diff --git a/gamedatatop.json b/gamedatatop.json index 71bbf20db..5de7d5e76 100644 --- a/gamedatatop.json +++ b/gamedatatop.json @@ -6,8 +6,8 @@ "webview": "", "assetbundle": "", "master": "", - "dataVer": 810, - "dateVer": 1698202800, + "dataVer": 811, + "dateVer": 1698505200, "assetbundleKey": "" }, "fail": {}, diff --git a/master/mstBgm.json b/master/mstBgm.json index 10b617fee..cc83e9817 100644 --- a/master/mstBgm.json +++ b/master/mstBgm.json @@ -5448,4 +5448,14 @@ "shopId": 7000562, "logoId": 1, "script": "{}" +}, { + "id": 563, + "fileName": "BGM_TITLE_4", + "name": "", + "priority": 0, + "detail": "", + "flag": 1, + "shopId": 7000563, + "logoId": 1, + "script": "{}" }] \ No newline at end of file diff --git a/master/mstCommonRelease.json b/master/mstCommonRelease.json index cb0f4fad6..7438febf1 100644 --- a/master/mstCommonRelease.json +++ b/master/mstCommonRelease.json @@ -4177,6 +4177,34 @@ "condType": 42, "condId": 94065129, "condNum": 1 +}, { + "id": 10065201, + "priority": 0, + "condGroup": 0, + "condType": 1, + "condId": 94064901, + "condNum": 0 +}, { + "id": 10065201, + "priority": 0, + "condGroup": 1, + "condType": 1, + "condId": 3001100, + "condNum": 0 +}, { + "id": 10065202, + "priority": 1, + "condGroup": 1, + "condType": 1, + "condId": 3001101, + "condNum": 0 +}, { + "id": 10065202, + "priority": 2, + "condGroup": 1, + "condType": 1, + "condId": 94064914, + "condNum": 0 }, { "id": 20052701, "priority": 0, @@ -8748,55 +8776,6 @@ "condType": 119, "condId": 80298, "condNum": 8 -}, { - "id": 50065402, - "priority": 0, - "condGroup": 0, - "condType": 0, - "condId": 0, - "condNum": 0 -}, { - "id": 50065402, - "priority": 0, - "condGroup": 1, - "condType": 12, - "condId": 0, - "condNum": 1640923199 -}, { - "id": 50065403, - "priority": 0, - "condGroup": 0, - "condType": 92, - "condId": 0, - "condNum": 0 -}, { - "id": 50065404, - "priority": 0, - "condGroup": 0, - "condType": 0, - "condId": 0, - "condNum": 0 -}, { - "id": 50065405, - "priority": 0, - "condGroup": 0, - "condType": 0, - "condId": 0, - "condNum": 0 -}, { - "id": 50065405, - "priority": 0, - "condGroup": 1, - "condType": 12, - "condId": 0, - "condNum": 1640923199 -}, { - "id": 50065406, - "priority": 0, - "condGroup": 0, - "condType": 92, - "condId": 0, - "condNum": 0 }, { "id": 94041901, "priority": 1, diff --git a/master/mstConstant.json b/master/mstConstant.json index d67809cc0..f73075656 100644 --- a/master/mstConstant.json +++ b/master/mstConstant.json @@ -90,6 +90,10 @@ "name": "CHAPTER1_PROLOGUE_WAR_ID", "value": 100, "createdAt": 946652400 +}, { + "name": "CHAPTER2_EPILOGUE_WAR_ID", + "value": 309, + "createdAt": 946652400 }, { "name": "CHAPTER2_PROLOGUE_WAR_ID", "value": 300, @@ -440,7 +444,7 @@ "createdAt": 946652400 }, { "name": "LAST_WAR_ID", - "value": 308, + "value": 309, "createdAt": 946652400 }, { "name": "LIMITED_PERIOD_VOICE_CHANGE_TYPE", diff --git a/master/mstEquip.json b/master/mstEquip.json index fb0721f83..91aa9d8ef 100644 --- a/master/mstEquip.json +++ b/master/mstEquip.json @@ -185,4 +185,15 @@ "imageId": 190, "maleSpellId": 1, "femaleSpellId": 2 +}, { + "id": 210, + "name": "결전용 칼데아 제복", + "detail": "칼데아 베이스에서 새로 만들어진 마술예장.\n시온의 협력하에 개발되었다.", + "condUserLv": 1, + "maxLv": 10, + "maleImageId": 211, + "femaleImageId": 212, + "imageId": 210, + "maleSpellId": 1, + "femaleSpellId": 2 }] \ No newline at end of file diff --git a/master/mstEquipExp.json b/master/mstEquipExp.json index 1a07f5467..77dc60511 100644 --- a/master/mstEquipExp.json +++ b/master/mstEquipExp.json @@ -1188,4 +1188,74 @@ "skillLv1": 10, "skillLv2": 10, "skillLv3": 10 +}, { + "equipId": 210, + "lv": 1, + "exp": 3451800, + "skillLv1": 1, + "skillLv2": 1, + "skillLv3": 1 +}, { + "equipId": 210, + "lv": 2, + "exp": 10355400, + "skillLv1": 2, + "skillLv2": 2, + "skillLv3": 2 +}, { + "equipId": 210, + "lv": 3, + "exp": 20710800, + "skillLv1": 3, + "skillLv2": 3, + "skillLv3": 3 +}, { + "equipId": 210, + "lv": 4, + "exp": 34518000, + "skillLv1": 4, + "skillLv2": 4, + "skillLv3": 4 +}, { + "equipId": 210, + "lv": 5, + "exp": 51777000, + "skillLv1": 5, + "skillLv2": 5, + "skillLv3": 5 +}, { + "equipId": 210, + "lv": 6, + "exp": 72487800, + "skillLv1": 6, + "skillLv2": 6, + "skillLv3": 6 +}, { + "equipId": 210, + "lv": 7, + "exp": 96650400, + "skillLv1": 7, + "skillLv2": 7, + "skillLv3": 7 +}, { + "equipId": 210, + "lv": 8, + "exp": 124264800, + "skillLv1": 8, + "skillLv2": 8, + "skillLv3": 8 +}, { + "equipId": 210, + "lv": 9, + "exp": 155331000, + "skillLv1": 9, + "skillLv2": 9, + "skillLv3": 9 +}, { + "equipId": 210, + "lv": 10, + "exp": -1, + "skillLv1": 10, + "skillLv2": 10, + "skillLv3": 10 }] \ No newline at end of file diff --git a/master/mstEquipImage.json b/master/mstEquipImage.json index d115d59ed..e30d845fe 100644 --- a/master/mstEquipImage.json +++ b/master/mstEquipImage.json @@ -270,4 +270,20 @@ "offsetYMyroom": 2, "offsetXEffect": 0, "offsetYEffect": 0 +}, { + "id": 211, + "offsetX": -236, + "offsetY": 0, + "offsetXMyroom": 622, + "offsetYMyroom": 12, + "offsetXEffect": 0, + "offsetYEffect": 0 +}, { + "id": 212, + "offsetX": -286, + "offsetY": -12, + "offsetXMyroom": 526, + "offsetYMyroom": 2, + "offsetXEffect": 0, + "offsetYEffect": 0 }] \ No newline at end of file diff --git a/master/mstEquipSkill.json b/master/mstEquipSkill.json index daa3d9f31..1fcee1a48 100644 --- a/master/mstEquipSkill.json +++ b/master/mstEquipSkill.json @@ -253,4 +253,19 @@ "num": 3, "skillId": 980072, "condLv": 0 +}, { + "equipId": 210, + "num": 1, + "skillId": 980073, + "condLv": 0 +}, { + "equipId": 210, + "num": 2, + "skillId": 980074, + "condLv": 0 +}, { + "equipId": 210, + "num": 3, + "skillId": 980075, + "condLv": 0 }] \ No newline at end of file diff --git a/master/mstGacha.json b/master/mstGacha.json index 7c0ffb092..625d9f983 100644 --- a/master/mstGacha.json +++ b/master/mstGacha.json @@ -1,7 +1,7 @@ [{ "id": 1, "name": "친구 포인트 소환", - "imageId": 3, + "imageId": 4, "priority": 1, "warId": -1, "gachaSlot": 1, @@ -9,7 +9,7 @@ "shopId1": 1, "shopId2": 0, "rarityId": 14, - "baseId": 30009, + "baseId": 30011, "adjustId": 0, "pickupId": 0, "ticketItemId": 0, @@ -69,7 +69,7 @@ }, { "id": 21001, "name": "스토리 소환", - "imageId": 223, + "imageId": 224, "priority": 1001, "warId": 100, "gachaSlot": 2, @@ -77,7 +77,7 @@ "shopId1": 4, "shopId2": 5, "rarityId": 3, - "baseId": 610018, + "baseId": 10019, "adjustId": 0, "pickupId": 0, "ticketItemId": 4001, @@ -58512,6 +58512,40 @@ "bannerQuestId": 1000002, "bannerQuestPhase": 1, "flag": 2 +}, { + "id": 50021411, + "name": "빛의 코얀스카야 픽업 소환", + "imageId": 82463, + "priority": 21698, + "warId": 100, + "gachaSlot": 50021411, + "type": 1, + "shopId1": 4, + "shopId2": 5, + "rarityId": 3, + "baseId": 10019, + "adjustId": 50021411, + "pickupId": 50021412, + "ticketItemId": 4001, + "gachaGroupId": 0, + "drawNum1": 1, + "drawNum2": 11, + "extraGroupId1": 50021411, + "extraGroupId2": 0, + "extraAddCount1": 1, + "extraAddCount2": 0, + "freeDrawFlag": 0, + "maxDrawNum": 0, + "beforeGachaId": 101, + "beforeDrawNum": 1, + "openedAt": 1698634800, + "closedAt": 1698850799, + "condQuestId": 1000002, + "condQuestPhase": 1, + "detailUrl": "605", + "bannerQuestId": 1000002, + "bannerQuestPhase": 1, + "flag": 2 }, { "id": 55000026, "name": "꽃미남_픽업_알트리아 펜드래곤", diff --git a/master/mstGachaAppend.json b/master/mstGachaAppend.json index fc5e3029d..e7f0afb57 100644 --- a/master/mstGachaAppend.json +++ b/master/mstGachaAppend.json @@ -724,4 +724,15 @@ "extraAddCount": 0, "maxDrawNum": 0, "flag": 1 +}, { + "gachaId": 50021411, + "idx": 3, + "type": 7, + "shopId": 8, + "gachaGroupId": 50021411, + "drawNum": 1, + "extraGroupId": 0, + "extraAddCount": 0, + "maxDrawNum": 0, + "flag": 1 }] \ No newline at end of file diff --git a/master/mstGachaGroup.json b/master/mstGachaGroup.json index deec97c64..fd2661f31 100644 --- a/master/mstGachaGroup.json +++ b/master/mstGachaGroup.json @@ -454,4 +454,10 @@ "name": "유료 성정석 1개로 매일 1회 성정석 소환", "maxDrawNum": 1, "flag": 1 +}, { + "tutorialImageIds": ["Tutorial/tutorial_2007", "tutorial_2007"], + "id": 50021411, + "name": "유료 성정석 1개로 매일 1회 성정석 소환", + "maxDrawNum": 1, + "flag": 1 }] \ No newline at end of file diff --git a/master/mstGachaStoryAdjust.json b/master/mstGachaStoryAdjust.json index a14496bba..174f0f58d 100644 --- a/master/mstGachaStoryAdjust.json +++ b/master/mstGachaStoryAdjust.json @@ -5,7 +5,7 @@ "condType": 1, "targetId": 1000011, "value": 1, - "imageId": 223 + "imageId": 224 }, { "gachaId": 21001, "idx": 2, @@ -13,7 +13,7 @@ "condType": 1, "targetId": 1000115, "value": 1, - "imageId": 223 + "imageId": 224 }, { "gachaId": 21001, "idx": 3, @@ -21,7 +21,7 @@ "condType": 1, "targetId": 1000215, "value": 1, - "imageId": 223 + "imageId": 224 }, { "gachaId": 21001, "idx": 4, @@ -29,7 +29,7 @@ "condType": 1, "targetId": 1000314, "value": 1, - "imageId": 223 + "imageId": 224 }, { "gachaId": 21001, "idx": 5, @@ -37,7 +37,7 @@ "condType": 1, "targetId": 1000413, "value": 1, - "imageId": 223 + "imageId": 224 }, { "gachaId": 21001, "idx": 6, @@ -45,7 +45,7 @@ "condType": 1, "targetId": 1000522, "value": 1, - "imageId": 223 + "imageId": 224 }, { "gachaId": 21001, "idx": 7, @@ -53,7 +53,7 @@ "condType": 1, "targetId": 1000632, "value": 1, - "imageId": 223 + "imageId": 224 }, { "gachaId": 21001, "idx": 8, @@ -61,7 +61,7 @@ "condType": 1, "targetId": 1000722, "value": 1, - "imageId": 223 + "imageId": 224 }, { "gachaId": 21001, "idx": 9, @@ -69,7 +69,7 @@ "condType": 1, "targetId": 2000118, "value": 1, - "imageId": 223 + "imageId": 224 }, { "gachaId": 21001, "idx": 10, @@ -77,7 +77,7 @@ "condType": 1, "targetId": 2000216, "value": 1, - "imageId": 223 + "imageId": 224 }, { "gachaId": 21001, "idx": 11, @@ -85,7 +85,7 @@ "condType": 1, "targetId": 2000316, "value": 1, - "imageId": 223 + "imageId": 224 }, { "gachaId": 21001, "idx": 12, @@ -93,7 +93,7 @@ "condType": 1, "targetId": 2000410, "value": 1, - "imageId": 223 + "imageId": 224 }, { "gachaId": 21001, "idx": 13, @@ -101,7 +101,7 @@ "condType": 1, "targetId": 3000125, "value": 1, - "imageId": 223 + "imageId": 224 }, { "gachaId": 21001, "idx": 14, @@ -109,7 +109,7 @@ "condType": 1, "targetId": 3000218, "value": 1, - "imageId": 223 + "imageId": 224 }, { "gachaId": 21001, "idx": 15, @@ -117,7 +117,7 @@ "condType": 1, "targetId": 3000320, "value": 1, - "imageId": 223 + "imageId": 224 }, { "gachaId": 21001, "idx": 16, @@ -125,7 +125,7 @@ "condType": 1, "targetId": 3000421, "value": 1, - "imageId": 223 + "imageId": 224 }, { "gachaId": 21001, "idx": 17, @@ -133,7 +133,7 @@ "condType": 1, "targetId": 3000531, "value": 1, - "imageId": 223 + "imageId": 224 }, { "gachaId": 21001, "idx": 18, @@ -141,7 +141,7 @@ "condType": 1, "targetId": 3000628, "value": 1, - "imageId": 223 + "imageId": 224 }, { "gachaId": 21001, "idx": 19, @@ -149,7 +149,7 @@ "condType": 1, "targetId": 3000716, "value": 1, - "imageId": 223 + "imageId": 224 }, { "gachaId": 21001, "idx": 20, @@ -157,5 +157,5 @@ "condType": 1, "targetId": 3001009, "value": 1, - "imageId": 223 + "imageId": 224 }] \ No newline at end of file diff --git a/master/mstGachaSub.json b/master/mstGachaSub.json index 4baae0527..1ba4a52fc 100644 --- a/master/mstGachaSub.json +++ b/master/mstGachaSub.json @@ -2410,11 +2410,29 @@ "openedAt": 1697814000, "closedAt": 1698505199, "commonReleaseId": 20060301 +}, { + "gachaId": 1, + "id": 392, + "priority": 1, + "imageId": 4, + "adjustAddId": 373, + "openedAt": 1698634800, + "closedAt": 1698850799, + "commonReleaseId": 0 +}, { + "gachaId": 1, + "id": 393, + "priority": 2, + "imageId": 4, + "adjustAddId": 374, + "openedAt": 1698634800, + "closedAt": 1698850799, + "commonReleaseId": 20060301 }, { "gachaId": 1, "id": 1000, "priority": 1, - "imageId": 3, + "imageId": 4, "adjustAddId": 1000, "openedAt": 1686754800, "closedAt": 1911653999, diff --git a/master/mstGift.json b/master/mstGift.json index 9edd3af68..f827d79b7 100644 --- a/master/mstGift.json +++ b/master/mstGift.json @@ -43078,6 +43078,14 @@ "num": 1, "limitCount": 0, "lv": 0 +}, { + "id": 3001101, + "type": 2, + "objectId": 2, + "priority": 1, + "num": 1, + "limitCount": 0, + "lv": 0 }, { "id": 94060451, "type": 2, @@ -182702,6 +182710,14 @@ "num": 1, "limitCount": 0, "lv": 1 +}, { + "id": 3001101, + "type": 5, + "objectId": 210, + "priority": 2, + "num": 1, + "limitCount": 0, + "lv": 1 }, { "id": 700020, "type": 5, diff --git a/master/mstMap.json b/master/mstMap.json index 41f6c176d..5ff0f13ea 100644 --- a/master/mstMap.json +++ b/master/mstMap.json @@ -139,6 +139,15 @@ "mapImageH": 1440, "headerImageId": 19, "bgmId": 229 +}, { + "script": {}, + "id": 309, + "warId": 309, + "mapImageId": 309, + "mapImageW": 0, + "mapImageH": 0, + "headerImageId": 0, + "bgmId": 0 }, { "script": {}, "id": 1001, diff --git a/master/mstOpeningMovie.json b/master/mstOpeningMovie.json index a0e487efb..fc5874faa 100644 --- a/master/mstOpeningMovie.json +++ b/master/mstOpeningMovie.json @@ -1,6 +1,6 @@ [{ "id": 1, - "priority": 1, + "priority": 100, "name": "제2부 후기 오프닝", "movieName": "intro001", "commonReleaseId": 50051301, diff --git a/master/mstQuest.json b/master/mstQuest.json index 9680fc909..39694c3f0 100644 --- a/master/mstQuest.json +++ b/master/mstQuest.json @@ -14814,6 +14814,70 @@ "noticeAt": 1686193200, "openedAt": 1686193200, "closedAt": 1893423600 +}, { + "beforeActionVals": [], + "afterActionVals": [], + "id": 3001100, + "name": "Prologue", + "nameRuby": "", + "type": 1, + "consumeType": 1, + "actConsume": 0, + "chaldeaGateCategory": 0, + "spotId": 30999, + "giftId": 0, + "priority": 3001101, + "bannerType": 41, + "bannerId": 0, + "iconId": 0, + "charaIconId": 0, + "giftIconId": 0, + "forceOperation": 0, + "afterClear": 1, + "displayHours": 0, + "intervalHours": 0, + "chapterId": 302, + "chapterSubId": 0, + "chapterSubStr": " ", + "recommendLv": "1", + "hasStartAction": 0, + "flag": 2, + "scriptQuestId": 0, + "noticeAt": 1698505200, + "openedAt": 1698505200, + "closedAt": 1893423600 +}, { + "beforeActionVals": [], + "afterActionVals": [], + "id": 3001101, + "name": "길을 떠나다", + "nameRuby": "", + "type": 1, + "consumeType": 1, + "actConsume": 0, + "chaldeaGateCategory": 0, + "spotId": 30999, + "giftId": 3001101, + "priority": 3001100, + "bannerType": 41, + "bannerId": 0, + "iconId": 0, + "charaIconId": 0, + "giftIconId": 3, + "forceOperation": 0, + "afterClear": 1, + "displayHours": 0, + "intervalHours": 0, + "chapterId": 302, + "chapterSubId": 1, + "chapterSubStr": " ", + "recommendLv": "1", + "hasStartAction": 0, + "flag": 2, + "scriptQuestId": 0, + "noticeAt": 1698505200, + "openedAt": 1698505200, + "closedAt": 1893423600 }, { "beforeActionVals": [], "afterActionVals": [], @@ -353374,6 +353438,38 @@ "noticeAt": 1698202800, "openedAt": 1698202800, "closedAt": 1698505199 +}, { + "beforeActionVals": [], + "afterActionVals": [], + "id": 94064915, + "name": "", + "nameRuby": "", + "type": 5, + "consumeType": 1, + "actConsume": 5, + "chaldeaGateCategory": 1, + "spotId": 912899, + "giftId": 0, + "priority": 94065184, + "bannerType": 0, + "bannerId": 94064901, + "iconId": 94064901, + "charaIconId": 0, + "giftIconId": 3, + "forceOperation": 0, + "afterClear": 1, + "displayHours": 0, + "intervalHours": 0, + "chapterId": 0, + "chapterSubId": 0, + "chapterSubStr": "", + "recommendLv": "1", + "hasStartAction": 0, + "flag": 0, + "scriptQuestId": 0, + "noticeAt": 1698505200, + "openedAt": 1698505200, + "closedAt": 1698505199 }, { "beforeActionVals": [], "afterActionVals": [], diff --git a/master/mstQuestGroup.json b/master/mstQuestGroup.json index b91c1f5f3..08c0cde6f 100644 --- a/master/mstQuestGroup.json +++ b/master/mstQuestGroup.json @@ -51198,6 +51198,10 @@ "questId": 94064914, "type": 1, "groupId": 80349 +}, { + "questId": 94064915, + "type": 1, + "groupId": 80349 }, { "questId": 94065001, "type": 1, diff --git a/master/mstQuestPhase.json b/master/mstQuestPhase.json index 0152876f5..c4b1deef5 100644 --- a/master/mstQuestPhase.json +++ b/master/mstQuestPhase.json @@ -21871,6 +21871,34 @@ "playerExp": 10, "friendshipExp": 50, "giftId": 104 +}, { + "classIds": [], + "individuality": [], + "script": {}, + "questSelect": null, + "questId": 3001100, + "phase": 1, + "isNpcOnly": false, + "battleBgId": 20200, + "battleBgType": 1, + "qp": 500, + "playerExp": 5, + "friendshipExp": 25, + "giftId": 0 +}, { + "classIds": [], + "individuality": [], + "script": {}, + "questSelect": null, + "questId": 3001101, + "phase": 1, + "isNpcOnly": false, + "battleBgId": 20200, + "battleBgType": 1, + "qp": 500, + "playerExp": 5, + "friendshipExp": 25, + "giftId": 104 }, { "classIds": [3, 1, 2], "individuality": [2121, 2392], @@ -221292,6 +221320,20 @@ "playerExp": 5, "friendshipExp": 25, "giftId": 0 +}, { + "classIds": [], + "individuality": [2038, 2392, 94000127], + "script": {}, + "questSelect": null, + "questId": 94064915, + "phase": 1, + "isNpcOnly": false, + "battleBgId": 20500, + "battleBgType": 0, + "qp": 500, + "playerExp": 5, + "friendshipExp": 25, + "giftId": 0 }, { "classIds": [4], "individuality": [94000127], diff --git a/master/mstQuestRelease.json b/master/mstQuestRelease.json index 18c47f979..a7faabe50 100644 --- a/master/mstQuestRelease.json +++ b/master/mstQuestRelease.json @@ -4190,6 +4190,30 @@ "openLimit": 0, "closedMessageId": 0, "imagePriority": 10000 +}, { + "questId": 3001100, + "type": 1, + "targetId": 3001009, + "value": 0, + "openLimit": 0, + "closedMessageId": 0, + "imagePriority": 9000 +}, { + "questId": 3001100, + "type": 36, + "targetId": 94064901, + "value": 0, + "openLimit": 0, + "closedMessageId": 0, + "imagePriority": 8000 +}, { + "questId": 3001101, + "type": 1, + "targetId": 3001009, + "value": 0, + "openLimit": 0, + "closedMessageId": 0, + "imagePriority": 9000 }, { "questId": 91100101, "type": 1, @@ -216838,6 +216862,14 @@ "openLimit": 0, "closedMessageId": 4, "imagePriority": 9000 +}, { + "questId": 94064915, + "type": 92, + "targetId": 0, + "value": 0, + "openLimit": 0, + "closedMessageId": 0, + "imagePriority": 7000 }, { "questId": 94065001, "type": 1, diff --git a/master/mstQuestScript.json b/master/mstQuestScript.json index e7f6a5d3a..913416db1 100644 --- a/master/mstQuestScript.json +++ b/master/mstQuestScript.json @@ -28,6 +28,11 @@ "name": "막간_3", "folderType": 0, "materialFolderId": 0 +}, { + "id": 3001100, + "name": "Prologue", + "folderType": 0, + "materialFolderId": 0 }, { "id": 91601804, "name": "조난자 X의 귀환", @@ -5078,4 +5083,9 @@ "name": "화이트데이 당일", "folderType": 0, "materialFolderId": 0 +}, { + "id": 94064915, + "name": "여행길에 오르다", + "folderType": 2, + "materialFolderId": 80349 }] \ No newline at end of file diff --git a/master/mstQuestScriptRelease.json b/master/mstQuestScriptRelease.json index eb2edf1c6..9fb358318 100644 --- a/master/mstQuestScriptRelease.json +++ b/master/mstQuestScriptRelease.json @@ -22,6 +22,14 @@ "flag": 8, "condType": 1, "targetNum": 1 +}, { + "targetIds": [10065201], + "scriptId": 3001100, + "phase": 0, + "id": 1, + "flag": 8, + "condType": 113, + "targetNum": 1 }, { "targetIds": [91601804, 94041930, 94054830], "scriptId": 91601804, @@ -8190,4 +8198,12 @@ "flag": 8, "condType": 1, "targetNum": 1 +}, { + "targetIds": [10065202], + "scriptId": 94064915, + "phase": 0, + "id": 1, + "flag": 8, + "condType": 113, + "targetNum": 1 }] \ No newline at end of file diff --git a/master/mstShop.json b/master/mstShop.json index 051b20745..cd7d440fa 100644 --- a/master/mstShop.json +++ b/master/mstShop.json @@ -33928,7 +33928,7 @@ "eventId": 0, "slot": 0, "flag": 0, - "priority": 708, + "priority": 2013, "purchaseType": 4, "setNum": 1, "payType": 9, @@ -34043,6 +34043,39 @@ "bgImageId": 0, "openedAt": 1698202800, "closedAt": 1698505199 +}, { + "itemIds": [17], + "prices": [10], + "targetIds": [604200], + "script": {}, + "anotherPayType": 0, + "anotherItemIds": [], + "useAnotherPayCommonReleaseId": 0, + "freeShopCondId": 0, + "freeShopCondMessage": "", + "hideWarningMessageCondId": 0, + "freeShopReleaseDate": 0, + "id": 4000723, + "baseShopId": 4000723, + "eventId": 0, + "slot": 0, + "flag": 0, + "priority": 704, + "purchaseType": 4, + "setNum": 1, + "payType": 9, + "shopType": 7, + "limitNum": 1, + "defaultLv": 1, + "defaultLimitCount": 0, + "name": "빛의 코얀스카야", + "detail": "★5 빛의 코얀스카야로 교환", + "infoMessage": "", + "warningMessage": "", + "imageId": 0, + "bgImageId": 0, + "openedAt": 1698634800, + "closedAt": 1698850799 }, { "itemIds": [16], "prices": [7], diff --git a/master/mstSkill.json b/master/mstSkill.json index dd92a27a4..1abed6433 100644 --- a/master/mstSkill.json +++ b/master/mstSkill.json @@ -87197,6 +87197,39 @@ "maxLv": 10, "iconId": 608, "motion": 102 +}, { + "effectList": [], + "actIndividuality": [], + "script": {}, + "id": 980073, + "type": 1, + "name": "결전강화", + "ruby": "결전강화", + "maxLv": 10, + "iconId": 300, + "motion": 102 +}, { + "effectList": [], + "actIndividuality": [], + "script": {}, + "id": 980074, + "type": 1, + "name": "전선회복", + "ruby": "전선회복", + "maxLv": 10, + "iconId": 600, + "motion": 102 +}, { + "effectList": [], + "actIndividuality": [], + "script": {}, + "id": 980075, + "type": 1, + "name": "오더 체인지", + "ruby": "오더 체인지", + "maxLv": 10, + "iconId": 704, + "motion": 300 }, { "effectList": [], "actIndividuality": [], diff --git a/master/mstSkillDetail.json b/master/mstSkillDetail.json index 78dede212..13396259f 100644 --- a/master/mstSkillDetail.json +++ b/master/mstSkillDetail.json @@ -6806,6 +6806,18 @@ "id": 980072, "detail": "아군 한 명의 행동불능 상태・봉인 상태 해제&NP 증가", "detailShort": "아군 한 명의 행동불능 상태・봉인 상태 해제&NP 증가" +}, { + "id": 980073, + "detail": "아군 전체의 공격력 UP[{0}](1턴)&보구 위력 UP[{0}](1턴)", + "detailShort": "아군 전체의 공격력 UP[{0}](1턴)&보구 위력 UP[{0}](1턴)" +}, { + "id": 980074, + "detail": "아군 하나의 HP 회복[{0}](1턴)&공격 약화 상태 해제", + "detailShort": "아군 하나의 HP 회복[{0}](1턴)&공격 약화 상태 해제" +}, { + "id": 980075, + "detail": "배틀 중의 멤버를 서브 멤버로 교체한다", + "detailShort": "배틀 중의 멤버를 서브 멤버로 교체한다" }, { "id": 990001, "detail": "자신의 방어력 3% UP", diff --git a/master/mstSkillLv.json b/master/mstSkillLv.json index e7f6f037d..20ece8776 100644 --- a/master/mstSkillLv.json +++ b/master/mstSkillLv.json @@ -183903,6 +183903,276 @@ "chargeTurn": 10, "skillDetailId": 980072, "priority": 0 +}, { + "funcId": [152, 254], + "svals": ["[5000,1,-1,100]", "[5000,1,-1,100]"], + "script": {}, + "skillId": 980073, + "lv": 1, + "chargeTurn": 15, + "skillDetailId": 980073, + "priority": 0 +}, { + "funcId": [152, 254], + "svals": ["[5000,1,-1,110]", "[5000,1,-1,110]"], + "script": {}, + "skillId": 980073, + "lv": 2, + "chargeTurn": 15, + "skillDetailId": 980073, + "priority": 0 +}, { + "funcId": [152, 254], + "svals": ["[5000,1,-1,120]", "[5000,1,-1,120]"], + "script": {}, + "skillId": 980073, + "lv": 3, + "chargeTurn": 15, + "skillDetailId": 980073, + "priority": 0 +}, { + "funcId": [152, 254], + "svals": ["[5000,1,-1,130]", "[5000,1,-1,130]"], + "script": {}, + "skillId": 980073, + "lv": 4, + "chargeTurn": 15, + "skillDetailId": 980073, + "priority": 0 +}, { + "funcId": [152, 254], + "svals": ["[5000,1,-1,140]", "[5000,1,-1,140]"], + "script": {}, + "skillId": 980073, + "lv": 5, + "chargeTurn": 15, + "skillDetailId": 980073, + "priority": 0 +}, { + "funcId": [152, 254], + "svals": ["[5000,1,-1,150]", "[5000,1,-1,150]"], + "script": {}, + "skillId": 980073, + "lv": 6, + "chargeTurn": 14, + "skillDetailId": 980073, + "priority": 0 +}, { + "funcId": [152, 254], + "svals": ["[5000,1,-1,160]", "[5000,1,-1,160]"], + "script": {}, + "skillId": 980073, + "lv": 7, + "chargeTurn": 14, + "skillDetailId": 980073, + "priority": 0 +}, { + "funcId": [152, 254], + "svals": ["[5000,1,-1,170]", "[5000,1,-1,170]"], + "script": {}, + "skillId": 980073, + "lv": 8, + "chargeTurn": 14, + "skillDetailId": 980073, + "priority": 0 +}, { + "funcId": [152, 254], + "svals": ["[5000,1,-1,180]", "[5000,1,-1,180]"], + "script": {}, + "skillId": 980073, + "lv": 9, + "chargeTurn": 14, + "skillDetailId": 980073, + "priority": 0 +}, { + "funcId": [152, 254], + "svals": ["[5000,1,-1,200]", "[5000,1,-1,200]"], + "script": {}, + "skillId": 980073, + "lv": 10, + "chargeTurn": 13, + "skillDetailId": 980073, + "priority": 0 +}, { + "funcId": [442, 4775], + "svals": ["[1000,1000]", "[5000,NoCheckIndividualityIfNotUnit:1]"], + "script": {}, + "skillId": 980074, + "lv": 1, + "chargeTurn": 12, + "skillDetailId": 980074, + "priority": 0 +}, { + "funcId": [442, 4775], + "svals": ["[1000,1200]", "[5000,NoCheckIndividualityIfNotUnit:1]"], + "script": {}, + "skillId": 980074, + "lv": 2, + "chargeTurn": 12, + "skillDetailId": 980074, + "priority": 0 +}, { + "funcId": [442, 4775], + "svals": ["[1000,1400]", "[5000,NoCheckIndividualityIfNotUnit:1]"], + "script": {}, + "skillId": 980074, + "lv": 3, + "chargeTurn": 12, + "skillDetailId": 980074, + "priority": 0 +}, { + "funcId": [442, 4775], + "svals": ["[1000,1600]", "[5000,NoCheckIndividualityIfNotUnit:1]"], + "script": {}, + "skillId": 980074, + "lv": 4, + "chargeTurn": 12, + "skillDetailId": 980074, + "priority": 0 +}, { + "funcId": [442, 4775], + "svals": ["[1000,1800]", "[5000,NoCheckIndividualityIfNotUnit:1]"], + "script": {}, + "skillId": 980074, + "lv": 5, + "chargeTurn": 12, + "skillDetailId": 980074, + "priority": 0 +}, { + "funcId": [442, 4775], + "svals": ["[1000,2000]", "[5000,NoCheckIndividualityIfNotUnit:1]"], + "script": {}, + "skillId": 980074, + "lv": 6, + "chargeTurn": 11, + "skillDetailId": 980074, + "priority": 0 +}, { + "funcId": [442, 4775], + "svals": ["[1000,2200]", "[5000,NoCheckIndividualityIfNotUnit:1]"], + "script": {}, + "skillId": 980074, + "lv": 7, + "chargeTurn": 11, + "skillDetailId": 980074, + "priority": 0 +}, { + "funcId": [442, 4775], + "svals": ["[1000,2400]", "[5000,NoCheckIndividualityIfNotUnit:1]"], + "script": {}, + "skillId": 980074, + "lv": 8, + "chargeTurn": 11, + "skillDetailId": 980074, + "priority": 0 +}, { + "funcId": [442, 4775], + "svals": ["[1000,2600]", "[5000,NoCheckIndividualityIfNotUnit:1]"], + "script": {}, + "skillId": 980074, + "lv": 9, + "chargeTurn": 11, + "skillDetailId": 980074, + "priority": 0 +}, { + "funcId": [442, 4775], + "svals": ["[1000,3000]", "[5000,NoCheckIndividualityIfNotUnit:1]"], + "script": {}, + "skillId": 980074, + "lv": 10, + "chargeTurn": 10, + "skillDetailId": 980074, + "priority": 0 +}, { + "funcId": [531], + "svals": ["[1000,1]"], + "script": {}, + "skillId": 980075, + "lv": 1, + "chargeTurn": 15, + "skillDetailId": 980075, + "priority": 0 +}, { + "funcId": [531], + "svals": ["[1000,1]"], + "script": {}, + "skillId": 980075, + "lv": 2, + "chargeTurn": 15, + "skillDetailId": 980075, + "priority": 0 +}, { + "funcId": [531], + "svals": ["[1000,1]"], + "script": {}, + "skillId": 980075, + "lv": 3, + "chargeTurn": 15, + "skillDetailId": 980075, + "priority": 0 +}, { + "funcId": [531], + "svals": ["[1000,1]"], + "script": {}, + "skillId": 980075, + "lv": 4, + "chargeTurn": 15, + "skillDetailId": 980075, + "priority": 0 +}, { + "funcId": [531], + "svals": ["[1000,1]"], + "script": {}, + "skillId": 980075, + "lv": 5, + "chargeTurn": 15, + "skillDetailId": 980075, + "priority": 0 +}, { + "funcId": [531], + "svals": ["[1000,1]"], + "script": {}, + "skillId": 980075, + "lv": 6, + "chargeTurn": 14, + "skillDetailId": 980075, + "priority": 0 +}, { + "funcId": [531], + "svals": ["[1000,1]"], + "script": {}, + "skillId": 980075, + "lv": 7, + "chargeTurn": 14, + "skillDetailId": 980075, + "priority": 0 +}, { + "funcId": [531], + "svals": ["[1000,1]"], + "script": {}, + "skillId": 980075, + "lv": 8, + "chargeTurn": 14, + "skillDetailId": 980075, + "priority": 0 +}, { + "funcId": [531], + "svals": ["[1000,1]"], + "script": {}, + "skillId": 980075, + "lv": 9, + "chargeTurn": 14, + "skillDetailId": 980075, + "priority": 0 +}, { + "funcId": [531], + "svals": ["[1000,1]"], + "script": {}, + "skillId": 980075, + "lv": 10, + "chargeTurn": 13, + "skillDetailId": 980075, + "priority": 0 }, { "funcId": [175], "svals": ["[1000,-1,-1,30]"], diff --git a/master/mstSpot.json b/master/mstSpot.json index 00d4df3b3..04d33bfda 100644 --- a/master/mstSpot.json +++ b/master/mstSpot.json @@ -16434,6 +16434,34 @@ "activeTargetValue": 0, "closedMessage": "", "flag": 0 +}, { + "joinSpotIds": [], + "id": 30999, + "warId": 309, + "mapId": 309, + "name": "칼데아 게이트", + "imageId": 0, + "x": 0, + "y": 0, + "imageOfsX": 0, + "imageOfsY": 0, + "nameOfsX": 0, + "nameOfsY": 0, + "questOfsX": 0, + "questOfsY": 0, + "nextOfsX": 0, + "nextOfsY": 0, + "dispCondType1": 1, + "dispTargetId1": 0, + "dispTargetValue1": 0, + "dispCondType2": 1, + "dispTargetId2": 0, + "dispTargetValue2": 0, + "activeCondType": 1, + "activeTargetId": 0, + "activeTargetValue": 0, + "closedMessage": "", + "flag": 0 }, { "joinSpotIds": [], "id": 99001, diff --git a/master/mstSvtComment.json b/master/mstSvtComment.json index d83e255df..b9b9d516c 100644 --- a/master/mstSvtComment.json +++ b/master/mstSvtComment.json @@ -11285,7 +11285,7 @@ "id": 7, "priority": 0, "condMessage": "비영장생존권 퉁구스카 생추어리 에필로그 클리어 및 인연 Lv.5에서 개방", - "comment": "", + "comment": "태공망은 퉁구스카에 현계하면서\n달기와의 재회, 아니, 달기 퇴치에 의욕적이었지만,\n코얀스카야는 설마 했던 완전히 다른 인물이었다.\n\n그 일에 관해……\n태공망은 딱히 감상을 말하지 않는다.\n실망했다고도, 안심했다고도 말하지 않는다.\n\n그저, 애매한 미소를 지을 뿐이다.\n예상이 빗나가서 미안하다고 말해라, 라며\n니키티치가 추궁해도 단호하게 미소만 지을 뿐이다.\n\n◆\n\n과거, 태공망이 달기와 마음을 나누었다는 기록은 없다.\n‘봉신연의’에서 이야기하는 대로, 그는 달기를 쓰러트리고\n천수를 다한 은 왕조를 타도했다.\n그와 함께 싸웠던 동료들도 입을 모아 말할 것이다.\n태공망이 달기에게 농락당하다니 \n그런 일은 있을 수 없다, 라고.\n\n실제로 그는 농락당하지 않았다.\n오히려 달기에게 미움받았고,\n결국 태공망은 그녀를 직접 쓰러트렸다.\n\n“농락? 설마요.\n 그 여자에게 그런 말을 했다간 살해당할 겁니다.\n 다만, 그러네요.\n ───그 여자는 아름다웠다. 그것만은 사실입니다.”", "condType": 1, "condValue2": 0 }, { @@ -11355,7 +11355,7 @@ "id": 7, "priority": 0, "condMessage": "비영장생존권 퉁구스카 생추어리 에필로그 클리어 및 인연 Lv.5에서 개방", - "comment": "", + "comment": "───어째서, 그 자리에 영령이 현계할 수 있었는가?\n억지력의 구현에 의한 것인가?\n무언가의 기적에 의한 것인가?\n성배전쟁과 유사한, 어떠한 소환 의식에 의한 것인가?\n\n어쨌든, 본인이 입을 열지 않기에 사실은 알 수 없지만,\n도브리냐 니키티치 혹은\n도브리냐 니키티치를 자칭하는 이 영령은\n1908년 퉁구스카 대폭발 직후에, \n현지를 방문했을 가능성이 있다.\n\n그곳에서, 생명으로서 막 성립한 비스트 유체에,\n이 영령은 이름을 붙였다고 한다.\n\n이름은, 야스카야.\n\n이 설이 사실이라면,\n아홉 개의 꼬리를 지닌 인류악, \n금색백면과 모습이 비슷해진 타마모빗치 코얀스카야의……\n‘코얀스카야’ 부분의 이름을 지어준 자가\n이 영령이라는 뜻이 될 것이다.\n\n ◆\n\n칼데아에서 니키티치는\n코얀스카야에 관해서 꽤 신경을 쓰고 있다.\n기회가 있으면 친하게 지내고 싶다고 \n생각하는 듯하지만───", "condType": 1, "condValue2": 0 }, { @@ -17170,6 +17170,16 @@ "comment": "분위기를 파악할 줄 아는 여자로서, \n가정의 달 축제를 기념해 한발 앞서 칼데아에 나타난 \n수수께끼의 서번트.\n\n그 힘, 그 매력, 아직도 수수께끼에 싸인 S・P・Y.\n어디를 어떻게 봐도 칼데아와 적대하던 코얀스카야지만, \n본인의 말로는 “이젠 비스트 유체가 아니라 \n평범한 만능 미인 비서(빛)입니다”라고 하는데……?", "condType": 0, "condValue2": 0 +}, { + "condValues": [0], + "script": {}, + "svtId": 604200, + "id": 1, + "priority": 1, + "condMessage": "", + "comment": "로스트벨트 : 비스트Ⅳ의 봉신에 의해, \n떨어져 내린 코얀스카야의 두 파편, 그 한쪽.\n\n빛의 코얀스카야.\n칼데아와 적대하던 시절보다 \n아주 조금 더 인리를 존중하고, 인간에게 관대한 쪽.\n\n결혼 소망이 없는 타마모노마에…… \n아니 그거, 타마모노마에 맞아? 라는 의문은 제쳐 두고…… \n지배자, 신령(자연령)으로서의 측면이 강하다.\n", + "condType": 0, + "condValue2": 0 }, { "condValues": [1], "script": {}, @@ -17230,6 +17240,16 @@ "comment": "비스트란 ‘인류가 발전할 때 생기는 업’에 의해 태어나는 \n악이며, 비스트Ⅳ 후보였던 코얀스카야도 그중 하나다.\n\n이 코얀스카야는, \n‘인류에게 박해받은 것・인류가 박해할 때 쓴 것’ 중, \n‘박해할 때 쓴 것’ ……즉, ‘인류가 만들어 낸 살상 도구’를 \n망라하는 신령이 되었다. \n\n영기 제3이 되면 타마모노마에를 \n형성하는 문화를 리스펙트하여 \n병기대신(이쿠사우츠와노오오미카미)을 자칭한다.\n\n인류가 만들어 낸 모든 병기를 쓸 권리가 있으며, \n또한 그 성능을 극한까지 발휘하는 권능을 지닌다.\n빛 속성이 되었다고는 해도,\n인간혐오는 변함없다.\n\n‘인류 소탕’까지는 가지 않더라도, ‘슬슬 우쭐해진\n 인류를 따끔하게 교육해야 할까’ 같은 스탠스.\n\n‘■■■■ ■■’이 집합된 복수자.\n자연계의 보복 기구가 의신화한 존재이기는 하지만, \n타마모노마에를 원형으로 삼았기 때문인지, \n‘그건 그렇다 치고 자기 인생도 즐길게요☆’라는 \n인조이 기질이 강하다.\n\n그리고 가장 중요한 비밀로서, \n아무리 인류의 적대자이며 결혼원망이 없더라도 \n타마모노마에가 가진 ‘봉사체질’만은 \n없어지지 않았다는 점이 있다.\n\n참고로 여우(폭스)가 아니라 토끼(버니)다.", "condType": 9, "condValue2": 0 +}, { + "condValues": [3001101], + "script": {}, + "svtId": 604200, + "id": 7, + "priority": 1, + "condMessage": "", + "comment": "비스트란 ‘인류가 발전할 때 발생하는 업’에 의해 \n태어난 악이며, 비스트Ⅳ 후보였던 코얀스카야도 그 중 하나.\n\n이 코얀스카야는 ‘인류에게 박해당한 존재・인류가 박해에 \n사용한 존재’ 중 ‘박해에 사용한 존재’…… \n즉, ‘인류가 만들어 낸 살상 도구’를 망라하는 신령이 되었다. \n\n제3영기가 되면, \n타마모노마에를 형성한 문화를 리스펙트하며, \n병기대신(이쿠사우츠와노오오미카미)을 자칭한다.\n\n인류가 만들어낸 모든 병기를 사용할 권리가 있으며, \n또한 이 성능을 극한까지 발휘하는 권능을 지녔다.\n빛 속성이 되었다고 해도,\n인간혐오는 변하지 않았다.\n\n‘인류소탕’까지는 아니더라도, \n“우쭐해진 인류를 슬슬\n 따끔하게 교육해 줘 볼까?”라는 스탠스.\n\n‘동물들의 고통’이 집합된 복수자.\n자연계의 복수 기구가 의신화한 존재이긴 하지만, \n타마모노마에를 원형으로 삼았기 때문인지\n“그것은 그거고 제 인생은 즐길게요☆”라는 \n인조이 경향이 강하다.\n\n그리고 가장 중요한 비밀로서, \n아무리 인류의 적대자이며 결혼 소망이 없다고 해도, \n타마모노마에가 지닌 ‘봉사체질’ 만은 사라지지 않았다.\n\n참고로 여우(폭스)가 아니라 토끼(버니)다.", + "condType": 1, + "condValue2": 0 }, { "condValues": [0], "script": {}, diff --git a/master/mstSvtCommentAdd.json b/master/mstSvtCommentAdd.json index ee7a05dd5..1aeefb5df 100644 --- a/master/mstSvtCommentAdd.json +++ b/master/mstSvtCommentAdd.json @@ -1230,6 +1230,30 @@ "idx": 0, "condType": 0, "condValue2": 0 +}, { + "condValues": [3001101], + "svtId": 604200, + "id": 1, + "priority": 1, + "idx": 0, + "condType": 1, + "condValue2": 0 +}, { + "condValues": [5], + "svtId": 604200, + "id": 1, + "priority": 1, + "idx": 1, + "condType": 9, + "condValue2": 0 +}, { + "condValues": [5], + "svtId": 604200, + "id": 7, + "priority": 1, + "idx": 0, + "condType": 9, + "condValue2": 0 }, { "condValues": [1], "svtId": 702700, diff --git a/master/mstVoiceClosedMessage.json b/master/mstVoiceClosedMessage.json index 3ad3a2b21..e12f903ea 100644 --- a/master/mstVoiceClosedMessage.json +++ b/master/mstVoiceClosedMessage.json @@ -118,4 +118,7 @@ }, { "id": 42, "message": "인연 Lv.에 따라 + 칼데아 서머 어드벤처! 클리어로 개방" +}, { + "id": 43, + "message": "인연 Lv.에 따라 + 퉁구스카 생추어리 클리어로 개방" }] \ No newline at end of file diff --git a/master/mstVoiceCond.json b/master/mstVoiceCond.json index 3853df179..64fd4309a 100644 --- a/master/mstVoiceCond.json +++ b/master/mstVoiceCond.json @@ -11638,6 +11638,54 @@ "closedType": 2, "condPriority": 50, "closedMessageId": 0 +}, { + "svtId": 404300, + "voicePrefix": -1, + "voiceId": "H1800", + "condType": 1, + "targetId": 3001101, + "condGroup": 0, + "condValue": 0, + "priority": 1, + "closedType": 1, + "condPriority": 90, + "closedMessageId": 43 +}, { + "svtId": 404300, + "voicePrefix": -1, + "voiceId": "H1800", + "condType": 9, + "targetId": 404300, + "condGroup": 0, + "condValue": 5, + "priority": 1, + "closedType": 1, + "condPriority": 90, + "closedMessageId": 43 +}, { + "svtId": 404400, + "voicePrefix": -1, + "voiceId": "H240", + "condType": 1, + "targetId": 3001101, + "condGroup": 1, + "condValue": 0, + "priority": -1, + "closedType": 1, + "condPriority": 50, + "closedMessageId": 0 +}, { + "svtId": 404400, + "voicePrefix": -1, + "voiceId": "H240", + "condType": 8, + "targetId": 604200, + "condGroup": 1, + "condValue": 0, + "priority": 1, + "closedType": 1, + "condPriority": 50, + "closedMessageId": 0 }, { "svtId": 500100, "voicePrefix": -1, @@ -15922,6 +15970,30 @@ "closedType": 1, "condPriority": 50, "closedMessageId": 0 +}, { + "svtId": 604200, + "voicePrefix": 0, + "voiceId": "H1000", + "condType": 1, + "targetId": 3001101, + "condGroup": 0, + "condValue": 0, + "priority": 1, + "closedType": 1, + "condPriority": 90, + "closedMessageId": 43 +}, { + "svtId": 604200, + "voicePrefix": 0, + "voiceId": "H1000", + "condType": 9, + "targetId": 604200, + "condGroup": 0, + "condValue": 1, + "priority": 1, + "closedType": 1, + "condPriority": 90, + "closedMessageId": 43 }, { "svtId": 604200, "voicePrefix": 2, diff --git a/master/mstVoiceMaterialCond.json b/master/mstVoiceMaterialCond.json index 3123de876..42ca728b6 100644 --- a/master/mstVoiceMaterialCond.json +++ b/master/mstVoiceMaterialCond.json @@ -13408,6 +13408,15 @@ "condGroup": 1, "condType": 103, "targetId": 604200 +}, { + "condValues": [0, 1], + "svtId": 604200, + "voicePrefix": 0, + "voiceId": "H1000", + "idx": 1, + "condGroup": 1, + "condType": 103, + "targetId": 604200 }, { "condValues": [0, 1], "svtId": 604200, @@ -13489,6 +13498,15 @@ "condGroup": 1, "condType": 103, "targetId": 604200 +}, { + "condValues": [0, 1], + "svtId": 604200, + "voicePrefix": 0, + "voiceId": "H230", + "idx": 1, + "condGroup": 1, + "condType": 103, + "targetId": 604200 }, { "condValues": [3], "svtId": 604200, diff --git a/master/mstVoicePlayCond.json b/master/mstVoicePlayCond.json index 7b9780474..97d0e396c 100644 --- a/master/mstVoicePlayCond.json +++ b/master/mstVoicePlayCond.json @@ -2328,6 +2328,26 @@ "condGroup": 1, "condType": 81, "targetId": 2 +}, { + "condValues": [0], + "script": {}, + "svtId": 404300, + "voicePrefix": -1, + "voiceId": "H1800", + "idx": 1, + "condGroup": 1, + "condType": 1, + "targetId": 3001101 +}, { + "condValues": [0], + "script": {}, + "svtId": 404400, + "voicePrefix": -1, + "voiceId": "H250", + "idx": 1, + "condGroup": 1, + "condType": 1, + "targetId": 3001101 }, { "condValues": [0], "script": {}, diff --git a/master/mstWar.json b/master/mstWar.json index e0170ea74..8eda850af 100644 --- a/master/mstWar.json +++ b/master/mstWar.json @@ -587,14 +587,14 @@ "priority": 311, "parentWarId": 0, "materialParentWarId": 0, - "flag": 130, + "flag": 960, "emptyMessage": "퀘스트가 없습니다.", "bgmId": 0, "scriptId": "NONE", - "startType": 0, - "targetId": 0, + "startType": 2, + "targetId": 3001100, "eventId": 0, - "lastQuestId": 0, + "lastQuestId": 3001101, "assetId": 0 }, { "coordinates": [ diff --git a/master/mstWarAdd.json b/master/mstWarAdd.json index 43f08853f..8828f65d7 100644 --- a/master/mstWarAdd.json +++ b/master/mstWarAdd.json @@ -1282,6 +1282,30 @@ "value": 0, "startedAt": 1698202800, "endedAt": 1698505199 +}, { + "script": {}, + "warId": 309, + "type": 3, + "priority": 5, + "overwriteId": 314, + "overwriteStr": "", + "condType": 1, + "targetId": 94064901, + "value": 0, + "startedAt": 1698505200, + "endedAt": 1893423600 +}, { + "script": {}, + "warId": 309, + "type": 10, + "priority": 4, + "overwriteId": 13000, + "overwriteStr": "", + "condType": 1, + "targetId": 3000008, + "value": 0, + "startedAt": 1698505200, + "endedAt": 1893423600 }, { "script": {}, "warId": 309, @@ -1289,10 +1313,22 @@ "priority": 2, "overwriteId": 0, "overwriteStr": "", - "condType": 36, - "targetId": 94064914, + "condType": 1, + "targetId": 3001101, "value": 0, - "startedAt": 1593666000, + "startedAt": 1698505200, + "endedAt": 1893423600 +}, { + "script": {}, + "warId": 309, + "type": 16, + "priority": 3, + "overwriteId": 0, + "overwriteStr": "", + "condType": 1, + "targetId": 94064901, + "value": 0, + "startedAt": 1698505200, "endedAt": 1893423600 }, { "script": {}, @@ -1306,6 +1342,18 @@ "value": 0, "startedAt": 1698202800, "endedAt": 1893423600 +}, { + "script": {}, + "warId": 310, + "type": 14, + "priority": 1, + "overwriteId": 0, + "overwriteStr": "", + "condType": 1, + "targetId": 3001009, + "value": 0, + "startedAt": 1698505200, + "endedAt": 1893423600 }, { "script": {}, "warId": 8113, diff --git a/master/mstWarGroup.json b/master/mstWarGroup.json index bebae7fba..22d49f458 100644 --- a/master/mstWarGroup.json +++ b/master/mstWarGroup.json @@ -113,4 +113,9 @@ "warId": 308, "questAfterClear": 1, "questType": 1 +}, { + "id": 1, + "warId": 309, + "questAfterClear": 1, + "questType": 1 }] \ No newline at end of file diff --git a/master/viewEnemy.json b/master/viewEnemy.json index bc6c64c28..7df37cac8 100644 --- a/master/viewEnemy.json +++ b/master/viewEnemy.json @@ -13126,292 +13126,4 @@ "missionIds": [10180, 10181, 10182, 10183, 10184, 10185, 10186, 10187, 10188, 10189, 10190, 10191, 10192, 10193, 10194, 10195, 10196, 10197, 10198, 10199, 10200, 2001891, 2001892, 2001929, 2001930, 2001951, 2001952, 2001893, 2001923, 2001924, 2001949, 2001934, 2001912, 2001943], "impossibleKill": 0, "npcSvtId": 94061505 -}, { - "questId": 94065101, - "enemyId": 1, - "name": "AN602-Ivan", - "classId": 4, - "svtId": 9941110, - "limitCount": 1, - "iconId": 99411101, - "displayType": 1, - "missionIds": [10180, 10181, 10182, 10183, 10184, 10185, 10186, 10187, 10188, 10189, 10190, 10191, 10192, 10193, 10194, 10195, 10196, 10197, 10198, 10199, 10200, 2001891, 2001892, 2001929, 2001930, 2001951, 2001952, 2001894, 2001931, 2001950, 2001901, 2001935, 2001934, 2001914, 2001943], - "impossibleKill": 0, - "npcSvtId": 94065000 -}, { - "questId": 94065102, - "enemyId": 1, - "name": "AN602-Ivan", - "classId": 4, - "svtId": 9941110, - "limitCount": 1, - "iconId": 99411101, - "displayType": 1, - "missionIds": [10180, 10181, 10182, 10183, 10184, 10185, 10186, 10187, 10188, 10189, 10190, 10191, 10192, 10193, 10194, 10195, 10196, 10197, 10198, 10199, 10200, 2001891, 2001892, 2001929, 2001930, 2001951, 2001952, 2001894, 2001931, 2001950, 2001901, 2001935, 2001934, 2001914, 2001943], - "impossibleKill": 0, - "npcSvtId": 94065001 -}, { - "questId": 94065103, - "enemyId": 1, - "name": "AN602-Ivan", - "classId": 4, - "svtId": 9941110, - "limitCount": 1, - "iconId": 99411101, - "displayType": 1, - "missionIds": [10180, 10181, 10182, 10183, 10184, 10185, 10186, 10187, 10188, 10189, 10190, 10191, 10192, 10193, 10194, 10195, 10196, 10197, 10198, 10199, 10200, 2001891, 2001892, 2001929, 2001930, 2001951, 2001952, 2001894, 2001931, 2001950, 2001901, 2001935, 2001934, 2001914, 2001943], - "impossibleKill": 0, - "npcSvtId": 94065002 -}, { - "questId": 94065104, - "enemyId": 1, - "name": "R-36M2-Voevoda", - "classId": 1, - "svtId": 9941370, - "limitCount": 1, - "iconId": 99413701, - "displayType": 1, - "missionIds": [10180, 10181, 10182, 10183, 10184, 10185, 10186, 10187, 10188, 10189, 10190, 10191, 10192, 10193, 10194, 10195, 10196, 10197, 10198, 10199, 10200, 2001891, 2001892, 2001929, 2001930, 2001951, 2001952, 2001894, 2001931, 2001950, 2001936, 2001901, 2001935, 2001934, 2001912, 2001942], - "impossibleKill": 0, - "npcSvtId": 94065010 -}, { - "questId": 94065105, - "enemyId": 1, - "name": "R-36M2-Voevoda", - "classId": 1, - "svtId": 9941370, - "limitCount": 1, - "iconId": 99413701, - "displayType": 1, - "missionIds": [10180, 10181, 10182, 10183, 10184, 10185, 10186, 10187, 10188, 10189, 10190, 10191, 10192, 10193, 10194, 10195, 10196, 10197, 10198, 10199, 10200, 2001891, 2001892, 2001929, 2001930, 2001951, 2001952, 2001894, 2001931, 2001950, 2001936, 2001901, 2001935, 2001934, 2001912, 2001942], - "impossibleKill": 0, - "npcSvtId": 94065011 -}, { - "questId": 94065106, - "enemyId": 1, - "name": "R-36M2-Voevoda", - "classId": 1, - "svtId": 9941370, - "limitCount": 1, - "iconId": 99413701, - "displayType": 1, - "missionIds": [10180, 10181, 10182, 10183, 10184, 10185, 10186, 10187, 10188, 10189, 10190, 10191, 10192, 10193, 10194, 10195, 10196, 10197, 10198, 10199, 10200, 2001891, 2001892, 2001929, 2001930, 2001951, 2001952, 2001894, 2001931, 2001950, 2001936, 2001901, 2001935, 2001934, 2001912, 2001942], - "impossibleKill": 0, - "npcSvtId": 94065012 -}, { - "questId": 94065127, - "enemyId": 1, - "name": "로스트벨트: 비스트Ⅳ", - "classId": 29, - "svtId": 9943100, - "limitCount": 1, - "iconId": 99431001, - "displayType": 1, - "missionIds": [10180, 10181, 10182, 10183, 10184, 10185, 10186, 10187, 10188, 10189, 10190, 10191, 10192, 10193, 10194, 10195, 10196, 10197, 10198, 10199, 10200, 2001891, 2001892, 2001929, 2001930, 2001951, 2001952, 2001901, 2001935], - "impossibleKill": 0, - "npcSvtId": 94065040 -}, { - "questId": 94065127, - "enemyId": 2, - "name": "권속Ⅱ", - "classId": 3, - "svtId": 9941270, - "limitCount": 2, - "iconId": 99412702, - "displayType": 2, - "missionIds": [10180, 10181, 10182, 10183, 10184, 10185, 10186, 10187, 10188, 10189, 10190, 10191, 10192, 10193, 10194, 10195, 10196, 10197, 10198, 10199, 10200, 2001891, 2001892, 2001929, 2001930, 2001951, 2001952, 2001894, 2001931, 2001950, 2001936, 2001901, 2001935, 2001934, 2001913, 2001943], - "impossibleKill": 0, - "npcSvtId": 94065045 -}, { - "questId": 94065127, - "enemyId": 3, - "name": "권속Ⅵ", - "classId": 5, - "svtId": 9942910, - "limitCount": 1, - "iconId": 99429101, - "displayType": 2, - "missionIds": [10180, 10181, 10182, 10183, 10184, 10185, 10186, 10187, 10188, 10189, 10190, 10191, 10192, 10193, 10194, 10195, 10196, 10197, 10198, 10199, 10200, 2001891, 2001892, 2001929, 2001930, 2001951, 2001952, 2001894, 2001931, 2001950, 2001901, 2001935, 2001934, 2001912, 2001943], - "impossibleKill": 0, - "npcSvtId": 94065042 -}, { - "questId": 94065127, - "enemyId": 4, - "name": "권속Ⅵ", - "classId": 5, - "svtId": 9942900, - "limitCount": 1, - "iconId": 99429001, - "displayType": 2, - "missionIds": [10180, 10181, 10182, 10183, 10184, 10185, 10186, 10187, 10188, 10189, 10190, 10191, 10192, 10193, 10194, 10195, 10196, 10197, 10198, 10199, 10200, 2001891, 2001892, 2001929, 2001930, 2001951, 2001952, 2001894, 2001931, 2001950, 2001901, 2001935, 2001934, 2001912, 2001943], - "impossibleKill": 0, - "npcSvtId": 94065041 -}, { - "questId": 94065127, - "enemyId": 5, - "name": "권속Ⅱ", - "classId": 3, - "svtId": 9941260, - "limitCount": 2, - "iconId": 99412602, - "displayType": 2, - "missionIds": [10180, 10181, 10182, 10183, 10184, 10185, 10186, 10187, 10188, 10189, 10190, 10191, 10192, 10193, 10194, 10195, 10196, 10197, 10198, 10199, 10200, 2001891, 2001892, 2001929, 2001930, 2001951, 2001952, 2001894, 2001931, 2001950, 2001936, 2001901, 2001935, 2001934, 2001913, 2001943], - "impossibleKill": 0, - "npcSvtId": 94065044 -}, { - "questId": 94065127, - "enemyId": 6, - "name": "권속Ⅱ", - "classId": 3, - "svtId": 9941250, - "limitCount": 2, - "iconId": 99412502, - "displayType": 2, - "missionIds": [10180, 10181, 10182, 10183, 10184, 10185, 10186, 10187, 10188, 10189, 10190, 10191, 10192, 10193, 10194, 10195, 10196, 10197, 10198, 10199, 10200, 2001891, 2001892, 2001929, 2001930, 2001951, 2001952, 2001894, 2001931, 2001950, 2001936, 2001901, 2001935, 2001934, 2001913, 2001943], - "impossibleKill": 0, - "npcSvtId": 94065043 -}, { - "questId": 94065128, - "enemyId": 1, - "name": "로스트벨트: 비스트Ⅳ", - "classId": 29, - "svtId": 9943100, - "limitCount": 1, - "iconId": 99431001, - "displayType": 1, - "missionIds": [10180, 10181, 10182, 10183, 10184, 10185, 10186, 10187, 10188, 10189, 10190, 10191, 10192, 10193, 10194, 10195, 10196, 10197, 10198, 10199, 10200, 2001891, 2001892, 2001929, 2001930, 2001951, 2001952, 2001901, 2001935], - "impossibleKill": 0, - "npcSvtId": 94065046 -}, { - "questId": 94065128, - "enemyId": 2, - "name": "권속Ⅱ", - "classId": 3, - "svtId": 9941270, - "limitCount": 2, - "iconId": 99412702, - "displayType": 2, - "missionIds": [10180, 10181, 10182, 10183, 10184, 10185, 10186, 10187, 10188, 10189, 10190, 10191, 10192, 10193, 10194, 10195, 10196, 10197, 10198, 10199, 10200, 2001891, 2001892, 2001929, 2001930, 2001951, 2001952, 2001894, 2001931, 2001950, 2001936, 2001901, 2001935, 2001934, 2001913, 2001943], - "impossibleKill": 0, - "npcSvtId": 94065051 -}, { - "questId": 94065128, - "enemyId": 3, - "name": "권속Ⅵ", - "classId": 5, - "svtId": 9942910, - "limitCount": 1, - "iconId": 99429101, - "displayType": 2, - "missionIds": [10180, 10181, 10182, 10183, 10184, 10185, 10186, 10187, 10188, 10189, 10190, 10191, 10192, 10193, 10194, 10195, 10196, 10197, 10198, 10199, 10200, 2001891, 2001892, 2001929, 2001930, 2001951, 2001952, 2001894, 2001931, 2001950, 2001901, 2001935, 2001934, 2001912, 2001943], - "impossibleKill": 0, - "npcSvtId": 94065048 -}, { - "questId": 94065128, - "enemyId": 4, - "name": "권속Ⅵ", - "classId": 5, - "svtId": 9942900, - "limitCount": 1, - "iconId": 99429001, - "displayType": 2, - "missionIds": [10180, 10181, 10182, 10183, 10184, 10185, 10186, 10187, 10188, 10189, 10190, 10191, 10192, 10193, 10194, 10195, 10196, 10197, 10198, 10199, 10200, 2001891, 2001892, 2001929, 2001930, 2001951, 2001952, 2001894, 2001931, 2001950, 2001901, 2001935, 2001934, 2001912, 2001943], - "impossibleKill": 0, - "npcSvtId": 94065047 -}, { - "questId": 94065128, - "enemyId": 5, - "name": "권속Ⅱ", - "classId": 3, - "svtId": 9941260, - "limitCount": 2, - "iconId": 99412602, - "displayType": 2, - "missionIds": [10180, 10181, 10182, 10183, 10184, 10185, 10186, 10187, 10188, 10189, 10190, 10191, 10192, 10193, 10194, 10195, 10196, 10197, 10198, 10199, 10200, 2001891, 2001892, 2001929, 2001930, 2001951, 2001952, 2001894, 2001931, 2001950, 2001936, 2001901, 2001935, 2001934, 2001913, 2001943], - "impossibleKill": 0, - "npcSvtId": 94065050 -}, { - "questId": 94065128, - "enemyId": 6, - "name": "권속Ⅱ", - "classId": 3, - "svtId": 9941250, - "limitCount": 2, - "iconId": 99412502, - "displayType": 2, - "missionIds": [10180, 10181, 10182, 10183, 10184, 10185, 10186, 10187, 10188, 10189, 10190, 10191, 10192, 10193, 10194, 10195, 10196, 10197, 10198, 10199, 10200, 2001891, 2001892, 2001929, 2001930, 2001951, 2001952, 2001894, 2001931, 2001950, 2001936, 2001901, 2001935, 2001934, 2001913, 2001943], - "impossibleKill": 0, - "npcSvtId": 94065049 -}, { - "questId": 94065129, - "enemyId": 1, - "name": "로스트벨트: 비스트Ⅳ", - "classId": 29, - "svtId": 9943100, - "limitCount": 1, - "iconId": 99431001, - "displayType": 1, - "missionIds": [10180, 10181, 10182, 10183, 10184, 10185, 10186, 10187, 10188, 10189, 10190, 10191, 10192, 10193, 10194, 10195, 10196, 10197, 10198, 10199, 10200, 2001891, 2001892, 2001929, 2001930, 2001951, 2001952, 2001901, 2001935], - "impossibleKill": 0, - "npcSvtId": 94065052 -}, { - "questId": 94065129, - "enemyId": 2, - "name": "권속Ⅱ", - "classId": 3, - "svtId": 9941270, - "limitCount": 2, - "iconId": 99412702, - "displayType": 2, - "missionIds": [10180, 10181, 10182, 10183, 10184, 10185, 10186, 10187, 10188, 10189, 10190, 10191, 10192, 10193, 10194, 10195, 10196, 10197, 10198, 10199, 10200, 2001891, 2001892, 2001929, 2001930, 2001951, 2001952, 2001894, 2001931, 2001950, 2001936, 2001901, 2001935, 2001934, 2001913, 2001943], - "impossibleKill": 0, - "npcSvtId": 94065057 -}, { - "questId": 94065129, - "enemyId": 3, - "name": "권속Ⅵ", - "classId": 5, - "svtId": 9942910, - "limitCount": 1, - "iconId": 99429101, - "displayType": 2, - "missionIds": [10180, 10181, 10182, 10183, 10184, 10185, 10186, 10187, 10188, 10189, 10190, 10191, 10192, 10193, 10194, 10195, 10196, 10197, 10198, 10199, 10200, 2001891, 2001892, 2001929, 2001930, 2001951, 2001952, 2001894, 2001931, 2001950, 2001901, 2001935, 2001934, 2001912, 2001943], - "impossibleKill": 0, - "npcSvtId": 94065054 -}, { - "questId": 94065129, - "enemyId": 4, - "name": "권속Ⅵ", - "classId": 5, - "svtId": 9942900, - "limitCount": 1, - "iconId": 99429001, - "displayType": 2, - "missionIds": [10180, 10181, 10182, 10183, 10184, 10185, 10186, 10187, 10188, 10189, 10190, 10191, 10192, 10193, 10194, 10195, 10196, 10197, 10198, 10199, 10200, 2001891, 2001892, 2001929, 2001930, 2001951, 2001952, 2001894, 2001931, 2001950, 2001901, 2001935, 2001934, 2001912, 2001943], - "impossibleKill": 0, - "npcSvtId": 94065053 -}, { - "questId": 94065129, - "enemyId": 5, - "name": "권속Ⅱ", - "classId": 3, - "svtId": 9941260, - "limitCount": 2, - "iconId": 99412602, - "displayType": 2, - "missionIds": [10180, 10181, 10182, 10183, 10184, 10185, 10186, 10187, 10188, 10189, 10190, 10191, 10192, 10193, 10194, 10195, 10196, 10197, 10198, 10199, 10200, 2001891, 2001892, 2001929, 2001930, 2001951, 2001952, 2001894, 2001931, 2001950, 2001936, 2001901, 2001935, 2001934, 2001913, 2001943], - "impossibleKill": 0, - "npcSvtId": 94065056 -}, { - "questId": 94065129, - "enemyId": 6, - "name": "권속Ⅱ", - "classId": 3, - "svtId": 9941250, - "limitCount": 2, - "iconId": 99412502, - "displayType": 2, - "missionIds": [10180, 10181, 10182, 10183, 10184, 10185, 10186, 10187, 10188, 10189, 10190, 10191, 10192, 10193, 10194, 10195, 10196, 10197, 10198, 10199, 10200, 2001891, 2001892, 2001929, 2001930, 2001951, 2001952, 2001894, 2001931, 2001950, 2001936, 2001901, 2001935, 2001934, 2001913, 2001943], - "impossibleKill": 0, - "npcSvtId": 94065055 }] \ No newline at end of file diff --git a/master/viewQuestEnemyInfo.json b/master/viewQuestEnemyInfo.json index c701ec893..f12b61b37 100644 --- a/master/viewQuestEnemyInfo.json +++ b/master/viewQuestEnemyInfo.json @@ -898,31 +898,4 @@ }, { "questId": 94061640, "enemyNum": 2 -}, { - "questId": 94065101, - "enemyNum": 1 -}, { - "questId": 94065102, - "enemyNum": 1 -}, { - "questId": 94065103, - "enemyNum": 1 -}, { - "questId": 94065104, - "enemyNum": 1 -}, { - "questId": 94065105, - "enemyNum": 1 -}, { - "questId": 94065106, - "enemyNum": 1 -}, { - "questId": 94065127, - "enemyNum": 6 -}, { - "questId": 94065128, - "enemyNum": 6 -}, { - "questId": 94065129, - "enemyNum": 6 }] \ No newline at end of file diff --git a/master/viewQuestInfo.json b/master/viewQuestInfo.json index d342f3f32..1d417e812 100644 --- a/master/viewQuestInfo.json +++ b/master/viewQuestInfo.json @@ -1198,40 +1198,4 @@ "questId": 94061640, "dropSvtNum": 0, "dropItemNum": 1 -}, { - "questId": 94065101, - "dropSvtNum": 0, - "dropItemNum": 8 -}, { - "questId": 94065102, - "dropSvtNum": 0, - "dropItemNum": 8 -}, { - "questId": 94065103, - "dropSvtNum": 0, - "dropItemNum": 8 -}, { - "questId": 94065104, - "dropSvtNum": 0, - "dropItemNum": 8 -}, { - "questId": 94065105, - "dropSvtNum": 0, - "dropItemNum": 8 -}, { - "questId": 94065106, - "dropSvtNum": 0, - "dropItemNum": 8 -}, { - "questId": 94065127, - "dropSvtNum": 0, - "dropItemNum": 30 -}, { - "questId": 94065128, - "dropSvtNum": 0, - "dropItemNum": 30 -}, { - "questId": 94065129, - "dropSvtNum": 0, - "dropItemNum": 30 }] \ No newline at end of file