竞技场

FGUIProject/assets/Arena/components/BtnTab11.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="455,96" extention="Button">
+  <controller name="button" pages="0,down,1,up" selected="0"/>
+  <displayList>
+    <image id="n7_jcej" name="n7" src="jcej47" fileName="images/phbphb_zidi_1.png" xy="0,0">
+      <gearDisplay controller="button" pages="0"/>
+    </image>
+    <image id="n8_jcej" name="n8" src="jcej48" fileName="images/phbphb_zidi_2.png" xy="0,0">
+      <gearDisplay controller="button" pages="1"/>
+    </image>
+    <loader id="n4_psph" name="icon" xy="227,48" pivot="0.5,0.5" anchor="true" size="167,42" url="ui://4lc5fhlbjcej49" autoSize="true">
+      <gearIcon controller="button" pages="0,1" values="ui://4lc5fhlbjcej49|ui://4lc5fhlbjcej4c"/>
+    </loader>
+  </displayList>
+  <Button mode="Radio"/>
+</component>

FGUIProject/assets/Arena/components/BtnTab22.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="296,83" extention="Button">
+  <controller name="button" pages="0,down,1,up" selected="0"/>
+  <displayList>
+    <image id="n6_jcej" name="n6" src="jcej42" fileName="images/phbphb_btdidi_2.png" xy="0,0">
+      <gearDisplay controller="button" pages="0"/>
+    </image>
+    <loader id="n4_psph" name="icon" xy="148,41" pivot="0.5,0.5" anchor="true" size="127,42" url="ui://4lc5fhlbjcej4j" autoSize="true">
+      <gearIcon controller="button" pages="0,1" values="ui://4lc5fhlbjcej4j|ui://4lc5fhlbjcej4h"/>
+    </loader>
+  </displayList>
+  <Button mode="Radio"/>
+</component>

FGUIProject/assets/Arena/components/ComValueInfo.xml

@@ -2,8 +2,9 @@
 <component size="277,254">
   <controller name="c1" alias="标签数量" pages="0,,1,,2,,3,,4,,5," selected="0"/>
   <controller name="c2" pages="0,,1," selected="0"/>
+  <controller name="c3" pages="0,,1," selected="0"/>
   <displayList>
-    <image id="n91_jcej" name="n91" src="jcej2h" fileName="images/jjsy_zldi.png" xy="0,0" size="288,56" group="n92_jcej" pkg="eg2y0ldp">
+    <image id="n91_jcej" name="n91" src="jcej2h" fileName="imagesExport/jjsy_zldi.png" pkg="eg2y0ldp" xy="0,0" size="288,56" group="n92_jcej">
       <relation target="n82_jcej" sidePair="width-width"/>
     </image>
     <text id="n82_jcej" name="txtFightScore" xy="48,7" size="225,39" group="n92_jcej" font="ui://eg2y0ldpwonotjc" fontSize="28" color="#a07943" vars="true" text="竞技场战力：{value=000}"/>
@@ -11,23 +12,23 @@
       <Button icon="ui://eg2y0ldpjcej2k" controller="c2" page="1"/>
     </component>
     <group id="n92_jcej" name="n92" xy="0,0" size="288,56"/>
-    <image id="n83_jcej" name="n83" src="jcej3s" fileName="images/dz_hz_fsk_1.png" xy="1,70" size="248,57" group="n86_jcej" pkg="eg2y0ldp"/>
+    <image id="n83_jcej" name="n83" src="jcej3s" fileName="imagesExport/dz_hz_fsk_1.png" pkg="eg2y0ldp" xy="1,70" size="248,57" group="n86_jcej"/>
     <loader id="n84_jcej" name="scoreType" xy="0,72" size="50,50" group="n86_jcej" url="ui://eg2y0ldp842s6h" fill="scale"/>
     <text id="n85_jcej" name="txtScore" xy="80,72" size="124,54" group="n86_jcej" fontSize="28" color="#b08649" align="center" vAlign="middle" autoSize="none" autoClearText="true" text="9999"/>
     <group id="n86_jcej" name="n86" xy="0,70" size="249,57"/>
-    <image id="n93_jcej" name="n93" src="jcej2i" fileName="images/jjsy_bqdi.png" xy="4,139" group="n90_jcej" pkg="eg2y0ldp"/>
+    <image id="n93_jcej" name="n93" src="jcej2i" fileName="imagesExport/jjsy_bqdi.png" pkg="eg2y0ldp" xy="4,139" group="n90_jcej"/>
     <text id="n94_jcej" name="n94" xy="58,142" size="116,39" group="n90_jcej" font="ui://eg2y0ldpwonotjc" fontSize="28" color="#a07943" text="标签加成"/>
     <component id="n87_jcej" name="btnTagRule" src="psphtkg" fileName="components/BtnRule.xml" pkg="eg2y0ldp" xy="185,149" size="29,29" group="n90_jcej">
       <Button icon="ui://eg2y0ldpjcej2k"/>
     </component>
-    <component id="n88_jcej" name="comTag" src="ih7566" fileName="components/ComTag.xml" pkg="eg2y0ldp" xy="25,187" group="n90_jcej"/>
-    <text id="n89_jcej" name="txtTagScore" xy="176,187" pivot="0.5,0" size="19,36" group="n90_jcej" fontSize="26" color="#de867e" align="center" text="0"/>
+    <component id="n88_jcej" name="comTag" src="ih7566" fileName="components/ComTag.xml" pkg="eg2y0ldp" xy="25,187" group="n110_u10a"/>
+    <text id="n89_jcej" name="txtTagScore" xy="176,187" pivot="0.5,0" size="19,36" group="n110_u10a" fontSize="26" color="#de867e" align="center" text="0"/>
     <image id="n96_jcej" name="n96" src="jcej2m" fileName="images/jjsy_xx_2.png" xy="33,229" group="n101_jcej"/>
     <image id="n97_jcej" name="n97" src="jcej2m" fileName="images/jjsy_xx_2.png" xy="49,229" group="n101_jcej"/>
     <image id="n98_jcej" name="n98" src="jcej2m" fileName="images/jjsy_xx_2.png" xy="65,229" group="n101_jcej"/>
     <image id="n99_jcej" name="n99" src="jcej2m" fileName="images/jjsy_xx_2.png" xy="81,229" group="n101_jcej"/>
     <image id="n100_jcej" name="n100" src="jcej2m" fileName="images/jjsy_xx_2.png" xy="97,229" group="n101_jcej"/>
-    <group id="n101_jcej" name="n101" xy="33,229" size="78,14" group="n90_jcej" advanced="true" layout="hz" colGap="2" excludeInvisibles="true"/>
+    <group id="n101_jcej" name="n101" xy="33,229" size="78,14" group="n110_u10a" advanced="true" layout="hz" colGap="2" excludeInvisibles="true"/>
     <image id="n102_jcej" name="n102" src="jcej2l" fileName="images/jjsy_xx_1.png" xy="33,229" group="n107_jcej">
       <gearDisplay controller="c1" pages="1,2,3,4,5"/>
     </image>
@@ -43,7 +44,10 @@
     <image id="n106_jcej" name="n106" src="jcej2l" fileName="images/jjsy_xx_1.png" xy="97,229" group="n107_jcej">
       <gearDisplay controller="c1" pages="5"/>
     </image>
-    <group id="n107_jcej" name="n107" xy="33,229" size="0,0" group="n90_jcej" advanced="true" layout="hz" colGap="2" excludeInvisibles="true"/>
+    <group id="n107_jcej" name="n107" xy="33,229" size="0,0" group="n110_u10a" advanced="true" layout="hz" colGap="2" excludeInvisibles="true"/>
+    <group id="n110_u10a" name="n110" xy="25,187" size="170,56" group="n90_jcej" advanced="true">
+      <gearDisplay controller="c3" pages="1"/>
+    </group>
     <group id="n90_jcej" name="n90" xy="4,139" size="244,115"/>
     <component id="n109_jcej" name="comFightScore" src="jcej4q" fileName="components/ComFightScore.xml" xy="5,58" controller="c1,1">
       <gearDisplay controller="c2" pages="1"/>

FGUIProject/assets/DressUp/components/ComValueInfo.xml

@@ -2,8 +2,9 @@
 <component size="277,254">
   <controller name="c1" alias="标签数量" pages="0,,1,,2,,3,,4,,5," selected="0"/>
   <controller name="c2" pages="0,,1," selected="0"/>
+  <controller name="c3" pages="1,,2," selected="0"/>
   <displayList>
-    <image id="n91_jcej" name="n91" src="jcej2h" fileName="images/jjsy_zldi.png" xy="0,0" size="288,56" group="n92_jcej" pkg="eg2y0ldp">
+    <image id="n91_jcej" name="n91" src="jcej2h" fileName="imagesExport/jjsy_zldi.png" pkg="eg2y0ldp" xy="0,0" size="288,56" group="n92_jcej">
       <relation target="n82_jcej" sidePair="width-width"/>
     </image>
     <text id="n82_jcej" name="txtFightScore" xy="48,7" size="225,39" group="n92_jcej" font="ui://eg2y0ldpwonotjc" fontSize="28" color="#a07943" vars="true" text="竞技场战力：{value=000}"/>
@@ -11,23 +12,23 @@
       <Button icon="ui://eg2y0ldpjcej2k" controller="c2" page="1"/>
     </component>
     <group id="n92_jcej" name="n92" xy="0,0" size="288,56"/>
-    <image id="n83_jcej" name="n83" src="jcej3s" fileName="images/dz_hz_fsk_1.png" xy="1,70" size="248,57" group="n86_jcej" pkg="eg2y0ldp"/>
+    <image id="n83_jcej" name="n83" src="jcej3s" fileName="imagesExport/dz_hz_fsk_1.png" pkg="eg2y0ldp" xy="1,70" size="248,57" group="n86_jcej"/>
     <loader id="n84_jcej" name="scoreType" xy="0,72" size="50,50" group="n86_jcej" url="ui://eg2y0ldp842s6h" fill="scale"/>
     <text id="n85_jcej" name="txtScore" xy="80,72" size="124,54" group="n86_jcej" fontSize="28" color="#b08649" align="center" vAlign="middle" autoSize="none" autoClearText="true" text="9999"/>
     <group id="n86_jcej" name="n86" xy="0,70" size="249,57"/>
-    <image id="n93_jcej" name="n93" src="jcej2i" fileName="images/jjsy_bqdi.png" xy="4,139" group="n90_jcej" pkg="eg2y0ldp"/>
+    <image id="n93_jcej" name="n93" src="jcej2i" fileName="imagesExport/jjsy_bqdi.png" pkg="eg2y0ldp" xy="4,139" group="n90_jcej"/>
     <text id="n94_jcej" name="n94" xy="58,142" size="116,39" group="n90_jcej" font="ui://eg2y0ldpwonotjc" fontSize="28" color="#a07943" text="标签加成"/>
     <component id="n87_jcej" name="btnTagRule" src="psphtkg" fileName="components/BtnRule.xml" pkg="eg2y0ldp" xy="185,149" size="29,29" group="n90_jcej">
       <Button icon="ui://eg2y0ldpjcej2k"/>
     </component>
-    <component id="n88_jcej" name="comTag" src="ih7566" fileName="components/ComTag.xml" pkg="eg2y0ldp" xy="25,187" group="n90_jcej"/>
-    <text id="n89_jcej" name="txtTagScore" xy="176,187" pivot="0.5,0" size="19,36" group="n90_jcej" fontSize="26" color="#de867e" align="center" text="0"/>
+    <component id="n88_jcej" name="comTag" src="ih7566" fileName="components/ComTag.xml" pkg="eg2y0ldp" xy="25,187" group="n110_u10a"/>
+    <text id="n89_jcej" name="txtTagScore" xy="176,187" pivot="0.5,0" size="19,36" group="n110_u10a" fontSize="26" color="#de867e" align="center" text="0"/>
     <image id="n96_jcej" name="n96" src="v461f1" fileName="images/jjsy_xx_2.png" xy="33,229" group="n101_jcej"/>
     <image id="n97_jcej" name="n97" src="v461f1" fileName="images/jjsy_xx_2.png" xy="49,229" group="n101_jcej"/>
     <image id="n98_jcej" name="n98" src="v461f1" fileName="images/jjsy_xx_2.png" xy="65,229" group="n101_jcej"/>
     <image id="n99_jcej" name="n99" src="v461f1" fileName="images/jjsy_xx_2.png" xy="81,229" group="n101_jcej"/>
     <image id="n100_jcej" name="n100" src="v461f1" fileName="images/jjsy_xx_2.png" xy="97,229" group="n101_jcej"/>
-    <group id="n101_jcej" name="n101" xy="33,229" size="78,14" group="n90_jcej" advanced="true" layout="hz" colGap="2" excludeInvisibles="true"/>
+    <group id="n101_jcej" name="n101" xy="33,229" size="78,14" group="n110_u10a" advanced="true" layout="hz" colGap="2" excludeInvisibles="true"/>
     <image id="n102_jcej" name="n102" src="v461f2" fileName="images/jjsy_xx_1.png" xy="33,229" group="n107_jcej">
       <gearDisplay controller="c1" pages="1,2,3,4,5"/>
     </image>
@@ -43,7 +44,10 @@
     <image id="n106_jcej" name="n106" src="v461f2" fileName="images/jjsy_xx_1.png" xy="97,229" group="n107_jcej">
       <gearDisplay controller="c1" pages="5"/>
     </image>
-    <group id="n107_jcej" name="n107" xy="33,229" size="0,0" group="n90_jcej" advanced="true" layout="hz" colGap="2" excludeInvisibles="true"/>
+    <group id="n107_jcej" name="n107" xy="33,229" size="0,0" group="n110_u10a" advanced="true" layout="hz" colGap="2" excludeInvisibles="true"/>
+    <group id="n110_u10a" name="n110" xy="25,187" size="170,56" group="n90_jcej" advanced="true">
+      <gearDisplay controller="c3" pages="2"/>
+    </group>
     <group id="n90_jcej" name="n90" xy="4,139" size="244,115"/>
     <component id="n109_jcej" name="comFightScore" src="v461f3" fileName="components/ComFightScore.xml" xy="5,58" controller="c1,1">
       <gearDisplay controller="c2" pages="1"/>

FGUIProject/assets/RoleInfo/GMPanelUI.xml

@@ -3,14 +3,14 @@
   <displayList>
     <loader id="n0_d4iw" name="bg" xy="0,0" size="600,600" url="ui://mk0fwx0xq08x4" fill="scaleFree"/>
     <component id="n11_c5sc" name="ComBtn" src="lqp0dm" fileName="components/ComBtn.xml" xy="45,51"/>
-    <richtext id="n3_c5sc" name="n3" xy="70,456" size="132,36" group="n14_g926" fontSize="26" color="#999999" text="添加物品："/>
-    <graph id="n5_c5sc" name="n5" xy="249,451" size="219,42" group="n14_g926" type="rect" lineSize="0" fillColor="#ffd0cfdb">
+    <richtext id="n3_c5sc" name="n3" xy="70,472" size="130,36" group="n14_g926" fontSize="26" color="#999999" text="添加物品："/>
+    <graph id="n5_c5sc" name="n5" xy="249,467" size="219,42" group="n14_g926" type="rect" lineSize="0" fillColor="#ffd0cfdb">
       <relation target="n4_c5sc" sidePair="width-width,height-height,center-center,middle-middle"/>
     </graph>
-    <text id="n4_c5sc" name="inputItem" xy="249,451" size="219,42" group="n14_g926" fontSize="30" vAlign="middle" autoSize="none" text="" input="true" prompt="[color=#999999][size=18]请输入 物品id 空格 个数[/size][/color]"/>
-    <component id="n6_c5sc" name="btnAddItem" src="ki9637" fileName="components/ButtonPlus1.xml" pkg="eg2y0ldp" xy="489,450" group="n14_g926"/>
-    <group id="n14_g926" name="n14" xy="70,450" size="459,43"/>
-    <richtext id="n15_g926" name="n15" xy="70,535" size="132,36" group="n19_g926" fontSize="26" color="#999999" text="输入指令："/>
+    <text id="n4_c5sc" name="inputItem" xy="249,467" size="219,42" group="n14_g926" fontSize="30" vAlign="middle" autoSize="none" text="" input="true" prompt="[color=#999999][size=18]请输入 物品id 空格 个数[/size][/color]"/>
+    <component id="n6_c5sc" name="btnAddItem" src="ki9637" fileName="components/ButtonPlus1.xml" pkg="eg2y0ldp" xy="489,466" group="n14_g926"/>
+    <group id="n14_g926" name="n14" xy="70,466" size="459,43"/>
+    <richtext id="n15_g926" name="n15" xy="70,535" size="130,36" group="n19_g926" fontSize="26" color="#999999" text="输入指令："/>
     <graph id="n16_g926" name="n16" xy="249,530" size="219,42" group="n19_g926" type="rect" lineSize="0" fillColor="#ffd0cfdb">
       <relation target="n17_g926" sidePair="width-width,height-height,center-center,middle-middle"/>
     </graph>

FGUIProject/assets/RoleInfo/components/ComBtn.xml

@@ -25,12 +25,20 @@
       <Button title="设置玩家章节" titleFontSize="30"/>
     </component>
     <text id="n18_lqp0" name="txtChapter" xy="333,245" size="44,42" group="n27_ysx9" fontSize="30" autoSize="none" text="5" input="true" prompt="[color=#B6A688]章[/color]"/>
-    <text id="n24_lqp0" name="n24" xy="454,246" size="34,41" group="n27_ysx9" fontSize="30" text="关"/>
-    <text id="n21_lqp0" name="n21" xy="377,245" size="34,41" group="n27_ysx9" fontSize="30" text="章"/>
+    <text id="n24_lqp0" name="n24" xy="454,246" size="33,41" group="n27_ysx9" fontSize="30" text="关"/>
+    <text id="n21_lqp0" name="n21" xy="377,245" size="33,41" group="n27_ysx9" fontSize="30" text="章"/>
     <text id="n19_lqp0" name="txtChapterLv" xy="411,245" size="42,42" group="n27_ysx9" fontSize="30" autoSize="none" text="1" input="true" prompt="[color=#B6A688]关[/color]"/>
     <group id="n27_ysx9" name="n27" xy="1,244" size="487,46" group="n28_ysx9" advanced="true">
       <gearDisplay controller="c1" pages="0,1"/>
     </group>
-    <group id="n28_ysx9" name="n28" xy="0,0" size="488,290" advanced="true" layout="vt" lineGap="15" excludeInvisibles="true"/>
+    <component id="n35_u10a" name="btnArenaGrade" src="c5sc8h" fileName="components/ButtonGM.xml" xy="0,305" size="330,46" group="n40_u10a">
+      <Button title="设置竞技场段位排行" titleFontSize="30"/>
+    </component>
+    <text id="n36_u10a" name="txtArenaGrade" xy="332,306" size="73,42" group="n40_u10a" fontSize="30" autoSize="none" text="" input="true" prompt="[color=#666666]段位[/color]"/>
+    <text id="n39_u10a" name="txtArenaRank" xy="407,306" size="75,42" group="n40_u10a" fontSize="30" autoSize="none" text="" input="true" prompt="[color=#666666]排行[/color]"/>
+    <group id="n40_u10a" name="n40" xy="0,305" size="482,46" group="n28_ysx9" advanced="true" layout="hz" colGap="2">
+      <gearDisplay controller="c1" pages="0"/>
+    </group>
+    <group id="n28_ysx9" name="n28" xy="0,0" size="488,351" advanced="true" layout="vt" lineGap="15" excludeInvisibles="true"/>
   </displayList>
 </component>

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

@@ -42,6 +42,7 @@ namespace GFGGame
         public int LastGrade;//战斗前段位
         public int LastRank;//战斗前排行
         public OtherRoleInfoData LastTargetInfo = new OtherRoleInfoData();//战斗对手角色信息
+        public List<ArenaTargetData> LastTargets = new List<ArenaTargetData>();//对手
         public int RewardId;//段位提升奖励
         public List<ItemData> BonusList;//战斗结算奖励
 
@@ -116,16 +117,6 @@ namespace GFGGame
         {
             return arenaTarget.FightDatas[index];
         }
-        // //获取竞技场对手角色战斗数据
-        // public FightRoleData GetArenaRoleData(int index, ArenaTargetData arenaTarget)
-        // {
-        //     return arenaTarget.RoleDressupList[index];
-        // }
-        // //获取竞技场机器人战斗数据
-        // public FightRobotData GetArenaRobotData(int index, ArenaTargetData arenaTarget)
-        // {
-        //     return arenaTarget.RobotDressupList[index];
-        // }
 
         /// <summary>
         /// 获取推荐卡牌
@@ -233,11 +224,9 @@ namespace GFGGame
                     }
                 }
             }
-            ET.Log.Debug("scoreType:" + scoreType);
             List<int> itemList = new List<int>();
             foreach (int subType in itemListDic.Keys)
             {
-                ET.Log.Debug("subType:" + subType + "   item:" + itemListDic[subType]);
                 DressUpMenuItemDataManager.SortItemListByHighScore(itemListDic[subType]);
                 if (subType == ConstDressUpItemType.TE_SHU)
                 {
@@ -249,7 +238,6 @@ namespace GFGGame
                     itemList.AddRange(itemListDic[subType]);
                 }
             }
-            // ET.Log.Debug("itemList:" + itemList);
             return itemList;
         }
         private List<int> SortDressList(List<int> dressList, int scoreType, string[] tags)
@@ -262,7 +250,10 @@ namespace GFGGame
                 if (ItemDataManager.CheckItemTagsRight(b, tags)) return 1;
                 int scoreA = ItemDataManager.GetItemAdditionScore(a, scoreType, tags);
                 int scoreB = ItemDataManager.GetItemAdditionScore(b, scoreType, tags);
-                return scoreB - scoreA;
+                if (scoreA > scoreB) return -1;
+                if (scoreA < scoreB) return 1;
+
+                return cfgA.id - cfgB.id;
             });
             return dressList;
         }

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

@@ -129,6 +129,7 @@ namespace GFGGame
             com.m_txtTagScore.text = FightDataManager.Instance.GetTagsScore(roleDatas[index].itemList, roleDatas[index].tags).ToString();
             int count = ArenaDataManager.Instance.GetTagsCount(roleDatas[index].itemList, roleDatas[index].tags);
             com.m_c1.selectedIndex = Math.Min(count, ArenaTagCfgArray.Instance.dataArray.Length);
+            com.m_c3.selectedIndex = roleDatas[index].tags.Length > 0 ? 1 : 0;
             UpdateFightScore(com.m_comFightScore.target, roleDatas);
             if (index == 0)
             {

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

@@ -77,7 +77,7 @@ namespace GFGGame
                 StorageSProxy.ReqSetClientValue(ConstStorageId.STORAGE_AUTO_PLAY, _autoPlay == true ? 1 : 0).Coroutine();
             }
         }
-        public int maxFightSpeed = 2;
+        public int maxFightSpeed = 4;
         private int _fightSpeed = 1;
         public int fightSpeed
         {
@@ -257,7 +257,7 @@ namespace GFGGame
             List<PassivitySkillCfg> skillCfgs = PassivitySkillCfgArray.Instance.GetCfgsBycardId(cardId);
             for (int j = 0; j < skillCfgs.Count; j++)
             {
-                // ET.Log.Debug("cardId:" + cardId + "  skillLvs:" + skillLvs.Count + "   skillCfgs:" + skillCfgs.Count + "   index:" + j);
+                if (skillLvs.Count == 0) continue;
                 PassivitySkillLvlCfg skillLvlCfg = PassivitySkillLvlCfgArray.Instance.GetCfgByskilllvlAndskillId(skillLvs[j], skillCfgs[j].skillId);
                 if (skillLvlCfg == null) continue;
                 skillScore += skillBaseScore * skillLvlCfg.fightPowerParam / 10000;
@@ -313,15 +313,12 @@ namespace GFGGame
             int currentTime = BeginTime.PART_ALL_FIGHT_BEGIN;
             GetSkillScore(FightRoleType.MINE, roundIndex, currentTime, partId, mainScore, cardId, skillLvs, roundTime, ref score, targetMainScore, targetCardId, targetSkillLvs, targetRoundTime, ref targetScore);
             GetSkillScore(FightRoleType.TAEGET, roundIndex, currentTime, partId, targetMainScore, targetCardId, targetSkillLvs, targetRoundTime, ref targetScore, mainScore, cardId, skillLvs, roundTime, ref score);
-            Debug.Log(" targetScore000:" + targetScore);
             for (int i = 0; i < FightScoreCfgArray.Instance.dataArray.Length; i++)
             {
                 partId++;
-
                 currentTime = BeginTime.PART_FIGHT_BEGIN;
                 GetSkillScore(FightRoleType.MINE, roundIndex, currentTime, partId, mainScore, cardId, skillLvs, roundTime, ref score, targetMainScore, targetCardId, targetSkillLvs, targetRoundTime, ref targetScore);
                 GetSkillScore(FightRoleType.TAEGET, roundIndex, currentTime, partId, targetMainScore, targetCardId, targetSkillLvs, targetRoundTime, ref targetScore, mainScore, cardId, skillLvs, roundTime, ref score);
-                // Debug.Log(" targetScore111:" + targetScore);
                 score += ScoreSystemData.Instance.GetPartScore(myRoleData, partId, ClickType.PREFACT_CLICK, 0);
                 if (targetRoleData.type == FightTargetType.PLAYER)
                 {
@@ -331,17 +328,15 @@ namespace GFGGame
                 {
                     targetScore += ScoreSystemData.Instance.GetRobotPartScore(targetRoleData, partId, ClickType.PREFACT_CLICK, 0);
                 }
-                // Debug.Log(" targetScore222:" + targetScore);
                 currentTime = BeginTime.PART_PREFACT_CLICK;
                 GetSkillScore(FightRoleType.MINE, roundIndex, currentTime, partId, mainScore, cardId, skillLvs, roundTime, ref score, targetMainScore, targetCardId, targetSkillLvs, targetRoundTime, ref targetScore);
                 GetSkillScore(FightRoleType.TAEGET, roundIndex, currentTime, partId, targetMainScore, targetCardId, targetSkillLvs, targetRoundTime, ref targetScore, mainScore, cardId, skillLvs, roundTime, ref score);
                 currentTime = BeginTime.PART_FIGHT_END;
                 GetSkillScore(FightRoleType.MINE, roundIndex, currentTime, partId, mainScore, cardId, skillLvs, roundTime, ref score, targetMainScore, targetCardId, targetSkillLvs, targetRoundTime, ref targetScore);
                 GetSkillScore(FightRoleType.TAEGET, roundIndex, currentTime, partId, targetMainScore, targetCardId, targetSkillLvs, targetRoundTime, ref targetScore, mainScore, cardId, skillLvs, roundTime, ref score);
-                Debug.Log(" targetScore444:" + targetScore);
+                // Debug.Log(" targetScore444:" + targetScore);
             }
             score += ScoreSystemData.Instance.GetAllCircleAddScore(mainScore);
-            // Debug.Log(" targetScore555:" + targetScore);
             targetScore += ScoreSystemData.Instance.GetAllCircleAddScore(targetMainScore);
             Debug.Log(" targetScore666:" + targetScore);
             _score = Mathf.CeilToInt((float)score);
@@ -353,8 +348,7 @@ namespace GFGGame
         {
             List<PassivitySkillLvlCfg> vaildSkills = ScoreSystemData.Instance.GetValidSkills(currentTime, partId, cardId, skillLvs, targetCardId, targetSkillLvs, roundTime, targetRoundTime);
             ScoreSystemData.Instance.GetPartItemSkillScore(vaildSkills, mainScore, targetMainScore, out int skillScore, out int targetSkillScore, out Dictionary<int, int> skillScoreDic);
-            Debug.Log(" skillScore:" + skillScore);
-            Debug.Log(" targetSkillScore:" + targetSkillScore);
+
             score += skillScore;
             targetScore += targetSkillScore;
 

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Arena/UI_ComValueInfo.cs

@@ -9,6 +9,7 @@ namespace UI.Arena
         public GComponent target;
         public Controller m_c1;
         public Controller m_c2;
+        public Controller m_c3;
         public GTextField m_txtFightScore;
         public GButton m_btnFightScoreRule;
         public GLoader m_scoreType;
@@ -66,6 +67,7 @@ namespace UI.Arena
         {
             m_c1 = comp.GetController("c1");
             m_c2 = comp.GetController("c2");
+            m_c3 = comp.GetController("c3");
             m_txtFightScore = (GTextField)comp.GetChild("txtFightScore");
             m_btnFightScoreRule = (GButton)comp.GetChild("btnFightScoreRule");
             m_scoreType = (GLoader)comp.GetChild("scoreType");
@@ -79,6 +81,7 @@ namespace UI.Arena
         {
             m_c1 = null;
             m_c2 = null;
+            m_c3 = null;
             m_txtFightScore = null;
             m_btnFightScoreRule = null;
             m_scoreType = null;

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DressUp/UI_ComValueInfo.cs

@@ -9,6 +9,7 @@ namespace UI.DressUp
         public GComponent target;
         public Controller m_c1;
         public Controller m_c2;
+        public Controller m_c3;
         public GTextField m_txtFightScore;
         public GButton m_btnFightScoreRule;
         public GLoader m_scoreType;
@@ -66,6 +67,7 @@ namespace UI.DressUp
         {
             m_c1 = comp.GetController("c1");
             m_c2 = comp.GetController("c2");
+            m_c3 = comp.GetController("c3");
             m_txtFightScore = (GTextField)comp.GetChild("txtFightScore");
             m_btnFightScoreRule = (GButton)comp.GetChild("btnFightScoreRule");
             m_scoreType = (GLoader)comp.GetChild("scoreType");
@@ -79,6 +81,7 @@ namespace UI.DressUp
         {
             m_c1 = null;
             m_c2 = null;
+            m_c3 = null;
             m_txtFightScore = null;
             m_btnFightScoreRule = null;
             m_scoreType = null;

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/RoleInfo/UI_ComBtn.cs

@@ -16,6 +16,9 @@ namespace UI.RoleInfo
         public GButton m_btnSetChapter;
         public GTextInput m_txtChapter;
         public GTextInput m_txtChapterLv;
+        public GButton m_btnArenaGrade;
+        public GTextInput m_txtArenaGrade;
+        public GTextInput m_txtArenaRank;
         public const string URL = "ui://374k3dwvlqp0dm";
         public const string PACKAGE_NAME = "RoleInfo";
         public const string RES_NAME = "ComBtn";
@@ -72,6 +75,9 @@ namespace UI.RoleInfo
             m_btnSetChapter = (GButton)comp.GetChild("btnSetChapter");
             m_txtChapter = (GTextInput)comp.GetChild("txtChapter");
             m_txtChapterLv = (GTextInput)comp.GetChild("txtChapterLv");
+            m_btnArenaGrade = (GButton)comp.GetChild("btnArenaGrade");
+            m_txtArenaGrade = (GTextInput)comp.GetChild("txtArenaGrade");
+            m_txtArenaRank = (GTextInput)comp.GetChild("txtArenaRank");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -84,6 +90,9 @@ namespace UI.RoleInfo
             m_btnSetChapter = null;
             m_txtChapter = null;
             m_txtChapterLv = null;
+            m_btnArenaGrade = null;
+            m_txtArenaGrade = null;
+            m_txtArenaRank = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -63,7 +63,12 @@ namespace GFGGame
 
                     for (int i = 0; i < response.targets.Count; i++)
                     {
-                        ArenaDataManager.Instance.Targets.Add(GetArenaTargetData(response.targets[i]));
+                        ArenaTargetData targetData = GetArenaTargetData(response.targets[i]);
+                        ArenaDataManager.Instance.Targets.Add(targetData);
+                        if (targetData.Type == FightTargetType.PLAYER)
+                        {
+                            await ArenaSproxy.ReqArenaFightAttr(targetData.RoleInfo.roleId, targetData.FightDatas);
+                        }
                     }
                 }
             }
@@ -72,7 +77,7 @@ namespace GFGGame
         public static async ETTask<bool> ReqRefreshArenaTargets()
         {
             S2C_RefreshArenaTargets response = null;
-            response = (S2C_RefreshArenaTargets)await MessageHelper.SendToServer(new C2S_RefreshArenaTargets() { RoleId = RoleDataManager.roleId });
+            response = (S2C_RefreshArenaTargets)await MessageHelper.SendToServer(new C2S_RefreshArenaTargets());
             if (response != null)
             {
                 if (response.Error == ErrorCode.ERR_Success)
@@ -80,7 +85,12 @@ namespace GFGGame
                     ArenaDataManager.Instance.Targets.Clear();
                     for (int i = 0; i < response.targets.Count; i++)
                     {
-                        ArenaDataManager.Instance.Targets.Add(GetArenaTargetData(response.targets[i]));
+                        ArenaTargetData targetData = GetArenaTargetData(response.targets[i]);
+                        ArenaDataManager.Instance.Targets.Add(targetData);
+                        if (targetData.Type == FightTargetType.PLAYER)
+                        {
+                            await ArenaSproxy.ReqArenaFightAttr(targetData.RoleInfo.roleId, targetData.FightDatas);
+                        }
                     }
                     PromptController.Instance.ShowFloatTextPrompt("刷新成功");
                     return true;
@@ -153,14 +163,19 @@ namespace GFGGame
                     ArenaDataManager.Instance.LastTargetInfo.headId = targetData.RoleInfo.headId;
                     ArenaDataManager.Instance.LastTargetInfo.headRes = targetData.RoleInfo.headRes;
                     ArenaDataManager.Instance.BonusList = ItemUtil.CreateItemDataList(response.rewards);
+                    ArenaDataManager.Instance.LastTargets = new List<ArenaTargetData>(ArenaDataManager.Instance.Targets);
 
                     //更新新数据
                     ArenaDataManager.Instance.Targets.Clear();
                     for (int i = 0; i < response.targets.Count; i++)
                     {
-                        ArenaDataManager.Instance.Targets.Add(GetArenaTargetData(response.targets[i]));
+                        ArenaTargetData _targetData = GetArenaTargetData(response.targets[i]);
+                        ArenaDataManager.Instance.Targets.Add(_targetData);
+                        if (_targetData.Type == FightTargetType.PLAYER)
+                        {
+                            await ArenaSproxy.ReqArenaFightAttr(_targetData.RoleInfo.roleId, _targetData.FightDatas);
+                        }
                     }
-
                     ArenaDataManager.Instance.Grade = response.Grade;
                     ArenaDataManager.Instance.Rank = response.RankInGrade;
                     ArenaDataManager.Instance.TryUpdateHighest();
@@ -174,7 +189,13 @@ namespace GFGGame
                     ArenaDataManager.Instance.Targets.Clear();
                     for (int i = 0; i < response.targets.Count; i++)
                     {
-                        ArenaDataManager.Instance.Targets.Add(GetArenaTargetData(response.targets[i]));
+                        // ArenaDataManager.Instance.Targets.Add(GetArenaTargetData(response.targets[i]));
+                        ArenaTargetData _targetData = GetArenaTargetData(response.targets[i]);
+                        ArenaDataManager.Instance.Targets.Add(_targetData);
+                        if (_targetData.Type == FightTargetType.PLAYER)
+                        {
+                            await ArenaSproxy.ReqArenaFightAttr(_targetData.RoleInfo.roleId, _targetData.FightDatas);
+                        }
                     }
                     EventAgent.DispatchEvent(ConstMessage.ARENA_FIGHT_RESULT);
 
@@ -253,10 +274,13 @@ namespace GFGGame
                         list[i].itemScoreList = response.data[i].SuitScore;
                         List<PassivitySkillCfg> skillCfgs = PassivitySkillCfgArray.Instance.GetCfgsBycardId(response.data[i].CardId);
 
-                        for (int j = 0; j < skillCfgs.Count; j++)
+                        if (response.data[i].SkillId.Count == skillCfgs.Count)
                         {
-                            int index = response.data[i].SkillId.IndexOf(skillCfgs[j].skillId);
-                            list[i].skillLvs.Add(response.data[i].SkillLevel[index]);
+                            for (int j = 0; j < skillCfgs.Count; j++)
+                            {
+                                int index = response.data[i].SkillId.IndexOf(skillCfgs[j].skillId);
+                                list[i].skillLvs.Add(response.data[i].SkillLevel[index]);
+                            }
                         }
                         FightDataManager.Instance.SetItemScoreList(list[i]);
                         ScoreSystemData.Instance.SetEquipScoresWithPartId(list[i]);
@@ -344,7 +368,7 @@ namespace GFGGame
             FightData fightData = new FightData();
             fightData.name = robotCfg.gradeName;
             fightData.scoreType = ArenaDataManager.Instance.ThemeList[index];
-            fightData.baseScore = robotCfg.baseScore;
+            fightData.baseScore = RoleLevelCfgArray.Instance.GetCfg(robotCfg.level).baseScore;
             fightData.cardId = robotProto.CardIdList[index];
             if (index == 0)//只有第一个主题才计算标签
             {

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

@@ -32,13 +32,10 @@ namespace GFGGame
             viewAnimationType = EnumViewAnimationType.ZOOM_CENTER;
 
             _ui.m_listFirstDanReward.itemRenderer = RenderListItem;
-            // _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("gzs_bjbj");
         }
         protected override void AddEventListener()
         {
             base.AddEventListener();
-
-            // EventAgent.AddEventListener(ConstMessage.JUMP_TO_SOURCE, this.Hide);
         }
         protected override void OnShown()
         {

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

@@ -13,10 +13,8 @@ namespace GFGGame
         private UI_ArenaDressInfoUI _ui;
         private GameObject _scenePrefab;
         private GameObject _sceneObject;
-        private DressUpObj _dressUpObj;
         private List<LongPressGesture> _listLongPress = new List<LongPressGesture>();
         private List<FightData> _roleDatas;//可能是自己的搭配，也可能是对方玩家的搭配
-        // private List<FightRobotData> _robotDatas;//对方机器人搭配
         private int _themeIndex = 0;
         private List<int> _itemList;
         private string[] _tags;
@@ -28,7 +26,7 @@ namespace GFGGame
                 GameObject.Destroy(_sceneObject);
                 _sceneObject = null;
             }
-            _dressUpObj.Dispose();
+            // _dressUpObj.Dispose();
             for (int i = 0; i < _listLongPress.Count; i++)
             {
                 _listLongPress[i].Dispose();
@@ -59,7 +57,6 @@ namespace GFGGame
 
             _scenePrefab = GFGAsset.Load<GameObject>(ResPathUtil.GetPrefabPath("SceneArenaDressUp"));
 
-            // _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("gzs_bjbj");
         }
         protected override void AddEventListener()
         {
@@ -71,18 +68,12 @@ namespace GFGGame
             _roleType = (int)(this.viewData as object[])[0];
             _themeIndex = (int)(this.viewData as object[])[1];
             _roleDatas = (this.viewData as object[])[2] as List<FightData>;
-            // _robotDatas = (this.viewData as object[])[3] as List<FightRobotData>;
 
             _ui.m_c1.selectedIndex = _roleType;
             if (_sceneObject == null)
             {
                 _sceneObject = GameObject.Instantiate(_scenePrefab);
                 MyDressUpHelper.dressUpObj.setSceneObj(_sceneObject, false, false);
-
-                GameObject sceneCopyObject = _sceneObject.transform.Find("CopyRole").gameObject;
-                _dressUpObj = new DressUpObj();
-                _dressUpObj.setSceneObj(sceneCopyObject, false, false);
-
             }
             UpdateView();
         }
@@ -139,28 +130,15 @@ namespace GFGGame
                     PromptController.Instance.ShowFloatTextPrompt("保存失败");
                     return;
                 }
-                Timers.inst.StartCoroutine(ScreenShotTex(i));
             }
             PromptController.Instance.ShowFloatTextPrompt("保存成功");
             UpdateView();
         }
-        private IEnumerator ScreenShotTex(int index)
-        {
 
-            _dressUpObj.TakeOffAll();
-            _dressUpObj.PutOnItemList(_roleDatas[index].itemList);
-
-            GameObject gameObject = _sceneObject.transform.Find("FightCamera").gameObject;
-            Camera camera = gameObject.GetComponent<Camera>();
-            ArenaDataManager.Instance.TextureDic[index] = FightDataManager.Instance.GetPrintscreenNTexture(camera);
-
-            yield return new WaitForEndOfFrame();
-        }
         private void UpdateView()
         {
             _itemList = _roleDatas[_themeIndex].itemList;
             _tags = _roleDatas[_themeIndex].tags;
-            // UpdateValueInfo();
             UpdateCardInfo(_roleDatas[_themeIndex].cardId);
             ArenaViewManager.Instance.UpdateValue(_ui.m_comValueInfo.target, _themeIndex, _roleDatas);
 
@@ -185,9 +163,6 @@ namespace GFGGame
         private void RenderListItem(int index, GObject obj)
         {
             UI_ListPartsItem item = UI_ListPartsItem.Proxy(obj);
-            // item.m_comAxtionSelect.target.visible = false;
-            // item.m_imgNeed.visible = false;
-            // item.m_imgNew.visible = false;
             item.m_iconSelected.visible = true;
             ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(_itemList[index]);
             item.m_txtTitle.text = itemCfg.name;

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

@@ -29,7 +29,6 @@ namespace GFGGame
             this.modal = true;
             viewAnimationType = EnumViewAnimationType.ZOOM_CENTER;
 
-            // _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("gzs_bjbj");
             _ui.m_list.itemRenderer = RenderListItem;
         }
         protected override void AddEventListener()

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

@@ -28,8 +28,6 @@ namespace GFGGame
             this.viewCom.Center();
             this.modal = true;
             viewAnimationType = EnumViewAnimationType.ZOOM_CENTER;
-
-            // _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("gzs_bjbj");
         }
         protected override void AddEventListener()
         {

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

@@ -49,14 +49,6 @@ namespace GFGGame
         {
             base.OnShown();
             _rankType = ArenaRankType.NOW_SEASON;
-            // _ui.m_btn0.selected = true;
-            // _ui.m_btn1.selected = false;
-            // _ui.m_btn00.selected = true;
-            // _ui.m_btn01.selected = false;
-            // _ui.m_c1.selectedIndex = 1;
-            // _ui.m_c2.selectedIndex = 1;
-            // _ui.m_c1.selectedIndex = 0;
-            // _ui.m_c2.selectedIndex = 0;
             _ui.m_listRank.numItems = 100;
             _ui.m_comMyRank.m_btnLook.visible = false;
             ArenaDataManager.Instance.RankDatasDic.Clear();
@@ -138,7 +130,6 @@ namespace GFGGame
         private void UpdateView()
         {
             UpdateSelf();
-            // _ui.m_listRank.numItems = 0;
             if (_rankType == ArenaRankType.FRIEND)
             {
                 _ui.m_listRank.numItems = ArenaDataManager.Instance.RankDatasDic[_rankType].Count;
@@ -197,7 +188,6 @@ namespace GFGGame
             }
             if (index == 0)
             {
-                // int childIndex = _ui.m_listRank.ItemIndexToChildIndex(0);
                 int itemIndex0 = 0;
                 if (RankDatasDic.ContainsKey(_rankType) && RankDatasDic[_rankType].Count > itemIndex0)
                 {

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

@@ -31,7 +31,6 @@ namespace GFGGame
             this.modal = true;
             viewAnimationType = EnumViewAnimationType.ZOOM_CENTER;
 
-            // _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("gzs_bjbj");
             _ui.m_list.itemRenderer = RenderListItem;
         }
         protected override void AddEventListener()
@@ -43,7 +42,7 @@ namespace GFGGame
         {
             base.OnShown();
             _winCount = 0;
-            _targetData = ArenaDataManager.Instance.Targets[ArenaDataManager.Instance.SelectTargetIndex];
+            _targetData = ArenaDataManager.Instance.LastTargets[ArenaDataManager.Instance.SelectTargetIndex];
             _ui.m_txtTargetName.text = _targetData.RoleInfo.roleName;
             _ui.m_txtTargetRank.text = _targetData.RankInGrade.ToString();
             ArenaRankCfg rankCfg = ArenaRankCfgArray.Instance.GetCfg(_targetData.Grade);

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

@@ -81,13 +81,13 @@ namespace GFGGame
         }
         private void RenderListItem(int index, GObject obj)
         {
-            ArenaViewManager.Instance.UpdateFightRoundResult(obj, index, _dataManager.myScore, _dataManager.targetScore, _dataManager.Targets[_dataManager.SelectTargetIndex], out bool isWin);
+            ArenaViewManager.Instance.UpdateFightRoundResult(obj, index, _dataManager.myScore, _dataManager.targetScore, _dataManager.LastTargets[_dataManager.SelectTargetIndex], out bool isWin);
             if (isWin) winCount++;
         }
 
         private void StartNextRound(object param)
         {
-            ArenaTargetData targetData = _dataManager.Targets[_dataManager.SelectTargetIndex];
+            ArenaTargetData targetData = _dataManager.LastTargets[_dataManager.SelectTargetIndex];
 
             ViewManager.Show<StoryFightTargetScoreView>(new object[] { _dataManager.DressupList[_dataManager.CurFightIndex], targetData.FightDatas[_dataManager.CurFightIndex] }, null, true);
         }

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

@@ -1,5 +1,6 @@
 using System.Collections;
 using System.Collections.Generic;
+using System.Threading.Tasks;
 using ET;
 using FairyGUI;
 using UI.Arena;
@@ -80,21 +81,13 @@ namespace GFGGame
             EventAgent.AddEventListener(ConstMessage.ARENA_FIGHT_RESULT, UpdateView);
             EventAgent.AddEventListener(ConstMessage.NUMERIC_CHANGE, UpdateValue);
         }
-        protected override async void OnShown()
+        protected override void OnShown()
         {
             base.OnShown();
             _targetData = this.viewData == null ? null : this.viewData as ArenaTargetData;
             _arenaCfg = ArenaOpenCfgArray.Instance.GetCfg(_dataManager.SeasonId);
             _valueBarController.OnShown();
             _dataManager.SetMineFightAttr();
-            for (int i = 0; i < _dataManager.Targets.Count; i++)
-            {
-                ArenaTargetData targetData = _dataManager.Targets[i];
-                if (targetData.Type == FightTargetType.PLAYER)
-                {
-                    await ArenaSproxy.ReqArenaFightAttr(targetData.RoleInfo.roleId, targetData.FightDatas);
-                }
-            }
 
             InstanceZonesDataManager.FightScene = ConstInstanceZonesType.Arena;
             if (_targetData == null)
@@ -112,11 +105,29 @@ namespace GFGGame
             {
                 _ui.m_c1.selectedIndex = 1;
             }
+
+            if (_sceneObject == null)
+            {
+                _sceneObject = GameObject.Instantiate(_scenePrefab);
+            }
+            GameObject sceneCopyObject = _sceneObject.transform.Find("CopyRole").gameObject;
+            if (_copyDressUpObj == null)
+            {
+                _copyDressUpObj = new DressUpObj();
+                _copyDressUpObj.setSceneObj(sceneCopyObject, false, false);
+            }
+            sceneCopyObject.SetActive(true);
+            for (int i = 0; i < ArenaDataManager.Instance.ThemeList.Count; i++)
+            {
+                Timers.inst.StartCoroutine(ScreenShotTex(i));
+            }
+            sceneCopyObject.SetActive(false);
+
+            UpdateRole();
             UpdateNormal();
             UpdateValue();
             UpdateRole();
-            // GetFightResult();
-            // ArenaSproxy.ReqArenaHistory().Coroutine();
+
         }
 
         protected override void OnHide()
@@ -128,11 +139,9 @@ namespace GFGGame
                 _sceneObject = null;
             }
             _targetDressUpObj.TakeOffAll();
-            // if (_targetDressUpObj != null)
-            // {
-            //     GameObject.Destroy(_sceneObject);
-            //     _sceneObject = null;
-            // }
+            _copyDressUpObj.TakeOffAll();
+            _copyDressUpObj.Dispose();
+            _copyDressUpObj = null;
             _valueBarController.OnHide();
         }
 
@@ -173,7 +182,6 @@ namespace GFGGame
                 PromptController.Instance.ShowFloatTextPrompt("结算中......");
                 return;
             }
-            Debug.Log("ArenaBuyFightTimes:" + RoleDataManager.ArenaBuyFightTimes);
             if (RoleDataManager.ArenaBuyFightTimes == 0)
             {
                 PromptController.Instance.ShowFloatTextPrompt("今日次数购买已达上限");
@@ -211,6 +219,7 @@ namespace GFGGame
             if (result)
             {
                 UpdateTargetList();
+                UpdateRole();
             }
         }
         private void OnBtnDressClick()
@@ -235,7 +244,7 @@ namespace GFGGame
             UpdateRole();
         }
 
-        private void OnBtnFightClick()
+        private async void OnBtnFightClick()
         {
             if (RoleDataManager.ArenaFightTimes <= 0)
             {
@@ -251,7 +260,7 @@ namespace GFGGame
                 }
             }
 
-            GetFightResult();
+            await GetFightResult();
             if (_ui.m_btnQuickFight.selected)
             {
                 ViewManager.Show<ArenaResultQuickView>();
@@ -261,7 +270,7 @@ namespace GFGGame
                 ViewManager.Show<StoryFightTargetView>(null, null, true);
             }
         }
-        private async void GetFightResult()
+        private async ETTask GetFightResult()
         {
             _dataManager.myScore.Clear();
             _dataManager.targetScore.Clear();
@@ -335,20 +344,7 @@ namespace GFGGame
 
         private void UpdateRole()
         {
-            if (_sceneObject == null)
-            {
-                _sceneObject = GameObject.Instantiate(_scenePrefab);
 
-                GameObject sceneCopyObject = _sceneObject.transform.Find("CopyRole").gameObject;
-                sceneCopyObject.SetActive(true);
-                _copyDressUpObj = new DressUpObj();
-                _copyDressUpObj.setSceneObj(sceneCopyObject, false, false);
-                for (int i = 0; i < ArenaDataManager.Instance.ThemeList.Count; i++)
-                {
-                    Timers.inst.StartCoroutine(ScreenShotTex(i));
-                }
-                sceneCopyObject.SetActive(false);
-            }
             GameObject mySceneObj = _sceneObject.transform.Find("MyRole").gameObject;
             MyDressUpHelper.dressUpObj.setSceneObj(mySceneObj, false, false);
 

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

@@ -14,7 +14,7 @@ namespace GFGGame
     public class ArenaDressUpFightView : BaseView
     {
         private UI_ArenaDressUpFightUI _ui;
-        private DressUpObj _dressUpData = new DressUpObj();
+        // private DressUpObj _dressUpData = new DressUpObj();
         private ArenaDataManager _dataManager;
         public FightData _roleData;
         // private int _fightID;
@@ -49,7 +49,7 @@ namespace GFGGame
             {
                 _listLongPress[i].Dispose();
             }
-            _dressUpData.Dispose();
+            // _dressUpData.Dispose();
             if (_ui != null)
             {
                 _ui.Dispose();
@@ -132,8 +132,8 @@ namespace GFGGame
                 _sceneObject = GameObject.Instantiate(_scenePrefab);
                 MyDressUpHelper.dressUpObj.setSceneObj(_sceneObject, false, false);
 
-                GameObject copyObj = _sceneObject.transform.Find("CopyRole").gameObject;
-                _dressUpData.setSceneObj(copyObj);
+                // GameObject copyObj = _sceneObject.transform.Find("CopyRole").gameObject;
+                // _dressUpData.setSceneObj(copyObj);
             }
             MyDressUpHelper.dressUpObj.PutOnItemList(_roleData.itemList);
             _ui.m_txtDressLimit.text = string.Format("饰品穿戴限制：{0}/{1}", MyDressUpHelper.GetCurrentOrnamentCount(), GlobalCfgArray.globalCfg.dressLimitCount);
@@ -152,7 +152,8 @@ namespace GFGGame
                 GameObject.Destroy(_sceneObject);
                 _sceneObject = null;
             }
-
+            // _dressUpData.TakeOffAll();
+            // _dressUpData = null;
             DressUpMenuItemDataManager.Clear();
 
             Timers.inst.Remove(CheckGuide);
@@ -353,24 +354,9 @@ namespace GFGGame
             }
             else
             {
-                Timers.inst.StartCoroutine(ScreenShotTex());
+                DressUpFinish();
             }
         }
-
-        private IEnumerator ScreenShotTex()
-        {
-
-            _dressUpData.TakeOffAll();
-            _dressUpData.PutOnItemList(MyDressUpHelper.dressUpObj.itemList);
-
-            Camera camera = _sceneObject.transform.Find("FightCamera").gameObject.GetComponent<Camera>();
-            ArenaDataManager.Instance.TextureDic[_dataManager.SelectThemeIndex] = FightDataManager.Instance.GetPrintscreenNTexture(camera);
-
-            yield return new WaitForEndOfFrame();
-
-            DressUpFinish();
-
-        }
         private async void DressUpFinish()
         {
 

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

@@ -39,15 +39,14 @@ namespace GFGGame
 
             _ui.m_btnClose.onClick.Add(OnClickBtnClose);
 
-            _ui.m_loaBg.url = ResPathUtil.GetFightBgImgPath("fightBg");
+            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("fightBg");
 
         }
 
         protected override void OnShown()
         {
             base.OnShown();
-            Debug.Log("CurFightIndex:" + ArenaDataManager.Instance.CurFightIndex);
-            Debug.Log("Count:" + ArenaDataManager.Instance.myScore.Count);
+
             long myScore = ArenaDataManager.Instance.myScore[ArenaDataManager.Instance.CurFightIndex];
             long targetScore = ArenaDataManager.Instance.targetScore[ArenaDataManager.Instance.CurFightIndex];
 

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

@@ -74,8 +74,8 @@ namespace GFGGame
             // _ui.m_comClickCircle.target.onClick.Add(OnComClickCircle);
             _ui.m_comClick.target.onClick.Add(CheckPerfectSkill);
 
-            _ui.m_loaBg.url = ResPathUtil.GetFightBgImgPath("fightBg");
-            _ui.m_LoaMask.url = ResPathUtil.GetFightBgImgPath("fightBg");
+            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("fightBg");
+            _ui.m_LoaMask.url = ResPathUtil.GetBgImgPath("fightBg");
 
             AddEffect();
         }

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

@@ -74,8 +74,8 @@ namespace GFGGame
             viewCom = _ui.target;
             isfullScreen = true;
 
-            _ui.m_loaBg.url = ResPathUtil.GetFightBgImgPath("fightBg");
-            _ui.m_LoaMask.url = ResPathUtil.GetFightBgImgPath("fightBg");
+            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("fightBg");
+            _ui.m_LoaMask.url = ResPathUtil.GetBgImgPath("fightBg");
 
             _ui.m_btnBack.onClick.Add(OnBtnBackClick);
             _ui.m_comClick.target.onClick.Add(PartScoreEnd);

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

@@ -81,7 +81,7 @@ namespace GFGGame
                 roleFightData = ArenaDataManager.Instance.DressupList[ArenaDataManager.Instance.CurFightIndex];
                 MyDressUpHelper.dressUpObj.PutOnItemList(ArenaDataManager.Instance.DressupList[ArenaDataManager.Instance.CurFightIndex].itemList);
 
-                targetFightData = ArenaDataManager.Instance.Targets[ArenaDataManager.Instance.SelectTargetIndex].FightDatas[0];
+                targetFightData = ArenaDataManager.Instance.LastTargets[ArenaDataManager.Instance.SelectTargetIndex].FightDatas[0];
                 _ui.m_targetName.m_txtName.text = targetFightData.name;
 
                 _sceneTargetObj.SetActive(true);

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

@@ -42,7 +42,7 @@ namespace GFGGame
             _ui.m_btnClose.enabled = false;
             _ui.m_btnClose.onClick.Add(OnClickBtnClose);
 
-            _ui.m_loaBg.url = ResPathUtil.GetFightBgImgPath("fightBg");
+            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("fightBg");
 
         }
 

GameClient/Assets/Game/HotUpdate/Views/RoleInfo/GMPanelView.cs

@@ -32,6 +32,7 @@ namespace GFGGame
             _ui.m_ComBtn.m_btnSetLv.onClick.Add(OnClickBtnSetLv);
             _ui.m_ComBtn.m_btnSetChapter.onClick.Add(OnClickBtnSetChapter);
             _ui.m_ComBtn.m_btnAll.onClick.Add(OnClickBtnAll);
+            _ui.m_ComBtn.m_btnArenaGrade.onClick.Add(OnClickBtnArenaGrade);
             _ui.m_btnAddItem.onClick.Add(OnClickBtnAddItem);
             _ui.m_btnGM.onClick.Add(OnClickBtnGM);
         }
@@ -40,6 +41,8 @@ namespace GFGGame
         {
             base.OnShown();
             _ui.m_ComBtn.m_c1.selectedIndex = LauncherConfig.netType == LauncherConfig.EnumNetType.LOCAL ? 0 : 1;
+            _ui.m_ComBtn.m_txtArenaGrade.text = "";
+            _ui.m_ComBtn.m_txtArenaRank.text = "";
         }
 
         protected override void OnHide()
@@ -124,9 +127,13 @@ namespace GFGGame
                 PromptController.Instance.ShowFloatTextPrompt("已开启跳过功能开启检测");
 
             }
-
-
         }
+        private async void OnClickBtnArenaGrade()
+        {
+            string gm = string.Format("SetArenaRank|{0}|{1}", _ui.m_ComBtn.m_txtArenaGrade.text, _ui.m_ComBtn.m_txtArenaRank.text);
+            await GMController.SendGMCommand(gm, "修改成功");
+        }
+
         private async void OnClickBtnAll()
         {
             bool result = await StorageSProxy.ReqSetClientValue(ConstStorageId.STORAGE_SKIP_GUIDE, 2);

GameClient/Assets/ResIn/Prefab/SceneArenaDressUp.prefab

@@ -82,133 +82,6 @@ SpriteRenderer:
   m_WasSpriteAssigned: 1
   m_MaskInteraction: 0
   m_SpriteSortPoint: 0
---- !u!1 &1382333317567840377
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 2934965860753742362}
-  m_Layer: 0
-  m_Name: CopyRole
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &2934965860753742362
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1382333317567840377}
-  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: -10}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_Children:
-  - {fileID: 3427358089976778040}
-  m_Father: {fileID: 6789252974363538597}
-  m_RootOrder: 2
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &2135504065154407463
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 8330110764557552440}
-  - component: {fileID: 1051733436616080236}
-  - component: {fileID: 6854520056618082555}
-  - component: {fileID: 8241307450413332938}
-  m_Layer: 0
-  m_Name: FightCamera
-  m_TagString: MainCamera
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &8330110764557552440
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2135504065154407463}
-  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: -10}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_Children: []
-  m_Father: {fileID: 6789252974363538597}
-  m_RootOrder: 3
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!20 &1051733436616080236
-Camera:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2135504065154407463}
-  m_Enabled: 1
-  serializedVersion: 2
-  m_ClearFlags: 2
-  m_BackGroundColor: {r: 1, g: 1, b: 1, a: 0}
-  m_projectionMatrixMode: 1
-  m_GateFitMode: 2
-  m_FOVAxisMode: 0
-  m_SensorSize: {x: 36, y: 24}
-  m_LensShift: {x: 0, y: 0}
-  m_FocalLength: 50
-  m_NormalizedViewPortRect:
-    serializedVersion: 2
-    x: 0
-    y: 0
-    width: 1
-    height: 1
-  near clip plane: -1
-  far clip plane: 2
-  field of view: 60
-  orthographic: 1
-  orthographic size: 9.6
-  m_Depth: -2
-  m_CullingMask:
-    serializedVersion: 2
-    m_Bits: 23
-  m_RenderingPath: -1
-  m_TargetTexture: {fileID: 0}
-  m_TargetDisplay: 0
-  m_TargetEye: 0
-  m_HDR: 1
-  m_AllowMSAA: 0
-  m_AllowDynamicResolution: 0
-  m_ForceIntoRT: 0
-  m_OcclusionCulling: 0
-  m_StereoConvergence: 10
-  m_StereoSeparation: 0.022
---- !u!114 &6854520056618082555
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2135504065154407463}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 03a74e9be952781499f1c48566c89209, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
---- !u!124 &8241307450413332938
-Behaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2135504065154407463}
-  m_Enabled: 1
 --- !u!1 &6789252974363538596
 GameObject:
   m_ObjectHideFlags: 0
@@ -238,8 +111,6 @@ Transform:
   m_Children:
   - {fileID: 5877254733391801254}
   - {fileID: 6789252972548977635}
-  - {fileID: 2934965860753742362}
-  - {fileID: 8330110764557552440}
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -317,73 +188,3 @@ Transform:
   m_CorrespondingSourceObject: {fileID: 8605298645749227662, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
   m_PrefabInstance: {fileID: 2978124125425603437}
   m_PrefabAsset: {fileID: 0}
---- !u!1001 &6412076388096470454
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    m_TransformParent: {fileID: 2934965860753742362}
-    m_Modifications:
-    - target: {fileID: 6890174107261882195, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
-      propertyPath: m_Name
-      value: faxing
-      objectReference: {fileID: 0}
-    - target: {fileID: 8075054435002964044, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
-      propertyPath: m_Name
-      value: lianyiqun
-      objectReference: {fileID: 0}
-    - target: {fileID: 8605298645749227662, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
-      propertyPath: m_RootOrder
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8605298645749227662, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8605298645749227662, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8605298645749227662, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8605298645749227662, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 8605298645749227662, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
-      propertyPath: m_LocalRotation.x
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8605298645749227662, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
-      propertyPath: m_LocalRotation.y
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8605298645749227662, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
-      propertyPath: m_LocalRotation.z
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8605298645749227662, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8605298645749227662, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8605298645749227662, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8605298645749227663, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
-      propertyPath: m_Name
-      value: Role
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
---- !u!4 &3427358089976778040 stripped
-Transform:
-  m_CorrespondingSourceObject: {fileID: 8605298645749227662, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
-  m_PrefabInstance: {fileID: 6412076388096470454}
-  m_PrefabAsset: {fileID: 0}

GameClient/Assets/ResIn/Prefab/SceneArenaDressUpFight.prefab

@@ -1,36 +1,5 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
---- !u!1 &3270958908631963596
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 5272424991718203143}
-  m_Layer: 0
-  m_Name: CopyRole
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &5272424991718203143
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3270958908631963596}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: -10}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_Children:
-  - {fileID: 7699102870567231584}
-  m_Father: {fileID: 5591372854433669388}
-  m_RootOrder: 2
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &5591372854433669389
 GameObject:
   m_ObjectHideFlags: 0
@@ -60,107 +29,9 @@ Transform:
   m_Children:
   - {fileID: 648717468607016563}
   - {fileID: 5591372855846626890}
-  - {fileID: 5272424991718203143}
-  - {fileID: 7270768326552441965}
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &8796825807392229099
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 7270768326552441965}
-  - component: {fileID: 5182680727879188553}
-  - component: {fileID: 7464284760406400746}
-  - component: {fileID: 1839775417564747814}
-  m_Layer: 0
-  m_Name: FightCamera
-  m_TagString: MainCamera
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &7270768326552441965
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8796825807392229099}
-  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: -10}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_Children: []
-  m_Father: {fileID: 5591372854433669388}
-  m_RootOrder: 3
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!20 &5182680727879188553
-Camera:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8796825807392229099}
-  m_Enabled: 1
-  serializedVersion: 2
-  m_ClearFlags: 2
-  m_BackGroundColor: {r: 1, g: 1, b: 1, a: 0}
-  m_projectionMatrixMode: 1
-  m_GateFitMode: 2
-  m_FOVAxisMode: 0
-  m_SensorSize: {x: 36, y: 24}
-  m_LensShift: {x: 0, y: 0}
-  m_FocalLength: 50
-  m_NormalizedViewPortRect:
-    serializedVersion: 2
-    x: 0
-    y: 0
-    width: 1
-    height: 1
-  near clip plane: -1
-  far clip plane: 2
-  field of view: 60
-  orthographic: 1
-  orthographic size: 9.6
-  m_Depth: -2
-  m_CullingMask:
-    serializedVersion: 2
-    m_Bits: 23
-  m_RenderingPath: -1
-  m_TargetTexture: {fileID: 0}
-  m_TargetDisplay: 0
-  m_TargetEye: 0
-  m_HDR: 1
-  m_AllowMSAA: 0
-  m_AllowDynamicResolution: 0
-  m_ForceIntoRT: 0
-  m_OcclusionCulling: 0
-  m_StereoConvergence: 10
-  m_StereoSeparation: 0.022
---- !u!114 &7464284760406400746
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8796825807392229099}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 03a74e9be952781499f1c48566c89209, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
---- !u!124 &1839775417564747814
-Behaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8796825807392229099}
-  m_Enabled: 1
 --- !u!1 &9148350711561066481
 GameObject:
   m_ObjectHideFlags: 0
@@ -243,76 +114,6 @@ SpriteRenderer:
   m_WasSpriteAssigned: 1
   m_MaskInteraction: 0
   m_SpriteSortPoint: 0
---- !u!1001 &2140508081813045486
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    m_TransformParent: {fileID: 5272424991718203143}
-    m_Modifications:
-    - target: {fileID: 6890174107261882195, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
-      propertyPath: m_Name
-      value: faxing
-      objectReference: {fileID: 0}
-    - target: {fileID: 8075054435002964044, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
-      propertyPath: m_Name
-      value: lianyiqun
-      objectReference: {fileID: 0}
-    - target: {fileID: 8605298645749227662, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
-      propertyPath: m_RootOrder
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8605298645749227662, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8605298645749227662, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8605298645749227662, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8605298645749227662, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 8605298645749227662, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
-      propertyPath: m_LocalRotation.x
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8605298645749227662, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
-      propertyPath: m_LocalRotation.y
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8605298645749227662, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
-      propertyPath: m_LocalRotation.z
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8605298645749227662, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8605298645749227662, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8605298645749227662, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8605298645749227663, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
-      propertyPath: m_Name
-      value: Role
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
---- !u!4 &7699102870567231584 stripped
-Transform:
-  m_CorrespondingSourceObject: {fileID: 8605298645749227662, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
-  m_PrefabInstance: {fileID: 2140508081813045486}
-  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &4248198995156371140
 PrefabInstance:
   m_ObjectHideFlags: 0