~admin/snxx_server.git

parent: d6be71e6 | 补丁 | 提交 | ignore whitespace

Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server

CeHua_ZWJ

2018-10-10 6124337c1fc41ccc5a59d57e88dcf1c838e0029c

Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server

28个文件已修改

	CoreServerGroup/GameServer/ChinGameServer.exe	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	CoreServerGroup/GameServer/ChinGameServer.map	172884 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	CoreServerGroup/GameServer/ChinGameServer.tds	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	CoreServerGroup/GameServer/Script/EventReport.pyc	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	CoreServerGroup/GameServer/Script/GameWorld.pyc	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldProcess.pyc	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	CoreServerGroup/GameServer/Script/Player/PlayerGeTui.pyc	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	CoreServerGroup/LoginServer/LoginServer.exe	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	CoreServerGroup/LoginServer/LoginServer.map	49784 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	CoreServerGroup/LoginServer/LoginServer.tds	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ZoneServerGroup/map1_8G/MapServer/MapServerData/ChinMapServer.exe	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ZoneServerGroup/map1_8G/MapServer/MapServerData/ChinMapServer.map	171838 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ZoneServerGroup/map1_8G/MapServer/MapServerData/ChinMapServer.tds	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ZoneServerGroup/map1_8G/MapServer/MapServerData/ChinMapServerDM.exe	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ZoneServerGroup/map1_8G/MapServer/MapServerData/ChinMapServerDM.map	184628 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ZoneServerGroup/map1_8G/MapServer/MapServerData/ChinMapServerDM.tds	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/EventReport.pyc	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorld.pyc	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCoin.pyc	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerDienstgrad.pyc	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFlashGiftbag.pyc	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGeTui.pyc	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerNewGuyCard.pyc	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerViewCacheTube.pyc	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	db/PyMongoDataServer/Common/CommFunc.pyc	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	db/PyMongoDataServer/LogicProcess/UserCtrlDB.pyc	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	db/PyMongoDataServer/PySysDB/tagOrderInfo.txt	29 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	db/PyMongoDataServer/PySysDB/tagRoleEquipStars.txt	40 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 CoreServerGroup/GameServer/ChinGameServer.exe

Binary files differ

 CoreServerGroup/GameServer/ChinGameServer.map

Diff too large

 CoreServerGroup/GameServer/ChinGameServer.tds

Binary files differ

 CoreServerGroup/GameServer/Script/EventReport.pyc

Binary files differ

 CoreServerGroup/GameServer/Script/GameWorld.pyc

Binary files differ

 CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldProcess.pyc

Binary files differ

 CoreServerGroup/GameServer/Script/Player/PlayerGeTui.pyc

Binary files differ

 CoreServerGroup/LoginServer/LoginServer.exe

Binary files differ

 CoreServerGroup/LoginServer/LoginServer.map

Diff too large

 CoreServerGroup/LoginServer/LoginServer.tds

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/ChinMapServer.exe

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/ChinMapServer.map

Diff too large

 ZoneServerGroup/map1_8G/MapServer/MapServerData/ChinMapServer.tds

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/ChinMapServerDM.exe

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/ChinMapServerDM.map

Diff too large

 ZoneServerGroup/map1_8G/MapServer/MapServerData/ChinMapServerDM.tds

Binary files differ

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

Binary files differ

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

Binary files differ

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

Binary files differ

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

Binary files differ

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

Binary files differ

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

Binary files differ

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

Binary files differ

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

Binary files differ

 db/PyMongoDataServer/Common/CommFunc.pyc

Binary files differ

 db/PyMongoDataServer/LogicProcess/UserCtrlDB.pyc

Binary files differ

 db/PyMongoDataServer/PySysDB/tagOrderInfo.txt

@@ -179,3 +179,32 @@
com.price68.xjlb    spyxxjios    68    0    5

com.price128.xjlb    spyxxjios    128    0    7

com.price168.xjlb    spyxxjios    168    0    8

jisu.18    jisugame    18    101    0

jisu.10    jisugame    10    102    0

jisu.30    jisugame    30    103    0

jisu.98    jisugame    98    104    0

jisu.128    jisugame    128    105    0

jisu.198    jisugame    198    106    0

jisu.328    jisugame    328    107    0

jisu.648    jisugame    648    108    0

jisu.3000    jisugame    3000    109    0

jisu.1    jisugame    1    110    0

jisu.android.6    jisugame    6    0    2

jisu.android.30    jisugame    30    0    4

jisu.android.68    jisugame    68    0    5

jisu.android.128    jisugame    128    0    7

jisu.android.168    jisugame    168    0    8

com.snjjxios.01    jisugameios    18    101    0

com.snjjxios.02    jisugameios    6    2    0

com.snjjxios.03    jisugameios    30    103    0

com.snjjxios.04    jisugameios    98    104    0

com.snjjxios.05    jisugameios    128    105    0

com.snjjxios.06    jisugameios    198    106    0

com.snjjxios.07    jisugameios    328    107    0

com.snjjxios.08    jisugameios    648    108    0

com.snjjxios.14    jisugameios    1    110    0

com.snjjxios.09    jisugameios    6    0    2

com.snjjxios.10    jisugameios    30    0    4

com.snjjxios.11    jisugameios    68    0    5

com.snjjxios.12    jisugameios    128    0    7

com.snjjxios.13    jisugameios    168    0    8


 db/PyMongoDataServer/PySysDB/tagRoleEquipStars.txt

@@ -1,18 +1,24 @@
countNeed    attType    attValue

5    6|7    1532|76

6    6|7    3192|159

7    6|7    4986|249

8    6|7    6924|346

9    6|7    9012|450

10    6|7    11262|563

11    6|7    13682|684

12    6|7    16283|814

13    6|7    19078|953

14    6|7    22078|1103

15    6|7    25296|1264

16    6|7    28746|1437

17    6|7    32442|1622

18    6|7    36399|1819

19    6|7    40633|2031

20    6|7    45161|2258

21    6|7    50000|2500

1    7    100

3    7    300

5    7    600

7    7|32    900|100

9    7|32    1200|300

11    7|32|60    1200|600|1000

13    7|32|60    1200|900|2000

15    7|32|60    1200|1200|3000

16    7|32|60    1200|1200|4000

17    7|32|60    1200|1200|5000

18    7|32|60    1200|1200|6000

19    7|32|60    1200|1200|7000

20    7|32|60    1200|1200|8500

21    7|32|60    1200|1200|10000

22    7|32|60    1200|1200|11500

23    7|32|60    1200|1200|13000

24    7|32|60    1200|1200|15000

25    7|32|60    1200|1200|17000

26    7|32|60    1200|1200|19000

27    7|32|60    1200|1200|21000

28    7|32|60    1200|1200|24000

29    7|32|60    1200|1200|27000

30    7|32|60    1200|1200|30000

			@@ -179,3 +179,32 @@
			com.price68.xjlb spyxxjios 68 0 5
			com.price128.xjlb spyxxjios 128 0 7
			com.price168.xjlb spyxxjios 168 0 8
			jisu.18 jisugame 18 101 0
			jisu.10 jisugame 10 102 0
			jisu.30 jisugame 30 103 0
			jisu.98 jisugame 98 104 0
			jisu.128 jisugame 128 105 0
			jisu.198 jisugame 198 106 0
			jisu.328 jisugame 328 107 0
			jisu.648 jisugame 648 108 0
			jisu.3000 jisugame 3000 109 0
			jisu.1 jisugame 1 110 0
			jisu.android.6 jisugame 6 0 2
			jisu.android.30 jisugame 30 0 4
			jisu.android.68 jisugame 68 0 5
			jisu.android.128 jisugame 128 0 7
			jisu.android.168 jisugame 168 0 8
			com.snjjxios.01 jisugameios 18 101 0
			com.snjjxios.02 jisugameios 6 2 0
			com.snjjxios.03 jisugameios 30 103 0
			com.snjjxios.04 jisugameios 98 104 0
			com.snjjxios.05 jisugameios 128 105 0
			com.snjjxios.06 jisugameios 198 106 0
			com.snjjxios.07 jisugameios 328 107 0
			com.snjjxios.08 jisugameios 648 108 0
			com.snjjxios.14 jisugameios 1 110 0
			com.snjjxios.09 jisugameios 6 0 2
			com.snjjxios.10 jisugameios 30 0 4
			com.snjjxios.11 jisugameios 68 0 5
			com.snjjxios.12 jisugameios 128 0 7
			com.snjjxios.13 jisugameios 168 0 8

			@@ -1,18 +1,24 @@
			countNeed attType attValue
			5 6\|7 1532\|76
			6 6\|7 3192\|159
			7 6\|7 4986\|249
			8 6\|7 6924\|346
			9 6\|7 9012\|450
			10 6\|7 11262\|563
			11 6\|7 13682\|684
			12 6\|7 16283\|814
			13 6\|7 19078\|953
			14 6\|7 22078\|1103
			15 6\|7 25296\|1264
			16 6\|7 28746\|1437
			17 6\|7 32442\|1622
			18 6\|7 36399\|1819
			19 6\|7 40633\|2031
			20 6\|7 45161\|2258
			21 6\|7 50000\|2500
			1 7 100
			3 7 300
			5 7 600
			7 7\|32 900\|100
			9 7\|32 1200\|300
			11 7\|32\|60 1200\|600\|1000
			13 7\|32\|60 1200\|900\|2000
			15 7\|32\|60 1200\|1200\|3000
			16 7\|32\|60 1200\|1200\|4000
			17 7\|32\|60 1200\|1200\|5000
			18 7\|32\|60 1200\|1200\|6000
			19 7\|32\|60 1200\|1200\|7000
			20 7\|32\|60 1200\|1200\|8500
			21 7\|32\|60 1200\|1200\|10000
			22 7\|32\|60 1200\|1200\|11500
			23 7\|32\|60 1200\|1200\|13000
			24 7\|32\|60 1200\|1200\|15000
			25 7\|32\|60 1200\|1200\|17000
			26 7\|32\|60 1200\|1200\|19000
			27 7\|32\|60 1200\|1200\|21000
			28 7\|32\|60 1200\|1200\|24000
			29 7\|32\|60 1200\|1200\|27000
			30 7\|32\|60 1200\|1200\|30000