Browse Source

水月镜花打开任务

hexiaojie 5 months ago
parent
commit
11009d2704

+ 13 - 13
GameClient/Assets/Editor/Bat/commitGame.bat

@@ -1,15 +1,15 @@
-cd ../../Res
-svn add . --force
-svn ci -m "公用机提交"
+@REM cd ../../Res
+@REM svn add . --force
+@REM svn ci -m "锟斤拷锟矫伙拷锟结交"
 
-cd ../Game/CSShare
-git add .
-git commit -am "公用机提交"
-git pull
-git push
+@REM cd ../Game/CSShare
+@REM git add .
+@REM git commit -am "锟斤拷锟矫伙拷锟结交"
+@REM git pull
+@REM git push
 
-cd ../../../../
-git add .
-git commit -am "公用机提交"
-git pull
-git push
+@REM cd ../../../../
+@REM git add .
+@REM git commit -am "锟斤拷锟矫伙拷锟结交"
+@REM git pull
+@REM git push

+ 4 - 4
GameClient/Assets/Editor/Bat/updateArtRes.bat

@@ -1,4 +1,4 @@
-echo %1
-cd ../../../../../../gfg/%1
-svn cleanup
-svn up --force --accept tc
+@REM echo %1
+@REM cd ../../../../../../gfg/%1
+@REM svn cleanup
+@REM svn up --force --accept tc

+ 2 - 2
GameClient/Assets/Editor/Bat/updateExcel.bat

@@ -1,2 +1,2 @@
-cd ../../../../../../gfg/tools/Config/
-svn up --force --accept tc
+@REM cd ../../../../../../gfg/tools/Config/
+@REM svn up --force --accept tc

+ 10 - 10
GameClient/Assets/Editor/Bat/updateGame.bat

@@ -1,11 +1,11 @@
-cd ../../../../
-git clean -df
-git reset --hard
-git status
-git pull
+@REM cd ../../../../
+@REM git clean -df
+@REM git reset --hard
+@REM git status
+@REM git pull
 
-cd GameClient/Assets/Game/CSShare
-git clean -df
-git reset --hard
-git status
-git pull
+@REM cd GameClient/Assets/Game/CSShare
+@REM git clean -df
+@REM git reset --hard
+@REM git status
+@REM git pull

+ 3 - 3
GameClient/Assets/Editor/Bat/updateGameRes.bat

@@ -1,3 +1,3 @@
-cd ../../../Assets/Res
-svn cleanup
-svn up --force --accept tc
+@REM cd ../../../Assets/Res
+@REM svn cleanup
+@REM svn up --force --accept tc

+ 1 - 1
GameClient/Assets/Game/HotUpdate/Views/ActivityThemeLuckyBox/ActivityThemeLuckyBoxView.cs

@@ -89,7 +89,7 @@ namespace GFGGame
             {
                 _ui.m_card.target.visible = false;
             }
-            _ui.m_btnTask.target.visible = false;
+            // _ui.m_btnTask.target.visible = false;
             UpdateEffect();
             UpdateRedDot();
             UpdateTime();

BIN
GameClient/Assets/ResIn/UI/ActivityThemeLuckyBox/ActivityThemeLuckyBox_atlas0_1!a.png


BIN
GameClient/Assets/ResIn/UI/ActivityThemeLuckyBox/ActivityThemeLuckyBox_atlas0_1.png


BIN
GameClient/Assets/ResIn/UI/ActivityThemeLuckyBox/ActivityThemeLuckyBox_fui.bytes