Merge branch 'tr/bugfix' into tr/publish/release

# Conflicts: # src/csvdata

Merge branch 'tr/bugfix' into tr/publish/release
# Conflicts: # src/csvdata
熊润斐
2 parents 80d5c076 18722d1e
Showing 7 changed files with 23 additions and 5 deletions Show diff stats
src/actions/AdvAction.lua
src/actions/GmAction.lua
src/actions/HeroAction.lua
src/models/Activity.lua
src/models/RoleLog.lua
src/models/RolePlugin.lua
src/models/RoleTask.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
@@ -80,7 +80,20 @@ function _M.silent(role, pms)
 end
  
 function _M.pvp_cross_head(role, pms)
-	role:awardExpireItem(tonum(pms.expire), pms.reward, {log = {desc = "pvpCHead"}})
+	local reward = pms.reward:toNumMap()
+	local iconCsv = csvdb["player_iconCsv"]
+	local isLong = false
+	for k , v in pairs(reward) do
+		if iconCsv[k] and iconCsv[k].path == 3 then
+			isLong = true
+			break
+		end
+	end
+	if isLong then
+		role:award(reward, {log = {desc = "pvpCHead"}})
+	else
+		role:awardExpireItem(tonum(pms.expire), reward, {log = {desc = "pvpCHead"}})
+	end
 	return "成功"
 end
  
@@ -131,7 +131,7 @@ function _M.wakeRpc(agent, data)
 	local oldBattleV = hero:getProperty("battleV")
 	hero:updateProperty({field = "wakeL", delta = 1})
  
-	role:checkTaskEnter("Wake", {heroType = typ, wakeL = curLevel})
+	role:checkTaskEnter("Wake", {heroType = typ, wakeL = curLevel + 1})
 	if curLevel == 3 then -- 解锁cg
 		role:checkTaskEnter("WakeCG", {heroType = typ})
 	end
@@ -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
@@ -59,7 +59,7 @@ local ItemReason = {
 	advLevelStage = 143, -- 拾荒活动阶段奖励
 	towerBnous = 144, -- 爬塔到一定层数对某些功能的奖励
 	unknowShop = 145, -- 未知商店
-
+	activityCrisis = 146,
  
 	advHang = 301, -- 拾荒挂机
 	hangBattle = 302, -- 挂机战斗
@@ -247,7 +247,8 @@ function RolePlugin.bind(Role)
 								local headData = csvdb["player_iconCsv"][itemId]
 								-- pvp 跨服竞技场奖励
 								if headData and headData.path == 2 then
-									redisproxy:insertEmail({roleId = self:getProperty("id"), emailId = 19})
+									self:sendMail(19)
+									--redisproxy:insertEmail({roleId = self:getProperty("id"), emailId = 19})
 								end
 							end
 						end
@@ -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}},
 	}
 }