Merge pull request #35 from MC1-morning-coffee/feat/henry/handle_image

Feat/henry/handle image

.swiftpm/xcode/xcuserdata/oreobro.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Bucket
+   uuid = "3DE39F1A-9F7D-49F2-AF2F-DB83D2F16E5F"
+   type = "1"
+   version = "2.0">
+</Bucket>

.swiftpm/xcode/xcuserdata/oreobro.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>SchemeUserState</key>
+	<dict>
+		<key>runSomeWhere.xcscheme_^#shared#^_</key>
+		<dict>
+			<key>orderHint</key>
+			<integer>0</integer>
+		</dict>
+	</dict>
+	<key>SuppressBuildableAutocreation</key>
+	<dict>
+		<key>AppModule</key>
+		<dict>
+			<key>primary</key>
+			<true/>
+		</dict>
+		<key>runSomeWhere</key>
+		<dict>
+			<key>primary</key>
+			<true/>
+		</dict>
+	</dict>
+</dict>
+</plist>

View/SceneView/SceneObjectView/CharacterView.swift

@@ -15,10 +15,10 @@ struct CharacterView: View {
 
 
     // 버튼을 누르면 move+1씩 증가함 -> 홀수 짝수에 따라서 오브젝트의 위치를 바꾸도록 함 -> 나중에 scenNumber에 따라서 바뀌도록 수정해야 함
-    @State var move: Int = 0
+    //@State var move: Int = 0
     @State var imageNumber: Int = 1
     @State var imageName: String = "" // 여기에 이미지의 이름을 저장
-
+    @State var imageOffset: Bool = false
 
     // globalStore에 저장되어 있는 값을 가져오기 위함
     @EnvironmentObject var globalStore: GlobalStore
@@ -40,59 +40,40 @@ struct CharacterView: View {
         }
     }
 
-
     var body: some View {
 
         // Luna의 Image
-        VStack{
+        VStack {
             Image(imageName)
-                .fixedSize()
-            //.aspectRatio(contentMode: .fit)
-                .border(.red)
-                .offset(x: {
-                    if move%2 == 0 { // 처음 위치
-                        return CGFloat(start.0)
-                    } else { // 이동할 위치
-                        return CGFloat(end.0)
+                .position(x: CGFloat(start.0), y: CGFloat(start.1))
+                .edgesIgnoringSafeArea(.all)
+                .offset(x:  (imageOffset ? CGFloat(end.0) : 0), y: imageOffset ? CGFloat(end.1) : 0)
+                .onAppear{
+                    withAnimation(.linear(duration: 3.0)){
+                        self.imageOffset.toggle()
                     }
-                }(), y: {
-                    if move%2 == 0 { // 처음 위치
-                        return CGFloat(start.1)
-                    } else { // 이동할 위치
-                        return CGFloat(end.1)
+                    // .Back_1이거나 Back_2이면 뚜벅뚜벅 효과주기
+                    if (makeDirection == EnumDirection.Back_1){
+                        setTimeIntervalClosure(Count: 0) {
+                            if imageNumber == 1 {
+                                imageNumber = 2
+                                updateImage(direction: .Back_2, Name: objectName)
+                            } else {
+                                imageNumber = 1
+                                updateImage(direction: .Back_1, Name: objectName)
+                            }
+                        }
                     }
-                }())
-            //move가 true이면 위쪽으로 이동하기
-                .animation(.easeOut(duration: 2), value: move)
-                .onAppear{
-                    print(imageName)
-                }
-
-            Button {
-                move += 1
-            } label: {
-                Text("move the character!")
-                    .foregroundColor(.black)
-            }
-        }
-        .onAppear{
-            // .Back_1이거나 Back_2이면 뚜벅뚜벅 효과주기
-            if (makeDirection == EnumDirection.Back_1 || makeDirection == EnumDirection.Back_2){
-                setTimeIntervalClosure(Count: 0) {
-                    if (imageNumber == 1){
-                        imageNumber = 2
-                        updateImage(direction: .Back_2, Name: objectName)
-//                        print(imageNumber)
-                    } else {
-                        imageNumber = 1
-                        updateImage(direction: .Back_1, Name: objectName)
-//                        print(imageNumber)
+                    else { // 뚜벅 뚜벅 효과를 줄 필요 없을때는 바로 이미지를 만들어준다
+                        updateImage(direction: makeDirection, Name: objectName)
                     }
                 }
-            }
-            else { // 뚜벅 뚜벅 효과를 줄 필요 없을때는 바로 이미지를 만들어준다
-                updateImage(direction: makeDirection, Name: objectName)
-            }
         }
     }
 }
+struct CharacterView_Previews: PreviewProvider {
+    static var previews: some View {
+        CharacterView(objectName: henry.name, makeDirection: EnumDirection.Back_1, start: (0, 0), end: (195, 422))
+    }
+
+}

View/SceneView/SequenceView/SequenceThreeView.swift

@@ -1,6 +1,6 @@
 //
 //  SwiftUIView.swift
-//  
+//
 //
 //  Created by Yun Dongbeom on 2023/03/27.
 //
@@ -22,15 +22,16 @@ struct SequenceThreeView: View {
         switch scriptCount {
             case 19:
                 isPaddleBtnActive = true
-            case 20:
-                isPaddleBtnActive = false
+//            case 20:
+//                isPaddleBtnActive = false
             default:
                 print("scriptCount", scriptCount)
         }
     }
     var body: some View {
         ZStack(alignment: .topLeading){
             Text("globalStore.scriptCount: \(globalStore.scriptCount)")
+
             if isPaddleBtnActive {
                 PaddleButtonView()
             }