From 3b548c3657d693ca9394ebdd5336427926cfadbc Mon Sep 17 00:00:00 2001
From: cehua-TT <448191260@qq.com>
Date: 星期四, 08 十一月 2018 17:25:37 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server
---
db/PyMongoDataServer/PySysDB/tagFunctionForecast.txt | 10 +++++-----
db/PyMongoDataServer/PySysDB/tagStore.txt | 30 ++++++++++++++++++------------
CoreServerGroup/GameServer/PySysDB/tagStore.txt | 6 ++++++
3 files changed, 29 insertions(+), 17 deletions(-)
diff --git a/CoreServerGroup/GameServer/PySysDB/tagStore.txt b/CoreServerGroup/GameServer/PySysDB/tagStore.txt
index 3d7f672..de6c012 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagStore.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagStore.txt
@@ -138,6 +138,12 @@
712 15 0 0
713 15 0 0
714 15 0 0
+715 15 0 0
+716 15 0 0
+717 15 0 0
+718 15 0 0
+719 15 0 0
+720 15 0 0
751 101 0 0
752 101 0 0
753 101 0 0
diff --git a/db/PyMongoDataServer/PySysDB/tagFunctionForecast.txt b/db/PyMongoDataServer/PySysDB/tagFunctionForecast.txt
index 20a7665..d0e72e6 100644
--- a/db/PyMongoDataServer/PySysDB/tagFunctionForecast.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFunctionForecast.txt
@@ -1,17 +1,17 @@
FuncId Award
1 {"1":[[1,1]],"2":[[1,1]],"3":[[1,1]]}
-76 {"1":[[1,1]],"2":[[1,1]],"3":[[1,1]]}
+76
9 {"1":[[4302,3]],"2":[[4302,3]],"3":[[4302,3]]}
6 {"1":[[4151,2]],"2":[[4151,2]],"3":[[4151,2]]}
8 {"1":[[181,5]],"2":[[181,5]],"3":[[181,5]]}
-12 {"1":[[922,1]],"2":[[922,1]],"3":[[922,1]]}
-88 {"1":[[1130,5]],"2":[[1130,5]],"3":[[1130,5]]}
+12
+88
143 {"1":[[2211,5]],"2":[[2211,5]],"3":[[2211,5]]}
82 {"1":[[145,1]],"2":[[145,1]],"3":[[145,1]]}
-97 {"1":[[952,1]],"2":[[952,1]],"3":[[952,1]]}
+97
91 {"1":[[5303,10]],"2":[[5303,10]],"3":[[5303,10]]}
36 {"1":[[5012,10]],"2":[[5022,10]],"3":[[5012,10]]}
-145 {"1":[[106,1]],"2":[[106,1]],"3":[[106,1]]}
+145
93 {"1":[[5410,1]],"2":[[5410,1]],"3":[[5410,1]]}
138 {"1":[[8353,2]],"2":[[8353,2]],"3":[[8353,2]]}
28 {"1":[[966,1]],"2":[[966,1]],"3":[[966,1]]}
diff --git a/db/PyMongoDataServer/PySysDB/tagStore.txt b/db/PyMongoDataServer/PySysDB/tagStore.txt
index 9af9c31..f52bc71 100644
--- a/db/PyMongoDataServer/PySysDB/tagStore.txt
+++ b/db/PyMongoDataServer/PySysDB/tagStore.txt
@@ -124,20 +124,26 @@
651 14 0 58 1 1 [[194,1,1],[5,1,1],[912,1,1]] 58 0 0 0 1 0 1 188 500 0 Bargaingift1
652 14 0 4208 1 1 [[4151,50,1],[5,1,1],[913,1,1]] 4208 0 0 0 1 0 1 388 1200 0 Bargaingift2
653 14 0 255 1 1 [[196,1,1],[181,80,1],[913,1,1]] 255 0 0 0 1 0 1 1088 2780 0 Bargaingift3
-701 15 0 912 1 1 [[142,300,1]] 142 0 0 106 1 0 1 188 600 1 OpenTakePreferential1
+701 15 0 1128 2 1 [[2213,30,1]] 1128 0 0 106 1 0 1 38 575 1 OpenTakePreferential1
702 15 0 982 10 1 [] 982 0 0 106 1 0 1 888 2500 1 OpenTakePreferential2
-703 15 0 2343 1 1 [] 2343 0 0 106 1 0 1 188 500 2 OpenTakePreferential1
-704 15 0 2344 2 1 [] 2344 0 0 106 1 0 1 888 2400 2 OpenTakePreferential2
-705 15 0 6 1 1 [[143,100,1]] 143 0 0 106 1 0 1 188 600 3 OpenTakePreferential1
-706 15 0 9062 1 1 [[6,3,1]] 9062 0 0 106 1 0 1 888 2700 3 OpenTakePreferential2
-707 15 0 3514 2 1 [[3504,2,1]] 3514 0 0 106 1 0 1 188 1080 4 OpenTakePreferential1
+703 15 0 2343 1 1 [] 2343 0 0 106 1 0 1 38 500 2 OpenTakePreferential1
+704 15 0 2411 1 1 [] 2411 0 0 106 1 0 1 688 3000 2 OpenTakePreferential2
+705 15 0 1128 2 1 [[2213,30,1]] 1128 0 0 106 1 0 1 38 575 3 OpenTakePreferential1
+706 15 0 9062 1 1 [[983,20,1]] 9062 0 0 106 1 0 1 688 2600 3 OpenTakePreferential2
+707 15 0 3514 1 1 [[3504,1,1]] 3514 0 0 106 1 0 1 38 540 4 OpenTakePreferential1
708 15 0 3516 1 1 [[3506,1,1]] 3516 0 0 106 1 0 1 888 4860 4 OpenTakePreferential2
-709 15 0 913 1 1 [[4694,3,1]] 913 0 0 106 1 0 1 188 800 5 OpenTakePreferential1
-710 15 0 1002 2 1 [[30,2000,1]] 30 0 0 106 1 0 1 888 3000 5 OpenTakePreferential2
-711 15 0 2213 40 1 [[1502,4,1]] 2213 0 0 106 1 0 1 188 700 6 OpenTakePreferential1
-712 15 0 2213 150 1 [[4680,1,1]] 4680 0 0 106 1 0 1 888 2625 6 OpenTakePreferential2
-713 15 0 2213 40 1 [[5303,200,1]] 2213 0 0 106 1 0 1 188 700 7 OpenTakePreferential1
-714 15 0 4186 1 1 [[2390,1,1]] 4186 0 0 106 1 0 1 888 2550 7 OpenTakePreferential2
+709 15 0 913 1 1 [[4694,1,1]] 913 0 0 106 1 0 1 38 600 5 OpenTakePreferential1
+710 15 0 1003 2 1 [[30,2000,1]] 30 0 0 106 1 0 1 688 3000 5 OpenTakePreferential2
+711 15 0 2213 30 1 [[4610,1,1]] 4610 0 0 106 1 0 1 38 575 6 OpenTakePreferential1
+712 15 0 2213 150 1 [[4606,1,1]] 4606 0 0 106 1 0 1 688 2875 6 OpenTakePreferential2
+713 15 0 195 1 1 [[5303,150,1]] 195 0 0 106 1 0 1 38 450 7 OpenTakePreferential1
+714 15 0 4186 1 1 [[5006,5,1]] 4186 0 0 106 1 0 1 688 3200 7 OpenTakePreferential2
+715 15 0 4608 1 1 [[2213,15,1]] 4608 0 0 106 1 0 1 38 680 8 OpenTakePreferential1
+716 15 0 982 10 1 [] 982 0 0 106 1 0 1 888 2500 8 OpenTakePreferential2
+717 15 0 153 38 1 [[147,6,1]] 153 0 0 106 1 0 1 38 630 9 OpenTakePreferential1
+718 15 0 2213 150 1 [[4606,1,1]] 4606 0 0 106 1 0 1 688 2875 9 OpenTakePreferential2
+719 15 0 2389 3 1 [] 2389 0 0 106 1 0 1 38 540 10 OpenTakePreferential1
+720 15 0 2390 3 1 [[8354,50,1]] 2390 0 0 106 1 0 1 688 2800 10 OpenTakePreferential2
751 101 1 4694 1 1 [[141,300,1]] 4694 0 0 0 1 0 1 88 400 0 LimitGift6
752 101 1 4183 1 1 [[147,6,1]] 4183 0 0 0 1 0 1 288 850 0 LimitGift7
753 101 1 4606 1 1 [[143,300,1]] 4606 0 0 0 1 0 1 688 1600 0 LimitGift8
--
Gitblit v1.8.0