Merge branch 'bugfix' into qa

* bugfix: 活动以类型标识，修改双倍活动bug 伤害计算数据保护数据保护充值 gm 结算rmb 客户端要用到角色创建时间两个记录bug 新设备遗失的log

Merge branch 'bugfix' into qa
* bugfix: 活动以类型标识，修改双倍活动bug 伤害计算数据保护数据保护充值 gm 结算rmb 客户端要用到角色创建时间两个记录bug 新设备遗失的log
zhouhaihai
2 parents abed32ed 44d8a134
Showing 12 changed files with 270 additions and 78 deletions Show diff stats
src/actions/DinerAction.lua
src/actions/GmAction.lua
src/actions/HangAction.lua
src/actions/HeroAction.lua
src/actions/RoleAction.lua
src/adv/AdvPlayer.lua
src/csvdata
src/models/Activity.lua
src/models/Role.lua
src/models/RolePlugin.lua
src/models/RoleTask.lua
src/utils/CommonFunc.lua
@@ -901,6 +901,7 @@ function _M.entrustRpc(agent , data)
 	role:finishGuide(26)
 	role:mylog("diner_action", {desc = "entrus", short1 = ctype, int1 = entrustId})
+	role:checkTaskEnter("VillageApply", {})
 	SendPacket(actionCodes.Diner_entrustRpc, MsgPack.pack({reward = reward, change = change}))
 	return true
@@ -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,
@@ -409,10 +412,9 @@ function _M.quickRpc(agent , data)
 	end
 	local doubleCoef = role.activity:isOpen("DoubleDrop") and 2 or 1
-
 	-- 特权卡获取加速获得额外道具
 	local coef = role.storeData:getProduceItemSpeedCoef()
-	if coef > 1 then
+	if coef > 1 or doubleCoef > 1 then
 		for k, cnt in pairs(reward) do
 			reward[k] = math.floor(cnt * coef * doubleCoef)
 		end
@@ -479,10 +481,15 @@ function _M.buyBonusCountRpc(agent, data)
 	local btype = msg.type
 	if not TimeReset["DailyBattle" .. btype] then return end
+	local open, actId = role.activity:isOpen("BonusDouble")
+	local actData = csvdb["activity_ctrlCsv"][actId]
+	if not actData then return end
+
+	local coef = open and tonumber(actData.condition2) or 1
 	local bonusC = role.dailyData:getProperty("bonusC")
 	bonusC[btype] = bonusC[btype] or {c = 0, b = 0}
-	local lastCount = globalCsv.bonus_daily_buy_count - bonusC[btype]["b"]
+	local lastCount = globalCsv.bonus_daily_buy_count * coef - bonusC[btype]["b"]
 	if math.illegalNum(count, 1, lastCount)  then return 1 end
 	if not role:checkItemEnough({[ItemId.Diamond] = globalCsv.bonus_buy_cost * count}) then return 2 end
@@ -502,20 +509,30 @@ function _M.startBonusBattleRpc(agent, data)
 	local msg = MsgPack.unpack(data)
 	local id = msg.id
-	if not role:isFuncUnlock(FuncUnlock.BonusBattle) then return end
+	local open, actId = role.activity:isOpen("BonusDouble")
+
+	if not role:isFuncUnlock(FuncUnlock.BonusBattle) then return 1 end
 	local bonusData = csvdb["bonus_battleCsv"][id]
-	if not role:isTimeResetOpen(TimeReset["DailyBattle" .. bonusData.type]) then return end
+	if not open then
+		if not role:isTimeResetOpen(TimeReset["DailyBattle" .. bonusData.type]) then return 2 end
+	end
-	if not bonusData then return 1 end
-	if not role:checkHangPass(bonusData.unlock) then return 2 end
+	if not bonusData then return 3 end
+	if not role:checkHangPass(bonusData.unlock) then return 4 end
-	if not next(role:getProperty("bTeam")) then return 3 end
+	if not next(role:getProperty("bTeam")) then return 5 end
 	local bonusC = role.dailyData:getProperty("bonusC")
 	bonusC[bonusData.type] = bonusC[bonusData.type] or {c = 0, b = 0}
-	if globalCsv.bonus_daily_count - bonusC[bonusData.type]["c"] <= 0 then return 4 end
+
+	local actData = csvdb["activity_ctrlCsv"][actId]
+	if not actData then return 6 end
+
+	local coef = open and tonumber(actData.condition2) or 1
+
+	if globalCsv.bonus_daily_count * coef - bonusC[bonusData.type]["c"] <= 0 then return 7 end
 	role.__bonusBattleCache = {
@@ -533,6 +550,11 @@ function _M.endBonusBattleRpc(agent, data)
 	local key = msg.key
 	local starNum = msg.starNum
 	if not role.__bonusBattleCache then return 1 end
+	local open, actId = role.activity:isOpen("BonusDouble")
+	local actData = csvdb["activity_ctrlCsv"][actId]
+	if not actData then return end
+
+	local coef = open and tonumber(actData.condition2) or 1
 	if role.__bonusBattleCache.id ~= id or role.__bonusBattleCache.key ~= key then 
 		SendPacket(actionCodes.Hang_endBonusBattleRpc, MsgPack.pack({errorCode = 1}))
@@ -545,7 +567,7 @@ function _M.endBonusBattleRpc(agent, data)
  		-- 胜利扣除次数
  		local bonusC = role.dailyData:getProperty("bonusC")
 		bonusC[bonusData.type] = bonusC[bonusData.type] or {c = 0, b = 0}
-		if globalCsv.bonus_daily_count - bonusC[bonusData.type]["c"] <= 0 then return 3 end
+		if globalCsv.bonus_daily_count * coef - bonusC[bonusData.type]["c"] <= 0 then return 3 end
 		bonusC[bonusData.type]["c"] = bonusC[bonusData.type]["c"] + 1
 		role.dailyData:updateProperty({field = "bonusC", value = bonusC})
@@ -554,6 +576,9 @@ function _M.endBonusBattleRpc(agent, data)
 		if chance[1] ~= 0 then
 			reward[chance[1]] = (reward[chance[1]] or 0) + chance[2]
 		end
+		for k, v  in pairs(reward) do
+			reward[k] = v * (coef > 1 and actData.condition or 1)
+		end
  		reward, change = role:award(reward, {log = {desc = "bonusBattle", int1 = id}})
  		role:checkTaskEnter("BonusPass", {id = id})
  	end
@@ -564,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,
@@ -586,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
@@ -721,7 +721,7 @@ function _M.drawHeroRpc(agent, data)
 	local role = agent.role
 	local msg = MsgPack.unpack(data)
-	if not role:isFuncUnlock(FuncUnlock.GetHero) then return end
+	if not role:isFuncUnlock(FuncUnlock.GetHero) then return 1 end
 	local btype = msg.pool	-- 1 2 3	卡池类型
 	local subType = msg.subType	or 1-- 定向卡池需要传 子类型
 	local drawType = msg.type -- 1 单抽 2 十连
@@ -730,10 +730,10 @@ function _M.drawHeroRpc(agent, data)
 	end
 	local buildTypeData = csvdb["build_typeCsv"][btype]
-	if not buildTypeData then return 1 end
+	if not buildTypeData then return 2 end
 	local drawCount = {1, 10} -- 抽取次数
-	if not drawCount[drawType] then return 2 end
+	if not drawCount[drawType] then return 3 end
 	local draw_floor_back_counts = globalCsv.draw_floor_back_counts[btype]
 	local floorHeroCount = role:getProperty("floorHero")[btype] or 0
@@ -757,20 +757,20 @@ function _M.drawHeroRpc(agent, data)
 		end
 	end
 	if lastCount > 0 then -- 钱不够
-		return 3
+		return 4
 	end
 	-- 抽取的池子
 	local poolMap = buildTypeData["pool"]:toNumMap()
 	local poolId = poolMap[subType]
-	if not poolId then return end
+	if not poolId then return 5 end
 	--判断定向卡池是否开启
 	if btype == 1 then
 			if not role:isTimeResetOpen(TimeReset["DrawType" .. subType]) then
 				local unlockPool = role.dailyData:getProperty("unlockPool")
 				if not unlockPool[subType] then
-					return 1
+					return 6
 				end
 			end
 	end
@@ -782,12 +782,12 @@ function _M.drawHeroRpc(agent, data)
 	end
 	local unitPool = csvdb["build_unitCsv"][poolId]
-	if not unitPool then return 4 end
+	if not unitPool then return 7 end
 	-- 开始抽
 	local resultPool = {}
 	local function fillDrawPool(isFloorBack)
-		local condition = {"rare", "camp"}
+		local condition = {"rare"}
 		local values = {}
@@ -848,7 +848,7 @@ function _M.drawHeroRpc(agent, data)
 		fillDrawPool(isFloorBack)
 		if not next(resultPool) then
 			skynet.error("random pool error, poolId:" .. poolId)
-			return
+			return 8
 		end
 		local itemId = math.randWeight(resultPool, 1)
@@ -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
@@ -584,7 +590,7 @@ function _M.openTimeBoxRpc(agent, data)
 		boxL[slot] = nil
 		reward, change = role:award(reward, {log = {desc = "openTimeBox", int1 = boxId}})
-		role:checkTaskEnter("OpenBox", {id = boxId, count=1})
+		role:checkTaskEnter("OpenBox", {id = boxId, count=1, quality=itemData.quality})
 		role:log("carriage_dismantle", {
 			item_id = boxId, -- 道具id
@@ -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
 		-- 舍身和恃宠
-Subproject commit 5751e98613ad7ade246cb9068c6752ecca115163
+Subproject commit 76bf12dfa6afe523ec30d1da6467cb8cbd30790f
 local Activity = class("Activity", require("shared.ModelBase"))
 local string_format = string.format
+-- activity_ctr showType
 Activity.ActivityType = {
-	Sign = 1,  -- 签到
+	SsrUpPoolChange = 1,	-- 特定英雄活动，切卡池
 	DoubleDrop = 2, -- 双倍掉落
-	FoodSell = 3,	--贩卖周 料理
-	DrawHero = 4,	--抽卡周 招募
-	AdvDraw = 5,	--拾荒抽周 资助
-	OpenBox = 6,	--拆解周 时钟箱
-	PaySignIn = 7,	--付费签到
-	PayBack = 9,	--返利
-
-	SsrUpPoolChange = 10,	-- 特定英雄活动，切卡池
+	Sign = 4,  -- 签到
+	ChangeCG = 5,	-- 客户端使用，切换抽卡界面
+	PaySignIn = 6,	--付费签到
+	ExploreCommand = 7,	-- 探索指令
+	PayBack = 8,	--返利
+
+	BonusDouble = 9,	-- 奖励关卡翻倍
+	CalendaTask = 10,	-- 日历任务
+
+	FoodSell = 11,	--贩卖周 料理
+	DrawHero = 12,	--抽卡周 招募
+	AdvDraw = 13,	--拾荒抽周 资助
+	OpenBox = 14,	--拆解周 时钟箱
 }
@@ -33,26 +39,27 @@ end
 Activity.schema = {
 	actime 		= {"table", {}},  -- 最近检查某项活动的开始时间  {id = time}
 	round		= {"table", {}},  -- 记录活动到了第几轮  {id = roundnum}
-	act1		= {"table", {}},  -- {0 = day, 1= -1, 2 = -1} == 签到活动
-	act3		= {"table", {}},  -- {0 = 抽卡次数, 1=1, 2=1}  抽卡周活动  1表示领取过该档位的奖励
-	act4		= {"table", {}},  -- {0 = 贩卖数量, 1=1, 2=1}  贩卖周活动  1表示领取过该档位的奖励
-	act5		= {"table", {}},  -- {0 = 拆解数量, 1=1, 2=1}  拆解周活动  1表示领取过该档位的奖励
-	act6		= {"table", {}},  -- {0 = 拾荒消耗远古金币数量, 1=1, 2=1}  拾荒周活动  1表示领取过该档位的奖励
-	act7		= {"table", {}},  -- {1 = 1, 2 = 1} == 付费签到活动
-	act9		= {"number", 0},  -- 充值返利 
+	act4		= {"table", {}},  -- {0 = day, 1= -1, 2 = -1} == 签到活动
+	act6		= {"table", {}},  -- {1 = 1, 2 = 1} == 付费签到活动
+	act8		= {"number", 0},  -- 充值返利 
+
+	act11		= {"table", {}},  -- {0 = 贩卖数量, 1=1, 2=1}  贩卖周活动  1表示领取过该档位的奖励
+	act12		= {"table", {}},  -- {0 = 抽卡次数, 1=1, 2=1}  抽卡周活动  1表示领取过该档位的奖励
+	act13		= {"table", {}},  -- {0 = 拾荒消耗远古金币数量, 1=1, 2=1}  拾荒周活动  1表示领取过该档位的奖励
+	act14		= {"table", {}},  -- {0 = 拆解数量, 1=1, 2=1}  拆解周活动  1表示领取过该档位的奖励
 }
 function Activity:data()
 	return {
 		actime = self:getProperty("actime"),
 		round = self:getProperty("round"),
-		act1 = self:getProperty("act1"),
-		act3 = self:getProperty("act3"),
 		act4 = self:getProperty("act4"),
-		act5 = self:getProperty("act5"),
 		act6 = self:getProperty("act6"),
-		act7 = self:getProperty("act7"),
-		act9 = self:getProperty("act9"),
+		act8 = self:getProperty("act8"),
+		act11 = self:getProperty("act11"),
+		act12 = self:getProperty("act12"),
+		act13 = self:getProperty("act13"),
+		act14 = self:getProperty("act14"),
 	}
 end
@@ -77,10 +84,9 @@ function Activity:updateProperty(params)
 	return false
 end
-
-function Activity:isOpenRaw(activityType, now)
-	activityType = checkActivityType(activityType)
-	local actData = csvdb["activity_ctrlCsv"][activityType]
+function Activity:isOpenRaw(activityId, now)
+	activityId = checkActivityType(activityId)
+	local actData = csvdb["activity_ctrlCsv"][activityId]
 	if not actData then return end
 	if actData.time == "" then -- 关闭
@@ -89,7 +95,7 @@ function Activity:isOpenRaw(activityType, now)
 	local st = 0
 	local et = 0
-	local now = skynet.timex()
+	--local now = skynet.timex()
 	if actData.ttype == 0 then -- 时间开放
 		local openTimes = actData.time:toArray(false, "=")
@@ -118,7 +124,17 @@ end
 -- 缓存开放
 function Activity:isOpen(activityType)
 	activityType = checkActivityType(activityType)
-	return self._isOpen[activityType]
+	--return self._isOpen[activityType]
+	local open = false
+	for id, data in pairs(csvdb["activity_ctrlCsv"]) do
+		if data.showType == activityType then
+			open = self._isOpen[data.id]
+			if open then
+				return true, data.id
+			end
+		end
+	end
+	return false
 end
 function Activity:getActData(actType)
@@ -137,22 +153,22 @@ function Activity:checkActivityStatus(now, isCrossDay, notify)
 	self._isOpen = {}
 	local actime = self:getProperty("actime")
 	local change = false
-	for actType, actData in pairs(csvdb["activity_ctrlCsv"]) do
-		local isOpen, startTime = self:isOpenRaw(actType, now)
-		self._isOpen[actType] = isOpen
+	for actId, actData in pairs(csvdb["activity_ctrlCsv"]) do
+		local isOpen, startTime = self:isOpenRaw(actId, now)
+		self._isOpen[actId] = isOpen
 		if isOpen then
-			if actime[actType] and actime[actType] == startTime then -- 还是之前的状态 开放中
+			if actime[actId] and actime[actId] == startTime then -- 还是之前的状态 开放中
 			else  -- 重置
-				actime[actType] = startTime
-				self:closeActivity(actType, notify, true)
-				self:initActivity(actType, isCrossDay, notify)
+				actime[actId] = startTime
+				self:closeActivity(actId, notify, true)
+				self:initActivity(actId, isCrossDay, notify)
 				change = true
 			end
 		else
-			if actime[actType] then
-				self:closeActivity(actType, notify)
-				actime[actType] = nil
+			if actime[actId] then
+				self:closeActivity(actId, notify)
+				actime[actId] = nil
 				change = true
 			end
 		end
@@ -345,13 +361,19 @@ activityFunc[Activity.ActivityType.PayBack] = {
 	-- end,
 }
-function Activity:initActivity(actType, isCrossDay, notify)
+function Activity:initActivity(actId, isCrossDay, notify)
+	local actData = csvdb["activity_ctrlCsv"][actId]
+	if not actData then return end
+	local actType = actData.showType
 	if activityFunc[actType] and activityFunc[actType]['close'] then
 		activityFunc[actType]["init"](self, actType, isCrossDay, notify)
 	end
 end
-function Activity:closeActivity(actType, notify, notUpdateAct)
+function Activity:closeActivity(actId, notify, notUpdateAct)
+	local actData = csvdb["activity_ctrlCsv"][actId]
+	if not actData then return end
+	local actType = actData.showType
 	if activityFunc[actType] and activityFunc[actType]['close'] then
 		activityFunc[actType]["close"](self, actType, notify)
 	end
@@ -361,8 +383,10 @@ function Activity:closeActivity(actType, notify, notUpdateAct)
 end
 function Activity:refreshDailyData(notify)
-	for actType, status in pairs(self._isOpen) do
-		if status then
+	for actId, status in pairs(self._isOpen) do
+		local actData = csvdb["activity_ctrlCsv"][actId]
+		if status and actData then
+			local actType = actData.showType
 			if activityFunc[actType] and activityFunc[actType]['crossDay'] then
 				activityFunc[actType]["crossDay"](self, actType, notify)
 			end
@@ -398,10 +422,12 @@ end
 -- 获取活动卡池id
 function Activity:getActivityPool(mainType, subType)
-	if not self:isOpen(Activity.ActivityType.SsrUpPoolChange) then	
+	local open, actId = self:isOpen(Activity.ActivityType.SsrUpPoolChange)
+	if not open then
+	--if not self:isOpen(Activity.ActivityType.SsrUpPoolChange) then	
 		return 0
 	end
-	local actData = csvdb["activity_ctrlCsv"][Activity.ActivityType.SsrUpPoolChange]
+	local actData = csvdb["activity_ctrlCsv"][actId]
 	if not actData then return 0 end
 	local poolMap = actData.condition2:toMap(true, "=")
@@ -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'
 		})
@@ -12,6 +12,9 @@ local TaskType = {
 	WakeCG = 7,					-- 觉醒到解锁CG		- heroType
 	HeroTalent = 8,				-- 天赋升级			- heroType	alv
 	DrawSSR = 9,				-- 抽到SSR			- count
+	HeroLvlCollect = 10,		-- 英雄等级收集进度
+	HeroQualityCollect = 11,	-- 英雄品质收集进度
+	HeroStarCollect = 12,		-- 英雄星级收集进度
 	--装备相关
 	AddEquip = 101,				-- 获得装备			- equipId	rarity
@@ -44,6 +47,7 @@ local TaskType = {
 	AdvStartSelf = 409,			-- 手动冒险			- id	
 	AdvScore = 410, 			-- 冒险分数			- score		
 	AdvDraw = 411, 				-- 冒险资助			- count		ptype
+	AdvHang	= 412,				-- 代理拾荒次数
 	--爬塔相关
 	TowerPass = 501,			-- 爬塔通关			- level
@@ -60,6 +64,7 @@ local TaskType = {
 	DinerPopular = 608,			-- 人气值			- count
 	DinerLevelUp = 609,			-- 餐厅升级			- level type
 	DinerTalentUp = 610,		-- 天赋升级			- type level
+	VillageApply = 611,			-- 餐厅委托个数
 	-- 车厢相关
 	PotionMake = 701, 			-- 营养剂制作			- id	count
@@ -78,6 +83,7 @@ local TaskType = {
 	-- 角色相关 
 	RoleLevelUp = 901,			-- 角色升级			- curlevel
+	RuneQualityCollect	= 902,	-- 铭文品质收集进度
 	--功能未实现 todo
 	AdvShop = 1002,				-- 冒险商城
@@ -230,6 +236,32 @@ local StoreListener = {
 	}
 }
+local CalendaTaskListener = {
+	func = "checkCalendaTask",
+	listen = {
+		[TaskType.DrawHero] = {{1, 1, f("count")}},
+		[TaskType.BonusPass]= {{2, 1}},
+		[TaskType.AdvPass]= {{3, 1}},
+		[TaskType.DinerLevelUp]= {{4, 2, f("level")}},
+		[TaskType.HeroLvlCollect]= {{5, 3}},		-- x名y级英雄
+		[TaskType.AdvHang]= {{6, 1}},			----
+		[TaskType.HeroQualityCollect]= {{7, 3}},
+		[TaskType.OverOderTask]= {{8, 1}},
+		[TaskType.VillageApply]= {{9, 1}},
+		[TaskType.PvpWin]= {{10, 2, f("score")}},
+		[TaskType.DinerPopular]= {{11, 2, f("count")}},
+		[TaskType.RoleLevelUp]= {{12, 2, f("level")}},
+		[TaskType.TowerPass]= {{13, 2, f("level")}},
+		[TaskType.HeroTalent]= {{14, 1}},
+		[TaskType.HangPass]= {{15, 2, f("id")}},
+		[TaskType.HeroStarCollect]= {{16, 3}},
+		[TaskType.FoodSell]= {{17, 1, f("count")}},
+		[TaskType.HangGet]= {{18, 3, f("reward")}},
+		[TaskType.RuneQualityCollect]= {{19, 3, f("id")}},
+		[TaskType.OpenBox]= {{20, 3, f("count"), f("quality")}},
+	}
+}
+
 local TaskListeners = {
 	StoryListener,
@@ -552,6 +584,33 @@ function RoleTask.bind(Role)
 		self.storeData:OnTriggerLimitTimePack(triggerType, param)
 	end
+	function Role:checkCalendaTask(notNotify, mainType, subType, param1, param2)
+		local open, actId = self.activity:isOpen("CalendaTask")
+		local actData = csvdb["activity_ctrlCsv"][actId]
+		if not actData then return end
+		if not open then return end
+
+		local change = false
+		local calTask = self:getProperty("calTask") or {}
+		param1 = param1 or 1
+
+		local cid = actData.condition
+		for k, taskList in pairs(csvdb["activity_taskCsv"]) do
+			if k == cid then
+				for id, cfg in pairs(taskList) do
+					if cfg.type == mainType then
+						if subType == 1 then	-- 增加数值
+							calTask[id] = (calTask[id] or 0) + param1
+						elseif subType == 2 then	-- 直接赋值
+							calTask[id] = param1
+						elseif subType == 3 then	-- 自定义类型
+						end
+					end
+				end
+			end
+		end
+	end
+
 end
 return RoleTask
 \ No newline at end of file
@@ -155,7 +155,7 @@ function diffFromOpen()
 		hour = RESET_TIME,
 	}
 	if now < openTime then
-		return 0
+		return -1
 	end
 	return math.floor((now - openTime) / DAY_SEC)