From 32edfe2a3acaa40518a9462a6c8b0c0baba2007d Mon Sep 17 00:00:00 2001 From: chenxi Date: Thu, 20 Apr 2023 20:53:26 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=B3=A2=E6=AC=A1=E4=B9=8B=E9=97=B4?= =?UTF-8?q?=E5=9B=9E=E8=A1=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/app/module/battle/battle_const.lua | 17 ++++--- .../battle/component/battle_hero_comp.lua | 12 ----- .../battle/component/battle_monster_comp.lua | 11 ----- .../battle/component/battle_unit_comp.lua | 44 ++++++++++++++++++- .../controller/battle_controller_stage.lua | 28 ++++++++---- .../battle/helper/battle_buff_handle.lua | 8 ++-- lua/app/module/battle/team/battle_team.lua | 8 ++++ 7 files changed, 85 insertions(+), 43 deletions(-) diff --git a/lua/app/module/battle/battle_const.lua b/lua/app/module/battle/battle_const.lua index 683388d6..80bf108d 100644 --- a/lua/app/module/battle/battle_const.lua +++ b/lua/app/module/battle/battle_const.lua @@ -37,6 +37,9 @@ BattleConst.ANIMATOR_HASH_NAME_NUMBER_MOVE_L = -526518883 BattleConst.ANIMATOR_HASH_NAME_NUMBER_MOVE_R = 445827326 BattleConst.ANIMATOR_HASH_NAME_NUMBER_CRIT = -1734531349 BattleConst.ANIMATOR_HASH_NAME_NUMBER_BUFF = 1364146828 +BattleConst.RECOVER_HP_COUNT = 3 +BattleConst.RECOVER_HP_INTERVAL = 0.2 +BattleConst.RECOVER_HP_PERCENT = 333 BattleConst.BATTLE_ROUND_STEP = { WAIT_BEGIN = 0, -- 等待开始 @@ -79,13 +82,13 @@ BattleConst.UNIT_STATE = { IDLE = 1, -- 待机 NORMAL_ATTACK = 2, -- 普通攻击 SKILL_ATTACK = 3, -- 技能攻击 - HURT = 4, -- 受伤 - DEAD = 5, -- 死亡 - ENTER_BATTLEFIELD = 6, -- 进入战场 - SWITCH_IN = 7, -- 入场 - SWITCH_OUT = 8, -- 离场 - ASSISTING_ATTACK = 9, -- 协助攻击 - WAIT = 10, -- 等待 + DEAD = 4, -- 死亡 + ENTER_BATTLEFIELD = 5, -- 进入战场 + SWITCH_IN = 6, -- 入场 + SWITCH_OUT = 7, -- 离场 + ASSISTING_ATTACK = 8, -- 协助攻击 + WAIT = 9, -- 等待 + RECOVER_HP_WAVE = 10, -- 波次之间回血 } BattleConst.MATCH_DMG_ADDITION_NAME = { diff --git a/lua/app/module/battle/component/battle_hero_comp.lua b/lua/app/module/battle/component/battle_hero_comp.lua index efa66e27..7b5e22f6 100644 --- a/lua/app/module/battle/component/battle_hero_comp.lua +++ b/lua/app/module/battle/component/battle_hero_comp.lua @@ -1,17 +1,5 @@ -local BattleConst = require "app/module/battle/battle_const" local BattleUnitComp = require "app/module/battle/component/battle_unit_comp" local BattleHeroComp = class("BattleHeroComp", BattleUnitComp) -local UNIT_STATE = BattleConst.UNIT_STATE - -function BattleHeroComp:init() - self.battleMgr = CS.BF.BFMain.Instance.BattleMgr -end - -function BattleHeroComp:initBase() - self.isDead = false - self.currState = UNIT_STATE.INIT -end - return BattleHeroComp \ No newline at end of file diff --git a/lua/app/module/battle/component/battle_monster_comp.lua b/lua/app/module/battle/component/battle_monster_comp.lua index 229c01de..5015c09b 100644 --- a/lua/app/module/battle/component/battle_monster_comp.lua +++ b/lua/app/module/battle/component/battle_monster_comp.lua @@ -1,16 +1,5 @@ -local BattleConst = require "app/module/battle/battle_const" local BattleUnitComp = require "app/module/battle/component/battle_unit_comp" local BattleMonsterComp = class("BattleMonsterComp", BattleUnitComp) -local UNIT_STATE = BattleConst.UNIT_STATE - -function BattleMonsterComp:init() -end - -function BattleMonsterComp:initBase() - self.isDead = false - self.currState = UNIT_STATE.INIT -end - return BattleMonsterComp \ No newline at end of file diff --git a/lua/app/module/battle/component/battle_unit_comp.lua b/lua/app/module/battle/component/battle_unit_comp.lua index 8c4334b2..e48f5ff2 100644 --- a/lua/app/module/battle/component/battle_unit_comp.lua +++ b/lua/app/module/battle/component/battle_unit_comp.lua @@ -393,6 +393,8 @@ function BattleUnitComp:changeState(state) self:exitSwitchOutState() elseif self.currState == UNIT_STATE.WAIT then self:exitWaitState() + elseif self.currState == UNIT_STATE.RECOVER_HP_WAVE then + self:exitRecoverHpWaveState() end -- 进入目标状态 self.currState = state @@ -416,6 +418,8 @@ function BattleUnitComp:changeState(state) self:enterSwitchOutState() elseif state == UNIT_STATE.WAIT then self:enterWaitState() + elseif state == UNIT_STATE.RECOVER_HP_WAVE then + self:enterRecoverHpWaveState() end return true end @@ -563,6 +567,34 @@ function BattleUnitComp:updateHurt(dt) end end +function BattleUnitComp:enterRecoverHpWaveState() + self.recoverHpCount = BattleConst.RECOVER_HP_COUNT + self.recoverHpTime = BattleConst.RECOVER_HP_INTERVAL / 2 +end + +function BattleUnitComp:exitRecoverHpWaveState() +end + +function BattleUnitComp:updateRecoverHpWaveState(dt) + if self.recoverHpCount <= 0 then + return + end + self.recoverHpTime = self.recoverHpTime - dt + if self.recoverHpTime < 0 then + self.recoverHpCount = self.recoverHpCount - 1 + self.recoverHpTime = BattleConst.RECOVER_HP_INTERVAL + local healNum = BattleConst.RECOVER_HP_PERCENT * self.unitEntity:getMaxHp() // DEFAULT_FACTOR + self:takeDamageOrCure(self, healNum, EFFECT_TYPE.HEAL, 0) + if self.recoverHpCount <= 0 then + if self.finishRecoverHpCallback then + local callback = self.finishRecoverHpCallback + self.finishRecoverHpCallback = nil + callback() + end + end + end +end + function BattleUnitComp:enterWaitState() end @@ -1002,7 +1034,7 @@ function BattleUnitComp:removeEffect(buff, target) end end -function BattleUnitComp:takeDamageOrCure(atker, buff, num, effectType, effectStatus) +function BattleUnitComp:takeDamageOrCure(atker, num, effectType, effectStatus) if self:getIsClear() then return 0 end @@ -1087,6 +1119,14 @@ function BattleUnitComp:playDead(callback) end end +function BattleUnitComp:recoverHpOnWaveOver(callback) + self.finishRecoverHpCallback = callback + if not self:changeState(UNIT_STATE.RECOVER_HP_WAVE) then + self.finishRecoverHpCallback = nil + callback() + end +end + function BattleUnitComp:playEnterBattlefield(isBoss, callback) self.finishEnterBattlefieldCallback = callback if isBoss then @@ -1140,6 +1180,8 @@ function BattleUnitComp:tick(dt) self:updateSwitchOutState(dt) elseif self.currState == UNIT_STATE.WAIT then self:updateWaitState(dt) + elseif self.currState == UNIT_STATE.RECOVER_HP_WAVE then + self:updateRecoverHpWaveState(dt) end end diff --git a/lua/app/module/battle/controller/battle_controller_stage.lua b/lua/app/module/battle/controller/battle_controller_stage.lua index 21f0ebd8..48d7289f 100644 --- a/lua/app/module/battle/controller/battle_controller_stage.lua +++ b/lua/app/module/battle/controller/battle_controller_stage.lua @@ -46,16 +46,28 @@ function BattleControllerStage:_stageGenerateNextMonster() monsterComp:initWithEntity(modelId, unitEntity, self) self.defTeam:addUnit(monsterComp, true) self.battleUI:refreshDefHp(unitEntity:getHp(), unitEntity:getHpPercent()) - if isBoss then -- 如果是boss就跑过去 + if not isBoss then -- 如果是boss就跑过去 + local count = 0 + local function onFinish() + count = count + 1 + if count == 2 then + self.atkTeam:stopRunAction() + self:onRoundEnd(true) + end + end self.atkTeam:playRunAction() - monsterComp:playEnterBattlefield(true, function() - self.atkTeam:stopRunAction() - self:onRoundEnd(true) - end) + self.atkTeam:recoverHpOnWaveOver(onFinish) + monsterComp:playEnterBattlefield(true, onFinish) else - monsterComp:playEnterBattlefield(false, function() - self:onRoundEnd(true) - end) + local count = 0 + local function onFinish() + count = count + 1 + if count == 2 then + self:onRoundEnd(true) + end + end + self.atkTeam:recoverHpOnWaveOver(onFinish) + monsterComp:playEnterBattlefield(false, onFinish) end end) end diff --git a/lua/app/module/battle/helper/battle_buff_handle.lua b/lua/app/module/battle/helper/battle_buff_handle.lua index fc39f1a4..29eb3d84 100644 --- a/lua/app/module/battle/helper/battle_buff_handle.lua +++ b/lua/app/module/battle/helper/battle_buff_handle.lua @@ -18,7 +18,7 @@ local function _doDotWork(unitComp, buffEffect, buff) else damage = -damage end - unitComp:takeDamageOrCure(buffEffect.sender, buff, damage, EFFECT_TYPE.DOT, hurtStatus) + unitComp:takeDamageOrCure(buffEffect.sender, damage, EFFECT_TYPE.DOT, hurtStatus) end local function _doHotWork(unitComp, buffEffect, buff) @@ -26,7 +26,7 @@ local function _doHotWork(unitComp, buffEffect, buff) if cure < 0 then -- 加血不能是负数 cure = 0 end - unitComp:takeDamageOrCure(buffEffect.sender, buff, cure, EFFECT_TYPE.HOT, hurtStatus) + unitComp:takeDamageOrCure(buffEffect.sender, cure, EFFECT_TYPE.HOT, hurtStatus) end function BattleBuffHandle.doBuffWork(unitComp, buffEffect) @@ -76,7 +76,7 @@ local function _takeEffectDirectHurt(unitComp, buff, target, buffEffect) else damage = -damage end - target:takeDamageOrCure(unitComp, buff, damage, EFFECT_TYPE.DIRECT, hurtStatus) + target:takeDamageOrCure(unitComp, damage, EFFECT_TYPE.DIRECT, hurtStatus) return damage end @@ -89,7 +89,7 @@ local function _takeEffectDirectCure(unitComp, buff, target, buffEffect) if cure < 0 then -- 加血不能是负数 cure = 0 end - target:takeDamageOrCure(unitComp, buff, cure, EFFECT_TYPE.HEAL, hurtStatus) + target:takeDamageOrCure(unitComp, cure, EFFECT_TYPE.HEAL, hurtStatus) return cure end diff --git a/lua/app/module/battle/team/battle_team.lua b/lua/app/module/battle/team/battle_team.lua index 03099306..e959167f 100644 --- a/lua/app/module/battle/team/battle_team.lua +++ b/lua/app/module/battle/team/battle_team.lua @@ -267,6 +267,14 @@ function BattleTeam:stopRunAction() end end +function BattleTeam:recoverHpOnWaveOver(callback) + if self.mainUnit then + self.mainUnit:recoverHpOnWaveOver(callback) + else + callback() + end +end + function BattleTeam:getCentralizedAttack() return self.centralizedAttack end From 9c70bfbfed778480c057abc70ea7d21f1ec25233 Mon Sep 17 00:00:00 2001 From: chenxi Date: Thu, 20 Apr 2023 20:54:29 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/app/config/chapter.lua | 616 +++++++++++----------- lua/app/config/const.lua | 11 +- lua/app/config/hero.lua | 436 +++++++-------- lua/app/config/hero_level.lua | 98 ++-- lua/app/config/item.lua | 6 +- lua/app/config/player_initial.lua | 4 +- lua/app/config/skill.lua | 80 ++- lua/app/config/skill_rogue.lua | 50 +- lua/app/config/strings/cn/skill_rogue.lua | 26 +- lua/app/config/strings/de/skill_rogue.lua | 26 +- lua/app/config/strings/en/skill_rogue.lua | 26 +- lua/app/config/strings/fr/skill_rogue.lua | 26 +- lua/app/config/strings/id/skill_rogue.lua | 26 +- lua/app/config/strings/ja/skill_rogue.lua | 26 +- lua/app/config/strings/ko/skill_rogue.lua | 26 +- lua/app/config/strings/pt/skill_rogue.lua | 26 +- lua/app/config/strings/ru/skill_rogue.lua | 26 +- lua/app/config/strings/th/skill_rogue.lua | 26 +- lua/app/config/strings/vi/skill_rogue.lua | 26 +- lua/app/config/strings/zh/skill_rogue.lua | 26 +- lua/app/config/tutorial.lua | 189 +++++++ lua/app/config/tutorial.lua.meta | 10 + lua/app/config/tutorial_start.lua | 20 + lua/app/config/tutorial_start.lua.meta | 10 + 24 files changed, 1236 insertions(+), 606 deletions(-) create mode 100644 lua/app/config/tutorial.lua create mode 100644 lua/app/config/tutorial.lua.meta create mode 100644 lua/app/config/tutorial_start.lua create mode 100644 lua/app/config/tutorial_start.lua.meta diff --git a/lua/app/config/chapter.lua b/lua/app/config/chapter.lua index 36339ead..5817f146 100644 --- a/lua/app/config/chapter.lua +++ b/lua/app/config/chapter.lua @@ -37,8 +37,8 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=20, - ["num_for_nothing"]="VAg=" + ["num"]=5, + ["num_for_nothing"]="Uw==" } }, ["finish_reward"]={ @@ -47,8 +47,8 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1000, - ["num_for_nothing"]="VwhcAw==" + ["num"]=100, + ["num_for_nothing"]="Vwhc" } }, ["box_num"]={ @@ -58,16 +58,8 @@ local chapter = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=1000, - ["num_for_nothing"]="VwhcAw==" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=12001, - ["id_for_nothing"]="VwpcA2Q=", + ["id"]=4, + ["id_for_nothing"]="Ug==", ["num"]=3, ["num_for_nothing"]="VQ==" } @@ -106,23 +98,39 @@ local chapter = { 1501 }, ["wave_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=4, + ["id_for_nothing"]="Ug==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=25, - ["num_for_nothing"]="VA0=" + ["num"]=6, + ["num_for_nothing"]="UA==" } }, ["finish_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=4, + ["id_for_nothing"]="Ug==", + ["num"]=5, + ["num_for_nothing"]="Uw==" + }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1000, - ["num_for_nothing"]="VwhcAw==" + ["num"]=200, + ["num_for_nothing"]="VAhc" } }, ["box_num"]={ @@ -133,36 +141,28 @@ local chapter = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=2000, - ["num_for_nothing"]="VAhcAw==" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=3, - ["id_for_nothing"]="VQ==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" + ["id"]=4, + ["id_for_nothing"]="Ug==", + ["num"]=5, + ["num_for_nothing"]="Uw==" } }, ["box_reward_2"]={ { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=1001, - ["num_for_nothing"]="VwhcAg==" + ["id"]=4, + ["id_for_nothing"]="Ug==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=32001, - ["id_for_nothing"]="VQpcA2Q=", - ["num"]=5, - ["num_for_nothing"]="Uw==" + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" } } }, @@ -218,8 +218,8 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=30, - ["num_for_nothing"]="VQg=" + ["num"]=15, + ["num_for_nothing"]="Vw0=" } }, ["finish_reward"]={ @@ -228,16 +228,16 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=5, - ["num_for_nothing"]="Uw==" + ["num"]=10, + ["num_for_nothing"]="Vwg=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1000, - ["num_for_nothing"]="VwhcAw==" + ["num"]=500, + ["num_for_nothing"]="Uwhc" } }, ["box_num"]={ @@ -248,28 +248,28 @@ local chapter = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=2000, - ["num_for_nothing"]="VAhcAw==" + ["id"]=4, + ["id_for_nothing"]="Ug==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" } }, ["box_reward_2"]={ { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=1001, - ["num_for_nothing"]="VwhcAg==" + ["id"]=4, + ["id_for_nothing"]="Ug==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=52001, - ["id_for_nothing"]="UwpcA2Q=", - ["num"]=3, - ["num_for_nothing"]="VQ==" + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1000, + ["num_for_nothing"]="VwhcAw==" } } }, @@ -320,8 +320,8 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=35, - ["num_for_nothing"]="VQ0=" + ["num"]=20, + ["num_for_nothing"]="VAg=" } }, ["finish_reward"]={ @@ -330,16 +330,16 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=5, - ["num_for_nothing"]="Uw==" + ["num"]=20, + ["num_for_nothing"]="VAg=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1000, - ["num_for_nothing"]="VwhcAw==" + ["num"]=2000, + ["num_for_nothing"]="VAhcAw==" } }, ["box_num"]={ @@ -351,62 +351,54 @@ local chapter = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=2000, - ["num_for_nothing"]="VAhcAw==" + ["id"]=4, + ["id_for_nothing"]="Ug==", + ["num"]=15, + ["num_for_nothing"]="Vw0=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=4, - ["id_for_nothing"]="Ug==", - ["num"]=5, - ["num_for_nothing"]="Uw==" + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1000, + ["num_for_nothing"]="VwhcAw==" } }, ["box_reward_2"]={ { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=2000, - ["num_for_nothing"]="VAhcAw==" + ["id"]=4, + ["id_for_nothing"]="Ug==", + ["num"]=20, + ["num_for_nothing"]="VAg=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=3, - ["id_for_nothing"]="VQ==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1500, + ["num_for_nothing"]="Vw1cAw==" } }, ["box_reward_3"]={ - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=2000, - ["num_for_nothing"]="VAhcAw==" - }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=5, - ["num_for_nothing"]="Uw==" + ["num"]=40, + ["num_for_nothing"]="Ugg=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=5, - ["id_for_nothing"]="Uw==", - ["num"]=3, - ["num_for_nothing"]="VQ==" + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=5000, + ["num_for_nothing"]="UwhcAw==" } } }, @@ -449,16 +441,16 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=1, - ["num_for_nothing"]="Vw==" + ["num"]=2, + ["num_for_nothing"]="VA==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=20, - ["num_for_nothing"]="VAg=" + ["num"]=30, + ["num_for_nothing"]="VQg=" } }, ["finish_reward"]={ @@ -467,16 +459,16 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=5, - ["num_for_nothing"]="Uw==" + ["num"]=30, + ["num_for_nothing"]="VQg=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1000, - ["num_for_nothing"]="VwhcAw==" + ["num"]=4000, + ["num_for_nothing"]="UghcAw==" } }, ["box_num"]={ @@ -488,54 +480,54 @@ local chapter = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=2000, - ["num_for_nothing"]="VAhcAw==" + ["id"]=4, + ["id_for_nothing"]="Ug==", + ["num"]=20, + ["num_for_nothing"]="VAg=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=4, - ["id_for_nothing"]="Ug==", - ["num"]=5, - ["num_for_nothing"]="Uw==" + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=5000, + ["num_for_nothing"]="UwhcAw==" } }, ["box_reward_2"]={ { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=2000, - ["num_for_nothing"]="VAhcAw==" + ["id"]=4, + ["id_for_nothing"]="Ug==", + ["num"]=40, + ["num_for_nothing"]="Ugg=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=3, - ["id_for_nothing"]="VQ==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=10000, + ["num_for_nothing"]="VwhcA2U=" } }, ["box_reward_3"]={ { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=2000, - ["num_for_nothing"]="VAhcAw==" + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=3, + ["num_for_nothing"]="VQ==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=43001, - ["id_for_nothing"]="UgtcA2Q=", - ["num"]=3, - ["num_for_nothing"]="VQ==" + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=20000, + ["num_for_nothing"]="VAhcA2U=" } } }, @@ -578,16 +570,16 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=1, - ["num_for_nothing"]="Vw==" + ["num"]=2, + ["num_for_nothing"]="VA==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=25, - ["num_for_nothing"]="VA0=" + ["num"]=40, + ["num_for_nothing"]="Ugg=" } }, ["finish_reward"]={ @@ -596,16 +588,16 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=5, - ["num_for_nothing"]="Uw==" + ["num"]=40, + ["num_for_nothing"]="Ugg=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1000, - ["num_for_nothing"]="VwhcAw==" + ["num"]=5000, + ["num_for_nothing"]="UwhcAw==" } }, ["box_num"]={ @@ -617,62 +609,54 @@ local chapter = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=2000, - ["num_for_nothing"]="VAhcAw==" + ["id"]=4, + ["id_for_nothing"]="Ug==", + ["num"]=40, + ["num_for_nothing"]="Ugg=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=4, - ["id_for_nothing"]="Ug==", - ["num"]=5, - ["num_for_nothing"]="Uw==" + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=5000, + ["num_for_nothing"]="UwhcAw==" } }, ["box_reward_2"]={ { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=2000, - ["num_for_nothing"]="VAhcAw==" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=3, - ["id_for_nothing"]="VQ==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" - } - }, - ["box_reward_3"]={ - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=2000, - ["num_for_nothing"]="VAhcAw==" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=4, - ["id_for_nothing"]="Ug==", + ["id"]=5, + ["id_for_nothing"]="Uw==", ["num"]=5, ["num_for_nothing"]="Uw==" }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=10000, + ["num_for_nothing"]="VwhcA2U=" + } + }, + ["box_reward_3"]={ { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=5, ["id_for_nothing"]="Uw==", - ["num"]=3, - ["num_for_nothing"]="VQ==" + ["num"]=5, + ["num_for_nothing"]="Uw==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=25000, + ["num_for_nothing"]="VA1cA2U=" } } }, @@ -715,16 +699,16 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=1, - ["num_for_nothing"]="Vw==" + ["num"]=3, + ["num_for_nothing"]="VQ==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=30, - ["num_for_nothing"]="VQg=" + ["num"]=50, + ["num_for_nothing"]="Uwg=" } }, ["finish_reward"]={ @@ -733,16 +717,16 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=5, - ["num_for_nothing"]="Uw==" + ["num"]=50, + ["num_for_nothing"]="Uwg=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1000, - ["num_for_nothing"]="VwhcAw==" + ["num"]=5000, + ["num_for_nothing"]="UwhcAw==" } }, ["box_num"]={ @@ -754,54 +738,54 @@ local chapter = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=2000, - ["num_for_nothing"]="VAhcAw==" + ["id"]=4, + ["id_for_nothing"]="Ug==", + ["num"]=60, + ["num_for_nothing"]="UAg=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=4, - ["id_for_nothing"]="Ug==", - ["num"]=5, - ["num_for_nothing"]="Uw==" + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=8000, + ["num_for_nothing"]="XghcAw==" } }, ["box_reward_2"]={ { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=2000, - ["num_for_nothing"]="VAhcAw==" + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=5, + ["num_for_nothing"]="Uw==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=3, - ["id_for_nothing"]="VQ==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=12000, + ["num_for_nothing"]="VwpcA2U=" } }, ["box_reward_3"]={ { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=2000, - ["num_for_nothing"]="VAhcAw==" + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=23001, - ["id_for_nothing"]="VAtcA2Q=", - ["num"]=3, - ["num_for_nothing"]="VQ==" + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=30000, + ["num_for_nothing"]="VQhcA2U=" } } }, @@ -844,6 +828,14 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", + ["num"]=3, + ["num_for_nothing"]="VQ==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", ["num"]=1, ["num_for_nothing"]="Vw==" }, @@ -852,8 +844,8 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=35, - ["num_for_nothing"]="VQ0=" + ["num"]=60, + ["num_for_nothing"]="UAg=" } }, ["finish_reward"]={ @@ -862,16 +854,16 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=5, - ["num_for_nothing"]="Uw==" + ["num"]=60, + ["num_for_nothing"]="UAg=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1000, - ["num_for_nothing"]="VwhcAw==" + ["num"]=5000, + ["num_for_nothing"]="UwhcAw==" } }, ["box_num"]={ @@ -883,62 +875,54 @@ local chapter = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=2000, - ["num_for_nothing"]="VAhcAw==" + ["id"]=4, + ["id_for_nothing"]="Ug==", + ["num"]=100, + ["num_for_nothing"]="Vwhc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=4, - ["id_for_nothing"]="Ug==", - ["num"]=5, - ["num_for_nothing"]="Uw==" + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=10000, + ["num_for_nothing"]="VwhcA2U=" } }, ["box_reward_2"]={ { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=2000, - ["num_for_nothing"]="VAhcAw==" + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=3, - ["id_for_nothing"]="VQ==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=15000, + ["num_for_nothing"]="Vw1cA2U=" } }, ["box_reward_3"]={ - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=2000, - ["num_for_nothing"]="VAhcAw==" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=4, - ["id_for_nothing"]="Ug==", - ["num"]=5, - ["num_for_nothing"]="Uw==" - }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=5, ["id_for_nothing"]="Uw==", - ["num"]=3, - ["num_for_nothing"]="VQ==" + ["num"]=10, + ["num_for_nothing"]="Vwg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=40000, + ["num_for_nothing"]="UghcA2U=" } } }, @@ -981,6 +965,14 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", + ["num"]=3, + ["num_for_nothing"]="VQ==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", ["num"]=1, ["num_for_nothing"]="Vw==" }, @@ -989,8 +981,8 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=20, - ["num_for_nothing"]="VAg=" + ["num"]=80, + ["num_for_nothing"]="Xgg=" } }, ["finish_reward"]={ @@ -999,16 +991,16 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=5, - ["num_for_nothing"]="Uw==" + ["num"]=80, + ["num_for_nothing"]="Xgg=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1000, - ["num_for_nothing"]="VwhcAw==" + ["num"]=5000, + ["num_for_nothing"]="UwhcAw==" } }, ["box_num"]={ @@ -1020,54 +1012,54 @@ local chapter = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=2000, - ["num_for_nothing"]="VAhcAw==" + ["id"]=4, + ["id_for_nothing"]="Ug==", + ["num"]=150, + ["num_for_nothing"]="Vw1c" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=4, - ["id_for_nothing"]="Ug==", - ["num"]=5, - ["num_for_nothing"]="Uw==" + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=15000, + ["num_for_nothing"]="Vw1cA2U=" } }, ["box_reward_2"]={ { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=2000, - ["num_for_nothing"]="VAhcAw==" + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=15, + ["num_for_nothing"]="Vw0=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=3, - ["id_for_nothing"]="VQ==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=20000, + ["num_for_nothing"]="VAhcA2U=" } }, ["box_reward_3"]={ { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=2000, - ["num_for_nothing"]="VAhcAw==" + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=15, + ["num_for_nothing"]="Vw0=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=33001, - ["id_for_nothing"]="VQtcA2Q=", - ["num"]=3, - ["num_for_nothing"]="VQ==" + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=50000, + ["num_for_nothing"]="UwhcA2U=" } } }, @@ -1109,6 +1101,14 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", + ["num"]=3, + ["num_for_nothing"]="VQ==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", ["num"]=1, ["num_for_nothing"]="Vw==" }, @@ -1117,8 +1117,8 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=25, - ["num_for_nothing"]="VA0=" + ["num"]=100, + ["num_for_nothing"]="Vwhc" } }, ["finish_reward"]={ @@ -1127,16 +1127,16 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=5, - ["num_for_nothing"]="Uw==" + ["num"]=100, + ["num_for_nothing"]="Vwhc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1000, - ["num_for_nothing"]="VwhcAw==" + ["num"]=5000, + ["num_for_nothing"]="UwhcAw==" } }, ["box_num"]={ @@ -1148,62 +1148,54 @@ local chapter = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=2000, - ["num_for_nothing"]="VAhcAw==" + ["id"]=4, + ["id_for_nothing"]="Ug==", + ["num"]=200, + ["num_for_nothing"]="VAhc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=4, - ["id_for_nothing"]="Ug==", - ["num"]=5, - ["num_for_nothing"]="Uw==" + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=20000, + ["num_for_nothing"]="VAhcA2U=" } }, ["box_reward_2"]={ { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=2000, - ["num_for_nothing"]="VAhcAw==" + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=15, + ["num_for_nothing"]="Vw0=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=3, - ["id_for_nothing"]="VQ==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=30000, + ["num_for_nothing"]="VQhcA2U=" } }, ["box_reward_3"]={ - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=2000, - ["num_for_nothing"]="VAhcAw==" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=4, - ["id_for_nothing"]="Ug==", - ["num"]=5, - ["num_for_nothing"]="Uw==" - }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=5, ["id_for_nothing"]="Uw==", - ["num"]=3, - ["num_for_nothing"]="VQ==" + ["num"]=20, + ["num_for_nothing"]="VAg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=60000, + ["num_for_nothing"]="UAhcA2U=" } } } diff --git a/lua/app/config/const.lua b/lua/app/config/const.lua index 2982578a..e48a6c93 100644 --- a/lua/app/config/const.lua +++ b/lua/app/config/const.lua @@ -7,9 +7,18 @@ local const = { }, ["chapter_cost"]={ ["value"]=10 + }, + ["shake_level_1"]={ + ["value"]=10 + }, + ["shake_level_2"]={ + ["value"]=20 + }, + ["shake_level_3"]={ + ["value"]=60 } } local config = { -data=const,count=3 +data=const,count=6 } return config \ No newline at end of file diff --git a/lua/app/config/hero.lua b/lua/app/config/hero.lua index eb872f0e..4e6aebb1 100644 --- a/lua/app/config/hero.lua +++ b/lua/app/config/hero.lua @@ -6,43 +6,44 @@ local hero = { ["hurt_num"]=3, ["base_skill"]=120011, ["support_skill"]=120010, + ["rouge_skill"]=200500, ["rouge_skill_1"]=200501, ["rouge_skill_2"]=200502, ["rouge_skill_3"]=200503, ["begin_lv"]=1, ["hp"]={ 2000000, - 2100000, - 2200000, - 2300000, - 2400000, - 2500000, - 2600000, - 2700000, - 2800000, - 2900000, + 2240000, + 2480000, + 2740000, 3000000, - 3100000, - 3200000, - 3300000, - 3400000 + 3280000, + 3580000, + 3900000, + 4260000, + 4660000, + 5100000, + 5580000, + 6120000, + 6720000, + 7400000 }, ["atk"]={ 1000000, - 1100000, - 1200000, - 1300000, - 1400000, + 1120000, + 1240000, + 1370000, 1500000, - 1600000, - 1700000, - 1800000, - 1900000, - 2000000, - 2100000, - 2200000, - 2300000, - 2400000 + 1640000, + 1790000, + 1950000, + 2130000, + 2330000, + 2550000, + 2790000, + 3060000, + 3360000, + 3700000 }, ["model_id"]="p0005", ["icon"]="5", @@ -56,43 +57,44 @@ local hero = { ["hurt_num"]=3, ["base_skill"]=220011, ["support_skill"]=220010, + ["rouge_skill"]=200200, ["rouge_skill_1"]=200201, ["rouge_skill_2"]=200202, ["rouge_skill_3"]=200203, ["begin_lv"]=1, ["hp"]={ 2000000, - 2100000, - 2200000, - 2300000, - 2400000, - 2500000, - 2600000, - 2700000, - 2800000, - 2900000, + 2240000, + 2480000, + 2740000, 3000000, - 3100000, - 3200000, - 3300000, - 3400000 + 3280000, + 3580000, + 3900000, + 4260000, + 4660000, + 5100000, + 5580000, + 6120000, + 6720000, + 7400000 }, ["atk"]={ 1000000, - 1100000, - 1200000, - 1300000, - 1400000, + 1120000, + 1240000, + 1370000, 1500000, - 1600000, - 1700000, - 1800000, - 1900000, - 2000000, - 2100000, - 2200000, - 2300000, - 2400000 + 1640000, + 1790000, + 1950000, + 2130000, + 2330000, + 2550000, + 2790000, + 3060000, + 3360000, + 3700000 }, ["model_id"]="p0002", ["icon"]="2", @@ -106,43 +108,44 @@ local hero = { ["hurt_num"]=3, ["base_skill"]=230011, ["support_skill"]=230010, + ["rouge_skill"]=200700, ["rouge_skill_1"]=200701, ["rouge_skill_2"]=200702, ["rouge_skill_3"]=200703, ["begin_lv"]=3, ["hp"]={ - 2000000, - 2100000, - 2200000, - 2300000, - 2400000, - 2500000, - 2600000, - 2700000, - 2800000, - 2900000, 3000000, - 3100000, - 3200000, - 3300000, - 3400000 + 3320000, + 3640000, + 3980000, + 4320000, + 4680000, + 5080000, + 5500000, + 5960000, + 6480000, + 7060000, + 7680000, + 8380000, + 9160000, + 10040000 }, ["atk"]={ - 1000000, - 1100000, - 1200000, - 1300000, - 1400000, 1500000, - 1600000, - 1700000, - 1800000, - 1900000, - 2000000, - 2100000, - 2200000, - 2300000, - 2400000 + 1660000, + 1820000, + 1990000, + 2160000, + 2340000, + 2540000, + 2750000, + 2980000, + 3240000, + 3530000, + 3840000, + 4190000, + 4580000, + 5020000 }, ["model_id"]="p0007", ["icon"]="7", @@ -156,43 +159,44 @@ local hero = { ["hurt_num"]=3, ["base_skill"]=320011, ["support_skill"]=320010, + ["rouge_skill"]=200100, ["rouge_skill_1"]=200101, ["rouge_skill_2"]=200102, ["rouge_skill_3"]=200103, ["begin_lv"]=1, ["hp"]={ 2000000, - 2100000, - 2200000, - 2300000, - 2400000, - 2500000, - 2600000, - 2700000, - 2800000, - 2900000, + 2240000, + 2480000, + 2740000, 3000000, - 3100000, - 3200000, - 3300000, - 3400000 + 3280000, + 3580000, + 3900000, + 4260000, + 4660000, + 5100000, + 5580000, + 6120000, + 6720000, + 7400000 }, ["atk"]={ 1000000, - 1100000, - 1200000, - 1300000, - 1400000, + 1120000, + 1240000, + 1370000, 1500000, - 1600000, - 1700000, - 1800000, - 1900000, - 2000000, - 2100000, - 2200000, - 2300000, - 2400000 + 1640000, + 1790000, + 1950000, + 2130000, + 2330000, + 2550000, + 2790000, + 3060000, + 3360000, + 3700000 }, ["model_id"]="p0001", ["icon"]="1", @@ -206,43 +210,44 @@ local hero = { ["hurt_num"]=3, ["base_skill"]=330011, ["support_skill"]=330010, + ["rouge_skill"]=200600, ["rouge_skill_1"]=200601, ["rouge_skill_2"]=200602, ["rouge_skill_3"]=200603, ["begin_lv"]=3, ["hp"]={ - 2000000, - 2100000, - 2200000, - 2300000, - 2400000, - 2500000, - 2600000, - 2700000, - 2800000, - 2900000, 3000000, - 3100000, - 3200000, - 3300000, - 3400000 + 3320000, + 3640000, + 3980000, + 4320000, + 4680000, + 5080000, + 5500000, + 5960000, + 6480000, + 7060000, + 7680000, + 8380000, + 9160000, + 10040000 }, ["atk"]={ - 1000000, - 1100000, - 1200000, - 1300000, - 1400000, 1500000, - 1600000, - 1700000, - 1800000, - 1900000, - 2000000, - 2100000, - 2200000, - 2300000, - 2400000 + 1660000, + 1820000, + 1990000, + 2160000, + 2340000, + 2540000, + 2750000, + 2980000, + 3240000, + 3530000, + 3840000, + 4190000, + 4580000, + 5020000 }, ["model_id"]="p0006", ["icon"]="6", @@ -256,43 +261,44 @@ local hero = { ["hurt_num"]=3, ["base_skill"]=420011, ["support_skill"]=420010, + ["rouge_skill"]=200300, ["rouge_skill_1"]=200301, ["rouge_skill_2"]=200302, ["rouge_skill_3"]=200303, ["begin_lv"]=1, ["hp"]={ 2000000, - 2100000, - 2200000, - 2300000, - 2400000, - 2500000, - 2600000, - 2700000, - 2800000, - 2900000, + 2240000, + 2480000, + 2740000, 3000000, - 3100000, - 3200000, - 3300000, - 3400000 + 3280000, + 3580000, + 3900000, + 4260000, + 4660000, + 5100000, + 5580000, + 6120000, + 6720000, + 7400000 }, ["atk"]={ 1000000, - 1100000, - 1200000, - 1300000, - 1400000, + 1120000, + 1240000, + 1370000, 1500000, - 1600000, - 1700000, - 1800000, - 1900000, - 2000000, - 2100000, - 2200000, - 2300000, - 2400000 + 1640000, + 1790000, + 1950000, + 2130000, + 2330000, + 2550000, + 2790000, + 3060000, + 3360000, + 3700000 }, ["model_id"]="p0003", ["icon"]="3", @@ -306,43 +312,44 @@ local hero = { ["hurt_num"]=3, ["base_skill"]=430011, ["support_skill"]=430010, + ["rouge_skill"]=200800, ["rouge_skill_1"]=200801, ["rouge_skill_2"]=200802, ["rouge_skill_3"]=200803, ["begin_lv"]=3, ["hp"]={ - 2000000, - 2100000, - 2200000, - 2300000, - 2400000, - 2500000, - 2600000, - 2700000, - 2800000, - 2900000, 3000000, - 3100000, - 3200000, - 3300000, - 3400000 + 3320000, + 3640000, + 3980000, + 4320000, + 4680000, + 5080000, + 5500000, + 5960000, + 6480000, + 7060000, + 7680000, + 8380000, + 9160000, + 10040000 }, ["atk"]={ - 1000000, - 1100000, - 1200000, - 1300000, - 1400000, 1500000, - 1600000, - 1700000, - 1800000, - 1900000, - 2000000, - 2100000, - 2200000, - 2300000, - 2400000 + 1660000, + 1820000, + 1990000, + 2160000, + 2340000, + 2540000, + 2750000, + 2980000, + 3240000, + 3530000, + 3840000, + 4190000, + 4580000, + 5020000 }, ["model_id"]="p0008", ["icon"]="8", @@ -356,43 +363,44 @@ local hero = { ["hurt_num"]=3, ["base_skill"]=520011, ["support_skill"]=520010, + ["rouge_skill"]=200400, ["rouge_skill_1"]=200401, ["rouge_skill_2"]=200402, ["rouge_skill_3"]=200403, ["begin_lv"]=1, ["hp"]={ 2000000, - 2100000, - 2200000, - 2300000, - 2400000, - 2500000, - 2600000, - 2700000, - 2800000, - 2900000, + 2240000, + 2480000, + 2740000, 3000000, - 3100000, - 3200000, - 3300000, - 3400000 + 3280000, + 3580000, + 3900000, + 4260000, + 4660000, + 5100000, + 5580000, + 6120000, + 6720000, + 7400000 }, ["atk"]={ 1000000, - 1100000, - 1200000, - 1300000, - 1400000, + 1120000, + 1240000, + 1370000, 1500000, - 1600000, - 1700000, - 1800000, - 1900000, - 2000000, - 2100000, - 2200000, - 2300000, - 2400000 + 1640000, + 1790000, + 1950000, + 2130000, + 2330000, + 2550000, + 2790000, + 3060000, + 3360000, + 3700000 }, ["model_id"]="p0004", ["icon"]="4", diff --git a/lua/app/config/hero_level.lua b/lua/app/config/hero_level.lua index 1007be71..0a064b19 100644 --- a/lua/app/config/hero_level.lua +++ b/lua/app/config/hero_level.lua @@ -9,14 +9,14 @@ local hero_level = { [2]={ ["cost_2"]={ 5, - 100 + 50 }, ["unlock_skill"]=1 }, [3]={ ["cost_2"]={ 10, - 250 + 100 }, ["cost_3"]={ 3, @@ -27,11 +27,11 @@ local hero_level = { [4]={ ["cost_2"]={ 25, - 500 + 200 }, ["cost_3"]={ 5, - 500 + 300 }, ["unlock_skill"]=2 }, @@ -42,161 +42,161 @@ local hero_level = { }, ["cost_3"]={ 10, - 500 + 1500 }, ["cost_4"]={ 3, - 500 + 0 }, ["unlock_skill"]=2 }, [6]={ ["cost_2"]={ 100, - 1000 + 5000 }, ["cost_3"]={ 25, - 500 + 7000 }, ["cost_4"]={ 5, - 500 + 10000 }, ["unlock_skill"]=2 }, [7]={ ["cost_2"]={ - 200, + 250, 10000 }, ["cost_3"]={ 50, - 10000 + 15000 }, ["cost_4"]={ 10, - 500 + 20000 }, ["unlock_skill"]=2 }, [8]={ ["cost_2"]={ 500, - 10000 + 15000 }, ["cost_3"]={ 100, - 10000 + 24000 }, ["cost_4"]={ 20, - 10000 + 30000 }, ["unlock_skill"]=3 }, [9]={ ["cost_2"]={ 1000, - 10000 + 20000 }, ["cost_3"]={ - 200, - 10000 + 250, + 30000 }, ["cost_4"]={ - 40, - 10000 + 25, + 40000 }, ["unlock_skill"]=3 }, [10]={ ["cost_2"]={ 1500, - 10000 + 30000 }, ["cost_3"]={ - 400, - 10000 + 500, + 45000 }, ["cost_4"]={ - 80, - 10000 + 50, + 60000 }, ["unlock_skill"]=3 }, [11]={ ["cost_2"]={ 2000, - 10000 + 40000 }, ["cost_3"]={ 1000, - 10000 + 60000 }, ["cost_4"]={ - 160, - 10000 + 100, + 80000 }, ["unlock_skill"]=3 }, [12]={ ["cost_2"]={ 2500, - 10000 + 50000 }, ["cost_3"]={ 1500, - 10000 + 75000 }, ["cost_4"]={ - 320, - 10000 + 150, + 100000 }, ["unlock_skill"]=3 }, [13]={ ["cost_2"]={ 3000, - 10000 + 75000 }, ["cost_3"]={ 2000, - 10000 + 110000 }, ["cost_4"]={ - 640, - 10000 + 200, + 150000 }, ["unlock_skill"]=3 }, [14]={ ["cost_2"]={ - 4000, - 10000 + 3500, + 100000 }, ["cost_3"]={ - 3000, - 10000 + 2500, + 150000 }, ["cost_4"]={ - 1000, - 10000 + 300, + 200000 }, ["unlock_skill"]=3 }, [15]={ ["cost_2"]={ - 5000, - 10000 + 4000, + 150000 }, ["cost_3"]={ - 4000, - 10000 + 3000, + 240000 }, ["cost_4"]={ - 1500, - 10000 + 400, + 300000 }, ["unlock_skill"]=3 } diff --git a/lua/app/config/item.lua b/lua/app/config/item.lua index e988e07c..35200181 100644 --- a/lua/app/config/item.lua +++ b/lua/app/config/item.lua @@ -1,17 +1,17 @@ local item = { [1]={ ["type"]=1, - ["qlt"]=0, + ["qlt"]=5, ["icon"]="1" }, [2]={ ["type"]=1, - ["qlt"]=0, + ["qlt"]=5, ["icon"]="2" }, [3]={ ["type"]=1, - ["qlt"]=0, + ["qlt"]=5, ["icon"]="3" }, [4]={ diff --git a/lua/app/config/player_initial.lua b/lua/app/config/player_initial.lua index 37ed855a..0052c937 100644 --- a/lua/app/config/player_initial.lua +++ b/lua/app/config/player_initial.lua @@ -5,8 +5,8 @@ local player_initial = { ["type_for_nothing"]="Vw==", ["id"]=3, ["id_for_nothing"]="VQ==", - ["num"]=30, - ["num_for_nothing"]="VQg=" + ["num"]=60, + ["num_for_nothing"]="UAg=" } }, [2]={ diff --git a/lua/app/config/skill.lua b/lua/app/config/skill.lua index d69b95be..ce44ec0a 100644 --- a/lua/app/config/skill.lua +++ b/lua/app/config/skill.lua @@ -12,7 +12,9 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1 + ["skill_position"]=1, + ["shake_time"]=100, + ["shake_type"]=1 }, [2]={ ["position"]=2, @@ -27,7 +29,9 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1 + ["skill_position"]=1, + ["shake_time"]=100, + ["shake_type"]=1 }, [3]={ ["position"]=3, @@ -42,7 +46,9 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1 + ["skill_position"]=1, + ["shake_time"]=100, + ["shake_type"]=1 }, [4]={ ["position"]=4, @@ -57,7 +63,9 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1 + ["skill_position"]=1, + ["shake_time"]=100, + ["shake_type"]=1 }, [5]={ ["position"]=5, @@ -72,7 +80,9 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1 + ["skill_position"]=1, + ["shake_time"]=100, + ["shake_type"]=1 }, [6]={ ["position"]=1, @@ -87,7 +97,9 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2 + ["skill_position"]=2, + ["shake_time"]=100, + ["shake_type"]=1 }, [7]={ ["position"]=2, @@ -102,7 +114,9 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2 + ["skill_position"]=2, + ["shake_time"]=100, + ["shake_type"]=1 }, [8]={ ["position"]=3, @@ -117,7 +131,9 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2 + ["skill_position"]=2, + ["shake_time"]=100, + ["shake_type"]=1 }, [9]={ ["position"]=4, @@ -132,7 +148,9 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2 + ["skill_position"]=2, + ["shake_time"]=100, + ["shake_type"]=1 }, [10]={ ["position"]=5, @@ -147,7 +165,9 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2 + ["skill_position"]=2, + ["shake_time"]=100, + ["shake_type"]=1 }, [11]={ ["effect_type"]=2, @@ -220,6 +240,8 @@ local skill = { } }, ["skill_position"]=2, + ["shake_time"]=100, + ["shake_type"]=1, ["name_act"]="support01" }, [320011]={ @@ -254,6 +276,8 @@ local skill = { } }, ["skill_position"]=2, + ["shake_time"]=100, + ["shake_type"]=1, ["name_act"]="support01" }, [220011]={ @@ -275,6 +299,8 @@ local skill = { }, ["obj"]=2, ["skill_position"]=1, + ["shake_time"]=100, + ["shake_type"]=4, ["name_act"]="skill01" }, [220012]={ @@ -316,6 +342,8 @@ local skill = { } }, ["skill_position"]=1, + ["shake_time"]=100, + ["shake_type"]=4, ["name_act"]="skill01" }, [420010]={ @@ -331,6 +359,8 @@ local skill = { } }, ["skill_position"]=2, + ["shake_time"]=100, + ["shake_type"]=1, ["name_act"]="support01" }, [420011]={ @@ -361,6 +391,8 @@ local skill = { } }, ["skill_position"]=2, + ["shake_time"]=100, + ["shake_type"]=1, ["name_act"]="support01" }, [520011]={ @@ -397,6 +429,8 @@ local skill = { } }, ["skill_position"]=2, + ["shake_time"]=100, + ["shake_type"]=1, ["name_act"]="support01" }, [120011]={ @@ -431,6 +465,8 @@ local skill = { } }, ["skill_position"]=2, + ["shake_time"]=100, + ["shake_type"]=1, ["name_act"]="support01" }, [330011]={ @@ -467,6 +503,8 @@ local skill = { } }, ["skill_position"]=2, + ["shake_time"]=100, + ["shake_type"]=1, ["name_act"]="support01" }, [230011]={ @@ -600,6 +638,8 @@ local skill = { } }, ["skill_position"]=2, + ["shake_time"]=100, + ["shake_type"]=1, ["name_act"]="support01" }, [430011]={ @@ -626,6 +666,8 @@ local skill = { } }, ["skill_position"]=1, + ["shake_time"]=100, + ["shake_type"]=3, ["name_act"]="skill01" }, [430012]={ @@ -670,6 +712,8 @@ local skill = { } }, ["skill_position"]=1, + ["shake_time"]=100, + ["shake_type"]=3, ["name_act"]="skill01" }, [1000000]={ @@ -684,7 +728,9 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2 + ["skill_position"]=2, + ["shake_time"]=100, + ["shake_type"]=1 }, [1000001]={ ["effect_type"]=1, @@ -698,7 +744,9 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2 + ["skill_position"]=2, + ["shake_time"]=100, + ["shake_type"]=1 }, [1000002]={ ["effect_type"]=1, @@ -732,6 +780,8 @@ local skill = { ["skill_position"]=2, ["cd"]=4, ["cd_start"]=4, + ["shake_time"]=100, + ["shake_type"]=4, ["name_act"]="skill01" }, [1000004]={ @@ -785,6 +835,8 @@ local skill = { ["skill_position"]=2, ["cd"]=3, ["cd_start"]=3, + ["shake_time"]=100, + ["shake_type"]=4, ["name_act"]="skill01" }, [1000007]={ @@ -860,6 +912,8 @@ local skill = { ["skill_position"]=2, ["cd"]=2, ["cd_start"]=2, + ["shake_time"]=100, + ["shake_type"]=3, ["name_act"]="skill01" }, [1000012]={ @@ -1073,6 +1127,8 @@ local skill = { ["skill_position"]=2, ["cd"]=2, ["cd_start"]=2, + ["shake_time"]=100, + ["shake_type"]=3, ["name_act"]="skill01" }, [1000027]={ diff --git a/lua/app/config/skill_rogue.lua b/lua/app/config/skill_rogue.lua index e3473a5f..358f9bc2 100644 --- a/lua/app/config/skill_rogue.lua +++ b/lua/app/config/skill_rogue.lua @@ -650,6 +650,12 @@ local skill_rogue = { }, ["icon"]="29" }, + [200100]={ + ["limit_times"]=1, + ["weight"]=4000, + ["type"]=6, + ["skill_position"]=3 + }, [200101]={ ["limit_times"]=1, ["weight"]=2000, @@ -702,6 +708,12 @@ local skill_rogue = { ["obj"]=2, ["icon"]="33" }, + [200200]={ + ["limit_times"]=1, + ["weight"]=4000, + ["type"]=6, + ["skill_position"]=2 + }, [200201]={ ["limit_times"]=1, ["weight"]=2000, @@ -753,6 +765,12 @@ local skill_rogue = { ["obj"]=1, ["icon"]="36" }, + [200300]={ + ["limit_times"]=1, + ["weight"]=4000, + ["type"]=6, + ["skill_position"]=4 + }, [200301]={ ["limit_times"]=1, ["weight"]=2000, @@ -792,6 +810,12 @@ local skill_rogue = { }, ["icon"]="39" }, + [200400]={ + ["limit_times"]=1, + ["weight"]=4000, + ["type"]=6, + ["skill_position"]=5 + }, [200401]={ ["limit_times"]=1, ["weight"]=2000, @@ -824,6 +848,12 @@ local skill_rogue = { ["skill_position"]=5, ["icon"]="42" }, + [200500]={ + ["limit_times"]=1, + ["weight"]=4000, + ["type"]=6, + ["skill_position"]=1 + }, [200501]={ ["limit_times"]=1, ["weight"]=2000, @@ -876,6 +906,12 @@ local skill_rogue = { ["obj"]=1, ["icon"]="45" }, + [200600]={ + ["limit_times"]=1, + ["weight"]=4000, + ["type"]=6, + ["skill_position"]=3 + }, [200601]={ ["limit_times"]=1, ["weight"]=2000, @@ -918,6 +954,12 @@ local skill_rogue = { ["obj"]=1, ["icon"]="48" }, + [200700]={ + ["limit_times"]=1, + ["weight"]=4000, + ["type"]=6, + ["skill_position"]=2 + }, [200701]={ ["limit_times"]=1, ["weight"]=2000, @@ -957,6 +999,12 @@ local skill_rogue = { ["skill_position"]=2, ["icon"]="51" }, + [200800]={ + ["limit_times"]=1, + ["weight"]=4000, + ["type"]=6, + ["skill_position"]=4 + }, [200801]={ ["limit_times"]=1, ["weight"]=2000, @@ -999,6 +1047,6 @@ local skill_rogue = { } } local config = { -data=skill_rogue,count=68 +data=skill_rogue,count=76 } return config \ No newline at end of file diff --git a/lua/app/config/strings/cn/skill_rogue.lua b/lua/app/config/strings/cn/skill_rogue.lua index c6c34daf..7d9c92e0 100644 --- a/lua/app/config/strings/cn/skill_rogue.lua +++ b/lua/app/config/strings/cn/skill_rogue.lua @@ -131,6 +131,9 @@ local skill_rogue = { [44]={ ["desc"]="将场上随机5个非紫色元素变为紫色" }, + [200100]={ + ["desc"]="长枪突刺：将上下2格元素进行消除" + }, [200101]={ ["desc"]="长枪突刺可上下多消1格" }, @@ -140,6 +143,9 @@ local skill_rogue = { [200103]={ ["desc"]="连接长枪突刺每次攻击有10%概率眩晕对手1回合。" }, + [200200]={ + ["desc"]="拔刀斩：卡拉可造成大量伤害" + }, [200201]={ ["desc"]="拔刀斩被连接时其上下左右4个元素变为金色元素" }, @@ -149,6 +155,9 @@ local skill_rogue = { [200203]={ ["desc"]="拔刀斩终结技可放2次" }, + [200300]={ + ["desc"]="元素链接：随机额外消除2个元素" + }, [200301]={ ["desc"]="元素链接可与任何颜色链接" }, @@ -158,6 +167,9 @@ local skill_rogue = { [200303]={ ["desc"]="元素链接随机消除元素增加2个" }, + [200400]={ + ["desc"]="魔法罩：艾伦可生成一个魔法罩持续1回合" + }, [200401]={ ["desc"]="魔法罩可与任何颜色链接" }, @@ -167,6 +179,9 @@ local skill_rogue = { [200403]={ ["desc"]="生成的魔法罩如果没有破可以额外持续1回合" }, + [200500]={ + ["desc"]="舞步消散：将左右2格元素进行消除" + }, [200501]={ ["desc"]="舞步消散左右可多消1格" }, @@ -176,6 +191,9 @@ local skill_rogue = { [200503]={ ["desc"]="每有1个元素连接舞步消散则本回合格挡增加2%" }, + [200600]={ + ["desc"]="快速治愈：莉莉丝可恢复20%生命值" + }, [200601]={ ["desc"]="快速治愈可与任何元素连接" }, @@ -185,6 +203,9 @@ local skill_rogue = { [200603]={ ["desc"]="连接快速治愈的每一击都将恢复2%生命值" }, + [200700]={ + ["desc"]="巨剑连斩：每一次攻击的伤害将增加50%" + }, [200701]={ ["desc"]="疾风骤雨被连接时其上下左右4个元素变为金色元素" }, @@ -194,6 +215,9 @@ local skill_rogue = { [200703]={ ["desc"]="疾风骤雨被连接时周围8格元素变为金色元素" }, + [200800]={ + ["desc"]="霜冻剑舞：白发凯瑟琳可额外造成1次伤害并给敌人1回合冰霜效果（普攻次数-1）" + }, [200801]={ ["desc"]="霜冻剑舞被使用时可消除掉其上下左右4个元素" }, @@ -205,6 +229,6 @@ local skill_rogue = { } } local config = { -data=skill_rogue,count=68 +data=skill_rogue,count=76 } return config \ No newline at end of file diff --git a/lua/app/config/strings/de/skill_rogue.lua b/lua/app/config/strings/de/skill_rogue.lua index 1981a410..1edf592a 100644 --- a/lua/app/config/strings/de/skill_rogue.lua +++ b/lua/app/config/strings/de/skill_rogue.lua @@ -130,6 +130,9 @@ local skill_rogue = { }, [44]={ + }, + [200100]={ + }, [200101]={ @@ -139,6 +142,9 @@ local skill_rogue = { }, [200103]={ + }, + [200200]={ + }, [200201]={ @@ -148,6 +154,9 @@ local skill_rogue = { }, [200203]={ + }, + [200300]={ + }, [200301]={ @@ -157,6 +166,9 @@ local skill_rogue = { }, [200303]={ + }, + [200400]={ + }, [200401]={ @@ -166,6 +178,9 @@ local skill_rogue = { }, [200403]={ + }, + [200500]={ + }, [200501]={ @@ -175,6 +190,9 @@ local skill_rogue = { }, [200503]={ + }, + [200600]={ + }, [200601]={ @@ -184,6 +202,9 @@ local skill_rogue = { }, [200603]={ + }, + [200700]={ + }, [200701]={ @@ -193,6 +214,9 @@ local skill_rogue = { }, [200703]={ + }, + [200800]={ + }, [200801]={ @@ -205,6 +229,6 @@ local skill_rogue = { } } local config = { -data=skill_rogue,count=68 +data=skill_rogue,count=76 } return config \ No newline at end of file diff --git a/lua/app/config/strings/en/skill_rogue.lua b/lua/app/config/strings/en/skill_rogue.lua index 1981a410..1edf592a 100644 --- a/lua/app/config/strings/en/skill_rogue.lua +++ b/lua/app/config/strings/en/skill_rogue.lua @@ -130,6 +130,9 @@ local skill_rogue = { }, [44]={ + }, + [200100]={ + }, [200101]={ @@ -139,6 +142,9 @@ local skill_rogue = { }, [200103]={ + }, + [200200]={ + }, [200201]={ @@ -148,6 +154,9 @@ local skill_rogue = { }, [200203]={ + }, + [200300]={ + }, [200301]={ @@ -157,6 +166,9 @@ local skill_rogue = { }, [200303]={ + }, + [200400]={ + }, [200401]={ @@ -166,6 +178,9 @@ local skill_rogue = { }, [200403]={ + }, + [200500]={ + }, [200501]={ @@ -175,6 +190,9 @@ local skill_rogue = { }, [200503]={ + }, + [200600]={ + }, [200601]={ @@ -184,6 +202,9 @@ local skill_rogue = { }, [200603]={ + }, + [200700]={ + }, [200701]={ @@ -193,6 +214,9 @@ local skill_rogue = { }, [200703]={ + }, + [200800]={ + }, [200801]={ @@ -205,6 +229,6 @@ local skill_rogue = { } } local config = { -data=skill_rogue,count=68 +data=skill_rogue,count=76 } return config \ No newline at end of file diff --git a/lua/app/config/strings/fr/skill_rogue.lua b/lua/app/config/strings/fr/skill_rogue.lua index 1981a410..1edf592a 100644 --- a/lua/app/config/strings/fr/skill_rogue.lua +++ b/lua/app/config/strings/fr/skill_rogue.lua @@ -130,6 +130,9 @@ local skill_rogue = { }, [44]={ + }, + [200100]={ + }, [200101]={ @@ -139,6 +142,9 @@ local skill_rogue = { }, [200103]={ + }, + [200200]={ + }, [200201]={ @@ -148,6 +154,9 @@ local skill_rogue = { }, [200203]={ + }, + [200300]={ + }, [200301]={ @@ -157,6 +166,9 @@ local skill_rogue = { }, [200303]={ + }, + [200400]={ + }, [200401]={ @@ -166,6 +178,9 @@ local skill_rogue = { }, [200403]={ + }, + [200500]={ + }, [200501]={ @@ -175,6 +190,9 @@ local skill_rogue = { }, [200503]={ + }, + [200600]={ + }, [200601]={ @@ -184,6 +202,9 @@ local skill_rogue = { }, [200603]={ + }, + [200700]={ + }, [200701]={ @@ -193,6 +214,9 @@ local skill_rogue = { }, [200703]={ + }, + [200800]={ + }, [200801]={ @@ -205,6 +229,6 @@ local skill_rogue = { } } local config = { -data=skill_rogue,count=68 +data=skill_rogue,count=76 } return config \ No newline at end of file diff --git a/lua/app/config/strings/id/skill_rogue.lua b/lua/app/config/strings/id/skill_rogue.lua index 1981a410..1edf592a 100644 --- a/lua/app/config/strings/id/skill_rogue.lua +++ b/lua/app/config/strings/id/skill_rogue.lua @@ -130,6 +130,9 @@ local skill_rogue = { }, [44]={ + }, + [200100]={ + }, [200101]={ @@ -139,6 +142,9 @@ local skill_rogue = { }, [200103]={ + }, + [200200]={ + }, [200201]={ @@ -148,6 +154,9 @@ local skill_rogue = { }, [200203]={ + }, + [200300]={ + }, [200301]={ @@ -157,6 +166,9 @@ local skill_rogue = { }, [200303]={ + }, + [200400]={ + }, [200401]={ @@ -166,6 +178,9 @@ local skill_rogue = { }, [200403]={ + }, + [200500]={ + }, [200501]={ @@ -175,6 +190,9 @@ local skill_rogue = { }, [200503]={ + }, + [200600]={ + }, [200601]={ @@ -184,6 +202,9 @@ local skill_rogue = { }, [200603]={ + }, + [200700]={ + }, [200701]={ @@ -193,6 +214,9 @@ local skill_rogue = { }, [200703]={ + }, + [200800]={ + }, [200801]={ @@ -205,6 +229,6 @@ local skill_rogue = { } } local config = { -data=skill_rogue,count=68 +data=skill_rogue,count=76 } return config \ No newline at end of file diff --git a/lua/app/config/strings/ja/skill_rogue.lua b/lua/app/config/strings/ja/skill_rogue.lua index 1981a410..1edf592a 100644 --- a/lua/app/config/strings/ja/skill_rogue.lua +++ b/lua/app/config/strings/ja/skill_rogue.lua @@ -130,6 +130,9 @@ local skill_rogue = { }, [44]={ + }, + [200100]={ + }, [200101]={ @@ -139,6 +142,9 @@ local skill_rogue = { }, [200103]={ + }, + [200200]={ + }, [200201]={ @@ -148,6 +154,9 @@ local skill_rogue = { }, [200203]={ + }, + [200300]={ + }, [200301]={ @@ -157,6 +166,9 @@ local skill_rogue = { }, [200303]={ + }, + [200400]={ + }, [200401]={ @@ -166,6 +178,9 @@ local skill_rogue = { }, [200403]={ + }, + [200500]={ + }, [200501]={ @@ -175,6 +190,9 @@ local skill_rogue = { }, [200503]={ + }, + [200600]={ + }, [200601]={ @@ -184,6 +202,9 @@ local skill_rogue = { }, [200603]={ + }, + [200700]={ + }, [200701]={ @@ -193,6 +214,9 @@ local skill_rogue = { }, [200703]={ + }, + [200800]={ + }, [200801]={ @@ -205,6 +229,6 @@ local skill_rogue = { } } local config = { -data=skill_rogue,count=68 +data=skill_rogue,count=76 } return config \ No newline at end of file diff --git a/lua/app/config/strings/ko/skill_rogue.lua b/lua/app/config/strings/ko/skill_rogue.lua index 1981a410..1edf592a 100644 --- a/lua/app/config/strings/ko/skill_rogue.lua +++ b/lua/app/config/strings/ko/skill_rogue.lua @@ -130,6 +130,9 @@ local skill_rogue = { }, [44]={ + }, + [200100]={ + }, [200101]={ @@ -139,6 +142,9 @@ local skill_rogue = { }, [200103]={ + }, + [200200]={ + }, [200201]={ @@ -148,6 +154,9 @@ local skill_rogue = { }, [200203]={ + }, + [200300]={ + }, [200301]={ @@ -157,6 +166,9 @@ local skill_rogue = { }, [200303]={ + }, + [200400]={ + }, [200401]={ @@ -166,6 +178,9 @@ local skill_rogue = { }, [200403]={ + }, + [200500]={ + }, [200501]={ @@ -175,6 +190,9 @@ local skill_rogue = { }, [200503]={ + }, + [200600]={ + }, [200601]={ @@ -184,6 +202,9 @@ local skill_rogue = { }, [200603]={ + }, + [200700]={ + }, [200701]={ @@ -193,6 +214,9 @@ local skill_rogue = { }, [200703]={ + }, + [200800]={ + }, [200801]={ @@ -205,6 +229,6 @@ local skill_rogue = { } } local config = { -data=skill_rogue,count=68 +data=skill_rogue,count=76 } return config \ No newline at end of file diff --git a/lua/app/config/strings/pt/skill_rogue.lua b/lua/app/config/strings/pt/skill_rogue.lua index 1981a410..1edf592a 100644 --- a/lua/app/config/strings/pt/skill_rogue.lua +++ b/lua/app/config/strings/pt/skill_rogue.lua @@ -130,6 +130,9 @@ local skill_rogue = { }, [44]={ + }, + [200100]={ + }, [200101]={ @@ -139,6 +142,9 @@ local skill_rogue = { }, [200103]={ + }, + [200200]={ + }, [200201]={ @@ -148,6 +154,9 @@ local skill_rogue = { }, [200203]={ + }, + [200300]={ + }, [200301]={ @@ -157,6 +166,9 @@ local skill_rogue = { }, [200303]={ + }, + [200400]={ + }, [200401]={ @@ -166,6 +178,9 @@ local skill_rogue = { }, [200403]={ + }, + [200500]={ + }, [200501]={ @@ -175,6 +190,9 @@ local skill_rogue = { }, [200503]={ + }, + [200600]={ + }, [200601]={ @@ -184,6 +202,9 @@ local skill_rogue = { }, [200603]={ + }, + [200700]={ + }, [200701]={ @@ -193,6 +214,9 @@ local skill_rogue = { }, [200703]={ + }, + [200800]={ + }, [200801]={ @@ -205,6 +229,6 @@ local skill_rogue = { } } local config = { -data=skill_rogue,count=68 +data=skill_rogue,count=76 } return config \ No newline at end of file diff --git a/lua/app/config/strings/ru/skill_rogue.lua b/lua/app/config/strings/ru/skill_rogue.lua index 1981a410..1edf592a 100644 --- a/lua/app/config/strings/ru/skill_rogue.lua +++ b/lua/app/config/strings/ru/skill_rogue.lua @@ -130,6 +130,9 @@ local skill_rogue = { }, [44]={ + }, + [200100]={ + }, [200101]={ @@ -139,6 +142,9 @@ local skill_rogue = { }, [200103]={ + }, + [200200]={ + }, [200201]={ @@ -148,6 +154,9 @@ local skill_rogue = { }, [200203]={ + }, + [200300]={ + }, [200301]={ @@ -157,6 +166,9 @@ local skill_rogue = { }, [200303]={ + }, + [200400]={ + }, [200401]={ @@ -166,6 +178,9 @@ local skill_rogue = { }, [200403]={ + }, + [200500]={ + }, [200501]={ @@ -175,6 +190,9 @@ local skill_rogue = { }, [200503]={ + }, + [200600]={ + }, [200601]={ @@ -184,6 +202,9 @@ local skill_rogue = { }, [200603]={ + }, + [200700]={ + }, [200701]={ @@ -193,6 +214,9 @@ local skill_rogue = { }, [200703]={ + }, + [200800]={ + }, [200801]={ @@ -205,6 +229,6 @@ local skill_rogue = { } } local config = { -data=skill_rogue,count=68 +data=skill_rogue,count=76 } return config \ No newline at end of file diff --git a/lua/app/config/strings/th/skill_rogue.lua b/lua/app/config/strings/th/skill_rogue.lua index 1981a410..1edf592a 100644 --- a/lua/app/config/strings/th/skill_rogue.lua +++ b/lua/app/config/strings/th/skill_rogue.lua @@ -130,6 +130,9 @@ local skill_rogue = { }, [44]={ + }, + [200100]={ + }, [200101]={ @@ -139,6 +142,9 @@ local skill_rogue = { }, [200103]={ + }, + [200200]={ + }, [200201]={ @@ -148,6 +154,9 @@ local skill_rogue = { }, [200203]={ + }, + [200300]={ + }, [200301]={ @@ -157,6 +166,9 @@ local skill_rogue = { }, [200303]={ + }, + [200400]={ + }, [200401]={ @@ -166,6 +178,9 @@ local skill_rogue = { }, [200403]={ + }, + [200500]={ + }, [200501]={ @@ -175,6 +190,9 @@ local skill_rogue = { }, [200503]={ + }, + [200600]={ + }, [200601]={ @@ -184,6 +202,9 @@ local skill_rogue = { }, [200603]={ + }, + [200700]={ + }, [200701]={ @@ -193,6 +214,9 @@ local skill_rogue = { }, [200703]={ + }, + [200800]={ + }, [200801]={ @@ -205,6 +229,6 @@ local skill_rogue = { } } local config = { -data=skill_rogue,count=68 +data=skill_rogue,count=76 } return config \ No newline at end of file diff --git a/lua/app/config/strings/vi/skill_rogue.lua b/lua/app/config/strings/vi/skill_rogue.lua index 1981a410..1edf592a 100644 --- a/lua/app/config/strings/vi/skill_rogue.lua +++ b/lua/app/config/strings/vi/skill_rogue.lua @@ -130,6 +130,9 @@ local skill_rogue = { }, [44]={ + }, + [200100]={ + }, [200101]={ @@ -139,6 +142,9 @@ local skill_rogue = { }, [200103]={ + }, + [200200]={ + }, [200201]={ @@ -148,6 +154,9 @@ local skill_rogue = { }, [200203]={ + }, + [200300]={ + }, [200301]={ @@ -157,6 +166,9 @@ local skill_rogue = { }, [200303]={ + }, + [200400]={ + }, [200401]={ @@ -166,6 +178,9 @@ local skill_rogue = { }, [200403]={ + }, + [200500]={ + }, [200501]={ @@ -175,6 +190,9 @@ local skill_rogue = { }, [200503]={ + }, + [200600]={ + }, [200601]={ @@ -184,6 +202,9 @@ local skill_rogue = { }, [200603]={ + }, + [200700]={ + }, [200701]={ @@ -193,6 +214,9 @@ local skill_rogue = { }, [200703]={ + }, + [200800]={ + }, [200801]={ @@ -205,6 +229,6 @@ local skill_rogue = { } } local config = { -data=skill_rogue,count=68 +data=skill_rogue,count=76 } return config \ No newline at end of file diff --git a/lua/app/config/strings/zh/skill_rogue.lua b/lua/app/config/strings/zh/skill_rogue.lua index 1981a410..1edf592a 100644 --- a/lua/app/config/strings/zh/skill_rogue.lua +++ b/lua/app/config/strings/zh/skill_rogue.lua @@ -130,6 +130,9 @@ local skill_rogue = { }, [44]={ + }, + [200100]={ + }, [200101]={ @@ -139,6 +142,9 @@ local skill_rogue = { }, [200103]={ + }, + [200200]={ + }, [200201]={ @@ -148,6 +154,9 @@ local skill_rogue = { }, [200203]={ + }, + [200300]={ + }, [200301]={ @@ -157,6 +166,9 @@ local skill_rogue = { }, [200303]={ + }, + [200400]={ + }, [200401]={ @@ -166,6 +178,9 @@ local skill_rogue = { }, [200403]={ + }, + [200500]={ + }, [200501]={ @@ -175,6 +190,9 @@ local skill_rogue = { }, [200503]={ + }, + [200600]={ + }, [200601]={ @@ -184,6 +202,9 @@ local skill_rogue = { }, [200603]={ + }, + [200700]={ + }, [200701]={ @@ -193,6 +214,9 @@ local skill_rogue = { }, [200703]={ + }, + [200800]={ + }, [200801]={ @@ -205,6 +229,6 @@ local skill_rogue = { } } local config = { -data=skill_rogue,count=68 +data=skill_rogue,count=76 } return config \ No newline at end of file diff --git a/lua/app/config/tutorial.lua b/lua/app/config/tutorial.lua new file mode 100644 index 00000000..af73b73f --- /dev/null +++ b/lua/app/config/tutorial.lua @@ -0,0 +1,189 @@ +local tutorial = { + [10000]={ + ["next_id"]=10010, + ["type"]=6, + ["target_element"]={ + 53, + 44, + 45 + }, + ["arrow_offset"]={ + 0, + 0 + } + }, + [10010]={ + ["next_id"]=10020, + ["type"]=4, + ["finish"]=3 + }, + [10020]={ + ["next_id"]=10030, + ["type"]=4, + ["finish"]=1, + ["finish_parameter"]=1 + }, + [10030]={ + ["next_id"]=10040, + ["type"]=5, + ["finish"]=2, + ["finish_parameter"]=1 + }, + [10040]={ + ["next_id"]=10050, + ["type"]=6, + ["target_element"]={ + 33, + 23, + 13, + 14, + 15, + 25, + 35 + }, + ["arrow_offset"]={ + 0, + 0 + } + }, + [10050]={ + ["next_id"]=10060, + ["type"]=4, + ["finish"]=3 + }, + [10060]={ + ["type"]=6, + ["target_element"]={ + 23, + 13, + 14, + 15, + 25 + }, + ["arrow_offset"]={ + 0, + 0 + } + }, + [20000]={ + ["next_id"]=20010, + ["type"]=2, + ["target_name"]="main_ui(Clone)/sub_ui_node/main_comp/chapter/progress_bg/box_1", + ["arrow_offset"]={ + 0, + 0 + }, + ["show_mask"]=2, + ["circle_r"]=100, + ["circle_offset"]={ + 0, + 0 + } + }, + [20010]={ + ["next_id"]=20020, + ["type"]=4, + ["finish"]=1, + ["finish_parameter"]=2 + }, + [20020]={ + ["next_id"]=20030, + ["type"]=5, + ["finish"]=2, + ["finish_parameter"]=2 + }, + [20030]={ + ["next_id"]=20040, + ["type"]=2, + ["target_name"]="main_ui(Clone)/bottom_node/bottom_btn_cell_2", + ["arrow_offset"]={ + 0, + 0 + }, + ["show_mask"]=1, + ["square_size"]={ + 100, + 100 + }, + ["square_offset"]={ + 0, + 0 + } + }, + [20040]={ + ["next_id"]=20050, + ["type"]=2, + ["target_name"]="main_ui(Clone)/sub_ui_node/hero_ui/scrollrect/viewport/content/scroll_cell_1/prop_node/hero_cell_4", + ["arrow_offset"]={ + 0, + 0 + }, + ["show_mask"]=1, + ["square_size"]={ + 100, + 300 + }, + ["square_offset"]={ + 0, + 0 + } + }, + [20050]={ + ["next_id"]=20060, + ["type"]=2, + ["target_name"]="hero_detail_ui(Clone)/bg/up_btn", + ["arrow_offset"]={ + 0, + 0 + }, + ["show_mask"]=1, + ["square_size"]={ + 200, + 100 + }, + ["square_offset"]={ + 0, + 0 + } + }, + [20060]={ + ["next_id"]=20070, + ["type"]=2, + ["target_name"]="hero_detail_ui(Clone)/bg/back_btn", + ["arrow_offset"]={ + 0, + 0 + }, + ["show_mask"]=1 + }, + [20070]={ + ["next_id"]=20080, + ["type"]=2, + ["target_name"]="main_ui(Clone)/sub_ui_node/hero_ui/scrollrect/viewport/content/scroll_cell_1/prop_node/hero_cell_4", + ["arrow_offset"]={ + 0, + 0 + }, + ["show_mask"]=1, + ["square_size"]={ + 100, + 300 + }, + ["square_offset"]={ + 0, + 0 + } + }, + [20080]={ + ["type"]=2, + ["target_name"]="main_ui(Clone)/sub_ui_node/hero_ui/scrollrect/viewport/content/large_hero_cell/hero_bg/use_btn", + ["arrow_offset"]={ + 0, + 0 + } + } +} +local config = { +data=tutorial,count=16 +} +return config \ No newline at end of file diff --git a/lua/app/config/tutorial.lua.meta b/lua/app/config/tutorial.lua.meta new file mode 100644 index 00000000..5c61822d --- /dev/null +++ b/lua/app/config/tutorial.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 5b5a5d0a581e34e4783076bf305923c8 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/config/tutorial_start.lua b/lua/app/config/tutorial_start.lua new file mode 100644 index 00000000..2dc26d2c --- /dev/null +++ b/lua/app/config/tutorial_start.lua @@ -0,0 +1,20 @@ +local tutorial_start = { + [1]={ + ["start_id"]=10000, + ["uires_path"]="assets/prefabs/ui/battle/battle_ui.prefab" + }, + [2]={ + ["start_id"]=20000, + ["uires_path"]="Assets/prefabs/ui/main_city/main_ui.prefab" + }, + [3]={ + ["start_id"]=30000 + }, + [4]={ + ["start_id"]=40000 + } +} +local config = { +data=tutorial_start,count=4 +} +return config \ No newline at end of file diff --git a/lua/app/config/tutorial_start.lua.meta b/lua/app/config/tutorial_start.lua.meta new file mode 100644 index 00000000..669f93e0 --- /dev/null +++ b/lua/app/config/tutorial_start.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 7b1900921f574ae4cb9a7a9ac0e55f5c +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} From 325b34a69148dab6dfbb10e6fd330f9f7f053204 Mon Sep 17 00:00:00 2001 From: chenxi Date: Thu, 20 Apr 2023 21:08:03 +0800 Subject: [PATCH 3/3] =?UTF-8?q?tips=E6=9C=80=E5=B0=8F=E9=99=90=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/app/ui/tips/desc_tips.lua | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lua/app/ui/tips/desc_tips.lua b/lua/app/ui/tips/desc_tips.lua index f0143d00..e78f4d48 100644 --- a/lua/app/ui/tips/desc_tips.lua +++ b/lua/app/ui/tips/desc_tips.lua @@ -36,7 +36,11 @@ function DescTips:onRefresh() -- 这里原来是用preferredHeight,但是在中英文混合的时候这个值可能不准,只有改用renderedHeight -- renderedHeight必须要先调用下ForceMeshUpdate强制刷新才有效 self.descTx:getComponent(GConst.TYPEOF_UNITY_CLASS.UI_TEXT_MESH_PRO):ForceMeshUpdate() - self.bg:setSizeDeltaY(self.descTx:getComponent(GConst.TYPEOF_UNITY_CLASS.UI_TEXT_MESH_PRO).renderedHeight + 18) + local height = self.descTx:getComponent(GConst.TYPEOF_UNITY_CLASS.UI_TEXT_MESH_PRO).renderedHeight + 18 + if height < 130 then + height = 130 + end + self.bg:setSizeDeltaY(height) if self.tarCornerScreenPos then self:locate(self.location, self.originSizeDelta, self.bg, self.tarCornerScreenPos) end