From 354794b9cf1d4fd8d013a76c575ac46b5dfb77a3 Mon Sep 17 00:00:00 2001
From: cehua_wcy <781813756@qq.com>
Date: 星期四, 13 九月 2018 17:28:32 +0800
Subject: [PATCH] Merge branch '1.0.15' of http://192.168.0.87:10010/r/snxx_server into 1.0.15
---
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerPet.pyc | 0
db/PyMongoDataServer/PySysDB/tagSuccess.txt | 34 ++++++++--------
db/PyMongoDataServer/SysDB/tagChinItem.txt | 2
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/AttackCommon.pyc | 0
db/PyMongoDataServer/PySysDB/tagFuncConfig.txt | 2
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuffEffMng.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveSkill_4051.pyc | 0
CoreServerGroup/GameServer/PySysDB/tagFamilyRedPack.txt | 12 +++---
CoreServerGroup/GameServer/Script/ShareDefine.pyc | 0
db/PyMongoDataServer/PySysDB/tagChests.txt | 28 +++++++------
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.pyc | 0
db/PyMongoDataServer/PySysDB/tagFamilyRedPack.txt | 12 +++---
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFamily.pyc | 0
15 files changed, 46 insertions(+), 44 deletions(-)
diff --git a/CoreServerGroup/GameServer/PySysDB/tagFamilyRedPack.txt b/CoreServerGroup/GameServer/PySysDB/tagFamilyRedPack.txt
index 617adf9..4d69ba7 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagFamilyRedPack.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagFamilyRedPack.txt
@@ -4,12 +4,12 @@
3 2 200 2 0 0
4 2 200 2 0 0
5 4 500 2 0 1
-6 5 25 2 5 0
-7 5 25 2 5 0
-8 5 25 2 5 0
-9 5 25 2 5 0
-10 5 25 2 5 0
-11 5 25 2 5 0
+6 5 100 2 4 0
+7 5 100 2 4 0
+8 5 100 2 4 0
+9 5 200 2 5 0
+10 5 200 2 5 0
+11 5 200 2 5 0
12 5 25 2 5 0
13 5 25 2 5 0
14 5 25 2 5 0
diff --git a/CoreServerGroup/GameServer/Script/ShareDefine.pyc b/CoreServerGroup/GameServer/Script/ShareDefine.pyc
index 90ff0bb..c95b1e3 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/Attack/AttackLogic/AttackCommon.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/AttackCommon.pyc
index 15c2263..13c6834 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/ChConfig.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc
index 584de1a..a98cc0d 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/Player/PlayerControl.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.pyc
index 7729402..cbb2161 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFamily.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFamily.pyc
index 085de75..7a59e8b 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFamily.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFamily.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerPet.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerPet.pyc
index 6f1e8c6..5e1fcdd 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerPet.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerPet.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 fd6acb3..6fb90f5 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/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveSkill_4051.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveSkill_4051.pyc
new file mode 100644
index 0000000..92a4244
--- /dev/null
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveSkill_4051.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuffEffMng.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuffEffMng.pyc
index 52f3d39..756b684 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuffEffMng.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuffEffMng.pyc
Binary files differ
diff --git a/db/PyMongoDataServer/PySysDB/tagChests.txt b/db/PyMongoDataServer/PySysDB/tagChests.txt
index 7425ad9..50f4232 100644
--- a/db/PyMongoDataServer/PySysDB/tagChests.txt
+++ b/db/PyMongoDataServer/PySysDB/tagChests.txt
@@ -2,9 +2,9 @@
2200 0 0 0 1 1
2201 0 0 0 1 1
2202 0 0 0 1 1
-2203 0 0 0 1 1
+2203 0 0 0 0 1
2204 0 0 0 0 1
-2205 0 0 0 1 0
+2205 0 0 0 0 0
2206 0 0 0 1 1
2207 0 0 0 0 1
2208 0 0 0 0 1
@@ -92,7 +92,7 @@
2298 0 0 0 1 0
2299 0 0 0 0 0
2300 0 0 0 0 0
-2301 0 0 0 1 0
+2301 0 0 0 0 0
2302 0 0 0 1 1
2303 0 0 0 1 1
2304 0 0 0 1 1
@@ -105,8 +105,8 @@
2311 0 0 0 1 1
2312 0 0 0 1 1
2317 0 0 388 1 1
-2318 0 0 0 1 1
-2319 0 0 0 1 1
+2318 0 0 0 0 1
+2319 0 0 0 0 1
2320 0 0 0 0 0
2321 0 0 0 0 1
2322 0 0 0 0 1
@@ -127,17 +127,17 @@
2337 0 0 0 1 0
2338 0 0 0 1 0
2339 0 0 0 0 1
-2340 0 0 0 1 1
+2340 0 0 0 0 1
2341 0 0 0 0 1
2342 0 0 0 0 1
2343 0 0 0 1 1
2344 0 0 0 1 1
2345 0 0 0 1 1
-2346 0 0 0 1 0
-2347 0 0 0 1 0
-2348 0 0 0 1 0
-2349 0 0 0 1 1
-2350 0 0 0 1 1
+2346 0 0 0 0 0
+2347 0 0 0 0 0
+2348 0 0 0 0 0
+2349 0 0 0 0 1
+2350 0 0 0 0 1
2351 0 0 0 1 1
2352 0 0 0 1 0
2353 0 0 0 1 0
@@ -166,5 +166,7 @@
2376 0 0 0 1 0
2377 0 0 0 1 0
2378 0 0 0 1 0
-2379 0 0 0 1 1
-2380 0 0 0 1 1
+2379 0 0 0 0 1
+2380 0 0 0 0 1
+2381 0 0 0 1 1
+2382 0 0 0 1 1
diff --git a/db/PyMongoDataServer/PySysDB/tagFamilyRedPack.txt b/db/PyMongoDataServer/PySysDB/tagFamilyRedPack.txt
index b647179..aac3db7 100644
--- a/db/PyMongoDataServer/PySysDB/tagFamilyRedPack.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFamilyRedPack.txt
@@ -4,12 +4,12 @@
3 2 200 2 0
4 2 200 2 0
5 4 500 2 0
-6 5 25 2 5
-7 5 25 2 5
-8 5 25 2 5
-9 5 25 2 5
-10 5 25 2 5
-11 5 25 2 5
+6 5 100 2 4
+7 5 100 2 4
+8 5 100 2 4
+9 5 200 2 5
+10 5 200 2 5
+11 5 200 2 5
12 5 25 2 5
13 5 25 2 5
14 5 25 2 5
diff --git a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
index b180824..e267776 100644
--- a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
@@ -19,7 +19,7 @@
AI197Point {"31040":[[16,34],[18,99]]}
AI198Point {"3119000":[[15,19],[7,16],[13,22],[21,26]],"3119001":[[15,19],[7,16],[13,22],[21,26]],"3119002":[[15,19],[7,16],[13,22],[21,26]],"3119003":[[15,19],[7,16],[13,22],[21,26]],"3119004":[[15,19],[7,16],[13,22],[21,26]],"3119005":[[15,19],[7,16],[13,22],[21,26]],"3119006":[[15,19],[7,16],[13,22],[21,26]],"3118000":[[71,17],[73,63],[21,48]],"5101002":[[114,19]],"5101004":[[56,65],[83,88]],"3101000":[[6,25]],"4111000":[[17,16]],"4111001":[[17,16]],"4111002":[[17,16]],"4111003":[[17,16]],"4111004":[[17,16]],"4111005":[[17,16]],"4111006":[[17,16]],"4111007":[[17,16]],"4111008":[[17,16]],"4111009":[[77,17]],"4111010":[[77,17]],"4111011":[[77,17]],"4111012":[[77,17]],"4111013":[[77,17]],"4111014":[[77,17]],"4111015":[[77,17]],"4111016":[[77,17]],"4111017":[[77,17]],"4111018":[[77,17]],"4111019":[[77,17]],"4111020":[[77,17]],"4111021":[[77,17]],"4111022":[[77,17]],"3116000":[[59,25],[116,27],[88,53],[114,65],[36,78],[135,82],[99,93],[109,111],[66,111],[41,120]],"6001000":[[46,16],[10,18]],"6001001":[[198,24],[184,21],[144,23],[123,23]],"6001002":[[294,21],[279,21],[264,21],[236,23]],"3121000":[[12,38]],"5101007":[[66,118]],"5101003":[[18,66]],"5101005":[[122,70]],"5101006":[[8,109],[17,109],[12,119]]}
AIRefreshPointNPCRun {101:[[7,15]],102:[[13,22]],103:[[21,25]]}
-RuneUnlock 0|204|304|404|504|604|704|804 8_100 8_120 0 0
+RuneUnlock 0|204|304|404|504|604|704|804 8_100 8_120 9 0
RuneDoubleInlayCnt 101_1|908_2|1008_3|1108_4|1208_5
RunePackageNum 200 0 0 0 0
RuneAttr7 int(118154*(0.1+0.3*(level/50.0)+0.35*pow(level/50.0,2)+0.25*pow(level/50.0,3))*2*0.5/20) 1_0.2|2_0.3|3_0.5|4_0.7|5_1 1.5 0 0
diff --git a/db/PyMongoDataServer/PySysDB/tagSuccess.txt b/db/PyMongoDataServer/PySysDB/tagSuccess.txt
index 84c2434..b7f8e88 100644
--- a/db/PyMongoDataServer/PySysDB/tagSuccess.txt
+++ b/db/PyMongoDataServer/PySysDB/tagSuccess.txt
@@ -273,23 +273,23 @@
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
-771 36 10 10101001 0 0 0 0 6
-772 5 10 0 0 0 0 0 7
-773 48 20 0 0 0 0 0 8
-774 81 20 31080 0 0 0 0 9
-775 10 1 100|20 0 0 0 0 10
-776 58 1 50106001|20 0 0 0 0 11
-777 19 10 0 0 0 0 0 12
-778 78 3 0 0 0 0 0 13
-779 27 7 25 0 0 0 0 14
-780 28 3 0 0 0 0 0 15
-781 54 1 4|1|1 0 0 0 0 16
-782 42 1 208 0 0 0 0 17
-783 1 150 0 0 0 0 0 18
-784 6 1 0 0 0 0 0 19
-785 50 6 0 0 0 0 0 20
-786 12 6 0 0 0 0 0 21
-787 120 60 0 0 0 0 0 22
+771 28 1 0 0 0 0 0 6
+772 54 1 4|1|2 0 0 0 0 7
+773 50 6 0 0 0 0 0 8
+774 10 1 201|20 0 0 0 0 9
+775 12 6 0 0 0 0 0 10
+776 120 80 0 0 0 0 0 11
+777 36 10 10101001 0 0 0 0 12
+778 5 10 0 0 0 0 0 13
+779 48 20 0 0 0 0 0 14
+780 81 20 31080 0 0 0 0 15
+781 58 1 50106001|20 0 0 0 0 16
+782 19 10 0 0 0 0 0 17
+783 78 3 0 0 0 0 0 18
+784 27 7 25 0 0 0 0 19
+785 42 1 208 0 0 0 0 20
+786 1 150 0 0 0 0 0 21
+787 6 1 0 0 0 0 0 22
801 30 1 1 0 0 0 0 0
802 30 1 2 0 0 0 0 0
803 30 1 3 0 0 0 0 0
diff --git a/db/PyMongoDataServer/SysDB/tagChinItem.txt b/db/PyMongoDataServer/SysDB/tagChinItem.txt
index e5e5a37..119130a 100644
--- a/db/PyMongoDataServer/SysDB/tagChinItem.txt
+++ b/db/PyMongoDataServer/SysDB/tagChinItem.txt
@@ -471,7 +471,7 @@
2379 1 0 灵宠养成袋 81 0 0 0 0 999 1 1 1 0 1 0 0 1 0 0 1 40 0 5 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
2380 1 0 坐骑养成袋 81 0 0 0 0 999 1 1 1 0 1 0 0 1 0 0 1 40 0 5 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
2381 1 0 天机宝箱 81 0 0 0 0 999 1 1 1 0 1 0 0 1 0 0 1 40 0 5 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
-2382 1 0 天机宝箱 81 0 0 0 0 999 1 1 1 0 1 0 0 1 0 0 1 40 0 5 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
+2382 1 0 天机宝箱 81 0 0 0 0 999 1 1 1 0 1 0 0 1 0 0 1 40 0 5 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
3501 1 0 1级生命翡翠 25 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 10 0 10 0 0 0 1 225 1 1 3502 6 190 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
3502 1 0 2级生命翡翠 25 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 30 0 10 0 0 0 1 225 1 2 3503 6 465 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
3503 1 0 3级生命翡翠 25 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 90 0 20 0 0 0 1 225 1 3 3504 6 1160 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
--
Gitblit v1.8.0