高级合成副本补充提交

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

@@ -9,6 +9,7 @@ namespace UI.TimeTracing
         public GComponent target;
         public Controller m_c1;
         public GImage m_Got;
+        public GLoader m_icon;
         public GImage m_GotIcon;
         public GImage m_canGet;
         public const string URL = "ui://gayfh946iwcl2u";
@@ -60,6 +61,7 @@ namespace UI.TimeTracing
         {
             m_c1 = comp.GetController("c1");
             m_Got = (GImage)comp.GetChild("Got");
+            m_icon = (GLoader)comp.GetChild("icon");
             m_GotIcon = (GImage)comp.GetChild("GotIcon");
             m_canGet = (GImage)comp.GetChild("canGet");
         }
@@ -67,6 +69,7 @@ namespace UI.TimeTracing
         {
             m_c1 = null;
             m_Got = null;
+            m_icon = null;
             m_GotIcon = null;
             m_canGet = null;
             if(disposeTarget && target != null)

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

@@ -112,7 +112,7 @@ namespace GFGGame
                             ItemCfg headBorderCfg = ItemCfgArray.Instance.GetCfg(itemInfo[levelCfg.id].HeadBorderItemId);
                             levelItem.m_player.m_headFrame.url = ResPathUtil.GetHeadBorderPath(headBorderCfg.res);
                             levelItem.m_player.m_head.url = ResPathUtil.GetHeadPath(headCfg.res);
-                            RedDotController.Instance.SetComRedDot(levelItem.target, TimeTracingDataManager.Instance.GetLevelRewardStatus(levelCfg.id), "", -30);
+                            RedDotController.Instance.SetComRedDot(levelItem.target, TimeTracingDataManager.Instance.GetLevelRewardStatus(levelCfg.id), "", -30,10);
                         }
                     }
                     else
@@ -129,7 +129,7 @@ namespace GFGGame
                 if (!InstanceZonesDataManager.CheckLevelPass(levelCfg.id))
                 {
                     //设置为解锁关卡
-                    RedDotController.Instance.SetComRedDot(levelItem.target, TimeTracingDataManager.Instance.GetLevelRewardStatus(levelCfg.id),"",-30);
+                    RedDotController.Instance.SetComRedDot(levelItem.target, TimeTracingDataManager.Instance.GetLevelRewardStatus(levelCfg.id),"",-30,10);
                     MainStoryDataManager.currentLevelCfgId = levelCfg.id;
                     levelItem.m_player.target.visible = false;
                 }
@@ -208,6 +208,7 @@ namespace GFGGame
 
                 //}
                 item.m_c1.selectedIndex = TimeTracingDataManager.Instance.GetChapterRewardIDStatus(datas[i].id, datas[i].paramsArr[0]);
+                item.m_icon.url = ResPathUtil.GetIconPath(ItemCfgArray.Instance.GetCfg(datas[i].bonusArr[0][0]).res, "png");
                 if (item.target.data == null)
                 {
                     item.target.onClick.Add(OnBtnGetProBonus);
@@ -223,6 +224,7 @@ namespace GFGGame
             CompositebonusCfg compositeCfg = obj.data as CompositebonusCfg;
             if(num < compositeCfg.count || TimeTracingDataManager.Instance.GetChapterRewardIDStatus(compositeCfg.id, compositeCfg.paramsArr[0]) != 1)
             {
+                GoodsItemTipsController.ShowItemTips(compositeCfg.bonusArr[0][0]);
                 return;
             }
             await TimeTracingSProxy.ReqGetSuitReward(compositeCfg.id);