Commit fac6bef4 authored by fallenstardust's avatar fallenstardust

fix直接观战不隐藏wHostPrepare

parent befa60cc
...@@ -1107,7 +1107,11 @@ void Game::ShowElement(irr::gui::IGUIElement * win, int autoframe) { ...@@ -1107,7 +1107,11 @@ void Game::ShowElement(irr::gui::IGUIElement * win, int autoframe) {
fadingList.push_back(fu); fadingList.push_back(fu);
} }
void Game::HideElement(irr::gui::IGUIElement * win, bool set_action) { void Game::HideElement(irr::gui::IGUIElement * win, bool set_action) {
if(!win->isVisible() && !set_action) bool fading = false;
for(auto fit = fadingList.begin(); fit != fadingList.end(); ++fit)
if(win == fit->guiFading)
fading = true;
if(!win->isVisible() && !set_action && !fading)
return; return;
FadingUnit fu; FadingUnit fu;
fu.fadingSize = win->getRelativePosition(); fu.fadingSize = win->getRelativePosition();
......
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
"消失吧,杂鱼" "消失吧,杂鱼"
], ],
"ondirectattack": [ "ondirectattack": [
"爸爸,饶命",. "爸爸,饶命",
"恐怖如斯" "恐怖如斯"
], ],
"facedownmonstername": "怪兽", "facedownmonstername": "怪兽",
......
...@@ -8,7 +8,7 @@ android { ...@@ -8,7 +8,7 @@ android {
applicationId "cn.garymb.ygomobile" applicationId "cn.garymb.ygomobile"
minSdkVersion 21 minSdkVersion 21
targetSdkVersion 28 targetSdkVersion 28
versionCode 370100526 versionCode 370100528
versionName "3.7.1" versionName "3.7.1"
flavorDimensions "versionCode" flavorDimensions "versionCode"
vectorDrawables.useSupportLibrary = true vectorDrawables.useSupportLibrary = true
......
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