diff --git a/assets/res/popBattle/SkillSelect.meta b/assets/bundles/popBattle/popSelect.meta similarity index 70% rename from assets/res/popBattle/SkillSelect.meta rename to assets/bundles/popBattle/popSelect.meta index a0d99da..97ae4dc 100644 --- a/assets/res/popBattle/SkillSelect.meta +++ b/assets/bundles/popBattle/popSelect.meta @@ -2,7 +2,7 @@ "ver": "1.2.0", "importer": "directory", "imported": true, - "uuid": "95f22647-b7cb-4fca-ab68-e7b6519b1ea7", + "uuid": "e8af14ca-74b3-48ea-8912-fec3ea86b266", "files": [], "subMetas": {}, "userData": {} diff --git a/assets/res/popBattle/SkillSelect/spine.meta b/assets/bundles/popBattle/popSelect/prefab.meta similarity index 70% rename from assets/res/popBattle/SkillSelect/spine.meta rename to assets/bundles/popBattle/popSelect/prefab.meta index febf2c5..2da294e 100644 --- a/assets/res/popBattle/SkillSelect/spine.meta +++ b/assets/bundles/popBattle/popSelect/prefab.meta @@ -2,7 +2,7 @@ "ver": "1.2.0", "importer": "directory", "imported": true, - "uuid": "d05c836a-de42-455c-b77f-96842b83d906", + "uuid": "75ff3460-ff8b-4900-a885-bef85187cc49", "files": [], "subMetas": {}, "userData": {} diff --git a/assets/res/popBattle/SkillSelect/spine/选择框.atlas b/assets/res/popBattle/SkillSelect/spine/选择框.atlas deleted file mode 100644 index 088ca9d..0000000 --- a/assets/res/popBattle/SkillSelect/spine/选择框.atlas +++ /dev/null @@ -1,272 +0,0 @@ - -选择框.png -size: 1943,1792 -format: RGBA8888 -filter: Linear,Linear -repeat: none -bai - rotate: true - xy: 383, 15 - size: 205, 381 - orig: 207, 383 - offset: 1, 1 - index: -1 -橙色阶 - rotate: true - xy: 0, 13 - size: 207, 381 - orig: 207, 383 - offset: 0, 1 - index: -1 -橙色阶_00000 - rotate: false - xy: 0, 1401 - size: 250, 391 - orig: 250, 391 - offset: 0, 0 - index: -1 -橙色阶_00001 - rotate: false - xy: 0, 1008 - size: 250, 391 - orig: 250, 391 - offset: 0, 0 - index: -1 -橙色阶_00002 - rotate: false - xy: 0, 615 - size: 250, 391 - orig: 250, 391 - offset: 0, 0 - index: -1 -橙色阶_00003 - rotate: false - xy: 0, 222 - size: 250, 391 - orig: 250, 391 - offset: 0, 0 - index: -1 -橙色阶_00004 - rotate: false - xy: 252, 1401 - size: 250, 391 - orig: 250, 391 - offset: 0, 0 - index: -1 -橙色阶_00005 - rotate: false - xy: 252, 1008 - size: 250, 391 - orig: 250, 391 - offset: 0, 0 - index: -1 -橙色阶_00006 - rotate: false - xy: 252, 615 - size: 250, 391 - orig: 250, 391 - offset: 0, 0 - index: -1 -橙色阶_00007 - rotate: false - xy: 252, 222 - size: 250, 391 - orig: 250, 391 - offset: 0, 0 - index: -1 -橙色阶_00008 - rotate: true - xy: 766, 1542 - size: 250, 391 - orig: 250, 391 - offset: 0, 0 - index: -1 -橙色阶_00009 - rotate: false - xy: 504, 1401 - size: 250, 391 - orig: 250, 391 - offset: 0, 0 - index: -1 -橙色阶_00010 - rotate: true - xy: 1159, 1542 - size: 250, 391 - orig: 250, 391 - offset: 0, 0 - index: -1 -橙色阶_00011 - rotate: true - xy: 1552, 1542 - size: 250, 391 - orig: 250, 391 - offset: 0, 0 - index: -1 -橙色阶_00012 - rotate: true - xy: 756, 1290 - size: 250, 391 - orig: 250, 391 - offset: 0, 0 - index: -1 -橙色阶_00013 - rotate: false - xy: 504, 1008 - size: 250, 391 - orig: 250, 391 - offset: 0, 0 - index: -1 -橙色阶_00014 - rotate: false - xy: 504, 615 - size: 250, 391 - orig: 250, 391 - offset: 0, 0 - index: -1 -祥云 - rotate: false - xy: 1512, 529 - size: 94, 48 - orig: 94, 48 - offset: 0, 0 - index: -1 -紫星星 - rotate: false - xy: 1552, 12 - size: 75, 105 - orig: 77, 107 - offset: 1, 1 - index: -1 -紫色阶 - rotate: true - xy: 1552, 119 - size: 201, 375 - orig: 201, 377 - offset: 0, 1 - index: -1 -紫色阶_00000 - rotate: false - xy: 504, 222 - size: 250, 391 - orig: 250, 391 - offset: 0, 0 - index: -1 -紫色阶_00001 - rotate: true - xy: 1149, 1290 - size: 250, 391 - orig: 250, 391 - offset: 0, 0 - index: -1 -紫色阶_00002 - rotate: true - xy: 1542, 1290 - size: 250, 391 - orig: 250, 391 - offset: 0, 0 - index: -1 -紫色阶_00003 - rotate: false - xy: 756, 897 - size: 250, 391 - orig: 250, 391 - offset: 0, 0 - index: -1 -紫色阶_00004 - rotate: false - xy: 756, 504 - size: 250, 391 - orig: 250, 391 - offset: 0, 0 - index: -1 -紫色阶_00005 - rotate: true - xy: 756, 252 - size: 250, 391 - orig: 250, 391 - offset: 0, 0 - index: -1 -紫色阶_00006 - rotate: true - xy: 766, 0 - size: 250, 391 - orig: 250, 391 - offset: 0, 0 - index: -1 -紫色阶_00007 - rotate: false - xy: 1008, 897 - size: 250, 391 - orig: 250, 391 - offset: 0, 0 - index: -1 -紫色阶_00008 - rotate: false - xy: 1008, 504 - size: 250, 391 - orig: 250, 391 - offset: 0, 0 - index: -1 -紫色阶_00009 - rotate: true - xy: 1149, 252 - size: 250, 391 - orig: 250, 391 - offset: 0, 0 - index: -1 -紫色阶_00010 - rotate: true - xy: 1159, 0 - size: 250, 391 - orig: 250, 391 - offset: 0, 0 - index: -1 -紫色阶_00011 - rotate: true - xy: 1542, 1038 - size: 250, 391 - orig: 250, 391 - offset: 0, 0 - index: -1 -紫色阶_00012 - rotate: false - xy: 1260, 897 - size: 250, 391 - orig: 250, 391 - offset: 0, 0 - index: -1 -紫色阶_00013 - rotate: true - xy: 1512, 786 - size: 250, 391 - orig: 250, 391 - offset: 0, 0 - index: -1 -紫色阶_00014 - rotate: false - xy: 1260, 504 - size: 250, 391 - orig: 250, 391 - offset: 0, 0 - index: -1 -绿色阶 - rotate: true - xy: 1542, 322 - size: 205, 378 - orig: 207, 380 - offset: 1, 1 - index: -1 -蓝色阶 - rotate: true - xy: 1512, 579 - size: 205, 379 - orig: 207, 381 - offset: 1, 1 - index: -1 -黄星星 - rotate: false - xy: 1629, 12 - size: 75, 105 - orig: 77, 107 - offset: 1, 1 - index: -1 diff --git a/assets/res/popBattle/SkillSelect/spine/选择框.atlas.meta b/assets/res/popBattle/SkillSelect/spine/选择框.atlas.meta deleted file mode 100644 index 3b1732f..0000000 --- a/assets/res/popBattle/SkillSelect/spine/选择框.atlas.meta +++ /dev/null @@ -1,12 +0,0 @@ -{ - "ver": "1.0.0", - "importer": "*", - "imported": true, - "uuid": "60bb1b87-8182-4df5-8fd2-84c12d34b624", - "files": [ - ".atlas", - ".json" - ], - "subMetas": {}, - "userData": {} -} diff --git a/assets/res/popBattle/SkillSelect/spine/选择框.json b/assets/res/popBattle/SkillSelect/spine/选择框.json deleted file mode 100644 index 348c156..0000000 --- a/assets/res/popBattle/SkillSelect/spine/选择框.json +++ /dev/null @@ -1 +0,0 @@ -{"skeleton":{"hash":"AkvXgwec2SVuuzqsfnqgJdLI5DY","spine":"3.8.75","x":-194.03,"y":-278.7,"width":383.28,"height":563.24},"bones":[{"name":"root"},{"name":"z","parent":"root"},{"name":"huang11","parent":"z","x":-69.1,"y":-156.55,"scaleX":0.3432,"scaleY":0.3432},{"name":"zi1","parent":"z","y":136.35},{"name":"zi2","parent":"z","y":-97.8},{"name":"guang","parent":"z","x":-2.39,"y":2.93,"scaleX":0.7666,"scaleY":0.7203},{"name":"guang2","parent":"z","x":-2.39,"y":2.93,"scaleX":0.7666,"scaleY":0.7203},{"name":"huang10","parent":"z","x":56,"y":-161.5,"scaleX":0.397,"scaleY":0.397},{"name":"huang","parent":"z","x":-99.69,"y":-60.72,"scaleX":0.397,"scaleY":0.397},{"name":"huang2","parent":"z","x":99.83,"y":-11.46,"scaleX":0.397,"scaleY":0.397},{"name":"huang3","parent":"z","x":-107.89,"y":24.64,"scaleX":0.397,"scaleY":0.397},{"name":"huang4","parent":"z","x":-76.51,"y":91.36,"scaleX":0.397,"scaleY":0.397},{"name":"huang5","parent":"z","x":-49.05,"y":174.25,"scaleX":0.397,"scaleY":0.397},{"name":"huang6","parent":"z","x":-9.55,"y":196.17,"scaleX":0.397,"scaleY":0.397},{"name":"huang7","parent":"z","x":51.91,"y":168.76,"scaleX":0.3432,"scaleY":0.3432},{"name":"huang8","parent":"z","x":-88.18,"y":-99.99,"scaleX":0.3432,"scaleY":0.3432},{"name":"huang9","parent":"z","x":35.31,"y":-142.34,"scaleX":0.397,"scaleY":0.397},{"name":"huang12","parent":"z","x":96.5,"y":-94.97,"scaleX":0.397,"scaleY":0.397},{"name":"huang13","parent":"z","x":92.18,"y":58.08,"scaleX":0.5222,"scaleY":0.5222},{"name":"huang14","parent":"z","x":85.46,"y":106.95,"scaleX":0.3098,"scaleY":0.3098},{"name":"huang15","parent":"z","x":-22.01,"y":-168.36,"scaleX":0.397,"scaleY":0.397},{"name":"祥云","parent":"root","length":29.74,"rotation":180,"x":-75.57,"y":55.69}],"slots":[{"name":"橙色阶_00000","bone":"guang","attachment":"橙色阶_00014","blend":"additive"},{"name":"橙色阶_0","bone":"guang2","attachment":"橙色阶_00014","blend":"additive"},{"name":"黄星星","bone":"huang11","attachment":"黄星星"},{"name":"黄星星10","bone":"huang8","attachment":"黄星星"},{"name":"黄星星9","bone":"huang7","attachment":"黄星星"},{"name":"黄星星8","bone":"huang6","attachment":"黄星星"},{"name":"黄星星7","bone":"huang5","attachment":"黄星星"},{"name":"黄星星6","bone":"huang4","attachment":"黄星星"},{"name":"黄星星5","bone":"huang3","attachment":"黄星星"},{"name":"黄星星4","bone":"huang2","attachment":"黄星星"},{"name":"黄星星13","bone":"huang13","attachment":"黄星星"},{"name":"黄星星14","bone":"huang14","attachment":"黄星星"},{"name":"黄星星3","bone":"huang","attachment":"黄星星"},{"name":"黄星星11","bone":"huang9","attachment":"黄星星"},{"name":"黄星星12","bone":"huang12","attachment":"黄星星"},{"name":"黄星星2","bone":"huang10","attachment":"黄星星"},{"name":"黄星星15","bone":"huang15","attachment":"黄星星"},{"name":"橙色阶","bone":"z","attachment":"橙色阶"},{"name":"橙色阶2","bone":"z"},{"name":"祥云","bone":"祥云","attachment":"祥云"}],"skins":[{"name":"default","attachments":{"橙色阶2":{"bai":{"width":207,"height":383}}}},{"name":"紫","attachments":{"黄星星10":{"黄星星":{"name":"紫星星","width":77,"height":107}},"黄星星11":{"黄星星":{"name":"紫星星","width":77,"height":107}},"黄星星12":{"黄星星":{"name":"紫星星","width":77,"height":107}},"黄星星13":{"黄星星":{"name":"紫星星","width":77,"height":107}},"黄星星14":{"黄星星":{"name":"紫星星","width":77,"height":107}},"黄星星15":{"黄星星":{"name":"紫星星","width":77,"height":107}},"橙色阶_00000":{"橙色阶_00000":{"name":"紫色阶_00000","type":"mesh","uvs":[1,1,0,1,0,0,1,0],"triangles":[1,2,3,1,3,0],"vertices":[250,-391,-250,-391,-250,391,250,391],"hull":4},"橙色阶_00001":{"name":"紫色阶_00001","type":"mesh","uvs":[1,1,0,1,0,0,1,0],"triangles":[1,2,3,1,3,0],"vertices":[250,-391,-250,-391,-250,391,250,391],"hull":4},"橙色阶_00002":{"name":"紫色阶_00002","type":"mesh","uvs":[1,1,0,1,0,0,1,0],"triangles":[1,2,3,1,3,0],"vertices":[250,-391,-250,-391,-250,391,250,391],"hull":4},"橙色阶_00003":{"name":"紫色阶_00003","type":"mesh","uvs":[1,1,0,1,0,0,1,0],"triangles":[1,2,3,1,3,0],"vertices":[250,-391,-250,-391,-250,391,250,391],"hull":4},"橙色阶_00004":{"name":"紫色阶_00004","type":"mesh","uvs":[1,1,0,1,0,0,1,0],"triangles":[1,2,3,1,3,0],"vertices":[250,-391,-250,-391,-250,391,250,391],"hull":4},"橙色阶_00005":{"name":"紫色阶_00005","type":"mesh","uvs":[1,1,0,1,0,0,1,0],"triangles":[1,2,3,1,3,0],"vertices":[250,-391,-250,-391,-250,391,250,391],"hull":4},"橙色阶_00006":{"name":"紫色阶_00006","type":"mesh","uvs":[1,1,0,1,0,0,1,0],"triangles":[1,2,3,1,3,0],"vertices":[250,-391,-250,-391,-250,391,250,391],"hull":4},"橙色阶_00007":{"name":"紫色阶_00007","type":"mesh","uvs":[1,1,0,1,0,0,1,0],"triangles":[1,2,3,1,3,0],"vertices":[250,-391,-250,-391,-250,391,250,391],"hull":4},"橙色阶_00008":{"name":"紫色阶_00008","type":"mesh","uvs":[1,1,0,1,0,0,1,0],"triangles":[1,2,3,1,3,0],"vertices":[250,-391,-250,-391,-250,391,250,391],"hull":4},"橙色阶_00009":{"name":"紫色阶_00009","type":"mesh","uvs":[1,1,0,1,0,0,1,0],"triangles":[1,2,3,1,3,0],"vertices":[250,-391,-250,-391,-250,391,250,391],"hull":4},"橙色阶_00010":{"name":"紫色阶_00010","type":"mesh","uvs":[1,1,0,1,0,0,1,0],"triangles":[1,2,3,1,3,0],"vertices":[250,-391,-250,-391,-250,391,250,391],"hull":4},"橙色阶_00011":{"name":"紫色阶_00011","type":"mesh","uvs":[1,1,0,1,0,0,1,0],"triangles":[1,2,3,1,3,0],"vertices":[250,-391,-250,-391,-250,391,250,391],"hull":4},"橙色阶_00012":{"name":"紫色阶_00012","type":"mesh","uvs":[1,1,0,1,0,0,1,0],"triangles":[1,2,3,1,3,0],"vertices":[250,-391,-250,-391,-250,391,250,391],"hull":4},"橙色阶_00013":{"name":"紫色阶_00013","type":"mesh","uvs":[1,1,0,1,0,0,1,0],"triangles":[1,2,3,1,3,0],"vertices":[250,-391,-250,-391,-250,391,250,391],"hull":4},"橙色阶_00014":{"name":"紫色阶_00014","type":"mesh","uvs":[1,1,0,1,0,0,1,0],"triangles":[1,2,3,1,3,0],"vertices":[250,-391,-250,-391,-250,391,250,391],"hull":4}},"黄星星3":{"黄星星":{"name":"紫星星","width":77,"height":107}},"黄星星4":{"黄星星":{"name":"紫星星","width":77,"height":107}},"黄星星5":{"黄星星":{"name":"紫星星","width":77,"height":107}},"黄星星6":{"黄星星":{"name":"紫星星","width":77,"height":107}},"黄星星7":{"黄星星":{"name":"紫星星","width":77,"height":107}},"橙色阶_0":{"橙色阶_00000":{"name":"紫色阶_00000","type":"mesh","uvs":[1,1,0,1,0,0,1,0],"triangles":[1,2,3,1,3,0],"vertices":[250,-391,-250,-391,-250,391,250,391],"hull":4},"橙色阶_00001":{"name":"紫色阶_00001","type":"mesh","uvs":[1,1,0,1,0,0,1,0],"triangles":[1,2,3,1,3,0],"vertices":[250,-391,-250,-391,-250,391,250,391],"hull":4},"橙色阶_00002":{"name":"紫色阶_00002","type":"mesh","uvs":[1,1,0,1,0,0,1,0],"triangles":[1,2,3,1,3,0],"vertices":[250,-391,-250,-391,-250,391,250,391],"hull":4},"橙色阶_00003":{"name":"紫色阶_00003","type":"mesh","uvs":[1,1,0,1,0,0,1,0],"triangles":[1,2,3,1,3,0],"vertices":[250,-391,-250,-391,-250,391,250,391],"hull":4},"橙色阶_00004":{"name":"紫色阶_00004","type":"mesh","uvs":[1,1,0,1,0,0,1,0],"triangles":[1,2,3,1,3,0],"vertices":[250,-391,-250,-391,-250,391,250,391],"hull":4},"橙色阶_00005":{"name":"紫色阶_00005","type":"mesh","uvs":[1,1,0,1,0,0,1,0],"triangles":[1,2,3,1,3,0],"vertices":[250,-391,-250,-391,-250,391,250,391],"hull":4},"橙色阶_00006":{"name":"紫色阶_00006","type":"mesh","uvs":[1,1,0,1,0,0,1,0],"triangles":[1,2,3,1,3,0],"vertices":[250,-391,-250,-391,-250,391,250,391],"hull":4},"橙色阶_00007":{"name":"紫色阶_00007","type":"mesh","uvs":[1,1,0,1,0,0,1,0],"triangles":[1,2,3,1,3,0],"vertices":[250,-391,-250,-391,-250,391,250,391],"hull":4},"橙色阶_00008":{"name":"紫色阶_00008","type":"mesh","uvs":[1,1,0,1,0,0,1,0],"triangles":[1,2,3,1,3,0],"vertices":[250,-391,-250,-391,-250,391,250,391],"hull":4},"橙色阶_00009":{"name":"紫色阶_00009","type":"mesh","uvs":[1,1,0,1,0,0,1,0],"triangles":[1,2,3,1,3,0],"vertices":[250,-391,-250,-391,-250,391,250,391],"hull":4},"橙色阶_00010":{"name":"紫色阶_00010","type":"mesh","uvs":[1,1,0,1,0,0,1,0],"triangles":[1,2,3,1,3,0],"vertices":[250,-391,-250,-391,-250,391,250,391],"hull":4},"橙色阶_00011":{"name":"紫色阶_00011","type":"mesh","uvs":[1,1,0,1,0,0,1,0],"triangles":[1,2,3,1,3,0],"vertices":[250,-391,-250,-391,-250,391,250,391],"hull":4},"橙色阶_00012":{"name":"紫色阶_00012","type":"mesh","uvs":[1,1,0,1,0,0,1,0],"triangles":[1,2,3,1,3,0],"vertices":[250,-391,-250,-391,-250,391,250,391],"hull":4},"橙色阶_00013":{"name":"紫色阶_00013","type":"mesh","uvs":[1,1,0,1,0,0,1,0],"triangles":[1,2,3,1,3,0],"vertices":[250,-391,-250,-391,-250,391,250,391],"hull":4},"橙色阶_00014":{"name":"紫色阶_00014","type":"mesh","uvs":[1,1,0,1,0,0,1,0],"triangles":[1,2,3,1,3,0],"vertices":[250,-391,-250,-391,-250,391,250,391],"hull":4}},"黄星星9":{"黄星星":{"name":"紫星星","width":77,"height":107}},"橙色阶":{"橙色阶":{"name":"紫色阶","x":-0.5,"y":0.02,"width":201,"height":377}},"黄星星":{"黄星星":{"name":"紫星星","width":77,"height":107}},"黄星星8":{"黄星星":{"name":"紫星星","width":77,"height":107}},"黄星星2":{"黄星星":{"name":"紫星星","width":77,"height":107}}}},{"name":"绿","attachments":{"橙色阶":{"橙色阶":{"name":"绿色阶","width":207,"height":380}}}},{"name":"蓝","attachments":{"橙色阶":{"橙色阶":{"name":"蓝色阶","width":207,"height":381}}}},{"name":"黄","attachments":{"黄星星10":{"黄星星":{"width":77,"height":107}},"黄星星11":{"黄星星":{"width":77,"height":107}},"黄星星12":{"黄星星":{"width":77,"height":107}},"黄星星13":{"黄星星":{"width":77,"height":107}},"黄星星14":{"黄星星":{"width":77,"height":107}},"黄星星15":{"黄星星":{"width":77,"height":107}},"祥云":{"祥云":{"x":-6.86,"y":-5.72,"rotation":180,"width":94,"height":48}},"橙色阶_00000":{"橙色阶_00000":{"type":"mesh","uvs":[1,1,0,1,0,0,1,0],"triangles":[1,2,3,1,3,0],"vertices":[250,-391,-250,-391,-250,391,250,391],"hull":4},"橙色阶_00001":{"type":"mesh","uvs":[1,1,0,1,0,0,1,0],"triangles":[1,2,3,1,3,0],"vertices":[250,-391,-250,-391,-250,391,250,391],"hull":4},"橙色阶_00002":{"type":"mesh","uvs":[1,1,0,1,0,0,1,0],"triangles":[1,2,3,1,3,0],"vertices":[250,-391,-250,-391,-250,391,250,391],"hull":4},"橙色阶_00003":{"type":"mesh","uvs":[1,1,0,1,0,0,1,0],"triangles":[1,2,3,1,3,0],"vertices":[250,-391,-250,-391,-250,391,250,391],"hull":4},"橙色阶_00004":{"type":"mesh","uvs":[1,1,0,1,0,0,1,0],"triangles":[1,2,3,1,3,0],"vertices":[250,-391,-250,-391,-250,391,250,391],"hull":4},"橙色阶_00005":{"type":"mesh","uvs":[1,1,0,1,0,0,1,0],"triangles":[1,2,3,1,3,0],"vertices":[250,-391,-250,-391,-250,391,250,391],"hull":4},"橙色阶_00006":{"type":"mesh","uvs":[1,1,0,1,0,0,1,0],"triangles":[1,2,3,1,3,0],"vertices":[250,-391,-250,-391,-250,391,250,391],"hull":4},"橙色阶_00007":{"type":"mesh","uvs":[1,1,0,1,0,0,1,0],"triangles":[1,2,3,1,3,0],"vertices":[250,-391,-250,-391,-250,391,250,391],"hull":4},"橙色阶_00008":{"type":"mesh","uvs":[1,1,0,1,0,0,1,0],"triangles":[1,2,3,1,3,0],"vertices":[250,-391,-250,-391,-250,391,250,391],"hull":4},"橙色阶_00009":{"type":"mesh","uvs":[1,1,0,1,0,0,1,0],"triangles":[1,2,3,1,3,0],"vertices":[250,-391,-250,-391,-250,391,250,391],"hull":4},"橙色阶_00010":{"type":"mesh","uvs":[1,1,0,1,0,0,1,0],"triangles":[1,2,3,1,3,0],"vertices":[250,-391,-250,-391,-250,391,250,391],"hull":4},"橙色阶_00011":{"type":"mesh","uvs":[1,1,0,1,0,0,1,0],"triangles":[1,2,3,1,3,0],"vertices":[250,-391,-250,-391,-250,391,250,391],"hull":4},"橙色阶_00012":{"type":"mesh","uvs":[1,1,0,1,0,0,1,0],"triangles":[1,2,3,1,3,0],"vertices":[250,-391,-250,-391,-250,391,250,391],"hull":4},"橙色阶_00013":{"type":"mesh","uvs":[1,1,0,1,0,0,1,0],"triangles":[1,2,3,1,3,0],"vertices":[250,-391,-250,-391,-250,391,250,391],"hull":4},"橙色阶_00014":{"type":"mesh","uvs":[1,1,0,1,0,0,1,0],"triangles":[1,2,3,1,3,0],"vertices":[250,-391,-250,-391,-250,391,250,391],"hull":4}},"黄星星3":{"黄星星":{"width":77,"height":107}},"黄星星4":{"黄星星":{"width":77,"height":107}},"黄星星5":{"黄星星":{"width":77,"height":107}},"黄星星6":{"黄星星":{"width":77,"height":107}},"黄星星7":{"黄星星":{"width":77,"height":107}},"橙色阶_0":{"橙色阶_00000":{"type":"mesh","uvs":[1,1,0,1,0,0,1,0],"triangles":[1,2,3,1,3,0],"vertices":[250,-391,-250,-391,-250,391,250,391],"hull":4},"橙色阶_00001":{"type":"mesh","uvs":[1,1,0,1,0,0,1,0],"triangles":[1,2,3,1,3,0],"vertices":[250,-391,-250,-391,-250,391,250,391],"hull":4},"橙色阶_00002":{"type":"mesh","uvs":[1,1,0,1,0,0,1,0],"triangles":[1,2,3,1,3,0],"vertices":[250,-391,-250,-391,-250,391,250,391],"hull":4},"橙色阶_00003":{"type":"mesh","uvs":[1,1,0,1,0,0,1,0],"triangles":[1,2,3,1,3,0],"vertices":[250,-391,-250,-391,-250,391,250,391],"hull":4},"橙色阶_00004":{"type":"mesh","uvs":[1,1,0,1,0,0,1,0],"triangles":[1,2,3,1,3,0],"vertices":[250,-391,-250,-391,-250,391,250,391],"hull":4},"橙色阶_00005":{"type":"mesh","uvs":[1,1,0,1,0,0,1,0],"triangles":[1,2,3,1,3,0],"vertices":[250,-391,-250,-391,-250,391,250,391],"hull":4},"橙色阶_00006":{"type":"mesh","uvs":[1,1,0,1,0,0,1,0],"triangles":[1,2,3,1,3,0],"vertices":[250,-391,-250,-391,-250,391,250,391],"hull":4},"橙色阶_00007":{"type":"mesh","uvs":[1,1,0,1,0,0,1,0],"triangles":[1,2,3,1,3,0],"vertices":[250,-391,-250,-391,-250,391,250,391],"hull":4},"橙色阶_00008":{"type":"mesh","uvs":[1,1,0,1,0,0,1,0],"triangles":[1,2,3,1,3,0],"vertices":[250,-391,-250,-391,-250,391,250,391],"hull":4},"橙色阶_00009":{"type":"mesh","uvs":[1,1,0,1,0,0,1,0],"triangles":[1,2,3,1,3,0],"vertices":[250,-391,-250,-391,-250,391,250,391],"hull":4},"橙色阶_00010":{"type":"mesh","uvs":[1,1,0,1,0,0,1,0],"triangles":[1,2,3,1,3,0],"vertices":[250,-391,-250,-391,-250,391,250,391],"hull":4},"橙色阶_00011":{"type":"mesh","uvs":[1,1,0,1,0,0,1,0],"triangles":[1,2,3,1,3,0],"vertices":[250,-391,-250,-391,-250,391,250,391],"hull":4},"橙色阶_00012":{"type":"mesh","uvs":[1,1,0,1,0,0,1,0],"triangles":[1,2,3,1,3,0],"vertices":[250,-391,-250,-391,-250,391,250,391],"hull":4},"橙色阶_00013":{"type":"mesh","uvs":[1,1,0,1,0,0,1,0],"triangles":[1,2,3,1,3,0],"vertices":[250,-391,-250,-391,-250,391,250,391],"hull":4},"橙色阶_00014":{"type":"mesh","uvs":[1,1,0,1,0,0,1,0],"triangles":[1,2,3,1,3,0],"vertices":[250,-391,-250,-391,-250,391,250,391],"hull":4}},"黄星星9":{"黄星星":{"width":77,"height":107}},"橙色阶":{"橙色阶":{"width":207,"height":383}},"黄星星":{"黄星星":{"width":77,"height":107}},"黄星星8":{"黄星星":{"width":77,"height":107}},"黄星星2":{"黄星星":{"width":77,"height":107}}}}],"animations":{"idle":{"slots":{"橙色阶_0":{"color":[{"color":"ffffffea"},{"time":0.0667,"color":"ffffffff"},{"time":0.9,"color":"ffffff00"},{"time":1.6667,"color":"ffffffea"}],"attachment":[{"name":"橙色阶_00007"},{"time":0.1333,"name":"橙色阶_00008"},{"time":0.2333,"name":"橙色阶_00009"},{"time":0.3333,"name":"橙色阶_00010"},{"time":0.4667,"name":"橙色阶_00011"},{"time":0.5667,"name":"橙色阶_00012"},{"time":0.6667,"name":"橙色阶_00013"},{"time":0.8,"name":"橙色阶_00014"},{"time":0.9,"name":"橙色阶_00000"},{"time":1,"name":"橙色阶_00001"},{"time":1.1333,"name":"橙色阶_00002"},{"time":1.2333,"name":"橙色阶_00003"},{"time":1.3333,"name":"橙色阶_00004"},{"time":1.4667,"name":"橙色阶_00005"},{"time":1.5667,"name":"橙色阶_00006"}]},"橙色阶_00000":{"color":[{"color":"ffffff00"},{"time":0.8333,"color":"ffffffff"},{"time":1.6667,"color":"ffffff00"}],"attachment":[{"name":"橙色阶_00000"},{"time":0.1,"name":"橙色阶_00001"},{"time":0.2333,"name":"橙色阶_00002"},{"time":0.3333,"name":"橙色阶_00003"},{"time":0.4333,"name":"橙色阶_00004"},{"time":0.5667,"name":"橙色阶_00005"},{"time":0.6667,"name":"橙色阶_00006"},{"time":0.7667,"name":"橙色阶_00007"},{"time":0.9,"name":"橙色阶_00008"},{"time":1,"name":"橙色阶_00009"},{"time":1.1,"name":"橙色阶_00010"},{"time":1.2333,"name":"橙色阶_00011"},{"time":1.3333,"name":"橙色阶_00012"},{"time":1.4333,"name":"橙色阶_00013"},{"time":1.5667,"name":"橙色阶_00014"},{"time":1.6667,"name":"橙色阶_00000"}]}},"bones":{"huang9":{"translate":[{"x":-25.9,"y":-0.76},{"time":0.4667,"x":-3.83,"y":-11.46},{"time":0.7667,"x":10.36,"y":-18.33,"curve":"stepped"},{"time":0.8,"x":-27.47},{"time":1.6,"x":10.36,"y":-18.33,"curve":"stepped"},{"time":1.6333,"x":-27.47},{"time":1.6667,"x":-25.9,"y":-0.76}],"scale":[{"x":0.083,"y":0.083},{"time":0.3667},{"time":0.4667,"x":0.75,"y":0.75},{"time":0.7667,"x":0,"y":0,"curve":"stepped"},{"time":0.8,"x":0,"y":0},{"time":1.2},{"time":1.6,"x":0,"y":0,"curve":"stepped"},{"time":1.6333,"x":0,"y":0},{"time":1.6667,"x":0.083,"y":0.083}]},"huang10":{"translate":[{"x":9.59,"y":-14.79},{"time":0.1667,"x":18.32,"y":-23.23,"curve":"stepped"},{"time":0.2,"x":-23.55,"y":17.27},{"time":1,"x":4.78,"y":-15.94,"curve":"stepped"},{"time":1.0333,"x":-23.55,"y":17.27},{"time":1.6667,"x":9.59,"y":-14.79}],"scale":[{"x":0.417,"y":0.417},{"time":0.1667,"x":0,"y":0,"curve":"stepped"},{"time":0.2,"x":0,"y":0},{"time":0.6},{"time":1,"x":0,"y":0,"curve":"stepped"},{"time":1.0333,"x":0,"y":0},{"time":1.4333},{"time":1.6667,"x":0.417,"y":0.417}]},"huang11":{"translate":[{"x":-0.31,"y":9.95},{"time":0.4333,"x":-1.59,"y":-7.97,"curve":"stepped"},{"time":0.4667,"x":0.79,"y":25.12},{"time":1.0667,"x":-12.71,"y":-4.38},{"time":1.2667,"x":-17.21,"y":-14.22,"curve":"stepped"},{"time":1.3,"x":0.79,"y":25.12},{"time":1.6667,"x":-0.31,"y":9.95}],"scale":[{"x":0.917,"y":0.917},{"time":0.0333},{"time":0.4333,"x":0,"y":0,"curve":"stepped"},{"time":0.4667,"x":0,"y":0},{"time":0.8667},{"time":1.0667,"x":0.5,"y":0.5},{"time":1.2667,"x":0,"y":0,"curve":"stepped"},{"time":1.3,"x":0,"y":0},{"time":1.6667,"x":0.917,"y":0.917}]},"huang8":{"translate":[{"x":-24.81,"y":-26.16,"curve":"stepped"},{"time":0.0333,"x":19.17,"y":6.97},{"time":0.4667,"x":2.42,"y":1.65},{"time":0.8333,"x":-11.76,"y":-2.86,"curve":"stepped"},{"time":0.8667,"x":19.17,"y":6.97},{"time":1.6667,"x":-24.81,"y":-26.16}],"scale":[{"x":0,"y":0,"curve":"stepped"},{"time":0.0333,"x":0,"y":0},{"time":0.4333},{"time":0.4667,"x":0.917,"y":0.917},{"time":0.8333,"x":0,"y":0,"curve":"stepped"},{"time":0.8667,"x":0,"y":0},{"time":1.2667},{"time":1.6667,"x":0,"y":0}]},"huang":{"translate":[{"x":15.91,"y":5.3},{"time":0.4667,"x":-16.86,"y":12.49},{"time":0.5667,"x":-23.88,"y":14.03,"curve":"stepped"},{"time":0.6,"x":32.3,"y":1.7},{"time":1.4,"x":-22.95,"y":-10.2,"curve":"stepped"},{"time":1.4333,"x":32.3,"y":1.7},{"time":1.6667,"x":15.91,"y":5.3}],"scale":[{"x":0.583,"y":0.583},{"time":0.1667},{"time":0.4667,"x":0.25,"y":0.25},{"time":0.5667,"x":0,"y":0,"curve":"stepped"},{"time":0.6,"x":0,"y":0},{"time":1},{"time":1.4,"x":0,"y":0,"curve":"stepped"},{"time":1.4333,"x":0,"y":0},{"time":1.6667,"x":0.583,"y":0.583}]},"huang3":{"translate":[{"x":0.38,"y":11.8},{"time":0.2333,"x":-9.32,"y":15.84,"curve":"stepped"},{"time":0.2667,"x":23.94,"y":1.99},{"time":1.0667,"curve":"stepped"},{"time":1.1,"x":23.94,"y":1.99},{"time":1.6667,"x":0.38,"y":11.8}],"scale":[{"x":0.583,"y":0.583},{"time":0.2333,"x":0,"y":0,"curve":"stepped"},{"time":0.2667,"x":0,"y":0},{"time":0.6667},{"time":1.0667,"x":0,"y":0,"curve":"stepped"},{"time":1.1,"x":0,"y":0},{"time":1.5},{"time":1.6667,"x":0.583,"y":0.583}]},"huang4":{"translate":[{"x":-15.08,"y":23.25},{"time":0.0333,"x":-16.78,"y":24.23,"curve":"stepped"},{"time":0.0667,"x":23.94,"y":0.66},{"time":0.8667,"curve":"stepped"},{"time":0.9,"x":23.94,"y":0.66},{"time":1.6667,"x":-15.08,"y":23.25}],"scale":[{"x":0.083,"y":0.083},{"time":0.0333,"x":0,"y":0,"curve":"stepped"},{"time":0.0667,"x":0,"y":0},{"time":0.4667},{"time":0.8667,"x":0,"y":0,"curve":"stepped"},{"time":0.9,"x":0,"y":0},{"time":1.3},{"time":1.6667,"x":0.083,"y":0.083}]},"huang5":{"translate":[{"x":-7.78,"y":-20.45},{"time":0.5333,"x":-36.74,"y":14.87,"curve":"stepped"},{"time":0.5667,"x":6.69,"y":-38.11},{"time":1.3667,"x":-16.27,"y":21.7,"curve":"stepped"},{"time":1.4,"x":6.69,"y":-38.11},{"time":1.6667,"x":-7.78,"y":-20.45}],"scale":[{"x":0.667,"y":0.667},{"time":0.1333},{"time":0.5333,"x":0,"y":0,"curve":"stepped"},{"time":0.5667,"x":0,"y":0},{"time":0.9667},{"time":1.3667,"x":0,"y":0,"curve":"stepped"},{"time":1.4,"x":0,"y":0},{"time":1.6667,"x":0.667,"y":0.667}]},"huang6":{"translate":[{"x":18.56,"y":-10.76},{"time":0.3,"x":22.43,"y":8.74,"curve":"stepped"},{"time":0.3333,"x":2.59,"y":-46.71},{"time":1.1333,"x":2.81,"y":7.03,"curve":"stepped"},{"time":1.1667,"x":12.11,"y":-43.25},{"time":1.6667,"x":18.56,"y":-10.76}],"scale":[{"x":0.75,"y":0.75},{"time":0.3,"x":0,"y":0,"curve":"stepped"},{"time":0.3333,"x":0,"y":0},{"time":0.7333},{"time":1.1333,"x":0,"y":0,"curve":"stepped"},{"time":1.1667,"x":0,"y":0},{"time":1.5667},{"time":1.6667,"x":0.75,"y":0.75}]},"huang7":{"translate":[{"x":-32.44,"y":-36.56},{"time":0.8,"x":10.17,"y":5.42,"curve":"stepped"},{"time":0.8333,"x":-32.44,"y":-36.56},{"time":1.6333,"x":24.67,"y":-3.96,"curve":"stepped"},{"time":1.6667,"x":-32.44,"y":-36.56}],"scale":[{"x":0,"y":0},{"time":0.4},{"time":0.8,"x":0,"y":0,"curve":"stepped"},{"time":0.8333,"x":0,"y":0},{"time":1.2333},{"time":1.6333,"x":0,"y":0}]},"huang2":{"translate":[{"x":6.52,"y":29.82},{"time":0.0333,"x":8.11,"y":31,"curve":"stepped"},{"time":0.0667,"x":-29.99,"y":2.61},{"time":0.8667,"x":13.23,"y":8.82,"curve":"stepped"},{"time":0.9,"x":-29.99,"y":2.61},{"time":1.6667,"x":6.52,"y":29.82}],"scale":[{"x":0.083,"y":0.083},{"time":0.0333,"x":0,"y":0,"curve":"stepped"},{"time":0.0667,"x":0,"y":0},{"time":0.4667},{"time":0.8667,"x":0,"y":0,"curve":"stepped"},{"time":0.9,"x":0,"y":0},{"time":1.3},{"time":1.6667,"x":0.083,"y":0.083}]},"huang12":{"translate":[{"x":-3.83,"y":-11.46},{"time":0.3,"x":10.36,"y":-18.33,"curve":"stepped"},{"time":0.3333,"x":-27.47},{"time":1.1333,"x":10.36,"y":-18.33,"curve":"stepped"},{"time":1.1667,"x":-27.47},{"time":1.6667,"x":-3.83,"y":-11.46}],"scale":[{"x":0.75,"y":0.75},{"time":0.3,"x":0,"y":0,"curve":"stepped"},{"time":0.3333,"x":0,"y":0},{"time":0.7333},{"time":1.1333,"x":0,"y":0,"curve":"stepped"},{"time":1.1667,"x":0,"y":0},{"time":1.5667},{"time":1.6667,"x":0.75,"y":0.75}]},"huang13":{"translate":[{"x":-18.88,"y":10.89},{"time":0.5333,"x":6.52,"y":29.82},{"time":0.5667,"x":8.11,"y":31,"curve":"stepped"},{"time":0.6,"x":-29.99,"y":2.61},{"time":1.4,"x":13.23,"y":8.82,"curve":"stepped"},{"time":1.4333,"x":-29.99,"y":2.61},{"time":1.6667,"x":-18.88,"y":10.89}],"scale":[{"x":0.583,"y":0.583},{"time":0.1667},{"time":0.5333,"x":0.083,"y":0.083},{"time":0.5667,"x":0,"y":0,"curve":"stepped"},{"time":0.6,"x":0,"y":0},{"time":1},{"time":1.4,"x":0,"y":0,"curve":"stepped"},{"time":1.4333,"x":0,"y":0},{"time":1.6667,"x":0.583,"y":0.583}]},"huang14":{"translate":[{"x":6.52,"y":29.82},{"time":0.0333,"x":8.11,"y":31,"curve":"stepped"},{"time":0.0667,"x":-29.99,"y":2.61},{"time":0.8667,"x":13.23,"y":8.82,"curve":"stepped"},{"time":0.9,"x":-29.99,"y":2.61},{"time":1.6667,"x":6.52,"y":29.82}],"scale":[{"x":0.083,"y":0.083},{"time":0.0333,"x":0,"y":0,"curve":"stepped"},{"time":0.0667,"x":0,"y":0},{"time":0.4667},{"time":0.8667,"x":0,"y":0,"curve":"stepped"},{"time":0.9,"x":0,"y":0},{"time":1.3},{"time":1.6667,"x":0.083,"y":0.083}]},"huang15":{"translate":[{"x":-20.06,"y":13.9},{"time":0.5667,"x":9.59,"y":-14.79},{"time":0.7333,"x":18.32,"y":-23.23,"curve":"stepped"},{"time":0.7667,"x":-23.55,"y":17.27},{"time":1.5667,"x":-4.21,"y":-42.91,"curve":"stepped"},{"time":1.6,"x":-23.55,"y":17.27},{"time":1.6667,"x":-20.06,"y":13.9}],"scale":[{"x":0.167,"y":0.167},{"time":0.3333},{"time":0.5667,"x":0.417,"y":0.417},{"time":0.7333,"x":0,"y":0,"curve":"stepped"},{"time":0.7667,"x":0,"y":0},{"time":1.1667},{"time":1.5667,"x":0,"y":0,"curve":"stepped"},{"time":1.6,"x":0,"y":0},{"time":1.6667,"x":0.167,"y":0.167}]},"祥云":{"translate":[{"curve":0.25,"c3":0.75},{"time":0.8333,"x":-7.23,"y":-1.81,"curve":0.25,"c3":0.75},{"time":1.6667}],"scale":[{"curve":0.25,"c3":0.75},{"time":0.8333,"x":1.045,"y":1.045,"curve":0.25,"c3":0.75},{"time":1.6667}]}}},"play":{"slots":{"橙色阶_0":{"color":[{"color":"ffffffea"},{"time":0.0667,"color":"ffffffff"},{"time":0.9,"color":"ffffff00"},{"time":1.6667,"color":"ffffffea"}],"attachment":[{"name":null},{"time":0.0333,"name":"橙色阶_00007"},{"time":0.1333,"name":"橙色阶_00008"},{"time":0.2333,"name":"橙色阶_00009"},{"time":0.3333,"name":"橙色阶_00010"},{"time":0.4667,"name":"橙色阶_00011"},{"time":0.5667,"name":"橙色阶_00012"},{"time":0.6667,"name":"橙色阶_00013"},{"time":0.8,"name":"橙色阶_00014"},{"time":0.9,"name":"橙色阶_00000"},{"time":1,"name":"橙色阶_00001"},{"time":1.1333,"name":"橙色阶_00002"},{"time":1.2333,"name":"橙色阶_00003"},{"time":1.3333,"name":"橙色阶_00004"},{"time":1.4667,"name":"橙色阶_00005"},{"time":1.5667,"name":"橙色阶_00006"}]},"黄星星3":{"attachment":[{"name":null},{"time":0.0333,"name":"黄星星"}]},"黄星星7":{"attachment":[{"name":null},{"time":0.0333,"name":"黄星星"}]},"黄星星15":{"attachment":[{"name":null},{"time":0.0333,"name":"黄星星"}]},"祥云":{"color":[{"color":"ffffff00"},{"time":0.3,"color":"ffffffff"}]},"橙色阶_00000":{"color":[{"color":"ffffff00"},{"time":0.8333,"color":"ffffffff"},{"time":1.6667,"color":"ffffff00"}],"attachment":[{"name":null},{"time":0.0333,"name":"橙色阶_00000"},{"time":0.1,"name":"橙色阶_00001"},{"time":0.2333,"name":"橙色阶_00002"},{"time":0.3333,"name":"橙色阶_00003"},{"time":0.4333,"name":"橙色阶_00004"},{"time":0.5667,"name":"橙色阶_00005"},{"time":0.6667,"name":"橙色阶_00006"},{"time":0.7667,"name":"橙色阶_00007"},{"time":0.9,"name":"橙色阶_00008"},{"time":1,"name":"橙色阶_00009"},{"time":1.1,"name":"橙色阶_00010"},{"time":1.2333,"name":"橙色阶_00011"},{"time":1.3333,"name":"橙色阶_00012"},{"time":1.4333,"name":"橙色阶_00013"},{"time":1.5667,"name":"橙色阶_00014"},{"time":1.6667,"name":"橙色阶_00000"}]},"黄星星14":{"attachment":[{"name":null},{"time":0.0333,"name":"黄星星"}]},"黄星星11":{"attachment":[{"name":null},{"time":0.0333,"name":"黄星星"}]},"黄星星8":{"attachment":[{"name":null},{"time":0.0333,"name":"黄星星"}]},"黄星星4":{"attachment":[{"name":null},{"time":0.0333,"name":"黄星星"}]},"黄星星2":{"attachment":[{"name":null},{"time":0.0333,"name":"黄星星"}]},"黄星星6":{"attachment":[{"name":null},{"time":0.0333,"name":"黄星星"}]},"黄星星5":{"attachment":[{"name":null},{"time":0.0333,"name":"黄星星"}]},"橙色阶2":{"color":[{"color":"ffffff00","curve":0.25,"c3":0.75},{"time":0.2,"color":"ffffffff","curve":"stepped"},{"time":0.2667,"color":"ffffffff","curve":0.25,"c3":0.75},{"time":0.5,"color":"ffffff00"}],"attachment":[{"time":0.0333,"name":"bai"}]},"橙色阶":{"attachment":[{"name":null},{"time":0.0333,"name":"橙色阶"}]},"黄星星12":{"attachment":[{"name":null},{"time":0.0333,"name":"黄星星"}]},"黄星星":{"attachment":[{"name":null},{"time":0.0333,"name":"黄星星"}]},"黄星星13":{"attachment":[{"name":null},{"time":0.0333,"name":"黄星星"}]},"黄星星10":{"attachment":[{"name":null},{"time":0.0333,"name":"黄星星"}]},"黄星星9":{"attachment":[{"name":null},{"time":0.0333,"name":"黄星星"}]}},"bones":{"huang9":{"translate":[{"x":-25.9,"y":-0.76},{"time":0.4667,"x":-3.83,"y":-11.46},{"time":0.7667,"x":10.36,"y":-18.33,"curve":"stepped"},{"time":0.8,"x":-27.47},{"time":1.6,"x":10.36,"y":-18.33,"curve":"stepped"},{"time":1.6333,"x":-27.47},{"time":1.6667,"x":-25.9,"y":-0.76}],"scale":[{"x":0.083,"y":0.083},{"time":0.3667},{"time":0.4667,"x":0.75,"y":0.75},{"time":0.7667,"x":0,"y":0,"curve":"stepped"},{"time":0.8,"x":0,"y":0},{"time":1.2},{"time":1.6,"x":0,"y":0,"curve":"stepped"},{"time":1.6333,"x":0,"y":0},{"time":1.6667,"x":0.083,"y":0.083}]},"huang10":{"translate":[{"x":9.59,"y":-14.79},{"time":0.1667,"x":18.32,"y":-23.23,"curve":"stepped"},{"time":0.2,"x":-23.55,"y":17.27},{"time":1,"x":4.78,"y":-15.94,"curve":"stepped"},{"time":1.0333,"x":-23.55,"y":17.27},{"time":1.6667,"x":9.59,"y":-14.79}],"scale":[{"x":0.417,"y":0.417},{"time":0.1667,"x":0,"y":0,"curve":"stepped"},{"time":0.2,"x":0,"y":0},{"time":0.6},{"time":1,"x":0,"y":0,"curve":"stepped"},{"time":1.0333,"x":0,"y":0},{"time":1.4333},{"time":1.6667,"x":0.417,"y":0.417}]},"huang11":{"translate":[{"x":-0.31,"y":9.95},{"time":0.4333,"x":-1.59,"y":-7.97,"curve":"stepped"},{"time":0.4667,"x":0.79,"y":25.12},{"time":1.0667,"x":-12.71,"y":-4.38},{"time":1.2667,"x":-17.21,"y":-14.22,"curve":"stepped"},{"time":1.3,"x":0.79,"y":25.12},{"time":1.6667,"x":-0.31,"y":9.95}],"scale":[{"x":0.917,"y":0.917},{"time":0.0333},{"time":0.4333,"x":0,"y":0,"curve":"stepped"},{"time":0.4667,"x":0,"y":0},{"time":0.8667},{"time":1.0667,"x":0.5,"y":0.5},{"time":1.2667,"x":0,"y":0,"curve":"stepped"},{"time":1.3,"x":0,"y":0},{"time":1.6667,"x":0.917,"y":0.917}]},"huang8":{"translate":[{"x":-24.81,"y":-26.16,"curve":"stepped"},{"time":0.0333,"x":19.17,"y":6.97},{"time":0.4667,"x":2.42,"y":1.65},{"time":0.8333,"x":-11.76,"y":-2.86,"curve":"stepped"},{"time":0.8667,"x":19.17,"y":6.97},{"time":1.6667,"x":-24.81,"y":-26.16}],"scale":[{"x":0,"y":0,"curve":"stepped"},{"time":0.0333,"x":0,"y":0},{"time":0.4333},{"time":0.4667,"x":0.917,"y":0.917},{"time":0.8333,"x":0,"y":0,"curve":"stepped"},{"time":0.8667,"x":0,"y":0},{"time":1.2667},{"time":1.6667,"x":0,"y":0}]},"huang":{"translate":[{"x":15.91,"y":5.3},{"time":0.4667,"x":-16.86,"y":12.49},{"time":0.5667,"x":-23.88,"y":14.03,"curve":"stepped"},{"time":0.6,"x":32.3,"y":1.7},{"time":1.4,"x":-22.95,"y":-10.2,"curve":"stepped"},{"time":1.4333,"x":32.3,"y":1.7},{"time":1.6667,"x":15.91,"y":5.3}],"scale":[{"x":0.583,"y":0.583},{"time":0.1667},{"time":0.4667,"x":0.25,"y":0.25},{"time":0.5667,"x":0,"y":0,"curve":"stepped"},{"time":0.6,"x":0,"y":0},{"time":1},{"time":1.4,"x":0,"y":0,"curve":"stepped"},{"time":1.4333,"x":0,"y":0},{"time":1.6667,"x":0.583,"y":0.583}]},"huang3":{"translate":[{"x":0.38,"y":11.8},{"time":0.2333,"x":-9.32,"y":15.84,"curve":"stepped"},{"time":0.2667,"x":23.94,"y":1.99},{"time":1.0667,"curve":"stepped"},{"time":1.1,"x":23.94,"y":1.99},{"time":1.6667,"x":0.38,"y":11.8}],"scale":[{"x":0.583,"y":0.583},{"time":0.2333,"x":0,"y":0,"curve":"stepped"},{"time":0.2667,"x":0,"y":0},{"time":0.6667},{"time":1.0667,"x":0,"y":0,"curve":"stepped"},{"time":1.1,"x":0,"y":0},{"time":1.5},{"time":1.6667,"x":0.583,"y":0.583}]},"huang4":{"translate":[{"x":-15.08,"y":23.25},{"time":0.0333,"x":-16.78,"y":24.23,"curve":"stepped"},{"time":0.0667,"x":23.94,"y":0.66},{"time":0.8667,"curve":"stepped"},{"time":0.9,"x":23.94,"y":0.66},{"time":1.6667,"x":-15.08,"y":23.25}],"scale":[{"x":0.083,"y":0.083},{"time":0.0333,"x":0,"y":0,"curve":"stepped"},{"time":0.0667,"x":0,"y":0},{"time":0.4667},{"time":0.8667,"x":0,"y":0,"curve":"stepped"},{"time":0.9,"x":0,"y":0},{"time":1.3},{"time":1.6667,"x":0.083,"y":0.083}]},"huang5":{"translate":[{"x":-7.78,"y":-20.45},{"time":0.5333,"x":-36.74,"y":14.87,"curve":"stepped"},{"time":0.5667,"x":6.69,"y":-38.11},{"time":1.3667,"x":-16.27,"y":21.7,"curve":"stepped"},{"time":1.4,"x":6.69,"y":-38.11},{"time":1.6667,"x":-7.78,"y":-20.45}],"scale":[{"x":0.667,"y":0.667},{"time":0.1333},{"time":0.5333,"x":0,"y":0,"curve":"stepped"},{"time":0.5667,"x":0,"y":0},{"time":0.9667},{"time":1.3667,"x":0,"y":0,"curve":"stepped"},{"time":1.4,"x":0,"y":0},{"time":1.6667,"x":0.667,"y":0.667}]},"huang6":{"translate":[{"x":18.56,"y":-10.76},{"time":0.3,"x":22.43,"y":8.74,"curve":"stepped"},{"time":0.3333,"x":2.59,"y":-46.71},{"time":1.1333,"x":2.81,"y":7.03,"curve":"stepped"},{"time":1.1667,"x":12.11,"y":-43.25},{"time":1.6667,"x":18.56,"y":-10.76}],"scale":[{"x":0.75,"y":0.75},{"time":0.3,"x":0,"y":0,"curve":"stepped"},{"time":0.3333,"x":0,"y":0},{"time":0.7333},{"time":1.1333,"x":0,"y":0,"curve":"stepped"},{"time":1.1667,"x":0,"y":0},{"time":1.5667},{"time":1.6667,"x":0.75,"y":0.75}]},"huang7":{"translate":[{"x":-32.44,"y":-36.56},{"time":0.8,"x":10.17,"y":5.42,"curve":"stepped"},{"time":0.8333,"x":-32.44,"y":-36.56},{"time":1.6333,"x":24.67,"y":-3.96,"curve":"stepped"},{"time":1.6667,"x":-32.44,"y":-36.56}],"scale":[{"x":0,"y":0},{"time":0.4},{"time":0.8,"x":0,"y":0,"curve":"stepped"},{"time":0.8333,"x":0,"y":0},{"time":1.2333},{"time":1.6333,"x":0,"y":0}]},"huang2":{"translate":[{"x":6.52,"y":29.82},{"time":0.0333,"x":8.11,"y":31,"curve":"stepped"},{"time":0.0667,"x":-29.99,"y":2.61},{"time":0.8667,"x":13.23,"y":8.82,"curve":"stepped"},{"time":0.9,"x":-29.99,"y":2.61},{"time":1.6667,"x":6.52,"y":29.82}],"scale":[{"x":0.083,"y":0.083},{"time":0.0333,"x":0,"y":0,"curve":"stepped"},{"time":0.0667,"x":0,"y":0},{"time":0.4667},{"time":0.8667,"x":0,"y":0,"curve":"stepped"},{"time":0.9,"x":0,"y":0},{"time":1.3},{"time":1.6667,"x":0.083,"y":0.083}]},"huang12":{"translate":[{"x":-3.83,"y":-11.46},{"time":0.3,"x":10.36,"y":-18.33,"curve":"stepped"},{"time":0.3333,"x":-27.47},{"time":1.1333,"x":10.36,"y":-18.33,"curve":"stepped"},{"time":1.1667,"x":-27.47},{"time":1.6667,"x":-3.83,"y":-11.46}],"scale":[{"x":0.75,"y":0.75},{"time":0.3,"x":0,"y":0,"curve":"stepped"},{"time":0.3333,"x":0,"y":0},{"time":0.7333},{"time":1.1333,"x":0,"y":0,"curve":"stepped"},{"time":1.1667,"x":0,"y":0},{"time":1.5667},{"time":1.6667,"x":0.75,"y":0.75}]},"huang13":{"translate":[{"x":-18.88,"y":10.89},{"time":0.5333,"x":6.52,"y":29.82},{"time":0.5667,"x":8.11,"y":31,"curve":"stepped"},{"time":0.6,"x":-29.99,"y":2.61},{"time":1.4,"x":13.23,"y":8.82,"curve":"stepped"},{"time":1.4333,"x":-29.99,"y":2.61},{"time":1.6667,"x":-18.88,"y":10.89}],"scale":[{"x":0.583,"y":0.583},{"time":0.1667},{"time":0.5333,"x":0.083,"y":0.083},{"time":0.5667,"x":0,"y":0,"curve":"stepped"},{"time":0.6,"x":0,"y":0},{"time":1},{"time":1.4,"x":0,"y":0,"curve":"stepped"},{"time":1.4333,"x":0,"y":0},{"time":1.6667,"x":0.583,"y":0.583}]},"huang14":{"translate":[{"x":6.52,"y":29.82},{"time":0.0333,"x":8.11,"y":31,"curve":"stepped"},{"time":0.0667,"x":-29.99,"y":2.61},{"time":0.8667,"x":13.23,"y":8.82,"curve":"stepped"},{"time":0.9,"x":-29.99,"y":2.61},{"time":1.6667,"x":6.52,"y":29.82}],"scale":[{"x":0.083,"y":0.083},{"time":0.0333,"x":0,"y":0,"curve":"stepped"},{"time":0.0667,"x":0,"y":0},{"time":0.4667},{"time":0.8667,"x":0,"y":0,"curve":"stepped"},{"time":0.9,"x":0,"y":0},{"time":1.3},{"time":1.6667,"x":0.083,"y":0.083}]},"huang15":{"translate":[{"x":-20.06,"y":13.9},{"time":0.5667,"x":9.59,"y":-14.79},{"time":0.7333,"x":18.32,"y":-23.23,"curve":"stepped"},{"time":0.7667,"x":-23.55,"y":17.27},{"time":1.5667,"x":-4.21,"y":-42.91,"curve":"stepped"},{"time":1.6,"x":-23.55,"y":17.27},{"time":1.6667,"x":-20.06,"y":13.9}],"scale":[{"x":0.167,"y":0.167},{"time":0.3333},{"time":0.5667,"x":0.417,"y":0.417},{"time":0.7333,"x":0,"y":0,"curve":"stepped"},{"time":0.7667,"x":0,"y":0},{"time":1.1667},{"time":1.5667,"x":0,"y":0,"curve":"stepped"},{"time":1.6,"x":0,"y":0},{"time":1.6667,"x":0.167,"y":0.167}]},"z":{"scale":[{"y":0.065,"curve":0.25,"c3":0.75},{"time":0.2,"y":1.057,"curve":0.25,"c3":0.75},{"time":0.5}]},"祥云":{"translate":[{"x":5.42,"y":-32.09},{"time":0.3}],"scale":[{"x":0.916,"y":0.916},{"time":0.3}]}}}}} \ No newline at end of file diff --git a/assets/res/popBattle/SkillSelect/spine/选择框.json.meta b/assets/res/popBattle/SkillSelect/spine/选择框.json.meta deleted file mode 100644 index e09c2b8..0000000 --- a/assets/res/popBattle/SkillSelect/spine/选择框.json.meta +++ /dev/null @@ -1,13 +0,0 @@ -{ - "ver": "1.2.7", - "importer": "spine-data", - "imported": true, - "uuid": "6dce4e3c-5cd9-4abb-bfd5-27ae8cb0b2a7", - "files": [ - ".json" - ], - "subMetas": {}, - "userData": { - "atlasUuid": "60bb1b87-8182-4df5-8fd2-84c12d34b624" - } -} diff --git a/assets/res/popBattle/SkillSelect/spine/选择框.png b/assets/res/popBattle/SkillSelect/spine/选择框.png deleted file mode 100644 index c550eb8..0000000 Binary files a/assets/res/popBattle/SkillSelect/spine/选择框.png and /dev/null differ diff --git a/assets/res/popBattle/SkillSelect/spine/选择框.png.meta b/assets/res/popBattle/SkillSelect/spine/选择框.png.meta deleted file mode 100644 index 32f10e1..0000000 --- a/assets/res/popBattle/SkillSelect/spine/选择框.png.meta +++ /dev/null @@ -1,134 +0,0 @@ -{ - "ver": "1.0.27", - "importer": "image", - "imported": true, - "uuid": "d436042b-a21c-45c9-86cf-8cdec08c94d0", - "files": [ - ".json", - ".png" - ], - "subMetas": { - "6c48a": { - "importer": "texture", - "uuid": "d436042b-a21c-45c9-86cf-8cdec08c94d0@6c48a", - "displayName": "选择框", - "id": "6c48a", - "name": "texture", - "userData": { - "wrapModeS": "clamp-to-edge", - "wrapModeT": "clamp-to-edge", - "imageUuidOrDatabaseUri": "d436042b-a21c-45c9-86cf-8cdec08c94d0", - "isUuid": true, - "visible": false, - "minfilter": "linear", - "magfilter": "linear", - "mipfilter": "none", - "anisotropy": 0 - }, - "ver": "1.0.22", - "imported": true, - "files": [ - ".json" - ], - "subMetas": {} - }, - "f9941": { - "importer": "sprite-frame", - "uuid": "d436042b-a21c-45c9-86cf-8cdec08c94d0@f9941", - "displayName": "选择框", - "id": "f9941", - "name": "spriteFrame", - "userData": { - "trimThreshold": 1, - "rotated": false, - "offsetX": 0, - "offsetY": 0, - "trimX": 0, - "trimY": 0, - "width": 1943, - "height": 1792, - "rawWidth": 1943, - "rawHeight": 1792, - "borderTop": 0, - "borderBottom": 0, - "borderLeft": 0, - "borderRight": 0, - "packable": true, - "pixelsToUnit": 100, - "pivotX": 0.5, - "pivotY": 0.5, - "meshType": 0, - "vertices": { - "rawPosition": [ - -971.5, - -896, - 0, - 971.5, - -896, - 0, - -971.5, - 896, - 0, - 971.5, - 896, - 0 - ], - "indexes": [ - 0, - 1, - 2, - 2, - 1, - 3 - ], - "uv": [ - 0, - 1792, - 1943, - 1792, - 0, - 0, - 1943, - 0 - ], - "nuv": [ - 0, - 0, - 1, - 0, - 0, - 1, - 1, - 1 - ], - "minPos": [ - -971.5, - -896, - 0 - ], - "maxPos": [ - 971.5, - 896, - 0 - ] - }, - "isUuid": true, - "imageUuidOrDatabaseUri": "d436042b-a21c-45c9-86cf-8cdec08c94d0@6c48a", - "atlasUuid": "", - "trimType": "auto" - }, - "ver": "1.0.12", - "imported": true, - "files": [ - ".json" - ], - "subMetas": {} - } - }, - "userData": { - "type": "sprite-frame", - "hasAlpha": true, - "fixAlphaTransparencyArtifacts": false, - "redirect": "d436042b-a21c-45c9-86cf-8cdec08c94d0@6c48a" - } -} diff --git a/assets/res/popBattle/popSelect.meta b/assets/res/popBattle/popSelect.meta new file mode 100644 index 0000000..58ef84f --- /dev/null +++ b/assets/res/popBattle/popSelect.meta @@ -0,0 +1,9 @@ +{ + "ver": "1.2.0", + "importer": "directory", + "imported": true, + "uuid": "701dcbb7-c268-49a5-b241-fd2cd67a6a92", + "files": [], + "subMetas": {}, + "userData": {} +} diff --git a/assets/res/popBattle/SkillSelect/texture.meta b/assets/res/popBattle/popSelect/texture.meta similarity index 70% rename from assets/res/popBattle/SkillSelect/texture.meta rename to assets/res/popBattle/popSelect/texture.meta index 67ca893..eee886c 100644 --- a/assets/res/popBattle/SkillSelect/texture.meta +++ b/assets/res/popBattle/popSelect/texture.meta @@ -2,7 +2,7 @@ "ver": "1.2.0", "importer": "directory", "imported": true, - "uuid": "4081e53a-5ec5-46e1-be53-eaa951e0aa06", + "uuid": "2543eb5b-839b-4195-a3e2-a046701d0820", "files": [], "subMetas": {}, "userData": {} diff --git a/assets/script/battle/combat/TowerLoadoutService.ts b/assets/script/battle/combat/TowerLoadoutService.ts index a2264ef..77416ae 100644 --- a/assets/script/battle/combat/TowerLoadoutService.ts +++ b/assets/script/battle/combat/TowerLoadoutService.ts @@ -99,14 +99,16 @@ export class TowerLoadoutService { weaponSkillActive = Number(sk.type) === 1; } } + // 五行每行自带技能数组;非五行仍按合成等级取下标 + const skillLv = isElementHero(hero) ? 1 : level; const loadout: TowerLoadout = { weapon1Id: heroId, level, weaponId, - normalBaseAtkId: heroNormalSkillId(hero, level), + normalBaseAtkId: heroNormalSkillId(hero, skillLv), overAtkType: '', overAtkPara: '', - activeSkillBaseAtkId: heroUltSkillId(hero, level), + activeSkillBaseAtkId: heroUltSkillId(hero, skillLv), weaponSkillId, weaponSkillActive, }; diff --git a/assets/script/battle/combat/TowerStatResolver.ts b/assets/script/battle/combat/TowerStatResolver.ts index ff679f0..ccbaa55 100644 --- a/assets/script/battle/combat/TowerStatResolver.ts +++ b/assets/script/battle/combat/TowerStatResolver.ts @@ -70,6 +70,7 @@ export function resolveBaseAtkRangePx(baseAtk: ITableSkill | null): number { } /** + * @deprecated 五行数字已按 Hero 分行取 atk,勿再乘本系数;仅旧非五行路径保留。 * 合成等级 → 攻击力等级系数(常量表 id=13 para1,按下标 level-1)。 * @param composeLevel 有效合成等级(≥1) */ @@ -124,35 +125,48 @@ function rangeAddFromAtkBuff(raw: string | undefined): number { } /** - * 局内合成等级 → 战斗基础数值(不含局外角色攻击/暴击/冷却系数)。 - * 实际攻击力 = Hero.atk × 等级系数 + 装备 atk(若有)。 - * @param w1 Hero 行 - * @param composeLevel 合成等级 + * 局内战斗基础数值(不含局外角色攻击/暴击/冷却系数)。 + * 五行:合成后已是独立 Hero 行,攻击力=该行 atk(+宝石),不再乘 Const 等级系数。 + * @param w1 Hero 行(五行须已是目标等级那一行) + * @param composeLevel 显示/合成等级;五行仅作校验,攻击取 w1.atk * @param battleWeaponId 战斗武器 id;AI/指定装载须传入,缺省才读本机 gg.equip */ export function deriveTowerSetupStats(w1: ITableHero, composeLevel: number, battleWeaponId?: number): TowerSetupStats { const compose = Math.max(1, Math.floor(composeLevel) || 1); + const weaponId = resolveSetupWeaponId(w1, battleWeaponId); + const weaponRow = weaponId > 0 + ? gg.data.table.getTableData(TableNames.Weapon, weaponId) + : null; + const exclusiveMul = weaponRow ? gg.equip.getEquipExclusiveMul(w1.id, weaponRow) : 1; + const weaponAtk = (weaponRow?.atk ?? 0) * exclusiveMul; + let effectiveLevel: number; + let levelCoef: number; + let attack: number; + let skillLevel: number; if (isElementHero(w1)) { + const rowLevel = Math.floor(Number(w1.level)) || 0; const cap = WeaponComposeConfigProvider.instance.getElementMaxLevel(Math.floor(Number(w1.herotype))); - effectiveLevel = Math.min(compose, cap); + effectiveLevel = rowLevel > 0 ? Math.min(rowLevel, cap) : Math.min(compose, cap); + if (rowLevel > 0 && rowLevel !== compose) { + console.warn('[TowerStatResolver] 五行 Hero.level 与传入等级不一致', w1.id, rowLevel, compose); + } + levelCoef = 1; + attack = w1.atk + weaponAtk; + // 每行自带 atk_id,按本行取技能(下标 0) + skillLevel = 1; } else { if (!(w1.level_limit > 0)) { console.log('[TowerStatResolver] Hero.level_limit 未配置', w1.id); } const levelLimit = w1.level_limit > 0 ? w1.level_limit : 1; effectiveLevel = Math.min(compose, levelLimit); + levelCoef = resolveAtkLevelCoef(effectiveLevel); + attack = w1.atk * levelCoef + weaponAtk; + skillLevel = effectiveLevel; } - const weaponId = resolveSetupWeaponId(w1, battleWeaponId); - const weaponRow = weaponId > 0 - ? gg.data.table.getTableData(TableNames.Weapon, weaponId) - : null; - const exclusiveMul = weaponRow ? gg.equip.getEquipExclusiveMul(w1.id, weaponRow) : 1; - const weaponAtk = (weaponRow?.atk ?? 0) * exclusiveMul; - const levelCoef = resolveAtkLevelCoef(effectiveLevel); - const attack = w1.atk * levelCoef + weaponAtk; - const skillId = heroNormalSkillId(w1, effectiveLevel); + const skillId = heroNormalSkillId(w1, skillLevel); const skillRow = skillId > 0 ? gg.data.table.getTableData(TableNames.Skill, skillId) : null; const attackSpeed = skillRow?.cd > 0 ? 1 / skillRow.cd : 1; const critRate = Math.min(1, (w1.critical_chance ?? 0) / 10000); diff --git a/assets/script/battle/view/CocosBagBoardView.ts b/assets/script/battle/view/CocosBagBoardView.ts index eab11e1..96b9722 100644 --- a/assets/script/battle/view/CocosBagBoardView.ts +++ b/assets/script/battle/view/CocosBagBoardView.ts @@ -3468,6 +3468,7 @@ export class CocosBagBoardView { grid.restoreOrigin(); } else { this._commitViewsAfterSuccessfulDrop(grid, target); + this._tryPresentPendingAttrRewrite(); this._vibratePlaceSuccess(); if (drag.source.kind === 'bag' && target.kind === 'map') { bagAttackSpeedPlace = { source: drag.source, target }; @@ -4489,6 +4490,11 @@ export class CocosBagBoardView { this._requestBagRebuild(false); break; } + // 属性卡换五行会换 Hero.id:必须先 DeploySync 再刷视图/Skill, + // 否则 ensureNumberSkill 绑到旧实体,reconcile 销毁后数字停攻。 + if (this._deploySync && this._map.gridsInitialized) { + this._deploySync.reconcileFromMerge('glyphRewritten'); + } if (this._applyMapGlyphRewriteInPlace(event.target.gridIndex)) { this._refreshCanUpgradeHints(); this._refreshSkillBindings(); @@ -4496,9 +4502,6 @@ export class CocosBagBoardView { this._requestSessionRebuild(false); this._scheduleComposeFxFlush(); } - if (this._deploySync && this._map.gridsInitialized) { - this._deploySync.reconcileFromMerge('glyphRewritten'); - } break; case MergeEventType.PlaceRejected: if (event.reason === PlaceRejectReason.NotPrepPhase) { diff --git a/assets/script/game/ConfigProjectData.ts b/assets/script/game/ConfigProjectData.ts index 6d3c71c..07485af 100644 --- a/assets/script/game/ConfigProjectData.ts +++ b/assets/script/game/ConfigProjectData.ts @@ -2,8 +2,8 @@ import { color } from "cc"; import { Singleton } from "../../mx/tools/Singleton"; import { LevelFieldResolver } from "../manager/LevelFieldResolver"; import { SkillMultiplyType, TableNames } from "./ConfigTableData"; -import { heroNormalSkillId, isBasicHero } from '../battle/config/BattleHeroTable'; -import { resolveAtkLevelCoef } from '../battle/combat/TowerStatResolver'; +import { isBasicHero } from '../battle/config/BattleHeroTable'; +import { deriveTowerSetupStats } from '../battle/combat/TowerStatResolver'; import type { IBattleRuntimeHandle } from '../battle/types/ProjectBattleTypes'; import MTools from "../../mx/tools/MTools"; import { DailyWinStats } from '../manager/DailyWinStats'; @@ -881,22 +881,9 @@ export class ConfigProjectData extends Singleton { // 旧词条 Skill.weapon 已删:DPS 乘区用传入 skills(局外带入/调试),无则按 1 const dpsMult = this.calculateDPSWeight(skills as ITableSkill[], weapon1Id); - - const levelLimit = w1.level_limit > 0 ? w1.level_limit : composeLevel; - const effectiveLevel = Math.max(1, Math.min(composeLevel, levelLimit)); - const weaponRow = this._getHeroWeaponRow(w1); - const exclusiveMul = weaponRow ? gg.equip.getEquipExclusiveMul(w1.id, weaponRow) : 1; - const weaponAtk = (weaponRow?.atk ?? 0) * exclusiveMul; - const allAttack = w1.atk * resolveAtkLevelCoef(effectiveLevel) + weaponAtk; - - const skillId = heroNormalSkillId(w1, effectiveLevel); - const skillRow = skillId > 0 - ? gg.data.table.getTableData(TableNames.Skill, skillId) - : null; - const baseCd = skillRow?.cd ?? 1; - if (baseCd <= 0) return 0; - - return dpsMult * allAttack / baseCd; + const setup = deriveTowerSetupStats(w1, composeLevel); + if (!(setup.attackSpeed > 0)) return 0; + return dpsMult * setup.attack * setup.attackSpeed; } /** 计算一组词条对指定武器的理论 DPS 乘区(暴击期望 × 其他乘区) */ diff --git a/assets/script/ui/BattleGame/BattleGameRewriteGlyphPresenter.ts b/assets/script/ui/BattleGame/BattleGameRewriteGlyphPresenter.ts index d67c884..bb8bd6f 100644 --- a/assets/script/ui/BattleGame/BattleGameRewriteGlyphPresenter.ts +++ b/assets/script/ui/BattleGame/BattleGameRewriteGlyphPresenter.ts @@ -250,8 +250,9 @@ export class BattleGameRewriteGlyphPresenter { else node.destroy(); } - /** 中断属性卡表现 */ + /** 中断属性卡表现(须先提交未换皮回调,避免卡已耗尽却未改字) */ private _abortAttrFx(): void { + this._flushAttrRewriteIfNeeded(); this._attrGen++; const node = this._attrFxNode; this._attrFxNode = null; diff --git a/assets/script/ui/BattleGame/Monster.ts b/assets/script/ui/BattleGame/Monster.ts index abbb01a..73211a7 100644 --- a/assets/script/ui/BattleGame/Monster.ts +++ b/assets/script/ui/BattleGame/Monster.ts @@ -1303,6 +1303,10 @@ export class Monster extends Component { onComplete?.(); return false; } + // 行军用 PRIVATE_CACHE;死亡轨含附件切换,缓存模式无法起播,须切 REALTIME + if (typeof this.anim.setAnimationCacheMode === 'function') { + this.anim.setAnimationCacheMode(sp.SpineAnimationCacheMode.REALTIME); + } // 禁止直接 findAnimation:Spine runtime 未就绪时会抛 Cannot read properties of null (reading 'lv') this._animBaseTimeScale = 1; const ok = BattleSpinePlayback.play(this.anim, anim, {