From 6fdb100db8afae21e275602834938ed8aa87e9c7 Mon Sep 17 00:00:00 2001
From: cehua_wcy <781813756@qq.com>
Date: 星期三, 16 一月 2019 12:03:44 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server
---
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ItemControler.pyc | 0
CoreServerGroup/GameServer/Script/Player/CrossRealmPlayer.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/AttackCommon.pyc | 0
CoreServerGroup/GameServer/Script/ChNetSendPack.pyc | 0
CoreServerGroup/GameServer/Script/ShareDefine.pyc | 0
CoreServerGroup/GameServer/PySysDB/tagActFairyCeremony.txt | 1 +
CoreServerGroup/GameServer/Script/Player/PlayerQuery.pyc | 0
CoreServerGroup/GameServer/Script/Player/PlayerTeam.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.pyc | 0
CoreServerGroup/GameServer/Script/Player/PlayerTalk.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFamily.pyc | 0
db/PyMongoDataServer/PySysDB/tagChestsAward.txt | 12 ++++++------
CoreServerGroup/GameServer/Script/Player/PlayerControl.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.pyc | 0
15 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/CoreServerGroup/GameServer/PySysDB/tagActFairyCeremony.txt b/CoreServerGroup/GameServer/PySysDB/tagActFairyCeremony.txt
index 45f3f68..b2f1eff 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagActFairyCeremony.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagActFairyCeremony.txt
@@ -1,3 +1,4 @@
CfgID ActMark PlatformList ServerIDList StartDate EndDate ResetType NotifyInfoStart NotifyInfoEnd LimitLV
1 test1 [] [] 2019-1-1 2019-1-1 2 {0:["CeremonyStart", []],30:["CeremonyStart", []],60:["CeremonyStart", []],180:["CeremonyStart", []],360:["CeremonyStart", []]} {-60:["CeremonyEnd", []],-30:["CeremonyEnd", []],0:["CeremonyOver", []]} 110
2 test2 [] [] 7 7 2 {0:["CeremonyStart", []],30:["CeremonyStart", []],60:["CeremonyStart", []],180:["CeremonyStart", []],360:["CeremonyStart", []]} {-60:["CeremonyEnd", []],-30:["CeremonyEnd", []],0:["CeremonyOver", []]} 110
+3 20190122 [] [] 2019-1-12 2019-1-12 2 {0:["CeremonyStart", []],30:["CeremonyStart", []],60:["CeremonyStart", []],180:["CeremonyStart", []],360:["CeremonyStart", []]} {-60:["CeremonyEnd", []],-30:["CeremonyEnd", []],0:["CeremonyOver", []]} 110
diff --git a/CoreServerGroup/GameServer/Script/ChNetSendPack.pyc b/CoreServerGroup/GameServer/Script/ChNetSendPack.pyc
index 5a4fa03..26d9ae6 100644
--- a/CoreServerGroup/GameServer/Script/ChNetSendPack.pyc
+++ b/CoreServerGroup/GameServer/Script/ChNetSendPack.pyc
Binary files differ
diff --git a/CoreServerGroup/GameServer/Script/Player/CrossRealmPlayer.pyc b/CoreServerGroup/GameServer/Script/Player/CrossRealmPlayer.pyc
index 1ac6f44..36245ca 100644
--- a/CoreServerGroup/GameServer/Script/Player/CrossRealmPlayer.pyc
+++ b/CoreServerGroup/GameServer/Script/Player/CrossRealmPlayer.pyc
Binary files differ
diff --git a/CoreServerGroup/GameServer/Script/Player/PlayerControl.pyc b/CoreServerGroup/GameServer/Script/Player/PlayerControl.pyc
index 8cf3ba3..5c2d15b 100644
--- a/CoreServerGroup/GameServer/Script/Player/PlayerControl.pyc
+++ b/CoreServerGroup/GameServer/Script/Player/PlayerControl.pyc
Binary files differ
diff --git a/CoreServerGroup/GameServer/Script/Player/PlayerQuery.pyc b/CoreServerGroup/GameServer/Script/Player/PlayerQuery.pyc
index b7c3c8b..6d9a011 100644
--- a/CoreServerGroup/GameServer/Script/Player/PlayerQuery.pyc
+++ b/CoreServerGroup/GameServer/Script/Player/PlayerQuery.pyc
Binary files differ
diff --git a/CoreServerGroup/GameServer/Script/Player/PlayerTalk.pyc b/CoreServerGroup/GameServer/Script/Player/PlayerTalk.pyc
index 1723717..a31eefe 100644
--- a/CoreServerGroup/GameServer/Script/Player/PlayerTalk.pyc
+++ b/CoreServerGroup/GameServer/Script/Player/PlayerTalk.pyc
Binary files differ
diff --git a/CoreServerGroup/GameServer/Script/Player/PlayerTeam.pyc b/CoreServerGroup/GameServer/Script/Player/PlayerTeam.pyc
index a7ff073..8124273 100644
--- a/CoreServerGroup/GameServer/Script/Player/PlayerTeam.pyc
+++ b/CoreServerGroup/GameServer/Script/Player/PlayerTeam.pyc
Binary files differ
diff --git a/CoreServerGroup/GameServer/Script/ShareDefine.pyc b/CoreServerGroup/GameServer/Script/ShareDefine.pyc
index 105ae27..b804f3c 100644
--- a/CoreServerGroup/GameServer/Script/ShareDefine.pyc
+++ b/CoreServerGroup/GameServer/Script/ShareDefine.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/AttackCommon.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/AttackCommon.pyc
index af3cecd..a615e46 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/AttackCommon.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/AttackCommon.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ItemControler.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ItemControler.pyc
index 0a80394..07503c6 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ItemControler.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ItemControler.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.pyc
index 12202bb..865dbad 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.pyc
index 0afdf72..c5c70b9 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.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 496a903..a9483f0 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/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.pyc
index 072cee6..71f1420 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.pyc
Binary files differ
diff --git a/db/PyMongoDataServer/PySysDB/tagChestsAward.txt b/db/PyMongoDataServer/PySysDB/tagChestsAward.txt
index 798a428..9ffac4b 100644
--- a/db/PyMongoDataServer/PySysDB/tagChestsAward.txt
+++ b/db/PyMongoDataServer/PySysDB/tagChestsAward.txt
@@ -1,17 +1,17 @@
BoxID BoxLV SelectList FixedItem Probability1 RandCount1 Probability2 RandCount2 ProbabilitySpec JobItem MoneyType MoneyCount NeedNotifyItemList
-2200 0 103_2|102_5|101_10 0 0
-2201 0 106_1|105_1|104_4 0 0
+2200 0 103_2|101_10 0 0
+2201 0 106_1|104_4 0 0
2202 0 4305_8 0 0
2203 0 5303_100 0 0
2204 0 153_15|144_30|143_45|142_60|141_80 147_1 0 0
2205 0 5012_20 [[5012,5022]] 0 0
-2206 0 6_1 0 0
+2206 0 [[5000,[3502,1]],[10000,[3512,1]]] 1 0 0
2301 0 4151_10 0 0
2207 0 101_3 0 0
2263 0 4611_2|4612_2|4613_2|4614_2|4615_2 [[2941,[983,1]],[4706,[4657,1]],[6471,[4658,1]],[8235,[4670,1]],[10000,[4694,1]]] [[8300,0],[10000,1]] 0 0 [983,4657,4658,4670,4694]
-2264 0 102_3 0 0
-2265 0 102_2 0 0
-2266 0 102_1 0 0
+2264 0 101_3 0 0
+2265 0 101_3 0 0
+2266 0 101_3 0 0
2267 0 101_3 0 0
2208 0 4314_1|4319_1|4349_1|4354_1 0 0
2209 0 4335_1|4370_1|4375_1|4380_1 0 0
--
Gitblit v1.8.0