diff --git a/assets/resources/game/heros/hero/1002.png b/assets/resources/game/heros/hero/1002.png deleted file mode 100644 index 924b593e..00000000 Binary files a/assets/resources/game/heros/hero/1002.png and /dev/null differ diff --git a/assets/resources/game/heros/hero/1002.png.meta b/assets/resources/game/heros/hero/1002.png.meta deleted file mode 100644 index ee46544d..00000000 --- a/assets/resources/game/heros/hero/1002.png.meta +++ /dev/null @@ -1,42 +0,0 @@ -{ - "ver": "1.0.26", - "importer": "image", - "imported": true, - "uuid": "4b3c006d-45c8-414e-a0c7-65b024f623c8", - "files": [ - ".json", - ".png" - ], - "subMetas": { - "6c48a": { - "importer": "texture", - "uuid": "4b3c006d-45c8-414e-a0c7-65b024f623c8@6c48a", - "displayName": "1002", - "id": "6c48a", - "name": "texture", - "userData": { - "wrapModeS": "repeat", - "wrapModeT": "repeat", - "minfilter": "linear", - "magfilter": "linear", - "mipfilter": "none", - "anisotropy": 0, - "isUuid": true, - "imageUuidOrDatabaseUri": "4b3c006d-45c8-414e-a0c7-65b024f623c8", - "visible": false - }, - "ver": "1.0.22", - "imported": true, - "files": [ - ".json" - ], - "subMetas": {} - } - }, - "userData": { - "hasAlpha": true, - "type": "texture", - "fixAlphaTransparencyArtifacts": false, - "redirect": "4b3c006d-45c8-414e-a0c7-65b024f623c8@6c48a" - } -} diff --git a/assets/resources/game/heros/hero/1003.png b/assets/resources/game/heros/hero/1003.png deleted file mode 100644 index 3bb1c7e8..00000000 Binary files a/assets/resources/game/heros/hero/1003.png and /dev/null differ diff --git a/assets/resources/game/heros/hero/1003.png.meta b/assets/resources/game/heros/hero/1003.png.meta deleted file mode 100644 index cb37fb17..00000000 --- a/assets/resources/game/heros/hero/1003.png.meta +++ /dev/null @@ -1,42 +0,0 @@ -{ - "ver": "1.0.26", - "importer": "image", - "imported": true, - "uuid": "437161f5-6e85-460a-ac1e-40c006f36a7c", - "files": [ - ".json", - ".png" - ], - "subMetas": { - "6c48a": { - "importer": "texture", - "uuid": "437161f5-6e85-460a-ac1e-40c006f36a7c@6c48a", - "displayName": "1003", - "id": "6c48a", - "name": "texture", - "userData": { - "wrapModeS": "repeat", - "wrapModeT": "repeat", - "minfilter": "linear", - "magfilter": "linear", - "mipfilter": "none", - "anisotropy": 0, - "isUuid": true, - "imageUuidOrDatabaseUri": "437161f5-6e85-460a-ac1e-40c006f36a7c", - "visible": false - }, - "ver": "1.0.22", - "imported": true, - "files": [ - ".json" - ], - "subMetas": {} - } - }, - "userData": { - "hasAlpha": true, - "type": "texture", - "fixAlphaTransparencyArtifacts": false, - "redirect": "437161f5-6e85-460a-ac1e-40c006f36a7c@6c48a" - } -} diff --git a/assets/resources/game/heros/hero/1004.png b/assets/resources/game/heros/hero/1004.png deleted file mode 100644 index fb73ad9f..00000000 Binary files a/assets/resources/game/heros/hero/1004.png and /dev/null differ diff --git a/assets/resources/game/heros/hero/1004.png.meta b/assets/resources/game/heros/hero/1004.png.meta deleted file mode 100644 index 70985ed4..00000000 --- a/assets/resources/game/heros/hero/1004.png.meta +++ /dev/null @@ -1,42 +0,0 @@ -{ - "ver": "1.0.26", - "importer": "image", - "imported": true, - "uuid": "484cb07a-e92e-4ed3-a82c-48a8da5635e9", - "files": [ - ".json", - ".png" - ], - "subMetas": { - "6c48a": { - "importer": "texture", - "uuid": "484cb07a-e92e-4ed3-a82c-48a8da5635e9@6c48a", - "displayName": "1004", - "id": "6c48a", - "name": "texture", - "userData": { - "wrapModeS": "repeat", - "wrapModeT": "repeat", - "minfilter": "linear", - "magfilter": "linear", - "mipfilter": "none", - "anisotropy": 0, - "isUuid": true, - "imageUuidOrDatabaseUri": "484cb07a-e92e-4ed3-a82c-48a8da5635e9", - "visible": false - }, - "ver": "1.0.22", - "imported": true, - "files": [ - ".json" - ], - "subMetas": {} - } - }, - "userData": { - "hasAlpha": true, - "type": "texture", - "fixAlphaTransparencyArtifacts": false, - "redirect": "484cb07a-e92e-4ed3-a82c-48a8da5635e9@6c48a" - } -} diff --git a/assets/resources/game/heros/hero/1011.png b/assets/resources/game/heros/hero/1011.png deleted file mode 100644 index e1d806b7..00000000 Binary files a/assets/resources/game/heros/hero/1011.png and /dev/null differ diff --git a/assets/resources/game/heros/hero/1011.png.meta b/assets/resources/game/heros/hero/1011.png.meta deleted file mode 100644 index ebf2063c..00000000 --- a/assets/resources/game/heros/hero/1011.png.meta +++ /dev/null @@ -1,42 +0,0 @@ -{ - "ver": "1.0.26", - "importer": "image", - "imported": true, - "uuid": "a2757e6d-39dd-45b3-9b54-9750a81bcbad", - "files": [ - ".json", - ".png" - ], - "subMetas": { - "6c48a": { - "importer": "texture", - "uuid": "a2757e6d-39dd-45b3-9b54-9750a81bcbad@6c48a", - "displayName": "1011", - "id": "6c48a", - "name": "texture", - "userData": { - "wrapModeS": "repeat", - "wrapModeT": "repeat", - "minfilter": "linear", - "magfilter": "linear", - "mipfilter": "none", - "anisotropy": 0, - "isUuid": true, - "imageUuidOrDatabaseUri": "a2757e6d-39dd-45b3-9b54-9750a81bcbad", - "visible": false - }, - "ver": "1.0.22", - "imported": true, - "files": [ - ".json" - ], - "subMetas": {} - } - }, - "userData": { - "hasAlpha": true, - "type": "texture", - "fixAlphaTransparencyArtifacts": false, - "redirect": "a2757e6d-39dd-45b3-9b54-9750a81bcbad@6c48a" - } -} diff --git a/assets/resources/game/heros/hero/1012.png b/assets/resources/game/heros/hero/1012.png deleted file mode 100644 index 8650c4e2..00000000 Binary files a/assets/resources/game/heros/hero/1012.png and /dev/null differ diff --git a/assets/resources/game/heros/hero/1012.png.meta b/assets/resources/game/heros/hero/1012.png.meta deleted file mode 100644 index e5f4bfe6..00000000 --- a/assets/resources/game/heros/hero/1012.png.meta +++ /dev/null @@ -1,42 +0,0 @@ -{ - "ver": "1.0.26", - "importer": "image", - "imported": true, - "uuid": "ea20b981-20e0-4620-b007-5100919e2198", - "files": [ - ".json", - ".png" - ], - "subMetas": { - "6c48a": { - "importer": "texture", - "uuid": "ea20b981-20e0-4620-b007-5100919e2198@6c48a", - "displayName": "1012", - "id": "6c48a", - "name": "texture", - "userData": { - "wrapModeS": "repeat", - "wrapModeT": "repeat", - "minfilter": "linear", - "magfilter": "linear", - "mipfilter": "none", - "anisotropy": 0, - "isUuid": true, - "imageUuidOrDatabaseUri": "ea20b981-20e0-4620-b007-5100919e2198", - "visible": false - }, - "ver": "1.0.22", - "imported": true, - "files": [ - ".json" - ], - "subMetas": {} - } - }, - "userData": { - "hasAlpha": true, - "type": "texture", - "fixAlphaTransparencyArtifacts": false, - "redirect": "ea20b981-20e0-4620-b007-5100919e2198@6c48a" - } -} diff --git a/assets/resources/game/heros/hero/1101.png b/assets/resources/game/heros/hero/1101.png deleted file mode 100644 index 6d72e6ea..00000000 Binary files a/assets/resources/game/heros/hero/1101.png and /dev/null differ diff --git a/assets/resources/game/heros/hero/1101.png.meta b/assets/resources/game/heros/hero/1101.png.meta deleted file mode 100644 index 220c311e..00000000 --- a/assets/resources/game/heros/hero/1101.png.meta +++ /dev/null @@ -1,42 +0,0 @@ -{ - "ver": "1.0.26", - "importer": "image", - "imported": true, - "uuid": "c5dce644-69ff-49bd-bec0-0d1efe95d2fe", - "files": [ - ".json", - ".png" - ], - "subMetas": { - "6c48a": { - "importer": "texture", - "uuid": "c5dce644-69ff-49bd-bec0-0d1efe95d2fe@6c48a", - "displayName": "1101", - "id": "6c48a", - "name": "texture", - "userData": { - "wrapModeS": "repeat", - "wrapModeT": "repeat", - "minfilter": "linear", - "magfilter": "linear", - "mipfilter": "none", - "anisotropy": 0, - "isUuid": true, - "imageUuidOrDatabaseUri": "c5dce644-69ff-49bd-bec0-0d1efe95d2fe", - "visible": false - }, - "ver": "1.0.22", - "imported": true, - "files": [ - ".json" - ], - "subMetas": {} - } - }, - "userData": { - "hasAlpha": true, - "type": "texture", - "fixAlphaTransparencyArtifacts": false, - "redirect": "c5dce644-69ff-49bd-bec0-0d1efe95d2fe@6c48a" - } -} diff --git a/assets/resources/game/heros/hero/1102.png b/assets/resources/game/heros/hero/1102.png deleted file mode 100644 index f1d5cd8d..00000000 Binary files a/assets/resources/game/heros/hero/1102.png and /dev/null differ diff --git a/assets/resources/game/heros/hero/1102.png.meta b/assets/resources/game/heros/hero/1102.png.meta deleted file mode 100644 index ffc76951..00000000 --- a/assets/resources/game/heros/hero/1102.png.meta +++ /dev/null @@ -1,42 +0,0 @@ -{ - "ver": "1.0.26", - "importer": "image", - "imported": true, - "uuid": "7481f209-9fba-42c6-9598-28dd2a12b615", - "files": [ - ".json", - ".png" - ], - "subMetas": { - "6c48a": { - "importer": "texture", - "uuid": "7481f209-9fba-42c6-9598-28dd2a12b615@6c48a", - "displayName": "1102", - "id": "6c48a", - "name": "texture", - "userData": { - "wrapModeS": "repeat", - "wrapModeT": "repeat", - "minfilter": "linear", - "magfilter": "linear", - "mipfilter": "none", - "anisotropy": 0, - "isUuid": true, - "imageUuidOrDatabaseUri": "7481f209-9fba-42c6-9598-28dd2a12b615", - "visible": false - }, - "ver": "1.0.22", - "imported": true, - "files": [ - ".json" - ], - "subMetas": {} - } - }, - "userData": { - "hasAlpha": true, - "type": "texture", - "fixAlphaTransparencyArtifacts": false, - "redirect": "7481f209-9fba-42c6-9598-28dd2a12b615@6c48a" - } -} diff --git a/assets/resources/game/heros/hero/1201.png b/assets/resources/game/heros/hero/1201.png deleted file mode 100644 index e9272b2e..00000000 Binary files a/assets/resources/game/heros/hero/1201.png and /dev/null differ diff --git a/assets/resources/game/heros/hero/1201.png.meta b/assets/resources/game/heros/hero/1201.png.meta deleted file mode 100644 index 48a8fbab..00000000 --- a/assets/resources/game/heros/hero/1201.png.meta +++ /dev/null @@ -1,42 +0,0 @@ -{ - "ver": "1.0.26", - "importer": "image", - "imported": true, - "uuid": "1cf77461-bf11-4314-897d-75e0401ad8f8", - "files": [ - ".json", - ".png" - ], - "subMetas": { - "6c48a": { - "importer": "texture", - "uuid": "1cf77461-bf11-4314-897d-75e0401ad8f8@6c48a", - "displayName": "1201", - "id": "6c48a", - "name": "texture", - "userData": { - "wrapModeS": "repeat", - "wrapModeT": "repeat", - "minfilter": "linear", - "magfilter": "linear", - "mipfilter": "none", - "anisotropy": 0, - "isUuid": true, - "imageUuidOrDatabaseUri": "1cf77461-bf11-4314-897d-75e0401ad8f8", - "visible": false - }, - "ver": "1.0.22", - "imported": true, - "files": [ - ".json" - ], - "subMetas": {} - } - }, - "userData": { - "hasAlpha": true, - "type": "texture", - "fixAlphaTransparencyArtifacts": false, - "redirect": "1cf77461-bf11-4314-897d-75e0401ad8f8@6c48a" - } -} diff --git a/assets/resources/game/heros/hero/heros.plist b/assets/resources/game/heros/hero/heros.plist new file mode 100644 index 00000000..3c41d731 --- /dev/null +++ b/assets/resources/game/heros/hero/heros.plist @@ -0,0 +1,146 @@ + + + + + frames + + 1001.png + + aliases + + spriteOffset + {0,-8} + spriteSize + {88,89} + spriteSourceSize + {100,105} + textureRect + {{106,1},{88,89}} + textureRotated + + + 1002.png + + aliases + + spriteOffset + {-2,-1} + spriteSize + {84,103} + spriteSourceSize + {100,105} + textureRect + {{1,1},{84,103}} + textureRotated + + + 1003.png + + aliases + + spriteOffset + {0,-1} + spriteSize + {80,103} + spriteSourceSize + {100,105} + textureRect + {{1,87},{80,103}} + textureRotated + + + 1004.png + + aliases + + spriteOffset + {-2,-6} + spriteSize + {80,93} + spriteSourceSize + {100,105} + textureRect + {{100,173},{80,93}} + textureRotated + + + 1012.png + + aliases + + spriteOffset + {0,-8} + spriteSize + {80,89} + spriteSourceSize + {80,105} + textureRect + {{106,91},{80,89}} + textureRotated + + + 1101.png + + aliases + + spriteOffset + {-1,-8} + spriteSize + {76,89} + spriteSourceSize + {80,105} + textureRect + {{1,263},{76,89}} + textureRotated + + + 1102.png + + aliases + + spriteOffset + {-1,-8} + spriteSize + {76,89} + spriteSourceSize + {100,105} + textureRect + {{92,263},{76,89}} + textureRotated + + + 1201.png + + aliases + + spriteOffset + {0,-4} + spriteSize + {92,97} + spriteSourceSize + {100,105} + textureRect + {{1,169},{92,97}} + textureRotated + + + + metadata + + format + 3 + pixelFormat + RGBA8888 + premultiplyAlpha + + realTextureFileName + heros.png + size + {196,340} + smartupdate + $TexturePacker:SmartUpdate:ba9f8fd13a3d9a9d58ae0ea08aed506d:6db790d4ed1dcd0f40cb034a6b5f2ff7:757b9ddd41d3352a4ebb204a2b6924d3$ + textureFileName + heros.png + + + diff --git a/assets/resources/game/heros/hero/heros.plist.meta b/assets/resources/game/heros/hero/heros.plist.meta new file mode 100644 index 00000000..f48ed33b --- /dev/null +++ b/assets/resources/game/heros/hero/heros.plist.meta @@ -0,0 +1,385 @@ +{ + "ver": "1.0.8", + "importer": "sprite-atlas", + "imported": true, + "uuid": "8a791edd-743c-45ad-8991-81f589e8b598", + "files": [ + ".json" + ], + "subMetas": { + "b3f5a": { + "importer": "sprite-frame", + "uuid": "8a791edd-743c-45ad-8991-81f589e8b598@b3f5a", + "displayName": "", + "id": "b3f5a", + "name": "1001", + "userData": { + "trimType": "auto", + "trimThreshold": 1, + "rotated": true, + "offsetX": 0, + "offsetY": -8, + "trimX": 106, + "trimY": 1, + "width": 88, + "height": 89, + "rawWidth": 100, + "rawHeight": 105, + "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": "55b3f5b8-c97f-45fe-8971-b253ee5f4add@6c48a", + "atlasUuid": "8a791edd-743c-45ad-8991-81f589e8b598" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + }, + "f8120": { + "importer": "sprite-frame", + "uuid": "8a791edd-743c-45ad-8991-81f589e8b598@f8120", + "displayName": "", + "id": "f8120", + "name": "1002", + "userData": { + "trimType": "auto", + "trimThreshold": 1, + "rotated": true, + "offsetX": -2, + "offsetY": -1, + "trimX": 1, + "trimY": 1, + "width": 84, + "height": 103, + "rawWidth": 100, + "rawHeight": 105, + "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": "55b3f5b8-c97f-45fe-8971-b253ee5f4add@6c48a", + "atlasUuid": "8a791edd-743c-45ad-8991-81f589e8b598" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + }, + "a59f6": { + "importer": "sprite-frame", + "uuid": "8a791edd-743c-45ad-8991-81f589e8b598@a59f6", + "displayName": "", + "id": "a59f6", + "name": "1003", + "userData": { + "trimType": "auto", + "trimThreshold": 1, + "rotated": true, + "offsetX": 0, + "offsetY": -1, + "trimX": 1, + "trimY": 87, + "width": 80, + "height": 103, + "rawWidth": 100, + "rawHeight": 105, + "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": "55b3f5b8-c97f-45fe-8971-b253ee5f4add@6c48a", + "atlasUuid": "8a791edd-743c-45ad-8991-81f589e8b598" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + }, + "f948a": { + "importer": "sprite-frame", + "uuid": "8a791edd-743c-45ad-8991-81f589e8b598@f948a", + "displayName": "", + "id": "f948a", + "name": "1004", + "userData": { + "trimType": "auto", + "trimThreshold": 1, + "rotated": true, + "offsetX": -2, + "offsetY": -6, + "trimX": 100, + "trimY": 173, + "width": 80, + "height": 93, + "rawWidth": 100, + "rawHeight": 105, + "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": "55b3f5b8-c97f-45fe-8971-b253ee5f4add@6c48a", + "atlasUuid": "8a791edd-743c-45ad-8991-81f589e8b598" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + }, + "f58a6": { + "importer": "sprite-frame", + "uuid": "8a791edd-743c-45ad-8991-81f589e8b598@f58a6", + "displayName": "", + "id": "f58a6", + "name": "1012", + "userData": { + "trimType": "auto", + "trimThreshold": 1, + "rotated": true, + "offsetX": 0, + "offsetY": -8, + "trimX": 106, + "trimY": 91, + "width": 80, + "height": 89, + "rawWidth": 80, + "rawHeight": 105, + "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": "55b3f5b8-c97f-45fe-8971-b253ee5f4add@6c48a", + "atlasUuid": "8a791edd-743c-45ad-8991-81f589e8b598" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + }, + "c29c5": { + "importer": "sprite-frame", + "uuid": "8a791edd-743c-45ad-8991-81f589e8b598@c29c5", + "displayName": "", + "id": "c29c5", + "name": "1101", + "userData": { + "trimType": "auto", + "trimThreshold": 1, + "rotated": true, + "offsetX": -1, + "offsetY": -8, + "trimX": 1, + "trimY": 263, + "width": 76, + "height": 89, + "rawWidth": 80, + "rawHeight": 105, + "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": "55b3f5b8-c97f-45fe-8971-b253ee5f4add@6c48a", + "atlasUuid": "8a791edd-743c-45ad-8991-81f589e8b598" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + }, + "c3a1e": { + "importer": "sprite-frame", + "uuid": "8a791edd-743c-45ad-8991-81f589e8b598@c3a1e", + "displayName": "", + "id": "c3a1e", + "name": "1102", + "userData": { + "trimType": "auto", + "trimThreshold": 1, + "rotated": true, + "offsetX": -1, + "offsetY": -8, + "trimX": 92, + "trimY": 263, + "width": 76, + "height": 89, + "rawWidth": 100, + "rawHeight": 105, + "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": "55b3f5b8-c97f-45fe-8971-b253ee5f4add@6c48a", + "atlasUuid": "8a791edd-743c-45ad-8991-81f589e8b598" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + }, + "7dd7d": { + "importer": "sprite-frame", + "uuid": "8a791edd-743c-45ad-8991-81f589e8b598@7dd7d", + "displayName": "", + "id": "7dd7d", + "name": "1201", + "userData": { + "trimType": "auto", + "trimThreshold": 1, + "rotated": true, + "offsetX": 0, + "offsetY": -4, + "trimX": 1, + "trimY": 169, + "width": 92, + "height": 97, + "rawWidth": 100, + "rawHeight": 105, + "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": "55b3f5b8-c97f-45fe-8971-b253ee5f4add@6c48a", + "atlasUuid": "8a791edd-743c-45ad-8991-81f589e8b598" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + } + }, + "userData": { + "atlasTextureName": "heros.png", + "format": 3, + "uuid": "8a791edd-743c-45ad-8991-81f589e8b598", + "textureUuid": "55b3f5b8-c97f-45fe-8971-b253ee5f4add@6c48a" + } +} diff --git a/assets/resources/game/heros/hero/heros.png b/assets/resources/game/heros/hero/heros.png new file mode 100644 index 00000000..19b5ef95 Binary files /dev/null and b/assets/resources/game/heros/hero/heros.png differ diff --git a/assets/resources/game/heros/hero/heros.png.meta b/assets/resources/game/heros/hero/heros.png.meta new file mode 100644 index 00000000..d2d03808 --- /dev/null +++ b/assets/resources/game/heros/hero/heros.png.meta @@ -0,0 +1,134 @@ +{ + "ver": "1.0.26", + "importer": "image", + "imported": true, + "uuid": "55b3f5b8-c97f-45fe-8971-b253ee5f4add", + "files": [ + ".json", + ".png" + ], + "subMetas": { + "6c48a": { + "importer": "texture", + "uuid": "55b3f5b8-c97f-45fe-8971-b253ee5f4add@6c48a", + "displayName": "heros", + "id": "6c48a", + "name": "texture", + "userData": { + "wrapModeS": "clamp-to-edge", + "wrapModeT": "clamp-to-edge", + "minfilter": "linear", + "magfilter": "linear", + "mipfilter": "none", + "anisotropy": 0, + "isUuid": true, + "imageUuidOrDatabaseUri": "55b3f5b8-c97f-45fe-8971-b253ee5f4add", + "visible": false + }, + "ver": "1.0.22", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + }, + "f9941": { + "importer": "sprite-frame", + "uuid": "55b3f5b8-c97f-45fe-8971-b253ee5f4add@f9941", + "displayName": "heros", + "id": "f9941", + "name": "spriteFrame", + "userData": { + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": -1, + "offsetY": 0, + "trimX": 0, + "trimY": 2, + "width": 194, + "height": 336, + "rawWidth": 196, + "rawHeight": 340, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "packable": true, + "pixelsToUnit": 100, + "pivotX": 0.5, + "pivotY": 0.5, + "meshType": 0, + "vertices": { + "rawPosition": [ + -97, + -168, + 0, + 97, + -168, + 0, + -97, + 168, + 0, + 97, + 168, + 0 + ], + "indexes": [ + 0, + 1, + 2, + 2, + 1, + 3 + ], + "uv": [ + 0, + 338, + 194, + 338, + 0, + 2, + 194, + 2 + ], + "nuv": [ + 0, + 0.0058823529411764705, + 0.9897959183673469, + 0.0058823529411764705, + 0, + 0.9941176470588236, + 0.9897959183673469, + 0.9941176470588236 + ], + "minPos": [ + -97, + -168, + 0 + ], + "maxPos": [ + 97, + 168, + 0 + ] + }, + "isUuid": true, + "imageUuidOrDatabaseUri": "55b3f5b8-c97f-45fe-8971-b253ee5f4add@6c48a", + "atlasUuid": "" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + } + }, + "userData": { + "hasAlpha": true, + "type": "sprite-frame", + "fixAlphaTransparencyArtifacts": false, + "redirect": "55b3f5b8-c97f-45fe-8971-b253ee5f4add@f9941" + } +} diff --git a/assets/script/Main.ts b/assets/script/Main.ts index 12aed978..582afd7b 100644 --- a/assets/script/Main.ts +++ b/assets/script/Main.ts @@ -25,18 +25,14 @@ export class Main extends Root { protected async run() { smc.initialize = ecs.getEntity(Initialize); smc.monsters = [ - {prefab_path:'lang',name:'迅狼',speed:100}, - {prefab_path:'hero',name:'火猴',speed:45}, - {prefab_path:'lang',name:'m3',speed:40}, - {prefab_path:'lang',name:'m4',speed:40}, - {prefab_path:'lang',name:'m3',speed:40}, - {prefab_path:'lang',name:'m4',speed:40}, - ] - smc.heros = [ - {prefab_path:'lang',name:'迅狼',speed:110}, - {prefab_path:'liubang',name:'刘邦',speed:110}, - {prefab_path:'yinzheng',name:'嬴政',speed:110}, + {uuid:1102}, + {uuid:1102}, + {uuid:1102}, + {uuid:1201}, + {uuid:1201}, + {uuid:1201}, ] + console.log("Game start"); smc.vmAdd() } diff --git a/assets/script/game/common/config/CardSet.ts b/assets/script/game/common/config/CardSet.ts index 327b7e5a..d866cbd1 100644 --- a/assets/script/game/common/config/CardSet.ts +++ b/assets/script/game/common/config/CardSet.ts @@ -4,18 +4,45 @@ * @LastEditors: dgflash * @LastEditTime: 2022-01-26 16:42:00 */ +export const CardType = { + 1: "前排", + 2: "后排", +} +export const CardList={ + 1:[1001,1002,1003,1102], + 2:[1001,1002,1003,1004,1102,1201], + 3:[1001,1002,1003,1004,1102,1201], + 4:[1001,1002,1003,1004,1102,1201], + 5:[1001,1002,1003,1004,1102,1201], + 6:[1001,1002,1003,1004,1102,1201], +} + export const CardSet = { 1001:{ - uuid:1001, - name:'护盾战士', - level:1, - prefab_path:'yinzheng', - atk:2, - hp:10, - power:50, //每0.1秒增加1能量 - speed:50, + uuid:1001, name:'护盾战士', type:1, level:1,prefab_path:1001,atk:1,atk_cd:1.5, hp:20, power:50, speed:50, skill:{ } }, - + 1002:{ + uuid:1002, name:'无名法师', type:2, level:1,prefab_path:1002,atk:3,atk_cd:1.5, hp:10, power:50, speed:50, + skill:{ } + }, + 1003:{ + uuid:1003, name:'无名战士', type:1, level:1,prefab_path:1003,atk:2, atk_cd:1.5, hp:15, power:50, speed:50, + skill:{ } + }, + 1102:{ + uuid:1102, name:'骷髅士兵', type:1, level:1,prefab_path:1102,atk:2,atk_cd:1.5, hp:10, power:50, speed:50, + skill:{ } + }, + 1004:{ + uuid:1004, name:'火焰法师', type:2, level:2,prefab_path:1004,atk:4,atk_cd:1.5, hp:15, power:50, speed:50, + skill:{ } + }, + 1201:{ + uuid:1201, name:'猎寻狼', type:1, level:2,prefab_path:1201,atk:5,atk_cd:1.5, hp:20, power:100, speed:100, + skill:{ } + }, + + } \ No newline at end of file diff --git a/assets/script/game/map/CardController.ts b/assets/script/game/map/CardController.ts index 1e15e2df..61a841cf 100644 --- a/assets/script/game/map/CardController.ts +++ b/assets/script/game/map/CardController.ts @@ -5,13 +5,15 @@ import { smc } from "../common/SingletonModuleComp"; import { oops } from "../../../../extensions/oops-plugin-framework/assets/core/Oops"; import { HeroCard } from "../monster/HeroCard"; import { HeroCardViewComp } from "../monster/HeroCardViewComp"; +import { RandomManager } from "../../../../extensions/oops-plugin-framework/assets/core/common/random/RandomManager"; +import { CardList } from "../common/config/CardSet"; const { ccclass, property } = _decorator; /** 视图层对象 */ @ccclass('ControllerComp') @ecs.register('Controller', false) export class ControllerComp extends CCComp { - /** 视图层逻辑代码分离演示 */ + card_level = 1; start() { this.load_cards() // var entity = this.ent as ecs.Entity; // ecs.Entity 可转为当前模块的具体实体对象 @@ -29,7 +31,6 @@ export class ControllerComp extends CCComp { smc.vm_data.shuaxin.min += smc.vm_data.shuaxin.speed*dt; if (smc.vm_data.shuaxin.min >= smc.vm_data.shuaxin.max) { smc.vm_data.shuaxin.min = 0; - // oops.message.dispatchEvent("do_add_hero",this) this.load_cards() } } @@ -44,12 +45,13 @@ export class ControllerComp extends CCComp { let cards_node= this.node.getChildByName("cards") let x=0 let y=0 - for (let i = 0; i < 5; i++) { + let lists = this.get_card_list() + lists.forEach(element => { let card = ecs.getEntity(HeroCard); let pos = v3(x,y) - card.load(pos,1001,cards_node); + card.load(pos,element[0],cards_node); x=x+120 - } + }); this.node.getChildByName("cards").getChildByName("active").active = false } /** 转场 */ @@ -57,6 +59,14 @@ export class ControllerComp extends CCComp { this.shuaxin(dt) } + get_card_list(){ + let lists:any = [] + for (let index = 0; index < 5; index++) { + let list = RandomManager.instance.getRandomByObjectList(CardList[this.card_level], 1); + lists.push(list) + } + return lists + } /** 视图对象通过 ecs.Entity.remove(ControllerComp) 删除组件是触发组件处理自定义释放逻辑 */ reset() { this.node.destroy(); diff --git a/assets/script/game/map/view/MapViewComp.ts b/assets/script/game/map/view/MapViewComp.ts index 7b3c4594..9b286dbf 100644 --- a/assets/script/game/map/view/MapViewComp.ts +++ b/assets/script/game/map/view/MapViewComp.ts @@ -60,7 +60,10 @@ export class MapViewComp extends CCComp { this.gold_add(dt) } monster_refresh(){ - this.addMonster(1001) + if(smc.monsters.length > 0 ){ + this.addMonster(smc.monsters[0].uuid) + } + } gold_add(dt: number) { smc.vm_data.gold.time += dt; @@ -88,10 +91,11 @@ export class MapViewComp extends CCComp { } private addMonster(uuid:number=1001) { this.scene.node.active = true - let monster = ecs.getEntity(Monster); - let pos:Vec3 = v3(BoxSet.MONSTER_START,BoxSet.GAME_LINE) - let camp = -1 - monster.load(pos,camp,uuid); + let monster = ecs.getEntity(Monster); + let pos:Vec3 = v3(BoxSet.MONSTER_START,BoxSet.GAME_LINE) + let camp = -1 + monster.load(pos,camp,uuid); + smc.monsters.splice(0,1) } diff --git a/assets/script/game/monster/Hero.ts b/assets/script/game/monster/Hero.ts index 51da84d5..50c03135 100644 --- a/assets/script/game/monster/Hero.ts +++ b/assets/script/game/monster/Hero.ts @@ -5,7 +5,7 @@ * @LastEditors: dgflash * @LastEditTime: 2022-08-04 15:43:04 */ -import { instantiate, Node, Prefab, Vec3,v3,resources,SpriteFrame,Sprite} from "cc"; +import { instantiate, Node, Prefab, Vec3,v3,resources,SpriteFrame,Sprite,SpriteAtlas} from "cc"; import { UICallbacks } from "../../../../extensions/oops-plugin-framework/assets/core/gui/layer/Defines"; import { oops } from "../../../../extensions/oops-plugin-framework/assets/core/Oops"; import { ecs } from "../../../../extensions/oops-plugin-framework/assets/libs/ecs/ECS"; @@ -48,11 +48,11 @@ export class Hero extends ecs.Entity { node.getChildByName("avatar").setScale(node.getChildByName("avatar").scale.x*camp, node.getChildByName("avatar").scale.y, node.getChildByName("avatar").scale.z); node.setPosition(pos) // console.log(node.getChildByName("avatar").getChildByName("TNode").getChildByName("bb").getComponent(Sprite)) - const url = 'game/heros/hero/'+CardSet[uuid].prefab_path+'/spriteFrame'; - resources.load(url, SpriteFrame, (err: any, spriteFrame) => { + const url = 'game/heros/hero/heros'; + resources.load(url, SpriteAtlas, (err: any, atlas) => { const sprite = node.getChildByName("avatar").getChildByName("TNode").getChildByName("bb").getComponent(Sprite); - sprite.spriteFrame = spriteFrame; + sprite.spriteFrame = atlas.getSpriteFrame(CardSet[uuid].prefab_path); }); this.hero_init(uuid,node) oops.message.dispatchEvent("hero_load",this) @@ -62,6 +62,12 @@ export class Hero extends ecs.Entity { var mv = node.getComponent(MonsterViewComp)!; mv.speed =mv.ospeed = CardSet[uuid].speed; mv.hero_name= CardSet[uuid].name; + mv.hp= mv.hp_max = CardSet[uuid].hp; + mv.level = CardSet[uuid].level; + mv.atk = CardSet[uuid].atk; + mv.atk_cd = CardSet[uuid].atk_cd; + mv.power = CardSet[uuid].power; + mv.type = CardSet[uuid].type; mv.Tpos = v3(0,0,0); mv.camp = 1; mv.change_name(CardSet[uuid].name,1) diff --git a/assets/script/game/monster/HeroCard.ts b/assets/script/game/monster/HeroCard.ts index 1f59bdf6..639d4a0e 100644 --- a/assets/script/game/monster/HeroCard.ts +++ b/assets/script/game/monster/HeroCard.ts @@ -5,7 +5,7 @@ * @LastEditors: dgflash * @LastEditTime: 2022-08-04 15:43:04 */ -import { instantiate, Node, Prefab, Vec3 ,tween, v3,Collider2D,Contact2DType,PhysicsSystem2D,IPhysics2DContact, animation,Label,resources,SpriteFrame,Sprite} from "cc"; +import { instantiate, Node, Prefab, Vec3 ,tween, v3,SpriteAtlas,Label,resources,SpriteFrame,Sprite} from "cc"; import { UICallbacks } from "../../../../extensions/oops-plugin-framework/assets/core/gui/layer/Defines"; import { oops } from "../../../../extensions/oops-plugin-framework/assets/core/Oops"; import { ecs } from "../../../../extensions/oops-plugin-framework/assets/libs/ecs/ECS"; @@ -34,6 +34,7 @@ export class HeroCard extends ecs.Entity { /** 加载角色 */ load(pos: Vec3 = Vec3.ZERO,uuid:number=1001,parent:Node) { + console.log("load hero",uuid); // var path = "game/monster/"+prefab_path; var path = "game/heros/cards/hero_card"; var prefab: Prefab = oops.res.get(path, Prefab)!; @@ -42,17 +43,17 @@ export class HeroCard extends ecs.Entity { // node.getChildByName("avatar").setScale(node.getChildByName("avatar").scale.x*camp, node.getChildByName("avatar").scale.y, node.getChildByName("avatar").scale.z); node.setPosition(pos) + const url = 'game/heros/hero/heros'; + resources.load(url, SpriteAtlas, (err: any, atlas) => { + const sprite = node.getChildByName("hero").getComponent(Sprite); + sprite.spriteFrame = atlas.getSpriteFrame(CardSet[uuid].prefab_path); + }); + var hcv = node.getComponent(HeroCardViewComp)!; hcv.card_name=CardSet[uuid].name hcv.card_uid=uuid this.add(hcv); - // // console.log(node.getChildByName("avatar").getChildByName("TNode").getChildByName("bb").getComponent(Sprite)) - // const url = 'game/heros/hero/'+prefab_path+'/spriteFrame'; - // resources.load(url, SpriteFrame, (err: any, spriteFrame) => { - // const sprite = node.getChildByName("avatar").getChildByName("TNode").getChildByName("bb").getComponent(Sprite); - - // sprite.spriteFrame = spriteFrame; - // }); + } diff --git a/assets/script/game/monster/Monster.ts b/assets/script/game/monster/Monster.ts index dc006322..e5cb03e6 100644 --- a/assets/script/game/monster/Monster.ts +++ b/assets/script/game/monster/Monster.ts @@ -5,7 +5,7 @@ * @LastEditors: dgflash * @LastEditTime: 2022-08-04 15:43:04 */ -import { instantiate, Node, Prefab, Vec3 ,v3,resources,SpriteFrame,Sprite,} from "cc"; +import { instantiate, Node, Prefab, Vec3 ,v3,resources,SpriteFrame,Sprite,SpriteAtlas} from "cc"; import { UICallbacks } from "../../../../extensions/oops-plugin-framework/assets/core/gui/layer/Defines"; import { oops } from "../../../../extensions/oops-plugin-framework/assets/core/Oops"; import { ecs } from "../../../../extensions/oops-plugin-framework/assets/libs/ecs/ECS"; @@ -48,11 +48,11 @@ export class Monster extends ecs.Entity { node.getChildByName("avatar").setScale(node.getChildByName("avatar").scale.x*camp, node.getChildByName("avatar").scale.y, node.getChildByName("avatar").scale.z); node.setPosition(pos) // console.log(node.getChildByName("avatar").getChildByName("TNode").getChildByName("bb").getComponent(Sprite)) - const url = 'game/heros/hero/'+CardSet[uuid].prefab_path+'/spriteFrame'; - resources.load(url, SpriteFrame, (err: any, spriteFrame) => { + const url = 'game/heros/hero/heros'; + resources.load(url, SpriteAtlas, (err: any, atlas) => { const sprite = node.getChildByName("avatar").getChildByName("TNode").getChildByName("bb").getComponent(Sprite); - sprite.spriteFrame = spriteFrame; + sprite.spriteFrame = atlas.getSpriteFrame(CardSet[uuid].prefab_path); }); this.hero_init(uuid,node) oops.message.dispatchEvent("monster_load",this) @@ -61,6 +61,12 @@ export class Monster extends ecs.Entity { var mv = node.getComponent(MonsterViewComp)!; mv.speed =mv.ospeed = CardSet[uuid].speed; mv.hero_name= CardSet[uuid].name; + mv.hp= mv.hp_max = CardSet[uuid].hp; + mv.level = CardSet[uuid].level; + mv.atk = CardSet[uuid].atk; + mv.atk_cd = CardSet[uuid].atk_cd; + mv.power = CardSet[uuid].power; + mv.type = CardSet[uuid].type; mv.camp = -1; mv.Tpos = v3(0,0,0); mv.change_name(CardSet[uuid].name,-1) diff --git a/assets/script/game/monster/MonsterViewComp.ts b/assets/script/game/monster/MonsterViewComp.ts index 2054d2e6..0e586851 100644 --- a/assets/script/game/monster/MonsterViewComp.ts +++ b/assets/script/game/monster/MonsterViewComp.ts @@ -18,6 +18,7 @@ import { oops } from "../../../../extensions/oops-plugin-framework/assets/core/O import { baseCom } from "../skills/baseCom"; import { Skill } from "../skills/Skill"; import { Timer } from "../../../../extensions/oops-plugin-framework/assets/core/common/timer/Timer"; +import { SkillCom } from "../skills/SkillCom"; const { ccclass, property } = _decorator; /** 角色显示组件 */ @@ -27,6 +28,7 @@ export class MonsterViewComp extends CCComp { /** 角色动画 */ as: MonsterSpine = null!; hero_name : string = "hero"; + level:number =1; camp: number = 1; /** 角色阵营 1：hero -1 :monster */ type: number = 1; /**角色类型 1：前排 2 后排 */ state: number = 1; /** 状态 1：move ,2: act 3: stop */ @@ -90,8 +92,10 @@ export class MonsterViewComp extends CCComp { // } onPostSolve (selfCollider: Collider2D, otherCollider: Collider2D, contact: IPhysics2DContact | null) { if(otherCollider.group== BoxSet.HERO_SKILL || otherCollider.group== BoxSet.MONSTER_SKILL){ + let skill = otherCollider.node.getComponent(SkillCom)!; + // console.log('onPostSolve',skill); this.in_atked(); - this.hp_change(10); + this.hp_change(skill.atk); } // switch (selfCollider.group) { // case BoxSet.HERO: