From 736954c294a09fff70dce313cc373b80c78d8dcd Mon Sep 17 00:00:00 2001
From: CeHua_ZWJ <ceh@163.com>
Date: 星期二, 04 十二月 2018 16:53:45 +0800
Subject: [PATCH] Merge branch '1.3' of http://192.168.0.87:10010/r/snxx_server into 1.3
---
db/PyMongoDataServer/PySysDB/tagFBHelpBattle.txt | 1 +
CoreServerGroup/GameServer/PySysDB/tagFBHelpBattle.txt | 13 +++++++------
2 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/CoreServerGroup/GameServer/PySysDB/tagFBHelpBattle.txt b/CoreServerGroup/GameServer/PySysDB/tagFBHelpBattle.txt
index 878cac3..d1cc751 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagFBHelpBattle.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagFBHelpBattle.txt
@@ -1,10 +1,11 @@
DataMapID LineID FightPowerMin FightPowerMax LVLimit DayFreeHelpCount
-51010 0 457100 3541349 155 [5, 1]
-51010 1 869040 4697877 155 [5, 1]
-51010 2 1997875 7285497 155 [5, 1]
-51010 3 3541349 11336856 155 [5, 1]
-51010 4 4697877 15707537 155 [5, 1]
-51010 5 7285497 0 155 [5, 1]
+51010 0 457100 1997875 155 [5, 1]
+51010 1 869040 3541349 155 [5, 1]
+51010 2 1997875 4697877 155 [5, 1]
+51010 3 3541349 7285497 155 [5, 1]
+51010 4 4697877 11336856 155 [5, 1]
+51010 5 7285497 15256635 155 [5, 1]
+51010 6 11336856 0 155 [5, 1]
60010 0 218160 0 105 [5, 0]
60010 1 815427 0 165 [5, 0]
60010 2 1809401 0 200 [5, 0]
diff --git a/db/PyMongoDataServer/PySysDB/tagFBHelpBattle.txt b/db/PyMongoDataServer/PySysDB/tagFBHelpBattle.txt
index ba54e5e..8f73d4a 100644
--- a/db/PyMongoDataServer/PySysDB/tagFBHelpBattle.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFBHelpBattle.txt
@@ -5,6 +5,7 @@
51010 3 3541349 3541349 235 277595 50 {1:{(12500, 12501, 12502, 12503):1, 12511:7, 12512:15, 12513:30, 12514:80, 12515:140}, 2:{(12600, 12601, 12602, 12603):1, 12611:7, 12612:15, 12614:80, 12615:140}}
51010 4 4697877 4697877 255 366081 50 {1:{(12500, 12501, 12502, 12503):1, 12511:7, 12512:15, 12513:30, 12514:80, 12515:140}, 2:{(12600, 12601, 12602, 12603):1, 12611:7, 12612:15, 12614:80, 12615:140}}
51010 5 7285497 7285497 275 698930 50 {1:{(12500, 12501, 12502, 12503):1, 12511:7, 12512:15, 12513:30, 12514:80, 12515:140}, 2:{(12600, 12601, 12602, 12603):1, 12611:7, 12612:15, 12614:80, 12615:140}}
+51010 6 11336856 11336856 300 913525 50 {1:{(12500, 12501, 12502, 12503):1, 12511:7, 12512:15, 12513:30, 12514:80, 12515:140}, 2:{(12600, 12601, 12602, 12603):1, 12611:7, 12612:15, 12614:80, 12615:140}}
60010 0 218160 218160 105 7094 50 {1:{(12500, 12501, 12502, 12503):1, 12511:7, 12512:15, 12513:30, 12514:80, 12515:140}, 2:{(12600, 12601, 12602, 12603):1, 12611:7, 12612:15, 12614:80, 12615:140}}
60010 1 815427 815427 165 35603 50 {1:{(12500, 12501, 12502, 12503):1, 12511:7, 12512:15, 12513:30, 12514:80, 12515:140}, 2:{(12600, 12601, 12602, 12603):1, 12611:7, 12612:15, 12614:80, 12615:140}}
60010 2 1809401 1809401 200 106878 50 {1:{(12500, 12501, 12502, 12503):1, 12511:7, 12512:15, 12513:30, 12514:80, 12515:140}, 2:{(12600, 12601, 12602, 12603):1, 12611:7, 12612:15, 12614:80, 12615:140}}
--
Gitblit v1.8.0