Selaa lähdekoodia

替换进度条资源

zhaoyang 2 vuotta sitten
vanhempi
commit
71a6268bba
27 muutettua tiedostoa jossa 34 lisäystä ja 36 poistoa
  1. 4 5
      FGUIProject/assets/Launcher/LauncherUI.xml
  2. 5 5
      FGUIProject/assets/Launcher/components/ProgressBar2.xml
  3. BIN
      FGUIProject/assets/Launcher/images/di_1.png
  4. BIN
      FGUIProject/assets/Launcher/images/dljm_jdq_1.png
  5. BIN
      FGUIProject/assets/Launcher/images/dljm_jdq_2.png
  6. BIN
      FGUIProject/assets/Launcher/images/dljm_jdq_3.png
  7. BIN
      FGUIProject/assets/Launcher/images/dljm_jdq_4.png
  8. BIN
      FGUIProject/assets/Launcher/images/dljm_jdq_5.png
  9. BIN
      FGUIProject/assets/Launcher/images/jz_bar.png
  10. BIN
      FGUIProject/assets/Launcher/images/jz_bar_bg.png
  11. BIN
      FGUIProject/assets/Launcher/images/jz_bar_r.png
  12. 3 4
      FGUIProject/assets/Launcher/package.xml
  13. 4 7
      FGUIProject/assets/Loading/LoadingView.xml
  14. 6 5
      FGUIProject/assets/Loading/components/ProgressBar2.xml
  15. BIN
      FGUIProject/assets/Loading/images/dljm_jdq_1.png
  16. BIN
      FGUIProject/assets/Loading/images/dljm_jdq_2.png
  17. BIN
      FGUIProject/assets/Loading/images/dljm_jdq_3.png
  18. BIN
      FGUIProject/assets/Loading/images/dljm_jdq_4.png
  19. BIN
      FGUIProject/assets/Loading/images/dljm_jdq_5.png
  20. 3 0
      FGUIProject/assets/Loading/package.xml
  21. 4 4
      GameClient/Assets/Game/HotUpdate/Views/Loading/LoadingView.cs
  22. 5 6
      GameClient/Assets/Game/Launcher/Views/LauncherView.cs
  23. BIN
      GameClient/Assets/ResIn/UI/Loading/Loading_atlas0.png
  24. BIN
      GameClient/Assets/ResIn/UI/Loading/Loading_fui.bytes
  25. BIN
      GameClient/Assets/Resources/UI/Launcher/Launcher_atlas0!a.png
  26. BIN
      GameClient/Assets/Resources/UI/Launcher/Launcher_atlas0.png
  27. BIN
      GameClient/Assets/Resources/UI/Launcher/Launcher_fui.bytes

+ 4 - 5
FGUIProject/assets/Launcher/LauncherUI.xml

@@ -13,18 +13,17 @@
     <text id="n9_v0op" name="txtDescRight" xy="90,1840" size="900,44" visible="false" fontSize="32" color="#ffffff" align="center" autoSize="none" strokeColor="#333333" autoClearText="true" text="1/1">
       <relation target="" sidePair=""/>
     </text>
-    <component id="n15_slyz" name="progressBar1" src="slyzt" fileName="components/ProgressBar2.xml" xy="40,1625" size="1000,26">
+    <component id="n15_slyz" name="progressBar1" src="slyzt" fileName="components/ProgressBar2.xml" xy="100,1625">
       <relation target="" sidePair="center-center,bottom-bottom"/>
       <ProgressBar value="100" max="100"/>
     </component>
-    <graph id="n18_slyz" name="holder" xy="-90,1622" size="10,10">
+    <graph id="n18_slyz" name="holder" xy="-52,1626" size="10,10">
       <relation target="n16_slyz" sidePair="right-right,top-top"/>
     </graph>
-    <image id="n16_slyz" name="imgAni" src="slyzp" fileName="images/dljm_chuan.png" xy="-70,1597">
+    <image id="n16_slyz" name="imgAni" src="pac9tjn" fileName="images/dljm_jdq_3.png" xy="100,1638" pivot="0.55,0.549" anchor="true">
       <relation target="n15_slyz" sidePair="bottom-bottom"/>
     </image>
-    <image id="n14_slyz" name="n14" src="slyzq" fileName="images/dljm_jdk.png" xy="210,1723" group="n17_slyz"/>
-    <text id="n3_l55o" name="txtDescLeft" xy="90,1722" size="900,44" group="n17_slyz" fontSize="25" color="#d8c584" align="center" autoSize="none" strokeColor="#333333" text="启动中...">
+    <text id="n3_l55o" name="txtDescLeft" xy="90,1722" size="900,44" group="n17_slyz" fontSize="32" color="#ffffff" align="center" autoSize="none" text="启动中...">
       <relation target="" sidePair=""/>
     </text>
     <group id="n17_slyz" name="n17" xy="90,1722" size="900,44" advanced="true">

+ 5 - 5
FGUIProject/assets/Launcher/components/ProgressBar2.xml

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="1000,26" extention="ProgressBar">
+<component size="919,26" extention="ProgressBar">
   <displayList>
-    <image id="n0_slyz" name="n0" src="slyzr" fileName="images/dljm_jdq_1.png" xy="0,0" size="1000,26">
-      <relation target="" sidePair="width-width,height-height"/>
-    </image>
-    <image id="n1_slyz" name="bar" src="slyzo" fileName="images/dljm_jdq_2.png" xy="38,7" fillMethod="hz">
+    <image id="n0_slyz" name="n0" src="slyzr" fileName="images/dljm_jdq_1.png" xy="0,1"/>
+    <image id="n1_slyz" name="bar" src="slyzo" fileName="images/dljm_jdq_2.png" xy="4,4" fillMethod="hz">
       <relation target="" sidePair="width-width"/>
     </image>
+    <image id="n3_pac9" name="n3" src="pac9tjp" fileName="images/dljm_jdq_5.png" xy="-15,0"/>
+    <image id="n4_pac9" name="n4" src="pac9tjo" fileName="images/dljm_jdq_4.png" xy="-50,-80"/>
   </displayList>
   <ProgressBar/>
 </component>

BIN
FGUIProject/assets/Launcher/images/di_1.png


BIN
FGUIProject/assets/Launcher/images/dljm_jdq_1.png


BIN
FGUIProject/assets/Launcher/images/dljm_jdq_2.png


BIN
FGUIProject/assets/Launcher/images/dljm_jdq_3.png


BIN
FGUIProject/assets/Launcher/images/dljm_jdq_4.png


BIN
FGUIProject/assets/Launcher/images/dljm_jdq_5.png


BIN
FGUIProject/assets/Launcher/images/jz_bar.png


BIN
FGUIProject/assets/Launcher/images/jz_bar_bg.png


BIN
FGUIProject/assets/Launcher/images/jz_bar_r.png


+ 3 - 4
FGUIProject/assets/Launcher/package.xml

@@ -6,14 +6,10 @@
     <image id="l55o4" name="p3_png.png" path="/images/"/>
     <component id="l55o5" name="ProgressBar1.xml" path="/components/"/>
     <image id="ul4p6" name="jz_tu.jpg" path="/imagesExport/" exported="true" atlas="alone_npot"/>
-    <image id="ul4p7" name="jz_bar_bg.png" path="/images/" scale="9grid" scale9grid="22,20,5,3"/>
-    <image id="ul4p8" name="jz_bar_r.png" path="/images/"/>
-    <image id="ul4p9" name="jz_bar.png" path="/images/" scale="9grid" scale9grid="8,4,16,8"/>
     <image id="lqt1a" name="LOGO.png" path="/imagesExport/" exported="true"/>
     <component id="k0v5b" name="LauncherAlertUI.xml" path="/" exported="true"/>
     <image id="k0v5f" name="ANNIU_1.png" path="/images/"/>
     <image id="k0v5g" name="ANNIU_2.png" path="/images/" scale="9grid" scale9grid="51,27,231,54"/>
-    <image id="k0v5h" name="di_1.png" path="/images/" scale="9grid" scale9grid="22,22,44,44" gridTile="16"/>
     <component id="k0v5i" name="Button1.xml" path="/components/"/>
     <component id="k0v5j" name="Button2.xml" path="/components/"/>
     <image id="wgy9k" name="hc_kuang_6.png" path="/images/" scale="9grid" scale9grid="49,57,16,10"/>
@@ -36,6 +32,9 @@
     <component id="dhoax" name="Button19.xml" path="/components/" exported="true"/>
     <image id="dhoay" name="anniuty.png" path="/images/" exported="true"/>
     <image id="dhoaz" name="anniuty3.png" path="/images/" exported="true"/>
+    <image id="pac9tjn" name="dljm_jdq_3.png" path="/images/"/>
+    <image id="pac9tjo" name="dljm_jdq_4.png" path="/images/"/>
+    <image id="pac9tjp" name="dljm_jdq_5.png" path="/images/"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\Resources\UI\Launcher" packageCount="2" genCode="true" codePath="..\GameClient\Assets\Game\Launcher\FairyGUI\GenCode\" extractAlpha="true"/>
 </packageDescription>

+ 4 - 7
FGUIProject/assets/Loading/LoadingView.xml

@@ -4,18 +4,15 @@
     <loader id="n9_gbqo" name="loaBg" xy="540,960" pivot="0.5,0.5" anchor="true" size="1080,2400" fill="scaleMatchWidth">
       <relation target="" sidePair="width-width,height-height,center-center,middle-middle"/>
     </loader>
-    <component id="n3_hibu" name="progressBar1" src="hibu3" fileName="components/ProgressBar2.xml" xy="40,1626" size="1000,26">
+    <component id="n3_hibu" name="progressBar1" src="hibu3" fileName="components/ProgressBar2.xml" xy="100,1626">
       <relation target="" sidePair="center-center,bottom-bottom"/>
       <ProgressBar max="100"/>
     </component>
-    <graph id="n4_hibu" name="holder" xy="-90,1622" size="10,10">
-      <relation target="n5_hibu" sidePair="right-right,top-top"/>
-    </graph>
-    <image id="n5_hibu" name="imgAni" src="hibu6" fileName="images/dljm_chuan.png" xy="-70,1597">
+    <graph id="n4_hibu" name="holder" xy="-90,1622" size="10,10"/>
+    <image id="n10_pac9" name="imgAni" src="pac9a" fileName="images/dljm_jdq_3.png" xy="100,1638" pivot="0.55,0.549" anchor="true">
       <relation target="n3_hibu" sidePair="bottom-bottom"/>
     </image>
-    <image id="n6_hibu" name="n6" src="hibu7" fileName="images/dljm_jdk.png" xy="210,1723" group="n8_hibu"/>
-    <text id="n7_hibu" name="txtDescLeft" xy="90,1722" size="900,44" group="n8_hibu" fontSize="25" color="#d8c584" align="center" autoSize="none" text="启动中...">
+    <text id="n7_hibu" name="txtDescLeft" xy="90,1722" size="900,44" group="n8_hibu" fontSize="32" color="#585d76" align="center" autoSize="none" text="启动中...">
       <relation target="" sidePair=""/>
     </text>
     <group id="n8_hibu" name="n8" xy="90,1722" size="900,44" advanced="true">

+ 6 - 5
FGUIProject/assets/Loading/components/ProgressBar2.xml

@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="1000,26" extention="ProgressBar">
+<component size="919,26" extention="ProgressBar">
   <displayList>
-    <image id="n0_slyz" name="n0" src="hibu4" fileName="images/dljm_jdq_1.png" xy="0,0" size="1000,26">
-      <relation target="" sidePair="width-width,height-height"/>
-    </image>
-    <image id="n1_slyz" name="bar" src="hibu5" fileName="images/dljm_jdq_2.png" xy="38,7" fillMethod="hz">
+    <image id="n2_pac9" name="n2" src="hibu4" fileName="images/dljm_jdq_1.png" xy="0,1" group="n6_pac9"/>
+    <image id="n3_pac9" name="bar" src="hibu5" fileName="images/dljm_jdq_2.png" xy="4,4" group="n6_pac9" fillMethod="hz">
       <relation target="" sidePair="width-width"/>
     </image>
+    <image id="n4_pac9" name="n4" src="pac98" fileName="images/dljm_jdq_5.png" xy="-15,0" group="n6_pac9"/>
+    <image id="n5_pac9" name="n5" src="pac99" fileName="images/dljm_jdq_4.png" xy="-50,-80" group="n6_pac9"/>
+    <group id="n6_pac9" name="n6" xy="-50,-80" size="985,156"/>
   </displayList>
   <ProgressBar/>
 </component>

BIN
FGUIProject/assets/Loading/images/dljm_jdq_1.png


BIN
FGUIProject/assets/Loading/images/dljm_jdq_2.png


BIN
FGUIProject/assets/Loading/images/dljm_jdq_3.png


BIN
FGUIProject/assets/Loading/images/dljm_jdq_4.png


BIN
FGUIProject/assets/Loading/images/dljm_jdq_5.png


+ 3 - 0
FGUIProject/assets/Loading/package.xml

@@ -7,6 +7,9 @@
     <image id="hibu5" name="dljm_jdq_2.png" path="/images/"/>
     <image id="hibu6" name="dljm_chuan.png" path="/images/"/>
     <image id="hibu7" name="dljm_jdk.png" path="/images/"/>
+    <image id="pac98" name="dljm_jdq_5.png" path="/images/"/>
+    <image id="pac99" name="dljm_jdq_4.png" path="/images/"/>
+    <image id="pac9a" name="dljm_jdq_3.png" path="/images/"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\Loading" packageCount="2" genCode="true"/>
 </packageDescription>

+ 4 - 4
GameClient/Assets/Game/HotUpdate/Views/Loading/LoadingView.cs

@@ -111,8 +111,8 @@ namespace GFGGame
             if (progress < oldValule)
             {
                 _ui.m_progressBar1.value = progress;
-                float posX = _ui.m_progressBar1.width * (progress / 100) - 70;
-                _ui.m_imgAni.x = Mathf.Min(posX, _ui.target.width - _ui.m_imgAni.width - 70);
+                float posX = _ui.m_progressBar1.width * (progress / 100) + _ui.m_progressBar1.x;
+                _ui.m_imgAni.x = Mathf.Min(posX, _ui.m_progressBar1.width + _ui.m_progressBar1.x);
                 callback?.Invoke();
             }
             else
@@ -120,8 +120,8 @@ namespace GFGGame
                 float duration = (float)(progress - oldValule) * SPEED;
                 GTweener gtweener = _ui.m_progressBar1.TweenValue(progress, duration).OnUpdate((GTweener t) =>
                 {
-                    float posX = _ui.m_progressBar1.width * (t.value.x / 100) - 70;
-                    _ui.m_imgAni.x = Mathf.Min(posX, _ui.target.width - _ui.m_imgAni.width - 70);
+                    float posX = _ui.m_progressBar1.width * (t.value.x / 100) + _ui.m_progressBar1.x;
+                    _ui.m_imgAni.x = Mathf.Min(posX, _ui.m_progressBar1.width + _ui.m_progressBar1.x);
 
                 });
                 if (callback != null)

+ 5 - 6
GameClient/Assets/Game/Launcher/Views/LauncherView.cs

@@ -25,7 +25,7 @@ namespace GFGGame
         private UI_LauncherUI _ui;
         private GameObject _gameObject;
         private GoWrapper _wrapper;
-
+        private string[] resNames = { "11", "33" };
         /// <summary>
         /// 每1%耗时,单位秒
         /// </summary>
@@ -80,7 +80,6 @@ namespace GFGGame
             _gameObject.transform.localScale = new Vector3(100, 100, 100);
             _wrapper = new GoWrapper(_gameObject);
             _ui.m_holder.SetNativeObject(_wrapper);
-
         }
 
         /// <summary>
@@ -136,8 +135,8 @@ namespace GFGGame
             if (progress < oldValule)
             {
                 _ui.m_progressBar1.value = progress;
-                float posX = _ui.m_progressBar1.width * (progress / 100) - 70;
-                _ui.m_imgAni.x = Mathf.Min(posX, _ui.target.width - _ui.m_imgAni.width - 70);
+                float posX = _ui.m_progressBar1.width * (progress / 100) + _ui.m_progressBar1.x;
+                _ui.m_imgAni.x = Mathf.Min(posX, _ui.m_progressBar1.width + _ui.m_progressBar1.x);
                 callback?.Invoke();
             }
             else
@@ -146,8 +145,8 @@ namespace GFGGame
                 float duration = (float)(progress - oldValule) * SPEED;
                 GTweener gtweener = _ui.m_progressBar1.TweenValue(progress, duration).OnUpdate((GTweener t) =>
                 {
-                    float posX = _ui.m_progressBar1.width * (t.value.x / 100) - 70;
-                    _ui.m_imgAni.x = Mathf.Min(posX, _ui.target.width - _ui.m_imgAni.width - 70);
+                    float posX = _ui.m_progressBar1.width * (t.value.x / 100) + _ui.m_progressBar1.x;
+                    _ui.m_imgAni.x = Mathf.Min(posX, _ui.m_progressBar1.width + _ui.m_progressBar1.x);
 
                 });
                 if (callback != null)

BIN
GameClient/Assets/ResIn/UI/Loading/Loading_atlas0.png


BIN
GameClient/Assets/ResIn/UI/Loading/Loading_fui.bytes


BIN
GameClient/Assets/Resources/UI/Launcher/Launcher_atlas0!a.png


BIN
GameClient/Assets/Resources/UI/Launcher/Launcher_atlas0.png


BIN
GameClient/Assets/Resources/UI/Launcher/Launcher_fui.bytes