Merge remote-tracking branch 'origin/cn/develop' into cn/develop

zhangqijia
2 parents 77014b19 f4c12f1b
Showing 4 changed files with 13 additions and 7 deletions Show diff stats
src/actions/GmAction.lua
src/actions/RoleAction.lua
src/models/Email.lua
src/services/dbseed.lua
@@ -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)
@@ -1288,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)
@@ -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()},
@@ -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';")