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

hwj35

2025-12-16 8b1ee2fc2c8af3eee4fe03d3daad4787265dcf03

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

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

@@ -1,7 +1,7 @@
ID    Type    NeedCnt    Condition    AwardItemList

1    1    105        [[1,50],[4,2],[100401,1,120]]

2    1    205        [[1,100],[5,2],[100501,1,121]]

3    1    308        [[1,200],[13002,50],[100601,1,122]]

1    1    105        [[1,50],[4,2]]

2    1    205        [[1,100],[5,2],[13002,25],]

3    1    308        [[1,200],[13002,25],[100601,1,122]]

4    1    410        [[1,200],[8,50],[5,5]]

5    1    510        [[1,200],[8,50],[12005,50]]

6    1    610        [[1,200],[8,100],[5,10]]


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

@@ -1,7 +1,7 @@
ID    Type    NeedCnt    Condition    AwardItemList

1    1    105        [[1,50],[4,2],[100401,1,120]]

2    1    205        [[1,100],[5,2],[100501,1,121]]

3    1    308        [[1,200],[13002,50],[100601,1,122]]

1    1    105        [[1,50],[4,2]]

2    1    205        [[1,100],[5,2],[13002,25],]

3    1    308        [[1,200],[13002,25],[100601,1,122]]

4    1    410        [[1,200],[8,50],[5,5]]

5    1    510        [[1,200],[8,50],[12005,50]]

6    1    610        [[1,200],[8,100],[5,10]]