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

cehua-HWJ35

2019-02-19 8983e9f1821aa55dfe21366d98c9ba0f9b6f27df

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

 CoreServerGroup/GameServer/ChinGameServer.exe

Binary files differ

 CoreServerGroup/GameServer/ChinGameServer.map

Diff too large

 CoreServerGroup/GameServer/ChinGameServer.tds

Binary files differ

 CoreServerGroup/GameServer/PySysDB/tagActLoginAward.txt

@@ -1,2 +1,2 @@
CfgID    ActMark    PlatformList    ServerIDList    StartDate    EndDate    AdvanceMinutes    IsDayReset    ResetType    NotifyInfoStart    NotifyInfoEnd    NotifyInfoLoop    LimitLV

1    OpenSever1    []    []    2019-2-15    2019-2-22    300    1    1    {0:["LoginAward_Start", []]}    {0:["SevenDayEnd", []]}    [240,"LoginAward_Start"]    110

1    OpenSever1    []    []    2019-1-15    2019-1-21    300    1    1    {0:["LoginAward_Start", []]}    {0:["SevenDayEnd", []]}    [240,"LoginAward_Start"]    110


 CoreServerGroup/GameServer/PySysDB/tagActLuckyTreasure.txt

@@ -1,7 +1,2 @@
CfgID    ActMark    PlatformList    ServerIDList    StartDate    EndDate    ResetType    NotifyInfoStart    NotifyInfoEnd    NotifyInfoLoop    LimitLV

1    kaifu1    []    []    2    3    0    {0:["LuckyAppraisal_Start", []]}    {0:["LuckyAppraisal_End", []]}    []    110

2    kaifu2    []    []    6    7    0    {0:["LuckyAppraisal_Start", []]}    {0:["LuckyAppraisal_End", []]}    []    110

3    ceshi1    []    []    2018-11-16    2018-11-18    0    {0:["LuckyAppraisal_Start", []]}    {0:["LuckyAppraisal_End", []]}    []    110

4    yunying1    []    []    2018-11-23    2018-11-24    0    {0:["LuckyAppraisal_Start", []]}    {0:["LuckyAppraisal_End", []]}    []    110

5    yunying2    []    []    2018-11-26    2018-11-26    0    {0:["LuckyAppraisal_Start", []]}    {0:["LuckyAppraisal_End", []]}    []    110

6    xiaoxuexy18    []    []    2019-2-20    2019-2-20    0    {0:["LuckyAppraisal_Start", []]}    {0:["LuckyAppraisal_End", []]}    []    110

1    xiaoxuexy18    []    []    2019-1-20    2019-1-20    0    {0:["LuckyAppraisal_Start", []]}    {0:["LuckyAppraisal_End", []]}    []    110


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

Binary files differ

 CoreServerGroup/GameServer/Script/IPY_Compensation.pyc

Binary files differ

 CoreServerGroup/GameServer/Script/Player/PlayerCompensation.pyc

Binary files differ

 db/PyMongoDataServer/Collections/CollectionDefine.pyc

Binary files differ

 db/PyMongoDataServer/Collections/DataServerPlayerData.pyc

Binary files differ

 db/PyMongoDataServer/PySysDB/tagActLoginAward.txt

@@ -1,2 +1,2 @@
CfgID    StartDate    EndDate    AdvanceMinutes    IsDayReset    ResetType    LimitLV    TemplateID

1    2019-2-15    2019-2-22    300    1    1    110    [[100,200,500,600,800,1100,1300],[100,200,500,600,1700,1800,1600],[100,200,500,600,1200,1000,300],[100,200,500,600,400,900,700],[100,200,500,600,1700,1800,1600],[100,200,500,600,800,1100,1300],[100,200,500,600,1200,1000,300]]

1    2019-1-15    2019-1-21    300    1    1    110    [[100,200,500,600,800,1100,1300],[100,200,500,600,1700,1800,1600],[100,200,500,600,1200,1000,300],[100,200,500,600,400,900,700],[100,200,500,600,1700,1800,1600],[100,200,500,600,800,1100,1300],[100,200,500,600,1200,1000,300]]


 db/PyMongoDataServer/PySysDB/tagActLuckyTreasure.txt

@@ -1,7 +1,2 @@
CfgID    StartDate    EndDate    ResetType    LimitLV    TemplateID    LuckyPoint

1    2    3    0    110    1    600

2    6    7    0    110    1    600

3    2018-11-16    2018-11-18    0    110    1    600

4    2018-11-23    2018-11-24    0    110    1    600

5    2018-11-26    2018-11-26    0    110    1    600

6    2019-2-20    2019-2-20    0    110    1    600

1    2019-1-20    2019-1-20    0    110    1    600