zhaoyang 2 жил өмнө
parent
commit
42761d2b5d

+ 24 - 24
FGUIProject/assets/Arena/ArenaUI.xml

@@ -9,7 +9,7 @@
     <image id="n48_jcej" name="n48" src="jcej39" fileName="images/jzsjzs_kddi.png" xy="746,1679" pivot="0.5,0.5" scale="-1,-1">
       <relation target="" sidePair="bottom-bottom"/>
     </image>
-    <component id="n0_psph" name="btnBack" src="9xlo8" fileName="components/BtnBack.xml" pkg="eg2y0ldp" xy="33,80" group="n28_psph"/>
+    <component id="n0_psph" name="btnBack" src="9xlo8" fileName="components/BtnBack.xml" pkg="eg2y0ldp" xy="35,80" group="n28_psph"/>
     <component id="n1_psph" name="valueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="0,85" group="n28_psph" controller="c1,12"/>
     <image id="n37_jcej" name="n37" src="jcej3d" fileName="images/jzsjzs_bzztzt.png" xy="358,154" group="n28_psph"/>
     <component id="n25_psph" name="comTheme" src="t6j15b" fileName="components/ComTheme.xml" xy="354,276" group="n28_psph"/>
@@ -43,38 +43,38 @@
       <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="33,1454" group="n46_jcej"/>
-    <image id="n44_jcej" name="n44" src="jcej32" fileName="images/jzsjzs_xtxt_1.png" xy="178,1510" group="n46_jcej"/>
-    <loader id="n2_psph" name="loaDanIcon" xy="25,1448" size="172,172" group="n46_jcej" aspect="true" url="ui://4lc5fhlbe0505d" fill="scale"/>
-    <text id="n7_psph" name="txtName" xy="184,1472" size="122,41" group="n46_jcej" fontSize="30" color="#9a7c56" text="自己名字"/>
-    <text id="n9_psph" name="txtDanTitle" xy="184,1518" size="90,31" group="n46_jcej" fontSize="22" color="#9a7c56" text="段位名称"/>
-    <text id="n8_psph" name="txtRank" xy="184,1550" size="90,31" group="n46_jcej" fontSize="22" color="#9a7c56" text="段位排名"/>
-    <text id="n10_psph" name="txtFightScore" xy="184,1581" size="132,31" group="n46_jcej" fontSize="22" color="#9a7c56" text="竞技战力6666"/>
-    <component id="n45_jcej" name="btnFightScoreRule" src="psphtkg" fileName="components/BtnRule.xml" pkg="eg2y0ldp" xy="156,1584" size="29,29" group="n46_jcej">
+    <image id="n43_jcej" name="n43" src="jcej37" fileName="images/jzsjzs_mpmpdi.png" xy="33,1446" group="n46_jcej"/>
+    <image id="n44_jcej" name="n44" src="jcej32" fileName="images/jzsjzs_xtxt_1.png" xy="178,1502" group="n46_jcej"/>
+    <loader id="n2_psph" name="loaDanIcon" xy="25,1440" size="172,172" group="n46_jcej" aspect="true" url="ui://4lc5fhlbe0505d" fill="scale"/>
+    <text id="n7_psph" name="txtName" xy="184,1464" size="122,41" group="n46_jcej" fontSize="30" color="#9a7c56" text="自己名字"/>
+    <text id="n9_psph" name="txtDanTitle" xy="184,1510" size="90,31" group="n46_jcej" fontSize="22" color="#9a7c56" text="段位名称"/>
+    <text id="n8_psph" name="txtRank" xy="184,1542" size="90,31" group="n46_jcej" fontSize="22" color="#9a7c56" text="段位排名"/>
+    <text id="n10_psph" name="txtFightScore" xy="184,1573" size="132,31" group="n46_jcej" fontSize="22" color="#9a7c56" text="竞技战力6666"/>
+    <component id="n45_jcej" name="btnFightScoreRule" src="psphtkg" fileName="components/BtnRule.xml" pkg="eg2y0ldp" xy="156,1576" 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="135,1401" group="n46_jcej">
+    <component id="n54_jcej" name="comFightScore" src="jcej4q" fileName="components/ComFightScore.xml" xy="135,1393" group="n46_jcej">
       <gearDisplay controller="c2" pages="1"/>
     </component>
-    <group id="n46_jcej" name="grpMyInfo" xy="25,1401" size="475,227" group="n20_psph"/>
-    <text id="n14_psph" name="txtMoneyCount" xy="790,1574" pivot="0.5,0" size="266,34" group="n20_psph" 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="756,1613" pivot="0.5,0" group="n51_jcej" scale="-1,1"/>
-    <component id="n17_psph" name="btnAddFightCount" src="psph1j" fileName="components/BtnRefresh.xml" xy="753,1616" group="n51_jcej">
+    <group id="n46_jcej" name="grpMyInfo" xy="25,1393" size="475,227" group="n20_psph"/>
+    <text id="n14_psph" name="txtMoneyCount" xy="790,1566" pivot="0.5,0" size="266,34" group="n20_psph" 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="756,1605" pivot="0.5,0" group="n51_jcej" scale="-1,1"/>
+    <component id="n17_psph" name="btnAddFightCount" src="psph1j" fileName="components/BtnRefresh.xml" xy="753,1608" group="n51_jcej">
       <Button icon="ui://4lc5fhlbjcej3a"/>
     </component>
-    <text id="n15_psph" name="txtFightCount" xy="815,1617" size="223,41" group="n51_jcej" fontSize="30" color="#fbf6ed" align="center" text="剩余次数:10/10"/>
-    <group id="n51_jcej" name="n51" xy="753,1613" size="356,48" group="n20_psph"/>
-    <text id="n16_psph" name="txtRefreshCount" xy="815,1683" size="223,41" group="n49_jcej" fontSize="30" color="#fbf6ed" align="center" text="免费刷新:10/10"/>
-    <component id="n19_psph" name="btnRefresh" src="psph1j" fileName="components/BtnRefresh.xml" xy="753,1682" group="n49_jcej"/>
-    <component id="n18_psph" name="comCostCurrent" src="jcej3y" fileName="components/ComCostCurrency.xml" xy="851,1680" size="156,46" group="n49_jcej"/>
-    <group id="n49_jcej" name="n49" xy="753,1680" size="285,46" group="n20_psph"/>
-    <component id="n13_psph" name="btnQuickFight" src="jcejtkk" fileName="components/Button17.xml" pkg="eg2y0ldp" xy="418,1565" group="n20_psph">
+    <text id="n15_psph" name="txtFightCount" xy="815,1609" size="223,41" group="n51_jcej" fontSize="30" color="#fbf6ed" align="center" text="剩余次数:10/10"/>
+    <group id="n51_jcej" name="n51" xy="753,1605" size="356,48" group="n20_psph"/>
+    <text id="n16_psph" name="txtRefreshCount" xy="815,1675" size="223,41" group="n49_jcej" fontSize="30" color="#fbf6ed" align="center" text="免费刷新:10/10"/>
+    <component id="n19_psph" name="btnRefresh" src="psph1j" fileName="components/BtnRefresh.xml" xy="753,1674" group="n49_jcej"/>
+    <component id="n18_psph" name="comCostCurrent" src="jcej3y" fileName="components/ComCostCurrency.xml" xy="851,1672" size="156,46" group="n49_jcej"/>
+    <group id="n49_jcej" name="n49" xy="753,1672" size="285,46" group="n20_psph"/>
+    <component id="n13_psph" name="btnQuickFight" src="jcejtkk" fileName="components/Button17.xml" pkg="eg2y0ldp" xy="418,1537" group="n20_psph">
       <Button title="快速挑战"/>
     </component>
-    <component id="n6_psph" name="btnShop" src="psph1g" fileName="components/BtnRecord.xml" xy="78,1667" size="209,61" group="n20_psph" aspect="true">
+    <component id="n6_psph" name="btnShop" src="psph1g" fileName="components/BtnRecord.xml" xy="78,1659" 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="359,1635" group="n20_psph" aspect="true">
+    <component id="n11_psph" name="btnDress" src="oqa1tjt" fileName="components/Button21.xml" pkg="mk0fwx0x" xy="359,1627" group="n20_psph" aspect="true">
       <Button title="我的搭配"/>
     </component>
     <component id="n4_psph" name="btnReward" src="psph1g" fileName="components/BtnRecord.xml" xy="77,1760" size="209,61" group="n20_psph" aspect="true">
@@ -86,7 +86,7 @@
     <component id="n3_psph" name="btnRecord" src="psph1g" fileName="components/BtnRecord.xml" xy="793,1760" size="209,61" group="n20_psph" aspect="true">
       <Button title="比拼记录"/>
     </component>
-    <group id="n20_psph" name="grpBottom" xy="25,1401" size="1084,420" advanced="true">
+    <group id="n20_psph" name="grpBottom" xy="25,1393" size="1084,428" advanced="true">
       <relation target="" sidePair="center-center,bottom-bottom"/>
     </group>
   </displayList>

+ 1 - 1
GameClient/Assets/Editor/ToolsMenu.cs

@@ -281,7 +281,7 @@ namespace GFGEditor
 
             FileUtil.DeleteUnnecessaryImage(ImportArtResTool.MaterialTargetPath, new string[] { ImportArtResTool.EffectMaterialMd5FileSaveName });
             FileUtil.DeleteUnnecessaryImage(ImportArtResTool.ShaderTargetPath, new string[] { ImportArtResTool.ShaderMd5FileSaveName });
-            FileUtil.DeleteUnnecessaryImage(ImportArtResTool.ModelTargetPath, new string[] { ImportArtResTool.ModelTargetPath });
+            // FileUtil.DeleteUnnecessaryImage(ImportArtResTool.ModelTargetPath, new string[] { ImportArtResTool.ModelTargetPath });
 
             FileUtil.DeleteUnnecessaryImage(ImportArtResTool.TextureTargetPath, new string[] { ImportArtResTool.EffectTextureMd5FileSaveName });
 

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