From 4b3327eb48d0dbd74db8c3ce54c98b6e16ca6f78 Mon Sep 17 00:00:00 2001
From: chenyueqi <chenyueqi@qq.com>
Date: Mon, 12 Apr 2021 14:36:34 +0800
Subject: [PATCH] 物资危机增加 代理拾荒时长和击杀boss数量的任务类型

---
 src/actions/AdvAction.lua | 1 +
 src/models/Activity.lua   | 2 +-
 src/models/RoleLog.lua    | 2 +-
 src/models/RoleTask.lua   | 3 +++
 4 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/actions/AdvAction.lua b/src/actions/AdvAction.lua
index b9442ee..4bba84f 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 c27eca3..da1d687 100644
--- a/src/models/Activity.lua
+++ b/src/models/Activity.lua
@@ -986,7 +986,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 95aae96..72838f4 100644
--- a/src/models/RoleLog.lua
+++ b/src/models/RoleLog.lua
@@ -59,7 +59,7 @@ local ItemReason = {
 	advLevelStage = 143, -- 拾荒活动阶段奖励
 	towerBnous = 144, -- 爬塔到一定层数对某些功能的奖励
 	unknowShop = 145, -- 未知商店
-
+	activityCrisis = 146,
 
 	advHang = 301, -- 拾荒挂机
 	hangBattle = 302, -- 挂机战斗
diff --git a/src/models/RoleTask.lua b/src/models/RoleTask.lua
index af11a44..f56f275 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 = 421,			-- 拾荒委托累计时长 		-- count
 	
 	--爬塔相关
 	TowerPass = 501,			-- 爬塔通关			- level
@@ -253,6 +254,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