diff --git a/AssetStorage.txt b/AssetStorage.txt
index be4a43c03..54d8c22a1 100644
--- a/AssetStorage.txt
+++ b/AssetStorage.txt
@@ -1,7 +1,7 @@
-~2050539498
-@FgoDataVersion0066,20160420_1,20220311_17:18
+~4157565702
+@FgoDataVersion0066,20160420_1,20220322_16:18
9415133d0638e3c6a938c3002b8385692d7b2b9b,DATA0,5113408,787437972,ADV/1000000,,1
-f1ef210b761113a4584fc447d9ad35681073fb45,DATA0,279040,3331094437,Android,,
+066c42920462b051832418bbf4a687b152d33180,DATA0,279040,1195722447,Android,,
cc8c789ef357bdf1ddc14b35394d2905f0885e3e,SYSTEM,7467144,694688279,Audio/Battle.cpk.bytes,,
c19557cba621d2b96ea32fc309a2168a1c4ecf26,DATA0,1896584,1822905443,Audio/Bgm/BGM_AMAZONES.cpk.bytes,,
2d8fffa13cfb05357521bef4f8b9f14e1f826a6a,SYSTEM,3133576,2361780594,Audio/Bgm/BGM_APO_1.cpk.bytes,,
@@ -14635,10 +14635,10 @@ c9504da421f68323f9c8a40cb5e9676aff1e2683,DATA0,77312,2620482271,Servants/Status/
a3f1fe47ba85dc6782b1e63b46886df3a03fbfb4,DATA0,42688,2226363914,Servants/Status/9942510,,1
6ae4c76c545765b2f0a8697ec6a8391a2f33e786,SYSTEM,970112,2861768057,ShopBanners/DownloadShopBannerAtlas1,,1
f8c70a3a728cda455dc3e2382c1175f59589f3ce,SYSTEM,1469056,1895972291,ShopBanners/DownloadShopBannerAtlas2,,1
-f51665f9cfa44ab8e7560f8e03a0d20373f83a4d,SYSTEM,269056,4044862188,ShopBanners/DownloadShopBannerAtlas3,,1
+a108e209642f48654d01cb66ec8e77758392c042,SYSTEM,317920,558411618,ShopBanners/DownloadShopBannerAtlas3,,1
3d7da492c222b26fd76277d80e9eede54f8db14c,SYSTEM,669664,4271840861,SkillIcons/DownloadSkillIcon,,1
-58eeabf0b007583f3886c4dc7dbb1ea69632bade,SYSTEM,1633408,2249936405,SummonBanners/DownloadSummonBannerAtlas1,,1
-0c50b849b31e35634362420eb11ad4d596e3ccc3,SYSTEM,1021824,3112378511,SummonBanners/DownloadSummonBannerAtlas2,,1
+71725f0e6aeddcda2d77fc701b517c1dbed3e267,SYSTEM,1454528,3442496569,SummonBanners/DownloadSummonBannerAtlas1,,1
+f586a4ae71ff1ee395655de73f157bdafa365ff7,SYSTEM,903040,2964583605,SummonBanners/DownloadSummonBannerAtlas2,,1
cf82059cfc03e22d80c81b55b2f3be33b74a2b80,SYSTEM,1059776,904989455,SummonBanners/DownloadSummonBannerAtlas3,,1
cf0bc0649267f5614bc0df2bebe06ba63555615a,SYSTEM,923776,3128060889,SummonBanners/DownloadSummonBannerAtlas4,,1
e29046f76926bfc373d8efd4adf3721d232fcb38,SYSTEM,1018976,2821427854,SummonBanners/DownloadSummonBannerAtlas5,,1
diff --git a/gamedatatop.json b/gamedatatop.json
index b712d35b4..f5075f350 100644
--- a/gamedatatop.json
+++ b/gamedatatop.json
@@ -3,7 +3,7 @@
{
"resCode": "00",
"success": {
- "version": 293,
+ "version": 294,
"master": "",
"useProtoBuf": 1,
"isCloseSvtGetEffect": "0000",
@@ -16,7 +16,7 @@
"FixVersion_iOS": 2021112600,
"voiceLabelSet": 1,
"npVoiceLabelSet": 1,
- "assetStorageVersion": 202203111715
+ "assetStorageVersion": 202203221615
},
"fail": {},
"nid": "gamedata"
diff --git a/master/mstBanner.json b/master/mstBanner.json
index 1e7d630ae..a84ac97db 100644
--- a/master/mstBanner.json
+++ b/master/mstBanner.json
@@ -502,4 +502,28 @@
"deviceType": 0,
"dialogImage": "0",
"dialogText": "0"
+}, {
+ "id": 80283,
+ "bannerId": 80283,
+ "bannerPriority": 112,
+ "terminalBannerPriority": 112,
+ "noticeAt": 1648098000,
+ "finishedAt": 1649307599,
+ "linkType": 1,
+ "linkBody": "https://line1-patch.fate-go.com.tw/manage/html/Notice/Game/tw/2022-03-16/activityNotice_3268_1647420176.html",
+ "deviceType": 0,
+ "dialogImage": "0",
+ "dialogText": "0"
+}, {
+ "id": 80284,
+ "bannerId": 80284,
+ "bannerPriority": 111,
+ "terminalBannerPriority": 111,
+ "noticeAt": 1648108800,
+ "finishedAt": 1648702799,
+ "linkType": 1,
+ "linkBody": "https://line1-patch.fate-go.com.tw/manage/html/Notice/Game/tw/2022-03-16/activityNotice_3267_1647419380.html",
+ "deviceType": 0,
+ "dialogImage": "0",
+ "dialogText": "0"
}]
\ No newline at end of file
diff --git a/master/mstEvent.json b/master/mstEvent.json
index 479f03938..1a2ab2657 100644
--- a/master/mstEvent.json
+++ b/master/mstEvent.json
@@ -5483,4 +5483,29 @@
"myroomBgmId": 0,
"script": [],
"shortName": ""
+}, {
+ "id": 80295,
+ "baseEventId": 0,
+ "type": 12,
+ "openType": 1,
+ "name": "狩獵任務 第8彈",
+ "detail": "狩獵任務",
+ "noticeBannerId": 0,
+ "bannerId": 0,
+ "iconId": 0,
+ "bannerPriority": 0,
+ "openHours": 0,
+ "intervalHours": 0,
+ "noticeAt": 1648098000,
+ "startedAt": 1648098000,
+ "endedAt": 1648702799,
+ "finishedAt": 1648702799,
+ "materialOpenedAt": 1751299200,
+ "linkType": 1,
+ "linkBody": "/summon/detail_summon_1.html",
+ "deviceType": 0,
+ "myroomBgId": 0,
+ "myroomBgmId": 0,
+ "script": [],
+ "shortName": ""
}]
\ No newline at end of file
diff --git a/master/mstEventMission.json b/master/mstEventMission.json
index ca342392d..2f4a34629 100644
--- a/master/mstEventMission.json
+++ b/master/mstEventMission.json
@@ -36756,10 +36756,10 @@
"type": 2
}, {
"bannerGroup": 0,
- "closedAt": 499875200,
+ "closedAt": 1649606399,
"detail": "完成本週所有的御主任務",
"dispNo": 1,
- "endedAt": 499875200,
+ "endedAt": 1649001599,
"flag": 0,
"giftId": 419,
"id": 2001442,
@@ -36770,14 +36770,14 @@
"priority": 2000785,
"rewardRarity": 0,
"rewardType": 1,
- "startedAt": 499875200,
+ "startedAt": 1648396800,
"type": 2
}, {
"bannerGroup": 0,
- "closedAt": 499875200,
+ "closedAt": 1649606399,
"detail": "擊敗20個敵人(從者以及部分Boss除外)",
"dispNo": 2,
- "endedAt": 499875200,
+ "endedAt": 1649001599,
"flag": 0,
"giftId": 419,
"id": 2001443,
@@ -36788,14 +36788,14 @@
"priority": 2000786,
"rewardRarity": 0,
"rewardType": 1,
- "startedAt": 499875200,
+ "startedAt": 1648396800,
"type": 2
}, {
"bannerGroup": 0,
- "closedAt": 499875200,
+ "closedAt": 1649606399,
"detail": "擊敗40個敵人(從者以及部分Boss除外)",
"dispNo": 3,
- "endedAt": 499875200,
+ "endedAt": 1649001599,
"flag": 0,
"giftId": 419,
"id": 2001444,
@@ -36806,14 +36806,14 @@
"priority": 2000787,
"rewardRarity": 0,
"rewardType": 1,
- "startedAt": 499875200,
+ "startedAt": 1648396800,
"type": 2
}, {
"bannerGroup": 0,
- "closedAt": 499875200,
+ "closedAt": 1649606399,
"detail": "擊敗3騎持有『王』特性的從者",
"dispNo": 4,
- "endedAt": 499875200,
+ "endedAt": 1649001599,
"flag": 0,
"giftId": 419,
"id": 2001445,
@@ -36824,14 +36824,14 @@
"priority": 2000788,
"rewardRarity": 0,
"rewardType": 1,
- "startedAt": 499875200,
+ "startedAt": 1648396800,
"type": 2
}, {
"bannerGroup": 0,
- "closedAt": 499875200,
+ "closedAt": 1649606399,
"detail": "擊敗3騎持有『神性』特性的從者",
"dispNo": 5,
- "endedAt": 499875200,
+ "endedAt": 1649001599,
"flag": 0,
"giftId": 419,
"id": 2001446,
@@ -36842,14 +36842,14 @@
"priority": 2000789,
"rewardRarity": 0,
"rewardType": 1,
- "startedAt": 499875200,
+ "startedAt": 1648396800,
"type": 2
}, {
"bannerGroup": 0,
- "closedAt": 499875200,
+ "closedAt": 1649606399,
"detail": "擊敗15個持有『天』之力的敵人",
"dispNo": 6,
- "endedAt": 499875200,
+ "endedAt": 1649001599,
"flag": 0,
"giftId": 419,
"id": 2001447,
@@ -36860,14 +36860,14 @@
"priority": 2000790,
"rewardRarity": 0,
"rewardType": 1,
- "startedAt": 499875200,
+ "startedAt": 1648396800,
"type": 2
}, {
"bannerGroup": 0,
- "closedAt": 499875200,
+ "closedAt": 1649606399,
"detail": "擊敗15個持有『女性』特性的敵人",
"dispNo": 7,
- "endedAt": 499875200,
+ "endedAt": 1649001599,
"flag": 0,
"giftId": 419,
"id": 2001448,
@@ -36878,7 +36878,7 @@
"priority": 2000791,
"rewardRarity": 0,
"rewardType": 1,
- "startedAt": 499875200,
+ "startedAt": 1648396800,
"type": 2
}, {
"bannerGroup": 0,
diff --git a/master/mstGacha.json b/master/mstGacha.json
index ae82b94af..1123469a3 100644
--- a/master/mstGacha.json
+++ b/master/mstGacha.json
@@ -6946,4 +6946,40 @@
"ticketItemId": 4001,
"type": 1,
"warId": 100
+}, {
+ "adjustId": 50005591,
+ "bannerQuestId": 1000002,
+ "bannerQuestPhase": 1,
+ "baseId": 20046,
+ "beforeDrawNum": 1,
+ "beforeGachaId": 101,
+ "closedAt": 1649307599,
+ "condQuestId": 1000002,
+ "condQuestPhase": 1,
+ "detailUrl": "",
+ "drawNum1": 1,
+ "drawNum2": 11,
+ "extraAddCount1": 1,
+ "extraAddCount2": 0,
+ "extraGroupId1": 57,
+ "extraGroupId2": 0,
+ "freeDrawFlag": 0,
+ "gachaGroupId": 0,
+ "gachaProbabilityId": 5001727,
+ "gachaSlot": 21,
+ "id": 5001727,
+ "imageId": 81239,
+ "maxDrawNum": 0,
+ "name": "包含泳裝的全體攻擊寶具從者PICK",
+ "openedAt": 1648098000,
+ "pickupClosedAt": 1649307599,
+ "pickupId": 50007082,
+ "pickupOpenedAt": 1648098000,
+ "priority": 5001727,
+ "rarityId": 3,
+ "shopId1": 4,
+ "shopId2": 5,
+ "ticketItemId": 4001,
+ "type": 1,
+ "warId": 100
}]
\ No newline at end of file
diff --git a/master/mstGachaSub.json b/master/mstGachaSub.json
index fe50bcbfc..dbfe10142 100644
--- a/master/mstGachaSub.json
+++ b/master/mstGachaSub.json
@@ -118,4 +118,12 @@
"adjustAddId": 79,
"openedAt": 1646110800,
"closedAt": 1647320399
+}, {
+ "gachaId": 1,
+ "id": 80,
+ "priority": 80,
+ "imageId": 80,
+ "adjustAddId": 80,
+ "openedAt": 1648098000,
+ "closedAt": 1648702799
}]
\ No newline at end of file
diff --git a/master/mstMasterMission.json b/master/mstMasterMission.json
index b14a1f266..1ad3d8e2e 100644
--- a/master/mstMasterMission.json
+++ b/master/mstMasterMission.json
@@ -1655,13 +1655,13 @@
"priority": 0,
"startedAt": 1647792000
}, {
- "closedAt": 4294967295,
- "endedAt": 4294967295,
+ "closedAt": 1649606399,
+ "endedAt": 1649001599,
"id": 100209,
"imageId": 0,
"name": "0",
"priority": 0,
- "startedAt": 4294967295
+ "startedAt": 1648396800
}, {
"closedAt": 4294967295,
"endedAt": 4294967295,
diff --git a/master/mstNpVoiceCaptions.json b/master/mstNpVoiceCaptions.json
index d0b099804..94f287350 100644
--- a/master/mstNpVoiceCaptions.json
+++ b/master/mstNpVoiceCaptions.json
@@ -507,17 +507,17 @@
"id": "11_B050",
"face": 4,
"delay": 0,
- "text": "這正是，毀滅吾父王之邪劍。"
+ "text": "這正是，"
}, {
"id": "11_B051",
"face": 4,
"delay": 0.05299997,
- "text": "『對吾華貴父王的"
+ "text": "毀滅吾父王之邪劍。"
}, {
"id": "11_B052",
"face": 4,
"delay": 0.5400002,
- "text": "叛逆』！"
+ "text": "『對吾華貴父王的叛逆』！"
}],
"conds": [{
"condType": 13,
@@ -4221,7 +4221,7 @@
"id": "0_B052",
"face": 0,
"delay": 1.1,
- "text": "『天使在吶喊，則惡魔於影中消逝』！！",
+ "text": "『天使吶喊，惡魔便於影中消逝』！！",
"form": 0
}],
"conds": []
@@ -4242,7 +4242,7 @@
"id": "0_B802",
"face": 0,
"delay": 0.49,
- "text": "『天使在吶喊，則惡魔於影中消逝』！",
+ "text": "『天使吶喊，惡魔便於影中消逝』！",
"form": 0
}],
"conds": []
@@ -7537,7 +7537,7 @@
"id": "0_B054",
"face": 0,
"delay": 0.55,
- "text": "『混元一陣』！」",
+ "text": "『混元一陣』！",
"form": 0
}],
"conds": []
@@ -7597,7 +7597,7 @@
"id": "0_B814",
"face": 0,
"delay": 1.12,
- "text": "豈能破解得了？」",
+ "text": "豈能破解得了？",
"form": 0
}],
"conds": []
@@ -11997,7 +11997,7 @@
"id": "0_B800",
"face": 0,
"delay": 0.0,
- "text": "遠老的神秘，斷絕於死亡。",
+ "text": "遠古的神秘，斷絕於死亡。",
"form": 0
}, {
"id": "0_B801",
diff --git a/master/mstQuest.json b/master/mstQuest.json
index d40411d72..54bbddc4f 100644
--- a/master/mstQuest.json
+++ b/master/mstQuest.json
@@ -258910,6 +258910,774 @@
"scriptQuestId": 0,
"spotId": 908704,
"type": 5
+}, {
+ "actConsume": 30,
+ "afterActionVals": [],
+ "afterClear": 3,
+ "bannerId": 94003601,
+ "bannerType": 0,
+ "beforeActionVals": [],
+ "chaldeaGateCategory": 1,
+ "chapterId": 0,
+ "chapterSubId": 0,
+ "chapterSubStr": "",
+ "charaIconId": 0,
+ "closedAt": 1648195199,
+ "consumeType": 1,
+ "displayHours": 0,
+ "flag": 0,
+ "forceOperation": 0,
+ "giftIconId": 0,
+ "giftId": 302,
+ "hasStartAction": 1,
+ "iconId": 94052101,
+ "id": 94052101,
+ "intervalHours": 0,
+ "name": "雙足飛龍．狩獵 開位級",
+ "nameRuby": "",
+ "noticeAt": 1648098000,
+ "openedAt": 1648098000,
+ "priority": 94052199,
+ "recommendLv": "50",
+ "scriptQuestId": 0,
+ "spotId": 999999,
+ "type": 5
+}, {
+ "actConsume": 35,
+ "afterActionVals": [],
+ "afterClear": 3,
+ "bannerId": 94003602,
+ "bannerType": 0,
+ "beforeActionVals": [],
+ "chaldeaGateCategory": 1,
+ "chapterId": 0,
+ "chapterSubId": 0,
+ "chapterSubStr": "",
+ "charaIconId": 0,
+ "closedAt": 1648195199,
+ "consumeType": 1,
+ "displayHours": 0,
+ "flag": 0,
+ "forceOperation": 0,
+ "giftIconId": 0,
+ "giftId": 303,
+ "hasStartAction": 1,
+ "iconId": 94052101,
+ "id": 94052102,
+ "intervalHours": 0,
+ "name": "雙足飛龍．狩獵 祭位級",
+ "nameRuby": "",
+ "noticeAt": 1648098000,
+ "openedAt": 1648098000,
+ "priority": 94052198,
+ "recommendLv": "75",
+ "scriptQuestId": 0,
+ "spotId": 999999,
+ "type": 5
+}, {
+ "actConsume": 40,
+ "afterActionVals": [],
+ "afterClear": 3,
+ "bannerId": 94003603,
+ "bannerType": 0,
+ "beforeActionVals": [],
+ "chaldeaGateCategory": 1,
+ "chapterId": 0,
+ "chapterSubId": 0,
+ "chapterSubStr": "",
+ "charaIconId": 0,
+ "closedAt": 1648195199,
+ "consumeType": 1,
+ "displayHours": 0,
+ "flag": 0,
+ "forceOperation": 0,
+ "giftIconId": 0,
+ "giftId": 304,
+ "hasStartAction": 1,
+ "iconId": 94052101,
+ "id": 94052103,
+ "intervalHours": 0,
+ "name": "雙足飛龍．狩獵 典位級",
+ "nameRuby": "",
+ "noticeAt": 1648098000,
+ "openedAt": 1648098000,
+ "priority": 94052197,
+ "recommendLv": "90",
+ "scriptQuestId": 0,
+ "spotId": 999999,
+ "type": 5
+}, {
+ "actConsume": 40,
+ "afterActionVals": [],
+ "afterClear": 3,
+ "bannerId": 94052101,
+ "bannerType": 0,
+ "beforeActionVals": [],
+ "chaldeaGateCategory": 1,
+ "chapterId": 0,
+ "chapterSubId": 0,
+ "chapterSubStr": "",
+ "charaIconId": 0,
+ "closedAt": 1648195199,
+ "consumeType": 1,
+ "displayHours": 0,
+ "flag": 0,
+ "forceOperation": 0,
+ "giftIconId": 0,
+ "giftId": 305,
+ "hasStartAction": 1,
+ "iconId": 94052101,
+ "id": 94052104,
+ "intervalHours": 0,
+ "name": "雙足飛龍．狩獵 典位+級",
+ "nameRuby": "",
+ "noticeAt": 1648098000,
+ "openedAt": 1648098000,
+ "priority": 94052196,
+ "recommendLv": "90+",
+ "scriptQuestId": 0,
+ "spotId": 999999,
+ "type": 5
+}, {
+ "actConsume": 30,
+ "afterActionVals": [],
+ "afterClear": 3,
+ "bannerId": 94003601,
+ "bannerType": 0,
+ "beforeActionVals": [],
+ "chaldeaGateCategory": 1,
+ "chapterId": 0,
+ "chapterSubId": 0,
+ "chapterSubStr": "",
+ "charaIconId": 0,
+ "closedAt": 1648281599,
+ "consumeType": 1,
+ "displayHours": 0,
+ "flag": 0,
+ "forceOperation": 0,
+ "giftIconId": 0,
+ "giftId": 302,
+ "hasStartAction": 1,
+ "iconId": 94052102,
+ "id": 94052105,
+ "intervalHours": 0,
+ "name": "自動防衛裝置．狩獵 開位級",
+ "nameRuby": "",
+ "noticeAt": 1648195200,
+ "openedAt": 1648195200,
+ "priority": 94052195,
+ "recommendLv": "50",
+ "scriptQuestId": 0,
+ "spotId": 999999,
+ "type": 5
+}, {
+ "actConsume": 35,
+ "afterActionVals": [],
+ "afterClear": 3,
+ "bannerId": 94003602,
+ "bannerType": 0,
+ "beforeActionVals": [],
+ "chaldeaGateCategory": 1,
+ "chapterId": 0,
+ "chapterSubId": 0,
+ "chapterSubStr": "",
+ "charaIconId": 0,
+ "closedAt": 1648281599,
+ "consumeType": 1,
+ "displayHours": 0,
+ "flag": 0,
+ "forceOperation": 0,
+ "giftIconId": 0,
+ "giftId": 303,
+ "hasStartAction": 1,
+ "iconId": 94052102,
+ "id": 94052106,
+ "intervalHours": 0,
+ "name": "自動防衛裝置．狩獵 祭位級",
+ "nameRuby": "",
+ "noticeAt": 1648195200,
+ "openedAt": 1648195200,
+ "priority": 94052194,
+ "recommendLv": "75",
+ "scriptQuestId": 0,
+ "spotId": 999999,
+ "type": 5
+}, {
+ "actConsume": 40,
+ "afterActionVals": [],
+ "afterClear": 3,
+ "bannerId": 94003603,
+ "bannerType": 0,
+ "beforeActionVals": [],
+ "chaldeaGateCategory": 1,
+ "chapterId": 0,
+ "chapterSubId": 0,
+ "chapterSubStr": "",
+ "charaIconId": 0,
+ "closedAt": 1648281599,
+ "consumeType": 1,
+ "displayHours": 0,
+ "flag": 0,
+ "forceOperation": 0,
+ "giftIconId": 0,
+ "giftId": 304,
+ "hasStartAction": 1,
+ "iconId": 94052102,
+ "id": 94052107,
+ "intervalHours": 0,
+ "name": "自動防衛裝置．狩獵 典位級",
+ "nameRuby": "",
+ "noticeAt": 1648195200,
+ "openedAt": 1648195200,
+ "priority": 94052193,
+ "recommendLv": "90",
+ "scriptQuestId": 0,
+ "spotId": 999999,
+ "type": 5
+}, {
+ "actConsume": 40,
+ "afterActionVals": [],
+ "afterClear": 3,
+ "bannerId": 94052101,
+ "bannerType": 0,
+ "beforeActionVals": [],
+ "chaldeaGateCategory": 1,
+ "chapterId": 0,
+ "chapterSubId": 0,
+ "chapterSubStr": "",
+ "charaIconId": 0,
+ "closedAt": 1648281599,
+ "consumeType": 1,
+ "displayHours": 0,
+ "flag": 0,
+ "forceOperation": 0,
+ "giftIconId": 0,
+ "giftId": 305,
+ "hasStartAction": 1,
+ "iconId": 94052102,
+ "id": 94052108,
+ "intervalHours": 0,
+ "name": "自動防衛裝置．狩獵 典位+級",
+ "nameRuby": "",
+ "noticeAt": 1648195200,
+ "openedAt": 1648195200,
+ "priority": 94052192,
+ "recommendLv": "90+",
+ "scriptQuestId": 0,
+ "spotId": 999999,
+ "type": 5
+}, {
+ "actConsume": 30,
+ "afterActionVals": [],
+ "afterClear": 3,
+ "bannerId": 94003601,
+ "bannerType": 0,
+ "beforeActionVals": [],
+ "chaldeaGateCategory": 1,
+ "chapterId": 0,
+ "chapterSubId": 0,
+ "chapterSubStr": "",
+ "charaIconId": 0,
+ "closedAt": 1648367999,
+ "consumeType": 1,
+ "displayHours": 0,
+ "flag": 0,
+ "forceOperation": 0,
+ "giftIconId": 0,
+ "giftId": 302,
+ "hasStartAction": 1,
+ "iconId": 94052103,
+ "id": 94052109,
+ "intervalHours": 0,
+ "name": "蛇女．狩獵 開位級",
+ "nameRuby": "",
+ "noticeAt": 1648281600,
+ "openedAt": 1648281600,
+ "priority": 94052191,
+ "recommendLv": "50",
+ "scriptQuestId": 0,
+ "spotId": 999999,
+ "type": 5
+}, {
+ "actConsume": 35,
+ "afterActionVals": [],
+ "afterClear": 3,
+ "bannerId": 94003602,
+ "bannerType": 0,
+ "beforeActionVals": [],
+ "chaldeaGateCategory": 1,
+ "chapterId": 0,
+ "chapterSubId": 0,
+ "chapterSubStr": "",
+ "charaIconId": 0,
+ "closedAt": 1648367999,
+ "consumeType": 1,
+ "displayHours": 0,
+ "flag": 0,
+ "forceOperation": 0,
+ "giftIconId": 0,
+ "giftId": 303,
+ "hasStartAction": 1,
+ "iconId": 94052103,
+ "id": 94052110,
+ "intervalHours": 0,
+ "name": "蛇女．狩獵 祭位級",
+ "nameRuby": "",
+ "noticeAt": 1648281600,
+ "openedAt": 1648281600,
+ "priority": 94052190,
+ "recommendLv": "75",
+ "scriptQuestId": 0,
+ "spotId": 999999,
+ "type": 5
+}, {
+ "actConsume": 40,
+ "afterActionVals": [],
+ "afterClear": 3,
+ "bannerId": 94003603,
+ "bannerType": 0,
+ "beforeActionVals": [],
+ "chaldeaGateCategory": 1,
+ "chapterId": 0,
+ "chapterSubId": 0,
+ "chapterSubStr": "",
+ "charaIconId": 0,
+ "closedAt": 1648367999,
+ "consumeType": 1,
+ "displayHours": 0,
+ "flag": 0,
+ "forceOperation": 0,
+ "giftIconId": 0,
+ "giftId": 304,
+ "hasStartAction": 1,
+ "iconId": 94052103,
+ "id": 94052111,
+ "intervalHours": 0,
+ "name": "蛇女．狩獵 典位級",
+ "nameRuby": "",
+ "noticeAt": 1648281600,
+ "openedAt": 1648281600,
+ "priority": 94052189,
+ "recommendLv": "90",
+ "scriptQuestId": 0,
+ "spotId": 999999,
+ "type": 5
+}, {
+ "actConsume": 40,
+ "afterActionVals": [],
+ "afterClear": 3,
+ "bannerId": 94052101,
+ "bannerType": 0,
+ "beforeActionVals": [],
+ "chaldeaGateCategory": 1,
+ "chapterId": 0,
+ "chapterSubId": 0,
+ "chapterSubStr": "",
+ "charaIconId": 0,
+ "closedAt": 1648367999,
+ "consumeType": 1,
+ "displayHours": 0,
+ "flag": 0,
+ "forceOperation": 0,
+ "giftIconId": 0,
+ "giftId": 305,
+ "hasStartAction": 1,
+ "iconId": 94052103,
+ "id": 94052112,
+ "intervalHours": 0,
+ "name": "蛇女．狩獵 典位+級",
+ "nameRuby": "",
+ "noticeAt": 1648281600,
+ "openedAt": 1648281600,
+ "priority": 94052188,
+ "recommendLv": "90+",
+ "scriptQuestId": 0,
+ "spotId": 999999,
+ "type": 5
+}, {
+ "actConsume": 30,
+ "afterActionVals": [],
+ "afterClear": 3,
+ "bannerId": 94003601,
+ "bannerType": 0,
+ "beforeActionVals": [],
+ "chaldeaGateCategory": 1,
+ "chapterId": 0,
+ "chapterSubId": 0,
+ "chapterSubStr": "",
+ "charaIconId": 0,
+ "closedAt": 1648454399,
+ "consumeType": 1,
+ "displayHours": 0,
+ "flag": 0,
+ "forceOperation": 0,
+ "giftIconId": 0,
+ "giftId": 302,
+ "hasStartAction": 1,
+ "iconId": 94052104,
+ "id": 94052113,
+ "intervalHours": 0,
+ "name": "凝視者．狩獵 開位級",
+ "nameRuby": "",
+ "noticeAt": 1648368000,
+ "openedAt": 1648368000,
+ "priority": 94052187,
+ "recommendLv": "50",
+ "scriptQuestId": 0,
+ "spotId": 999999,
+ "type": 5
+}, {
+ "actConsume": 35,
+ "afterActionVals": [],
+ "afterClear": 3,
+ "bannerId": 94003602,
+ "bannerType": 0,
+ "beforeActionVals": [],
+ "chaldeaGateCategory": 1,
+ "chapterId": 0,
+ "chapterSubId": 0,
+ "chapterSubStr": "",
+ "charaIconId": 0,
+ "closedAt": 1648454399,
+ "consumeType": 1,
+ "displayHours": 0,
+ "flag": 0,
+ "forceOperation": 0,
+ "giftIconId": 0,
+ "giftId": 303,
+ "hasStartAction": 1,
+ "iconId": 94052105,
+ "id": 94052114,
+ "intervalHours": 0,
+ "name": "凝視者．狩獵 祭位級",
+ "nameRuby": "",
+ "noticeAt": 1648368000,
+ "openedAt": 1648368000,
+ "priority": 94052186,
+ "recommendLv": "75",
+ "scriptQuestId": 0,
+ "spotId": 999999,
+ "type": 5
+}, {
+ "actConsume": 40,
+ "afterActionVals": [],
+ "afterClear": 3,
+ "bannerId": 94003603,
+ "bannerType": 0,
+ "beforeActionVals": [],
+ "chaldeaGateCategory": 1,
+ "chapterId": 0,
+ "chapterSubId": 0,
+ "chapterSubStr": "",
+ "charaIconId": 0,
+ "closedAt": 1648454399,
+ "consumeType": 1,
+ "displayHours": 0,
+ "flag": 0,
+ "forceOperation": 0,
+ "giftIconId": 0,
+ "giftId": 304,
+ "hasStartAction": 1,
+ "iconId": 94052105,
+ "id": 94052115,
+ "intervalHours": 0,
+ "name": "凝視者．狩獵 典位級",
+ "nameRuby": "",
+ "noticeAt": 1648368000,
+ "openedAt": 1648368000,
+ "priority": 94052185,
+ "recommendLv": "90",
+ "scriptQuestId": 0,
+ "spotId": 999999,
+ "type": 5
+}, {
+ "actConsume": 40,
+ "afterActionVals": [],
+ "afterClear": 3,
+ "bannerId": 94052101,
+ "bannerType": 0,
+ "beforeActionVals": [],
+ "chaldeaGateCategory": 1,
+ "chapterId": 0,
+ "chapterSubId": 0,
+ "chapterSubStr": "",
+ "charaIconId": 0,
+ "closedAt": 1648454399,
+ "consumeType": 1,
+ "displayHours": 0,
+ "flag": 0,
+ "forceOperation": 0,
+ "giftIconId": 0,
+ "giftId": 305,
+ "hasStartAction": 1,
+ "iconId": 94052105,
+ "id": 94052116,
+ "intervalHours": 0,
+ "name": "凝視者．狩獵 典位+級",
+ "nameRuby": "",
+ "noticeAt": 1648368000,
+ "openedAt": 1648368000,
+ "priority": 94052184,
+ "recommendLv": "90+",
+ "scriptQuestId": 0,
+ "spotId": 999999,
+ "type": 5
+}, {
+ "actConsume": 30,
+ "afterActionVals": [],
+ "afterClear": 3,
+ "bannerId": 94003601,
+ "bannerType": 0,
+ "beforeActionVals": [],
+ "chaldeaGateCategory": 1,
+ "chapterId": 0,
+ "chapterSubId": 0,
+ "chapterSubStr": "",
+ "charaIconId": 0,
+ "closedAt": 1648540799,
+ "consumeType": 1,
+ "displayHours": 0,
+ "flag": 0,
+ "forceOperation": 0,
+ "giftIconId": 0,
+ "giftId": 302,
+ "hasStartAction": 1,
+ "iconId": 94052106,
+ "id": 94052117,
+ "intervalHours": 0,
+ "name": "守護者．狩獵 開位級",
+ "nameRuby": "",
+ "noticeAt": 1648454400,
+ "openedAt": 1648454400,
+ "priority": 94052183,
+ "recommendLv": "50",
+ "scriptQuestId": 0,
+ "spotId": 999999,
+ "type": 5
+}, {
+ "actConsume": 35,
+ "afterActionVals": [],
+ "afterClear": 3,
+ "bannerId": 94003602,
+ "bannerType": 0,
+ "beforeActionVals": [],
+ "chaldeaGateCategory": 1,
+ "chapterId": 0,
+ "chapterSubId": 0,
+ "chapterSubStr": "",
+ "charaIconId": 0,
+ "closedAt": 1648540799,
+ "consumeType": 1,
+ "displayHours": 0,
+ "flag": 0,
+ "forceOperation": 0,
+ "giftIconId": 0,
+ "giftId": 303,
+ "hasStartAction": 1,
+ "iconId": 94052107,
+ "id": 94052118,
+ "intervalHours": 0,
+ "name": "守護者．狩獵 祭位級",
+ "nameRuby": "",
+ "noticeAt": 1648454400,
+ "openedAt": 1648454400,
+ "priority": 94052182,
+ "recommendLv": "75",
+ "scriptQuestId": 0,
+ "spotId": 999999,
+ "type": 5
+}, {
+ "actConsume": 40,
+ "afterActionVals": [],
+ "afterClear": 3,
+ "bannerId": 94003603,
+ "bannerType": 0,
+ "beforeActionVals": [],
+ "chaldeaGateCategory": 1,
+ "chapterId": 0,
+ "chapterSubId": 0,
+ "chapterSubStr": "",
+ "charaIconId": 0,
+ "closedAt": 1648540799,
+ "consumeType": 1,
+ "displayHours": 0,
+ "flag": 0,
+ "forceOperation": 0,
+ "giftIconId": 0,
+ "giftId": 304,
+ "hasStartAction": 1,
+ "iconId": 94052107,
+ "id": 94052119,
+ "intervalHours": 0,
+ "name": "守護者．狩獵 典位級",
+ "nameRuby": "",
+ "noticeAt": 1648454400,
+ "openedAt": 1648454400,
+ "priority": 94052181,
+ "recommendLv": "90",
+ "scriptQuestId": 0,
+ "spotId": 999999,
+ "type": 5
+}, {
+ "actConsume": 40,
+ "afterActionVals": [],
+ "afterClear": 3,
+ "bannerId": 94052101,
+ "bannerType": 0,
+ "beforeActionVals": [],
+ "chaldeaGateCategory": 1,
+ "chapterId": 0,
+ "chapterSubId": 0,
+ "chapterSubStr": "",
+ "charaIconId": 0,
+ "closedAt": 1648540799,
+ "consumeType": 1,
+ "displayHours": 0,
+ "flag": 0,
+ "forceOperation": 0,
+ "giftIconId": 0,
+ "giftId": 305,
+ "hasStartAction": 1,
+ "iconId": 94052107,
+ "id": 94052120,
+ "intervalHours": 0,
+ "name": "守護者．狩獵 典位+級",
+ "nameRuby": "",
+ "noticeAt": 1648454400,
+ "openedAt": 1648454400,
+ "priority": 94052180,
+ "recommendLv": "90+",
+ "scriptQuestId": 0,
+ "spotId": 999999,
+ "type": 5
+}, {
+ "actConsume": 30,
+ "afterActionVals": [],
+ "afterClear": 3,
+ "bannerId": 94003601,
+ "bannerType": 0,
+ "beforeActionVals": [],
+ "chaldeaGateCategory": 1,
+ "chapterId": 0,
+ "chapterSubId": 0,
+ "chapterSubStr": "",
+ "charaIconId": 0,
+ "closedAt": 1648702799,
+ "consumeType": 1,
+ "displayHours": 0,
+ "flag": 0,
+ "forceOperation": 0,
+ "giftIconId": 0,
+ "giftId": 302,
+ "hasStartAction": 1,
+ "iconId": 94052108,
+ "id": 94052121,
+ "intervalHours": 0,
+ "name": "偉大那伽．狩獵 開位級",
+ "nameRuby": "",
+ "noticeAt": 1648540800,
+ "openedAt": 1648540800,
+ "priority": 94052179,
+ "recommendLv": "50",
+ "scriptQuestId": 0,
+ "spotId": 999999,
+ "type": 5
+}, {
+ "actConsume": 35,
+ "afterActionVals": [],
+ "afterClear": 3,
+ "bannerId": 94003602,
+ "bannerType": 0,
+ "beforeActionVals": [],
+ "chaldeaGateCategory": 1,
+ "chapterId": 0,
+ "chapterSubId": 0,
+ "chapterSubStr": "",
+ "charaIconId": 0,
+ "closedAt": 1648702799,
+ "consumeType": 1,
+ "displayHours": 0,
+ "flag": 0,
+ "forceOperation": 0,
+ "giftIconId": 0,
+ "giftId": 303,
+ "hasStartAction": 1,
+ "iconId": 94052108,
+ "id": 94052122,
+ "intervalHours": 0,
+ "name": "偉大那伽．狩獵 祭位級",
+ "nameRuby": "",
+ "noticeAt": 1648540800,
+ "openedAt": 1648540800,
+ "priority": 94052178,
+ "recommendLv": "75",
+ "scriptQuestId": 0,
+ "spotId": 999999,
+ "type": 5
+}, {
+ "actConsume": 40,
+ "afterActionVals": [],
+ "afterClear": 3,
+ "bannerId": 94003603,
+ "bannerType": 0,
+ "beforeActionVals": [],
+ "chaldeaGateCategory": 1,
+ "chapterId": 0,
+ "chapterSubId": 0,
+ "chapterSubStr": "",
+ "charaIconId": 0,
+ "closedAt": 1648702799,
+ "consumeType": 1,
+ "displayHours": 0,
+ "flag": 0,
+ "forceOperation": 0,
+ "giftIconId": 0,
+ "giftId": 304,
+ "hasStartAction": 1,
+ "iconId": 94052108,
+ "id": 94052123,
+ "intervalHours": 0,
+ "name": "偉大那伽．狩獵 典位級",
+ "nameRuby": "",
+ "noticeAt": 1648540800,
+ "openedAt": 1648540800,
+ "priority": 94052177,
+ "recommendLv": "90",
+ "scriptQuestId": 0,
+ "spotId": 999999,
+ "type": 5
+}, {
+ "actConsume": 40,
+ "afterActionVals": [],
+ "afterClear": 3,
+ "bannerId": 94052101,
+ "bannerType": 0,
+ "beforeActionVals": [],
+ "chaldeaGateCategory": 1,
+ "chapterId": 0,
+ "chapterSubId": 0,
+ "chapterSubStr": "",
+ "charaIconId": 0,
+ "closedAt": 1648702799,
+ "consumeType": 1,
+ "displayHours": 0,
+ "flag": 0,
+ "forceOperation": 0,
+ "giftIconId": 0,
+ "giftId": 305,
+ "hasStartAction": 1,
+ "iconId": 94052108,
+ "id": 94052124,
+ "intervalHours": 0,
+ "name": "偉大那伽．狩獵 典位+級",
+ "nameRuby": "",
+ "noticeAt": 1648540800,
+ "openedAt": 1648540800,
+ "priority": 94052176,
+ "recommendLv": "90+",
+ "scriptQuestId": 0,
+ "spotId": 999999,
+ "type": 5
}, {
"actConsume": 21,
"afterActionVals": [],
diff --git a/master/mstShop.json b/master/mstShop.json
index c9b372acb..bcd6c360b 100644
--- a/master/mstShop.json
+++ b/master/mstShop.json
@@ -19276,6 +19276,84 @@
"slot": 0,
"targetIds": [403200],
"warningMessage": ""
+}, {
+ "baseShopId": 4000247,
+ "bgImageId": 0,
+ "closedAt": 1649307599,
+ "defaultLimitCount": 0,
+ "defaultLv": 1,
+ "detail": "限時兌換★5從者",
+ "eventId": 0,
+ "flag": 0,
+ "id": 4000247,
+ "imageId": 0,
+ "infoMessage": "",
+ "itemIds": [17],
+ "limitNum": 1,
+ "name": "貞德",
+ "openedAt": 1648098000,
+ "payType": 9,
+ "prices": [10],
+ "priority": 3,
+ "purchaseType": 4,
+ "script": {},
+ "setNum": 1,
+ "shopType": 7,
+ "slot": 0,
+ "targetIds": [203200],
+ "warningMessage": ""
+}, {
+ "baseShopId": 4000248,
+ "bgImageId": 0,
+ "closedAt": 1649307599,
+ "defaultLimitCount": 0,
+ "defaultLv": 1,
+ "detail": "限時兌換★5從者",
+ "eventId": 0,
+ "flag": 0,
+ "id": 4000248,
+ "imageId": 0,
+ "infoMessage": "",
+ "itemIds": [17],
+ "limitNum": 1,
+ "name": "尼祿．克勞狄烏斯",
+ "openedAt": 1648098000,
+ "payType": 9,
+ "prices": [10],
+ "priority": 4,
+ "purchaseType": 4,
+ "script": {},
+ "setNum": 1,
+ "shopType": 7,
+ "slot": 0,
+ "targetIds": [503200],
+ "warningMessage": ""
+}, {
+ "baseShopId": 4000249,
+ "bgImageId": 0,
+ "closedAt": 1649307599,
+ "defaultLimitCount": 0,
+ "defaultLv": 1,
+ "detail": "限時兌換★5從者",
+ "eventId": 0,
+ "flag": 0,
+ "id": 4000249,
+ "imageId": 0,
+ "infoMessage": "",
+ "itemIds": [17],
+ "limitNum": 1,
+ "name": "BB",
+ "openedAt": 1648098000,
+ "payType": 9,
+ "prices": [10],
+ "priority": 5,
+ "purchaseType": 4,
+ "script": {},
+ "setNum": 1,
+ "shopType": 7,
+ "slot": 0,
+ "targetIds": [2300200],
+ "warningMessage": ""
}, {
"baseShopId": 5000001,
"bgImageId": 0,
diff --git a/master/mstSkill.json b/master/mstSkill.json
index 9e4b33a89..fdef2f765 100644
--- a/master/mstSkill.json
+++ b/master/mstSkill.json
@@ -87542,7 +87542,7 @@
"id": 992211,
"maxLv": 1,
"motion": 101,
- "name": "自由坐席",
+ "name": "自由座",
"ruby": "-",
"script": {},
"type": 2
@@ -87554,7 +87554,7 @@
"id": 992212,
"maxLv": 1,
"motion": 101,
- "name": "自由坐席",
+ "name": "自由座",
"ruby": "-",
"script": {},
"type": 2
diff --git a/master/mstSvtComment.json b/master/mstSvtComment.json
index 6674aca9f..dd12b8eef 100644
--- a/master/mstSvtComment.json
+++ b/master/mstSvtComment.json
@@ -29873,7 +29873,7 @@
"id": 1,
"priority": 0,
"condMessage": "",
- "comment": "猶如永不停歇的鰹魚。\n猶如躍出海面的飛魚。\n\n就算今日收起船帆，\n開朗的聲音也會令內心為了明日的航海而雀躍不已。\n\n因為就算海風平息，\n大海依然會重複著潮起潮落。",
+ "comment": "猶如不停游泳的鰹魚。\n猶如躍出海面的飛魚。\n\n就算今日收起船帆，\n開朗的聲音也會令內心為了明日的航海而雀躍不已。\n\n因為就算海風平息，\n大海依然會重複著潮起潮落。",
"condType": 0,
"condValues": [0],
"condValue2": 0,
diff --git a/master/viewEnemy.json b/master/viewEnemy.json
index 7baa1c530..2c3f68022 100644
--- a/master/viewEnemy.json
+++ b/master/viewEnemy.json
@@ -70191,7 +70191,7 @@
}, {
"questId": 94052105,
"enemyId": 1,
- "name": "自动防卫装置・二式",
+ "name": "自動防衛裝置・二式",
"classId": 2,
"svtId": 9936760,
"limitCount": 2,
@@ -70221,7 +70221,7 @@
}, {
"questId": 94052106,
"enemyId": 1,
- "name": "自动防卫装置・二式",
+ "name": "自動防衛裝置・二式",
"classId": 2,
"svtId": 9936760,
"limitCount": 2,
@@ -70251,7 +70251,7 @@
}, {
"questId": 94052107,
"enemyId": 1,
- "name": "自动防卫装置・二式",
+ "name": "自動防衛裝置・二式",
"classId": 2,
"svtId": 9936760,
"limitCount": 2,
@@ -70281,7 +70281,7 @@
}, {
"questId": 94052108,
"enemyId": 1,
- "name": "自动防卫装置・二式",
+ "name": "自動防衛裝置・二式",
"classId": 2,
"svtId": 9936760,
"limitCount": 2,