~admin/snxx_server.git

parent: 1c4add4d | 补丁 | 提交 | ignore whitespace

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

cehua_wcy

2018-11-27 24e89aa68af2e102c31170e954b70b814f5d352f

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

3个文件已修改

	CoreServerGroup/GameServer/Script/Player/PlayerFBHelpBattle.pyc	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/FBHelpBattle.pyc	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	db/PyMongoDataServer/PySysDB/tagFuncConfig.txt	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 CoreServerGroup/GameServer/Script/Player/PlayerFBHelpBattle.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/FBHelpBattle.pyc

Binary files differ

 db/PyMongoDataServer/PySysDB/tagFuncConfig.txt

@@ -100,7 +100,7 @@
GodWeapon2    104|105|106    0    0    0    0

GodWeapon3    107|108|109    0    0    0    0

GodWeapon4    110|111|112    0    0    0    0

GodWeaponActive    1    {"2":[[1,100]],  "4":[[2,100]]}    0    0    0

GodWeaponActive    1    {"2":[[1,100]],  "4":[[2,100]]}    {"2":100,  "4":200}    0    0

GodWeaponSys    {1:'GetGodWeapon3',2:'GetGodWeapon1',3:'GetGodWeapon2',4:'GetGodWeapon4'}                

GodMagicExp    {"1":[10,10],"2":[10,10],"4":[10,10]}                

MagicExterior    {"1":0,"2":0,"3":0,"4":100386}    0    2000

			@@ -100,7 +100,7 @@
			GodWeapon2 104\|105\|106 0 0 0 0
			GodWeapon3 107\|108\|109 0 0 0 0
			GodWeapon4 110\|111\|112 0 0 0 0
			GodWeaponActive 1 {"2":[[1,100]], "4":[[2,100]]} 0 0 0
			GodWeaponActive 1 {"2":[[1,100]], "4":[[2,100]]} {"2":100, "4":200} 0 0
			GodWeaponSys {1:'GetGodWeapon3',2:'GetGodWeapon1',3:'GetGodWeapon2',4:'GetGodWeapon4'}
			GodMagicExp {"1":[10,10],"2":[10,10],"4":[10,10]}
			MagicExterior {"1":0,"2":0,"3":0,"4":100386} 0 2000