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

Merge branch 'dev_20230919' into limit_pvp

Browse Source 
# Conflicts:
#	lua/app/common/bi_report.lua
#	lua/app/common/data_manager.lua
#	lua/app/common/pay_manager.lua
#	lua/app/config/activity_pvp_board.lua.meta
#	lua/app/config/const.lua
#	lua/app/config/item.lua
#	lua/app/config/monster_activity.lua
#	lua/app/config/monster_base.lua
#	lua/app/config/skill.lua
#	lua/app/config/skin.lua
#	lua/app/config/skin_skill.lua
#	lua/app/config/strings/cn/global.lua
#	lua/app/config/strings/cn/item.lua
#	lua/app/config/strings/cn/skill_rogue.lua
#	lua/app/config/strings/cn/skin.lua
#	lua/app/config/strings/de/item.lua
#	lua/app/config/strings/de/skin.lua
#	lua/app/config/strings/en/item.lua
#	lua/app/config/strings/en/skin.lua
#	lua/app/config/strings/es/item.lua
#	lua/app/config/strings/es/skin.lua
#	lua/app/config/strings/fr/item.lua
#	lua/app/config/strings/fr/skin.lua
#	lua/app/config/strings/id/item.lua
#	lua/app/config/strings/id/skin.lua
#	lua/app/config/strings/ja/item.lua
#	lua/app/config/strings/ja/skin.lua
#	lua/app/config/strings/ko/item.lua
#	lua/app/config/strings/ko/skin.lua
#	lua/app/config/strings/pt/item.lua
#	lua/app/config/strings/pt/skin.lua
#	lua/app/config/strings/ru/item.lua
#	lua/app/config/strings/ru/skin.lua
#	lua/app/config/strings/th/item.lua
#	lua/app/config/strings/th/skin.lua
#	lua/app/config/strings/vi/item.lua
#	lua/app/config/strings/vi/skin.lua
#	lua/app/config/strings/zh/item.lua
#	lua/app/config/strings/zh/skin.lua
#	lua/app/config/task_type.lua.meta
#	lua/app/global/global_const.lua
#	lua/app/module/battle/battle_const.lua
#	lua/app/module/battle/battle_manager.lua
This commit is contained in:
xiekaidong 2023-09-16 17:55:38 +08:00
commit 820a22b051
153 changed files with 5382 additions and 1584 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
lua/app/common/bi_report.lua
View File

@ -150,6 +150,9 @@ BIReport.ITEM_GET_TYPE = {
ACT_FOURTEEN_DAY_TASK = "ActFourteenDayTask",
ACT_FOURTEEN_DAY_EXCHANGE = "ActFourteenDayExchange",
FOURTEEN_DAY_GIFT = "FourteenDayGift",
FULL_MOON_HERO_GIFT = "FullMoonHeroGift",
FULL_MOON_NEW_HERO_GIFT = "FullMoonNewHeroGift",
FULL_MOON_SKIN_GIFT = "FullMoonSkinGift",
DUNGEON_RUNE_START = "DungeonRuneStart",
DUNGEON_RUNE_SETTLEMENT = "DungeonRuneSettlement",
DUNGEON_RUNE_SWEEP = "DungeonRuneSweep",
@ -163,6 +166,11 @@ BIReport.ITEM_GET_TYPE = {
ACT_PVP_BOUNTY_GIFT = "ActPvpBountyGift",
ACT_PVP_RANK_REWARD = "ActPvpRankReward",
ACT_PVP_BUY_BOUNTY_LEVEL = "ActPvpBuyBountyLevel",
RUNES_QUENCHING = "RuneQuenching",
RUNES_GIFT = "RuneGift",
FULL_MOON_TASK = "FullMoonTask",
FULL_MOON_TASK_PROG_REWARD = "FullMoonTaskProgReward",
FULL_MOON_SKIN_CHALLENGE_REWARD = "FullMoonSkinChallengeReward",
}
BIReport.ADS_CLICK_TYPE = {
@ -216,7 +224,8 @@ BIReport.BATTLE_TYPE = {
["7"] = "DungeonArmor",
["8"] = "ActBossRush",
["9"] = "DungeonRune",
["10"] = "ActPvp",
["10"] = "FullMoonSkin",
["11"] = "ActPvp",
}
BIReport.GIFT_TYPE = {
@ -240,6 +249,10 @@ BIReport.GIFT_TYPE = {
ACT_HERO_FUND = "ActHeroFund",
FOURTEEN_DAY_GIFT = "FourteenDayGift",
ACT_PVP_BOUNTY_GIFT = "ActPvpBountyGift",
FULL_MOON_HERO_GIFT = "FullMoonHeroGift",
FULL_MOON_NEW_HERO_GIFT = "FullMoonNewHeroGift",
FULL_MOON_SKIN_GIFT = "FullMoonSkinGift",
RUNES_GIFT = "RunesGift",
}
BIReport.COIN_TYPE = {
@ -282,6 +295,7 @@ BIReport.DIALY_CHALLENGE_OPT_TYPE = {
BIReport.MISCELLANEOUS_OPT_TYPE = {
EVALUATE_OPEN = "EvaluateOpen",
EVALUATE_CLOSE = "EvaluateClose",
BATTLE_SNAP_SHOP_OPEN = "BattleSnapShopOpen",
}
BIReport.ARENA_OPT_TYPE = {
@ -1673,6 +1687,13 @@ function BIReport:postRateOpen()
self:report(EVENT_NAME_MISCELLANEOUS_OPT, args)
end
function BIReport:postBatttleSnapshotOpen()
local args = {
event_type = BIReport.MISCELLANEOUS_OPT_TYPE.BATTLE_SNAP_SHOP_OPEN,
}
self:report(EVENT_NAME_MISCELLANEOUS_OPT, args)
end
function BIReport:postPbAuthfailed(pbName, lastLoginInfo, authFailToLogin)
local args = {
event_type = BIReport.NETWORK_OPT_TYPE.AUTH_FAILED,

15
lua/app/common/data_manager.lua
View File

@ -16,6 +16,7 @@ function DataManager:init()
self:initManager("BagData", "app/userdata/bag/bag_data")
self:initManager("EquipData", "app/userdata/equip/equip_data")
self:initManager("SkinData", "app/userdata/skin/skin_data")
self:initManager("RunesData", "app/userdata/runes/runes_data")
self:initManager("BattleData", "app/userdata/battle/battle_data")
self:initManager("BattlePVPData", "app/userdata/battle/battle_pvp_data")
self:initManager("FormationData", "app/userdata/formation/formation_data")
@ -32,6 +33,7 @@ function DataManager:init()
self:initManager("SevenDayData", "app/userdata/activity/seven_day/seven_day_data")
self:initManager("ShopData", "app/userdata/shop/shop_data")
self:initManager("SummonData", "app/userdata/summon/summon_data")
self:initManager("FullMoonData", "app/userdata/activity/full_moon/full_moon_data")
self:initManager("AIHelperData", "app/userdata/game_setting/ai_helper_data")
self:initManager("HeroFundData", "app/userdata/activity/hero_fund/hero_fund_data")
self:initManager("ActBossRushData", "app/userdata/activity/act_boss_rush/act_boss_rush_data")
@ -107,6 +109,7 @@ function DataManager:clear()
self.BagData:clear()
self.EquipData:clear()
self.SkinData:clear()
self.RunesData:clear()
self.FormationData:clear()
self.ActivityData:clear()
self.MailData:clear()
@ -119,6 +122,7 @@ function DataManager:clear()
self.SevenDayData:clear()
self.ShopData:clear()
self.SummonData:clear()
self.FullMoonData:clear()
-- 任务数据最后清理
self.TaskData:clear()
self.AIHelperData:clear()
@ -153,7 +157,8 @@ function DataManager:initWithServerData(data)
self.EquipData:init(data.heroes_equips)
self.EquipData:initGifts(data.act_weapon_armor_gift)
self.SkinData:init(data.bag.skins)
-- HeroData要在EquipData和SkinData之后初始化，依赖它们的属性数据
self.RunesData:init(data.rune)
-- HeroData要在EquipData、SkinData、RunesData之后初始化，依赖它们的属性数据
self.HeroData:init(data.bag.heroes)
self.BagData:init(data.bag)
self.FormationData:init(data.fight_info)
@ -507,6 +512,10 @@ DataManager.activityOpenFunc = {
DataManager.ActPvpData:setActivityInfo(params)
ModuleManager.ActPvpManager:reqActData()
end,
[4] = function(params)
DataManager.FullMoonData:setActStatus(params)
ModuleManager.FullMoonManager:reqActData()
end,
}
DataManager.waitOpenActivity = {
@ -519,6 +528,10 @@ DataManager.waitOpenActivity = {
DataManager.ActPvpData:setActivityId(params.id)
DataManager.ActPvpData:setActivityInfo(params)
end,
[4] = function(params)
DataManager.FullMoonData:setActStatus(params)
ModuleManager.FullMoonManager:initTimer()
end,
}
return DataManager

1
lua/app/common/event_manager.lua
View File

@ -60,6 +60,7 @@ EventManager.CUSTOM_EVENT = {
-- BORAD_TOUCH_OVER = "BORAD_TOUCH_OVER"
DUNGEON_ARMOR_TO_TARGET_ID = "DUNGEON_ARMOR_TO_TARGET_ID",
ACTIVITY_SUMMER_END = "ACTIVITY_SUMMER_END",
ACTIVITY_FULL_MOON_END = "ACTIVITY_FULL_MOON_END",
MAIN_UI_CHECK_SIDE_BAR = "MAIN_UI_CHECK_SIDE_BAR",
FORMATION_CHANGE = "FORMATION_CHANGE",
BATTLE_REBIRTH = "BATTLE_REBIRTH",

4
lua/app/common/module_manager.lua
View File

@ -69,12 +69,16 @@ local MODULE_PATHS = {
EquipManager = "app/module/equip/equip_manager",
-- 皮肤
SkinManager = "app/module/skin/skin_manager",
-- 皮肤
RunesManager = "app/module/runes/runes_manager",
-- 英雄基金
HeroFundManager = "app/module/activity/hero_fund/hero_fund_manager",
-- 世界首领活动
ActBossRushManager = "app/module/activity/act_boss_rush/act_boss_rush_manager",
-- 新手14天乐
FourteenDayManager = "app/module/activity/fourteen_day/fourteen_day_manager",
-- 圆月活动
FullMoonManager = "app/module/activity/full_moon/full_moon_manager",
-- 符文副本
DungeonRuneManager = "app/module/dungeon_rune/dungeon_rune_manager",
-- 梦魇酒馆

14
lua/app/common/pay_manager.lua
View File

@ -28,6 +28,10 @@ PayManager.PURCHARSE_ACT_TYPE = {
ARMOR_UPGRADE_GIFT = 16,
FOURTEEN_DAY_GIFT = 17,
ACT_PVP_BOUNTY = 22,
FULL_MOON_HERO_GIFT = 18,
FULL_MOON_NEW_HERO_GIFT = 19,
FULL_MOON_SKIN_GIFT = 20,
RUNES_GIFT = 21,
}
PayManager.PURCHARSE_TYPE_CONFIG = {
@ -58,6 +62,10 @@ PayManager.BI_ITEM_GET_TYPE = {
[PayManager.PURCHARSE_ACT_TYPE.ARMOR_UPGRADE_GIFT] = BIReport.ITEM_GET_TYPE.ARMOR_GIFT,
[PayManager.PURCHARSE_ACT_TYPE.FOURTEEN_DAY_GIFT] = BIReport.ITEM_GET_TYPE.FOURTEEN_DAY_GIFT,
[PayManager.PURCHARSE_ACT_TYPE.ACT_PVP_BOUNTY] = BIReport.ITEM_GET_TYPE.ACT_PVP_BOUNTY_GIFT,
[PayManager.PURCHARSE_ACT_TYPE.FULL_MOON_HERO_GIFT] = BIReport.ITEM_GET_TYPE.FULL_MOON_HERO_GIFT,
[PayManager.PURCHARSE_ACT_TYPE.FULL_MOON_NEW_HERO_GIFT] = BIReport.ITEM_GET_TYPE.FULL_MOON_NEW_HERO_GIFT,
[PayManager.PURCHARSE_ACT_TYPE.FULL_MOON_SKIN_GIFT] = BIReport.ITEM_GET_TYPE.FULL_MOON_SKIN_GIFT,
[PayManager.PURCHARSE_ACT_TYPE.RUNES_GIFT] = BIReport.ITEM_GET_TYPE.RUNES_GIFT,
},
[PayManager.PURCHARSE_TYPE.ACT_GOLD_PIG] = BIReport.ITEM_GET_TYPE.GOLD_PIG,
[PayManager.PURCHARSE_TYPE.MALL_TREASURE] = BIReport.ITEM_GET_TYPE.MALL_TREASURE,
@ -80,11 +88,15 @@ PayManager.BI_GIFT_TYPE = {
[PayManager.PURCHARSE_ACT_TYPE.WEAPON_GIFT] = BIReport.GIFT_TYPE.WEAPON_GIFT,
[PayManager.PURCHARSE_ACT_TYPE.ARMOR_GIFT] = BIReport.GIFT_TYPE.ARMOR_GIFT,
[PayManager.PURCHARSE_ACT_TYPE.ACT_SUMMER] = BIReport.GIFT_TYPE.ACT_SUMMER,
[PayManager.PURCHARSE_ACT_TYPE.ACT_HERO_FUND] = BIReport.ITEM_GET_TYPE.ACT_HERO_FUND,
[PayManager.PURCHARSE_ACT_TYPE.ACT_HERO_FUND] = BIReport.GIFT_TYPE.ACT_HERO_FUND,
[PayManager.PURCHARSE_ACT_TYPE.WEAPON_UPGRADE_GIFT] = BIReport.GIFT_TYPE.WEAPON_GIFT,
[PayManager.PURCHARSE_ACT_TYPE.ARMOR_UPGRADE_GIFT] = BIReport.GIFT_TYPE.ARMOR_GIFT,
[PayManager.PURCHARSE_ACT_TYPE.FOURTEEN_DAY_GIFT] = BIReport.GIFT_TYPE.FOURTEEN_DAY_GIFT,
[PayManager.PURCHARSE_ACT_TYPE.ACT_PVP_BOUNTY] = BIReport.GIFT_TYPE.ACT_PVP_BOUNTY_GIFT,
[PayManager.PURCHARSE_ACT_TYPE.FULL_MOON_HERO_GIFT] = BIReport.GIFT_TYPE.FULL_MOON_HERO_GIFT,
[PayManager.PURCHARSE_ACT_TYPE.FULL_MOON_NEW_HERO_GIFT] = BIReport.GIFT_TYPE.FULL_MOON_NEW_HERO_GIFT,
[PayManager.PURCHARSE_ACT_TYPE.FULL_MOON_SKIN_GIFT] = BIReport.GIFT_TYPE.FULL_MOON_SKIN_GIFT,
[PayManager.PURCHARSE_ACT_TYPE.RUNES_GIFT] = BIReport.GIFT_TYPE.RUNES_GIFT,
},
[PayManager.PURCHARSE_TYPE.ACT_GOLD_PIG] = BIReport.GIFT_TYPE.GOLD_PIG,
[PayManager.PURCHARSE_TYPE.MALL_TREASURE] = BIReport.GIFT_TYPE.MALL_TREASURE,

1
lua/app/common/server_push_manager.lua
View File

@ -23,6 +23,7 @@ function ServerPushManager:initWhenLogin()
self:addServerPushListener(ProtoMsgType.FromMsgEnum.AIHelpUnreadNtf, ModuleManager.GameSettingManager, ModuleManager.GameSettingManager.rspAiHelperNtf)
self:addServerPushListener(ProtoMsgType.FromMsgEnum.RecoveryNtf, ModuleManager.ItemManager, ModuleManager.ItemManager.rspRecoveryNtf)
self:addServerPushListener(ProtoMsgType.FromMsgEnum.BossRushBoughtNtf, ModuleManager.ActBossRushManager, ModuleManager.ActBossRushManager.rspBossRushBoughtNtf)
self:addServerPushListener(ProtoMsgType.FromMsgEnum.RuneUpdateNtf, ModuleManager.RunesManager, ModuleManager.RunesManager.rspUpdate)
end
---- 移除全局推送监听

8
lua/app/config/act_gift.lua
View File

@ -5059,8 +5059,8 @@ local act_gift = {
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=3400101,
["id_for_nothing"]="VQxcA2RRfg==",
["id"]=5400401,
["id_for_nothing"]="UwxcA2FRfg==",
["num"]=1,
["num_for_nothing"]="Vw=="
}
@ -5091,8 +5091,8 @@ local act_gift = {
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=5400101,
["id_for_nothing"]="UwxcA2RRfg==",
["id"]=4400201,
["id_for_nothing"]="UgxcA2dRfg==",
["num"]=1,
["num_for_nothing"]="Vw=="
}

4
lua/app/config/activity_full_moon_reward.lua
View File

@ -114,8 +114,8 @@ local activity_full_moon_reward = {
["reward"]={
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=5300101,
["id_for_nothing"]="UwtcA2RRfg==",
["id"]=2300201,
["id_for_nothing"]="VAtcA2dRfg==",
["num"]=1,
["num_for_nothing"]="Vw=="
}

2
lua/app/config/activity_pvp_board.lua.meta
View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: eec0aaed6b62d6742906ac31143602d1
guid: 0ea07987f5138fd4783f9cb9509cf506
ScriptedImporter:
internalIDToNameTable: []
externalObjects: {}

14
lua/app/config/avatar.lua
View File

@ -171,9 +171,21 @@ local avatar = {
[1400101]={
["iconId"]="16_1",
["item"]=1400101
},
[2300201]={
["iconId"]="10_1",
["item"]=2300201
},
[4400201]={
["iconId"]="20_1",
["item"]=4400201
},
[5400401]={
["iconId"]="16_1",
["item"]=5400401
}
}
local config = {
data=avatar,count=42
data=avatar,count=45
}
return config

1588
lua/app/config/chapter_dungeon_rune.lua
View File

File diff suppressed because it is too large Load Diff

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

@ -441,6 +441,9 @@ local const = {
["num_for_nothing"]="Uw=="
}
},
["runes_red_point"]={
["value"]=1000
},
["dungeon_rune_lvlimit"]={
["value"]=20
},
@ -523,6 +526,6 @@ local const = {
}
}
local config = {
data=const,count=104
data=const,count=105
}
return config

6
lua/app/config/hero.lua
View File

@ -1620,7 +1620,8 @@ local hero = {
["is_show"]=1,
["collection_point"]=5,
["skin"]={
44002
44002,
4400201
}
},
[44003]={
@ -2180,7 +2181,8 @@ local hero = {
["item_id"]=54004,
["collection_point"]=5,
["skin"]={
54004
54004,
5400401
}
}
}

14
lua/app/config/item.lua
View File

@ -2451,9 +2451,21 @@ local item = {
["parameter"]=2300201,
["qlt"]=2,
["icon"]="2300201"
},
[4400201]={
["type"]=12,
["parameter"]=4400201,
["qlt"]=4,
["icon"]="4400201"
},
[5400401]={
["type"]=12,
["parameter"]=5400401,
["qlt"]=4,
["icon"]="5400401"
}
}
local config = {
data=item,count=126
data=item,count=128
}
return config

46
lua/app/config/monster_activity.lua
View File

@ -771,47 +771,39 @@ local monster_activity = {
["monster_exp"]=15000
},
[10004]={
["monster_base"]=20047,
["monster_base"]=30043,
["is_boss"]=1,
["hp"]=107230000,
["atk"]=930000,
["hp"]=245450000,
["atk"]=910000,
["atk_times"]=4,
["hurt_skill"]={
30156,
30157,
30158
50138,
50139,
50140,
50141
},
["skill"]={
10137,
10138
50142,
50143
},
["passive_skill"]={
10013,
10010
},
["monster_exp"]=15000
["monster_exp"]=350000
},
[10104]={
["monster_base"]=20048,
["monster_base"]=30044,
["is_boss"]=1,
["hp"]=107230000,
["atk"]=930000,
["hp"]=245450000,
["atk"]=910000,
["atk_times"]=4,
["hurt_skill"]={
30159,
30160,
30161
50144,
50145,
50146,
50147
},
["skill"]={
10139,
10140
50148
},
["passive_skill"]={
10141,
10014,
10009
},
["monster_exp"]=15000
["monster_exp"]=350000
}
}
local config = {

42
lua/app/config/monster_base.lua
View File

@ -620,52 +620,52 @@ local monster_base = {
["model_ui"]=1.0
},
[20049]={
["model_id"]="m20039",
["model_id"]="m20049",
["body"]=1,
["model_ui"]=0.8
["model_ui"]=1.0
},
[20050]={
["model_id"]="m20040",
["model_id"]="m20051",
["body"]=1,
["model_ui"]=0.8
["model_ui"]=1.0
},
[20051]={
["model_id"]="m20041",
["model_id"]="m20053",
["body"]=1,
["model_ui"]=0.8
["model_ui"]=1.0
},
[20052]={
["model_id"]="m20042",
["model_id"]="m20052",
["body"]=1,
["model_ui"]=0.8
["model_ui"]=1.0
},
[20053]={
["model_id"]="m20043",
["model_id"]="m20056",
["body"]=1,
["model_ui"]=0.8
["model_ui"]=1.0
},
[20054]={
["model_id"]="m20044",
["model_id"]="m20057",
["body"]=1,
["model_ui"]=1.0
},
[20055]={
["model_id"]="m20045",
["model_id"]="m20058",
["body"]=1,
["model_ui"]=1.0
},
[20056]={
["model_id"]="m20046",
["model_id"]="m20054",
["body"]=1,
["model_ui"]=1.0
},
[20057]={
["model_id"]="m20047",
["model_id"]="m20055",
["body"]=1,
["model_ui"]=1.0
},
[20058]={
["model_id"]="m20048",
["model_id"]="m20050",
["body"]=1,
["model_ui"]=1.0
},
@ -793,9 +793,19 @@ local monster_base = {
["model_id"]="p0026",
["body"]=2,
["model_ui"]=1.0
},
[30043]={
["model_id"]="p0043",
["body"]=2,
["model_ui"]=1.0
},
[30044]={
["model_id"]="p0044",
["body"]=2,
["model_ui"]=1.0
}
}
local config = {
data=monster_base,count=159
data=monster_base,count=161
}
return config

619
lua/app/config/skill.lua
View File

File diff suppressed because it is too large Load Diff

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

@ -1518,6 +1518,9 @@ local skill_rogue = {
["icon"]="235"
},
[1400401]={
["buff_id"]={
"charm"
},
["limit_times"]=1,
["weight"]=3000,
["qlt"]=4,
@ -1578,6 +1581,9 @@ local skill_rogue = {
["icon"]="266"
},
[1400404]={
["buff_id"]={
"charm"
},
["unlock"]=1400401,
["cover_unlock"]=1400401,
["limit_times"]=1,
@ -1597,6 +1603,9 @@ local skill_rogue = {
["icon"]="267"
},
[1400405]={
["buff_id"]={
"normal_attack_add"
},
["limit_times"]=1,
["weight"]=3000,
["qlt"]=4,
@ -2523,6 +2532,9 @@ local skill_rogue = {
["icon"]="237"
},
[2400403]={
["buff_id"]={
"stun"
},
["limit_times"]=1,
["weight"]=3000,
["qlt"]=4,
@ -2567,6 +2579,9 @@ local skill_rogue = {
["icon"]="239"
},
[2400405]={
["buff_id"]={
"bleed"
},
["limit_times"]=1,
["weight"]=3000,
["qlt"]=4,
@ -2587,20 +2602,23 @@ local skill_rogue = {
["limit_times"]=1,
["weight"]=3000,
["qlt"]=3,
["type"]=12,
["type"]=9,
["skill_position"]=2,
["effect"]={
{
["type"]="add_skill",
["num"]=2400422,
["ratio"]=10000,
["round"]=1
["round"]=999
}
},
["obj"]=4,
["icon"]="241"
},
[2400407]={
["buff_id"]={
"stun"
},
["unlock"]=2400403,
["cover_unlock"]=2400403,
["limit_times"]=1,
@ -3458,6 +3476,9 @@ local skill_rogue = {
["icon"]="243"
},
[3400402]={
["buff_id"]={
"poison"
},
["limit_times"]=1,
["weight"]=3000,
["qlt"]=3,
@ -4398,13 +4419,16 @@ local skill_rogue = {
["qlt"]=3,
["type"]=8,
["parameter"]={
5,
4,
1
},
["skill_position"]=4,
["icon"]="252"
},
[4400404]={
["buff_id"]={
"corrupt"
},
["limit_times"]=1,
["weight"]=3000,
["qlt"]=4,
@ -4422,6 +4446,9 @@ local skill_rogue = {
["icon"]="253"
},
[4400405]={
["buff_id"]={
"rebirth"
},
["limit_times"]=1,
["weight"]=3000,
["qlt"]=4,
@ -4466,6 +4493,9 @@ local skill_rogue = {
["icon"]="255"
},
[4400407]={
["buff_id"]={
"rebirth"
},
["unlock"]=4400405,
["cover_unlock"]=4400405,
["limit_times"]=1,
@ -5337,6 +5367,9 @@ local skill_rogue = {
["icon"]="258"
},
[5400403]={
["buff_id"]={
"immune"
},
["limit_times"]=1,
["weight"]=3000,
["qlt"]=4,
@ -5354,6 +5387,9 @@ local skill_rogue = {
["icon"]="259"
},
[5400404]={
["buff_id"]={
"counterattack"
},
["limit_times"]=1,
["weight"]=3000,
["qlt"]=4,
@ -5371,6 +5407,9 @@ local skill_rogue = {
["icon"]="260"
},
[5400405]={
["buff_id"]={
"immune"
},
["unlock"]=5400403,
["cover_unlock"]=5400403,
["limit_times"]=1,
@ -5407,6 +5446,9 @@ local skill_rogue = {
["icon"]="262"
},
[5400407]={
["buff_id"]={
"undead"
},
["limit_times"]=1,
["weight"]=3000,
["qlt"]=4,

54
lua/app/config/skin.lua
View File

@ -259,6 +259,32 @@ local skin = {
["skin_point"]=0,
["hero_id"]=44002
},
[4400201]={
["model_id"]="p0044",
["qlt"]=4,
["bonus"]={
{
["type"]="attr_crit_blue",
["num"]=500
},
{
["type"]="attr_crit_time_blue",
["num"]=2000
}
},
["icon"]="20_1",
["got"]=1,
["skin_point"]=15,
["hero_id"]=44002,
["item_id"]=4400201,
["skill_show"]={
44002011,
44002012,
44002013,
44002014,
44002015
}
},
[44003]={
["model_id"]="p0030",
["qlt"]=1,
@ -364,9 +390,35 @@ local skin = {
["qlt"]=1,
["skin_point"]=0,
["hero_id"]=54004
},
[5400401]={
["model_id"]="p0043",
["qlt"]=4,
["bonus"]={
{
["type"]="attr_crit_purple",
["num"]=500
},
{
["type"]="attr_crit_time_purple",
["num"]=2000
}
},
["icon"]="20_1",
["got"]=1,
["skin_point"]=15,
["hero_id"]=54004,
["item_id"]=5400401,
["skill_show"]={
54004011,
54004012,
54004013,
54004014,
54004015
}
}
}
local config = {
data=skin,count=41
data=skin,count=43
}
return config

146
lua/app/config/skin_skill.lua
View File

@ -451,9 +451,153 @@ local skin_skill = {
400
},
["fx_self_mirror"]=400004
},
[44002011]={
["skill_position"]={
2,
0
},
["shake_time"]=100,
["shake_type"]=1,
["sound_hit"]={
10005
},
["name_act"]="attack01",
["fx_self"]=300110,
["fx_self_mirror"]=400110
},
[44002012]={
["skill_position"]={
2,
0
},
["shake_time"]=100,
["shake_type"]=1,
["sound_hit"]={
10006
},
["name_act"]="attack02",
["fx_self"]=300110,
["fx_self_mirror"]=400110
},
[44002013]={
["skill_position"]={
2,
0
},
["shake_time"]=100,
["shake_type"]=1,
["sound_hit"]={
10023
},
["name_act"]="attack03",
["fx_self"]=300110,
["fx_self_mirror"]=400110
},
[44002014]={
["skill_position"]={
2,
0
},
["shake_time"]=100,
["shake_type"]=1,
["sound_hit"]={
10048
},
["name_act"]="attack04",
["fx_self"]=300110,
["fx_self_mirror"]=400110
},
[44002015]={
["skill_position"]={
2,
0
},
["shake_time"]=200,
["shake_type"]=6,
["sound"]=44002200,
["sound_delay"]=0.0,
["name_act"]="skill01",
["fx_self"]=300111,
["bullet_time"]={
1333,
3000,
400
},
["fx_self_mirror"]=400111
},
[54004011]={
["skill_position"]={
1,
25
},
["shake_time"]=100,
["shake_type"]=2,
["sound"]=5400410,
["sound_delay"]=0.0,
["name_act"]="attack01",
["fx_self"]=300160,
["fx_self_mirror"]=400160
},
[54004012]={
["skill_position"]={
1,
25
},
["shake_time"]=100,
["shake_type"]=2,
["sound"]=5400411,
["sound_delay"]=0.0,
["name_act"]="attack02",
["fx_self"]=300161,
["fx_self_mirror"]=400161
},
[54004013]={
["skill_position"]={
1,
25
},
["shake_time"]=100,
["shake_type"]=1,
["sound"]=5400412,
["sound_delay"]=0.0,
["name_act"]="attack03",
["fx_self"]=300162,
["fx_self_mirror"]=400162
},
[54004014]={
["skill_position"]={
1,
25
},
["shake_time"]=100,
["shake_type"]=2,
["sound"]=5400413,
["sound_delay"]=0.0,
["name_act"]="attack04",
["fx_self"]=300163,
["fx_self_mirror"]=400163
},
[54004015]={
["skill_position"]={
1,
25
},
["shake_time"]=200,
["shake_type"]=6,
["sound"]=5400420,
["sound_delay"]=0.0,
["name_act"]="skill01",
["fx_self"]=300164,
["bullet_time"]={
1666,
3000,
400
},
["fx_self_mirror"]=400164
}
}
local config = {
data=skin_skill,count=30
data=skin_skill,count=40
}
return config

11
lua/app/config/strings/cn/avatar.lua
View File

@ -124,9 +124,18 @@ local avatar = {
},
[1400101]={
["desc"]="遗迹战甲"
},
[2300201]={
["desc"]="黑剑士"
},
[4400201]={
["desc"]="新月女王"
},
[5400401]={
["desc"]="暗月武神"
}
}
local config = {
data=avatar,count=42
data=avatar,count=45
}
return config

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

@ -596,9 +596,9 @@ local localization_global =
["ACT_PVP_DESC_13"] = "是否消耗{0}钻石刷新",
["ACT_PVP_DESC_14"] = "总胜场数",
["ACT_PVP_DESC_15"] = "酒馆积分",
["ACT_PVP_DESC_16"] = "酒馆描述",
["ACT_PVP_DESC_16"] = "欢迎入股酒馆基金，在酒馆挑战对手，累计积分可领取奖励分红哟~",
["ACT_PVP_DESC_17"] = "累计胜场",
["ACT_PVP_DESC_18"] = "排行榜帮助",
["ACT_PVP_DESC_18"] = "1.活动前七天可以挑战，累计胜场排名。\n2.第八天可领取排行榜奖励，第八天无挑战。",
}
return localization_global

11
lua/app/config/strings/cn/item.lua
View File

@ -474,9 +474,18 @@ local item = {
[5400101]={
["name"]="翩然起舞",
["desc"]="蝴蝶的新衣装。"
},
[2300201]={
["name"]="黑剑士"
},
[4400201]={
["name"]="新月女王"
},
[5400401]={
["name"]="暗月武神"
}
}
local config = {
data=item,count=119
data=item,count=122
}
return config

8
lua/app/config/strings/cn/skill_rogue.lua
View File

@ -885,7 +885,7 @@ local skill_rogue = {
["desc"]="啊，打！沿＋方向可额外消除<color=#3cff28>4</color>格。"
},
[2400403]={
["desc"]="龙哥普攻有<color=#3cff28>5%</color>概率附加<color=#3cff28>眩晕</color>效果，<color=#3cff28>1</color>回合。"
["desc"]="李普攻有<color=#3cff28>5%</color>概率附加<color=#3cff28>眩晕</color>效果，<color=#3cff28>1</color>回合。"
},
[2400404]={
["desc"]="啊，打！沿X方向可额外消除<color=#3cff28>4</color>格。"
@ -894,7 +894,7 @@ local skill_rogue = {
["desc"]="啊，打！可附加<color=#3cff28>流血</color>效果，<color=#3cff28>2</color>回合。"
},
[2400406]={
["desc"]="<color=#fcff28>Combo</color>:龙哥普攻对<color=#3cff28>冰霜</color>和<color=#3cff28>流血</color>敌人额外增伤。"
["desc"]="<color=#fcff28>Combo</color>:李普攻对<color=#3cff28>冰霜</color>和<color=#3cff28>灼烧</color>敌人额外增伤。"
},
[2400407]={
["desc"]="啊，打！附加的<color=#3cff28>眩晕</color>效果概率提高至<color=#3cff28>10%</color>，回合数<color=#3cff28>+1</color>。"
@ -927,7 +927,7 @@ local skill_rogue = {
["desc"]="解锁飞棺降物：额外造成多次技能伤害，附加<color=#fcb501>冰霜</color>效果，<color=#3cff28>1</color>回合。"
},
[4400401]={
["desc"]="已逝行者普攻有<color=#3cff28>10%</color>概率附加<color=#3cff28>腐败</color>效果，<color=#3cff28>2</color>回合。"
["desc"]="牧魂者普攻有<color=#3cff28>10%</color>概率附加<color=#3cff28>腐败</color>效果，<color=#3cff28>2</color>回合。"
},
[4400402]={
["desc"]="飞棺降物可附加<color=#3cff28>虚弱</color>效果，<color=#3cff28>2</color>回合。"
@ -936,7 +936,7 @@ local skill_rogue = {
["desc"]="飞棺降物附加的<color=#3cff28>冰霜</color>效果，回合数<color=#3cff28>+1</color>。"
},
[4400404]={
["desc"]="<color=#fcff28>Combo</color>:已逝行者普攻<color=#3cff28>腐败</color>敌人将恢复生命。"
["desc"]="<color=#fcff28>Combo</color>:牧魂者普攻<color=#3cff28>腐败</color>敌人将恢复生命。"
},
[4400405]={
["desc"]="飞棺降物释放后为团队附加<color=#3cff28>重生</color>效果，<color=#3cff28>1</color>回合。"

10
lua/app/config/strings/cn/skin.lua
View File

@ -36,7 +36,7 @@ local skin = {
["value"]="初始"
},
[2300201]={
["value"]="Z丫"
["value"]="黑剑士"
},
[24001]={
["value"]="初始"
@ -89,6 +89,9 @@ local skin = {
[44002]={
["value"]="初始"
},
[4400201]={
["value"]="新月女王"
},
[44003]={
["value"]="初始"
},
@ -121,9 +124,12 @@ local skin = {
},
[54004]={
["value"]="初始"
},
[5400401]={
["value"]="暗月武神"
}
}
local config = {
data=skin,count=41
data=skin,count=43
}
return config

11
lua/app/config/strings/de/avatar.lua
View File

@ -124,9 +124,18 @@ local avatar = {
},
[1400101]={
},
[2300201]={
},
[4400201]={
},
[5400401]={
}
}
local config = {
data=avatar,count=42
data=avatar,count=45
}
return config

11
lua/app/config/strings/de/item.lua
View File

@ -355,9 +355,18 @@ local item = {
},
[5400101]={
},
[2300201]={
},
[4400201]={
},
[5400401]={
}
}
local config = {
data=item,count=119
data=item,count=122
}
return config

8
lua/app/config/strings/de/skin.lua
View File

@ -88,6 +88,9 @@ local skin = {
},
[44002]={
},
[4400201]={
},
[44003]={
@ -121,9 +124,12 @@ local skin = {
},
[54004]={
},
[5400401]={
}
}
local config = {
data=skin,count=41
data=skin,count=43
}
return config

11
lua/app/config/strings/en/avatar.lua
View File

@ -124,9 +124,18 @@ local avatar = {
},
[1400101]={
["desc"]="Relic Armor"
},
[2300201]={
},
[4400201]={
},
[5400401]={
}
}
local config = {
data=avatar,count=42
data=avatar,count=45
}
return config

11
lua/app/config/strings/en/item.lua
View File

@ -470,9 +470,18 @@ local item = {
[5400101]={
["name"]="Graceful Dance",
["desc"]="Butterfly's new outfit."
},
[2300201]={
},
[4400201]={
},
[5400401]={
}
}
local config = {
data=item,count=119
data=item,count=122
}
return config

8
lua/app/config/strings/en/skin.lua
View File

@ -88,6 +88,9 @@ local skin = {
},
[44002]={
["value"]="Initial"
},
[4400201]={
},
[44003]={
["value"]="Initial"
@ -121,9 +124,12 @@ local skin = {
},
[54004]={
["value"]="Initial"
},
[5400401]={
}
}
local config = {
data=skin,count=41
data=skin,count=43
}
return config

11
lua/app/config/strings/es/avatar.lua
View File

@ -124,9 +124,18 @@ local avatar = {
},
[1400101]={
["desc"]="Armadura de Ruinas"
},
[2300201]={
},
[4400201]={
},
[5400401]={
}
}
local config = {
data=avatar,count=42
data=avatar,count=45
}
return config

11
lua/app/config/strings/es/item.lua
View File

@ -470,9 +470,18 @@ local item = {
[5400101]={
["name"]="Danza Elegante",
["desc"]="Traje nuevo de Mariposa."
},
[2300201]={
},
[4400201]={
},
[5400401]={
}
}
local config = {
data=item,count=119
data=item,count=122
}
return config

8
lua/app/config/strings/es/skin.lua
View File

@ -88,6 +88,9 @@ local skin = {
},
[44002]={
["value"]="Inicial"
},
[4400201]={
},
[44003]={
["value"]="Inicial"
@ -121,9 +124,12 @@ local skin = {
},
[54004]={
["value"]="Inicial"
},
[5400401]={
}
}
local config = {
data=skin,count=41
data=skin,count=43
}
return config

11
lua/app/config/strings/fr/avatar.lua
View File

@ -124,9 +124,18 @@ local avatar = {
},
[1400101]={
},
[2300201]={
},
[4400201]={
},
[5400401]={
}
}
local config = {
data=avatar,count=42
data=avatar,count=45
}
return config

11
lua/app/config/strings/fr/item.lua
View File

@ -355,9 +355,18 @@ local item = {
},
[5400101]={
},
[2300201]={
},
[4400201]={
},
[5400401]={
}
}
local config = {
data=item,count=119
data=item,count=122
}
return config

8
lua/app/config/strings/fr/skin.lua
View File

@ -88,6 +88,9 @@ local skin = {
},
[44002]={
},
[4400201]={
},
[44003]={
@ -121,9 +124,12 @@ local skin = {
},
[54004]={
},
[5400401]={
}
}
local config = {
data=skin,count=41
data=skin,count=43
}
return config

11
lua/app/config/strings/id/avatar.lua
View File

@ -124,9 +124,18 @@ local avatar = {
},
[1400101]={
["desc"]="Armor Relik"
},
[2300201]={
},
[4400201]={
},
[5400401]={
}
}
local config = {
data=avatar,count=42
data=avatar,count=45
}
return config

11
lua/app/config/strings/id/item.lua
View File

@ -470,9 +470,18 @@ local item = {
[5400101]={
["name"]="Tarian Anggun",
["desc"]="Outfit baru Kupu-kupu."
},
[2300201]={
},
[4400201]={
},
[5400401]={
}
}
local config = {
data=item,count=119
data=item,count=122
}
return config

8
lua/app/config/strings/id/skin.lua
View File

@ -88,6 +88,9 @@ local skin = {
},
[44002]={
["value"]="Awal"
},
[4400201]={
},
[44003]={
["value"]="Awal"
@ -121,9 +124,12 @@ local skin = {
},
[54004]={
["value"]="Awal"
},
[5400401]={
}
}
local config = {
data=skin,count=41
data=skin,count=43
}
return config

11
lua/app/config/strings/ja/avatar.lua
View File

@ -124,9 +124,18 @@ local avatar = {
},
[1400101]={
["desc"]="レリックアーマー"
},
[2300201]={
},
[4400201]={
},
[5400401]={
}
}
local config = {
data=avatar,count=42
data=avatar,count=45
}
return config

11
lua/app/config/strings/ja/item.lua
View File

@ -470,9 +470,18 @@ local item = {
[5400101]={
["name"]="グレイスフルダンス",
["desc"]="蝴蝶の新スキン。"
},
[2300201]={
},
[4400201]={
},
[5400401]={
}
}
local config = {
data=item,count=119
data=item,count=122
}
return config

8
lua/app/config/strings/ja/skin.lua
View File

@ -88,6 +88,9 @@ local skin = {
},
[44002]={
["value"]="デフォルト"
},
[4400201]={
},
[44003]={
["value"]="デフォルト"
@ -121,9 +124,12 @@ local skin = {
},
[54004]={
["value"]="デフォルト"
},
[5400401]={
}
}
local config = {
data=skin,count=41
data=skin,count=43
}
return config

11
lua/app/config/strings/ko/avatar.lua
View File

@ -124,9 +124,18 @@ local avatar = {
},
[1400101]={
["desc"]="유적 갑옷"
},
[2300201]={
},
[4400201]={
},
[5400401]={
}
}
local config = {
data=avatar,count=42
data=avatar,count=45
}
return config

11
lua/app/config/strings/ko/item.lua
View File

@ -470,9 +470,18 @@ local item = {
[5400101]={
["name"]="날아오르는 춤",
["desc"]="나비의 새 옷"
},
[2300201]={
},
[4400201]={
},
[5400401]={
}
}
local config = {
data=item,count=119
data=item,count=122
}
return config

8
lua/app/config/strings/ko/skin.lua
View File

@ -88,6 +88,9 @@ local skin = {
},
[44002]={
["value"]="초기"
},
[4400201]={
},
[44003]={
["value"]="초기"
@ -121,9 +124,12 @@ local skin = {
},
[54004]={
["value"]="초기"
},
[5400401]={
}
}
local config = {
data=skin,count=41
data=skin,count=43
}
return config

11
lua/app/config/strings/pt/avatar.lua
View File

@ -124,9 +124,18 @@ local avatar = {
},
[1400101]={
["desc"]="Armadura das Ruínas"
},
[2300201]={
},
[4400201]={
},
[5400401]={
}
}
local config = {
data=avatar,count=42
data=avatar,count=45
}
return config

11
lua/app/config/strings/pt/item.lua
View File

@ -470,9 +470,18 @@ local item = {
[5400101]={
["name"]="Dança Fluida",
["desc"]="A nova roupa da Borboleta."
},
[2300201]={
},
[4400201]={
},
[5400401]={
}
}
local config = {
data=item,count=119
data=item,count=122
}
return config

8
lua/app/config/strings/pt/skin.lua
View File

@ -88,6 +88,9 @@ local skin = {
},
[44002]={
["value"]="Inicial"
},
[4400201]={
},
[44003]={
["value"]="Inicial"
@ -121,9 +124,12 @@ local skin = {
},
[54004]={
["value"]="Inicial"
},
[5400401]={
}
}
local config = {
data=skin,count=41
data=skin,count=43
}
return config

11
lua/app/config/strings/ru/avatar.lua
View File

@ -124,9 +124,18 @@ local avatar = {
},
[1400101]={
},
[2300201]={
},
[4400201]={
},
[5400401]={
}
}
local config = {
data=avatar,count=42
data=avatar,count=45
}
return config

11
lua/app/config/strings/ru/item.lua
View File

@ -355,9 +355,18 @@ local item = {
},
[5400101]={
},
[2300201]={
},
[4400201]={
},
[5400401]={
}
}
local config = {
data=item,count=119
data=item,count=122
}
return config

8
lua/app/config/strings/ru/skin.lua
View File

@ -88,6 +88,9 @@ local skin = {
},
[44002]={
},
[4400201]={
},
[44003]={
@ -121,9 +124,12 @@ local skin = {
},
[54004]={
},
[5400401]={
}
}
local config = {
data=skin,count=41
data=skin,count=43
}
return config

11
lua/app/config/strings/th/avatar.lua
View File

@ -124,9 +124,18 @@ local avatar = {
},
[1400101]={
["desc"]="เกราะรบซาก"
},
[2300201]={
},
[4400201]={
},
[5400401]={
}
}
local config = {
data=avatar,count=42
data=avatar,count=45
}
return config

11
lua/app/config/strings/th/item.lua
View File

@ -470,9 +470,18 @@ local item = {
[5400101]={
["name"]="เยื้องกรายเต้นรำ",
["desc"]="ชุดใหม่ของผีเสื้อ"
},
[2300201]={
},
[4400201]={
},
[5400401]={
}
}
local config = {
data=item,count=119
data=item,count=122
}
return config

8
lua/app/config/strings/th/skin.lua
View File

@ -88,6 +88,9 @@ local skin = {
},
[44002]={
["value"]="เริ่มต้น"
},
[4400201]={
},
[44003]={
["value"]="เริ่มต้น"
@ -121,9 +124,12 @@ local skin = {
},
[54004]={
["value"]="เริ่มต้น"
},
[5400401]={
}
}
local config = {
data=skin,count=41
data=skin,count=43
}
return config

11
lua/app/config/strings/vi/avatar.lua
View File

@ -124,9 +124,18 @@ local avatar = {
},
[1400101]={
["desc"]="Giáp Di Tích"
},
[2300201]={
},
[4400201]={
},
[5400401]={
}
}
local config = {
data=avatar,count=42
data=avatar,count=45
}
return config

11
lua/app/config/strings/vi/item.lua
View File

@ -470,9 +470,18 @@ local item = {
[5400101]={
["name"]="Nhảy Múa Nhanh Nhẹn",
["desc"]="Quần áo mới của Bươm Bướm."
},
[2300201]={
},
[4400201]={
},
[5400401]={
}
}
local config = {
data=item,count=119
data=item,count=122
}
return config

8
lua/app/config/strings/vi/skin.lua
View File

@ -88,6 +88,9 @@ local skin = {
},
[44002]={
["value"]="Ban Đầu"
},
[4400201]={
},
[44003]={
["value"]="Ban Đầu"
@ -121,9 +124,12 @@ local skin = {
},
[54004]={
["value"]="Ban Đầu"
},
[5400401]={
}
}
local config = {
data=skin,count=41
data=skin,count=43
}
return config

11
lua/app/config/strings/zh/avatar.lua
View File

@ -124,9 +124,18 @@ local avatar = {
},
[1400101]={
["desc"]="遺跡戰甲"
},
[2300201]={
},
[4400201]={
},
[5400401]={
}
}
local config = {
data=avatar,count=42
data=avatar,count=45
}
return config

11
lua/app/config/strings/zh/item.lua
View File

@ -470,9 +470,18 @@ local item = {
[5400101]={
["name"]="翩然起舞",
["desc"]="蝴蝶的新服裝。"
},
[2300201]={
},
[4400201]={
},
[5400401]={
}
}
local config = {
data=item,count=119
data=item,count=122
}
return config

8
lua/app/config/strings/zh/skin.lua
View File

@ -88,6 +88,9 @@ local skin = {
},
[44002]={
["value"]="初始"
},
[4400201]={
},
[44003]={
["value"]="初始"
@ -121,9 +124,12 @@ local skin = {
},
[54004]={
["value"]="初始"
},
[5400401]={
}
}
local config = {
data=skin,count=41
data=skin,count=43
}
return config

2
lua/app/config/task_type.lua.meta
View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 06cee74f7d55a4049a81d89bfe1caa02
guid: a1f8b50c03a5fd747b96cc18be330104
ScriptedImporter:
internalIDToNameTable: []
externalObjects: {}

6
lua/app/global/global_const.lua
View File

@ -13,6 +13,7 @@ local CONST_PATHS = {
HeroConst = "app/module/hero/hero_const",
FormationConst = "app/module/formation/formation_const",
EquipConst = "app/module/equip/equip_const",
RunesConst = "app/module/runes/runes_const",
DungeonConst = "app/module/dungeon/dungeon_const",
ShopConst = "app/module/shop/shop_const",
SummonConst = "app/module/summon/summon_const",
@ -22,7 +23,7 @@ local CONST_PATHS = {
ActivityConst = "app/module/activity/activity_const",
FourteenDayConst = "app/module/activity/fourteen_day/fourteen_day_const",
DungeonRuneConst = "app/module/dungeon_rune/dungeon_rune_const",
DungeonRuneConst = "app/module/dungeon_rune/dungeon_rune_const",
FullMoonConst = "app/module/activity/full_moon/full_moon_const",
}
if EDITOR_MODE then
@ -312,7 +313,8 @@ GConst.MESSAGE_BOX_TYPE = {
GConst.MESSAGE_BOX_SHOW_TODAY = {
BOUNTY_BUY_LEVEL = 1,
HOT_SELL_BUY = 2,
ACTIVITY_BUY_LEVEL = 2,
ACTIVITY_BUY_LEVEL = 3,
RUNES_AUTO = 4,
}
GConst.QUALITY_TYPE =

63
lua/app/global/global_func.lua
View File

@ -434,14 +434,63 @@ function GFunc.getBuffDesc(buffName, effectNum, ispercent)
end
function GFunc.getAttrDesc(attrName, attrNum)
attrNum = attrNum // 100
attrNum = GFunc.getAttrShowValue(attrName, attrNum, true)
return I18N:getTextWithOtherKey("attr", "name", attrName, "desc", attrNum)
end
-- 获取属性用于显示的数值
function GFunc.getAttrShowValue(attrType, attrNum, notPercentSign)
if table.containValue(GConst.MATCH_ATTACK_ADD_NAME, attrType) or
table.containValue(GConst.MATCH_HP_ADD_NAME, attrType) or
table.containValue(GConst.MATCH_NORMAL_HURTP_NAME, attrType) or
table.containValue(GConst.MATCH_SKILL_HURTP_NAME, attrType) or
table.containValue(GConst.MATCH_CRIT_NAME, attrType) or
table.containValue(GConst.MATCH_CRIT_TIME_NAME, attrType) or
table.containValue(GConst.MATCH_CURED_NAME, attrType) or
table.containValue(GConst.MATCH_ALL_HURTP_NAME, attrType)
then
local str = notPercentSign and "" or "%"
return attrNum // GConst.BattleConst.PERCENT_FACTOR .. str
else
return attrNum // GConst.BattleConst.DEFAULT_FACTOR
end
end
function GFunc.getAttrName(key)
return I18N:getText("attr", key, "name")
end
-- 获取任务icon
function GFunc.getTaskIcon(taskType, taskTarget)
if taskType == GConst.TaskConst.TASK_TYPE.X_ARENA_GRADING then
local name = DataManager.ArenaData:getGradingIconName(DataManager.ArenaData:getGradingIdFromScore(taskTarget))
if name == "arena_dan_1" then
return "13"
elseif name == "arena_dan_2" then
return "14"
elseif name == "arena_dan_3" then
return "12"
end
else
return ConfigManager:getConfig("task_type")[taskType].icon
end
end
-- 获取任务描述
function GFunc.getTaskDesc(taskType, taskTarget)
if taskType == GConst.TaskConst.TASK_TYPE.X_ARENA_GRADING then
-- 段位显示文本
local grading = DataManager.ArenaData:getGradingName(DataManager.ArenaData:getGradingIdFromScore(taskTarget))
return I18N:getText("task_type", taskType, "desc", grading)
elseif taskType == GConst.TaskConst.TASK_TYPE.X_DUNGEON_ARMOR then
-- 防具副本显示章节和关卡
local cfg = DataManager.DungeonData:getDungeonDataByType(ModuleManager.MODULE_KEY.DUNGEON_ARMOR):getConfig(taskTarget)
return I18N:getText("task_type", taskType, "desc", cfg.chapter, cfg.stage)
else
return I18N:getText("task_type", taskType, "desc", taskTarget)
end
end
function GFunc.getTimeStrWithMS(time)
local m = math.floor(time/60)
local s = time%60
@ -1821,7 +1870,7 @@ function GFunc.formatPlayerName(name)
return name
end
-- info = {array_heroes, heroes_equips, skins} -- 服务器返回的数据
-- info = {array_heroes, heroes_equips, skins, heroes_runes} -- 服务器返回的数据
function GFunc.formatPlayerFormationInfo(info)
local formation = {}
if not info.array_heroes then
@ -1840,6 +1889,9 @@ function GFunc.formatPlayerFormationInfo(info)
if not info.skins then
info.skins = {}
end
if not info.heroes_runes then
info.heroes_runes = {}
end
for matchType, heroEntity in pairs(formation) do
local heroId = heroEntity:getCfgId()
@ -1868,6 +1920,13 @@ function GFunc.formatPlayerFormationInfo(info)
if #skinIds > 0 then
heroEntity:setSkins(skinIds)
end
-- 处理符文
if info.heroes_runes[heroId] == nil then
info.heroes_runes[heroId] = {grids = {}}
end
local runesEntity = DataManager.RunesData:createEntity(heroId, info.heroes_runes[heroId].grids)
heroEntity:setRunes(runesEntity)
end
return formation

8
lua/app/module/activity/full_moon.meta Normal file
View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 0ee2abea36076ae4d8463dff225a1234
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

28
lua/app/module/activity/full_moon/full_moon_const.lua Normal file
View File

@ -0,0 +1,28 @@
local FullMoonConst = {}
-- 活动id
FullMoonConst.ACT_ID = 406
FullMoonConst.ACT_DAYS = 10
-- 英雄自选礼包分页显示个数
FullMoonConst.HERO_GIFT_SHOW_STEP = {
4,4,5
}
-- 界面
FullMoonConst.PANEL_TYPE = {
TASK = 1,
CHOOSE_HERO = 2,
NEW_HERO = 3,
SKIN = 4,
}
FullMoonConst.SKIN_CHALLENGE_ID_1 = 1
FullMoonConst.SKIN_CHALLENGE_ID_2 = 2
FullMoonConst.SKIN_GIFT_ID_1 = 200102
FullMoonConst.SKIN_GIFT_ID_2 = 200202
return FullMoonConst

2
lua/app/ui/hero/skin_info_comp.lua.meta → lua/app/module/activity/full_moon/full_moon_const.lua.meta
View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 7209380a6f275fe4fa7fd87e464fde53
guid: 2ce3abbd5316c744c9ea4254adf1a947
ScriptedImporter:
internalIDToNameTable: []
externalObjects: {}

112
lua/app/module/activity/full_moon/full_moon_manager.lua Normal file
View File

@ -0,0 +1,112 @@
local FullMoonManager = class("FullMoonManager", BaseModule)
function FullMoonManager:showActMainUI(panelType)
UIManager:showUI("app/ui/activity/full_moon/full_moon_ui", panelType)
end
-- 初始化计时器
function FullMoonManager:initTimer()
self:unscheduleGlobal(self.actSid)
if DataManager.FullMoonData:isOpenTime() then
Logger.logHighlight("圆月活动结束倒计时："..DataManager.FullMoonData:getEndRemainTime())
self.actSid = self:performWithDelayGlobal(function()
Logger.logHighlight("圆月活动结束")
EventManager:dispatchEvent(EventManager.CUSTOM_EVENT.ACTIVITY_FULL_MOON_END)
end, DataManager.FullMoonData:getEndRemainTime())
elseif DataManager.FullMoonData:getStartRemainTime() > 0 then
Logger.logHighlight("圆月活动开始倒计时："..DataManager.FullMoonData:getStartRemainTime())
self.actSid = self:performWithDelayGlobal(function()
Logger.logHighlight("圆月活动开始")
self:reqActData()
end, DataManager.FullMoonData:getStartRemainTime())
end
end
-- 请求活动数据
function FullMoonManager:reqActData()
if not DataManager.FullMoonData:isOpen() then
return
end
if not DataManager.FullMoonData:isOpenTime() then
return
end
if self.isReqActData then
return
end
self.isReqActData = true
self:sendMessage(ProtoMsgType.FromMsgEnum.FullMoonInfoReq, {}, {}, self.rspActData, nil)
end
function FullMoonManager:rspActData(result)
self.isReqActData = false
DataManager.FullMoonData:setInReset(false)
if result.err_code == GConst.ERROR_STR.SUCCESS then
DataManager.FullMoonData:onGetActData(result.full_moon)
end
end
-- 请求任务奖励
function FullMoonManager:reqTaskReward(id)
self:sendMessage(ProtoMsgType.FromMsgEnum.FullMoonTaskClaimReq, {id = id}, {}, self.rspTaskReward, BIReport.ITEM_GET_TYPE.FULL_MOON_TASK)
end
function FullMoonManager:rspTaskReward(result)
if result.err_code == GConst.ERROR_STR.SUCCESS then
DataManager.FullMoonData:onReceivedTaskReward(result.reqData.id, result.finished)
GFunc.showRewardBox(result.rewards)
end
end
-- 请求任务进度奖励
function FullMoonManager:reqTaskProgressReward(id)
self:sendMessage(ProtoMsgType.FromMsgEnum.FullMoonRewardClaimReq, {id = id}, {}, self.rspTaskProgressReward, BIReport.ITEM_GET_TYPE.FULL_MOON_TASK_PROG_REWARD)
end
function FullMoonManager:rspTaskProgressReward(result)
if result.err_code == GConst.ERROR_STR.SUCCESS then
DataManager.FullMoonData:onReceivedTaskProgressReward(result.reqData.id)
GFunc.showRewardBox(result.rewards)
end
end
-- 自选礼包选择
function FullMoonManager:reqGiftChooseHero(index)
self:sendMessage(ProtoMsgType.FromMsgEnum.FullMoonCustomGiftChooseReq, {index = index}, {}, self.rspGiftChooseHero, nil)
end
function FullMoonManager:rspGiftChooseHero(result)
if result.err_code == GConst.ERROR_STR.SUCCESS then
DataManager.FullMoonData:onChooseHeroSuccess(result.reqData.index)
end
end
-- 皮肤挑战
function FullMoonManager:skinChallenge(id)
DataManager.FullMoonData:setCurSkinChallengeId(id)
ModuleManager.BattleManager:playBattle(GConst.BattleConst.BATTLE_TYPE.FULL_MOON_SKIN, nil, function()
UIManager:closeAllUI()
ModuleManager.MaincityManager:showMainCityUI()
self:showActMainUI(GConst.FullMoonConst.PANEL_TYPE.SKIN)
end)
end
-- 请求皮肤关卡挑战奖励
function FullMoonManager:reqChapterSkinClaim(id, combatReport)
if not combatReport.victory or DataManager.FullMoonData:isReceivedSkinFirstChallengeReward(id) then
ModuleManager.BattleManager:showBattleResultUI(GConst.BattleConst.BATTLE_TYPE.FULL_MOON_SKIN, {}, combatReport or {}, nil, nil, true)
return
end
self:sendMessage(ProtoMsgType.FromMsgEnum.FullMoonChapterSkinClaimReq, {id = id, combatReport = combatReport}, {}, self.rspChapterSkinClaim, BIReport.ITEM_GET_TYPE.FULL_MOON_SKIN_CHALLENGE_REWARD)
end
function FullMoonManager:rspChapterSkinClaim(result)
if result.err_code == GConst.ERROR_STR.SUCCESS then
DataManager.FullMoonData:onReceivedSkinChallengeReward(result.reqData.id)
ModuleManager.BattleManager:showBattleResultUI(GConst.BattleConst.BATTLE_TYPE.FULL_MOON_SKIN, result.rewards, result.reqData and result.reqData.combatReport or {}, nil, nil, true)
end
end
return FullMoonManager

10
lua/app/module/activity/full_moon/full_moon_manager.lua.meta Normal file
View File

@ -0,0 +1,10 @@
fileFormatVersion: 2
guid: 5b71325bf902494459246e0b6b8b0799
ScriptedImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 2
userData:
assetBundleName:
assetBundleVariant:
script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3}

2
lua/app/module/arena/arena_manager.lua
View File

@ -127,7 +127,7 @@ function ArenaManager:rspSettlement(result)
if result.err_code == GConst.ERROR_STR.SUCCESS then
local reqData = result.reqData
DataManager.ArenaData:onBattleResultReceived(result.settlement, result)
DataManager.ArenaData:onBattleResultReceived(result.score, result.settlement, result)
DataManager.ArenaData:initGiftInfo(result.act_arena_gift)
local checkCount = 0
if result.settlement.win then

4
lua/app/module/battle/battle_const.lua
View File

@ -20,6 +20,7 @@ BattleConst.SKILL_TYPE_ASSISTING = 3
BattleConst.SKILL_TYPE_PASSIVE = 4
BattleConst.SKILL_SELECT_COUNT = 3
BattleConst.DEFAULT_FACTOR = 10000
BattleConst.PERCENT_FACTOR = 100
BattleConst.TIME_FACTOR = 1000
BattleConst.INIT_POS_X = 140 -- 战斗单位初始化的坐标
BattleConst.UNIT_FRONT_POS_X = 0 -- 战斗单位身前的坐标
@ -90,7 +91,8 @@ BattleConst.BATTLE_TYPE = {
DUNGEON_ARMOR = "7",
ACT_BOSS_RUSH = "8",
DUNGEON_RUNE = "9",
ACT_PVP = "10",
ACT_PVP = "11",
FULL_MOON_SKIN = "10",
}
BattleConst.IS_PVP_BATTLE = {

1
lua/app/module/battle/battle_manager.lua
View File

@ -17,6 +17,7 @@ local BATTLE_CONTROLLER = {
[BattleConst.BATTLE_TYPE.ACT_BOSS_RUSH] = "app/module/battle/controller/battle_controller_boss_rush",
[BattleConst.BATTLE_TYPE.DUNGEON_RUNE] = "app/module/battle/controller/battle_controller_dungeon_rune",
[BattleConst.BATTLE_TYPE.ACT_PVP] = "app/module/battle/controller/battle_controller_act_pvp",
[BattleConst.BATTLE_TYPE.FULL_MOON_SKIN] = "app/module/battle/controller/battle_controller_full_moon_skin",
}
function BattleManager:showPauseUI(battleType, battleController)

51
lua/app/module/battle/controller/battle_controller_dungeon_rune.lua
View File

@ -28,9 +28,6 @@ function BattleControllerDungeonRune:initOther()
if self.battleUI then
local desc = self.dungeonRuneRemainRoundCount
if not self.isBossChapter then
desc = I18N:getGlobalText(I18N.GlobalConst.DUNGEON_WEAPON_DESC_6, self.chapterId)
end
self.battleUI:refreshWave(desc, GConst.ATLAS_PATH.COMMON, "common_dec_15")
end
@ -161,9 +158,6 @@ function BattleControllerDungeonRune:enterRoundBegin()
self.dungeonRuneRemainRoundCount = self.dungeonRuneRemainRoundCount - 1
if self.battleUI then
local desc = self.dungeonRuneRemainRoundCount + 1
if not self.isBossChapter then
desc = I18N:getGlobalText(I18N.GlobalConst.DUNGEON_WEAPON_DESC_6, self.chapterId)
end
self.battleUI:refreshWave(desc, GConst.ATLAS_PATH.COMMON, "common_dec_15")
end
BattleController.enterRoundBegin(self)
@ -186,9 +180,6 @@ function BattleControllerDungeonRune:enterRoundBegin()
end
if self.battleUI then
local desc = self.dungeonRuneRemainRoundCount + 1
if not self.isBossChapter then
desc = I18N:getGlobalText(I18N.GlobalConst.DUNGEON_WEAPON_DESC_6, self.chapterId)
end
self.battleUI:refreshWave(desc, GConst.ATLAS_PATH.COMMON, "common_dec_15")
end
BattleController.enterRoundBegin(self)
@ -239,6 +230,44 @@ function BattleControllerDungeonRune:getInitBoard()
return self.boradList, self.fixedRandomGrid, self.mysteryBoxIndexMap
end
function BattleControllerDungeonRune:refreshWave()
if not self.battleUI then
return
end
-- local desc = self.dungeonRuneRemainRoundCount + 1
-- self.battleUI:refreshWave(desc, GConst.ATLAS_PATH.COMMON, "common_dec_15")
end
function BattleControllerDungeonRune:getRandomGridInfo()
local list, fixedRandomGrid = self:getInitBoard()
local fixedRandomList = fixedRandomGrid[self.curBoardIndex]
local gridType = 0
local elementType
if fixedRandomList and fixedRandomList[1] then
elementType = table.remove(fixedRandomList, 1)
else
local map = self.battleData:getElementTypeMap()
self.getRandomGridInfoIndexs = table.clearOrCreate(self.getRandomGridInfoIndexs)
self.getRandomGridInfoTypeList = table.clearOrCreate(self.getRandomGridInfoTypeList)
for typeName, typeNum in pairs(BattleConst.ELEMENT_TYPE) do
if not self:getSealElementType()[typeNum] and self:getSkillEntityByElement(typeNum) then
local weight = 100
if self.elementWeightMap and self.elementWeightMap[typeNum] then
weight = weight + self.elementWeightMap[typeNum]
end
table.insert(self.getRandomGridInfoIndexs, weight)
table.insert(self.getRandomGridInfoTypeList, typeNum)
end
end
local index = GFunc.getRandomIndex(self.getRandomGridInfoIndexs)
elementType = self.getRandomGridInfoTypeList[index]
end
return {gridType = gridType, elementType = elementType}
end
function BattleControllerDungeonRune:onLoadComplete(...)
-- 处理技能
local unlockAllSkill = function(side)
@ -401,7 +430,7 @@ function BattleControllerDungeonRune:getRuneTaskNumByType(taskInfo)
elseif taskType == GConst.DungeonRuneConst.TASK_TYPE.BREAK_GRID_TYPE then
return self.totalBreakedGridType[taskParams1] or 0
elseif taskType == GConst.DungeonRuneConst.TASK_TYPE.KILL_MONSTER then
return self.getTaskProgress[GConst.BattleConst.BATTLE_TASK_FIELD.KILL_NORMAL_MONSTER]
return self.taskProgress[GConst.BattleConst.BATTLE_TASK_FIELD.KILL_NORMAL_MONSTER]
end
end
@ -411,7 +440,7 @@ function BattleControllerDungeonRune:getRuneTaskAllOver()
local taskProgress = ModuleManager.DungeonRuneManager:getTaskStatus(self, chapterCondition)
local taskOver = true
for index, info in pairs(taskProgress) do
if not info.over then
if not info.over and index ~= 1 then
taskOver = false
break
end

63
lua/app/module/battle/controller/battle_controller_full_moon_skin.lua Normal file
View File

@ -0,0 +1,63 @@
local BattleController = require "app/module/battle/controller/battle_controller"
local BattleControllerFullMoonSkin = class("BattleControllerFullMoonSkin", BattleController)
function BattleControllerFullMoonSkin:getBoardConfig()
return ConfigManager:getConfig("chapter_board_dungeon_shards")
end
function BattleControllerFullMoonSkin:getChapterConfig()
return ConfigManager:getConfig("chapter_new_skin_fight")
end
function BattleControllerFullMoonSkin:getChapterId()
return DataManager.FullMoonData:getCurSkinChallengeId()
end
function BattleControllerFullMoonSkin:controllBattleEnd()
self.combatReport = {
battleType = GConst.BattleConst.BATTLE_TYPE.FULL_MOON_SKIN,
wave = self:getWaveIndex(),
victory = self.victory,
}
local atkReport = {}
local teamEntity = self.battleData:getAtkTeam()
local members = teamEntity:getAllMembers()
for k, v in pairs(members) do
local report = {
heroId = v:getId(),
dmg = v:getDamageCount(),
}
table.insert(atkReport, report)
end
self.combatReport.atkReport = atkReport
ModuleManager.FullMoonManager:reqChapterSkinClaim(self.chapterId, self.combatReport)
end
function BattleControllerFullMoonSkin:postWaveOver(atkDead, isQuit)
local deathType = BIReport.FIGHT_DEATH_TYPE.SURVIVE
local waveEndType = BIReport.FIGHT_WAVE_END_TYPE.WIN
if atkDead then
if self.isBossWave then
deathType = BIReport.FIGHT_DEATH_TYPE.BOSS_FAIL
else
deathType = BIReport.FIGHT_DEATH_TYPE.NORMAL_FAIL
end
waveEndType = BIReport.FIGHT_WAVE_END_TYPE.FAIL
end
if isQuit then
waveEndType = BIReport.FIGHT_WAVE_END_TYPE.QUIT
end
local duration = self.waveDurationTime
local totalTime = self.totalDurationTime
local isFianlStep = self:getWaveIndex() >= self.maxWaveIndex
BIReport:postFightEnd(GConst.BattleConst.BATTLE_TYPE.FULL_MOON_SKIN, self.battleData, self.chapterId, self:getWaveIndex(), duration, totalTime, self.eliminateCount, self.eliminateTotalCount, waveEndType, deathType, 0, true, isFianlStep, self.maxLinkCount)
end
function BattleControllerFullMoonSkin:postFightStart()
BIReport:postFightBegin(GConst.BattleConst.BATTLE_TYPE.FULL_MOON_SKIN, self:getWaveIndex(), self.chapterId, 0, 0)
end
return BattleControllerFullMoonSkin

10
lua/app/module/battle/controller/battle_controller_full_moon_skin.lua.meta Normal file
View File

@ -0,0 +1,10 @@
fileFormatVersion: 2
guid: 4d3f99278cc5ab44e81190f7b9819a0b
ScriptedImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 2
userData:
assetBundleName:
assetBundleVariant:
script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3}

33
lua/app/module/battle/controller/battle_controller_pvp.lua
View File

@ -320,4 +320,37 @@ function BattleControllerPVP:refreshWave()
self.battleUI:refreshWave(self.waveRoundCount[self:getWaveIndex()] or 0)
end
function BattleControllerPVP:getRandomGridInfo()
local list, fixedRandomGrid = self:getInitBoard()
local fixedRandomList = fixedRandomGrid[self.curBoardIndex]
local gridType = 0
local elementType
if fixedRandomList and fixedRandomList[1] then
elementType = table.remove(fixedRandomList, 1)
else
local map = self.battleData:getElementTypeMap()
self.getRandomGridInfoIndexs = table.clearOrCreate(self.getRandomGridInfoIndexs)
self.getRandomGridInfoTypeList = table.clearOrCreate(self.getRandomGridInfoTypeList)
for typeName, typeNum in pairs(BattleConst.ELEMENT_TYPE) do
if not self:getSealElementType()[typeNum] and self:getSkillEntityByElement(typeNum) then
local weight = BattleConst.ELEMENT_WIGHT -- 改为平等权重
if self.elementWeightMap and self.elementWeightMap[typeNum] then
weight = weight + self.elementWeightMap[typeNum]
end
if weight > BattleConst.MAX_ELEMENT_WIGHT then
weight = BattleConst.MAX_ELEMENT_WIGHT
end
table.insert(self.getRandomGridInfoIndexs, weight)
table.insert(self.getRandomGridInfoTypeList, typeNum)
end
end
local index = GFunc.getRandomIndex(self.getRandomGridInfoIndexs)
elementType = self.getRandomGridInfoTypeList[index]
end
return {gridType = gridType, elementType = elementType}
end
return BattleControllerPVP

2
lua/app/module/dungeon_rune/dungeon_rune_const.lua
View File

@ -25,7 +25,7 @@ DungeonRuneConst.TASK_ICON = {
[4] = "dungeon_rune_task_vine",
[5] = "dungeon_rune_task_ice",
[7] = "dungeon_rune_task_stone_3",
[12] = "dungeon_rune_task_stump_1",
[12] = "dungeon_rune_task_leaf",
[13] = "dungeon_rune_task_jelly",
[18] = "dungeon_rune_task_stump_1",
[19] = "dungeon_rune_task_stump_2",

24
lua/app/module/hero/hero_const.lua
View File

@ -1,5 +1,14 @@
local HeroConst = {}
-- 英雄颜色类型
HeroConst.MATCH_TYPE = {
RED = 1,
YELLOW = 2,
GREEN = 3,
BLUE = 4,
PURPLE = 5
}
HeroConst.MATCH_ICON_NAME = {
[1] = "match_1",
[2] = "match_2",
@ -21,7 +30,7 @@ HeroConst.PANEL_TYPE = {
HERO = 1,
WEAPON = 2,
ARMOR = 3,
SKIN = 4,
RUNES = 4,
}
-- 总计
@ -70,6 +79,18 @@ HeroConst.ATTR_SHOW_SKIN = {
GConst.MATCH_SKILL_HURTP_NAME, -- 技能增伤百分比
GConst.MATCH_CURED_NAME, -- 治疗效果提升百分比
}
-- 符文
HeroConst.ATTR_SHOW_RUNES = {
GConst.MATCH_HP_FIX_NAME, -- 生命
GConst.MATCH_ATTACK_NAME, -- 攻击
GConst.MATCH_NORMAL_HURT_NAME, -- 普攻增伤
GConst.MATCH_SKILL_HURT_NAME, -- 技能增伤
GConst.MATCH_CRIT_NAME, -- 暴击率百分比
GConst.MATCH_CRIT_TIME_NAME, -- 暴击伤害百分比
GConst.MATCH_NORMAL_HURTP_NAME, -- 普攻增伤百分比
GConst.MATCH_SKILL_HURTP_NAME, -- 技能增伤百分比
GConst.MATCH_CURED_NAME, -- 治疗效果提升百分比
}
-- 需要显示属性的模块
HeroConst.SHOW_NODE = {
@ -77,6 +98,7 @@ HeroConst.SHOW_NODE = {
HeroConst.ATTR_SHOW_BASE,
HeroConst.ATTR_SHOW_WEAPON,
HeroConst.ATTR_SHOW_ARMOR,
HeroConst.ATTR_SHOW_RUNES,
HeroConst.ATTR_SHOW_SKIN,
}

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

@ -1,7 +1,11 @@
local HeroManager = class("HeroManager", BaseModule)
function HeroManager:showHeroDetailUI(heroId, onlyLook, heroEntity, skinId, formationType)
UIManager:showUI("app/ui/hero/hero_detail_ui", {heroId = heroId, onlyLook = onlyLook, heroEntity = heroEntity, skinId = skinId, formationType = formationType})
function HeroManager:showHeroDetailUI(heroId, onlyLook, heroEntity, formationType)
UIManager:showUI("app/ui/hero/hero_detail_ui", {heroId = heroId, onlyLook = onlyLook, heroEntity = heroEntity, formationType = formationType})
end
function HeroManager:showHeroSkinUI(heroId, onlyLookSkinId)
UIManager:showUI("app/ui/hero/hero_skin_ui", {heroId = heroId, onlyLookSkinId = onlyLookSkinId})
end
function HeroManager:showHeroUnlockUI(heroIdList)

2
lua/app/module/item/item_const.lua
View File

@ -19,6 +19,8 @@ ItemConst.ITEM_ID_ARENA_TICKET = 22
ItemConst.ITEM_ID_FOURTEEN_DAY_EXCHANGE = 51
ItemConst.ITEM_ID_GLOD_WING = 49
ItemConst.ITEM_ID_SLIVER_WING = 50
ItemConst.ITEM_ID_RUNES = 55
ItemConst.ITEM_ID_FULL_MOON = 56
ItemConst.ITEM_TYPE = {
RES = 1,

1
lua/app/module/maincity/maincity_const.lua
View File

@ -36,6 +36,7 @@ MainCityConst.LEFT_SIDE_BARS = {
"app/ui/main_city/cell/side_bar_hero_fund_cell",
"app/ui/main_city/cell/side_bar_seven_days_cell",
"app/ui/main_city/cell/side_bar_activity_cell",
"app/ui/main_city/cell/side_bar_full_moon_cell",
-- gm放最后一个
"app/ui/main_city/cell/side_bar_gm_cell"
}

8
lua/app/module/runes.meta Normal file
View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 18d45baac20fe4d4b8f98e500a15c222
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

32
lua/app/module/runes/runes_const.lua Normal file
View File

@ -0,0 +1,32 @@
local RunesConst = {}
RunesConst.GIFT_IDS = {
210102,
210202,
210302,
}
RunesConst.QUALITY_ICON = {
[1] = "hero_rune_f",
[2] = "hero_rune_e",
[3] = "hero_rune_d",
[4] = "hero_rune_c",
[5] = "hero_rune_b",
[6] = "hero_rune_a",
[7] = "hero_rune_s",
[8] = "hero_rune_ss",
}
-- 检查锁定状态
RunesConst.CHECK_QLT_LOCK = 7
-- 最大属性栏位数
RunesConst.MAX_ATTR_GRID_COUNT = 6
-- 品质个数
RunesConst.MAX_QUALITY_COUNT = 8
-- 最大套装个数
RunesConst.MAX_SUITS_COUNT = 5
-- 最大符文种类个数
RunesConst.MAX_ATTR_COUNT = 11
return RunesConst

10
lua/app/module/runes/runes_const.lua.meta Normal file
View File

@ -0,0 +1,10 @@
fileFormatVersion: 2
guid: 4bda2a68bd04f8e4993df04a2b3878c7
ScriptedImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 2
userData:
assetBundleName:
assetBundleVariant:
script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3}

47
lua/app/module/runes/runes_manager.lua Normal file
View File

@ -0,0 +1,47 @@
local RunesManager = class("RunesManager", BaseModule)
-- 锁定和解锁属性栏
function RunesManager:reqChangeLockGrid(heroId, index, isLock)
if self.isReqLockChange then
return
end
self.isReqLockChange = true
self:sendMessage(ProtoMsgType.FromMsgEnum.RuneLockReq, {hero_id = heroId, grid_num = index, lock = isLock}, {}, self.rspChangeLockGrid)
end
function RunesManager:rspChangeLockGrid(result)
self.isReqLockChange = false
if result.hero_girds then
DataManager.RunesData:onGridLockSuccess(result.reqData.hero_id, result.hero_girds.grids)
end
end
-- 淬炼
function RunesManager:reqQuenching(heroId, autoCount)
if self.isReqQuenching then
return
end
self.isReqQuenching = true
self:sendMessage(ProtoMsgType.FromMsgEnum.RuneQuenchingReq, {hero_id = heroId, auto_count = autoCount}, {}, self.rspQuenching, BIReport.ITEM_GET_TYPE.RUNES_QUENCHING)
end
function RunesManager:rspQuenching(result)
self.isReqQuenching = false
if result.err_code == GConst.ERROR_STR.SUCCESS then
DataManager.RunesData:onQuenchingSuccess(result.level, result.exp, result.reqData.hero_id, result.hero_girds.grids)
if result.auto_count and result.auto_count > 0 then
ModuleManager.TaskManager:addTaskProgress(GConst.TaskConst.TASK_TYPE.X_RUNES_QUENCHING, result.auto_count)
else
ModuleManager.TaskManager:addTaskProgress(GConst.TaskConst.TASK_TYPE.X_RUNES_QUENCHING, 1)
end
end
end
function RunesManager:rspUpdate(result)
DataManager.RunesData:init(result.rune)
end
return RunesManager

10
lua/app/module/runes/runes_manager.lua.meta Normal file
View File

@ -0,0 +1,10 @@
fileFormatVersion: 2
guid: 88f86325d3b00894d8fb5beb962a5ac0
ScriptedImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 2
userData:
assetBundleName:
assetBundleVariant:
script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3}

3
lua/app/module/task/task_const.lua
View File

@ -40,6 +40,9 @@ TaskConst.TASK_TYPE = {
X_OPEN_CHAPTER_BOX = 37, -- 开启主线宝箱x个
X_UPGRADE_WEAPON = 38, -- 武器升级x次
X_UPGRADE_ARMOR = 39, -- 防具升级x次
X_BUY_ANYONE = 40, -- 任意购买行为x次
X_RUNES_GETED_MATERIALS = 41, -- 获得符文材料x个
X_RUNES_QUENCHING = 42, -- 符文锻造x次
}
return TaskConst

15
lua/app/module/task/task_manager.lua
View File

@ -310,6 +310,18 @@ function TaskManager:xUpgradeArmor()
self:dispatchTask(GConst.TaskConst.TASK_TYPE.X_UPGRADE_ARMOR, 1)
end
function TaskManager:xBuyAnyone()
self:dispatchTask(GConst.TaskConst.TASK_TYPE.X_BUY_ANYONE, 1)
end
function TaskManager:xRunesGetedMaterials(count)
self:dispatchTask(GConst.TaskConst.TASK_TYPE.X_RUNES_GETED_MATERIALS, count)
end
function TaskManager:xRunesQuenching(count)
self:dispatchTask(GConst.TaskConst.TASK_TYPE.X_RUNES_QUENCHING, count)
end
---- 没有特殊说明，方法均返回任务增量
TaskManager.TYPE_DEAL_FUNC = {
[GConst.TaskConst.TASK_TYPE.X_WATCH_AD] = TaskManager.xWatchAd,
@ -349,6 +361,9 @@ TaskManager.TYPE_DEAL_FUNC = {
[GConst.TaskConst.TASK_TYPE.X_OPEN_CHAPTER_BOX] = TaskManager.xOpenChapterBox,
[GConst.TaskConst.TASK_TYPE.X_UPGRADE_WEAPON] = TaskManager.xUpgradeWeapon,
[GConst.TaskConst.TASK_TYPE.X_UPGRADE_ARMOR] = TaskManager.xUpgradeArmor,
[GConst.TaskConst.TASK_TYPE.X_BUY_ANYONE] = TaskManager.xBuyAnyone,
[GConst.TaskConst.TASK_TYPE.X_RUNES_GETED_MATERIALS] = TaskManager.xRunesGetedMaterials,
[GConst.TaskConst.TASK_TYPE.X_RUNES_QUENCHING] = TaskManager.xRunesQuenching,
}
function TaskManager:taskGoto(taskType)

12
lua/app/module/tips/tips_manager.lua
View File

@ -48,7 +48,7 @@ function TipsManager:showRewardTips(rewardId, rewardType, tarPrefabObj, alignTyp
return
elseif info.type == GConst.ItemConst.ITEM_TYPE.SKIN then
-- 英雄皮肤
ModuleManager.HeroManager:showHeroDetailUI(DataManager.SkinData:getHeroIdBySkinId(info.parameter), true, nil, info.parameter)
ModuleManager.HeroManager:showHeroSkinUI(DataManager.SkinData:getHeroIdBySkinId(info.parameter), info.parameter)
return
elseif info.type == GConst.ItemConst.ITEM_TYPE.RANDOM_BOX_ITEM or info.type == GConst.ItemConst.ITEM_TYPE.FIXED_BOX_ITEM then
self:showBoxItemTips(rewardId)
@ -110,6 +110,16 @@ function TipsManager:showDescTips(desc, tarPrefabObj, alignType)
UIManager:showUI("app/ui/tips/desc_tips", params)
end
function TipsManager:showChooseRewardTips(title, desc, rewards, callback)
local params = {
title = title,
desc = desc,
rewards = rewards,
callback = callback,
}
UIManager:showUI("app/ui/tips/choose_reward_tips", params)
end
function TipsManager:showHeroFragmentTips(itemId)
local params = {
itemId = itemId

1
lua/app/module/tutorial/tutorial_const.lua
View File

@ -12,6 +12,7 @@ TutorialConst.UNLOCK_DUNGEON = 6
TutorialConst.UNLOCK_ARENA = 7
TutorialConst.WEAPON_DUNGEON = 8
TutorialConst.ARMOR_DUNGEON = 9
TutorialConst.RUNE_DUNGEON = 10
TutorialConst.TUTORIAL_TYPE = {
CLICK = 1, -- 点击任意区域

30
lua/app/proto/proto_msg_type.lua
View File

@ -1,5 +1,7 @@
local ProtoMsgType = {
FromMsgId = {
[5949102] = "FullMoonCustomGiftChooseReq",
[5950935] = "FullMoonCustomGiftChooseRsp",
[109633552] = "PigLevelDownNtf",
[109700242] = "PigLevelDownReq",
[109702075] = "PigLevelDownRsp",
@ -77,6 +79,8 @@ local ProtoMsgType = {
[1433354371] = "ChapterDailyChallengeResetRsp",
[1435947790] = "AppStorePaidReq",
[1435949623] = "AppStorePaidRsp",
[1459267856] = "FullMoonChapterSkinClaimReq",
[1459269689] = "FullMoonChapterSkinClaimRsp",
[1471116409] = "BindReq",
[1471118242] = "BindRsp",
[1478006910] = "BossRushBountyClaimReq",
@ -123,6 +127,8 @@ local ProtoMsgType = {
[2140119902] = "ActivityPVPDecideHeroRsp",
[2164009445] = "BossRushStartReq",
[2164011278] = "BossRushStartRsp",
[2194306819] = "FullMoonTaskClaimReq",
[2194308652] = "FullMoonTaskClaimRsp",
[2198847028] = "BossRushBoughtNtf",
[2224825865] = "ChapterRuneChallengeSettlementReq",
[2224827698] = "ChapterRuneChallengeSettlementRsp",
@ -183,6 +189,8 @@ local ProtoMsgType = {
[3038153756] = "TaskDailyRefreshRsp",
[3039097236] = "SummerBountyClaimReq",
[3039099069] = "SummerBountyClaimRsp",
[3050641832] = "FullMoonInfoReq",
[3050643665] = "FullMoonInfoRsp",
[3058879524] = "PVPRankReq",
[3058881357] = "PVPRankRsp",
[3062745642] = "FundAwardReq",
@ -264,6 +272,8 @@ local ProtoMsgType = {
[3904150593] = "GMRsp",
[3933875617] = "ChapterStartReq",
[3933877450] = "ChapterStartRsp",
[3991710133] = "FullMoonRewardClaimReq",
[3991711966] = "FullMoonRewardClaimRsp",
[4010728288] = "ChapterRuneBuySliverReq",
[4010730121] = "ChapterRuneBuySliverRsp",
[4015942008] = "RuneQuenchingReq",
@ -290,6 +300,8 @@ local ProtoMsgType = {
[4256335780] = "ExistRsp",
},
FromMsgToId = {
FullMoonCustomGiftChooseReq = 5949102,
FullMoonCustomGiftChooseRsp = 5950935,
PigLevelDownNtf = 109633552,
PigLevelDownReq = 109700242,
PigLevelDownRsp = 109702075,
@ -367,6 +379,8 @@ local ProtoMsgType = {
ChapterDailyChallengeResetRsp = 1433354371,
AppStorePaidReq = 1435947790,
AppStorePaidRsp = 1435949623,
FullMoonChapterSkinClaimReq = 1459267856,
FullMoonChapterSkinClaimRsp = 1459269689,
BindReq = 1471116409,
BindRsp = 1471118242,
BossRushBountyClaimReq = 1478006910,
@ -413,6 +427,8 @@ local ProtoMsgType = {
ActivityPVPDecideHeroRsp = 2140119902,
BossRushStartReq = 2164009445,
BossRushStartRsp = 2164011278,
FullMoonTaskClaimReq = 2194306819,
FullMoonTaskClaimRsp = 2194308652,
BossRushBoughtNtf = 2198847028,
ChapterRuneChallengeSettlementReq = 2224825865,
ChapterRuneChallengeSettlementRsp = 2224827698,
@ -473,6 +489,8 @@ local ProtoMsgType = {
TaskDailyRefreshRsp = 3038153756,
SummerBountyClaimReq = 3039097236,
SummerBountyClaimRsp = 3039099069,
FullMoonInfoReq = 3050641832,
FullMoonInfoRsp = 3050643665,
PVPRankReq = 3058879524,
PVPRankRsp = 3058881357,
FundAwardReq = 3062745642,
@ -554,6 +572,8 @@ local ProtoMsgType = {
GMRsp = 3904150593,
ChapterStartReq = 3933875617,
ChapterStartRsp = 3933877450,
FullMoonRewardClaimReq = 3991710133,
FullMoonRewardClaimRsp = 3991711966,
ChapterRuneBuySliverReq = 4010728288,
ChapterRuneBuySliverRsp = 4010730121,
RuneQuenchingReq = 4015942008,
@ -580,6 +600,8 @@ local ProtoMsgType = {
ExistRsp = 4256335780,
},
FromMsgEnum = {
FullMoonCustomGiftChooseReq = "FullMoonCustomGiftChooseReq",
FullMoonCustomGiftChooseRsp = "FullMoonCustomGiftChooseRsp",
PigLevelDownNtf = "PigLevelDownNtf",
PigLevelDownReq = "PigLevelDownReq",
PigLevelDownRsp = "PigLevelDownRsp",
@ -657,6 +679,8 @@ local ProtoMsgType = {
ChapterDailyChallengeResetRsp = "ChapterDailyChallengeResetRsp",
AppStorePaidReq = "AppStorePaidReq",
AppStorePaidRsp = "AppStorePaidRsp",
FullMoonChapterSkinClaimReq = "FullMoonChapterSkinClaimReq",
FullMoonChapterSkinClaimRsp = "FullMoonChapterSkinClaimRsp",
BindReq = "BindReq",
BindRsp = "BindRsp",
BossRushBountyClaimReq = "BossRushBountyClaimReq",
@ -703,6 +727,8 @@ local ProtoMsgType = {
ActivityPVPDecideHeroRsp = "ActivityPVPDecideHeroRsp",
BossRushStartReq = "BossRushStartReq",
BossRushStartRsp = "BossRushStartRsp",
FullMoonTaskClaimReq = "FullMoonTaskClaimReq",
FullMoonTaskClaimRsp = "FullMoonTaskClaimRsp",
BossRushBoughtNtf = "BossRushBoughtNtf",
ChapterRuneChallengeSettlementReq = "ChapterRuneChallengeSettlementReq",
ChapterRuneChallengeSettlementRsp = "ChapterRuneChallengeSettlementRsp",
@ -763,6 +789,8 @@ local ProtoMsgType = {
TaskDailyRefreshRsp = "TaskDailyRefreshRsp",
SummerBountyClaimReq = "SummerBountyClaimReq",
SummerBountyClaimRsp = "SummerBountyClaimRsp",
FullMoonInfoReq = "FullMoonInfoReq",
FullMoonInfoRsp = "FullMoonInfoRsp",
PVPRankReq = "PVPRankReq",
PVPRankRsp = "PVPRankRsp",
FundAwardReq = "FundAwardReq",
@ -844,6 +872,8 @@ local ProtoMsgType = {
GMRsp = "GMRsp",
ChapterStartReq = "ChapterStartReq",
ChapterStartRsp = "ChapterStartRsp",
FullMoonRewardClaimReq = "FullMoonRewardClaimReq",
FullMoonRewardClaimRsp = "FullMoonRewardClaimRsp",
ChapterRuneBuySliverReq = "ChapterRuneBuySliverReq",
ChapterRuneBuySliverRsp = "ChapterRuneBuySliverRsp",
RuneQuenchingReq = "RuneQuenchingReq",

8
lua/app/ui/activity/full_moon.meta Normal file
View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 1332d53647109d0499e22a6659ce1f1e
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

8
lua/app/ui/activity/full_moon/cell.meta Normal file
View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: dd6f0549559c9064790b07dc590f84a4
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

60
lua/app/ui/activity/full_moon/cell/full_moon_task_cell.lua Normal file
View File

@ -0,0 +1,60 @@
local FullMoonTaskCell = class("FullMoonTaskCell", BaseCell)
function FullMoonTaskCell:init()
local uiMap = self:getUIMap()
self.imgTaskBg = uiMap["full_moon_task_cell.img_task_bg"]
self.imgTask = uiMap["full_moon_task_cell.img_task_bg.img_task"]
self.txDesc = uiMap["full_moon_task_cell.tx_desc"]
self.imgProg = uiMap["full_moon_task_cell.prog.img_prog"]:getComponent(GConst.TYPEOF_UNITY_CLASS.BF_SLIDER)
self.txProg = uiMap["full_moon_task_cell.prog.tx_prog"]
self.txRewardName = uiMap["full_moon_task_cell.tx_reward_name"]
self.imgRewardIcon = uiMap["full_moon_task_cell.icon_reward"]
self.txNum = uiMap["full_moon_task_cell.tx_num"]
self.finish = uiMap["full_moon_task_cell.finish"]
self.txFinish = uiMap["full_moon_task_cell.finish.bg.tx_finish"]
self:addClickListener(function()
if DataManager.FullMoonData:canGetTaskReward(self.taskId) and not DataManager.FullMoonData:isReceivedTaskReward(self.taskId) then
ModuleManager.FullMoonManager:reqTaskReward(self.taskId)
end
end)
end
function FullMoonTaskCell:refresh(id)
self.taskId = id
local taskType = DataManager.FullMoonData:getTaskType(self.taskId)
local total = DataManager.FullMoonData:getTaskTarget(self.taskId)
local cur = DataManager.FullMoonData:getTaskProgress(self.taskId)
local reward = DataManager.FullMoonData:getTaskReward(self.taskId)
self.imgTask:setSprite(GConst.ATLAS_PATH.ICON_TASK, GFunc.getTaskIcon(taskType, total))
self.txDesc:setText(GFunc.getTaskDesc(taskType, total))
self.imgProg.value = cur / total
self.txProg:setText(cur .. "/" .. total)
self.txRewardName:setText(GFunc.getRewardName(reward.type, reward.id))
self.imgRewardIcon:setSprite(GFunc.getRewardIconRes(reward.type, reward.id))
self.txNum:setText(GFunc.getRewardNum(reward))
self.txFinish:setText(I18N:getGlobalText(I18N.GlobalConst.STR_COMPLETED))
self.finish:setActive(false)
self.baseObject:removeRedPoint()
if DataManager.FullMoonData:canGetTaskReward(self.taskId) then
-- 已完成
if DataManager.FullMoonData:isReceivedTaskReward(self.taskId) then
-- 已领取
self.baseObject:setSprite(GConst.ATLAS_PATH.ACT_COMMON, "act_common_bg_2")
self.imgTaskBg:setSprite(GConst.ATLAS_PATH.ACT_COMMON, "act_common_board_3")
self.finish:setActive(true)
else
-- 未领取
self.baseObject:setSprite(GConst.ATLAS_PATH.ACT_COMMON, "act_common_bg_3")
self.imgTaskBg:setSprite(GConst.ATLAS_PATH.ACT_COMMON, "act_common_board_4")
self.baseObject:addRedPoint(260, 70, 0.8)
end
else
--未完成
self.baseObject:setSprite(GConst.ATLAS_PATH.ACT_COMMON, "act_common_bg_2")
self.imgTaskBg:setSprite(GConst.ATLAS_PATH.ACT_COMMON, "act_common_board_3")
end
end
return FullMoonTaskCell

10
lua/app/ui/activity/full_moon/cell/full_moon_task_cell.lua.meta Normal file
View File

@ -0,0 +1,10 @@
fileFormatVersion: 2
guid: 7f22f15dc9b4a6d4385ac1f17fd683b4
ScriptedImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 2
userData:
assetBundleName:
assetBundleVariant:
script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3}

34
lua/app/ui/activity/full_moon/cell/full_moon_task_prog_cell.lua Normal file
View File

@ -0,0 +1,34 @@
local FullMoonTaskProgCell = class("FullMoonTaskProgCell", BaseCell)
function FullMoonTaskProgCell:init()
local uiMap = self:getUIMap()
self.imgProg = uiMap["prog_reward.img_prog"]
self.txProg = uiMap["prog_reward.img_prog.tx_prog"]
self.rewardCell = uiMap["prog_reward.reward_cell"]:addLuaComponent(GConst.TYPEOF_LUA_CLASS.REWARD_CELL)
end
function FullMoonTaskProgCell:refresh(id)
local canGet = DataManager.FullMoonData:isReachTaskProgressReward(id)
local isReceived = DataManager.FullMoonData:isReceivedTaskProgressReward(id)
self.txProg:setText(DataManager.FullMoonData:getTaskProgressTarget(id))
self.rewardCell:refreshByConfig(DataManager.FullMoonData:getTaskProgressReward(id), isReceived, isReceived)
if canGet then
self.imgProg:setSprite(GConst.ATLAS_PATH.ACT_COMMON, "act_common_bg_7")
if not isReceived then
self.rewardCell.baseObject:addRedPoint(50, 50, 0.6)
self.rewardCell:addClickListener(function()
ModuleManager.FullMoonManager:reqTaskProgressReward(id)
end)
else
self.rewardCell.baseObject:removeRedPoint()
self.rewardCell:addClickListener(nil)
end
else
self.imgProg:setSprite(GConst.ATLAS_PATH.ACT_COMMON, "act_common_bg_8")
self.rewardCell.baseObject:removeRedPoint()
self.rewardCell:addClickListener(nil)
end
end
return FullMoonTaskProgCell

10
lua/app/ui/activity/full_moon/cell/full_moon_task_prog_cell.lua.meta Normal file
View File

@ -0,0 +1,10 @@
fileFormatVersion: 2
guid: 77ab55a8c675c344f86e75e0c68481dc
ScriptedImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 2
userData:
assetBundleName:
assetBundleVariant:
script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3}

130
lua/app/ui/activity/full_moon/full_moon_choose_hero_comp.lua Normal file
View File

@ -0,0 +1,130 @@
local FullMoonChooseHeroComp = class("FullMoonChooseHeroComp", LuaComponent)
function FullMoonChooseHeroComp:init()
local uiMap = self:getUIMap()
-- self.spineBanner = uiMap["choose_hero_panel.spine_banner"]
self.txTitle = uiMap["choose_hero_panel.tx_title"]
self.txTips = uiMap["choose_hero_panel.tx_tips"]
self.btnBuy = uiMap["choose_hero_panel.btn_buy"]
self.txBuy = uiMap["choose_hero_panel.btn_buy.tx_buy"]
self.rewards = uiMap["choose_hero_panel.rewards"]:getComponent(GConst.TYPEOF_UNITY_CLASS.BF_HORIZONTAL_OR_VERTICAL_LAYOUT)
self.rewardCells = {}
for i = 1, 3 do
table.insert(self.rewardCells, uiMap["choose_hero_panel.rewards.pop_reward_cell_" .. i]:addLuaComponent(GConst.TYPEOF_LUA_CLASS.POP_REWARD_CELL))
end
self.gifts = uiMap["choose_hero_panel.gifts"]:getComponent(GConst.TYPEOF_UNITY_CLASS.BF_HORIZONTAL_OR_VERTICAL_LAYOUT)
self.giftItems = {}
for i = 1, 5 do
table.insert(self.giftItems, uiMap["choose_hero_panel.gifts.gift_" .. i])
end
-- self.spineBanner:playAnim("animation", true, true)
self.txTitle:setText(I18N:getGlobalText(I18N.GlobalConst.ACTIVITY_MOON_DESC_4))
self.txTips:setText(I18N:getGlobalText(I18N.GlobalConst.ACTIVITY_MOON_DESC_6))
self.btnBuy:addClickListener(function()
if not DataManager.FullMoonData:getChooseHeroIndex() then
self:showChoose()
return
end
PayManager:purchasePackage(self.selectGiftId, PayManager.PURCHARSE_TYPE.ACT_GIFT)
end)
end
function FullMoonChooseHeroComp:refresh()
self.curGiftId = DataManager.FullMoonData:getCurChooseHeroGiftId()
self.selectGiftId = self.curGiftId
self:refreshGifts()
end
-- 刷新礼包显示
function FullMoonChooseHeroComp:refreshGifts()
local chooseFunc = function()
self:showChoose()
end
local gift = DataManager.ShopData:getActGiftConfig()[self.selectGiftId]
self.txTips:setActive(self.selectGiftId ~= self.curGiftId)
self.btnBuy:setActive(self.selectGiftId == self.curGiftId)
if not DataManager.FullMoonData:isGiftBought(self.selectGiftId) then
self.btnBuy:setTouchEnable(true)
self.btnBuy:setSprite(GConst.ATLAS_PATH.COMMON, "common_btn_green_1")
self.txBuy:setText(GFunc.getFormatPrice(gift.recharge_id))
else
self.btnBuy:setTouchEnable(false)
self.btnBuy:setSprite(GConst.ATLAS_PATH.COMMON, "common_btn_grey_1")
self.txBuy:setText(I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_20))
end
for index, cell in ipairs(self.rewardCells) do
if gift.reward[index] then
cell:setVisible(true)
cell:refresh(gift.reward[index].id, gift.reward[index].num, true)
elseif index == #gift.reward + 1 then
cell:setVisible(true)
if DataManager.FullMoonData:getChooseHeroIndex() then
local choose = DataManager.FullMoonData:getChooseRewards(self.selectGiftId, true)[DataManager.FullMoonData:getChooseHeroIndex()]
-- Logger.logHighlight(DataManager.FullMoonData:getChooseHeroIndex())
cell:refresh(choose.id, choose.num, true)
cell:refreshChoose(chooseFunc)
else
cell:refreshOnlyChoose(chooseFunc)
end
else
cell:setVisible(false)
end
end
self.rewards:RefreshLayout()
local ids = DataManager.FullMoonData:getCurStepChooseHeroGiftIds()
for index, item in ipairs(self.giftItems) do
if ids[index] then
item:setActive(true)
local map = item:genAllChildren()
local imgGift = map["img_gift"]
local imgBught = map["img_bught"]
local imgSelect = map["img_select"]
if ids[index] == self.curGiftId then
imgGift:setSprite(GConst.ATLAS_PATH.ACT_COMMON, "act_common_chest_2")
elseif ids[index] > self.curGiftId then
imgGift:setSprite(GConst.ATLAS_PATH.ACT_COMMON, "act_common_chest_3")
else
imgGift:setSprite(GConst.ATLAS_PATH.ACT_COMMON, "act_common_chest_1")
end
imgSelect:setActive(ids[index] == self.selectGiftId)
imgBught:setActive(DataManager.FullMoonData:isGiftBought(ids[index]))
item:addClickListener(function()
self:onSelectGift(ids[index])
end)
else
item:setActive(false)
end
end
self.gifts:RefreshLayout()
end
-- 选择礼包
function FullMoonChooseHeroComp:onSelectGift(id)
if id < self.curGiftId then
-- 已购礼包不允许点击
return
end
self.selectGiftId = id
self:refreshGifts()
end
-- 自选弹窗
function FullMoonChooseHeroComp:showChoose()
ModuleManager.TipsManager:showChooseRewardTips(
I18N:getGlobalText(I18N.GlobalConst.ACTIVITY_MOON_DESC_7),
I18N:getGlobalText(I18N.GlobalConst.ACTIVITY_MOON_DESC_8),
DataManager.FullMoonData:getChooseRewards(self.selectGiftId),
function(index)
index = DataManager.FullMoonData:getChooseRewardsIndexByCanChooseIndex(index)
ModuleManager.FullMoonManager:reqGiftChooseHero(index)
end
)
end
return FullMoonChooseHeroComp

10
lua/app/ui/activity/full_moon/full_moon_choose_hero_comp.lua.meta Normal file
View File

@ -0,0 +1,10 @@
fileFormatVersion: 2
guid: ff32f3cd22038324e8daab0f06524093
ScriptedImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 2
userData:
assetBundleName:
assetBundleVariant:
script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3}

100
lua/app/ui/activity/full_moon/full_moon_new_hero_comp.lua Normal file
View File

@ -0,0 +1,100 @@
local FullMoonNewHeroComp = class("FullMoonNewHeroComp", LuaComponent)
function FullMoonNewHeroComp:init()
local uiMap = self:getUIMap()
-- self.spineBanner = uiMap["new_hero_panel.spine_banner"]
self.txTitle = uiMap["new_hero_panel.tx_title"]
self.txTips = uiMap["new_hero_panel.tx_tips"]
self.btnBuy = uiMap["new_hero_panel.btn_buy"]
self.txBuy = uiMap["new_hero_panel.btn_buy.tx_buy"]
self.rewards = uiMap["new_hero_panel.rewards"]:getComponent(GConst.TYPEOF_UNITY_CLASS.BF_HORIZONTAL_OR_VERTICAL_LAYOUT)
self.rewardCells = {}
for i = 1, 3 do
table.insert(self.rewardCells, uiMap["new_hero_panel.rewards.pop_reward_cell_" .. i]:addLuaComponent(GConst.TYPEOF_LUA_CLASS.POP_REWARD_CELL))
end
self.gifts = uiMap["new_hero_panel.gifts"]:getComponent(GConst.TYPEOF_UNITY_CLASS.BF_HORIZONTAL_OR_VERTICAL_LAYOUT)
self.giftItems = {}
for i = 1, 5 do
table.insert(self.giftItems, uiMap["new_hero_panel.gifts.gift_" .. i])
end
-- self.spineBanner:playAnim("animation", true, true)
self.txTitle:setText(I18N:getGlobalText(I18N.GlobalConst.ACTIVITY_MOON_DESC_5))
self.txTips:setText(I18N:getGlobalText(I18N.GlobalConst.ACTIVITY_MOON_DESC_6))
self.btnBuy:addClickListener(function()
PayManager:purchasePackage(self.selectGiftId, PayManager.PURCHARSE_TYPE.ACT_GIFT)
end)
end
function FullMoonNewHeroComp:refresh()
self.curGiftId = DataManager.FullMoonData:getCurNewHeroGiftId()
self.selectGiftId = self.curGiftId
self:refreshGifts()
end
-- 刷新礼包显示
function FullMoonNewHeroComp:refreshGifts()
local gift = DataManager.ShopData:getActGiftConfig()[self.selectGiftId]
self.txTips:setActive(self.selectGiftId ~= self.curGiftId)
self.btnBuy:setActive(self.selectGiftId == self.curGiftId)
if not DataManager.FullMoonData:isGiftBought(self.selectGiftId) then
self.btnBuy:setTouchEnable(true)
self.btnBuy:setSprite(GConst.ATLAS_PATH.COMMON, "common_btn_green_1")
self.txBuy:setText(GFunc.getFormatPrice(gift.recharge_id))
else
self.btnBuy:setTouchEnable(false)
self.btnBuy:setSprite(GConst.ATLAS_PATH.COMMON, "common_btn_grey_1")
self.txBuy:setText(I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_20))
end
for index, cell in ipairs(self.rewardCells) do
if gift.reward[index] then
cell:setVisible(true)
cell:refresh(gift.reward[index].id, gift.reward[index].num, true)
else
cell:setVisible(false)
end
end
self.rewards:RefreshLayout()
local ids = DataManager.FullMoonData:getCurStepNewHeroGiftIds()
for index, item in ipairs(self.giftItems) do
if ids[index] then
item:setActive(true)
local map = item:genAllChildren()
local imgGift = map["img_gift"]
local imgBught = map["img_bught"]
local imgSelect = map["img_select"]
if ids[index] == self.curGiftId then
imgGift:setSprite(GConst.ATLAS_PATH.ACT_COMMON, "act_common_chest_2")
elseif ids[index] > self.curGiftId then
imgGift:setSprite(GConst.ATLAS_PATH.ACT_COMMON, "act_common_chest_3")
else
imgGift:setSprite(GConst.ATLAS_PATH.ACT_COMMON, "act_common_chest_1")
end
imgSelect:setActive(ids[index] == self.selectGiftId)
imgBught:setActive(DataManager.FullMoonData:isGiftBought(ids[index]))
item:addClickListener(function()
self:onSelectGift(ids[index])
end)
else
item:setActive(false)
end
end
self.gifts:RefreshLayout()
end
-- 选择礼包
function FullMoonNewHeroComp:onSelectGift(id)
if id < self.curGiftId then
-- 已购礼包不允许点击
return
end
self.selectGiftId = id
self:refreshGifts()
end
return FullMoonNewHeroComp

Some files were not shown because too many files have changed in this diff Show More