From d16ac1dce651427ed18a3180a95d87eeec0844c6 Mon Sep 17 00:00:00 2001
From: cehua_wcy <781813756@qq.com>
Date: 星期四, 13 九月 2018 21:38:39 +0800
Subject: [PATCH] Merge branch '1.0.15' of http://192.168.0.87:10010/r/snxx_server into 1.0.15
---
db/PyMongoDataServer/PySysDB/tagResourcesBack.txt | 4 ++--
db/PyMongoDataServer/SysDB/tagChinItem.txt | 2 +-
db/PyMongoDataServer/PySysDB/tagFuncConfig.txt | 2 +-
CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt b/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt
index a930bdc..6002b31 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt
@@ -48,7 +48,7 @@
SetWorldPosShunt {10010:10, 10020:10, 10030:10, 10040:10, 10050:25, 10060:25} 160
DogzFBRefreshCfg {(101,102,103,104,105,106,107,108,109):[20302001,1,'30',2,3], (121,122,123,124):[20302002,1,'40',2,3], (131,132,133):[20302003,10,'30',30,30]} 20303001 [20302001, 20302003]
XMZZBetCfg {}
-XMZZAward {"3":[[104,1,1]],"6":[[104,2,1]],"9":[[104,3,1]],"12":[[105,1,1]],"15":[[105,1,1]]} [[56,1,1]] [[105,2,1],[992,1,1]] [[105,1,1],[993,1,1]] 500
+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
XMZZPKPowerRange [[30,10],[100,50]] [2,3]
XMZZSpecialNPCRate min(5000,(conWinCnt*625+10))
diff --git a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
index c67f05a..aa702fb 100644
--- a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
@@ -250,7 +250,7 @@
DogzFBRefreshCfg {(101,102,103,104,105,106,107,108,109):[20302001,1,'30',2,3], (121,122,123,124):[20302002,1,'40',2,3], (131,132,133):[20302003,10,'30',30,30]} 20303001 [20302001, 20302003]
DogzFBCollect {20302001:1,20302002:1} {20302001:1,20302002:1}
XMZZBetCfg {}
-XMZZAward {"3":[[104,1,1]],"6":[[104,2,1]],"9":[[104,3,1]],"12":[[105,1,1]],"15":[[105,1,1]]} [[56,1,1]] [[105,2,1],[992,1,1]] [[105,1,1],[993,1,1]] 500
+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
XMZZRobotSkill {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}}
XMZZPKAward [0,10,20,30,40,50,60,70,80,90] addPer+100 + int(math.ceil(HPPer/10.0)) 50 reExp*216*(100+addPer)/100 reExp*108
diff --git a/db/PyMongoDataServer/PySysDB/tagResourcesBack.txt b/db/PyMongoDataServer/PySysDB/tagResourcesBack.txt
index c016393..4f34398 100644
--- a/db/PyMongoDataServer/PySysDB/tagResourcesBack.txt
+++ b/db/PyMongoDataServer/PySysDB/tagResourcesBack.txt
@@ -5,8 +5,8 @@
4 3 0 15 0 {"exp":"18000*reExp", "item":[{"ItemID":24,"ItemCount":"30"},{"ItemID":26,"ItemCount":"16000"}]} 50000 {"exp":"9900*reExp", "item":[{"ItemID":24,"ItemCount":"30"},{"ItemID":26,"ItemCount":"8800"}]}
5 5 0 15 30 {"item":[{"ItemID":24,"ItemCount":"15"},{"ItemID":4151,"ItemCount":"max(min(1,extraData),0)*2+max(min(2,extraData)-1,0)*2+max(min(3,extraData)-2,0)*2+max(min(4,extraData)-3,0)*2+max(min(5,extraData)-4,0)*3+max(min(6,extraData)-5,0)*2"}]} 60000 {"item":[{"ItemID":24,"ItemCount":"15"},{"ItemID":4151,"ItemCount":"max(min(1,extraData),0)+max(min(2,extraData)-1,0)+max(min(3,extraData)-2,0)+max(min(4,extraData)-3,0)+max(min(5,extraData)-4,0)*2+max(min(6,extraData)-5,0)"}]}
6 6 1 15 50 {"exp":"21600*reExp*expRate", "item":[{"ItemID":24,"ItemCount":"30"}]} 83000 {"exp":"12474*reExp", "item":[{"ItemID":24,"ItemCount":"30"}]}
-7 10 0 25 0 {"exp":"12000*reExp", "item":[{"ItemID":24,"ItemCount":"30"},{"ItemID":103,"ItemCount":"1"},{"ItemID":105,"ItemCount":"1"},{"ItemID":104,"ItemCount":"4"}]} 150000 {"exp":"6600*reExp", "item":[{"ItemID":24,"ItemCount":"30"},{"ItemID":102,"ItemCount":"2"},{"ItemID":104,"ItemCount":"5"}]}
-8 14 0 8 0 {"exp":"4000*reExp", "item":[{"ItemID":24,"ItemCount":"30"},{"ItemID":105,"ItemCount":"1"}]} 50000 {"exp":"2200*reExp", "item":[{"ItemID":24,"ItemCount":"30"},{"ItemID":104,"ItemCount":"3"}]}
+7 10 0 25 0 {"exp":"12000*reExp", "item":[{"ItemID":24,"ItemCount":"30"},{"ItemID":105,"ItemCount":"1"},{"ItemID":102,"ItemCount":"2"}]} 150000 {"exp":"6600*reExp", "item":[{"ItemID":24,"ItemCount":"30"},{"ItemID":104,"ItemCount":"6"},{"ItemID":102,"ItemCount":"2"}]}
+8 14 0 8 0 {"exp":"4000*reExp", "item":[{"ItemID":24,"ItemCount":"30"},{"ItemID":106,"ItemCount":"2"}]} 50000 {"exp":"2200*reExp", "item":[{"ItemID":24,"ItemCount":"30"},{"ItemID":105,"ItemCount":"2"}]}
9 8 0 25 0 {"exp":"12000*reExp", "item":[{"ItemID":24,"ItemCount":"30"},{"ItemID":103,"ItemCount":"1"},{"ItemID":181,"ItemCount":"8"},{"ItemID":102,"ItemCount":"2"}]} 150000 {"exp":"6600*reExp", "item":[{"ItemID":24,"ItemCount":"30"},{"ItemID":181,"ItemCount":"4"},{"ItemID":102,"ItemCount":"4"}]}
10 7 0 50 0 {"exp":"72000*reExp", "item":[{"ItemID":24,"ItemCount":"100"},{"ItemID":26,"ItemCount":"33000"}]} 167000 {"exp":"39600*reExp", "item":[{"ItemID":24,"ItemCount":"100"},{"ItemID":26,"ItemCount":"18150"}]}
11 11 0 25 50 {"item":[{"ItemID":24,"ItemCount":"20"},{"ItemID":29,"ItemCount":"max(min(1,extraData),0)*424500+max(min(2,extraData)-1,0)*536000+max(min(3,extraData)-2,0)*665000+max(min(4,extraData)-3,0)*812000+max(min(5,extraData)-4,0)*975500+max(min(6,extraData)-5,0)*1157000+max(min(7,extraData)-6,0)*1356500+max(min(8,extraData)-7,0)*1573500"},{"ItemID":141,"ItemCount":"max(min(1,extraData),0)*5+max(min(2,extraData)-1,0)*10+max(min(3,extraData)-2,0)*15"},{"ItemID":142,"ItemCount":"max(min(4,extraData)-3,0)*10+max(min(5,extraData)-4,0)*15"},{"ItemID":143,"ItemCount":"max(min(6,extraData)-5,0)*10+max(min(extraData,7)-6,0)*15"},{"ItemID":144,"ItemCount":"max(min(8,extraData)-7,0)*15"}]} 33000 {"item":[{"ItemID":24,"ItemCount":"20"},{"ItemID":29,"ItemCount":"max(min(1,extraData),0)*254700+max(min(2,extraData)-1,0)*321600+max(min(3,extraData)-2,0)*399000+max(min(4,extraData)-3,0)*487200+max(min(5,extraData)-4,0)*585300+max(min(6,extraData)-5,0)*694200+max(min(7,extraData)-6,0)*813900+max(min(8,extraData)-7,0)*944100"},{"ItemID":141,"ItemCount":"max(min(1,extraData),0)*3+max(min(2,extraData)-1,0)*6+max(min(3,extraData)-2,0)*9"},{"ItemID":142,"ItemCount":"max(min(4,extraData)-3,0)*6+max(min(5,extraData)-4,0)*9"},{"ItemID":143,"ItemCount":"max(min(6,extraData)-5,0)*6+max(min(extraData,7)-6,0)*9"},{"ItemID":144,"ItemCount":"max(min(8,extraData)-7,0)*6"}]}
diff --git a/db/PyMongoDataServer/SysDB/tagChinItem.txt b/db/PyMongoDataServer/SysDB/tagChinItem.txt
index b6599d9..c1591de 100644
--- a/db/PyMongoDataServer/SysDB/tagChinItem.txt
+++ b/db/PyMongoDataServer/SysDB/tagChinItem.txt
@@ -186,7 +186,7 @@
990 1 0 地级经验丹 13 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 5 0 50 0 1 0 0 215 1800 450 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
991 1 0 天级经验丹 13 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 5 0 50 0 1 0 0 215 1800 550 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
992 1 0 仙魔之争经验丹 13 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 24 0 50 0 1 0 0 215 8400 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
-993 1 0 仙魔之争经验丹 13 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 18 0 50 0 1 0 0 215 6720 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
+993 1 0 仙魔之争经验丹 13 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 18 0 50 0 1 0 0 215 5880 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
994 1 0 世界Boss经验丹 13 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 50 0 50 0 1 0 0 215 18000 150 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
995 1 0 世界Boss经验丹 13 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 50 0 50 0 1 0 0 215 18000 200 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
996 1 0 世界Boss经验丹 13 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 50 0 50 0 1 0 0 215 18000 250 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
--
Gitblit v1.8.0