From 9a4ad76285e1c96c65b2365303b966004e810142 Mon Sep 17 00:00:00 2001
From: cehua_LC <tingame100@163.com>
Date: 星期三, 14 十一月 2018 14:42:50 +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/Item/UseItem/ItemCommon.pyc | 0
db/PyMongoDataServer/SysDB/tagChinItem.txt | 4 ++--
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetPack.pyc | 0
db/PyMongoDataServer/PySysDB/tagFuncConfig.txt | 2 +-
db/PyMongoDataServer/PySysDB/tagIceLodeStarAward.txt | 9 +++++++++
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGodWeapon.pyc | 0
CoreServerGroup/GameServer/Script/ShareDefine.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/FBCommon.pyc | 0
CoreServerGroup/GameServer/Script/ChPyNetPack.pyc | 0
11 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/CoreServerGroup/GameServer/Script/ChPyNetPack.pyc b/CoreServerGroup/GameServer/Script/ChPyNetPack.pyc
index 612a08e..5e7c972 100644
--- a/CoreServerGroup/GameServer/Script/ChPyNetPack.pyc
+++ b/CoreServerGroup/GameServer/Script/ChPyNetPack.pyc
Binary files differ
diff --git a/CoreServerGroup/GameServer/Script/ShareDefine.pyc b/CoreServerGroup/GameServer/Script/ShareDefine.pyc
index fb25ab3..8097b56 100644
--- a/CoreServerGroup/GameServer/Script/ShareDefine.pyc
+++ b/CoreServerGroup/GameServer/Script/ShareDefine.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip b/ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip
index 652dac5..0569a74 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/ChPyNetPack.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetPack.pyc
index 00f10d1..37a0016 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetPack.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetPack.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/FBCommon.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/FBCommon.pyc
index 1d260c3..30349f7 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/FBCommon.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/FBCommon.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/ItemCommon.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/ItemCommon.pyc
index d324efd..abb21ba 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/ItemCommon.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/ItemCommon.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGodWeapon.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGodWeapon.pyc
index 1f4d6a0..cd45cdb 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGodWeapon.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGodWeapon.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 3876dfa..518803c 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/tagFuncConfig.txt b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
index c276997..9abd03e 100644
--- a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
@@ -98,7 +98,7 @@
GodWeapon2 104|105|106 0 0 0 0
GodWeapon3 107|108|109 0 0 0 0
GodWeapon4 110|111|112 0 0 0 0
-GodWeaponActive 1 0 0 0 0
+GodWeaponActive 1 {"2":[[1,10]], "3":[[1,15], [2,10]], "4":[[2,20], [3,10]]} 0 0 0
GodWeaponSys {1:'GetGodWeapon',2:'GetGodWeapon1',3:'GetGodWeapon2'}
GodLv {1:[100,200,300,400],2:[100,200,300,400],3:[100,200,300,400]}
WorldLvExpRate int((max(min((worldLv-playerLv)*0.0075,0.15)-max(worldLv-playerLv-20,0),0)+min((max((worldLv-playerLv-20),0)/200.0),0.5)+min((math.sqrt(max((worldLv-playerLv-20),0)/100.0)*1.5),1.5))*10000) 0 0 0 0
diff --git a/db/PyMongoDataServer/PySysDB/tagIceLodeStarAward.txt b/db/PyMongoDataServer/PySysDB/tagIceLodeStarAward.txt
new file mode 100644
index 0000000..3528f53
--- /dev/null
+++ b/db/PyMongoDataServer/PySysDB/tagIceLodeStarAward.txt
@@ -0,0 +1,9 @@
+NPCID LineID Time index Star LV ItemList
+60203001 0 25 0 4 [0,200] [(4151,2,2)]
+60203002 1 30 1 8 [0,200] [(4151,2,2)]
+60203003 2 35 2 12 [0,200] [(4151,2,2)]
+60203004 3 40 3 15 [0,200] [(4151,2,2)]
+60203005 4 40 0 4 [201,500] [(4151,2,2)]
+60203006 5 50 1 8 [201,500] [(4151,2,2)]
+60203007 6 60 2 12 [201,500] [(4151,2,2)]
+60203008 7 65 3 15 [201,500] [(4151,2,2)]
diff --git a/db/PyMongoDataServer/SysDB/tagChinItem.txt b/db/PyMongoDataServer/SysDB/tagChinItem.txt
index 4ebd7bc..6dbca19 100644
--- a/db/PyMongoDataServer/SysDB/tagChinItem.txt
+++ b/db/PyMongoDataServer/SysDB/tagChinItem.txt
@@ -293,8 +293,8 @@
1504 1 0 矿脉钥匙 76 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 20 0 10 0 1 0 0 233 31140 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
1505 1 0 秘境地图 76 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 20 0 10 0 1 0 0 233 31080 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
1600 1 0 后羿之魂 77 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 100 0 10 0 1 0 0 236 111 250 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
-1650 1 0 贵族气泡 15 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 100 0 10 0 1 0 0 237 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 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-1651 1 0 至尊气泡 15 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 100 0 10 0 1 0 0 237 2 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
+1650 1 0 贵族气泡 16 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 100 0 10 0 1 0 0 237 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 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+1651 1 0 至尊气泡 16 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 100 0 10 0 1 0 0 237 2 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
2050 1 0 世界喇叭 48 0 0 0 0 999 1 1 1 0 1 0 0 1 0 0 1 50 0 5 0 0 0 0 2700 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 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
2100 1 0 铜钱 43 0 0 0 0 1 1 1 1 0 1 0 0 1 0 0 1 1 0 5 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 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
2101 1 0 铜钱 43 0 0 0 0 1 1 1 1 0 1 0 0 1 0 0 1 1 0 5 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 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
--
Gitblit v1.8.0