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

hwj35

2 天以前 205e9e17cd4b4160016e14e6b622ac3ce1c30e29

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

 ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig.ini

@@ -20,7 +20,7 @@
;合成背包rptCompose

PackCnt07=0

;鉴定背包rptIdentify

PackCnt08=20

PackCnt08=100

;拆解准备背包rptBreakPrepare

PackCnt09=0

;合成结果背包rptResult

@@ -76,6 +76,6 @@
;武将英雄背包

PackCnt35=500

;命格卦玉背包

PackCnt36=48

PackCnt36=60

;命格推演背包

PackCnt37=10

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/DB/StructData/DBFamily.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/CreateFamily.pyc

Binary files differ

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

Binary files differ

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

Binary files differ

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

@@ -102,24 +102,24 @@
2033    0    0    1    0    0    0    0    0    0    [[1,300],[12,100],[13,20]]    {}            0

2034    0    0    1    0    0    0    0    0    0    [[1,680],[12,200],[13,40]]    {}            0

2035    0    0    1    0    0    0    0    0    0    [[1,1280],[12,350],[13,70]]    {}            0

3000    0    0    5    0    0    0    0    0    0    [[1,120],[5,5]]    {}            0

3001    0    0    5    0    0    0    0    0    0    [[1,600],[5,10]]    {}            0

3002    0    0    5    0    0    0    0    0    0    [[1,1360],[5,15]]    {}            0

3003    0    0    5    0    0    0    0    0    0    [[1,2560],[5,30]]    {}            0

3004    0    0    5    0    0    0    0    0    0    [[1,3960],[5,40]]    {}            0

3005    0    0    10    0    0    0    0    0    0    [[1,6560],[5,50]]    {}            0

3006    0    0    10    0    0    0    0    0    0    [[1,12960],[5,100]]    {}            0

3007    0    0    5    0    0    0    0    0    0    [[1,120],[20,5]]    {}            0

3008    0    0    5    0    0    0    0    0    0    [[1,600],[20,10]]    {}            0

3009    0    0    5    0    0    0    0    0    0    [[1,1360],[20,15]]    {}            0

3010    0    0    5    0    0    0    0    0    0    [[1,2560],[20,30]]    {}            0

3011    0    0    5    0    0    0    0    0    0    [[1,3960],[20,40]]    {}            0

3012    0    0    10    0    0    0    0    0    0    [[1,6560],[20,50]]    {}            0

3013    0    0    10    0    0    0    0    0    0    [[1,12960],[20,100]]    {}            0

3014    0    0    5    0    0    0    0    0    0    [[1,120],[5,5]]    {}            0

3015    0    0    5    0    0    0    0    0    0    [[1,600],[5,10]]    {}            0

3016    0    0    5    0    0    0    0    0    0    [[1,1360],[5,15]]    {}            0

3017    0    0    5    0    0    0    0    0    0    [[1,2560],[5,30]]    {}            0

3018    0    0    5    0    0    0    0    0    0    [[1,3960],[5,40]]    {}            0

3019    0    0    10    0    0    0    0    0    0    [[1,6560],[5,50]]    {}            0

3020    0    0    10    0    0    0    0    0    0    [[1,12960],[5,100]]    {}            0

3000    0    5    0    0    0    0    0    0    0    [[1,120],[5,5]]    {}            0

3001    0    5    0    0    0    0    0    0    0    [[1,600],[5,10]]    {}            0

3002    0    5    0    0    0    0    0    0    0    [[1,1360],[5,15]]    {}            0

3003    0    5    0    0    0    0    0    0    0    [[1,2560],[5,30]]    {}            0

3004    0    5    0    0    0    0    0    0    0    [[1,3960],[5,40]]    {}            0

3005    0    10    0    0    0    0    0    0    0    [[1,6560],[5,50]]    {}            0

3006    0    10    0    0    0    0    0    0    0    [[1,12960],[5,100]]    {}            0

3007    0    5    0    0    0    0    0    0    0    [[1,120],[20,5]]    {}            0

3008    0    5    0    0    0    0    0    0    0    [[1,600],[20,10]]    {}            0

3009    0    5    0    0    0    0    0    0    0    [[1,1360],[20,15]]    {}            0

3010    0    5    0    0    0    0    0    0    0    [[1,2560],[20,30]]    {}            0

3011    0    5    0    0    0    0    0    0    0    [[1,3960],[20,40]]    {}            0

3012    0    10    0    0    0    0    0    0    0    [[1,6560],[20,50]]    {}            0

3013    0    10    0    0    0    0    0    0    0    [[1,12960],[20,100]]    {}            0

3014    0    5    0    0    0    0    0    0    0    [[1,120],[5,5]]    {}            0

3015    0    5    0    0    0    0    0    0    0    [[1,600],[5,10]]    {}            0

3016    0    5    0    0    0    0    0    0    0    [[1,1360],[5,15]]    {}            0

3017    0    5    0    0    0    0    0    0    0    [[1,2560],[5,30]]    {}            0

3018    0    5    0    0    0    0    0    0    0    [[1,3960],[5,40]]    {}            0

3019    0    10    0    0    0    0    0    0    0    [[1,6560],[5,50]]    {}            0

3020    0    10    0    0    0    0    0    0    0    [[1,12960],[5,100]]    {}            0


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

@@ -10,10 +10,15 @@
5100090                

5100100                

5100110                

5100111				
5100120                

5100121				
5100130                

5100131				
5100140                

5100141				
5100150                

5100151				
5100160                

5100161                

5200010                

@@ -23,15 +28,22 @@
5200050                

5200060                

5200070                

5200071				
5200080                

5200090                

5200100                

5200110                

5200111				
5200120                

5200121				
5200130                

5200131				
5200140                

5200141				
5200150                

5200151				
5200160                

5200161				
5300010                

5300020                

5300030                

@@ -40,14 +52,20 @@
5300060                

5300070                

5300080                

5300081				
5300090                

5300100                

5300110                

5300120                

5300121				
5300130                

5300131				
5300140                

5300141				
5300150                

5300151				
5300160                

5300161				
5400010                

5400020                

5400030                

@@ -57,13 +75,19 @@
5400070                

5400080                

5400090                

5400091				
5400100                

5400110                

5400120                

5400121				
5400130                

5400131				
5400140                

5400141				
5400150                

5400151				
5400160                

5400161				
6100010                

6100011                

6100012                


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

@@ -194,16 +194,18 @@
1015210    1015210    1    1    北溟嘲风·极    4                                                    6006    1300    8    1015020                                                                                120000

1015230    1015230    1    1    北溟嘲风·狂    4                                                    6007    1    8    10150201                                                                                360000

1015240    1015240    1    1    神格    4                                                    5022    [40,5000,1]|    23    10150101    5022    [40,5000,1]|    23    1015020                                                                480000

1016010    1016010    1    1    洞若观火    1    1    2    1    0    0    1    1    0    10000    0    0    10000    0                0                0                    0    3|1    0    0        0    0    0    0    0    0

1016020    1016020    1    1    天妒    2    1    2    1    4    0    0    2    0    21000    0    0    10000    0                0                0                    0    4|1    0    0        0    0    0    0    0    0

1016030    1016030    1    1    九天水    3                                            0                                                                                                    0

1016010    1016010    1    1    洞若观火    1    1    2    1    0    0    0    2    0    7500    0    0    10000    5010    10160101|[1,2]    13        0                0                    0    3|1    0    0        0    0    0    0    0    6000

10160101    10160101    1    1        0    11    2    1    6    0    0    0    3    1000    0    40000    10000    5010																							
1016020    1016020    1    1    天妒    2    1    2    1    0    0    0    6    0    13000    0    0    10000    5010    10160201    13        0                0                    0    4|1    0    0        0    0    0    0    0    60000

10160201    10160201    1    1    寒气    0    4    2    1001    6    0    0    0    0    5000    0    0    5000    5001        4    2    5002    2|3|0|300    13        0                    0        2    3        1    0    4    0    0    0

1016030    1016030    1    1    九天水    3    1    2    1    0    0    5    1    0    40000    0    0    10000    5011        2    1                                            1                                    0

1016050    1016050    1    1    星落    3                                            0                                                                                                    0

1016070    1016070    1    1    神机    3                                            0                                                                                                    0

1016070    1016070    1    1    神机    3    1    2    1    0    0    1    1    0    10000    0    0    10000    5011        3    1                                            1    0    0        0    0    0    0    0    0

1016080    1016080    1    1    怒气    3    0    0    6    5    0    0    0    0    5000    0    0    10000    5011        1    1                                                                                0

1016090    1016090    1    1    升变    3                                            0                                                                                                    0

1016210    1016210    1    1    天妒·极                                                                                                                                                    0

1016230    1016230    1    1    天妒·狂                                                                                                                                                    0

1016240    1016240    1    1    神格                                                                                                                                                    0

1016210    1016210    1    1    天妒·极    4                                                                                                                                                0

1016230    1016230    1    1    天妒·狂    4                                                                                                                                                0

1016240    1016240    1    1    神格    4                                                                                                                                                0

2001010    2001010    1    1    济世    1    1    2    1    1    0    0    1    0    13500    0    0    10000    0                0                0                    0    3|1    0    0        0    0    0    0    0    2500

2001020    2001020    1    1    千金一掷    2    2    2    2    0    1    1    2    0    21000    0    0    10000    0                0                0                    0    4|1    0    0        0    0    0    0    0    25000

2001030    2001030    1    1    倾囊    3    2    0    2    0    1    1    1    0    8000    0    0    10000    5011        33    1                                                                                100000


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

@@ -102,24 +102,24 @@
2033    0    0    1    0    0    0    0    0    0    [[1,300],[12,100],[13,20]]    {}            0

2034    0    0    1    0    0    0    0    0    0    [[1,680],[12,200],[13,40]]    {}            0

2035    0    0    1    0    0    0    0    0    0    [[1,1280],[12,350],[13,70]]    {}            0

3000    0    0    5    0    0    0    0    0    0    [[1,120],[5,5]]    {}            0

3001    0    0    5    0    0    0    0    0    0    [[1,600],[5,10]]    {}            0

3002    0    0    5    0    0    0    0    0    0    [[1,1360],[5,15]]    {}            0

3003    0    0    5    0    0    0    0    0    0    [[1,2560],[5,30]]    {}            0

3004    0    0    5    0    0    0    0    0    0    [[1,3960],[5,40]]    {}            0

3005    0    0    10    0    0    0    0    0    0    [[1,6560],[5,50]]    {}            0

3006    0    0    10    0    0    0    0    0    0    [[1,12960],[5,100]]    {}            0

3007    0    0    5    0    0    0    0    0    0    [[1,120],[20,5]]    {}            0

3008    0    0    5    0    0    0    0    0    0    [[1,600],[20,10]]    {}            0

3009    0    0    5    0    0    0    0    0    0    [[1,1360],[20,15]]    {}            0

3010    0    0    5    0    0    0    0    0    0    [[1,2560],[20,30]]    {}            0

3011    0    0    5    0    0    0    0    0    0    [[1,3960],[20,40]]    {}            0

3012    0    0    10    0    0    0    0    0    0    [[1,6560],[20,50]]    {}            0

3013    0    0    10    0    0    0    0    0    0    [[1,12960],[20,100]]    {}            0

3014    0    0    5    0    0    0    0    0    0    [[1,120],[5,5]]    {}            0

3015    0    0    5    0    0    0    0    0    0    [[1,600],[5,10]]    {}            0

3016    0    0    5    0    0    0    0    0    0    [[1,1360],[5,15]]    {}            0

3017    0    0    5    0    0    0    0    0    0    [[1,2560],[5,30]]    {}            0

3018    0    0    5    0    0    0    0    0    0    [[1,3960],[5,40]]    {}            0

3019    0    0    10    0    0    0    0    0    0    [[1,6560],[5,50]]    {}            0

3020    0    0    10    0    0    0    0    0    0    [[1,12960],[5,100]]    {}            0

3000    0    5    0    0    0    0    0    0    0    [[1,120],[5,5]]    {}            0

3001    0    5    0    0    0    0    0    0    0    [[1,600],[5,10]]    {}            0

3002    0    5    0    0    0    0    0    0    0    [[1,1360],[5,15]]    {}            0

3003    0    5    0    0    0    0    0    0    0    [[1,2560],[5,30]]    {}            0

3004    0    5    0    0    0    0    0    0    0    [[1,3960],[5,40]]    {}            0

3005    0    10    0    0    0    0    0    0    0    [[1,6560],[5,50]]    {}            0

3006    0    10    0    0    0    0    0    0    0    [[1,12960],[5,100]]    {}            0

3007    0    5    0    0    0    0    0    0    0    [[1,120],[20,5]]    {}            0

3008    0    5    0    0    0    0    0    0    0    [[1,600],[20,10]]    {}            0

3009    0    5    0    0    0    0    0    0    0    [[1,1360],[20,15]]    {}            0

3010    0    5    0    0    0    0    0    0    0    [[1,2560],[20,30]]    {}            0

3011    0    5    0    0    0    0    0    0    0    [[1,3960],[20,40]]    {}            0

3012    0    10    0    0    0    0    0    0    0    [[1,6560],[20,50]]    {}            0

3013    0    10    0    0    0    0    0    0    0    [[1,12960],[20,100]]    {}            0

3014    0    5    0    0    0    0    0    0    0    [[1,120],[5,5]]    {}            0

3015    0    5    0    0    0    0    0    0    0    [[1,600],[5,10]]    {}            0

3016    0    5    0    0    0    0    0    0    0    [[1,1360],[5,15]]    {}            0

3017    0    5    0    0    0    0    0    0    0    [[1,2560],[5,30]]    {}            0

3018    0    5    0    0    0    0    0    0    0    [[1,3960],[5,40]]    {}            0

3019    0    10    0    0    0    0    0    0    0    [[1,6560],[5,50]]    {}            0

3020    0    10    0    0    0    0    0    0    0    [[1,12960],[5,100]]    {}            0


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

@@ -10,10 +10,15 @@
5100090                

5100100                

5100110                

5100111				
5100120                

5100121				
5100130                

5100131				
5100140                

5100141				
5100150                

5100151				
5100160                

5100161                

5200010                

@@ -23,15 +28,22 @@
5200050                

5200060                

5200070                

5200071				
5200080                

5200090                

5200100                

5200110                

5200111				
5200120                

5200121				
5200130                

5200131				
5200140                

5200141				
5200150                

5200151				
5200160                

5200161				
5300010                

5300020                

5300030                

@@ -40,14 +52,20 @@
5300060                

5300070                

5300080                

5300081				
5300090                

5300100                

5300110                

5300120                

5300121				
5300130                

5300131				
5300140                

5300141				
5300150                

5300151				
5300160                

5300161				
5400010                

5400020                

5400030                

@@ -57,13 +75,19 @@
5400070                

5400080                

5400090                

5400091				
5400100                

5400110                

5400120                

5400121				
5400130                

5400131				
5400140                

5400141				
5400150                

5400151				
5400160                

5400161				
6100010                

6100011                

6100012                


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

@@ -194,16 +194,18 @@
1015210    1015210    1    1    北溟嘲风·极    4                                                    6006    1300    8    1015020                                                                                120000

1015230    1015230    1    1    北溟嘲风·狂    4                                                    6007    1    8    10150201                                                                                360000

1015240    1015240    1    1    神格    4                                                    5022    [40,5000,1]|    23    10150101    5022    [40,5000,1]|    23    1015020                                                                480000

1016010    1016010    1    1    洞若观火    1    1    2    1    0    0    1    1    0    10000    0    0    10000    0                0                0                    0    3|1    0    0        0    0    0    0    0    0

1016020    1016020    1    1    天妒    2    1    2    1    4    0    0    2    0    21000    0    0    10000    0                0                0                    0    4|1    0    0        0    0    0    0    0    0

1016030    1016030    1    1    九天水    3                                            0                                                                                                    0

1016010    1016010    1    1    洞若观火    1    1    2    1    0    0    0    2    0    7500    0    0    10000    5010    10160101|[1,2]    13        0                0                    0    3|1    0    0        0    0    0    0    0    6000

10160101    10160101    1    1        0    11    2    1    6    0    0    0    3    1000    0    40000    10000    5010																							
1016020    1016020    1    1    天妒    2    1    2    1    0    0    0    6    0    13000    0    0    10000    5010    10160201    13        0                0                    0    4|1    0    0        0    0    0    0    0    60000

10160201    10160201    1    1    寒气    0    4    2    1001    6    0    0    0    0    5000    0    0    5000    5001        4    2    5002    2|3|0|300    13        0                    0        2    3        1    0    4    0    0    0

1016030    1016030    1    1    九天水    3    1    2    1    0    0    5    1    0    40000    0    0    10000    5011        2    1                                            1                                    0

1016050    1016050    1    1    星落    3                                            0                                                                                                    0

1016070    1016070    1    1    神机    3                                            0                                                                                                    0

1016070    1016070    1    1    神机    3    1    2    1    0    0    1    1    0    10000    0    0    10000    5011        3    1                                            1    0    0        0    0    0    0    0    0

1016080    1016080    1    1    怒气    3    0    0    6    5    0    0    0    0    5000    0    0    10000    5011        1    1                                                                                0

1016090    1016090    1    1    升变    3                                            0                                                                                                    0

1016210    1016210    1    1    天妒·极                                                                                                                                                    0

1016230    1016230    1    1    天妒·狂                                                                                                                                                    0

1016240    1016240    1    1    神格                                                                                                                                                    0

1016210    1016210    1    1    天妒·极    4                                                                                                                                                0

1016230    1016230    1    1    天妒·狂    4                                                                                                                                                0

1016240    1016240    1    1    神格    4                                                                                                                                                0

2001010    2001010    1    1    济世    1    1    2    1    1    0    0    1    0    13500    0    0    10000    0                0                0                    0    3|1    0    0        0    0    0    0    0    2500

2001020    2001020    1    1    千金一掷    2    2    2    2    0    1    1    2    0    21000    0    0    10000    0                0                0                    0    4|1    0    0        0    0    0    0    0    25000

2001030    2001030    1    1    倾囊    3    2    0    2    0    1    1    1    0    8000    0    0    10000    5011        33    1                                                                                100000