diff --git a/res/csvdata.dat b/res/csvdata.dat index 90177ee..36dd1a3 100644 Binary files a/res/csvdata.dat and b/res/csvdata.dat differ diff --git a/res/flist b/res/flist index 25e1da6..15c0fd2 100644 --- a/res/flist +++ b/res/flist @@ -1,7 +1,7 @@ local list = { - ver = "1.0.9", + ver = "1.0.10", stage = { - {name = "res/game.dat", code = "392027b5a2488cfcc00117dccf4645f1", size = "795128"}, + {name = "res/game.dat", code = "841fdb27d7a10b1855a8238f390c4da9", size = "795632"}, {name = "res/guide/sela_tu_chouqu.png", code = "de469f0a126c0fd490f78f4fbb6cdf1b", size = "47884"}, {name = "res/guide/bihua_tu_suipian.png", code = "0db2178986cd5051d14ff951d89f4b33", size = "16040"}, {name = "res/guide/guide_tu_bihua.png", code = "b56e23063750ba5b3f369840cb38d7e7", size = "49648"}, @@ -1126,7 +1126,7 @@ local list = { {name = "res/ui/talk/next.png", code = "24689d5ba8c628537e533595d09b4040", size = "1312"}, {name = "res/ui/talk/talk_txt_bg1.png", code = "cac316f7583de42456864dd699e2f8dd", size = "2842"}, {name = "res/ui/talk/talk_sale_bg.png", code = "e1817189a2303c88b55ccea15a1b656c", size = "2433"}, - {name = "res/update.lua", code = "a8f5c0317c0fe25cc9e7756002a10f9c", size = "38616", act = "load"}, + {name = "res/update.lua", code = "e0dd89727fbe7eb2fd31ca4c08eb3bf0", size = "38588", act = "load"}, {name = "res/video/README.txt", code = "cce3df80f07d36b56db4376a4802d6c2", size = "6"}, {name = "res/spineEff/juleiqiu.json", code = "b0d57959fa68a0df25fa6620168c88af", size = "6978"}, {name = "res/spineEff/guangzhu_zi.png", code = "e12fb71abf281fd33f0d970a4988f3c4", size = "3796"}, @@ -1166,11 +1166,13 @@ local list = { {name = "res/spineEff/shenyizhiyin.json", code = "314dd07e06782c3041e11f52766a214b", size = "1434"}, {name = "res/spineEff/bingci.atlas", code = "b2e4e64839c36b199efdcfe78ac57ab4", size = "953"}, {name = "res/spineEff/fire_enchantment.png", code = "a27d085e85a5b30e7f95f5be8ac2b8e3", size = "2596"}, + {name = "res/spineEff/blackRed.png", code = "cc611cd2bb01bfaad9c287c6b54dff91", size = "223340"}, {name = "res/spineEff/hurt_gongjian03.png", code = "164d4e36d24e13017d0bc37f8478e743", size = "8016"}, {name = "res/spineEff/heimo_curse.atlas", code = "0a5a73eb18c14386fccd50998af1039c", size = "689"}, {name = "res/spineEff/anyingdoupeng.atlas", code = "2172a21cae9908b57fe418c0d8d22f5d", size = "6282"}, {name = "res/spineEff/dianfenshen.json", code = "d029446abd20d2f243f8e143c2904e0a", size = "32441"}, {name = "res/spineEff/buff_atk.atlas", code = "40a9e6dae79427c90e4a7bdf5a0bac0c", size = "587"}, + {name = "res/spineEff/blackRed.json", code = "69749b8f5e8d4623d901418e3d84bea8", size = "4184"}, {name = "res/spineEff/greenlove_break.json", code = "5451d2f0a0cb48d21593fc9aefdcbc0e", size = "4055"}, {name = "res/spineEff/hongguangzheng.png", code = "15660a16b954506443ee305cb5963676", size = "70340"}, {name = "res/spineEff/buff_atk.png", code = "c7b34200534212830376a68dc7c8813e", size = "4028"}, @@ -1377,6 +1379,7 @@ local list = { {name = "res/spineEff/fanshangdun.atlas", code = "176478769fc2ca9df998e9f5e62250d6", size = "181"}, {name = "res/spineEff/hot.atlas", code = "dce9a408215947d3b21c55a4559a29b3", size = "169"}, {name = "res/spineEff/laolieren_rush.png", code = "f221404fab4e4084ef36089b0f2aaa91", size = "58768"}, + {name = "res/spineEff/blackRed.atlas", code = "2da9e94aa9406452e3419022ada4d923", size = "1687"}, {name = "res/spineEff/chouqu.atlas", code = "fa912f925eea4d9a1656374db3b39aaa", size = "2649"}, {name = "res/spineEff/jianshi_skillB.png", code = "91f8bb832a79d3d301dad0e19e1b2560", size = "66104"}, {name = "res/spineEff/kongjianzhan.atlas", code = "4ca0b12ca4779b9e5cd7a858f6b0bf02", size = "4029"}, @@ -3460,7 +3463,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 = "b9a92e71c855c360ca9bbb1ca8584966", size = "2351736"}, + {name = "res/csvdata.dat", code = "c6af81ffbe578f4adbc850693da6e05e", size = "2351736"}, {name = "res/font/OLDENGL.ttf", code = "c34445985276137bcb98e7868a4ebb88", size = "36384"}, {name = "res/font/FZCQJW.TTF", code = "8d4ecbeb5215930556abaea4955c3dfe", size = "2359908"}, {name = "res/icon/battle/hero4_2_3.png", code = "34c9f2a9a0c7fac278e989779f9a9ef0", size = "4620"}, @@ -4230,6 +4233,7 @@ local list = { {name = "res/icon/equip/tower_bishou_bing06.png", code = "bde1bb64bce90e232f167521c534debe", size = "3808"}, {name = "res/icon/equip/tower_fazhang_zhang08.png", code = "2b37c73ed0f0dd79438eee6621a9d742", size = "3188"}, {name = "res/icon/equip/tower_darkarrow_gong07.png", code = "0e9823f6a438fa67eab85b8742f609c6", size = "4308"}, + {name = "res/icon/equip/darksword_17_01.png", code = "1e685473f1d40623fea3486e725205fd", size = "3528"}, {name = "res/icon/equip/qiang_08_01.png", code = "375347e0b51b40af9c41f048908b3838", size = "4692"}, {name = "res/icon/equip/tower_jian_wen08.png", code = "5c465f03b8fd064110d98755c4caff81", size = "3216"}, {name = "res/icon/equip/tower_darkarrow_arrow01.png", code = "2b1fbc8f86c34423bb35e69326068160", size = "2948"}, diff --git a/res/game.dat b/res/game.dat index c7b77ce..80e072f 100644 Binary files a/res/game.dat and b/res/game.dat differ diff --git a/res/icon/equip/darksword_17_01.png b/res/icon/equip/darksword_17_01.png new file mode 100644 index 0000000..c0b726f Binary files /dev/null and b/res/icon/equip/darksword_17_01.png differ diff --git a/res/spineEff/blackRed.atlas b/res/spineEff/blackRed.atlas new file mode 100644 index 0000000..f4a8ff9 --- /dev/null +++ b/res/spineEff/blackRed.atlas @@ -0,0 +1,111 @@ + +blackRed.png +size: 1940,1207 +format: RGBA4444 +filter: Linear,Linear +repeat: none +blackRed1 + rotate: false + xy: 2, 766 + size: 321, 439 + orig: 321, 439 + offset: 0, 0 + index: -1 +blackRed2 + rotate: false + xy: 2, 325 + size: 321, 439 + orig: 321, 439 + offset: 0, 0 + index: -1 +blackRed3 + rotate: false + xy: 325, 766 + size: 321, 439 + orig: 321, 439 + offset: 0, 0 + index: -1 +flashlight_black1 + rotate: false + xy: 325, 325 + size: 321, 439 + orig: 321, 439 + offset: 0, 0 + index: -1 +flashlight_black2 + rotate: true + xy: 2, 2 + size: 321, 439 + orig: 321, 439 + offset: 0, 0 + index: -1 +flashlight_black3 + rotate: false + xy: 648, 766 + size: 321, 439 + orig: 321, 439 + offset: 0, 0 + index: -1 +flashlight_black4 + rotate: false + xy: 648, 325 + size: 321, 439 + orig: 321, 439 + offset: 0, 0 + index: -1 +flashlight_black5 + rotate: true + xy: 443, 2 + size: 321, 439 + orig: 321, 439 + offset: 0, 0 + index: -1 +flashlight_black6 + rotate: false + xy: 971, 766 + size: 321, 439 + orig: 321, 439 + offset: 0, 0 + index: -1 +flashlight_black7 + rotate: false + xy: 971, 325 + size: 321, 439 + orig: 321, 439 + offset: 0, 0 + index: -1 +flashlight_red1 + rotate: false + xy: 1294, 766 + size: 321, 439 + orig: 321, 439 + offset: 0, 0 + index: -1 +flashlight_red2 + rotate: false + xy: 1294, 325 + size: 321, 439 + orig: 321, 439 + offset: 0, 0 + index: -1 +flashlight_red3 + rotate: true + xy: 884, 2 + size: 321, 439 + orig: 321, 439 + offset: 0, 0 + index: -1 +flashlight_red4 + rotate: false + xy: 1617, 766 + size: 321, 439 + orig: 321, 439 + offset: 0, 0 + index: -1 +flashlight_red5 + rotate: false + xy: 1617, 325 + size: 321, 439 + orig: 321, 439 + offset: 0, 0 + index: -1 diff --git a/res/spineEff/blackRed.json b/res/spineEff/blackRed.json new file mode 100644 index 0000000..080c96d --- /dev/null +++ b/res/spineEff/blackRed.json @@ -0,0 +1,137 @@ +{ +"skeleton": { "hash": "2HgLPHtzVyupysbg2dmAmr9wUss", "spine": "3.4.02", "width": 0, "height": 0 }, +"bones": [ + { "name": "root" }, + { "name": "blackRed1", "parent": "root", "x": -439.96, "y": 275.65 }, + { "name": "flashlight_black1", "parent": "root", "y": 276.73 }, + { "name": "flashlight_red1", "parent": "root", "y": 276.73 } +], +"slots": [ + { "name": "blackRed1", "bone": "blackRed1" }, + { "name": "flashlight_black1", "bone": "flashlight_black1" }, + { "name": "flashlight_red1", "bone": "flashlight_red1" } +], +"skins": { + "default": { + "blackRed1": { + "blackRed1": { "width": 401, "height": 549 }, + "blackRed2": { "width": 401, "height": 549 }, + "blackRed3": { "width": 401, "height": 549 } + }, + "flashlight_black1": { + "flashlight_black1": { "width": 401, "height": 549 }, + "flashlight_black2": { "width": 401, "height": 549 }, + "flashlight_black3": { "width": 401, "height": 549 }, + "flashlight_black4": { "width": 401, "height": 549 }, + "flashlight_black5": { "width": 401, "height": 549 }, + "flashlight_black6": { "width": 401, "height": 549 }, + "flashlight_black7": { "width": 401, "height": 549 } + }, + "flashlight_red1": { + "flashlight_red1": { "width": 401, "height": 549 }, + "flashlight_red2": { "width": 401, "height": 549 }, + "flashlight_red3": { "width": 401, "height": 549 }, + "flashlight_red4": { "width": 401, "height": 549 }, + "flashlight_red5": { "width": 401, "height": 549 } + } + } +}, +"events": { + "special": {} +}, +"animations": { + "special": { + "slots": { + "blackRed1": { + "color": [ + { "time": 0, "color": "ffffffff", "curve": "stepped" }, + { "time": 0.4, "color": "ffffffff" }, + { "time": 0.5666, "color": "ffffff00" } + ], + "attachment": [ + { "time": 0, "name": "blackRed1" }, + { "time": 0.1333, "name": "blackRed2" } + ] + }, + "flashlight_black1": { + "color": [ + { "time": 0, "color": "ffffffff", "curve": "stepped" }, + { "time": 0.4333, "color": "ffffffff" }, + { "time": 0.5666, "color": "ffffff00" } + ], + "attachment": [ + { "time": 0.2, "name": "flashlight_black1" }, + { "time": 0.2666, "name": "flashlight_black2" }, + { "time": 0.3, "name": "flashlight_black3" }, + { "time": 0.3333, "name": "flashlight_black4" }, + { "time": 0.3666, "name": "flashlight_black5" }, + { "time": 0.4333, "name": "flashlight_black6" }, + { "time": 0.4666, "name": "flashlight_black7" }, + { "time": 0.5, "name": "flashlight_black6" }, + { "time": 0.5333, "name": "flashlight_black7" }, + { "time": 0.5666, "name": null } + ] + }, + "flashlight_red1": { + "color": [ + { "time": 0.0666, "color": "ffffff00" }, + { "time": 0.1333, "color": "ffffffff" } + ], + "attachment": [ + { "time": 0.0666, "name": "flashlight_red1" }, + { "time": 0.1333, "name": "flashlight_red2" }, + { "time": 0.2, "name": "flashlight_red3" }, + { "time": 0.2666, "name": "flashlight_red4" }, + { "time": 0.3333, "name": "flashlight_red5" }, + { "time": 0.4, "name": null } + ] + } + }, + "bones": { + "flashlight_red1": { + "rotate": [ + { "time": 0.0666, "angle": 0 } + ], + "translate": [ + { "time": 0.0666, "x": 0, "y": 241.83 }, + { "time": 0.1333, "x": 0, "y": -5.28 } + ], + "scale": [ + { "time": 0.0666, "x": 3.88, "y": 0.114 }, + { "time": 0.1333, "x": 1, "y": 1 } + ] + }, + "blackRed1": { + "translate": [ + { "time": 0, "x": 441.37, "y": 228.61 }, + { "time": 0.0666, "x": 441.37, "y": -1.32 }, + { "time": 0.1333, "x": 441.37, "y": 13.21 } + ], + "scale": [ + { "time": 0, "x": 0.952, "y": 0.172 }, + { "time": 0.0666, "x": 1.013, "y": 1.013 }, + { "time": 0.1333, "x": 1.548, "y": 1.053 }, + { "time": 0.1666, "x": 2.66, "y": 1.053 }, + { "time": 0.4, "x": 1.645, "y": 1.053 }, + { "time": 0.5666, "x": 0.394, "y": 1.053 } + ] + }, + "flashlight_black1": { + "rotate": [ + { "time": 0.2, "angle": 0 } + ], + "translate": [ + { "time": 0.2, "x": 0, "y": 0 } + ], + "scale": [ + { "time": 0.2, "x": 1.198, "y": 1 } + ] + } + }, + "events": [ + { "time": 0.1333, "name": "special" }, + { "time": 0.3, "name": "special" } + ] + } +} +} \ No newline at end of file diff --git a/res/spineEff/blackRed.png b/res/spineEff/blackRed.png new file mode 100644 index 0000000..ec6ecfb Binary files /dev/null and b/res/spineEff/blackRed.png differ diff --git a/res/update.lua b/res/update.lua index b3e2853..f3736c4 100644 Binary files a/res/update.lua and b/res/update.lua differ -- libgit2 0.21.2