From b7c5f31e79dc45be47f5d8fcfed4b766c9474afd Mon Sep 17 00:00:00 2001
From: CeHua_ZWJ <ceh@163.com>
Date: 星期一, 08 十月 2018 11:25:26 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server
---
db/PyMongoDataServer/PySysDB/tagDogz.txt | 40 ++++++++++++++++++++--------------------
CoreServerGroup/GameServer/Script/Player/PlayerFairyCeremony.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.pyc | 0
CoreServerGroup/GameServer/Script/IpyGameDataPY.pyc | 0
CoreServerGroup/GameServer/Script/ChPyNetSendPack.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerDogz.pyc | 0
CoreServerGroup/GameServer/PySysDB/tagFBStateTime.txt | 12 ++++++------
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.pyc | 0
CoreServerGroup/GameServer/PySysDB/tagActFairyCeremony.txt | 6 +++---
9 files changed, 29 insertions(+), 29 deletions(-)
diff --git a/CoreServerGroup/GameServer/PySysDB/tagActFairyCeremony.txt b/CoreServerGroup/GameServer/PySysDB/tagActFairyCeremony.txt
index 85a0948..e90fd56 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagActFairyCeremony.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagActFairyCeremony.txt
@@ -1,3 +1,3 @@
-CfgID ActMark ServerIDList StartDate EndDate NotifyInfoStart NotifyInfoEnd LimitLV
-1 test1 [] 2018-9-30 2018-9-30 {0:["CeremonyStart", []],30:["CeremonyStart", []],60:["CeremonyStart", []],180:["CeremonyStart", []],360:["CeremonyStart", []]} {-60:["CeremonyEnd", []],-30:["CeremonyEnd", []],0:["CeremonyEnd", []]} 110
-2 test2 [] 2018-10-6 2018-10-6 {0:["CeremonyStart", []],30:["CeremonyStart", []],60:["CeremonyStart", []],180:["CeremonyStart", []],360:["CeremonyStart", []]} {-60:["CeremonyEnd", []],-30:["CeremonyEnd", []],0:["CeremonyEnd", []]} 110
+CfgID ActMark ServerIDList StartDate EndDate ResetType NotifyInfoStart NotifyInfoEnd LimitLV
+1 test1 [] 2018-9-30 2018-10-1 1 {0:["CeremonyStart", []],30:["CeremonyStart", []],60:["CeremonyStart", []],180:["CeremonyStart", []],360:["CeremonyStart", []]} {-60:["CeremonyEnd", []],-30:["CeremonyEnd", []],0:["CeremonyEnd", []]} 110
+2 test2 [] 2018-10-6 2018-10-6 1 {0:["CeremonyStart", []],30:["CeremonyStart", []],60:["CeremonyStart", []],180:["CeremonyStart", []],360:["CeremonyStart", []]} {-60:["CeremonyEnd", []],-30:["CeremonyEnd", []],0:["CeremonyEnd", []]} 110
diff --git a/CoreServerGroup/GameServer/PySysDB/tagFBStateTime.txt b/CoreServerGroup/GameServer/PySysDB/tagFBStateTime.txt
index a989e15..a0d984a 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagFBStateTime.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagFBStateTime.txt
@@ -14,11 +14,11 @@
13 31160 2 20 30 21 0 1 1 {}
14 31160 4 20 30 21 0 1 1 {}
15 31160 6 20 30 21 0 1 1
-16 31220 2 19 0 21 0 0 11 {0:["FamilyMatchTime", []]}
-17 31220 2 21 0 21 20 1 12 {-5:["FamilyMatchBeforeStart", [5]], -3:["FamilyMatchBeforeStart", [3]], -1:["FamilyMatchBeforeStart", [1]], 0:["FamilyMatchStart", []]}
-18 31220 2 21 21 21 25 0 13 {}
-19 31220 2 21 25 21 30 0 21 {0:["FamilyMatchTime", []]}
-20 31220 2 21 30 21 50 1 22 {-5:["FamilyMatchBeforeStart", [5]], -3:["FamilyMatchBeforeStart", [3]], -1:["FamilyMatchBeforeStart", [1]], 0:["FamilyMatchStart", []]}
-21 31220 2 21 51 23 59 0 23 {}
+16 31220 5 19 0 21 0 0 11 {0:["FamilyMatchTime", []]}
+17 31220 5 21 0 21 20 1 12 {-5:["FamilyMatchBeforeStart", [5]], -3:["FamilyMatchBeforeStart", [3]], -1:["FamilyMatchBeforeStart", [1]], 0:["FamilyMatchStart", []]}
+18 31220 5 21 21 21 25 0 13 {}
+19 31220 5 21 25 21 30 0 21 {0:["FamilyMatchTime", []]}
+20 31220 5 21 30 21 50 1 22 {-5:["FamilyMatchBeforeStart", [5]], -3:["FamilyMatchBeforeStart", [3]], -1:["FamilyMatchBeforeStart", [1]], 0:["FamilyMatchStart", []]}
+21 31220 5 21 51 23 59 0 23 {}
23 31010 3 21 0 21 30 1 1 {-5:['XMZZBeforeStart',[5]],0:['XMZZStart',[]]}
24 31010 7 21 0 21 30 1 1 {-5:['XMZZBeforeStart',[5]],0:['XMZZStart',[]]}
diff --git a/CoreServerGroup/GameServer/Script/ChPyNetSendPack.pyc b/CoreServerGroup/GameServer/Script/ChPyNetSendPack.pyc
index 2e13acc..d69bba9 100644
--- a/CoreServerGroup/GameServer/Script/ChPyNetSendPack.pyc
+++ b/CoreServerGroup/GameServer/Script/ChPyNetSendPack.pyc
Binary files differ
diff --git a/CoreServerGroup/GameServer/Script/IpyGameDataPY.pyc b/CoreServerGroup/GameServer/Script/IpyGameDataPY.pyc
index 5f02adf..f54cc98 100644
--- a/CoreServerGroup/GameServer/Script/IpyGameDataPY.pyc
+++ b/CoreServerGroup/GameServer/Script/IpyGameDataPY.pyc
Binary files differ
diff --git a/CoreServerGroup/GameServer/Script/Player/PlayerFairyCeremony.pyc b/CoreServerGroup/GameServer/Script/Player/PlayerFairyCeremony.pyc
index 4ab0611..5649460 100644
--- a/CoreServerGroup/GameServer/Script/Player/PlayerFairyCeremony.pyc
+++ b/CoreServerGroup/GameServer/Script/Player/PlayerFairyCeremony.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.pyc
index ce94e4e..8cafd41 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.pyc
index c0afa32..45be096 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerDogz.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerDogz.pyc
index fb4d83a..aff8af3 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerDogz.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerDogz.pyc
Binary files differ
diff --git a/db/PyMongoDataServer/PySysDB/tagDogz.txt b/db/PyMongoDataServer/PySysDB/tagDogz.txt
index d9d87c2..3bd67fe 100644
--- a/db/PyMongoDataServer/PySysDB/tagDogz.txt
+++ b/db/PyMongoDataServer/PySysDB/tagDogz.txt
@@ -1,20 +1,20 @@
-ID BaseAttrTypes BaseAttrValues HelpBattleSkills FightPowerEx EquipPlaceColorList
-1 6|7|8 3716|247|61 46010 10000 1|1|1|1|1
-2 6|7|8 4548|303|75 46011 20000 2|2|2|1|1
-3 6|7|8 5523|368|92 46000 30000 2|2|2|2|2
-4 6|7|8 6676|445|111 46005 40000 3|2|2|2|2
-5 6|7|8 8048|536|134 46012|46030 50000 3|3|3|2|2
-6 6|7|8 9685|645|161 46001|46015 60000 3|3|3|3|3
-7 6|7|8 11638|775|193 46006|46020 70000 3|3|3|3|3
-8 6|7|8 13966|931|232 46025|46060 80000 4|3|3|3|3
-9 6|7|8 16734|1115|278 46025|46055 90000 4|4|4|3|3
-10 6|7|8 20011|1334|333 46025|46080 100000 4|4|4|4|4
-11 6|7|8 23875|1591|397 46025|46065 110000 5|4|4|4|4
-12 6|7|8 28407|1893|473 46025|46050 120000 5|5|5|4|4
-13 6|7|8 33696|2246|561 46025|46040|46070 130000 5|5|5|5|5
-14 6|7|8 39835|2655|663 46025|46035|46045 140000 5|5|5|5|5
-15 6|7|8 46926|3128|782 46025|46075|46085 150000 6|5|5|5|5
-16 6|7|8 55074|3671|917 46025|46056|46066 160000 6|6|5|5|5
-17 6|7|8 64393|4292|1073 46025|46051|46081 170000 6|6|6|5|5
-18 6|7|8 75000|5000|1250 46025|46041|46071 180000 6|6|6|6|5
-19 6|7|8 87019|5801|1450 46025|46086|46076 190000 6|6|6|6|6
+ID BaseAttrTypes BaseAttrValues HelpBattleSkills FightPowerEx EquipPlaceColorList HelpBattleNotify
+1 6|7|8 3716|247|61 46010 10000 1|1|1|1|1 ["HelpBattleNotify1", [], 1]
+2 6|7|8 4548|303|75 46011 20000 2|2|2|1|1 ["HelpBattleNotify2", [], 1]
+3 6|7|8 5523|368|92 46000 30000 2|2|2|2|2 []
+4 6|7|8 6676|445|111 46005 40000 3|2|2|2|2 []
+5 6|7|8 8048|536|134 46012|46030 50000 3|3|3|2|2 []
+6 6|7|8 9685|645|161 46001|46015 60000 3|3|3|3|3 []
+7 6|7|8 11638|775|193 46006|46020 70000 3|3|3|3|3 []
+8 6|7|8 13966|931|232 46025|46060 80000 4|3|3|3|3 []
+9 6|7|8 16734|1115|278 46025|46055 90000 4|4|4|3|3 []
+10 6|7|8 20011|1334|333 46025|46080 100000 4|4|4|4|4 []
+11 6|7|8 23875|1591|397 46025|46065 110000 5|4|4|4|4 []
+12 6|7|8 28407|1893|473 46025|46050 120000 5|5|5|4|4 []
+13 6|7|8 33696|2246|561 46025|46040|46070 130000 5|5|5|5|5 []
+14 6|7|8 39835|2655|663 46025|46035|46045 140000 5|5|5|5|5 []
+15 6|7|8 46926|3128|782 46025|46075|46085 150000 6|5|5|5|5 []
+16 6|7|8 55074|3671|917 46025|46056|46066 160000 6|6|5|5|5 []
+17 6|7|8 64393|4292|1073 46025|46051|46081 170000 6|6|6|5|5 []
+18 6|7|8 75000|5000|1250 46025|46041|46071 180000 6|6|6|6|5 []
+19 6|7|8 87019|5801|1450 46025|46086|46076 190000 6|6|6|6|6 []
--
Gitblit v1.8.0