From ff92c3be071b528b09de17bef26032513c6531d8 Mon Sep 17 00:00:00 2001 From: yuncoffee Date: Fri, 31 Mar 2023 05:37:46 +0900 Subject: [PATCH] chore: code merge #14 --- ContentView.swift | 7 +++++++ Data/Global/globalStore.swift | 3 +++ View/SceneView/SequenceView/SequenceEndingView.swift | 4 ++++ 3 files changed, 14 insertions(+) diff --git a/ContentView.swift b/ContentView.swift index 85788f6..6c59e43 100644 --- a/ContentView.swift +++ b/ContentView.swift @@ -9,6 +9,7 @@ struct ContentView: View { var body: some View { GeometryReader { geo in ZStack(alignment: .topLeading) { + VStack(spacing: 0){ SceneView() if globalStore.isScriptBoxOpen { @@ -25,6 +26,12 @@ struct ContentView: View { .offset(y: geo.size.height - SCRIPT_BOX_HEIGHT) .frame(width: geo.size.width, height: SCRIPT_BOX_HEIGHT) } + if globalStore.isMovieStart { + SequenceIntroView() + .onTapGesture { + globalStore.isMovieStart = false + } + } } } .onAppear{ diff --git a/Data/Global/globalStore.swift b/Data/Global/globalStore.swift index e0aa32e..187741d 100644 --- a/Data/Global/globalStore.swift +++ b/Data/Global/globalStore.swift @@ -128,6 +128,9 @@ class GlobalStore: ObservableObject { @Published var paddleCount = 0 + @Published + var isMovieStart = true + func resetUI() { turnOffIsPopupActive() turnOffIsFaceViewActive() diff --git a/View/SceneView/SequenceView/SequenceEndingView.swift b/View/SceneView/SequenceView/SequenceEndingView.swift index 10d19b8..10fd5f6 100644 --- a/View/SceneView/SequenceView/SequenceEndingView.swift +++ b/View/SceneView/SequenceView/SequenceEndingView.swift @@ -77,6 +77,10 @@ struct SequenceEndingView: View { var currentSceneCount: Int = 0 private func updateCurrentSequence() { + if globalStore.scriptCount > 7 { + return + } + if !globalStore.isTapAble{ return }