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

测试
2 parents accf94c4 6df85179
Showing 6 changed files with 97 additions and 13 deletions Show diff stats
src/actions/GmAction.lua
src/actions/HangAction.lua
src/actions/RoleAction.lua
src/adv/AdvPlayer.lua
src/models/Role.lua
src/models/RolePlugin.lua
@@ -27,6 +27,7 @@ function _M.ignoreout(role, pms)
 	else  -- 解除
 		role:updateProperty({field = "ignoreMt", value = 0})
 	end
+	role:mylog("gm_action", {desc = "ignoreout", key1 = pms.sender})
 	return "指令生效"
 end
@@ -46,11 +47,17 @@ function _M.ban(role, pms)
 			end)
 		end
 	end
+
+	role:mylog("gm_action", {desc = "ban", int1 = time, int2 = ctype, key1 = pms.sender})
+
 	return isBan and "解封杀成功" or "封杀成功"
 end
 function _M.unban(role, pms)
 	role:setBan(0, 0)
+
+	role:mylog("gm_action", {desc = "unban", key1 = pms.sender})
+
 	return "解封杀成功"
 end
@@ -63,6 +70,8 @@ function _M.gmmsg(role, pms)
 			skynet.call(agent.gate_serv, "lua", "forcekick", agent.fd)
 		end)
 	end
+	role:mylog("gm_action", {desc = "gmmsg", text1 = pms.pm1, key1 = pms.sender})
+
 	return "指令成功"
 end
@@ -73,6 +82,8 @@ function _M.silent(role, pms)
 		return "解禁言成功"
 	end
 	role:updateProperty({field = "silent", value = specTime({hour = 0}, skynet.timex()) + pm1 * 86400})
+
+	role:mylog("gm_action", {desc = "silent", int1 = pms.pm1, key1 = pms.sender})
 	return "禁言成功"
 end
@@ -90,6 +101,8 @@ function _M.hero(role, pms)
 	if not role:addHero({type = heroType, log = {desc = "gm"}}) then
 		return "失败"
 	end
+
+	role:mylog("gm_action", {desc = "hero", int1 = heroType, key1 = pms.sender})
 	return "成功"
 end
@@ -122,6 +135,8 @@ function _M.herol(role, pms)
 	hero:updateProperty({field = "level", delta = addLevel})
 	role:checkTaskEnter("HeroLevelUp", {level = hero:getProperty("level")})
+	role:mylog("gm_action", {desc = "herol", int1 = heroType, int2 = addLevel, key1 = pms.sender})
+
 	return "成功"
 end
@@ -133,6 +148,8 @@ function _M.herola(role, pms)
 		_M.herol(role, {pm1 = hero:getProperty("type"), pm2 = addLevel})
 	end
+	role:mylog("gm_action", {desc = "herola", int1 = addLevel, key1 = pms.sender})
+
 	return "成功"
 end
@@ -143,6 +160,7 @@ function _M.equip(role, pms)
 	local level = tonum(pms.pm2)
 	local count = tonum(pms.pm3)
 	role:addEquip(typ, level, count, {log = {desc = "gm"}})
+	role:mylog("gm_action", {desc = "equip", int1 = typ, int2 = level, long1 = count, key1 = pms.sender})
 	return "成功"
 end
@@ -151,6 +169,7 @@ function _M.rune(role, pms)
 	local typ = tonum(pms.pm1)
 	local id = tonum(pms.pm2)
 	local result = role:addRune({type = typ,id = id, log = {desc = "gm"}})
+	role:mylog("gm_action", {desc = "rune", int1 = typ, int2 = id, key1 = pms.sender})
 	return result
 end
@@ -171,6 +190,8 @@ function _M.fb(role, pms) -- 直接通关
 	role:hangFinish(carbonId)
 	addPre(carbonId)
+	role:mylog("gm_action", {desc = "fb", int1 = carbonId, key1 = pms.sender})
+
 	role:checkTaskEnter("HangPass", {id = carbonId})
 	return "成功"
 end
@@ -191,6 +212,8 @@ function _M.fbc(role, pms) -- 直接通关
 	end
 	role:updateProperty({field = "hangPass", value = {}})
 	addPre(carbonId)
+	
+	role:mylog("gm_action", {desc = "fbc", int1 = carbonId, key1 = pms.sender})
 	return "成功"
 end
@@ -224,6 +247,8 @@ function _M.exp(role, pms)
 	exp = math.floor(math.max(exp, 0))
 	role:addPlayExp(exp, {log = {desc = "gm"}})
+	role:mylog("gm_action", {desc = "exp", int1 = exp, key1 = pms.sender})
+
 	return "成功"
 end
@@ -280,6 +305,7 @@ function _M.get(role, pms)
 		end
 		local count = tonum(pms.pm2, 1)
 		role:award({[itemId] = count}, {log = {desc = "gm"}})
+		role:mylog("gm_action", {desc = "get", int1 = itemId, int2 = count, key1 = pms.sender})
 	end
 	return "成功"
 end
@@ -303,6 +329,9 @@ function _M.advc(role, pms)
 		advAFWear = {},
 	}, notNotify)
 	role.advData = nil
+
+	role:mylog("gm_action", {desc = "advc", key1 = pms.sender})
+
 	return "成功"
 end
@@ -311,6 +340,8 @@ function _M.advf(role, pms)
 	role:updateProperty({field = "advC", value = 0})
 	role.dailyData:updateProperty({field = "advElC", value = 0})
+	role:mylog("gm_action", {desc = "advf", key1 = pms.sender})
+
 	return "成功"
 end
@@ -330,6 +361,7 @@ function _M.adv(role, pms)
 		advPass[chapterId] = layer
 		role:updateProperty({field = "advPass", value = advPass})
 	end
+	role:mylog("gm_action", {desc = "adv", int1 = chapterId, int2 = layer, key1 = pms.sender})
 	return "成功"
 end
@@ -356,6 +388,7 @@ function _M.advt(role, pms)
 		isEnter = true,
 		debugMapId = mapId,
 	})
+	role:mylog("gm_action", {desc = "advt", int1 = chapterId, int2 = layer, key1 = pms.sender})
 	return "成功"
 end
@@ -364,6 +397,8 @@ function _M.advl(role, pms)
 	local exp = tonum(pms.pm1)
 	role:addAdvLvExp(math.max(0, exp))
+	role:mylog("gm_action", {desc = "advl", int1 = exp, key1 = pms.sender})
+
 	return "成功"
 end
@@ -377,6 +412,7 @@ function _M.advcl(role, pms)
 	end
 	advData.battle.player:addExp(exp)
 	advData:saveDB()
+	role:mylog("gm_action", {desc = "advcl", int1 = exp, key1 = pms.sender})
 	return "成功"
 end
@@ -386,6 +422,7 @@ function _M.idlec(role, pms)
 	role:updateProperty({field = "hangTeam", value = {}})
 	role:updateProperty({field = "hangInfo", value = {}})
 	role:updateProperty({field = "hangBag", value = {}})
+	role:mylog("gm_action", {desc = "idlec", key1 = pms.sender})
 	role.advData = nil
 	return "成功"
@@ -410,6 +447,8 @@ function _M.advit(role, pms)
 		local itemId = tonum(pms.pm1)
 		local count = tonum(pms.pm2)
 		reward[itemId] = count
+
+		role:mylog("gm_action", {desc = "advit", int1 = itemId, int2 = count, key1 = pms.sender})
 	end
@@ -425,6 +464,8 @@ function _M.tower(role, pms)
 	if not csvdb["tower_battleCsv"][level] then return  "不存在" end
 	role:updateProperty({field = "towerInfo", value = {c = globalCsv.tower_count_limit, l = level}})
+	role:mylog("gm_action", {desc = "tower", int1 = level, key1 = pms.sender})
+
 	return "成功"
 end
@@ -443,6 +484,8 @@ function _M.email(role, pms)
 		rewardPms = id ~= 0 and reward or nil,
 	})
+	role:mylog("gm_action", {desc = "email", int1 = id, key1 = pms.sender})
+
 	return "成功"
 end
@@ -461,6 +504,8 @@ function _M.guide(role, pms)
 			end
 		end
 		role:updateProperty({field = "funcGuide", value = str})
+		role:mylog("gm_action", {desc = "sguide", key1 = pms.sender})
+
 	elseif cmd == "RESET" then
 		local id = tonum(pms.pm2, 0)
 		if id == 0 then
@@ -473,6 +518,8 @@ function _M.guide(role, pms)
 		elseif id == 2 then
 			role:updateProperty({field = "funcGuide", value = ""})
 		end
+		role:mylog("gm_action", {desc = "cguide", int1 = id, key1 = pms.sender})
+
 	end
 	return "成功"
@@ -496,4 +543,21 @@ function _M.ayncPurchase(role, params)
 	return role:handlePurchase(params) or ""
 end
+function _M.cz(role, pms)
+	local id = tonum(pms.pm1)
+	local csvData = csvdb["shop_rechargeCsv"][id]
+	if not csvData then
+		return "充值id错误, 查看shop_recharge.csv"
+	end
+	role:recharge({
+		id = id,
+		transactionId = "GM",
+		order = "GM",
+		pay_time = skynet.timex(),
+	})
+	role:mylog("gm_action", {desc = "recharge", int1 = id, key1 = pms.sender})
+	return "指令成功"
+end
+
+
 return _M
 \ No newline at end of file
@@ -166,7 +166,7 @@ function _M.startRpc( agent, data )
 	elseif carbonId == 10220 then
 		role:saveGuide(22,1)
 	end
-
+	role:mylog("hang_action", {desc = "startHang", int1 = carbonId})
 	SendPacket(actionCodes.Hang_startRpc, '')
 	return true
 end
@@ -289,6 +289,9 @@ function _M.endBattleRpc(agent, data)
 		reward = reward,
 	})
+	local team = role:getProperty("pvpTC")
+	role:mylog("hang_action", {desc = "hangBattle", short1 = msg.starNum > 0 and 1 or 0, int1 = carbonId, int2 = role:getProperty("hangTBV"), cint1 = role:getHerosCamp(team.heros)})
+
 	SendPacket(actionCodes.Hang_endBattleRpc, MsgPack.pack({
 		starNum = msg.starNum, 
 		reward = reward,
@@ -586,6 +589,8 @@ function _M.endBonusBattleRpc(agent, data)
 		info = msg.info,
 		reward = reward,
 	})
+	role:mylog("hang_action", {desc = "bonusBattle", short1 = msg.starNum > 0 and 1 or 0, int1 = id})
+
 	SendPacket(actionCodes.Hang_endBonusBattleRpc, MsgPack.pack({
 		starNum = starNum, 
 		reward = reward,
@@ -608,6 +613,7 @@ function _M.hangGiftRpc(agent, data)
 	local reward, change = role:award(carbonData.item_clear_special, {log = {desc = "hangGift", int1 = id}})
 	role:changeUpdates({{type = "hangGift", field = id, value = 1}})
+	role:mylog("hang_action", {desc = "hangGift",  int1 = id})
 	SendPacket(actionCodes.Hang_hangGiftRpc, MsgPack.pack({reward = reward, change = change}))
 	return true
@@ -292,7 +292,10 @@ function _M.loginRpc( agent, data )
 	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]})
+	end
 	return true
 end
@@ -359,7 +362,10 @@ function _M.createRpc(agent, data)
 		newRole:log("onCreateAccount")
 	end
 	newRole:log("onCreateRole")
-
+	newRole:mylog("create", {key1 = agent.ip:toArray(false, ":")[1]})
+	if msg.newdevice then
+		newRole:mylog("newdevice", {key1 = agent.ip:toArray(false, ":")[1]})
+	end
 	SendPacket(actionCodes.Role_createRpc, MsgPack.pack(response))
 	return true
@@ -552,7 +558,7 @@ function _M.openTimeBoxRpc(agent, data)
 		if boxL[slot].time > skynet.timex() then -- 没开完
 			if not quick then return end
 			local cost_pre = globalCsv.box_timeOpen_diamond:toArray(true, "=")
-			local costKey = math.ceil((boxL[slot].time - skynet.timex()) / (cost_pre[1] * 60)) * cost_pre[2]
+			costKey = math.ceil((boxL[slot].time - skynet.timex()) / (cost_pre[1] * 60)) * cost_pre[2]
 			if not role:checkItemEnough({[ItemId.BoxKey] = costKey}) then return end
 			role:costItems({[ItemId.BoxKey] = costKey}, {log = {desc = "openTimeBox"}})
 		end
@@ -687,8 +693,8 @@ function _M.storyBookRewardRpc(agent, data)
 	role:log("carriage_video", {
 		carriage_video_type = storyBookData.type, --放映室类型，剧情CG:0, 角色CG:1, 主线剧情:2, 角色剧情:3, 活动剧情:4, 图鉴:5
 		carriage_video_id = storyId, --放映室片段ID
-		carriage_video_coinid = reward[ItemId.Gold] and ItemId.Gold or 0, --放映奖励货币类型，无奖励则填写0
-		carriage_video_coinnum = reward[ItemId.Gold] or 0, --放映奖励货币数量，无奖励则填写0
+		carriage_video_coinid = reward[ItemId.Diamond] and ItemId.Diamond or 0, --放映奖励货币类型，无奖励则填写0
+		carriage_video_coinnum = reward[ItemId.Diamond] or 0, --放映奖励货币数量，无奖励则填写0
 		carriage_video_item = reward, --放映奖励其他物品数量，json格式记录，{'itemid1':10,'itemid2':5,…………..}，无奖励则填写0
 	})
@@ -1007,7 +1013,7 @@ function _M.changeSettingRpc(agent, data)
 	local setting = role:getProperty("setting")
 	setting[id] = status
 	role:updateProperty({field = "setting", value = setting})
-
+	role:mylog("role_action", {desc = "changeSetting", int1 = id, int2 = status})
 	SendPacket(actionCodes.Role_changeSettingRpc,  '')
 	return true
 end
@@ -1045,6 +1051,7 @@ function _M.drawCodeRpc(agent, data)
 				gift_name = "", -- 礼包名称
 				gift_reason = 0, -- 礼包发放原因，见发放原因枚举表
 			})
+			role:mylog("role_action", {desc = "drawCode", int1 = giftId, key1 = code})
 			SendPacket(actionCodes.Role_drawCodeRpc, MsgPack.pack({
 				result = ret,
 				reward = reward,
@@ -1119,6 +1126,7 @@ function _M.guideRpc(agent, data)
 		if msg.funcType then
 			funcGuide = funcGuide:setv(msg.funcType, 1)
 			role:log("onGuidePoint", {guild_type = 2, guild_id = msg.funcType, guild_point = 0, guild_pass = 0})
+			role:mylog("guide", {desc = "guide_weak", int1 = msg.funcType})
 		end
 		role:updateProperty({field = "funcGuide", value = funcGuide})
 	elseif cmdType == 3 then
@@ -1128,6 +1136,7 @@ function _M.guideRpc(agent, data)
 			funcGuide = funcGuide:setv(msg.funcType, 1)
 			role:updateProperty({field = "funcGuide", value = funcGuide})
 			role:log("onGuidePoint", {guild_type = 1, guild_id = msg.funcType, guild_point = 0, guild_pass = 0})
+			role:mylog("guide", {desc = "guide_sys", int1 = msg.funcType})
 		end
 	elseif cmdType == 4 then
 		-- 弹出一个tips（进入功能界面也许要自动弹说明，value要区分1、2）
@@ -1135,6 +1144,7 @@ function _M.guideRpc(agent, data)
 			local value = msg.value or 1
 			for _, funcIdx in pairs(msg.funcType:toArray(true,"=")) do
 				role:log("onGuidePoint", {guild_type = 3, guild_id = funcIdx, guild_point = 0, guild_pass = 0})
+				role:mylog("guide", {desc = "guide_tips", int1 = funcIdx})
 				funcGuide = funcGuide:setv(funcIdx, value)
 			end
 			role:updateProperty({field = "funcGuide", value = funcGuide})
@@ -332,7 +332,7 @@ end
 --计算自己伤害减免后的值
 function BaseObject:getInjuredValue(value)
 	local injuredChange = self:getInjuredChange()
-	return math.max(0, (value - self.def + injuredChange[0]) * (1 + injuredChange[1]))
+	return math.max(0, (value + injuredChange[0]) * (1 + injuredChange[1]))
 end
 --最终伤害 = [ (敌方攻击 - 己方防御) * （1+伤害增加百分比-伤害减少百分比）*（1+受伤增加百分比-受伤减少百分比）+（伤害增加固定值-伤害增加固定值+受伤增加固定值-受伤增加固定值）]*（1+侍宠百分比）-侍宠固定值
@@ -348,10 +348,11 @@ function BaseObject:hurt(value, releaser, params)
 		end
 	end
-	if params.hurtType ~= 5 and params.hurtType ~= 6 then
-		if not params.hurtType or params.hurtType ~= 4 then
-			value = self:getInjuredValue(value) --减伤计算
+	if params.hurtType ~= 5 then
+		if params.hurtType ~= 6 or params.hurtType ~= 4 then
+			value = math.max(0, value - self.def)
 		end
+		value = self:getInjuredValue(value) --减伤计算
 		if value == 0 then return end
 		-- 舍身和恃宠
@@ -386,7 +386,8 @@ function Role:data()
 		chatline = self:getProperty("chatline"),
 		downCvR	= self:getProperty("downCvR"), -- 下载cv扩展包奖励 
-		feedback = self:getProperty("feedback")
+		feedback = self:getProperty("feedback"),
+		ctime = self:getProperty("ctime"),
 	}
 end
@@ -51,6 +51,7 @@ function RolePlugin.bind(Role)
 	end
 	local function _award(self, itemId, count, params)
+		local count = math.floor(count)
 		local pms = clone(params)
 		local itemData = csvdb["itemCsv"][itemId]
 		if not itemData then  -- 加一层保护
@@ -259,6 +260,7 @@ function RolePlugin.bind(Role)
 	function Role:addItem(params)
 		params = params or {}
+		params.count = math.floor(params.count or 0)
 		if params.itemId ==  ItemId.Diamond then
 			self:gainDiamond(params)
 			return
@@ -1536,7 +1538,7 @@ function RolePlugin.bind(Role)
 			item_number = 1, -- 购买的道具数量
 			item_level = 1, -- 购买的道具等级
 			order_cost = rechargeData.rmb * 100, -- 此次消费的现金金额（单位：分），如 51800即未518元，对应客户端SDK传入的'total_fee'
-			order_currency = "TWD", -- 货币类型，默认为"CNY"（人民币），遵循ISO 4217规范
+			order_currency = "CNY", -- 货币类型，默认为"CNY"（人民币），遵循ISO 4217规范
 			order_type = order_type, -- 订单类型，首充记录为1，否则为0
 			order_id = params.transactionId, -- 本条记录的订单号,对应客户端SDK返回的'bs_trade_no'
 		})