Project_SG_Server.git

parent: ed66d49b | 补丁 | 提交 | ignore whitespace

Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_Server

hwj35

4 天以前 7177b649f00afbb2e1562835710961783e340aa3

Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_Server

6个文件已修改

1个文件已添加

1个文件已删除

	ServersRoute/GMToolLogicProcess/Commands/GMT_ReloadConfig.pyc	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ServersRoute/GMToolLogicProcess/Commands/GMT_ReloadServersConfig.pyc	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ServersRoute/GMToolLogicProcess/ProjSpecialProcess.pyc	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ServersRoute/LogicProcessThread.pyc	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/ActHeroAppear.txt	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/Hero.txt	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/ActHeroAppear.txt	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/Hero.txt	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 ServersRoute/GMToolLogicProcess/Commands/GMT_ReloadConfig.pyc

Binary files differ

 ServersRoute/GMToolLogicProcess/Commands/GMT_ReloadServersConfig.pyc

Binary files differ

 ServersRoute/GMToolLogicProcess/ProjSpecialProcess.pyc

Binary files differ

 ServersRoute/LogicProcessThread.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/ActHeroAppear.txt

@@ -1,3 +1,4 @@
CfgID    PlatformList    ServerIDList    ActNum    StartDate    EndDate    ActHeroIDList    ActTreasureType    StarGiftTempID    SkinCTGIDList    GiftCTGIDList    GiftShopType    ExShopType    ExShopRecycleMail    SignTempID    BillTempID    BillAwardMail

1    ["xssg"]    [[1,17]]    10    2026-3-20    2026-3-26    [510016]    100    1    [4000]    [6100,6101,6102,6103,6104,6105,6106,6107,6108]    200    201    ActHeroAppearRecycleShop    1    1    ActHeroAppearHeroCall

2    ["test"]    []    10    K8    K14    [510016]    100    1    [4000]    [6100,6101,6102,6103,6104,6105,6106,6107,6108]    200    201    ActHeroAppearRecycleShop    1    1    ActHeroAppearHeroCall

2    ["xssg"]    [[18,10000]]    10    K8    K14    [510016]    100    1    [4000]    [6100,6101,6102,6103,6104,6105,6106,6107,6108]    200    201    ActHeroAppearRecycleShop    1    1    ActHeroAppearHeroCall

1000    ["ryzj","test"]    []    10    K8    K14    [510016]    100    1    [4000]    [6100,6101,6102,6103,6104,6105,6106,6107,6108]    200    201    ActHeroAppearRecycleShop    1    1    ActHeroAppearHeroCall


 ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/Hero.txt

@@ -62,7 +62,7 @@
540013    吕玲绮    1    4    5    1    2    2    5400130    4013010    4013020    13500    10000    12500    {"23":2500}    11    1    2

540014    吕布    1    4    5    1    1    1    5400140    4014010    4014020    12000    10000    14000    {"29":2500}    10    0    5

540015    张角    1    4    5    2    1    4    5400150    4015010    4015020    14000    10000    12000    {"21":2500}        0    1

540016    左慈    1    4    5    2    1    3    5400160    4016010    4016020    13000    10000    13000    {"27":2500}        0    4

540016    左慈    1    4    5    2    1    3    5400160|5400161    4016010    4016020    13000    10000    13000    {"27":2500}        0    4

610001    黄巾刀兵    0    4    1    1    1    2    6100010    6001010    6001020    12000    9500    11500    {}        0    2

610002    黄巾枪兵    0    4    1    1    1    3    6100020    6002010    6002020    12000    9500    11500    {}        0    4

610003    黄巾盾兵    0    4    1    1    1    1    6100030    6003010    6003020    12000    9500    11500    {}        0    5


 ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/ActHeroAppear.txt

@@ -1,3 +1,4 @@
CfgID    PlatformList    ServerIDList    ActNum    StartDate    EndDate    ActHeroIDList    ActTreasureType    StarGiftTempID    SkinCTGIDList    GiftCTGIDList    GiftShopType    ExShopType    ExShopRecycleMail    SignTempID    BillTempID    BillAwardMail

1    ["xssg"]    [[1,17]]    10    2026-3-20    2026-3-26    [510016]    100    1    [4000]    [6100,6101,6102,6103,6104,6105,6106,6107,6108]    200    201    ActHeroAppearRecycleShop    1    1    ActHeroAppearHeroCall

2    ["test"]    []    10    K8    K14    [510016]    100    1    [4000]    [6100,6101,6102,6103,6104,6105,6106,6107,6108]    200    201    ActHeroAppearRecycleShop    1    1    ActHeroAppearHeroCall

2    ["xssg"]    [[18,10000]]    10    K8    K14    [510016]    100    1    [4000]    [6100,6101,6102,6103,6104,6105,6106,6107,6108]    200    201    ActHeroAppearRecycleShop    1    1    ActHeroAppearHeroCall

1000    ["ryzj","test"]    []    10    K8    K14    [510016]    100    1    [4000]    [6100,6101,6102,6103,6104,6105,6106,6107,6108]    200    201    ActHeroAppearRecycleShop    1    1    ActHeroAppearHeroCall


 ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/Hero.txt

@@ -62,7 +62,7 @@
540013    吕玲绮    1    4    5    1    2    2    5400130    4013010    4013020    13500    10000    12500    {"23":2500}    11    1    2

540014    吕布    1    4    5    1    1    1    5400140    4014010    4014020    12000    10000    14000    {"29":2500}    10    0    5

540015    张角    1    4    5    2    1    4    5400150    4015010    4015020    14000    10000    12000    {"21":2500}        0    1

540016    左慈    1    4    5    2    1    3    5400160    4016010    4016020    13000    10000    13000    {"27":2500}        0    4

540016    左慈    1    4    5    2    1    3    5400160|5400161    4016010    4016020    13000    10000    13000    {"27":2500}        0    4

610001    黄巾刀兵    0    4    1    1    1    2    6100010    6001010    6001020    12000    9500    11500    {}        0    2

610002    黄巾枪兵    0    4    1    1    1    3    6100020    6002010    6002020    12000    9500    11500    {}        0    4

610003    黄巾盾兵    0    4    1    1    1    1    6100030    6003010    6003020    12000    9500    11500    {}        0    5

			@@ -1,3 +1,4 @@
			CfgID PlatformList ServerIDList ActNum StartDate EndDate ActHeroIDList ActTreasureType StarGiftTempID SkinCTGIDList GiftCTGIDList GiftShopType ExShopType ExShopRecycleMail SignTempID BillTempID BillAwardMail
			1 ["xssg"] [[1,17]] 10 2026-3-20 2026-3-26 [510016] 100 1 [4000] [6100,6101,6102,6103,6104,6105,6106,6107,6108] 200 201 ActHeroAppearRecycleShop 1 1 ActHeroAppearHeroCall
			2 ["test"] [] 10 K8 K14 [510016] 100 1 [4000] [6100,6101,6102,6103,6104,6105,6106,6107,6108] 200 201 ActHeroAppearRecycleShop 1 1 ActHeroAppearHeroCall
			2 ["xssg"] [[18,10000]] 10 K8 K14 [510016] 100 1 [4000] [6100,6101,6102,6103,6104,6105,6106,6107,6108] 200 201 ActHeroAppearRecycleShop 1 1 ActHeroAppearHeroCall
			1000 ["ryzj","test"] [] 10 K8 K14 [510016] 100 1 [4000] [6100,6101,6102,6103,6104,6105,6106,6107,6108] 200 201 ActHeroAppearRecycleShop 1 1 ActHeroAppearHeroCall

			@@ -62,7 +62,7 @@
			540013 吕玲绮 1 4 5 1 2 2 5400130 4013010 4013020 13500 10000 12500 {"23":2500} 11 1 2
			540014 吕布 1 4 5 1 1 1 5400140 4014010 4014020 12000 10000 14000 {"29":2500} 10 0 5
			540015 张角 1 4 5 2 1 4 5400150 4015010 4015020 14000 10000 12000 {"21":2500} 0 1
			540016 左慈 1 4 5 2 1 3 5400160 4016010 4016020 13000 10000 13000 {"27":2500} 0 4
			540016 左慈 1 4 5 2 1 3 5400160\|5400161 4016010 4016020 13000 10000 13000 {"27":2500} 0 4
			610001 黄巾刀兵 0 4 1 1 1 2 6100010 6001010 6001020 12000 9500 11500 {} 0 2
			610002 黄巾枪兵 0 4 1 1 1 3 6100020 6002010 6002020 12000 9500 11500 {} 0 4
			610003 黄巾盾兵 0 4 1 1 1 1 6100030 6003010 6003020 12000 9500 11500 {} 0 5