From c9316f09fccd8f055b6c0ecae9c02fb1d1928c21 Mon Sep 17 00:00:00 2001
From: cehua_wcy <781813756@qq.com>
Date: 星期五, 11 一月 2019 15:44:54 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server

---
 db/PyMongoDataServer/PySysDB/tagFBHelpBattle.txt       |   28 ++++++++++++++--------------
 CoreServerGroup/GameServer/PySysDB/tagFBHelpBattle.txt |   28 ++++++++++++++--------------
 2 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/CoreServerGroup/GameServer/PySysDB/tagFBHelpBattle.txt b/CoreServerGroup/GameServer/PySysDB/tagFBHelpBattle.txt
index dceb403..36c0c62 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagFBHelpBattle.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagFBHelpBattle.txt
@@ -10,17 +10,17 @@
 60010	0	211105	0	105	[10, 0]
 60010	1	833411	0	165	[10, 0]
 60010	2	1572067	0	200	[10, 0]
-31110	3	236259	0	125	[3, 0]
-31110	6	1026504	0	180	[3, 0]
-31110	8	1951849	0	215	[3, 0]
-31110	10	3350743	0	240	[3, 0]
-31110	13	5356017	0	285	[3, 0]
-31110	16	13518730	0	320	[3, 0]
-31110	19	21246457	0	350	[3, 0]
-31110	22	31854168	0	380	[3, 0]
-31110	26	39832173	0	380	[3, 0]
-31110	29	47049420	0	380	[3, 0]
-31110	32	57824958	0	380	[3, 0]
-31110	35	66779701	0	380	[3, 0]
-31110	38	74750658	0	380	[3, 0]
-31110	41	85744857	0	380	[3, 0]
+31110	2	236259	0	125	[3, 0]
+31110	5	1026504	0	180	[3, 0]
+31110	7	1951849	0	215	[3, 0]
+31110	9	3350743	0	240	[3, 0]
+31110	12	5356017	0	285	[3, 0]
+31110	15	13518730	0	320	[3, 0]
+31110	18	21246457	0	350	[3, 0]
+31110	21	31854168	0	380	[3, 0]
+31110	25	39832173	0	380	[3, 0]
+31110	28	47049420	0	380	[3, 0]
+31110	31	57824958	0	380	[3, 0]
+31110	34	66779701	0	380	[3, 0]
+31110	37	74750658	0	380	[3, 0]
+31110	40	85744857	0	380	[3, 0]
diff --git a/db/PyMongoDataServer/PySysDB/tagFBHelpBattle.txt b/db/PyMongoDataServer/PySysDB/tagFBHelpBattle.txt
index 65c8c23..43860f4 100644
--- a/db/PyMongoDataServer/PySysDB/tagFBHelpBattle.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFBHelpBattle.txt
@@ -10,17 +10,17 @@
 60010	0	211105	211105	105	7570	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	833411	833411	165	33991	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	1572067	1572067	200	77807	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	3	236259	236259	125	2595	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	6	1026504	1026504	180	19742	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	8	1951849	1951849	215	52854	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	10	3350743	3350743	240	123182	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	13	5356017	5356017	285	244430	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	16	13518730	13518730	320	613333	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	19	21246457	21246457	350	1022460	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	22	31854168	31854168	380	1740102	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	26	39832173	39832173	404	2255808	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	29	47049420	47049420	427	3054920	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	32	57824958	57824958	449	4192979	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	35	66779701	66779701	470	5156940	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	38	74750658	74750658	491	5737919	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	41	85744857	85744857	511	6608609	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	236259	236259	125	2595	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	1026504	1026504	180	19742	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	1951849	1951849	215	52854	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	3350743	3350743	240	123182	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	12	5356017	5356017	285	244430	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	15	13518730	13518730	320	613333	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	18	21246457	21246457	350	1022460	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	21	31854168	31854168	380	1740102	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	25	39832173	39832173	404	2255808	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	28	47049420	47049420	427	3054920	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	31	57824958	57824958	449	4192979	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	34	66779701	66779701	470	5156940	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	37	74750658	74750658	491	5737919	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	40	85744857	85744857	511	6608609	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