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

测试 · xiongrenfei · xiongrenfei
2 parents b3f13e56 2f7891b4
Showing 11 changed files with 73 additions and 26 deletions Show diff stats
src/actions/RoleAction.lua
src/adv/AdvBuff.lua
src/adv/AdvPassive.lua
src/adv/AdvPlayer.lua
src/csvdata
src/models/Activity.lua
src/models/RoleLog.lua
src/models/RolePlugin.lua
src/models/RoleTimeReset.lua
src/services/chated.lua
src/services/named.lua
@@ -160,6 +160,7 @@ function _M.loginRpc( agent, data )
 	local resetMode = role:updateTimeReset(now)
 	if not resetMode or not resetMode["CrossDay"] then -- 没有跨天
 		role.activity:checkActivityStatus(now, false, false)
+		role:log("onLogin")
 	end
 	redisproxy:zadd(FRIEND_RECOMMEND, now, roleId)
@@ -291,7 +292,6 @@ function _M.loginRpc( agent, data )
 	role:savePvpHTeam()
 	local hangPass = role:getProperty("hangPass")
-	role:log("onLogin")
 	role:mylog("login", {key1 = agent.ip:toArray(false, ":")[1], int1 = hangPass[1] or 0})
 	if msg.newdevice then
 		role:mylog("newdevice", {key1 = agent.ip:toArray(false, ":")[1]})
@@ -584,12 +584,12 @@ end
 -- 在当前阶段不可用 小透明 < 不会回合遍历  不会查找遍历  可以删除遍历  可以下层遍历 >
 function Buff:isHide()
 	if self.isDel then
-		return false
+		return true
 	end
 	if self.buffData.mapLock == 1 and self.mapId and self.owner.battle.adv:getCurMap().mapId ~= self.mapId  then
-		return false
+		return true
 	end
-	return true
+	return false
 end
 --删除buff 时调用
@@ -355,12 +355,12 @@ end
 -- 在当前阶段不可用 小透明 < 不会回合遍历  不会查找遍历  可以删除遍历  可以下层遍历 >
 function Passive:isHide()
 	if self.isDel then
-		return false
+		return true
 	end
 	if self.passiveData.mapLock == 1 and self.mapId and self.owner.battle.adv:getCurMap().mapId ~= self.mapId  then
-		return false
+		return true
 	end
-	return true
+	return false
 end
 -- 可以触发
@@ -349,7 +349,7 @@ function BaseObject:hurt(value, releaser, params)
 	end
 	if params.hurtType ~= 5 then
-		if params.hurtType ~= 6 or params.hurtType ~= 4 then
+		if params.hurtType ~= 6 and params.hurtType ~= 4 then
 			value = math.max(0, value - self.def)
 		end
 		value = self:getInjuredValue(value) --减伤计算
-Subproject commit 136449ab16898403b00003f7161c2ac278274891
+Subproject commit d54c7ca07fd397022166b38b58b80a78f339f592
@@ -348,9 +348,10 @@ activityFunc[Activity.ActivityType.PayBack] = {
 	["check"] = function(self, actType, notify, twd) -- 检查
 		local oldVal = self:getActData(actType) or 0
 		local newVal = oldVal + twd
-		local gift = self.owner:getPaybackReward(oldVal, newVal)
+		local gift, checkPoint = self.owner:getPaybackReward(oldVal, newVal)
 		if gift ~= "" then
-			self.owner:sendMail(MailId.PayBackAward, nil, gift, {newVal})
+			local strCp = table.concat(checkPoint ,"/")
+			self.owner:sendMail(MailId.PayBackAward, nil, gift, {newVal, strCp})
 		end
 		self:updateActData(actType, newVal, not notify)
 	end,
@@ -62,6 +62,7 @@ local ItemReason = {
 	finishTask = 403, -- 任务
 	taskActive = 404, -- 完成活跃任务
 	advMainTask = 405, -- 拾荒主线
+	chatline = 406, --查看chatline
 	finishAchive = 601, -- 完成成就
 	advAchiev = 602, -- 拾荒成就
@@ -92,7 +93,8 @@ local ItemReason = {
 	dinerBuildUp = 1108, -- 建筑升级
 	removeSell = 1109, -- 移除售卖
 	dinerSell = 1110, -- 餐饮售卖
-
+	dinerShop = 1111, -- 餐厅商店
+	dinerSellQ = 1112, -- 餐厅快速
 	-- 英雄
 	heroLevelUp = 1201, -- 英雄升级
 	heroBreak = 1202, -- 英雄突破
@@ -104,6 +106,13 @@ local ItemReason = {
 	unlockPool = 1208, -- 解锁英雄定向抽卡池
 	downloadCv = 1209, -- 下载 cv包奖励
 	refer = 1210, -- 穿戴
+
+	-- pvp 
+	pvpCHead = 1301, -- pvp 跨服竞技场头像
+
+	--adv
+	chooseEvent = 1351, -- 冒险选择
+	clickTrader = 1352, -- 冒险商店
 }
@@ -699,7 +708,7 @@ function RoleLog.bind(Role)
 			action_type = after - before > 0 and 1 or 0, -- 变化类型（玩家获取：1，玩家消耗：0）
 			item_before = before, -- 道具变化前的数量
 			item_after = after, -- 道具变化后的数量
-			item_reason = reasonType, -- 道具流动一级原因，如抽卡、装备强化、副本掉落，可参考道具动作类型枚举表
+			item_reason = reasonType or 0, -- 道具流动一级原因，如抽卡、装备强化、副本掉落，可参考道具动作类型枚举表
 			item_subreason = subreason, -- 道具流动二级原因，抽卡：卡池ID，装备强化：装备ID，副本掉落：副本ID
 			item_other = other, -- 其他（可包含阶数，强化等级，随机属性）
 		})
@@ -203,7 +203,7 @@ function RolePlugin.bind(Role)
 	function Role:changeHead(id, notNotify)
 		self:updateProperty({field = "headId" ,value = id, notNotify = notNotify})
 		self:changeCrossServerPvpSelfInfo("headId")
-		self:log("role_action", {desc = "changeHead", int1 = id})
+		self:mylog("role_action", {desc = "changeHead", int1 = id})
 	end
 	function Role:addPlayExp(addExp, params)
@@ -761,7 +761,7 @@ function RolePlugin.bind(Role)
 		end
 		if heartWarning < 50 and heartWarning % 5 == 0 then
 			self:sendGmMsg("server_accountBanned_warning")
-			self:log("role_action",{desc = "heartWarning", int1 = heartWarning})
+			self:mylog("role_action",{desc = "heartWarning", int1 = heartWarning})
 		end
 	end
@@ -774,11 +774,11 @@ function RolePlugin.bind(Role)
 			self:setProperty("banType", 0)
 			self:setProperty("heartWarning", 0)
-			self:log("role_action", {desc = "ban_rm"})
+			self:mylog("role_action", {desc = "ban_rm"})
 		else
 			self:setProperty("banTime", now + 86400 * time)
 			self:setProperty("banType", banType)
-			self:log("role_action", {desc = "ban", int1 = time, int2 = banType})
+			self:mylog("role_action", {desc = "ban", int1 = time, int2 = banType})
 		end
 	end
@@ -1595,7 +1595,7 @@ function RolePlugin.bind(Role)
 		self:updateProperty({field = "rmbC", delta = rmb})
 		self:updateProperty({field = "twdC", delta = rechargeData.twd})
-		self:mylog("role_action", {desc = "recharge", int1 = id, int2 = rmb, key1 = params.transactionId, key2 = params.order, long1 = params.pay_time})
+		self:mylog("role_action", {desc = "recharge", int1 = id, int2 = rmb, key1 = params.transactionId, key2 = params.order, long1 = tonum(params.pay_time, 0)})
 		return nil, reward
 	end
@@ -1704,6 +1704,7 @@ function RolePlugin.bind(Role)
 	function Role:getPaybackReward(oldVal, newVal)
 		local maxVal, diff, extraReward = 0, 0, ""
 		local gift = ""
+		local checkPoint = {}
 		for k, v in pairs(csvdb["rebateCsv"]) do
 			if k > maxVal then
 				maxVal = k
@@ -1714,21 +1715,30 @@ function RolePlugin.bind(Role)
 			end
 			if oldVal < k and newVal > k then
 				gift = gift .. v.reward .. " "
+
+				table.insert(checkPoint, k)
 			end
 		end
 		if newVal > maxVal then
 			local cnt = 0
+			local oldCheckPoint = 0
 			if oldVal < maxVal then
 				cnt = math.floor((newVal - maxVal) / diff)
+				oldCheckPoint = maxVal
 			else
 				cnt = math.floor((newVal - maxVal) / diff) - math.floor((oldVal - maxVal) / diff)
+				oldCheckPoint = maxVal + math.floor((oldVal - maxVal) / diff) * diff
 			end
 			for i = 1, cnt do
 				gift = gift .. extraReward .. " "
+
+				table.insert(checkPoint, oldCheckPoint + i * diff)
 			end
 		end
-
-		return gift
+		table.sort(checkPoint, function(a, b)
+			return a < b
+		end)
+		return gift, checkPoint
 	end
 end
@@ -20,6 +20,7 @@ ResetFunc[&quot;CrossDay&quot;] = function(self, notify, response, now)
 	response.dTask = {}
 	response.advSup = self:getProperty("advSup")
+	self:log("onLogin")
 end
 ResetFunc["CrossWeek"] = function(self, notify, response)
@@ -5,6 +5,8 @@ local crab = require &quot;crab.c&quot;
 local table_insert = table.insert
 local table_unpack = table.unpack
 local mode, id, dict = ...
+local hideCode = utf8.codepoint("*")
+
 local function toutf8(name)
 	local t = {}
@@ -14,6 +16,16 @@ local function toutf8(name)
 	return t
 end
+local function fix(a, b)
+	for i, v in pairs(a) do
+		if b[i] == hideCode then
+			a[i] = hideCode
+		end
+	end
+	return utf8.char(table_unpack(a))
+end
+
+
 if mode == "sub" then
 	local CMD = {}
 	dict = tonumber(dict)
@@ -23,8 +35,9 @@ if mode == &quot;sub&quot; then
 			return false
 		end
 		local utftb = toutf8(name)
-		if crab.filter(dict, utftb) then
-			return false, utf8.char(table_unpack(utftb))
+		local utftbU = toutf8(string.upper(name))
+		if crab.filter(dict, utftbU) then
+			return false, fix(utftb, utftbU)
 		end
 		return true
 	end
@@ -45,7 +58,7 @@ else
 		local words = {}
 		for _, data in ipairs(forbidNames) do
-			local ok, utftb = pcall(toutf8, data.name)
+			local ok, utftb = pcall(toutf8, string.upper(data.name))
 			if ok then table.insert(words, utftb) end
 		end
 		local d = crab.open(words)
@@ -5,6 +5,8 @@ local crab = require &quot;crab.c&quot;
 local table_insert = table.insert
 local table_unpack = table.unpack
 local mode, id, dict = ...
+local hideCode = utf8.codepoint("*")
+
 local function toutf8(name)
 	local t = {}
@@ -14,6 +16,16 @@ local function toutf8(name)
 	return t
 end
+local function fix(a, b)
+	for i, v in pairs(a) do
+		if b[i] == hideCode then
+			a[i] = hideCode
+		end
+	end
+	return utf8.char(table_unpack(a))
+end
+
+
 if mode == "sub" then
 	local CMD = {}
 	dict = tonumber(dict)
@@ -23,8 +35,9 @@ if mode == &quot;sub&quot; then
 			return false
 		end
 		local utftb = toutf8(name)
-		if crab.filter(dict, utftb) then
-			return false, utf8.char(table_unpack(utftb))
+		local utftbU = toutf8(string.upper(name))
+		if crab.filter(dict, utftbU) then
+			return false, fix(utftb, utftbU)
 		end
 		return true
 	end
@@ -45,7 +58,7 @@ else
 		local words = {}
 		for _, data in ipairs(forbidNames) do
-			local ok, utftb = pcall(toutf8, data.name)
+			local ok, utftb = pcall(toutf8, string.upper(data.name))
 			if ok then table.insert(words, utftb) end
 		end
 		local d = crab.open(words)