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

assets/resources/scenes/FightingScene.scene

@@ -158,9 +158,7 @@
         "__uuid__": "57122fad-a4bb-4503-99b7-f7738db893f6@8c0dc"
       }
     ],
-    "_defaultClip": {
-      "__uuid__": "57122fad-a4bb-4503-99b7-f7738db893f6@c2696"
-    },
+    "_defaultClip": null,
     "_id": "25yTsB/wFBCJYFX9FK31cT"
   },
   {
@@ -1279,9 +1277,7 @@
         "__uuid__": "57122fad-a4bb-4503-99b7-f7738db893f6@8c0dc"
       }
     ],
-    "_defaultClip": {
-      "__uuid__": "57122fad-a4bb-4503-99b7-f7738db893f6@c2696"
-    },
+    "_defaultClip": null,
     "_id": "2cG+L9EnlJTZBGH8sNec0Y"
   },
   {

assets/resources/ui/PrepareUI.prefab

@@ -279,7 +279,7 @@
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": 375,
-      "y": 968.7940000000017,
+      "y": 968.7939999999944,
       "z": 0
     },
     "_lrot": {
@@ -385,7 +385,7 @@
     "_target": null,
     "_left": 0,
     "_right": 0,
-    "_top": -32134.794,
+    "_top": -32134.793999999998,
     "_bottom": -31531.206,
     "_horizontalCenter": 0,
     "_verticalCenter": 0,
@@ -958,7 +958,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 480,
-      "height": 250.0000000000001
+      "height": 250
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -975,12 +975,12 @@
       "__id__": 30
     },
     "_enabled": true,
-    "_alignFlags": 21,
+    "_alignFlags": 17,
     "_target": null,
     "_left": 0,
     "_right": 0,
-    "_top": 234.58899999999994,
-    "_bottom": 849.411,
+    "_top": 234.589,
+    "_bottom": 849.4110000000001,
     "_horizontalCenter": 0,
     "_verticalCenter": 0,
     "_isAbsLeft": true,
@@ -1147,11 +1147,11 @@
       "__id__": 34
     },
     "_enabled": true,
-    "_alignFlags": 21,
+    "_alignFlags": 17,
     "_target": null,
     "_left": 0,
     "_right": 0,
-    "_top": 232.80000000000007,
+    "_top": 232.8,
     "_bottom": 1050.8,
     "_horizontalCenter": 0,
     "_verticalCenter": 0,