From 38e1dc1d07a29b14458578861bed94529b1a62d8 Mon Sep 17 00:00:00 2001
From: cehua_LC <tingame100@163.com>
Date: 星期六, 08 十二月 2018 11:53:48 +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/LoginDayAward/LoginDayAward_4.txt |  132 ++++++++++++++++++++++----------------------
 1 files changed, 66 insertions(+), 66 deletions(-)

diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/LoginDayAward/LoginDayAward_4.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/LoginDayAward/LoginDayAward_4.txt
index 15de596..76eb0a8 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/LoginDayAward/LoginDayAward_4.txt
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/LoginDayAward/LoginDayAward_4.txt
@@ -1,67 +1,67 @@
-# 累计登陆对应的奖励物品信息
-# [占用总格子数, {(职业):[对应奖励], (职业):[对应奖励], ...}]
-# 没有配置的职业默认取()职业的奖励
-# 有指定的职业可配置()里,支持多职业如(0,1,2),如果只配一个职业,则必须加一个逗号,如(0,)
-# 职业:0:剑士,1:魔法师,2:弓箭手,3:魔剑士,4:骑士,5:魔导师,6:圣射手
-# 奖励说明:(奖励类型, id, 个数, 绑定为可选)
-# 奖励类型说明:0-普通物品(id为物品id);1-定制装备(id为PyMapTable\AppointItemList.txt中的ItemIndex)
-
-
-(
-	[
-		'', # 提示Mark
-		6, # 占用格子数
-	
-		# 按职业给物品,没有配置的职业则默认取()的物品
-		{
-			# ()如果有配置,则未配置职业的取该物品
-			():[
-				
-				(1,3,1,1),
-				(0,60030,15,1),
-				(0,41070,15,1),
-				(0,43042,15,1),
-				(0,1301,3,1),
-
-				
-				],
-			
-			# 0职业奖励的物品
-			(0,4):[
-				
-				(0,471,1,1),
-				(0,60030,15,1),
-				(0,60000,5,1),
-				(0,41070,15,1),
-				(0,43042,15,1),
-				(0,1301,3,1),
-
-				],
-
-
-			# 1职业奖励的物品
-			(1,5):[
-				
-				(0,471,1,1),
-				(0,60030,15,1),
-				(0,60000,5,1),
-				(0,41070,15,1),
-				(0,43042,15,1),
-				(0,1301,3,1),
-				
-				],
-
-			# 2职业奖励的物品
-			(2,6):[
-				
-				(0,471,1,1),
-				(0,60030,15,1),
-				(0,60000,5,1),
-				(0,41070,15,1),
-				(0,43042,15,1),
-				(0,1301,3,1),
-				
-				],
-		},
-	]
+# 累计登陆对应的奖励物品信息
+# [占用总格子数, {(职业):[对应奖励], (职业):[对应奖励], ...}]
+# 没有配置的职业默认取()职业的奖励
+# 有指定的职业可配置()里,支持多职业如(0,1,2),如果只配一个职业,则必须加一个逗号,如(0,)
+# 职业:0:剑士,1:魔法师,2:弓箭手,3:魔剑士,4:骑士,5:魔导师,6:圣射手
+# 奖励说明:(奖励类型, id, 个数, 绑定为可选)
+# 奖励类型说明:0-普通物品(id为物品id);1-定制装备(id为PyMapTable\AppointItemList.txt中的ItemIndex)
+
+
+(
+	[
+		'', # 提示Mark
+		6, # 占用格子数
+	
+		# 按职业给物品,没有配置的职业则默认取()的物品
+		{
+			# ()如果有配置,则未配置职业的取该物品
+			():[
+				
+				(1,3,1,1),
+				(0,60030,15,1),
+				(0,41070,15,1),
+				(0,43042,15,1),
+				(0,1301,3,1),
+
+				
+				],
+			
+			# 0职业奖励的物品
+			(0,4):[
+				
+				(0,471,1,1),
+				(0,60030,15,1),
+				(0,60000,5,1),
+				(0,41070,15,1),
+				(0,43042,15,1),
+				(0,1301,3,1),
+
+				],
+
+
+			# 1职业奖励的物品
+			(1,5):[
+				
+				(0,471,1,1),
+				(0,60030,15,1),
+				(0,60000,5,1),
+				(0,41070,15,1),
+				(0,43042,15,1),
+				(0,1301,3,1),
+				
+				],
+
+			# 2职业奖励的物品
+			(2,6):[
+				
+				(0,471,1,1),
+				(0,60030,15,1),
+				(0,60000,5,1),
+				(0,41070,15,1),
+				(0,43042,15,1),
+				(0,1301,3,1),
+				
+				],
+		},
+	]
 )
\ No newline at end of file

--
Gitblit v1.8.0