From 518aabb82992338f6725fe0fa551f03ae173c3f9 Mon Sep 17 00:00:00 2001 From: xiekaidong Date: Mon, 8 May 2023 16:31:44 +0800 Subject: [PATCH 01/23] =?UTF-8?q?buff=E5=8F=A0=E5=8A=A0=E6=9C=BA=E5=88=B6?= =?UTF-8?q?=E5=92=8C=E7=84=B6=E7=83=A7buff?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/app/config/buff.lua | 10 +++- lua/app/config/chapter.lua | 3 + lua/app/config/skill.lua | 6 ++ lua/app/module/battle/battle_const.lua | 6 ++ .../battle/component/battle_unit_comp.lua | 4 +- .../module/battle/helper/battle_formula.lua | 5 ++ lua/app/module/battle/team/battle_team.lua | 57 +++++++++++++++++-- .../battle/skill/battle_buff_entity.lua | 4 ++ 8 files changed, 87 insertions(+), 8 deletions(-) diff --git a/lua/app/config/buff.lua b/lua/app/config/buff.lua index 9445d96d..e06d61bf 100644 --- a/lua/app/config/buff.lua +++ b/lua/app/config/buff.lua @@ -252,6 +252,11 @@ local buff = { ["fx_disappear"]={ 14 } + }, + [47]={ + ["name"]="burn", + ["buff_type"]=4, + ["formula"]=4 } } local keys = { @@ -301,12 +306,13 @@ local keys = { ["cured_add"]=buff[43], ["add_skill"]=buff[44], ["skill_fire_times"]=buff[45], - ["shield_rebound_200"]=buff[46] + ["shield_rebound_200"]=buff[46], + ["burn"]=buff[47] } } local config = { data=buff, keys=keys, -count=46 +count=47 } return config \ No newline at end of file diff --git a/lua/app/config/chapter.lua b/lua/app/config/chapter.lua index 5978fb60..8d706b94 100644 --- a/lua/app/config/chapter.lua +++ b/lua/app/config/chapter.lua @@ -96,6 +96,9 @@ local chapter = { 3 }, ["seal_element"]={ + 1, + 3, + 4, 5 }, ["not_involved_skill"]={ diff --git a/lua/app/config/skill.lua b/lua/app/config/skill.lua index 50c76ab6..f962ab54 100644 --- a/lua/app/config/skill.lua +++ b/lua/app/config/skill.lua @@ -336,6 +336,12 @@ local skill = { ["num"]=40000, ["ratio"]=10000, ["round"]=0 + }, + { + ["type"]="burn", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=2 } }, ["obj"]=2, diff --git a/lua/app/module/battle/battle_const.lua b/lua/app/module/battle/battle_const.lua index f50c61c6..9c217e0f 100644 --- a/lua/app/module/battle/battle_const.lua +++ b/lua/app/module/battle/battle_const.lua @@ -90,6 +90,12 @@ BattleConst.BUFF_TYPE = { DIRECT_HURT = 3 } +BattleConst.BUFF_STACK_TYPE = { + CANT_ADD = 0, + ADD_ROUND = 1, + ADD = 2 +} + BattleConst.SKILL_MOVE_TYPE = { MOVE = 1, -- 移动到目标跟前使用 STAND = 2, -- 原地使用 diff --git a/lua/app/module/battle/component/battle_unit_comp.lua b/lua/app/module/battle/component/battle_unit_comp.lua index 25d3188f..c5f1ceac 100644 --- a/lua/app/module/battle/component/battle_unit_comp.lua +++ b/lua/app/module/battle/component/battle_unit_comp.lua @@ -1067,7 +1067,7 @@ function BattleUnitComp:addMaxHp(percent) end function BattleUnitComp:addBuff(buffEffect) - self.team:addBuff(buffEffect) + return self.team:addBuff(buffEffect) end function BattleUnitComp:updateBuffState(buff, num) @@ -1151,7 +1151,7 @@ function BattleUnitComp:takeEffect(buff, target) buffEffect.round = round buffEffect.target = target buffEffect.sender = self - target:addBuff(buffEffect) + buffEffect = target:addBuff(buffEffect) end local func = BattleBuffHandle.takeBuffEffect[buff:getBuffType()] if func then diff --git a/lua/app/module/battle/helper/battle_formula.lua b/lua/app/module/battle/helper/battle_formula.lua index 03f9e73e..e5b67f9f 100644 --- a/lua/app/module/battle/helper/battle_formula.lua +++ b/lua/app/module/battle/helper/battle_formula.lua @@ -39,6 +39,11 @@ BattleFormula.calculateFormula = { [3] = function(unitComp, buff, targetUnit) local result = unitComp.unitEntity:getAtk() * buff:getEffectNum() // DEFAULT_FACTOR * (unitComp.unitEntity:getCureAddition() + DEFAULT_FACTOR) // DEFAULT_FACTOR return result, 0 + end, + -- buff释放方攻击力*技能倍率 + [4] = function(unitComp, buff, targetUnit) + local result = unitComp.unitEntity:getAtk() * buff:getEffectNum() // DEFAULT_FACTOR + return result, 0 end } diff --git a/lua/app/module/battle/team/battle_team.lua b/lua/app/module/battle/team/battle_team.lua index 41253e69..ec1ee9c0 100644 --- a/lua/app/module/battle/team/battle_team.lua +++ b/lua/app/module/battle/team/battle_team.lua @@ -228,11 +228,60 @@ function BattleTeam:handleShield(reduceShield, unit) end function BattleTeam:addBuff(buffEffect) - table.insert(self.buffList, buffEffect) - self:updateBuffState(buffEffect.buff, 1) - if buffEffect.buff:getIcon() then - self.battleController:refreshBuff(self.side, self.buffList) + local stack = buffEffect.buff:getStack() + local needRecycle + if not stack or stack == BattleConst.BUFF_STACK_TYPE.CANT_ADD then + local buffName = buffEffect.buff:getName() + local buffNum = self.sameBuffCount[buffName] + if buffNum and buffNum > 0 then + for _, bEffect in ipairs(self.buffList) do + if bEffect.buff:getName() == buffName then + if bEffect.round < buffEffect.round then + bEffect.round = buffEffect.round + for fieldName, v in pairs(bEffect) do + if fieldName ~= "buff" and fieldName ~= "round" then + bEffect[fieldName] = buffEffect[fieldName] + end + end + needRecycle = bEffect + break + end + end + end + end + elseif stack == BattleConst.BUFF_STACK_TYPE.ADD_ROUND then + local buffName = buffEffect.buff:getName() + local buffNum = self.sameBuffCount[buffName] + if buffNum and buffNum > 0 then + for _, bEffect in ipairs(self.buffList) do + if bEffect.buff:getName() == buffName then + bEffect.round = bEffect.round + buffEffect.round + for fieldName, v in pairs(bEffect) do + if fieldName ~= "buff" and fieldName ~= "round" then + bEffect[fieldName] = buffEffect[fieldName] + end + end + needRecycle = bEffect + break + end + end + end + elseif stack == BattleConst.BUFF_STACK_TYPE.ADD then end + + if needRecycle then + BattleHelper:recycleBuffEffect(buffEffect) + else + table.insert(self.buffList, buffEffect) + self:updateBuffState(buffEffect.buff, 1) + if buffEffect.buff:getIcon() then + self.battleController:refreshBuff(self.side, self.buffList) + end + + needRecycle = buffEffect + end + + return needRecycle end function BattleTeam:removeAllBuff() diff --git a/lua/app/userdata/battle/skill/battle_buff_entity.lua b/lua/app/userdata/battle/skill/battle_buff_entity.lua index 7bdc6a5e..d6694ada 100644 --- a/lua/app/userdata/battle/skill/battle_buff_entity.lua +++ b/lua/app/userdata/battle/skill/battle_buff_entity.lua @@ -81,6 +81,10 @@ function BattleBuffEntity:setTargetSide(side) self.targetSide = side end +function BattleBuffEntity:getStack() + return self.buffInfo.stack +end + function BattleBuffEntity:getIcon() return self.buffInfo.icon end From 187a7ee6bda0a665a9593e4aca42443049b80b55 Mon Sep 17 00:00:00 2001 From: xiekaidong Date: Tue, 9 May 2023 15:15:07 +0800 Subject: [PATCH 02/23] =?UTF-8?q?=E7=81=BC=E7=83=A7=E3=80=81=E6=98=93?= =?UTF-8?q?=E4=BC=A4=E3=80=81=E4=B8=AD=E6=AF=92=E3=80=81=E8=85=90=E8=B4=A5?= =?UTF-8?q?=E3=80=81=E5=89=8A=E5=BC=B1=E3=80=81=E8=AF=85=E5=92=92buff?= =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/app/config/act_chapter_store.lua | 1206 ++++++ lua/app/config/act_chapter_store.lua.meta | 10 + lua/app/config/act_gift.lua | 20 + lua/app/config/act_gift.lua.meta | 10 + lua/app/config/act_growup_gift.lua | 336 ++ lua/app/config/act_growup_gift.lua.meta | 10 + lua/app/config/bounty_level.lua | 3246 +++++++++++++++++ lua/app/config/bounty_level.lua.meta | 10 + lua/app/config/bounty_time.lua | 16 + lua/app/config/bounty_time.lua.meta | 10 + lua/app/config/buff.lua | 307 +- lua/app/config/const.lua | 38 +- lua/app/config/func_open.lua | 5 +- lua/app/config/item.lua | 19 +- .../localization_global_const.lua | 13 + lua/app/config/player_initial.lua | 16 +- lua/app/config/recharge.lua | 24 +- lua/app/config/strings/cn/buff.lua | 6 +- lua/app/config/strings/cn/global.lua | 13 + lua/app/config/strings/cn/item.lua | 6 +- lua/app/config/strings/de/buff.lua | 6 +- lua/app/config/strings/de/item.lua | 5 +- lua/app/config/strings/en/buff.lua | 6 +- lua/app/config/strings/en/item.lua | 5 +- lua/app/config/strings/fr/buff.lua | 6 +- lua/app/config/strings/fr/item.lua | 5 +- lua/app/config/strings/id/buff.lua | 6 +- lua/app/config/strings/id/item.lua | 5 +- lua/app/config/strings/ja/buff.lua | 6 +- lua/app/config/strings/ja/item.lua | 5 +- lua/app/config/strings/ko/buff.lua | 6 +- lua/app/config/strings/ko/item.lua | 5 +- lua/app/config/strings/pt/buff.lua | 6 +- lua/app/config/strings/pt/item.lua | 5 +- lua/app/config/strings/ru/buff.lua | 6 +- lua/app/config/strings/ru/item.lua | 5 +- lua/app/config/strings/th/buff.lua | 6 +- lua/app/config/strings/th/item.lua | 5 +- lua/app/config/strings/vi/buff.lua | 6 +- lua/app/config/strings/vi/item.lua | 5 +- lua/app/config/strings/zh/buff.lua | 6 +- lua/app/config/strings/zh/item.lua | 5 +- lua/app/config/task.lua | 1324 +++++++ lua/app/config/task.lua.meta | 10 + lua/app/config/task_daily.lua | 712 ++++ lua/app/config/task_daily.lua.meta | 10 + lua/app/module/battle/battle_const.lua | 36 + .../battle/component/battle_unit_comp.lua | 6 + .../module/battle/helper/battle_formula.lua | 16 +- .../battle/team/battle_team_entity.lua | 16 +- .../battle/team/battle_unit_entity.lua | 16 +- 51 files changed, 7476 insertions(+), 112 deletions(-) create mode 100644 lua/app/config/act_chapter_store.lua create mode 100644 lua/app/config/act_chapter_store.lua.meta create mode 100644 lua/app/config/act_gift.lua create mode 100644 lua/app/config/act_gift.lua.meta create mode 100644 lua/app/config/act_growup_gift.lua create mode 100644 lua/app/config/act_growup_gift.lua.meta create mode 100644 lua/app/config/bounty_level.lua create mode 100644 lua/app/config/bounty_level.lua.meta create mode 100644 lua/app/config/bounty_time.lua create mode 100644 lua/app/config/bounty_time.lua.meta create mode 100644 lua/app/config/task.lua create mode 100644 lua/app/config/task.lua.meta create mode 100644 lua/app/config/task_daily.lua create mode 100644 lua/app/config/task_daily.lua.meta diff --git a/lua/app/config/act_chapter_store.lua b/lua/app/config/act_chapter_store.lua new file mode 100644 index 00000000..1f3a9fe4 --- /dev/null +++ b/lua/app/config/act_chapter_store.lua @@ -0,0 +1,1206 @@ +local act_chapter_store = { + [103]={ + ["chapter"]=1, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=3000, + ["num_for_nothing"]="VQhcAw==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=4, + ["id_for_nothing"]="Ug==", + ["num"]=25, + ["num_for_nothing"]="VA0=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=8, + ["num_for_nothing"]="Xg==" + } + }, + ["original"]=4, + ["recharge_id"]=2, + ["value"]=10 + }, + [203]={ + ["chapter"]=2, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=3000, + ["num_for_nothing"]="VQhcAw==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=4, + ["id_for_nothing"]="Ug==", + ["num"]=25, + ["num_for_nothing"]="VA0=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=8, + ["num_for_nothing"]="Xg==" + } + }, + ["original"]=4, + ["recharge_id"]=2, + ["value"]=10 + }, + [303]={ + ["chapter"]=3, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=3000, + ["num_for_nothing"]="VQhcAw==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=4, + ["id_for_nothing"]="Ug==", + ["num"]=25, + ["num_for_nothing"]="VA0=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=8, + ["num_for_nothing"]="Xg==" + } + }, + ["original"]=4, + ["recharge_id"]=2, + ["value"]=10 + }, + [403]={ + ["chapter"]=4, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=3000, + ["num_for_nothing"]="VQhcAw==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=4, + ["id_for_nothing"]="Ug==", + ["num"]=25, + ["num_for_nothing"]="VA0=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=8, + ["num_for_nothing"]="Xg==" + } + }, + ["original"]=5, + ["recharge_id"]=3, + ["value"]=9 + }, + [503]={ + ["chapter"]=5, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=3000, + ["num_for_nothing"]="VQhcAw==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=4, + ["id_for_nothing"]="Ug==", + ["num"]=25, + ["num_for_nothing"]="VA0=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=8, + ["num_for_nothing"]="Xg==" + } + }, + ["original"]=5, + ["recharge_id"]=3, + ["value"]=9 + }, + [603]={ + ["chapter"]=6, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=3000, + ["num_for_nothing"]="VQhcAw==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=4, + ["id_for_nothing"]="Ug==", + ["num"]=25, + ["num_for_nothing"]="VA0=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=8, + ["num_for_nothing"]="Xg==" + } + }, + ["original"]=5, + ["recharge_id"]=3, + ["value"]=9 + }, + [703]={ + ["chapter"]=7, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=3000, + ["num_for_nothing"]="VQhcAw==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=4, + ["id_for_nothing"]="Ug==", + ["num"]=25, + ["num_for_nothing"]="VA0=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=8, + ["num_for_nothing"]="Xg==" + } + }, + ["original"]=6, + ["recharge_id"]=4, + ["value"]=8 + }, + [803]={ + ["chapter"]=8, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=3000, + ["num_for_nothing"]="VQhcAw==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=4, + ["id_for_nothing"]="Ug==", + ["num"]=25, + ["num_for_nothing"]="VA0=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=8, + ["num_for_nothing"]="Xg==" + } + }, + ["original"]=6, + ["recharge_id"]=4, + ["value"]=8 + }, + [903]={ + ["chapter"]=9, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=3000, + ["num_for_nothing"]="VQhcAw==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=4, + ["id_for_nothing"]="Ug==", + ["num"]=25, + ["num_for_nothing"]="VA0=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=8, + ["num_for_nothing"]="Xg==" + } + }, + ["original"]=6, + ["recharge_id"]=4, + ["value"]=8 + }, + [1003]={ + ["chapter"]=10, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=3000, + ["num_for_nothing"]="VQhcAw==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=4, + ["id_for_nothing"]="Ug==", + ["num"]=25, + ["num_for_nothing"]="VA0=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=8, + ["num_for_nothing"]="Xg==" + } + }, + ["original"]=6, + ["recharge_id"]=4, + ["value"]=8 + }, + [1103]={ + ["chapter"]=11, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=3000, + ["num_for_nothing"]="VQhcAw==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=4, + ["id_for_nothing"]="Ug==", + ["num"]=25, + ["num_for_nothing"]="VA0=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=8, + ["num_for_nothing"]="Xg==" + } + }, + ["original"]=7, + ["recharge_id"]=5, + ["value"]=8 + }, + [1203]={ + ["chapter"]=12, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=3000, + ["num_for_nothing"]="VQhcAw==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=4, + ["id_for_nothing"]="Ug==", + ["num"]=25, + ["num_for_nothing"]="VA0=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=8, + ["num_for_nothing"]="Xg==" + } + }, + ["original"]=7, + ["recharge_id"]=5, + ["value"]=8 + }, + [1303]={ + ["chapter"]=13, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=3000, + ["num_for_nothing"]="VQhcAw==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=4, + ["id_for_nothing"]="Ug==", + ["num"]=25, + ["num_for_nothing"]="VA0=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=8, + ["num_for_nothing"]="Xg==" + } + }, + ["original"]=7, + ["recharge_id"]=5, + ["value"]=8 + }, + [1403]={ + ["chapter"]=14, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=3000, + ["num_for_nothing"]="VQhcAw==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=4, + ["id_for_nothing"]="Ug==", + ["num"]=25, + ["num_for_nothing"]="VA0=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=8, + ["num_for_nothing"]="Xg==" + } + }, + ["original"]=7, + ["recharge_id"]=5, + ["value"]=8 + }, + [1503]={ + ["chapter"]=15, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=3000, + ["num_for_nothing"]="VQhcAw==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=4, + ["id_for_nothing"]="Ug==", + ["num"]=25, + ["num_for_nothing"]="VA0=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=8, + ["num_for_nothing"]="Xg==" + } + }, + ["original"]=7, + ["recharge_id"]=5, + ["value"]=8 + }, + [1603]={ + ["chapter"]=16, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=3000, + ["num_for_nothing"]="VQhcAw==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=4, + ["id_for_nothing"]="Ug==", + ["num"]=25, + ["num_for_nothing"]="VA0=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=8, + ["num_for_nothing"]="Xg==" + } + }, + ["original"]=7, + ["recharge_id"]=5, + ["value"]=8 + }, + [1703]={ + ["chapter"]=17, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=3000, + ["num_for_nothing"]="VQhcAw==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=4, + ["id_for_nothing"]="Ug==", + ["num"]=25, + ["num_for_nothing"]="VA0=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=8, + ["num_for_nothing"]="Xg==" + } + }, + ["original"]=7, + ["recharge_id"]=5, + ["value"]=8 + }, + [1803]={ + ["chapter"]=18, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=3000, + ["num_for_nothing"]="VQhcAw==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=4, + ["id_for_nothing"]="Ug==", + ["num"]=25, + ["num_for_nothing"]="VA0=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=8, + ["num_for_nothing"]="Xg==" + } + }, + ["original"]=7, + ["recharge_id"]=5, + ["value"]=8 + }, + [1903]={ + ["chapter"]=19, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=3000, + ["num_for_nothing"]="VQhcAw==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=4, + ["id_for_nothing"]="Ug==", + ["num"]=25, + ["num_for_nothing"]="VA0=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=8, + ["num_for_nothing"]="Xg==" + } + }, + ["original"]=7, + ["recharge_id"]=5, + ["value"]=8 + }, + [2003]={ + ["chapter"]=20, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=3000, + ["num_for_nothing"]="VQhcAw==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=4, + ["id_for_nothing"]="Ug==", + ["num"]=25, + ["num_for_nothing"]="VA0=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=8, + ["num_for_nothing"]="Xg==" + } + }, + ["original"]=7, + ["recharge_id"]=5, + ["value"]=8 + }, + [2103]={ + ["chapter"]=21, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=3000, + ["num_for_nothing"]="VQhcAw==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=4, + ["id_for_nothing"]="Ug==", + ["num"]=25, + ["num_for_nothing"]="VA0=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=8, + ["num_for_nothing"]="Xg==" + } + }, + ["original"]=8, + ["recharge_id"]=6, + ["value"]=8 + }, + [2203]={ + ["chapter"]=22, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=3000, + ["num_for_nothing"]="VQhcAw==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=4, + ["id_for_nothing"]="Ug==", + ["num"]=25, + ["num_for_nothing"]="VA0=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=8, + ["num_for_nothing"]="Xg==" + } + }, + ["original"]=8, + ["recharge_id"]=6, + ["value"]=8 + }, + [2303]={ + ["chapter"]=23, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=3000, + ["num_for_nothing"]="VQhcAw==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=4, + ["id_for_nothing"]="Ug==", + ["num"]=25, + ["num_for_nothing"]="VA0=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=8, + ["num_for_nothing"]="Xg==" + } + }, + ["original"]=8, + ["recharge_id"]=6, + ["value"]=8 + }, + [2403]={ + ["chapter"]=24, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=3000, + ["num_for_nothing"]="VQhcAw==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=4, + ["id_for_nothing"]="Ug==", + ["num"]=25, + ["num_for_nothing"]="VA0=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=8, + ["num_for_nothing"]="Xg==" + } + }, + ["original"]=8, + ["recharge_id"]=6, + ["value"]=8 + }, + [2503]={ + ["chapter"]=25, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=3000, + ["num_for_nothing"]="VQhcAw==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=4, + ["id_for_nothing"]="Ug==", + ["num"]=25, + ["num_for_nothing"]="VA0=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=8, + ["num_for_nothing"]="Xg==" + } + }, + ["original"]=8, + ["recharge_id"]=6, + ["value"]=8 + }, + [2603]={ + ["chapter"]=26, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=3000, + ["num_for_nothing"]="VQhcAw==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=4, + ["id_for_nothing"]="Ug==", + ["num"]=25, + ["num_for_nothing"]="VA0=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=8, + ["num_for_nothing"]="Xg==" + } + }, + ["original"]=8, + ["recharge_id"]=6, + ["value"]=8 + }, + [2703]={ + ["chapter"]=27, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=3000, + ["num_for_nothing"]="VQhcAw==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=4, + ["id_for_nothing"]="Ug==", + ["num"]=25, + ["num_for_nothing"]="VA0=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=8, + ["num_for_nothing"]="Xg==" + } + }, + ["original"]=8, + ["recharge_id"]=6, + ["value"]=8 + }, + [2803]={ + ["chapter"]=28, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=3000, + ["num_for_nothing"]="VQhcAw==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=4, + ["id_for_nothing"]="Ug==", + ["num"]=25, + ["num_for_nothing"]="VA0=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=8, + ["num_for_nothing"]="Xg==" + } + }, + ["original"]=8, + ["recharge_id"]=6, + ["value"]=8 + }, + [2903]={ + ["chapter"]=29, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=3000, + ["num_for_nothing"]="VQhcAw==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=4, + ["id_for_nothing"]="Ug==", + ["num"]=25, + ["num_for_nothing"]="VA0=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=8, + ["num_for_nothing"]="Xg==" + } + }, + ["original"]=8, + ["recharge_id"]=6, + ["value"]=8 + }, + [3003]={ + ["chapter"]=30, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=3000, + ["num_for_nothing"]="VQhcAw==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=4, + ["id_for_nothing"]="Ug==", + ["num"]=25, + ["num_for_nothing"]="VA0=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=8, + ["num_for_nothing"]="Xg==" + } + }, + ["original"]=8, + ["recharge_id"]=6, + ["value"]=8 + } +} +local config = { +data=act_chapter_store,count=30 +} +return config \ No newline at end of file diff --git a/lua/app/config/act_chapter_store.lua.meta b/lua/app/config/act_chapter_store.lua.meta new file mode 100644 index 00000000..701fda05 --- /dev/null +++ b/lua/app/config/act_chapter_store.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: e1c21d8a7d40ea54bac5ddca0ef0eab8 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/config/act_gift.lua b/lua/app/config/act_gift.lua new file mode 100644 index 00000000..853ca841 --- /dev/null +++ b/lua/app/config/act_gift.lua @@ -0,0 +1,20 @@ +local act_gift = { + [10002]={ + ["type"]=7, + ["recharge_id"]=11, + ["time_type"]=3, + ["limit"]=1, + ["value"]=3000 + }, + [10102]={ + ["type"]=7, + ["recharge_id"]=12, + ["time_type"]=3, + ["limit"]=1, + ["value"]=25 + } +} +local config = { +data=act_gift,count=2 +} +return config \ No newline at end of file diff --git a/lua/app/config/act_gift.lua.meta b/lua/app/config/act_gift.lua.meta new file mode 100644 index 00000000..8cb7ccf6 --- /dev/null +++ b/lua/app/config/act_gift.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 5d4e36b21dd4c58408962b5a7f47a459 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/config/act_growup_gift.lua b/lua/app/config/act_growup_gift.lua new file mode 100644 index 00000000..0a45e470 --- /dev/null +++ b/lua/app/config/act_growup_gift.lua @@ -0,0 +1,336 @@ +local act_growup_gift = { + [1014]={ + ["hero_id"]=23001, + ["recharge_id"]=7, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=10000, + ["num_for_nothing"]="VwhcA2U=" + } + }, + ["time_type"]=1, + ["limit_time"]=3, + ["cd"]=12, + ["limit"]=1, + ["value"]=800 + }, + [1024]={ + ["hero_id"]=23001, + ["recharge_id"]=10, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=10000, + ["num_for_nothing"]="VwhcA2U=" + } + }, + ["time_type"]=1, + ["limit_time"]=3, + ["cd"]=12, + ["limit"]=1, + ["value"]=800 + }, + [1034]={ + ["hero_id"]=23001, + ["recharge_id"]=13, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=300, + ["num_for_nothing"]="VQhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=10000, + ["num_for_nothing"]="VwhcA2U=" + } + }, + ["time_type"]=1, + ["limit_time"]=3, + ["cd"]=12, + ["limit"]=1, + ["value"]=800 + }, + [1044]={ + ["hero_id"]=23001, + ["recharge_id"]=15, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=400, + ["num_for_nothing"]="Ughc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=10000, + ["num_for_nothing"]="VwhcA2U=" + } + }, + ["time_type"]=1, + ["limit_time"]=3, + ["cd"]=12, + ["limit"]=1, + ["value"]=800 + }, + [1054]={ + ["hero_id"]=23001, + ["recharge_id"]=17, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=10000, + ["num_for_nothing"]="VwhcA2U=" + } + }, + ["time_type"]=1, + ["limit_time"]=3, + ["cd"]=12, + ["limit"]=1, + ["value"]=800 + }, + [1064]={ + ["hero_id"]=23001, + ["recharge_id"]=18, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=600, + ["num_for_nothing"]="UAhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=10000, + ["num_for_nothing"]="VwhcA2U=" + } + }, + ["time_type"]=1, + ["limit_time"]=3, + ["cd"]=12, + ["limit"]=1, + ["value"]=800 + }, + [2014]={ + ["hero_id"]=43001, + ["recharge_id"]=7, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=10000, + ["num_for_nothing"]="VwhcA2U=" + } + }, + ["time_type"]=1, + ["limit_time"]=3, + ["cd"]=12, + ["limit"]=1, + ["value"]=800, + ["value_2"]=1 + }, + [2024]={ + ["hero_id"]=43001, + ["recharge_id"]=10, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=10000, + ["num_for_nothing"]="VwhcA2U=" + } + }, + ["time_type"]=1, + ["limit_time"]=3, + ["cd"]=12, + ["limit"]=1, + ["value"]=800, + ["value_2"]=1 + }, + [2034]={ + ["hero_id"]=43001, + ["recharge_id"]=13, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=300, + ["num_for_nothing"]="VQhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=10000, + ["num_for_nothing"]="VwhcA2U=" + } + }, + ["time_type"]=1, + ["limit_time"]=3, + ["cd"]=12, + ["limit"]=1, + ["value"]=800, + ["value_2"]=1 + }, + [2044]={ + ["hero_id"]=43001, + ["recharge_id"]=15, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=400, + ["num_for_nothing"]="Ughc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=10000, + ["num_for_nothing"]="VwhcA2U=" + } + }, + ["time_type"]=1, + ["limit_time"]=3, + ["cd"]=12, + ["limit"]=1, + ["value"]=800, + ["value_2"]=1 + }, + [2054]={ + ["hero_id"]=43001, + ["recharge_id"]=17, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=10000, + ["num_for_nothing"]="VwhcA2U=" + } + }, + ["time_type"]=1, + ["limit_time"]=3, + ["cd"]=12, + ["limit"]=1, + ["value"]=800, + ["value_2"]=1 + }, + [2064]={ + ["hero_id"]=43001, + ["recharge_id"]=18, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=600, + ["num_for_nothing"]="UAhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=10000, + ["num_for_nothing"]="VwhcA2U=" + } + }, + ["time_type"]=1, + ["limit_time"]=3, + ["cd"]=12, + ["limit"]=1, + ["value"]=800, + ["value_2"]=1 + } +} +local config = { +data=act_growup_gift,count=12 +} +return config \ No newline at end of file diff --git a/lua/app/config/act_growup_gift.lua.meta b/lua/app/config/act_growup_gift.lua.meta new file mode 100644 index 00000000..94dfdd0f --- /dev/null +++ b/lua/app/config/act_growup_gift.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 956a66427f61d674b86d5c5b729862d6 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/config/bounty_level.lua b/lua/app/config/bounty_level.lua new file mode 100644 index 00000000..aecab977 --- /dev/null +++ b/lua/app/config/bounty_level.lua @@ -0,0 +1,3246 @@ +local bounty_level = { + [101]={ + ["season"]=1, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [102]={ + ["season"]=1, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [103]={ + ["season"]=1, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1000, + ["num_for_nothing"]="VwhcAw==" + } + }, + [104]={ + ["season"]=1, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [105]={ + ["season"]=1, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [106]={ + ["season"]=1, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1000, + ["num_for_nothing"]="VwhcAw==" + } + }, + [107]={ + ["season"]=1, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [108]={ + ["season"]=1, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [109]={ + ["season"]=1, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1000, + ["num_for_nothing"]="VwhcAw==" + } + }, + [110]={ + ["season"]=1, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=6, + ["id_for_nothing"]="UA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + }, + ["reward_type"]=1 + }, + [111]={ + ["season"]=1, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [112]={ + ["season"]=1, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [113]={ + ["season"]=1, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1000, + ["num_for_nothing"]="VwhcAw==" + } + }, + [114]={ + ["season"]=1, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [115]={ + ["season"]=1, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [116]={ + ["season"]=1, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1000, + ["num_for_nothing"]="VwhcAw==" + } + }, + [117]={ + ["season"]=1, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [118]={ + ["season"]=1, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [119]={ + ["season"]=1, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1000, + ["num_for_nothing"]="VwhcAw==" + } + }, + [120]={ + ["season"]=1, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=6, + ["id_for_nothing"]="UA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + }, + ["reward_type"]=1 + }, + [121]={ + ["season"]=1, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [122]={ + ["season"]=1, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [123]={ + ["season"]=1, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1000, + ["num_for_nothing"]="VwhcAw==" + } + }, + [124]={ + ["season"]=1, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [125]={ + ["season"]=1, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [126]={ + ["season"]=1, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1000, + ["num_for_nothing"]="VwhcAw==" + } + }, + [127]={ + ["season"]=1, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [128]={ + ["season"]=1, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [129]={ + ["season"]=1, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1000, + ["num_for_nothing"]="VwhcAw==" + } + }, + [130]={ + ["season"]=1, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=6, + ["id_for_nothing"]="UA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + }, + ["reward_type"]=1 + }, + [131]={ + ["season"]=1, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [132]={ + ["season"]=1, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [133]={ + ["season"]=1, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1000, + ["num_for_nothing"]="VwhcAw==" + } + }, + [134]={ + ["season"]=1, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [135]={ + ["season"]=1, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [136]={ + ["season"]=1, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1000, + ["num_for_nothing"]="VwhcAw==" + } + }, + [137]={ + ["season"]=1, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [138]={ + ["season"]=1, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [139]={ + ["season"]=1, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1000, + ["num_for_nothing"]="VwhcAw==" + } + }, + [140]={ + ["season"]=1, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=6, + ["id_for_nothing"]="UA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + }, + ["reward_type"]=1 + }, + [141]={ + ["season"]=1, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [142]={ + ["season"]=1, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [143]={ + ["season"]=1, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1000, + ["num_for_nothing"]="VwhcAw==" + } + }, + [144]={ + ["season"]=1, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [145]={ + ["season"]=1, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [146]={ + ["season"]=1, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1000, + ["num_for_nothing"]="VwhcAw==" + } + }, + [147]={ + ["season"]=1, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [148]={ + ["season"]=1, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [149]={ + ["season"]=1, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1000, + ["num_for_nothing"]="VwhcAw==" + } + }, + [150]={ + ["season"]=1, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=6, + ["id_for_nothing"]="UA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + }, + ["reward_type"]=1 + }, + [151]={ + ["season"]=1, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [152]={ + ["season"]=1, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [153]={ + ["season"]=1, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1000, + ["num_for_nothing"]="VwhcAw==" + } + }, + [154]={ + ["season"]=1, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [155]={ + ["season"]=1, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [156]={ + ["season"]=1, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1000, + ["num_for_nothing"]="VwhcAw==" + } + }, + [157]={ + ["season"]=1, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [158]={ + ["season"]=1, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [159]={ + ["season"]=1, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1000, + ["num_for_nothing"]="VwhcAw==" + } + }, + [160]={ + ["season"]=1, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=6, + ["id_for_nothing"]="UA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + }, + ["reward_type"]=1 + }, + [161]={ + ["season"]=1, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [162]={ + ["season"]=1, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [163]={ + ["season"]=1, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1000, + ["num_for_nothing"]="VwhcAw==" + } + }, + [164]={ + ["season"]=1, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [165]={ + ["season"]=1, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [166]={ + ["season"]=1, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1000, + ["num_for_nothing"]="VwhcAw==" + } + }, + [167]={ + ["season"]=1, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [168]={ + ["season"]=1, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [169]={ + ["season"]=1, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1000, + ["num_for_nothing"]="VwhcAw==" + } + }, + [170]={ + ["season"]=1, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=6, + ["id_for_nothing"]="UA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + }, + ["reward_type"]=1 + }, + [171]={ + ["season"]=1, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [172]={ + ["season"]=1, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [173]={ + ["season"]=1, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1000, + ["num_for_nothing"]="VwhcAw==" + } + }, + [174]={ + ["season"]=1, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [175]={ + ["season"]=1, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [176]={ + ["season"]=1, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1000, + ["num_for_nothing"]="VwhcAw==" + } + }, + [177]={ + ["season"]=1, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [178]={ + ["season"]=1, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [179]={ + ["season"]=1, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1000, + ["num_for_nothing"]="VwhcAw==" + } + }, + [180]={ + ["season"]=1, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=6, + ["id_for_nothing"]="UA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + }, + ["reward_type"]=1 + }, + [181]={ + ["season"]=1, + ["exp"]=500, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=6, + ["id_for_nothing"]="UA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [201]={ + ["season"]=2, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [202]={ + ["season"]=2, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [203]={ + ["season"]=2, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1000, + ["num_for_nothing"]="VwhcAw==" + } + }, + [204]={ + ["season"]=2, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [205]={ + ["season"]=2, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [206]={ + ["season"]=2, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1000, + ["num_for_nothing"]="VwhcAw==" + } + }, + [207]={ + ["season"]=2, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [208]={ + ["season"]=2, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [209]={ + ["season"]=2, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1000, + ["num_for_nothing"]="VwhcAw==" + } + }, + [210]={ + ["season"]=2, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=6, + ["id_for_nothing"]="UA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + }, + ["reward_type"]=1 + }, + [211]={ + ["season"]=2, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [212]={ + ["season"]=2, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [213]={ + ["season"]=2, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1000, + ["num_for_nothing"]="VwhcAw==" + } + }, + [214]={ + ["season"]=2, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [215]={ + ["season"]=2, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [216]={ + ["season"]=2, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1000, + ["num_for_nothing"]="VwhcAw==" + } + }, + [217]={ + ["season"]=2, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [218]={ + ["season"]=2, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [219]={ + ["season"]=2, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1000, + ["num_for_nothing"]="VwhcAw==" + } + }, + [220]={ + ["season"]=2, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=6, + ["id_for_nothing"]="UA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + }, + ["reward_type"]=1 + }, + [221]={ + ["season"]=2, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [222]={ + ["season"]=2, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [223]={ + ["season"]=2, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1000, + ["num_for_nothing"]="VwhcAw==" + } + }, + [224]={ + ["season"]=2, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [225]={ + ["season"]=2, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [226]={ + ["season"]=2, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1000, + ["num_for_nothing"]="VwhcAw==" + } + }, + [227]={ + ["season"]=2, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [228]={ + ["season"]=2, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [229]={ + ["season"]=2, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1000, + ["num_for_nothing"]="VwhcAw==" + } + }, + [230]={ + ["season"]=2, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=6, + ["id_for_nothing"]="UA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + }, + ["reward_type"]=1 + }, + [231]={ + ["season"]=2, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [232]={ + ["season"]=2, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [233]={ + ["season"]=2, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1000, + ["num_for_nothing"]="VwhcAw==" + } + }, + [234]={ + ["season"]=2, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [235]={ + ["season"]=2, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [236]={ + ["season"]=2, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1000, + ["num_for_nothing"]="VwhcAw==" + } + }, + [237]={ + ["season"]=2, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [238]={ + ["season"]=2, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [239]={ + ["season"]=2, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1000, + ["num_for_nothing"]="VwhcAw==" + } + }, + [240]={ + ["season"]=2, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=6, + ["id_for_nothing"]="UA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + }, + ["reward_type"]=1 + }, + [241]={ + ["season"]=2, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [242]={ + ["season"]=2, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [243]={ + ["season"]=2, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1000, + ["num_for_nothing"]="VwhcAw==" + } + }, + [244]={ + ["season"]=2, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [245]={ + ["season"]=2, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [246]={ + ["season"]=2, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1000, + ["num_for_nothing"]="VwhcAw==" + } + }, + [247]={ + ["season"]=2, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [248]={ + ["season"]=2, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [249]={ + ["season"]=2, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1000, + ["num_for_nothing"]="VwhcAw==" + } + }, + [250]={ + ["season"]=2, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=6, + ["id_for_nothing"]="UA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + }, + ["reward_type"]=1 + }, + [251]={ + ["season"]=2, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [252]={ + ["season"]=2, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [253]={ + ["season"]=2, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1000, + ["num_for_nothing"]="VwhcAw==" + } + }, + [254]={ + ["season"]=2, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [255]={ + ["season"]=2, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [256]={ + ["season"]=2, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1000, + ["num_for_nothing"]="VwhcAw==" + } + }, + [257]={ + ["season"]=2, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [258]={ + ["season"]=2, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [259]={ + ["season"]=2, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1000, + ["num_for_nothing"]="VwhcAw==" + } + }, + [260]={ + ["season"]=2, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=6, + ["id_for_nothing"]="UA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + }, + ["reward_type"]=1 + }, + [261]={ + ["season"]=2, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [262]={ + ["season"]=2, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [263]={ + ["season"]=2, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1000, + ["num_for_nothing"]="VwhcAw==" + } + }, + [264]={ + ["season"]=2, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [265]={ + ["season"]=2, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [266]={ + ["season"]=2, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1000, + ["num_for_nothing"]="VwhcAw==" + } + }, + [267]={ + ["season"]=2, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [268]={ + ["season"]=2, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [269]={ + ["season"]=2, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1000, + ["num_for_nothing"]="VwhcAw==" + } + }, + [270]={ + ["season"]=2, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=6, + ["id_for_nothing"]="UA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + }, + ["reward_type"]=1 + }, + [271]={ + ["season"]=2, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [272]={ + ["season"]=2, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [273]={ + ["season"]=2, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1000, + ["num_for_nothing"]="VwhcAw==" + } + }, + [274]={ + ["season"]=2, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [275]={ + ["season"]=2, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [276]={ + ["season"]=2, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1000, + ["num_for_nothing"]="VwhcAw==" + } + }, + [277]={ + ["season"]=2, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [278]={ + ["season"]=2, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [279]={ + ["season"]=2, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1000, + ["num_for_nothing"]="VwhcAw==" + } + }, + [280]={ + ["season"]=2, + ["exp"]=100, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=6, + ["id_for_nothing"]="UA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + }, + ["reward_type"]=1 + }, + [281]={ + ["season"]=2, + ["exp"]=500, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=6, + ["id_for_nothing"]="UA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + } +} +local config = { +data=bounty_level,count=162 +} +return config \ No newline at end of file diff --git a/lua/app/config/bounty_level.lua.meta b/lua/app/config/bounty_level.lua.meta new file mode 100644 index 00000000..328b1e1d --- /dev/null +++ b/lua/app/config/bounty_level.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 69710b76d77270f40aafa0077807c9dd +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/config/bounty_time.lua b/lua/app/config/bounty_time.lua new file mode 100644 index 00000000..18e4076d --- /dev/null +++ b/lua/app/config/bounty_time.lua @@ -0,0 +1,16 @@ +local bounty_time = { + [1]={ + ["season"]=1, + ["start_time"]="2023-5-1 00:00:00", + ["end_time"]="2022-6-1 00:00:00" + }, + [2]={ + ["season"]=2, + ["start_time"]="2023-6-1 00:00:00", + ["end_time"]="2022-7-1 00:00:00" + } +} +local config = { +data=bounty_time,count=2 +} +return config \ No newline at end of file diff --git a/lua/app/config/bounty_time.lua.meta b/lua/app/config/bounty_time.lua.meta new file mode 100644 index 00000000..284294e6 --- /dev/null +++ b/lua/app/config/bounty_time.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: b6823cf4d657ca14290f9453c0dedebf +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/config/buff.lua b/lua/app/config/buff.lua index e06d61bf..2c08a5e7 100644 --- a/lua/app/config/buff.lua +++ b/lua/app/config/buff.lua @@ -2,174 +2,232 @@ local buff = { [1]={ ["name"]="hurt", ["buff_type"]=3, + ["decr"]=3, ["formula"]=1 }, [2]={ ["name"]="hurt_red", ["buff_type"]=3, ["position"]=1, + ["decr"]=3, ["formula"]=1 }, [3]={ ["name"]="hurt_yellow", ["buff_type"]=3, ["position"]=2, + ["decr"]=3, ["formula"]=1 }, [4]={ ["name"]="hurt_green", ["buff_type"]=3, ["position"]=3, + ["decr"]=3, ["formula"]=1 }, [5]={ ["name"]="hurt_blue", ["buff_type"]=3, ["position"]=4, + ["decr"]=3, ["formula"]=1 }, [6]={ ["name"]="hurt_purple", ["buff_type"]=3, ["position"]=5, + ["decr"]=3, ["formula"]=1 }, [7]={ ["name"]="dec_dmg_red_add", ["buff_type"]=1, + ["stack"]=2, ["position"]=1, + ["decr"]=1, ["icon"]="dec_dmg_red_add" }, [8]={ ["name"]="dec_dmg_yellow_add", ["buff_type"]=1, + ["stack"]=2, ["position"]=2, + ["decr"]=1, ["icon"]="dec_dmg_yellow_add" }, [9]={ ["name"]="dec_dmg_green_add", ["buff_type"]=1, + ["stack"]=2, ["position"]=3, + ["decr"]=1, ["icon"]="dec_dmg_green_add" }, [10]={ ["name"]="dec_dmg_blue_add", ["buff_type"]=1, + ["stack"]=2, ["position"]=4, + ["decr"]=1, ["icon"]="dec_dmg_blue_add" }, [11]={ ["name"]="dec_dmg_purple_add", ["buff_type"]=1, + ["stack"]=2, ["position"]=5, + ["decr"]=1, ["icon"]="dec_dmg_purple_add" }, [12]={ ["name"]="dec_dmg_all_add", ["buff_type"]=1, + ["stack"]=2, + ["decr"]=1, ["icon"]="dec_dmg_all_add" }, [13]={ ["name"]="weakness_red_add", ["buff_type"]=1, + ["stack"]=2, ["position"]=1, + ["decr"]=2, ["icon"]="weakness_red_add" }, [14]={ ["name"]="weakness_yellow_add", ["buff_type"]=1, + ["stack"]=2, ["position"]=2, + ["decr"]=2, ["icon"]="weakness_yellow_add" }, [15]={ ["name"]="weakness_green_add", ["buff_type"]=1, + ["stack"]=2, ["position"]=3, + ["decr"]=2, ["icon"]="weakness_green_add" }, [16]={ ["name"]="weakness_blue_add", ["buff_type"]=1, + ["stack"]=2, ["position"]=4, + ["decr"]=2, ["icon"]="weakness_blue_add" }, [17]={ ["name"]="weakness_purple_add", ["buff_type"]=1, + ["stack"]=2, ["position"]=5, + ["decr"]=2, ["icon"]="weakness_purple_add" }, [18]={ ["name"]="weakness_all_add", ["buff_type"]=1, + ["stack"]=2, + ["decr"]=2, ["icon"]="weakness_all_add" }, [19]={ ["name"]="dmg_addition_red_add", ["buff_type"]=1, - ["position"]=1 + ["stack"]=2, + ["position"]=1, + ["decr"]=1 }, [20]={ ["name"]="dmg_addition_yellow_add", ["buff_type"]=1, - ["position"]=2 + ["stack"]=2, + ["position"]=2, + ["decr"]=1 }, [21]={ ["name"]="dmg_addition_green_add", ["buff_type"]=1, - ["position"]=3 + ["stack"]=2, + ["position"]=3, + ["decr"]=1 }, [22]={ ["name"]="dmg_addition_blue_add", ["buff_type"]=1, - ["position"]=4 + ["stack"]=2, + ["position"]=4, + ["decr"]=1 }, [23]={ ["name"]="dmg_addition_purple_add", ["buff_type"]=1, - ["position"]=5 + ["stack"]=2, + ["position"]=5, + ["decr"]=1 }, [24]={ ["name"]="dmg_addition_all_add", - ["buff_type"]=1 + ["buff_type"]=1, + ["stack"]=2, + ["decr"]=1 }, [25]={ ["name"]="atkp_color_add", - ["buff_type"]=1 + ["buff_type"]=1, + ["stack"]=2, + ["decr"]=1 }, [26]={ ["name"]="atkp_red_add", ["buff_type"]=1, - ["position"]=1 + ["stack"]=2, + ["position"]=1, + ["decr"]=1 }, [27]={ ["name"]="atkp_yellow_add", ["buff_type"]=1, - ["position"]=2 + ["stack"]=2, + ["position"]=2, + ["decr"]=1 }, [28]={ ["name"]="atkp_green_add", ["buff_type"]=1, - ["position"]=3 + ["stack"]=2, + ["position"]=3, + ["decr"]=1 }, [29]={ ["name"]="atkp_blue_add", ["buff_type"]=1, - ["position"]=4 + ["stack"]=2, + ["position"]=4, + ["decr"]=1 }, [30]={ ["name"]="atkp_purple_add", ["buff_type"]=1, - ["position"]=5 + ["stack"]=2, + ["position"]=5, + ["decr"]=1 }, [31]={ ["name"]="wavehealp", ["buff_type"]=5, + ["stack"]=2, + ["decr"]=1, ["formula"]=2 }, [32]={ ["name"]="heal", ["buff_type"]=5, + ["stack"]=2, + ["decr"]=1, ["formula"]=3, ["fx_get"]={ 300025 @@ -178,6 +236,8 @@ local buff = { [33]={ ["name"]="stun", ["buff_type"]=8, + ["stack"]=2, + ["decr"]=2, ["icon"]="stun", ["fx_continued"]={ 13 @@ -186,6 +246,7 @@ local buff = { [34]={ ["name"]="shield", ["buff_type"]=2, + ["decr"]=1, ["icon"]="shield", ["fx_continued"]={ 11 @@ -196,11 +257,15 @@ local buff = { }, [35]={ ["name"]="atkp_add", - ["buff_type"]=1 + ["buff_type"]=1, + ["stack"]=2, + ["decr"]=1 }, [36]={ ["name"]="normal_attack_dec", ["buff_type"]=1, + ["stack"]=2, + ["decr"]=2, ["icon"]="normal_attack_dec", ["fx_continued"]={ 12 @@ -208,43 +273,68 @@ local buff = { }, [37]={ ["name"]="normal_attack_add", - ["buff_type"]=1 + ["buff_type"]=1, + ["stack"]=2, + ["decr"]=1 }, [38]={ ["name"]="block", - ["buff_type"]=1 + ["buff_type"]=1, + ["stack"]=2, + ["decr"]=1 }, [39]={ ["name"]="hpp_add", - ["buff_type"]=1 + ["buff_type"]=1, + ["stack"]=2, + ["decr"]=1 }, [40]={ ["name"]="crit_add", - ["buff_type"]=1 + ["buff_type"]=1, + ["stack"]=2, + ["decr"]=1 }, [41]={ ["name"]="crit_time_add", - ["buff_type"]=1 + ["buff_type"]=1, + ["stack"]=2, + ["decr"]=1 }, [42]={ ["name"]="exp_time_add", - ["buff_type"]=7 + ["buff_type"]=7, + ["stack"]=2, + ["decr"]=1 }, [43]={ ["name"]="cured_add", - ["buff_type"]=1 + ["buff_type"]=1, + ["stack"]=2, + ["decr"]=1 }, [44]={ - ["name"]="add_skill", - ["buff_type"]=7 + ["name"]="cured_dec", + ["buff_type"]=1, + ["stack"]=2, + ["decr"]=2 }, [45]={ - ["name"]="skill_fire_times", - ["buff_type"]=7 + ["name"]="add_skill", + ["buff_type"]=7, + ["stack"]=2, + ["decr"]=3 }, [46]={ + ["name"]="skill_fire_times", + ["buff_type"]=7, + ["stack"]=2, + ["decr"]=3 + }, + [47]={ ["name"]="shield_rebound_200", ["buff_type"]=2, + ["decr"]=1, ["icon"]="shield", ["fx_continued"]={ 11 @@ -253,10 +343,143 @@ local buff = { 14 } }, - [47]={ + [48]={ ["name"]="burn", ["buff_type"]=4, + ["stack"]=1, + ["decr"]=2, ["formula"]=4 + }, + [49]={ + ["name"]="vulnerable", + ["buff_type"]=1, + ["decr"]=2 + }, + [50]={ + ["name"]="frozen", + ["buff_type"]=8, + ["decr"]=2 + }, + [51]={ + ["name"]="poison", + ["buff_type"]=4, + ["stack"]=2, + ["decr"]=2, + ["formula"]=4 + }, + [52]={ + ["name"]="Imprison", + ["buff_type"]=7, + ["decr"]=2 + }, + [53]={ + ["name"]="corrupt", + ["buff_type"]=1, + ["decr"]=2 + }, + [54]={ + ["name"]="bleed", + ["buff_type"]=7, + ["decr"]=2, + ["formula"]=4 + }, + [55]={ + ["name"]="weaken", + ["buff_type"]=1, + ["decr"]=2 + }, + [56]={ + ["name"]="lethargy", + ["buff_type"]=8, + ["stack"]=1, + ["decr"]=2 + }, + [57]={ + ["name"]="curse", + ["buff_type"]=1, + ["decr"]=2 + }, + [58]={ + ["name"]="lock", + ["buff_type"]=7, + ["decr"]=2 + }, + [59]={ + ["name"]="first_hand", + ["buff_type"]=7, + ["decr"]=1 + }, + [60]={ + ["name"]="skill_hurt_add", + ["buff_type"]=1, + ["decr"]=1 + }, + [61]={ + ["name"]="undead", + ["buff_type"]=7, + ["decr"]=1 + }, + [62]={ + ["name"]="counterattack", + ["buff_type"]=7, + ["stack"]=1, + ["decr"]=1 + }, + [63]={ + ["name"]="thorns", + ["buff_type"]=7, + ["decr"]=1 + }, + [64]={ + ["name"]="dmg_dec_red_add", + ["buff_type"]=1, + ["stack"]=2, + ["position"]=1, + ["decr"]=2 + }, + [65]={ + ["name"]="dmg_dec_yellow_add", + ["buff_type"]=1, + ["stack"]=2, + ["position"]=2, + ["decr"]=2 + }, + [66]={ + ["name"]="dmg_dec_green_add", + ["buff_type"]=1, + ["stack"]=2, + ["position"]=3, + ["decr"]=2 + }, + [67]={ + ["name"]="dmg_dec_blue_add", + ["buff_type"]=1, + ["stack"]=2, + ["position"]=4, + ["decr"]=2 + }, + [68]={ + ["name"]="dmg_dec_purple_add", + ["buff_type"]=1, + ["stack"]=2, + ["position"]=5, + ["decr"]=2 + }, + [69]={ + ["name"]="dmg_dec_all_add", + ["buff_type"]=1, + ["stack"]=2, + ["decr"]=2 + }, + [70]={ + ["name"]="be_sucked", + ["buff_type"]=1, + ["decr"]=2 + }, + [71]={ + ["name"]="be_dmg_to_heal", + ["buff_type"]=1, + ["decr"]=2 } } local keys = { @@ -304,15 +527,39 @@ local keys = { ["crit_time_add"]=buff[41], ["exp_time_add"]=buff[42], ["cured_add"]=buff[43], - ["add_skill"]=buff[44], - ["skill_fire_times"]=buff[45], - ["shield_rebound_200"]=buff[46], - ["burn"]=buff[47] + ["cured_dec"]=buff[44], + ["add_skill"]=buff[45], + ["skill_fire_times"]=buff[46], + ["shield_rebound_200"]=buff[47], + ["burn"]=buff[48], + ["vulnerable"]=buff[49], + ["frozen"]=buff[50], + ["poison"]=buff[51], + ["Imprison"]=buff[52], + ["corrupt"]=buff[53], + ["bleed"]=buff[54], + ["weaken"]=buff[55], + ["lethargy"]=buff[56], + ["curse"]=buff[57], + ["lock"]=buff[58], + ["first_hand"]=buff[59], + ["skill_hurt_add"]=buff[60], + ["undead"]=buff[61], + ["counterattack"]=buff[62], + ["thorns"]=buff[63], + ["dmg_dec_red_add"]=buff[64], + ["dmg_dec_yellow_add"]=buff[65], + ["dmg_dec_green_add"]=buff[66], + ["dmg_dec_blue_add"]=buff[67], + ["dmg_dec_purple_add"]=buff[68], + ["dmg_dec_all_add"]=buff[69], + ["be_sucked"]=buff[70], + ["be_dmg_to_heal"]=buff[71] } } local config = { data=buff, keys=keys, -count=47 +count=71 } return config \ No newline at end of file diff --git a/lua/app/config/const.lua b/lua/app/config/const.lua index a6efdb32..631a68bf 100644 --- a/lua/app/config/const.lua +++ b/lua/app/config/const.lua @@ -41,9 +41,45 @@ local const = { }, ["act_gold_pig_full_cd"]={ ["value"]=12 + }, + ["stamina_diamond_buy"]={ + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=3, + ["id_for_nothing"]="VQ==", + ["num"]=30, + ["num_for_nothing"]="VQg=" + } + }, + ["stamina_diamond_cost"]={ + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=30, + ["num_for_nothing"]="VQg=" + } + }, + ["stamina_diamond_times"]={ + ["value"]=3 + }, + ["stamina_ad_buy"]={ + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=3, + ["id_for_nothing"]="VQ==", + ["num"]=20, + ["num_for_nothing"]="VAg=" + } + }, + ["stamina_ad_times"]={ + ["value"]=5 } } local config = { -data=const,count=12 +data=const,count=17 } return config \ No newline at end of file diff --git a/lua/app/config/func_open.lua b/lua/app/config/func_open.lua index f9f386d0..dcb0fa2c 100644 --- a/lua/app/config/func_open.lua +++ b/lua/app/config/func_open.lua @@ -2,9 +2,12 @@ local func_open = { ["act_gold_pig"]={ ["stage"]=3, ["pop_ups"]=1 + }, + ["task"]={ + ["stage"]=2 } } local config = { -data=func_open,count=1 +data=func_open,count=2 } return config \ No newline at end of file diff --git a/lua/app/config/item.lua b/lua/app/config/item.lua index 529b8867..d64382f7 100644 --- a/lua/app/config/item.lua +++ b/lua/app/config/item.lua @@ -101,6 +101,23 @@ local item = { } } }, + [7]={ + ["type"]=1, + ["qlt"]=5, + ["icon"]="7" + }, + [8]={ + ["type"]=4 + }, + [9]={ + ["type"]=4 + }, + [10]={ + ["type"]=4 + }, + [11]={ + ["type"]=4 + }, [12001]={ ["type"]=5, ["parameter"]=12001, @@ -151,6 +168,6 @@ local item = { } } local config = { -data=item,count=14 +data=item,count=19 } 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 cbe85a4d..b7c4e7b3 100644 --- a/lua/app/config/localization/localization_global_const.lua +++ b/lua/app/config/localization/localization_global_const.lua @@ -56,6 +56,19 @@ local LocalizationGlobalConst = CLICK_COPY_ACOUNT_DESC = "CLICK_COPY_ACOUNT_DESC", APP = "APP", CHAPTER_DESC_1 = "CHAPTER_DESC_1", + SETTING_DESC = "SETTING_DESC", + SETTING_DESC_MUSIC = "SETTING_DESC_MUSIC", + SETTING_DESC_VOICE = "SETTING_DESC_VOICE", + SETTING_DESC_LANGUAGE = "SETTING_DESC_LANGUAGE", + SERVICE_DESC = "SERVICE_DESC", + PRIVACY_DESC = "PRIVACY_DESC", + CLIENT_VERSION = "CLIENT_VERSION", + BIND_ACCOUNT_DESC = "BIND_ACCOUNT_DESC", + CHANGE_ACCOUNT_DESC = "CHANGE_ACCOUNT_DESC", + DELETE_ACCOUNT_DESC = "DELETE_ACCOUNT_DESC", + SETTING_DESC_1 = "SETTING_DESC_1", + ACCOUNT_ALREADY_BINDED_DESC = "ACCOUNT_ALREADY_BINDED_DESC", + LANGUAGE_DESC = "LANGUAGE_DESC", } return LocalizationGlobalConst \ No newline at end of file diff --git a/lua/app/config/player_initial.lua b/lua/app/config/player_initial.lua index 4937c5e8..62240c39 100644 --- a/lua/app/config/player_initial.lua +++ b/lua/app/config/player_initial.lua @@ -1,15 +1,5 @@ local player_initial = { [1]={ - ["reward"]={ - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=3, - ["id_for_nothing"]="VQ==", - ["num"]=60, - ["num_for_nothing"]="UAg=" - } - }, - [2]={ ["reward"]={ ["type"]=2, ["type_for_nothing"]="VA==", @@ -19,7 +9,7 @@ local player_initial = { ["num_for_nothing"]="Vw==" } }, - [3]={ + [2]={ ["reward"]={ ["type"]=2, ["type_for_nothing"]="VA==", @@ -29,7 +19,7 @@ local player_initial = { ["num_for_nothing"]="Vw==" } }, - [4]={ + [3]={ ["reward"]={ ["type"]=2, ["type_for_nothing"]="VA==", @@ -41,6 +31,6 @@ local player_initial = { } } local config = { -data=player_initial,count=4 +data=player_initial,count=3 } return config \ No newline at end of file diff --git a/lua/app/config/recharge.lua b/lua/app/config/recharge.lua index 7a83bdc9..6e1a406c 100644 --- a/lua/app/config/recharge.lua +++ b/lua/app/config/recharge.lua @@ -76,10 +76,18 @@ local recharge = { ["price"]=9.99, ["price_cn"]=68, ["same_price"]=10, - ["price_str"]="$9.99", + ["price_str"]="9.99", ["score"]=10 }, [11]={ + ["payId"]="com.idle.ko.io.11.99dollar", + ["price"]=11.99, + ["price_cn"]=78, + ["same_price"]=12, + ["price_str"]="11.99", + ["score"]=12 + }, + [12]={ ["payId"]="com.idle.ko.io.14.99dollar", ["price"]=14.99, ["price_cn"]=98, @@ -87,7 +95,7 @@ local recharge = { ["price_str"]="$14.99", ["score"]=15 }, - [12]={ + [13]={ ["payId"]="com.idle.ko.io.19.99dollar", ["price"]=19.99, ["price_cn"]=128, @@ -95,7 +103,7 @@ local recharge = { ["price_str"]="$19.99", ["score"]=20 }, - [13]={ + [14]={ ["payId"]="com.idle.ko.io.24.99dollar", ["price"]=24.99, ["price_cn"]=168, @@ -103,7 +111,7 @@ local recharge = { ["price_str"]="$24.99", ["score"]=25 }, - [14]={ + [15]={ ["payId"]="com.idle.ko.io.29.99dollar", ["price"]=29.99, ["price_cn"]=198, @@ -111,7 +119,7 @@ local recharge = { ["price_str"]="$29.99", ["score"]=30 }, - [15]={ + [16]={ ["payId"]="com.idle.ko.io.49.99dollar", ["price"]=49.99, ["price_cn"]=328, @@ -119,7 +127,7 @@ local recharge = { ["price_str"]="$49.99", ["score"]=50 }, - [16]={ + [17]={ ["payId"]="com.idle.ko.io.69.99dollar", ["price"]=69.99, ["price_cn"]=448, @@ -127,7 +135,7 @@ local recharge = { ["price_str"]="$69.99", ["score"]=70 }, - [17]={ + [18]={ ["payId"]="com.idle.ko.io.99.99dollar", ["price"]=99.99, ["price_cn"]=648, @@ -137,6 +145,6 @@ local recharge = { } } local config = { -data=recharge,count=17 +data=recharge,count=18 } return config \ No newline at end of file diff --git a/lua/app/config/strings/cn/buff.lua b/lua/app/config/strings/cn/buff.lua index 01b34143..6e22c869 100644 --- a/lua/app/config/strings/cn/buff.lua +++ b/lua/app/config/strings/cn/buff.lua @@ -59,9 +59,9 @@ local buff = { ["desc"]="普攻攻击次数减少", ["name"]="normal_attack_dec" }, - [46]={ + [47]={ ["desc"]="护盾可抵挡一定的伤害，并有200%反伤", - ["name"]="shield" + ["name"]="shield_rebound_200" } } local keys = { @@ -81,7 +81,7 @@ local keys = { ["stun"]=buff[33], ["shield"]=buff[34], ["normal_attack_dec"]=buff[36], - ["shield"]=buff[46] + ["shield_rebound_200"]=buff[47] } } local config = { diff --git a/lua/app/config/strings/cn/global.lua b/lua/app/config/strings/cn/global.lua index 4efc14bc..6a090e33 100644 --- a/lua/app/config/strings/cn/global.lua +++ b/lua/app/config/strings/cn/global.lua @@ -56,6 +56,19 @@ local localization_global = ["CLICK_COPY_ACOUNT_DESC"] = "点击复制用户ID", ["APP"] = "版本号：", ["CHAPTER_DESC_1"] = "最高纪录：{0}", + ["SETTING_DESC"] = "设置", + ["SETTING_DESC_MUSIC"] = "音乐", + ["SETTING_DESC_VOICE"] = "音效", + ["SETTING_DESC_LANGUAGE"] = "语言", + ["SERVICE_DESC"] = "使用条款", + ["PRIVACY_DESC"] = "隐私政策", + ["CLIENT_VERSION"] = "当前版本:{0}", + ["BIND_ACCOUNT_DESC"] = "绑定账号", + ["CHANGE_ACCOUNT_DESC"] = "切换账号", + ["DELETE_ACCOUNT_DESC"] = "删除账号", + ["SETTING_DESC_1"] = "ID:{0}", + ["ACCOUNT_ALREADY_BINDED_DESC"] = "已绑定", + ["LANGUAGE_DESC"] = "语言", } return localization_global \ No newline at end of file diff --git a/lua/app/config/strings/cn/item.lua b/lua/app/config/strings/cn/item.lua index 693de2dc..418865cf 100644 --- a/lua/app/config/strings/cn/item.lua +++ b/lua/app/config/strings/cn/item.lua @@ -23,6 +23,10 @@ local item = { ["name"]="史诗英雄", ["desc"]="可以获得史诗英雄。" }, + [7]={ + ["name"]="通行证积分", + ["desc"]="累计积分可提升通行证等级。" + }, [12001]={ ["name"]="洛克西英雄碎片", ["desc"]="洛克西英雄碎片,凑齐可解锁或升级。" @@ -57,6 +61,6 @@ local item = { } } local config = { -data=item,count=14 +data=item,count=15 } return config \ No newline at end of file diff --git a/lua/app/config/strings/de/buff.lua b/lua/app/config/strings/de/buff.lua index 8347d4fa..988ea298 100644 --- a/lua/app/config/strings/de/buff.lua +++ b/lua/app/config/strings/de/buff.lua @@ -44,8 +44,8 @@ local buff = { [36]={ ["name"]="normal_attack_dec" }, - [46]={ - ["name"]="shield" + [47]={ + ["name"]="shield_rebound_200" } } local keys = { @@ -65,7 +65,7 @@ local keys = { ["stun"]=buff[33], ["shield"]=buff[34], ["normal_attack_dec"]=buff[36], - ["shield"]=buff[46] + ["shield_rebound_200"]=buff[47] } } local config = { diff --git a/lua/app/config/strings/de/item.lua b/lua/app/config/strings/de/item.lua index bf76d4ba..b0fc1100 100644 --- a/lua/app/config/strings/de/item.lua +++ b/lua/app/config/strings/de/item.lua @@ -19,6 +19,9 @@ local item = { }, [6]={ + }, + [7]={ + }, [12001]={ @@ -46,6 +49,6 @@ local item = { } } local config = { -data=item,count=14 +data=item,count=15 } return config \ No newline at end of file diff --git a/lua/app/config/strings/en/buff.lua b/lua/app/config/strings/en/buff.lua index a9fdbb53..e69c25c3 100644 --- a/lua/app/config/strings/en/buff.lua +++ b/lua/app/config/strings/en/buff.lua @@ -59,9 +59,9 @@ local buff = { ["desc"]="Reduce normal attack hits", ["name"]="normal_attack_dec" }, - [46]={ + [47]={ ["desc"]="The shield can absorb a certain amount of damage, reflect and deal 200% damage back to the enemy", - ["name"]="shield" + ["name"]="shield_rebound_200" } } local keys = { @@ -81,7 +81,7 @@ local keys = { ["stun"]=buff[33], ["shield"]=buff[34], ["normal_attack_dec"]=buff[36], - ["shield"]=buff[46] + ["shield_rebound_200"]=buff[47] } } local config = { diff --git a/lua/app/config/strings/en/item.lua b/lua/app/config/strings/en/item.lua index 707063e3..2fa10f58 100644 --- a/lua/app/config/strings/en/item.lua +++ b/lua/app/config/strings/en/item.lua @@ -22,6 +22,9 @@ local item = { [6]={ ["name"]="Epic Hero", ["desc"]="Allows you to get an epic hero" + }, + [7]={ + }, [12001]={ ["name"]="Roxy Shard", @@ -57,6 +60,6 @@ local item = { } } local config = { -data=item,count=14 +data=item,count=15 } return config \ No newline at end of file diff --git a/lua/app/config/strings/fr/buff.lua b/lua/app/config/strings/fr/buff.lua index 8347d4fa..988ea298 100644 --- a/lua/app/config/strings/fr/buff.lua +++ b/lua/app/config/strings/fr/buff.lua @@ -44,8 +44,8 @@ local buff = { [36]={ ["name"]="normal_attack_dec" }, - [46]={ - ["name"]="shield" + [47]={ + ["name"]="shield_rebound_200" } } local keys = { @@ -65,7 +65,7 @@ local keys = { ["stun"]=buff[33], ["shield"]=buff[34], ["normal_attack_dec"]=buff[36], - ["shield"]=buff[46] + ["shield_rebound_200"]=buff[47] } } local config = { diff --git a/lua/app/config/strings/fr/item.lua b/lua/app/config/strings/fr/item.lua index 08e1088c..e7fddf46 100644 --- a/lua/app/config/strings/fr/item.lua +++ b/lua/app/config/strings/fr/item.lua @@ -19,6 +19,9 @@ local item = { }, [6]={ + }, + [7]={ + }, [12001]={ @@ -46,6 +49,6 @@ local item = { } } local config = { -data=item,count=14 +data=item,count=15 } return config \ No newline at end of file diff --git a/lua/app/config/strings/id/buff.lua b/lua/app/config/strings/id/buff.lua index 8347d4fa..988ea298 100644 --- a/lua/app/config/strings/id/buff.lua +++ b/lua/app/config/strings/id/buff.lua @@ -44,8 +44,8 @@ local buff = { [36]={ ["name"]="normal_attack_dec" }, - [46]={ - ["name"]="shield" + [47]={ + ["name"]="shield_rebound_200" } } local keys = { @@ -65,7 +65,7 @@ local keys = { ["stun"]=buff[33], ["shield"]=buff[34], ["normal_attack_dec"]=buff[36], - ["shield"]=buff[46] + ["shield_rebound_200"]=buff[47] } } local config = { diff --git a/lua/app/config/strings/id/item.lua b/lua/app/config/strings/id/item.lua index da41fab0..04f2ceab 100644 --- a/lua/app/config/strings/id/item.lua +++ b/lua/app/config/strings/id/item.lua @@ -19,6 +19,9 @@ local item = { }, [6]={ + }, + [7]={ + }, [12001]={ @@ -46,6 +49,6 @@ local item = { } } local config = { -data=item,count=14 +data=item,count=15 } return config \ No newline at end of file diff --git a/lua/app/config/strings/ja/buff.lua b/lua/app/config/strings/ja/buff.lua index 8347d4fa..988ea298 100644 --- a/lua/app/config/strings/ja/buff.lua +++ b/lua/app/config/strings/ja/buff.lua @@ -44,8 +44,8 @@ local buff = { [36]={ ["name"]="normal_attack_dec" }, - [46]={ - ["name"]="shield" + [47]={ + ["name"]="shield_rebound_200" } } local keys = { @@ -65,7 +65,7 @@ local keys = { ["stun"]=buff[33], ["shield"]=buff[34], ["normal_attack_dec"]=buff[36], - ["shield"]=buff[46] + ["shield_rebound_200"]=buff[47] } } local config = { diff --git a/lua/app/config/strings/ja/item.lua b/lua/app/config/strings/ja/item.lua index e4c19683..bf3d32f7 100644 --- a/lua/app/config/strings/ja/item.lua +++ b/lua/app/config/strings/ja/item.lua @@ -19,6 +19,9 @@ local item = { }, [6]={ + }, + [7]={ + }, [12001]={ @@ -46,6 +49,6 @@ local item = { } } local config = { -data=item,count=14 +data=item,count=15 } return config \ No newline at end of file diff --git a/lua/app/config/strings/ko/buff.lua b/lua/app/config/strings/ko/buff.lua index 8347d4fa..988ea298 100644 --- a/lua/app/config/strings/ko/buff.lua +++ b/lua/app/config/strings/ko/buff.lua @@ -44,8 +44,8 @@ local buff = { [36]={ ["name"]="normal_attack_dec" }, - [46]={ - ["name"]="shield" + [47]={ + ["name"]="shield_rebound_200" } } local keys = { @@ -65,7 +65,7 @@ local keys = { ["stun"]=buff[33], ["shield"]=buff[34], ["normal_attack_dec"]=buff[36], - ["shield"]=buff[46] + ["shield_rebound_200"]=buff[47] } } local config = { diff --git a/lua/app/config/strings/ko/item.lua b/lua/app/config/strings/ko/item.lua index d6a06409..d51699a7 100644 --- a/lua/app/config/strings/ko/item.lua +++ b/lua/app/config/strings/ko/item.lua @@ -19,6 +19,9 @@ local item = { }, [6]={ + }, + [7]={ + }, [12001]={ @@ -46,6 +49,6 @@ local item = { } } local config = { -data=item,count=14 +data=item,count=15 } return config \ No newline at end of file diff --git a/lua/app/config/strings/pt/buff.lua b/lua/app/config/strings/pt/buff.lua index 8347d4fa..988ea298 100644 --- a/lua/app/config/strings/pt/buff.lua +++ b/lua/app/config/strings/pt/buff.lua @@ -44,8 +44,8 @@ local buff = { [36]={ ["name"]="normal_attack_dec" }, - [46]={ - ["name"]="shield" + [47]={ + ["name"]="shield_rebound_200" } } local keys = { @@ -65,7 +65,7 @@ local keys = { ["stun"]=buff[33], ["shield"]=buff[34], ["normal_attack_dec"]=buff[36], - ["shield"]=buff[46] + ["shield_rebound_200"]=buff[47] } } local config = { diff --git a/lua/app/config/strings/pt/item.lua b/lua/app/config/strings/pt/item.lua index 820447e5..68eddb8e 100644 --- a/lua/app/config/strings/pt/item.lua +++ b/lua/app/config/strings/pt/item.lua @@ -18,6 +18,9 @@ local item = { }, [6]={ + }, + [7]={ + }, [12001]={ @@ -45,6 +48,6 @@ local item = { } } local config = { -data=item,count=14 +data=item,count=15 } return config \ No newline at end of file diff --git a/lua/app/config/strings/ru/buff.lua b/lua/app/config/strings/ru/buff.lua index 8347d4fa..988ea298 100644 --- a/lua/app/config/strings/ru/buff.lua +++ b/lua/app/config/strings/ru/buff.lua @@ -44,8 +44,8 @@ local buff = { [36]={ ["name"]="normal_attack_dec" }, - [46]={ - ["name"]="shield" + [47]={ + ["name"]="shield_rebound_200" } } local keys = { @@ -65,7 +65,7 @@ local keys = { ["stun"]=buff[33], ["shield"]=buff[34], ["normal_attack_dec"]=buff[36], - ["shield"]=buff[46] + ["shield_rebound_200"]=buff[47] } } local config = { diff --git a/lua/app/config/strings/ru/item.lua b/lua/app/config/strings/ru/item.lua index 8e5b2364..9505cbf1 100644 --- a/lua/app/config/strings/ru/item.lua +++ b/lua/app/config/strings/ru/item.lua @@ -16,6 +16,9 @@ local item = { }, [6]={ + }, + [7]={ + }, [12001]={ @@ -43,6 +46,6 @@ local item = { } } local config = { -data=item,count=14 +data=item,count=15 } return config \ No newline at end of file diff --git a/lua/app/config/strings/th/buff.lua b/lua/app/config/strings/th/buff.lua index 8347d4fa..988ea298 100644 --- a/lua/app/config/strings/th/buff.lua +++ b/lua/app/config/strings/th/buff.lua @@ -44,8 +44,8 @@ local buff = { [36]={ ["name"]="normal_attack_dec" }, - [46]={ - ["name"]="shield" + [47]={ + ["name"]="shield_rebound_200" } } local keys = { @@ -65,7 +65,7 @@ local keys = { ["stun"]=buff[33], ["shield"]=buff[34], ["normal_attack_dec"]=buff[36], - ["shield"]=buff[46] + ["shield_rebound_200"]=buff[47] } } local config = { diff --git a/lua/app/config/strings/th/item.lua b/lua/app/config/strings/th/item.lua index 8e5b2364..9505cbf1 100644 --- a/lua/app/config/strings/th/item.lua +++ b/lua/app/config/strings/th/item.lua @@ -16,6 +16,9 @@ local item = { }, [6]={ + }, + [7]={ + }, [12001]={ @@ -43,6 +46,6 @@ local item = { } } local config = { -data=item,count=14 +data=item,count=15 } return config \ No newline at end of file diff --git a/lua/app/config/strings/vi/buff.lua b/lua/app/config/strings/vi/buff.lua index 8347d4fa..988ea298 100644 --- a/lua/app/config/strings/vi/buff.lua +++ b/lua/app/config/strings/vi/buff.lua @@ -44,8 +44,8 @@ local buff = { [36]={ ["name"]="normal_attack_dec" }, - [46]={ - ["name"]="shield" + [47]={ + ["name"]="shield_rebound_200" } } local keys = { @@ -65,7 +65,7 @@ local keys = { ["stun"]=buff[33], ["shield"]=buff[34], ["normal_attack_dec"]=buff[36], - ["shield"]=buff[46] + ["shield_rebound_200"]=buff[47] } } local config = { diff --git a/lua/app/config/strings/vi/item.lua b/lua/app/config/strings/vi/item.lua index f646c2c7..4aeba37a 100644 --- a/lua/app/config/strings/vi/item.lua +++ b/lua/app/config/strings/vi/item.lua @@ -19,6 +19,9 @@ local item = { }, [6]={ + }, + [7]={ + }, [12001]={ @@ -46,6 +49,6 @@ local item = { } } local config = { -data=item,count=14 +data=item,count=15 } return config \ No newline at end of file diff --git a/lua/app/config/strings/zh/buff.lua b/lua/app/config/strings/zh/buff.lua index d6acdfb5..a265a0a2 100644 --- a/lua/app/config/strings/zh/buff.lua +++ b/lua/app/config/strings/zh/buff.lua @@ -59,9 +59,9 @@ local buff = { ["desc"]="普攻攻擊次數減少", ["name"]="normal_attack_dec" }, - [46]={ + [47]={ ["desc"]="護盾可抵擋一定的傷害，並有200%反傷", - ["name"]="shield" + ["name"]="shield_rebound_200" } } local keys = { @@ -81,7 +81,7 @@ local keys = { ["stun"]=buff[33], ["shield"]=buff[34], ["normal_attack_dec"]=buff[36], - ["shield"]=buff[46] + ["shield_rebound_200"]=buff[47] } } local config = { diff --git a/lua/app/config/strings/zh/item.lua b/lua/app/config/strings/zh/item.lua index 00969123..7b9abb78 100644 --- a/lua/app/config/strings/zh/item.lua +++ b/lua/app/config/strings/zh/item.lua @@ -22,6 +22,9 @@ local item = { [6]={ ["name"]="史詩英雄", ["desc"]="可以獲得史詩英雄。" + }, + [7]={ + }, [12001]={ ["name"]="洛克西英雄碎片", @@ -57,6 +60,6 @@ local item = { } } local config = { -data=item,count=14 +data=item,count=15 } return config \ No newline at end of file diff --git a/lua/app/config/task.lua b/lua/app/config/task.lua new file mode 100644 index 00000000..81639699 --- /dev/null +++ b/lua/app/config/task.lua @@ -0,0 +1,1324 @@ +local task = { + [1]={ + ["type"]=1, + ["number"]=10, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + [2]={ + ["type"]=20, + ["number"]=5, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + [3]={ + ["type"]=21, + ["number"]=1, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=7, + ["id_for_nothing"]="UQ==", + ["num"]=50, + ["num_for_nothing"]="Uwg=" + } + } + }, + [4]={ + ["type"]=2, + ["number"]=500, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=7, + ["id_for_nothing"]="UQ==", + ["num"]=50, + ["num_for_nothing"]="Uwg=" + } + } + }, + [5]={ + ["type"]=2, + ["number"]=650, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=7, + ["id_for_nothing"]="UQ==", + ["num"]=75, + ["num_for_nothing"]="UQ0=" + } + } + }, + [6]={ + ["type"]=2, + ["number"]=800, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=7, + ["id_for_nothing"]="UQ==", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + } + } + }, + [7]={ + ["type"]=2, + ["number"]=1000, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=7, + ["id_for_nothing"]="UQ==", + ["num"]=125, + ["num_for_nothing"]="VwpZ" + } + } + }, + [8]={ + ["type"]=3, + ["number"]=20, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=7, + ["id_for_nothing"]="UQ==", + ["num"]=50, + ["num_for_nothing"]="Uwg=" + } + }, + ["lock"]=3 + }, + [9]={ + ["type"]=3, + ["number"]=25, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=7, + ["id_for_nothing"]="UQ==", + ["num"]=75, + ["num_for_nothing"]="UQ0=" + } + }, + ["lock"]=3 + }, + [10]={ + ["type"]=3, + ["number"]=30, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=7, + ["id_for_nothing"]="UQ==", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + } + }, + ["lock"]=3 + }, + [11]={ + ["type"]=3, + ["number"]=40, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=7, + ["id_for_nothing"]="UQ==", + ["num"]=125, + ["num_for_nothing"]="VwpZ" + } + }, + ["lock"]=3 + }, + [12]={ + ["type"]=4, + ["number"]=500, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=7, + ["id_for_nothing"]="UQ==", + ["num"]=50, + ["num_for_nothing"]="Uwg=" + } + } + }, + [13]={ + ["type"]=4, + ["number"]=650, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=7, + ["id_for_nothing"]="UQ==", + ["num"]=75, + ["num_for_nothing"]="UQ0=" + } + } + }, + [14]={ + ["type"]=4, + ["number"]=800, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=7, + ["id_for_nothing"]="UQ==", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + } + } + }, + [15]={ + ["type"]=4, + ["number"]=1000, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=7, + ["id_for_nothing"]="UQ==", + ["num"]=125, + ["num_for_nothing"]="VwpZ" + } + } + }, + [16]={ + ["type"]=5, + ["number"]=50, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=7, + ["id_for_nothing"]="UQ==", + ["num"]=50, + ["num_for_nothing"]="Uwg=" + } + }, + ["lock"]=3 + }, + [17]={ + ["type"]=5, + ["number"]=65, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=7, + ["id_for_nothing"]="UQ==", + ["num"]=75, + ["num_for_nothing"]="UQ0=" + } + }, + ["lock"]=3 + }, + [18]={ + ["type"]=5, + ["number"]=80, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=7, + ["id_for_nothing"]="UQ==", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + } + }, + ["lock"]=3 + }, + [19]={ + ["type"]=5, + ["number"]=100, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=7, + ["id_for_nothing"]="UQ==", + ["num"]=125, + ["num_for_nothing"]="VwpZ" + } + }, + ["lock"]=3 + }, + [20]={ + ["type"]=6, + ["number"]=1, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=7, + ["id_for_nothing"]="UQ==", + ["num"]=50, + ["num_for_nothing"]="Uwg=" + } + } + }, + [21]={ + ["type"]=6, + ["number"]=2, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=7, + ["id_for_nothing"]="UQ==", + ["num"]=75, + ["num_for_nothing"]="UQ0=" + } + } + }, + [22]={ + ["type"]=6, + ["number"]=3, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=7, + ["id_for_nothing"]="UQ==", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + } + } + }, + [23]={ + ["type"]=6, + ["number"]=4, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=7, + ["id_for_nothing"]="UQ==", + ["num"]=125, + ["num_for_nothing"]="VwpZ" + } + } + }, + [24]={ + ["type"]=7, + ["number"]=1, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=7, + ["id_for_nothing"]="UQ==", + ["num"]=50, + ["num_for_nothing"]="Uwg=" + } + }, + ["lock"]=10 + }, + [25]={ + ["type"]=7, + ["number"]=1, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=7, + ["id_for_nothing"]="UQ==", + ["num"]=75, + ["num_for_nothing"]="UQ0=" + } + }, + ["lock"]=10 + }, + [26]={ + ["type"]=7, + ["number"]=1, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=7, + ["id_for_nothing"]="UQ==", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + } + }, + ["lock"]=10 + }, + [27]={ + ["type"]=7, + ["number"]=1, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=7, + ["id_for_nothing"]="UQ==", + ["num"]=125, + ["num_for_nothing"]="VwpZ" + } + }, + ["lock"]=10 + }, + [28]={ + ["type"]=8, + ["number"]=2, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=7, + ["id_for_nothing"]="UQ==", + ["num"]=50, + ["num_for_nothing"]="Uwg=" + } + }, + ["lock"]=5 + }, + [29]={ + ["type"]=8, + ["number"]=3, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=7, + ["id_for_nothing"]="UQ==", + ["num"]=75, + ["num_for_nothing"]="UQ0=" + } + }, + ["lock"]=5 + }, + [30]={ + ["type"]=8, + ["number"]=4, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=7, + ["id_for_nothing"]="UQ==", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + } + }, + ["lock"]=5 + }, + [31]={ + ["type"]=8, + ["number"]=5, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=7, + ["id_for_nothing"]="UQ==", + ["num"]=125, + ["num_for_nothing"]="VwpZ" + } + }, + ["lock"]=5 + }, + [32]={ + ["type"]=9, + ["number"]=1, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=7, + ["id_for_nothing"]="UQ==", + ["num"]=50, + ["num_for_nothing"]="Uwg=" + } + } + }, + [33]={ + ["type"]=9, + ["number"]=2, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=7, + ["id_for_nothing"]="UQ==", + ["num"]=75, + ["num_for_nothing"]="UQ0=" + } + } + }, + [34]={ + ["type"]=9, + ["number"]=3, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=7, + ["id_for_nothing"]="UQ==", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + } + } + }, + [35]={ + ["type"]=9, + ["number"]=4, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=7, + ["id_for_nothing"]="UQ==", + ["num"]=125, + ["num_for_nothing"]="VwpZ" + } + } + }, + [36]={ + ["type"]=10, + ["number"]=1, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=7, + ["id_for_nothing"]="UQ==", + ["num"]=50, + ["num_for_nothing"]="Uwg=" + } + }, + ["lock"]=4 + }, + [37]={ + ["type"]=10, + ["number"]=1, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=7, + ["id_for_nothing"]="UQ==", + ["num"]=75, + ["num_for_nothing"]="UQ0=" + } + }, + ["lock"]=4 + }, + [38]={ + ["type"]=10, + ["number"]=2, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=7, + ["id_for_nothing"]="UQ==", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + } + }, + ["lock"]=4 + }, + [39]={ + ["type"]=10, + ["number"]=2, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=7, + ["id_for_nothing"]="UQ==", + ["num"]=125, + ["num_for_nothing"]="VwpZ" + } + }, + ["lock"]=4 + }, + [40]={ + ["type"]=11, + ["number"]=5, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=7, + ["id_for_nothing"]="UQ==", + ["num"]=50, + ["num_for_nothing"]="Uwg=" + } + }, + ["lock"]=5 + }, + [41]={ + ["type"]=11, + ["number"]=10, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=7, + ["id_for_nothing"]="UQ==", + ["num"]=75, + ["num_for_nothing"]="UQ0=" + } + }, + ["lock"]=5 + }, + [42]={ + ["type"]=11, + ["number"]=15, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=7, + ["id_for_nothing"]="UQ==", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + } + }, + ["lock"]=5 + }, + [43]={ + ["type"]=11, + ["number"]=20, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=7, + ["id_for_nothing"]="UQ==", + ["num"]=125, + ["num_for_nothing"]="VwpZ" + } + }, + ["lock"]=5 + }, + [44]={ + ["type"]=12, + ["number"]=4, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=7, + ["id_for_nothing"]="UQ==", + ["num"]=50, + ["num_for_nothing"]="Uwg=" + } + } + }, + [45]={ + ["type"]=12, + ["number"]=6, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=7, + ["id_for_nothing"]="UQ==", + ["num"]=75, + ["num_for_nothing"]="UQ0=" + } + } + }, + [46]={ + ["type"]=12, + ["number"]=8, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=7, + ["id_for_nothing"]="UQ==", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + } + } + }, + [47]={ + ["type"]=12, + ["number"]=10, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=7, + ["id_for_nothing"]="UQ==", + ["num"]=125, + ["num_for_nothing"]="VwpZ" + } + } + }, + [48]={ + ["type"]=13, + ["number"]=10, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=7, + ["id_for_nothing"]="UQ==", + ["num"]=50, + ["num_for_nothing"]="Uwg=" + } + } + }, + [49]={ + ["type"]=13, + ["number"]=20, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=7, + ["id_for_nothing"]="UQ==", + ["num"]=75, + ["num_for_nothing"]="UQ0=" + } + } + }, + [50]={ + ["type"]=13, + ["number"]=30, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=7, + ["id_for_nothing"]="UQ==", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + } + } + }, + [51]={ + ["type"]=13, + ["number"]=40, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=7, + ["id_for_nothing"]="UQ==", + ["num"]=125, + ["num_for_nothing"]="VwpZ" + } + } + }, + [52]={ + ["type"]=14, + ["number"]=20, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=7, + ["id_for_nothing"]="UQ==", + ["num"]=50, + ["num_for_nothing"]="Uwg=" + } + } + }, + [53]={ + ["type"]=14, + ["number"]=25, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=7, + ["id_for_nothing"]="UQ==", + ["num"]=75, + ["num_for_nothing"]="UQ0=" + } + } + }, + [54]={ + ["type"]=14, + ["number"]=30, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=7, + ["id_for_nothing"]="UQ==", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + } + } + }, + [55]={ + ["type"]=14, + ["number"]=40, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=7, + ["id_for_nothing"]="UQ==", + ["num"]=125, + ["num_for_nothing"]="VwpZ" + } + } + }, + [56]={ + ["type"]=15, + ["number"]=5, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=7, + ["id_for_nothing"]="UQ==", + ["num"]=50, + ["num_for_nothing"]="Uwg=" + } + } + }, + [57]={ + ["type"]=15, + ["number"]=6, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=7, + ["id_for_nothing"]="UQ==", + ["num"]=75, + ["num_for_nothing"]="UQ0=" + } + } + }, + [58]={ + ["type"]=15, + ["number"]=8, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=7, + ["id_for_nothing"]="UQ==", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + } + } + }, + [59]={ + ["type"]=15, + ["number"]=10, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=7, + ["id_for_nothing"]="UQ==", + ["num"]=125, + ["num_for_nothing"]="VwpZ" + } + } + }, + [60]={ + ["type"]=16, + ["number"]=2, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=7, + ["id_for_nothing"]="UQ==", + ["num"]=50, + ["num_for_nothing"]="Uwg=" + } + } + }, + [61]={ + ["type"]=16, + ["number"]=3, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=7, + ["id_for_nothing"]="UQ==", + ["num"]=75, + ["num_for_nothing"]="UQ0=" + } + } + }, + [62]={ + ["type"]=16, + ["number"]=3, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=7, + ["id_for_nothing"]="UQ==", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + } + } + }, + [63]={ + ["type"]=16, + ["number"]=4, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=7, + ["id_for_nothing"]="UQ==", + ["num"]=125, + ["num_for_nothing"]="VwpZ" + } + } + }, + [64]={ + ["type"]=17, + ["number"]=5, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=7, + ["id_for_nothing"]="UQ==", + ["num"]=50, + ["num_for_nothing"]="Uwg=" + } + } + }, + [65]={ + ["type"]=17, + ["number"]=6, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=7, + ["id_for_nothing"]="UQ==", + ["num"]=75, + ["num_for_nothing"]="UQ0=" + } + } + }, + [66]={ + ["type"]=17, + ["number"]=8, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=7, + ["id_for_nothing"]="UQ==", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + } + } + }, + [67]={ + ["type"]=17, + ["number"]=10, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=7, + ["id_for_nothing"]="UQ==", + ["num"]=125, + ["num_for_nothing"]="VwpZ" + } + } + }, + [68]={ + ["type"]=18, + ["number"]=8, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=7, + ["id_for_nothing"]="UQ==", + ["num"]=50, + ["num_for_nothing"]="Uwg=" + } + } + }, + [69]={ + ["type"]=18, + ["number"]=12, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=7, + ["id_for_nothing"]="UQ==", + ["num"]=75, + ["num_for_nothing"]="UQ0=" + } + } + }, + [70]={ + ["type"]=18, + ["number"]=15, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=7, + ["id_for_nothing"]="UQ==", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + } + } + }, + [71]={ + ["type"]=18, + ["number"]=20, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=7, + ["id_for_nothing"]="UQ==", + ["num"]=125, + ["num_for_nothing"]="VwpZ" + } + } + }, + [72]={ + ["type"]=19, + ["number"]=15, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=7, + ["id_for_nothing"]="UQ==", + ["num"]=50, + ["num_for_nothing"]="Uwg=" + } + } + }, + [73]={ + ["type"]=19, + ["number"]=20, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=7, + ["id_for_nothing"]="UQ==", + ["num"]=75, + ["num_for_nothing"]="UQ0=" + } + } + }, + [74]={ + ["type"]=19, + ["number"]=25, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=7, + ["id_for_nothing"]="UQ==", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + } + } + }, + [75]={ + ["type"]=19, + ["number"]=30, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=7, + ["id_for_nothing"]="UQ==", + ["num"]=125, + ["num_for_nothing"]="VwpZ" + } + } + }, + [76]={ + ["type"]=2, + ["number"]=1200, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=7, + ["id_for_nothing"]="UQ==", + ["num"]=150, + ["num_for_nothing"]="Vw1c" + } + } + }, + [77]={ + ["type"]=3, + ["number"]=50, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=7, + ["id_for_nothing"]="UQ==", + ["num"]=150, + ["num_for_nothing"]="Vw1c" + } + }, + ["lock"]=3 + }, + [78]={ + ["type"]=5, + ["number"]=120, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=7, + ["id_for_nothing"]="UQ==", + ["num"]=150, + ["num_for_nothing"]="Vw1c" + } + }, + ["lock"]=3 + }, + [79]={ + ["type"]=6, + ["number"]=5, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=7, + ["id_for_nothing"]="UQ==", + ["num"]=150, + ["num_for_nothing"]="Vw1c" + } + } + }, + [80]={ + ["type"]=7, + ["number"]=2, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=7, + ["id_for_nothing"]="UQ==", + ["num"]=150, + ["num_for_nothing"]="Vw1c" + } + }, + ["lock"]=10 + }, + [81]={ + ["type"]=8, + ["number"]=6, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=7, + ["id_for_nothing"]="UQ==", + ["num"]=150, + ["num_for_nothing"]="Vw1c" + } + }, + ["lock"]=5 + }, + [82]={ + ["type"]=9, + ["number"]=5, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=7, + ["id_for_nothing"]="UQ==", + ["num"]=150, + ["num_for_nothing"]="Vw1c" + } + } + }, + [83]={ + ["type"]=10, + ["number"]=3, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=7, + ["id_for_nothing"]="UQ==", + ["num"]=150, + ["num_for_nothing"]="Vw1c" + } + }, + ["lock"]=4 + }, + [84]={ + ["type"]=11, + ["number"]=25, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=7, + ["id_for_nothing"]="UQ==", + ["num"]=150, + ["num_for_nothing"]="Vw1c" + } + }, + ["lock"]=5 + }, + [85]={ + ["type"]=12, + ["number"]=12, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=7, + ["id_for_nothing"]="UQ==", + ["num"]=150, + ["num_for_nothing"]="Vw1c" + } + } + }, + [86]={ + ["type"]=13, + ["number"]=50, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=7, + ["id_for_nothing"]="UQ==", + ["num"]=150, + ["num_for_nothing"]="Vw1c" + } + } + }, + [87]={ + ["type"]=14, + ["number"]=50, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=7, + ["id_for_nothing"]="UQ==", + ["num"]=150, + ["num_for_nothing"]="Vw1c" + } + } + }, + [88]={ + ["type"]=15, + ["number"]=12, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=7, + ["id_for_nothing"]="UQ==", + ["num"]=150, + ["num_for_nothing"]="Vw1c" + } + } + }, + [89]={ + ["type"]=16, + ["number"]=5, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=7, + ["id_for_nothing"]="UQ==", + ["num"]=150, + ["num_for_nothing"]="Vw1c" + } + } + }, + [90]={ + ["type"]=17, + ["number"]=12, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=7, + ["id_for_nothing"]="UQ==", + ["num"]=150, + ["num_for_nothing"]="Vw1c" + } + } + }, + [91]={ + ["type"]=18, + ["number"]=25, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=7, + ["id_for_nothing"]="UQ==", + ["num"]=150, + ["num_for_nothing"]="Vw1c" + } + } + }, + [92]={ + ["type"]=19, + ["number"]=35, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=7, + ["id_for_nothing"]="UQ==", + ["num"]=150, + ["num_for_nothing"]="Vw1c" + } + } + } +} +local config = { +data=task,count=92 +} +return config \ No newline at end of file diff --git a/lua/app/config/task.lua.meta b/lua/app/config/task.lua.meta new file mode 100644 index 00000000..ef087d89 --- /dev/null +++ b/lua/app/config/task.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 8ae000b3de17b394088b2cfc1a04796f +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/config/task_daily.lua b/lua/app/config/task_daily.lua new file mode 100644 index 00000000..67728cc0 --- /dev/null +++ b/lua/app/config/task_daily.lua @@ -0,0 +1,712 @@ +local task_daily = { + [1]={ + ["type"]=1, + ["reset"]=2, + ["task"]={ + { + 1, + 100 + } + } + }, + [2]={ + ["type"]=1, + ["reset"]=1, + ["task"]={ + { + 2, + 100 + } + } + }, + [3]={ + ["type"]=1, + ["reset"]=1, + ["task"]={ + { + 4, + 100 + }, + { + 5, + 100 + }, + { + 6, + 100 + }, + { + 8, + 100 + }, + { + 9, + 100 + }, + { + 10, + 100 + } + }, + ["ad_task"]={ + { + 7, + 100 + }, + { + 11, + 100 + }, + { + 14, + 100 + }, + { + 15, + 100 + }, + { + 18, + 100 + }, + { + 19, + 100 + }, + { + 34, + 100 + }, + { + 35, + 100 + }, + { + 74, + 100 + }, + { + 75, + 100 + }, + { + 58, + 100 + }, + { + 59, + 100 + }, + { + 62, + 100 + }, + { + 63, + 100 + }, + { + 70, + 100 + }, + { + 71, + 100 + }, + { + 54, + 100 + }, + { + 55, + 100 + } + }, + ["ad_refresh"]=1 + }, + [4]={ + ["type"]=1, + ["reset"]=1, + ["task"]={ + { + 12, + 100 + }, + { + 13, + 100 + }, + { + 14, + 100 + }, + { + 16, + 100 + }, + { + 17, + 100 + }, + { + 18, + 100 + } + }, + ["ad_task"]={ + { + 6, + 100 + }, + { + 7, + 100 + }, + { + 10, + 100 + }, + { + 11, + 100 + }, + { + 15, + 100 + }, + { + 19, + 100 + }, + { + 34, + 100 + }, + { + 35, + 100 + }, + { + 74, + 100 + }, + { + 75, + 100 + }, + { + 58, + 100 + }, + { + 59, + 100 + }, + { + 62, + 100 + }, + { + 63, + 100 + }, + { + 70, + 100 + }, + { + 71, + 100 + }, + { + 54, + 100 + }, + { + 55, + 100 + } + }, + ["ad_refresh"]=1 + }, + [5]={ + ["type"]=1, + ["reset"]=1, + ["task"]={ + { + 32, + 100 + }, + { + 33, + 100 + }, + { + 34, + 100 + }, + { + 72, + 100 + }, + { + 73, + 100 + }, + { + 74, + 100 + } + }, + ["ad_task"]={ + { + 6, + 100 + }, + { + 7, + 100 + }, + { + 10, + 100 + }, + { + 11, + 100 + }, + { + 14, + 100 + }, + { + 15, + 100 + }, + { + 18, + 100 + }, + { + 19, + 100 + }, + { + 35, + 100 + }, + { + 75, + 100 + }, + { + 58, + 100 + }, + { + 59, + 100 + }, + { + 62, + 100 + }, + { + 63, + 100 + }, + { + 70, + 100 + }, + { + 71, + 100 + }, + { + 54, + 100 + }, + { + 55, + 100 + } + }, + ["ad_refresh"]=1 + }, + [6]={ + ["type"]=1, + ["reset"]=1, + ["task"]={ + { + 56, + 100 + }, + { + 57, + 100 + }, + { + 58, + 100 + }, + { + 60, + 100 + }, + { + 61, + 100 + }, + { + 62, + 100 + } + }, + ["ad_task"]={ + { + 6, + 100 + }, + { + 7, + 100 + }, + { + 10, + 100 + }, + { + 11, + 100 + }, + { + 14, + 100 + }, + { + 15, + 100 + }, + { + 18, + 100 + }, + { + 19, + 100 + }, + { + 34, + 100 + }, + { + 35, + 100 + }, + { + 74, + 100 + }, + { + 75, + 100 + }, + { + 59, + 100 + }, + { + 63, + 100 + }, + { + 70, + 100 + }, + { + 71, + 100 + }, + { + 54, + 100 + }, + { + 55, + 100 + } + }, + ["ad_refresh"]=1 + }, + [7]={ + ["type"]=1, + ["reset"]=1, + ["task"]={ + { + 3, + 100 + } + } + }, + [8]={ + ["type"]=1, + ["reset"]=1, + ["task"]={ + { + 68, + 100 + }, + { + 69, + 100 + }, + { + 70, + 100 + }, + { + 52, + 100 + }, + { + 53, + 100 + }, + { + 54, + 100 + } + }, + ["ad_task"]={ + { + 6, + 100 + }, + { + 7, + 100 + }, + { + 10, + 100 + }, + { + 11, + 100 + }, + { + 14, + 100 + }, + { + 15, + 100 + }, + { + 18, + 100 + }, + { + 19, + 100 + }, + { + 34, + 100 + }, + { + 35, + 100 + }, + { + 74, + 100 + }, + { + 75, + 100 + }, + { + 58, + 100 + }, + { + 59, + 100 + }, + { + 62, + 100 + }, + { + 63, + 100 + }, + { + 71, + 100 + }, + { + 55, + 100 + } + }, + ["ad_refresh"]=1, + ["bounty"]=1 + }, + [9]={ + ["type"]=2, + ["reset"]=1, + ["task"]={ + { + 26, + 100 + }, + { + 27, + 100 + }, + { + 76, + 50 + }, + { + 77, + 50 + } + } + }, + [10]={ + ["type"]=2, + ["reset"]=1, + ["task"]={ + { + 38, + 100 + }, + { + 39, + 100 + }, + { + 78, + 50 + } + } + }, + [11]={ + ["type"]=2, + ["reset"]=1, + ["task"]={ + { + 50, + 100 + }, + { + 51, + 100 + }, + { + 91, + 50 + } + } + }, + [12]={ + ["type"]=2, + ["reset"]=1, + ["task"]={ + { + 66, + 100 + }, + { + 67, + 100 + }, + { + 82, + 50 + } + } + }, + [13]={ + ["type"]=2, + ["reset"]=1, + ["task"]={ + { + 30, + 100 + }, + { + 31, + 100 + } + } + }, + [14]={ + ["type"]=2, + ["reset"]=1, + ["task"]={ + { + 87, + 50 + }, + { + 42, + 100 + }, + { + 43, + 100 + } + } + }, + [15]={ + ["type"]=2, + ["reset"]=1, + ["task"]={ + { + 88, + 50 + }, + { + 89, + 50 + }, + { + 46, + 100 + }, + { + 47, + 100 + } + }, + ["bounty"]=1 + }, + [16]={ + ["type"]=2, + ["reset"]=1, + ["task"]={ + { + 92, + 100 + }, + { + 22, + 100 + }, + { + 23, + 100 + } + }, + ["bounty"]=1 + } +} +local config = { +data=task_daily,count=16 +} +return config \ No newline at end of file diff --git a/lua/app/config/task_daily.lua.meta b/lua/app/config/task_daily.lua.meta new file mode 100644 index 00000000..95b86df8 --- /dev/null +++ b/lua/app/config/task_daily.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 022c70d6a5d937d41b72d559d006efb8 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/module/battle/battle_const.lua b/lua/app/module/battle/battle_const.lua index 9c217e0f..fb686edf 100644 --- a/lua/app/module/battle/battle_const.lua +++ b/lua/app/module/battle/battle_const.lua @@ -125,6 +125,15 @@ BattleConst.MATCH_DMG_ADDITION_NAME = { } BattleConst.MATCH_DMG_DEC_NAME = { + [0] = "dmg_dec_none", + [1] = "dmg_dec_red", + [2] = "dmg_dec_yellow", + [3] = "dmg_dec_green", + [4] = "dmg_dec_blue", + [5] = "dmg_dec_purple", +} + +BattleConst.MATCH_DEC_DMG_NAME = { [0] = "dec_dmg_none", [1] = "dec_dmg_red", [2] = "dec_dmg_yellow", @@ -216,9 +225,21 @@ local BUFF_NAME = { CRIT_TIME_ADD = "crit_time_add", EXP_TIME_ADD = "exp_time_add", CURED_ADD = "cured_add", + CURED_DEC = "cured_dec", ADD_SKILL = "add_skill", SKILL_FIRE_TIMES = "skill_fire_times", SHIELD_REBOUND_200 = "shield_rebound_200", + BURN = "burn", + VULNERABLE = "vulnerable", + FROAEN = "frozen", + POISON = "poison", + IMPRISON = "imprison", + CORRUPT = "corrupt", + BLEED = "bleed", + WEAKEN = "weaken", + LETHARGY = "lethargy", + CURSE = "curse", + LOCK = "lock", } BattleConst.BUFF_NAME = BUFF_NAME @@ -247,13 +268,23 @@ local ATTR_NAME = { DMG_ADDITION_BLUE = "dmg_addition_blue", DMG_ADDITION_PURPLE = "dmg_addition_purple", DMG_ADDITION_ALL = "dmg_addition_all", + DMG_DEC_RED = "dmg_dec_red", + DMG_DEC_YELLOW = "dmg_dec_yellow", + DMG_DEC_GREEN = "dmg_dec_green", + DMG_DEC_BLUE = "dmg_dec_blue", + DMG_DEC_PURPLE = "dmg_dec_purple", + DMG_DEC_ALL = "dmg_dec_all", NORMAL_ATTACK_COUNT = "normal_attack_count", BLOCK = "block", CRIT = "crit", CRIT_TIME = "crit_time", EXP_TIME = "exp_time", CURE_ADDITION = "cure_addition", + CURE_DEC = "cure_dec", SHIELD_REBOUND = "shield_rebound", + BE_DMG_TO_HEAL = "be_dmg_to_heal", + + BE_SUCKED = "be_sucked", } BattleConst.ATTR_NAME = ATTR_NAME @@ -288,6 +319,11 @@ BattleConst.BUFF_NAME_TO_ATTR = { [BUFF_NAME.CRIT_TIME_ADD] = {ATTR_NAME.CRIT_TIME, false}, [BUFF_NAME.EXP_TIME_ADD] = {ATTR_NAME.EXP_TIME, false}, [BUFF_NAME.CURED_ADD] = {ATTR_NAME.CURE_ADDITION, false}, + [BUFF_NAME.VULNERABLE] = {ATTR_NAME.WEAKNESS_ALL, false}, + [BUFF_NAME.CORRUPT] = {ATTR_NAME.CURE_DEC, false}, + [BUFF_NAME.CURED_DEC] = {ATTR_NAME.CURE_DEC, false}, + [BUFF_NAME.WEAKEN] = {ATTR_NAME.DMG_DEC_ALL, false}, + [BUFF_NAME.CURSE] = {ATTR_NAME.BE_DMG_TO_HEAL, false}, } ---- 格子类型 diff --git a/lua/app/module/battle/component/battle_unit_comp.lua b/lua/app/module/battle/component/battle_unit_comp.lua index c5f1ceac..88d98fa2 100644 --- a/lua/app/module/battle/component/battle_unit_comp.lua +++ b/lua/app/module/battle/component/battle_unit_comp.lua @@ -644,6 +644,9 @@ function BattleUnitComp:updateRecoverHpWaveState(dt) self.recoverHpCount = self.recoverHpCount - 1 self.recoverHpTime = BattleConst.RECOVER_HP_INTERVAL local healNum = BattleConst.RECOVER_HP_PERCENT * self.unitEntity:getMaxHp() // DEFAULT_FACTOR + if healNum < 0 then -- 治疗效果不能为负数 + healNum = 0 + end self:takeDamageOrCure(self, healNum, EFFECT_TYPE.HEAL, 0) if self.recoverHpCount <= 0 then if self.finishRecoverHpCallback then @@ -1194,6 +1197,9 @@ function BattleUnitComp:takeDamageOrCure(atker, num, effectType, effectStatus) if num == 0 then return 0 end + if num < 0 and atker.unitEntity:getBeDmgToHeal() > 0 then + num = -num * atker.unitEntity:getBeDmgToHeal() // DEFAULT_FACTOR + end atker.unitEntity:addDamageCount(num) local shieldHpBefore = self.unitEntity:getShieldHp() local hpRealReduce = self.unitEntity:takeDamageOrCure(num) diff --git a/lua/app/module/battle/helper/battle_formula.lua b/lua/app/module/battle/helper/battle_formula.lua index e5b67f9f..ec7c4c7b 100644 --- a/lua/app/module/battle/helper/battle_formula.lua +++ b/lua/app/module/battle/helper/battle_formula.lua @@ -15,11 +15,11 @@ function BattleFormula:getDamageOrCureResult(unitComp, buff, targetUnitComp) end BattleFormula.calculateFormula = { - -- （攻击）*技能倍率*(1+(攻击者元素伤害增加+所有伤害增加）（攻击者）+(受到元素伤害增加+受到所有伤害增加（受击）-受到元素伤害降低-受到所有伤害降低（受击）*暴击伤害 + -- （攻击）*技能倍率*(1+(攻击者元素伤害增加+所有伤害增加）（攻击者）- (攻击者元素伤害降低+所有伤害降低) +(受到元素伤害增加+受到所有伤害增加（受击）-受到元素伤害降低-受到所有伤害降低（受击）*暴击伤害 [1] = function(unitComp, buff, targetUnit) local matchType = unitComp.unitEntity:getMatchType() local result = unitComp.unitEntity:getAtk() * buff:getEffectNum() // DEFAULT_FACTOR * - (DEFAULT_FACTOR + unitComp.unitEntity:getDmgAddition() + targetUnit.unitEntity:getWeakness(matchType) - targetUnit.unitEntity:getDmgDec(matchType)) // DEFAULT_FACTOR + (DEFAULT_FACTOR + unitComp.unitEntity:getDmgAddition() - unitComp.unitEntity:getDmgDec() + targetUnit.unitEntity:getWeakness(matchType) - targetUnit.unitEntity:getDecDmg(matchType)) // DEFAULT_FACTOR local hurtState = 0 local crit = unitComp.unitEntity:getCrit() if crit > 0 then @@ -32,19 +32,21 @@ BattleFormula.calculateFormula = { end, -- 生命值*回合开始时的回血系数*(1 + 治疗效果增加) [2] = function(unitComp, buff, targetUnit) - local result = targetUnit.unitEntity:getMaxHp() * buff:getEffectNum() // DEFAULT_FACTOR * (unitComp.unitEntity:getCureAddition() + DEFAULT_FACTOR) // DEFAULT_FACTOR + local result = targetUnit.unitEntity:getMaxHp() * buff:getEffectNum() // DEFAULT_FACTOR * (unitComp.unitEntity:getCureAddition() - unitComp.unitEntity:getCureDec() + DEFAULT_FACTOR) // DEFAULT_FACTOR return result, 0 end, -- 角色攻击力*技能倍率*(1+治疗效果增加) [3] = function(unitComp, buff, targetUnit) - local result = unitComp.unitEntity:getAtk() * buff:getEffectNum() // DEFAULT_FACTOR * (unitComp.unitEntity:getCureAddition() + DEFAULT_FACTOR) // DEFAULT_FACTOR + local result = unitComp.unitEntity:getAtk() * buff:getEffectNum() // DEFAULT_FACTOR * (unitComp.unitEntity:getCureAddition() - unitComp.unitEntity:getCureDec() + DEFAULT_FACTOR) // DEFAULT_FACTOR return result, 0 end, - -- buff释放方攻击力*技能倍率 + -- 释放者攻击*技能系数*(1+(攻击者元素伤害增加+所有伤害增加-攻击者元素伤害降低-所有伤害降低+受到元素伤害增加+受到所有伤害增加（受击）-受到元素伤害降低-受到所有伤害降低（受击）) [4] = function(unitComp, buff, targetUnit) - local result = unitComp.unitEntity:getAtk() * buff:getEffectNum() // DEFAULT_FACTOR + local matchType = unitComp.unitEntity:getMatchType() + local result = unitComp.unitEntity:getAtk() * buff:getEffectNum() // DEFAULT_FACTOR * + (DEFAULT_FACTOR + unitComp.unitEntity:getDmgAddition() - unitComp.unitEntity:getDmgDec() + targetUnit.unitEntity:getWeakness(matchType) - targetUnit.unitEntity:getDecDmg(matchType)) // DEFAULT_FACTOR return result, 0 - end + end, } return BattleFormula \ No newline at end of file diff --git a/lua/app/userdata/battle/team/battle_team_entity.lua b/lua/app/userdata/battle/team/battle_team_entity.lua index 4834417e..9b03dbf1 100644 --- a/lua/app/userdata/battle/team/battle_team_entity.lua +++ b/lua/app/userdata/battle/team/battle_team_entity.lua @@ -6,6 +6,7 @@ local BattleTeamEntity = class("BattleTeamEntity", BaseData) local MATCH_ATTACK_NAME = GConst.MATCH_ATTACK_NAME local MATCH_DMG_ADDITION_NAME = BattleConst.MATCH_DMG_ADDITION_NAME +local MATCH_DEC_DMG_NAME = BattleConst.MATCH_DEC_DMG_NAME local MATCH_DMG_DEC_NAME = BattleConst.MATCH_DMG_DEC_NAME local MATCH_WEAKNESS_NAME = BattleConst.MATCH_WEAKNESS_NAME local DEFAULT_FACTOR = BattleConst.DEFAULT_FACTOR @@ -85,6 +86,7 @@ function BattleTeamEntity:addBaseAttr(unitAttr) end function BattleTeamEntity:addAttr(name, num, isPercent) + Logger.logHighlight(name) local addNum = 0 if isPercent then if self.attr[name] then @@ -146,7 +148,11 @@ function BattleTeamEntity:getDmgAddition(matchType) end function BattleTeamEntity:getDmgDec(matchType) - return (self.attr.dec_dmg_all or 0) + (self.attr[MATCH_DMG_DEC_NAME[matchType]] or 0) + return (self.attr.dmg_dec_all or 0) + (self.attr[MATCH_DMG_DEC_NAME[matchType]] or 0) +end + +function BattleTeamEntity:getDecDmg(matchType) + return (self.attr.dec_dmg_all or 0) + (self.attr[MATCH_DEC_DMG_NAME[matchType]] or 0) end function BattleTeamEntity:getWeakness(matchType) @@ -165,6 +171,14 @@ function BattleTeamEntity:getCureAddition() return self.attr.cure_addition or 0 end +function BattleTeamEntity:getCureDec() + return self.attr.cure_dec or 0 +end + +function BattleTeamEntity:getBeDmgToHeal() + return self.attr.be_dmg_to_heal or 0 +end + function BattleTeamEntity:getNormalAttackAddCount() return self.attr[ATTR_NAME.NORMAL_ATTACK_COUNT] or 0 end diff --git a/lua/app/userdata/battle/team/battle_unit_entity.lua b/lua/app/userdata/battle/team/battle_unit_entity.lua index d2b32e1f..4fdaf183 100644 --- a/lua/app/userdata/battle/team/battle_unit_entity.lua +++ b/lua/app/userdata/battle/team/battle_unit_entity.lua @@ -258,8 +258,12 @@ function BattleUnitEntity:getDmgAddition() return self.team:getDmgAddition(self.unitData.matchType) end -function BattleUnitEntity:getDmgDec(matchType) - return self.team:getDmgDec(matchType) +function BattleUnitEntity:getDmgDec() + return self.team:getDmgDec(self.unitData.matchType) +end + +function BattleUnitEntity:getDecDmg(matchType) + return self.team:getDecDmg(matchType) end function BattleUnitEntity:getWeakness(matchType) @@ -278,6 +282,14 @@ function BattleUnitEntity:getCureAddition() return self.team:getCureAddition() end +function BattleUnitEntity:getCureDec() + return self.team:getCureDec() +end + +function BattleUnitEntity:getBeDmgToHeal() + return self.team:getBeDmgToHeal() +end + function BattleUnitEntity:getNormalAttackAddCount() return self.team:getNormalAttackAddCount() end From 607d9d9d651503e83918437900c48aab2348372a Mon Sep 17 00:00:00 2001 From: xiekaidong Date: Tue, 9 May 2023 15:47:38 +0800 Subject: [PATCH 03/23] =?UTF-8?q?=E6=B5=81=E8=A1=80buff?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/app/config/act_gift.lua | 808 +++++++++++++++++- lua/app/config/chapter.lua | 3 - lua/app/config/skill.lua | 6 - .../battle/component/battle_unit_comp.lua | 3 + .../battle/helper/battle_buff_handle.lua | 2 + .../battle/helper/battle_buff_special.lua | 34 + .../battle/team/battle_team_entity.lua | 4 + .../battle/team/battle_unit_entity.lua | 4 + 8 files changed, 852 insertions(+), 12 deletions(-) diff --git a/lua/app/config/act_gift.lua b/lua/app/config/act_gift.lua index 853ca841..ebcbd5eb 100644 --- a/lua/app/config/act_gift.lua +++ b/lua/app/config/act_gift.lua @@ -1,20 +1,822 @@ local act_gift = { - [10002]={ + [70102]={ ["type"]=7, ["recharge_id"]=11, ["time_type"]=3, ["limit"]=1, ["value"]=3000 }, - [10102]={ + [70202]={ ["type"]=7, ["recharge_id"]=12, ["time_type"]=3, ["limit"]=1, ["value"]=25 + }, + [20102]={ + ["type"]=2, + ["pay_condition"]={ + 0, + 5 + }, + ["recharge_id"]=4, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=80000, + ["num_for_nothing"]="XghcA2U=" + } + }, + ["time_type"]=1, + ["limit_time"]=1, + ["cd"]=6, + ["limit"]=1, + ["value"]=800 + }, + [20202]={ + ["type"]=2, + ["pay_condition"]={ + 5, + 20 + }, + ["recharge_id"]=5, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=120000, + ["num_for_nothing"]="VwpcA2VR" + } + }, + ["time_type"]=1, + ["limit_time"]=1, + ["cd"]=6, + ["limit"]=1, + ["value"]=800 + }, + [20302]={ + ["type"]=2, + ["pay_condition"]={ + 20, + 9999 + }, + ["recharge_id"]=7, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=180000, + ["num_for_nothing"]="VwBcA2VR" + } + }, + ["time_type"]=1, + ["limit_time"]=1, + ["cd"]=6, + ["limit"]=1, + ["value"]=800 + }, + [50102]={ + ["type"]=5, + ["pay_condition"]={ + 0, + 10 + }, + ["parameter"]=5, + ["recharge_id"]=4, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=20, + ["num_for_nothing"]="VAg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=4, + ["id_for_nothing"]="Ug==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + ["time_type"]=3, + ["limit"]=1, + ["value"]=800 + }, + [50202]={ + ["type"]=5, + ["pay_condition"]={ + 10, + 20 + }, + ["parameter"]=5, + ["recharge_id"]=6, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=40, + ["num_for_nothing"]="Ugg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=4, + ["id_for_nothing"]="Ug==", + ["num"]=2, + ["num_for_nothing"]="VA==" + } + }, + ["time_type"]=3, + ["limit"]=1, + ["value"]=800 + }, + [50302]={ + ["type"]=5, + ["pay_condition"]={ + 20, + 9999 + }, + ["parameter"]=5, + ["recharge_id"]=8, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=60, + ["num_for_nothing"]="UAg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=4, + ["id_for_nothing"]="Ug==", + ["num"]=3, + ["num_for_nothing"]="VQ==" + } + }, + ["time_type"]=3, + ["limit"]=1, + ["value"]=800 + }, + [50402]={ + ["type"]=5, + ["pay_condition"]={ + 0, + 10 + }, + ["parameter"]=10, + ["recharge_id"]=4, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=50, + ["num_for_nothing"]="Uwg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + ["time_type"]=3, + ["limit"]=1, + ["value"]=800 + }, + [50502]={ + ["type"]=5, + ["pay_condition"]={ + 10, + 20 + }, + ["parameter"]=10, + ["recharge_id"]=6, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=60, + ["num_for_nothing"]="UAg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=2, + ["num_for_nothing"]="VA==" + } + }, + ["time_type"]=3, + ["limit"]=1, + ["value"]=800 + }, + [50602]={ + ["type"]=5, + ["pay_condition"]={ + 20, + 30 + }, + ["parameter"]=10, + ["recharge_id"]=8, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=70, + ["num_for_nothing"]="UQg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=3, + ["num_for_nothing"]="VQ==" + } + }, + ["time_type"]=3, + ["limit"]=1, + ["value"]=800 + }, + [50702]={ + ["type"]=5, + ["pay_condition"]={ + 30, + 9999 + }, + ["parameter"]=10, + ["recharge_id"]=9, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=80, + ["num_for_nothing"]="Xgg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=3, + ["num_for_nothing"]="VQ==" + } + }, + ["time_type"]=3, + ["limit"]=1, + ["value"]=800 + }, + [50802]={ + ["type"]=5, + ["pay_condition"]={ + 0, + 10 + }, + ["parameter"]=15, + ["recharge_id"]=4, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=50, + ["num_for_nothing"]="Uwg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + ["time_type"]=3, + ["limit"]=1, + ["value"]=800 + }, + [50902]={ + ["type"]=5, + ["pay_condition"]={ + 10, + 20 + }, + ["parameter"]=15, + ["recharge_id"]=6, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=60, + ["num_for_nothing"]="UAg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=2, + ["num_for_nothing"]="VA==" + } + }, + ["time_type"]=3, + ["limit"]=1, + ["value"]=800 + }, + [51002]={ + ["type"]=5, + ["pay_condition"]={ + 20, + 30 + }, + ["parameter"]=15, + ["recharge_id"]=8, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=70, + ["num_for_nothing"]="UQg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=3, + ["num_for_nothing"]="VQ==" + } + }, + ["time_type"]=3, + ["limit"]=1, + ["value"]=800 + }, + [51102]={ + ["type"]=5, + ["pay_condition"]={ + 30, + 9999 + }, + ["parameter"]=15, + ["recharge_id"]=9, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=80, + ["num_for_nothing"]="Xgg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=3, + ["num_for_nothing"]="VQ==" + } + }, + ["time_type"]=3, + ["limit"]=1, + ["value"]=800 + }, + [51202]={ + ["type"]=5, + ["pay_condition"]={ + 0, + 10 + }, + ["parameter"]=20, + ["recharge_id"]=4, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=55, + ["num_for_nothing"]="Uw0=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + ["time_type"]=3, + ["limit"]=1, + ["value"]=800 + }, + [51302]={ + ["type"]=5, + ["pay_condition"]={ + 10, + 20 + }, + ["parameter"]=20, + ["recharge_id"]=6, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=65, + ["num_for_nothing"]="UA0=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=2, + ["num_for_nothing"]="VA==" + } + }, + ["time_type"]=3, + ["limit"]=1, + ["value"]=800 + }, + [51402]={ + ["type"]=5, + ["pay_condition"]={ + 20, + 30 + }, + ["parameter"]=20, + ["recharge_id"]=8, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=75, + ["num_for_nothing"]="UQ0=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=3, + ["num_for_nothing"]="VQ==" + } + }, + ["time_type"]=3, + ["limit"]=1, + ["value"]=800 + }, + [51502]={ + ["type"]=5, + ["pay_condition"]={ + 30, + 9999 + }, + ["parameter"]=20, + ["recharge_id"]=9, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=85, + ["num_for_nothing"]="Xg0=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=3, + ["num_for_nothing"]="VQ==" + } + }, + ["time_type"]=3, + ["limit"]=1, + ["value"]=800 + }, + [51602]={ + ["type"]=5, + ["pay_condition"]={ + 0, + 10 + }, + ["parameter"]=25, + ["recharge_id"]=4, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=50, + ["num_for_nothing"]="Uwg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + ["time_type"]=3, + ["limit"]=1, + ["value"]=800 + }, + [51702]={ + ["type"]=5, + ["pay_condition"]={ + 10, + 20 + }, + ["parameter"]=25, + ["recharge_id"]=6, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=60, + ["num_for_nothing"]="UAg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=2, + ["num_for_nothing"]="VA==" + } + }, + ["time_type"]=3, + ["limit"]=1, + ["value"]=800 + }, + [51802]={ + ["type"]=5, + ["pay_condition"]={ + 20, + 30 + }, + ["parameter"]=25, + ["recharge_id"]=8, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=70, + ["num_for_nothing"]="UQg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=3, + ["num_for_nothing"]="VQ==" + } + }, + ["time_type"]=3, + ["limit"]=1, + ["value"]=800 + }, + [51902]={ + ["type"]=5, + ["pay_condition"]={ + 30, + 9999 + }, + ["parameter"]=25, + ["recharge_id"]=9, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=80, + ["num_for_nothing"]="Xgg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=3, + ["num_for_nothing"]="VQ==" + } + }, + ["time_type"]=3, + ["limit"]=1, + ["value"]=800 + }, + [52002]={ + ["type"]=5, + ["pay_condition"]={ + 0, + 10 + }, + ["parameter"]=30, + ["recharge_id"]=4, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=50, + ["num_for_nothing"]="Uwg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=2, + ["num_for_nothing"]="VA==" + } + }, + ["time_type"]=3, + ["limit"]=1, + ["value"]=800 + }, + [52102]={ + ["type"]=5, + ["pay_condition"]={ + 10, + 20 + }, + ["parameter"]=30, + ["recharge_id"]=6, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=60, + ["num_for_nothing"]="UAg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=4, + ["num_for_nothing"]="Ug==" + } + }, + ["time_type"]=3, + ["limit"]=1, + ["value"]=800 + }, + [52202]={ + ["type"]=5, + ["pay_condition"]={ + 20, + 30 + }, + ["parameter"]=30, + ["recharge_id"]=8, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=70, + ["num_for_nothing"]="UQg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=5, + ["num_for_nothing"]="Uw==" + } + }, + ["time_type"]=3, + ["limit"]=1, + ["value"]=800 + }, + [52302]={ + ["type"]=5, + ["pay_condition"]={ + 30, + 9999 + }, + ["parameter"]=30, + ["recharge_id"]=9, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=80, + ["num_for_nothing"]="Xgg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=6, + ["num_for_nothing"]="UA==" + } + }, + ["time_type"]=3, + ["limit"]=1, + ["value"]=800 + }, + [40102]={ + ["type"]=4, + ["recharge_id"]=2, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=6, + ["num_for_nothing"]="UA==" + } + } + }, + [10102]={ + ["type"]=1, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=6, + ["num_for_nothing"]="UA==" + } + } } } local config = { -data=act_gift,count=2 +data=act_gift,count=30 } return config \ No newline at end of file diff --git a/lua/app/config/chapter.lua b/lua/app/config/chapter.lua index 8d706b94..5978fb60 100644 --- a/lua/app/config/chapter.lua +++ b/lua/app/config/chapter.lua @@ -96,9 +96,6 @@ local chapter = { 3 }, ["seal_element"]={ - 1, - 3, - 4, 5 }, ["not_involved_skill"]={ diff --git a/lua/app/config/skill.lua b/lua/app/config/skill.lua index f962ab54..50c76ab6 100644 --- a/lua/app/config/skill.lua +++ b/lua/app/config/skill.lua @@ -336,12 +336,6 @@ local skill = { ["num"]=40000, ["ratio"]=10000, ["round"]=0 - }, - { - ["type"]="burn", - ["num"]=10000, - ["ratio"]=10000, - ["round"]=2 } }, ["obj"]=2, diff --git a/lua/app/module/battle/component/battle_unit_comp.lua b/lua/app/module/battle/component/battle_unit_comp.lua index 88d98fa2..cb9fa5db 100644 --- a/lua/app/module/battle/component/battle_unit_comp.lua +++ b/lua/app/module/battle/component/battle_unit_comp.lua @@ -1246,6 +1246,9 @@ function BattleUnitComp:takeDamageOrCure(atker, num, effectType, effectStatus) if hp > 0 and self.unitEntity:getShieldRebound() then -- 伤害反弹 atker:takeDamageOrCure(self, num*self.unitEntity:getShieldRebound() // DEFAULT_FACTOR, EFFECT_TYPE.DIRECT, 0) end + if self.unitEntity:getBeSucked() > 0 and effectType == EFFECT_TYPE.DIRECT then + atker:takeDamageOrCure(self, -num*self.unitEntity:getBeSucked() // DEFAULT_FACTOR, EFFECT_TYPE.HEAL, 0) + end elseif num > 0 then -- 治疗 self:showEffectNumber(BattleConst.EFFECT_COLOR_GREEN, BattleConst.EFFECT_TYPE_BUFF, "+" .. num, x, y, 0) end diff --git a/lua/app/module/battle/helper/battle_buff_handle.lua b/lua/app/module/battle/helper/battle_buff_handle.lua index 74e9b46c..a3b62229 100644 --- a/lua/app/module/battle/helper/battle_buff_handle.lua +++ b/lua/app/module/battle/helper/battle_buff_handle.lua @@ -36,6 +36,8 @@ function BattleBuffHandle.doBuffWork(unitComp, buffEffect) _doDotWork(unitComp, buffEffect, buff) elseif buffType == 6 then _doHotWork(unitComp, buffEffect, buff) + elseif buffType == 7 then -- 特殊buff + BattleBuffSpecial.specialBuffWork(unitComp, buffEffect, buff) end local fxList = buff:getFxTake() if fxList then diff --git a/lua/app/module/battle/helper/battle_buff_special.lua b/lua/app/module/battle/helper/battle_buff_special.lua index 91946990..ebc10975 100644 --- a/lua/app/module/battle/helper/battle_buff_special.lua +++ b/lua/app/module/battle/helper/battle_buff_special.lua @@ -1,9 +1,11 @@ local BattleConst = require "app/module/battle/battle_const" +local BattleFormula = require "app/module/battle/helper/battle_formula" local BattleBuffSpecial = {} local BUFF_NAME = BattleConst.BUFF_NAME local ATTR_NAME = BattleConst.ATTR_NAM +local EFFECT_TYPE = BattleConst.EFFECT_TYPE local function _addSkillOn(unitComp, buff, target, buffEffect) return target:addSkill(buff:getEffectNum()) @@ -25,14 +27,38 @@ local function _skillFireTimesOff(buffSender, target, buff, buffEffect) return 1 end +local function _bleedOn(buffSender, buff, target, buffEffect) + return target.unitEntity:addAttr(BattleConst.ATTR_NAME.BE_SUCKED, 1000, false) -- 写死10% +end + +local function _bleedOff(buffSender, target, buff, buffEffect) + target.unitEntity:addAttr(BattleConst.ATTR_NAME.BE_SUCKED, -1000, false) -- 写死10% +end + +local function _bleedWork(unitComp, buffEffect, buff) + local damage, hurtStatus = BattleFormula:getDamageOrCureResult(buffEffect.sender, buff, unitComp) + if damage <= 0 then + damage = -1 + else + damage = -damage + end + unitComp:takeDamageOrCure(buffEffect.sender, damage, EFFECT_TYPE.DOT, hurtStatus) +end + local _handleOn = { [BUFF_NAME.ADD_SKILL] = _addSkillOn, -- 添加技能 [BUFF_NAME.SKILL_FIRE_TIMES] = _skillFireTimesOn, -- 技能额外使用次数 + [BUFF_NAME.BLEED] = _bleedOn, -- 流血 } local _handleOff = { [BUFF_NAME.ADD_SKILL] = _addSkillOff, -- 添加技能 [BUFF_NAME.SKILL_FIRE_TIMES] = _skillFireTimesOff, -- 技能额外使用次数 + [BUFF_NAME.BLEED] = _bleedOff, -- 流血 +} + +local _handleWork = { + [BUFF_NAME.BLEED] = _bleedWork, -- 流血 } -- 特殊buff添加时 @@ -52,4 +78,12 @@ function BattleBuffSpecial.specialBuffOff(buffSender, target, buff, buffEffect) end end +-- 特殊buff生效 +function BattleBuffSpecial.specialBuffWork(unitComp, buffEffect, buff) + local func = _handleWork[buff:getName()] + if func then + func(unitComp, buffEffect, buff) + end +end + return BattleBuffSpecial \ No newline at end of file diff --git a/lua/app/userdata/battle/team/battle_team_entity.lua b/lua/app/userdata/battle/team/battle_team_entity.lua index 9b03dbf1..036d129f 100644 --- a/lua/app/userdata/battle/team/battle_team_entity.lua +++ b/lua/app/userdata/battle/team/battle_team_entity.lua @@ -179,6 +179,10 @@ function BattleTeamEntity:getBeDmgToHeal() return self.attr.be_dmg_to_heal or 0 end +function BattleTeamEntity:getBeSucked() + return self.attr.be_sucked or 0 +end + function BattleTeamEntity:getNormalAttackAddCount() return self.attr[ATTR_NAME.NORMAL_ATTACK_COUNT] or 0 end diff --git a/lua/app/userdata/battle/team/battle_unit_entity.lua b/lua/app/userdata/battle/team/battle_unit_entity.lua index 4fdaf183..c11a02e1 100644 --- a/lua/app/userdata/battle/team/battle_unit_entity.lua +++ b/lua/app/userdata/battle/team/battle_unit_entity.lua @@ -290,6 +290,10 @@ function BattleUnitEntity:getBeDmgToHeal() return self.team:getBeDmgToHeal() end +function BattleUnitEntity:getBeSucked() + return self.team:getBeSucked() +end + function BattleUnitEntity:getNormalAttackAddCount() return self.team:getNormalAttackAddCount() end From 1f911a21a7133d7e50aaca1ca2a0a9dc605dd1ea Mon Sep 17 00:00:00 2001 From: xiekaidong Date: Tue, 9 May 2023 16:49:27 +0800 Subject: [PATCH 04/23] =?UTF-8?q?=E6=98=8F=E7=9D=A1buff?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/app/module/battle/battle_const.lua | 2 +- .../battle/component/battle_unit_comp.lua | 11 +++++++++++ .../module/battle/helper/battle_buff_handle.lua | 2 +- lua/app/module/battle/team/battle_team.lua | 17 +++++++++++++++++ .../userdata/battle/team/battle_team_entity.lua | 14 +++++++++++++- .../userdata/battle/team/battle_unit_entity.lua | 8 ++++++-- 6 files changed, 49 insertions(+), 5 deletions(-) diff --git a/lua/app/module/battle/battle_const.lua b/lua/app/module/battle/battle_const.lua index fb686edf..0714101b 100644 --- a/lua/app/module/battle/battle_const.lua +++ b/lua/app/module/battle/battle_const.lua @@ -283,8 +283,8 @@ local ATTR_NAME = { CURE_DEC = "cure_dec", SHIELD_REBOUND = "shield_rebound", BE_DMG_TO_HEAL = "be_dmg_to_heal", - BE_SUCKED = "be_sucked", + LETHARGY = "lethargy", } BattleConst.ATTR_NAME = ATTR_NAME diff --git a/lua/app/module/battle/component/battle_unit_comp.lua b/lua/app/module/battle/component/battle_unit_comp.lua index cb9fa5db..48365ca0 100644 --- a/lua/app/module/battle/component/battle_unit_comp.lua +++ b/lua/app/module/battle/component/battle_unit_comp.lua @@ -59,6 +59,10 @@ function BattleUnitComp:getIsLimit() return self.unitEntity:getIsLimit() end +function BattleUnitComp:getIsLethargy() + return self.unitEntity:getIsLethargy() +end + function BattleUnitComp:setTeam(team) self.team = team end @@ -1081,6 +1085,10 @@ function BattleUnitComp:removeAllBuff() self.team:removeAllBuff() end +function BattleUnitComp:removeBuffByName(buffName) + self.team:removeBuffByName(buffName) +end + function BattleUnitComp:onSkillTakeEffect(skill) skill:endUse() if skill:getIsEliminateType() then @@ -1249,6 +1257,9 @@ function BattleUnitComp:takeDamageOrCure(atker, num, effectType, effectStatus) if self.unitEntity:getBeSucked() > 0 and effectType == EFFECT_TYPE.DIRECT then atker:takeDamageOrCure(self, -num*self.unitEntity:getBeSucked() // DEFAULT_FACTOR, EFFECT_TYPE.HEAL, 0) end + if effectType == EFFECT_TYPE.DIRECT and self.unitEntity:getIsLethargy() then + self:removeBuffByName(BattleConst.BUFF_NAME.LETHARGY) + end elseif num > 0 then -- 治疗 self:showEffectNumber(BattleConst.EFFECT_COLOR_GREEN, BattleConst.EFFECT_TYPE_BUFF, "+" .. num, x, y, 0) end diff --git a/lua/app/module/battle/helper/battle_buff_handle.lua b/lua/app/module/battle/helper/battle_buff_handle.lua index a3b62229..1cc4ac31 100644 --- a/lua/app/module/battle/helper/battle_buff_handle.lua +++ b/lua/app/module/battle/helper/battle_buff_handle.lua @@ -120,7 +120,7 @@ local function _takeEffectAttr(unitComp, buff, target, buffEffect) end local function _takeEffectControl(unitComp, buff, target, buffEffect) - target.unitEntity:addLimit(buff:getName()) + target.unitEntity:addLimit(buff:getName(), buffEffect) return true end diff --git a/lua/app/module/battle/team/battle_team.lua b/lua/app/module/battle/team/battle_team.lua index ec1ee9c0..3ce9abf2 100644 --- a/lua/app/module/battle/team/battle_team.lua +++ b/lua/app/module/battle/team/battle_team.lua @@ -317,6 +317,23 @@ function BattleTeam:doBuffWork() self.battleController:refreshBuff(self.side, self.buffList) end +function BattleTeam:removeBuffByName(buffName) + local count = #self.buffList + if count <= 0 then + return + end + local buffEffect = nil + for i = count, 1, -1 do + buffEffect = self.buffList[i] + if buffEffect.buff:getName() == buffName then + self:updateBuffState(buffEffect.buff, -1) + table.remove(self.buffList, i) + BattleBuffHandle.removeBuff(self.mainUnit, buffEffect) + end + end + self.battleController:refreshBuff(self.side, self.buffList) +end + function BattleTeam:updateBuffState(buff, num) local buffName = buff:getName() local buffNum = (self.sameBuffCount[buffName] or 0) + num diff --git a/lua/app/userdata/battle/team/battle_team_entity.lua b/lua/app/userdata/battle/team/battle_team_entity.lua index 036d129f..8dca0b98 100644 --- a/lua/app/userdata/battle/team/battle_team_entity.lua +++ b/lua/app/userdata/battle/team/battle_team_entity.lua @@ -36,6 +36,7 @@ function BattleTeamEntity:init(side, data) end self.isDead = false self.stunCount = 0 + self.lethargyCount = 0 self.limitAll = 0 self.shieldHp = 0 if data then @@ -201,9 +202,14 @@ function BattleTeamEntity:addMaxHp(num) end end -function BattleTeamEntity:addLimit(name) +function BattleTeamEntity:addLimit(name, buffEffect) if name == BUFF_NAME.STUN then self.stunCount = self.stunCount + 1 + elseif name == BUFF_NAME.LETHARGY then + if buffEffect.result then + return + end + self.lethargyCount = self.lethargyCount + 1 end self.limitAll = self.limitAll + 1 end @@ -211,6 +217,8 @@ end function BattleTeamEntity:removeLimit(name) if name == BUFF_NAME.STUN then self.stunCount = self.stunCount - 1 + elseif name == BUFF_NAME.LETHARGY then + self.lethargyCount = self.lethargyCount - 1 end self.limitAll = self.limitAll - 1 end @@ -219,6 +227,10 @@ function BattleTeamEntity:getIsLimit() return self.limitAll > 0 end +function BattleTeamEntity:getIsLethargy() + return self.lethargyCount > 0 +end + function BattleTeamEntity:addShield(num) self.shieldHp = self.shieldHp + num end diff --git a/lua/app/userdata/battle/team/battle_unit_entity.lua b/lua/app/userdata/battle/team/battle_unit_entity.lua index c11a02e1..a2e8e08b 100644 --- a/lua/app/userdata/battle/team/battle_unit_entity.lua +++ b/lua/app/userdata/battle/team/battle_unit_entity.lua @@ -298,8 +298,8 @@ function BattleUnitEntity:getNormalAttackAddCount() return self.team:getNormalAttackAddCount() end -function BattleUnitEntity:addLimit(name) - self.team:addLimit(name) +function BattleUnitEntity:addLimit(name, buffEffect) + self.team:addLimit(name, buffEffect) end function BattleUnitEntity:removeLimit(name) @@ -310,6 +310,10 @@ function BattleUnitEntity:getIsLimit() return self.team:getIsLimit() end +function BattleUnitEntity:getIsLethargy() + return self.team:getIsLethargy() +end + function BattleUnitEntity:addShield(num) self.team:addShield(num) end From 199ff4a7a26de895a8679a85c7443fd5fa06966f Mon Sep 17 00:00:00 2001 From: xiekaidong Date: Tue, 9 May 2023 19:40:47 +0800 Subject: [PATCH 05/23] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/app/module/battle/battle_const.lua | 6 ++++++ lua/app/module/battle/component/battle_unit_comp.lua | 2 +- lua/app/module/battle/team/battle_team.lua | 2 +- lua/app/userdata/battle/skill/battle_buff_entity.lua | 4 ++++ 4 files changed, 12 insertions(+), 2 deletions(-) diff --git a/lua/app/module/battle/battle_const.lua b/lua/app/module/battle/battle_const.lua index 0714101b..72cf56ab 100644 --- a/lua/app/module/battle/battle_const.lua +++ b/lua/app/module/battle/battle_const.lua @@ -96,6 +96,12 @@ BattleConst.BUFF_STACK_TYPE = { ADD = 2 } +BattleConst.BUFF_DECR_TYPE = { + INCREASE_GAIN = 1, + REDUCE_GAIN = 2, + NOT_INCREASE_DECREASE_GAIN = 3 +} + BattleConst.SKILL_MOVE_TYPE = { MOVE = 1, -- 移动到目标跟前使用 STAND = 2, -- 原地使用 diff --git a/lua/app/module/battle/component/battle_unit_comp.lua b/lua/app/module/battle/component/battle_unit_comp.lua index 48365ca0..1e2540af 100644 --- a/lua/app/module/battle/component/battle_unit_comp.lua +++ b/lua/app/module/battle/component/battle_unit_comp.lua @@ -1452,7 +1452,7 @@ function BattleUnitComp:getEffectAndPlay(fxInfo, isLoop) end) end -function BattleUnitComp:removeEffect(res) +function BattleUnitComp:removeFx(res) local effect = self.loopFxMap[res] if effect then self.loopFxMap[res] = nil diff --git a/lua/app/module/battle/team/battle_team.lua b/lua/app/module/battle/team/battle_team.lua index 3ce9abf2..75381829 100644 --- a/lua/app/module/battle/team/battle_team.lua +++ b/lua/app/module/battle/team/battle_team.lua @@ -350,7 +350,7 @@ function BattleTeam:updateBuffState(buff, num) self.loopFxMap[res] = count - 1 if count == 1 then for k2, v2 in ipairs(self.unitList) do - v2:removeEffect(res) + v2:removeFx(res) end end end diff --git a/lua/app/userdata/battle/skill/battle_buff_entity.lua b/lua/app/userdata/battle/skill/battle_buff_entity.lua index d6694ada..b99a40ca 100644 --- a/lua/app/userdata/battle/skill/battle_buff_entity.lua +++ b/lua/app/userdata/battle/skill/battle_buff_entity.lua @@ -85,6 +85,10 @@ function BattleBuffEntity:getStack() return self.buffInfo.stack end +function BattleBuffEntity:getDecr() + return self.buffInfo.decr +end + function BattleBuffEntity:getIcon() return self.buffInfo.icon end From fd44822cd7d8929ec966b510376278c86980750e Mon Sep 17 00:00:00 2001 From: xiekaidong Date: Tue, 9 May 2023 20:05:37 +0800 Subject: [PATCH 06/23] =?UTF-8?q?=E4=B8=8D=E6=AD=BBbuff?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/app/module/battle/battle_const.lua | 2 ++ .../module/battle/helper/battle_buff_special.lua | 11 +++++++++++ lua/app/userdata/battle/team/battle_team_entity.lua | 13 +++++++++++++ lua/app/userdata/battle/team/battle_unit_entity.lua | 8 ++++++++ 4 files changed, 34 insertions(+) diff --git a/lua/app/module/battle/battle_const.lua b/lua/app/module/battle/battle_const.lua index 72cf56ab..9954f13f 100644 --- a/lua/app/module/battle/battle_const.lua +++ b/lua/app/module/battle/battle_const.lua @@ -246,6 +246,7 @@ local BUFF_NAME = { LETHARGY = "lethargy", CURSE = "curse", LOCK = "lock", + UNDEAD = "undead", } BattleConst.BUFF_NAME = BUFF_NAME @@ -291,6 +292,7 @@ local ATTR_NAME = { BE_DMG_TO_HEAL = "be_dmg_to_heal", BE_SUCKED = "be_sucked", LETHARGY = "lethargy", + UNDEAD = "undead", } BattleConst.ATTR_NAME = ATTR_NAME diff --git a/lua/app/module/battle/helper/battle_buff_special.lua b/lua/app/module/battle/helper/battle_buff_special.lua index ebc10975..875ca9bf 100644 --- a/lua/app/module/battle/helper/battle_buff_special.lua +++ b/lua/app/module/battle/helper/battle_buff_special.lua @@ -45,16 +45,27 @@ local function _bleedWork(unitComp, buffEffect, buff) unitComp:takeDamageOrCure(buffEffect.sender, damage, EFFECT_TYPE.DOT, hurtStatus) end +local function _undeadOn(buffSender, buff, target, buffEffect) + return target.unitEntity:setUndeadHp(1) -- 写死1 +end + +local function _undeadOff(buffSender, target, buff, buffEffect) + target.unitEntity:setUndeadHp(0) -- 写死0 +end + + local _handleOn = { [BUFF_NAME.ADD_SKILL] = _addSkillOn, -- 添加技能 [BUFF_NAME.SKILL_FIRE_TIMES] = _skillFireTimesOn, -- 技能额外使用次数 [BUFF_NAME.BLEED] = _bleedOn, -- 流血 + [BUFF_NAME.UNDEAD] = _undeadOn, -- 不死 } local _handleOff = { [BUFF_NAME.ADD_SKILL] = _addSkillOff, -- 添加技能 [BUFF_NAME.SKILL_FIRE_TIMES] = _skillFireTimesOff, -- 技能额外使用次数 [BUFF_NAME.BLEED] = _bleedOff, -- 流血 + [BUFF_NAME.UNDEAD] = _undeadOff, -- 不死 } local _handleWork = { diff --git a/lua/app/userdata/battle/team/battle_team_entity.lua b/lua/app/userdata/battle/team/battle_team_entity.lua index 8dca0b98..9d5c8f17 100644 --- a/lua/app/userdata/battle/team/battle_team_entity.lua +++ b/lua/app/userdata/battle/team/battle_team_entity.lua @@ -39,6 +39,7 @@ function BattleTeamEntity:init(side, data) self.lethargyCount = 0 self.limitAll = 0 self.shieldHp = 0 + self.undeadHp = 0 if data then table.sort(data.units, function(a, b) if a.level == b.level then @@ -184,6 +185,14 @@ function BattleTeamEntity:getBeSucked() return self.attr.be_sucked or 0 end +function BattleTeamEntity:getUndeadHp() + return self.undeadHp +end + +function BattleTeamEntity:setUndeadHp(hp) + self.undeadHp = hp +end + function BattleTeamEntity:getNormalAttackAddCount() return self.attr[ATTR_NAME.NORMAL_ATTACK_COUNT] or 0 end @@ -260,6 +269,10 @@ function BattleTeamEntity:takeDamageOrCure(num) local hpBefore = self.attr.hp self.attr.hp = self.attr.hp + num local hurtEventNum = 0 + if self:getUndeadHp() > 0 and self.attr.hp <= 0 then + self.attr.hp = self:getUndeadHp() + num = self:getUndeadHp() - hpBefore + end if self.attr.hp <= 0 then -- 死了 hurtEventNum = -hpBefore self.attr.hp = 0 diff --git a/lua/app/userdata/battle/team/battle_unit_entity.lua b/lua/app/userdata/battle/team/battle_unit_entity.lua index a2e8e08b..edca54cf 100644 --- a/lua/app/userdata/battle/team/battle_unit_entity.lua +++ b/lua/app/userdata/battle/team/battle_unit_entity.lua @@ -294,6 +294,14 @@ function BattleUnitEntity:getBeSucked() return self.team:getBeSucked() end +function BattleUnitEntity:getUndeadHp() + return self.team:getUndeadHp() +end + +function BattleUnitEntity:setUndeadHp(hp) + return self.team:setUndeadHp(hp) +end + function BattleUnitEntity:getNormalAttackAddCount() return self.team:getNormalAttackAddCount() end From c9558d872ed9f9d3aa83dbc4e58c8d808506f70f Mon Sep 17 00:00:00 2001 From: xiekaidong Date: Tue, 9 May 2023 20:39:00 +0800 Subject: [PATCH 07/23] =?UTF-8?q?=E5=8F=8D=E4=BC=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/app/module/battle/battle_const.lua | 4 ++++ .../battle/component/battle_unit_comp.lua | 21 ++++++++++++------- .../battle/team/battle_team_entity.lua | 4 ++++ .../battle/team/battle_unit_entity.lua | 4 ++++ 4 files changed, 25 insertions(+), 8 deletions(-) diff --git a/lua/app/module/battle/battle_const.lua b/lua/app/module/battle/battle_const.lua index 9954f13f..6a7771af 100644 --- a/lua/app/module/battle/battle_const.lua +++ b/lua/app/module/battle/battle_const.lua @@ -182,6 +182,7 @@ BattleConst.EFFECT_TYPE = { DOT = 2, -- 间接伤害 HEAL = 101, HOT = 102, + REBOUND = 201, -- 反弹 } BattleConst.SKILL_RECORD_DATA_NAME = { @@ -247,6 +248,7 @@ local BUFF_NAME = { CURSE = "curse", LOCK = "lock", UNDEAD = "undead", + THORNS = "thorns", } BattleConst.BUFF_NAME = BUFF_NAME @@ -293,6 +295,7 @@ local ATTR_NAME = { BE_SUCKED = "be_sucked", LETHARGY = "lethargy", UNDEAD = "undead", + THORNS = "thorns", } BattleConst.ATTR_NAME = ATTR_NAME @@ -332,6 +335,7 @@ BattleConst.BUFF_NAME_TO_ATTR = { [BUFF_NAME.CURED_DEC] = {ATTR_NAME.CURE_DEC, false}, [BUFF_NAME.WEAKEN] = {ATTR_NAME.DMG_DEC_ALL, false}, [BUFF_NAME.CURSE] = {ATTR_NAME.BE_DMG_TO_HEAL, false}, + [BUFF_NAME.THORNS] = {ATTR_NAME.THORNS, false}, } ---- 格子类型 diff --git a/lua/app/module/battle/component/battle_unit_comp.lua b/lua/app/module/battle/component/battle_unit_comp.lua index 1e2540af..03090246 100644 --- a/lua/app/module/battle/component/battle_unit_comp.lua +++ b/lua/app/module/battle/component/battle_unit_comp.lua @@ -1251,14 +1251,19 @@ function BattleUnitComp:takeDamageOrCure(atker, num, effectType, effectStatus) end end end - if hp > 0 and self.unitEntity:getShieldRebound() then -- 伤害反弹 - atker:takeDamageOrCure(self, num*self.unitEntity:getShieldRebound() // DEFAULT_FACTOR, EFFECT_TYPE.DIRECT, 0) - end - if self.unitEntity:getBeSucked() > 0 and effectType == EFFECT_TYPE.DIRECT then - atker:takeDamageOrCure(self, -num*self.unitEntity:getBeSucked() // DEFAULT_FACTOR, EFFECT_TYPE.HEAL, 0) - end - if effectType == EFFECT_TYPE.DIRECT and self.unitEntity:getIsLethargy() then - self:removeBuffByName(BattleConst.BUFF_NAME.LETHARGY) + if effectType == EFFECT_TYPE.DIRECT then + if hp > 0 and self.unitEntity:getShieldRebound() then -- 伤害反弹 + atker:takeDamageOrCure(self, num*self.unitEntity:getShieldRebound() // DEFAULT_FACTOR, EFFECT_TYPE.REBOUND, 0) + end + if self.unitEntity:getBeSucked() > 0 then -- 吸血 + atker:takeDamageOrCure(self, -num*self.unitEntity:getBeSucked() // DEFAULT_FACTOR, EFFECT_TYPE.HEAL, 0) + end + if self.unitEntity:getIsLethargy() then -- 移除昏睡 + self:removeBuffByName(BattleConst.BUFF_NAME.LETHARGY) + end + if self.unitEntity:getThorns() > 0 then -- 反伤 + atker:takeDamageOrCure(self, num*self.unitEntity:getThorns() // DEFAULT_FACTOR, EFFECT_TYPE.REBOUND, 0) + end end elseif num > 0 then -- 治疗 self:showEffectNumber(BattleConst.EFFECT_COLOR_GREEN, BattleConst.EFFECT_TYPE_BUFF, "+" .. num, x, y, 0) diff --git a/lua/app/userdata/battle/team/battle_team_entity.lua b/lua/app/userdata/battle/team/battle_team_entity.lua index 9d5c8f17..d821f8f3 100644 --- a/lua/app/userdata/battle/team/battle_team_entity.lua +++ b/lua/app/userdata/battle/team/battle_team_entity.lua @@ -197,6 +197,10 @@ function BattleTeamEntity:getNormalAttackAddCount() return self.attr[ATTR_NAME.NORMAL_ATTACK_COUNT] or 0 end +function BattleTeamEntity:getThorns() + return self.attr[ATTR_NAME.THORNS] or 0 +end + function BattleTeamEntity:getExpTime() return self.attr.exp_time or 0 end diff --git a/lua/app/userdata/battle/team/battle_unit_entity.lua b/lua/app/userdata/battle/team/battle_unit_entity.lua index edca54cf..622d03c7 100644 --- a/lua/app/userdata/battle/team/battle_unit_entity.lua +++ b/lua/app/userdata/battle/team/battle_unit_entity.lua @@ -306,6 +306,10 @@ function BattleUnitEntity:getNormalAttackAddCount() return self.team:getNormalAttackAddCount() end +function BattleUnitEntity:getThorns() + return self.team:getThorns() +end + function BattleUnitEntity:addLimit(name, buffEffect) self.team:addLimit(name, buffEffect) end From e6ee7b0093362fde4b1fe9d80578bd993630994c Mon Sep 17 00:00:00 2001 From: xiekaidong Date: Wed, 10 May 2023 10:10:58 +0800 Subject: [PATCH 08/23] =?UTF-8?q?=E5=85=88=E6=89=8Bbuff?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/app/config/buff.lua | 6 +- lua/app/module/battle/battle_const.lua | 9 +- .../battle/controller/battle_controller.lua | 128 +++++++++--------- .../battle/team/battle_team_entity.lua | 4 + .../battle/team/battle_unit_entity.lua | 4 + 5 files changed, 82 insertions(+), 69 deletions(-) diff --git a/lua/app/config/buff.lua b/lua/app/config/buff.lua index 2c08a5e7..4205dc64 100644 --- a/lua/app/config/buff.lua +++ b/lua/app/config/buff.lua @@ -406,7 +406,7 @@ local buff = { }, [59]={ ["name"]="first_hand", - ["buff_type"]=7, + ["buff_type"]=1, ["decr"]=1 }, [60]={ @@ -421,13 +421,13 @@ local buff = { }, [62]={ ["name"]="counterattack", - ["buff_type"]=7, + ["buff_type"]=1, ["stack"]=1, ["decr"]=1 }, [63]={ ["name"]="thorns", - ["buff_type"]=7, + ["buff_type"]=1, ["decr"]=1 }, [64]={ diff --git a/lua/app/module/battle/battle_const.lua b/lua/app/module/battle/battle_const.lua index 6a7771af..eb3316cd 100644 --- a/lua/app/module/battle/battle_const.lua +++ b/lua/app/module/battle/battle_const.lua @@ -53,10 +53,10 @@ BattleConst.BATTLE_ROUND_STEP = { ON_BEGIN = 1, -- 回合开始 ON_ELIMINATION_BEGIN = 3, -- 消除开始 ON_ELIMINATION = 4, -- 等待消除 - ON_ATK_STEP = 5, -- 攻击方行动 - ON_ATK_STEP_OVER = 6, -- 攻击方行动结束(可能直接跳转到刷新棋盘/回合结束) + ON_TEAM_ACTION = 5, -- 队伍行动 + ON_ATK_STEP = 6, -- 攻击方行动 ON_DEF_STEP = 7, -- 防守方行动 - ON_DEF_STEP_OVER = 8, -- 防守方行动结束(可能直接跳转到刷新棋盘/回合结束) + ON_TEAM_ACTION_OVER = 8, -- 攻击方行动结束(可能直接跳转到刷新棋盘/回合结束/进入下一个队伍行动) ON_REFRESH_BOARD = 9, -- 刷新棋盘 ON_END = 10, -- 回合结束 } @@ -249,6 +249,7 @@ local BUFF_NAME = { LOCK = "lock", UNDEAD = "undead", THORNS = "thorns", + FIRST_HAND = "first_hand", } BattleConst.BUFF_NAME = BUFF_NAME @@ -296,6 +297,7 @@ local ATTR_NAME = { LETHARGY = "lethargy", UNDEAD = "undead", THORNS = "thorns", + FIRST_HAND = "first_hand", } BattleConst.ATTR_NAME = ATTR_NAME @@ -336,6 +338,7 @@ BattleConst.BUFF_NAME_TO_ATTR = { [BUFF_NAME.WEAKEN] = {ATTR_NAME.DMG_DEC_ALL, false}, [BUFF_NAME.CURSE] = {ATTR_NAME.BE_DMG_TO_HEAL, false}, [BUFF_NAME.THORNS] = {ATTR_NAME.THORNS, false}, + [BUFF_NAME.FIRST_HAND] = {ATTR_NAME.FIRST_HAND, false}, } ---- 格子类型 diff --git a/lua/app/module/battle/controller/battle_controller.lua b/lua/app/module/battle/controller/battle_controller.lua index 42389623..2ebcb4b7 100644 --- a/lua/app/module/battle/controller/battle_controller.lua +++ b/lua/app/module/battle/controller/battle_controller.lua @@ -523,74 +523,76 @@ function BattleController:enterElimination(needDelay) end end -function BattleController:enterAtkStep() - self.roundStep = BattleConst.BATTLE_ROUND_STEP.ON_ATK_STEP - self:exeInstructions(function() - self:enterAtkStepOver() - end) +function BattleController:enterBattleStep() + self.roundStep = BattleConst.BATTLE_ROUND_STEP.ON_TEAM_ACTION + if not self.battleTeamActionList then + self.battleTeamActionList = {} + else + for i = #self.battleTeamActionList, 1, -1 do + self.battleTeamActionList[i] = nil + end + end + + local atkAction = function() + self.roundStep = BattleConst.BATTLE_ROUND_STEP.ON_ATK_STEP + self:exeInstructions(function() + self:enterNextTeamAction() + end) + end + + local defAction = function() + self.roundStep = BattleConst.BATTLE_ROUND_STEP.ON_DEF_STEP + self.defTeam:mainUnitUseAllSkills(function() + self:enterNextTeamAction() + end) + end + + if self.battleData:getAtkTeam():getFirstHand() < self.battleData:getDefTeam():getFirstHand() then + table.insert(self.battleTeamActionList, defAction) + table.insert(self.battleTeamActionList, atkAction) + else + table.insert(self.battleTeamActionList, atkAction) + table.insert(self.battleTeamActionList, defAction) + end + + self:enterNextTeamAction() +end + +function BattleController:enterNextTeamAction() + self.roundStep = BattleConst.BATTLE_ROUND_STEP.ON_TEAM_ACTION_OVER + self:hideCombo() + + local atkTeam = self.battleData:getAtkTeam() + if not atkTeam or atkTeam:getIsDead() then -- 英雄死了， 直接结算 + self:enterNextWave() + return + end + + local defTeam = self.battleData:getDefTeam() + if not defTeam or defTeam:getIsDead() then -- 怪物死了， 直接进入刷新逻辑 + if self.waveIndex >= self.maxWaveIndex then + self:enterRoundEnd() + else + self.defTeam:removeAllBuff() + self:onDefDead() + self:enterRefreshBoard() + end + return + end + + if not self.battleTeamActionList or not self.battleTeamActionList[1] then + self:enterRefreshBoard() + return + end + + local action = table.remove(self.battleTeamActionList, 1) + action() end function BattleController:getIsAtkStep() return self.roundStep == BattleConst.BATTLE_ROUND_STEP.ON_ATK_STEP end -function BattleController:enterAtkStepOver() - self:hideCombo() - self.roundStep = BattleConst.BATTLE_ROUND_STEP.ON_ATK_STEP_OVER - - local defTeam = self.battleData:getDefTeam() - if not defTeam or defTeam:getIsDead() then -- 怪物死了， 直接进入刷新逻辑 - if self.waveIndex >= self.maxWaveIndex then - self:enterRoundEnd() - else - self.defTeam:removeAllBuff() - self:onDefDead() - self:enterRefreshBoard() - end - return - end - - local atkTeam = self.battleData:getAtkTeam() - if not atkTeam or atkTeam:getIsDead() then -- 英雄死了， 直接结算 - self:enterNextWave() - return - end - - self:enterDefStep() -end - -function BattleController:enterDefStep() - self.roundStep = BattleConst.BATTLE_ROUND_STEP.ON_DEF_STEP - - self.defTeam:mainUnitUseAllSkills(function() - self:enterDefStepOver() - end) -end - -function BattleController:enterDefStepOver() - self.roundStep = BattleConst.BATTLE_ROUND_STEP.ON_DEF_STEP_OVER - - local atkTeam = self.battleData:getAtkTeam() - if not atkTeam or atkTeam:getIsDead() then -- 英雄死了， 直接结算 - self:enterNextWave() - return - end - - local defTeam = self.battleData:getDefTeam() - if not defTeam or defTeam:getIsDead() then -- 怪物死了， 直接进入刷新逻辑 - if self.waveIndex >= self.maxWaveIndex then - self:enterRoundEnd() - else - self.defTeam:removeAllBuff() - self:onDefDead() - self:enterRefreshBoard() - end - return - end - - self:enterRefreshBoard() -end - function BattleController:enterRefreshBoard() self.roundStep = BattleConst.BATTLE_ROUND_STEP.ON_REFRESH_BOARD self:fillBoard() @@ -996,7 +998,7 @@ function BattleController:onLinkOver() self.battleUI:disableUITouch() self.battleUI:eliminationAni(sequence, function() self:generateInstructions(skillEntity, linkElementType, lineCount, influenceElementType, elementTypeMap) - self:enterAtkStep() + self:enterBattleStep() end) self.eliminateCount = self.eliminateCount + 1 diff --git a/lua/app/userdata/battle/team/battle_team_entity.lua b/lua/app/userdata/battle/team/battle_team_entity.lua index d821f8f3..cbed277b 100644 --- a/lua/app/userdata/battle/team/battle_team_entity.lua +++ b/lua/app/userdata/battle/team/battle_team_entity.lua @@ -205,6 +205,10 @@ function BattleTeamEntity:getExpTime() return self.attr.exp_time or 0 end +function BattleTeamEntity:getFirstHand() + return self.attr.first_hand or 0 +end + function BattleTeamEntity:addMaxHp(num) local hpBefore = self.attr.hp local currPercent = hpBefore * DEFAULT_FACTOR // self.attr.max_hp diff --git a/lua/app/userdata/battle/team/battle_unit_entity.lua b/lua/app/userdata/battle/team/battle_unit_entity.lua index 622d03c7..f3411ffa 100644 --- a/lua/app/userdata/battle/team/battle_unit_entity.lua +++ b/lua/app/userdata/battle/team/battle_unit_entity.lua @@ -310,6 +310,10 @@ function BattleUnitEntity:getThorns() return self.team:getThorns() end +function BattleUnitEntity:getFirstHand() + return self.team:getFirstHand() +end + function BattleUnitEntity:addLimit(name, buffEffect) self.team:addLimit(name, buffEffect) end From 1c6ff387fc8fdda69bd3dd738e254079a0447dde Mon Sep 17 00:00:00 2001 From: xiekaidong Date: Wed, 10 May 2023 11:53:44 +0800 Subject: [PATCH 09/23] =?UTF-8?q?=E5=8F=8D=E5=87=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/app/module/battle/battle_const.lua | 4 +++ .../battle/component/battle_unit_comp.lua | 19 ++++++++++--- .../battle/controller/battle_controller.lua | 23 ++++++++++++---- lua/app/module/battle/team/battle_team.lua | 27 ++++++++++++++++--- .../battle/team/battle_team_entity.lua | 18 +++++++++++++ .../battle/team/battle_unit_entity.lua | 16 +++++++++++ 6 files changed, 95 insertions(+), 12 deletions(-) diff --git a/lua/app/module/battle/battle_const.lua b/lua/app/module/battle/battle_const.lua index eb3316cd..dd8e4a9c 100644 --- a/lua/app/module/battle/battle_const.lua +++ b/lua/app/module/battle/battle_const.lua @@ -183,6 +183,7 @@ BattleConst.EFFECT_TYPE = { HEAL = 101, HOT = 102, REBOUND = 201, -- 反弹 + COUNTERATTACK = 301, -- 反击 } BattleConst.SKILL_RECORD_DATA_NAME = { @@ -250,6 +251,7 @@ local BUFF_NAME = { UNDEAD = "undead", THORNS = "thorns", FIRST_HAND = "first_hand", + COUNTER_ATTACK = "counterattack", } BattleConst.BUFF_NAME = BUFF_NAME @@ -298,6 +300,7 @@ local ATTR_NAME = { UNDEAD = "undead", THORNS = "thorns", FIRST_HAND = "first_hand", + COUNTER_ATTACK = "counterattack", } BattleConst.ATTR_NAME = ATTR_NAME @@ -339,6 +342,7 @@ BattleConst.BUFF_NAME_TO_ATTR = { [BUFF_NAME.CURSE] = {ATTR_NAME.BE_DMG_TO_HEAL, false}, [BUFF_NAME.THORNS] = {ATTR_NAME.THORNS, false}, [BUFF_NAME.FIRST_HAND] = {ATTR_NAME.FIRST_HAND, false}, + [BUFF_NAME.COUNTER_ATTACK] = {ATTR_NAME.COUNTER_ATTACK, false}, } ---- 格子类型 diff --git a/lua/app/module/battle/component/battle_unit_comp.lua b/lua/app/module/battle/component/battle_unit_comp.lua index 03090246..81d65120 100644 --- a/lua/app/module/battle/component/battle_unit_comp.lua +++ b/lua/app/module/battle/component/battle_unit_comp.lua @@ -253,10 +253,12 @@ function BattleUnitComp:getIsCentralizedAttack() return self.team:getCentralizedAttack() end -function BattleUnitComp:beforeAttack() +function BattleUnitComp:beforeAttack(effectType) self.team:setCentralizedAttack(true) self.battleController:setIsPauseHpProgress(true) - self:checkPassiveEvent(PASSIVE_EVENT.ON_UNI_ATTACK_START, self) + if effectType == BattleConst.EFFECT_TYPE.DIRECT then + self:checkPassiveEvent(PASSIVE_EVENT.ON_UNI_ATTACK_START, self) + end end function BattleUnitComp:useAssistingSkill(count, delay, callback) @@ -374,9 +376,12 @@ function BattleUnitComp:useAllSkills(callback) end end -function BattleUnitComp:useNormalSkill(count, callback) +function BattleUnitComp:useNormalSkill(count, effectType, callback) self.actionOverCallback = callback - self.normalSkillCount = count + self.unitEntity:getNormalAttackAddCount() + self.normalSkillCount = count + if effectType == BattleConst.EFFECT_TYPE.DIRECT then + self.normalSkillCount = self.normalSkillCount + self.unitEntity:getNormalAttackAddCount() + end if not self:changeState(UNIT_STATE.NORMAL_ATTACK) then self.actionOverCallback = nil self.battleController:setIsPauseHpProgress(false) @@ -1264,6 +1269,12 @@ function BattleUnitComp:takeDamageOrCure(atker, num, effectType, effectStatus) if self.unitEntity:getThorns() > 0 then -- 反伤 atker:takeDamageOrCure(self, num*self.unitEntity:getThorns() // DEFAULT_FACTOR, EFFECT_TYPE.REBOUND, 0) end + if self.unitEntity:getCounterAttack() > 0 then -- 触发反击 + local counterattack = self.unitEntity:getCounterAttack() + if counterattack > DEFAULT_FACTOR or BattleHelper:random(1, DEFAULT_FACTOR) <= counterattack then -- 通过命中概率 + self.unitEntity:addCounterAttackCount(1) + end + end end elseif num > 0 then -- 治疗 self:showEffectNumber(BattleConst.EFFECT_COLOR_GREEN, BattleConst.EFFECT_TYPE_BUFF, "+" .. num, x, y, 0) diff --git a/lua/app/module/battle/controller/battle_controller.lua b/lua/app/module/battle/controller/battle_controller.lua index 2ebcb4b7..5d4f2503 100644 --- a/lua/app/module/battle/controller/battle_controller.lua +++ b/lua/app/module/battle/controller/battle_controller.lua @@ -548,17 +548,29 @@ function BattleController:enterBattleStep() end if self.battleData:getAtkTeam():getFirstHand() < self.battleData:getDefTeam():getFirstHand() then - table.insert(self.battleTeamActionList, defAction) - table.insert(self.battleTeamActionList, atkAction) + self:addTeamActionList(defAction, 1) + self:addTeamActionList(atkAction, 2) else - table.insert(self.battleTeamActionList, atkAction) - table.insert(self.battleTeamActionList, defAction) + self:addTeamActionList(atkAction, 1) + self:addTeamActionList(defAction, 2) end self:enterNextTeamAction() end +function BattleController:addTeamActionList(func, index) + if not self.battleTeamActionList then + self.battleTeamActionList = {} + end + + index = index or 1 + table.insert(self.battleTeamActionList, index, func) +end + function BattleController:enterNextTeamAction() + self.atkTeam:onActionOver() + self.defTeam:onActionOver() + self.roundStep = BattleConst.BATTLE_ROUND_STEP.ON_TEAM_ACTION_OVER self:hideCombo() @@ -580,6 +592,7 @@ function BattleController:enterNextTeamAction() return end + Logger.logHighlight(self.battleTeamActionList[1] == nil) if not self.battleTeamActionList or not self.battleTeamActionList[1] then self:enterRefreshBoard() return @@ -2275,7 +2288,7 @@ local function _assisting(self, instruction, callback) end local function _generalAttack(self, instruction, callback) - self.atkTeam:useNormalSkill(instruction.skillMatch, instruction.count, #self.instructions == 0, callback) + self.atkTeam:useNormalSkill(instruction.skillMatch, instruction.count, #self.instructions == 0, BattleConst.EFFECT_TYPE.DIRECT, callback) end local function _playSkill(self, instruction, callback) diff --git a/lua/app/module/battle/team/battle_team.lua b/lua/app/module/battle/team/battle_team.lua index 75381829..740275b7 100644 --- a/lua/app/module/battle/team/battle_team.lua +++ b/lua/app/module/battle/team/battle_team.lua @@ -57,7 +57,7 @@ function BattleTeam:removeAllUnits() self.mainUnit = nil end -function BattleTeam:useNormalSkill(matchType, count, isFinalAction, callback) +function BattleTeam:useNormalSkill(matchType, count, isFinalAction, effectType, callback) self.isFinalAction = isFinalAction local unit = nil if matchType == nil then @@ -72,9 +72,9 @@ function BattleTeam:useNormalSkill(matchType, count, isFinalAction, callback) return callback() end self.mainUnit = unit - unit:beforeAttack() + unit:beforeAttack(effectType) unit:resetBeforeAttack() - unit:useNormalSkill(count, callback) + unit:useNormalSkill(count, effectType, callback) end function BattleTeam:useSkill(matchType, count, isFinalAction, callback) @@ -444,6 +444,27 @@ function BattleTeam:addCombo() self.battleController:showCombo(self.comboCount) end +function BattleTeam:onActionOver() + -- 处理反击 + local counterAttackCount = self:getMainUnit().unitEntity:getCounterAttackCount() + if counterAttackCount <= 0 then + return + end + self:getMainUnit().unitEntity:clearCounterAttackCount() + + local teamAction = function() + self.battleController.roundStep = BattleConst.BATTLE_ROUND_STEP.ON_ATK_STEP + self.battleController.curTeam = self.battleController.atkTeam + ---- 普攻 + local skillMatch = self:getMainUnit().unitEntity:getMatchType() + self:useNormalSkill(skillMatch, counterAttackCount, true, BattleConst.EFFECT_TYPE.COUNTERATTACK, function() + self.battleController:enterNextTeamAction() + end) + end + self.battleController:addTeamActionList(teamAction, 1) + self.comboCount = 0 +end + function BattleTeam:tick(dt) for k, v in ipairs(self.unitList) do v:tick(dt) diff --git a/lua/app/userdata/battle/team/battle_team_entity.lua b/lua/app/userdata/battle/team/battle_team_entity.lua index cbed277b..86b8058c 100644 --- a/lua/app/userdata/battle/team/battle_team_entity.lua +++ b/lua/app/userdata/battle/team/battle_team_entity.lua @@ -16,6 +16,7 @@ local ATTR_NAME = BattleConst.ATTR_NAME function BattleTeamEntity:ctor() self.members = {} self.membersCount = 0 + self.counterAttackCount = 0 -- 反击次数 end function BattleTeamEntity:init(side, data) @@ -264,6 +265,10 @@ function BattleTeamEntity:getBlock() return self.attr.block or 0 end +function BattleTeamEntity:getCounterAttack() + return self.attr.counterattack or 0 +end + function BattleTeamEntity:takeDamageOrCure(num) if self.isDead then return 0 @@ -306,6 +311,19 @@ function BattleTeamEntity:handleShield(damageNum) end end +function BattleTeamEntity:getCounterAttackCount() + return self.counterAttackCount or 0 +end + +function BattleTeamEntity:addCounterAttackCount(count) + count = count or 1 + self.counterAttackCount = self.counterAttackCount + count +end + +function BattleTeamEntity:clearCounterAttackCount() + self.counterAttackCount = 0 +end + function BattleTeamEntity:getRecordData(name) if self.recordData == nil then self.recordData = {} diff --git a/lua/app/userdata/battle/team/battle_unit_entity.lua b/lua/app/userdata/battle/team/battle_unit_entity.lua index f3411ffa..d9f321da 100644 --- a/lua/app/userdata/battle/team/battle_unit_entity.lua +++ b/lua/app/userdata/battle/team/battle_unit_entity.lua @@ -314,6 +314,10 @@ function BattleUnitEntity:getFirstHand() return self.team:getFirstHand() end +function BattleUnitEntity:getCounterAttack() + return self.team:getCounterAttack() +end + function BattleUnitEntity:addLimit(name, buffEffect) self.team:addLimit(name, buffEffect) end @@ -376,6 +380,18 @@ function BattleUnitEntity:getSkillExtraUseTimes(skillId) return self.skillExtraUseTimes[skillId] or 0 end +function BattleUnitEntity:addCounterAttackCount(count) + self.team:addCounterAttackCount(count) +end + +function BattleUnitEntity:getCounterAttackCount() + return self.team:getCounterAttackCount() +end + +function BattleUnitEntity:clearCounterAttackCount() + self.team:clearCounterAttackCount() +end + function BattleUnitEntity:getTeamRecordData(name) return self.team:getRecordData(name) end From b7dda49394041ed5a83c88d6aedf9d7f78089cfb Mon Sep 17 00:00:00 2001 From: xiekaidong Date: Wed, 10 May 2023 15:17:30 +0800 Subject: [PATCH 10/23] =?UTF-8?q?=E4=B8=BB=E5=8A=A8=E6=8A=80=E8=83=BD?= =?UTF-8?q?=E4=BC=A4=E5=AE=B3=E5=A2=9E=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/app/module/battle/battle_const.lua | 3 +++ lua/app/module/battle/helper/battle_formula.lua | 9 +++++++-- lua/app/userdata/battle/skill/battle_buff_entity.lua | 7 ++++++- lua/app/userdata/battle/skill/battle_skill_entity.lua | 6 +++--- lua/app/userdata/battle/team/battle_team_entity.lua | 4 ++++ lua/app/userdata/battle/team/battle_unit_entity.lua | 4 ++++ 6 files changed, 27 insertions(+), 6 deletions(-) diff --git a/lua/app/module/battle/battle_const.lua b/lua/app/module/battle/battle_const.lua index dd8e4a9c..e8b2e7c8 100644 --- a/lua/app/module/battle/battle_const.lua +++ b/lua/app/module/battle/battle_const.lua @@ -252,6 +252,7 @@ local BUFF_NAME = { THORNS = "thorns", FIRST_HAND = "first_hand", COUNTER_ATTACK = "counterattack", + SKILL_HURT_ADD = "skill_hurt_add", } BattleConst.BUFF_NAME = BUFF_NAME @@ -301,6 +302,7 @@ local ATTR_NAME = { THORNS = "thorns", FIRST_HAND = "first_hand", COUNTER_ATTACK = "counterattack", + SKILL_HURT = "skill_hurt", } BattleConst.ATTR_NAME = ATTR_NAME @@ -343,6 +345,7 @@ BattleConst.BUFF_NAME_TO_ATTR = { [BUFF_NAME.THORNS] = {ATTR_NAME.THORNS, false}, [BUFF_NAME.FIRST_HAND] = {ATTR_NAME.FIRST_HAND, false}, [BUFF_NAME.COUNTER_ATTACK] = {ATTR_NAME.COUNTER_ATTACK, false}, + [BUFF_NAME.SKILL_HURT_ADD] = {ATTR_NAME.SKILL_HURT, false}, } ---- 格子类型 diff --git a/lua/app/module/battle/helper/battle_formula.lua b/lua/app/module/battle/helper/battle_formula.lua index ec7c4c7b..a2a48839 100644 --- a/lua/app/module/battle/helper/battle_formula.lua +++ b/lua/app/module/battle/helper/battle_formula.lua @@ -15,11 +15,16 @@ function BattleFormula:getDamageOrCureResult(unitComp, buff, targetUnitComp) end BattleFormula.calculateFormula = { - -- （攻击）*技能倍率*(1+(攻击者元素伤害增加+所有伤害增加）（攻击者）- (攻击者元素伤害降低+所有伤害降低) +(受到元素伤害增加+受到所有伤害增加（受击）-受到元素伤害降低-受到所有伤害降低（受击）*暴击伤害 + -- （攻击）*技能倍率*(1+(攻击者元素伤害增加+所有伤害增加）（攻击者）- (攻击者元素伤害降低+所有伤害降低) +(受到元素伤害增加+受到所有伤害增加（受击）-受到元素伤害降低-受到所有伤害降低（受击） + 主动技能增伤)*暴击伤害 [1] = function(unitComp, buff, targetUnit) + local skillHurtAdd = 0 + local hostSkill = buff:getHostSkill() + if hostSkill and hostSkill:getIsActiveType() and unitComp.unitEntity:getSkillHurt() > 0 then -- 是主动技能携带的buff，且拥有技能伤害加成 + skillHurtAdd = unitComp.unitEntity:getSkillHurt() + end local matchType = unitComp.unitEntity:getMatchType() local result = unitComp.unitEntity:getAtk() * buff:getEffectNum() // DEFAULT_FACTOR * - (DEFAULT_FACTOR + unitComp.unitEntity:getDmgAddition() - unitComp.unitEntity:getDmgDec() + targetUnit.unitEntity:getWeakness(matchType) - targetUnit.unitEntity:getDecDmg(matchType)) // DEFAULT_FACTOR + (DEFAULT_FACTOR + unitComp.unitEntity:getDmgAddition() - unitComp.unitEntity:getDmgDec() + targetUnit.unitEntity:getWeakness(matchType) - targetUnit.unitEntity:getDecDmg(matchType) + skillHurtAdd) // DEFAULT_FACTOR local hurtState = 0 local crit = unitComp.unitEntity:getCrit() if crit > 0 then diff --git a/lua/app/userdata/battle/skill/battle_buff_entity.lua b/lua/app/userdata/battle/skill/battle_buff_entity.lua index b99a40ca..31a0cd1d 100644 --- a/lua/app/userdata/battle/skill/battle_buff_entity.lua +++ b/lua/app/userdata/battle/skill/battle_buff_entity.lua @@ -6,12 +6,13 @@ local BUFF_TYPE_DIRECT_HURT = BattleConst.BUFF_TYPE.DIRECT_HURT function BattleBuffEntity:ctor() end -function BattleBuffEntity:init(effectParams, owner) +function BattleBuffEntity:init(effectParams, owner, hostSkill) self.name = effectParams.type self.effectNum = effectParams.num self.round = effectParams.round self.ratio = effectParams.ratio self.owner = owner + self.hostSkill = hostSkill self.targetSide = nil self.buffInfo = ConfigManager:getConfigWithOtherKey("buff", "name")[self.name] self.buffType = self.buffInfo.buff_type @@ -25,6 +26,10 @@ function BattleBuffEntity:getName() return self.name end +function BattleBuffEntity:getHostSkill() + return self.hostSkill +end + function BattleBuffEntity:getDesc() if self.desc == nil then local buff18NInfo = I18N:getConfigWithOtherKey("buff", "name")[self.name] diff --git a/lua/app/userdata/battle/skill/battle_skill_entity.lua b/lua/app/userdata/battle/skill/battle_skill_entity.lua index b8645253..c305830c 100644 --- a/lua/app/userdata/battle/skill/battle_skill_entity.lua +++ b/lua/app/userdata/battle/skill/battle_skill_entity.lua @@ -37,7 +37,7 @@ function BattleSkillEntity:initSkillEffect() if self.skillInfo.effect then for k, v in ipairs(self.skillInfo.effect) do local buffEntity = BattleBuffEntity:create() - buffEntity:init(v, self.owner) + buffEntity:init(v, self.owner, self) if buffEntity:getIsHurtType() then self.isHurtType = true end @@ -89,7 +89,7 @@ function BattleSkillEntity:addSkillEffectParams(effect) end if not buffEntity then buffEntity = BattleBuffEntity:create() - buffEntity:init(effect, self.owner) + buffEntity:init(effect, self.owner, self) table.insert(self.effectList, buffEntity) else buffEntity:setEffectNum(buffEntity:getEffectNum() + effect.num) @@ -106,7 +106,7 @@ function BattleSkillEntity:addSkillEffectRound(effect) end if not buffEntity then buffEntity = BattleBuffEntity:create() - buffEntity:init(effect, self.owner) + buffEntity:init(effect, self.owner, self) table.insert(self.effectList, buffEntity) else buffEntity:setRound(buffEntity:getRound() + effect.round) diff --git a/lua/app/userdata/battle/team/battle_team_entity.lua b/lua/app/userdata/battle/team/battle_team_entity.lua index 86b8058c..6648d596 100644 --- a/lua/app/userdata/battle/team/battle_team_entity.lua +++ b/lua/app/userdata/battle/team/battle_team_entity.lua @@ -269,6 +269,10 @@ function BattleTeamEntity:getCounterAttack() return self.attr.counterattack or 0 end +function BattleTeamEntity:getSkillHurt() + return self.attr.skill_hurt or 0 +end + function BattleTeamEntity:takeDamageOrCure(num) if self.isDead then return 0 diff --git a/lua/app/userdata/battle/team/battle_unit_entity.lua b/lua/app/userdata/battle/team/battle_unit_entity.lua index d9f321da..9114a753 100644 --- a/lua/app/userdata/battle/team/battle_unit_entity.lua +++ b/lua/app/userdata/battle/team/battle_unit_entity.lua @@ -318,6 +318,10 @@ function BattleUnitEntity:getCounterAttack() return self.team:getCounterAttack() end +function BattleUnitEntity:getSkillHurt() + return self.team:getSkillHurt() +end + function BattleUnitEntity:addLimit(name, buffEffect) self.team:addLimit(name, buffEffect) end From 530ea1477658c3e645013b342620dab6b63814ee Mon Sep 17 00:00:00 2001 From: xiekaidong Date: Wed, 10 May 2023 16:51:45 +0800 Subject: [PATCH 11/23] =?UTF-8?q?=E7=A6=81=E9=94=A2buff?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/battle/component/battle_unit_comp.lua | 10 ++++++++++ .../module/battle/controller/battle_controller.lua | 1 - .../module/battle/helper/battle_buff_special.lua | 9 +++++++++ .../battle/skill/battle_rogue_skill_handle.lua | 1 - lua/app/userdata/battle/team/battle_team_entity.lua | 13 +++++++++++++ lua/app/userdata/battle/team/battle_unit_entity.lua | 12 ++++++++++++ 6 files changed, 44 insertions(+), 2 deletions(-) diff --git a/lua/app/module/battle/component/battle_unit_comp.lua b/lua/app/module/battle/component/battle_unit_comp.lua index 81d65120..013f1152 100644 --- a/lua/app/module/battle/component/battle_unit_comp.lua +++ b/lua/app/module/battle/component/battle_unit_comp.lua @@ -63,6 +63,10 @@ function BattleUnitComp:getIsLethargy() return self.unitEntity:getIsLethargy() end +function BattleUnitComp:getActiveSkillLimit() + return self.unitEntity:getActiveSkillLimit() +end + function BattleUnitComp:setTeam(team) self.team = team end @@ -299,6 +303,9 @@ function BattleUnitComp:useSkill(index, count, callback) self.actionOverCallback = callback self.activeSkillIndex = nil self.currActiveSkill = self.unitEntity:getAvailableActiveSkill(index) + if self:getActiveSkillLimit() then + self.currActiveSkill = nil + end if count <= 0 then self.normalSkillCount = 0 else @@ -345,6 +352,9 @@ function BattleUnitComp:useAllSkills(callback) self.activeSkillIndex = 1 self.currActiveSkill = nil local activeSkillCount = self.unitEntity:getActiveSkillCount() + if self:getActiveSkillLimit() then + activeSkillCount = 0 + end while self.activeSkillIndex <= activeSkillCount do self.currActiveSkill = self.unitEntity:getAvailableActiveSkill(self.activeSkillIndex) if self.currActiveSkill then diff --git a/lua/app/module/battle/controller/battle_controller.lua b/lua/app/module/battle/controller/battle_controller.lua index 5d4f2503..19643e41 100644 --- a/lua/app/module/battle/controller/battle_controller.lua +++ b/lua/app/module/battle/controller/battle_controller.lua @@ -592,7 +592,6 @@ function BattleController:enterNextTeamAction() return end - Logger.logHighlight(self.battleTeamActionList[1] == nil) if not self.battleTeamActionList or not self.battleTeamActionList[1] then self:enterRefreshBoard() return diff --git a/lua/app/module/battle/helper/battle_buff_special.lua b/lua/app/module/battle/helper/battle_buff_special.lua index 875ca9bf..e14db043 100644 --- a/lua/app/module/battle/helper/battle_buff_special.lua +++ b/lua/app/module/battle/helper/battle_buff_special.lua @@ -53,12 +53,20 @@ local function _undeadOff(buffSender, target, buff, buffEffect) target.unitEntity:setUndeadHp(0) -- 写死0 end +local function _imprisonOn(buffSender, buff, target, buffEffect) + target.unitEntity:addActiveSkillLimit(buff:getName()) +end + +local function _imprisonOff(buffSender, target, buff, buffEffect) + target.unitEntity:removeActiveSkillLimit(buff:getName()) +end local _handleOn = { [BUFF_NAME.ADD_SKILL] = _addSkillOn, -- 添加技能 [BUFF_NAME.SKILL_FIRE_TIMES] = _skillFireTimesOn, -- 技能额外使用次数 [BUFF_NAME.BLEED] = _bleedOn, -- 流血 [BUFF_NAME.UNDEAD] = _undeadOn, -- 不死 + [BUFF_NAME.IMPRISON] = _imprisonOn, -- 禁锢 } local _handleOff = { @@ -66,6 +74,7 @@ local _handleOff = { [BUFF_NAME.SKILL_FIRE_TIMES] = _skillFireTimesOff, -- 技能额外使用次数 [BUFF_NAME.BLEED] = _bleedOff, -- 流血 [BUFF_NAME.UNDEAD] = _undeadOff, -- 不死 + [BUFF_NAME.IMPRISON] = _imprisonOff, -- 禁锢 } local _handleWork = { diff --git a/lua/app/module/battle/skill/battle_rogue_skill_handle.lua b/lua/app/module/battle/skill/battle_rogue_skill_handle.lua index 4e19551d..c910328a 100644 --- a/lua/app/module/battle/skill/battle_rogue_skill_handle.lua +++ b/lua/app/module/battle/skill/battle_rogue_skill_handle.lua @@ -180,7 +180,6 @@ local _addSkillRound = function(skillInfo, battleData, battleController) battleData.atkTeam:getAllMembers()[elementType]:addSkillRound(skillId, effect) end end - Logger.logHighlight("------addSkillRound------ " .. elementType .. " " .. json.encode(effect)) end local _addSkillEffect = function(skillInfo, battleData, battleController) diff --git a/lua/app/userdata/battle/team/battle_team_entity.lua b/lua/app/userdata/battle/team/battle_team_entity.lua index 6648d596..cb7f9b00 100644 --- a/lua/app/userdata/battle/team/battle_team_entity.lua +++ b/lua/app/userdata/battle/team/battle_team_entity.lua @@ -39,6 +39,7 @@ function BattleTeamEntity:init(side, data) self.stunCount = 0 self.lethargyCount = 0 self.limitAll = 0 + self.activeSkillLimit = 0 self.shieldHp = 0 self.undeadHp = 0 if data then @@ -245,6 +246,18 @@ function BattleTeamEntity:getIsLimit() return self.limitAll > 0 end +function BattleTeamEntity:getActiveSkillLimit() + return self.activeSkillLimit > 0 +end + +function BattleTeamEntity:addActiveSkillLimit(name) + self.activeSkillLimit = self.activeSkillLimit + 1 +end + +function BattleTeamEntity:removeActiveSkillLimit(name) + self.activeSkillLimit = self.activeSkillLimit - 1 +end + function BattleTeamEntity:getIsLethargy() return self.lethargyCount > 0 end diff --git a/lua/app/userdata/battle/team/battle_unit_entity.lua b/lua/app/userdata/battle/team/battle_unit_entity.lua index 9114a753..bad6a097 100644 --- a/lua/app/userdata/battle/team/battle_unit_entity.lua +++ b/lua/app/userdata/battle/team/battle_unit_entity.lua @@ -334,6 +334,18 @@ function BattleUnitEntity:getIsLimit() return self.team:getIsLimit() end +function BattleUnitEntity:getActiveSkillLimit() + return self.team:getActiveSkillLimit() +end + +function BattleUnitEntity:addActiveSkillLimit(name) + self.team:addActiveSkillLimit(name) +end + +function BattleUnitEntity:removeActiveSkillLimit(name) + self.team:removeActiveSkillLimit(name) +end + function BattleUnitEntity:getIsLethargy() return self.team:getIsLethargy() end From af0c61130d2a27e349c456915b176ac513884ebb Mon Sep 17 00:00:00 2001 From: xiekaidong Date: Wed, 10 May 2023 20:53:06 +0800 Subject: [PATCH 12/23] =?UTF-8?q?=E5=86=BB=E7=BB=93buff?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/app/module/battle/battle_const.lua | 3 +- .../battle/component/battle_unit_comp.lua | 58 ++++++++++ .../battle/helper/battle_buff_handle.lua | 6 +- .../battle/helper/battle_buff_special.lua | 18 +++- lua/app/module/battle/team/battle_team.lua | 101 +++++++++++++++++- .../battle/team/battle_team_entity.lua | 15 ++- .../battle/team/battle_unit_entity.lua | 8 +- 7 files changed, 198 insertions(+), 11 deletions(-) diff --git a/lua/app/module/battle/battle_const.lua b/lua/app/module/battle/battle_const.lua index e8b2e7c8..7a737259 100644 --- a/lua/app/module/battle/battle_const.lua +++ b/lua/app/module/battle/battle_const.lua @@ -239,7 +239,7 @@ local BUFF_NAME = { SHIELD_REBOUND_200 = "shield_rebound_200", BURN = "burn", VULNERABLE = "vulnerable", - FROAEN = "frozen", + FROZEN = "frozen", POISON = "poison", IMPRISON = "imprison", CORRUPT = "corrupt", @@ -356,6 +356,7 @@ BattleConst.GRID_TYPE = { SOLID_SNOW = 3, VINES = 4, ICE = 5, + LOCK = 6, } BattleConst.GRID_TYPE_ICON = { diff --git a/lua/app/module/battle/component/battle_unit_comp.lua b/lua/app/module/battle/component/battle_unit_comp.lua index 013f1152..360d5a1a 100644 --- a/lua/app/module/battle/component/battle_unit_comp.lua +++ b/lua/app/module/battle/component/battle_unit_comp.lua @@ -1104,6 +1104,18 @@ function BattleUnitComp:removeBuffByName(buffName) self.team:removeBuffByName(buffName) end +function BattleUnitComp:putCacheBuff(buffEffect) + self.team:putCacheBuff(buffEffect) +end + +function BattleUnitComp:putCacheBuffByDecr(buffDecr) + self.team:putCacheBuffByDecr(buffDecr) +end + +function BattleUnitComp:popCacheBuffByDecr(buffDecr) + self.team:popCacheBuffByDecr(buffDecr) +end + function BattleUnitComp:onSkillTakeEffect(skill) skill:endUse() if skill:getIsEliminateType() then @@ -1168,6 +1180,18 @@ function BattleUnitComp:takeEffect(buff, target) return false end end + if self.unitEntity:getIsFrozen() and buff:getDecr() == BattleConst.BUFF_DECR_TYPE.INCREASE_GAIN then -- 冻结状态，缓存增益buff + if buff:getRound() > 0 then + local buffEffect = BattleHelper:getBuffEffect() + buffEffect.buff = buff + buffEffect.result = nil + buffEffect.round = buff:getRound() + buffEffect.target = target + buffEffect.sender = self + target:putCacheBuff(buffEffect) + end + return + end local round = buff:getRound() local buffEffect if round > 0 then @@ -1179,6 +1203,40 @@ function BattleUnitComp:takeEffect(buff, target) buffEffect.sender = self buffEffect = target:addBuff(buffEffect) end + if buffEffect and buffEffect.result then + return + end + local func = BattleBuffHandle.takeBuffEffect[buff:getBuffType()] + if func then + local result = func(self, buff, target, buffEffect) + if buffEffect then + buffEffect.result = result + end + local success = result ~= nil + if success then + local fxList = buff:getFxGet() + if fxList then + for _, v in ipairs(fxList) do + target:playFx(v, 0) + end + end + end + return success + end + return false +end + +function BattleUnitComp:reTakeEffectByBuffEffect(buffEffect) + local round = buffEffect.round + local target = buffEffect.target + local buff = buffEffect.buff + if round > 0 then + buffEffect.result = nil + buffEffect = target:addBuff(buffEffect) + end + if buffEffect and buffEffect.result then + return + end local func = BattleBuffHandle.takeBuffEffect[buff:getBuffType()] if func then local result = func(self, buff, target, buffEffect) diff --git a/lua/app/module/battle/helper/battle_buff_handle.lua b/lua/app/module/battle/helper/battle_buff_handle.lua index 1cc4ac31..10083d8d 100644 --- a/lua/app/module/battle/helper/battle_buff_handle.lua +++ b/lua/app/module/battle/helper/battle_buff_handle.lua @@ -47,14 +47,16 @@ function BattleBuffHandle.doBuffWork(unitComp, buffEffect) end end -function BattleBuffHandle.removeBuff(unitComp, buffEffect) +function BattleBuffHandle.removeBuff(unitComp, buffEffect, noRecycle) local buff = buffEffect.buff local buffType = buff:getBuffType() local func = BattleBuffHandle.removeEffect[buffType] if func then func(buffEffect.sender, unitComp, buff, buffEffect) end - BattleHelper:recycleBuffEffect(buffEffect) + if not noRecycle then + BattleHelper:recycleBuffEffect(buffEffect) + end end BattleBuffHandle.addAttribute = { diff --git a/lua/app/module/battle/helper/battle_buff_special.lua b/lua/app/module/battle/helper/battle_buff_special.lua index e14db043..652f3962 100644 --- a/lua/app/module/battle/helper/battle_buff_special.lua +++ b/lua/app/module/battle/helper/battle_buff_special.lua @@ -54,19 +54,34 @@ local function _undeadOff(buffSender, target, buff, buffEffect) end local function _imprisonOn(buffSender, buff, target, buffEffect) - target.unitEntity:addActiveSkillLimit(buff:getName()) + return target.unitEntity:addActiveSkillLimit(buff:getName()) end local function _imprisonOff(buffSender, target, buff, buffEffect) target.unitEntity:removeActiveSkillLimit(buff:getName()) end +local function _frozenOn(buffSender, buff, target, buffEffect) + if not target.unitEntity:getIsFrozen() then + target:putCacheBuffByDecr(BattleConst.BUFF_DECR_TYPE.INCREASE_GAIN) + end + return target.unitEntity:addLimit(buff:getName(), buffEffect) +end + +local function _frozenOff(buffSender, target, buff, buffEffect) + target.unitEntity:removeLimit(buff:getName(), buffEffect) + if not target.unitEntity:getIsFrozen() then + target:popCacheBuffByDecr(BattleConst.BUFF_DECR_TYPE.INCREASE_GAIN) + end +end + local _handleOn = { [BUFF_NAME.ADD_SKILL] = _addSkillOn, -- 添加技能 [BUFF_NAME.SKILL_FIRE_TIMES] = _skillFireTimesOn, -- 技能额外使用次数 [BUFF_NAME.BLEED] = _bleedOn, -- 流血 [BUFF_NAME.UNDEAD] = _undeadOn, -- 不死 [BUFF_NAME.IMPRISON] = _imprisonOn, -- 禁锢 + [BUFF_NAME.FROZEN] = _frozenOn, -- 冻结 } local _handleOff = { @@ -75,6 +90,7 @@ local _handleOff = { [BUFF_NAME.BLEED] = _bleedOff, -- 流血 [BUFF_NAME.UNDEAD] = _undeadOff, -- 不死 [BUFF_NAME.IMPRISON] = _imprisonOff, -- 禁锢 + [BUFF_NAME.FROZEN] = _frozenOff, -- 冻结 } local _handleWork = { diff --git a/lua/app/module/battle/team/battle_team.lua b/lua/app/module/battle/team/battle_team.lua index 740275b7..7b56959e 100644 --- a/lua/app/module/battle/team/battle_team.lua +++ b/lua/app/module/battle/team/battle_team.lua @@ -14,6 +14,7 @@ function BattleTeam:init(side, battleController) self.shieldBuffList = {} self.loopFxMap = {} self.comboCount = 0 + self.cacheBuffDecr = {} end function BattleTeam:addUnit(unit, isMainUnit) @@ -239,12 +240,14 @@ function BattleTeam:addBuff(buffEffect) if bEffect.round < buffEffect.round then bEffect.round = buffEffect.round for fieldName, v in pairs(bEffect) do - if fieldName ~= "buff" and fieldName ~= "round" then + if fieldName ~= "buff" and fieldName ~= "round" and fieldName ~= "result" then bEffect[fieldName] = buffEffect[fieldName] end end needRecycle = bEffect break + else + return bEffect end end end @@ -257,7 +260,7 @@ function BattleTeam:addBuff(buffEffect) if bEffect.buff:getName() == buffName then bEffect.round = bEffect.round + buffEffect.round for fieldName, v in pairs(bEffect) do - if fieldName ~= "buff" and fieldName ~= "round" then + if fieldName ~= "buff" and fieldName ~= "round" and fieldName ~= "result" then bEffect[fieldName] = buffEffect[fieldName] end end @@ -295,15 +298,105 @@ function BattleTeam:removeAllBuff() BattleBuffHandle.removeBuff(self.mainUnit, buffEffect) end end + + if self.cacheBuffDecr then + for decr, list in pairs(self.cacheBuffDecr) do + count = #list + for i = count, 1, -1 do + buffEffect = self.cacheBuffDecr[decr][i] + table.remove(self.cacheBuffDecr[decr], i) + BattleHelper:recycleBuffEffect(buffEffect) + end + end + end + self.battleController:clearBuff(self.side) end -function BattleTeam:doBuffWork() +function BattleTeam:putCacheBuff(buffEffect) + local buffDecr = buffEffect.buff:getDecr() + if not self.cacheBuffDecr[buffDecr] then + self.cacheBuffDecr[buffDecr] = {} + end + table.insert(self.cacheBuffDecr[buffDecr], buffEffect) +end + +function BattleTeam:putCacheBuffByDecr(buffDecr) + if not buffDecr then + return + end + + local needRefresh = false + local buffEffect = nil local count = #self.buffList + for i = count, 1, -1 do + buffEffect = self.buffList[i] + if buffEffect and buffEffect.buff:getDecr() == buffDecr then + self:updateBuffState(buffEffect.buff, -1) + table.remove(self.buffList, i) + BattleBuffHandle.removeBuff(self.mainUnit, buffEffect, true) + if not self.cacheBuffDecr[buffDecr] then + self.cacheBuffDecr[buffDecr] = {} + end + + table.insert(self.cacheBuffDecr[buffDecr], buffEffect) + if buffEffect.buff:getIcon() then + needRefresh = true + end + end + end + + if needRefresh then + self.battleController:refreshBuff(self.side, self.buffList) + end +end + +function BattleTeam:popCacheBuffByDecr(buffDecr) + if not buffDecr or not self.cacheBuffDecr or not self.cacheBuffDecr[buffDecr] then + return + end + + local list = self.cacheBuffDecr[buffDecr] + + local needRefresh = false + local count = #list + local buffEffect + for i = count, 1, -1 do + buffEffect = self.cacheBuffDecr[buffDecr][i] + self:getMainUnit():reTakeEffectByBuffEffect(buffEffect) + table.remove(self.cacheBuffDecr[buffDecr]) + if buffEffect.buff:getIcon() then + needRefresh = true + end + end + + if needRefresh then + self.battleController:refreshBuff(self.side, self.buffList) + end +end + +function BattleTeam:doBuffWork() + local count = nil + local buffEffect = nil + if self.cacheBuffDecr then + for decr, list in pairs(self.cacheBuffDecr) do + count = #list + for i = count, 1, -1 do + buffEffect = self.cacheBuffDecr[decr][i] + buffEffect.round = buffEffect.round - 1 + if buffEffect.round <= 0 then + table.remove(self.cacheBuffDecr[decr], i) + BattleHelper:recycleBuffEffect(buffEffect) + end + end + end + end + + count = #self.buffList if count <= 0 then return end - local buffEffect = nil + buffEffect = nil for i = count, 1, -1 do buffEffect = self.buffList[i] buffEffect.round = buffEffect.round - 1 diff --git a/lua/app/userdata/battle/team/battle_team_entity.lua b/lua/app/userdata/battle/team/battle_team_entity.lua index cb7f9b00..3e068fa1 100644 --- a/lua/app/userdata/battle/team/battle_team_entity.lua +++ b/lua/app/userdata/battle/team/battle_team_entity.lua @@ -38,6 +38,7 @@ function BattleTeamEntity:init(side, data) self.isDead = false self.stunCount = 0 self.lethargyCount = 0 + self.frozenCount = 0 self.limitAll = 0 self.activeSkillLimit = 0 self.shieldHp = 0 @@ -90,7 +91,6 @@ function BattleTeamEntity:addBaseAttr(unitAttr) end function BattleTeamEntity:addAttr(name, num, isPercent) - Logger.logHighlight(name) local addNum = 0 if isPercent then if self.attr[name] then @@ -229,8 +229,14 @@ function BattleTeamEntity:addLimit(name, buffEffect) return end self.lethargyCount = self.lethargyCount + 1 + elseif name == BUFF_NAME.FROZEN then + if buffEffect.result then + return + end + self.frozenCount = self.frozenCount + 1 end self.limitAll = self.limitAll + 1 + return 1 end function BattleTeamEntity:removeLimit(name) @@ -238,8 +244,11 @@ function BattleTeamEntity:removeLimit(name) self.stunCount = self.stunCount - 1 elseif name == BUFF_NAME.LETHARGY then self.lethargyCount = self.lethargyCount - 1 + elseif name == BUFF_NAME.FROZEN then + self.frozenCount = self.frozenCount - 1 end self.limitAll = self.limitAll - 1 + return 1 end function BattleTeamEntity:getIsLimit() @@ -262,6 +271,10 @@ function BattleTeamEntity:getIsLethargy() return self.lethargyCount > 0 end +function BattleTeamEntity:getIsFrozen() + return self.frozenCount > 0 +end + function BattleTeamEntity:addShield(num) self.shieldHp = self.shieldHp + num end diff --git a/lua/app/userdata/battle/team/battle_unit_entity.lua b/lua/app/userdata/battle/team/battle_unit_entity.lua index bad6a097..4e2b184f 100644 --- a/lua/app/userdata/battle/team/battle_unit_entity.lua +++ b/lua/app/userdata/battle/team/battle_unit_entity.lua @@ -323,11 +323,11 @@ function BattleUnitEntity:getSkillHurt() end function BattleUnitEntity:addLimit(name, buffEffect) - self.team:addLimit(name, buffEffect) + return self.team:addLimit(name, buffEffect) end function BattleUnitEntity:removeLimit(name) - self.team:removeLimit(name) + return self.team:removeLimit(name) end function BattleUnitEntity:getIsLimit() @@ -350,6 +350,10 @@ function BattleUnitEntity:getIsLethargy() return self.team:getIsLethargy() end +function BattleUnitEntity:getIsFrozen() + return self.team:getIsFrozen() +end + function BattleUnitEntity:addShield(num) self.team:addShield(num) end From 9a9d4447ac0eede57147a430014407856c9686e9 Mon Sep 17 00:00:00 2001 From: xiekaidong Date: Wed, 10 May 2023 21:04:30 +0800 Subject: [PATCH 13/23] =?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/module/battle/helper/battle_buff_special.lua | 6 ++++-- lua/app/userdata/battle/team/battle_team_entity.lua | 2 -- lua/app/userdata/battle/team/battle_unit_entity.lua | 6 ++++-- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/lua/app/module/battle/helper/battle_buff_special.lua b/lua/app/module/battle/helper/battle_buff_special.lua index 652f3962..8dc8310f 100644 --- a/lua/app/module/battle/helper/battle_buff_special.lua +++ b/lua/app/module/battle/helper/battle_buff_special.lua @@ -54,7 +54,8 @@ local function _undeadOff(buffSender, target, buff, buffEffect) end local function _imprisonOn(buffSender, buff, target, buffEffect) - return target.unitEntity:addActiveSkillLimit(buff:getName()) + target.unitEntity:addActiveSkillLimit(buff:getName()) + return 1 end local function _imprisonOff(buffSender, target, buff, buffEffect) @@ -65,7 +66,8 @@ local function _frozenOn(buffSender, buff, target, buffEffect) if not target.unitEntity:getIsFrozen() then target:putCacheBuffByDecr(BattleConst.BUFF_DECR_TYPE.INCREASE_GAIN) end - return target.unitEntity:addLimit(buff:getName(), buffEffect) + target.unitEntity:addLimit(buff:getName(), buffEffect) + return 1 end local function _frozenOff(buffSender, target, buff, buffEffect) diff --git a/lua/app/userdata/battle/team/battle_team_entity.lua b/lua/app/userdata/battle/team/battle_team_entity.lua index 3e068fa1..4ced81f9 100644 --- a/lua/app/userdata/battle/team/battle_team_entity.lua +++ b/lua/app/userdata/battle/team/battle_team_entity.lua @@ -236,7 +236,6 @@ function BattleTeamEntity:addLimit(name, buffEffect) self.frozenCount = self.frozenCount + 1 end self.limitAll = self.limitAll + 1 - return 1 end function BattleTeamEntity:removeLimit(name) @@ -248,7 +247,6 @@ function BattleTeamEntity:removeLimit(name) self.frozenCount = self.frozenCount - 1 end self.limitAll = self.limitAll - 1 - return 1 end function BattleTeamEntity:getIsLimit() diff --git a/lua/app/userdata/battle/team/battle_unit_entity.lua b/lua/app/userdata/battle/team/battle_unit_entity.lua index 4e2b184f..616af888 100644 --- a/lua/app/userdata/battle/team/battle_unit_entity.lua +++ b/lua/app/userdata/battle/team/battle_unit_entity.lua @@ -339,7 +339,7 @@ function BattleUnitEntity:getActiveSkillLimit() end function BattleUnitEntity:addActiveSkillLimit(name) - self.team:addActiveSkillLimit(name) + return self.team:addActiveSkillLimit(name) end function BattleUnitEntity:removeActiveSkillLimit(name) @@ -422,7 +422,9 @@ end function BattleUnitEntity:onRoundEnd() for k, v in ipairs(self.activeSkills) do - v:cooldown() + if not self:getActiveSkillLimit() then + v:cooldown() + end end end From f89e3f1256c0b531db7cd6a443736801d5707442 Mon Sep 17 00:00:00 2001 From: xiekaidong Date: Thu, 11 May 2023 09:59:10 +0800 Subject: [PATCH 14/23] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=88=98=E6=96=97?= =?UTF-8?q?=E8=8A=82=E5=A5=8F=E9=A1=BA=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/app/module/battle/battle_const.lua | 10 +++--- .../battle/controller/battle_controller.lua | 31 ++++++++++--------- 2 files changed, 21 insertions(+), 20 deletions(-) diff --git a/lua/app/module/battle/battle_const.lua b/lua/app/module/battle/battle_const.lua index 7a737259..f7442878 100644 --- a/lua/app/module/battle/battle_const.lua +++ b/lua/app/module/battle/battle_const.lua @@ -53,11 +53,11 @@ BattleConst.BATTLE_ROUND_STEP = { ON_BEGIN = 1, -- 回合开始 ON_ELIMINATION_BEGIN = 3, -- 消除开始 ON_ELIMINATION = 4, -- 等待消除 - ON_TEAM_ACTION = 5, -- 队伍行动 - ON_ATK_STEP = 6, -- 攻击方行动 - ON_DEF_STEP = 7, -- 防守方行动 - ON_TEAM_ACTION_OVER = 8, -- 攻击方行动结束(可能直接跳转到刷新棋盘/回合结束/进入下一个队伍行动) - ON_REFRESH_BOARD = 9, -- 刷新棋盘 + ON_REFRESH_BOARD = 5, -- 刷新棋盘 + ON_TEAM_ACTION = 6, -- 队伍行动 + ON_ATK_STEP = 7, -- 攻击方行动 + ON_DEF_STEP = 8, -- 防守方行动 + ON_TEAM_ACTION_OVER = 9, -- 攻击方行动结束(可能直接跳转到刷新棋盘/回合结束/进入下一个队伍行动) ON_END = 10, -- 回合结束 } diff --git a/lua/app/module/battle/controller/battle_controller.lua b/lua/app/module/battle/controller/battle_controller.lua index 19643e41..89bba5a9 100644 --- a/lua/app/module/battle/controller/battle_controller.lua +++ b/lua/app/module/battle/controller/battle_controller.lua @@ -66,7 +66,7 @@ function BattleController:initDefUnits(callback) end function BattleController:findNextDefUnit() - self:enterRefreshBoard() + self:enterRoundEnd() end function BattleController:onDefDead() @@ -587,13 +587,13 @@ function BattleController:enterNextTeamAction() else self.defTeam:removeAllBuff() self:onDefDead() - self:enterRefreshBoard() + self:_findNextDefUnit() end return end if not self.battleTeamActionList or not self.battleTeamActionList[1] then - self:enterRefreshBoard() + self:enterRoundEnd() return end @@ -1010,7 +1010,7 @@ function BattleController:onLinkOver() self.battleUI:disableUITouch() self.battleUI:eliminationAni(sequence, function() self:generateInstructions(skillEntity, linkElementType, lineCount, influenceElementType, elementTypeMap) - self:enterBattleStep() + self:enterRefreshBoard() end) self.eliminateCount = self.eliminateCount + 1 @@ -1071,17 +1071,18 @@ function BattleController:onFillBoardOver() self:generateSkill(function() self.battleUI:refreshSkill() - local defTeam = self.battleData:getDefTeam() - if not defTeam or defTeam:getIsDead() then -- 怪物死了， 直接进入刷新逻辑 - if self.waveIndex >= self.maxWaveIndex then - self:enterRoundEnd() - else - self:_findNextDefUnit() - end - return - else - self:enterRoundEnd() - end + self:enterBattleStep() + -- local defTeam = self.battleData:getDefTeam() + -- if not defTeam or defTeam:getIsDead() then -- 怪物死了， 直接进入刷新逻辑 + -- if self.waveIndex >= self.maxWaveIndex then + -- self:enterRoundEnd() + -- else + -- self:_findNextDefUnit() + -- end + -- return + -- else + -- self:enterRoundEnd() + -- end end) end From d9bf3ee52b23364349e35be35abfa8cccbcd2daf Mon Sep 17 00:00:00 2001 From: xiekaidong Date: Thu, 11 May 2023 11:22:46 +0800 Subject: [PATCH 15/23] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BD=B1=E5=93=8D?= =?UTF-8?q?=E6=A3=8B=E7=9B=98=E7=9A=84=E6=8A=80=E8=83=BD=E7=9A=84=E9=80=BB?= =?UTF-8?q?=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../battle/component/battle_unit_comp.lua | 5 +-- .../battle/controller/battle_controller.lua | 2 +- .../skill/battle_board_skill_handle.lua | 31 ++++++++++++++++--- .../skill/battle_board_skill_entity.lua | 4 +++ .../battle/skill/battle_skill_entity.lua | 8 +++-- 5 files changed, 40 insertions(+), 10 deletions(-) diff --git a/lua/app/module/battle/component/battle_unit_comp.lua b/lua/app/module/battle/component/battle_unit_comp.lua index 360d5a1a..069a25eb 100644 --- a/lua/app/module/battle/component/battle_unit_comp.lua +++ b/lua/app/module/battle/component/battle_unit_comp.lua @@ -1,6 +1,7 @@ local BattleConst = require "app/module/battle/battle_const" local BattleHelper = require "app/module/battle/helper/battle_helper" local BattleBuffHandle = require "app/module/battle/helper/battle_buff_handle" +local BATTLE_BOARD_SKILL_HANDLE = require "app/module/battle/skill/battle_board_skill_handle" local BattlePassive = require "app/module/battle/helper/battle_passive" local BattleUnitComp = class("BattleUnitComp", LuaComponent) @@ -1118,8 +1119,8 @@ end function BattleUnitComp:onSkillTakeEffect(skill) skill:endUse() - if skill:getIsEliminateType() then - self.battleController:generateGridType(skill:getEliminateSkillParameter(), self.baseObject:getTransform().position) + if skill:isAttackOverActive() then + BATTLE_BOARD_SKILL_HANDLE.activeAttackOverSkill(self, skill, self.battleController) end local effectList = skill:getEffectList() if effectList == nil then diff --git a/lua/app/module/battle/controller/battle_controller.lua b/lua/app/module/battle/controller/battle_controller.lua index 89bba5a9..1882ec08 100644 --- a/lua/app/module/battle/controller/battle_controller.lua +++ b/lua/app/module/battle/controller/battle_controller.lua @@ -1582,7 +1582,7 @@ function BattleController:findSkillInfluenceGrids() if skillId then local skillEntity = self.battleData:getSkillEntityBySkillId(skillId) if skillEntity then - BATTLE_BOARD_SKILL_HANDLE.activeBoardSkill(info.posId, skillEntity, self.battleData:getGridEnties(), sequenceEntities) + BATTLE_BOARD_SKILL_HANDLE.activeBoardSkill(info.posId, skillEntity, self.battleData:getGridEnties(), sequenceEntities, self) end end end diff --git a/lua/app/module/battle/skill/battle_board_skill_handle.lua b/lua/app/module/battle/skill/battle_board_skill_handle.lua index 429b586e..24d59942 100644 --- a/lua/app/module/battle/skill/battle_board_skill_handle.lua +++ b/lua/app/module/battle/skill/battle_board_skill_handle.lua @@ -5,7 +5,7 @@ local BattleBoardSkillHandle = {} local SKILL_TYPE = BattleConst.SKILL_TYPE local SKILL_METHOD_TYPE = BattleConst.SKILL_METHOD_TYPE -local function _takeElimination(posId, skillEntity, gridEntities, sequenceEntities) +local function _takeElimination(posId, skillEntity, gridEntities, sequenceEntities, battleController) local boardrange = skillEntity:getBoardRange() if boardrange then local cludePosIdsMap = {} @@ -27,7 +27,7 @@ local function _takeElimination(posId, skillEntity, gridEntities, sequenceEntiti end end -local function _takeChangeAround(posId, skillEntity, gridEntities, sequenceEntities) +local function _takeChangeAround(posId, skillEntity, gridEntities, sequenceEntities, battleController) local boardrange = skillEntity:getBoardRange() if boardrange then local cludePosIdsMap = {} @@ -46,7 +46,13 @@ local function _takeChangeAround(posId, skillEntity, gridEntities, sequenceEntit end end -local function _takeEliminationGridAndElement(posId, skillEntity, gridEntities, sequenceEntities) +local function _taleReleaseGridType(atkUnitComp, skillEntity, battleController) + if skillEntity:getEliminateSkillParameter() then + battleController:generateGridType(skillEntity:getEliminateSkillParameter(), atkUnitComp:getBaseObject():getTransform().position) + end +end + +local function _takeEliminationGridAndElement(posId, skillEntity, gridEntities, sequenceEntities, battleController) local boardrange = skillEntity:getBoardRange() if boardrange then local cludePosIdsMap = {} @@ -74,14 +80,29 @@ BattleBoardSkillHandle._activeBoardSkill = { [SKILL_TYPE.ELIMINATION_GRID_AND_ELEMENT] = _takeEliminationGridAndElement, } -function BattleBoardSkillHandle.activeBoardSkill(posId, skillEntity, gridEntities, sequenceEntities) +BattleBoardSkillHandle._activeAttackOverSkill = { + [SKILL_TYPE.RELEASE_GRID_TYPE] = _taleReleaseGridType, +} + +function BattleBoardSkillHandle.activeBoardSkill(posId, skillEntity, gridEntities, sequenceEntities, battleController) if not skillEntity then return end local func = BattleBoardSkillHandle._activeBoardSkill[skillEntity:getSkillType()] if func then - func(posId, skillEntity, gridEntities, sequenceEntities) + func(posId, skillEntity, gridEntities, sequenceEntities, battleController) + end +end + +function BattleBoardSkillHandle.activeAttackOverSkill(atkUnitComp, skillEntity, battleController) + if not skillEntity then + return + end + + local func = BattleBoardSkillHandle._activeAttackOverSkill[skillEntity:getEliminateSkillType()] + if func then + func(atkUnitComp, skillEntity, battleController) end end diff --git a/lua/app/userdata/battle/skill/battle_board_skill_entity.lua b/lua/app/userdata/battle/skill/battle_board_skill_entity.lua index 915e858f..fb828706 100644 --- a/lua/app/userdata/battle/skill/battle_board_skill_entity.lua +++ b/lua/app/userdata/battle/skill/battle_board_skill_entity.lua @@ -74,6 +74,10 @@ function BattleBoardSkillEntity:getSkillType() return self.config.skill_type end +function BattleBoardSkillEntity:isAttackOverActive() + return GConst.BattleConst.ATTACK_OVER_ACTIVE_SKILL_TYPE[self:getSkillType()] +end + function BattleBoardSkillEntity:getSkillTypeParameter() if not self.config then return diff --git a/lua/app/userdata/battle/skill/battle_skill_entity.lua b/lua/app/userdata/battle/skill/battle_skill_entity.lua index c305830c..05aa89cc 100644 --- a/lua/app/userdata/battle/skill/battle_skill_entity.lua +++ b/lua/app/userdata/battle/skill/battle_skill_entity.lua @@ -130,8 +130,12 @@ function BattleSkillEntity:getIsActiveType() end -- 消除类技能 -function BattleSkillEntity:getIsEliminateType() - return self.skillInfo.skill_type == 3 +function BattleSkillEntity:getEliminateSkillType() + return self.skillInfo.skill_type +end + +function BattleSkillEntity:isAttackOverActive() + return GConst.BattleConst.ATTACK_OVER_ACTIVE_SKILL_TYPE[self:getEliminateSkillType()] end -- 消除类技能参数 From 5fc337e78b7f93ff917324f2b7df8742223eaa26 Mon Sep 17 00:00:00 2001 From: xiekaidong Date: Thu, 11 May 2023 14:31:24 +0800 Subject: [PATCH 16/23] =?UTF-8?q?=E6=94=B9=E5=8F=98=E6=A3=8B=E7=9B=98?= =?UTF-8?q?=E6=89=80=E6=9C=89=E5=85=83=E7=B4=A0=E7=9A=84=E6=8A=80=E8=83=BD?= =?UTF-8?q?=E6=9C=BA=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/app/module/battle/battle_const.lua | 9 +++- .../battle/controller/battle_controller.lua | 26 ++++++---- .../skill/battle_board_skill_handle.lua | 33 ++++++++++++ lua/app/ui/battle/battle_ui.lua | 50 +++++++++++-------- 4 files changed, 85 insertions(+), 33 deletions(-) diff --git a/lua/app/module/battle/battle_const.lua b/lua/app/module/battle/battle_const.lua index f7442878..bf31bf7f 100644 --- a/lua/app/module/battle/battle_const.lua +++ b/lua/app/module/battle/battle_const.lua @@ -682,8 +682,14 @@ BattleConst.SKILL_TYPE = { NORMAL = 0, ELIMINATION = 1, CHANGE_AROUND = 2, - -- 3 暂不处理 + RELEASE_GRID_TYPE = 3, ELIMINATION_GRID_AND_ELEMENT = 4, + CHANGE_ALL_ELEMENT_TYPE = 5, +} + +BattleConst.ATTACK_OVER_ACTIVE_SKILL_TYPE = { + [BattleConst.SKILL_TYPE.RELEASE_GRID_TYPE] = true, + [BattleConst.SKILL_TYPE.CHANGE_ALL_ELEMENT_TYPE] = true, } BattleConst.SKILL_METHOD_TYPE = { @@ -708,6 +714,7 @@ BattleConst.OUTLINE_SFX = { } BattleConst.LINE_SFX = "assets/prefabs/effects/battle/sfx_piece_line_b01.prefab" +BattleConst.CHANGE_ELEMENT_SFX = "assets/prefabs/effects/battle/sfx_skill_b02.prefab" BattleConst.GRID_TYPE_BREAK_SFX = { [BattleConst.GRID_TYPE.SNOW_BOX] = "assets/prefabs/effects/battle/sfx_piece_za_b01.prefab", [BattleConst.GRID_TYPE.SOLID_SNOW] = "assets/prefabs/effects/battle/sfx_piece_za_b01.prefab", diff --git a/lua/app/module/battle/controller/battle_controller.lua b/lua/app/module/battle/controller/battle_controller.lua index 1882ec08..c4361ca9 100644 --- a/lua/app/module/battle/controller/battle_controller.lua +++ b/lua/app/module/battle/controller/battle_controller.lua @@ -1717,22 +1717,26 @@ function BattleController:onSelectSkill(skillId, value, pos) end function BattleController:changeElementType(count, elementType) - local list = {} + local map = {} for _, entity in pairs(self.battleData:getGridEnties()) do if entity:canChangeInfo() and entity:getElementType() ~= elementType then - table.insert(list, entity) + map[entity] = elementType + count = count - 1 + if count <= 0 then + break + end end end - for i = 1, count do - if not list[1] then - break - end - local entity = table.remove(list, math.random(1, #list)) - if entity then - self.battleData:setGridInfo(entity:getPosId(), {gridType = entity:getGridType(), elementType = elementType}) - self.battleUI:playChangeElementSfx(entity:getPosId(), i) - end + self:changeElementTypeByMap(map) +end + +function BattleController:changeElementTypeByMap(changeMap) + local index = 1 + for entity, elementType in pairs(changeMap) do + self.battleData:setGridInfo(entity:getPosId(), {gridType = entity:getGridType(), elementType = elementType}) + self.battleUI:playChangeElementSfx(entity:getPosId(), index) + index = index + 1 end end diff --git a/lua/app/module/battle/skill/battle_board_skill_handle.lua b/lua/app/module/battle/skill/battle_board_skill_handle.lua index 24d59942..bbf823ac 100644 --- a/lua/app/module/battle/skill/battle_board_skill_handle.lua +++ b/lua/app/module/battle/skill/battle_board_skill_handle.lua @@ -74,6 +74,38 @@ local function _takeEliminationGridAndElement(posId, skillEntity, gridEntities, end end +local function _takeChangeAllElementType(atkUnitComp, skillEntity, battleController) + local battleData = battleController.battleData + if not battleData or not battleData:getGridEnties() then + return + end + + local elementMap = {} + for k, v in pairs(BattleConst.ELEMENT_TYPE) do + if v ~= BattleConst.ELEMENT_TYPE.NONE then + elementMap[v] = {list = {}, count = 0} + for k2, v2 in pairs(BattleConst.ELEMENT_TYPE) do + if v2 ~= BattleConst.ELEMENT_TYPE.NONE and v2 ~= v then + table.insert(elementMap[v].list, v2) + elementMap[v].count = elementMap[v].count + 1 + end + end + end + end + + local map = {} + for posId, entity in pairs(battleData:getGridEnties()) do + if entity:isEmptyIdle() then + local eType = entity:getElementType() + if elementMap[eType] and elementMap[eType].count > 0 then + map[entity] = elementMap[eType].list[math.random(1, elementMap[eType].count)] + end + end + end + + battleController:changeElementTypeByMap(map) +end + BattleBoardSkillHandle._activeBoardSkill = { [SKILL_TYPE.ELIMINATION] = _takeElimination, [SKILL_TYPE.CHANGE_AROUND] = _takeChangeAround, @@ -82,6 +114,7 @@ BattleBoardSkillHandle._activeBoardSkill = { BattleBoardSkillHandle._activeAttackOverSkill = { [SKILL_TYPE.RELEASE_GRID_TYPE] = _taleReleaseGridType, + [SKILL_TYPE.CHANGE_ALL_ELEMENT_TYPE] = _takeChangeAllElementType, } function BattleBoardSkillHandle.activeBoardSkill(posId, skillEntity, gridEntities, sequenceEntities, battleController) diff --git a/lua/app/ui/battle/battle_ui.lua b/lua/app/ui/battle/battle_ui.lua index aff5a1fd..da69e49d 100644 --- a/lua/app/ui/battle/battle_ui.lua +++ b/lua/app/ui/battle/battle_ui.lua @@ -1573,14 +1573,6 @@ function BattleUI:initSkillLineSfx() self.skillLightSfxs[25] = uiMap["battle_ui.bg_2.board_node.grid_node.sfx_skill_b05_5"] end - if not self.changeElementSfxs then - self.changeElementSfxs = {} - self.changeElementSfxs[1] = uiMap["battle_ui.bg_2.board_node.grid_node.sfx_skill_b02_1"] - self.changeElementSfxs[2] = uiMap["battle_ui.bg_2.board_node.grid_node.sfx_skill_b02_2"] - self.changeElementSfxs[3] = uiMap["battle_ui.bg_2.board_node.grid_node.sfx_skill_b02_3"] - self.changeElementSfxs[4] = uiMap["battle_ui.bg_2.board_node.grid_node.sfx_skill_b02_4"] - end - for _, obj in pairs(self.skillLineSfxs) do obj:setActive(true) obj:getComponent(GConst.TYPEOF_UNITY_CLASS.BF_EFFECT_HELPER):SetSortingOrder(self:getUIOrder(), GConst.UI_EFFECT_ORDER.LEVEL2) @@ -1592,12 +1584,6 @@ function BattleUI:initSkillLineSfx() obj:getComponent(GConst.TYPEOF_UNITY_CLASS.BF_EFFECT_HELPER):SetSortingOrder(self:getUIOrder(), GConst.UI_EFFECT_ORDER.LEVEL2) obj:setActive(false) end - - for _, obj in pairs(self.changeElementSfxs) do - obj:setActive(true) - obj:getComponent(GConst.TYPEOF_UNITY_CLASS.BF_EFFECT_HELPER):SetSortingOrder(self:getUIOrder(), GConst.UI_EFFECT_ORDER.LEVEL2) - obj:setActive(false) - end end function BattleUI:playSkillLineSfx(posId, boradRangeList, randomPosList) @@ -1666,16 +1652,28 @@ function BattleUI:playSkillLineSfx(posId, boradRangeList, randomPosList) end function BattleUI:playChangeElementSfx(posId, index) - if not self.changeElementSfxs then - return + if not self.root.changeElementSfxs then + self.root.changeElementSfxs = {} end local pos = ModuleManager.BattleManager:getPosInfo(posId) - local obj = self.changeElementSfxs[index] - if obj then - obj:setAnchoredPosition(pos.x, pos.y) - obj:setActive(true) - obj:play() + local info = self.root.changeElementSfxs[index] + if info then + local obj = info.obj + if obj then + obj:setAnchoredPosition(pos.x, pos.y) + obj:setActive(true) + obj:play() + end + else + self.root.changeElementSfxs[index] = { + isLoaded = true + } + EffectManager:loadUIEffectAsync(GConst.BattleConst.CHANGE_ELEMENT_SFX, self, self.gridNode, GConst.UI_EFFECT_ORDER.LEVEL2, function(obj) + self.root.changeElementSfxs[index].obj = obj + obj:setAnchoredPosition(pos.x, pos.y) + obj:play() + end) end end @@ -1718,6 +1716,16 @@ function BattleUI:initUISfxs() end end end + + if self.root.changeElementSfxs then + for index, info in pairs(self.root.changeElementSfxs) do + if info.obj then + info.obj:setActive(true) + info.obj:getComponent(GConst.TYPEOF_UNITY_CLASS.BF_EFFECT_HELPER):SetSortingOrder(self:getUIOrder(), GConst.UI_EFFECT_ORDER.LEVEL2) + info.obj:setActive(false) + end + end + end end function BattleUI:showTutorialFinger(posIdList) From 9d70b5b8b111ef750f71ba7b7f213f77650c65ea Mon Sep 17 00:00:00 2001 From: xiekaidong Date: Thu, 11 May 2023 15:17:42 +0800 Subject: [PATCH 17/23] =?UTF-8?q?=E9=9A=8F=E6=9C=BA=E6=B6=88=E9=99=A4x?= =?UTF-8?q?=E4=B8=AA=E6=8A=80=E8=83=BD=E5=85=83=E7=B4=A0=20=E7=9A=84?= =?UTF-8?q?=E6=8A=80=E8=83=BD=E6=9C=BA=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/app/module/battle/battle_const.lua | 2 + .../battle/controller/battle_controller.lua | 55 ++++++++++--------- .../skill/battle_board_skill_handle.lua | 32 +++++++++++ lua/app/ui/battle/battle_ui.lua | 8 +++ 4 files changed, 72 insertions(+), 25 deletions(-) diff --git a/lua/app/module/battle/battle_const.lua b/lua/app/module/battle/battle_const.lua index bf31bf7f..1f660f5d 100644 --- a/lua/app/module/battle/battle_const.lua +++ b/lua/app/module/battle/battle_const.lua @@ -685,11 +685,13 @@ BattleConst.SKILL_TYPE = { RELEASE_GRID_TYPE = 3, ELIMINATION_GRID_AND_ELEMENT = 4, CHANGE_ALL_ELEMENT_TYPE = 5, + RANDOM_KILL_SKILL_GRID = 6, } BattleConst.ATTACK_OVER_ACTIVE_SKILL_TYPE = { [BattleConst.SKILL_TYPE.RELEASE_GRID_TYPE] = true, [BattleConst.SKILL_TYPE.CHANGE_ALL_ELEMENT_TYPE] = true, + [BattleConst.SKILL_TYPE.RANDOM_KILL_SKILL_GRID] = true, } BattleConst.SKILL_METHOD_TYPE = { diff --git a/lua/app/module/battle/controller/battle_controller.lua b/lua/app/module/battle/controller/battle_controller.lua index c4361ca9..37fb1d38 100644 --- a/lua/app/module/battle/controller/battle_controller.lua +++ b/lua/app/module/battle/controller/battle_controller.lua @@ -441,9 +441,7 @@ end function BattleController:enterEliminationBegin() self.roundStep = BattleConst.BATTLE_ROUND_STEP.ON_BEGIN self:onEliminationBegin() - self:popBoardCacheSkill(function() - self:enterElimination(true) - end) + self:enterRefreshBoard(true) end function BattleController:enterElimination(needDelay) @@ -605,9 +603,9 @@ function BattleController:getIsAtkStep() return self.roundStep == BattleConst.BATTLE_ROUND_STEP.ON_ATK_STEP end -function BattleController:enterRefreshBoard() +function BattleController:enterRefreshBoard(isRoundBeginCheck) self.roundStep = BattleConst.BATTLE_ROUND_STEP.ON_REFRESH_BOARD - self:fillBoard() + self:fillBoard(isRoundBeginCheck) end function BattleController:enterRoundEnd() @@ -1017,7 +1015,7 @@ function BattleController:onLinkOver() self.eliminateTotalCount = self.eliminateTotalCount + 1 end -function BattleController:fillBoard() +function BattleController:fillBoard(isRoundBeginCheck) local pathMap = {} local columnCount = {} local gridMap = {} @@ -1061,29 +1059,23 @@ function BattleController:fillBoard() end self.battleUI:fallGrid(pathMap, function() - self:onFillBoardOver() + self:onFillBoardOver(isRoundBeginCheck) self.battleUI:enableUITouch() end) end -function BattleController:onFillBoardOver() - EventManager:dispatchEvent(EventManager.CUSTOM_EVENT.BOARD_FILL_OVER) - - self:generateSkill(function() - self.battleUI:refreshSkill() - self:enterBattleStep() - -- local defTeam = self.battleData:getDefTeam() - -- if not defTeam or defTeam:getIsDead() then -- 怪物死了， 直接进入刷新逻辑 - -- if self.waveIndex >= self.maxWaveIndex then - -- self:enterRoundEnd() - -- else - -- self:_findNextDefUnit() - -- end - -- return - -- else - -- self:enterRoundEnd() - -- end - end) +function BattleController:onFillBoardOver(isRoundBeginCheck) + if isRoundBeginCheck then + EventManager:dispatchEvent(EventManager.CUSTOM_EVENT.BOARD_FILL_OVER) + self:popBoardCacheSkill(function() + self:enterElimination(true) + end) + else + self:generateSkill(function() + self.battleUI:refreshSkill() + self:enterBattleStep() + end) + end end function BattleController:generateInstructions(skillEntity, elementType, lineCount, influenceElementTypeMap, elementTypeMap) @@ -1740,6 +1732,19 @@ function BattleController:changeElementTypeByMap(changeMap) end end +function BattleController:killGrids(posIdList) + if not posIdList[1] then + return + end + + for _, posId in ipairs(posIdList) do + local entity = DataManager.BattleData:getGridEntity(posId) + entity:setIsIdle(true) + end + + self.battleUI:removeGridOutOfScreen(posIdList) +end + function BattleController:addHeroAttr(attrName, value) if not self.battleData or not self.battleData.atkTeam then return diff --git a/lua/app/module/battle/skill/battle_board_skill_handle.lua b/lua/app/module/battle/skill/battle_board_skill_handle.lua index bbf823ac..c45f9734 100644 --- a/lua/app/module/battle/skill/battle_board_skill_handle.lua +++ b/lua/app/module/battle/skill/battle_board_skill_handle.lua @@ -106,6 +106,37 @@ local function _takeChangeAllElementType(atkUnitComp, skillEntity, battleControl battleController:changeElementTypeByMap(map) end +local function _takeRandomKillSkillGrid(atkUnitComp, skillEntity, battleController) + local battleData = battleController.battleData + if not battleData or not battleData:getGridEnties() or not skillEntity:getEliminateSkillParameter() then + return + end + + local count = skillEntity:getEliminateSkillParameter()[1] + if count <= 0 then + return + end + + local list = {} + local listCount = 0 + for posId, entity in pairs(battleData:getGridEnties()) do + if entity:getSkillId() and not entity:getIsIdle() then + table.insert(list, posId) + listCount = listCount + 1 + end + end + + if listCount > count then + local removeCount = listCount - count + for i = 1, removeCount do + table.remove(list, math.random(1, listCount)) + listCount = listCount - 1 + end + end + + battleController:killGrids(list) +end + BattleBoardSkillHandle._activeBoardSkill = { [SKILL_TYPE.ELIMINATION] = _takeElimination, [SKILL_TYPE.CHANGE_AROUND] = _takeChangeAround, @@ -115,6 +146,7 @@ BattleBoardSkillHandle._activeBoardSkill = { BattleBoardSkillHandle._activeAttackOverSkill = { [SKILL_TYPE.RELEASE_GRID_TYPE] = _taleReleaseGridType, [SKILL_TYPE.CHANGE_ALL_ELEMENT_TYPE] = _takeChangeAllElementType, + [SKILL_TYPE.RANDOM_KILL_SKILL_GRID] = _takeRandomKillSkillGrid, } function BattleBoardSkillHandle.activeBoardSkill(posId, skillEntity, gridEntities, sequenceEntities, battleController) diff --git a/lua/app/ui/battle/battle_ui.lua b/lua/app/ui/battle/battle_ui.lua index da69e49d..99a534ad 100644 --- a/lua/app/ui/battle/battle_ui.lua +++ b/lua/app/ui/battle/battle_ui.lua @@ -1112,6 +1112,14 @@ function BattleUI:shuffleBoard(changeInfo, callback) end) end +function BattleUI:removeGridOutOfScreen(posIdList) + for _, posId in ipairs(posIdList) do + local entity = DataManager.BattleData:getGridEntity(posId) + local cell = entity:getCell() + cell:getBaseObject():setAnchoredPositionX(DEFAULT_X) + end +end + function BattleUI:fallGrid(listInfo, callback) self:showMask(false) self.fallAniCount = 0 From 5f7cca6351661d392743e950a5655fbac8ff9d20 Mon Sep 17 00:00:00 2001 From: xiekaidong Date: Thu, 11 May 2023 15:31:06 +0800 Subject: [PATCH 18/23] =?UTF-8?q?=E6=89=93=E4=B9=B1=E6=A3=8B=E7=9B=98?= =?UTF-8?q?=E7=9A=84=E6=8A=80=E8=83=BD=E6=9C=BA=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/app/module/battle/battle_const.lua | 2 + .../battle/controller/battle_controller.lua | 84 ++++++++++--------- .../skill/battle_board_skill_handle.lua | 10 +++ 3 files changed, 58 insertions(+), 38 deletions(-) diff --git a/lua/app/module/battle/battle_const.lua b/lua/app/module/battle/battle_const.lua index 1f660f5d..f2a3fd8f 100644 --- a/lua/app/module/battle/battle_const.lua +++ b/lua/app/module/battle/battle_const.lua @@ -686,12 +686,14 @@ BattleConst.SKILL_TYPE = { ELIMINATION_GRID_AND_ELEMENT = 4, CHANGE_ALL_ELEMENT_TYPE = 5, RANDOM_KILL_SKILL_GRID = 6, + SHUFFLE_BOARD = 7, } BattleConst.ATTACK_OVER_ACTIVE_SKILL_TYPE = { [BattleConst.SKILL_TYPE.RELEASE_GRID_TYPE] = true, [BattleConst.SKILL_TYPE.CHANGE_ALL_ELEMENT_TYPE] = true, [BattleConst.SKILL_TYPE.RANDOM_KILL_SKILL_GRID] = true, + [BattleConst.SKILL_TYPE.SHUFFLE_BOARD] = true, } BattleConst.SKILL_METHOD_TYPE = { diff --git a/lua/app/module/battle/controller/battle_controller.lua b/lua/app/module/battle/controller/battle_controller.lua index 37fb1d38..c0d490f9 100644 --- a/lua/app/module/battle/controller/battle_controller.lua +++ b/lua/app/module/battle/controller/battle_controller.lua @@ -469,43 +469,9 @@ function BattleController:enterElimination(needDelay) -- 检查棋盘 local find, pathList = self:findAttention() if not find then -- 如果没找到，就要打乱棋盘 - local changeInfo = self:shuffleBoard() - if changeInfo then - self.battleData:setGridEntitiesPosId(changeInfo) - self.battleUI:shuffleBoard(changeInfo, function() - self.roundStep = BattleConst.BATTLE_ROUND_STEP.ON_ELIMINATION - end) - else - local resetList = {} - for posId, entity in pairs(self.battleData:getGridEnties()) do - if entity:isEmptyIdle() then - table.insert(resetList, posId) - end - end - local resetInfo = self:resetGrids(resetList) - if not resetInfo then - if EDITOR_MODE then - Logger.logHighlight("----- 处于无法消除状态 -----") - end - self.roundStep = BattleConst.BATTLE_ROUND_STEP.ON_ELIMINATION - else - if self.resetGridSid then - ModuleManager.BattleManager:unscheduleGlobal(self.resetGridSid) - self.resetGridSid = nil - end - - self.resetGridSid = ModuleManager.BattleManager:performWithDelayGlobal(function() - local count = 1 - for posId, info in pairs(resetInfo) do - self.battleData:setGridInfo(posId, info) - self.battleUI:playChangeElementSfx(posId, count) - count = count + 1 - end - self.resetGridSid = nil - self.roundStep = BattleConst.BATTLE_ROUND_STEP.ON_ELIMINATION - end, 0.5) - end - end + self:shuffleBoard(function() + self.roundStep = BattleConst.BATTLE_ROUND_STEP.ON_ELIMINATION + end) else self.attentionList = pathList -- ModuleManager.BattleManager:performWithDelayGlobal(function() @@ -1797,7 +1763,49 @@ function BattleController:showAttention() end, 2) end -function BattleController:shuffleBoard() +function BattleController:shuffleBoard(callback) + local changeInfo = self:getShuffleBoardInfo() + if changeInfo then + self.battleData:setGridEntitiesPosId(changeInfo) + self.battleUI:shuffleBoard(changeInfo, callback) + else + local resetList = {} + for posId, entity in pairs(self.battleData:getGridEnties()) do + if entity:isEmptyIdle() then + table.insert(resetList, posId) + end + end + local resetInfo = self:resetGrids(resetList) + if not resetInfo then + if EDITOR_MODE then + Logger.logHighlight("----- 处于无法消除状态 -----") + end + if callback then + callback() + end + else + if self.resetGridSid then + ModuleManager.BattleManager:unscheduleGlobal(self.resetGridSid) + self.resetGridSid = nil + end + + self.resetGridSid = ModuleManager.BattleManager:performWithDelayGlobal(function() + local count = 1 + for posId, info in pairs(resetInfo) do + self.battleData:setGridInfo(posId, info) + self.battleUI:playChangeElementSfx(posId, count) + count = count + 1 + end + self.resetGridSid = nil + if callback then + callback() + end + end, 0.5) + end + end +end + +function BattleController:getShuffleBoardInfo() local posList = {} local gridEntityList = {} local anySkillList = {} diff --git a/lua/app/module/battle/skill/battle_board_skill_handle.lua b/lua/app/module/battle/skill/battle_board_skill_handle.lua index c45f9734..4969b4d7 100644 --- a/lua/app/module/battle/skill/battle_board_skill_handle.lua +++ b/lua/app/module/battle/skill/battle_board_skill_handle.lua @@ -137,6 +137,15 @@ local function _takeRandomKillSkillGrid(atkUnitComp, skillEntity, battleControll battleController:killGrids(list) end +local function _takeShuffleBoard(atkUnitComp, skillEntity, battleController) + local battleData = battleController.battleData + if not battleData or not battleData:getGridEnties() then + return + end + + battleController:shuffleBoard() +end + BattleBoardSkillHandle._activeBoardSkill = { [SKILL_TYPE.ELIMINATION] = _takeElimination, [SKILL_TYPE.CHANGE_AROUND] = _takeChangeAround, @@ -147,6 +156,7 @@ BattleBoardSkillHandle._activeAttackOverSkill = { [SKILL_TYPE.RELEASE_GRID_TYPE] = _taleReleaseGridType, [SKILL_TYPE.CHANGE_ALL_ELEMENT_TYPE] = _takeChangeAllElementType, [SKILL_TYPE.RANDOM_KILL_SKILL_GRID] = _takeRandomKillSkillGrid, + [SKILL_TYPE.SHUFFLE_BOARD] = _takeShuffleBoard, } function BattleBoardSkillHandle.activeBoardSkill(posId, skillEntity, gridEntities, sequenceEntities, battleController) From bea9daf0bcadb69aa77113c365a03ab1e6849817 Mon Sep 17 00:00:00 2001 From: xiekaidong Date: Thu, 11 May 2023 16:57:39 +0800 Subject: [PATCH 19/23] =?UTF-8?q?=E9=9A=8F=E6=9C=BA=E6=B6=88=E7=81=ADx?= =?UTF-8?q?=E8=A1=8C=E5=88=97=E7=A9=BA=E9=97=B2=E5=85=83=E7=B4=A0=E6=8A=80?= =?UTF-8?q?=E8=83=BD=E6=9C=BA=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/app/module/battle/battle_const.lua | 2 + .../battle/controller/battle_controller.lua | 16 ++++++ .../skill/battle_board_skill_handle.lua | 56 +++++++++++++++++++ 3 files changed, 74 insertions(+) diff --git a/lua/app/module/battle/battle_const.lua b/lua/app/module/battle/battle_const.lua index f2a3fd8f..44179db1 100644 --- a/lua/app/module/battle/battle_const.lua +++ b/lua/app/module/battle/battle_const.lua @@ -687,6 +687,7 @@ BattleConst.SKILL_TYPE = { CHANGE_ALL_ELEMENT_TYPE = 5, RANDOM_KILL_SKILL_GRID = 6, SHUFFLE_BOARD = 7, + RANDOM_KILL_ROW_OR_COLUMN = 8, } BattleConst.ATTACK_OVER_ACTIVE_SKILL_TYPE = { @@ -694,6 +695,7 @@ BattleConst.ATTACK_OVER_ACTIVE_SKILL_TYPE = { [BattleConst.SKILL_TYPE.CHANGE_ALL_ELEMENT_TYPE] = true, [BattleConst.SKILL_TYPE.RANDOM_KILL_SKILL_GRID] = true, [BattleConst.SKILL_TYPE.SHUFFLE_BOARD] = true, + [BattleConst.SKILL_TYPE.RANDOM_KILL_ROW_OR_COLUMN] = true, } BattleConst.SKILL_METHOD_TYPE = { diff --git a/lua/app/module/battle/controller/battle_controller.lua b/lua/app/module/battle/controller/battle_controller.lua index c0d490f9..9114778d 100644 --- a/lua/app/module/battle/controller/battle_controller.lua +++ b/lua/app/module/battle/controller/battle_controller.lua @@ -1711,6 +1711,22 @@ function BattleController:killGrids(posIdList) self.battleUI:removeGridOutOfScreen(posIdList) end +function BattleController:killRowOrColumn(infoList) + local map = {} + for _, info in ipairs(infoList) do + if info.posList then + for i, posId in ipairs(info.posList) do + if not map[posId] then + map[posId] = true + local entity = DataManager.BattleData:getGridEntity(posId) + entity:setIsIdle(true) + end + end + self.battleUI:removeGridOutOfScreen(info.posList) + end + end +end + function BattleController:addHeroAttr(attrName, value) if not self.battleData or not self.battleData.atkTeam then return diff --git a/lua/app/module/battle/skill/battle_board_skill_handle.lua b/lua/app/module/battle/skill/battle_board_skill_handle.lua index 4969b4d7..f7f03b16 100644 --- a/lua/app/module/battle/skill/battle_board_skill_handle.lua +++ b/lua/app/module/battle/skill/battle_board_skill_handle.lua @@ -146,6 +146,61 @@ local function _takeShuffleBoard(atkUnitComp, skillEntity, battleController) battleController:shuffleBoard() end +local function _takeRandomKillRowOrColumn(atkUnitComp, skillEntity, battleController) + local battleData = battleController.battleData + if not battleData or not battleData:getGridEnties() or not skillEntity:getEliminateSkillParameter() then + return + end + + local count = skillEntity:getEliminateSkillParameter()[1] + if count <= 0 then + return + end + + local listCount = 0 + local list = {} + local rowMap = {} + local columnMap = {} + for posId, entity in pairs(battleData:getGridEnties()) do + if entity:isEmptyIdle() then + local rc = ModuleManager.BattleManager:getPosRC(posId) + local r = rc.r + local c = rc.c + if not rowMap[r] then + table.insert(list, {r = r}) + listCount = listCount + 1 + rowMap[r] = {} + end + if not columnMap[c] then + table.insert(list, {c = c}) + listCount = listCount + 1 + columnMap[c] = {} + end + table.insert(rowMap[r], posId) + table.insert(columnMap[c], posId) + end + end + + local infoList = {} + for i = 1, count do + if not list[1] then + break + end + local info = table.remove(list, math.random(1, listCount)) + listCount = listCount - 1 + if info.r then + info.posList = rowMap[info.r] + elseif info.c then + info.posList = columnMap[info.c] + end + if info.posList then + table.insert(infoList, info) + end + end + + battleController:killRowOrColumn(infoList) +end + BattleBoardSkillHandle._activeBoardSkill = { [SKILL_TYPE.ELIMINATION] = _takeElimination, [SKILL_TYPE.CHANGE_AROUND] = _takeChangeAround, @@ -157,6 +212,7 @@ BattleBoardSkillHandle._activeAttackOverSkill = { [SKILL_TYPE.CHANGE_ALL_ELEMENT_TYPE] = _takeChangeAllElementType, [SKILL_TYPE.RANDOM_KILL_SKILL_GRID] = _takeRandomKillSkillGrid, [SKILL_TYPE.SHUFFLE_BOARD] = _takeShuffleBoard, + [SKILL_TYPE.RANDOM_KILL_ROW_OR_COLUMN] = _takeRandomKillRowOrColumn, } function BattleBoardSkillHandle.activeBoardSkill(posId, skillEntity, gridEntities, sequenceEntities, battleController) From 7a7bde728efcecafaa22be2f76989f70fee94f0b Mon Sep 17 00:00:00 2001 From: xiekaidong Date: Thu, 11 May 2023 17:21:53 +0800 Subject: [PATCH 20/23] =?UTF-8?q?=E6=B6=88=E7=81=AD=E9=9A=8F=E6=9C=BA1?= =?UTF-8?q?=E7=A7=8D=E9=A2=9C=E8=89=B2=E7=9A=84=E6=A3=8B=E5=AD=90=E5=B9=B6?= =?UTF-8?q?=E5=9B=9E=E8=A1=80=E6=8A=80=E8=83=BD=E6=9C=BA=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/app/module/battle/battle_const.lua | 2 + .../skill/battle_board_skill_handle.lua | 38 +++++++++++++++++++ 2 files changed, 40 insertions(+) diff --git a/lua/app/module/battle/battle_const.lua b/lua/app/module/battle/battle_const.lua index 44179db1..43042a31 100644 --- a/lua/app/module/battle/battle_const.lua +++ b/lua/app/module/battle/battle_const.lua @@ -688,6 +688,7 @@ BattleConst.SKILL_TYPE = { RANDOM_KILL_SKILL_GRID = 6, SHUFFLE_BOARD = 7, RANDOM_KILL_ROW_OR_COLUMN = 8, + RANDOM_KILL_ELEMENT_AND_HEAL = 9, } BattleConst.ATTACK_OVER_ACTIVE_SKILL_TYPE = { @@ -696,6 +697,7 @@ BattleConst.ATTACK_OVER_ACTIVE_SKILL_TYPE = { [BattleConst.SKILL_TYPE.RANDOM_KILL_SKILL_GRID] = true, [BattleConst.SKILL_TYPE.SHUFFLE_BOARD] = true, [BattleConst.SKILL_TYPE.RANDOM_KILL_ROW_OR_COLUMN] = true, + [BattleConst.SKILL_TYPE.RANDOM_KILL_ELEMENT_AND_HEAL] = true, } BattleConst.SKILL_METHOD_TYPE = { diff --git a/lua/app/module/battle/skill/battle_board_skill_handle.lua b/lua/app/module/battle/skill/battle_board_skill_handle.lua index f7f03b16..d4f61ced 100644 --- a/lua/app/module/battle/skill/battle_board_skill_handle.lua +++ b/lua/app/module/battle/skill/battle_board_skill_handle.lua @@ -201,6 +201,43 @@ local function _takeRandomKillRowOrColumn(atkUnitComp, skillEntity, battleContro battleController:killRowOrColumn(infoList) end +local function _takeRandomKillElementAndHeal(atkUnitComp, skillEntity, battleController) + local battleData = battleController.battleData + if not battleData or not battleData:getGridEnties() or not skillEntity:getEliminateSkillParameter() then + return + end + + local effectNum = skillEntity:getEliminateSkillParameter()[1] + if not effectNum or effectNum <= 0 then + return + end + + local elementMap = {} + local list = {} + for posId, entity in pairs(battleData:getGridEnties()) do + if entity:isEmptyIdle() then + local elementType = entity:getElementType() + if not elementMap[elementType] then + elementMap[elementType] = {} + table.insert(list, elementType) + end + table.insert(elementMap[elementType], posId) + end + end + + if not list[1] then + return + end + + local elementType = list[math.random(1, #list)] + list = elementMap[elementType] + local count = #list + local heal = count * effectNum * atkUnitComp.unitEntity:getAtk() // GConst.BattleConst.DEFAULT_FACTOR + atkUnitComp:takeDamageOrCure(atkUnitComp, heal, BattleConst.EFFECT_TYPE.HEAL, 0) + + battleController:killGrids(list) +end + BattleBoardSkillHandle._activeBoardSkill = { [SKILL_TYPE.ELIMINATION] = _takeElimination, [SKILL_TYPE.CHANGE_AROUND] = _takeChangeAround, @@ -213,6 +250,7 @@ BattleBoardSkillHandle._activeAttackOverSkill = { [SKILL_TYPE.RANDOM_KILL_SKILL_GRID] = _takeRandomKillSkillGrid, [SKILL_TYPE.SHUFFLE_BOARD] = _takeShuffleBoard, [SKILL_TYPE.RANDOM_KILL_ROW_OR_COLUMN] = _takeRandomKillRowOrColumn, + [SKILL_TYPE.RANDOM_KILL_ELEMENT_AND_HEAL] = _takeRandomKillElementAndHeal, } function BattleBoardSkillHandle.activeBoardSkill(posId, skillEntity, gridEntities, sequenceEntities, battleController) From 11d28008db721cdec94674830f29133f6a74f81e Mon Sep 17 00:00:00 2001 From: xiekaidong Date: Thu, 11 May 2023 19:11:21 +0800 Subject: [PATCH 21/23] =?UTF-8?q?=E6=AD=BB=E4=BA=A1=E5=8F=AC=E5=94=A4buff?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/app/config/act_gift.lua | 840 ++++++- lua/app/config/act_level_fund.lua | 754 ++++++ lua/app/config/act_level_fund.lua.meta | 10 + lua/app/config/act_sevenday_quest.lua | 937 ++++++++ lua/app/config/act_sevenday_quest.lua.meta | 10 + lua/app/config/act_sevenday_quest_reward.lua | 83 + .../config/act_sevenday_quest_reward.lua.meta | 10 + lua/app/config/buff.lua | 298 ++- lua/app/config/chapter.lua | 420 ++++ lua/app/config/const.lua | 47 +- lua/app/config/func_open.lua | 12 +- lua/app/config/item.lua | 23 +- .../localization_global_const.lua | 6 + lua/app/config/player_exp.lua | 2106 +++++++++++++++++ lua/app/config/player_exp.lua.meta | 10 + lua/app/config/strings/cn/global.lua | 6 + lua/app/config/strings/cn/item.lua | 18 +- lua/app/config/strings/cn/task.lua | 282 +++ lua/app/config/strings/cn/task.lua.meta | 10 + lua/app/config/strings/de/item.lua | 17 +- lua/app/config/strings/de/task.lua | 282 +++ lua/app/config/strings/de/task.lua.meta | 10 + lua/app/config/strings/en/global.lua | 3 + lua/app/config/strings/en/item.lua | 17 +- lua/app/config/strings/en/task.lua | 282 +++ lua/app/config/strings/en/task.lua.meta | 10 + lua/app/config/strings/fr/item.lua | 17 +- lua/app/config/strings/fr/task.lua | 282 +++ lua/app/config/strings/fr/task.lua.meta | 10 + lua/app/config/strings/id/item.lua | 17 +- lua/app/config/strings/ja/item.lua | 17 +- lua/app/config/strings/ja/task.lua | 282 +++ lua/app/config/strings/ja/task.lua.meta | 10 + lua/app/config/strings/ko/item.lua | 17 +- lua/app/config/strings/ko/task.lua | 282 +++ lua/app/config/strings/ko/task.lua.meta | 10 + lua/app/config/strings/pt/item.lua | 17 +- lua/app/config/strings/ru/item.lua | 17 +- lua/app/config/strings/th/item.lua | 17 +- lua/app/config/strings/vi/item.lua | 17 +- lua/app/config/strings/zh/item.lua | 17 +- lua/app/config/strings/zh/task.lua | 282 +++ lua/app/config/strings/zh/task.lua.meta | 10 + lua/app/config/task.lua | 270 ++- lua/app/config/task_daily.lua | 16 +- lua/app/module/battle/battle_const.lua | 3 + .../battle/component/battle_unit_comp.lua | 2 + .../battle/controller/battle_controller.lua | 64 +- .../battle/helper/battle_buff_handle.lua | 6 + .../battle/helper/battle_buff_special.lua | 5 + .../module/battle/helper/battle_passive.lua | 5 + .../battle/team/battle_team_entity.lua | 8 + .../battle/team/battle_unit_entity.lua | 8 + 53 files changed, 8002 insertions(+), 209 deletions(-) create mode 100644 lua/app/config/act_level_fund.lua create mode 100644 lua/app/config/act_level_fund.lua.meta create mode 100644 lua/app/config/act_sevenday_quest.lua create mode 100644 lua/app/config/act_sevenday_quest.lua.meta create mode 100644 lua/app/config/act_sevenday_quest_reward.lua create mode 100644 lua/app/config/act_sevenday_quest_reward.lua.meta create mode 100644 lua/app/config/player_exp.lua create mode 100644 lua/app/config/player_exp.lua.meta create mode 100644 lua/app/config/strings/cn/task.lua create mode 100644 lua/app/config/strings/cn/task.lua.meta create mode 100644 lua/app/config/strings/de/task.lua create mode 100644 lua/app/config/strings/de/task.lua.meta create mode 100644 lua/app/config/strings/en/task.lua create mode 100644 lua/app/config/strings/en/task.lua.meta create mode 100644 lua/app/config/strings/fr/task.lua create mode 100644 lua/app/config/strings/fr/task.lua.meta create mode 100644 lua/app/config/strings/ja/task.lua create mode 100644 lua/app/config/strings/ja/task.lua.meta create mode 100644 lua/app/config/strings/ko/task.lua create mode 100644 lua/app/config/strings/ko/task.lua.meta create mode 100644 lua/app/config/strings/zh/task.lua create mode 100644 lua/app/config/strings/zh/task.lua.meta diff --git a/lua/app/config/act_gift.lua b/lua/app/config/act_gift.lua index 9ea84d79..960dd925 100644 --- a/lua/app/config/act_gift.lua +++ b/lua/app/config/act_gift.lua @@ -1,20 +1,850 @@ local act_gift = { - [10002]={ - ["type"]=1, + [70102]={ + ["type"]=7, ["recharge_id"]=11, ["time_type"]=3, ["limit"]=1, ["value"]=3000 }, - [10102]={ - ["type"]=1, + [70202]={ + ["type"]=7, ["recharge_id"]=12, ["time_type"]=3, ["limit"]=1, ["value"]=25 + }, + [20102]={ + ["type"]=2, + ["pay_condition"]={ + 0, + 5 + }, + ["recharge_id"]=4, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=80000, + ["num_for_nothing"]="XghcA2U=" + } + }, + ["time_type"]=1, + ["limit_time"]=1, + ["cd"]=6, + ["limit"]=1, + ["value"]=800 + }, + [20202]={ + ["type"]=2, + ["pay_condition"]={ + 5, + 20 + }, + ["recharge_id"]=5, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=120000, + ["num_for_nothing"]="VwpcA2VR" + } + }, + ["time_type"]=1, + ["limit_time"]=1, + ["cd"]=6, + ["limit"]=1, + ["value"]=800 + }, + [20302]={ + ["type"]=2, + ["pay_condition"]={ + 20, + 9999 + }, + ["recharge_id"]=7, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=180000, + ["num_for_nothing"]="VwBcA2VR" + } + }, + ["time_type"]=1, + ["limit_time"]=1, + ["cd"]=6, + ["limit"]=1, + ["value"]=800 + }, + [50102]={ + ["type"]=5, + ["pay_condition"]={ + 0, + 10 + }, + ["parameter"]=5, + ["recharge_id"]=4, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=20, + ["num_for_nothing"]="VAg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=4, + ["id_for_nothing"]="Ug==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + ["time_type"]=3, + ["limit"]=1, + ["value"]=800 + }, + [50202]={ + ["type"]=5, + ["pay_condition"]={ + 10, + 20 + }, + ["parameter"]=5, + ["recharge_id"]=6, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=40, + ["num_for_nothing"]="Ugg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=4, + ["id_for_nothing"]="Ug==", + ["num"]=2, + ["num_for_nothing"]="VA==" + } + }, + ["time_type"]=3, + ["limit"]=1, + ["value"]=800 + }, + [50302]={ + ["type"]=5, + ["pay_condition"]={ + 20, + 9999 + }, + ["parameter"]=5, + ["recharge_id"]=8, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=60, + ["num_for_nothing"]="UAg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=4, + ["id_for_nothing"]="Ug==", + ["num"]=3, + ["num_for_nothing"]="VQ==" + } + }, + ["time_type"]=3, + ["limit"]=1, + ["value"]=800 + }, + [50402]={ + ["type"]=5, + ["pay_condition"]={ + 0, + 10 + }, + ["parameter"]=10, + ["recharge_id"]=4, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=50, + ["num_for_nothing"]="Uwg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + ["time_type"]=3, + ["limit"]=1, + ["value"]=800 + }, + [50502]={ + ["type"]=5, + ["pay_condition"]={ + 10, + 20 + }, + ["parameter"]=10, + ["recharge_id"]=6, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=60, + ["num_for_nothing"]="UAg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=2, + ["num_for_nothing"]="VA==" + } + }, + ["time_type"]=3, + ["limit"]=1, + ["value"]=800 + }, + [50602]={ + ["type"]=5, + ["pay_condition"]={ + 20, + 30 + }, + ["parameter"]=10, + ["recharge_id"]=8, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=70, + ["num_for_nothing"]="UQg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=3, + ["num_for_nothing"]="VQ==" + } + }, + ["time_type"]=3, + ["limit"]=1, + ["value"]=800 + }, + [50702]={ + ["type"]=5, + ["pay_condition"]={ + 30, + 9999 + }, + ["parameter"]=10, + ["recharge_id"]=9, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=80, + ["num_for_nothing"]="Xgg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=3, + ["num_for_nothing"]="VQ==" + } + }, + ["time_type"]=3, + ["limit"]=1, + ["value"]=800 + }, + [50802]={ + ["type"]=5, + ["pay_condition"]={ + 0, + 10 + }, + ["parameter"]=15, + ["recharge_id"]=4, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=50, + ["num_for_nothing"]="Uwg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + ["time_type"]=3, + ["limit"]=1, + ["value"]=800 + }, + [50902]={ + ["type"]=5, + ["pay_condition"]={ + 10, + 20 + }, + ["parameter"]=15, + ["recharge_id"]=6, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=60, + ["num_for_nothing"]="UAg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=2, + ["num_for_nothing"]="VA==" + } + }, + ["time_type"]=3, + ["limit"]=1, + ["value"]=800 + }, + [51002]={ + ["type"]=5, + ["pay_condition"]={ + 20, + 30 + }, + ["parameter"]=15, + ["recharge_id"]=8, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=70, + ["num_for_nothing"]="UQg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=3, + ["num_for_nothing"]="VQ==" + } + }, + ["time_type"]=3, + ["limit"]=1, + ["value"]=800 + }, + [51102]={ + ["type"]=5, + ["pay_condition"]={ + 30, + 9999 + }, + ["parameter"]=15, + ["recharge_id"]=9, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=80, + ["num_for_nothing"]="Xgg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=3, + ["num_for_nothing"]="VQ==" + } + }, + ["time_type"]=3, + ["limit"]=1, + ["value"]=800 + }, + [51202]={ + ["type"]=5, + ["pay_condition"]={ + 0, + 10 + }, + ["parameter"]=20, + ["recharge_id"]=4, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=55, + ["num_for_nothing"]="Uw0=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + ["time_type"]=3, + ["limit"]=1, + ["value"]=800 + }, + [51302]={ + ["type"]=5, + ["pay_condition"]={ + 10, + 20 + }, + ["parameter"]=20, + ["recharge_id"]=6, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=65, + ["num_for_nothing"]="UA0=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=2, + ["num_for_nothing"]="VA==" + } + }, + ["time_type"]=3, + ["limit"]=1, + ["value"]=800 + }, + [51402]={ + ["type"]=5, + ["pay_condition"]={ + 20, + 30 + }, + ["parameter"]=20, + ["recharge_id"]=8, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=75, + ["num_for_nothing"]="UQ0=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=3, + ["num_for_nothing"]="VQ==" + } + }, + ["time_type"]=3, + ["limit"]=1, + ["value"]=800 + }, + [51502]={ + ["type"]=5, + ["pay_condition"]={ + 30, + 9999 + }, + ["parameter"]=20, + ["recharge_id"]=9, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=85, + ["num_for_nothing"]="Xg0=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=3, + ["num_for_nothing"]="VQ==" + } + }, + ["time_type"]=3, + ["limit"]=1, + ["value"]=800 + }, + [51602]={ + ["type"]=5, + ["pay_condition"]={ + 0, + 10 + }, + ["parameter"]=25, + ["recharge_id"]=4, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=50, + ["num_for_nothing"]="Uwg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + ["time_type"]=3, + ["limit"]=1, + ["value"]=800 + }, + [51702]={ + ["type"]=5, + ["pay_condition"]={ + 10, + 20 + }, + ["parameter"]=25, + ["recharge_id"]=6, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=60, + ["num_for_nothing"]="UAg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=2, + ["num_for_nothing"]="VA==" + } + }, + ["time_type"]=3, + ["limit"]=1, + ["value"]=800 + }, + [51802]={ + ["type"]=5, + ["pay_condition"]={ + 20, + 30 + }, + ["parameter"]=25, + ["recharge_id"]=8, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=70, + ["num_for_nothing"]="UQg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=3, + ["num_for_nothing"]="VQ==" + } + }, + ["time_type"]=3, + ["limit"]=1, + ["value"]=800 + }, + [51902]={ + ["type"]=5, + ["pay_condition"]={ + 30, + 9999 + }, + ["parameter"]=25, + ["recharge_id"]=9, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=80, + ["num_for_nothing"]="Xgg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=3, + ["num_for_nothing"]="VQ==" + } + }, + ["time_type"]=3, + ["limit"]=1, + ["value"]=800 + }, + [52002]={ + ["type"]=5, + ["pay_condition"]={ + 0, + 10 + }, + ["parameter"]=30, + ["recharge_id"]=4, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=50, + ["num_for_nothing"]="Uwg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=2, + ["num_for_nothing"]="VA==" + } + }, + ["time_type"]=3, + ["limit"]=1, + ["value"]=800 + }, + [52102]={ + ["type"]=5, + ["pay_condition"]={ + 10, + 20 + }, + ["parameter"]=30, + ["recharge_id"]=6, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=60, + ["num_for_nothing"]="UAg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=4, + ["num_for_nothing"]="Ug==" + } + }, + ["time_type"]=3, + ["limit"]=1, + ["value"]=800 + }, + [52202]={ + ["type"]=5, + ["pay_condition"]={ + 20, + 30 + }, + ["parameter"]=30, + ["recharge_id"]=8, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=70, + ["num_for_nothing"]="UQg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=5, + ["num_for_nothing"]="Uw==" + } + }, + ["time_type"]=3, + ["limit"]=1, + ["value"]=800 + }, + [52302]={ + ["type"]=5, + ["pay_condition"]={ + 30, + 9999 + }, + ["parameter"]=30, + ["recharge_id"]=9, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=80, + ["num_for_nothing"]="Xgg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=6, + ["num_for_nothing"]="UA==" + } + }, + ["time_type"]=3, + ["limit"]=1, + ["value"]=800 + }, + [40102]={ + ["type"]=4, + ["recharge_id"]=2, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=6, + ["num_for_nothing"]="UA==" + } + } + }, + [10102]={ + ["type"]=1, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=6, + ["num_for_nothing"]="UA==" + } + } + }, + [60102]={ + ["type"]=6, + ["recharge_id"]=13, + ["time_type"]=3, + ["limit"]=1, + ["value"]=25 + }, + [60202]={ + ["type"]=6, + ["recharge_id"]=5, + ["time_type"]=3, + ["limit"]=1, + ["value"]=21 + }, + [60302]={ + ["type"]=6, + ["recharge_id"]=15, + ["time_type"]=3, + ["limit"]=1, + ["value"]=25 + }, + [60402]={ + ["type"]=6, + ["recharge_id"]=10, + ["time_type"]=3, + ["limit"]=1, + ["value"]=21 } } local config = { -data=act_gift,count=2 +data=act_gift,count=34 } return config \ No newline at end of file diff --git a/lua/app/config/act_level_fund.lua b/lua/app/config/act_level_fund.lua new file mode 100644 index 00000000..06d69e22 --- /dev/null +++ b/lua/app/config/act_level_fund.lua @@ -0,0 +1,754 @@ +local act_level_fund = { + [1]={ + ["stage"]=1, + ["level"]=5, + ["reward_free"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + } + }, + ["reward_small"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + } + }, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1500, + ["num_for_nothing"]="Vw1cAw==" + } + } + }, + [2]={ + ["stage"]=1, + ["level"]=7, + ["reward_free"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=5000, + ["num_for_nothing"]="UwhcAw==" + } + }, + ["reward_small"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + } + }, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1500, + ["num_for_nothing"]="Vw1cAw==" + } + } + }, + [3]={ + ["stage"]=1, + ["level"]=10, + ["reward_free"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + } + }, + ["reward_small"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + } + }, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=2000, + ["num_for_nothing"]="VAhcAw==" + } + } + }, + [4]={ + ["stage"]=1, + ["level"]=13, + ["reward_free"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=5000, + ["num_for_nothing"]="UwhcAw==" + } + }, + ["reward_small"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + } + }, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=2000, + ["num_for_nothing"]="VAhcAw==" + } + } + }, + [5]={ + ["stage"]=1, + ["level"]=15, + ["reward_free"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + } + }, + ["reward_small"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + } + }, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=2500, + ["num_for_nothing"]="VA1cAw==" + } + } + }, + [6]={ + ["stage"]=1, + ["level"]=20, + ["reward_free"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=10000, + ["num_for_nothing"]="VwhcA2U=" + } + }, + ["reward_small"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + } + }, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=2500, + ["num_for_nothing"]="VA1cAw==" + } + } + }, + [7]={ + ["stage"]=1, + ["level"]=25, + ["reward_free"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=150, + ["num_for_nothing"]="Vw1c" + } + }, + ["reward_small"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1000, + ["num_for_nothing"]="VwhcAw==" + } + }, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=3000, + ["num_for_nothing"]="VQhcAw==" + } + } + }, + [8]={ + ["stage"]=1, + ["level"]=30, + ["reward_free"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=10000, + ["num_for_nothing"]="VwhcA2U=" + } + }, + ["reward_small"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1000, + ["num_for_nothing"]="VwhcAw==" + } + }, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=3500, + ["num_for_nothing"]="VQ1cAw==" + } + } + }, + [9]={ + ["stage"]=1, + ["level"]=35, + ["reward_free"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=150, + ["num_for_nothing"]="Vw1c" + } + }, + ["reward_small"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1000, + ["num_for_nothing"]="VwhcAw==" + } + }, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=6000, + ["num_for_nothing"]="UAhcAw==" + } + } + }, + [10]={ + ["stage"]=1, + ["level"]=40, + ["reward_free"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=20000, + ["num_for_nothing"]="VAhcA2U=" + } + }, + ["reward_small"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1000, + ["num_for_nothing"]="VwhcAw==" + } + }, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=8000, + ["num_for_nothing"]="XghcAw==" + } + } + }, + [11]={ + ["stage"]=1, + ["level"]=45, + ["reward_free"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + } + }, + ["reward_small"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1500, + ["num_for_nothing"]="Vw1cAw==" + } + }, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10000, + ["num_for_nothing"]="VwhcA2U=" + } + } + }, + [101]={ + ["stage"]=2, + ["level"]=45, + ["reward_free"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + } + }, + ["reward_small"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1000, + ["num_for_nothing"]="VwhcAw==" + } + }, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=3000, + ["num_for_nothing"]="VQhcAw==" + } + } + }, + [102]={ + ["stage"]=2, + ["level"]=48, + ["reward_free"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=5000, + ["num_for_nothing"]="UwhcAw==" + } + }, + ["reward_small"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1000, + ["num_for_nothing"]="VwhcAw==" + } + }, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=3000, + ["num_for_nothing"]="VQhcAw==" + } + } + }, + [103]={ + ["stage"]=2, + ["level"]=50, + ["reward_free"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + } + }, + ["reward_small"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1000, + ["num_for_nothing"]="VwhcAw==" + } + }, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=4000, + ["num_for_nothing"]="UghcAw==" + } + } + }, + [104]={ + ["stage"]=2, + ["level"]=52, + ["reward_free"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=5000, + ["num_for_nothing"]="UwhcAw==" + } + }, + ["reward_small"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1500, + ["num_for_nothing"]="Vw1cAw==" + } + }, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=4000, + ["num_for_nothing"]="UghcAw==" + } + } + }, + [105]={ + ["stage"]=2, + ["level"]=54, + ["reward_free"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + } + }, + ["reward_small"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1500, + ["num_for_nothing"]="Vw1cAw==" + } + }, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=5000, + ["num_for_nothing"]="UwhcAw==" + } + } + }, + [106]={ + ["stage"]=2, + ["level"]=56, + ["reward_free"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=10000, + ["num_for_nothing"]="VwhcA2U=" + } + }, + ["reward_small"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1500, + ["num_for_nothing"]="Vw1cAw==" + } + }, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=5000, + ["num_for_nothing"]="UwhcAw==" + } + } + }, + [107]={ + ["stage"]=2, + ["level"]=58, + ["reward_free"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=150, + ["num_for_nothing"]="Vw1c" + } + }, + ["reward_small"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=2000, + ["num_for_nothing"]="VAhcAw==" + } + }, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=6000, + ["num_for_nothing"]="UAhcAw==" + } + } + }, + [108]={ + ["stage"]=2, + ["level"]=60, + ["reward_free"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=10000, + ["num_for_nothing"]="VwhcA2U=" + } + }, + ["reward_small"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=2000, + ["num_for_nothing"]="VAhcAw==" + } + }, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=6000, + ["num_for_nothing"]="UAhcAw==" + } + } + }, + [109]={ + ["stage"]=2, + ["level"]=62, + ["reward_free"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=150, + ["num_for_nothing"]="Vw1c" + } + }, + ["reward_small"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=2000, + ["num_for_nothing"]="VAhcAw==" + } + }, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=8000, + ["num_for_nothing"]="XghcAw==" + } + } + }, + [110]={ + ["stage"]=2, + ["level"]=64, + ["reward_free"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=20000, + ["num_for_nothing"]="VAhcA2U=" + } + }, + ["reward_small"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=2500, + ["num_for_nothing"]="VA1cAw==" + } + }, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10000, + ["num_for_nothing"]="VwhcA2U=" + } + } + }, + [111]={ + ["stage"]=2, + ["level"]=66, + ["reward_free"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + } + }, + ["reward_small"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=3000, + ["num_for_nothing"]="VQhcAw==" + } + }, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=12000, + ["num_for_nothing"]="VwpcA2U=" + } + } + } +} +local config = { +data=act_level_fund,count=22 +} +return config \ No newline at end of file diff --git a/lua/app/config/act_level_fund.lua.meta b/lua/app/config/act_level_fund.lua.meta new file mode 100644 index 00000000..fdf7c206 --- /dev/null +++ b/lua/app/config/act_level_fund.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 3a0a8659f7e6f7948b80b5e939bea1de +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/config/act_sevenday_quest.lua b/lua/app/config/act_sevenday_quest.lua new file mode 100644 index 00000000..28b66881 --- /dev/null +++ b/lua/app/config/act_sevenday_quest.lua @@ -0,0 +1,937 @@ +local act_sevenday_quest = { + [1]={ + ["day"]=1, + ["number"]=1, + ["type"]=22, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + } + }, + [2]={ + ["day"]=1, + ["number"]=1, + ["type"]=24, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + } + }, + [3]={ + ["day"]=1, + ["number"]=1, + ["type"]=28, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + ["count_type"]=1 + }, + [4]={ + ["day"]=1, + ["number"]=3, + ["type"]=25, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + } + }, + [5]={ + ["day"]=1, + ["number"]=5, + ["type"]=27, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + } + }, + [6]={ + ["day"]=1, + ["number"]=3, + ["type"]=23, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + } + }, + [7]={ + ["day"]=1, + ["number"]=30, + ["type"]=26, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + ["count_type"]=1 + }, + [8]={ + ["day"]=1, + ["number"]=50, + ["type"]=3, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + } + }, + [9]={ + ["day"]=1, + ["number"]=1000, + ["type"]=2, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + } + }, + [10]={ + ["day"]=1, + ["number"]=5, + ["type"]=1, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + ["count_type"]=1 + }, + [11]={ + ["day"]=2, + ["number"]=1, + ["type"]=22, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + } + }, + [12]={ + ["day"]=2, + ["number"]=1, + ["type"]=24, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + } + }, + [13]={ + ["day"]=2, + ["number"]=1, + ["type"]=28, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + ["count_type"]=1 + }, + [14]={ + ["day"]=2, + ["number"]=3, + ["type"]=25, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + } + }, + [15]={ + ["day"]=2, + ["number"]=5, + ["type"]=27, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + } + }, + [16]={ + ["day"]=2, + ["number"]=3, + ["type"]=23, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + } + }, + [17]={ + ["day"]=2, + ["number"]=30, + ["type"]=26, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + ["count_type"]=1 + }, + [18]={ + ["day"]=2, + ["number"]=50, + ["type"]=3, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + } + }, + [19]={ + ["day"]=2, + ["number"]=1000, + ["type"]=2, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + } + }, + [20]={ + ["day"]=2, + ["number"]=5, + ["type"]=1, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + ["count_type"]=1 + }, + [21]={ + ["day"]=3, + ["number"]=1, + ["type"]=22, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + } + }, + [22]={ + ["day"]=3, + ["number"]=1, + ["type"]=24, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + } + }, + [23]={ + ["day"]=3, + ["number"]=1, + ["type"]=28, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + ["count_type"]=1 + }, + [24]={ + ["day"]=3, + ["number"]=3, + ["type"]=25, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + } + }, + [25]={ + ["day"]=3, + ["number"]=5, + ["type"]=27, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + } + }, + [26]={ + ["day"]=3, + ["number"]=3, + ["type"]=23, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + } + }, + [27]={ + ["day"]=3, + ["number"]=30, + ["type"]=26, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + ["count_type"]=1 + }, + [28]={ + ["day"]=3, + ["number"]=50, + ["type"]=3, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + } + }, + [29]={ + ["day"]=3, + ["number"]=1000, + ["type"]=2, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + } + }, + [30]={ + ["day"]=3, + ["number"]=5, + ["type"]=1, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + ["count_type"]=1 + }, + [31]={ + ["day"]=4, + ["number"]=1, + ["type"]=22, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + } + }, + [32]={ + ["day"]=4, + ["number"]=1, + ["type"]=24, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + } + }, + [33]={ + ["day"]=4, + ["number"]=1, + ["type"]=28, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + ["count_type"]=1 + }, + [34]={ + ["day"]=4, + ["number"]=3, + ["type"]=25, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + } + }, + [35]={ + ["day"]=4, + ["number"]=5, + ["type"]=27, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + } + }, + [36]={ + ["day"]=4, + ["number"]=3, + ["type"]=23, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + } + }, + [37]={ + ["day"]=4, + ["number"]=30, + ["type"]=26, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + ["count_type"]=1 + }, + [38]={ + ["day"]=4, + ["number"]=50, + ["type"]=3, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + } + }, + [39]={ + ["day"]=4, + ["number"]=1000, + ["type"]=2, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + } + }, + [40]={ + ["day"]=4, + ["number"]=5, + ["type"]=1, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + ["count_type"]=1 + }, + [41]={ + ["day"]=5, + ["number"]=1, + ["type"]=22, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + } + }, + [42]={ + ["day"]=5, + ["number"]=1, + ["type"]=24, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + } + }, + [43]={ + ["day"]=5, + ["number"]=1, + ["type"]=28, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + ["count_type"]=1 + }, + [44]={ + ["day"]=5, + ["number"]=3, + ["type"]=25, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + } + }, + [45]={ + ["day"]=5, + ["number"]=5, + ["type"]=27, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + } + }, + [46]={ + ["day"]=5, + ["number"]=3, + ["type"]=23, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + } + }, + [47]={ + ["day"]=5, + ["number"]=30, + ["type"]=26, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + ["count_type"]=1 + }, + [48]={ + ["day"]=5, + ["number"]=50, + ["type"]=3, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + } + }, + [49]={ + ["day"]=5, + ["number"]=1000, + ["type"]=2, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + } + }, + [50]={ + ["day"]=5, + ["number"]=5, + ["type"]=1, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + ["count_type"]=1 + }, + [51]={ + ["day"]=6, + ["number"]=1, + ["type"]=22, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + } + }, + [52]={ + ["day"]=6, + ["number"]=1, + ["type"]=24, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + } + }, + [53]={ + ["day"]=6, + ["number"]=1, + ["type"]=28, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + ["count_type"]=1 + }, + [54]={ + ["day"]=6, + ["number"]=3, + ["type"]=25, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + } + }, + [55]={ + ["day"]=6, + ["number"]=5, + ["type"]=27, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + } + }, + [56]={ + ["day"]=6, + ["number"]=3, + ["type"]=23, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + } + }, + [57]={ + ["day"]=6, + ["number"]=30, + ["type"]=26, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + ["count_type"]=1 + }, + [58]={ + ["day"]=6, + ["number"]=50, + ["type"]=3, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + } + }, + [59]={ + ["day"]=6, + ["number"]=1000, + ["type"]=2, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + } + }, + [60]={ + ["day"]=6, + ["number"]=5, + ["type"]=1, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + ["count_type"]=1 + }, + [61]={ + ["day"]=7, + ["number"]=1, + ["type"]=22, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + } + }, + [62]={ + ["day"]=7, + ["number"]=1, + ["type"]=24, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + } + }, + [63]={ + ["day"]=7, + ["number"]=1, + ["type"]=28, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + ["count_type"]=1 + }, + [64]={ + ["day"]=7, + ["number"]=3, + ["type"]=25, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + } + }, + [65]={ + ["day"]=7, + ["number"]=5, + ["type"]=27, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + } + }, + [66]={ + ["day"]=7, + ["number"]=3, + ["type"]=23, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + } + }, + [67]={ + ["day"]=7, + ["number"]=30, + ["type"]=26, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + ["count_type"]=1 + }, + [68]={ + ["day"]=7, + ["number"]=50, + ["type"]=3, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + } + }, + [69]={ + ["day"]=7, + ["number"]=1000, + ["type"]=2, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + } + }, + [70]={ + ["day"]=7, + ["number"]=5, + ["type"]=1, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + ["count_type"]=1 + } +} +local config = { +data=act_sevenday_quest,count=70 +} +return config \ No newline at end of file diff --git a/lua/app/config/act_sevenday_quest.lua.meta b/lua/app/config/act_sevenday_quest.lua.meta new file mode 100644 index 00000000..5590af84 --- /dev/null +++ b/lua/app/config/act_sevenday_quest.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 77f4e766031f9c1439ca129341fb3a41 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/config/act_sevenday_quest_reward.lua b/lua/app/config/act_sevenday_quest_reward.lua new file mode 100644 index 00000000..35b0515a --- /dev/null +++ b/lua/app/config/act_sevenday_quest_reward.lua @@ -0,0 +1,83 @@ +local act_sevenday_quest_reward = { + [1]={ + ["num"]=10, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1000, + ["num_for_nothing"]="VwhcAw==" + } + }, + [2]={ + ["num"]=20, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [3]={ + ["num"]=30, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=3000, + ["num_for_nothing"]="VQhcAw==" + } + }, + [4]={ + ["num"]=40, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=2, + ["num_for_nothing"]="VA==" + } + }, + [5]={ + ["num"]=50, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=5000, + ["num_for_nothing"]="UwhcAw==" + } + }, + [6]={ + ["num"]=60, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=6, + ["id_for_nothing"]="UA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [7]={ + ["num"]=70, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=6, + ["id_for_nothing"]="UA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + } +} +local config = { +data=act_sevenday_quest_reward,count=7 +} +return config \ No newline at end of file diff --git a/lua/app/config/act_sevenday_quest_reward.lua.meta b/lua/app/config/act_sevenday_quest_reward.lua.meta new file mode 100644 index 00000000..75590633 --- /dev/null +++ b/lua/app/config/act_sevenday_quest_reward.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: dddcc322d60209544bf40bb227cb1bcf +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/config/buff.lua b/lua/app/config/buff.lua index ec69687d..d34024ef 100644 --- a/lua/app/config/buff.lua +++ b/lua/app/config/buff.lua @@ -2,36 +2,42 @@ local buff = { [1]={ ["name"]="hurt", ["buff_type"]=3, + ["decr"]=3, ["formula"]=1 }, [2]={ ["name"]="hurt_red", ["buff_type"]=3, ["position"]=1, + ["decr"]=3, ["formula"]=1 }, [3]={ ["name"]="hurt_yellow", ["buff_type"]=3, ["position"]=2, + ["decr"]=3, ["formula"]=1 }, [4]={ ["name"]="hurt_green", ["buff_type"]=3, ["position"]=3, + ["decr"]=3, ["formula"]=1 }, [5]={ ["name"]="hurt_blue", ["buff_type"]=3, ["position"]=4, + ["decr"]=3, ["formula"]=1 }, [6]={ ["name"]="hurt_purple", ["buff_type"]=3, ["position"]=5, + ["decr"]=3, ["formula"]=1 }, [7]={ @@ -39,6 +45,7 @@ local buff = { ["buff_type"]=1, ["stack"]=2, ["position"]=1, + ["decr"]=1, ["icon"]="dec_dmg_red_add" }, [8]={ @@ -46,6 +53,7 @@ local buff = { ["buff_type"]=1, ["stack"]=2, ["position"]=2, + ["decr"]=1, ["icon"]="dec_dmg_yellow_add" }, [9]={ @@ -53,6 +61,7 @@ local buff = { ["buff_type"]=1, ["stack"]=2, ["position"]=3, + ["decr"]=1, ["icon"]="dec_dmg_green_add" }, [10]={ @@ -60,6 +69,7 @@ local buff = { ["buff_type"]=1, ["stack"]=2, ["position"]=4, + ["decr"]=1, ["icon"]="dec_dmg_blue_add" }, [11]={ @@ -67,12 +77,14 @@ local buff = { ["buff_type"]=1, ["stack"]=2, ["position"]=5, + ["decr"]=1, ["icon"]="dec_dmg_purple_add" }, [12]={ ["name"]="dec_dmg_all_add", ["buff_type"]=1, ["stack"]=2, + ["decr"]=1, ["icon"]="dec_dmg_all_add" }, [13]={ @@ -80,6 +92,7 @@ local buff = { ["buff_type"]=1, ["stack"]=2, ["position"]=1, + ["decr"]=2, ["icon"]="weakness_red_add" }, [14]={ @@ -87,6 +100,7 @@ local buff = { ["buff_type"]=1, ["stack"]=2, ["position"]=2, + ["decr"]=2, ["icon"]="weakness_yellow_add" }, [15]={ @@ -94,6 +108,7 @@ local buff = { ["buff_type"]=1, ["stack"]=2, ["position"]=3, + ["decr"]=2, ["icon"]="weakness_green_add" }, [16]={ @@ -101,6 +116,7 @@ local buff = { ["buff_type"]=1, ["stack"]=2, ["position"]=4, + ["decr"]=2, ["icon"]="weakness_blue_add" }, [17]={ @@ -108,94 +124,110 @@ local buff = { ["buff_type"]=1, ["stack"]=2, ["position"]=5, + ["decr"]=2, ["icon"]="weakness_purple_add" }, [18]={ ["name"]="weakness_all_add", ["buff_type"]=1, ["stack"]=2, + ["decr"]=2, ["icon"]="weakness_all_add" }, [19]={ ["name"]="dmg_addition_red_add", ["buff_type"]=1, ["stack"]=2, - ["position"]=1 + ["position"]=1, + ["decr"]=1 }, [20]={ ["name"]="dmg_addition_yellow_add", ["buff_type"]=1, ["stack"]=2, - ["position"]=2 + ["position"]=2, + ["decr"]=1 }, [21]={ ["name"]="dmg_addition_green_add", ["buff_type"]=1, ["stack"]=2, - ["position"]=3 + ["position"]=3, + ["decr"]=1 }, [22]={ ["name"]="dmg_addition_blue_add", ["buff_type"]=1, ["stack"]=2, - ["position"]=4 + ["position"]=4, + ["decr"]=1 }, [23]={ ["name"]="dmg_addition_purple_add", ["buff_type"]=1, ["stack"]=2, - ["position"]=5 + ["position"]=5, + ["decr"]=1 }, [24]={ ["name"]="dmg_addition_all_add", ["buff_type"]=1, - ["stack"]=2 + ["stack"]=2, + ["decr"]=1 }, [25]={ ["name"]="atkp_color_add", ["buff_type"]=1, - ["stack"]=2 + ["stack"]=2, + ["decr"]=1 }, [26]={ ["name"]="atkp_red_add", ["buff_type"]=1, ["stack"]=2, - ["position"]=1 + ["position"]=1, + ["decr"]=1 }, [27]={ ["name"]="atkp_yellow_add", ["buff_type"]=1, ["stack"]=2, - ["position"]=2 + ["position"]=2, + ["decr"]=1 }, [28]={ ["name"]="atkp_green_add", ["buff_type"]=1, ["stack"]=2, - ["position"]=3 + ["position"]=3, + ["decr"]=1 }, [29]={ ["name"]="atkp_blue_add", ["buff_type"]=1, ["stack"]=2, - ["position"]=4 + ["position"]=4, + ["decr"]=1 }, [30]={ ["name"]="atkp_purple_add", ["buff_type"]=1, ["stack"]=2, - ["position"]=5 + ["position"]=5, + ["decr"]=1 }, [31]={ ["name"]="wavehealp", ["buff_type"]=5, ["stack"]=2, + ["decr"]=1, ["formula"]=2 }, [32]={ ["name"]="heal", ["buff_type"]=5, ["stack"]=2, + ["decr"]=1, ["formula"]=3, ["fx_get"]={ 300025 @@ -205,7 +237,9 @@ local buff = { ["name"]="stun", ["buff_type"]=8, ["stack"]=2, + ["decr"]=2, ["icon"]="stun", + ["control_priority"]=2, ["fx_continued"]={ 13 } @@ -213,6 +247,7 @@ local buff = { [34]={ ["name"]="shield", ["buff_type"]=2, + ["decr"]=3, ["icon"]="shield", ["fx_continued"]={ 11 @@ -224,12 +259,14 @@ local buff = { [35]={ ["name"]="atkp_add", ["buff_type"]=1, - ["stack"]=2 + ["stack"]=2, + ["decr"]=1 }, [36]={ ["name"]="normal_attack_dec", ["buff_type"]=1, ["stack"]=2, + ["decr"]=2, ["icon"]="normal_attack_dec", ["fx_continued"]={ 12 @@ -238,51 +275,67 @@ local buff = { [37]={ ["name"]="normal_attack_add", ["buff_type"]=1, - ["stack"]=2 + ["stack"]=2, + ["decr"]=1 }, [38]={ ["name"]="block", ["buff_type"]=1, - ["stack"]=2 + ["stack"]=2, + ["decr"]=1 }, [39]={ ["name"]="hpp_add", ["buff_type"]=1, - ["stack"]=2 + ["stack"]=2, + ["decr"]=1 }, [40]={ ["name"]="crit_add", ["buff_type"]=1, - ["stack"]=2 + ["stack"]=2, + ["decr"]=1 }, [41]={ ["name"]="crit_time_add", ["buff_type"]=1, - ["stack"]=2 + ["stack"]=2, + ["decr"]=1 }, [42]={ ["name"]="exp_time_add", ["buff_type"]=7, - ["stack"]=2 + ["stack"]=2, + ["decr"]=1 }, [43]={ ["name"]="cured_add", ["buff_type"]=1, - ["stack"]=2 + ["stack"]=2, + ["decr"]=1 }, [44]={ - ["name"]="add_skill", - ["buff_type"]=7, - ["stack"]=2 + ["name"]="cured_dec", + ["buff_type"]=1, + ["stack"]=2, + ["decr"]=2 }, [45]={ - ["name"]="skill_fire_times", + ["name"]="add_skill", ["buff_type"]=7, - ["stack"]=2 + ["stack"]=2, + ["decr"]=3 }, [46]={ + ["name"]="skill_fire_times", + ["buff_type"]=7, + ["stack"]=2, + ["decr"]=3 + }, + [47]={ ["name"]="shield_rebound_200", ["buff_type"]=2, + ["decr"]=3, ["icon"]="shield", ["fx_continued"]={ 11 @@ -291,74 +344,151 @@ local buff = { 14 } }, - [47]={ + [48]={ ["name"]="burn", ["buff_type"]=4, ["stack"]=1, + ["decr"]=2, ["formula"]=4 }, - [48]={ - ["name"]="vulnerable", - ["buff_type"]=1 - }, [49]={ - ["name"]="frozen", - ["buff_type"]=8 + ["name"]="vulnerable", + ["buff_type"]=1, + ["decr"]=2 }, [50]={ - ["name"]="poison", - ["buff_type"]=4, - ["stack"]=2 + ["name"]="frozen", + ["buff_type"]=7, + ["decr"]=2, + ["control_priority"]=1 }, [51]={ - ["name"]="Imprison", - ["buff_type"]=7 + ["name"]="poison", + ["buff_type"]=4, + ["stack"]=2, + ["decr"]=2, + ["formula"]=4 }, [52]={ - ["name"]="corrupt", - ["buff_type"]=1 + ["name"]="imprison", + ["buff_type"]=7, + ["decr"]=2, + ["control_priority"]=4 }, [53]={ - ["name"]="bleed", - ["buff_type"]=7 + ["name"]="corrupt", + ["buff_type"]=1, + ["decr"]=2 }, [54]={ - ["name"]="weaken", - ["buff_type"]=1 + ["name"]="bleed", + ["buff_type"]=7, + ["decr"]=2, + ["formula"]=4 }, [55]={ - ["name"]="lethargy", - ["buff_type"]=8, - ["stack"]=1 + ["name"]="weaken", + ["buff_type"]=1, + ["decr"]=2 }, [56]={ - ["name"]="curse", - ["buff_type"]=7 + ["name"]="lethargy", + ["buff_type"]=8, + ["stack"]=1, + ["decr"]=2, + ["control_priority"]=3 }, [57]={ - ["name"]="lock", - ["buff_type"]=7 + ["name"]="curse", + ["buff_type"]=1, + ["decr"]=2 }, [58]={ - ["name"]="first_hand", - ["buff_type"]=7 + ["name"]="lock", + ["buff_type"]=7, + ["decr"]=2 }, [59]={ - ["name"]="skill_hurt_add", - ["buff_type"]=1 + ["name"]="first_hand", + ["buff_type"]=1, + ["decr"]=1 }, [60]={ - ["name"]="undead", - ["buff_type"]=7 + ["name"]="skill_hurt_add", + ["buff_type"]=1, + ["decr"]=1 }, [61]={ - ["name"]="counterattack", + ["name"]="undead", ["buff_type"]=7, - ["stack"]=1 + ["decr"]=1 }, [62]={ + ["name"]="counterattack", + ["buff_type"]=1, + ["stack"]=1, + ["decr"]=1 + }, + [63]={ ["name"]="thorns", - ["buff_type"]=7 + ["buff_type"]=1, + ["decr"]=1 + }, + [64]={ + ["name"]="dmg_dec_red_add", + ["buff_type"]=1, + ["stack"]=2, + ["position"]=1, + ["decr"]=2 + }, + [65]={ + ["name"]="dmg_dec_yellow_add", + ["buff_type"]=1, + ["stack"]=2, + ["position"]=2, + ["decr"]=2 + }, + [66]={ + ["name"]="dmg_dec_green_add", + ["buff_type"]=1, + ["stack"]=2, + ["position"]=3, + ["decr"]=2 + }, + [67]={ + ["name"]="dmg_dec_blue_add", + ["buff_type"]=1, + ["stack"]=2, + ["position"]=4, + ["decr"]=2 + }, + [68]={ + ["name"]="dmg_dec_purple_add", + ["buff_type"]=1, + ["stack"]=2, + ["position"]=5, + ["decr"]=2 + }, + [69]={ + ["name"]="dmg_dec_all_add", + ["buff_type"]=1, + ["stack"]=2, + ["decr"]=2 + }, + [70]={ + ["name"]="be_sucked", + ["buff_type"]=1, + ["decr"]=2 + }, + [71]={ + ["name"]="be_dmg_to_heal", + ["buff_type"]=1, + ["decr"]=2 + }, + [72]={ + ["name"]="death_summon", + ["buff_type"]=1, + ["decr"]=3 } } local keys = { @@ -406,30 +536,40 @@ local keys = { ["crit_time_add"]=buff[41], ["exp_time_add"]=buff[42], ["cured_add"]=buff[43], - ["add_skill"]=buff[44], - ["skill_fire_times"]=buff[45], - ["shield_rebound_200"]=buff[46], - ["burn"]=buff[47], - ["vulnerable"]=buff[48], - ["frozen"]=buff[49], - ["poison"]=buff[50], - ["Imprison"]=buff[51], - ["corrupt"]=buff[52], - ["bleed"]=buff[53], - ["weaken"]=buff[54], - ["lethargy"]=buff[55], - ["curse"]=buff[56], - ["lock"]=buff[57], - ["first_hand"]=buff[58], - ["skill_hurt_add"]=buff[59], - ["undead"]=buff[60], - ["counterattack"]=buff[61], - ["thorns"]=buff[62] + ["cured_dec"]=buff[44], + ["add_skill"]=buff[45], + ["skill_fire_times"]=buff[46], + ["shield_rebound_200"]=buff[47], + ["burn"]=buff[48], + ["vulnerable"]=buff[49], + ["frozen"]=buff[50], + ["poison"]=buff[51], + ["imprison"]=buff[52], + ["corrupt"]=buff[53], + ["bleed"]=buff[54], + ["weaken"]=buff[55], + ["lethargy"]=buff[56], + ["curse"]=buff[57], + ["lock"]=buff[58], + ["first_hand"]=buff[59], + ["skill_hurt_add"]=buff[60], + ["undead"]=buff[61], + ["counterattack"]=buff[62], + ["thorns"]=buff[63], + ["dmg_dec_red_add"]=buff[64], + ["dmg_dec_yellow_add"]=buff[65], + ["dmg_dec_green_add"]=buff[66], + ["dmg_dec_blue_add"]=buff[67], + ["dmg_dec_purple_add"]=buff[68], + ["dmg_dec_all_add"]=buff[69], + ["be_sucked"]=buff[70], + ["be_dmg_to_heal"]=buff[71], + ["death_summon"]=buff[72] } } local config = { data=buff, keys=keys, -count=62 +count=72 } return config \ No newline at end of file diff --git a/lua/app/config/chapter.lua b/lua/app/config/chapter.lua index 5978fb60..8e8d2262 100644 --- a/lua/app/config/chapter.lua +++ b/lua/app/config/chapter.lua @@ -82,6 +82,48 @@ local chapter = { ["num"]=3, ["num_for_nothing"]="VQ==" } + }, + ["finish_exp"]=1000, + ["challenge_exp"]=500, + ["idle_exp"]=11, + ["idle_gold"]=16, + ["idle_drop"]={ + { + ["type"]=1, + ["id"]=5, + ["num"]=1, + ["weight"]=100 + }, + { + ["type"]=1, + ["id"]=6, + ["num"]=1, + ["weight"]=100 + }, + { + ["type"]=1, + ["id"]=7, + ["num"]=1, + ["weight"]=100 + }, + { + ["type"]=1, + ["id"]=8, + ["num"]=1, + ["weight"]=100 + }, + { + ["type"]=1, + ["id"]=9, + ["num"]=1, + ["weight"]=100 + }, + { + ["type"]=1, + ["id"]=10, + ["num"]=1, + ["weight"]=100 + } } }, [2]={ @@ -203,6 +245,48 @@ local chapter = { ["num"]=500, ["num_for_nothing"]="Uwhc" } + }, + ["finish_exp"]=1100, + ["challenge_exp"]=550, + ["idle_exp"]=12, + ["idle_gold"]=17, + ["idle_drop"]={ + { + ["type"]=1, + ["id"]=5, + ["num"]=1, + ["weight"]=100 + }, + { + ["type"]=1, + ["id"]=6, + ["num"]=1, + ["weight"]=100 + }, + { + ["type"]=1, + ["id"]=7, + ["num"]=1, + ["weight"]=100 + }, + { + ["type"]=1, + ["id"]=8, + ["num"]=1, + ["weight"]=100 + }, + { + ["type"]=1, + ["id"]=9, + ["num"]=1, + ["weight"]=100 + }, + { + ["type"]=1, + ["id"]=10, + ["num"]=1, + ["weight"]=100 + } } }, [3]={ @@ -335,6 +419,48 @@ local chapter = { ["num"]=1000, ["num_for_nothing"]="VwhcAw==" } + }, + ["finish_exp"]=1200, + ["challenge_exp"]=600, + ["idle_exp"]=13, + ["idle_gold"]=18, + ["idle_drop"]={ + { + ["type"]=1, + ["id"]=5, + ["num"]=1, + ["weight"]=100 + }, + { + ["type"]=1, + ["id"]=6, + ["num"]=1, + ["weight"]=100 + }, + { + ["type"]=1, + ["id"]=7, + ["num"]=1, + ["weight"]=100 + }, + { + ["type"]=1, + ["id"]=8, + ["num"]=1, + ["weight"]=100 + }, + { + ["type"]=1, + ["id"]=9, + ["num"]=1, + ["weight"]=100 + }, + { + ["type"]=1, + ["id"]=10, + ["num"]=1, + ["weight"]=100 + } } }, [4]={ @@ -500,6 +626,48 @@ local chapter = { ["num"]=5000, ["num_for_nothing"]="UwhcAw==" } + }, + ["finish_exp"]=1300, + ["challenge_exp"]=650, + ["idle_exp"]=14, + ["idle_gold"]=19, + ["idle_drop"]={ + { + ["type"]=1, + ["id"]=5, + ["num"]=1, + ["weight"]=100 + }, + { + ["type"]=1, + ["id"]=6, + ["num"]=1, + ["weight"]=100 + }, + { + ["type"]=1, + ["id"]=7, + ["num"]=1, + ["weight"]=100 + }, + { + ["type"]=1, + ["id"]=8, + ["num"]=1, + ["weight"]=100 + }, + { + ["type"]=1, + ["id"]=9, + ["num"]=1, + ["weight"]=100 + }, + { + ["type"]=1, + ["id"]=10, + ["num"]=1, + ["weight"]=100 + } } }, [5]={ @@ -665,6 +833,48 @@ local chapter = { ["num"]=20000, ["num_for_nothing"]="VAhcA2U=" } + }, + ["finish_exp"]=1400, + ["challenge_exp"]=700, + ["idle_exp"]=15, + ["idle_gold"]=20, + ["idle_drop"]={ + { + ["type"]=1, + ["id"]=5, + ["num"]=1, + ["weight"]=100 + }, + { + ["type"]=1, + ["id"]=6, + ["num"]=1, + ["weight"]=100 + }, + { + ["type"]=1, + ["id"]=7, + ["num"]=1, + ["weight"]=100 + }, + { + ["type"]=1, + ["id"]=8, + ["num"]=1, + ["weight"]=100 + }, + { + ["type"]=1, + ["id"]=9, + ["num"]=1, + ["weight"]=100 + }, + { + ["type"]=1, + ["id"]=10, + ["num"]=1, + ["weight"]=100 + } } }, [6]={ @@ -830,6 +1040,48 @@ local chapter = { ["num"]=25000, ["num_for_nothing"]="VA1cA2U=" } + }, + ["finish_exp"]=1500, + ["challenge_exp"]=750, + ["idle_exp"]=16, + ["idle_gold"]=21, + ["idle_drop"]={ + { + ["type"]=1, + ["id"]=5, + ["num"]=1, + ["weight"]=100 + }, + { + ["type"]=1, + ["id"]=6, + ["num"]=1, + ["weight"]=100 + }, + { + ["type"]=1, + ["id"]=7, + ["num"]=1, + ["weight"]=100 + }, + { + ["type"]=1, + ["id"]=8, + ["num"]=1, + ["weight"]=100 + }, + { + ["type"]=1, + ["id"]=9, + ["num"]=1, + ["weight"]=100 + }, + { + ["type"]=1, + ["id"]=10, + ["num"]=1, + ["weight"]=100 + } } }, [7]={ @@ -1011,6 +1263,48 @@ local chapter = { ["num"]=30000, ["num_for_nothing"]="VQhcA2U=" } + }, + ["finish_exp"]=1600, + ["challenge_exp"]=800, + ["idle_exp"]=17, + ["idle_gold"]=22, + ["idle_drop"]={ + { + ["type"]=1, + ["id"]=5, + ["num"]=1, + ["weight"]=100 + }, + { + ["type"]=1, + ["id"]=6, + ["num"]=1, + ["weight"]=100 + }, + { + ["type"]=1, + ["id"]=7, + ["num"]=1, + ["weight"]=100 + }, + { + ["type"]=1, + ["id"]=8, + ["num"]=1, + ["weight"]=100 + }, + { + ["type"]=1, + ["id"]=9, + ["num"]=1, + ["weight"]=100 + }, + { + ["type"]=1, + ["id"]=10, + ["num"]=1, + ["weight"]=100 + } } }, [8]={ @@ -1192,6 +1486,48 @@ local chapter = { ["num"]=40000, ["num_for_nothing"]="UghcA2U=" } + }, + ["finish_exp"]=1700, + ["challenge_exp"]=850, + ["idle_exp"]=18, + ["idle_gold"]=23, + ["idle_drop"]={ + { + ["type"]=1, + ["id"]=5, + ["num"]=1, + ["weight"]=100 + }, + { + ["type"]=1, + ["id"]=6, + ["num"]=1, + ["weight"]=100 + }, + { + ["type"]=1, + ["id"]=7, + ["num"]=1, + ["weight"]=100 + }, + { + ["type"]=1, + ["id"]=8, + ["num"]=1, + ["weight"]=100 + }, + { + ["type"]=1, + ["id"]=9, + ["num"]=1, + ["weight"]=100 + }, + { + ["type"]=1, + ["id"]=10, + ["num"]=1, + ["weight"]=100 + } } }, [9]={ @@ -1373,6 +1709,48 @@ local chapter = { ["num"]=50000, ["num_for_nothing"]="UwhcA2U=" } + }, + ["finish_exp"]=1800, + ["challenge_exp"]=900, + ["idle_exp"]=19, + ["idle_gold"]=24, + ["idle_drop"]={ + { + ["type"]=1, + ["id"]=5, + ["num"]=1, + ["weight"]=100 + }, + { + ["type"]=1, + ["id"]=6, + ["num"]=1, + ["weight"]=100 + }, + { + ["type"]=1, + ["id"]=7, + ["num"]=1, + ["weight"]=100 + }, + { + ["type"]=1, + ["id"]=8, + ["num"]=1, + ["weight"]=100 + }, + { + ["type"]=1, + ["id"]=9, + ["num"]=1, + ["weight"]=100 + }, + { + ["type"]=1, + ["id"]=10, + ["num"]=1, + ["weight"]=100 + } } }, [10]={ @@ -1553,6 +1931,48 @@ local chapter = { ["num"]=60000, ["num_for_nothing"]="UAhcA2U=" } + }, + ["finish_exp"]=1900, + ["challenge_exp"]=950, + ["idle_exp"]=20, + ["idle_gold"]=25, + ["idle_drop"]={ + { + ["type"]=1, + ["id"]=5, + ["num"]=1, + ["weight"]=100 + }, + { + ["type"]=1, + ["id"]=6, + ["num"]=1, + ["weight"]=100 + }, + { + ["type"]=1, + ["id"]=7, + ["num"]=1, + ["weight"]=100 + }, + { + ["type"]=1, + ["id"]=8, + ["num"]=1, + ["weight"]=100 + }, + { + ["type"]=1, + ["id"]=9, + ["num"]=1, + ["weight"]=100 + }, + { + ["type"]=1, + ["id"]=10, + ["num"]=1, + ["weight"]=100 + } } } } diff --git a/lua/app/config/const.lua b/lua/app/config/const.lua index 631a68bf..a36f8732 100644 --- a/lua/app/config/const.lua +++ b/lua/app/config/const.lua @@ -77,9 +77,54 @@ local const = { }, ["stamina_ad_times"]={ ["value"]=5 + }, + ["bounty_buy_cost"]={ + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=30, + ["num_for_nothing"]="VQg=" + } + }, + ["idle_drop_fast_times_1"]={ + ["value"]=2 + }, + ["idle_drop_fast_times_2"]={ + ["value"]=1 + }, + ["idle_drop_fast_time"]={ + ["value"]=21600 + }, + ["idle_drop_fast_cost"]={ + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=3, + ["id_for_nothing"]="VQ==", + ["num"]=20, + ["num_for_nothing"]="VAg=" + } + }, + ["refresh_skill_cost"]={ + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=20, + ["num_for_nothing"]="VAg=" + } + }, + ["ad_refresh_skill"]={ + ["value"]=2 + }, + ["diamond_refresh_skill"]={ + ["value"]=1 } } local config = { -data=const,count=17 +data=const,count=25 } return config \ No newline at end of file diff --git a/lua/app/config/func_open.lua b/lua/app/config/func_open.lua index dcb0fa2c..8e591850 100644 --- a/lua/app/config/func_open.lua +++ b/lua/app/config/func_open.lua @@ -5,9 +5,19 @@ local func_open = { }, ["task"]={ ["stage"]=2 + }, + ["act_level_gift"]={ + ["level"]=5 + }, + ["idle_drop"]={ + ["stage"]=2 + }, + ["act_sevenday"]={ + ["stage"]=2, + ["pop_ups"]=1 } } local config = { -data=func_open,count=2 +data=func_open,count=5 } return config \ No newline at end of file diff --git a/lua/app/config/item.lua b/lua/app/config/item.lua index d64382f7..e803d150 100644 --- a/lua/app/config/item.lua +++ b/lua/app/config/item.lua @@ -107,16 +107,29 @@ local item = { ["icon"]="7" }, [8]={ - ["type"]=4 + ["type"]=4, + ["qlt"]=1, + ["icon"]="8" }, [9]={ - ["type"]=4 + ["type"]=4, + ["qlt"]=1, + ["icon"]="9" }, [10]={ - ["type"]=4 + ["type"]=4, + ["qlt"]=1, + ["icon"]="10" }, [11]={ - ["type"]=4 + ["type"]=4, + ["qlt"]=1, + ["icon"]="11" + }, + [12]={ + ["type"]=1, + ["qlt"]=5, + ["icon"]="12" }, [12001]={ ["type"]=5, @@ -168,6 +181,6 @@ local item = { } } local config = { -data=item,count=19 +data=item,count=20 } 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 b7c4e7b3..f680e433 100644 --- a/lua/app/config/localization/localization_global_const.lua +++ b/lua/app/config/localization/localization_global_const.lua @@ -69,6 +69,12 @@ local LocalizationGlobalConst = SETTING_DESC_1 = "SETTING_DESC_1", ACCOUNT_ALREADY_BINDED_DESC = "ACCOUNT_ALREADY_BINDED_DESC", LANGUAGE_DESC = "LANGUAGE_DESC", + ACT_SEVENDAY_TITLE = "ACT_SEVENDAY_TITLE", + ACT_SEVENDAY_LEFTTIME = "ACT_SEVENDAY_LEFTTIME", + ACT_SEVENDAY_TASK = "ACT_SEVENDAY_TASK", + ACT_SEVENDAY_DESC = "ACT_SEVENDAY_DESC", + BTN_CLAIM = "BTN_CLAIM", + BTN_DONE = "BTN_DONE", } return LocalizationGlobalConst \ No newline at end of file diff --git a/lua/app/config/player_exp.lua b/lua/app/config/player_exp.lua new file mode 100644 index 00000000..10425f9e --- /dev/null +++ b/lua/app/config/player_exp.lua @@ -0,0 +1,2106 @@ +local player_exp = { + [1]={ + ["need_exp"]=500, + ["level_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + [2]={ + ["need_exp"]=1000, + ["level_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + [3]={ + ["need_exp"]=1900, + ["level_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + [4]={ + ["need_exp"]=3100, + ["level_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + [5]={ + ["need_exp"]=4300, + ["level_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + [6]={ + ["need_exp"]=5500, + ["level_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + [7]={ + ["need_exp"]=6700, + ["level_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + [8]={ + ["need_exp"]=7900, + ["level_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + [9]={ + ["need_exp"]=9100, + ["level_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + [10]={ + ["need_exp"]=10300, + ["level_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + [11]={ + ["need_exp"]=13000, + ["level_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + [12]={ + ["need_exp"]=16000, + ["level_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + [13]={ + ["need_exp"]=20000, + ["level_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + [14]={ + ["need_exp"]=25000, + ["level_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + [15]={ + ["need_exp"]=30000, + ["level_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + [16]={ + ["need_exp"]=35000, + ["level_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + [17]={ + ["need_exp"]=40000, + ["level_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + [18]={ + ["need_exp"]=45000, + ["level_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + [19]={ + ["need_exp"]=50000, + ["level_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + [20]={ + ["need_exp"]=60000, + ["level_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + [21]={ + ["need_exp"]=70000, + ["level_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + [22]={ + ["need_exp"]=80000, + ["level_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + [23]={ + ["need_exp"]=90000, + ["level_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + [24]={ + ["need_exp"]=100000, + ["level_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + [25]={ + ["need_exp"]=110000, + ["level_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + [26]={ + ["need_exp"]=120000, + ["level_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + [27]={ + ["need_exp"]=140000, + ["level_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + [28]={ + ["need_exp"]=160000, + ["level_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + [29]={ + ["need_exp"]=180000, + ["level_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + [30]={ + ["need_exp"]=200000, + ["level_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + [31]={ + ["need_exp"]=220000, + ["level_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + [32]={ + ["need_exp"]=240000, + ["level_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + [33]={ + ["need_exp"]=260000, + ["level_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + [34]={ + ["need_exp"]=280000, + ["level_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + [35]={ + ["need_exp"]=300000, + ["level_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + [36]={ + ["need_exp"]=320000, + ["level_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + [37]={ + ["need_exp"]=340000, + ["level_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + [38]={ + ["need_exp"]=360000, + ["level_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + [39]={ + ["need_exp"]=380000, + ["level_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + [40]={ + ["need_exp"]=400000, + ["level_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + [41]={ + ["need_exp"]=420000, + ["level_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + [42]={ + ["need_exp"]=440000, + ["level_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + [43]={ + ["need_exp"]=460000, + ["level_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + [44]={ + ["need_exp"]=480000, + ["level_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + [45]={ + ["need_exp"]=500000, + ["level_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + [46]={ + ["need_exp"]=520000, + ["level_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + [47]={ + ["need_exp"]=540000, + ["level_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + [48]={ + ["need_exp"]=560000, + ["level_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + [49]={ + ["need_exp"]=580000, + ["level_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + [50]={ + ["need_exp"]=600000, + ["level_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + [51]={ + ["need_exp"]=620000, + ["level_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + [52]={ + ["need_exp"]=640000, + ["level_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + [53]={ + ["need_exp"]=660000, + ["level_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + [54]={ + ["need_exp"]=680000, + ["level_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + [55]={ + ["need_exp"]=700000, + ["level_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + [56]={ + ["need_exp"]=720000, + ["level_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + [57]={ + ["need_exp"]=740000, + ["level_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + [58]={ + ["need_exp"]=760000, + ["level_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + [59]={ + ["need_exp"]=780000, + ["level_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + [60]={ + ["need_exp"]=800000, + ["level_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + [61]={ + ["need_exp"]=820000, + ["level_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + [62]={ + ["need_exp"]=840000, + ["level_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + [63]={ + ["need_exp"]=860000, + ["level_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + [64]={ + ["need_exp"]=880000, + ["level_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + [65]={ + ["need_exp"]=900000, + ["level_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + [66]={ + ["need_exp"]=920000, + ["level_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + [67]={ + ["need_exp"]=940000, + ["level_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + [68]={ + ["need_exp"]=960000, + ["level_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + [69]={ + ["need_exp"]=980000, + ["level_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + [70]={ + ["need_exp"]=1000000, + ["level_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + [71]={ + ["need_exp"]=1040000, + ["level_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + [72]={ + ["need_exp"]=1080000, + ["level_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + [73]={ + ["need_exp"]=1120000, + ["level_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + [74]={ + ["need_exp"]=1160000, + ["level_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + [75]={ + ["need_exp"]=1200000, + ["level_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + [76]={ + ["need_exp"]=1240000, + ["level_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + [77]={ + ["need_exp"]=1280000, + ["level_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + [78]={ + ["need_exp"]=1320000, + ["level_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + [79]={ + ["need_exp"]=1360000, + ["level_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + [80]={ + ["need_exp"]=1400000, + ["level_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + [81]={ + ["need_exp"]=1440000, + ["level_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + [82]={ + ["need_exp"]=1480000, + ["level_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + [83]={ + ["need_exp"]=1520000, + ["level_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + [84]={ + ["need_exp"]=1560000, + ["level_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + [85]={ + ["need_exp"]=1600000, + ["level_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + [86]={ + ["need_exp"]=1640000, + ["level_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + [87]={ + ["need_exp"]=1680000, + ["level_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + [88]={ + ["need_exp"]=1720000, + ["level_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + [89]={ + ["need_exp"]=1760000, + ["level_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + [90]={ + ["need_exp"]=1800000, + ["level_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + [91]={ + ["need_exp"]=1840000, + ["level_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + [92]={ + ["need_exp"]=1880000, + ["level_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + [93]={ + ["need_exp"]=1920000, + ["level_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + [94]={ + ["need_exp"]=1960000, + ["level_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + [95]={ + ["need_exp"]=2000000, + ["level_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + [96]={ + ["need_exp"]=2040000, + ["level_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + [97]={ + ["need_exp"]=2080000, + ["level_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + [98]={ + ["need_exp"]=2120000, + ["level_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + [99]={ + ["need_exp"]=2160000, + ["level_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + [100]={ + ["need_exp"]=2200000, + ["level_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + } +} +local config = { +data=player_exp,count=100 +} +return config \ No newline at end of file diff --git a/lua/app/config/player_exp.lua.meta b/lua/app/config/player_exp.lua.meta new file mode 100644 index 00000000..30653494 --- /dev/null +++ b/lua/app/config/player_exp.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 85f5b906b8e175845a014ee91a965ce5 +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 6a090e33..5c3b2b28 100644 --- a/lua/app/config/strings/cn/global.lua +++ b/lua/app/config/strings/cn/global.lua @@ -69,6 +69,12 @@ local localization_global = ["SETTING_DESC_1"] = "ID:{0}", ["ACCOUNT_ALREADY_BINDED_DESC"] = "已绑定", ["LANGUAGE_DESC"] = "语言", + ["ACT_SEVENDAY_TITLE"] = "开服嘉年华", + ["ACT_SEVENDAY_LEFTTIME"] = "剩余时间：{0}天{1}小时", + ["ACT_SEVENDAY_TASK"] = "任务完成：{0}/{1}", + ["ACT_SEVENDAY_DESC"] = "每日将开启新的任务。", + ["BTN_CLAIM"] = "领取", + ["BTN_DONE"] = "已领取", } return localization_global \ No newline at end of file diff --git a/lua/app/config/strings/cn/item.lua b/lua/app/config/strings/cn/item.lua index 418865cf..2598b70d 100644 --- a/lua/app/config/strings/cn/item.lua +++ b/lua/app/config/strings/cn/item.lua @@ -27,6 +27,22 @@ local item = { ["name"]="通行证积分", ["desc"]="累计积分可提升通行证等级。" }, + [8]={ + ["name"]="木箱（优秀，稀有）" + }, + [9]={ + ["name"]="木箱2（优秀，稀有）" + }, + [10]={ + ["name"]="金箱（优秀，稀有）" + }, + [11]={ + ["name"]="铂金箱（稀有，史诗）" + }, + [12]={ + ["name"]="经验", + ["desc"]="累计达到一定数量可升级。" + }, [12001]={ ["name"]="洛克西英雄碎片", ["desc"]="洛克西英雄碎片,凑齐可解锁或升级。" @@ -61,6 +77,6 @@ local item = { } } local config = { -data=item,count=15 +data=item,count=20 } return config \ No newline at end of file diff --git a/lua/app/config/strings/cn/task.lua b/lua/app/config/strings/cn/task.lua new file mode 100644 index 00000000..c3f36b23 --- /dev/null +++ b/lua/app/config/strings/cn/task.lua @@ -0,0 +1,282 @@ +local task = { + [1]={ + ["desc"]="累计观看广告" + }, + [2]={ + ["desc"]="完成所有日常任务" + }, + [3]={ + ["desc"]="广告时间" + }, + [4]={ + ["desc"]="获得金币" + }, + [5]={ + ["desc"]="获得金币" + }, + [6]={ + ["desc"]="获得金币" + }, + [7]={ + ["desc"]="获得金币" + }, + [8]={ + ["desc"]="获得钻石" + }, + [9]={ + ["desc"]="获得钻石" + }, + [10]={ + ["desc"]="获得钻石" + }, + [11]={ + ["desc"]="获得钻石" + }, + [12]={ + ["desc"]="消耗金币" + }, + [13]={ + ["desc"]="消耗金币" + }, + [14]={ + ["desc"]="消耗金币" + }, + [15]={ + ["desc"]="消耗金币" + }, + [16]={ + ["desc"]="消耗钻石" + }, + [17]={ + ["desc"]="消耗钻石" + }, + [18]={ + ["desc"]="消耗钻石" + }, + [19]={ + ["desc"]="消耗钻石" + }, + [20]={ + ["desc"]="开启商城任意宝箱" + }, + [21]={ + ["desc"]="开启商城任意宝箱" + }, + [22]={ + ["desc"]="开启商城任意宝箱" + }, + [23]={ + ["desc"]="开启商城任意宝箱" + }, + [24]={ + ["desc"]="开启商城史诗宝箱" + }, + [25]={ + ["desc"]="开启商城史诗宝箱" + }, + [26]={ + ["desc"]="开启商城史诗宝箱" + }, + [27]={ + ["desc"]="开启商城史诗宝箱" + }, + [28]={ + ["desc"]="关卡内打开技能神灯" + }, + [29]={ + ["desc"]="关卡内打开技能神灯" + }, + [30]={ + ["desc"]="关卡内打开技能神灯" + }, + [31]={ + ["desc"]="关卡内打开技能神灯" + }, + [32]={ + ["desc"]="在战斗中获胜" + }, + [33]={ + ["desc"]="在战斗中获胜" + }, + [34]={ + ["desc"]="在战斗中获胜" + }, + [35]={ + ["desc"]="在战斗中获胜" + }, + [36]={ + ["desc"]="升级你的英雄" + }, + [37]={ + ["desc"]="升级你的英雄" + }, + [38]={ + ["desc"]="升级你的英雄" + }, + [39]={ + ["desc"]="升级你的英雄" + }, + [40]={ + ["desc"]="获得英雄碎片" + }, + [41]={ + ["desc"]="获得英雄碎片" + }, + [42]={ + ["desc"]="获得英雄碎片" + }, + [43]={ + ["desc"]="获得英雄碎片" + }, + [44]={ + ["desc"]="击杀首领" + }, + [45]={ + ["desc"]="击杀首领" + }, + [46]={ + ["desc"]="击杀首领" + }, + [47]={ + ["desc"]="击杀首领" + }, + [48]={ + ["desc"]="击杀小怪" + }, + [49]={ + ["desc"]="击杀小怪" + }, + [50]={ + ["desc"]="击杀小怪" + }, + [51]={ + ["desc"]="击杀小怪" + }, + [52]={ + ["desc"]="累计消除元素" + }, + [53]={ + ["desc"]="累计消除元素" + }, + [54]={ + ["desc"]="累计消除元素" + }, + [55]={ + ["desc"]="累计消除元素" + }, + [56]={ + ["desc"]="6连消次数" + }, + [57]={ + ["desc"]="6连消次数" + }, + [58]={ + ["desc"]="6连消次数" + }, + [59]={ + ["desc"]="6连消次数" + }, + [60]={ + ["desc"]="8连消次数" + }, + [61]={ + ["desc"]="8连消次数" + }, + [62]={ + ["desc"]="8连消次数" + }, + [63]={ + ["desc"]="8连消次数" + }, + [64]={ + ["desc"]="战斗中超过10连击次数" + }, + [65]={ + ["desc"]="战斗中超过10连击次数" + }, + [66]={ + ["desc"]="战斗中超过10连击次数" + }, + [67]={ + ["desc"]="战斗中超过10连击次数" + }, + [68]={ + ["desc"]="战斗中释放技能次数" + }, + [69]={ + ["desc"]="战斗中释放技能次数" + }, + [70]={ + ["desc"]="战斗中释放技能次数" + }, + [71]={ + ["desc"]="战斗中释放技能次数" + }, + [72]={ + ["desc"]="通过战斗波次" + }, + [73]={ + ["desc"]="通过战斗波次" + }, + [74]={ + ["desc"]="通过战斗波次" + }, + [75]={ + ["desc"]="通过战斗波次" + }, + [76]={ + ["desc"]="获得金币" + }, + [77]={ + ["desc"]="获得钻石" + }, + [78]={ + ["desc"]="消耗钻石" + }, + [79]={ + ["desc"]="开启商城任意宝箱" + }, + [80]={ + ["desc"]="开启商城史诗宝箱" + }, + [81]={ + ["desc"]="关卡内打开技能神灯" + }, + [82]={ + ["desc"]="在战斗中获胜" + }, + [83]={ + ["desc"]="升级你的英雄" + }, + [84]={ + ["desc"]="获得英雄碎片" + }, + [85]={ + ["desc"]="击杀首领" + }, + [86]={ + ["desc"]="击杀小怪" + }, + [87]={ + ["desc"]="累计消除元素" + }, + [88]={ + ["desc"]="6连消次数" + }, + [89]={ + ["desc"]="8连消次数" + }, + [90]={ + ["desc"]="战斗中超过10连击次数" + }, + [91]={ + ["desc"]="战斗中释放技能次数" + }, + [92]={ + ["desc"]="通过战斗波次" + } +} +local config = { +data=task,count=92 +} +return config \ No newline at end of file diff --git a/lua/app/config/strings/cn/task.lua.meta b/lua/app/config/strings/cn/task.lua.meta new file mode 100644 index 00000000..4c4c14c4 --- /dev/null +++ b/lua/app/config/strings/cn/task.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 3087058d22208d243a56270aa7dfd940 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/config/strings/de/item.lua b/lua/app/config/strings/de/item.lua index b0fc1100..286f2314 100644 --- a/lua/app/config/strings/de/item.lua +++ b/lua/app/config/strings/de/item.lua @@ -22,6 +22,21 @@ local item = { }, [7]={ + }, + [8]={ + + }, + [9]={ + + }, + [10]={ + + }, + [11]={ + + }, + [12]={ + }, [12001]={ @@ -49,6 +64,6 @@ local item = { } } local config = { -data=item,count=15 +data=item,count=20 } return config \ No newline at end of file diff --git a/lua/app/config/strings/de/task.lua b/lua/app/config/strings/de/task.lua new file mode 100644 index 00000000..334f1161 --- /dev/null +++ b/lua/app/config/strings/de/task.lua @@ -0,0 +1,282 @@ +local task = { + [1]={ + + }, + [2]={ + + }, + [3]={ + + }, + [4]={ + + }, + [5]={ + + }, + [6]={ + + }, + [7]={ + + }, + [8]={ + + }, + [9]={ + + }, + [10]={ + + }, + [11]={ + + }, + [12]={ + + }, + [13]={ + + }, + [14]={ + + }, + [15]={ + + }, + [16]={ + + }, + [17]={ + + }, + [18]={ + + }, + [19]={ + + }, + [20]={ + + }, + [21]={ + + }, + [22]={ + + }, + [23]={ + + }, + [24]={ + + }, + [25]={ + + }, + [26]={ + + }, + [27]={ + + }, + [28]={ + + }, + [29]={ + + }, + [30]={ + + }, + [31]={ + + }, + [32]={ + + }, + [33]={ + + }, + [34]={ + + }, + [35]={ + + }, + [36]={ + + }, + [37]={ + + }, + [38]={ + + }, + [39]={ + + }, + [40]={ + + }, + [41]={ + + }, + [42]={ + + }, + [43]={ + + }, + [44]={ + + }, + [45]={ + + }, + [46]={ + + }, + [47]={ + + }, + [48]={ + + }, + [49]={ + + }, + [50]={ + + }, + [51]={ + + }, + [52]={ + + }, + [53]={ + + }, + [54]={ + + }, + [55]={ + + }, + [56]={ + + }, + [57]={ + + }, + [58]={ + + }, + [59]={ + + }, + [60]={ + + }, + [61]={ + + }, + [62]={ + + }, + [63]={ + + }, + [64]={ + + }, + [65]={ + + }, + [66]={ + + }, + [67]={ + + }, + [68]={ + + }, + [69]={ + + }, + [70]={ + + }, + [71]={ + + }, + [72]={ + + }, + [73]={ + + }, + [74]={ + + }, + [75]={ + + }, + [76]={ + + }, + [77]={ + + }, + [78]={ + + }, + [79]={ + + }, + [80]={ + + }, + [81]={ + + }, + [82]={ + + }, + [83]={ + + }, + [84]={ + + }, + [85]={ + + }, + [86]={ + + }, + [87]={ + + }, + [88]={ + + }, + [89]={ + + }, + [90]={ + + }, + [91]={ + + }, + [92]={ + + } +} +local config = { +data=task,count=92 +} +return config \ No newline at end of file diff --git a/lua/app/config/strings/de/task.lua.meta b/lua/app/config/strings/de/task.lua.meta new file mode 100644 index 00000000..c29213e3 --- /dev/null +++ b/lua/app/config/strings/de/task.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: bd05fc1d5ec40624a816431545fe0db3 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/config/strings/en/global.lua b/lua/app/config/strings/en/global.lua index e84a8a32..6358f098 100644 --- a/lua/app/config/strings/en/global.lua +++ b/lua/app/config/strings/en/global.lua @@ -56,6 +56,9 @@ local localization_global = ["CLICK_COPY_ACOUNT_DESC"] = "Click to copy your PlayerID", ["APP"] = "Version:", ["CHAPTER_DESC_1"] = "The Best Record: {0}", + ["ACT_SEVENDAY_TITLE"] = "HAPPY SEVENDAY", + ["BTN_CLAIM"] = "CLAIM", + ["BTN_DONE"] = "GOT", } return localization_global \ No newline at end of file diff --git a/lua/app/config/strings/en/item.lua b/lua/app/config/strings/en/item.lua index 2fa10f58..d3fe5455 100644 --- a/lua/app/config/strings/en/item.lua +++ b/lua/app/config/strings/en/item.lua @@ -25,6 +25,21 @@ local item = { }, [7]={ + }, + [8]={ + + }, + [9]={ + + }, + [10]={ + + }, + [11]={ + + }, + [12]={ + }, [12001]={ ["name"]="Roxy Shard", @@ -60,6 +75,6 @@ local item = { } } local config = { -data=item,count=15 +data=item,count=20 } return config \ No newline at end of file diff --git a/lua/app/config/strings/en/task.lua b/lua/app/config/strings/en/task.lua new file mode 100644 index 00000000..334f1161 --- /dev/null +++ b/lua/app/config/strings/en/task.lua @@ -0,0 +1,282 @@ +local task = { + [1]={ + + }, + [2]={ + + }, + [3]={ + + }, + [4]={ + + }, + [5]={ + + }, + [6]={ + + }, + [7]={ + + }, + [8]={ + + }, + [9]={ + + }, + [10]={ + + }, + [11]={ + + }, + [12]={ + + }, + [13]={ + + }, + [14]={ + + }, + [15]={ + + }, + [16]={ + + }, + [17]={ + + }, + [18]={ + + }, + [19]={ + + }, + [20]={ + + }, + [21]={ + + }, + [22]={ + + }, + [23]={ + + }, + [24]={ + + }, + [25]={ + + }, + [26]={ + + }, + [27]={ + + }, + [28]={ + + }, + [29]={ + + }, + [30]={ + + }, + [31]={ + + }, + [32]={ + + }, + [33]={ + + }, + [34]={ + + }, + [35]={ + + }, + [36]={ + + }, + [37]={ + + }, + [38]={ + + }, + [39]={ + + }, + [40]={ + + }, + [41]={ + + }, + [42]={ + + }, + [43]={ + + }, + [44]={ + + }, + [45]={ + + }, + [46]={ + + }, + [47]={ + + }, + [48]={ + + }, + [49]={ + + }, + [50]={ + + }, + [51]={ + + }, + [52]={ + + }, + [53]={ + + }, + [54]={ + + }, + [55]={ + + }, + [56]={ + + }, + [57]={ + + }, + [58]={ + + }, + [59]={ + + }, + [60]={ + + }, + [61]={ + + }, + [62]={ + + }, + [63]={ + + }, + [64]={ + + }, + [65]={ + + }, + [66]={ + + }, + [67]={ + + }, + [68]={ + + }, + [69]={ + + }, + [70]={ + + }, + [71]={ + + }, + [72]={ + + }, + [73]={ + + }, + [74]={ + + }, + [75]={ + + }, + [76]={ + + }, + [77]={ + + }, + [78]={ + + }, + [79]={ + + }, + [80]={ + + }, + [81]={ + + }, + [82]={ + + }, + [83]={ + + }, + [84]={ + + }, + [85]={ + + }, + [86]={ + + }, + [87]={ + + }, + [88]={ + + }, + [89]={ + + }, + [90]={ + + }, + [91]={ + + }, + [92]={ + + } +} +local config = { +data=task,count=92 +} +return config \ No newline at end of file diff --git a/lua/app/config/strings/en/task.lua.meta b/lua/app/config/strings/en/task.lua.meta new file mode 100644 index 00000000..cfce37ad --- /dev/null +++ b/lua/app/config/strings/en/task.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 269bb4bead3ca8843b236b17154ade58 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/config/strings/fr/item.lua b/lua/app/config/strings/fr/item.lua index e7fddf46..d3ca5f14 100644 --- a/lua/app/config/strings/fr/item.lua +++ b/lua/app/config/strings/fr/item.lua @@ -22,6 +22,21 @@ local item = { }, [7]={ + }, + [8]={ + + }, + [9]={ + + }, + [10]={ + + }, + [11]={ + + }, + [12]={ + }, [12001]={ @@ -49,6 +64,6 @@ local item = { } } local config = { -data=item,count=15 +data=item,count=20 } return config \ No newline at end of file diff --git a/lua/app/config/strings/fr/task.lua b/lua/app/config/strings/fr/task.lua new file mode 100644 index 00000000..334f1161 --- /dev/null +++ b/lua/app/config/strings/fr/task.lua @@ -0,0 +1,282 @@ +local task = { + [1]={ + + }, + [2]={ + + }, + [3]={ + + }, + [4]={ + + }, + [5]={ + + }, + [6]={ + + }, + [7]={ + + }, + [8]={ + + }, + [9]={ + + }, + [10]={ + + }, + [11]={ + + }, + [12]={ + + }, + [13]={ + + }, + [14]={ + + }, + [15]={ + + }, + [16]={ + + }, + [17]={ + + }, + [18]={ + + }, + [19]={ + + }, + [20]={ + + }, + [21]={ + + }, + [22]={ + + }, + [23]={ + + }, + [24]={ + + }, + [25]={ + + }, + [26]={ + + }, + [27]={ + + }, + [28]={ + + }, + [29]={ + + }, + [30]={ + + }, + [31]={ + + }, + [32]={ + + }, + [33]={ + + }, + [34]={ + + }, + [35]={ + + }, + [36]={ + + }, + [37]={ + + }, + [38]={ + + }, + [39]={ + + }, + [40]={ + + }, + [41]={ + + }, + [42]={ + + }, + [43]={ + + }, + [44]={ + + }, + [45]={ + + }, + [46]={ + + }, + [47]={ + + }, + [48]={ + + }, + [49]={ + + }, + [50]={ + + }, + [51]={ + + }, + [52]={ + + }, + [53]={ + + }, + [54]={ + + }, + [55]={ + + }, + [56]={ + + }, + [57]={ + + }, + [58]={ + + }, + [59]={ + + }, + [60]={ + + }, + [61]={ + + }, + [62]={ + + }, + [63]={ + + }, + [64]={ + + }, + [65]={ + + }, + [66]={ + + }, + [67]={ + + }, + [68]={ + + }, + [69]={ + + }, + [70]={ + + }, + [71]={ + + }, + [72]={ + + }, + [73]={ + + }, + [74]={ + + }, + [75]={ + + }, + [76]={ + + }, + [77]={ + + }, + [78]={ + + }, + [79]={ + + }, + [80]={ + + }, + [81]={ + + }, + [82]={ + + }, + [83]={ + + }, + [84]={ + + }, + [85]={ + + }, + [86]={ + + }, + [87]={ + + }, + [88]={ + + }, + [89]={ + + }, + [90]={ + + }, + [91]={ + + }, + [92]={ + + } +} +local config = { +data=task,count=92 +} +return config \ No newline at end of file diff --git a/lua/app/config/strings/fr/task.lua.meta b/lua/app/config/strings/fr/task.lua.meta new file mode 100644 index 00000000..37137300 --- /dev/null +++ b/lua/app/config/strings/fr/task.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: acb5227dbd28ad14b8310e02e335096a +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/config/strings/id/item.lua b/lua/app/config/strings/id/item.lua index 04f2ceab..7d622997 100644 --- a/lua/app/config/strings/id/item.lua +++ b/lua/app/config/strings/id/item.lua @@ -22,6 +22,21 @@ local item = { }, [7]={ + }, + [8]={ + + }, + [9]={ + + }, + [10]={ + + }, + [11]={ + + }, + [12]={ + }, [12001]={ @@ -49,6 +64,6 @@ local item = { } } local config = { -data=item,count=15 +data=item,count=20 } return config \ No newline at end of file diff --git a/lua/app/config/strings/ja/item.lua b/lua/app/config/strings/ja/item.lua index bf3d32f7..de7f9d10 100644 --- a/lua/app/config/strings/ja/item.lua +++ b/lua/app/config/strings/ja/item.lua @@ -22,6 +22,21 @@ local item = { }, [7]={ + }, + [8]={ + + }, + [9]={ + + }, + [10]={ + + }, + [11]={ + + }, + [12]={ + }, [12001]={ @@ -49,6 +64,6 @@ local item = { } } local config = { -data=item,count=15 +data=item,count=20 } return config \ No newline at end of file diff --git a/lua/app/config/strings/ja/task.lua b/lua/app/config/strings/ja/task.lua new file mode 100644 index 00000000..334f1161 --- /dev/null +++ b/lua/app/config/strings/ja/task.lua @@ -0,0 +1,282 @@ +local task = { + [1]={ + + }, + [2]={ + + }, + [3]={ + + }, + [4]={ + + }, + [5]={ + + }, + [6]={ + + }, + [7]={ + + }, + [8]={ + + }, + [9]={ + + }, + [10]={ + + }, + [11]={ + + }, + [12]={ + + }, + [13]={ + + }, + [14]={ + + }, + [15]={ + + }, + [16]={ + + }, + [17]={ + + }, + [18]={ + + }, + [19]={ + + }, + [20]={ + + }, + [21]={ + + }, + [22]={ + + }, + [23]={ + + }, + [24]={ + + }, + [25]={ + + }, + [26]={ + + }, + [27]={ + + }, + [28]={ + + }, + [29]={ + + }, + [30]={ + + }, + [31]={ + + }, + [32]={ + + }, + [33]={ + + }, + [34]={ + + }, + [35]={ + + }, + [36]={ + + }, + [37]={ + + }, + [38]={ + + }, + [39]={ + + }, + [40]={ + + }, + [41]={ + + }, + [42]={ + + }, + [43]={ + + }, + [44]={ + + }, + [45]={ + + }, + [46]={ + + }, + [47]={ + + }, + [48]={ + + }, + [49]={ + + }, + [50]={ + + }, + [51]={ + + }, + [52]={ + + }, + [53]={ + + }, + [54]={ + + }, + [55]={ + + }, + [56]={ + + }, + [57]={ + + }, + [58]={ + + }, + [59]={ + + }, + [60]={ + + }, + [61]={ + + }, + [62]={ + + }, + [63]={ + + }, + [64]={ + + }, + [65]={ + + }, + [66]={ + + }, + [67]={ + + }, + [68]={ + + }, + [69]={ + + }, + [70]={ + + }, + [71]={ + + }, + [72]={ + + }, + [73]={ + + }, + [74]={ + + }, + [75]={ + + }, + [76]={ + + }, + [77]={ + + }, + [78]={ + + }, + [79]={ + + }, + [80]={ + + }, + [81]={ + + }, + [82]={ + + }, + [83]={ + + }, + [84]={ + + }, + [85]={ + + }, + [86]={ + + }, + [87]={ + + }, + [88]={ + + }, + [89]={ + + }, + [90]={ + + }, + [91]={ + + }, + [92]={ + + } +} +local config = { +data=task,count=92 +} +return config \ No newline at end of file diff --git a/lua/app/config/strings/ja/task.lua.meta b/lua/app/config/strings/ja/task.lua.meta new file mode 100644 index 00000000..8fb8163c --- /dev/null +++ b/lua/app/config/strings/ja/task.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: eb4dee21223abde4f8c34b174867f26c +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/config/strings/ko/item.lua b/lua/app/config/strings/ko/item.lua index d51699a7..66f66a6a 100644 --- a/lua/app/config/strings/ko/item.lua +++ b/lua/app/config/strings/ko/item.lua @@ -22,6 +22,21 @@ local item = { }, [7]={ + }, + [8]={ + + }, + [9]={ + + }, + [10]={ + + }, + [11]={ + + }, + [12]={ + }, [12001]={ @@ -49,6 +64,6 @@ local item = { } } local config = { -data=item,count=15 +data=item,count=20 } return config \ No newline at end of file diff --git a/lua/app/config/strings/ko/task.lua b/lua/app/config/strings/ko/task.lua new file mode 100644 index 00000000..334f1161 --- /dev/null +++ b/lua/app/config/strings/ko/task.lua @@ -0,0 +1,282 @@ +local task = { + [1]={ + + }, + [2]={ + + }, + [3]={ + + }, + [4]={ + + }, + [5]={ + + }, + [6]={ + + }, + [7]={ + + }, + [8]={ + + }, + [9]={ + + }, + [10]={ + + }, + [11]={ + + }, + [12]={ + + }, + [13]={ + + }, + [14]={ + + }, + [15]={ + + }, + [16]={ + + }, + [17]={ + + }, + [18]={ + + }, + [19]={ + + }, + [20]={ + + }, + [21]={ + + }, + [22]={ + + }, + [23]={ + + }, + [24]={ + + }, + [25]={ + + }, + [26]={ + + }, + [27]={ + + }, + [28]={ + + }, + [29]={ + + }, + [30]={ + + }, + [31]={ + + }, + [32]={ + + }, + [33]={ + + }, + [34]={ + + }, + [35]={ + + }, + [36]={ + + }, + [37]={ + + }, + [38]={ + + }, + [39]={ + + }, + [40]={ + + }, + [41]={ + + }, + [42]={ + + }, + [43]={ + + }, + [44]={ + + }, + [45]={ + + }, + [46]={ + + }, + [47]={ + + }, + [48]={ + + }, + [49]={ + + }, + [50]={ + + }, + [51]={ + + }, + [52]={ + + }, + [53]={ + + }, + [54]={ + + }, + [55]={ + + }, + [56]={ + + }, + [57]={ + + }, + [58]={ + + }, + [59]={ + + }, + [60]={ + + }, + [61]={ + + }, + [62]={ + + }, + [63]={ + + }, + [64]={ + + }, + [65]={ + + }, + [66]={ + + }, + [67]={ + + }, + [68]={ + + }, + [69]={ + + }, + [70]={ + + }, + [71]={ + + }, + [72]={ + + }, + [73]={ + + }, + [74]={ + + }, + [75]={ + + }, + [76]={ + + }, + [77]={ + + }, + [78]={ + + }, + [79]={ + + }, + [80]={ + + }, + [81]={ + + }, + [82]={ + + }, + [83]={ + + }, + [84]={ + + }, + [85]={ + + }, + [86]={ + + }, + [87]={ + + }, + [88]={ + + }, + [89]={ + + }, + [90]={ + + }, + [91]={ + + }, + [92]={ + + } +} +local config = { +data=task,count=92 +} +return config \ No newline at end of file diff --git a/lua/app/config/strings/ko/task.lua.meta b/lua/app/config/strings/ko/task.lua.meta new file mode 100644 index 00000000..f8726deb --- /dev/null +++ b/lua/app/config/strings/ko/task.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 36b9e2ac52678d44f8fb50c7ec6d4c6d +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/config/strings/pt/item.lua b/lua/app/config/strings/pt/item.lua index 68eddb8e..44e488cc 100644 --- a/lua/app/config/strings/pt/item.lua +++ b/lua/app/config/strings/pt/item.lua @@ -21,6 +21,21 @@ local item = { }, [7]={ + }, + [8]={ + + }, + [9]={ + + }, + [10]={ + + }, + [11]={ + + }, + [12]={ + }, [12001]={ @@ -48,6 +63,6 @@ local item = { } } local config = { -data=item,count=15 +data=item,count=20 } return config \ No newline at end of file diff --git a/lua/app/config/strings/ru/item.lua b/lua/app/config/strings/ru/item.lua index 9505cbf1..6458d15a 100644 --- a/lua/app/config/strings/ru/item.lua +++ b/lua/app/config/strings/ru/item.lua @@ -19,6 +19,21 @@ local item = { }, [7]={ + }, + [8]={ + + }, + [9]={ + + }, + [10]={ + + }, + [11]={ + + }, + [12]={ + }, [12001]={ @@ -46,6 +61,6 @@ local item = { } } local config = { -data=item,count=15 +data=item,count=20 } return config \ No newline at end of file diff --git a/lua/app/config/strings/th/item.lua b/lua/app/config/strings/th/item.lua index 9505cbf1..6458d15a 100644 --- a/lua/app/config/strings/th/item.lua +++ b/lua/app/config/strings/th/item.lua @@ -19,6 +19,21 @@ local item = { }, [7]={ + }, + [8]={ + + }, + [9]={ + + }, + [10]={ + + }, + [11]={ + + }, + [12]={ + }, [12001]={ @@ -46,6 +61,6 @@ local item = { } } local config = { -data=item,count=15 +data=item,count=20 } return config \ No newline at end of file diff --git a/lua/app/config/strings/vi/item.lua b/lua/app/config/strings/vi/item.lua index 4aeba37a..7e50beaa 100644 --- a/lua/app/config/strings/vi/item.lua +++ b/lua/app/config/strings/vi/item.lua @@ -22,6 +22,21 @@ local item = { }, [7]={ + }, + [8]={ + + }, + [9]={ + + }, + [10]={ + + }, + [11]={ + + }, + [12]={ + }, [12001]={ @@ -49,6 +64,6 @@ local item = { } } local config = { -data=item,count=15 +data=item,count=20 } return config \ No newline at end of file diff --git a/lua/app/config/strings/zh/item.lua b/lua/app/config/strings/zh/item.lua index 7b9abb78..90b575af 100644 --- a/lua/app/config/strings/zh/item.lua +++ b/lua/app/config/strings/zh/item.lua @@ -25,6 +25,21 @@ local item = { }, [7]={ + }, + [8]={ + + }, + [9]={ + + }, + [10]={ + + }, + [11]={ + + }, + [12]={ + }, [12001]={ ["name"]="洛克西英雄碎片", @@ -60,6 +75,6 @@ local item = { } } local config = { -data=item,count=15 +data=item,count=20 } return config \ No newline at end of file diff --git a/lua/app/config/strings/zh/task.lua b/lua/app/config/strings/zh/task.lua new file mode 100644 index 00000000..334f1161 --- /dev/null +++ b/lua/app/config/strings/zh/task.lua @@ -0,0 +1,282 @@ +local task = { + [1]={ + + }, + [2]={ + + }, + [3]={ + + }, + [4]={ + + }, + [5]={ + + }, + [6]={ + + }, + [7]={ + + }, + [8]={ + + }, + [9]={ + + }, + [10]={ + + }, + [11]={ + + }, + [12]={ + + }, + [13]={ + + }, + [14]={ + + }, + [15]={ + + }, + [16]={ + + }, + [17]={ + + }, + [18]={ + + }, + [19]={ + + }, + [20]={ + + }, + [21]={ + + }, + [22]={ + + }, + [23]={ + + }, + [24]={ + + }, + [25]={ + + }, + [26]={ + + }, + [27]={ + + }, + [28]={ + + }, + [29]={ + + }, + [30]={ + + }, + [31]={ + + }, + [32]={ + + }, + [33]={ + + }, + [34]={ + + }, + [35]={ + + }, + [36]={ + + }, + [37]={ + + }, + [38]={ + + }, + [39]={ + + }, + [40]={ + + }, + [41]={ + + }, + [42]={ + + }, + [43]={ + + }, + [44]={ + + }, + [45]={ + + }, + [46]={ + + }, + [47]={ + + }, + [48]={ + + }, + [49]={ + + }, + [50]={ + + }, + [51]={ + + }, + [52]={ + + }, + [53]={ + + }, + [54]={ + + }, + [55]={ + + }, + [56]={ + + }, + [57]={ + + }, + [58]={ + + }, + [59]={ + + }, + [60]={ + + }, + [61]={ + + }, + [62]={ + + }, + [63]={ + + }, + [64]={ + + }, + [65]={ + + }, + [66]={ + + }, + [67]={ + + }, + [68]={ + + }, + [69]={ + + }, + [70]={ + + }, + [71]={ + + }, + [72]={ + + }, + [73]={ + + }, + [74]={ + + }, + [75]={ + + }, + [76]={ + + }, + [77]={ + + }, + [78]={ + + }, + [79]={ + + }, + [80]={ + + }, + [81]={ + + }, + [82]={ + + }, + [83]={ + + }, + [84]={ + + }, + [85]={ + + }, + [86]={ + + }, + [87]={ + + }, + [88]={ + + }, + [89]={ + + }, + [90]={ + + }, + [91]={ + + }, + [92]={ + + } +} +local config = { +data=task,count=92 +} +return config \ No newline at end of file diff --git a/lua/app/config/strings/zh/task.lua.meta b/lua/app/config/strings/zh/task.lua.meta new file mode 100644 index 00000000..c410ed77 --- /dev/null +++ b/lua/app/config/strings/zh/task.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: af8ae60c031a3304a87cdd73f26b131e +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/config/task.lua b/lua/app/config/task.lua index 81639699..d08c8c9d 100644 --- a/lua/app/config/task.lua +++ b/lua/app/config/task.lua @@ -11,7 +11,8 @@ local task = { ["num"]=10, ["num_for_nothing"]="Vwg=" } - } + }, + ["icon"]="1" }, [2]={ ["type"]=20, @@ -25,7 +26,8 @@ local task = { ["num"]=10, ["num_for_nothing"]="Vwg=" } - } + }, + ["icon"]="20" }, [3]={ ["type"]=21, @@ -39,7 +41,8 @@ local task = { ["num"]=50, ["num_for_nothing"]="Uwg=" } - } + }, + ["icon"]="21" }, [4]={ ["type"]=2, @@ -53,7 +56,8 @@ local task = { ["num"]=50, ["num_for_nothing"]="Uwg=" } - } + }, + ["icon"]="2" }, [5]={ ["type"]=2, @@ -67,7 +71,8 @@ local task = { ["num"]=75, ["num_for_nothing"]="UQ0=" } - } + }, + ["icon"]="2" }, [6]={ ["type"]=2, @@ -81,7 +86,8 @@ local task = { ["num"]=100, ["num_for_nothing"]="Vwhc" } - } + }, + ["icon"]="2" }, [7]={ ["type"]=2, @@ -95,7 +101,8 @@ local task = { ["num"]=125, ["num_for_nothing"]="VwpZ" } - } + }, + ["icon"]="2" }, [8]={ ["type"]=3, @@ -110,7 +117,8 @@ local task = { ["num_for_nothing"]="Uwg=" } }, - ["lock"]=3 + ["lock"]=3, + ["icon"]="3" }, [9]={ ["type"]=3, @@ -125,7 +133,8 @@ local task = { ["num_for_nothing"]="UQ0=" } }, - ["lock"]=3 + ["lock"]=3, + ["icon"]="3" }, [10]={ ["type"]=3, @@ -140,7 +149,8 @@ local task = { ["num_for_nothing"]="Vwhc" } }, - ["lock"]=3 + ["lock"]=3, + ["icon"]="3" }, [11]={ ["type"]=3, @@ -155,7 +165,8 @@ local task = { ["num_for_nothing"]="VwpZ" } }, - ["lock"]=3 + ["lock"]=3, + ["icon"]="3" }, [12]={ ["type"]=4, @@ -169,7 +180,8 @@ local task = { ["num"]=50, ["num_for_nothing"]="Uwg=" } - } + }, + ["icon"]="4" }, [13]={ ["type"]=4, @@ -183,7 +195,8 @@ local task = { ["num"]=75, ["num_for_nothing"]="UQ0=" } - } + }, + ["icon"]="4" }, [14]={ ["type"]=4, @@ -197,7 +210,8 @@ local task = { ["num"]=100, ["num_for_nothing"]="Vwhc" } - } + }, + ["icon"]="4" }, [15]={ ["type"]=4, @@ -211,7 +225,8 @@ local task = { ["num"]=125, ["num_for_nothing"]="VwpZ" } - } + }, + ["icon"]="4" }, [16]={ ["type"]=5, @@ -226,7 +241,8 @@ local task = { ["num_for_nothing"]="Uwg=" } }, - ["lock"]=3 + ["lock"]=3, + ["icon"]="5" }, [17]={ ["type"]=5, @@ -241,7 +257,8 @@ local task = { ["num_for_nothing"]="UQ0=" } }, - ["lock"]=3 + ["lock"]=3, + ["icon"]="5" }, [18]={ ["type"]=5, @@ -256,7 +273,8 @@ local task = { ["num_for_nothing"]="Vwhc" } }, - ["lock"]=3 + ["lock"]=3, + ["icon"]="5" }, [19]={ ["type"]=5, @@ -271,7 +289,8 @@ local task = { ["num_for_nothing"]="VwpZ" } }, - ["lock"]=3 + ["lock"]=3, + ["icon"]="5" }, [20]={ ["type"]=6, @@ -285,7 +304,8 @@ local task = { ["num"]=50, ["num_for_nothing"]="Uwg=" } - } + }, + ["icon"]="6" }, [21]={ ["type"]=6, @@ -299,7 +319,8 @@ local task = { ["num"]=75, ["num_for_nothing"]="UQ0=" } - } + }, + ["icon"]="6" }, [22]={ ["type"]=6, @@ -313,7 +334,8 @@ local task = { ["num"]=100, ["num_for_nothing"]="Vwhc" } - } + }, + ["icon"]="6" }, [23]={ ["type"]=6, @@ -327,7 +349,8 @@ local task = { ["num"]=125, ["num_for_nothing"]="VwpZ" } - } + }, + ["icon"]="6" }, [24]={ ["type"]=7, @@ -342,7 +365,8 @@ local task = { ["num_for_nothing"]="Uwg=" } }, - ["lock"]=10 + ["lock"]=10, + ["icon"]="7" }, [25]={ ["type"]=7, @@ -357,7 +381,8 @@ local task = { ["num_for_nothing"]="UQ0=" } }, - ["lock"]=10 + ["lock"]=10, + ["icon"]="7" }, [26]={ ["type"]=7, @@ -372,7 +397,8 @@ local task = { ["num_for_nothing"]="Vwhc" } }, - ["lock"]=10 + ["lock"]=10, + ["icon"]="7" }, [27]={ ["type"]=7, @@ -387,7 +413,8 @@ local task = { ["num_for_nothing"]="VwpZ" } }, - ["lock"]=10 + ["lock"]=10, + ["icon"]="7" }, [28]={ ["type"]=8, @@ -402,7 +429,8 @@ local task = { ["num_for_nothing"]="Uwg=" } }, - ["lock"]=5 + ["lock"]=5, + ["icon"]="8" }, [29]={ ["type"]=8, @@ -417,7 +445,8 @@ local task = { ["num_for_nothing"]="UQ0=" } }, - ["lock"]=5 + ["lock"]=5, + ["icon"]="8" }, [30]={ ["type"]=8, @@ -432,7 +461,7 @@ local task = { ["num_for_nothing"]="Vwhc" } }, - ["lock"]=5 + ["icon"]="8" }, [31]={ ["type"]=8, @@ -447,7 +476,7 @@ local task = { ["num_for_nothing"]="VwpZ" } }, - ["lock"]=5 + ["icon"]="8" }, [32]={ ["type"]=9, @@ -461,7 +490,8 @@ local task = { ["num"]=50, ["num_for_nothing"]="Uwg=" } - } + }, + ["icon"]="9" }, [33]={ ["type"]=9, @@ -475,7 +505,8 @@ local task = { ["num"]=75, ["num_for_nothing"]="UQ0=" } - } + }, + ["icon"]="9" }, [34]={ ["type"]=9, @@ -489,7 +520,8 @@ local task = { ["num"]=100, ["num_for_nothing"]="Vwhc" } - } + }, + ["icon"]="9" }, [35]={ ["type"]=9, @@ -503,7 +535,8 @@ local task = { ["num"]=125, ["num_for_nothing"]="VwpZ" } - } + }, + ["icon"]="9" }, [36]={ ["type"]=10, @@ -518,7 +551,8 @@ local task = { ["num_for_nothing"]="Uwg=" } }, - ["lock"]=4 + ["lock"]=4, + ["icon"]="10" }, [37]={ ["type"]=10, @@ -533,7 +567,8 @@ local task = { ["num_for_nothing"]="UQ0=" } }, - ["lock"]=4 + ["lock"]=4, + ["icon"]="10" }, [38]={ ["type"]=10, @@ -548,7 +583,7 @@ local task = { ["num_for_nothing"]="Vwhc" } }, - ["lock"]=4 + ["icon"]="10" }, [39]={ ["type"]=10, @@ -563,7 +598,7 @@ local task = { ["num_for_nothing"]="VwpZ" } }, - ["lock"]=4 + ["icon"]="10" }, [40]={ ["type"]=11, @@ -578,7 +613,8 @@ local task = { ["num_for_nothing"]="Uwg=" } }, - ["lock"]=5 + ["lock"]=5, + ["icon"]="11" }, [41]={ ["type"]=11, @@ -593,7 +629,8 @@ local task = { ["num_for_nothing"]="UQ0=" } }, - ["lock"]=5 + ["lock"]=5, + ["icon"]="11" }, [42]={ ["type"]=11, @@ -608,7 +645,8 @@ local task = { ["num_for_nothing"]="Vwhc" } }, - ["lock"]=5 + ["lock"]=5, + ["icon"]="11" }, [43]={ ["type"]=11, @@ -623,7 +661,8 @@ local task = { ["num_for_nothing"]="VwpZ" } }, - ["lock"]=5 + ["lock"]=5, + ["icon"]="11" }, [44]={ ["type"]=12, @@ -637,7 +676,8 @@ local task = { ["num"]=50, ["num_for_nothing"]="Uwg=" } - } + }, + ["icon"]="12" }, [45]={ ["type"]=12, @@ -651,7 +691,8 @@ local task = { ["num"]=75, ["num_for_nothing"]="UQ0=" } - } + }, + ["icon"]="12" }, [46]={ ["type"]=12, @@ -665,7 +706,8 @@ local task = { ["num"]=100, ["num_for_nothing"]="Vwhc" } - } + }, + ["icon"]="12" }, [47]={ ["type"]=12, @@ -679,7 +721,8 @@ local task = { ["num"]=125, ["num_for_nothing"]="VwpZ" } - } + }, + ["icon"]="12" }, [48]={ ["type"]=13, @@ -693,7 +736,8 @@ local task = { ["num"]=50, ["num_for_nothing"]="Uwg=" } - } + }, + ["icon"]="13" }, [49]={ ["type"]=13, @@ -707,7 +751,8 @@ local task = { ["num"]=75, ["num_for_nothing"]="UQ0=" } - } + }, + ["icon"]="13" }, [50]={ ["type"]=13, @@ -721,7 +766,8 @@ local task = { ["num"]=100, ["num_for_nothing"]="Vwhc" } - } + }, + ["icon"]="13" }, [51]={ ["type"]=13, @@ -735,7 +781,8 @@ local task = { ["num"]=125, ["num_for_nothing"]="VwpZ" } - } + }, + ["icon"]="13" }, [52]={ ["type"]=14, @@ -749,7 +796,8 @@ local task = { ["num"]=50, ["num_for_nothing"]="Uwg=" } - } + }, + ["icon"]="14" }, [53]={ ["type"]=14, @@ -763,7 +811,8 @@ local task = { ["num"]=75, ["num_for_nothing"]="UQ0=" } - } + }, + ["icon"]="14" }, [54]={ ["type"]=14, @@ -777,7 +826,8 @@ local task = { ["num"]=100, ["num_for_nothing"]="Vwhc" } - } + }, + ["icon"]="14" }, [55]={ ["type"]=14, @@ -791,7 +841,8 @@ local task = { ["num"]=125, ["num_for_nothing"]="VwpZ" } - } + }, + ["icon"]="14" }, [56]={ ["type"]=15, @@ -805,7 +856,8 @@ local task = { ["num"]=50, ["num_for_nothing"]="Uwg=" } - } + }, + ["icon"]="15" }, [57]={ ["type"]=15, @@ -819,7 +871,8 @@ local task = { ["num"]=75, ["num_for_nothing"]="UQ0=" } - } + }, + ["icon"]="15" }, [58]={ ["type"]=15, @@ -833,7 +886,8 @@ local task = { ["num"]=100, ["num_for_nothing"]="Vwhc" } - } + }, + ["icon"]="15" }, [59]={ ["type"]=15, @@ -847,7 +901,8 @@ local task = { ["num"]=125, ["num_for_nothing"]="VwpZ" } - } + }, + ["icon"]="15" }, [60]={ ["type"]=16, @@ -861,7 +916,8 @@ local task = { ["num"]=50, ["num_for_nothing"]="Uwg=" } - } + }, + ["icon"]="16" }, [61]={ ["type"]=16, @@ -875,7 +931,8 @@ local task = { ["num"]=75, ["num_for_nothing"]="UQ0=" } - } + }, + ["icon"]="16" }, [62]={ ["type"]=16, @@ -889,7 +946,8 @@ local task = { ["num"]=100, ["num_for_nothing"]="Vwhc" } - } + }, + ["icon"]="16" }, [63]={ ["type"]=16, @@ -903,7 +961,8 @@ local task = { ["num"]=125, ["num_for_nothing"]="VwpZ" } - } + }, + ["icon"]="16" }, [64]={ ["type"]=17, @@ -917,7 +976,8 @@ local task = { ["num"]=50, ["num_for_nothing"]="Uwg=" } - } + }, + ["icon"]="17" }, [65]={ ["type"]=17, @@ -931,7 +991,8 @@ local task = { ["num"]=75, ["num_for_nothing"]="UQ0=" } - } + }, + ["icon"]="17" }, [66]={ ["type"]=17, @@ -945,7 +1006,8 @@ local task = { ["num"]=100, ["num_for_nothing"]="Vwhc" } - } + }, + ["icon"]="17" }, [67]={ ["type"]=17, @@ -959,7 +1021,8 @@ local task = { ["num"]=125, ["num_for_nothing"]="VwpZ" } - } + }, + ["icon"]="17" }, [68]={ ["type"]=18, @@ -973,7 +1036,8 @@ local task = { ["num"]=50, ["num_for_nothing"]="Uwg=" } - } + }, + ["icon"]="18" }, [69]={ ["type"]=18, @@ -987,7 +1051,8 @@ local task = { ["num"]=75, ["num_for_nothing"]="UQ0=" } - } + }, + ["icon"]="18" }, [70]={ ["type"]=18, @@ -1001,7 +1066,8 @@ local task = { ["num"]=100, ["num_for_nothing"]="Vwhc" } - } + }, + ["icon"]="18" }, [71]={ ["type"]=18, @@ -1015,7 +1081,8 @@ local task = { ["num"]=125, ["num_for_nothing"]="VwpZ" } - } + }, + ["icon"]="18" }, [72]={ ["type"]=19, @@ -1029,7 +1096,8 @@ local task = { ["num"]=50, ["num_for_nothing"]="Uwg=" } - } + }, + ["icon"]="19" }, [73]={ ["type"]=19, @@ -1043,7 +1111,8 @@ local task = { ["num"]=75, ["num_for_nothing"]="UQ0=" } - } + }, + ["icon"]="19" }, [74]={ ["type"]=19, @@ -1057,7 +1126,8 @@ local task = { ["num"]=100, ["num_for_nothing"]="Vwhc" } - } + }, + ["icon"]="19" }, [75]={ ["type"]=19, @@ -1071,7 +1141,8 @@ local task = { ["num"]=125, ["num_for_nothing"]="VwpZ" } - } + }, + ["icon"]="19" }, [76]={ ["type"]=2, @@ -1085,7 +1156,8 @@ local task = { ["num"]=150, ["num_for_nothing"]="Vw1c" } - } + }, + ["icon"]="2" }, [77]={ ["type"]=3, @@ -1100,7 +1172,7 @@ local task = { ["num_for_nothing"]="Vw1c" } }, - ["lock"]=3 + ["icon"]="3" }, [78]={ ["type"]=5, @@ -1115,7 +1187,7 @@ local task = { ["num_for_nothing"]="Vw1c" } }, - ["lock"]=3 + ["icon"]="5" }, [79]={ ["type"]=6, @@ -1129,7 +1201,8 @@ local task = { ["num"]=150, ["num_for_nothing"]="Vw1c" } - } + }, + ["icon"]="6" }, [80]={ ["type"]=7, @@ -1144,7 +1217,8 @@ local task = { ["num_for_nothing"]="Vw1c" } }, - ["lock"]=10 + ["lock"]=10, + ["icon"]="7" }, [81]={ ["type"]=8, @@ -1159,7 +1233,8 @@ local task = { ["num_for_nothing"]="Vw1c" } }, - ["lock"]=5 + ["lock"]=5, + ["icon"]="8" }, [82]={ ["type"]=9, @@ -1173,7 +1248,8 @@ local task = { ["num"]=150, ["num_for_nothing"]="Vw1c" } - } + }, + ["icon"]="9" }, [83]={ ["type"]=10, @@ -1188,7 +1264,8 @@ local task = { ["num_for_nothing"]="Vw1c" } }, - ["lock"]=4 + ["lock"]=4, + ["icon"]="10" }, [84]={ ["type"]=11, @@ -1203,7 +1280,8 @@ local task = { ["num_for_nothing"]="Vw1c" } }, - ["lock"]=5 + ["lock"]=5, + ["icon"]="11" }, [85]={ ["type"]=12, @@ -1217,7 +1295,8 @@ local task = { ["num"]=150, ["num_for_nothing"]="Vw1c" } - } + }, + ["icon"]="12" }, [86]={ ["type"]=13, @@ -1231,7 +1310,8 @@ local task = { ["num"]=150, ["num_for_nothing"]="Vw1c" } - } + }, + ["icon"]="13" }, [87]={ ["type"]=14, @@ -1245,7 +1325,8 @@ local task = { ["num"]=150, ["num_for_nothing"]="Vw1c" } - } + }, + ["icon"]="14" }, [88]={ ["type"]=15, @@ -1259,7 +1340,8 @@ local task = { ["num"]=150, ["num_for_nothing"]="Vw1c" } - } + }, + ["icon"]="15" }, [89]={ ["type"]=16, @@ -1273,7 +1355,8 @@ local task = { ["num"]=150, ["num_for_nothing"]="Vw1c" } - } + }, + ["icon"]="16" }, [90]={ ["type"]=17, @@ -1287,7 +1370,8 @@ local task = { ["num"]=150, ["num_for_nothing"]="Vw1c" } - } + }, + ["icon"]="17" }, [91]={ ["type"]=18, @@ -1301,7 +1385,8 @@ local task = { ["num"]=150, ["num_for_nothing"]="Vw1c" } - } + }, + ["icon"]="18" }, [92]={ ["type"]=19, @@ -1315,7 +1400,8 @@ local task = { ["num"]=150, ["num_for_nothing"]="Vw1c" } - } + }, + ["icon"]="19" } } local config = { diff --git a/lua/app/config/task_daily.lua b/lua/app/config/task_daily.lua index 67728cc0..991d8f84 100644 --- a/lua/app/config/task_daily.lua +++ b/lua/app/config/task_daily.lua @@ -122,7 +122,7 @@ local task_daily = { 100 } }, - ["ad_refresh"]=1 + ["ad_refresh"]=true }, [4]={ ["type"]=1, @@ -227,7 +227,7 @@ local task_daily = { 100 } }, - ["ad_refresh"]=1 + ["ad_refresh"]=true }, [5]={ ["type"]=1, @@ -332,7 +332,7 @@ local task_daily = { 100 } }, - ["ad_refresh"]=1 + ["ad_refresh"]=true }, [6]={ ["type"]=1, @@ -437,7 +437,7 @@ local task_daily = { 100 } }, - ["ad_refresh"]=1 + ["ad_refresh"]=true }, [7]={ ["type"]=1, @@ -552,8 +552,8 @@ local task_daily = { 100 } }, - ["ad_refresh"]=1, - ["bounty"]=1 + ["ad_refresh"]=true, + ["bounty"]=true }, [9]={ ["type"]=2, @@ -684,7 +684,7 @@ local task_daily = { 100 } }, - ["bounty"]=1 + ["bounty"]=true }, [16]={ ["type"]=2, @@ -703,7 +703,7 @@ local task_daily = { 100 } }, - ["bounty"]=1 + ["bounty"]=true } } local config = { diff --git a/lua/app/module/battle/battle_const.lua b/lua/app/module/battle/battle_const.lua index 43042a31..69064439 100644 --- a/lua/app/module/battle/battle_const.lua +++ b/lua/app/module/battle/battle_const.lua @@ -196,6 +196,7 @@ BattleConst.PASSIVE_EVENT = { HP_LOWER_THAN = 4, -- 血量低于X% USE_NORMAL_SKILL = 5, -- 使用普攻 ACTIVE_SKILL_HIT = 6, -- 主动技能命中 + ON_DEAD = 7, -- 死亡时 } local BUFF_NAME = { @@ -253,6 +254,7 @@ local BUFF_NAME = { FIRST_HAND = "first_hand", COUNTER_ATTACK = "counterattack", SKILL_HURT_ADD = "skill_hurt_add", + DEATH_SUMMON = "death_summon", } BattleConst.BUFF_NAME = BUFF_NAME @@ -303,6 +305,7 @@ local ATTR_NAME = { FIRST_HAND = "first_hand", COUNTER_ATTACK = "counterattack", SKILL_HURT = "skill_hurt", + DEATH_SUMMON = "death_summon", } BattleConst.ATTR_NAME = ATTR_NAME diff --git a/lua/app/module/battle/component/battle_unit_comp.lua b/lua/app/module/battle/component/battle_unit_comp.lua index 069a25eb..2d02f26d 100644 --- a/lua/app/module/battle/component/battle_unit_comp.lua +++ b/lua/app/module/battle/component/battle_unit_comp.lua @@ -1363,6 +1363,8 @@ function BattleUnitComp:takeDamageOrCure(atker, num, effectType, effectStatus) end if hp > 0 then self.team:checkPassiveEvent(PASSIVE_EVENT.HP_LOWER_THAN, atker, hpPercent) + else + self.team:checkPassiveEvent(PASSIVE_EVENT.ON_DEAD, atker) end end diff --git a/lua/app/module/battle/controller/battle_controller.lua b/lua/app/module/battle/controller/battle_controller.lua index 9114778d..fa0e2877 100644 --- a/lua/app/module/battle/controller/battle_controller.lua +++ b/lua/app/module/battle/controller/battle_controller.lua @@ -69,8 +69,22 @@ function BattleController:findNextDefUnit() self:enterRoundEnd() end -function BattleController:onDefDead() - self.defTeam:getMainUnit():playDead() +function BattleController:onDefDead(callback) + self.defTeam:getMainUnit():playDead(function() + local monsterId = self.defTeam:getMainUnit().unitEntity:getDeathSummon() + Logger.logHighlight(monsterId) + if monsterId > 0 then + self:generateMonsterById(monsterId, function() + if callback then + callback() + end + end) + else + if callback then + callback() + end + end + end) end function BattleController:tick(dt) @@ -549,9 +563,14 @@ function BattleController:enterNextTeamAction() if self.waveIndex >= self.maxWaveIndex then self:enterRoundEnd() else + self:onDefDead(function() + if self.battleData:getDefTeam():getIsDead() then + self:_findNextDefUnit() + else + self:enterRoundEnd() + end + end) self.defTeam:removeAllBuff() - self:onDefDead() - self:_findNextDefUnit() end return end @@ -589,9 +608,33 @@ function BattleController:enterRoundEnd() self:enterNextWave() return end + self.atkTeam:onRoundEnd() self.defTeam:onRoundEnd() + local atkTeam = self.battleData:getAtkTeam() + if not atkTeam or atkTeam:getIsDead() then -- 英雄死了， 直接结算 + self:enterNextWave() + return + end + + local defTeam = self.battleData:getDefTeam() + if not defTeam or defTeam:getIsDead() then -- 怪物死了， 直接进入刷新逻辑 + if self.waveIndex >= self.maxWaveIndex then + self:enterNextWave() + else + self:onDefDead(function() + if self.battleData:getDefTeam():getIsDead() then + self:_findNextDefUnit() + else + self:enterNextWave() + end + end) + self.defTeam:removeAllBuff() + end + return + end + self:onRoundEnd() end @@ -2159,8 +2202,17 @@ function BattleController:findLinkLine(posId, posIdMap, hadSkill, mainElementTyp return hadSkill end -function BattleController:randomDisruptionBoard() - +function BattleController:generateMonsterById(monsterId, callback) + local unitEntity = DataManager.BattleData:addMonster(monsterId, true) + local modelId = unitEntity:getModelId() + BattleHelper:loadBattleHeroModel(modelId, self.battleUI:getBattleNode(), function(spineObject) + self.defTeam:removeAllUnits() + local monsterComp = spineObject:addLuaComponent(GConst.BattleConst.TYPEOF_LUA_COMP.BATTLE_MONSTER_COMPONENT) + monsterComp:initWithEntity(modelId, unitEntity, self) + self.defTeam:addUnit(monsterComp, true) + self.battleUI:refreshDefHp(unitEntity:getHp(), unitEntity:getHpPercent()) + monsterComp:playEnterBattlefield(false, callback) + end) end function BattleController:addBattleExp(exp) diff --git a/lua/app/module/battle/helper/battle_buff_handle.lua b/lua/app/module/battle/helper/battle_buff_handle.lua index 10083d8d..d59f4d39 100644 --- a/lua/app/module/battle/helper/battle_buff_handle.lua +++ b/lua/app/module/battle/helper/battle_buff_handle.lua @@ -77,6 +77,12 @@ BattleBuffHandle.addAttribute = { [BUFF_NAME.HPP_ADD] = function(target, num) target:addMaxHp(num) end, + [BUFF_NAME.DEATH_SUMMON] = function(target, num) + if num < 0 then + num = 0 + end + target.unitEntity:setAttr(ATTR_NAME.DEATH_SUMMON, num) + end } local function _takeEffectDirectHurt(unitComp, buff, target, buffEffect) diff --git a/lua/app/module/battle/helper/battle_buff_special.lua b/lua/app/module/battle/helper/battle_buff_special.lua index 8dc8310f..2aa6940e 100644 --- a/lua/app/module/battle/helper/battle_buff_special.lua +++ b/lua/app/module/battle/helper/battle_buff_special.lua @@ -33,6 +33,7 @@ end local function _bleedOff(buffSender, target, buff, buffEffect) target.unitEntity:addAttr(BattleConst.ATTR_NAME.BE_SUCKED, -1000, false) -- 写死10% + return 1 end local function _bleedWork(unitComp, buffEffect, buff) @@ -43,6 +44,7 @@ local function _bleedWork(unitComp, buffEffect, buff) damage = -damage end unitComp:takeDamageOrCure(buffEffect.sender, damage, EFFECT_TYPE.DOT, hurtStatus) + return 1 end local function _undeadOn(buffSender, buff, target, buffEffect) @@ -51,6 +53,7 @@ end local function _undeadOff(buffSender, target, buff, buffEffect) target.unitEntity:setUndeadHp(0) -- 写死0 + return 1 end local function _imprisonOn(buffSender, buff, target, buffEffect) @@ -60,6 +63,7 @@ end local function _imprisonOff(buffSender, target, buff, buffEffect) target.unitEntity:removeActiveSkillLimit(buff:getName()) + return 1 end local function _frozenOn(buffSender, buff, target, buffEffect) @@ -75,6 +79,7 @@ local function _frozenOff(buffSender, target, buff, buffEffect) if not target.unitEntity:getIsFrozen() then target:popCacheBuffByDecr(BattleConst.BUFF_DECR_TYPE.INCREASE_GAIN) end + return 1 end local _handleOn = { diff --git a/lua/app/module/battle/helper/battle_passive.lua b/lua/app/module/battle/helper/battle_passive.lua index 8a2ae9e5..a023ba49 100644 --- a/lua/app/module/battle/helper/battle_passive.lua +++ b/lua/app/module/battle/helper/battle_passive.lua @@ -49,12 +49,17 @@ local function _checkActiveSkillHit(unitComp, skill, targetComp) return 1 end +local function _checkOnDead(unitComp, skill, targetComp) + return 1 +end + BattlePassive.checkTrigger = { [PASSIVE_EVENT.ON_UNIT_PREPARE_OVER] = _checkOnUnitPrepareOver, [PASSIVE_EVENT.ON_UNI_ATTACK_START] = _checkOnUniAttackStart, [PASSIVE_EVENT.HP_LOWER_THAN] = _checkhpLowerThan, [PASSIVE_EVENT.USE_NORMAL_SKILL] = _checkUseNormalSkill, [PASSIVE_EVENT.ACTIVE_SKILL_HIT] = _checkActiveSkillHit, + [PASSIVE_EVENT.ON_DEAD] = _checkOnDead, } return BattlePassive \ No newline at end of file diff --git a/lua/app/userdata/battle/team/battle_team_entity.lua b/lua/app/userdata/battle/team/battle_team_entity.lua index 4ced81f9..5cda5537 100644 --- a/lua/app/userdata/battle/team/battle_team_entity.lua +++ b/lua/app/userdata/battle/team/battle_team_entity.lua @@ -123,6 +123,10 @@ function BattleTeamEntity:addAttr(name, num, isPercent) return addNum end +function BattleTeamEntity:setAttr(name, num) + self.attr[name] = num +end + function BattleTeamEntity:getAllMembers() return self.members end @@ -211,6 +215,10 @@ function BattleTeamEntity:getFirstHand() return self.attr.first_hand or 0 end +function BattleTeamEntity:getDeathSummon() + return self.attr.death_summon or 0 +end + function BattleTeamEntity:addMaxHp(num) local hpBefore = self.attr.hp local currPercent = hpBefore * DEFAULT_FACTOR // self.attr.max_hp diff --git a/lua/app/userdata/battle/team/battle_unit_entity.lua b/lua/app/userdata/battle/team/battle_unit_entity.lua index 616af888..c7f308a4 100644 --- a/lua/app/userdata/battle/team/battle_unit_entity.lua +++ b/lua/app/userdata/battle/team/battle_unit_entity.lua @@ -100,6 +100,10 @@ function BattleUnitEntity:addAttr(name, num, isPercent) return self.team:addAttr(name, num, isPercent) end +function BattleUnitEntity:setAttr(name, num) + return self.team:setAttr(name, num) +end + function BattleUnitEntity:getModelId() return self.unitData.modelId end @@ -314,6 +318,10 @@ function BattleUnitEntity:getFirstHand() return self.team:getFirstHand() end +function BattleUnitEntity:getDeathSummon() + return self.team:getDeathSummon() +end + function BattleUnitEntity:getCounterAttack() return self.team:getCounterAttack() end From 240517e04eb9b74b524608fdaeb9ad4e064c10f9 Mon Sep 17 00:00:00 2001 From: xiekaidong Date: Thu, 11 May 2023 19:17:29 +0800 Subject: [PATCH 22/23] =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=B8=80=E4=B8=8B?= =?UTF-8?q?=E9=98=9F=E4=BC=8D=E6=AD=BB=E4=BA=A1=E5=88=A4=E5=AE=9A=E9=80=BB?= =?UTF-8?q?=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../battle/controller/battle_controller.lua | 73 ++++++++----------- 1 file changed, 32 insertions(+), 41 deletions(-) diff --git a/lua/app/module/battle/controller/battle_controller.lua b/lua/app/module/battle/controller/battle_controller.lua index fa0e2877..540d080c 100644 --- a/lua/app/module/battle/controller/battle_controller.lua +++ b/lua/app/module/battle/controller/battle_controller.lua @@ -72,7 +72,6 @@ end function BattleController:onDefDead(callback) self.defTeam:getMainUnit():playDead(function() local monsterId = self.defTeam:getMainUnit().unitEntity:getDeathSummon() - Logger.logHighlight(monsterId) if monsterId > 0 then self:generateMonsterById(monsterId, function() if callback then @@ -552,26 +551,7 @@ function BattleController:enterNextTeamAction() self.roundStep = BattleConst.BATTLE_ROUND_STEP.ON_TEAM_ACTION_OVER self:hideCombo() - local atkTeam = self.battleData:getAtkTeam() - if not atkTeam or atkTeam:getIsDead() then -- 英雄死了， 直接结算 - self:enterNextWave() - return - end - - local defTeam = self.battleData:getDefTeam() - if not defTeam or defTeam:getIsDead() then -- 怪物死了， 直接进入刷新逻辑 - if self.waveIndex >= self.maxWaveIndex then - self:enterRoundEnd() - else - self:onDefDead(function() - if self.battleData:getDefTeam():getIsDead() then - self:_findNextDefUnit() - else - self:enterRoundEnd() - end - end) - self.defTeam:removeAllBuff() - end + if self:checkTeamIsDead(function() self:enterRoundEnd() end) then return end @@ -584,6 +564,36 @@ function BattleController:enterNextTeamAction() action() end +function BattleController:checkTeamIsDead(callback) + local atkTeam = self.battleData:getAtkTeam() + if not atkTeam or atkTeam:getIsDead() then -- 英雄死了， 直接结算 + self:enterNextWave() + return true + end + + local defTeam = self.battleData:getDefTeam() + if not defTeam or defTeam:getIsDead() then -- 怪物死了， 直接进入刷新逻辑 + if self.waveIndex >= self.maxWaveIndex then + if callback then + callback() + end + else + self:onDefDead(function() + self.defTeam:removeAllBuff() + if self.battleData:getDefTeam():getIsDead() then + self:_findNextDefUnit() + else + if callback() then + callback() + end + end + end) + end + return true + end + return false +end + function BattleController:getIsAtkStep() return self.roundStep == BattleConst.BATTLE_ROUND_STEP.ON_ATK_STEP end @@ -612,26 +622,7 @@ function BattleController:enterRoundEnd() self.atkTeam:onRoundEnd() self.defTeam:onRoundEnd() - local atkTeam = self.battleData:getAtkTeam() - if not atkTeam or atkTeam:getIsDead() then -- 英雄死了， 直接结算 - self:enterNextWave() - return - end - - local defTeam = self.battleData:getDefTeam() - if not defTeam or defTeam:getIsDead() then -- 怪物死了， 直接进入刷新逻辑 - if self.waveIndex >= self.maxWaveIndex then - self:enterNextWave() - else - self:onDefDead(function() - if self.battleData:getDefTeam():getIsDead() then - self:_findNextDefUnit() - else - self:enterNextWave() - end - end) - self.defTeam:removeAllBuff() - end + if self:checkTeamIsDead(function() self:enterNextWave() end) then return end From 4bf948f67023cfe2dfcc24136d556a9627e9f4a4 Mon Sep 17 00:00:00 2001 From: xiekaidong Date: Thu, 11 May 2023 20:14:59 +0800 Subject: [PATCH 23/23] =?UTF-8?q?=E8=A1=A8=E7=8E=B0=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E4=B8=80=E4=B8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/app/module/battle/controller/battle_controller.lua | 2 +- lua/app/ui/battle/battle_ui.lua | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/lua/app/module/battle/controller/battle_controller.lua b/lua/app/module/battle/controller/battle_controller.lua index 540d080c..befd2749 100644 --- a/lua/app/module/battle/controller/battle_controller.lua +++ b/lua/app/module/battle/controller/battle_controller.lua @@ -1058,7 +1058,7 @@ function BattleController:fillBoard(isRoundBeginCheck) end end - self.battleUI:fallGrid(pathMap, function() + self.battleUI:fallGrid(pathMap, isRoundBeginCheck, function() self:onFillBoardOver(isRoundBeginCheck) self.battleUI:enableUITouch() end) diff --git a/lua/app/ui/battle/battle_ui.lua b/lua/app/ui/battle/battle_ui.lua index 99a534ad..d28929cf 100644 --- a/lua/app/ui/battle/battle_ui.lua +++ b/lua/app/ui/battle/battle_ui.lua @@ -1120,8 +1120,12 @@ function BattleUI:removeGridOutOfScreen(posIdList) end end -function BattleUI:fallGrid(listInfo, callback) - self:showMask(false) +function BattleUI:fallGrid(listInfo, isRoundBeginCheck, callback) + if isRoundBeginCheck then + self:showMask(false) + else + self.boardMask:getTransform():SetAsLastSibling() + end self.fallAniCount = 0 for posId, info in pairs(listInfo) do self.fallAniCount = self.fallAniCount + 1