From 8f27d791347dad59ded58fbb8b0f9223aa556d64 Mon Sep 17 00:00:00 2001 From: CloudJ Date: Mon, 5 Jun 2023 19:41:10 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/app/config/act_growup_gift.lua | 25 +- .../localization_global_const.lua | 1 + lua/app/config/skill.lua | 1040 ++++++++--------- lua/app/config/strings/cn/global.lua | 1 + lua/app/config/strings/en/global.lua | 1 + lua/app/config/strings/zh/global.lua | 1 + lua/app/ui/shop/gift_pop_ui.lua | 16 +- lua/app/userdata/shop/shop_data.lua | 43 +- 8 files changed, 559 insertions(+), 569 deletions(-) diff --git a/lua/app/config/act_growup_gift.lua b/lua/app/config/act_growup_gift.lua index e2f0b83c..c56d5715 100644 --- a/lua/app/config/act_growup_gift.lua +++ b/lua/app/config/act_growup_gift.lua @@ -206,8 +206,9 @@ local act_growup_gift = { ["time_type"]=1, ["limit_time"]=3, ["cd"]=12, - ["limit"]=1, - ["value"]=800 + ["limit"]=99999, + ["value"]=800, + ["last"]=1 }, [2014]={ ["hero_id"]=24001, @@ -421,9 +422,10 @@ local act_growup_gift = { ["time_type"]=1, ["limit_time"]=3, ["cd"]=12, - ["limit"]=1, + ["limit"]=99999, ["value"]=800, - ["value_2"]=1 + ["value_2"]=1, + ["last"]=1 }, [3014]={ ["hero_id"]=34001, @@ -637,9 +639,10 @@ local act_growup_gift = { ["time_type"]=1, ["limit_time"]=3, ["cd"]=12, - ["limit"]=1, + ["limit"]=99999, ["value"]=800, - ["value_2"]=1 + ["value_2"]=1, + ["last"]=1 }, [4014]={ ["hero_id"]=44001, @@ -853,9 +856,10 @@ local act_growup_gift = { ["time_type"]=1, ["limit_time"]=3, ["cd"]=12, - ["limit"]=1, + ["limit"]=99999, ["value"]=800, - ["value_2"]=1 + ["value_2"]=1, + ["last"]=1 }, [5014]={ ["hero_id"]=54001, @@ -1069,9 +1073,10 @@ local act_growup_gift = { ["time_type"]=1, ["limit_time"]=3, ["cd"]=12, - ["limit"]=1, + ["limit"]=99999, ["value"]=800, - ["value_2"]=1 + ["value_2"]=1, + ["last"]=1 } } local config = { diff --git a/lua/app/config/localization/localization_global_const.lua b/lua/app/config/localization/localization_global_const.lua index 8b05f126..38a7707b 100644 --- a/lua/app/config/localization/localization_global_const.lua +++ b/lua/app/config/localization/localization_global_const.lua @@ -212,6 +212,7 @@ local LocalizationGlobalConst = SETTING_DESC_22 = "SETTING_DESC_22", SETTING_DESC_23 = "SETTING_DESC_23", SETTING_DESC_25 = "SETTING_DESC_25", + BIND_TIPS_DESC = "BIND_TIPS_DESC", } return LocalizationGlobalConst \ No newline at end of file diff --git a/lua/app/config/skill.lua b/lua/app/config/skill.lua index 1966f6dc..1526614f 100644 --- a/lua/app/config/skill.lua +++ b/lua/app/config/skill.lua @@ -111,7 +111,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 1200111 + 1000001 }, ["name_act"]="attack01", ["fx_self"]=300018 @@ -133,7 +133,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 1200112 + 1000002 }, ["name_act"]="attack02", ["fx_self"]=300019 @@ -155,7 +155,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 1200113 + 1000003 }, ["name_act"]="attack03", ["fx_self"]=300020 @@ -177,7 +177,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 1200114 + 1000004 }, ["name_act"]="attack04", ["fx_self"]=300021 @@ -322,7 +322,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 1200111 + 1000011 }, ["name_act"]="attack01", ["fx_self"]=300055 @@ -344,7 +344,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 1200112 + 1000012 }, ["name_act"]="attack02", ["fx_self"]=300056 @@ -366,7 +366,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 1200113 + 1000013 }, ["name_act"]="attack03", ["fx_self"]=300057 @@ -388,7 +388,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 1200114 + 1000014 }, ["name_act"]="attack04", ["fx_self"]=300058 @@ -431,9 +431,9 @@ local skill = { ["shake_time"]=200, ["shake_type"]=5, ["sound_hit"]={ - 1200120, - 1200114, - 1200113 + 13001201, + 13001202, + 13001203 }, ["name_act"]="skill01", ["fx_self"]=300059, @@ -526,9 +526,9 @@ local skill = { ["shake_time"]=200, ["shake_type"]=5, ["sound_hit"]={ - 1200120, - 1200114, - 1200113 + 13001201, + 13001202, + 13001203 }, ["name_act"]="skill01", ["fx_self"]=300059, @@ -611,7 +611,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 1200111 + 1000011 }, ["name_act"]="attack01", ["fx_self"]=300035 @@ -633,7 +633,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 1200112 + 1000012 }, ["name_act"]="attack02", ["fx_self"]=300036 @@ -655,7 +655,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 1200113 + 1000013 }, ["name_act"]="attack03", ["fx_self"]=300037 @@ -677,7 +677,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 1200114 + 1000014 }, ["name_act"]="attack04", ["fx_self"]=300038 @@ -751,11 +751,11 @@ local skill = { ["shake_time"]=200, ["shake_type"]=5, ["sound_hit"]={ - 1200114, - 1200114, - 1200113, - 1200114, - 1200113 + 13002201, + 13002202, + 13002201, + 13002202, + 1300223 }, ["name_act"]="skill01", ["fx_self"]=300039, @@ -865,11 +865,11 @@ local skill = { ["shake_time"]=200, ["shake_type"]=5, ["sound_hit"]={ - 1200114, - 1200114, - 1200113, - 1200114, - 1200113 + 13002201, + 13002202, + 13002201, + 13002202, + 1300223 }, ["name_act"]="skill01", ["fx_self"]=300039, @@ -896,7 +896,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=2, ["sound_hit"]={ - 1200111 + 1000011 }, ["name_act"]="attack01", ["fx_self"]=300045 @@ -918,7 +918,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=2, ["sound_hit"]={ - 1200112 + 1000012 }, ["name_act"]="attack02", ["fx_self"]=300046 @@ -940,7 +940,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=4, ["sound_hit"]={ - 1200113 + 1000013 }, ["name_act"]="attack03", ["fx_self"]=300047 @@ -962,7 +962,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 1200114 + 1000014 }, ["name_act"]="attack04", ["fx_self"]=300048 @@ -1038,7 +1038,7 @@ local skill = { ["shake_time"]=200, ["shake_type"]=6, ["sound_hit"]={ - 1200120 + 1400120 }, ["name_act"]="skill01", ["fx_self"]=300049, @@ -1161,7 +1161,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 2200111 + 1000001 }, ["name_act"]="attack01", ["fx_self"]=300005 @@ -1183,7 +1183,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=2, ["sound_hit"]={ - 2200112 + 1000002 }, ["name_act"]="attack02", ["fx_self"]=300006 @@ -1205,7 +1205,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 2200113 + 1000003 }, ["name_act"]="attack03", ["fx_self"]=300007 @@ -1227,7 +1227,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=2, ["sound_hit"]={ - 2200114 + 1000004 }, ["name_act"]="attack04", ["fx_self"]=300008 @@ -1369,7 +1369,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 2200111 + 1000011 }, ["name_act"]="attack01", ["fx_self"]=300040 @@ -1391,7 +1391,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=2, ["sound_hit"]={ - 2200112 + 1000012 }, ["name_act"]="attack02", ["fx_self"]=300041 @@ -1413,7 +1413,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 2200113 + 1000013 }, ["name_act"]="attack03", ["fx_self"]=300042 @@ -1435,7 +1435,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=2, ["sound_hit"]={ - 2200114 + 1000014 }, ["name_act"]="attack04", ["fx_self"]=300043 @@ -1486,10 +1486,7 @@ local skill = { ["shake_time"]=200, ["shake_type"]=5, ["sound_hit"]={ - 2200120, - 1200114, - 1200113, - 1200114 + 2300120 }, ["name_act"]="skill01", ["fx_self"]=300044, @@ -1559,10 +1556,7 @@ local skill = { ["shake_time"]=200, ["shake_type"]=5, ["sound_hit"]={ - 2200120, - 1200114, - 1200113, - 1200114 + 2300120 }, ["name_act"]="skill01", ["fx_self"]=300044, @@ -1679,7 +1673,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 2200111 + 1000001 }, ["name_act"]="attack01", ["fx_self"]=300050 @@ -1701,7 +1695,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=2, ["sound_hit"]={ - 2200112 + 1000002 }, ["name_act"]="attack02", ["fx_self"]=300051 @@ -1723,7 +1717,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 2200113 + 1000003 }, ["name_act"]="attack03", ["fx_self"]=300052 @@ -1745,7 +1739,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 2200114 + 1000004 }, ["name_act"]="attack04", ["fx_self"]=300053 @@ -1801,9 +1795,7 @@ local skill = { ["shake_time"]=200, ["shake_type"]=5, ["sound_hit"]={ - 2200120, - 1200114, - 1200113 + 2300220 }, ["name_act"]="skill01", ["fx_self"]=300054, @@ -1889,7 +1881,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=2, ["sound_hit"]={ - 2300111 + 1000011 }, ["name_act"]="attack01", ["fx_self"]=300028 @@ -1911,7 +1903,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=2, ["sound_hit"]={ - 2300112 + 1000012 }, ["name_act"]="attack02", ["fx_self"]=300029 @@ -1933,7 +1925,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 2300113 + 1000013 }, ["name_act"]="attack03", ["fx_self"]=300030 @@ -1955,7 +1947,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=2, ["sound_hit"]={ - 2300114 + 1000014 }, ["name_act"]="attack04", ["fx_self"]=300031 @@ -1985,7 +1977,7 @@ local skill = { ["shake_time"]=200, ["shake_type"]=6, ["sound_hit"]={ - 2300120 + 2400120 }, ["name_act"]="skill01", ["fx_self"]=300032, @@ -2100,7 +2092,7 @@ local skill = { ["shake_time"]=200, ["shake_type"]=6, ["sound_hit"]={ - 2300120 + 2400120 }, ["name_act"]="skill01", ["fx_self"]=300032, @@ -2141,7 +2133,7 @@ local skill = { ["shake_time"]=200, ["shake_type"]=6, ["sound_hit"]={ - 2300120 + 2400120 }, ["name_act"]="skill01", ["fx_self"]=300032, @@ -2182,7 +2174,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 3200111 + 1000011 }, ["name_act"]="attack01", ["fx_self"]=300000 @@ -2204,7 +2196,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 3200112 + 1000012 }, ["name_act"]="attack02", ["fx_self"]=300001 @@ -2226,7 +2218,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=2, ["sound_hit"]={ - 3200113 + 1000013 }, ["name_act"]="attack03", ["fx_self"]=300002 @@ -2248,7 +2240,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 3200114 + 1000014 }, ["name_act"]="attack04", ["fx_self"]=300003 @@ -2378,7 +2370,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=2, ["sound_hit"]={ - 3300111 + 1000001 }, ["name_act"]="attack01", ["fx_target"]=300023 @@ -2400,7 +2392,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 3300112 + 1000002 }, ["name_act"]="attack02", ["fx_target"]=300024 @@ -2422,7 +2414,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=2, ["sound_hit"]={ - 3300113 + 1000003 }, ["name_act"]="attack03", ["fx_target"]=300025 @@ -2444,7 +2436,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=2, ["sound_hit"]={ - 3300114 + 1000004 }, ["name_act"]="attack04", ["fx_target"]=300026 @@ -2581,7 +2573,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 3300111 + 1000001 }, ["name_act"]="attack01", ["fx_self"]=300070 @@ -2603,7 +2595,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=2, ["sound_hit"]={ - 3300112 + 1000002 }, ["name_act"]="attack02", ["fx_self"]=300071 @@ -2625,7 +2617,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 3300113 + 1000003 }, ["name_act"]="attack03", ["fx_self"]=300072 @@ -2647,7 +2639,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=2, ["sound_hit"]={ - 3300114 + 1000004 }, ["name_act"]="attack04", ["fx_self"]=300073 @@ -2699,10 +2691,7 @@ local skill = { ["shake_time"]=200, ["shake_type"]=5, ["sound_hit"]={ - 2200120, - 1200114, - 1200113, - 1200114 + 3300220 }, ["name_act"]="skill01", ["fx_self"]=300074, @@ -2795,10 +2784,7 @@ local skill = { ["shake_time"]=200, ["shake_type"]=5, ["sound_hit"]={ - 2200120, - 1200114, - 1200113, - 1200114 + 3300220 }, ["name_act"]="skill01", ["fx_self"]=300074, @@ -2878,10 +2864,7 @@ local skill = { ["shake_time"]=200, ["shake_type"]=5, ["sound_hit"]={ - 2200120, - 1200114, - 1200113, - 1200114 + 3300220 }, ["name_act"]="skill01", ["fx_self"]=300074, @@ -2908,7 +2891,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 3300111 + 1000001 }, ["name_act"]="attack01", ["fx_self"]=300091 @@ -2930,7 +2913,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 3300112 + 1000002 }, ["name_act"]="attack02", ["fx_self"]=300091 @@ -2952,7 +2935,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 3300113 + 1000003 }, ["name_act"]="attack03", ["fx_self"]=300091 @@ -2974,7 +2957,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 3300114 + 1000004 }, ["name_act"]="attack04", ["fx_self"]=300091 @@ -3027,9 +3010,7 @@ local skill = { ["shake_time"]=200, ["shake_type"]=5, ["sound_hit"]={ - 2200120, - 1200114, - 1200113 + 3400120 }, ["name_act"]="skill01", ["fx_self"]=300092, @@ -3153,9 +3134,7 @@ local skill = { ["shake_time"]=200, ["shake_type"]=5, ["sound_hit"]={ - 2200120, - 1200114, - 1200113 + 3400120 }, ["name_act"]="skill01", ["fx_self"]=300092, @@ -3384,7 +3363,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=2, ["sound_hit"]={ - 4200111 + 1000021 }, ["name_act"]="attack01", ["fx_self"]=300080 @@ -3406,7 +3385,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 4200112 + 1000022 }, ["name_act"]="attack02", ["fx_self"]=300081 @@ -3428,7 +3407,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 4200113 + 1000023 }, ["name_act"]="attack03", ["fx_self"]=300082 @@ -3450,7 +3429,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 4200114 + 1000024 }, ["name_act"]="attack04", ["fx_self"]=300083 @@ -3483,7 +3462,9 @@ local skill = { ["shake_time"]=200, ["shake_type"]=6, ["sound_hit"]={ - 4200120 + 42001201, + 0, + 42001203 }, ["name_act"]="skill01", ["fx_self"]=300084, @@ -3608,7 +3589,9 @@ local skill = { ["shake_time"]=200, ["shake_type"]=6, ["sound_hit"]={ - 4200120 + 42001201, + 0, + 42001203 }, ["name_act"]="skill01", ["fx_self"]=300084, @@ -3635,7 +3618,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 4200111 + 1000001 }, ["name_act"]="attack01", ["fx_self"]=300075 @@ -3657,7 +3640,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 4200112 + 1000002 }, ["name_act"]="attack02", ["fx_self"]=300076 @@ -3679,7 +3662,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 4200113 + 1000003 }, ["name_act"]="attack03", ["fx_self"]=300077 @@ -3701,7 +3684,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 4200114 + 1000004 }, ["name_act"]="attack04", ["fx_self"]=300078 @@ -3754,9 +3737,7 @@ local skill = { ["shake_time"]=200, ["shake_type"]=6, ["sound_hit"]={ - 4200120, - 1200114, - 1200113 + 4300220 }, ["name_act"]="skill01", ["fx_self"]=300079, @@ -3873,7 +3854,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 4300111 + 1000001 }, ["name_act"]="attack01", ["fx_target"]=300033 @@ -3895,7 +3876,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 4300112 + 1000002 }, ["name_act"]="attack02", ["fx_target"]=300033 @@ -3917,7 +3898,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 4300113 + 1000003 }, ["name_act"]="attack03", ["fx_target"]=300033 @@ -3939,7 +3920,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 4300114 + 1000004 }, ["name_act"]="attack04", ["fx_target"]=300033 @@ -4064,7 +4045,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200111 + 1000021 }, ["name_act"]="attack01", ["fx_self"]=300015 @@ -4086,7 +4067,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200112 + 1000022 }, ["name_act"]="attack02", ["fx_self"]=300015 @@ -4108,7 +4089,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200113 + 1000023 }, ["name_act"]="attack03", ["fx_self"]=300016 @@ -4130,7 +4111,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200114 + 1000024 }, ["name_act"]="attack04", ["fx_self"]=300090 @@ -4249,7 +4230,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=2, ["sound_hit"]={ - 5200111 + 1000021 }, ["name_act"]="attack01", ["fx_self"]=300060 @@ -4271,7 +4252,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200112 + 1000022 }, ["name_act"]="attack02", ["fx_self"]=300061 @@ -4293,7 +4274,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=2, ["sound_hit"]={ - 5200113 + 1000023 }, ["name_act"]="attack03", ["fx_self"]=300062 @@ -4315,7 +4296,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=2, ["sound_hit"]={ - 5200114 + 1000024 }, ["name_act"]="attack04", ["fx_self"]=300063 @@ -4366,10 +4347,10 @@ local skill = { ["shake_time"]=200, ["shake_type"]=6, ["sound_hit"]={ - 4200120, - 1200114, - 1200113, - 1200114 + 53001201, + 53001202, + 0, + 53001204 }, ["name_act"]="skill01", ["fx_self"]=300064, @@ -4474,7 +4455,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=2, ["sound_hit"]={ - 5200111 + 1000001 }, ["name_act"]="attack01", ["fx_self"]=300065 @@ -4496,7 +4477,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=2, ["sound_hit"]={ - 5200112 + 1000002 }, ["name_act"]="attack02", ["fx_self"]=300066 @@ -4518,7 +4499,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200113 + 1000003 }, ["name_act"]="attack03", ["fx_self"]=300067 @@ -4540,7 +4521,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200114 + 1000004 }, ["name_act"]="attack04", ["fx_self"]=300068 @@ -4583,9 +4564,9 @@ local skill = { ["shake_time"]=200, ["shake_type"]=6, ["sound_hit"]={ - 4200120, - 1200114, - 1200113 + 5300220, + 5300220, + 5300220 }, ["name_act"]="skill01", ["fx_self"]=300069, @@ -4734,9 +4715,9 @@ local skill = { ["shake_time"]=200, ["shake_type"]=6, ["sound_hit"]={ - 4200120, - 1200114, - 1200113 + 5300220, + 5300220, + 5300220 }, ["name_act"]="skill01", ["fx_self"]=300069, @@ -4763,7 +4744,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=2, ["sound_hit"]={ - 5200111 + 1000001 }, ["name_act"]="attack01", ["fx_self"]=300085 @@ -4785,7 +4766,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=2, ["sound_hit"]={ - 5200112 + 1000002 }, ["name_act"]="attack02", ["fx_self"]=300086 @@ -4807,7 +4788,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200113 + 1000003 }, ["name_act"]="attack03", ["fx_self"]=300087 @@ -4829,7 +4810,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=2, ["sound_hit"]={ - 5200114 + 1000004 }, ["name_act"]="attack04", ["fx_self"]=300088 @@ -4873,9 +4854,9 @@ local skill = { ["shake_time"]=200, ["shake_type"]=6, ["sound_hit"]={ - 4200120, - 1200114, - 1200113 + 54001201, + 0, + 54001203 }, ["name_act"]="skill01", ["fx_self"]=300089, @@ -4944,9 +4925,9 @@ local skill = { ["shake_time"]=200, ["shake_type"]=6, ["sound_hit"]={ - 4200120, - 1200114, - 1200113 + 54001201, + 0, + 54001203 }, ["name_act"]="skill01", ["fx_self"]=300089, @@ -5251,7 +5232,7 @@ local skill = { ["shake_time"]=200, ["shake_type"]=6, ["sound_hit"]={ - 10082 + 10016 }, ["name_act"]="skill01", ["fx_self"]=200045, @@ -5285,7 +5266,7 @@ local skill = { ["shake_time"]=200, ["shake_type"]=6, ["sound_hit"]={ - 10082 + 10017 }, ["name_act"]="skill01", ["fx_self"]=200037, @@ -5324,7 +5305,7 @@ local skill = { ["shake_time"]=200, ["shake_type"]=6, ["sound_hit"]={ - 10082 + 10018 }, ["name_act"]="skill01", ["fx_self"]=200117, @@ -5358,7 +5339,7 @@ local skill = { ["shake_time"]=200, ["shake_type"]=5, ["sound_hit"]={ - 10082 + 10019 }, ["name_act"]="skill01", ["fx_self"]=200002, @@ -5392,7 +5373,7 @@ local skill = { ["shake_time"]=200, ["shake_type"]=5, ["sound_hit"]={ - 10082 + 10019 }, ["name_act"]="skill01", ["fx_self"]=200005, @@ -5426,7 +5407,9 @@ local skill = { ["shake_time"]=200, ["shake_type"]=6, ["sound_hit"]={ - 4200120 + 42001201, + 0, + 42001203 }, ["name_act"]="skill01", ["fx_self"]=400044, @@ -5475,7 +5458,7 @@ local skill = { ["shake_time"]=200, ["shake_type"]=6, ["sound_hit"]={ - 10082 + 10023 }, ["name_act"]="skill01", ["fx_self"]=200076, @@ -5524,9 +5507,7 @@ local skill = { ["shake_time"]=200, ["shake_type"]=5, ["sound_hit"]={ - 10082, - 1200114, - 1200113 + 10024 }, ["name_act"]="skill01", ["fx_self"]=200016, @@ -5585,11 +5566,7 @@ local skill = { ["shake_time"]=200, ["shake_type"]=5, ["sound_hit"]={ - 2200120, - 1200114, - 1200113, - 1200114, - 1200113 + 2300220 }, ["name_act"]="skill01", ["fx_self"]=400004, @@ -5643,7 +5620,7 @@ local skill = { ["shake_time"]=200, ["shake_type"]=5, ["sound_hit"]={ - 2200120 + 10027 }, ["name_act"]="skill01", ["fx_self"]=200057, @@ -5683,7 +5660,7 @@ local skill = { ["shake_time"]=200, ["shake_type"]=5, ["sound_hit"]={ - 2200120 + 10029 }, ["name_act"]="skill01", ["fx_self"]=200009, @@ -5734,9 +5711,9 @@ local skill = { ["shake_time"]=200, ["shake_type"]=6, ["sound_hit"]={ - 1200120, - 1200114, - 1200113 + 13001201, + 13001202, + 13001203 }, ["name_act"]="skill01", ["fx_self"]=400009, @@ -5765,7 +5742,7 @@ local skill = { ["shake_time"]=200, ["shake_type"]=6, ["sound_hit"]={ - 1200120 + 10018 }, ["name_act"]="skill01", ["fx_self"]=200024, @@ -5791,7 +5768,7 @@ local skill = { ["cd"]=2, ["cd_start"]=0, ["sound_hit"]={ - 5200120 + 10033 }, ["name_act"]="skill01", ["fx_self"]=200020 @@ -5819,7 +5796,7 @@ local skill = { ["shake_time"]=200, ["shake_type"]=5, ["sound_hit"]={ - 1200120 + 10034 }, ["name_act"]="skill01", ["fx_self"]=200073, @@ -5877,10 +5854,7 @@ local skill = { ["shake_time"]=200, ["shake_type"]=5, ["sound_hit"]={ - 2200120, - 1200114, - 1200113, - 1200114 + 2300120 }, ["name_act"]="skill01", ["fx_self"]=400014, @@ -5930,9 +5904,7 @@ local skill = { ["shake_time"]=200, ["shake_type"]=5, ["sound_hit"]={ - 1200120, - 1200114, - 1200113 + 10036 }, ["name_act"]="skill01", ["fx_self"]=200053, @@ -6000,7 +5972,7 @@ local skill = { ["shake_time"]=200, ["shake_type"]=6, ["sound_hit"]={ - 1200120 + 10039 }, ["name_act"]="skill01", ["fx_self"]=200028, @@ -6069,11 +6041,11 @@ local skill = { ["shake_time"]=200, ["shake_type"]=5, ["sound_hit"]={ - 1200114, - 1200114, - 1200113, - 1200114, - 1200113 + 13002201, + 13002202, + 13002201, + 13002202, + 1300223 }, ["name_act"]="skill01", ["fx_self"]=400024, @@ -6098,6 +6070,9 @@ local skill = { ["skill_position"]=2, ["cd"]=3, ["cd_start"]=0, + ["sound_hit"]={ + 10041 + }, ["name_act"]="skill01", ["fx_self"]=200120, ["bullet_time"]={ @@ -6154,10 +6129,10 @@ local skill = { ["shake_time"]=200, ["shake_type"]=6, ["sound_hit"]={ - 4200120, - 1200114, - 1200113, - 1200114 + 53001201, + 53001202, + 0, + 53001204 }, ["name_act"]="skill01", ["fx_self"]=400029, @@ -6187,6 +6162,9 @@ local skill = { ["obj"]=2, ["cd"]=3, ["cd_start"]=1, + ["sound_hit"]={ + 10043 + }, ["name_act"]="skill01", ["fx_self"]=200084, ["bullet_time"]={ @@ -6240,10 +6218,7 @@ local skill = { ["shake_time"]=200, ["shake_type"]=6, ["sound_hit"]={ - 4200120, - 1200114, - 1200113, - 1200114 + 10044 }, ["name_act"]="skill02", ["fx_self"]=200085, @@ -6276,7 +6251,7 @@ local skill = { ["shake_time"]=200, ["shake_type"]=6, ["sound_hit"]={ - 4200120 + 10045 }, ["name_act"]="skill01", ["fx_self"]=200065, @@ -6324,7 +6299,7 @@ local skill = { ["shake_time"]=200, ["shake_type"]=6, ["sound_hit"]={ - 4200120 + 10047 }, ["name_act"]="skill01", ["fx_self"]=200069, @@ -6385,9 +6360,9 @@ local skill = { ["shake_time"]=200, ["shake_type"]=5, ["sound_hit"]={ - 4200120, - 1200114, - 1200113 + 10049, + 10049, + 10049 }, ["name_act"]="skill01", ["fx_self"]=200041, @@ -6445,10 +6420,7 @@ local skill = { ["shake_time"]=200, ["shake_type"]=6, ["sound_hit"]={ - 4200120, - 1200114, - 1200113, - 1200114 + 10050 }, ["name_act"]="skill02", ["fx_self"]=200121, @@ -6506,7 +6478,7 @@ local skill = { ["shake_time"]=200, ["shake_type"]=5, ["sound_hit"]={ - 4200120 + 10018 }, ["name_act"]="skill01", ["fx_self"]=200118, @@ -6562,10 +6534,7 @@ local skill = { ["shake_time"]=200, ["shake_type"]=6, ["sound_hit"]={ - 4200120, - 1200114, - 1200113, - 1200114 + 10053 }, ["name_act"]="skill02", ["fx_self"]=200119, @@ -6651,10 +6620,10 @@ local skill = { ["shake_time"]=200, ["shake_type"]=5, ["sound_hit"]={ - 4200120, - 1200114, - 1200113, - 1200114 + 10056, + 0, + 10056, + 0 }, ["name_act"]="skill01", ["fx_self"]=200107, @@ -6724,11 +6693,12 @@ local skill = { ["shake_time"]=200, ["shake_type"]=5, ["sound_hit"]={ - 4200120, - 1200114, - 1200113, - 1200114, - 1200113 + 10057, + 10057, + 10057, + 10057, + 10057, + 10057 }, ["name_act"]="skill02", ["fx_self"]=200108, @@ -6779,9 +6749,9 @@ local skill = { ["shake_time"]=200, ["shake_type"]=5, ["sound_hit"]={ - 4200120, - 1200114, - 1200113 + 10058, + 10058, + 10058 }, ["name_act"]="skill01", ["fx_self"]=200113, @@ -6820,7 +6790,8 @@ local skill = { ["shake_time"]=200, ["shake_type"]=6, ["sound_hit"]={ - 4200120 + 10059, + 10059 }, ["name_act"]="skill02", ["fx_self"]=200113, @@ -6845,9 +6816,6 @@ local skill = { ["skill_position"]=2, ["cd"]=2, ["cd_start"]=0, - ["sound_hit"]={ - 3300120 - }, ["name_act"]="skill01" }, [10061]={ @@ -6894,7 +6862,7 @@ local skill = { ["shake_time"]=200, ["shake_type"]=6, ["sound_hit"]={ - 10082 + 10023 }, ["name_act"]="skill01", ["fx_self"]=200092, @@ -6928,7 +6896,7 @@ local skill = { ["shake_time"]=200, ["shake_type"]=6, ["sound_hit"]={ - 10082 + 10063 }, ["name_act"]="skill01", ["fx_self"]=200080, @@ -6968,7 +6936,7 @@ local skill = { ["shake_time"]=200, ["shake_type"]=6, ["sound_hit"]={ - 10082 + 10063 }, ["name_act"]="skill01", ["fx_self"]=200092, @@ -7007,7 +6975,7 @@ local skill = { ["shake_time"]=200, ["shake_type"]=6, ["sound_hit"]={ - 10082 + 10018 }, ["name_act"]="skill01", ["fx_self"]=200103, @@ -7068,9 +7036,7 @@ local skill = { ["shake_time"]=200, ["shake_type"]=6, ["sound_hit"]={ - 4200120, - 1200114, - 1200113 + 5300220 }, ["name_act"]="skill01", ["fx_self"]=400034, @@ -7143,9 +7109,7 @@ local skill = { ["shake_time"]=200, ["shake_type"]=5, ["sound_hit"]={ - 2200120, - 1200114, - 1200113 + 3300220 }, ["name_act"]="skill01", ["fx_self"]=400039, @@ -7173,7 +7137,7 @@ local skill = { ["shake_time"]=200, ["shake_type"]=6, ["sound_hit"]={ - 10082 + 10016 }, ["name_act"]="skill01", ["fx_self"]=200049, @@ -7213,7 +7177,7 @@ local skill = { ["shake_time"]=200, ["shake_type"]=6, ["sound_hit"]={ - 10082 + 10063 }, ["name_act"]="skill01", ["fx_self"]=200092 @@ -7234,7 +7198,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200111 + 1000001 }, ["name_act"]="attack01", ["fx_self"]=100001 @@ -7255,7 +7219,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200112 + 1000002 }, ["name_act"]="attack02", ["fx_self"]=100002 @@ -7276,7 +7240,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200113 + 1000003 }, ["name_act"]="attack03", ["fx_self"]=100003 @@ -7297,7 +7261,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200111 + 1000011 }, ["name_act"]="attack01", ["fx_self"]=100004 @@ -7318,7 +7282,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200112 + 1000012 }, ["name_act"]="attack02", ["fx_self"]=100005 @@ -7339,7 +7303,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200113 + 1000013 }, ["name_act"]="attack03", ["fx_self"]=100006 @@ -7360,7 +7324,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200111 + 1000001 }, ["name_act"]="attack01", ["fx_self"]=100007 @@ -7381,7 +7345,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200112 + 1000002 }, ["name_act"]="attack02", ["fx_self"]=100008 @@ -7402,7 +7366,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200113 + 1000003 }, ["name_act"]="attack03", ["fx_self"]=100009 @@ -7423,7 +7387,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200111 + 1000011 }, ["name_act"]="attack01", ["fx_self"]=100010 @@ -7444,7 +7408,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200112 + 1000012 }, ["name_act"]="attack02", ["fx_self"]=100011 @@ -7465,7 +7429,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200113 + 1000013 }, ["name_act"]="attack03", ["fx_self"]=100012 @@ -7486,7 +7450,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200111 + 1000021 }, ["name_act"]="attack01", ["fx_self"]=100013 @@ -7507,7 +7471,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200112 + 1000022 }, ["name_act"]="attack02", ["fx_self"]=100013 @@ -7528,7 +7492,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200113 + 1000023 }, ["name_act"]="attack03", ["fx_self"]=100013 @@ -7549,7 +7513,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200111 + 1000021 }, ["name_act"]="attack01", ["fx_self"]=100013 @@ -7570,7 +7534,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200112 + 1000022 }, ["name_act"]="attack02", ["fx_self"]=100013 @@ -7591,7 +7555,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200113 + 1000023 }, ["name_act"]="attack03", ["fx_self"]=100013 @@ -7612,7 +7576,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200111 + 1000021 }, ["name_act"]="attack01", ["fx_self"]=100013 @@ -7633,7 +7597,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200112 + 1000022 }, ["name_act"]="attack02", ["fx_self"]=100013 @@ -7654,7 +7618,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200113 + 1000023 }, ["name_act"]="attack03", ["fx_self"]=100013 @@ -7675,7 +7639,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200111 + 1000021 }, ["name_act"]="attack01", ["fx_self"]=100013 @@ -7696,7 +7660,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200112 + 1000022 }, ["name_act"]="attack02", ["fx_self"]=100013 @@ -7717,7 +7681,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200113 + 1000023 }, ["name_act"]="attack03", ["fx_self"]=100013 @@ -7738,7 +7702,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200111 + 1000001 }, ["name_act"]="attack01", ["fx_self"]=100014 @@ -7759,7 +7723,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200112 + 1000002 }, ["name_act"]="attack02", ["fx_self"]=100015 @@ -7780,7 +7744,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200113 + 1000003 }, ["name_act"]="attack03", ["fx_self"]=100016 @@ -7801,7 +7765,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200111 + 1000001 }, ["name_act"]="attack01", ["fx_self"]=100017 @@ -7822,7 +7786,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200112 + 1000002 }, ["name_act"]="attack02", ["fx_self"]=100018 @@ -7843,7 +7807,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200113 + 1000003 }, ["name_act"]="attack03", ["fx_self"]=100019 @@ -7864,7 +7828,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200111 + 1000001 }, ["name_act"]="attack01", ["fx_self"]=100020 @@ -7885,7 +7849,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200112 + 1000002 }, ["name_act"]="attack02", ["fx_self"]=100021 @@ -7906,7 +7870,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200113 + 1000003 }, ["name_act"]="attack03", ["fx_self"]=100021 @@ -7927,7 +7891,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200111 + 1000001 }, ["name_act"]="attack01", ["fx_self"]=100022 @@ -7948,7 +7912,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200112 + 1000002 }, ["name_act"]="attack02", ["fx_self"]=100023 @@ -7969,7 +7933,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200113 + 1000003 }, ["name_act"]="attack03", ["fx_self"]=100023 @@ -7990,7 +7954,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200111 + 1000001 }, ["name_act"]="attack01", ["fx_self"]=100024 @@ -8011,7 +7975,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200112 + 1000002 }, ["name_act"]="attack02", ["fx_self"]=100025 @@ -8032,7 +7996,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200113 + 1000003 }, ["name_act"]="attack03", ["fx_self"]=100025 @@ -8053,7 +8017,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200111 + 1000001 }, ["name_act"]="attack01", ["fx_self"]=100026 @@ -8074,7 +8038,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200112 + 1000002 }, ["name_act"]="attack02", ["fx_self"]=100027 @@ -8095,7 +8059,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200113 + 1000003 }, ["name_act"]="attack03", ["fx_self"]=100027 @@ -8116,7 +8080,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200111 + 1000001 }, ["name_act"]="attack01", ["fx_self"]=100028 @@ -8137,7 +8101,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200112 + 1000002 }, ["name_act"]="attack02", ["fx_self"]=100029 @@ -8158,7 +8122,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200113 + 1000003 }, ["name_act"]="attack03", ["fx_self"]=100030 @@ -8179,7 +8143,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200111 + 1000001 }, ["name_act"]="attack01", ["fx_self"]=100028 @@ -8200,7 +8164,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200112 + 1000002 }, ["name_act"]="attack02", ["fx_self"]=100029 @@ -8221,7 +8185,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200113 + 1000003 }, ["name_act"]="attack03", ["fx_self"]=100030 @@ -8242,7 +8206,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200111 + 1000001 }, ["name_act"]="attack01", ["fx_self"]=100028 @@ -8263,7 +8227,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200112 + 1000002 }, ["name_act"]="attack02", ["fx_self"]=100029 @@ -8284,7 +8248,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200113 + 1000003 }, ["name_act"]="attack03", ["fx_self"]=100030 @@ -8305,7 +8269,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200111 + 1000001 }, ["name_act"]="attack01", ["fx_self"]=100028 @@ -8326,7 +8290,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200112 + 1000002 }, ["name_act"]="attack02", ["fx_self"]=100029 @@ -8347,7 +8311,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200113 + 1000003 }, ["name_act"]="attack03", ["fx_self"]=100030 @@ -8368,7 +8332,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200111 + 1000021 }, ["name_act"]="attack01", ["fx_self"]=100031 @@ -8389,7 +8353,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200112 + 1000022 }, ["name_act"]="attack02", ["fx_self"]=100032 @@ -8410,7 +8374,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200113 + 1000023 }, ["name_act"]="attack03", ["fx_self"]=100033 @@ -8431,7 +8395,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200111 + 1000021 }, ["name_act"]="attack01", ["fx_self"]=100034 @@ -8452,7 +8416,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200112 + 1000022 }, ["name_act"]="attack02", ["fx_self"]=100035 @@ -8473,7 +8437,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200113 + 1000023 }, ["name_act"]="attack03", ["fx_self"]=100036 @@ -8494,7 +8458,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200111 + 1000021 }, ["name_act"]="attack01", ["fx_self"]=100037 @@ -8515,7 +8479,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200112 + 1000022 }, ["name_act"]="attack02", ["fx_self"]=100038 @@ -8536,7 +8500,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200113 + 1000023 }, ["name_act"]="attack03", ["fx_self"]=100039 @@ -8557,7 +8521,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200111 + 1000021 }, ["name_act"]="attack01", ["fx_self"]=100040 @@ -8578,7 +8542,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200112 + 1000022 }, ["name_act"]="attack02", ["fx_self"]=100041 @@ -8599,7 +8563,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200113 + 1000023 }, ["name_act"]="attack03", ["fx_self"]=100042 @@ -8620,7 +8584,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200111 + 1000021 }, ["name_act"]="attack01", ["fx_self"]=100043 @@ -8641,7 +8605,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200112 + 1000022 }, ["name_act"]="attack02", ["fx_self"]=100043 @@ -8662,7 +8626,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200113 + 1000023 }, ["name_act"]="attack03", ["fx_self"]=100043 @@ -8683,7 +8647,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200111 + 1000021 }, ["name_act"]="attack01", ["fx_self"]=100044 @@ -8704,7 +8668,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200112 + 1000022 }, ["name_act"]="attack02", ["fx_self"]=100044 @@ -8725,7 +8689,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200113 + 1000023 }, ["name_act"]="attack03", ["fx_self"]=100044 @@ -8746,7 +8710,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200111 + 1000021 }, ["name_act"]="attack01", ["fx_self"]=100045 @@ -8767,7 +8731,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200112 + 1000022 }, ["name_act"]="attack02", ["fx_self"]=100045 @@ -8788,7 +8752,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200113 + 1000023 }, ["name_act"]="attack03", ["fx_self"]=100045 @@ -8809,7 +8773,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200111 + 1000021 }, ["name_act"]="attack01", ["fx_self"]=100046 @@ -8830,7 +8794,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200112 + 1000022 }, ["name_act"]="attack02", ["fx_self"]=100046 @@ -8851,7 +8815,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200113 + 1000023 }, ["name_act"]="attack03", ["fx_self"]=100046 @@ -8872,7 +8836,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200111 + 1000011 }, ["name_act"]="attack01", ["fx_self"]=100047 @@ -8893,7 +8857,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200112 + 1000012 }, ["name_act"]="attack02", ["fx_self"]=100048 @@ -8914,7 +8878,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200113 + 1000013 }, ["name_act"]="attack03", ["fx_self"]=100049 @@ -8935,7 +8899,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200111 + 1000011 }, ["name_act"]="attack01", ["fx_self"]=100047 @@ -8956,7 +8920,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200112 + 1000012 }, ["name_act"]="attack02", ["fx_self"]=100048 @@ -8977,7 +8941,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200113 + 1000013 }, ["name_act"]="attack03", ["fx_self"]=100049 @@ -8998,7 +8962,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200111 + 1000001 }, ["name_act"]="attack01", ["fx_self"]=100050 @@ -9019,7 +8983,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200112 + 1000002 }, ["name_act"]="attack02", ["fx_self"]=100051 @@ -9040,7 +9004,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200113 + 1000003 }, ["name_act"]="attack03", ["fx_self"]=100052 @@ -9061,7 +9025,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200111 + 1000001 }, ["name_act"]="attack01", ["fx_self"]=100050 @@ -9082,7 +9046,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200112 + 1000002 }, ["name_act"]="attack02", ["fx_self"]=100051 @@ -9103,7 +9067,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200113 + 1000003 }, ["name_act"]="attack03", ["fx_self"]=100052 @@ -9124,7 +9088,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200111 + 1000021 }, ["name_act"]="attack01", ["fx_self"]=100053 @@ -9145,7 +9109,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200112 + 1000022 }, ["name_act"]="attack02", ["fx_self"]=100053 @@ -9166,7 +9130,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200113 + 1000023 }, ["name_act"]="attack03", ["fx_self"]=100053 @@ -9187,7 +9151,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200111 + 1000021 }, ["name_act"]="attack01", ["fx_self"]=100055 @@ -9208,7 +9172,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200112 + 1000022 }, ["name_act"]="attack02", ["fx_self"]=100055 @@ -9229,7 +9193,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200113 + 1000023 }, ["name_act"]="attack03", ["fx_self"]=100055 @@ -9250,7 +9214,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200111 + 1000001 }, ["name_act"]="attack01", ["fx_self"]=100057 @@ -9271,7 +9235,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200112 + 1000002 }, ["name_act"]="attack02", ["fx_self"]=100058 @@ -9292,7 +9256,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200113 + 1000003 }, ["name_act"]="attack03", ["fx_self"]=100059 @@ -9313,7 +9277,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200111 + 1000001 }, ["name_act"]="attack01", ["fx_self"]=100057 @@ -9334,7 +9298,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200112 + 1000002 }, ["name_act"]="attack02", ["fx_self"]=100058 @@ -9355,7 +9319,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200113 + 1000003 }, ["name_act"]="attack03", ["fx_self"]=100059 @@ -9376,7 +9340,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200111 + 1000001 }, ["name_act"]="attack01", ["fx_self"]=100060 @@ -9397,7 +9361,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200112 + 1000002 }, ["name_act"]="attack02", ["fx_self"]=100060 @@ -9418,7 +9382,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200113 + 1000003 }, ["name_act"]="attack03", ["fx_self"]=100060 @@ -9439,7 +9403,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200111 + 1000001 }, ["name_act"]="attack01", ["fx_self"]=100060 @@ -9460,7 +9424,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200112 + 1000002 }, ["name_act"]="attack02", ["fx_self"]=100060 @@ -9481,7 +9445,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200113 + 1000003 }, ["name_act"]="attack03", ["fx_self"]=100060 @@ -9502,7 +9466,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200111 + 1000001 }, ["name_act"]="attack01", ["fx_self"]=100061 @@ -9523,7 +9487,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200112 + 1000002 }, ["name_act"]="attack02", ["fx_self"]=100062 @@ -9544,7 +9508,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200113 + 1000003 }, ["name_act"]="attack03", ["fx_self"]=100062 @@ -9565,7 +9529,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200111 + 1000001 }, ["name_act"]="attack01", ["fx_self"]=100063 @@ -9586,7 +9550,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200112 + 1000002 }, ["name_act"]="attack02", ["fx_self"]=100064 @@ -9607,7 +9571,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200113 + 1000003 }, ["name_act"]="attack03", ["fx_self"]=100065 @@ -9628,7 +9592,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200111 + 1000021 }, ["name_act"]="attack01", ["fx_self"]=100066 @@ -9649,7 +9613,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200112 + 1000022 }, ["name_act"]="attack02", ["fx_self"]=100066 @@ -9670,7 +9634,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200113 + 1000023 }, ["name_act"]="attack03", ["fx_self"]=100066 @@ -9691,7 +9655,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200111 + 1000001 }, ["name_act"]="attack01", ["fx_self"]=100067 @@ -9712,7 +9676,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200112 + 1000002 }, ["name_act"]="attack02", ["fx_self"]=100067 @@ -9733,7 +9697,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200113 + 1000003 }, ["name_act"]="attack03", ["fx_self"]=100067 @@ -9754,7 +9718,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200111 + 1000001 }, ["name_act"]="attack01", ["fx_self"]=100068 @@ -9775,7 +9739,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200112 + 1000002 }, ["name_act"]="attack02", ["fx_self"]=100068 @@ -9796,7 +9760,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200113 + 1000003 }, ["name_act"]="attack03", ["fx_self"]=100068 @@ -9817,7 +9781,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200111 + 1000001 }, ["name_act"]="attack01", ["fx_self"]=100069 @@ -9838,7 +9802,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200112 + 1000002 }, ["name_act"]="attack02", ["fx_self"]=100069 @@ -9859,7 +9823,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200113 + 1000003 }, ["name_act"]="attack03", ["fx_self"]=100069 @@ -9880,7 +9844,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200111 + 1000001 }, ["name_act"]="attack01", ["fx_self"]=100071 @@ -9901,7 +9865,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200112 + 1000002 }, ["name_act"]="attack02", ["fx_self"]=100071 @@ -9922,7 +9886,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200113 + 1000003 }, ["name_act"]="attack03", ["fx_self"]=100071 @@ -9943,7 +9907,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200111 + 1000001 }, ["name_act"]="attack01", ["fx_self"]=100073 @@ -9964,7 +9928,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200112 + 1000002 }, ["name_act"]="attack02", ["fx_self"]=100073 @@ -9985,7 +9949,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200113 + 1000003 }, ["name_act"]="attack03", ["fx_self"]=100073 @@ -10006,7 +9970,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200111 + 1000001 }, ["name_act"]="attack01", ["fx_self"]=100074 @@ -10027,7 +9991,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200112 + 1000002 }, ["name_act"]="attack02", ["fx_self"]=100074 @@ -10048,7 +10012,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200113 + 1000003 }, ["name_act"]="attack03", ["fx_self"]=100074 @@ -10069,7 +10033,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200111 + 1000001 }, ["name_act"]="attack01", ["fx_self"]=100075 @@ -10090,7 +10054,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200112 + 1000002 }, ["name_act"]="attack02", ["fx_self"]=100076 @@ -10111,7 +10075,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200113 + 1000003 }, ["name_act"]="attack03", ["fx_self"]=100077 @@ -10132,7 +10096,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200111 + 1000001 }, ["name_act"]="attack01", ["fx_self"]=100078 @@ -10153,7 +10117,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200112 + 1000002 }, ["name_act"]="attack02", ["fx_self"]=100079 @@ -10174,7 +10138,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200113 + 1000003 }, ["name_act"]="attack03", ["fx_self"]=100080 @@ -10195,7 +10159,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200111 + 1000021 }, ["name_act"]="attack01", ["fx_self"]=100081 @@ -10216,7 +10180,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200112 + 1000022 }, ["name_act"]="attack02", ["fx_self"]=100082 @@ -10237,7 +10201,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200113 + 1000023 }, ["name_act"]="attack03", ["fx_self"]=100083 @@ -10258,7 +10222,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200111 + 1000021 }, ["name_act"]="attack01", ["fx_self"]=100085 @@ -10279,7 +10243,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200112 + 1000022 }, ["name_act"]="attack02", ["fx_self"]=100086 @@ -10300,7 +10264,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200113 + 1000023 }, ["name_act"]="attack03", ["fx_self"]=100087 @@ -10321,7 +10285,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200111 + 1000001 }, ["name_act"]="attack01", ["fx_self"]=100089 @@ -10342,7 +10306,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200112 + 1000002 }, ["name_act"]="attack02", ["fx_self"]=100089 @@ -10363,7 +10327,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200113 + 1000003 }, ["name_act"]="attack03", ["fx_self"]=100089 @@ -10384,7 +10348,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200111 + 1000001 }, ["name_act"]="attack01", ["fx_self"]=100090 @@ -10405,7 +10369,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200112 + 1000002 }, ["name_act"]="attack02", ["fx_self"]=100090 @@ -10426,7 +10390,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200113 + 1000003 }, ["name_act"]="attack03", ["fx_self"]=100090 @@ -10447,7 +10411,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200111 + 1000021 }, ["name_act"]="attack01", ["fx_self"]=100091 @@ -10468,7 +10432,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200112 + 1000022 }, ["name_act"]="attack02", ["fx_self"]=100091 @@ -10489,7 +10453,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200113 + 1000023 }, ["name_act"]="attack03", ["fx_self"]=100091 @@ -10510,7 +10474,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200111 + 1000021 }, ["name_act"]="attack01", ["fx_self"]=100092 @@ -10531,7 +10495,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200112 + 1000022 }, ["name_act"]="attack02", ["fx_self"]=100092 @@ -10552,7 +10516,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200113 + 1000023 }, ["name_act"]="attack03", ["fx_self"]=100092 @@ -10573,7 +10537,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200111 + 1000001 }, ["name_act"]="attack01", ["fx_self"]=100093 @@ -10594,7 +10558,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200112 + 1000002 }, ["name_act"]="attack02", ["fx_self"]=100093 @@ -10615,7 +10579,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200113 + 1000003 }, ["name_act"]="attack03", ["fx_self"]=100093 @@ -10636,7 +10600,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200111 + 1000001 }, ["name_act"]="attack01", ["fx_self"]=100094 @@ -10657,7 +10621,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200112 + 1000002 }, ["name_act"]="attack02", ["fx_self"]=100094 @@ -10678,7 +10642,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200113 + 1000003 }, ["name_act"]="attack03", ["fx_self"]=100094 @@ -10699,7 +10663,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200111 + 1000001 }, ["name_act"]="attack01", ["fx_self"]=100095 @@ -10720,7 +10684,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200112 + 1000002 }, ["name_act"]="attack02", ["fx_self"]=100096 @@ -10741,7 +10705,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200113 + 1000003 }, ["name_act"]="attack03", ["fx_self"]=100096 @@ -10762,7 +10726,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200111 + 1000001 }, ["name_act"]="attack01", ["fx_self"]=100097 @@ -10783,7 +10747,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200112 + 1000002 }, ["name_act"]="attack02", ["fx_self"]=100098 @@ -10804,7 +10768,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200113 + 1000003 }, ["name_act"]="attack03", ["fx_self"]=100098 @@ -10825,7 +10789,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200111 + 1000021 }, ["name_act"]="attack01", ["fx_self"]=100099 @@ -10846,7 +10810,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200112 + 1000022 }, ["name_act"]="attack02", ["fx_self"]=100100 @@ -10867,7 +10831,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200113 + 1000023 }, ["name_act"]="attack03", ["fx_self"]=100101 @@ -10888,7 +10852,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200111 + 1000001 }, ["name_act"]="attack01", ["fx_self"]=200000 @@ -10909,7 +10873,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200112 + 1000002 }, ["name_act"]="attack02", ["fx_self"]=200001 @@ -10930,7 +10894,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200113 + 1000003 }, ["name_act"]="attack03", ["fx_self"]=200000 @@ -10951,7 +10915,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200111 + 1000001 }, ["name_act"]="attack01", ["fx_self"]=200003 @@ -10972,7 +10936,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200112 + 1000002 }, ["name_act"]="attack02", ["fx_self"]=200004 @@ -10993,7 +10957,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200113 + 1000003 }, ["name_act"]="attack03", ["fx_self"]=200003 @@ -11014,7 +10978,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200111 + 1000011 }, ["name_act"]="attack01", ["fx_self"]=200006 @@ -11035,7 +10999,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200112 + 1000012 }, ["name_act"]="attack02", ["fx_self"]=200007 @@ -11056,7 +11020,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200113 + 1000013 }, ["name_act"]="attack03", ["fx_self"]=200008 @@ -11077,7 +11041,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200111 + 1000001 }, ["name_act"]="attack01", ["fx_self"]=200010 @@ -11098,7 +11062,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200112 + 1000002 }, ["name_act"]="attack02", ["fx_self"]=200011 @@ -11119,7 +11083,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200113 + 1000003 }, ["name_act"]="attack03", ["fx_self"]=200012 @@ -11140,7 +11104,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200111 + 1000011 }, ["name_act"]="attack01", ["fx_self"]=200013 @@ -11161,7 +11125,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200112 + 1000012 }, ["name_act"]="attack02", ["fx_self"]=200014 @@ -11182,7 +11146,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200113 + 1000013 }, ["name_act"]="attack03", ["fx_self"]=200015 @@ -11203,7 +11167,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200111 + 1000011 }, ["name_act"]="attack01", ["fx_self"]=200017 @@ -11224,7 +11188,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200112 + 1000012 }, ["name_act"]="attack02", ["fx_self"]=200018 @@ -11245,7 +11209,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200113 + 1000013 }, ["name_act"]="attack03", ["fx_self"]=200019 @@ -11266,7 +11230,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200111 + 1000001 }, ["name_act"]="attack01", ["fx_self"]=200010 @@ -11287,7 +11251,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200112 + 1000002 }, ["name_act"]="attack02", ["fx_self"]=200011 @@ -11308,7 +11272,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200113 + 1000003 }, ["name_act"]="attack03", ["fx_self"]=200012 @@ -11329,7 +11293,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200111 + 1000011 }, ["name_act"]="attack01", ["fx_self"]=200021 @@ -11350,7 +11314,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200112 + 1000012 }, ["name_act"]="attack02", ["fx_self"]=200022 @@ -11371,7 +11335,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200113 + 1000013 }, ["name_act"]="attack03", ["fx_self"]=200023 @@ -11392,7 +11356,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200111 + 1000011 }, ["name_act"]="attack01", ["fx_self"]=200025 @@ -11413,7 +11377,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200112 + 1000012 }, ["name_act"]="attack02", ["fx_self"]=200026 @@ -11434,7 +11398,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200113 + 1000013 }, ["name_act"]="attack03", ["fx_self"]=200027 @@ -11455,7 +11419,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200111 + 1000001 }, ["name_act"]="attack01", ["fx_self"]=200029 @@ -11476,7 +11440,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200112 + 1000002 }, ["name_act"]="attack02", ["fx_self"]=200029 @@ -11497,7 +11461,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200113 + 1000003 }, ["name_act"]="attack03", ["fx_self"]=200030 @@ -11518,7 +11482,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200111 + 1000001 }, ["name_act"]="attack01", ["fx_self"]=200031 @@ -11539,7 +11503,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200112 + 1000002 }, ["name_act"]="attack02", ["fx_self"]=200032 @@ -11560,7 +11524,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200113 + 1000003 }, ["name_act"]="attack03", ["fx_self"]=200033 @@ -11581,7 +11545,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200111 + 1000001 }, ["name_act"]="attack01", ["fx_self"]=200034 @@ -11602,7 +11566,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200112 + 1000002 }, ["name_act"]="attack02", ["fx_self"]=200035 @@ -11623,7 +11587,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200113 + 1000003 }, ["name_act"]="attack03", ["fx_self"]=200036 @@ -11644,7 +11608,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200111 + 1000021 }, ["name_act"]="attack01", ["fx_self"]=200038 @@ -11665,7 +11629,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200112 + 1000022 }, ["name_act"]="attack02", ["fx_self"]=200039 @@ -11686,7 +11650,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200113 + 1000023 }, ["name_act"]="attack03", ["fx_self"]=200040 @@ -11707,7 +11671,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200111 + 1000011 }, ["name_act"]="attack01", ["fx_self"]=200042 @@ -11728,7 +11692,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200112 + 1000012 }, ["name_act"]="attack02", ["fx_self"]=200043 @@ -11749,7 +11713,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200113 + 1000013 }, ["name_act"]="attack03", ["fx_self"]=200044 @@ -11770,7 +11734,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200111 + 1000011 }, ["name_act"]="attack01", ["fx_self"]=200046 @@ -11791,7 +11755,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200112 + 1000012 }, ["name_act"]="attack02", ["fx_self"]=200047 @@ -11812,7 +11776,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200113 + 1000013 }, ["name_act"]="attack03", ["fx_self"]=200048 @@ -11833,7 +11797,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200111 + 1000011 }, ["name_act"]="attack01", ["fx_self"]=200050 @@ -11854,7 +11818,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200112 + 1000012 }, ["name_act"]="attack02", ["fx_self"]=200051 @@ -11875,7 +11839,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200113 + 1000013 }, ["name_act"]="attack03", ["fx_self"]=200052 @@ -11896,7 +11860,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200111 + 1000021 }, ["name_act"]="attack01", ["fx_self"]=200054 @@ -11917,7 +11881,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200112 + 1000022 }, ["name_act"]="attack02", ["fx_self"]=200055 @@ -11938,7 +11902,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200113 + 1000023 }, ["name_act"]="attack03", ["fx_self"]=200056 @@ -11959,7 +11923,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200111 + 1000021 }, ["name_act"]="attack01", ["fx_self"]=200058 @@ -11980,7 +11944,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200112 + 1000022 }, ["name_act"]="attack02", ["fx_self"]=200059 @@ -12001,7 +11965,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200113 + 1000023 }, ["name_act"]="attack03", ["fx_self"]=200060 @@ -12022,7 +11986,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200111 + 1000001 }, ["name_act"]="attack01", ["fx_self"]=200062 @@ -12043,7 +12007,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200112 + 1000002 }, ["name_act"]="attack02", ["fx_self"]=200063 @@ -12064,7 +12028,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200113 + 1000003 }, ["name_act"]="attack03", ["fx_self"]=200064 @@ -12085,7 +12049,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200111 + 1000001 }, ["name_act"]="attack01", ["fx_self"]=200066 @@ -12106,7 +12070,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200112 + 1000002 }, ["name_act"]="attack02", ["fx_self"]=200067 @@ -12127,7 +12091,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200113 + 1000003 }, ["name_act"]="attack03", ["fx_self"]=200068 @@ -12148,7 +12112,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200111 + 1000011 }, ["name_act"]="attack01", ["fx_self"]=200070 @@ -12169,7 +12133,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200112 + 1000012 }, ["name_act"]="attack02", ["fx_self"]=200071 @@ -12190,7 +12154,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200113 + 1000013 }, ["name_act"]="attack03", ["fx_self"]=200072 @@ -12211,7 +12175,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200111 + 1000011 }, ["name_act"]="attack01", ["fx_self"]=200074 @@ -12232,7 +12196,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200112 + 1000012 }, ["name_act"]="attack02", ["fx_self"]=200075 @@ -12253,7 +12217,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200113 + 1000013 }, ["name_act"]="attack03", ["fx_self"]=200074 @@ -12274,7 +12238,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200111 + 1000011 }, ["name_act"]="attack01", ["fx_self"]=200077 @@ -12295,7 +12259,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200112 + 1000012 }, ["name_act"]="attack02", ["fx_self"]=200078 @@ -12316,7 +12280,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200113 + 1000013 }, ["name_act"]="attack03", ["fx_self"]=200079 @@ -12337,7 +12301,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200111 + 1000021 }, ["name_act"]="attack01", ["fx_self"]=200081 @@ -12358,7 +12322,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200112 + 1000022 }, ["name_act"]="attack02", ["fx_self"]=200082 @@ -12379,7 +12343,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200113 + 1000023 }, ["name_act"]="attack03", ["fx_self"]=200083 @@ -12400,7 +12364,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200111 + 1000011 }, ["name_act"]="attack01", ["fx_self"]=200086 @@ -12421,7 +12385,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200112 + 1000012 }, ["name_act"]="attack02", ["fx_self"]=200086 @@ -12442,7 +12406,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200113 + 1000013 }, ["name_act"]="attack03", ["fx_self"]=200087 @@ -12463,7 +12427,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200111 + 1000011 }, ["name_act"]="attack01", ["fx_self"]=200089 @@ -12484,7 +12448,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200112 + 1000012 }, ["name_act"]="attack02", ["fx_self"]=200090 @@ -12505,7 +12469,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200113 + 1000013 }, ["name_act"]="attack03", ["fx_self"]=200091 @@ -12526,7 +12490,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200111 + 1000011 }, ["name_act"]="attack01", ["fx_self"]=200093 @@ -12547,7 +12511,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200112 + 1000012 }, ["name_act"]="attack02", ["fx_self"]=200094 @@ -12568,7 +12532,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200113 + 1000013 }, ["name_act"]="attack03", ["fx_self"]=200095 @@ -12589,7 +12553,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200111 + 1000011 }, ["name_act"]="attack01", ["fx_self"]=200096 @@ -12610,7 +12574,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200112 + 1000012 }, ["name_act"]="attack02", ["fx_self"]=200097 @@ -12631,7 +12595,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200113 + 1000013 }, ["name_act"]="attack03", ["fx_self"]=200098 @@ -12652,7 +12616,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200111 + 1000011 }, ["name_act"]="attack01", ["fx_self"]=200100 @@ -12673,7 +12637,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200112 + 1000012 }, ["name_act"]="attack02", ["fx_self"]=200101 @@ -12694,7 +12658,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200113 + 1000013 }, ["name_act"]="attack03", ["fx_self"]=200102 @@ -12715,7 +12679,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200111 + 1000011 }, ["name_act"]="attack01", ["fx_self"]=200104 @@ -12736,7 +12700,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200112 + 1000012 }, ["name_act"]="attack02", ["fx_self"]=200105 @@ -12757,7 +12721,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200113 + 1000013 }, ["name_act"]="attack03", ["fx_self"]=200106 @@ -12778,7 +12742,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200111 + 1000011 }, ["name_act"]="attack01", ["fx_self"]=200109 @@ -12799,7 +12763,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200112 + 1000012 }, ["name_act"]="attack02", ["fx_self"]=200110 @@ -12820,7 +12784,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200113 + 1000013 }, ["name_act"]="attack03", ["fx_self"]=200111 @@ -12841,7 +12805,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200111 + 1000011 }, ["name_act"]="attack01", ["fx_self"]=200114 @@ -12862,7 +12826,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200112 + 1000012 }, ["name_act"]="attack02", ["fx_self"]=200115 @@ -12883,7 +12847,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200113 + 1000013 }, ["name_act"]="attack03", ["fx_self"]=200116 @@ -12904,7 +12868,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 4200111 + 1000021 }, ["name_act"]="attack01", ["fx_self"]=400040 @@ -12925,7 +12889,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 4200112 + 1000022 }, ["name_act"]="attack02", ["fx_self"]=400041 @@ -12946,7 +12910,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 4200113 + 1000023 }, ["name_act"]="attack03", ["fx_self"]=400042 @@ -12967,7 +12931,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 4200114 + 1000024 }, ["name_act"]="attack04", ["fx_self"]=400043 @@ -12988,7 +12952,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 2200111 + 1000001 }, ["name_act"]="attack01", ["fx_self"]=400000 @@ -13009,7 +12973,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 2200112 + 1000002 }, ["name_act"]="attack02", ["fx_self"]=400001 @@ -13030,7 +12994,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 2200113 + 1000003 }, ["name_act"]="attack03", ["fx_self"]=400002 @@ -13051,7 +13015,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 2200114 + 1000004 }, ["name_act"]="attack04", ["fx_self"]=400003 @@ -13072,7 +13036,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 1200111 + 1000011 }, ["name_act"]="attack01", ["fx_self"]=400005 @@ -13093,7 +13057,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 1200112 + 1000012 }, ["name_act"]="attack02", ["fx_self"]=400006 @@ -13114,7 +13078,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 1200113 + 1000013 }, ["name_act"]="attack03", ["fx_self"]=400007 @@ -13135,7 +13099,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 1200114 + 1000014 }, ["name_act"]="attack04", ["fx_self"]=400008 @@ -13156,7 +13120,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 2200111 + 1000011 }, ["name_act"]="attack01", ["fx_self"]=400010 @@ -13177,7 +13141,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 2200112 + 1000012 }, ["name_act"]="attack02", ["fx_self"]=400011 @@ -13198,7 +13162,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 2200113 + 1000013 }, ["name_act"]="attack03", ["fx_self"]=400012 @@ -13219,7 +13183,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 2200114 + 1000014 }, ["name_act"]="attack04", ["fx_self"]=400013 @@ -13240,7 +13204,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 3300111 + 1000001 }, ["name_act"]="attack01", ["fx_target"]=400015 @@ -13261,7 +13225,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 3300112 + 1000002 }, ["name_act"]="attack02", ["fx_target"]=400016 @@ -13282,7 +13246,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 3300113 + 1000003 }, ["name_act"]="attack03", ["fx_target"]=400017 @@ -13303,7 +13267,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 3300114 + 1000004 }, ["name_act"]="attack04", ["fx_target"]=400018 @@ -13324,7 +13288,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 1200111 + 1000011 }, ["name_act"]="attack01", ["fx_self"]=400020 @@ -13345,7 +13309,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 1200112 + 1000012 }, ["name_act"]="attack02", ["fx_self"]=400021 @@ -13366,7 +13330,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 1200113 + 1000013 }, ["name_act"]="attack03", ["fx_self"]=400022 @@ -13387,7 +13351,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 1200114 + 1000014 }, ["name_act"]="attack04", ["fx_self"]=400023 @@ -13408,7 +13372,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200111 + 1000021 }, ["name_act"]="attack01", ["fx_self"]=400025 @@ -13429,7 +13393,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200112 + 1000022 }, ["name_act"]="attack02", ["fx_self"]=400026 @@ -13450,7 +13414,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200113 + 1000023 }, ["name_act"]="attack03", ["fx_self"]=400027 @@ -13471,7 +13435,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200114 + 1000024 }, ["name_act"]="attack04", ["fx_self"]=400028 @@ -13492,7 +13456,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200111 + 1000001 }, ["name_act"]="attack01", ["fx_self"]=400030 @@ -13513,7 +13477,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200112 + 1000002 }, ["name_act"]="attack02", ["fx_self"]=400031 @@ -13534,7 +13498,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200113 + 1000003 }, ["name_act"]="attack03", ["fx_self"]=400032 @@ -13555,7 +13519,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200114 + 1000004 }, ["name_act"]="attack04", ["fx_self"]=400033 @@ -13576,7 +13540,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200111 + 1000001 }, ["name_act"]="attack01", ["fx_self"]=400035 @@ -13597,7 +13561,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200112 + 1000002 }, ["name_act"]="attack02", ["fx_self"]=400036 @@ -13618,7 +13582,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200113 + 1000003 }, ["name_act"]="attack03", ["fx_self"]=400037 @@ -13639,7 +13603,7 @@ local skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5200114 + 1000004 }, ["name_act"]="attack04", ["fx_self"]=400038 diff --git a/lua/app/config/strings/cn/global.lua b/lua/app/config/strings/cn/global.lua index e76cf427..3c8566f0 100644 --- a/lua/app/config/strings/cn/global.lua +++ b/lua/app/config/strings/cn/global.lua @@ -212,6 +212,7 @@ local localization_global = ["SETTING_DESC_22"] = "Google Play Store连接异常，请稍后再试", ["SETTING_DESC_23"] = "当前有订单正在处理中，请稍后再试", ["SETTING_DESC_25"] = "支付取消", + ["BIND_TIPS_DESC"] = "为了您的帐户安全，请绑定账号", } return localization_global \ No newline at end of file diff --git a/lua/app/config/strings/en/global.lua b/lua/app/config/strings/en/global.lua index 4b2e1935..81ebdb94 100644 --- a/lua/app/config/strings/en/global.lua +++ b/lua/app/config/strings/en/global.lua @@ -212,6 +212,7 @@ local localization_global = ["SETTING_DESC_22"] = "Google Play Store connection error, please try again later", ["SETTING_DESC_23"] = "An order is currently being processed, please try again later", ["SETTING_DESC_25"] = "Payment Cancellation", + ["BIND_TIPS_DESC"] = "For the security of your account, please bind your accounts", } return localization_global \ No newline at end of file diff --git a/lua/app/config/strings/zh/global.lua b/lua/app/config/strings/zh/global.lua index 9349f6c9..2bf1aa9a 100644 --- a/lua/app/config/strings/zh/global.lua +++ b/lua/app/config/strings/zh/global.lua @@ -212,6 +212,7 @@ local localization_global = ["SETTING_DESC_22"] = "Google Play Store連接異常，請稍後再試", ["SETTING_DESC_23"] = "當前有訂單正在處理中，請稍後再試", ["SETTING_DESC_25"] = "支付取消", + ["BIND_TIPS_DESC"] = "爲了您的帳戶安全，請綁定賬號", } return localization_global \ No newline at end of file diff --git a/lua/app/ui/shop/gift_pop_ui.lua b/lua/app/ui/shop/gift_pop_ui.lua index 5741d480..f6ef6b59 100644 --- a/lua/app/ui/shop/gift_pop_ui.lua +++ b/lua/app/ui/shop/gift_pop_ui.lua @@ -12,13 +12,13 @@ local GIFT_BG_NAME = { } local GIFT_TITLE_TEXT = { [PayManager.PURCHARSE_TYPE.ACT_GIFT] = { - [PayManager.PURCHARSE_ACT_TYPE.FIRST_RECHARGE] = I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_9), - [PayManager.PURCHARSE_ACT_TYPE.BEGINNER_GIFT] = I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_11), - [PayManager.PURCHARSE_ACT_TYPE.LEVEL_UP_GIFT] = I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_12), - [PayManager.PURCHARSE_ACT_TYPE.COIN_GIFT] = I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_14), + [PayManager.PURCHARSE_ACT_TYPE.FIRST_RECHARGE] = I18N.GlobalConst.SHOP_DESC_9, + [PayManager.PURCHARSE_ACT_TYPE.BEGINNER_GIFT] = I18N.GlobalConst.SHOP_DESC_11, + [PayManager.PURCHARSE_ACT_TYPE.LEVEL_UP_GIFT] = I18N.GlobalConst.SHOP_DESC_12, + [PayManager.PURCHARSE_ACT_TYPE.COIN_GIFT] = I18N.GlobalConst.SHOP_DESC_14, }, - [PayManager.PURCHARSE_TYPE.CHAPTER_GIFT] = I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_10), - [PayManager.PURCHARSE_TYPE.GROW_UP_GIFT] = I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_13), + [PayManager.PURCHARSE_TYPE.CHAPTER_GIFT] = I18N.GlobalConst.SHOP_DESC_10, + [PayManager.PURCHARSE_TYPE.GROW_UP_GIFT] = I18N.GlobalConst.SHOP_DESC_13, } local MAX_ITEM_NUM = 4 @@ -101,10 +101,10 @@ function GiftPopUI:refresh(needCheck) end if self.actType == PayManager.PURCHARSE_TYPE.ACT_GIFT then local type = PayManager:getGiftConfigInfo(self.actType, self.actId).type - self.titleTx:setText(GIFT_TITLE_TEXT[self.actType][type]) + self.titleTx:setText(I18N:getGlobalText(GIFT_TITLE_TEXT[self.actType][type])) self.banner:setTexture(GIFT_BG_NAME[self.actType][type]) else - self.titleTx:setText(GIFT_TITLE_TEXT[self.actType]) + self.titleTx:setText(I18N:getGlobalText(GIFT_TITLE_TEXT[self.actType])) self.banner:setTexture(GIFT_BG_NAME[self.actType]) end diff --git a/lua/app/userdata/shop/shop_data.lua b/lua/app/userdata/shop/shop_data.lua index 01824d29..16e85187 100644 --- a/lua/app/userdata/shop/shop_data.lua +++ b/lua/app/userdata/shop/shop_data.lua @@ -686,21 +686,25 @@ function ShopData:getValidGrowUpGifts() -- 是否在有效范围内 local isInDurationTime = Time:getServerTime() < maxDurationTime if isInDurationTime then - -- 从通用act里找到这个礼包 如果有该礼包且购买次数未达到上限,则有效；如果没有该礼包也有效 - local actGiftDetailData = self:getActGiftDetailData(PayManager.PURCHARSE_TYPE.GROW_UP_GIFT, gift.current_grow_up_id) - - if actGiftDetailData then - local buyCount = actGiftDetailData.buy_count - local latestBuyTime = actGiftDetailData.latest_buy_at // 1000 - if buyLimit > 0 then - if buyCount < buyLimit then + -- 如果是最后一档 默认有效 + if cfgInfo.last then + isValid = true + else -- 否则从通用act里找到这个礼包 如果有该礼包且购买次数未达到上限,则有效；如果没有该礼包也有效 + local actGiftDetailData = self:getActGiftDetailData(PayManager.PURCHARSE_TYPE.GROW_UP_GIFT, gift.current_grow_up_id) + + if actGiftDetailData then + local buyCount = actGiftDetailData.buy_count + local latestBuyTime = actGiftDetailData.latest_buy_at // 1000 + if buyLimit > 0 then + if buyCount < buyLimit then + isValid = true + end + else isValid = true - end + end else isValid = true - end - else - isValid = true + end end end if isValid then @@ -724,8 +728,21 @@ end -- 触发了成长礼包 function ShopData:onTriggerGrowUpGift(gift) - table.insert(self.growUpGifts, gift) + local hasGift = false + if self.growUpGifts then + for _, ownGift in ipairs(self.growUpGifts) do + if ownGift.current_grow_up_id == gift.current_grow_up_id then + ownGift.trigger_at = gift.trigger_at + ownGift.hero_id = gift.hero_id + hasGift = true + break + end + end + end + if not hasGift then + table.insert(self.growUpGifts, gift) + end self:setDirty() end From 0c420e840ba01af81a4257a9a4b5fc2090e33985 Mon Sep 17 00:00:00 2001 From: xiekaidong Date: Mon, 5 Jun 2023 20:06:51 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E7=89=B9=E6=95=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/app/ui/battle/battle_skill_select_comp.lua | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lua/app/ui/battle/battle_skill_select_comp.lua b/lua/app/ui/battle/battle_skill_select_comp.lua index 153d6457..2d6cb7fb 100644 --- a/lua/app/ui/battle/battle_skill_select_comp.lua +++ b/lua/app/ui/battle/battle_skill_select_comp.lua @@ -20,7 +20,7 @@ end function BattleSkillSelectComp:_display() local uiMap = self:getUIMap() local bg2 = uiMap["battle_select_skill_comp.bg_2"] - bg2:setVisible(self.onlyCommonSkill) + bg2:setActive(self.onlyCommonSkill) local bg = uiMap["battle_select_skill_comp.bg_1"] if ModuleManager.BattleManager.battleController then bg:setVisible(false) @@ -58,13 +58,16 @@ function BattleSkillSelectComp:_addListeners() self.canvasGroup = uiMap["battle_select_skill_comp.skill_node"]:getComponent(GConst.TYPEOF_UNITY_CLASS.CANVAS_GROUP) self.canvasGroup.alpha = 1 self.bg = uiMap["battle_select_skill_comp.bg_1"] + self.bg2 = uiMap["battle_select_skill_comp.bg_2"] uiMap["battle_select_skill_comp.look_btn"]:addTouchListener(function(eventType, x, y) if eventType == GConst.TOUCH_EVENT.DOWN or eventType == GConst.TOUCH_EVENT.DRAG then self.canvasGroup.alpha = 0.3 self.bg:setVisible(false) + self.bg2:setVisible(false) else self.canvasGroup.alpha = 1 self.bg:setVisible(true) + self.bg2:setVisible(true) end end) end From d4cf1c58fd12c0554d23363cf09d0be33b2a3c60 Mon Sep 17 00:00:00 2001 From: xiekaidong Date: Mon, 5 Jun 2023 20:08:36 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/app/game.lua | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lua/app/game.lua b/lua/app/game.lua index 4a659c01..06e3b69e 100644 --- a/lua/app/game.lua +++ b/lua/app/game.lua @@ -401,6 +401,10 @@ if NOT_PUBLISH then end if (Input.GetKeyDown(KeyCode.RightArrow) or Input.GetKeyDown(KeyCode.LeftArrow)) and Input.GetKey(KeyCode.LeftControl) then + if not ModuleManager.DevToolManager.set_board_info then + Logger.logHighlight("请先去gm面板设置浏览的棋盘信息!") + return + end local configName = ModuleManager.DevToolManager.set_board_info.config local idx = ModuleManager.DevToolManager.set_board_info.idx or 0 if not configName then From 8badb72aecc839c0bed10a4f1e128fe14ff4c35a Mon Sep 17 00:00:00 2001 From: CloudJ Date: Mon, 5 Jun 2023 20:17:11 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=8A=BD=E5=8D=A1=E8=A1=A8=E7=8E=B0?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/app/ui/shop/box_open_ui.lua | 3 --- lua/app/ui/shop/box_reward_ui.lua | 16 ++++++++++--- lua/app/ui/shop/cell/box_hero_cell.lua | 31 ++++++++++++++++++++++++++ 3 files changed, 44 insertions(+), 6 deletions(-) diff --git a/lua/app/ui/shop/box_open_ui.lua b/lua/app/ui/shop/box_open_ui.lua index 8aebc8f3..3e473818 100644 --- a/lua/app/ui/shop/box_open_ui.lua +++ b/lua/app/ui/shop/box_open_ui.lua @@ -40,9 +40,6 @@ function BoxOpenUI:onLoadRootComplete() -- 播放spine表现 播放完毕后打开奖励UI self.spineObj = self.uiMap["box_open_ui.ui_spine_obj"] local spineName - - Logger.logHighlight("type:%s index:%s", self.type, self.index) - if self.type == GConst.ShopConst.BOX_REWARD_TYPE.SUMMON then spineName = SUMMON_SPINE_NAME[self.index] elseif self.type == GConst.ShopConst.BOX_REWARD_TYPE.BOUNTY then diff --git a/lua/app/ui/shop/box_reward_ui.lua b/lua/app/ui/shop/box_reward_ui.lua index 72c8970c..cafc8b8a 100644 --- a/lua/app/ui/shop/box_reward_ui.lua +++ b/lua/app/ui/shop/box_reward_ui.lua @@ -159,6 +159,7 @@ function BoxRewardUI:onLoadRootComplete() if i <= rewardCount then self.rewardCells[i]:setVisible(true) self.rewardCells[i]:refresh(self.fragmentRewards[i]) + self.rewardCells[i]:disableAllEffect() else self.rewardCells[i]:setVisible(false) end @@ -203,15 +204,23 @@ function BoxRewardUI:playCellAction(cell, idx) local seq = cell.baseObject:createBindTweenSequence() table.insert(self.cellSeqs, seq) - local tween = canvasGroup:DOFade(1, FADE_TIME) + -- local tween = canvasGroup:DOFade(1, FADE_TIME) seq:AppendInterval(delayTime) - tween:SetEase(CS.DG.Tweening.Ease.InOutSine) + -- tween:SetEase(CS.DG.Tweening.Ease.InOutSine) seq:AppendCallback(function() cell:setSpineVisible(false) -- 防止spine因透明度变化导致的闪白 end) - seq:Append(tween) + -- seq:Append(tween) seq:AppendCallback(function() if not self:isClosed() then + -- 恢复显示 + canvasGroup.alpha = 1 + -- 特效 + if self.isPlayAni then + cell:playEffect() + else + cell:disableAllEffect() + end -- 如果需要spine 则显示 local heroEntity = DataManager.HeroData:getHeroById(self.fragmentRewards[idx].id) if heroEntity and heroEntity:canLvUp() then @@ -298,6 +307,7 @@ function BoxRewardUI:jump() canvasGroup = cell.baseObject:addComponent(GConst.TYPEOF_UNITY_CLASS.CANVAS_GROUP) end canvasGroup.alpha = 1 + cell:disableAllEffect() end self.scrollRectContent:setAnchoredPositionY(self.maxScrollContentHeight - BASE_CONTENT_HEIGHT) self.turnIdx = self.maxIdx diff --git a/lua/app/ui/shop/cell/box_hero_cell.lua b/lua/app/ui/shop/cell/box_hero_cell.lua index c524b0ce..f244dfda 100644 --- a/lua/app/ui/shop/cell/box_hero_cell.lua +++ b/lua/app/ui/shop/cell/box_hero_cell.lua @@ -4,6 +4,11 @@ function BoxHeroCell:init() local uiMap = self.baseObject:genAllChildren() self.heroCell = CellManager:addCellComp(uiMap["cell.hero_cell"], GConst.TYPEOF_LUA_CLASS.HERO_CELL) self.heroNumText = uiMap["cell.num_tx"] + self.effects = {} + self.effects[2] = uiMap["cell.effect_node.sfx_ui_zhaohuan_lv_b01"] + self.effects[3] = uiMap["cell.effect_node.sfx_ui_zhaohuan_lan_b01"] + self.effects[4] = uiMap["cell.effect_node.sfx_ui_zhaohuan_zi_b01"] + self:disableAllEffect() end function BoxHeroCell:refresh(data) @@ -20,6 +25,32 @@ function BoxHeroCell:refresh(data) self.heroNumText:setText("X" .. tostring(num)) end +function BoxHeroCell:playEffect() + if self.data and self.effects then + local id = self.data.id + local heroInfo = ConfigManager:getConfig("hero")[id] + if heroInfo then + local qlt = heroInfo.qlt + for key, effect in pairs(self.effects) do + if key == qlt then + effect:setActive(true) + effect:play() + else + effect:setActive(false) + end + end + end + end +end + +function BoxHeroCell:disableAllEffect() + if self.effects then + for key, effect in pairs(self.effects) do + effect:setActive(false) + end + end +end + function BoxHeroCell:setSpineVisible(visible) self.heroCell:setSpineVisible(visible) end