Merge branch 'develop' into tr/cb

zhouhaihai
2 parents 0d3dbda9 ba84f3c7
Showing 11 changed files with 23 additions and 15 deletions Show diff stats
config/develop.lua
src/actions/ActivityAction.lua
src/actions/RoleAction.lua
src/actions/StoreAction.lua
src/csvdata
src/models/Role.lua
src/models/RoleLog.lua
src/models/RolePlugin.lua
src/models/Store.lua
src/services/globald.lua
src/services/logd.lua
@@ -15,5 +15,3 @@ redis_host = &quot;127.0.0.1&quot;
 redis_port = 6100
 redis_db = 1
 redis_auth = nil
-
-pay_url = ""
 \ No newline at end of file
@@ -68,7 +68,7 @@ function _M.sudokuRpc(agent, data)
 	role:log("activity", {
 		activity_id = id, -- 活动ID（或活动指定任务的ID）
 		activity_type = 0, -- 活动类型，见活动类型枚举表
-		activity_reward = reward, -- 活动奖励，json格式记录,{'itemid1':123,'itemid2':456,………...}
+		activity_reward = reward or {}, -- 活动奖励，json格式记录,{'itemid1':123,'itemid2':456,………...}
 	})
 	SendPacket(actionCodes.Activity_sudokuRpc, MsgPack.pack({task = role:packReward(task, tchange), reward = role:packReward(reward, rchange), rId = rId}))
@@ -308,6 +308,13 @@ function _M.createRpc(agent, data)
 		SendPacket(actionCodes.Role_createRpc, MsgPack.pack(response))
 		return true
 	end
+	local stopcreate = tonumber(redisproxy:hget("autoincrement_set", "stopcreate"))
+	if stopcreate and stopcreate > 0 then
+		response.result = "STOP_CREATE"
+		SendPacket(actionCodes.Role_createRpc, MsgPack.pack(response))
+		return true
+	end
+
 	local roleId = getNextRoleId()
 	if not roleId then
@@ -2,7 +2,6 @@ local _M = {}
 local serverId = tonumber(skynet.getenv("servId"))
 local md5 = require "md5"
-local pay_url = skynet.getenv("pay_url") or ""
 local function makeOrder(roleId, rechargeId)
 	local orderId = redisproxy:hincrby("autoincrement_set", "order", 1)
@@ -86,7 +85,7 @@ function _M.googleRechargeRpc(agent, data)
 		money = dataSet.rmb * 100,
 		game_money = dataSet.diamond,
 		product_id = dataSet.productId,
-		notify_url = pay_url .. "/pay/google"
+		notify_url = msg.notifyUrl
 	}
 	local sign = signPms(need, secret_key)
@@ -112,7 +111,7 @@ function _M.myCardRechargeRpc(agent, data)
 		out_trade_no = partnerOrderId,
 		money = dataSet.rmb * 100,
 		game_money = dataSet.diamond,
-		notify_url = pay_url .. "/pay/mycard"
+		notify_url = msg.notifyUrl
 	}
 	local sign = signPms(need, secret_key)
@@ -139,7 +138,7 @@ function _M.iosRechargeRpc(agent, data)
 		money = dataSet.rmb * 100,
 		game_money = dataSet.diamond,
 		product_id = dataSet.iap_product_id,
-		notify_url = pay_url .. "/pay/ios"
+		notify_url = msg.notifyUrl
 	}
 	local sign = signPms(need, secret_key)
-Subproject commit b026265df3a1755bad4a83630d7457b790232b3e
+Subproject commit 2de1748bed665c9220f68eeb23a8ce3d1f810bda
@@ -381,6 +381,8 @@ function Role:data()
 		redp = self:getProperty("redp"),
 		chatline = self:getProperty("chatline"),
+
+		downCvR	= self:getProperty("downCvR"), -- 下载cv扩展包奖励 
 	}
 end
@@ -97,6 +97,7 @@ local ItemReason = {
 	createHeroRandom = 1206, -- 随机合成
 	resetHero = 1207, -- 重置养成
 	unlockPool = 1208, -- 解锁英雄定向抽卡池
+	downloadCv = 1209, -- 下载 cv包奖励
 }
@@ -229,7 +229,7 @@ function RolePlugin.bind(Role)
 				self:log("setLevel", {
 					level_before = oldLevel, 
 					level_changemain = log.desc,
-					level_changedetail = log.sub,
+					level_changedetail = log.sub or "",
 					level_reward = {},
 				})
 			else
@@ -270,11 +270,12 @@ end
 --触发限时礼包
 function Store:OnTriggerLimitTimePack(eventType, param)
     local limitPack = self:getProperty("limitTPack")
+    local payRecord = self:getProperty("payR")
     local timeNow = skynet.timex()
     local find = false
     -- 有未过期的限时礼包不再推送
     for k, v in pairs(limitPack) do
-        if v > timeNow then
+        if v > timeNow and not payRecord[k] then
             find = true
             break
         end
@@ -60,25 +60,25 @@ local function mailQuene()
 		if email.mid then
 			redisproxy:hmset(string_format("globalEmail:%s", gid), 
 				"id", gid,
-				"createtime", email.endTime,
+				"createtime", email.startTime,
 				"title", email.title,
 				"stitle", email.stitle,
 				"content", email.content,
 				"attachments", email.attachments,
 				"endtime", email.endTime,
 				"mid", email.mid,
-				"timestamp", email.startTime
+				"timestamp", now
 			)
 		else
 			redisproxy:hmset(string_format("globalEmail:%s", gid), 
 				"id", gid,
-				"createtime", email.endTime,
+				"createtime", email.startTime,
 				"title", email.title,
 				"stitle", email.stitle,
 				"content", email.content,
 				"attachments", email.attachments,
 				"endtime", email.endTime,
-				"timestamp", email.startTime
+				"timestamp", now
 			)
 		end
 	end
@@ -65,7 +65,7 @@ function CMD.log(doc)
 end
 function CMD.open()
-	log_fd = socketdriver.connect("127.0.0.1", 5170)
+	log_fd = socketdriver.connect("127.0.0.1", 13001)
 	connecting = true
 end