zhaoyang 3 жил өмнө
parent
commit
a82428388e

+ 2 - 2
FGUIProject/assets/Launcher/LauncherUI.xml

@@ -20,10 +20,10 @@
       <relation target="" sidePair="center-center,bottom-bottom"/>
       <relation target="" sidePair="center-center,bottom-bottom"/>
       <ProgressBar value="100" max="100"/>
       <ProgressBar value="100" max="100"/>
     </component>
     </component>
-    <graph id="n18_slyz" name="holder" xy="-140,1620" size="10,10">
+    <graph id="n18_slyz" name="holder" xy="-90,1622" size="10,10">
       <relation target="n16_slyz" sidePair="right-right,top-top"/>
       <relation target="n16_slyz" sidePair="right-right,top-top"/>
     </graph>
     </graph>
-    <image id="n16_slyz" name="imgAni" src="slyzp" fileName="images/dljm_chuan.png" xy="-120,1595">
+    <image id="n16_slyz" name="imgAni" src="slyzp" fileName="images/dljm_chuan.png" xy="-70,1597">
       <relation target="n15_slyz" sidePair="bottom-bottom"/>
       <relation target="n15_slyz" sidePair="bottom-bottom"/>
     </image>
     </image>
     <image id="n14_slyz" name="n14" src="slyzq" fileName="images/dljm_jdk.png" xy="210,1723" group="n17_slyz"/>
     <image id="n14_slyz" name="n14" src="slyzq" fileName="images/dljm_jdk.png" xy="210,1723" group="n17_slyz"/>

+ 2 - 2
FGUIProject/assets/Loading/LoadingView.xml

@@ -8,10 +8,10 @@
       <relation target="" sidePair="center-center,bottom-bottom"/>
       <relation target="" sidePair="center-center,bottom-bottom"/>
       <ProgressBar max="100"/>
       <ProgressBar max="100"/>
     </component>
     </component>
-    <graph id="n4_hibu" name="holder" xy="-108,1621" size="10,10">
+    <graph id="n4_hibu" name="holder" xy="-90,1622" size="10,10">
       <relation target="n5_hibu" sidePair="right-right,top-top"/>
       <relation target="n5_hibu" sidePair="right-right,top-top"/>
     </graph>
     </graph>
-    <image id="n5_hibu" name="imgAni" src="hibu6" fileName="images/dljm_chuan.png" xy="-88,1596">
+    <image id="n5_hibu" name="imgAni" src="hibu6" fileName="images/dljm_chuan.png" xy="-70,1597">
       <relation target="n3_hibu" sidePair="bottom-bottom"/>
       <relation target="n3_hibu" sidePair="bottom-bottom"/>
     </image>
     </image>
     <image id="n6_hibu" name="n6" src="hibu7" fileName="images/dljm_jdk.png" xy="210,1723" group="n8_hibu"/>
     <image id="n6_hibu" name="n6" src="hibu7" fileName="images/dljm_jdk.png" xy="210,1723" group="n8_hibu"/>

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

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

+ 4 - 2
GameClient/Assets/Game/Launcher/Views/LauncherView.cs

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

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


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