From b74b94f961dc0817c756de0032b15e72db4662f1 Mon Sep 17 00:00:00 2001
From: cehua-TT <448191260@qq.com>
Date: 星期二, 27 十一月 2018 16:33:13 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server
---
db/PyMongoDataServer/PySysDB/tagVipPrivilege.txt | 4 ++--
db/PyMongoDataServer/PySysDB/tagLVAward.txt | 2 +-
db/PyMongoDataServer/PySysDB/tagLoginDayAward.txt | 4 ++--
CoreServerGroup/GameServer/PySysDB/tagVipPrivilege.txt | 4 ++--
db/PyMongoDataServer/PySysDB/tagFuncConfig.txt | 6 +++---
CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt | 6 +++---
6 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt b/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt
index df512ac..bc73f0e 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 5 3 2 10 5
-HelpBattlePoint 1500 {"1":[20, 10], "2":[10, 5]} 1|2
-HelpBattleCheckIn 48 3 {1:[60010], 2:[60010, 51010]}
+HelpBattleCall 6 3 3 10 2
+HelpBattlePoint 1400 {"1":[30, 30], "2":[30, 30]} 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 1a518c4..4776850 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagVipPrivilege.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagVipPrivilege.txt
@@ -31,5 +31,5 @@
30 0 1 1 2 2 3 5 7 10 12 15 15 15 15 15 15
31 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
32 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-33 0 0 0 500 500 500 500 1000 1000 1000 1000 1000 1000 1000 1000 1000
-34 0 0 0 5000 5000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000
+33 0 0 800 800 800 800 1600 1600 1600 1600 1600 1600 1600 1600 1600 1600
+34 0 0 0 0 5000 5000 5000 5000 10000 10000 10000 10000 10000 10000 10000 10000
diff --git a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
index 49116d3..31ea183 100644
--- a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
@@ -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 5 3 2 10 5
-HelpBattleRefresh 5 5 5 5
-HelpBattlePoint 1500 {"1":[20, 10], "2":[10, 5]} 1|2
+HelpBattleCall 6 3 3 10 2
+HelpBattleRefresh 5 5 2 5
+HelpBattlePoint 1400 {"1":[30, 30], "2":[30, 30]} 1|2
HelpBattleRobot 50105026 baseHurt*hpCoefficient
diff --git a/db/PyMongoDataServer/PySysDB/tagLVAward.txt b/db/PyMongoDataServer/PySysDB/tagLVAward.txt
index c9b604f..93e286b 100644
--- a/db/PyMongoDataServer/PySysDB/tagLVAward.txt
+++ b/db/PyMongoDataServer/PySysDB/tagLVAward.txt
@@ -2,7 +2,7 @@
1 60 0 {"1":[[922,1],[924,1],[911,1],[4151,2]],"2":[[922,1],[924,1],[911,1],[4151,2]],"3":[[922,1],[924,1],[911,1],[4151,2]]} 2 [[4151,10]]
2 80 0 {"1":[[3511,1],[1500,1],[923,1],[2107,1]],"2":[[3511,1],[1500,1],[923,1],[2107,1]],"3":[[3511,1],[1500,1],[923,1],[2107,1]]} 2 [[181,10]]
3 100 0 {"1":[[4151,5],[1502,1],[954,10],[2107,1]],"2":[[4151,5],[1502,1],[954,10],[2107,1]],"3":[[4151,5],[1502,1],[954,10],[2107,1]]} 2 [[194,1]]
-4 120 0 {"1":[[105,2],[102,5],[141,60],[911,1]],"2":[[105,2],[102,5],[141,60],[911,1]],"3":[[105,2],[102,5],[141,60],[911,1]]} 2 [[1001,1]]
+4 120 0 {"1":[[181,2],[2107,1],[141,60],[911,1]],"2":[[181,2],[2107,1],[141,60],[911,1]],"3":[[181,2],[2107,1],[141,60],[911,1]]} 2 [[1001,1]]
5 150 0 {"1":[[1501,1],[142,60],[151,1],[30,100]],"2":[[1501,1],[142,60],[151,1],[30,100]],"3":[[1501,1],[142,60],[151,1],[30,100]]} 3 [[5,1]]
6 180 0 {"1":[[2241,1],[181,5],[4151,5],[911,1]],"2":[[2241,1],[181,5],[4151,5],[911,1]],"3":[[2241,1],[181,5],[4151,5],[911,1]]} 3 [[199,1]]
7 200 0 {"1":[[3801,1],[3503,1],[912,1],[181,10]],"2":[[3801,1],[3503,1],[912,1],[181,10]],"3":[[3801,1],[3503,1],[912,1],[181,10]]} 4 [[1002,1]]
diff --git a/db/PyMongoDataServer/PySysDB/tagLoginDayAward.txt b/db/PyMongoDataServer/PySysDB/tagLoginDayAward.txt
index b2745f0..3d0a42a 100644
--- a/db/PyMongoDataServer/PySysDB/tagLoginDayAward.txt
+++ b/db/PyMongoDataServer/PySysDB/tagLoginDayAward.txt
@@ -1,7 +1,7 @@
RewardID Reward
1 {"1":[[2,1],[954,10],[921,1],[922,1]],"2":[[2,1],[954,10],[921,1],[922,1]],"3":[[2,1],[954,10],[921,1],[922,1]]}
-2 {"1":[[251,1],[103,1],[954,10],[952,1]],"2":[[251,1],[103,1],[954,10],[952,1]],"3":[[251,1],[103,1],[954,10],[952,1]]}
-3 {"1":[[4204,1],[106,1],[912,1],[2,1]],"2":[[4204,1],[106,1],[912,1],[2,1]],"3":[[4204,1],[106,1],[912,1],[2,1]]}
+2 {"1":[[251,1],[101,1],[954,10],[952,1]],"2":[[251,1],[101,1],[954,10],[952,1]],"3":[[251,1],[101,1],[954,10],[952,1]]}
+3 {"1":[[4204,1],[2107,1],[912,1],[2,1]],"2":[[4204,1],[2107,1],[912,1],[2,1]],"3":[[4204,1],[2107,1],[912,1],[2,1]]}
4 {"1":[[4184,1],[4151,5],[30,100],[923,1]],"2":[[4184,1],[4151,5],[30,100],[923,1]],"3":[[4184,1],[4151,5],[30,100],[923,1]]}
5 {"1":[[53,1],[2,1],[2107,3],[924,1]],"2":[[53,1],[2,1],[2107,3],[924,1]],"3":[[53,1],[2,1],[2107,3],[924,1]]}
6 {"1":[[195,1],[3,1],[921,1],[923,1]],"2":[[195,1],[3,1],[921,1],[923,1]],"3":[[195,1],[3,1],[921,1],[923,1]]}
diff --git a/db/PyMongoDataServer/PySysDB/tagVipPrivilege.txt b/db/PyMongoDataServer/PySysDB/tagVipPrivilege.txt
index 1a518c4..4776850 100644
--- a/db/PyMongoDataServer/PySysDB/tagVipPrivilege.txt
+++ b/db/PyMongoDataServer/PySysDB/tagVipPrivilege.txt
@@ -31,5 +31,5 @@
30 0 1 1 2 2 3 5 7 10 12 15 15 15 15 15 15
31 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
32 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-33 0 0 0 500 500 500 500 1000 1000 1000 1000 1000 1000 1000 1000 1000
-34 0 0 0 5000 5000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000
+33 0 0 800 800 800 800 1600 1600 1600 1600 1600 1600 1600 1600 1600 1600
+34 0 0 0 0 5000 5000 5000 5000 10000 10000 10000 10000 10000 10000 10000 10000
--
Gitblit v1.8.0