From 8d4ea21269d0da10060ca97b5ebbc3fb44620b38 Mon Sep 17 00:00:00 2001
From: cehua-TT <448191260@qq.com>
Date: 星期二, 28 八月 2018 09:39:13 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server
---
db/PyMongoDataServer/PySysDB/tagInvest.txt | 32 ++++++++++++++++----------------
db/PyMongoDataServer/PySysDB/tagFuncConfig.txt | 6 +++---
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_Dogz.pyc | 0
CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt | 2 +-
4 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt b/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt
index fb94dbd..626b91b 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt
@@ -39,7 +39,7 @@
OpenJob 1|2 0 0 0 0
TeamReadyTime 30
BossShunt 10040|21070 2 5
-MapLine 10040_10|21070_1
+MapLine 10040_10|21070_1 10010_11|10020_11|10030_11|10040_21
DropRecordValue 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,(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']}
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_Dogz.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_Dogz.pyc
index 03cfee6..e9ad537 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_Dogz.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_Dogz.pyc
Binary files differ
diff --git a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
index 3a125cd..676a787 100644
--- a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
@@ -200,7 +200,7 @@
AngryAdd 60 1 20 100 0
BossHomeCost 1_0|2_100|3_200|4_200|5_200|6_200|7_200|8_200 0 0 0 0
BossShunt 10040|21070 2 5
-MapLine 10040_10|21070_1
+MapLine 10040_10|21070_1 10010_11|10020_11|10030_11|10040_21
DungeonDeliver 31020|31030|31150
DungeonIntegral 10000
BuyFBCntCost {"31080":"35","31140":"20","52010":"20+min(max(hasBuyCnt-1,0),1)*10+min(max(hasBuyCnt-3,0),1)*10+min(max(hasBuyCnt-5,0),1)*10+min(max(hasBuyCnt-7,0),1)*10+min(max(hasBuyCnt-9,0),1)*20","31190":"30"}
@@ -209,7 +209,7 @@
DropRecordEquipment {(1,2,3,4,5,6,7):[3,4,2],(8):[3,3,0]}
DropRecordNormal 2320|4606|4607|4608|4609|4610|3801|2339|2340|5302|5206|5207|5202|5006|5007|4182
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
+PKConfig [[22,00], [8,00]] 50 10 10 130
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,(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']}
BossHurtValue 30 0 0 0 0
@@ -254,7 +254,7 @@
OSCBillboardOpen {"2":[20,1,2],"1":[200,3,3],"3":[12,4,4],"4":[200,5,5],"5":[6,6,6],"6":[1200000,7,7]} 10
OSCRankRedpackAward {1:80,(2,5):81}
WeekResetSuccType []
-InvestCost {"1":[300],"2":[300],"3":[680,1280,1880]}
+InvestCost {"1":[300],"2":[300],"3":[300,680,1280,1880]}
InvestMaxDay {"1":31,"2":28}
InvestRedPackAward {2:51,3:50}
VIPInvest {"1":[1,280],"2":[281,350],"3":[351,1000]} 4
diff --git a/db/PyMongoDataServer/PySysDB/tagInvest.txt b/db/PyMongoDataServer/PySysDB/tagInvest.txt
index 049f637..111e73b 100644
--- a/db/PyMongoDataServer/PySysDB/tagInvest.txt
+++ b/db/PyMongoDataServer/PySysDB/tagInvest.txt
@@ -58,19 +58,19 @@
226 2 26 0 {"1":[[4010,2,1],[105,1,1],[3512,1,1]],"2":[[4010,2,1],[105,1,1],[3512,1,1]],"3":[[4010,2,1],[105,1,1],[3512,1,1]]}
227 2 27 0 {"1":[[4010,2,1],[105,1,1],[3512,1,1]],"2":[[4010,2,1],[105,1,1],[3512,1,1]],"3":[[4010,2,1],[105,1,1],[3512,1,1]]}
228 2 28 0 {"1":[[4010,2,1],[105,1,1],[3513,1,1]],"2":[[4010,2,1],[105,1,1],[3513,1,1]],"3":[[4010,2,1],[105,1,1],[3513,1,1]]}
-301 3 0 0 {"1":[[30,680,0]], "2":[[30,1280,0]], "3":[[30,1880,0]]}
-302 3 0 150 {"1":[[30,180,0]], "2":[[30,330,0]], "3":[[30,480,0]]}
-303 3 0 160 {"1":[[30,220,0]], "2":[[30,400,0]], "3":[[30,580,0]]}
-304 3 0 170 {"1":[[30,260,0]], "2":[[30,470,0]], "3":[[30,680,0]]}
-305 3 0 180 {"1":[[30,290,0]], "2":[[30,530,0]], "3":[[30,770,0]]}
-306 3 0 190 {"1":[[30,320,0]], "2":[[30,590,0]], "3":[[30,860,0]]}
-307 3 0 200 {"1":[[30,350,0]], "2":[[30,650,0]], "3":[[30,950,0]]}
-308 3 0 210 {"1":[[30,380,0]], "2":[[30,710,0]], "3":[[30,1040,0]]}
-309 3 0 225 {"1":[[30,410,0]], "2":[[30,770,0]], "3":[[30,1130,0]]}
-310 3 0 240 {"1":[[30,440,0]], "2":[[30,830,0]], "3":[[30,1220,0]]}
-311 3 0 255 {"1":[[30,470,0]], "2":[[30,890,0]], "3":[[30,1310,0]]}
-312 3 0 270 {"1":[[30,500,0]], "2":[[30,950,0]], "3":[[30,1400,0]]}
-313 3 0 285 {"1":[[30,530,0]], "2":[[30,1010,0]], "3":[[30,1490,0]]}
-314 3 0 300 {"1":[[30,560,0]], "2":[[30,1070,0]], "3":[[30,1580,0]]}
-315 3 0 315 {"1":[[30,590,0]], "2":[[30,1130,0]], "3":[[30,1670,0]]}
-316 3 0 330 {"1":[[30,620,0]], "2":[[30,1190,0]], "3":[[30,1760,0]]}
+301 3 0 0 {"1":[[30,300,0]], "2":[[30,680,0]], "3":[[30,1280,0]], "4":[[30,1880,0]]}
+302 3 0 150 {"1":[[30,100,0]], "2":[[30,220,0]], "3":[[30,420,0]], "4":[[30,620,0]]}
+303 3 0 160 {"1":[[30,120,0]], "2":[[30,250,0]], "3":[[30,480,0]], "4":[[30,700,0]]}
+304 3 0 170 {"1":[[30,130,0]], "2":[[30,280,0]], "3":[[30,530,0]], "4":[[30,780,0]]}
+305 3 0 180 {"1":[[30,140,0]], "2":[[30,310,0]], "3":[[30,580,0]], "4":[[30,850,0]]}
+306 3 0 190 {"1":[[30,150,0]], "2":[[30,335,0]], "3":[[30,630,0]], "4":[[30,920,0]]}
+307 3 0 200 {"1":[[30,160,0]], "2":[[30,360,0]], "3":[[30,680,0]], "4":[[30,990,0]]}
+308 3 0 210 {"1":[[30,170,0]], "2":[[30,385,0]], "3":[[30,730,0]], "4":[[30,1060,0]]}
+309 3 0 225 {"1":[[30,180,0]], "2":[[30,410,0]], "3":[[30,775,0]], "4":[[30,1130,0]]}
+310 3 0 240 {"1":[[30,190,0]], "2":[[30,435,0]], "3":[[30,820,0]], "4":[[30,1200,0]]}
+311 3 0 255 {"1":[[30,200,0]], "2":[[30,460,0]], "3":[[30,865,0]], "4":[[30,1270,0]]}
+312 3 0 270 {"1":[[30,210,0]], "2":[[30,485,0]], "3":[[30,910,0]], "4":[[30,1340,0]]}
+313 3 0 285 {"1":[[30,220,0]], "2":[[30,510,0]], "3":[[30,955,0]], "4":[[30,1410,0]]}
+314 3 0 300 {"1":[[30,230,0]], "2":[[30,535,0]], "3":[[30,1000,0]], "4":[[30,1480,0]]}
+315 3 0 315 {"1":[[30,240,0]], "2":[[30,560,0]], "3":[[30,1045,0]], "4":[[30,1550,0]]}
+316 3 0 330 {"1":[[30,260,0]], "2":[[30,585,0]], "3":[[30,1100,0]], "4":[[30,1620,0]]}
--
Gitblit v1.8.0