From 79070ee1a57664bce9d8e31e4cb48b17e7787115 Mon Sep 17 00:00:00 2001
From: cehua_lyf <1251614069@qq.com>
Date: 星期三, 23 一月 2019 10:25:29 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server
---
CoreServerGroup/GameServer/Script/Player/PlayerGeTui.pyc | 0
db/PyMongoDataServer/SysDB/tagChinSkill.txt | 6 +++---
db/PyMongoDataServer/SysDB/tagChinItem.txt | 6 ++++--
db/PyMongoDataServer/PySysDB/tagFuncConfig.txt | 2 +-
db/PyMongoDataServer/PySysDB/tagActWeekParty.txt | 2 +-
CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt | 2 +-
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_ZhuXianTower.pyc | 0
7 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt b/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt
index c7aefa8..c75ebb3 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
-GeTuiOffLine 您关注的封魔坛BOSS[%s LV.%s]已经复活，快前往挑战 您关注的%s的BOSS[%s LV.%s]即将复活刷新，赶快上线前往挑战 您收到来自[%s]的私聊消息，快上线回复对方 升到60级就开启离线挂机啦，角色下线也可以挂机，经验和装备一点也不落下！[再玩一会]
+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
BossRebornNotify [50,80] [0,20,40]
diff --git a/CoreServerGroup/GameServer/Script/Player/PlayerGeTui.pyc b/CoreServerGroup/GameServer/Script/Player/PlayerGeTui.pyc
index 7918c04..7908446 100644
--- a/CoreServerGroup/GameServer/Script/Player/PlayerGeTui.pyc
+++ b/CoreServerGroup/GameServer/Script/Player/PlayerGeTui.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_ZhuXianTower.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_ZhuXianTower.pyc
index 60bef3a..237f314 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_ZhuXianTower.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_ZhuXianTower.pyc
Binary files differ
diff --git a/db/PyMongoDataServer/PySysDB/tagActWeekParty.txt b/db/PyMongoDataServer/PySysDB/tagActWeekParty.txt
index c818d43..b2a103f 100644
--- a/db/PyMongoDataServer/PySysDB/tagActWeekParty.txt
+++ b/db/PyMongoDataServer/PySysDB/tagActWeekParty.txt
@@ -1,2 +1,2 @@
CfgID StartDate EndDate AdvanceMinutes IsDayReset ResetType LimitLV TemplateID PointAward
-1 8 15 300 1 1 110 [[1400,1500,1600,1700,1800,1900,2000,200,301,401,700,900,1000,1103,1200],[1400,1500,1600,1700,1800,1900,2000,201,302,401,700,900,1103,1200,2100],[1400,1500,1600,1700,1800,1900,2000,201,302,401,700,900,1103,1200,2400],[1400,1500,1600,1700,1800,1900,2000,201,302,401,700,900,1103,1200,2300],[1400,1500,1600,1700,1800,1900,2000,200,301,401,700,900,1000,1103,1200,2600],[1400,1500,1600,1700,1800,1900,2000,200,301,401,700,900,1000,1103,1200,2200],[1400,1500,1600,1700,1800,1900,2000,200,301,401,700,900,1000,1103,1200,2500]] {0:{330:[(1652,1,1)]},1:{350:[(5801,1,1)],410:[(5801,1,1)]},2:{350:[(5800,1,1)],410:[(5800,1,1)]},3:{350:[(5802,1,1)],410:[(5802,1,1)]},4:{380:[(4216,1,1)]},5:{380:[(62,1,1)]},6:{380:[(4221,1,1)]},}
+1 8 15 300 1 1 110 [[1400,1500,1600,1700,1800,1900,2000,200,301,401,700,900,1000,1103,1200],[1400,1500,1600,1700,1800,1900,2000,201,302,401,700,900,1103,1200,2200],[1400,1500,1600,1700,1800,1900,2000,201,302,401,700,900,1103,1200,2400],[1400,1500,1600,1700,1800,1900,2000,201,302,401,700,900,1103,1200,2300],[1400,1500,1600,1700,1800,1900,2000,200,301,401,700,900,1000,1103,1200,2600],[1400,1500,1600,1700,1800,1900,2000,200,301,401,700,900,1000,1103,1200,2100],[1400,1500,1600,1700,1800,1900,2000,200,301,401,700,900,1000,1103,1200,2500]] {0:{330:[(1652,1,1)]},1:{350:[(5801,1,1)],410:[(5801,1,1)]},2:{350:[(5800,1,1)],410:[(5800,1,1)]},3:{350:[(5802,1,1)],410:[(5802,1,1)]},4:{380:[(4216,1,1)]},5:{380:[(62,1,1)]},6:{380:[(4221,1,1)]},}
diff --git a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
index d8600b4..1491f58 100644
--- a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
@@ -62,7 +62,7 @@
BoursePriceLimit 2 100000000
BourseCharge 1 0
SkillXPAddByFB 31090|31060|31250 0 0 0 0
-SPSkillType {"1":[50005,50105,50405,1005,50205,55005,55105,55405,2005,55205],"2":[50035,50135,50435,1035,50235,55035,55135,55435,2035,55235],"3":[50065,50165,50465,1065,50265,55065,55165,55465,2065,55265],"4":[50305,50505,55305,55505],"5":[50335,50535,55335,55535],"6":[50365,50565,55365,55565],"7":[50605,50705,55605,55705],"8":[50635,50735,55635,55735],"9":[50665,50765,55665,55765],"10":[50805,51005,51105,55805,56005,56105],"11":[50835,51035,51135,55835,56035,56135],"12":[50865,51065,51165,55865,56065,56165]} 6000 {} 0 0
+SPSkillType {"1":[50005,50105,50405,1005,50205,55005,55105,55405,2005,55205],"2":[50035,50135,50435,1035,50235,55035,55135,55435,2035,55235],"3":[50065,50165,50465,1065,50265,55065,55165,55465,2065,55265],"4":[50305,50505,55305,55505],"5":[50335,50535,55335,55535],"6":[50365,50565,55365,55565],"7":[50605,50705,55605,55705],"8":[50635,50735,55635,55735],"9":[50665,50765,55665,55765],"10":[50805,51005,51105,55805,56005,56105],"11":[50835,51035,51135,55835,56035,56135],"12":[50865,51065,51165,55865,56065,56165]} 6000 {45000:"ZhuXianShenJi1",45100:"ZhuXianShenJi1",45001:"ZhuXianShenJi2",45101:"ZhuXianShenJi2",45002:"ZhuXianShenJi3",45102:"ZhuXianShenJi3"} 0 0
PassSkillEquipLimit {"0":{"level":70},"1":{"level":70},"2":{"OpenSkillSlots":2},"3":{"OpenSkillSlots":3},"4":{"OpenSkillSlots":4},"5":{"OpenSkillSlots":5}} 6 3 2_20005|3_20006|4_20007|5_20008
TalentResetBook 948 380
CreatRolePoint1 2_54|3_18|4_15|5_8 0 0 0 0
diff --git a/db/PyMongoDataServer/SysDB/tagChinItem.txt b/db/PyMongoDataServer/SysDB/tagChinItem.txt
index bbe0bfc..bd49cd3 100644
--- a/db/PyMongoDataServer/SysDB/tagChinItem.txt
+++ b/db/PyMongoDataServer/SysDB/tagChinItem.txt
@@ -1119,8 +1119,10 @@
5410 1 0 红2合成幸运草 126 0 1 0 0 999 1 1 1 0 1 0 0 0 0 0 1 50 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
5411 1 0 红3合成幸运草 126 0 1 0 0 999 1 1 1 0 1 0 0 0 0 0 1 100 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 5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
5412 1 0 洗炼必增符 126 0 1 0 0 999 1 1 1 0 1 0 0 0 0 0 1 5 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
-5413 1 0 诛仙原石 126 0 1 0 0 999 1 1 1 0 1 0 0 0 0 0 1 250 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
-5414 1 0 诛仙雷尘 126 0 1 0 0 999 1 1 1 0 1 0 0 0 0 0 1 500 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 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+5413 1 0 原石 126 0 1 0 0 999 1 1 1 0 1 0 0 0 0 0 1 250 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
+5414 1 0 雷尘 126 0 1 0 0 999 1 1 1 0 1 0 0 0 0 0 1 500 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 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+5415 1 0 高阶原石 126 0 1 0 0 999 1 1 1 0 1 0 0 0 0 0 1 250 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 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+5416 1 0 高阶雷尘 126 0 1 0 0 999 1 1 1 0 1 0 0 0 0 0 1 500 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
5700 1 0 熊猫公仔时装碎片 82 0 1 0 0 999 1 1 1 0 1 0 0 0 0 0 1 100 0 50 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 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
5701 1 0 魔幻大师时装碎片 82 0 1 0 0 999 1 1 1 0 1 0 0 0 0 0 1 100 0 50 0 0 0 0 0 6 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
5702 1 0 夏日狂欢时装碎片 82 0 1 0 0 999 1 1 1 0 1 0 0 0 0 0 1 100 0 50 0 0 0 0 0 9 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
diff --git a/db/PyMongoDataServer/SysDB/tagChinSkill.txt b/db/PyMongoDataServer/SysDB/tagChinSkill.txt
index 09287e8..59e8d1b 100644
--- a/db/PyMongoDataServer/SysDB/tagChinSkill.txt
+++ b/db/PyMongoDataServer/SysDB/tagChinSkill.txt
@@ -691,13 +691,13 @@
23107 复仇之刃（8层） 23100 8 10 0 0 0 5 0 0 0 0 0 0 0 0 0 0 0 0 0 9 8000 3 0 10 8000 3 0 7 8000 3 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 1200000 0 0 0 0 0 0 0 0 0 3 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 31160 0 0
23108 复仇之刃（9层） 23100 9 10 0 0 0 5 0 0 0 0 0 0 0 0 0 0 0 0 0 9 9000 3 0 10 9000 3 0 7 9000 3 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 1200000 0 0 0 0 0 0 0 0 0 3 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 31160 0 0
23109 复仇之刃（10层） 23100 10 10 0 0 0 5 0 0 0 0 0 0 0 0 0 0 0 0 0 9 10000 3 0 10 10000 3 0 7 10000 3 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 1200000 0 0 0 0 0 0 0 0 0 3 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 31160 0 0
-45000 诛仙一击 45000 1 1 2 13 0 7 0 0 0 0 0 0 0 1000 0 0 0 0 0 200 1000 1 0 201 5000 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 0 0 0 0 0 0 0 0 0 0 0 0 0 2 5000 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+45000 诛仙一击 45000 1 1 2 13 0 20 0 0 0 0 0 0 0 1000 0 0 0 0 0 200 1000 1 0 201 5000 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 0 0 0 0 0 0 0 0 0 0 0 0 0 2 5000 0 0 0 0 0 0 0 0 0 0 0 0 0 0
45001 唯快不破 45001 1 1 2 13 0 16 1 0 0 0 10 0 0 1000 0 0 0 0 0 17 10000 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 500 10000 0 0 0 0 0 0 0 0 0 0 0 0 2 6000 0 0 0 0 0 0 0 0 0 0 0 0 0 0
45002 终极斩杀 45002 1 1 2 13 0 7 1 0 0 0 0 0 0 1000 0 0 0 0 0 4069 2500 2500 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 0 0 0 0 0 0 0 0 2 7000 0 0 0 0 0 0 0 4 0 0 0 0 0 0
-45100 诛仙一击 45100 1 1 4 13 0 7 0 0 0 0 0 0 0 1000 0 0 0 0 0 200 1000 1 0 201 5000 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 0 0 0 0 0 0 0 0 0 0 0 0 0 2 5000 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+45100 诛仙一击 45100 1 1 4 13 0 20 0 0 0 0 0 0 0 1000 0 0 0 0 0 200 1000 1 0 201 5000 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 0 0 0 0 0 0 0 0 0 0 0 0 0 2 5000 0 0 0 0 0 0 0 0 0 0 0 0 0 0
45101 唯快不破 45101 1 1 4 13 0 16 1 0 0 0 10 0 0 1000 0 0 0 0 0 17 10000 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 500 10000 0 0 0 0 0 0 0 0 0 0 0 0 2 6000 0 0 0 0 0 0 0 0 0 0 0 0 0 0
45102 终极斩杀 45102 1 1 4 13 0 7 1 0 0 0 0 0 0 1000 0 0 0 0 0 4069 2500 2500 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 0 0 0 0 0 0 0 0 2 7000 0 0 0 0 0 0 0 4 0 0 0 0 0 0
-45200 诛仙一击 45200 1 1 8 13 0 7 0 0 0 0 0 0 0 1000 0 0 0 0 0 200 1000 1 0 201 5000 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 0 0 0 0 0 0 0 0 0 0 0 0 0 2 5000 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+45200 诛仙一击 45200 1 1 8 13 0 20 0 0 0 0 0 0 0 1000 0 0 0 0 0 200 1000 1 0 201 5000 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 0 0 0 0 0 0 0 0 0 0 0 0 0 2 5000 0 0 0 0 0 0 0 0 0 0 0 0 0 0
45201 唯快不破 45201 1 1 8 13 0 16 1 0 0 0 10 0 0 1000 0 0 0 0 0 17 10000 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 500 10000 0 0 0 0 0 0 0 0 0 0 0 0 2 6000 0 0 0 0 0 0 0 0 0 0 0 0 0 0
45202 终极斩杀 45202 1 1 8 13 0 7 1 0 0 0 0 0 0 1000 0 0 0 0 0 4069 2500 2500 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 0 0 0 0 0 0 0 0 2 7000 0 0 0 0 0 0 0 4 0 0 0 0 0 0
46000 强健之体 46000 1 2 0 12 0 23 0 0 0 0 0 0 0 0 0 0 0 0 0 551 1800 7 3 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 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
--
Gitblit v1.8.0