diff --git a/Assets/BingoBrain/FGUI/Package/JRewardPop/com_extraItem.cs b/Assets/BingoBrain/FGUI/Package/JRewardPop/com_extraItem.cs index ac8e943..8f8a2cd 100644 --- a/Assets/BingoBrain/FGUI/Package/JRewardPop/com_extraItem.cs +++ b/Assets/BingoBrain/FGUI/Package/JRewardPop/com_extraItem.cs @@ -11,6 +11,8 @@ namespace FGUI.JRewardPop public Controller curr_type; public GTextField txt_title; public GButton closeButton; + public GImage img_diamond; + public GImage img_ch; public GTextField text_num; public com_roll com_roll; public GButton btn_more; @@ -31,11 +33,13 @@ namespace FGUI.JRewardPop curr_type = GetControllerAt(1); txt_title = (GTextField)GetChildAt(3); closeButton = (GButton)GetChildAt(4); - text_num = (GTextField)GetChildAt(8); - com_roll = (com_roll)GetChildAt(9); - btn_more = (GButton)GetChildAt(10); - text_cardnum = (GTextField)GetChildAt(13); - btn_claim = (btn_claim)GetChildAt(16); + img_diamond = (GImage)GetChildAt(6); + img_ch = (GImage)GetChildAt(7); + text_num = (GTextField)GetChildAt(9); + com_roll = (com_roll)GetChildAt(10); + btn_more = (GButton)GetChildAt(11); + text_cardnum = (GTextField)GetChildAt(14); + btn_claim = (btn_claim)GetChildAt(17); } } } \ No newline at end of file diff --git a/Assets/BingoBrain/Harmony/GameHelper.cs b/Assets/BingoBrain/Harmony/GameHelper.cs index 84780c4..267e00a 100644 --- a/Assets/BingoBrain/Harmony/GameHelper.cs +++ b/Assets/BingoBrain/Harmony/GameHelper.cs @@ -1659,10 +1659,10 @@ namespace BingoBrain } public static bool isRDExchangeMode() { - // return false;//zhushi + return false;//zhushi return true;//zhushi return SaveData.GetSaveobject().ExchangeModeToggle == 1; - } + } public static string getDesByKey(string key) { Debug.Log(key); diff --git a/Assets/BingoBrain/Manager/Hall.cs b/Assets/BingoBrain/Manager/Hall.cs index f0c8993..8691563 100644 --- a/Assets/BingoBrain/Manager/Hall.cs +++ b/Assets/BingoBrain/Manager/Hall.cs @@ -121,7 +121,7 @@ namespace BingoBrain if (GameHelper.IsGiftSwitch()) { UICtrlDispatcher.Instance.Dispatch(SkinInfo.BroadcastUI_Open); - if (PlayerPrefs.GetInt("first_", 0) != 1) + if (PlayerPrefs.GetInt("first_uid", 0) != GameHelper.GetLoginModel().uid) { UICtrlDispatcher.Instance.Dispatch(SkinInfo.FirstRewardUI_Open); } diff --git a/Assets/BingoBrain/ModuleUI/ExtraItem/ExtraItemUI.cs b/Assets/BingoBrain/ModuleUI/ExtraItem/ExtraItemUI.cs index 290793a..bd878c6 100644 --- a/Assets/BingoBrain/ModuleUI/ExtraItem/ExtraItemUI.cs +++ b/Assets/BingoBrain/ModuleUI/ExtraItem/ExtraItemUI.cs @@ -130,9 +130,11 @@ namespace BingoBrain GameHelper.DelayedShowGObject(this, ui.closeButton, ui.btn_claim); } - if ( ConfigSystem.GetConfig().PiggyBankSwitch == 1) ui.btn_more.GetChild("img_saveingpot").visible = true; + if (ConfigSystem.GetConfig().PiggyBankSwitch == 1) ui.btn_more.GetChild("img_saveingpot").visible = true; } } + if (GameHelper.IsGiftSwitch()) ui.img_diamond.visible = false; + else ui.img_ch.visible = false; } private void OpenCloseClick(bool val) @@ -145,7 +147,7 @@ namespace BingoBrain private void OnBtnClaimClick() { // GameHelper.ShowInterstitial("interstitial_skipAd"); - GameHelper.addInterAdnumber(); + GameHelper.addInterAdnumber(); OpenCloseClick(false); if (data.cont_index == ui._Extra_extraball) { diff --git a/Assets/BingoBrain/ModuleUI/FirstReward/FirstRewardUI.cs b/Assets/BingoBrain/ModuleUI/FirstReward/FirstRewardUI.cs index e057d5d..9ad1318 100644 --- a/Assets/BingoBrain/ModuleUI/FirstReward/FirstRewardUI.cs +++ b/Assets/BingoBrain/ModuleUI/FirstReward/FirstRewardUI.cs @@ -147,7 +147,7 @@ namespace BingoBrain // value => { ui.money.GetChild("text_gold").text = GameHelper.Get101Str((decimal)value); }); // SaveData.GetSaveobject().IsGetFirstReward = true; // SaveData.saveDataFunc(); - PlayerPrefs.SetInt("first_", 1); + PlayerPrefs.SetInt("first_uid", (int)GameHelper.GetLoginModel().uid); DOVirtual.DelayedCall(1f, () => { UICtrlDispatcher.Instance.Dispatch(SkinInfo.FirstRewardUI_Close); diff --git a/Assets/Resources/AssetHotFix/FGUI/JRewardPop_fui.bytes b/Assets/Resources/AssetHotFix/FGUI/JRewardPop_fui.bytes index 8c8f0a4..c77255a 100644 Binary files a/Assets/Resources/AssetHotFix/FGUI/JRewardPop_fui.bytes and b/Assets/Resources/AssetHotFix/FGUI/JRewardPop_fui.bytes differ