fix：1、修复bug

Assets/Scripts/ModuleUI/ArrowGame/ArrowGameUI.cs

@@ -9,6 +9,7 @@ using FGUI.Arrow_game;
 using FGUI.Common_01;
 using IgnoreOPS;
 using UnityEngine;
+using btn_saveingpot = FGUI.Common_01.btn_saveingpot;
 using Random = UnityEngine.Random;
 
 namespace ChillConnect
@@ -347,6 +348,17 @@ namespace ChillConnect
 
         protected override void OnOpenBefore(object args)
         {
+            if (Screen.safeArea.y != 0)
+            {//刘海屏
+                ui.panel.y += Screen.safeArea.y - 15;
+                ui.com_money.y += Screen.safeArea.y- 15;
+                ui.com_gem.y += Screen.safeArea.y - 15;
+                ui.btn_signin.y += Screen.safeArea.y - 15;
+            }
+
+            ui.state.selectedIndex = GameHelper.IsGiftSwitch() ? 1 : 0;
+            
+            
             //加载配置
             // InitAllLevelData();
             LoadLevelConfig();
@@ -365,6 +377,48 @@ namespace ChillConnect
             InitView();
             
             ((com_money)ui.com_money).btn_ch.title = GameHelper.getDesByKey("ch_out_1");
+            
+            if (GameHelper.IsGiftSwitch() && ConfigSystem.GetConfig<CommonModel>().PiggyBankSwitch == 1)
+            {
+                ui.btn_saveingpot.visible = true;
+                ui.com_gift.visible =  true;
+            }
+            
+            GameHelper.IsShowFirstReward();
+            
+            GameHelper.ShowStatementView();
+        }
+
+        private void RefreshGift(object obj = null)
+        {
+            ui.com_gift.text_gift.text = GameHelper.Get102Str((decimal)SaveData.GetSaveObject().saveingpot_ch);
+        }    
+
+        private void Set101(decimal coin = -1)
+        {
+            if (coin < 0)
+            {
+                coin = DataMgr.Coin.Value;
+            }
+
+            if (ui.com_gem is com_gold btnCoin) btnCoin.text_gold.text = $"{coin:N0}";
+        }
+
+        private void Set102()
+        {
+            decimal coin = DataMgr.Ticket.Value;
+
+            if (ui.com_money is com_money comMoney) comMoney.text_gold.text = coin.ToString("0.00");
+        }
+        
+        public void OnUpdate101(object obj = null)
+        {
+            Set101();
+        }
+
+        public void OnUpdate102(object obj = null)
+        {
+            Set102();
         }
 
         protected override void OnOpen(object args)
@@ -390,6 +444,7 @@ namespace ChillConnect
             GameDispatcher.Instance.AddListener(GameMsg.UpdateSpeed, SetSpeed);
             GameDispatcher.Instance.AddListener(GameMsg.UseProps, SetUserPorp);
             GameDispatcher.Instance.AddListener(GameMsg.StopArrowTouch,OpenOrStopGameInput);
+            GameDispatcher.Instance.AddListener(GameMsg.refreshGift,RefreshGift);
             
         }
 
@@ -402,6 +457,8 @@ namespace ChillConnect
             GameDispatcher.Instance.RemoveListener(GameMsg.UpdateSpeed, SetSpeed);
             GameDispatcher.Instance.RemoveListener(GameMsg.UseProps, SetUserPorp);
             GameDispatcher.Instance.RemoveListener(GameMsg.StopArrowTouch, OpenOrStopGameInput);
+            GameDispatcher.Instance.RemoveListener(GameMsg.refreshGift,RefreshGift);
+            
             
             
             
@@ -487,6 +544,10 @@ namespace ChillConnect
             SetModel();
 
             SetTopCurr();
+
+            Set101();
+            
+            RefreshGift();
             
             _fingerTipObj = com_finger.CreateInstance();
             _viewContainer.AddChild(_fingerTipObj);
@@ -563,6 +624,12 @@ namespace ChillConnect
                 uiCtrlDispatcher.Dispatch(UICtrlMsg.PersonViewUI_Open, _moveSpeed);
             });
             
+            if (!GameHelper.IsGiftSwitch() && ConfigSystem.GetConfig<CommonModel>().WVswitch == 0)
+            {
+                ui.btn_wv.visible = false;
+            }
+            ui.btn_wv.SetClick(() => { uiCtrlDispatcher.Dispatch(UICtrlMsg.H5UI_Open); });
+            
             ui.com_bottom.btn_skin.SetClick(() => { uiCtrlDispatcher.Dispatch(UICtrlMsg.ArrowThemeUI_Open); });
             
             ui.btn_petty.SetClick(() => { uiCtrlDispatcher.Dispatch(UICtrlMsg.PettyAwardUI_Open); });
@@ -572,6 +639,8 @@ namespace ChillConnect
             ui.btn_statement.SetClick(() => { uiCtrlDispatcher.Dispatch(UICtrlMsg.StatementViewUI_Open); });
             
             ui.btn_saveingpot.SetClick(() => { uiCtrlDispatcher.Dispatch(UICtrlMsg.SaveingPotUI_Open); });
+            
+            ui.com_gift.SetClick(() => { uiCtrlDispatcher.Dispatch(UICtrlMsg.SaveingPotUI_Open); });
         }
         
 
@@ -1883,12 +1952,15 @@ namespace ChillConnect
         /// </summary>
         private void DisappearLineGetReward()
         { 
+            
+            if (!GameHelper.IsGiftSwitch()) return;
+            
             bool isGet = false;
                 
             int money_rate = ConfigSystem.GetConfig<CommonModel>().rewardrate;
             var randomNum = UnityEngine.Random.Range(0, 100);
             // Debug.Log($"[creat]  money_rate------------ {randomNum}==={money_rate}");
-            if (GameHelper.IsGiftSwitch() && randomNum < money_rate)
+            if (randomNum < money_rate)
             {
                 isGet = true;
                 

Assets/Scripts/ModuleUI/ArrowGame/ArrowGameUICtrl.cs

@@ -51,12 +51,32 @@ namespace ChillConnect
         {
             uiCtrlDispatcher.AddListener(openUIMsg, OpenUI);
             uiCtrlDispatcher.AddListener(closeUIMsg, CloseUI);
+            
+            GameDispatcher.Instance.AddListener(GameMsg.Update101, OnUpdate101);
+            GameDispatcher.Instance.AddListener(GameMsg.Update102, OnUpdate102);
         }
         protected override void RemoveListener()
         {
             uiCtrlDispatcher.RemoveListener(openUIMsg, OpenUI);
             uiCtrlDispatcher.RemoveListener(closeUIMsg, CloseUI);
+            
+            GameDispatcher.Instance.RemoveListener(GameMsg.Update101, OnUpdate101);
+            GameDispatcher.Instance.RemoveListener(GameMsg.Update102, OnUpdate102);
+
         }
+        
+        private void OnUpdate101(object obj)
+        {
+            ui?.OnUpdate101(obj);
+        }
+        
+
+        private void OnUpdate102(object obj)
+        {
+            ui?.OnUpdate102(obj);
+        }
+
+
 
         protected override void AddServerListener()
         {

Assets/Scripts/ModuleUI/ArrowTips/ArrowTipsUI.cs

@@ -21,7 +21,7 @@ namespace ChillConnect
         {
             uiInfo.packageName = "Arrow_game";
             uiInfo.assetName = "com_tips";
-            uiInfo.layerType = UILayerType.Loading;
+            uiInfo.layerType = UILayerType.Popup;
             uiInfo.isNeedUIMask = true;
             uiInfo.isNeedOpenAnim = true;
             uiInfo.isNeedCloseAnim = true;
@@ -36,6 +36,9 @@ namespace ChillConnect
             GameDispatcher.Instance.Dispatch(GameMsg.StopArrowTouch, true);
             
             CommonHelper.FadeOut(ui);
+            
+            HallManager.Instance.UpdateSecondEvent -= UpdateCd;
+            
         }
 
         protected override void OnBind()
@@ -43,12 +46,19 @@ namespace ChillConnect
             ui = baseUI as com_tips;
         }
 
+        private int state_;
         protected override void OnOpenBefore(object args)
         {
             GameDispatcher.Instance.Dispatch(GameMsg.StopArrowTouch, false);
             
             if (args != null)
+            {
                 InitView((int)args);
+                state_ = (int)args + 5;
+            }
+            
+            HallManager.Instance.UpdateSecondEvent += UpdateCd;
+            UpdateCd();
         }
 
         protected override void OnOpen(object args)
@@ -79,7 +89,7 @@ namespace ChillConnect
                     if (isSuccess)
                     {
                         Debug.Log($"isSuccess tips state = {state} ");
-                        
+                        GameHelper.SetWatchCd(state_);
                         GameDispatcher.Instance.Dispatch(GameMsg.UseProps, state);
                         CtrlCloseUI();
                     }
@@ -88,5 +98,24 @@ namespace ChillConnect
             
             ui.btn_close.SetClick(CtrlCloseUI);
         }
+        
+        
+        private void UpdateCd()
+        {  
+            var btnWatch = ui.btn_watch ;
+            // Debug.Log($"DataMgr.NewWatchCd.Value[state_ + 2]==={DataMgr.NewWatchCd.Value[state_ + 2]}");
+            if (DataMgr.NewWatchCd.Value[state_] > Convert.ToInt32(GameHelper.GetNowTime()))
+            {
+                btnWatch.enabled = false;
+                btnWatch.can.selectedIndex = 1;
+                btnWatch.text.text = CommonHelper.TimeFormat(DataMgr.NewWatchCd.Value[state_] - Convert.ToInt32(GameHelper.GetNowTime()), CountDownType.Hour);
+            }
+            else
+            {
+                ui.btn_watch.enabled = true;
+                btnWatch.can.selectedIndex = 0;
+                btnWatch.text.text = "Use Item";
+            }
+        }
     }
 }

Assets/Scripts/ModuleUI/Broadcast/BroadcastUI.cs

@@ -193,7 +193,7 @@ namespace ChillConnect
                     name = name[..4] + "...";
                 }
                 // text_ui.hide_text.text = GameHelper.getDesByKey("makeup_4");
-                var money_text = GameHelper.getChString(decimal.Parse(config_money_list[money_index]));
+                var money_text = GameHelper.Get102Str(decimal.Parse(config_money_list[money_index]));
                 string broad_text = String.Format(GameHelper.getDesByKey("makeup_4"), name, money_text, DateTimeManager.Instance.GetCurrDateTime());
                 text_ui.cast_text.text = broad_text;
                 ui.t0.Play();

Assets/Scripts/ModuleUI/MakeupConfirm/MakeupConfirmUI.cs

@@ -625,15 +625,15 @@ namespace ChillConnect
                 return;
             }
 
-            ui.text_condi1.text = GameHelper.getChString(vo.item_need);
+            ui.text_condi1.text = GameHelper.getChNumber(vo.item_need);
             ui.pb_condi1.max = vo.item_need;
-            ui.text_ch_number.text = GameHelper.getChString(DataMgr.Ticket.Value);
+            ui.text_ch_number.text = GameHelper.getChNumber(DataMgr.Ticket.Value);
             var curValue = Math.Min(DataMgr.Ticket.Value, vo.item_need);
             ui.pb_condi1.value = (double)curValue;
             var textTitle = ui.pb_condi1.GetChild("title");
             if (textTitle != null)
             {
-                textTitle.text = GameHelper.getChString(curValue) + "/" + GameHelper.getChString(vo.item_need);
+                textTitle.text = GameHelper.getChNumber(curValue) + "/" + GameHelper.getChNumber(vo.item_need);
             }
 
             var taskTime = (int)((float)vo.task_need / 60 * 100) * 0.01F;
@@ -987,7 +987,7 @@ namespace ChillConnect
         {
             com_ticket_item item = (com_ticket_item)obj;
 
-            item.lab_num.text = GameHelper.getPrice(makeupTaskData.rdData[index].coupon_mount);
+            item.lab_num.text = GameHelper.GetPriceInt(makeupTaskData.rdData[index].coupon_mount);
 
             if (makeupTaskData.rdData[index].isClaimed)
             {

Assets/Scripts/ModuleUI/PettyAward/PettyAwardUI.cs

@@ -302,7 +302,7 @@ namespace ChillConnect
                 SaveData.GetSaveObject().PettyDataLimit = day;
             }
             
-            if (!IsPettyDataExpired())
+            if (IsPettyDataExpired())
             {
                 ui.com_detail.btn_redeem.visible = true;
                 ui.com_detail.btn_redeem.SetClick(() =>

Assets/Scripts/ModuleUI/RedeemCode/RedeemCodeUI.cs

@@ -20,7 +20,7 @@ namespace ChillConnect
         {
             uiInfo.packageName = "tixian";
             uiInfo.assetName = "com_redeem_code";
-            uiInfo.layerType = UILayerType.Loading;
+            uiInfo.layerType = UILayerType.Popup;
             uiInfo.isNeedOpenAnim = true;
             uiInfo.isNeedCloseAnim = true;
             uiInfo.isNeedUIMask = true;

Assets/Scripts/ModuleUI/Reward/RewardUI.cs

@@ -103,7 +103,7 @@ namespace ChillConnect
             }
             else
             {
-                ui.btn_collect.title ="(" + "Claim(<img src='ui://o9974uc5k1oncy'/>" + GameHelper.Get101Str((decimal)value) + ")";
+                ui.btn_collect.title ="Claim(<img src='ui://o9974uc5npswda'/>" + GameHelper.Get101Str((decimal)value) + ")";
             }
             DOVirtual.DelayedCall(0.2f, () =>
             {
@@ -164,7 +164,7 @@ namespace ChillConnect
             }
             cash_num = value;
 
-            var src = GameHelper.IsGiftSwitch() ? "(" : "(<img src='ui://o9974uc5cou6b8'/>";
+            var src = GameHelper.IsGiftSwitch() ? "(" : "(<img src='ui://o9974uc5npswda'/>";
             (ui.wheel.GetChild("wheel_") as wheel_).t0.Play(Scroll);
             (ui.wheel.GetChild("wheel_") as wheel_).t1.Play(() =>
             {
@@ -189,7 +189,7 @@ namespace ChillConnect
         }
         void setItemUrl(GLoader loader, int urltype)
         {
-            if (urltype == 0) loader.url = "ui://ZM_Common_01/cards_gold";  //jinbi
+            if (urltype == 0) loader.url = "ui://ZM_Common_01/gem_small";  //jinbi
             else if (urltype == 1) loader.url = "ui://Common_01/spin_remove";   //yichu
             else if (urltype == 2) loader.url = "ui://Common_01/spin_undo";   //chehui
             else if (urltype == 3) loader.url = "ui://Common_01/spin_refresh";  //shuaxin
@@ -298,7 +298,7 @@ namespace ChillConnect
                 var src = "(";
                 var rewards = GameHelper.Get102Str((decimal)cash_num * boost_array[rate_idnex % boost_array.Length]);
                 if (!GameHelper.IsGiftSwitch()){
-                    src = "(<img src='ui://o9974uc5cou6b8'/>";
+                    src = "(<img src='ui://o9974uc5npswda'/>";
                     rewards = GameHelper.Get101Str((decimal)cash_num * boost_array[rate_idnex % boost_array.Length]);
                 }
                 
@@ -357,7 +357,7 @@ namespace ChillConnect
                 //     return;
                 // }
 
-                var src = GameHelper.IsGiftSwitch() ? "(" : "(<img src='ui://o9974uc5cou6b8'/>";
+                var src = GameHelper.IsGiftSwitch() ? "(" : "(<img src='ui://o9974uc5npswda'/>";
             (ui.wheel.GetChild("wheel_") as wheel_).t1.Play(() =>
                 {
                     rate_idnex++;

Assets/Scripts/ModuleUI/SaveingPot/SaveingPotUI.cs

@@ -55,6 +55,7 @@ namespace ChillConnect
             AdRedeemManager.Instance.Destroy();
             HallManager.Instance.UpdateSecondEvent -= updateSpeedCD;
             HallManager.Instance.UpdateSecondEvent -= Update;
+            HallManager.Instance.UpdateSecondEvent -= upLvWatchAdsBtn;
             closeCallback?.Invoke();
             // WebviewManager.ShezhiACT(true);
             WebviewManager.Instance.SetDarkThough(true);
@@ -113,6 +114,9 @@ namespace ChillConnect
             HallManager.Instance.UpdateSecondEvent += Update;
             updateSpeedCD();
             InitBroadCast();
+            
+            HallManager.Instance.UpdateSecondEvent += upLvWatchAdsBtn;
+            upLvWatchAdsBtn();
 
         }
 
@@ -171,30 +175,34 @@ namespace ChillConnect
                 Debug.Log("iiiiiiiiiiiiiiiiiiiii");
                 if (SaveData.GetSaveObject().saveingpot_ch < makeupTaskData.amount)
                 {
-                    ui.btn_ch.title = "Go";
+                    ((btn_watchAd)ui.btn_ch).watch.text = "Go";
                     ui.btn_ch.SetClick(() =>
                     {
-                        // if (UIManager.Instance.IsExistUI(UIConst.HallUI))
-                        // {
-                        //     GameDispatcher.Instance.Dispatch(GameMsg.MainTab, 1);
-                        // }
-                        // else
-                        // {
-                        //     buygoldParam param = new buygoldParam()
-                        //     {
-                        //         isShow1 = false,
-                        //         is_in_game = true
-                        //     };
-                        //     UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.BuygoldUI_Open, param);
-                        // }
-                        CtrlCloseUI();
+                        GameHelper.ShowVideoAd("SaveingPotAd", isSuccess =>
+                        {
+                            if (isSuccess)
+                            {
+                                var ad_times = Convert.ToInt32(GameHelper.GetNowTime());
+                                SaveData.GetSaveObject()._watch_ad_cd = ad_times + GameHelper.GetCommonModel().exchangeCD;
+
+                                btn_watchAd btnWatchad = ui.btn_ch as btn_watchAd;
+                                btnWatchad.enabled = false;
+                                btnWatchad.can_buy.selectedIndex = 1;
+                                btnWatchad.btn_text.text = CommonHelper.TimeFormat(SaveData.GetSaveObject()._watch_ad_cd - Convert.ToInt32(GameHelper.GetNowTime()), CountDownType.Hour);
+                                HallManager.Instance.UpdateSecondEvent += upLvWatchAdsBtn;
+                                InitView();
+                            }
+                        });
                     });
 
                 }
-
                 else
                 {
-                    ui.btn_ch.SetClick(() =>
+                    btn_watchAd btnWatchad = ui.btn_ch as btn_watchAd;
+                    btnWatchad.enabled = true;
+                    btnWatchad.buy_state.selectedIndex = 1;
+                    btnWatchad.title = "GET GIFT CARD";
+                    btnWatchad.SetClick(() =>
                     {
                         makeupTaskData.needShowAni = false;
                         SaveData.saveDataFunc();
@@ -305,9 +313,37 @@ namespace ChillConnect
                 ui.btn_watch.enabled = true;
                 ui.btn_watch.show_cd.selectedIndex = 0;
             }
-
         }
 
+        private void upLvWatchAdsBtn()
+        {
+            var lastAdTimes = SaveData.GetSaveObject()._watch_ad_cd;
+            btn_watchAd btn_watchad = ui.btn_ch as btn_watchAd;
+            btn_watchad.img_saveingpot.visible = false;
+
+            if (SaveData.GetSaveObject().saveingpot_ch >= makeupTaskData.amount)
+            {
+                HallManager.Instance.UpdateSecondEvent -= upLvWatchAdsBtn;
+                InitView();
+                return;
+            }
+
+            if (GameHelper.GetNowTime() < lastAdTimes)
+            {
+                btn_watchad.enabled = false;
+                btn_watchad.can_buy.selectedIndex = 1;
+                btn_watchad.btn_text.text = CommonHelper.TimeFormat(lastAdTimes - Convert.ToInt32(GameHelper.GetNowTime()), CountDownType.Hour);
+            }
+            else
+            {
+                HallManager.Instance.UpdateSecondEvent -= upLvWatchAdsBtn;
+                btn_watchad.enabled = true;
+                btn_watchad.can_buy.selectedIndex = 0;
+                if (GameHelper.IsGiftSwitch() && ConfigSystem.GetConfig<CommonModel>().PiggyBankSwitch == 1) btn_watchad.img_saveingpot.visible = true;
+            }
+        }
+        
+
         private void OnInline()
         {
             CheckBtnWatchStatus();
@@ -513,7 +549,7 @@ namespace ChillConnect
         private void refreshItem(int index, GObject obj)
         {
             com_ticket_item item = (com_ticket_item)obj;
-            item.lab_num.text = GameHelper.getPrice(makeupTaskData.rdData[index].coupon_mount);
+            item.lab_num.text = GameHelper.GetPriceInt(makeupTaskData.rdData[index].coupon_mount);
 
             if (makeupTaskData.rdData[index].isClaimed)
             {
@@ -733,6 +769,8 @@ namespace ChillConnect
                                  // DataMgr.MakeupTaskHistory.Save();
                                  //OnInline();
                                  SaveData.GetSaveObject().saveingpot_ch -= vo.item_need;
+                                 GameDispatcher.Instance.Dispatch(GameMsg.refreshGift);
+                                 
                                  SaveingPotHelper.CreatSaveingPotItem();
                                  //  Debug.Log(JsonConvert.SerializeObject(vo));
                                  if (vo.id == 1)
@@ -815,7 +853,7 @@ namespace ChillConnect
                     return;
                 }
                 DataMgr.ExchangeAccount.Value= account;
-                DataMgr.ExchangeName  .Value= $"{fname} {lname}";
+                DataMgr.ExchangeName.Value= $"{fname} {lname}";
                 DataMgr.short_name = fname;
                 DataMgr.long_name = lname;
                 showPaypal();
@@ -834,7 +872,7 @@ namespace ChillConnect
             }
 
 
-            ui.com_pay.text_name.text = DataMgr.ExchangeName .Value;
+            ui.com_pay.text_name.text = DataMgr.ExchangeName.Value;
             ui.com_pay.text_email.text = DataMgr.ExchangeAccount.Value;
 
             ui.com_pay.btn_change.SetClick(() =>
@@ -875,7 +913,7 @@ namespace ChillConnect
 
             for (int i = 0; i < btn_list.Count; i++)
             {
-                btn_list[i].text_ch.text = "$" + (int)makeup_list[i].item_need;
+                btn_list[i].text_ch.text = makeup_list[i].item_need + "";
                 Debug.Log(makeup_list[i].item_need);
                 btn_list[i].index.selectedIndex = i;
                 if (i >= saveingpot_history.Count)

Assets/Scripts/ModuleUI/SignInView/SignInViewUI.cs

@@ -140,6 +140,7 @@ namespace ChillConnect
                 btnSign.day.selectedIndex = 1;
                 btnSign.reward_num1.text = GameHelper.Get101Str(reward.quantity[1]);
                 setItemUrl(btnSign.loader_icon0, reward.rewards_type[1]);
+                btnSign.x = 300;
             }
             btnSign.anim_sign.visible = false;