From f8048db340785e0d9731fe7a4b47f18c320f9968 Mon Sep 17 00:00:00 2001
From: cehua_hzl <648597270@qq.com>
Date: 星期三, 26 九月 2018 21:14:11 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server
---
db/PyMongoDataServer/PySysDB/tagDogz.txt | 18 ++++----
db/PyMongoDataServer/PySysDB/tagTalentSkill.txt | 61 ++++++++++++++++++++++++++++++
ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/NPCLogic/NPCLogic_Collect/CollectNPCCfg.txt | 2
db/PyMongoDataServer/SysDB/tagChinItem.txt | 1
db/PyMongoDataServer/PySysDB/tagFuncConfig.txt | 4 +-
CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt | 2
6 files changed, 75 insertions(+), 13 deletions(-)
diff --git a/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt b/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt
index 7ae91d4..c5746e2 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt
@@ -46,7 +46,7 @@
KillBossCntLimit {(10403001,10503001,10603001,10703001,10803001,20103001,20103002,20103003,20103004,20103005,20103006,20103007,20203001,20203002,20203003,20203004,20203005,20203006,20203007):0,(30303001,30303002,30303003,30303004,30303005,30303006,30303007,30303008,30303009,30303010,30303011,30303012):1,(20303001,20303002,20303003,20303004,2030300,5,20303006,20303007):2} 0_3|1_0|2_3 {0:'WB_Limit',1:'BossHome_Limit',2:'WB_Limit'} {1:27} {0:[21,'WorldBossNoHarm']}
CreateRoleMap {1:[10010,195,81],2:[10010,195,81],3:[10010,195,81]}
SetWorldPosShunt {10010:10, 10020:10, 10030:10, 10040:10, 10050:25, 10060:25} 160
-DogzFBRefreshCfg {(101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150):[20302001,1,'60',20,20,20], (151,152,153,154,155,156,157,158,159,160):[20302002,1,'14400',8,8,8], (161,162,163,164,165,166,167):[20302003,6,'14400',42,42,42]} 20303001 [20302002, 20302003]
+DogzFBRefreshCfg {(101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150):[20302001,1,'60',20,20,20], (151,152,153,154,155,156,157,158,159,160):[20302002,1,'7200',8,8,8], (161,162,163,164,165,166,167):[20302003,8,'7200',56,56,56]} 20303001 [20302002, 20302003]
XMZZBetCfg {}
XMZZAward {"3":[[104,3,1]],"6":[[105,1,1]],"9":[[105,2,1]],"12":[[106,1,1]],"15":[[56,1,1]]} [] [[992,1,1]] [[993,1,1]] 500
XMZZDogFallLimit 1000
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/NPCLogic/NPCLogic_Collect/CollectNPCCfg.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/NPCLogic/NPCLogic_Collect/CollectNPCCfg.txt
index 8acaa83..89b4b85 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/NPCLogic/NPCLogic_Collect/CollectNPCCfg.txt
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/NPCLogic/NPCLogic_Collect/CollectNPCCfg.txt
@@ -13,6 +13,6 @@
{
#神兽副本
20302001:[1, 'GeRen_liubo_436832', (0, 0), 10000, '0', '0', 0, {(0,9999):'20302001'}, 'GeRen_liubo_612029', 'DogzSmallTreasureLimit'],
-20302002:[1, 'GeRen_liubo_436832', (0, 0), 20000, '0', '0', 0, {(0,9999):'20302002'}, 'GeRen_liubo_612029', 'DogzBigTreasureLimit'],
+20302002:[1, 'GeRen_liubo_436832', (0, 0), 30000, '0', '0', 0, {(0,9999):'20302002'}, 'GeRen_liubo_612029', 'DogzBigTreasureLimit'],
}
)
\ No newline at end of file
diff --git a/db/PyMongoDataServer/PySysDB/tagDogz.txt b/db/PyMongoDataServer/PySysDB/tagDogz.txt
index 8ee93ed..d9d87c2 100644
--- a/db/PyMongoDataServer/PySysDB/tagDogz.txt
+++ b/db/PyMongoDataServer/PySysDB/tagDogz.txt
@@ -1,10 +1,10 @@
ID BaseAttrTypes BaseAttrValues HelpBattleSkills FightPowerEx EquipPlaceColorList
1 6|7|8 3716|247|61 46010 10000 1|1|1|1|1
-2 6|7|8 4548|303|75 46011 20000 1|1|1|1|1
-3 6|7|8 5523|368|92 46000 30000 2|2|2|1|1
-4 6|7|8 6676|445|111 46005 40000 2|2|2|2|2
-5 6|7|8 8048|536|134 46012|46030 50000 3|2|2|2|2
-6 6|7|8 9685|645|161 46001|46015 60000 3|3|3|2|2
+2 6|7|8 4548|303|75 46011 20000 2|2|2|1|1
+3 6|7|8 5523|368|92 46000 30000 2|2|2|2|2
+4 6|7|8 6676|445|111 46005 40000 3|2|2|2|2
+5 6|7|8 8048|536|134 46012|46030 50000 3|3|3|2|2
+6 6|7|8 9685|645|161 46001|46015 60000 3|3|3|3|3
7 6|7|8 11638|775|193 46006|46020 70000 3|3|3|3|3
8 6|7|8 13966|931|232 46025|46060 80000 4|3|3|3|3
9 6|7|8 16734|1115|278 46025|46055 90000 4|4|4|3|3
@@ -13,8 +13,8 @@
12 6|7|8 28407|1893|473 46025|46050 120000 5|5|5|4|4
13 6|7|8 33696|2246|561 46025|46040|46070 130000 5|5|5|5|5
14 6|7|8 39835|2655|663 46025|46035|46045 140000 5|5|5|5|5
-15 6|7|8 46926|3128|782 46025|46075|46085 150000 6|6|5|5|5
-16 6|7|8 55074|3671|917 46025|46056|46066 160000 6|6|6|5|5
-17 6|7|8 64393|4292|1073 46025|46051|46081 170000 6|6|6|6|5
-18 6|7|8 75000|5000|1250 46025|46041|46071 180000 6|6|6|6|6
+15 6|7|8 46926|3128|782 46025|46075|46085 150000 6|5|5|5|5
+16 6|7|8 55074|3671|917 46025|46056|46066 160000 6|6|5|5|5
+17 6|7|8 64393|4292|1073 46025|46051|46081 170000 6|6|6|5|5
+18 6|7|8 75000|5000|1250 46025|46041|46071 180000 6|6|6|6|5
19 6|7|8 87019|5801|1450 46025|46086|46076 190000 6|6|6|6|6
diff --git a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
index ae78a06..9c64052 100644
--- a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
@@ -249,8 +249,8 @@
OutOfPrintValue int(maxOOPValue*min(1,(0.001 + 0.05*(lv/350.0) + 0.1*pow((lv/350.0), 2) +0.15*pow((lv/350.0), 3) + 0.699*pow((lv/350.0), 4))))
BossStoneDelayTime 1500
DogzAssist 3|6 5409 2|3|5 1_10|2_20|3_30|4_40|5_50|6_50 8352
-DogzFBRefreshCfg {(101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150):[20302001,1,'60',20,20,20], (151,152,153,154,155,156,157,158,159,160):[20302002,1,'14400',8,8,8], (161,162,163,164,165,166,167):[20302003,6,'14400',42,42,42]} 20303001 [20302002, 20302003]
-DogzFBCollect {20302001:2,20302002:2} {20302001:2,20302002:3}
+DogzFBRefreshCfg {(101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150):[20302001,1,'60',20,20,20], (151,152,153,154,155,156,157,158,159,160):[20302002,1,'7200',8,8,8], (161,162,163,164,165,166,167):[20302003,8,'7200',56,56,56]} 20303001 [20302002, 20302003]
+DogzFBCollect {20302001:2,20302002:2} {20302001:2,20302002:4}
XMZZBetCfg {}
XMZZAward {"3":[[104,3,1]],"6":[[105,1,1]],"9":[[105,2,1]],"12":[[106,1,1]],"15":[[56,1,1]]} [] [[992,1,1]] [[993,1,1]] 500
XMZZRobot [30403002,30403003] 30403001
diff --git a/db/PyMongoDataServer/PySysDB/tagTalentSkill.txt b/db/PyMongoDataServer/PySysDB/tagTalentSkill.txt
new file mode 100644
index 0000000..8f5e0bb
--- /dev/null
+++ b/db/PyMongoDataServer/PySysDB/tagTalentSkill.txt
@@ -0,0 +1,61 @@
+skillId type series
+51200 1 1
+51250 1 1
+51300 1 1
+51350 1 1
+51400 1 1
+51450 1 1
+51500 1 1
+51550 1 1
+51600 1 2
+51650 1 2
+51700 1 2
+51750 1 2
+51800 1 2
+51850 1 2
+51900 1 2
+51950 1 2
+52000 1 2
+52050 1 2
+52100 1 3
+52150 1 3
+52200 1 3
+52250 1 3
+52300 1 3
+52350 1 3
+52400 1 3
+52450 1 3
+52500 1 3
+52550 2 1
+52600 2 1
+52650 2 1
+52700 2 1
+52750 2 1
+52800 2 1
+52850 2 1
+52900 2 1
+52950 2 2
+53000 2 2
+53050 2 2
+53100 2 2
+53150 2 2
+53200 2 2
+53250 2 2
+53300 2 2
+53350 2 2
+53400 2 2
+53450 2 3
+53500 2 3
+53550 2 3
+53600 2 3
+53650 2 3
+53700 2 3
+53750 2 3
+53800 2 3
+53850 2 3
+53900 2 3
+53950 2 3
+54000 2 3
+54050 2 3
+54100 2 3
+54150 2 3
diff --git a/db/PyMongoDataServer/SysDB/tagChinItem.txt b/db/PyMongoDataServer/SysDB/tagChinItem.txt
index f268856..115ccc1 100644
--- a/db/PyMongoDataServer/SysDB/tagChinItem.txt
+++ b/db/PyMongoDataServer/SysDB/tagChinItem.txt
@@ -269,6 +269,7 @@
1141 1 0 混乱妖域经验丹 13 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 4 0 50 0 1 0 0 215 12000 400 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
1142 1 0 麒麟之府经验丹 13 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 4 0 50 0 1 0 0 215 1800 400 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
1143 1 0 麒麟之府经验丹 13 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 4 0 50 0 1 0 0 215 600 400 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
+1144 1 0 异兽之地经验丹 13 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 4 0 50 0 1 0 0 215 3600 400 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
1500 1 0 麒麟魂魄 76 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 10 0 10 0 1 0 0 233 31190 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 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
1501 1 0 宗门令牌 76 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 25 0 10 0 1 0 0 233 60010 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 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
1502 1 0 封魔令牌 76 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 20 0 10 0 1 0 0 233 52010 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 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
--
Gitblit v1.8.0