diff --git a/lua/app/config/chapter.lua b/lua/app/config/chapter.lua index e5ba3fc1..054c04d3 100644 --- a/lua/app/config/chapter.lua +++ b/lua/app/config/chapter.lua @@ -2411,7 +2411,7 @@ local chapter = { 25 }, ["monster"]={ - 4020101, + 4021501, 4020201, 4020301, 4020401, diff --git a/lua/app/config/hero.lua b/lua/app/config/hero.lua index 46e3a5d5..23ce5f78 100644 --- a/lua/app/config/hero.lua +++ b/lua/app/config/hero.lua @@ -7625,7 +7625,7 @@ local hero = { 1100, 1200 }, - ["model_id"]="p35001", + ["model_id"]="p35002", ["icon"]="35002", ["item_id"]=35002, ["level_id"]=11, diff --git a/lua/app/config/recovery.lua b/lua/app/config/recovery.lua index f27fe6ee..3b573948 100644 --- a/lua/app/config/recovery.lua +++ b/lua/app/config/recovery.lua @@ -2,7 +2,7 @@ local recovery = { [3]={ ["type"]=1, ["time"]=600, - ["limit"]=30 + ["limit"]=60 }, [8]={ ["type"]=2, diff --git a/lua/app/config/skill.lua b/lua/app/config/skill.lua index 29c6c678..ae4725ef 100644 --- a/lua/app/config/skill.lua +++ b/lua/app/config/skill.lua @@ -3720,7 +3720,7 @@ local skill = { }, ["name_act"]="attack03", ["name_hit"]={ - "suffer03" + "suffer01" }, ["fx_self"]=300057, ["fx_self_mirror"]=400057 @@ -4235,8 +4235,8 @@ local skill = { }, ["obj"]=2, ["skill_position"]={ - 1, - 140 + 2, + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -4245,10 +4245,9 @@ local skill = { }, ["name_act"]="attack01", ["name_hit"]={ - "suffer01" + "suffer02" }, - ["fx_self"]=300018, - ["fx_self_mirror"]=400018 + ["fx_self_mirror"]=100000 }, [3500211]={ ["position"]=3, @@ -4264,8 +4263,8 @@ local skill = { }, ["obj"]=2, ["skill_position"]={ - 1, - 140 + 2, + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -4274,10 +4273,9 @@ local skill = { }, ["name_act"]="attack02", ["name_hit"]={ - "suffer02" + "suffer01" }, - ["fx_self"]=300019, - ["fx_self_mirror"]=400019 + ["fx_self_mirror"]=100000 }, [3500212]={ ["position"]=3, @@ -4293,8 +4291,8 @@ local skill = { }, ["obj"]=2, ["skill_position"]={ - 1, - 140 + 2, + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -4303,10 +4301,9 @@ local skill = { }, ["name_act"]="attack03", ["name_hit"]={ - "suffer02" + "suffer01" }, - ["fx_self"]=300020, - ["fx_self_mirror"]=400020 + ["fx_self_mirror"]=100000 }, [3500213]={ ["position"]=3, @@ -4322,8 +4319,8 @@ local skill = { }, ["obj"]=2, ["skill_position"]={ - 1, - 140 + 2, + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -4332,10 +4329,9 @@ local skill = { }, ["name_act"]="attack04", ["name_hit"]={ - "suffer02" + "suffer01" }, - ["fx_self"]=300021, - ["fx_self_mirror"]=400021 + ["fx_self_mirror"]=100000 }, [3500220]={ ["energy"]=10, @@ -4383,8 +4379,8 @@ local skill = { 4 }, ["skill_position"]={ - 1, - 140 + 2, + 0 }, ["shake_time"]=200, ["shake_type"]=5, @@ -4392,18 +4388,17 @@ local skill = { ["sound_delay"]=0.0, ["name_act"]="skill01", ["name_hit"]={ - "suffer01", "suffer02", - "suffer03", + "suffer02", + "suffer02", "suffer03" }, - ["fx_self"]=300022, ["bullet_time"]={ - 1167, + 3630, 3000, - 300 + 600 }, - ["fx_self_mirror"]=400022 + ["fx_self_mirror"]=100000 }, [3500221]={ ["position"]=3, @@ -8725,8 +8720,8 @@ local skill = { }, ["obj"]=2, ["skill_position"]={ - 1, - 140 + 2, + 0 }, ["name_act"]="attack01", ["name_hit"]={ @@ -8747,8 +8742,8 @@ local skill = { }, ["obj"]=2, ["skill_position"]={ - 1, - 140 + 2, + 0 }, ["name_act"]="attack02", ["name_hit"]={ @@ -8769,8 +8764,8 @@ local skill = { }, ["obj"]=2, ["skill_position"]={ - 1, - 140 + 2, + 0 }, ["name_act"]="attack03", ["name_hit"]={ @@ -8792,8 +8787,8 @@ local skill = { }, ["obj"]=2, ["skill_position"]={ - 1, - 140 + 2, + 0 }, ["cd"]=2, ["cd_start"]=0, @@ -8823,8 +8818,8 @@ local skill = { }, ["obj"]=2, ["skill_position"]={ - 1, - 140 + 2, + 0 }, ["name_act"]="attack01", ["name_hit"]={ @@ -8845,8 +8840,8 @@ local skill = { }, ["obj"]=2, ["skill_position"]={ - 1, - 140 + 2, + 0 }, ["name_act"]="attack02", ["name_hit"]={ @@ -8867,8 +8862,8 @@ local skill = { }, ["obj"]=2, ["skill_position"]={ - 1, - 140 + 2, + 0 }, ["name_act"]="attack03", ["name_hit"]={ @@ -8912,8 +8907,8 @@ local skill = { 3 }, ["skill_position"]={ - 1, - 140 + 2, + 0 }, ["cd"]=2, ["cd_start"]=0, @@ -9114,7 +9109,7 @@ local skill = { 5, 2 }, - ["battle_icon"]="45002", + ["battle_icon"]="m20001_1", ["effect_type"]=1, ["trigger"]=1, ["effect"]={ diff --git a/lua/app/config/strings/cn/global.lua b/lua/app/config/strings/cn/global.lua index 15139935..471d71d7 100644 --- a/lua/app/config/strings/cn/global.lua +++ b/lua/app/config/strings/cn/global.lua @@ -120,7 +120,7 @@ local localization_global = ["COUNTER_ATTACK_DESC"] = "反击", ["EXPIRES_IN_HOURS"] = "{0}小时到期", ["EXTRA_REWARDS"] = "额外奖励", - ["PLAYER_LEVEL_UP_DESC"] = "恭喜等级达到{0}级", + ["PLAYER_LEVEL_UP_DESC"] = "等级提升", ["LEVEL_UP_REWARD"] = "升级奖励", ["CLICK_TO_CONTINUE"] = "点击继续", ["BOUNTY_DESC_4"] = "购买此通行证会超过通行证等级上限，会造成损失，是否购买？", diff --git a/lua/app/config/strings/cn/item.lua b/lua/app/config/strings/cn/item.lua index a425bc1c..cf781304 100644 --- a/lua/app/config/strings/cn/item.lua +++ b/lua/app/config/strings/cn/item.lua @@ -17,15 +17,15 @@ local item = { }, [5]={ ["name"]="普通信件", - ["desc"]="用于商城开启普通宝箱。" + ["desc"]="可以在普通招募中进行招募。" }, [6]={ ["name"]="高级信件", - ["desc"]="用于商城开启精致宝箱。" + ["desc"]="可以在高级招募中进行招募。" }, [7]={ ["name"]="神秘信件", - ["desc"]="用于商城开启珍贵宝箱。" + ["desc"]="可以在限时招募中进行招募。" }, [8]={ ["name"]="竞技券", diff --git a/lua/app/config/strings/en/item.lua b/lua/app/config/strings/en/item.lua index d0d3e8f2..192841aa 100644 --- a/lua/app/config/strings/en/item.lua +++ b/lua/app/config/strings/en/item.lua @@ -16,16 +16,13 @@ local item = { ["desc"]="Accumulate to a certain quantity for an upgrade." }, [5]={ - ["name"]="Common Key", - ["desc"]="Used to open Normal Chest in the shop." + ["name"]="Common Key" }, [6]={ - ["name"]="Exquisite Key", - ["desc"]="Used to open Exquisite Chest in the shop." + ["name"]="Exquisite Key" }, [7]={ - ["name"]="Precious Key", - ["desc"]="Used to open Precious Chest in the shop." + ["name"]="Precious Key" }, [8]={ ["name"]="Entry Ticket", diff --git a/lua/app/config/strings/es/item.lua b/lua/app/config/strings/es/item.lua index f3fe9ab3..6903c871 100644 --- a/lua/app/config/strings/es/item.lua +++ b/lua/app/config/strings/es/item.lua @@ -16,16 +16,13 @@ local item = { ["desc"]="Acumular a cierta cantidad para subir de nivel." }, [5]={ - ["name"]="Llave Normal", - ["desc"]="Se usa para abrir cofres comunes en la Tienda." + ["name"]="Llave Normal" }, [6]={ - ["name"]="Llave Refinada", - ["desc"]="Se usa para abrir cofres refinados en la Tienda." + ["name"]="Llave Refinada" }, [7]={ - ["name"]="Llave Preciosa", - ["desc"]="Se usa para abrir cofres preciosos en la Tienda." + ["name"]="Llave Preciosa" }, [8]={ ["name"]="Boleto", diff --git a/lua/app/config/strings/id/item.lua b/lua/app/config/strings/id/item.lua index 1193614d..054d4cfd 100644 --- a/lua/app/config/strings/id/item.lua +++ b/lua/app/config/strings/id/item.lua @@ -16,16 +16,13 @@ local item = { ["desc"]="Kumpulkan hingga jumlah tertentu untuk upgrade." }, [5]={ - ["name"]="Kunci Umum", - ["desc"]="Gunakan untuk membuka Peti Umum di Mall." + ["name"]="Kunci Umum" }, [6]={ - ["name"]="Kunci Indah", - ["desc"]="Gunakan untuk membuka Peti Indah di Mall." + ["name"]="Kunci Indah" }, [7]={ - ["name"]="Kunci Berharga", - ["desc"]="Gunakan untuk membuka Peti Premium di Mall." + ["name"]="Kunci Berharga" }, [8]={ ["name"]="Tiket Masuk", diff --git a/lua/app/config/strings/ja/item.lua b/lua/app/config/strings/ja/item.lua index eb578abb..f967bb5c 100644 --- a/lua/app/config/strings/ja/item.lua +++ b/lua/app/config/strings/ja/item.lua @@ -16,16 +16,13 @@ local item = { ["desc"]="一定数まで貯めると、レベルアップができる。" }, [5]={ - ["name"]="普通の鍵", - ["desc"]="ショップで普通の宝箱を開ける際に使用する。" + ["name"]="普通の鍵" }, [6]={ - ["name"]="精巧の鍵", - ["desc"]="ショップで精巧の宝箱を開ける際に使用する。" + ["name"]="精巧の鍵" }, [7]={ - ["name"]="貴重の鍵", - ["desc"]="ショップで貴重の宝箱を開ける際に使用する。" + ["name"]="貴重の鍵" }, [8]={ ["name"]="チケット", diff --git a/lua/app/config/strings/ko/item.lua b/lua/app/config/strings/ko/item.lua index 9649e28a..610ae1d0 100644 --- a/lua/app/config/strings/ko/item.lua +++ b/lua/app/config/strings/ko/item.lua @@ -16,16 +16,13 @@ local item = { ["desc"]="일정 횟수 누적되면 업그레이드할 수 있습니다." }, [5]={ - ["name"]="일반 열쇠", - ["desc"]="상점에서 일반 보물상자를 여는 데 사용됩니다." + ["name"]="일반 열쇠" }, [6]={ - ["name"]="정교한 열쇠", - ["desc"]="상점에서 정교한 보물상자를 여는 데 사용됩니다." + ["name"]="정교한 열쇠" }, [7]={ - ["name"]="귀중한 열쇠", - ["desc"]="상점에서 귀중한 보물상자를 여는 데 사용됩니다." + ["name"]="귀중한 열쇠" }, [8]={ ["name"]="입장권", diff --git a/lua/app/config/strings/pt/item.lua b/lua/app/config/strings/pt/item.lua index f118de1e..88db833f 100644 --- a/lua/app/config/strings/pt/item.lua +++ b/lua/app/config/strings/pt/item.lua @@ -16,16 +16,13 @@ local item = { ["desc"]="Acumule uma certa quantidade para subir de nível." }, [5]={ - ["name"]="Chave Comum", - ["desc"]="Usada para abrir baús comuns na Loja." + ["name"]="Chave Comum" }, [6]={ - ["name"]="Chave Requintada", - ["desc"]="Usada para abrir baús requintados na Loja." + ["name"]="Chave Requintada" }, [7]={ - ["name"]="Chave Preciosa", - ["desc"]="Usada para abrir baús preciosos na Loja." + ["name"]="Chave Preciosa" }, [8]={ ["name"]="Ingresso", diff --git a/lua/app/config/strings/th/item.lua b/lua/app/config/strings/th/item.lua index 30124aef..c8497eb2 100644 --- a/lua/app/config/strings/th/item.lua +++ b/lua/app/config/strings/th/item.lua @@ -16,16 +16,13 @@ local item = { ["desc"]="สะสมถึงจำนวนที่กำหนดสามารถอัปเลเวลได้" }, [5]={ - ["name"]="กุญแจทั่วไป", - ["desc"]="ใช้ในห้างเพื่อเปิดหีบทั่วไป" + ["name"]="กุญแจทั่วไป" }, [6]={ - ["name"]="กุญแจสวยงาม", - ["desc"]="ใช้ในห้างเพื่อเปิดหีบสวยงาม" + ["name"]="กุญแจสวยงาม" }, [7]={ - ["name"]="กุญแจล้ำค่า", - ["desc"]="ใช้ในห้างเพื่อเปิดหีบล้ำค่า" + ["name"]="กุญแจล้ำค่า" }, [8]={ ["name"]="ตั๋วเข้าร่วม", diff --git a/lua/app/config/strings/vi/item.lua b/lua/app/config/strings/vi/item.lua index 12997e59..f04dacb8 100644 --- a/lua/app/config/strings/vi/item.lua +++ b/lua/app/config/strings/vi/item.lua @@ -16,16 +16,13 @@ local item = { ["desc"]="Tích lũy đạt số lượng nhất định được tăng cấp." }, [5]={ - ["name"]="Chìa Khóa Thường", - ["desc"]="Dùng tại SHOP để mở Rương Thường." + ["name"]="Chìa Khóa Thường" }, [6]={ - ["name"]="Chìa Khóa Tinh Xảo", - ["desc"]="Dùng tại SHOP để mở Rương Tinh Xảo." + ["name"]="Chìa Khóa Tinh Xảo" }, [7]={ - ["name"]="Chìa Khóa Quý", - ["desc"]="Dùng tại SHOP để mở Rương Quý." + ["name"]="Chìa Khóa Quý" }, [8]={ ["name"]="Vé", diff --git a/lua/app/config/strings/zh/item.lua b/lua/app/config/strings/zh/item.lua index 9ad8b4ca..1a67a212 100644 --- a/lua/app/config/strings/zh/item.lua +++ b/lua/app/config/strings/zh/item.lua @@ -16,16 +16,13 @@ local item = { ["desc"]="累積達到特定數量可升級。" }, [5]={ - ["name"]="普通鑰匙", - ["desc"]="可以在商城開啟普通寶箱。" + ["name"]="普通鑰匙" }, [6]={ - ["name"]="精緻鑰匙", - ["desc"]="可以在商城開啟精緻寶箱。" + ["name"]="精緻鑰匙" }, [7]={ - ["name"]="珍貴鑰匙", - ["desc"]="可以在商城開啟珍貴寶箱。" + ["name"]="珍貴鑰匙" }, [8]={ ["name"]="入場券", diff --git a/lua/app/config/task_daily.lua b/lua/app/config/task_daily.lua index 268fc8b3..9af15876 100644 --- a/lua/app/config/task_daily.lua +++ b/lua/app/config/task_daily.lua @@ -1,6 +1,6 @@ local task_daily = { [101]={ - ["task_type"]=21, + ["task_type"]=22, ["number"]=1, ["value"]=20 }, diff --git a/lua/app/config/task_daily_stage.lua b/lua/app/config/task_daily_stage.lua index 85fac3a7..744cfc95 100644 --- a/lua/app/config/task_daily_stage.lua +++ b/lua/app/config/task_daily_stage.lua @@ -1,6 +1,6 @@ local task_daily_stage = { [101]={ - ["point"]=40, + ["point"]=30, ["reward"]={ { ["type"]=1, @@ -21,7 +21,7 @@ local task_daily_stage = { } }, [102]={ - ["point"]=80, + ["point"]=50, ["reward"]={ { ["type"]=1, @@ -42,7 +42,7 @@ local task_daily_stage = { } }, [103]={ - ["point"]=120, + ["point"]=80, ["reward"]={ { ["type"]=1, @@ -63,7 +63,7 @@ local task_daily_stage = { } }, [104]={ - ["point"]=160, + ["point"]=100, ["reward"]={ { ["type"]=1, @@ -84,7 +84,7 @@ local task_daily_stage = { } }, [105]={ - ["point"]=200, + ["point"]=120, ["reward"]={ { ["type"]=1, diff --git a/lua/app/ui/battle/cell/boss_skill_cell.lua b/lua/app/ui/battle/cell/boss_skill_cell.lua index 2d18533e..c18e13bb 100644 --- a/lua/app/ui/battle/cell/boss_skill_cell.lua +++ b/lua/app/ui/battle/cell/boss_skill_cell.lua @@ -7,15 +7,19 @@ function BossSkillCell:init() local uiMap = self:getUIMap() self.icon = uiMap["boss_skill_cell.icon"] self.roundTx = uiMap["boss_skill_cell.round_text"] + self.mask = uiMap["boss_skill_cell.mask"] end function BossSkillCell:refresh(skillEntity) local skillId = skillEntity:getSkillId() local cd = skillEntity:getShowCd() + local coolCd = skillEntity:getShowCoolingRounds() self.skillId = skillId local icon = ModuleManager.HeroManager:getSkillIcon(skillId) self.icon:setSprite(GConst.ATLAS_PATH.ICON_SKILL, icon) self.roundTx:setText(cd + 1) + + self.mask:getComponent(GConst.TYPEOF_UNITY_CLASS.UI_IMAGE).fillAmount = (cd + 1) / coolCd end function BossSkillCell:setActive(active) diff --git a/lua/app/userdata/battle/skill/battle_skill_entity.lua b/lua/app/userdata/battle/skill/battle_skill_entity.lua index 435f07a0..09a6dd8e 100644 --- a/lua/app/userdata/battle/skill/battle_skill_entity.lua +++ b/lua/app/userdata/battle/skill/battle_skill_entity.lua @@ -132,6 +132,10 @@ function BattleSkillEntity:getShowCd() return self.cd end +function BattleSkillEntity:getShowCoolingRounds() + return self.coolingRounds +end + -- 技能释放完毕 function BattleSkillEntity:endUse() self.cd = self.coolingRounds