zhangyuqian 11 ヶ月 前
コミット
f3f45e4686

+ 0 - 20
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/TurnTable/UI_Component1.cs

@@ -18,11 +18,6 @@ namespace UI.TurnTable
         public UI_reward m_itemj7;
         public UI_reward m_itemj8;
         public UI_reward m_itemj9;
-        public UI_reward m_itemj10;
-        public UI_reward m_itemj11;
-        public UI_reward m_itemj12;
-        public UI_reward m_itemj13;
-        public UI_reward m_itemj14;
         public const string URL = "ui://zioq0m8xqncf1d";
         public const string PACKAGE_NAME = "TurnTable";
         public const string RES_NAME = "Component1";
@@ -81,11 +76,6 @@ namespace UI.TurnTable
             m_itemj7 = (UI_reward)UI_reward.Create(comp.GetChild("itemj7"));
             m_itemj8 = (UI_reward)UI_reward.Create(comp.GetChild("itemj8"));
             m_itemj9 = (UI_reward)UI_reward.Create(comp.GetChild("itemj9"));
-            m_itemj10 = (UI_reward)UI_reward.Create(comp.GetChild("itemj10"));
-            m_itemj11 = (UI_reward)UI_reward.Create(comp.GetChild("itemj11"));
-            m_itemj12 = (UI_reward)UI_reward.Create(comp.GetChild("itemj12"));
-            m_itemj13 = (UI_reward)UI_reward.Create(comp.GetChild("itemj13"));
-            m_itemj14 = (UI_reward)UI_reward.Create(comp.GetChild("itemj14"));
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -110,16 +100,6 @@ namespace UI.TurnTable
             m_itemj8 = null;
             m_itemj9.Dispose();
             m_itemj9 = null;
-            m_itemj10.Dispose();
-            m_itemj10 = null;
-            m_itemj11.Dispose();
-            m_itemj11 = null;
-            m_itemj12.Dispose();
-            m_itemj12 = null;
-            m_itemj13.Dispose();
-            m_itemj13 = null;
-            m_itemj14.Dispose();
-            m_itemj14 = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

+ 8 - 4
GameClient/Assets/Game/HotUpdate/Views/TurnTable/TurnTableView.cs

@@ -182,15 +182,19 @@ namespace GFGGame
                 _ui.m_timeText.text = GetTImeText(activiyCfg.endTime);
             }
             //还要判断是否已购买,和时间
-            var activityOpenCfgs = ActivityOpenCfgArray.Instance.GetCfg(activityID);
-            if(activityOpenCfgs.paramsArr.Length == 0)
+            var activityInfoByTypeList = ActivityGlobalDataManager.Instance.GetActivityInfoByType(ActivityType.XSLB3);
+            if (activityInfoByTypeList.Count == 0)
             {
                 return;
             }
-            var shopCfgId = activityOpenCfgs.paramsArr[0];
+            ActivityOpenCfg activityOpenCfg = ActivityOpenCfgArray.Instance.GetCfg(activityInfoByTypeList[0].ActivityId);
+            var shopCfgId = activityOpenCfg.paramsArr[0];
             var shopCfg = ShopCfgArray.Instance.GetCfg(shopCfgId);
+            if(shopCfg == null)
+            {
+                return;
+            }
             var remainBuyNum = shopCfg.maxBuyNum - ShopDataManager.Instance.GetGoodsBuyNumById(shopCfg.id);
-            var activityInfoByTypeList = ActivityGlobalDataManager.Instance.GetActivityInfoByType(ActivityType.XSLB3);
             if (activityInfoByTypeList.Count == 0)
             {
                 _ui.m_gift.visible = false;

BIN
GameClient/Assets/ResIn/UI/TurnTable/TurnTable_fui.bytes