Merge branch 'tr/bugfix-qa' into tr/develop

* tr/bugfix-qa: 拾荒随机错误金额使用乘以 100 的方式 mycard twd 反回的是twd 战令-一次性领取超出周上限的战令经验应该只领取到达周上限的那一部分战令奖励错位战令活动购买等级扣除钻石bug 代理拾荒出勤人数计数错误，代理拾荒没有统计进拾荒体力消耗 httpweb 美食币计算错误开启x品质时钟箱任务计数错误bug 活动任务数据重置活动结束回收邮件

Merge branch 'tr/bugfix-qa' into tr/develop
* tr/bugfix-qa: 拾荒随机错误金额使用乘以 100 的方式 mycard twd 反回的是twd 战令-一次性领取超出周上限的战令经验应该只领取到达周上限的那一部分战令奖励错位战令活动购买等级扣除钻石bug 代理拾荒出勤人数计数错误，代理拾荒没有统计进拾荒体力消耗 httpweb 美食币计算错误开启x品质时钟箱任务计数错误bug 活动任务数据重置活动结束回收邮件
zhouhaihai
2 parents ebc40c72 82520a23
Showing 9 changed files with 30 additions and 18 deletions Show diff stats
src/actions/ActivityAction.lua
src/actions/AdvAction.lua
src/actions/HttpAction.lua
src/csvdata
src/models/Activity.lua
src/models/Diner.lua
src/models/RolePlugin.lua
src/models/RoleTask.lua
src/services/httpweb.lua
@@ -1237,10 +1237,10 @@ function _M.battleCommandRpc(agent, data)
 		local awd = ""
 		if pay then
 			actData["payR"] = record
-			awd = bpCfg["rewardNormal"]
+			awd = bpCfg["rewardHigh"]
 		else
 			actData["freeR"] = record
-			awd = bpCfg["rewardHigh"]
+			awd = bpCfg["rewardNormal"]
 		end
 		for k, v in pairs(awd:toNumMap()) do
 			award[k] = (award[k] or 0) + v
@@ -1279,6 +1279,7 @@ function _M.buyBattleCommandLvlRpc(agent, data)
 		local cfg = bpCfg[i]
 		if cfg["type"] > curLvl and cfg["type"] <= nextLvl then
 			cost = cost + cfg["cost"]
+		elseif cfg["type"] > nextLvl then
 			break
 		end
 	end
@@ -291,6 +291,8 @@ function _M.startHangRpc(agent, data)
 	if not role:checkAdvCount(adv_idle_energy) then return 7 end -- 是否有体力
+	role:checkTaskEnter("AdvCostPower", {count = adv_idle_energy})
+
 	if not checkFormat(role, format, role:getAdvData():isRunning()) then return 8 end --编队是否正确
 	local player = {}
@@ -151,7 +151,7 @@ function _M.query_role(query)
 	if not query.uid then return "not found" end
 	local user = redisproxy:get(string.format("uid:%s", query.uid))
 	if not user then return "not found" end
-	local roleId = redisproxy:get(string_format("user:%s", string.upper(user)))
+	local roleId = redisproxy:get(string.format("user:%s", string.upper(user)))
 	if not roleId then return "not found" end
 	return json.encode({roleId, user})
 end
-Subproject commit 3a1129db7ff72ddc39e74f565bcf3742af5ec87b
+Subproject commit 5c618b16315e74aaa111b3e84dbc4da3f7b3d699
@@ -473,6 +473,7 @@ activityFunc[Activity.ActivityType.CalendaTask] = {
 	["init"] = function(self, actType, isCrossDay, notify)
 		local calTask = self.owner:getProperty("calTask")
 		calTask = {}
+		self.owner:updateProperty({field="calTask", value=calTask})
 		local role = self.owner
 		local buildL = role.dinerData:getProperty("buildL")
 		local curLevel = buildL:getv(1, 1)
@@ -540,6 +541,7 @@ activityFunc[Activity.ActivityType.BattleCommandTask] = {
 	["init"] = function(self, actType, isCrossDay, notify)
 		local bcTask = self.owner:getProperty("bcTask")
 		bcTask = {}
+		self.owner:updateProperty({field="bcTask", value=bcTask})
 		local role = self.owner
 		local buildL = role.dinerData:getProperty("buildL")
 		local curLevel = buildL:getv(1, 1)
@@ -715,8 +717,8 @@ function Activity:closeActivity(actId, notify, notUpdateAct)
 	local actType = actData.showType
 	if activityFunc[actType] and activityFunc[actType]['close'] then
 		activityFunc[actType]["close"](self, actType, notify, actId)
-		self:recycleActItem(actId)
 	end
+	self:recycleActItem(actId)
 	if Activity.schema["act".. actType] then
 		if not Activity.schema["act" .. actType][3] then 
 			self:updateActData(actType, Activity.schema["act" .. actType][2], not notify or notUpdateAct)
@@ -1003,7 +1005,7 @@ activityFunc[Activity.ActivityType.CommonSignIn] = {
 	["crossDay"] = function(self, actType, notify, actId)
 		local actCfg = csvdb["activity_ctrlCsv"][actId]
 		if not actCfg then return end
-		local conArr = actCfg.condition2:toArray("true", "=")
+		local conArr = actCfg.condition2:toArray(true, "=")
 		-- 0 登录即可， 1 达到指定活跃度
 		if conArr[1] ~= 0 then
 			return
@@ -1042,12 +1044,16 @@ activityFunc[Activity.ActivityType.BattleCommand] = {
 		if not actCfg then return end
 		if actCfg.condition1 == "" then return end
 		local arr = actCfg.condition2:toArray(true, "=")
-		local itemId, limit = arr[1], arr[2]
-		if itemId == id and count > 0 then
-			if (actData["week"] or 0) >= limit then
-				return
+		local itemIdWeek, itemIdNormal, limit = arr[1], arr[2], arr[3]
+		if (itemIdWeek == id or itemIdNormal == id) and count > 0 then
+			if itemIdWeek == id then
+				if (actData["week"] or 0) >= limit then
+					return
+				end
+				local old = actData["week"] or 0
+				actData["week"] = math.min(old + count, limit)
+				count = actData["week"] - old
 			end
-			actData["week"] = (actData["week"] or 0) + count
 			local total = actData["sum"] + count
 			local curLvl = actData["lvl"] or 0
 			if actCfg.condition == 1 then		-- 代表sum需要转换为等级
@@ -201,7 +201,7 @@ function Diner:calSellReward(sell, delta, dishData)
 			upValue[ItemId.Gold] = (upValue[ItemId.Gold] or 0) + buildData.gold_up
 		end
 		if buildData.item_up > 0 then
-			upValue[ItemId.DinerCoin] = (upValue[ItemId.DinerCoin] or 0) + buildData.gold_up
+			upValue[ItemId.DinerCoin] = (upValue[ItemId.DinerCoin] or 0) + buildData.item_up 
 		end
 		if buildData and buildData.famous_up > 0 then
 			upValue[-1] = (upValue[-1] or 0) + buildData.famous_up
@@ -1698,7 +1698,7 @@ function RolePlugin.bind(Role)
 		for k , v in pairs(csvdb["shop_rechargeCsv"]) do
 			if not v[pidField] then return "no product" end
 			if v[pidField] == params.product_id then
-				if v.rmb ~= params.money then
+				if v.twd * 100 ~= tonumber(params.money) then
 					return "error money"
 				end
 				-- 发现需要的id
@@ -1823,12 +1823,13 @@ function RolePlugin.bind(Role)
 	-- 充值 --
 	--[[
 	request.order = data.out_trade_no
-	request.amount = data.money / 100
+	request.amount = data.money
 	request.game_money = data.game_money
 	request.product_id = data.product_id
 	request.pay_time = data.pay_time
 	request.transactionId = data.order_no
 	request.extension_info = data.extension_info
+	request.is_mycard = 1
 	]]
 	function Role:handlePurchase(params)
 		local roleId = self:getProperty("id")
@@ -1844,7 +1845,7 @@ function RolePlugin.bind(Role)
 		end
 		local rechargeId = back
 		local rechargeData = csvdb["shop_rechargeCsv"][rechargeId]
-		if rechargeData.rmb ~= tonumber(params.amount) then
+		if (params.is_mycard and rechargeData.twd * 100 ~= tonumber(params.amount)) or (not params.is_mycard and rechargeData.rmb * 100 ~= tonumber(params.amount)) then
 			skynet.error(string.format("[recharge] fake order: %s, roleId: %d, order: %s,  rmb %s, get %s", 
 				params.transactionId, roleId, partnerOrderStr, rechargeData.rmb, params.amount
 			))
@@ -285,7 +285,7 @@ local CalendaTaskListener = {
 		[TaskType.OpenBox]= {{20, 3, f("count"), f("quality")}},
 		[TaskType.RadioTaskStart] = {{21, 1}, {22, 3, f("heroCnt")}},
 		[TaskType.BonusQuick] = {{23, 1, f("count")}},
-		[TaskType.AdvHangHeroCnt] = {{24, 3, f("HeroCnt")}},
+		[TaskType.AdvHangHeroCnt] = {{24, 3, f("count")}},
 		[TaskType.AdvKillBoss] = {{25, 1}},
 		[TaskType.AdvMineKill] = {{26, 1}},
 		[TaskType.PvpBattle] = {{27, 1}},
@@ -41,8 +41,10 @@ local port = ...
 port = tonumber(port)
 local key = "zhaolu1234dangge"
-local function response(id, ...)
-	local ok, err = httpd.write_response(sockethelper.writefunc(id), ...)
+local function response(id, code, body)
+	local ok, err = httpd.write_response(sockethelper.writefunc(id), code, body, {
+		["Connection"] = "Close",
+	})
 	if not ok then
 		-- if err == sockethelper.socket_error , that means socket closed.
 		skynet.error(string.format("fd = %d, %s", id, err))