From 3d4eda7dc9e2e4f77361c9fc1ed277476f4bd9d6 Mon Sep 17 00:00:00 2001
From: cehua_LC <tingame100@163.com>
Date: 星期四, 15 十一月 2018 16:47:03 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server
---
db/PyMongoDataServer/PySysDB/tagMagicWeaponFB.txt | 37 +++++++++++++++++-
CoreServerGroup/GameServer/Script/PyGameData.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_FamilyBoss.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerBourseTube.pyc | 0
CoreServerGroup/GameServer/Script/Player/PlayerBourse.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/ItemCommon.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerMagicWeapon.pyc | 0
db/PyMongoDataServer/PySysDB/tagSuccess.txt | 50 ++++++++++++------------
CoreServerGroup/GameServer/Script/ChPyNetSendPack.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.pyc | 0
10 files changed, 60 insertions(+), 27 deletions(-)
diff --git a/CoreServerGroup/GameServer/Script/ChPyNetSendPack.pyc b/CoreServerGroup/GameServer/Script/ChPyNetSendPack.pyc
index 88359da..59cc753 100644
--- a/CoreServerGroup/GameServer/Script/ChPyNetSendPack.pyc
+++ b/CoreServerGroup/GameServer/Script/ChPyNetSendPack.pyc
Binary files differ
diff --git a/CoreServerGroup/GameServer/Script/Player/PlayerBourse.pyc b/CoreServerGroup/GameServer/Script/Player/PlayerBourse.pyc
index 7cbe32a..7f61ec3 100644
--- a/CoreServerGroup/GameServer/Script/Player/PlayerBourse.pyc
+++ b/CoreServerGroup/GameServer/Script/Player/PlayerBourse.pyc
Binary files differ
diff --git a/CoreServerGroup/GameServer/Script/PyGameData.pyc b/CoreServerGroup/GameServer/Script/PyGameData.pyc
index 0a8765b..f439c77 100644
--- a/CoreServerGroup/GameServer/Script/PyGameData.pyc
+++ b/CoreServerGroup/GameServer/Script/PyGameData.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.pyc
index a06ea3b..b2016da 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_FamilyBoss.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_FamilyBoss.pyc
index 01970e1..dd65907 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_FamilyBoss.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_FamilyBoss.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/ItemCommon.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/ItemCommon.pyc
index abb21ba..8379690 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/ItemCommon.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/ItemCommon.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerBourseTube.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerBourseTube.pyc
index 8fb64c2..fc27f62 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerBourseTube.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerBourseTube.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerMagicWeapon.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerMagicWeapon.pyc
index 645531c..f1039d9 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerMagicWeapon.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerMagicWeapon.pyc
Binary files differ
diff --git a/db/PyMongoDataServer/PySysDB/tagMagicWeaponFB.txt b/db/PyMongoDataServer/PySysDB/tagMagicWeaponFB.txt
index 9ce5145..78cc440 100644
--- a/db/PyMongoDataServer/PySysDB/tagMagicWeaponFB.txt
+++ b/db/PyMongoDataServer/PySysDB/tagMagicWeaponFB.txt
@@ -1,3 +1,36 @@
MWID LineID Level RefreshNPC Attr
-201 9 1 [[102,31203001,1,1,1,1,0]] {"18":2000}
-201 9 2 [[102,31203001,1,1,1,1,0]] {"18":3000}
+201 9 1 [[102,60103001,1,1,1,1,0]] {"18":2000}
+201 9 2 [[102,60103002,1,1,1,1,0]] {"18":3000}
+202 10 1 [[102,60103003,1,1,1,1,0]] {"18":4000}
+202 10 2 [[102,60103004,1,1,1,1,0]] {"18":5000}
+202 10 3 [[102,60103005,1,1,1,1,0]] {"18":6000}
+202 10 4 [[102,60103006,1,1,1,1,0]] {"18":7000}
+202 10 5 [[102,60103007,1,1,1,1,0]] {"18":8000}
+203 11 1 [[102,60103008,1,1,1,1,0]] {"18":9000}
+203 11 2 [[102,60103009,1,1,1,1,0]] {"18":10000}
+203 11 3 [[102,60103010,1,1,1,1,0]] {"18":11000}
+203 11 4 [[102,60103011,1,1,1,1,0]] {"18":12000}
+203 11 5 [[102,60103012,1,1,1,1,0]] {"18":13000}
+204 12 1 [[102,60103013,1,1,1,1,0]] {"18":14000}
+204 12 2 [[102,60103014,1,1,1,1,0]] {"18":15000}
+204 12 3 [[102,60103015,1,1,1,1,0]] {"18":16000}
+204 12 4 [[102,60103016,1,1,1,1,0]] {"18":17000}
+204 12 5 [[102,60103017,1,1,1,1,0]] {"18":18000}
+204 12 6 [[102,60103018,1,1,1,1,0]] {"18":19000}
+205 13 1 [[102,60103019,1,1,1,1,0]] {"18":20000}
+205 13 2 [[102,60103020,1,1,1,1,0]] {"18":21000}
+205 13 3 [[102,60103021,1,1,1,1,0]] {"18":22000}
+205 13 4 [[102,60103022,1,1,1,1,0]] {"18":23000}
+205 13 5 [[102,60103023,1,1,1,1,0]] {"18":24000}
+205 13 6 [[102,60103024,1,1,1,1,0]] {"18":25000}
+206 14 1 [[102,60103025,1,1,1,1,0]] {"18":26000}
+206 14 2 [[102,60103026,1,1,1,1,0]] {"18":27000}
+206 14 3 [[102,60103027,1,1,1,1,0]] {"18":28000}
+206 14 4 [[102,60103028,1,1,1,1,0]] {"18":29000}
+206 14 5 [[102,60103029,1,1,1,1,0]] {"18":30000}
+206 14 6 [[102,60103030,1,1,1,1,0]] {"18":31000}
+206 14 7 [[102,60103031,1,1,1,1,0]] {"18":32000}
+207 15 1 [[102,60103032,1,1,1,1,0]] {"18":33000}
+207 15 2 [[102,60103033,1,1,1,1,0]] {"18":34000}
+207 15 3 [[102,60103034,1,1,1,1,0]] {"18":35000}
+207 15 4 [[102,60103035,1,1,1,1,0]] {"18":36000}
diff --git a/db/PyMongoDataServer/PySysDB/tagSuccess.txt b/db/PyMongoDataServer/PySysDB/tagSuccess.txt
index 209a463..e3968bd 100644
--- a/db/PyMongoDataServer/PySysDB/tagSuccess.txt
+++ b/db/PyMongoDataServer/PySysDB/tagSuccess.txt
@@ -288,17 +288,17 @@
775 12 6 0 0 0 0 0 10
776 120 80 0 0 0 0 0 11
777 6 2 0 0 0 0 0 12
-801 30 1 1 0 0 0 0 0
-802 30 1 2 0 0 0 0 0
-803 30 1 3 0 0 0 0 0
-804 30 1 4 0 0 0 0 0
-805 30 1 5 0 0 0 0 0
-806 30 1 6 0 0 0 0 0
-807 30 1 7 0 0 0 0 0
-808 30 1 8 0 0 0 0 0
-809 30 1 9 0 0 0 0 0
-810 30 1 24 0 0 0 0 0
-811 30 1 25 0 0 0 0 0
+801 30 1 1|0 0 0 0 0 0
+802 30 1 2|0 0 0 0 0 0
+803 30 1 3|0 0 0 0 0 0
+804 30 1 4|0 0 0 0 0 0
+805 30 1 5|0 0 0 0 0 0
+806 30 1 6|0 0 0 0 0 0
+807 30 1 7|0 0 0 0 0 0
+808 30 1 8|0 0 0 0 0 0
+809 30 1 9|0 0 0 0 0 0
+810 30 1 24|0 0 0 0 0 0
+811 30 1 25|0 0 0 0 0 0
816 3 1 101060 0 0 0 0 0
817 3 1 102020 0 0 0 0 0
818 3 1 102110 0 0 0 0 0
@@ -310,20 +310,20 @@
824 3 1 107020 0 0 0 0 0
825 3 1 108020 0 0 0 0 0
826 3 1 109020 0 0 0 0 0
-831 30 1 10 0 0 0 0 0
-832 30 1 11 0 0 0 0 0
-833 30 1 12 0 0 0 0 0
-834 30 1 13 0 0 0 0 0
-835 30 1 14 0 0 0 0 0
-836 30 1 15 0 0 0 0 0
-837 30 1 16 0 0 0 0 0
-838 30 1 17 0 0 0 0 0
-839 30 1 18 0 0 0 0 0
-840 30 1 19 0 0 0 0 0
-841 30 1 20 0 0 0 0 0
-842 30 1 21 0 0 0 0 0
-843 30 1 22 0 0 0 0 0
-844 30 1 23 0 0 0 0 0
+831 30 1 10|2 0 0 0 0 0
+832 30 1 11|5 0 0 0 0 0
+833 30 1 12|5 0 0 0 0 0
+834 30 1 13|6 0 0 0 0 0
+835 30 1 14|6 0 0 0 0 0
+836 30 1 15|7 0 0 0 0 0
+837 30 1 16|4 0 0 0 0 0
+838 30 1 17|0 0 0 0 0 0
+839 30 1 18|0 0 0 0 0 0
+840 30 1 19|0 0 0 0 0 0
+841 30 1 20|0 0 0 0 0 0
+842 30 1 21|0 0 0 0 0 0
+843 30 1 22|0 0 0 0 0 0
+844 30 1 23|0 0 0 0 0 0
901 55 10 0 0 4609_1 0 0 0 0
902 55 20 0 0 4609_1 0 0 0 0
903 55 50 0 0 4610_1 0 0 0 0
--
Gitblit v1.8.0