From accf788f562c59486d06daaa06b9985b7c6c15d0 Mon Sep 17 00:00:00 2001
From: cehua_wcy <781813756@qq.com>
Date: 星期三, 30 一月 2019 17:34:16 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server
---
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerState.pyc | 0
db/PyMongoDataServer/PySysDB/tagFuncOpenLV.txt | 1 +
db/PyMongoDataServer/SysDB/tagChinItem.txt | 1 +
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.pyc | 0
CoreServerGroup/GameServer/PySysDB/tagFuncOpenLV.txt | 1 +
db/PyMongoDataServer/PySysDB/tagFuncConfig.txt | 4 ++--
db/PyMongoDataServer/PySysDB/tagChatBubbleBox.txt | 1 +
CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt | 4 ++--
db/PyMongoDataServer/PySysDB/tagZhuXianStoneAttr.txt | 38 +++++++++++++++++++-------------------
9 files changed, 27 insertions(+), 23 deletions(-)
diff --git a/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt b/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt
index f8d8adc..8dc4d65 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt
@@ -43,7 +43,7 @@
OpenJob 1|2 0 0 0 0
TeamReadyTime 30
BossShunt 10040|21070 1 3
-MapLine 10040_10|10080_10|21070_1 10010_11|10020_11|10030_11|10080_11|10040_26 [10103001,10203001,10303001,10403001] 21070|21100|21110|32020
+MapLine 10040_10|10080_10|21070_1 10010_11|10020_11|10030_11|10080_11|10040_26 [10103001,10203001,10303001,10403001] 21070|21100|21110|32020|21310
DropRecordValue 4213|250|4202|2404|2405|3802|983|982|260|4209|3803|258|4210|3804|9051|9062|3805|3806|9073|222|4250|260|4209|5408|9074|9075|9077|9078|5409
DropRecordNum 40 1
KillBossCntLimit {(10403001,10503001,10603001,10703001,10803001,20103001,20103002,20103003,20103004,20103005,20103006,20103007,20203001,20203002,20203003,20203004,20203005,20203006,20203007,10903001,11003001,11103001,20403001,20403002,20403003,20403004,20403005,20403006,20403007):0,(20303001,20303002,20303003,20303004,20303005,20303006,20303007,40103001,40103002,40103003,40103004,40103005,40103006,40103007,40103008):2,(30303001,30303002,30303003,30303004,30303005,30303006,30303007,30303008,30303009,30303010,30303011,30303012,30303013,30303014,30303015,30303016,30303017,30303018,30303019,30303020):1} 0_3|2_3|1_9999 {0:'WB_Limit',2:'DogzDungeonPL',1:'BossHome_Limit'} {} {0:[21,'WorldBossNoHarm']}
@@ -61,7 +61,7 @@
OpenServerRedPacketCnt 30
OSRSuccess [14,15,16,17,18,19,20,21,22]
OpenServerRedPacketRain 200 {"31":"OSRedpackSfx1", "32":"OSRedpackSfx2"}
-FeastRedPacket 5 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]
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/CoreServerGroup/GameServer/PySysDB/tagFuncOpenLV.txt b/CoreServerGroup/GameServer/PySysDB/tagFuncOpenLV.txt
index 14a58c7..af06048 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagFuncOpenLV.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagFuncOpenLV.txt
@@ -114,3 +114,4 @@
165 235 0 0
167 240 0 0
168 1 0 0
+169 240 0 0
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.pyc
index f8e4276..853e788 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/PlayerState.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerState.pyc
index e12b516..431a7ff 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerState.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerState.pyc
Binary files differ
diff --git a/db/PyMongoDataServer/PySysDB/tagChatBubbleBox.txt b/db/PyMongoDataServer/PySysDB/tagChatBubbleBox.txt
index ec6a014..3e97bb9 100644
--- a/db/PyMongoDataServer/PySysDB/tagChatBubbleBox.txt
+++ b/db/PyMongoDataServer/PySysDB/tagChatBubbleBox.txt
@@ -3,3 +3,4 @@
1 0 2
2 0 6
3 0 0
+4 0 0
diff --git a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
index 8e3ae57..eac2513 100644
--- a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
@@ -225,7 +225,7 @@
AngryAdd 60 1 20 100 0
BossHomeCost 1_0|2_100|3_200|4_200|5_200|6_200|7_200|8_200 0 0 0 0
BossShunt 10040|21070 1 3
-MapLine 10040_10|10080_10|21070_1 10010_11|10020_11|10030_11|10080_11|10040_26 [10103001,10203001,10303001,10403001] 21070|21100|21110|32020
+MapLine 10040_10|10080_10|21070_1 10010_11|10020_11|10030_11|10080_11|10040_26 [10103001,10203001,10303001,10403001] 21070|21100|21110|32020|21310
NeutralMapExpAward {(21070,21100,21110,32020,31230):[500,'int(0.6*reExp)']}
DungeonDeliver 31020|31030|31150|31031
DungeonIntegral 2000
@@ -301,7 +301,7 @@
OpenServerRedPacketType 5
OSRAllMoneySys [100,300,500,800,1000,1200,1500,1800]
OpenServerRedPacketCfg 3 10 3600 50 5
-FeastRedPacket 5 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]
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/PySysDB/tagFuncOpenLV.txt b/db/PyMongoDataServer/PySysDB/tagFuncOpenLV.txt
index 10f5b11..46d4e02 100644
--- a/db/PyMongoDataServer/PySysDB/tagFuncOpenLV.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFuncOpenLV.txt
@@ -114,3 +114,4 @@
165 235 0 0 0 0
167 240 0 0 0 0
168 1 0 0 0 0
+169 240 0 0 0 0
diff --git a/db/PyMongoDataServer/PySysDB/tagZhuXianStoneAttr.txt b/db/PyMongoDataServer/PySysDB/tagZhuXianStoneAttr.txt
index 5164def..73988f3 100644
--- a/db/PyMongoDataServer/PySysDB/tagZhuXianStoneAttr.txt
+++ b/db/PyMongoDataServer/PySysDB/tagZhuXianStoneAttr.txt
@@ -1,19 +1,19 @@
-suiteType shareSoneLV attrIDList attrValueList
-1 1 96|97|98 1000|1000|1000
-1 2 96|97|98 1500|1500|1500
-1 3 96|97|98 2000|2000|2000
-1 4 96|97|98 2500|2500|2500
-1 5 96|97|98 3000|3000|3000
-1 6 96|97|98 3500|3500|3500
-2 1 99|100|101 1500|1500|1500
-2 2 99|100|101 2250|2250|2250
-2 3 99|100|101 3000|3000|3000
-2 4 99|100|101 3750|3750|3750
-2 5 99|100|101 4500|4500|4500
-2 6 99|100|101 5250|5250|5250
-3 1 90|91|93|94 300|300|150|150
-3 2 90|91|93|94 600|600|300|300
-3 3 90|91|93|94 900|900|450|450
-3 4 90|91|93|94 1200|1200|600|600
-3 5 90|91|93|94 1500|1500|750|750
-3 6 90|91|93|94 1800|1800|900|900
+suiteType suiteLV attrIDList attrValueList
+1 1 96|97|98 400|400|400
+1 2 96|97|98 800|800|800
+1 3 96|97|98 1200|1200|1200
+1 4 96|97|98 1600|1600|1600
+1 5 96|97|98 2000|2000|2000
+1 6 96|97|98 2400|2400|2400
+2 1 99|100|101 400|400|400
+2 2 99|100|101 800|800|800
+2 3 99|100|101 1200|1200|1200
+2 4 99|100|101 1600|1600|1600
+2 5 99|100|101 2000|2000|2000
+2 6 99|100|101 2400|2400|2400
+3 1 116|117|118|119 400|400|400|400
+3 2 116|117|118|119 800|800|800|800
+3 3 116|117|118|119 1200|1200|1200|1200
+3 4 116|117|118|119 1600|1600|1600|1600
+3 5 116|117|118|119 2000|2000|2000|2000
+3 6 116|117|118|119 2400|2400|2400|2400
diff --git a/db/PyMongoDataServer/SysDB/tagChinItem.txt b/db/PyMongoDataServer/SysDB/tagChinItem.txt
index 7649dc7..b7a8377 100644
--- a/db/PyMongoDataServer/SysDB/tagChinItem.txt
+++ b/db/PyMongoDataServer/SysDB/tagChinItem.txt
@@ -340,6 +340,7 @@
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
1652 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 3 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
+1653 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 4 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
1800 1 0 玄武之魂(黄) 22 0 0 0 0 999 1 0 1 0 1 0 0 0 0 0 1 3400 0 20 0 1 0 0 7 275 0 0 6 8264 0 0 15 300 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
1801 1 0 应龙之魂(黄) 22 0 0 0 0 999 1 0 1 0 1 0 0 0 0 0 1 2570 0 20 0 1 0 0 7 275 0 0 6 8264 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
1802 1 0 朱雀之魂(黄) 22 0 1 0 0 999 1 1 1 0 1 0 0 0 0 0 1 1020 0 1000 0 1 0 0 7 991 0 0 6 29736 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