From 8e7bf5a47d836fb4053faa88e3b680ed41234bdd Mon Sep 17 00:00:00 2001
From: cehua_wcy <781813756@qq.com>
Date: 星期五, 21 九月 2018 20:04:13 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server
---
CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldActionControl.pyc | 0
db/PyMongoDataServer/PySysDB/tagFuncConfig.txt | 2 +-
2 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldActionControl.pyc b/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldActionControl.pyc
index f2fab52..6cef8c7 100644
--- a/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldActionControl.pyc
+++ b/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldActionControl.pyc
Binary files differ
diff --git a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
index c6ed3fa..5897090 100644
--- a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
@@ -247,7 +247,7 @@
ItemTimeOut {"4101":[4101,380,688],"4102":[4102,288,0],"4105":[4101,380,688]}
OutOfPrintValue int(maxOOPValue*min(1,(0.001 + 0.05*(lv/350.0) + 0.1*pow((lv/350.0), 2) +0.15*pow((lv/350.0), 3) + 0.699*pow((lv/350.0), 4))))
BossStoneDelayTime 1500
-DogzAssist 3|10 3511 2|3|4|5 1_10|2_20|3_30|4_40|5_50|6_50 8351
+DogzAssist 3|6 5409 2|3|5 1_10|2_20|3_30|4_40|5_50|6_50 8352
DogzFBRefreshCfg {(101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150):[20302001,1,'30',30,30,30], (151,152,153,154,155,156,157,158,159,160):[20302002,1,'40',6,6,6], (161,162,163,164,165,166,167):[20302003,6,'30',42,42,42]} 20303001 [20302001, 20302003]
DogzFBCollect {20302001:1,20302002:1} {20302001:1,20302002:1}
XMZZBetCfg {}
--
Gitblit v1.8.0