圣盾加攻击bug 修复，添加了多个怪物动画

2025-01-05 23:42:31 +08:00
parent b5624cf477
commit 01ac7703c2
114 changed files with 47710 additions and 1824 deletions
--- a/assets/resources/game/heros/mor1.prefab
+++ b/assets/resources/game/heros/mor1.prefab
@@ -28,13 +28,13 @@
        "__id__": 17
      },
      {
-        "__id__": 25
+        "__id__": 26
      },
      {
-        "__id__": 37
+        "__id__": 34
      },
      {
-        "__id__": 48
+        "__id__": 46
      },
      {
        "__id__": 57
@@ -255,10 +255,10 @@
      "__id__": 8
    },
    "asset": {
-      "__uuid__": "198e9c93-3ac9-4564-9d0e-63c9836e509a",
+      "__uuid__": "5b4ca49e-0f12-4478-b56d-bf8198b36b90",
      "__expectedType__": "cc.Prefab"
    },
-    "fileId": "54R/aYBglLI4Jn5pm++Jx8",
+    "fileId": "0d6ZXmA5dHkZxoGONDL2sE",
    "instance": {
      "__id__": 10
    },
@@ -266,7 +266,7 @@
  },
  {
    "__type__": "cc.PrefabInstance",
-    "fileId": "cdIK+ocxBJRLNeMROksdDi",
+    "fileId": "fe79INE+JI1Jy2Hu0iKLMn",
    "prefabRootNode": {
      "__id__": 1
    },
@@ -299,12 +299,12 @@
    "propertyPath": [
      "_name"
    ],
-    "value": "max"
+    "value": "tooltip"
  },
  {
    "__type__": "cc.TargetInfo",
    "localID": [
-      "54R/aYBglLI4Jn5pm++Jx8"
+      "0d6ZXmA5dHkZxoGONDL2sE"
    ]
  },
  {
@@ -317,8 +317,8 @@
    ],
    "value": {
      "__type__": "cc.Vec3",
-      "x": 0,
-      "y": -4.526,
+      "x": 4.65,
+      "y": 129.718,
      "z": 0
    }
  },
@@ -363,6 +363,131 @@
    ],
    "value": false
  },
+  {
+    "__type__": "cc.Node",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 1
+    },
+    "_prefab": {
+      "__id__": 18
+    },
+    "__editorExtras__": {}
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 17
+    },
+    "asset": {
+      "__uuid__": "198e9c93-3ac9-4564-9d0e-63c9836e509a",
+      "__expectedType__": "cc.Prefab"
+    },
+    "fileId": "54R/aYBglLI4Jn5pm++Jx8",
+    "instance": {
+      "__id__": 19
+    },
+    "targetOverrides": null
+  },
+  {
+    "__type__": "cc.PrefabInstance",
+    "fileId": "cdIK+ocxBJRLNeMROksdDi",
+    "prefabRootNode": {
+      "__id__": 1
+    },
+    "mountedChildren": [],
+    "mountedComponents": [],
+    "propertyOverrides": [
+      {
+        "__id__": 20
+      },
+      {
+        "__id__": 22
+      },
+      {
+        "__id__": 23
+      },
+      {
+        "__id__": 24
+      },
+      {
+        "__id__": 25
+      }
+    ],
+    "removedComponents": []
+  },
+  {
+    "__type__": "CCPropertyOverrideInfo",
+    "targetInfo": {
+      "__id__": 21
+    },
+    "propertyPath": [
+      "_name"
+    ],
+    "value": "max"
+  },
+  {
+    "__type__": "cc.TargetInfo",
+    "localID": [
+      "54R/aYBglLI4Jn5pm++Jx8"
+    ]
+  },
+  {
+    "__type__": "CCPropertyOverrideInfo",
+    "targetInfo": {
+      "__id__": 21
+    },
+    "propertyPath": [
+      "_lpos"
+    ],
+    "value": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": -4.526,
+      "z": 0
+    }
+  },
+  {
+    "__type__": "CCPropertyOverrideInfo",
+    "targetInfo": {
+      "__id__": 21
+    },
+    "propertyPath": [
+      "_lrot"
+    ],
+    "value": {
+      "__type__": "cc.Quat",
+      "x": 0,
+      "y": 0,
+      "z": 0,
+      "w": 1
+    }
+  },
+  {
+    "__type__": "CCPropertyOverrideInfo",
+    "targetInfo": {
+      "__id__": 21
+    },
+    "propertyPath": [
+      "_euler"
+    ],
+    "value": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    }
+  },
+  {
+    "__type__": "CCPropertyOverrideInfo",
+    "targetInfo": {
+      "__id__": 21
+    },
+    "propertyPath": [
+      "_active"
+    ],
+    "value": false
+  },
  {
    "__type__": "cc.Node",
    "_name": "anm",
@@ -375,17 +500,17 @@
    "_active": true,
    "_components": [
      {
-        "__id__": 18
+        "__id__": 27
      },
      {
-        "__id__": 20
+        "__id__": 29
      },
      {
-        "__id__": 22
+        "__id__": 31
      }
    ],
    "_prefab": {
-      "__id__": 24
+      "__id__": 33
    },
    "_lpos": {
      "__type__": "cc.Vec3",
@@ -402,8 +527,8 @@
    },
    "_lscale": {
      "__type__": "cc.Vec3",
-      "x": 0.25,
-      "y": 0.25,
+      "x": 0.2,
+      "y": 0.2,
      "z": 1
    },
    "_mobility": 0,
@@ -422,11 +547,11 @@
    "_objFlags": 0,
    "__editorExtras__": {},
    "node": {
-      "__id__": 17
+      "__id__": 26
    },
    "_enabled": true,
    "__prefab": {
-      "__id__": 19
+      "__id__": 28
    },
    "_contentSize": {
      "__type__": "cc.Size",
@@ -450,11 +575,11 @@
    "_objFlags": 0,
    "__editorExtras__": {},
    "node": {
-      "__id__": 17
+      "__id__": 26
    },
    "_enabled": true,
    "__prefab": {
-      "__id__": 21
+      "__id__": 30
    },
    "_customMaterial": null,
    "_srcBlendFactor": 2,
@@ -473,7 +598,7 @@
    "defaultSkin": "default",
    "defaultAnimation": "Idle",
    "_premultipliedAlpha": true,
-    "_timeScale": 0.9,
+    "_timeScale": 1,
    "_preCacheMode": 0,
    "_cacheMode": 0,
    "_sockets": [],
@@ -495,11 +620,11 @@
    "_objFlags": 0,
    "__editorExtras__": {},
    "node": {
-      "__id__": 17
+      "__id__": 26
    },
    "_enabled": true,
    "__prefab": {
-      "__id__": 23
+      "__id__": 32
    },
    "_id": ""
  },
@@ -527,14 +652,14 @@
      "__id__": 1
    },
    "_prefab": {
-      "__id__": 26
+      "__id__": 35
    },
    "__editorExtras__": {}
  },
  {
    "__type__": "cc.PrefabInfo",
    "root": {
-      "__id__": 25
+      "__id__": 34
    },
    "asset": {
      "__uuid__": "e1b8a315-ece3-41a2-941e-a66861753f1b",
@@ -542,7 +667,7 @@
    },
    "fileId": "c46/YsCPVOJYA4mWEpNYRx",
    "instance": {
-      "__id__": 27
+      "__id__": 36
    },
    "targetOverrides": null
  },
@@ -556,25 +681,25 @@
    "mountedComponents": [],
    "propertyOverrides": [
      {
-        "__id__": 28
+        "__id__": 37
      },
      {
-        "__id__": 30
+        "__id__": 39
      },
      {
-        "__id__": 31
+        "__id__": 40
      },
      {
-        "__id__": 32
+        "__id__": 41
      },
      {
-        "__id__": 33
+        "__id__": 42
      },
      {
-        "__id__": 34
+        "__id__": 43
      },
      {
-        "__id__": 36
+        "__id__": 45
      }
    ],
    "removedComponents": []
@@ -582,7 +707,7 @@
  {
    "__type__": "CCPropertyOverrideInfo",
    "targetInfo": {
-      "__id__": 29
+      "__id__": 38
    },
    "propertyPath": [
      "_name"
@@ -598,7 +723,7 @@
  {
    "__type__": "CCPropertyOverrideInfo",
    "targetInfo": {
-      "__id__": 29
+      "__id__": 38
    },
    "propertyPath": [
      "_lpos"
@@ -613,7 +738,7 @@
  {
    "__type__": "CCPropertyOverrideInfo",
    "targetInfo": {
-      "__id__": 29
+      "__id__": 38
    },
    "propertyPath": [
      "_lrot"
@@ -629,7 +754,7 @@
  {
    "__type__": "CCPropertyOverrideInfo",
    "targetInfo": {
-      "__id__": 29
+      "__id__": 38
    },
    "propertyPath": [
      "_euler"
@@ -644,7 +769,7 @@
  {
    "__type__": "CCPropertyOverrideInfo",
    "targetInfo": {
-      "__id__": 29
+      "__id__": 38
    },
    "propertyPath": [
      "_active"
@@ -654,7 +779,7 @@
  {
    "__type__": "CCPropertyOverrideInfo",
    "targetInfo": {
-      "__id__": 35
+      "__id__": 44
    },
    "propertyPath": [
      "_contentSize"
@@ -674,7 +799,7 @@
  {
    "__type__": "CCPropertyOverrideInfo",
    "targetInfo": {
-      "__id__": 29
+      "__id__": 38
    },
    "propertyPath": [
      "_lscale"
@@ -693,14 +818,14 @@
      "__id__": 1
    },
    "_prefab": {
-      "__id__": 38
+      "__id__": 47
    },
    "__editorExtras__": {}
  },
  {
    "__type__": "cc.PrefabInfo",
    "root": {
-      "__id__": 37
+      "__id__": 46
    },
    "asset": {
      "__uuid__": "50c3d5e4-49f8-4bd7-a15b-cda359a0ae5c",
@@ -708,7 +833,7 @@
    },
    "fileId": "5fqU0L3/FOhKaco5UkHuWT",
    "instance": {
-      "__id__": 39
+      "__id__": 48
    },
    "targetOverrides": null
  },
@@ -722,22 +847,22 @@
    "mountedComponents": [],
    "propertyOverrides": [
      {
-        "__id__": 40
+        "__id__": 49
      },
      {
-        "__id__": 42
+        "__id__": 51
      },
      {
-        "__id__": 43
+        "__id__": 52
      },
      {
-        "__id__": 44
+        "__id__": 53
      },
      {
-        "__id__": 45
+        "__id__": 54
      },
      {
-        "__id__": 47
+        "__id__": 56
      }
    ],
    "removedComponents": []
@@ -745,7 +870,7 @@
  {
    "__type__": "CCPropertyOverrideInfo",
    "targetInfo": {
-      "__id__": 41
+      "__id__": 50
    },
    "propertyPath": [
      "_name"
@@ -761,7 +886,7 @@
  {
    "__type__": "CCPropertyOverrideInfo",
    "targetInfo": {
-      "__id__": 41
+      "__id__": 50
    },
    "propertyPath": [
      "_lpos"
@@ -776,7 +901,7 @@
  {
    "__type__": "CCPropertyOverrideInfo",
    "targetInfo": {
-      "__id__": 41
+      "__id__": 50
    },
    "propertyPath": [
      "_lrot"
@@ -792,7 +917,7 @@
  {
    "__type__": "CCPropertyOverrideInfo",
    "targetInfo": {
-      "__id__": 41
+      "__id__": 50
    },
    "propertyPath": [
      "_euler"
@@ -807,7 +932,7 @@
  {
    "__type__": "CCPropertyOverrideInfo",
    "targetInfo": {
-      "__id__": 46
+      "__id__": 55
    },
    "propertyPath": [
      "_lpos"
@@ -828,7 +953,7 @@
  {
    "__type__": "CCPropertyOverrideInfo",
    "targetInfo": {
-      "__id__": 41
+      "__id__": 50
    },
    "propertyPath": [
      "_lscale"
@@ -840,131 +965,6 @@
      "z": 1
    }
  },
-  {
-    "__type__": "cc.Node",
-    "_objFlags": 0,
-    "_parent": {
-      "__id__": 1
-    },
-    "_prefab": {
-      "__id__": 49
-    },
-    "__editorExtras__": {}
-  },
-  {
-    "__type__": "cc.PrefabInfo",
-    "root": {
-      "__id__": 48
-    },
-    "asset": {
-      "__uuid__": "5b4ca49e-0f12-4478-b56d-bf8198b36b90",
-      "__expectedType__": "cc.Prefab"
-    },
-    "fileId": "0d6ZXmA5dHkZxoGONDL2sE",
-    "instance": {
-      "__id__": 50
-    },
-    "targetOverrides": null
-  },
-  {
-    "__type__": "cc.PrefabInstance",
-    "fileId": "fe79INE+JI1Jy2Hu0iKLMn",
-    "prefabRootNode": {
-      "__id__": 1
-    },
-    "mountedChildren": [],
-    "mountedComponents": [],
-    "propertyOverrides": [
-      {
-        "__id__": 51
-      },
-      {
-        "__id__": 53
-      },
-      {
-        "__id__": 54
-      },
-      {
-        "__id__": 55
-      },
-      {
-        "__id__": 56
-      }
-    ],
-    "removedComponents": []
-  },
-  {
-    "__type__": "CCPropertyOverrideInfo",
-    "targetInfo": {
-      "__id__": 52
-    },
-    "propertyPath": [
-      "_name"
-    ],
-    "value": "tooltip"
-  },
-  {
-    "__type__": "cc.TargetInfo",
-    "localID": [
-      "0d6ZXmA5dHkZxoGONDL2sE"
-    ]
-  },
-  {
-    "__type__": "CCPropertyOverrideInfo",
-    "targetInfo": {
-      "__id__": 52
-    },
-    "propertyPath": [
-      "_lpos"
-    ],
-    "value": {
-      "__type__": "cc.Vec3",
-      "x": 4.65,
-      "y": 129.718,
-      "z": 0
-    }
-  },
-  {
-    "__type__": "CCPropertyOverrideInfo",
-    "targetInfo": {
-      "__id__": 52
-    },
-    "propertyPath": [
-      "_lrot"
-    ],
-    "value": {
-      "__type__": "cc.Quat",
-      "x": 0,
-      "y": 0,
-      "z": 0,
-      "w": 1
-    }
-  },
-  {
-    "__type__": "CCPropertyOverrideInfo",
-    "targetInfo": {
-      "__id__": 52
-    },
-    "propertyPath": [
-      "_euler"
-    ],
-    "value": {
-      "__type__": "cc.Vec3",
-      "x": 0,
-      "y": 0,
-      "z": 0
-    }
-  },
-  {
-    "__type__": "CCPropertyOverrideInfo",
-    "targetInfo": {
-      "__id__": 52
-    },
-    "propertyPath": [
-      "_active"
-    ],
-    "value": false
-  },
  {
    "__type__": "cc.Node",
    "_objFlags": 0,
@@ -1579,7 +1579,7 @@
      "__id__": 100
    },
    "anm": {
-      "__id__": 22
+      "__id__": 31
    },
    "_id": ""
  },
@@ -1648,13 +1648,13 @@
        "__id__": 57
      },
      {
-        "__id__": 48
+        "__id__": 46
      },
      {
-        "__id__": 37
+        "__id__": 34
      },
      {
-        "__id__": 25
+        "__id__": 17
      },
      {
        "__id__": 8