h5sdk提交

2026-07-06 16:31:08 +08:00
parent 761e670f01
commit 3c0298f19f
1183 changed files with 107360 additions and 42666 deletions
@@ -5,6 +5,7 @@ using BingoBrain.Core;
 using BingoBrain.HotFix;
 using FGUI.JBingoPlay;
 using System.Collections.Generic;
+using DontConfuse;

 namespace BingoBrain
 {
@@ -51,6 +52,7 @@ namespace BingoBrain
                ui?.fx_show.Stop();
                OnClearTween();
            });
+            WebviewManager.Instance.SetDarkThough(true);
        }

        protected override void OnBind()
@@ -77,6 +79,7 @@ namespace BingoBrain

        protected override void OnOpenBefore(object args)
        {
+            WebviewManager.Instance.SetDarkThough(false);
            InitView();
        }

@@ -166,7 +169,7 @@ namespace BingoBrain

            GameHelper.GetVideo("reward_extraFlip", isSuccess =>
            {
-                 if (isSuccess)
+                if (isSuccess)
                {
                    var adwardModel = GameHelper.GetConfig<AdRewardModel>();
                    MaxClickNum = Mathf.Clamp(MaxClickNum + adwardModel.GetData("reward_extraFlip").rewardAmount,
@@ -230,11 +233,6 @@ namespace BingoBrain

        private void ClickContinueBtn()
        {
-            if (!canClick)
-            {
-                return;
-            }
-
            OpenAll();
        }

@@ -331,9 +329,7 @@ namespace BingoBrain
                        var tw1 = DOVirtual.DelayedCall(0.3f, () => { canClick = true; });
                        tweenerQueue.Enqueue(tw1);
                    });
-                    rewardData.condition = GameHelper.IsCanGuide() ? RewardCondition.None : RewardCondition.AD;
-                    rewardData.displayType =
-                        RewardDisplayType.Dialog | RewardDisplayType.RewardFly | RewardDisplayType.ValueChange;
+                    rewardData.displayType = RewardDisplayType.RewardFly | RewardDisplayType.ValueChange;
                    GameDispatcher.Instance.Dispatch(BingoInfo.GetReward, rewardData);
                }
                else
@@ -54,15 +54,15 @@ namespace BingoBrain
            // {
            //     var skeletal = sk;
            //     var goWrapper = new GoWrapper(skeletal.gameObject);
-            //     // ui.com_endPop.gp_fx.SetNativeObject(goWrapper);
+            //     ui.com_endPop.gp_fx.SetNativeObject(goWrapper);
            //     skeletal.transform.localScale = Vector3.one * 110;
            //     skeletal.state.SetAnimation(0, "animation", true);
-            //     // closeCb += () =>
-            //     // {
-            //     //     goWrapper.wrapTarget = null;
-            //     //     ui.com_endPop.gp_fx.SetNativeObject(null);
-            //     //     FX.Instance.RecFx(Fx_Type.spine_reward, skeletal);
-            //     // };
+            //     closeCb += () =>
+            //     {
+            //         goWrapper.wrapTarget = null;
+            //         ui.com_endPop.gp_fx.SetNativeObject(null);
+            //         FX.Instance.RecFx(Fx_Type.spine_reward, skeletal);
+            //     };
            // });
        }

@@ -91,7 +91,8 @@ namespace BingoBrain
        {
            CtrlCloseUI();
            GameDispatcher.Instance.Dispatch(BingoInfo.EndBingoGame, true);
-             GameHelper.ShowInterstitial("interstitial_endgameAd");
+            //  GameHelper.addInterAdnumber("interstitial_endgameAd");
+             GameHelper.addInterAdnumber();
        }

        #endregion
@@ -67,11 +67,6 @@ namespace BingoBrain
        protected override void OnOpenBefore(object args)
        {
            InitView();
-            Set101();
-            Set102();
-            SetName();
-            ui.settings.SetClick(OnClickSetting);
-            // ui.com_avatar.loader_flag.visible = false;
            // if (!GameHelper.IsGiftSwitch() && (ConfigSystem.GetConfig<CommonModel>().WVswitch == 1))
            // {
            //     ui.btn_h5.visible = true;
@@ -83,57 +78,7 @@ namespace BingoBrain
            // });

        }
-        private void OnClickSetting()
-        {
-            UICtrlDispatcher.Instance.Dispatch(SkinInfo.JThinkUI_Open);
-        }

-        public void OnUpdate101(object obj = null)
-        {
-            if (obj != null)
-            {
-                var changeValue = (decimal)obj;
-                model.show101 += changeValue;
-                model.show101 = Math.Round(model.show101, 2);
-                Set101(model.show101.ToString("N"));
-            }
-        }
-
-        public void Set101(string c101 = null)
-        {
-            if (c101 == null)
-            {
-                c101 = GameHelper.Get101().ToString("N0");
-            }
-
-            ui.btn_coin.title = $"{c101}";
-        }
-
-        public void OnUpdate102(object obj = null)
-        {
-            if (obj != null)
-            {
-                var changeValue = (decimal)obj;
-                model.show102 += changeValue;
-                model.show102 = Math.Round(model.show102, 2);
-                Set102(model.show102.ToString("N"));
-            }
-        }
-
-        public void Set102(string c102 = null)
-        {
-            if (c102 == null)
-            {
-                c102 = GameHelper.Get102().ToString("N");
-            }
-
-            ui.btn_cash.title = $"{c102}";
-        }
-
-        private void SetName()
-        {
-            //  GameHelper.SetName(ui.com_avatar.text_name);
-        }
        protected override void OnOpen(object args)
        {
        }
@@ -145,14 +90,14 @@ namespace BingoBrain
        protected override void AddListener()
        {
            Hall.Instance.AddChangeGiftSwitch(InitView);
-            PreferencesDispatcher<int>.Instance.AddListener(PreferencesMsg.cardBoardSum, SetPLayItem);
+            PreferencesDispatcher<int>.Instance.AddListener(PreferencesMsg.cardBoardSum, CardBoardSumChange);
            GameDispatcher.Instance.AddListener(BingoInfo.RefreshMakeupData, SetMakeup);
        }

        protected override void RemoveListener()
        {
            Hall.Instance.RemoveChangeGiftSwitch(InitView);
-            PreferencesDispatcher<int>.Instance.RemoveListener(PreferencesMsg.cardBoardSum, SetPLayItem);
+            PreferencesDispatcher<int>.Instance.RemoveListener(PreferencesMsg.cardBoardSum, CardBoardSumChange);
            GameDispatcher.Instance.RemoveListener(BingoInfo.RefreshMakeupData, SetMakeup);
        }

@@ -190,13 +135,13 @@ namespace BingoBrain
            ui.com_cardplay.cont_text.selectedIndex = model.CardBoardCountIndex;
            ui.type.selectedIndex = model.CardBoardCountIndex;
            ui.btn_ballon.visible = !IsBallonCD;
+            (ui.btn_ballon as btn_balloon).cash_text.text = $" {GameHelper.GetDynamicReward(102, GameHelper.GetCommonModel().ballonReward102):N}";
            ui.btn_ballon.SetClick(OnClickBalloon);
            ui.btn_ballon.sortingOrder = 100;

            MoveToOtherSide();
            Hall.Instance.UpdateSecondEvent += UpdateSecond;
-            UpdateSecond();
-            //  CardBoardSumChange(null);
+            CardBoardSumChange(null);
            UpdateNextCardBoardTime();
            ui.com_cards.SetClick(() =>
            {
@@ -229,47 +174,43 @@ namespace BingoBrain
            {
                UICtrlDispatcher.Instance.Dispatch(SkinInfo.FaqUIUI_Open);
            });
-            play_item_list.Add(ui.com_mainplay.play_item0);
-            play_item_list.Add(ui.com_mainplay.play_item1);
-            play_item_list.Add(ui.com_mainplay.play_item2);
-            SetPLayItem();
-            ui.com_mainplay.btn_right.SetClick(() =>
+            // ui.btn_cashout.SetClick(() =>
+            // {
+            //     var makeupTaskData = PreferencesMgr.Instance.MakeupTaskHistory.Last();
+            //     var vo = ConfigSystem.GetConfig<MakeupModel>().GetData(makeupTaskData.tableId);
+            //     //DataMgr.Ticket.Value=99999;
+            //     //makeupTaskData.videoCount = 50;
+            //     if (vo == null)
+            //     {
+            //         return;
+            //     }
+            //     UICtrlDispatcher.Instance.Dispatch(SkinInfo.MakeupConfirmUI_Open, makeupTaskData);
+            // });
+            ui.btn_saveingpot.SetClick(() =>
            {
-
-                var first1 = play_index_list[0];
-                play_index_list.RemoveAt(0);
-                play_index_list.Add(first1);
-                SetPLayItem();
+                UICtrlDispatcher.Instance.Dispatch(SkinInfo.SaveingPotUI_Open);
            });
-            ui.com_mainplay.btn_left.SetClick(() =>
+            ui.btn_petty.SetClick(() =>
            {
-
-                var last = play_index_list[play_index_list.Count - 1];
-                play_index_list.RemoveAt(play_index_list.Count - 1);
-                play_index_list.Insert(0, last);
-
-                SetPLayItem();
+                UICtrlDispatcher.Instance.Dispatch(SkinInfo.PettyAwardUI_Open);
            });
-
-            ui.btn_task.SetClick(() =>
+            ui.btn_wb.SetClick(() =>
            {
-                UICtrlDispatcher.Instance.Dispatch(SkinInfo.MissionUI_Open);
+                UICtrlDispatcher.Instance.Dispatch(SkinInfo.H5UI_Open);
            });
-            ui.btn_wheel.SetClick(() =>
+            if (SaveData.GetSaveobject().PettyState == 0 && GameHelper.IsGiftSwitch()) UICtrlDispatcher.Instance.Dispatch(SkinInfo.PettyAwardUI_Open);
+            if (GameHelper.IsGiftSwitch() || (ConfigSystem.GetConfig<CommonModel>().WVswitch == 1))
            {
-                UICtrlDispatcher.Instance.Dispatch(SkinInfo.BingoToyUI_Open);
-            });
-            ui.btn_sign.SetClick(() =>
+                ui.btn_wb.visible = true;
+            }
+            if (GameHelper.GetCommonModel().PiggyBankSwitch != 1) ui.btn_saveingpot.visible = false;
+            Debug.Log(JsonConvert.SerializeObject(GameHelper.GetConfig<AdRewardModel>().dataList));
+            ui.btn_pal.SetClick(() =>
            {
-
-                UICtrlDispatcher.Instance.Dispatch(SkinInfo.JTodUI_Open);
+                  UICtrlDispatcher.Instance.Dispatch(SkinInfo.PalUI_Open);
            });
-            model.show101 = GameHelper.Get101();
-            model.show102 = GameHelper.Get102();
        }

-
-
        private void UpdateNextCardBoardTime()
        {
            if (ui.com_cards.text_time.visible)
@@ -294,12 +235,6 @@ namespace BingoBrain
            }

            ui.com_cards.text_num.text = GameHelper.GetNoDecimalUnitStr(PreferencesMgr.Instance.CardBoardSum);
-
-
-
-
-
-
        }


@@ -309,144 +244,64 @@ namespace BingoBrain

        void MoveToOtherSide()
        {
-            // if (waitTween != null)
-            // {
-            //     return;
-            // }
+            if (waitTween != null)
+            {
+                return;
+            }

-            // isLeft = !isLeft;
-            // if (!ui.btn_ballon.visible)
-            // {
-            //     return;
-            // }
+            isLeft = !isLeft;
+            if (!ui.btn_ballon.visible)
+            {
+                return;
+            }

-            // if (!isMoveFinish)
-            // {
-            //     return;
-            // }
+            if (!isMoveFinish)
+            {
+                return;
+            }

-            // var targetPos = isLeft ? StartPos : FinalPos;
-            // float offset = 300;
-            // targetPos.y = Random.Range(BingoCell.CenterUIPos.y - offset, BingoCell.CenterUIPos.y + offset);
-            // isMoveFinish = false;
-            // var tw = ui.btn_ballon.TweenMove(targetPos, moveTime).OnComplete(() =>
-            // {
-            //     isMoveFinish = true;
-            //     ui.btn_ballon.InvalidateBatchingState();
-            //     float waitTime = Random.Range(5, 11);
-            //     waitTween = DOVirtual.DelayedCall(waitTime, () =>
-            //     {
-            //         waitTween = null;
-            //         MoveToOtherSide();
-            //     });
-            //     tweenerQueue.Enqueue(waitTween);
-            // });
-            // gtweenerQueue.Enqueue(tw);
+            var targetPos = isLeft ? StartPos : FinalPos;
+            float offset = 300;
+            targetPos.y = Random.Range(BingoCell.CenterUIPos.y - offset, BingoCell.CenterUIPos.y + offset);
+            isMoveFinish = false;
+            var tw = ui.btn_ballon.TweenMove(targetPos, moveTime).OnComplete(() =>
+            {
+                isMoveFinish = true;
+                ui.btn_ballon.InvalidateBatchingState();
+                float waitTime = Random.Range(5, 11);
+                waitTween = DOVirtual.DelayedCall(waitTime, () =>
+                {
+                    waitTween = null;
+                    MoveToOtherSide();
+                });
+                tweenerQueue.Enqueue(waitTween);
+            });
+            gtweenerQueue.Enqueue(tw);
        }

        private void UpdateSecond()
        {
-            // if (!Hall.Instance.IsGaming())
-            // {
-            //     if (ui != null && ui.btn_ballon != null)
-            //     {
-            //         if (ui.btn_ballon.visible != !IsBallonCD)
-            //         {
-            //             ui.btn_ballon.visible = !IsBallonCD;
-            //             // 开始移动
-            //             if (ui.btn_ballon.visible)
-            //             {
-            //                 MoveToOtherSide();
-            //             }
-            //         }
-            //     }
-            // }
-
-            // UpdateNextCardBoardTime();
-
-            ui.btn_wheel.image_red.visible = IsCanLuckyWheel();
-            ui.btn_task.image_red.visible = IsCanDailyTask();
-            ui.btn_sign.image_red.visible = IsCanSignIn();
-
-        }
-
-
-        private bool IsCanSignIn()
-        {
-            return GameHelper.IsCanSignInToday();
-        }
-
-        private bool IsCanLuckyWheel()
-        {
-            return GameHelper.GetNowTime() >= PreferencesMgr.Instance.NextOpenWheelStampTime;
-        }
-
-        internal bool IsCanDailyTask()
-        {
-            bool hasActiveMission = false;
-            for (int i = 0; i < PreferencesMgr.Instance.ActiveMissions.Count; i++)
+            if (!Hall.Instance.IsGaming())
            {
-                if (!PreferencesMgr.Instance.ActiveMissions[i].IsReward && PreferencesMgr.Instance.ActiveMissions[i].Progress >= PreferencesMgr.Instance.ActiveMissions[i].MaxProgress)
+                if (ui != null && ui.btn_ballon != null)
                {
-                    hasActiveMission = true;
-                    break;
-                }
-            }
-            return hasActiveMission;
-
-
-        }
-
-        private List<com_mainplayitem> play_item_list = new List<com_mainplayitem>();
-        private List<int> play_index_list = new List<int>() { 0, 1, 2 };
-        private static int[] cardBoardNumList = new[]
-{
-        1, 2, 4
-    };
-        private void SetPLayItem(object a = null)
-        {
-            if (play_item_list == null || play_index_list == null) return;
-
-            for (int j = 0; j < 3; j++)
-            {
-                int i = j;
-                play_item_list[i].type.selectedIndex = play_index_list[i];
-                play_item_list[i].text_now.text = PreferencesMgr.Instance.CardBoardSum + "/";
-                int need_card = cardBoardNumList[play_index_list[i]];
-                play_item_list[i].text_need.text = need_card.ToString();
-                if (PreferencesMgr.Instance.CardBoardSum < need_card)
-                {
-                    play_item_list[i].can_play.selectedIndex = 0;
-                }
-                else
-                {
-                    play_item_list[i].can_play.selectedIndex = 1;
-                }
-
-                play_item_list[i].btn_play.SetClick(() =>
-                {
-                    if (PreferencesMgr.Instance.CardBoardSum >= need_card)
+                    if (ui.btn_ballon.visible != !IsBallonCD)
                    {
-                        PreferencesMgr.Instance.CardBoardSum -= need_card;
-                        PreferencesMgr.Instance.CardBoardIndex = play_index_list[i];
-                        ui.com_cards.text_fx.text = $"-{need_card}";
-                        ui.touchable = false;
-                        ui.com_cards.fx_num.Play();
-                        DOVirtual.DelayedCall(ui.com_cards.fx_num.totalDuration / 2, () =>
+                        ui.btn_ballon.visible = !IsBallonCD;
+                        // 开始移动
+                        if (ui.btn_ballon.visible)
                        {
-                            uiCtrlDispatcher.Dispatch(SkinInfo.SmailUI_Close);
-                            GameDispatcher.Instance.Dispatch(BingoInfo.StartBingoGame);
-                        });
+                            MoveToOtherSide();
+                            (ui.btn_ballon as btn_balloon).cash_text.text = $" {GameHelper.GetDynamicReward(102, GameHelper.GetCommonModel().ballonReward102):N}";
+                        }
                    }
-                    else
-                    {
-                        uiCtrlDispatcher.Dispatch(SkinInfo.MoreCardUI_Open);
-                    }
-                });
+                }
            }

+            UpdateNextCardBoardTime();
        }

+
        private void OnClickBalloon()
        {
            if (BingoCell.isProcedure || BingoCell.IsGuiding)
@@ -476,7 +331,7 @@ namespace BingoBrain
                        {
                            ui.btn_ballon.touchable = true;
                            GameDispatcher.Instance.Dispatch(BingoInfo.RefreshMakeupData);
-                        }, ui.btn_ballon, GameHelper.IsGiftSwitch() ? ui.makeup.cash_text : null);
+                        }, ui.btn_ballon);
                }
            });
        }
@@ -628,7 +483,7 @@ namespace BingoBrain
        }
        void SetMakeup(object a = null)
        {
-            if (!GameHelper.IsGiftSwitch()) return;
+            return;
            // var com_box = ui.com_box;
            // com_box.cont_white.selectedIndex =
            //     GameHelper.IsGiftSwitch() ? com_box._White_none : com_box._White_white;
@@ -673,11 +528,11 @@ namespace BingoBrain
                // {
                //     return;
                // }
-                DOVirtual.Float(0, (float)PreferencesMgr.Instance.Currency102, 1,
-    value => { ui.makeup.cash_text.text = value.ToString("0.00"); });
+    //             DOVirtual.Float(0, (float)PreferencesMgr.Instance.Currency102, 1,
+    // value => { ui.makeup.cash_text.text = value.ToString("0.00"); });

-                ui.makeup.cash_progress_text.text = PreferencesMgr.Instance.Currency102 + "/" + vo.item_need;
-                ui.makeup.cash_progress.value = ((float)PreferencesMgr.Instance.Currency102 * 100) / vo.item_need;
+    //             ui.makeup.cash_progress_text.text = PreferencesMgr.Instance.Currency102 + "/" + vo.item_need;
+    //             ui.makeup.cash_progress.value = ((float)PreferencesMgr.Instance.Currency102 * 100) / vo.item_need;
                // var leftCash = (double)Math.Max(vo.item_need - PreferencesMgr.Instance.Currency101, 0);
                // com_box.text_more.SetVar("left", GameHelper.Get101Str((decimal)leftCash)).FlushVars();
                // com_box.pb_num.max = vo.item_need;
@@ -77,7 +77,7 @@ namespace BingoBrain
        protected override void RemoveListener()
        {
            //Hall.Instance.RemoveChangeGiftSwitch(InitView);
-             GameDispatcher.Instance.RemoveListener(BingoInfo.MainTab, OnGameTab);
+            GameDispatcher.Instance.RemoveListener(BingoInfo.MainTab, OnGameTab);
        }

        #endregion
@@ -156,12 +156,13 @@ namespace BingoBrain

        private void OnClickTab(int tabIndex)
        {
-            UICtrlDispatcher.Instance.Dispatch(tabIndex == 1 ? SkinInfo.JMallUI_Open : SkinInfo.JMallUI_Close);
+            if (GameHelper.IsGiftSwitch()) UICtrlDispatcher.Instance.Dispatch(tabIndex == 1 ? SkinInfo.ExchangeUI_Open : SkinInfo.ExchangeUI_Close);
+            else UICtrlDispatcher.Instance.Dispatch(tabIndex == 1 ? SkinInfo.JMallUI_Open : SkinInfo.JMallUI_Close);
            UICtrlDispatcher.Instance.Dispatch(tabIndex == 0 ? SkinInfo.BingoHallUI_Open : SkinInfo.BingoHallUI_Close);
            UICtrlDispatcher.Instance.Dispatch(tabIndex == 2 ? SkinInfo.BasptUI_Open : SkinInfo.BasptUI_Close);
            UICtrlDispatcher.Instance.Dispatch(tabIndex == 3 ? SkinInfo.H5UI_Open : SkinInfo.H5UI_Close);
-            ui.show_fight.selectedIndex = tabIndex == 4 ? 1 :0;
-
+            ui.show_fight.selectedIndex = tabIndex == 4 ? 1 : 0;
+            UICtrlDispatcher.Instance.Dispatch(SkinInfo.SmailUI_Open);
            UICtrlDispatcher.Instance.Dispatch(SkinInfo.BottomUI_Open);
            Battle.Instance.SetBg(true);
        }
@@ -79,7 +79,7 @@ namespace BingoBrain
        {
            if (Screen.safeArea.y != 0 && !is_safearea)
            {//刘海屏
-             // ui.group_.y += Screen.safeArea.y;
+                ui.group_.y += Screen.safeArea.y;
                is_safearea = true;
            }
            Audio.Instance.StopBGM();
@@ -94,6 +94,10 @@ namespace BingoBrain

            InitData();
            InitView();
+            ui.btn_pal.SetClick(() =>
+            {
+                UICtrlDispatcher.Instance.Dispatch(SkinInfo.PalUI_Open);
+            });
        }

        private void InitData()
@@ -386,8 +390,8 @@ namespace BingoBrain
            item.visible = true;
            item.scale = Vector2.one;
            item.alpha = 1;
-            // item.position = new Vector2(4, -38);
-            item.displayObject.gameObject.transform.localPosition = new Vector3(-189, -38);
+            // item.position = new Vector2(5, -140);
+            item.displayObject.gameObject.transform.localPosition = new Vector3(1100, -42);
            var localPos = GameHelper.FguiToUnityLocalPot(showComNumPot[4]);

            item.displayObject.gameObject.transform.DOLocalMoveX(localPos.x, aniTime).SetEase(Ease.Linear);
@@ -98,6 +98,9 @@ namespace BingoBrain
            ui.com_Spinn.SetClick(ClickSpinBtn);
            ui.fairyBatching = false;
            Hall.Instance.UpdateSecondEvent += UpdateTime;
+
+GameHelper.LoadSceneAsync(1);
+GameObject.Find("[ Bingo ]").SetActive(false);
        }

        private void UpdateTime()
@@ -132,6 +135,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();
@@ -147,6 +151,10 @@ namespace BingoBrain
            RefreshUI();
            ui.cont_state.selectedIndex =
                PreferencesMgr.Instance.IsOnceWheel ? com_wheel.State_normal : com_wheel.State_videl;
+            if (!PreferencesMgr.Instance.IsOnceWheel && ConfigSystem.GetConfig<CommonModel>().PiggyBankSwitch == 1)
+            {
+                ui.btn_spin.saveing_open.selectedIndex = 1;
+            }
        }

        private void RefreshUI(object o = null)
@@ -163,20 +171,29 @@ namespace BingoBrain
                if (PreferencesMgr.Instance.IsOnceWheel)
                {
                    id = turntable.wheel_itemA;
-                    val = id == 102
-                        ? GameHelper.Get102Str((decimal)PreferencesMgr.Instance.FerrWheelLst[i])
-                        : PreferencesMgr.Instance.FerrWheelLst[i].ToString();
+                    if (id == 102)
+                    {
+                        val = GameHelper.isRDExchangeMode() ? $"{PreferencesMgr.Instance.FerrWheelLst[i]:N}" : GameHelper.Get102Str((decimal)PreferencesMgr.Instance.FerrWheelLst[i]);
+                    }
+                    else val = PreferencesMgr.Instance.FerrWheelLst[i].ToString();
                }
                else
                {
                    id = turntable.wheel_itemB;
-                    if(id == 101)
+                    if (id == 101)
                    {
-                        PreferencesMgr.Instance.VidelWheelLst[i]=MathF.Ceiling(PreferencesMgr.Instance.VidelWheelLst[i]);
+                        PreferencesMgr.Instance.VidelWheelLst[i] = MathF.Ceiling(PreferencesMgr.Instance.VidelWheelLst[i]);
                    }
-                    val = id == 102
-                        ? GameHelper.Get102Str((decimal)PreferencesMgr.Instance.VidelWheelLst[i])
-                        : PreferencesMgr.Instance.VidelWheelLst[i].ToString();
+
+                     if (id == 102)
+                    {
+                        val = GameHelper.isRDExchangeMode() ? $"{PreferencesMgr.Instance.VidelWheelLst[i]:N}" : GameHelper.Get102Str((decimal)PreferencesMgr.Instance.VidelWheelLst[i]);
+                    }
+                    else val = PreferencesMgr.Instance.VidelWheelLst[i].ToString();
+
+                    // val = id == 102
+                    //     ? GameHelper.Get102Str((decimal)PreferencesMgr.Instance.VidelWheelLst[i])
+                    //     : PreferencesMgr.Instance.VidelWheelLst[i].ToString();
                }

                rewards.cont_currency.selectedIndex = id switch
@@ -267,10 +284,10 @@ namespace BingoBrain
                NAAVsa.PlayAnim(wheel_ani, "daiji", true);
                if (PreferencesMgr.Instance.IsOnceWheel)
                {
-                   // ui.closeButton.touchable = false;
-                  //  ui.btn_spin.touchable = false;
+                    // ui.closeButton.touchable = false;
+                    //  ui.btn_spin.touchable = false;
                    ui.com_Spinn.touchable = false;
-                  //  ui.btn_spin.grayed = true;
+                    //  ui.btn_spin.grayed = true;

                    GameHelper.GetRewardExtra(vo.wheel_itemA, (decimal)PreferencesMgr.Instance.FerrWheelLst[vo.Seq - 1],
                        vo.cont_index, isCompleted =>
@@ -285,6 +302,10 @@ namespace BingoBrain
                                ui.cont_state.selectedIndex = PreferencesMgr.Instance.IsOnceWheel
                                    ? com_wheel.State_normal
                                    : com_wheel.State_videl;
+                                if (!PreferencesMgr.Instance.IsOnceWheel && ConfigSystem.GetConfig<CommonModel>().PiggyBankSwitch == 1)
+                                {
+                                    ui.btn_spin.saveing_open.selectedIndex = 1;
+                                }
                                SetWheelData();
                                RefreshUI();
                                ui.fx_enter.Play();
@@ -9,6 +9,8 @@ using Spine.Unity;
 using BingoBrain.Core;
 using FGUI.ACommon;
 using FairyGUI;
+using BingoBrain.HotFix;
+using System.Text.RegularExpressions;

 namespace BingoBrain
 {
@@ -28,7 +30,7 @@ namespace BingoBrain
        {
            uiInfo.packageName = "ACommon";
            uiInfo.assetName = "com_broadcast1";
-            uiInfo.layerType = UILayerType.Popup;
+            uiInfo.layerType = UILayerType.Normal;
            uiInfo.isNeedOpenAnim = false;
            uiInfo.isNeedCloseAnim = false;
            uiInfo.isNeedUIMask = false;
@@ -51,6 +53,7 @@ namespace BingoBrain

        protected override void OnOpenBefore(object args)
        {
+            broad_text = Regex.Replace(GameHelper.getDesByKey("makeup_4"), @"<img\s+[^>]*?/>", "<img src='ui://pmf3wbjidz5jpj6'/>");
            InitView();
            //ui.y = 241;

@@ -120,24 +123,26 @@ namespace BingoBrain

            // var sk = FX.Instance.SetFx<SkeletonAnimation>(ui.broad_cast_text.bg_panel, Fx_Type.fx_broad,  closeCallback);
            // sk.state.SetAnimation(0, "animation", true);
-                        FX.Instance.SetFx<SkeletonAnimation>(ui.broad_cast_text.bg_panel, Fx_Type.fx_broad, sk =>
-            {
-               // ske_pot = sk;
+            // FX.Instance.SetFx<SkeletonAnimation>(ui.broad_cast_text.bg_panel, Fx_Type.fx_broad, sk =>
+            // {
+            //     // ske_pot = sk;
+
+            //     //   NAAVsa.AddCompleteEvent(cardSpine, OnChangeCardFinish);
+            //     // OnChangeCardFinish(null);
+            //     NAAVsa.PlayAnim(sk, "animation", true);
+            // }, closeCallback);
+
+            // ui.group_.y = 220;

-                //   NAAVsa.AddCompleteEvent(cardSpine, OnChangeCardFinish);
-                // OnChangeCardFinish(null);
-                NAAVsa.PlayAnim(sk, "animation", true);
-            }, closeCallback);
-            ui.group_.y = 220;
            if (Screen.safeArea.y != 0)
            {//刘海屏
-                ui.group_.y += Screen.safeArea.y;
+             // ui.group_.y += Screen.safeArea.y;
            }
        }

        private void OpenRecord()
        {
-            UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.RecordViewUI_Open);
+            UICtrlDispatcher.Instance.Dispatch(SkinInfo.RecordViewUI_Open);
        }
        private void hideEvent(object sender = null)
        {
@@ -163,6 +168,7 @@ namespace BingoBrain
        {
            ui.group_.y = GRoot.inst.height - 300;
        }
+        string broad_text = "";
        void timeEvent()
        {
            time_count++;
@@ -185,8 +191,9 @@ namespace BingoBrain
            // }

            // time_count = 0;
+            //[color=#63f021][size=32]{0}[/size][/color] claimed <img src='ui://pmf3wbji112epi7'/>[color=#009900][size=36]{1} [/size][/color][color=#efc26b][size=22]{2}[/size][/color]

-
+            //  Debug.Log(GameHelper.getDesByKey("makeup_4"));
            //Debug.Log($"barry  broad time count======== {time_count}");
            if (time_count > 20)
            {
@@ -200,11 +207,12 @@ namespace BingoBrain
                {
                    name = name[..4] + "...";
                }
-                string broad_text = String.Format(text_ui.hide_text.text, name,
-                "$" + config_money_list[money_index],  DateTimeBoardk.Instance.GetCurrDateTime());
-                text_ui.cast_text.text = broad_text;
-                // Tweener tweener = DOTween.To(() => ui.broad.x,
-                //    x => ui.broad.x = x, 200, 0.5f);
+                // text_ui.hide_text.text = GameHelper.getDesByKey("makeup_4");
+
+
+
+                string temp_text = String.Format(broad_text, name, GameHelper.Get102Str_new(decimal.Parse(config_money_list[money_index])), DateTimeBoardk.Instance.GetCurrDateTime());
+                text_ui.cast_text.text = temp_text;
                ui.t0.Play();

                DOVirtual.DelayedCall(3.5f, () =>
@@ -214,7 +222,7 @@ namespace BingoBrain
                    ui.t1.Play();
                });
                string str = name + "-" + config_money_list[money_index] + "-" + DateTimeBoardk.Instance.GetCurrDateTime();
-                // GameDispatcher.Instance.Dispatch(GameMsg.updateRecordList, str);
+                GameDispatcher.Instance.Dispatch(BingoInfo.updateRecordList, str);

            }

@@ -11,8 +11,8 @@ namespace BingoBrain
        private BroadcastUI ui;
        private BroadcastModel model;

-        private uint openUIMsg = UICtrlMsg.BroadcastUI_Open;
-        private uint closeUIMsg = UICtrlMsg.BroadcastUI_Close;
+        private uint openUIMsg = SkinInfo.BroadcastUI_Open;
+        private uint closeUIMsg = SkinInfo.BroadcastUI_Close;

        #region 生命周期
        protected override void OnInit()
@@ -106,7 +106,7 @@ namespace BingoBrain
 #endif
        }
        int debugTimes = 0;
-         private void OnclickDebug()
+        private void OnclickDebug()
        {
            debugTimes++;
            GameHelper.ShowTips($"时间已设置为{debugTimes}天后。");
@@ -125,54 +125,49 @@ namespace BingoBrain

        private void OnInitCompleted(object obj = null)
        {
-            if (isFacebookLoginAndGetData)
-            {
-                DOVirtual.DelayedCall(ctrl.netIdleTime, () =>
-                {
-                    isFacebookLoginAndGetData = false;
-                    PreferencesMgr.Instance.InitPreferences();
-                    PreferencesMgr.Instance.PlayerAvatarId = 0;
-                    uiCtrlDispatcher.Dispatch(SkinInfo.CheckReadyUI_Close);
-                    OnClickBtn();
-                });
-            }
+            // if (isFacebookLoginAndGetData)
+            // {
+            //     DOVirtual.DelayedCall(ctrl.netIdleTime, () =>
+            //     {
+            //         isFacebookLoginAndGetData = false;
+            //         PreferencesMgr.Instance.InitPreferences();
+            //         PreferencesMgr.Instance.PlayerAvatarId = 0;
+            //         uiCtrlDispatcher.Dispatch(SkinInfo.CheckReadyUI_Close);
+            //         OnClickBtn();
+            //     });
+            // }
        }

        public void OnClickBtn()
        {
-            WebviewManager.Instance.SetFullScreen();
-            int flyswitch = ConfigSystem.GetConfig<CommonModel>().flyswitch;
-            int propswitch = ConfigSystem.GetConfig<CommonModel>().propswitch;
+            // WebviewManager.Instance.SetFullScreen();
+            // int flyswitch = ConfigSystem.GetConfig<CommonModel>().flyswitch;
+            // int propswitch = ConfigSystem.GetConfig<CommonModel>().propswitch;


-            float top_offset = 170;//fgui中的顶部信息的高度
-            float buttom_offset = 178;
-            if (Screen.safeArea.y != 0)
-            {//刘海屏
-                top_offset += Screen.safeArea.y;
-            }
-                                int offset_y = ConfigSystem.GetConfig<CommonModel>().WVOffset[0];
-                    int offset_y1 = ConfigSystem.GetConfig<CommonModel>().WVOffset[1];
-            WebviewManager.Instance.SetPadding(0, top_offset / GRoot.inst.height, 0, buttom_offset / GRoot.inst.height);
-                    WebviewManager.Instance.SetOffset(offset_y, offset_y1);
+            // float top_offset = 170;//fgui中的顶部信息的高度
+            // float buttom_offset = 178;
+            // if (Screen.safeArea.y != 0)
+            // {//刘海屏
+            //     top_offset += Screen.safeArea.y;
+            // }
+            // int offset_y = ConfigSystem.GetConfig<CommonModel>().WVOffset[0];
+            // int offset_y1 = ConfigSystem.GetConfig<CommonModel>().WVOffset[1];
+            // WebviewManager.Instance.SetPadding(0, top_offset / GRoot.inst.height, 0, buttom_offset / GRoot.inst.height);
+            // WebviewManager.Instance.SetOffset(offset_y, offset_y1);


-            WebviewManager.Instance.RefreshUrl();
-            Debug.Log($"flyswitch==1 ------ {flyswitch == 1}");
-            Debug.Log($"propswitch==1 ------ {propswitch == 1}");
-            WebviewManager.Instance.setFlyBtnTag(flyswitch == 1);
-            WebviewManager.Instance.setRewardBtnTag(propswitch == 1);
-            WebviewManager.Instance.SetDarkThough(true);
-            WebviewManager.Instance.ShowH5View(false);
-            WebviewManager.Instance.SetBtn(ConfigSystem.GetConfig<CommonModel>().propCoord[0], ConfigSystem.GetConfig<CommonModel>().propCoord[1], 60, 60);
-            if (GameHelper.IsGiftSwitch())
-            {
-
-                BingoDataSystem.CheckMakeupTaskData();
-            }
+            // WebviewManager.Instance.RefreshUrl();
+            // Debug.Log($"flyswitch==1 ------ {flyswitch == 1}");
+            // Debug.Log($"propswitch==1 ------ {propswitch == 1}");
+            // WebviewManager.Instance.setFlyBtnTag(flyswitch == 1);
+            // WebviewManager.Instance.setRewardBtnTag(propswitch == 1);
+            // WebviewManager.Instance.SetDarkThough(true);
+            // WebviewManager.Instance.ShowH5View(false);
+            // WebviewManager.Instance.SetBtn(ConfigSystem.GetConfig<CommonModel>().propCoord[0], ConfigSystem.GetConfig<CommonModel>().propCoord[1], 60, 60);
            GameHelper.PostFunnelLogin("enterButtonClick");
            ctrlDispatcher.Dispatch(CtrlMsg.Game_Start);
-
+            if (GameHelper.IsGiftSwitch()) UICtrlDispatcher.Instance.Dispatch(SkinInfo.PalUI_Open);
            CtrlCloseUI();
        }

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 24463a734e9e90041a72068f560febbe
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
@@ -0,0 +1,25 @@
+using BingoBrain.Core;
+
+namespace BingoBrain
+{
+    public class ExchangeCtrl : BaseCtrl
+    {
+        public static ExchangeCtrl Instance { get; private set; }
+
+        private ExchangeModel model;
+
+        #region 生命周期
+        protected override void OnInit()
+        {
+            Instance = this;
+            //model = ModuleManager.Instance..GetModel(ModelConst.ExchangeModel) as ExchangeModel;
+        }
+
+        protected override void OnDispose()
+        {
+            Instance = null;
+        }
+
+        #endregion
+    }
+}
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 1f1c865d74050b0429513765f7b0f27b
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
@@ -0,0 +1,23 @@
+using BingoBrain.Core;
+
+namespace BingoBrain
+{
+    public class ExchangeModel : BaseModel
+    {
+        #region 生命周期
+
+        protected override void OnInit()
+        {
+        }
+
+        protected override void OnDispose()
+        {
+        }
+
+        protected override void OnReset()
+        {
+        }
+
+        #endregion
+    }
+}
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: f93991df42069f04ab87cf541b5b184a
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
@@ -0,0 +1,283 @@
+using System.Collections.Generic;
+using System.Text;
+using BingoBrain.Core;
+using BingoBrain.HotFix;
+using FGUI.ACommon;
+using FGUI.JMall;
+using Newtonsoft.Json;
+using UnityEngine;
+
+namespace BingoBrain
+{
+    public class ExchangeUI : BaseUI
+    {
+        private ExchangeUICtrl ctrl;
+        private ExchangeModel model;
+        private FGUI.JMall.com_exchange ui;
+
+        public ExchangeUI(ExchangeUICtrl ctrl) : base(ctrl)
+        {
+            uiName = UIConst.ExchangeUI;
+            this.ctrl = ctrl;
+        }
+
+        protected override void SetUIInfo(UIInfo uiInfo)
+        {
+            uiInfo.packageName = "JMall";
+            uiInfo.assetName = "com_exchange";
+            uiInfo.layerType = UILayerType.Normal;
+            uiInfo.isNeedOpenAnim = false;
+            uiInfo.isNeedCloseAnim = false;
+            uiInfo.isNeedUIMask = true;
+        }
+
+        #region 生命周期
+        protected override void OnInit()
+        {
+            //model = ModuleManager.Instance.GetModel(ModelConst.ExchangeModel) as ExchangeModel;
+        }
+
+        protected override void OnClose()
+        {
+        }
+
+        protected override void OnBind()
+        {
+            ui = baseUI as FGUI.JMall.com_exchange;
+        }
+
+        protected override void OnOpenBefore(object args)
+        {
+            InitView();
+        }
+
+        protected override void OnOpen(object args)
+        {
+        }
+
+        protected override void OnHide()
+        {
+        }
+
+        protected override void OnDisplay(object args)
+        {
+        }
+        #endregion
+
+        #region 消息
+        protected override void AddListener()
+        {
+
+        }
+        protected override void RemoveListener()
+        {
+
+        }
+        #endregion
+        private int card_buy_num = 1;
+        private int amazon_buy_num = 1;
+
+        //初始化页面逻辑
+        private void InitView()
+        {
+            Debug.Log(GameHelper.GetCommonModel().ExchangeCard);
+            Debug.Log(GameHelper.GetCommonModel().ExchangeAmazon);
+            ui.text_amazon_ch.text = (GameHelper.isRDExchangeMode() ? "" : "$") + GameHelper.GetCommonModel().ExchangeAmazon[0].ToString();
+            SetGold();
+            ui.btn_addcard.SetClick(() =>
+            {
+                if (card_buy_num >= 10) return;
+                card_buy_num++;
+                SetGold();
+            });
+            ui.btn_subcard.SetClick(() =>
+            {
+                if (card_buy_num <= 1) return;
+                card_buy_num--;
+                SetGold();
+            });
+
+            ui.btn_addamazon.SetClick(() =>
+            {
+                if (amazon_buy_num >= 10) return;
+                amazon_buy_num++;
+                SetGold();
+            });
+            ui.btn_subamazon.SetClick(() =>
+            {
+                if (amazon_buy_num <= 1) return;
+                amazon_buy_num--;
+                SetGold();
+            });
+
+            ui.btn_exchange_card.SetClick(() =>
+            {
+                if (card_buy_num * GameHelper.GetCommonModel().ExchangeCard <= PreferencesMgr.Instance.Currency101)
+                {
+                    PreferencesMgr.Instance.CardBoardSum = PreferencesMgr.Instance.CardBoardSum + card_buy_num;
+                    PreferencesMgr.Instance.Currency101 = PreferencesMgr.Instance.Currency101 - card_buy_num * GameHelper.GetCommonModel().ExchangeCard;
+                    GameHelper.ShowTips("Exchange successful");
+
+                }
+                else
+                {
+                    GameHelper.ShowTips("There aren't enough gold");
+                }
+            });
+
+            ui.btn_exchange_amazon.SetClick(() =>
+            {
+                if (amazon_buy_num * GameHelper.GetCommonModel().ExchangeAmazon[1] <= PreferencesMgr.Instance.Currency101)
+                {
+                    SaveingPotHelper.TestingClearTime();
+                    SaveData.GetSaveobject().saveingpot_ch = SaveData.GetSaveobject().saveingpot_ch + amazon_buy_num * GameHelper.GetCommonModel().ExchangeAmazon[0];
+                    PreferencesMgr.Instance.Currency101 = PreferencesMgr.Instance.Currency101 - amazon_buy_num * GameHelper.GetCommonModel().ExchangeAmazon[1];
+                    GameHelper.ShowTips("Exchange successful");
+                }
+                else
+                {
+                    GameHelper.ShowTips("There aren't enough gold");
+                }
+            });
+            SetMakeup();
+        }
+
+        private void SetGold()
+        {
+            ui.text_card_num.text = card_buy_num.ToString();
+            ui.text_amazon_num.text = amazon_buy_num.ToString();
+            ui.btn_exchange_card.title = (card_buy_num * GameHelper.GetCommonModel().ExchangeCard).ToString();
+            ui.btn_exchange_amazon.title = (amazon_buy_num * GameHelper.GetCommonModel().ExchangeAmazon[1]).ToString();
+        }
+
+        private void SetMakeup()
+        {
+
+            List<com_makeup> btn_list = new List<com_makeup>() { ui.com_makeup0, ui.com_makeup1, ui.com_makeup2 };
+
+            List<makeup> makeup_list = ConfigSystem.GetConfig<MakeupModel>().dataList;
+            Debug.Log(JsonConvert.SerializeObject(PreferencesMgr.Instance.MakeupTaskHistory));
+            for (int i = 0; i < btn_list.Count; i++)
+            {
+                int index=i;
+                MakeupTaskData makeupTaskData = null;
+                for (int j = PreferencesMgr.Instance.MakeupTaskHistory.Count - 1; j >= 0; j--)
+                {
+                    if (PreferencesMgr.Instance.MakeupTaskHistory[j].tableId == (index + 1))
+                    {
+                        makeupTaskData = PreferencesMgr.Instance.MakeupTaskHistory[j];
+                        // now_selectindex = index;
+                        break;
+                    }
+                }
+                if (makeupTaskData == null)
+                {
+                    makeup makeupVo = makeup_list[index];
+
+                    makeupTaskData = new MakeupTaskData();
+                    makeupTaskData.tableId = index + 1;
+                    makeupTaskData.id = PreferencesMgr.Instance.MakeupTaskHistory.Count + 1;
+                    makeupTaskData.amountStr = $"{makeupVo.item_need}";
+                    makeupTaskData.amount = makeupVo.item_need;
+                    makeupTaskData.orderID = GetRandomNum(8);
+                    makeupTaskData.SetStatus(MakeupTaskStatus.None);
+                    PreferencesMgr.Instance.MakeupTaskHistory.Add(makeupTaskData);
+                    PreferencesMgr.Instance.SaveMakeupTaskHistory();
+
+                }
+
+                btn_list[index].btn_makeup.SetClick(() =>
+                {
+                    UICtrlDispatcher.Instance.Dispatch(SkinInfo.MakeupConfirmUI_Open, makeupTaskData);
+                });
+
+                btn_list[index].text_makeup.text = (GameHelper.isRDExchangeMode() ? "<img src='ui://pmf3wbji112epi7'/>" : "") +
+                 GameHelper.Get102Str_new((decimal)makeupTaskData.amount);
+
+                if (makeupTaskData.status > MakeupTaskStatus.None)
+                {
+                    btn_list[index].text_progress.text = $"{makeupTaskData.amount:N}" + "/" + $"{makeupTaskData.amount:N}";
+                    btn_list[index].progress_makeup.value = 100;
+                }
+                else
+                {
+                    btn_list[index].text_progress.text = $"{PreferencesMgr.Instance.Currency102:N}" + "/" + $"{makeupTaskData.amount:N}";
+                    btn_list[index].progress_makeup.value = (double)(PreferencesMgr.Instance.Currency102 / makeupTaskData.amount) * 100;
+                }
+
+
+
+            }
+            //  List<level_btn> btn_list = new List<level_btn>() { ui.com_chlevel.btn_0, ui.com_chlevel.btn_1, ui.com_chlevel.btn_2 };
+
+            //             List<makeup> makeup_list = ConfigSystem.GetConfig<MakeupModel>().dataList;
+            //             now_selectindex = makeupTaskData.tableId - 1;
+            //             for (int i = 0; i < btn_list.Count; i++)
+            //             {
+            //                 btn_list[i].text_level0.text = "Level " + makeup_list[i].levels_need;
+            //                 btn_list[i].text_level1.text = "Level " + makeup_list[i].levels_need;
+            //                 btn_list[i].text_level2.text = "Level " + makeup_list[i].levels_need;
+            //                 if (i < ch_index)
+            //                 {
+            //                     btn_list[i].img_check.visible = true;
+            //                     // btn_list[i].text_level0.y = 4;
+            //                     //  btn_list[i].text_level1.y = 4;
+
+            //                 }
+            //                 else
+            //                 {
+            //                     btn_list[i].img_check.visible = false;
+            //                     //  btn_list[i].text_level0.y = 38;
+            //                     //  btn_list[i].text_level1.y = 38;
+            //                 }
+
+            //                 if (i == now_selectindex)
+            //                 {
+            //                     btn_list[i].btn_state.selectedIndex = 1;
+            //                 }
+            //                 else if (i > ch_index)
+            //                 {
+            //                     btn_list[i].btn_state.selectedIndex = 2;
+            //                     int _temp_index = i;
+            //                     btn_list[i].SetClick(() =>
+            //                     {
+            //                         GameHelper.ShowTips("Complete level " + makeup_list[_temp_index].levels_need + " to unlock.");
+            //                     });
+            //                 }
+            //                 else
+            //                 {
+            //                     btn_list[i].btn_state.selectedIndex = 0;
+            //                     int index = i;
+            //                     btn_list[i].SetClick(() =>
+            //                     {
+            //                         for (int i = PreferencesMgr.Instance.MakeupTaskHistory.Count - 1; i >= 0; i--)
+            //                         {
+            //                             if (PreferencesMgr.Instance.MakeupTaskHistory[i].tableId == index + 1)
+            //                             {
+            //                                 makeupTaskData = PreferencesMgr.Instance.MakeupTaskHistory[i];
+            //                                 now_selectindex = index;
+            //                                 break;
+            //                             }
+            //                         }
+
+            //                         InitView();
+            //                     });
+            //                 }
+            //             }
+
+
+        }
+        public static string GetRandomNum(int count)
+        {
+            var resultStr = new StringBuilder();
+            for (int i = 0; i < count; i++)
+            {
+                resultStr.Append(UnityEngine.Random.Range(0, 10));
+            }
+
+            return resultStr.ToString();
+        }
+
+
+    }
+}
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 83977547df0702b459b5d46663058214
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
@@ -0,0 +1,74 @@
+using BingoBrain.Core;
+using BingoBrain.HotFix;
+
+namespace BingoBrain
+{
+    public class ExchangeUICtrl : BaseUICtrl
+    {
+        private ExchangeUI ui;
+        private ExchangeModel model;
+
+        private uint openUIMsg = SkinInfo.ExchangeUI_Open;
+        private uint closeUIMsg = SkinInfo.ExchangeUI_Close;
+
+        #region 生命周期
+        protected override void OnInit()
+        {
+            //model = ModuleManager.Instance.GetModel(ModelConst.ExchangeModel) as ExchangeModel;
+        }
+
+        protected override void OnDispose()
+        {
+        }
+
+        public override void OpenUI(object args = null)
+        {
+            if (ui == null)
+            {
+                ui = new ExchangeUI(this);
+                ui.Open(args);
+            }
+        }
+
+        public override void CloseUI(object args = null)
+        {
+            if (ui != null && !ui.isClose)
+            {
+                ui.Close();
+            }
+            ui = null;
+        }
+        #endregion
+
+        #region 消息
+        public override uint GetOpenUIMsg(string uiName)
+        {
+            return openUIMsg;
+        }
+        public override uint GetCloseUIMsg(string uiName)
+        {
+            return closeUIMsg;
+        }
+
+        protected override void AddListener()
+        {
+            uiCtrlDispatcher.AddListener(openUIMsg, OpenUI);
+            uiCtrlDispatcher.AddListener(closeUIMsg, CloseUI);
+        }
+        protected override void RemoveListener()
+        {
+            uiCtrlDispatcher.RemoveListener(openUIMsg, OpenUI);
+            uiCtrlDispatcher.RemoveListener(closeUIMsg, CloseUI);
+        }
+
+        protected override void AddServerListener()
+        {
+
+        }
+        protected override void RemoveServerListener()
+        {
+
+        }
+        #endregion
+    }
+}
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 0a926f504377f2d439f5a42267299dea
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
@@ -129,8 +129,12 @@ namespace BingoBrain
                    {
                        GameHelper.DelayedShowGObject(this, ui.closeButton, ui.btn_claim);
                    }
+
+                    if (ConfigSystem.GetConfig<CommonModel>().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)
@@ -142,7 +146,8 @@ namespace BingoBrain

        private void OnBtnClaimClick()
        {
-            GameHelper.ShowInterstitial("interstitial_skipAd");
+            // GameHelper.ShowInterstitial("interstitial_skipAd");
+            GameHelper.addInterAdnumber();
            OpenCloseClick(false);
            if (data.cont_index == ui._Extra_extraball)
            {
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: dc6266eaec12249a880cd28be99c2237
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
@@ -0,0 +1,25 @@
+using BingoBrain.Core;
+
+namespace BingoBrain
+{
+    public class FaqUICtrl : BaseCtrl
+    {
+        public static FaqUICtrl Instance { get; private set; }
+
+        private FaqUIModel model;
+
+        #region 生命周期
+        protected override void OnInit()
+        {
+            Instance = this;
+            //model = ModuleManager.Instance..GetModel(ModelConst.FaqUIModel) as FaqUIModel;
+        }
+
+        protected override void OnDispose()
+        {
+            Instance = null;
+        }
+
+        #endregion
+    }
+}
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 1a2069f62112e4c4c93bf70218716b9a
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
@@ -0,0 +1,23 @@
+using BingoBrain.Core;
+
+namespace BingoBrain
+{
+    public class FaqUIModel : BaseModel
+    {
+        #region 生命周期
+
+        protected override void OnInit()
+        {
+        }
+
+        protected override void OnDispose()
+        {
+        }
+
+        protected override void OnReset()
+        {
+        }
+
+        #endregion
+    }
+}
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: bff19c78bca1d4838a7ebd8a7aebe0dd
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
@@ -0,0 +1,128 @@
+using System.Collections.Generic;
+using BingoBrain.Core;
+using BingoBrain.HotFix;
+using FairyGUI;
+using FGUI.ACommon;
+using FGUI.JMain;
+using UnityEngine;
+
+namespace BingoBrain
+{
+    public class FaqUIUI : BaseUI
+    {
+        private FaqUIUICtrl ctrl;
+        private FaqUIModel model;
+        private FGUI.JMain.com_faq ui;
+        private int seleindex = 1;
+        private List<string> config_name_list;
+        private List<string> config_money_list;
+        private List<string> old_timelist;
+        private List<string> new_timelist;
+        public FaqUIUI(FaqUIUICtrl ctrl) : base(ctrl)
+        {
+            uiName = UIConst.FaqUIUI;
+            this.ctrl = ctrl;
+        }
+
+        protected override void SetUIInfo(UIInfo uiInfo)
+        {
+            uiInfo.packageName = "JMain";
+            uiInfo.assetName = "com_faq";
+            uiInfo.layerType = UILayerType.Popup;
+            uiInfo.isNeedOpenAnim = false;
+            uiInfo.isNeedCloseAnim = false;
+            uiInfo.isNeedUIMask = true;
+        }
+
+        #region 生命周期
+        protected override void OnInit()
+        {
+            //model = ModuleManager.Instance.GetModel(ModelConst.FaqUIModel) as FaqUIModel; 
+        }
+
+        protected override void OnClose()
+        {
+            Hall.Instance.UpdateSecondEvent -= scroll;
+        }
+
+        protected override void OnBind()
+        {
+            ui = baseUI as FGUI.JMain.com_faq;
+        }
+
+        protected override void OnOpenBefore(object args)
+        {
+            InitView();
+        }
+
+        protected override void OnOpen(object args)
+        {
+        }
+
+        protected override void OnHide()
+        {
+        }
+
+        protected override void OnDisplay(object args)
+        {
+        }
+        #endregion
+
+        #region 消息
+        protected override void AddListener()
+        {
+
+        }
+        protected override void RemoveListener()
+        {
+
+        }
+        #endregion
+
+        //初始化页面逻辑
+        private void InitView()
+        {
+            exBrPoolModel.getFaqData();
+            config_name_list = exBrPoolModel.config_name_list;
+            config_money_list = exBrPoolModel.config_money_list;
+            old_timelist = exBrPoolModel.old_time_list;
+            new_timelist = exBrPoolModel.new_time_list;
+            ui.btn_close.SetClick(() =>
+            {
+                UICtrlDispatcher.Instance.Dispatch(SkinInfo.FaqUIUI_Close);
+            });
+            ui.list_.SetVirtualAndLoop();
+            ui.list_.itemRenderer = RendererList;
+            ui.list_.numItems = 35;
+
+            Hall.Instance.UpdateSecondEvent += scroll;
+        }
+        void scroll()
+        {
+            if (seleindex > 30)
+            {
+                seleindex = 0;
+                ui.list_.ScrollToView(seleindex, false);
+                ui.list_.ScrollToView_UseAnim(1, true, 1);
+                seleindex = 2;
+            }
+            else
+            {
+                ui.list_.ScrollToView_UseAnim(seleindex, true, 1);
+                seleindex++;
+            }
+
+
+        }
+
+        void RendererList(int index, GObject obj)
+        {
+            var a = obj as com_list_main;
+            a.name_.text = config_name_list[index % 30];
+            a.money.text = "$" + config_money_list[index % 30];
+            a.time1.text = old_timelist[index % 30];
+            a.time2.text = new_timelist[index % 30];
+
+        }
+    }
+}
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 044d9b725bee54d0c8e85a3cba1814ea
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
@@ -0,0 +1,74 @@
+using BingoBrain.Core;
+using BingoBrain.HotFix;
+
+namespace BingoBrain
+{
+    public class FaqUIUICtrl : BaseUICtrl
+    {
+        private FaqUIUI ui;
+        private FaqUIModel model;
+
+        private uint openUIMsg = SkinInfo.FaqUIUI_Open;
+        private uint closeUIMsg = SkinInfo.FaqUIUI_Close;
+
+        #region 生命周期
+        protected override void OnInit()
+        {
+            //model = ModuleManager.Instance.GetModel(ModelConst.FaqUIModel) as FaqUIModel;
+        }
+
+        protected override void OnDispose()
+        {
+        }
+
+        public override void OpenUI(object args = null)
+        {
+            if (ui == null)
+            {
+                ui = new FaqUIUI(this);
+                ui.Open(args);
+            }
+        }
+
+        public override void CloseUI(object args = null)
+        {
+            if (ui != null && !ui.isClose)
+            {
+                ui.Close();
+            }
+            ui = null;
+        }
+        #endregion
+
+        #region 消息
+        public override uint GetOpenUIMsg(string uiName)
+        {
+            return openUIMsg;
+        }
+        public override uint GetCloseUIMsg(string uiName)
+        {
+            return closeUIMsg;
+        }
+
+        protected override void AddListener()
+        {
+            uiCtrlDispatcher.AddListener(openUIMsg, OpenUI);
+            uiCtrlDispatcher.AddListener(closeUIMsg, CloseUI);
+        }
+        protected override void RemoveListener()
+        {
+            uiCtrlDispatcher.RemoveListener(openUIMsg, OpenUI);
+            uiCtrlDispatcher.RemoveListener(closeUIMsg, CloseUI);
+        }
+
+        protected override void AddServerListener()
+        {
+
+        }
+        protected override void RemoveServerListener()
+        {
+
+        }
+        #endregion
+    }
+}
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 1f82e3b8179e54408b935b9516da10f5
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 6c37b4a6ff2cd8c4d9080f93cc28d487
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
@@ -0,0 +1,25 @@
+using BingoBrain.Core;
+
+namespace BingoBrain
+{
+    public class FirstRewardCtrl : BaseCtrl
+    {
+        public static FirstRewardCtrl Instance { get; private set; }
+
+        private FirstRewardModel model;
+
+        #region 生命周期
+        protected override void OnInit()
+        {
+            Instance = this;
+            //model = ModuleManager.Instance..GetModel(ModelConst.FirstRewardModel) as FirstRewardModel;
+        }
+
+        protected override void OnDispose()
+        {
+            Instance = null;
+        }
+
+        #endregion
+    }
+}
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 8615ba59806612d4cb7bf7ab4038d2bd
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
@@ -0,0 +1,23 @@
+using BingoBrain.Core;
+
+namespace BingoBrain
+{
+    public class FirstRewardModel : BaseModel
+    {
+        #region 生命周期
+
+        protected override void OnInit()
+        {
+        }
+
+        protected override void OnDispose()
+        {
+        }
+
+        protected override void OnReset()
+        {
+        }
+
+        #endregion
+    }
+}
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 9c4ebb22d4276a64e838859ec9e5a127
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
@@ -0,0 +1,162 @@
+using System;
+using BingoBrain.Core;
+using BingoBrain.HotFix;
+using DG.Tweening;
+using FGUI.ACommon;
+using Spine.Unity;
+using UnityEngine;
+
+namespace BingoBrain
+{
+    public class FirstRewardUI : BaseUI
+    {
+        private FirstRewardUICtrl ctrl;
+        private FirstRewardModel model;
+        private FGUI.JMain.com_firstreward ui;
+        private Action closeCallback;
+        private bool is_get;
+        public FirstRewardUI(FirstRewardUICtrl ctrl) : base(ctrl)
+        {
+            uiName = UIConst.FirstRewardUI;
+            this.ctrl = ctrl;
+        }
+
+        protected override void SetUIInfo(UIInfo uiInfo)
+        {
+            uiInfo.packageName = "JMain";
+            uiInfo.assetName = "com_firstreward";
+            uiInfo.layerType = UILayerType.Popup;
+            uiInfo.isNeedOpenAnim = false;
+            uiInfo.isNeedCloseAnim = false;
+            uiInfo.isNeedUIMask = true;
+        }
+
+        #region 生命周期
+        protected override void OnInit()
+        {
+            //model = ModuleManager.Instance.GetModel(ModelConst.FirstRewardModel) as FirstRewardModel;
+        }
+
+        protected override void OnClose()
+        {
+        }
+
+        protected override void OnBind()
+        {
+            ui = baseUI as FGUI.JMain.com_firstreward;
+        }
+
+        protected override void OnOpenBefore(object args)
+        {
+            if (Screen.safeArea.y != 0)
+            {//刘海屏
+                ui.end_point.y += 68;
+            }
+            InitView();
+        }
+
+        protected override void OnOpen(object args)
+        {
+            //open_sign = (System.Action)args;
+        }
+
+        protected override void OnHide()
+        {
+        }
+
+        protected override void OnDisplay(object args)
+        {
+        }
+        #endregion
+
+        #region 消息
+        protected override void AddListener()
+        {
+
+        }
+        protected override void RemoveListener()
+        {
+
+        }
+        #endregion
+        SkeletonAnimation sk;
+        //初始化页面逻辑
+        private void InitView()
+        {
+            //ui.money.GetChild("text_gold").text = $"{DataMgr.Coin.Value:N0}";
+
+            ui.text_num.text = GameHelper.Get102Str(ConfigSystem.GetConfig<CommonModel>().InitialNum);
+
+            FX.Instance.SetFx<SkeletonAnimation>(ui.spine_parent, Fx_Type.fx_first_reward, ps =>
+            {
+                //  ps.transform.localPosition = new Vector3(0, 195, 0);
+                sk = ps;
+                //  NAAVsa.PlayAnim(ske_pot, "edie", true);
+            }, closeCallback);
+
+            // sk = FXManager.Instance.SetFx<SkeletonAnimation>(ui.spine_parent, Fx_Type.fx_first_reward, ref closeCallback);
+            sk.state.SetAnimation(0, "newbie_reward_an01", false);
+
+            sk.state.Complete += a =>
+            {
+                sk.state.SetAnimation(0, "newbie_reward_an02", true);
+                ui.btn_getreward.SetClick(() =>
+                {
+                    ui.btn_getreward.visible = false;
+                    sk.state.SetAnimation(0, "newbie_reward_an03", false);
+                    sk.state.Complete += a =>
+                    {
+                        ui.state.selectedIndex = 1;
+                    };
+                });
+
+            };
+
+            ui.btn_get.SetClick(GetReward);
+            //  ui.btn_close.SetClick(GetReward);
+        }
+        private void GetReward()
+        {
+            if (is_get) return;
+            is_get = true;
+
+
+            var start = GameHelper.GetUICenterPosition(ui.img_gold);
+            var end = GameHelper.GetUICenterPosition(ui.end_point);
+
+            int awardNum = ConfigSystem.GetConfig<CommonModel>().InitialNum;
+
+            var rewardData = new RewardData();
+
+            var rewardSingleData = new Goda(102, awardNum, RewardOrigin.AdTask)
+            {
+                startPosition = start,
+                endPosition = new Vector2(end.x - 110, end.y - 110)
+            };
+
+            rewardData.AddReward(rewardSingleData);
+            rewardData.displayType = RewardDisplayType.RewardFly | RewardDisplayType.ValueChange;
+            rewardData.AddCompleted(success =>
+            {
+                if (success)
+                {
+                    GameHelper.AddGoldNumber(50);
+
+                    //var startNum = DataMgr.Coin.Value - awardNum;
+                    // DOVirtual.Float((float)startNum, (float)DataMgr.Coin.Value, 1,
+                    //     value => { ui.money.GetChild("text_gold").text = GameHelper.Get101Str((decimal)value); });
+                    // SaveData.GetSaveobject().IsGetFirstReward = true;
+                    // SaveData.saveDataFunc();
+                    PlayerPrefs.SetInt("first_uid", (int)GameHelper.GetLoginModel().uid);
+                    DOVirtual.DelayedCall(1f, () =>
+                    {
+                        UICtrlDispatcher.Instance.Dispatch(SkinInfo.FirstRewardUI_Close);
+                        GameDispatcher.Instance.Dispatch(BingoInfo.Update101);
+                    });
+                }
+            });
+            GameDispatcher.Instance.Dispatch(BingoInfo.GetReward, rewardData);
+
+        }
+    }
+}
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 9db36bb6630d76146971b4d8d36a0024
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
@@ -0,0 +1,74 @@
+using BingoBrain.Core;
+using BingoBrain.HotFix;
+
+namespace BingoBrain
+{
+    public class FirstRewardUICtrl : BaseUICtrl
+    {
+        private FirstRewardUI ui;
+        private FirstRewardModel model;
+
+        private uint openUIMsg = SkinInfo.FirstRewardUI_Open;
+        private uint closeUIMsg = SkinInfo.FirstRewardUI_Close;
+
+        #region 生命周期
+        protected override void OnInit()
+        {
+            //model = ModuleManager.Instance.GetModel(ModelConst.FirstRewardModel) as FirstRewardModel;
+        }
+
+        protected override void OnDispose()
+        {
+        }
+
+        public override void OpenUI(object args = null)
+        {
+            if (ui == null)
+            {
+                ui = new FirstRewardUI(this);
+                ui.Open(args);
+            }
+        }
+
+        public override void CloseUI(object args = null)
+        {
+            if (ui != null && !ui.isClose)
+            {
+                ui.Close();
+            }
+            ui = null;
+        }
+        #endregion
+
+        #region 消息
+        public override uint GetOpenUIMsg(string uiName)
+        {
+            return openUIMsg;
+        }
+        public override uint GetCloseUIMsg(string uiName)
+        {
+            return closeUIMsg;
+        }
+
+        protected override void AddListener()
+        {
+            uiCtrlDispatcher.AddListener(openUIMsg, OpenUI);
+            uiCtrlDispatcher.AddListener(closeUIMsg, CloseUI);
+        }
+        protected override void RemoveListener()
+        {
+            uiCtrlDispatcher.RemoveListener(openUIMsg, OpenUI);
+            uiCtrlDispatcher.RemoveListener(closeUIMsg, CloseUI);
+        }
+
+        protected override void AddServerListener()
+        {
+
+        }
+        protected override void RemoveServerListener()
+        {
+
+        }
+        #endregion
+    }
+}
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 21efe86f0ac02734e96c5d7aec67f1e2
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
@@ -3,6 +3,7 @@ using DG.Tweening;
 using BingoBrain.Core;
 using FGUI.JRewardPop;
 using DontConfuse;
+using FGUI.ACommon;

 namespace BingoBrain
 {
@@ -93,9 +94,10 @@ namespace BingoBrain

            var isFree = model.rewardInfo.condition == RewardCondition.None;

-            if (ui.btn_collect is btn_collect btn_collect)
+            if (ui.btn_collect is btn_green_vid btn_collect)
            {
-                btn_collect.cont_state.selectedIndex = isFree ? btn_collect._State_free : btn_collect._State_video;
+                btn_collect.cont_button.selectedIndex = isFree ? 0 : 1;
+                if (!isFree && ConfigSystem.GetConfig<CommonModel>().PiggyBankSwitch == 1) btn_collect.img_saveingpot.visible = true;
            }


@@ -103,16 +105,16 @@ namespace BingoBrain

            // if (!isFree)
            // {
-                DOVirtual.DelayedCall(2, () => { ui.btn_no.visible = true; });
+            DOVirtual.DelayedCall(2, () => { ui.btn_no.visible = true; });

-                ui.btn_collect.SetClick(() =>
-                {
-                    OnClickAdCollect(item.cashmultiple);
-                });
-                ui.btn_no.SetClick(() =>
-                {
-                    OnClickCancel();
-                });
+            ui.btn_collect.SetClick(() =>
+            {
+                OnClickAdCollect(item.cashmultiple);
+            });
+            ui.btn_no.SetClick(() =>
+            {
+                OnClickCancel();
+            });

            // }
            // else
@@ -144,7 +146,8 @@ namespace BingoBrain
            model.rewardInfo.GetRewardDataList()[0].value = model.rewardInfo.GetRewardDataList()[0].value / 10;
            UsaSystem.GetReward(model.rewardInfo);
            CtrlCloseUI();
-            GameHelper.ShowInterstitial("interstitial_skipAd");
+            // GameHelper.ShowInterstitial("interstitial_skipAd");
+            GameHelper.addInterAdnumber();
        }
    }
 }
@@ -41,6 +41,7 @@ namespace BingoBrain
        private bool isRiseUI;

        private Action CloseCb;
+        public int ui_index = 0;

        public GodPleAcUI(GodPleAcUICtrl ctrl) : base(ctrl)
        {
@@ -103,6 +104,8 @@ namespace BingoBrain

        protected override void OnOpenBefore(object args)
        {
+            ui_index = UnityEngine.Random.Range(0, 99999);
+            Debug.Log("fasongyiciguanbi" + ui_index);
            UICtrlDispatcher.Instance.Dispatch(SkinInfo.MaskUI_Open);
            if (args is GodDa displayModel)
            {
@@ -184,7 +187,11 @@ namespace BingoBrain

                                if (completeSum >= ui.com_Coins.numChildren)
                                {
-                                    var tw6 = DOVirtual.DelayedCall(0.2f, CtrlCloseUI);
+                                    var tw6 = DOVirtual.DelayedCall(0.2f, () =>
+                                    {
+                                        uiCtrlDispatcher.Dispatch(SkinInfo.GodPleAcUI_Close, ui_index);
+                                        Debug.Log("fasongyiciguanbi" + ui_index);
+                                    });
                                    tweenQueue.Enqueue(tw6);
                                }
                            });
@@ -1,5 +1,7 @@
+
 using BingoBrain.Core;
 using BingoBrain.HotFix;
+using UnityEngine;

 namespace BingoBrain
 {
@@ -29,6 +31,7 @@ namespace BingoBrain

        public override void CloseUI(object args = null)
        {
+            if (args != null && ui.ui_index != (int)args) return;
            if (ui != null && !ui.isClose)
            {
                ui.Close();
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: ab00c3d5c44ee3d4fa5b2caa5721ae17
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
@@ -0,0 +1,25 @@
+using BingoBrain.Core;
+
+namespace BingoBrain
+{
+    public class H5Ctrl : BaseCtrl
+    {
+        public static H5Ctrl Instance { get; private set; }
+
+        private H5Model model;
+
+        #region 生命周期
+        protected override void OnInit()
+        {
+            Instance = this;
+            //model = ModuleManager.Instance..GetModel(ModelConst.H5Model) as H5Model;
+        }
+
+        protected override void OnDispose()
+        {
+            Instance = null;
+        }
+
+        #endregion
+    }
+}
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 9f0d89ff894a1074494420d446333bfc
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
@@ -0,0 +1,23 @@
+using BingoBrain.Core;
+
+namespace BingoBrain
+{
+    public class H5Model : BaseModel
+    {
+        #region 生命周期
+
+        protected override void OnInit()
+        {
+        }
+
+        protected override void OnDispose()
+        {
+        }
+
+        protected override void OnReset()
+        {
+        }
+
+        #endregion
+    }
+}
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 2ad9b45c44f492b4a97fc9845e2972a8
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
@@ -0,0 +1,244 @@
+using BingoBrain.Core;
+using BingoBrain.HotFix;
+using DontConfuse;
+using FGUI.ACommon;
+using FGUI.webview;
+using UnityEngine;
+
+namespace BingoBrain
+{
+    public class H5UI : BaseUI
+    {
+        private H5UICtrl ctrl;
+        private H5Model model;
+        private com_webview ui;
+
+        public H5UI(H5UICtrl ctrl) : base(ctrl)
+        {
+            uiName = UIConst.H5UI;
+            this.ctrl = ctrl;
+        }
+
+        protected override void SetUIInfo(UIInfo uiInfo)
+        {
+            uiInfo.packageName = "webview";
+            uiInfo.assetName = "com_webview";
+            uiInfo.layerType = UILayerType.Popup;
+            uiInfo.isNeedOpenAnim = false;
+            uiInfo.isNeedCloseAnim = false;
+            uiInfo.isNeedUIMask = true;
+        }
+
+        #region 生命周期
+        protected override void OnInit()
+        {
+            //model = ModuleManager.Instance.GetModel(ModelConst.H5Model) as H5Model;
+        }
+
+        protected override void OnClose()
+        {
+            WebviewManager.Instance.setInH5View(false);
+            WebviewManager.Instance.ShowH5View(false);
+        }
+
+        protected override void OnBind()
+        {
+            ui = baseUI as FGUI.webview.com_webview;
+        }
+
+        protected override void OnOpenBefore(object args)
+        {
+            WebviewManager.Instance.setInH5View(true);
+            // delayedCall = DOVirtual.DelayedCall(0.3f, () =>
+            //   {
+            WebviewManager.Instance.ShowH5View(true);
+            ui.btn_close.SetClick(() =>
+            {
+                UICtrlDispatcher.Instance.Dispatch(SkinInfo.H5UI_Close);
+            });
+            InitView();
+
+        }
+
+        protected override void OnOpen(object args)
+        {
+        }
+
+        protected override void OnHide()
+        {
+        }
+
+        protected override void OnDisplay(object args)
+        {
+        }
+        #endregion
+
+        #region 消息
+        protected override void AddListener()
+        {
+
+        }
+        protected override void RemoveListener()
+        {
+
+        }
+        #endregion
+
+        //初始化页面逻辑
+        private void InitView()
+        {
+
+        }
+        public void ClickBtn(string name)
+        {
+            // // Debug.Log("[UNITY] Click btn: " + name);
+            // FGUIHelper.PlayClickSound();
+            if (name == "flyBtn")
+            {
+                OnClickFlyCash();
+                NetworkKit.BuriedPoint(BuriedPointEvent.Hall_behavior, BuriedPointEvent.collect_fly_number, 1);
+                //NetworkKit.BuriedPoint(BuriedPointEvent.Hall_behavior,BuriedPointEvent.collect_fly_people,1);
+            }
+            else if (name == "rewardBtn")
+            {
+                OnClickIcon();
+
+            }
+        }
+        private void OnClickFlyCash()
+        {
+            // PreferencesMgr.Instance.AdCashFlyShowTime =
+            //     GameHelper.GetNowTime() + ConfigSystem.GetConfig<CommonModel>().flyCD;
+            // var rewardData = new RewardData();
+
+            // var singleValue =
+            //     (decimal)Math.Round(
+            //         UnityEngine.Random.Range(ConfigSystem.GetConfig<CommonModel>().flyReward[0],
+            //             ConfigSystem.GetConfig<CommonModel>().flyReward[1]), 2);
+
+
+            // decimal rewardValue;
+
+
+            // if (flyClickCount >= flyNeedClickCount)
+            // {
+            //     flyClickCount = -1;
+            //     //var rate = GameHelper.GetVideoRate();
+            //     rewardValue = singleValue;
+            //     GameHelper.ShowVideoAd("reward_fly", isCompleted =>
+            //     {
+            //         if (isCompleted)
+            //         {
+            //             GameDispatcher.Instance.Dispatch(GameMsg.GetReward, rewardData);
+            //             GameDispatcher.Instance.Dispatch(GameMsg.RefreshMakeupData);
+            //         }
+            //     });
+            // }
+            // else
+            // {
+            //     rewardValue = singleValue;
+            // }
+
+            // var startPosition = GameHelper.GetUICenterPosition(ui.com_fly);
+            // var endPosition = GameHelper.GetUICenterPosition(ui.com_top.text_num);
+
+            // var rewardSingleData = new RewardSingleData(102, rewardValue, RewardOrigin.H5Fly101)
+            // {
+            //     startPosition = startPosition,
+            //     endPosition = new Vector2(endPosition.x - 150, endPosition.y - 106)
+            // };
+
+            // rewardData.AddReward(rewardSingleData);
+            // rewardData.displayType = RewardDisplayType.RewardFly | RewardDisplayType.ValueChange;
+            // rewardData.AddCompleted(isSuccess =>
+            // {
+            //     if (isSuccess)
+            //     {
+            //         flyClickCount++;
+            //     }
+
+            //     SetMakeup();
+            // });
+            // //GameHelper.addMoney((float)rewardValue);
+            // GameDispatcher.Instance.Dispatch(GameMsg.GetReward, rewardData);
+            // GameDispatcher.Instance.Dispatch(GameMsg.RefreshMakeupData);
+            // CheckShowFly();
+        }
+        private void OnClickIcon()
+        {
+            //             //WebThroughUtil.WebThroughClick(H5WebThroughType.OnlineH5, ui.btn_icon);
+            //             if (iconTime < ConfigSystem.GetConfig<CommonModel>().ThroughRewardCD)
+            //             {
+            //                 return;
+            //             }
+
+            // #if UNITY_IOS && !UNITY_EDITOR
+            //                         WebviewManager.Instance.ShowH5View(false);
+            // #endif
+
+            //             float[] cash_array = GameHelper.GetRewardValue(2);
+
+            //             // var temp = new { is_success = true, cash_number = cash_array[0], rate = cash_array[1], is_level_success = false, is_h5_reward = true };
+            //             SuccessData temp = new SuccessData();
+            //             temp.IsWin = true;
+            //             temp.cash_number = cash_array[0];
+            //             temp.rate = (int)cash_array[1];
+            //             temp.IsLevelSuccess = false;
+            //             temp.IsH5Reward = true;
+            //             UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.LevelSuccessUI_Open, temp);
+
+            //             //UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.RewardUI_Open);
+            //             // var rewardData = new RewardData();
+
+            //             // var rewardType = 111;
+            //             // decimal rewardValue = (decimal)GameHelper.GetRewardValue(3)[0];
+
+            //             // var rewardSingleData = new RewardSingleData(rewardType, rewardValue, RewardOrigin.H5Icon)
+            //             // {
+            //             //     startPosition = GameHelper.GetUICenterPosition(ui.btn_icon),
+            //             //     endPosition = GameHelper.GetUICenterPosition(ui.com_top.text_num)
+            //             // };
+            //             // rewardData.AddReward(rewardSingleData);
+            //             // rewardData.AddCompleted(isSuccess =>
+            //             // {
+            //             //     ui.btn_icon.cont_state.selectedIndex = btn_icon.State_none;
+            //             //     iconTime = 0;
+            //             //     SetMakeup();
+            //             // });
+            //             // rewardData.condition = RewardCondition.AD;
+            //             // rewardData.displayType =
+            //             //     RewardDisplayType.Dialog | RewardDisplayType.RewardFly | RewardDisplayType.ValueChange;
+
+            //             // GameDispatcher.Instance.Dispatch(GameMsg.GetReward, rewardData);
+
+            //             // GameHelper.addMoney((float)rewardValue);
+            //             // GameDispatcher.Instance.Dispatch(GameMsg.GetReward, rewardData);
+            //             // GameDispatcher.Instance.Dispatch(GameMsg.RefreshMakeupData);
+
+
+            //             iconTime = 0;
+            //             // SetMakeup();
+            //             NetworkKit.BuriedPoint(BuriedPointEvent.Hall_behavior, BuriedPointEvent.annular_get_number, 1);
+        }
+        private void CheckShowFly()
+        {
+            // var nowTime = GameHelper.GetNowTime();
+            // var leftTime = (int)(PreferencesMgr.Instance.AdCashFlyShowTime - nowTime);
+
+            // ui.com_fly.visible = false;
+            // ui.com_fly.visible = leftTime <= 0;
+            // if (leftTime > 0)
+            // {
+            //     WebviewManager.Instance.ShowFlyBtn(false);
+            //     isFlyShow = false;
+            // }
+            // else
+            // {
+            //     //StartFly();
+            //     if (!isFlyShow) WebviewManager.Instance.ShowFlyBtn(true);
+            //     isFlyShow = true;
+
+            // }
+        }
+    }
+}
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 345404ec69f13b84c9ce0415061b717b
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
@@ -0,0 +1,79 @@
+using BingoBrain.Core;
+using BingoBrain.HotFix;
+
+namespace BingoBrain
+{
+    public class H5UICtrl : BaseUICtrl
+    {
+        private H5UI ui;
+        private H5Model model;
+
+        private uint openUIMsg = SkinInfo.H5UI_Open;
+        private uint closeUIMsg = SkinInfo.H5UI_Close;
+
+        #region 生命周期
+        protected override void OnInit()
+        {
+            //model = ModuleManager.Instance.GetModel(ModelConst.H5Model) as H5Model;
+        }
+
+        protected override void OnDispose()
+        {
+        }
+
+        public override void OpenUI(object args = null)
+        {
+            if (ui == null)
+            {
+                ui = new H5UI(this);
+                ui.Open(args);
+            }
+        }
+
+        public override void CloseUI(object args = null)
+        {
+            if (ui != null && !ui.isClose)
+            {
+                ui.Close();
+            }
+            ui = null;
+        }
+        #endregion
+
+        #region 消息
+        public override uint GetOpenUIMsg(string uiName)
+        {
+            return openUIMsg;
+        }
+        public override uint GetCloseUIMsg(string uiName)
+        {
+            return closeUIMsg;
+        }
+
+        protected override void AddListener()
+        {
+            uiCtrlDispatcher.AddListener(openUIMsg, OpenUI);
+            uiCtrlDispatcher.AddListener(closeUIMsg, CloseUI);
+            gameDispatcher.AddListener(BingoInfo.H5ViewClickBtn, OnH5ClickBtn);
+        }
+        protected override void RemoveListener()
+        {
+            uiCtrlDispatcher.RemoveListener(openUIMsg, OpenUI);
+            uiCtrlDispatcher.RemoveListener(closeUIMsg, CloseUI);
+            gameDispatcher.RemoveListener(BingoInfo.H5ViewClickBtn, OnH5ClickBtn);
+        }
+        void OnH5ClickBtn(object arg)
+        {
+            ui?.ClickBtn((string)arg);
+        }
+        protected override void AddServerListener()
+        {
+
+        }
+        protected override void RemoveServerListener()
+        {
+
+        }
+        #endregion
+    }
+}
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 74ecd6e2beb102e4e9eee8ad48c987d6
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
@@ -82,7 +82,7 @@ namespace BingoBrain
                {
                    var aRichTextField = new GTextField();
                    aRichTextField.SetSize(GRoot.inst.width, 100);
-                    aRichTextField.color = new Color32(193,114,83,1);
+                    aRichTextField.color = new Color32(19,136,198,1);


                    aRichTextField.textFormat.size = 38;
@@ -71,10 +71,7 @@ namespace BingoBrain
                    CtrlCloseUI();
                });
            }
-            ui.btn_website.SetClick(() =>
-            {
-                OpenBrowser.OpenURL("https://bingotor.com/");
-            });
+            ui.gift.selectedIndex = GameHelper.IsGiftSwitch() ? 1 : 0;
        }

        private void OnClickSoundBtn()
@@ -172,7 +172,7 @@ namespace BingoBrain
                        else
                        {
                            day.cont_currency.selectedIndex = btn_day2.Currency_diam;
-                            day.text_reward.text = $"{GameHelper.Get102Str((decimal)dailyBonus.quantity)}";
+                            day.text_reward.text = (GameHelper.isRDExchangeMode() && GameHelper.IsGiftSwitch()) ?$"{dailyBonus.quantity:N}" : GameHelper.Get102Str((decimal)dailyBonus.quantity);
                        }

                        day.text_day.text = "Day " + (index + 1);
@@ -212,7 +212,7 @@ namespace BingoBrain
                        else
                        {
                            day.cont_currency.selectedIndex = btn_day.Currency_diam;
-                            day.text_reward.text = $"{GameHelper.Get102Str((decimal)dailyBonus.quantity):N}";
+                            day.text_reward.text = (GameHelper.isRDExchangeMode() && GameHelper.IsGiftSwitch()) ? $"{dailyBonus.quantity:N}" : GameHelper.Get102Str((decimal)dailyBonus.quantity);
                        }

                        day.text_day.text = "Day " + (index + 1);
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 70abc757db03fa14fb55166286e33e82
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
@@ -0,0 +1,25 @@
+using BingoBrain.Core;
+
+namespace BingoBrain
+{
+    public class LoginACtrl : BaseCtrl
+    {
+        public static LoginACtrl Instance { get; private set; }
+
+        private LoginAModel model;
+
+        #region 生命周期
+        protected override void OnInit()
+        {
+            Instance = this;
+            //model = ModuleManager.Instance..GetModel(ModelConst.LoginAModel) as LoginAModel;
+        }
+
+        protected override void OnDispose()
+        {
+            Instance = null;
+        }
+
+        #endregion
+    }
+}
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: d7be6d39d4fce5d48891f72ae83a8f9e
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
@@ -0,0 +1,23 @@
+using BingoBrain.Core;
+
+namespace BingoBrain
+{
+    public class LoginAModel : BaseModel
+    {
+        #region 生命周期
+
+        protected override void OnInit()
+        {
+        }
+
+        protected override void OnDispose()
+        {
+        }
+
+        protected override void OnReset()
+        {
+        }
+
+        #endregion
+    }
+}
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: ed73858f32591a24abd037f84d05f7b4
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
@@ -0,0 +1,84 @@
+using BingoBrain.Core;
+using BingoBrain.HotFix;
+using FGUI.ACommon;
+using UnityEngine;
+
+namespace BingoBrain
+{
+    public class LoginAUI : BaseUI
+    {
+        private LoginAUICtrl ctrl;
+        private LoginAModel model;
+        private FGUI.JLoading.com_login_a ui;
+
+        public LoginAUI(LoginAUICtrl ctrl) : base(ctrl)
+        {
+            uiName = UIConst.LoginAUI;
+            this.ctrl = ctrl;
+        }
+
+        protected override void SetUIInfo(UIInfo uiInfo)
+        {
+            uiInfo.packageName = "JLoading";
+            uiInfo.assetName = "com_login_a";
+            uiInfo.layerType = UILayerType.Normal;
+            uiInfo.isNeedOpenAnim = false;
+            uiInfo.isNeedCloseAnim = false;
+            uiInfo.isNeedUIMask = true;
+        }
+
+        #region 生命周期
+        protected override void OnInit()
+        {
+            //model = ModuleManager.Instance.GetModel(ModelConst.LoginAModel) as LoginAModel;
+        }
+
+        protected override void OnClose()
+        {
+        }
+
+        protected override void OnBind()
+        {
+            ui = baseUI as FGUI.JLoading.com_login_a;
+        }
+
+        protected override void OnOpenBefore(object args)
+        {
+            InitView();
+        }
+
+        protected override void OnOpen(object args)
+        {
+        }
+
+        protected override void OnHide()
+        {
+        }
+
+        protected override void OnDisplay(object args)
+        {
+        }
+        #endregion
+
+        #region 消息
+        protected override void AddListener()
+        {
+            AppDispatcher.Instance.AddListener(CsjInfoC.Show_uid, Show_uid);
+        }
+        protected override void RemoveListener()
+        {
+            AppDispatcher.Instance.RemoveListener(CsjInfoC.Show_uid, Show_uid);
+        }
+        void Show_uid(object a = null)
+        {
+            ui.text_uid.text = "uid" + GameHelper.GetLoginModel().uid;
+        }
+        #endregion
+
+        //初始化页面逻辑
+        private void InitView()
+        {
+
+        }
+    }
+}
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 7508c9044c7bcc74e83c032adca95c66
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
@@ -0,0 +1,74 @@
+using BingoBrain.Core;
+using BingoBrain.HotFix;
+
+namespace BingoBrain
+{
+    public class LoginAUICtrl : BaseUICtrl
+    {
+        private LoginAUI ui;
+        private LoginAModel model;
+
+        private uint openUIMsg = SkinInfo.LoginAUI_Open;
+        private uint closeUIMsg = SkinInfo.LoginAUI_Close;
+
+        #region 生命周期
+        protected override void OnInit()
+        {
+            //model = ModuleManager.Instance.GetModel(ModelConst.LoginAModel) as LoginAModel;
+        }
+
+        protected override void OnDispose()
+        {
+        }
+
+        public override void OpenUI(object args = null)
+        {
+            if (ui == null)
+            {
+                ui = new LoginAUI(this);
+                ui.Open(args);
+            }
+        }
+
+        public override void CloseUI(object args = null)
+        {
+            if (ui != null && !ui.isClose)
+            {
+                ui.Close();
+            }
+            ui = null;
+        }
+        #endregion
+
+        #region 消息
+        public override uint GetOpenUIMsg(string uiName)
+        {
+            return openUIMsg;
+        }
+        public override uint GetCloseUIMsg(string uiName)
+        {
+            return closeUIMsg;
+        }
+
+        protected override void AddListener()
+        {
+            uiCtrlDispatcher.AddListener(openUIMsg, OpenUI);
+            uiCtrlDispatcher.AddListener(closeUIMsg, CloseUI);
+        }
+        protected override void RemoveListener()
+        {
+            uiCtrlDispatcher.RemoveListener(openUIMsg, OpenUI);
+            uiCtrlDispatcher.RemoveListener(closeUIMsg, CloseUI);
+        }
+
+        protected override void AddServerListener()
+        {
+
+        }
+        protected override void RemoveServerListener()
+        {
+
+        }
+        #endregion
+    }
+}
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 66ca3c84bf1bcdf4db260da89e5610db
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: c88dc545c836423438690ea89702f985
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
@@ -0,0 +1,25 @@
+using BingoBrain.Core;
+
+namespace BingoBrain
+{
+    public class MakeupConfirmCtrl : BaseCtrl
+    {
+        public static MakeupConfirmCtrl Instance { get; private set; }
+
+        private MakeupConfirmModel model;
+
+        #region 生命周期
+        protected override void OnInit()
+        {
+            Instance = this;
+            //model = ModuleManager.Instance..GetModel(ModelConst.MakeupConfirmModel) as MakeupConfirmModel;
+        }
+
+        protected override void OnDispose()
+        {
+            Instance = null;
+        }
+
+        #endregion
+    }
+}
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 992ca3a050715ff49b56b6eab3472028
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
@@ -0,0 +1,23 @@
+using BingoBrain.Core;
+
+namespace BingoBrain
+{
+    public class MakeupConfirmModel : BaseModel
+    {
+        #region 生命周期
+
+        protected override void OnInit()
+        {
+        }
+
+        protected override void OnDispose()
+        {
+        }
+
+        protected override void OnReset()
+        {
+        }
+
+        #endregion
+    }
+}
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 950aecd0ab2e25940a45cfc16de3c1ce
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 279f68dd0122f1140b46914e6d166617
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
@@ -0,0 +1,74 @@
+using BingoBrain.Core;
+using BingoBrain.HotFix;
+
+namespace BingoBrain
+{
+    public class MakeupConfirmUICtrl : BaseUICtrl
+    {
+        private MakeupConfirmUI ui;
+        private MakeupConfirmModel model;
+
+        private uint openUIMsg = SkinInfo.MakeupConfirmUI_Open;
+        private uint closeUIMsg = SkinInfo.MakeupConfirmUI_Close;
+
+        #region 生命周期
+        protected override void OnInit()
+        {
+            //model = ModuleManager.Instance.GetModel(ModelConst.MakeupConfirmModel) as MakeupConfirmModel;
+        }
+
+        protected override void OnDispose()
+        {
+        }
+
+        public override void OpenUI(object args = null)
+        {
+            if (ui == null)
+            {
+                ui = new MakeupConfirmUI(this);
+                ui.Open(args);
+            }
+        }
+
+        public override void CloseUI(object args = null)
+        {
+            if (ui != null && !ui.isClose)
+            {
+                ui.Close();
+            }
+            ui = null;
+        }
+        #endregion
+
+        #region 消息
+        public override uint GetOpenUIMsg(string uiName)
+        {
+            return openUIMsg;
+        }
+        public override uint GetCloseUIMsg(string uiName)
+        {
+            return closeUIMsg;
+        }
+
+        protected override void AddListener()
+        {
+            uiCtrlDispatcher.AddListener(openUIMsg, OpenUI);
+            uiCtrlDispatcher.AddListener(closeUIMsg, CloseUI);
+        }
+        protected override void RemoveListener()
+        {
+            uiCtrlDispatcher.RemoveListener(openUIMsg, OpenUI);
+            uiCtrlDispatcher.RemoveListener(closeUIMsg, CloseUI);
+        }
+
+        protected override void AddServerListener()
+        {
+
+        }
+        protected override void RemoveServerListener()
+        {
+
+        }
+        #endregion
+    }
+}
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: b35458b519a76474ba76f69f4da2f3de
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: c30937b710555294d8045052a0d9712c
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
@@ -0,0 +1,25 @@
+using BingoBrain.Core;
+
+namespace BingoBrain
+{
+    public class PalCtrl : BaseCtrl
+    {
+        public static PalCtrl Instance { get; private set; }
+
+        private PalModel model;
+
+        #region 生命周期
+        protected override void OnInit()
+        {
+            Instance = this;
+            //model = ModuleManager.Instance..GetModel(ModelConst.PalModel) as PalModel;
+        }
+
+        protected override void OnDispose()
+        {
+            Instance = null;
+        }
+
+        #endregion
+    }
+}
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: aa2b2f6680825b04f941dfa669ad3ed7
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
@@ -0,0 +1,23 @@
+using BingoBrain.Core;
+
+namespace BingoBrain
+{
+    public class PalModel : BaseModel
+    {
+        #region 生命周期
+
+        protected override void OnInit()
+        {
+        }
+
+        protected override void OnDispose()
+        {
+        }
+
+        protected override void OnReset()
+        {
+        }
+
+        #endregion
+    }
+}
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 2db57b7b73c78574b85db16295855638
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
@@ -0,0 +1,98 @@
+using BingoBrain.Core;
+using BingoBrain.HotFix;
+using FairyGUI;
+using FGUI.ACommon;
+using FGUI.JMain;
+using UnityEngine;
+
+namespace BingoBrain
+{
+    public class PalUI : BaseUI
+    {
+        private PalUICtrl ctrl;
+        private PalModel model;
+        private FGUI.JMain.com_pal ui;
+
+        public PalUI(PalUICtrl ctrl) : base(ctrl)
+        {
+            uiName = UIConst.PalUI;
+            this.ctrl = ctrl;
+        }
+
+        protected override void SetUIInfo(UIInfo uiInfo)
+        {
+            uiInfo.packageName = "JMain";
+            uiInfo.assetName = "com_pal";
+            uiInfo.layerType = UILayerType.Popup;
+            uiInfo.isNeedOpenAnim = false;
+            uiInfo.isNeedCloseAnim = false;
+            uiInfo.isNeedUIMask = true;
+        }
+
+        #region 生命周期
+        protected override void OnInit()
+        {
+            //model = ModuleManager.Instance.GetModel(ModelConst.PalModel) as PalModel;
+        }
+
+        protected override void OnClose()
+        {
+        }
+
+        protected override void OnBind()
+        {
+            ui = baseUI as FGUI.JMain.com_pal;
+        }
+
+        protected override void OnOpenBefore(object args)
+        {
+            ui.list_pal.itemRenderer = RendererList;
+            ui.list_pal.numItems = 2;
+
+
+            ui.list_pal.scrollPane.onScrollEnd.Add(() =>
+            {
+                int index = ui.list_pal.GetFirstChildInView();
+
+                ui.state.selectedIndex = index;
+            });
+            ui.btn_close.SetClick(CtrlCloseUI);
+            InitView();
+        }
+
+        protected override void OnOpen(object args)
+        {
+        }
+
+        protected override void OnHide()
+        {
+        }
+
+        protected override void OnDisplay(object args)
+        {
+        }
+        #endregion
+
+        #region 消息
+        protected override void AddListener()
+        {
+
+        }
+        protected override void RemoveListener()
+        {
+
+        }
+        #endregion
+        void RendererList(int index, GObject obj)
+        {
+            item_pal item = obj as item_pal;
+            item.state.selectedIndex = index;
+
+        }
+        //初始化页面逻辑
+        private void InitView()
+        {
+
+        }
+    }
+}
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 94c75695fa5b4964c8e7be3f52fbb99d
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
@@ -0,0 +1,74 @@
+using BingoBrain.Core;
+using BingoBrain.HotFix;
+
+namespace BingoBrain
+{
+    public class PalUICtrl : BaseUICtrl
+    {
+        private PalUI ui;
+        private PalModel model;
+
+        private uint openUIMsg = SkinInfo.PalUI_Open;
+        private uint closeUIMsg = SkinInfo.PalUI_Close;
+
+        #region 生命周期
+        protected override void OnInit()
+        {
+            //model = ModuleManager.Instance.GetModel(ModelConst.PalModel) as PalModel;
+        }
+
+        protected override void OnDispose()
+        {
+        }
+
+        public override void OpenUI(object args = null)
+        {
+            if (ui == null)
+            {
+                ui = new PalUI(this);
+                ui.Open(args);
+            }
+        }
+
+        public override void CloseUI(object args = null)
+        {
+            if (ui != null && !ui.isClose)
+            {
+                ui.Close();
+            }
+            ui = null;
+        }
+        #endregion
+
+        #region 消息
+        public override uint GetOpenUIMsg(string uiName)
+        {
+            return openUIMsg;
+        }
+        public override uint GetCloseUIMsg(string uiName)
+        {
+            return closeUIMsg;
+        }
+
+        protected override void AddListener()
+        {
+            uiCtrlDispatcher.AddListener(openUIMsg, OpenUI);
+            uiCtrlDispatcher.AddListener(closeUIMsg, CloseUI);
+        }
+        protected override void RemoveListener()
+        {
+            uiCtrlDispatcher.RemoveListener(openUIMsg, OpenUI);
+            uiCtrlDispatcher.RemoveListener(closeUIMsg, CloseUI);
+        }
+
+        protected override void AddServerListener()
+        {
+
+        }
+        protected override void RemoveServerListener()
+        {
+
+        }
+        #endregion
+    }
+}
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: f59034f142a0ceb4891d4a541c350d35
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 929445620293f0a40a24fb36e503ba37
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
@@ -0,0 +1,25 @@
+using BingoBrain.Core;
+
+namespace BingoBrain
+{
+    public class PettyAwardCtrl : BaseCtrl
+    {
+        public static PettyAwardCtrl Instance { get; private set; }
+
+        private PettyAwardModel model;
+
+        #region 生命周期
+        protected override void OnInit()
+        {
+            Instance = this;
+            //model = ModuleManager.Instance..GetModel(ModelConst.PettyAwardModel) as PettyAwardModel;
+        }
+
+        protected override void OnDispose()
+        {
+            Instance = null;
+        }
+
+        #endregion
+    }
+}
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 90b28f931a8a485439898f66ca3a9822
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
@@ -0,0 +1,23 @@
+using BingoBrain.Core;
+
+namespace BingoBrain
+{
+    public class PettyAwardModel : BaseModel
+    {
+        #region 生命周期
+
+        protected override void OnInit()
+        {
+        }
+
+        protected override void OnDispose()
+        {
+        }
+
+        protected override void OnReset()
+        {
+        }
+
+        #endregion
+    }
+}
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 88d12f04c8019c541bb34a5ed9e11b72
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
@@ -0,0 +1,319 @@
+using System;
+using BingoBrain.Core;
+using BingoBrain.HotFix;
+using DontConfuse;
+using FGUI.ACommon;
+using Newtonsoft.Json;
+using Spine.Unity;
+using UnityEngine;
+
+namespace BingoBrain
+{
+    public class PettyAwardUI : BaseUI
+    {
+        private PettyAwardUICtrl ctrl;
+        private PettyAwardModel model;
+        private FGUI.ZM_Petty.com_petty_award ui;
+        private Action closeCallback;
+        public PettyAwardUI(PettyAwardUICtrl ctrl) : base(ctrl)
+        {
+            uiName = UIConst.PettyAwardUI;
+            this.ctrl = ctrl;
+        }
+
+        protected override void SetUIInfo(UIInfo uiInfo)
+        {
+            uiInfo.packageName = "ZM_Petty";
+            uiInfo.assetName = "com_petty_award";
+            uiInfo.layerType = UILayerType.Popup;
+            uiInfo.isNeedOpenAnim = false;
+            uiInfo.isNeedCloseAnim = false;
+            uiInfo.isNeedUIMask = true;
+        }
+
+        #region 生命周期
+        protected override void OnInit()
+        {
+            //model = ModuleManager.Instance.GetModel(ModelConst.PettyAwardModel) as PettyAwardModel;
+        }
+
+        protected override void OnClose()
+        {
+            closeCallback?.Invoke();
+        }
+
+        protected override void OnBind()
+        {
+            ui = baseUI as FGUI.ZM_Petty.com_petty_award;
+        }
+
+        protected override void OnOpenBefore(object args)
+        {
+
+            InitView();
+        }
+
+        protected override void OnOpen(object args)
+        {
+            //open_sign = (System.Action)args;
+        }
+
+        protected override void OnHide()
+        {
+        }
+
+        protected override void OnDisplay(object args)
+        {
+        }
+        #endregion
+
+        #region 消息
+        protected override void AddListener()
+        {
+
+        }
+        protected override void RemoveListener()
+        {
+
+        }
+        #endregion
+
+
+        private int _mLastState;
+        //初始化页面逻辑
+        private void InitView()
+        {
+            _mLastState = SaveData.GetSaveobject().PettyState;
+            Debug.Log($"PettyState============: {SaveData.GetSaveobject().PettyState}");
+            var num = GameHelper.GetCommonModel().SmallReward;
+            ui.com_get_panel.text_reward.text = $"{GameHelper.Get102Str(num)} USD";
+
+
+            ui.com_get_panel.btn_get.SetClick(GotoEnterAccount);
+            ui.btn_close.SetClick(() =>
+            {
+                if (ui.state.selectedIndex == 4)
+                {
+                    GotoEnterAccount();
+                }
+                else
+                {
+                    CtrlCloseUI();
+                }
+            });
+
+            if (_mLastState == 0)
+            {
+                // SkeletonAnimation sk = FXManager.Instance.SetFx<SkeletonAnimation>(ui.anim, Fx_Type.fx_petty_reward, ref closeCallback);
+                SkeletonAnimation sk = null;
+                FX.Instance.SetFx<SkeletonAnimation>(ui.anim, Fx_Type.fx_petty_reward,
+                    ps =>
+                    {
+                        //  ps.transform.localPosition = new Vector3(0, 195, 0);
+                        sk = ps;
+
+                    }, closeCallback);
+
+                sk.state.SetAnimation(0, "newbie_reward_an01", false);
+
+                sk.state.Complete += (a) =>
+                {
+                    sk.state.SetAnimation(0, "newbie_reward_an02", true);
+                    ui.btn_gerAward.SetClick(() =>
+                    {
+                        ui.btn_gerAward.visible = false;
+                        sk.state.SetAnimation(0, "newbie_reward_an03", false);
+                        sk.state.Complete += (a) =>
+                        {
+                            ui.state.selectedIndex = 1;
+                            SaveData.GetSaveobject().PettyState = 1;
+                            ui.anim.visible = false;
+                        };
+                    });
+
+                };
+            }
+            else
+            {
+                GotoPanel(_mLastState);
+            }
+        }
+
+        private void GotoPanel(int index)
+        {
+            switch (index)
+            {
+                case 1:
+                    ui.state.selectedIndex = 1;
+                    break;
+                case 2:
+                    ui.state.selectedIndex = 2;
+                    GotoEnterAccount();
+                    break;
+                case 3:
+                    ui.state.selectedIndex = 3;
+                    GotoDetail();
+                    break;
+            }
+        }
+
+        private void GotoEnterAccount()
+        {
+            ui.state.selectedIndex = 2;
+            SaveData.GetSaveobject().PettyState = 2;
+            if (!SaveData.GetSaveobject().PettyAccount.IsNullOrWhiteSpace())
+            {
+                ui.com_account.com_email.enter_email.text = SaveData.GetSaveobject().PettyAccount;
+            }
+            if (!SaveData.GetSaveobject().PettyFirstName.IsNullOrWhiteSpace())
+            {
+                ui.com_account.com_first_name.enter_first_name.text = SaveData.GetSaveobject().PettyFirstName;
+            }
+            if (!SaveData.GetSaveobject().PettyLastName.IsNullOrWhiteSpace())
+            {
+                ui.com_account.com_last_name.enter_last_name.text = SaveData.GetSaveobject().PettyLastName;
+            }
+
+            ui.com_account.btn_confirm.SetClick(ConfirmClick);
+        }
+
+        private void ConfirmClick()
+        {
+            var account = ui.com_account.com_email.enter_email.text.Replace(" ", "");
+            if (account == "")
+            {
+                GameHelper.ShowTips("Please enter the correct account information", true);
+                return;
+            }
+
+            if (!GameHelper.CheckAccountValidly(account))
+            {
+                GameHelper.ShowTips("Please enter the correct account information", true);
+                return;
+            }
+
+            var fname = ui.com_account.com_first_name.enter_first_name.text.Replace(" ", "");
+            if (!GameHelper.CheckNameValidly(fname))
+            {
+                GameHelper.ShowTips("Please enter the correct account information", true);
+                return;
+            }
+
+            var lname = ui.com_account.com_last_name.enter_last_name.text.Replace(" ", "");
+            if (!GameHelper.CheckNameValidly(lname))
+            {
+                GameHelper.ShowTips("Please enter the correct account information", true);
+                return;
+            }
+
+            SaveData.GetSaveobject().PettyAccount = account;
+            SaveData.GetSaveobject().PettyFirstName = fname;
+            SaveData.GetSaveobject().PettyLastName = lname;
+
+            GotoSecondConfirm(account, fname, lname);
+
+        }
+
+        private void GotoSecondConfirm(string account, string fname, string lname)
+        {
+            ui.state.selectedIndex = 4;
+            PaymentMsg info = new PaymentMsg
+            {
+                email = account,
+                first_name = fname,
+                last_name = lname
+            };
+
+            ui.com_second_confirm.text_account.SetVar("account", account).FlushVars();
+            ui.com_second_confirm.text_first_name.SetVar("name", fname).FlushVars();
+            ui.com_second_confirm.text_last_name.SetVar("name", lname).FlushVars();
+
+            ui.com_second_confirm.btn_confirm.SetClick(() =>
+            {
+                ui.com_second_confirm.btn_confirm.enabled = false;
+                NetworkKit.PostWithHeader<object>("shop/payOutUserInfo", info, (isSuccess, obj) =>
+                {
+                    Debug.Log("[petty ui]-------------payOutUserInfo---" + JsonConvert.SerializeObject(info));
+                    if (isSuccess)
+                    {
+                        GotoDetail();
+                    }
+                    else
+                    {
+                        GameHelper.ShowTips("Failed to save information., please try again");
+                        ui.com_second_confirm.btn_confirm.enabled = true;
+                    }
+                });
+            });
+        }
+
+        private void GotoDetail()
+        {
+            ui.state.selectedIndex = 3;
+            SaveData.GetSaveobject().PettyState = 3;
+
+            var pettyAmount = SaveData.GetSaveobject().PettyAmount;
+            if (pettyAmount != 0)
+            {
+                ui.com_detail.text_amount.SetVar("num", GameHelper.Get102Str(pettyAmount)).FlushVars();
+            }
+            else
+            {
+                var num = GameHelper.GetCommonModel().SmallReward;
+                ui.com_detail.text_amount.SetVar("num", GameHelper.Get102Str(num)).FlushVars();
+                SaveData.GetSaveobject().PettyAmount = num;
+            }
+
+            var pettyDateTime = SaveData.GetSaveobject().PettyDateTime;
+            if (!pettyDateTime.IsNullOrWhiteSpace())
+            {
+                ui.com_detail.text_data.SetVar("data", pettyDateTime).FlushVars();
+            }
+            else
+            {
+                var dateTime = DateTime.Now.ToString("yyyy.MM.dd");
+                ui.com_detail.text_data.SetVar("data", dateTime).FlushVars();
+                SaveData.GetSaveobject().PettyDateTime = dateTime;
+            }
+
+            var pettyOrderID = SaveData.GetSaveobject().PettyOrderID;
+            if (!pettyOrderID.IsNullOrWhiteSpace())
+            {
+                ui.com_detail.text_order.SetVar("order", pettyOrderID).FlushVars();
+            }
+            else
+            {
+                string datePart = DateTime.Now.ToString("yyyyMMdd");
+                System.Random random = new System.Random();
+                string randomPart = random.Next(1000, 9999).ToString(); // 生成1000-9999之间的四位数
+                ui.com_detail.text_order.SetVar("order", datePart + randomPart).FlushVars();
+
+                SaveData.GetSaveobject().PettyOrderID = datePart + randomPart;
+            }
+
+
+            ui.com_detail.text_email.SetVar("email", SaveData.GetSaveobject().PettyAccount).FlushVars();
+
+            var pettyDataLimit = SaveData.GetSaveobject().PettyDataLimit;
+            if (pettyDataLimit != 0)
+            {
+                ui.com_detail.text_limit.SetVar("day", pettyDataLimit.ToString()).FlushVars();
+            }
+            else
+            {
+                var day = GameHelper.GetCommonModel().ProcessingTime;
+                ui.com_detail.text_limit.SetVar("day", day.ToString()).FlushVars();
+                SaveData.GetSaveobject().PettyDataLimit = day;
+            }
+        }
+    }
+}
+namespace DontConfuse
+{
+    public class PaymentMsg
+    {
+        public string email;
+        public string first_name;
+        public string last_name;
+    }
+}
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 3419b0d0813ffd14294efe17fecb0b0e
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
@@ -0,0 +1,74 @@
+using BingoBrain.Core;
+using BingoBrain.HotFix;
+
+namespace BingoBrain
+{
+    public class PettyAwardUICtrl : BaseUICtrl
+    {
+        private PettyAwardUI ui;
+        private PettyAwardModel model;
+
+        private uint openUIMsg = SkinInfo.PettyAwardUI_Open;
+        private uint closeUIMsg = SkinInfo.PettyAwardUI_Close;
+
+        #region 生命周期
+        protected override void OnInit()
+        {
+            //model = ModuleManager.Instance.GetModel(ModelConst.PettyAwardModel) as PettyAwardModel;
+        }
+
+        protected override void OnDispose()
+        {
+        }
+
+        public override void OpenUI(object args = null)
+        {
+            if (ui == null)
+            {
+                ui = new PettyAwardUI(this);
+                ui.Open(args);
+            }
+        }
+
+        public override void CloseUI(object args = null)
+        {
+            if (ui != null && !ui.isClose)
+            {
+                ui.Close();
+            }
+            ui = null;
+        }
+        #endregion
+
+        #region 消息
+        public override uint GetOpenUIMsg(string uiName)
+        {
+            return openUIMsg;
+        }
+        public override uint GetCloseUIMsg(string uiName)
+        {
+            return closeUIMsg;
+        }
+
+        protected override void AddListener()
+        {
+            uiCtrlDispatcher.AddListener(openUIMsg, OpenUI);
+            uiCtrlDispatcher.AddListener(closeUIMsg, CloseUI);
+        }
+        protected override void RemoveListener()
+        {
+            uiCtrlDispatcher.RemoveListener(openUIMsg, OpenUI);
+            uiCtrlDispatcher.RemoveListener(closeUIMsg, CloseUI);
+        }
+
+        protected override void AddServerListener()
+        {
+
+        }
+        protected override void RemoveServerListener()
+        {
+
+        }
+        #endregion
+    }
+}
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: c8a241703482ef64ab8b07f9577ced78
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 58047cf7496897b40974c58f8321d4ec
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
@@ -0,0 +1,25 @@
+using BingoBrain.Core;
+
+namespace BingoBrain
+{
+    public class RecordViewCtrl : BaseCtrl
+    {
+        public static RecordViewCtrl Instance { get; private set; }
+
+        private RecordViewModel model;
+
+        #region 生命周期
+        protected override void OnInit()
+        {
+            Instance = this;
+            //model = ModuleManager.Instance..GetModel(ModelConst.RecordViewModel) as RecordViewModel;
+        }
+
+        protected override void OnDispose()
+        {
+            Instance = null;
+        }
+
+        #endregion
+    }
+}
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: ad133fc8d24bd3e4392d1d483e156019
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
@@ -0,0 +1,24 @@
+using System.Collections.Generic;
+using BingoBrain.Core;
+
+namespace BingoBrain
+{
+    public class RecordViewModel : BaseModel
+    {
+        #region 生命周期
+        public List<string> recordList = new List<string>();
+        protected override void OnInit()
+        {
+        }
+
+        protected override void OnDispose()
+        {
+        }
+
+        protected override void OnReset()
+        {
+        }
+
+        #endregion
+    }
+}
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: c68b8b32fc927ea468ccee7c68846d2d
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
@@ -0,0 +1,197 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using BingoBrain.Core;
+using BingoBrain.HotFix;
+using DG.Tweening;
+using FairyGUI;
+using FGUI.ACommon;
+using FGUI.bkg_jilu;
+using NSubstitute.ReturnsExtensions;
+using UnityEngine;
+
+namespace BingoBrain
+{
+    public class RecordViewUI : BaseUI
+    {
+        public RecordViewUICtrl ctrl;
+        public RecordViewModel model;
+        private FGUI.bkg_jilu.com_jilu ui;
+
+        public RecordViewUI(RecordViewUICtrl ctrl) : base(ctrl)
+        {
+            uiName = UIConst.RecordViewUI;
+            this.ctrl = ctrl;
+        }
+
+        protected override void SetUIInfo(UIInfo uiInfo)
+        {
+            uiInfo.packageName = "bkg_jilu";
+            uiInfo.assetName = "com_jilu";
+            uiInfo.layerType = UILayerType.Popup;
+            uiInfo.isNeedOpenAnim = false;
+            uiInfo.isNeedCloseAnim = false;
+            uiInfo.isNeedUIMask = true;
+        }
+
+        #region 生命周期
+        protected override void OnInit()
+        {
+            //model = ModuleManager.Instance.GetModel(ModelConst.RecordViewModel) as RecordViewModel;
+        }
+
+        protected override void OnClose()
+        {
+            if (coroutine != null)
+            {
+                IsfvKit.StopCoroutine(coroutine);
+            }
+        }
+
+        protected override void OnBind()
+        {
+            ui = baseUI as com_jilu;
+        }
+
+        protected override void OnOpenBefore(object args)
+        {
+            InitView();
+
+            ui.btn_close.onClick.Add(() =>
+            {
+                CtrlCloseUI();
+            });
+        }
+
+        protected override void OnOpen(object args)
+        {
+        }
+
+        protected override void OnHide()
+        {
+        }
+
+        protected override void OnDisplay(object args)
+        {
+        }
+        #endregion
+
+        #region 消息
+        protected override void AddListener()
+        {
+
+        }
+        protected override void RemoveListener()
+        {
+
+        }
+        #endregion
+
+        private bool isroll;
+
+        private List<GObject> list_panel = new List<GObject>();
+
+        // 初始化页面逻辑
+        private void InitView()
+        {
+            for (int i = 0; i < 9; i++)
+            {
+                GObject item = ui.panel.GetChild("item" + i);
+                list_panel.Add(item);
+            }
+
+            UpdateRecord();
+        }
+
+        private Coroutine coroutine;
+        public void UpdateRecord()
+        {
+            if (ctrl.model == null || ctrl.model.recordList.Count == 0) return;
+
+            for (int i = 0; i < ctrl.model.recordList.Count; i++)
+            {
+                if (i < list_panel.Count)
+                {
+                    setRecord(i, list_panel[i]);
+                    list_panel[i].visible = true;
+                }
+            }
+
+            if (ctrl.model.recordList.Count >= 9 && !isroll) // 注意这里应该是 9，因为 list_panel 只有 9 个元素
+            {
+                isroll = true;
+                coroutine = IsfvKit.StartCoroutine(ScrollRoutine());
+            }
+        }
+
+        private void setRecord(int index, GObject obj)
+        {
+            com_record_item item = (com_record_item)obj;
+            string[] values = ctrl.model.recordList[index].Split('-');
+
+            item.name.text = values[0];
+
+            item.num.text = GameHelper.getChString(decimal.Parse(values[1]));
+
+            if (GameHelper.isRDExchangeMode())
+            {
+                string str = "<img src='ui://pmf3wbjidz5jpj6'/>";
+                item.num.text = str + $" {decimal.Parse(values[1]):N}";
+            }
+            else
+            {
+                item.num.text = $"${decimal.Parse(values[1]):N}";
+
+            }
+            string[] parts = values[2].Split(" ");
+            item.time.text = parts[0];
+            item.lab_claim.text = GameHelper.getDesByKey("ww");
+        }
+
+        private IEnumerator ScrollRoutine()
+        {
+            while (true)
+            {
+                int panelCount = list_panel.Count; // 缓存 list_panel 的长度
+                for (int i = 0; i < panelCount; i++)
+                {
+                    if (i < list_panel.Count) // 再次检查索引是否有效
+                    {
+                        float targetY = list_panel[i].y - 110;
+                        list_panel[i].MoveTween(targetY);
+                    }
+                }
+
+                yield return new WaitForSeconds(1f); // 每隔1秒滚动一次
+            }
+        }
+
+        private void hideEvent(object sender = null)
+        {
+
+        }
+
+        private void showEvent(object sender = null)
+        {
+
+        }
+    }
+
+    // 定义一个非泛型静态类来包含扩展方法
+    public static class GObjectMoveFunc
+    {
+        public static void MoveTween(this GObject obj, float targetY, Action action = null)
+        {
+            obj.TweenMove(new Vector2(obj.x, targetY), 0.5f)
+               .SetEase((EaseType)Ease.Linear)
+               .OnComplete(() =>
+               {
+                   if (targetY <= -16)
+                   {
+                       // 第一个 item 放到最后一个位置
+                       obj.y = 890;
+                   }
+               });
+        }
+    }
+}
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 401f77facf125e0439d09580a69ddae7
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
@@ -0,0 +1,95 @@
+
+using BingoBrain.Core;
+using BingoBrain.HotFix;
+using UnityEngine;
+
+namespace BingoBrain
+{
+    public class RecordViewUICtrl : BaseUICtrl
+    {
+        public RecordViewUI ui;
+        public RecordViewModel model;
+
+        private uint openUIMsg = SkinInfo.RecordViewUI_Open;
+        private uint closeUIMsg = SkinInfo.RecordViewUI_Close;
+
+        #region 生命周期
+        protected override void OnInit()
+        {
+            model = ModuleBoardk.Instance.GetModel(ModelConst.RecordViewModel) as RecordViewModel;
+        }
+
+        protected override void OnDispose()
+        {
+        }
+
+        public override void OpenUI(object args = null)
+        {
+            if (ui == null)
+            {
+                ui = new RecordViewUI(this);
+                ui.Open(args);
+            }
+        }
+
+        public override void CloseUI(object args = null)
+        {
+            if (ui != null && !ui.isClose)
+            {
+                ui.Close();
+            }
+            ui = null;
+        }
+        #endregion
+
+        #region 消息
+        public override uint GetOpenUIMsg(string uiName)
+        {
+            return openUIMsg;
+        }
+        public override uint GetCloseUIMsg(string uiName)
+        {
+            return closeUIMsg;
+        }
+
+        protected override void AddListener()
+        {
+            uiCtrlDispatcher.AddListener(openUIMsg, OpenUI);
+            uiCtrlDispatcher.AddListener(closeUIMsg, CloseUI);
+            GameDispatcher.Instance.AddListener(BingoInfo.updateRecordList, RefreshList);
+        }
+        protected override void RemoveListener()
+        {
+            uiCtrlDispatcher.RemoveListener(openUIMsg, OpenUI);
+            uiCtrlDispatcher.RemoveListener(closeUIMsg, CloseUI);
+            GameDispatcher.Instance.RemoveListener(BingoInfo.updateRecordList, RefreshList);
+        }
+        void RefreshList(object args = null)
+        {
+            Debug.Log("????????????????0");
+              Debug.Log(args);
+                 Debug.Log(model);
+                        Debug.Log(model.recordList);
+            if (args == null || model.recordList == null) return;
+Debug.Log("????????????????1");
+            if (model.recordList.Count >= 9)
+            {
+                model.recordList.RemoveAt(0);
+
+            }
+            model.recordList.Add(args.ToString());
+
+            ui?.UpdateRecord();
+
+        }
+        protected override void AddServerListener()
+        {
+
+        }
+        protected override void RemoveServerListener()
+        {
+
+        }
+        #endregion
+    }
+}
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 25d0f566135c40f478971ffae78516c8
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
@@ -1,6 +1,7 @@
 using System.Collections;
 using System.Collections.Generic;
 using System.IO;
+using Castle.Core.Internal;
 using Newtonsoft.Json;
 using UnityEngine;
 namespace BingoBrain
@@ -16,11 +17,19 @@ namespace BingoBrain
                {
                    string jsonstr = File.ReadAllText(jsonFilePath);
                    saveobject = JsonConvert.DeserializeObject<Saveobject>(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;
                }
            }
@@ -32,9 +41,10 @@ namespace BingoBrain

        public static void saveDataFunc()
        {
-
+            if (saveobject == null) return;
            string save = JsonConvert.SerializeObject(saveobject);
-
+            if (save.IsNullOrEmpty()) return;
+            if (save == null || save == "") return;
            if (File.Exists(jsonFilePath)) File.Delete(jsonFilePath);
            File.WriteAllText(jsonFilePath, save);

@@ -110,66 +120,86 @@ namespace BingoBrain
    {


+        public long uid;
        public bool is_get_battlepass = false;
        public List<int> battle_pass_freelist = new List<int>();
        public List<int> battle_pass_paylist = new List<int>();



-        public int _goldtime0;
-        public int _goldtime1;
-        public int _goldtime2;
-        public int _goldtime3;
-        public int _goldtime4;
-        public bool have_slot;
-        public int battle_pass_time;
+        // public int _goldtime0;
+        // public int _goldtime1;
+        // public int _goldtime2;
+        // public int _goldtime3;
+        // public int _goldtime4;
+        // public bool have_slot;
+        // public int battle_pass_time;


        public List<int> pass_task_record = new List<int>();
        public List<int> time_task_record = new List<int>();
        public int login_day;
        public int login_hour;
-        public int cash_people;
-        public float cash_people_1;
-        public float cash_people_2;
+        // public int cash_people;
+        // public float cash_people_1;
+        // public float cash_people_2;

-        public bool is_get_packreward;
+        // public bool is_get_packreward;

        public bool is_get_removead;
-        public bool is_autopack_show;
-        public int is_autopack_show_day;
+        // public bool is_autopack_show;
+        // public int is_autopack_show_day;

-        public long start_time;
-        public int clear_number;
+        // public long start_time;
+        // public int clear_number;

-        /// <summary>
-        /// 每一局使用道具数量（[0]:out [1]:back [2]:refresh）
-        /// </summary>
-        public int[] usePropsNum = new int[3];
-        /// <summary>
-        /// 卡牌层数
-        /// </summary>
-        public int card_layer;
-        /// <summary>
-        /// 卡牌总数量
-        /// </summary>
-        public int all_card_numbers;
+        // /// <summary>
+        // /// 每一局使用道具数量（[0]:out [1]:back [2]:refresh）
+        // /// </summary>
+        // public int[] usePropsNum = new int[3];
+        // /// <summary>
+        // /// 卡牌层数
+        // /// </summary>
+        // public int card_layer;
+        // /// <summary>
+        // /// 卡牌总数量
+        // /// </summary>
+        // public int all_card_numbers;


-        public int this_time_cardtype;
+        // public int this_time_cardtype;
        public int look_ad_numbers;
-        public int look_ad_time;
-        public int[] dark_Dayref;
-        public int[] _goldtime;
+        // public int look_ad_time;
+        public List<int> dark_Dayref;
+        // public int[] _goldtime;
        // public MaxPayClass max_pay_object;

        public List<SaveingPotClass> saveingpot_history = new List<SaveingPotClass>();
-        public float saveingpot_cash;
-        public float last_saveingpot_cash;

-        public long failed_pack_time;
-        public int three_gift_got_index = 1;
-        public long last_got_three_gift_time = 0;
-        public bool is_get_ThreeDaysGift;
+
+        // public long failed_pack_time;
+        // public int three_gift_got_index = 1;
+        // public long last_got_three_gift_time = 0;
+        // public bool is_get_ThreeDaysGift;
+        //tixian
+        public int ExchangeProcessMode = -1;
+        public int CHProcessMode = -1;
+        public int chout_lv;
+        public int ch_people;
+        public float ch_people_1;
+        public float ch_people_2;
+        public int _watch_ad_cd;
+        public float saveingpot_ch;
+        public float last_saveingpot_ch;
+        public int ExchangeModeToggle = 1;
+        public int PettyState;
+        public string PettyAccount;
+        public string PettyFirstName;
+        public string PettyLastName;
+
+        public int PettyAmount;
+        public string PettyOrderID;
+        public string PettyDateTime;
+        public int PettyDataLimit;
    }
 }
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: b1882840e62bbc64eb7c1fdcfb4a9fc9
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
@@ -0,0 +1,25 @@
+using BingoBrain.Core;
+
+namespace BingoBrain
+{
+    public class SaveingPotCtrl : BaseCtrl
+    {
+        public static SaveingPotCtrl Instance { get; private set; }
+
+        private SaveingPotModel model;
+
+        #region 生命周期
+        protected override void OnInit()
+        {
+            Instance = this;
+            //model = ModuleManager.Instance..GetModel(ModelConst.SaveingPotModel) as SaveingPotModel;
+        }
+
+        protected override void OnDispose()
+        {
+            Instance = null;
+        }
+
+        #endregion
+    }
+}
--- a/Show More
+++ b/Show More