From d528db973e590314a85e248e2ba84beb116dbc6a Mon Sep 17 00:00:00 2001
From: cehua_wcy <781813756@qq.com>
Date: 星期日, 30 十二月 2018 14:05:43 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server
---
db/PyMongoDataServer/PySysDB/tagCTG.txt | 28 ++++++++++++++--------------
db/PyMongoDataServer/PySysDB/tagFuncConfig.txt | 2 +-
ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip | 0
3 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip b/ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip
index edf4d7e..6c6c760 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip
Binary files differ
diff --git a/db/PyMongoDataServer/PySysDB/tagCTG.txt b/db/PyMongoDataServer/PySysDB/tagCTG.txt
index 5afece2..1a9277d 100644
--- a/db/PyMongoDataServer/PySysDB/tagCTG.txt
+++ b/db/PyMongoDataServer/PySysDB/tagCTG.txt
@@ -1,12 +1,12 @@
RecordID DailyBuyCount GainGold GainGoldPaper FirstGoldPaperPrize GainItemList NotifyMark
101 1 0 0 0 [[2317,1,1],[109,2,1],[108,5,1],[107,10,1]]
-102 0 100 10 0 []
-103 0 300 30 0 []
-104 0 980 100 0 []
-105 0 1280 138 0 []
-106 0 1980 248 0 []
-107 0 3280 468 0 []
-108 0 6480 1088 0 []
+102 0 100 10 100 []
+103 0 300 30 300 []
+104 0 980 100 980 []
+105 0 1280 138 1280 []
+106 0 1980 248 1980 []
+107 0 3280 468 3280 []
+108 0 6480 1088 6480 []
109 0 30000 5888 0 []
110 0 10 1 0 []
111 1 0 0 0 [[58,1,1],[194,1,1],[5,1,1],[912,1,1]] Bargaingift1
@@ -15,13 +15,13 @@
2 0 60 6 0 []
201 1 0 0 0 [[2317,1,1],[109,2,1],[108,5,1],[107,10,1]]
202 0 60 6 0 []
-203 0 300 30 0 []
-204 0 980 100 0 []
-205 0 1280 138 0 []
-206 0 1980 248 0 []
-207 0 3280 468 0 []
-208 0 6480 1088 0 []
-209 0 30000 5888 0 []
+203 0 300 30 60 []
+204 0 980 100 300 []
+205 0 1280 138 980 []
+206 0 1980 248 1280 []
+207 0 3280 468 1980 []
+208 0 6480 1088 3280 []
+209 0 30000 5888 6480 []
210 0 1 0 0 []
211 0 1 0 0 []
212 1 0 0 0 [[58,1,1],[194,1,1],[5,1,1],[912,1,1]] Bargaingift1
diff --git a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
index 0338f21..3bd2ed2 100644
--- a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
@@ -295,7 +295,7 @@
OpenServerRedPacketCfg 3 10 3600 50 5
PotentialSkillLearn {"50065":[15,47000],"50165":[15,47010],"50265":[15,47020],"1065":[15,47030],"50365":[15,47040],"50465":[15,47050],"50565":[15,47060],"50665":[15,47070],"50765":[15,47080],"50865":[15,47090],"51065":[15,47130],"51165":[15,47140],"55065":[15,47200],"55165":[15,47210],"55265":[15,47220],"2065":[15,47230],"55365":[15,47240],"55465":[15,47250],"55565":[15,47260],"55665":[15,47270],"55765":[15,47280],"55865":[15,47290],"56065":[15,47330],"56165":[15,47340]}
FirstGold {"1":[[6619,1,1],[221,1,1],[912,1,1],[4151,5,1],[3,1,1]],"2":[[6620,1,1],[221,1,1],[912,1,1],[4151,5,1],[3,1,1]]} {"1":388,"2":388} 1800
-CTG 0
+CTG 20181224
FirstGoldTryItem 1_6621|2_6622 1_10221|2_20221 9 100
ItemRecord 1 0
ItemRecordRule {0:4,39:3,111:2,45:3,9:2,58:3,22:3,28:3,8:3} [4,25,26,41,112] [947,948,949,950,953,982,983,986,1128] [] []
--
Gitblit v1.8.0