hwj35
2025-12-18 f0e76e345d4cb0aae3c24ac6dd791e1022d61a4e
Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_Server
8个文件已修改
40 ■■■■ 已修改文件
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/GameWorldEvent.pyc 补丁 | 查看 | 原始文档 | blame | 历史
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTreasure.pyc 补丁 | 查看 | 原始文档 | blame | 历史
ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/FuncConfig.txt 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/FuncOpenLV.txt 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/Store.txt 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/FuncConfig.txt 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/FuncOpenLV.txt 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/Store.txt 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/GameWorldEvent.pyc
Binary files differ
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTreasure.pyc
Binary files differ
ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/FuncConfig.txt
@@ -383,7 +383,7 @@
ZhenbaogeCut    -500    int(initPrice*cutWeight/totalWeight*1.0*(minRatio+randRatio*rand))            
PersonalMail    200                
BillboardSet    []    {0:1000, 1:9999, 2:9999, 3:9999, 4:9999}    {}        
OSABillboard    {"3":[1, 2], "4":[2, 3]}    {"1":[[5,40,0],[8,800,0],[7,40000,0]],"2":[[5,30,0],[8,600,0],[7,30000,0]],"3":[[5,20,0],[8,400,0],[7,20000,0]],"5":[[5,15,0],[8,300,0],[7,15000,0]],"10":[[5,10,0],[8,200,0],[7,10000,0]],"20":[[5,8,0],[8,160,0],[7,8000,0]],"50":[[5,6,0],[8,120,0],[7,6000,0]],"100":[[5,4,0],[8,80,0],[7,4000,0]],"200":[[5,4,0],[8,60,0],[7,3000,0]],"2000":[[5,2,0],[8,40,0],[7,2000,0]]}    {"1":[[1005,1,0],[1001,3,0],[1,2000,0]],"2":[[1013,40,0],[1001,3,0],[1,1800,0]],"3":[[1013,30,0],[1001,2,0],[1,1500,0]],"5":[[1013,20,0],[1001,2,0],[1,1000,0]],"10":[[1001,2,0],[7,10000,0]],"20":[[1001,1,0],[7,8000,0]],"50":[[1003,1,0],[7,6000,0]],"100":[[1003,1,0],[7,4000,0]],"200":[[1002,1,0],[7,3000,0]],"2000":[[1002,1,0],[7,2000,0]]}
OSABillboard    {"3":[1, 3], "4":[2, 4]}    {"1":[[5,40,0],[8,800,0],[7,40000,0]],"2":[[5,30,0],[8,600,0],[7,30000,0]],"3":[[5,20,0],[8,400,0],[7,20000,0]],"5":[[5,15,0],[8,300,0],[7,15000,0]],"10":[[5,10,0],[8,200,0],[7,10000,0]],"20":[[5,8,0],[8,160,0],[7,8000,0]],"50":[[5,6,0],[8,120,0],[7,6000,0]],"100":[[5,4,0],[8,80,0],[7,4000,0]],"200":[[5,4,0],[8,60,0],[7,3000,0]],"2000":[[5,2,0],[8,40,0],[7,2000,0]]}    {"1":[[1005,1,0],[1001,3,0],[1,2000,0]],"2":[[1013,40,0],[1001,3,0],[1,1800,0]],"3":[[1013,30,0],[1001,2,0],[1,1500,0]],"5":[[1013,20,0],[1001,2,0],[1,1000,0]],"10":[[1001,2,0],[7,10000,0]],"20":[[1001,1,0],[7,8000,0]],"50":[[1003,1,0],[7,6000,0]],"100":[[1003,1,0],[7,4000,0]],"200":[[1002,1,0],[7,3000,0]],"2000":[[1002,1,0],[7,2000,0]]}
OSACelebration    7    {"2000":[[3,100]],"4000":[[7,10000]],"6000":[[2,20000]],"9000":[[8,100]],"12000":[[1005,1]]}    20        
TalkCD    {"0":3,"3":3}                
TalkCache    {0:100, 3:30}                
@@ -441,7 +441,7 @@
ArenaSet    1000    30    3    [[2,1000],[12,2]]    
ArenaMatch    [[30,15],[25,12],[20,10],[15,7],[10,5]]    2|10        42|100    
ArenaMatchRobot    1.3    [[-30, -20], [-5, -5], [5, 10], [10, 12], [12, 15]]    1        
ArenaBillboradAward    {"1":[[1,300,0],[12,80,0]],"2":[[1,200,0],[12,60,0]],"3":[[1,100,0],[12,40,0]],"5":[[1,80,0],[12,20,0]],"10":[[1,60,0],[12,16,0]],"50":[[1,40,0],[12,12,0]],"500":[[1,30,0],[12,10,0]],"9999":[[1,20,0],[12,10,0]]}    {"1":[[1,2000,0],[13,50,0]],"2":[[1,1600,0],[13,40,0]],"3":[[1,1200,0],[13,30,0]],"5":[[1,1000,0],[13,25,0]],"10":[[1,800,0],[13,20,0]],"50":[[1,600,0],[13,15,0]],"500":[[1,400,0],[13,10,0]],"9999":[[1,200,0],[13,5,0]]}
ArenaBillboradAward    {"1":[[1,300,0],[12,100,0],[10,20,0]],"2":[[1,200,0],[12,80,0],[10,10,0]],"3":[[1,100,0],[12,60,0],[10,5,0]],"5":[[1,80,0],[12,50,0]],"10":[[1,70,0],[12,40,0]],"50":[[1,60,0],[12,30,0]],"100":[[1,50,0],[12,25,0]],"200":[[1,40,0],[12,20,0]],"500":[[1,20,0],[12,10,0]],"9999":[[1,10,0],[12,5,0]]}    {"1":[[1,300,0],[12,100,0],[10000,20,0]],"2":[[1,200,0],[12,80,0],[10000,10,0]],"3":[[1,100,0],[12,60,0],[10000,5,0]],"5":[[1,80,0],[12,50,0],[10000,3,0]],"10":[[1,70,0],[12,40,0],[10000,2,0]],"50":[[1,60,0],[12,30,0]],"100":[[1,50,0],[12,25,0]],"200":[[1,40,0],[12,20,0]],"500":[[1,20,0],[12,10,0]],"9999":[[1,10,0],[12,5,0]]}
TianziBillboradAward    {"1":[[1,300,0],[8,300,0],[7,5000,0]],"2":[[1,200,0],[8,120,0],[7,4500,0]],"3":[[1,100,0],[8,80,0],[7,4000,0]],"10":[[1,80,0],[8,60,0],[7,3500,0]],"50":[[1,50,0],[8,40,0],[7,3000,0]],"100":[[1,20,0],[8,20,0],[7,2500,0]],"500":[[1,10,0],[8,10,0],[7,2000,0]],"9999":[[1,5,0],[8,5,0],[7,1500,0]]}                
SignInSet    1|30                
Zhanling    {"1":[110], "2":[111], "3":[112], "4":[113], "5":[114], "6":[115]}        {}    {}    [2,1,3,5,4]
ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/FuncOpenLV.txt
@@ -2,10 +2,10 @@
1    0    0    0        10103        [[1, 20]]
2    0    0    1250                
3    0    0    1350                
4    100    0    0    14            [[1, 20]]
4    100    0    0    15            [[1, 20]]
5    335    0    0    30            
6    70    0    0    7
7    96    0    0    2            [[1, 20]]
6    70    0    0    60
7    96    0    0    7            [[1, 20]]
8    0    0    2310                [[1, 20]]
9    0    0    1590                [[1, 20]]
10    1    0    0                
@@ -25,7 +25,7 @@
25    0    0    1220                
26    0    0    0                
27    0    0    1250                [[1, 20]]
28    136    0    0    7            [[1, 20]]
28    136    0    0    26            [[1, 20]]
29    0    0    0                
30    0    0    0                
31    0    0    1250                
@@ -40,7 +40,7 @@
40    0    0    1350                
41    0    0    1770                
42    0    0    0                
43    0    0    1760
43    0    0    1760    10
44    0    0    1760                
45    0    0    1490    0            
46    0    0    1490    2            
ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/Store.txt
@@ -1,9 +1,9 @@
ID    ShopType    ItemID    ItemCnt    ItemListEx    ResetType    LimitCnt    MoneyType    MoneyNum    MoneyOriginal    UnlockType    UnlockValue
1    1    3    25    []    1    1    1    0    0    0    0
2    1    4    1    []    1    100    1    20    0    0    0
3    1    2    10000    []    0    0    1    100    0    0    0
4    1    2    22000    []    0    0    1    200    0    0    0
5    1    2    45000    []    0    0    1    400    0    0    0
3    1    2    10000    []    0    0    1    150    0    0    0
4    1    2    22000    []    0    0    1    300    0    0    0
5    1    2    45000    []    0    0    1    600    0    0    0
6    1    5    10    []    1    1    1    2240    2800    0    0
7    1    20    10    []    1    1    1    1500    2000    0    0
8    1    13    1    []    1    2    1    240    0    0    0
ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/FuncConfig.txt
@@ -383,7 +383,7 @@
ZhenbaogeCut    -500    int(initPrice*cutWeight/totalWeight*1.0*(minRatio+randRatio*rand))            
PersonalMail    200                
BillboardSet    []    {0:1000, 1:9999, 2:9999, 3:9999, 4:9999}    {}        
OSABillboard    {"3":[1, 2], "4":[2, 3]}    {"1":[[5,40,0],[8,800,0],[7,40000,0]],"2":[[5,30,0],[8,600,0],[7,30000,0]],"3":[[5,20,0],[8,400,0],[7,20000,0]],"5":[[5,15,0],[8,300,0],[7,15000,0]],"10":[[5,10,0],[8,200,0],[7,10000,0]],"20":[[5,8,0],[8,160,0],[7,8000,0]],"50":[[5,6,0],[8,120,0],[7,6000,0]],"100":[[5,4,0],[8,80,0],[7,4000,0]],"200":[[5,4,0],[8,60,0],[7,3000,0]],"2000":[[5,2,0],[8,40,0],[7,2000,0]]}    {"1":[[1005,1,0],[1001,3,0],[1,2000,0]],"2":[[1013,40,0],[1001,3,0],[1,1800,0]],"3":[[1013,30,0],[1001,2,0],[1,1500,0]],"5":[[1013,20,0],[1001,2,0],[1,1000,0]],"10":[[1001,2,0],[7,10000,0]],"20":[[1001,1,0],[7,8000,0]],"50":[[1003,1,0],[7,6000,0]],"100":[[1003,1,0],[7,4000,0]],"200":[[1002,1,0],[7,3000,0]],"2000":[[1002,1,0],[7,2000,0]]}
OSABillboard    {"3":[1, 3], "4":[2, 4]}    {"1":[[5,40,0],[8,800,0],[7,40000,0]],"2":[[5,30,0],[8,600,0],[7,30000,0]],"3":[[5,20,0],[8,400,0],[7,20000,0]],"5":[[5,15,0],[8,300,0],[7,15000,0]],"10":[[5,10,0],[8,200,0],[7,10000,0]],"20":[[5,8,0],[8,160,0],[7,8000,0]],"50":[[5,6,0],[8,120,0],[7,6000,0]],"100":[[5,4,0],[8,80,0],[7,4000,0]],"200":[[5,4,0],[8,60,0],[7,3000,0]],"2000":[[5,2,0],[8,40,0],[7,2000,0]]}    {"1":[[1005,1,0],[1001,3,0],[1,2000,0]],"2":[[1013,40,0],[1001,3,0],[1,1800,0]],"3":[[1013,30,0],[1001,2,0],[1,1500,0]],"5":[[1013,20,0],[1001,2,0],[1,1000,0]],"10":[[1001,2,0],[7,10000,0]],"20":[[1001,1,0],[7,8000,0]],"50":[[1003,1,0],[7,6000,0]],"100":[[1003,1,0],[7,4000,0]],"200":[[1002,1,0],[7,3000,0]],"2000":[[1002,1,0],[7,2000,0]]}
OSACelebration    7    {"2000":[[3,100]],"4000":[[7,10000]],"6000":[[2,20000]],"9000":[[8,100]],"12000":[[1005,1]]}    20        
TalkCD    {"0":3,"3":3}                
TalkCache    {0:100, 3:30}                
@@ -441,7 +441,7 @@
ArenaSet    1000    30    3    [[2,1000],[12,2]]    
ArenaMatch    [[30,15],[25,12],[20,10],[15,7],[10,5]]    2|10        42|100    
ArenaMatchRobot    1.3    [[-30, -20], [-5, -5], [5, 10], [10, 12], [12, 15]]    1        
ArenaBillboradAward    {"1":[[1,300,0],[12,80,0]],"2":[[1,200,0],[12,60,0]],"3":[[1,100,0],[12,40,0]],"5":[[1,80,0],[12,20,0]],"10":[[1,60,0],[12,16,0]],"50":[[1,40,0],[12,12,0]],"500":[[1,30,0],[12,10,0]],"9999":[[1,20,0],[12,10,0]]}    {"1":[[1,2000,0],[13,50,0]],"2":[[1,1600,0],[13,40,0]],"3":[[1,1200,0],[13,30,0]],"5":[[1,1000,0],[13,25,0]],"10":[[1,800,0],[13,20,0]],"50":[[1,600,0],[13,15,0]],"500":[[1,400,0],[13,10,0]],"9999":[[1,200,0],[13,5,0]]}
ArenaBillboradAward    {"1":[[1,300,0],[12,100,0],[10,20,0]],"2":[[1,200,0],[12,80,0],[10,10,0]],"3":[[1,100,0],[12,60,0],[10,5,0]],"5":[[1,80,0],[12,50,0]],"10":[[1,70,0],[12,40,0]],"50":[[1,60,0],[12,30,0]],"100":[[1,50,0],[12,25,0]],"200":[[1,40,0],[12,20,0]],"500":[[1,20,0],[12,10,0]],"9999":[[1,10,0],[12,5,0]]}    {"1":[[1,300,0],[12,100,0],[10000,20,0]],"2":[[1,200,0],[12,80,0],[10000,10,0]],"3":[[1,100,0],[12,60,0],[10000,5,0]],"5":[[1,80,0],[12,50,0],[10000,3,0]],"10":[[1,70,0],[12,40,0],[10000,2,0]],"50":[[1,60,0],[12,30,0]],"100":[[1,50,0],[12,25,0]],"200":[[1,40,0],[12,20,0]],"500":[[1,20,0],[12,10,0]],"9999":[[1,10,0],[12,5,0]]}
TianziBillboradAward    {"1":[[1,300,0],[8,300,0],[7,5000,0]],"2":[[1,200,0],[8,120,0],[7,4500,0]],"3":[[1,100,0],[8,80,0],[7,4000,0]],"10":[[1,80,0],[8,60,0],[7,3500,0]],"50":[[1,50,0],[8,40,0],[7,3000,0]],"100":[[1,20,0],[8,20,0],[7,2500,0]],"500":[[1,10,0],[8,10,0],[7,2000,0]],"9999":[[1,5,0],[8,5,0],[7,1500,0]]}                
SignInSet    1|30                
Zhanling    {"1":[110], "2":[111], "3":[112], "4":[113], "5":[114], "6":[115]}        {}    {}    [2,1,3,5,4]
ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/FuncOpenLV.txt
@@ -2,10 +2,10 @@
1    0    0    0        10103        [[1, 20]]
2    0    0    1250                
3    0    0    1350                
4    100    0    0    14            [[1, 20]]
4    100    0    0    15            [[1, 20]]
5    335    0    0    30            
6    70    0    0    7
7    96    0    0    2            [[1, 20]]
6    70    0    0    60
7    96    0    0    7            [[1, 20]]
8    0    0    2310                [[1, 20]]
9    0    0    1590                [[1, 20]]
10    1    0    0                
@@ -25,7 +25,7 @@
25    0    0    1220                
26    0    0    0                
27    0    0    1250                [[1, 20]]
28    136    0    0    7            [[1, 20]]
28    136    0    0    26            [[1, 20]]
29    0    0    0                
30    0    0    0                
31    0    0    1250                
@@ -40,7 +40,7 @@
40    0    0    1350                
41    0    0    1770                
42    0    0    0                
43    0    0    1760
43    0    0    1760    10
44    0    0    1760                
45    0    0    1490    0            
46    0    0    1490    2            
ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/Store.txt
@@ -1,9 +1,9 @@
ID    ShopType    ItemID    ItemCnt    ItemListEx    ResetType    LimitCnt    MoneyType    MoneyNum    MoneyOriginal    UnlockType    UnlockValue
1    1    3    25    []    1    1    1    0    0    0    0
2    1    4    1    []    1    100    1    20    0    0    0
3    1    2    10000    []    0    0    1    100    0    0    0
4    1    2    22000    []    0    0    1    200    0    0    0
5    1    2    45000    []    0    0    1    400    0    0    0
3    1    2    10000    []    0    0    1    150    0    0    0
4    1    2    22000    []    0    0    1    300    0    0    0
5    1    2    45000    []    0    0    1    600    0    0    0
6    1    5    10    []    1    1    1    2240    2800    0    0
7    1    20    10    []    1    1    1    1500    2000    0    0
8    1    13    1    []    1    2    1    240    0    0    0