diff --git a/assets/resources/game/skills/buff/b1.plist b/assets/resources/game/skills/buff/b1.plist index 324661f1..919800cd 100644 --- a/assets/resources/game/skills/buff/b1.plist +++ b/assets/resources/game/skills/buff/b1.plist @@ -15,7 +15,7 @@ spriteSourceSize {68,68} textureRect - {{0,0},{68,68}} + {{0,105},{68,68}} textureRotated @@ -30,7 +30,7 @@ spriteSourceSize {68,68} textureRect - {{68,0},{68,68}} + {{0,173},{68,68}} textureRotated @@ -45,7 +45,7 @@ spriteSourceSize {68,68} textureRect - {{136,0},{68,68}} + {{0,241},{68,68}} textureRotated @@ -60,7 +60,7 @@ spriteSourceSize {68,68} textureRect - {{204,0},{68,68}} + {{0,309},{68,68}} textureRotated @@ -75,7 +75,7 @@ spriteSourceSize {68,68} textureRect - {{272,0},{68,68}} + {{0,377},{68,68}} textureRotated @@ -90,7 +90,277 @@ spriteSourceSize {68,68} textureRect - {{340,0},{68,68}} + {{0,445},{68,68}} + textureRotated + + + buff2-0.png + + aliases + + spriteOffset + {0,0} + spriteSize + {105,70} + spriteSourceSize + {105,70} + textureRect + {{0,582},{105,70}} + textureRotated + + + buff2-1.png + + aliases + + spriteOffset + {0,0} + spriteSize + {96,70} + spriteSourceSize + {96,70} + textureRect + {{0,652},{96,70}} + textureRotated + + + buff2-2.png + + aliases + + spriteOffset + {0,0} + spriteSize + {103,71} + spriteSourceSize + {103,71} + textureRect + {{0,932},{103,71}} + textureRotated + + + buff2-3.png + + aliases + + spriteOffset + {0,0} + spriteSize + {98,70} + spriteSourceSize + {98,70} + textureRect + {{0,722},{98,70}} + textureRotated + + + buff2-4.png + + aliases + + spriteOffset + {0,0} + spriteSize + {94,70} + spriteSourceSize + {94,70} + textureRect + {{0,792},{94,70}} + textureRotated + + + buff2-5.png + + aliases + + spriteOffset + {0,0} + spriteSize + {94,70} + spriteSourceSize + {94,70} + textureRect + {{0,862},{94,70}} + textureRotated + + + buff2-6.png + + aliases + + spriteOffset + {0,0} + spriteSize + {93,69} + spriteSourceSize + {93,69} + textureRect + {{0,513},{93,69}} + textureRotated + + + buff3-0.png + + aliases + + spriteOffset + {0,0} + spriteSize + {100,19} + spriteSourceSize + {100,19} + textureRect + {{0,10},{100,19}} + textureRotated + + + buff3-1.png + + aliases + + spriteOffset + {0,0} + spriteSize + {100,19} + spriteSourceSize + {100,19} + textureRect + {{0,29},{100,19}} + textureRotated + + + buff3-2.png + + aliases + + spriteOffset + {0,0} + spriteSize + {100,19} + spriteSourceSize + {100,19} + textureRect + {{0,48},{100,19}} + textureRotated + + + buff3-3.png + + aliases + + spriteOffset + {0,0} + spriteSize + {100,19} + spriteSourceSize + {100,19} + textureRect + {{0,67},{100,19}} + textureRotated + + + buff3-4.png + + aliases + + spriteOffset + {0,0} + spriteSize + {100,19} + spriteSourceSize + {100,19} + textureRect + {{0,86},{100,19}} + textureRotated + + + jiaxue-0.png + + aliases + + spriteOffset + {0,0} + spriteSize + {7,10} + spriteSourceSize + {7,10} + textureRect + {{0,0},{7,10}} + textureRotated + + + jiaxue-1.png + + aliases + + spriteOffset + {0,0} + spriteSize + {7,10} + spriteSourceSize + {7,10} + textureRect + {{7,0},{7,10}} + textureRotated + + + jiaxue-2.png + + aliases + + spriteOffset + {0,0} + spriteSize + {7,10} + spriteSourceSize + {7,10} + textureRect + {{14,0},{7,10}} + textureRotated + + + jiaxue-3.png + + aliases + + spriteOffset + {0,0} + spriteSize + {7,10} + spriteSourceSize + {7,10} + textureRect + {{21,0},{7,10}} + textureRotated + + + jiaxue-4.png + + aliases + + spriteOffset + {0,0} + spriteSize + {7,10} + spriteSourceSize + {7,10} + textureRect + {{28,0},{7,10}} + textureRotated + + + jiaxue-5.png + + aliases + + spriteOffset + {0,0} + spriteSize + {7,10} + spriteSourceSize + {7,10} + textureRect + {{35,0},{7,10}} textureRotated @@ -106,9 +376,9 @@ realTextureFileName b1.png size - {408,68} + {105,1003} smartupdate - $TexturePacker:SmartUpdate:17867f7d69251236922fb34f0fed3f07:00650667d552d8a65450b754d59d1631:711ea92644afcfa26ff56bf794426a0a$ + $TexturePacker:SmartUpdate:3116efc0bdf80f788ce6d6b911ed721a:c1a234e31e5b9411c14817f040f6011b:711ea92644afcfa26ff56bf794426a0a$ textureFileName b1.png diff --git a/assets/resources/game/skills/buff/b1.plist.meta b/assets/resources/game/skills/buff/b1.plist.meta index 7d3d8dac..001a5564 100644 --- a/assets/resources/game/skills/buff/b1.plist.meta +++ b/assets/resources/game/skills/buff/b1.plist.meta @@ -7,6 +7,98 @@ ".json" ], "subMetas": { + "38637": { + "importer": "sprite-frame", + "uuid": "2e272fb5-0f2a-459c-853d-e312e14693d0@38637", + "displayName": "", + "id": "38637", + "name": "jiaxue-4", + "userData": { + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 28, + "trimY": 0, + "width": 7, + "height": 10, + "rawWidth": 7, + "rawHeight": 10, + "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": "39cde2ed-1c08-46d0-9fe1-ad4c917a7b34@6c48a", + "atlasUuid": "2e272fb5-0f2a-459c-853d-e312e14693d0" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + }, + "81236": { + "importer": "sprite-frame", + "uuid": "2e272fb5-0f2a-459c-853d-e312e14693d0@81236", + "displayName": "", + "id": "81236", + "name": "buff3-0", + "userData": { + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 0, + "trimY": 10, + "width": 100, + "height": 19, + "rawWidth": 100, + "rawHeight": 19, + "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": "39cde2ed-1c08-46d0-9fe1-ad4c917a7b34@6c48a", + "atlasUuid": "2e272fb5-0f2a-459c-853d-e312e14693d0" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + }, "cc2a3": { "importer": "sprite-frame", "uuid": "2e272fb5-0f2a-459c-853d-e312e14693d0@cc2a3", @@ -20,7 +112,7 @@ "offsetX": 0, "offsetY": 0, "trimX": 0, - "trimY": 0, + "trimY": 105, "width": 68, "height": 68, "rawWidth": 68, @@ -65,8 +157,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 68, - "trimY": 0, + "trimX": 0, + "trimY": 173, "width": 68, "height": 68, "rawWidth": 68, @@ -111,8 +203,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 136, - "trimY": 0, + "trimX": 0, + "trimY": 241, "width": 68, "height": 68, "rawWidth": 68, @@ -157,8 +249,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 204, - "trimY": 0, + "trimX": 0, + "trimY": 309, "width": 68, "height": 68, "rawWidth": 68, @@ -203,8 +295,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 272, - "trimY": 0, + "trimX": 0, + "trimY": 377, "width": 68, "height": 68, "rawWidth": 68, @@ -249,8 +341,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 340, - "trimY": 0, + "trimX": 0, + "trimY": 445, "width": 68, "height": 68, "rawWidth": 68, @@ -282,6 +374,742 @@ ".json" ], "subMetas": {} + }, + "b1e25": { + "importer": "sprite-frame", + "uuid": "2e272fb5-0f2a-459c-853d-e312e14693d0@b1e25", + "displayName": "", + "id": "b1e25", + "name": "buff2-0", + "userData": { + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 0, + "trimY": 582, + "width": 105, + "height": 70, + "rawWidth": 105, + "rawHeight": 70, + "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": "39cde2ed-1c08-46d0-9fe1-ad4c917a7b34@6c48a", + "atlasUuid": "2e272fb5-0f2a-459c-853d-e312e14693d0" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + }, + "c6e3b": { + "importer": "sprite-frame", + "uuid": "2e272fb5-0f2a-459c-853d-e312e14693d0@c6e3b", + "displayName": "", + "id": "c6e3b", + "name": "buff2-1", + "userData": { + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 0, + "trimY": 652, + "width": 96, + "height": 70, + "rawWidth": 96, + "rawHeight": 70, + "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": "39cde2ed-1c08-46d0-9fe1-ad4c917a7b34@6c48a", + "atlasUuid": "2e272fb5-0f2a-459c-853d-e312e14693d0" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + }, + "74f0a": { + "importer": "sprite-frame", + "uuid": "2e272fb5-0f2a-459c-853d-e312e14693d0@74f0a", + "displayName": "", + "id": "74f0a", + "name": "buff2-2", + "userData": { + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 0, + "trimY": 932, + "width": 103, + "height": 71, + "rawWidth": 103, + "rawHeight": 71, + "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": "39cde2ed-1c08-46d0-9fe1-ad4c917a7b34@6c48a", + "atlasUuid": "2e272fb5-0f2a-459c-853d-e312e14693d0" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + }, + "a824d": { + "importer": "sprite-frame", + "uuid": "2e272fb5-0f2a-459c-853d-e312e14693d0@a824d", + "displayName": "", + "id": "a824d", + "name": "buff2-3", + "userData": { + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 0, + "trimY": 722, + "width": 98, + "height": 70, + "rawWidth": 98, + "rawHeight": 70, + "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": "39cde2ed-1c08-46d0-9fe1-ad4c917a7b34@6c48a", + "atlasUuid": "2e272fb5-0f2a-459c-853d-e312e14693d0" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + }, + "43a27": { + "importer": "sprite-frame", + "uuid": "2e272fb5-0f2a-459c-853d-e312e14693d0@43a27", + "displayName": "", + "id": "43a27", + "name": "buff2-4", + "userData": { + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 0, + "trimY": 792, + "width": 94, + "height": 70, + "rawWidth": 94, + "rawHeight": 70, + "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": "39cde2ed-1c08-46d0-9fe1-ad4c917a7b34@6c48a", + "atlasUuid": "2e272fb5-0f2a-459c-853d-e312e14693d0" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + }, + "798c8": { + "importer": "sprite-frame", + "uuid": "2e272fb5-0f2a-459c-853d-e312e14693d0@798c8", + "displayName": "", + "id": "798c8", + "name": "buff2-5", + "userData": { + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 0, + "trimY": 862, + "width": 94, + "height": 70, + "rawWidth": 94, + "rawHeight": 70, + "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": "39cde2ed-1c08-46d0-9fe1-ad4c917a7b34@6c48a", + "atlasUuid": "2e272fb5-0f2a-459c-853d-e312e14693d0" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + }, + "8fbc1": { + "importer": "sprite-frame", + "uuid": "2e272fb5-0f2a-459c-853d-e312e14693d0@8fbc1", + "displayName": "", + "id": "8fbc1", + "name": "buff2-6", + "userData": { + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 0, + "trimY": 513, + "width": 93, + "height": 69, + "rawWidth": 93, + "rawHeight": 69, + "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": "39cde2ed-1c08-46d0-9fe1-ad4c917a7b34@6c48a", + "atlasUuid": "2e272fb5-0f2a-459c-853d-e312e14693d0" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + }, + "05350": { + "importer": "sprite-frame", + "uuid": "2e272fb5-0f2a-459c-853d-e312e14693d0@05350", + "displayName": "", + "id": "05350", + "name": "buff3-1", + "userData": { + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 0, + "trimY": 29, + "width": 100, + "height": 19, + "rawWidth": 100, + "rawHeight": 19, + "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": "39cde2ed-1c08-46d0-9fe1-ad4c917a7b34@6c48a", + "atlasUuid": "2e272fb5-0f2a-459c-853d-e312e14693d0" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + }, + "0a216": { + "importer": "sprite-frame", + "uuid": "2e272fb5-0f2a-459c-853d-e312e14693d0@0a216", + "displayName": "", + "id": "0a216", + "name": "buff3-2", + "userData": { + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 0, + "trimY": 48, + "width": 100, + "height": 19, + "rawWidth": 100, + "rawHeight": 19, + "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": "39cde2ed-1c08-46d0-9fe1-ad4c917a7b34@6c48a", + "atlasUuid": "2e272fb5-0f2a-459c-853d-e312e14693d0" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + }, + "6b05a": { + "importer": "sprite-frame", + "uuid": "2e272fb5-0f2a-459c-853d-e312e14693d0@6b05a", + "displayName": "", + "id": "6b05a", + "name": "buff3-3", + "userData": { + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 0, + "trimY": 67, + "width": 100, + "height": 19, + "rawWidth": 100, + "rawHeight": 19, + "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": "39cde2ed-1c08-46d0-9fe1-ad4c917a7b34@6c48a", + "atlasUuid": "2e272fb5-0f2a-459c-853d-e312e14693d0" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + }, + "9e298": { + "importer": "sprite-frame", + "uuid": "2e272fb5-0f2a-459c-853d-e312e14693d0@9e298", + "displayName": "", + "id": "9e298", + "name": "buff3-4", + "userData": { + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 0, + "trimY": 86, + "width": 100, + "height": 19, + "rawWidth": 100, + "rawHeight": 19, + "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": "39cde2ed-1c08-46d0-9fe1-ad4c917a7b34@6c48a", + "atlasUuid": "2e272fb5-0f2a-459c-853d-e312e14693d0" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + }, + "0a780": { + "importer": "sprite-frame", + "uuid": "2e272fb5-0f2a-459c-853d-e312e14693d0@0a780", + "displayName": "", + "id": "0a780", + "name": "jiaxue-0", + "userData": { + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 0, + "trimY": 0, + "width": 7, + "height": 10, + "rawWidth": 7, + "rawHeight": 10, + "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": "39cde2ed-1c08-46d0-9fe1-ad4c917a7b34@6c48a", + "atlasUuid": "2e272fb5-0f2a-459c-853d-e312e14693d0" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + }, + "d2c0d": { + "importer": "sprite-frame", + "uuid": "2e272fb5-0f2a-459c-853d-e312e14693d0@d2c0d", + "displayName": "", + "id": "d2c0d", + "name": "jiaxue-1", + "userData": { + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 7, + "trimY": 0, + "width": 7, + "height": 10, + "rawWidth": 7, + "rawHeight": 10, + "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": "39cde2ed-1c08-46d0-9fe1-ad4c917a7b34@6c48a", + "atlasUuid": "2e272fb5-0f2a-459c-853d-e312e14693d0" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + }, + "dfefd": { + "importer": "sprite-frame", + "uuid": "2e272fb5-0f2a-459c-853d-e312e14693d0@dfefd", + "displayName": "", + "id": "dfefd", + "name": "jiaxue-2", + "userData": { + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 14, + "trimY": 0, + "width": 7, + "height": 10, + "rawWidth": 7, + "rawHeight": 10, + "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": "39cde2ed-1c08-46d0-9fe1-ad4c917a7b34@6c48a", + "atlasUuid": "2e272fb5-0f2a-459c-853d-e312e14693d0" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + }, + "e3a32": { + "importer": "sprite-frame", + "uuid": "2e272fb5-0f2a-459c-853d-e312e14693d0@e3a32", + "displayName": "", + "id": "e3a32", + "name": "jiaxue-3", + "userData": { + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 21, + "trimY": 0, + "width": 7, + "height": 10, + "rawWidth": 7, + "rawHeight": 10, + "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": "39cde2ed-1c08-46d0-9fe1-ad4c917a7b34@6c48a", + "atlasUuid": "2e272fb5-0f2a-459c-853d-e312e14693d0" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + }, + "5c7dd": { + "importer": "sprite-frame", + "uuid": "2e272fb5-0f2a-459c-853d-e312e14693d0@5c7dd", + "displayName": "", + "id": "5c7dd", + "name": "jiaxue-5", + "userData": { + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 35, + "trimY": 0, + "width": 7, + "height": 10, + "rawWidth": 7, + "rawHeight": 10, + "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": "39cde2ed-1c08-46d0-9fe1-ad4c917a7b34@6c48a", + "atlasUuid": "2e272fb5-0f2a-459c-853d-e312e14693d0" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} } }, "userData": { diff --git a/assets/resources/game/skills/buff/b1.png b/assets/resources/game/skills/buff/b1.png index ac676b7a..218b22f7 100644 Binary files a/assets/resources/game/skills/buff/b1.png and b/assets/resources/game/skills/buff/b1.png differ diff --git a/assets/resources/game/skills/heath/jiaxue.anim b/assets/resources/game/skills/heath/jiaxue.anim new file mode 100644 index 00000000..cb3f263d --- /dev/null +++ b/assets/resources/game/skills/heath/jiaxue.anim @@ -0,0 +1,193 @@ +[ + { + "__type__": "cc.AnimationClip", + "_name": "jiaxue", + "_objFlags": 0, + "__editorExtras__": { + "embeddedPlayerGroups": [] + }, + "_native": "", + "sample": 10, + "speed": 1, + "wrapMode": 2, + "enableTrsBlending": false, + "_duration": 2.4, + "_hash": 500763545, + "_tracks": [ + { + "__id__": 1 + } + ], + "_exoticAnimation": null, + "_events": [], + "_embeddedPlayers": [], + "_additiveSettings": { + "__id__": 6 + }, + "_auxiliaryCurveEntries": [] + }, + { + "__type__": "cc.animation.ObjectTrack", + "_binding": { + "__type__": "cc.animation.TrackBinding", + "path": { + "__id__": 2 + }, + "proxy": null + }, + "_channel": { + "__id__": 4 + } + }, + { + "__type__": "cc.animation.TrackPath", + "_paths": [ + { + "__id__": 3 + }, + "spriteFrame" + ] + }, + { + "__type__": "cc.animation.ComponentPath", + "component": "cc.Sprite" + }, + { + "__type__": "cc.animation.Channel", + "_curve": { + "__id__": 5 + } + }, + { + "__type__": "cc.ObjectCurve", + "_times": [ + 0, + 0.1, + 0.2, + 0.3, + 0.4, + 0.5, + 0.6, + 0.7, + 0.8, + 0.9, + 1, + 1.1, + 1.2, + 1.3, + 1.4, + 1.5, + 1.6, + 1.7, + 1.8, + 1.9, + 2, + 2.1, + 2.2, + 2.3 + ], + "_values": [ + { + "__uuid__": "45af5702-7585-4d72-85cf-d7b8da02d832@8bbe1", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "45af5702-7585-4d72-85cf-d7b8da02d832@6af37", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "45af5702-7585-4d72-85cf-d7b8da02d832@8c9f6", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "45af5702-7585-4d72-85cf-d7b8da02d832@5eb5f", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "45af5702-7585-4d72-85cf-d7b8da02d832@9b440", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "45af5702-7585-4d72-85cf-d7b8da02d832@ee2f0", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "45af5702-7585-4d72-85cf-d7b8da02d832@0e978", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "45af5702-7585-4d72-85cf-d7b8da02d832@473f3", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "45af5702-7585-4d72-85cf-d7b8da02d832@7b5b0", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "45af5702-7585-4d72-85cf-d7b8da02d832@42880", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "45af5702-7585-4d72-85cf-d7b8da02d832@719ea", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "45af5702-7585-4d72-85cf-d7b8da02d832@5c045", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "45af5702-7585-4d72-85cf-d7b8da02d832@242d6", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "45af5702-7585-4d72-85cf-d7b8da02d832@58e0c", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "45af5702-7585-4d72-85cf-d7b8da02d832@c4f8b", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "45af5702-7585-4d72-85cf-d7b8da02d832@49c82", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "45af5702-7585-4d72-85cf-d7b8da02d832@65e0a", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "45af5702-7585-4d72-85cf-d7b8da02d832@95c6c", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "45af5702-7585-4d72-85cf-d7b8da02d832@0d3da", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "45af5702-7585-4d72-85cf-d7b8da02d832@0f0b4", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "45af5702-7585-4d72-85cf-d7b8da02d832@78c08", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "45af5702-7585-4d72-85cf-d7b8da02d832@18a2d", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "45af5702-7585-4d72-85cf-d7b8da02d832@99948", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "45af5702-7585-4d72-85cf-d7b8da02d832@ef692", + "__expectedType__": "cc.SpriteFrame" + } + ] + }, + { + "__type__": "cc.AnimationClipAdditiveSettings", + "enabled": false, + "refClip": null + } +] \ No newline at end of file diff --git a/assets/resources/game/skills/heath/jiaxue.anim.meta b/assets/resources/game/skills/heath/jiaxue.anim.meta new file mode 100644 index 00000000..a7663f19 --- /dev/null +++ b/assets/resources/game/skills/heath/jiaxue.anim.meta @@ -0,0 +1,13 @@ +{ + "ver": "2.0.3", + "importer": "animation-clip", + "imported": true, + "uuid": "b881dada-0e58-4189-8299-7b5d97e318df", + "files": [ + ".cconb" + ], + "subMetas": {}, + "userData": { + "name": "jiaxue" + } +} diff --git a/assets/resources/game/skills/heathed.prefab b/assets/resources/game/skills/heathed.prefab index 1ccb2804..2f9f8ea8 100644 --- a/assets/resources/game/skills/heathed.prefab +++ b/assets/resources/game/skills/heathed.prefab @@ -22,7 +22,7 @@ "__id__": 2 } ], - "_active": false, + "_active": true, "_components": [ { "__id__": 8 diff --git a/assets/resources/game/skills/jiaxue.prefab b/assets/resources/game/skills/jiaxue.prefab new file mode 100644 index 00000000..7637df45 --- /dev/null +++ b/assets/resources/game/skills/jiaxue.prefab @@ -0,0 +1,271 @@ +[ + { + "__type__": "cc.Prefab", + "_name": "jiaxue", + "_objFlags": 0, + "__editorExtras__": {}, + "_native": "", + "data": { + "__id__": 1 + }, + "optimizationPolicy": 0, + "persistent": false + }, + { + "__type__": "cc.Node", + "_name": "jiaxue", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": null, + "_children": [ + { + "__id__": 2 + } + ], + "_active": true, + "_components": [ + { + "__id__": 10 + } + ], + "_prefab": { + "__id__": 12 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 1, + "y": 1, + "z": 1 + }, + "_mobility": 0, + "_layer": 1073741824, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.Node", + "_name": "skill", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 1 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 3 + }, + { + "__id__": 5 + }, + { + "__id__": 7 + } + ], + "_prefab": { + "__id__": 9 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 1, + "y": 1, + "z": 1 + }, + "_mobility": 0, + "_layer": 1073741824, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 2 + }, + "_enabled": true, + "__prefab": { + "__id__": 4 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 26, + "height": 26 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "8ehvwqH4ZFlK/UcLSoFCO0" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 2 + }, + "_enabled": true, + "__prefab": { + "__id__": 6 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 45, + "g": 199, + "b": 70, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "45af5702-7585-4d72-85cf-d7b8da02d832@8bbe1", + "__expectedType__": "cc.SpriteFrame" + }, + "_type": 0, + "_fillType": 0, + "_sizeMode": 1, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_useGrayscale": false, + "_atlas": null, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "04fTLJ1QdEJLkeIVNdVxef" + }, + { + "__type__": "cc.Animation", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 2 + }, + "_enabled": true, + "__prefab": { + "__id__": 8 + }, + "playOnLoad": false, + "_clips": [ + { + "__uuid__": "b881dada-0e58-4189-8299-7b5d97e318df", + "__expectedType__": "cc.AnimationClip" + } + ], + "_defaultClip": { + "__uuid__": "b881dada-0e58-4189-8299-7b5d97e318df", + "__expectedType__": "cc.AnimationClip" + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "9bHkXlamJLVJrCV9XQLKcW" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "bczw9AVWRKvbioC0BzckLA", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 1 + }, + "_enabled": true, + "__prefab": { + "__id__": 11 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 100, + "height": 100 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "893nuUmClG0LvnTTvx/hI/" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "c46/YsCPVOJYA4mWEpNYRx", + "instance": null, + "targetOverrides": null + } +] \ No newline at end of file diff --git a/assets/resources/game/skills/jiaxue.prefab.meta b/assets/resources/game/skills/jiaxue.prefab.meta new file mode 100644 index 00000000..9eb594b6 --- /dev/null +++ b/assets/resources/game/skills/jiaxue.prefab.meta @@ -0,0 +1,13 @@ +{ + "ver": "1.1.50", + "importer": "prefab", + "imported": true, + "uuid": "ec11e9f5-3347-4d5e-8ed8-f98a6ac7963a", + "files": [ + ".json" + ], + "subMetas": {}, + "userData": { + "syncNodeName": "jiaxue" + } +} diff --git a/assets/script/game/common/SingletonModuleComp.ts b/assets/script/game/common/SingletonModuleComp.ts index b0c3fec5..df191f46 100644 --- a/assets/script/game/common/SingletonModuleComp.ts +++ b/assets/script/game/common/SingletonModuleComp.ts @@ -86,7 +86,7 @@ export class SingletonModuleComp extends ecs.Comp { bboss_cd:10, victory:0, once:6, //每波刷新怪物数量 - total:120, //总怪物数 + total:1, //总怪物数 m_less:0, m_alive:120, g_level:1, diff --git a/assets/script/game/hero/Hero.ts b/assets/script/game/hero/Hero.ts index 60240995..7d9951d3 100644 --- a/assets/script/game/hero/Hero.ts +++ b/assets/script/game/hero/Hero.ts @@ -59,11 +59,7 @@ export class Hero extends ecs.Entity { var prefab: Prefab = oops.res.get(path, Prefab)!; var node = instantiate(prefab); node.parent=layer - // var as = node.getComponent(HeroSpine); - // let ratio=this.set_ratio(uuid); - // node.setScale(node.scale.x*scale*ratio, node.scale.y*ratio, 0); - // pos.x=smc.Role.RoleView.node.position.x+pos.x; - // pos.y=smc.Role.RoleView.node.position.y+pos.y; + node.setPosition(pos) this.hero_init(uuid,node,index,scale,box_group) oops.message.dispatchEvent("hero_load",this) @@ -88,12 +84,12 @@ export class Hero extends ecs.Entity { hv.max_skill_uuid = hero_set.max_skill_uuid; hv.role_heros_index = index; hv.type = hero_set.type; - hv.hp= hv.hp_max =Math.floor(hero_set.hp*(1+talents[1011].bonus*role_talent[1011].lv)*smc.vm_data.mission.hero.hp); - hv.atk = Math.floor(hero_set.atk*(1+talents[1012].bonus*role_talent[1012].lv)) - hv.atk_cd = hero_set.atk_cd*(1-talents[1013].bonus*role_talent[1013].lv); - hv.st_boncus=1+talents[1015].bonus*role_talent[1015].lv; - hv.s_boncus=1+talents[1016].bonus*role_talent[1016].lv; - hv.power_max= hero_set.power_max*(1-talents[1014].bonus*role_talent[1014].lv);; + hv.hp= hv.hp_max =hero_set.hp; + hv.atk = hero_set.atk; + hv.atk_cd = hero_set.atk_cd + hv.st_boncus=1 + hv.s_boncus=1 + hv.power_max= hero_set.power_max this.add(hv); } set_ratio(uuid:number){ diff --git a/assets/script/game/hero/HeroSpine.ts b/assets/script/game/hero/HeroSpine.ts index 2ec7c0a3..dbc6defd 100644 --- a/assets/script/game/hero/HeroSpine.ts +++ b/assets/script/game/hero/HeroSpine.ts @@ -44,43 +44,53 @@ export class HeroSpine extends Component { // console.log("mon spine init",this.animator); } - + in_playing(){ + if(this.animator.getState(this.atk_clip.name).isPlaying) return true; + if(this.animator.getState(this.max_clip.name).isPlaying) return true; + if(this.animator.getState(this.idle_clip.name).isPlaying) return true; + if(this.animator.getState(this.move_clip.name).isPlaying) return true; + return false; + } onAnimationEvent(type: Animation.EventType, state: AnimationState){ if(type==Animation.EventType.FINISHED){ + console.log("animator end",state.name); if(state.name==this.atk_clip.name||state.name==this.max_clip.name){ + console.log("animator no atk and no max"); this.default(); } } } change_default(value:string){ + console.log("change default",value); this.default_clip=value; } default() { - if(!this.animator.getState(this.default_clip).isPlaying){ + if(!this.in_playing()){ + console.log("do default"); this.animator.play(this.default_clip); } } idle(){ - if(!this.animator.getState(this.idle_clip.name).isPlaying){ + if(!this.in_playing()){ + console.log("do idle"); this.animator.play(this.idle_clip.name); } } atk() { - if(!this.animator.getState(this.atk_clip.name).isPlaying){ - this.animator.play(this.atk_clip.name); - } + console.log("do atk"); + this.animator.play(this.atk_clip.name); } max(){ - if(!this.animator.getState(this.max_clip.name).isPlaying){ + console.log("do max"); this.animator.play(this.max_clip.name); - } } move(){ - if(!this.animator.getState(this.move_clip.name).isPlaying){ + if(!this.in_playing()){ + console.log("do move"); this.animator.play(this.move_clip.name); } } diff --git a/assets/script/game/hero/HeroViewComp.ts b/assets/script/game/hero/HeroViewComp.ts index cdad03ce..b83b1679 100644 --- a/assets/script/game/hero/HeroViewComp.ts +++ b/assets/script/game/hero/HeroViewComp.ts @@ -99,7 +99,7 @@ export class HeroViewComp extends CCComp { role_heros_index:number = -1; anm_timer:Timer = new Timer(2); anm_name="idle" - + status:String = "idle" onLoad() { this.as = this.getComponent(HeroSpine); // this.BoxRang = this.node.getChildByName("range_box"); @@ -124,10 +124,7 @@ export class HeroViewComp extends CCComp { // this.BoxRang.getComponent(BoxRangComp).offset_x = 300; // console.log("monseter ",this.BoxRang); // console.log("monseter ",this.BoxRang); - // if(this.box_group == BoxSet.MON){ - // this.enemy=smc.Role.RoleView.node - // // console.log("mon enemy ",this.enemy); - // } + // 注册单个碰撞体的回调函数 let collider = this.getComponent(Collider2D); collider.group = this.box_group; @@ -185,7 +182,15 @@ export class HeroViewComp extends CCComp { } onPostSolve (selfCollider: Collider2D, otherCollider: Collider2D) { } - + status_change(type:string){ + if(this.status == type) return + this.status=type + if(type != "move"){ + this.as.change_default("idle") + }else{ + this.as.change_default("move") + } + } update(dt: number){ if(!smc.vm_data.mission.play||smc.vm_data.pause){ @@ -194,18 +199,18 @@ export class HeroViewComp extends CCComp { if (this.timer.update(dt)) { this.power_change(this.power_speed) } - if(this.anm_timer.update(dt)) { - this.change_anm() - } - // this.in_destroy(); - // this.check_buff_atks(dt) - // this.in_shield(dt); - // this.in_stop(dt); - // this.atk_time += dt; - // this.check_enemy_alive() - // this.in_atk(dt); - // this.hp_show() - // this.move(dt); + // if(this.anm_timer.update(dt)) { + // this.change_anm() + // } + this.in_destroy(); + this.check_buff_atks(dt) + this.in_shield(dt); + this.in_stop(dt); + this.atk_time += dt; + this.check_enemy_alive() + this.in_atk(dt); + this.hp_show() + this.move(dt); // this.in_speek(dt); @@ -266,8 +271,11 @@ export class HeroViewComp extends CCComp { } } + move(dt: number){ if(this.stop_cd > 0){ + this.as.idle() + this.status_change("idle") return } if (this.node.position.x >= 360 && this.scale==1) { @@ -276,11 +284,14 @@ export class HeroViewComp extends CCComp { if(this.scale===-1&&this.node.position.x <= -360){ return; } + this.as.move() + this.status_change("move") // if(this.enemy){ // return // } this.node.setPosition(this.node.position.x+dt*this.speed*this.scale, this.node.position.y+dt*this.dir_y, this.node.position.z); } + hp_show(){ if(this.hp == this.hp_max){ this.node.getChildByName("top").getChildByName("hp").active = false; @@ -397,13 +408,7 @@ export class HeroViewComp extends CCComp { } if(t_hero){ //血量最少单体 - if(smc.Role.RoleView){ - let role_hp=smc.Role.RoleView.hp_max-smc.Role.RoleView.hp - if(role_hp > least_hp){ - least_hp = role_hp - t_hero = smc.Role.RoleView - } - } + this.to_add_buff(t_hero,skill) } @@ -453,10 +458,10 @@ export class HeroViewComp extends CCComp { in_atk(dt: number) { - if(this.atk_time >= this.atk_cd/smc.vm_data.mission.hero.atk_cd){ + if(this.atk_time >= this.atk_cd){ if(this.is_atking){ this.atk_time = 0; - // console.log("atk_cd:"+this.atk_cd); + console.log("atk_cd:"+this.atk_cd); this.as.atk(); this.scheduleOnce(()=>{ this.handle_skill(this.skill_uuid) diff --git a/assets/script/game/map/MapMonsterComp.ts b/assets/script/game/map/MapMonsterComp.ts index 935241be..c46dabc9 100644 --- a/assets/script/game/map/MapMonsterComp.ts +++ b/assets/script/game/map/MapMonsterComp.ts @@ -82,7 +82,7 @@ export class MapMonsterComp extends CCComp { } if(this.setp_timer.update(dt)){ if(this.total<=0) return - // this.monster_refresh() + this.monster_refresh() } if(this.call_hero_timer.update(dt)){ if(this.hero_total <= 0) return @@ -90,7 +90,7 @@ export class MapMonsterComp extends CCComp { } if(this.boss_timer.update(dt)){ if(this.boss_num <=0 ) return - this.load_boss() + // this.load_boss() } this.is_reward() if (this.refresh_timer.update(dt)) { @@ -122,7 +122,6 @@ export class MapMonsterComp extends CCComp { this.hero_x=0 this.hero_index=0 smc.vm_data.mission.coin = 0 - // this.load_role() } on_mon_dead(){ let coin =(GameSet.MON_COIN_ADD*smc.vm_data.mission.coin_reward_add*(1+Talents[1006].bonus*smc.vm_data.talent[1006].lv)).toFixed(0) @@ -190,10 +189,11 @@ export class MapMonsterComp extends CCComp { count_mon_pos(){ let monsters:any= ecs.query(ecs.allOf(MonModelComp)); for(let i=0;i(Role); - let pos = v3(BoxSet.HERO_START-100,BoxSet.GAME_LINE-5) - role.load(pos,109) - smc.Role=role - // console.log("加载玩家",role) + console.log("count_hero_pos",smc.hero_pos); } + private on_do_add_hero(event: string, args: any) { this.addHero(args.uuid) } diff --git a/assets/script/game/map/MapSkillComp.ts b/assets/script/game/map/MapSkillComp.ts index d2c9dbd0..9b30a2ff 100644 --- a/assets/script/game/map/MapSkillComp.ts +++ b/assets/script/game/map/MapSkillComp.ts @@ -41,15 +41,7 @@ export class MapSkillComp extends CCComp { } useItem(event: string, args: any){ console.log("useItem"); - if(smc.sitems[args.uuid].hp > 0){ //buff加血 - smc.Role.RoleView.add_hp(smc.sitems[args.uuid].hp) - } - if(smc.sitems[args.uuid].atk > 0){ //buff加攻击 - smc.Role.RoleView.add_atk(smc.sitems[args.uuid].atk,smc.sitems[args.uuid].sd) - } - if(smc.sitems[args.uuid].shield > 0){ //buff护盾 - smc.Role.RoleView.add_shield(smc.sitems[args.uuid].shield,smc.sitems[args.uuid].sd) - } + } /** 视图层逻辑代码分离演示 */ start() { diff --git a/assets/script/game/mon/MonViewComp.ts b/assets/script/game/mon/MonViewComp.ts index 75e5ea8f..1b11ee66 100644 --- a/assets/script/game/mon/MonViewComp.ts +++ b/assets/script/game/mon/MonViewComp.ts @@ -106,10 +106,7 @@ export class MonViewComp extends CCComp { // this.BoxRang.getComponent(BoxRangComp).offset_x = 300; // console.log("monseter ",this.BoxRang); // console.log("monseter ",this.BoxRang); - // if(this.box_group == BoxSet.MON){ - // this.enemy=smc.Role.RoleView.node - // // console.log("mon enemy ",this.enemy); - // } + // 注册单个碰撞体的回调函数 let collider = this.getComponent(Collider2D); collider.group = this.box_group; @@ -172,10 +169,7 @@ export class MonViewComp extends CCComp { this.in_atk(dt); this.hp_show() this.move(dt); - - // if(this.m_timer.update(dt)){ - // this.move_to() - // } + } check_enemy_alive(){ let dir = 320 @@ -222,12 +216,7 @@ export class MonViewComp extends CCComp { set_diry(){ this.dir_y=-(this.node.position.y-BoxSet.GAME_LINE)/20 } - move_to(){ - var move = this.ent.get(MoveToComp) || this.ent.add(MoveToComp); - move.target = v3(smc.Role.RoleView.node.position.x+10,smc.Role.RoleView.node.position.y); - move.node = this.node; - move.speed = this.ospeed; - } + power_change(power: number){ if(this.max_skill_uuid == 0){ return diff --git a/assets/script/game/skills/CSkillComp.ts b/assets/script/game/skills/CSkillComp.ts index 04933b83..f4eedc4f 100644 --- a/assets/script/game/skills/CSkillComp.ts +++ b/assets/script/game/skills/CSkillComp.ts @@ -74,7 +74,7 @@ export class CSkillComp extends CCComp { angle = randian * (180 / Math.PI); let scale = this.scale let atk = smc.skills[this.skill_uuid].atk+this.atk; - skill.load(pos,scale,this.node,this.skill_uuid,atk,angle,t_pos); + skill.load(pos,scale,this.node,this.skill_uuid,atk,t_pos); } add_buff(){ // 1： 远距离攻击，碰撞后 结束 @@ -89,7 +89,7 @@ export class CSkillComp extends CCComp { // 94：role 临时buff // 95：role 永久buff let uuid= this.skill_uuid; - let atk:number=smc.Role.RoleView.atk?smc.Role.RoleView.atk:0 + let atk:number=0 let args:any = { atk:atk*GameSet.ATK_TO_ATK_RATIO, hp:atk*GameSet.ATK_TO_HP_RATIO,