From c7cb2c18ed26fc3db28f47f2fcf4b1823762a9f4 Mon Sep 17 00:00:00 2001
From: cehua-HWJ35 <hwj35@163.com>
Date: 星期四, 31 一月 2019 14:14:43 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server
---
db/PyMongoDataServer/SysDB/tagChinSkill.txt | 6 +++---
db/PyMongoDataServer/PySysDB/tagFuncConfig.txt | 2 +-
CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt | 2 +-
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFeastRedPacket.pyc | 0
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt b/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt
index bfc27c8..3959e01 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt
@@ -61,7 +61,7 @@
OpenServerRedPacketCnt 30
OSRSuccess [14,15,16,17,18,19,20,21,22]
OpenServerRedPacketRain 200 {"31":"OSRedpackSfx1", "32":"OSRedpackSfx2"}
-FeastRedPacket 10 max(1,int((remainNum- 1*(remainPacketCnt-1))/float(remainPacketCnt)*random.uniform(0.5,min(remainPacketCnt-0.5, 1.5)))) [100,300,500,800,1000,1200,1500,1800]
+FeastRedPacket 10 max(1,int((remainNum- 1*(remainPacketCnt-1))/float(remainPacketCnt)*random.uniform(0.5,min(remainPacketCnt-0.5, 1.5)))) [100,300,500,800,1000,1200,1500,1800] 1
GeTuiOffLine 您关注的封魔坛BOSS[%s LV.%s]已经复活，快前往挑战 您关注的%s的BOSS[%s LV.%s]即将复活刷新，赶快上线前往挑战 您收到来自[%s]的私聊消息，快上线回复对方 升到60级就开启离线挂机啦，角色下线也可以挂机，经验和装备一点也不落下！[再玩一会] 您关注的诛仙BOSS[%s LV.%s]已经复活，快前往挑战
BillBoardPlayerLoginNotify [[0, {1:'GeRen_liubo_232930'}],[4, {1:'GeRen_liubo_148706'}],] 100 300
BossRebornTotalPoint 2200|3300|4400|5500 26|51|101|9999
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFeastRedPacket.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFeastRedPacket.pyc
index eaf6e6d..b8e30f0 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFeastRedPacket.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFeastRedPacket.pyc
Binary files differ
diff --git a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
index 748f43f..1e11670 100644
--- a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
@@ -301,7 +301,7 @@
OpenServerRedPacketType 5
OSRAllMoneySys [100,300,500,800,1000,1200,1500,1800]
OpenServerRedPacketCfg 3 10 3600 50 5
-FeastRedPacket 10 max(1,int((remainNum- 1*(remainPacketCnt-1))/float(remainPacketCnt)*random.uniform(0.5,min(remainPacketCnt-0.5, 1.5)))) [100,300,500,800,1000,1200,1500,1800]
+FeastRedPacket 10 max(1,int((remainNum- 1*(remainPacketCnt-1))/float(remainPacketCnt)*random.uniform(0.5,min(remainPacketCnt-0.5, 1.5)))) [100,300,500,800,1000,1200,1500,1800] 1
PotentialSkillLearn {"50065":[15,47000],"50165":[15,47010],"50265":[15,47020],"1065":[15,47030],"50365":[15,47040],"50465":[15,47050],"50565":[15,47060],"50665":[15,47070],"50765":[15,47080],"50865":[15,47090],"51065":[15,47130],"51165":[15,47140],"55065":[15,47200],"55165":[15,47210],"55265":[15,47220],"2065":[15,47230],"55365":[15,47240],"55465":[15,47250],"55565":[15,47260],"55665":[15,47270],"55765":[15,47280],"55865":[15,47290],"56065":[15,47330],"56165":[15,47340]}
FirstGold {"1":[[6619,1,1],[221,1,1],[912,1,1],[4151,5,1],[3,1,1]],"2":[[6620,1,1],[221,1,1],[912,1,1],[4151,5,1],[3,1,1]]} {"1":388,"2":388} 1800
CTG 20181224
diff --git a/db/PyMongoDataServer/SysDB/tagChinSkill.txt b/db/PyMongoDataServer/SysDB/tagChinSkill.txt
index 2dead29..5eb48d4 100644
--- a/db/PyMongoDataServer/SysDB/tagChinSkill.txt
+++ b/db/PyMongoDataServer/SysDB/tagChinSkill.txt
@@ -727,8 +727,8 @@
46056 兽血沸腾 46055 2 2 0 12 0 16 1 0 0 0 10 0 0 3000 0 0 0 0 0 4023 2000 5000 0 18 2000 1 0 19 3000 3 0 16 3000 3 0 0 0 0 0 0 0 0 0 10000 3000 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
46060 不灭之盾 46060 1 2 0 12 0 16 1 0 0 0 10 0 0 3000 0 0 0 0 0 4023 2000 0 0 13 2000 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 3000 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
46061 不灭之盾 46060 2 2 0 12 0 16 1 0 0 0 10 0 0 3000 0 0 0 0 0 4023 2000 0 0 13 2500 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 3000 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
-46065 不朽之力 46065 1 2 0 12 0 16 1 0 0 0 10 0 0 9000 0 0 0 0 0 4023 2000 0 0 4516 2000 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 3000 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
-46066 不朽之力 46065 2 2 0 12 0 16 1 0 0 0 10 0 0 9000 0 0 0 0 0 4023 2000 0 0 4516 3000 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 3000 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
+46065 不朽之力 46065 1 2 0 12 0 16 1 0 0 0 10 0 0 8000 0 0 0 0 0 4023 2000 0 0 4516 2000 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 3000 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
+46066 不朽之力 46065 2 2 0 12 0 16 1 0 0 0 10 0 0 8000 0 0 0 0 0 4023 2000 0 0 4516 3000 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 3000 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
46070 背水一战 46070 1 2 0 12 0 7 1 0 0 0 0 0 0 0 0 0 0 0 0 4005 5000 10000 3000 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 3000 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
46071 背水一战 46070 2 2 0 12 0 7 1 0 0 0 0 0 0 0 0 0 0 0 0 4005 6000 10000 3000 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 3000 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
46075 混沌之心 46075 1 2 0 12 0 16 1 0 0 0 10 0 0 3000 0 0 0 0 0 4023 10000 2000 0 77 2500 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 5000 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
@@ -1962,7 +1962,7 @@
30457 攻其不备 30450 8 10 2 4 0 7 0 0 0 0 41 10 0 0 0 0 0 0 0 4003 4000 7 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 0 0 0 0 0 21500 30400 6 0 10035 0 0 0 2 461080 0 0 0 0 0 0 0 0 0 50800 0 0 0 0
30458 攻其不备 30450 9 10 2 4 0 7 0 0 0 0 41 10 0 0 0 0 0 0 0 4003 4500 7 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 0 0 0 0 0 21500 30400 6 0 10035 0 0 0 2 518715 0 0 0 0 0 0 0 0 0 50800 0 0 0 0
30459 攻其不备 30450 10 10 2 4 0 7 0 0 0 0 41 10 0 0 0 0 0 0 0 4003 5000 7 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 0 0 0 0 0 21500 30400 6 0 10035 0 0 0 2 576350 0 0 0 0 0 0 0 0 0 50800 0 0 0 0
-30500 终极风暴(PVP) 30500 1 1 2 4 0 16 1 0 0 0 10 0 0 10000 0 0 0 0 0 4060 10000 0 0 4052 10000 3000 0 4055 50800 5000 1 1011 1 0 0 0 0 0 0 0 0 0 0 10000 5000 0 0 0 0 21800 30450 6 0 10045 0 0 0 2 88669 0 0 0 0 0 0 0 0 0 50800 0 0 0 0
+30500 终极风暴(PVP) 30500 1 1 2 4 0 16 1 0 0 0 10 0 0 0 0 0 0 0 0 4060 10000 0 0 4052 10000 3000 0 4055 50800 5000 1 1011 1 0 0 0 0 0 0 0 0 0 0 10000 5000 0 0 0 0 21800 30450 6 0 10045 0 0 0 2 88669 0 0 0 0 0 0 0 0 0 50800 0 0 0 0
30550 幻炎之体 30550 1 15 2 4 0 16 0 0 0 0 10 0 0 0 0 0 0 0 0 4022 10000 0 0 7 250 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 5000 0 0 0 0 20600 0 0 0 0 0 0 0 2 19396 0 0 0 0 0 0 0 4 0 30000 0 0 0 0
30551 幻炎之体 30550 2 15 2 4 0 16 0 0 0 0 10 0 0 0 0 0 0 0 0 4022 10000 0 0 7 375 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 5000 0 0 0 0 20600 0 0 0 0 0 0 0 2 38792 0 0 0 0 0 0 0 4 0 30000 0 0 0 0
30552 幻炎之体 30550 3 15 2 4 0 16 0 0 0 0 10 0 0 0 0 0 0 0 0 4022 10000 0 0 7 500 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 5000 0 0 0 0 20600 0 0 0 0 0 0 0 2 58188 0 0 0 0 0 0 0 4 0 30000 0 0 0 0
--
Gitblit v1.8.0