Merge branch 'tr/bugfix' into cn/develop

熊润斐
2 parents fe41ea5d 54f63c13
Showing 10 changed files with 163 additions and 21 deletions Show diff stats
src/GlobalVar.lua
src/adv/Adv.lua
src/adv/AdvBlock.lua
src/adv/AdvBuff.lua
src/adv/AdvMap.lua
src/adv/AdvPassive.lua
src/csvdata
src/models/Activity.lua
src/models/RolePlugin.lua
src/models/Store.lua
@@ -83,6 +83,7 @@ ItemType = {
 	SpeedBox					= 16, 	-- 加速箱子
 	SelectItemBox				= 17, 	-- 自选箱子
 	CommonPaster				= 18, 	-- 万能贴纸
+	BossTicket					= 20, 	-- boss挑战门票
 }
  
 --在这个里面的会记录的是功能开放 对应类型open 而不是 ID
@@ -313,6 +314,8 @@ CardType = {
 	PaySignCard = 6, -- 付费签到卡
 	BattlePassCard = 7, -- 探索指令
 	ActBattleCommandCard = 8, -- 战令活动卡
+	NormalMonthCardLevelUp = 9,	-- 月卡升级
+	SuperMonthCardLevelUp = 10,	-- 超级月卡升级
 }
  
 ShopPackType = {
@@ -2127,6 +2127,32 @@ function Adv:doActive(activeId, target)
 		self.battle.player:addBaseAttr(attr, value, vtype)
 		return true
 	end
+	-- 13=将目标移动至地图随机点，可以移动至未翻开的空格
+	doActiveEffect[13] = function(_)
+		for _, target in ipairs(targers) do
+		end
+		return true
+	end
+	-- 14=获得drop，在有坐标时需要道具飞入背包的展现。
+	doActiveEffect[14] = function(_, dropId)
+		local gift = nil
+		local dropData = csvdb["event_dropCsv"][dropId]
+		if dropData then
+			local item = dropData["range"]:randWeight(true)
+			if item[1] ~= 0 then
+				gift = {}
+				gift[item[1]] = (gift[item[1]] or 0) + item[2]
+			end
+		end
+		local roomId, blockId
+		if not target or not target.roomId or not target.blockId then
+			roomId, blockId = target.roomId, target.blockId
+		end
+		if gift then
+			self:award(gift, {log = {desc = "doActive",  int1 = activeId}}, {roomId = roomId, blockId = blockId})
+		end
+		return true
+	end
  
 	for _, effect in ipairs(activeData.effect:toArray()) do
 		local cur = effect:toArray(true, "=")
@@ -215,7 +215,9 @@ function Block:randomEvent()
 	randomFunc[AdvEventType.Trap] = function()
 		local data = csvdb["event_trapCsv"][self.event.id]
 		-- 因为一些神器效果 提前触发被动
-		adv.battle.player:triggerPassive(Passive.CLICK_TRAP)
+		if not data.classify:sismember(1, " ") then
+			adv.battle.player:triggerPassive(Passive.CLICK_TRAP)
+		end
  
 		local buffs = data.effect:toArray(true, "=")
  
@@ -704,11 +704,13 @@ function Buff:overlay(releaser, data, layer)
  
 		self.release = releaser or self.release
 		-- 叠加层数
+		local oldLayer = self.layer
 		self.layer = self.layer + layer
 		if maxLayer ~= 0 then
 			self.layer = math.min(maxLayer, self.layer)
 		end
-		if self._overlay then
+
+		if oldLayer ~= self.layer and self._overlay then
 			self:_overlay()
 		end
  
@@ -97,23 +97,28 @@ function Map:checkOver()
 	end
 end
  
+function Map:randEmptyBlock()
+	local pool = {}
+	for _, room_ in pairs(self.rooms) do
+		for _, block_ in pairs(room_.blocks) do
+			if block_.isOpen and not block_.event then
+				table.insert(pool, {room_, block_})
+			end
+		end
+	end
+	if not next(pool) then return end
+	local idx = math.randomInt(1, #pool)
+	return pool[idx][1], pool[idx][2]
+end
+
 --随机一个空的位置生成怪， 如果没有就没有	
 function Map:addNewMonsterRand(monsterId, where)
 	local room, block
 	if where then
 		room, block = where[1], where[2]
 	else
-		local pool = {}
-		for _, room_ in pairs(self.rooms) do
-			for _, block_ in pairs(room_.blocks) do
-				if block_.isOpen and not block_.event then
-					table.insert(pool, {room_, block_})
-				end
-			end
-		end
-		if not next(pool) then return end
-		local idx = math.randomInt(1, #pool)
-		room, block = pool[idx][1], pool[idx][2]
+		room, block = self:randEmptyBlock()
+		if not room then return end
 	end
  
 	if not monsterId then
@@ -565,6 +565,16 @@ end
  
 -- 在指定地点召唤event项目							
 function Passive:effect12(eventType, triggerPms, eventId, count, stage)
+	if eventType == AdvEventType.Monster then
+		for _, buff in ipairs(self.owner.battle.player.buffs) do
+			if not buff.isDel and buff:getType() == buff.Buff_NO_PASSIVE_MONSTER then
+				local effect = buff:effect()
+				if effect == 0 or effect == eventId then
+					return
+				end
+			end
+		end
+	end
 	local change = self.owner.battle.adv:getCurMap():layEventToStage(eventType, eventId, count, stage)
 	for _, one in ipairs(change) do
 		self.owner.battle.adv:backBlockChange(one[1].roomId, one[2].blockId)
-Subproject commit 9ab88a62f1c2ff1121be7547f02668db43dc1f75
+Subproject commit f70c635c2f99d9800b629e41e13aa5115d5f69cd
@@ -1039,6 +1039,14 @@ activityFunc[Activity.ActivityType.BattleCommand] = {
 	["init"] = function (self, actType, isCrossDay, notify, actId)
 		local data = {unlock = 0, freeR = "", payR = "", lvl = 0, sum = 0, week = 0}
 		self:updateActData(actType, data, not notify)
+
+		local rechargeRecord = self.owner.storeData:getProperty("payR")
+		for id, cfg in pairs(csvdb["shop_rechargeCsv"]) do
+			if cfg.shop == 2 and cfg.type == CardType.ActBattleCommandCard then
+				rechargeRecord[id] = nil
+			end
+		end
+		self.owner.storeData:updateProperty({field="payR", value=rechargeRecord})
 	end,
 	["check"] = function(self, actType, notify, id, count) -- 检查	itemid, count
 		local isOpen, actId = self:isOpen(actType)
@@ -1082,6 +1090,15 @@ activityFunc[Activity.ActivityType.BattleCommand] = {
 		actData["week"] = 0
 		self:updateActData(actType, actData, true)
 	end,
+	["close"] = function (self, actType, notify, actId)
+		local rechargeRecord = self.owner.storeData:getProperty("payR")
+		for id, cfg in pairs(csvdb["shop_rechargeCsv"]) do
+			if cfg.shop == 2 and cfg.type == CardType.ActBattleCommandCard then
+				rechargeRecord[id] = nil
+			end
+		end
+		self.owner.storeData:updateProperty({field="payR", value=rechargeRecord})
+	end,
 }
  
  
@@ -137,6 +137,12 @@ function RolePlugin.bind(Role)
 			[ItemType.Potion] = function ()
 				self:addPotion({id = itemId, count = count, notNotify = pms.notNotify, log = pms.log})
 			end,
+			[ItemType.BossTicket] = function ()
+				if not self.activity:isOpen("ChallengeLevel") then return end
+				local actData = self.activity:getActData("ChallengeLevel")
+				actData["ticket"] = (actData["ticket"] or 0) + count
+				self.activity:updateActData("ChallengeLevel", actData)
+			end,
 		}
  
 		if count > 0 then
@@ -3,7 +3,29 @@
 local Store = class("Store", require("shared.ModelBase"))
  
 function Store:ctor(properties)
-	Store.super.ctor(self, properties)
+    Store.super.ctor(self, properties)
+end
+
+function Store:onLoad()
+    local monEx = self:getProperty("monthCardEx")
+    local smonEx = self:getProperty("smonthCardEx")
+    local monId = self:getProperty("monthCardId")
+    local smonId = self:getProperty("smonthCardId")
+    local timeNow = skynet.timex()
+    local flag = false
+    if monEx > timeNow and monId == 0 then
+        self:updateProperty({field = "monthCardId", value = 101})
+        self:updateProperty({field = "getMailT1", value = 0})
+        flag = true
+    end
+    if smonEx > timeNow and smonId == 0 then
+        self:updateProperty({field = "smonthCardId", value = 102})
+        self:updateProperty({field = "getMailT2", value = 0})
+        flag = true
+    end
+    if flag then
+        self:sendMonthCardEmail()
+    end
 end
  
 ActGoodsType = {
@@ -17,7 +39,9 @@ Store.schema = {
     growFundR  = {"string", ""},        -- 成长基金领取记录
  
 	monthCardEx	= {"number", 0},		-- 月卡过期时间戳
+	monthCardId	= {"number", 0},		-- 月卡id
     smonthCardEx	= {"number", 0},		-- 超级月卡过期时间戳
+    smonthCardId	= {"number", 0},		-- 超级月卡id
  
 	battleCard	= {"number", 0},		-- 赛季卡
 	battleFR = {"string", ""},		-- 免费赛季卡领取记录
@@ -51,7 +75,7 @@ function Store:updateProperty(params)
 		return
 	end
 	local newValue = self:getProperty(params.field)
-	if not params.notNotify then
+    if not params.notNotify then
 		self:notifyUpdateProperty(params.field, newValue, oldValue)
 	end
 end
@@ -77,13 +101,16 @@ end
 -- 发送月卡邮件
 function Store:sendMonthCardEmail()
     local timeNow = skynet.timex()
-    local tabs = {{ex="monthCardEx", t="getMailT1", mail=MailId.MonthCard, alert=MailId.MonthCardEx},
-    {ex="smonthCardEx", t="getMailT2", mail=MailId.SuperMonthCard, alert=MailId.SuperMonthCardEx}}
+
+    local tabs = {{ex="monthCardEx", t="getMailT1", id= self:getProperty("monthCardId")},
+    {ex="smonthCardEx", t="getMailT2", id=self:getProperty("smonthCardId")}}
     for _, v in ipairs(tabs) do
         local ex  = self:getProperty(v.ex)
         local ts  = self:getProperty(v.t) or 0
-        local mailId = v.mail
-        local alertId = v.alert
+        local cfg = csvdb["shop_cardCsv"][v.id] or {}
+
+        local mailId = cfg.email
+        local alertId = cfg.email_2
         local alertTs = dayLater(ex) - DAY_SEC
         if ex > timeNow then
             local cnt = 0
@@ -184,24 +211,66 @@ function Store:getHangDropCoef()
     return (1 + globalCsv.hang_drop_exp_coef) or 1, (1 + globalCsv.hang_drop_item_coef) or 1
 end
  
+function Store:getCurMonthCardLvl(isSuper)
+    local id = 0
+    if isSuper then
+       id = self:getProperty("smonthCardId") or 0
+    else
+       id = self:getProperty("monthCardId") or 0
+    end
+    local cfg = csvdb["shop_cardCsv"][id]
+    if not cfg then return 0 end
+
+    return cfg.level or 0
+end
  
 -- 购买通行证
 function Store:onBuyCard(type, duration, id, actid)
     local timeNow = skynet.timex()
     if type == CardType.NormalMonthCard then
         if self:isMonthCardExpire() then
+            self:updateProperty({field = "monthCardId", value = id})
             self:updateProperty({field = "monthCardEx", value = timeNow + duration})
         else
             self:updateProperty({field = "monthCardEx", value = self:getProperty("monthCardEx") + duration})
         end
         self:sendMonthCardEmail()
+    elseif type == CardType.NormalMonthCardLevelUp then
+        if self:isMonthCardExpire() then
+            skynet.error(string.format("month card expired, can not level up,%d,%d",self.owner:getProperty("id"), id))
+        else
+            local cfg = csvdb["shop_cardCsv"][id]
+            if not cfg then return end 
+            local dif = cfg.level - self:getCurMonthCardLvl(false)
+            if dif > 1 and dif < 0 then
+                return
+            end
+            self:updateProperty({field = "monthCardId", value = id})
+            self:updateProperty({field = "monthCardEx", value = self:getProperty("monthCardEx") + duration})
+        end
+        self:sendMonthCardEmail()
     elseif type == CardType.SuperMonthCard then
         if self:isSuperMonthCardExpire() then
+            self:updateProperty({field = "smonthCardId", value = id})
             self:updateProperty({field = "smonthCardEx", value = timeNow + duration})
         else
             self:updateProperty({field = "smonthCardEx", value = self:getProperty("smonthCardEx") + duration})
         end
         self:sendMonthCardEmail()
+    elseif type == CardType.SuperMonthCardLevelUp then
+        if self:isSuperMonthCardExpire() then
+            skynet.error(string.format("super month card expired, can not level up,%d,%d",self.owner:getProperty("id"), id))
+        else
+            local cfg = csvdb["shop_cardCsv"][id]
+            if not cfg then return end 
+            local dif = cfg.level - self:getCurMonthCardLvl(true)
+            if dif > 1 and dif < 0 then
+                return
+            end
+            self:updateProperty({field = "smonthCardId", value = id})
+            self:updateProperty({field = "smonthCardEx", value = self:getProperty("smonthCardEx") + duration})
+        end
+        self:sendMonthCardEmail()
     elseif type == CardType.PrivilegeCard then
         if self:isPrivCardExpire() then
             self:updateProperty({field = "privCardEx", value = timeNow + duration})
@@ -253,7 +322,7 @@ function Store:notifyUpdateProperty(field, newValue, oldValue)
 		key = field,
 		newValue = newValue,
 		oldValue = oldValue,
-	}
+    }
 	SendPacket(actionCodes.Store_updateproperty, MsgPack.pack(datas))
 end
  
@@ -494,6 +563,8 @@ function Store:data()
         actGoodsFlag = self:getProperty("actGoodsFlag"),
         bpInfo = self:getProperty("bpInfo"),
         totalRR = self:getProperty("totalRR"),
+        monthCardId  = self:getProperty("monthCardId"),
+        smonthCardId  = self:getProperty("smonthCardId"),
 	}
 end