From 483d6154c621aa9d92e6cd1f32fe2fd83ea14f2c Mon Sep 17 00:00:00 2001
From: cehua_wcy <781813756@qq.com>
Date: 星期四, 22 十一月 2018 15:09:04 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server
---
db/PyMongoDataServer/PySysDB/tagCTG.txt | 6 ++++++
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/PyNetPack.ini | 5 ++++-
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetPack.pyc | 0
db/PyMongoDataServer/PySysDB/tagOrderInfo.txt | 21 +++++++++++++++++++++
db/PyMongoDataServer/PySysDB/tagFuncConfig.txt | 2 +-
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGodWeapon.pyc | 0
CoreServerGroup/GameServer/Script/ShareDefine.pyc | 0
CoreServerGroup/GameServer/Script/ChPyNetPack.pyc | 0
11 files changed, 32 insertions(+), 2 deletions(-)
diff --git a/CoreServerGroup/GameServer/Script/ChPyNetPack.pyc b/CoreServerGroup/GameServer/Script/ChPyNetPack.pyc
index 5e7c972..4a93bb3 100644
--- a/CoreServerGroup/GameServer/Script/ChPyNetPack.pyc
+++ b/CoreServerGroup/GameServer/Script/ChPyNetPack.pyc
Binary files differ
diff --git a/CoreServerGroup/GameServer/Script/ShareDefine.pyc b/CoreServerGroup/GameServer/Script/ShareDefine.pyc
index 543e762..2c224f3 100644
--- a/CoreServerGroup/GameServer/Script/ShareDefine.pyc
+++ b/CoreServerGroup/GameServer/Script/ShareDefine.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/PyNetPack.ini b/ZoneServerGroup/map1_8G/MapServer/MapServerData/PyNetPack.ini
index f05f5d8..a164022 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/PyNetPack.ini
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/PyNetPack.ini
@@ -890,12 +890,15 @@
Writer = ljd
Releaser = ljd
RegType = 0
-RegisterPackCount = 1
+RegisterPackCount = 2
PacketCMD_1=0xA5
PacketSubCMD_1=0x55
PacketCallFunc_1=OnPlusGodWeapon
+PacketCMD_2=0xA5
+PacketSubCMD_2=0x56
+PacketCallFunc_2=OnGodWeaponActivate
;聊天
[PlayerTalk]
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc
index 88d3e28..faa45db 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetPack.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetPack.pyc
index 37a0016..ffd9a6d 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetPack.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetPack.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.pyc
index 40715b4..c507129 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGodWeapon.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGodWeapon.pyc
index cd45cdb..414635e 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGodWeapon.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGodWeapon.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.pyc
index 2633543..597abb7 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.pyc
Binary files differ
diff --git a/db/PyMongoDataServer/PySysDB/tagCTG.txt b/db/PyMongoDataServer/PySysDB/tagCTG.txt
index f1ba5dd..7316e69 100644
--- a/db/PyMongoDataServer/PySysDB/tagCTG.txt
+++ b/db/PyMongoDataServer/PySysDB/tagCTG.txt
@@ -9,6 +9,9 @@
108 0 6480 1088 6480 []
109 0 30000 5888 0 []
110 0 10 1 0 []
+111 1 0 0 0 [[58,1,1],[194,1,1],[5,1,1],[912,1,1]]
+112 1 0 0 0 [[4208,1,1],[4151,50,1],[5,1,1],[913,1,1]]
+113 1 0 0 0 [[255,1,1],[196,1,1],[181,80,1],[913,1,1]]
2 0 60 6 60 []
201 1 0 0 0 [[2317,1,1],[109,2,1],[108,5,1],[107,10,1]]
202 0 60 6 60 []
@@ -21,3 +24,6 @@
209 0 30000 5888 0 []
210 0 1 0 0 []
211 0 1 0 0 []
+212 1 0 0 0 [[58,1,1],[194,1,1],[5,1,1],[912,1,1]]
+213 1 0 0 0 [[4208,1,1],[4151,50,1],[5,1,1],[913,1,1]]
+214 1 0 0 0 [[255,1,1],[196,1,1],[181,80,1],[913,1,1]]
diff --git a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
index 5ecf827..03bd1dc 100644
--- a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
@@ -305,7 +305,7 @@
CeremonyFireParty {"0":801,"1":802,"2":803}
CeremonyRankLimit 3280
TJDropTaskItem {}
-SuperGiftTimeList [[651,3],[652,5],[653,7]] []
+SuperGiftTimeList [[6,3],[7,5],[8,7]] []
OSSaleOpenMail [1,2,3,4,5,6,7] []
FairyGrabBossID [50103001,50103002,50103003,50103004,50103005,50103006,50103007] [[26,14000,1]] -60
FairyGrabBoss {50103001:{1:[[2352,1,1]],2:[[2353,1,1]],3:[[2354,1,1]]},50103002:{1:[[2356,1,1]],2:[[2357,1,1]],3:[[2358,1,1]]},50103003:{1:[[2360,1,1]],2:[[2361,1,1]],3:[[2362,1,1]]},50103004:{1:[[2364,1,1]],2:[[2365,1,1]],3:[[2366,1,1]]},50103005:{1:[[2368,1,1]],2:[[2369,1,1]],3:[[2370,1,1]]},50103006:{1:[[2372,1,1]],2:[[2373,1,1]],3:[[2374,1,1]]},50103007:{1:[[2376,1,1]],2:[[2377,1,1]],3:[[2378,1,1]]}} 2 {50103001:[[2351,1,1]],50103002:[[2355,1,1]],50103003:[[2359,1,1]],50103004:[[2363,1,1]],50103005:[[2367,1,1]],50103006:[[2371,1,1]],50103007:[[2375,1,1]]} [[10, "FairyGrabBossWillKill"]]
diff --git a/db/PyMongoDataServer/PySysDB/tagOrderInfo.txt b/db/PyMongoDataServer/PySysDB/tagOrderInfo.txt
index 6c7a830..132fbde 100644
--- a/db/PyMongoDataServer/PySysDB/tagOrderInfo.txt
+++ b/db/PyMongoDataServer/PySysDB/tagOrderInfo.txt
@@ -31,6 +31,9 @@
sn.android.98 226114725 98 0 6
sn.android.128 226114725 128 0 7
sn.android.168 226114725 168 0 8
+sn.android.jbch 226114725 18 111 0
+sn.android.ntlc 226114725 30 112 0
+sn.android.jszq 226114725 98 113 0
lxj.18 508021130 18 101 0
lxj.6 508021130 6 2 0
lxj.30 508021130 30 103 0
@@ -62,6 +65,9 @@
lxj.android.98 813015059 98 0 6
lxj.android.128 813015059 128 0 7
lxj.android.168 813015059 168 0 8
+lxj.android.jbch 813015059 18 111 0
+lxj.android.ntlc 813015059 30 112 0
+lxj.android.jszq 813015059 98 113 0
snxxz.18 822055139 18 101 0
snxxz.10 822055139 10 102 0
snxxz.30 822055139 30 103 0
@@ -78,6 +84,9 @@
snxxz.android.98 822055139 98 0 6
snxxz.android.128 822055139 128 0 7
snxxz.android.168 822055139 168 0 8
+snxxz.android.jbch 822055139 18 111 0
+snxxz.android.ntlc 822055139 30 112 0
+snxxz.android.jszq 822055139 98 113 0
snxxz.18 828115704 18 101 0
snxxz.6 828115704 6 2 0
snxxz.30 828115704 30 103 0
@@ -108,6 +117,9 @@
572 mrgame 68 0 5
573 mrgame 128 0 7
574 mrgame 168 0 8
+585 mrgame 18 111 0
+586 mrgame 30 112 0
+587 mrgame 98 113 0
sgsbl.18 815035927 18 101 0
sgsbl.6 815035927 6 2 0
sgsbl.30 815035927 30 103 0
@@ -138,6 +150,9 @@
test.libao.68 test 68 0 5
test.libao.128 test 128 0 7
test.libao.168 test 168 0 8
+test.libao.jbch test 18 111 0
+test.libao.ntlc test 30 112 0
+test.libao.jszq test 98 113 0
xj.18 spxjgame 18 101 0
xj.10 spxjgame 10 102 0
xj.30 spxjgame 30 103 0
@@ -153,6 +168,9 @@
xj.android.68 spxjgame 68 0 5
xj.android.128 spxjgame 128 0 7
xj.android.168 spxjgame 168 0 8
+xj.android.jbch spxjgame 18 111 0
+xj.android.ntlc spxjgame 30 112 0
+xj.android.jszq spxjgame 98 113 0
jkjk.18 mrgameios 18 101 0
jkjk.06 mrgameios 6 2 0
jkjk.030 mrgameios 30 103 0
@@ -196,6 +214,9 @@
jisu.android.68 jisugame 68 0 5
jisu.android.128 jisugame 128 0 7
jisu.android.168 jisugame 168 0 8
+jisu.android.jbch jisugame 18 111 0
+jisu.android.ntlc jisugame 30 112 0
+jisu.android.jszq jisugame 98 113 0
com.snjjxios.01 jisugameios 18 101 0
com.snjjxios.02 jisugameios 6 2 0
com.snjjxios.03 jisugameios 30 103 0
--
Gitblit v1.8.0