From ebdffee93ff9a966bd1da503d0d7121fc6b14319 Mon Sep 17 00:00:00 2001
From: cehua_wcy <781813756@qq.com>
Date: 星期二, 20 十一月 2018 17:01:17 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server
---
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc | 0
db/PyMongoDataServer/PySysDB/tagSuccess.txt | 3 ++-
db/PyMongoDataServer/SysDB/tagChinItem.txt | 4 ++--
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_SealDemon.pyc | 0
db/PyMongoDataServer/PySysDB/tagFuncConfig.txt | 2 +-
CoreServerGroup/GameServer/PySysDB/tagFamilyRedPack.txt | 2 +-
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.pyc | 0
db/PyMongoDataServer/PySysDB/tagChests.txt | 2 ++
db/PyMongoDataServer/PySysDB/tagFamilyRedPack.txt | 2 +-
db/PyMongoDataServer/PySysDB/tagChestsAward.txt | 2 ++
CoreServerGroup/GameServer/Script/ChPyNetSendPack.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/FBCommon.pyc | 0
13 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/CoreServerGroup/GameServer/PySysDB/tagFamilyRedPack.txt b/CoreServerGroup/GameServer/PySysDB/tagFamilyRedPack.txt
index 2ce1ed8..75f0feb 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagFamilyRedPack.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagFamilyRedPack.txt
@@ -11,7 +11,7 @@
10 5 400 2 10 0
11 5 500 2 10 0
12 5 100 2 4 0
-13 5 25 2 5 0
+13 5 100 2 4 0
14 5 25 2 5 0
15 5 25 2 5 0
16 5 25 2 5 0
diff --git a/CoreServerGroup/GameServer/Script/ChPyNetSendPack.pyc b/CoreServerGroup/GameServer/Script/ChPyNetSendPack.pyc
index d02c12b..91e81a7 100644
--- a/CoreServerGroup/GameServer/Script/ChPyNetSendPack.pyc
+++ b/CoreServerGroup/GameServer/Script/ChPyNetSendPack.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 a58fb50..0f685d1 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/ChPyNetSendPack.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.pyc
index 92533b1..762fcd3 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.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 30349f7..829ff2e 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/GameWorldLogic/FBProcess/GameLogic_SealDemon.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_SealDemon.pyc
index 4f320ba..234bf3f 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_SealDemon.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_SealDemon.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.pyc
index 5cf1534..42b69ee 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.pyc
Binary files differ
diff --git a/db/PyMongoDataServer/PySysDB/tagChests.txt b/db/PyMongoDataServer/PySysDB/tagChests.txt
index a170fcd..6e5aad1 100644
--- a/db/PyMongoDataServer/PySysDB/tagChests.txt
+++ b/db/PyMongoDataServer/PySysDB/tagChests.txt
@@ -199,3 +199,5 @@
2409 0 0 0 1 1
2410 0 0 0 1 1
2411 0 0 0 1 1
+4008 0 0 0 0 0
+4009 0 0 0 0 0
diff --git a/db/PyMongoDataServer/PySysDB/tagChestsAward.txt b/db/PyMongoDataServer/PySysDB/tagChestsAward.txt
index 238b695..373ef7f 100644
--- a/db/PyMongoDataServer/PySysDB/tagChestsAward.txt
+++ b/db/PyMongoDataServer/PySysDB/tagChestsAward.txt
@@ -196,3 +196,5 @@
2409 4611_2|4612_2|4613_2|4614_2|4615_2 [[10000,[4622,1]]] [[8000,0],[10000,1]] [4622]
2410 4611_2|4612_2|4613_2|4614_2|4615_2 [[10000,[4622,1]]] [[9000,0],[10000,1]] [4622]
2411 0 181_300
+4008 4011_5
+4009 4011_5
diff --git a/db/PyMongoDataServer/PySysDB/tagFamilyRedPack.txt b/db/PyMongoDataServer/PySysDB/tagFamilyRedPack.txt
index c7ff331..9ef0942 100644
--- a/db/PyMongoDataServer/PySysDB/tagFamilyRedPack.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFamilyRedPack.txt
@@ -11,7 +11,7 @@
10 5 400 2 10
11 5 500 2 10
12 5 100 2 4
-13 5 25 2 5
+13 5 100 2 4
14 5 25 2 5
15 5 25 2 5
16 5 25 2 5
diff --git a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
index a43368d..739cb92 100644
--- a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
@@ -247,7 +247,7 @@
SetWorldPosShunt {10010:10, 10020:10, 10030:10, 10040:10, 10050:10, 10060:10,10070:10,10080:10,10090:10} 350
TransportPay 954 1
GuardFBCageNPCID 32502001 32504001 3
-DemonJarSpecial 2018-11-30 1
+DemonJarSpecial 1
FBCntRegainInterval 7200
SealDemonNewbieLine 0|1|2
SealDemonDoubleDrop 2321|2322|2323|2324|4609|4610|4608|4606 1|2|3|4|5|6|7 2
diff --git a/db/PyMongoDataServer/PySysDB/tagSuccess.txt b/db/PyMongoDataServer/PySysDB/tagSuccess.txt
index e3968bd..af68c49 100644
--- a/db/PyMongoDataServer/PySysDB/tagSuccess.txt
+++ b/db/PyMongoDataServer/PySysDB/tagSuccess.txt
@@ -282,12 +282,13 @@
763 112 1 2124 0 0 0 0 0
764 1 120 0 0 0 0 0 0
771 28 1 0 0 0 0 0 6
-772 54 1 4|1|2 0 0 0 0 7
+772 54 1 4|1|2 0 0 0 0 0
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 6 2 0 0 0 0 0 12
+778 54 1 1|5|2 0 0 0 0 13
801 30 1 1|0 0 0 0 0 0
802 30 1 2|0 0 0 0 0 0
803 30 1 3|0 0 0 0 0 0
diff --git a/db/PyMongoDataServer/SysDB/tagChinItem.txt b/db/PyMongoDataServer/SysDB/tagChinItem.txt
index 7d56d8e..fa1da53 100644
--- a/db/PyMongoDataServer/SysDB/tagChinItem.txt
+++ b/db/PyMongoDataServer/SysDB/tagChinItem.txt
@@ -597,8 +597,8 @@
4005 0 0 烈性火药 44 0 1 0 0 999 1 1 1 0 1 0 0 0 0 0 1 10 0 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 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
4006 0 0 火药助燃剂 44 0 1 0 0 999 1 1 1 0 1 0 0 0 0 0 1 10 0 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 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
4007 0 0 古神印记 15 0 1 0 0 999 1 1 1 0 1 0 0 0 0 0 1 80 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
-4008 0 0 印记碎片（左） 44 0 1 0 0 999 1 1 1 0 1 0 0 0 0 0 1 40 0 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 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
-4009 0 0 印记碎片（右） 44 0 1 0 0 999 1 1 1 0 1 0 0 0 0 0 1 40 0 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 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
+4008 0 0 印记碎片（左） 81 0 1 0 0 999 1 1 1 0 1 0 0 0 0 0 1 40 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 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+4009 0 0 印记碎片（右） 81 0 1 0 0 999 1 1 1 0 1 0 0 0 0 0 1 40 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 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
4010 0 0 VIP Boss挑战券 15 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 80 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
4011 0 0 古神印记碎片 44 0 1 0 0 999 1 1 1 0 1 0 0 0 0 0 1 8 0 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 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
4101 0 0 幼龙 112 12 0 0 0 1 1 1 0 0 1 0 0 0 0 0 1 380 0 20 0 0 0 0 6 5000 0 0 46 5000 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 9 0 0 0 0 0 0 2592000 0 0 0 0 0 0 0
--
Gitblit v1.8.0