Merge remote-tracking branch 'remotes/origin/master' into dev

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/TimeTracing/UI_proBarItem.cs

@@ -9,9 +9,9 @@ namespace UI.TimeTracing
         public GComponent target;
         public Controller m_c1;
         public GImage m_Got;
+        public GImage m_canGet;
         public GLoader m_icon;
         public GImage m_GotIcon;
-        public GImage m_canGet;
         public GTextField m_count;
         public const string URL = "ui://gayfh946iwcl2u";
         public const string PACKAGE_NAME = "TimeTracing";
@@ -62,18 +62,18 @@ namespace UI.TimeTracing
         {
             m_c1 = comp.GetController("c1");
             m_Got = (GImage)comp.GetChild("Got");
+            m_canGet = (GImage)comp.GetChild("canGet");
             m_icon = (GLoader)comp.GetChild("icon");
             m_GotIcon = (GImage)comp.GetChild("GotIcon");
-            m_canGet = (GImage)comp.GetChild("canGet");
             m_count = (GTextField)comp.GetChild("count");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_c1 = null;
             m_Got = null;
+            m_canGet = null;
             m_icon = null;
             m_GotIcon = null;
-            m_canGet = null;
             m_count = null;
             if(disposeTarget && target != null)
             {

GameClient/Assets/Game/HotUpdate/Views/ActivityMainTips/ZGTHgiftTipsView.cs

@@ -12,6 +12,7 @@ namespace GFGGame
         private UI_ZGTHgiftTipsUI _ui;
         private int giftItemId = 0;
         private ItemCfg itemcfg;
+        private int shopId = 0;
         public override void Dispose()
         {
 
@@ -57,6 +58,7 @@ namespace GFGGame
             
             ShopCfg shopCfg = ShopCfgArray.Instance.GetCfg(ActivityOpenCfgArray.Instance.GetCfg(6002).paramsArr[0]);
             giftItemId = shopCfg.itemId;
+            shopId = shopCfg.id;
             itemcfg = ItemCfgArray.Instance.GetCfg(giftItemId);
             _ui.m_Itemlist.numItems = itemcfg.itemsArr.Length;  
             int buyNum = ShopDataManager.Instance.GetGoodsBuyNumById(shopCfg.id);
@@ -96,7 +98,7 @@ namespace GFGGame
         private void OnBtnGetClick()
         {
             _ui.m_btnBuy.visible = false;
-            ReqShopBuy(itemcfg.id).Coroutine();
+            ReqShopBuy(shopId).Coroutine();
         }
         private void UpdateBtn()
         {

GameClient/Assets/Game/HotUpdate/Views/TimeTracing/TimeTracingSwitchView.cs

@@ -66,8 +66,8 @@ namespace GFGGame
             if (index != _ui.m_List.numItems - 2)
             {
                 listItem.m_TimeTracingSwitchItm.m_periodsNumText.text = "第" + NumStringList[index] + "期";
-                listItem.m_TimeTracingSwitchItm.m_periodsNameText.text = "不知道";
-                listItem.m_TimeTracingSwitchItm.m_suitIcon.icon = "";
+                listItem.m_TimeTracingSwitchItm.m_periodsNameText.text = "";
+                listItem.m_TimeTracingSwitchItm.m_suitIcon.icon = string.Format("ui://TimeTracing/select{0}",index);
                 listItem.m_TimeTracingSwitchItm.m_waitText.visible = false;
             }
             else