From 0d636ce8c192b1f999d1f4d3112bc329cadf1c2f Mon Sep 17 00:00:00 2001 From: zhengshouren <448949750@qq.com> Date: Fri, 19 Apr 2019 00:40:45 +0800 Subject: [PATCH] auto package --- res/csvdata.dat | Bin 2642108 -> 0 bytes res/flist | 12 +++++++----- res/game.dat | Bin 866944 -> 0 bytes res/music/sound/shushi_lingyanqun.mp3 | Bin 0 -> 24214 bytes res/music/sound/shushi_xuebo.mp3 | Bin 0 -> 29856 bytes res/spineEff/baoqi.json | 151 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------------------------------------------------- res/update.lua | Bin 38616 -> 0 bytes 7 files changed, 84 insertions(+), 79 deletions(-) create mode 100644 res/music/sound/shushi_lingyanqun.mp3 create mode 100644 res/music/sound/shushi_xuebo.mp3 diff --git a/res/csvdata.dat b/res/csvdata.dat index 5a7571e..1ac59b6 100644 Binary files a/res/csvdata.dat and b/res/csvdata.dat differ diff --git a/res/flist b/res/flist index a1e7510..63d624b 100644 --- a/res/flist +++ b/res/flist @@ -1,7 +1,7 @@ local list = { - ver = "1.0.22", + ver = "1.0.23", stage = { - {name = "res/game.dat", code = "3694c2cea4b1d212627f26181769f9f9", size = "866944"}, + {name = "res/game.dat", code = "8406b2a61d869b554537c7438b91091b", size = "867984"}, {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"}, @@ -206,6 +206,7 @@ local list = { {name = "res/music/sound/zadi02.mp3", code = "4a12efcd41503aebc09bfae0fd0aacb5", size = "19259"}, {name = "res/music/sound/cike_a1.mp3", code = "3e947566eb6088d7aa3c92a573b74087", size = "16515"}, {name = "res/music/sound/shout_kuangskillD.mp3", code = "6296f9156a431b8e0da1037cb3d07a3c", size = "77425"}, + {name = "res/music/sound/shushi_xuebo.mp3", code = "52318542c67cc69f576d5e779b12a2fc", size = "29856"}, {name = "res/music/sound/atk_molong_a2.mp3", code = "184f75fddfd0da9915f26b18f6d71eb2", size = "25154"}, {name = "res/music/sound/bingyuansu_skillC1.mp3", code = "93816e5e9cf476c87bfe7dcbd4317573", size = "11360"}, {name = "res/music/sound/atk_guangjipao.mp3", code = "35d72034af9e9b65b8ac9ed88f58bcb9", size = "23925"}, @@ -314,6 +315,7 @@ local list = { {name = "res/music/sound/mojian_skillB2.mp3", code = "01236298603f22091e576bdc0c5f2e76", size = "18571"}, {name = "res/music/sound/lingzhu_skillD.mp3", code = "252627c4e180b825f4442051482bc195", size = "18675"}, {name = "res/music/sound/alsts_skillC1.mp3", code = "09b1b9c6491738921677e9f7bbda4b54", size = "27035"}, + {name = "res/music/sound/shushi_lingyanqun.mp3", code = "350b859481adc1d8415a628b5f91676c", size = "24214"}, {name = "res/music/sound/hurt1_qiangshou1.mp3", code = "c6882141b6929d5f6d60f03f53cab9fb", size = "6135"}, {name = "res/music/sound/jianyintieqi.mp3", code = "f3c17836383e0da1855af8b09cf06368", size = "5268"}, {name = "res/music/sound/atk_gong1.mp3", code = "bc44ff8fb7ea17b685b9b2154fb4ca0b", size = "6731"}, @@ -1202,7 +1204,7 @@ local list = { {name = "res/skin/skin_lieren.png", code = "f0bfae00115a4428fab481089184f21b", size = "8084"}, {name = "res/skin/skin_jianshi_g.png", code = "f4869bb7dadaba181f691a146c17573b", size = "7920"}, {name = "res/skin/skin_jianshi.png", code = "f771037605cec08f38adbaa2cfdbe3f4", size = "7452"}, - {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/binghuan.atlas", code = "819a96338a671c01d6b15bbf0d228fb3", size = "443"}, {name = "res/spineEff/bingqilang.json", code = "cb22be8fb6745efd8c6c81b7324799d5", size = "8826"}, @@ -1689,7 +1691,7 @@ local list = { {name = "res/spineEff/sword_blacklight.json", code = "a3e35434f15089a09a9ed25f347f3265", size = "1535"}, {name = "res/spineEff/zadi.png", code = "12059dc14feed2ee73904481fe509312", size = "54352"}, {name = "res/spineEff/fashi_skillA1hurt.png", code = "a079683c864c34c3aac4040c9cfea45f", size = "60224"}, - {name = "res/spineEff/baoqi.json", code = "747f7b7c82324b15e8c67b73ede27461", size = "11268"}, + {name = "res/spineEff/baoqi.json", code = "40a1d7b4a37ae763ee0ac2a615e7a05a", size = "11325"}, {name = "res/spineEff/yanxingzhizhu2.png", code = "f4f1418c28a4eb81dbcee667437f4f15", size = "7012"}, {name = "res/spineEff/laolieren_skillD1.json", code = "42718439cf03b5f86248f22e78f7ae3e", size = "14198"}, {name = "res/spineEff/huixuan.atlas", code = "28db546c20143c9d574bcb7913c09012", size = "909"}, @@ -3648,7 +3650,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 = "7725bca5e00ebc10afd1d789fae81592", size = "2642108"}, + {name = "res/csvdata.dat", code = "d88fe5a65bfb51cf39eefc6123f92b86", size = "2642404"}, {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"}, diff --git a/res/game.dat b/res/game.dat index 21e6484..4a0ba3e 100644 Binary files a/res/game.dat and b/res/game.dat differ diff --git a/res/music/sound/shushi_lingyanqun.mp3 b/res/music/sound/shushi_lingyanqun.mp3 new file mode 100644 index 0000000..f973cae Binary files /dev/null and b/res/music/sound/shushi_lingyanqun.mp3 differ diff --git a/res/music/sound/shushi_xuebo.mp3 b/res/music/sound/shushi_xuebo.mp3 new file mode 100644 index 0000000..ba79fe5 Binary files /dev/null and b/res/music/sound/shushi_xuebo.mp3 differ diff --git a/res/spineEff/baoqi.json b/res/spineEff/baoqi.json index 7683f1a..296d160 100644 --- a/res/spineEff/baoqi.json +++ b/res/spineEff/baoqi.json @@ -1,5 +1,5 @@ { -"skeleton": { "hash": "P8Hz5ECFoFrIVBDyP/z9ikGS2vQ", "spine": "3.4.02", "width": 0, "height": 0 }, +"skeleton": { "hash": "zRvQ51ujmVItjvIR+v2L6gqNJng", "spine": "3.4.02", "width": 0, "height": 0 }, "bones": [ { "name": "root" }, { "name": "1", "parent": "root", "x": 42.33, "y": 161.79 }, @@ -139,22 +139,22 @@ "slots": { "1": { "attachment": [ - { "time": 0.2, "name": "01" }, - { "time": 0.2333, "name": "02" }, - { "time": 0.2666, "name": "03" }, - { "time": 0.3333, "name": "04" }, - { "time": 0.3666, "name": "05" }, - { "time": 0.4, "name": null } + { "time": 0.4, "name": "01" }, + { "time": 0.4666, "name": "02" }, + { "time": 0.5333, "name": "03" }, + { "time": 0.6666, "name": "04" }, + { "time": 0.7333, "name": "05" }, + { "time": 0.8, "name": null } ] }, "2": { "attachment": [ - { "time": 0.2, "name": "01" }, - { "time": 0.2333, "name": "02" }, - { "time": 0.3, "name": "03" }, - { "time": 0.3333, "name": "04" }, - { "time": 0.3666, "name": "05" }, - { "time": 0.4, "name": null } + { "time": 0.4, "name": "01" }, + { "time": 0.4666, "name": "02" }, + { "time": 0.6, "name": "03" }, + { "time": 0.6666, "name": "04" }, + { "time": 0.7333, "name": "05" }, + { "time": 0.8, "name": null } ] }, "01": { @@ -163,68 +163,68 @@ ], "attachment": [ { "time": 0, "name": "01" }, - { "time": 0.0666, "name": "02" }, - { "time": 0.1, "name": "03" }, - { "time": 0.1333, "name": "04" }, - { "time": 0.2, "name": null }, - { "time": 0.2333, "name": null } + { "time": 0.1333, "name": "02" }, + { "time": 0.2, "name": "03" }, + { "time": 0.2666, "name": "04" }, + { "time": 0.4, "name": null }, + { "time": 0.4666, "name": null } ] }, "Electricity_00": { "attachment": [ { "time": 0, "name": "Electricity_00" }, - { "time": 0.0333, "name": "Electricity_01" }, - { "time": 0.0666, "name": "Electricity_02" }, - { "time": 0.1, "name": "Electricity_03" }, - { "time": 0.1333, "name": "Electricity_05" }, - { "time": 0.1666, "name": "Electricity_07" }, - { "time": 0.2, "name": "Electricity_09" }, - { "time": 0.2333, "name": "Electricity_10" }, - { "time": 0.2666, "name": "Electricity_12" }, - { "time": 0.3, "name": "Electricity_14" }, - { "time": 0.3333, "name": null } + { "time": 0.0666, "name": "Electricity_01" }, + { "time": 0.1333, "name": "Electricity_02" }, + { "time": 0.2, "name": "Electricity_03" }, + { "time": 0.2666, "name": "Electricity_05" }, + { "time": 0.3333, "name": "Electricity_07" }, + { "time": 0.4, "name": "Electricity_09" }, + { "time": 0.4666, "name": "Electricity_10" }, + { "time": 0.5333, "name": "Electricity_12" }, + { "time": 0.6, "name": "Electricity_14" }, + { "time": 0.6666, "name": null } ] }, "Smoke_01": { "attachment": [ - { "time": 0.0333, "name": "Smoke_01" }, - { "time": 0.0666, "name": "Smoke_03" }, - { "time": 0.1, "name": "Smoke_05" }, - { "time": 0.1333, "name": "Smoke_07" }, - { "time": 0.1666, "name": "Smoke_09" }, - { "time": 0.2, "name": "Smoke_11" }, - { "time": 0.2333, "name": "Smoke_13" }, - { "time": 0.2666, "name": "Smoke_15" }, - { "time": 0.3, "name": "Smoke_17" }, - { "time": 0.3333, "name": null } + { "time": 0.0666, "name": "Smoke_01" }, + { "time": 0.1333, "name": "Smoke_03" }, + { "time": 0.2, "name": "Smoke_05" }, + { "time": 0.2666, "name": "Smoke_07" }, + { "time": 0.3333, "name": "Smoke_09" }, + { "time": 0.4, "name": "Smoke_11" }, + { "time": 0.4666, "name": "Smoke_13" }, + { "time": 0.5333, "name": "Smoke_15" }, + { "time": 0.6, "name": "Smoke_17" }, + { "time": 0.6666, "name": null } ] }, "Smoke_1": { "attachment": [ - { "time": 0.2, "name": "Smoke_01" }, - { "time": 0.2333, "name": "Smoke_03" }, - { "time": 0.2666, "name": "Smoke_05" }, - { "time": 0.3, "name": "Smoke_07" }, - { "time": 0.3333, "name": "Smoke_09" }, - { "time": 0.3666, "name": "Smoke_11" }, - { "time": 0.4, "name": "Smoke_13" }, - { "time": 0.4333, "name": "Smoke_15" }, - { "time": 0.4666, "name": "Smoke_17" }, - { "time": 0.5, "name": null } + { "time": 0.4, "name": "Smoke_01" }, + { "time": 0.4666, "name": "Smoke_03" }, + { "time": 0.5333, "name": "Smoke_05" }, + { "time": 0.6, "name": "Smoke_07" }, + { "time": 0.6666, "name": "Smoke_09" }, + { "time": 0.7333, "name": "Smoke_11" }, + { "time": 0.8, "name": "Smoke_13" }, + { "time": 0.8666, "name": "Smoke_15" }, + { "time": 0.9333, "name": "Smoke_17" }, + { "time": 1, "name": null } ] }, "Smoke_2": { "attachment": [ - { "time": 0.2, "name": "Smoke_01" }, - { "time": 0.2333, "name": "Smoke_03" }, - { "time": 0.2666, "name": "Smoke_05" }, - { "time": 0.3, "name": "Smoke_07" }, - { "time": 0.3333, "name": "Smoke_09" }, - { "time": 0.3666, "name": "Smoke_11" }, - { "time": 0.4, "name": "Smoke_13" }, - { "time": 0.4333, "name": "Smoke_15" }, - { "time": 0.4666, "name": "Smoke_17" }, - { "time": 0.5, "name": null } + { "time": 0.4, "name": "Smoke_01" }, + { "time": 0.4666, "name": "Smoke_03" }, + { "time": 0.5333, "name": "Smoke_05" }, + { "time": 0.6, "name": "Smoke_07" }, + { "time": 0.6666, "name": "Smoke_09" }, + { "time": 0.7333, "name": "Smoke_11" }, + { "time": 0.8, "name": "Smoke_13" }, + { "time": 0.8666, "name": "Smoke_15" }, + { "time": 0.9333, "name": "Smoke_17" }, + { "time": 1, "name": null } ] } }, @@ -235,6 +235,9 @@ ], "translate": [ { "time": 0, "x": 0, "y": -1.06 } + ], + "scale": [ + { "time": 0, "x": 1.5, "y": 1.5 } ] }, "01": { @@ -243,12 +246,12 @@ ], "translate": [ { "time": 0, "x": 0, "y": -67.94 }, - { "time": 0.0333, "x": 0, "y": -33.22 }, - { "time": 0.0666, "x": 0, "y": -0.79 } + { "time": 0.0666, "x": 0, "y": -33.22 }, + { "time": 0.1333, "x": 0, "y": -0.79 } ], "scale": [ { "time": 0, "x": 0.114, "y": 0.58 }, - { "time": 0.0666, "x": 1, "y": 1 } + { "time": 0.1333, "x": 1, "y": 1 } ] }, "Electricity_00": { @@ -273,15 +276,15 @@ "Smoke_1": { "rotate": [ { "time": 0, "angle": 0, "curve": "stepped" }, - { "time": 0.2, "angle": 0 } + { "time": 0.4, "angle": 0 } ], "translate": [ { "time": 0, "x": 0, "y": 0 }, - { "time": 0.2, "x": 168.68, "y": -3.62 } + { "time": 0.4, "x": 168.68, "y": -3.62 } ], "scale": [ { "time": 0, "x": 1, "y": 1 }, - { "time": 0.2, "x": 0.88, "y": 0.88 } + { "time": 0.4, "x": 0.88, "y": 0.88 } ] }, "Electricity_0": { @@ -295,15 +298,15 @@ "1": { "rotate": [ { "time": 0, "angle": 0, "curve": "stepped" }, - { "time": 0.2, "angle": 0 } + { "time": 0.4, "angle": 0 } ], "translate": [ { "time": 0, "x": 0, "y": 0 }, - { "time": 0.2, "x": 170.89, "y": -38.95 } + { "time": 0.4, "x": 170.89, "y": -38.95 } ], "scale": [ { "time": 0, "x": 1, "y": 1 }, - { "time": 0.2, "x": 0.765, "y": 0.765 } + { "time": 0.4, "x": 0.765, "y": 0.765 } ] }, "2": { @@ -312,10 +315,10 @@ ], "translate": [ { "time": 0, "x": 0, "y": 0 }, - { "time": 0.2, "x": -168.29, "y": -44.92 } + { "time": 0.4, "x": -168.29, "y": -44.92 } ], "scale": [ - { "time": 0.2, "x": 0.73, "y": 0.73 } + { "time": 0.4, "x": 0.73, "y": 0.73 } ] }, "Electricity_1": { @@ -337,20 +340,20 @@ "Smoke_2": { "rotate": [ { "time": 0, "angle": 0, "curve": "stepped" }, - { "time": 0.2, "angle": 0 } + { "time": 0.4, "angle": 0 } ], "translate": [ { "time": 0, "x": 0, "y": 0 }, - { "time": 0.2, "x": -166.89, "y": 0 } + { "time": 0.4, "x": -166.89, "y": 0 } ], "scale": [ - { "time": 0.2, "x": -0.894, "y": 0.953 } + { "time": 0.4, "x": -0.894, "y": 0.953 } ] } }, "events": [ - { "time": 0.1, "name": "special" }, - { "time": 0.2666, "name": "special" } + { "time": 0.2, "name": "special" }, + { "time": 0.5333, "name": "special" } ] } } 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