竞技场

FGUIProject/assets/Arena/ArenaUI.xml

@@ -4,7 +4,7 @@
     <remark page="0" value="选对手"/>
     <remark page="1" value="展示对手"/>
   </controller>
-  <controller name="c2" pages="0,,1," selected="1"/>
+  <controller name="c2" pages="0,,1," selected="0"/>
   <displayList>
     <component id="n0_psph" name="btnBack" src="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="33,80" group="n28_psph"/>
     <component id="n1_psph" name="valueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="-12,95" group="n28_psph" controller="c1,12"/>
@@ -17,8 +17,8 @@
     <loader id="n24_psph" name="loaScore2" xy="668,276" size="58,58" group="n38_jcej" url="ui://eg2y0ldp842s6h" autoSize="true"/>
     <group id="n38_jcej" name="grpTheme" xy="354,276" size="372,58" group="n28_psph" advanced="true" layout="hz" colGap="10" excludeInvisibles="true"/>
     <image id="n41_jcej" name="n41" src="jcej36" fileName="images/jzsjzs_sjsjdi.png" xy="659,353" group="n42_jcej"/>
-    <text id="n27_psph" name="txtTime" xy="691,359" pivot="1,0" size="348,41" group="n42_jcej" font="ui://eg2y0ldpwonotjc" fontSize="30" color="#fbf6ed" align="right" text="赛季时间：01/05-05/21"/>
-    <component id="n21_psph" name="btnRule" src="psphtkg" fileName="components/BtnRule.xml" pkg="eg2y0ldp" xy="1041,366" size="29,29" group="n42_jcej">
+    <text id="n27_psph" name="txtTime" xy="728,359" size="348,41" group="n42_jcej" font="ui://eg2y0ldpwonotjc" fontSize="30" color="#fbf6ed" text="赛季时间：01/05-05/21"/>
+    <component id="n21_psph" name="btnRule" src="psphtkg" fileName="components/BtnRule.xml" pkg="eg2y0ldp" xy="693,366" size="29,29" group="n42_jcej">
       <Button icon="ui://eg2y0ldpjcej2k"/>
     </component>
     <group id="n42_jcej" name="grpTime" xy="659,353" size="421,52" group="n28_psph"/>
@@ -46,53 +46,51 @@
       <gearDisplay controller="c2" pages="1"/>
       <relation target="" sidePair="width-width,height-height"/>
     </graph>
-    <image id="n43_jcej" name="n43" src="jcej37" fileName="images/jzsjzs_mpmpdi.png" xy="42,1454" group="n46_jcej"/>
-    <image id="n44_jcej" name="n44" src="jcej32" fileName="images/jzsjzs_xtxt_1.png" xy="187,1510" group="n46_jcej"/>
-    <loader id="n2_psph" name="loaDanIcon" xy="48,1464" size="149,153" group="n46_jcej" url="ui://eg2y0ldpu2u3tkq" fill="scale"/>
-    <text id="n7_psph" name="txtName" xy="193,1472" size="122,41" group="n46_jcej" font="ui://eg2y0ldpwonotjc" fontSize="30" color="#9a7c56" text="自己名字"/>
-    <text id="n8_psph" name="txtRank" xy="193,1518" size="90,31" group="n46_jcej" font="ui://eg2y0ldpwonotjc" fontSize="22" color="#9a7c56" text="段位排名"/>
-    <text id="n9_psph" name="txtDanTitle" xy="193,1550" size="90,31" group="n46_jcej" font="ui://eg2y0ldpwonotjc" fontSize="22" color="#9a7c56" text="段位名称"/>
-    <text id="n10_psph" name="txtFightScore" xy="193,1581" size="145,31" group="n46_jcej" font="ui://eg2y0ldpwonotjc" fontSize="22" color="#9a7c56" text="竞技战力6666"/>
-    <component id="n45_jcej" name="btnFightScoreRule" src="psphtkg" fileName="components/BtnRule.xml" pkg="eg2y0ldp" xy="165,1584" size="29,29" group="n46_jcej">
-      <Button checked="true" icon="ui://eg2y0ldpjcej2k" controller="c2" page="1"/>
+    <image id="n43_jcej" name="n43" src="jcej37" fileName="images/jzsjzs_mpmpdi.png" xy="23,1454" group="n46_jcej"/>
+    <image id="n44_jcej" name="n44" src="jcej32" fileName="images/jzsjzs_xtxt_1.png" xy="168,1510" group="n46_jcej"/>
+    <loader id="n2_psph" name="loaDanIcon" xy="29,1464" size="149,153" group="n46_jcej" url="ui://eg2y0ldpu2u3tkq" fill="scale"/>
+    <text id="n7_psph" name="txtName" xy="174,1472" size="122,41" group="n46_jcej" font="ui://eg2y0ldpwonotjc" fontSize="30" color="#9a7c56" text="自己名字"/>
+    <text id="n9_psph" name="txtDanTitle" xy="174,1518" size="90,31" group="n46_jcej" font="ui://eg2y0ldpwonotjc" fontSize="22" color="#9a7c56" text="段位名称"/>
+    <text id="n8_psph" name="txtRank" xy="174,1550" size="90,31" group="n46_jcej" font="ui://eg2y0ldpwonotjc" fontSize="22" color="#9a7c56" text="段位排名"/>
+    <text id="n10_psph" name="txtFightScore" xy="174,1581" size="145,31" group="n46_jcej" font="ui://eg2y0ldpwonotjc" fontSize="22" color="#9a7c56" text="竞技战力6666"/>
+    <component id="n45_jcej" name="btnFightScoreRule" src="psphtkg" fileName="components/BtnRule.xml" pkg="eg2y0ldp" xy="146,1584" size="29,29" group="n46_jcej">
+      <Button icon="ui://eg2y0ldpjcej2k" controller="c2" page="1"/>
     </component>
-    <component id="n54_jcej" name="comFightScore" src="jcej4q" fileName="components/ComFightScore.xml" xy="144,1401" group="n46_jcej">
+    <component id="n54_jcej" name="comFightScore" src="jcej4q" fileName="components/ComFightScore.xml" xy="125,1401" group="n46_jcej">
       <gearDisplay controller="c2" pages="1"/>
     </component>
-    <group id="n46_jcej" name="grpMyInfo" xy="42,1401" size="467,227" group="n20_psph"/>
-    <text id="n14_psph" name="txtMoneyCount" xy="774,1574" pivot="0.5,0" size="276,34" group="n20_psph" font="ui://eg2y0ldpwonotjc" fontSize="24" color="#ffffff" align="center" strokeColor="#c5a973" strokeSize="2" text="今日和可获得xx次xx货币"/>
-    <image id="n52_jcej" name="n52" src="jcej39" fileName="images/jzsjzs_kddi.png" xy="727,1613" group="n51_jcej"/>
-    <image id="n53_jcej" name="n53" src="jcej3c" fileName="images/jzsjzs_dian.png" xy="751,1625" group="n51_jcej"/>
-    <component id="n17_psph" name="btnAddFightCount" src="psph1j" fileName="components/BtnRefresh.xml" xy="1035,1616" group="n51_jcej">
+    <group id="n46_jcej" name="grpMyInfo" xy="23,1401" size="467,227" group="n20_psph"/>
+    <text id="n14_psph" name="txtMoneyCount" xy="775,1574" pivot="0.5,0" size="276,34" group="n20_psph" font="ui://eg2y0ldpwonotjc" fontSize="24" color="#ffffff" align="center" strokeColor="#c5a973" strokeSize="2" text="今日和可获得xx次xx货币"/>
+    <image id="n52_jcej" name="n52" src="jcej39" fileName="images/jzsjzs_kddi.png" xy="746,1613" pivot="0.5,0" group="n51_jcej" scale="-1,1"/>
+    <component id="n17_psph" name="btnAddFightCount" src="psph1j" fileName="components/BtnRefresh.xml" xy="743,1616" group="n51_jcej">
       <Button icon="ui://4lc5fhlbjcej3a"/>
     </component>
-    <text id="n15_psph" name="txtFightCount" xy="789,1617" size="243,41" group="n51_jcej" font="ui://eg2y0ldpwonotjc" fontSize="30" color="#fbf6ed" align="center" text="剩余次数：10/10"/>
-    <group id="n51_jcej" name="n51" xy="727,1613" size="353,48" group="n20_psph"/>
-    <image id="n48_jcej" name="n48" src="jcej39" fileName="images/jzsjzs_kddi.png" xy="727,1679" group="n49_jcej"/>
-    <image id="n50_jcej" name="n50" src="jcej3c" fileName="images/jzsjzs_dian.png" xy="751,1690" group="n49_jcej"/>
-    <text id="n16_psph" name="txtRefreshCount" xy="788,1683" size="243,41" group="n49_jcej" font="ui://eg2y0ldpwonotjc" fontSize="30" color="#fbf6ed" align="center" text="免费刷新：10/10"/>
-    <component id="n19_psph" name="btnRefresh" src="psph1j" fileName="components/BtnRefresh.xml" xy="1035,1682" group="n49_jcej"/>
-    <component id="n18_psph" name="comCostCurrent" src="jcej3y" fileName="components/ComCostCurrency.xml" xy="788,1680" group="n49_jcej"/>
-    <group id="n49_jcej" name="n49" xy="727,1679" size="353,48" group="n20_psph"/>
-    <component id="n13_psph" name="btnQuickFight" src="jcejtkk" fileName="components/Button17.xml" pkg="eg2y0ldp" xy="427,1565" group="n20_psph">
+    <text id="n15_psph" name="txtFightCount" xy="805,1617" size="243,42" group="n51_jcej" font="ui://eg2y0ldpwonotjc" fontSize="30" color="#fbf6ed" align="center" text="剩余次数：10/10"/>
+    <group id="n51_jcej" name="n51" xy="743,1613" size="356,48" group="n20_psph"/>
+    <image id="n48_jcej" name="n48" src="jcej39" fileName="images/jzsjzs_kddi.png" xy="746,1679" pivot="0.5,0" group="n49_jcej" scale="-1,1"/>
+    <text id="n16_psph" name="txtRefreshCount" xy="805,1683" size="243,41" group="n49_jcej" font="ui://eg2y0ldpwonotjc" fontSize="30" color="#fbf6ed" align="center" text="免费刷新：10/10"/>
+    <component id="n19_psph" name="btnRefresh" src="psph1j" fileName="components/BtnRefresh.xml" xy="743,1682" group="n49_jcej"/>
+    <component id="n18_psph" name="comCostCurrent" src="jcej3y" fileName="components/ComCostCurrency.xml" xy="841,1680" group="n49_jcej"/>
+    <group id="n49_jcej" name="n49" xy="743,1679" size="356,48" group="n20_psph"/>
+    <component id="n13_psph" name="btnQuickFight" src="jcejtkk" fileName="components/Button17.xml" pkg="eg2y0ldp" xy="408,1565" group="n20_psph">
       <Button title="快速挑战"/>
     </component>
-    <component id="n6_psph" name="btnShop" src="psph1g" fileName="components/BtnRecord.xml" xy="87,1667" size="209,61" group="n20_psph" aspect="true">
+    <component id="n6_psph" name="btnShop" src="psph1g" fileName="components/BtnRecord.xml" xy="68,1667" size="209,61" group="n20_psph" aspect="true">
       <Button title="商店" icon="ui://4lc5fhlbjcej3q"/>
     </component>
-    <component id="n11_psph" name="btnDress" src="oqa1tjt" fileName="components/Button21.xml" pkg="mk0fwx0x" xy="368,1635" group="n20_psph" aspect="true">
+    <component id="n11_psph" name="btnDress" src="oqa1tjt" fileName="components/Button21.xml" pkg="mk0fwx0x" xy="349,1635" group="n20_psph" aspect="true">
       <Button title="我的搭配"/>
     </component>
-    <component id="n4_psph" name="btnReward" src="psph1g" fileName="components/BtnRecord.xml" xy="86,1760" size="209,61" group="n20_psph" aspect="true">
+    <component id="n4_psph" name="btnReward" src="psph1g" fileName="components/BtnRecord.xml" xy="67,1760" size="209,61" group="n20_psph" aspect="true">
       <Button title="段位奖励"/>
     </component>
-    <component id="n5_psph" name="btnRank" src="psph1g" fileName="components/BtnRecord.xml" xy="444,1760" size="209,61" group="n20_psph" aspect="true">
+    <component id="n5_psph" name="btnRank" src="psph1g" fileName="components/BtnRecord.xml" xy="425,1760" size="209,61" group="n20_psph" aspect="true">
       <Button title="排行榜"/>
     </component>
-    <component id="n3_psph" name="btnRecord" src="psph1g" fileName="components/BtnRecord.xml" xy="802,1760" size="209,61" group="n20_psph" aspect="true">
+    <component id="n3_psph" name="btnRecord" src="psph1g" fileName="components/BtnRecord.xml" xy="783,1760" size="209,61" group="n20_psph" aspect="true">
       <Button title="比拼记录"/>
     </component>
-    <group id="n20_psph" name="grpBottom" xy="42,1401" size="1038,420" advanced="true">
+    <group id="n20_psph" name="grpBottom" xy="23,1401" size="1076,420" advanced="true">
       <relation target="" sidePair="center-center,bottom-bottom"/>
     </group>
   </displayList>

FGUIProject/assets/Arena/components/ComCostCurrency.xml

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="202,46">
+<component size="165,46">
   <displayList>
     <text id="n2_ojlz" name="n2" xy="0,2" size="63,41" group="n7_si5z" font="ui://eg2y0ldpwonotjc" fontSize="30" color="#fbf6ed" text="消耗"/>
     <loader id="n1_ojlz" name="loaIcon" xy="68,-2" size="50,50" group="n7_si5z" aspect="true" url="ui://eg2y0ldpq08x3" fill="scale"/>
-    <text id="n6_j5a5" name="txtNeed" xy="123,2" size="79,41" group="n7_si5z" font="ui://eg2y0ldpwonotjc" fontSize="30" color="#fbf6ed" align="center" vAlign="middle" ubb="true" autoClearText="true" text="9999"/>
-    <group id="n7_si5z" name="n7" xy="0,-2" size="202,50" advanced="true" layout="hz" colGap="5" excludeInvisibles="true">
+    <text id="n6_j5a5" name="txtNeed" xy="123,2" size="42,42" group="n7_si5z" font="ui://eg2y0ldpwonotjc" fontSize="30" color="#fbf6ed" align="center" vAlign="middle" ubb="true" autoClearText="true" text="50"/>
+    <group id="n7_si5z" name="n7" xy="0,-2" size="165,50" advanced="true" layout="hz" colGap="5" excludeInvisibles="true">
       <relation target="" sidePair="center-center"/>
     </group>
   </displayList>

FGUIProject/assets/Main/StoryFightTargetScoreUI.xml

@@ -7,7 +7,7 @@
     <image id="n62_psph" name="imgRole" src="v482fx" fileName="zjm_1.jpg" xy="540,960" pivot="0.5,0.5" anchor="true" size="1080,2400">
       <relation target="" sidePair="center-center,middle-middle"/>
     </image>
-    <component id="n50_psph" name="comClick" src="psphj5" fileName="components/ComClick1.xml" xy="0,0">
+    <component id="n50_psph" name="comClick" src="psphj5" fileName="components/ComClick.xml" xy="0,0">
       <relation target="" sidePair="width-width,height-height"/>
     </component>
     <component id="n37_mhyh" name="btnBack" src="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="34,80">
@@ -17,6 +17,10 @@
       <relation target="" sidePair="right-right,bottom-bottom"/>
       <Button title="x1"/>
     </component>
+    <component id="n65_t31n" name="btnSkip" src="t31nj9" fileName="componentsDialog/ButtonSkip1.xml" xy="809,1546">
+      <relation target="" sidePair="right-right,bottom-bottom"/>
+      <Button title="x1" icon="ui://mfvz4q8kt31nj8"/>
+    </component>
     <component id="n51_psph" name="myHead" src="r9ri1h" fileName="components/ComHead.xml" pkg="eg2y0ldp" xy="-23,175"/>
     <component id="n52_psph" name="targetHead" src="r9ri1h" fileName="components/ComHead.xml" pkg="eg2y0ldp" xy="879,175"/>
     <component id="n28_uj53" name="proScore" src="v3k9c7" fileName="components/ProgressBarTargetScore.xml" xy="136,147" pivot="0,0.5" anchor="true">
@@ -24,7 +28,7 @@
     </component>
     <component id="n54_psph" name="comTargetCard" src="psphiz" fileName="components/ComTargetCard.xml" xy="1180,540" pivot="0.5,0.5" anchor="true" size="174,250" aspect="true"/>
     <component id="n55_psph" name="comDeduction" src="psphix" fileName="components/ComDeduction.xml" xy="102,500" pivot="0.5,0.5" anchor="true" scale="0,0"/>
-    <component id="n56_psph" name="comAllPerfect" src="psphj4" fileName="components/ComAllPerfect1.xml" xy="367,963"/>
+    <component id="n56_psph" name="comAllPerfect" src="psphj4" fileName="components/ComAllPerfect.xml" xy="367,963"/>
     <loader id="n57_psph" name="LoaMask" xy="540,960" pivot="0.5,0.5" anchor="true" size="1080,2400" alpha="0" align="center" vAlign="middle" fill="scaleMatchHeight">
       <relation target="" sidePair="center-center,middle-middle"/>
     </loader>

FGUIProject/assets/Main/componentsDialog/ButtonSkip1.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="108,109" extention="Button">
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
+  <displayList>
+    <image id="n0_nmnb" name="n0" src="t31nj8" fileName="images/zd_tgtgt.png" xy="0,0">
+      <relation target="" sidePair="width-width,height-height"/>
+    </image>
+  </displayList>
+  <Button/>
+</component>

FGUIProject/assets/Main/package.xml

@@ -459,6 +459,8 @@
     <component id="psphj5" name="ComClick.xml" path="/components/"/>
     <component id="jcejj6" name="ArenaFightResultUI.xml" path="/" exported="true"/>
     <image id="v461j7" name="zjm_e_6.png" path="/images/"/>
+    <image id="t31nj8" name="zd_tgtgt.png" path="/images/"/>
+    <component id="t31nj9" name="ButtonSkip1.xml" path="/componentsDialog/"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\Main" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

GameClient/Assets/Game/HotUpdate/Constant/ConstMessage.cs

@@ -25,6 +25,7 @@ namespace GFGGame
         public const string DRESS_FILTER = "DRESS_FILTER";
         public const string DRESS_SEARCH = "DRESS_SEARCH";
         public const string CARD_CHOOSE = "CARD_CHOOSE";
+        public const string CARD_SELECTED = "CARD_SELECTED";
         public const string SHOW_CARD_SKILL_END = "SHOW_CARD_SKILL_END";
         public const string UPDATE_PROGRESS_END = "UPDATE_PROGRESS_END";
         public const string CARD_REFRESH = "CARD_REFRESH";

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

@@ -287,17 +287,20 @@ namespace GFGGame
         }
 
         /*********************************************************************************************************************/
-        public void SetMineFightAttr()
+        public void SetMineFightAttrs()
         {
             for (int i = 0; i < DressupList.Count; i++)
             {
-                FightData fightData = DressupList[i];
-                fightData.cardScore = ItemDataManager.GetItemAdditionScore(fightData.cardId, ThemeList[i], fightData.tags);
-                fightData.skillLvs = SkillDataManager.Instance.GetSkillLvs(fightData.cardId);
-                FightDataManager.Instance.SetItemScoreList(fightData);
+                SetMineFightAttr(DressupList[i], ThemeList[i]);
             }
         }
 
+        public void SetMineFightAttr(FightData fightData, int theme)
+        {
+            fightData.cardScore = ItemDataManager.GetItemAdditionScore(fightData.cardId, theme, fightData.tags);
+            fightData.skillLvs = SkillDataManager.Instance.GetSkillLvs(fightData.cardId);
+            FightDataManager.Instance.SetItemScoreList(fightData);
+        }
         /// <summary>
         /// 获取三套服装总战力
         /// </summary>

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

@@ -52,29 +52,14 @@ namespace GFGGame
             }
             for (int i = 0; i < roleData.itemList.Count; i++)
             {
-                // FightScoreCfg[] typeCfgs = FightScoreCfgArray.Instance.dataArray;
                 for (int j = 0; j < typeCfgs.Length; j++)
                 {
                     FightScoreCfg cfg = typeCfgs[j];
-                    // if (roleData.pardScoreListDic.ContainsKey(cfg.id) == false)
-                    // {
-                    //     roleData.pardScoreListDic.Add(cfg.id, new List<int>());
-                    // }
-                    // if (roleData.pardListDic.ContainsKey(cfg.id) == false)
-                    // {
-                    //     roleData.pardListDic.Add(cfg.id, new List<int>());
-                    // }
-
                     bool isCheckFinish = false;
+
                     for (int k = 0; k < cfg.subTypesArr.Length; k++)
                     {
-                        var itemId = roleData.itemList[i];
-                        ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(itemId);
-                        if(itemCfg == null)
-                        {
-                            Log.Warning($"id为 {itemId} 的物品没有配置，请查找原因！");
-                            continue;
-                        }
+                        ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(roleData.itemList[i]);
                         if (itemCfg.subType == cfg.subTypesArr[k])
                         {
                             roleData.pardListDic[cfg.id].Add(roleData.itemList[i]);
@@ -284,7 +269,7 @@ namespace GFGGame
                 if (CheckIsRightTime(targetSkillLvlCfg, currentTime, partId))
                 {
                     bool isProbability = targetSkillLvlCfg.nullifySkillIndex > 0 && UnityEngine.Random.Range(0, 10000) < targetSkillLvlCfg.probability;
-                    if (targetSkillLvlCfg.beginTime == BeginTime.PART_ALL_FIGHT_BEGIN && targetRoundTimes != null && partId < targetRoundTimes[i]) isProbability = true;
+                    if (targetSkillLvlCfg.beginTime == BeginTime.PART_ALL_FIGHT_BEGIN && targetRoundTimes.Count > i && partId < targetRoundTimes[i]) isProbability = true;
                     if (isProbability) nullifySkillIndex.Add(targetSkillLvlCfg.nullifySkillIndex);
                 }
             }

GameClient/Assets/Game/HotUpdate/DressUp/MyDressUpHelper.cs

@@ -51,7 +51,7 @@ namespace GFGGame
             {
                 var itemId = equipDatas[i];
                 ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(itemId);
-                if(itemCfg == null)
+                if (itemCfg == null)
                 {
                     Log.Warning($"id为 {itemId} 的物品没有配置，请查找原因！");
                     continue;
@@ -228,18 +228,18 @@ namespace GFGGame
             SuitCfg suitCfg = SuitCfgArray.Instance.GetCfg(fightCfg.needSuitId);
             int[] suitParts = suitCfg == null ? new int[] { } : suitCfg.partsArr;
             int shangyiId = itemsDic.ContainsKey(ConstDressUpItemType.SHANG_YI) && itemsDic[ConstDressUpItemType.SHANG_YI].Count > 0 ? itemsDic[ConstDressUpItemType.SHANG_YI][0] : 0;
-            int xiazhuangId = itemsDic.ContainsKey(ConstDressUpItemType.XIA_ZHUANG) && itemsDic[ConstDressUpItemType.XIA_ZHUANG].Count > 0 ? itemsDic[ConstDressUpItemType.XIA_ZHUANG][0] : 0;
-            int neidaId = itemsDic.ContainsKey(ConstDressUpItemType.NEI_DA) && itemsDic[ConstDressUpItemType.NEI_DA].Count > 0 ? itemsDic[ConstDressUpItemType.NEI_DA][0] : 0;
-            int lianyiqunId = itemsDic.ContainsKey(ConstDressUpItemType.LIAN_YI_QUN) && itemsDic[ConstDressUpItemType.LIAN_YI_QUN].Count > 0 ? itemsDic[ConstDressUpItemType.LIAN_YI_QUN][0] : 0;
-            if (shangyiId == fightCfg.needItemId || Array.IndexOf(suitParts, shangyiId) >= 0
-            || xiazhuangId == fightCfg.needItemId || Array.IndexOf(suitParts, xiazhuangId) >= 0
-            || neidaId == fightCfg.needItemId || Array.IndexOf(suitParts, neidaId) >= 0)
+            int xiazhuangId = itemsDic.ContainsKey(ConstDressUpItemType.XIA_ZHUANG) && itemsDic[ConstDressUpItemType.XIA_ZHUANG].Count > 0 ? itemsDic[ConstDressUpItemType.XIA_ZHUANG][0] : ConstItemID.DEFULT_XIA_ZHUANG;
+            int neidaId = itemsDic.ContainsKey(ConstDressUpItemType.NEI_DA) && itemsDic[ConstDressUpItemType.NEI_DA].Count > 0 ? itemsDic[ConstDressUpItemType.NEI_DA][0] : ConstItemID.DEFULT_NEI_DA;
+            int lianyiqunId = itemsDic.ContainsKey(ConstDressUpItemType.LIAN_YI_QUN) && itemsDic[ConstDressUpItemType.LIAN_YI_QUN].Count > 0 ? itemsDic[ConstDressUpItemType.LIAN_YI_QUN][0] : ConstItemID.DEFULT_LIAN_YI_QUN;
+
+            if (fightCfg.needItemId > 0 && (shangyiId == fightCfg.needItemId || xiazhuangId == fightCfg.needItemId || neidaId == fightCfg.needItemId) ||
+            fightCfg.needSuitId > 0 && (Array.IndexOf(suitParts, shangyiId) >= 0 || Array.IndexOf(suitParts, xiazhuangId) >= 0 || Array.IndexOf(suitParts, neidaId) >= 0))
             {
-                recommendList.Add(shangyiId);
+                if (shangyiId > 0) recommendList.Add(shangyiId);
                 recommendList.Add(xiazhuangId);
                 recommendList.Add(neidaId);
             }
-            else if (lianyiqunId == fightCfg.needItemId || Array.IndexOf(suitParts, lianyiqunId) >= 0)
+            else if (fightCfg.needItemId > 0 && lianyiqunId == fightCfg.needItemId || fightCfg.needSuitId > 0 && Array.IndexOf(suitParts, lianyiqunId) >= 0)
             {
                 recommendList.Add(lianyiqunId);
             }
@@ -255,7 +255,7 @@ namespace GFGGame
                 }
                 else
                 {
-                    recommendList.Add(shangyiId);
+                    if (shangyiId > 0) recommendList.Add(shangyiId);
                     recommendList.Add(xiazhuangId);
                     recommendList.Add(neidaId);
                 }

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

@@ -25,8 +25,8 @@ namespace UI.Arena
         public GGraph m_grhCloseComFightScore;
         public GLoader m_loaDanIcon;
         public GTextField m_txtName;
-        public GTextField m_txtRank;
         public GTextField m_txtDanTitle;
+        public GTextField m_txtRank;
         public GTextField m_txtFightScore;
         public GButton m_btnFightScoreRule;
         public UI_ComFightScore m_comFightScore;
@@ -108,8 +108,8 @@ namespace UI.Arena
             m_grhCloseComFightScore = (GGraph)comp.GetChild("grhCloseComFightScore");
             m_loaDanIcon = (GLoader)comp.GetChild("loaDanIcon");
             m_txtName = (GTextField)comp.GetChild("txtName");
-            m_txtRank = (GTextField)comp.GetChild("txtRank");
             m_txtDanTitle = (GTextField)comp.GetChild("txtDanTitle");
+            m_txtRank = (GTextField)comp.GetChild("txtRank");
             m_txtFightScore = (GTextField)comp.GetChild("txtFightScore");
             m_btnFightScoreRule = (GButton)comp.GetChild("btnFightScoreRule");
             m_comFightScore = (UI_ComFightScore)UI_ComFightScore.Create(comp.GetChild("comFightScore"));
@@ -147,8 +147,8 @@ namespace UI.Arena
             m_grhCloseComFightScore = null;
             m_loaDanIcon = null;
             m_txtName = null;
-            m_txtRank = null;
             m_txtDanTitle = null;
+            m_txtRank = null;
             m_txtFightScore = null;
             m_btnFightScoreRule = null;
             m_comFightScore.Dispose();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_StoryFightTargetScoreUI.cs

@@ -12,6 +12,7 @@ namespace UI.Main
         public UI_ComClick m_comClick;
         public GButton m_btnBack;
         public GButton m_btnSpeedUp;
+        public GButton m_btnSkip;
         public GComponent m_myHead;
         public GComponent m_targetHead;
         public UI_ProgressBarTargetScore m_proScore;
@@ -75,6 +76,7 @@ namespace UI.Main
             m_comClick = (UI_ComClick)UI_ComClick.Create(comp.GetChild("comClick"));
             m_btnBack = (GButton)comp.GetChild("btnBack");
             m_btnSpeedUp = (GButton)comp.GetChild("btnSpeedUp");
+            m_btnSkip = (GButton)comp.GetChild("btnSkip");
             m_myHead = (GComponent)comp.GetChild("myHead");
             m_targetHead = (GComponent)comp.GetChild("targetHead");
             m_proScore = (UI_ProgressBarTargetScore)UI_ProgressBarTargetScore.Create(comp.GetChild("proScore"));
@@ -95,6 +97,7 @@ namespace UI.Main
             m_comClick = null;
             m_btnBack = null;
             m_btnSpeedUp = null;
+            m_btnSkip = null;
             m_myHead = null;
             m_targetHead = null;
             m_proScore.Dispose();

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

@@ -370,9 +370,9 @@ namespace GFGGame
             {
                 ArenaRobotCfg robotCfg = ArenaRobotCfgArray.Instance.GetCfg(arenaTargetProto.RobotDressupInfo.RobotId);
                 arenaTarget.RoleInfo.roleId = 0;
-                arenaTarget.RoleInfo.roleName = robotCfg.gradeName;
+                arenaTarget.RoleInfo.roleName = arenaTargetProto.RobotDressupInfo.Name;
                 arenaTarget.RoleInfo.roleLv = robotCfg.level;
-                arenaTarget.RoleInfo.headRes = robotCfg.targetRes;
+                arenaTarget.RoleInfo.headRes = arenaTargetProto.RobotDressupInfo.RobotHead;
             }
 
             arenaTarget.FightDatas.Clear();
@@ -429,7 +429,7 @@ namespace GFGGame
                 fightData.itemScoreList.Add((int)Math.Ceiling(score));
             }
             fightData.type = FightTargetType.ROBOT;
-            fightData.res = robotCfg.targetRes;
+            fightData.res = robotProto.RobotHead;
             double cardScore = (double)robotCfg.cardScore * (double)robotProto.Randoms[index] / 10000d;
             fightData.cardScore = (int)Math.Ceiling(cardScore);
             fightData.skillLvs.Add(robotCfg.skillLvs);

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

@@ -140,9 +140,7 @@ namespace GFGGame
                 roleData.scoreType = scoreType;
                 roleData.itemList = ArenaDataManager.Instance.GetRecommentItemList(scoreType, roleData.tags);
                 roleData.cardId = ArenaDataManager.Instance.GetRecommentCardId(scoreType, roleData.itemList);
-                roleData.cardScore = ItemDataManager.GetItemAdditionScore(roleData.cardId, roleData.scoreType, roleData.tags);
-                roleData.skillLvs = SkillDataManager.Instance.GetSkillLvs(roleData.cardId);
-                FightDataManager.Instance.SetItemScoreList(roleData);
+                ArenaDataManager.Instance.SetMineFightAttr(roleData, scoreType);
                 ScoreSystemData.Instance.SetEquipScoresWithPartId(roleData);
                 _roleDatas = ArenaDataManager.Instance.DressupList;
                 bool result = await ArenaSproxy.ReqChangeArenaDressup(i, roleData.cardId, roleData.itemList);

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

@@ -54,7 +54,7 @@ namespace GFGGame
             _ui.m_listRank.numItems = 100;
             _ui.m_comMyRank.m_btnLook.visible = false;
             ArenaDataManager.Instance.RankDatasDic.Clear();
-            ReqRankList(0);
+            ReqRankList(1);
         }
 
         protected override void OnHide()
@@ -81,7 +81,7 @@ namespace GFGGame
             }
             if (_ui.m_listRank.numItems > 0) _ui.m_listRank.ScrollToView(0);
             _ui.m_listRank.numItems = 0;
-            ReqRankList(0);
+            ReqRankList(1);
         }
         private void OnTab1Change()
         {
@@ -95,15 +95,15 @@ namespace GFGGame
             }
             if (_ui.m_listRank.numItems > 0) _ui.m_listRank.ScrollToView(0);
             _ui.m_listRank.numItems = 0;
-            ReqRankList(0);
+            ReqRankList(1);
         }
         private void OnListScroll()
         {
 
             int itemIndex = _ui.m_listRank.ChildIndexToItemIndex(_ui.m_listRank.numChildren - 1);
-            if (itemIndex % 20 == 0)
+            if (itemIndex > 30 && ArenaDataManager.Instance.RankDatasDic.ContainsKey(_rankType) && ArenaDataManager.Instance.RankDatasDic[_rankType].Count < 100)
             {
-                ReqRankList(itemIndex);
+                ReqRankList(31);
             }
         }
         private async void ReqRankList(int index)
@@ -114,20 +114,18 @@ namespace GFGGame
             {
                 count = ArenaDataManager.Instance.RankDatasDic[_rankType].Count;
             }
-            if (_lock) return;
             if (count > index)
             {
                 UpdateView();
                 return;
             }
-            _lock = true;
-            int startIndex = index + 1;
-            bool result = await ArenaSproxy.ReqArenaRank(_rankType, startIndex, startIndex + 19);
+            int endIndex = index == 1 ? 30 : 100;
+            bool result = await ArenaSproxy.ReqArenaRank(_rankType, index, endIndex);
             if (result)
             {
                 UpdateView();
             }
-            _lock = false;
+
         }
         private void UpdateView()
         {

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

@@ -87,7 +87,7 @@ namespace GFGGame
             _targetData = this.viewData == null ? null : this.viewData as ArenaTargetData;
             _arenaCfg = ArenaOpenCfgArray.Instance.GetCfg(_dataManager.SeasonId);
             _valueBarController.OnShown();
-            _dataManager.SetMineFightAttr();
+            _dataManager.SetMineFightAttrs();
 
             if (_dataManager.DressupList.Count == 0) return;
             InstanceZonesDataManager.FightScene = ConstInstanceZonesType.Arena;
@@ -115,7 +115,7 @@ namespace GFGGame
             if (_copyDressUpObj == null)
             {
                 _copyDressUpObj = new DressUpObj();
-                _copyDressUpObj.setSceneObj(sceneCopyObject, false, false);
+                _copyDressUpObj.setSceneObj(sceneCopyObject, false, false, null, false);
             }
             sceneCopyObject.SetActive(true);
             for (int i = 0; i < _dataManager.ThemeList.Count; i++)
@@ -327,6 +327,7 @@ namespace GFGGame
         private void UpdateNormal()
         {
             ItemUtil.UpdateTag(_ui.m_comTag, _dataManager.Tag);
+            ItemUtil.SetItemNeedNum(_ui.m_comCostCurrent.target, GlobalCfgArray.globalCfg.costIdBuyFreshTimes, GlobalCfgArray.globalCfg.costNumBuyFreshTimes);
             _ui.m_loaScore0.url = ResPathUtil.GetScorePath(_dataManager.ThemeList[0]);
             _ui.m_loaScore1.url = ResPathUtil.GetScorePath(_dataManager.ThemeList[1]);
             _ui.m_loaScore2.url = ResPathUtil.GetScorePath(_dataManager.ThemeList[2]);

GameClient/Assets/Game/HotUpdate/Views/Card/CardFosterView.cs

@@ -524,7 +524,11 @@ namespace GFGGame
         {
             CardStarCfg cardStarCfg = CardStarCfgArray.Instance.GetCfgBycardIdAndstarLvl(_cardData.id, _cardData.star);
 
-
+            if (cardStarCfg == null)
+            {
+                ET.Log.Error("卡牌：" + _cardData.id + "   无" + _cardData.star + "星升星配置");
+                return;
+            }
             if (CardDataManager.isFullStar(_cardData.id, _cardData.star, false))
             {
                 _comFosterBottom.m_ctrlFullStar.selectedIndex = 1;

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

@@ -97,11 +97,9 @@ namespace GFGGame
         protected override void AddEventListener()
         {
             base.AddEventListener();
-            // EventAgent.AddEventListener(ConstMessage.CARD_CHOOSE, StartCalculateScore);
             EventAgent.AddEventListener(ConstMessage.DRESS_FILTER, UpdatePartsListSort);
             EventAgent.AddEventListener(ConstMessage.DRESS_SEARCH, UpdatePartsListSort);
-            // EventAgent.AddEventListener(ConstMessage.DRESS_UP_SCORE_CHANGED, UpdateValueInfo);
-
+            EventAgent.AddEventListener(ConstMessage.CARD_SELECTED, UpdateValueInfo);
         }
         protected override void OnShown()
         {
@@ -166,10 +164,9 @@ namespace GFGGame
         protected override void RemoveEventListener()
         {
             base.RemoveEventListener();
-            // EventAgent.RemoveEventListener(ConstMessage.CARD_CHOOSE, StartCalculateScore);
             EventAgent.RemoveEventListener(ConstMessage.DRESS_FILTER, UpdatePartsListSort);
             EventAgent.RemoveEventListener(ConstMessage.DRESS_SEARCH, UpdatePartsListSort);
-            // EventAgent.RemoveEventListener(ConstMessage.DRESS_UP_SCORE_CHANGED, UpdateValueInfo);
+            EventAgent.AddEventListener(ConstMessage.CARD_SELECTED, UpdateValueInfo);
 
         }
         private void OnClickBtnBack()

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

@@ -534,6 +534,7 @@ namespace GFGGame
 
             UpdateListPartsSelected();
             UpdateListSuitPartsSelected();
+            UpdateScore();
             if (!CheckHasNeed())
             {
                 PromptController.Instance.ShowFloatTextPrompt("未拥有必需品");

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

@@ -13,6 +13,7 @@ namespace GFGGame
         private UI_StoryCardChooseUI _ui;
         private List<CardData> cardList = new List<CardData>();
         private static int _scoreType;
+        private int _cardId = 0;//记录打开界面时的竞技场卡牌id
 
         private List<GameObject> _effects = new List<GameObject>();
         private List<GoWrapper> _wrappers = new List<GoWrapper>();
@@ -56,7 +57,14 @@ namespace GFGGame
             cardList = FightDataManager.Instance.SortCardList(cardList, MyDressUpHelper.dressUpObj.itemList, _scoreType);
             _ui.m_listCard.numItems = cardList.Count;
             _ui.m_listCard.selectedIndex = 0;
+            if (InstanceZonesDataManager.FightScene == ConstInstanceZonesType.Arena)
+            {
+                ArenaDataManager dataManager = ArenaDataManager.Instance;
+                _cardId = dataManager.DressupList[dataManager.SelectThemeIndex].cardId;
+            }
+            OnCardSelected(cardList[0].id);
             UpdateView(0);
+
             Timers.inst.AddUpdate(CheckGuide);
         }
 
@@ -107,8 +115,16 @@ namespace GFGGame
         private void OnListCardItemClick(EventContext context)
         {
             UpdateView(_ui.m_listCard.selectedIndex);
+            OnCardSelected(cardList[_ui.m_listCard.selectedIndex].id);
         }
 
+        private void OnCardSelected(int cardId)
+        {
+            ArenaDataManager dataManager = ArenaDataManager.Instance;
+            dataManager.DressupList[dataManager.SelectThemeIndex].cardId = cardId;
+            dataManager.SetMineFightAttr(dataManager.DressupList[dataManager.SelectThemeIndex], dataManager.SelectThemeIndex);
+            EventAgent.DispatchEvent(ConstMessage.CARD_SELECTED);
+        }
         private void OnBtnComfirmClick()
         {
             int cardId = cardList[_ui.m_listCard.selectedIndex].id;
@@ -117,7 +133,10 @@ namespace GFGGame
             {
                 ArenaDataManager dataManager = ArenaDataManager.Instance;
                 ArenaSproxy.ReqChangeArenaDressup(dataManager.SelectThemeIndex, cardId, MyDressUpHelper.dressUpObj.itemList).Coroutine();
-
+                if (InstanceZonesDataManager.FightScene == ConstInstanceZonesType.Arena)
+                {
+                    ViewManager.GoBackFrom(typeof(ArenaDressUpFightView).FullName);
+                }
             }
             else
             {
@@ -131,6 +150,7 @@ namespace GFGGame
 
         private void OnBtnCancelClick()
         {
+            OnCardSelected(_cardId);
             this.Hide();
         }
         protected override void OnHide()
@@ -139,10 +159,7 @@ namespace GFGGame
             _ui.m_listCard.ScrollToView(0);
 
             Timers.inst.Remove(CheckGuide);
-            if (InstanceZonesDataManager.FightScene == ConstInstanceZonesType.Arena)
-            {
-                ViewManager.GoBackFrom(typeof(ArenaDressUpFightView).FullName);
-            }
+
         }
         private void CheckGuide(object param)
         {

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

@@ -148,7 +148,7 @@ namespace GFGGame
         private void SkillScoreStart(object param)
         {
             List<int> roundTimes = ScoreSystemData.Instance.GetRoundTime(roleData.cardId, roleData.skillLvs);
-            List<PassivitySkillLvlCfg> vaildSkills = ScoreSystemData.Instance.GetValidSkills(_currentTime, _partId, roleData.cardId, roleData.skillLvs, 0, null, roundTimes, null);
+            List<PassivitySkillLvlCfg> vaildSkills = ScoreSystemData.Instance.GetValidSkills(_currentTime, _partId, roleData.cardId, roleData.skillLvs, 0, null, roundTimes, new List<int>());
             ScoreSystemData.Instance.GetPartItemSkillScore(vaildSkills, _mainScore, 0, out _skillScore, out int _targetScore, out Dictionary<int, int> skillScoreDic);
             bool _showCard = ScoreSystemData.Instance.IsShowCard(InstanceZonesDataManager.currentCardId, vaildSkills);
             if (_showCard)

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

@@ -80,6 +80,7 @@ namespace GFGGame
             _ui.m_btnBack.onClick.Add(OnBtnBackClick);
             _ui.m_comClick.target.onClick.Add(PartScoreEnd);
             _ui.m_btnSpeedUp.onClick.Add(OnBtnSpeedUp);
+            _ui.m_btnSkip.onClick.Add(OnBtnSKip);
 
             _ui.m_comClick.m_comResult.m_t0.ignoreEngineTimeScale = false;
             _ui.m_comClick.m_comResult.m_t1.ignoreEngineTimeScale = false;
@@ -136,6 +137,7 @@ namespace GFGGame
             _ui.m_comAllPerfect.target.visible = false;
             _ui.m_LoaMask.visible = false;
             _ui.m_proScore.m_comBar.target.width = 0;
+            _ui.m_btnSkip.visible = InstanceZonesDataManager.FightScene == ConstInstanceZonesType.Arena;
 
 
             if (targetData.type == FightTargetType.PLAYER)
@@ -556,6 +558,14 @@ namespace GFGGame
 
             _ui.m_btnSpeedUp.title = "x" + FightDataManager.Instance.fightSpeed;
         }
+        private void OnBtnSKip()
+        {
+            if (InstanceZonesDataManager.FightScene == ConstInstanceZonesType.Arena)
+            {
+                ArenaDataManager.Instance.CurFightIndex = 2;
+                Skip();
+            }
+        }
         private void OnBtnBackClick()
         {
             InstanceZonesController.OnFinishStoryLevel(InstanceZonesDataManager.currentLevelCfgId, false, false);

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

@@ -86,17 +86,16 @@ namespace GFGGame
 
                 _sceneTargetObj.SetActive(true);
                 _sceneNpcObj.SetActive(false);
-                _targetDressUpObj.setSceneObj(_sceneTargetObj, true, false);
+                _targetDressUpObj.setSceneObj(_sceneTargetObj, true, false, null, false);
                 if (targetFightData.type == FightTargetType.ROBOT)
                 {
-                    _targetDressUpObj.PutOnSuitCfg(targetFightData.showSuitId, false, null, true, false);
+                    _targetDressUpObj.PutOnSuitCfg(targetFightData.showSuitId, false, new int[] { ConstDressUpItemType.BEI_JING }, true, false);
                 }
                 else
                 {
 
                     _targetDressUpObj.PutOnItemList(targetFightData.itemList);
                 }
-
                 MusicManager.Instance.Play(ResPathUtil.GetMusicPath("fight", "mp3"));
 
             }

GameClient/Assets/ResIn/UI/Main/Main_atlas0_8!a.png.meta

@@ -1,96 +0,0 @@
-fileFormatVersion: 2
-guid: 88ae8751cfbf4344aba88bd3c5d7837c
-TextureImporter:
-  internalIDToNameTable: []
-  externalObjects: {}
-  serializedVersion: 11
-  mipmaps:
-    mipMapMode: 0
-    enableMipMap: 0
-    sRGBTexture: 1
-    linearTexture: 0
-    fadeOut: 0
-    borderMipMap: 0
-    mipMapsPreserveCoverage: 0
-    alphaTestReferenceValue: 0.5
-    mipMapFadeDistanceStart: 1
-    mipMapFadeDistanceEnd: 3
-  bumpmap:
-    convertToNormalMap: 0
-    externalNormalMap: 0
-    heightScale: 0.25
-    normalMapFilter: 0
-  isReadable: 0
-  streamingMipmaps: 0
-  streamingMipmapsPriority: 0
-  vTOnly: 0
-  grayScaleToAlpha: 0
-  generateCubemap: 6
-  cubemapConvolution: 0
-  seamlessCubemap: 0
-  textureFormat: 1
-  maxTextureSize: 2048
-  textureSettings:
-    serializedVersion: 2
-    filterMode: 1
-    aniso: 1
-    mipBias: 0
-    wrapU: 1
-    wrapV: 1
-    wrapW: 1
-  nPOTScale: 0
-  lightmap: 0
-  compressionQuality: 50
-  spriteMode: 1
-  spriteExtrude: 1
-  spriteMeshType: 1
-  alignment: 0
-  spritePivot: {x: 0.5, y: 0.5}
-  spritePixelsToUnits: 100
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
-  spriteGenerateFallbackPhysicsShape: 1
-  alphaUsage: 1
-  alphaIsTransparency: 1
-  spriteTessellationDetail: -1
-  textureType: 8
-  textureShape: 1
-  singleChannelComponent: 0
-  flipbookRows: 1
-  flipbookColumns: 1
-  maxTextureSizeSet: 0
-  compressionQualitySet: 0
-  textureFormatSet: 0
-  ignorePngGamma: 0
-  applyGammaDecoding: 0
-  platformSettings:
-  - serializedVersion: 3
-    buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  spriteSheet:
-    serializedVersion: 2
-    sprites: []
-    outline: []
-    physicsShape: []
-    bones: []
-    spriteID: 5e97eb03825dee720800000000000000
-    internalID: 0
-    vertices: []
-    indices: 
-    edges: []
-    weights: []
-    secondaryTextures: []
-  spritePackingTag: 
-  pSDRemoveMatte: 0
-  pSDShowRemoveMatteOption: 0
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

GameClient/Assets/ResIn/UI/Main/Main_atlas0_8.png.meta

@@ -1,96 +0,0 @@
-fileFormatVersion: 2
-guid: d443b8f05835eb54499f0ff2477d90ce
-TextureImporter:
-  internalIDToNameTable: []
-  externalObjects: {}
-  serializedVersion: 11
-  mipmaps:
-    mipMapMode: 0
-    enableMipMap: 0
-    sRGBTexture: 1
-    linearTexture: 0
-    fadeOut: 0
-    borderMipMap: 0
-    mipMapsPreserveCoverage: 0
-    alphaTestReferenceValue: 0.5
-    mipMapFadeDistanceStart: 1
-    mipMapFadeDistanceEnd: 3
-  bumpmap:
-    convertToNormalMap: 0
-    externalNormalMap: 0
-    heightScale: 0.25
-    normalMapFilter: 0
-  isReadable: 0
-  streamingMipmaps: 0
-  streamingMipmapsPriority: 0
-  vTOnly: 0
-  grayScaleToAlpha: 0
-  generateCubemap: 6
-  cubemapConvolution: 0
-  seamlessCubemap: 0
-  textureFormat: 1
-  maxTextureSize: 2048
-  textureSettings:
-    serializedVersion: 2
-    filterMode: 1
-    aniso: 1
-    mipBias: 0
-    wrapU: 1
-    wrapV: 1
-    wrapW: 1
-  nPOTScale: 0
-  lightmap: 0
-  compressionQuality: 50
-  spriteMode: 1
-  spriteExtrude: 1
-  spriteMeshType: 1
-  alignment: 0
-  spritePivot: {x: 0.5, y: 0.5}
-  spritePixelsToUnits: 100
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
-  spriteGenerateFallbackPhysicsShape: 1
-  alphaUsage: 1
-  alphaIsTransparency: 1
-  spriteTessellationDetail: -1
-  textureType: 8
-  textureShape: 1
-  singleChannelComponent: 0
-  flipbookRows: 1
-  flipbookColumns: 1
-  maxTextureSizeSet: 0
-  compressionQualitySet: 0
-  textureFormatSet: 0
-  ignorePngGamma: 0
-  applyGammaDecoding: 0
-  platformSettings:
-  - serializedVersion: 3
-    buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  spriteSheet:
-    serializedVersion: 2
-    sprites: []
-    outline: []
-    physicsShape: []
-    bones: []
-    spriteID: 5e97eb03825dee720800000000000000
-    internalID: 0
-    vertices: []
-    indices: 
-    edges: []
-    weights: []
-    secondaryTextures: []
-  spritePackingTag: 
-  pSDRemoveMatte: 0
-  pSDShowRemoveMatteOption: 0
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: