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

Merge branch 'master' into dev_20231009

Browse Source 
# Conflicts:
#	lua/app/config/const.lua
This commit is contained in:
xiekaidong 2023-10-09 15:48:38 +08:00
commit 291b438b19
5 changed files with 36 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
lua/app/config/activity_pvp_robot.lua
View File

@ -12,7 +12,7 @@ local activity_pvp_robot = {
6 6
}, },
{ {
24004, 22004,
6 6
}, },
{ {
@ -20,7 +20,7 @@ local activity_pvp_robot = {
6 6
}, },
{ {
44002, 42002,
6 6
}, },
{ {
@ -42,15 +42,15 @@ local activity_pvp_robot = {
6 6
}, },
{ {
24002, 22002,
6 6
}, },
{ {
34001, 32001,
6 6
}, },
{ {
44004, 42004,
6 6
}, },
{ {
@ -68,7 +68,7 @@ local activity_pvp_robot = {
["avatar_frame"]=1000, ["avatar_frame"]=1000,
["hero_id"]={ ["hero_id"]={
{ {
14002, 12002,
6 6
}, },
{ {
@ -76,7 +76,7 @@ local activity_pvp_robot = {
6 6
}, },
{ {
34001, 32001,
6 6
}, },
{ {
@ -102,7 +102,7 @@ local activity_pvp_robot = {
6 6
}, },
{ {
24003, 22003,
6 6
}, },
{ {
@ -132,7 +132,7 @@ local activity_pvp_robot = {
6 6
}, },
{ {
24002, 23002,
6 6
}, },
{ {
@ -140,7 +140,7 @@ local activity_pvp_robot = {
6 6
}, },
{ {
44001, 42001,
6 6
}, },
{ {

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

@ -152,6 +152,7 @@ function BattleControllerDungeonRune:enterRoundBegin()
-- 完成任务 -- 完成任务
local taskOver = self:getRuneTaskAllOver() local taskOver = self:getRuneTaskAllOver()
if taskOver and not self.isBossChapter then if taskOver and not self.isBossChapter then
self.needWaitingBoardOver = nil
self.victory = true self.victory = true
self:postWaveOver(false) self:postWaveOver(false)
self:battleEnd() self:battleEnd()
@ -454,8 +455,9 @@ function BattleControllerDungeonRune:getRuneTaskNumByType(taskInfo)
elseif taskType == GConst.DungeonRuneConst.TASK_TYPE.BREAK_GRID_TYPE then elseif taskType == GConst.DungeonRuneConst.TASK_TYPE.BREAK_GRID_TYPE then
return self.totalBreakedGridType[taskParams1] or 0 return self.totalBreakedGridType[taskParams1] or 0
elseif taskType == GConst.DungeonRuneConst.TASK_TYPE.KILL_MONSTER then elseif taskType == GConst.DungeonRuneConst.TASK_TYPE.KILL_MONSTER then
return self.taskProgress[GConst.BattleConst.BATTLE_TASK_FIELD.KILL_NORMAL_MONSTER] return self.taskProgress[GConst.BattleConst.BATTLE_TASK_FIELD.KILL_NORMAL_MONSTER] or 0
end end
return 0
end end
function BattleControllerDungeonRune:getRuneTaskAllOver() function BattleControllerDungeonRune:getRuneTaskAllOver()

4
lua/app/userdata/arena/arena_data.lua
View File

@ -211,6 +211,10 @@ function ArenaData:getGradingIdFromScore(score, isLastSeason)
if isLastSeason then if isLastSeason then
cfg = self:getRankCfg(self.season - 1) cfg = self:getRankCfg(self.season - 1)
end end
if cfg == nil then
-- 活动没开特殊处理
cfg = self:getRankCfg(1)
end
local ids = table.keys(cfg) local ids = table.keys(cfg)
table.sort(ids) table.sort(ids)

16
lua/app/userdata/hero/hero_data.lua
View File

@ -98,12 +98,16 @@ function HeroData:updateSelfHeroEquipsAndRunes(entity)
Logger.logHighlight("更新英雄属性:" .. entity:getCfgId()) Logger.logHighlight("更新英雄属性:" .. entity:getCfgId())
end end
entity:setEquips(GConst.EquipConst.PART_TYPE.WEAPON, DataManager.EquipData:getEquip(entity:getCfgId(), GConst.EquipConst.PART_TYPE.WEAPON)) entity:setEquips(GConst.EquipConst.PART_TYPE.WEAPON, DataManager.EquipData:getEquip(entity:getCfgId(), GConst.EquipConst.PART_TYPE.WEAPON), true)
entity:setEquips(GConst.EquipConst.PART_TYPE.HAT, DataManager.EquipData:getEquip(entity:getCfgId(), GConst.EquipConst.PART_TYPE.HAT)) entity:setEquips(GConst.EquipConst.PART_TYPE.HAT, DataManager.EquipData:getEquip(entity:getCfgId(), GConst.EquipConst.PART_TYPE.HAT), true)
entity:setEquips(GConst.EquipConst.PART_TYPE.CLOTHES, DataManager.EquipData:getEquip(entity:getCfgId(), GConst.EquipConst.PART_TYPE.CLOTHES)) entity:setEquips(GConst.EquipConst.PART_TYPE.CLOTHES, DataManager.EquipData:getEquip(entity:getCfgId(), GConst.EquipConst.PART_TYPE.CLOTHES), true)
entity:setEquips(GConst.EquipConst.PART_TYPE.BELT, DataManager.EquipData:getEquip(entity:getCfgId(), GConst.EquipConst.PART_TYPE.BELT)) entity:setEquips(GConst.EquipConst.PART_TYPE.BELT, DataManager.EquipData:getEquip(entity:getCfgId(), GConst.EquipConst.PART_TYPE.BELT), true)
entity:setEquips(GConst.EquipConst.PART_TYPE.HANDGUARD, DataManager.EquipData:getEquip(entity:getCfgId(), GConst.EquipConst.PART_TYPE.HANDGUARD)) entity:setEquips(GConst.EquipConst.PART_TYPE.HANDGUARD, DataManager.EquipData:getEquip(entity:getCfgId(), GConst.EquipConst.PART_TYPE.HANDGUARD), true)
entity:setRunes(DataManager.RunesData:getRunes(entity:getCfgId())) entity:setRunes(DataManager.RunesData:getRunes(entity:getCfgId()), true)
-- 手动调用更新数据
entity:onEquipAttrChange()
entity:onRunesAttrChange()
end end
function HeroData:getEntity(heroStruct) function HeroData:getEntity(heroStruct)

11
lua/app/userdata/hero/hero_entity.lua
View File

@ -594,12 +594,15 @@ function HeroEntity:getTotalBaseAtk()
end end
-- {partType = EquipEntity} -- {partType = EquipEntity}
function HeroEntity:setEquips(partType, equipEntities) function HeroEntity:setEquips(partType, equipEntities, notNowUpdate)
if self.equipEntities == nil then if self.equipEntities == nil then
self.equipEntities = {} self.equipEntities = {}
end end
self.equipEntities[partType] = equipEntities self.equipEntities[partType] = equipEntities
if notNowUpdate then
return
end
self:getTotalAttrValue() -- 防止报错 self:getTotalAttrValue() -- 防止报错
self:onEquipAttrChange() self:onEquipAttrChange()
end end
@ -621,8 +624,12 @@ function HeroEntity:getSkins()
return self.unlockSkins return self.unlockSkins
end end
function HeroEntity:setRunes(runesEntity) function HeroEntity:setRunes(runesEntity, notNowUpdate)
self.runesEntity = runesEntity self.runesEntity = runesEntity
if notNowUpdate then
return
end
self:getTotalAttrValue() -- 防止报错 self:getTotalAttrValue() -- 防止报错
self:onRunesAttrChange() self:onRunesAttrChange()
end end