From f8f6259bcfbc54b0c8071c54a1d05d8f6b11448c Mon Sep 17 00:00:00 2001
From: cehua_wcy <781813756@qq.com>
Date: 星期三, 22 八月 2018 18:22:04 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server
---
db/PyMongoDataServer/PySysDB/tagTreasurePrivilege.txt | 4 ++--
db/PyMongoDataServer/PySysDB/tagFuncOpenLV.txt | 2 +-
db/PyMongoDataServer/PySysDB/tagRealm.txt | 4 ++--
CoreServerGroup/GameServer/PySysDB/tagFuncOpenLV.txt | 2 +-
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventShell.pyc | 0
5 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/CoreServerGroup/GameServer/PySysDB/tagFuncOpenLV.txt b/CoreServerGroup/GameServer/PySysDB/tagFuncOpenLV.txt
index 8ffb72e..4f5b2fe 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagFuncOpenLV.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagFuncOpenLV.txt
@@ -81,7 +81,7 @@
129 120 0 0
130 800 0 0
131 800 0 0
-132 30 0 0
+132 106 0 0
133 52 0 0
134 400 0 0
135 110 0 0
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventShell.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventShell.pyc
index c6e3d1d..e2ac330 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventShell.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventShell.pyc
Binary files differ
diff --git a/db/PyMongoDataServer/PySysDB/tagFuncOpenLV.txt b/db/PyMongoDataServer/PySysDB/tagFuncOpenLV.txt
index 2f42e7d..5e0917d 100644
--- a/db/PyMongoDataServer/PySysDB/tagFuncOpenLV.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFuncOpenLV.txt
@@ -81,7 +81,7 @@
129 120 0 0 0
130 800 0 0 0
131 800 0 0 0
-132 30 0 0 0
+132 106 0 0 0
133 52 0 0 0
134 400 0 0 0
135 110 0 0 0
diff --git a/db/PyMongoDataServer/PySysDB/tagRealm.txt b/db/PyMongoDataServer/PySysDB/tagRealm.txt
index 52ad271..4b0f516 100644
--- a/db/PyMongoDataServer/PySysDB/tagRealm.txt
+++ b/db/PyMongoDataServer/PySysDB/tagRealm.txt
@@ -1,14 +1,14 @@
Lv IsBigRealm NeedPoint NeedGood NeedNum NeedActiveTreasure AddAttrType AddAttrNum BossID SitTime TeamAward
0 0 450 0 0 0 6|7 0|0 61103000 {"1":0,"2":0,"3":0,"4":0,"5":0} 0
1 0 650 0 0 0 6|7 4700|230 61103001 {"1":0,"2":0,"3":0,"4":0,"5":0} 0
-2 1 1130 0 0 0 6|7 9900|490 61203001 {"1":0,"2":0,"3":0,"4":0,"5":0} {0:[(105,1,1),(102,3,1)]}
+2 1 1100 0 0 0 6|7 9900|490 61203001 {"1":0,"2":0,"3":0,"4":0,"5":0} {0:[(105,1,1),(102,3,1)]}
3 0 1150 0 0 0 6|7|19 18700|940|1000 61103002 {"1":0,"2":0,"3":0,"4":0,"5":0} 0
4 1 1410 0 0 0 6|7|19 25100|1260|1000 61203002 {"1":0,"2":0,"3":0,"4":0,"5":0} {0:[(105,3,1),(103,1,1)]}
5 0 1160 0 0 0 6|7|19 35900|1800|3000 61103003 {"1":0,"2":0,"3":0,"4":0,"5":0} 0
6 1 1270 0 0 0 6|7|19 43900|2200|3000 61203003 {"1":0,"2":0,"3":0,"4":0,"5":0} {0:[(105,3,1),(103,1,1)]}
7 0 1410 0 0 0 6|7|19|18 57400|2870|3000|2000 61103004 {"1":0,"2":0,"3":0,"4":0,"5":0} 0
8 1 2250 0 0 0 6|7|19|18 67300|3360|3000|2000 61203004 {"1":0,"2":0,"3":0,"4":0,"5":0} {0:[(106,1,1),(103,3,1)]}
-9 0 1800 0 0 0 6|7|19|18 83900|4200|3000|5000 61103005 {"1":0,"2":0,"3":0,"4":0,"5":0} 0
+9 0 2340 0 0 0 6|7|19|18 83900|4200|3000|5000 61103005 {"1":0,"2":0,"3":0,"4":0,"5":0} 0
10 0 2670 0 0 0 6|7|19|18 96100|4810|3000|5000 61103006 {"1":0,"2":0,"3":0,"4":0,"5":0} 0
11 1 4890 0 0 0 6|7|19|18 109800|5490|3000|5000 61203005 {"1":0,"2":0,"3":0,"4":0,"5":0} {0:[(106,1,1),(103,3,1)]}
12 0 3710 0 0 0 6|7|19|18|49 132500|6630|3000|5000|3000 61103007 {"1":0,"2":0,"3":0,"4":0,"5":0} 0
diff --git a/db/PyMongoDataServer/PySysDB/tagTreasurePrivilege.txt b/db/PyMongoDataServer/PySysDB/tagTreasurePrivilege.txt
index 7113ffa..b5c83ce 100644
--- a/db/PyMongoDataServer/PySysDB/tagTreasurePrivilege.txt
+++ b/db/PyMongoDataServer/PySysDB/tagTreasurePrivilege.txt
@@ -1,7 +1,7 @@
PrivilegeID EffectValue singleValue maxValue attr itemAward successList
1 0 {"6":10000,"7":200} 1001|1021|1041
-2 0 3 180 {"7":50} 1003|1023|1043
-3 0 1002|1022|1042
+2 0 1002|1022|1042
+3 0 3 180 {"7":50} 1003|1023|1043
4 10000 1004|1024|1044
5 0 4 0 {"7":100} 1006|1026|1046
6 0 1 0 {"6":12000} 1005|1025|1045
--
Gitblit v1.8.0