竞技场添加头像框

FGUIProject/assets/Arena/components/ComDanSimpleInfo.xml

@@ -8,12 +8,9 @@
     <loader id="n12_jcej" name="n12" xy="14,144" size="237,286" url="ui://4lc5fhlbjcej1n" autoSize="true">
       <gearIcon controller="c1" pages="0" values="ui://4lc5fhlbjcej1n" default="ui://4lc5fhlbjcej1t"/>
     </loader>
-    <component id="n1_psph" name="comHead" src="r9ri1h" fileName="components/ComHead.xml" pkg="eg2y0ldp" xy="21,5" pivot="0.5,0.5" scale="1.5,1.5" controller="c1,1"/>
-    <loader id="n10_jcej" name="n10" xy="8,3" size="250,250" url="ui://4lc5fhlbjcej1r" autoSize="true">
-      <gearIcon controller="c1" pages="1" values="ui://4lc5fhlbjcej1s" default="ui://4lc5fhlbjcej1r"/>
-    </loader>
+    <component id="n1_psph" name="comHead" src="r9ri1h" fileName="components/ComHead.xml" pkg="eg2y0ldp" xy="21,5" pivot="0.5,0.5" scale="1.5,1.5" controller="c1,1,c2,3"/>
     <text id="n6_psph" name="txtName" xy="67,254" pivot="0.5,0" size="132,44" fontSize="32" color="#fef7f6" align="center" autoClearText="true" text="名字名字"/>
     <text id="n7_psph" name="txtDanTitle" xy="83,298" pivot="0.5,0" size="100,34" fontSize="24" color="#fef7f6" align="center" autoClearText="true" text="段位段位"/>
-    <text id="n8_psph" name="txtRank" xy="46,327" pivot="0.5,0" size="173,34" fontSize="24" color="#fef7f6" align="center" vars="true" autoClearText="true" text="段位排名 {rank=10000}"/>
+    <text id="n8_psph" name="txtRank" xy="50,327" pivot="0.5,0" size="165,34" fontSize="24" color="#fef7f6" align="center" vars="true" autoClearText="true" text="段位排名 {rank=10000}"/>
   </displayList>
 </component>

FGUIProject/assets/Arena/components/ListRankItem.xml

@@ -4,16 +4,15 @@
   <displayList>
     <image id="n6_jcej" name="n6" src="jcej43" fileName="images/phbphb_pbtdi.png" xy="0,0"/>
     <image id="n16_jcej" name="n16" src="jcej46" fileName="images/phbphb_xxt.png" xy="9,283"/>
-    <component id="n5_psph" name="comHead" src="r9ri1h" fileName="components/ComHead.xml" pkg="eg2y0ldp" xy="3,17" scale="1.117,1.117"/>
-    <component id="n9_jcej" name="comLv" src="psphq" fileName="components/ComLv.xml" pkg="eg2y0ldp" xy="185,207"/>
-    <image id="n8_jcej" name="n8" src="jcej45" fileName="images/phbphb_txkk.png" xy="36,58"/>
+    <component id="n5_psph" name="comHead" src="r9ri1h" fileName="components/ComHead.xml" pkg="eg2y0ldp" xy="3,17" scale="1.117,1.117" controller="c2,4"/>
+    <component id="n9_jcej" name="comLv" src="psphq" fileName="components/ComHeadLv.xml" pkg="eg2y0ldp" xy="185,207"/>
     <loader id="n7_jcej" name="loaRank" xy="85,21" size="88,87" url="ui://4lc5fhlbjcej3m" autoSize="true">
       <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://eg2y0ldpu2u3tkq" fill="scale"/>
-    <text id="n15_jcej" name="txtName" xy="68,242" pivot="0.5,0" size="122,42" fontSize="30" color="#927550" align="center" autoClearText="true" text="玩家名称"/>
-    <text id="n13_jcej" name="txtDanRank" xy="30,323" size="137,34" fontSize="24" color="#927550" align="center" autoClearText="true" text="段位排名：1"/>
-    <text id="n14_jcej" name="txtFightScore" xy="30,288" size="206,34" fontSize="24" color="#927550" letterSpacing="-2" text="竞技场战力：111111"/>
+    <text id="n15_jcej" name="txtName" xy="68,242" pivot="0.5,0" size="122,41" fontSize="30" color="#927550" align="center" autoClearText="true" text="玩家名称"/>
+    <text id="n13_jcej" name="txtDanRank" xy="30,323" size="136,34" fontSize="24" color="#927550" align="center" autoClearText="true" text="段位排名：1"/>
+    <text id="n14_jcej" name="txtFightScore" xy="30,288" size="196,34" fontSize="24" color="#927550" letterSpacing="-2" text="竞技场战力：111111"/>
   </displayList>
 </component>

FGUIProject/assets/Arena/components/ListRankItem3.xml

@@ -3,8 +3,7 @@
   <displayList>
     <image id="n19_jcej" name="n19" src="jcej44" fileName="images/phbphb_phdi_1.png" xy="0,0"/>
     <text id="n12_psph" name="txtRank" xy="28,41" pivot="0.5,0" size="132,59" group="n18_psph" fontSize="44" color="#a98860" align="center" autoClearText="true" text="100000"/>
-    <component id="n31_v461" name="comHead" src="r9ri1h" fileName="components/ComHead.xml" pkg="eg2y0ldp" xy="167,-18" size="229,230" group="n35_v461" scale="0.73,0.73"/>
-    <image id="n32_v461" name="n32" src="jcej33" fileName="images/jzsjzs_txktx.png" xy="188,9" group="n35_v461"/>
+    <component id="n31_v461" name="comHead" src="r9ri1h" fileName="components/ComHead.xml" pkg="eg2y0ldp" xy="167,-18" size="229,230" group="n35_v461" scale="0.73,0.73" controller="c2,2"/>
     <component id="n33_v461" name="btnLook" src="jcej2w" fileName="components/BtnLook.xml" xy="272,11" group="n35_v461" scale="0.7,0.7"/>
     <component id="n34_v461" name="comLv" src="psphq" fileName="components/ComHeadLv.xml" pkg="eg2y0ldp" xy="273,99" group="n35_v461" scale="0.9,0.9"/>
     <group id="n35_v461" name="n35" xy="167,-18" size="229,230" group="n18_psph"/>

FGUIProject/assets/Arena/components/ListRankItem4.xml

@@ -2,19 +2,18 @@
 <component size="916,165">
   <displayList>
     <image id="n19_jcej" name="n19" src="jcej4d" fileName="images/phbphb_zjpm.png" xy="0,0"/>
-    <text id="n12_psph" name="txtRank" xy="30,54" pivot="0.5,0" size="150,59" group="n18_psph" fontSize="44" color="#a98860" align="center" autoClearText="true" text="100000"/>
-    <component id="n13_psph" name="comHead" src="r9ri1h" fileName="components/ComHead.xml" pkg="eg2y0ldp" xy="189,-6" size="229,230" group="n30_jcej" scale="0.73,0.73"/>
-    <image id="n32_v461" name="n32" src="jcej33" fileName="images/jzsjzs_txktx.png" xy="210,21" group="n30_jcej"/>
+    <text id="n12_psph" name="txtRank" xy="39,54" pivot="0.5,0" size="132,59" group="n18_psph" fontSize="44" color="#a98860" align="center" autoClearText="true" text="100000"/>
+    <component id="n13_psph" name="comHead" src="r9ri1h" fileName="components/ComHead.xml" pkg="eg2y0ldp" xy="189,-6" size="229,230" group="n30_jcej" scale="0.73,0.73" controller="c2,1"/>
     <component id="n24_jcej" name="btnLook" src="jcej2w" fileName="components/BtnLook.xml" xy="294,19" group="n30_jcej" scale="0.7,0.7"/>
-    <component id="n23_jcej" name="comLv" src="psphq" fileName="components/ComLv.xml" pkg="eg2y0ldp" xy="294,111" group="n30_jcej" scale="0.9,0.9"/>
+    <component id="n23_jcej" name="comLv" src="psphq" fileName="components/ComHeadLv.xml" pkg="eg2y0ldp" xy="294,111" group="n30_jcej" scale="0.9,0.9"/>
     <group id="n30_jcej" name="n30" xy="189,-6" size="229,230" group="n18_psph"/>
-    <text id="n14_psph" name="txtName" xy="346,33" size="48,52" group="n29_jcej" fontSize="38" color="#927550" align="center" autoClearText="true" text="--"/>
+    <text id="n14_psph" name="txtName" xy="346,33" size="54,51" group="n29_jcej" fontSize="38" color="#927550" align="center" autoClearText="true" text="--"/>
     <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="205,39" group="n29_jcej" fontSize="28" color="#9b7c56" align="center" autoClearText="true" text="竞技场战力：--"/>
+    <text id="n15_psph" name="txtFightScore" xy="345,91" size="209,39" group="n29_jcej" 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,42" group="n27_jcej" fontSize="30" color="#c09c6d" text="段位排名"/>
-    <text id="n17_psph" name="txtDanRank" xy="777,71" pivot="0.5,0" size="52,56" group="n27_jcej" fontSize="42" color="#c09c6d" align="center" letterSpacing="-2" bold="true" text="--"/>
+    <text id="n26_jcej" name="n26" xy="742,37" size="122,41" group="n27_jcej" fontSize="30" color="#c09c6d" text="段位排名"/>
+    <text id="n17_psph" name="txtDanRank" xy="773,71" pivot="0.5,0" size="59,56" group="n27_jcej" 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="30,-6" size="834,230"/>
   </displayList>

FGUIProject/assets/Arena/components/ListRecordItem.xml

@@ -2,15 +2,13 @@
 <component size="898,164">
   <displayList>
     <image id="n9_jcej" name="n9" src="jcej24" fileName="images/bpjl_bpdi.png" xy="0,0"/>
-    <loader id="n1_psph" name="loaScore" xy="36,53" size="58,58" url="ui://eg2y0ldp842s6h" autoSize="true" clearOnPublish="true"/>
-    <text id="n2_psph" name="txtMyScore" xy="123,54" pivot="0.5,0" size="100,56" fontSize="42" color="#b07c7c" align="center" autoClearText="true" text="9999"/>
-    <component id="n3_psph" name="comMyHead" src="r9ri1h" fileName="components/ComHead.xml" pkg="eg2y0ldp" xy="177,-36" pivot="0.5,0.5" scale="0.58,0.58"/>
+    <loader id="n1_psph" name="loaScore" xy="36,53" size="44,44" url="ui://eg2y0ldp842s6h" autoSize="true" clearOnPublish="true"/>
+    <text id="n2_psph" name="txtMyScore" xy="130,54" pivot="0.5,0" size="85,56" fontSize="42" color="#b07c7c" align="center" autoClearText="true" text="9999"/>
+    <component id="n3_psph" name="comMyHead" src="r9ri1h" fileName="components/ComHead.xml" pkg="eg2y0ldp" xy="177,-36" pivot="0.5,0.5" scale="0.58,0.58" controller="c2,1"/>
     <component id="n4_psph" name="loaMyCard" src="jcej2u" fileName="components/ComCardRecord.xml" xy="363,44"/>
-    <text id="n11_jcej" name="n11" xy="465,60" size="36,44" fontSize="32" color="#b07c7c" text="vs"/>
+    <text id="n11_jcej" name="n11" xy="465,60" size="29,44" fontSize="32" color="#b07c7c" text="vs"/>
     <component id="n6_psph" name="loaTargetCard" src="jcej2u" fileName="components/ComCardRecord.xml" xy="527,44"/>
-    <component id="n7_psph" name="comTargetHead" src="r9ri1h" fileName="components/ComHead.xml" pkg="eg2y0ldp" xy="563,-36" pivot="0.5,0.5" scale="0.58,0.58"/>
-    <text id="n8_psph" name="txtTargetScore" xy="765,54" pivot="0.5,0" size="76,56" fontSize="42" color="#b07c7c" autoClearText="true" text="999"/>
-    <image id="n10_jcej" name="n10" src="jcej2c" fileName="images/jjsjs_txk_2.png" xy="241,33"/>
-    <image id="n14_jcej" name="n14" src="jcej2c" fileName="images/jjsjs_txk_2.png" xy="628,33"/>
+    <component id="n7_psph" name="comTargetHead" src="r9ri1h" fileName="components/ComHead.xml" pkg="eg2y0ldp" xy="563,-36" pivot="0.5,0.5" scale="0.58,0.58" controller="c2,2"/>
+    <text id="n8_psph" name="txtTargetScore" xy="771,54" pivot="0.5,0" size="64,56" fontSize="42" color="#b07c7c" autoClearText="true" text="999"/>
   </displayList>
 </component>

FGUIProject/assets/Arena/components/ListResultItem.xml

@@ -2,15 +2,13 @@
 <component size="958,166">
   <displayList>
     <image id="n9_jcej" name="n9" src="jcej2f" fileName="images/jjsjs_di.png" xy="0,0"/>
-    <loader id="n1_psph" name="loaScore" xy="36,53" size="58,58" url="ui://eg2y0ldp842s6h" autoSize="true" clearOnPublish="true"/>
-    <text id="n2_psph" name="txtMyScore" xy="108,54" pivot="0.5,0" size="124,56" fontSize="42" color="#b07c7c" align="center" autoClearText="true" text="99900"/>
-    <component id="n3_psph" name="comMyHead" src="r9ri1h" fileName="components/ComHead.xml" pkg="eg2y0ldp" xy="177,-36" pivot="0.5,0.5" scale="0.58,0.58"/>
+    <loader id="n1_psph" name="loaScore" xy="36,53" size="44,44" url="ui://eg2y0ldp842s6h" autoSize="true" clearOnPublish="true"/>
+    <text id="n2_psph" name="txtMyScore" xy="117,54" pivot="0.5,0" size="105,56" fontSize="42" color="#b07c7c" align="center" autoClearText="true" text="99900"/>
+    <component id="n3_psph" name="comMyHead" src="r9ri1h" fileName="components/ComHead.xml" pkg="eg2y0ldp" xy="177,-36" pivot="0.5,0.5" scale="0.58,0.58" controller="c2,2"/>
     <component id="n4_psph" name="loaMyCard" src="jcej2u" fileName="components/ComCardRecord.xml" xy="360,44"/>
-    <text id="n11_jcej" name="txtRound" xy="458,60" size="118,44" fontSize="32" color="#b07c7c" letterSpacing="-2" vars="true" text="Round {value=1}"/>
+    <text id="n11_jcej" name="txtRound" xy="458,60" size="108,44" fontSize="32" color="#b07c7c" letterSpacing="-2" vars="true" text="Round {value=1}"/>
     <component id="n6_psph" name="loaTargetCard" src="jcej2u" fileName="components/ComCardRecord.xml" xy="595,44"/>
-    <component id="n7_psph" name="comTargetHead" src="r9ri1h" fileName="components/ComHead.xml" pkg="eg2y0ldp" xy="627,-36" pivot="0.5,0.5" scale="0.58,0.58"/>
-    <text id="n8_psph" name="txtTargetScore" xy="795,54" pivot="0.5,0" size="124,56" fontSize="42" color="#b07c7c" align="center" autoClearText="true" text="99900"/>
-    <image id="n10_jcej" name="n10" src="jcej2c" fileName="images/jjsjs_txk_2.png" xy="241,33"/>
-    <image id="n14_jcej" name="n14" src="jcej2c" fileName="images/jjsjs_txk_2.png" xy="692,33"/>
+    <component id="n7_psph" name="comTargetHead" src="r9ri1h" fileName="components/ComHead.xml" pkg="eg2y0ldp" xy="627,-36" pivot="0.5,0.5" scale="0.58,0.58" controller="c2,2"/>
+    <text id="n8_psph" name="txtTargetScore" xy="804,54" pivot="0.5,0" size="105,56" fontSize="42" color="#b07c7c" align="center" autoClearText="true" text="99900"/>
   </displayList>
 </component>

FGUIProject/assets/Arena/components/ListTargetItem.xml

@@ -3,15 +3,14 @@
   <displayList>
     <loader id="n45_jcej" name="loaBg" xy="0,0" size="573,196" url="ui://4lc5fhlbjcej3b" autoSize="true"/>
     <image id="n37_jcej" name="n37" src="jcej3n" fileName="images/jzsjzs_xxxtxt.png" xy="192,85"/>
-    <component id="n31_psph" name="comHead" src="r9ri1h" fileName="components/ComHead.xml" pkg="eg2y0ldp" xy="106,95" pivot="0.5,0.5" anchor="true" group="n42_jcej" scale="0.725,0.725"/>
-    <image id="n40_jcej" name="n40" src="jcej33" fileName="images/jzsjzs_txktx.png" xy="44,38" group="n42_jcej"/>
-    <component id="n43_jcej" name="comLv" src="psphq" fileName="components/ComLv.xml" pkg="eg2y0ldp" xy="124,122" group="n42_jcej"/>
+    <component id="n31_psph" name="comHead" src="r9ri1h" fileName="components/ComHead.xml" pkg="eg2y0ldp" xy="106,95" pivot="0.5,0.5" anchor="true" group="n42_jcej" scale="0.725,0.725" controller="c2,2"/>
+    <component id="n43_jcej" name="comLv" src="psphq" fileName="components/ComHeadLv.xml" pkg="eg2y0ldp" xy="124,122" group="n42_jcej"/>
     <group id="n42_jcej" name="n42" xy="-9,-20" size="230,230"/>
     <text id="n32_psph" name="txtName" xy="193,30" size="148,49" fontSize="36" color="#927550" text="对手名字"/>
     <component id="n44_jcej" name="btnLook" src="jcej2w" fileName="components/BtnLook.xml" xy="124,30" size="41,41" aspect="true"/>
     <text id="n35_psph" name="txtDanTitle" xy="193,96" size="100,34" fontSize="24" color="#9b7c56" text="段位名称"/>
-    <text id="n33_psph" name="txtRank" xy="352,96" size="191,34" fontSize="24" color="#9b7c56" text="段位排名：10000"/>
-    <text id="n34_psph" name="txtFightScore" xy="192,131" size="215,34" fontSize="24" color="#9b7c56" text="竞技场战力：10000"/>
+    <text id="n33_psph" name="txtRank" xy="352,96" size="182,34" fontSize="24" color="#9b7c56" text="段位排名：10000"/>
+    <text id="n34_psph" name="txtFightScore" xy="192,131" size="206,34" fontSize="24" color="#9b7c56" text="竞技场战力：10000"/>
     <image id="n46_u2u3" name="imgUpDan" src="u2u353" fileName="images/jjsy_jjjj.png" xy="519,15"/>
   </displayList>
 </component>

FGUIProject/assets/Arena/package.xml

@@ -95,7 +95,7 @@
     <component id="jcej30" name="ListResultItem.xml" path="/components/"/>
     <image id="jcej31" name="dwjl_didi.png" path="/images/"/>
     <image id="jcej32" name="jzsjzs_xtxt_1.png" path="/images/"/>
-    <image id="jcej33" name="jzsjzs_txktx.png" path="/images/"/>
+    <image id="jcej33" name="jzsjzs_txktx.png" path="/images/" scale9grid="30,30,60,60"/>
     <image id="jcej34" name="jzsjzs_sxsxa.png" path="/images/"/>
     <image id="jcej35" name="jzsjzs_ssss.png" path="/images/"/>
     <image id="jcej36" name="jzsjzs_sjsjdi.png" path="/images/"/>

FGUIProject/assets/CommonGame/components/ComHead.xml

@@ -4,6 +4,9 @@
     <remark page="0" value="可见"/>
     <remark page="1" value="不可见"/>
   </controller>
+  <controller name="c2" exported="true" pages="0,,1,,2,,3,,4," selected="4">
+    <remark page="0" value="默认边框"/>
+  </controller>
   <displayList>
     <image id="n43_jcej" name="n43" src="jcejtkj" fileName="images/grxx_123.png" xy="33,40" pivot="0.5,0.5" size="160,160" group="n41_r9ri">
       <relation target="" sidePair="width-width,height-height"/>
@@ -11,9 +14,20 @@
     <component id="n39_r9ri" name="comHead" src="jcejtki" fileName="components/ComHeadIcon.xml" xy="30,37" pivot="0.5,0.5" group="n41_r9ri">
       <relation target="" sidePair="width-width,height-height"/>
     </component>
-    <image id="n35_r9ri" name="n35" src="r9ritjs" fileName="images/grxx_zytxtx.png" xy="28,36" pivot="0.5,0.5" size="170,171" group="n41_r9ri" aspect="true">
-      <gearDisplay controller="c1" pages="0"/>
-      <relation target="" sidePair="width-width,height-height"/>
+    <image id="n45_qik1" name="n45" src="r9ritjs" fileName="images/grxx_zytxtx.png" xy="28,37" pivot="0.5,0.5" size="170,170" group="n41_r9ri" aspect="true">
+      <gearDisplay controller="c2" pages="0"/>
+    </image>
+    <image id="n46_qik1" name="n46" src="qik1tm2" fileName="images/jzsjzs_txktx.png" xy="29,36" pivot="0.5,0.5" size="166,168" group="n41_r9ri">
+      <gearDisplay controller="c2" pages="1"/>
+    </image>
+    <image id="n47_qik1" name="n47" src="qik1tm3" fileName="images/jjsjs_txk_2.png" xy="30,39" size="165,165" group="n41_r9ri" aspect="true">
+      <gearDisplay controller="c2" pages="2"/>
+    </image>
+    <image id="n48_qik1" name="n48" src="qik1tm4" fileName="images/pmts_xtk_1.png" xy="29,36" size="167,167" group="n41_r9ri" aspect="true">
+      <gearDisplay controller="c2" pages="3"/>
+    </image>
+    <image id="n49_qik1" name="n49" src="qik1tm5" fileName="images/phbphb_txkk.png" xy="30,38" size="166,166" group="n41_r9ri">
+      <gearDisplay controller="c2" pages="4"/>
     </image>
     <loader id="n37_r9ri" name="loaBorder" xy="0,13" pivot="0.5,0.5" size="230,203" group="n41_r9ri" touchable="false" autoSize="true">
       <relation target="" sidePair="width-width,height-height"/>

FGUIProject/assets/CommonGame/package.xml

@@ -306,6 +306,10 @@
     <image id="hhx9j" name="wp_baseboard1.png" path="/imagesNew/"/>
     <image id="qik1tm0" name="dikuang_SkillLevel.png" path="/imagesNew/" scale="9grid" scale9grid="10,7,20,14"/>
     <component id="qik1tm1" name="BtnStyle000.xml" path="/components/" exported="true"/>
+    <image id="qik1tm2" name="jzsjzs_txktx.png" path="/images/" scale9grid="30,30,60,60"/>
+    <image id="qik1tm3" name="jjsjs_txk_2.png" path="/images/"/>
+    <image id="qik1tm4" name="pmts_xtk_1.png" path="/images/"/>
+    <image id="qik1tm5" name="phbphb_txkk.png" path="/images/"/>
   </resources>
   <publish name="" path="../GameClient/Assets/ResIn/UI/CommonGame" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

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

@@ -38,15 +38,18 @@ namespace GFGGame
             long myScore = myScores[index];
             int myCardId = ArenaDataManager.Instance.DressupList[index].cardId;
             int myHeadId = ArenaDataManager.Instance.DressupList[index].headId;
+            int myHeadBorderId = ArenaDataManager.Instance.DressupList[index].borderId;
 
             long targetScore = targetScores[index];
             // ArenaTargetData targetData = ArenaDataManager.Instance.Targets[index];
             int targetCardId = targetData.FightDatas[index].cardId;
             int targetHeadId = 0;
+            int targetBorderId = 0;
             string res = "";
             if (targetData.Type == FightTargetType.PLAYER)
             {
                 targetHeadId = targetData.FightDatas[index].headId;
+                targetBorderId = targetData.FightDatas[index].borderId;
             }
             else
             {
@@ -65,10 +68,10 @@ namespace GFGGame
             item.m_loaMyCard.m_comCardmask.m_loaCard.url = cardCfg == null ? "" : ResPathUtil.GetCardSmallPath(cardCfg.res);
             ItemCfg targetCardCfg = ItemCfgArray.Instance.GetCfg(targetCardId);
             item.m_loaTargetCard.m_comCardmask.m_loaCard.url = targetCardCfg == null ? "" : ResPathUtil.GetCardSmallPath(targetCardCfg.res);
-            RoleInfoManager.Instance.UpdateHead(item.m_comMyHead, myHeadId, 0);
+            RoleInfoManager.Instance.UpdateHead(item.m_comMyHead, myHeadId, myHeadBorderId);
             if (targetHeadId > 0)
             {
-                RoleInfoManager.Instance.UpdateHead(item.m_comTargetHead, targetHeadId, 0);
+                RoleInfoManager.Instance.UpdateHead(item.m_comTargetHead, targetHeadId, targetBorderId);
             }
             else
             {

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

@@ -18,6 +18,7 @@ namespace GFGGame
         /**********************************************玩家独立数据*****************************************/
 
         public int headId;//头像id
+        public int borderId;//头像框id
         public Dictionary<int, List<int>> pardListDic = new Dictionary<int, List<int>>();//战斗部位，部件列表,战斗开始时更新
         public Dictionary<int, List<int>> pardScoreListDic = new Dictionary<int, List<int>>();//战斗部位，部件分数列表,战斗开始时更新
         public List<int> itemList = new List<int>();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComHead.cs

@@ -8,6 +8,7 @@ namespace UI.CommonGame
     {
         public GComponent target;
         public Controller m_c1;
+        public Controller m_c2;
         public UI_ComHeadIcon m_comHead;
         public GLoader m_loaBorder;
         public const string URL = "ui://eg2y0ldpr9ri1h";
@@ -58,12 +59,14 @@ namespace UI.CommonGame
         private void Init(GComponent comp)
         {
             m_c1 = comp.GetController("c1");
+            m_c2 = comp.GetController("c2");
             m_comHead = (UI_ComHeadIcon)UI_ComHeadIcon.Create(comp.GetChild("comHead"));
             m_loaBorder = (GLoader)comp.GetChild("loaBorder");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_c1 = null;
+            m_c2 = null;
             m_comHead.Dispose();
             m_comHead = null;
             m_loaBorder = null;

GameClient/Assets/Game/HotUpdate/ServerProxy/ArenaSproxy.cs

@@ -203,6 +203,7 @@ namespace GFGGame
                     ArenaDataManager.Instance.LastRank = ArenaDataManager.Instance.Rank;
                     ArenaDataManager.Instance.LastTargetInfo.roleName = targetData.RoleInfo.roleName;
                     ArenaDataManager.Instance.LastTargetInfo.headId = targetData.RoleInfo.headId;
+                    ArenaDataManager.Instance.LastTargetInfo.headBorderId = targetData.RoleInfo.headBorderId;
                     ArenaDataManager.Instance.LastTargetInfo.headRes = targetData.RoleInfo.headRes;
                     ArenaDataManager.Instance.BonusList = ItemUtil.CreateItemDataList(response.rewards);
                     ArenaDataManager.Instance.LastTargets = new List<ArenaTargetData>(ArenaDataManager.Instance.Targets);

GameClient/Assets/Game/HotUpdate/Views/Arena/ArenaRankUpView.cs

@@ -45,8 +45,8 @@ namespace GFGGame
 
             this.clickBlankToClose = false;
 
-            UpdateInfo(_ui.m_comMyHeadInfo.target, ArenaDataManager.Instance.Grade, ArenaDataManager.Instance.Rank, RoleDataManager.roleName, RoleDataManager.headId, "");
-            UpdateInfo(_ui.m_comTargetHeadInfo.target, lastGrade, lastRank, targetName, targetHeadId, targetHeadRes);
+            UpdateInfo(_ui.m_comMyHeadInfo.target, ArenaDataManager.Instance.Grade, ArenaDataManager.Instance.Rank, RoleDataManager.roleName, RoleDataManager.headId, RoleDataManager.headBorderId, "");
+            UpdateInfo(_ui.m_comTargetHeadInfo.target, lastGrade, lastRank, targetName, targetHeadId, 0, targetHeadRes);
 
             _ui.m_t0.Play(() => { this.clickBlankToClose = true; });
         }
@@ -62,7 +62,7 @@ namespace GFGGame
             base.RemoveEventListener();
         }
 
-        private void UpdateInfo(GComponent com, int grade, int rank, string name, int headId, string res)
+        private void UpdateInfo(GComponent com, int grade, int rank, string name, int headId, int borderId, string res)
         {
             UI_ComDanSimpleInfo comDanSimpleInfo = UI_ComDanSimpleInfo.Proxy(com);
             comDanSimpleInfo.m_txtName.text = name;
@@ -71,7 +71,7 @@ namespace GFGGame
             comDanSimpleInfo.m_txtRank.text = string.Format("段位排名：{0}", rank);
             if (headId > 0)
             {
-                RoleInfoManager.Instance.UpdateHead(comDanSimpleInfo.m_comHead, headId, 0);
+                RoleInfoManager.Instance.UpdateHead(comDanSimpleInfo.m_comHead, headId, borderId);
             }
             else
             {

GameClient/Assets/Game/HotUpdate/Views/Arena/ArenaRankView.cs

@@ -243,7 +243,7 @@ namespace GFGGame
                 {
                     //上榜的玩家一定战斗过，可以直接计算
                     item.m_txtFightScore.text = string.Format("飞花令战力：{0}", ArenaDataManager.Instance.GetAllFightScore(arenaData.FightScores));
-                    RoleInfoManager.Instance.UpdateHead(item.m_comHead, arenaData.RoleInfo.headId, 0);
+                    RoleInfoManager.Instance.UpdateHead(item.m_comHead, arenaData.RoleInfo.headId, arenaData.RoleInfo.headBorderId);
                 }
                 else
                 {
@@ -257,7 +257,7 @@ namespace GFGGame
                 RoleInfoManager.Instance.UpdateLv(item.m_comLv, arenaData.RoleInfo.roleLv);
                 if (arenaData.Type == FightTargetType.PLAYER)
                 {
-                    RoleInfoManager.Instance.UpdateHead(item.m_comHead, arenaData.RoleInfo.headId, 0);
+                    RoleInfoManager.Instance.UpdateHead(item.m_comHead, arenaData.RoleInfo.headId, arenaData.RoleInfo.headBorderId);
                 }
                 else
                 {
@@ -302,7 +302,7 @@ namespace GFGGame
                 {
                     //上榜的玩家一定战斗过，可以直接计算
                     item.m_txtFightScore.text = string.Format("飞花令战力：{0}", ArenaDataManager.Instance.GetAllFightScore(arenaData.FightScores));
-                    RoleInfoManager.Instance.UpdateHead(item.m_comHead, arenaData.RoleInfo.headId, 0);
+                    RoleInfoManager.Instance.UpdateHead(item.m_comHead, arenaData.RoleInfo.headId, arenaData.RoleInfo.headBorderId);
                 }
                 else
                 {

GameClient/Assets/Game/HotUpdate/Views/Arena/ArenaResultQuickView.cs

@@ -49,7 +49,7 @@ namespace GFGGame
             _ui.m_txtDantitle.text = rankCfg.gradeName;
             if (_targetData.Type == FightTargetType.PLAYER)
             {
-                RoleInfoManager.Instance.UpdateHead(_ui.m_comTargetHead, _targetData.RoleInfo.headId, 0);
+                RoleInfoManager.Instance.UpdateHead(_ui.m_comTargetHead, _targetData.RoleInfo.headId, _targetData.RoleInfo.headBorderId);
             }
             else
             {

GameClient/Assets/Game/HotUpdate/Views/Arena/ArenaView.cs

@@ -391,7 +391,7 @@ namespace GFGGame
 
             if (targetData.Type == FightTargetType.PLAYER)
             {
-                RoleInfoManager.Instance.UpdateHead(item.m_comHead, targetData.RoleInfo.headId, 0);
+                RoleInfoManager.Instance.UpdateHead(item.m_comHead, targetData.RoleInfo.headId, targetData.RoleInfo.headBorderId);
             }
             else
             {