puxuan/c1_lua
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

通用技能tips

Browse Source
This commit is contained in:
xiekaidong 2023-05-22 16:38:04 +08:00
parent 14dfdecddc
commit 8ae7df28e2
9 changed files with 4229 additions and 102 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
lua/app/config/act_gold_pig.lua
View File

@ -2,29 +2,29 @@ local act_gold_pig = {
[101]={ [101]={
["before_id"]=101, ["before_id"]=101,
["next_id"]=201, ["next_id"]=201,
["battle_diamond"]=120, ["battle_diamond"]=100,
["min_diamond"]=360, ["min_diamond"]=300,
["max_diamond"]=720, ["max_diamond"]=600,
["recharge_id"]=3, ["recharge_id"]=5,
["value"]=300 ["value"]=400
}, },
[201]={ [201]={
["before_id"]=101, ["before_id"]=101,
["next_id"]=301, ["next_id"]=301,
["battle_diamond"]=200, ["battle_diamond"]=250,
["min_diamond"]=600, ["min_diamond"]=1000,
["max_diamond"]=1200, ["max_diamond"]=2000,
["recharge_id"]=4, ["recharge_id"]=10,
["value"]=300 ["value"]=700
}, },
[301]={ [301]={
["before_id"]=201, ["before_id"]=201,
["next_id"]=401, ["next_id"]=401,
["battle_diamond"]=350, ["battle_diamond"]=300,
["min_diamond"]=1400, ["min_diamond"]=1500,
["max_diamond"]=2800, ["max_diamond"]=3000,
["recharge_id"]=5, ["recharge_id"]=12,
["value"]=300 ["value"]=700
}, },
[401]={ [401]={
["before_id"]=301, ["before_id"]=301,
@ -32,35 +32,35 @@ local act_gold_pig = {
["battle_diamond"]=400, ["battle_diamond"]=400,
["min_diamond"]=2000, ["min_diamond"]=2000,
["max_diamond"]=4000, ["max_diamond"]=4000,
["recharge_id"]=6, ["recharge_id"]=13,
["value"]=300 ["value"]=700
}, },
[501]={ [501]={
["before_id"]=401, ["before_id"]=401,
["next_id"]=601, ["next_id"]=601,
["battle_diamond"]=520, ["battle_diamond"]=500,
["min_diamond"]=2600, ["min_diamond"]=2500,
["max_diamond"]=5200, ["max_diamond"]=5000,
["recharge_id"]=7, ["recharge_id"]=14,
["value"]=300 ["value"]=700
}, },
[601]={ [601]={
["before_id"]=501, ["before_id"]=501,
["next_id"]=701, ["next_id"]=701,
["battle_diamond"]=680, ["battle_diamond"]=600,
["min_diamond"]=3400, ["min_diamond"]=3000,
["max_diamond"]=6800, ["max_diamond"]=6000,
["recharge_id"]=8, ["recharge_id"]=15,
["value"]=300 ["value"]=700
}, },
[701]={ [701]={
["before_id"]=601, ["before_id"]=601,
["next_id"]=701, ["next_id"]=701,
["battle_diamond"]=800, ["battle_diamond"]=1000,
["min_diamond"]=4000, ["min_diamond"]=5000,
["max_diamond"]=8000, ["max_diamond"]=10000,
["recharge_id"]=9, ["recharge_id"]=16,
["value"]=300 ["value"]=700
} }
} }
local config = { local config = {

4170
lua/app/config/chapter.lua
View File

File diff suppressed because it is too large Load Diff

10
lua/app/config/const.lua
View File

@ -105,13 +105,13 @@ local const = {
["value"]=57600 ["value"]=57600
}, },
["idle_exp_drop_time"]={ ["idle_exp_drop_time"]={
["value"]=30 ["value"]=1200
}, },
["idle_gold_drop_time"]={ ["idle_gold_drop_time"]={
["value"]=30 ["value"]=1200
}, },
["idle_item_drop_time"]={ ["idle_item_drop_time"]={
["value"]=4320 ["value"]=1200
}, },
["idle_drop_fast_times_1"]={ ["idle_drop_fast_times_1"]={
["value"]=2 ["value"]=2
@ -128,8 +128,8 @@ local const = {
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=3, ["id"]=3,
["id_for_nothing"]="VQ==", ["id_for_nothing"]="VQ==",
["num"]=20, ["num"]=30,
["num_for_nothing"]="VAg=" ["num_for_nothing"]="VQg="
} }
}, },
["refresh_skill_cost"]={ ["refresh_skill_cost"]={

5
lua/app/config/localization/localization_global_const.lua
View File

@ -1,7 +1,5 @@
local LocalizationGlobalConst = local LocalizationGlobalConst =
{ {
BATTLE_DESC_9 = "BATTLE_DESC_9",
BATTLE_DESC_10 = "BATTLE_DESC_10",
MAIN_BTN_1 = "MAIN_BTN_1", MAIN_BTN_1 = "MAIN_BTN_1",
QLT_DESC_1 = "QLT_DESC_1", QLT_DESC_1 = "QLT_DESC_1",
QLT_DESC_2 = "QLT_DESC_2", QLT_DESC_2 = "QLT_DESC_2",
@ -118,7 +116,8 @@ local LocalizationGlobalConst =
BTN_DELETE_ALL_READ_MAIL = "BTN_DELETE_ALL_READ_MAIL", BTN_DELETE_ALL_READ_MAIL = "BTN_DELETE_ALL_READ_MAIL",
BTN_CLAIM_ALL = "BTN_CLAIM_ALL", BTN_CLAIM_ALL = "BTN_CLAIM_ALL",
BTN_READ = "BTN_READ", BTN_READ = "BTN_READ",
MAIL_COUNTDOWN = "MAIL_COUNTDOWN", BATTLE_DESC_9 = "BATTLE_DESC_9",
BATTLE_DESC_10 = "BATTLE_DESC_10",
} }
return LocalizationGlobalConst return LocalizationGlobalConst

27
lua/app/config/skill_rogue.lua
View File

@ -1,6 +1,7 @@
local skill_rogue = { local skill_rogue = {
[1]={ [1]={
["universal"]=1, ["universal"]=1,
["toast_mark"]=1,
["limit_times"]=3, ["limit_times"]=3,
["weight"]=3000, ["weight"]=3000,
["qlt"]=2, ["qlt"]=2,
@ -15,6 +16,7 @@ local skill_rogue = {
}, },
[2]={ [2]={
["universal"]=1, ["universal"]=1,
["toast_mark"]=1,
["limit_times"]=2, ["limit_times"]=2,
["weight"]=2000, ["weight"]=2000,
["qlt"]=3, ["qlt"]=3,
@ -29,6 +31,7 @@ local skill_rogue = {
}, },
[3]={ [3]={
["universal"]=1, ["universal"]=1,
["toast_mark"]=1,
["limit_times"]=1, ["limit_times"]=1,
["weight"]=1000, ["weight"]=1000,
["qlt"]=4, ["qlt"]=4,
@ -43,6 +46,7 @@ local skill_rogue = {
}, },
[4]={ [4]={
["universal"]=1, ["universal"]=1,
["toast_mark"]=2,
["limit_times"]=4, ["limit_times"]=4,
["weight"]=3000, ["weight"]=3000,
["qlt"]=2, ["qlt"]=2,
@ -57,6 +61,7 @@ local skill_rogue = {
}, },
[5]={ [5]={
["universal"]=1, ["universal"]=1,
["toast_mark"]=2,
["limit_times"]=3, ["limit_times"]=3,
["weight"]=3000, ["weight"]=3000,
["qlt"]=3, ["qlt"]=3,
@ -71,6 +76,7 @@ local skill_rogue = {
}, },
[6]={ [6]={
["universal"]=1, ["universal"]=1,
["toast_mark"]=2,
["limit_times"]=2, ["limit_times"]=2,
["weight"]=2000, ["weight"]=2000,
["qlt"]=3, ["qlt"]=3,
@ -85,6 +91,7 @@ local skill_rogue = {
}, },
[7]={ [7]={
["universal"]=1, ["universal"]=1,
["toast_mark"]=3,
["limit_times"]=4, ["limit_times"]=4,
["weight"]=3000, ["weight"]=3000,
["qlt"]=2, ["qlt"]=2,
@ -99,6 +106,7 @@ local skill_rogue = {
}, },
[8]={ [8]={
["universal"]=1, ["universal"]=1,
["toast_mark"]=3,
["limit_times"]=3, ["limit_times"]=3,
["weight"]=3000, ["weight"]=3000,
["qlt"]=3, ["qlt"]=3,
@ -113,6 +121,7 @@ local skill_rogue = {
}, },
[9]={ [9]={
["universal"]=1, ["universal"]=1,
["toast_mark"]=3,
["limit_times"]=2, ["limit_times"]=2,
["weight"]=2000, ["weight"]=2000,
["qlt"]=3, ["qlt"]=3,
@ -127,6 +136,7 @@ local skill_rogue = {
}, },
[10]={ [10]={
["universal"]=1, ["universal"]=1,
["toast_mark"]=4,
["limit_times"]=4, ["limit_times"]=4,
["weight"]=3000, ["weight"]=3000,
["qlt"]=2, ["qlt"]=2,
@ -141,6 +151,7 @@ local skill_rogue = {
}, },
[11]={ [11]={
["universal"]=1, ["universal"]=1,
["toast_mark"]=4,
["limit_times"]=3, ["limit_times"]=3,
["weight"]=3000, ["weight"]=3000,
["qlt"]=3, ["qlt"]=3,
@ -155,6 +166,7 @@ local skill_rogue = {
}, },
[12]={ [12]={
["universal"]=1, ["universal"]=1,
["toast_mark"]=4,
["limit_times"]=2, ["limit_times"]=2,
["weight"]=2000, ["weight"]=2000,
["qlt"]=3, ["qlt"]=3,
@ -169,6 +181,7 @@ local skill_rogue = {
}, },
[13]={ [13]={
["universal"]=1, ["universal"]=1,
["toast_mark"]=5,
["limit_times"]=4, ["limit_times"]=4,
["weight"]=3000, ["weight"]=3000,
["qlt"]=2, ["qlt"]=2,
@ -183,6 +196,7 @@ local skill_rogue = {
}, },
[14]={ [14]={
["universal"]=1, ["universal"]=1,
["toast_mark"]=5,
["limit_times"]=3, ["limit_times"]=3,
["weight"]=3000, ["weight"]=3000,
["qlt"]=3, ["qlt"]=3,
@ -197,6 +211,7 @@ local skill_rogue = {
}, },
[15]={ [15]={
["universal"]=1, ["universal"]=1,
["toast_mark"]=5,
["limit_times"]=2, ["limit_times"]=2,
["weight"]=2000, ["weight"]=2000,
["qlt"]=3, ["qlt"]=3,
@ -211,6 +226,7 @@ local skill_rogue = {
}, },
[16]={ [16]={
["universal"]=1, ["universal"]=1,
["toast_mark"]=6,
["limit_times"]=4, ["limit_times"]=4,
["weight"]=3000, ["weight"]=3000,
["qlt"]=2, ["qlt"]=2,
@ -225,6 +241,7 @@ local skill_rogue = {
}, },
[17]={ [17]={
["universal"]=1, ["universal"]=1,
["toast_mark"]=6,
["limit_times"]=3, ["limit_times"]=3,
["weight"]=3000, ["weight"]=3000,
["qlt"]=3, ["qlt"]=3,
@ -239,6 +256,7 @@ local skill_rogue = {
}, },
[18]={ [18]={
["universal"]=1, ["universal"]=1,
["toast_mark"]=6,
["limit_times"]=2, ["limit_times"]=2,
["weight"]=2000, ["weight"]=2000,
["qlt"]=3, ["qlt"]=3,
@ -270,6 +288,7 @@ local skill_rogue = {
}, },
[20]={ [20]={
["universal"]=1, ["universal"]=1,
["toast_mark"]=7,
["limit_times"]=4, ["limit_times"]=4,
["weight"]=3000, ["weight"]=3000,
["qlt"]=2, ["qlt"]=2,
@ -284,6 +303,7 @@ local skill_rogue = {
}, },
[21]={ [21]={
["universal"]=1, ["universal"]=1,
["toast_mark"]=8,
["limit_times"]=3, ["limit_times"]=3,
["weight"]=3000, ["weight"]=3000,
["qlt"]=2, ["qlt"]=2,
@ -298,6 +318,7 @@ local skill_rogue = {
}, },
[22]={ [22]={
["universal"]=1, ["universal"]=1,
["toast_mark"]=8,
["limit_times"]=2, ["limit_times"]=2,
["weight"]=2000, ["weight"]=2000,
["qlt"]=3, ["qlt"]=3,
@ -312,6 +333,7 @@ local skill_rogue = {
}, },
[23]={ [23]={
["universal"]=1, ["universal"]=1,
["toast_mark"]=8,
["limit_times"]=1, ["limit_times"]=1,
["weight"]=1000, ["weight"]=1000,
["qlt"]=4, ["qlt"]=4,
@ -326,6 +348,7 @@ local skill_rogue = {
}, },
[24]={ [24]={
["universal"]=1, ["universal"]=1,
["toast_mark"]=9,
["limit_times"]=2, ["limit_times"]=2,
["weight"]=2000, ["weight"]=2000,
["qlt"]=3, ["qlt"]=3,
@ -343,6 +366,7 @@ local skill_rogue = {
}, },
[25]={ [25]={
["universal"]=1, ["universal"]=1,
["toast_mark"]=10,
["limit_times"]=3, ["limit_times"]=3,
["weight"]=3000, ["weight"]=3000,
["qlt"]=3, ["qlt"]=3,
@ -357,6 +381,7 @@ local skill_rogue = {
}, },
[26]={ [26]={
["universal"]=1, ["universal"]=1,
["toast_mark"]=11,
["limit_times"]=3, ["limit_times"]=3,
["weight"]=2000, ["weight"]=2000,
["qlt"]=3, ["qlt"]=3,
@ -371,6 +396,7 @@ local skill_rogue = {
}, },
[27]={ [27]={
["universal"]=1, ["universal"]=1,
["toast_mark"]=12,
["limit_times"]=3, ["limit_times"]=3,
["weight"]=2000, ["weight"]=2000,
["qlt"]=3, ["qlt"]=3,
@ -385,6 +411,7 @@ local skill_rogue = {
}, },
[28]={ [28]={
["universal"]=1, ["universal"]=1,
["toast_mark"]=13,
["limit_times"]=3, ["limit_times"]=3,
["weight"]=2000, ["weight"]=2000,
["qlt"]=3, ["qlt"]=3,

3
lua/app/config/strings/cn/global.lua
View File

@ -116,7 +116,8 @@ local localization_global =
["BTN_DELETE_ALL_READ_MAIL"] = "删除已读邮件", ["BTN_DELETE_ALL_READ_MAIL"] = "删除已读邮件",
["BTN_CLAIM_ALL"] = "领取所有", ["BTN_CLAIM_ALL"] = "领取所有",
["BTN_READ"] = "读取", ["BTN_READ"] = "读取",
["MAIL_COUNTDOWN"] = "{0}小时到期", ["BATTLE_DESC_9"] = "{0}攻击力：<color=#ffffff>{1}</color>",
["BATTLE_DESC_10"] = "已激活效果",
} }
return localization_global return localization_global

2
lua/app/module/battle/controller/battle_controller.lua
View File

@ -1737,6 +1737,8 @@ function BattleController:onSelectSkill(skillId, value, pos)
end end
self:selectSKillNextToStep() self:selectSKillNextToStep()
self.battleUI:showCommonSkillTips(skillId)
end end
function BattleController:selectSKillNextToStep() function BattleController:selectSKillNextToStep()

3
lua/app/module/hero/hero_manager.lua
View File

@ -78,7 +78,8 @@ function HeroManager:getSkillRogueDesc(skillId, value)
end end
function HeroManager:showValueRogue(skillId) function HeroManager:showValueRogue(skillId)
if (skillId >= 1 and skillId <= 18) or (skillId >= 21 and skillId <= 23) then local cfg = ConfigManager:getConfig("skill_rogue")[skillId]
if cfg and cfg.toast_mark then
return true return true
end end

47
lua/app/ui/battle/battle_ui.lua
View File

@ -64,6 +64,7 @@ function BattleUI:_display()
self:initSkillLineSfx() self:initSkillLineSfx()
self:initGenerateSkillEffect() self:initGenerateSkillEffect()
self:initSelectSkillNode() self:initSelectSkillNode()
self:initCommonSkillDescTips()
end end
function BattleUI:_addListeners() function BattleUI:_addListeners()
@ -1924,6 +1925,47 @@ function BattleUI:hideAllBoardSfxs()
end end
end end
function BattleUI:initCommonSkillDescTips()
local uiMap = self.root:genAllChildren()
self.skillDescTipsNode = uiMap["battle_ui.bg_2.lv_node.skill_desc_tips"]
self.skillDescTips = uiMap["battle_ui.bg_2.lv_node.skill_desc_tips.desc"]
self.skillDescTipsNode:setVisible(false)
end
function BattleUI:showCommonSkillTips(skillId)
-- 需要合并显示
local rogueCfg = ConfigManager:getConfig("skill_rogue")
local curCfg = rogueCfg[skillId]
if not curCfg or curCfg.universal ~= 1 then
return
end
local value = 0
local selectSkillMap = DataManager.BattleData:getSelectSkillMap()
if selectSkillMap[skillId] then
value = selectSkillMap[skillId].value
end
if curCfg.toast_mark then
for id, info in pairs(rogueCfg) do
if selectSkillMap[id] and id ~= skillId and info.toast_mark == curCfg.toast_mark then
value = value + selectSkillMap[id].value
end
end
end
if self.showCommonSkillTipsSid then
self:unscheduleGlobal(self.showCommonSkillTipsSid)
self.showCommonSkillTipsSid = nil
end
self.skillDescTipsNode:setVisible(true)
self.skillDescTips:setText(ModuleManager.HeroManager:getSkillRogueDesc(skillId, value))
self.showCommonSkillTipsSid = self:performWithDelayGlobal(function()
self.skillDescTipsNode:setVisible(false)
end, 1.5)
end
function BattleUI:clear() function BattleUI:clear()
if self.alreadyClear then if self.alreadyClear then
return return
@ -2019,6 +2061,11 @@ function BattleUI:clear()
self.monsterSkillAniSeq:Kill() self.monsterSkillAniSeq:Kill()
self.monsterSkillAniSeq = nil self.monsterSkillAniSeq = nil
end end
if self.showCommonSkillTipsSid then
self:unscheduleGlobal(self.showCommonSkillTipsSid)
self.showCommonSkillTipsSid = nil
end
end end
return BattleUI return BattleUI