Merge branch 'cn/develop' of 120.26.43.151:wasteland/server into cn/develop

saicom
2 parents f2c7c6fa b88939d5
Showing 6 changed files with 24 additions and 14 deletions Show diff stats
src/GlobalVar.lua
src/actions/HeroAction.lua
src/models/RoleCross.lua
src/models/RolePlugin.lua
src/models/RoleTask.lua
src/models/Store.lua
@@ -391,6 +391,7 @@ TriggerEventType = {
     RuneUp = 12,    -- 循环强化符文
     CostDiamond = 13,   -- 循环消耗钻石
     BuyLimitPack = 14, --购买指定id礼包 触发
+	HeroTalent = 15, --英雄精进 触发礼包
 }
 DrawCardType = {
@@ -147,9 +147,11 @@ function _M.wakeRpc(agent, data)
 	local oldBattleV = hero:getProperty("battleV")
 	hero:updateProperty({field = "wakeL", delta = 1})
-	role:checkTaskEnter("Wake", {heroType = typ, wakeL = curLevel + 1})
+	curLevel = curLevel + 1
+	role:checkTaskEnter("Wake", {heroType = typ, wakeL = curLevel})
 	if curLevel == 3 then -- 解锁cg
 		role:checkTaskEnter("WakeCG", {heroType = typ})
+		role:checkTaskEnter("WakeCGSum", {count = 1})
 	end
 	if curLevel >= 4 then --自动觉醒技能
@@ -173,6 +175,7 @@ function _M.wakeRpc(agent, data)
 	SendPacket(actionCodes.Hero_wakeRpc, '')
 	role:checkTaskEnter("HeroStarCollect", {})
+	role:checkTaskEnter("HeroStartSum", {})
 	return true
 end
@@ -212,7 +215,7 @@ function _M.talentRpc(agent, data)
 		talent = talent:setv(1, curLevel + 1)
 	end
 	curStage = talent:getv(0, 1)
-	role:checkTaskEnter("HeroTalent", {heroType = hero:getProperty("type"), alv = curStage})
+	role:checkTaskEnter("HeroTalent", {heroType = hero:getProperty("type"), alv = curStage, count = 1})
 	hero:updateProperty({field = "talent", value = talent})
@@ -167,8 +167,10 @@ 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})
+				if initData.heros.wakeL == 3 then
+					self:checkTaskEnter("WakeCGSum", {count = 1})
+				end
 			end
 		end
@@ -623,6 +623,8 @@ function RolePlugin.bind(Role)
 		end
 		self:checkTaskEnter("AddHero", {heroType = heroType, wakeL = newHero:getProperty("wakeL"), camp = unitData.camp, job = unitData.job, ssrCount = ssrCount}, params.notNotify)
 		self:checkTaskEnter("HeroQualityCollect", {})
+		self:checkTaskEnter("HeroStartSum", {})
+
 		if not params.notNotify then
 			local heroResponse = {}
 			table.insert(heroResponse, newHero:data())
@@ -282,6 +282,7 @@ local StoreListener = {
 		[TaskType.RuneUp] = {{TriggerEventType.RuneUp, 1}},
 		[TaskType.CostDiamond] = {{TriggerEventType.CostDiamond, f("count")}},
 		[TaskType.BuyLimitPack] = {{TriggerEventType.BuyLimitPack, f("id")}},
+		[TaskType.HeroTalent] = {{TriggerEventType.HeroTalent, f("count")}},
 	}
 }
@@ -96,8 +96,15 @@ function Store:refreshWeekData(notify)
     self:flushWeekShop()
 end
+
+local function getSMonthCardPeriods(self, id)
+    local smonthCards = self:getProperty("smonthCards") or {}
+    local smonthCard = smonthCards[id] or {}
+    return smonthCard["periods"] or 0
+end
+
 local function getCardItemDailyReward(self, id)
-    local cur_ex = self:getSMonthCardPeriods(self, id)
+    local cur_ex = getSMonthCardPeriods(self, id)
     if cur_ex == 0 then return nil, nil end
     cur_ex = cur_ex - 1
@@ -293,8 +300,8 @@ end
 function Store:getSMonthCardDailyReward(id)
     if not id then return nil end
-    local before_ex = self:getSMonthCardPeriods(self, id)
-    local reward, change, cur_ex= getCardItemDailyReward(id)
+    local before_ex = getSMonthCardPeriods(self, id)
+    local reward, change, cur_ex= getCardItemDailyReward(self, id)
     --今日特刊奖励已经领取
     self:updateProperty({field = "smonthCardReceive", value = 1})
@@ -330,14 +337,8 @@ function Store:firstBuySMonthCard(id)
     return nil
 end
-function Store:getSMonthCardPeriods(id)
-    local smonthCards = self:getProperty("smonthCards") or {}
-    local smonthCard = smonthCards[id] or {}
-    return smonthCard["periods"] or 0
-end
-
 function Store:isSMonthCardExpired(id)
-    return self:getSMonthCardPeriods(id) == 0
+    return getSMonthCardPeriods(self, id) == 0
 end
 function Store:buySMonthCardLimit(buylimit)
@@ -627,7 +628,7 @@ function Store:OnTriggerLimitTimePack(eventType, param)
     if not config then return end
     -- 每日循环弹窗
-    local typeMap = {[TriggerEventType.DrawHero] = 1, [TriggerEventType.FoodSell] = 1, [TriggerEventType.RuneUp] = 1, [TriggerEventType.CostDiamond] = 1}
+    local typeMap = {[TriggerEventType.DrawHero] = 1, [TriggerEventType.FoodSell] = 1, [TriggerEventType.RuneUp] = 1, [TriggerEventType.CostDiamond] = 1, [TriggerEventType.HeroTalent] = 1}
     if typeMap[eventType] then
         local dayInfo = self:getProperty("dayLimitInfo")
         local info = dayInfo[eventType] or {}