chore: code merge #14

MC1-morning-coffee · Mar 30, 2023 · ff92c3b · ff92c3b
1 parent 9d566a1
commit ff92c3b
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 0 deletions.
diff --git 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
@@ -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
@@ -77,6 +77,10 @@ struct SequenceEndingView: View {
     var currentSceneCount: Int = 0
 
     private func updateCurrentSequence() {
+        if globalStore.scriptCount > 7 {
+            return
+        }
+
         if !globalStore.isTapAble{
             return
         }