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

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

@@ -220,6 +220,10 @@ namespace GFGGame
         {
             int sum = 0;
             int skillId = ItemDataManager.GetItemSkillId(itemId);
+            if(skillId == 0)
+            {
+                return 0;
+            }
             Dictionary<int, int> leagueSkillLvDatas = SkillDataManager.Instance.GetLeagueSkillLvDatas();
             if (!leagueSkillLvDatas.ContainsKey(skillId))
                 return 0;

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

@@ -191,6 +191,10 @@ namespace GFGGame
                 return value.param2Arr[0];
             }
             ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(itemId);
+            if (itemCfg.param2Arr.Length == 0)
+            {
+                return 0;
+            }
             return itemCfg.param2Arr[0];
         }
 

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/FieldGuide/UI_ChapterItemGuideUI.cs

@@ -8,7 +8,7 @@ namespace UI.FieldGuide
     {
         public GComponent target;
         public GLoader m_loaBg;
-        public GComponent m_btnBack;
+        public GButton m_btnBack;
         public GList m_list;
         public const string URL = "ui://vqq9h9h4s61p1y";
         public const string PACKAGE_NAME = "FieldGuide";
@@ -58,7 +58,7 @@ namespace UI.FieldGuide
         private void Init(GComponent comp)
         {
             m_loaBg = (GLoader)comp.GetChild("loaBg");
-            m_btnBack = (GComponent)comp.GetChild("btnBack");
+            m_btnBack = (GButton)comp.GetChild("btnBack");
             m_list = (GList)comp.GetChild("list");
         }
         public void Dispose(bool disposeTarget = false)

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

@@ -114,7 +114,7 @@ namespace GFGGame
             }
             else
             {
-                //if (chapterID[3] == 1)
+                if (chapterID[3] == 1)
                 {
                     if(chapterID[0] == _ui.m_List.numItems - 2 || chapterID[1] == 0)
                     {
@@ -125,11 +125,11 @@ namespace GFGGame
                     EventAgent.DispatchEvent(ConstMessage.TIMETRACINGUPDATE);
                     this.Hide();
                 }
-                //else
-                //{
-                //    PromptController.Instance.ShowFloatTextPrompt("需集齐前置套装");
-                //    return;
-                //}
+                else
+                {
+                    PromptController.Instance.ShowFloatTextPrompt("需集齐前置套装");
+                    return;
+                }
             }
 
         }