From ede592d81b6d8c32e8c2526bbf18daa949133fe6 Mon Sep 17 00:00:00 2001
From: cehua-TT <448191260@qq.com>
Date: 星期六, 24 十一月 2018 11:15:40 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server
---
db/PyMongoDataServer/PySysDB/tagNPCStrengthen.txt | 30 +++++++-------
db/PyMongoDataServer/SysDB/tagChinSkill.txt | 10 ++--
db/PyMongoDataServer/PySysDB/tagFuncConfig.txt | 5 +-
db/PyMongoDataServer/PySysDB/tagFBHelpBattle.txt | 24 ++++++------
CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt | 2
5 files changed, 36 insertions(+), 35 deletions(-)
diff --git a/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt b/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt
index f7a24f0..7f3d017 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt
@@ -70,6 +70,6 @@
FairyGrabBossID [50103001,50103002,50103003,50103004,50103005,50103006,50103007] [[26,14000,1]] -60
OperationAction 10 0 0 0 0
HelpBattleCall 5 3 2 10 5
-HelpBattlePoint 1500 {"1":[20, 10], "2":[10, 5]}
+HelpBattlePoint 1500 {"1":[20, 10], "2":[10, 5]} 1|2
HelpBattleCheckIn 48 3 {1:[60010], 2:[60010, 51010]}
PlayerViewCache 100 [0,4]
diff --git a/db/PyMongoDataServer/PySysDB/tagFBHelpBattle.txt b/db/PyMongoDataServer/PySysDB/tagFBHelpBattle.txt
index 9290bfc..4e9ae30 100644
--- a/db/PyMongoDataServer/PySysDB/tagFBHelpBattle.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFBHelpBattle.txt
@@ -1,13 +1,13 @@
DataMapID LineID RobotFightPower RobotLV RobotSkill
-51010 0 10000 155 {}
-51010 1 20000 165 {}
-51010 2 30000 175 {}
-51010 3 40000 185 {}
-51010 4 50000 195 {}
-51010 5 60000 205 {}
-60010 0 10000 105 {}
-60010 1 50000 165 {}
-60010 2 100000 200 {}
-31110 2 10000 80 {}
-31110 5 50000 100 {}
-31110 7 100000 150 {}
+51010 0 10000 155 {1:{(12000, 12001, 12002, 12003):1, 12011:7, 12012:15, 12013:30, 12014:80, 12015:140}, 2:{(12100, 12101, 12102, 12103):1, 12111:7, 12112:15, 12114:80, 12115:140}}
+51010 1 20000 165 {1:{(12000, 12001, 12002, 12003):1, 12011:7, 12012:15, 12013:30, 12014:80, 12015:140}, 2:{(12100, 12101, 12102, 12103):1, 12111:7, 12112:15, 12114:80, 12115:140}}
+51010 2 30000 175 {1:{(12000, 12001, 12002, 12003):1, 12011:7, 12012:15, 12013:30, 12014:80, 12015:140}, 2:{(12100, 12101, 12102, 12103):1, 12111:7, 12112:15, 12114:80, 12115:140}}
+51010 3 40000 185 {1:{(12000, 12001, 12002, 12003):1, 12011:7, 12012:15, 12013:30, 12014:80, 12015:140}, 2:{(12100, 12101, 12102, 12103):1, 12111:7, 12112:15, 12114:80, 12115:140}}
+51010 4 50000 195 {1:{(12000, 12001, 12002, 12003):1, 12011:7, 12012:15, 12013:30, 12014:80, 12015:140}, 2:{(12100, 12101, 12102, 12103):1, 12111:7, 12112:15, 12114:80, 12115:140}}
+51010 5 60000 205 {1:{(12000, 12001, 12002, 12003):1, 12011:7, 12012:15, 12013:30, 12014:80, 12015:140}, 2:{(12100, 12101, 12102, 12103):1, 12111:7, 12112:15, 12114:80, 12115:140}}
+60010 0 10000 105 {1:{(12000, 12001, 12002, 12003):1, 12011:7, 12012:15, 12013:30, 12014:80, 12015:140}, 2:{(12100, 12101, 12102, 12103):1, 12111:7, 12112:15, 12114:80, 12115:140}}
+60010 1 50000 165 {1:{(12000, 12001, 12002, 12003):1, 12011:7, 12012:15, 12013:30, 12014:80, 12015:140}, 2:{(12100, 12101, 12102, 12103):1, 12111:7, 12112:15, 12114:80, 12115:140}}
+60010 2 100000 200 {1:{(12000, 12001, 12002, 12003):1, 12011:7, 12012:15, 12013:30, 12014:80, 12015:140}, 2:{(12100, 12101, 12102, 12103):1, 12111:7, 12112:15, 12114:80, 12115:140}}
+31110 2 10000 80 {1:{(12000, 12001, 12002, 12003):1, 12011:7, 12012:15, 12013:30, 12014:80, 12015:140}, 2:{(12100, 12101, 12102, 12103):1, 12111:7, 12112:15, 12114:80, 12115:140}}
+31110 5 50000 100 {1:{(12000, 12001, 12002, 12003):1, 12011:7, 12012:15, 12013:30, 12014:80, 12015:140}, 2:{(12100, 12101, 12102, 12103):1, 12111:7, 12112:15, 12114:80, 12115:140}}
+31110 7 100000 150 {1:{(12000, 12001, 12002, 12003):1, 12011:7, 12012:15, 12013:30, 12014:80, 12015:140}, 2:{(12100, 12101, 12102, 12103):1, 12111:7, 12112:15, 12114:80, 12115:140}}
diff --git a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
index aa41abc..d9725d9 100644
--- a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
@@ -103,6 +103,7 @@
GodWeaponSys {1:'GetGodWeapon',2:'GetGodWeapon1',3:'GetGodWeapon2',4:'GetGodWeapon2'}
GodLv {1:[50,150,200,250,325,500,650],2:[50,150,200,250,325,500,650],3:[50,150,200,250,325,500,650]}
GodMagicExp {"1":[10,10],"2":[15,15],"4":[25,25]}
+MagicExterior {1:'4399',2:'43999',3:'439999',4:'436999'}
WorldLvExpRate int((max(min((worldLv-playerLv)*0.0075,0.15)-max(worldLv-playerLv-20,0),0)+min((max((worldLv-playerLv-20),0)/200.0),0.5)+min((math.sqrt(max((worldLv-playerLv-20),0)/100.0)*1.5),1.5))*10000) 0 0 0 0
EquipSuitLimit 4 2 3 0 0
EquipSuitColorStar {"1":[4,1],"2":[5,2]} 2
@@ -281,7 +282,7 @@
InvestRedPackAward {2:51,3:50}
VIPInvest {"1":[1,280],"2":[281,350],"3":[351,1000]} 3
GoldInvestLVLimit 300
-OfflinePostItem 181|4151|4002|4003|4008|4009|4005|4006|951|956|4501|4502
+OfflinePostItem 181|4151|4002|4003|4008|4009|4005|4006|4011|951|956|4501|4502
TreasureSet {0:10,1: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] [250, 2000] [[982,1], [982, 10]] [0, 0] [10, 100]
TreasureSet21 max(baseRate,int(min(curLuck,30)*2+min(max(curLuck-30,0),10)*4+min(max(curLuck-40,0),20)*10)) [1, 10] 1000
@@ -315,5 +316,5 @@
WishingWellCfg 14400 10 8 5
HelpBattleCall 5 3 2 10 5
HelpBattleRefresh 5 5 5
-HelpBattlePoint 1500 {"1":[20, 10], "2":[10, 5]}
+HelpBattlePoint 1500 {"1":[20, 10], "2":[10, 5]} 1|2
HelpBattleRobot 50105026
diff --git a/db/PyMongoDataServer/PySysDB/tagNPCStrengthen.txt b/db/PyMongoDataServer/PySysDB/tagNPCStrengthen.txt
index 35efa99..1468533 100644
--- a/db/PyMongoDataServer/PySysDB/tagNPCStrengthen.txt
+++ b/db/PyMongoDataServer/PySysDB/tagNPCStrengthen.txt
@@ -99,18 +99,18 @@
50103005 1 3 1 372500 10000 0 8000 2 9900 50 1 0 0 1020 0
50103006 1 3 1 419000 10000 0 8000 2 9900 50 1 0 0 947 0
50103007 1 3 1 465600 10000 0 8000 2 9900 50 1 0 0 874 0
-31401002 0 2 0 1500 10000 0 8000 3 9900 50 1 0 0 0 0
-31403002 0 2 0 5000 10000 0 8000 3 9900 50 1 0 0 50 0
-31401003 0 2 0 800 10000 0 8000 3 9900 50 1 0 0 0 0
-31403003 0 2 0 5000 10000 0 8000 3 9900 50 1 0 0 50 0
-31401004 0 2 0 800 10000 1000 8000 3 9900 50 1 0 0 0 0
-31403004 0 2 0 5000 10000 0 8000 3 9900 50 1 0 0 50 0
-31401005 0 2 0 1000 10000 0 8000 3 9900 50 1 0 0 0 0
-31403005 0 2 0 5000 10000 0 8000 3 9900 50 1 0 0 50 0
-31401006 0 2 0 800 10000 0 8000 3 9900 50 1 0 0 0 0
-31403006 0 2 0 4000 10000 0 8000 3 9900 50 1 0 0 50 0
-31401007 0 2 0 1000 10000 0 8000 3 9900 50 1 0 0 0 0
-31403007 0 2 0 5000 10000 0 8000 3 9900 50 1 0 0 50 0
-31401008 0 2 0 500 10000 0 8000 3 9900 50 1 0 0 0 0
-31403008 0 2 0 5000 10000 0 8000 3 9900 50 1 0 0 50 0
-31401009 0 2 0 800 10000 0 8000 3 9900 50 1 0 0 0 0
+31401002 0 2 0 2000 10000 0 8000 3 9900 50 24 0 0 0 0
+31403002 0 2 0 6000 10000 0 8000 3 9900 50 1 0 0 50 0
+31401003 0 2 0 800 10000 0 8000 3 9900 50 24 0 0 0 0
+31403003 0 2 0 6000 10000 0 8000 3 9900 50 1 0 0 50 0
+31401004 0 2 0 800 10000 1000 8000 3 9900 50 12 0 0 0 0
+31403004 0 2 0 6000 10000 0 8000 3 9900 50 1 0 0 50 0
+31401005 0 2 0 1000 10000 0 8000 3 9900 50 12 0 0 0 0
+31403005 0 2 0 6000 10000 0 8000 3 9900 50 1 0 0 50 0
+31401006 0 2 0 800 10000 0 8000 3 9900 50 12 0 0 0 0
+31403006 0 2 0 6000 10000 0 8000 3 9900 50 1 0 0 50 0
+31401007 0 2 0 1000 10000 0 8000 3 9900 50 12 0 0 0 0
+31403007 0 2 0 6000 10000 0 8000 3 9900 50 1 0 0 50 0
+31401008 0 2 0 500 10000 0 8000 3 9900 50 12 0 0 0 0
+31403008 0 2 0 6000 10000 0 8000 3 9900 50 1 0 0 50 0
+31401009 0 2 0 800 10000 0 8000 3 9900 50 12 0 0 0 0
diff --git a/db/PyMongoDataServer/SysDB/tagChinSkill.txt b/db/PyMongoDataServer/SysDB/tagChinSkill.txt
index 5b069c0..ea96d5f 100644
--- a/db/PyMongoDataServer/SysDB/tagChinSkill.txt
+++ b/db/PyMongoDataServer/SysDB/tagChinSkill.txt
@@ -620,11 +620,11 @@
23024 第四层加血 23024 1 1 0 0 0 2 0 0 8 5 141 20 0 30000 0 0 0 0 0 1000 1000 0 5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 0 0 0 0 0 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
23030 境界压制 23030 1 1 0 11 0 13 0 0 16 0 40 8 0 180000 0 0 0 0 0 1060 50105019 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 10000 0 0 0 0 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0
23031 压制法阵 23031 1 1 0 11 0 1 0 0 2 6 40 0 0 1000 0 0 0 0 0 1010 10000 0 0 9999 1000 0 0 1200 10 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 1000 0 0 0 0 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0
-23041 新冰晶矿脉3层加防 23041 1 1 0 0 0 5 0 0 6 9 140 9 0 1800000 0 0 0 0 0 13 50000 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 120000 0 0 0 0 0 0 0 0 0 2 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-23042 新冰晶矿脉4层放毒 23042 1 1 0 0 0 4 0 0 6 9 140 9 0 1800000 0 0 0 0 0 1089 10000 0 10 9999 1000 0 0 4012 14 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 10000 0 0 0 0 0 0 0 0 0 2 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-23043 新冰晶矿脉5层减攻 23043 1 1 0 0 0 6 0 0 6 9 40 9 0 1800000 0 0 0 0 0 9 5000 4 0 10 5000 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 120000 0 0 0 0 0 0 0 0 0 2 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 31140 0 0
-23044 新冰晶矿脉6层加攻 23044 1 1 0 0 0 5 0 0 6 9 40 9 0 1800000 0 0 0 0 0 9 5000 3 0 10 5000 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 300000 0 0 0 0 0 0 0 0 0 2 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 31140 0 0
-23045 新冰晶矿脉7层加血 23045 1 1 0 0 0 2 0 0 18 5 140 6 0 0 0 0 0 0 0 0 1250 500 0 0 5 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 0 0 0 0 0 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+23041 新冰晶矿脉3层加防 23041 1 1 0 0 0 5 0 0 6 200 140 9 0 1800000 0 0 0 0 0 13 50000 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 120000 0 0 0 0 0 0 0 0 0 2 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+23042 新冰晶矿脉4层放毒 23042 1 1 0 0 0 4 0 0 6 200 140 9 0 1800000 0 0 0 0 0 1089 10000 0 10 9999 1000 0 0 4012 14 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 10000 0 0 0 0 0 0 0 0 0 2 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+23043 新冰晶矿脉5层减攻 23043 1 1 0 0 0 6 0 0 6 201 40 9 0 1800000 0 0 0 0 0 9 5000 4 0 10 5000 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 120000 0 0 0 0 0 0 0 0 0 2 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 31140 0 0
+23044 新冰晶矿脉6层加攻 23044 1 1 0 0 0 5 0 0 6 201 40 9 0 1800000 0 0 0 0 0 9 5000 3 0 10 5000 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 300000 0 0 0 0 0 0 0 0 0 2 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 31140 0 0
+23045 新冰晶矿脉7层加血 23045 1 1 0 0 0 2 0 0 8 0 151 10 0 0 0 0 0 0 0 0 500 0 5 2103 31403007 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 0 0 0 0 0 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
23046 新冰晶矿脉8层沉默 23046 1 1 0 0 3100 1 0 0 2 5 41 6 0 60000 0 0 0 0 0 1010 10000 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 0 0 23050 0 0 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
23050 沉默 23050 1 1 0 5 0 14 0 0 1 0 41 0 0 0 0 0 0 0 0 4012 10 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 8000 0 0 0 0 0 0 0 0 0 0 0 0 2 0 0 0 0 2 0 0 2 0 0 0 0 0 0 0
23100 复仇之刃（1层） 23100 1 10 0 0 0 5 0 0 0 0 0 0 0 0 0 0 0 0 0 9 1000 3 0 10 1000 3 0 7 1000 3 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 1200000 0 0 0 0 0 0 0 0 0 3 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 31160 0 0
--
Gitblit v1.8.0