From cc44238587cdf66e250594ab88fa274e33270c7e Mon Sep 17 00:00:00 2001
From: cehua-TT <448191260@qq.com>
Date: 星期一, 20 八月 2018 14:48:56 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server
---
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.pyc | 0
db/PyMongoDataServer/PySysDB/tagStore.txt | 7 ++-----
db/PyMongoDataServer/PySysDB/tagTrialExchange.txt | 30 +++++++++++++++---------------
db/PyMongoDataServer/PySysDB/tagFuncOpenLV.txt | 4 ++--
CoreServerGroup/GameServer/PySysDB/tagFuncOpenLV.txt | 4 ++--
db/PyMongoDataServer/PySysDB/tagFuncConfig.txt | 6 +++---
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_MunekadoTrial.pyc | 0
CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt | 3 ++-
8 files changed, 26 insertions(+), 28 deletions(-)
diff --git a/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt b/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt
index b3ad5d6..e1c150d 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt
@@ -42,10 +42,11 @@
MapLine 10040_10|21070_1
DropRecordValue 2339|3802|983|982|3803|3804|9051|9062|3805|3806|9073|222|4250|260|4209|9074|9075|9077|9078
DropRecordNum 40 1
-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} 0_3|1_0 {0:'WB_Limit',1:'BossHome_Limit'} {1:27} {0:[21,'WorldBossNoHarm']}
+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 {0:'WB_Limit',1:'BossHome_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):[20302001,1,'30',2,3], (121,122,123,124):[20302002,1,'40',2,3], (131,132,133):[20302003,10,'30',30,30]} 20303001
+DogzBoxLimit 2 20
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
XMZZDogFallLimit 1000
diff --git a/CoreServerGroup/GameServer/PySysDB/tagFuncOpenLV.txt b/CoreServerGroup/GameServer/PySysDB/tagFuncOpenLV.txt
index 5a732f5..8906e20 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagFuncOpenLV.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagFuncOpenLV.txt
@@ -76,7 +76,7 @@
124 95 0 0
125 55 0 0
126 0 10803 0
-127 100 0 0
+127 85 0 0
128 35 0 0
129 120 0 0
130 800 0 0
@@ -86,5 +86,5 @@
134 400 0 0
135 110 0 0
136 250 0 0
-137 200 0 0
+137 205 0 0
138 0 11003 0
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_MunekadoTrial.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_MunekadoTrial.pyc
index a1c7602..f2901c9 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_MunekadoTrial.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_MunekadoTrial.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.pyc
index e3ae538..eb63251 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.pyc
Binary files differ
diff --git a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
index 6aecef4..91207af 100644
--- a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
@@ -210,7 +210,7 @@
DropRecordBossID 10403001|10503001|10603001|10703001|10803001|20103001|20103002|20103003|20103004|20103005|20103006|20103007|20203001|20203002|20203003|20203004|20203005|20203006|20203007|30301001|30301002|30303001|30303002|30303003|30303004|30303005|30303006|30303007|30303008|30303009|30303010|30303011|30303012|31903001|31903002|31903003|31903004|31903005|31903006|31903007|31903008|31903009|31903010|31903011|31903012|31903013|31503001|31503002|31503003|31503004|31503005|31503006|31503007|31503008|31501001|31501002|31501003|31501004|31501005|31501006|31501007|31501008|60203001|60203002|60203003|60203004|60203005|60203006|60203007|60203008|60203009|60203010|60203011|60203012|60203013|60203014|60203015|60203016|60203017|60203018|60203019|60203020|30903001|30603001|30603002|30603003|30603004|30603005|30603006
PKConfig [[22,00], [8,00]] 50 10 10
FamilyKilledNotify {1:"PK_pan_31379",2:"PK_pan_861048",3:"PK_pan_202580",10:"PK_pan_272921"}
-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} 0_3|1_0 {0:'WB_Limit',1:'BossHome_Limit'} {1:27} {0:[21,'WorldBossNoHarm']}
+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 {0:'WB_Limit',1:'BossHome_Limit'} {1:27} {0:[21,'WorldBossNoHarm']}
BossHurtValue 30 0 0 0 0
FamilyInvadeCfg [180,1500,10,31170, [84,85,86,87], [101,31704003], {102:31704002,103:31704001}] {1:0.5,3:0.6,4:0.8,5:1} int(48000*reExp*starPer*min(passWheel/8.0,1)) [21010,21011] [31704001,31704002,31704003]
SwrhMonsterExp reExp*baseExp
@@ -259,9 +259,9 @@
GoldInvestLVLimit 300
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, 1984] [[1000,1], [1000, 8]] [0, 0] [10, 100]
+TreasureSet11 [1, 10] [248, 1984] [[982,1], [982, 8]] [0, 0] [10, 100]
TreasureSet21 int(min(100,baseRate+curLuck/300.0*max(100-baseRate,0))) [1, 10] 300
-TreasureSet12 [1, 10] [98, 784] [[1001,1], [1001, 8]] [1440, 0] [5, 50]
+TreasureSet12 [1, 10] [98, 784] [[983,1], [983, 8]] [1440, 0] [5, 50]
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]
diff --git a/db/PyMongoDataServer/PySysDB/tagFuncOpenLV.txt b/db/PyMongoDataServer/PySysDB/tagFuncOpenLV.txt
index 76b6742..406ec24 100644
--- a/db/PyMongoDataServer/PySysDB/tagFuncOpenLV.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFuncOpenLV.txt
@@ -76,7 +76,7 @@
124 95 0 0 0
125 55 0 0 0
126 0 10803 0 0
-127 100 0 0 0
+127 85 0 0 0
128 35 0 0 0
129 120 0 0 0
130 800 0 0 0
@@ -86,5 +86,5 @@
134 400 0 0 0
135 110 0 0 0
136 250 0 0 0
-137 200 0 0 0
+137 205 0 0 0
138 0 11003 0 0
diff --git a/db/PyMongoDataServer/PySysDB/tagStore.txt b/db/PyMongoDataServer/PySysDB/tagStore.txt
index 518e542..c9abe57 100644
--- a/db/PyMongoDataServer/PySysDB/tagStore.txt
+++ b/db/PyMongoDataServer/PySysDB/tagStore.txt
@@ -5,7 +5,7 @@
5 1 0 2213 1 1 [] 0 7 0|1|2|3|4|5|6|7|8|9|10 0 10|15|20|25|30|35|40|50|60|70|80 1 15 0 0
6 1 0 3504 1 1 [] 0 7 2 0 2 1 135 0 0
7 1 0 3514 1 1 [] 0 7 2 0 2 1 135 0 0
-8 1 0 2204 1 1 [] 0 7 3 190 6 1 100 0 0
+8 1 0 2204 1 1 [] 0 7 3 160 6 1 100 0 0
9 1 0 2203 1 1 [] 0 7 4|6|8 240 2|3|4 1 60 0 0
10 1 0 4187 1 1 [] 0 7 8 0 1 1 600 0 0
11 1 0 4188 1 1 [] 0 7 8 0 1 1 600 0 0
@@ -27,10 +27,8 @@
65 2 0 982 1 0 [] 0 0 0 500 0 1 248 0 0
66 2 0 983 1 0 [] 0 0 0 500 0 1 98 0 0
101 3 0 181 1 0 [] 0 0 0 0 0 1 10 0 0
-102 3 0 966 1 0 [] 0 0 0 0 0 1 88 0 0
103 3 0 3501 1 0 [] 0 0 0 0 0 1 10 0 0
104 3 0 3511 1 0 [] 0 0 0 0 0 1 10 0 0
-105 3 0 967 1 0 [] 0 0 0 300 0 1 128 0 0
108 3 0 4205 1 1 [] 0 0 0 0 1 1 988 0 0
109 3 0 256 1 1 [] 0 0 0 0 1 1 988 0 0
110 3 0 4207 1 1 [] 0 0 0 150 1 1 3888 0 0
@@ -48,8 +46,6 @@
163 4 0 4001 1 1 [] 0 0 0 0 0 2 30 0 0
164 4 0 4007 1 1 [] 0 0 0 200 0 2 80 0 0
165 4 0 4004 1 1 [] 0 0 0 250 0 2 20 0 0
-166 4 0 966 1 1 [] 0 0 0 0 0 2 88 0 0
-167 4 0 967 1 1 [] 0 0 0 300 0 2 128 0 0
201 5 0 12 1 1 [] 0 4 0 0 1 16 120 0 0
203 5 0 954 1 1 [] 0 4 0 0 20 16 5 0 0
204 5 0 181 1 1 [] 0 4 0 0 6 16 100 0 0
@@ -106,6 +102,7 @@
561 13 0 4606 1 0 [] 0 0 0 0 0 25 5000 0 0 ShopBuyBroadcast_2
562 13 0 4608 1 0 [] 0 0 0 0 0 25 5000 0 0 ShopBuyBroadcast_2
563 13 0 912 1 0 [] 0 0 0 0 0 25 100 0 0 ShopBuyBroadcast_2
+651 14 0 58 1 1 [[194,1,1],[5,1,1],[912,1,1]] 58 0 0 0 1 1 188 0 0 ShopBuyBroadcast_1
652 14 0 4208 1 1 [[4151,60,1],[5,1,1],[913,1,1]] 4208 0 0 0 1 1 388 0 0 ShopBuyBroadcast_1
653 14 0 255 1 1 [[196,1,1],[181,140,1],[913,1,1]] 255 0 0 0 1 1 1088 0 0 ShopBuyBroadcast_1
701 15 0 4151 40 1 [] 0 0 0 106 1 1 88 400 1 OpenTakePreferential1
diff --git a/db/PyMongoDataServer/PySysDB/tagTrialExchange.txt b/db/PyMongoDataServer/PySysDB/tagTrialExchange.txt
index b4b84d4..01db4f3 100644
--- a/db/PyMongoDataServer/PySysDB/tagTrialExchange.txt
+++ b/db/PyMongoDataServer/PySysDB/tagTrialExchange.txt
@@ -1,19 +1,19 @@
id exchangeItemID exchangeItemCount exchangeItemIsBind tokenId tokenCount
1 2333 1 0 1131 12
-2 10344 1 0 1134 6
-3 10346 1 0 1134 5
-4 10343 1 0 1134 4
-5 10347 1 0 1134 3
-6 10345 1 0 1134 2
+2 10344|20344 1 0 1134 6
+3 10346|20346 1 0 1134 5
+4 10343|20343 1 0 1134 4
+5 10347|20347 1 0 1134 3
+6 10345|20345 1 0 1134 2
7 2335 1 0 1132 12
-8 10444 1 0 1135 6
-9 10446 1 0 1135 5
-10 10443 1 0 1135 4
-11 10447 1 0 1135 3
-12 10445 1 0 1135 2
+8 10444|20444 1 0 1135 6
+9 10446|20446 1 0 1135 5
+10 10443|20443 1 0 1135 4
+11 10447|20447 1 0 1135 3
+12 10445|20445 1 0 1135 2
13 2337 1 0 1133 12
-14 10544 1 0 1136 6
-15 10546 1 0 1136 5
-16 10543 1 0 1136 4
-17 10547 1 0 1136 3
-18 10545 1 0 1136 2
+14 10544|20544 1 0 1136 6
+15 10546|20546 1 0 1136 5
+16 10543|20543 1 0 1136 4
+17 10547|20547 1 0 1136 3
+18 10545|20545 1 0 1136 2
--
Gitblit v1.8.0