dd

2024-09-23 08:14:39 +08:00
parent 96c96da552
commit 618a6e3f7b
65 changed files with 38950 additions and 8530 deletions
--- a/assets/resources/game/skills/heathed.prefab
+++ b/assets/resources/game/skills/heathed.prefab
@@ -25,14 +25,14 @@
    "_active": false,
    "_components": [
      {
-        "__id__": 10
+        "__id__": 8
      },
      {
-        "__id__": 12
+        "__id__": 10
      }
    ],
    "_prefab": {
-      "__id__": 14
+      "__id__": 12
    },
    "_lpos": {
      "__type__": "cc.Vec3",
@@ -79,18 +79,15 @@
      },
      {
        "__id__": 5
-      },
-      {
-        "__id__": 7
      }
    ],
    "_prefab": {
-      "__id__": 9
+      "__id__": 7
    },
    "_lpos": {
      "__type__": "cc.Vec3",
      "x": 0,
-      "y": 15,
+      "y": 20,
      "z": 0
    },
    "_lrot": {
@@ -145,7 +142,7 @@
    "fileId": "b4sNQPJWFKha7x75SWXmRj"
  },
  {
-    "__type__": "cc.Sprite",
+    "__type__": "sp.Skeleton",
    "_name": "",
    "_objFlags": 0,
    "__editorExtras__": {},
@@ -164,59 +161,30 @@
      "r": 255,
      "g": 255,
      "b": 255,
-      "a": 189
+      "a": 255
    },
-    "_spriteFrame": {
-      "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@fe592",
-      "__expectedType__": "cc.SpriteFrame"
+    "_skeletonData": {
+      "__uuid__": "2b3e4b0f-2c6b-4e36-b35e-6a1e5564c1ef",
+      "__expectedType__": "sp.SkeletonData"
    },
-    "_type": 0,
-    "_fillType": 0,
-    "_sizeMode": 0,
-    "_fillCenter": {
-      "__type__": "cc.Vec2",
-      "x": 0,
-      "y": 0
-    },
-    "_fillStart": 0,
-    "_fillRange": 0,
-    "_isTrimmedMode": true,
-    "_useGrayscale": false,
-    "_atlas": null,
+    "defaultSkin": "default",
+    "defaultAnimation": "animation",
+    "_premultipliedAlpha": true,
+    "_timeScale": 1,
+    "_preCacheMode": 1,
+    "_cacheMode": 1,
+    "_sockets": [],
+    "_useTint": false,
+    "_debugMesh": false,
+    "_debugBones": false,
+    "_debugSlots": false,
+    "_enableBatch": false,
+    "loop": true,
    "_id": ""
  },
  {
    "__type__": "cc.CompPrefabInfo",
-    "fileId": "9a+65VIghBm4HQxuHPQ/mg"
-  },
-  {
-    "__type__": "cc.Animation",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 2
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 8
-    },
-    "playOnLoad": true,
-    "_clips": [
-      {
-        "__uuid__": "e0c4f819-15df-490b-b85b-bb5c5ec1e33b",
-        "__expectedType__": "cc.AnimationClip"
-      }
-    ],
-    "_defaultClip": {
-      "__uuid__": "e0c4f819-15df-490b-b85b-bb5c5ec1e33b",
-      "__expectedType__": "cc.AnimationClip"
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "cc1FBbHhlBirJkBcBIHROd"
+    "fileId": "19bfqDKVVABp98vs44D9nn"
  },
  {
    "__type__": "cc.PrefabInfo",
@@ -241,7 +209,7 @@
    },
    "_enabled": true,
    "__prefab": {
-      "__id__": 11
+      "__id__": 9
    },
    "_contentSize": {
      "__type__": "cc.Size",
@@ -260,7 +228,7 @@
    "fileId": "63NP9yq3hEUKD/OZZZ5t7x"
  },
  {
-    "__type__": "9df17PD7tBNSJwn4urZqfaP",
+    "__type__": "6e0a9ldFsFFVI+AKTlPJCE7",
    "_name": "",
    "_objFlags": 0,
    "__editorExtras__": {},
@@ -269,13 +237,13 @@
    },
    "_enabled": true,
    "__prefab": {
-      "__id__": 13
+      "__id__": 11
    },
    "_id": ""
  },
  {
    "__type__": "cc.CompPrefabInfo",
-    "fileId": "9ascdecXpHsbT6oFKKynfa"
+    "fileId": "d1sugNhMpATaYxRUKCj8i/"
  },
  {
    "__type__": "cc.PrefabInfo",
--- a/assets/resources/game/skills/shield.prefab
+++ b/assets/resources/game/skills/shield.prefab
@@ -170,7 +170,7 @@
      "a": 255
    },
    "_spriteFrame": {
-      "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@f599c",
+      "__uuid__": "45af5702-7585-4d72-85cf-d7b8da02d832@97bba",
      "__expectedType__": "cc.SpriteFrame"
    },
    "_type": 0,
--- a/assets/resources/game/skills/skills.plist
+++ b/assets/resources/game/skills/skills.plist
@@ -30,7 +30,7 @@
                <key>spriteSourceSize</key>
                <string>{160,60}</string>
                <key>textureRect</key>
-                <string>{{223,1},{160,60}}</string>
+                <string>{{1,65},{160,60}}</string>
                <key>textureRotated</key>
                <false/>
            </dict>
@@ -45,7 +45,7 @@
                <key>spriteSourceSize</key>
                <string>{217,58}</string>
                <key>textureRect</key>
-                <string>{{1,65},{217,58}}</string>
+                <string>{{223,1},{217,58}}</string>
                <key>textureRotated</key>
                <false/>
            </dict>
@@ -64,6 +64,21 @@
                <key>textureRotated</key>
                <false/>
            </dict>
+            <key>baohushijian.png</key>
+            <dict>
+                <key>aliases</key>
+                <array/>
+                <key>spriteOffset</key>
+                <string>{0,0}</string>
+                <key>spriteSize</key>
+                <string>{80,83}</string>
+                <key>spriteSourceSize</key>
+                <string>{82,85}</string>
+                <key>textureRect</key>
+                <string>{{571,1},{80,83}}</string>
+                <key>textureRotated</key>
+                <false/>
+            </dict>
            <key>k_shield-2.png</key>
            <dict>
                <key>aliases</key>
@@ -75,7 +90,7 @@
                <key>spriteSourceSize</key>
                <string>{64,116}</string>
                <key>textureRect</key>
-                <string>{{223,63},{64,116}}</string>
+                <string>{{223,61},{64,116}}</string>
                <key>textureRotated</key>
                <true/>
            </dict>
@@ -90,7 +105,7 @@
                <key>spriteSourceSize</key>
                <string>{64,116}</string>
                <key>textureRect</key>
-                <string>{{341,63},{64,116}}</string>
+                <string>{{341,61},{64,116}}</string>
                <key>textureRotated</key>
                <true/>
            </dict>
@@ -106,9 +121,9 @@
            <key>realTextureFileName</key>
            <string>skills.png</string>
            <key>size</key>
-            <string>{570,128}</string>
+            <string>{652,126}</string>
            <key>smartupdate</key>
-            <string>$TexturePacker:SmartUpdate:af64fe94524129451d8c85f50c8579cb:3f9bd602a2698454983429844492221c:37e596914ac459dbdf00101432af5e18$</string>
+            <string>$TexturePacker:SmartUpdate:4b05cd9625692e1378d6c3d279dca35f:c375bdff73bed86746f1342d22d253e8:37e596914ac459dbdf00101432af5e18$</string>
            <key>textureFileName</key>
            <string>skills.png</string>
        </dict>
--- a/assets/resources/game/skills/skills.plist.meta
+++ b/assets/resources/game/skills/skills.plist.meta
@@ -65,8 +65,8 @@
        "rotated": false,
        "offsetX": 0,
        "offsetY": 0,
-        "trimX": 223,
-        "trimY": 1,
+        "trimX": 1,
+        "trimY": 65,
        "width": 160,
        "height": 60,
        "rawWidth": 160,
@@ -111,8 +111,8 @@
        "rotated": false,
        "offsetX": 0,
        "offsetY": 0,
-        "trimX": 1,
-        "trimY": 65,
+        "trimX": 223,
+        "trimY": 1,
        "width": 217,
        "height": 58,
        "rawWidth": 217,
@@ -191,6 +191,52 @@
      ],
      "subMetas": {}
    },
+    "97bba": {
+      "importer": "sprite-frame",
+      "uuid": "45af5702-7585-4d72-85cf-d7b8da02d832@97bba",
+      "displayName": "",
+      "id": "97bba",
+      "name": "baohushijian",
+      "userData": {
+        "trimType": "auto",
+        "trimThreshold": 1,
+        "rotated": false,
+        "offsetX": 0,
+        "offsetY": 0,
+        "trimX": 571,
+        "trimY": 1,
+        "width": 80,
+        "height": 83,
+        "rawWidth": 82,
+        "rawHeight": 85,
+        "borderTop": 0,
+        "borderBottom": 0,
+        "borderLeft": 0,
+        "borderRight": 0,
+        "packable": true,
+        "pixelsToUnit": 100,
+        "pivotX": 0.5,
+        "pivotY": 0.5,
+        "meshType": 0,
+        "vertices": {
+          "rawPosition": [],
+          "indexes": [],
+          "uv": [],
+          "nuv": [],
+          "minPos": [],
+          "maxPos": []
+        },
+        "isUuid": true,
+        "imageUuidOrDatabaseUri": "cd104e76-5215-49fe-a074-e65ffa26583e@6c48a",
+        "atlasUuid": "45af5702-7585-4d72-85cf-d7b8da02d832"
+      },
+      "ver": "1.0.12",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    },
    "4421a": {
      "importer": "sprite-frame",
      "uuid": "45af5702-7585-4d72-85cf-d7b8da02d832@4421a",
@@ -204,7 +250,7 @@
        "offsetX": 0,
        "offsetY": 0,
        "trimX": 223,
-        "trimY": 63,
+        "trimY": 61,
        "width": 64,
        "height": 116,
        "rawWidth": 64,
@@ -250,7 +296,7 @@
        "offsetX": 0,
        "offsetY": 0,
        "trimX": 341,
-        "trimY": 63,
+        "trimY": 61,
        "width": 64,
        "height": 116,
        "rawWidth": 64,
--- a/assets/resources/game/skills/skills.png
+++ b/assets/resources/game/skills/skills.png