From 3a642fdaa74fea9147817b11b81833d1a1a2045f Mon Sep 17 00:00:00 2001
From: cehua_lgq <cehua_lgq@163.com>
Date: 星期六, 01 九月 2018 16:51:21 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server
---
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerActivity.pyc | 0
CoreServerGroup/GameServer/Script/GM/Commands/CreateFamily.pyc | 0
CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldFamilyWar.pyc | 0
CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldActionControl.pyc | 0
db/PyMongoDataServer/PySysDB/tagFuncConfig.txt | 8 ++++----
CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt | 1 +
ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip | 0
7 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt b/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt
index 7575654..0540a7e 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 12800 [200,0] ["PartyKing",1,[(28,25,1)]] 1
+FamilyMatchSet 1 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
FamilyMatchOtherReward [[28,60,1],[26,28000,1]] [60,70,80,90,100] 5
diff --git a/CoreServerGroup/GameServer/Script/GM/Commands/CreateFamily.pyc b/CoreServerGroup/GameServer/Script/GM/Commands/CreateFamily.pyc
index 7f837be..54bfbd6 100644
--- a/CoreServerGroup/GameServer/Script/GM/Commands/CreateFamily.pyc
+++ b/CoreServerGroup/GameServer/Script/GM/Commands/CreateFamily.pyc
Binary files differ
diff --git a/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldActionControl.pyc b/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldActionControl.pyc
index 6834fa2..12f5cb6 100644
--- a/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldActionControl.pyc
+++ b/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldActionControl.pyc
Binary files differ
diff --git a/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldFamilyWar.pyc b/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldFamilyWar.pyc
index 5670f1c..be3f643 100644
--- a/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldFamilyWar.pyc
+++ b/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldFamilyWar.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip b/ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip
index 762ffa4..e96d481 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerActivity.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerActivity.pyc
index 257c396..0c4c94f 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerActivity.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerActivity.pyc
Binary files differ
diff --git a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
index e542738..f89d265 100644
--- a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
@@ -286,9 +286,9 @@
CeremonyFireParty {"0":801,"1":802,"2":803}
CeremonyRankLimit 3280
TJDropTaskItem {20007:[120,1104,100,'int(killCnt/25000)+min(max(killCnt-int(killCnt/25000)*25000-random.randint(1,25000),0),1)']}
-SuperGiftTimeList [[651,2],[652,2],[653,2]] [(181,1,1)]
-FlashGiftbagMailItem [(181,1,1)]
-SpringSaleMailItem [(181,1,1)]
-OSSaleMailItem [(181,1,1)]
+SuperGiftTimeList [[651,2],[652,2],[653,2]] [(181,1,1),(4151,1,1)]
+FlashGiftbagMailItem [(181,1,1),(4151,1,1)]
+SpringSaleMailItem [(181,1,1),(4151,1,1)]
+OSSaleMailItem [(181,1,1),(4151,1,1)]
FairyGrabBossID [50103001,50103002,50103003,50103004,50103005,50103006,50103007] [[26,14000,1]]
FairyGrabBoss {50103001:{1:[[2352,1,1]],2:[[2353,1,1]],3:[[2354,1,1]]},50103002:{1:[[2356,1,1]],2:[[2357,1,1]],3:[[2358,1,1]]},50103003:{1:[[2360,1,1]],2:[[2361,1,1]],3:[[2362,1,1]]},50103004:{1:[[2364,1,1]],2:[[2365,1,1]],3:[[2366,1,1]]},50103005:{1:[[2368,1,1]],2:[[2369,1,1]],3:[[2370,1,1]]},50103006:{1:[[2372,1,1]],2:[[2373,1,1]],3:[[2374,1,1]]},50103007:{1:[[2376,1,1]],2:[[2377,1,1]],3:[[2378,1,1]]}} 10 {50103001:[[2351,1,1]],50103002:[[2355,1,1]],50103003:[[2359,1,1]],50103004:[[2363,1,1]],50103005:[[2367,1,1]],50103006:[[2371,1,1]],50103007:[[2375,1,1]]} [[10, "FairyGrabBossWillKill"]]
--
Gitblit v1.8.0