Merge branch 'master' of http://10.108.64.190:3000/gfg/client

FGUIProject/assets/CommonGame/BuyConfirmUI.xml

@@ -2,8 +2,8 @@
 <component size="962,536">
   <displayList>
     <component id="n0_ds62" name="bg" src="si5ztih" fileName="components/ComBg.xml" pkg="mk0fwx0x" xy="0,0" size="962,536"/>
-    <text id="n3_ds62" name="txtNeed" xy="344,124" pivot="0.5,0" size="279,56" fontSize="42" color="#876e54" text="还需要购买7个"/>
-    <text id="n4_ds62" name="txtNum" xy="299,299" pivot="0.5,0" size="369,46" fontSize="34" color="#a0845c" text="是否花费700鲛绡购买？">
+    <text id="n3_ds62" name="txtMessage" xy="346,124" pivot="0.5,0" size="274,56" fontSize="42" color="#876e54" text="还需要购买7个"/>
+    <text id="n4_ds62" name="txtTips" xy="306,299" pivot="0.5,0" size="355,46" fontSize="34" color="#a0845c" text="是否花费700鲛绡购买？">
       <relation target="n1_ds62" sidePair="bottom-top"/>
     </text>
     <component id="n2_ds62" name="btnCancel" src="r9ritjh" fileName="components/Button18.xml" pkg="mk0fwx0x" xy="88,379">

FGUIProject/assets/CommonGame/components/ComponentValueBar.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,70" opaque="false">
-  <controller name="c1" exported="true" pages="0,,1,,3,,4,,5,,6,,7,,8,,9,,10,,12,,13,,14," selected="0">
+  <controller name="c1" exported="true" pages="0,,1,,3,,4,,5,,6,,7,,8,,9,,10,,12,,13,,14," selected="3">
     <remark page="0" value="体力金币马蹄珍珠"/>
     <remark page="1" value="体力金币马蹄"/>
     <remark page="2" value="抽卡兑换"/>
@@ -16,57 +16,57 @@
     <remark page="12" value="商店列表"/>
   </controller>
   <displayList>
-    <component id="n43_vek8" name="btnCJLuoXing" src="r9gf5z" fileName="components/ButtonInValueBar.xml" xy="460,0">
+    <component id="n43_vek8" name="btnCJLuoXing" src="r9gf5z" fileName="components/ButtonInValueBar.xml" xy="460,5">
       <gearDisplay controller="c1" pages="3"/>
       <gearXY controller="c1" pages="0,3" values="460,0|814,0" default="460,5"/>
       <Button title="100" icon="ui://eg2y0ldpq08x4"/>
     </component>
-    <component id="n44_vek8" name="btnCJHuoDong" src="r9gf5z" fileName="components/ButtonInValueBar.xml" xy="460,0">
-      <gearDisplay controller="c1" pages="4"/>
+    <component id="n44_vek8" name="btnCJHuoDong" src="r9gf5z" fileName="components/ButtonInValueBar.xml" xy="814,0" visible="false">
+      <gearDisplay controller="c1" pages=""/>
       <gearXY controller="c1" pages="0,4" values="460,0|814,0" default="460,5"/>
       <Button title="100" icon="ui://eg2y0ldpq08x4"/>
     </component>
-    <component id="n47_wono" name="btnTravel" src="r9gf5z" fileName="components/ButtonInValueBar.xml" xy="814,0">
+    <component id="n47_wono" name="btnTravel" src="r9gf5z" fileName="components/ButtonInValueBar.xml" xy="688,5">
       <gearDisplay controller="c1" pages="8"/>
       <gearXY controller="c1" pages="0,1,5,6,8" values="814,0|684,2|684,2|684,2|814,0" default="688,5"/>
       <Button title="100" icon="ui://eg2y0ldpq08x5"/>
     </component>
-    <component id="n48_r9ri" name="btnGallery" src="r9gf5z" fileName="components/ButtonInValueBar.xml" xy="814,0">
+    <component id="n48_r9ri" name="btnGallery" src="r9gf5z" fileName="components/ButtonInValueBar.xml" xy="688,5">
       <gearDisplay controller="c1" pages="9"/>
       <gearXY controller="c1" pages="0,1,3,5,6,8,9" values="814,0|684,2|814,2|684,2|684,2|814,2|814,0" default="688,5"/>
       <Button title="100" icon="ui://eg2y0ldpdhoatk2"/>
     </component>
-    <component id="n38_r9gf" name="btnPower" src="r9gf5z" fileName="components/ButtonInValueBar.xml" xy="37,0">
+    <component id="n38_r9gf" name="btnPower" src="r9gf5z" fileName="components/ButtonInValueBar.xml" xy="0,5">
       <gearDisplay controller="c1" pages="0,1"/>
       <gearXY controller="c1" pages="0,1,5" values="37,0|296,0|296,5" default="0,5"/>
       <Button title="100" icon="ui://eg2y0ldpq08x4"/>
     </component>
-    <component id="n46_ighs" name="btnCJ" src="r9gf5z" fileName="components/ButtonInValueBar.xml" xy="-215,0">
-      <gearDisplay controller="c1" pages="5"/>
-      <gearXY controller="c1" pages="0,1,3,5" values="-215,0|1079,5|979,5|296,0" default="460,5"/>
+    <component id="n46_ighs" name="btnCJ" src="r9gf5z" fileName="components/ButtonInValueBar.xml" xy="296,0">
+      <gearDisplay controller="c1" pages="4,5"/>
+      <gearXY controller="c1" pages="0,1,3,4,5" values="-215,0|1079,5|979,5|296,0|296,0" default="460,5"/>
       <Button title="100" icon="ui://eg2y0ldpq08x4"/>
     </component>
-    <component id="n40_r9gf" name="btnGold" src="r9gf5z" fileName="components/ButtonInValueBar.xml" xy="296,0">
-      <gearDisplay controller="c1" pages="0,1,6,7,10,12"/>
-      <gearXY controller="c1" pages="0,1,6,7,10,12" values="296,0|555,0|555,0|814,0|296,0|296,0" default="230,5"/>
+    <component id="n40_r9gf" name="btnGold" src="r9gf5z" fileName="components/ButtonInValueBar.xml" xy="555,0">
+      <gearDisplay controller="c1" pages="0,1,4,6,7,10,12"/>
+      <gearXY controller="c1" pages="0,1,4,6,7,10,12" values="296,0|555,0|555,0|555,0|814,0|296,0|296,0" default="230,5"/>
       <Button title="100" icon="ui://eg2y0ldpq08x3"/>
     </component>
-    <component id="n39_r9gf" name="btnDiamondRed" src="r9gf5z" fileName="components/ButtonInValueBar.xml" xy="555,0">
+    <component id="n39_r9gf" name="btnDiamondRed" src="r9gf5z" fileName="components/ButtonInValueBar.xml" xy="460,5">
       <gearDisplay controller="c1" pages="0,1,5,6,10,12"/>
       <gearXY controller="c1" pages="0,1,3,5,6,10,12" values="555,0|814,0|979,5|555,0|814,0|555,0|555,0" default="460,5"/>
       <Button title="100" icon="ui://eg2y0ldpq08x6"/>
     </component>
-    <component id="n41_r9gf" name="btnDiamondPurple" src="r9gf5z" fileName="components/ButtonInValueBar.xml" xy="814,0">
-      <gearDisplay controller="c1" pages="0,5,10"/>
-      <gearXY controller="c1" pages="0,1,3,5,6,8,10" values="814,0|814,2|1207,5|814,0|814,2|688,5|814,0" default="688,5"/>
+    <component id="n41_r9gf" name="btnDiamondPurple" src="r9gf5z" fileName="components/ButtonInValueBar.xml" xy="815,-1">
+      <gearDisplay controller="c1" pages="0,4,5,10"/>
+      <gearXY controller="c1" pages="0,1,3,4,5,6,8,10" values="814,0|814,2|1207,5|815,-1|814,0|814,2|688,5|814,0" default="688,5"/>
       <Button title="100" icon="ui://eg2y0ldpq08x5"/>
     </component>
-    <component id="n49_psph" name="btnArena" src="r9gf5z" fileName="components/ButtonInValueBar.xml" xy="814,0">
+    <component id="n49_psph" name="btnArena" src="r9gf5z" fileName="components/ButtonInValueBar.xml" xy="688,5">
       <gearDisplay controller="c1" pages="12"/>
       <gearXY controller="c1" pages="0,1,3,5,6,8,10,12" values="814,0|814,2|1207,5|814,0|814,2|688,5|814,0|814,0" default="688,5"/>
       <Button title="100" icon="ui://eg2y0ldpkztethq"/>
     </component>
-    <component id="n50_pvb4" name="btnLeagueContribuation" src="r9gf5z" fileName="components/ButtonInValueBar.xml" xy="814,0">
+    <component id="n50_pvb4" name="btnLeagueContribuation" src="r9gf5z" fileName="components/ButtonInValueBar.xml" xy="688,5">
       <gearDisplay controller="c1" pages="13"/>
       <gearXY controller="c1" pages="0,1,3,5,6,8,10,12,13" values="814,0|814,2|1207,5|814,0|814,2|688,5|814,0|814,0|814,1" default="688,5"/>
       <Button title="100" icon="ui://eg2y0ldpkztethq"/>

GameClient/Assets/Game/HotUpdate/Controller/BuyConfirmController.cs

@@ -5,28 +5,28 @@ namespace GFGGame
 
     public class BuyConfirmController : SingletonBase<BuyConfirmController>
     {
-        private static BuyConfirmView _buyConfirmView;
+        //     private static BuyConfirmView _buyConfirmView;
 
-        public static void Show(int itemId, int count, Action onSuccess = null, string message = "")
-        {
-            if (_buyConfirmView == null)
-            {
-                _buyConfirmView = new BuyConfirmView();
-            }
-            _buyConfirmView.SetParams(itemId, count, onSuccess, message);
-            _buyConfirmView.Show();
-        }
+        //     public static void Show(string message, string tips = "", Action onBtnSureSuccess = null, bool hideView = true)
+        //     {
+        //         if (_buyConfirmView == null)
+        //         {
+        //             _buyConfirmView = new BuyConfirmView();
+        //         }
+        // _buyConfirmView.SetParams(message, tips, onBtnSureSuccess, hideView);
+        // _buyConfirmView.Show();
+        //     }
 
-        public static void hide()
-        {
-            if (_buyConfirmView != null)
-            {
-                _buyConfirmView.Hide();
-            }
-        }
-        public static void Dispose()
-        {
-            _buyConfirmView = null;
-        }
+        //     public static void hide()
+        //     {
+        //         if (_buyConfirmView != null)
+        //         {
+        //             _buyConfirmView.Hide();
+        //         }
+        //     }
+        //     public static void Dispose()
+        //     {
+        //         _buyConfirmView = null;
+        //     }
     }
 }

GameClient/Assets/Game/HotUpdate/Data/ActivityDataManager.cs

@@ -58,8 +58,27 @@ namespace GFGGame
         /// <typeparam name="int">值由ConstBonusStatus定义</typeparam>
         /// <returns></returns>
         public Dictionary<int, int> luckyBoxActBonusState = new Dictionary<int, int>();
+        public List<ActivityLuckybonusCfg> SortActivityLuckybonusCfg(List<ActivityLuckybonusCfg> list)
+        {
+            list.Sort((ActivityLuckybonusCfg a, ActivityLuckybonusCfg b) =>
+            {
+
+                long allPlayTimes = ActivityDataManager.Instance.allPlayTimes;// GameGlobal.myNumericComponent.GetAsInt(NumericType.TotalRechargeScore);
+                int stateA = ActivityDataManager.Instance.luckyBoxActBonusState.ContainsKey(a.num) ? 1 : -1;
+                int stateB = ActivityDataManager.Instance.luckyBoxActBonusState.ContainsKey(b.num) ? 1 : -1;
+
+                if (allPlayTimes >= a.num && allPlayTimes < b.num && stateA < 0) return -1;
+                if (allPlayTimes >= b.num && allPlayTimes < a.num && stateB < 0) return 1;
 
 
+                if (stateA >= 0 && stateB < 0) return 1;
+                if (stateB >= 0 && stateA < 0) return -1;
+
+                return a.num - b.num;
+            });
+            return list;
+        }
+
         /**********************************************************每日登录*************************************************/
         private int _sevenDayLoginLoginId = 1;
         /// <summary>

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_BuyConfirmUI.cs

@@ -8,8 +8,8 @@ namespace UI.CommonGame
     {
         public GComponent target;
         public GComponent m_bg;
-        public GTextField m_txtNeed;
-        public GTextField m_txtNum;
+        public GTextField m_txtMessage;
+        public GTextField m_txtTips;
         public GButton m_btnCancel;
         public GButton m_btnSure;
         public const string URL = "ui://eg2y0ldpds629h";
@@ -60,16 +60,16 @@ namespace UI.CommonGame
         private void Init(GComponent comp)
         {
             m_bg = (GComponent)comp.GetChild("bg");
-            m_txtNeed = (GTextField)comp.GetChild("txtNeed");
-            m_txtNum = (GTextField)comp.GetChild("txtNum");
+            m_txtMessage = (GTextField)comp.GetChild("txtMessage");
+            m_txtTips = (GTextField)comp.GetChild("txtTips");
             m_btnCancel = (GButton)comp.GetChild("btnCancel");
             m_btnSure = (GButton)comp.GetChild("btnSure");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_bg = null;
-            m_txtNeed = null;
-            m_txtNum = null;
+            m_txtMessage = null;
+            m_txtTips = null;
             m_btnCancel = null;
             m_btnSure = null;
             if(disposeTarget && target != null)

GameClient/Assets/Game/HotUpdate/ServerProxy/ArenaSproxy.cs

@@ -161,7 +161,7 @@ namespace GFGGame
         }
 
         //购买挑战次数
-        public static async ETTask ReqBuyArenaFightTimes()
+        public static async ETTask<bool> ReqBuyArenaFightTimes()
         {
 
             S2C_BuyArenaFightTimes response = null;
@@ -171,8 +171,10 @@ namespace GFGGame
                 if (response.Error == ErrorCode.ERR_Success)
                 {
                     PromptController.Instance.ShowFloatTextPrompt("购买成功");
+                    return true;
                 }
             }
+            return false;
         }
 
 

GameClient/Assets/Game/HotUpdate/Views/ActivityThemeLuckyBox/ActivityThemeLuckyBoxBonusView.cs

@@ -43,6 +43,7 @@ namespace GFGGame
         {
             base.OnShown();
             _bonueCfgs = ActivityLuckybonusCfgArray.Instance.GetCfgsByid(ActivityDataManager.Instance.actLuckyBoxId);
+            _bonueCfgs = ActivityDataManager.Instance.SortActivityLuckybonusCfg(_bonueCfgs);
             _ui.m_list.numItems = _bonueCfgs.Count;
         }
 
@@ -104,6 +105,7 @@ namespace GFGGame
             bool result = await ActivitySProxy.ReqGetTimeLimitLuckyBoxBonus(ActivityDataManager.Instance.actLuckyBoxId, key);
             if (result)
             {
+                _bonueCfgs = ActivityDataManager.Instance.SortActivityLuckybonusCfg(_bonueCfgs);
                 _ui.m_list.numItems = _bonueCfgs.Count;
             }
         }

GameClient/Assets/Game/HotUpdate/Views/Arena/ArenaView.cs

@@ -145,10 +145,7 @@ namespace GFGGame
         {
             _ui.m_c2.selectedIndex = 0;
         }
-        // private void OnBtnRuleClick()
-        // {
-        //     ViewManager.Show<RuleView>(300001);
-        // }
+
         private void OnBtnBackClick()
         {
             GuideController.TryCompleteGuideIndex(ConstGuideId.ARENA_OPEN, 12);
@@ -183,19 +180,9 @@ namespace GFGGame
                 PromptController.Instance.ShowFloatTextPrompt("今日次数购买已达上限");
                 return;
             }
-            ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(GlobalCfgArray.globalCfg.costIdBuyFightTimes);
-            AlertUI.Show(string.Format("是否使用{0}{1}增加1次飞花令挑战次数？", GlobalCfgArray.globalCfg.costNumBuyFightTimes, itemCfg.name),
-            string.Format("(今天已购买{0}/{1}次)", GlobalCfgArray.globalCfg.limitDailyBuyFightTimes - RoleDataManager.ArenaBuyFightTimes, GlobalCfgArray.globalCfg.limitDailyBuyFightTimes))
-            .SetLeftButton(true, "取消").SetRightButton(true, "确定", (object data) =>
-            {
-                if (ItemDataManager.GetItemNum(GlobalCfgArray.globalCfg.costIdBuyFightTimes) < GlobalCfgArray.globalCfg.costNumBuyFightTimes)
-                {
-                    PromptController.Instance.ShowFloatTextPrompt("消耗不足");
-                    return;
-                }
-                ArenaSproxy.ReqBuyArenaFightTimes().Coroutine();
-            });
+            ViewManager.Show<BuyConfirmView>();
         }
+
         private async void OnBtnRefreshClick()
         {
             if (_dataManager.IsArenaClearing)

GameClient/Assets/Game/HotUpdate/Views/Common/Controller/ValueBarController.cs

@@ -21,6 +21,7 @@ namespace GFGGame
             _valueBar.m_btnTravel.target.onClick.Add(OnClickTravel);
             _valueBar.m_btnGallery.target.onClick.Add(OnClickGallery);
             _valueBar.m_btnLeagueContribuation.target.onClick.Add(OnClickLeagueContribuation);
+            _valueBar.m_btnCJ.target.onClick.Add(OnBtnClick);
 
         }
         private void OnClickGold()
@@ -123,6 +124,7 @@ namespace GFGGame
             if (luckyBoxCfg == null) return;
             _valueBar.m_btnCJ.target.text = "" + ItemDataManager.GetItemNum(luckyBoxCfg.costID);
             _valueBar.m_btnCJ.target.icon = ResPathUtil.GetCommonGameResPath(ItemCfgArray.Instance.GetCfg(luckyBoxCfg.costID).res);
+            _valueBar.m_btnCJ.target.data = luckyBoxCfg.costID;
         }
 
         private void UpdateTravel()
@@ -224,6 +226,15 @@ namespace GFGGame
                 case ConstItemID.LEAGUE_CONTRIBUTION:
                     OnClickLeagueContribuation();
                     break;
+                case ConstItemID.LUCKYBOX_COST_0:
+                case ConstItemID.LUCKYBOX_COST_1:
+                case ConstItemID.LUCKYBOX_COST_2:
+                    // ItemUtil.ExchangeItemById(itemId, 10, true, null, true, GameConst.MAX_COUNT_TO_BUY_DIAMOND_RED, true);
+                    BuyItemConteoller.Show(itemId, 10, ConstBuyType.TYPE_ITEM, null, true, false, GameConst.MAX_COUNT_TO_BUY_DIAMOND_RED);
+                    break;
+                default:
+
+                    break;
             }
         }
     }

GameClient/Assets/Game/HotUpdate/Views/CommonGame/BuyConfirmView.cs

@@ -8,14 +8,7 @@ namespace GFGGame
     {
         private UI_BuyConfirmUI _ui;
 
-        private int _itemId;
-        private int _count;//本次购买次数
-        private int _buyTimes = 0;//已购次数
 
-
-        private Action _onSuccess;
-        private int _maxTimes = 0;
-        private string _message = "";
         public override void Dispose()
         {
             if (_ui != null)
@@ -23,7 +16,6 @@ namespace GFGGame
                 _ui.Dispose();
                 _ui = null;
             }
-            BuyConfirmController.Dispose();
             base.Dispose();
         }
 
@@ -39,89 +31,40 @@ namespace GFGGame
             _ui.m_btnSure.onClick.Add(OnClickBtnSure);
             _ui.m_btnCancel.onClick.Add(OnClickBtnCancel);
         }
-        public void SetParams(int itemId, int count, Action onSuccess, string message = "")
+        protected override void AddEventListener()
         {
-            _itemId = itemId;
-            _count = count;
-
-            _onSuccess = onSuccess;
-            _message = message;
-
+            base.AddEventListener();
+            EventAgent.AddEventListener(ConstMessage.NUMERIC_CHANGE, UpdateView);
         }
         protected override void OnShown()
         {
             base.OnShown();
             UpdateView();
         }
+        protected override void RemoveEventListener()
+        {
+            base.RemoveEventListener();
+            EventAgent.RemoveEventListener(ConstMessage.NUMERIC_CHANGE, UpdateView);
+        }
         private void UpdateView()
         {
-            _buyTimes = ItemDataManager.GetItemExchangeTimes(_itemId);
-
-            ItemExchangeCfgArray.Instance.GetMoneyIdAndNum(_itemId, _buyTimes, _count, out int costId, out int coustNum, out int buyNum);
-            ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(_itemId);
-            ItemCfg costCfg = ItemCfgArray.Instance.GetCfg(costId);
-            _ui.m_txtNeed.text = string.Format("是否花费{0}{1} 购买{2}{3}", coustNum, costCfg.name, buyNum, itemCfg.name);
+            ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(GlobalCfgArray.globalCfg.costIdBuyFightTimes);
 
-            _ui.m_txtNum.text = "";
-            _maxTimes = ItemExchangeCfgArray.Instance.GetCfg(_itemId).maxLimit;
-            if (_maxTimes != 0)
-            {
-                _ui.m_txtNum.text = string.Format("今日剩余购买次数{0}/{1}", _maxTimes - _buyTimes, _maxTimes);
-            }
-            if (_message != "")
-            {
-                _ui.m_txtNum.text = _message;
-            }
+            _ui.m_txtMessage.text = string.Format("是否使用{0}{1}增加1次飞花令挑战次数？", GlobalCfgArray.globalCfg.costNumBuyFightTimes, itemCfg.name);
+            _ui.m_txtTips.text = string.Format("(今天已购买{0}/{1}次)", GlobalCfgArray.globalCfg.limitDailyBuyFightTimes - RoleDataManager.ArenaBuyFightTimes, GlobalCfgArray.globalCfg.limitDailyBuyFightTimes);
         }
-        private async void OnClickBtnSure()
+        private void OnClickBtnSure()
         {
-            if (_maxTimes > 0 && (_buyTimes + _count) > _maxTimes)
-            {
-                PromptController.Instance.ShowFloatTextPrompt("购买次数不足");
-                return;
-            }
-            ItemExchangeCfgArray.Instance.GetMoneyIdAndNum(_itemId, _buyTimes, _count, out int costId, out int coustNum, out int buyNum);
-
-            Debug.Log(costId + "数量：" + ItemDataManager.GetItemNum(costId));
-            if (ItemDataManager.GetItemNum(costId) < coustNum)
+            if (ItemDataManager.GetItemNum(GlobalCfgArray.globalCfg.costIdBuyFightTimes) < GlobalCfgArray.globalCfg.costNumBuyFightTimes)
             {
-                ItemCfg costCfg = ItemCfgArray.Instance.GetCfg(costId);
-                if (_itemId == ConstItemID.DIAMOND_PURPLE)
-                {
-                    PromptController.Instance.ShowFloatTextPrompt(string.Format("{0}不足，请前往商城选购", costCfg.name));
-
-                }
-                else
-                {
-                    AlertUI.Show(costCfg.name + "不足，是否前往购买？").SetLeftButton(true).SetRightButton(true, "确认", (AlertWindow.AlertCallback)((object data) =>
-                    {
-                        long costNeedCount = coustNum - ItemDataManager.GetItemNum(costId);
-                        BuyItemConteoller.Show(costId, costNeedCount, ConstBuyType.TYPE_ITEM, null, true, true, GameConst.MAX_COUNT_TO_BUY_DIAMOND_RED);
-                    }));
-                    OnClickBtnCancel();
-                }
-
+                PromptController.Instance.ShowFloatTextPrompt("消耗不足");
                 return;
             }
-
-            bool result = await ItemExchangeSProxy.ItemExchange(_itemId, _count);
-
-            if (result)
-            {
-                PromptController.Instance.ShowFloatTextPrompt("购买成功", MessageType.SUCCESS);
-                if (_onSuccess != null)
-                {
-                    _onSuccess();
-                }
-            }
-
-            this.Hide();
+            ArenaSproxy.ReqBuyArenaFightTimes().Coroutine();
         }
         private void OnClickBtnCancel()
         {
             this.Hide();
         }
-
     }
-
 }

GameClient/Assets/Game/HotUpdate/Views/LuckyBox/LuckyBoxView.cs

@@ -190,6 +190,14 @@ namespace GFGGame
             if (_lcukyBoxCtrl.ContainsKey(LuckyBoxDataManager.Instance.currentBoxId)) _lcukyBoxCtrl[LuckyBoxDataManager.Instance.currentBoxId].OnHide();
             _curIndex = _ui.m_listBg.GetFirstChildInView();
             LuckyBoxDataManager.Instance.currentBoxId = LuckyBoxDataManager.Instance.luckyBoxIds[_curIndex];
+            if (LuckyBoxDataManager.Instance.currentBoxId == LuckyBoxDataManager.BOX_ID_3)
+            {
+                _valueBarController.Controller(3);
+            }
+            else
+            {
+                _valueBarController.Controller(4);
+            }
             _valueBarController.UpdateCJ();
             UpdateListItem();
             _ui.m_btnLeft.grayed = _curIndex <= 0;