Merge branch 'master' of http://10.108.64.190:3000/gfg/client

GameClient/Assets/Game/HotUpdate/Controller/LoginController.cs

@@ -182,6 +182,7 @@ namespace GFGGame
 
         public static async ETTask GetRoles()
         {
+            GameGlobal.OpenServerTime = GameGlobal.zoneScene.GetComponent<ServerInfosComponent>().GetCurrentServerInfo().OpenServerTime;
             ViewManager.Show<ModalStatusView>("获取角色信息...");
             int errorCode = await LoginHelper.GetRoles(GameGlobal.zoneScene);
             if (errorCode != ErrorCode.ERR_Success)

GameClient/Assets/Game/HotUpdate/Views/DressUp/DressUpFightView.cs

@@ -1516,7 +1516,16 @@ namespace GFGGame
                 AlertUI.Show("管理员已开启茶会，请前往挑战！")
                 .SetLeftButton(false).SetRightButton(true, "确定", (object data) =>
                 {
-                    ViewManager.Show<LeagueTeaPartyView>();
+                    this.Hide();
+                    if (LeagueDataManager.Instance.TeaPartyStatus == LeagueTeaPartyStatus.YesGo)
+                    {
+                        if (LeagueDataManager.Instance.RoleTeapartyInfo.Status && !LeagueDataManager.Instance.RoleTeapartyInfo.IsComplete)
+                        {
+                            ViewManager.Show<LeagueTeaPartyShowView>();
+                        }
+                        else
+                            ViewManager.Show<LeagueTeaPartyView>();
+                    }
                 });
             }
         }

GameClient/Assets/Game/HotUpdate/Views/League/LeagueTeaPartyView.cs

@@ -106,6 +106,10 @@ namespace GFGGame
             GetTeapartyMatchingInfos();
             GetRoleContainerInfos();
             ReferBtnRewardRed();
+
+            if (LeagueDataManager.Instance.TeaPartyStatus == LeagueTeaPartyStatus.YesGo
+                && LeagueDataManager.Instance.CheckTeaPartyRewardCanGet())
+                    OnBtnRewardClick();
         }
 
         protected override void OnHide()
@@ -184,7 +188,7 @@ namespace GFGGame
         {
             ViewManager.Show<LeagueTeaPartyRewardView>();
         }
-        
+
         private void OnBtnBackClick()
         {
             ViewManager.GoBackFrom(typeof(LeagueTeaPartyView).FullName);
@@ -276,9 +280,10 @@ namespace GFGGame
             ReferBtnRewardRed();
 
             if (LeagueDataManager.Instance.TeaPartyStatus == LeagueTeaPartyStatus.YesGo) {
-                if (LeagueDataManager.Instance.RoleTeapartyInfo.Status && !LeagueDataManager.Instance.RoleTeapartyInfo.IsComplete) 
-                    ViewManager.Show<LeagueTeaPartyShowView>(null, new object[] { typeof(LeagueView).FullName, null });
-                else
+                if (LeagueDataManager.Instance.RoleTeapartyInfo.Status && !LeagueDataManager.Instance.RoleTeapartyInfo.IsComplete) { 
+                    ViewManager.Show<LeagueTeaPartyShowView>();
+                }
+                else if(LeagueDataManager.Instance.CheckTeaPartyRewardCanGet())
                     OnBtnRewardClick();
             }
         }

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

@@ -44,7 +44,7 @@ namespace GFGGame
 
             _ui.m_listTab.selectedIndex = 0;
             _ui.m_listType.selectedIndex = 0;
-            _ui.m_loaBg.url = ResPathUtil.GetSceneBgPath("zhangjie_bg","png");
+            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("zhangjie_bg");
 
             _ui.m_listChapter.scrollPane.onScroll.Add(DoSpecialEffect);//滚动时派发事件
 

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

@@ -146,7 +146,7 @@ namespace GFGGame
             //根据困难程度选择显示图片
             if (currentDifficulty == 1)
             {
-                _ui.m_loaBg.url = ResPathUtil.GetSceneBgPath("zhangjie_bg", "png");
+                _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("zhangjie_bg");
             }
             else
             {