diff --git a/Config/GlobalConfig/GameCoreConstValue.json b/Config/GlobalConfig/GameCoreConstValue.json index 9366d5dea..00e5d6fcc 100644 --- a/Config/GlobalConfig/GameCoreConstValue.json +++ b/Config/GlobalConfig/GameCoreConstValue.json @@ -864,7 +864,7 @@ "ProjectileCurveAsset": [ "Projectile/ProjectileSpeedCurve.asset" ], - "GameCoreDesignDataVersion": 9988961, + "GameCoreDesignDataVersion": 10022220, "MainMonsterUniqueName": "CurMainMonster", "StanceBreakActionDelayChangeRatio": { "Value": 0.25 diff --git a/Config/Level/GroupGraph/F20423001/Group_F20423001_G30.json b/Config/Level/GroupGraph/F20423001/Group_F20423001_G30.json index 5a1903756..5fad4a675 100644 --- a/Config/Level/GroupGraph/F20423001/Group_F20423001_G30.json +++ b/Config/Level/GroupGraph/F20423001/Group_F20423001_G30.json @@ -670,6 +670,59 @@ ] } ] + }, + { + "TaskList": [ + { + "$type": "RPG.GameCore.PredicateTaskList", + "Predicate": { + "$type": "RPG.GameCore.ByAnd", + "PredicateList": [ + { + "$type": "RPG.GameCore.ByCheckTimelineEntityState", + "Target": { + "$type": "RPG.GameCore.GroupFetchLocalTarget", + "TargetType": "Prop", + "Targets": [ + 300009 + ] + }, + "StateName": { + "Value": "L1_Angle02" + } + }, + { + "$type": "RPG.GameCore.ByCheckTimelineEntityState", + "Target": { + "$type": "RPG.GameCore.GroupFetchLocalTarget", + "TargetType": "Prop", + "Targets": [ + 300010 + ] + }, + "StateName": { + "Value": "L1_Angle01" + } + } + ] + }, + "SuccessTaskList": [ + { + "$type": "RPG.GameCore.SetTimelineEntityState", + "Target": { + "$type": "RPG.GameCore.GroupFetchLocalTarget", + "TargetType": "Prop", + "Targets": [ + 300004 + ] + }, + "StateName": { + "Value": "L0_Root" + } + } + ] + } + ] } ], "Type": "Group", diff --git a/Config/Level/LevelInstanceGraph/F30532001/LG_Prop_F30532001_G13_300002.json b/Config/Level/LevelInstanceGraph/F30532001/LG_Prop_F30532001_G13_300002.json index 3a30a5829..a41da86c3 100644 --- a/Config/Level/LevelInstanceGraph/F30532001/LG_Prop_F30532001_G13_300002.json +++ b/Config/Level/LevelInstanceGraph/F30532001/LG_Prop_F30532001_G13_300002.json @@ -81,7 +81,6 @@ }, { "$type": "RPG.GameCore.ShowGuideHintWithText", - "Block": true, "TargetEvent": [ { "$type": "RPG.GameCore.WaitForWithTaskList", diff --git a/Config/Level/Mission/3040050/Act/Act304005000.json b/Config/Level/Mission/3040050/Act/Act304005000.json index d9868d16b..a61db2283 100644 --- a/Config/Level/Mission/3040050/Act/Act304005000.json +++ b/Config/Level/Mission/3040050/Act/Act304005000.json @@ -3,6 +3,16 @@ "OnStartSequece": [ { "TaskList": [ + { + "$type": "RPG.GameCore.CollectDataConditions", + "TaskIDList": [], + "MainMissionIDList": [ + 1040309 + ], + "PerformanceIDList": [], + "PerformanceIDDsList": [], + "CustomValueMainMissionIDList": [] + }, { "$type": "RPG.GameCore.LevelPerformanceInitialize", "PerformanceType": "E", @@ -51,140 +61,287 @@ ] }, { - "$type": "RPG.GameCore.PlaySequenceDialogue", - "Dialogues": [ + "$type": "RPG.GameCore.PredicateTaskList", + "Predicate": { + "$type": "RPG.GameCore.ByCompareMainMissionState", + "MainMissionID": 1040309 + }, + "SuccessTaskList": [ { - "$type": "RPG.GameCore.PlayAndWaitSimpleTalk", - "SimpleTalkList": [ + "$type": "RPG.GameCore.PlaySequenceDialogue", + "Dialogues": [ { - "TextSpeed": 0, - "TalkSentenceID": 504059901, - "ProtectTime": 0 - }, - { - "TextSpeed": 0, - "TalkSentenceID": 504059902, - "ProtectTime": 0 - }, - { - "TextSpeed": 0, - "TalkSentenceID": 504059903, - "ProtectTime": 0 - }, - { - "TextSpeed": 0, - "TalkSentenceID": 504059904, - "ProtectTime": 0 - }, - { - "TextSpeed": 0, - "TalkSentenceID": 504059905, - "ProtectTime": 0 - }, - { - "TextSpeed": 0, - "TalkSentenceID": 504059906, - "ProtectTime": 0 - } - ] - }, - { - "$type": "RPG.GameCore.PlayAndWaitSimpleTalk", - "SimpleTalkList": [ - { - "TextSpeed": 0, - "TalkSentenceID": 504059921, - "ProtectTime": 0 - }, - { - "TextSpeed": 0, - "TalkSentenceID": 504059922, - "ProtectTime": 0 - }, - { - "TextSpeed": 0, - "TalkSentenceID": 504059923, - "ProtectTime": 0 - }, - { - "TextSpeed": 0, - "TalkSentenceID": 504059924, - "ProtectTime": 0 - }, - { - "TextSpeed": 0, - "TalkSentenceID": 504059925, - "ProtectTime": 0 - }, - { - "TextSpeed": 0, - "TalkSentenceID": 504059926, - "ProtectTime": 0 - } - ] - }, - { - "$type": "RPG.GameCore.PlayAndWaitSimpleTalk", - "SimpleTalkList": [ - { - "TextSpeed": 0, - "TalkSentenceID": 504059941, - "ProtectTime": 0 - }, - { - "TextSpeed": 0, - "TalkSentenceID": 504059942, - "ProtectTime": 0 - }, - { - "TextSpeed": 0, - "TalkSentenceID": 504059943, - "ProtectTime": 0 - }, - { - "TextSpeed": 0, - "TalkSentenceID": 504059944, - "ProtectTime": 0 - }, - { - "TextSpeed": 0, - "TalkSentenceID": 504059945, - "ProtectTime": 0 - }, - { - "TextSpeed": 0, - "TalkSentenceID": 504059946, - "ProtectTime": 0 - } - ] - } - ] - }, - { - "$type": "RPG.GameCore.PlayFullScreenTransfer", - "PostDuration": -1, - "Action": [ - { - "$type": "RPG.GameCore.ScrTrfActTaskList", - "TaskList": [ - { - "$type": "RPG.GameCore.AdvDestroyGroupEntity", - "InstanceIDList": [ - 400001 + "$type": "RPG.GameCore.PlayAndWaitSimpleTalk", + "SimpleTalkList": [ + { + "TextSpeed": 0, + "TalkSentenceID": 304005741, + "ProtectTime": 0 + }, + { + "TextSpeed": 0, + "TalkSentenceID": 304005742, + "ProtectTime": 0 + }, + { + "TextSpeed": 0, + "TalkSentenceID": 304005743, + "ProtectTime": 0 + }, + { + "TextSpeed": 0, + "TalkSentenceID": 304005744, + "ProtectTime": 0 + }, + { + "TextSpeed": 0, + "TalkSentenceID": 304005745, + "ProtectTime": 0 + }, + { + "TextSpeed": 0, + "TalkSentenceID": 304005746, + "ProtectTime": 0 + } ] }, { - "$type": "RPG.GameCore.ActiveVirtualCamera", - "AreaName": "LevelArea_P10402_F10402001_G49", - "AnchorName": "Anchor1", - "IsActive": false + "$type": "RPG.GameCore.PlayAndWaitSimpleTalk", + "SimpleTalkList": [ + { + "TextSpeed": 0, + "TalkSentenceID": 304005747, + "ProtectTime": 0 + }, + { + "TextSpeed": 0, + "TalkSentenceID": 304005748, + "ProtectTime": 0 + }, + { + "TextSpeed": 0, + "TalkSentenceID": 304005749, + "ProtectTime": 0 + }, + { + "TextSpeed": 0, + "TalkSentenceID": 304005750, + "ProtectTime": 0 + }, + { + "TextSpeed": 0, + "TalkSentenceID": 304005751, + "ProtectTime": 0 + }, + { + "TextSpeed": 0, + "TalkSentenceID": 304005752, + "ProtectTime": 0 + } + ] + }, + { + "$type": "RPG.GameCore.PlayAndWaitSimpleTalk", + "SimpleTalkList": [ + { + "TextSpeed": 0, + "TalkSentenceID": 304005753, + "ProtectTime": 0 + }, + { + "TextSpeed": 0, + "TalkSentenceID": 304005754, + "ProtectTime": 0 + }, + { + "TextSpeed": 0, + "TalkSentenceID": 304005755, + "ProtectTime": 0 + }, + { + "TextSpeed": 0, + "TalkSentenceID": 304005756, + "ProtectTime": 0 + }, + { + "TextSpeed": 0, + "TalkSentenceID": 304005757, + "ProtectTime": 0 + }, + { + "TextSpeed": 0, + "TalkSentenceID": 304005758, + "ProtectTime": 0 + } + ] } ] + }, + { + "$type": "RPG.GameCore.PlayFullScreenTransfer", + "PostDuration": -1, + "Action": [ + { + "$type": "RPG.GameCore.ScrTrfActTaskList", + "TaskList": [ + { + "$type": "RPG.GameCore.AdvDestroyGroupEntity", + "InstanceIDList": [ + 400001 + ] + }, + { + "$type": "RPG.GameCore.ActiveVirtualCamera", + "AreaName": "LevelArea_P10402_F10402001_G49", + "AnchorName": "Anchor1", + "IsActive": false + } + ] + } + ] + }, + { + "$type": "RPG.GameCore.EndPerformance" + } + ], + "FailedTaskList": [ + { + "$type": "RPG.GameCore.PlaySequenceDialogue", + "Dialogues": [ + { + "$type": "RPG.GameCore.PlayAndWaitSimpleTalk", + "SimpleTalkList": [ + { + "TextSpeed": 0, + "TalkSentenceID": 504059901, + "ProtectTime": 0 + }, + { + "TextSpeed": 0, + "TalkSentenceID": 504059902, + "ProtectTime": 0 + }, + { + "TextSpeed": 0, + "TalkSentenceID": 504059903, + "ProtectTime": 0 + }, + { + "TextSpeed": 0, + "TalkSentenceID": 504059904, + "ProtectTime": 0 + }, + { + "TextSpeed": 0, + "TalkSentenceID": 504059905, + "ProtectTime": 0 + }, + { + "TextSpeed": 0, + "TalkSentenceID": 504059906, + "ProtectTime": 0 + } + ] + }, + { + "$type": "RPG.GameCore.PlayAndWaitSimpleTalk", + "SimpleTalkList": [ + { + "TextSpeed": 0, + "TalkSentenceID": 504059921, + "ProtectTime": 0 + }, + { + "TextSpeed": 0, + "TalkSentenceID": 504059922, + "ProtectTime": 0 + }, + { + "TextSpeed": 0, + "TalkSentenceID": 504059923, + "ProtectTime": 0 + }, + { + "TextSpeed": 0, + "TalkSentenceID": 504059924, + "ProtectTime": 0 + }, + { + "TextSpeed": 0, + "TalkSentenceID": 504059925, + "ProtectTime": 0 + }, + { + "TextSpeed": 0, + "TalkSentenceID": 504059926, + "ProtectTime": 0 + } + ] + }, + { + "$type": "RPG.GameCore.PlayAndWaitSimpleTalk", + "SimpleTalkList": [ + { + "TextSpeed": 0, + "TalkSentenceID": 504059941, + "ProtectTime": 0 + }, + { + "TextSpeed": 0, + "TalkSentenceID": 504059942, + "ProtectTime": 0 + }, + { + "TextSpeed": 0, + "TalkSentenceID": 504059943, + "ProtectTime": 0 + }, + { + "TextSpeed": 0, + "TalkSentenceID": 504059944, + "ProtectTime": 0 + }, + { + "TextSpeed": 0, + "TalkSentenceID": 504059945, + "ProtectTime": 0 + }, + { + "TextSpeed": 0, + "TalkSentenceID": 504059946, + "ProtectTime": 0 + } + ] + } + ] + }, + { + "$type": "RPG.GameCore.PlayFullScreenTransfer", + "PostDuration": -1, + "Action": [ + { + "$type": "RPG.GameCore.ScrTrfActTaskList", + "TaskList": [ + { + "$type": "RPG.GameCore.AdvDestroyGroupEntity", + "InstanceIDList": [ + 400001 + ] + }, + { + "$type": "RPG.GameCore.ActiveVirtualCamera", + "AreaName": "LevelArea_P10402_F10402001_G49", + "AnchorName": "Anchor1", + "IsActive": false + } + ] + } + ] + }, + { + "$type": "RPG.GameCore.EndPerformance" } ] - }, - { - "$type": "RPG.GameCore.EndPerformance" } ] }, @@ -198,5 +355,6 @@ } ] } - ] + ], + "EntityEventList": [] } \ No newline at end of file diff --git a/Config/Level/PropDialogue/P10402/F10402001_G49/DialogueMain_F10402001_G49_P300001.json b/Config/Level/PropDialogue/P10402/F10402001_G49/DialogueMain_F10402001_G49_P300001.json index 8890b9bef..fc985f197 100644 --- a/Config/Level/PropDialogue/P10402/F10402001_G49/DialogueMain_F10402001_G49_P300001.json +++ b/Config/Level/PropDialogue/P10402/F10402001_G49/DialogueMain_F10402001_G49_P300001.json @@ -8,8 +8,7 @@ "TaskIDList": [], "MainMissionIDList": [ 1040213, - 1040110, - 1040309 + 1040110 ], "PerformanceIDList": [], "PerformanceIDDsList": [], @@ -30,37 +29,15 @@ }, "SuccessTaskList": [ { - "$type": "RPG.GameCore.PredicateTaskList", - "Predicate": { - "$type": "RPG.GameCore.ByCompareMainMissionState", - "MainMissionID": 1040309 - }, - "SuccessTaskList": [ - { - "$type": "RPG.GameCore.TriggerPerformance", - "ValueSource": {}, - "PerformanceType": "E", - "PerformanceID": 304005036, - "MaskConfig": { - "UseExcelData": false, - "StartBlack": "NoPost", - "EndBlack": "NoPre" - } - } - ], - "FailedTaskList": [ - { - "$type": "RPG.GameCore.TriggerPerformance", - "ValueSource": {}, - "PerformanceType": "E", - "PerformanceID": 304005000, - "MaskConfig": { - "UseExcelData": false, - "StartBlack": "NoPost", - "EndBlack": "NoPre" - } - } - ] + "$type": "RPG.GameCore.TriggerPerformance", + "ValueSource": {}, + "PerformanceType": "E", + "PerformanceID": 304005000, + "MaskConfig": { + "UseExcelData": false, + "StartBlack": "NoPost", + "EndBlack": "NoPre" + } } ], "FailedTaskList": [ diff --git a/Config/Level/Tutorial/InBattle/Tutorial_7019.json b/Config/Level/Tutorial/InBattle/Tutorial_7019.json index 87e6b111a..9d59adafd 100644 --- a/Config/Level/Tutorial/InBattle/Tutorial_7019.json +++ b/Config/Level/Tutorial/InBattle/Tutorial_7019.json @@ -7,7 +7,8 @@ "$type": "RPG.GameCore.WaitCustomString", "CustomString": { "Value": "Castorice_Tutorial_WaveMonster_01" - } + }, + "GoNextImmediately": true }, { "$type": "RPG.GameCore.ShowTutorialUI", @@ -46,7 +47,8 @@ "$type": "RPG.GameCore.WaitCustomString", "CustomString": { "Value": "Castorice_Tutorial_Skill_02" - } + }, + "GoNextImmediately": true }, { "$type": "RPG.GameCore.ShowGuideHintWithText", @@ -81,7 +83,8 @@ "$type": "RPG.GameCore.WaitCustomString", "CustomString": { "Value": "Castorice_Tutorial_Bomb_Pre" - } + }, + "GoNextImmediately": true }, { "$type": "RPG.GameCore.PauseGame",