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

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

@@ -400,15 +400,15 @@ namespace GFGGame
             {
                 var activityFightCfg = ActivityFightCfgArray.Instance.GetCfg(levelCfg.chapterId);
                 RoleLimitData limitData = RoleLimitDataManager.GetLimitData(activityFightCfg.limit);
-                times = limitData.TotalPlayMax - limitData.PlayTimes;
-                times = Math.Min(times, 10);
+                int time = limitData.TotalPlayMax - limitData.PlayTimes;
+                times = Math.Min(times, time);
             }
             else if(type == 1 && subType == 1)
             {
                 //精英关卡特殊处理
                 RoleLimitData limitData = RoleLimitDataManager.GetLimitData(50);
-                times = limitData.TotalPlayMax - limitData.PlayTimes;
-                times = Math.Min(times, 10);
+                int time = limitData.TotalPlayMax - limitData.PlayTimes;
+                times = Math.Min(times, time);
             }
             title = string.Format("挑战{0}次", NumberUtil.GetChiniseNumberText(times));
         }

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_StoryDialogUI.cs

@@ -12,6 +12,7 @@ namespace UI.Main
         public GGraph m_mask1;
         public GGraph m_mask2;
         public GGraph m_btnNext;
+        public GGraph m_effect;
         public UI_CompDialogText m_dialogText;
         public UI_CompDialogName m_dialogName;
         public UI_CompDialogHead m_dialogHead;
@@ -25,7 +26,6 @@ namespace UI.Main
         public GTextField m_txtPlayName;
         public GGroup m_comPlayName;
         public GGraph m_mask;
-        public GGraph m_effect;
         public GLoader m_eyeOpen;
         public Transition m_t0;
         public Transition m_showMask;
@@ -85,6 +85,7 @@ namespace UI.Main
             m_mask1 = (GGraph)comp.GetChild("mask1");
             m_mask2 = (GGraph)comp.GetChild("mask2");
             m_btnNext = (GGraph)comp.GetChild("btnNext");
+            m_effect = (GGraph)comp.GetChild("effect");
             m_dialogText = (UI_CompDialogText)UI_CompDialogText.Create(comp.GetChild("dialogText"));
             m_dialogName = (UI_CompDialogName)UI_CompDialogName.Create(comp.GetChild("dialogName"));
             m_dialogHead = (UI_CompDialogHead)UI_CompDialogHead.Create(comp.GetChild("dialogHead"));
@@ -98,7 +99,6 @@ namespace UI.Main
             m_txtPlayName = (GTextField)comp.GetChild("txtPlayName");
             m_comPlayName = (GGroup)comp.GetChild("comPlayName");
             m_mask = (GGraph)comp.GetChild("mask");
-            m_effect = (GGraph)comp.GetChild("effect");
             m_eyeOpen = (GLoader)comp.GetChild("eyeOpen");
             m_t0 = comp.GetTransition("t0");
             m_showMask = comp.GetTransition("showMask");
@@ -114,6 +114,7 @@ namespace UI.Main
             m_mask1 = null;
             m_mask2 = null;
             m_btnNext = null;
+            m_effect = null;
             m_dialogText.Dispose();
             m_dialogText = null;
             m_dialogName.Dispose();
@@ -131,7 +132,6 @@ namespace UI.Main
             m_txtPlayName = null;
             m_comPlayName = null;
             m_mask = null;
-            m_effect = null;
             m_eyeOpen = null;
             m_t0 = null;
             m_showMask = null;

GameClient/Assets/Game/HotUpdate/Views/Card/CardStarRewardView.cs

@@ -69,7 +69,7 @@ namespace GFGGame
             }
             else
             {
-                item.m_txtTitle.text = string.Format("词牌星级达到{0}星一阶", NumberUtil.GetChiniseNumberText(cardStarCfg.starLvl / 5));
+                item.m_txtTitle.text = string.Format("词牌星级达到{0}星", NumberUtil.GetChiniseNumberText(cardStarCfg.starLvl / 5));
             }
             string resPath = ResPathUtil.GetCardAnimationPath(cardData.resources[cardData.resIndex]);
             if (index == 1 && YooAssets.CheckResExist(resPath))

GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryLevelInfoView.cs

@@ -228,7 +228,7 @@ namespace GFGGame
                 _ui.m_comCostCurrent.visible = true;
                 _ui.m_btnBg.url = "ui://Main/zx_jq_dituditu";
                 UI_ComCostCurrency com = UI_ComCostCurrency.Proxy(_ui.m_comCostCurrent);
-                com.m_c1.selectedIndex = 2;
+                com.m_c1.selectedIndex = 3;
                 UpdateVisitNum();
                 UI_ComCostCurrency.ProxyEnd();
             }

GameClient/Assets/Game/HotUpdate/Views/MainStory/StroyFightResultView.cs

@@ -141,11 +141,11 @@ namespace GFGGame
             }
             _ui.m_comResult.m_t0.Play(AddExp);
 
-            StoryLevelCfg storylevel = StoryLevelCfgArray.Instance.GetCfg(MainStoryDataManager.currentLevelCfgId);
+            StoryLevelCfg storylevel = StoryLevelCfgArray.Instance.GetCfg(InstanceZonesDataManager.currentLevelCfgId);
             if (_resultData.Result && storylevel.type == 6 && storylevel.subType == 2)
             {
                 await TimeTracingSProxy.ReqGetMaxLevelInfo(TimeTracingDataManager._currentChapterId);
-                await TimeTracingSProxy.ReqGetAppointLevelRewardStatus(MainStoryDataManager.currentLevelCfgId);
+                await TimeTracingSProxy.ReqGetAppointLevelRewardStatus(InstanceZonesDataManager.currentLevelCfgId);
                 await TimeTracingSProxy.ReqGetSuitRewardStatus();
             }
         }