~admin/snxx_server.git

parent: 23304a8b | 补丁 | 提交 | ignore whitespace

Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server

cehua_LC

2018-10-22 d85f4593596d6d74bdcee4463b050a0351b6ac99

Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server

15个文件已修改

	CoreServerGroup/GameServer/PySysDB/tagActFlashGiftbag.txt	60 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	CoreServerGroup/GameServer/PySysDB/tagQuestionBank.txt	109 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_DuJie.pyc	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_QueenRelics.pyc	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTJG.pyc	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/BuffSkill.pyc	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuffEffMng.pyc	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/SkillShell.pyc	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	db/PyMongoDataServer/PySysDB/tagActFlashGiftbag.txt	60 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	db/PyMongoDataServer/PySysDB/tagFlashGiftbag.txt	12 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	db/PyMongoDataServer/PySysDB/tagFuncConfig.txt	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	db/PyMongoDataServer/PySysDB/tagStore.txt	20 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	db/PyMongoDataServer/SysDB/tagChinItem.txt	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 CoreServerGroup/GameServer/PySysDB/tagActFlashGiftbag.txt

@@ -1,30 +1,32 @@
CfgID    ActMark    ServerIDList    StartDate    EndDate    StartTime    EndTime    AdvanceMinutes    NotifyInfoStart    NotifyInfoEnd    NotifyInfoLoop    LimitLV    IsDayReset

1    OpenServer01    []    3    4            120    {0:["LimitGift1",[]]}    {-60:["LimitGift2",[]]}    [120, "LimitGift1"]    50    0

2    OpenServer02    []    5    6            0    {0:["LimitGift1",[]]}    {-60:["LimitGift2",[]]}    [120, "LimitGift1"]    50    0

3    OpenServer03    []    7    8            0    {0:["LimitGift1",[]]}    {-60:["LimitGift2",[]]}    [120, "LimitGift1"]    50    0

4    OpenServer04    []    9    10            0    {0:["LimitGift1",[]]}    {-60:["LimitGift2",[]]}    [120, "LimitGift1"]    50    0

5    NationalDay    []    2018-9-1    2018-9-3            120    {0:["LimitGift1",[]]}    {-30:["LimitGift2",[]]}    [30, "LimitGift2"]    50    1

6    NationalDay    [(1,10), (100, 110), 120]    2018-9-1    2018-9-3    12:00|18:00    13:00|19:00    120    {0:["LimitGift1",[]]}    {-30:["LimitGift2",[]]}    [240, "LimitGift2"]    50    1

7    1OpenServer01    [7001]    2018-9-7    2018-9-7            120    {0:["LimitGift1",[]]}    {-60:["LimitGift2",[]]}    []    50    1

8    1OpenServer02    [7001]    2018-9-9    2018-9-9            120    {0:["LimitGift1",[]]}    {-60:["LimitGift2",[]]}    []    50    1

9    1OpenServer03    [7001]    2018-9-11    2018-9-11            120    {0:["LimitGift1",[]]}    {-60:["LimitGift2",[]]}    []    50    1

10    1OpenServer04    [7001]    2018-9-12    2018-9-12            120    {0:["LimitGift1",[]]}    {-60:["LimitGift2",[]]}    []    180    1

11    1OpenServer05    [7001]    2018-9-15    2018-9-15            120    {0:["LimitGift1",[]]}    {-60:["LimitGift2",[]]}    []    280    1

12    2OpenServer01    [7002]    2018-9-8    2018-9-8            120    {0:["LimitGift1",[]]}    {-60:["LimitGift2",[]]}    []    50    1

13    2OpenServer02    [7002]    2018-9-10    2018-9-10            120    {0:["LimitGift1",[]]}    {-60:["LimitGift2",[]]}    []    50    1

14    2OpenServer03    [7002]    2018-9-12    2018-9-12            120    {0:["LimitGift1",[]]}    {-60:["LimitGift2",[]]}    []    50    1

15    2OpenServer04    [7002]    2018-9-13    2018-9-13            120    {0:["LimitGift1",[]]}    {-60:["LimitGift2",[]]}    []    180    1

16    2OpenServer05    [7002]    2018-9-16    2018-9-16            120    {0:["LimitGift1",[]]}    {-60:["LimitGift2",[]]}    []    280    1

17    3OpenServer01    [7003]    2018-9-12    2018-9-12            120    {0:["LimitGift1",[]]}    {-60:["LimitGift2",[]]}    []    50    1

18    3OpenServer02    [7003]    2018-9-14    2018-9-14            120    {0:["LimitGift1",[]]}    {-60:["LimitGift2",[]]}    []    50    1

19    3OpenServer03    [7003]    2018-9-16    2018-9-16            120    {0:["LimitGift1",[]]}    {-60:["LimitGift2",[]]}    []    50    1

20    3OpenServer04    [7003]    2018-9-17    2018-9-17            120    {0:["LimitGift1",[]]}    {-60:["LimitGift2",[]]}    []    180    1

21    3OpenServer05    [7003]    2018-9-20    2018-9-20            120    {0:["LimitGift1",[]]}    {-60:["LimitGift2",[]]}    []    280    1

22    NationalDay01    [(7001,7003), (8002, 8004)]    2018-10-1    2018-10-1            120    {0:["LimitGift1",[]]}    {-60:["LimitGift2",[]]}    [120, "LimitGift1"]    110    0

23    NationalDay02    [(7001,7003), (8002, 8004)]    2018-10-2    2018-10-2                {0:["LimitGift1",[]]}    {-60:["LimitGift2",[]]}    [120, "LimitGift1"]    110    0

24    NationalDay03    [(7001,7003), (8002, 8004)]    2018-10-3    2018-10-3                {0:["LimitGift1",[]]}    {-60:["LimitGift2",[]]}    [120, "LimitGift1"]    110    0

25    NationalDay04    [(7001,7003), (8002, 8004)]    2018-10-4    2018-10-4                {0:["LimitGift1",[]]}    {-60:["LimitGift2",[]]}    [120, "LimitGift1"]    110    0

26    NationalDay05    [(7001,7003), (8002, 8004)]    2018-10-5    2018-10-5                {0:["LimitGift1",[]]}    {-60:["LimitGift2",[]]}    [120, "LimitGift1"]    110    0

27    NationalDay06    [(7001,7003), (8002, 8004)]    2018-10-6    2018-10-6                {0:["LimitGift1",[]]}    {-60:["LimitGift2",[]]}    [120, "LimitGift1"]    110    0

28    NationalDay07    [(7001,7003), (8002, 8004)]    2018-10-7    2018-10-7                {0:["LimitGift1",[]]}    {-60:["LimitGift2",[]]}    [120, "LimitGift1"]    110    0

29    NationalDay08    [(7001,7003), (8002, 8004)]    2018-10-8    2018-10-8                {0:["LimitGift1",[]]}    {-60:["LimitGift2",[]]}    [120, "LimitGift1"]    110    0

1    OpenServer01    []    2    3            120    {0:["LimitGift1",[]]}    {-60:["LimitGift2",[]]}    [120, "LimitGift1"]    50    0

2    OpenServer02    []    4    4            0    {0:["LimitGift1",[]]}    {-60:["LimitGift2",[]]}    [120, "LimitGift1"]    50    0

3    OpenServer03    []    5    5            0    {0:["LimitGift1",[]]}    {-60:["LimitGift2",[]]}    [120, "LimitGift1"]    50    0

4    OpenServer04    []    6    6            0    {0:["LimitGift1",[]]}    {-60:["LimitGift2",[]]}    [120, "LimitGift1"]    50    0

5    OpenServer05    []    7    7            0    {0:["LimitGift1",[]]}    {-60:["LimitGift2",[]]}    [120, "LimitGift1"]    50    0

5    OpenServer06    []    9    10            120    {0:["LimitGift1",[]]}    {-60:["LimitGift2",[]]}    [120, "LimitGift1"]    50    0

7    NationalDay    []    2018-9-1    2018-9-3            120    {0:["LimitGift1",[]]}    {-30:["LimitGift2",[]]}    [30, "LimitGift2"]    50    1

8    NationalDay    [(1,10), (100, 110), 120]    2018-9-1    2018-9-3    12:00|18:00    13:00|19:00    120    {0:["LimitGift1",[]]}    {-30:["LimitGift2",[]]}    [240, "LimitGift2"]    50    1

9    1OpenServer01    [7001]    2018-9-7    2018-9-7            120    {0:["LimitGift1",[]]}    {-60:["LimitGift2",[]]}    []    50    1

10    1OpenServer02    [7001]    2018-9-9    2018-9-9            120    {0:["LimitGift1",[]]}    {-60:["LimitGift2",[]]}    []    50    1

11    1OpenServer03    [7001]    2018-9-11    2018-9-11            120    {0:["LimitGift1",[]]}    {-60:["LimitGift2",[]]}    []    50    1

12    1OpenServer04    [7001]    2018-9-12    2018-9-12            120    {0:["LimitGift1",[]]}    {-60:["LimitGift2",[]]}    []    180    1

13    1OpenServer05    [7001]    2018-9-15    2018-9-15            120    {0:["LimitGift1",[]]}    {-60:["LimitGift2",[]]}    []    280    1

14    2OpenServer01    [7002]    2018-9-8    2018-9-8            120    {0:["LimitGift1",[]]}    {-60:["LimitGift2",[]]}    []    50    1

15    2OpenServer02    [7002]    2018-9-10    2018-9-10            120    {0:["LimitGift1",[]]}    {-60:["LimitGift2",[]]}    []    50    1

16    2OpenServer03    [7002]    2018-9-12    2018-9-12            120    {0:["LimitGift1",[]]}    {-60:["LimitGift2",[]]}    []    50    1

17    2OpenServer04    [7002]    2018-9-13    2018-9-13            120    {0:["LimitGift1",[]]}    {-60:["LimitGift2",[]]}    []    180    1

18    2OpenServer05    [7002]    2018-9-16    2018-9-16            120    {0:["LimitGift1",[]]}    {-60:["LimitGift2",[]]}    []    280    1

19    3OpenServer01    [7003]    2018-9-12    2018-9-12            120    {0:["LimitGift1",[]]}    {-60:["LimitGift2",[]]}    []    50    1

20    3OpenServer02    [7003]    2018-9-14    2018-9-14            120    {0:["LimitGift1",[]]}    {-60:["LimitGift2",[]]}    []    50    1

21    3OpenServer03    [7003]    2018-9-16    2018-9-16            120    {0:["LimitGift1",[]]}    {-60:["LimitGift2",[]]}    []    50    1

22    3OpenServer04    [7003]    2018-9-17    2018-9-17            120    {0:["LimitGift1",[]]}    {-60:["LimitGift2",[]]}    []    180    1

23    3OpenServer05    [7003]    2018-9-20    2018-9-20            120    {0:["LimitGift1",[]]}    {-60:["LimitGift2",[]]}    []    280    1

24    NationalDay01    [(7001,7003), (8002, 8004)]    2018-10-1    2018-10-1            120    {0:["LimitGift1",[]]}    {-60:["LimitGift2",[]]}    [120, "LimitGift1"]    110    0

25    NationalDay02    [(7001,7003), (8002, 8004)]    2018-10-2    2018-10-2                {0:["LimitGift1",[]]}    {-60:["LimitGift2",[]]}    [120, "LimitGift1"]    110    0

26    NationalDay03    [(7001,7003), (8002, 8004)]    2018-10-3    2018-10-3                {0:["LimitGift1",[]]}    {-60:["LimitGift2",[]]}    [120, "LimitGift1"]    110    0

27    NationalDay04    [(7001,7003), (8002, 8004)]    2018-10-4    2018-10-4                {0:["LimitGift1",[]]}    {-60:["LimitGift2",[]]}    [120, "LimitGift1"]    110    0

28    NationalDay05    [(7001,7003), (8002, 8004)]    2018-10-5    2018-10-5                {0:["LimitGift1",[]]}    {-60:["LimitGift2",[]]}    [120, "LimitGift1"]    110    0

29    NationalDay06    [(7001,7003), (8002, 8004)]    2018-10-6    2018-10-6                {0:["LimitGift1",[]]}    {-60:["LimitGift2",[]]}    [120, "LimitGift1"]    110    0

30    NationalDay07    [(7001,7003), (8002, 8004)]    2018-10-7    2018-10-7                {0:["LimitGift1",[]]}    {-60:["LimitGift2",[]]}    [120, "LimitGift1"]    110    0

31    NationalDay08    [(7001,7003), (8002, 8004)]    2018-10-8    2018-10-8                {0:["LimitGift1",[]]}    {-60:["LimitGift2",[]]}    [120, "LimitGift1"]    110    0


 CoreServerGroup/GameServer/PySysDB/tagQuestionBank.txt

@@ -30,7 +30,7 @@
29    ['无毒不丈夫']

30    ['上海']

31    ['调虎离山']

32    ['汉族']

32    ['汉族','汉']

33    ['拿人家的手短']

34    ['丈夫']

35    ['胡萝卜']

@@ -47,7 +47,7 @@
46    ['活到九十九','活到99']

47    ['汉界']

48    ['左']

49    ['美国']

49    ['美国','美']

50    ['一百年不许变']

51    ['孙悟空']

52    ['杭州']

@@ -65,11 +65,11 @@
64    ['任贤齐']

65    ['深圳']

66    ['长江']

67    ['老鼠']

68    ['老虎']

69    ['风力']

67    ['老鼠','鼠']

68    ['老虎','虎']

69    ['风力','风']

70    ['曹植']

71    ['亚洲']

71    ['亚洲','亚']

72    ['二十岁','20','20岁']

73    ['荔枝']

74    ['宙斯']

@@ -79,16 +79,16 @@
78    ['凤毛麟角']

79    ['冰雨']

80    ['李莲英']

81    ['菊花']

81    ['菊花','菊']

82    ['牡丹']

83    ['桃子']

83    ['桃子','桃']

84    ['尾巴']

85    ['包子']

86    ['鸽子']

87    ['骆驼']

88    ['芭蕾舞']

89    ['一万年']

90    ['大象']

90    ['大象','象']

91    ['眼睛']

92    ['蜡烛']

93    ['我爱你']

@@ -100,23 +100,23 @@
99    ['蟑螂']

100    ['植物大战僵尸']

101    ['亲']

102    ['哭']

102    ['哭','哭泣','难受']

103    ['龙凤胎']

104    ['乒乓球','乒乓']

105    ['快乐崇拜']

106    ['大象','象']

107    ['狼']

108    ['诸葛亮']

108    ['诸葛亮','诸葛孔明']

109    ['万里长城','长城']

110    ['霍比特人']

111    ['猪八戒','天蓬元帅']

112    ['关羽']

112    ['关羽','关云长']

113    ['长白山']

114    ['马']

115    ['烟囱']

116    ['黑白']

117    ['老虎','虎']

118    ['黑色']

118    ['黑色,'黑'']

119    ['龙']

120    ['苏州']

121    ['酸']

@@ -129,11 +129,11 @@
128    ['长春']

129    ['绿色','绿']

130    ['三亚']

131    ['法国']

131    ['法国','法']

132    ['乔布斯']

133    ['青海']

134    ['藏族']

135    ['川菜']

134    ['藏族','藏']

135    ['川菜','川']

136    ['花木兰']

137    ['反正有大把时光']

138    ['你的笑容已泛黄']

@@ -155,7 +155,7 @@
154    ['数学']

155    ['狐狸']

156    ['摸不得']

157    ['变大']

157    ['变大','大']

158    ['京杭大运河']

159    ['重阳节']

160    ['兰州拉面']

@@ -177,7 +177,7 @@
176    ['林黛玉']

177    ['对']

178    ['丹麦']

179    ['泰国']

179    ['泰国','泰']

180    ['李时珍']

181    ['成吉思汗']

182    ['安徽']

@@ -189,8 +189,8 @@
188    ['对']

189    ['今晚吃鸡']

190    ['新闻联播']

191    ['29']

192    ['T']

191    ['29','二十九']

192    ['T','t']

193    ['直鱼钩']

194    ['广州']

195    ['将进酒']

@@ -198,20 +198,20 @@
197    ['金']

198    ['精忠报国']

199    ['119']

200    ['4']

200    ['4','四']

201    ['施耐庵']

202    ['宋朝']

203    ['隋朝']

202    ['宋朝','宋']

203    ['隋朝','隋']

204    ['何事秋风悲画扇']

205    ['武则天']

206    ['赣']

207    ['爆炸']

208    ['秦国']

208    ['秦国','秦']

209    ['太阳']

210    ['肝脏']

211    ['小肠']

212    ['隋朝']

213    ['三']

212    ['隋朝','隋']

213    ['三','3']

214    ['勾践']

215    ['东北虎']

216    ['丹麦']

@@ -228,38 +228,35 @@
227    ['笔墨纸砚']

228    ['国风']

229    ['86']

230    ['三十']

230    ['三十','30']

231    ['唐伯虎']

232    ['围棋']

233    ['五十岁']

234    ['孔子的弟子']

234    ['孔子的弟子','孔子弟子']

235    ['老舍']

236    ['明史']

237    ['牲口圈']

238    ['逗号']

239    ['杜甫']

240    ['不识好人心']

241    ['摸不得']

242    ['清明']

243    ['新疆']

244    ['琵琶']

245    ['歌德']

246    ['老子']

247    ['孔子']

248    ['水浒传']

249    ['出使去楚国']

250    ['³Ѹ']

251    ['永乐大典']

252    ['木兰辞']

253    ['关羽']

254    ['杜甫']

255    ['妻子']

256    ['观沧海']

257    ['六月飞雪']

258    ['望庐山瀑布']

259    ['白居易']

260    ['王羲之']

261    ['贵州']

262    ['匡衡']

263    ['诸葛亮']

264    ['儒家']

237    ['逗号']

238    ['杜甫']

239    ['不识好人心']

240    ['摸不得']

241    ['清明']

242    ['新疆']

243    ['琵琶']

244    ['歌德']

245    ['老子']

246    ['孔子']

247    ['水浒传']

248    ['³Ѹ']

249    ['永乐大典']

250    ['木兰辞']

251    ['关羽']

252    ['杜甫']

253    ['妻子',,'老婆']

254    ['观沧海']

255    ['望庐山瀑布']

256    ['白居易']

257    ['王羲之']

258    ['贵州']

259    ['匡衡']

260    ['诸葛亮']

261    ['儒家','儒']


 ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_DuJie.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_QueenRelics.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTJG.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/BuffSkill.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuffEffMng.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/SkillShell.pyc

Binary files differ

 db/PyMongoDataServer/PySysDB/tagActFlashGiftbag.txt

@@ -1,30 +1,32 @@
CfgID    StartDate    EndDate    StartTime    EndTime    AdvanceMinutes    LimitLV    IsDayReset    GiftbagList    MailKey    MailItemPrize

1    3    4            120    50    0    [[6]]    SellMail4	
2    5    6            0    50    0    [[7]]    SellMail4	
3    7    8            0    50    0    [[8]]    SellMail4	
4    9    10            0    50    0    [[9]]    SellMail4	
5    2018-9-1    2018-9-3            120    50    1    [[1,2,3]]    SellMail4    [[13,2,1],[2,2,1]]

6    2018-9-1    2018-9-3    12:00|18:00    13:00|19:00    120    50    1    [[3]]    SellMail4    [[13,2,1],[2,2,1]]

7    2018-9-7    2018-9-7            120    50    1    [[2]]    SellMail4    [[13,2,1],[2,2,1]]

8    2018-9-9    2018-9-9            120    50    1    [[4]]    SellMail4    [[13,2,1],[2,2,1]]

9    2018-9-11    2018-9-11            120    50    1    [[1]]    SellMail4    [[13,2,1],[2,2,1]]

10    2018-9-12    2018-9-12            120    180    1    [[3]]    SellMail4    [[13,2,1],[2,2,1]]

11    2018-9-15    2018-9-15            120    280    1    [[5]]    SellMail4    [[13,2,1],[2,2,1]]

12    2018-9-8    2018-9-8            120    50    1    [[2]]    SellMail4    [[13,2,1],[2,2,1]]

13    2018-9-10    2018-9-10            120    50    1    [[4]]    SellMail4    [[13,2,1],[2,2,1]]

14    2018-9-12    2018-9-12            120    50    1    [[1]]    SellMail4    [[13,2,1],[2,2,1]]

15    2018-9-13    2018-9-13            120    180    1    [[3]]    SellMail4    [[13,2,1],[2,2,1]]

16    2018-9-16    2018-9-16            120    280    1    [[5]]    SellMail4    [[13,2,1],[2,2,1]]

17    2018-9-12    2018-9-12            120    50    1    [[2]]    SellMail4    [[13,2,1],[2,2,1]]

18    2018-9-14    2018-9-14            120    50    1    [[4]]    SellMail4    [[13,2,1],[2,2,1]]

19    2018-9-16    2018-9-16            120    50    1    [[1]]    SellMail4    [[13,2,1],[2,2,1]]

20    2018-9-17    2018-9-17            120    180    1    [[3]]    SellMail4    [[13,2,1],[2,2,1]]

21    2018-9-20    2018-9-20            120    280    1    [[5]]    SellMail4    [[13,2,1],[2,2,1]]

22    2018-10-1    2018-10-1            120    110    0    [[9]]    SellMail4	
23    2018-10-2    2018-10-2                110    0    [[10]]    SellMail4	
24    2018-10-3    2018-10-3                110    0    [[13]]    SellMail4	
25    2018-10-4    2018-10-4                110    0    [[10]]    SellMail4	
26    2018-10-5    2018-10-5                110    0    [[8]]    SellMail4	
27    2018-10-6    2018-10-6                110    0    [[11]]    SellMail4	
28    2018-10-7    2018-10-7                110    0    [[14]]    SellMail4	
29    2018-10-8    2018-10-8                110    0    [[12]]    SellMail4	
1    2    3            120    50    0    [[9]]    SellMail4	
2    4    4            0    50    0    [[6]]    SellMail4	
3    5    5            0    50    0    [[3]]    SellMail4	
4    6    6            0    50    0    [[7]]    SellMail4	
5    7    7            0    50    0    [[8]]    SellMail4	
5    9    10            120    50    0    [[4]]    SellMail4	
7    2018-9-1    2018-9-3            120    50    1    [[1,2,3]]    SellMail4    [[13,2,1],[2,2,1]]

8    2018-9-1    2018-9-3    12:00|18:00    13:00|19:00    120    50    1    [[3]]    SellMail4    [[13,2,1],[2,2,1]]

9    2018-9-7    2018-9-7            120    50    1    [[2]]    SellMail4    [[13,2,1],[2,2,1]]

10    2018-9-9    2018-9-9            120    50    1    [[4]]    SellMail4    [[13,2,1],[2,2,1]]

11    2018-9-11    2018-9-11            120    50    1    [[1]]    SellMail4    [[13,2,1],[2,2,1]]

12    2018-9-12    2018-9-12            120    180    1    [[3]]    SellMail4    [[13,2,1],[2,2,1]]

13    2018-9-15    2018-9-15            120    280    1    [[5]]    SellMail4    [[13,2,1],[2,2,1]]

14    2018-9-8    2018-9-8            120    50    1    [[2]]    SellMail4    [[13,2,1],[2,2,1]]

15    2018-9-10    2018-9-10            120    50    1    [[4]]    SellMail4    [[13,2,1],[2,2,1]]

16    2018-9-12    2018-9-12            120    50    1    [[1]]    SellMail4    [[13,2,1],[2,2,1]]

17    2018-9-13    2018-9-13            120    180    1    [[3]]    SellMail4    [[13,2,1],[2,2,1]]

18    2018-9-16    2018-9-16            120    280    1    [[5]]    SellMail4    [[13,2,1],[2,2,1]]

19    2018-9-12    2018-9-12            120    50    1    [[2]]    SellMail4    [[13,2,1],[2,2,1]]

20    2018-9-14    2018-9-14            120    50    1    [[4]]    SellMail4    [[13,2,1],[2,2,1]]

21    2018-9-16    2018-9-16            120    50    1    [[1]]    SellMail4    [[13,2,1],[2,2,1]]

22    2018-9-17    2018-9-17            120    180    1    [[3]]    SellMail4    [[13,2,1],[2,2,1]]

23    2018-9-20    2018-9-20            120    280    1    [[5]]    SellMail4    [[13,2,1],[2,2,1]]

24    2018-10-1    2018-10-1            120    110    0    [[9]]    SellMail4	
25    2018-10-2    2018-10-2                110    0    [[10]]    SellMail4	
26    2018-10-3    2018-10-3                110    0    [[13]]    SellMail4	
27    2018-10-4    2018-10-4                110    0    [[10]]    SellMail4	
28    2018-10-5    2018-10-5                110    0    [[8]]    SellMail4	
29    2018-10-6    2018-10-6                110    0    [[11]]    SellMail4	
30    2018-10-7    2018-10-7                110    0    [[14]]    SellMail4	
31    2018-10-8    2018-10-8                110    0    [[12]]    SellMail4	

 db/PyMongoDataServer/PySysDB/tagFlashGiftbag.txt

@@ -1,13 +1,13 @@
GiftbagID    GiftbagType    OriginalRMB    BuyCountLimit    GiftItemList    MainItemID    NotifyKey

2    1    88    1    [(196,1,0)]    196    LimitGift3

4    2    130    1    [(913,1,0),(181,80,0)]    913    LimitGift3

5    3    200    1    [(7002,1,0),(4608,2,0)]    7002    LimitGift3

7    4    320    1    [(4214,1,0),(4151,200,0)]    4214    LimitGift3

5    3    260    1    [(7002,1,0),(4608,2,0)]    7002    LimitGift3

7    4    360    1    [(4214,1,0),(4151,200,0)]    4214    LimitGift3

8    5    600    1    [(4606,2,0),(4607,2,0)]    4606    LimitGift3

4    6    70    1    [(4215,1,1),(4151,40,1)]    4215    LimitGift3

5    7    210    1    [(263,1,1),(181,80,1)]    263    LimitGift3

5    8    140    1    [(4220,1,1),(4151,80,1)]    4220    LimitGift3

8    9    360    1    [(262,1,1),(181,200,1)]    262    LimitGift3

4    6    110    1    [(4215,1,1),(4151,80,1)]    4215    LimitGift3

5    7    190    1    [(263,1,1),(181,100,1)]    263    LimitGift3

5    8    180    1    [(4220,1,1),(4151,100,1)]    4220    LimitGift3

8    9    440    1    [(262,1,1),(181,240,1)]    262    LimitGift3

2    10    25    1    [(8353,2,1),(912,1,1),(142,50,1)]    8353    LimitGift3

2    11    40    1    [(8353,2,1),(4010,2,1),(143,30,1)]    8353    LimitGift3

2    12    25    1    [(8353,2,1),(2213,3,1),(143,30,1)]    8353    LimitGift3


 db/PyMongoDataServer/PySysDB/tagFuncConfig.txt

@@ -289,7 +289,7 @@
CeremonyRecharge    {"1":[[4184,1,1],[2392,1,1],[912,1,1],[1145,5,1],[4609,1,1]],"2":[[4184,1,1],[2392,1,1],[912,1,1],[1145,5,1],[4609,1,1]]}                

CeremonyFireParty    {"0":801,"1":802,"2":803}                

CeremonyRankLimit    3280                

TJDropTaskItem    {20007:[120,1104,50,'int(killCnt/25000)+min(max(killCnt-int(killCnt/25000)*25000-random.randint(1,25000),0),1)']}				
TJDropTaskItem    {}				
SuperGiftTimeList    [[651,2],[652,2],[653,2]]    []            

OSSaleOpenMail    [1,2,3,4,5,6,7]    []            

FairyGrabBossID    [50103001,50103002,50103003,50103004,50103005,50103006,50103007]    [[26,14000,1]]    -60        

@@ -297,3 +297,4 @@
SamboSpecialUnlock    9001|9002|9003|9004|9005|9006|9007|9008|9009|9010|9011|9012|9013|9014|9015|9016|9017|9018                

BindJadeWheelCfg    88    {"1":110,"2":300,"3":150,"4":200,"5":300,"6":150,"7":130,"8":200,"9":588}    [(3879,1),(3889,2),(4889,3),(5189,4),(5199,5),(6199,6),(9699,7),(9999,8),(10000,9)]    {1:[(6000,3),(10000,4)],30:[(10000,9)]}    [[12.0,67.4],[67.4,103.0],[103.0,148.1],[148.1,186.2],[186.2,221.8],[221.8,267.0],[267.0,311.7],[311.7,348],[348,372]]

BindJadeWheelNotice    150                

WishingWellCfg    7200    refreshCnt+10    8    5	

 db/PyMongoDataServer/PySysDB/tagStore.txt

@@ -122,16 +122,16 @@
702    15    0    4185    1    1    []    4185        0    0    106    1    0    1    288    800    1    OpenTakePreferential2    

703    15    0    2343    1    1    []    0        0    0    106    1    0    1    88    380    2    OpenTakePreferential1    

704    15    0    2344    1    1    []    2344        0    0    106    1    0    1    288    1000    2    OpenTakePreferential2    

705    15    0    800    1    1    []    800        0    0    106    1    0    1    88    240    3    OpenTakePreferential1	
706    15    0    801    1    1    [[913,1,1]]    801        0    0    106    1    0    1    288    700    3    OpenTakePreferential2	
707    15    0    3514    1    1    [[3504,1,1]]    0        0    0    106    1    0    1    88    360    4    OpenTakePreferential1	
708    15    0    3515    1    1    [[3505,1,1]]    3514        0    0    106    1    0    1    288    1080    4    OpenTakePreferential2	
709    15    0    912    1    1    [[18,1,1]]    912        0    0    106    1    0    1    88    250    5    OpenTakePreferential1	
710    15    0    913    1    1    [[15,1,1]]    913        0    0    106    1    0    1    388    888    5    OpenTakePreferential2	
711    15    0    2213    20    1    []    0        0    0    106    1    0    1    88    250    6    OpenTakePreferential1	
712    15    0    1128    1    1    [[2213,60,1]]    1128        0    0    106    1    0    1    388    1000    6    OpenTakePreferential2	
713    15    0    852    1    1    []    0        0    0    106    1    0    1    188    388    7    OpenTakePreferential1	
714    15    0    4606    1    1    [[4608,2,1]]    4606        0    0    106    1    0    1    688    2000    7    OpenTakePreferential2	
705    15    0    9    1    1    [[142,300,1]]    142        0    0    106    1    0    1    188    750    3    OpenTakePreferential1	
706    15    0    6    2    1    [[913,2,1]]    913        0    0    106    1    0    1    488    1800    3    OpenTakePreferential2	
707    15    0    3514    2    1    [[3504,2,1]]    3514        0    0    106    1    0    1    288    1080    4    OpenTakePreferential1	
708    15    0    3515    2    1    [[3505,2,1]]    3515        0    0    106    1    0    1    688    3240    4    OpenTakePreferential2	
709    15    0    912    1    1    [[30,588,1]]    30        0    0    106    1    0    1    188    738    5    OpenTakePreferential1	
710    15    0    913    1    1    [[30,1588,1]]    30        0    0    106    1    0    1    588    2088    5    OpenTakePreferential2	
711    15    0    2213    60    1    [[4610,1,1]]    4610        0    0    106    1    0    1    188    950    6    OpenTakePreferential1	
712    15    0    2213    140    1    [[1128,1,1]]    1128        0    0    106    1    0    1    588    2000    6    OpenTakePreferential2	
713    15    0    30    588    1    [[912,1,1]]    30        0    0    106    1    0    1    188    738    7    OpenTakePreferential1	
714    15    0    4606    2    1    [[4608,2,1]]    4606        0    0    106    1    0    1    688    3000    7    OpenTakePreferential2	
751    16    1    15    1    1    []    15        0    0    0    1    0    1    188    500    0    LimitGift6    

752    17    1    4151    60    1    []    4151        0    0    0    1    0    1    188    600    0    LimitGift6    

753    18    1    181    40    1    []    181        0    0    0    1    0    1    188    600    0    LimitGift6    


 db/PyMongoDataServer/SysDB/tagChinItem.txt

@@ -237,7 +237,7 @@
1101    1    0    花粉    17    0    0    0    0    999    1    0    1    0    1    0    0    0    0    0    1    1    0    50    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    1    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0

1102    1    0    魂印    17    0    0    0    0    999    1    0    1    0    1    0    0    0    0    0    1    1    0    50    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    1    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0

1103    1    0    令牌    17    0    0    0    0    999    1    0    1    0    1    0    0    0    0    0    1    1    0    50    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    1    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0

1104    1    0    技能钥匙    17    0    0    0    0    999    1    0    1    0    1    0    0    0    0    0    1    10    0    50    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    1    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0

1104    1    0    技能钥匙    17    0    0    0    0    999    1    1    1    0    1    0    0    0    0    0    1    10    0    50    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    1    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0

1105    1    0    钥匙    17    0    0    0    0    999    1    0    1    0    1    0    0    0    0    0    1    1    0    50    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    1    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0

1106    1    0    兵刃    17    0    0    0    0    999    1    0    1    0    1    0    0    0    0    0    1    1    0    50    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    1    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0

1107    1    0    花粉    17    0    0    0    0    999    1    0    1    0    1    0    0    0    0    0    1    1    0    50    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    1    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0

			@@ -1,30 +1,32 @@
			CfgID ActMark ServerIDList StartDate EndDate StartTime EndTime AdvanceMinutes NotifyInfoStart NotifyInfoEnd NotifyInfoLoop LimitLV IsDayReset
			1 OpenServer01 [] 3 4 120 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [120, "LimitGift1"] 50 0
			2 OpenServer02 [] 5 6 0 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [120, "LimitGift1"] 50 0
			3 OpenServer03 [] 7 8 0 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [120, "LimitGift1"] 50 0
			4 OpenServer04 [] 9 10 0 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [120, "LimitGift1"] 50 0
			5 NationalDay [] 2018-9-1 2018-9-3 120 {0:["LimitGift1",[]]} {-30:["LimitGift2",[]]} [30, "LimitGift2"] 50 1
			6 NationalDay [(1,10), (100, 110), 120] 2018-9-1 2018-9-3 12:00\|18:00 13:00\|19:00 120 {0:["LimitGift1",[]]} {-30:["LimitGift2",[]]} [240, "LimitGift2"] 50 1
			7 1OpenServer01 [7001] 2018-9-7 2018-9-7 120 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [] 50 1
			8 1OpenServer02 [7001] 2018-9-9 2018-9-9 120 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [] 50 1
			9 1OpenServer03 [7001] 2018-9-11 2018-9-11 120 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [] 50 1
			10 1OpenServer04 [7001] 2018-9-12 2018-9-12 120 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [] 180 1
			11 1OpenServer05 [7001] 2018-9-15 2018-9-15 120 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [] 280 1
			12 2OpenServer01 [7002] 2018-9-8 2018-9-8 120 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [] 50 1
			13 2OpenServer02 [7002] 2018-9-10 2018-9-10 120 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [] 50 1
			14 2OpenServer03 [7002] 2018-9-12 2018-9-12 120 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [] 50 1
			15 2OpenServer04 [7002] 2018-9-13 2018-9-13 120 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [] 180 1
			16 2OpenServer05 [7002] 2018-9-16 2018-9-16 120 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [] 280 1
			17 3OpenServer01 [7003] 2018-9-12 2018-9-12 120 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [] 50 1
			18 3OpenServer02 [7003] 2018-9-14 2018-9-14 120 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [] 50 1
			19 3OpenServer03 [7003] 2018-9-16 2018-9-16 120 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [] 50 1
			20 3OpenServer04 [7003] 2018-9-17 2018-9-17 120 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [] 180 1
			21 3OpenServer05 [7003] 2018-9-20 2018-9-20 120 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [] 280 1
			22 NationalDay01 [(7001,7003), (8002, 8004)] 2018-10-1 2018-10-1 120 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [120, "LimitGift1"] 110 0
			23 NationalDay02 [(7001,7003), (8002, 8004)] 2018-10-2 2018-10-2 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [120, "LimitGift1"] 110 0
			24 NationalDay03 [(7001,7003), (8002, 8004)] 2018-10-3 2018-10-3 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [120, "LimitGift1"] 110 0
			25 NationalDay04 [(7001,7003), (8002, 8004)] 2018-10-4 2018-10-4 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [120, "LimitGift1"] 110 0
			26 NationalDay05 [(7001,7003), (8002, 8004)] 2018-10-5 2018-10-5 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [120, "LimitGift1"] 110 0
			27 NationalDay06 [(7001,7003), (8002, 8004)] 2018-10-6 2018-10-6 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [120, "LimitGift1"] 110 0
			28 NationalDay07 [(7001,7003), (8002, 8004)] 2018-10-7 2018-10-7 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [120, "LimitGift1"] 110 0
			29 NationalDay08 [(7001,7003), (8002, 8004)] 2018-10-8 2018-10-8 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [120, "LimitGift1"] 110 0
			1 OpenServer01 [] 2 3 120 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [120, "LimitGift1"] 50 0
			2 OpenServer02 [] 4 4 0 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [120, "LimitGift1"] 50 0
			3 OpenServer03 [] 5 5 0 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [120, "LimitGift1"] 50 0
			4 OpenServer04 [] 6 6 0 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [120, "LimitGift1"] 50 0
			5 OpenServer05 [] 7 7 0 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [120, "LimitGift1"] 50 0
			5 OpenServer06 [] 9 10 120 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [120, "LimitGift1"] 50 0
			7 NationalDay [] 2018-9-1 2018-9-3 120 {0:["LimitGift1",[]]} {-30:["LimitGift2",[]]} [30, "LimitGift2"] 50 1
			8 NationalDay [(1,10), (100, 110), 120] 2018-9-1 2018-9-3 12:00\|18:00 13:00\|19:00 120 {0:["LimitGift1",[]]} {-30:["LimitGift2",[]]} [240, "LimitGift2"] 50 1
			9 1OpenServer01 [7001] 2018-9-7 2018-9-7 120 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [] 50 1
			10 1OpenServer02 [7001] 2018-9-9 2018-9-9 120 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [] 50 1
			11 1OpenServer03 [7001] 2018-9-11 2018-9-11 120 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [] 50 1
			12 1OpenServer04 [7001] 2018-9-12 2018-9-12 120 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [] 180 1
			13 1OpenServer05 [7001] 2018-9-15 2018-9-15 120 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [] 280 1
			14 2OpenServer01 [7002] 2018-9-8 2018-9-8 120 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [] 50 1
			15 2OpenServer02 [7002] 2018-9-10 2018-9-10 120 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [] 50 1
			16 2OpenServer03 [7002] 2018-9-12 2018-9-12 120 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [] 50 1
			17 2OpenServer04 [7002] 2018-9-13 2018-9-13 120 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [] 180 1
			18 2OpenServer05 [7002] 2018-9-16 2018-9-16 120 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [] 280 1
			19 3OpenServer01 [7003] 2018-9-12 2018-9-12 120 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [] 50 1
			20 3OpenServer02 [7003] 2018-9-14 2018-9-14 120 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [] 50 1
			21 3OpenServer03 [7003] 2018-9-16 2018-9-16 120 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [] 50 1
			22 3OpenServer04 [7003] 2018-9-17 2018-9-17 120 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [] 180 1
			23 3OpenServer05 [7003] 2018-9-20 2018-9-20 120 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [] 280 1
			24 NationalDay01 [(7001,7003), (8002, 8004)] 2018-10-1 2018-10-1 120 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [120, "LimitGift1"] 110 0
			25 NationalDay02 [(7001,7003), (8002, 8004)] 2018-10-2 2018-10-2 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [120, "LimitGift1"] 110 0
			26 NationalDay03 [(7001,7003), (8002, 8004)] 2018-10-3 2018-10-3 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [120, "LimitGift1"] 110 0
			27 NationalDay04 [(7001,7003), (8002, 8004)] 2018-10-4 2018-10-4 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [120, "LimitGift1"] 110 0
			28 NationalDay05 [(7001,7003), (8002, 8004)] 2018-10-5 2018-10-5 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [120, "LimitGift1"] 110 0
			29 NationalDay06 [(7001,7003), (8002, 8004)] 2018-10-6 2018-10-6 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [120, "LimitGift1"] 110 0
			30 NationalDay07 [(7001,7003), (8002, 8004)] 2018-10-7 2018-10-7 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [120, "LimitGift1"] 110 0
			31 NationalDay08 [(7001,7003), (8002, 8004)] 2018-10-8 2018-10-8 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [120, "LimitGift1"] 110 0

			@@ -30,7 +30,7 @@
			29 ['无毒不丈夫']
			30 ['上海']
			31 ['调虎离山']
			32 ['汉族']
			32 ['汉族','汉']
			33 ['拿人家的手短']
			34 ['丈夫']
			35 ['胡萝卜']
			@@ -47,7 +47,7 @@
			46 ['活到九十九','活到99']
			47 ['汉界']
			48 ['左']
			49 ['美国']
			49 ['美国','美']
			50 ['一百年不许变']
			51 ['孙悟空']
			52 ['杭州']
			@@ -65,11 +65,11 @@
			64 ['任贤齐']
			65 ['深圳']
			66 ['长江']
			67 ['老鼠']
			68 ['老虎']
			69 ['风力']
			67 ['老鼠','鼠']
			68 ['老虎','虎']
			69 ['风力','风']
			70 ['曹植']
			71 ['亚洲']
			71 ['亚洲','亚']
			72 ['二十岁','20','20岁']
			73 ['荔枝']
			74 ['宙斯']
			@@ -79,16 +79,16 @@
			78 ['凤毛麟角']
			79 ['冰雨']
			80 ['李莲英']
			81 ['菊花']
			81 ['菊花','菊']
			82 ['牡丹']
			83 ['桃子']
			83 ['桃子','桃']
			84 ['尾巴']
			85 ['包子']
			86 ['鸽子']
			87 ['骆驼']
			88 ['芭蕾舞']
			89 ['一万年']
			90 ['大象']
			90 ['大象','象']
			91 ['眼睛']
			92 ['蜡烛']
			93 ['我爱你']
			@@ -100,23 +100,23 @@
			99 ['蟑螂']
			100 ['植物大战僵尸']
			101 ['亲']
			102 ['哭']
			102 ['哭','哭泣','难受']
			103 ['龙凤胎']
			104 ['乒乓球','乒乓']
			105 ['快乐崇拜']
			106 ['大象','象']
			107 ['狼']
			108 ['诸葛亮']
			108 ['诸葛亮','诸葛孔明']
			109 ['万里长城','长城']
			110 ['霍比特人']
			111 ['猪八戒','天蓬元帅']
			112 ['关羽']
			112 ['关羽','关云长']
			113 ['长白山']
			114 ['马']
			115 ['烟囱']
			116 ['黑白']
			117 ['老虎','虎']
			118 ['黑色']
			118 ['黑色,'黑'']
			119 ['龙']
			120 ['苏州']
			121 ['酸']
			@@ -129,11 +129,11 @@
			128 ['长春']
			129 ['绿色','绿']
			130 ['三亚']
			131 ['法国']
			131 ['法国','法']
			132 ['乔布斯']
			133 ['青海']
			134 ['藏族']
			135 ['川菜']
			134 ['藏族','藏']
			135 ['川菜','川']
			136 ['花木兰']
			137 ['反正有大把时光']
			138 ['你的笑容已泛黄']
			@@ -155,7 +155,7 @@
			154 ['数学']
			155 ['狐狸']
			156 ['摸不得']
			157 ['变大']
			157 ['变大','大']
			158 ['京杭大运河']
			159 ['重阳节']
			160 ['兰州拉面']
			@@ -177,7 +177,7 @@
			176 ['林黛玉']
			177 ['对']
			178 ['丹麦']
			179 ['泰国']
			179 ['泰国','泰']
			180 ['李时珍']
			181 ['成吉思汗']
			182 ['安徽']
			@@ -189,8 +189,8 @@
			188 ['对']
			189 ['今晚吃鸡']
			190 ['新闻联播']
			191 ['29']
			192 ['T']
			191 ['29','二十九']
			192 ['T','t']
			193 ['直鱼钩']
			194 ['广州']
			195 ['将进酒']
			@@ -198,20 +198,20 @@
			197 ['金']
			198 ['精忠报国']
			199 ['119']
			200 ['4']
			200 ['4','四']
			201 ['施耐庵']
			202 ['宋朝']
			203 ['隋朝']
			202 ['宋朝','宋']
			203 ['隋朝','隋']
			204 ['何事秋风悲画扇']
			205 ['武则天']
			206 ['赣']
			207 ['爆炸']
			208 ['秦国']
			208 ['秦国','秦']
			209 ['太阳']
			210 ['肝脏']
			211 ['小肠']
			212 ['隋朝']
			213 ['三']
			212 ['隋朝','隋']
			213 ['三','3']
			214 ['勾践']
			215 ['东北虎']
			216 ['丹麦']
			@@ -228,38 +228,35 @@
			227 ['笔墨纸砚']
			228 ['国风']
			229 ['86']
			230 ['三十']
			230 ['三十','30']
			231 ['唐伯虎']
			232 ['围棋']
			233 ['五十岁']
			234 ['孔子的弟子']
			234 ['孔子的弟子','孔子弟子']
			235 ['老舍']
			236 ['明史']
			237 ['牲口圈']
			238 ['逗号']
			239 ['杜甫']
			240 ['不识好人心']
			241 ['摸不得']
			242 ['清明']
			243 ['新疆']
			244 ['琵琶']
			245 ['歌德']
			246 ['老子']
			247 ['孔子']
			248 ['水浒传']
			249 ['出使去楚国']
			250 ['³Ѹ']
			251 ['永乐大典']
			252 ['木兰辞']
			253 ['关羽']
			254 ['杜甫']
			255 ['妻子']
			256 ['观沧海']
			257 ['六月飞雪']
			258 ['望庐山瀑布']
			259 ['白居易']
			260 ['王羲之']
			261 ['贵州']
			262 ['匡衡']
			263 ['诸葛亮']
			264 ['儒家']
			237 ['逗号']
			238 ['杜甫']
			239 ['不识好人心']
			240 ['摸不得']
			241 ['清明']
			242 ['新疆']
			243 ['琵琶']
			244 ['歌德']
			245 ['老子']
			246 ['孔子']
			247 ['水浒传']
			248 ['³Ѹ']
			249 ['永乐大典']
			250 ['木兰辞']
			251 ['关羽']
			252 ['杜甫']
			253 ['妻子',,'老婆']
			254 ['观沧海']
			255 ['望庐山瀑布']
			256 ['白居易']
			257 ['王羲之']
			258 ['贵州']
			259 ['匡衡']
			260 ['诸葛亮']
			261 ['儒家','儒']

			@@ -1,30 +1,32 @@
			CfgID StartDate EndDate StartTime EndTime AdvanceMinutes LimitLV IsDayReset GiftbagList MailKey MailItemPrize
			1 3 4 120 50 0 [[6]] SellMail4
			2 5 6 0 50 0 [[7]] SellMail4
			3 7 8 0 50 0 [[8]] SellMail4
			4 9 10 0 50 0 [[9]] SellMail4
			5 2018-9-1 2018-9-3 120 50 1 [[1,2,3]] SellMail4 [[13,2,1],[2,2,1]]
			6 2018-9-1 2018-9-3 12:00\|18:00 13:00\|19:00 120 50 1 [[3]] SellMail4 [[13,2,1],[2,2,1]]
			7 2018-9-7 2018-9-7 120 50 1 [[2]] SellMail4 [[13,2,1],[2,2,1]]
			8 2018-9-9 2018-9-9 120 50 1 [[4]] SellMail4 [[13,2,1],[2,2,1]]
			9 2018-9-11 2018-9-11 120 50 1 [[1]] SellMail4 [[13,2,1],[2,2,1]]
			10 2018-9-12 2018-9-12 120 180 1 [[3]] SellMail4 [[13,2,1],[2,2,1]]
			11 2018-9-15 2018-9-15 120 280 1 [[5]] SellMail4 [[13,2,1],[2,2,1]]
			12 2018-9-8 2018-9-8 120 50 1 [[2]] SellMail4 [[13,2,1],[2,2,1]]
			13 2018-9-10 2018-9-10 120 50 1 [[4]] SellMail4 [[13,2,1],[2,2,1]]
			14 2018-9-12 2018-9-12 120 50 1 [[1]] SellMail4 [[13,2,1],[2,2,1]]
			15 2018-9-13 2018-9-13 120 180 1 [[3]] SellMail4 [[13,2,1],[2,2,1]]
			16 2018-9-16 2018-9-16 120 280 1 [[5]] SellMail4 [[13,2,1],[2,2,1]]
			17 2018-9-12 2018-9-12 120 50 1 [[2]] SellMail4 [[13,2,1],[2,2,1]]
			18 2018-9-14 2018-9-14 120 50 1 [[4]] SellMail4 [[13,2,1],[2,2,1]]
			19 2018-9-16 2018-9-16 120 50 1 [[1]] SellMail4 [[13,2,1],[2,2,1]]
			20 2018-9-17 2018-9-17 120 180 1 [[3]] SellMail4 [[13,2,1],[2,2,1]]
			21 2018-9-20 2018-9-20 120 280 1 [[5]] SellMail4 [[13,2,1],[2,2,1]]
			22 2018-10-1 2018-10-1 120 110 0 [[9]] SellMail4
			23 2018-10-2 2018-10-2 110 0 [[10]] SellMail4
			24 2018-10-3 2018-10-3 110 0 [[13]] SellMail4
			25 2018-10-4 2018-10-4 110 0 [[10]] SellMail4
			26 2018-10-5 2018-10-5 110 0 [[8]] SellMail4
			27 2018-10-6 2018-10-6 110 0 [[11]] SellMail4
			28 2018-10-7 2018-10-7 110 0 [[14]] SellMail4
			29 2018-10-8 2018-10-8 110 0 [[12]] SellMail4
			1 2 3 120 50 0 [[9]] SellMail4
			2 4 4 0 50 0 [[6]] SellMail4
			3 5 5 0 50 0 [[3]] SellMail4
			4 6 6 0 50 0 [[7]] SellMail4
			5 7 7 0 50 0 [[8]] SellMail4
			5 9 10 120 50 0 [[4]] SellMail4
			7 2018-9-1 2018-9-3 120 50 1 [[1,2,3]] SellMail4 [[13,2,1],[2,2,1]]
			8 2018-9-1 2018-9-3 12:00\|18:00 13:00\|19:00 120 50 1 [[3]] SellMail4 [[13,2,1],[2,2,1]]
			9 2018-9-7 2018-9-7 120 50 1 [[2]] SellMail4 [[13,2,1],[2,2,1]]
			10 2018-9-9 2018-9-9 120 50 1 [[4]] SellMail4 [[13,2,1],[2,2,1]]
			11 2018-9-11 2018-9-11 120 50 1 [[1]] SellMail4 [[13,2,1],[2,2,1]]
			12 2018-9-12 2018-9-12 120 180 1 [[3]] SellMail4 [[13,2,1],[2,2,1]]
			13 2018-9-15 2018-9-15 120 280 1 [[5]] SellMail4 [[13,2,1],[2,2,1]]
			14 2018-9-8 2018-9-8 120 50 1 [[2]] SellMail4 [[13,2,1],[2,2,1]]
			15 2018-9-10 2018-9-10 120 50 1 [[4]] SellMail4 [[13,2,1],[2,2,1]]
			16 2018-9-12 2018-9-12 120 50 1 [[1]] SellMail4 [[13,2,1],[2,2,1]]
			17 2018-9-13 2018-9-13 120 180 1 [[3]] SellMail4 [[13,2,1],[2,2,1]]
			18 2018-9-16 2018-9-16 120 280 1 [[5]] SellMail4 [[13,2,1],[2,2,1]]
			19 2018-9-12 2018-9-12 120 50 1 [[2]] SellMail4 [[13,2,1],[2,2,1]]
			20 2018-9-14 2018-9-14 120 50 1 [[4]] SellMail4 [[13,2,1],[2,2,1]]
			21 2018-9-16 2018-9-16 120 50 1 [[1]] SellMail4 [[13,2,1],[2,2,1]]
			22 2018-9-17 2018-9-17 120 180 1 [[3]] SellMail4 [[13,2,1],[2,2,1]]
			23 2018-9-20 2018-9-20 120 280 1 [[5]] SellMail4 [[13,2,1],[2,2,1]]
			24 2018-10-1 2018-10-1 120 110 0 [[9]] SellMail4
			25 2018-10-2 2018-10-2 110 0 [[10]] SellMail4
			26 2018-10-3 2018-10-3 110 0 [[13]] SellMail4
			27 2018-10-4 2018-10-4 110 0 [[10]] SellMail4
			28 2018-10-5 2018-10-5 110 0 [[8]] SellMail4
			29 2018-10-6 2018-10-6 110 0 [[11]] SellMail4
			30 2018-10-7 2018-10-7 110 0 [[14]] SellMail4
			31 2018-10-8 2018-10-8 110 0 [[12]] SellMail4

			@@ -1,13 +1,13 @@
			GiftbagID GiftbagType OriginalRMB BuyCountLimit GiftItemList MainItemID NotifyKey
			2 1 88 1 [(196,1,0)] 196 LimitGift3
			4 2 130 1 [(913,1,0),(181,80,0)] 913 LimitGift3
			5 3 200 1 [(7002,1,0),(4608,2,0)] 7002 LimitGift3
			7 4 320 1 [(4214,1,0),(4151,200,0)] 4214 LimitGift3
			5 3 260 1 [(7002,1,0),(4608,2,0)] 7002 LimitGift3
			7 4 360 1 [(4214,1,0),(4151,200,0)] 4214 LimitGift3
			8 5 600 1 [(4606,2,0),(4607,2,0)] 4606 LimitGift3
			4 6 70 1 [(4215,1,1),(4151,40,1)] 4215 LimitGift3
			5 7 210 1 [(263,1,1),(181,80,1)] 263 LimitGift3
			5 8 140 1 [(4220,1,1),(4151,80,1)] 4220 LimitGift3
			8 9 360 1 [(262,1,1),(181,200,1)] 262 LimitGift3
			4 6 110 1 [(4215,1,1),(4151,80,1)] 4215 LimitGift3
			5 7 190 1 [(263,1,1),(181,100,1)] 263 LimitGift3
			5 8 180 1 [(4220,1,1),(4151,100,1)] 4220 LimitGift3
			8 9 440 1 [(262,1,1),(181,240,1)] 262 LimitGift3
			2 10 25 1 [(8353,2,1),(912,1,1),(142,50,1)] 8353 LimitGift3
			2 11 40 1 [(8353,2,1),(4010,2,1),(143,30,1)] 8353 LimitGift3
			2 12 25 1 [(8353,2,1),(2213,3,1),(143,30,1)] 8353 LimitGift3

			@@ -289,7 +289,7 @@
			CeremonyRecharge {"1":[[4184,1,1],[2392,1,1],[912,1,1],[1145,5,1],[4609,1,1]],"2":[[4184,1,1],[2392,1,1],[912,1,1],[1145,5,1],[4609,1,1]]}
			CeremonyFireParty {"0":801,"1":802,"2":803}
			CeremonyRankLimit 3280
			TJDropTaskItem {20007:[120,1104,50,'int(killCnt/25000)+min(max(killCnt-int(killCnt/25000)*25000-random.randint(1,25000),0),1)']}
			TJDropTaskItem {}
			SuperGiftTimeList [[651,2],[652,2],[653,2]] []
			OSSaleOpenMail [1,2,3,4,5,6,7] []
			FairyGrabBossID [50103001,50103002,50103003,50103004,50103005,50103006,50103007] [[26,14000,1]] -60
			@@ -297,3 +297,4 @@
			SamboSpecialUnlock 9001\|9002\|9003\|9004\|9005\|9006\|9007\|9008\|9009\|9010\|9011\|9012\|9013\|9014\|9015\|9016\|9017\|9018
			BindJadeWheelCfg 88 {"1":110,"2":300,"3":150,"4":200,"5":300,"6":150,"7":130,"8":200,"9":588} [(3879,1),(3889,2),(4889,3),(5189,4),(5199,5),(6199,6),(9699,7),(9999,8),(10000,9)] {1:[(6000,3),(10000,4)],30:[(10000,9)]} [[12.0,67.4],[67.4,103.0],[103.0,148.1],[148.1,186.2],[186.2,221.8],[221.8,267.0],[267.0,311.7],[311.7,348],[348,372]]
			BindJadeWheelNotice 150
			WishingWellCfg 7200 refreshCnt+10 8 5

			@@ -122,16 +122,16 @@
			702 15 0 4185 1 1 [] 4185 0 0 106 1 0 1 288 800 1 OpenTakePreferential2
			703 15 0 2343 1 1 [] 0 0 0 106 1 0 1 88 380 2 OpenTakePreferential1
			704 15 0 2344 1 1 [] 2344 0 0 106 1 0 1 288 1000 2 OpenTakePreferential2
			705 15 0 800 1 1 [] 800 0 0 106 1 0 1 88 240 3 OpenTakePreferential1
			706 15 0 801 1 1 [[913,1,1]] 801 0 0 106 1 0 1 288 700 3 OpenTakePreferential2
			707 15 0 3514 1 1 [[3504,1,1]] 0 0 0 106 1 0 1 88 360 4 OpenTakePreferential1
			708 15 0 3515 1 1 [[3505,1,1]] 3514 0 0 106 1 0 1 288 1080 4 OpenTakePreferential2
			709 15 0 912 1 1 [[18,1,1]] 912 0 0 106 1 0 1 88 250 5 OpenTakePreferential1
			710 15 0 913 1 1 [[15,1,1]] 913 0 0 106 1 0 1 388 888 5 OpenTakePreferential2
			711 15 0 2213 20 1 [] 0 0 0 106 1 0 1 88 250 6 OpenTakePreferential1
			712 15 0 1128 1 1 [[2213,60,1]] 1128 0 0 106 1 0 1 388 1000 6 OpenTakePreferential2
			713 15 0 852 1 1 [] 0 0 0 106 1 0 1 188 388 7 OpenTakePreferential1
			714 15 0 4606 1 1 [[4608,2,1]] 4606 0 0 106 1 0 1 688 2000 7 OpenTakePreferential2
			705 15 0 9 1 1 [[142,300,1]] 142 0 0 106 1 0 1 188 750 3 OpenTakePreferential1
			706 15 0 6 2 1 [[913,2,1]] 913 0 0 106 1 0 1 488 1800 3 OpenTakePreferential2
			707 15 0 3514 2 1 [[3504,2,1]] 3514 0 0 106 1 0 1 288 1080 4 OpenTakePreferential1
			708 15 0 3515 2 1 [[3505,2,1]] 3515 0 0 106 1 0 1 688 3240 4 OpenTakePreferential2
			709 15 0 912 1 1 [[30,588,1]] 30 0 0 106 1 0 1 188 738 5 OpenTakePreferential1
			710 15 0 913 1 1 [[30,1588,1]] 30 0 0 106 1 0 1 588 2088 5 OpenTakePreferential2
			711 15 0 2213 60 1 [[4610,1,1]] 4610 0 0 106 1 0 1 188 950 6 OpenTakePreferential1
			712 15 0 2213 140 1 [[1128,1,1]] 1128 0 0 106 1 0 1 588 2000 6 OpenTakePreferential2
			713 15 0 30 588 1 [[912,1,1]] 30 0 0 106 1 0 1 188 738 7 OpenTakePreferential1
			714 15 0 4606 2 1 [[4608,2,1]] 4606 0 0 106 1 0 1 688 3000 7 OpenTakePreferential2
			751 16 1 15 1 1 [] 15 0 0 0 1 0 1 188 500 0 LimitGift6
			752 17 1 4151 60 1 [] 4151 0 0 0 1 0 1 188 600 0 LimitGift6
			753 18 1 181 40 1 [] 181 0 0 0 1 0 1 188 600 0 LimitGift6

			@@ -237,7 +237,7 @@
			1101 1 0 花粉 17 0 0 0 0 999 1 0 1 0 1 0 0 0 0 0 1 1 0 50 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
			1102 1 0 魂印 17 0 0 0 0 999 1 0 1 0 1 0 0 0 0 0 1 1 0 50 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
			1103 1 0 令牌 17 0 0 0 0 999 1 0 1 0 1 0 0 0 0 0 1 1 0 50 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
			1104 1 0 技能钥匙 17 0 0 0 0 999 1 0 1 0 1 0 0 0 0 0 1 10 0 50 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
			1104 1 0 技能钥匙 17 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 10 0 50 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
			1105 1 0 钥匙 17 0 0 0 0 999 1 0 1 0 1 0 0 0 0 0 1 1 0 50 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
			1106 1 0 兵刃 17 0 0 0 0 999 1 0 1 0 1 0 0 0 0 0 1 1 0 50 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
			1107 1 0 花粉 17 0 0 0 0 999 1 0 1 0 1 0 0 0 0 0 1 1 0 50 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0