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

jiyue
2 parents 2284b38e 2fdb4d55
Showing 9 changed files with 33 additions and 22 deletions Show diff stats
src/GlobalVar.lua
src/actions/AdvAction.lua
src/actions/GmAction.lua
src/actions/HangAction.lua
src/actions/RoleAction.lua
src/models/Email.lua
src/models/RolePlugin.lua
src/services/dbseed.lua
src/shared/functions.lua
@@ -95,6 +95,7 @@ ItemType = {
 	CommonPaster				= 18, 	-- 万能贴纸
 	BossTicket					= 20, 	-- boss挑战门票
 	Spark						= 21, 	-- 火花
+	Stick 						= 23, 	-- 贴纸
 }
 --在这个里面的会记录的是功能开放 对应类型open 而不是 ID
@@ -514,7 +514,7 @@ function _M.buyAdvCountRpc(agent , data)
 	else
 		--if math.illegalNum(count, 1, globalCsv.adv_daily_buy_count - role.dailyData:getProperty("advBC")) then return end
 		local advCount = (role.dailyData:getProperty("advBC") + count ) * globalCsv.adv_daily_buy_num
-		cost = {[ItemId.Jade] = table.findMinKeyByItem(globalCsv.adv_buy_cost, advCount, globalCsv.adv_daily_buy_num)}
+		cost = {[ItemId.Jade] = table.findMinKeyByIndex(globalCsv.adv_buy_cost, advCount, globalCsv.adv_daily_buy_num)}
 	end
@@ -66,7 +66,7 @@ end
 function _M.silent(role, pms)
 	local pm1 = tonum(pms.pm1, 0)
-    dump(pms, pm1)
+    --dump(pms, pm1)
 	if pm1 < 1 then
 		role:updateProperty({field = "silent", value = 0})
         role:setProperty("silentType", 0)
@@ -478,7 +478,7 @@ function _M.quickRpc(agent , data)
 	local change = globalCsv.idle_quickproduce_time / 3600
 	local curCount = role.dailyData:getProperty("hangQC") + 1
-	local costCount = table.findMinKeyByItem(globalCsv.idle_quickproduce_cost, curCount * change, change)
+	local costCount = table.findMinKeyByIndex(globalCsv.idle_quickproduce_cost, curCount * change, change)
 	if not role:checkItemEnough({[ItemId.Jade] = costCount}) then return 2 end
 	role:costItems({[ItemId.Jade] = costCount}, {log = {desc = "quickHang", int1 = hangInfo.carbonId}})
@@ -575,7 +575,7 @@ function _M.buyBonusCountRpc(agent, data)
 	--if math.illegalNum(count, 1, lastCount)  then return 1 end
 	local costCount = bonusC[btype]["b"] + count
-	local cost = table.findMinKeyByItem(globalCsv.bonus_buy_cost, costCount, 1)
+	local cost = table.findMinKeyByIndex(globalCsv.bonus_buy_cost, costCount, 1)
 	if not role:checkItemEnough({[ItemId.Jade] = cost}) then return 2 end
@@ -83,9 +83,6 @@ function _M.loginRpc( agent, data )
 		end
 	end
-	-- 设备记录
-	redisproxy:sadd(string_format("device:%d", roleId), msg.device)
-
 	local now = skynet.timex()
 	local role = agent.role
 	-- 2
@@ -338,8 +335,14 @@ function _M.loginRpc( agent, data )
 	local hangPass = role:getProperty("hangPass")
 	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]})
+
+	-- 是否是新设备
+	local deviced = cluster.query("center", "deviced")
+	if deviced then
+		local status, back = pcall(cluster.call, "center", deviced, "isNewDevice", {device = msg.device})
+		if status and back  then
+			role:mylog("newdevice", {key1 = agent.ip:toArray(false, ":")[1]})
+		end
 	end
 	return true
@@ -1285,10 +1288,13 @@ function _M.chatRpc(agent, data)
 					red:rpush(CHAT_OFFLINE:format(objectId), bin)
 					red:ltrim(CHAT_OFFLINE:format(objectId), -200, -1)
 				end)
-				-- 若在线，实时发送聊天信息
-				local agent = datacenter.get("agent", objectId)
-				if agent then
-					SendPacket(actionCodes.Role_chat, bin, agent.fd)
+
+				if role:getProperty("silent") < now then  --禁言
+					-- 若在线，实时发送聊天信息
+					local agent = datacenter.get("agent", objectId)
+					if agent then
+						SendPacket(actionCodes.Role_chat, bin, agent.fd)
+					end
 				end
 			end
 			SendPacket(actionCodes.Role_chat, bin)
@@ -1603,7 +1609,7 @@ function _M.useSelectItemRpc(agent, data)
 	local count = msg.count
 	if math.illegalNum(count, 1, role:getItemCount(itemId)) then return end
 	local itemData = csvdb["itemCsv"][itemId]
-	if not (itemData.type == ItemType.SelectItemBox or itemData.type == ItemType.CommonPaster) then return end
+	if not (itemData.type == ItemType.SelectItemBox or itemData.type == ItemType.CommonPaster or itemData.type == ItemType.Stick) then return end
 	local itemMap = itemData.use_effect:toNumMap()
 	local reward, change = {}
 	for k, v in pairs(itemMap) do
@@ -10,7 +10,7 @@ Email.schema = {
     emailId		= {"number", 0},	-- 邮件csv ID
     title 		= {"string", ""},	-- 邮件标题
     stitle		= {"string", ""}, 	-- 小标题
-    content 	= {"string", ""},	-- 邮件正文
+    content 	= {"string", "", 2048},	-- 邮件正文
     attachments	= {"string", "", 512},
     status		= {"number", 0},	-- 邮件状态: 未读, 已读, 已领取
     createtime	= {"number", skynet.timex()},
@@ -494,7 +494,7 @@ function RolePlugin.bind(Role)
 		local originr = self:getProperty("sid") == IOS_SID and self:getProperty("reDiamondIos") or self:getProperty("reDiamond")
 		local origin = origind + originr
 		--if params.isRecharge then
-			if params.sid == IOS_SID then
+			if self:getProperty("sid") == IOS_SID then
 				self:incrProperty("reDiamondIos", count)
 			else
 				self:incrProperty("reDiamond", count)
@@ -266,7 +266,10 @@ local function doUpdateSql()
         },
         [2] = {
             "ALTER TABLE `Rune` MODIFY COLUMN `refer` bigint;"
-        }
+        },
+        [3] = {
+            "ALTER TABLE `Email` MODIFY COLUMN `refer` VARCHAR(2048);"
+        },
     }
 	-- 更新记录表
     local res = mysqlproxy:query("SELECT `value` FROM `autoincrement_set` WHERE `key` = 'db_ver';")
@@ -865,12 +865,13 @@ function table.array2Table(arr)
     return ret
 end
-function table.findMinKeyByItem(t, item, change)
-    if next(t) and not t[item] then
-            item = item - change
-            return table.findMinKeyByItem(t, item, change)
+function table.findMinKeyByIndex(t, index, change)
+    if not next(t or {}) then return nil end
+    if not t[index] then
+            index = index - change
+            return table.findMinKeyByIndex(t, index, change)
     else
-        return t[item]
+        return t[index]
     end
 end