From f5a0d9ff3359dc58e996b75d44b8d4570aa579dd Mon Sep 17 00:00:00 2001
From: cehua_wcy <781813756@qq.com>
Date: 星期四, 01 十一月 2018 18:00:14 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server
---
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.pyc | 0
CoreServerGroup/GameServer/Script/Player/PlayerControl.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.pyc | 0
db/PyMongoDataServer/PySysDB/tagOSCBillRankAward.txt | 12 ++++++------
ZoneServerGroup/map1_8G/MapServer/MapServerData/PyNetPack.ini | 6 +++++-
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetPack.pyc | 0
db/PyMongoDataServer/PySysDB/tagFuncConfig.txt | 2 +-
CoreServerGroup/GameServer/Script/Player/ChPlayer.pyc | 0
db/PyMongoDataServer/PySysDB/tagOSCBillTagAward.txt | 4 ++--
CoreServerGroup/GameServer/Script/ChPyNetPack.pyc | 0
10 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/CoreServerGroup/GameServer/Script/ChPyNetPack.pyc b/CoreServerGroup/GameServer/Script/ChPyNetPack.pyc
index 062fdbb..612a08e 100644
--- a/CoreServerGroup/GameServer/Script/ChPyNetPack.pyc
+++ b/CoreServerGroup/GameServer/Script/ChPyNetPack.pyc
Binary files differ
diff --git a/CoreServerGroup/GameServer/Script/Player/ChPlayer.pyc b/CoreServerGroup/GameServer/Script/Player/ChPlayer.pyc
index aab37b9..e1dae34 100644
--- a/CoreServerGroup/GameServer/Script/Player/ChPlayer.pyc
+++ b/CoreServerGroup/GameServer/Script/Player/ChPlayer.pyc
Binary files differ
diff --git a/CoreServerGroup/GameServer/Script/Player/PlayerControl.pyc b/CoreServerGroup/GameServer/Script/Player/PlayerControl.pyc
index 639a667..bb76e7e 100644
--- a/CoreServerGroup/GameServer/Script/Player/PlayerControl.pyc
+++ b/CoreServerGroup/GameServer/Script/Player/PlayerControl.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/PyNetPack.ini b/ZoneServerGroup/map1_8G/MapServer/MapServerData/PyNetPack.ini
index 2a16803..f05f5d8 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/PyNetPack.ini
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/PyNetPack.ini
@@ -334,7 +334,7 @@
Writer = hxp
Releaser = hxp
RegType = 0
-RegisterPackCount = 17
+RegisterPackCount = 18
PacketCMD_1 = 0xA5
PacketSubCMD_1 = 0x04
@@ -404,6 +404,10 @@
PacketSubCMD_17=0x29
PacketCallFunc_17=OnSetLittleHelper
+PacketCMD_18=0xA2
+PacketSubCMD_18=0x30
+PacketCallFunc_18=OnSetChatBubbleBox
+
;购买相关的
[BuySomething]
ScriptName = Event\EventSrc\Operate_PlayerBuyZhenQi.py
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetPack.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetPack.pyc
index 37fcc5e..00f10d1 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/Player/ChPlayer.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.pyc
index 76695bc..8a797d8 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/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.pyc
index 2aa1915..81c02d0 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/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
index b74ea64..459cb61 100644
--- a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
@@ -268,7 +268,7 @@
XMZZRobotSkill {1:{(12000, 12001, 12002, 12003):1, 12011:7, 12012:15, 12013:30, 12014:80, 12015:140}, 2:{(12100, 12101, 12102, 12103):1, 12111:7, 12112:15, 12114:80, 12115:140}}
XMZZPKAward [0,10,20,30,40,50,60,70,80,90] addPer+100 + int(math.ceil(HPPer/10.0)) 50 reExp*216*(100+addPer)/100 reExp*108
PayRMB 10
-OSCBillboardOpen {"2":[20,1,2],"1":[200,3,3],"3":[12,4,4],"4":[200,5,5],"5":[7,6,6],"6":[1200000,7,7]} 10
+OSCBillboardOpen {"2":[20,1,2],"7":[40,3,3],"3":[12,4,4],"4":[200,5,5],"5":[7,6,6],"6":[1200000,7,7]} 10
OSCRankRedpackAward {1:80,(2,5):81}
WeekResetSuccType []
InvestCost {"1":[300],"2":[98],"3":[300,680,1280,1880]}
diff --git a/db/PyMongoDataServer/PySysDB/tagOSCBillRankAward.txt b/db/PyMongoDataServer/PySysDB/tagOSCBillRankAward.txt
index 6d4d718..749c422 100644
--- a/db/PyMongoDataServer/PySysDB/tagOSCBillRankAward.txt
+++ b/db/PyMongoDataServer/PySysDB/tagOSCBillRankAward.txt
@@ -5,12 +5,12 @@
2 4 5 {"1":[[204,1,1],[181,30,1],[4304,6,1]],"2":[[204,1,1],[181,30,1],[4304,6,1]],"3":[[204,1,1],[181,30,1],[4304,6,1]]}
2 6 10 {"1":[[204,1,1],[181,20,1],[4303,6,1]],"2":[[204,1,1],[181,20,1],[4303,6,1]],"3":[[204,1,1],[181,20,1],[4303,6,1]]}
2 11 20 {"1":[[205,1,1],[181,15,1],[4303,4,1]],"2":[[205,1,1],[181,15,1],[4303,4,1]],"3":[[205,1,1],[181,15,1],[4303,4,1]]}
-1 1 1 {"1":[[4702,1,1],[6706,1,0],[3504,3,1],[3514,3,1]],"2":[[4702,1,1],[6806,1,0],[3504,3,1],[3514,3,1]],"3":[[4702,1,1],[6906,1,0],[3504,3,1],[3514,3,1]]}
-1 2 2 {"1":[[4702,1,1],[6707,1,0],[3504,2,1],[3514,2,1]],"2":[[4702,1,1],[6807,1,0],[3504,2,1],[3514,2,1]],"3":[[4702,1,1],[6907,1,0],[3504,2,1],[3514,2,1]]}
-1 3 3 {"1":[[4702,1,1],[6708,1,0],[3503,4,1],[3513,4,1]],"2":[[4702,1,1],[6808,1,0],[3503,4,1],[3513,4,1]],"3":[[4702,1,1],[6908,1,0],[3503,4,1],[3513,4,1]]}
-1 4 5 {"1":[[4703,1,1],[3503,3,1],[3513,3,1]],"2":[[4703,1,1],[3503,3,1],[3513,3,1]],"3":[[4703,1,1],[3503,3,1],[3513,3,1]]}
-1 6 10 {"1":[[4703,1,1],[3503,2,1],[3513,2,1]],"2":[[4703,1,1],[3503,2,1],[3513,2,1]],"3":[[4703,1,1],[3503,2,1],[3513,2,1]]}
-1 11 20 {"1":[[4704,1,1],[3503,1,1],[3513,1,1]],"2":[[4704,1,1],[3503,1,1],[3513,1,1]],"3":[[4704,1,1],[3503,1,1],[3513,1,1]]}
+7 1 1 {"1":[[4702,1,1],[6706,1,0],[3504,3,1],[3514,3,1]],"2":[[4702,1,1],[6806,1,0],[3504,3,1],[3514,3,1]],"3":[[4702,1,1],[6906,1,0],[3504,3,1],[3514,3,1]]}
+7 2 2 {"1":[[4702,1,1],[6707,1,0],[3504,2,1],[3514,2,1]],"2":[[4702,1,1],[6807,1,0],[3504,2,1],[3514,2,1]],"3":[[4702,1,1],[6907,1,0],[3504,2,1],[3514,2,1]]}
+7 3 3 {"1":[[4702,1,1],[6708,1,0],[3503,4,1],[3513,4,1]],"2":[[4702,1,1],[6808,1,0],[3503,4,1],[3513,4,1]],"3":[[4702,1,1],[6908,1,0],[3503,4,1],[3513,4,1]]}
+7 4 5 {"1":[[4703,1,1],[3503,3,1],[3513,3,1]],"2":[[4703,1,1],[3503,3,1],[3513,3,1]],"3":[[4703,1,1],[3503,3,1],[3513,3,1]]}
+7 6 10 {"1":[[4703,1,1],[3503,2,1],[3513,2,1]],"2":[[4703,1,1],[3503,2,1],[3513,2,1]],"3":[[4703,1,1],[3503,2,1],[3513,2,1]]}
+7 11 20 {"1":[[4704,1,1],[3503,1,1],[3513,1,1]],"2":[[4704,1,1],[3503,1,1],[3513,1,1]],"3":[[4704,1,1],[3503,1,1],[3513,1,1]]}
3 1 1 {"1":[[4699,1,1],[6709,1,0],[4151,60,1],[6,1,1]],"2":[[4699,1,1],[6809,1,0],[4151,60,1],[6,1,1]],"3":[[4699,1,1],[6909,1,0],[4151,60,1],[6,1,1]]}
3 2 2 {"1":[[4699,1,1],[6710,1,0],[4151,50,1],[9,1,1]],"2":[[4699,1,1],[6810,1,0],[4151,50,1],[9,1,1]],"3":[[4699,1,1],[6910,1,0],[4151,50,1],[9,1,1]]}
3 3 3 {"1":[[4699,1,1],[6711,1,0],[4151,40,1],[7,1,1]],"2":[[4699,1,1],[6811,1,0],[4151,40,1],[7,1,1]],"3":[[4699,1,1],[6911,1,0],[4151,40,1],[7,1,1]]}
diff --git a/db/PyMongoDataServer/PySysDB/tagOSCBillTagAward.txt b/db/PyMongoDataServer/PySysDB/tagOSCBillTagAward.txt
index 7829e1c..ae6f943 100644
--- a/db/PyMongoDataServer/PySysDB/tagOSCBillTagAward.txt
+++ b/db/PyMongoDataServer/PySysDB/tagOSCBillTagAward.txt
@@ -1,8 +1,8 @@
RangListType Condition Gift
2 15 {"1":[[181,15],[4303,2]],"2":[[181,15],[4303,2]],"3":[[181,15],[4303,2]]}
2 10 {"1":[[181,10],[4303,1]],"2":[[181,10],[4303,1]],"3":[[181,10],[4303,1]]}
-1 180 {"1":[[3502,2],[3512,2]],"2":[[3502,2],[3512,2]],"3":[[3502,2],[3512,2]]}
-1 160 {"1":[[3502,1],[3512,1]],"2":[[3502,1],[3512,1]],"3":[[3502,1],[3512,1]]}
+7 30 {"1":[[3502,2],[3512,2]],"2":[[3502,2],[3512,2]],"3":[[3502,2],[3512,2]]}
+7 20 {"1":[[3502,1],[3512,1]],"2":[[3502,1],[3512,1]],"3":[[3502,1],[3512,1]]}
3 9 {"1":[[4151,15],[3,2]],"2":[[4151,15],[3,2]],"3":[[4151,15],[3,2]]}
3 6 {"1":[[4151,10],[3,1]],"2":[[4151,10],[3,1]],"3":[[4151,10],[3,1]]}
4 190 {"1":[[106,1],[103,1]],"2":[[106,1],[103,1]],"3":[[106,1],[103,1]]}
--
Gitblit v1.8.0