Project_SG_resourcesout.git

parent: e7555de0 | 补丁 | 提交 | ignore whitespace

Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_resourcesout

hwj35

19 小时以前 4679a359132bf83e2235d151306f2b7eca1ef817

Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_resourcesout

3个文件已修改

	Config/FuncConfig.txt	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Config/Mail.txt	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Config/Store.txt	21 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 Config/FuncConfig.txt

@@ -18,7 +18,7 @@
BillboardSet    []    {0:1000, 1:9999, 2:9999, 3:9999, 4:9999, 6:9999, 7:9999, 8:9999, 9:9999, 10:10000, 150:10000}    {}        

OSABillboard    {"3":[1, 3], "4":[2, 4], "8":[3, 5], "7":[4, 6], "9":[5, 7]}    {"1":[[5,40],[8,800],[3,800],[7,40000],[3002,1]],"2":[[5,30],[8,600],[3,600],[7,30000],[3003,1]],"3":[[5,20],[8,400],[3,400],[7,20000],[3004,1]],"5":[[5,15],[8,300],[3,300],[7,15000]],"10":[[5,10],[8,200],[3,200],[7,10000]],"20":[[5,8],[8,160],[3,160],[7,8000]],"50":[[5,6],[8,120],[3,120],[7,6000]],"100":[[5,4],[8,80],[3,80],[7,4000]],"200":[[5,4],[8,60],[3,60],[7,3000]],"2000":[[5,2],[8,40],[3,40],[7,2000]]}    {"1":[[1005,1],[1001,3],[7,40000],[1,2000],[3005,1]],"2":[[1013,40],[1001,3],[7,30000],[1,1800],[3006,1]],"3":[[1013,30],[1001,2],[7,20000],[1,1500],[3007,1]],"5":[[1013,20],[1001,2],[7,15000],[1,1000]],"10":[[1001,2],[7,10000],[1,800]],"20":[[1001,1],[7,8000],[1,500]],"50":[[1003,1],[7,6000],[1,400]],"100":[[1003,1],[7,4000],[1,200]],"200":[[1002,1],[7,3000],[1,150]],"2000":[[1002,1],[7,2000],[1,100]]}    {"1":[[202,120],[32,120],[200,500],[1,2000],[3011,1]],"2":[[202,100],[32,100],[200,400],[1,1800],[3012,1]],"3":[[202,80],[32,80],[200,300],[1,1500],[3013,1]],"5":[[202,60],[32,60],[200,250],[1,1000]],"10":[[201,100],[32,50],[200,220],[1,800]],"20":[[201,80],[32,40],[200,200],[1,500]],"50":[[201,60],[32,30],[200,180],[1,400]],"100":[[201,40],[32,20],[200,150],[1,200]],"200":[[201,30],[32,10],[200,100],[1,150]],"2000":[[201,20],[32,10],[200,50],[1,100]]}    

OSABillboardTrain    {"7":0.04, "8":10, "9":500, "10":100}    {"1":10, "2":25, "3":50, "4":200, "5":500}    {"1":[[1005,1],[10,100],[8,800],[1,2000],[3008,1]],"2":[[1013,40],[10,80],[8,600],[1,1800],[3009,1]],"3":[[1013,30],[10,60],[8,400],[1,1500],[3010,1]],"5":[[1013,20],[10,50],[8,300],[1,1000]],"10":[[10,40],[8,200],[1,800]],"20":[[10,35],[8,160],[1,500]],"50":[[10,30],[8,120],[1,400]],"100":[[10,20],[8,80],[1,200]],"200":[[10,10],[8,60],[1,150]],"2000":[[10,5],[8,40],[1,100]]}    10|100    {"1":[[31,160],[30,800],[1,2000],[10000,400],[3014,1]],"2":[[31,120],[30,600],[1,1800],[10000,300],[3015,1]],"3":[[31,80],[30,400],[1,1500],[10000,240],[3016,1]],"5":[[31,60],[30,300],[1,1000],[10000,160]],"10":[[31,40],[30,200],[1,800],[10000,100]],"20":[[31,32],[30,160],[1,500],[10000,50]],"50":[[31,24],[30,120],[1,400]],"100":[[31,16],[30,80],[1,200]],"200":[[31,12],[30,60],[1,150]],"2000":[[31,8],[30,40],[1,100]]}

OSACelebration    7    {"2000":[[3,100]],"4000":[[7,20000]],"6000":[[2,20000]],"9000":[[8,200]],"12000":[[1005,1]]}    20		
OSACelebration    7    {"2000":[[3,100]],"5000":[[4807,1]],"8000":[[8,200]],"12000":[[1005,10000]],"15000":[[3503,1]]}    20		
TalkCD    {"0":3,"3":3}                

TalkColor    42|227|55|255    245|246|230|255    {"0":[254,247,234,255], "1":[254,247,234,255], "3":[42,227,55,255], "6":[245,180,234,255]}    245|246|230|255    

TalkLimit    50                


 Config/Mail.txt

@@ -24,6 +24,7 @@
OSABeautyTrain    开服红颜冲榜奖励    恭喜主公在开服红颜冲榜中荣登第<color=#248B12>{0}</color>名，为主公准备的奖励已存放在附件中，请注意及时查收！

OSAMinggeTrain    开服命格冲榜奖励    恭喜主公在开服命格冲榜中荣登第<color=#248B12>{0}</color>名，为主公准备的奖励已存放在附件中，请注意及时查收！

OSACelebrationPoint    庆典积分转换补偿    您在开服庆典活动中未使用的庆典积分已转换为元宝发放，请注意查收。

OSACelebrationPointAwardEx    庆典积分档位奖励补偿    由于开服庆典活动调整了积分档位奖励，现对您已领取的档位进行补偿，请注意查收。

FamilyLeaderAutoChange    公会职位变更提醒    恭喜您成为<color=#248B12>【{0}】</color>的新会长，请带领公会创造辉煌！

LunhuidianUnget    限时冲刺奖励补发    您在限时冲刺中有尚未领取的奖励，现已通过邮件补发，请注意查收！

ActHeroAppearRecycleCall    武将登场招募道具回收    武将登场活动已结束，未使用的招募道具进行回收并转换为元宝，请注意查收。


 Config/Store.txt

@@ -43,15 +43,16 @@
210    3    11    13004    1    []    0    5    0    43    40    0    2    1000    0            

211    3    12    14006    1    []    0    5    0    43    40    0    2    1000    0            

212    3    13    13002    1    []    0    5    0    43    40    0    2    1000    0            

300    5    1    3    5    []    0    50    0    55    20    0    0    0    0			
301    5    2    12    2    []    0    20    0    55    30    0    0    0    0			
302    5    3    2    500    []    0    40    0    55    40    0    0    0    0			
303    5    4    7    1000    []    0    50    0    55    50    0    0    0    0			
304    5    5    8    20    []    0    5    0    55    200    0    0    0    0			
305    5    6    6    3    []    0    5    0    55    300    0    0    0    0			
306    5    7    13    4    []    0    4    0    55    400    0    0    0    0			
307    5    8    5    5    []    0    5    0    55    500    0    0    0    0			
308    5    9    11009    1    []    0    50    0    55    75    0    0    0    0			
300    5    2    3    5    []    0    50    0    55    20    0    0    0    0			
301    5    3    12    2    []    0    20    0    55    30    0    0    0    0			
302    5    4    2    500    []    0    40    0    55    40    0    0    0    0			
303    5    5    7    1000    []    0    25    0    55    50    0    0    0    0			
304    5    6    8    20    []    0    5    0    55    200    0    0    0    0			
305    5    7    6    3    []    0    5    0    55    300    0    0    0    0			
306    5    8    13    4    []    0    4    0    55    400    0    0    0    0			
307    5    9    5    5    []    0    5    0    55    500    0    0    0    0			
308    5    10    11009    1    []    0    50    0    55    75    0    0    0    0			
309    5    1    4510    1    []    0    1    0    55    1250    0    0    0    0			
10001    4    1    3    10    []    1    1    0    1    0    50    0    0    0    招募冲榜免费礼包        

10002    4    2    5    7    []    1    1    0    1    1588    1960    0    0    0    招募冲榜元宝礼包        

10003    17    1    3    10    []    1    1    0    1    0    50    0    0    0    红颜冲榜免费礼包        

@@ -175,7 +176,7 @@
2165    217    5    8    100    []    0    20    609    0    100    0    0    0    0            

2166    217    6    10    10    []    0    10    609    0    200    0    0    0    0            

2167    217    7    9    10    []    0    20    609    0    1000    0    0    0    0            

2180    218    1    510    1    []    1    1    0    0    0    0    0    0    0    免费花枝宝珠礼包		
2180    218    1    510    1    []    1    1    0    0    0    0    0    0    0    免费黄天符令礼包		
2181    219    1    14018    1    []    1    50    610    0    200    0    0    0    0            

2182    219    2    510    10    []    0    2    610    0    300    0    0    0    0            

2183    219    3    5    1    []    0    20    610    0    20    0    0    0    0

			@@ -24,6 +24,7 @@
			OSABeautyTrain 开服红颜冲榜奖励恭喜主公在开服红颜冲榜中荣登第<color=#248B12>{0}</color>名，为主公准备的奖励已存放在附件中，请注意及时查收！
			OSAMinggeTrain 开服命格冲榜奖励恭喜主公在开服命格冲榜中荣登第<color=#248B12>{0}</color>名，为主公准备的奖励已存放在附件中，请注意及时查收！
			OSACelebrationPoint 庆典积分转换补偿您在开服庆典活动中未使用的庆典积分已转换为元宝发放，请注意查收。
			OSACelebrationPointAwardEx 庆典积分档位奖励补偿由于开服庆典活动调整了积分档位奖励，现对您已领取的档位进行补偿，请注意查收。
			FamilyLeaderAutoChange 公会职位变更提醒恭喜您成为<color=#248B12>【{0}】</color>的新会长，请带领公会创造辉煌！
			LunhuidianUnget 限时冲刺奖励补发您在限时冲刺中有尚未领取的奖励，现已通过邮件补发，请注意查收！
			ActHeroAppearRecycleCall 武将登场招募道具回收武将登场活动已结束，未使用的招募道具进行回收并转换为元宝，请注意查收。

			@@ -18,7 +18,7 @@
			BillboardSet [] {0:1000, 1:9999, 2:9999, 3:9999, 4:9999, 6:9999, 7:9999, 8:9999, 9:9999, 10:10000, 150:10000} {}
			OSABillboard {"3":[1, 3], "4":[2, 4], "8":[3, 5], "7":[4, 6], "9":[5, 7]} {"1":[[5,40],[8,800],[3,800],[7,40000],[3002,1]],"2":[[5,30],[8,600],[3,600],[7,30000],[3003,1]],"3":[[5,20],[8,400],[3,400],[7,20000],[3004,1]],"5":[[5,15],[8,300],[3,300],[7,15000]],"10":[[5,10],[8,200],[3,200],[7,10000]],"20":[[5,8],[8,160],[3,160],[7,8000]],"50":[[5,6],[8,120],[3,120],[7,6000]],"100":[[5,4],[8,80],[3,80],[7,4000]],"200":[[5,4],[8,60],[3,60],[7,3000]],"2000":[[5,2],[8,40],[3,40],[7,2000]]} {"1":[[1005,1],[1001,3],[7,40000],[1,2000],[3005,1]],"2":[[1013,40],[1001,3],[7,30000],[1,1800],[3006,1]],"3":[[1013,30],[1001,2],[7,20000],[1,1500],[3007,1]],"5":[[1013,20],[1001,2],[7,15000],[1,1000]],"10":[[1001,2],[7,10000],[1,800]],"20":[[1001,1],[7,8000],[1,500]],"50":[[1003,1],[7,6000],[1,400]],"100":[[1003,1],[7,4000],[1,200]],"200":[[1002,1],[7,3000],[1,150]],"2000":[[1002,1],[7,2000],[1,100]]} {"1":[[202,120],[32,120],[200,500],[1,2000],[3011,1]],"2":[[202,100],[32,100],[200,400],[1,1800],[3012,1]],"3":[[202,80],[32,80],[200,300],[1,1500],[3013,1]],"5":[[202,60],[32,60],[200,250],[1,1000]],"10":[[201,100],[32,50],[200,220],[1,800]],"20":[[201,80],[32,40],[200,200],[1,500]],"50":[[201,60],[32,30],[200,180],[1,400]],"100":[[201,40],[32,20],[200,150],[1,200]],"200":[[201,30],[32,10],[200,100],[1,150]],"2000":[[201,20],[32,10],[200,50],[1,100]]}
			OSABillboardTrain {"7":0.04, "8":10, "9":500, "10":100} {"1":10, "2":25, "3":50, "4":200, "5":500} {"1":[[1005,1],[10,100],[8,800],[1,2000],[3008,1]],"2":[[1013,40],[10,80],[8,600],[1,1800],[3009,1]],"3":[[1013,30],[10,60],[8,400],[1,1500],[3010,1]],"5":[[1013,20],[10,50],[8,300],[1,1000]],"10":[[10,40],[8,200],[1,800]],"20":[[10,35],[8,160],[1,500]],"50":[[10,30],[8,120],[1,400]],"100":[[10,20],[8,80],[1,200]],"200":[[10,10],[8,60],[1,150]],"2000":[[10,5],[8,40],[1,100]]} 10\|100 {"1":[[31,160],[30,800],[1,2000],[10000,400],[3014,1]],"2":[[31,120],[30,600],[1,1800],[10000,300],[3015,1]],"3":[[31,80],[30,400],[1,1500],[10000,240],[3016,1]],"5":[[31,60],[30,300],[1,1000],[10000,160]],"10":[[31,40],[30,200],[1,800],[10000,100]],"20":[[31,32],[30,160],[1,500],[10000,50]],"50":[[31,24],[30,120],[1,400]],"100":[[31,16],[30,80],[1,200]],"200":[[31,12],[30,60],[1,150]],"2000":[[31,8],[30,40],[1,100]]}
			OSACelebration 7 {"2000":[[3,100]],"4000":[[7,20000]],"6000":[[2,20000]],"9000":[[8,200]],"12000":[[1005,1]]} 20
			OSACelebration 7 {"2000":[[3,100]],"5000":[[4807,1]],"8000":[[8,200]],"12000":[[1005,10000]],"15000":[[3503,1]]} 20
			TalkCD {"0":3,"3":3}
			TalkColor 42\|227\|55\|255 245\|246\|230\|255 {"0":[254,247,234,255], "1":[254,247,234,255], "3":[42,227,55,255], "6":[245,180,234,255]} 245\|246\|230\|255
			TalkLimit 50

			@@ -43,15 +43,16 @@
			210 3 11 13004 1 [] 0 5 0 43 40 0 2 1000 0
			211 3 12 14006 1 [] 0 5 0 43 40 0 2 1000 0
			212 3 13 13002 1 [] 0 5 0 43 40 0 2 1000 0
			300 5 1 3 5 [] 0 50 0 55 20 0 0 0 0
			301 5 2 12 2 [] 0 20 0 55 30 0 0 0 0
			302 5 3 2 500 [] 0 40 0 55 40 0 0 0 0
			303 5 4 7 1000 [] 0 50 0 55 50 0 0 0 0
			304 5 5 8 20 [] 0 5 0 55 200 0 0 0 0
			305 5 6 6 3 [] 0 5 0 55 300 0 0 0 0
			306 5 7 13 4 [] 0 4 0 55 400 0 0 0 0
			307 5 8 5 5 [] 0 5 0 55 500 0 0 0 0
			308 5 9 11009 1 [] 0 50 0 55 75 0 0 0 0
			300 5 2 3 5 [] 0 50 0 55 20 0 0 0 0
			301 5 3 12 2 [] 0 20 0 55 30 0 0 0 0
			302 5 4 2 500 [] 0 40 0 55 40 0 0 0 0
			303 5 5 7 1000 [] 0 25 0 55 50 0 0 0 0
			304 5 6 8 20 [] 0 5 0 55 200 0 0 0 0
			305 5 7 6 3 [] 0 5 0 55 300 0 0 0 0
			306 5 8 13 4 [] 0 4 0 55 400 0 0 0 0
			307 5 9 5 5 [] 0 5 0 55 500 0 0 0 0
			308 5 10 11009 1 [] 0 50 0 55 75 0 0 0 0
			309 5 1 4510 1 [] 0 1 0 55 1250 0 0 0 0
			10001 4 1 3 10 [] 1 1 0 1 0 50 0 0 0 招募冲榜免费礼包
			10002 4 2 5 7 [] 1 1 0 1 1588 1960 0 0 0 招募冲榜元宝礼包
			10003 17 1 3 10 [] 1 1 0 1 0 50 0 0 0 红颜冲榜免费礼包
			@@ -175,7 +176,7 @@
			2165 217 5 8 100 [] 0 20 609 0 100 0 0 0 0
			2166 217 6 10 10 [] 0 10 609 0 200 0 0 0 0
			2167 217 7 9 10 [] 0 20 609 0 1000 0 0 0 0
			2180 218 1 510 1 [] 1 1 0 0 0 0 0 0 0 免费花枝宝珠礼包
			2180 218 1 510 1 [] 1 1 0 0 0 0 0 0 0 免费黄天符令礼包
			2181 219 1 14018 1 [] 1 50 610 0 200 0 0 0 0
			2182 219 2 510 10 [] 0 2 610 0 300 0 0 0 0
			2183 219 3 5 1 [] 0 20 610 0 20 0 0 0 0