From 648939932f822e4bbf312ccce4d9594c98fbac23 Mon Sep 17 00:00:00 2001
From: CeHua_ZWJ <ceh@163.com>
Date: 星期五, 21 九月 2018 17:08:27 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server
---
CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldBoss.pyc | 0
db/PyMongoDataServer/SysDB/tagChinItem.txt | 9 +++++----
CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt | 1 +
3 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt b/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt
index 2bdd81b..a2d2c14 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt
@@ -64,5 +64,6 @@
BossRebornTotalPoint 2200|3300|4400|5500 26|51|101|9999
BossRebornNotify [50,80] [0,20,40]
ServerActivePlayerCnt 100 max(20,min(yesterdayPlayerCnt,150))
+FirstDayActivePlayerCnt 1000
CeremonyWorldLv {"1":[[0,100],[101,200],[201,900]],"2":[[0,100],[101,200],[201,900]],"3":[[0,100],[101,200],[201,900]],"4":[[0,100],[101,200],[201,900]]}
FairyGrabBossID [50103001,50103002,50103003,50103004,50103005,50103006,50103007] [[26,14000,1]] -60
diff --git a/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldBoss.pyc b/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldBoss.pyc
index bfe0faf..869494f 100644
--- a/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldBoss.pyc
+++ b/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldBoss.pyc
Binary files differ
diff --git a/db/PyMongoDataServer/SysDB/tagChinItem.txt b/db/PyMongoDataServer/SysDB/tagChinItem.txt
index e9a2123..b101ede 100644
--- a/db/PyMongoDataServer/SysDB/tagChinItem.txt
+++ b/db/PyMongoDataServer/SysDB/tagChinItem.txt
@@ -65,10 +65,10 @@
107 1 0 初级暴击神兵石 20 0 0 0 0 999 110 1 1 0 1 0 0 0 0 0 1 5 0 10 0 1 0 0 206 25 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
108 2 0 中级暴击神兵石 20 0 0 0 0 999 110 1 1 0 1 0 0 0 0 0 1 30 0 20 0 1 0 0 206 150 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
109 3 0 高级暴击神兵石 20 0 0 0 0 999 110 1 1 0 1 0 0 0 0 0 1 150 0 50 0 1 0 0 206 750 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
-141 1 0 初级溶彩石 6 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 10 0 10 0 1 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
-142 1 0 中级溶彩石 6 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 15 0 20 0 1 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
-143 1 0 高级溶彩石 6 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 25 0 50 0 1 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
-144 1 0 顶级溶彩石 6 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 50 0 100 0 1 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
+141 1 0 初级溶彩石 6 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 10 0 10 0 1 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
+142 1 0 中级溶彩石 6 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 15 0 20 0 1 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
+143 1 0 高级溶彩石 6 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 25 0 50 0 1 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
+144 1 0 顶级溶彩石 6 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 50 0 100 0 1 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
145 1 0 30万潜力 5 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 30 0 100 0 1 0 0 205 300000 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
146 1 0 40万潜力 5 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 40 0 100 0 1 0 0 205 400000 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
147 1 0 500万潜力 5 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 500 0 100 0 1 0 0 205 5000000 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
@@ -77,6 +77,7 @@
150 1 0 50万潜力 5 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 100 0 100 0 1 0 0 205 500000 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
151 1 0 200万潜力 5 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 100 0 100 0 1 0 0 205 2000000 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
152 1 0 750万潜力 5 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 500 0 100 0 1 0 0 205 7500000 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
+153 1 0 完美溶彩石 6 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 100 0 200 0 1 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
181 1 0 坐骑丹 21 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 10 0 10 0 1 0 0 301 100 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
191 1 0 幼灵之魂 22 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 100 0 20 0 1 0 0 7 30 0 0 8 10 0 0 6 420 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
192 1 0 灵兽之魂 22 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 200 0 20 0 1 0 0 7 60 0 0 8 15 0 0 6 900 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