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

assets/resources/ui/KongtouTip.anim

@@ -8,12 +8,13 @@
     "speed": 1,
     "wrapMode": 2,
     "events": [],
-    "_duration": 15.133333333333333,
+    "_duration": 20.083333333333332,
     "_keys": [
       [
         0,
         3.0166666666666666,
-        15.133333333333333
+        15.133333333333333,
+        20.083333333333332
       ],
       [
         0,
@@ -76,7 +77,8 @@
         14.25,
         14.5,
         14.75,
-        15.133333333333333
+        15.133333333333333,
+        20.083333333333332
       ],
       [
         0,
@@ -139,13 +141,15 @@
         14.25,
         14.5,
         14.75,
-        15.133333333333333
+        15.133333333333333,
+        20.083333333333332
       ],
       [
         0,
         5,
         10.016666666666667,
-        15.133333333333333
+        15.133333333333333,
+        20.083333333333332
       ]
     ],
     "_stepness": 0,
@@ -172,6 +176,12 @@
               "y": 0,
               "z": -360
             },
+            {
+              "__type__": "cc.Vec3",
+              "x": 0,
+              "y": 0,
+              "z": -1800
+            },
             {
               "__type__": "cc.Vec3",
               "x": 0,
@@ -552,6 +562,12 @@
               "y": 0,
               "z": -1.879
             },
+            {
+              "__type__": "cc.Vec3",
+              "x": 0,
+              "y": 0,
+              "z": 0
+            },
             {
               "__type__": "cc.Vec3",
               "x": 0,
@@ -932,6 +948,12 @@
               "y": 100.756,
               "z": 0
             },
+            {
+              "__type__": "cc.Vec3",
+              "x": 0,
+              "y": 95.03899999999999,
+              "z": 0
+            },
             {
               "__type__": "cc.Vec3",
               "x": 0,
@@ -967,6 +989,12 @@
               "y": 156.197,
               "z": 0
             },
+            {
+              "__type__": "cc.Vec3",
+              "x": 502.4,
+              "y": -23.714,
+              "z": 0
+            },
             {
               "__type__": "cc.Vec3",
               "x": 502.4,
@@ -979,7 +1007,7 @@
       }
     ],
     "_commonTargets": [],
-    "_hash": 1648756614
+    "_hash": 2146003832
   },
   {
     "__type__": "cc.animation.HierarchyPath",

assets/ui/img_qiandao_gun_1.png.meta

@@ -2,7 +2,7 @@
   "ver": "1.0.18",
   "importer": "image",
   "imported": true,
-  "uuid": "28bcd888-3f95-43f0-96b5-92640d99b4fd",
+  "uuid": "3c6b7431-3602-417a-bf9d-a868c77c5e0f",
   "files": [
     ".png",
     ".json"
@@ -10,7 +10,7 @@
   "subMetas": {
     "6c48a": {
       "importer": "texture",
-      "uuid": "28bcd888-3f95-43f0-96b5-92640d99b4fd@6c48a",
+      "uuid": "3c6b7431-3602-417a-bf9d-a868c77c5e0f@6c48a",
       "displayName": "img_qiandao_gun_1",
       "id": "6c48a",
       "name": "texture",
@@ -29,12 +29,12 @@
         "premultiplyAlpha": false,
         "anisotropy": 1,
         "isUuid": true,
-        "imageUuidOrDatabaseUri": "28bcd888-3f95-43f0-96b5-92640d99b4fd"
+        "imageUuidOrDatabaseUri": "3c6b7431-3602-417a-bf9d-a868c77c5e0f"
       }
     },
     "f9941": {
       "importer": "sprite-frame",
-      "uuid": "28bcd888-3f95-43f0-96b5-92640d99b4fd@f9941",
+      "uuid": "3c6b7431-3602-417a-bf9d-a868c77c5e0f@f9941",
       "displayName": "img_qiandao_gun_1",
       "id": "f9941",
       "name": "spriteFrame",
@@ -48,26 +48,26 @@
         "trimType": "auto",
         "trimThreshold": 1,
         "rotated": false,
-        "offsetX": -1,
-        "offsetY": -4.5,
-        "trimX": 4,
-        "trimY": 9,
-        "width": 555,
-        "height": 226,
-        "rawWidth": 565,
-        "rawHeight": 235,
+        "offsetX": 0,
+        "offsetY": 0,
+        "trimX": 0,
+        "trimY": 0,
+        "width": 566,
+        "height": 213,
+        "rawWidth": 566,
+        "rawHeight": 213,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
         "borderRight": 0,
         "isUuid": true,
-        "imageUuidOrDatabaseUri": "28bcd888-3f95-43f0-96b5-92640d99b4fd@6c48a",
+        "imageUuidOrDatabaseUri": "3c6b7431-3602-417a-bf9d-a868c77c5e0f@6c48a",
         "atlasUuid": ""
       }
     }
   },
   "userData": {
     "type": "sprite-frame",
-    "redirect": "28bcd888-3f95-43f0-96b5-92640d99b4fd@f9941"
+    "redirect": "3c6b7431-3602-417a-bf9d-a868c77c5e0f@f9941"
   }
 }

assets/ui/img_qiandao_gun_2.png.meta

@@ -2,7 +2,7 @@
   "ver": "1.0.18",
   "importer": "image",
   "imported": true,
-  "uuid": "9043b8e6-c78e-425e-9d8c-ab0b3205d04e",
+  "uuid": "95cf2261-699f-492b-b6ac-e6b727d630b4",
   "files": [
     ".png",
     ".json"
@@ -10,7 +10,7 @@
   "subMetas": {
     "6c48a": {
       "importer": "texture",
-      "uuid": "9043b8e6-c78e-425e-9d8c-ab0b3205d04e@6c48a",
+      "uuid": "95cf2261-699f-492b-b6ac-e6b727d630b4@6c48a",
       "displayName": "img_qiandao_gun_2",
       "id": "6c48a",
       "name": "texture",
@@ -29,12 +29,12 @@
         "premultiplyAlpha": false,
         "anisotropy": 1,
         "isUuid": true,
-        "imageUuidOrDatabaseUri": "9043b8e6-c78e-425e-9d8c-ab0b3205d04e"
+        "imageUuidOrDatabaseUri": "95cf2261-699f-492b-b6ac-e6b727d630b4"
       }
     },
     "f9941": {
       "importer": "sprite-frame",
-      "uuid": "9043b8e6-c78e-425e-9d8c-ab0b3205d04e@f9941",
+      "uuid": "95cf2261-699f-492b-b6ac-e6b727d630b4@f9941",
       "displayName": "img_qiandao_gun_2",
       "id": "f9941",
       "name": "spriteFrame",
@@ -48,26 +48,26 @@
         "trimType": "auto",
         "trimThreshold": 1,
         "rotated": false,
-        "offsetX": -0.5,
+        "offsetX": 0,
         "offsetY": 0,
         "trimX": 0,
         "trimY": 0,
-        "width": 169,
-        "height": 66,
-        "rawWidth": 170,
-        "rawHeight": 66,
+        "width": 182,
+        "height": 94,
+        "rawWidth": 182,
+        "rawHeight": 94,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
         "borderRight": 0,
         "isUuid": true,
-        "imageUuidOrDatabaseUri": "9043b8e6-c78e-425e-9d8c-ab0b3205d04e@6c48a",
+        "imageUuidOrDatabaseUri": "95cf2261-699f-492b-b6ac-e6b727d630b4@6c48a",
         "atlasUuid": ""
       }
     }
   },
   "userData": {
     "type": "sprite-frame",
-    "redirect": "9043b8e6-c78e-425e-9d8c-ab0b3205d04e@f9941"
+    "redirect": "95cf2261-699f-492b-b6ac-e6b727d630b4@f9941"
   }
 }