diff --git a/Assets/BingoBrain/Harmony/GameHelper.cs b/Assets/BingoBrain/Harmony/GameHelper.cs index 85256c7..43e2bfd 100644 --- a/Assets/BingoBrain/Harmony/GameHelper.cs +++ b/Assets/BingoBrain/Harmony/GameHelper.cs @@ -1658,7 +1658,7 @@ namespace BingoBrain } public static bool isRDExchangeMode() { - return false;//zhushi + // return false;//zhushi return SaveData.GetSaveobject().ExchangeModeToggle == 1; } public static string getDesByKey(string key) diff --git a/Assets/BingoBrain/ModuleUI/BingoHall/BingoHallUI.cs b/Assets/BingoBrain/ModuleUI/BingoHall/BingoHallUI.cs index 96fbacf..86e2e2e 100644 --- a/Assets/BingoBrain/ModuleUI/BingoHall/BingoHallUI.cs +++ b/Assets/BingoBrain/ModuleUI/BingoHall/BingoHallUI.cs @@ -197,6 +197,7 @@ namespace BingoBrain { UICtrlDispatcher.Instance.Dispatch(SkinInfo.H5UI_Open); }); + if (SaveData.GetSaveobject().PettyState == 0) UICtrlDispatcher.Instance.Dispatch(SkinInfo.PettyAwardUI_Open); } private void UpdateNextCardBoardTime() diff --git a/Assets/BingoBrain/ModuleUI/BingoToy/BingoToyUI.cs b/Assets/BingoBrain/ModuleUI/BingoToy/BingoToyUI.cs index ee6ed59..9d8de29 100644 --- a/Assets/BingoBrain/ModuleUI/BingoToy/BingoToyUI.cs +++ b/Assets/BingoBrain/ModuleUI/BingoToy/BingoToyUI.cs @@ -134,6 +134,7 @@ namespace BingoBrain item.quantityA[GameHelper.GetDynamicIndex(item.wheel_itemA)]); PreferencesMgr.Instance.VidelWheelLst.Add( item.quantityB[GameHelper.GetDynamicIndex(item.wheel_itemB)]); + Debug.Log(GameHelper.GetDynamicIndex(item.wheel_itemB)); } PreferencesMgr.Instance.SaveFerrWheelLst(); diff --git a/Assets/BingoBrain/ModuleUI/SaveData.cs b/Assets/BingoBrain/ModuleUI/SaveData.cs index 588c5b1..987ebe5 100644 --- a/Assets/BingoBrain/ModuleUI/SaveData.cs +++ b/Assets/BingoBrain/ModuleUI/SaveData.cs @@ -17,11 +17,19 @@ namespace BingoBrain { string jsonstr = File.ReadAllText(jsonFilePath); saveobject = JsonConvert.DeserializeObject(jsonstr); + Debug.Log("saveobject.uid" + saveobject.uid); + Debug.Log("login.uid" + GameHelper.GetLoginModel().uid); + if (saveobject.uid != GameHelper.GetLoginModel().uid && GameHelper.GetLoginModel().uid != 0) + { + saveobject = new Saveobject(); + saveobject.uid = GameHelper.GetLoginModel().uid; + } return saveobject; } else { saveobject = new Saveobject(); + saveobject.uid = GameHelper.GetLoginModel().uid; return saveobject; } } @@ -112,6 +120,7 @@ namespace BingoBrain { + public long uid; public bool is_get_battlepass = false; public List battle_pass_freelist = new List(); public List battle_pass_paylist = new List();