diff --git a/assets/resources/game/heros/equips2.plist b/assets/resources/game/heros/equips2.plist index 3fe31a58..45b4d9f4 100644 --- a/assets/resources/game/heros/equips2.plist +++ b/assets/resources/game/heros/equips2.plist @@ -15,9 +15,9 @@ spriteSourceSize {90,90} textureRect - {{213,899},{74,76}} + {{379,823},{74,76}} textureRotated - + 2102.png @@ -30,7 +30,7 @@ spriteSourceSize {90,90} textureRect - {{321,675},{76,78}} + {{75,755},{76,78}} textureRotated @@ -60,7 +60,7 @@ spriteSourceSize {90,90} textureRect - {{75,665},{78,78}} + {{241,585},{78,78}} textureRotated @@ -75,7 +75,7 @@ spriteSourceSize {90,90} textureRect - {{409,537},{78,78}} + {{159,595},{78,78}} textureRotated @@ -105,7 +105,7 @@ spriteSourceSize {90,90} textureRect - {{407,617},{78,76}} + {{77,677},{78,76}} textureRotated @@ -135,7 +135,7 @@ spriteSourceSize {90,90} textureRect - {{327,595},{78,78}} + {{409,517},{78,78}} textureRotated @@ -195,9 +195,9 @@ spriteSourceSize {90,90} textureRect - {{281,977},{74,76}} + {{377,899},{74,76}} textureRotated - + 2114.png @@ -240,7 +240,7 @@ spriteSourceSize {90,90} textureRect - {{313,753},{76,76}} + {{229,755},{76,76}} textureRotated @@ -255,9 +255,9 @@ spriteSourceSize {90,90} textureRect - {{357,977},{74,72}} + {{151,849},{74,72}} textureRotated - + 3102.png @@ -285,7 +285,7 @@ spriteSourceSize {90,90} textureRect - {{435,213},{86,76}} + {{429,355},{86,76}} textureRotated @@ -300,7 +300,7 @@ spriteSourceSize {90,90} textureRect - {{343,339},{88,74}} + {{431,265},{88,74}} textureRotated @@ -330,9 +330,9 @@ spriteSourceSize {90,90} textureRect - {{1,669},{86,70}} + {{321,599},{86,70}} textureRotated - + 3107.png @@ -345,7 +345,7 @@ spriteSourceSize {90,90} textureRect - {{1,417},{84,78}} + {{343,339},{84,78}} textureRotated @@ -390,7 +390,7 @@ spriteSourceSize {90,90} textureRect - {{401,695},{84,70}} + {{309,671},{84,70}} textureRotated @@ -420,7 +420,7 @@ spriteSourceSize {90,90} textureRect - {{225,753},{86,68}} + {{395,677},{86,68}} textureRotated @@ -450,7 +450,7 @@ spriteSourceSize {90,90} textureRect - {{73,745},{88,68}} + {{159,675},{88,68}} textureRotated @@ -465,7 +465,7 @@ spriteSourceSize {90,90} textureRect - {{171,423},{80,80}} + {{259,421},{80,80}} textureRotated @@ -495,9 +495,9 @@ spriteSourceSize {90,90} textureRect - {{447,73},{68,64}} + {{141,993},{68,64}} textureRotated - + 4102.png @@ -510,9 +510,9 @@ spriteSourceSize {90,90} textureRect - {{73,997},{66,64}} + {{211,1043},{66,64}} textureRotated - + 4103.png @@ -525,9 +525,9 @@ spriteSourceSize {90,90} textureRect - {{1,927},{70,78}} + {{227,833},{70,78}} textureRotated - + 4104.png @@ -540,7 +540,7 @@ spriteSourceSize {90,90} textureRect - {{205,995},{68,74}} + {{143,923},{68,74}} textureRotated @@ -555,7 +555,7 @@ spriteSourceSize {90,90} textureRect - {{73,919},{68,76}} + {{1,915},{68,76}} textureRotated @@ -570,9 +570,9 @@ spriteSourceSize {90,90} textureRect - {{365,831},{70,72}} + {{301,915},{70,72}} textureRotated - + 4107.png @@ -585,9 +585,9 @@ spriteSourceSize {90,90} textureRect - {{439,837},{68,72}} + {{1,993},{68,72}} textureRotated - + 4108.png @@ -600,9 +600,9 @@ spriteSourceSize {90,90} textureRect - {{437,767},{68,74}} + {{71,989},{68,74}} textureRotated - + 4109.png @@ -615,9 +615,9 @@ spriteSourceSize {90,90} textureRect - {{447,1},{64,70}} + {{219,977},{64,70}} textureRotated - + 4110.png @@ -630,7 +630,7 @@ spriteSourceSize {90,90} textureRect - {{431,977},{70,72}} + {{375,975},{70,72}} textureRotated @@ -645,7 +645,7 @@ spriteSourceSize {90,90} textureRect - {{139,997},{64,64}} + {{141,1059},{64,64}} textureRotated @@ -660,9 +660,9 @@ spriteSourceSize {90,90} textureRect - {{447,143},{68,64}} + {{291,987},{68,64}} textureRotated - + 4113.png @@ -675,7 +675,7 @@ spriteSourceSize {90,90} textureRect - {{143,853},{78,68}} + {{73,909},{78,68}} textureRotated @@ -690,9 +690,9 @@ spriteSourceSize {90,90} textureRect - {{291,831},{64,60}} + {{279,1053},{64,60}} textureRotated - + 4122.png @@ -705,7 +705,7 @@ spriteSourceSize {90,90} textureRect - {{143,933},{68,60}} + {{361,1047},{68,60}} textureRotated @@ -720,7 +720,7 @@ spriteSourceSize {90,90} textureRect - {{365,905},{72,70}} + {{227,905},{72,70}} textureRotated @@ -765,7 +765,7 @@ spriteSourceSize {90,90} textureRect - {{87,429},{80,80}} + {{171,423},{80,80}} textureRotated @@ -780,7 +780,7 @@ spriteSourceSize {90,90} textureRect - {{241,599},{78,78}} + {{409,597},{78,78}} textureRotated @@ -795,7 +795,7 @@ spriteSourceSize {90,90} textureRect - {{1,497},{80,80}} + {{253,503},{80,80}} textureRotated @@ -855,7 +855,7 @@ spriteSourceSize {90,90} textureRect - {{213,823},{76,74}} + {{73,833},{76,74}} textureRotated @@ -885,7 +885,7 @@ spriteSourceSize {90,90} textureRect - {{169,505},{80,80}} + {{85,429},{80,80}} textureRotated @@ -915,7 +915,7 @@ spriteSourceSize {90,90} textureRect - {{333,429},{80,78}} + {{85,511},{80,78}} textureRotated @@ -960,7 +960,7 @@ spriteSourceSize {90,90} textureRect - {{415,457},{80,78}} + {{1,579},{80,78}} textureRotated @@ -975,9 +975,9 @@ spriteSourceSize {90,90} textureRect - {{431,301},{80,82}} + {{1,417},{80,82}} textureRotated - + 6102.png @@ -990,7 +990,7 @@ spriteSourceSize {90,90} textureRect - {{1,757},{70,84}} + {{1,829},{70,84}} textureRotated @@ -1005,7 +1005,7 @@ spriteSourceSize {90,90} textureRect - {{333,509},{74,84}} + {{83,591},{74,84}} textureRotated @@ -1020,9 +1020,9 @@ spriteSourceSize {90,90} textureRect - {{225,679},{72,82}} + {{1,745},{72,82}} textureRotated - + 6105.png @@ -1035,9 +1035,9 @@ spriteSourceSize {90,90} textureRect - {{419,385},{70,90}} + {{435,173},{70,90}} textureRotated - + 6106.png @@ -1050,7 +1050,7 @@ spriteSourceSize {90,90} textureRect - {{155,675},{68,88}} + {{239,665},{68,88}} textureRotated @@ -1065,7 +1065,7 @@ spriteSourceSize {90,90} textureRect - {{73,835},{68,82}} + {{307,831},{68,82}} textureRotated @@ -1080,7 +1080,7 @@ spriteSourceSize {90,90} textureRect - {{1,579},{72,88}} + {{167,505},{72,88}} textureRotated @@ -1095,7 +1095,7 @@ spriteSourceSize {90,90} textureRect - {{1,843},{70,82}} + {{155,765},{70,82}} textureRotated @@ -1110,7 +1110,7 @@ spriteSourceSize {90,90} textureRect - {{259,421},{72,90}} + {{343,419},{72,90}} textureRotated @@ -1125,7 +1125,7 @@ spriteSourceSize {90,90} textureRect - {{143,765},{68,86}} + {{309,743},{68,86}} textureRotated @@ -1140,9 +1140,9 @@ spriteSourceSize {90,90} textureRect - {{167,587},{72,86}} + {{417,443},{72,86}} textureRotated - + 6113.png @@ -1155,9 +1155,9 @@ spriteSourceSize {90,90} textureRect - {{75,591},{72,86}} + {{335,511},{72,86}} textureRotated - + 6114.png @@ -1170,7 +1170,7 @@ spriteSourceSize {90,90} textureRect - {{251,513},{74,84}} + {{1,659},{74,84}} textureRotated @@ -1185,7 +1185,7 @@ spriteSourceSize {90,90} textureRect - {{83,511},{78,82}} + {{1,499},{78,82}} textureRotated @@ -1200,10 +1200,295 @@ spriteSourceSize {90,90} textureRect - {{289,899},{76,74}} + {{379,747},{76,74}} + textureRotated + + + 7401.png + + aliases + + spriteOffset + {0,-1} + spriteSize + {50,42} + spriteSourceSize + {64,64} + textureRect + {{457,845},{50,42}} textureRotated + 7402.png + + aliases + + spriteOffset + {-1,0} + spriteSize + {50,54} + spriteSourceSize + {64,64} + textureRect + {{455,941},{50,54}} + textureRotated + + + 7403.png + + aliases + + spriteOffset + {-1,0} + spriteSize + {44,48} + spriteSourceSize + {64,64} + textureRect + {{457,799},{44,48}} + textureRotated + + + 7404.png + + aliases + + spriteOffset + {1,0} + spriteSize + {54,58} + spriteSourceSize + {64,64} + textureRect + {{447,117},{54,58}} + textureRotated + + + 7405.png + + aliases + + spriteOffset + {1,-1} + spriteSize + {50,48} + spriteSourceSize + {64,64} + textureRect + {{457,747},{50,48}} + textureRotated + + + 7406.png + + aliases + + spriteOffset + {0,-1} + spriteSize + {60,60} + spriteSourceSize + {64,64} + textureRect + {{137,1125},{60,60}} + textureRotated + + + 7421.png + + aliases + + spriteOffset + {1,0} + spriteSize + {54,56} + spriteSourceSize + {64,64} + textureRect + {{449,997},{54,56}} + textureRotated + + + 7422.png + + aliases + + spriteOffset + {0,-2} + spriteSize + {60,60} + spriteSourceSize + {64,64} + textureRect + {{345,1109},{60,60}} + textureRotated + + + 7423.png + + aliases + + spriteOffset + {-1,-1} + spriteSize + {58,56} + spriteSourceSize + {64,64} + textureRect + {{447,1},{58,56}} + textureRotated + + + 7424.png + + aliases + + spriteOffset + {-1,0} + spriteSize + {56,58} + spriteSourceSize + {64,64} + textureRect + {{447,59},{56,58}} + textureRotated + + + 7425.png + + aliases + + spriteOffset + {-1,0} + spriteSize + {60,60} + spriteSourceSize + {64,64} + textureRect + {{271,1115},{60,60}} + textureRotated + + + 7426.png + + aliases + + spriteOffset + {0,0} + spriteSize + {60,60} + spriteSourceSize + {64,64} + textureRect + {{407,1117},{60,60}} + textureRotated + + + 7441.png + + aliases + + spriteOffset + {0,1} + spriteSize + {46,42} + spriteSourceSize + {64,64} + textureRect + {{457,897},{46,42}} + textureRotated + + + 7442.png + + aliases + + spriteOffset + {0,0} + spriteSize + {50,52} + spriteSourceSize + {64,64} + textureRect + {{1,1133},{50,52}} + textureRotated + + + 7443.png + + aliases + + spriteOffset + {0,0} + spriteSize + {64,64} + spriteSourceSize + {64,64} + textureRect + {{71,1065},{64,64}} + textureRotated + + + 7444.png + + aliases + + spriteOffset + {1,0} + spriteSize + {60,62} + spriteSourceSize + {64,64} + textureRect + {{207,1109},{60,62}} + textureRotated + + + 7445.png + + aliases + + spriteOffset + {0,0} + spriteSize + {62,64} + spriteSourceSize + {64,64} + textureRect + {{431,1053},{62,64}} + textureRotated + + + 7446.png + + aliases + + spriteOffset + {-1,0} + spriteSize + {54,56} + spriteSourceSize + {64,64} + textureRect + {{67,1131},{54,56}} + textureRotated + + + 7447.png + + aliases + + spriteOffset + {0,0} + spriteSize + {64,64} + spriteSourceSize + {64,64} + textureRect + {{1,1067},{64,64}} + textureRotated + + metadata @@ -1216,9 +1501,9 @@ realTextureFileName equips2.png size - {512,1064} + {506,1188} smartupdate - $TexturePacker:SmartUpdate:f58323a886e6d0dddcc96e9ea8780f76:ed37379302a75c0c40a37b476368c418:cfe368b3d30388aaa97a224e353de6e0$ + $TexturePacker:SmartUpdate:efb8d029753f67af514ac6eabfd549dd:1b6301aa9c953e392c07dc07cad72799:cfe368b3d30388aaa97a224e353de6e0$ textureFileName equips2.png diff --git a/assets/resources/game/heros/equips2.plist.meta b/assets/resources/game/heros/equips2.plist.meta index 7dd9cb91..3f8b655e 100644 --- a/assets/resources/game/heros/equips2.plist.meta +++ b/assets/resources/game/heros/equips2.plist.meta @@ -65,8 +65,8 @@ "rotated": false, "offsetX": -1, "offsetY": 0, - "trimX": 169, - "trimY": 505, + "trimX": 85, + "trimY": 429, "width": 80, "height": 80, "rawWidth": 90, @@ -108,11 +108,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 1, - "trimX": 439, - "trimY": 837, + "trimX": 1, + "trimY": 993, "width": 68, "height": 72, "rawWidth": 90, @@ -145,6 +145,52 @@ ], "subMetas": {} }, + "31165": { + "importer": "sprite-frame", + "uuid": "c8772092-7edb-4fb4-8cfc-ac0860cab175@31165", + "displayName": "", + "id": "31165", + "name": "7444", + "userData": { + "trimType": "auto", + "trimThreshold": 1, + "rotated": true, + "offsetX": 1, + "offsetY": 0, + "trimX": 207, + "trimY": 1109, + "width": 60, + "height": 62, + "rawWidth": 64, + "rawHeight": 64, + "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": "15588387-53dc-4224-bf79-8427e1cc1e9a@6c48a", + "atlasUuid": "c8772092-7edb-4fb4-8cfc-ac0860cab175" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + }, "37122": { "importer": "sprite-frame", "uuid": "c8772092-7edb-4fb4-8cfc-ac0860cab175@37122", @@ -237,6 +283,98 @@ ], "subMetas": {} }, + "46378": { + "importer": "sprite-frame", + "uuid": "c8772092-7edb-4fb4-8cfc-ac0860cab175@46378", + "displayName": "", + "id": "46378", + "name": "7443", + "userData": { + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 71, + "trimY": 1065, + "width": 64, + "height": 64, + "rawWidth": 64, + "rawHeight": 64, + "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": "15588387-53dc-4224-bf79-8427e1cc1e9a@6c48a", + "atlasUuid": "c8772092-7edb-4fb4-8cfc-ac0860cab175" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + }, + "52189": { + "importer": "sprite-frame", + "uuid": "c8772092-7edb-4fb4-8cfc-ac0860cab175@52189", + "displayName": "", + "id": "52189", + "name": "7422", + "userData": { + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": -2, + "trimX": 345, + "trimY": 1109, + "width": 60, + "height": 60, + "rawWidth": 64, + "rawHeight": 64, + "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": "15588387-53dc-4224-bf79-8427e1cc1e9a@6c48a", + "atlasUuid": "c8772092-7edb-4fb4-8cfc-ac0860cab175" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + }, "79483": { "importer": "sprite-frame", "uuid": "c8772092-7edb-4fb4-8cfc-ac0860cab175@79483", @@ -249,8 +387,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 143, - "trimY": 765, + "trimX": 309, + "trimY": 743, "width": 68, "height": 86, "rawWidth": 90, @@ -295,8 +433,8 @@ "rotated": true, "offsetX": 0, "offsetY": 1, - "trimX": 321, - "trimY": 675, + "trimX": 75, + "trimY": 755, "width": 76, "height": 78, "rawWidth": 90, @@ -329,6 +467,52 @@ ], "subMetas": {} }, + "81445": { + "importer": "sprite-frame", + "uuid": "c8772092-7edb-4fb4-8cfc-ac0860cab175@81445", + "displayName": "", + "id": "81445", + "name": "7406", + "userData": { + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": -1, + "trimX": 137, + "trimY": 1125, + "width": 60, + "height": 60, + "rawWidth": 64, + "rawHeight": 64, + "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": "15588387-53dc-4224-bf79-8427e1cc1e9a@6c48a", + "atlasUuid": "c8772092-7edb-4fb4-8cfc-ac0860cab175" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + }, "85413": { "importer": "sprite-frame", "uuid": "c8772092-7edb-4fb4-8cfc-ac0860cab175@85413", @@ -341,8 +525,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 415, - "trimY": 457, + "trimX": 1, + "trimY": 579, "width": 80, "height": 78, "rawWidth": 90, @@ -375,6 +559,52 @@ ], "subMetas": {} }, + "91329": { + "importer": "sprite-frame", + "uuid": "c8772092-7edb-4fb4-8cfc-ac0860cab175@91329", + "displayName": "", + "id": "91329", + "name": "7447", + "userData": { + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 1, + "trimY": 1067, + "width": 64, + "height": 64, + "rawWidth": 64, + "rawHeight": 64, + "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": "15588387-53dc-4224-bf79-8427e1cc1e9a@6c48a", + "atlasUuid": "c8772092-7edb-4fb4-8cfc-ac0860cab175" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + }, "91361": { "importer": "sprite-frame", "uuid": "c8772092-7edb-4fb4-8cfc-ac0860cab175@91361", @@ -467,6 +697,52 @@ ], "subMetas": {} }, + "98572": { + "importer": "sprite-frame", + "uuid": "c8772092-7edb-4fb4-8cfc-ac0860cab175@98572", + "displayName": "", + "id": "98572", + "name": "7425", + "userData": { + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": -1, + "offsetY": 0, + "trimX": 271, + "trimY": 1115, + "width": 60, + "height": 60, + "rawWidth": 64, + "rawHeight": 64, + "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": "15588387-53dc-4224-bf79-8427e1cc1e9a@6c48a", + "atlasUuid": "c8772092-7edb-4fb4-8cfc-ac0860cab175" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + }, "c99eb": { "importer": "sprite-frame", "uuid": "c8772092-7edb-4fb4-8cfc-ac0860cab175@c99eb", @@ -476,11 +752,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 213, - "trimY": 899, + "trimX": 379, + "trimY": 823, "width": 74, "height": 76, "rawWidth": 90, @@ -571,8 +847,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 75, - "trimY": 665, + "trimX": 241, + "trimY": 585, "width": 78, "height": 78, "rawWidth": 90, @@ -617,8 +893,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 409, - "trimY": 537, + "trimX": 159, + "trimY": 595, "width": 78, "height": 78, "rawWidth": 90, @@ -709,8 +985,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 407, - "trimY": 617, + "trimX": 77, + "trimY": 677, "width": 78, "height": 76, "rawWidth": 90, @@ -755,8 +1031,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 327, - "trimY": 595, + "trimX": 409, + "trimY": 517, "width": 78, "height": 78, "rawWidth": 90, @@ -936,11 +1212,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 281, - "trimY": 977, + "trimX": 377, + "trimY": 899, "width": 74, "height": 76, "rawWidth": 90, @@ -1077,8 +1353,8 @@ "rotated": false, "offsetX": -1, "offsetY": 0, - "trimX": 313, - "trimY": 753, + "trimX": 229, + "trimY": 755, "width": 76, "height": 76, "rawWidth": 90, @@ -1120,11 +1396,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 357, - "trimY": 977, + "trimX": 151, + "trimY": 849, "width": 74, "height": 72, "rawWidth": 90, @@ -1215,8 +1491,8 @@ "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 435, - "trimY": 213, + "trimX": 429, + "trimY": 355, "width": 86, "height": 76, "rawWidth": 90, @@ -1261,8 +1537,8 @@ "rotated": true, "offsetX": -1, "offsetY": 0, - "trimX": 343, - "trimY": 339, + "trimX": 431, + "trimY": 265, "width": 88, "height": 74, "rawWidth": 90, @@ -1304,11 +1580,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1, - "trimY": 669, + "trimX": 321, + "trimY": 599, "width": 86, "height": 70, "rawWidth": 90, @@ -1353,8 +1629,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1, - "trimY": 417, + "trimX": 343, + "trimY": 339, "width": 84, "height": 78, "rawWidth": 90, @@ -1491,8 +1767,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 401, - "trimY": 695, + "trimX": 309, + "trimY": 671, "width": 84, "height": 70, "rawWidth": 90, @@ -1537,8 +1813,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 225, - "trimY": 753, + "trimX": 395, + "trimY": 677, "width": 86, "height": 68, "rawWidth": 90, @@ -1629,8 +1905,8 @@ "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 73, - "trimY": 745, + "trimX": 159, + "trimY": 675, "width": 88, "height": 68, "rawWidth": 90, @@ -1675,8 +1951,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 171, - "trimY": 423, + "trimX": 259, + "trimY": 421, "width": 80, "height": 80, "rawWidth": 90, @@ -1764,11 +2040,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": -1, "offsetY": 0, - "trimX": 447, - "trimY": 73, + "trimX": 141, + "trimY": 993, "width": 68, "height": 64, "rawWidth": 90, @@ -1810,11 +2086,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 73, - "trimY": 997, + "trimX": 211, + "trimY": 1043, "width": 66, "height": 64, "rawWidth": 90, @@ -1856,11 +2132,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1, - "trimY": 927, + "trimX": 227, + "trimY": 833, "width": 70, "height": 78, "rawWidth": 90, @@ -1905,8 +2181,8 @@ "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 205, - "trimY": 995, + "trimX": 143, + "trimY": 923, "width": 68, "height": 74, "rawWidth": 90, @@ -1951,8 +2227,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 73, - "trimY": 919, + "trimX": 1, + "trimY": 915, "width": 68, "height": 76, "rawWidth": 90, @@ -1994,11 +2270,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 365, - "trimY": 831, + "trimX": 301, + "trimY": 915, "width": 70, "height": 72, "rawWidth": 90, @@ -2040,11 +2316,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 437, - "trimY": 767, + "trimX": 71, + "trimY": 989, "width": 68, "height": 74, "rawWidth": 90, @@ -2086,11 +2362,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 447, - "trimY": 1, + "trimX": 219, + "trimY": 977, "width": 64, "height": 70, "rawWidth": 90, @@ -2135,8 +2411,8 @@ "rotated": true, "offsetX": 0, "offsetY": 1, - "trimX": 431, - "trimY": 977, + "trimX": 375, + "trimY": 975, "width": 70, "height": 72, "rawWidth": 90, @@ -2181,8 +2457,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 139, - "trimY": 997, + "trimX": 141, + "trimY": 1059, "width": 64, "height": 64, "rawWidth": 90, @@ -2224,11 +2500,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 447, - "trimY": 143, + "trimX": 291, + "trimY": 987, "width": 68, "height": 64, "rawWidth": 90, @@ -2273,8 +2549,8 @@ "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 143, - "trimY": 853, + "trimX": 73, + "trimY": 909, "width": 78, "height": 68, "rawWidth": 90, @@ -2316,11 +2592,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": -1, "offsetY": 0, - "trimX": 291, - "trimY": 831, + "trimX": 279, + "trimY": 1053, "width": 64, "height": 60, "rawWidth": 90, @@ -2365,8 +2641,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 143, - "trimY": 933, + "trimX": 361, + "trimY": 1047, "width": 68, "height": 60, "rawWidth": 90, @@ -2411,7 +2687,7 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 365, + "trimX": 227, "trimY": 905, "width": 72, "height": 70, @@ -2503,8 +2779,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 87, - "trimY": 429, + "trimX": 171, + "trimY": 423, "width": 80, "height": 80, "rawWidth": 90, @@ -2549,8 +2825,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 241, - "trimY": 599, + "trimX": 409, + "trimY": 597, "width": 78, "height": 78, "rawWidth": 90, @@ -2595,8 +2871,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1, - "trimY": 497, + "trimX": 253, + "trimY": 503, "width": 80, "height": 80, "rawWidth": 90, @@ -2733,8 +3009,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 213, - "trimY": 823, + "trimX": 73, + "trimY": 833, "width": 76, "height": 74, "rawWidth": 90, @@ -2871,8 +3147,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 333, - "trimY": 429, + "trimX": 85, + "trimY": 511, "width": 80, "height": 78, "rawWidth": 90, @@ -3006,11 +3282,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 431, - "trimY": 301, + "trimX": 1, + "trimY": 417, "width": 80, "height": 82, "rawWidth": 90, @@ -3056,7 +3332,7 @@ "offsetX": 0, "offsetY": 0, "trimX": 1, - "trimY": 757, + "trimY": 829, "width": 70, "height": 84, "rawWidth": 90, @@ -3101,8 +3377,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 333, - "trimY": 509, + "trimX": 83, + "trimY": 591, "width": 74, "height": 84, "rawWidth": 90, @@ -3144,11 +3420,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 225, - "trimY": 679, + "trimX": 1, + "trimY": 745, "width": 72, "height": 82, "rawWidth": 90, @@ -3190,11 +3466,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 419, - "trimY": 385, + "trimX": 435, + "trimY": 173, "width": 70, "height": 90, "rawWidth": 90, @@ -3239,8 +3515,8 @@ "rotated": false, "offsetX": -2, "offsetY": 0, - "trimX": 155, - "trimY": 675, + "trimX": 239, + "trimY": 665, "width": 68, "height": 88, "rawWidth": 90, @@ -3285,8 +3561,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 73, - "trimY": 835, + "trimX": 307, + "trimY": 831, "width": 68, "height": 82, "rawWidth": 90, @@ -3331,8 +3607,8 @@ "rotated": false, "offsetX": -1, "offsetY": 0, - "trimX": 1, - "trimY": 579, + "trimX": 167, + "trimY": 505, "width": 72, "height": 88, "rawWidth": 90, @@ -3377,8 +3653,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1, - "trimY": 843, + "trimX": 155, + "trimY": 765, "width": 70, "height": 82, "rawWidth": 90, @@ -3423,8 +3699,8 @@ "rotated": false, "offsetX": -1, "offsetY": 0, - "trimX": 259, - "trimY": 421, + "trimX": 343, + "trimY": 419, "width": 72, "height": 90, "rawWidth": 90, @@ -3466,11 +3742,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 167, - "trimY": 587, + "trimX": 417, + "trimY": 443, "width": 72, "height": 86, "rawWidth": 90, @@ -3512,11 +3788,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 75, - "trimY": 591, + "trimX": 335, + "trimY": 511, "width": 72, "height": 86, "rawWidth": 90, @@ -3561,8 +3837,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 251, - "trimY": 513, + "trimX": 1, + "trimY": 659, "width": 74, "height": 84, "rawWidth": 90, @@ -3607,8 +3883,8 @@ "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 83, - "trimY": 511, + "trimX": 1, + "trimY": 499, "width": 78, "height": 82, "rawWidth": 90, @@ -3650,11 +3926,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 289, - "trimY": 899, + "trimX": 379, + "trimY": 747, "width": 76, "height": 74, "rawWidth": 90, @@ -3686,6 +3962,604 @@ ".json" ], "subMetas": {} + }, + "947a2": { + "importer": "sprite-frame", + "uuid": "c8772092-7edb-4fb4-8cfc-ac0860cab175@947a2", + "displayName": "", + "id": "947a2", + "name": "7401", + "userData": { + "trimType": "auto", + "trimThreshold": 1, + "rotated": true, + "offsetX": 0, + "offsetY": -1, + "trimX": 457, + "trimY": 845, + "width": 50, + "height": 42, + "rawWidth": 64, + "rawHeight": 64, + "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": "15588387-53dc-4224-bf79-8427e1cc1e9a@6c48a", + "atlasUuid": "c8772092-7edb-4fb4-8cfc-ac0860cab175" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + }, + "b0c6a": { + "importer": "sprite-frame", + "uuid": "c8772092-7edb-4fb4-8cfc-ac0860cab175@b0c6a", + "displayName": "", + "id": "b0c6a", + "name": "7402", + "userData": { + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": -1, + "offsetY": 0, + "trimX": 455, + "trimY": 941, + "width": 50, + "height": 54, + "rawWidth": 64, + "rawHeight": 64, + "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": "15588387-53dc-4224-bf79-8427e1cc1e9a@6c48a", + "atlasUuid": "c8772092-7edb-4fb4-8cfc-ac0860cab175" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + }, + "878b8": { + "importer": "sprite-frame", + "uuid": "c8772092-7edb-4fb4-8cfc-ac0860cab175@878b8", + "displayName": "", + "id": "878b8", + "name": "7403", + "userData": { + "trimType": "auto", + "trimThreshold": 1, + "rotated": true, + "offsetX": -1, + "offsetY": 0, + "trimX": 457, + "trimY": 799, + "width": 44, + "height": 48, + "rawWidth": 64, + "rawHeight": 64, + "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": "15588387-53dc-4224-bf79-8427e1cc1e9a@6c48a", + "atlasUuid": "c8772092-7edb-4fb4-8cfc-ac0860cab175" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + }, + "d42b9": { + "importer": "sprite-frame", + "uuid": "c8772092-7edb-4fb4-8cfc-ac0860cab175@d42b9", + "displayName": "", + "id": "d42b9", + "name": "7404", + "userData": { + "trimType": "auto", + "trimThreshold": 1, + "rotated": true, + "offsetX": 1, + "offsetY": 0, + "trimX": 447, + "trimY": 117, + "width": 54, + "height": 58, + "rawWidth": 64, + "rawHeight": 64, + "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": "15588387-53dc-4224-bf79-8427e1cc1e9a@6c48a", + "atlasUuid": "c8772092-7edb-4fb4-8cfc-ac0860cab175" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + }, + "4bd0f": { + "importer": "sprite-frame", + "uuid": "c8772092-7edb-4fb4-8cfc-ac0860cab175@4bd0f", + "displayName": "", + "id": "4bd0f", + "name": "7405", + "userData": { + "trimType": "auto", + "trimThreshold": 1, + "rotated": true, + "offsetX": 1, + "offsetY": -1, + "trimX": 457, + "trimY": 747, + "width": 50, + "height": 48, + "rawWidth": 64, + "rawHeight": 64, + "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": "15588387-53dc-4224-bf79-8427e1cc1e9a@6c48a", + "atlasUuid": "c8772092-7edb-4fb4-8cfc-ac0860cab175" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + }, + "ba3f0": { + "importer": "sprite-frame", + "uuid": "c8772092-7edb-4fb4-8cfc-ac0860cab175@ba3f0", + "displayName": "", + "id": "ba3f0", + "name": "7421", + "userData": { + "trimType": "auto", + "trimThreshold": 1, + "rotated": true, + "offsetX": 1, + "offsetY": 0, + "trimX": 449, + "trimY": 997, + "width": 54, + "height": 56, + "rawWidth": 64, + "rawHeight": 64, + "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": "15588387-53dc-4224-bf79-8427e1cc1e9a@6c48a", + "atlasUuid": "c8772092-7edb-4fb4-8cfc-ac0860cab175" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + }, + "8f56e": { + "importer": "sprite-frame", + "uuid": "c8772092-7edb-4fb4-8cfc-ac0860cab175@8f56e", + "displayName": "", + "id": "8f56e", + "name": "7423", + "userData": { + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": -1, + "offsetY": -1, + "trimX": 447, + "trimY": 1, + "width": 58, + "height": 56, + "rawWidth": 64, + "rawHeight": 64, + "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": "15588387-53dc-4224-bf79-8427e1cc1e9a@6c48a", + "atlasUuid": "c8772092-7edb-4fb4-8cfc-ac0860cab175" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + }, + "4927b": { + "importer": "sprite-frame", + "uuid": "c8772092-7edb-4fb4-8cfc-ac0860cab175@4927b", + "displayName": "", + "id": "4927b", + "name": "7424", + "userData": { + "trimType": "auto", + "trimThreshold": 1, + "rotated": true, + "offsetX": -1, + "offsetY": 0, + "trimX": 447, + "trimY": 59, + "width": 56, + "height": 58, + "rawWidth": 64, + "rawHeight": 64, + "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": "15588387-53dc-4224-bf79-8427e1cc1e9a@6c48a", + "atlasUuid": "c8772092-7edb-4fb4-8cfc-ac0860cab175" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + }, + "da0c8": { + "importer": "sprite-frame", + "uuid": "c8772092-7edb-4fb4-8cfc-ac0860cab175@da0c8", + "displayName": "", + "id": "da0c8", + "name": "7426", + "userData": { + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 407, + "trimY": 1117, + "width": 60, + "height": 60, + "rawWidth": 64, + "rawHeight": 64, + "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": "15588387-53dc-4224-bf79-8427e1cc1e9a@6c48a", + "atlasUuid": "c8772092-7edb-4fb4-8cfc-ac0860cab175" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + }, + "e5450": { + "importer": "sprite-frame", + "uuid": "c8772092-7edb-4fb4-8cfc-ac0860cab175@e5450", + "displayName": "", + "id": "e5450", + "name": "7441", + "userData": { + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 1, + "trimX": 457, + "trimY": 897, + "width": 46, + "height": 42, + "rawWidth": 64, + "rawHeight": 64, + "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": "15588387-53dc-4224-bf79-8427e1cc1e9a@6c48a", + "atlasUuid": "c8772092-7edb-4fb4-8cfc-ac0860cab175" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + }, + "eb680": { + "importer": "sprite-frame", + "uuid": "c8772092-7edb-4fb4-8cfc-ac0860cab175@eb680", + "displayName": "", + "id": "eb680", + "name": "7442", + "userData": { + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 1, + "trimY": 1133, + "width": 50, + "height": 52, + "rawWidth": 64, + "rawHeight": 64, + "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": "15588387-53dc-4224-bf79-8427e1cc1e9a@6c48a", + "atlasUuid": "c8772092-7edb-4fb4-8cfc-ac0860cab175" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + }, + "e300e": { + "importer": "sprite-frame", + "uuid": "c8772092-7edb-4fb4-8cfc-ac0860cab175@e300e", + "displayName": "", + "id": "e300e", + "name": "7445", + "userData": { + "trimType": "auto", + "trimThreshold": 1, + "rotated": true, + "offsetX": 0, + "offsetY": 0, + "trimX": 431, + "trimY": 1053, + "width": 62, + "height": 64, + "rawWidth": 64, + "rawHeight": 64, + "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": "15588387-53dc-4224-bf79-8427e1cc1e9a@6c48a", + "atlasUuid": "c8772092-7edb-4fb4-8cfc-ac0860cab175" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + }, + "17c0e": { + "importer": "sprite-frame", + "uuid": "c8772092-7edb-4fb4-8cfc-ac0860cab175@17c0e", + "displayName": "", + "id": "17c0e", + "name": "7446", + "userData": { + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": -1, + "offsetY": 0, + "trimX": 67, + "trimY": 1131, + "width": 54, + "height": 56, + "rawWidth": 64, + "rawHeight": 64, + "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": "15588387-53dc-4224-bf79-8427e1cc1e9a@6c48a", + "atlasUuid": "c8772092-7edb-4fb4-8cfc-ac0860cab175" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} } }, "userData": { diff --git a/assets/resources/game/heros/equips2.png b/assets/resources/game/heros/equips2.png index 73f13d08..eda2a6b0 100644 Binary files a/assets/resources/game/heros/equips2.png and b/assets/resources/game/heros/equips2.png differ diff --git a/assets/script/game/common/config/Equips.ts b/assets/script/game/common/config/Equips.ts index f7760675..4007e478 100644 --- a/assets/script/game/common/config/Equips.ts +++ b/assets/script/game/common/config/Equips.ts @@ -26,18 +26,20 @@ export enum SkillTarget { } //特殊属性 export enum EquipSpecialAttr { - ICE=1, //普通技能变冰系冰冻 - FIRE=2, //普通技能变火焰易伤 - WIND=3, //普通技能变飓风带击退 + ICE=1, //冰系加成 + FIRE=2, //火焰加成 + WIND=3, //飓风加成 FRIEND_LIVE_CD=4, //伙伴复活时间减少 - ATK_ADD_FRIEND_ATK=5, //伙伴攻击力增加 - ATK_ADD_FRIEND_HP=6, //伙伴生命值增加 - ATK_ADD_GLOD=7, //金币增加 - ATK_ADD_MASTER_ATK=8, //主将攻击力增加 - ATK_ADD_MASTER_HP=9, //主将生命值增加 - DOUBLE_DEAD=10, //双倍死亡触发 - DOUBLE_ATKED=11, //双倍受击触发 + ATK_ADD_FRIEND_ATK=5, //攻击n次后增加伙伴攻击力 + ATK_ADD_FRIEND_HP=6, //攻击n次后增加伙伴生命值 + ATK_ADD_GLOD=7, //攻击n次后增加金币 + ATK_ADD_MASTER_ATK=8, //攻击n次后增加主将攻击力 + ATK_ADD_MASTER_HP=9, //攻击n次后增加主将生命值 + DOUBLE_DEAD=10, //额外死亡触发次数 + DOUBLE_ATKED=11, //额外受击触发次数 FRIEND_ATKED_ADD_SKILL_STONE=12, //伙伴被攻击增加技能石 + ATK_ADD_VALUE=13, //攻击n次后触发属性增加的值 额外增加值 + FRIEND_GET_MASTER_EQUIP=14, //伙伴获得主将装备属性加成 } export enum Quality { WHITE = 1, @@ -76,6 +78,20 @@ export const axeWeapons = [ 3501, 3502, 3503, // 绿、蓝、紫 ]; +// 锤类武器UUID列表 - 根据wp.md配置 +export const hammerWeapons = [ + // 等级1 + 1101, 1102, 1103, // 绿、蓝、紫 + // 等级2 + 1201, 1202, 1203, // 绿、蓝、紫 + // 等级3 + 1301, 1302, 1303, // 绿、蓝、紫 + // 等级4 + 1401, 1402, 1403, // 绿、蓝、紫 + // 等级5 + 1501, 1502, 1503, // 绿、蓝、紫 +]; + // 盾牌装备UUID列表 - 根据wp.md配置 export const shieldArmors = [ // 闪避型盾牌 @@ -103,10 +119,57 @@ export const shieldArmors = [ 4123, 4223, 4323, 4423, 4523, ]; -export const weapons = [...swordWeapons, ...axeWeapons]; -export const armors = [...shieldArmors, 2001, 2002, 2003]; -export const accessorys = [2001, 2002, 2003]; -export const equip_list = [...swordWeapons, ...axeWeapons, ...shieldArmors, 2001, 2002, 2003, ...accessorys]; +// 饰品装备UUID列表 - 根据wp.md配置 +export const accessoryItems = [ + // 绿色品质饰品 (等级4-5) + // 磐石戒指 + 7401, 7501, + // 刚玉戒指 + 7402, 7502, + // 烈阳戒指 + 7403, 7503, + // 雷暴耳饰 + 7404, 7504, + // 迷雾耳饰 + 7405, 7505, + // 荆棘耳饰 + 7406, 7506, + + // 蓝色品质饰品 (等级4-5) + // 星辉耳饰 + 7421, 7521, + // 霜晶耳饰 + 7422, 7522, + // 流光吊坠 + 7423, 7523, + // 地脉指环 + 7424, 7524, + // 炎阳戒指 + 7425, 7525, + // 潮汐戒指 + 7426, 7526, + + // 紫色品质饰品 (等级4-5) + // 天穹戒指 + 7441, 7541, + // 神木戒指 + 7442, 7542, + // 日曜戒指 + 7443, 7543, + // 月影项链 + 7444, 7544, + // 星尘项链 + 7445, 7545, + // 深渊戒指 + 7446, 7546, + // 永夜戒指 + 7447, 7547, +]; + +export const weapons = [...swordWeapons, ...axeWeapons, ...hammerWeapons]; +export const armors = [...shieldArmors]; +export const accessorys = [...accessoryItems]; +export const equip_list = [...swordWeapons, ...axeWeapons, ...hammerWeapons, ...shieldArmors, ...accessoryItems]; @@ -475,7 +538,6 @@ export const EquipInfo: { [key: number]: EquipData } = { { type: BuffAttr.ATK, value: 100, target: EquipAttrTarget.HERO }, { type: BuffAttr.ATK_CD, value: 0, target: EquipAttrTarget.HERO }, // CD修正0% { type: BuffAttr.WFUNY, value: 20, target: EquipAttrTarget.HERO }, // 风怒概率20% - { type: BuffAttr.KNOCKBACK, value: 15, target: EquipAttrTarget.HERO }, // 击退概率15% ], }, 3102: { @@ -525,7 +587,6 @@ export const EquipInfo: { [key: number]: EquipData } = { { type: BuffAttr.ATK, value: 130, target: EquipAttrTarget.HERO }, { type: BuffAttr.ATK_CD, value: 0, target: EquipAttrTarget.HERO }, // CD修正0% { type: BuffAttr.WFUNY, value: 25, target: EquipAttrTarget.HERO }, // 风怒概率25% - { type: BuffAttr.KNOCKBACK, value: 18, target: EquipAttrTarget.HERO }, // 击退概率18% ], }, 3202: { @@ -575,7 +636,6 @@ export const EquipInfo: { [key: number]: EquipData } = { { type: BuffAttr.ATK, value: 160, target: EquipAttrTarget.HERO }, { type: BuffAttr.ATK_CD, value: 0, target: EquipAttrTarget.HERO }, // CD修正0% { type: BuffAttr.WFUNY, value: 30, target: EquipAttrTarget.HERO }, // 风怒概率30% - { type: BuffAttr.KNOCKBACK, value: 21, target: EquipAttrTarget.HERO }, // 击退概率21% ], }, 3302: { @@ -625,7 +685,6 @@ export const EquipInfo: { [key: number]: EquipData } = { { type: BuffAttr.ATK, value: 190, target: EquipAttrTarget.HERO }, { type: BuffAttr.ATK_CD, value: 0, target: EquipAttrTarget.HERO }, // CD修正0% { type: BuffAttr.WFUNY, value: 35, target: EquipAttrTarget.HERO }, // 风怒概率35% - { type: BuffAttr.KNOCKBACK, value: 24, target: EquipAttrTarget.HERO }, // 击退概率24% ], }, 3402: { @@ -651,12 +710,12 @@ export const EquipInfo: { [key: number]: EquipData } = { quality: Quality.PURPLE, lv: 4, path: "3103", - info: "攻击力增加280%，风怒概率55%，击退概率34%", + info: "攻击力增加280%，风怒概率75%，击退概率34%", special_attr: [], buff: [ { type: BuffAttr.ATK, value: 280, target: EquipAttrTarget.HERO }, { type: BuffAttr.ATK_CD, value: 0, target: EquipAttrTarget.HERO }, // CD修正0% - { type: BuffAttr.WFUNY, value: 55, target: EquipAttrTarget.HERO }, // 风怒概率55% + { type: BuffAttr.WFUNY, value: 75, target: EquipAttrTarget.HERO }, // 风怒概率75% { type: BuffAttr.KNOCKBACK, value: 34, target: EquipAttrTarget.HERO }, // 击退概率34% ], }, @@ -675,7 +734,7 @@ export const EquipInfo: { [key: number]: EquipData } = { { type: BuffAttr.ATK, value: 220, target: EquipAttrTarget.HERO }, { type: BuffAttr.ATK_CD, value: 0, target: EquipAttrTarget.HERO }, // CD修正0% { type: BuffAttr.WFUNY, value: 40, target: EquipAttrTarget.HERO }, // 风怒概率40% - { type: BuffAttr.KNOCKBACK, value: 27, target: EquipAttrTarget.HERO }, // 击退概率27% + { type: BuffAttr.KNOCKBACK, value: 20, target: EquipAttrTarget.HERO }, // 击退概率20% ], }, 3502: { @@ -711,6 +770,248 @@ export const EquipInfo: { [key: number]: EquipData } = { ], }, + // === 锤类武器配置 === + + // 等级1 锤类武器 + 1101: { + uuid: 1101, + name: "碎骨战锤(Lv1)", + type: EquipType.WEAPON, + quality: Quality.GREEN, + lv: 1, + path: "5101", + info: "攻击力增加120%，暴击率10%，击晕概率15%", + special_attr: [], + buff: [ + { type: BuffAttr.ATK, value: 120, target: EquipAttrTarget.HERO }, + { type: BuffAttr.ATK_CD, value: 6.7, target: EquipAttrTarget.HERO }, // CD修正+6.7% + { type: BuffAttr.CRITICAL, value: 10, target: EquipAttrTarget.HERO }, // 暴击率10% + ], + }, + 1102: { + uuid: 1102, + name: "雷霆重锤(Lv1)", + type: EquipType.WEAPON, + quality: Quality.BLUE, + lv: 1, + path: "5102", + info: "攻击力增加150%，暴击率15%，击晕概率20%", + special_attr: [], + buff: [ + { type: BuffAttr.ATK, value: 150, target: EquipAttrTarget.HERO }, + { type: BuffAttr.ATK_CD, value: 6.7, target: EquipAttrTarget.HERO }, // CD修正+6.7% + { type: BuffAttr.CRITICAL, value: 15, target: EquipAttrTarget.HERO }, // 暴击率15% + ], + }, + 1103: { + uuid: 1103, + name: "泰坦粉碎者(Lv1)", + type: EquipType.WEAPON, + quality: Quality.PURPLE, + lv: 1, + path: "5103", + info: "攻击力增加180%，暴击率20%，击晕概率25%，暴击伤害+50%", + special_attr: [], + buff: [ + { type: BuffAttr.ATK, value: 180, target: EquipAttrTarget.HERO }, + { type: BuffAttr.ATK_CD, value: 6.7, target: EquipAttrTarget.HERO }, // CD修正+6.7% + { type: BuffAttr.CRITICAL, value: 20, target: EquipAttrTarget.HERO }, // 暴击率20% + { type: BuffAttr.CRITICAL_DMG, value: 50, target: EquipAttrTarget.HERO }, // 暴击伤害+50% + ], + }, + + // 等级2 锤类武器 + 1201: { + uuid: 1201, + name: "碎骨战锤(Lv2)", + type: EquipType.WEAPON, + quality: Quality.GREEN, + lv: 2, + path: "5101", + info: "攻击力增加150%，暴击率12%，击晕概率18%", + special_attr: [], + buff: [ + { type: BuffAttr.ATK, value: 150, target: EquipAttrTarget.HERO }, + { type: BuffAttr.ATK_CD, value: 6.7, target: EquipAttrTarget.HERO }, // CD修正+6.7% + { type: BuffAttr.CRITICAL, value: 12, target: EquipAttrTarget.HERO }, // 暴击率12% + ], + }, + 1202: { + uuid: 1202, + name: "雷霆重锤(Lv2)", + type: EquipType.WEAPON, + quality: Quality.BLUE, + lv: 2, + path: "5102", + info: "攻击力增加190%，暴击率18%，击晕概率23%", + special_attr: [], + buff: [ + { type: BuffAttr.ATK, value: 190, target: EquipAttrTarget.HERO }, + { type: BuffAttr.ATK_CD, value: 6.7, target: EquipAttrTarget.HERO }, // CD修正+6.7% + { type: BuffAttr.CRITICAL, value: 18, target: EquipAttrTarget.HERO }, // 暴击率18% + ], + }, + 1203: { + uuid: 1203, + name: "泰坦粉碎者(Lv2)", + type: EquipType.WEAPON, + quality: Quality.PURPLE, + lv: 2, + path: "5103", + info: "攻击力增加220%，暴击率23%，击晕概率28%，暴击伤害+55%", + special_attr: [], + buff: [ + { type: BuffAttr.ATK, value: 220, target: EquipAttrTarget.HERO }, + { type: BuffAttr.ATK_CD, value: 6.7, target: EquipAttrTarget.HERO }, // CD修正+6.7% + { type: BuffAttr.CRITICAL, value: 23, target: EquipAttrTarget.HERO }, // 暴击率23% + { type: BuffAttr.CRITICAL_DMG, value: 55, target: EquipAttrTarget.HERO }, // 暴击伤害+55% + ], + }, + + // 等级3 锤类武器 + 1301: { + uuid: 1301, + name: "碎骨战锤(Lv3)", + type: EquipType.WEAPON, + quality: Quality.GREEN, + lv: 3, + path: "5101", + info: "攻击力增加180%，暴击率14%，击晕概率21%", + special_attr: [], + buff: [ + { type: BuffAttr.ATK, value: 180, target: EquipAttrTarget.HERO }, + { type: BuffAttr.ATK_CD, value: 6.7, target: EquipAttrTarget.HERO }, // CD修正+6.7% + { type: BuffAttr.CRITICAL, value: 14, target: EquipAttrTarget.HERO }, // 暴击率14% + ], + }, + 1302: { + uuid: 1302, + name: "雷霆重锤(Lv3)", + type: EquipType.WEAPON, + quality: Quality.BLUE, + lv: 3, + path: "5102", + info: "攻击力增加230%，暴击率21%，击晕概率26%", + special_attr: [], + buff: [ + { type: BuffAttr.ATK, value: 230, target: EquipAttrTarget.HERO }, + { type: BuffAttr.ATK_CD, value: 6.7, target: EquipAttrTarget.HERO }, // CD修正+6.7% + { type: BuffAttr.CRITICAL, value: 21, target: EquipAttrTarget.HERO }, // 暴击率21% + ], + }, + 1303: { + uuid: 1303, + name: "泰坦粉碎者(Lv3)", + type: EquipType.WEAPON, + quality: Quality.PURPLE, + lv: 3, + path: "5103", + info: "攻击力增加260%，暴击率26%，击晕概率31%，暴击伤害+60%", + special_attr: [], + buff: [ + { type: BuffAttr.ATK, value: 260, target: EquipAttrTarget.HERO }, + { type: BuffAttr.ATK_CD, value: 6.7, target: EquipAttrTarget.HERO }, // CD修正+6.7% + { type: BuffAttr.CRITICAL, value: 26, target: EquipAttrTarget.HERO }, // 暴击率26% + { type: BuffAttr.CRITICAL_DMG, value: 60, target: EquipAttrTarget.HERO }, // 暴击伤害+60% + ], + }, + + // 等级4 锤类武器 + 1401: { + uuid: 1401, + name: "碎骨战锤(Lv4)", + type: EquipType.WEAPON, + quality: Quality.GREEN, + lv: 4, + path: "5101", + info: "攻击力增加210%，暴击率16%，击晕概率24%", + special_attr: [], + buff: [ + { type: BuffAttr.ATK, value: 210, target: EquipAttrTarget.HERO }, + { type: BuffAttr.ATK_CD, value: 6.7, target: EquipAttrTarget.HERO }, // CD修正+6.7% + { type: BuffAttr.CRITICAL, value: 16, target: EquipAttrTarget.HERO }, // 暴击率16% + ], + }, + 1402: { + uuid: 1402, + name: "雷霆重锤(Lv4)", + type: EquipType.WEAPON, + quality: Quality.BLUE, + lv: 4, + path: "5102", + info: "攻击力增加270%，暴击率24%，击晕概率29%", + special_attr: [], + buff: [ + { type: BuffAttr.ATK, value: 270, target: EquipAttrTarget.HERO }, + { type: BuffAttr.ATK_CD, value: 6.7, target: EquipAttrTarget.HERO }, // CD修正+6.7% + { type: BuffAttr.CRITICAL, value: 24, target: EquipAttrTarget.HERO }, // 暴击率24% + ], + }, + 1403: { + uuid: 1403, + name: "泰坦粉碎者(Lv4)", + type: EquipType.WEAPON, + quality: Quality.PURPLE, + lv: 4, + path: "5103", + info: "攻击力增加300%，暴击率29%，击晕概率34%，暴击伤害+65%", + special_attr: [], + buff: [ + { type: BuffAttr.ATK, value: 300, target: EquipAttrTarget.HERO }, + { type: BuffAttr.ATK_CD, value: 6.7, target: EquipAttrTarget.HERO }, // CD修正+6.7% + { type: BuffAttr.CRITICAL, value: 29, target: EquipAttrTarget.HERO }, // 暴击率29% + { type: BuffAttr.CRITICAL_DMG, value: 65, target: EquipAttrTarget.HERO }, // 暴击伤害+65% + ], + }, + + // 等级5 锤类武器 + 1501: { + uuid: 1501, + name: "碎骨战锤(Lv5)", + type: EquipType.WEAPON, + quality: Quality.GREEN, + lv: 5, + path: "5101", + info: "攻击力增加240%，暴击率18%，击晕概率27%", + special_attr: [], + buff: [ + { type: BuffAttr.ATK, value: 240, target: EquipAttrTarget.HERO }, + { type: BuffAttr.ATK_CD, value: 6.7, target: EquipAttrTarget.HERO }, // CD修正+6.7% + { type: BuffAttr.CRITICAL, value: 18, target: EquipAttrTarget.HERO }, // 暴击率18% + ], + }, + 1502: { + uuid: 1502, + name: "雷霆重锤(Lv5)", + type: EquipType.WEAPON, + quality: Quality.BLUE, + lv: 5, + path: "5102", + info: "攻击力增加310%，暴击率27%，击晕概率32%", + special_attr: [], + buff: [ + { type: BuffAttr.ATK, value: 310, target: EquipAttrTarget.HERO }, + { type: BuffAttr.ATK_CD, value: 6.7, target: EquipAttrTarget.HERO }, // CD修正+6.7% + { type: BuffAttr.CRITICAL, value: 27, target: EquipAttrTarget.HERO }, // 暴击率27% + ], + }, + 1503: { + uuid: 1503, + name: "泰坦粉碎者(Lv5)", + type: EquipType.WEAPON, + quality: Quality.PURPLE, + lv: 5, + path: "5103", + info: "攻击力增加360%，暴击率32%，击晕概率37%，暴击伤害+70%", + special_attr: [], + buff: [ + { type: BuffAttr.ATK, value: 360, target: EquipAttrTarget.HERO }, + { type: BuffAttr.ATK_CD, value: 6.7, target: EquipAttrTarget.HERO }, // CD修正+6.7% + { type: BuffAttr.CRITICAL, value: 32, target: EquipAttrTarget.HERO }, // 暴击率32% + { type: BuffAttr.CRITICAL_DMG, value: 70, target: EquipAttrTarget.HERO }, // 暴击伤害+70% + ], + }, + // === 盾牌装备配置 === // === 闪避型盾牌 === @@ -1441,60 +1742,603 @@ export const EquipInfo: { [key: number]: EquipData } = { ], }, - // 保留原有的装备配置 - 2001: {uuid: 2001, name: "新手剑", type: EquipType.WEAPON,quality: Quality.WHITE,info:"攻击力增加80%", - lv: 1, - path: "2001", + // === 饰品装备配置 === + + // === 绿色品质饰品 === + + // 磐石戒指 + 7401: { + uuid: 7401, + name: "磐石戒指(Lv4)", + type: EquipType.ACCESSORY, + quality: Quality.GREEN, + lv: 4, + path: "7401", + info: "生命值+56%", + special_attr: [], + buff: [ + { type: BuffAttr.HP, value: 56, target: EquipAttrTarget.HERO }, + ], + }, + 7501: { + uuid: 7501, + name: "磐石戒指(Lv5)", + type: EquipType.ACCESSORY, + quality: Quality.GREEN, + lv: 5, + path: "7401", + info: "生命值+64%", + special_attr: [], + buff: [ + { type: BuffAttr.HP, value: 64, target: EquipAttrTarget.HERO }, + ], + }, + + // 刚玉戒指 + 7402: { + uuid: 7402, + name: "刚玉戒指(Lv4)", + type: EquipType.ACCESSORY, + quality: Quality.GREEN, + lv: 4, + path: "7402", + info: "免伤+22%", + special_attr: [], + buff: [ + { type: BuffAttr.DEF, value: 22, target: EquipAttrTarget.HERO }, + ], + }, + 7502: { + uuid: 7502, + name: "刚玉戒指(Lv5)", + type: EquipType.ACCESSORY, + quality: Quality.GREEN, + lv: 5, + path: "7402", + info: "免伤+25%", + special_attr: [], + buff: [ + { type: BuffAttr.DEF, value: 25, target: EquipAttrTarget.HERO }, + ], + }, + + // 烈阳戒指 + 7403: { + uuid: 7403, + name: "烈阳戒指(Lv4)", + type: EquipType.ACCESSORY, + quality: Quality.GREEN, + lv: 4, + path: "7403", + info: "攻击+50%", + special_attr: [], + buff: [ + { type: BuffAttr.ATK, value: 50, target: EquipAttrTarget.HERO }, + ], + }, + 7503: { + uuid: 7503, + name: "烈阳戒指(Lv5)", + type: EquipType.ACCESSORY, + quality: Quality.GREEN, + lv: 5, + path: "7403", + info: "攻击+56%", + special_attr: [], + buff: [ + { type: BuffAttr.ATK, value: 56, target: EquipAttrTarget.HERO }, + ], + }, + + // 雷暴耳饰 + 7404: { + uuid: 7404, + name: "雷暴耳饰(Lv4)", + type: EquipType.ACCESSORY, + quality: Quality.GREEN, + lv: 4, + path: "7404", + info: "暴伤+35%", + special_attr: [], + buff: [ + { type: BuffAttr.CRITICAL_DMG, value: 35, target: EquipAttrTarget.HERO }, + ], + }, + 7504: { + uuid: 7504, + name: "雷暴耳饰(Lv5)", + type: EquipType.ACCESSORY, + quality: Quality.GREEN, + lv: 5, + path: "7404", + info: "暴伤+40%", + special_attr: [], + buff: [ + { type: BuffAttr.CRITICAL_DMG, value: 40, target: EquipAttrTarget.HERO }, + ], + }, + + // 迷雾耳饰 + 7405: { + uuid: 7405, + name: "迷雾耳饰(Lv4)", + type: EquipType.ACCESSORY, + quality: Quality.GREEN, + lv: 4, + path: "7405", + info: "闪避+12%", + special_attr: [], + buff: [ + { type: BuffAttr.DODGE, value: 12, target: EquipAttrTarget.HERO }, + ], + }, + 7505: { + uuid: 7505, + name: "迷雾耳饰(Lv5)", + type: EquipType.ACCESSORY, + quality: Quality.GREEN, + lv: 5, + path: "7405", + info: "闪避+14%", + special_attr: [], + buff: [ + { type: BuffAttr.DODGE, value: 14, target: EquipAttrTarget.HERO }, + ], + }, + + // 荆棘耳饰 + 7406: { + uuid: 7406, + name: "荆棘耳饰(Lv4)", + type: EquipType.ACCESSORY, + quality: Quality.GREEN, + lv: 4, + path: "7406", + info: "反伤+14%", + special_attr: [], + buff: [ + { type: BuffAttr.REFLECT, value: 14, target: EquipAttrTarget.HERO }, + ], + }, + 7506: { + uuid: 7506, + name: "荆棘耳饰(Lv5)", + type: EquipType.ACCESSORY, + quality: Quality.GREEN, + lv: 5, + path: "7406", + info: "反伤+16%", + special_attr: [], + buff: [ + { type: BuffAttr.REFLECT, value: 16, target: EquipAttrTarget.HERO }, + ], + }, + + // === 蓝色品质饰品 === + + // 星辉耳饰 + 7421: { + uuid: 7421, + name: "星辉耳饰(Lv4)", + type: EquipType.ACCESSORY, + quality: Quality.BLUE, + lv: 4, + path: "7421", + info: "生命值+36%，免伤+14%", + special_attr: [], + buff: [ + { type: BuffAttr.HP, value: 36, target: EquipAttrTarget.HERO }, + { type: BuffAttr.DEF, value: 14, target: EquipAttrTarget.HERO }, + ], + }, + 7521: { + uuid: 7521, + name: "星辉耳饰(Lv5)", + type: EquipType.ACCESSORY, + quality: Quality.BLUE, + lv: 5, + path: "7421", + info: "生命值+40%，免伤+16%", + special_attr: [], + buff: [ + { type: BuffAttr.HP, value: 40, target: EquipAttrTarget.HERO }, + { type: BuffAttr.DEF, value: 16, target: EquipAttrTarget.HERO }, + ], + }, + + // 霜晶耳饰 + 7422: { + uuid: 7422, + name: "霜晶耳饰(Lv4)", + type: EquipType.ACCESSORY, + quality: Quality.BLUE, + lv: 4, + path: "7422", + info: "攻击+36%，暴伤+25%", + special_attr: [], + buff: [ + { type: BuffAttr.ATK, value: 36, target: EquipAttrTarget.HERO }, + { type: BuffAttr.CRITICAL_DMG, value: 25, target: EquipAttrTarget.HERO }, + ], + }, + 7522: { + uuid: 7522, + name: "霜晶耳饰(Lv5)", + type: EquipType.ACCESSORY, + quality: Quality.BLUE, + lv: 5, + path: "7422", + info: "攻击+40%，暴伤+28%", + special_attr: [], + buff: [ + { type: BuffAttr.ATK, value: 40, target: EquipAttrTarget.HERO }, + { type: BuffAttr.CRITICAL_DMG, value: 28, target: EquipAttrTarget.HERO }, + ], + }, + + // 流光吊坠 + 7423: { + uuid: 7423, + name: "流光吊坠(Lv4)", + type: EquipType.ACCESSORY, + quality: Quality.BLUE, + lv: 4, + path: "7423", + info: "生命值+32%，闪避+8%", + special_attr: [], + buff: [ + { type: BuffAttr.HP, value: 32, target: EquipAttrTarget.HERO }, + { type: BuffAttr.DODGE, value: 8, target: EquipAttrTarget.HERO }, + ], + }, + 7523: { + uuid: 7523, + name: "流光吊坠(Lv5)", + type: EquipType.ACCESSORY, + quality: Quality.BLUE, + lv: 5, + path: "7423", + info: "生命值+36%，闪避+9%", + special_attr: [], + buff: [ + { type: BuffAttr.HP, value: 36, target: EquipAttrTarget.HERO }, + { type: BuffAttr.DODGE, value: 9, target: EquipAttrTarget.HERO }, + ], + }, + + // 地脉指环 + 7424: { + uuid: 7424, + name: "地脉指环(Lv4)", + type: EquipType.ACCESSORY, + quality: Quality.BLUE, + lv: 4, + path: "7424", + info: "免伤+15%，反伤+9%", + special_attr: [], + buff: [ + { type: BuffAttr.DEF, value: 15, target: EquipAttrTarget.HERO }, + { type: BuffAttr.REFLECT, value: 9, target: EquipAttrTarget.HERO }, + ], + }, + 7524: { + uuid: 7524, + name: "地脉指环(Lv5)", + type: EquipType.ACCESSORY, + quality: Quality.BLUE, + lv: 5, + path: "7424", + info: "免伤+17%，反伤+10%", + special_attr: [], + buff: [ + { type: BuffAttr.DEF, value: 17, target: EquipAttrTarget.HERO }, + { type: BuffAttr.REFLECT, value: 10, target: EquipAttrTarget.HERO }, + ], + }, + + // 炎阳戒指 + 7425: { + uuid: 7425, + name: "炎阳戒指(Lv4)", + type: EquipType.ACCESSORY, + quality: Quality.BLUE, + lv: 4, + path: "7425", + info: "攻击+40%，闪避+7%", + special_attr: [], + buff: [ + { type: BuffAttr.ATK, value: 40, target: EquipAttrTarget.HERO }, + { type: BuffAttr.DODGE, value: 7, target: EquipAttrTarget.HERO }, + ], + }, + 7525: { + uuid: 7525, + name: "炎阳戒指(Lv5)", + type: EquipType.ACCESSORY, + quality: Quality.BLUE, + lv: 5, + path: "7425", + info: "攻击+44%，闪避+8%", + special_attr: [], + buff: [ + { type: BuffAttr.ATK, value: 44, target: EquipAttrTarget.HERO }, + { type: BuffAttr.DODGE, value: 8, target: EquipAttrTarget.HERO }, + ], + }, + + // 潮汐戒指 + 7426: { + uuid: 7426, + name: "潮汐戒指(Lv4)", + type: EquipType.ACCESSORY, + quality: Quality.BLUE, + lv: 4, + path: "7426", + info: "暴伤+28%，反伤+8%", + special_attr: [], + buff: [ + { type: BuffAttr.CRITICAL_DMG, value: 28, target: EquipAttrTarget.HERO }, + { type: BuffAttr.REFLECT, value: 8, target: EquipAttrTarget.HERO }, + ], + }, + 7526: { + uuid: 7526, + name: "潮汐戒指(Lv5)", + type: EquipType.ACCESSORY, + quality: Quality.BLUE, + lv: 5, + path: "7426", + info: "暴伤+32%，反伤+9%", + special_attr: [], + buff: [ + { type: BuffAttr.CRITICAL_DMG, value: 32, target: EquipAttrTarget.HERO }, + { type: BuffAttr.REFLECT, value: 9, target: EquipAttrTarget.HERO }, + ], + }, + + // === 紫色品质饰品 === + + // 天穹戒指 + 7441: { + uuid: 7441, + name: "天穹戒指(Lv4)", + type: EquipType.ACCESSORY, + quality: Quality.PURPLE, + lv: 4, + path: "7441", + info: "生命值+40%，免伤+15%，攻击触发属性增加额外加值+2", special_attr: [ - {special_attr:EquipSpecialAttr.ATK_ADD_FRIEND_ATK,special_attr_value:3}, - {special_attr:EquipSpecialAttr.ICE,special_attr_value:1}, - {special_attr:EquipSpecialAttr.DOUBLE_DEAD,special_attr_value:1}, - {special_attr:EquipSpecialAttr.DOUBLE_ATKED,special_attr_value:1}, - {special_attr:EquipSpecialAttr.ATK_ADD_FRIEND_HP,special_attr_value:30}, - {special_attr:EquipSpecialAttr.ATK_ADD_GLOD,special_attr_value:3}, - {special_attr:EquipSpecialAttr.ATK_ADD_MASTER_ATK,special_attr_value:3}, - {special_attr:EquipSpecialAttr.ATK_ADD_MASTER_HP,special_attr_value:3}, + {special_attr: EquipSpecialAttr.ATK_ADD_VALUE, special_attr_value: 2}, ], buff: [ - { type: BuffAttr.ATK, value: 80, target: EquipAttrTarget.HERO }, - { type: BuffAttr.WFUNY, value: 30, target: EquipAttrTarget.HERO }, + { type: BuffAttr.HP, value: 40, target: EquipAttrTarget.HERO }, + { type: BuffAttr.DEF, value: 15, target: EquipAttrTarget.HERO }, ], }, - 2002: {uuid: 2002,name: "新手剑2",type: EquipType.WEAPON,quality: Quality.WHITE,info:"攻击速度增加30%", - lv: 1, - path: "2002", - special_attr:[ - {special_attr:EquipSpecialAttr.FIRE,special_attr_value:1}, - {special_attr:EquipSpecialAttr.DOUBLE_DEAD,special_attr_value:1}, - {special_attr:EquipSpecialAttr.DOUBLE_ATKED,special_attr_value:1}, - {special_attr:EquipSpecialAttr.ATK_ADD_FRIEND_ATK,special_attr_value:3}, - {special_attr:EquipSpecialAttr.ATK_ADD_FRIEND_HP,special_attr_value:30}, - {special_attr:EquipSpecialAttr.ATK_ADD_GLOD,special_attr_value:3}, - {special_attr:EquipSpecialAttr.ATK_ADD_MASTER_ATK,special_attr_value:3}, - {special_attr:EquipSpecialAttr.ATK_ADD_MASTER_HP,special_attr_value:3}, + 7541: { + uuid: 7541, + name: "天穹戒指(Lv5)", + type: EquipType.ACCESSORY, + quality: Quality.PURPLE, + lv: 5, + path: "7441", + info: "生命值+44%，免伤+18%，攻击触发属性增加额外加值+4", + special_attr: [ + {special_attr: EquipSpecialAttr.ATK_ADD_VALUE, special_attr_value: 4}, ], buff: [ - { type: BuffAttr.ATK_CD, value: 30, target: EquipAttrTarget.HERO }, - { type: BuffAttr.WFUNY, value: 30, target: EquipAttrTarget.HERO }, + { type: BuffAttr.HP, value: 44, target: EquipAttrTarget.HERO }, + { type: BuffAttr.DEF, value: 18, target: EquipAttrTarget.HERO }, ], }, - 2003: {uuid: 2003,name: "新手剑3",type: EquipType.WEAPON,quality: Quality.WHITE,info:"攻击次数增加1次", - lv: 1, - path: "2003", - special_attr:[ - {special_attr:EquipSpecialAttr.WIND,special_attr_value:1}, - {special_attr:EquipSpecialAttr.DOUBLE_DEAD,special_attr_value:1}, - {special_attr:EquipSpecialAttr.DOUBLE_ATKED,special_attr_value:1}, - {special_attr:EquipSpecialAttr.ATK_ADD_FRIEND_ATK,special_attr_value:3}, - {special_attr:EquipSpecialAttr.ATK_ADD_FRIEND_HP,special_attr_value:30}, - {special_attr:EquipSpecialAttr.ATK_ADD_GLOD,special_attr_value:3}, - {special_attr:EquipSpecialAttr.ATK_ADD_MASTER_ATK,special_attr_value:3}, - {special_attr:EquipSpecialAttr.ATK_ADD_MASTER_HP,special_attr_value:3}, + + // 神木戒指 + 7442: { + uuid: 7442, + name: "神木戒指(Lv4)", + type: EquipType.ACCESSORY, + quality: Quality.PURPLE, + lv: 4, + path: "7442", + info: "攻击+44%，暴伤+30%，伙伴获得主将装备属性加成10%", + special_attr: [ + {special_attr: EquipSpecialAttr.FRIEND_GET_MASTER_EQUIP, special_attr_value: 10}, ], buff: [ - { type: BuffAttr.WFUNY, value: 1, target: EquipAttrTarget.HERO }, - { type: BuffAttr.HP, value: 30, target: EquipAttrTarget.HERO }, + { type: BuffAttr.ATK, value: 44, target: EquipAttrTarget.HERO }, + { type: BuffAttr.CRITICAL_DMG, value: 30, target: EquipAttrTarget.HERO }, ], }, + 7542: { + uuid: 7542, + name: "神木戒指(Lv5)", + type: EquipType.ACCESSORY, + quality: Quality.PURPLE, + lv: 5, + path: "7442", + info: "攻击+50%，暴伤+34%，伙伴获得主将装备属性加成20%", + special_attr: [ + {special_attr: EquipSpecialAttr.FRIEND_GET_MASTER_EQUIP, special_attr_value: 20}, + ], + buff: [ + { type: BuffAttr.ATK, value: 50, target: EquipAttrTarget.HERO }, + { type: BuffAttr.CRITICAL_DMG, value: 34, target: EquipAttrTarget.HERO }, + ], + }, + + // 日曜戒指 + 7443: { + uuid: 7443, + name: "日曜戒指(Lv4)", + type: EquipType.ACCESSORY, + quality: Quality.PURPLE, + lv: 4, + path: "7443", + info: "生命值+36%，攻击+40%，攻击触发增加主将攻击力+2/生命值+10", + special_attr: [ + {special_attr: EquipSpecialAttr.ATK_ADD_MASTER_ATK, special_attr_value: 2}, + {special_attr: EquipSpecialAttr.ATK_ADD_MASTER_HP, special_attr_value: 10}, + ], + buff: [ + { type: BuffAttr.HP, value: 36, target: EquipAttrTarget.HERO }, + { type: BuffAttr.ATK, value: 40, target: EquipAttrTarget.HERO }, + ], + }, + 7543: { + uuid: 7543, + name: "日曜戒指(Lv5)", + type: EquipType.ACCESSORY, + quality: Quality.PURPLE, + lv: 5, + path: "7443", + info: "生命值+40%，攻击+48%，攻击触发增加主将攻击力+4/生命值+20", + special_attr: [ + {special_attr: EquipSpecialAttr.ATK_ADD_MASTER_ATK, special_attr_value: 4}, + {special_attr: EquipSpecialAttr.ATK_ADD_MASTER_HP, special_attr_value: 20}, + ], + buff: [ + { type: BuffAttr.HP, value: 40, target: EquipAttrTarget.HERO }, + { type: BuffAttr.ATK, value: 48, target: EquipAttrTarget.HERO }, + ], + }, + + // 月影项链 + 7444: { + uuid: 7444, + name: "月影项链(Lv4)", + type: EquipType.ACCESSORY, + quality: Quality.PURPLE, + lv: 4, + path: "7444", + info: "免伤+16%，暴伤+28%，攻击触发增加伙伴攻击力+3/生命值+10", + special_attr: [ + {special_attr: EquipSpecialAttr.ATK_ADD_FRIEND_ATK, special_attr_value: 3}, + {special_attr: EquipSpecialAttr.ATK_ADD_FRIEND_HP, special_attr_value: 10}, + ], + buff: [ + { type: BuffAttr.DEF, value: 16, target: EquipAttrTarget.HERO }, + { type: BuffAttr.CRITICAL_DMG, value: 28, target: EquipAttrTarget.HERO }, + ], + }, + 7544: { + uuid: 7544, + name: "月影项链(Lv5)", + type: EquipType.ACCESSORY, + quality: Quality.PURPLE, + lv: 5, + path: "7444", + info: "免伤+18%，暴伤+32%，攻击触发增加伙伴攻击力+6/生命值+25", + special_attr: [ + {special_attr: EquipSpecialAttr.ATK_ADD_FRIEND_ATK, special_attr_value: 6}, + {special_attr: EquipSpecialAttr.ATK_ADD_FRIEND_HP, special_attr_value: 25}, + ], + buff: [ + { type: BuffAttr.DEF, value: 18, target: EquipAttrTarget.HERO }, + { type: BuffAttr.CRITICAL_DMG, value: 32, target: EquipAttrTarget.HERO }, + ], + }, + + // 星尘项链 + 7445: { + uuid: 7445, + name: "星尘项链(Lv4)", + type: EquipType.ACCESSORY, + quality: Quality.PURPLE, + lv: 4, + path: "7445", + info: "闪避+10%，攻击+44%，伙伴复活时间减少30%", + special_attr: [ + {special_attr: EquipSpecialAttr.FRIEND_LIVE_CD, special_attr_value: 30}, + ], + buff: [ + { type: BuffAttr.DODGE, value: 10, target: EquipAttrTarget.HERO }, + { type: BuffAttr.ATK, value: 44, target: EquipAttrTarget.HERO }, + ], + }, + 7545: { + uuid: 7545, + name: "星尘项链(Lv5)", + type: EquipType.ACCESSORY, + quality: Quality.PURPLE, + lv: 5, + path: "7445", + info: "闪避+12%，攻击+50%，伙伴复活时间减少50%", + special_attr: [ + {special_attr: EquipSpecialAttr.FRIEND_LIVE_CD, special_attr_value: 50}, + ], + buff: [ + { type: BuffAttr.DODGE, value: 12, target: EquipAttrTarget.HERO }, + { type: BuffAttr.ATK, value: 50, target: EquipAttrTarget.HERO }, + ], + }, + + // 深渊戒指 + 7446: { + uuid: 7446, + name: "深渊戒指(Lv4)", + type: EquipType.ACCESSORY, + quality: Quality.PURPLE, + lv: 4, + path: "7446", + info: "反伤+12%，生命值+44%，双倍死亡触发+1", + special_attr: [ + {special_attr: EquipSpecialAttr.DOUBLE_DEAD, special_attr_value: 1}, + ], + buff: [ + { type: BuffAttr.REFLECT, value: 12, target: EquipAttrTarget.HERO }, + { type: BuffAttr.HP, value: 44, target: EquipAttrTarget.HERO }, + ], + }, + 7546: { + uuid: 7546, + name: "深渊戒指(Lv5)", + type: EquipType.ACCESSORY, + quality: Quality.PURPLE, + lv: 5, + path: "7446", + info: "反伤+14%，生命值+50%，双倍死亡触发+2", + special_attr: [ + {special_attr: EquipSpecialAttr.DOUBLE_DEAD, special_attr_value: 2}, + ], + buff: [ + { type: BuffAttr.REFLECT, value: 14, target: EquipAttrTarget.HERO }, + { type: BuffAttr.HP, value: 50, target: EquipAttrTarget.HERO }, + ], + }, + + // 永夜戒指 + 7447: { + uuid: 7447, + name: "永夜戒指(Lv4)", + type: EquipType.ACCESSORY, + quality: Quality.PURPLE, + lv: 4, + path: "7447", + info: "免伤+18%，暴伤+32%，双倍受击触发+1", + special_attr: [ + {special_attr: EquipSpecialAttr.DOUBLE_ATKED, special_attr_value: 1}, + ], + buff: [ + { type: BuffAttr.DEF, value: 18, target: EquipAttrTarget.HERO }, + { type: BuffAttr.CRITICAL_DMG, value: 32, target: EquipAttrTarget.HERO }, + ], + }, + 7547: { + uuid: 7547, + name: "永夜戒指(Lv5)", + type: EquipType.ACCESSORY, + quality: Quality.PURPLE, + lv: 5, + path: "7447", + info: "免伤+20%，暴伤+36%，双倍受击触发+2", + special_attr: [ + {special_attr: EquipSpecialAttr.DOUBLE_ATKED, special_attr_value: 2}, + ], + buff: [ + { type: BuffAttr.DEF, value: 20, target: EquipAttrTarget.HERO }, + { type: BuffAttr.CRITICAL_DMG, value: 36, target: EquipAttrTarget.HERO }, + ], + }, + } diff --git a/assets/script/game/hero/HeroViewComp.ts b/assets/script/game/hero/HeroViewComp.ts index 12925305..0ce70f91 100644 --- a/assets/script/game/hero/HeroViewComp.ts +++ b/assets/script/game/hero/HeroViewComp.ts @@ -164,17 +164,7 @@ export class HeroViewComp extends CCComp { change_atk(e:GameEvent,data:any){ if(!this.is_master) return - if(data.ice){ - this.atk_skill=6014 - }else if(data.fire){ - this.atk_skill=6012 - }else if(data.wind){ - this.atk_skill=6013 - }else{ - this.atk_skill=6001 - } - - console.log("[HeroViewComp]:change_atk",SkillSet[this.atk_skill].name) + } get isActive() { @@ -394,6 +384,7 @@ export class HeroViewComp extends CCComp { this.DEBUFF_FROST+=deV break case DebuffAttr.STUN: + this.at=0 // 眩晕 cd归零 this.BUFFCOMP.in_yun(deV) this.DEBUFF_STUN+=deV this.is_stop=true diff --git a/assets/script/game/hero/SkillConComp.ts b/assets/script/game/hero/SkillConComp.ts index 77b4f6dd..bf53e55d 100644 --- a/assets/script/game/hero/SkillConComp.ts +++ b/assets/script/game/hero/SkillConComp.ts @@ -38,7 +38,7 @@ export class SkillConComp extends CCComp { update(dt: number) { if(!smc.mission.play||smc.mission.pause) return - if(this.HeroView.DEBUFF_STUN <= 0) this.HeroView.at += dt; + if(this.HeroView.DEBUFF_STUN <= 0&&this.HeroView.DEBUFF_FROST <= 0) this.HeroView.at += dt; let cd = this.get_cd(this.HeroView.cd,this.HeroView) // console.log(this.HeroView.hero_name+(this.HeroView.is_master?"[主]":"[从] 准备释放")+SkillSet[this.HeroView.atk_skill].name+"=>"+"=>cd:"+cd+"=> count:"+count) diff --git a/assets/script/game/map/EquipsComp.ts b/assets/script/game/map/EquipsComp.ts index cd5c8a50..c56c7e09 100644 --- a/assets/script/game/map/EquipsComp.ts +++ b/assets/script/game/map/EquipsComp.ts @@ -80,7 +80,7 @@ export class EquipsComp extends Component { } break case "accessory": - if(this.accessory.uuid==0) return 1 + if(this.accessory.uuid==0) return 4 lv=EquipInfo[this.accessory.uuid].lv break } @@ -225,6 +225,7 @@ export class EquipsComp extends Component { const all_special_attr=[...weapon_special_attr,...armor_special_attr,...accessory_special_attr] let equip_special_attr=this.count_equip_special_attr(all_special_attr) + let friend_get_master_equip=equip_special_attr[EquipSpecialAttr.FRIEND_GET_MASTER_EQUIP] oops.message.dispatchEvent(GameEvent.ChangeATK_EQUIP_SPECIAL_ATTR,equip_special_attr) // 合并所有装备属性 @@ -245,59 +246,42 @@ export class EquipsComp extends Component { } this.add_attr(targetKey,attr) }); - + // 伙伴获取英雄装备属性加成 + this.attrs.friend_buff.ATK+=this.attrs.hero_buff.ATK*friend_get_master_equip + this.attrs.friend_buff.HP+=this.attrs.hero_buff.HP*friend_get_master_equip console.log("[EquipsComp]:debuff buff attrs ", this.attrs); oops.message.dispatchEvent(GameEvent.EquipChange, this.attrs); } count_equip_special_attr(all_special_attr:any[]){ - //特殊属性附加 - let equip_special_attr={ - ice:false, - fire:false, - wind:false, - friend_live_cd_less:0, - atk_add_friend_atk:0, - atk_add_friend_hp:0, - atk_add_glod:0, - atk_add_master_atk:0, - atk_add_master_hp:0, - } + //特殊属性附加 - 直接使用枚举值作为属性名 + let equip_special_attr = { + [EquipSpecialAttr.ICE]: 0, + [EquipSpecialAttr.FIRE]: 0, + [EquipSpecialAttr.WIND]: 0, + [EquipSpecialAttr.FRIEND_LIVE_CD]: 0, + [EquipSpecialAttr.ATK_ADD_FRIEND_ATK]: 0, + [EquipSpecialAttr.ATK_ADD_FRIEND_HP]: 0, + [EquipSpecialAttr.ATK_ADD_GLOD]: 0, + [EquipSpecialAttr.ATK_ADD_MASTER_ATK]: 0, + [EquipSpecialAttr.ATK_ADD_MASTER_HP]: 0, + [EquipSpecialAttr.DOUBLE_DEAD]: 0, + [EquipSpecialAttr.DOUBLE_ATKED]: 0, + [EquipSpecialAttr.FRIEND_ATKED_ADD_SKILL_STONE]: 0, + [EquipSpecialAttr.ATK_ADD_VALUE]: 0, + [EquipSpecialAttr.FRIEND_GET_MASTER_EQUIP]: 0, + }; + console.log("[EquipsComp]:all_special_attr",all_special_attr) - all_special_attr.forEach(special_attr=>{ - if(special_attr){ - switch(special_attr.special_attr){ - case EquipSpecialAttr.ICE: - equip_special_attr.ice=true - break - case EquipSpecialAttr.FIRE: - equip_special_attr.fire=true - break - case EquipSpecialAttr.WIND: - equip_special_attr.wind=true - break - case EquipSpecialAttr.FRIEND_LIVE_CD: - equip_special_attr.friend_live_cd_less+=special_attr.special_attr_value - break - case EquipSpecialAttr.ATK_ADD_FRIEND_ATK: - equip_special_attr.atk_add_friend_atk+=special_attr.special_attr_value - break - case EquipSpecialAttr.ATK_ADD_FRIEND_HP: - equip_special_attr.atk_add_friend_hp+=special_attr.special_attr_value - break - case EquipSpecialAttr.ATK_ADD_GLOD: - equip_special_attr.atk_add_glod+=special_attr.special_attr_value - break - case EquipSpecialAttr.ATK_ADD_MASTER_ATK: - equip_special_attr.atk_add_master_atk+=special_attr.special_attr_value - break - case EquipSpecialAttr.ATK_ADD_MASTER_HP: - equip_special_attr.atk_add_master_hp+=special_attr.special_attr_value - break - } + + // 直接使用枚举值累加属性 + all_special_attr.forEach(special_attr => { + if (special_attr && equip_special_attr.hasOwnProperty(special_attr.special_attr)) { + equip_special_attr[special_attr.special_attr] += special_attr.special_attr_value; } - }) + }); + console.log("[EquipsComp]:equip_special_attr",equip_special_attr) return equip_special_attr } @@ -361,12 +345,17 @@ export class EquipsComp extends Component { this.boxs.getChildByName("armor").getChildByName("tip").active=true this.boxs.getChildByName("armor").getChildByName("tip").getComponent(Label).string="升级" } - if(this.accessory.uuid==0 &&smc.vmdata.mission_data.equip_stone_max >= 160){ - if(EquipInfo[this.accessory.uuid].lv>=5) return + if(this.accessory.uuid==0 ){ this.boxs.getChildByName("accessory").getChildByName("get").active =true this.boxs.getChildByName("accessory").getChildByName("light").active=true this.boxs.getChildByName("accessory").getChildByName("tip").active=true this.boxs.getChildByName("accessory").getChildByName("tip").getComponent(Label).string="购买" + }else{ + if(EquipInfo[this.accessory.uuid].lv>=5) return + this.boxs.getChildByName("accessory").getChildByName("change").active =true + this.boxs.getChildByName("accessory").getChildByName("light").active=true + this.boxs.getChildByName("accessory").getChildByName("tip").active=true + this.boxs.getChildByName("accessory").getChildByName("tip").getComponent(Label).string="升级" } } diff --git a/assets/script/game/map/FightConComp.ts b/assets/script/game/map/FightConComp.ts index dcd0a186..e27458b6 100644 --- a/assets/script/game/map/FightConComp.ts +++ b/assets/script/game/map/FightConComp.ts @@ -5,6 +5,7 @@ import { geDebuffNum, getBuffNum, BuffAttr, DebuffAttr } from '../common/config/ import { Timer } from 'db://oops-framework/core/common/timer/Timer'; import { FightSet } from '../common/config/Mission'; import { SuperCards, SuperCardsType } from '../common/config/CardSet'; +import { EquipSpecialAttr } from '../common/config/Equips'; import { ecs } from 'db://oops-framework/libs/ecs/ECS'; import { Skill } from '../skills/Skill'; import { MasterModelComp } from '../hero/MasterModel'; @@ -29,6 +30,11 @@ export class FightConComp extends Component { atk_add_glod:number=0 atk_add_master_atk:number=0 atk_add_master_hp:number=0 + double_dead:number=0 + double_atked:number=0 + friend_atked_add_skill_stone:number=0 + atk_add_value:number=0 + friend_get_master_equip:number=0 //卡牌特效 card_atk_add:number=0 //卡牌特效 攻击提高攻击力效果 额外添加值 @@ -59,13 +65,17 @@ export class FightConComp extends Component { } change_equip_special_attr(e:GameEvent,data:any){ console.log("[FightConComp]:change_equip_special_attr",data) - this.atk_add_friend_atk=data.atk_add_friend_atk+(this.card_atk_add > 0 ? this.card_atk_add:0) //装备特殊属性 英雄/伙伴 攻击力增加 - this.atk_add_friend_hp=data.atk_add_friend_hp+(this.card_hp_add > 0 ? this.card_hp_add:0) //装备特殊属性 英雄/伙伴 生命值增加 - this.atk_add_glod=data.atk_add_glod - this.atk_add_master_atk=data.atk_add_master_atk+(this.card_atk_add > 0 ? this.card_atk_add:0) //装备特殊属性 英雄/伙伴 攻击力增加 - this.atk_add_master_hp=data.atk_add_master_hp+(this.card_hp_add > 0 ? this.card_hp_add:0) //装备特殊属性 英雄/伙伴 生命值增加 - this.friend_alive_cd=FightSet.FRIEND_LIVE_CD-data.friend_live_cd_less - + this.atk_add_value=data[EquipSpecialAttr.ATK_ADD_VALUE] + this.atk_add_friend_atk=data[EquipSpecialAttr.ATK_ADD_FRIEND_ATK]+this.atk_add_value+(this.card_atk_add > 0 ? this.card_atk_add:0) //装备特殊属性 英雄/伙伴 攻击力增加 + this.atk_add_friend_hp=data[EquipSpecialAttr.ATK_ADD_FRIEND_HP]+this.atk_add_value+(this.card_hp_add > 0 ? this.card_hp_add:0) //装备特殊属性 英雄/伙伴 生命值增加 + this.atk_add_glod=data[EquipSpecialAttr.ATK_ADD_GLOD] + this.atk_add_master_atk=data[EquipSpecialAttr.ATK_ADD_MASTER_ATK]+this.atk_add_value+(this.card_atk_add > 0 ? this.card_atk_add:0) //装备特殊属性 英雄/伙伴 攻击力增加 + this.atk_add_master_hp=data[EquipSpecialAttr.ATK_ADD_MASTER_HP]+this.atk_add_value+(this.card_hp_add > 0 ? this.card_hp_add:0) //装备特殊属性 英雄/伙伴 生命值增加 + this.friend_alive_cd=FightSet.FRIEND_LIVE_CD-data[EquipSpecialAttr.FRIEND_LIVE_CD] + this.double_dead=data[EquipSpecialAttr.DOUBLE_DEAD] + this.double_atked=data[EquipSpecialAttr.DOUBLE_ATKED] + this.friend_atked_add_skill_stone=data[EquipSpecialAttr.FRIEND_ATKED_ADD_SKILL_STONE] + this.friend_get_master_equip=data[EquipSpecialAttr.FRIEND_GET_MASTER_EQUIP] } @@ -194,6 +204,11 @@ export class FightConComp extends Component { this.atk_add_glod=0 this.atk_add_master_atk=0 this.atk_add_master_hp=0 + this.double_dead=0 + this.double_atked=0 + this.friend_atked_add_skill_stone=0 + this.atk_add_value=0 + this.friend_get_master_equip=0 this.card_atk_add=0 this.card_hp_add=0 this.aoe_queues = [] // 清空技能队列 diff --git a/assets/script/game/skills/Skill.ts b/assets/script/game/skills/Skill.ts index a0e1b62b..7d11b82f 100644 --- a/assets/script/game/skills/Skill.ts +++ b/assets/script/game/skills/Skill.ts @@ -107,7 +107,7 @@ export class Skill extends ecs.Entity { let ap=0 let crit=0 let crit_d=0 - let buff_ap=1 + let buffap=1 let buff=null let puncture=0 let puncture_damage=0 @@ -116,7 +116,7 @@ export class Skill extends ecs.Entity { if(view.is_boss) buff=FIGHTCON.enemy_buff if(view.is_kalami) buff=FIGHTCON.enemy_buff if(buff!==null) { - buff_ap=(100+buff.ATK)/100 //装备区 总加成 + buffap=(100+buff.ATK)/100 //装备区 总加成 } // 汇总DEBUFF_DECD并处理count值 let BUFF_ATK = 0 @@ -143,7 +143,7 @@ export class Skill extends ecs.Entity { let BUFF_AP=(100-DEBUFF_DEATK+BUFF_ATK+dmg)/100 //buff区 总加成 puncture =buff.PUNCTURE+view.puncture puncture_damage=buff.PUNCTURE_DMG+view.puncture_damage - ap=view.ap*buff_ap*BUFF_AP*SkillSet[uuid].ap/100 + ap=view.ap*buffap*BUFF_AP*SkillSet[uuid].ap/100 crit=view.crit+buff.CRITICAL crit_d=view.crit_d+buff.CRITICAL_DMG return {ap,crit,crit_d,puncture,puncture_damage} diff --git a/assets/wp.md b/assets/wp.md index 7450ca24..907bf03f 100644 --- a/assets/wp.md +++ b/assets/wp.md @@ -11,6 +11,7 @@ - 基准CD：1.5秒 - 实际CD = 1.5 × (1 + CD修正%) - 剑：-20% | 斧：0% | 刀：-26.7% | 锤：+6.7% +- 剑类核心机制:默认穿刺伤害是上一次伤害的50% ### 📋 剑类武器数据表 | 等级 | 品质 | 名称 | **CD修正** | 实际CD | 攻击加成 | 核心特性 | 穿透伤害比率（进化） | @@ -42,27 +43,141 @@ **进化规则**： - 品质提升风怒概率和击退概率 - 等级提升攻击加成和特殊属性 - +- 斧类核心机制:风怒默认伤害额外一次攻击 伤害100% ## 📋 斧类武器完整数据表 | 等级 | 品质 | 名称 | CD | 攻击加成 | 风怒概率 | 击退概率 | |------ |------|------------------|------|----------|----------|----------| -| **Lv1** | 绿 | 风暴战斧(Lv1) | 1.50s | +100% | 20% | 15% | +| **Lv1** | 绿 | 风暴战斧(Lv1) | 1.50s | +100% | 20% | | | | 蓝 | 寒锋巨斧(Lv1) | 1.50s | +130% | 30% | 20% | | | 紫 | 龙鳞撕裂者(Lv1) | 1.50s | +160% | 40% | 25% | -| **Lv2** | 绿 | 风暴战斧(Lv2) | 1.50s | +130% | 25% | 18% | +| **Lv2** | 绿 | 风暴战斧(Lv2) | 1.50s | +130% | 25% | | | | 蓝 | 寒锋巨斧(Lv2) | 1.50s | +170% | 35% | 23% | | | 紫 | 龙鳞撕裂者(Lv2) | 1.50s | +200% | 45% | 28% | -| **Lv3** | 绿 | 风暴战斧(Lv3) | 1.50s | +160% | 30% | 21% | +| **Lv3** | 绿 | 风暴战斧(Lv3) | 1.50s | +160% | 30% | | | | 蓝 | 寒锋巨斧(Lv3) | 1.50s | +210% | 40% | 26% | | | 紫 | 龙鳞撕裂者(Lv3) | 1.50s | +240% | 50% | 31% | -| **Lv4** | 绿 | 风暴战斧(Lv4) | 1.50s | +190% | 35% | 24% | +| **Lv4** | 绿 | 风暴战斧(Lv4) | 1.50s | +190% | 35% | | | | 蓝 | 寒锋巨斧(Lv4) | 1.50s | +250% | 45% | 29% | | | 紫 | 龙鳞撕裂者(Lv4) | 1.50s | +280% | 55% | 34% | -| **Lv5** | 绿 | 风暴战斧(Lv5) | 1.50s | +220% | 40% | 27% | +| **Lv5** | 绿 | 风暴战斧(Lv5) | 1.50s | +220% | 40% | 20% | | | 蓝 | 寒锋巨斧(Lv5) | 1.50s | +280% | 50% | 32% | | | 紫 | 龙鳞撕裂者(Lv5) | 1.50s | +340% | 60% | 37% | +# 🔨 锤类武器详细数据表 + +## 📜 基础属性说明 +- ​**CD计算**​：基准1.5s × (1 + 6.7%) = ​**1.60s**​（全等级固定） +- ​**核心机制**​： + - 暴击伤害基础值：150% + - 紫色品质额外增加暴击伤害 + - 击晕效果：使目标无法行动1秒（不可叠加）,并且使攻击施法 cd 归零 + +## 📊 完整等级数据（Lv1-Lv5） + +### Lv1 +| 品质 | 名称 | 攻击加成 | 暴击率 | 击晕概率 | 暴击伤害加成 | +|------|------------------|----------|--------|----------|--------------| +| 绿 | 碎骨战锤(Lv1) | +120% | 10% | 15% | - | +| 蓝 | 雷霆重锤(Lv1) | +150% | 15% | 20% | - | +| 紫 | 泰坦粉碎者(Lv1) | +180% | 20% | 25% | +50% | + +### Lv2 +| 品质 | 名称 | 攻击加成 | 暴击率 | 击晕概率 | 暴击伤害加成 | +|------|------------------|----------|--------|----------|--------------| +| 绿 | 碎骨战锤(Lv2) | +150% | 12% | 18% | - | +| 蓝 | 雷霆重锤(Lv2) | +190% | 18% | 23% | - | +| 紫 | 泰坦粉碎者(Lv2) | +220% | 23% | 28% | +55% | + +### Lv3 +| 品质 | 名称 | 攻击加成 | 暴击率 | 击晕概率 | 暴击伤害加成 | +|------|------------------|----------|--------|----------|--------------| +| 绿 | 碎骨战锤(Lv3) | +180% | 14% | 21% | - | +| 蓝 | 雷霆重锤(Lv3) | +230% | 21% | 26% | - | +| 紫 | 泰坦粉碎者(Lv3) | +260% | 26% | 31% | +60% | + +### Lv4 +| 品质 | 名称 | 攻击加成 | 暴击率 | 击晕概率 | 暴击伤害加成 | +|------|------------------|----------|--------|----------|--------------| +| 绿 | 碎骨战锤(Lv4) | +210% | 16% | 24% | - | +| 蓝 | 雷霆重锤(Lv4) | +270% | 24% | 29% | - | +| 紫 | 泰坦粉碎者(Lv4) | +300% | 29% | 34% | +65% | + +### Lv5 +| 品质 | 名称 | 攻击加成 | 暴击率 | 击晕概率 | 暴击伤害加成 | +|------|------------------|----------|--------|----------|--------------| +| 绿 | 碎骨战锤(Lv5) | +240% | 18% | 27% | - | +| 蓝 | 雷霆重锤(Lv5) | +310% | 27% | 32% | - | +| 紫 | 泰坦粉碎者(Lv5) | +360% | 32% | 37% | +70% | + +## ⚖️ 属性成长规律 +1. ​**攻击加成**​： + - 每等级提升：绿+30%，蓝+40%，紫+40% + - 品质差异：蓝比绿高20%，紫比蓝高20% + +2. ​**暴击率**​： + - 每等级提升：+2%（绿），+3%（蓝/紫） + - 品质差异：蓝比绿高5%，紫比蓝高5% + +3. ​**击晕概率**​： + - 每等级提升：+3%（全品质） + - 品质差异：蓝比绿高5%，紫比蓝高5% + +4. ​**暴击伤害**​（仅紫）： + - 每等级+5%（Lv1基础+50%） + +## 💡 战斗特性说明 +```diff ++ 优势场景： + - 对BOSS战（暴击+击晕双重压制） + - 需要打断施法的战斗 +! 使用技巧： + - 紫色锤暴击时实际伤害=270%（基础200%+70%加成） + - 击晕可打断敌人技能读条 + + +# ⚔️ 刀类武器完整配置表（含CD修正） + +## 📜 核心机制说明 +- ​**基准CD**​：1.5秒 +- ​**CD修正**​：-26.7%（全等级固定） +- ​**实际CD**​：1.5 × (1 - 0.267) ≈ ​**1.10s**​ +- 冰冻效果: 停止移动并暂停cd +## 📊 完整数据表（Lv1-Lv5） + +| 等级 | 品质 | 名称 | CD修正 | 实际CD | 攻击加成 | 易伤加成 | 冰冻概率 | +|------|------|--------------------|--------|--------|----------|----------|----------| +| Lv1 | 绿 | 影刃(Lv1) | -26.7% | 1.10s | +60% | +15% | - | +| | 蓝 | 寒月双刃(Lv1) | -26.7% | 1.10s | +85% | +20% | - | +| | 紫 | 霜魂切割者(Lv1) | -26.7% | 1.10s | +115% | +25% | 15% | +| Lv2 | 绿 | 影刃(Lv2) | -26.7% | 1.10s | +90% | +17% | - | +| | 蓝 | 寒月双刃(Lv2) | -26.7% | 1.10s | +125% | +23% | - | +| | 紫 | 霜魂切割者(Lv2) | -26.7% | 1.10s | +160% | +29% | 18% | +| Lv3 | 绿 | 影刃(Lv3) | -26.7% | 1.10s | +120% | +19% | - | +| | 蓝 | 寒月双刃(Lv3) | -26.7% | 1.10s | +165% | +26% | - | +| | 紫 | 霜魂切割者(Lv3) | -26.7% | 1.10s | +205% | +33% | 21% | +| Lv4 | 绿 | 影刃(Lv4) | -26.7% | 1.10s | +150% | +21% | - | +| | 蓝 | 寒月双刃(Lv4) | -26.7% | 1.10s | +205% | +29% | - | +| | 紫 | 霜魂切割者(Lv4) | -26.7% | 1.10s | +250% | +37% | 24% | +| Lv5 | 绿 | 影刃(Lv5) | -26.7% | 1.10s | +180% | +25% | - | +| | 蓝 | 寒月双刃(Lv5) | -26.7% | 1.10s | +245% | +35% | - | +| | 紫 | 霜魂切割者(Lv5) | -26.7% | 1.10s | +300% | +45% | 27% | + +## ⚙️ 系统兼容性说明 +1. ​**CD修正统一性**​： + - 所有刀类武器固定-26.7%修正 + - 实际CD四舍五入保留两位小数 + +2. ​**双人协同参数**​： + ```math + \text{理论攻击频率} = \frac{2}{1.10} \approx 1.82 \text{次/秒} + \text{易伤覆盖率} = \frac{5}{1.82} \approx 2.75 \text{秒持续效果} + + + + + + ## 🛡️ 盾牌系统设计规范（属性互斥） @@ -126,4 +241,59 @@ | 4 | 紫 | 永恒守护者(Lv4) | +80% | 21% | 闪避11% |- | | 5 | 绿 | 守护圆盾(Lv5) | +72% | 18% | - | - | | 5 | 蓝 | 圣光壁垒(Lv5) | +80% | 20% | Debuff减免16% | - | -| 5 | 紫 | 永恒守护者(Lv5) | +88% | 23% | 闪避13% | **被攻5次+1技能点** | \ No newline at end of file +| 5 | 紫 | 永恒守护者(Lv5) | +88% | 23% | 闪避13% | **被攻5次+1技能点** | + + +## 🟢 绿色品质饰品（自然元素系列） + +| 品质 | 名称 | 等级 | 属性类型 | 属性值 | 属性类型2 | 属性值2 | 核心属性 | 核心值 | +|------|------------|------|----------|--------|-----------|---------|----------|--------| +| 绿 | 磐石徽章 | 4 | HP加成 | +56% | - | - | - | - | +| 绿 | 磐石徽章 | 5 | HP加成 | +64% | - | - | - | - | +| 绿 | 刚玉戒指 | 4 | 免伤 | +22% | - | - | - | - | +| 绿 | 刚玉戒指 | 5 | 免伤 | +25% | - | - | - | - | +| 绿 | 烈阳吊坠 | 4 | 攻击 | +50% | - | - | - | - | +| 绿 | 烈阳吊坠 | 5 | 攻击 | +56% | - | - | - | - | +| 绿 | 雷暴耳饰 | 4 | 暴伤 | +35% | - | - | - | - | +| 极 | 雷暴耳饰 | 5 | 暴伤 | +40% | - | - | - | - | +| 绿 | 迷雾指环 | 4 | 闪避 | +12% | - | - | - | - | +| 绿 | 迷雾指环 | 5 | 闪避 | +14% | - | - | - | - | +| 绿 | 荆棘挂饰 | 4 | 反伤 | +14% | - | - | - | - | +| 绿 | 荆棘挂饰 | 5 | 反伤 | +16% | - | - | - | - | + +## 🔵 蓝色品质饰品（天文现象系列） + +| 品质 | 名称 | 等级 | 属性类型1 | 属性值1 | 属性类型2 | 属性值2 | 核心属性 | 核心值 | +|------|------------|------|-----------|---------|-----------|---------|----------|--------| +| 蓝 | 星辉徽章 | 4 | HP加成 | +36% | 免伤 | +14% | - | - | +| 蓝 | 星辉徽章 | 5 | HP加成 | +40% | 免伤 | +16% | - | - | +| 蓝 | 霜晶戒指 | 4 | 攻击 | +36% | 暴伤 | +25% | - | - | +| 蓝 | 霜晶戒指 | 5 | 攻击 | +40% | 暴伤 | +28% | - | - | +| 蓝 | 流光吊坠 | 4 | HP加成 | +32% | 闪避 | +8% | - | - | +| 蓝 | 流光吊坠 | 5 | HP加成 | +36% | 闪避 | +9% | - | - | +| 蓝 | 地脉指环 | 4 | 免伤 | +15% | 反伤 | +9% | - | - | +| 蓝 | 地脉指环 | 5 | 免伤 | +17% | 反伤 | +10% | - | - | +| 蓝 | 炎阳耳饰 | 4 | 攻击 | +40% | 闪避 | +7% | - | - | +| 蓝 | 炎阳耳饰 | 5 | 攻击 | +44% | 闪避 | +8% | - | - | +| 蓝 | 潮汐挂饰 | 4 | 暴伤 | +28% | 反伤 | +8% | - | - | +| 蓝 | 潮汐挂饰 | 5 | 暴伤 | +32% | 反伤 | +9% | - | - | + +## 🟣 紫色品质饰品（神话概念系列） + +| 品质 | 名称 | 等级 | 属性类型1 | 属性值1 | 属性类型2 | 属性值2 | 核心属性 | 核心值 | +|------|------------|------|-----------|---------|-----------|---------|------------------|--------| +| 紫 | 天穹徽章 | 4 | HP加成 | +40% | 免伤 | +15% | 攻击触发属性增加的值额外加值 | 2 | +| 紫 | 天穹徽章 | 5 | HP加成 | +44% | 免伤 | +18% | 攻击触发属性增加的值额外加值 | 4 | +| 紫 | 神木戒指 | 4 | 攻击 | +44% | 暴伤 | +30% | 伙伴获得主将装备生命值和攻击力属性加成 | 10 | +| 紫 | 神木戒指 | 5 | 攻击 | +50% | 暴伤 | +34% | 伙伴获得主将装备生命值和攻击力属性加成 | 20 | +| 紫 | 日曜吊坠 | 4 | HP加成 | +36% | 攻击 | +40% | 攻击n次后增加主将攻击力/攻击n次后增加主将生命值 | 2/10 | +| 紫 | 日曜吊坠 | 5 | HP加成 | +40% | 攻击 | +48% | 攻击n次后增加主将攻击力/攻击n次后增加主将生命值 | 4/20 | +| 紫 | 月影指环 | 4 | 免伤 | +16% | 暴伤 | +28% | 攻击n次后增加伙伴攻击力/攻击n次后增加伙伴生命值 | 3/10 | +| 紫 | 月影指环 | 5 | 免伤 | +18% | 暴伤 | +32% | 攻击n次后增加伙伴攻击力/攻击n次后增加伙伴生命值 | 6/25 | +| 紫 | 星尘耳饰 | 4 | 闪避 | +10% | 攻击 | +44% | 伙伴复活时间减少 | -30% | +| 紫 | 星尘耳饰 | 5 | 闪避 | +12% | 攻击 | +50% | 伙伴复活时间减少 | -50% | +| 紫 | 深渊挂饰 | 4 | 反伤 | +12% | HP加成 | +44% | 双倍死亡触发 | 1 | +| 紫 | 深渊挂饰 | 5 | 反伤 | +14% | HP加成 | +50% | 双倍死亡触发 | 2 | +| 紫 | 永夜徽章 | 4 | 免伤 | +18% | 暴伤 | +32% | 双倍受击触发 | 1 | +| 紫 | 永夜徽章 | 5 | 免伤 | +20% | 暴伤 | +36% | 双倍受击触发 | 2 | +