Merge branch 'master' of http://10.108.64.190:3000/gfg/client

FGUIProject/assets/Task/BattlePassRewardUI.xml

@@ -5,7 +5,7 @@
     <image id="n15_nd17" name="n15" src="uxxstmf" fileName="images/sj_dk.png" xy="0,264">
       <relation target="" sidePair="left-right"/>
     </image>
-    <text id="n19_nd17" name="LeftTime" xy="37,264" size="200,44" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#fffaec" autoSize="none" text="15天24时60分"/>
+    <text id="n19_nd17" name="LeftTime" xy="37,264" size="200,44" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#fffaec" autoSize="none" text=""/>
     <component id="n16_nd17" name="tip" src="nyhmtly" fileName="components/ButtonRed.xml" pkg="eg2y0ldp" xy="246,257" size="61,61"/>
     <component id="n18_nd17" name="LevelProcess" src="e3m1tnl" fileName="components/ExpProcess.xml" xy="107,604">
       <relation target="" sidePair="left-left"/>

GameClient/Assets/Editor/Xasset/Builds/BuildTask.cs

@@ -126,7 +126,6 @@ namespace VEngine.Editor.Builds
             }
             CheckAssets();
             EditorUtility.ClearProgressBar();
-            return;
             FinishBuild();
         }