From ad07b96c37846dad55542465d9b8f7077c60e432 Mon Sep 17 00:00:00 2001
From: cehua_wcy <781813756@qq.com>
Date: 星期三, 28 十一月 2018 13:57:14 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server
---
db/PyMongoDataServer/PySysDB/tagVipPrivilege.txt | 2 +-
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.pyc | 0
CoreServerGroup/GameServer/PySysDB/tagVipPrivilege.txt | 2 +-
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCAI/AIType_20.pyc | 0
db/PyMongoDataServer/PySysDB/tagFuncConfig.txt | 4 ++--
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/FBHelpBattle.pyc | 0
CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt | 2 +-
8 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt b/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt
index f95350b..fe67f9d 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt
@@ -69,7 +69,7 @@
CeremonyWorldLv {"1":[[0,250],[251,300],[301,900]],"2":[[0,250],[251,300],[301,900]],"3":[[0,250],[251,300],[301,900]],"4":[[0,250],[251,300],[301,900]]}
FairyGrabBossID [50103001,50103002,50103003,50103004,50103005,50103006,50103007] [[26,14000,1]] -60
OperationAction 10 0 0 0 0
-HelpBattleCall 6 3 3 10 2
+HelpBattleCall 6 3 3 10 10
HelpBattlePoint 1400 {"1":[10, 10], "2":[10, 10]} 1|2
HelpBattleCheckIn 48 3 {3:[60010], 20:[60010, 51010], 60:[60010, 51010]}
PlayerViewCache 100 [0,4]
diff --git a/CoreServerGroup/GameServer/PySysDB/tagVipPrivilege.txt b/CoreServerGroup/GameServer/PySysDB/tagVipPrivilege.txt
index 4776850..cd0768e 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagVipPrivilege.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagVipPrivilege.txt
@@ -14,7 +14,7 @@
13 3 4 5 6 10 11 12 15 16 17 20 20 22 24 26 28
14 2 3 4 5 8 9 10 13 14 15 20 16 18 20 22 24
15 0 0 0 2 3 4 4 5 6 7 8 9 10 11 12 12
-16 0 0 1 1 1 2 2 2 3 3 4 5 6 6 6 6
+16 0 0 1 1 1 2 2 2 3 3 3 5 6 6 6 6
17 1 1 2 2 3 3 4 4 4 4 4 4 4 4 4 4
18 0 0 0 0 1 1 2 2 2 2 2 2 2 2 2 2
19 0 0 1 1 3 3 5 5 7 7 9 11 11 13 13 15
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc
index 4e72390..149fef7 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/FBHelpBattle.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/FBHelpBattle.pyc
index cf0cdb4..9d77bf9 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/FBHelpBattle.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/FBHelpBattle.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCAI/AIType_20.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCAI/AIType_20.pyc
index 376e62b..cf7b124 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCAI/AIType_20.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCAI/AIType_20.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.pyc
index 2669a21..f6f5d1d 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.pyc
Binary files differ
diff --git a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
index c3860be..fd66b31 100644
--- a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
@@ -99,7 +99,7 @@
GodWeapon1 101|102|103 0 0 0 0
GodWeapon2 104|105|106 0 0 0 0
GodWeapon3 107|108|109 0 0 0 0
-GodWeapon4 110|111|112 0 0 0 0
+GodWeapon4 110|111|112 10000+maxHP*proDefPer/10000 0 0 0
GodWeaponActive 1 {"2":[[1,120]], "4":[[2,120]]} {"2":250, "4":320} 0 0
GodWeaponSys {1:'GetGodWeapon3',2:'GetGodWeapon1',3:'GetGodWeapon2',4:'GetGodWeapon4'}
GodMagicExp {"1":[10,10],"2":[10,10],"4":[10,10]}
@@ -314,7 +314,7 @@
BindJadeWheelCfg 88 {"1":110,"2":300,"3":150,"4":200,"5":300,"6":150,"7":130,"8":200,"9":588} [(3879,1),(3889,2),(4889,3),(5189,4),(5199,5),(6199,6),(9699,7),(9999,8),(10000,9)] {1:[(6000,3),(10000,4)],30:[(10000,9)]} [[12.0,67.4],[67.4,103.0],[103.0,148.1],[148.1,186.2],[186.2,221.8],[221.8,267.0],[267.0,311.7],[311.7,348],[348,372]]
BindJadeWheelNotice 150
WishingWellCfg 14400 10 8 5
-HelpBattleCall 6 3 3 10 2
+HelpBattleCall 6 3 3 10 10
HelpBattleRefresh 5 5 2 5
HelpBattlePoint 1400 {"1":[10, 10], "2":[10, 10]} 1|2
HelpBattleRobot 50105026 baseHurt*hpCoefficient
diff --git a/db/PyMongoDataServer/PySysDB/tagVipPrivilege.txt b/db/PyMongoDataServer/PySysDB/tagVipPrivilege.txt
index 4776850..cd0768e 100644
--- a/db/PyMongoDataServer/PySysDB/tagVipPrivilege.txt
+++ b/db/PyMongoDataServer/PySysDB/tagVipPrivilege.txt
@@ -14,7 +14,7 @@
13 3 4 5 6 10 11 12 15 16 17 20 20 22 24 26 28
14 2 3 4 5 8 9 10 13 14 15 20 16 18 20 22 24
15 0 0 0 2 3 4 4 5 6 7 8 9 10 11 12 12
-16 0 0 1 1 1 2 2 2 3 3 4 5 6 6 6 6
+16 0 0 1 1 1 2 2 2 3 3 3 5 6 6 6 6
17 1 1 2 2 3 3 4 4 4 4 4 4 4 4 4 4
18 0 0 0 0 1 1 2 2 2 2 2 2 2 2 2 2
19 0 0 1 1 3 3 5 5 7 7 9 11 11 13 13 15
--
Gitblit v1.8.0