From 2a1979a89d0ab2d4b8a069d91fd7096126c898b9 Mon Sep 17 00:00:00 2001
From: cehua_wcy <781813756@qq.com>
Date: 星期三, 22 八月 2018 14:38:50 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server
---
db/PyMongoDataServer/PySysDB/tagStore.txt | 4 ++--
db/PyMongoDataServer/PySysDB/tagFBLine.txt | 2 +-
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/QuestRunner.pyc | 0
db/PyMongoDataServer/PySysDB/tagSuccess.txt | 10 +++++-----
db/PyMongoDataServer/PySysDB/tagFuncOpenLV.txt | 2 +-
db/PyMongoDataServer/SysDB/tagChinItem.txt | 4 ++--
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/AttackCommon.pyc | 0
CoreServerGroup/GameServer/PySysDB/tagFuncOpenLV.txt | 2 +-
ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip | 0
9 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/CoreServerGroup/GameServer/PySysDB/tagFuncOpenLV.txt b/CoreServerGroup/GameServer/PySysDB/tagFuncOpenLV.txt
index 2f5d4fd..8ffb72e 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagFuncOpenLV.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagFuncOpenLV.txt
@@ -37,7 +37,7 @@
84 110 0 0
85 60 0 0
86 80 0 0
-87 0 30100 0
+87 0 30101 0
88 105 0 0
89 110 0 0
90 155 0 0
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip b/ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip
index b0c6497..5669c23 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/AttackCommon.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/AttackCommon.pyc
index 27fa38f..310a908 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/AttackCommon.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/AttackCommon.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/QuestRunner.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/QuestRunner.pyc
index 3fd1e6b..4a3a729 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/QuestRunner.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/QuestRunner.pyc
Binary files differ
diff --git a/db/PyMongoDataServer/PySysDB/tagFBLine.txt b/db/PyMongoDataServer/PySysDB/tagFBLine.txt
index e55bde3..093b4f7 100644
--- a/db/PyMongoDataServer/PySysDB/tagFBLine.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFBLine.txt
@@ -58,7 +58,7 @@
60010 2 60010 200 500 0 0 0 0 0 0 0 [317,21] [10,1800,50,10] [[[(30601006,8)],[(30601007,12)],[(30601008,2)],[(30603003,1)]], [111,112,113,114,115]] {1:[[1133,1,1]],2:[[1133,2,1]],3:[[1133,3,1]],4:[[1133,4,1]],5:[[1133,5,2]]}
31160 0 31160 110 250 0 0 0 0 0 0 0 [[91,18],[136,49],[100,59],[65,88],[67,134],[16,108]] 1800 [311601,311603] {1:[[103,1],[105,2]], 2:[[103,1],[105,1],[104,4]],3 :[[102,3],[101,2],[105,1],[104,2]], 4:[[102,3],[105,1],[104,1]], 5:[[102,2],[104,5]], 6:[[102,2],[104,3]]}
31160 1 31160 251 300 0 0 0 0 0 0 0 [[91,18],[136,49],[100,59],[65,88],[67,134],[16,108]] 1800 [311604,311605] {1:[[103,1],[105,2]], 2:[[103,1],[105,1],[104,4]],3 :[[102,3],[101,2],[105,1],[104,2]], 4:[[102,3],[105,1],[104,1]], 5:[[102,2],[104,5]], 6:[[102,2],[104,3]]}
-31160 2 31160 301 350 0 0 0 0 0 0 0 [[91,18],[136,49],[100,59],[65,88],[67,134],[16,108]] 1800 [311606,311607] {1:[[103,1],[105,2]], 2:[[103,1],[105,1],[104,4]],3 :[[102,3],[101,2],[105,1],[104,2]], 4:[[102,3],[105,1],[104,1]], 5:[[102,2],[104,5]], 6:[[102,2],[104,3]]}
+31160 2 31160 301 500 0 0 0 0 0 0 0 [[91,18],[136,49],[100,59],[65,88],[67,134],[16,108]] 1800 [311606,311607] {1:[[103,1],[105,2]], 2:[[103,1],[105,1],[104,4]],3 :[[102,3],[101,2],[105,1],[104,2]], 4:[[102,3],[105,1],[104,1]], 5:[[102,2],[104,5]], 6:[[102,2],[104,3]]}
31250 0 31250 0 0 0 0 0 0 0 0 0 [30,18] [0,300,10] [312501,312502,312503] [0,4235]
52010 0 52020 20 0 0 0 0 0 0 0 0 [17,19,8] 10 [520101,520102,520103,520104]
52010 1 52020 40 0 0 0 0 0 0 0 0 [17,19,8] 10 [520105,520106,520107,520108]
diff --git a/db/PyMongoDataServer/PySysDB/tagFuncOpenLV.txt b/db/PyMongoDataServer/PySysDB/tagFuncOpenLV.txt
index e7b5a18..2f42e7d 100644
--- a/db/PyMongoDataServer/PySysDB/tagFuncOpenLV.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFuncOpenLV.txt
@@ -37,7 +37,7 @@
84 110 0 0 0
85 60 0 0 0
86 80 0 0 104080
-87 0 30100 0 0
+87 0 30101 0 0
88 105 0 0 0
89 110 0 0 0
90 155 0 0 0
diff --git a/db/PyMongoDataServer/PySysDB/tagStore.txt b/db/PyMongoDataServer/PySysDB/tagStore.txt
index 7d6d2ca..c50dd66 100644
--- a/db/PyMongoDataServer/PySysDB/tagStore.txt
+++ b/db/PyMongoDataServer/PySysDB/tagStore.txt
@@ -24,8 +24,8 @@
62 2 0 4004 1 0 [] 0 0 0 240 0 1 20 0 0
63 2 0 957 1 0 [] 0 0 0 0 0 1 50 0 0
64 2 0 2050 1 0 [] 0 0 0 0 0 1 50 0 0
-65 2 0 982 1 0 [] 0 0 0 500 0 1 248 0 0
-66 2 0 983 1 0 [] 0 0 0 500 0 1 98 0 0
+65 2 0 982 1 0 [] 0 0 0 150 0 1 248 0 0
+66 2 0 983 1 0 [] 0 0 0 150 0 1 98 0 0
101 3 0 181 1 0 [] 0 0 0 0 0 1 10 0 0
103 3 0 3501 1 0 [] 0 0 0 0 0 1 10 0 0
104 3 0 3511 1 0 [] 0 0 0 0 0 1 10 0 0
diff --git a/db/PyMongoDataServer/PySysDB/tagSuccess.txt b/db/PyMongoDataServer/PySysDB/tagSuccess.txt
index 3d95531..66145d9 100644
--- a/db/PyMongoDataServer/PySysDB/tagSuccess.txt
+++ b/db/PyMongoDataServer/PySysDB/tagSuccess.txt
@@ -238,11 +238,11 @@
713 1 340 0 0 0 0 0 0
714 1 360 0 0 0 0 0 0
715 1 380 0 0 0 0 0 0
-752 3 1 20511 0 0 0 1 0
-753 3 1 20512 0 0 0 1 0
-754 3 1 20513 0 0 0 1 0
-755 3 1 20514 0 0 0 1 0
-756 3 1 20515 0 0 0 1 0
+752 3 1 20511 0 0 0 0 0 301 1
+753 3 1 20512 0 0 0 0 0 301 1
+754 3 1 20513 0 0 0 0 0 301 1
+755 3 1 20514 0 0 0 0 0 301 1
+756 3 1 20515 0 0 0 0 0 301 1
761 112 1 2122 0 0 0 0 0
762 112 1 2123 0 0 0 0 0
763 112 1 2124 0 0 0 0 0
diff --git a/db/PyMongoDataServer/SysDB/tagChinItem.txt b/db/PyMongoDataServer/SysDB/tagChinItem.txt
index 31458c1..f92bffb 100644
--- a/db/PyMongoDataServer/SysDB/tagChinItem.txt
+++ b/db/PyMongoDataServer/SysDB/tagChinItem.txt
@@ -190,8 +190,8 @@
979 1 0 钻石充值卡 80 0 0 0 0 999 1 0 1 0 1 0 0 0 0 0 1 3000 0 50 0 1 0 0 228 300 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
980 1 0 白金充值卡 80 0 0 0 0 999 1 0 1 0 1 0 0 0 0 0 1 1000 0 50 0 1 0 0 228 100 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
981 1 0 黄金充值卡 80 0 0 0 0 999 1 0 1 0 1 0 0 0 0 0 1 500 0 50 0 1 0 0 228 50 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-982 1 0 极品寻宝令 15 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 248 0 50 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-983 1 0 符印寻宝令 15 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 98 0 50 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+982 1 0 极品寻宝令 15 0 0 0 0 999 1 0 1 0 1 0 0 0 0 0 1 248 0 50 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+983 1 0 符印寻宝令 15 0 0 0 0 999 1 0 1 0 1 0 0 0 0 0 1 98 0 50 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
984 1 0 中型等级经验丹 13 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 3 0 50 0 1 0 0 215 1000 400 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
985 1 0 VIP体验卡 80 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 0 0 50 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
986 1 0 经验祈愿符 15 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 0 0 50 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
--
Gitblit v1.8.0