parent: b043f0c9 | 补丁 | 提交 | show whitespace
CeHua_ZWJ
2018-10-21 b30999281c9c1005513d3aee44f5a2e307809430 
4262 开服运营活动修改

Conflicts:
	CoreServerGroup/GameServer/PySysDB/tagActFlashGiftbag.txt
	CoreServerGroup/GameServer/PySysDB/tagActSpringSale.txt
	db/PyMongoDataServer/PySysDB/tagStore.txt
2个文件已修改
4 ■■■■■ 已修改文件
CoreServerGroup/GameServer/PySysDB/tagActFlashGiftbag.txt 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
db/PyMongoDataServer/PySysDB/tagActFlashGiftbag.txt 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 
 CoreServerGroup/GameServer/PySysDB/tagActFlashGiftbag.txt


@@ -4,7 +4,7 @@


3    OpenServer03    []    5    5            0    {0:["LimitGift1",[]]}    {-60:["LimitGift2",[]]}    [120, "LimitGift1"]    50    0



4    OpenServer04    []    6    6            0    {0:["LimitGift1",[]]}    {-60:["LimitGift2",[]]}    [120, "LimitGift1"]    50    0



5    OpenServer05    []    7    7            0    {0:["LimitGift1",[]]}    {-60:["LimitGift2",[]]}    [120, "LimitGift1"]    50    0



5    OpenServer06    []    9    10            120    {0:["LimitGift1",[]]}    {-60:["LimitGift2",[]]}    [120, "LimitGift1"]    50    0



6    OpenServer06    []    9    10            120    {0:["LimitGift1",[]]}    {-60:["LimitGift2",[]]}    [120, "LimitGift1"]    50    0



7    NationalDay    []    2018-9-1    2018-9-3            120    {0:["LimitGift1",[]]}    {-30:["LimitGift2",[]]}    [30, "LimitGift2"]    50    1



8    NationalDay    [(1,10), (100, 110), 120]    2018-9-1    2018-9-3    12:00|18:00    13:00|19:00    120    {0:["LimitGift1",[]]}    {-30:["LimitGift2",[]]}    [240, "LimitGift2"]    50    1



9    1OpenServer01    [7001]    2018-9-7    2018-9-7            120    {0:["LimitGift1",[]]}    {-60:["LimitGift2",[]]}    []    50    1





 db/PyMongoDataServer/PySysDB/tagActFlashGiftbag.txt


@@ -4,7 +4,7 @@


3    5    5            0    50    0    [[3]]    SellMail4    



4    6    6            0    50    0    [[7]]    SellMail4    



5    7    7            0    50    0    [[8]]    SellMail4    



5    9    10            120    50    0    [[4]]    SellMail4	


6    9    10            120    50    0    [[4]]    SellMail4	


7    2018-9-1    2018-9-3            120    50    1    [[1,2,3]]    SellMail4    [[13,2,1],[2,2,1]]



8    2018-9-1    2018-9-3    12:00|18:00    13:00|19:00    120    50    1    [[3]]    SellMail4    [[13,2,1],[2,2,1]]



9    2018-9-7    2018-9-7            120    50    1    [[2]]    SellMail4    [[13,2,1],[2,2,1]]