竞技场

FGUIProject/assets/Arena/ArenaDanUpUI.xml

@@ -8,9 +8,9 @@
     <image id="n6_jcej" name="n6" src="jcej1p" fileName="images/pmts_ditu.png" xy="0,43"/>
     <image id="n4_jcej" name="n4" src="jcej40" fileName="images/dwjj_btbt.png" xy="67,-22"/>
     <text id="n8_jcej" name="txtlastDanTitle" xy="474,419" pivot="0.5,0" size="132,44" group="n9_jcej" font="ui://eg2y0ldpwonotjc" fontSize="32" color="#fef7f6" text="段位名字"/>
-    <loader id="n7_jcej" name="loaLastDanIcon" xy="440,214" size="200,200" group="n9_jcej" url="ui://4lc5fhlbpsphz" autoSize="true" color="#666666"/>
+    <loader id="n7_jcej" name="loaLastDanIcon" xy="440,214" size="200,200" group="n9_jcej" url="ui://eg2y0ldpu2u3tkq" fill="scale" color="#666666"/>
     <group id="n9_jcej" name="n9" xy="440,214" size="200,249" advanced="true"/>
-    <loader id="n2_psph" name="loaDanIcon" xy="440,214" size="200,200" group="n10_jcej" url="ui://4lc5fhlbpsphz" autoSize="true"/>
+    <loader id="n2_psph" name="loaDanIcon" xy="440,214" size="200,200" group="n10_jcej" aspect="true" url="ui://eg2y0ldpu2u3tkq" fill="scale"/>
     <text id="n3_psph" name="txtDanTitle" xy="474,419" pivot="0.5,0" size="132,44" group="n10_jcej" font="ui://eg2y0ldpwonotjc" fontSize="32" color="#fef7f6" text="段位名字"/>
     <group id="n10_jcej" name="n10" xy="440,214" size="200,249" advanced="true"/>
     <image id="n5_jcej" name="n5" src="jcej3z" fileName="images/pmts_ffbtbt.png" xy="422,540" group="n11_jcej"/>

FGUIProject/assets/Arena/ArenaUI.xml

@@ -44,7 +44,7 @@
     </list>
     <image id="n43_jcej" name="n43" src="jcej37" fileName="images/jzsjzs_mpmpdi.png" xy="42,1454" group="n46_jcej"/>
     <image id="n44_jcej" name="n44" src="jcej32" fileName="images/jzsjzs_xtxt_1.png" xy="187,1510" group="n46_jcej"/>
-    <loader id="n2_psph" name="loaDanIcon" xy="48,1464" size="149,153" group="n46_jcej" url="ui://4lc5fhlbpsphz" fill="scale"/>
+    <loader id="n2_psph" name="loaDanIcon" xy="48,1464" size="149,153" group="n46_jcej" url="ui://eg2y0ldpu2u3tkq" fill="scale"/>
     <text id="n7_psph" name="txtName" xy="193,1472" size="122,41" group="n46_jcej" font="ui://eg2y0ldpwonotjc" fontSize="30" color="#9a7c56" text="自己名字"/>
     <text id="n8_psph" name="txtRank" xy="193,1518" size="90,31" group="n46_jcej" font="ui://eg2y0ldpwonotjc" fontSize="22" color="#9a7c56" text="段位排名"/>
     <text id="n9_psph" name="txtDanTitle" xy="193,1550" size="90,31" group="n46_jcej" font="ui://eg2y0ldpwonotjc" fontSize="22" color="#9a7c56" text="段位名称"/>
@@ -52,7 +52,7 @@
     <component id="n45_jcej" name="btnFightScoreRule" src="psphtkg" fileName="components/BtnRule.xml" pkg="eg2y0ldp" xy="165,1584" size="29,29" group="n46_jcej">
       <Button icon="ui://eg2y0ldpjcej2k" controller="c2" page="1"/>
     </component>
-    <component id="n54_jcej" name="comFightScore" src="jcej4q" fileName="ComFightScore.xml" xy="144,1401" group="n46_jcej">
+    <component id="n54_jcej" name="comFightScore" src="jcej4q" fileName="components/ComFightScore.xml" xy="144,1401" group="n46_jcej">
       <gearDisplay controller="c2" pages="1"/>
     </component>
     <group id="n46_jcej" name="grpMyInfo" xy="42,1401" size="467,227" group="n20_psph"/>

FGUIProject/assets/Arena/components/ComMyDanReward.xml

@@ -9,7 +9,7 @@
       <item/>
       <item/>
     </list>
-    <loader id="n2_psph" name="loaDanIcon" xy="159,87" pivot="0.5,0.5" anchor="true" size="149,153" url="ui://4lc5fhlbpsphz" fill="scale"/>
+    <loader id="n2_psph" name="loaDanIcon" xy="159,87" pivot="0.5,0.5" anchor="true" size="149,153" url="ui://eg2y0ldpu2u3tkq" fill="scale"/>
     <loader id="n3_psph" name="loaSelf" xy="275,0" size="48,98" url="ui://4lc5fhlbjcej3o" autoSize="true"/>
     <text id="n5_u10a" name="n5" xy="524,63" size="220,49" font="ui://eg2y0ldpwonotjc" fontSize="36" color="#c09c6d" text="尚未参与挑战">
       <gearDisplay controller="c1" pages="0"/>

FGUIProject/assets/Arena/components/ListFightRecordItem.xml

@@ -19,7 +19,7 @@
     <loader id="n2_psph" name="loaResultIcon" xy="172,99" size="42,42" group="n11_psph" url="ui://4lc5fhlbjcej1z" autoSize="true">
       <gearIcon controller="ctrDan" pages="2,3" values="ui://4lc5fhlbjcej21|ui://4lc5fhlbjcej20" default="ui://4lc5fhlbjcej1z"/>
     </loader>
-    <loader id="n3_psph" name="loaDanIcon" xy="229,69" size="108,101" group="n11_psph" url="ui://4lc5fhlbpsphz" fill="scale"/>
+    <loader id="n3_psph" name="loaDanIcon" xy="229,69" size="108,101" group="n11_psph" url="ui://eg2y0ldpu2u3tkq" fill="scale"/>
     <text id="n14_jcej" name="n14" xy="423,71" pivot="0.5,0" anchor="true" size="71,46" group="n11_psph" font="ui://eg2y0ldpwonotjc" fontSize="34" color="#c09c6d" align="center" vars="true" text="排名"/>
     <text id="n5_psph" name="txtRank" xy="423,107" pivot="0.5,0" anchor="true" size="138,64" group="n11_psph" fontSize="48" color="#c09c6d" align="center" letterSpacing="-2" vars="true" bold="true" text="10000"/>
     <text id="n7_psph" name="txtTargetName" xy="582,69" size="148,49" group="n11_psph" font="ui://eg2y0ldpwonotjc" fontSize="36" color="#c09c6d" autoClearText="true" text="对手名字"/>
@@ -36,7 +36,7 @@
       <item/>
       <item/>
     </list>
-    <component id="n27_jcej" name="comResult" src="jcej4n" fileName="components/ComFightScoreResult.xml" xy="146,692" group="n12_psph">
+    <component id="n27_jcej" name="comResult" src="jcej4n" fileName="components/ComAllScore.xml" xy="146,692" group="n12_psph">
       <gearDisplay controller="c1" pages="1"/>
     </component>
     <group id="n12_psph" name="grpAllInfo" xy="5,0" size="888,198" advanced="true" layout="vt" excludeInvisibles="true"/>

FGUIProject/assets/Arena/components/ListRankItem.xml

@@ -11,7 +11,7 @@
       <gearIcon controller="c1" pages="2,3" values="ui://4lc5fhlbjcej3l|ui://4lc5fhlbjcej3k" default="ui://4lc5fhlbjcej3m"/>
     </loader>
     <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://4lc5fhlbpsphz" fill="scale"/>
+    <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="n14_jcej" name="txtFightScore" xy="30,288" size="218,34" font="ui://eg2y0ldpwonotjc" fontSize="24" color="#927550" letterSpacing="-2" text="竞技场战力：111111"/>

FGUIProject/assets/Arena/components/ListRankItem3.xml

@@ -12,7 +12,7 @@
     <image id="n25_jcej" name="n25" src="jcej3n" fileName="images/jzsjzs_xxxtxt.png" xy="330,71" group="n29_jcej"/>
     <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://4lc5fhlbpsphz" fill="scale" clearOnPublish="true"/>
+    <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="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"/>

FGUIProject/assets/Arena/components/ListRankItem4.xml

@@ -12,7 +12,7 @@
     <image id="n25_jcej" name="n25" src="jcej3n" fileName="images/jzsjzs_xxxtxt.png" xy="344,84" group="n29_jcej"/>
     <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://4lc5fhlbpsphz" fill="scale"/>
+    <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="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"/>

FGUIProject/assets/CommonGame/package.xml

@@ -241,6 +241,7 @@
     <image id="jcej3s" name="dz_hz_fsk_1.png" path="/imagesExport/" exported="true" scale="9grid" scale9grid="50,14,100,28"/>
     <image id="jcej2i" name="jjsy_bqdi.png" path="/imagesExport/" exported="true"/>
     <image id="jcej2h" name="jjsy_zldi.png" path="/imagesExport/" exported="true" scale="9grid" scale9grid="68,14,136,28"/>
+    <image id="u2u3tkq" name="testBig.png" path="/imgItemIcon/" exported="true"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\CommonGame" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

GameClient/Assets/Game/HotUpdate/Data/VO/ItemData.cs

@@ -50,6 +50,8 @@ namespace GFGGame
             var cfg = ItemCfgArray.Instance.GetCfg(id);
             if (cfg.itemType == ConstItemType.CARD)
             {
+                CardData cardData = CardDataManager.GetCardDataById(id);
+                if (cardData == null || !cardData.scores.ContainsKey(scoreType)) return 0;
                 return CardDataManager.GetCardDataById(id).scores[scoreType];
             }
             switch (scoreType)