From 70daba80647df7e2b206e1c6b109d85110c2cba1 Mon Sep 17 00:00:00 2001
From: cehua-TT <448191260@qq.com>
Date: 星期六, 10 十一月 2018 16:08:23 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server
---
db/PyMongoDataServer/PySysDB/tagFunctionForecast.txt | 1 +
db/PyMongoDataServer/PySysDB/tagStore.txt | 2 +-
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerVip.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/SetVerFix.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCoin.pyc | 0
6 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc
index 87b7e0c..b598a22 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/SetVerFix.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/SetVerFix.pyc
new file mode 100644
index 0000000..0c49eb4
--- /dev/null
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/SetVerFix.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCoin.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCoin.pyc
index 8945001..84b026c 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCoin.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCoin.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerVip.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerVip.pyc
index 4f07614..e15ce50 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerVip.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerVip.pyc
Binary files differ
diff --git a/db/PyMongoDataServer/PySysDB/tagFunctionForecast.txt b/db/PyMongoDataServer/PySysDB/tagFunctionForecast.txt
index 3d57e10..1a89502 100644
--- a/db/PyMongoDataServer/PySysDB/tagFunctionForecast.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFunctionForecast.txt
@@ -14,6 +14,7 @@
145
93 {"1":[[5410,1]],"2":[[5410,1]],"3":[[5410,1]]}
138 {"1":[[8353,2]],"2":[[8353,2]],"3":[[8353,2]]}
+149 {"1":[[966,1]],"2":[[966,1]],"3":[[966,1]]}
103
140
141
diff --git a/db/PyMongoDataServer/PySysDB/tagStore.txt b/db/PyMongoDataServer/PySysDB/tagStore.txt
index 1d7f6ef..aed5d55 100644
--- a/db/PyMongoDataServer/PySysDB/tagStore.txt
+++ b/db/PyMongoDataServer/PySysDB/tagStore.txt
@@ -12,7 +12,7 @@
12 1 0 2325 1 1 [] 0 7 0 110 1 0 2 0 0 0
13 1 0 4741 1 1 [] 0 7 1 125 1 0 1 30 0 0
14 1 0 2389 1 1 [] 0 7 0 260 2 0 1 100 0 0
-15 1 0 1129 1 1 [] 0 7 3 110 1 0 1 150 0 0
+15 1 0 1129 1 1 [] 0 7 3 110 3 0 1 99 0 0
51 2 0 3796 1 0 [] 0 0 0 0 0 0 1 280 0 0
52 2 0 3797 1 0 [] 0 0 0 0 0 0 1 280 0 0
53 2 0 4101 1 0 [] 0 0 0 0 0 0 1 380 0 0
--
Gitblit v1.8.0