Browse Source

Merge branch 'master' of http://120.92.132.192:23541/TDGame/TDGameClient3D

xiejing 4 years ago
parent
commit
683ac7353e
2 changed files with 105 additions and 590 deletions
  1. 2 2
      assets/resources/ui/GameOverUI.prefab
  2. 103 588
      assets/resources/ui/PrepareUI.prefab

+ 2 - 2
assets/resources/ui/GameOverUI.prefab

@@ -373,7 +373,7 @@
         "__id__": 19
         "__id__": 19
       }
       }
     ],
     ],
-    "_active": false,
+    "_active": true,
     "_components": [
     "_components": [
       {
       {
         "__id__": 23
         "__id__": 23
@@ -3466,7 +3466,7 @@
         "__id__": 238
         "__id__": 238
       }
       }
     ],
     ],
-    "_active": false,
+    "_active": true,
     "_components": [
     "_components": [
       {
       {
         "__id__": 254
         "__id__": 254

File diff suppressed because it is too large
+ 103 - 588
assets/resources/ui/PrepareUI.prefab


Some files were not shown because too many files changed in this diff