From 771426bfecc4cc8c4d2b9330e92c570933c97ecd Mon Sep 17 00:00:00 2001 From: cehua_hzl <648597270@qq.com> Date: 星期三, 26 九月 2018 22:17:47 +0800 Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server --- db/PyMongoDataServer/Config/DBConfig.pyc | 0 db/PyMongoDataServer/Common/CommFunc.pyc | 0 db/PyMongoDataServer/PySysDB/tagChestsAward.txt | 4 ++-- ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetPack.pyc | 0 db/PyMongoDataServer/PyMongoDataServer.ini | 7 ++++--- ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerDogz.pyc | 0 db/PyMongoDataServer/LogicProcess/UserCtrlDB.pyc | 0 CoreServerGroup/GameServer/Script/ChPyNetPack.pyc | 0 8 files changed, 6 insertions(+), 5 deletions(-) diff --git a/CoreServerGroup/GameServer/Script/ChPyNetPack.pyc b/CoreServerGroup/GameServer/Script/ChPyNetPack.pyc index 9d3e7b1..11d57a7 100644 --- a/CoreServerGroup/GameServer/Script/ChPyNetPack.pyc +++ b/CoreServerGroup/GameServer/Script/ChPyNetPack.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 3bcf8a2..3cb75ac 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/PlayerDogz.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerDogz.pyc index 687d502..86ccb7f 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerDogz.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerDogz.pyc Binary files differ diff --git a/db/PyMongoDataServer/Common/CommFunc.pyc b/db/PyMongoDataServer/Common/CommFunc.pyc index 1d4c21b..777dab6 100644 --- a/db/PyMongoDataServer/Common/CommFunc.pyc +++ b/db/PyMongoDataServer/Common/CommFunc.pyc Binary files differ diff --git a/db/PyMongoDataServer/Config/DBConfig.pyc b/db/PyMongoDataServer/Config/DBConfig.pyc index 6bcc037..642a37b 100644 --- a/db/PyMongoDataServer/Config/DBConfig.pyc +++ b/db/PyMongoDataServer/Config/DBConfig.pyc Binary files differ diff --git a/db/PyMongoDataServer/LogicProcess/UserCtrlDB.pyc b/db/PyMongoDataServer/LogicProcess/UserCtrlDB.pyc index 3b2be1a..ccdfc07 100644 --- a/db/PyMongoDataServer/LogicProcess/UserCtrlDB.pyc +++ b/db/PyMongoDataServer/LogicProcess/UserCtrlDB.pyc Binary files differ diff --git a/db/PyMongoDataServer/PyMongoDataServer.ini b/db/PyMongoDataServer/PyMongoDataServer.ini index 01faa76..5241c8c 100644 --- a/db/PyMongoDataServer/PyMongoDataServer.ini +++ b/db/PyMongoDataServer/PyMongoDataServer.ini @@ -13,6 +13,10 @@ ;混服平台合服后主服ID, 配置不带字母s, 纯数字, 格式: 平台 + MainServerID, 如果没有配置则默认取 ServerID 173on_lanMainServerID=9999 +;思璞登录需要key验证 +spxjgame_LoginKey=123 + + [EventReport] AppId=AppId1 Key=7ded96779343f198de9b95a05a0704c9 @@ -24,6 +28,3 @@ OSName=all GeTuiUrl=http://127.0.0.1:53000/getui/index.php -;思璞游戏 -[SPGame] -LoginKey = 132 \ No newline at end of file diff --git a/db/PyMongoDataServer/PySysDB/tagChestsAward.txt b/db/PyMongoDataServer/PySysDB/tagChestsAward.txt index 885e404..28d88e7 100644 --- a/db/PyMongoDataServer/PySysDB/tagChestsAward.txt +++ b/db/PyMongoDataServer/PySysDB/tagChestsAward.txt @@ -171,5 +171,5 @@ 2384 0 [[5000,[4151,3]],[7000,[4151,4]],[9000,[4151,5]],[10000,[4151,6]]] 1 [[10000,[4250,1]]] [[9000,0],[10000,1]] [4250] 2385 0 [[5000,[181,3]],[7000,[181,4]],[9000,[181,5]],[10000,[181,6]]] 1 [[10000,[223,1]]] [[9000,0],[10000,1]] [223] 2386 0 [[5000,[4151,3]],[7000,[4151,4]],[9000,[4151,5]],[10000,[4151,6]]] 1 [[10000,[4251,1]]] [[9000,0],[10000,1]] [4251] -2387 0 8353_1 [[57,[8204,1]],[114,[8217,1]],[171,[8230,1]],[228,[8243,1]],[285,[8256,1]],[513,[8203,1]],[741,[8216,1]],[969,[8229,1]],[1197,[8242,1]],[1425,[8255,1]],[3139,[8202,1]],[4853,[8215,1]],[6567,[8228,1]],[8281,[8241,1]],[10000,[8254,1]]] 3 [[38,[8207,1]],[76,[8220,1]],[114,[8233,1]],[152,[8246,1]],[190,[8259,1]],[536,[8206,1]],[882,[8219,1]],[1228,[8232,1]],[1574,[8245,1]],[1920,[8258,1]],[3458,[8205,1]],[4996,[8218,1]],[6534,[8231,1]],[8072,[8244,1]],[9610,[8257,1]],[10000,[8354,1]]] 1 [8206,8219,8232,8245,8258,8207,8220,8233,8246,8259] -2388 0 [[2000,[8201,1]],[4000,[8214,1]],[6000,[8227,1]],[8000,[8240,1]],[10000,[8253,1]]] 3 [[28,[8204,1]],[56,[8217,1]],[84,[8230,1]],[112,[8243,1]],[140,[8256,1]],[397,[8203,1]],[654,[8216,1]],[911,[8229,1]],[1168,[8242,1]],[1425,[8255,1]],[2567,[8202,1]],[3709,[8215,1]],[4851,[8228,1]],[5993,[8241,1]],[7135,[8254,1]],[10000,[8252,1]]] 1 +2387 0 8353_1 [[1500,[8202,1]],[3000,[8215,1]],[4500,[8228,1]],[6000,[8241,1]],[7500,[8254,1]],[7800,[8203,1]],[8100,[8216,1]],[8400,[8229,1]],[8700,[8242,1]],[9000,[8255,1]],[9200,[8204,1]],[9400,[8217,1]],[9600,[8230,1]],[9800,[8243,1]],[10000,[8256,1]]] 3 [[740,[8354,1]],[2221,[8205,1]],[3702,[8218,1]],[5183,[8231,1]],[6664,[8244,1]],[8145,[8257,1]],[8478,[8206,1]],[8811,[8219,1]],[9144,[8232,1]],[9477,[8245,1]],[9810,[8258,1]],[9847,[8207,1]],[9884,[8220,1]],[9921,[8233,1]],[9958,[8246,1]],[10000,[8259,1]]] 1 [8205,8218,8231,8244,8257,8206,8219,8232,8245,8258,8207,8220,8233,8246,8259] +2388 0 [[2000,[8352,1]],[2500,[8201,1]],[3000,[8214,1]],[3500,[8227,1]],[4000,[8240,1]],[4500,[8253,1]],[5400,[8202,1]],[6300,[8215,1]],[7200,[8228,1]],[8100,[8241,1]],[9000,[8254,1]],[9200,[8203,1]],[9400,[8216,1]],[9600,[8229,1]],[9800,[8242,1]],[10000,[8255,1]]] 1 -- Gitblit v1.8.0