From 8a5822a3e2b2d1c536f01e0b6e006bf3d9727226 Mon Sep 17 00:00:00 2001
From: cehua_LC <tingame100@163.com>
Date: 星期二, 11 十二月 2018 19:45:06 +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 |   38 +++++++++++++++++++-------------------
 1 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/db/PyMongoDataServer/PySysDB/tagFBHelpBattle.txt b/db/PyMongoDataServer/PySysDB/tagFBHelpBattle.txt
index ab78d28..cc9e2ab 100644
--- a/db/PyMongoDataServer/PySysDB/tagFBHelpBattle.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFBHelpBattle.txt
@@ -1,20 +1,20 @@
 DataMapID	LineID	FightPowerMin	RobotFightPower	RobotLV	RobotBaseHurt	RobotHPCoefficient	RobotSkill
-51010	0	457100	457100	155	16178	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	1	901904	901904	180	29445	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	2	1744734	1744734	205	44795	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	3	2960913	2960913	235	178469	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	4217329	4217329	255	259276	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	6095725	6095725	275	396491	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	8671079	8671079	300	535105	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	7	10262321	10262321	320	687006	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	189065	189065	105	6671	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	811100	811100	165	32818	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	1555493	1555493	200	76940	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}}
-31110	2	210072	210072	125	2238	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}}
-31110	5	1002116	1002116	180	19114	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}}
-31110	7	1938593	1938593	215	53815	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}}
-31110	9	3289904	3289904	240	127104	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:141}}
-31110	12	5267200	5267200	285	251223	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:142}}
-31110	15	13895353	13895353	320	708657	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:143}}
-31110	18	20734999	20734999	350	1161426	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:144}}
-31110	21	29887528	29887528	380	1802872	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:145}}
+51010	0	481774	481774	155	16326	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	1	902486	902486	180	29441	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	2	1739123	1739123	205	44412	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	3	2954460	2954460	235	174971	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	4230162	4230162	255	257064	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	6109592	6109592	275	397245	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	8756402	8756402	300	541215	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	7	11200324	11200324	320	692932	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	190645	190645	105	6693	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	814425	814425	165	32906	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	1549773	1549773	200	76340	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}}
+31110	2	211827	211827	125	2244	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}}
+31110	5	1002762	1002762	180	19111	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}}
+31110	7	1932359	1932359	215	53367	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}}
+31110	9	3282734	3282734	240	124607	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:141}}
+31110	12	5289480	5289480	285	252024	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:142}}
+31110	15	13580689	13580689	320	666101	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:143}}
+31110	18	20391906	20391906	350	1103022	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:144}}
+31110	21	29719158	29719158	380	1752095	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:145}}

--
Gitblit v1.8.0