From 9a33f7bd2777a963fa4341b64df5c5a44f86f4e2 Mon Sep 17 00:00:00 2001
From: cehua-HWJ35 <hwj35@163.com>
Date: 星期三, 30 一月 2019 14:40:53 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server
---
db/PyMongoDataServer/PySysDB/tagActFeastWeekParty.txt | 2 +-
db/PyMongoDataServer/SysDB/tagChinSkill.txt | 10 +++++-----
db/PyMongoDataServer/PySysDB/tagFuncConfig.txt | 2 +-
db/PyMongoDataServer/PySysDB/tagFeastWeekParty.txt | 3 +++
CoreServerGroup/GameServer/PySysDB/tagActFeastWeekParty.txt | 2 +-
5 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/CoreServerGroup/GameServer/PySysDB/tagActFeastWeekParty.txt b/CoreServerGroup/GameServer/PySysDB/tagActFeastWeekParty.txt
index 8129fb2..f4b50d5 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagActFeastWeekParty.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagActFeastWeekParty.txt
@@ -1,2 +1,2 @@
CfgID ActMark PlatformList ServerIDList StartDate EndDate AdvanceMinutes IsDayReset ResetType NotifyInfoStart NotifyInfoEnd LimitLV
-1 OpenSever1 [] [] 2019-1-25 2019-2-1 300 1 1 {0:["SevenDayStart", []],30:["SevenDayStart", []],60:["SevenDayStart", []],180:["SevenDayStart", []],360:["SevenDayStart", []]} {-60:["SevenDayEnd", []],-30:["SevenDayEnd", []],0:["SevenDayOver", []]} 110
+1 OpenSever1 [] [] 2019-2-4 2019-2-11 300 1 1 {0:["SevenDayStart", []],30:["SevenDayStart", []],60:["SevenDayStart", []],180:["SevenDayStart", []],360:["SevenDayStart", []]} {-60:["SevenDayEnd", []],-30:["SevenDayEnd", []],0:["SevenDayOver", []]} 110
diff --git a/db/PyMongoDataServer/PySysDB/tagActFeastWeekParty.txt b/db/PyMongoDataServer/PySysDB/tagActFeastWeekParty.txt
index cf992f2..b5a9d62 100644
--- a/db/PyMongoDataServer/PySysDB/tagActFeastWeekParty.txt
+++ b/db/PyMongoDataServer/PySysDB/tagActFeastWeekParty.txt
@@ -1,2 +1,2 @@
CfgID StartDate EndDate AdvanceMinutes IsDayReset ResetType LimitLV TemplateID PointAward
-1 2019-1-25 2019-2-1 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)]},}
+1 2019-2-4 2019-2-11 300 1 1 110 [[2000,200,303,401,702,1001,1103,1201],[2000,200,303,401,702,1001,1103,1201],[2000,200,303,401,702,1001,1103,1201],[2000,200,303,401,702,1001,1103,1201],[2000,200,303,401,702,1001,1103,1201],[2000,200,303,401,702,1001,1103,1201],[2000,200,303,401,702,1001,1103,1201]] {0:{160:[(2475,1,1)],210:[(5810,1,1)]},1:{160:[(2475,1,1)],210:[(1653,1,1)]},2:{160:[(2475,1,1)],210:[(5809,1,1)]},3:{160:[(2475,1,1)],210:[(5811,1,1)]},4:{160:[(2475,1,1)],210:[(5810,1,1)]},5:{160:[(2475,1,1)],210:[(67,1,1)]},6:{160:[(2475,1,1)],210:[(5809,1,1)]},7:{160:[(2475,1,1)],210:[(5811,1,1)]},}
diff --git a/db/PyMongoDataServer/PySysDB/tagFeastWeekParty.txt b/db/PyMongoDataServer/PySysDB/tagFeastWeekParty.txt
index f7b0209..367e829 100644
--- a/db/PyMongoDataServer/PySysDB/tagFeastWeekParty.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFeastWeekParty.txt
@@ -5,16 +5,19 @@
300 3 2 1 [(2426,1,1),(882,1,1)] 10
301 3 3 1 [(2426,1,1),(882,1,1)] 10
302 3 5 1 [(2426,1,1),(882,1,1)] 10
+303 3 4 1 [(2426,1,1),(882,1,1)] 10
400 4 2 1 [(2426,1,1),(882,1,1)] 10
401 4 3 1 [(2426,1,1),(882,1,1)] 10
500 5 5 1 [(2426,1,1),(882,1,1)] 10
600 6 50 50 [(2426,1,1),(882,1,1)] 10
700 7 3 1 [(2426,1,1),(882,1,1)] 10
701 7 4 1 [(2426,1,1),(882,1,1)] 10
+702 7 1 1 [(2426,1,1),(882,1,1)] 10
800 8 1 1 [(2426,1,1),(882,1,1)] 10
900 9 5 1 [(2426,1,1),(882,1,1)] 10
901 9 8 1 [(2426,1,1),(882,1,1)] 10
1000 10 1 1 [(2426,1,1),(882,1,1)] 10
+1001 10 2 1 [(2426,1,1),(882,1,1)] 10
1100 11 5 5 [(2427,1,1),(882,1,1)] 25
1101 11 10 5 [(2427,1,1),(882,1,1)] 25
1102 11 15 5 [(2427,1,1),(882,1,1)] 25
diff --git a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
index 5740062..8e3ae57 100644
--- a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
@@ -226,7 +226,7 @@
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
-NeutralMapExpAward {(21070,21100,21110,32020):[500,'int(0.6*reExp)']}
+NeutralMapExpAward {(21070,21100,21110,32020,31230):[500,'int(0.6*reExp)']}
DungeonDeliver 31020|31030|31150|31031
DungeonIntegral 2000
BuyFBCntCost {"31080":"35","31140":"20","52010":"20+min(max(hasBuyCnt-1,0),1)*10+min(max(hasBuyCnt-3,0),1)*10+min(max(hasBuyCnt-5,0),1)*10+min(max(hasBuyCnt-7,0),1)*10+min(max(hasBuyCnt-9,0),1)*20","31190":"30","51010":"50","31380":"50"}
diff --git a/db/PyMongoDataServer/SysDB/tagChinSkill.txt b/db/PyMongoDataServer/SysDB/tagChinSkill.txt
index cdb1662..236c480 100644
--- a/db/PyMongoDataServer/SysDB/tagChinSkill.txt
+++ b/db/PyMongoDataServer/SysDB/tagChinSkill.txt
@@ -892,11 +892,11 @@
45550 福瑞健体 45550 1 1 0 6 0 20 0 0 0 0 111 0 0 0 0 0 0 0 0 7 13822 1 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 13822 0 0 0 0 0 0 0 0 0 0 0 0 0 0
48551 福瑞强攻 48551 1 1 0 6 0 20 0 0 0 0 111 0 0 0 0 0 0 0 0 9 1244 1 0 10 1244 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 24888 0 0 0 0 0 0 0 0 0 0 0 0 0 0
48552 福瑞守护 48552 1 1 0 6 0 16 0 0 0 0 111 0 0 30000 0 0 0 0 0 2106 0 0 0 20 2000 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 62173 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-48560 魔龙健体 48560 1 1 0 6 0 20 0 0 0 0 111 0 0 0 0 0 0 0 0 7 19377 1 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 19377 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-48561 魔龙强攻 48561 1 1 0 6 0 20 0 0 0 0 111 0 0 0 0 0 0 0 0 9 1743 1 0 10 1743 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 34869 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-48562 魔龙守护 48562 1 1 0 6 0 7 0 0 0 0 0 0 0 0 0 0 0 0 0 4005 5000 10000 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 87219 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-48563 魔龙之体 48563 1 1 0 6 0 16 0 0 0 0 111 0 0 50000 0 0 0 0 0 2105 0 0 0 4521 6000 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 218035 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-48564 魔龙法身 48564 1 1 0 6 0 16 0 0 0 0 111 0 0 15000 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 10000 1000 0 0 0 0 0 0 0 0 0 0 0 0 2 654026 0 0 0 3 511 511 3 0 0 0 0 0 0 0
+48560 神牛健体 48560 1 1 0 6 0 20 0 0 0 0 111 0 0 0 0 0 0 0 0 7 19377 1 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 19377 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+48561 神牛强攻 48561 1 1 0 6 0 20 0 0 0 0 111 0 0 0 0 0 0 0 0 9 1743 1 0 10 1743 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 34869 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+48562 神牛蛮力 48562 1 1 0 6 0 7 0 0 0 0 0 0 0 0 0 0 0 0 0 4005 5000 10000 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 87219 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+48563 神牛之体 48563 1 1 0 6 0 16 0 0 0 0 111 0 0 50000 0 0 0 0 0 2105 0 0 0 4521 6000 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 218035 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+48564 神牛法相 48564 1 1 0 6 0 16 0 0 0 0 111 0 0 15000 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 10000 1000 0 0 0 0 0 0 0 0 0 0 0 0 2 654026 0 0 0 3 511 511 3 0 0 0 0 0 0 0
49000 全能 49000 1 1 0 5 0 20 0 0 0 0 0 0 0 0 0 0 0 0 0 7 1038 1 0 9 51 1 0 10 51 1 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 2076 0 0 0 0 0 0 0 0 0 0 0 0 0 0
49005 玄冥 49005 1 1 0 5 0 20 0 0 0 0 0 0 0 0 0 0 0 0 0 511 2 6 500 511 2 7 500 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 5195 0 0 0 0 0 0 0 0 0 0 0 0 0 0
49010 全费 49010 1 1 0 5 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 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
--
Gitblit v1.8.0