From b4ed2526ff1c3f21e04eb43fc6ede4a8040b97c8 Mon Sep 17 00:00:00 2001
From: cehua_wcy <781813756@qq.com>
Date: 星期五, 31 八月 2018 14:12:08 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server
---
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFamily.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_FamilyParty.pyc | 0
db/PyMongoDataServer/PySysDB/tagFuncConfig.txt | 4 ++--
db/PyMongoDataServer/PySysDB/tagAlchemySpec.txt | 12 +++++++-----
db/PyMongoDataServer/PySysDB/tagNPCDropItem.txt | 16 ++++++++--------
5 files changed, 17 insertions(+), 15 deletions(-)
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_FamilyParty.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_FamilyParty.pyc
index 907d230..4360844 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_FamilyParty.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_FamilyParty.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFamily.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFamily.pyc
index 9fd1550..400e6a7 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFamily.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFamily.pyc
Binary files differ
diff --git a/db/PyMongoDataServer/PySysDB/tagAlchemySpec.txt b/db/PyMongoDataServer/PySysDB/tagAlchemySpec.txt
index 42734a3..6a95f9b 100644
--- a/db/PyMongoDataServer/PySysDB/tagAlchemySpec.txt
+++ b/db/PyMongoDataServer/PySysDB/tagAlchemySpec.txt
@@ -1,8 +1,10 @@
ID SpecialMaterialD SpecialMateriaNUM AlchemyEXP AlchemyItem BlastFurnaceLV
1 4609 1 134 [[9000,4655,1],[1000,1128,1]] 2
+2 4609 1 194 [[9000,4691,1],[1000,1128,1]] 3
11 4610 1 244 [[9000,4687,1],[1000,4681,1]] 3
-21 4608 1 509 [[9000,200,1],[1000,4680,1]] 4
-22 4608 1 665 [[9000,201,1],[1000,4680,1]] 5
-31 4606 1 759 [[10000,4183,1],[0,4206,1]] 4
-32 4606 1 915 [[10000,4185,1],[0,253,1]] 5
-41 4607 1 1622 [[7000,4688,1],[1500,4676,1],[1500,4677,1]] 6
+12 4610 1 359 [[9000,4692,1],[1000,4681,1]] 4
+21 4608 1 509 [[6500,4660,1],[2000,200,1],[1500,4680,1]] 4
+22 4608 1 665 [[7000,4661,1],[1500,201,1],[1500,4680,1]] 5
+31 4606 1 759 [[9200,4183,1],[800,4206,1]] 4
+32 4606 1 915 [[9500,4185,1],[500,253,1]] 5
+41 4607 1 1622 [[8400,4688,1],[800,4676,1],[800,4677,1]] 6
diff --git a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
index 032f213..bfb51ea 100644
--- a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
@@ -131,7 +131,7 @@
PetFoodExchange 1130 1 50 999 0
PartyReward 12800 [200,0] ["PartyKing",1,[(28,25,1)]] 1
FamilyPartyAreaAward {"Exp":"int(reExp*300)"} 5 60
-FamilyPartyDesk 3200 10
+FamilyPartyDesk 3200 10 [(3901,150,1)]
FamilyActive 40|80|120|160|220 10|10|15|25|30
FamilyMatchSpawnPoint [[18,74,4],[216,74,4]] [[40,66,40,83], [190,66,190,81]]
FamilyMatchResourcePoint [[(170,18,5)],[(56,131,5)],[(170,132,5)],[(111,74,5)],[(56,18,5)]] [30909001,30909002,30909003,30909004,30909005] [[2,5,4,3,1],[1,3,4,5,2]] 0 6000
@@ -194,7 +194,7 @@
XjmjMonsterExp baseExp*expMulti*min((hurtValue*1.0/npcMaxHP),2.8)*reExp*(1+max(min(playerCnt-1,1),0)*0.06+max(min(playerCnt-2,1),0)*0.02-max(min(playerCnt-3,1),0)*0.03)*0.8 2 0 0 0
XjmjFirstEnter [5000, 25, 911] 350000
AlchemyNotify 3 4716 4712|4708|4721|4713|4709|4722|4714|4710|4723|4728|4715|4724|4729
-SpecialAlchemy {102:{1:[[1,4707,1]],2:[[1,4716,1]]},103:{3:[[1,4717,1]],6:[[1,4740,1]]},104:{8:[[1,4730,1]]}} {1:{2:[[1,1128,1]]},11:{2:[[1,4681,1]]},31:{3:[[1,4206,1]]},21:{2:[[1,4680,1]]},32:{5:[[1,253,1]]},22:{2:[[1,4680,1]]}} {4206:1,253:1}
+SpecialAlchemy {102:{1:[[1,4707,1]],2:[[1,4716,1]]},103:{3:[[1,4717,1]],6:[[1,4740,1]]},104:{8:[[1,4730,1]]}} {1:{2:[[1,1128,1]]},2:{3:[[1,1128,1]]},11:{2:[[1,4681,1]]},12:{5:[[1,4681,1]]},21:{1:[[1,200,1]],2:[[1,4680,1]],4:[[1,200,1]],8:[[1,200,1]]},22:{1:[[1,4680,1]],2:[[1,201,1]],5:[[1,201,1]],10:[[1,201,1]]},41:{1:[[1,4677,1]],3:[[1,4676,1]],5:[[1,4677,1]],8:[[1,4676,1]],12:[[1,4677,1]],20:[[1,4676,1]]}} {4206:1,253:1}
TreasureUpRateItem 101|105|106|107|104|102|109|110 4601|4602|4603|4604|4605
ClientFightEnable 1 0 0 0 0
GodAreaExpAward {"Exp":"int(reExp*10)"} 5 0
diff --git a/db/PyMongoDataServer/PySysDB/tagNPCDropItem.txt b/db/PyMongoDataServer/PySysDB/tagNPCDropItem.txt
index c206dba..ea3c93c 100644
--- a/db/PyMongoDataServer/PySysDB/tagNPCDropItem.txt
+++ b/db/PyMongoDataServer/PySysDB/tagNPCDropItem.txt
@@ -94,8 +94,8 @@
20202007 0 460 1 0 [(974945,0),(981945,(8,1,107)),(996667,(8,2,107)),(1000000,(8,3,107))] 1 {} 0 {} {3:[(9600,0),(10000,1)]} [] [] {951:208,4002:583,4003:583,4501:0,4008:208,4009:208,4005:417,4006:417,4502:0,956:528} {} {2:500000} {} {2:1} 1 800 1588 1962 [] []
20103001 210 225 2 0 [(411960,0),(555293,(3,2,107)),(1000000,(3,3,107))] 30 {(3,4,107):1000000,(3,2,108):100000,(3,3,108):20000,(3,4,108):10000} 1 {4:4,5:2} {3:[(9600,0),(10000,1)],4:[(7500,1),(10000,2)],5:[(0,1),(10000,2)]} [1,3,4,[(10000,2)],107] [] {2320:100000,2339:166666,2340:166666} {} {} {} {} 25 800 1077 1615 [] [1005,3904]
20103002 210 245 2 0 [(411960,0),(555293,(3,2,107)),(1000000,(3,3,107))] 30 {(3,4,107):1000000,(3,2,108):100000,(3,3,108):20000,(3,4,108):10000} 1 {4:4,5:2} {3:[(9600,0),(10000,1)],4:[(7000,1),(10000,2)],5:[(0,1),(10000,2)]} [1,3,4,[(10000,2)],107] [] {3801:300000,2320:100000,2339:166666,2340:166666} {} {} {} {} 25 800 1077 1615 [] [1005,3904]
-20103003 210 260 2 0 [(410784,0),(554117,(4,2,107)),(1000000,(4,3,107))] 30 {(4,4,107):1000000,(4,5,107):80000,(4,2,108):100000,(4,3,108):20000,(4,4,108):10000} 1 {4:4,5:2} {3:[(9600,0),(10000,1)],4:[(6000,1),(10000,2)],5:[(0,1),(10000,2)]} [1,4,5,[(10000,2)],107] [3,4,4,[(3000,1),(10000,2)],107] {3801:300000,2320:100000,2339:166666,2340:166666} {} {} {} {} 25 800 1115 1673 [] [999,3904]
-20103004 210 280 2 0 [(410784,0),(554117,(4,2,107)),(1000000,(4,3,107))] 30 {(4,4,107):1360000,(4,5,107):80000,(4,2,108):100000,(4,3,108):20000,(4,4,108):10000} 1 {4:4,5:2} {3:[(9600,0),(10000,1)],4:[(7000,1),(10000,2)],5:[(0,1),(10000,2)]} [] [3,4,4,[(3000,1),(10000,2)],107] {3801:300000,5202:420000,2320:100000,2339:166666,2340:166666} {} {2:499200} {} {2:5} 25 800 1115 1673 [] [999,3904]
+20103003 210 260 2 0 [(410784,0),(554117,(4,2,107)),(1000000,(4,3,107))] 30 {(4,4,107):1000000,(4,5,107):80000,(4,2,108):100000,(4,3,108):20000,(4,4,108):10000} 1 {4:4,5:2} {3:[(9600,0),(10000,1)],4:[(6000,1),(10000,2)],5:[(0,1),(10000,2)]} [1,4,5,[(10000,2)],107] [] {3801:300000,2320:100000,2339:166666,2340:166666} {} {} {} {} 25 800 1115 1673 [] [999,3904]
+20103004 210 280 2 0 [(410784,0),(554117,(4,2,107)),(1000000,(4,3,107))] 30 {(4,4,107):1360000,(4,5,107):80000,(4,2,108):100000,(4,3,108):20000,(4,4,108):10000} 1 {4:4,5:2} {3:[(9600,0),(10000,1)],4:[(7000,1),(10000,2)],5:[(0,1),(10000,2)]} [] [] {3801:300000,5202:420000,2320:100000,2339:166666,2340:166666} {} {2:499200} {} {2:5} 25 800 1115 1673 [] [999,3904]
20103005 210 315 2 0 [(406076,0),(549409,(5,2,107)),(1000000,(5,3,107))] 30 {(5,4,107):1540000,(5,5,107):106667,(5,2,108):100000,(5,3,108):10000,(5,4,108):5000} 1 {4:4,5:2} {3:[(9600,0),(10000,1)],4:[(7000,1),(10000,2)],5:[(0,1),(10000,2)]} [] [] {3801:300000,3802:31250,5202:440000,2320:100000,2339:166666,2340:166666} {} {2:582400} {} {2:5} 25 800 1123 1685 [] [999,3904]
20103006 210 335 2 0 [(406076,0),(549409,(5,2,107)),(1000000,(5,3,107))] 30 {(5,4,107):1585000,(5,5,107):106667,(5,2,108):100000,(5,3,108):10000,(5,4,108):5000} 1 {4:4,5:2} {3:[(9600,0),(10000,1)],4:[(7000,1),(10000,2)],5:[(0,1),(10000,2)]} [] [] {3801:300000,3802:31250,5202:460000,2320:100000,2339:166666,2340:166666} {} {2:665600} {} {2:5} 25 800 1123 1685 [] [999,3904]
20103007 210 365 2 0 [(402547,0),(545880,(6,2,107)),(1000000,(6,3,107))] 30 {(6,4,107):1585000,(6,5,107):106667,(6,2,108):100000,(6,3,108):10000,(6,4,108):5000} 1 {4:4,5:2} {3:[(9600,0),(10000,1)],4:[(7000,1),(10000,2)],5:[(0,1),(10000,2)]} [] [] {3801:300000,3802:41667,9051:4630,5202:480000,2320:100000,2339:166666,2340:166666} {} {2:748800} {} {2:5} 25 800 1129 1694 [] [999,3904]
@@ -108,8 +108,8 @@
20203007 210 505 2 0 [(388426,0),(531759,(8,2,107)),(1000000,(8,3,107))] 30 {(8,4,107):1675000,(8,5,107):93333,(8,2,108):100000,(8,3,108):10000,(8,4,108):5000} 1 {4:4,5:2} {3:[(9600,0),(10000,1)],4:[(7000,1),(10000,2)],5:[(0,1),(10000,2)]} [] [] {3801:300000,3802:104167,3803:11574,9051:11574,5202:560000,2320:100000,2339:166666,2340:166666} {} {2:800000} {} {2:5} 25 800 1588 1962 [] [999,3904]
20103001 1000 225 2 0 [(411960,0),(555293,(3,2,107)),(1000000,(3,3,107))] 30 {(3,4,107):1000000,(3,2,108):100000,(3,3,108):20000,(3,4,108):10000} 1 {4:4,5:2} {3:[(9600,0),(10000,1)],4:[(7500,1),(10000,2)],5:[(0,1),(10000,2)]} [1,3,4,[(10000,2)],107] [] {2320:100000,2339:83333,2340:166666} {} {} {} {} 25 800 1077 1615 [] [999,3904]
20103002 1000 245 2 0 [(411960,0),(555293,(3,2,107)),(1000000,(3,3,107))] 30 {(3,4,107):1000000,(3,2,108):100000,(3,3,108):20000,(3,4,108):10000} 1 {4:4,5:2} {3:[(9600,0),(10000,1)],4:[(7000,1),(10000,2)],5:[(0,1),(10000,2)]} [1,3,4,[(10000,2)],107] [] {3801:300000,2320:100000,2339:83333,2340:166666} {} {} {} {} 25 800 1077 1615 [] [999,3904]
-20103003 1000 260 2 0 [(410784,0),(554117,(4,2,107)),(1000000,(4,3,107))] 30 {(4,4,107):1000000,(4,5,107):80000,(4,2,108):100000,(4,3,108):20000,(4,4,108):10000} 1 {4:4,5:2} {3:[(9600,0),(10000,1)],4:[(6000,1),(10000,2)],5:[(0,1),(10000,2)]} [1,4,5,[(10000,2)],107] [3,4,4,[(3000,1),(10000,2)],107] {3801:300000,2320:100000,2339:83333,2340:166666} {} {} {} {} 25 800 1115 1673 [] [999,3904]
-20103004 1000 280 2 0 [(410784,0),(554117,(4,2,107)),(1000000,(4,3,107))] 30 {(4,4,107):1360000,(4,5,107):80000,(4,2,108):100000,(4,3,108):20000,(4,4,108):10000} 1 {4:4,5:2} {3:[(9600,0),(10000,1)],4:[(7000,1),(10000,2)],5:[(0,1),(10000,2)]} [] [3,4,4,[(3000,1),(10000,2)],107] {3801:300000,5202:420000,2320:100000,2339:83333,2340:166666} {} {2:499200} {} {2:5} 25 800 1115 1673 [] [999,3904]
+20103003 1000 260 2 0 [(410784,0),(554117,(4,2,107)),(1000000,(4,3,107))] 30 {(4,4,107):1000000,(4,5,107):80000,(4,2,108):100000,(4,3,108):20000,(4,4,108):10000} 1 {4:4,5:2} {3:[(9600,0),(10000,1)],4:[(6000,1),(10000,2)],5:[(0,1),(10000,2)]} [1,4,5,[(10000,2)],107] [] {3801:300000,2320:100000,2339:83333,2340:166666} {} {} {} {} 25 800 1115 1673 [] [999,3904]
+20103004 1000 280 2 0 [(410784,0),(554117,(4,2,107)),(1000000,(4,3,107))] 30 {(4,4,107):1360000,(4,5,107):80000,(4,2,108):100000,(4,3,108):20000,(4,4,108):10000} 1 {4:4,5:2} {3:[(9600,0),(10000,1)],4:[(7000,1),(10000,2)],5:[(0,1),(10000,2)]} [] [] {3801:300000,5202:420000,2320:100000,2339:83333,2340:166666} {} {2:499200} {} {2:5} 25 800 1115 1673 [] [999,3904]
20103005 1000 315 2 0 [(406076,0),(549409,(5,2,107)),(1000000,(5,3,107))] 30 {(5,4,107):1360000,(5,5,107):106667,(5,2,108):100000,(5,3,108):10000,(5,4,108):5000} 1 {4:4,5:2} {3:[(9600,0),(10000,1)],4:[(7000,1),(10000,2)],5:[(0,1),(10000,2)]} [] [] {3801:300000,3802:31250,5202:440000,2320:100000,2339:83333,2340:166666} {} {2:582400} {} {2:5} 25 800 1123 1685 [] [999,3904]
20103006 1000 335 2 0 [(406076,0),(549409,(5,2,107)),(1000000,(5,3,107))] 30 {(5,4,107):1390000,(5,5,107):106667,(5,2,108):100000,(5,3,108):10000,(5,4,108):5000} 1 {4:4,5:2} {3:[(9600,0),(10000,1)],4:[(7000,1),(10000,2)],5:[(0,1),(10000,2)]} [] [] {3801:300000,3802:31250,5202:460000,2320:100000,2339:83333,2340:166666} {} {2:665600} {} {2:5} 25 800 1123 1685 [] [999,3904]
20103007 1000 365 2 0 [(402547,0),(545880,(6,2,107)),(1000000,(6,3,107))] 30 {(6,4,107):1390000,(6,5,107):106667,(6,2,108):100000,(6,3,108):10000,(6,4,108):5000} 1 {4:4,5:2} {3:[(9600,0),(10000,1)],4:[(7000,1),(10000,2)],5:[(0,1),(10000,2)]} [] [] {3801:200000,3802:41667,9051:4630,5202:480000,2320:100000,2339:83333,2340:166666} {} {2:748800} {} {2:5} 25 800 1129 1694 [] [999,3904]
@@ -164,10 +164,10 @@
60203001 0 0 0 1 [] 0 {} 0 {} {} [] [] {} {} {} {} {} 0 0 0 0 [1,1,1,[1009,10112,20112,30112,10114,20114,30114]] []
60203002 0 0 0 1 [] 0 {} 0 {} {} [] [] {} {} {} {} {} 0 0 0 0 [1,1,1,[1010,10211,20211,30211,10213,20213,30213]] []
60203003 0 0 0 1 [] 0 {} 0 {} {} [] [] {} {} {} {} {} 0 0 0 0 [1,1,1,[1011,10222,20222,30222,10211,20211,30211]] []
-60203004 0 190 0 0 [(600000,0),(1000000,(3,2,107))] 5 {(3,3,107):1000000} 1 {} {3:[(10000,0)]} [] [5,3,3,[(10000,0)],107] {987:1000000,2321:1000000} {} {} {} {} 0 0 0 0 [] []
-60203005 0 190 0 0 [(600000,0),(1000000,(3,2,107))] 5 {(3,3,107):1000000} 1 {} {3:[(10000,0)]} [] [5,3,3,[(10000,0)],107] {987:1000000,2321:1000000} {} {} {} {} 0 0 0 0 [] []
-60203006 0 210 0 0 [(500000,0),(1000000,(3,2,107))] 7 {(3,3,107):1000000} 1 {} {3:[(10000,0)]} [] [5,3,3,[(10000,0)],107] {987:1000000,2322:1000000} {} {} {} {} 0 0 0 0 [] []
-60203007 0 230 0 0 [(500000,0),(1000000,(3,2,107))] 10 {(3,3,107):1000000} 1 {} {3:[(10000,0)]} [] [5,3,3,[(10000,0)],107] {987:1000000,2323:1000000} {} {} {} {5:1} 0 0 0 0 [] []
+60203004 0 190 0 0 [(600000,0),(1000000,(3,2,107))] 5 {(3,3,107):1000000} 1 {} {3:[(10000,0)]} [] [2,3,3,[(10000,0)],107] {987:1000000,2321:1000000} {} {} {} {} 0 0 0 0 [] []
+60203005 0 190 0 0 [(600000,0),(1000000,(3,2,107))] 5 {(3,3,107):1000000} 1 {} {3:[(10000,0)]} [] [2,3,3,[(10000,0)],107] {987:1000000,2321:1000000} {} {} {} {} 0 0 0 0 [] []
+60203006 0 210 0 0 [(500000,0),(1000000,(3,2,107))] 7 {(3,3,107):1000000} 1 {} {3:[(10000,0)]} [] [1,3,3,[(10000,0)],107] {987:1000000,2322:1000000} {} {} {} {} 0 0 0 0 [] []
+60203007 0 230 0 0 [(500000,0),(1000000,(3,2,107))] 10 {(3,3,107):1000000} 1 {} {3:[(10000,0)]} [] [1,3,3,[(10000,0)],107] {987:1000000,2323:1000000} {} {} {} {5:1} 0 0 0 0 [] []
60203008 0 255 0 0 [(500000,0),(1000000,(4,2,107))] 7 {(4,3,107):1200000} 1 {} {3:[(10000,0)]} [] [] {987:1000000,4609:20000,3801:60000,2324:1000000} {} {} {} {5:1} 0 0 0 0 [] []
60203009 0 280 0 0 [(500000,0),(1000000,(4,2,107))] 5 {(4,3,107):1400000} 1 {} {3:[(10000,0)]} [] [] {987:1000000,4609:20000,3801:60000,2324:1000000} {2321:2} {} {2:1140000} {2:1} 0 0 0 0 [] []
60203010 0 305 0 0 [(500000,0),(1000000,(5,2,107))] 5 {(5,3,107):1600000} 1 {} {3:[(10000,0)]} [] [] {987:1000000,4609:10000,3801:60000,4610:10000,2324:1000000} {2321:2} {} {2:2500000} {2:1} 0 0 0 0 [] []
--
Gitblit v1.8.0