From 536153e5a8eb6ef92e058844b1b3ec261ff37d89 Mon Sep 17 00:00:00 2001
From: cehua_wcy <781813756@qq.com>
Date: 星期二, 30 十月 2018 15:38:08 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server
---
CoreServerGroup/GameServer/Script/Player/PlayerFamilyParty.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFamily.pyc | 0
CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt | 1 +
db/PyMongoDataServer/PySysDB/tagNPCDropItem.txt | 18 +++++++++---------
4 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt b/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt
index b2305d4..163243c 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt
@@ -30,6 +30,7 @@
FamilyBossOpen 31210 7000 20|22 5 0
FamilyStoreSpace 139 0 0 0 0
PartyReward [(26,12800,1)] [200,0] ["PartyKing",1,[(28,25,1)]] 1
+FairyCorrectAnswer 20
FamilyMatchSet 2 0 0 0 0
FamilyMatchRankReward {1:[[28,80,1,0],[26,59400,1,0]],4:[[28,64,1,0],[26,49500,1,0]],10:[[28,56,1,0],[26,39600,1,0]],20:[[28,48,1,0],[26,29700,1,0]],21:[[28,40,1,0],[26,19800,1,0]]} [40,50,60,80,100] [[103,5,1],[26,13200,1]]
FamilyMatchLianWinReward [[2278,1,0]] 3 3
diff --git a/CoreServerGroup/GameServer/Script/Player/PlayerFamilyParty.pyc b/CoreServerGroup/GameServer/Script/Player/PlayerFamilyParty.pyc
index 033a1b1..37f70e1 100644
--- a/CoreServerGroup/GameServer/Script/Player/PlayerFamilyParty.pyc
+++ b/CoreServerGroup/GameServer/Script/Player/PlayerFamilyParty.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 7a59e8b..4b6b228 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/tagNPCDropItem.txt b/db/PyMongoDataServer/PySysDB/tagNPCDropItem.txt
index 550d613..46f804c 100644
--- a/db/PyMongoDataServer/PySysDB/tagNPCDropItem.txt
+++ b/db/PyMongoDataServer/PySysDB/tagNPCDropItem.txt
@@ -2,23 +2,23 @@
10101001 0 62 1 0 [] 0 {} 0 {} {} [] [] {} {} {} {} {} 1 0 0 0 [] []
10101002 0 64 1 0 [] 0 {} 0 {} {} [] [] {} {} {} {} {} 1 0 0 0 [4,1,1,[10101,20101,30101]] []
10101003 0 66 1 0 [] 0 {} 0 {} {} [] [] {} {} {} {} {} 1 0 0 0 [] []
-10101004 0 68 1 0 [] 0 {} 0 {} {} [] [] {} {} {} {} {} 1 0 0 0 [8,1,1,[10105,20105,30105]] []
+10101004 0 68 1 0 [] 0 {} 0 {} {} [] [] {} {} {} {} {} 1 0 0 0 [6,1,1,[10105,20105,30105]] []
10101005 0 70 1 0 [] 0 {} 0 {} {} [] [] {} {} {} {} {} 1 0 0 0 [] []
-10102001 0 73 1 0 [] 0 {} 0 {} {} [] [] {} {} {} {} {} 1 0 0 0 [10,1,1,[10103,20103,30103]] []
+10102001 0 73 1 0 [] 0 {} 0 {} {} [] [] {} {} {} {} {} 1 0 0 0 [8,1,1,[10103,20103,30103]] []
10201001 0 76 1 0 [] 1 {} 0 {} {} [] [] {} {} {} {} {} 1 0 0 0 [] []
-10201002 0 79 1 0 [] 1 {} 0 {} {} [] [] {} {} {} {} {} 1 0 0 0 [20,1,1,[10106,20106,30106]] []
+10201002 0 79 1 0 [] 1 {} 0 {} {} [] [] {} {} {} {} {} 1 0 0 0 [8,1,1,[10106,20106,30106]] []
10201003 0 82 1 0 [] 1 {} 0 {} {} [] [] {} {} {} {} {} 1 0 0 0 [] []
-10201004 0 85 1 0 [] 1 {} 0 {} {} [] [] {} {} {} {} {} 1 0 0 0 [20,1,1,[10107,20107,30107]] []
-10201005 0 88 1 0 [] 1 {} 0 {} {} [] [] {} {} {} {} {} 1 0 0 0 [20,1,1,[10206,20206,30206]] []
+10201004 0 85 1 0 [] 1 {} 0 {} {} [] [] {} {} {} {} {} 1 0 0 0 [10,1,1,[10107,20107,30107]] []
+10201005 0 88 1 0 [] 1 {} 0 {} {} [] [] {} {} {} {} {} 1 0 0 0 [10,1,1,[10206,20206,30206]] []
10202001 0 92 1 0 [] 1 {} 0 {} {} [] [] {} {} {} {} {} 1 0 0 0 [] []
10301001 0 95 1 0 [] 1 {} 0 {} {} [] [] {} {} {} {} {} 1 0 0 0 [] []
10301002 0 98 1 0 [] 1 {} 0 {} {} [] [] {} {} {} {} {} 1 0 0 0 [] []
-10301003 0 101 1 0 [] 1 {} 0 {} {} [] [] {} {} {} {} {} 1 0 0 0 [35,1,1,[10207,20207,30207]] []
-10301004 0 104 1 0 [] 1 {} 0 {} {} [] [] {} {} {} {} {} 1 0 0 0 [20,1,1,[10212,20212,30212]] []
+10301003 0 101 1 0 [] 1 {} 0 {} {} [] [] {} {} {} {} {} 1 0 0 0 [12,1,1,[10207,20207,30207]] []
+10301004 0 104 1 0 [] 1 {} 0 {} {} [] [] {} {} {} {} {} 1 0 0 0 [12,1,1,[10212,20212,30212]] []
10301005 0 107 1 0 [] 1 {} 0 {} {} [] [] {} {} {} {} {} 1 0 0 0 [] []
10302001 0 110 1 0 [] 1 {} 0 {} {} [] [] {} {} {} {} {} 1 0 0 0 [12,1,1,[10216,20216,30216]] []
-10401001 0 130 1 0 [(999475,0),(999826,(2,1,107)),(1000000,(2,2,107)),(1000000,(2,3,107))] 1 {} 0 {} {} [] [] {951:3,4002:0,4003:0,4501:0,4008:0,4009:0,4005:0,4006:0,4502:0,956:0,4151:17,181:0} {} {} {} {} 1 0 0 0 [35,1,1,[4002]] []
-10401002 0 140 1 0 [(999405,0),(999756,(2,1,107)),(1000000,(2,2,107)),(1000000,(2,3,107))] 1 {} 0 {} {} [] [] {951:3,4002:16,4003:16,4501:0,4008:0,4009:0,4005:0,4006:0,4502:0,956:0,4151:17,181:35} {} {} {} {} 1 0 0 0 [40,1,1,[4003]] []
+10401001 0 130 1 0 [(999475,0),(999826,(2,1,107)),(1000000,(2,2,107)),(1000000,(2,3,107))] 1 {} 0 {} {} [] [] {951:3,4002:0,4003:0,4501:0,4008:0,4009:0,4005:0,4006:0,4502:0,956:0,4151:17,181:0} {} {} {} {} 1 0 0 0 [14,1,1,[4002]] []
+10401002 0 140 1 0 [(999405,0),(999756,(2,1,107)),(1000000,(2,2,107)),(1000000,(2,3,107))] 1 {} 0 {} {} [] [] {951:3,4002:16,4003:16,4501:0,4008:0,4009:0,4005:0,4006:0,4502:0,956:0,4151:17,181:35} {} {} {} {} 1 0 0 0 [14,1,1,[4003]] []
10401003 0 150 1 0 [(999335,0),(999686,(2,1,107)),(1000000,(2,2,107)),(1000000,(2,3,107))] 1 {} 0 {} {} [] [] {951:3,4002:16,4003:16,4501:0,4008:0,4009:0,4005:0,4006:0,4502:0,956:0,4151:17,181:35} {} {} {} {} 1 0 0 0 [] []
10401004 0 160 1 0 [(999404,0),(999638,(3,1,107)),(1000000,(3,2,107)),(1000000,(3,3,107))] 1 {} 0 {} {} [] [] {951:3,4002:16,4003:16,4501:0,4008:0,4009:0,4005:0,4006:0,4502:0,956:0,4151:17,181:35} {} {} {} {} 1 50 58 100 [] []
10401005 0 170 1 0 [(999355,0),(999589,(3,1,107)),(999983,(3,2,107)),(1000000,(3,3,107))] 1 {} 0 {} {} [] [] {951:3,4002:16,4003:16,4501:0,4008:0,4009:0,4005:0,4006:0,4502:0,956:0,4151:17,181:35} {} {} {} {} 1 100 69 104 [] []
--
Gitblit v1.8.0