From 7784fd7fe53a878347cbeeea0df662bcdf88efea Mon Sep 17 00:00:00 2001
From: cehua_wcy <781813756@qq.com>
Date: 星期五, 23 十一月 2018 20:45:52 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server
---
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.pyc | 0
CoreServerGroup/GameServer/Script/IpyGameDataPY.pyc | 0
CoreServerGroup/GameServer/Script/ChPyNetSendPack.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetPack.pyc | 0
db/PyMongoDataServer/PySysDB/tagFBHelpBattle.txt | 13 +++++++++++++
CoreServerGroup/GameServer/PySysDB/tagFBHelpBattle.txt | 13 +++++++++++++
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.pyc | 0
CoreServerGroup/GameServer/Script/ChPyNetPack.pyc | 0
8 files changed, 26 insertions(+), 0 deletions(-)
diff --git a/CoreServerGroup/GameServer/PySysDB/tagFBHelpBattle.txt b/CoreServerGroup/GameServer/PySysDB/tagFBHelpBattle.txt
new file mode 100644
index 0000000..a86343f
--- /dev/null
+++ b/CoreServerGroup/GameServer/PySysDB/tagFBHelpBattle.txt
@@ -0,0 +1,13 @@
+DataMapID LineID FightPowerMin FightPowerMax LVLimit DayFreeHelpCount
+51010 0 10000 30000 155 [5, 1]
+51010 1 20000 40000 155 [5, 1]
+51010 2 30000 50000 155 [5, 1]
+51010 3 40000 60000 155 [5, 1]
+51010 4 50000 70000 155 [5, 1]
+51010 5 60000 80000 155 [5, 1]
+60010 0 10000 0 105 [5, 0]
+60010 1 50000 0 165 [5, 0]
+60010 2 100000 0 200 [5, 0]
+31110 2 10000 0 80 [5, 1]
+31110 5 50000 0 100 [5, 1]
+31110 7 100000 0 150 [5, 1]
diff --git a/CoreServerGroup/GameServer/Script/ChPyNetPack.pyc b/CoreServerGroup/GameServer/Script/ChPyNetPack.pyc
index 4a93bb3..a97fd7c 100644
--- a/CoreServerGroup/GameServer/Script/ChPyNetPack.pyc
+++ b/CoreServerGroup/GameServer/Script/ChPyNetPack.pyc
Binary files differ
diff --git a/CoreServerGroup/GameServer/Script/ChPyNetSendPack.pyc b/CoreServerGroup/GameServer/Script/ChPyNetSendPack.pyc
index 1e55370..a28ae92 100644
--- a/CoreServerGroup/GameServer/Script/ChPyNetSendPack.pyc
+++ b/CoreServerGroup/GameServer/Script/ChPyNetSendPack.pyc
Binary files differ
diff --git a/CoreServerGroup/GameServer/Script/IpyGameDataPY.pyc b/CoreServerGroup/GameServer/Script/IpyGameDataPY.pyc
index 91be1dd..3cfc31a 100644
--- a/CoreServerGroup/GameServer/Script/IpyGameDataPY.pyc
+++ b/CoreServerGroup/GameServer/Script/IpyGameDataPY.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetPack.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetPack.pyc
index ffd9a6d..46e84ba 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetPack.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetPack.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.pyc
index 12bb10a..7fd9159 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.pyc
index 18cb2db..531eb4a 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.pyc
Binary files differ
diff --git a/db/PyMongoDataServer/PySysDB/tagFBHelpBattle.txt b/db/PyMongoDataServer/PySysDB/tagFBHelpBattle.txt
new file mode 100644
index 0000000..9290bfc
--- /dev/null
+++ b/db/PyMongoDataServer/PySysDB/tagFBHelpBattle.txt
@@ -0,0 +1,13 @@
+DataMapID LineID RobotFightPower RobotLV RobotSkill
+51010 0 10000 155 {}
+51010 1 20000 165 {}
+51010 2 30000 175 {}
+51010 3 40000 185 {}
+51010 4 50000 195 {}
+51010 5 60000 205 {}
+60010 0 10000 105 {}
+60010 1 50000 165 {}
+60010 2 100000 200 {}
+31110 2 10000 80 {}
+31110 5 50000 100 {}
+31110 7 100000 150 {}
--
Gitblit v1.8.0