~admin/snxx_server.git

parent: 01d2a7f7 | 补丁 | 提交 | ignore whitespace

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

cehua_wcy

2018-11-28 e14a047351267536c1a5d7f45c51f9ad829f9f95

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

5个文件已修改

	ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/FBHelpBattle.pyc	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerState.pyc	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	db/PyMongoDataServer/PySysDB/tagActFlashGiftbag.txt	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	db/PyMongoDataServer/PySysDB/tagChestsAward.txt	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	db/PyMongoDataServer/PySysDB/tagItemCompound.txt	20 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

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

Binary files differ

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

Binary files differ

 db/PyMongoDataServer/PySysDB/tagActFlashGiftbag.txt

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

1    1    2            120    50    0    [[22]]    SellMail4    

2    3    4                50    0    [[16]]    SellMail4	
2    3    4                50    0    [[19]]    SellMail4	
3    5    6                50    0    [[18]]    SellMail4    

4    9    10            120    50    0    [[15]]    SellMail4    

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


 db/PyMongoDataServer/PySysDB/tagChestsAward.txt

@@ -181,7 +181,7 @@
2394            4184_2|1146_15|952_3|913_1                                    [913]

2395                        [[100,[3803,1]],[250,[5408,1]],[260,[5409,1]],[280,[4607,1]],[380,[4606,1]],[480,[4608,1]],[630,[3506,1]],[780,[3516,1]],[1380,[4305,5]],[1680,[5303,60]],[3180,[8353,6]],[4800,[2324,2]],[6200,[3503,1]],[7600,[3513,1]],[7900,[143,30]],[8200,[144,20]],[8500,[153,10]],[10000,[4151,8]]]    1    {2:[[10000,[3516,1]]],8:[[10000,[4608,1]]],20:[[10000,[5408,1]]]}                [3803,5408,5409,4607,4606,4608,3506,3516]

2396            4184_2|1147_15|952_3|913_1                                    [913]

2397                [[11800,[8209,1]],[13600,[8222,1]],[15400,[8235,1]],[17200,[8248,1]],[19000,[8261,1]],[19200,[8210,1]],[19400,[8223,1]],[19600,[8236,1]],[19800,[8249,1]],[20000,[8262,1]]]    1							
2397                [[1800,[8209,1]],[3600,[8222,1]],[5400,[8235,1]],[7200,[8248,1]],[9000,[8261,1]],[9200,[8210,1]],[9400,[8223,1]],[9600,[8236,1]],[9800,[8249,1]],[10000,[8262,1]]]    1							
2398    0            [[1600,[10453,1]],[3200,[10454,1]],[4800,[10455,1]],[6400,[10456,1]],[8000,[10457,1]],[8400,[10473,1]],[8800,[10474,1]],[9200,[10475,1]],[9600,[10476,1]],[10000,[10477,1]]]    1                [[10453,20453,30453],[10454,20454,30454],[10455,20455,30455],[10456,20456,30456],[10457,20457,30457],[10473,20473,30473],[10474,20474,30474],[10475,20475,30475],[10476,20476,30476],[10477,20477,30477]]            [10453,20453,30453,10454,20454,30454,10455,20455,30455,10456,20456,30456,10457,20457,30457,10473,20473,30473,10474,20474,30474,10475,20475,30475,10476,20476,30476,10477,20477,30477]

2399    0            [[1600,[10553,1]],[3200,[10554,1]],[4800,[10555,1]],[6400,[10556,1]],[8000,[10557,1]],[8400,[10573,1]],[8800,[10574,1]],[9200,[10575,1]],[9600,[10576,1]],[10000,[10577,1]]]    1                [[10553,20553,30553],[10554,20554,30554],[10555,20555,30555],[10556,20556,30556],[10557,20557,30557],[10573,20573,30573],[10574,20574,30574],[10575,20575,30575],[10576,20576,30576],[10577,20577,30577]]            [10553,20553,30553,10554,20554,30554,10555,20555,30555,10556,20556,30556,10557,20557,30557,10573,20573,30573,10574,20574,30574,10575,20575,30575,10576,20576,30576,10577,20577,30577]

2400    0            [[1600,[10653,1]],[3200,[10654,1]],[4800,[10655,1]],[6400,[10656,1]],[8000,[10657,1]],[8400,[10673,1]],[8800,[10674,1]],[9200,[10675,1]],[9600,[10676,1]],[10000,[10677,1]]]    1                [[10653,20653,30653],[10654,20654,30654],[10655,20655,30655],[10656,20656,30656],[10657,20657,30657],[10673,20673,30673],[10674,20674,30674],[10675,20675,30675],[10676,20676,30676],[10677,20677,30677]]            [10653,20653,30653,10654,20654,30654,10655,20655,30655,10656,20656,30656,10657,20657,30657,10673,20673,30673,10674,20674,30674,10675,20675,30675,10676,20676,30676,10677,20677,30677]


 db/PyMongoDataServer/PySysDB/tagItemCompound.txt

@@ -8,16 +8,16 @@
7    0    3725    0    3724    1    3805|3806    2|2    0    2000    10000    0    5    WingComposeSuccess5    1

11    0    9065    0    9064|9064|9064    3    5304    20    0    10000    0    0    0    XianComposeSucces1    1

12    0    9067    0    9065|9065|9065    3    5304    2    0    10000    0    0    0    EquipComposeSuccess1    1

13    0    10893    0    10883|10884|10885|10886|10887    3    5408    1    0    10000    0    0    0    EquipComposeSuccess7    1

14    0    10894    0    10883|10884|10885|10886|10887    3    5408    1    0    10000    0    0    0    EquipComposeSuccess7    1

15    0    10895    0    10883|10884|10885|10886|10887    3    5408    1    0    10000    0    0    0    EquipComposeSuccess7    1

16    0    10896    0    10883|10884|10885|10886|10887    3    5408    1    0    10000    0    0    0    EquipComposeSuccess7    1

17    0    10897    0    10883|10884|10885|10886|10887    3    5408    1    0    10000    0    0    0    EquipComposeSuccess7    1

18    0    20893    0    20883|20884|20885|20886|20887    3    5408    1    0    10000    0    0    0    EquipComposeSuccess7    1

19    0    20894    0    20883|20884|20885|20886|20887    3    5408    1    0    10000    0    0    0    EquipComposeSuccess7    1

20    0    20895    0    20883|20884|20885|20886|20887    3    5408    1    0    10000    0    0    0    EquipComposeSuccess7    1

21    0    20896    0    20883|20884|20885|20886|20887    3    5408    1    0    10000    0    0    0    EquipComposeSuccess7    1

22    0    20897    0    20883|20884|20885|20886|20887    3    5408    1    0    10000    0    0    0    EquipComposeSuccess7    1

13    0    10893    0    10881|10882|10883|10884|10885|10886|10887    3    5408    1    0    10000    0    0    0    EquipComposeSuccess7    1

14    0    10894    0    10881|10882|10883|10884|10885|10886|10887    3    5408    1    0    10000    0    0    0    EquipComposeSuccess7    1

15    0    10895    0    10881|10882|10883|10884|10885|10886|10887    3    5408    1    0    10000    0    0    0    EquipComposeSuccess7    1

16    0    10896    0    10881|10882|10883|10884|10885|10886|10887    3    5408    1    0    10000    0    0    0    EquipComposeSuccess7    1

17    0    10897    0    10881|10882|10883|10884|10885|10886|10887    3    5408    1    0    10000    0    0    0    EquipComposeSuccess7    1

18    0    20893    0    20881|20882|20883|20884|20885|20886|20887    3    5408    1    0    10000    0    0    0    EquipComposeSuccess7    1

19    0    20894    0    20881|20882|20883|20884|20885|20886|20887    3    5408    1    0    10000    0    0    0    EquipComposeSuccess7    1

20    0    20895    0    20881|20882|20883|20884|20885|20886|20887    3    5408    1    0    10000    0    0    0    EquipComposeSuccess7    1

21    0    20896    0    20881|20882|20883|20884|20885|20886|20887    3    5408    1    0    10000    0    0    0    EquipComposeSuccess7    1

22    0    20897    0    20881|20882|20883|20884|20885|20886|20887    3    5408    1    0    10000    0    0    0    EquipComposeSuccess7    1

23    2    10571    0    10551|10552|10553|10554|10555|10556|10557    3    0    0    0    6000    0    5410|1|4000    0    EquipComposeSuccess1    1

24    2    10572    0    10551|10552|10553|10554|10555|10556|10557    3    0    0    0    6000    0    5410|1|4000    0    EquipComposeSuccess1    1

25    2    10573    0    10551|10552|10553|10554|10555|10556|10557    3    0    0    0    6000    0    5410|1|4000    0    EquipComposeSuccess1    1

			@@ -1,6 +1,6 @@
			CfgID StartDate EndDate StartTime EndTime AdvanceMinutes LimitLV IsDayReset GiftbagList MailKey MailItemPrize
			1 1 2 120 50 0 [[22]] SellMail4
			2 3 4 50 0 [[16]] SellMail4
			2 3 4 50 0 [[19]] SellMail4
			3 5 6 50 0 [[18]] SellMail4
			4 9 10 120 50 0 [[15]] SellMail4
			5 2018-9-1 2018-9-1 120 50 1 [[1,2,3]] SellMail4 [[13,2,1],[2,2,1]]

			@@ -181,7 +181,7 @@
			2394 4184_2\|1146_15\|952_3\|913_1 [913]
			2395 [[100,[3803,1]],[250,[5408,1]],[260,[5409,1]],[280,[4607,1]],[380,[4606,1]],[480,[4608,1]],[630,[3506,1]],[780,[3516,1]],[1380,[4305,5]],[1680,[5303,60]],[3180,[8353,6]],[4800,[2324,2]],[6200,[3503,1]],[7600,[3513,1]],[7900,[143,30]],[8200,[144,20]],[8500,[153,10]],[10000,[4151,8]]] 1 {2:[[10000,[3516,1]]],8:[[10000,[4608,1]]],20:[[10000,[5408,1]]]} [3803,5408,5409,4607,4606,4608,3506,3516]
			2396 4184_2\|1147_15\|952_3\|913_1 [913]
			2397 [[11800,[8209,1]],[13600,[8222,1]],[15400,[8235,1]],[17200,[8248,1]],[19000,[8261,1]],[19200,[8210,1]],[19400,[8223,1]],[19600,[8236,1]],[19800,[8249,1]],[20000,[8262,1]]] 1
			2397 [[1800,[8209,1]],[3600,[8222,1]],[5400,[8235,1]],[7200,[8248,1]],[9000,[8261,1]],[9200,[8210,1]],[9400,[8223,1]],[9600,[8236,1]],[9800,[8249,1]],[10000,[8262,1]]] 1
			2398 0 [[1600,[10453,1]],[3200,[10454,1]],[4800,[10455,1]],[6400,[10456,1]],[8000,[10457,1]],[8400,[10473,1]],[8800,[10474,1]],[9200,[10475,1]],[9600,[10476,1]],[10000,[10477,1]]] 1 [[10453,20453,30453],[10454,20454,30454],[10455,20455,30455],[10456,20456,30456],[10457,20457,30457],[10473,20473,30473],[10474,20474,30474],[10475,20475,30475],[10476,20476,30476],[10477,20477,30477]] [10453,20453,30453,10454,20454,30454,10455,20455,30455,10456,20456,30456,10457,20457,30457,10473,20473,30473,10474,20474,30474,10475,20475,30475,10476,20476,30476,10477,20477,30477]
			2399 0 [[1600,[10553,1]],[3200,[10554,1]],[4800,[10555,1]],[6400,[10556,1]],[8000,[10557,1]],[8400,[10573,1]],[8800,[10574,1]],[9200,[10575,1]],[9600,[10576,1]],[10000,[10577,1]]] 1 [[10553,20553,30553],[10554,20554,30554],[10555,20555,30555],[10556,20556,30556],[10557,20557,30557],[10573,20573,30573],[10574,20574,30574],[10575,20575,30575],[10576,20576,30576],[10577,20577,30577]] [10553,20553,30553,10554,20554,30554,10555,20555,30555,10556,20556,30556,10557,20557,30557,10573,20573,30573,10574,20574,30574,10575,20575,30575,10576,20576,30576,10577,20577,30577]
			2400 0 [[1600,[10653,1]],[3200,[10654,1]],[4800,[10655,1]],[6400,[10656,1]],[8000,[10657,1]],[8400,[10673,1]],[8800,[10674,1]],[9200,[10675,1]],[9600,[10676,1]],[10000,[10677,1]]] 1 [[10653,20653,30653],[10654,20654,30654],[10655,20655,30655],[10656,20656,30656],[10657,20657,30657],[10673,20673,30673],[10674,20674,30674],[10675,20675,30675],[10676,20676,30676],[10677,20677,30677]] [10653,20653,30653,10654,20654,30654,10655,20655,30655,10656,20656,30656,10657,20657,30657,10673,20673,30673,10674,20674,30674,10675,20675,30675,10676,20676,30676,10677,20677,30677]

			@@ -8,16 +8,16 @@
			7 0 3725 0 3724 1 3805\|3806 2\|2 0 2000 10000 0 5 WingComposeSuccess5 1
			11 0 9065 0 9064\|9064\|9064 3 5304 20 0 10000 0 0 0 XianComposeSucces1 1
			12 0 9067 0 9065\|9065\|9065 3 5304 2 0 10000 0 0 0 EquipComposeSuccess1 1
			13 0 10893 0 10883\|10884\|10885\|10886\|10887 3 5408 1 0 10000 0 0 0 EquipComposeSuccess7 1
			14 0 10894 0 10883\|10884\|10885\|10886\|10887 3 5408 1 0 10000 0 0 0 EquipComposeSuccess7 1
			15 0 10895 0 10883\|10884\|10885\|10886\|10887 3 5408 1 0 10000 0 0 0 EquipComposeSuccess7 1
			16 0 10896 0 10883\|10884\|10885\|10886\|10887 3 5408 1 0 10000 0 0 0 EquipComposeSuccess7 1
			17 0 10897 0 10883\|10884\|10885\|10886\|10887 3 5408 1 0 10000 0 0 0 EquipComposeSuccess7 1
			18 0 20893 0 20883\|20884\|20885\|20886\|20887 3 5408 1 0 10000 0 0 0 EquipComposeSuccess7 1
			19 0 20894 0 20883\|20884\|20885\|20886\|20887 3 5408 1 0 10000 0 0 0 EquipComposeSuccess7 1
			20 0 20895 0 20883\|20884\|20885\|20886\|20887 3 5408 1 0 10000 0 0 0 EquipComposeSuccess7 1
			21 0 20896 0 20883\|20884\|20885\|20886\|20887 3 5408 1 0 10000 0 0 0 EquipComposeSuccess7 1
			22 0 20897 0 20883\|20884\|20885\|20886\|20887 3 5408 1 0 10000 0 0 0 EquipComposeSuccess7 1
			13 0 10893 0 10881\|10882\|10883\|10884\|10885\|10886\|10887 3 5408 1 0 10000 0 0 0 EquipComposeSuccess7 1
			14 0 10894 0 10881\|10882\|10883\|10884\|10885\|10886\|10887 3 5408 1 0 10000 0 0 0 EquipComposeSuccess7 1
			15 0 10895 0 10881\|10882\|10883\|10884\|10885\|10886\|10887 3 5408 1 0 10000 0 0 0 EquipComposeSuccess7 1
			16 0 10896 0 10881\|10882\|10883\|10884\|10885\|10886\|10887 3 5408 1 0 10000 0 0 0 EquipComposeSuccess7 1
			17 0 10897 0 10881\|10882\|10883\|10884\|10885\|10886\|10887 3 5408 1 0 10000 0 0 0 EquipComposeSuccess7 1
			18 0 20893 0 20881\|20882\|20883\|20884\|20885\|20886\|20887 3 5408 1 0 10000 0 0 0 EquipComposeSuccess7 1
			19 0 20894 0 20881\|20882\|20883\|20884\|20885\|20886\|20887 3 5408 1 0 10000 0 0 0 EquipComposeSuccess7 1
			20 0 20895 0 20881\|20882\|20883\|20884\|20885\|20886\|20887 3 5408 1 0 10000 0 0 0 EquipComposeSuccess7 1
			21 0 20896 0 20881\|20882\|20883\|20884\|20885\|20886\|20887 3 5408 1 0 10000 0 0 0 EquipComposeSuccess7 1
			22 0 20897 0 20881\|20882\|20883\|20884\|20885\|20886\|20887 3 5408 1 0 10000 0 0 0 EquipComposeSuccess7 1
			23 2 10571 0 10551\|10552\|10553\|10554\|10555\|10556\|10557 3 0 0 0 6000 0 5410\|1\|4000 0 EquipComposeSuccess1 1
			24 2 10572 0 10551\|10552\|10553\|10554\|10555\|10556\|10557 3 0 0 0 6000 0 5410\|1\|4000 0 EquipComposeSuccess1 1
			25 2 10573 0 10551\|10552\|10553\|10554\|10555\|10556\|10557 3 0 0 0 6000 0 5410\|1\|4000 0 EquipComposeSuccess1 1