feat: sequenceOne #14

MC1-morning-coffee · Mar 30, 2023 · e2553bd · e2553bd
1 parent e3f4ed1
commit e2553bd
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 28 deletions.
diff --git a/Data/Global/globalStore.swift b/Data/Global/globalStore.swift
@@ -38,6 +38,7 @@ enum EnumDetailImage: CaseIterable {
     case Redkey // 열쇠 중 1개(커피)를 선택한다.
     case Water
     case Door
+    case Treasure
 }
 
 // 이미지를 교체하기 위한 EnumDirection

diff --git a/...ar/Object_Treasure.imageset/Contents.json → ...290/Image_Treasure.imageset/Contents.json b/...ar/Object_Treasure.imageset/Contents.json → ...290/Image_Treasure.imageset/Contents.json
diff --git a/...ect_Treasure.imageset/Object_Treasure.png → ...age_Treasure.imageset/Object_Treasure.png b/...ect_Treasure.imageset/Object_Treasure.png → ...age_Treasure.imageset/Object_Treasure.png
diff --git a/Utils/Scene/handleSequenceOne.swift b/Utils/Scene/handleSequenceOne.swift
@@ -24,7 +24,10 @@ func handleSequenceOne(globalStore: GlobalStore){
             globalStore.turnOffIsFaceViewActive()
             globalStore.turnOnIsQuizSequence()
             globalStore.turnOffIsTapAble()
-
+        case 7:
+            globalStore.turnOffIsFaceViewActive()
+        case 8:
+            globalStore.turnOnIsFaceViewActive()
         //case 7: handleSequenceQuizOne() //실행될 것
     default:
         print("sequence one is Ready")

diff --git a/Utils/Scene/handleSequenceThree.swift b/Utils/Scene/handleSequenceThree.swift
@@ -16,18 +16,23 @@ func handleSequenceThree(globalStore: GlobalStore){
          */
         case 0:
             globalStore.resetUI()
-            globalStore.toggleIsFaceViewActive() // true
+            globalStore.turnOnIsFaceViewActive()
         case 6:
+            globalStore.turnOffIsFaceViewActive()
             globalStore.toggleIsFaceViewActive() // false
         case 7:
             print("배가 만들어지는 이벤트 진행")
         case 8:
-            globalStore.toggleIsFaceViewActive() // true
+            globalStore.turnOnIsFaceViewActive()
 //        case 14:
 ////            globalStore.toggleIsFaceViewActive() // false
 //        case 16:
 ////            globalStore.toggleIsFaceViewActive() // true
-//        ...
+        case 24:
+        globalStore.updateCurrentDetailImage(detailImage: .Treasure)
+        globalStore.turnOnIsPopupActive()
+        case 25:
+        globalStore.turnOffIsPopupActive()
     default:
         print("sequence one is Ready")
     }

diff --git a/View/SceneView/SequenceView/SequenceOneView.swift b/View/SceneView/SequenceView/SequenceOneView.swift
@@ -34,44 +34,37 @@ struct SequenceOneView: View {
 
     private func handleSequenceView(scriptCount: Int) {
         switch scriptCount {
-        case 1, 4, 5, 6, 10, 11:
-            isCharacterMove = false
-            print("scriptCount", scriptCount)
-
-            DispatchQueue.main.asyncAfter(deadline: .now() + 0.001) {
-                isCharacterMove = true
+        case 0:
+            setTimeoutClosure(timeCount: 3000) {
+                isJolJolMove = true
             }
-        case 2: // JolJol 나옴
+        case 10, 11:
             isCharacterMove = false
             print("scriptCount", scriptCount)
 
             DispatchQueue.main.asyncAfter(deadline: .now() + 0.001) {
                 isCharacterMove = true
             }
-            isJolJolMove = true
+         // JolJol 나옴
+//            isCharacterMove = false
+//            print("scriptCount", scriptCount)
+//            
+//            DispatchQueue.main.asyncAfter(deadline: .now() + 0.001) {
+//                isCharacterMove = true
+//            }
         case 3: // JolJol 움직임
-            isCharacterMove = false
+//            isCharacterMove = false
             isJolJolMove = false
-            print("scriptCount", scriptCount)
-            
-            DispatchQueue.main.asyncAfter(deadline: .now() + 0.001) {
-                isCharacterMove = true
-            }
+//            print("scriptCount", scriptCount)
+//
+//            DispatchQueue.main.asyncAfter(deadline: .now() + 0.001) {
+//                isCharacterMove = true
+//            }
             isJolJol = true
         case 7: // JolJol 없어짐
-            isCharacterMove = false
             isJolJol = false
             isJolJolMove = false
-            print("scriptCount", scriptCount)
-
-            DispatchQueue.main.asyncAfter(deadline: .now() + 0.001) {
-                isCharacterMove = true
-            }
-        case 8:
             isMuho = true
-        case 9:
-            isMuho = false
-
         default:
             print("scriptCount", scriptCount)
         }