From 0246c557a9e15c96fce97d4135318303164a3b1c Mon Sep 17 00:00:00 2001
From: CH_TRX <526616766@qq.com>
Date: 星期五, 10 八月 2018 19:35:29 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server
---
db/PyMongoDataServer/PySysDB/tagStore.txt | 17 +++++++----------
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_DuJie.pyc | 0
db/PyMongoDataServer/PySysDB/tagFBLine.txt | 4 ++--
db/PyMongoDataServer/PySysDB/tagChestsAward.txt | 2 +-
db/PyMongoDataServer/SysDB/tagChinItem.txt | 6 ++++++
db/PyMongoDataServer/PySysDB/tagFuncConfig.txt | 6 +++---
db/PyMongoDataServer/SysDB/tagChinMap.txt | 2 +-
7 files changed, 20 insertions(+), 17 deletions(-)
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_DuJie.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_DuJie.pyc
index cfab5f3..1ac603e 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_DuJie.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_DuJie.pyc
Binary files differ
diff --git a/db/PyMongoDataServer/PySysDB/tagChestsAward.txt b/db/PyMongoDataServer/PySysDB/tagChestsAward.txt
index 3905da9..b6f9342 100644
--- a/db/PyMongoDataServer/PySysDB/tagChestsAward.txt
+++ b/db/PyMongoDataServer/PySysDB/tagChestsAward.txt
@@ -109,7 +109,7 @@
2319 0 4609_1|4611_2|4612_2|4613_1|4614_1|4615_1
2320 0 4611_5|4612_5|4613_5|4614_5|4615_5
2321 0 4611_1|4612_1|4613_1|4614_1|4615_1
-2322 0 4611_1|4612_1|4613_1|4614_1|4615_1 [[2000,[4611,1]],[4000,[4612,1]],[6000,[4613,1]],[8000,[4614,1]],[10000,[4615,1]]] [[5000,1],[10000,2]]
+2322 0 [[2000,[4611,1]],[4000,[4612,1]],[6000,[4613,1]],[8000,[4614,1]],[10000,[4615,1]]] 1
2323 0 4611_1|4612_1|4613_1|4614_1|4615_1 [[2000,[4611,1]],[4000,[4612,1]],[6000,[4613,1]],[8000,[4614,1]],[10000,[4615,1]]] [[5000,3],[10000,4]]
2324 0 4611_2|4612_2|4613_2|4614_2|4615_2
2325 0 181_20
diff --git a/db/PyMongoDataServer/PySysDB/tagFBLine.txt b/db/PyMongoDataServer/PySysDB/tagFBLine.txt
index 111ec8d..433f421 100644
--- a/db/PyMongoDataServer/PySysDB/tagFBLine.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFBLine.txt
@@ -1,7 +1,7 @@
DataMapID LineID MapID LVLimitMin LVLimitMax JobRankLimit TicketID TicketCostCnt TicketPrice SweepLVLimit SweepItemID SweepCostCnt EnterPosInfo StepTime RefreshNPC Grade Rewards
31010 0 31010 110 0 0 0 0 0 0 0 0 [26,6] [180,3,10]
-31020 0 31020 0 0 0 0 0 0 0 0 0 [49,71] 10
-31020 1 31030 0 0 0 0 0 0 0 0 0 [55,14] 10
+31020 0 31020 0 0 0 0 0 0 0 0 0 [49,71] 12
+31020 1 31030 0 0 0 0 0 0 0 0 0 [55,14] 12
31040 0 31040 0 0 0 0 0 0 0 0 0 [59,19] [1,5,300,10] [[201,30102001,5,15,500,0,0],[202,30102002,4,8,100,0,0],[203,30102003,1,2,100,0,0]]
31040 1 31040 0 0 0 0 0 0 0 0 0 [60,54] [0,5,300,10] [[210,30102004,1,1,1,1,0]]
31040 2 31040 0 0 0 0 0 0 0 0 0 [60,54] [0,5,300,10] [[210,30102005,1,1,1,1,0]]
diff --git a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
index f086b89..93d576b 100644
--- a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
@@ -254,9 +254,9 @@
OfflinePostItem 181|4151|4002|4003|4008|4009|4005|4006|951|956|4501|4502
TreasureSet 10 {2330:[4313,4318,4333,4393,4383,4363,4353,4348,4358,4388,4378,4373],2331:[4314,4319,4334,4394,4384,4364,4354,4349,4359,4389,4379,4374],2332:[4315,4320,4335,4395,4385,4365,4355,4350,4360,4390,4380,4375]}
TreasureSet11 [1, 10] [248, 1968] [1000, 1001] [0, 0] [10, 100]
-TreasureSet21 min(100,baseRate+curLuck/300.0*max(100-baseRate,0)) [1, 10] 300
+TreasureSet21 int(min(100,baseRate+curLuck/300.0*max(100-baseRate,0))) [1, 10] 300
TreasureSet12 [1, 10] [98, 788] [1003, 1004] [1440, 0] [5, 50]
-TreasureSet22 min(100,baseRate+curLuck/300.0*max(100-baseRate,0)) [1, 10] 300
+TreasureSet22 int(min(100,baseRate+curLuck/300.0*max(100-baseRate,0))) [1, 10] 300
OpenServerRedPacketType 5
OSRAllMoneySys [100,300,500,800,1000,1200,1500,1800]
OpenServerRedPacketCfg 3 10 3600 50
@@ -268,7 +268,7 @@
GeTuiTJG 离线挂机已开始托管角色挂机，角色当前经验效率：%s经验/分，剩余离线挂机时间：%s小时%s分钟 您被[%s]杀死，剩余离线挂机时间：%s小时%s分钟 当前背包已满，赶快上线查收战利品吧 您的离线挂机时间已不足1个小时
EquipDecomposeAward 10 [4611,4612,4613,4614,4615]
ReloadQuests 0
-DownReward [(3,1,1),(13,1,1),(14,1,1),(5,1,1)] 70
+DownReward [(14,1,1),(911,1,1)] 70
FreeGoodsOpenTime 259200
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]]}
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]]}
diff --git a/db/PyMongoDataServer/PySysDB/tagStore.txt b/db/PyMongoDataServer/PySysDB/tagStore.txt
index 19c19a9..7e92844 100644
--- a/db/PyMongoDataServer/PySysDB/tagStore.txt
+++ b/db/PyMongoDataServer/PySysDB/tagStore.txt
@@ -151,13 +151,10 @@
801 19 0 2213 1 1 [] 0 0 0 0 0 1 80 0 0
802 19 0 2213 1 1 [] 0 0 0 0 0 1 80 0 0
803 19 0 2213 1 1 [] 0 0 0 0 0 1 80 0 0
-901 30 0 4611 1 1 [] 0 7 0 0 0 27 100 0 0
-902 30 0 4612 1 1 [] 0 7 0 0 0 27 100 0 0
-903 30 0 4613 1 1 [] 0 7 0 0 0 27 100 0 0
-904 30 0 4614 1 1 [] 0 7 0 0 0 27 100 0 0
-905 30 0 4615 1 1 [] 0 7 0 0 0 27 100 0 0
-906 30 0 4735 1 1 [] 0 7 0 0 1 27 2500 0 0
-907 30 0 4737 1 1 [] 0 7 0 0 1 27 5000 0 0
-908 30 0 4657 1 1 [] 0 7 0 0 1 27 10000 0 0
-909 30 0 4675 1 1 [] 0 7 0 0 1 27 15000 0 0
-910 30 0 4674 1 1 [] 0 7 0 0 1 27 20000 0 0
+901 30 0 2322 1 1 [] 0 7 0 0 0 27 50 0 0
+902 30 0 4658 1 1 [] 0 7 0 0 2 27 500 0 0
+903 30 0 4738 1 1 [] 0 7 0 0 3 27 800 0 0
+904 30 0 4739 1 1 [] 0 7 0 0 1 27 1000 0 0
+905 30 0 4735 1 1 [] 0 7 0 0 1 27 2000 0 0
+906 30 0 4737 1 1 [] 0 7 0 0 1 27 3000 0 0
+909 30 0 4675 1 1 [] 0 7 0 0 1 27 5000 0 0
diff --git a/db/PyMongoDataServer/SysDB/tagChinItem.txt b/db/PyMongoDataServer/SysDB/tagChinItem.txt
index eb8dff1..ccaa25b 100644
--- a/db/PyMongoDataServer/SysDB/tagChinItem.txt
+++ b/db/PyMongoDataServer/SysDB/tagChinItem.txt
@@ -299,6 +299,12 @@
2129 1 0 培元丹 15 0 0 0 0 1 1 1 1 0 1 0 0 1 0 0 1 1 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
2130 1 0 玄龙丹 15 0 0 0 0 1 1 1 1 0 1 0 0 1 0 0 1 1 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
2131 1 0 神速丹 15 0 0 0 0 1 1 1 1 0 1 0 0 1 0 0 1 1 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
+2132 1 0 一品丹药 15 0 0 0 0 1 1 1 1 0 1 0 0 1 0 0 1 1 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
+2133 1 0 二品丹药 15 0 0 0 0 1 1 1 1 0 1 0 0 1 0 0 1 1 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
+2134 1 0 三品丹药 15 0 0 0 0 1 1 1 1 0 1 0 0 1 0 0 1 1 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
+2135 1 0 四品丹药 15 0 0 0 0 1 1 1 1 0 1 0 0 1 0 0 1 1 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
+2136 1 0 五品丹药 15 0 0 0 0 1 1 1 1 0 1 0 0 1 0 0 1 1 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
+2137 1 0 六品丹药 15 0 0 0 0 1 1 1 1 0 1 0 0 1 0 0 1 1 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
2200 1 0 生命神兵石宝箱 81 0 0 0 0 999 1 1 1 0 1 0 0 1 0 0 1 160 0 5 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
2201 1 0 攻击神兵石宝箱 81 0 0 0 0 999 1 1 1 0 1 0 0 1 0 0 1 160 0 5 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
2202 1 0 符印精华超值宝箱 81 0 0 0 0 999 1 1 1 0 1 0 0 1 0 0 1 140 0 5 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
diff --git a/db/PyMongoDataServer/SysDB/tagChinMap.txt b/db/PyMongoDataServer/SysDB/tagChinMap.txt
index 8409b74..30b90ce 100644
--- a/db/PyMongoDataServer/SysDB/tagChinMap.txt
+++ b/db/PyMongoDataServer/SysDB/tagChinMap.txt
@@ -17,7 +17,7 @@
31030 BOSS之家二层 1 0 0 8 0 0 0 0 0 0 0 0 0 0 10000 50 50 1 1 0 5 35
31040 日常副本 1 0 360000 1 1 0 0 0 0 0 0 0 1 1 10000 50 50 1 1 0 0 1
31080 仙界秘境 1 0 900000 2 1 0 0 0 0 0 0 0 1 1 10000 50 50 1 1 0 0 1
-31110 渡劫 1 0 0 2 1 0 0 0 0 0 0 0 0 0 10000 50 50 1 1 0 0 1
+31110 渡劫 1 0 220000 2 1 0 0 0 0 0 0 0 0 0 10000 50 50 1 1 0 0 1
31130 符印塔 1 0 0 1 1 0 0 0 0 0 0 0 0 0 10000 50 50 1 1 0 0 1
31140 冰晶矿脉 1 0 900000 1 1 0 0 0 0 0 0 0 1 1 10000 50 50 1 1 0 0 1
31150 古神禁地 1 0 0 8 0 0 0 0 0 0 0 0 0 0 10000 50 50 1 1 0 5 32
--
Gitblit v1.8.0