From c89eb8ef3f030e2f28c47a9c316edffb1d3c0ca5 Mon Sep 17 00:00:00 2001 From: xiekaidong Date: Fri, 26 May 2023 18:08:05 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A6=81=E9=94=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/app/config/chapter_board.lua | 10 +- lua/app/config/func_open.lua | 36 +++- .../localization_global_const.lua | 1 + lua/app/config/monster_chapter.lua | 4 +- lua/app/config/skill.lua | 2 +- lua/app/config/skill_rogue.lua | 46 +++-- lua/app/config/strings/cn/func_open.lua | 46 +++++ lua/app/config/strings/cn/func_open.lua.meta | 10 + lua/app/config/strings/cn/global.lua | 1 + lua/app/config/strings/cn/monster_base.lua | 194 +++++++++++++++--- .../strings/cn/task_daily_challenge.lua | 2 +- lua/app/config/strings/de/func_open.lua | 36 ++++ lua/app/config/strings/de/func_open.lua.meta | 10 + lua/app/config/strings/de/monster_base.lua | 146 ++++++++++++- lua/app/config/strings/en/func_open.lua | 36 ++++ lua/app/config/strings/en/func_open.lua.meta | 10 + lua/app/config/strings/en/monster_base.lua | 146 ++++++++++++- lua/app/config/strings/fpt.meta | 8 + lua/app/config/strings/fpt/func_open.lua | 36 ++++ lua/app/config/strings/fpt/func_open.lua.meta | 10 + lua/app/config/strings/fr/func_open.lua | 36 ++++ lua/app/config/strings/fr/func_open.lua.meta | 10 + lua/app/config/strings/fr/monster_base.lua | 146 ++++++++++++- lua/app/config/strings/id/func_open.lua | 36 ++++ lua/app/config/strings/id/func_open.lua.meta | 10 + lua/app/config/strings/id/monster_base.lua | 146 ++++++++++++- lua/app/config/strings/ja/monster_base.lua | 146 ++++++++++++- lua/app/config/strings/jp.meta | 8 + lua/app/config/strings/jp/func_open.lua | 36 ++++ lua/app/config/strings/jp/func_open.lua.meta | 10 + lua/app/config/strings/ko/func_open.lua | 36 ++++ lua/app/config/strings/ko/func_open.lua.meta | 10 + lua/app/config/strings/ko/monster_base.lua | 146 ++++++++++++- lua/app/config/strings/pt/monster_base.lua | 146 ++++++++++++- lua/app/config/strings/ru/func_open.lua | 36 ++++ lua/app/config/strings/ru/func_open.lua.meta | 10 + lua/app/config/strings/ru/monster_base.lua | 146 ++++++++++++- lua/app/config/strings/th/func_open.lua | 36 ++++ lua/app/config/strings/th/func_open.lua.meta | 10 + lua/app/config/strings/th/monster_base.lua | 146 ++++++++++++- lua/app/config/strings/vi/func_open.lua | 36 ++++ lua/app/config/strings/vi/func_open.lua.meta | 10 + lua/app/config/strings/vi/monster_base.lua | 146 ++++++++++++- lua/app/config/strings/zh/func_open.lua | 36 ++++ lua/app/config/strings/zh/func_open.lua.meta | 10 + lua/app/config/strings/zh/monster_base.lua | 146 ++++++++++++- lua/app/config/task.lua | 182 ++++++++-------- lua/app/config/task_daily_challenge.lua | 2 +- lua/app/config/tutorial.lua | 11 +- .../battle/controller/battle_controller.lua | 10 +- .../battle/helper/battle_buff_special.lua | 6 + lua/app/module/battle/team/battle_team.lua | 1 - lua/app/userdata/battle/battle_data.lua | 16 ++ 53 files changed, 2494 insertions(+), 214 deletions(-) create mode 100644 lua/app/config/strings/cn/func_open.lua create mode 100644 lua/app/config/strings/cn/func_open.lua.meta create mode 100644 lua/app/config/strings/de/func_open.lua create mode 100644 lua/app/config/strings/de/func_open.lua.meta create mode 100644 lua/app/config/strings/en/func_open.lua create mode 100644 lua/app/config/strings/en/func_open.lua.meta create mode 100644 lua/app/config/strings/fpt.meta create mode 100644 lua/app/config/strings/fpt/func_open.lua create mode 100644 lua/app/config/strings/fpt/func_open.lua.meta create mode 100644 lua/app/config/strings/fr/func_open.lua create mode 100644 lua/app/config/strings/fr/func_open.lua.meta create mode 100644 lua/app/config/strings/id/func_open.lua create mode 100644 lua/app/config/strings/id/func_open.lua.meta create mode 100644 lua/app/config/strings/jp.meta create mode 100644 lua/app/config/strings/jp/func_open.lua create mode 100644 lua/app/config/strings/jp/func_open.lua.meta create mode 100644 lua/app/config/strings/ko/func_open.lua create mode 100644 lua/app/config/strings/ko/func_open.lua.meta create mode 100644 lua/app/config/strings/ru/func_open.lua create mode 100644 lua/app/config/strings/ru/func_open.lua.meta create mode 100644 lua/app/config/strings/th/func_open.lua create mode 100644 lua/app/config/strings/th/func_open.lua.meta create mode 100644 lua/app/config/strings/vi/func_open.lua create mode 100644 lua/app/config/strings/vi/func_open.lua.meta create mode 100644 lua/app/config/strings/zh/func_open.lua create mode 100644 lua/app/config/strings/zh/func_open.lua.meta diff --git a/lua/app/config/chapter_board.lua b/lua/app/config/chapter_board.lua index 5e35d5f3..01561188 100644 --- a/lua/app/config/chapter_board.lua +++ b/lua/app/config/chapter_board.lua @@ -67,11 +67,11 @@ local chapter_board = { }, { 0, - 4 + 3 }, { 0, - 3 + 4 }, { 0, @@ -103,7 +103,7 @@ local chapter_board = { }, { 0, - 2 + 3 }, { 1, @@ -202,9 +202,9 @@ local chapter_board = { 3, 3, 2, + 2, 3, - 3, - 3, + 2, 3, 3, 3, diff --git a/lua/app/config/func_open.lua b/lua/app/config/func_open.lua index 9ebdea82..7549ae23 100644 --- a/lua/app/config/func_open.lua +++ b/lua/app/config/func_open.lua @@ -4,37 +4,51 @@ local func_open = { ["pop_ups"]=1 }, ["bounty_open"]={ - ["stage"]=3 + ["stage"]=3, + ["icon"]="main_bounty" }, ["task"]={ - ["stage"]=3 + ["stage"]=3, + ["icon"]="main_task" }, ["act_level_gift"]={ - ["level"]=5 + ["level"]=5, + ["icon"]="main_act_level_gift" }, ["idle_drop"]={ - ["stage"]=2 + ["stage"]=2, + ["icon"]="main_idle_drop" }, ["act_sevenday"]={ - ["stage"]=2 + ["stage"]=2, + ["icon"]="main_act_sevenday" }, ["mall"]={ - ["stage"]=1 + ["stage"]=1, + ["icon"]="main_mall" }, ["mall_daily"]={ - ["stage"]=5 + ["stage"]=5, + ["icon"]="main_mall_daily" }, ["store_box_open"]={ - ["stage"]=2 + ["stage"]=2, + ["icon"]="main_store_box" }, ["store_box_3_open"]={ - ["stage"]=5 + ["stage"]=5, + ["icon"]="main_store_box_3" }, ["daily_challenge"]={ - ["stage"]=2 + ["stage"]=2, + ["icon"]="main_daily_challenge" + }, + ["act_gift_show_open"]={ + ["stage"]=3, + ["pop_ups"]=1 } } local config = { -data=func_open,count=11 +data=func_open,count=12 } return config \ No newline at end of file diff --git a/lua/app/config/localization/localization_global_const.lua b/lua/app/config/localization/localization_global_const.lua index 24061061..64a01e7b 100644 --- a/lua/app/config/localization/localization_global_const.lua +++ b/lua/app/config/localization/localization_global_const.lua @@ -143,6 +143,7 @@ local LocalizationGlobalConst = DAY_X = "DAY_X", DAY_X_UNLOCK = "DAY_X_UNLOCK", SEVEN_DAY_DESC_2 = "SEVEN_DAY_DESC_2", + FUNC_UNLOCK = "FUNC_UNLOCK", } return LocalizationGlobalConst \ No newline at end of file diff --git a/lua/app/config/monster_chapter.lua b/lua/app/config/monster_chapter.lua index a4319153..6576957a 100644 --- a/lua/app/config/monster_chapter.lua +++ b/lua/app/config/monster_chapter.lua @@ -13,7 +13,7 @@ local monster_chapter = { }, [201]={ ["monster_base"]=10002, - ["hp"]=5000000, + ["hp"]=6000000, ["atk"]=200000, ["atk_times"]=2, ["hurt_skill"]={ @@ -25,7 +25,7 @@ local monster_chapter = { }, [301]={ ["monster_base"]=10003, - ["hp"]=12000000, + ["hp"]=11000000, ["atk"]=200000, ["atk_times"]=2, ["hurt_skill"]={ diff --git a/lua/app/config/skill.lua b/lua/app/config/skill.lua index f1be0253..145f604d 100644 --- a/lua/app/config/skill.lua +++ b/lua/app/config/skill.lua @@ -2085,7 +2085,7 @@ local skill = { ["round"]=1 } }, - ["obj"]=2 + ["obj"]=1 }, [3200110]={ ["position"]=3, diff --git a/lua/app/config/skill_rogue.lua b/lua/app/config/skill_rogue.lua index 15a97a36..554587de 100644 --- a/lua/app/config/skill_rogue.lua +++ b/lua/app/config/skill_rogue.lua @@ -682,7 +682,7 @@ local skill_rogue = { }, [1200100]={ ["limit_times"]=1, - ["weight"]=30000, + ["weight"]=100000, ["qlt"]=4, ["type"]=6, ["skill_position"]=1, @@ -826,7 +826,7 @@ local skill_rogue = { }, [1300100]={ ["limit_times"]=1, - ["weight"]=30000, + ["weight"]=100000, ["qlt"]=4, ["type"]=6, ["skill_position"]=1, @@ -957,7 +957,7 @@ local skill_rogue = { }, [1300200]={ ["limit_times"]=1, - ["weight"]=30000, + ["weight"]=100000, ["qlt"]=4, ["type"]=6, ["skill_position"]=1 @@ -1080,7 +1080,7 @@ local skill_rogue = { }, [1400100]={ ["limit_times"]=1, - ["weight"]=30000, + ["weight"]=100000, ["qlt"]=4, ["type"]=6, ["skill_position"]=1 @@ -1211,7 +1211,7 @@ local skill_rogue = { }, [2200100]={ ["limit_times"]=1, - ["weight"]=30000, + ["weight"]=100000, ["qlt"]=4, ["type"]=6, ["skill_position"]=2, @@ -1351,7 +1351,7 @@ local skill_rogue = { }, [2300100]={ ["limit_times"]=1, - ["weight"]=30000, + ["weight"]=100000, ["qlt"]=4, ["type"]=6, ["skill_position"]=2, @@ -1476,7 +1476,7 @@ local skill_rogue = { }, [2300200]={ ["limit_times"]=1, - ["weight"]=30000, + ["weight"]=100000, ["qlt"]=4, ["type"]=6, ["skill_position"]=2, @@ -1629,7 +1629,7 @@ local skill_rogue = { }, [2400100]={ ["limit_times"]=1, - ["weight"]=30000, + ["weight"]=100000, ["qlt"]=4, ["type"]=6, ["skill_position"]=2, @@ -1757,7 +1757,7 @@ local skill_rogue = { }, [3200100]={ ["limit_times"]=1, - ["weight"]=30000, + ["weight"]=100000, ["qlt"]=4, ["type"]=6, ["skill_position"]=3, @@ -1900,7 +1900,7 @@ local skill_rogue = { }, [3300100]={ ["limit_times"]=1, - ["weight"]=30000, + ["weight"]=100000, ["qlt"]=4, ["type"]=6, ["skill_position"]=3, @@ -2036,7 +2036,7 @@ local skill_rogue = { }, [3300200]={ ["limit_times"]=1, - ["weight"]=30000, + ["weight"]=100000, ["qlt"]=4, ["type"]=6, ["skill_position"]=3, @@ -2143,13 +2143,15 @@ local skill_rogue = { ["icon"]="38" }, [3400100]={ - ["weight"]=30000, + ["limit_times"]=1, + ["weight"]=100000, ["qlt"]=4, ["type"]=6, ["skill_position"]=3, ["icon"]="67" }, [3400101]={ + ["limit_times"]=1, ["weight"]=3000, ["qlt"]=4, ["type"]=12, @@ -2211,6 +2213,7 @@ local skill_rogue = { [3400104]={ ["unlock"]=3400101, ["cover_unlock"]=3400101, + ["limit_times"]=1, ["weight"]=3000, ["qlt"]=3, ["type"]=12, @@ -2227,6 +2230,7 @@ local skill_rogue = { ["icon"]="67" }, [3400105]={ + ["limit_times"]=1, ["weight"]=3000, ["qlt"]=4, ["type"]=12, @@ -2245,6 +2249,7 @@ local skill_rogue = { [3400106]={ ["unlock"]=3400106, ["cover_unlock"]=3400106, + ["limit_times"]=1, ["weight"]=3000, ["qlt"]=3, ["type"]=12, @@ -2261,6 +2266,7 @@ local skill_rogue = { ["icon"]="67" }, [3400107]={ + ["limit_times"]=1, ["weight"]=3000, ["qlt"]=4, ["type"]=14, @@ -2281,7 +2287,7 @@ local skill_rogue = { }, [4200100]={ ["limit_times"]=1, - ["weight"]=30000, + ["weight"]=100000, ["qlt"]=4, ["type"]=6, ["skill_position"]=4, @@ -2404,7 +2410,7 @@ local skill_rogue = { }, [4300100]={ ["limit_times"]=1, - ["weight"]=30000, + ["weight"]=100000, ["qlt"]=4, ["type"]=6, ["skill_position"]=4, @@ -2532,7 +2538,7 @@ local skill_rogue = { }, [4300300]={ ["limit_times"]=1, - ["weight"]=30000, + ["weight"]=100000, ["qlt"]=4, ["skill_position"]=4, ["icon"]="57" @@ -2662,7 +2668,7 @@ local skill_rogue = { }, [4400100]={ ["limit_times"]=1, - ["weight"]=30000, + ["weight"]=100000, ["qlt"]=4, ["type"]=6, ["skill_position"]=4, @@ -2778,7 +2784,7 @@ local skill_rogue = { }, [5200100]={ ["limit_times"]=1, - ["weight"]=30000, + ["weight"]=100000, ["qlt"]=4, ["type"]=6, ["skill_position"]=5, @@ -2893,7 +2899,7 @@ local skill_rogue = { }, [5300100]={ ["limit_times"]=1, - ["weight"]=30000, + ["weight"]=100000, ["qlt"]=4, ["type"]=6, ["skill_position"]=5, @@ -3024,7 +3030,7 @@ local skill_rogue = { }, [5300200]={ ["limit_times"]=1, - ["weight"]=30000, + ["weight"]=100000, ["qlt"]=4, ["type"]=6, ["skill_position"]=5, @@ -3159,7 +3165,7 @@ local skill_rogue = { }, [5400100]={ ["limit_times"]=1, - ["weight"]=30000, + ["weight"]=100000, ["qlt"]=4, ["type"]=6, ["skill_position"]=5, diff --git a/lua/app/config/strings/cn/func_open.lua b/lua/app/config/strings/cn/func_open.lua new file mode 100644 index 00000000..0f49067e --- /dev/null +++ b/lua/app/config/strings/cn/func_open.lua @@ -0,0 +1,46 @@ +local func_open = { + ["bounty"]={ + ["name"]="战令", + ["desc"]="大陆贸易点，可购买多种道具" + }, + ["task"]={ + ["name"]="任务", + ["desc"]="呼朋唤友，集结各方力量" + }, + ["act_level_gift"]={ + ["name"]="成长基金", + ["desc"]="帝国科技，打造理想装备" + }, + ["idle_drop"]={ + ["name"]="挂机", + ["desc"]="快速获取游戏道具" + }, + ["act_sevenday"]={ + ["name"]="七天乐", + ["desc"]="团队作战" + }, + ["mall"]={ + ["name"]="商城", + ["desc"]="玩家对决，为荣誉而战" + }, + ["mall_daily"]={ + ["name"]="商城每日商店", + ["desc"]="突破极限，创新记录" + }, + ["store_box"]={ + ["name"]="商城普通宝箱+精致宝箱", + ["desc"]="战斗速度增加一倍" + }, + ["store_box_3"]={ + ["name"]="商城珍贵宝箱", + ["desc"]="解放双手，策略制胜" + }, + ["daily_challenge"]={ + ["name"]="每日挑战开启章节", + ["desc"]="多方成长，强化英雄" + } +} +local config = { +data=func_open,count=10 +} +return config \ No newline at end of file diff --git a/lua/app/config/strings/cn/func_open.lua.meta b/lua/app/config/strings/cn/func_open.lua.meta new file mode 100644 index 00000000..5130eca7 --- /dev/null +++ b/lua/app/config/strings/cn/func_open.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 919f420c7305f34489c8aaa76289c6cd +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/config/strings/cn/global.lua b/lua/app/config/strings/cn/global.lua index 46da0048..fec94f10 100644 --- a/lua/app/config/strings/cn/global.lua +++ b/lua/app/config/strings/cn/global.lua @@ -143,6 +143,7 @@ local localization_global = ["DAY_X"] = "第{0}天", ["DAY_X_UNLOCK"] = "第{0}天解锁", ["SEVEN_DAY_DESC_2"] = "已完成任务数:{0}/{1}", + ["FUNC_UNLOCK"] = "解锁新功能", } return localization_global \ No newline at end of file diff --git a/lua/app/config/strings/cn/monster_base.lua b/lua/app/config/strings/cn/monster_base.lua index b483f594..776c83f5 100644 --- a/lua/app/config/strings/cn/monster_base.lua +++ b/lua/app/config/strings/cn/monster_base.lua @@ -29,9 +29,6 @@ local monster_base = { [10010]={ ["name"]="骷髅枪兵" }, - [10011]={ - ["name"]="地灵枪兵" - }, [10012]={ ["name"]="兽人大刀兵（绿）" }, @@ -56,80 +53,221 @@ local monster_base = { [10019]={ ["name"]="兽人盾骨兵（蓝）" }, + [10020]={ + ["name"]="小史莱姆（绿）" + }, + [10021]={ + ["name"]="小史莱姆（黄）" + }, + [10022]={ + ["name"]="小史莱姆（蓝）" + }, + [10023]={ + ["name"]="小史莱姆（红）" + }, + [10024]={ + ["name"]="大史莱姆（绿）" + }, + [10025]={ + ["name"]="大史莱姆（黄）" + }, + [10026]={ + ["name"]="大史莱姆（蓝）" + }, + [10027]={ + ["name"]="大史莱姆（红）" + }, [10028]={ - ["name"]="双斧男(白紫）" + ["name"]="双斧莫西干（紫）" }, [10029]={ - ["name"]="双斧男(黑红）" + ["name"]="双斧莫西干（红）" }, [10030]={ - ["name"]="剑士（白黄）" + ["name"]="黄发剑士" }, [10031]={ - ["name"]="剑士（褐蓝）" + ["name"]="蓝发剑士" }, [10032]={ - ["name"]="女魔法师（蓝）" + ["name"]="女巫师（蓝）" }, [10033]={ - ["name"]="女魔法师（红）" + ["name"]="女巫师（紫）" + }, + [10034]={ + ["name"]="剑盾士兵（黄发）" + }, + [10035]={ + ["name"]="剑盾士兵（蓝发）" + }, + [10036]={ + ["name"]="人类弓箭手（红）" + }, + [10037]={ + ["name"]="人类弓箭手（绿）" + }, + [10038]={ + ["name"]="骷髅弓箭手" }, [10039]={ - ["name"]="盾刀骷髅兵（有帽子）" + ["name"]="盾刀骷髅兵（有头盔）" + }, + [10040]={ + ["name"]="骷髅小法师" + }, + [10041]={ + ["name"]="蓝色蝙蝠恶魔" + }, + [10042]={ + ["name"]="蓝色恶魔野猪" + }, + [10043]={ + ["name"]="紫色独眼蝙蝠" + }, + [10044]={ + ["name"]="蓝色独眼蝙蝠" + }, + [10045]={ + ["name"]="紫色蜘蛛" + }, + [10046]={ + ["name"]="红色蜘蛛" + }, + [10047]={ + ["name"]="红色蜥蜴剑士" + }, + [10048]={ + ["name"]="绿色蜥蜴剑士" + }, + [10049]={ + ["name"]="绿色食人花" + }, + [10050]={ + ["name"]="黑色食人花" + }, + [10051]={ + ["name"]="红色恶魔野猪" + }, + [10052]={ + ["name"]="红色蝙蝠恶魔" + }, + [10053]={ + ["name"]="紫色鬼火" + }, + [10054]={ + ["name"]="青绿鬼火" + }, + [10055]={ + ["name"]="红色幽灵恶魔" + }, + [10056]={ + ["name"]="紫色幽灵恶魔" + }, + [10057]={ + ["name"]="魔都小枪兵（红）" + }, + [10058]={ + ["name"]="魔都小枪兵（紫）" + }, + [10059]={ + ["name"]="紫色食人花" }, [20001]={ - ["name"]="弓箭神射手（黄）" + ["name"]="丛林神射手" }, [20002]={ - ["name"]="丛林弓箭神射手（绿）" + ["name"]="丛林神猎手" }, [20003]={ - ["name"]="巨龙" + ["name"]="王之巨龙" }, [20004]={ - ["name"]="邪恶法师" + ["name"]="精英哥布林" }, [20005]={ - ["name"]="石像巨人守卫" + ["name"]="远古堡垒" }, [20006]={ - ["name"]="巨绿龟" + ["name"]="绿龟刚铠" }, [20007]={ - ["name"]="独眼巨人（蓝）" + ["name"]="狂暴哥布林" }, [20008]={ - ["name"]="石头人" + ["name"]="石巨人" }, [20009]={ - ["name"]="大树精" + ["name"]="树精祭祀" }, [20010]={ - ["name"]="火灵" + ["name"]="火灵守卫" }, [20011]={ - ["name"]="地精首领" + ["name"]="地精魔像" }, [20012]={ ["name"]="骷髅王" }, [20013]={ - ["name"]="小丑" + ["name"]="小丑之王" }, [20014]={ - ["name"]="兽人首领（绿）" + ["name"]="钢盾绿首领" }, [20015]={ - ["name"]="兽人首领（红）" + ["name"]="钢盾红首领" }, [20016]={ - ["name"]="独眼萌娃" + ["name"]="独眼旋风" }, [20017]={ - ["name"]="骷髅恶魔法师（紫衣）" + ["name"]="骷髅法师" }, [20018]={ - ["name"]="骷髅恶魔法师（红衣）" + ["name"]="恶毒法师" + }, + [20019]={ + ["name"]="火灵刀客" + }, + [20020]={ + ["name"]="火灵王" + }, + [20021]={ + ["name"]="卓一德DH" + }, + [20022]={ + ["name"]="雪人铁匠" + }, + [20023]={ + ["name"]="雪人精英" + }, + [20024]={ + ["name"]="飞天魔" + }, + [20025]={ + ["name"]="异变铁匠" + }, + [20026]={ + ["name"]="异变精英" + }, + [20027]={ + ["name"]="红龟霍顿" + }, + [20028]={ + ["name"]="冰巨人" + }, + [20029]={ + ["name"]="地精炎魔像" + }, + [20030]={ + ["name"]="魔神碎片" + }, + [20031]={ + ["name"]="魔神守护者" + }, + [20032]={ + ["name"]="远古魔神" }, [30001]={ ["name"]="洋葱头" @@ -169,6 +307,6 @@ local monster_base = { } } local config = { -data=monster_base,count=56 +data=monster_base,count=102 } return config \ No newline at end of file diff --git a/lua/app/config/strings/cn/task_daily_challenge.lua b/lua/app/config/strings/cn/task_daily_challenge.lua index b83a1db6..6dbc01ad 100644 --- a/lua/app/config/strings/cn/task_daily_challenge.lua +++ b/lua/app/config/strings/cn/task_daily_challenge.lua @@ -15,7 +15,7 @@ local task_daily_challenge = { ["desc"]="通关时{0}英雄释放技能{1}次" }, [6]={ - ["desc"]="{0}回合内击败最终首领" + ["desc"]="10回合内击败最终首领" }, [7]={ ["desc"]="通关时，{0}造成伤害占比超过{1}%" diff --git a/lua/app/config/strings/de/func_open.lua b/lua/app/config/strings/de/func_open.lua new file mode 100644 index 00000000..864ae094 --- /dev/null +++ b/lua/app/config/strings/de/func_open.lua @@ -0,0 +1,36 @@ +local func_open = { + ["bounty"]={ + + }, + ["task"]={ + + }, + ["act_level_gift"]={ + + }, + ["idle_drop"]={ + + }, + ["act_sevenday"]={ + + }, + ["mall"]={ + + }, + ["mall_daily"]={ + + }, + ["store_box"]={ + + }, + ["store_box_3"]={ + + }, + ["daily_challenge"]={ + + } +} +local config = { +data=func_open,count=10 +} +return config \ No newline at end of file diff --git a/lua/app/config/strings/de/func_open.lua.meta b/lua/app/config/strings/de/func_open.lua.meta new file mode 100644 index 00000000..efe470e8 --- /dev/null +++ b/lua/app/config/strings/de/func_open.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: c38dc3ad8ba97d24ca8cba99e679d91f +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/config/strings/de/monster_base.lua b/lua/app/config/strings/de/monster_base.lua index cecafbb6..748e7028 100644 --- a/lua/app/config/strings/de/monster_base.lua +++ b/lua/app/config/strings/de/monster_base.lua @@ -28,9 +28,6 @@ local monster_base = { }, [10010]={ - }, - [10011]={ - }, [10012]={ @@ -55,6 +52,30 @@ local monster_base = { }, [10019]={ + }, + [10020]={ + + }, + [10021]={ + + }, + [10022]={ + + }, + [10023]={ + + }, + [10024]={ + + }, + [10025]={ + + }, + [10026]={ + + }, + [10027]={ + }, [10028]={ @@ -73,9 +94,84 @@ local monster_base = { }, [10033]={ + }, + [10034]={ + + }, + [10035]={ + + }, + [10036]={ + + }, + [10037]={ + + }, + [10038]={ + }, [10039]={ + }, + [10040]={ + + }, + [10041]={ + + }, + [10042]={ + + }, + [10043]={ + + }, + [10044]={ + + }, + [10045]={ + + }, + [10046]={ + + }, + [10047]={ + + }, + [10048]={ + + }, + [10049]={ + + }, + [10050]={ + + }, + [10051]={ + + }, + [10052]={ + + }, + [10053]={ + + }, + [10054]={ + + }, + [10055]={ + + }, + [10056]={ + + }, + [10057]={ + + }, + [10058]={ + + }, + [10059]={ + }, [20001]={ @@ -130,6 +226,48 @@ local monster_base = { }, [20018]={ + }, + [20019]={ + + }, + [20020]={ + + }, + [20021]={ + + }, + [20022]={ + + }, + [20023]={ + + }, + [20024]={ + + }, + [20025]={ + + }, + [20026]={ + + }, + [20027]={ + + }, + [20028]={ + + }, + [20029]={ + + }, + [20030]={ + + }, + [20031]={ + + }, + [20032]={ + }, [30001]={ @@ -169,6 +307,6 @@ local monster_base = { } } local config = { -data=monster_base,count=56 +data=monster_base,count=102 } return config \ No newline at end of file diff --git a/lua/app/config/strings/en/func_open.lua b/lua/app/config/strings/en/func_open.lua new file mode 100644 index 00000000..eb782ebc --- /dev/null +++ b/lua/app/config/strings/en/func_open.lua @@ -0,0 +1,36 @@ +local func_open = { + ["bounty"]={ + ["desc"]="Trading Spot of the continent." + }, + ["task"]={ + ["desc"]="Gather friends to unify strength." + }, + ["act_level_gift"]={ + ["desc"]="Empire technology to craft ideal gear." + }, + ["idle_drop"]={ + ["desc"]="Get game items fast." + }, + ["act_sevenday"]={ + ["desc"]="Team Battle" + }, + ["mall"]={ + ["desc"]="Players duel. Fight for honor." + }, + ["mall_daily"]={ + ["desc"]="Break limit. New record." + }, + ["store_box"]={ + ["desc"]="Battle speed doubles" + }, + ["store_box_3"]={ + ["desc"]="Free up your hands." + }, + ["daily_challenge"]={ + ["desc"]="Multiple growth to strengthen heroes." + } +} +local config = { +data=func_open,count=10 +} +return config \ No newline at end of file diff --git a/lua/app/config/strings/en/func_open.lua.meta b/lua/app/config/strings/en/func_open.lua.meta new file mode 100644 index 00000000..f04ae92a --- /dev/null +++ b/lua/app/config/strings/en/func_open.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 9537d27af9092e74793da612150c39f3 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/config/strings/en/monster_base.lua b/lua/app/config/strings/en/monster_base.lua index cecafbb6..748e7028 100644 --- a/lua/app/config/strings/en/monster_base.lua +++ b/lua/app/config/strings/en/monster_base.lua @@ -28,9 +28,6 @@ local monster_base = { }, [10010]={ - }, - [10011]={ - }, [10012]={ @@ -55,6 +52,30 @@ local monster_base = { }, [10019]={ + }, + [10020]={ + + }, + [10021]={ + + }, + [10022]={ + + }, + [10023]={ + + }, + [10024]={ + + }, + [10025]={ + + }, + [10026]={ + + }, + [10027]={ + }, [10028]={ @@ -73,9 +94,84 @@ local monster_base = { }, [10033]={ + }, + [10034]={ + + }, + [10035]={ + + }, + [10036]={ + + }, + [10037]={ + + }, + [10038]={ + }, [10039]={ + }, + [10040]={ + + }, + [10041]={ + + }, + [10042]={ + + }, + [10043]={ + + }, + [10044]={ + + }, + [10045]={ + + }, + [10046]={ + + }, + [10047]={ + + }, + [10048]={ + + }, + [10049]={ + + }, + [10050]={ + + }, + [10051]={ + + }, + [10052]={ + + }, + [10053]={ + + }, + [10054]={ + + }, + [10055]={ + + }, + [10056]={ + + }, + [10057]={ + + }, + [10058]={ + + }, + [10059]={ + }, [20001]={ @@ -130,6 +226,48 @@ local monster_base = { }, [20018]={ + }, + [20019]={ + + }, + [20020]={ + + }, + [20021]={ + + }, + [20022]={ + + }, + [20023]={ + + }, + [20024]={ + + }, + [20025]={ + + }, + [20026]={ + + }, + [20027]={ + + }, + [20028]={ + + }, + [20029]={ + + }, + [20030]={ + + }, + [20031]={ + + }, + [20032]={ + }, [30001]={ @@ -169,6 +307,6 @@ local monster_base = { } } local config = { -data=monster_base,count=56 +data=monster_base,count=102 } return config \ No newline at end of file diff --git a/lua/app/config/strings/fpt.meta b/lua/app/config/strings/fpt.meta new file mode 100644 index 00000000..e0c1d3f6 --- /dev/null +++ b/lua/app/config/strings/fpt.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ceb056f138919414eabb60535cff2463 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/lua/app/config/strings/fpt/func_open.lua b/lua/app/config/strings/fpt/func_open.lua new file mode 100644 index 00000000..864ae094 --- /dev/null +++ b/lua/app/config/strings/fpt/func_open.lua @@ -0,0 +1,36 @@ +local func_open = { + ["bounty"]={ + + }, + ["task"]={ + + }, + ["act_level_gift"]={ + + }, + ["idle_drop"]={ + + }, + ["act_sevenday"]={ + + }, + ["mall"]={ + + }, + ["mall_daily"]={ + + }, + ["store_box"]={ + + }, + ["store_box_3"]={ + + }, + ["daily_challenge"]={ + + } +} +local config = { +data=func_open,count=10 +} +return config \ No newline at end of file diff --git a/lua/app/config/strings/fpt/func_open.lua.meta b/lua/app/config/strings/fpt/func_open.lua.meta new file mode 100644 index 00000000..c13d7e14 --- /dev/null +++ b/lua/app/config/strings/fpt/func_open.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: e87dea876ebcc164fb7f9c4fc902b3be +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/config/strings/fr/func_open.lua b/lua/app/config/strings/fr/func_open.lua new file mode 100644 index 00000000..864ae094 --- /dev/null +++ b/lua/app/config/strings/fr/func_open.lua @@ -0,0 +1,36 @@ +local func_open = { + ["bounty"]={ + + }, + ["task"]={ + + }, + ["act_level_gift"]={ + + }, + ["idle_drop"]={ + + }, + ["act_sevenday"]={ + + }, + ["mall"]={ + + }, + ["mall_daily"]={ + + }, + ["store_box"]={ + + }, + ["store_box_3"]={ + + }, + ["daily_challenge"]={ + + } +} +local config = { +data=func_open,count=10 +} +return config \ No newline at end of file diff --git a/lua/app/config/strings/fr/func_open.lua.meta b/lua/app/config/strings/fr/func_open.lua.meta new file mode 100644 index 00000000..e979d0c8 --- /dev/null +++ b/lua/app/config/strings/fr/func_open.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 8b96ecfc420d26a498036ca9042d8980 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/config/strings/fr/monster_base.lua b/lua/app/config/strings/fr/monster_base.lua index cecafbb6..748e7028 100644 --- a/lua/app/config/strings/fr/monster_base.lua +++ b/lua/app/config/strings/fr/monster_base.lua @@ -28,9 +28,6 @@ local monster_base = { }, [10010]={ - }, - [10011]={ - }, [10012]={ @@ -55,6 +52,30 @@ local monster_base = { }, [10019]={ + }, + [10020]={ + + }, + [10021]={ + + }, + [10022]={ + + }, + [10023]={ + + }, + [10024]={ + + }, + [10025]={ + + }, + [10026]={ + + }, + [10027]={ + }, [10028]={ @@ -73,9 +94,84 @@ local monster_base = { }, [10033]={ + }, + [10034]={ + + }, + [10035]={ + + }, + [10036]={ + + }, + [10037]={ + + }, + [10038]={ + }, [10039]={ + }, + [10040]={ + + }, + [10041]={ + + }, + [10042]={ + + }, + [10043]={ + + }, + [10044]={ + + }, + [10045]={ + + }, + [10046]={ + + }, + [10047]={ + + }, + [10048]={ + + }, + [10049]={ + + }, + [10050]={ + + }, + [10051]={ + + }, + [10052]={ + + }, + [10053]={ + + }, + [10054]={ + + }, + [10055]={ + + }, + [10056]={ + + }, + [10057]={ + + }, + [10058]={ + + }, + [10059]={ + }, [20001]={ @@ -130,6 +226,48 @@ local monster_base = { }, [20018]={ + }, + [20019]={ + + }, + [20020]={ + + }, + [20021]={ + + }, + [20022]={ + + }, + [20023]={ + + }, + [20024]={ + + }, + [20025]={ + + }, + [20026]={ + + }, + [20027]={ + + }, + [20028]={ + + }, + [20029]={ + + }, + [20030]={ + + }, + [20031]={ + + }, + [20032]={ + }, [30001]={ @@ -169,6 +307,6 @@ local monster_base = { } } local config = { -data=monster_base,count=56 +data=monster_base,count=102 } return config \ No newline at end of file diff --git a/lua/app/config/strings/id/func_open.lua b/lua/app/config/strings/id/func_open.lua new file mode 100644 index 00000000..864ae094 --- /dev/null +++ b/lua/app/config/strings/id/func_open.lua @@ -0,0 +1,36 @@ +local func_open = { + ["bounty"]={ + + }, + ["task"]={ + + }, + ["act_level_gift"]={ + + }, + ["idle_drop"]={ + + }, + ["act_sevenday"]={ + + }, + ["mall"]={ + + }, + ["mall_daily"]={ + + }, + ["store_box"]={ + + }, + ["store_box_3"]={ + + }, + ["daily_challenge"]={ + + } +} +local config = { +data=func_open,count=10 +} +return config \ No newline at end of file diff --git a/lua/app/config/strings/id/func_open.lua.meta b/lua/app/config/strings/id/func_open.lua.meta new file mode 100644 index 00000000..4d76fc87 --- /dev/null +++ b/lua/app/config/strings/id/func_open.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 8d4109a2a72f4094ebc743f6df66cea4 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/config/strings/id/monster_base.lua b/lua/app/config/strings/id/monster_base.lua index cecafbb6..748e7028 100644 --- a/lua/app/config/strings/id/monster_base.lua +++ b/lua/app/config/strings/id/monster_base.lua @@ -28,9 +28,6 @@ local monster_base = { }, [10010]={ - }, - [10011]={ - }, [10012]={ @@ -55,6 +52,30 @@ local monster_base = { }, [10019]={ + }, + [10020]={ + + }, + [10021]={ + + }, + [10022]={ + + }, + [10023]={ + + }, + [10024]={ + + }, + [10025]={ + + }, + [10026]={ + + }, + [10027]={ + }, [10028]={ @@ -73,9 +94,84 @@ local monster_base = { }, [10033]={ + }, + [10034]={ + + }, + [10035]={ + + }, + [10036]={ + + }, + [10037]={ + + }, + [10038]={ + }, [10039]={ + }, + [10040]={ + + }, + [10041]={ + + }, + [10042]={ + + }, + [10043]={ + + }, + [10044]={ + + }, + [10045]={ + + }, + [10046]={ + + }, + [10047]={ + + }, + [10048]={ + + }, + [10049]={ + + }, + [10050]={ + + }, + [10051]={ + + }, + [10052]={ + + }, + [10053]={ + + }, + [10054]={ + + }, + [10055]={ + + }, + [10056]={ + + }, + [10057]={ + + }, + [10058]={ + + }, + [10059]={ + }, [20001]={ @@ -130,6 +226,48 @@ local monster_base = { }, [20018]={ + }, + [20019]={ + + }, + [20020]={ + + }, + [20021]={ + + }, + [20022]={ + + }, + [20023]={ + + }, + [20024]={ + + }, + [20025]={ + + }, + [20026]={ + + }, + [20027]={ + + }, + [20028]={ + + }, + [20029]={ + + }, + [20030]={ + + }, + [20031]={ + + }, + [20032]={ + }, [30001]={ @@ -169,6 +307,6 @@ local monster_base = { } } local config = { -data=monster_base,count=56 +data=monster_base,count=102 } return config \ No newline at end of file diff --git a/lua/app/config/strings/ja/monster_base.lua b/lua/app/config/strings/ja/monster_base.lua index cecafbb6..748e7028 100644 --- a/lua/app/config/strings/ja/monster_base.lua +++ b/lua/app/config/strings/ja/monster_base.lua @@ -28,9 +28,6 @@ local monster_base = { }, [10010]={ - }, - [10011]={ - }, [10012]={ @@ -55,6 +52,30 @@ local monster_base = { }, [10019]={ + }, + [10020]={ + + }, + [10021]={ + + }, + [10022]={ + + }, + [10023]={ + + }, + [10024]={ + + }, + [10025]={ + + }, + [10026]={ + + }, + [10027]={ + }, [10028]={ @@ -73,9 +94,84 @@ local monster_base = { }, [10033]={ + }, + [10034]={ + + }, + [10035]={ + + }, + [10036]={ + + }, + [10037]={ + + }, + [10038]={ + }, [10039]={ + }, + [10040]={ + + }, + [10041]={ + + }, + [10042]={ + + }, + [10043]={ + + }, + [10044]={ + + }, + [10045]={ + + }, + [10046]={ + + }, + [10047]={ + + }, + [10048]={ + + }, + [10049]={ + + }, + [10050]={ + + }, + [10051]={ + + }, + [10052]={ + + }, + [10053]={ + + }, + [10054]={ + + }, + [10055]={ + + }, + [10056]={ + + }, + [10057]={ + + }, + [10058]={ + + }, + [10059]={ + }, [20001]={ @@ -130,6 +226,48 @@ local monster_base = { }, [20018]={ + }, + [20019]={ + + }, + [20020]={ + + }, + [20021]={ + + }, + [20022]={ + + }, + [20023]={ + + }, + [20024]={ + + }, + [20025]={ + + }, + [20026]={ + + }, + [20027]={ + + }, + [20028]={ + + }, + [20029]={ + + }, + [20030]={ + + }, + [20031]={ + + }, + [20032]={ + }, [30001]={ @@ -169,6 +307,6 @@ local monster_base = { } } local config = { -data=monster_base,count=56 +data=monster_base,count=102 } return config \ No newline at end of file diff --git a/lua/app/config/strings/jp.meta b/lua/app/config/strings/jp.meta new file mode 100644 index 00000000..c2bca076 --- /dev/null +++ b/lua/app/config/strings/jp.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d005351c60b922045b028083e396665d +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/lua/app/config/strings/jp/func_open.lua b/lua/app/config/strings/jp/func_open.lua new file mode 100644 index 00000000..864ae094 --- /dev/null +++ b/lua/app/config/strings/jp/func_open.lua @@ -0,0 +1,36 @@ +local func_open = { + ["bounty"]={ + + }, + ["task"]={ + + }, + ["act_level_gift"]={ + + }, + ["idle_drop"]={ + + }, + ["act_sevenday"]={ + + }, + ["mall"]={ + + }, + ["mall_daily"]={ + + }, + ["store_box"]={ + + }, + ["store_box_3"]={ + + }, + ["daily_challenge"]={ + + } +} +local config = { +data=func_open,count=10 +} +return config \ No newline at end of file diff --git a/lua/app/config/strings/jp/func_open.lua.meta b/lua/app/config/strings/jp/func_open.lua.meta new file mode 100644 index 00000000..5362c7ec --- /dev/null +++ b/lua/app/config/strings/jp/func_open.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: b3fe7a2d96eea784787d55c87964aa2a +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/config/strings/ko/func_open.lua b/lua/app/config/strings/ko/func_open.lua new file mode 100644 index 00000000..864ae094 --- /dev/null +++ b/lua/app/config/strings/ko/func_open.lua @@ -0,0 +1,36 @@ +local func_open = { + ["bounty"]={ + + }, + ["task"]={ + + }, + ["act_level_gift"]={ + + }, + ["idle_drop"]={ + + }, + ["act_sevenday"]={ + + }, + ["mall"]={ + + }, + ["mall_daily"]={ + + }, + ["store_box"]={ + + }, + ["store_box_3"]={ + + }, + ["daily_challenge"]={ + + } +} +local config = { +data=func_open,count=10 +} +return config \ No newline at end of file diff --git a/lua/app/config/strings/ko/func_open.lua.meta b/lua/app/config/strings/ko/func_open.lua.meta new file mode 100644 index 00000000..d4b9f8b1 --- /dev/null +++ b/lua/app/config/strings/ko/func_open.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: e1457bf1f0f96a84886cc052c3b10ffa +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/config/strings/ko/monster_base.lua b/lua/app/config/strings/ko/monster_base.lua index cecafbb6..748e7028 100644 --- a/lua/app/config/strings/ko/monster_base.lua +++ b/lua/app/config/strings/ko/monster_base.lua @@ -28,9 +28,6 @@ local monster_base = { }, [10010]={ - }, - [10011]={ - }, [10012]={ @@ -55,6 +52,30 @@ local monster_base = { }, [10019]={ + }, + [10020]={ + + }, + [10021]={ + + }, + [10022]={ + + }, + [10023]={ + + }, + [10024]={ + + }, + [10025]={ + + }, + [10026]={ + + }, + [10027]={ + }, [10028]={ @@ -73,9 +94,84 @@ local monster_base = { }, [10033]={ + }, + [10034]={ + + }, + [10035]={ + + }, + [10036]={ + + }, + [10037]={ + + }, + [10038]={ + }, [10039]={ + }, + [10040]={ + + }, + [10041]={ + + }, + [10042]={ + + }, + [10043]={ + + }, + [10044]={ + + }, + [10045]={ + + }, + [10046]={ + + }, + [10047]={ + + }, + [10048]={ + + }, + [10049]={ + + }, + [10050]={ + + }, + [10051]={ + + }, + [10052]={ + + }, + [10053]={ + + }, + [10054]={ + + }, + [10055]={ + + }, + [10056]={ + + }, + [10057]={ + + }, + [10058]={ + + }, + [10059]={ + }, [20001]={ @@ -130,6 +226,48 @@ local monster_base = { }, [20018]={ + }, + [20019]={ + + }, + [20020]={ + + }, + [20021]={ + + }, + [20022]={ + + }, + [20023]={ + + }, + [20024]={ + + }, + [20025]={ + + }, + [20026]={ + + }, + [20027]={ + + }, + [20028]={ + + }, + [20029]={ + + }, + [20030]={ + + }, + [20031]={ + + }, + [20032]={ + }, [30001]={ @@ -169,6 +307,6 @@ local monster_base = { } } local config = { -data=monster_base,count=56 +data=monster_base,count=102 } return config \ No newline at end of file diff --git a/lua/app/config/strings/pt/monster_base.lua b/lua/app/config/strings/pt/monster_base.lua index cecafbb6..748e7028 100644 --- a/lua/app/config/strings/pt/monster_base.lua +++ b/lua/app/config/strings/pt/monster_base.lua @@ -28,9 +28,6 @@ local monster_base = { }, [10010]={ - }, - [10011]={ - }, [10012]={ @@ -55,6 +52,30 @@ local monster_base = { }, [10019]={ + }, + [10020]={ + + }, + [10021]={ + + }, + [10022]={ + + }, + [10023]={ + + }, + [10024]={ + + }, + [10025]={ + + }, + [10026]={ + + }, + [10027]={ + }, [10028]={ @@ -73,9 +94,84 @@ local monster_base = { }, [10033]={ + }, + [10034]={ + + }, + [10035]={ + + }, + [10036]={ + + }, + [10037]={ + + }, + [10038]={ + }, [10039]={ + }, + [10040]={ + + }, + [10041]={ + + }, + [10042]={ + + }, + [10043]={ + + }, + [10044]={ + + }, + [10045]={ + + }, + [10046]={ + + }, + [10047]={ + + }, + [10048]={ + + }, + [10049]={ + + }, + [10050]={ + + }, + [10051]={ + + }, + [10052]={ + + }, + [10053]={ + + }, + [10054]={ + + }, + [10055]={ + + }, + [10056]={ + + }, + [10057]={ + + }, + [10058]={ + + }, + [10059]={ + }, [20001]={ @@ -130,6 +226,48 @@ local monster_base = { }, [20018]={ + }, + [20019]={ + + }, + [20020]={ + + }, + [20021]={ + + }, + [20022]={ + + }, + [20023]={ + + }, + [20024]={ + + }, + [20025]={ + + }, + [20026]={ + + }, + [20027]={ + + }, + [20028]={ + + }, + [20029]={ + + }, + [20030]={ + + }, + [20031]={ + + }, + [20032]={ + }, [30001]={ @@ -169,6 +307,6 @@ local monster_base = { } } local config = { -data=monster_base,count=56 +data=monster_base,count=102 } return config \ No newline at end of file diff --git a/lua/app/config/strings/ru/func_open.lua b/lua/app/config/strings/ru/func_open.lua new file mode 100644 index 00000000..864ae094 --- /dev/null +++ b/lua/app/config/strings/ru/func_open.lua @@ -0,0 +1,36 @@ +local func_open = { + ["bounty"]={ + + }, + ["task"]={ + + }, + ["act_level_gift"]={ + + }, + ["idle_drop"]={ + + }, + ["act_sevenday"]={ + + }, + ["mall"]={ + + }, + ["mall_daily"]={ + + }, + ["store_box"]={ + + }, + ["store_box_3"]={ + + }, + ["daily_challenge"]={ + + } +} +local config = { +data=func_open,count=10 +} +return config \ No newline at end of file diff --git a/lua/app/config/strings/ru/func_open.lua.meta b/lua/app/config/strings/ru/func_open.lua.meta new file mode 100644 index 00000000..2047acff --- /dev/null +++ b/lua/app/config/strings/ru/func_open.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 781991512de623142ad273c835fcbc6b +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/config/strings/ru/monster_base.lua b/lua/app/config/strings/ru/monster_base.lua index cecafbb6..748e7028 100644 --- a/lua/app/config/strings/ru/monster_base.lua +++ b/lua/app/config/strings/ru/monster_base.lua @@ -28,9 +28,6 @@ local monster_base = { }, [10010]={ - }, - [10011]={ - }, [10012]={ @@ -55,6 +52,30 @@ local monster_base = { }, [10019]={ + }, + [10020]={ + + }, + [10021]={ + + }, + [10022]={ + + }, + [10023]={ + + }, + [10024]={ + + }, + [10025]={ + + }, + [10026]={ + + }, + [10027]={ + }, [10028]={ @@ -73,9 +94,84 @@ local monster_base = { }, [10033]={ + }, + [10034]={ + + }, + [10035]={ + + }, + [10036]={ + + }, + [10037]={ + + }, + [10038]={ + }, [10039]={ + }, + [10040]={ + + }, + [10041]={ + + }, + [10042]={ + + }, + [10043]={ + + }, + [10044]={ + + }, + [10045]={ + + }, + [10046]={ + + }, + [10047]={ + + }, + [10048]={ + + }, + [10049]={ + + }, + [10050]={ + + }, + [10051]={ + + }, + [10052]={ + + }, + [10053]={ + + }, + [10054]={ + + }, + [10055]={ + + }, + [10056]={ + + }, + [10057]={ + + }, + [10058]={ + + }, + [10059]={ + }, [20001]={ @@ -130,6 +226,48 @@ local monster_base = { }, [20018]={ + }, + [20019]={ + + }, + [20020]={ + + }, + [20021]={ + + }, + [20022]={ + + }, + [20023]={ + + }, + [20024]={ + + }, + [20025]={ + + }, + [20026]={ + + }, + [20027]={ + + }, + [20028]={ + + }, + [20029]={ + + }, + [20030]={ + + }, + [20031]={ + + }, + [20032]={ + }, [30001]={ @@ -169,6 +307,6 @@ local monster_base = { } } local config = { -data=monster_base,count=56 +data=monster_base,count=102 } return config \ No newline at end of file diff --git a/lua/app/config/strings/th/func_open.lua b/lua/app/config/strings/th/func_open.lua new file mode 100644 index 00000000..864ae094 --- /dev/null +++ b/lua/app/config/strings/th/func_open.lua @@ -0,0 +1,36 @@ +local func_open = { + ["bounty"]={ + + }, + ["task"]={ + + }, + ["act_level_gift"]={ + + }, + ["idle_drop"]={ + + }, + ["act_sevenday"]={ + + }, + ["mall"]={ + + }, + ["mall_daily"]={ + + }, + ["store_box"]={ + + }, + ["store_box_3"]={ + + }, + ["daily_challenge"]={ + + } +} +local config = { +data=func_open,count=10 +} +return config \ No newline at end of file diff --git a/lua/app/config/strings/th/func_open.lua.meta b/lua/app/config/strings/th/func_open.lua.meta new file mode 100644 index 00000000..34547506 --- /dev/null +++ b/lua/app/config/strings/th/func_open.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 4113cfd07da50d7478adc8ac79a309ba +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/config/strings/th/monster_base.lua b/lua/app/config/strings/th/monster_base.lua index cecafbb6..748e7028 100644 --- a/lua/app/config/strings/th/monster_base.lua +++ b/lua/app/config/strings/th/monster_base.lua @@ -28,9 +28,6 @@ local monster_base = { }, [10010]={ - }, - [10011]={ - }, [10012]={ @@ -55,6 +52,30 @@ local monster_base = { }, [10019]={ + }, + [10020]={ + + }, + [10021]={ + + }, + [10022]={ + + }, + [10023]={ + + }, + [10024]={ + + }, + [10025]={ + + }, + [10026]={ + + }, + [10027]={ + }, [10028]={ @@ -73,9 +94,84 @@ local monster_base = { }, [10033]={ + }, + [10034]={ + + }, + [10035]={ + + }, + [10036]={ + + }, + [10037]={ + + }, + [10038]={ + }, [10039]={ + }, + [10040]={ + + }, + [10041]={ + + }, + [10042]={ + + }, + [10043]={ + + }, + [10044]={ + + }, + [10045]={ + + }, + [10046]={ + + }, + [10047]={ + + }, + [10048]={ + + }, + [10049]={ + + }, + [10050]={ + + }, + [10051]={ + + }, + [10052]={ + + }, + [10053]={ + + }, + [10054]={ + + }, + [10055]={ + + }, + [10056]={ + + }, + [10057]={ + + }, + [10058]={ + + }, + [10059]={ + }, [20001]={ @@ -130,6 +226,48 @@ local monster_base = { }, [20018]={ + }, + [20019]={ + + }, + [20020]={ + + }, + [20021]={ + + }, + [20022]={ + + }, + [20023]={ + + }, + [20024]={ + + }, + [20025]={ + + }, + [20026]={ + + }, + [20027]={ + + }, + [20028]={ + + }, + [20029]={ + + }, + [20030]={ + + }, + [20031]={ + + }, + [20032]={ + }, [30001]={ @@ -169,6 +307,6 @@ local monster_base = { } } local config = { -data=monster_base,count=56 +data=monster_base,count=102 } return config \ No newline at end of file diff --git a/lua/app/config/strings/vi/func_open.lua b/lua/app/config/strings/vi/func_open.lua new file mode 100644 index 00000000..864ae094 --- /dev/null +++ b/lua/app/config/strings/vi/func_open.lua @@ -0,0 +1,36 @@ +local func_open = { + ["bounty"]={ + + }, + ["task"]={ + + }, + ["act_level_gift"]={ + + }, + ["idle_drop"]={ + + }, + ["act_sevenday"]={ + + }, + ["mall"]={ + + }, + ["mall_daily"]={ + + }, + ["store_box"]={ + + }, + ["store_box_3"]={ + + }, + ["daily_challenge"]={ + + } +} +local config = { +data=func_open,count=10 +} +return config \ No newline at end of file diff --git a/lua/app/config/strings/vi/func_open.lua.meta b/lua/app/config/strings/vi/func_open.lua.meta new file mode 100644 index 00000000..cd273958 --- /dev/null +++ b/lua/app/config/strings/vi/func_open.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 454a4766f1fe9f541a9b42c571fdb7f5 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/config/strings/vi/monster_base.lua b/lua/app/config/strings/vi/monster_base.lua index cecafbb6..748e7028 100644 --- a/lua/app/config/strings/vi/monster_base.lua +++ b/lua/app/config/strings/vi/monster_base.lua @@ -28,9 +28,6 @@ local monster_base = { }, [10010]={ - }, - [10011]={ - }, [10012]={ @@ -55,6 +52,30 @@ local monster_base = { }, [10019]={ + }, + [10020]={ + + }, + [10021]={ + + }, + [10022]={ + + }, + [10023]={ + + }, + [10024]={ + + }, + [10025]={ + + }, + [10026]={ + + }, + [10027]={ + }, [10028]={ @@ -73,9 +94,84 @@ local monster_base = { }, [10033]={ + }, + [10034]={ + + }, + [10035]={ + + }, + [10036]={ + + }, + [10037]={ + + }, + [10038]={ + }, [10039]={ + }, + [10040]={ + + }, + [10041]={ + + }, + [10042]={ + + }, + [10043]={ + + }, + [10044]={ + + }, + [10045]={ + + }, + [10046]={ + + }, + [10047]={ + + }, + [10048]={ + + }, + [10049]={ + + }, + [10050]={ + + }, + [10051]={ + + }, + [10052]={ + + }, + [10053]={ + + }, + [10054]={ + + }, + [10055]={ + + }, + [10056]={ + + }, + [10057]={ + + }, + [10058]={ + + }, + [10059]={ + }, [20001]={ @@ -130,6 +226,48 @@ local monster_base = { }, [20018]={ + }, + [20019]={ + + }, + [20020]={ + + }, + [20021]={ + + }, + [20022]={ + + }, + [20023]={ + + }, + [20024]={ + + }, + [20025]={ + + }, + [20026]={ + + }, + [20027]={ + + }, + [20028]={ + + }, + [20029]={ + + }, + [20030]={ + + }, + [20031]={ + + }, + [20032]={ + }, [30001]={ @@ -169,6 +307,6 @@ local monster_base = { } } local config = { -data=monster_base,count=56 +data=monster_base,count=102 } return config \ No newline at end of file diff --git a/lua/app/config/strings/zh/func_open.lua b/lua/app/config/strings/zh/func_open.lua new file mode 100644 index 00000000..864ae094 --- /dev/null +++ b/lua/app/config/strings/zh/func_open.lua @@ -0,0 +1,36 @@ +local func_open = { + ["bounty"]={ + + }, + ["task"]={ + + }, + ["act_level_gift"]={ + + }, + ["idle_drop"]={ + + }, + ["act_sevenday"]={ + + }, + ["mall"]={ + + }, + ["mall_daily"]={ + + }, + ["store_box"]={ + + }, + ["store_box_3"]={ + + }, + ["daily_challenge"]={ + + } +} +local config = { +data=func_open,count=10 +} +return config \ No newline at end of file diff --git a/lua/app/config/strings/zh/func_open.lua.meta b/lua/app/config/strings/zh/func_open.lua.meta new file mode 100644 index 00000000..4884d273 --- /dev/null +++ b/lua/app/config/strings/zh/func_open.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 980b12952c08adb42b77de24ba45a5f5 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/config/strings/zh/monster_base.lua b/lua/app/config/strings/zh/monster_base.lua index cecafbb6..748e7028 100644 --- a/lua/app/config/strings/zh/monster_base.lua +++ b/lua/app/config/strings/zh/monster_base.lua @@ -28,9 +28,6 @@ local monster_base = { }, [10010]={ - }, - [10011]={ - }, [10012]={ @@ -55,6 +52,30 @@ local monster_base = { }, [10019]={ + }, + [10020]={ + + }, + [10021]={ + + }, + [10022]={ + + }, + [10023]={ + + }, + [10024]={ + + }, + [10025]={ + + }, + [10026]={ + + }, + [10027]={ + }, [10028]={ @@ -73,9 +94,84 @@ local monster_base = { }, [10033]={ + }, + [10034]={ + + }, + [10035]={ + + }, + [10036]={ + + }, + [10037]={ + + }, + [10038]={ + }, [10039]={ + }, + [10040]={ + + }, + [10041]={ + + }, + [10042]={ + + }, + [10043]={ + + }, + [10044]={ + + }, + [10045]={ + + }, + [10046]={ + + }, + [10047]={ + + }, + [10048]={ + + }, + [10049]={ + + }, + [10050]={ + + }, + [10051]={ + + }, + [10052]={ + + }, + [10053]={ + + }, + [10054]={ + + }, + [10055]={ + + }, + [10056]={ + + }, + [10057]={ + + }, + [10058]={ + + }, + [10059]={ + }, [20001]={ @@ -130,6 +226,48 @@ local monster_base = { }, [20018]={ + }, + [20019]={ + + }, + [20020]={ + + }, + [20021]={ + + }, + [20022]={ + + }, + [20023]={ + + }, + [20024]={ + + }, + [20025]={ + + }, + [20026]={ + + }, + [20027]={ + + }, + [20028]={ + + }, + [20029]={ + + }, + [20030]={ + + }, + [20031]={ + + }, + [20032]={ + }, [30001]={ @@ -169,6 +307,6 @@ local monster_base = { } } local config = { -data=monster_base,count=56 +data=monster_base,count=102 } return config \ No newline at end of file diff --git a/lua/app/config/task.lua b/lua/app/config/task.lua index f6bb1317..ea39d150 100644 --- a/lua/app/config/task.lua +++ b/lua/app/config/task.lua @@ -12,7 +12,7 @@ local task = { ["num_for_nothing"]="Vw==" } }, - ["icon"]="1" + ["icon"]="10" }, [2]={ ["type"]=20, @@ -27,7 +27,7 @@ local task = { ["num_for_nothing"]="Vw==" } }, - ["icon"]="20" + ["icon"]="8" }, [3]={ ["type"]=21, @@ -42,7 +42,7 @@ local task = { ["num_for_nothing"]="Uwg=" } }, - ["icon"]="21" + ["icon"]="10" }, [4]={ ["type"]=2, @@ -57,7 +57,7 @@ local task = { ["num_for_nothing"]="Uwg=" } }, - ["icon"]="2" + ["icon"]="1" }, [5]={ ["type"]=2, @@ -72,7 +72,7 @@ local task = { ["num_for_nothing"]="UQ0=" } }, - ["icon"]="2" + ["icon"]="1" }, [6]={ ["type"]=2, @@ -87,7 +87,7 @@ local task = { ["num_for_nothing"]="Vwhc" } }, - ["icon"]="2" + ["icon"]="1" }, [7]={ ["type"]=2, @@ -102,7 +102,7 @@ local task = { ["num_for_nothing"]="Vw1c" } }, - ["icon"]="2" + ["icon"]="1" }, [8]={ ["type"]=3, @@ -118,7 +118,7 @@ local task = { } }, ["lock"]=3, - ["icon"]="3" + ["icon"]="1" }, [9]={ ["type"]=3, @@ -134,7 +134,7 @@ local task = { } }, ["lock"]=3, - ["icon"]="3" + ["icon"]="1" }, [10]={ ["type"]=3, @@ -150,7 +150,7 @@ local task = { } }, ["lock"]=3, - ["icon"]="3" + ["icon"]="1" }, [11]={ ["type"]=3, @@ -166,7 +166,7 @@ local task = { } }, ["lock"]=3, - ["icon"]="3" + ["icon"]="1" }, [12]={ ["type"]=4, @@ -181,7 +181,7 @@ local task = { ["num_for_nothing"]="Uwg=" } }, - ["icon"]="4" + ["icon"]="1" }, [13]={ ["type"]=4, @@ -196,7 +196,7 @@ local task = { ["num_for_nothing"]="UQ0=" } }, - ["icon"]="4" + ["icon"]="1" }, [14]={ ["type"]=4, @@ -211,7 +211,7 @@ local task = { ["num_for_nothing"]="Vwhc" } }, - ["icon"]="4" + ["icon"]="1" }, [15]={ ["type"]=4, @@ -226,7 +226,7 @@ local task = { ["num_for_nothing"]="Vw1c" } }, - ["icon"]="4" + ["icon"]="1" }, [16]={ ["type"]=5, @@ -242,7 +242,7 @@ local task = { } }, ["lock"]=3, - ["icon"]="5" + ["icon"]="2" }, [17]={ ["type"]=5, @@ -258,7 +258,7 @@ local task = { } }, ["lock"]=3, - ["icon"]="5" + ["icon"]="2" }, [18]={ ["type"]=5, @@ -274,7 +274,7 @@ local task = { } }, ["lock"]=3, - ["icon"]="5" + ["icon"]="2" }, [19]={ ["type"]=5, @@ -290,7 +290,7 @@ local task = { } }, ["lock"]=3, - ["icon"]="5" + ["icon"]="2" }, [20]={ ["type"]=6, @@ -305,7 +305,7 @@ local task = { ["num_for_nothing"]="Uwg=" } }, - ["icon"]="6" + ["icon"]="3" }, [21]={ ["type"]=6, @@ -320,7 +320,7 @@ local task = { ["num_for_nothing"]="UQ0=" } }, - ["icon"]="6" + ["icon"]="3" }, [22]={ ["type"]=6, @@ -335,7 +335,7 @@ local task = { ["num_for_nothing"]="Vwhc" } }, - ["icon"]="6" + ["icon"]="3" }, [23]={ ["type"]=6, @@ -350,7 +350,7 @@ local task = { ["num_for_nothing"]="Vw1c" } }, - ["icon"]="6" + ["icon"]="3" }, [24]={ ["type"]=7, @@ -366,7 +366,7 @@ local task = { } }, ["lock"]=10, - ["icon"]="7" + ["icon"]="4" }, [25]={ ["type"]=7, @@ -382,7 +382,7 @@ local task = { } }, ["lock"]=10, - ["icon"]="7" + ["icon"]="4" }, [26]={ ["type"]=7, @@ -398,7 +398,7 @@ local task = { } }, ["lock"]=10, - ["icon"]="7" + ["icon"]="4" }, [27]={ ["type"]=7, @@ -414,7 +414,7 @@ local task = { } }, ["lock"]=10, - ["icon"]="7" + ["icon"]="4" }, [28]={ ["type"]=8, @@ -430,7 +430,7 @@ local task = { } }, ["lock"]=5, - ["icon"]="8" + ["icon"]="5" }, [29]={ ["type"]=8, @@ -446,7 +446,7 @@ local task = { } }, ["lock"]=5, - ["icon"]="8" + ["icon"]="5" }, [30]={ ["type"]=8, @@ -461,7 +461,7 @@ local task = { ["num_for_nothing"]="Vwhc" } }, - ["icon"]="8" + ["icon"]="5" }, [31]={ ["type"]=8, @@ -476,7 +476,7 @@ local task = { ["num_for_nothing"]="Vw1c" } }, - ["icon"]="8" + ["icon"]="5" }, [32]={ ["type"]=9, @@ -491,7 +491,7 @@ local task = { ["num_for_nothing"]="Uwg=" } }, - ["icon"]="9" + ["icon"]="6" }, [33]={ ["type"]=9, @@ -506,7 +506,7 @@ local task = { ["num_for_nothing"]="UQ0=" } }, - ["icon"]="9" + ["icon"]="6" }, [34]={ ["type"]=9, @@ -521,7 +521,7 @@ local task = { ["num_for_nothing"]="Vwhc" } }, - ["icon"]="9" + ["icon"]="6" }, [35]={ ["type"]=9, @@ -536,7 +536,7 @@ local task = { ["num_for_nothing"]="Vw1c" } }, - ["icon"]="9" + ["icon"]="6" }, [36]={ ["type"]=10, @@ -552,7 +552,7 @@ local task = { } }, ["lock"]=4, - ["icon"]="10" + ["icon"]="7" }, [37]={ ["type"]=10, @@ -568,7 +568,7 @@ local task = { } }, ["lock"]=4, - ["icon"]="10" + ["icon"]="7" }, [38]={ ["type"]=10, @@ -583,7 +583,7 @@ local task = { ["num_for_nothing"]="Vwhc" } }, - ["icon"]="10" + ["icon"]="7" }, [39]={ ["type"]=10, @@ -598,7 +598,7 @@ local task = { ["num_for_nothing"]="Vw1c" } }, - ["icon"]="10" + ["icon"]="7" }, [40]={ ["type"]=11, @@ -614,7 +614,7 @@ local task = { } }, ["lock"]=5, - ["icon"]="11" + ["icon"]="7" }, [41]={ ["type"]=11, @@ -630,7 +630,7 @@ local task = { } }, ["lock"]=5, - ["icon"]="11" + ["icon"]="7" }, [42]={ ["type"]=11, @@ -646,7 +646,7 @@ local task = { } }, ["lock"]=5, - ["icon"]="11" + ["icon"]="7" }, [43]={ ["type"]=11, @@ -662,7 +662,7 @@ local task = { } }, ["lock"]=5, - ["icon"]="11" + ["icon"]="7" }, [44]={ ["type"]=12, @@ -677,7 +677,7 @@ local task = { ["num_for_nothing"]="Uwg=" } }, - ["icon"]="12" + ["icon"]="9" }, [45]={ ["type"]=12, @@ -692,7 +692,7 @@ local task = { ["num_for_nothing"]="UQ0=" } }, - ["icon"]="12" + ["icon"]="9" }, [46]={ ["type"]=12, @@ -707,7 +707,7 @@ local task = { ["num_for_nothing"]="Vwhc" } }, - ["icon"]="12" + ["icon"]="9" }, [47]={ ["type"]=12, @@ -722,7 +722,7 @@ local task = { ["num_for_nothing"]="Vw1c" } }, - ["icon"]="12" + ["icon"]="9" }, [48]={ ["type"]=13, @@ -737,7 +737,7 @@ local task = { ["num_for_nothing"]="Uwg=" } }, - ["icon"]="13" + ["icon"]="9" }, [49]={ ["type"]=13, @@ -752,7 +752,7 @@ local task = { ["num_for_nothing"]="UQ0=" } }, - ["icon"]="13" + ["icon"]="9" }, [50]={ ["type"]=13, @@ -767,7 +767,7 @@ local task = { ["num_for_nothing"]="Vwhc" } }, - ["icon"]="13" + ["icon"]="9" }, [51]={ ["type"]=13, @@ -782,7 +782,7 @@ local task = { ["num_for_nothing"]="Vw1c" } }, - ["icon"]="13" + ["icon"]="9" }, [52]={ ["type"]=14, @@ -797,7 +797,7 @@ local task = { ["num_for_nothing"]="Uwg=" } }, - ["icon"]="14" + ["icon"]="8" }, [53]={ ["type"]=14, @@ -812,7 +812,7 @@ local task = { ["num_for_nothing"]="UQ0=" } }, - ["icon"]="14" + ["icon"]="8" }, [54]={ ["type"]=14, @@ -827,7 +827,7 @@ local task = { ["num_for_nothing"]="Vwhc" } }, - ["icon"]="14" + ["icon"]="8" }, [55]={ ["type"]=14, @@ -842,7 +842,7 @@ local task = { ["num_for_nothing"]="Vw1c" } }, - ["icon"]="14" + ["icon"]="8" }, [56]={ ["type"]=15, @@ -857,7 +857,7 @@ local task = { ["num_for_nothing"]="Uwg=" } }, - ["icon"]="15" + ["icon"]="8" }, [57]={ ["type"]=15, @@ -872,7 +872,7 @@ local task = { ["num_for_nothing"]="UQ0=" } }, - ["icon"]="15" + ["icon"]="8" }, [58]={ ["type"]=15, @@ -887,7 +887,7 @@ local task = { ["num_for_nothing"]="Vwhc" } }, - ["icon"]="15" + ["icon"]="8" }, [59]={ ["type"]=15, @@ -902,7 +902,7 @@ local task = { ["num_for_nothing"]="Vw1c" } }, - ["icon"]="15" + ["icon"]="8" }, [60]={ ["type"]=16, @@ -917,7 +917,7 @@ local task = { ["num_for_nothing"]="Uwg=" } }, - ["icon"]="16" + ["icon"]="8" }, [61]={ ["type"]=16, @@ -932,7 +932,7 @@ local task = { ["num_for_nothing"]="UQ0=" } }, - ["icon"]="16" + ["icon"]="8" }, [62]={ ["type"]=16, @@ -947,7 +947,7 @@ local task = { ["num_for_nothing"]="Vwhc" } }, - ["icon"]="16" + ["icon"]="8" }, [63]={ ["type"]=16, @@ -962,7 +962,7 @@ local task = { ["num_for_nothing"]="Vw1c" } }, - ["icon"]="16" + ["icon"]="8" }, [64]={ ["type"]=17, @@ -977,7 +977,7 @@ local task = { ["num_for_nothing"]="Uwg=" } }, - ["icon"]="17" + ["icon"]="8" }, [65]={ ["type"]=17, @@ -992,7 +992,7 @@ local task = { ["num_for_nothing"]="UQ0=" } }, - ["icon"]="17" + ["icon"]="8" }, [66]={ ["type"]=17, @@ -1007,7 +1007,7 @@ local task = { ["num_for_nothing"]="Vwhc" } }, - ["icon"]="17" + ["icon"]="8" }, [67]={ ["type"]=17, @@ -1022,7 +1022,7 @@ local task = { ["num_for_nothing"]="Vw1c" } }, - ["icon"]="17" + ["icon"]="8" }, [68]={ ["type"]=18, @@ -1037,7 +1037,7 @@ local task = { ["num_for_nothing"]="Uwg=" } }, - ["icon"]="18" + ["icon"]="8" }, [69]={ ["type"]=18, @@ -1052,7 +1052,7 @@ local task = { ["num_for_nothing"]="UQ0=" } }, - ["icon"]="18" + ["icon"]="8" }, [70]={ ["type"]=18, @@ -1067,7 +1067,7 @@ local task = { ["num_for_nothing"]="Vwhc" } }, - ["icon"]="18" + ["icon"]="8" }, [71]={ ["type"]=18, @@ -1082,7 +1082,7 @@ local task = { ["num_for_nothing"]="Vw1c" } }, - ["icon"]="18" + ["icon"]="8" }, [72]={ ["type"]=19, @@ -1097,7 +1097,7 @@ local task = { ["num_for_nothing"]="Uwg=" } }, - ["icon"]="19" + ["icon"]="9" }, [73]={ ["type"]=19, @@ -1112,7 +1112,7 @@ local task = { ["num_for_nothing"]="UQ0=" } }, - ["icon"]="19" + ["icon"]="9" }, [74]={ ["type"]=19, @@ -1127,7 +1127,7 @@ local task = { ["num_for_nothing"]="Vwhc" } }, - ["icon"]="19" + ["icon"]="9" }, [75]={ ["type"]=19, @@ -1142,7 +1142,7 @@ local task = { ["num_for_nothing"]="Vw1c" } }, - ["icon"]="19" + ["icon"]="9" }, [76]={ ["type"]=2, @@ -1157,7 +1157,7 @@ local task = { ["num_for_nothing"]="Vwhc" } }, - ["icon"]="2" + ["icon"]="1" }, [77]={ ["type"]=3, @@ -1172,7 +1172,7 @@ local task = { ["num_for_nothing"]="Vw1c" } }, - ["icon"]="3" + ["icon"]="2" }, [78]={ ["type"]=5, @@ -1187,7 +1187,7 @@ local task = { ["num_for_nothing"]="Vw1c" } }, - ["icon"]="5" + ["icon"]="2" }, [79]={ ["type"]=6, @@ -1202,7 +1202,7 @@ local task = { ["num_for_nothing"]="Vw1c" } }, - ["icon"]="6" + ["icon"]="3" }, [80]={ ["type"]=7, @@ -1218,7 +1218,7 @@ local task = { } }, ["lock"]=10, - ["icon"]="7" + ["icon"]="4" }, [81]={ ["type"]=8, @@ -1234,7 +1234,7 @@ local task = { } }, ["lock"]=5, - ["icon"]="8" + ["icon"]="5" }, [82]={ ["type"]=9, @@ -1265,7 +1265,7 @@ local task = { } }, ["lock"]=4, - ["icon"]="10" + ["icon"]="7" }, [84]={ ["type"]=11, @@ -1281,7 +1281,7 @@ local task = { } }, ["lock"]=5, - ["icon"]="11" + ["icon"]="7" }, [85]={ ["type"]=12, @@ -1296,7 +1296,7 @@ local task = { ["num_for_nothing"]="Vw1c" } }, - ["icon"]="12" + ["icon"]="9" }, [86]={ ["type"]=13, @@ -1311,7 +1311,7 @@ local task = { ["num_for_nothing"]="Vw1c" } }, - ["icon"]="13" + ["icon"]="9" }, [87]={ ["type"]=14, @@ -1326,7 +1326,7 @@ local task = { ["num_for_nothing"]="Vw1c" } }, - ["icon"]="14" + ["icon"]="8" }, [88]={ ["type"]=15, @@ -1341,7 +1341,7 @@ local task = { ["num_for_nothing"]="Vwhc" } }, - ["icon"]="15" + ["icon"]="8" }, [89]={ ["type"]=16, @@ -1356,7 +1356,7 @@ local task = { ["num_for_nothing"]="Vw1c" } }, - ["icon"]="16" + ["icon"]="8" }, [90]={ ["type"]=17, @@ -1371,7 +1371,7 @@ local task = { ["num_for_nothing"]="Vw1c" } }, - ["icon"]="17" + ["icon"]="8" }, [91]={ ["type"]=18, @@ -1386,7 +1386,7 @@ local task = { ["num_for_nothing"]="Vwhc" } }, - ["icon"]="18" + ["icon"]="8" }, [92]={ ["type"]=19, @@ -1401,7 +1401,7 @@ local task = { ["num_for_nothing"]="Vw1c" } }, - ["icon"]="19" + ["icon"]="9" } } local config = { diff --git a/lua/app/config/task_daily_challenge.lua b/lua/app/config/task_daily_challenge.lua index d8eead79..36c5adba 100644 --- a/lua/app/config/task_daily_challenge.lua +++ b/lua/app/config/task_daily_challenge.lua @@ -112,7 +112,7 @@ local task_daily_challenge = { ["number"]=3 }, [6]={ - ["param"]=10, + ["param"]=1, ["reward"]={ { ["type"]=1, diff --git a/lua/app/config/tutorial.lua b/lua/app/config/tutorial.lua index ecc3eecb..ee367a4b 100644 --- a/lua/app/config/tutorial.lua +++ b/lua/app/config/tutorial.lua @@ -43,8 +43,9 @@ local tutorial = { 13, 14, 24, - 34, - 44 + 33, + 44, + 45 } }, [10040]={ @@ -61,8 +62,7 @@ local tutorial = { 13, 14, 24, - 34, - 44 + 34 } }, [10060]={ @@ -78,8 +78,7 @@ local tutorial = { 13, 14, 24, - 34, - 44 + 34 } }, [20000]={ diff --git a/lua/app/module/battle/controller/battle_controller.lua b/lua/app/module/battle/controller/battle_controller.lua index 9db26a45..763dde64 100644 --- a/lua/app/module/battle/controller/battle_controller.lua +++ b/lua/app/module/battle/controller/battle_controller.lua @@ -156,9 +156,11 @@ function BattleController:onLinkChange() end end - local aniSequence, influenceElementType, lineCount, elementTypeMap, linkElementType = self:calculateCurElimination(true) + if not self.atkTeam:getMainUnit().unitEntity:getActiveSkillLimit() then + local aniSequence, influenceElementType, lineCount, elementTypeMap, linkElementType = self:calculateCurElimination(true) + self.battleUI:refreshSkill(elementTypeMap, count > 0) + end - self.battleUI:refreshSkill(elementTypeMap, count > 0) if mainElementType then self.atkTeam:changeMainUnit(mainElementType) end @@ -910,7 +912,9 @@ function BattleController:onLinkOver() local aniSequence, influenceElementTypeMap, lineCount, elementTypeMap, linkElementType, effectGridMap = self:calculateCurElimination() - self.battleData:addSkillEnergy(elementTypeMap) + if not self.atkTeam:getMainUnit().unitEntity:getActiveSkillLimit() then + self.battleData:addSkillEnergy(elementTypeMap) + end self.battleData:clearGridSequence() self.battleUI:disableUITouch() self.battleUI:eliminationAni(aniSequence, effectGridMap, function() diff --git a/lua/app/module/battle/helper/battle_buff_special.lua b/lua/app/module/battle/helper/battle_buff_special.lua index 64967a97..76db1ebb 100644 --- a/lua/app/module/battle/helper/battle_buff_special.lua +++ b/lua/app/module/battle/helper/battle_buff_special.lua @@ -57,11 +57,17 @@ local function _undeadOff(buffSender, target, buff, buffEffect) end local function _imprisonOn(buffSender, buff, target, buffEffect) + if target.side == GConst.BattleConst.SIDE_ATK then + DataManager.BattleData:lockAllSkillGrid(true) + end target.unitEntity:addActiveSkillLimit(buff:getName()) return 1 end local function _imprisonOff(buffSender, target, buff, buffEffect) + if target.side == GConst.BattleConst.SIDE_ATK then + DataManager.BattleData:lockAllSkillGrid(false) + end target.unitEntity:removeActiveSkillLimit(buff:getName()) return 1 end diff --git a/lua/app/module/battle/team/battle_team.lua b/lua/app/module/battle/team/battle_team.lua index 96079779..9682aa24 100644 --- a/lua/app/module/battle/team/battle_team.lua +++ b/lua/app/module/battle/team/battle_team.lua @@ -532,7 +532,6 @@ function BattleTeam:setCentralizedAttack(centralizedAttack) end function BattleTeam:setIsFinalBlock(isFinalBlock) - Logger.logHighlight(isFinalBlock) if not self.isFinalBlock and not isFinalBlock then return end diff --git a/lua/app/userdata/battle/battle_data.lua b/lua/app/userdata/battle/battle_data.lua index 400ebf0a..3555f1d6 100644 --- a/lua/app/userdata/battle/battle_data.lua +++ b/lua/app/userdata/battle/battle_data.lua @@ -343,6 +343,22 @@ function BattleData:setGridType(posId, gridType) entity:determineIdleStatus() end +function BattleData:lockAllSkillGrid(lock) + if not self.gridEntities then + return + end + + for posId, entity in pairs(self.gridEntities) do + if entity:getSkillId() then + local gridType = GConst.BattleConst.GRID_TYPE.EMPTY + if lock then + gridType = GConst.BattleConst.GRID_TYPE.LOCK + end + self:setGridType(posId, gridType) + end + end +end + function BattleData:getSkillEntities() return self.skillMap end