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

hwj35

2025-11-24 23fcce49313d4ad554b4e24c6db812fbc1c6cf71

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

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

Binary files differ

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

@@ -431,7 +431,7 @@
InvestCost    {"1":[116],"2":[117]}                 

InvestDay    {"1":30}    {"1":180}    {"1":[[4,10],[3,100]], "2":[[1,100], [3,100]]}         

InvestPower    {"1":{"30010":2}}    {"2":[30010]}    {"1":3, "2":3}    {"2":3}    

AutoGuaji    [1,8,12,16,20]    1260        [1.4,1.8,2.2]	
AutoGuaji    [1,4,8,12,16]    1260        [1.4,1.8,2.2]	
GoldRush    12|12    60|60    10        

GoldRushAuto    [3,  30]    [[1]]    [1,2,3,4]        

GoldRushRefresh    1    42    [10,20,30,40,50]    30    


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

@@ -3,4 +3,3 @@
1    0    1    0    0    0    0            

2    0    1    3    0    0    0            

3    0    1    5    0    0    0            

999    0    2    4    1    1    5    71|72    500|500    100|100


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

@@ -431,7 +431,7 @@
InvestCost    {"1":[116],"2":[117]}                 

InvestDay    {"1":30}    {"1":180}    {"1":[[4,10],[3,100]], "2":[[1,100], [3,100]]}         

InvestPower    {"1":{"30010":2}}    {"2":[30010]}    {"1":3, "2":3}    {"2":3}    

AutoGuaji    [1,8,12,16,20]    1260        [1.4,1.8,2.2]	
AutoGuaji    [1,4,8,12,16]    1260        [1.4,1.8,2.2]	
GoldRush    12|12    60|60    10        

GoldRushAuto    [3,  30]    [[1]]    [1,2,3,4]        

GoldRushRefresh    1    42    [10,20,30,40,50]    30    


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

@@ -3,4 +3,3 @@
1    0    1    0    0    0    0            

2    0    1    3    0    0    0            

3    0    1    5    0    0    0            

999    0    2    4    1    1    5    71|72    500|500    100|100