From b1e6d1ab3b99141f031fa85b502776c640ce01c7 Mon Sep 17 00:00:00 2001
From: cehua_wcy <781813756@qq.com>
Date: 星期一, 03 九月 2018 14:17:31 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server
---
db/PyMongoDataServer/PySysDB/tagFuncConfig.txt | 2 +-
ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/FBCommon.pyc | 0
3 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip b/ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip
index e96d481..6d0bc6c 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/FBCommon.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/FBCommon.pyc
index 5f06689..970c173 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/FBCommon.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/FBCommon.pyc
Binary files differ
diff --git a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
index 3f8dc21..a560073 100644
--- a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
@@ -285,7 +285,7 @@
CeremonyRecharge {"0":[[1,10,1],[2,10,1],[3,10,1]],"1":[[1,10,1],[2,10,1],[3,10,1]],"2":[[1,10,1],[2,10,1],[3,10,1]]}
CeremonyFireParty {"0":801,"1":802,"2":803}
CeremonyRankLimit 3280
-TJDropTaskItem {20007:[120,1104,100,'int(killCnt/25000)+min(max(killCnt-int(killCnt/25000)*25000-random.randint(1,25000),0),1)']}
+TJDropTaskItem {20007:[120,1104,50,'int(killCnt/25000)+min(max(killCnt-int(killCnt/25000)*25000-random.randint(1,25000),0),1)']}
SuperGiftTimeList [[651,2],[652,2],[653,2]] [(181,1,1),(4151,1,1)]
FlashGiftbagMailItem [(181,1,1),(4151,1,1)]
SpringSaleMailItem [(181,1,1),(4151,1,1)]
--
Gitblit v1.8.0