From b089a16fe59244859278a823fc1235c3ad163ed4 Mon Sep 17 00:00:00 2001
From: cehua_wcy <781813756@qq.com>
Date: 星期四, 24 一月 2019 13:52:12 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server
---
db/PyMongoDataServer/PySysDB/tagItemCompound.txt | 10 +++++-----
db/PyMongoDataServer/PySysDB/tagDailyQuest.txt | 2 +-
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc | 0
db/PyMongoDataServer/PySysDB/tagChestsAward.txt | 2 +-
db/PyMongoDataServer/SysDB/tagChinItem.txt | 3 ++-
db/PyMongoDataServer/PySysDB/tagFuncConfig.txt | 3 ++-
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/Operate_ItemCompound.pyc | 0
CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt | 2 +-
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_ZhuXianTower.pyc | 0
9 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt b/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt
index fd8d524..a22d4e5 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt
@@ -34,7 +34,7 @@
PartyReward [(26,12800,1),(28,25,1)] [200,0] ["PartyKing",1,[(28,25,1)]] 1
FairyCorrectAnswer 30
FamilyMatchSet 2 0 0 0 0
-FamilyMatchRankReward {1:[[28,200,1,0],[26,59400,1,0]],4:[[28,160,1,0],[26,49500,1,0]],10:[[28,140,1,0],[26,39600,1,0]],20:[[28,120,1,0],[26,29700,1,0]],21:[[28,100,1,0],[26,19800,1,0]]} [40,50,60,80,100] [[103,2,1],[26,13200,1]]
+FamilyMatchRankReward {1:[[28,200,1,0],[26,59400,1,0]],4:[[28,160,1,0],[26,49500,1,0]],10:[[28,140,1,0],[26,39600,1,0]],20:[[28,120,1,0],[26,29700,1,0]],21:[[28,100,1,0],[26,19800,1,0]]} [40,50,60,80,100] [[28,100,1],[26,13200,1]]
FamilyMatchLianWinReward [[2278,1,0]] 3 3
FamilyMatchOtherReward [[28,60,1],[26,28000,1],[24,100,1]] [100,100,100,100,100] 5
MailDefaultCount 50 0 0 0 0
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc
index 3392644..66668af 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/Operate_ItemCompound.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/Operate_ItemCompound.pyc
index 5e08d8e..0bafa20 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/Operate_ItemCompound.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/Operate_ItemCompound.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_ZhuXianTower.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_ZhuXianTower.pyc
index c221289..719b65a 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_ZhuXianTower.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_ZhuXianTower.pyc
Binary files differ
diff --git a/db/PyMongoDataServer/PySysDB/tagChestsAward.txt b/db/PyMongoDataServer/PySysDB/tagChestsAward.txt
index 69844a3..5b2b93f 100644
--- a/db/PyMongoDataServer/PySysDB/tagChestsAward.txt
+++ b/db/PyMongoDataServer/PySysDB/tagChestsAward.txt
@@ -255,7 +255,7 @@
2467 [[2500,[8436,1]],[5000,[8437,1]],[7500,[8438,1]],[10000,[8439,1]]] 1 [8436,8437,8438,8439]
2468 142_100|2469_1
2469 142_800
-2470 143_100|2470_1
+2470 143_100|2471_1
2471 143_1000
2472 144_70|2473_1
2473 144_700
diff --git a/db/PyMongoDataServer/PySysDB/tagDailyQuest.txt b/db/PyMongoDataServer/PySysDB/tagDailyQuest.txt
index 822ea09..1b69be8 100644
--- a/db/PyMongoDataServer/PySysDB/tagDailyQuest.txt
+++ b/db/PyMongoDataServer/PySysDB/tagDailyQuest.txt
@@ -28,5 +28,5 @@
29 1 20 151 1 20 20
30 2 31340 156 1 20 40
31 1 21 157 1 5 50
-32 1 22 163 1 10 0
+32 1 22 163 1 20 0
33 1 23 164 1 10 0
diff --git a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
index 1cca154..b4b6f59 100644
--- a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
@@ -5,6 +5,7 @@
GemType2 1|2|8|9|10 可镶嵌攻击炎晶 0 0 0
GemTypeCount 2 0 0 0 0
GemUpCostFormula 1_3501|2_3511 3 0 0 0
+PutInItemPack {"255":[30, 31], "254":[61,62,63], "32":[70,119,120,121,122,123,139], "34":[128,129,130,131,132,133,134,135,136,137,138]}
OpenBagItem 951 int(math.ceil(index/4.0)) 20 0 0
InitDepotCellCount 60 0 0 0 0
MaxDepotCellCount 100 0 0 0 0
@@ -153,7 +154,7 @@
FamilyMatchCollect 10|10 3|3
FamilyMatchPersonalScore 12 12 {0:20, 30909004:40} 16 10
FamilyMatchPlayTime [60,1020,30]
-FamilyMatchRankReward {1:[[28,200,1,0],[26,59400,1,0]],4:[[28,160,1,0],[26,49500,1,0]],10:[[28,140,1,0],[26,39600,1,0]],20:[[28,120,1,0],[26,29700,1,0]],21:[[28,100,1,0],[26,19800,1,0]]} [40,50,60,80,100] [[103,2,1],[26,13200,1]]
+FamilyMatchRankReward {1:[[28,200,1,0],[26,59400,1,0]],4:[[28,160,1,0],[26,49500,1,0]],10:[[28,140,1,0],[26,39600,1,0]],20:[[28,120,1,0],[26,29700,1,0]],21:[[28,100,1,0],[26,19800,1,0]]} [40,50,60,80,100] [[28,100,1],[26,13200,1]]
FamilyMatchRankOneReward {215:[[2299,1,0]],265:[[2279,1,0]],315:[[2281,1,0]],365:[[2283,1,0]],415:[[2285,1,0]]} {215:[[2398,1,0]],265:[[2399,1,0]],315:[[2400,1,0]],365:[[2401,1,0]],415:[[2402,1,0]]}
FamilyMatchSRankOneReward {215:[[2300,1,0]],265:[[2280,1,0]],315:[[2282,1,0]],365:[[2284,1,0]],415:[[2286,1,0]]} {215:[[2398,1,0]],265:[[2399,1,0]],315:[[2400,1,0]],365:[[2401,1,0]],415:[[2402,1,0]]}
FamilyMatchDayReward [[914,1,1],[911,1,1],[2213,1,1]] 11|12 41
diff --git a/db/PyMongoDataServer/PySysDB/tagItemCompound.txt b/db/PyMongoDataServer/PySysDB/tagItemCompound.txt
index 98598c4..5dde85c 100644
--- a/db/PyMongoDataServer/PySysDB/tagItemCompound.txt
+++ b/db/PyMongoDataServer/PySysDB/tagItemCompound.txt
@@ -235,11 +235,11 @@
269 0 8238 0 8211|8224|8237|8250|8263 3 0 0 0 10000 0 0 0 XianComposeSucces6 1
270 0 8251 0 8211|8224|8237|8250|8263 3 0 0 0 10000 0 0 0 XianComposeSucces6 1
271 0 8264 0 8211|8224|8237|8250|8263 3 0 0 0 10000 0 0 0 XianComposeSucces6 1
-272 0 8213 0 8212|8225|8238|8251|8264 3 5408 1 0 10000 0 0 0 EquipComposeSuccess8 1
-273 0 8226 0 8212|8225|8238|8251|8264 3 5408 1 0 10000 0 0 0 EquipComposeSuccess8 1
-274 0 8239 0 8212|8225|8238|8251|8264 3 5408 1 0 10000 0 0 0 EquipComposeSuccess8 1
-275 0 8252 0 8212|8225|8238|8251|8264 3 5408 1 0 10000 0 0 0 EquipComposeSuccess8 1
-276 0 8265 0 8212|8225|8238|8251|8264 3 5408 1 0 10000 0 0 0 EquipComposeSuccess8 1
+272 0 8213 0 8212|8225|8238|8251|8264 3 5417 1 0 10000 0 0 0 EquipComposeSuccess8 1
+273 0 8226 0 8212|8225|8238|8251|8264 3 5417 1 0 10000 0 0 0 EquipComposeSuccess8 1
+274 0 8239 0 8212|8225|8238|8251|8264 3 5417 1 0 10000 0 0 0 EquipComposeSuccess8 1
+275 0 8252 0 8212|8225|8238|8251|8264 3 5417 1 0 10000 0 0 0 EquipComposeSuccess8 1
+276 0 8265 0 8212|8225|8238|8251|8264 3 5417 1 0 10000 0 0 0 EquipComposeSuccess8 1
277 0 8410 0 8411|8412|8414|8415 2 5413 30 0 10000 0 0 0 EquipComposeSuccess9 1
278 0 8413 0 8411|8412|8414|8415 2 5413 30 0 10000 0 0 0 EquipComposeSuccess9 1
279 0 8416 0 8411|8412|8414|8415 2 5413 500 0 10000 0 0 0 EquipComposeSuccess9 1
diff --git a/db/PyMongoDataServer/SysDB/tagChinItem.txt b/db/PyMongoDataServer/SysDB/tagChinItem.txt
index f4db227..3d5d7a6 100644
--- a/db/PyMongoDataServer/SysDB/tagChinItem.txt
+++ b/db/PyMongoDataServer/SysDB/tagChinItem.txt
@@ -408,7 +408,7 @@
2139 1 0 宝莲灯 53 0 0 0 0 1 1 1 1 0 1 0 0 1 0 0 1 1 0 5 0 0 0 0 232 401 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
2140 1 0 荣誉值 15 0 0 0 0 1 1 1 1 0 1 0 0 1 0 0 1 1 0 5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
2141 1 0 荣誉值 15 0 0 0 0 1 1 1 1 0 1 0 0 0 0 0 1 1 0 10 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-2142 1 0 荣誉值20点 1 0 0 0 0 1 1 1 0 0 1 0 0 1 0 0 1 1 0 5 0 1 0 0 242 20 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+2142 1 0 荣誉值20点 1 0 0 0 0 999 1 1 0 0 1 0 0 1 0 0 1 1 0 5 0 1 0 0 242 20 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
2150 1 0 星级装备 15 0 0 0 0 1 1 0 0 0 1 0 0 1 0 0 1 1 0 5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
2151 1 0 宝莲灯Lv.1 53 0 0 0 0 1 1 1 1 0 1 0 0 1 0 0 1 1 0 5 0 0 0 0 232 401 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
2152 1 0 宝莲灯Lv.2 53 0 0 0 0 1 1 1 1 0 1 0 0 1 0 0 1 1 0 5 0 0 0 0 232 401 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
@@ -1153,6 +1153,7 @@
5414 1 0 雷尘 138 0 1 0 0 999 1 1 0 0 1 0 0 0 0 0 1 2 0 50 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
5415 1 0 高阶原石 138 0 1 0 0 999 1 1 0 0 1 0 0 0 0 0 1 250 0 50 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
5416 1 0 高阶雷尘 138 0 1 0 0 999 1 1 0 0 1 0 0 0 0 0 1 500 0 50 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+5417 1 0 厉兽魂石 139 0 1 0 0 999 1 1 1 0 1 0 0 0 0 0 1 1000 0 50 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 6 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
5700 1 0 熊猫公仔时装碎片 82 0 1 0 0 999 1 1 1 0 1 0 0 0 0 0 1 100 0 50 0 0 0 0 0 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
5701 1 0 魔幻大师时装碎片 82 0 1 0 0 999 1 1 1 0 1 0 0 0 0 0 1 100 0 50 0 0 0 0 0 6 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
5702 1 0 夏日狂欢时装碎片 82 0 1 0 0 999 1 1 1 0 1 0 0 0 0 0 1 100 0 50 0 0 0 0 0 9 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
--
Gitblit v1.8.0