Skip to content

Y
YGOMobile-Cn-Ko-En
Commit 34bdf64a authored by fallenstardust's avatar fallenstardust
Browse files
Options

更改为scroll settings

parent b56f9074
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 13 deletions
Classes/gframe/deck_con.cpp
View file @ 34bdf64a
...@@ -171,6 +171,7 @@ void DeckBuilder::Terminate() { ...@@ -171,6 +171,7 @@ void DeckBuilder::Terminate() {
mainGame->btnLeaveGame->setVisible(false); mainGame->btnLeaveGame->setVisible(false);
mainGame->wPallet->setVisible(false); mainGame->wPallet->setVisible(false);
mainGame->wSettings->setVisible(false); mainGame->wSettings->setVisible(false);
mainGame->wLogs->setVisible(false);
mainGame->PopupElement(mainGame->wMainMenu); mainGame->PopupElement(mainGame->wMainMenu);
mainGame->device->setEventReceiver(&mainGame->menuHandler); mainGame->device->setEventReceiver(&mainGame->menuHandler);
mainGame->wACMessage->setVisible(false); mainGame->wACMessage->setVisible(false);
......
Classes/gframe/event_handler.cpp
View file @ 34bdf64a
...@@ -183,7 +183,7 @@ bool ClientField::OnEvent(const irr::SEvent& event) { ...@@ -183,7 +183,7 @@ bool ClientField::OnEvent(const irr::SEvent& event) {
break; break;
} }
case BUTTON_BGM: { case BUTTON_BGM: {
mainGame->soundManager->PlaySoundEffect(SoundManager::SFX::BUTTON); mainGame->imgVol->setImage(imageManager.tPlay);
if (mainGame->gameConf.enable_music) { if (mainGame->gameConf.enable_music) {
mainGame->gameConf.enable_music = false; mainGame->gameConf.enable_music = false;
mainGame->soundManager->StopBGM(); mainGame->soundManager->StopBGM();
...@@ -202,7 +202,6 @@ bool ClientField::OnEvent(const irr::SEvent& event) { ...@@ -202,7 +202,6 @@ bool ClientField::OnEvent(const irr::SEvent& event) {
mainGame->soundManager->PlayBGM(SoundManager::BGM::DUEL); mainGame->soundManager->PlayBGM(SoundManager::BGM::DUEL);
} }
} }
mainGame->imgVol->setImage(imageManager.tPlay);
break; break;
} }
case BUTTON_CHAIN_IGNORE: { case BUTTON_CHAIN_IGNORE: {
...@@ -1953,15 +1952,9 @@ bool ClientField::OnCommonEvent(const irr::SEvent& event) { ...@@ -1953,15 +1952,9 @@ bool ClientField::OnCommonEvent(const irr::SEvent& event) {
return true; return true;
break; break;
} }
case SCROLL_TAB_HELPER: { case SCROLL_SETTINGS: {
rect<s32> pos = mainGame->tabHelper->getRelativePosition(); rect<s32> pos = mainGame->wSettings->getRelativePosition();
mainGame->tabHelper->setRelativePosition(recti(0, mainGame->scrTabHelper->getPos() * -1, pos.LowerRightCorner.X, pos.LowerRightCorner.Y)); mainGame->wSettings->setRelativePosition(recti(0, mainGame->scrTabSystem->getPos() * -1, pos.LowerRightCorner.X, pos.LowerRightCorner.Y));
return true;
break;
}
case SCROLL_TAB_SYSTEM: {
rect<s32> pos = mainGame->tabSystem->getRelativePosition();
mainGame->tabSystem->setRelativePosition(recti(0, mainGame->scrTabSystem->getPos() * -1, pos.LowerRightCorner.X, pos.LowerRightCorner.Y));
return true; return true;
break; break;
} }
......
Classes/gframe/game.h
View file @ 34bdf64a
...@@ -821,8 +821,7 @@ private: ...@@ -821,8 +821,7 @@ private:
#define BUTTON_SHOW_LOG 367 #define BUTTON_SHOW_LOG 367
#define CHECKBOX_DRAW_FIELD_SPELL 368 #define CHECKBOX_DRAW_FIELD_SPELL 368
#define CHECKBOX_QUICK_ANIMATION 369 #define CHECKBOX_QUICK_ANIMATION 369
#define SCROLL_TAB_HELPER 370 #define SCROLL_SETTINGS 371
#define SCROLL_TAB_SYSTEM 371
#define CHECKBOX_MULTI_KEYWORDS 372 #define CHECKBOX_MULTI_KEYWORDS 372
#define CHECKBOX_PREFER_EXPANSION 373 #define CHECKBOX_PREFER_EXPANSION 373
#define CHECKBOX_DRAW_SINGLE_CHAIN 374 #define CHECKBOX_DRAW_SINGLE_CHAIN 374
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment