diff --git a/src/actions/AdvAction.lua b/src/actions/AdvAction.lua index 820800e..47b1c3b 100644 --- a/src/actions/AdvAction.lua +++ b/src/actions/AdvAction.lua @@ -494,6 +494,7 @@ function _M.endHangRpc(agent, data) role:checkTaskEnter("AdvHang", {}) role:checkTaskEnter("AdvHangHeroCnt", {count = heroCnt}) + role:checkTaskEnter("AdvHangTime", {count = math.ceil(adv_idle_time / 3600)}) SendPacket(actionCodes.Adv_endHangRpc, MsgPack.pack({reward = reward, change = change, isFull = isFull, heroFaith = heroFaithMap})) return true diff --git a/src/models/Activity.lua b/src/models/Activity.lua index e517890..3e02ce7 100644 --- a/src/models/Activity.lua +++ b/src/models/Activity.lua @@ -1086,7 +1086,7 @@ activityFunc[Activity.ActivityType.Crisis] = { status = -1 end - self.owner:award(reward, {log = {desc = "activity_crisis"}, notNotify = not notify}) + self.owner:award(reward, {log = {desc = "activityCrisis"}, notNotify = not notify}) end actData.task[id] = status change = true diff --git a/src/models/RoleLog.lua b/src/models/RoleLog.lua index 6fa3800..500a0e0 100644 --- a/src/models/RoleLog.lua +++ b/src/models/RoleLog.lua @@ -61,6 +61,7 @@ local ItemReason = { unknowShop = 145, -- 未知商店 convert = 146, -- 钻石兑换其他物品 giftTime = 147, -- 创角后的时间礼包 + activityCrisis = 148, -- 物资危机奖励 advHang = 301, -- 拾荒挂机 hangBattle = 302, -- 挂机战斗 diff --git a/src/models/RoleTask.lua b/src/models/RoleTask.lua index e55fc2e..41e62a9 100644 --- a/src/models/RoleTask.lua +++ b/src/models/RoleTask.lua @@ -60,6 +60,7 @@ local TaskType = { AdvUseItem = 419, -- 使用道具 - itemId count AdvBuild = 420, -- 建筑交互 - buildId AdvKill = 421, -- 拾荒击败敌人 + AdvHangTime = 422, -- 代理拾荒时间 - count --爬塔相关 TowerPass = 501, -- 爬塔通关 - level @@ -255,6 +256,8 @@ local ActivityListener = { [TaskType.AdvCostPower] = {{Activity.ActivityType.Crisis, 3, f("count")}}, [TaskType.DailyTask] = {{Activity.ActivityType.CommonSignIn, f("pre"), f("cur")}}, [TaskType.AddItem] = {{Activity.ActivityType.BattleCommand, f("id"), f("count")}}, + [TaskType.AdvHangTime] = {{Activity.ActivityType.Crisis, 4, f("count")}}, + [TaskType.AdvKillBoss] = {{Activity.ActivityType.Crisis, 5}}, } } -- libgit2 0.21.2