给imagebutton添加统一管理托盘父布局wPallet

Classes/gframe/deck_con.cpp

@@ -134,7 +134,7 @@ void DeckBuilder::Initialize() {
 	mainGame->wSort->setVisible(true);
 	mainGame->btnLeaveGame->setVisible(true);
 	mainGame->btnLeaveGame->setText(dataManager.GetSysString(1306));
-	mainGame->imgSettings->setVisible(true);
+	mainGame->wPallet->setVisible(true);
 	mainGame->btnSideOK->setVisible(false);
 	mainGame->btnSideShuffle->setVisible(false);
 	mainGame->btnSideSort->setVisible(false);

Classes/gframe/duelclient.cpp

@@ -592,7 +592,7 @@ void DuelClient::HandleSTOCPacketLan(char* data, unsigned int len) {
 		mainGame->is_building = false;
 		mainGame->wCardImg->setVisible(true);
 		mainGame->wInfos->setVisible(true);
-		mainGame->imgSettings->setVisible(true);
+		mainGame->wPallet->setVisible(true);
 		mainGame->wPhase->setVisible(true);
 		mainGame->btnSideOK->setVisible(false);
 		mainGame->btnSideShuffle->setVisible(false);

Classes/gframe/game.cpp

@@ -389,10 +389,14 @@ bool Game::Initialize() {
 	scrCardText->setSmallStep(1);
 	scrCardText->setVisible(false);
 	//setting
-    imgSettings = irr::gui::CGUIImageButton::addImageButton(env, rect<s32>(265 * yScale, 275 * yScale, 290 * yScale, 300 * yScale), 0, BUTTON_SETTINGS);
+    wPallet = env->addWindow(rect<s32>(265 * xScale, 275 * yScale, 290 * xScale, 324 * yScale), false, L"");
+    wPallet->getCloseButton()->setVisible(false);
+    wPallet->setDraggable(false);
+    //wPallet->setDrawTitlebar(false);
+    wPallet->setVisible(false);
+    imgSettings = irr::gui::CGUIImageButton::addImageButton(env, rect<s32>(265 * yScale, 275 * yScale, 295 * yScale, 300 * yScale), wPallet, BUTTON_SETTINGS);
     imgSettings->setImage(imageManager.tAct);
-    //imgSettings->setImageScale(core::vector2df(xScale, yScale));
-    imgSettings->setVisible(false);
+    imgSettings->setImageSize(core::dimension2di(xScale, yScale));
     wSettings = env->addWindow(rect<s32>(220 * xScale, 100 * yScale, 800 * xScale, 520 * yScale), false, dataManager.GetSysString(1273));
 	wSettings->getCloseButton()->setVisible(false);
 	wSettings->setVisible(false);
@@ -1767,7 +1771,7 @@ void Game::CloseDuelWindow() {
 	wCardImg->setVisible(false);
 	wInfos->setVisible(false);
 	wChat->setVisible(false);
-	imgSettings->setVisible(false);
+	wPallet->setVisible(false);
 	btnSideOK->setVisible(false);
 	btnSideShuffle->setVisible(false);
 	btnSideSort->setVisible(false);

Classes/gframe/game.h

@@ -255,7 +255,8 @@ public:
 	//card image
 	irr::gui::IGUIStaticText* wCardImg;
 	irr::gui::IGUIImage* imgCard;
-	//bgm image
+	//image button
+	irr::gui::IGUIWindow* wPallet;
 	irr::gui::CGUIImageButton* imgVol;
 	irr::gui::CGUIImageButton* imgSettings;
 	irr::gui::CGUIImageButton* imgLog;

Classes/gframe/menu_handler.cpp

@@ -240,7 +240,7 @@ bool MenuHandler::OnEvent(const irr::SEvent& event) {
 				mainGame->imgCard->setScaleImage(true);
 				mainGame->wCardImg->setVisible(true);
 				mainGame->wInfos->setVisible(true);
-				mainGame->imgSettings->setVisible(true);
+				mainGame->wPallet->setVisible(true);
 				mainGame->wReplay->setVisible(true);
 				mainGame->wReplayControl->setVisible(true);
 				mainGame->btnReplayStart->setVisible(false);

Classes/gframe/single_mode.cpp

@@ -72,7 +72,7 @@ int SingleMode::SinglePlayThread() {
 	mainGame->ClearCardInfo();
 	mainGame->wCardImg->setVisible(true);
 	mainGame->wInfos->setVisible(true);
-	mainGame->imgSettings->setVisible(true);
+	mainGame->wPallet->setVisible(true);
 	mainGame->btnLeaveGame->setVisible(true);
 	mainGame->btnLeaveGame->setText(dataManager.GetSysString(1210));
 	mainGame->wPhase->setVisible(true);

mobile/assets/changelog.html

@@ -16,16 +16,11 @@
     特别感谢： 菜菜,尸体,废话多,大毛,龙道香姐,晓L,幻兽L 的支持与努力.
 </pre>
 <ul>
-    <li style="color:#ffff00">3.7.2</li>
+    <li style="color:#ffff00">3.7.3</li>
 </ul>
 <pre>
     更新：
     1.更新ygo内核；
-    2.新卡DP24；
-    变更：
-    1.卡组数量1以下时安装新版本会检查备份卡组并提示；
-    2.卡组数量1以上时不再复制SAMPLE卡组；
-    3.申请前增加对敏感权限的解释；
 </pre>
 <h3 style="color:#ff0000">注意</h3>
 <pre>