From 9a277fac6f9f965a22bc7df44c851631dfcd4e73 Mon Sep 17 00:00:00 2001 From: CeHua_TRX <526616766@qq.com> Date: 星期六, 08 十二月 2018 14:35:11 +0800 Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server --- db/PyMongoDataServer/PySysDB/tagFuncConfig.txt | 2 +- CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt b/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt index 6f29ddc..61d4919 100644 --- a/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt +++ b/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt @@ -71,7 +71,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 14 0 0 0 0 -HelpBattleCall 6 3 3 60 10 +HelpBattleCall 6 3 2 60 10 HelpBattleCall2 1 2 HelpBattlePoint 1400 {"1":[8, 8], "2":[8, 8]} 1|2 HelpBattleCheckIn 48 3 {3:[60010], 20:[60010], 60:[60010]} diff --git a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt index f973eb1..fc4c4d8 100644 --- a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt +++ b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt @@ -316,7 +316,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 60 10 +HelpBattleCall 6 3 2 60 10 HelpBattleRefresh 5 5 2 5 HelpBattlePoint 1400 {"1":[8, 8], "2":[8, 8]} 1|2 HelpBattleRobot 50105026 baseHurt*hpCoefficient -- Gitblit v1.8.0