From ae6f7ce7a2071508a8f4204775f6fd8d566a98ed Mon Sep 17 00:00:00 2001 From: zhaolu <> Date: Tue, 27 Feb 2018 14:42:06 +0800 Subject: [PATCH] auto package --- res/csvdata.dat | Bin 1217288 -> 0 bytes res/flist | 95 +++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------ res/game.dat | Bin 516716 -> 0 bytes res/icon/buff_icon/fangyu_jiafang.png | Bin 5476 -> 0 bytes res/icon/buff_icon/fangyu_shanbi.png | Bin 5372 -> 0 bytes res/icon/buff_icon/fangyu_wudi.png | Bin 6744 -> 0 bytes res/icon/buff_icon/gongji_baoji.png | Bin 5284 -> 0 bytes res/icon/buff_icon/gongji_fantan.png | Bin 5168 -> 0 bytes res/icon/buff_icon/gongji_jiagong.png | Bin 4268 -> 0 bytes res/icon/buff_icon/huifu_hudun.png | Bin 5076 -> 0 bytes res/icon/buff_icon/huifu_huixue.png | Bin 5576 -> 0 bytes res/icon/buff_icon/huifu_xixue.png | Bin 6500 -> 0 bytes res/music/audio/hint_click.mp3 | Bin 0 -> 5477 bytes res/music/audio/hint_close.mp3 | Bin 0 -> 4223 bytes res/music/audio/hint_compose02.mp3 | Bin 0 -> 35152 bytes res/music/audio/hint_decompose02.mp3 | Bin 0 -> 13418 bytes res/music/audio/hint_deequip.mp3 | Bin 0 -> 15090 bytes res/music/audio/hint_equip.mp3 | Bin 0 -> 13783 bytes res/music/audio/hint_gem.mp3 | Bin 0 -> 14254 bytes res/music/audio/hint_null.mp3 | Bin 0 -> 4282 bytes res/music/audio/hint_pause.mp3 | Bin 0 -> 14316 bytes res/music/audio/hint_sell.mp3 | Bin 0 -> 7149 bytes res/music/sound/atk_guangji.mp3 | Bin 0 -> 4752 bytes res/spine/hudie.atlas | 28 ++++++++++++++-------------- res/spine/hudie.json | 60 +++++++++++++++++++++++++++++++++++++++++++++++------------- res/spine/hudie.png | Bin 1320 -> 0 bytes res/tiledmaps/hero/biaozhi_baowu.atlas | 6 +++--- res/tiledmaps/hero/biaozhi_baowu.json | 26 ++++++++------------------ res/tiledmaps/hero/biaozhi_baowu.png | Bin 1708 -> 0 bytes res/tiledmaps/hero/biaozhi_jineng.atlas | 6 +++--- res/tiledmaps/hero/biaozhi_jineng.json | 39 ++++++++++++++------------------------- res/tiledmaps/hero/biaozhi_jineng.png | Bin 2396 -> 0 bytes res/tiledmaps/hero/biaozhi_wuqi.atlas | 6 +++--- res/tiledmaps/hero/biaozhi_wuqi.json | 36 +++++++++++++----------------------- res/tiledmaps/hero/biaozhi_wuqi.png | Bin 2772 -> 0 bytes res/ui/hero/skillTree/star_1_active.atlas | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++-------- res/ui/hero/skillTree/star_1_active.json | 136 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------ res/ui/hero/skillTree/star_1_active.png | Bin 8162 -> 0 bytes res/ui/hero/skillTree/star_2_active.atlas | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++-------- res/ui/hero/skillTree/star_2_active.json | 136 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------ res/ui/hero/skillTree/star_2_active.png | Bin 8162 -> 0 bytes res/ui/hero/skillTree/star_3_active.atlas | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++-------- res/ui/hero/skillTree/star_3_active.json | 136 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------ res/ui/hero/skillTree/star_3_active.png | Bin 8162 -> 0 bytes res/ui/hero/skillTree/star_4_active.atlas | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++-------- res/ui/hero/skillTree/star_4_active.json | 136 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------ res/ui/hero/skillTree/star_4_active.png | Bin 8162 -> 0 bytes res/ui/hero/skillTree/star_5_active.atlas | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++++---- res/ui/hero/skillTree/star_5_active.json | 150 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------- res/ui/hero/skillTree/star_5_active.png | Bin 5128 -> 0 bytes res/ui/hero/skillTree/star_6_active.atlas | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++++---- res/ui/hero/skillTree/star_6_active.json | 150 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------- res/ui/hero/skillTree/star_6_active.png | Bin 5128 -> 0 bytes 53 files changed, 1230 insertions(+), 262 deletions(-) create mode 100644 res/music/audio/hint_click.mp3 create mode 100644 res/music/audio/hint_close.mp3 create mode 100644 res/music/audio/hint_compose02.mp3 create mode 100644 res/music/audio/hint_decompose02.mp3 create mode 100644 res/music/audio/hint_deequip.mp3 create mode 100644 res/music/audio/hint_equip.mp3 create mode 100644 res/music/audio/hint_gem.mp3 create mode 100644 res/music/audio/hint_null.mp3 create mode 100644 res/music/audio/hint_pause.mp3 create mode 100644 res/music/audio/hint_sell.mp3 create mode 100644 res/music/sound/atk_guangji.mp3 diff --git a/res/csvdata.dat b/res/csvdata.dat index fabdcc6..8bd2ec2 100644 Binary files a/res/csvdata.dat and b/res/csvdata.dat differ diff --git a/res/flist b/res/flist index 14db1a3..7613a80 100644 --- a/res/flist +++ b/res/flist @@ -1,7 +1,7 @@ local list = { - ver = "1.0.24", + ver = "1.0.25", stage = { - {name = "res/game.dat", code = "afa39278914d755b46a8cf4e85058708", size = "516716"}, + {name = "res/game.dat", code = "53cf10b489979ceef9c0660c9e632979", size = "517144"}, {name = "res/paint/paint12.png", code = "fa39af5b6d4d2c67d449eab9d6d4e045", size = "44108"}, {name = "res/paint/paint06.png", code = "44e77c2012140b190b09f55cbba3b935", size = "37840"}, {name = "res/paint/paint07.png", code = "0f6a85bf933fd2489067031fec1579e9", size = "8024"}, @@ -43,6 +43,16 @@ local list = { {name = "res/paint/paint22.png", code = "6f44ad3843db52aeeecc1d82074d7ca2", size = "20856"}, {name = "res/paint/paint23.png", code = "6e6a824ba407d72e61b8ff0a6d73a764", size = "28596"}, {name = "res/paint/paint_icon.png", code = "4582b7007fdac82aed66807cf6cd65a5", size = "4020"}, + {name = "res/music/audio/hint_decompose02.mp3", code = "1a175f12f2c843eb42b1f7b7f9f6e463", size = "13418"}, + {name = "res/music/audio/hint_equip.mp3", code = "c543b7eddade75c789df5d0f1991de57", size = "13783"}, + {name = "res/music/audio/hint_compose02.mp3", code = "747d7f18e6413a15cefd3df7b980cc11", size = "35152"}, + {name = "res/music/audio/hint_deequip.mp3", code = "e6947998818ff2b3f62243289b1613bb", size = "15090"}, + {name = "res/music/audio/hint_sell.mp3", code = "9a24b1d7c0253561e45ef423a1103103", size = "7149"}, + {name = "res/music/audio/hint_gem.mp3", code = "27191623b548a043124529595cd7a15b", size = "14254"}, + {name = "res/music/audio/hint_close.mp3", code = "808c469e4ea0492b427c3dd1b586cb82", size = "4223"}, + {name = "res/music/audio/hint_pause.mp3", code = "ea6c44e8f9ccd5171a7210856d9a6484", size = "14316"}, + {name = "res/music/audio/hint_click.mp3", code = "cce517b7a32f6eebc99c41f580994fec", size = "5477"}, + {name = "res/music/audio/hint_null.mp3", code = "955bcc2e18f51b3f2a0d87eddb20a40d", size = "4282"}, {name = "res/music/bg/home3.mp3", code = "df79c1cef00e44eefe1912d45d94d298", size = "2209690"}, {name = "res/music/bg/boss_bright.mp3", code = "81c34667d4c13c6b9465f1c66ce25d22", size = "1825572"}, {name = "res/music/bg/home2.mp3", code = "9adb7bb248a1b2d9a7ab8cc1406716b5", size = "3977750"}, @@ -197,6 +207,7 @@ local list = { {name = "res/music/sound/qiang_a1.mp3", code = "9b297ec3d48f8ccfcaac85384710b602", size = "15009"}, {name = "res/music/sound/shout_jurennuhou2.mp3", code = "549b4541e0c6b0844d7826235dac011a", size = "23867"}, {name = "res/music/sound/fashi_hurt4.mp3", code = "3e10adce265273f9691985197bdfdfd1", size = "12426"}, + {name = "res/music/sound/atk_guangji.mp3", code = "d5d9b1d0d671c67c0c4cbd0f1a515c63", size = "4752"}, {name = "res/music/sound/bomb04.mp3", code = "04a5ae4a9ad7cedebe4c950977b89f5c", size = "56473"}, {name = "res/music/sound/quan_B2.mp3", code = "1d93ca685df5a4f3f308e329b072f597", size = "16457"}, {name = "res/music/sound/bomb.mp3", code = "c8e5780d5eb666d351fb34a13c05110e", size = "78474"}, @@ -480,37 +491,37 @@ local list = { {name = "res/ui/hero/skillTree/star_4_disable.png", code = "63f2693b606117fdf50effb8bdc9b974", size = "9878"}, {name = "res/ui/hero/skillTree/star_3_levelup.png", code = "0c70a2a6fb05de654f1d5b2284fef802", size = "7827"}, {name = "res/ui/hero/skillTree/star_1_levelup.atlas", code = "2ff6e859deebbb0737484b464d86b4a4", size = "278"}, - {name = "res/ui/hero/skillTree/star_6_active.png", code = "e6ed47ba157685f12077b938b8158226", size = "5128"}, + {name = "res/ui/hero/skillTree/star_6_active.png", code = "eeb9234c45a5e6919009069f3adad329", size = "39022"}, {name = "res/ui/hero/skillTree/star_5_levelup.atlas", code = "bdc6bdb7ba6a01b325814b4c923b0996", size = "182"}, - {name = "res/ui/hero/skillTree/star_4_active.json", code = "2f18e6914783796823dda8543ddc4ab5", size = "1511"}, + {name = "res/ui/hero/skillTree/star_4_active.json", code = "373d9c4351c7140ed86625b1fb6145cd", size = "5594"}, {name = "res/ui/hero/skillTree/star_3_disable.atlas", code = "3728d6639a59610ba44bac0f85f2d9cd", size = "279"}, {name = "res/ui/hero/skillTree/star_2_levelup.atlas", code = "3d8c3b5dad91332654bf9d6f2b4d86d4", size = "281"}, - {name = "res/ui/hero/skillTree/star_3_active.png", code = "d531e40b1f0b17c0be9acc13ebd54736", size = "8162"}, + {name = "res/ui/hero/skillTree/star_3_active.png", code = "eeb9234c45a5e6919009069f3adad329", size = "39022"}, {name = "res/ui/hero/skillTree/star_4_disable.atlas", code = "3c970ccb7be0e9b035fc79c9239ccdf1", size = "279"}, {name = "res/ui/hero/skillTree/star_6_levelup.atlas", code = "ba3a8daae7d191cb2140ff8e0ac1babf", size = "183"}, - {name = "res/ui/hero/skillTree/star_1_active.json", code = "fc6a8a0228c2f04dde49c7bd8c26d6d4", size = "1511"}, + {name = "res/ui/hero/skillTree/star_1_active.json", code = "373d9c4351c7140ed86625b1fb6145cd", size = "5594"}, {name = "res/ui/hero/skillTree/star_6_levelup.png", code = "c0bf1a14befd5cd9384b218b97077359", size = "5111"}, {name = "res/ui/hero/skillTree/star_1_disable.png", code = "63f2693b606117fdf50effb8bdc9b974", size = "9878"}, {name = "res/ui/hero/skillTree/star_1_disable.json", code = "fdd9435fcd670f08609f3c6b2430f81c", size = "1446"}, {name = "res/ui/hero/skillTree/star_6_disable.json", code = "5e38d86dfb259ab8d096d480188802c3", size = "1279"}, - {name = "res/ui/hero/skillTree/star_1_active.atlas", code = "8ce471b43a18c82057fa7d60c98a765a", size = "279"}, - {name = "res/ui/hero/skillTree/star_6_active.atlas", code = "bfa90c5b18e89f5723b4c9412c7a67e3", size = "183"}, + {name = "res/ui/hero/skillTree/star_1_active.atlas", code = "1400e4ffe478c686edc1a5bfeffcf9fd", size = "932"}, + {name = "res/ui/hero/skillTree/star_6_active.atlas", code = "e77560345b699a8e4e887f4b497cc219", size = "932"}, {name = "res/ui/hero/skillTree/tree_3.png", code = "8b59895a6da9dbcda28637c234f0f10a", size = "95704"}, {name = "res/ui/hero/skillTree/star_2_disable.png", code = "63f2693b606117fdf50effb8bdc9b974", size = "9878"}, {name = "res/ui/hero/skillTree/tree_2.png", code = "2d44c0f437f609db74ef93ad02df5529", size = "44442"}, {name = "res/ui/hero/skillTree/star_5_levelup.png", code = "1a694a2d0f1dff7d10e105bf5c8985dd", size = "4958"}, - {name = "res/ui/hero/skillTree/star_2_active.json", code = "2f18e6914783796823dda8543ddc4ab5", size = "1511"}, + {name = "res/ui/hero/skillTree/star_2_active.json", code = "373d9c4351c7140ed86625b1fb6145cd", size = "5594"}, {name = "res/ui/hero/skillTree/line_1_active.png", code = "6052f723f0a1315b6dd3f3aa12c81aea", size = "220"}, {name = "res/ui/hero/skillTree/tree_1.png", code = "b1924fd9d861aab744e3b38cedb54baf", size = "54003"}, - {name = "res/ui/hero/skillTree/star_4_active.png", code = "d531e40b1f0b17c0be9acc13ebd54736", size = "8162"}, + {name = "res/ui/hero/skillTree/star_4_active.png", code = "eeb9234c45a5e6919009069f3adad329", size = "39022"}, {name = "res/ui/hero/skillTree/reset_btn.png", code = "2dae5025d85e72d6d9c90a8b5dea2d9a", size = "840"}, - {name = "res/ui/hero/skillTree/star_1_active.png", code = "d531e40b1f0b17c0be9acc13ebd54736", size = "8162"}, + {name = "res/ui/hero/skillTree/star_1_active.png", code = "eeb9234c45a5e6919009069f3adad329", size = "39022"}, {name = "res/ui/hero/skillTree/star_1_levelup.json", code = "29322b61585a6ccb5888b27777d9e43c", size = "4422"}, {name = "res/ui/hero/skillTree/star_6_levelup.json", code = "80e656a9904bbfc66aa735c11dcedbc0", size = "2608"}, - {name = "res/ui/hero/skillTree/star_2_active.png", code = "d531e40b1f0b17c0be9acc13ebd54736", size = "8162"}, + {name = "res/ui/hero/skillTree/star_2_active.png", code = "eeb9234c45a5e6919009069f3adad329", size = "39022"}, {name = "res/ui/hero/skillTree/star_4_levelup.json", code = "aa69376adcf00fed2fd78ad6daf5dd23", size = "4423"}, {name = "res/ui/hero/skillTree/star_3_levelup.json", code = "1427b82ca62ad0e0a0f309787a6e88b3", size = "4459"}, - {name = "res/ui/hero/skillTree/star_5_active.json", code = "0b5b82abb943c309dcfdb6c05bebb477", size = "1085"}, + {name = "res/ui/hero/skillTree/star_5_active.json", code = "373d9c4351c7140ed86625b1fb6145cd", size = "5594"}, {name = "res/ui/hero/skillTree/line_2_disable.png", code = "cbd04d4b88f0b753a038e09827b80897", size = "154"}, {name = "res/ui/hero/skillTree/main_bg.png", code = "146e09a65853f2ca068316114d5ca6ba", size = "336312"}, {name = "res/ui/hero/skillTree/info_line.png", code = "24c3983ffe63b47162f2cd24f6ebf118", size = "2001"}, @@ -527,23 +538,23 @@ local list = { {name = "res/ui/hero/skillTree/star_3_levelup.atlas", code = "ff1f7aea1e8f8238e87fd67b4a47e589", size = "281"}, {name = "res/ui/hero/skillTree/info_arrow.png", code = "b3a40bb7881f9d8310bd3477ab8ff1d3", size = "2149"}, {name = "res/ui/hero/skillTree/line_1_disable.png", code = "a07a5b842b3857d8db0f11b5929c1ff2", size = "170"}, - {name = "res/ui/hero/skillTree/star_4_active.atlas", code = "1eb18096c872eb11515465897fc00913", size = "279"}, - {name = "res/ui/hero/skillTree/star_6_active.json", code = "0b5b82abb943c309dcfdb6c05bebb477", size = "1085"}, - {name = "res/ui/hero/skillTree/star_3_active.atlas", code = "2029d7773f6c65491dc82a86529b6827", size = "279"}, + {name = "res/ui/hero/skillTree/star_4_active.atlas", code = "bbc9f6cadd2adfb17cd7240077ec630b", size = "932"}, + {name = "res/ui/hero/skillTree/star_6_active.json", code = "373d9c4351c7140ed86625b1fb6145cd", size = "5594"}, + {name = "res/ui/hero/skillTree/star_3_active.atlas", code = "8f2c86744812ad30232d8136f00e1f0a", size = "932"}, {name = "res/ui/hero/skillTree/star_4_disable.json", code = "346e84600560f959e9e36ad30e446a6b", size = "1446"}, {name = "res/ui/hero/skillTree/star_3_disable.json", code = "50021349be8317ba3f3d9dffd4c08003", size = "1446"}, - {name = "res/ui/hero/skillTree/star_3_active.json", code = "50d1a7a71280d0d0f29842492d68d41e", size = "1477"}, + {name = "res/ui/hero/skillTree/star_3_active.json", code = "373d9c4351c7140ed86625b1fb6145cd", size = "5594"}, {name = "res/ui/hero/skillTree/star_3_disable.png", code = "63f2693b606117fdf50effb8bdc9b974", size = "9878"}, - {name = "res/ui/hero/skillTree/star_2_active.atlas", code = "d3aab958a4ba4efa5b4625c8fb8ecd51", size = "279"}, + {name = "res/ui/hero/skillTree/star_2_active.atlas", code = "db87c1446282c513184cc43300c7c51d", size = "932"}, {name = "res/ui/hero/skillTree/star_2_disable.atlas", code = "a172bca351877cbeb5a551879658ac1b", size = "279"}, - {name = "res/ui/hero/skillTree/star_5_active.atlas", code = "64fe9fbc6df4093a9e1ca489c94bcbdf", size = "183"}, + {name = "res/ui/hero/skillTree/star_5_active.atlas", code = "a8a11445f8cc8707f9722626205bc259", size = "932"}, {name = "res/ui/hero/skillTree/star_2_disable.json", code = "2554545b8bbc73b5b393a77451b0b4ac", size = "1480"}, {name = "res/ui/hero/skillTree/star_4_levelup.png", code = "e7d04abc220ff647bb717785aa84bc21", size = "7719"}, {name = "res/ui/hero/skillTree/info_bg.png", code = "0d3c149bf92ae8f8022c6802d2008c1e", size = "2847"}, {name = "res/ui/hero/skillTree/star_5_disable.json", code = "361503eecaf88d8c5264a5f15a7a7340", size = "1241"}, {name = "res/ui/hero/skillTree/star_4_levelup.atlas", code = "daef8a99d6862904c980bd918baa6aa1", size = "279"}, {name = "res/ui/hero/skillTree/star_6_disable.atlas", code = "98fbecfdd01a327df68f667d12e74dd3", size = "183"}, - {name = "res/ui/hero/skillTree/star_5_active.png", code = "e6ed47ba157685f12077b938b8158226", size = "5128"}, + {name = "res/ui/hero/skillTree/star_5_active.png", code = "eeb9234c45a5e6919009069f3adad329", size = "39022"}, {name = "res/ui/hero/txt_equip.png", code = "c09d459c7f1f7b6b6e7376d8971b0d0f", size = "680"}, {name = "res/ui/hero/equip_bg_2.png", code = "ae29076335611fa6a113b68819a89eb2", size = "10360"}, {name = "res/ui/hero/equip_bg_1.png", code = "771d20a78854af99a30b0e4473a0d779", size = "9283"}, @@ -1173,7 +1184,7 @@ local list = { {name = "res/spine/heidong.json", code = "499c9cca2c3b55c308f9db3493bd9b08", size = "48848"}, {name = "res/spine/emochui.json", code = "f28ec631611711abfdf21986c45cc004", size = "185231"}, {name = "res/spine/emoniao.atlas", code = "62cf5fb16e8cbae2f8540baf23f63132", size = "2483"}, - {name = "res/spine/hudie.json", code = "2b3fc7ec6b2687ce560196195cf03d99", size = "110620"}, + {name = "res/spine/hudie.json", code = "03032ee19ac794fd5a42a81f9e8e854c", size = "111714"}, {name = "res/spine/jixiezhu.png", code = "7e4bf60f077c40a5b56228f8b686c17a", size = "88180"}, {name = "res/spine/tj.json", code = "cb018877312dad4f177da378ce70883c", size = "93089"}, {name = "res/spine/emo.json", code = "4c112d65f882a7b17fe1bb374e8112b4", size = "504416"}, @@ -1269,7 +1280,7 @@ local list = { {name = "res/spine/ladisi.json", code = "20e7f02f473c9ff068bbb2d181a3df39", size = "1366485"}, {name = "res/spine/silingguai.atlas", code = "a65855e2603cee7a25f5bb97af80db37", size = "4694"}, {name = "res/spine/juren.png", code = "b25aee685ea2e36b43b0d24bdddcdb08", size = "97272"}, - {name = "res/spine/hudie.png", code = "a77475c7b35e9128daac7baf4b959250", size = "1320"}, + {name = "res/spine/hudie.png", code = "79a0d5b76cd9f3e4403465ec8d4c2207", size = "1488"}, {name = "res/spine/huoyuansu.atlas", code = "665329f3e22a941d23774b9937b0adb7", size = "9659"}, {name = "res/spine/huoyuansuguai.json", code = "46197476b181fd067dddf1c2a2607890", size = "224201"}, {name = "res/spine/lingzhiyan.png", code = "a4e670ec03388386a50e21a86df8df84", size = "17308"}, @@ -1369,7 +1380,7 @@ local list = { {name = "res/spine/jumo.png", code = "f2ce33ccbd44d02108d41466ea70186f", size = "115728"}, {name = "res/spine/zhizhuxiao.json", code = "92775abff9bafe95aa9c3868058882a3", size = "264691"}, {name = "res/spine/cike.png", code = "a62f24162e67b4a695b708d21dc249ce", size = "489976"}, - {name = "res/spine/hudie.atlas", code = "579951a7a18e504e478e284951a44126", size = "439"}, + {name = "res/spine/hudie.atlas", code = "f80d7e2a1aa8752152f33abe03efea40", size = "442"}, {name = "res/spine/huoshou.png", code = "b55643b56519a851481a3fd0ce345bb2", size = "191752"}, {name = "res/spine/cike.json", code = "559442e3048b0c458c253193828aed01", size = "1840358"}, {name = "res/spine/quanjishou.atlas", code = "6a5a0f267ac76a909386733b8c10ec85", size = "34652"}, @@ -1979,12 +1990,12 @@ local list = { {name = "res/tiledmaps/cpt01/zhongjing02.png", code = "435f7edfb621d3482998942bf29fe960", size = "42180"}, {name = "res/tiledmaps/hero/hero1_guang.json", code = "ac6cd51b051629ec3e261e2b8507bb1d", size = "509"}, {name = "res/tiledmaps/hero/hero3_ta.json", code = "97d2f7071ceb4dfb509e6187415134e3", size = "5072"}, - {name = "res/tiledmaps/hero/biaozhi_baowu.json", code = "571046821bdd93123d5ae5208714aba5", size = "5532"}, - {name = "res/tiledmaps/hero/biaozhi_jineng.atlas", code = "ab7ab0b1a6e7fa9b1987143878f9b1c4", size = "183"}, + {name = "res/tiledmaps/hero/biaozhi_baowu.json", code = "3f5b989282e3a885ea750df543ab06f7", size = "4984"}, + {name = "res/tiledmaps/hero/biaozhi_jineng.atlas", code = "edb857f26998075104b46227a7ce6c61", size = "183"}, {name = "res/tiledmaps/hero/hero1_zhutai.atlas", code = "8fecf5f670819ef28c5921958ea3f757", size = "791"}, - {name = "res/tiledmaps/hero/biaozhi_baowu.atlas", code = "dbed3b94dc4f929d0baf5dcf919fe389", size = "182"}, + {name = "res/tiledmaps/hero/biaozhi_baowu.atlas", code = "df7d54d64cb99544c76c8cf1c4852aab", size = "182"}, {name = "res/tiledmaps/hero/hero2_twt.json", code = "96d86a1c99991819635401fcceb068ef", size = "6273"}, - {name = "res/tiledmaps/hero/biaozhi_wuqi.atlas", code = "670c12bef1133914afd378f3573d8e2d", size = "179"}, + {name = "res/tiledmaps/hero/biaozhi_wuqi.atlas", code = "0c9c23ee4f712d1b50da2be873fc82fd", size = "179"}, {name = "res/tiledmaps/hero/hero1_men.atlas", code = "42e8455d8308b92fde7406796dfab098", size = "676"}, {name = "res/tiledmaps/hero/hero3_ta.png", code = "855c2d766f38371ae98ef045f34ea15f", size = "18136"}, {name = "res/tiledmaps/hero/hero1_men.png", code = "f4dcb113b0cd6fca4edd4b761ea1d432", size = "12752"}, @@ -2003,12 +2014,12 @@ local list = { {name = "res/tiledmaps/hero/hero2_bilu.png", code = "584118edbff5e878a3a7b03e622069c4", size = "72208"}, {name = "res/tiledmaps/hero/hero1_chuang.json", code = "73b72451c6bab4909f8e24042998b4ef", size = "838"}, {name = "res/tiledmaps/hero/house_1.png", code = "ffff14007b3ee99bfda2a67e3ca2cd1a", size = "76192"}, - {name = "res/tiledmaps/hero/biaozhi_wuqi.png", code = "58b65e634f98220b4356ce397e11deba", size = "2772"}, + {name = "res/tiledmaps/hero/biaozhi_wuqi.png", code = "e84ddf4e74d785a19a413d22a3969817", size = "2644"}, {name = "res/tiledmaps/hero/side_mask.png", code = "b4ca8788aaf52c9c47611482371e8c9d", size = "740"}, - {name = "res/tiledmaps/hero/biaozhi_jineng.png", code = "7efe5246990927d8221318c4bf456cfc", size = "2396"}, + {name = "res/tiledmaps/hero/biaozhi_jineng.png", code = "963e6582d339bd0f72d2148d85aff34f", size = "2336"}, {name = "res/tiledmaps/hero/hero1_guang.png", code = "66f5ac1576e1cf6eabbbe45e73f72430", size = "196560"}, {name = "res/tiledmaps/hero/hero2_men.png", code = "6da58c124c07b24747c312aa4df16abe", size = "6396"}, - {name = "res/tiledmaps/hero/biaozhi_jineng.json", code = "6e3e3e78398db4e1c26df1e0130577db", size = "5945"}, + {name = "res/tiledmaps/hero/biaozhi_jineng.json", code = "a7a0fcda9c83a94e575373820ab64b8f", size = "5346"}, {name = "res/tiledmaps/hero/hero3_shu.atlas", code = "f34ab85e6b3dc0c7f584a70912264b8c", size = "3066"}, {name = "res/tiledmaps/hero/hero1_jianzhong.atlas", code = "141277a0285594d90991379be44c3f72", size = "600"}, {name = "res/tiledmaps/hero/hero1_jianzhong.json", code = "79effeb0d4af7a3944811c17d1c0b13f", size = "8560"}, @@ -2029,7 +2040,7 @@ local list = { {name = "res/tiledmaps/hero/hero3_lun.atlas", code = "1defcb48503a9cb058e69cfa181107c9", size = "674"}, {name = "res/tiledmaps/hero/hero3_shu.json", code = "efd4824b9c09a7935ff236b35ef80269", size = "58521"}, {name = "res/tiledmaps/hero/hero2_men.atlas", code = "5e8c049dcb2f54ed08fa14700bf7d98f", size = "275"}, - {name = "res/tiledmaps/hero/biaozhi_baowu.png", code = "df6372b0a134b4459cb58ff18ee931e0", size = "1708"}, + {name = "res/tiledmaps/hero/biaozhi_baowu.png", code = "cf8e3c731983609c997dce59b96eff32", size = "1772"}, {name = "res/tiledmaps/hero/null.atlas", code = "33506e6d7e4b2d698b62bee8479a6878", size = "163"}, {name = "res/tiledmaps/hero/herohouse_2.json", code = "6c8eedc109fb010d1336075e535b75b4", size = "130922"}, {name = "res/tiledmaps/hero/herohouse_3.json", code = "d4ed1510c92169ca1aac11308a8e529d", size = "1019977"}, @@ -2042,7 +2053,7 @@ local list = { {name = "res/tiledmaps/hero/hero3_shu.png", code = "8b5a443322fb4bda6018852a6cb28e4e", size = "156464"}, {name = "res/tiledmaps/hero/hero2_twt.png", code = "40e5538cc6276438705f74146be44889", size = "8716"}, {name = "res/tiledmaps/hero/hero1_twt.atlas", code = "17b79dd68f8569fa6cef473830cfc956", size = "1678"}, - {name = "res/tiledmaps/hero/biaozhi_wuqi.json", code = "427c5841ab2b777e0af7ef560c009905", size = "5727"}, + {name = "res/tiledmaps/hero/biaozhi_wuqi.json", code = "ee5e35cc282c751f045f4933dac5ff70", size = "5123"}, {name = "res/tiledmaps/hero/hero1_chuang.png", code = "b47dd48f63df13d2b1927e345654737f", size = "8104"}, {name = "res/tiledmaps/hero/hero2_men.json", code = "96742e2aa703e078253a8d5de077b0bf", size = "789"}, {name = "res/tiledmaps/hero/hero3_men.json", code = "f1a8350b75a12661eb0829a5ff55d84a", size = "9127"}, @@ -2368,7 +2379,7 @@ local list = { {name = "res/shaders/banish.frag", code = "3dd3cbf9e81546e29e2750506d419fe1", size = "385"}, {name = "res/shaders/invisible.vert", code = "065e2cd9329d827b1edfe934333ba09f", size = "342"}, {name = "res/shaders/mirror.frag", code = "de1fde94e8a2a1feb4c6233868d1523e", size = "394"}, - {name = "res/csvdata.dat", code = "400f66952c67332020d4ab6c7ebe7676", size = "1217288"}, + {name = "res/csvdata.dat", code = "28f785971e105b1f199031b57b7b2b2b", size = "1220864"}, {name = "res/font/OLDENGL.ttf", code = "c34445985276137bcb98e7868a4ebb88", size = "36384"}, {name = "res/font/SourceHanSansCN-Medium.ttf", code = "98ab7073a7639362cc7f8872234d9968", size = "8727684"}, {name = "res/icon/battle/hero_weapon_2.png", code = "6032282fe1f3a40bb22770338cf70da0", size = "18436"}, @@ -3198,15 +3209,15 @@ local list = { {name = "res/icon/equip_big/quan_07_01.png", code = "0e28ae086da65dc5fed3126bd1cde8c1", size = "4036"}, {name = "res/icon/equip_big/bishou_02_03.png", code = "6e103ce33bc9cb741634c17c670ec0cc", size = "3228"}, {name = "res/icon/equip_big/fazhang_13_01.png", code = "bf3d603298f91a6c7ca7bfb6d581e1ad", size = "5480"}, - {name = "res/icon/buff_icon/gongji_fantan.png", code = "12f83ed941027d9b99678fefb3f4be81", size = "5168"}, - {name = "res/icon/buff_icon/huifu_xixue.png", code = "3e3212be801007452ab7aa2b70154fbf", size = "6500"}, - {name = "res/icon/buff_icon/fangyu_shanbi.png", code = "fb24bd56e678d9ce3bd7f238bdc4487e", size = "5372"}, - {name = "res/icon/buff_icon/huifu_hudun.png", code = "d4707f9aa08cab688a237f6efad8a62b", size = "5076"}, - {name = "res/icon/buff_icon/fangyu_wudi.png", code = "1fa9cfb4f93dd7ad8ad41d6d654371d7", size = "6744"}, - {name = "res/icon/buff_icon/fangyu_jiafang.png", code = "01c3abf2e8c482428cada284f1cf164a", size = "5476"}, - {name = "res/icon/buff_icon/huifu_huixue.png", code = "fa155398b3703a1d99ba0b57bfd48436", size = "5576"}, - {name = "res/icon/buff_icon/gongji_baoji.png", code = "f246b08f3b2c78c30a3d1841edec4c2b", size = "5284"}, - {name = "res/icon/buff_icon/gongji_jiagong.png", code = "b0c421966ec778f26882c420a8f76f4c", size = "4268"}, + {name = "res/icon/buff_icon/gongji_fantan.png", code = "722b0e45b1655d937006f474fa56755d", size = "5696"}, + {name = "res/icon/buff_icon/huifu_xixue.png", code = "7427e03a995853191d66345982b9ee2d", size = "7144"}, + {name = "res/icon/buff_icon/fangyu_shanbi.png", code = "9e9a3b04c9b3486207cb0bacfdf5fed2", size = "6096"}, + {name = "res/icon/buff_icon/huifu_hudun.png", code = "551b93bc5dd10d7a78d6e1d77037f33c", size = "5412"}, + {name = "res/icon/buff_icon/fangyu_wudi.png", code = "3e6db2b948b48185a19ccf1034415174", size = "8076"}, + {name = "res/icon/buff_icon/fangyu_jiafang.png", code = "8a9096ef49f798d3b3b630c581eeb108", size = "6100"}, + {name = "res/icon/buff_icon/huifu_huixue.png", code = "54bd1e1c1cd9139c1b34d28e550e2c80", size = "5964"}, + {name = "res/icon/buff_icon/gongji_baoji.png", code = "3298e701792b26bf0525f13d4d6ea765", size = "5692"}, + {name = "res/icon/buff_icon/gongji_jiagong.png", code = "a234b9dc29aadf75509f3fdad2e73464", size = "3600"}, {name = "res/icon/gem/gem407.png", code = "62412013e0e1e7fb68760324b35cef12", size = "3076"}, {name = "res/icon/gem/gem605.png", code = "a1a398c44b301b541888bf1e46904411", size = "3096"}, {name = "res/icon/gem/gem201.png", code = "f50adbd35d80b9fff4ed785239109d5d", size = "2760"}, diff --git a/res/game.dat b/res/game.dat index 26d17ce..55e6c7d 100644 Binary files a/res/game.dat and b/res/game.dat differ diff --git a/res/icon/buff_icon/fangyu_jiafang.png b/res/icon/buff_icon/fangyu_jiafang.png index a81c932..34a26f3 100644 Binary files a/res/icon/buff_icon/fangyu_jiafang.png and b/res/icon/buff_icon/fangyu_jiafang.png differ diff --git a/res/icon/buff_icon/fangyu_shanbi.png b/res/icon/buff_icon/fangyu_shanbi.png index f714d75..2542662 100644 Binary files a/res/icon/buff_icon/fangyu_shanbi.png and b/res/icon/buff_icon/fangyu_shanbi.png differ diff --git a/res/icon/buff_icon/fangyu_wudi.png b/res/icon/buff_icon/fangyu_wudi.png index b8fded5..3d08d82 100644 Binary files a/res/icon/buff_icon/fangyu_wudi.png and b/res/icon/buff_icon/fangyu_wudi.png differ diff --git a/res/icon/buff_icon/gongji_baoji.png b/res/icon/buff_icon/gongji_baoji.png index b349e2d..b2863e6 100644 Binary files a/res/icon/buff_icon/gongji_baoji.png and b/res/icon/buff_icon/gongji_baoji.png differ diff --git a/res/icon/buff_icon/gongji_fantan.png b/res/icon/buff_icon/gongji_fantan.png index 2ec6769..445c322 100644 Binary files a/res/icon/buff_icon/gongji_fantan.png and b/res/icon/buff_icon/gongji_fantan.png differ diff --git a/res/icon/buff_icon/gongji_jiagong.png b/res/icon/buff_icon/gongji_jiagong.png index 1ae39e2..25e00bb 100644 Binary files a/res/icon/buff_icon/gongji_jiagong.png and b/res/icon/buff_icon/gongji_jiagong.png differ diff --git a/res/icon/buff_icon/huifu_hudun.png b/res/icon/buff_icon/huifu_hudun.png index 66e0c71..84eeef5 100644 Binary files a/res/icon/buff_icon/huifu_hudun.png and b/res/icon/buff_icon/huifu_hudun.png differ diff --git a/res/icon/buff_icon/huifu_huixue.png b/res/icon/buff_icon/huifu_huixue.png index 8cceae3..90cda9f 100644 Binary files a/res/icon/buff_icon/huifu_huixue.png and b/res/icon/buff_icon/huifu_huixue.png differ diff --git a/res/icon/buff_icon/huifu_xixue.png b/res/icon/buff_icon/huifu_xixue.png index 98838a0..8379297 100644 Binary files a/res/icon/buff_icon/huifu_xixue.png and b/res/icon/buff_icon/huifu_xixue.png differ diff --git a/res/music/audio/hint_click.mp3 b/res/music/audio/hint_click.mp3 new file mode 100644 index 0000000..2ce125d Binary files /dev/null and b/res/music/audio/hint_click.mp3 differ diff --git a/res/music/audio/hint_close.mp3 b/res/music/audio/hint_close.mp3 new file mode 100644 index 0000000..05bb4de Binary files /dev/null and b/res/music/audio/hint_close.mp3 differ diff --git a/res/music/audio/hint_compose02.mp3 b/res/music/audio/hint_compose02.mp3 new file mode 100644 index 0000000..9f0b7c9 Binary files /dev/null and b/res/music/audio/hint_compose02.mp3 differ diff --git a/res/music/audio/hint_decompose02.mp3 b/res/music/audio/hint_decompose02.mp3 new file mode 100644 index 0000000..81a3286 Binary files /dev/null and b/res/music/audio/hint_decompose02.mp3 differ diff --git a/res/music/audio/hint_deequip.mp3 b/res/music/audio/hint_deequip.mp3 new file mode 100644 index 0000000..81ad8cc Binary files /dev/null and b/res/music/audio/hint_deequip.mp3 differ diff --git a/res/music/audio/hint_equip.mp3 b/res/music/audio/hint_equip.mp3 new file mode 100644 index 0000000..c4a9631 Binary files /dev/null and b/res/music/audio/hint_equip.mp3 differ diff --git a/res/music/audio/hint_gem.mp3 b/res/music/audio/hint_gem.mp3 new file mode 100644 index 0000000..e57aa45 Binary files /dev/null and b/res/music/audio/hint_gem.mp3 differ diff --git a/res/music/audio/hint_null.mp3 b/res/music/audio/hint_null.mp3 new file mode 100644 index 0000000..0e05e56 Binary files /dev/null and b/res/music/audio/hint_null.mp3 differ diff --git a/res/music/audio/hint_pause.mp3 b/res/music/audio/hint_pause.mp3 new file mode 100644 index 0000000..b563d62 Binary files /dev/null and b/res/music/audio/hint_pause.mp3 differ diff --git a/res/music/audio/hint_sell.mp3 b/res/music/audio/hint_sell.mp3 new file mode 100644 index 0000000..956a472 Binary files /dev/null and b/res/music/audio/hint_sell.mp3 differ diff --git a/res/music/sound/atk_guangji.mp3 b/res/music/sound/atk_guangji.mp3 new file mode 100644 index 0000000..7afa430 Binary files /dev/null and b/res/music/sound/atk_guangji.mp3 differ diff --git a/res/spine/hudie.atlas b/res/spine/hudie.atlas index 9313cec..e330277 100644 --- a/res/spine/hudie.atlas +++ b/res/spine/hudie.atlas @@ -1,34 +1,34 @@ hudie.png -size: 30,30 +size: 29,27 format: RGBA4444 filter: Linear,Linear repeat: none hudie_01 rotate: false - xy: 2, 18 - size: 11, 10 - orig: 11, 10 + xy: 2, 13 + size: 13, 12 + orig: 13, 12 offset: 0, 0 index: -1 hudie_02 rotate: true - xy: 15, 20 - size: 8, 13 - orig: 8, 13 + xy: 2, 2 + size: 9, 14 + orig: 9, 14 offset: 0, 0 index: -1 hudie_03 rotate: false - xy: 2, 10 - size: 9, 6 - orig: 9, 6 + xy: 17, 18 + size: 10, 7 + orig: 10, 7 offset: 0, 0 index: -1 hudie_04 - rotate: true - xy: 2, 2 - size: 6, 8 - orig: 6, 8 + rotate: false + xy: 18, 7 + size: 6, 9 + orig: 6, 9 offset: 0, 0 index: -1 diff --git a/res/spine/hudie.json b/res/spine/hudie.json index af5c953..33cca70 100644 --- a/res/spine/hudie.json +++ b/res/spine/hudie.json @@ -1,7 +1,7 @@ { -"skeleton": { "hash": "g/JYRR2KQnrbL6wMRe2lkb/f5GU", "spine": "3.4.02", "width": 171.14, "height": 93.83, "images": "" }, +"skeleton": { "hash": "+5ZqGoORFfI+EqnGGU38oeboVwA", "spine": "3.4.02", "width": 205.37, "height": 112.59, "images": "" }, "bones": [ - { "name": "root", "scaleX": -1 }, + { "name": "root", "scaleX": -1.2, "scaleY": 1.2 }, { "name": "hudie_01", "parent": "root", "length": 3.74, "rotation": 158.19, "x": -14.93, "y": 205.85 }, { "name": "hudie_1", "parent": "root", "length": 3.74, "rotation": 158.19, "x": 35.3, "y": 188.1 }, { "name": "hudie_02", "parent": "root", "length": 3.52, "rotation": 90, "x": -12.26, "y": 206.79 }, @@ -1449,31 +1449,30 @@ "root": { "rotate": [ { "time": 0, "angle": 0, "curve": "stepped" }, - { "time": 0.3333, "angle": 0, "curve": "stepped" }, + { "time": 0.4333, "angle": 0, "curve": "stepped" }, + { "time": 1, "angle": 0, "curve": "stepped" }, { "time": 1.6333, "angle": 0 } ], "translate": [ { "time": 0, "x": 0, "y": 0 }, - { "time": 0.3333, "x": 0, "y": 78.17 }, + { "time": 0.4333, "x": 94.24, "y": 78.17 }, + { "time": 1, "x": -118.87, "y": 55.62 }, { "time": 1.6333, "x": 0, "y": 0 } ], "scale": [ { "time": 0, "x": 1, "y": 1, "curve": "stepped" }, - { "time": 0.3333, "x": 1, "y": 1, "curve": "stepped" }, + { "time": 0.4333, "x": 1, "y": 1, "curve": "stepped" }, + { "time": 1, "x": 1, "y": 1, "curve": "stepped" }, { "time": 1.6333, "x": 1, "y": 1 } ] } }, "events": [ { "time": 0.5, "name": "atk1" }, - { "time": 0.6333, "name": "atk1" }, - { "time": 0.7666, "name": "atk1" }, - { "time": 0.9, "name": "atk1" }, - { "time": 1.0333, "name": "atk1" }, - { "time": 1.1666, "name": "atk1" }, - { "time": 1.3, "name": "atk1" }, - { "time": 1.4333, "name": "atk1" }, - { "time": 1.5666, "name": "atk1" } + { "time": 0.7333, "name": "atk1" }, + { "time": 0.9666, "name": "atk1" }, + { "time": 1.2333, "name": "atk1" }, + { "time": 1.5, "name": "atk1" } ] }, "atkidle1": { @@ -2660,6 +2659,21 @@ { "time": 0.4666, "x": 1, "y": 1, "curve": "stepped" }, { "time": 0.6666, "x": 1, "y": 1 } ] + }, + "root": { + "rotate": [ + { "time": 0, "angle": 0, "curve": "stepped" }, + { "time": 0.6666, "angle": 0 } + ], + "translate": [ + { "time": 0, "x": 0, "y": 0 }, + { "time": 0.3333, "x": 0, "y": -56.27 }, + { "time": 0.6666, "x": 0, "y": 0 } + ], + "scale": [ + { "time": 0, "x": 1, "y": 1, "curve": "stepped" }, + { "time": 0.6666, "x": 1, "y": 1 } + ] } } }, @@ -3120,6 +3134,26 @@ { "time": 0.4666, "x": 1, "y": 1, "curve": "stepped" }, { "time": 0.6666, "x": 1, "y": 1 } ] + }, + "root": { + "rotate": [ + { "time": 0, "angle": 0, "curve": "stepped" }, + { "time": 0.2, "angle": 0, "curve": "stepped" }, + { "time": 0.4333, "angle": 0, "curve": "stepped" }, + { "time": 0.6666, "angle": 0 } + ], + "translate": [ + { "time": 0, "x": 0, "y": 0 }, + { "time": 0.2, "x": 5.92, "y": -53.77 }, + { "time": 0.4333, "x": -31.63, "y": -17.14 }, + { "time": 0.6666, "x": 0, "y": 0 } + ], + "scale": [ + { "time": 0, "x": 1, "y": 1, "curve": "stepped" }, + { "time": 0.2, "x": 1, "y": 1, "curve": "stepped" }, + { "time": 0.4333, "x": 1, "y": 1, "curve": "stepped" }, + { "time": 0.6666, "x": 1, "y": 1 } + ] } } }, diff --git a/res/spine/hudie.png b/res/spine/hudie.png index 609ea03..97b5555 100644 Binary files a/res/spine/hudie.png and b/res/spine/hudie.png differ diff --git a/res/tiledmaps/hero/biaozhi_baowu.atlas b/res/tiledmaps/hero/biaozhi_baowu.atlas index 4b8eeef..038ed4e 100644 --- a/res/tiledmaps/hero/biaozhi_baowu.atlas +++ b/res/tiledmaps/hero/biaozhi_baowu.atlas @@ -1,13 +1,13 @@ biaozhi_baowu.png -size: 38,52 +size: 35,47 format: RGBA4444 filter: Linear,Linear repeat: none biaozhi_biaowu rotate: false xy: 2, 2 - size: 34, 48 - orig: 34, 48 + size: 31, 43 + orig: 31, 43 offset: 0, 0 index: -1 diff --git a/res/tiledmaps/hero/biaozhi_baowu.json b/res/tiledmaps/hero/biaozhi_baowu.json index ecb2f19..63f00b0 100644 --- a/res/tiledmaps/hero/biaozhi_baowu.json +++ b/res/tiledmaps/hero/biaozhi_baowu.json @@ -1,5 +1,5 @@ { -"skeleton": { "hash": "j+K7hJUovvBwdD7w9kKWyxrVI4I", "spine": "3.4.02", "width": 34, "height": 48, "images": "" }, +"skeleton": { "hash": "MJyiByb/XVfFYgc4KSDPDQHgA2M", "spine": "3.4.02", "width": 34, "height": 48, "images": "" }, "bones": [ { "name": "root" }, { "name": "biaozhi_biaowu", "parent": "root", "length": 19.63, "rotation": 90, "x": -0.55, "y": 10.23 }, @@ -29,8 +29,9 @@ "slots": { "biaozhi_biaowu": { "color": [ - { "time": 0, "color": "ffffffff", "curve": "stepped" }, - { "time": 1.0666, "color": "ffffffff", "curve": "stepped" }, + { "time": 0, "color": "ffffffff" }, + { "time": 1.0666, "color": "ff9279ff" }, + { "time": 1.6666, "color": "ffffffff", "curve": "stepped" }, { "time": 5, "color": "ffffffff" } ] }, @@ -143,31 +144,20 @@ "slots": { "biaozhi_biaowu": { "color": [ - { "time": 0, "color": "ffffffff" }, - { "time": 1.4333, "color": "ffffffa7" }, - { "time": 2.6666, "color": "ffffffff" } + { "time": 0, "color": "ffffffff" } ] } }, "bones": { "biaozhi_biaowu": { "rotate": [ - { "time": 0, "angle": 0, "curve": "stepped" }, - { "time": 1.1, "angle": 0, "curve": "stepped" }, - { "time": 1.4333, "angle": 0, "curve": "stepped" }, - { "time": 2.6666, "angle": 0 } + { "time": 0, "angle": 0 } ], "translate": [ - { "time": 0, "x": 0, "y": 0, "curve": "stepped" }, - { "time": 1.1, "x": 0, "y": 0, "curve": "stepped" }, - { "time": 1.4333, "x": 0, "y": 0, "curve": "stepped" }, - { "time": 2.6666, "x": 0, "y": 0 } + { "time": 0, "x": 0, "y": 0 } ], "scale": [ - { "time": 0, "x": 1, "y": 1 }, - { "time": 1.1, "x": 0.91, "y": 0.91 }, - { "time": 1.4333, "x": 0.914, "y": 0.914 }, - { "time": 2.6666, "x": 1, "y": 1 } + { "time": 0, "x": 1, "y": 1 } ] } } diff --git a/res/tiledmaps/hero/biaozhi_baowu.png b/res/tiledmaps/hero/biaozhi_baowu.png index d99e5e3..26b52ad 100644 Binary files a/res/tiledmaps/hero/biaozhi_baowu.png and b/res/tiledmaps/hero/biaozhi_baowu.png differ diff --git a/res/tiledmaps/hero/biaozhi_jineng.atlas b/res/tiledmaps/hero/biaozhi_jineng.atlas index 9a0df59..0f36d3d 100644 --- a/res/tiledmaps/hero/biaozhi_jineng.atlas +++ b/res/tiledmaps/hero/biaozhi_jineng.atlas @@ -1,13 +1,13 @@ biaozhi_jineng.png -size: 56,56 +size: 51,51 format: RGBA4444 filter: Linear,Linear repeat: none biaozhi_jineng rotate: false xy: 2, 2 - size: 52, 52 - orig: 52, 52 + size: 47, 47 + orig: 47, 47 offset: 0, 0 index: -1 diff --git a/res/tiledmaps/hero/biaozhi_jineng.json b/res/tiledmaps/hero/biaozhi_jineng.json index 36dd9d1..95278c3 100644 --- a/res/tiledmaps/hero/biaozhi_jineng.json +++ b/res/tiledmaps/hero/biaozhi_jineng.json @@ -1,5 +1,5 @@ { -"skeleton": { "hash": "AHXs49U0U75cmjYSi0Ea8EBzHnE", "spine": "3.4.02", "width": 52, "height": 52, "images": "" }, +"skeleton": { "hash": "wNlRv9v5mMsuluJd8MtfNZgX3pM", "spine": "3.4.02", "width": 52, "height": 52, "images": "" }, "bones": [ { "name": "root" }, { "name": "biaozhi_jineng", "parent": "root", "length": 15.47, "rotation": 88.36, "x": -0.53, "y": 10.48 }, @@ -29,7 +29,9 @@ "slots": { "biaozhi_jineng": { "color": [ - { "time": 0, "color": "ffffffff", "curve": "stepped" }, + { "time": 0, "color": "ffffffff" }, + { "time": 1, "color": "ff9486ff" }, + { "time": 1.6666, "color": "ffffffff", "curve": "stepped" }, { "time": 5, "color": "ffffffff" } ] }, @@ -61,16 +63,19 @@ "biaozhi_jineng": { "rotate": [ { "time": 0, "angle": 0, "curve": "stepped" }, + { "time": 0.6666, "angle": 0, "curve": "stepped" }, { "time": 1, "angle": 0, "curve": "stepped" }, { "time": 5, "angle": 0 } ], "translate": [ { "time": 0, "x": 0, "y": 0, "curve": "stepped" }, + { "time": 0.6666, "x": 0, "y": 0, "curve": "stepped" }, { "time": 1, "x": 0, "y": 0, "curve": "stepped" }, { "time": 5, "x": 0, "y": 0 } ], "scale": [ - { "time": 0, "x": 1, "y": 1, "curve": "stepped" }, + { "time": 0, "x": 1, "y": 1 }, + { "time": 0.6666, "x": 0.887, "y": 0.887 }, { "time": 1, "x": 1, "y": 1, "curve": "stepped" }, { "time": 5, "x": 1, "y": 1 } ] @@ -92,8 +97,8 @@ ], "scale": [ { "time": 0, "x": 1, "y": 1, "curve": "stepped" }, - { "time": 0.2333, "x": 1, "y": 1, "curve": "stepped" }, - { "time": 0.5, "x": 1, "y": 1, "curve": "stepped" }, + { "time": 0.2333, "x": 1, "y": 1 }, + { "time": 0.5, "x": 0.94, "y": 0.94 }, { "time": 1, "x": 1, "y": 1, "curve": "stepped" }, { "time": 5, "x": 1, "y": 1 } ] @@ -144,36 +149,20 @@ "slots": { "biaozhi_jineng": { "color": [ - { "time": 0, "color": "ffffffff" }, - { "time": 1.2333, "color": "ffffff86", "curve": "stepped" }, - { "time": 1.4333, "color": "ffffff86" }, - { "time": 2.6666, "color": "ffffffff" } - ], - "attachment": [ - { "time": 1.2333, "name": "biaozhi_jineng" }, - { "time": 1.4333, "name": "biaozhi_jineng" } + { "time": 0, "color": "ffffffff" } ] } }, "bones": { "biaozhi_jineng": { "rotate": [ - { "time": 0, "angle": 0, "curve": "stepped" }, - { "time": 1.2333, "angle": 0, "curve": "stepped" }, - { "time": 1.4333, "angle": 0, "curve": "stepped" }, - { "time": 2.6666, "angle": 0 } + { "time": 0, "angle": 0 } ], "translate": [ - { "time": 0, "x": 0, "y": 0, "curve": "stepped" }, - { "time": 1.2333, "x": 0, "y": 0, "curve": "stepped" }, - { "time": 1.4333, "x": 0, "y": 0, "curve": "stepped" }, - { "time": 2.6666, "x": 0, "y": 0 } + { "time": 0, "x": 0, "y": 0 } ], "scale": [ - { "time": 0, "x": 1, "y": 1 }, - { "time": 1.2333, "x": 0.839, "y": 0.839, "curve": "stepped" }, - { "time": 1.4333, "x": 0.839, "y": 0.839 }, - { "time": 2.6666, "x": 1, "y": 1 } + { "time": 0, "x": 1, "y": 1 } ] } } diff --git a/res/tiledmaps/hero/biaozhi_jineng.png b/res/tiledmaps/hero/biaozhi_jineng.png index e85f180..e7efc45 100644 Binary files a/res/tiledmaps/hero/biaozhi_jineng.png and b/res/tiledmaps/hero/biaozhi_jineng.png differ diff --git a/res/tiledmaps/hero/biaozhi_wuqi.atlas b/res/tiledmaps/hero/biaozhi_wuqi.atlas index 2b177a8..6ee09ee 100644 --- a/res/tiledmaps/hero/biaozhi_wuqi.atlas +++ b/res/tiledmaps/hero/biaozhi_wuqi.atlas @@ -1,13 +1,13 @@ biaozhi_wuqi.png -size: 72,64 +size: 65,58 format: RGBA4444 filter: Linear,Linear repeat: none biaozhi_wuqi rotate: false xy: 2, 2 - size: 68, 60 - orig: 68, 60 + size: 61, 54 + orig: 61, 54 offset: 0, 0 index: -1 diff --git a/res/tiledmaps/hero/biaozhi_wuqi.json b/res/tiledmaps/hero/biaozhi_wuqi.json index 64e6675..2347572 100644 --- a/res/tiledmaps/hero/biaozhi_wuqi.json +++ b/res/tiledmaps/hero/biaozhi_wuqi.json @@ -1,5 +1,5 @@ { -"skeleton": { "hash": "1LAq9N4oTNWOR6fNrn5BYFCJSWA", "spine": "3.4.02", "width": 68, "height": 60, "images": "" }, +"skeleton": { "hash": "1uJj5w+CT94BQc8CL1zD+Lu1nac", "spine": "3.4.02", "width": 68, "height": 60, "images": "" }, "bones": [ { "name": "root" }, { "name": "biaozhi_wuqi", "parent": "root", "length": 16.73, "rotation": 88.6, "y": 5.81 }, @@ -29,7 +29,9 @@ "slots": { "biaozhi_wuqi": { "color": [ - { "time": 0, "color": "ffffffff", "curve": "stepped" }, + { "time": 0, "color": "ffffffff" }, + { "time": 1, "color": "ff857dff" }, + { "time": 1.6666, "color": "feffffff" }, { "time": 5, "color": "ffffffff" } ] }, @@ -60,20 +62,20 @@ "biaozhi_wuqi": { "rotate": [ { "time": 0, "angle": 0, "curve": "stepped" }, - { "time": 0.2333, "angle": 0, "curve": "stepped" }, + { "time": 0.6666, "angle": 0, "curve": "stepped" }, { "time": 1, "angle": 0, "curve": "stepped" }, { "time": 5, "angle": 0 } ], "translate": [ { "time": 0, "x": 0, "y": 0, "curve": "stepped" }, - { "time": 0.2333, "x": 0, "y": 0, "curve": "stepped" }, + { "time": 0.6666, "x": 0, "y": 0, "curve": "stepped" }, { "time": 1, "x": 0, "y": 0, "curve": "stepped" }, { "time": 5, "x": 0, "y": 0 } ], "scale": [ - { "time": 0, "x": 1, "y": 1, "curve": "stepped" }, - { "time": 0.2333, "x": 1, "y": 1 }, - { "time": 1, "x": 1.075, "y": 1.075 }, + { "time": 0, "x": 1, "y": 1 }, + { "time": 0.6666, "x": 1.059, "y": 1.059 }, + { "time": 1, "x": 1, "y": 1, "curve": "stepped" }, { "time": 5, "x": 1, "y": 1 } ] }, @@ -146,32 +148,20 @@ "slots": { "biaozhi_wuqi": { "color": [ - { "time": 0, "color": "ffffffff" }, - { "time": 1.2333, "color": "ffffff7e", "curve": "stepped" }, - { "time": 1.4333, "color": "ffffff7e" }, - { "time": 2.6666, "color": "ffffffff" } + { "time": 0, "color": "ffffffff" } ] } }, "bones": { "biaozhi_wuqi": { "rotate": [ - { "time": 0, "angle": 0, "curve": "stepped" }, - { "time": 1.2333, "angle": 0, "curve": "stepped" }, - { "time": 1.4333, "angle": 0, "curve": "stepped" }, - { "time": 2.6666, "angle": 0 } + { "time": 0, "angle": 0 } ], "translate": [ - { "time": 0, "x": 0, "y": 0, "curve": "stepped" }, - { "time": 1.2333, "x": 0, "y": 0, "curve": "stepped" }, - { "time": 1.4333, "x": 0, "y": 0, "curve": "stepped" }, - { "time": 2.6666, "x": 0, "y": 0 } + { "time": 0, "x": 0, "y": 0 } ], "scale": [ - { "time": 0, "x": 1, "y": 1 }, - { "time": 1.2333, "x": 0.919, "y": 0.919, "curve": "stepped" }, - { "time": 1.4333, "x": 0.919, "y": 0.919 }, - { "time": 2.6666, "x": 1, "y": 1 } + { "time": 0, "x": 1, "y": 1 } ] } } diff --git a/res/tiledmaps/hero/biaozhi_wuqi.png b/res/tiledmaps/hero/biaozhi_wuqi.png index 69c9791..815ee64 100644 Binary files a/res/tiledmaps/hero/biaozhi_wuqi.png and b/res/tiledmaps/hero/biaozhi_wuqi.png differ diff --git a/res/ui/hero/skillTree/star_1_active.atlas b/res/ui/hero/skillTree/star_1_active.atlas index dc40346..76b1851 100644 --- a/res/ui/hero/skillTree/star_1_active.atlas +++ b/res/ui/hero/skillTree/star_1_active.atlas @@ -1,20 +1,62 @@ star_1_active.png -size: 188,154 +size: 1168,150 format: RGBA4444 filter: Linear,Linear repeat: none -001 +big_whitestar rotate: false - xy: 154, 120 - size: 32, 32 - orig: 32, 32 + xy: 1031, 13 + size: 135, 135 + orig: 135, 135 offset: 0, 0 index: -1 -big_whitestar +fazhang_0000_07 rotate: false xy: 2, 2 - size: 150, 150 - orig: 150, 150 + size: 145, 146 + orig: 145, 146 + offset: 0, 0 + index: -1 +fazhang_0001_06 + rotate: false + xy: 149, 2 + size: 145, 146 + orig: 145, 146 + offset: 0, 0 + index: -1 +fazhang_0002_05 + rotate: false + xy: 296, 2 + size: 145, 146 + orig: 145, 146 + offset: 0, 0 + index: -1 +fazhang_0003_04 + rotate: false + xy: 443, 2 + size: 145, 146 + orig: 145, 146 + offset: 0, 0 + index: -1 +fazhang_0004_03 + rotate: false + xy: 590, 2 + size: 145, 146 + orig: 145, 146 + offset: 0, 0 + index: -1 +fazhang_0005_02 + rotate: false + xy: 737, 2 + size: 145, 146 + orig: 145, 146 + offset: 0, 0 + index: -1 +fazhang_0006_01 + rotate: false + xy: 884, 2 + size: 145, 146 + orig: 145, 146 offset: 0, 0 index: -1 diff --git a/res/ui/hero/skillTree/star_1_active.json b/res/ui/hero/skillTree/star_1_active.json index 93078a1..cbf1944 100644 --- a/res/ui/hero/skillTree/star_1_active.json +++ b/res/ui/hero/skillTree/star_1_active.json @@ -1,20 +1,43 @@ { -"skeleton": { "hash": "VQn4l7GM1joJTphxmQCN1HgB6pE", "spine": "3.4.02", "width": 216.4, "height": 153.71, "images": "" }, +"skeleton": { "hash": "j4Fcyc+J6jZt5NSWyMRzrm2ZBdc", "spine": "3.4.02", "width": 153.71, "height": 153.71, "images": "" }, "bones": [ { "name": "root", "x": -0.03 }, - { "name": "big_whitestar", "parent": "root", "length": 39.44, "rotation": 90.58, "x": -128.38, "y": -0.09 } + { "name": "big_whitestar", "parent": "root", "length": 39.44, "rotation": 90.58 }, + { "name": "big_whitestar2", "parent": "root", "length": 39.44, "rotation": 90.58 }, + { "name": "fazhang_0006_01", "parent": "root" }, + { "name": "fazhang_0006_1", "parent": "root", "x": 69.06 } ], "slots": [ - { "name": "001", "bone": "root", "attachment": "001" }, - { "name": "big_whitestar", "bone": "big_whitestar", "attachment": "big_whitestar" } + { "name": "fazhang_0006_01", "bone": "fazhang_0006_01" }, + { "name": "fazhang_0006_1", "bone": "fazhang_0006_1" }, + { "name": "big_whitestar", "bone": "big_whitestar", "attachment": "big_whitestar" }, + { "name": "big_whitestar2", "bone": "big_whitestar2", "blend": "screen" } ], "skins": { "default": { - "001": { - "001": { "x": 0.03, "scaleX": 0.7, "scaleY": 0.7, "width": 32, "height": 32 } - }, "big_whitestar": { + "big_whitestar": { "rotation": -92.02, "width": 150, "height": 150 } + }, + "big_whitestar2": { "big_whitestar": { "x": 1.06, "y": -0.08, "rotation": -92.02, "width": 150, "height": 150 } + }, + "fazhang_0006_01": { + "fazhang_0000_07": { "x": -0.03, "width": 161, "height": 162 }, + "fazhang_0001_06": { "x": -0.03, "width": 161, "height": 162 }, + "fazhang_0002_05": { "x": -0.03, "width": 161, "height": 162 }, + "fazhang_0003_04": { "x": -0.03, "width": 161, "height": 162 }, + "fazhang_0004_03": { "x": -0.03, "width": 161, "height": 162 }, + "fazhang_0005_02": { "x": -0.03, "width": 161, "height": 162 }, + "fazhang_0006_01": { "width": 161, "height": 162 } + }, + "fazhang_0006_1": { + "fazhang_0000_07": { "x": -0.03, "width": 161, "height": 162 }, + "fazhang_0001_06": { "x": -0.03, "width": 161, "height": 162 }, + "fazhang_0002_05": { "x": -0.03, "width": 161, "height": 162 }, + "fazhang_0003_04": { "x": -0.03, "width": 161, "height": 162 }, + "fazhang_0004_03": { "x": -0.03, "width": 161, "height": 162 }, + "fazhang_0005_02": { "x": -0.03, "width": 161, "height": 162 }, + "fazhang_0006_01": { "width": 161, "height": 162 } } } }, @@ -26,9 +49,51 @@ { "time": 0, "color": "ffffffc1" }, { "time": 1.6666, "color": "ffffffff" }, { "time": 3.3333, "color": "ffffffc1" } + ] + }, + "big_whitestar2": { + "color": [ + { "time": 1, "color": "ffffff00" }, + { "time": 1.6666, "color": "ffffffff" }, + { "time": 2.3333, "color": "ffffff00" } + ], + "attachment": [ + { "time": 1, "name": "big_whitestar" }, + { "time": 2.3333, "name": "big_whitestar" } + ] + }, + "fazhang_0006_01": { + "color": [ + { "time": 1, "color": "ffffffff" }, + { "time": 1.4666, "color": "ffffff2c" }, + { "time": 1.5333, "color": "ffffff00" } ], "attachment": [ - { "time": 0, "name": "big_whitestar" } + { "time": 1, "name": "fazhang_0006_01" }, + { "time": 1.0666, "name": "fazhang_0005_02" }, + { "time": 1.1333, "name": "fazhang_0004_03" }, + { "time": 1.2, "name": "fazhang_0003_04" }, + { "time": 1.2666, "name": "fazhang_0002_05" }, + { "time": 1.3333, "name": "fazhang_0001_06" }, + { "time": 1.4, "name": "fazhang_0000_07" }, + { "time": 1.4666, "name": "fazhang_0000_07" }, + { "time": 1.5333, "name": "fazhang_0001_06" } + ] + }, + "fazhang_0006_1": { + "color": [ + { "time": 1.5, "color": "ffffffff" }, + { "time": 1.9666, "color": "ffffff00" } + ], + "attachment": [ + { "time": 1.5, "name": "fazhang_0006_01" }, + { "time": 1.5666, "name": "fazhang_0005_02" }, + { "time": 1.6333, "name": "fazhang_0004_03" }, + { "time": 1.7, "name": "fazhang_0003_04" }, + { "time": 1.7666, "name": "fazhang_0002_05" }, + { "time": 1.8333, "name": "fazhang_0001_06" }, + { "time": 1.9, "name": "fazhang_0000_07" }, + { "time": 1.9666, "name": null } ] } }, @@ -36,20 +101,67 @@ "big_whitestar": { "rotate": [ { "time": 0, "angle": 0, "curve": "stepped" }, + { "time": 1.6666, "angle": 0, "curve": "stepped" }, { "time": 3.3333, "angle": 0 } ], "translate": [ - { "time": 0, "x": 128.56, "y": 0, "curve": "stepped" }, - { "time": 3.3333, "x": 128.56, "y": 0 } + { "time": 0, "x": 0, "y": 0, "curve": "stepped" }, + { "time": 1.6666, "x": 0, "y": 0, "curve": "stepped" }, + { "time": 3.3333, "x": 0, "y": 0 } ], "scale": [ - { "time": 0, "x": 1, "y": 1, "curve": "stepped" }, - { "time": 3.3333, "x": 1, "y": 1 } + { "time": 0, "x": 0.835, "y": 0.835 }, + { "time": 1.6666, "x": 1.11, "y": 1.11 }, + { "time": 3.3333, "x": 0.835, "y": 0.835 } ], "shear": [ { "time": 0, "x": 0, "y": 0, "curve": "stepped" }, { "time": 3.3333, "x": 0, "y": 0 } ] + }, + "big_whitestar2": { + "rotate": [ + { "time": 1, "angle": 0 }, + { "time": 1.6666, "angle": -68.88 }, + { "time": 2.3333, "angle": -186.55 } + ], + "translate": [ + { "time": 0, "x": 278.89, "y": 0 }, + { "time": 1, "x": 0, "y": 0, "curve": "stepped" }, + { "time": 1.6666, "x": 0, "y": 0, "curve": "stepped" }, + { "time": 2.3333, "x": 0, "y": 0 } + ], + "scale": [ + { "time": 1, "x": 0.444, "y": 0.444 }, + { "time": 1.6666, "x": 0.676, "y": 0.676 }, + { "time": 2.3333, "x": 0.444, "y": 0.444 } + ] + }, + "fazhang_0006_01": { + "rotate": [ + { "time": 1, "angle": 0 } + ], + "translate": [ + { "time": 1, "x": 0, "y": 0 } + ], + "scale": [ + { "time": 1, "x": 0.368, "y": 0.368 }, + { "time": 1.5333, "x": 0.87, "y": 0.87 } + ] + }, + "fazhang_0006_1": { + "rotate": [ + { "time": 1.5, "angle": 0, "curve": "stepped" }, + { "time": 1.9666, "angle": 0 } + ], + "translate": [ + { "time": 1.5, "x": -69.06, "y": 0, "curve": "stepped" }, + { "time": 1.9666, "x": -69.06, "y": 0 } + ], + "scale": [ + { "time": 1.5, "x": 0.477, "y": 0.477 }, + { "time": 1.9666, "x": 0.847, "y": 0.847 } + ] } } } diff --git a/res/ui/hero/skillTree/star_1_active.png b/res/ui/hero/skillTree/star_1_active.png index 1667a4a..9b67a7d 100644 Binary files a/res/ui/hero/skillTree/star_1_active.png and b/res/ui/hero/skillTree/star_1_active.png differ diff --git a/res/ui/hero/skillTree/star_2_active.atlas b/res/ui/hero/skillTree/star_2_active.atlas index ce392a1..847a693 100644 --- a/res/ui/hero/skillTree/star_2_active.atlas +++ b/res/ui/hero/skillTree/star_2_active.atlas @@ -1,20 +1,62 @@ star_2_active.png -size: 188,154 +size: 1168,150 format: RGBA4444 filter: Linear,Linear repeat: none -001 +big_whitestar rotate: false - xy: 154, 120 - size: 32, 32 - orig: 32, 32 + xy: 1031, 13 + size: 135, 135 + orig: 135, 135 offset: 0, 0 index: -1 -big_whitestar +fazhang_0000_07 rotate: false xy: 2, 2 - size: 150, 150 - orig: 150, 150 + size: 145, 146 + orig: 145, 146 + offset: 0, 0 + index: -1 +fazhang_0001_06 + rotate: false + xy: 149, 2 + size: 145, 146 + orig: 145, 146 + offset: 0, 0 + index: -1 +fazhang_0002_05 + rotate: false + xy: 296, 2 + size: 145, 146 + orig: 145, 146 + offset: 0, 0 + index: -1 +fazhang_0003_04 + rotate: false + xy: 443, 2 + size: 145, 146 + orig: 145, 146 + offset: 0, 0 + index: -1 +fazhang_0004_03 + rotate: false + xy: 590, 2 + size: 145, 146 + orig: 145, 146 + offset: 0, 0 + index: -1 +fazhang_0005_02 + rotate: false + xy: 737, 2 + size: 145, 146 + orig: 145, 146 + offset: 0, 0 + index: -1 +fazhang_0006_01 + rotate: false + xy: 884, 2 + size: 145, 146 + orig: 145, 146 offset: 0, 0 index: -1 diff --git a/res/ui/hero/skillTree/star_2_active.json b/res/ui/hero/skillTree/star_2_active.json index faaa7ca..cbf1944 100644 --- a/res/ui/hero/skillTree/star_2_active.json +++ b/res/ui/hero/skillTree/star_2_active.json @@ -1,20 +1,43 @@ { -"skeleton": { "hash": "5nngH62olBHJGBOfvtrHY6tt3j0", "spine": "3.4.02", "width": 216.4, "height": 153.71, "images": "" }, +"skeleton": { "hash": "j4Fcyc+J6jZt5NSWyMRzrm2ZBdc", "spine": "3.4.02", "width": 153.71, "height": 153.71, "images": "" }, "bones": [ { "name": "root", "x": -0.03 }, - { "name": "big_whitestar", "parent": "root", "length": 39.44, "rotation": 90.58, "x": -128.38, "y": -0.09 } + { "name": "big_whitestar", "parent": "root", "length": 39.44, "rotation": 90.58 }, + { "name": "big_whitestar2", "parent": "root", "length": 39.44, "rotation": 90.58 }, + { "name": "fazhang_0006_01", "parent": "root" }, + { "name": "fazhang_0006_1", "parent": "root", "x": 69.06 } ], "slots": [ - { "name": "001", "bone": "root", "attachment": "001" }, - { "name": "big_whitestar", "bone": "big_whitestar", "attachment": "big_whitestar" } + { "name": "fazhang_0006_01", "bone": "fazhang_0006_01" }, + { "name": "fazhang_0006_1", "bone": "fazhang_0006_1" }, + { "name": "big_whitestar", "bone": "big_whitestar", "attachment": "big_whitestar" }, + { "name": "big_whitestar2", "bone": "big_whitestar2", "blend": "screen" } ], "skins": { "default": { - "001": { - "001": { "x": 0.03, "scaleX": 0.7, "scaleY": 0.7, "width": 32, "height": 32 } - }, "big_whitestar": { + "big_whitestar": { "rotation": -92.02, "width": 150, "height": 150 } + }, + "big_whitestar2": { "big_whitestar": { "x": 1.06, "y": -0.08, "rotation": -92.02, "width": 150, "height": 150 } + }, + "fazhang_0006_01": { + "fazhang_0000_07": { "x": -0.03, "width": 161, "height": 162 }, + "fazhang_0001_06": { "x": -0.03, "width": 161, "height": 162 }, + "fazhang_0002_05": { "x": -0.03, "width": 161, "height": 162 }, + "fazhang_0003_04": { "x": -0.03, "width": 161, "height": 162 }, + "fazhang_0004_03": { "x": -0.03, "width": 161, "height": 162 }, + "fazhang_0005_02": { "x": -0.03, "width": 161, "height": 162 }, + "fazhang_0006_01": { "width": 161, "height": 162 } + }, + "fazhang_0006_1": { + "fazhang_0000_07": { "x": -0.03, "width": 161, "height": 162 }, + "fazhang_0001_06": { "x": -0.03, "width": 161, "height": 162 }, + "fazhang_0002_05": { "x": -0.03, "width": 161, "height": 162 }, + "fazhang_0003_04": { "x": -0.03, "width": 161, "height": 162 }, + "fazhang_0004_03": { "x": -0.03, "width": 161, "height": 162 }, + "fazhang_0005_02": { "x": -0.03, "width": 161, "height": 162 }, + "fazhang_0006_01": { "width": 161, "height": 162 } } } }, @@ -26,9 +49,51 @@ { "time": 0, "color": "ffffffc1" }, { "time": 1.6666, "color": "ffffffff" }, { "time": 3.3333, "color": "ffffffc1" } + ] + }, + "big_whitestar2": { + "color": [ + { "time": 1, "color": "ffffff00" }, + { "time": 1.6666, "color": "ffffffff" }, + { "time": 2.3333, "color": "ffffff00" } + ], + "attachment": [ + { "time": 1, "name": "big_whitestar" }, + { "time": 2.3333, "name": "big_whitestar" } + ] + }, + "fazhang_0006_01": { + "color": [ + { "time": 1, "color": "ffffffff" }, + { "time": 1.4666, "color": "ffffff2c" }, + { "time": 1.5333, "color": "ffffff00" } ], "attachment": [ - { "time": 0, "name": "big_whitestar" } + { "time": 1, "name": "fazhang_0006_01" }, + { "time": 1.0666, "name": "fazhang_0005_02" }, + { "time": 1.1333, "name": "fazhang_0004_03" }, + { "time": 1.2, "name": "fazhang_0003_04" }, + { "time": 1.2666, "name": "fazhang_0002_05" }, + { "time": 1.3333, "name": "fazhang_0001_06" }, + { "time": 1.4, "name": "fazhang_0000_07" }, + { "time": 1.4666, "name": "fazhang_0000_07" }, + { "time": 1.5333, "name": "fazhang_0001_06" } + ] + }, + "fazhang_0006_1": { + "color": [ + { "time": 1.5, "color": "ffffffff" }, + { "time": 1.9666, "color": "ffffff00" } + ], + "attachment": [ + { "time": 1.5, "name": "fazhang_0006_01" }, + { "time": 1.5666, "name": "fazhang_0005_02" }, + { "time": 1.6333, "name": "fazhang_0004_03" }, + { "time": 1.7, "name": "fazhang_0003_04" }, + { "time": 1.7666, "name": "fazhang_0002_05" }, + { "time": 1.8333, "name": "fazhang_0001_06" }, + { "time": 1.9, "name": "fazhang_0000_07" }, + { "time": 1.9666, "name": null } ] } }, @@ -36,20 +101,67 @@ "big_whitestar": { "rotate": [ { "time": 0, "angle": 0, "curve": "stepped" }, + { "time": 1.6666, "angle": 0, "curve": "stepped" }, { "time": 3.3333, "angle": 0 } ], "translate": [ - { "time": 0, "x": 128.56, "y": 0, "curve": "stepped" }, - { "time": 3.3333, "x": 128.56, "y": 0 } + { "time": 0, "x": 0, "y": 0, "curve": "stepped" }, + { "time": 1.6666, "x": 0, "y": 0, "curve": "stepped" }, + { "time": 3.3333, "x": 0, "y": 0 } ], "scale": [ - { "time": 0, "x": 1, "y": 1, "curve": "stepped" }, - { "time": 3.3333, "x": 1, "y": 1 } + { "time": 0, "x": 0.835, "y": 0.835 }, + { "time": 1.6666, "x": 1.11, "y": 1.11 }, + { "time": 3.3333, "x": 0.835, "y": 0.835 } ], "shear": [ { "time": 0, "x": 0, "y": 0, "curve": "stepped" }, { "time": 3.3333, "x": 0, "y": 0 } ] + }, + "big_whitestar2": { + "rotate": [ + { "time": 1, "angle": 0 }, + { "time": 1.6666, "angle": -68.88 }, + { "time": 2.3333, "angle": -186.55 } + ], + "translate": [ + { "time": 0, "x": 278.89, "y": 0 }, + { "time": 1, "x": 0, "y": 0, "curve": "stepped" }, + { "time": 1.6666, "x": 0, "y": 0, "curve": "stepped" }, + { "time": 2.3333, "x": 0, "y": 0 } + ], + "scale": [ + { "time": 1, "x": 0.444, "y": 0.444 }, + { "time": 1.6666, "x": 0.676, "y": 0.676 }, + { "time": 2.3333, "x": 0.444, "y": 0.444 } + ] + }, + "fazhang_0006_01": { + "rotate": [ + { "time": 1, "angle": 0 } + ], + "translate": [ + { "time": 1, "x": 0, "y": 0 } + ], + "scale": [ + { "time": 1, "x": 0.368, "y": 0.368 }, + { "time": 1.5333, "x": 0.87, "y": 0.87 } + ] + }, + "fazhang_0006_1": { + "rotate": [ + { "time": 1.5, "angle": 0, "curve": "stepped" }, + { "time": 1.9666, "angle": 0 } + ], + "translate": [ + { "time": 1.5, "x": -69.06, "y": 0, "curve": "stepped" }, + { "time": 1.9666, "x": -69.06, "y": 0 } + ], + "scale": [ + { "time": 1.5, "x": 0.477, "y": 0.477 }, + { "time": 1.9666, "x": 0.847, "y": 0.847 } + ] } } } diff --git a/res/ui/hero/skillTree/star_2_active.png b/res/ui/hero/skillTree/star_2_active.png index 1667a4a..9b67a7d 100644 Binary files a/res/ui/hero/skillTree/star_2_active.png and b/res/ui/hero/skillTree/star_2_active.png differ diff --git a/res/ui/hero/skillTree/star_3_active.atlas b/res/ui/hero/skillTree/star_3_active.atlas index 3d44941..48359d7 100644 --- a/res/ui/hero/skillTree/star_3_active.atlas +++ b/res/ui/hero/skillTree/star_3_active.atlas @@ -1,20 +1,62 @@ star_3_active.png -size: 188,154 +size: 1168,150 format: RGBA4444 filter: Linear,Linear repeat: none -001 +big_whitestar rotate: false - xy: 154, 120 - size: 32, 32 - orig: 32, 32 + xy: 1031, 13 + size: 135, 135 + orig: 135, 135 offset: 0, 0 index: -1 -big_whitestar +fazhang_0000_07 rotate: false xy: 2, 2 - size: 150, 150 - orig: 150, 150 + size: 145, 146 + orig: 145, 146 + offset: 0, 0 + index: -1 +fazhang_0001_06 + rotate: false + xy: 149, 2 + size: 145, 146 + orig: 145, 146 + offset: 0, 0 + index: -1 +fazhang_0002_05 + rotate: false + xy: 296, 2 + size: 145, 146 + orig: 145, 146 + offset: 0, 0 + index: -1 +fazhang_0003_04 + rotate: false + xy: 443, 2 + size: 145, 146 + orig: 145, 146 + offset: 0, 0 + index: -1 +fazhang_0004_03 + rotate: false + xy: 590, 2 + size: 145, 146 + orig: 145, 146 + offset: 0, 0 + index: -1 +fazhang_0005_02 + rotate: false + xy: 737, 2 + size: 145, 146 + orig: 145, 146 + offset: 0, 0 + index: -1 +fazhang_0006_01 + rotate: false + xy: 884, 2 + size: 145, 146 + orig: 145, 146 offset: 0, 0 index: -1 diff --git a/res/ui/hero/skillTree/star_3_active.json b/res/ui/hero/skillTree/star_3_active.json index 9201c73..cbf1944 100644 --- a/res/ui/hero/skillTree/star_3_active.json +++ b/res/ui/hero/skillTree/star_3_active.json @@ -1,20 +1,43 @@ { -"skeleton": { "hash": "dGG15yqXK4BnJnifO1omdUNYyEY", "spine": "3.4.02", "width": 22.4, "height": 22.4, "images": "" }, +"skeleton": { "hash": "j4Fcyc+J6jZt5NSWyMRzrm2ZBdc", "spine": "3.4.02", "width": 153.71, "height": 153.71, "images": "" }, "bones": [ { "name": "root", "x": -0.03 }, - { "name": "big_whitestar", "parent": "root", "length": 39.44, "rotation": 90.58, "x": -128.38, "y": -0.09 } + { "name": "big_whitestar", "parent": "root", "length": 39.44, "rotation": 90.58 }, + { "name": "big_whitestar2", "parent": "root", "length": 39.44, "rotation": 90.58 }, + { "name": "fazhang_0006_01", "parent": "root" }, + { "name": "fazhang_0006_1", "parent": "root", "x": 69.06 } ], "slots": [ - { "name": "001", "bone": "root", "attachment": "001" }, - { "name": "big_whitestar", "bone": "big_whitestar" } + { "name": "fazhang_0006_01", "bone": "fazhang_0006_01" }, + { "name": "fazhang_0006_1", "bone": "fazhang_0006_1" }, + { "name": "big_whitestar", "bone": "big_whitestar", "attachment": "big_whitestar" }, + { "name": "big_whitestar2", "bone": "big_whitestar2", "blend": "screen" } ], "skins": { "default": { - "001": { - "001": { "x": 0.03, "scaleX": 0.7, "scaleY": 0.7, "width": 32, "height": 32 } - }, "big_whitestar": { + "big_whitestar": { "rotation": -92.02, "width": 150, "height": 150 } + }, + "big_whitestar2": { "big_whitestar": { "x": 1.06, "y": -0.08, "rotation": -92.02, "width": 150, "height": 150 } + }, + "fazhang_0006_01": { + "fazhang_0000_07": { "x": -0.03, "width": 161, "height": 162 }, + "fazhang_0001_06": { "x": -0.03, "width": 161, "height": 162 }, + "fazhang_0002_05": { "x": -0.03, "width": 161, "height": 162 }, + "fazhang_0003_04": { "x": -0.03, "width": 161, "height": 162 }, + "fazhang_0004_03": { "x": -0.03, "width": 161, "height": 162 }, + "fazhang_0005_02": { "x": -0.03, "width": 161, "height": 162 }, + "fazhang_0006_01": { "width": 161, "height": 162 } + }, + "fazhang_0006_1": { + "fazhang_0000_07": { "x": -0.03, "width": 161, "height": 162 }, + "fazhang_0001_06": { "x": -0.03, "width": 161, "height": 162 }, + "fazhang_0002_05": { "x": -0.03, "width": 161, "height": 162 }, + "fazhang_0003_04": { "x": -0.03, "width": 161, "height": 162 }, + "fazhang_0004_03": { "x": -0.03, "width": 161, "height": 162 }, + "fazhang_0005_02": { "x": -0.03, "width": 161, "height": 162 }, + "fazhang_0006_01": { "width": 161, "height": 162 } } } }, @@ -26,9 +49,51 @@ { "time": 0, "color": "ffffffc1" }, { "time": 1.6666, "color": "ffffffff" }, { "time": 3.3333, "color": "ffffffc1" } + ] + }, + "big_whitestar2": { + "color": [ + { "time": 1, "color": "ffffff00" }, + { "time": 1.6666, "color": "ffffffff" }, + { "time": 2.3333, "color": "ffffff00" } + ], + "attachment": [ + { "time": 1, "name": "big_whitestar" }, + { "time": 2.3333, "name": "big_whitestar" } + ] + }, + "fazhang_0006_01": { + "color": [ + { "time": 1, "color": "ffffffff" }, + { "time": 1.4666, "color": "ffffff2c" }, + { "time": 1.5333, "color": "ffffff00" } ], "attachment": [ - { "time": 0, "name": "big_whitestar" } + { "time": 1, "name": "fazhang_0006_01" }, + { "time": 1.0666, "name": "fazhang_0005_02" }, + { "time": 1.1333, "name": "fazhang_0004_03" }, + { "time": 1.2, "name": "fazhang_0003_04" }, + { "time": 1.2666, "name": "fazhang_0002_05" }, + { "time": 1.3333, "name": "fazhang_0001_06" }, + { "time": 1.4, "name": "fazhang_0000_07" }, + { "time": 1.4666, "name": "fazhang_0000_07" }, + { "time": 1.5333, "name": "fazhang_0001_06" } + ] + }, + "fazhang_0006_1": { + "color": [ + { "time": 1.5, "color": "ffffffff" }, + { "time": 1.9666, "color": "ffffff00" } + ], + "attachment": [ + { "time": 1.5, "name": "fazhang_0006_01" }, + { "time": 1.5666, "name": "fazhang_0005_02" }, + { "time": 1.6333, "name": "fazhang_0004_03" }, + { "time": 1.7, "name": "fazhang_0003_04" }, + { "time": 1.7666, "name": "fazhang_0002_05" }, + { "time": 1.8333, "name": "fazhang_0001_06" }, + { "time": 1.9, "name": "fazhang_0000_07" }, + { "time": 1.9666, "name": null } ] } }, @@ -36,20 +101,67 @@ "big_whitestar": { "rotate": [ { "time": 0, "angle": 0, "curve": "stepped" }, + { "time": 1.6666, "angle": 0, "curve": "stepped" }, { "time": 3.3333, "angle": 0 } ], "translate": [ - { "time": 0, "x": 128.56, "y": 0, "curve": "stepped" }, - { "time": 3.3333, "x": 128.56, "y": 0 } + { "time": 0, "x": 0, "y": 0, "curve": "stepped" }, + { "time": 1.6666, "x": 0, "y": 0, "curve": "stepped" }, + { "time": 3.3333, "x": 0, "y": 0 } ], "scale": [ - { "time": 0, "x": 1, "y": 1, "curve": "stepped" }, - { "time": 3.3333, "x": 1, "y": 1 } + { "time": 0, "x": 0.835, "y": 0.835 }, + { "time": 1.6666, "x": 1.11, "y": 1.11 }, + { "time": 3.3333, "x": 0.835, "y": 0.835 } ], "shear": [ { "time": 0, "x": 0, "y": 0, "curve": "stepped" }, { "time": 3.3333, "x": 0, "y": 0 } ] + }, + "big_whitestar2": { + "rotate": [ + { "time": 1, "angle": 0 }, + { "time": 1.6666, "angle": -68.88 }, + { "time": 2.3333, "angle": -186.55 } + ], + "translate": [ + { "time": 0, "x": 278.89, "y": 0 }, + { "time": 1, "x": 0, "y": 0, "curve": "stepped" }, + { "time": 1.6666, "x": 0, "y": 0, "curve": "stepped" }, + { "time": 2.3333, "x": 0, "y": 0 } + ], + "scale": [ + { "time": 1, "x": 0.444, "y": 0.444 }, + { "time": 1.6666, "x": 0.676, "y": 0.676 }, + { "time": 2.3333, "x": 0.444, "y": 0.444 } + ] + }, + "fazhang_0006_01": { + "rotate": [ + { "time": 1, "angle": 0 } + ], + "translate": [ + { "time": 1, "x": 0, "y": 0 } + ], + "scale": [ + { "time": 1, "x": 0.368, "y": 0.368 }, + { "time": 1.5333, "x": 0.87, "y": 0.87 } + ] + }, + "fazhang_0006_1": { + "rotate": [ + { "time": 1.5, "angle": 0, "curve": "stepped" }, + { "time": 1.9666, "angle": 0 } + ], + "translate": [ + { "time": 1.5, "x": -69.06, "y": 0, "curve": "stepped" }, + { "time": 1.9666, "x": -69.06, "y": 0 } + ], + "scale": [ + { "time": 1.5, "x": 0.477, "y": 0.477 }, + { "time": 1.9666, "x": 0.847, "y": 0.847 } + ] } } } diff --git a/res/ui/hero/skillTree/star_3_active.png b/res/ui/hero/skillTree/star_3_active.png index 1667a4a..9b67a7d 100644 Binary files a/res/ui/hero/skillTree/star_3_active.png and b/res/ui/hero/skillTree/star_3_active.png differ diff --git a/res/ui/hero/skillTree/star_4_active.atlas b/res/ui/hero/skillTree/star_4_active.atlas index cd2e70d..4c99ac2 100644 --- a/res/ui/hero/skillTree/star_4_active.atlas +++ b/res/ui/hero/skillTree/star_4_active.atlas @@ -1,20 +1,62 @@ star_4_active.png -size: 188,154 +size: 1168,150 format: RGBA4444 filter: Linear,Linear repeat: none -001 +big_whitestar rotate: false - xy: 154, 120 - size: 32, 32 - orig: 32, 32 + xy: 1031, 13 + size: 135, 135 + orig: 135, 135 offset: 0, 0 index: -1 -big_whitestar +fazhang_0000_07 rotate: false xy: 2, 2 - size: 150, 150 - orig: 150, 150 + size: 145, 146 + orig: 145, 146 + offset: 0, 0 + index: -1 +fazhang_0001_06 + rotate: false + xy: 149, 2 + size: 145, 146 + orig: 145, 146 + offset: 0, 0 + index: -1 +fazhang_0002_05 + rotate: false + xy: 296, 2 + size: 145, 146 + orig: 145, 146 + offset: 0, 0 + index: -1 +fazhang_0003_04 + rotate: false + xy: 443, 2 + size: 145, 146 + orig: 145, 146 + offset: 0, 0 + index: -1 +fazhang_0004_03 + rotate: false + xy: 590, 2 + size: 145, 146 + orig: 145, 146 + offset: 0, 0 + index: -1 +fazhang_0005_02 + rotate: false + xy: 737, 2 + size: 145, 146 + orig: 145, 146 + offset: 0, 0 + index: -1 +fazhang_0006_01 + rotate: false + xy: 884, 2 + size: 145, 146 + orig: 145, 146 offset: 0, 0 index: -1 diff --git a/res/ui/hero/skillTree/star_4_active.json b/res/ui/hero/skillTree/star_4_active.json index faaa7ca..cbf1944 100644 --- a/res/ui/hero/skillTree/star_4_active.json +++ b/res/ui/hero/skillTree/star_4_active.json @@ -1,20 +1,43 @@ { -"skeleton": { "hash": "5nngH62olBHJGBOfvtrHY6tt3j0", "spine": "3.4.02", "width": 216.4, "height": 153.71, "images": "" }, +"skeleton": { "hash": "j4Fcyc+J6jZt5NSWyMRzrm2ZBdc", "spine": "3.4.02", "width": 153.71, "height": 153.71, "images": "" }, "bones": [ { "name": "root", "x": -0.03 }, - { "name": "big_whitestar", "parent": "root", "length": 39.44, "rotation": 90.58, "x": -128.38, "y": -0.09 } + { "name": "big_whitestar", "parent": "root", "length": 39.44, "rotation": 90.58 }, + { "name": "big_whitestar2", "parent": "root", "length": 39.44, "rotation": 90.58 }, + { "name": "fazhang_0006_01", "parent": "root" }, + { "name": "fazhang_0006_1", "parent": "root", "x": 69.06 } ], "slots": [ - { "name": "001", "bone": "root", "attachment": "001" }, - { "name": "big_whitestar", "bone": "big_whitestar", "attachment": "big_whitestar" } + { "name": "fazhang_0006_01", "bone": "fazhang_0006_01" }, + { "name": "fazhang_0006_1", "bone": "fazhang_0006_1" }, + { "name": "big_whitestar", "bone": "big_whitestar", "attachment": "big_whitestar" }, + { "name": "big_whitestar2", "bone": "big_whitestar2", "blend": "screen" } ], "skins": { "default": { - "001": { - "001": { "x": 0.03, "scaleX": 0.7, "scaleY": 0.7, "width": 32, "height": 32 } - }, "big_whitestar": { + "big_whitestar": { "rotation": -92.02, "width": 150, "height": 150 } + }, + "big_whitestar2": { "big_whitestar": { "x": 1.06, "y": -0.08, "rotation": -92.02, "width": 150, "height": 150 } + }, + "fazhang_0006_01": { + "fazhang_0000_07": { "x": -0.03, "width": 161, "height": 162 }, + "fazhang_0001_06": { "x": -0.03, "width": 161, "height": 162 }, + "fazhang_0002_05": { "x": -0.03, "width": 161, "height": 162 }, + "fazhang_0003_04": { "x": -0.03, "width": 161, "height": 162 }, + "fazhang_0004_03": { "x": -0.03, "width": 161, "height": 162 }, + "fazhang_0005_02": { "x": -0.03, "width": 161, "height": 162 }, + "fazhang_0006_01": { "width": 161, "height": 162 } + }, + "fazhang_0006_1": { + "fazhang_0000_07": { "x": -0.03, "width": 161, "height": 162 }, + "fazhang_0001_06": { "x": -0.03, "width": 161, "height": 162 }, + "fazhang_0002_05": { "x": -0.03, "width": 161, "height": 162 }, + "fazhang_0003_04": { "x": -0.03, "width": 161, "height": 162 }, + "fazhang_0004_03": { "x": -0.03, "width": 161, "height": 162 }, + "fazhang_0005_02": { "x": -0.03, "width": 161, "height": 162 }, + "fazhang_0006_01": { "width": 161, "height": 162 } } } }, @@ -26,9 +49,51 @@ { "time": 0, "color": "ffffffc1" }, { "time": 1.6666, "color": "ffffffff" }, { "time": 3.3333, "color": "ffffffc1" } + ] + }, + "big_whitestar2": { + "color": [ + { "time": 1, "color": "ffffff00" }, + { "time": 1.6666, "color": "ffffffff" }, + { "time": 2.3333, "color": "ffffff00" } + ], + "attachment": [ + { "time": 1, "name": "big_whitestar" }, + { "time": 2.3333, "name": "big_whitestar" } + ] + }, + "fazhang_0006_01": { + "color": [ + { "time": 1, "color": "ffffffff" }, + { "time": 1.4666, "color": "ffffff2c" }, + { "time": 1.5333, "color": "ffffff00" } ], "attachment": [ - { "time": 0, "name": "big_whitestar" } + { "time": 1, "name": "fazhang_0006_01" }, + { "time": 1.0666, "name": "fazhang_0005_02" }, + { "time": 1.1333, "name": "fazhang_0004_03" }, + { "time": 1.2, "name": "fazhang_0003_04" }, + { "time": 1.2666, "name": "fazhang_0002_05" }, + { "time": 1.3333, "name": "fazhang_0001_06" }, + { "time": 1.4, "name": "fazhang_0000_07" }, + { "time": 1.4666, "name": "fazhang_0000_07" }, + { "time": 1.5333, "name": "fazhang_0001_06" } + ] + }, + "fazhang_0006_1": { + "color": [ + { "time": 1.5, "color": "ffffffff" }, + { "time": 1.9666, "color": "ffffff00" } + ], + "attachment": [ + { "time": 1.5, "name": "fazhang_0006_01" }, + { "time": 1.5666, "name": "fazhang_0005_02" }, + { "time": 1.6333, "name": "fazhang_0004_03" }, + { "time": 1.7, "name": "fazhang_0003_04" }, + { "time": 1.7666, "name": "fazhang_0002_05" }, + { "time": 1.8333, "name": "fazhang_0001_06" }, + { "time": 1.9, "name": "fazhang_0000_07" }, + { "time": 1.9666, "name": null } ] } }, @@ -36,20 +101,67 @@ "big_whitestar": { "rotate": [ { "time": 0, "angle": 0, "curve": "stepped" }, + { "time": 1.6666, "angle": 0, "curve": "stepped" }, { "time": 3.3333, "angle": 0 } ], "translate": [ - { "time": 0, "x": 128.56, "y": 0, "curve": "stepped" }, - { "time": 3.3333, "x": 128.56, "y": 0 } + { "time": 0, "x": 0, "y": 0, "curve": "stepped" }, + { "time": 1.6666, "x": 0, "y": 0, "curve": "stepped" }, + { "time": 3.3333, "x": 0, "y": 0 } ], "scale": [ - { "time": 0, "x": 1, "y": 1, "curve": "stepped" }, - { "time": 3.3333, "x": 1, "y": 1 } + { "time": 0, "x": 0.835, "y": 0.835 }, + { "time": 1.6666, "x": 1.11, "y": 1.11 }, + { "time": 3.3333, "x": 0.835, "y": 0.835 } ], "shear": [ { "time": 0, "x": 0, "y": 0, "curve": "stepped" }, { "time": 3.3333, "x": 0, "y": 0 } ] + }, + "big_whitestar2": { + "rotate": [ + { "time": 1, "angle": 0 }, + { "time": 1.6666, "angle": -68.88 }, + { "time": 2.3333, "angle": -186.55 } + ], + "translate": [ + { "time": 0, "x": 278.89, "y": 0 }, + { "time": 1, "x": 0, "y": 0, "curve": "stepped" }, + { "time": 1.6666, "x": 0, "y": 0, "curve": "stepped" }, + { "time": 2.3333, "x": 0, "y": 0 } + ], + "scale": [ + { "time": 1, "x": 0.444, "y": 0.444 }, + { "time": 1.6666, "x": 0.676, "y": 0.676 }, + { "time": 2.3333, "x": 0.444, "y": 0.444 } + ] + }, + "fazhang_0006_01": { + "rotate": [ + { "time": 1, "angle": 0 } + ], + "translate": [ + { "time": 1, "x": 0, "y": 0 } + ], + "scale": [ + { "time": 1, "x": 0.368, "y": 0.368 }, + { "time": 1.5333, "x": 0.87, "y": 0.87 } + ] + }, + "fazhang_0006_1": { + "rotate": [ + { "time": 1.5, "angle": 0, "curve": "stepped" }, + { "time": 1.9666, "angle": 0 } + ], + "translate": [ + { "time": 1.5, "x": -69.06, "y": 0, "curve": "stepped" }, + { "time": 1.9666, "x": -69.06, "y": 0 } + ], + "scale": [ + { "time": 1.5, "x": 0.477, "y": 0.477 }, + { "time": 1.9666, "x": 0.847, "y": 0.847 } + ] } } } diff --git a/res/ui/hero/skillTree/star_4_active.png b/res/ui/hero/skillTree/star_4_active.png index 1667a4a..9b67a7d 100644 Binary files a/res/ui/hero/skillTree/star_4_active.png and b/res/ui/hero/skillTree/star_4_active.png differ diff --git a/res/ui/hero/skillTree/star_5_active.atlas b/res/ui/hero/skillTree/star_5_active.atlas index bb0c582..42e6f6c 100644 --- a/res/ui/hero/skillTree/star_5_active.atlas +++ b/res/ui/hero/skillTree/star_5_active.atlas @@ -1,13 +1,62 @@ star_5_active.png -size: 96,96 +size: 1168,150 format: RGBA4444 filter: Linear,Linear repeat: none -small_whitestar +big_whitestar + rotate: false + xy: 1031, 13 + size: 135, 135 + orig: 135, 135 + offset: 0, 0 + index: -1 +fazhang_0000_07 rotate: false xy: 2, 2 - size: 92, 92 - orig: 92, 92 + size: 145, 146 + orig: 145, 146 + offset: 0, 0 + index: -1 +fazhang_0001_06 + rotate: false + xy: 149, 2 + size: 145, 146 + orig: 145, 146 + offset: 0, 0 + index: -1 +fazhang_0002_05 + rotate: false + xy: 296, 2 + size: 145, 146 + orig: 145, 146 + offset: 0, 0 + index: -1 +fazhang_0003_04 + rotate: false + xy: 443, 2 + size: 145, 146 + orig: 145, 146 + offset: 0, 0 + index: -1 +fazhang_0004_03 + rotate: false + xy: 590, 2 + size: 145, 146 + orig: 145, 146 + offset: 0, 0 + index: -1 +fazhang_0005_02 + rotate: false + xy: 737, 2 + size: 145, 146 + orig: 145, 146 + offset: 0, 0 + index: -1 +fazhang_0006_01 + rotate: false + xy: 884, 2 + size: 145, 146 + orig: 145, 146 offset: 0, 0 index: -1 diff --git a/res/ui/hero/skillTree/star_5_active.json b/res/ui/hero/skillTree/star_5_active.json index df3ffc4..cbf1944 100644 --- a/res/ui/hero/skillTree/star_5_active.json +++ b/res/ui/hero/skillTree/star_5_active.json @@ -1,46 +1,166 @@ { -"skeleton": { "hash": "b8z29WB0WcC0m8wcpuP7EV4rz90", "spine": "3.4.02", "width": 0, "height": 0, "images": "" }, +"skeleton": { "hash": "j4Fcyc+J6jZt5NSWyMRzrm2ZBdc", "spine": "3.4.02", "width": 153.71, "height": 153.71, "images": "" }, "bones": [ { "name": "root", "x": -0.03 }, - { "name": "small_whitestar", "parent": "root", "length": 78.88, "rotation": 89.75, "x": 0.04, "y": 221.37 } + { "name": "big_whitestar", "parent": "root", "length": 39.44, "rotation": 90.58 }, + { "name": "big_whitestar2", "parent": "root", "length": 39.44, "rotation": 90.58 }, + { "name": "fazhang_0006_01", "parent": "root" }, + { "name": "fazhang_0006_1", "parent": "root", "x": 69.06 } ], "slots": [ - { "name": "small_whitestar", "bone": "small_whitestar" } + { "name": "fazhang_0006_01", "bone": "fazhang_0006_01" }, + { "name": "fazhang_0006_1", "bone": "fazhang_0006_1" }, + { "name": "big_whitestar", "bone": "big_whitestar", "attachment": "big_whitestar" }, + { "name": "big_whitestar2", "bone": "big_whitestar2", "blend": "screen" } ], "skins": { "default": { - "small_whitestar": { - "small_whitestar": { "x": -0.06, "y": 0.03, "rotation": -89.75, "width": 92, "height": 92 } + "big_whitestar": { + "big_whitestar": { "rotation": -92.02, "width": 150, "height": 150 } + }, + "big_whitestar2": { + "big_whitestar": { "x": 1.06, "y": -0.08, "rotation": -92.02, "width": 150, "height": 150 } + }, + "fazhang_0006_01": { + "fazhang_0000_07": { "x": -0.03, "width": 161, "height": 162 }, + "fazhang_0001_06": { "x": -0.03, "width": 161, "height": 162 }, + "fazhang_0002_05": { "x": -0.03, "width": 161, "height": 162 }, + "fazhang_0003_04": { "x": -0.03, "width": 161, "height": 162 }, + "fazhang_0004_03": { "x": -0.03, "width": 161, "height": 162 }, + "fazhang_0005_02": { "x": -0.03, "width": 161, "height": 162 }, + "fazhang_0006_01": { "width": 161, "height": 162 } + }, + "fazhang_0006_1": { + "fazhang_0000_07": { "x": -0.03, "width": 161, "height": 162 }, + "fazhang_0001_06": { "x": -0.03, "width": 161, "height": 162 }, + "fazhang_0002_05": { "x": -0.03, "width": 161, "height": 162 }, + "fazhang_0003_04": { "x": -0.03, "width": 161, "height": 162 }, + "fazhang_0004_03": { "x": -0.03, "width": 161, "height": 162 }, + "fazhang_0005_02": { "x": -0.03, "width": 161, "height": 162 }, + "fazhang_0006_01": { "width": 161, "height": 162 } } } }, "animations": { "special": { "slots": { - "small_whitestar": { + "big_whitestar": { + "color": [ + { "time": 0, "color": "ffffffc1" }, + { "time": 1.6666, "color": "ffffffff" }, + { "time": 3.3333, "color": "ffffffc1" } + ] + }, + "big_whitestar2": { + "color": [ + { "time": 1, "color": "ffffff00" }, + { "time": 1.6666, "color": "ffffffff" }, + { "time": 2.3333, "color": "ffffff00" } + ], + "attachment": [ + { "time": 1, "name": "big_whitestar" }, + { "time": 2.3333, "name": "big_whitestar" } + ] + }, + "fazhang_0006_01": { + "color": [ + { "time": 1, "color": "ffffffff" }, + { "time": 1.4666, "color": "ffffff2c" }, + { "time": 1.5333, "color": "ffffff00" } + ], + "attachment": [ + { "time": 1, "name": "fazhang_0006_01" }, + { "time": 1.0666, "name": "fazhang_0005_02" }, + { "time": 1.1333, "name": "fazhang_0004_03" }, + { "time": 1.2, "name": "fazhang_0003_04" }, + { "time": 1.2666, "name": "fazhang_0002_05" }, + { "time": 1.3333, "name": "fazhang_0001_06" }, + { "time": 1.4, "name": "fazhang_0000_07" }, + { "time": 1.4666, "name": "fazhang_0000_07" }, + { "time": 1.5333, "name": "fazhang_0001_06" } + ] + }, + "fazhang_0006_1": { "color": [ - { "time": 0, "color": "ffffff8f" }, - { "time": 1.3333, "color": "ffffffff" }, - { "time": 2.6666, "color": "ffffff8f" } + { "time": 1.5, "color": "ffffffff" }, + { "time": 1.9666, "color": "ffffff00" } ], "attachment": [ - { "time": 0, "name": "small_whitestar" } + { "time": 1.5, "name": "fazhang_0006_01" }, + { "time": 1.5666, "name": "fazhang_0005_02" }, + { "time": 1.6333, "name": "fazhang_0004_03" }, + { "time": 1.7, "name": "fazhang_0003_04" }, + { "time": 1.7666, "name": "fazhang_0002_05" }, + { "time": 1.8333, "name": "fazhang_0001_06" }, + { "time": 1.9, "name": "fazhang_0000_07" }, + { "time": 1.9666, "name": null } ] } }, "bones": { - "small_whitestar": { + "big_whitestar": { "rotate": [ - { "time": 0, "angle": 0 } + { "time": 0, "angle": 0, "curve": "stepped" }, + { "time": 1.6666, "angle": 0, "curve": "stepped" }, + { "time": 3.3333, "angle": 0 } ], "translate": [ - { "time": 0, "x": 0, "y": -221.26 } + { "time": 0, "x": 0, "y": 0, "curve": "stepped" }, + { "time": 1.6666, "x": 0, "y": 0, "curve": "stepped" }, + { "time": 3.3333, "x": 0, "y": 0 } ], "scale": [ - { "time": 0, "x": 1, "y": 1 } + { "time": 0, "x": 0.835, "y": 0.835 }, + { "time": 1.6666, "x": 1.11, "y": 1.11 }, + { "time": 3.3333, "x": 0.835, "y": 0.835 } ], "shear": [ - { "time": 0, "x": 0, "y": 0 } + { "time": 0, "x": 0, "y": 0, "curve": "stepped" }, + { "time": 3.3333, "x": 0, "y": 0 } + ] + }, + "big_whitestar2": { + "rotate": [ + { "time": 1, "angle": 0 }, + { "time": 1.6666, "angle": -68.88 }, + { "time": 2.3333, "angle": -186.55 } + ], + "translate": [ + { "time": 0, "x": 278.89, "y": 0 }, + { "time": 1, "x": 0, "y": 0, "curve": "stepped" }, + { "time": 1.6666, "x": 0, "y": 0, "curve": "stepped" }, + { "time": 2.3333, "x": 0, "y": 0 } + ], + "scale": [ + { "time": 1, "x": 0.444, "y": 0.444 }, + { "time": 1.6666, "x": 0.676, "y": 0.676 }, + { "time": 2.3333, "x": 0.444, "y": 0.444 } + ] + }, + "fazhang_0006_01": { + "rotate": [ + { "time": 1, "angle": 0 } + ], + "translate": [ + { "time": 1, "x": 0, "y": 0 } + ], + "scale": [ + { "time": 1, "x": 0.368, "y": 0.368 }, + { "time": 1.5333, "x": 0.87, "y": 0.87 } + ] + }, + "fazhang_0006_1": { + "rotate": [ + { "time": 1.5, "angle": 0, "curve": "stepped" }, + { "time": 1.9666, "angle": 0 } + ], + "translate": [ + { "time": 1.5, "x": -69.06, "y": 0, "curve": "stepped" }, + { "time": 1.9666, "x": -69.06, "y": 0 } + ], + "scale": [ + { "time": 1.5, "x": 0.477, "y": 0.477 }, + { "time": 1.9666, "x": 0.847, "y": 0.847 } ] } } diff --git a/res/ui/hero/skillTree/star_5_active.png b/res/ui/hero/skillTree/star_5_active.png index e7b017b..9b67a7d 100644 Binary files a/res/ui/hero/skillTree/star_5_active.png and b/res/ui/hero/skillTree/star_5_active.png differ diff --git a/res/ui/hero/skillTree/star_6_active.atlas b/res/ui/hero/skillTree/star_6_active.atlas index 61bbdaf..4722e2e 100644 --- a/res/ui/hero/skillTree/star_6_active.atlas +++ b/res/ui/hero/skillTree/star_6_active.atlas @@ -1,13 +1,62 @@ star_6_active.png -size: 96,96 +size: 1168,150 format: RGBA4444 filter: Linear,Linear repeat: none -small_whitestar +big_whitestar + rotate: false + xy: 1031, 13 + size: 135, 135 + orig: 135, 135 + offset: 0, 0 + index: -1 +fazhang_0000_07 rotate: false xy: 2, 2 - size: 92, 92 - orig: 92, 92 + size: 145, 146 + orig: 145, 146 + offset: 0, 0 + index: -1 +fazhang_0001_06 + rotate: false + xy: 149, 2 + size: 145, 146 + orig: 145, 146 + offset: 0, 0 + index: -1 +fazhang_0002_05 + rotate: false + xy: 296, 2 + size: 145, 146 + orig: 145, 146 + offset: 0, 0 + index: -1 +fazhang_0003_04 + rotate: false + xy: 443, 2 + size: 145, 146 + orig: 145, 146 + offset: 0, 0 + index: -1 +fazhang_0004_03 + rotate: false + xy: 590, 2 + size: 145, 146 + orig: 145, 146 + offset: 0, 0 + index: -1 +fazhang_0005_02 + rotate: false + xy: 737, 2 + size: 145, 146 + orig: 145, 146 + offset: 0, 0 + index: -1 +fazhang_0006_01 + rotate: false + xy: 884, 2 + size: 145, 146 + orig: 145, 146 offset: 0, 0 index: -1 diff --git a/res/ui/hero/skillTree/star_6_active.json b/res/ui/hero/skillTree/star_6_active.json index df3ffc4..cbf1944 100644 --- a/res/ui/hero/skillTree/star_6_active.json +++ b/res/ui/hero/skillTree/star_6_active.json @@ -1,46 +1,166 @@ { -"skeleton": { "hash": "b8z29WB0WcC0m8wcpuP7EV4rz90", "spine": "3.4.02", "width": 0, "height": 0, "images": "" }, +"skeleton": { "hash": "j4Fcyc+J6jZt5NSWyMRzrm2ZBdc", "spine": "3.4.02", "width": 153.71, "height": 153.71, "images": "" }, "bones": [ { "name": "root", "x": -0.03 }, - { "name": "small_whitestar", "parent": "root", "length": 78.88, "rotation": 89.75, "x": 0.04, "y": 221.37 } + { "name": "big_whitestar", "parent": "root", "length": 39.44, "rotation": 90.58 }, + { "name": "big_whitestar2", "parent": "root", "length": 39.44, "rotation": 90.58 }, + { "name": "fazhang_0006_01", "parent": "root" }, + { "name": "fazhang_0006_1", "parent": "root", "x": 69.06 } ], "slots": [ - { "name": "small_whitestar", "bone": "small_whitestar" } + { "name": "fazhang_0006_01", "bone": "fazhang_0006_01" }, + { "name": "fazhang_0006_1", "bone": "fazhang_0006_1" }, + { "name": "big_whitestar", "bone": "big_whitestar", "attachment": "big_whitestar" }, + { "name": "big_whitestar2", "bone": "big_whitestar2", "blend": "screen" } ], "skins": { "default": { - "small_whitestar": { - "small_whitestar": { "x": -0.06, "y": 0.03, "rotation": -89.75, "width": 92, "height": 92 } + "big_whitestar": { + "big_whitestar": { "rotation": -92.02, "width": 150, "height": 150 } + }, + "big_whitestar2": { + "big_whitestar": { "x": 1.06, "y": -0.08, "rotation": -92.02, "width": 150, "height": 150 } + }, + "fazhang_0006_01": { + "fazhang_0000_07": { "x": -0.03, "width": 161, "height": 162 }, + "fazhang_0001_06": { "x": -0.03, "width": 161, "height": 162 }, + "fazhang_0002_05": { "x": -0.03, "width": 161, "height": 162 }, + "fazhang_0003_04": { "x": -0.03, "width": 161, "height": 162 }, + "fazhang_0004_03": { "x": -0.03, "width": 161, "height": 162 }, + "fazhang_0005_02": { "x": -0.03, "width": 161, "height": 162 }, + "fazhang_0006_01": { "width": 161, "height": 162 } + }, + "fazhang_0006_1": { + "fazhang_0000_07": { "x": -0.03, "width": 161, "height": 162 }, + "fazhang_0001_06": { "x": -0.03, "width": 161, "height": 162 }, + "fazhang_0002_05": { "x": -0.03, "width": 161, "height": 162 }, + "fazhang_0003_04": { "x": -0.03, "width": 161, "height": 162 }, + "fazhang_0004_03": { "x": -0.03, "width": 161, "height": 162 }, + "fazhang_0005_02": { "x": -0.03, "width": 161, "height": 162 }, + "fazhang_0006_01": { "width": 161, "height": 162 } } } }, "animations": { "special": { "slots": { - "small_whitestar": { + "big_whitestar": { + "color": [ + { "time": 0, "color": "ffffffc1" }, + { "time": 1.6666, "color": "ffffffff" }, + { "time": 3.3333, "color": "ffffffc1" } + ] + }, + "big_whitestar2": { + "color": [ + { "time": 1, "color": "ffffff00" }, + { "time": 1.6666, "color": "ffffffff" }, + { "time": 2.3333, "color": "ffffff00" } + ], + "attachment": [ + { "time": 1, "name": "big_whitestar" }, + { "time": 2.3333, "name": "big_whitestar" } + ] + }, + "fazhang_0006_01": { + "color": [ + { "time": 1, "color": "ffffffff" }, + { "time": 1.4666, "color": "ffffff2c" }, + { "time": 1.5333, "color": "ffffff00" } + ], + "attachment": [ + { "time": 1, "name": "fazhang_0006_01" }, + { "time": 1.0666, "name": "fazhang_0005_02" }, + { "time": 1.1333, "name": "fazhang_0004_03" }, + { "time": 1.2, "name": "fazhang_0003_04" }, + { "time": 1.2666, "name": "fazhang_0002_05" }, + { "time": 1.3333, "name": "fazhang_0001_06" }, + { "time": 1.4, "name": "fazhang_0000_07" }, + { "time": 1.4666, "name": "fazhang_0000_07" }, + { "time": 1.5333, "name": "fazhang_0001_06" } + ] + }, + "fazhang_0006_1": { "color": [ - { "time": 0, "color": "ffffff8f" }, - { "time": 1.3333, "color": "ffffffff" }, - { "time": 2.6666, "color": "ffffff8f" } + { "time": 1.5, "color": "ffffffff" }, + { "time": 1.9666, "color": "ffffff00" } ], "attachment": [ - { "time": 0, "name": "small_whitestar" } + { "time": 1.5, "name": "fazhang_0006_01" }, + { "time": 1.5666, "name": "fazhang_0005_02" }, + { "time": 1.6333, "name": "fazhang_0004_03" }, + { "time": 1.7, "name": "fazhang_0003_04" }, + { "time": 1.7666, "name": "fazhang_0002_05" }, + { "time": 1.8333, "name": "fazhang_0001_06" }, + { "time": 1.9, "name": "fazhang_0000_07" }, + { "time": 1.9666, "name": null } ] } }, "bones": { - "small_whitestar": { + "big_whitestar": { "rotate": [ - { "time": 0, "angle": 0 } + { "time": 0, "angle": 0, "curve": "stepped" }, + { "time": 1.6666, "angle": 0, "curve": "stepped" }, + { "time": 3.3333, "angle": 0 } ], "translate": [ - { "time": 0, "x": 0, "y": -221.26 } + { "time": 0, "x": 0, "y": 0, "curve": "stepped" }, + { "time": 1.6666, "x": 0, "y": 0, "curve": "stepped" }, + { "time": 3.3333, "x": 0, "y": 0 } ], "scale": [ - { "time": 0, "x": 1, "y": 1 } + { "time": 0, "x": 0.835, "y": 0.835 }, + { "time": 1.6666, "x": 1.11, "y": 1.11 }, + { "time": 3.3333, "x": 0.835, "y": 0.835 } ], "shear": [ - { "time": 0, "x": 0, "y": 0 } + { "time": 0, "x": 0, "y": 0, "curve": "stepped" }, + { "time": 3.3333, "x": 0, "y": 0 } + ] + }, + "big_whitestar2": { + "rotate": [ + { "time": 1, "angle": 0 }, + { "time": 1.6666, "angle": -68.88 }, + { "time": 2.3333, "angle": -186.55 } + ], + "translate": [ + { "time": 0, "x": 278.89, "y": 0 }, + { "time": 1, "x": 0, "y": 0, "curve": "stepped" }, + { "time": 1.6666, "x": 0, "y": 0, "curve": "stepped" }, + { "time": 2.3333, "x": 0, "y": 0 } + ], + "scale": [ + { "time": 1, "x": 0.444, "y": 0.444 }, + { "time": 1.6666, "x": 0.676, "y": 0.676 }, + { "time": 2.3333, "x": 0.444, "y": 0.444 } + ] + }, + "fazhang_0006_01": { + "rotate": [ + { "time": 1, "angle": 0 } + ], + "translate": [ + { "time": 1, "x": 0, "y": 0 } + ], + "scale": [ + { "time": 1, "x": 0.368, "y": 0.368 }, + { "time": 1.5333, "x": 0.87, "y": 0.87 } + ] + }, + "fazhang_0006_1": { + "rotate": [ + { "time": 1.5, "angle": 0, "curve": "stepped" }, + { "time": 1.9666, "angle": 0 } + ], + "translate": [ + { "time": 1.5, "x": -69.06, "y": 0, "curve": "stepped" }, + { "time": 1.9666, "x": -69.06, "y": 0 } + ], + "scale": [ + { "time": 1.5, "x": 0.477, "y": 0.477 }, + { "time": 1.9666, "x": 0.847, "y": 0.847 } ] } } diff --git a/res/ui/hero/skillTree/star_6_active.png b/res/ui/hero/skillTree/star_6_active.png index e7b017b..9b67a7d 100644 Binary files a/res/ui/hero/skillTree/star_6_active.png and b/res/ui/hero/skillTree/star_6_active.png differ -- libgit2 0.21.2