新hero 基本完成

assets/resources/game/hero/arc1.prefab

@@ -186,7 +186,7 @@
     "enabledContactListener": true,
     "bullet": true,
     "awakeOnLoad": true,
-    "_group": 2,
+    "_group": 4,
     "_type": 1,
     "_allowSleep": false,
     "_gravityScale": 0,
@@ -218,7 +218,7 @@
       "__id__": 8
     },
     "tag": 4,
-    "_group": 2,
+    "_group": 4,
     "_density": 0,
     "_sensor": false,
     "_friction": 0.2,

assets/resources/game/hero/arc2.prefab

@@ -186,7 +186,7 @@
     "enabledContactListener": true,
     "bullet": true,
     "awakeOnLoad": true,
-    "_group": 2,
+    "_group": 4,
     "_type": 1,
     "_allowSleep": false,
     "_gravityScale": 0,
@@ -218,7 +218,7 @@
       "__id__": 8
     },
     "tag": 4,
-    "_group": 2,
+    "_group": 4,
     "_density": 0,
     "_sensor": false,
     "_friction": 0.2,

assets/resources/game/hero/arc3.prefab

@@ -186,7 +186,7 @@
     "enabledContactListener": true,
     "bullet": true,
     "awakeOnLoad": true,
-    "_group": 2,
+    "_group": 4,
     "_type": 1,
     "_allowSleep": false,
     "_gravityScale": 0,
@@ -218,7 +218,7 @@
       "__id__": 8
     },
     "tag": 4,
-    "_group": 2,
+    "_group": 4,
     "_density": 0,
     "_sensor": false,
     "_friction": 0.2,

assets/resources/game/hero/hero_icon.plist

@@ -0,0 +1,161 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+    <dict>
+        <key>frames</key>
+        <dict>
+            <key>9001.png</key>
+            <dict>
+                <key>aliases</key>
+                <array/>
+                <key>spriteOffset</key>
+                <string>{2,1}</string>
+                <key>spriteSize</key>
+                <string>{58,65}</string>
+                <key>spriteSourceSize</key>
+                <string>{102,75}</string>
+                <key>textureRect</key>
+                <string>{{1,1},{58,65}}</string>
+                <key>textureRotated</key>
+                <true/>
+            </dict>
+            <key>9002.png</key>
+            <dict>
+                <key>aliases</key>
+                <array/>
+                <key>spriteOffset</key>
+                <string>{2,1}</string>
+                <key>spriteSize</key>
+                <string>{58,65}</string>
+                <key>spriteSourceSize</key>
+                <string>{102,75}</string>
+                <key>textureRect</key>
+                <string>{{68,1},{58,65}}</string>
+                <key>textureRotated</key>
+                <true/>
+            </dict>
+            <key>9003.png</key>
+            <dict>
+                <key>aliases</key>
+                <array/>
+                <key>spriteOffset</key>
+                <string>{2,1}</string>
+                <key>spriteSize</key>
+                <string>{58,65}</string>
+                <key>spriteSourceSize</key>
+                <string>{102,75}</string>
+                <key>textureRect</key>
+                <string>{{135,1},{58,65}}</string>
+                <key>textureRotated</key>
+                <true/>
+            </dict>
+            <key>9004.png</key>
+            <dict>
+                <key>aliases</key>
+                <array/>
+                <key>spriteOffset</key>
+                <string>{-2,-1}</string>
+                <key>spriteSize</key>
+                <string>{57,59}</string>
+                <key>spriteSourceSize</key>
+                <string>{97,75}</string>
+                <key>textureRect</key>
+                <string>{{324,1},{57,59}}</string>
+                <key>textureRotated</key>
+                <false/>
+            </dict>
+            <key>9005.png</key>
+            <dict>
+                <key>aliases</key>
+                <array/>
+                <key>spriteOffset</key>
+                <string>{-2,-1}</string>
+                <key>spriteSize</key>
+                <string>{59,59}</string>
+                <key>spriteSourceSize</key>
+                <string>{97,75}</string>
+                <key>textureRect</key>
+                <string>{{202,1},{59,59}}</string>
+                <key>textureRotated</key>
+                <false/>
+            </dict>
+            <key>9006.png</key>
+            <dict>
+                <key>aliases</key>
+                <array/>
+                <key>spriteOffset</key>
+                <string>{-2,-1}</string>
+                <key>spriteSize</key>
+                <string>{59,59}</string>
+                <key>spriteSourceSize</key>
+                <string>{97,75}</string>
+                <key>textureRect</key>
+                <string>{{263,1},{59,59}}</string>
+                <key>textureRotated</key>
+                <false/>
+            </dict>
+            <key>9007.png</key>
+            <dict>
+                <key>aliases</key>
+                <array/>
+                <key>spriteOffset</key>
+                <string>{5,1}</string>
+                <key>spriteSize</key>
+                <string>{49,61}</string>
+                <key>spriteSourceSize</key>
+                <string>{93,75}</string>
+                <key>textureRect</key>
+                <string>{{515,1},{49,61}}</string>
+                <key>textureRotated</key>
+                <true/>
+            </dict>
+            <key>9008.png</key>
+            <dict>
+                <key>aliases</key>
+                <array/>
+                <key>spriteOffset</key>
+                <string>{7,2}</string>
+                <key>spriteSize</key>
+                <string>{51,63}</string>
+                <key>spriteSourceSize</key>
+                <string>{93,75}</string>
+                <key>textureRect</key>
+                <string>{{383,1},{51,63}}</string>
+                <key>textureRotated</key>
+                <true/>
+            </dict>
+            <key>9009.png</key>
+            <dict>
+                <key>aliases</key>
+                <array/>
+                <key>spriteOffset</key>
+                <string>{5,3}</string>
+                <key>spriteSize</key>
+                <string>{49,65}</string>
+                <key>spriteSourceSize</key>
+                <string>{93,75}</string>
+                <key>textureRect</key>
+                <string>{{448,1},{49,65}}</string>
+                <key>textureRotated</key>
+                <true/>
+            </dict>
+        </dict>
+        <key>metadata</key>
+        <dict>
+            <key>format</key>
+            <integer>3</integer>
+            <key>pixelFormat</key>
+            <string>RGBA8888</string>
+            <key>premultiplyAlpha</key>
+            <false/>
+            <key>realTextureFileName</key>
+            <string>hero_icon.png</string>
+            <key>size</key>
+            <string>{577,61}</string>
+            <key>smartupdate</key>
+            <string>$TexturePacker:SmartUpdate:b666e620e0fbd74ba68e9b9dab77417c:4220b683e840b7ee85b058f1cab5fdc1:edcadbf732503a41ecf1a90e72dba274$</string>
+            <key>textureFileName</key>
+            <string>hero_icon.png</string>
+        </dict>
+    </dict>
+</plist>

assets/resources/game/hero/hero_icon.plist.meta

@@ -0,0 +1,431 @@
+{
+  "ver": "1.0.8",
+  "importer": "sprite-atlas",
+  "imported": true,
+  "uuid": "946b5b69-c398-48c5-9a5d-a398a02d0cf5",
+  "files": [
+    ".json"
+  ],
+  "subMetas": {
+    "80343": {
+      "importer": "sprite-frame",
+      "uuid": "946b5b69-c398-48c5-9a5d-a398a02d0cf5@80343",
+      "displayName": "",
+      "id": "80343",
+      "name": "9006",
+      "userData": {
+        "trimType": "auto",
+        "trimThreshold": 1,
+        "rotated": false,
+        "offsetX": -2,
+        "offsetY": -1,
+        "trimX": 263,
+        "trimY": 1,
+        "width": 59,
+        "height": 59,
+        "rawWidth": 97,
+        "rawHeight": 75,
+        "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": "c86e353b-53c2-4b3b-8e75-6ebdae0fa11d@6c48a",
+        "atlasUuid": "946b5b69-c398-48c5-9a5d-a398a02d0cf5"
+      },
+      "ver": "1.0.12",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    },
+    "c8366": {
+      "importer": "sprite-frame",
+      "uuid": "946b5b69-c398-48c5-9a5d-a398a02d0cf5@c8366",
+      "displayName": "",
+      "id": "c8366",
+      "name": "9001",
+      "userData": {
+        "trimType": "auto",
+        "trimThreshold": 1,
+        "rotated": true,
+        "offsetX": 2,
+        "offsetY": 1,
+        "trimX": 1,
+        "trimY": 1,
+        "width": 58,
+        "height": 65,
+        "rawWidth": 102,
+        "rawHeight": 75,
+        "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": "c86e353b-53c2-4b3b-8e75-6ebdae0fa11d@6c48a",
+        "atlasUuid": "946b5b69-c398-48c5-9a5d-a398a02d0cf5"
+      },
+      "ver": "1.0.12",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    },
+    "fa39c": {
+      "importer": "sprite-frame",
+      "uuid": "946b5b69-c398-48c5-9a5d-a398a02d0cf5@fa39c",
+      "displayName": "",
+      "id": "fa39c",
+      "name": "9002",
+      "userData": {
+        "trimType": "auto",
+        "trimThreshold": 1,
+        "rotated": true,
+        "offsetX": 2,
+        "offsetY": 1,
+        "trimX": 68,
+        "trimY": 1,
+        "width": 58,
+        "height": 65,
+        "rawWidth": 102,
+        "rawHeight": 75,
+        "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": "c86e353b-53c2-4b3b-8e75-6ebdae0fa11d@6c48a",
+        "atlasUuid": "946b5b69-c398-48c5-9a5d-a398a02d0cf5"
+      },
+      "ver": "1.0.12",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    },
+    "5c4dd": {
+      "importer": "sprite-frame",
+      "uuid": "946b5b69-c398-48c5-9a5d-a398a02d0cf5@5c4dd",
+      "displayName": "",
+      "id": "5c4dd",
+      "name": "9003",
+      "userData": {
+        "trimType": "auto",
+        "trimThreshold": 1,
+        "rotated": true,
+        "offsetX": 2,
+        "offsetY": 1,
+        "trimX": 135,
+        "trimY": 1,
+        "width": 58,
+        "height": 65,
+        "rawWidth": 102,
+        "rawHeight": 75,
+        "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": "c86e353b-53c2-4b3b-8e75-6ebdae0fa11d@6c48a",
+        "atlasUuid": "946b5b69-c398-48c5-9a5d-a398a02d0cf5"
+      },
+      "ver": "1.0.12",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    },
+    "3e072": {
+      "importer": "sprite-frame",
+      "uuid": "946b5b69-c398-48c5-9a5d-a398a02d0cf5@3e072",
+      "displayName": "",
+      "id": "3e072",
+      "name": "9004",
+      "userData": {
+        "trimType": "auto",
+        "trimThreshold": 1,
+        "rotated": false,
+        "offsetX": -2,
+        "offsetY": -1,
+        "trimX": 324,
+        "trimY": 1,
+        "width": 57,
+        "height": 59,
+        "rawWidth": 97,
+        "rawHeight": 75,
+        "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": "c86e353b-53c2-4b3b-8e75-6ebdae0fa11d@6c48a",
+        "atlasUuid": "946b5b69-c398-48c5-9a5d-a398a02d0cf5"
+      },
+      "ver": "1.0.12",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    },
+    "675ef": {
+      "importer": "sprite-frame",
+      "uuid": "946b5b69-c398-48c5-9a5d-a398a02d0cf5@675ef",
+      "displayName": "",
+      "id": "675ef",
+      "name": "9005",
+      "userData": {
+        "trimType": "auto",
+        "trimThreshold": 1,
+        "rotated": false,
+        "offsetX": -2,
+        "offsetY": -1,
+        "trimX": 202,
+        "trimY": 1,
+        "width": 59,
+        "height": 59,
+        "rawWidth": 97,
+        "rawHeight": 75,
+        "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": "c86e353b-53c2-4b3b-8e75-6ebdae0fa11d@6c48a",
+        "atlasUuid": "946b5b69-c398-48c5-9a5d-a398a02d0cf5"
+      },
+      "ver": "1.0.12",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    },
+    "618a6": {
+      "importer": "sprite-frame",
+      "uuid": "946b5b69-c398-48c5-9a5d-a398a02d0cf5@618a6",
+      "displayName": "",
+      "id": "618a6",
+      "name": "9007",
+      "userData": {
+        "trimType": "auto",
+        "trimThreshold": 1,
+        "rotated": true,
+        "offsetX": 5,
+        "offsetY": 1,
+        "trimX": 515,
+        "trimY": 1,
+        "width": 49,
+        "height": 61,
+        "rawWidth": 93,
+        "rawHeight": 75,
+        "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": "c86e353b-53c2-4b3b-8e75-6ebdae0fa11d@6c48a",
+        "atlasUuid": "946b5b69-c398-48c5-9a5d-a398a02d0cf5"
+      },
+      "ver": "1.0.12",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    },
+    "a073d": {
+      "importer": "sprite-frame",
+      "uuid": "946b5b69-c398-48c5-9a5d-a398a02d0cf5@a073d",
+      "displayName": "",
+      "id": "a073d",
+      "name": "9008",
+      "userData": {
+        "trimType": "auto",
+        "trimThreshold": 1,
+        "rotated": true,
+        "offsetX": 7,
+        "offsetY": 2,
+        "trimX": 383,
+        "trimY": 1,
+        "width": 51,
+        "height": 63,
+        "rawWidth": 93,
+        "rawHeight": 75,
+        "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": "c86e353b-53c2-4b3b-8e75-6ebdae0fa11d@6c48a",
+        "atlasUuid": "946b5b69-c398-48c5-9a5d-a398a02d0cf5"
+      },
+      "ver": "1.0.12",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    },
+    "d2107": {
+      "importer": "sprite-frame",
+      "uuid": "946b5b69-c398-48c5-9a5d-a398a02d0cf5@d2107",
+      "displayName": "",
+      "id": "d2107",
+      "name": "9009",
+      "userData": {
+        "trimType": "auto",
+        "trimThreshold": 1,
+        "rotated": true,
+        "offsetX": 5,
+        "offsetY": 3,
+        "trimX": 448,
+        "trimY": 1,
+        "width": 49,
+        "height": 65,
+        "rawWidth": 93,
+        "rawHeight": 75,
+        "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": "c86e353b-53c2-4b3b-8e75-6ebdae0fa11d@6c48a",
+        "atlasUuid": "946b5b69-c398-48c5-9a5d-a398a02d0cf5"
+      },
+      "ver": "1.0.12",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    }
+  },
+  "userData": {
+    "atlasTextureName": "hero_icon.png",
+    "format": 3,
+    "uuid": "946b5b69-c398-48c5-9a5d-a398a02d0cf5",
+    "textureUuid": "c86e353b-53c2-4b3b-8e75-6ebdae0fa11d@6c48a"
+  }
+}

assets/resources/game/hero/hero_icon.png.meta

@@ -0,0 +1,42 @@
+{
+  "ver": "1.0.26",
+  "importer": "image",
+  "imported": true,
+  "uuid": "c86e353b-53c2-4b3b-8e75-6ebdae0fa11d",
+  "files": [
+    ".json",
+    ".png"
+  ],
+  "subMetas": {
+    "6c48a": {
+      "importer": "texture",
+      "uuid": "c86e353b-53c2-4b3b-8e75-6ebdae0fa11d@6c48a",
+      "displayName": "hero_icon",
+      "id": "6c48a",
+      "name": "texture",
+      "userData": {
+        "wrapModeS": "repeat",
+        "wrapModeT": "repeat",
+        "minfilter": "linear",
+        "magfilter": "linear",
+        "mipfilter": "none",
+        "anisotropy": 0,
+        "isUuid": true,
+        "imageUuidOrDatabaseUri": "c86e353b-53c2-4b3b-8e75-6ebdae0fa11d",
+        "visible": false
+      },
+      "ver": "1.0.22",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    }
+  },
+  "userData": {
+    "hasAlpha": true,
+    "type": "texture",
+    "fixAlphaTransparencyArtifacts": false,
+    "redirect": "c86e353b-53c2-4b3b-8e75-6ebdae0fa11d@6c48a"
+  }
+}

assets/resources/game/hero/k1.prefab

@@ -186,7 +186,7 @@
     "enabledContactListener": true,
     "bullet": true,
     "awakeOnLoad": true,
-    "_group": 2,
+    "_group": 4,
     "_type": 1,
     "_allowSleep": false,
     "_gravityScale": 0,
@@ -218,7 +218,7 @@
       "__id__": 8
     },
     "tag": 4,
-    "_group": 2,
+    "_group": 4,
     "_density": 0,
     "_sensor": false,
     "_friction": 0.2,

assets/resources/game/hero/k2.prefab

@@ -186,7 +186,7 @@
     "enabledContactListener": true,
     "bullet": true,
     "awakeOnLoad": true,
-    "_group": 2,
+    "_group": 4,
     "_type": 1,
     "_allowSleep": false,
     "_gravityScale": 0,
@@ -218,7 +218,7 @@
       "__id__": 8
     },
     "tag": 4,
-    "_group": 2,
+    "_group": 4,
     "_density": 0,
     "_sensor": false,
     "_friction": 0.2,

assets/resources/game/hero/k3.prefab

@@ -186,7 +186,7 @@
     "enabledContactListener": true,
     "bullet": true,
     "awakeOnLoad": true,
-    "_group": 2,
+    "_group": 4,
     "_type": 1,
     "_allowSleep": false,
     "_gravityScale": 0,
@@ -218,7 +218,7 @@
       "__id__": 8
     },
     "tag": 4,
-    "_group": 2,
+    "_group": 4,
     "_density": 0,
     "_sensor": false,
     "_friction": 0.2,

assets/resources/game/hero/m1.prefab

@@ -186,7 +186,7 @@
     "enabledContactListener": true,
     "bullet": true,
     "awakeOnLoad": true,
-    "_group": 2,
+    "_group": 4,
     "_type": 1,
     "_allowSleep": false,
     "_gravityScale": 0,
@@ -218,7 +218,7 @@
       "__id__": 8
     },
     "tag": 4,
-    "_group": 2,
+    "_group": 4,
     "_density": 0,
     "_sensor": false,
     "_friction": 0.2,

assets/resources/game/hero/m2.prefab

@@ -186,7 +186,7 @@
     "enabledContactListener": true,
     "bullet": true,
     "awakeOnLoad": true,
-    "_group": 2,
+    "_group": 4,
     "_type": 1,
     "_allowSleep": false,
     "_gravityScale": 0,
@@ -218,7 +218,7 @@
       "__id__": 8
     },
     "tag": 4,
-    "_group": 2,
+    "_group": 4,
     "_density": 0,
     "_sensor": false,
     "_friction": 0.2,

assets/resources/game/hero/m3.prefab

@@ -186,7 +186,7 @@
     "enabledContactListener": true,
     "bullet": true,
     "awakeOnLoad": true,
-    "_group": 2,
+    "_group": 4,
     "_type": 1,
     "_allowSleep": false,
     "_gravityScale": 0,
@@ -218,7 +218,7 @@
       "__id__": 8
     },
     "tag": 4,
-    "_group": 2,
+    "_group": 4,
     "_density": 0,
     "_sensor": false,
     "_friction": 0.2,

assets/resources/gui/card_info.prefab.meta

@@ -1,13 +0,0 @@
-{
-  "ver": "1.1.50",
-  "importer": "prefab",
-  "imported": true,
-  "uuid": "8e4fb949-6668-4442-bd81-7c6a95e6512f",
-  "files": [
-    ".json"
-  ],
-  "subMetas": {},
-  "userData": {
-    "syncNodeName": "card_info"
-  }
-}

assets/script/game/common/config/CardSet.ts

@@ -2,11 +2,34 @@
      CardList type: 1:精灵 2:技能 3:装备
  */
 
-export const CardList=[
+export const CardList={
-          // {uuid:1101,type:1},{uuid:1102,type:1},{uuid:1103,type:1},{uuid:1104,type:1},{uuid:1105,type:1},{uuid:1106,type:1},{uuid:1107,type:1},
+     1:[
-          // {uuid:1108,type:1},{uuid:1109,type:1},{uuid:1110,type:1},{uuid:1113,type:1},{uuid:1114,type:1},{uuid:1115,type:1},{uuid:1116,type:1},
+          {uuid:9001,type:1},{uuid:9002,type:1},{uuid:9003,type:1},{uuid:9004,type:1},{uuid:9005,type:1},{uuid:9006,type:1},
+          // {uuid:9007,type:1},{uuid:9008,type:1},{uuid:9009,type:1},{uuid:9010,type:1},{uuid:9011,type:1},{uuid:9012,type:1},
+     ],
+     2:[
+          {uuid:9001,type:1},{uuid:9002,type:1},{uuid:9003,type:1},{uuid:9004,type:1},{uuid:9005,type:1},{uuid:9006,type:1},
+          // {uuid:9007,type:1},{uuid:9008,type:1},{uuid:9009,type:1},{uuid:9010,type:1},{uuid:9011,type:1},{uuid:9012,type:1},
+     ],
+     3:[
+          {uuid:9001,type:1},{uuid:9002,type:1},{uuid:9003,type:1},{uuid:9004,type:1},{uuid:9005,type:1},{uuid:9006,type:1},
+          // {uuid:9007,type:1},{uuid:9008,type:1},{uuid:9009,type:1},{uuid:9010,type:1},{uuid:9011,type:1},{uuid:9012,type:1},
+     ],
+     4:[
           {uuid:1001,type:2},{uuid:1002,type:2},{uuid:4011,type:2},{uuid:4012,type:2},
-          {uuid:6001,type:3},{uuid:6004,type:3},{uuid:6101,type:3},{uuid:6002,type:3},{uuid:6003,type:3},{uuid:6005,type:3},{uuid:6006,type:3},{uuid:6102,type:3},{uuid:6103,type:3},
+          {uuid:6001,type:3},{uuid:6004,type:3},{uuid:6101,type:3},{uuid:6002,type:3},{uuid:6003,type:3},{uuid:6005,type:3},{uuid:6006,type:3},
-          {uuid:6210,type:3},{uuid:6213,type:3},{uuid:6216,type:3},{uuid:6211,type:3},{uuid:6212,type:3},{uuid:6214,type:3},{uuid:6215,type:3},{uuid:6217,type:3},{uuid:6218,type:3},
+          {uuid:6102,type:3},{uuid:6103,type:3}, {uuid:6210,type:3},{uuid:6213,type:3},{uuid:6216,type:3},{uuid:6211,type:3},{uuid:6212,type:3},
-     ]
+          {uuid:6214,type:3},{uuid:6215,type:3},{uuid:6217,type:3},{uuid:6218,type:3},
+     ],
+     5:[
+          {uuid:9001,type:1},{uuid:9002,type:1},{uuid:9003,type:1},{uuid:9004,type:1},{uuid:9005,type:1},{uuid:9006,type:1},
+          // {uuid:9007,type:1},{uuid:9008,type:1},{uuid:9009,type:1},{uuid:9010,type:1},{uuid:9011,type:1},{uuid:9012,type:1},
+     ],
+     6:[
+          {uuid:1001,type:2},{uuid:1002,type:2},{uuid:4011,type:2},{uuid:4012,type:2},
+          {uuid:6001,type:3},{uuid:6004,type:3},{uuid:6101,type:3},{uuid:6002,type:3},{uuid:6003,type:3},{uuid:6005,type:3},{uuid:6006,type:3},
+          {uuid:6102,type:3},{uuid:6103,type:3}, {uuid:6210,type:3},{uuid:6213,type:3},{uuid:6216,type:3},{uuid:6211,type:3},{uuid:6212,type:3},
+          {uuid:6214,type:3},{uuid:6215,type:3},{uuid:6217,type:3},{uuid:6218,type:3},
+     ],
 
+}

assets/script/game/common/config/heroSet.ts

@@ -1,31 +1,22 @@
 
 export const HeroSet={
-        1101:{uuid: 1101,path: 1101,type: 1,level: 1,name: "守护犬",atk: 4,hp: 24,atk_cd: 2,power: 50,speed: 30,
+        9001:{uuid: 9001,path: "k1",type: 1,level: 1,name: "战士1",atk: 4,hp: 24,atk_cd: 2,power: 50,speed: 30,
             skill: "base",max_skill: "base",skill_uuid: 9001,max_skill_uuid: 1001,word: "守护",info: "自身护盾", atktype: "攻击型",mon: "狗"},
-        1102:{uuid: 1102,path: 1102,type: 2,level: 1,name: "羊咩咩",atk: 2,hp: 48,atk_cd: 2,power: 50,speed: 30,
+        9002:{uuid: 9002,path: "k2",type: 2,level: 1,name: "战士2",atk: 2,hp: 48,atk_cd: 2,power: 50,speed: 30,
             skill: "base",max_skill: "base",skill_uuid: 9001,max_skill_uuid: 1001,word: "守护",info: "自身护盾", atktype: "血量型",mon: "绵羊"},
-        1103:{uuid: 1103,path: 1103,type: 1,level: 1,name: "战斗蚁",atk: 4,hp: 24,atk_cd: 2,power: 50,speed: 30,
+        9003:{uuid: 9003,path: "k3",type: 1,level: 1,name: "战士3",atk: 4,hp: 24,atk_cd: 2,power: 50,speed: 30,
             skill: "base",max_skill: "base",skill_uuid: 9001,max_skill_uuid: 1001, atktype: "攻击型",mon: "蚂蚁"},
-        1104:{uuid: 1104,path: 1104,type: 1,level: 1,name: "搬运蚁",atk: 4,hp: 24,atk_cd: 2,power: 50,speed: 30,
+        9004:{uuid: 9004,path: "m1",type: 1,level: 1,name: "魔法师1",atk: 4,hp: 24,atk_cd: 2,power: 50,speed: 30,
             skill: "base",max_skill: "base",skill_uuid: 9001,max_skill_uuid: 1001, atktype: "攻击型",mon: "蚂蚁"},
-        1105:{uuid: 1105,path: 1105,type: 3,level: 1,name: "闪电鼠",atk: 3,hp: 18,atk_cd: 1,power: 50,speed: 30,
+        9005:{uuid: 9005,path: "m2",type: 3,level: 1,name: "魔法师2",atk: 3,hp: 18,atk_cd: 1,power: 50,speed: 30,
             skill: "base",max_skill: "base",skill_uuid: 9001,max_skill_uuid: 1001, atktype: "攻速型",mon: "鼠"},
-        1106:{uuid: 1106,path: 1106,type: 3,level: 1,name: "闪电喵",atk: 3,hp: 18,atk_cd: 2,power: 50,speed: 30,
+        9006:{uuid: 9006,path: "m3",type: 3,level: 1,name: "魔法师3",atk: 3,hp: 18,atk_cd: 2,power: 50,speed: 30,
             skill: "base",max_skill: "base",skill_uuid: 9001,max_skill_uuid: 1001,word: "守护",info: "自身护盾", atktype: "攻速型",mon: "猫"},
-        1107:{uuid: 1107,path: 1107,type: 3,level: 1,name: "灵巧松鼠",atk: 3,hp: 18,atk_cd: 1,power: 50,speed: 30,
+        9007:{uuid: 9007,path: "arc1",type: 3,level: 1,name: "弓箭手1",atk: 3,hp: 18,atk_cd: 1,power: 50,speed: 30,
             skill: "base",max_skill: "base",skill_uuid: 9001,max_skill_uuid: 1001,word: "狂暴",info: "全体攻击", atktype: "攻速型",mon: "松鼠"},
-        1108:{uuid: 1108,path: 1108,type: 3,level: 2,name: "机械蜜",atk: 4,hp: 27,atk_cd: 1,power: 50,speed: 30,
+        9008:{uuid: 9008,path: "arc2",type: 3,level: 2,name: "弓箭手2",atk: 4,hp: 27,atk_cd: 1,power: 50,speed: 30,
             skill: "base",max_skill: "base",skill_uuid: 9001,max_skill_uuid: 1001, atktype: "攻速型",mon: "机械蜜蜂"},
-        1109:{uuid: 1109,path: 1109,type: 1,level: 2,name: "猎鹰",atk: 6,hp: 36,atk_cd: 2,power: 50,speed: 30,
+        9009:{uuid: 9009,path: "arc3",type: 1,level: 2,name: "弓箭手3",atk: 6,hp: 36,atk_cd: 2,power: 50,speed: 30,
             skill: "base",max_skill: "base",skill_uuid: 9001,max_skill_uuid: 1001, atktype: "攻击型",mon: "鹰"},
-        1110:{uuid: 1110,path: 1110,type: 2,level: 3,name: "憨憨猪",atk: 5,hp: 108,atk_cd: 2,power: 50,speed: 30,
+        
-            skill: "base",max_skill: "base",skill_uuid: 9001,max_skill_uuid: 1001, atktype: "血量型",mon: "野猪"},
-        1113:{uuid: 1113,path: 1113,type: 3,level: 3,name: "憨憨猪",atk: 6,hp: 45,atk_cd: 1,power: 50,speed: 30,
-            skill: "base",max_skill: "base",skill_uuid: 9001,max_skill_uuid: 1001, atktype: "攻速型",mon: "狮子"},
-        1114:{uuid: 1114,path: 1114,type: 2,level: 4,name: "黑耀犀牛",atk: 7,hp: 162,atk_cd: 2,power: 50,speed: 30,
-            skill: "base",max_skill: "base",skill_uuid: 9001,max_skill_uuid: 1001,word: "雷暴",info: "雷暴", atktype: "血量型",mon: "犀牛"},
-        1115:{uuid: 1115,path: 1115,type: 6,level: 5,name: "雷暴犀牛",atk: 15,hp: 180,atk_cd: 1,power: 50,speed: 30,
-            skill: "base",max_skill: "base",skill_uuid: 9001,max_skill_uuid: 1001, atktype: "精英型",mon: "雷电犀牛"},
-        1116:{uuid: 1116,path: 1116,type: 6,level: 5,name: "雷暴鼠",atk: 15,hp: 180,atk_cd: 1,power: 50,speed: 30,
-            skill: "base",max_skill: "base",skill_uuid: 9001,max_skill_uuid: 1001, atktype: "精英型",mon: "闪电鼠"},
 }

assets/script/game/hero/Hero.ts

@@ -41,7 +41,9 @@ export class Hero extends ecs.Entity {
 
     /** 加载角色 */
     load(pos: Vec3 = Vec3.ZERO,scale:number = -1,uuid:number=1001,layer:Node=smc.map.MapView.scene.entityLayer!.node!) {
-        var path =  "game/monster/"+MonSet[uuid].path;
+        console.log("加载角色",uuid,smc.heros[uuid]);
+
+        var path =  "game/hero/"+smc.heros[uuid].path;
         var prefab: Prefab = oops.res.get(path, Prefab)!;
         var node = instantiate(prefab);
         node.parent=layer
@@ -50,11 +52,11 @@ export class Hero extends ecs.Entity {
         // node.setScale(node.scale.x*scale*ratio, node.scale.y*ratio, 0);
         node.setPosition(pos)
         this.hero_init(uuid,node)
-        oops.message.dispatchEvent("mon_load",this)
+        oops.message.dispatchEvent("hero_load",this)
     }
     set_ratio(uuid:number){
         let ratio=1;
-        switch (MonSet[uuid].level) {
+        switch (smc.heros[uuid].level) {
             case 2:
                 ratio=1.05
                 break;
@@ -76,18 +78,18 @@ export class Hero extends ecs.Entity {
         var mv = node.getComponent(HeroViewComp)!;
         var buff =node.getComponent(HeroBuffComp)!;
         // console.log("hero_init",buff)
-        mv.speed =mv.ospeed = smc.monsters[uuid].speed;
+        mv.speed =mv.ospeed = smc.heros[uuid].speed;
-        mv.hero_name= smc.monsters[uuid].name;
+        mv.hero_name= smc.heros[uuid].name;
-        buff.group=mv.box_group= BoxSet.MONSTER;
+        buff.group=mv.box_group= BoxSet.HERO;
-        mv.hp= mv.hp_max = smc.monsters[uuid].hp;
+        mv.hp= mv.hp_max = smc.heros[uuid].hp;
-        mv.level = smc.monsters[uuid].level;
+        mv.level = smc.heros[uuid].level;
-        mv.atk = smc.monsters[uuid].atk;
+        mv.atk = smc.heros[uuid].atk;
-        mv.atk_cd = smc.monsters[uuid].atk_cd;
+        mv.atk_cd = smc.heros[uuid].atk_cd;
-        mv.power = smc.monsters[uuid].power;
+        mv.power = smc.heros[uuid].power;
-        mv.type = smc.monsters[uuid].type;
+        mv.type = smc.heros[uuid].type;
         mv.skill_uuid = 9001;        
-        mv.max_skill_uuid = smc.monsters[uuid].max_skill_uuid;
+        mv.max_skill_uuid = smc.heros[uuid].max_skill_uuid;
-        mv.scale = -1;
+        mv.scale = 1;
         mv.Tpos = v3(0,0,0);
         this.add(mv);
         this.add(buff);

assets/script/game/hero/HeroViewComp.ts

@@ -172,7 +172,7 @@ export class HeroViewComp extends CCComp {
         this.in_shield();
         this.in_stop(dt);
         this.in_act(dt);
-        // this.move(dt);
+        this.move(dt);
         // if(this.m_timer.update(dt)){
         //     this.move_to()
         // }
@@ -189,9 +189,9 @@ export class HeroViewComp extends CCComp {
         if(this.scale===-1&&this.node.position.x <= BoxSet.HERO_START){
             return;
         }
-        // if(this.enemy){
+        if(this.enemy){
-        //     return
+            return
-        // }
+        }
         this.node.setPosition(this.node.position.x+dt*this.speed*this.scale, this.node.position.y, this.node.position.z);
     }
     move_to(){

assets/script/game/map/CardController.ts

@@ -81,7 +81,6 @@ export class CardControllerComp extends CCComp {
     //     }
     // }
     touch1(event: EventTouch) {
-        console.log("touch 1");
         this.in_touch=true
         if(this.in_load)return
         if(!this.cards[1].alive)return
@@ -89,7 +88,6 @@ export class CardControllerComp extends CCComp {
     }
     
     touch2(event: EventTouch) {
-        console.log("touch 2");
         this.in_touch=true
         if(this.in_load)return
         if(!this.cards[2].alive)return
@@ -97,7 +95,6 @@ export class CardControllerComp extends CCComp {
     }
     
     touch3(event: EventTouch) {
-        console.log("touch 3");
         this.in_touch=true
         if(this.in_load)return
         if(!this.cards[3].alive)return
@@ -105,7 +102,6 @@ export class CardControllerComp extends CCComp {
     }
     
     touch4(event: EventTouch) {
-        console.log("touch 4");
         this.in_touch=true
         if(this.in_load)return
         if(!this.cards[4].alive)return
@@ -113,7 +109,6 @@ export class CardControllerComp extends CCComp {
     }
     
     touch5(event: EventTouch) {
-        console.log("touch 5");
         this.in_touch=true
         if(this.in_load)return
         if(!this.cards[5].alive)return
@@ -121,44 +116,37 @@ export class CardControllerComp extends CCComp {
     }
     
     touch6(event: EventTouch) {
-        console.log("touch 6");
         this.in_touch=true
         if(this.in_load)return
         if(!this.cards[6].alive)return
         this.show_info(this.cards[6].uuid,this.cards[6].type)          
     }
     end1(event: EventTouch) {
-        console.log("end1 1");
         this.onTouchEnd(1)
     }
     
     end2(event: EventTouch) {
-        console.log("end2 2");
         this.onTouchEnd(2)
     }
     
     end3(event: EventTouch) {
-        console.log("end3 3");
         this.onTouchEnd(3)
     }
     
     end4(event: EventTouch) {
-        console.log("end4 4");
         this.onTouchEnd(4)
     }
     
     end5(event: EventTouch) {
-        console.log("end5 5");
         this.onTouchEnd(5)
     }
     
     end6(event: EventTouch) {
-        console.log("end6 6");
         this.onTouchEnd(6)
     }
     
     show_info(uuid:number,type:number){
-        console.log("show_info",uuid)
+        // console.log("show_info",uuid)
         let node =this.node.getChildByName("item_box")
         if(type == 2){
             smc.vm_data.item_box.info = SkillSet[uuid].info
@@ -170,7 +158,6 @@ export class CardControllerComp extends CCComp {
             node.active=true
         }
         if(type == 3){
-            console.log(SkillSet[uuid])
             smc.vm_data.item_box.info = SkillSet[uuid].info
             smc.vm_data.item_box.name = SkillSet[uuid].name
             smc.vm_data.item_box.skillcd = SkillSet[uuid].cd
@@ -243,11 +230,16 @@ export class CardControllerComp extends CCComp {
             smc.vm_data.shuaxin.min = 0
         }
     }
+    
+    get_card_list(li:number){
+        let list = RandomManager.instance.getRandomByObjectList(CardList[li], 1);
+        return list
+    }
     load_cards() {
         this.in_load = true
         let card:any=null
         for (let index = 1; index <= 6; index++) {
-            card=RandomManager.instance.getRandomByObjectList(CardList, 1);
+            card=RandomManager.instance.getRandomByObjectList(CardList[index], 1);
             this.cards[index].uuid=card[0].uuid
             this.cards[index].type=card[0].type
             
@@ -258,8 +250,8 @@ export class CardControllerComp extends CCComp {
             let { uuid, type } = card[0];
             switch (type) {
                 case 1:
-                    url = "game/heros/heros";
+                    url = "game/hero/hero_icon";
-                    ({ path: pathName, name, level } = smc.heros[uuid]);
+                    ({ uuid: pathName, name, level } = smc.heros[uuid]);
                     break;
                 case 2:
                     url = "game/heros/skill";
@@ -271,7 +263,6 @@ export class CardControllerComp extends CCComp {
                     ({ path: pathName, name, level } = smc.skills[uuid]);
             }
             this.cards[index].lv=level
-            console.log("load_cards:",url,pathName,name,level)
             let node=this.node.getChildByName('cards').getChildByName('card'+index)
             node.getChildByName('cost').getComponent(Label).string=level.toString()
             node.getChildByName('name').getComponent(Label).string=name
@@ -352,10 +343,6 @@ export class CardControllerComp extends CCComp {
         }
     }
 
-    get_card_list(){
-        let list = RandomManager.instance.getRandomByObjectList(CardList, 1);
-        return list
-    }
 
     /** 视图对象通过 ecs.Entity.remove(ControllerComp) 删除组件是触发组件处理自定义释放逻辑 */
     reset() {

assets/script/game/map/MapMonsterComp.ts

@@ -10,10 +10,9 @@ import { MapViewScene } from "./view/MapViewScene";
 import { MissionSet,MissionNum,MonsetList } from "../common/config/MissionSet";
 import { RandomManager } from "../../../../extensions/oops-plugin-framework/assets/core/common/random/RandomManager";
 import { Role } from "../Role/Role";
-import { Hero } from "../monster/Hero";
+import { Hero } from "../hero/Hero";
-import { HeroModelComp } from "../monster/HeroModelComp";
+import { HeroModelComp } from "../hero/HeroModelComp";
 import { MonsterModelComp } from "../monster/MonsterModelComp";
-import { MonsterViewComp } from "../monster/MonsterViewComp";
 import { Mon } from "../mon/Mon";
 const { ccclass, property } = _decorator;