From 88a957d1a4034422d8f4a73c18e9b097b691c0b0 Mon Sep 17 00:00:00 2001
From: cehua_LC <tingame100@163.com>
Date: 星期六, 22 九月 2018 02:31:28 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server
---
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ChItem.pyc | 0
db/PyMongoDataServer/SysDB/tagChinNPC.txt | 28 ++++++++++++++--------------
CoreServerGroup/GameServer/PySysDB/tagActFlashGiftbag.txt | 2 +-
CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldActionControl.pyc | 0
db/PyMongoDataServer/PySysDB/tagActFlashGiftbag.txt | 2 +-
CoreServerGroup/GameServer/Script/Player/PlayerEventCounter.pyc | 0
6 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/CoreServerGroup/GameServer/PySysDB/tagActFlashGiftbag.txt b/CoreServerGroup/GameServer/PySysDB/tagActFlashGiftbag.txt
index 39bd03b..cb1f2a4 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagActFlashGiftbag.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagActFlashGiftbag.txt
@@ -2,7 +2,7 @@
1 OpenServer01 [] 2 2 120 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [30, "LimitGift1"] 50 0
2 OpenServer02 [] 4 4 120 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [30, "LimitGift1"] 50 0
3 OpenServer03 [] 6 6 120 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [30, "LimitGift1"] 50 0
-4 OpenServer04 [] 7 7 120 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [30, "LimitGift1"] 180 0
+4 OpenServer04 [] 7 7 0 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [30, "LimitGift1"] 180 0
5 OpenServer05 [] 10 10 120 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [30, "LimitGift1"] 280 0
6 NationalDay [] 2018-9-1 2018-9-3 1440 {0:["LimitGift1",[]]} {-30:["LimitGift2",[]]} [30, "LimitGift2"] 50 1
7 NationalDay [(1,10), (100, 110), 120] 2018-9-1 2018-9-3 12:00|18:00 13:00|19:00 1440 {0:["LimitGift1",[]]} {-30:["LimitGift2",[]]} [240, "LimitGift2"] 50 1
diff --git a/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldActionControl.pyc b/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldActionControl.pyc
index 390e45f..9947b0d 100644
--- a/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldActionControl.pyc
+++ b/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldActionControl.pyc
Binary files differ
diff --git a/CoreServerGroup/GameServer/Script/Player/PlayerEventCounter.pyc b/CoreServerGroup/GameServer/Script/Player/PlayerEventCounter.pyc
index 633b290..0fce39d 100644
--- a/CoreServerGroup/GameServer/Script/Player/PlayerEventCounter.pyc
+++ b/CoreServerGroup/GameServer/Script/Player/PlayerEventCounter.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ChItem.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ChItem.pyc
index a5e1471..4f7b7ba 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ChItem.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ChItem.pyc
Binary files differ
diff --git a/db/PyMongoDataServer/PySysDB/tagActFlashGiftbag.txt b/db/PyMongoDataServer/PySysDB/tagActFlashGiftbag.txt
index 2088b62..ff71ec4 100644
--- a/db/PyMongoDataServer/PySysDB/tagActFlashGiftbag.txt
+++ b/db/PyMongoDataServer/PySysDB/tagActFlashGiftbag.txt
@@ -2,7 +2,7 @@
1 2 2 120 50 0 [[2]] SellMail4 [[181,2,1],[4151,2,1]]
2 4 4 120 50 0 [[4]] SellMail4 [[181,2,1],[4151,2,1]]
3 6 6 120 50 0 [[1]] SellMail4 [[181,2,1],[4151,2,1]]
-4 7 7 120 180 0 [[3]] SellMail4 [[181,2,1],[4151,2,1]]
+4 7 7 0 180 0 [[3]] SellMail4 [[181,2,1],[4151,2,1]]
5 10 10 120 280 0 [[5]] SellMail4 [[181,2,1],[4151,2,1]]
6 2018-9-1 2018-9-3 1440 50 1 [[1,2,3]] SellMail4 [[13,2,1],[2,2,1]]
7 2018-9-1 2018-9-3 12:00|18:00 13:00|19:00 1440 50 1 [[3]] SellMail4 [[13,2,1],[2,2,1]]
diff --git a/db/PyMongoDataServer/SysDB/tagChinNPC.txt b/db/PyMongoDataServer/SysDB/tagChinNPC.txt
index 6af5628..6523df4 100644
--- a/db/PyMongoDataServer/SysDB/tagChinNPC.txt
+++ b/db/PyMongoDataServer/SysDB/tagChinNPC.txt
@@ -556,13 +556,13 @@
31103011 2 0 琉璃伞幻象 350 0 15186 15186 0 0 0 0 90000 17959 0 0 0 0 0 0 0 0 2600 49350 45 0 300 2 5 10077 10078 10079 0 0 0 0 0 0 40 2 40197221 0 0 0 0 3 0 0 186 1 1
31203001 2 0 焚源之炬幻象 70 0 1016 1016 619 0 0 0 10000 782 0 0 0 0 0 0 59360 4 2600 9869 10 0 300 2 5 11000 11001 10300 0 0 0 0 0 0 40 2 30419 0 0 0 0 3 0 0 186 1 1
31203002 2 0 摄魂铃幻象 100 0 1630 1630 0 0 0 0 10000 2364 0 0 0 0 0 0 109323 0 2600 40420 17 0 300 2 5 11002 11003 10301 0 0 0 0 0 0 40 2 134956 0 0 0 0 3 0 0 186 1 1
-31203003 2 0 乾云镜幻象 125 0 2743 2743 0 0 0 0 10000 3909 0 0 0 0 0 0 209112 0 2600 50101 19 0 300 2 5 11004 11005 10302 0 0 0 0 0 0 40 2 354883 0 0 0 0 3 0 0 186 1 1
-31203004 2 0 天丝琴幻象 160 0 3834 3834 0 0 0 0 10000 5388 0 0 0 0 0 0 330829 0 2600 62885 22 0 300 2 5 11006 11007 10303 0 0 0 0 0 0 40 2 589353 0 0 0 0 3 0 0 186 1 1
-31203005 2 0 九幽胄幻象 180 0 6135 6135 0 0 0 0 10000 7740 0 0 0 0 0 0 684140 0 2600 80181 26 0 300 2 5 11008 11009 10304 0 0 0 0 0 0 40 2 1241651 0 0 0 0 3 0 0 186 1 1
-31203006 2 0 碧霄剑幻象 200 0 9159 9159 3165 0 0 0 10000 11038 0 0 0 0 0 0 1191979 0 2600 97853 29 0 300 2 5 11010 11011 10305 0 0 0 0 0 0 40 2 2941511 0 0 0 0 3 0 0 186 1 1
-31203007 2 0 明心扇幻象 220 0 11991 11991 4398 0 0 0 10000 13528 0 0 0 0 0 0 1714213 0 2600 113646 31 0 300 2 5 11012 11013 10306 0 0 0 0 0 0 40 2 5871444 0 0 0 0 3 0 0 186 1 1
-31203008 2 0 混元伞幻象 240 0 19161 19161 5627 0 0 0 10000 20196 0 0 0 0 0 0 2550567 0 2600 134044 34 0 300 2 5 11014 11015 10307 0 0 0 0 0 0 40 2 10329293 0 0 0 0 3 0 0 186 1 1
-31203009 2 0 冥炎瓶幻象 260 0 26632 26632 7090 0 0 0 10000 27203 0 0 0 0 0 0 3752431 0 2600 150400 36 0 300 2 5 11016 11017 10308 0 0 0 0 0 0 40 2 18898569 0 0 0 0 3 0 0 186 1 1
+31203003 2 0 乾云镜幻象 125 0 3490 3490 0 0 0 0 10000 4702 0 0 0 0 0 0 349396 0 2600 64859 23 0 300 2 5 11004 11005 10302 0 0 0 0 0 0 40 2 675789 0 0 0 0 3 0 0 186 1 1
+31203004 2 0 天丝琴幻象 160 0 5426 5426 0 0 0 0 10000 7324 0 0 0 0 0 0 502431 0 2600 73883 25 0 300 2 5 11006 11007 10303 0 0 0 0 0 0 40 2 944637 0 0 0 0 3 0 0 186 1 1
+31203005 2 0 九幽胄幻象 180 0 8106 8106 0 0 0 0 10000 10205 0 0 0 0 0 0 978484 0 2600 89393 28 0 300 2 5 11008 11009 10304 0 0 0 0 0 0 40 2 2205848 0 0 0 0 3 0 0 186 1 1
+31203006 2 0 碧霄剑幻象 200 0 9729 9729 3467 0 0 0 10000 11428 0 0 0 0 0 0 1303560 0 2600 102178 30 0 300 2 5 11010 11011 10305 0 0 0 0 0 0 40 2 3536454 0 0 0 0 3 0 0 186 1 1
+31203007 2 0 明心扇幻象 220 0 13684 13684 4876 0 0 0 10000 14967 0 0 0 0 0 0 1965547 0 2600 121824 32 0 300 2 5 11012 11013 10306 0 0 0 0 0 0 40 2 7256978 0 0 0 0 3 0 0 186 1 1
+31203008 2 0 混元伞幻象 240 0 20861 20861 5910 0 0 0 10000 21858 0 0 0 0 0 0 2809789 0 2600 138180 35 0 300 2 5 11014 11015 10307 0 0 0 0 0 0 40 2 12140261 0 0 0 0 3 0 0 186 1 1
+31203009 2 0 冥炎瓶幻象 260 0 28987 28987 7678 0 0 0 10000 29014 0 0 0 0 0 0 4145552 0 2600 156886 37 0 300 2 5 11016 11017 10308 0 0 0 0 0 0 40 2 21961318 0 0 0 0 3 0 0 186 1 1
31203010 2 0 九黎神火扇幻象 280 0 40981 40981 10837 0 0 0 10000 36716 0 0 0 0 0 0 5805805 0 2600 170046 39 0 300 2 5 11018 11019 10309 0 0 0 0 0 0 40 2 36577866 0 0 0 0 3 0 0 186 1 1
31203011 2 0 白泽灯幻象 300 0 46605 46605 12744 0 0 0 10000 43740 0 0 0 0 0 0 7502545 0 2600 185556 41 0 300 2 5 11020 11021 10310 0 0 0 0 0 0 40 2 52933623 0 0 0 0 3 0 0 186 1 1
31203012 2 0 磐龙袍幻象 320 0 57028 57028 15213 0 0 0 10000 57770 0 0 0 0 0 0 9585098 0 2600 201160 44 0 300 2 5 11022 11023 10311 0 0 0 0 0 0 40 2 74605161 0 0 0 0 3 0 0 186 1 1
@@ -582,12 +582,12 @@
31503009 2 0 刑天古神 400 0 63715 63715 0 22 0 0 10000 45295 0 1 0 0 0 0 0 3 3000 2153281 49 0 300 2 6 23010 23030 0 0 0 0 0 0 0 10 1 40371222 15 100 0 0 5 0 0 186 1 1
31501001 2 0 精英狼蛛 180 0 1870 1870 0 2 0 0 0 975 0 0 0 0 0 0 0 0 3000 582685 21 0 300 2 6 0 0 0 0 0 0 0 0 0 10 1 238036 0 0 0 0 1 0 0 1 1 1
31501002 2 0 精英石精 210 0 2047 2047 0 4 0 0 0 975 0 0 0 0 0 0 0 0 3000 685177 24 0 300 2 6 0 0 0 0 0 0 0 0 0 10 1 325391 0 0 0 0 1 0 0 1 1 1
-31501003 2 0 精英海牛 240 0 2343 2343 0 4 0 0 0 992 0 0 0 0 0 0 0 0 3000 809496 26 0 300 2 6 0 0 0 0 0 0 0 0 0 10 1 458200 0 0 0 0 1 0 0 1 1 1
-31501004 2 0 精英地龙 270 0 3109 3109 0 4 0 0 0 1231 0 0 0 0 0 0 0 0 3000 1023022 29 0 300 2 6 0 0 0 0 0 0 0 0 0 10 1 902542 0 0 0 0 1 0 0 1 1 1
+31501003 2 0 精英海牛 240 0 2343 2343 0 5 0 0 0 992 0 0 0 0 0 0 0 0 3000 809496 26 0 300 2 6 0 0 0 0 0 0 0 0 0 10 1 458200 0 0 0 0 1 0 0 1 1 1
+31501004 2 0 精英地龙 270 0 3109 3109 0 6 0 0 0 1231 0 0 0 0 0 0 0 0 3000 1023022 29 0 300 2 6 0 0 0 0 0 0 0 0 0 10 1 902542 0 0 0 0 1 0 0 1 1 1
31501005 2 0 精英水妖 300 0 3954 3954 0 7 0 0 0 1318 0 0 0 0 0 0 0 0 3000 1270711 33 0 300 2 6 0 0 0 0 0 0 0 0 0 10 1 1743177 0 0 0 0 1 0 0 1 1 1
-31501006 2 0 精英狼妖 320 0 5553 5553 0 11 0 0 0 1593 0 0 0 0 0 0 0 0 3000 1518400 36 0 300 2 6 0 0 0 0 0 0 0 0 0 10 1 4638699 0 0 0 0 1 0 0 1 1 1
-31501007 2 0 精英飞蛇 350 0 7777 7777 0 11 0 0 0 1890 0 0 0 0 0 0 0 0 3000 1766089 40 0 300 2 6 0 0 0 0 0 0 0 0 0 10 1 8935315 0 0 0 0 1 0 0 1 1 1
-31501008 2 0 精英冰妖 390 0 10513 10513 0 16 0 0 0 1971 0 0 0 0 0 0 0 0 3000 2013778 43 0 300 2 6 0 0 0 0 0 0 0 0 0 10 1 15732324 0 0 0 0 1 0 0 1 1 1
+31501006 2 0 精英狼妖 320 0 5553 5553 0 12 0 0 0 1593 0 0 0 0 0 0 0 0 3000 1518400 36 0 300 2 6 0 0 0 0 0 0 0 0 0 10 1 4638699 0 0 0 0 1 0 0 1 1 1
+31501007 2 0 精英飞蛇 350 0 7777 7777 0 15 0 0 0 1890 0 0 0 0 0 0 0 0 3000 1766089 40 0 300 2 6 0 0 0 0 0 0 0 0 0 10 1 8935315 0 0 0 0 1 0 0 1 1 1
+31501008 2 0 精英冰妖 390 0 10513 10513 0 18 0 0 0 1971 0 0 0 0 0 0 0 0 3000 2013778 43 0 300 2 6 0 0 0 0 0 0 0 0 0 10 1 15732324 0 0 0 0 1 0 0 1 1 1
31501009 2 0 精英魔族 420 0 12291 12291 0 20 0 0 0 2237 0 0 0 0 0 0 0 0 3000 2124811 47 0 300 2 6 0 0 0 0 0 0 0 0 0 10 1 19924022 0 0 0 0 1 0 0 1 1 1
31609001 17 0 随机Buff 260 0 4811 4811 0 0 0 0 0 1400 0 0 0 0 0 0 0 0 2000 370110 34 0 300 2 6 0 0 0 0 0 0 0 0 1 10 2 8032498 0 0 0 0 1 0 0 1 1 1
31602001 2 0 上古魔兵 150 0 775 775 0 0 0 0 10000 240 0 0 0 0 0 0 0 0 3000 582685 21 0 300 2 6 10014 0 0 0 0 0 0 0 0 10 2 34730 0 0 0 0 1 0 0 186 1 1
@@ -769,7 +769,7 @@
60203020 18 0 刑天之主 455 2 303827 303827 0 20 0 0 10000 10546 0 0 0 0 0 0 0 0 2500 2274753 57 0 300 0 6 23010 0 0 0 0 0 0 0 1 10 2 72283925 477365 0 0 0 5 0 0 186 1 1
61103000 2 0 境界·个人 80 2 819 819 159 1 0 0 10000 300 0 0 0 0 0 0 32740 0 2500 243893 10 0 300 0 6 23010 0 0 0 0 0 0 0 1 20 2 70047 0 0 0 0 3 0 7 186 1 1
61103001 2 0 境界·个人 110 2 1914 1914 531 2 0 0 10000 737 0 0 0 0 0 0 96018 0 2500 390039 16 0 300 0 6 23010 0 0 0 0 0 0 0 1 20 2 195152 0 0 0 0 3 0 8 186 1 1
-61103002 2 0 境界·个人 140 2 3776 3776 1340 4 0 0 10000 1447 0 0 0 0 0 0 225746 0 2500 505817 19 0 300 0 6 23010 0 0 0 0 0 0 0 1 20 2 747946 0 0 0 0 3 0 9 186 1 1
+61103002 2 0 境界·个人 140 2 3446 3446 1340 4 0 0 10000 1297 0 0 0 0 0 0 225746 0 2500 505817 19 0 300 0 6 23010 0 0 0 0 0 0 0 1 20 2 747946 0 0 0 0 3 0 9 186 1 1
61103003 2 0 境界·个人 160 2 5000 5000 2027 5 0 0 10000 1861 0 0 0 0 0 0 357145 0 2500 634880 22 0 300 0 6 23010 0 0 0 0 0 0 0 1 20 2 1560551 0 0 0 0 3 0 10 186 1 1
61103004 2 0 境界·个人 205 2 8789 8789 1480 7 0 0 10000 2925 0 0 0 0 0 0 998969 0 2500 823731 26 0 300 0 6 23010 0 0 0 0 0 0 0 1 20 2 7305448 0 0 0 0 3 0 11 186 1 1
61103005 2 0 境界·个人 230 2 12761 12761 2199 9 0 0 10000 3888 0 0 0 0 0 0 1850571 0 2500 1147341 31 0 300 0 6 23010 0 0 0 0 0 0 0 1 20 2 30821002 0 0 0 0 3 0 12 186 1 1
@@ -788,7 +788,7 @@
61103018 2 0 境界·个人 420 2 100922 100922 11562 22 0 0 10000 17614 0 0 0 0 0 0 21176768 0 2500 2207374 53 0 300 0 6 23010 0 0 0 0 0 0 0 1 20 2 59424007 7 0 0 0 3 0 25 186 1 1
61103019 2 0 境界·个人 430 2 105188 105188 12021 22 0 0 10000 18196 0 0 0 0 0 0 23357572 0 2500 2221609 54 0 300 0 6 23010 0 0 0 0 0 0 0 1 20 2 41334254 8 0 0 0 3 0 26 186 1 1
61103020 2 0 境界·个人 440 2 110253 110253 12622 22 0 0 10000 18885 0 0 0 0 0 0 25484046 0 2500 2235844 55 0 300 0 6 23010 0 0 0 0 0 0 0 1 20 2 13081550 9 0 0 0 3 0 27 186 1 1
-61203001 2 0 境界·组队 125 2 3220 3220 361 3 0 0 10000 1236 0 0 0 0 0 0 187779 0 2500 464061 18 0 300 0 6 23010 0 0 0 0 0 0 0 1 20 2 726884 0 0 0 0 3 0 28 186 1 1
+61203001 2 0 境界·组队 125 2 2894 2894 361 3 0 0 10000 1086 0 0 0 0 0 0 187779 0 2500 464061 18 0 300 0 6 23010 0 0 0 0 0 0 0 1 20 2 726884 0 0 0 0 3 0 28 186 1 1
61203002 2 0 境界·组队 190 2 6892 6892 1031 6 0 0 10000 2267 0 0 0 0 0 0 738560 0 2500 809496 26 0 300 0 6 23010 0 0 0 0 0 0 0 1 20 2 3779102 0 0 0 0 3 0 29 186 1 1
61203003 2 0 境界·组队 220 2 11402 11402 1894 8 0 0 10000 3576 0 0 0 0 0 0 1588139 0 2500 1064778 30 0 300 0 6 23010 0 0 0 0 0 0 0 1 20 2 15899742 0 0 0 0 3 0 30 186 1 1
61203004 2 0 境界·组队 250 2 17486 17486 2627 10 0 0 10000 4961 0 0 0 0 0 0 2418051 0 2500 1295385 33 0 300 0 6 23010 0 0 0 0 0 0 0 1 20 2 31848953 0 0 0 0 3 0 31 186 1 1
--
Gitblit v1.8.0