Browse Source

茶话会修改单修改

huangxiaoyue 1 year ago
parent
commit
2670e5b5ca

+ 12 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/League/UI_LeagueTeaPartyRewardUI.cs

@@ -16,6 +16,10 @@ namespace UI.League
         public GLoader m_StartIndex;
         public GLoader m_EndLeagueIndex;
         public GLoader m_StartLeagueIndex;
+        public GTextField m_txtRoleScore;
+        public GTextField m_txtLevel;
+        public GTextField m_txtLeagueScore;
+        public GTextField m_txtLevel_2;
         public const string URL = "ui://tw70qm9dic4otpz";
         public const string PACKAGE_NAME = "League";
         public const string RES_NAME = "LeagueTeaPartyRewardUI";
@@ -72,6 +76,10 @@ namespace UI.League
             m_StartIndex = (GLoader)comp.GetChild("StartIndex");
             m_EndLeagueIndex = (GLoader)comp.GetChild("EndLeagueIndex");
             m_StartLeagueIndex = (GLoader)comp.GetChild("StartLeagueIndex");
+            m_txtRoleScore = (GTextField)comp.GetChild("txtRoleScore");
+            m_txtLevel = (GTextField)comp.GetChild("txtLevel");
+            m_txtLeagueScore = (GTextField)comp.GetChild("txtLeagueScore");
+            m_txtLevel_2 = (GTextField)comp.GetChild("txtLevel");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -84,6 +92,10 @@ namespace UI.League
             m_StartIndex = null;
             m_EndLeagueIndex = null;
             m_StartLeagueIndex = null;
+            m_txtRoleScore = null;
+            m_txtLevel = null;
+            m_txtLeagueScore = null;
+            m_txtLevel_2 = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

+ 1 - 1
GameClient/Assets/Game/HotUpdate/ServerProxy/LeagueSproxy.cs

@@ -913,7 +913,7 @@ namespace GFGGame
             {
                 if (response.Error == ErrorCode.ERR_Success)
                 {
-                    //LeagueDataManager.Instance.TeapartyRoleId = response.TeapartyRoleId;
+                    LeagueDataManager.Instance.RoleTeapartyInfo.PerScore = response.PerScore;
                     return true;
                 }
             }

+ 2 - 0
GameClient/Assets/Game/HotUpdate/Views/League/LeagueTeaPartyRewardView.cs

@@ -45,6 +45,8 @@ namespace GFGGame
             base.OnShown();
             SetPersonScoreList();
             SetLeagueScoreList();
+            _ui.m_txtRoleScore.text = LeagueDataManager.Instance.RoleTeapartyInfo.PerScore.ToString();
+            _ui.m_txtLeagueScore.text = LeagueDataManager.Instance.RoleTeapartyInfo.LeagueScore.ToString();
         }
         protected override void OnHide()
         {

+ 2 - 2
GameClient/Assets/Game/HotUpdate/Views/League/LeagueTeaPartyShowView.cs

@@ -55,7 +55,7 @@ namespace GFGGame
             base.OnShown();
 
             timeIndex = 3;
-            _ui.m_txtCountdown.text = string.Format("将在{0}s后进入下一阶段", timeIndex);
+            _ui.m_txtCountdown.text = string.Format("将在[color=#FF6600]{0}s[/color]后进入下一阶段", timeIndex);
             GetRoleContainerInfos();
             Timers.inst.Add(1, 3, UpdateTime);
         }
@@ -109,7 +109,7 @@ namespace GFGGame
         private void UpdateTime(object param)
         {
             timeIndex -= 1;
-            _ui.m_txtCountdown.text = string.Format("将在{0}s后进入下一阶段", timeIndex);
+            _ui.m_txtCountdown.text = string.Format("将在[color=#FF6600]{0}s[/color]后进入下一阶段", timeIndex);
             if (timeIndex <= 0) {
                 openNextView();
                 Timers.inst.Remove(UpdateTime);

+ 0 - 10
GameClient/Assets/Game/HotUpdate/Views/League/LeagueTeaPartyView.cs

@@ -83,7 +83,6 @@ namespace GFGGame
             _ui.m_btnChallenge.visible = isLeader;
 
             GetRoleContainerInfos();
-            //GetTeapartyMatchingInfos();
         }
 
         private void UpDataOverTime()
@@ -101,15 +100,6 @@ namespace GFGGame
             }
         }
 
-        //private async void GetTeapartyMatchingInfos()
-        //{
-        //    bool result = await LeagueSproxy.GetTeapartyMatchingInfos(RoleDataManager.roleId);
-        //    if (result)
-        //    {
-        //        _ui.m_ListTeaParty.numItems = 6;
-        //    }
-        //}
-        
         protected override void OnHide()
         {
             base.OnHide();

BIN
GameClient/Assets/ResIn/UI/League/League_fui.bytes