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/MixServerCampaign/MixServerCampaignMail.txt | 70 +++++++++++++++++-----------------
1 files changed, 35 insertions(+), 35 deletions(-)
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/MixServerCampaign/MixServerCampaignMail.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/MixServerCampaign/MixServerCampaignMail.txt
index a0092f8..edb89ee 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/MixServerCampaign/MixServerCampaignMail.txt
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/MixServerCampaign/MixServerCampaignMail.txt
@@ -1,36 +1,36 @@
-# 合服活动奖励邮件
-# -----------------------------------------------------------------------
-#合服活动类型标识
-#Def_MixCampaign_Type_PlayerBattle, # 总战斗力0
-#Def_MixCampaign_Type_RechargeFirst, # 首充奖励1
-#Def_MixCampaign_Type_RechargeRank, # 累计充值排行奖励2
-#Def_MixCampaign_Type_RechargeCnt, # 累计充值保底奖励3
-#Def_MixCampaign_Type_FamilyWar, # 冰封王座家族战获胜家族成员奖励4
-#Def_MixCampaign_Type_FamilyWarEnter, # 冰封王座参与奖5
-#Def_MixCampaign_Type_FamilyKillBoss, # 战盟击杀boss排行6
-#Def_MixCampaign_Type_PlayerKillBoss, # 个人击杀boss7
-# -----------------------------------------------------------------------
-# [邮件标题, 内容, 领奖有效天]
-
-(
-
-[
-
- "<MailTemplate>%s</MailTemplate>[%s]", # 内容, 参数(邮件模板, 领奖条件)
- 7, # 有效天数
-
- # 活动类型对应邮件模板
- {
- 0:49,
- 1:50,
- 2:51,
- 3:52,
- 4:53,
- 5:54,
- 6:55,
- 7:56,
- }
-
-]
-
+# 合服活动奖励邮件
+# -----------------------------------------------------------------------
+#合服活动类型标识
+#Def_MixCampaign_Type_PlayerBattle, # 总战斗力0
+#Def_MixCampaign_Type_RechargeFirst, # 首充奖励1
+#Def_MixCampaign_Type_RechargeRank, # 累计充值排行奖励2
+#Def_MixCampaign_Type_RechargeCnt, # 累计充值保底奖励3
+#Def_MixCampaign_Type_FamilyWar, # 冰封王座家族战获胜家族成员奖励4
+#Def_MixCampaign_Type_FamilyWarEnter, # 冰封王座参与奖5
+#Def_MixCampaign_Type_FamilyKillBoss, # 战盟击杀boss排行6
+#Def_MixCampaign_Type_PlayerKillBoss, # 个人击杀boss7
+# -----------------------------------------------------------------------
+# [邮件标题, 内容, 领奖有效天]
+
+(
+
+[
+
+ "<MailTemplate>%s</MailTemplate>[%s]", # 内容, 参数(邮件模板, 领奖条件)
+ 7, # 有效天数
+
+ # 活动类型对应邮件模板
+ {
+ 0:49,
+ 1:50,
+ 2:51,
+ 3:52,
+ 4:53,
+ 5:54,
+ 6:55,
+ 7:56,
+ }
+
+]
+
)
\ No newline at end of file
--
Gitblit v1.8.0