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

测试
2 parents 43a6d57e 3fa17db7
Showing 9 changed files with 65 additions and 38 deletions Show diff stats
src/actions/AdvAction.lua
src/actions/DinerAction.lua
src/actions/EmailAction.lua
src/actions/HeroAction.lua
src/actions/RoleAction.lua
src/models/Activity.lua
src/models/RoleChangeStruct.lua
src/models/RolePlugin.lua
src/services/globald.lua
@@ -133,6 +133,8 @@ function _M.startAdvRpc( agent, data )
  
 	local advPass = role:getProperty("advPass")
  
+	if not checkFormat(role) then return 7 end
+
 	if AdvCommon.isEndless(chapterId) then -- 无尽模式判断
  
 		if chapterId ~= role.advElChapter then return end -- 不是当前进行的章节
@@ -149,37 +151,23 @@ function _M.startAdvRpc( agent, data )
 			if not relayData then return 14 end  -- 不是中继层
 			if advElM < relayData.unlockfloor then return 15 end --未解锁
 		end 
+
+		role.dailyData:updateProperty({field = "advElC", delta = 1})
 	else   -- 普通模式判断
-		if not role:checkAdvCount(chapterData.limitlevel) then return 2 end -- 是否有体力
 		if layer >= chapterData.limitlevel  then return 4 end
-		-- 关卡开放判断
-		if not role:advChapterIsOpen(chapterId) then return 5 end
  
+		local relayData = role:getAdvData():isHaveRelay(layer, chapterId) 
+		if not relayData then return 6 end  -- 不是中继层
 		if layer ~= 1 then
-			local relayData = role:getAdvData():isHaveRelay(layer, chapterId) 
-			if not relayData then return 6 end  -- 不是中继层
 			if (advPass[chapterId] or 0) < relayData.floor then return 21 end
 		end
-	end
-	
-	if not checkFormat(role) then return 7 end
-
-	--local advTeam = role:getProperty("advTeam")
-	--table.clear(advTeam)
+		if not role:checkAdvCount(relayData.supply) then return 2 end -- 是否有体力
+		-- 关卡开放判断
+		if not role:advChapterIsOpen(chapterId) then return 5 end
  
-	--advTeam.heros = {}
-	--for slot, heroId in pairs(format.heros) do
-	--	advTeam.heros[slot] = heroId
-	--end
-	--advTeam.leader = format.leader
-	--advTeam.leader2 = format.leader2
-	--role:updateProperty({field = "advTeam", value = advTeam})
-	if AdvCommon.isEndless(chapterId) then
-		role.dailyData:updateProperty({field = "advElC", delta = 1})
-	else
-		role:changeAdvCount(chapterData.limitlevel)
+		role:changeAdvCount(relayData.supply)
 	end
-
+	
 	local support = {}  -- 支援效果
 	if AdvCommon.isEndless(chapterId) then
 		-- 选择的支援效果
@@ -199,6 +187,7 @@ function _M.startAdvRpc( agent, data )
 			end
 		end
 	end
+
 	role:getAdvData():initByChapter({
 		chapterId = chapterId, 
 		level = layer, 
@@ -207,6 +196,7 @@ function _M.startAdvRpc( agent, data )
 		support = support,
 		actid = actid
 	})
+	
 	role:checkTaskEnter("AdvStart", {id = chapterId})
 	role:checkTaskEnter("AdvStartSelf", {id = chapterId})
 	role:getAdvData():popBackEvents() -- 清一下事件
@@ -305,7 +305,7 @@ function _M.expediteSellRpc( agent, data )
 	local gift = reward:toNumMap()
  
 	-- 特权卡获取加速获得额外道具
-	local coef = role.storeData:getProduceItemSpeedCoef()
+	local coef = 1 --role.storeData:getProduceItemSpeedCoef()
 	for k, v in pairs(gift) do
 		if coef > 1 then
 			v = math.floor(v * coef)
@@ -40,10 +40,17 @@ function _M.listRpc(agent, data)
 		local count = 1
 		for _, data in ipairs(result) do
 			local email = tarr2tab(data)
-			if tonum(email.createtime) > role:getProperty("ctime") 
-				and ( not email.mid or tonum(email.mid) == mid ) 
+			-- 0 需要判斷創角時間小於郵件創建時間 1 只需要在時間段內登陸即可領取
+			local delayType = tonum(email.delayType)
+			local flag = false
+			if delayType == 1 then
+				flag = skynet.timex() > tonum(email.createtime)
+			else 
+				flag = tonum(email.createtime) > role:getProperty("ctime")
+			end
+			if flag and ( not email.mid or tonum(email.mid) == mid ) 
 				and ( not email.endtime or tonum(email.endtime) > now )then
-				local time = math.max(tonum(email.timestamp, 0) or email.createtime)
+				local time = math.max(tonum(email.timestamp, 0) , tonum(email.createtime))
 				redisproxy:insertEmail({
 					roleId = roleId, 
 					emailId = 0,
@@ -663,7 +663,8 @@ function _M.getResetRewardRpc(agent, data)
  
 	while stage > 0 do
 		local curData = csvdb["unit_talent_"..heroCfgId.."Csv"][stage]
-		for lvl = 1, curTalentLvl - 1 do
+		local offset = stage == talent:getv(0,1) and curTalentLvl - 1 or #curData
+        for lvl = 1, offset do
 			local talentData = curData[lvl]
 			for itemId, count in pairs(talentData.money:toNumMap()) do
 				reward[itemId] = (reward[itemId] or 0) + count
@@ -926,6 +927,7 @@ function _M.drawHeroRpc(agent, data)
 		local itemId = math.randWeight(resultPool, 1)
 		if guideHero then
 			itemId = guideHero
+			guideHero = nil
 		end
  
 		local itemData = csvdb["itemCsv"][itemId]
@@ -586,9 +586,9 @@ function _M.openTimeBoxRpc(agent, data)
 		else
 			local oldId, process, time = boxL[slot].id, boxL[slot].process, boxL[slot].time
 			local unitTime = globalCsv.box_key_time[oldId] * 60
-			local doneCnt = math.floor((process + skynet.timex() - time) / unitTime)
+			local doneCnt = time == 0 and 0 or math.floor((process + skynet.timex() - time) / unitTime)
 			if doneCnt > 0 then
-				reward = role:award({[oldId] = doneCnt}, {log = {desc = "openTimeBox", int1 = slot}})
+				reward = role:award({[oldId] = doneCnt}, {log = {desc = "openTimeBox", int1 = slot, int2 = oper}})
 			end
 		end
 		local limit = globalCsv.box_key_max[itemId] or 5
@@ -610,7 +610,7 @@ function _M.openTimeBoxRpc(agent, data)
 			local cost_pre = globalCsv.box_timeOpen_diamond:toArray(true, "=")
 			local costKey = math.ceil((stopTime - nowTime) / (cost_pre[1] * 60)) * cost_pre[2]
 			if not role:checkItemEnough({[ItemId.Diamond] = costKey}) then return 5 end
-			role:costItems({[ItemId.Diamond] = costKey}, {log = {desc = "openTimeBox", int1 = slot}})
+			role:costItems({[ItemId.Diamond] = costKey}, {log = {desc = "openTimeBox", int1 = slot, int2 = oper}})
 		else
 			stopTime = math.min(nowTime,time + globalCsv.box_productLine_time * 3600)
 		end
@@ -618,7 +618,7 @@ function _M.openTimeBoxRpc(agent, data)
  
 		local doneCnt = math.floor((process + stopTime - time) / unitTime)
 		if doneCnt > 0 then
-			reward = role:award({[itemId] = doneCnt}, {log = {desc = "openTimeBox", int1 = slot}})
+			reward = role:award({[itemId] = doneCnt}, {log = {desc = "openTimeBox", int1 = slot, int2 = oper}})
 		end
 		if role:getItemCount(itemId) >= globalCsv.box_key_max[itemId] then
 			nowTime = 0
@@ -687,7 +687,7 @@ function _M.openTimeBoxRpc(agent, data)
 				reward[id] = (reward[id] or 0) + num
 			end
 		end
-		reward, change = role:award(reward, {log = {desc = "openTimeBox", int1 = costId}})
+		reward, change = role:award(reward, {log = {desc = "openTimeBox", int1 = costId, int2 = oper}})
 	else
 		return
 	end
@@ -792,7 +792,7 @@ function Activity:recycleActItem(actId)
 		local itemCount = role:getItemCount(fromId)
 		if itemCount > 0 then
 			costs[fromId] = (costs[fromId] or 0) + itemCount
-			gift[toId] = toNum * itemCount
+			gift[toId] = (gift[toId] or 0) + toNum * itemCount
 		end
 	end
 	if next(costs) then
@@ -48,11 +48,29 @@ local bugFixSuduku = createVersionFunc(VersionType.DoOnly, function(role, params
 	end
 end)
  
+local bugFixRune = createVersionFunc(VersionType.DoOnly, function(role, params)
+	local had = false
+	for id, rune in pairs(role.runeBag) do
+		if math.floor(rune:getProperty("id") / 1000) == 16 then
+			local attrs = rune:getProperty("attrs")
+			local atk = attrs:getv(2, 0)
+			if atk ~= 0 then
+				attrs = attrs:delk(2):setv(1, atk)
+				had = true
+				rune:setProperty("attrs",attrs)
+			end
+		end
+	end
+	if had then
+		-- 补偿
+	end
+end)
 ---------------------版本方法  end   ----------------------
  
 -- version 罗列start
 local versionList = {} -- version 列表
 versionList[1] = {bugFixSuduku, {}}
+versionList[2] = {bugFixRune, {}}
 -- versionList[2] = {clearActivity, {5, 7}}
 -- versionList[3] = {changeStructF, "test1"}
 -- versionList[4] = {changeStructF, "test2"}
@@ -1507,6 +1507,7 @@ function RolePlugin.bind(Role)
 		return function (now, role)
 			if name == "email" and role.sendMailFlag then
 				last_breath = now + sec
+				role.sendMailFlag = false
 				return true
 			end
 			if now >= last_breath then
@@ -1542,8 +1543,15 @@ function RolePlugin.bind(Role)
 				end)
 				for _, data in ipairs(redret) do
 					local email = tarr2tab(data)
-					if tonum(email.createtime) > self:getProperty("ctime") 
-						and ( not email.mid or tonum(email.mid) == mid ) 
+					-- 0 需要判斷創角時間小於郵件創建時間 1 只需要在時間段內登陸即可領取
+					local delayType = tonum(email.delayType)
+					local flag = false
+					if delayType == 1 then
+						flag = skynet.timex() > tonum(email.createtime)
+					else
+						flag = tonum(email.createtime) > self:getProperty("ctime")
+					end
+					if flag and ( not email.mid or tonum(email.mid) == mid )
 						and ( not email.endtime or tonum(email.endtime) > now )then
 						return true
 					end
@@ -69,7 +69,8 @@ local function mailQuene()
 				"attachments", email.attachments,
 				"endtime", email.endTime,
 				"mid", email.mid,
-				"timestamp", now
+				"timestamp", now,
+				"delayType", email.delayType
 			)
 		else
 			redisproxy:hmset(string_format("globalEmail:%s", gid), 
@@ -80,7 +81,8 @@ local function mailQuene()
 				"content", email.content,
 				"attachments", email.attachments,
 				"endtime", email.endTime,
-				"timestamp", now
+				"timestamp", now,
+				"delayType", email.delayType
 			)
 		end
 	end