From 653f5075dc8b4335d0b2e67f3735352c4a0e554c Mon Sep 17 00:00:00 2001
From: cehua_hzl <648597270@qq.com>
Date: 星期二, 21 八月 2018 14:51:04 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server
---
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/Operate_EquipSuitCompose.pyc | 0
db/PyMongoDataServer/PySysDB/tagDailyQuest.txt | 2 +-
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_FamilyWar.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/QuestRunner.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_QueenRelics.pyc | 0
db/PyMongoDataServer/PySysDB/tagFuncConfig.txt | 2 +-
CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt | 2 +-
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventShell.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerHorse.pyc | 0
9 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt b/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt
index e81175f..1b61dfa 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt
@@ -30,7 +30,7 @@
FamilyBossOpen 31210 7000 20|22 5 0
FamilyStoreSpace 139 0 0 0 0
PartyReward 0 [100,0] ["PartyKing",1,[(28,25,1)]] 1
-FamilyMatchRankReward {1:[[28,100,1],[26,60000,1]],4:[[28,80,1],[26,45000,1]],10:[[28,60,1],[26,30000,1]],15:[[28,50,1],[26,18000,1]],20:[[28,40,1],[26,12000,1]]} [60,70,80,90,100] [[103,5,1],[26,40000,1]]
+FamilyMatchRankReward {1:[[28,100,1,1],[26,60000,1,1],[101,20,1,0]],4:[[28,80,1,1],[26,45000,1,1],[101,15,1,0]],10:[[28,60,1,1],[26,30000,1,1],[101,10,1,0]],15:[[28,50,1,1],[26,18000,1,1],[101,5,1,0]],20:[[28,40,1,1],[26,12000,1,1],[101,3,1,0]]} [60,70,80,90,100] [[103,5,1],[26,40000,1]]
FamilyMatchLianWinReward [[2278,1,0]] 3 3
FamilyMatchOtherReward [[28,60,1],[26,28000,1]] [60,70,80,90,100] 5
MailDefaultCount 50 0 0 0 0
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventShell.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventShell.pyc
index 23d1ee4..c6e3d1d 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventShell.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventShell.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/Operate_EquipSuitCompose.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/Operate_EquipSuitCompose.pyc
index d16a501..7b05632 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/Operate_EquipSuitCompose.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/Operate_EquipSuitCompose.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/QuestRunner.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/QuestRunner.pyc
index aec7439..bb64f44 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/QuestRunner.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/QuestRunner.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_FamilyWar.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_FamilyWar.pyc
index 3dce600..c80861f 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_FamilyWar.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_FamilyWar.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_QueenRelics.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_QueenRelics.pyc
index ca741a0..8ea3169 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_QueenRelics.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_QueenRelics.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerHorse.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerHorse.pyc
index 28316ed..5e66ee2 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerHorse.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerHorse.pyc
Binary files differ
diff --git a/db/PyMongoDataServer/PySysDB/tagDailyQuest.txt b/db/PyMongoDataServer/PySysDB/tagDailyQuest.txt
index 5f26af9..a0c6118 100644
--- a/db/PyMongoDataServer/PySysDB/tagDailyQuest.txt
+++ b/db/PyMongoDataServer/PySysDB/tagDailyQuest.txt
@@ -11,7 +11,7 @@
10 2 31160 101 1 30 30
11 2 51010 103 1 20 40
12 1 7 114 1 2 20
-13 2 31220 111 1 50 50
+13 2 31220 111 1 100 100
14 2 31010 74 1 10 30
15 1 8 61 1 5 0
16 1 9 21 1 30 0
diff --git a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
index 832eb8d..85d351b 100644
--- a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
@@ -138,7 +138,7 @@
FamilyMatchCollect 10|10 3|3
FamilyMatchPersonalScore 12 12 {0:20, 30909004:40} 16 10
FamilyMatchPlayTime [60,1200,30]
-FamilyMatchRankReward {1:[[28,100,1],[26,60000,1]],4:[[28,80,1],[26,45000,1]],10:[[28,60,1],[26,30000,1]],15:[[28,50,1],[26,18000,1]],20:[[28,40,1],[26,12000,1]]} [60,70,80,90,100] [[103,5,1],[26,40000,1]]
+FamilyMatchRankReward {1:[[28,100,1,1],[26,60000,1,1],[101,20,1,0]],4:[[28,80,1,1],[26,45000,1,1],[101,15,1,0]],10:[[28,60,1,1],[26,30000,1,1],[101,10,1,0]],15:[[28,50,1,1],[26,18000,1,1],[101,5,1,0]],20:[[28,40,1,1],[26,12000,1,1],[101,3,1,0]]} [60,70,80,90,100] [[103,5,1],[26,40000,1]]
FamilyMatchRankOneReward {215 :[[2299,1,0]], 265:[[2279,1,0]],315:[[2281,1,0]],365:[[2283,1,0]],415:[[2285,1,0]]}
FamilyMatchSRankOneReward {215 :[[2300,1,0]], 265:[[2280,1,0]],315:[[2282,1,0]],365:[[2284,1,0]],415:[[2286,1,0]]}
FamilyMatchDayReward [[914,1,1],[911,1,1],[2213,1,1]] 11|12 41
--
Gitblit v1.8.0