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

hwj35

2025-12-10 638f28332bc38f771463ccc7013f76041970eeea

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

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/GameWorldEvent.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/GameWorldProcess.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/ItemCommon.pyc

Binary files differ

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

Binary files differ

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

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/PyGameData.pyc

Binary files differ

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

@@ -384,7 +384,7 @@
PersonalMail    200                

BillboardSet    []    {0:1000, 1:9999, 2:9999, 3:9999, 4:9999}    {}        

OSABillboard    {"3":[1, 2], "4":[2, 3]}    {"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]]}        

OSACelebration    7    {"2000":[[3,100]],"3000":[[2,20000]],"5000":[[7,10000]],"8000":[[8,100]],"10000":[[5,10]]}			
OSACelebration    7    {"2000":[[3,100]],"3000":[[2,20000]],"5000":[[7,10000]],"8000":[[8,100]],"10000":[[5,10]]}    20		
TalkCD    {"0":3,"3":3}                

TalkCache    {0:100, 3:30}                

PlayerViewCache    50    7            


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

@@ -309,7 +309,7 @@
2009240    2009240    1    1    神格                                                                                                                                                    400000

2010010    2010010    1    1    龙吟    1    1    1    1    1    0    0    1    0    10000    0    0    10000    5012    3000    13        0                0                    0    3|1    0    0        0    0    0    0    0    5000

2010020    2010020    1    1    七进七出    2    1    1    1    0    0    1    1    0    35000    0    0    10000    5011    20100201    15    3    6019    1|50    8    3    0                    0    4|1    0    0        0    0    0    0    0    50000

20100201    20100201    1    1    七进七出    0    2    1    2    5    0    0    0    1    10000    0    0    10000                    0                0                    0        0    0        0    0    0    0    0    0

20100201    20100201    1    1    七进七出    0    2    1    2    5    0    0    0    1    10000    500000    0    3000                    0                0                    0        0    0        0    0    0    0    0    0

2010030    2010030    1    1    血染征袍    3                                            0    0    5012    10000|2010010    15    1                                                                                200000

2010050    2010050    1    1    龙胆    3    5            5                            0    10000    5011        7    1    5023    30|7|7|2010020    23    2010050    35    0|1                        30            1    7    3            400000

2010070    2010070    1    1    青釭贯虹    3    5            5                            0    10000    25    4000|1            5011    0|[]|3    31    2010010                                    2                            600000

@@ -684,9 +684,9 @@
4010210    4010210    1    1    天地寂灭斩·极                                                        6006    7000    8    4010020                                                                                100000

4010230    4010230    1    1    天地寂灭斩·狂                                                        6006    10000    8    4010020                                                                                300000

4010240    4010240    1    1    神格                                                        6006    1500    8    4010030                                                                                400000

4011010    4011010    1    1    狼烟    1    1    1    1    2    0    0    3    0    6500    0    0    10000    5010    40110101    13        0                0                    0    3|1    0    0        0    0    0    0    0    5000

4011010    4011010    1    1    狼烟    1    1    1    1    1    0    0    1    0    15000    0    0    10000    5010    40110101    13        0                0                    0    3|1    0    0        0    0    0    0    0    5000

40110101    40110101    1    1    生命恢复    0    2    0    2    5    0    0    0    2    2000    0    0    10000                    0                0                    0        0    0        0    0    0    0    0    0

4011020    4011020    1    1    西凉鬼骑    2    1    1    1    0    0    8    1    0    31000    0    0    10000    5010    40110201    13        7010    21            0                    0    4|1    0    0        0    0    0    0    0    50000

4011020    4011020    1    1    西凉鬼骑    2    1    1    1    2    0    0    3    0    11000    0    0    10000    5010    40110201    13        7010    21            0                    0    4|1    0    0        0    0    0    0    0    50000

40110201    40110201    1    1    额外伤害    0    1    1    1    6    0    0    0    1    800    0    0    10000    0                0                                                                            0

4011030    4011030    1    1    暴虐    3    1    1    1    6                1    200        0    10000    5011        9    4011010                                                                                200000

4011050    4011050    1    1    酒池    3                                            0                                                                                                    400000


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

@@ -384,7 +384,7 @@
PersonalMail    200                

BillboardSet    []    {0:1000, 1:9999, 2:9999, 3:9999, 4:9999}    {}        

OSABillboard    {"3":[1, 2], "4":[2, 3]}    {"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]]}        

OSACelebration    7    {"2000":[[3,100]],"3000":[[2,20000]],"5000":[[7,10000]],"8000":[[8,100]],"10000":[[5,10]]}			
OSACelebration    7    {"2000":[[3,100]],"3000":[[2,20000]],"5000":[[7,10000]],"8000":[[8,100]],"10000":[[5,10]]}    20		
TalkCD    {"0":3,"3":3}                

TalkCache    {0:100, 3:30}                

PlayerViewCache    50    7            


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

@@ -309,7 +309,7 @@
2009240    2009240    1    1    神格                                                                                                                                                    400000

2010010    2010010    1    1    龙吟    1    1    1    1    1    0    0    1    0    10000    0    0    10000    5012    3000    13        0                0                    0    3|1    0    0        0    0    0    0    0    5000

2010020    2010020    1    1    七进七出    2    1    1    1    0    0    1    1    0    35000    0    0    10000    5011    20100201    15    3    6019    1|50    8    3    0                    0    4|1    0    0        0    0    0    0    0    50000

20100201    20100201    1    1    七进七出    0    2    1    2    5    0    0    0    1    10000    0    0    10000                    0                0                    0        0    0        0    0    0    0    0    0

20100201    20100201    1    1    七进七出    0    2    1    2    5    0    0    0    1    10000    500000    0    3000                    0                0                    0        0    0        0    0    0    0    0    0

2010030    2010030    1    1    血染征袍    3                                            0    0    5012    10000|2010010    15    1                                                                                200000

2010050    2010050    1    1    龙胆    3    5            5                            0    10000    5011        7    1    5023    30|7|7|2010020    23    2010050    35    0|1                        30            1    7    3            400000

2010070    2010070    1    1    青釭贯虹    3    5            5                            0    10000    25    4000|1            5011    0|[]|3    31    2010010                                    2                            600000

@@ -684,9 +684,9 @@
4010210    4010210    1    1    天地寂灭斩·极                                                        6006    7000    8    4010020                                                                                100000

4010230    4010230    1    1    天地寂灭斩·狂                                                        6006    10000    8    4010020                                                                                300000

4010240    4010240    1    1    神格                                                        6006    1500    8    4010030                                                                                400000

4011010    4011010    1    1    狼烟    1    1    1    1    2    0    0    3    0    6500    0    0    10000    5010    40110101    13        0                0                    0    3|1    0    0        0    0    0    0    0    5000

4011010    4011010    1    1    狼烟    1    1    1    1    1    0    0    1    0    15000    0    0    10000    5010    40110101    13        0                0                    0    3|1    0    0        0    0    0    0    0    5000

40110101    40110101    1    1    生命恢复    0    2    0    2    5    0    0    0    2    2000    0    0    10000                    0                0                    0        0    0        0    0    0    0    0    0

4011020    4011020    1    1    西凉鬼骑    2    1    1    1    0    0    8    1    0    31000    0    0    10000    5010    40110201    13        7010    21            0                    0    4|1    0    0        0    0    0    0    0    50000

4011020    4011020    1    1    西凉鬼骑    2    1    1    1    2    0    0    3    0    11000    0    0    10000    5010    40110201    13        7010    21            0                    0    4|1    0    0        0    0    0    0    0    50000

40110201    40110201    1    1    额外伤害    0    1    1    1    6    0    0    0    1    800    0    0    10000    0                0                                                                            0

4011030    4011030    1    1    暴虐    3    1    1    1    6                1    200        0    10000    5011        9    4011010                                                                                200000

4011050    4011050    1    1    酒池    3                                            0                                                                                                    400000