From eeb51fc30034fc4ff9f81fca3bff0c683d8698ea Mon Sep 17 00:00:00 2001
From: cehua_LC <tingame100@163.com>
Date: 星期三, 10 十月 2018 11:45:54 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server
---
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc | 0
db/PyMongoDataServer/PySysDB/tagTreasurePrivilege.txt | 2 +-
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCommon.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerRefineStove.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerDogz.pyc | 0
CoreServerGroup/GameServer/Script/ShareDefine.pyc | 0
7 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/CoreServerGroup/GameServer/Script/ShareDefine.pyc b/CoreServerGroup/GameServer/Script/ShareDefine.pyc
index d9abee3..aac000a 100644
--- a/CoreServerGroup/GameServer/Script/ShareDefine.pyc
+++ b/CoreServerGroup/GameServer/Script/ShareDefine.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc
index 681a042..71a7ae1 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/NPC/NPCCommon.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCommon.pyc
index 4bd4293..1f2638e 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCommon.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCommon.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerDogz.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerDogz.pyc
index aff8af3..aa91fb4 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerDogz.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerDogz.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerRefineStove.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerRefineStove.pyc
index 60ce63b..5e363b6 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerRefineStove.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerRefineStove.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.pyc
index e9518f8..f0b773f 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.pyc
Binary files differ
diff --git a/db/PyMongoDataServer/PySysDB/tagTreasurePrivilege.txt b/db/PyMongoDataServer/PySysDB/tagTreasurePrivilege.txt
index 676b88d..fed8108 100644
--- a/db/PyMongoDataServer/PySysDB/tagTreasurePrivilege.txt
+++ b/db/PyMongoDataServer/PySysDB/tagTreasurePrivilege.txt
@@ -1,5 +1,5 @@
PrivilegeID EffectValue singleValue maxValue attr itemAward successList
-1 0 {"6":10000,"7":200}
+1 0 {"18":2000}
2 0 3 180 {"7":50}
3 0
4 10000
--
Gitblit v1.8.0