From 1f5be505486468d1e16043501720d66867b18f5e Mon Sep 17 00:00:00 2001 From: cehua_wcy <781813756@qq.com> Date: 星期四, 27 十二月 2018 16:43:56 +0800 Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server --- db/PyMongoDataServer/PySysDB/tagFuncOpenLV.txt | 1 + db/PyMongoDataServer/SysDB/tagChinItem.txt | 4 ++-- CoreServerGroup/GameServer/PySysDB/tagFuncOpenLV.txt | 1 + CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt b/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt index d7ed0db..ade3f80 100644 --- a/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt +++ b/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt @@ -79,4 +79,4 @@ CrossRealmCfg 5 CrossRealmPKMatch 5 3 60 [32010,32011] [(10, 7), (40,37)] CrossRealmPKCfg [100, 10] 180 50 -CrossRealmPKScore 0 [20, 10] cWinCount*5 +CrossRealmPKScore 0 [100, 30] min(cWinCount*10,100) diff --git a/CoreServerGroup/GameServer/PySysDB/tagFuncOpenLV.txt b/CoreServerGroup/GameServer/PySysDB/tagFuncOpenLV.txt index c8610fe..a260ff0 100644 --- a/CoreServerGroup/GameServer/PySysDB/tagFuncOpenLV.txt +++ b/CoreServerGroup/GameServer/PySysDB/tagFuncOpenLV.txt @@ -105,3 +105,4 @@ 156 300 0 0 157 150 0 0 158 300 0 0 +159 300 0 0 diff --git a/db/PyMongoDataServer/PySysDB/tagFuncOpenLV.txt b/db/PyMongoDataServer/PySysDB/tagFuncOpenLV.txt index dee0b17..93700ce 100644 --- a/db/PyMongoDataServer/PySysDB/tagFuncOpenLV.txt +++ b/db/PyMongoDataServer/PySysDB/tagFuncOpenLV.txt @@ -105,3 +105,4 @@ 156 300 0 0 0 0 157 150 0 0 0 0 158 300 0 0 0 0 +159 300 0 0 0 0 diff --git a/db/PyMongoDataServer/SysDB/tagChinItem.txt b/db/PyMongoDataServer/SysDB/tagChinItem.txt index b40afea..0fd7b32 100644 --- a/db/PyMongoDataServer/SysDB/tagChinItem.txt +++ b/db/PyMongoDataServer/SysDB/tagChinItem.txt @@ -1178,10 +1178,10 @@ 7155 1 0 双核：体质灵力 63 0 1 0 0 1 1 0 0 0 1 0 0 0 0 0 1 10 0 5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 7194 1 0 魂尘 63 0 1 0 0 1 1 0 0 0 1 0 0 0 0 0 1 10 0 5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 7195 1 0 聚魂碎片 63 0 1 0 0 1 1 0 0 0 1 0 0 0 0 0 1 10 0 5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -7196 1 0 核心环 63 0 1 0 0 1 1 0 0 0 1 0 0 0 0 0 1 10 0 5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +7196 1 0 核心环 63 0 1 0 0 1 1 0 0 0 1 0 0 0 0 0 1 10 0 5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 7197 1 0 魂尘 63 0 1 0 0 1 1 0 0 0 1 0 0 0 0 0 1 10 0 5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 7198 1 0 聚魂碎片 63 0 1 0 0 1 1 0 0 0 1 0 0 0 0 0 1 10 0 5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -7199 1 0 核心环 63 0 1 0 0 1 1 0 0 0 1 0 0 0 0 0 1 10 0 5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +7199 1 0 核心环 63 0 1 0 0 1 1 0 0 0 1 0 0 0 0 0 1 10 0 5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 7201 1 0 生命之魂 62 0 1 0 0 1 1 0 0 0 1 0 0 0 0 0 1 10 0 5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 7202 1 0 生命之魂 62 0 1 0 0 1 1 0 0 0 1 0 0 0 0 0 1 10 0 5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 7203 1 0 生命之魂 62 0 1 0 0 1 1 0 0 0 1 0 0 0 0 0 1 10 0 5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -- Gitblit v1.8.0