From 9a4bafd2f3bb2bcedbe2cdf4ea24f9d1875a3b58 Mon Sep 17 00:00:00 2001
From: cehua_wcy <781813756@qq.com>
Date: 星期三, 19 十二月 2018 16:59:19 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server
---
CoreServerGroup/GameServer/PySysDB/tagFBLine.txt | 2 ++
db/PyMongoDataServer/PySysDB/tagFBLine.txt | 2 ++
CoreServerGroup/GameServer/PySysDB/tagFBFunc.txt | 1 +
db/PyMongoDataServer/PySysDB/tagFBFunc.txt | 1 +
4 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/CoreServerGroup/GameServer/PySysDB/tagFBFunc.txt b/CoreServerGroup/GameServer/PySysDB/tagFBFunc.txt
index eab41db..a1535f1 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagFBFunc.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagFBFunc.txt
@@ -23,3 +23,4 @@
31010 0
31340 0
32010 0
+32011 0
diff --git a/CoreServerGroup/GameServer/PySysDB/tagFBLine.txt b/CoreServerGroup/GameServer/PySysDB/tagFBLine.txt
index 19568eb..0d54de8 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagFBLine.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagFBLine.txt
@@ -95,3 +95,5 @@
31110 1 31110
31210 0 31210
31340 0 31340
+32010 0 32010
+32011 0 32011
diff --git a/db/PyMongoDataServer/PySysDB/tagFBFunc.txt b/db/PyMongoDataServer/PySysDB/tagFBFunc.txt
index 11d7825..c300df4 100644
--- a/db/PyMongoDataServer/PySysDB/tagFBFunc.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFBFunc.txt
@@ -23,3 +23,4 @@
31010 3 2 0 0 0 0 0 0 0 180 0 0 0
31340 2 2 0 0 0 0 0 0 1 180 0 0 0
32010 10 2 0 0 0 0 0 0 0 31 0 0 0
+32011 10 2 0 0 0 0 0 0 0 31 0 0 0
diff --git a/db/PyMongoDataServer/PySysDB/tagFBLine.txt b/db/PyMongoDataServer/PySysDB/tagFBLine.txt
index 140dd5f..f6445f6 100644
--- a/db/PyMongoDataServer/PySysDB/tagFBLine.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFBLine.txt
@@ -95,3 +95,5 @@
31110 1 31110 80 500 0 0 0 0 0 0 0 [59,13,3] [3, 180, 10, [360, 245, 185, 125], [51,13]] 102
31210 0 31210 0 500 0 0 0 0 0 0 0 [12,6,3] [10, 3600, 60, [1800, 900, 600, 300]] [101,30903001]
31340 0 31340 300 0 0 0 0 0 0 0 0 [23,29,3] [1800,10,33409003,16,102,5000,{33409001:8,33409002:8},33403001,40,101,5000,10000] [[33402001,33402001,33402001],[33402001,33402001,33402001],[33402001,33402001,33402001,33402001]]
+32010 0 32010 150 0 0 0 0 0 0 0 0 [26,6] [180,3,10]
+32011 0 32011 150 0 0 0 0 0 0 0 0 [26,6] [180,3,10]
--
Gitblit v1.8.0