From 5c3f1bf0ce5437247ec63f90683eb894bedbaa40 Mon Sep 17 00:00:00 2001
From: cehua-TT <448191260@qq.com>
Date: 星期五, 30 十一月 2018 16:22:40 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server

---
 CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt                                         |    2 +-
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/FBCommon.pyc |    0 
 2 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt b/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt
index 4268756..4122d96 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt
@@ -71,5 +71,5 @@
 OperationAction	14	0	0	0	0
 HelpBattleCall	6	3	3	60	10
 HelpBattlePoint	1400	{"1":[10, 10], "2":[10, 10]}	1|2		
-HelpBattleCheckIn	48	3	{3:[60010], 20:[60010, 51010], 60:[60010, 51010]}		
+HelpBattleCheckIn	48	3	{3:[60010], 20:[60010], 60:[60010]}		
 PlayerViewCache	100	[0,4]			
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/FBCommon.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/FBCommon.pyc
index bbd92f5..5766538 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/FBCommon.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/FBCommon.pyc
Binary files differ

--
Gitblit v1.8.0