From 8a5822a3e2b2d1c536f01e0b6e006bf3d9727226 Mon Sep 17 00:00:00 2001
From: cehua_LC <tingame100@163.com>
Date: 星期二, 11 十二月 2018 19:45:06 +0800
Subject: [PATCH] Merge branch '1.3' of http://192.168.0.87:10010/r/snxx_server into 1.3

---
 ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/Mail/EventMailInfo.txt |   86 +++++++++++++++++++++---------------------
 1 files changed, 43 insertions(+), 43 deletions(-)

diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/Mail/EventMailInfo.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/Mail/EventMailInfo.txt
index 3bc0591..4977fe6 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/Mail/EventMailInfo.txt
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/Mail/EventMailInfo.txt
@@ -1,44 +1,44 @@
-# 游戏邮件事件记录信息
-# {邮件模板编号:[标题, 简要邮件内容], ...}
-# 注: 仅作为事件记录用，内容不用很详细，看得懂就行，但是邮件内容参数必须一致
-# 不记录的邮件可不配置
-
-(
-
-{
-
-0:["合服投资奖励", "合服周卡投资中还有%s绑钻的收益未及时领取."],
-1:["Boss击败奖励", "击败NPC(%s)输出第%s名奖励!"],
-2:["最后一击奖励", "击败NPC(%s)最后一击奖励!"],
-3:["消费送好礼奖励", "消费%s钻石奖励未领取,邮件补发."],
-4:["充值返利奖励", "充值%s钻石奖励%s未领取,邮件补发."],
-7:["充值排行榜奖励", "%s-%s充值第%s名奖励!"],
-8:["交易所提示", "物品下架时间过久, 自动转发到邮箱."],
-9:["贵族升级补偿", "贵族还有%s绑钻的特权时效未使用,邮件发送补偿."],
-10:["领主霸业奖励", "背包空间不足,邮件发送领主霸业副本奖励."],
-11:["恶魔试炼奖励", "背包空间不足,邮件发送恶魔试炼副本奖励."],
-14:["跨服匹配赛幸运物品", "%s跨服匹配赛中获得幸运物品奖励."],
-15:["跨服匹配赛每日积分奖励", "%s跨服匹配赛每日积分第%s名奖励."],
-16:["跨服匹配赛每周积分奖励", "%s跨服匹配赛每周积分第%s名奖励."],
-17:["跨服匹配赛每周连胜奖励", "%s跨服匹配赛中%s连胜奖励未领取."],
-19:["跨服匹配赛积分奖励", "%s跨服匹配赛%s积分奖励."],
-20:["跨服王者争霸提示", "获得本周王者争霸资格."],
-
-21:["开服活动全民冲级", "全民冲级活动%s级奖励未领取."],
-22:["开服活动击杀boss", "击杀BOSS活动%s次奖励未领取."],
-23:["开服活动战盟争霸", "战盟争霸获胜奖励未领取MemberLV=%s."],
-24:["开服活动英勇试炼", "英勇试炼活动%s层奖励未领取."],
-25:["开服活动强化达人", "强化达人活动%s级奖励未领取."],
-26:["开服活动坐骑阶级", "坐骑阶级活动%s+1阶奖励未领取"],
-27:["开服活动坐骑战力", "坐骑战力活动第%s名奖励."],
-28:["开服活动翅膀等级", "翅膀等级活动%s+1阶奖励未领取."],
-29:["开服活动翅膀战力", "翅膀战力活动第%s名奖励."],
-30:["开服活动宠物战力", "宠物战力活动第%s名奖励."],
-31:["开服活动总战斗力", "人物战力%s奖励未领取."],
-32:["开服活动总战力榜", "人物战力活动第%s名奖励."],
-33:["开服活动宠物阶级", "宠物阶级活动%s+1阶奖励未领取."],
-
-
-}
-
+# 游戏邮件事件记录信息
+# {邮件模板编号:[标题, 简要邮件内容], ...}
+# 注: 仅作为事件记录用，内容不用很详细，看得懂就行，但是邮件内容参数必须一致
+# 不记录的邮件可不配置
+
+(
+
+{
+
+0:["合服投资奖励", "合服周卡投资中还有%s绑钻的收益未及时领取."],
+1:["Boss击败奖励", "击败NPC(%s)输出第%s名奖励!"],
+2:["最后一击奖励", "击败NPC(%s)最后一击奖励!"],
+3:["消费送好礼奖励", "消费%s钻石奖励未领取,邮件补发."],
+4:["充值返利奖励", "充值%s钻石奖励%s未领取,邮件补发."],
+7:["充值排行榜奖励", "%s-%s充值第%s名奖励!"],
+8:["交易所提示", "物品下架时间过久, 自动转发到邮箱."],
+9:["贵族升级补偿", "贵族还有%s绑钻的特权时效未使用,邮件发送补偿."],
+10:["领主霸业奖励", "背包空间不足,邮件发送领主霸业副本奖励."],
+11:["恶魔试炼奖励", "背包空间不足,邮件发送恶魔试炼副本奖励."],
+14:["跨服匹配赛幸运物品", "%s跨服匹配赛中获得幸运物品奖励."],
+15:["跨服匹配赛每日积分奖励", "%s跨服匹配赛每日积分第%s名奖励."],
+16:["跨服匹配赛每周积分奖励", "%s跨服匹配赛每周积分第%s名奖励."],
+17:["跨服匹配赛每周连胜奖励", "%s跨服匹配赛中%s连胜奖励未领取."],
+19:["跨服匹配赛积分奖励", "%s跨服匹配赛%s积分奖励."],
+20:["跨服王者争霸提示", "获得本周王者争霸资格."],
+
+21:["开服活动全民冲级", "全民冲级活动%s级奖励未领取."],
+22:["开服活动击杀boss", "击杀BOSS活动%s次奖励未领取."],
+23:["开服活动战盟争霸", "战盟争霸获胜奖励未领取MemberLV=%s."],
+24:["开服活动英勇试炼", "英勇试炼活动%s层奖励未领取."],
+25:["开服活动强化达人", "强化达人活动%s级奖励未领取."],
+26:["开服活动坐骑阶级", "坐骑阶级活动%s+1阶奖励未领取"],
+27:["开服活动坐骑战力", "坐骑战力活动第%s名奖励."],
+28:["开服活动翅膀等级", "翅膀等级活动%s+1阶奖励未领取."],
+29:["开服活动翅膀战力", "翅膀战力活动第%s名奖励."],
+30:["开服活动宠物战力", "宠物战力活动第%s名奖励."],
+31:["开服活动总战斗力", "人物战力%s奖励未领取."],
+32:["开服活动总战力榜", "人物战力活动第%s名奖励."],
+33:["开服活动宠物阶级", "宠物阶级活动%s+1阶奖励未领取."],
+
+
+}
+
 )
\ No newline at end of file

--
Gitblit v1.8.0