From f9dc8d0135aa5315d401d799596f7b41cb902e17 Mon Sep 17 00:00:00 2001 From: dangge Date: Mon, 24 Apr 2017 20:07:45 +0800 Subject: [PATCH] auto package --- res/csvdata/act.lua | Bin 37127 -> 0 bytes res/csvdata/bullet.lua | Bin 61711 -> 0 bytes res/csvdata/chapter_battle.lua | Bin 12267 -> 0 bytes res/csvdata/scene/PT/pt10001.lua | Bin 4519 -> 0 bytes res/csvdata/scene/PT/pt10101.lua | Bin 6027 -> 0 bytes res/csvdata/skill.lua | Bin 354599 -> 0 bytes res/csvdata/skill_upgrade.lua | Bin 95367 -> 0 bytes res/csvdata/unit.lua | Bin 81531 -> 0 bytes res/flist | 24 +++++++++++++----------- res/game.dat | Bin 391259 -> 0 bytes res/spine/quanjishou.json | 9 ++++++++- res/ui/battle/shield.plist | 399 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ res/ui/battle/shield.png | Bin 0 -> 13370 bytes 13 files changed, 420 insertions(+), 12 deletions(-) create mode 100644 res/ui/battle/shield.plist create mode 100644 res/ui/battle/shield.png diff --git a/res/csvdata/act.lua b/res/csvdata/act.lua index e047c28..a7b8399 100644 Binary files a/res/csvdata/act.lua and b/res/csvdata/act.lua differ diff --git a/res/csvdata/bullet.lua b/res/csvdata/bullet.lua index 5429a43..d9c3b5d 100644 Binary files a/res/csvdata/bullet.lua and b/res/csvdata/bullet.lua differ diff --git a/res/csvdata/chapter_battle.lua b/res/csvdata/chapter_battle.lua index 839a310..1e01c2d 100644 Binary files a/res/csvdata/chapter_battle.lua and b/res/csvdata/chapter_battle.lua differ diff --git a/res/csvdata/scene/PT/pt10001.lua b/res/csvdata/scene/PT/pt10001.lua index f8bfe19..f84a469 100644 Binary files a/res/csvdata/scene/PT/pt10001.lua and b/res/csvdata/scene/PT/pt10001.lua differ diff --git a/res/csvdata/scene/PT/pt10101.lua b/res/csvdata/scene/PT/pt10101.lua index bb8b79e..69a3686 100644 Binary files a/res/csvdata/scene/PT/pt10101.lua and b/res/csvdata/scene/PT/pt10101.lua differ diff --git a/res/csvdata/skill.lua b/res/csvdata/skill.lua index 1d27160..c5899b2 100644 Binary files a/res/csvdata/skill.lua and b/res/csvdata/skill.lua differ diff --git a/res/csvdata/skill_upgrade.lua b/res/csvdata/skill_upgrade.lua index cb5a551..25b7803 100644 Binary files a/res/csvdata/skill_upgrade.lua and b/res/csvdata/skill_upgrade.lua differ diff --git a/res/csvdata/unit.lua b/res/csvdata/unit.lua index 9246cc3..a41dbea 100644 Binary files a/res/csvdata/unit.lua and b/res/csvdata/unit.lua differ diff --git a/res/flist b/res/flist index d76888b..d057fae 100644 --- a/res/flist +++ b/res/flist @@ -1,5 +1,5 @@ local list = { - ver = "1.0.84", + ver = "1.0.85", stage = { {name = "res/bodyBreak/cike.plist", code = "488a1d0d85fdd58b68103a8f6f3096bb", size = "8195"}, {name = "res/bodyBreak/cike.png", code = "f1cccf397fcc8bacf85705e1e5b12364", size = "9555"}, @@ -97,11 +97,11 @@ local list = { {name = "res/cptMap/cpt_02.png", code = "b7bbddd25888e42e5698816e3c07460e", size = "77171"}, {name = "res/cptMap/cpt_03.png", code = "4fe5c78d940f084f310340f59ababaaa", size = "112367"}, {name = "res/cptMap/cpt_04.png", code = "11b36d5300b605ba84b3a71049ea367f", size = "118647"}, - {name = "res/csvdata/act.lua", code = "cfef506a36dcc049121ad62b152764bd", size = "37127", act = "load"}, + {name = "res/csvdata/act.lua", code = "2a16c75b630ec959219a2b0ee5d19513", size = "37167", act = "load"}, {name = "res/csvdata/ai.lua", code = "c080ccd0e81eaa91e9c686b9e2f432f8", size = "7663", act = "load"}, {name = "res/csvdata/attr_des.lua", code = "6ac5765d450e924ec6ce0534f8a043c9", size = "45979", act = "load"}, {name = "res/csvdata/buff.lua", code = "6922ff92a262ebfee47cfd30834589a5", size = "54955", act = "load"}, - {name = "res/csvdata/bullet.lua", code = "30902f8aadc5ba1703cbb9bb82ad97a5", size = "61711", act = "load"}, + {name = "res/csvdata/bullet.lua", code = "c7062f0adfc5f32e1b96569e52ac7d25", size = "61711", act = "load"}, {name = "res/csvdata/bullet_act/buff_wudi.lua", code = "a0b6648452a172499d6f1d9e035a52df", size = "495", act = "load"}, {name = "res/csvdata/bullet_act/buffIcon_zhimang.lua", code = "d432c04ba4867d4e73f7b337b77baa64", size = "479", act = "load"}, {name = "res/csvdata/bullet_act/chuida.lua", code = "064c59b324898bfa1bd8afaa738e4404", size = "487", act = "load"}, @@ -186,7 +186,7 @@ local list = { {name = "res/csvdata/bullet_act/zhadanren_a.lua", code = "7d13198f66e6b2f96262259f62b29613", size = "543", act = "load"}, {name = "res/csvdata/bullet_act/zhadanren_h.lua", code = "88cb1e5832e3cbc008ce0a52dc12f341", size = "523", act = "load"}, {name = "res/csvdata/cdkey.lua", code = "7f14a8a79a0de2a9a5c306e3d9c19ec0", size = "151023", act = "load"}, - {name = "res/csvdata/chapter_battle.lua", code = "1ecf1b047874946f57eea15e694d7299", size = "12267", act = "load"}, + {name = "res/csvdata/chapter_battle.lua", code = "da0f84a7023848574c9ac90e571b7a58", size = "12267", act = "load"}, {name = "res/csvdata/chapter_info.lua", code = "986040125151e49c77d6a48860d97f75", size = "683", act = "load"}, {name = "res/csvdata/equip.lua", code = "a013fd5d4c410ba33e86725988023741", size = "105783", act = "load"}, {name = "res/csvdata/equip_suit.lua", code = "a82eac94ec12f7ebac70599cf192b47d", size = "18631", act = "load"}, @@ -211,8 +211,8 @@ local list = { {name = "res/csvdata/map/map304.lua", code = "0dc677db0855ccb50a2acf2f03bd4c2c", size = "6803", act = "load"}, {name = "res/csvdata/map/map305.lua", code = "3dac2d8d47f08df10602b56837ad1834", size = "5627", act = "load"}, {name = "res/csvdata/music.lua", code = "550a3e65dc89368f20b626017c25ad00", size = "13919", act = "load"}, - {name = "res/csvdata/scene/PT/pt10001.lua", code = "857253ba3485f56f736a2c353784fbd3", size = "4519", act = "load"}, - {name = "res/csvdata/scene/PT/pt10101.lua", code = "889b7b8afcf0bea7eb0c8cf4c4fd984f", size = "6027", act = "load"}, + {name = "res/csvdata/scene/PT/pt10001.lua", code = "a060fcc7cb50253078f35b3f580af25e", size = "4507", act = "load"}, + {name = "res/csvdata/scene/PT/pt10101.lua", code = "c3471749cee0d692cd47232d5e81c2ba", size = "6011", act = "load"}, {name = "res/csvdata/scene/PT/pt10102.lua", code = "167ec3b8e082b548550d5dd298f68549", size = "5939", act = "load"}, {name = "res/csvdata/scene/PT/pt10103.lua", code = "5ed5e982ed4936dabe66488d5cd02b26", size = "6627", act = "load"}, {name = "res/csvdata/scene/PT/pt10104.lua", code = "6a3dc3b2b917292b5db0e6af6860e46f", size = "8355", act = "load"}, @@ -228,16 +228,16 @@ local list = { {name = "res/csvdata/scene/PT/pt10304_1.lua", code = "30292365c5a5f0f826ebce1a1e1cd173", size = "6611", act = "load"}, {name = "res/csvdata/scene/PT/pt10304_2.lua", code = "98f28d5f9a8d5e6768d212d1f6cb5fda", size = "6611", act = "load"}, {name = "res/csvdata/scene/PT/pt10305.lua", code = "6fd71c1ce0089dde60ff48441e82997a", size = "6715", act = "load"}, - {name = "res/csvdata/skill.lua", code = "22f1975453acd552b2371c14de548cf9", size = "354599", act = "load"}, + {name = "res/csvdata/skill.lua", code = "56078fa5ae4da6927b98e6965b3057ff", size = "356779", act = "load"}, {name = "res/csvdata/skill_des.lua", code = "7d4917de17e4d8731f6b4b55e24a4ac5", size = "13667", act = "load"}, {name = "res/csvdata/skill_passive.lua", code = "347ddb3489b79b1e7f8689d58d39f78b", size = "59711", act = "load"}, {name = "res/csvdata/skill_tree.lua", code = "8a78bf31de137818eea963e3c4540fc4", size = "7587", act = "load"}, - {name = "res/csvdata/skill_upgrade.lua", code = "bb13679bb345b331da0e93d3ffd7074c", size = "95367", act = "load"}, + {name = "res/csvdata/skill_upgrade.lua", code = "d3cdf95906feb24f59bd328f4acfd0cc", size = "95483", act = "load"}, {name = "res/csvdata/spine_act.lua", code = "3084dc161c78cf444ae4d555321f0920", size = "3935", act = "load"}, {name = "res/csvdata/sys_codes.lua", code = "935b7c2e4ac396d55de81108f3323d64", size = "1347", act = "load"}, {name = "res/csvdata/talk.lua", code = "e6dec0a905a35b20ce69e82bbe715c3c", size = "125743", act = "load"}, {name = "res/csvdata/talk_act.lua", code = "d8c756a9e9e23a699cb42e2edfe7d851", size = "3075", act = "load"}, - {name = "res/csvdata/unit.lua", code = "99fb6f9205eefe2d20799ea2ce2130b8", size = "81531", act = "load"}, + {name = "res/csvdata/unit.lua", code = "6b7c0256a0bd4c0949078fa7bc2405ed", size = "81531", act = "load"}, {name = "res/Default/Button_Disable.png", code = "938900f78c57609f257077986a2e8bf5", size = "203"}, {name = "res/equip/bishou_01_01.png", code = "800284a76a9462c06add33e79dff65c1", size = "2047"}, {name = "res/equip/bishou_01_02.png", code = "cf52108254f9fa0b7f6c98eae79b39c1", size = "2987"}, @@ -661,7 +661,7 @@ local list = { {name = "res/equip_big/quan_bg_15.png", code = "ed6fb5ef79e0e8f021e96b3d1519d3c5", size = "4991"}, {name = "res/font/DFGB_H5.TTF", code = "2b3c1d0ecd85cfca3bbcbdeb53d7fbce", size = "2868592"}, {name = "res/font/OLDENGL.ttf", code = "c34445985276137bcb98e7868a4ebb88", size = "36384"}, - {name = "res/game.dat", code = "465f8951fc3add426f352e7bf304d2c5", size = "391259"}, + {name = "res/game.dat", code = "db6ce02dbdb4291d960bb401522a124b", size = "391403"}, {name = "res/head/jianshi.png", code = "60301cde7a7d1de92bbe329b8cee412b", size = "3951"}, {name = "res/head/molong.png", code = "6735dcaa871a4bbabab2b67740bd60bd", size = "2991"}, {name = "res/head/monv.png", code = "96c1431ec3478baa11343878ea600f4c", size = "4323"}, @@ -969,7 +969,7 @@ local list = { {name = "res/spine/niutou.json", code = "a4d54c37ae01a399ffb8db35af9f1fd5", size = "423114"}, {name = "res/spine/niutou.png", code = "0e54f039b9808c5ec9d4aed4a66caf04", size = "87231"}, {name = "res/spine/quanjishou.atlas", code = "fd82b6259e2dd69b1ffea18b42bc4310", size = "33904"}, - {name = "res/spine/quanjishou.json", code = "dbecf5118077c98e4486cb142a2e4e8e", size = "1674632"}, + {name = "res/spine/quanjishou.json", code = "616205b897f6914a079d84a5b8169ec3", size = "1674923"}, {name = "res/spine/quanjishou.png", code = "7fd761b102a4fb636d9a7e068b5fe7f8", size = "511183"}, {name = "res/spine/quanjishou2.png", code = "48528ba0596d3d0dd2cf3b6e9e487789", size = "160395"}, {name = "res/spine/shachong.atlas", code = "21c0fa5fa5d69f973fb1277393d4904b", size = "8646"}, @@ -1596,6 +1596,8 @@ local list = { {name = "res/ui/battle/shadow_boss.png", code = "01120714baf3b79d31048b44d9e0dccd", size = "3702"}, {name = "res/ui/battle/shadow_hero.png", code = "22d784bd346ec5d0d67f3e6f75e08ef7", size = "3797"}, {name = "res/ui/battle/shadow_monster.png", code = "81c3141c1db9f00b9df1cc30dafb52b5", size = "4104"}, + {name = "res/ui/battle/shield.plist", code = "333e2aee626e2e9bfc6f400092afda1a", size = "14284"}, + {name = "res/ui/battle/shield.png", code = "a4a3c013047117d576075af93fe43dad", size = "13370"}, {name = "res/ui/battle/shield_bar.png", code = "6d12a2046435cea710f5065b50b2d22b", size = "943"}, {name = "res/ui/battle/shield_broke.png", code = "d0c4f6ea406e5c822f9cfc9adeb29b39", size = "1684"}, {name = "res/ui/battle/shield_normal.png", code = "6bb26b7e6b611a1ad3dccf236929af38", size = "598"}, diff --git a/res/game.dat b/res/game.dat index c0ee7af..ebff4ef 100644 Binary files a/res/game.dat and b/res/game.dat differ diff --git a/res/spine/quanjishou.json b/res/spine/quanjishou.json index 850b8b7..42e40da 100644 --- a/res/spine/quanjishou.json +++ b/res/spine/quanjishou.json @@ -1,5 +1,5 @@ { -"skeleton": { "hash": "fCXcW44fR+YBwr7Bu+C7I5ZM/nM", "spine": "3.4.02", "width": 114.03, "height": 146.4, "images": "" }, +"skeleton": { "hash": "HbUtCcsBcoXC9ev/W1bDEtKIKZk", "spine": "3.4.02", "width": 114.03, "height": 146.4, "images": "" }, "bones": [ { "name": "root", "scaleX": 0.55, "scaleY": 0.55 }, { "name": "body", "parent": "root", "length": 91.42, "rotation": 103.34, "x": 1.94, "y": 57.04 }, @@ -33011,6 +33011,13 @@ "events": [ { "time": 0, "name": "skillC1" }, { "time": 0.4333, "name": "skillC1" }, + { "time": 0.5333, "name": "skillC1" }, + { "time": 0.6333, "name": "skillC1" }, + { "time": 0.7333, "name": "skillC1" }, + { "time": 0.8333, "name": "skillC1" }, + { "time": 0.9333, "name": "skillC1" }, + { "time": 1.0666, "name": "skillC1" }, + { "time": 1.2, "name": "skillC1" }, { "time": 1.5666, "name": "skillC1" }, { "time": 2.2333, "name": "skillC1" } ] diff --git a/res/ui/battle/shield.plist b/res/ui/battle/shield.plist new file mode 100644 index 0000000..66b70ec --- /dev/null +++ b/res/ui/battle/shield.plist @@ -0,0 +1,399 @@ + + + + + frames + + shield_01.png + + frame + {{196,18},{26,6}} + offset + {-83,-2} + rotated + + sourceColorRect + {{0,4},{26,6}} + sourceSize + {192,10} + + shield_02.png + + frame + {{196,10},{42,6}} + offset + {-75,-2} + rotated + + sourceColorRect + {{0,4},{42,6}} + sourceSize + {192,10} + + shield_03.png + + frame + {{196,2},{58,6}} + offset + {-67,-2} + rotated + + sourceColorRect + {{0,4},{58,6}} + sourceSize + {192,10} + + shield_04.png + + frame + {{164,220},{74,8}} + offset + {-59,-1} + rotated + + sourceColorRect + {{0,2},{74,8}} + sourceSize + {192,10} + + shield_05.png + + frame + {{2,182},{92,8}} + offset + {-50,-1} + rotated + + sourceColorRect + {{0,2},{92,8}} + sourceSize + {192,10} + + shield_06.png + + frame + {{146,232},{108,8}} + offset + {-42,-1} + rotated + + sourceColorRect + {{0,2},{108,8}} + sourceSize + {192,10} + + shield_07.png + + frame + {{2,242},{126,8}} + offset + {-33,-1} + rotated + + sourceColorRect + {{0,2},{126,8}} + sourceSize + {192,10} + + shield_08.png + + frame + {{2,232},{142,8}} + offset + {-25,-1} + rotated + + sourceColorRect + {{0,2},{142,8}} + sourceSize + {192,10} + + shield_09.png + + frame + {{2,220},{160,10}} + offset + {-16,0} + rotated + + sourceColorRect + {{0,0},{160,10}} + sourceSize + {192,10} + + shield_10.png + + frame + {{208,26},{176,10}} + offset + {-8,0} + rotated + + sourceColorRect + {{0,0},{176,10}} + sourceSize + {192,10} + + shield_11.png + + frame + {{2,170},{192,10}} + offset + {0,0} + rotated + + sourceColorRect + {{0,0},{192,10}} + sourceSize + {192,10} + + shield_12.png + + frame + {{2,158},{192,10}} + offset + {0,0} + rotated + + sourceColorRect + {{0,0},{192,10}} + sourceSize + {192,10} + + shield_13.png + + frame + {{2,146},{192,10}} + offset + {0,0} + rotated + + sourceColorRect + {{0,0},{192,10}} + sourceSize + {192,10} + + shield_14.png + + frame + {{2,134},{192,10}} + offset + {0,0} + rotated + + sourceColorRect + {{0,0},{192,10}} + sourceSize + {192,10} + + shield_15.png + + frame + {{2,122},{192,10}} + offset + {0,0} + rotated + + sourceColorRect + {{0,0},{192,10}} + sourceSize + {192,10} + + shield_16.png + + frame + {{2,110},{192,10}} + offset + {0,0} + rotated + + sourceColorRect + {{0,0},{192,10}} + sourceSize + {192,10} + + shield_17.png + + frame + {{2,98},{192,10}} + offset + {0,0} + rotated + + sourceColorRect + {{0,0},{192,10}} + sourceSize + {192,10} + + shield_18.png + + frame + {{2,86},{192,10}} + offset + {0,0} + rotated + + sourceColorRect + {{0,0},{192,10}} + sourceSize + {192,10} + + shield_19.png + + frame + {{2,74},{192,10}} + offset + {0,0} + rotated + + sourceColorRect + {{0,0},{192,10}} + sourceSize + {192,10} + + shield_20.png + + frame + {{2,62},{192,10}} + offset + {0,0} + rotated + + sourceColorRect + {{0,0},{192,10}} + sourceSize + {192,10} + + shield_21.png + + frame + {{2,50},{192,10}} + offset + {0,0} + rotated + + sourceColorRect + {{0,0},{192,10}} + sourceSize + {192,10} + + shield_22.png + + frame + {{2,38},{192,10}} + offset + {0,0} + rotated + + sourceColorRect + {{0,0},{192,10}} + sourceSize + {192,10} + + shield_23.png + + frame + {{196,26},{192,10}} + offset + {0,0} + rotated + + sourceColorRect + {{0,0},{192,10}} + sourceSize + {192,10} + + shield_24.png + + frame + {{2,26},{192,10}} + offset + {0,0} + rotated + + sourceColorRect + {{0,0},{192,10}} + sourceSize + {192,10} + + shield_25.png + + frame + {{224,18},{192,10}} + offset + {0,0} + rotated + + sourceColorRect + {{0,0},{192,10}} + sourceSize + {192,10} + + shield_26.png + + frame + {{240,10},{192,10}} + offset + {0,0} + rotated + + sourceColorRect + {{0,0},{192,10}} + sourceSize + {192,10} + + shield_27.png + + frame + {{2,14},{192,10}} + offset + {0,0} + rotated + + sourceColorRect + {{0,0},{192,10}} + sourceSize + {192,10} + + shield_28.png + + frame + {{2,2},{192,10}} + offset + {0,0} + rotated + + sourceColorRect + {{0,0},{192,10}} + sourceSize + {192,10} + + shield_29.png + + frame + {{130,242},{110,8}} + offset + {41,1} + rotated + + sourceColorRect + {{82,0},{110,8}} + sourceSize + {192,10} + + + metadata + + format + 2 + realTextureFileName + shield.png + size + {256,256} + smartupdate + $TexturePacker:SmartUpdate:69146747a82d0e11b7a5188c870c0093:1/1$ + textureFileName + shield.png + + + diff --git a/res/ui/battle/shield.png b/res/ui/battle/shield.png new file mode 100644 index 0000000..516dec4 Binary files /dev/null and b/res/ui/battle/shield.png differ -- libgit2 0.21.2