Merge branch 'cn/develop' into cn/publish/release

jiyue
2 parents febda4c3 c8981ed2
Showing 5 changed files with 91 additions and 50 deletions Show diff stats
src/actions/GmAction.lua
src/actions/HangAction.lua
src/actions/RoleAction.lua
src/models/Daily.lua
src/models/RolePlugin.lua
@@ -1139,4 +1139,27 @@ function _M.get_draw_hero_pro(role, pms)
 	return json.encode(result)
 end
+function _M.decrePayR(role, pms)
+	local id = tonumber(pms.pm1)
+	local payR = role.storeData:getProperty("payR")
+	if payR[id] > 0 then
+		payR[id] = payR[id] - 1
+		if payR[id] == 0 then
+			payR[id] = nil
+		end
+	end
+	role.storeData:updateProperty({field = "payR", value = payR})
+	return "指令成功"
+end
+
+function _M.draw_code(role, pms)
+    local code = pms.pm1
+	if type(code) ~= "string" then return -2 end
+	if code:find("[^0-9a-zA-Z]") then return -3 end
+
+	local ret, _, _= role:getCodeGift(code)
+	return ret
+end
+
+
 return _M
 \ No newline at end of file
@@ -570,18 +570,18 @@ function _M.buyBonusCountRpc(agent, data)
 	local bonusC = role.dailyData:getProperty("bonusC")
 	local extraCnt = role.storeData:getBonusExtraFightCount()
-	bonusC[btype] = bonusC[btype] or {c = 0, b = 0}
+	--bonusC[btype] = bonusC[btype] or {c = 0, b = 0}
 	--local lastCount = (globalCsv.bonus_daily_buy_count + role:getBnousChangeBuyCount()) * coef + extraCnt - bonusC[btype]["b"]
 	--if math.illegalNum(count, 1, lastCount)  then return 1 end
-	local costCount = bonusC[btype]["b"] + count
+	local costCount = (bonusC["b"] or 0 )+ count
 	local cost = table.findMinKeyByIndex(globalCsv.bonus_buy_cost, costCount, 1)
 	if not role:checkItemEnough({[ItemId.Jade] = cost}) then return 2 end
 	role:costItems({[ItemId.Jade] = cost}, {log = {desc = "buyBonusCount", int1 = btype, int2 = count}})
-	bonusC[btype]["b"] = costCount
-	bonusC[btype]["c"] = bonusC[btype]["c"] - count
+	bonusC["b"] = costCount
+	bonusC["c"] = (bonusC["c"] or 0) - count
 	role.dailyData:updateProperty({field = "bonusC", value = bonusC})
@@ -664,7 +664,7 @@ function _M.startBonusBattleRpc(agent, data)
 	if bonusStar[id] and bonusStar[id] >= (1 << #bonusData.sweep_condition:toTableArray(true)) - 1 then 
 			local bonusC = role.dailyData:getProperty("bonusC")
-			bonusC[bonusData.type] = bonusC[bonusData.type] or {c = 0, b = 0}
+			--bonusC[bonusData.type] = bonusC[bonusData.type] or {c = 0, b = 0}
 			local actData = csvdb["activity_ctrlCsv"][actId]
 			local extraCnt = role.storeData:getBonusExtraFightCount()
@@ -672,9 +672,9 @@ function _M.startBonusBattleRpc(agent, data)
 			if open and actData then
 				coef = tonumber(actData.condition2)
 			end
-			if math.illegalNum(count, 1, (globalCsv.bonus_daily_count + role:getBnousChangeBaseCount()) * coef + extraCnt - bonusC[bonusData.type]["c"]) then return 7 end
+			if math.illegalNum(count, 1, (globalCsv.bonus_daily_count + role:getBnousChangeBaseCount()) * coef + extraCnt - (bonusC["c"] or 0)) then return 7 end
-			bonusC[bonusData.type]["c"] = bonusC[bonusData.type]["c"] + count
+			bonusC["c"] = (bonusC["c"] or 0) + count
 			role.dailyData:updateProperty({field = "bonusC", value = bonusC})
 		local reward, change = bonusWinReward(role, bonusData, 3, count, true)
@@ -1240,6 +1240,12 @@ function _M.chatRpc(agent, data)
 				return
 			end
+			local dailyChatTimes = role.dailyData:getProperty("chatTimes")
+			if dailyChatTimes > (globalCsv.chat_world_day_limit or 15) then
+				result = 4
+				return
+			end 
+
 			role._worldChatLimit = role._worldChatLimit or {start = 0, count = 0, canSayt = 0}  --第一次开始说话时间  从第一次说话次数  能说话的时间
 			if now < role._worldChatLimit.canSayt then
@@ -1268,6 +1274,8 @@ function _M.chatRpc(agent, data)
             else
                 mcast_util.pub_world(actionCodes.Role_chat, MsgPack.pack(response))
             end
+			dailyChatTimes = dailyChatTimes + 1
+			role.dailyData:updateProperty({field="chatTimes", value=dailyChatTimes})
 			-- pcall(skynet.send, '.globald', "lua", "sendWorldMsg", role._channelIdx, response)
 			role:mylog("role_action", {desc = "chatWorld", text1 = content})
 		end,
@@ -1355,53 +1363,23 @@ end
 function _M.drawCodeRpc(agent, data)
 	local msg = MsgPack.unpack(data)
-	local codeurl = skynet.getenv("codeurl")
 	local role = agent.role
-	local msg = MsgPack.unpack(data)
 	local code = msg.code
-	if type(code) ~= "string" then return end
-	if code:find("[^0-9a-zA-Z]") then return end
+	if type(code) ~= "string" then return 1 end
+	if code:find("[^0-9a-zA-Z]") then return 2 end
-	local codestr = role:getProperty("codeStr")
-	local content = {
-		["platformId"] = role:getProperty("sid"),
-		["code"] = code,
-		["itemIds"] = codestr,
-		["key"] = "zhaolugame20170831",
-	}
-	local status, body = httpc.get(codeurl, "/libaoma?" .. httpGetFormatData(content), {})
-	if status == 200 then
-		local result = json.decode(body)
-		local ret = tonum(result.ret)
-		if ret == 0 then
-			local giftId = tonumber(result.giftId)
-			role:setProperty("codeStr", codestr:setv(giftId, 1))
-			local reward, change = role:award(result.gift, {log = {desc = "drawCode", int1 = giftId}})
-			
-			role:log("get_gift", {
-				gift_id = giftId, -- 礼包ID
-				gift_key = code, -- 礼包key
-				gift_reward = reward, -- 礼包奖励，json格式记录，{"itemid1":123,"itemid2":12,……….}
-				gift_name = "", -- 礼包名称
-				gift_reason = 0, -- 礼包发放原因，见发放原因枚举表
-			})
-			role:mylog("role_action", {desc = "drawCode", int1 = giftId, key1 = code, key2 = role:getRewardLogStr(result.gift)})
-			SendPacket(actionCodes.Role_drawCodeRpc, MsgPack.pack({
-				result = ret,
-				reward = reward,
-				change = change,
-			}))
-			return true
-		end
-        -- 1 不存在的礼包码
-        -- 2 已经领取过相同类型物品
-        -- 3 领取数量达到上限
-        -- 4 过期了
-		SendPacket(actionCodes.Role_drawCodeRpc, MsgPack.pack({result = ret}))
-		return true
+	local ret, reward, change= role:getCodeGift(code)
+	if ret == 0 then
+		SendPacket(actionCodes.Role_drawCodeRpc, MsgPack.pack({
+			result = ret,
+			reward = reward,
+			change = change,
+		}))
+        return true
 	end
-	SendPacket(actionCodes.Role_drawCodeRpc, MsgPack.pack({result = -1}))
+
+	SendPacket(actionCodes.Role_drawCodeRpc, MsgPack.pack({result = ret}))
 	return true
 end
@@ -17,7 +17,7 @@ Daily.schema = {
 	advBC			= {"number", 0},		-- 冒险次数购买次数(冒险体力购买次数)
 	advElBC			= {"number", 0},		-- 无尽次数购买次数(冒险体力购买次数)
 	advWs			= {"table", {}}, 		-- 冒险队工坊
-	bonusC			= {"table", {}}, 		-- 奖励副本 次数 {[type] = {c = 0, b = 0}}
+	bonusC			= {"table", {}}, 		-- 奖励副本 次数 {[type] = {c = 0, b = 0}} 修改为 {c=0, b=0}
 	giveFP			= {"table", {}},		-- 给谁送过心心
 	getFP			= {"table", {}},		-- 领过谁的心心
 	pvpFree			= {"number", 0},		-- pvp使用免费次数
@@ -36,6 +36,8 @@ Daily.schema = {
 	treasureBase	= {"number", 0}, 		-- 资源值
 	treasureList 	= {"table", {}}, 		--挂机图鉴
+
+	chatTimes 		= {"number", 0},		--每日发言次数
 }
 function Daily:updateProperty(params)
@@ -415,6 +417,7 @@ function Daily:data()
 		curPool = self:getProperty("curPool"),
 		treasureBase = self:getProperty("treasureBase"),
 		treasureList = self:getProperty("treasureList"),
+		chatTimes = self:getProperty("chatTimes"),
 	}
 end
@@ -3303,6 +3303,43 @@ function RolePlugin.bind(Role)
 		end
 		self:updateProperty({field = "worldChangePoints", value = worldChangePoints})
 	end
+
+	function Role:getCodeGift(code)
+		local codeurl = skynet.getenv("codeurl")
+		local codestr = self:getProperty("codeStr")
+		local content = {
+			["platformId"] = self:getProperty("sid"),
+			["code"] = code,
+			["itemIds"] = codestr,
+			["key"] = "zhaolugame20170831",
+		}
+		local status, body = httpc.get(codeurl, "/libaoma?" .. httpGetFormatData(content), {})
+		if status == 200 then
+			local result = json.decode(body)
+			local ret = tonum(result.ret)
+			if ret == 0 then
+				local giftId = tonumber(result.giftId)
+				self:setProperty("codeStr", codestr:setv(giftId, 1))
+				local reward, change = self:award(result.gift, {log = {desc = "drawCode", int1 = giftId}})
+
+				self:log("get_gift", {
+					gift_id = giftId, -- 礼包ID
+					gift_key = code, -- 礼包key
+					gift_reward = reward, -- 礼包奖励，json格式记录，{"itemid1":123,"itemid2":12,……….}
+					gift_name = "", -- 礼包名称
+					gift_reason = 0, -- 礼包发放原因，见发放原因枚举表
+				})
+				self:mylog("role_action", {desc = "drawCode", int1 = giftId, key1 = code, key2 = self:getRewardLogStr(result.gift)})
+				return ret, result, reward, change
+			end
+			-- 1 不存在的礼包码
+			-- 2 已经领取过相同类型物品
+			-- 3 领取数量达到上限
+			-- 4 过期了
+			return ret
+		end
+		return -1
+	end
 end
 return RolePlugin
 \ No newline at end of file