Commit: a5aff6bde5451479a0f6188c0f6e5b2f6f4e9680 - main (git)

Commit MetaInfo

• Revision: a5aff6bde5451479a0f6188c0f6e5b2f6f4e9680 (tree)
• Zeit: 2012-10-29 15:53:29
• Autor: h2so5 <h2so5@git....>
• Commiter: h2so5

Log Message

ver0.4.0
UILabelの改行バグを修正
コピペ機能を削除
ステージを持っていないチャンネルへのワープゾーンを表示しないように変更

Ändern Zusammenfassung

• modified: Readme.txt
• modified: client/3d/Stage.cpp
• modified: client/CommandManager.cpp
• modified: client/bin/system/default.info.json
• modified: client/scene/ChannelChange.cpp
• modified: client/scene/MainLoop.cpp
• modified: client/scene/Title.cpp
• modified: client/ui/Input.cpp
• modified: client/ui/Input.hpp
• modified: client/ui/InputBox.cpp
• modified: client/ui/UILabel.cpp
• modified: package.py

Diff

--- a/Readme.txt
+++ b/Readme.txt
@@ -1,4 +1,4 @@
-Miku Miku Online 0.3.10
+Miku Miku Online 0.4.0
 
 // ******************************** 警告 *********************************** //
 // *** 
@@ -105,5 +105,5 @@ Client.exeを終了した状態で、server/Server.exe を実行すると単独
 
 --
 mailto:[e-mail]
-http://mmo.h2so5.net/
+http://m2op.net/
 http://sourceforge.jp/projects/mmo/
\ No newline at end of file

--- a/client/3d/Stage.cpp
+++ b/client/3d/Stage.cpp
@@ -46,32 +46,7 @@ Stage::Stage(const ChannelPtr& channel,const ConfigManagerPtr &config_manager) :
 		warpobj_handles_.push_back(handle);
 	}
 
-	/*
-    auto warp_points_array = map_handle_.property().get_child("stage.warp_points", ptree());
-    for (auto it = warp_points_array.begin(); it != warp_points_array.end(); ++it) {
-        float x = it->second.get<float>("x", 0);
-        float y = it->second.get<float>("y", 0);
-        float z = it->second.get<float>("z", 0);
-        warp_points_.push_back(VGet(x, y, z));
-    }
-    if (warp_points_.empty()) {
-        warp_points_.push_back(VGet(0,0,0));
-    }
-	auto warpobj_name = map_handle_.property().get<std::string>("stage.warpobj_name", unicode::ToString(_T("warpobj:デフォルトワープオブジェクト")));
-	warpobj_handle_ = ResourceManager::LoadModelFromName(unicode::ToTString(warpobj_name));
-
-	float warpobj_scale = warpobj_handle_.property().get<float>("scale",12.5f);
-	if(warpobj_scale != 1.0f)MV1SetScale(warpobj_handle_.handle(), VGet(warpobj_scale, warpobj_scale, warpobj_scale));
-	auto warpobj_push_it = warp_points_.begin();
-	for( warpobj_push_it; warpobj_push_it != warp_points_.end(); ++warpobj_push_it)
-	{
-		auto tmp = ResourceManager::LoadModelFromName(unicode::ToTString(warpobj_name));
-		MV1SetScale(tmp.handle(), VGet(warpobj_scale, warpobj_scale, warpobj_scale));
-		MV1SetPosition(tmp.handle(),*warpobj_push_it);
-		warpobj_array_.push_back(tmp);
-	}
-	*/
-    auto skymap_name = map_handle_.property().get<std::string>("stage.skydome", unicode::ToString(_T("skydome:入道雲のある風景")));
+    auto skymap_name = unicode::ToString(_T("skydome:スカイドーム"));
     skymap_handle_ = ResourceManager::LoadModelFromName(unicode::ToTString(skymap_name));
 
     float skymap_scale = skymap_handle_.property().get<float>("scale", 80.0);
@@ -96,18 +71,16 @@ void Stage::Draw()
 		}
 	}
 
+	auto skymep_rotate = MV1GetRotationXYZ(skymap_handle_.handle());
+	skymep_rotate.y += 0.0001;
+	MV1SetRotationXYZ(skymap_handle_.handle(), skymep_rotate);
+
     MV1DrawModel(skymap_handle_.handle());
 
 	BOOST_FOREACH(const auto& warp_point_handle, warpobj_handles_) {
 		MV1DrawModel(warp_point_handle.handle());
 	}
 
-	/*
-	BOOST_FOREACH(auto warp_handle,warpobj_array_)
-	{
-		MV1DrawModel(warp_handle.handle());
-	}
-	*/
 }
 
 void Stage::DrawAfter()

--- a/client/CommandManager.cpp
+++ b/client/CommandManager.cpp
@@ -119,7 +119,7 @@ void CommandManager::FetchCommand(const network::Command& command)
 			channels_[id] = ptr;
 		}
 
-		// 存在しないチャンネルへのワープポイントを削除
+		// 存在しない・ステージデータがないチャンネルへのワープポイントを削除
 		BOOST_FOREACH(const auto& channel, channels_) {
 			auto& warp_points = channel.second->warp_points;
 			auto end_it = std::remove_if(warp_points.begin(),
@@ -127,6 +127,12 @@ void CommandManager::FetchCommand(const network::Command& command)
 				[this](Channel::WarpPoint& point) -> bool {
 				auto it = channels_.find(point.channel);
 				if (it != channels_.end()) {
+
+					if (ResourceManager::NameToFullPath(
+						unicode::ToTString(it->second->stage)).empty()) {
+						return true;
+					}
+
 					point.name = it->second->name;
 					return false;
 				} else {

--- a/client/bin/system/default.info.json
+++ b/client/bin/system/default.info.json
@@ -15,7 +15,6 @@
     		"start_points":
     			[
     				{"x":0.0, "y":0.0, "z":0.0}
-    			],
-    		"skydome": "skydome:入道雲のある風景"
+    			]
     	}
 }
\ No newline at end of file

--- a/client/scene/ChannelChange.cpp
+++ b/client/scene/ChannelChange.cpp
@@ -45,6 +45,8 @@ void ChannelChange::Update()
 		player_manager_->ResetStage();
 		manager_accessor_->set_world_manager(WorldManagerPtr());
 
+		ResourceManager::ClearModelHandle();
+
 		command_manager_->Write(network::ServerUpdateAccountProperty(CHANNEL, network::Utils::Serialize(channel_)));
 
 		auto channel_ptr = command_manager_->channels().at(channel_);

--- a/client/scene/MainLoop.cpp
+++ b/client/scene/MainLoop.cpp
@@ -176,13 +176,14 @@ void MainLoop::Draw()
 
 				UILabel label_;
 				label_.set_width(160);
+				auto text = _T("【") + unicode::ToTString(warp_point.name) + _T("】");
 				if (distance < 50) {
-					label_.set_text(unicode::ToTString(warp_point.name) + _T("\nＭキーで転送します"));
+					text += _T("\nＭキーで転送します");
 					label_.set_bgcolor(UIBase::Color(255,0,0,150));
 				} else {
-					label_.set_text(unicode::ToTString(warp_point.name));
 					label_.set_bgcolor(UIBase::Color(0,0,0,150));
 				}
+				label_.set_text(text);
 				label_.set_textcolor(UIBase::Color(255,255,255,255));
 
 				label_.set_left(x - 60);

Binary files a/client/scene/Title.cpp and b/client/scene/Title.cpp differ

--- a/client/ui/Input.cpp
+++ b/client/ui/Input.cpp
@@ -8,7 +8,7 @@
 
 const size_t Input::TEXT_BUFFER_SIZE = 1024;
 const size_t Input::HISTORY_MAX_SIZE = 50;
-const int Input::KEY_REPEAT_FRAME = 8;
+const int Input::KEY_REPEAT_FRAME = 6;
 
 const int Input::INPUT_MARGIN_X = 8;
 const int Input::INPUT_MARGIN_Y = 6;
@@ -19,12 +19,9 @@ const int Input::IME_MARGIN_Y = 16;
 const int Input::IME_MAX_PAGE_SIZE = 6;
 const int Input::IME_MIN_WIDTH = 120;
 
-Input::Input(ConfigManagerPtr config_manager) :
+Input::Input() :
 	multiline_(true),
-    reverse_color_(false),
-	drag_flag_(false),
-	rightmenu_show_(false),
-	config_manager_(config_manager)
+    reverse_color_(false)
 {
     input_bg_image_handle_ = ResourceManager::LoadCachedDivGraph<4>(
             _T("system/images/gui/gui_inputbox_input_bg.png"), 2, 2, 12, 12);
@@ -48,104 +45,6 @@ Input::Input(ConfigManagerPtr config_manager) :
     y_ = 100;
     width_ = 160;
     height_ = font_height_ + 4;
-
-}
-
-void Input::Init()
-{
-	right_click_list_.addItem(UIBasePtr(new UILabel([&]()->UILabel{
-		UILabel label;
-		label.set_input_adaptor(this);
-		label.set_text(unicode::ToTString(unicode::sjis2utf8("切り取り")));
-		label.set_width(120);
-		label.set_top(12);
-		label.set_left(0);
-		label.set_textcolor(UISuper::Color(0,0,0,255));
-		label.set_bgcolor(UISuper::Color(255,255,255,180));
-		label.set_on_click_function_([](UIBase* ptr)->void{
-			auto input_ = ptr->input_adpator();
-			auto sel_txt = input_->selecting_text();
-			SetClipboardText(sel_txt.c_str());
-			auto text = input_->text();
-			auto pos = text.find(sel_txt);
-			tstring res;
-			if( pos != std::string::npos )
-			{
-				res = text.substr(0,pos);
-				res += text.substr(pos + sel_txt.size(),text.size() - pos + sel_txt.size());
-			}
-			input_->set_text(res);
-		});
-		label.set_on_hover_function_([](UIBase* ptr)->void{
-			auto label_ptr = (UILabel *)ptr;
-			label_ptr->set_bgcolor(UISuper::Color(0,0,0,180));
-			label_ptr->set_textcolor(UISuper::Color(255,255,255));
-		});
-		label.set_on_out_function_([](UIBase* ptr)->void{
-			auto label_ptr = (UILabel *)ptr;
-			label_ptr->set_bgcolor(UISuper::Color(255,255,255,180));
-			label_ptr->set_textcolor(UISuper::Color(0,0,0));
-		});
-		return label;
-	}())));
-	right_click_list_.addItem(UIBasePtr(new UILabel([&]()->UILabel{
-		UILabel label;
-		label.set_input_adaptor(this);
-		label.set_text(unicode::ToTString(unicode::sjis2utf8("コピー")));
-		label.set_width(120);
-		label.set_top(12);
-		label.set_left(0);
-		label.set_textcolor(UISuper::Color(0,0,0,255));
-		label.set_bgcolor(UISuper::Color(255,255,255,180));
-		label.set_on_click_function_([&](UIBase* ptr)->void{
-			auto input_ = ptr->input_adpator();
-			SetClipboardText(input_->selecting_text().c_str());
-		});
-		label.set_on_hover_function_([](UIBase* ptr)->void{
-			auto label_ptr = (UILabel *)ptr;
-			label_ptr->set_bgcolor(UISuper::Color(0,0,0,180));
-			label_ptr->set_textcolor(UISuper::Color(255,255,255));
-		});
-		label.set_on_out_function_([](UIBase* ptr)->void{
-			auto label_ptr = (UILabel *)ptr;
-			label_ptr->set_bgcolor(UISuper::Color(255,255,255,180));
-			label_ptr->set_textcolor(UISuper::Color(0,0,0));
-		});
-		return label;
-	}())));
-	right_click_list_.addItem(UIBasePtr(new UILabel([&]()->UILabel{
-		UILabel label;
-		label.set_input_adaptor(this);
-		label.set_text(unicode::ToTString(unicode::sjis2utf8("貼り付け")));
-		label.set_width(120);
-		label.set_top(12);
-		label.set_left(0);
-		label.set_textcolor(UISuper::Color(0,0,0,255));
-		label.set_bgcolor(UISuper::Color(255,255,255,180));
-		label.set_on_click_function_([&](UIBase* ptr)->void{
-			auto input_ = ptr->input_adpator();
-			auto size = GetClipboardText(NULL);
-			if(size > 0){
-				TCHAR *buf = new TCHAR[size];
-				GetClipboardText(buf);
-				input_->paste_text(buf);
-				delete []buf;
-			}
-		});
-		label.set_on_hover_function_([](UIBase* ptr)->void{
-			auto label_ptr = (UILabel *)ptr;
-			label_ptr->set_bgcolor(UISuper::Color(0,0,0,180));
-			label_ptr->set_textcolor(UISuper::Color(255,255,255));
-		});
-		label.set_on_out_function_([](UIBase* ptr)->void{
-			auto label_ptr = (UILabel *)ptr;
-			label_ptr->set_bgcolor(UISuper::Color(255,255,255,180));
-			label_ptr->set_textcolor(UISuper::Color(0,0,0));
-		});
-		return label;
-	}())));
-	right_click_list_.set_height((font_height_ + 2)* 3);
-	right_click_list_.set_width(120);
 }
 
 void Input::Draw()
@@ -260,98 +159,12 @@ void Input::Draw()
             }
         }
 
-		int select_start = 0,select_end = 0;
-		GetKeyInputSelectArea(&select_start,&select_end,input_handle_);
-		if( select_start > select_end )std::swap(select_start,select_end);
-
-		if( select_start > -1 && select_end != select_start ) {
-			if ( multiline_ ) {
-				BOOST_FOREACH(auto it,lines_){
-					int width = 0;
-					TCHAR c[2] = {0};
-					if( select_start >= it.size() && select_start != -1 ) {
-						DrawStringToHandle(internal_x, internal_y + current_line * font_height_,
-							it.c_str(), text_color, font_handle_);
-						if(select_start == it.size()){
-							select_start -= it.size();
-						}else{
-							select_start -= it.size() + 1;
-						}
-						select_end -= it.size() + 1;
-						++current_line;
-					}else if(select_start != -1){
-						for(int i = 0;i < select_start;++i){
-							c[0] = it[i];
-							DrawStringToHandle(internal_x + width, internal_y + current_line * font_height_,
-								c, text_color, font_handle_);
-							width += GetDrawStringWidthToHandle(c,1,font_handle_);
-						}
-						for(int i = select_start;i < ((select_end > static_cast<int>(it.size())) ? it.size() : select_end); ++i){
-							c[0] = it[i];
-							SetDrawBlendMode(DX_BLENDMODE_ALPHA, 180);
-							DrawBox(internal_x + width,internal_y + current_line * font_height_,
-								internal_x + width + GetDrawStringWidthToHandle(c,1,font_handle_),internal_y + ( current_line + 1 ) * font_height_,text_color,1);
-							DrawStringToHandle(internal_x + width, internal_y + current_line * font_height_,
-								c, !reverse_color_ ? GetColor(255, 255, 255) : GetColor(0, 0, 0), font_handle_);
-							width += GetDrawStringWidthToHandle(c,1,font_handle_);
-							SetDrawBlendMode(DX_BLENDMODE_NOBLEND, 0);
-						}
-						for(int i = ((select_end > static_cast<int>(it.size())) ? it.size() : select_end);i < it.size(); ++i){
-							c[0] = it[i];
-							DrawStringToHandle(internal_x + width, internal_y + current_line * font_height_,
-								c, text_color, font_handle_);
-							width += GetDrawStringWidthToHandle(c,1,font_handle_);
-						}
-						if(select_end > it.size()){
-							select_end -= it.size() + 1;
-							select_start = 0;
-						}else{
-							select_start = -1;
-						}
-						++current_line;
-					}else if(select_start == -1){
-						DrawStringToHandle(internal_x + width, internal_y + current_line * font_height_,
-							it.c_str(), text_color, font_handle_);
-						++current_line;
-					}
-				}
-			}else{
-				BOOST_FOREACH(auto it,lines_){
-					int width = 0;
-					TCHAR c[2] = {0};
-					for(int i = 0;i < select_start;++i){
-						c[0] = it[i];
-						DrawStringToHandle(internal_x + width, internal_y + current_line * font_height_,
-							c, text_color, font_handle_);
-						width += GetDrawStringWidthToHandle(c,1,font_handle_);
-					}
-					for(int i = select_start;i < select_end; ++i){
-						c[0] = it[i];
-				        SetDrawBlendMode(DX_BLENDMODE_ALPHA, 180);
-						DrawBox(internal_x + width,internal_y + current_line * font_height_,
-							internal_x + width + GetDrawStringWidthToHandle(c,1,font_handle_),internal_y + ( current_line + 1 ) * font_height_,text_color,1);
-						DrawStringToHandle(internal_x + width, internal_y + current_line * font_height_,
-							c, !reverse_color_ ? GetColor(255, 255, 255) : GetColor(0, 0, 0), font_handle_);
-						width += GetDrawStringWidthToHandle(c,1,font_handle_);
-						SetDrawBlendMode(DX_BLENDMODE_NOBLEND, 0);
-					}
-					for(unsigned int i = select_end;i < it.size(); ++i){
-						c[0] = it[i];
-						DrawStringToHandle(internal_x + width, internal_y + current_line * font_height_,
-							c, text_color, font_handle_);
-						width += GetDrawStringWidthToHandle(c,1,font_handle_);
-					}
-				}
-			}
-		}else{
-			for (auto it = lines_.begin(); it != lines_.end(); ++it) {
-				auto line = *it;
-				DrawStringToHandle(internal_x, internal_y + current_line * font_height_,
-					line.c_str(), text_color, font_handle_);
-				current_line++;
-			}
-		}
-
+        for (auto it = lines_.begin(); it != lines_.end(); ++it) {
+            auto line = *it;
+            DrawStringToHandle(internal_x, internal_y + current_line * font_height_,
+                    line.c_str(), text_color, font_handle_);
+            current_line++;
+        }
 
         // カーソルを描画
         if (clause_lines_.size() <= 0 && active() && blink_count_ < 30) {
@@ -445,21 +258,11 @@ void Input::Draw()
             }
         }
     }
-	{
-		if ( rightmenu_show_ ) {
-			right_click_list_.Draw();
-		}
-	}
 }
 
 void Input::Update()
 {
     blink_count_ = (blink_count_ + 1) % 60;
-	{
-		if ( rightmenu_show_ ) {
-			right_click_list_.Update();
-		}
-	}
 }
 
 void Input::ProcessInput(InputManager* input)
@@ -468,11 +271,7 @@ void Input::ProcessInput(InputManager* input)
         return;
     }
 
-    bool push_mouse_left = (input->GetMouseLeftCount() > 0);
-	bool prev_mouse_left = input->GetPrevMouseLeft();
-
-	bool push_mouse_right = (input->GetMouseRightCount() > 0);
-	bool prev_mouse_right = input->GetPrevMouseRight();
+    // bool push_mouse_left = (input->GetMouseLeftCount() > 0);
 
     // bool first_key_shift = (input->GetKeyCount(KEY_INPUT_RSHIFT) == 1
     //        || input->GetKeyCount(KEY_INPUT_LSHIFT) == 1);
@@ -493,7 +292,6 @@ void Input::ProcessInput(InputManager* input)
             + KEY_REPEAT_FRAME) % (KEY_REPEAT_FRAME + 1) == 0;
     bool push_repeat_key_down = (input->GetKeyCount(KEY_INPUT_DOWN)
             + KEY_REPEAT_FRAME) % (KEY_REPEAT_FRAME + 1) == 0;
-
     // bool push_long_backspace = (input->GetKeyCount(KEY_INPUT_BACK) > 60 * 1.5);
 
     auto input_text = text();
@@ -609,184 +407,7 @@ void Input::ProcessInput(InputManager* input)
     }
 
     if (active()) {
-		if ( !rightmenu_show_ &&
-			!( rightmenu_show_ && right_click_list_.absolute_x()<= input->GetMouseX() && input->GetMouseX() <= right_click_list_.absolute_x()+ right_click_list_.absolute_width()
-			&& right_click_list_.absolute_y() <= input->GetMouseY() && input->GetMouseY() <= right_click_list_.absolute_y() + right_click_list_.absolute_height())) {
-				// マウス左ボタンが押された時
-				if (push_mouse_left && !prev_mouse_left) {
-					auto mpos = input->GetMousePos();
-					auto offset_x = mpos.first - (x_ + INPUT_MARGIN_X);
-					auto offset_y = mpos.second - (y_ + INPUT_MARGIN_Y);
-					// カレット変更
-					if( multiline_ ) {
-						auto line_num = offset_y / font_height_;
-						//if( ( offset_y % font_height_ ) != 0 )++line_num;
-						int tmp = 0,cnt = 0;
-						if( line_num < (int)lines_.size() && line_num >= 0 ){
-							for(int i = 0;i < line_num; ++i){
-								cnt += lines_[i].size();
-							}
-							for(unsigned int i = 0;i < lines_[line_num].size(); ++i){
-								auto tmp_x = GetDrawStringWidthToHandle(&lines_[line_num][i],1,font_handle_);
-								if( tmp + tmp_x < offset_x ){
-									tmp += tmp_x;
-									++cnt;
-								}
-							}
-							SetKeyInputCursorPosition(line_num + cnt,input_handle_);
-						}
-					}else{
-						int tmp = 0,cnt = 0;
-						for(unsigned int i = 0;i < lines_[0].size(); ++i){
-							auto tmp_x = GetDrawStringWidthToHandle(&lines_[0][i],1,font_handle_);
-							if( tmp + tmp_x < offset_x ){
-								tmp += tmp_x;
-								++cnt;
-							}
-						}
-						if( selecting_coursorpoint_.first = selecting_coursorpoint_.second ) {
-							SetKeyInputSelectArea( -1, -1, input_handle_ );
-						}else{
-							SetKeyInputSelectArea(selecting_coursorpoint_.first,selecting_coursorpoint_.second,input_handle_);
-						}
-						SetKeyInputCursorPosition(cnt,input_handle_);
-					}
-				}
-				// マウス左ボタンがドラッグされた時
-				if (push_mouse_left && prev_mouse_left ) {
-					int prev_cursor_pos = 0;
-					if( !drag_flag_ ){
-						prev_cursor_pos = GetKeyInputCursorPosition(input_handle_);
-					}else{
-						prev_cursor_pos = selecting_coursorpoint_.first;
-					}
-					auto mpos = input->GetMousePos();
-					auto offset_x = mpos.first - (x_ + INPUT_MARGIN_X);
-					auto offset_y = mpos.second - (y_ + INPUT_MARGIN_Y);
-					// カレット変更
-					if( multiline_ ) {
-						auto line_num = offset_y / font_height_;
-						int tmp = 0,cnt = 0;
-						if( line_num < (int)lines_.size() && line_num >= 0){
-							for(int i = 0;i < line_num; ++i,++cnt){
-								cnt += lines_[i].size();
-							}
-							for(unsigned int i = 0;i < lines_[line_num].size(); ++i){
-								auto tmp_x = GetDrawStringWidthToHandle(&lines_[line_num][i],1,font_handle_);
-								if( tmp + tmp_x < offset_x ){
-									tmp += tmp_x;
-									++cnt;
-								}
-							}
-						}
-						selecting_coursorpoint_ = std::make_pair<int,int>(prev_cursor_pos,cnt);
-					}else{
-						int tmp = 0,cnt = 0;
-						for(unsigned int i = 0;i < lines_[0].size(); ++i){
-							auto tmp_x = GetDrawStringWidthToHandle(&lines_[0][i],1,font_handle_);
-							if( tmp + tmp_x < offset_x ){
-								tmp += tmp_x;
-								++cnt;
-							}
-						}
-						selecting_coursorpoint_ = std::make_pair<int,int>(prev_cursor_pos,cnt);
-					}
-					SetKeyInputSelectArea(selecting_coursorpoint_.first,selecting_coursorpoint_.second,input_handle_);
-					SetKeyInputCursorPosition(selecting_coursorpoint_.second,input_handle_);
-					drag_flag_ = true;
-				}
-				// マウス左ボタンが離され、且つ前回ドラッグされていた時
-				if (!push_mouse_left && prev_mouse_left && drag_flag_ ) {
-					drag_flag_ = false;
-					if( selecting_coursorpoint_.first == selecting_coursorpoint_.second ) {
-						SetKeyInputSelectArea( -1, -1, input_handle_ );
-					}else{
-						SetKeyInputSelectArea(selecting_coursorpoint_.first,selecting_coursorpoint_.second,input_handle_);
-					}
-					SetKeyInputCursorPosition(selecting_coursorpoint_.second,input_handle_);
-				}
-		}else{
-			if( push_mouse_left ){
-				auto mpos = input->GetMousePos();
-				auto offset_x = mpos.first - (x_ + INPUT_MARGIN_X);
-				auto offset_y = mpos.second - (y_ + INPUT_MARGIN_Y);
-				// カレット変更
-				if( multiline_ ) {
-					auto line_num = offset_y / font_height_;
-					//if( ( offset_y % font_height_ ) != 0 )++line_num;
-					int tmp = 0,cnt = 0;
-					if( line_num < (int)lines_.size() && line_num >= 0 ){
-						for(int i = 0;i < line_num; ++i){
-							cnt += lines_[i].size();
-						}
-						for(unsigned int i = 0;i < lines_[line_num].size(); ++i){
-							auto tmp_x = GetDrawStringWidthToHandle(&lines_[line_num][i],1,font_handle_);
-							if( tmp + tmp_x < offset_x ){
-								tmp += tmp_x;
-								++cnt;
-							}
-						}
-						SetKeyInputCursorPosition(line_num + cnt,input_handle_);
-					}
-				}else{
-					int tmp = 0,cnt = 0;
-					for(unsigned int i = 0;i < lines_[0].size(); ++i){
-						auto tmp_x = GetDrawStringWidthToHandle(&lines_[0][i],1,font_handle_);
-						if( tmp + tmp_x < offset_x ){
-							tmp += tmp_x;
-							++cnt;
-						}
-					}
-					if( selecting_coursorpoint_.first = selecting_coursorpoint_.second ) {
-						SetKeyInputSelectArea( -1, -1, input_handle_ );
-					}else{
-						SetKeyInputSelectArea(selecting_coursorpoint_.first,selecting_coursorpoint_.second,input_handle_);
-					}
-					SetKeyInputCursorPosition(cnt,input_handle_);
-				}
-			}
-		}
-		// マウス右ボタンが押されたとき
-		if ( push_mouse_right && !prev_mouse_right ) {
-			if( x() <= input->GetMouseX() && input->GetMouseX() <= x() + width() && 
-				y() <= input->GetMouseY() && input->GetMouseY() <= y() + height()){
-					auto mouse_pos_ = input->GetMousePos();
-					if( mouse_pos_.second + right_click_list_.absolute_height() > config_manager_->screen_height()){
-						right_click_list_.set_top(mouse_pos_.second - right_click_list_.absolute_height());
-						if ( mouse_pos_.first + right_click_list_.absolute_width() > config_manager_->screen_width()){
-							right_click_list_.set_left(mouse_pos_.first - right_click_list_.absolute_width());
-							BOOST_FOREACH(auto it,right_click_list_.getItems()){
-								it->set_left(mouse_pos_.first - right_click_list_.absolute_width());
-								it->set_top(mouse_pos_.second - right_click_list_.absolute_height() + 12);
-							}
-						}else{
-							right_click_list_.set_left(mouse_pos_.first);
-							BOOST_FOREACH(auto it,right_click_list_.getItems()){
-								it->set_left(mouse_pos_.first);
-								it->set_top(mouse_pos_.second - right_click_list_.absolute_height() + 12);
-							}
-						}
-					}else{
-						right_click_list_.set_top(mouse_pos_.second);
-						if ( mouse_pos_.first + right_click_list_.absolute_width() > config_manager_->screen_width()){
-							right_click_list_.set_left(mouse_pos_.first - right_click_list_.absolute_width());
-							BOOST_FOREACH(auto it,right_click_list_.getItems()){
-								it->set_left(mouse_pos_.first - right_click_list_.absolute_width());
-								it->set_top(mouse_pos_.second + 12);
-							}
-						}else{
-							right_click_list_.set_left(mouse_pos_.first);
-							BOOST_FOREACH(auto it,right_click_list_.getItems()){
-								it->set_left(mouse_pos_.first);
-								it->set_top(mouse_pos_.second + 12);
-							}
-						}
-					}
-					rightmenu_show_ = true;
-			}
-		}
-
-        // カーソル位置（文字単位）を取得
+        // カーソル位置（byte）を取得
         cursor_byte_pos = GetKeyInputCursorPosition(input_handle_);
 		if (prev_cursor_pos_ != cursor_byte_pos) {
 			ResetCursorCount();
@@ -794,7 +415,6 @@ void Input::ProcessInput(InputManager* input)
 
 		prev_cursor_pos_ = cursor_byte_pos;
 
-
         // カーソルのドット単位の位置を取得する
         cursor_dot_pos = GetDrawStringWidthToHandle(String, cursor_byte_pos,
                 font_handle_);
@@ -1001,7 +621,6 @@ void Input::ProcessInput(InputManager* input)
             TCHAR c = *it;
             int width = GetDrawStringWidthToHandle(&c, 1, font_handle_);
             line_buffer += tstring(&c, 1);
-			char_count++;
         #else
             unsigned char c = *it;
             TCHAR string[2] = { 0, 0 };
@@ -1040,7 +659,7 @@ void Input::ProcessInput(InputManager* input)
                     && cursor_moveto_x_ <= line_width + width
                     && static_cast<int>(lines_.size() + message_lines_.size()) * font_height_ <= cursor_moveto_y_
                     && cursor_moveto_y_ <= (static_cast<int>(lines_.size() + message_lines_.size()) + 1) * font_height_) {
-                SetKeyInputCursorPosition(char_count - 1, input_handle_);
+                SetKeyInputCursorPosition(prev_char_count, input_handle_);
                 cursor_moveto_x_ = -1;
                 cursor_moveto_y_ = -1;
             }
@@ -1097,14 +716,6 @@ void Input::ProcessInput(InputManager* input)
     if (active()) {
         input->CancelKeyCountAll();
     }
-
-	if ( rightmenu_show_ ) {
-		right_click_list_.ProcessInput(input);
-		if( push_mouse_left ) {
-			rightmenu_show_ = false;
-		}
-	}
-
 }
 
 bool Input::active()
@@ -1204,51 +815,6 @@ void Input::set_on_enter(const CallbackFunc& func)
     on_enter_ = func;
 }
 
-tstring Input::selecting_text() const
-{
-		int select_start = 0,select_end = 0;
-		GetKeyInputSelectArea(&select_start,&select_end,input_handle_);
-		if( select_start > select_end )std::swap(select_start,select_end);
-		tstring selecting_text;
-
-		if( select_start > -1 && select_end != select_start ) {
-			if ( multiline_ ) {
-				BOOST_FOREACH(auto it,lines_){
-					TCHAR c[2] = {0};
-					if( select_start > it.size() && select_start != -1 ) {
-						select_start -= it.size();
-						select_end -= it.size();
-					}else{
-						for(int i = select_start;i < select_end; ++i){
-							c[0] = it[i];
-						    selecting_text += c;
-						}
-						select_start = -1;
-					}
-				}
-			}else{
-				BOOST_FOREACH(auto it,lines_){
-					TCHAR c[2] = {0};
-					for(int i = select_start;i < select_end; ++i){
-						c[0] = it[i];
-				        selecting_text += c;
-					}
-				}
-			}
-		}
-		return selecting_text;
-}
-
-void Input::paste_text(tstring text)
-{
-	auto pos = GetKeyInputCursorPosition(input_handle_);
-	TCHAR String[TEXT_BUFFER_SIZE];
-    GetKeyInputString(String, input_handle_);
-    tstring dat(String, _tcslen(String));
-	dat.insert(pos,text);
-	SetKeyInputString(dat.c_str(), input_handle_);
-}
-
 bool Input::reverse_color() const
 {
     return reverse_color_;

--- a/client/ui/Input.hpp
+++ b/client/ui/Input.hpp
@@ -8,20 +8,16 @@
 #include <functional>
 #include "../ResourceManager.hpp"
 #include "../InputManager.hpp"
-#include "../ConfigManager.hpp"
-#include "include.hpp"
-#include <boost/enable_shared_from_this.hpp>
 
-class Input{
+class Input {
         typedef std::function<bool(const std::string&)> CallbackFunc;
 
     public:
-        Input(ConfigManagerPtr config_manager);
+        Input();
 
         void Draw();
         void Update();
         void ProcessInput(InputManager* input);
-		void Init();
 
         bool active();
         void set_active(bool flag);
@@ -49,9 +45,6 @@ class Input{
 
         void set_on_enter(const CallbackFunc& func);
 
-		tstring selecting_text() const;
-		void paste_text(tstring text);
-
     public:    
         void CancelSelect();
 
@@ -80,20 +73,12 @@ class Input{
         std::vector<std::pair<int, int>> selecting_lines_;
         std::vector<std::pair<int, int>> clause_lines_;
         std::vector<std::pair<int, int>> selecting_clause_lines_;
-		std::pair<int, int> selecting_coursorpoint_;
-		bool drag_flag_;
 
         CallbackFunc on_enter_;
         tstring message_;
 
         bool reverse_color_;
         int blink_count_;
-		bool rightmenu_show_;
-		//std::pair<int, int> mouse_pos_;
-
-		UIList right_click_list_;
-
-		ConfigManagerPtr config_manager_;
 
     private:
         const static size_t TEXT_BUFFER_SIZE;

--- a/client/ui/InputBox.cpp
+++ b/client/ui/InputBox.cpp
@@ -44,7 +44,7 @@ InputBox::InputBox(const ManagerAccessorPtr& manager_accessor) :
                 manager_accessor_(manager_accessor),
                 card_(std::make_shared<Card>(manager_accessor_, "", "immo", "", "",
                             std::vector<std::string>())),
-				input_(manager_accessor->config_manager().lock())
+				input_()
 
 {
 	absolute_rect_ = Rect(100, 100, 800, 100);
@@ -103,7 +103,6 @@ InputBox::InputBox(const ManagerAccessorPtr& manager_accessor) :
 
         return true;
     });
-	input_.Init();
 }
 
 InputBox::~InputBox()

--- a/client/ui/UILabel.cpp
+++ b/client/ui/UILabel.cpp
@@ -255,6 +255,7 @@ void UILabel::UpdatePosition()
 
     for (auto it = char_width_list_.begin(); it != char_width_list_.end(); ++it) {
         if ( text_[text_cursor] == _T('\n')) {
+			line_width = 0;
             line_num++;
             substr_list_.push_back(text_cursor);
             substr_list_.push_back(text_cursor + 1);

--- a/package.py
+++ b/package.py
@@ -36,6 +36,7 @@ def make_full_package(model = True):
 	zip.write(os.path.join(base_dir, 'mmd.txt'), 'mmd.txt')
 
 	zip.write(os.path.join(bin_path, 'server/config.json'), 'server/config.json')
+	zip.write(os.path.join(bin_path, 'server/channels/ch000/config.json'), 'server/channels/ch000/config.json')
 
 	zip.write(os.path.join(bin_path, 'config.json'), 'config.json')
 	zip.write(os.path.join(bin_path, 'server/server.exe'), 'server/server.exe')
@@ -96,6 +97,7 @@ def make_server_package():
 	bin_path = os.path.join(base_dir, 'client/bin/')
 	zip.write(os.path.join(bin_path, 'server/server.exe'), 'server.exe')
 	zip.write(os.path.join(bin_path, 'server/config.json'), 'config.json')
+	zip.write(os.path.join(bin_path, 'server/channels/ch000/config.json'), 'channels/ch000/config.json')
 	        
 	zip.close()