Merge branch 'cn/develop' into cn/publish/preview

jiyue
2 parents 83734e23 9e5f9701
Showing 6 changed files with 36 additions and 11 deletions Show diff stats
src/actions/ActivityAction.lua
src/actions/HttpAction.lua
src/models/Activity.lua
src/models/RoleCross.lua
src/models/RolePlugin.lua
src/models/RoleTask.lua
@@ -645,7 +645,7 @@ function _M.startBattleRpc(agent, data)
 			award[k] = v * count
 		end
 		local reward, change  = role:award(award, {log = {desc = "actBattle", int1 = actid, int2 = count or 0}})
-		SendPacket(actionCodes.Activity_startBattleRpc, MsgPack.pack(role:packReward(reward, change)))
+
         changeFlag = true
         actData["ticket"] = ticket - num
@@ -665,11 +665,15 @@ function _M.startBattleRpc(agent, data)
             end
             role:updateRankCommon(RANK_TYPE.ActBattleBoss, rankVal)
 		end
+        role.activity:updateActData("ChallengeLevel", actData)
+		SendPacket(actionCodes.Activity_startBattleRpc, MsgPack.pack(role:packReward(reward, change)))
+
+        return true
 	end
-	if changeFlag then
-		role.activity:updateActData("ChallengeLevel", actData)
-	end
+	--if changeFlag then
+	--	role.activity:updateActData("ChallengeLevel", actData)
+	--end
 	return true
 end
@@ -143,7 +143,7 @@ function _M.gm_action(query)
 	role:startActionUcode()
 	local status = gmFuncs[query.cmd](role, query)
 	role:endActionUcode()
-    role:update()
+    role:saveRoleData()
 	return status
 end
@@ -174,6 +174,7 @@ function _M.pay_action(query)
 	role:startActionUcode()
 	local status = gmFuncs[query.cmd](role, query)
 	role:endActionUcode()
+    role:saveRoleData()
 	return status
 end
@@ -497,6 +497,7 @@ activityFunc[Activity.ActivityType.CalendaTask] = {
 		--role:checkTaskEnter("HangPass", {id = 0})
 		role:checkCalendaTask(true, 15, 3)
 		role:checkTaskEnter("HeroStarCollect", {})
+		role:checkTaskEnter("HeroStartSum", {})
 		role:checkTaskEnter("RuneQualityCollect", {})
 	end,
@@ -565,6 +566,7 @@ activityFunc[Activity.ActivityType.BattleCommandTask] = {
 		--role:checkTaskEnter("HangPass", {id = 0})
 		role:checkCalendaTask(true, 15, 3)
 		role:checkTaskEnter("HeroStarCollect", {})
+		role:checkTaskEnter("HeroStartSum", {})
 		role:checkTaskEnter("RuneQualityCollect", {})
 	end,
@@ -669,6 +671,7 @@ activityFunc[Activity.ActivityType.NewUserTask] = {
 		--role:checkTaskEnter("HangPass", {id = 0})
 		role:checkCalendaTask(true, 15, 3)
 		role:checkTaskEnter("HeroStarCollect", {})
+		role:checkTaskEnter("HeroStartSum", {})
 		role:checkTaskEnter("RuneQualityCollect", {})
 	end,
@@ -167,6 +167,7 @@ RoleCross.bind = function (Role)
 				})
 				self:checkTaskEnter("Wake", {heroType = heroId, wakeL = initData.heros.wakeL})
 				self:checkTaskEnter("WakeCG", {heroType = heroId})
+				self:checkTaskEnter("WakeCGSum", {count = 1})
 				self:checkTaskEnter("HeroTalent", {heroType = heroId, alv = aheadLevel})
 			end
@@ -32,6 +32,8 @@ function RolePlugin.bind(Role)
 	function Role:onOfflineEvent()
 		-- 设置最新的登录时间
 		self:setProperty("ltime", skynet.timex())
+
+        self:saveRoleData()
 	end
 	local function checkItemCount(self, itemId, count)
@@ -606,6 +608,7 @@ function RolePlugin.bind(Role)
 		}
 		if heroInfo.wakeL == 3 then
 			self:checkTaskEnter("WakeCG", {heroType = heroType})
+			self:checkTaskEnter("WakeCGSum", {count = 1})
 		end
 		local newHero = require("models.Hero").new(heroInfo)
 		newHero:create()
@@ -2051,10 +2054,10 @@ function RolePlugin.bind(Role)
     local SAVE_DATA_INTERVAL = 3
 	function Role:saveRoleData(now)
-        if now - self._lastSaveTs < SAVE_DATA_INTERVAL then
+        if now and (now - self._lastSaveTs < SAVE_DATA_INTERVAL) then
             return
         end
-        self._lastSaveTs = now
+        self._lastSaveTs = now or skynet.timex()
 		self:update()
 		local objs = {self.activity, self.dailyData, self.dinerData, self.storeData, self.roleIncre}
 		for _, info in ipairs(objs) do
@@ -17,6 +17,9 @@ local TaskType = {
 	HeroStarCollect = 12,		-- 英雄星级收集进度
 	DrawHeroNotFriend = 13,		-- 非友情招募		-- count
 	DrawHeroLimitPack = 14,		-- 抽卡限时礼貌		-- count
+    HeroStartSum = 15, 			-- 英雄星级总数
+	WakeCGSum = 16, 			-- 累计解锁xx张CG
+
 	--装备相关
 	AddEquip = 101,				-- 获得装备			- equipId	rarity
@@ -325,6 +328,8 @@ local CalendaTaskListener = {
 		[TaskType.ActBattlePass] = {{40, 3, f("chapterId")}},
 		[TaskType.AdvPass] = {{41, 3, f("id")}},
 		[TaskType.CostJade] = {{43, 1, f("count")}},
+		[TaskType.HeroStartSum] = {{44, 3}},
+		[TaskType.WakeCGSum] = {{45, 1, f("count")}},
 	}
 }
@@ -745,7 +750,7 @@ function RoleTask.bind(Role)
 									for _,uid in pairs(hero:getRunes()) do
 										if uid > 0 then
 											local runeData = self.runeBag[uid]
-											if runeData then 
+											if runeData then
 												local csvData = csvdb["runeCsv"][runeData:getProperty("type")][runeData:getProperty("id")]
 												if csvData and cfg.condition2 <= csvData.rarity then
@@ -765,9 +770,9 @@ function RoleTask.bind(Role)
 								end
 							elseif cfg.type == 15 then -- 通关关卡
 								if (calTask[id] or 0) == 0 then
-                                    if self:checkHangPass(cfg.condition2) then
+									if self:checkHangPass(cfg.condition2) then
 										calTask[id] = 1
-                                    end
+									end
 									--local hangPass = self:getProperty("hangPass")
 									--local diff = math.floor(cfg.condition2 / 10000)
 									--if (hangPass[diff] or 0) >= cfg.condition2 then
@@ -798,7 +803,7 @@ function RoleTask.bind(Role)
 							elseif cfg.type == 37 then -- 拾荒使用道具
 								if cfg.condition2 == param1 then
 									calTask[id] = (calTask[id] or 0) + (param2 or 0)
-								end	
+								end
 							elseif cfg.type == 38 then	-- 和指定建筑交互
 								local condArr = cfg.condition3:toArray(true, "=")
 								for i = 0, #condArr do
@@ -827,6 +832,14 @@ function RoleTask.bind(Role)
 								if cfg.condition2 <= param1 and param2 == 1 then
 									calTask[id] = (calTask[id] or 0) + 1
 								end
+							elseif cfg.type == 44 then --玩家拥有拾荒者总星级达到xxx
+								local count = 0
+								for _, hero in pairs(self.heros) do
+									count = count + hero:getProperty("wakeL")
+								end
+								if (calTask[id] or 0) < count then
+									calTask[id] = count
+								end
 							end
 						end
 					end