聊天消息发送&优化布局

Classes/gframe/deck_con.cpp

@@ -115,8 +115,6 @@ void DeckBuilder::Terminate() {
 		mainGame->device->closeDevice();
 }
 bool DeckBuilder::OnEvent(const irr::SEvent& event) {
-	if(mainGame->dField.OnCommonEvent(event))
-		return false;
 #ifdef _IRR_ANDROID_PLATFORM_
 	irr::SEvent transferEvent;
 	if (irr::android::TouchEventTransferAndroid::OnTransferDeckEdit(event)) {

Classes/gframe/game.h

@@ -222,6 +222,9 @@ public:
 	irr::gui::IGUIStaticText* stSetName;
 	irr::gui::IGUIStaticText* stText;
 	irr::gui::IGUIScrollBar* scrCardText;
+	irr::gui::IGUIListBox* lstLog;
+	irr::gui::IGUIButton* btnClearLog;
+	irr::gui::IGUIButton* btnSaveLog;
 	irr::gui::IGUICheckBox* chkMAutoPos;
 	irr::gui::IGUICheckBox* chkSTAutoPos;
 	irr::gui::IGUICheckBox* chkRandomPos;
@@ -231,9 +234,6 @@ public:
 	irr::gui::IGUICheckBox* chkHideHintButton;
 	irr::gui::IGUICheckBox* chkIgnoreDeckChanges;
 	irr::gui::IGUICheckBox* chkAutoSearch;
-	irr::gui::IGUIListBox* lstLog;
-	irr::gui::IGUIButton* btnClearLog;
-	irr::gui::IGUIButton* btnSaveLog;
 	//main menu
 	irr::gui::IGUIWindow* wMainMenu;
 	irr::gui::IGUIButton* btnLanMode;

Classes/gframe/menu_handler.cpp

@@ -31,6 +31,8 @@ void UpdateDeck() {
 	DuelClient::SendBufferToServer(CTOS_UPDATE_DECK, deckbuf, pdeck - deckbuf);
 }
 bool MenuHandler::OnEvent(const irr::SEvent& event) {
+    if(mainGame->dField.OnCommonEvent(event))
+		return false;
 #ifdef _IRR_ANDROID_PLATFORM_
 	irr::SEvent transferEvent;
 	if (irr::android::TouchEventTransferAndroid::OnTransferCommon(event, false)) {

mobile/assets/changelog.html

@@ -22,6 +22,7 @@
     更新：
     1.更新ygo内核；
     2.避免误导用户移除版本号修改功能★
+    3.新卡：TCG1004+WJ+VJ；
     修复：
     1.一些已知的卡图错误；
     2.下拉列表滚动容易弹回顶部的问题；

mobile/src/main/res/layout/activity_deck_cards.xml

@@ -23,26 +23,25 @@
                 android:layout_height="match_parent"/>
 
             <LinearLayout
-                android:layout_width="wrap_content"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_gravity="bottom|left"
+                android:layout_gravity="bottom|"
                 android:layout_marginBottom="2dp"
                 android:layout_marginLeft="10dp"
                 android:orientation="horizontal"
                 android:weightSum="1">
 
                 <TextView
-                    android:layout_width="match_parent"
+                    android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="@string/deck_name"
                     android:textColor="@color/holo_blue_light" />
 
                 <android.support.v7.widget.AppCompatSpinner
                     android:id="@+id/toolbar_list"
-                    android:layout_width="150dp"
+                    android:layout_width="0dp"
                     android:layout_height="@dimen/item_height"
-                    app:popupTheme="@style/AppTheme.PopupOverlay.Bule"
-                    android:layout_weight="3.56" />
+                    android:layout_weight="1" />
 
                 <ImageView
                     android:id="@+id/btn_nav_list"