From a0f72343434cf742b85e22c7aa1da17dd0d58859 Mon Sep 17 00:00:00 2001
From: cehua_wcy <781813756@qq.com>
Date: 星期四, 23 八月 2018 16:45:48 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server
---
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/CTG.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTJG.pyc | 0
db/PyMongoDataServer/PySysDB/tagFuncConfig.txt | 6 +++---
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/CTG.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/CTG.pyc
index 0e65fde..bc83ecb 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/CTG.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/CTG.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTJG.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTJG.pyc
index 1945e9e..16c5947 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTJG.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTJG.pyc
Binary files differ
diff --git a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
index 5355f4c..4f21a1c 100644
--- a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
@@ -54,7 +54,7 @@
BourseCharge 1 0
SkillXPAddByFB 31090|31060|31250 0 0 0 0
SPSkillType {"1":[1005,2005,3005,50005,50105,50205,50305,50405,50505,50605,50705,50805,55005,55105,55205,55305,55405,55505,55605,55705,55805,60005,60105,60205,60305,60405,60505,60605,60705,60805],"2":[1035,2035,3035,50035,50135,50235,50335,50435,50535,50635,50735,50835,55035,55135,55235,55335,55435,55535,55635,55735,55835,60035,60135,60235,60335,60435,60535,60635,60735,60835],"3":[1065,2065,3065,50065,50165,50265,50365,50465,50565,50665,50765,50865,55065,55165,55265,55365,55465,55565,55665,55765,55865,60065,60165,60265,60365,60465,60565,60665,60765,60865]} 6000 0 0 0
-PassSkillEquipLimit {"0":{"level":65},"1":{"level":90},"2":{"level":200},"3":{"level":250},"4":{"vipLv":5},"5":{"MountLv":80}} 6 3
+PassSkillEquipLimit {"0":{"level":70},"1":{"level":70},"2":{"OpenSkillSlots":2},"3":{"OpenSkillSlots":3},"4":{"OpenSkillSlots":4},"5":{"OpenSkillSlots":5}} 6 3
CreatRolePoint1 2_54|3_18|4_15|5_8 0 0 0 0
CreatRolePoint2 2_12|3_19|4_15|5_51 0 0 0 0
CreatRolePoint3 2_52|3_20|4_13|5_12 0 0 0 0
@@ -231,7 +231,7 @@
SealDemonNewbieLine 0|1|2
SealDemonDoubleDrop 0 1|2|3|4|5|6|7 2
SealDemonFirstPos [20,16]
-UnblockTreasure 101|102|103 {104:'UnblockTreasure'}
+UnblockTreasure 101|102|103 {301:'UnblockTreasure301',302:'UnblockTreasure302',303:'UnblockTreasure303',304:'UnblockTreasure304',305:'UnblockTreasure305',306:'UnblockTreasure306',307:'UnblockTreasure307',308:'UnblockTreasure308'}
MWSignDayAttr {"7":100} 304
DiceReward {"0":{"exp":"180*reExp","gold":0,"item":[2211,0]},"1":{"exp":"360*reExp","gold":0,"item":[2211,0]},"2":{"exp":"360*reExp","gold":100000,"item":[2211,1]},"3":{"exp":"360*reExp","gold":100000,"item":[2211,2]},"4":{"exp":"360*reExp","gold":500000,"item":[2211,3]},"5":{"exp":"360*reExp","gold":500000,"item":[2211,4]},"6":{"exp":"720*reExp","gold":1000000,"item":[2211,8]}}
DiceFreeNum 5
@@ -281,4 +281,4 @@
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,1101,100,'killCnt']}
+TJDropTaskItem {20007:[120,1104,100,'int(killCnt/25000)+min(max(killCnt-int(killCnt/25000)*25000-random.randint(1,25000),0),1)']}
--
Gitblit v1.8.0