Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server

cehua_ZWJ

2019-02-13 23935c173eef750e877afcc56d07f4f8cc0dd3e4

Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server

 CoreServerGroup/GameServer/PySysDB/tagDailyActionCustomMix.txt

New file
@@ -0,0 +1,4 @@
ID    MixServerDay    DailyQuestID    TimeList    Duration    NotifyInfo

1    1    17    [[20,30]]    30    {-10:["FairyGrabBossTime", []],-5:["FairyGrabBossTime", []],0:["FairyGrabBossStart", []]}

2    3    17    [[20,30]]    30    {-10:["FairyGrabBossTime", []],-5:["FairyGrabBossTime", []],0:["FairyGrabBossStart", []]}

3    5    17    [[20,30]]    30    {-10:["FairyGrabBossTime", []],-5:["FairyGrabBossTime", []],0:["FairyGrabBossStart", []]}


 CoreServerGroup/GameServer/PySysDB/tagFBStateTimeCustomMix.txt

New file
@@ -0,0 +1,12 @@
ID    MixServerDay    DataMapID    StartHour    StartMinute    EndHour    EndMinute    CanEnter    StateValue    NotifyInfo

1    1    31170    21    0    21    15    1    1    {}

2    1    31170    21    15    21    30    0    1    {}

3    2    31180    21    0    21    30    1    1    {-5:['HLYYBeforeStart',[5]],0:['HLYYStart',[]]}

4    3    31160    20    30    20    50    1    1    {}

5    4    31220    19    0    21    0    0    11    {0:["FamilyMatchTime", []]}

6    4    31220    21    0    21    18    1    12    {-5:["FamilyMatchBeforeStart", [5]], -3:["FamilyMatchBeforeStart", [3]], -1:["FamilyMatchBeforeStart", [1]], 0:["FamilyMatchStart", []]}

7    4    31220    21    19    21    20    0    13    {}

8    4    31220    21    20    21    30    0    21    {0:["FamilyMatchTime", []]}

9    4    31220    21    30    21    48    1    22    {-5:["FamilyMatchBeforeStart", [5]], -3:["FamilyMatchBeforeStart", [3]], -1:["FamilyMatchBeforeStart", [1]], 0:["FamilyMatchStart", []]}

10    4    31220    21    49    23    59    0    23    {}

11    5    31010    21    0    21    30    1    1    {-5:['XMZZBeforeStart',[5]],0:['XMZZStart',[]]}


 CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt

@@ -81,3 +81,4 @@
CrossRealmPKMatch    5    10    60    [32010,32011,32012,32013,32014]    [(10, 7), (40,37)]

CrossRealmPKCfg    [100, 5]    180    50        

CrossRealmPKScore    0    [100, 80]    min(cWinCount*20,100)        

MixServer    5				

 CoreServerGroup/GameServer/PySysDB/tagStore.txt

@@ -392,19 +392,19 @@
1150    214    0    20

1151    214    0    20

1152    215    0    1

1153    215    0    50

1154    215    0    100

1155    215    0    150

1153    215    0    10

1154    215    0    10

1155    215    0    20

1156    215    0    10

1158    216    0    1

1159    216    0    50

1160    216    0    100

1161    216    0    150

1159    216    0    10

1160    216    0    10

1161    216    0    6

1162    216    0    10

1164    217    0    1

1165    217    0    50

1166    217    0    100

1167    217    0    150

1165    217    0    10

1166    217    0    10

1167    217    0    8

1168    217    0    10

1169    220    0    1

1170    220    0    50


 CoreServerGroup/GameServer/Script/ChConfig.pyc

Binary files differ

 CoreServerGroup/GameServer/Script/ChPyNetPack.pyc

Binary files differ

 CoreServerGroup/GameServer/Script/ChPyNetSendPack.pyc

Binary files differ

 CoreServerGroup/GameServer/Script/GM/Commands/ClearOpenServerDay.pyc

Binary files differ

 CoreServerGroup/GameServer/Script/GM/Commands/SetMixServer.pyc

Binary files differ

 CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldActionControl.pyc

Binary files differ

 CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldMixServerCampaign.pyc

Binary files differ

 CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldProcess.pyc

Binary files differ

 CoreServerGroup/GameServer/Script/IpyGameDataPY.pyc

Binary files differ

 CoreServerGroup/GameServer/Script/Player/PlayerBillboard.pyc

Binary files differ

 CoreServerGroup/GameServer/Script/Player/PlayerEventCounter.pyc

Binary files differ

 CoreServerGroup/GameServer/Script/Player/PlayerFamily.pyc

Binary files differ

 CoreServerGroup/GameServer/Script/Player/PlayerQuery.pyc

Binary files differ

 CoreServerGroup/GameServer/Script/ShareDefine.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/PyNetPack.ini

@@ -365,9 +365,9 @@
PacketSubCMD_5=0x26

PacketCallFunc_5=QueryFamilyArrestAwardReceiveState



PacketCMD_6 = 0xAF

PacketSubCMD_6 = 0x02

PacketCallFunc_6 = GiveMixServerCampaignAward

PacketCMD_6=

PacketSubCMD_6=

PacketCallFunc_6=



PacketCMD_7=0xA2

PacketSubCMD_7=0x13

@@ -792,18 +792,6 @@
PacketCMD_1=0xA5

PacketSubCMD_1=0x42

PacketCallFunc_1=OnGetSuccessAward



;合服登陆豪礼

[PlayerMixTheDayLoginAward]

ScriptName = Player\PlayerMixLoginDayAward.py

Writer = ljd

Releaser = ljd

RegType = 0

RegisterPackCount = 1



PacketCMD_1 = 0xAF

PacketSubCMD_1 = 0x01

PacketCallFunc_1 = GetMixLoginDayAward



;节日登陆奖励

[PlayerFestivalLogin]

@@ -1454,4 +1442,16 @@


PacketCMD_3=0xA5

PacketSubCMD_3=0x1C

PacketCallFunc_3=OnGatherSoulCompound
PacketCallFunc_3=OnGatherSoulCompound



;幸运鉴宝

[PlayerLuckyTreasure]

ScriptName = Player\PlayerLuckyTreasure.py

Writer = xdh

Releaser = xdh

RegType = 0

RegisterPackCount = 1



PacketCMD_1=0xAA

PacketSubCMD_1=0x08

PacketCallFunc_1=OnStartLuckyTreasure

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetPack.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/DataRecordPack.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/Operate_EquipPlus.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/Operate_EquipWash.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/Operate_PlayerBuyZhenQi.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/QuestRunner.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/ClearMixServerAward.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_BZZD.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_FamilyParty.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_GodArea.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_IceLode.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_KirinHome.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_MunekadoTrial.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_QueenRelics.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_SealDemon.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_TrialTower.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_ZhuXianBoss.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_ZhuXianTower.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCommon.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCustomRefresh.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/MixServerCampaign.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerActLogin.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerActTotalRecharge.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerBillboard.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerEventCounter.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGoldGift.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerLuckyTreasure.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerMixLoginDayAward.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerRefineStove.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_MixServerCampaignAward.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.pyc

Binary files differ

 db/PyMongoDataServer/PySysDB/tagStore.txt

@@ -391,20 +391,20 @@
1149    214    2    112    10    1    []    112        0    0    0    1    20    1    150    600    0    FlashRushToBuy2    FlashToSnapUp

1150    214    2    912    2    1    []    912        0    0    0    1    20    1    60    300    0    FlashRushToBuy2    FlashToSnapUp

1151    214    2    2213    50    1    []    2213        0    0    0    1    20    1    120    625    0    FlashRushToBuy2    FlashToSnapUp

1152    215    2    2456    1    1    []    5408        0    0    0    1    1    1    60    600    0    FlashRushToBuy2    FlashToSnapUp

1153    215    2    2457    1    1    []    4607        0    0    0    10    50    1    600    2430    0    FlashRushToBuy2    FlashToSnapUp

1154    215    2    2458    1    1    []    4606        0    0    0    10    100    1    55    270    0    FlashRushToBuy2    FlashToSnapUp

1155    215    2    2459    1    1    []    4608        0    0    0    10    150    1    15    90    0    FlashRushToBuy2    FlashToSnapUp

1156    215    2    2213    20    1    []    4610        0    0    0    2    10    1    68    250    0    FlashRushToBuy2    FlashToSnapUp

1152    215    2    2456    1    1    []    2456        0    0    0    1    1    1    60    600    0    FlashRushToBuy2    FlashToSnapUp

1153    215    2    5413    30    1    []    5413        0    0    0    1    10    1    688    900    0    FlashRushToBuy2    FlashToSnapUp

1154    215    2    5414    500    1    []    5414        0    0    0    2    10    1    688    1000    0    FlashRushToBuy2    FlashToSnapUp

1155    215    2    181    40    1    []    181        0    0    0    4    20    1    58    400    0    FlashRushToBuy2    FlashToSnapUp

1156    215    2    2213    20    1    []    2213        0    0    0    2    10    1    68    250    0    FlashRushToBuy2    FlashToSnapUp

1158    216    2    2456    1    1    []    2456        0    0    0    1    1    1    60    600    0    FlashRushToBuy2    FlashToSnapUp

1159    216    2    2457    1    1    []    2457        0    0    0    10    50    1    600    2430    0    FlashRushToBuy2    FlashToSnapUp

1160    216    2    2458    1    1    []    2458        0    0    0    10    100    1    55    270    0    FlashRushToBuy2    FlashToSnapUp

1161    216    2    2459    1    1    []    2459        0    0    0    10    150    1    15    90    0    FlashRushToBuy2    FlashToSnapUp

1159    216    2    5413    30    1    []    5413        0    0    0    1    10    1    688    900    0    FlashRushToBuy2    FlashToSnapUp

1160    216    2    5414    500    1    []    5414        0    0    0    2    10    1    688    1000    0    FlashRushToBuy2    FlashToSnapUp

1161    216    2    5410    3    1    []    5410        0    0    0    2    6    1    50    150    0    FlashRushToBuy2    FlashToSnapUp

1162    216    2    2213    20    1    []    2213        0    0    0    2    10    1    68    250    0    FlashRushToBuy2    FlashToSnapUp

1164    217    2    2456    1    1    []    2456        0    0    0    1    1    1    60    600    0    FlashRushToBuy2    FlashToSnapUp

1165    217    2    2457    1    1    []    2457        0    0    0    10    50    1    600    2430    0    FlashRushToBuy2    FlashToSnapUp

1166    217    2    2458    1    1    []    2458        0    0    0    10    100    1    55    270    0    FlashRushToBuy2    FlashToSnapUp

1167    217    2    2459    1    1    []    2459        0    0    0    10    150    1    15    90    0    FlashRushToBuy2    FlashToSnapUp

1165    217    2    5413    30    1    []    5413        0    0    0    1    10    1    688    900    0    FlashRushToBuy2    FlashToSnapUp

1166    217    2    5414    500    1    []    5414        0    0    0    2    10    1    688    1000    0    FlashRushToBuy2    FlashToSnapUp

1167    217    2    4010    4    1    []    4010        0    0    0    2    8    1    80    320    0    FlashRushToBuy2    FlashToSnapUp

1168    217    2    2213    20    1    []    2213        0    0    0    2    10    1    68    250    0    FlashRushToBuy2    FlashToSnapUp

1169    220    2    2456    1    1    []    5408        0    0    0    1    1    1    60    600    0    FlashRushToBuy2    FlashToSnapUp

1170    220    2    103    5    1    []    4607        0    0    0    10    50    1    90    300    0    FlashRushToBuy2    FlashToSnapUp