Skip to content

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

按钮抬起时关闭设置、消息记录

parent 11a4bc15
Show whitespace changes
Inline Side-by-side
Showing with 21 additions and 17 deletions
Classes/gframe/deck_con.cpp
View file @ a52ce076
...@@ -314,11 +314,13 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) { ...@@ -314,11 +314,13 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) {
break; break;
} }
case BUTTON_SETTINGS: { case BUTTON_SETTINGS: {
if (mainGame->imgSettings->isEnabled()) {
mainGame->soundManager->PlaySoundEffect(SoundManager::SFX::BUTTON); mainGame->soundManager->PlaySoundEffect(SoundManager::SFX::BUTTON);
if (mainGame->imgSettings->isPressed()) {
mainGame->ShowElement(mainGame->wSettings); mainGame->ShowElement(mainGame->wSettings);
mainGame->imgSettings->setPressed(true); mainGame->imgSettings->setPressed(true);
mainGame->imgSettings->setEnabled(false); } else {
mainGame->HideElement(mainGame->wSettings);
mainGame->imgSettings->setPressed(false);
} }
break; break;
} }
...@@ -326,15 +328,16 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) { ...@@ -326,15 +328,16 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) {
mainGame->soundManager->PlaySoundEffect(SoundManager::SFX::BUTTON); mainGame->soundManager->PlaySoundEffect(SoundManager::SFX::BUTTON);
mainGame->HideElement(mainGame->wSettings); mainGame->HideElement(mainGame->wSettings);
mainGame->imgSettings->setPressed(false); mainGame->imgSettings->setPressed(false);
mainGame->imgSettings->setEnabled(true);
break; break;
} }
case BUTTON_SHOW_LOG: { case BUTTON_SHOW_LOG: {
if (mainGame->imgLog->isEnabled()) {
mainGame->soundManager->PlaySoundEffect(SoundManager::SFX::BUTTON); mainGame->soundManager->PlaySoundEffect(SoundManager::SFX::BUTTON);
if (mainGame->imgLog->isPressed()) {
mainGame->ShowElement(mainGame->wLogs); mainGame->ShowElement(mainGame->wLogs);
mainGame->imgLog->setPressed(true); mainGame->imgLog->setPressed(true);
mainGame->imgLog->setEnabled(false); } else {
mainGame->HideElement(mainGame->wLogs);
mainGame->imgLog->setPressed(false);
} }
break; break;
} }
...@@ -342,7 +345,6 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) { ...@@ -342,7 +345,6 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) {
mainGame->soundManager->PlaySoundEffect(SoundManager::SFX::BUTTON); mainGame->soundManager->PlaySoundEffect(SoundManager::SFX::BUTTON);
mainGame->HideElement(mainGame->wLogs); mainGame->HideElement(mainGame->wLogs);
mainGame->imgLog->setPressed(false); mainGame->imgLog->setPressed(false);
mainGame->imgLog->setEnabled(true);
break; break;
} }
case BUTTON_EFFECT_FILTER: { case BUTTON_EFFECT_FILTER: {
......
Classes/gframe/event_handler.cpp
View file @ a52ce076
...@@ -163,11 +163,13 @@ bool ClientField::OnEvent(const irr::SEvent& event) { ...@@ -163,11 +163,13 @@ bool ClientField::OnEvent(const irr::SEvent& event) {
break; break;
} }
case BUTTON_SETTINGS: { case BUTTON_SETTINGS: {
if (mainGame->imgSettings->isEnabled()) {
mainGame->soundManager->PlaySoundEffect(SoundManager::SFX::BUTTON); mainGame->soundManager->PlaySoundEffect(SoundManager::SFX::BUTTON);
if (!mainGame->imgSettings->isPressed()) {
mainGame->ShowElement(mainGame->wSettings); mainGame->ShowElement(mainGame->wSettings);
mainGame->imgSettings->setPressed(true); mainGame->imgSettings->setPressed(true);
mainGame->imgSettings->setEnabled(false); } else {
mainGame->HideElement(mainGame->wSettings);
mainGame->imgSettings->setPressed(false);
} }
break; break;
} }
...@@ -175,15 +177,16 @@ bool ClientField::OnEvent(const irr::SEvent& event) { ...@@ -175,15 +177,16 @@ bool ClientField::OnEvent(const irr::SEvent& event) {
mainGame->soundManager->PlaySoundEffect(SoundManager::SFX::BUTTON); mainGame->soundManager->PlaySoundEffect(SoundManager::SFX::BUTTON);
mainGame->HideElement(mainGame->wSettings); mainGame->HideElement(mainGame->wSettings);
mainGame->imgSettings->setPressed(false); mainGame->imgSettings->setPressed(false);
mainGame->imgSettings->setEnabled(true);
break; break;
} }
case BUTTON_SHOW_LOG: { case BUTTON_SHOW_LOG: {
if (mainGame->imgLog->isEnabled()) {
mainGame->soundManager->PlaySoundEffect(SoundManager::SFX::BUTTON); mainGame->soundManager->PlaySoundEffect(SoundManager::SFX::BUTTON);
if (!mainGame->imgLog->isPressed()) {
mainGame->ShowElement(mainGame->wLogs); mainGame->ShowElement(mainGame->wLogs);
mainGame->imgLog->setPressed(true); mainGame->imgLog->setPressed(true);
mainGame->imgLog->setEnabled(false); } else {
mainGame->HideElement(mainGame->wLogs);
mainGame->imgLog->setPressed(false);
} }
break; break;
} }
...@@ -191,7 +194,6 @@ bool ClientField::OnEvent(const irr::SEvent& event) { ...@@ -191,7 +194,6 @@ bool ClientField::OnEvent(const irr::SEvent& event) {
mainGame->soundManager->PlaySoundEffect(SoundManager::SFX::BUTTON); mainGame->soundManager->PlaySoundEffect(SoundManager::SFX::BUTTON);
mainGame->HideElement(mainGame->wLogs); mainGame->HideElement(mainGame->wLogs);
mainGame->imgLog->setPressed(false); mainGame->imgLog->setPressed(false);
mainGame->imgLog->setEnabled(true);
break; break;
} }
case BUTTON_BGM: { case BUTTON_BGM: {
......
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