zhaoyang 2 жил өмнө
parent
commit
9e9ac82b37

+ 1 - 1
FGUIProject/assets/Arena/components/ListRankItem.xml

@@ -13,7 +13,7 @@
     <component id="n10_jcej" name="btnLook" src="jcej2w" fileName="components/BtnLook.xml" xy="173,64" scale="0.9,0.9"/>
     <loader id="n12_jcej" name="loaDanIcon" xy="94,358" size="69,65" url="ui://eg2y0ldpu2u3tkq" fill="scale"/>
     <text id="n15_jcej" name="txtName" xy="68,242" pivot="0.5,0" size="122,41" font="ui://eg2y0ldpwonotjc" fontSize="30" color="#927550" align="center" autoClearText="true" text="玩家名称"/>
-    <text id="n13_jcej" name="txtDanRank" xy="30,323" size="139,34" font="ui://eg2y0ldpwonotjc" fontSize="24" color="#927550" align="center" autoClearText="true" text="段位排:1"/>
+    <text id="n13_jcej" name="txtDanRank" xy="30,323" size="139,34" font="ui://eg2y0ldpwonotjc" fontSize="24" color="#927550" align="center" autoClearText="true" text="段位排:1"/>
     <text id="n14_jcej" name="txtFightScore" xy="30,288" size="218,34" font="ui://eg2y0ldpwonotjc" fontSize="24" color="#927550" letterSpacing="-2" text="竞技场战力:111111"/>
   </displayList>
 </component>

+ 1 - 1
FGUIProject/assets/Arena/components/ListRankItem3.xml

@@ -13,7 +13,7 @@
     <text id="n15_psph" name="txtFightScore" xy="331,78" size="201,39" group="n29_jcej" font="ui://eg2y0ldpwonotjc" fontSize="28" color="#9b7c56" align="center" autoClearText="true" text="竞技场战力:--"/>
     <group id="n29_jcej" name="n29" xy="330,20" size="236,97" group="n18_psph"/>
     <loader id="n16_psph" name="loaDanIcon" xy="600,20" size="99,98" group="n18_psph" url="ui://eg2y0ldpu2u3tkq" fill="scale"/>
-    <text id="n26_jcej" name="n26" xy="729,24" size="122,41" group="n27_jcej" font="ui://eg2y0ldpwonotjc" fontSize="30" color="#c09c6d" text="段位排行"/>
+    <text id="n26_jcej" name="n26" xy="729,24" size="122,42" group="n27_jcej" font="ui://eg2y0ldpwonotjc" fontSize="30" color="#c09c6d" text="段位排名"/>
     <text id="n17_psph" name="txtDanRank" xy="770,58" pivot="0.5,0" size="40,56" group="n27_jcej" font="ui://eg2y0ldpweoktkb" fontSize="42" color="#c09c6d" align="center" letterSpacing="-2" bold="true" text="--"/>
     <group id="n27_jcej" name="n27" xy="729,24" size="122,90" group="n18_psph"/>
     <group id="n18_psph" name="n18" xy="8,-18" size="842,230"/>

+ 1 - 1
FGUIProject/assets/Arena/components/ListRankItem4.xml

@@ -13,7 +13,7 @@
     <text id="n15_psph" name="txtFightScore" xy="345,91" size="201,39" group="n29_jcej" font="ui://eg2y0ldpwonotjc" fontSize="28" color="#9b7c56" align="center" autoClearText="true" text="竞技场战力:--"/>
     <group id="n29_jcej" name="n29" xy="344,33" size="236,97" group="n18_psph"/>
     <loader id="n16_psph" name="loaDanIcon" xy="617,33" size="99,98" group="n18_psph" url="ui://eg2y0ldpu2u3tkq" fill="scale"/>
-    <text id="n26_jcej" name="n26" xy="742,37" size="122,41" group="n27_jcej" font="ui://eg2y0ldpwonotjc" fontSize="30" color="#c09c6d" text="段位排行"/>
+    <text id="n26_jcej" name="n26" xy="742,37" size="122,42" group="n27_jcej" font="ui://eg2y0ldpwonotjc" fontSize="30" color="#c09c6d" text="段位排名"/>
     <text id="n17_psph" name="txtDanRank" xy="783,71" pivot="0.5,0" size="40,56" group="n27_jcej" font="ui://eg2y0ldpweoktkb" fontSize="42" color="#c09c6d" align="center" letterSpacing="-2" bold="true" text="--"/>
     <group id="n27_jcej" name="n27" xy="742,37" size="122,90" group="n18_psph"/>
     <group id="n18_psph" name="n18" xy="19,-6" size="844,230"/>

+ 8 - 8
GameClient/Assets/Game/HotUpdate/Views/Arena/ArenaRankView.cs

@@ -159,12 +159,12 @@ namespace GFGGame
             if ((_rankType == ArenaRankType.FRIEND || _rankType == ArenaRankType.NOW_SEASON) && ArenaDataManager.Instance.SelfData != null)
             {
                 _ui.m_comMyRank.target.visible = true;
-                UpdateOtherItem(ArenaDataManager.Instance.SelfData, _ui.m_comMyRank.target, true);
+                UpdateOtherItem(ArenaDataManager.Instance.SelfData, _ui.m_comMyRank.target, ArenaDataManager.Instance.SelfData.RankInGrade, true);
             }
             else if (_rankType == ArenaRankType.LAST_SEASON && ArenaDataManager.Instance.SelfLastData != null)
             {
                 _ui.m_comMyRank.target.visible = true;
-                UpdateOtherItem(ArenaDataManager.Instance.SelfLastData, _ui.m_comMyRank.target, true);
+                UpdateOtherItem(ArenaDataManager.Instance.SelfLastData, _ui.m_comMyRank.target, ArenaDataManager.Instance.SelfLastData.RankInGrade, true);
             }
         }
         private string GetListItemResource(int index)
@@ -218,7 +218,7 @@ namespace GFGGame
             }
             if (index > 2)
             {
-                UpdateOtherItem(arenaData, obj);
+                UpdateOtherItem(arenaData, obj, index + 1);
             }
         }
         private void UpdateTopItem(int index, ArenaTargetData arenaData, GObject obj)
@@ -229,7 +229,7 @@ namespace GFGGame
             {
                 item.m_txtName.text = "--";
                 item.m_txtFightScore.text = "竞技场战力:--";
-                item.m_txtDanRank.text = "段位排:--";
+                item.m_txtDanRank.text = "段位排:--";
                 // item.m_loaDanIcon.url = "";
                 RoleInfoManager.Instance.UpdateLv(item.m_comLv, 0);
                 RoleInfoManager.Instance.UpdateNpcHead(item.m_comHead, "");
@@ -252,7 +252,7 @@ namespace GFGGame
                     RoleInfoManager.Instance.UpdateNpcHead(item.m_comHead, arenaData.RoleInfo.headRes);
                 }
                 // item.m_txtFightScore.text = string.Format("竞技场战力:{0}", fightScore);
-                item.m_txtDanRank.text = string.Format("段位排:{0}", arenaData.Grade);
+                item.m_txtDanRank.text = string.Format("段位排:{0}", arenaData.Grade);
                 ArenaViewManager.Instance.UpdateDanIcon(item.m_loaDanIcon, arenaData.Grade);
                 RoleInfoManager.Instance.UpdateLv(item.m_comLv, arenaData.RoleInfo.roleLv);
                 if (arenaData.Type == FightTargetType.PLAYER)
@@ -275,7 +275,7 @@ namespace GFGGame
             UI_ListRankItem.ProxyEnd();
         }
 
-        private void UpdateOtherItem(ArenaTargetData arenaData, GObject obj, bool isSelf = false)
+        private void UpdateOtherItem(ArenaTargetData arenaData, GObject obj, int index, bool isSelf = false)
         {
             UI_ListRankItem3 item = UI_ListRankItem3.Proxy(obj);
 
@@ -292,9 +292,9 @@ namespace GFGGame
             }
             else
             {
-                item.m_txtRank.text = arenaData.RankInGrade.ToString();
+                item.m_txtRank.text = index > 100 ? "--" : index.ToString();
                 item.m_txtName.text = arenaData.RoleInfo.roleName;
-                item.m_txtDanRank.text = arenaData.Grade.ToString();
+                item.m_txtDanRank.text = arenaData.RankInGrade.ToString();
 
                 ArenaViewManager.Instance.UpdateDanIcon(item.m_loaDanIcon, arenaData.Grade);
                 RoleInfoManager.Instance.UpdateLv(item.m_comLv, arenaData.RoleInfo.roleLv);

+ 3 - 1
GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryFightTargetScoreView.cs

@@ -472,7 +472,7 @@ namespace GFGGame
             _partId++;
             if (_partId > FightScoreCfgArray.Instance.dataArray.Length)
             {
-                if (_prefectCount > 0)
+                if (_prefectCount >= FightScoreCfgArray.Instance.dataArray.Length)
                 {
                     _ui.m_comAllPerfect.target.visible = true;
                     AllCirclePlayStart();//完美八连击
@@ -563,7 +563,9 @@ namespace GFGGame
             if (InstanceZonesDataManager.FightScene == ConstInstanceZonesType.Arena)
             {
                 ArenaDataManager.Instance.CurFightIndex = 2;
+                EventAgent.RemoveEventListener(ConstMessage.SHOW_CARD_SKILL_END, SkillScoreEnd);//跳过时先移除监听,避免界面未关闭时因监听继续其他逻辑
                 Skip();
+
             }
         }
         private void OnBtnBackClick()

BIN
GameClient/Assets/ResIn/UI/Arena/Arena_fui.bytes