diff --git a/res/csvdata/act.lua b/res/csvdata/act.lua index a7b8399..52ba874 100644 Binary files a/res/csvdata/act.lua and b/res/csvdata/act.lua differ diff --git a/res/csvdata/buff.lua b/res/csvdata/buff.lua index 099b05d..56cf5ff 100644 Binary files a/res/csvdata/buff.lua and b/res/csvdata/buff.lua differ diff --git a/res/csvdata/bullet.lua b/res/csvdata/bullet.lua index 8e7d799..4aa7d9e 100644 Binary files a/res/csvdata/bullet.lua and b/res/csvdata/bullet.lua differ diff --git a/res/csvdata/chapter_battle.lua b/res/csvdata/chapter_battle.lua index 1e01c2d..0b69ade 100644 Binary files a/res/csvdata/chapter_battle.lua and b/res/csvdata/chapter_battle.lua differ diff --git a/res/csvdata/equip.lua b/res/csvdata/equip.lua index da6e74e..363a73f 100644 Binary files a/res/csvdata/equip.lua and b/res/csvdata/equip.lua differ diff --git a/res/csvdata/hero_exp.lua b/res/csvdata/hero_exp.lua index 3a6f736..7d6a6f0 100644 Binary files a/res/csvdata/hero_exp.lua and b/res/csvdata/hero_exp.lua differ diff --git a/res/csvdata/map/map102.lua b/res/csvdata/map/map102.lua index 08873a6..3ee7158 100644 Binary files a/res/csvdata/map/map102.lua and b/res/csvdata/map/map102.lua differ diff --git a/res/csvdata/map/map104.lua b/res/csvdata/map/map104.lua index 54edba6..935f525 100644 Binary files a/res/csvdata/map/map104.lua and b/res/csvdata/map/map104.lua differ diff --git a/res/csvdata/map/map201.lua b/res/csvdata/map/map201.lua index a946910..eb24b0c 100644 Binary files a/res/csvdata/map/map201.lua and b/res/csvdata/map/map201.lua differ diff --git a/res/csvdata/map/map202.lua b/res/csvdata/map/map202.lua index d8fc00b..cf83306 100644 Binary files a/res/csvdata/map/map202.lua and b/res/csvdata/map/map202.lua differ diff --git a/res/csvdata/map/map204.lua b/res/csvdata/map/map204.lua index 3326616..0841808 100644 Binary files a/res/csvdata/map/map204.lua and b/res/csvdata/map/map204.lua differ diff --git a/res/csvdata/map/map205.lua b/res/csvdata/map/map205.lua index 85b59fd..5bcd559 100644 Binary files a/res/csvdata/map/map205.lua and b/res/csvdata/map/map205.lua differ diff --git a/res/csvdata/map/map301.lua b/res/csvdata/map/map301.lua index 6e44535..c805303 100644 Binary files a/res/csvdata/map/map301.lua and b/res/csvdata/map/map301.lua differ diff --git a/res/csvdata/map/map302.lua b/res/csvdata/map/map302.lua index af23b20..a3f7832 100644 Binary files a/res/csvdata/map/map302.lua and b/res/csvdata/map/map302.lua differ diff --git a/res/csvdata/map/map303.lua b/res/csvdata/map/map303.lua index 9fcd45e..b58c378 100644 Binary files a/res/csvdata/map/map303.lua and b/res/csvdata/map/map303.lua differ diff --git a/res/csvdata/map/map304.lua b/res/csvdata/map/map304.lua index 7c80b54..4dc8d2e 100644 Binary files a/res/csvdata/map/map304.lua and b/res/csvdata/map/map304.lua differ diff --git a/res/csvdata/map/map305.lua b/res/csvdata/map/map305.lua index 1a4bc90..3af0528 100644 Binary files a/res/csvdata/map/map305.lua and b/res/csvdata/map/map305.lua differ diff --git a/res/csvdata/scene/PT/pt10201.lua b/res/csvdata/scene/PT/pt10201.lua index 8a9fd4a..0a1017b 100644 Binary files a/res/csvdata/scene/PT/pt10201.lua and b/res/csvdata/scene/PT/pt10201.lua differ diff --git a/res/csvdata/skill.lua b/res/csvdata/skill.lua index c5899b2..cf50e4c 100644 Binary files a/res/csvdata/skill.lua and b/res/csvdata/skill.lua differ diff --git a/res/csvdata/skill_upgrade.lua b/res/csvdata/skill_upgrade.lua index 25b7803..c09948e 100644 Binary files a/res/csvdata/skill_upgrade.lua and b/res/csvdata/skill_upgrade.lua differ diff --git a/res/csvdata/unit.lua b/res/csvdata/unit.lua index a41dbea..f10f04c 100644 Binary files a/res/csvdata/unit.lua and b/res/csvdata/unit.lua differ diff --git a/res/flist b/res/flist index a9ca75e..b079abd 100644 --- a/res/flist +++ b/res/flist @@ -1,5 +1,5 @@ local list = { - ver = "1.0.86", + ver = "1.0.87", stage = { {name = "res/bodyBreak/cike.plist", code = "488a1d0d85fdd58b68103a8f6f3096bb", size = "8195"}, {name = "res/bodyBreak/cike.png", code = "f1cccf397fcc8bacf85705e1e5b12364", size = "9555"}, @@ -97,11 +97,11 @@ local list = { {name = "res/cptMap/cpt_02.png", code = "b7bbddd25888e42e5698816e3c07460e", size = "77171"}, {name = "res/cptMap/cpt_03.png", code = "4fe5c78d940f084f310340f59ababaaa", size = "112367"}, {name = "res/cptMap/cpt_04.png", code = "11b36d5300b605ba84b3a71049ea367f", size = "118647"}, - {name = "res/csvdata/act.lua", code = "2a16c75b630ec959219a2b0ee5d19513", size = "37167", act = "load"}, + {name = "res/csvdata/act.lua", code = "36aa289182576fae2d68c18264f50af4", size = "37155", act = "load"}, {name = "res/csvdata/ai.lua", code = "c080ccd0e81eaa91e9c686b9e2f432f8", size = "7663", act = "load"}, {name = "res/csvdata/attr_des.lua", code = "6ac5765d450e924ec6ce0534f8a043c9", size = "45979", act = "load"}, - {name = "res/csvdata/buff.lua", code = "6922ff92a262ebfee47cfd30834589a5", size = "54955", act = "load"}, - {name = "res/csvdata/bullet.lua", code = "ed0b68db73c4c1021854c31abbc7d53e", size = "61635", act = "load"}, + {name = "res/csvdata/buff.lua", code = "d64231a85f68b722c98a87a6052d523f", size = "54947", act = "load"}, + {name = "res/csvdata/bullet.lua", code = "2d0f047fe84836ec5a66369e2b85a0b9", size = "61555", act = "load"}, {name = "res/csvdata/bullet_act/buff_wudi.lua", code = "a0b6648452a172499d6f1d9e035a52df", size = "495", act = "load"}, {name = "res/csvdata/bullet_act/buffIcon_zhimang.lua", code = "d432c04ba4867d4e73f7b337b77baa64", size = "479", act = "load"}, {name = "res/csvdata/bullet_act/chuida.lua", code = "064c59b324898bfa1bd8afaa738e4404", size = "487", act = "load"}, @@ -186,37 +186,37 @@ local list = { {name = "res/csvdata/bullet_act/zhadanren_a.lua", code = "7d13198f66e6b2f96262259f62b29613", size = "543", act = "load"}, {name = "res/csvdata/bullet_act/zhadanren_h.lua", code = "88cb1e5832e3cbc008ce0a52dc12f341", size = "523", act = "load"}, {name = "res/csvdata/cdkey.lua", code = "7f14a8a79a0de2a9a5c306e3d9c19ec0", size = "151023", act = "load"}, - {name = "res/csvdata/chapter_battle.lua", code = "da0f84a7023848574c9ac90e571b7a58", size = "12267", act = "load"}, + {name = "res/csvdata/chapter_battle.lua", code = "6edab6af8628ca1622a85c1ea2b59d90", size = "12267", act = "load"}, {name = "res/csvdata/chapter_info.lua", code = "986040125151e49c77d6a48860d97f75", size = "683", act = "load"}, - {name = "res/csvdata/equip.lua", code = "a013fd5d4c410ba33e86725988023741", size = "105783", act = "load"}, + {name = "res/csvdata/equip.lua", code = "ca6cc089cf1ce1046aadc819d6fa1c4f", size = "105783", act = "load"}, {name = "res/csvdata/equip_suit.lua", code = "a82eac94ec12f7ebac70599cf192b47d", size = "18631", act = "load"}, {name = "res/csvdata/GlobalDefine.lua", code = "297323bdc4adc56f0cf366bc1a7b48bc", size = "1467", act = "load"}, - {name = "res/csvdata/hero_exp.lua", code = "2761c1c5dbed2cff82d5039b2633009b", size = "1607", act = "load"}, + {name = "res/csvdata/hero_exp.lua", code = "7fe5cd98d1c924314a95725fad8b677e", size = "1607", act = "load"}, {name = "res/csvdata/init.lua", code = "4f98e5ca60c3556ac571f7f6e4818d5e", size = "11523", act = "load"}, {name = "res/csvdata/item.lua", code = "e8f01f01bd6c37afc1e80d8a5db11b0e", size = "70619", act = "load"}, {name = "res/csvdata/map/home.lua", code = "cfad84dc1c8db0c5253af3498578a57d", size = "1027", act = "load"}, {name = "res/csvdata/map/map001.lua", code = "f306104935c06c61d9d5212fa6e58d62", size = "5143", act = "load"}, {name = "res/csvdata/map/map101.lua", code = "5ce43d28a02633d7de6071fe9a885e1b", size = "4235", act = "load"}, - {name = "res/csvdata/map/map102.lua", code = "a95287afebe72bb845e6dfa69e0e0625", size = "6123", act = "load"}, + {name = "res/csvdata/map/map102.lua", code = "4332c2b85ecf8d6f39156832e2efacd3", size = "6111", act = "load"}, {name = "res/csvdata/map/map103.lua", code = "84c2c8aa799f6d14931d81032b2365e3", size = "7203", act = "load"}, - {name = "res/csvdata/map/map104.lua", code = "14238a690604a42c16e2042fc8e6bc7b", size = "6595", act = "load"}, - {name = "res/csvdata/map/map201.lua", code = "0badea4e139af82258555373a89a6908", size = "7107", act = "load"}, - {name = "res/csvdata/map/map202.lua", code = "be00837410076137941d01ce9e96c9c6", size = "7295", act = "load"}, + {name = "res/csvdata/map/map104.lua", code = "3571e5d21a114ec596c234d1f94dc5b4", size = "6587", act = "load"}, + {name = "res/csvdata/map/map201.lua", code = "1fde302b4584be5342bec5135525f204", size = "7107", act = "load"}, + {name = "res/csvdata/map/map202.lua", code = "954abc9a0db65898d28367114e38b265", size = "7295", act = "load"}, {name = "res/csvdata/map/map203.lua", code = "bfade2bb2b1554e40fe2859f3d930eb6", size = "2443", act = "load"}, - {name = "res/csvdata/map/map204.lua", code = "28d55e2656d40565823b3f5b2bb5bd9f", size = "5367", act = "load"}, - {name = "res/csvdata/map/map205.lua", code = "3d92a2cba9dd436f26d05b273eddf158", size = "6199", act = "load"}, - {name = "res/csvdata/map/map301.lua", code = "b690619bb6422e63a0505bb212205469", size = "6855", act = "load"}, - {name = "res/csvdata/map/map302.lua", code = "7dcd405dd2868498adeff9504cd6f95e", size = "7343", act = "load"}, - {name = "res/csvdata/map/map303.lua", code = "61ccad88a267966ef4550cd625324609", size = "8651", act = "load"}, - {name = "res/csvdata/map/map304.lua", code = "0dc677db0855ccb50a2acf2f03bd4c2c", size = "6803", act = "load"}, - {name = "res/csvdata/map/map305.lua", code = "3dac2d8d47f08df10602b56837ad1834", size = "5627", act = "load"}, + {name = "res/csvdata/map/map204.lua", code = "f34b9c178d06b36e701efe7708fed014", size = "5359", act = "load"}, + {name = "res/csvdata/map/map205.lua", code = "1ec7dc600abcd500b6429433ece5a754", size = "6191", act = "load"}, + {name = "res/csvdata/map/map301.lua", code = "39310136b5524b0e0839199e999f40ac", size = "6711", act = "load"}, + {name = "res/csvdata/map/map302.lua", code = "f29c55035945bebf8b30e1d89fea5604", size = "7351", act = "load"}, + {name = "res/csvdata/map/map303.lua", code = "018b37165f236b871ba5eff9eda181b3", size = "8659", act = "load"}, + {name = "res/csvdata/map/map304.lua", code = "2362dbace8a4583228f4a83d2c37e5c2", size = "6803", act = "load"}, + {name = "res/csvdata/map/map305.lua", code = "07a1b29e7f568b243173854ebc5e6787", size = "5627", act = "load"}, {name = "res/csvdata/music.lua", code = "730cbd89fc0c8661ac74a86e917ae408", size = "13951", act = "load"}, {name = "res/csvdata/scene/PT/pt10001.lua", code = "a060fcc7cb50253078f35b3f580af25e", size = "4507", act = "load"}, {name = "res/csvdata/scene/PT/pt10101.lua", code = "c3471749cee0d692cd47232d5e81c2ba", size = "6011", act = "load"}, {name = "res/csvdata/scene/PT/pt10102.lua", code = "167ec3b8e082b548550d5dd298f68549", size = "5939", act = "load"}, {name = "res/csvdata/scene/PT/pt10103.lua", code = "5ed5e982ed4936dabe66488d5cd02b26", size = "6627", act = "load"}, {name = "res/csvdata/scene/PT/pt10104.lua", code = "6a3dc3b2b917292b5db0e6af6860e46f", size = "8355", act = "load"}, - {name = "res/csvdata/scene/PT/pt10201.lua", code = "cd3b9a32c169459fd0f0855ab8fdd570", size = "7715", act = "load"}, + {name = "res/csvdata/scene/PT/pt10201.lua", code = "6373089fb51646da930daecd08ed4214", size = "7719", act = "load"}, {name = "res/csvdata/scene/PT/pt10202.lua", code = "25566883a3f1e1747939b6665dbad76d", size = "8819", act = "load"}, {name = "res/csvdata/scene/PT/pt10203.lua", code = "575e7a132867cd155144a708ead47169", size = "1939", act = "load"}, {name = "res/csvdata/scene/PT/pt10204.lua", code = "41c681cb2d21841aa5967e79fe898dee", size = "7183", act = "load"}, @@ -228,16 +228,16 @@ local list = { {name = "res/csvdata/scene/PT/pt10304_1.lua", code = "30292365c5a5f0f826ebce1a1e1cd173", size = "6611", act = "load"}, {name = "res/csvdata/scene/PT/pt10304_2.lua", code = "98f28d5f9a8d5e6768d212d1f6cb5fda", size = "6611", act = "load"}, {name = "res/csvdata/scene/PT/pt10305.lua", code = "6fd71c1ce0089dde60ff48441e82997a", size = "6715", act = "load"}, - {name = "res/csvdata/skill.lua", code = "56078fa5ae4da6927b98e6965b3057ff", size = "356779", act = "load"}, + {name = "res/csvdata/skill.lua", code = "522d93d3151c5071135f01db2608a852", size = "356031", act = "load"}, {name = "res/csvdata/skill_des.lua", code = "7d4917de17e4d8731f6b4b55e24a4ac5", size = "13667", act = "load"}, {name = "res/csvdata/skill_passive.lua", code = "347ddb3489b79b1e7f8689d58d39f78b", size = "59711", act = "load"}, {name = "res/csvdata/skill_tree.lua", code = "8a78bf31de137818eea963e3c4540fc4", size = "7587", act = "load"}, - {name = "res/csvdata/skill_upgrade.lua", code = "d3cdf95906feb24f59bd328f4acfd0cc", size = "95483", act = "load"}, + {name = "res/csvdata/skill_upgrade.lua", code = "61a951aa4cf25a3e698dee821a61ced8", size = "95459", act = "load"}, {name = "res/csvdata/spine_act.lua", code = "3084dc161c78cf444ae4d555321f0920", size = "3935", act = "load"}, {name = "res/csvdata/sys_codes.lua", code = "935b7c2e4ac396d55de81108f3323d64", size = "1347", act = "load"}, {name = "res/csvdata/talk.lua", code = "e6dec0a905a35b20ce69e82bbe715c3c", size = "125743", act = "load"}, {name = "res/csvdata/talk_act.lua", code = "d8c756a9e9e23a699cb42e2edfe7d851", size = "3075", act = "load"}, - {name = "res/csvdata/unit.lua", code = "6b7c0256a0bd4c0949078fa7bc2405ed", size = "81531", act = "load"}, + {name = "res/csvdata/unit.lua", code = "867db0078a294b4ff4ae813804c9de75", size = "82183", act = "load"}, {name = "res/Default/Button_Disable.png", code = "938900f78c57609f257077986a2e8bf5", size = "203"}, {name = "res/equip/bishou_01_01.png", code = "800284a76a9462c06add33e79dff65c1", size = "2047"}, {name = "res/equip/bishou_01_02.png", code = "cf52108254f9fa0b7f6c98eae79b39c1", size = "2987"}, @@ -661,7 +661,7 @@ local list = { {name = "res/equip_big/quan_bg_15.png", code = "ed6fb5ef79e0e8f021e96b3d1519d3c5", size = "4991"}, {name = "res/font/DFGB_H5.TTF", code = "2b3c1d0ecd85cfca3bbcbdeb53d7fbce", size = "2868592"}, {name = "res/font/OLDENGL.ttf", code = "c34445985276137bcb98e7868a4ebb88", size = "36384"}, - {name = "res/game.dat", code = "db6ce02dbdb4291d960bb401522a124b", size = "391403"}, + {name = "res/game.dat", code = "da0efe52af6feef0529ff12fafcbca4b", size = "392003"}, {name = "res/head/jianshi.png", code = "60301cde7a7d1de92bbe329b8cee412b", size = "3951"}, {name = "res/head/molong.png", code = "6735dcaa871a4bbabab2b67740bd60bd", size = "2991"}, {name = "res/head/monv.png", code = "96c1431ec3478baa11343878ea600f4c", size = "4323"}, @@ -969,7 +969,7 @@ local list = { {name = "res/spine/niutou.json", code = "a4d54c37ae01a399ffb8db35af9f1fd5", size = "423114"}, {name = "res/spine/niutou.png", code = "0e54f039b9808c5ec9d4aed4a66caf04", size = "87231"}, {name = "res/spine/quanjishou.atlas", code = "fd82b6259e2dd69b1ffea18b42bc4310", size = "33904"}, - {name = "res/spine/quanjishou.json", code = "616205b897f6914a079d84a5b8169ec3", size = "1674923"}, + {name = "res/spine/quanjishou.json", code = "74695c517fa6c9ad5bf9238a927b985d", size = "1674837"}, {name = "res/spine/quanjishou.png", code = "7fd761b102a4fb636d9a7e068b5fe7f8", size = "511183"}, {name = "res/spine/quanjishou2.png", code = "48528ba0596d3d0dd2cf3b6e9e487789", size = "160395"}, {name = "res/spine/shachong.atlas", code = "21c0fa5fa5d69f973fb1277393d4904b", size = "8646"}, @@ -1339,7 +1339,7 @@ local list = { {name = "res/tiledmaps/mechanism/dici3.json", code = "b53e7847101387d90fc29baf04e018fe", size = "1295"}, {name = "res/tiledmaps/mechanism/dici3.png", code = "1238555877e5a521c9843db1f34d337c", size = "3063"}, {name = "res/tiledmaps/mechanism/dihuo.atlas", code = "a81bb9644eee93b9c3fa0ebe9fea9df7", size = "2779"}, - {name = "res/tiledmaps/mechanism/dihuo.json", code = "04a2151f80baaa85474ce0696e4bee03", size = "7239"}, + {name = "res/tiledmaps/mechanism/dihuo.json", code = "041fd57e18672bd8a76882c979026807", size = "8104"}, {name = "res/tiledmaps/mechanism/dihuo.png", code = "5c4d7dbd8ef3942f280d6505f3d9c287", size = "277995"}, {name = "res/tiledmaps/mechanism/dilei.atlas", code = "e7e9778dd8960c19eb22303421b90de7", size = "3073"}, {name = "res/tiledmaps/mechanism/dilei.json", code = "fac92c5d3ececbec109b9b1c28b14767", size = "18345"}, @@ -1456,7 +1456,7 @@ local list = { {name = "res/tiledmaps/mechanism/quan.json", code = "c158ed85a026f92fe93f4fdf67f47840", size = "4987"}, {name = "res/tiledmaps/mechanism/quan.png", code = "8f5b1b0c42073b945b01ee48673926e7", size = "3727"}, {name = "res/tiledmaps/mechanism/shandian.atlas", code = "b1d62f09543fbcd1e7091c577bc0a8ff", size = "936"}, - {name = "res/tiledmaps/mechanism/shandian.json", code = "778254e67d206adfc04b7069cd215b24", size = "5016"}, + {name = "res/tiledmaps/mechanism/shandian.json", code = "b95ebac45fc8b51dc3fd3ed5963443ea", size = "5383"}, {name = "res/tiledmaps/mechanism/shandian.png", code = "82bddb401a5de7b44c42871de12dfc63", size = "112863"}, {name = "res/tiledmaps/mechanism/tiemen.atlas", code = "56f4cc7806a957664b84e01c39d5dcb3", size = "171"}, {name = "res/tiledmaps/mechanism/tiemen.json", code = "31da0f01caccb0ab24fb1c3b3312659f", size = "1022"}, diff --git a/res/game.dat b/res/game.dat index ebff4ef..2b7b745 100644 Binary files a/res/game.dat and b/res/game.dat differ diff --git a/res/spine/quanjishou.json b/res/spine/quanjishou.json index 42e40da..4fdafa5 100644 --- a/res/spine/quanjishou.json +++ b/res/spine/quanjishou.json @@ -1,5 +1,5 @@ { -"skeleton": { "hash": "HbUtCcsBcoXC9ev/W1bDEtKIKZk", "spine": "3.4.02", "width": 114.03, "height": 146.4, "images": "" }, +"skeleton": { "hash": "ZGX5FyQyBlObQ6RAAkJFZEg165c", "spine": "3.4.02", "width": 114.03, "height": 146.4, "images": "" }, "bones": [ { "name": "root", "scaleX": 0.55, "scaleY": 0.55 }, { "name": "body", "parent": "root", "length": 91.42, "rotation": 103.34, "x": 1.94, "y": 57.04 }, @@ -33011,13 +33011,11 @@ "events": [ { "time": 0, "name": "skillC1" }, { "time": 0.4333, "name": "skillC1" }, - { "time": 0.5333, "name": "skillC1" }, - { "time": 0.6333, "name": "skillC1" }, + { "time": 0.5666, "name": "skillC1" }, { "time": 0.7333, "name": "skillC1" }, - { "time": 0.8333, "name": "skillC1" }, - { "time": 0.9333, "name": "skillC1" }, - { "time": 1.0666, "name": "skillC1" }, - { "time": 1.2, "name": "skillC1" }, + { "time": 0.8666, "name": "skillC1" }, + { "time": 1, "name": "skillC1" }, + { "time": 1.1666, "name": "skillC1" }, { "time": 1.5666, "name": "skillC1" }, { "time": 2.2333, "name": "skillC1" } ] diff --git a/res/tiledmaps/mechanism/dihuo.json b/res/tiledmaps/mechanism/dihuo.json index f7e8feb..3880ccf 100644 --- a/res/tiledmaps/mechanism/dihuo.json +++ b/res/tiledmaps/mechanism/dihuo.json @@ -1,7 +1,7 @@ { -"skeleton": { "hash": "t300hx3qT9wUQhdgN2Ilje2H5nM", "spine": "3.4.02", "width": 264, "height": 300, "images": "" }, +"skeleton": { "hash": "qNTZkgtXgzm378Gqw6F85eYgn/Y", "spine": "3.4.02", "width": 264, "height": 300, "images": "" }, "bones": [ - { "name": "root" }, + { "name": "root", "y": 10 }, { "name": "dihuosucai/_0021_dihuo_02", "parent": "root", "length": 40.39, "rotation": 90.84, "x": -0.09, "y": -10.19 }, { "name": "dihuosucai/dihuo_guangquan", "parent": "root", "length": 29.56, "rotation": 89.4, "x": -0.11, "y": -71.62 }, { "name": "dihuosucai/dihuo_guangquan2", "parent": "root", "length": 29.56, "rotation": 89.4, "x": -0.11, "y": -71.62 } @@ -59,57 +59,65 @@ "dihuosucai/_0021_dihuo_02": { "attachment": [ { "time": 0, "name": null }, - { "time": 0.6666, "name": "dihuosucai/_0021_dihuo_02" }, - { "time": 0.7333, "name": "dihuosucai/_0020_dihuo_03" }, - { "time": 0.8, "name": "dihuosucai/_0019_dihuo_04" }, - { "time": 0.8333, "name": "dihuosucai/_0018_dihuo_05" }, - { "time": 0.8666, "name": "dihuosucai/_0017_dihuo_06" }, - { "time": 0.9, "name": "dihuosucai/_0016_dihuo_07" }, - { "time": 0.9333, "name": "dihuosucai/_0015_dihuo_08" }, - { "time": 0.9666, "name": "dihuosucai/_0014_dihuo_09" }, - { "time": 1, "name": "dihuosucai/_0013_dihuo_10" }, - { "time": 1.0333, "name": "dihuosucai/_0012_dihuo_11" }, - { "time": 1.0666, "name": "dihuosucai/_0011_dihuo_12" }, - { "time": 1.1, "name": "dihuosucai/_0010_dihuo_13" }, - { "time": 1.1333, "name": "dihuosucai/_0009_dihuo_14" }, - { "time": 1.1666, "name": "dihuosucai/_0008_dihuo_15" }, - { "time": 1.2, "name": "dihuosucai/_0007_dihuo_16" }, - { "time": 1.2333, "name": "dihuosucai/_0006_dihuo_17" }, - { "time": 1.2666, "name": "dihuosucai/_0005_dihuo_18" }, - { "time": 1.3, "name": "dihuosucai/_0004_dihuo_19" }, - { "time": 1.3333, "name": "dihuosucai/_0003_dihuo_20" }, - { "time": 1.3666, "name": "dihuosucai/_0008_dihuo_15" }, - { "time": 1.4, "name": "dihuosucai/_0007_dihuo_16" }, - { "time": 1.4333, "name": "dihuosucai/_0006_dihuo_17" }, - { "time": 1.4666, "name": "dihuosucai/_0005_dihuo_18" }, - { "time": 1.5, "name": "dihuosucai/_0004_dihuo_19" }, - { "time": 1.5333, "name": "dihuosucai/_0003_dihuo_20" }, - { "time": 1.5666, "name": "dihuosucai/_0002_dihuo_21" }, - { "time": 1.6, "name": "dihuosucai/_0001_dihuo_22" }, - { "time": 1.6333, "name": "dihuosucai/_0000_dihuo_23" }, - { "time": 1.7, "name": null }, - { "time": 3, "name": null } + { "time": 0.4333, "name": null }, + { "time": 1.1666, "name": "dihuosucai/_0021_dihuo_02" }, + { "time": 1.2333, "name": "dihuosucai/_0020_dihuo_03" }, + { "time": 1.3, "name": "dihuosucai/_0019_dihuo_04" }, + { "time": 1.3333, "name": "dihuosucai/_0018_dihuo_05" }, + { "time": 1.3666, "name": "dihuosucai/_0017_dihuo_06" }, + { "time": 1.4, "name": "dihuosucai/_0016_dihuo_07" }, + { "time": 1.4333, "name": "dihuosucai/_0015_dihuo_08" }, + { "time": 1.4666, "name": "dihuosucai/_0014_dihuo_09" }, + { "time": 1.5, "name": "dihuosucai/_0013_dihuo_10" }, + { "time": 1.5333, "name": "dihuosucai/_0012_dihuo_11" }, + { "time": 1.5666, "name": "dihuosucai/_0011_dihuo_12" }, + { "time": 1.6, "name": "dihuosucai/_0010_dihuo_13" }, + { "time": 1.6333, "name": "dihuosucai/_0009_dihuo_14" }, + { "time": 1.6666, "name": "dihuosucai/_0008_dihuo_15" }, + { "time": 1.7, "name": "dihuosucai/_0007_dihuo_16" }, + { "time": 1.7333, "name": "dihuosucai/_0006_dihuo_17" }, + { "time": 1.7666, "name": "dihuosucai/_0005_dihuo_18" }, + { "time": 1.8, "name": "dihuosucai/_0004_dihuo_19" }, + { "time": 1.8333, "name": "dihuosucai/_0003_dihuo_20" }, + { "time": 1.8666, "name": "dihuosucai/_0008_dihuo_15" }, + { "time": 1.9, "name": "dihuosucai/_0007_dihuo_16" }, + { "time": 1.9333, "name": "dihuosucai/_0006_dihuo_17" }, + { "time": 1.9666, "name": "dihuosucai/_0005_dihuo_18" }, + { "time": 2, "name": "dihuosucai/_0004_dihuo_19" }, + { "time": 2.0333, "name": "dihuosucai/_0003_dihuo_20" }, + { "time": 2.0666, "name": "dihuosucai/_0002_dihuo_21" }, + { "time": 2.1, "name": "dihuosucai/_0001_dihuo_22" }, + { "time": 2.1333, "name": "dihuosucai/_0000_dihuo_23" }, + { "time": 2.2, "name": null }, + { "time": 4, "name": null } ] }, "dihuosucai/dihuo_guangquan": { "color": [ { "time": 0, "color": "ffdd0038" }, { "time": 0.1666, "color": "ffdd00d1" }, - { "time": 0.3333, "color": "ffdd0000" } + { "time": 0.4, "color": "ffdd0000" }, + { "time": 0.4333, "color": "ffdd0038" }, + { "time": 0.6, "color": "ffdd00d1" }, + { "time": 0.8, "color": "ffdd0000" } ], "attachment": [ { "time": 0, "name": "dihuosucai/dihuo_guangquan" }, - { "time": 0.3333, "name": "dihuosucai/dihuo_guangquan" } + { "time": 0.4, "name": "dihuosucai/dihuo_guangquan" }, + { "time": 0.4333, "name": "dihuosucai/dihuo_guangquan" }, + { "time": 0.8, "name": "dihuosucai/dihuo_guangquan" } ] }, "dihuosucai/dihuo_guangquan2": { "color": [ - { "time": 0.3333, "color": "ffdd0038" }, - { "time": 0.5, "color": "ffdd00d1" }, - { "time": 0.6666, "color": "ffdd0000" } + { "time": 0.4, "color": "ffdd0038", "curve": "stepped" }, + { "time": 0.8, "color": "ffdd0038" }, + { "time": 0.9666, "color": "ffdd00d1" }, + { "time": 1.1666, "color": "ffdd0000" } ], "attachment": [ - { "time": 0.3333, "name": "dihuosucai/dihuo_guangquan" } + { "time": 0.4, "name": "dihuosucai/dihuo_guangquan" }, + { "time": 0.8, "name": "dihuosucai/dihuo_guangquan" } ] } }, @@ -117,36 +125,44 @@ "dihuosucai/dihuo_guangquan": { "translate": [ { "time": 0, "x": 0, "y": 71.45, "curve": "stepped" }, - { "time": 0.3333, "x": 0, "y": 71.45 } + { "time": 0.4, "x": 0, "y": 71.45, "curve": "stepped" }, + { "time": 0.4333, "x": 0, "y": 71.45, "curve": "stepped" }, + { "time": 0.8, "x": 0, "y": 71.45 } ], "scale": [ { "time": 0, "x": 0.222, "y": 0.233 }, { "time": 0.1666, "x": 0.356, "y": 0.363 }, - { "time": 0.3333, "x": 0.222, "y": 0.523 } + { "time": 0.4, "x": 0.222, "y": 0.523 }, + { "time": 0.4333, "x": 0.222, "y": 0.233 }, + { "time": 0.6, "x": 0.356, "y": 0.363 }, + { "time": 0.8, "x": 0.222, "y": 0.523 } ] }, "dihuosucai/dihuo_guangquan2": { "translate": [ - { "time": 0.3333, "x": 0, "y": 71.45, "curve": "stepped" }, - { "time": 0.6666, "x": 0, "y": 71.45 } + { "time": 0.4, "x": 0, "y": 71.45, "curve": "stepped" }, + { "time": 0.8, "x": 0, "y": 71.45, "curve": "stepped" }, + { "time": 1.1666, "x": 0, "y": 71.45 } ], "scale": [ - { "time": 0.3333, "x": 0.222, "y": 0.233 }, - { "time": 0.5, "x": 0.356, "y": 0.363 }, - { "time": 0.6666, "x": 0.222, "y": 0.688 } + { "time": 0.4, "x": 0.222, "y": 0.233, "curve": "stepped" }, + { "time": 0.8, "x": 0.222, "y": 0.233 }, + { "time": 0.9666, "x": 0.356, "y": 0.363 }, + { "time": 1.1666, "x": 0.222, "y": 0.688 } ] }, "root": { "scale": [ - { "time": 0, "x": 2, "y": 2 }, - { "time": 1.2666, "x": 2.55, "y": 2.55 } + { "time": 0, "x": 2, "y": 2, "curve": "stepped" }, + { "time": 0.4333, "x": 2, "y": 2 }, + { "time": 1.7666, "x": 2.55, "y": 2.55 } ] } }, "events": [ - { "time": 0.9333, "name": "atk" }, - { "time": 1.2333, "name": "atk" }, - { "time": 1.5333, "name": "atk" } + { "time": 1.4333, "name": "atk" }, + { "time": 1.7333, "name": "atk" }, + { "time": 2.0333, "name": "atk" } ] } } diff --git a/res/tiledmaps/mechanism/shandian.json b/res/tiledmaps/mechanism/shandian.json index 34a2ef8..1a82d65 100644 --- a/res/tiledmaps/mechanism/shandian.json +++ b/res/tiledmaps/mechanism/shandian.json @@ -1,5 +1,5 @@ { -"skeleton": { "hash": "N86SdGwsXP5vx0gA9MhmFZK2xjw", "spine": "3.4.02", "width": 0, "height": 0, "images": "" }, +"skeleton": { "hash": "B59INCV4KppygoIdwQJJZ/+z2I0", "spine": "3.4.02", "width": 0, "height": 0, "images": "" }, "bones": [ { "name": "root" }, { "name": "atkEff", "parent": "root", "y": 84 }, @@ -45,96 +45,103 @@ "images/guangquan": { "color": [ { "time": 0.1666, "color": "ffffffff" }, - { "time": 0.7666, "color": "ffffff00" } + { "time": 0.5666, "color": "ffffff00" }, + { "time": 0.7666, "color": "ffffffff" }, + { "time": 1.1666, "color": "ffffff00" } ], "attachment": [ - { "time": 0, "name": "images/guangquan" } + { "time": 0, "name": "images/guangquan" }, + { "time": 0.6, "name": "images/guangquan" } ] }, "images/light0001": { "attachment": [ - { "time": 1, "name": "images/light0001" }, - { "time": 1.0666, "name": "images/light0002" }, - { "time": 1.2, "name": "images/light0003" }, - { "time": 1.2333, "name": "images/light0001" }, - { "time": 1.3, "name": "images/light0002" }, - { "time": 1.4333, "name": "images/light0003" }, - { "time": 1.4666, "name": "images/light0001" }, - { "time": 1.5333, "name": "images/light0002" }, - { "time": 1.6666, "name": "images/light0003" }, - { "time": 1.7333, "name": "images/light0004" }, - { "time": 1.8, "name": "images/light0005" }, - { "time": 1.8666, "name": "images/light0006" }, - { "time": 1.9333, "name": "images/light0007" }, - { "time": 2, "name": null } + { "time": 1.3333, "name": "images/light0001" }, + { "time": 1.4, "name": "images/light0002" }, + { "time": 1.5333, "name": "images/light0003" }, + { "time": 1.5666, "name": "images/light0001" }, + { "time": 1.6333, "name": "images/light0002" }, + { "time": 1.7666, "name": "images/light0003" }, + { "time": 1.8, "name": "images/light0001" }, + { "time": 1.8666, "name": "images/light0002" }, + { "time": 2, "name": "images/light0003" }, + { "time": 2.0666, "name": "images/light0004" }, + { "time": 2.1333, "name": "images/light0005" }, + { "time": 2.2, "name": "images/light0006" }, + { "time": 2.2666, "name": "images/light0007" }, + { "time": 2.3333, "name": null } ] }, "images/light1": { "attachment": [ - { "time": 1, "name": "images/light0001" }, - { "time": 1.1333, "name": "images/light0002" }, - { "time": 1.2333, "name": "images/light0001" }, - { "time": 1.3666, "name": "images/light0002" }, - { "time": 1.4666, "name": "images/light0001" }, - { "time": 1.6, "name": "images/light0002" }, - { "time": 1.7, "name": "images/light0003" }, - { "time": 1.7666, "name": "images/light0004" }, - { "time": 1.8333, "name": "images/light0005" }, - { "time": 1.9, "name": "images/light0006" }, - { "time": 1.9666, "name": "images/light0007" }, - { "time": 2.0333, "name": null }, - { "time": 3, "name": null } + { "time": 1.3333, "name": "images/light0001" }, + { "time": 1.4666, "name": "images/light0002" }, + { "time": 1.5666, "name": "images/light0001" }, + { "time": 1.7, "name": "images/light0002" }, + { "time": 1.8, "name": "images/light0001" }, + { "time": 1.9333, "name": "images/light0002" }, + { "time": 2.0333, "name": "images/light0003" }, + { "time": 2.1, "name": "images/light0004" }, + { "time": 2.1666, "name": "images/light0005" }, + { "time": 2.2333, "name": "images/light0006" }, + { "time": 2.3, "name": "images/light0007" }, + { "time": 2.3666, "name": null }, + { "time": 4, "name": null } ] } }, "bones": { "atkEff": { "rotate": [ - { "time": 1, "angle": 0, "curve": "stepped" }, - { "time": 1.2333, "angle": 0, "curve": "stepped" }, - { "time": 1.4666, "angle": 0 } + { "time": 1.3333, "angle": 0, "curve": "stepped" }, + { "time": 1.5666, "angle": 0, "curve": "stepped" }, + { "time": 1.8, "angle": 0 } ], "translate": [ - { "time": 1, "x": 0, "y": 5.49 }, - { "time": 1.0666, "x": 0, "y": 7.44 }, - { "time": 1.2333, "x": 0, "y": 5.49 }, - { "time": 1.3, "x": 0, "y": 7.44 }, - { "time": 1.4666, "x": 0, "y": 5.49 }, - { "time": 1.5333, "x": 0, "y": 7.44 } + { "time": 1.3333, "x": 0, "y": 5.49 }, + { "time": 1.4, "x": 0, "y": 7.44 }, + { "time": 1.5666, "x": 0, "y": 5.49 }, + { "time": 1.6333, "x": 0, "y": 7.44 }, + { "time": 1.8, "x": 0, "y": 5.49 }, + { "time": 1.8666, "x": 0, "y": 7.44 } ], "scale": [ - { "time": 1, "x": 0.781, "y": 1.252, "curve": "stepped" }, - { "time": 1.2333, "x": 0.781, "y": 1.252, "curve": "stepped" }, - { "time": 1.4666, "x": 0.781, "y": 1.252 } + { "time": 1.3333, "x": 0.781, "y": 1.252, "curve": "stepped" }, + { "time": 1.5666, "x": 0.781, "y": 1.252, "curve": "stepped" }, + { "time": 1.8, "x": 0.781, "y": 1.252 } ] }, "atkEff2": { "translate": [ - { "time": 1, "x": 2.61, "y": -48.74, "curve": "stepped" }, - { "time": 1.2333, "x": 2.61, "y": -48.74, "curve": "stepped" }, - { "time": 1.4666, "x": 2.61, "y": -48.74 } + { "time": 1.3333, "x": 2.61, "y": -48.74, "curve": "stepped" }, + { "time": 1.5666, "x": 2.61, "y": -48.74, "curve": "stepped" }, + { "time": 1.8, "x": 2.61, "y": -48.74 } ], "scale": [ - { "time": 1, "x": -1.124, "y": 0.47, "curve": "stepped" }, - { "time": 1.2333, "x": -1.124, "y": 0.47, "curve": "stepped" }, - { "time": 1.4666, "x": -1.124, "y": 0.47 } + { "time": 1.3333, "x": -1.124, "y": 0.47, "curve": "stepped" }, + { "time": 1.5666, "x": -1.124, "y": 0.47, "curve": "stepped" }, + { "time": 1.8, "x": -1.124, "y": 0.47 } ] }, "bone": { "translate": [ - { "time": 0, "x": -97.13, "y": -141.68 } + { "time": 0, "x": -97.13, "y": -141.68, "curve": "stepped" }, + { "time": 0.6, "x": -97.13, "y": -141.68 } ], "scale": [ { "time": 0, "x": 0.105, "y": 0.105 }, { "time": 0.1666, "x": 0.66, "y": 0.66 }, - { "time": 0.7666, "x": 1.367, "y": 1.367 } + { "time": 0.5666, "x": 1.367, "y": 1.367 }, + { "time": 0.6, "x": 0.105, "y": 0.105 }, + { "time": 0.7666, "x": 0.66, "y": 0.66 }, + { "time": 1.1666, "x": 1.367, "y": 1.367 } ] } }, "events": [ - { "time": 1.0666, "name": "atk" }, - { "time": 1.3333, "name": "atk" }, - { "time": 1.6333, "name": "atk" } + { "time": 1.4, "name": "atk" }, + { "time": 1.6666, "name": "atk" }, + { "time": 1.9666, "name": "atk" } ] } } -- libgit2 0.21.2