From 903a95d07c236fc4c234deccde563b9663a10d4c Mon Sep 17 00:00:00 2001
From: cehua_wcy <781813756@qq.com>
Date: 星期五, 04 一月 2019 21:37:56 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server
---
db/PyMongoDataServer/PySysDB/tagChests.txt | 2 ++
db/PyMongoDataServer/PySysDB/tagStore.txt | 1 +
db/PyMongoDataServer/PySysDB/tagChestsAward.txt | 2 ++
db/PyMongoDataServer/SysDB/tagChinItem.txt | 3 +++
CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmPK.pyc | 0
db/PyMongoDataServer/PySysDB/tagFuncConfig.txt | 6 +++---
CoreServerGroup/GameServer/PySysDB/tagStore.txt | 1 +
db/PyMongoDataServer/PySysDB/tagAllPeoplePartyAward.txt | 5 +++++
CoreServerGroup/GameServer/PySysDB/tagUniquenessArrive.txt | 3 +++
CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt | 2 +-
CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmMsg.pyc | 0
11 files changed, 21 insertions(+), 4 deletions(-)
diff --git a/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt b/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt
index 15f3f85..89c892b 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt
@@ -68,7 +68,7 @@
BossRebornNotify [50,80] [0,20,40]
ServerActivePlayerCnt 100 max(20,min(yesterdayPlayerCnt,150))
FirstDayActivePlayerCnt 1000
-CeremonyWorldLv {"1":[[0,250],[251,300],[301,900]],"2":[[0,250],[251,300],[301,900]],"3":[[0,250],[251,300],[301,900]],"4":[[0,250],[251,300],[301,900]]}
+CeremonyWorldLv {"1":[[0,250],[251,300],[301,330],[331,900]],"2":[[0,250],[251,300],[301,330],[331,900]],"3":[[0,250],[251,300],[301,330],[331,900]],"4":[[0,250],[251,300],[301,330],[331,900]]}
FairyGrabBossID [50103001,50103002,50103003,50103004,50103005,50103006,50103007] [[26,14000,1]] -60
OperationAction 14 0 0 0 0
HelpBattleCall 6 3 2 60 10
diff --git a/CoreServerGroup/GameServer/PySysDB/tagStore.txt b/CoreServerGroup/GameServer/PySysDB/tagStore.txt
index af8d464..ee8a127 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagStore.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagStore.txt
@@ -207,6 +207,7 @@
801 19 0 0
802 19 0 0
803 19 0 0
+804 19 0 0
901 30 7 0
902 30 7 0
903 30 7 0
diff --git a/CoreServerGroup/GameServer/PySysDB/tagUniquenessArrive.txt b/CoreServerGroup/GameServer/PySysDB/tagUniquenessArrive.txt
index e6711fc..d48931b 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagUniquenessArrive.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagUniquenessArrive.txt
@@ -8,3 +8,6 @@
2 1 {"1":[[2278,1,0]],"2":[[2278,1,0]]}
2 2 {"1":[[10871,1,0]],"2":[[20871,1,0]]}
2 3 {"1":[[10872,1,0]],"2":[[20872,1,0]]}
+3 1 {"1":[[2278,1,0]],"2":[[2278,1,0]]}
+3 2 {"1":[[10971,1,0]],"2":[[20971,1,0]]}
+3 3 {"1":[[10972,1,0]],"2":[[20972,1,0]]}
diff --git a/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmMsg.pyc b/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmMsg.pyc
index c764b94..845d3bd 100644
--- a/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmMsg.pyc
+++ b/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmMsg.pyc
Binary files differ
diff --git a/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmPK.pyc b/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmPK.pyc
index 716c588..315682a 100644
--- a/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmPK.pyc
+++ b/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmPK.pyc
Binary files differ
diff --git a/db/PyMongoDataServer/PySysDB/tagAllPeoplePartyAward.txt b/db/PyMongoDataServer/PySysDB/tagAllPeoplePartyAward.txt
index 1f39980..00aeb64 100644
--- a/db/PyMongoDataServer/PySysDB/tagAllPeoplePartyAward.txt
+++ b/db/PyMongoDataServer/PySysDB/tagAllPeoplePartyAward.txt
@@ -14,3 +14,8 @@
2 2 320 {"1":[[2390,1,1],[181,15,1],[8353,3,1],[4305,5,1]],"2":[[2390,1,1],[181,15,1],[8353,3,1],[4305,5,1]]}
2 3 420 {"1":[[3516,2,1],[181,20,1],[8353,4,1],[4305,5,1]],"2":[[3516,2,1],[181,20,1],[8353,4,1],[4305,5,1]]}
2 4 520 {"1":[[2397,1,1],[181,20,1],[8353,5,1],[4305,5,1]],"2":[[2397,1,1],[181,20,1],[8353,5,1],[4305,5,1]]}
+3 0 120 {"1":[[983,1,1],[181,5,1],[8353,1,1],[4305,5,1]],"2":[[983,1,1],[181,5,1],[8353,1,1],[4305,5,1]]}
+3 1 240 {"1":[[2389,1,1],[181,10,1],[8353,2,1],[4305,5,1]],"2":[[2389,1,1],[181,10,1],[8353,2,1],[4305,5,1]]}
+3 2 320 {"1":[[2390,1,1],[181,15,1],[8353,3,1],[4305,5,1]],"2":[[2390,1,1],[181,15,1],[8353,3,1],[4305,5,1]]}
+3 3 420 {"1":[[3516,2,1],[181,20,1],[8353,4,1],[4305,5,1]],"2":[[3516,2,1],[181,20,1],[8353,4,1],[4305,5,1]]}
+3 4 520 {"1":[[2397,1,1],[181,20,1],[8353,5,1],[4305,5,1]],"2":[[2397,1,1],[181,20,1],[8353,5,1],[4305,5,1]]}
diff --git a/db/PyMongoDataServer/PySysDB/tagChests.txt b/db/PyMongoDataServer/PySysDB/tagChests.txt
index 3030054..7093d16 100644
--- a/db/PyMongoDataServer/PySysDB/tagChests.txt
+++ b/db/PyMongoDataServer/PySysDB/tagChests.txt
@@ -212,3 +212,5 @@
2420 0 0 0 0 1
2421 0 0 0 0 1
2422 0 0 0 0 1
+2423 0 0 0 0 0
+2424 0 0 280 0 1
diff --git a/db/PyMongoDataServer/PySysDB/tagChestsAward.txt b/db/PyMongoDataServer/PySysDB/tagChestsAward.txt
index 4e649ce..4f08564 100644
--- a/db/PyMongoDataServer/PySysDB/tagChestsAward.txt
+++ b/db/PyMongoDataServer/PySysDB/tagChestsAward.txt
@@ -209,3 +209,5 @@
2420 4151_20
2421 4151_200
2422 [[800,[8209,1]],[1600,[8222,1]],[2400,[8235,1]],[3200,[8248,1]],[4000,[8261,1]],[4600,[8210,1]],[5200,[8223,1]],[5800,[8236,1]],[6400,[8249,1]],[7000,[8262,1]],[7600,[8211,1]],[8200,[8224,1]],[8800,[8237,1]],[9400,[8250,1]],[10000,[8263,1]]] 1 [8209,8222,8235,8248,8261,8210,8223,8236,8249,8262,8211,8224,8237,8250,8263]
+2423 [[25,[3804,1]],[125,[3803,1]],[275,[5408,1]],[285,[5409,1]],[305,[4607,1]],[405,[4606,1]],[555,[3506,1]],[705,[3516,1]],[1305,[4305,5]],[1805,[5303,60]],[2305,[5412,10]],[3505,[8353,6]],[5200,[2324,2]],[6400,[3503,1]],[7600,[3513,1]],[7900,[143,30]],[8200,[144,20]],[8500,[153,10]],[10000,[4151,8]]] 1 {2:[[10000,[3516,1]]],8:[[10000,[4607,1]]],20:[[10000,[5408,1]]]} [3804,3803,5408,5409,4607,4606,3506,3516]
+2424 4184_2|1025_15|952_3|913_1 [913]
diff --git a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
index 6d05369..6b758a8 100644
--- a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
@@ -304,9 +304,9 @@
ReloadQuests 0
DownReward [(2,1,1),(911,1,1)] 70
FreeGoodsOpenTime 259200
-CeremonyWorldLv {"1":[[0,250],[251,300],[301,900]],"2":[[0,250],[251,300],[301,900]],"3":[[0,250],[251,300],[301,900]],"4":[[0,250],[251,300],[301,900]]}
-CeremonyRecharge {"0":[[4184,1,1],[2392,1,1],[912,1,1],[1145,5,1],[4609,1,1]],"1":[[4184,1,1],[2394,1,1],[912,1,1],[1146,5,1],[4609,1,1]],"2":[[4184,1,1],[2396,1,1],[912,1,1],[1147,5,1],[4609,1,1]]}
-CeremonyFireParty {"0":801,"1":802,"2":803}
+CeremonyWorldLv {"1":[[0,250],[251,300],[301,330],[331,900]],"2":[[0,250],[251,300],[301,330],[331,900]],"3":[[0,250],[251,300],[301,330],[331,900]],"4":[[0,250],[251,300],[301,330],[331,900]]}
+CeremonyRecharge {"0":[[4184,1,1],[2392,1,1],[912,1,1],[1145,5,1],[4609,1,1]],"1":[[4184,1,1],[2394,1,1],[912,1,1],[1146,5,1],[4609,1,1]],"2":[[4184,1,1],[2396,1,1],[912,1,1],[1147,5,1],[4609,1,1]],"3":[[4184,1,1],[2396,1,1],[912,1,1],[1025,5,1],[4609,1,1]]}
+CeremonyFireParty {"0":801,"1":802,"2":803,"3":804}
CeremonyRankLimit 3280
TJDropTaskItem {}
SuperGiftTimeList [[6,3],[7,5],[8,7]] []
diff --git a/db/PyMongoDataServer/PySysDB/tagStore.txt b/db/PyMongoDataServer/PySysDB/tagStore.txt
index 1de5f93..582b22b 100644
--- a/db/PyMongoDataServer/PySysDB/tagStore.txt
+++ b/db/PyMongoDataServer/PySysDB/tagStore.txt
@@ -207,6 +207,7 @@
801 19 0 2391 1 0 [] 0 0 0 0 0 0 1 60 0 0
802 19 0 2393 1 0 [] 0 0 0 0 0 0 1 60 0 0
803 19 0 2395 1 0 [] 0 0 0 0 0 0 1 60 0 0
+804 19 0 2423 1 0 [] 0 0 0 0 0 0 1 60 0 0
901 30 0 2211 1 1 [] 0 7 0 0 50 0 27 50 0 0
902 30 0 4658 1 1 [] 0 7 0 0 2 0 27 500 0 0
903 30 0 4738 1 1 [] 0 7 0 0 3 0 27 800 0 0
diff --git a/db/PyMongoDataServer/SysDB/tagChinItem.txt b/db/PyMongoDataServer/SysDB/tagChinItem.txt
index 8a82cc4..dd70102 100644
--- a/db/PyMongoDataServer/SysDB/tagChinItem.txt
+++ b/db/PyMongoDataServer/SysDB/tagChinItem.txt
@@ -255,6 +255,7 @@
1022 1 0 魔坛秘影经验丹 13 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 1 0 50 0 1 0 0 213 2994480 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 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
1023 1 0 Boss争夺战经验丹 13 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 18 0 50 0 1 0 0 215 3000 400 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
1024 1 0 冰晶矿脉经验丹 13 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 18 0 50 0 1 0 0 215 7200 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
+1025 1 0 庆典经验丹 14 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 1060 0 50 0 1 0 0 214 1 320 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
1100 1 0 兵刃 17 0 0 0 0 999 1 0 1 0 1 0 0 0 0 0 1 1 0 50 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
1101 1 0 花粉 17 0 0 0 0 999 1 0 1 0 1 0 0 0 0 0 1 1 0 50 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
1102 1 0 魂印 17 0 0 0 0 999 1 0 1 0 1 0 0 0 0 0 1 1 0 50 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
@@ -614,6 +615,8 @@
2420 1 0 灵宠丹大礼包 81 0 0 0 0 999 1 1 1 0 1 0 0 1 0 0 1 380 0 5 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
2421 1 0 灵宠丹豪华礼包 81 0 0 0 0 999 1 1 1 0 1 0 0 1 0 0 1 1000 0 5 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
2422 1 0 跨服神兽宝箱 81 0 0 0 0 999 1 1 1 0 1 0 0 1 0 0 1 240 0 5 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 5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+2423 1 0 烟花 81 0 0 0 0 999 1 1 1 0 1 0 0 1 0 0 1 60 0 5 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 5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+2424 1 0 庆典礼包 81 0 0 0 0 999 1 1 1 0 1 0 0 1 0 0 1 280 0 5 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 5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
3501 1 0 1级生命翡翠 25 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 10 0 10 0 0 0 1 225 1 1 3502 6 600 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
3502 1 0 2级生命翡翠 25 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 30 0 10 0 0 0 1 225 1 2 3503 6 840 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
3503 1 0 3级生命翡翠 25 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 90 0 20 0 0 0 1 225 1 3 3504 6 1080 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
--
Gitblit v1.8.0