zhaoyang 2 роки тому
батько
коміт
ef922262d5
29 змінених файлів з 16 додано та 15 видалено
  1. 1 0
      FGUIProject/assets/Main/FontNew/Font_Result.fnt
  2. 2 2
      FGUIProject/assets/Main/components/ComResult.xml
  3. 10 10
      FGUIProject/assets/Main/package.xml
  4. 1 1
      GameClient/Assets/Game/HotUpdate/Data/FightDataManager.cs
  5. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0!a.png
  6. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0.png
  7. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_1!a.png
  8. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_1.png
  9. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_2!a.png
  10. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_2.png
  11. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_3!a.png
  12. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_3.png
  13. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_4!a.png
  14. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_4.png
  15. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_5!a.png
  16. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_5.png
  17. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_6!a.png
  18. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_6.png
  19. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_7!a.png
  20. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_7.png
  21. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_8!a.png
  22. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_8.png
  23. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_9!a.png
  24. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_9.png
  25. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas10!a.png
  26. 1 1
      GameClient/Assets/ResIn/UI/Main/Main_atlas10!a.png.meta
  27. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas10.png
  28. 1 1
      GameClient/Assets/ResIn/UI/Main/Main_atlas10.png.meta
  29. BIN
      GameClient/Assets/ResIn/UI/Main/Main_fui.bytes

+ 1 - 0
FGUIProject/assets/Main/FontNew/Font_Result.fnt

@@ -1,3 +1,4 @@
+info size=56 colored=false
 char id=48 img=qkjslx xoffset=0 yoffset=0 xadvance=0
 char id=49 img=qkjsly xoffset=0 yoffset=0 xadvance=0
 char id=50 img=qkjslz xoffset=0 yoffset=0 xadvance=0

+ 2 - 2
FGUIProject/assets/Main/components/ComResult.xml

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="983,374" pivot="0.5,0" anchor="true" overflow="hidden">
-  <controller name="c1" pages="0,,1,,2,,3," selected="3"/>
+  <controller name="c1" pages="0,,1,,2,,3," selected="0"/>
   <displayList>
     <graph id="n22_fqor" name="holderScore" xy="560,186" size="1,1" visible="false" type="rect"/>
     <image id="n17_qkjs" name="n17" src="qkjsk7" fileName="imagesNew/result.png" xy="477,159" visible="false"/>
-    <text id="n14_wono" name="txtScore" xy="594,158" size="104,60" visible="false" font="ui://mfvz4q8kqkjsnx" fontSize="40" color="#ecf6fc" letterSpacing="-10" singleLine="true" text="666">
+    <text id="n14_wono" name="txtScore" xy="594,158" size="134,60" visible="false" font="ui://mfvz4q8kqkjsnx" fontSize="40" color="#ecf6fc" letterSpacing="-10" singleLine="true" text="1111">
       <gearColor controller="c1" pages="0" values="#ecf6fc,#749dc8" default="#ecf6fc,#c49a49"/>
     </text>
     <graph id="n18_fqor" name="holderResult0" xy="184,186" size="2,2" visible="false" type="rect">

+ 10 - 10
FGUIProject/assets/Main/package.xml

@@ -538,11 +538,11 @@
     <image id="qkjslu" name="font_prefect_6.png" path="/FontNew/"/>
     <image id="qkjslv" name="font_prefect_8.png" path="/FontNew/"/>
     <image id="qkjslw" name="font_prefect_9.png" path="/FontNew/"/>
-    <image id="qkjslx" name="font_result_0.png" path="/FontNew/"/>
-    <image id="qkjsly" name="font_result_1.png" path="/FontNew/"/>
-    <image id="qkjslz" name="font_result_2.png" path="/FontNew/"/>
-    <image id="qkjsm0" name="font_result_3.png" path="/FontNew/"/>
-    <image id="qkjsm1" name="font_result_4.png" path="/FontNew/"/>
+    <image id="qkjslx" name="font_result_0.png" path="/FontNew/" atlas="10"/>
+    <image id="qkjsly" name="font_result_1.png" path="/FontNew/" atlas="10"/>
+    <image id="qkjslz" name="font_result_2.png" path="/FontNew/" atlas="10"/>
+    <image id="qkjsm0" name="font_result_3.png" path="/FontNew/" atlas="10"/>
+    <image id="qkjsm1" name="font_result_4.png" path="/FontNew/" atlas="10"/>
     <image id="qkjsm2" name="font_prefect_7.png" path="/FontNew/"/>
     <image id="qkjsm3" name="font_great_9.png" path="/FontNew/"/>
     <image id="qkjsm4" name="font_great_8.png" path="/FontNew/"/>
@@ -564,10 +564,10 @@
     <image id="qkjsmk" name="font_great_4.png" path="/FontNew/"/>
     <image id="qkjsml" name="font_great_5.png" path="/FontNew/"/>
     <image id="qkjsmm" name="font_great_6.png" path="/FontNew/"/>
-    <image id="qkjsmn" name="font_result_5.png" path="/FontNew/"/>
+    <image id="qkjsmn" name="font_result_5.png" path="/FontNew/" atlas="10"/>
     <image id="qkjsmo" name="font_zdqp_6.png" path="/FontNew/"/>
-    <image id="qkjsmp" name="font_result_6.png" path="/FontNew/"/>
-    <image id="qkjsmq" name="font_result_8.png" path="/FontNew/"/>
+    <image id="qkjsmp" name="font_result_6.png" path="/FontNew/" atlas="10"/>
+    <image id="qkjsmq" name="font_result_8.png" path="/FontNew/" atlas="10"/>
     <image id="qkjsmr" name="font_zdka_0.png" path="/FontNew/"/>
     <image id="qkjsms" name="font_zdka_1.png" path="/FontNew/"/>
     <image id="qkjsmt" name="font_zdka_2.png" path="/FontNew/"/>
@@ -587,7 +587,7 @@
     <image id="qkjsn8" name="font_zdjs_8.png" path="/FontNew/"/>
     <image id="qkjsn9" name="font_zdjs_7.png" path="/FontNew/"/>
     <image id="qkjsna" name="font_zdjs_6.png" path="/FontNew/"/>
-    <image id="qkjsnb" name="font_result_9.png" path="/FontNew/"/>
+    <image id="qkjsnb" name="font_result_9.png" path="/FontNew/" atlas="10"/>
     <image id="qkjsnc" name="font_score_0.png" path="/FontNew/"/>
     <image id="qkjsnd" name="font_score_1.png" path="/FontNew/"/>
     <image id="qkjsne" name="font_score_2.png" path="/FontNew/"/>
@@ -604,7 +604,7 @@
     <image id="qkjsnp" name="font_zdjs_3.png" path="/FontNew/"/>
     <image id="qkjsnq" name="font_zdjs_4.png" path="/FontNew/"/>
     <image id="qkjsnr" name="font_zdjs_5.png" path="/FontNew/"/>
-    <image id="qkjsns" name="font_result_7.png" path="/FontNew/"/>
+    <image id="qkjsns" name="font_result_7.png" path="/FontNew/" atlas="10"/>
     <font id="qkjsnu" name="Font_Fail.fnt" path="/FontNew/" exported="true"/>
     <font id="qkjsnv" name="Font_Great.fnt" path="/FontNew/" exported="true"/>
     <font id="qkjsnw" name="Font_Prefect.fnt" path="/FontNew/" exported="true"/>

+ 1 - 1
GameClient/Assets/Game/HotUpdate/Data/FightDataManager.cs

@@ -89,7 +89,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
         {

BIN
GameClient/Assets/ResIn/UI/Main/Main_atlas0!a.png


BIN
GameClient/Assets/ResIn/UI/Main/Main_atlas0.png


BIN
GameClient/Assets/ResIn/UI/Main/Main_atlas0_1!a.png


BIN
GameClient/Assets/ResIn/UI/Main/Main_atlas0_1.png


BIN
GameClient/Assets/ResIn/UI/Main/Main_atlas0_2!a.png


BIN
GameClient/Assets/ResIn/UI/Main/Main_atlas0_2.png


BIN
GameClient/Assets/ResIn/UI/Main/Main_atlas0_3!a.png


BIN
GameClient/Assets/ResIn/UI/Main/Main_atlas0_3.png


BIN
GameClient/Assets/ResIn/UI/Main/Main_atlas0_4!a.png


BIN
GameClient/Assets/ResIn/UI/Main/Main_atlas0_4.png


BIN
GameClient/Assets/ResIn/UI/Main/Main_atlas0_5!a.png


BIN
GameClient/Assets/ResIn/UI/Main/Main_atlas0_5.png


BIN
GameClient/Assets/ResIn/UI/Main/Main_atlas0_6!a.png


BIN
GameClient/Assets/ResIn/UI/Main/Main_atlas0_6.png


BIN
GameClient/Assets/ResIn/UI/Main/Main_atlas0_7!a.png


BIN
GameClient/Assets/ResIn/UI/Main/Main_atlas0_7.png


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


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


BIN
GameClient/Assets/ResIn/UI/Main/Main_atlas0_9!a.png


BIN
GameClient/Assets/ResIn/UI/Main/Main_atlas0_9.png


BIN
GameClient/Assets/ResIn/UI/Main/Main_atlas10!a.png


+ 1 - 1
GameClient/Assets/ResIn/UI/Main/Main_atlas0_9!a.png.meta → GameClient/Assets/ResIn/UI/Main/Main_atlas10!a.png.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 5693a3c31479518409027f70f9fae4a3
+guid: 0e9819f43ba742e44b7ddede28b4a9e4
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}

BIN
GameClient/Assets/ResIn/UI/Main/Main_atlas10.png


+ 1 - 1
GameClient/Assets/ResIn/UI/Main/Main_atlas0_9.png.meta → GameClient/Assets/ResIn/UI/Main/Main_atlas10.png.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 8fbfdfb83d755254bb0147d894b2f1cc
+guid: b56b8942b6d3d4744bed73499611cf37
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}

BIN
GameClient/Assets/ResIn/UI/Main/Main_fui.bytes