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

assets/Animation/AngerButton_anim.anim

@@ -0,0 +1,59 @@
+{
+  "__type__": "cc.AnimationClip",
+  "_name": "AngerButton_anim",
+  "_objFlags": 0,
+  "_native": "",
+  "sample": 60,
+  "speed": 1,
+  "wrapMode": 2,
+  "events": [],
+  "_duration": 0.5666666666666667,
+  "_keys": [
+    [
+      0,
+      0.21666666666666667,
+      0.45,
+      0.5666666666666667
+    ]
+  ],
+  "_stepness": 0,
+  "_curves": [
+    {
+      "modifiers": [
+        "scale"
+      ],
+      "data": {
+        "keys": 0,
+        "values": [
+          {
+            "__type__": "cc.Vec3",
+            "x": 1,
+            "y": 1,
+            "z": 1
+          },
+          {
+            "__type__": "cc.Vec3",
+            "x": 1.122,
+            "y": 1.122,
+            "z": 1.122
+          },
+          {
+            "__type__": "cc.Vec3",
+            "x": 0.943,
+            "y": 0.943,
+            "z": 0.943
+          },
+          {
+            "__type__": "cc.Vec3",
+            "x": 1,
+            "y": 1,
+            "z": 1
+          }
+        ],
+        "easingMethods": {}
+      }
+    }
+  ],
+  "_commonTargets": [],
+  "_hash": 2182565994
+}

assets/Animation/AngerButton_anim.anim.meta

@@ -0,0 +1,13 @@
+{
+  "ver": "1.0.10",
+  "importer": "animation-clip",
+  "imported": true,
+  "uuid": "80bd6be5-5ccf-4de0-bb18-e53860a414ee",
+  "files": [
+    ".json"
+  ],
+  "subMetas": {},
+  "userData": {
+    "name": "AngerButton_anim"
+  }
+}

assets/Animation/UI_light3.anim

@@ -0,0 +1,86 @@
+{
+  "__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"
+      ],
+      "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.7289999999999999,
+            "y": 0.7289999999999999,
+            "z": 0.7289999999999999
+          },
+          {
+            "__type__": "cc.Vec3",
+            "x": 0.786,
+            "y": 0.786,
+            "z": 0.786
+          },
+          {
+            "__type__": "cc.Vec3",
+            "x": 0.693,
+            "y": 0.693,
+            "z": 0.693
+          },
+          {
+            "__type__": "cc.Vec3",
+            "x": 0.7289999999999999,
+            "y": 0.7289999999999999,
+            "z": 0.7289999999999999
+          }
+        ],
+        "easingMethods": {}
+      }
+    }
+  ],
+  "_commonTargets": [],
+  "_hash": 4193346439
+}

assets/Animation/UI_light3.anim.meta

@@ -0,0 +1,13 @@
+{
+  "ver": "1.0.10",
+  "importer": "animation-clip",
+  "imported": true,
+  "uuid": "c5ec52e6-686b-491b-bd4b-86011fc9237e",
+  "files": [
+    ".json"
+  ],
+  "subMetas": {},
+  "userData": {
+    "name": "UI_light3"
+  }
+}