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

assets/Animation/ReplaceButton_anim.anim

@@ -0,0 +1,98 @@
+[
+  {
+    "__type__": "cc.AnimationClip",
+    "_name": "ReplaceButton_anim",
+    "_objFlags": 0,
+    "_native": "",
+    "sample": 60,
+    "speed": 1,
+    "wrapMode": 2,
+    "events": [],
+    "_duration": 0.5833333333333334,
+    "_keys": [
+      [
+        0,
+        0.2833333333333333,
+        0.5833333333333334
+      ],
+      [
+        0,
+        0.2833333333333333,
+        0.5833333333333334
+      ]
+    ],
+    "_stepness": 0,
+    "_curves": [
+      {
+        "modifiers": [
+          "scale"
+        ],
+        "data": {
+          "keys": 0,
+          "values": [
+            {
+              "__type__": "cc.Vec3",
+              "x": 1.25,
+              "y": 1,
+              "z": 1
+            },
+            {
+              "__type__": "cc.Vec3",
+              "x": 1.429,
+              "y": 1.143,
+              "z": 1.143
+            },
+            {
+              "__type__": "cc.Vec3",
+              "x": 1.25,
+              "y": 1,
+              "z": 1
+            }
+          ],
+          "easingMethods": {}
+        }
+      },
+      {
+        "modifiers": [
+          {
+            "__id__": 1
+          },
+          "color"
+        ],
+        "data": {
+          "keys": 1,
+          "values": [
+            {
+              "__type__": "cc.Color",
+              "r": 255,
+              "g": 255,
+              "b": 255,
+              "a": 255
+            },
+            {
+              "__type__": "cc.Color",
+              "r": 255,
+              "g": 155,
+              "b": 155,
+              "a": 255
+            },
+            {
+              "__type__": "cc.Color",
+              "r": 255,
+              "g": 255,
+              "b": 255,
+              "a": 255
+            }
+          ],
+          "easingMethods": {}
+        }
+      }
+    ],
+    "_commonTargets": [],
+    "_hash": 1906163087
+  },
+  {
+    "__type__": "cc.animation.ComponentPath",
+    "component": "cc.SpriteComponent"
+  }
+]

assets/Animation/ReplaceButton_anim.anim.meta

@@ -0,0 +1,13 @@
+{
+  "ver": "1.0.10",
+  "importer": "animation-clip",
+  "imported": true,
+  "uuid": "0223a8c8-cabc-47f3-8ce1-1545aa67345b",
+  "files": [
+    ".json"
+  ],
+  "subMetas": {},
+  "userData": {
+    "name": "ReplaceButton_anim"
+  }
+}

assets/Animation/UI_light3.anim

@@ -1,86 +1,132 @@
-{
-  "__type__": "cc.AnimationClip",
-  "_name": "UI_light3",
-  "_objFlags": 0,
-  "_native": "",
-  "sample": 60,
-  "speed": 1,
-  "wrapMode": 2,
-  "events": [],
-  "_duration": 0.5833333333333334,
-  "_keys": [
-    [
-      0,
-      0.5833333333333334
-    ],
-    [
-      0,
-      0.2,
-      0.36666666666666664,
-      0.5833333333333334
-    ]
-  ],
-  "_stepness": 0,
-  "_curves": [
-    {
-      "modifiers": [
-        "eulerAngles"
+[
+  {
+    "__type__": "cc.AnimationClip",
+    "_name": "UI_light3",
+    "_objFlags": 0,
+    "_native": "",
+    "sample": 60,
+    "speed": 1,
+    "wrapMode": 2,
+    "events": [],
+    "_duration": 0.5833333333333334,
+    "_keys": [
+      [
+        0,
+        0.5833333333333334
       ],
-      "data": {
-        "keys": 0,
-        "values": [
-          {
-            "__type__": "cc.Vec3",
-            "x": 0,
-            "y": 0,
-            "z": 0
-          },
-          {
-            "__type__": "cc.Vec3",
-            "x": 0,
-            "y": 0,
-            "z": -89.733
-          }
-        ],
-        "easingMethods": {}
-      }
-    },
-    {
-      "modifiers": [
-        "scale"
+      [
+        0,
+        0.2,
+        0.36666666666666664,
+        0.5833333333333334
       ],
-      "data": {
-        "keys": 1,
-        "values": [
-          {
-            "__type__": "cc.Vec3",
-            "x": 0.7289999999999999,
-            "y": 0.7289999999999999,
-            "z": 0.7289999999999999
-          },
-          {
-            "__type__": "cc.Vec3",
-            "x": 0.786,
-            "y": 0.786,
-            "z": 0.786
-          },
+      [
+        0,
+        0.3,
+        0.5833333333333334
+      ]
+    ],
+    "_stepness": 0,
+    "_curves": [
+      {
+        "modifiers": [
+          "eulerAngles"
+        ],
+        "data": {
+          "keys": 0,
+          "values": [
+            {
+              "__type__": "cc.Vec3",
+              "x": 0,
+              "y": 0,
+              "z": 0
+            },
+            {
+              "__type__": "cc.Vec3",
+              "x": 0,
+              "y": 0,
+              "z": -89.733
+            }
+          ],
+          "easingMethods": {}
+        }
+      },
+      {
+        "modifiers": [
+          "scale"
+        ],
+        "data": {
+          "keys": 1,
+          "values": [
+            {
+              "__type__": "cc.Vec3",
+              "x": 0.983,
+              "y": 0.983,
+              "z": 0.983
+            },
+            {
+              "__type__": "cc.Vec3",
+              "x": 0.883,
+              "y": 0.883,
+              "z": 0.883
+            },
+            {
+              "__type__": "cc.Vec3",
+              "x": 0.841,
+              "y": 0.841,
+              "z": 0.841
+            },
+            {
+              "__type__": "cc.Vec3",
+              "x": 0.983,
+              "y": 0.983,
+              "z": 0.983
+            }
+          ],
+          "easingMethods": {}
+        }
+      },
+      {
+        "modifiers": [
           {
-            "__type__": "cc.Vec3",
-            "x": 0.693,
-            "y": 0.693,
-            "z": 0.693
+            "__id__": 1
           },
-          {
-            "__type__": "cc.Vec3",
-            "x": 0.7289999999999999,
-            "y": 0.7289999999999999,
-            "z": 0.7289999999999999
-          }
+          "color"
         ],
-        "easingMethods": {}
+        "data": {
+          "keys": 2,
+          "values": [
+            {
+              "__type__": "cc.Color",
+              "r": 255,
+              "g": 255,
+              "b": 255,
+              "a": 255
+            },
+            {
+              "__type__": "cc.Color",
+              "r": 255,
+              "g": 101,
+              "b": 41,
+              "a": 255
+            },
+            {
+              "__type__": "cc.Color",
+              "r": 255,
+              "g": 255,
+              "b": 255,
+              "a": 255
+            }
+          ],
+          "easingMethods": {}
+        }
       }
-    }
-  ],
-  "_commonTargets": [],
-  "_hash": 4193346439
-}
+    ],
+    "_commonTargets": [],
+    "_hash": 4250400025
+  },
+  {
+    "__type__": "cc.animation.ComponentPath",
+    "component": "cc.SpriteComponent"
+  }
+]

assets/resources/ui/FightingUI.prefab

@@ -44,23 +44,23 @@
         "__id__": 200
       },
       {
-        "__id__": 228
+        "__id__": 229
       }
     ],
     "_active": true,
     "_components": [
-      {
-        "__id__": 254
-      },
       {
         "__id__": 255
       },
       {
         "__id__": 256
+      },
+      {
+        "__id__": 257
       }
     ],
     "_prefab": {
-      "__id__": 257
+      "__id__": 258
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -5356,9 +5356,9 @@
     },
     "_lscale": {
       "__type__": "cc.Vec3",
-      "x": 0.7289999999999999,
-      "y": 0.7289999999999999,
-      "z": 0.7289999999999999
+      "x": 0.961,
+      "y": 0.961,
+      "z": 0.961
     },
     "_layer": 1073741824,
     "_euler": {
@@ -6135,14 +6135,14 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 225
+        "__id__": 226
       },
       {
-        "__id__": 226
+        "__id__": 227
       }
     ],
     "_prefab": {
-      "__id__": 227
+      "__id__": 228
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -6581,10 +6581,13 @@
       },
       {
         "__id__": 223
+      },
+      {
+        "__id__": 224
       }
     ],
     "_prefab": {
-      "__id__": 224
+      "__id__": 225
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -6891,6 +6894,25 @@
     "_lockFlags": 0,
     "_id": ""
   },
+  {
+    "__type__": "cc.AnimationComponent",
+    "_name": "ButtonReplace<AnimationComponent>",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 214
+    },
+    "_enabled": true,
+    "playOnLoad": false,
+    "_clips": [
+      {
+        "__uuid__": "0223a8c8-cabc-47f3-8ce1-1545aa67345b"
+      }
+    ],
+    "_defaultClip": {
+      "__uuid__": "0223a8c8-cabc-47f3-8ce1-1545aa67345b"
+    },
+    "_id": ""
+  },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
@@ -6979,32 +7001,32 @@
     },
     "_children": [
       {
-        "__id__": 229
+        "__id__": 230
       },
       {
-        "__id__": 234
+        "__id__": 235
       },
       {
-        "__id__": 239
+        "__id__": 240
       },
       {
-        "__id__": 244
+        "__id__": 245
       }
     ],
     "_active": true,
     "_components": [
-      {
-        "__id__": 249
-      },
       {
         "__id__": 250
       },
       {
         "__id__": 251
+      },
+      {
+        "__id__": 252
       }
     ],
     "_prefab": {
-      "__id__": 253
+      "__id__": 254
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -7039,23 +7061,23 @@
     "_name": "kongtou_guang",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 228
+      "__id__": 229
     },
     "_children": [],
     "_active": true,
     "_components": [
-      {
-        "__id__": 230
-      },
       {
         "__id__": 231
       },
       {
         "__id__": 232
+      },
+      {
+        "__id__": 233
       }
     ],
     "_prefab": {
-      "__id__": 233
+      "__id__": 234
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -7090,7 +7112,7 @@
     "_name": "kongtou<UITransformComponent>",
     "_objFlags": 0,
     "node": {
-      "__id__": 229
+      "__id__": 230
     },
     "_enabled": true,
     "_priority": 0,
@@ -7111,7 +7133,7 @@
     "_name": "kongtou<SpriteComponent>",
     "_objFlags": 0,
     "node": {
-      "__id__": 229
+      "__id__": 230
     },
     "_enabled": true,
     "_srcBlendFactor": 2,
@@ -7147,7 +7169,7 @@
     "_name": "Bow<AnimationComponent>",
     "_objFlags": 0,
     "node": {
-      "__id__": 229
+      "__id__": 230
     },
     "_enabled": true,
     "playOnLoad": true,
@@ -7175,23 +7197,23 @@
     "_name": "kongtou_san",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 228
+      "__id__": 229
     },
     "_children": [],
     "_active": true,
     "_components": [
-      {
-        "__id__": 235
-      },
       {
         "__id__": 236
       },
       {
         "__id__": 237
+      },
+      {
+        "__id__": 238
       }
     ],
     "_prefab": {
-      "__id__": 238
+      "__id__": 239
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -7226,7 +7248,7 @@
     "_name": "kongtou<UITransformComponent>",
     "_objFlags": 0,
     "node": {
-      "__id__": 234
+      "__id__": 235
     },
     "_enabled": true,
     "_priority": 0,
@@ -7247,7 +7269,7 @@
     "_name": "kongtou<SpriteComponent>",
     "_objFlags": 0,
     "node": {
-      "__id__": 234
+      "__id__": 235
     },
     "_enabled": true,
     "_srcBlendFactor": 2,
@@ -7283,7 +7305,7 @@
     "_name": "Bow<AnimationComponent>",
     "_objFlags": 0,
     "node": {
-      "__id__": 234
+      "__id__": 235
     },
     "_enabled": true,
     "playOnLoad": true,
@@ -7311,23 +7333,23 @@
     "_name": "kongtou_bao",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 228
+      "__id__": 229
     },
     "_children": [],
     "_active": true,
     "_components": [
-      {
-        "__id__": 240
-      },
       {
         "__id__": 241
       },
       {
         "__id__": 242
+      },
+      {
+        "__id__": 243
       }
     ],
     "_prefab": {
-      "__id__": 243
+      "__id__": 244
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -7362,7 +7384,7 @@
     "_name": "kongtou<UITransformComponent>",
     "_objFlags": 0,
     "node": {
-      "__id__": 239
+      "__id__": 240
     },
     "_enabled": true,
     "_priority": 0,
@@ -7383,7 +7405,7 @@
     "_name": "kongtou<SpriteComponent>",
     "_objFlags": 0,
     "node": {
-      "__id__": 239
+      "__id__": 240
     },
     "_enabled": true,
     "_srcBlendFactor": 2,
@@ -7419,7 +7441,7 @@
     "_name": "Bow<AnimationComponent>",
     "_objFlags": 0,
     "node": {
-      "__id__": 239
+      "__id__": 240
     },
     "_enabled": true,
     "playOnLoad": true,
@@ -7447,23 +7469,23 @@
     "_name": "Label",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 228
+      "__id__": 229
     },
     "_children": [],
     "_active": true,
     "_components": [
-      {
-        "__id__": 245
-      },
       {
         "__id__": 246
       },
       {
         "__id__": 247
+      },
+      {
+        "__id__": 248
       }
     ],
     "_prefab": {
-      "__id__": 248
+      "__id__": 249
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -7498,7 +7520,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 244
+      "__id__": 245
     },
     "_enabled": true,
     "_priority": 0,
@@ -7519,7 +7541,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 244
+      "__id__": 245
     },
     "_enabled": true,
     "_srcBlendFactor": 2,
@@ -7555,7 +7577,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 244
+      "__id__": 245
     },
     "_enabled": true,
     "_color": {
@@ -7588,7 +7610,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 228
+      "__id__": 229
     },
     "_enabled": true,
     "_priority": 0,
@@ -7609,7 +7631,7 @@
     "_name": "Kongtou<AnimationComponent>",
     "_objFlags": 0,
     "node": {
-      "__id__": 228
+      "__id__": 229
     },
     "_enabled": true,
     "playOnLoad": true,
@@ -7628,12 +7650,12 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 228
+      "__id__": 229
     },
     "_enabled": true,
     "clickEvents": [
       {
-        "__id__": 252
+        "__id__": 253
       }
     ],
     "_interactable": true,
@@ -7827,7 +7849,7 @@
       "__id__": 112
     },
     "DropBoxAnimation": {
-      "__id__": 250
+      "__id__": 251
     },
     "_id": ""
   },

assets/resources/ui/ads/DaochuItemUI.prefab

@@ -254,8 +254,8 @@
     "_priority": 0,
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 160,
-      "height": 160
+      "width": 180,
+      "height": 180
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",

assets/resources/ui/components/ShopListItemRender.prefab

@@ -553,7 +553,7 @@
         "__id__": 18
       }
     ],
-    "_active": true,
+    "_active": false,
     "_components": [
       {
         "__id__": 22
@@ -1141,7 +1141,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 24.47,
-      "height": 45.2
+      "height": 25.2
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -1169,7 +1169,7 @@
     },
     "_sharedMaterial": null,
     "_useOriginalSize": true,
-    "_string": "15\n",
+    "_string": "15",
     "_horizontalAlign": 1,
     "_verticalAlign": 1,
     "_actualFontSize": 22,