diff --git a/Assets/Localization/StringTable Shared Data.asset b/Assets/Localization/StringTable Shared Data.asset index ba1853f..8cc54d3 100644 --- a/Assets/Localization/StringTable Shared Data.asset +++ b/Assets/Localization/StringTable Shared Data.asset @@ -535,6 +535,14 @@ MonoBehaviour: m_Key: tutorial_message_37 m_Metadata: m_Items: [] + - m_Id: 1829106272391176 + m_Key: tutorial_message_38 + m_Metadata: + m_Items: [] + - m_Id: 1829106272391177 + m_Key: tutorial_message_39 + m_Metadata: + m_Items: [] - m_Id: 164806647603200 m_Key: Adventure/Canvas/PauseUI/PauseBox/BgmVolume m_Metadata: @@ -827,13 +835,22 @@ MonoBehaviour: m_Key: PauseButton m_Metadata: m_Items: [] + - m_Id: 8020914447835136 + m_Key: Non-clearedNextButtonOSX + m_Metadata: + m_Items: [] + - m_Id: 8021235509223424 + m_Key: RetryTimeButtonOSX + m_Metadata: + m_Items: [] m_Metadata: m_Items: [] m_KeyGenerator: - id: 0 + rid: 0 references: - version: 1 - 00000000: + version: 2 + RefIds: + - rid: 0 type: {class: DistributedUIDGenerator, ns: UnityEngine.Localization.Tables, asm: Unity.Localization} data: diff --git a/Assets/Localization/StringTable.csv b/Assets/Localization/StringTable.csv index 3a83a8c..2896d91 100644 --- a/Assets/Localization/StringTable.csv +++ b/Assets/Localization/StringTable.csv @@ -1,131 +1,352 @@ -Key,Id,English(en),Korean(ko) -editor_start_welcome,,"Welcome to the map editor!","맵 에디터에 오신 걸 환영합니다!" -editor_update_begin,,"All right!\nLet's move on to the next step.","좋아요!\n다음 단계로 가볼까요?" -editor_update_test_prompt,,"Confirm the map\\is playable.","맵이 플레이 가능한지\\테스트해주세요." -editor_update_no_change,,"No changes\\since the\\last save.","마지막으로\\저장한 이후로\\변경사항이 없어요." -editor_update_save_prompt,,"Save the map\\before you quit.","종료하기 전에 먼저\\맵을 저장하세요." -editor_update_save_ready,,"Now you can save your map.","이제 맵을 저장할 수 있어요." -editor_update_set_time,,"Set the time limit and\nrun the map test.","시간 제한을 설정한 후\n맵을 테스트해주세요." -editor_update_set_map_name,,"Set your map name.","맵 이름을 설정하세요." -editor_update_set_save_path,,"Choose a path to save.","저장할 경로를 설정하세요." -editor_warning_add_wall,,"Cannot add a wall there.","여기에는 벽을 추가할 수 없어요." -editor_warning_add_shutter,,"Cannot add a shutter there.","여기에는 셔터를 추가할 수 없어요." -edtior_warning_add_exit,,"Cannot add an exit there.","여기에는 출구를 추가할 수 없어요." -editor_warning_add_ball,,"Cannot add a ball there.","여기에는 공을 추가할 수 없어요." -editor_warning_add_iron,,"Cannot add an iron there.","여기에는 쇳덩이를 추가할 수 없어요." -editor_warning_add_fire,,"Cannot add a fire there.","여기에는 불을 추가할 수 없어요." -editor_warning_duplicate_exits,,"Only one exit can be placed.","출구는 하나만 놓을 수 있어요." -editor_warning_duplicate_balls,,"Only one ball can be placed.","공은 하나만 놓을 수 있어요." -editor_warning_remove_wall,,"Cannot remove walls there.","해당 벽은 제거할 수 없어요." -editor_warning_remove_multi,,"Cannot remove walls,\nshutters, or exits there.","해당 벽, 셔터, 또는 출구는\n제거할 수 없어요." -editor_warning_remove_exit,,"Cannot remove exits there.","해당 출구는 제거할 수 없어요." -editor_warning_remove_object,,"Cannot remove objects there.","해당 물체는 제거할 수 없어요." -editor_guide_add_ball,,"Touch the map to add a ball.\nThere must be one ball.","맵을 터치하면 공을 추가돼요.\n공은 하나만 놓을 수 있어요." -editor_guide_add_exit,,"Touch the map to add an exit.\nThere must be one exit.","맵을 터치하면 출구가 추가돼요.\n출구는 하나만 놓을 수 있어요." -editor_guide_add_fire,,"Touch the map to add fires.","맵을 터치하면 불이 추가돼요." -editor_guide_add_iron,,"Touch the map to add irons.","맵을 터치하면 쇳덩이가 추가돼요." -editor_guide_add_wall,,"Touch the map to add walls.","맵을 터치하면 벽이 추가돼요." -editor_guide_add_shutter,,"Touch the map to add shutters.","맵을 터치하면 셔터가 추가돼요." -editor_guide_remove_multi,,"Touch the map to remove\nwalls or shutters or exits.","맵을 터치하면 벽, 셔터 또는 출구를\n제거할 수 있어요." -editor_guide_remove_object,,"Touch the map to remove objects.","맵을 터치하면 물체를 제거할 수 있어요." -editor_reset_initial,,"Build your own map!","나만의 맵을 만들어 보자고요!" -editor_reset_message,,"The map has been reset.\nYou can undo this action.","맵을 리셋했어요.\n이 행동은 실행취소할 수 있어요." -editor_quit_changed,,"Unsaved Changes\n\nThe map has changed.\nDo you want to quit anyway?","저장하지 않은 변경사항\n\n맵이 변경됐어요.\n저장하지 않고 그냥 종료할까요?" -editor_quit_unsaved,,"Unsaved Changes\n\nThe map has not been saved yet.\nDo you want to quit anyway?","저장하지 않은 변경사항\n\n맵을 아직 저장하지 않았어요.\n저장하지 않고 그냥 종료할까요?" -editor_quit_untested,,"Unsaved Changes\n\nThe map has not been tested or saved yet.\nDo you want to quit anyway?","저장하지 않은 변경사항\n\n맵을 아직 테스트 또는 저장하지 않았어요.\n저장하지 않고 그냥 종료할까요?" -editor_warning_illegal_file_name,,"Illegal file name.","사용할 수 없는 파일명이에요." -editor_open_map,,"Choose a map to open.","열고 싶은 맵을 고르세요." -editor_reinitialize_message,,"The map has been reinitialized.\nYou can undo this action.","맵을 재초기화했어요.\n이 행동은 실행취소할 수 있어요." -editor_create_folder_initial,,"Create folder\n\nEnter new\nfolder name.","폴더 생성\n\n새 폴더의\n이름을 입력하세요." -editor_warning_illegal_folder_name,,"Illegal folder name.","사용할 수 없는 폴더명이에요." -editor_warning_cannot_create_folder,,"Cannot create the folder:\nillegal folder name.","폴더를 생성할 수 없어요:\n사용할 수 없는 폴더명." -editor_create_folder_success_part1,,"New folder ""","새 폴더 """ -editor_create_folder_success_part2,,""" has created!","""을(를) 생성했어요!" -editor_create_folder_fail_part1,,"Cannot create the folder: folder ""","폴더를 생성할 수 없어요: """ -editor_create_folder_fail_part2,,""" already exists.",""" 폴더가 이미 존재해요." -editor_create_map_not_validated,,"Cannot save your map:\nimpossible to clear","맵을 저장할 수 없어요:\n클리어 불가능." -editor_create_map_not_saved,,"Cannot save your map: ","맵을 저장할 수 없어요: " -editor_create_map_duplicate_name_ask_part1,,"Confirm overwirte\n\nMap ""","덮어쓰기 확인\n\n맵 """ -editor_create_map_duplicate_name_ask_part2,,""" already exists.\nDo you want to overwrite it?","""이(가) 이미 존재해요.\n덮어쓸까요?" -editor_create_map_success_part1,,"You're done!\nSaved as ""","맵 생성 완료!\n""" -editor_create_map_success_part2,,"""","""(으)로 저장했어요!" -editor_create_map_reinitialize_message,,"You can reinitialize your map.","맵을 재초기화할 수 있어요." -editor_warning_map_not_saved_yet,,"The map has not been saved yet.","맵이 아직 저장되지 않았어요." -editor_undo_map_name,,"Undo: the map name","실행 취소: 맵 이름" -editor_undo_multi,,"Undo: a wall, a shutter,\nor an exit","실행 취소: 벽, 셔터\n또는 출구" -editor_undo_object,,"Undo: an object","실행 취소: 물체" -editor_undo_map_size,,"Undo: the map size","실행 취소: 맵 크기" -editor_undo_reset,,"Undo: reset","실행 취소: 리셋" -editor_undo_reintialization,,"Undo: reinitialization","실행 취소: 재초기화" -editor_redo_map_name,,"Redo: the map name","다시 실행: 맵 이름" -editor_redo_multi,,"Redo: a wall, a shutter,\nor an exit","다시 실행: 벽, 셔터\n또는 출구" -editor_redo_object,,"Redo: an object","다시 실행: 물체" -editor_redo_map_size,,"Redo: the map size","다시 실행: 맵 크기" -editor_redo_reset,,"Redo: reset","다시 실행: 리셋" -editor_redo_reinitialization,,"Redo: reinitialization","다시 실행: 재초기화" -warning_invalid_path,,"The path doesn't exist anymore.","해당 경로가 존재하지 않아요." -warning_no_such_file,,"The map doesn't exist anymore.","해당 맵이 존재하지 않아요." -warning_invalid_map_file,,"The file is not a valid map file.","올바른 맵 파일이 아니예요." -warning_exception_while_save,,"File invalid: execption while saving a map","올바르지 않은 파일: 맵을 저장하는 도중 예외가 발생했어요." -warning_exception_while_check,,"Something went wrong while checking a file.","맵을 확인하는 도중 예외가 발생했어요." -warning_invalid_map,,"Cannot open the map:\ninvalid map file","맵을 열 수 없어요:\n올바르지 않은 맵 파일" -warning_size_error,,"Cannot open the map:\nsize error","맵을 열 수 없어요:\n사이즈 오류" -warning_ball_error,,"Cannot open the map:\nball error","맵을 열 수 없어요:\n공 오류" -warning_iron_error,,"Cannot open the map:\niron error","맵을 열 수 없어요:\n쇳덩이 오류" -warning_fire_error,,"Cannot open the map:\nfire error","맵을 열 수 없어요:\n불 오류" -warning_exit_error,,"Cannot open the map:\nexit error","맵을 열 수 없어요:\n출구 오류" -warning_wall_error,,"Cannot open the map:\nwall error","맵을 열 수 없어요:\n벽 오류" -warning_shutter_error,,"Cannot open the map:\nshutter error","맵을 열 수 없어요:\n셔터 오류" -warning_time_limit_error,,"Cannot open the map:\ntime limit error","맵을 열 수 없어요:\n시간 제한 오류" -warning_solution_error,,"Cannot open the map:\nsolution error","맵을 열 수 없어요:\n풀이 오류" -warning_multiple_solutions,,"Cannot open the map:\nmultiple solutions","맵을 열 수 없어요:\n중복된 풀이" -warning_invalid_solution,,"Cannot open the map:\ninvalid solution","맵을 열 수 없어요:\n올바르지 않은 풀이" -warning_unknown_symbols,,"Cannot open the map:\nunknown_symbols","맵을 열 수 없어요:\n알 수 없는 기호" -warning_validation_fail,,"Cannot open the map:\ninvalid map or impossible to clear","맵을 열 수 없어요:\n올바르지 않은 맵 또는 클리어 불가능 맵" -result_ui_upper_message_pass,,"Congratulations!","축하해요!" -result_ui_upper_message_fail,,"Failed","실패" -result_ui_upper_message_abort,,"Your Result","결과" -result_ui_lower_message_fail,,"You will do better next time!","다음엔 더 잘할 거예요!" -result_ui_lower_message_abort,,"You can try again at any time.","언제든지 재도전할 수 있어요." -result_ui_lower_message_pass_tutorial,,"You're off to a great start!\nLet's play Adventure mode!","초대형 신인 등장!\nAdventure 모드에서 모험을 시작해보세요!" -result_ui_lower_message_pass_easy,,"Our journey has just begun!","우리의 모험은 이제부터 시작이에요!" -result_ui_lower_message_pass_normal,,"You are crushing it!","어떻게 이렇게 잘 하죠?" -result_ui_lower_message_pass_hard,,"You have mastered the art of GravitaMaze!","중력 미로 마스터가 되셨군요!" -result_ui_lower_message_pass_insane,,"No way! How did you pull this off?!","우와...! 어떻게 클리어하셨죠?!" -tutorial_message_01,,"Press the left arrow to make the ball roll to the left!","왼쪽 방향키를 누르면\n공이 왼쪽으로 굴러가요!" -tutorial_message_02,,"Great job!\nNow, let's press the up arrow to\nmake the ball roll upward.","좋아요!\n이번에는 위쪽 방향키를 눌러서\n공을 위로 굴려봐요." -tutorial_message_03,,"Okay! Then let's get the ball out!","훌륭해요! 이제 공을 탈출시켜보죠!" -tutorial_message_04,,"Next maze is a bit more complicated...\nGood luck!","다음 맵은 약간 더 어려운 미로예요...\n행운을 빌게요!" -tutorial_message_05,,"Oh, that's a great move!","흐음, 훌륭한 수네요!" -tutorial_message_06,,"We're almost there...","거의 다 왔어요..." -tutorial_message_07,,"We're just one step away!","한발짝만 더 가면 돼요!" -tutorial_message_08,,"Fire will burn the ball...","불은 공을 태워버려요..." -tutorial_message_09,,"The iron are also influenced by gravity... Be careful not to get squashed by the iron!","쇳덩이도 중력의 영향을 받습니다...\n쇳덩이에 깔리지 않게 조심하세요!" -tutorial_message_10,,"Now it won't get in our way!","이제 쇳덩이가 탈출을 방해하지 않는군요!" -tutorial_message_11,,"The iron block can be removed from\nthe maze just like the ball.","쇳덩이는 공과 마찬가지로\n미로에서 탈출할 수 있어요." -tutorial_message_12,,"The iron can temporarily cover a fire!","쇳덩이는 일시적으로\n불을 덮어버릴 수 있어요!" -tutorial_message_13,,"Let's get the ball out while the iron is blocking a fire!","쇳덩이로 불을 덮어버렸으니,\n이제 쇳덩이를 밟고 가보죠." -tutorial_message_14,,"Press the right arrow to close the bright green shutter.","오른쪽 방향키를 눌러서\n연두색 셔터를 닫아보세요." -tutorial_message_15,,"Let's use the shutter!","셔터를 사용해보죠!" -tutorial_message_16,,"A bright green shutter turns into a wall after the ball passes through it.","공이 연두색 셔터를 통과하고 나면,\n셔터는 벽으로 변해요." -tutorial_message_17,,"Once the shutter becomes a wall,\nit remains the same until you retry.","셔터가 벽으로 바뀌고 나면,\n이 맵을 재도전하기 전까지는\n계속 벽으로 남아있어요." -tutorial_message_18,,"Of course, sometimes you can get trapped by the shutter. Press the retry button!","물론, 셔터에 갇혀버리는 경우도 있죠!\n그럴 때는 되돌리기 버튼을 눌러보세요!" -tutorial_message_19,,"A shutter turned into a wall can also block the iron. It means it's safe when the ball passes through the shutter!","벽으로 변한 셔터는 쇳덩이를 막을 수 있어요. 셔터를 지나면 안전하다는 뜻이죠!" -tutorial_message_20,,"The iron cannot turn a shutter into a wall. Only the ball can close the shutter.","쇳덩이가 셔터를 통과하더라도 벽으로 변하지 않아요. 오직 공만이 셔터를 닫을 수 있어요." -tutorial_message_21,,"Great, you've found the exit!\nLet's escape!","좋아요! 출구를 찾으셨군요.\n이제 미로를 탈출해보죠!" -tutorial_message_22,,"The ball burned down!\nPress the shiny retry button to try again.","공이 불에 타버렸어요!\n반짝이는 되돌리기 버튼을 눌러\n다시 도전해봐요!" -tutorial_message_23,,"The ball got squashed!\nPress the shiny retry button to try again.","공이 뭉개져버렸어요!\n반짝이는 되돌리기 버튼을 눌러\n다시 도전해봐요!" -tutorial_message_24,,"Oh no, time's up!\nPress the shiny retry button to try again.","이런, 시간 초과네요!\n반짝이는 되돌리기 버튼을 눌러\n다시 도전해봐요!" -tutorial_message_25,,"The ball escaped the maze! Congratulations!","미로를 탈출했어요! 축하해요!" -tutorial_message_26,,"Whew... That was seriously cool just now!\nYou just passed all tutorials!","후우... 방금 진심으로 멋있었어요!\n이로써 모든 튜토리얼을 완료했군요!" -tutorial_message_27,,"The iron blocking the exit are gone.\nLet's escape!","출구를 막고 있던 쇳덩이가 사라졌네요.\n미로를 탈출해보죠!" -tutorial_message_28,,"The ball escaped the maze!\nCongratulations!\nPress the shiny next button!","미로를 탈출했어요! 축하해요!\n반짝이는 다음으로 버튼을 누르세요!" -tutorial_message_29,,"This maze is really challenging...\nThe time limit is short, you know!","이 미로는 정말 어렵습니다...\n제한시간이 짧거든요!" -tutorial_message_30,,"Oops, you got trapped...\nBut time keeps ticking.\nQuickly, press the retry button!","앗, 갇혀버렸네요...\n하지만 시간은 계속 흐르고 있어요.\n얼른 되돌리기 버튼을 누르세요!" -tutorial_message_31,,"Oh, great!","오! 좋아요!" -tutorial_message_32,,"The iron is blocking the way...\nWhat should you do?","쇳덩이가 길을 막고 있네요...\n어떻게 해야 할까요?" -tutorial_message_33,,"Hurry up! The exit has opened!","서두르세요! 탈출구가 열렸어요!" -tutorial_message_34,,"Apply gravity to the left and\nremove an iron!","왼쪽으로 중력을 가해 쇳덩이를 제거하세요!" -tutorial_message_35,,"Time freezes when the ball burned down!\nTake a deep breath and\npress the retry button!","공이 불에 타면 시간이 멈춰요!\n심호흡하고 되돌리기 버튼을 누르세요!" -tutorial_message_36,,"Time freezes when the ball got squashed!\nTake a deep breath and\npress the retry button!","공이 뭉개지면 시간이 멈춰요!\n심호흡하고 되돌리기 버튼을 누르세요!" -tutorial_message_37,,"You usually get a panelty when time's up,\nbut here it's okay! Let's try again!","시간이 끝나면 원래는 라이프가 깎이지만,\n여기서는 괜찮아요! 다시 도전해봐요!" +Key,Id,English(en),Korean(ko) +"editor_start_welcome",486441738240,"Welcome to the map editor!","맵 에디터에 오신 걸 환영합니다!" +"editor_update_begin",486475292672,"All right!\nLet's move on to the next step.","좋아요!\n다음 단계로 가볼까요?" +"editor_update_test_prompt",486479486976,"Confirm the map\\is playable.","맵이 플레이 가능한지\\테스트해주세요." +"editor_update_no_change",486479486977,"No changes\\since the\\last save.","마지막으로\\저장한 이후로\\변경사항이 없어요." +"editor_update_save_prompt",486492069888,"Save the map\\before you quit.","종료하기 전에 먼저\\맵을 저장하세요." +"editor_update_save_ready",486492069889,"Now you can save your map.","이제 맵을 저장할 수 있어요." +"editor_update_set_time",486492069890,"Set the time limit and\nrun the map test.","시간 제한을 설정한 후\n맵을 테스트해주세요." +"editor_update_set_map_name",486492069891,"Set your map name.","맵 이름을 설정하세요." +"editor_update_set_save_path",486492069892,"Choose a path to save.","저장할 경로를 설정하세요." +"editor_warning_add_wall",486492069893,"Cannot add a wall there.","여기에는 벽을 추가할 수 없어요." +"editor_warning_add_shutter",486492069894,"Cannot add a shutter there.","여기에는 셔터를 추가할 수 없어요." +"edtior_warning_add_exit",486492069895,"Cannot add an exit there.","여기에는 출구를 추가할 수 없어요." +"editor_warning_add_ball",486492069896,"Cannot add a ball there.","여기에는 공을 추가할 수 없어요." +"editor_warning_add_iron",486492069897,"Cannot add an iron there.","여기에는 쇳덩이를 추가할 수 없어요." +"editor_warning_add_fire",486492069898,"Cannot add a fire there.","여기에는 불을 추가할 수 없어요." +"editor_warning_duplicate_exits",486492069899,"Only one exit can be placed.","출구는 하나만 놓을 수 있어요." +"editor_warning_duplicate_balls",486492069900,"Only one ball can be placed.","공은 하나만 놓을 수 있어요." +"editor_warning_remove_wall",486492069901,"Cannot remove walls there.","해당 벽은 제거할 수 없어요." +"editor_warning_remove_multi",486492069902,"Cannot remove walls,\nshutters, or exits there.","해당 벽, 셔터, 또는 출구는\n제거할 수 없어요." +"editor_warning_remove_exit",486492069903,"Cannot remove exits there.","해당 출구는 제거할 수 없어요." +"editor_warning_remove_object",486492069904,"Cannot remove objects there.","해당 물체는 제거할 수 없어요." +"editor_guide_add_ball",486492069905,"Touch the map to add a ball.\nThere must be one ball.","맵을 터치하면 공을 추가돼요.\n공은 하나만 놓을 수 있어요." +"editor_guide_add_exit",486492069906,"Touch the map to add an exit.\nThere must be one exit.","맵을 터치하면 출구가 추가돼요.\n출구는 하나만 놓을 수 있어요." +"editor_guide_add_fire",486492069907,"Touch the map to add fires.","맵을 터치하면 불이 추가돼요." +"editor_guide_add_iron",486496264192,"Touch the map to add irons.","맵을 터치하면 쇳덩이가 추가돼요." +"editor_guide_add_wall",486496264193,"Touch the map to add walls.","맵을 터치하면 벽이 추가돼요." +"editor_guide_add_shutter",486496264194,"Touch the map to add shutters.","맵을 터치하면 셔터가 추가돼요." +"editor_guide_remove_multi",486496264195,"Touch the map to remove\nwalls or shutters or exits.","맵을 터치하면 벽, 셔터 또는 출구를\n제거할 수 있어요." +"editor_guide_remove_object",486496264196,"Touch the map to remove objects.","맵을 터치하면 물체를 제거할 수 있어요." +"editor_reset_initial",486496264197,"Build your own map!","나만의 맵을 만들어 보자고요!" +"editor_reset_message",486496264198,"The map has been reset.\nYou can undo this action.","맵을 리셋했어요.\n이 행동은 실행취소할 수 있어요." +"editor_quit_changed",486496264199,"Unsaved Changes\n\nThe map has changed.\nDo you want to quit anyway?","저장하지 않은 변경사항\n\n맵이 변경됐어요.\n저장하지 않고 그냥 종료할까요?" +"editor_quit_unsaved",486496264200,"Unsaved Changes\n\nThe map has not been saved yet.\nDo you want to quit anyway?","저장하지 않은 변경사항\n\n맵을 아직 저장하지 않았어요.\n저장하지 않고 그냥 종료할까요?" +"editor_quit_untested",486496264201,"Unsaved Changes\n\nThe map has not been tested or saved yet.\nDo you want to quit anyway?","저장하지 않은 변경사항\n\n맵을 아직 테스트 또는 저장하지 않았어요.\n저장하지 않고 그냥 종료할까요?" +"editor_warning_illegal_file_name",486496264202,"Illegal file name.","사용할 수 없는 파일 이름이에요." +"editor_open_map",486496264203,"Choose a map to open.","열고 싶은 맵을 고르세요." +"editor_reinitialize_message",486496264204,"The map has been reinitialized.\nYou can undo this action.","맵을 재초기화했어요.\n이 행동은 실행취소할 수 있어요." +"editor_create_folder_initial",486496264205,"Create folder\n\nEnter new\nfolder name.","폴더 생성\n\n새 폴더의\n이름을 입력하세요." +"editor_warning_illegal_folder_name",486496264206,"Illegal folder name.","사용할 수 없는 폴더 이름이에요." +"editor_warning_cannot_create_folder",486496264207,"Cannot create the folder:\nillegal folder name.","폴더를 생성할 수 없어요:\n사용할 수 없는 폴더 이름." +"editor_create_folder_success_part1",486496264208,"New folder ""","새 폴더 """ +"editor_create_folder_success_part2",486496264209,""" has been created!","""을(를) 생성했어요!" +"editor_create_folder_fail_part1",486496264210,"Cannot create the folder: folder ""","폴더를 생성할 수 없어요: """ +"editor_create_folder_fail_part2",486496264211,""" already exists.",""" 폴더가 이미 존재해요." +"editor_create_map_not_validated",486496264212,"Cannot save your map:\nimpossible to clear","맵을 저장할 수 없어요:\n클리어 불가능." +"editor_create_map_not_saved",486496264213,"Cannot save your map: ","맵을 저장할 수 없어요: " +"editor_create_map_duplicate_name_ask_part1",486496264214,"Confirm overwirte\n\nMap ""","덮어쓰기 확인\n\n맵 """ +"editor_create_map_duplicate_name_ask_part2",486496264215,""" already exists.\nDo you want to overwrite it?","""이(가) 이미 존재해요.\n덮어쓸까요?" +"editor_create_map_success_part1",1793875553243136,"You're done!\nSaved as ""","맵 생성 완료!\n""" +"editor_create_map_success_part2",1793875561631744,"""","""(으)로 저장했어요!" +"editor_create_map_reinitialize_message",486496264217,"You can reinitialize your map.","맵을 재초기화할 수 있어요." +"editor_warning_map_not_saved_yet",486496264218,"The map has not been saved yet.","맵이 아직 저장되지 않았어요." +"editor_undo_map_name",486496264219,"Undo: the map name","실행 취소: 맵 이름" +"editor_undo_multi",486496264220,"Undo: a wall, a shutter,\nor an exit","실행 취소: 벽, 셔터\n또는 출구" +"editor_undo_object",486496264221,"Undo: an object","실행 취소: 물체" +"editor_undo_map_size",486496264222,"Undo: the map size","실행 취소: 맵 크기" +"editor_undo_reset",486496264223,"Undo: reset","실행 취소: 리셋" +"editor_undo_reintialization",486496264224,"Undo: reinitialization","실행 취소: 재초기화" +"editor_redo_map_name",486496264225,"Redo: the map name","다시 실행: 맵 이름" +"editor_redo_multi",486496264226,"Redo: a wall, a shutter,\nor an exit","다시 실행: 벽, 셔터\n또는 출구" +"editor_redo_object",486496264227,"Redo: an object","다시 실행: 물체" +"editor_redo_map_size",486496264228,"Redo: the map size","다시 실행: 맵 크기" +"editor_redo_reset",486496264229,"Redo: reset","다시 실행: 리셋" +"editor_redo_reinitialization",486496264230,"Redo: reinitialization","다시 실행: 재초기화" +"warning_invalid_path",486496264231,"The path doesn't exist anymore.","해당 경로가 존재하지 않아요." +"warning_no_such_file",486496264232,"The map doesn't exist anymore.","해당 맵이 존재하지 않아요." +"warning_invalid_map_file",486496264233,"The file is not a valid map file.","올바른 맵 파일이 아니예요." +"warning_exception_while_save",486496264234,"File invalid: execption while saving a map","올바르지 않은 파일: 맵을 저장하는 도중 예외가 발생했어요." +"warning_exception_while_check",486496264235,"Something went wrong while checking a file.","맵을 확인하는 도중 예외가 발생했어요." +"warning_invalid_map",486496264236,"Cannot open the map:\ninvalid map file","맵을 열 수 없어요:\n올바르지 않은 맵 파일" +"warning_size_error",486496264237,"Cannot open the map:\nsize error","맵을 열 수 없어요:\n사이즈 오류" +"warning_ball_error",486496264238,"Cannot open the map:\nball error","맵을 열 수 없어요:\n공 오류" +"warning_iron_error",486496264239,"Cannot open the map:\niron error","맵을 열 수 없어요:\n쇳덩이 오류" +"warning_fire_error",486496264240,"Cannot open the map:\nfire error","맵을 열 수 없어요:\n불 오류" +"warning_exit_error",486496264241,"Cannot open the map:\nexit error","맵을 열 수 없어요:\n출구 오류" +"warning_wall_error",486496264242,"Cannot open the map:\nwall error","맵을 열 수 없어요:\n벽 오류" +"warning_shutter_error",486496264243,"Cannot open the map:\nshutter error","맵을 열 수 없어요:\n셔터 오류" +"warning_time_limit_error",486496264244,"Cannot open the map:\ntime limit error","맵을 열 수 없어요:\n시간 제한 오류" +"warning_solution_error",486496264245,"Cannot open the map:\nsolution error","맵을 열 수 없어요:\n풀이 오류" +"warning_multiple_solutions",486496264246,"Cannot open the map:\nmultiple solutions","맵을 열 수 없어요:\n중복된 풀이" +"warning_invalid_solution",486496264247,"Cannot open the map:\ninvalid solution","맵을 열 수 없어요:\n올바르지 않은 풀이" +"warning_unknown_symbols",486496264248,"Cannot open the map:\nunknown_symbols","맵을 열 수 없어요:\n알 수 없는 기호" +"warning_validation_fail",486496264249,"Cannot open the map:\ninvalid map or impossible to clear","맵을 열 수 없어요:\n올바르지 않은 맵 또는 클리어 불가능 맵" +"result_ui_upper_message_pass",486496264251,"Congratulations!","축하해요!" +"result_ui_upper_message_fail",486496264252,"Failed","실패" +"result_ui_upper_message_abort",486496264253,"Your Result","결과" +"result_ui_lower_message_fail",486496264254,"You will do better next time!","다음엔 더 잘할 거예요!" +"result_ui_lower_message_abort",486500458496,"You can try again at any time.","언제든지 재도전할 수 있어요." +"result_ui_lower_message_pass_tutorial",486500458497,"You're off to a great start!\nLet's play Adventure mode!","초대형 신인 등장!\nAdventure 모드에서 모험을 시작해보세요!" +"result_ui_lower_message_pass_easy",486500458498,"Our journey has just begun!","우리의 모험은 이제부터 시작이에요!" +"result_ui_lower_message_pass_normal",486500458499,"You are crushing it!","어떻게 이렇게 잘 하죠?" +"result_ui_lower_message_pass_hard",486500458500,"You have mastered the art of GravitaMaze!","중력미로 마스터가 되셨군요!" +"result_ui_lower_message_pass_insane",486500458501,"No way! How did you pull this off?!","우와...! 어떻게 클리어하셨죠?!" +"tutorial_message_01",486500458502,"Press the left arrow to make the ball roll to the left!","왼쪽 방향키를 누르면\n공이 왼쪽으로 굴러가요!" +"tutorial_message_02",486500458503,"Great job!\nNow, let's press the up arrow to\nmake the ball roll upward.","좋아요!\n이번에는 위쪽 방향키를 눌러서\n공을 위로 굴려봐요." +"tutorial_message_03",486500458504,"Okay! Then let's get the ball out!","훌륭해요! 이제 공을 탈출시켜보죠!" +"tutorial_message_04",486500458505,"Next maze is a bit more complicated...\nGood luck!","다음 맵은 약간 더 어려운 미로예요...\n행운을 빌게요!" +"tutorial_message_05",486500458506,"Oh, that's a great move!","흐음, 훌륭한 수네요!" +"tutorial_message_06",486500458507,"We're almost there...","거의 다 왔어요..." +"tutorial_message_07",486500458508,"We're just one step away!","한발짝만 더 가면 돼요!" +"tutorial_message_08",486500458509,"Fire will burn the ball...","불은 공을 태워버려요..." +"tutorial_message_09",486500458510,"The iron is also influenced by gravity... Be careful not to get squashed by the iron!","쇳덩이도 중력의 영향을 받습니다...\n쇳덩이에 깔리지 않게 조심하세요!" +"tutorial_message_10",486500458511,"Now it won't get in our way!","이제 쇳덩이가 탈출을 방해하지 않는군요!" +"tutorial_message_11",486500458512,"The iron block can be removed from\nthe maze just like the ball.","쇳덩이는 공과 마찬가지로\n미로에서 탈출할 수 있어요." +"tutorial_message_12",486500458513,"The iron can temporarily cover a fire!","쇳덩이는 일시적으로\n불을 덮어버릴 수 있어요!" +"tutorial_message_13",486500458514,"Let's get the ball out while the iron is blocking a fire!","쇳덩이로 불을 덮어버렸으니,\n이제 쇳덩이를 밟고 가보죠." +"tutorial_message_14",486500458515,"Press the right arrow to close the bright green shutter.","오른쪽 방향키를 눌러서\n연두색 셔터를 닫아보세요." +"tutorial_message_15",486500458516,"Let's use the shutter!","셔터를 사용해보죠!" +"tutorial_message_16",486500458517,"A bright green shutter turns into a wall after the ball passes through it.","공이 연두색 셔터를 통과하고 나면,\n셔터는 벽으로 변해요." +"tutorial_message_17",486500458518,"Once the shutter becomes a wall,\nit remains the same until you retry.","셔터가 벽으로 바뀌고 나면,\n이 맵을 재도전하기 전까지는\n계속 벽으로 남아있어요." +"tutorial_message_18",486500458519,"Of course, sometimes you can get trapped by the shutter. Press the retry button!","물론, 셔터에 갇혀버리는 경우도 있죠!\n그럴 때는 되돌리기 버튼을 눌러보세요!" +"tutorial_message_19",486500458520,"A shutter turned into a wall can also block the iron. It means it's safe when the ball passes through the shutter!","벽으로 변한 셔터는 쇳덩이를 막을 수 있어요. 셔터를 지나면 안전하다는 뜻이죠!" +"tutorial_message_20",486500458521,"The iron cannot turn a shutter into a wall. Only the ball can close the shutter.","쇳덩이가 셔터를 통과하더라도 벽으로 변하지 않아요. 오직 공만이 셔터를 닫을 수 있어요." +"tutorial_message_21",486500458522,"Great, you've found the exit!\nLet's escape!","좋아요! 출구를 찾으셨군요.\n이제 미로를 탈출해보죠!" +"tutorial_message_22",486500458523,"The ball burned down!\nPress the shiny retry button to try again.","공이 불에 타버렸어요!\n반짝이는 되돌리기 버튼을 눌러\n다시 도전해봐요!" +"tutorial_message_23",486500458524,"The ball got squashed!\nPress the shiny retry button to try again.","공이 뭉개져버렸어요!\n반짝이는 되돌리기 버튼을 눌러\n다시 도전해봐요!" +"tutorial_message_24",486500458525,"Oh no, time's up!\nPress the shiny retry button to try again.","이런, 시간 초과네요!\n반짝이는 되돌리기 버튼을 눌러\n다시 도전해봐요!" +"tutorial_message_25",486500458526,"The ball escaped the maze! Congratulations!","미로를 탈출했어요! 축하해요!" +"tutorial_message_26",486500458527,"Phew... That was spectacular!\nYou have now completed the tutorial!","후우... 방금 진심으로 멋있었어요!\n이로써 모든 튜토리얼을 완료했군요!" +"tutorial_message_27",486500458528,"The iron blocking the exit is gone now.\nLet's escape!","출구를 막고 있던 쇳덩이가 사라졌네요.\n미로를 탈출해보죠!" +"tutorial_message_28",1764238898974720,"The ball escaped the maze!\nCongratulations!\nPress the shiny next button!","미로를 탈출했어요! 축하해요!\n반짝이는 다음으로 버튼을 누르세요!" +"tutorial_message_29",1829106138173440,"This maze is really challenging...\nThe time limit is tight, you know!","이 미로는 정말 어렵습니다...\n제한시간이 짧거든요!" +"tutorial_message_30",1829106272391168,"Oops, you got trapped...\nBut the clock is still ticking.\nQuick, press the retry button!","앗, 갇혀버렸네요...\n하지만 시간은 계속 흐르고 있어요.\n얼른 되돌리기 버튼을 누르세요!" +"tutorial_message_31",1829106272391169,"Oh, great!","오! 좋아요!" +"tutorial_message_32",1829106272391170,"The iron is blocking the way...\nWhat should you do?","쇳덩이가 길을 막고 있네요...\n어떻게 해야 할까요?" +"tutorial_message_33",1829106272391171,"Hurry up! The exit has opened!","서두르세요! 탈출구가 열렸어요!" +"tutorial_message_34",1829106272391172,"Apply gravity to the left and\nremove an iron!","왼쪽으로 중력을 가해 쇳덩이를 제거하세요!" +"tutorial_message_35",1829106272391173,"Time freezes when the ball is burned down!\nTake a deep breath and\npress the retry button!","공이 불에 타면 시간이 멈춰요!\n심호흡하고 되돌리기 버튼을 누르세요!" +"tutorial_message_36",1829106272391174,"Time freezes when the ball gets squashed!\nTake a deep breath and\npress the retry button!","공이 뭉개지면 시간이 멈춰요!\n심호흡하고 되돌리기 버튼을 누르세요!" +"tutorial_message_37",1829106272391175,"You get a penalty when the time's up,\nbut in Tutorial mode you won't get one! Let's try again!","시간이 끝나면 원래는 페널티가 있지만,\n튜토리얼에서는 괜찮아요! 다시 도전해봐요!" +"tutorial_message_38",1829106272391176,"The time is really short...\nWhat if the time limit gets extended?\nGive it another try!","시간이 참 짧죠...\n제한시간을 늘려드릴게요.\n다시 도전해보세요!" +"tutorial_message_39",1829106272391177,"Now you have more time.\nTake your time and try it!","시간이 더 늘어났어요.\n여유를 갖고 시도해 보세요!" +"Adventure/Canvas/PauseUI/PauseBox/BgmVolume",164806647603200,"BGM +Volume","배경음 +음량" +"Adventure/Canvas/AdventureCompletePanel/LivesLeft",165160818827264,"Lives Left:","남은 목숨:" +"Adventure/Canvas/AdventureCompletePanel/MapsPassed",165244017041408,"Maps Passed:","클리어한 맵:" +"Adventure/Canvas/AdventureCompletePanel/MapsSkipped",165287633608704,"Maps Skipped:","건너뛴 맵:" +"Adventure/Canvas/PauseUI/PauseBox/PauseHeader",165336484667392,"Pause","일시정지" +"Adventure/Canvas/PauseUI/PauseBox/SfxVolume",165355212234752,"SFX +Volume","효과음 +음량" +"Adventure/Canvas/PauseUI/PauseBox/SkipGameButton/Text",165390494720000,"Time +skip","시간 +건너뛰기" +"Adventure/Canvas/PauseUI/PauseBox/ReturnToGameButton/Text",165437433176064,"Return +to game","게임으로 +돌아가기" +"Adventure/Canvas/PauseUI/PauseBox/QuitButton/Text",165465119776768,"Quit","나가기" +"Adventure/Canvas/TimeoutPanel/Text",165502885289984,"Time out!","시간 초과!" +"AdventureLevel/Canvas/TimeoutPanel/Text",165704832638976,"Time out!","시간 초과!" +"Custom/Canvas/PauseUI/PauseBox/BgmVolume",167868644712448,"BGM +Volume","배경음 +음량" +"Custom/Canvas/GravityPanel/CustomOpen/CustomOpenScrollView/Viewport/EmptyText",167920012353536,"Empty!","비어있네요!" +"Custom/Canvas/PauseUI/PauseBox/PauseHeader",167945413058560,"Pause","일시정지" +"Custom/Canvas/PauseUI/PauseBox/SfxVolume",167983132434432,"SFX +Volume","효과음 +음량" +"Custom/Canvas/TimeoutPanel/Text",168024756707328,"Time out!","시간 초과!" +"Custom/Canvas/PauseUI/PauseBox/QuitButton/Text",168044683845632,"Quit","나가기" +"Custom/Canvas/PauseUI/PauseBox/ReturnToGameButton/Text",168062677409792,"Return +to game","게임으로 +돌아가기" +"Custom/Canvas/PauseUI/PauseBox/SkipGameButton/Text",168120571387904,"Time +skip","시간 +건너뛰기" +"Editor/Canvas/EditorPanel/Phase 5: Open/EditorOpenScrollView/Viewport/EmptyText",168241920991232,"Empty!","비어있네요!" +"Editor/Canvas/EditorPanel/Phase 6: Save/EditorSaveScrollView/Viewport/EmptyText",168297738788864,"Empty!","비어있네요!" +"Editor/Canvas/EditorPanel/Phase 3: Request/EditorMapName3/Placeholder",168490139901952,"Enter the map name...","맵 이름을 입력하세요..." +"Editor/Canvas/EditorPanel/Phase 2: Build/EditorMapName2/Placeholder",168590564122624,"Enter the map name...","맵 이름을 입력하세요..." +"Editor/Canvas/EditorPanel/Phase 6: Save/EditorMapName6/Placeholder",168656062373888,"Map name required","맵 이름은 필수예요" +"Editor/Canvas/EditorPanel/Phase 1: Initialize/EditorMapName1/Placeholder",168774387884032,"Enter the map name...","맵 이름을 입력하세요..." +"Editor/Canvas/InputMessageUI/MessageBox/MessageInputField/Placeholder",168792230453248,"Folder name...","폴더 이름..." +"Editor/Canvas/TimeoutPanel/Text",168827580047360,"Time out!","시간 초과!" +"First/Canvas/FirstPanel/DesriptionText",169313049763840,"You're a gravity manipulator. +Your goal is to escape the ball to the exit.","당신은 중력 조작자입니다. +공을 출구로 탈출시켜보세요!" +"First/Canvas/FirstPanel/HeaderText",169428787388416,"Welcome!","환영합니다!" +"Main/Canvas/TimeoutPanel/Text",169542926983168,"Time out!","시간 초과!" +"Mode/Canvas/TimeoutPanel/Text",169606495854592,"Time out!","시간 초과!" +"Setting/Canvas/FirstPanel/Audio/BgmVolume",169656898805760,"BGM +Volume","배경음 +음량" +"Setting/Canvas/CreditPanel/DesriptionText",169839971786752,"GravitaMaze +v1.4.3 + +Project Managing +Dantae An + +Programming +Dantae An +junu192857 +Donghwan Yang +Suin Lee +Sehyun Kim +Jaehee Hong +Yongchan Jo +Diane Kim + +Game Design +Dantae An + +Level Design +Donghwan Yang +Dantae An + +UI/UX Design +Dantae An +Suin Lee + +Graphic Design +Dantae An +Suin Lee +Donghwan Yang + +Sound Design +Dantae An + +Localization +Jaehee Hong +Diane Kim +Dantae An + +Marketing +Suin Lee + +Infrastructure +cseteram + +Map Making +Dantae An +Donghwan Yang +ahnjunseo +junu192857 +Suin Lee +MINSEOKIM1 +ektnzpt1080","중력미로 +v1.4.3 + +프로젝트 관리 +안단태 + +프로그래밍 +안단태 +junu192857 +양동환 +이수인 +김세현 +홍재희 +조용찬 +김다인 + +게임 디자인 +안단태 + +레벨 디자인 +양동환 +안단태 + +UI/UX 디자인 +안단태 +이수인 + +그래픽 디자인 +안단태 +이수인 +양동환 + +사운드 디자인 +안단태 + +번역 +홍재희 +김다인 +안단태 + +마케팅 +이수인 + +인프라 +cseteram + +맵 제작 +안단태 +양동환 +ahnjunseo +junu192857 +이수인 +MINSEOKIM1 +ektnzpt1080" +"Setting/Canvas/FirstPanel/HeaderText",170078573158400,"Settings","설정" +"Setting/Canvas/CreditPanel/HeaderText",170098437382144,"Credit","크레딧" +"Setting/Canvas/FirstPanel/LanguageSetting/LanguageText",170175784542208,"Language","언어" +"Setting/Canvas/FirstPanel/Audio/SfxVolume",170197498454016,"SFX +Volume","효과음 +음량" +"Setting/Canvas/FirstPanel/Audio/VolumnText",170232315371520,"Volume","음량" +"Training/Canvas/PauseUI/PauseBox/BgmVolume",170767890243584,"BGM +Volume","배경음 +음량" +"Training/Canvas/PauseUI/PauseBox/PauseHeader",170796554117120,"Pause","일시정지" +"Training/Canvas/PauseUI/PauseBox/SfxVolume",170818960089088,"SFX +Volume","효과음 +음량" +"Training/Canvas/TimeoutPanel/Text",170842775347200,"Time out!","시간 초과!" +"Training/Canvas/PauseUI/PauseBox/QuitButton/Text",170862224334848,"Quit","나가기" +"Training/Canvas/PauseUI/PauseBox/ReturnToGameButton/Text",170877630013440,"Return +to game","게임으로 +돌아가기" +"Training/Canvas/PauseUI/PauseBox/SkipGameButton/Text",170898291154944,"Time +skip","시간 +건너뛰기" +"Tutorial/Canvas/PauseUI/PauseBox/BgmVolume",170979144753152,"BGM +Volume","배경음 +음량" +"Tutorial/Canvas/TutorialCompletePanel/MapsPassed",171031661633536,"Maps Passed:","클리어한 맵:" +"Tutorial/Canvas/PauseUI/PauseBox/PauseHeader",171075227869184,"Pause","일시정지" +"Tutorial/Canvas/PauseUI/PauseBox/SfxVolume",171095343751168,"SFX +Volume","효과음 +음량" +"Tutorial/Canvas/TimeoutPanel/Text",171112083218432,"Time out!","시간 초과!" +"Tutorial/Canvas/PauseUI/PauseBox/QuitButton/Text",171147529281536,"Quit","나가기" +"Tutorial/Canvas/PauseUI/PauseBox/ReturnToGameButton/Text",171166206517248,"Return +to game","게임으로 +돌아가기" +"Tutorial/Canvas/PauseUI/PauseBox/SkipGameButton/Text",171187530358784,"Time +skip","시간 +건너뛰기" +"Custom/Canvas/GravityPanel/CustomOpen/CustomButtonOpen",487869532594176,"Select a map\or a folder\to open.","열고 싶은 맵 또는\폴더를 골라주세요." +"Training/Canvas/GravityPanel/TrainingOpen/TrainingButtonOpen",488604819251200,"Select a map\or a folder\to open.","열고 싶은 맵 또는\폴더를 골라주세요." +"Editor/Canvas/EditorPanel/Phase 4: Test/EditorButtonBack4",489289522601984,"Press the next button\to complete the test.","다음 버튼을 눌러서\테스트를 완료하세요." +"Editor/Canvas/EditorPanel/Phase 1: Initialize/EditorButtonNext1",489351799627776,"Press the\New or Open\button first.","New 또는 Open 버튼을\먼저 눌러주세요." +"Editor/Canvas/EditorPanel/Phase 2: Build/EditorButtonNext2",489381340110848,"A ball and\an exit must\be placed.","공과 출구는 반드시\설치해야 해요." +"Editor/Canvas/EditorPanel/Phase 4: Test/EditorButtonNext4",489402718478336,"Escape the map\to complete\the test.","맵을 탈출해서\테스트를 완료하세요." +"Editor/Canvas/EditorPanel/Phase 5: Open/EditorButtonOpen5",489429658492928,"Select a map\or a folder\to open.","열고 싶은 맵 또는\폴더를 골라주세요." +"Editor/Canvas/EditorPanel/Phase 3: Request/EditorButtonQuit3",489467155570688,"Confirm the map\is playable.","플레이 가능한 맵인지\확인해주세요." +"Editor/Canvas/EditorPanel/Phase 4: Test/EditorButtonRetryTime",489777756364800,"Press the next button\to complete the test.","다음 버튼을 눌러서\테스트를 완료하세요." +"Editor/Canvas/EditorPanel/Phase 3: Request/EditorButtonSave3",489821985300480,"Confirm the map\is playable.","플레이 가능한 맵인지\확인해주세요." +"Editor/Canvas/EditorPanel/Phase 6: Save/EditorButtonSave6",489854755397632,"Set your map\name to save.","저장할 맵 이름을\설정해주세요." +"TutorialButtonUp",952412309245952,"↑ or W key","↑ 또는 W 키" +"TutorialButtonDown",952515296186368,"↓ or S key","↓ 또는 S 키" +"TutorialButtonLeft",952692740411392,"← or A key","← 또는 A 키" +"TutorialButtonRight",952804183068672,"→ or D key","→ 또는 D 키" +"RetryButton",962298430574592,"Space key","Space 키" +"RetryTimeButton",962494929522688,"Ctrl + Space key","Ctrl + Space 키" +"NextButton",962811704332288,"Enter key","Enter 키" +"Non-clearedNextButton",962904780132352,"Ctrl + Enter key","Ctrl + Enter 키" +"PauseButton",963619405647872,"Esc key","Esc 키" +"Non-clearedNextButtonOSX",8020914447835136,"Option + Enter key","Option + Enter 키" +"RetryTimeButtonOSX",8021235509223424,"Option + Space key","Option + Space 키" \ No newline at end of file diff --git a/Assets/Localization/StringTable_en.asset b/Assets/Localization/StringTable_en.asset index 1047ba3..f349348 100644 --- a/Assets/Localization/StringTable_en.asset +++ b/Assets/Localization/StringTable_en.asset @@ -17,7 +17,7 @@ MonoBehaviour: m_SharedData: {fileID: 11400000, guid: e140a6e03d69147b0bf89b55f6cb603e, type: 2} m_Metadata: m_Items: - - id: 0 + - rid: 0 m_TableData: - m_Id: 486441738240 m_Localized: Welcome to the map editor! @@ -27,22 +27,22 @@ MonoBehaviour: m_Localized: All right!\nLet's move on to the next step. m_Metadata: m_Items: - - id: 0 + - rid: 0 - m_Id: 486479486976 m_Localized: Confirm the map\\is playable. m_Metadata: m_Items: - - id: 0 + - rid: 0 - m_Id: 486479486977 m_Localized: No changes\\since the\\last save. m_Metadata: m_Items: - - id: 0 + - rid: 0 - m_Id: 486492069888 m_Localized: Save the map\\before you quit. m_Metadata: m_Items: - - id: 0 + - rid: 0 - m_Id: 486492069889 m_Localized: Now you can save your map. m_Metadata: @@ -51,7 +51,7 @@ MonoBehaviour: m_Localized: Set the time limit and\nrun the map test. m_Metadata: m_Items: - - id: 0 + - rid: 0 - m_Id: 486492069891 m_Localized: Set your map name. m_Metadata: @@ -100,7 +100,7 @@ MonoBehaviour: m_Localized: Cannot remove walls,\nshutters, or exits there. m_Metadata: m_Items: - - id: 0 + - rid: 0 - m_Id: 486492069903 m_Localized: Cannot remove exits there. m_Metadata: @@ -113,12 +113,12 @@ MonoBehaviour: m_Localized: Touch the map to add a ball.\nThere must be one ball. m_Metadata: m_Items: - - id: 0 + - rid: 0 - m_Id: 486492069906 m_Localized: Touch the map to add an exit.\nThere must be one exit. m_Metadata: m_Items: - - id: 0 + - rid: 0 - m_Id: 486492069907 m_Localized: Touch the map to add fires. m_Metadata: @@ -139,7 +139,7 @@ MonoBehaviour: m_Localized: Touch the map to remove\nwalls or shutters or exits. m_Metadata: m_Items: - - id: 0 + - rid: 0 - m_Id: 486496264196 m_Localized: Touch the map to remove objects. m_Metadata: @@ -152,25 +152,25 @@ MonoBehaviour: m_Localized: The map has been reset.\nYou can undo this action. m_Metadata: m_Items: - - id: 0 + - rid: 0 - m_Id: 486496264199 m_Localized: Unsaved Changes\n\nThe map has changed.\nDo you want to quit anyway? m_Metadata: m_Items: - - id: 0 + - rid: 0 - m_Id: 486496264200 m_Localized: Unsaved Changes\n\nThe map has not been saved yet.\nDo you want to quit anyway? m_Metadata: m_Items: - - id: 0 + - rid: 0 - m_Id: 486496264201 m_Localized: Unsaved Changes\n\nThe map has not been tested or saved yet.\nDo you want to quit anyway? m_Metadata: m_Items: - - id: 0 + - rid: 0 - m_Id: 486496264202 m_Localized: Illegal file name. m_Metadata: @@ -183,12 +183,12 @@ MonoBehaviour: m_Localized: The map has been reinitialized.\nYou can undo this action. m_Metadata: m_Items: - - id: 0 + - rid: 0 - m_Id: 486496264205 m_Localized: Create folder\n\nEnter new\nfolder name. m_Metadata: m_Items: - - id: 0 + - rid: 0 - m_Id: 486496264206 m_Localized: Illegal folder name. m_Metadata: @@ -197,13 +197,13 @@ MonoBehaviour: m_Localized: Cannot create the folder:\nillegal folder name. m_Metadata: m_Items: - - id: 0 + - rid: 0 - m_Id: 486496264208 m_Localized: New folder " m_Metadata: m_Items: [] - m_Id: 486496264209 - m_Localized: '" has created!' + m_Localized: '" has been created!' m_Metadata: m_Items: [] - m_Id: 486496264210 @@ -218,7 +218,7 @@ MonoBehaviour: m_Localized: Cannot save your map:\nimpossible to clear m_Metadata: m_Items: - - id: 0 + - rid: 0 - m_Id: 486496264213 m_Localized: 'Cannot save your map: ' m_Metadata: @@ -227,12 +227,12 @@ MonoBehaviour: m_Localized: Confirm overwirte\n\nMap " m_Metadata: m_Items: - - id: 0 + - rid: 0 - m_Id: 486496264215 m_Localized: '" already exists.\nDo you want to overwrite it?' m_Metadata: m_Items: - - id: 0 + - rid: 0 - m_Id: 486496264217 m_Localized: You can reinitialize your map. m_Metadata: @@ -249,7 +249,7 @@ MonoBehaviour: m_Localized: 'Undo: a wall, a shutter,\nor an exit' m_Metadata: m_Items: - - id: 0 + - rid: 0 - m_Id: 486496264221 m_Localized: 'Undo: an object' m_Metadata: @@ -274,7 +274,7 @@ MonoBehaviour: m_Localized: 'Redo: a wall, a shutter,\nor an exit' m_Metadata: m_Items: - - id: 0 + - rid: 0 - m_Id: 486496264227 m_Localized: 'Redo: an object' m_Metadata: @@ -315,72 +315,72 @@ MonoBehaviour: m_Localized: Cannot open the map:\ninvalid map file m_Metadata: m_Items: - - id: 0 + - rid: 0 - m_Id: 486496264237 m_Localized: Cannot open the map:\nsize error m_Metadata: m_Items: - - id: 0 + - rid: 0 - m_Id: 486496264238 m_Localized: Cannot open the map:\nball error m_Metadata: m_Items: - - id: 0 + - rid: 0 - m_Id: 486496264239 m_Localized: Cannot open the map:\niron error m_Metadata: m_Items: - - id: 0 + - rid: 0 - m_Id: 486496264240 m_Localized: Cannot open the map:\nfire error m_Metadata: m_Items: - - id: 0 + - rid: 0 - m_Id: 486496264241 m_Localized: Cannot open the map:\nexit error m_Metadata: m_Items: - - id: 0 + - rid: 0 - m_Id: 486496264242 m_Localized: Cannot open the map:\nwall error m_Metadata: m_Items: - - id: 0 + - rid: 0 - m_Id: 486496264243 m_Localized: Cannot open the map:\nshutter error m_Metadata: m_Items: - - id: 0 + - rid: 0 - m_Id: 486496264244 m_Localized: Cannot open the map:\ntime limit error m_Metadata: m_Items: - - id: 0 + - rid: 0 - m_Id: 486496264245 m_Localized: Cannot open the map:\nsolution error m_Metadata: m_Items: - - id: 0 + - rid: 0 - m_Id: 486496264246 m_Localized: Cannot open the map:\nmultiple solutions m_Metadata: m_Items: - - id: 0 + - rid: 0 - m_Id: 486496264247 m_Localized: Cannot open the map:\ninvalid solution m_Metadata: m_Items: - - id: 0 + - rid: 0 - m_Id: 486496264248 m_Localized: Cannot open the map:\nunknown_symbols m_Metadata: m_Items: - - id: 0 + - rid: 0 - m_Id: 486496264249 m_Localized: Cannot open the map:\ninvalid map or impossible to clear m_Metadata: m_Items: - - id: 0 + - rid: 0 - m_Id: 486496264251 m_Localized: Congratulations! m_Metadata: @@ -405,7 +405,7 @@ MonoBehaviour: m_Localized: You're off to a great start!\nLet's play Adventure mode! m_Metadata: m_Items: - - id: 0 + - rid: 0 - m_Id: 486500458498 m_Localized: Our journey has just begun! m_Metadata: @@ -431,7 +431,7 @@ MonoBehaviour: upward. m_Metadata: m_Items: - - id: 0 + - rid: 0 - m_Id: 486500458504 m_Localized: Okay! Then let's get the ball out! m_Metadata: @@ -440,7 +440,7 @@ MonoBehaviour: m_Localized: Next maze is a bit more complicated...\nGood luck! m_Metadata: m_Items: - - id: 0 + - rid: 0 - m_Id: 486500458506 m_Localized: Oh, that's a great move! m_Metadata: @@ -458,11 +458,11 @@ MonoBehaviour: m_Metadata: m_Items: [] - m_Id: 486500458510 - m_Localized: The iron are also influenced by gravity... Be careful not to get + m_Localized: The iron is also influenced by gravity... Be careful not to get squashed by the iron! m_Metadata: m_Items: - - id: 0 + - rid: 0 - m_Id: 486500458511 m_Localized: Now it won't get in our way! m_Metadata: @@ -470,7 +470,8 @@ MonoBehaviour: - m_Id: 486500458512 m_Localized: The iron block can be removed from\nthe maze just like the ball. m_Metadata: - m_Items: [] + m_Items: + - rid: 0 - m_Id: 486500458513 m_Localized: The iron can temporarily cover a fire! m_Metadata: @@ -496,7 +497,8 @@ MonoBehaviour: m_Localized: Once the shutter becomes a wall,\nit remains the same until you retry. m_Metadata: - m_Items: [] + m_Items: + - rid: 0 - m_Id: 486500458519 m_Localized: Of course, sometimes you can get trapped by the shutter. Press the retry button! @@ -515,35 +517,37 @@ MonoBehaviour: - m_Id: 486500458522 m_Localized: Great, you've found the exit!\nLet's escape! m_Metadata: - m_Items: [] + m_Items: + - rid: 0 - m_Id: 486500458523 m_Localized: The ball burned down!\nPress the shiny retry button to try again. m_Metadata: m_Items: - - id: 0 + - rid: 0 - m_Id: 486500458524 m_Localized: The ball got squashed!\nPress the shiny retry button to try again. m_Metadata: m_Items: - - id: 0 + - rid: 0 - m_Id: 486500458525 m_Localized: Oh no, time's up!\nPress the shiny retry button to try again. m_Metadata: m_Items: - - id: 0 + - rid: 0 - m_Id: 486500458526 m_Localized: The ball escaped the maze! Congratulations! m_Metadata: m_Items: [] - m_Id: 486500458527 - m_Localized: Whew... That was seriously cool just now!\nYou just passed all tutorials! + m_Localized: Phew... That was spectacular!\nYou have now completed the tutorial! m_Metadata: m_Items: - - id: 0 + - rid: 0 - m_Id: 486500458528 - m_Localized: The iron blocking the exit are gone.\nLet's escape! + m_Localized: The iron blocking the exit is gone now.\nLet's escape! m_Metadata: - m_Items: [] + m_Items: + - rid: 0 - m_Id: 164806647603200 m_Localized: 'BGM @@ -694,46 +698,128 @@ MonoBehaviour: m_Metadata: m_Items: [] - m_Id: 169839971786752 - m_Localized: 'Project Manager, + m_Localized: 'GravitaMaze - Main Programmer, + v1.4.3 - Sound Designer, + - UI/UX - Designer + Project + Managing + + Dantae An + + + + Programming + + Dantae + An + + junu192857 + + Donghwan + Yang + + Suin Lee + + Sehyun + Kim - and Map Maker + Jaehee Hong - DanTae An + Yongchan + Jo + Diane Kim - Sub - Programmer + - JunWoo Eom + Game + Design + Dantae An - Map Maker + - DongHwan + Level Design + + Donghwan Yang + Dantae An - Marketor + - SuIn Lee + UI/UX + Design + Dantae An - Assistant + Suin Lee - Diane - Kim + + + Graphic + Design + + Dantae An + + Suin Lee + + Donghwan + Yang + + + + Sound Design + + Dantae An + + + + Localization + + Jaehee + Hong + + Diane Kim + + Dantae + An + + + + Marketing + + Suin Lee - YongChan Jo + - Jaehee - Hong' + Infrastructure + + cseteram + + + + Map + Making + + Dantae An + + Donghwan + Yang + + ahnjunseo + + junu192857 + + Suin + Lee + + MINSEOKIM1 + + ektnzpt1080' m_Metadata: m_Items: [] - m_Id: 170078573158400 @@ -789,9 +875,9 @@ MonoBehaviour: m_Metadata: m_Items: [] - m_Id: 170898291154944 - m_Localized: 'Skip + m_Localized: 'Time - this map' + skip' m_Metadata: m_Items: [] - m_Id: 170979144753152 @@ -829,9 +915,9 @@ MonoBehaviour: m_Metadata: m_Items: [] - m_Id: 171187530358784 - m_Localized: 'Skip + m_Localized: 'Time - this map' + skip' m_Metadata: m_Items: [] - m_Id: 487869532594176 @@ -901,7 +987,8 @@ MonoBehaviour: - m_Id: 962494929522688 m_Localized: Ctrl + Space key m_Metadata: - m_Items: [] + m_Items: + - rid: 1375113474824208400 - m_Id: 962811704332288 m_Localized: Enter key m_Metadata: @@ -909,7 +996,8 @@ MonoBehaviour: - m_Id: 962904780132352 m_Localized: Ctrl + Enter key m_Metadata: - m_Items: [] + m_Items: + - rid: 1375113474824208397 - m_Id: 963619405647872 m_Localized: Esc key m_Metadata: @@ -919,26 +1007,28 @@ MonoBehaviour: button! m_Metadata: m_Items: - - id: 0 + - rid: 0 - m_Id: 1793875553243136 m_Localized: You're done!\nSaved as " m_Metadata: m_Items: - - id: 0 + - rid: 0 - m_Id: 1793875561631744 m_Localized: '"' m_Metadata: m_Items: [] - m_Id: 1829106138173440 - m_Localized: This maze is really challenging...\nThe time limit is short, you + m_Localized: This maze is really challenging...\nThe time limit is tight, you know! m_Metadata: - m_Items: [] + m_Items: + - rid: 0 - m_Id: 1829106272391168 - m_Localized: Oops, you got trapped...\nBut time keeps ticking.\nQuickly, press - the retry button! + m_Localized: Oops, you got trapped...\nBut the clock is still ticking.\nQuick, + press the retry button! m_Metadata: - m_Items: [] + m_Items: + - rid: 0 - m_Id: 1829106272391169 m_Localized: Oh, great! m_Metadata: @@ -946,7 +1036,8 @@ MonoBehaviour: - m_Id: 1829106272391170 m_Localized: The iron is blocking the way...\nWhat should you do? m_Metadata: - m_Items: [] + m_Items: + - rid: 0 - m_Id: 1829106272391171 m_Localized: Hurry up! The exit has opened! m_Metadata: @@ -954,28 +1045,85 @@ MonoBehaviour: - m_Id: 1829106272391172 m_Localized: Apply gravity to the left and\nremove an iron! m_Metadata: - m_Items: [] + m_Items: + - rid: 0 - m_Id: 1829106272391173 - m_Localized: Time freezes when the ball burned down!\nTake a deep breath and\npress + m_Localized: Time freezes when the ball is burned down!\nTake a deep breath and\npress the retry button! m_Metadata: m_Items: - - id: 0 + - rid: 0 - m_Id: 1829106272391174 - m_Localized: Time freezes when the ball got squashed!\nTake a deep breath and\npress + m_Localized: Time freezes when the ball gets squashed!\nTake a deep breath and\npress the retry button! m_Metadata: m_Items: - - id: 0 + - rid: 0 - m_Id: 1829106272391175 - m_Localized: You usually get a panelty when time's up,\nbut here it's okay! Let's - try again! + m_Localized: You get a penalty when the time's up,\nbut in Tutorial mode you + won't get one! Let's try again! m_Metadata: m_Items: - - id: 0 + - rid: 0 + - m_Id: 8020914447835136 + m_Localized: Option + Enter key + m_Metadata: + m_Items: [] + - m_Id: 8021235509223424 + m_Localized: Option + Space key + m_Metadata: + m_Items: [] + - m_Id: 1829106272391176 + m_Localized: The time is really short...\nWhat if the time limit gets extended?\nGive + it another try! + m_Metadata: + m_Items: + - rid: 0 + - m_Id: 1829106272391177 + m_Localized: Now you have more time.\nTake your time and try it! + m_Metadata: + m_Items: + - rid: 0 references: - version: 1 - 00000000: + version: 2 + RefIds: + - rid: 0 type: {class: SmartFormatTag, ns: UnityEngine.Localization.Metadata, asm: Unity.Localization} data: - m_Entries: 00e02f447100000001e06f447100000000e02f457100000002e02f457100000000e06f44710000000ee02f457100000011e02f457100000012e02f457100000003e06f457100000006e06f457100000007e06f457100000008e06f457100000009e06f45710000000de06f45710000000fe06f457100000014e06f457100000016e06f457100000017e06f457100000018e06f45710000001ce06f457100000022e06f45710000002ce06f45710000002de06f45710000002ee06f45710000002fe06f457100000030e06f457100000031e06f457100000032e06f457100000033e06f457100000034e06f457100000035e06f457100000036e06f457100000037e06f457100000038e06f457100000039e06f457100000007e0af457100000009e0af45710000001be0af45710000001de0af45710000001fe0af45710000000ce06f45710000001ce0af45710000000ee0af457100000001e0af45710000000050dfe09044060000501f33855f060007509ffd8f7f060006509ffd8f7f060005509ffd8f7f0600 + m_Entries: 00e02f447100000001e06f447100000000e02f457100000002e02f457100000000e06f44710000000ee02f457100000011e02f457100000012e02f457100000003e06f457100000006e06f457100000007e06f457100000008e06f457100000009e06f45710000000de06f45710000000fe06f457100000014e06f457100000016e06f457100000017e06f457100000018e06f45710000001ce06f457100000022e06f45710000002ce06f45710000002de06f45710000002ee06f45710000002fe06f457100000030e06f457100000031e06f457100000032e06f457100000033e06f457100000034e06f457100000035e06f457100000036e06f457100000037e06f457100000038e06f457100000039e06f457100000007e0af457100000009e0af45710000001be0af45710000001de0af45710000001fe0af45710000000ce06f45710000001ce0af45710000000ee0af457100000001e0af45710000000050dfe09044060000501f33855f060007509ffd8f7f060006509ffd8f7f060005509ffd8f7f060010e0af457100000016e0af45710000001ae0af457100000020e0af457100000000509ff58f7f060000509ffd8f7f060002509ffd8f7f060004509ffd8f7f060008509ffd8f7f060009509ffd8f7f0600 + - rid: 1375113474824208397 + type: {class: PlatformOverride, ns: UnityEngine.Localization.Metadata, asm: Unity.Localization} + data: + m_PlatformOverrides: + - platform: 1 + entryOverrideType: 2 + tableReference: + m_TableCollectionName: GUID:e140a6e03d69147b0bf89b55f6cb603e + tableEntryReference: + m_KeyId: 8020914447835136 + m_Key: + - platform: 0 + entryOverrideType: 2 + tableReference: + m_TableCollectionName: GUID:e140a6e03d69147b0bf89b55f6cb603e + tableEntryReference: + m_KeyId: 8020914447835136 + m_Key: + - rid: 1375113474824208400 + type: {class: PlatformOverride, ns: UnityEngine.Localization.Metadata, asm: Unity.Localization} + data: + m_PlatformOverrides: + - platform: 1 + entryOverrideType: 2 + tableReference: + m_TableCollectionName: GUID:e140a6e03d69147b0bf89b55f6cb603e + tableEntryReference: + m_KeyId: 8021235509223424 + m_Key: + - platform: 0 + entryOverrideType: 2 + tableReference: + m_TableCollectionName: GUID:e140a6e03d69147b0bf89b55f6cb603e + tableEntryReference: + m_KeyId: 8021235509223424 + m_Key: diff --git a/Assets/Localization/StringTable_ko.asset b/Assets/Localization/StringTable_ko.asset index 32e80aa..23eed2b 100644 --- a/Assets/Localization/StringTable_ko.asset +++ b/Assets/Localization/StringTable_ko.asset @@ -17,7 +17,7 @@ MonoBehaviour: m_SharedData: {fileID: 11400000, guid: e140a6e03d69147b0bf89b55f6cb603e, type: 2} m_Metadata: m_Items: - - id: 0 + - rid: 0 m_TableData: - m_Id: 486441738240 m_Localized: "\uB9F5 \uC5D0\uB514\uD130\uC5D0 \uC624\uC2E0 \uAC78 \uD658\uC601\uD569\uB2C8\uB2E4!" @@ -27,24 +27,24 @@ MonoBehaviour: m_Localized: "\uC88B\uC544\uC694!\\n\uB2E4\uC74C \uB2E8\uACC4\uB85C \uAC00\uBCFC\uAE4C\uC694?" m_Metadata: m_Items: - - id: 0 + - rid: 0 - m_Id: 486479486976 m_Localized: "\uB9F5\uC774 \uD50C\uB808\uC774 \uAC00\uB2A5\uD55C\uC9C0\\\\\uD14C\uC2A4\uD2B8\uD574\uC8FC\uC138\uC694." m_Metadata: m_Items: - - id: 0 + - rid: 0 - m_Id: 486479486977 m_Localized: "\uB9C8\uC9C0\uB9C9\uC73C\uB85C\\\\\uC800\uC7A5\uD55C \uC774\uD6C4\uB85C\\\\\uBCC0\uACBD\uC0AC\uD56D\uC774 \uC5C6\uC5B4\uC694." m_Metadata: m_Items: - - id: 0 + - rid: 0 - m_Id: 486492069888 m_Localized: "\uC885\uB8CC\uD558\uAE30 \uC804\uC5D0 \uBA3C\uC800\\\\\uB9F5\uC744 \uC800\uC7A5\uD558\uC138\uC694." m_Metadata: m_Items: - - id: 0 + - rid: 0 - m_Id: 486492069889 m_Localized: "\uC774\uC81C \uB9F5\uC744 \uC800\uC7A5\uD560 \uC218 \uC788\uC5B4\uC694." m_Metadata: @@ -54,7 +54,7 @@ MonoBehaviour: \uD14C\uC2A4\uD2B8\uD574\uC8FC\uC138\uC694." m_Metadata: m_Items: - - id: 0 + - rid: 0 - m_Id: 486492069891 m_Localized: "\uB9F5 \uC774\uB984\uC744 \uC124\uC815\uD558\uC138\uC694." m_Metadata: @@ -110,7 +110,7 @@ MonoBehaviour: \uC218 \uC5C6\uC5B4\uC694." m_Metadata: m_Items: - - id: 0 + - rid: 0 - m_Id: 486492069903 m_Localized: "\uD574\uB2F9 \uCD9C\uAD6C\uB294 \uC81C\uAC70\uD560 \uC218 \uC5C6\uC5B4\uC694." m_Metadata: @@ -124,13 +124,13 @@ MonoBehaviour: \uD558\uB098\uB9CC \uB193\uC744 \uC218 \uC788\uC5B4\uC694." m_Metadata: m_Items: - - id: 0 + - rid: 0 - m_Id: 486492069906 m_Localized: "\uB9F5\uC744 \uD130\uCE58\uD558\uBA74 \uCD9C\uAD6C\uAC00 \uCD94\uAC00\uB3FC\uC694.\\n\uCD9C\uAD6C\uB294 \uD558\uB098\uB9CC \uB193\uC744 \uC218 \uC788\uC5B4\uC694." m_Metadata: m_Items: - - id: 0 + - rid: 0 - m_Id: 486492069907 m_Localized: "\uB9F5\uC744 \uD130\uCE58\uD558\uBA74 \uBD88\uC774 \uCD94\uAC00\uB3FC\uC694." m_Metadata: @@ -153,7 +153,7 @@ MonoBehaviour: \uCD9C\uAD6C\uB97C\\n\uC81C\uAC70\uD560 \uC218 \uC788\uC5B4\uC694." m_Metadata: m_Items: - - id: 0 + - rid: 0 - m_Id: 486496264196 m_Localized: "\uB9F5\uC744 \uD130\uCE58\uD558\uBA74 \uBB3C\uCCB4\uB97C \uC81C\uAC70\uD560 \uC218 \uC788\uC5B4\uC694." @@ -168,30 +168,30 @@ MonoBehaviour: \uC2E4\uD589\uCDE8\uC18C\uD560 \uC218 \uC788\uC5B4\uC694." m_Metadata: m_Items: - - id: 0 + - rid: 0 - m_Id: 486496264199 m_Localized: "\uC800\uC7A5\uD558\uC9C0 \uC54A\uC740 \uBCC0\uACBD\uC0AC\uD56D\\n\\n\uB9F5\uC774 \uBCC0\uACBD\uB410\uC5B4\uC694.\\n\uC800\uC7A5\uD558\uC9C0 \uC54A\uACE0 \uADF8\uB0E5 \uC885\uB8CC\uD560\uAE4C\uC694?" m_Metadata: m_Items: - - id: 0 + - rid: 0 - m_Id: 486496264200 m_Localized: "\uC800\uC7A5\uD558\uC9C0 \uC54A\uC740 \uBCC0\uACBD\uC0AC\uD56D\\n\\n\uB9F5\uC744 \uC544\uC9C1 \uC800\uC7A5\uD558\uC9C0 \uC54A\uC558\uC5B4\uC694.\\n\uC800\uC7A5\uD558\uC9C0 \uC54A\uACE0 \uADF8\uB0E5 \uC885\uB8CC\uD560\uAE4C\uC694?" m_Metadata: m_Items: - - id: 0 + - rid: 0 - m_Id: 486496264201 m_Localized: "\uC800\uC7A5\uD558\uC9C0 \uC54A\uC740 \uBCC0\uACBD\uC0AC\uD56D\\n\\n\uB9F5\uC744 \uC544\uC9C1 \uD14C\uC2A4\uD2B8 \uB610\uB294 \uC800\uC7A5\uD558\uC9C0 \uC54A\uC558\uC5B4\uC694.\\n\uC800\uC7A5\uD558\uC9C0 \uC54A\uACE0 \uADF8\uB0E5 \uC885\uB8CC\uD560\uAE4C\uC694?" m_Metadata: m_Items: - - id: 0 + - rid: 0 - m_Id: 486496264202 - m_Localized: "\uC0AC\uC6A9\uD560 \uC218 \uC5C6\uB294 \uD30C\uC77C\uBA85\uC774\uC5D0\uC694." + m_Localized: "\uC0AC\uC6A9\uD560 \uC218 \uC5C6\uB294 \uD30C\uC77C \uC774\uB984\uC774\uC5D0\uC694." m_Metadata: m_Items: [] - m_Id: 486496264203 @@ -203,23 +203,23 @@ MonoBehaviour: \uD589\uB3D9\uC740 \uC2E4\uD589\uCDE8\uC18C\uD560 \uC218 \uC788\uC5B4\uC694." m_Metadata: m_Items: - - id: 0 + - rid: 0 - m_Id: 486496264205 m_Localized: "\uD3F4\uB354 \uC0DD\uC131\\n\\n\uC0C8 \uD3F4\uB354\uC758\\n\uC774\uB984\uC744 \uC785\uB825\uD558\uC138\uC694." m_Metadata: m_Items: - - id: 0 + - rid: 0 - m_Id: 486496264206 - m_Localized: "\uC0AC\uC6A9\uD560 \uC218 \uC5C6\uB294 \uD3F4\uB354\uBA85\uC774\uC5D0\uC694." + m_Localized: "\uC0AC\uC6A9\uD560 \uC218 \uC5C6\uB294 \uD3F4\uB354 \uC774\uB984\uC774\uC5D0\uC694." m_Metadata: m_Items: [] - m_Id: 486496264207 m_Localized: "\uD3F4\uB354\uB97C \uC0DD\uC131\uD560 \uC218 \uC5C6\uC5B4\uC694:\\n\uC0AC\uC6A9\uD560 - \uC218 \uC5C6\uB294 \uD3F4\uB354\uBA85." + \uC218 \uC5C6\uB294 \uD3F4\uB354 \uC774\uB984." m_Metadata: m_Items: - - id: 0 + - rid: 0 - m_Id: 486496264208 m_Localized: "\uC0C8 \uD3F4\uB354 \"" m_Metadata: @@ -242,7 +242,7 @@ MonoBehaviour: \uBD88\uAC00\uB2A5." m_Metadata: m_Items: - - id: 0 + - rid: 0 - m_Id: 486496264213 m_Localized: "\uB9F5\uC744 \uC800\uC7A5\uD560 \uC218 \uC5C6\uC5B4\uC694: " m_Metadata: @@ -251,12 +251,12 @@ MonoBehaviour: m_Localized: "\uB36E\uC5B4\uC4F0\uAE30 \uD655\uC778\\n\\n\uB9F5 \"" m_Metadata: m_Items: - - id: 0 + - rid: 0 - m_Id: 486496264215 m_Localized: "\"\uC774(\uAC00) \uC774\uBBF8 \uC874\uC7AC\uD574\uC694.\\n\uB36E\uC5B4\uC4F8\uAE4C\uC694?" m_Metadata: m_Items: - - id: 0 + - rid: 0 - m_Id: 486496264217 m_Localized: "\uB9F5\uC744 \uC7AC\uCD08\uAE30\uD654\uD560 \uC218 \uC788\uC5B4\uC694." m_Metadata: @@ -274,7 +274,7 @@ MonoBehaviour: \uCD9C\uAD6C" m_Metadata: m_Items: - - id: 0 + - rid: 0 - m_Id: 486496264221 m_Localized: "\uC2E4\uD589 \uCDE8\uC18C: \uBB3C\uCCB4" m_Metadata: @@ -300,7 +300,7 @@ MonoBehaviour: \uCD9C\uAD6C" m_Metadata: m_Items: - - id: 0 + - rid: 0 - m_Id: 486496264227 m_Localized: "\uB2E4\uC2DC \uC2E4\uD589: \uBB3C\uCCB4" m_Metadata: @@ -344,79 +344,79 @@ MonoBehaviour: \uC54A\uC740 \uB9F5 \uD30C\uC77C" m_Metadata: m_Items: - - id: 0 + - rid: 0 - m_Id: 486496264237 m_Localized: "\uB9F5\uC744 \uC5F4 \uC218 \uC5C6\uC5B4\uC694:\\n\uC0AC\uC774\uC988 \uC624\uB958" m_Metadata: m_Items: - - id: 0 + - rid: 0 - m_Id: 486496264238 m_Localized: "\uB9F5\uC744 \uC5F4 \uC218 \uC5C6\uC5B4\uC694:\\n\uACF5 \uC624\uB958" m_Metadata: m_Items: - - id: 0 + - rid: 0 - m_Id: 486496264239 m_Localized: "\uB9F5\uC744 \uC5F4 \uC218 \uC5C6\uC5B4\uC694:\\n\uC1F3\uB369\uC774 \uC624\uB958" m_Metadata: m_Items: - - id: 0 + - rid: 0 - m_Id: 486496264240 m_Localized: "\uB9F5\uC744 \uC5F4 \uC218 \uC5C6\uC5B4\uC694:\\n\uBD88 \uC624\uB958" m_Metadata: m_Items: - - id: 0 + - rid: 0 - m_Id: 486496264241 m_Localized: "\uB9F5\uC744 \uC5F4 \uC218 \uC5C6\uC5B4\uC694:\\n\uCD9C\uAD6C \uC624\uB958" m_Metadata: m_Items: - - id: 0 + - rid: 0 - m_Id: 486496264242 m_Localized: "\uB9F5\uC744 \uC5F4 \uC218 \uC5C6\uC5B4\uC694:\\n\uBCBD \uC624\uB958" m_Metadata: m_Items: - - id: 0 + - rid: 0 - m_Id: 486496264243 m_Localized: "\uB9F5\uC744 \uC5F4 \uC218 \uC5C6\uC5B4\uC694:\\n\uC154\uD130 \uC624\uB958" m_Metadata: m_Items: - - id: 0 + - rid: 0 - m_Id: 486496264244 m_Localized: "\uB9F5\uC744 \uC5F4 \uC218 \uC5C6\uC5B4\uC694:\\n\uC2DC\uAC04 \uC81C\uD55C \uC624\uB958" m_Metadata: m_Items: - - id: 0 + - rid: 0 - m_Id: 486496264245 m_Localized: "\uB9F5\uC744 \uC5F4 \uC218 \uC5C6\uC5B4\uC694:\\n\uD480\uC774 \uC624\uB958" m_Metadata: m_Items: - - id: 0 + - rid: 0 - m_Id: 486496264246 m_Localized: "\uB9F5\uC744 \uC5F4 \uC218 \uC5C6\uC5B4\uC694:\\n\uC911\uBCF5\uB41C \uD480\uC774" m_Metadata: m_Items: - - id: 0 + - rid: 0 - m_Id: 486496264247 m_Localized: "\uB9F5\uC744 \uC5F4 \uC218 \uC5C6\uC5B4\uC694:\\n\uC62C\uBC14\uB974\uC9C0 \uC54A\uC740 \uD480\uC774" m_Metadata: m_Items: - - id: 0 + - rid: 0 - m_Id: 486496264248 m_Localized: "\uB9F5\uC744 \uC5F4 \uC218 \uC5C6\uC5B4\uC694:\\n\uC54C \uC218 \uC5C6\uB294 \uAE30\uD638" m_Metadata: m_Items: - - id: 0 + - rid: 0 - m_Id: 486496264249 m_Localized: "\uB9F5\uC744 \uC5F4 \uC218 \uC5C6\uC5B4\uC694:\\n\uC62C\uBC14\uB974\uC9C0 \uC54A\uC740 \uB9F5 \uB610\uB294 \uD074\uB9AC\uC5B4 \uBD88\uAC00\uB2A5 \uB9F5" m_Metadata: m_Items: - - id: 0 + - rid: 0 - m_Id: 486496264251 m_Localized: "\uCD95\uD558\uD574\uC694!" m_Metadata: @@ -442,7 +442,7 @@ MonoBehaviour: \uBAA8\uD5D8\uC744 \uC2DC\uC791\uD574\uBCF4\uC138\uC694!" m_Metadata: m_Items: - - id: 0 + - rid: 0 - m_Id: 486500458498 m_Localized: "\uC6B0\uB9AC\uC758 \uBAA8\uD5D8\uC740 \uC774\uC81C\uBD80\uD130 \uC2DC\uC791\uC774\uC5D0\uC694!" @@ -453,7 +453,7 @@ MonoBehaviour: m_Metadata: m_Items: [] - m_Id: 486500458500 - m_Localized: "\uC911\uB825 \uBBF8\uB85C \uB9C8\uC2A4\uD130\uAC00 \uB418\uC168\uAD70\uC694!" + m_Localized: "\uC911\uB825\uBBF8\uB85C \uB9C8\uC2A4\uD130\uAC00 \uB418\uC168\uAD70\uC694!" m_Metadata: m_Items: [] - m_Id: 486500458501 @@ -465,13 +465,13 @@ MonoBehaviour: \uC67C\uCABD\uC73C\uB85C \uAD74\uB7EC\uAC00\uC694!" m_Metadata: m_Items: - - id: 0 + - rid: 0 - m_Id: 486500458503 m_Localized: "\uC88B\uC544\uC694!\\n\uC774\uBC88\uC5D0\uB294 \uC704\uCABD \uBC29\uD5A5\uD0A4\uB97C \uB20C\uB7EC\uC11C\\n\uACF5\uC744 \uC704\uB85C \uAD74\uB824\uBD10\uC694." m_Metadata: m_Items: - - id: 0 + - rid: 0 - m_Id: 486500458504 m_Localized: "\uD6CC\uB96D\uD574\uC694! \uC774\uC81C \uACF5\uC744 \uD0C8\uCD9C\uC2DC\uCF1C\uBCF4\uC8E0!" m_Metadata: @@ -481,7 +481,7 @@ MonoBehaviour: \uBBF8\uB85C\uC608\uC694...\\n\uD589\uC6B4\uC744 \uBE4C\uAC8C\uC694!" m_Metadata: m_Items: - - id: 0 + - rid: 0 - m_Id: 486500458506 m_Localized: "\uD750\uC74C, \uD6CC\uB96D\uD55C \uC218\uB124\uC694!" m_Metadata: @@ -504,7 +504,7 @@ MonoBehaviour: \uC870\uC2EC\uD558\uC138\uC694!" m_Metadata: m_Items: - - id: 0 + - rid: 0 - m_Id: 486500458511 m_Localized: "\uC774\uC81C \uC1F3\uB369\uC774\uAC00 \uD0C8\uCD9C\uC744 \uBC29\uD574\uD558\uC9C0 \uC54A\uB294\uAD70\uC694!" @@ -515,25 +515,25 @@ MonoBehaviour: \uD0C8\uCD9C\uD560 \uC218 \uC788\uC5B4\uC694." m_Metadata: m_Items: - - id: 0 + - rid: 0 - m_Id: 486500458513 m_Localized: "\uC1F3\uB369\uC774\uB294 \uC77C\uC2DC\uC801\uC73C\uB85C\\n\uBD88\uC744 \uB36E\uC5B4\uBC84\uB9B4 \uC218 \uC788\uC5B4\uC694!" m_Metadata: m_Items: - - id: 0 + - rid: 0 - m_Id: 486500458514 m_Localized: "\uC1F3\uB369\uC774\uB85C \uBD88\uC744 \uB36E\uC5B4\uBC84\uB838\uC73C\uB2C8,\\n\uC774\uC81C \uC1F3\uB369\uC774\uB97C \uBC1F\uACE0 \uAC00\uBCF4\uC8E0." m_Metadata: m_Items: - - id: 0 + - rid: 0 - m_Id: 486500458515 m_Localized: "\uC624\uB978\uCABD \uBC29\uD5A5\uD0A4\uB97C \uB20C\uB7EC\uC11C\\n\uC5F0\uB450\uC0C9 \uC154\uD130\uB97C \uB2EB\uC544\uBCF4\uC138\uC694." m_Metadata: m_Items: - - id: 0 + - rid: 0 - m_Id: 486500458516 m_Localized: "\uC154\uD130\uB97C \uC0AC\uC6A9\uD574\uBCF4\uC8E0!" m_Metadata: @@ -543,59 +543,59 @@ MonoBehaviour: \uB098\uBA74,\\n\uC154\uD130\uB294 \uBCBD\uC73C\uB85C \uBCC0\uD574\uC694." m_Metadata: m_Items: - - id: 0 + - rid: 0 - m_Id: 486500458518 m_Localized: "\uC154\uD130\uAC00 \uBCBD\uC73C\uB85C \uBC14\uB00C\uACE0 \uB098\uBA74,\\n\uC774 \uB9F5\uC744 \uC7AC\uB3C4\uC804\uD558\uAE30 \uC804\uAE4C\uC9C0\uB294\\n\uACC4\uC18D \uBCBD\uC73C\uB85C \uB0A8\uC544\uC788\uC5B4\uC694." m_Metadata: m_Items: - - id: 0 + - rid: 0 - m_Id: 486500458519 m_Localized: "\uBB3C\uB860, \uC154\uD130\uC5D0 \uAC07\uD600\uBC84\uB9AC\uB294 \uACBD\uC6B0\uB3C4 \uC788\uC8E0!\\n\uADF8\uB7F4 \uB54C\uB294 \uB418\uB3CC\uB9AC\uAE30 \uBC84\uD2BC\uC744 \uB20C\uB7EC\uBCF4\uC138\uC694!" m_Metadata: m_Items: - - id: 0 + - rid: 0 - m_Id: 486500458520 m_Localized: "\uBCBD\uC73C\uB85C \uBCC0\uD55C \uC154\uD130\uB294 \uC1F3\uB369\uC774\uB97C \uB9C9\uC744 \uC218 \uC788\uC5B4\uC694. \uC154\uD130\uB97C \uC9C0\uB098\uBA74 \uC548\uC804\uD558\uB2E4\uB294 \uB73B\uC774\uC8E0!" m_Metadata: m_Items: - - id: 0 + - rid: 0 - m_Id: 486500458521 m_Localized: "\uC1F3\uB369\uC774\uAC00 \uC154\uD130\uB97C \uD1B5\uACFC\uD558\uB354\uB77C\uB3C4 \uBCBD\uC73C\uB85C \uBCC0\uD558\uC9C0 \uC54A\uC544\uC694. \uC624\uC9C1 \uACF5\uB9CC\uC774 \uC154\uD130\uB97C \uB2EB\uC744 \uC218 \uC788\uC5B4\uC694." m_Metadata: m_Items: - - id: 0 + - rid: 0 - m_Id: 486500458522 m_Localized: "\uC88B\uC544\uC694! \uCD9C\uAD6C\uB97C \uCC3E\uC73C\uC168\uAD70\uC694.\\n\uC774\uC81C \uBBF8\uB85C\uB97C \uD0C8\uCD9C\uD574\uBCF4\uC8E0!" m_Metadata: m_Items: - - id: 0 + - rid: 0 - m_Id: 486500458523 m_Localized: "\uACF5\uC774 \uBD88\uC5D0 \uD0C0\uBC84\uB838\uC5B4\uC694!\\n\uBC18\uC9DD\uC774\uB294 \uB418\uB3CC\uB9AC\uAE30 \uBC84\uD2BC\uC744 \uB20C\uB7EC\\n\uB2E4\uC2DC \uB3C4\uC804\uD574\uBD10\uC694!" m_Metadata: m_Items: - - id: 0 + - rid: 0 - m_Id: 486500458524 m_Localized: "\uACF5\uC774 \uBB49\uAC1C\uC838\uBC84\uB838\uC5B4\uC694!\\n\uBC18\uC9DD\uC774\uB294 \uB418\uB3CC\uB9AC\uAE30 \uBC84\uD2BC\uC744 \uB20C\uB7EC\\n\uB2E4\uC2DC \uB3C4\uC804\uD574\uBD10\uC694!" m_Metadata: m_Items: - - id: 0 + - rid: 0 - m_Id: 486500458525 m_Localized: "\uC774\uB7F0, \uC2DC\uAC04 \uCD08\uACFC\uB124\uC694!\\n\uBC18\uC9DD\uC774\uB294 \uB418\uB3CC\uB9AC\uAE30 \uBC84\uD2BC\uC744 \uB20C\uB7EC\\n\uB2E4\uC2DC \uB3C4\uC804\uD574\uBD10\uC694!" m_Metadata: m_Items: - - id: 0 + - rid: 0 - m_Id: 486500458526 m_Localized: "\uBBF8\uB85C\uB97C \uD0C8\uCD9C\uD588\uC5B4\uC694! \uCD95\uD558\uD574\uC694!" m_Metadata: @@ -605,15 +605,15 @@ MonoBehaviour: \uBAA8\uB4E0 \uD29C\uD1A0\uB9AC\uC5BC\uC744 \uC644\uB8CC\uD588\uAD70\uC694!" m_Metadata: m_Items: - - id: 0 + - rid: 0 - m_Id: 486500458528 m_Localized: "\uCD9C\uAD6C\uB97C \uB9C9\uACE0 \uC788\uB358 \uC1F3\uB369\uC774\uAC00 \uC0AC\uB77C\uC84C\uB124\uC694.\\n\uBBF8\uB85C\uB97C \uD0C8\uCD9C\uD574\uBCF4\uC8E0!" m_Metadata: m_Items: - - id: 0 + - rid: 0 - m_Id: 164806647603200 - m_Localized: "\uBC30\uACBD\uC74C\n\uC74C\uB7C9" + m_Localized: "\uBC30\uACBD\uC74C\r\n\uC74C\uB7C9" m_Metadata: m_Items: [] - m_Id: 165160818827264 @@ -621,7 +621,7 @@ MonoBehaviour: m_Metadata: m_Items: [] - m_Id: 165244017041408 - m_Localized: "\uAE6C \uB9F5:" + m_Localized: "\uD074\uB9AC\uC5B4\uD55C \uB9F5:" m_Metadata: m_Items: [] - m_Id: 165287633608704 @@ -633,15 +633,15 @@ MonoBehaviour: m_Metadata: m_Items: [] - m_Id: 165355212234752 - m_Localized: "\uD6A8\uACFC\uC74C\n\uC74C\uB7C9" + m_Localized: "\uD6A8\uACFC\uC74C\r\n\uC74C\uB7C9" m_Metadata: m_Items: [] - m_Id: 165390494720000 - m_Localized: "\uC2DC\uAC04\n\uAC74\uB108\uB6F0\uAE30" + m_Localized: "\uC2DC\uAC04\r\n\uAC74\uB108\uB6F0\uAE30" m_Metadata: m_Items: [] - m_Id: 165437433176064 - m_Localized: "\uAC8C\uC784 \uC7AC\uAC1C" + m_Localized: "\uAC8C\uC784\uC73C\uB85C\r\n\uB3CC\uC544\uAC00\uAE30" m_Metadata: m_Items: [] - m_Id: 165465119776768 @@ -657,11 +657,11 @@ MonoBehaviour: m_Metadata: m_Items: [] - m_Id: 167868644712448 - m_Localized: "\uBC30\uACBD\uC74C\n\uC74C\uB7C9" + m_Localized: "\uBC30\uACBD\uC74C\r\n\uC74C\uB7C9" m_Metadata: m_Items: [] - m_Id: 167920012353536 - m_Localized: "\uBE44\uC5C8\uC74C!" + m_Localized: "\uBE44\uC5B4\uC788\uB124\uC694!" m_Metadata: m_Items: [] - m_Id: 167945413058560 @@ -669,7 +669,7 @@ MonoBehaviour: m_Metadata: m_Items: [] - m_Id: 167983132434432 - m_Localized: "\uD6A8\uACFC\uC74C\n\uC74C\uB7C9" + m_Localized: "\uD6A8\uACFC\uC74C\r\n\uC74C\uB7C9" m_Metadata: m_Items: [] - m_Id: 168024756707328 @@ -681,11 +681,11 @@ MonoBehaviour: m_Metadata: m_Items: [] - m_Id: 168062677409792 - m_Localized: "\uAC8C\uC784 \uC7AC\uAC1C" + m_Localized: "\uAC8C\uC784\uC73C\uB85C\r\n\uB3CC\uC544\uAC00\uAE30" m_Metadata: m_Items: [] - m_Id: 168120571387904 - m_Localized: "\uC2DC\uAC04\n\uAC74\uB108\uB6F0\uAE30" + m_Localized: "\uC2DC\uAC04\r\n\uAC74\uB108\uB6F0\uAE30" m_Metadata: m_Items: [] - m_Id: 168241920991232 @@ -695,8 +695,7 @@ MonoBehaviour: - m_Id: 168297738788864 m_Localized: "\uBE44\uC5B4\uC788\uB124\uC694!" m_Metadata: - m_Items: - - id: 0 + m_Items: [] - m_Id: 168490139901952 m_Localized: "\uB9F5 \uC774\uB984\uC744 \uC785\uB825\uD558\uC138\uC694..." m_Metadata: @@ -722,7 +721,7 @@ MonoBehaviour: m_Metadata: m_Items: [] - m_Id: 169313049763840 - m_Localized: "\uB2F9\uC2E0\uC740 \uC911\uB825 \uC870\uC791\uC790\uC785\uB2C8\uB2E4.\n\uACF5\uC744 + m_Localized: "\uB2F9\uC2E0\uC740 \uC911\uB825 \uC870\uC791\uC790\uC785\uB2C8\uB2E4.\r\n\uACF5\uC744 \uCD9C\uAD6C\uB85C \uD0C8\uCD9C\uC2DC\uCF1C\uBCF4\uC138\uC694!" m_Metadata: m_Items: [] @@ -739,15 +738,18 @@ MonoBehaviour: m_Metadata: m_Items: [] - m_Id: 169656898805760 - m_Localized: "\uBC30\uACBD\uC74C\n\uC74C\uB7C9" + m_Localized: "\uBC30\uACBD\uC74C\r\n\uC74C\uB7C9" m_Metadata: m_Items: [] - m_Id: 169839971786752 - m_Localized: "\uD504\uB85C\uC81D\uD2B8 \uAD00\uB9AC,\n\uBA54\uC778 \uD504\uB85C\uADF8\uB798\uBC0D,\n\uC0AC\uC6B4\uB4DC - \uB514\uC790\uC778,\nUI/UX \uB514\uC790\uC778,\n\uADF8\uB9AC\uACE0 \uB9F5 \uC81C\uC791\n\uC548\uB2E8\uD0DC\n\n\uC11C\uBE0C - \uD504\uB85C\uADF8\uB798\uBC0D\n\uC5C4\uC900\uC6B0\n\n\uB9F5 - \uC81C\uC791\n\uC591\uB3D9\uD658\n\n\uB9C8\uCF00\uD305\n\uC774\uC218\uC778\n\n\uAC1C\uBC1C - \uBCF4\uC870\n\uAE40\uB2E4\uC778\n\uC870\uC6A9\uCC2C\n\uD64D\uC7AC\uD76C" + m_Localized: "\uC911\uB825\uBBF8\uB85C\r\nv1.4.3\r\n\r\n\uD504\uB85C\uC81D\uD2B8 + \uAD00\uB9AC\r\n\uC548\uB2E8\uD0DC\r\n\r\n\uD504\uB85C\uADF8\uB798\uBC0D\r\n\uC548\uB2E8\uD0DC\r\njunu192857\r\n\uC591\uB3D9\uD658\r\n\uC774\uC218\uC778\r\n\uAE40\uC138\uD604\r\n\uD64D\uC7AC\uD76C\r\n\uC870\uC6A9\uCC2C\r\n\uAE40\uB2E4\uC778\r\n\r\n\uAC8C\uC784 + \uB514\uC790\uC778\r\n\uC548\uB2E8\uD0DC\r\n\r\n\uB808\uBCA8 + \uB514\uC790\uC778\r\n\uC591\uB3D9\uD658\r\n\uC548\uB2E8\uD0DC\r\n\r\nUI/UX + \uB514\uC790\uC778\r\n\uC548\uB2E8\uD0DC\r\n\uC774\uC218\uC778\r\n\r\n\uADF8\uB798\uD53D + \uB514\uC790\uC778\r\n\uC548\uB2E8\uD0DC\r\n\uC774\uC218\uC778\r\n\uC591\uB3D9\uD658\r\n\r\n\uC0AC\uC6B4\uB4DC + \uB514\uC790\uC778\r\n\uC548\uB2E8\uD0DC\r\n\r\n\uBC88\uC5ED\r\n\uD64D\uC7AC\uD76C\r\n\uAE40\uB2E4\uC778\r\n\uC548\uB2E8\uD0DC\r\n\r\n\uB9C8\uCF00\uD305\r\n\uC774\uC218\uC778\r\n\r\n\uC778\uD504\uB77C\r\ncseteram\r\n\r\n\uB9F5 + \uC81C\uC791\r\n\uC548\uB2E8\uD0DC\r\n\uC591\uB3D9\uD658\r\nahnjunseo\r\njunu192857\r\n\uC774\uC218\uC778\r\nMINSEOKIM1\r\nektnzpt1080" m_Metadata: m_Items: [] - m_Id: 170078573158400 @@ -763,7 +765,7 @@ MonoBehaviour: m_Metadata: m_Items: [] - m_Id: 170197498454016 - m_Localized: "\uD6A8\uACFC\uC74C\n\uC74C\uB7C9" + m_Localized: "\uD6A8\uACFC\uC74C\r\n\uC74C\uB7C9" m_Metadata: m_Items: [] - m_Id: 170232315371520 @@ -771,7 +773,7 @@ MonoBehaviour: m_Metadata: m_Items: [] - m_Id: 170767890243584 - m_Localized: "\uBC30\uACBD\uC74C\n\uC74C\uB7C9" + m_Localized: "\uBC30\uACBD\uC74C\r\n\uC74C\uB7C9" m_Metadata: m_Items: [] - m_Id: 170796554117120 @@ -779,7 +781,7 @@ MonoBehaviour: m_Metadata: m_Items: [] - m_Id: 170818960089088 - m_Localized: "\uD6A8\uACFC\uC74C\n\uC74C\uB7C9" + m_Localized: "\uD6A8\uACFC\uC74C\r\n\uC74C\uB7C9" m_Metadata: m_Items: [] - m_Id: 170842775347200 @@ -791,15 +793,15 @@ MonoBehaviour: m_Metadata: m_Items: [] - m_Id: 170877630013440 - m_Localized: "\uAC8C\uC784\uC73C\uB85C\n\uB3CC\uC544\uAC00\uAE30" + m_Localized: "\uAC8C\uC784\uC73C\uB85C\r\n\uB3CC\uC544\uAC00\uAE30" m_Metadata: m_Items: [] - m_Id: 170898291154944 - m_Localized: "\uC774 \uB9F5\n\uC2A4\uD0B5\uD558\uAE30" + m_Localized: "\uC2DC\uAC04\r\n\uAC74\uB108\uB6F0\uAE30" m_Metadata: m_Items: [] - m_Id: 170979144753152 - m_Localized: "\uBC30\uACBD\uC74C\n\uC74C\uB7C9" + m_Localized: "\uBC30\uACBD\uC74C\r\n\uC74C\uB7C9" m_Metadata: m_Items: [] - m_Id: 171031661633536 @@ -811,7 +813,7 @@ MonoBehaviour: m_Metadata: m_Items: [] - m_Id: 171095343751168 - m_Localized: "\uD6A8\uACFC\uC74C\n\uC74C\uB7C9" + m_Localized: "\uD6A8\uACFC\uC74C\r\n\uC74C\uB7C9" m_Metadata: m_Items: [] - m_Id: 171112083218432 @@ -823,11 +825,11 @@ MonoBehaviour: m_Metadata: m_Items: [] - m_Id: 171166206517248 - m_Localized: "\uAC8C\uC784\uC73C\uB85C\n\uB3CC\uC544\uAC00\uAE30" + m_Localized: "\uAC8C\uC784\uC73C\uB85C\r\n\uB3CC\uC544\uAC00\uAE30" m_Metadata: m_Items: [] - m_Id: 171187530358784 - m_Localized: "\uC774 \uB9F5\n\uC2A4\uD0B5\uD558\uAE30" + m_Localized: "\uC2DC\uAC04\r\n\uAC74\uB108\uB6F0\uAE30" m_Metadata: m_Items: [] - m_Id: 487869532594176 @@ -898,13 +900,14 @@ MonoBehaviour: m_Metadata: m_Items: [] - m_Id: 962298430574592 - m_Localized: "\uC2A4\uD398\uC774\uC2A4 \uD0A4" + m_Localized: "Space \uD0A4" m_Metadata: m_Items: [] - m_Id: 962494929522688 - m_Localized: "Ctrl + \uC2A4\uD398\uC774\uC2A4 \uD0A4" + m_Localized: "Ctrl + Space \uD0A4" m_Metadata: - m_Items: [] + m_Items: + - rid: 1375113474824208399 - m_Id: 962811704332288 m_Localized: "Enter \uD0A4" m_Metadata: @@ -912,7 +915,8 @@ MonoBehaviour: - m_Id: 962904780132352 m_Localized: "Ctrl + Enter \uD0A4" m_Metadata: - m_Items: [] + m_Items: + - rid: 1375113474824208398 - m_Id: 963619405647872 m_Localized: "Esc \uD0A4" m_Metadata: @@ -922,12 +926,12 @@ MonoBehaviour: \uB2E4\uC74C\uC73C\uB85C \uBC84\uD2BC\uC744 \uB204\uB974\uC138\uC694!" m_Metadata: m_Items: - - id: 0 + - rid: 0 - m_Id: 1793875553243136 m_Localized: "\uB9F5 \uC0DD\uC131 \uC644\uB8CC!\\n\"" m_Metadata: m_Items: - - id: 0 + - rid: 0 - m_Id: 1793875561631744 m_Localized: "\"(\uC73C)\uB85C \uC800\uC7A5\uD588\uC5B4\uC694!" m_Metadata: @@ -937,14 +941,14 @@ MonoBehaviour: \uC9E7\uAC70\uB4E0\uC694!" m_Metadata: m_Items: - - id: 0 + - rid: 0 - m_Id: 1829106272391168 m_Localized: "\uC557, \uAC07\uD600\uBC84\uB838\uB124\uC694...\\n\uD558\uC9C0\uB9CC \uC2DC\uAC04\uC740 \uACC4\uC18D \uD750\uB974\uACE0 \uC788\uC5B4\uC694.\\n\uC5BC\uB978 \uB418\uB3CC\uB9AC\uAE30 \uBC84\uD2BC\uC744 \uB204\uB974\uC138\uC694!" m_Metadata: m_Items: - - id: 0 + - rid: 0 - m_Id: 1829106272391169 m_Localized: "\uC624! \uC88B\uC544\uC694!" m_Metadata: @@ -954,7 +958,7 @@ MonoBehaviour: \uD574\uC57C \uD560\uAE4C\uC694?" m_Metadata: m_Items: - - id: 0 + - rid: 0 - m_Id: 1829106272391171 m_Localized: "\uC11C\uB450\uB974\uC138\uC694! \uD0C8\uCD9C\uAD6C\uAC00 \uC5F4\uB838\uC5B4\uC694!" m_Metadata: @@ -969,23 +973,80 @@ MonoBehaviour: \uB418\uB3CC\uB9AC\uAE30 \uBC84\uD2BC\uC744 \uB204\uB974\uC138\uC694!" m_Metadata: m_Items: - - id: 0 + - rid: 0 - m_Id: 1829106272391174 m_Localized: "\uACF5\uC774 \uBB49\uAC1C\uC9C0\uBA74 \uC2DC\uAC04\uC774 \uBA48\uCDB0\uC694!\\n\uC2EC\uD638\uD761\uD558\uACE0 \uB418\uB3CC\uB9AC\uAE30 \uBC84\uD2BC\uC744 \uB204\uB974\uC138\uC694!" m_Metadata: m_Items: - - id: 0 + - rid: 0 - m_Id: 1829106272391175 - m_Localized: "\uC2DC\uAC04\uC774 \uB05D\uB098\uBA74 \uC6D0\uB798\uB294 \uB77C\uC774\uD504\uAC00 - \uAE4E\uC774\uC9C0\uB9CC,\\n\uC5EC\uAE30\uC11C\uB294 \uAD1C\uCC2E\uC544\uC694! + m_Localized: "\uC2DC\uAC04\uC774 \uB05D\uB098\uBA74 \uC6D0\uB798\uB294 \uD398\uB110\uD2F0\uAC00 + \uC788\uC9C0\uB9CC,\\n\uD29C\uD1A0\uB9AC\uC5BC\uC5D0\uC11C\uB294 \uAD1C\uCC2E\uC544\uC694! \uB2E4\uC2DC \uB3C4\uC804\uD574\uBD10\uC694!" m_Metadata: m_Items: - - id: 0 + - rid: 0 + - m_Id: 8020914447835136 + m_Localized: "Option + Enter \uD0A4" + m_Metadata: + m_Items: [] + - m_Id: 8021235509223424 + m_Localized: "Option + Space \uD0A4" + m_Metadata: + m_Items: [] + - m_Id: 1829106272391176 + m_Localized: "\uC2DC\uAC04\uC774 \uCC38 \uC9E7\uC8E0...\\n\uC81C\uD55C\uC2DC\uAC04\uC744 + \uB298\uB824\uB4DC\uB9B4\uAC8C\uC694.\\n\uB2E4\uC2DC \uB3C4\uC804\uD574\uBCF4\uC138\uC694!" + m_Metadata: + m_Items: + - rid: 0 + - m_Id: 1829106272391177 + m_Localized: "\uC2DC\uAC04\uC774 \uB354 \uB298\uC5B4\uB0AC\uC5B4\uC694.\\n\uC5EC\uC720\uB97C + \uAC16\uACE0 \uC2DC\uB3C4\uD574 \uBCF4\uC138\uC694!" + m_Metadata: + m_Items: + - rid: 0 references: - version: 1 - 00000000: + version: 2 + RefIds: + - rid: 0 type: {class: SmartFormatTag, ns: UnityEngine.Localization.Metadata, asm: Unity.Localization} data: - m_Entries: 00e02f447100000001e06f447100000000e02f457100000002e02f457100000000e06f44710000000ee02f457100000011e02f457100000012e02f457100000003e06f457100000006e06f457100000007e06f457100000008e06f457100000009e06f45710000000de06f45710000000fe06f457100000014e06f457100000016e06f457100000017e06f457100000018e06f45710000001ce06f457100000022e06f45710000002ce06f45710000002de06f45710000002ee06f45710000002fe06f457100000030e06f457100000031e06f457100000032e06f457100000033e06f457100000034e06f457100000035e06f457100000036e06f457100000037e06f457100000038e06f457100000039e06f457100000007e0af457100000009e0af45710000001be0af45710000001de0af45710000001fe0af45710000000ce06f45710000001ce0af45710000000ee0af457100000001e0af45710000000050dfe09044060000e0efde1099000000501f33855f060007509ffd8f7f060006509ffd8f7f060005509ffd8f7f060000509ffd8f7f060020e0af45710000001ae0af457100000019e0af457100000018e0af457100000017e0af457100000016e0af457100000012e0af457100000006e0af457100000013e0af457100000015e0af457100000000509ff58f7f060002509ffd8f7f060010e0af457100000011e0af4571000000 + m_Entries: 00e02f447100000001e06f447100000000e02f457100000002e02f457100000000e06f44710000000ee02f457100000011e02f457100000012e02f457100000003e06f457100000006e06f457100000007e06f457100000008e06f457100000009e06f45710000000de06f45710000000fe06f457100000014e06f457100000016e06f457100000017e06f457100000018e06f45710000001ce06f457100000022e06f45710000002ce06f45710000002de06f45710000002ee06f45710000002fe06f457100000030e06f457100000031e06f457100000032e06f457100000033e06f457100000034e06f457100000035e06f457100000036e06f457100000037e06f457100000038e06f457100000039e06f457100000007e0af457100000009e0af45710000001be0af45710000001de0af45710000001fe0af45710000000ce06f45710000001ce0af45710000000ee0af457100000001e0af45710000000050dfe09044060000501f33855f060007509ffd8f7f060006509ffd8f7f060005509ffd8f7f060000509ffd8f7f060020e0af45710000001ae0af457100000019e0af457100000018e0af457100000017e0af457100000016e0af457100000012e0af457100000006e0af457100000013e0af457100000015e0af457100000000509ff58f7f060002509ffd8f7f060010e0af457100000011e0af457100000008509ffd8f7f060009509ffd8f7f0600 + - rid: 1375113474824208398 + type: {class: PlatformOverride, ns: UnityEngine.Localization.Metadata, asm: Unity.Localization} + data: + m_PlatformOverrides: + - platform: 1 + entryOverrideType: 2 + tableReference: + m_TableCollectionName: GUID:e140a6e03d69147b0bf89b55f6cb603e + tableEntryReference: + m_KeyId: 8020914447835136 + m_Key: + - platform: 0 + entryOverrideType: 2 + tableReference: + m_TableCollectionName: GUID:e140a6e03d69147b0bf89b55f6cb603e + tableEntryReference: + m_KeyId: 8020914447835136 + m_Key: + - rid: 1375113474824208399 + type: {class: PlatformOverride, ns: UnityEngine.Localization.Metadata, asm: Unity.Localization} + data: + m_PlatformOverrides: + - platform: 1 + entryOverrideType: 2 + tableReference: + m_TableCollectionName: GUID:e140a6e03d69147b0bf89b55f6cb603e + tableEntryReference: + m_KeyId: 8021235509223424 + m_Key: + - platform: 0 + entryOverrideType: 2 + tableReference: + m_TableCollectionName: GUID:e140a6e03d69147b0bf89b55f6cb603e + tableEntryReference: + m_KeyId: 8021235509223424 + m_Key: diff --git a/Assets/Prefabs/GravityMinMoveCount.prefab b/Assets/Prefabs/GravityMinMoveCount.prefab new file mode 100644 index 0000000..e0a2e86 --- /dev/null +++ b/Assets/Prefabs/GravityMinMoveCount.prefab @@ -0,0 +1,374 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &4153952067173167040 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6201100256435057325} + - component: {fileID: 1646323422643785924} + - component: {fileID: 6943585008823385632} + m_Layer: 5 + m_Name: Background3 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6201100256435057325 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4153952067173167040} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 947415739964845906} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 366, y: 354} + m_SizeDelta: {x: 324, y: 108} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1646323422643785924 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4153952067173167040} + m_CullTransparentMesh: 1 +--- !u!114 &6943585008823385632 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4153952067173167040} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: db1162f6a9a179f4883e95be01db38c1, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &5624274982047204072 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1878491366700404584} + - component: {fileID: 4758346734382964334} + - component: {fileID: 7938688105199665579} + m_Layer: 5 + m_Name: MinMoveCount1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1878491366700404584 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5624274982047204072} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 947415739964845906} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 486, y: 354} + m_SizeDelta: {x: 60, y: 84} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4758346734382964334 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5624274982047204072} + m_CullTransparentMesh: 1 +--- !u!114 &7938688105199665579 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5624274982047204072} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 2100000, guid: 7b3f00cdf31d54526a9400f5b7a0e441, type: 3} + m_Color: {r: 0.81960785, g: 0.8980392, b: 0.61960787, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 651c7cb75fa9faf4f9178abeb380bc42, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &6985810615854547123 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 826212454568802712} + - component: {fileID: 4046595181887224580} + - component: {fileID: 103161049738257137} + m_Layer: 5 + m_Name: MinMoveCount100 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &826212454568802712 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6985810615854547123} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 947415739964845906} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 342, y: 354} + m_SizeDelta: {x: 60, y: 84} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4046595181887224580 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6985810615854547123} + m_CullTransparentMesh: 1 +--- !u!114 &103161049738257137 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6985810615854547123} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 2100000, guid: 7b3f00cdf31d54526a9400f5b7a0e441, type: 3} + m_Color: {r: 0.81960785, g: 0.8980392, b: 0.61960787, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 651c7cb75fa9faf4f9178abeb380bc42, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &7479105889482343208 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 947415739964845906} + - component: {fileID: 6530629739181965378} + m_Layer: 5 + m_Name: GravityMinMoveCount + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &947415739964845906 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7479105889482343208} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 6201100256435057325} + - {fileID: 826212454568802712} + - {fileID: 3789096875493631698} + - {fileID: 1878491366700404584} + m_Father: {fileID: 0} + m_RootOrder: 8 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 960} + m_Pivot: {x: 0.5, y: 1} +--- !u!114 &6530629739181965378 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7479105889482343208} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0013944cea7f0794da5e0e7fc2b06c0d, type: 3} + m_Name: + m_EditorClassIdentifier: + mm: {fileID: 0} + minMoveCountLabel100: {fileID: 103161049738257137} + minMoveCountLabel10: {fileID: 5299890180674397444} + minMoveCountLabel1: {fileID: 7938688105199665579} + numberLabels: + - {fileID: 21300000, guid: 651c7cb75fa9faf4f9178abeb380bc42, type: 3} + - {fileID: 21300000, guid: 376e8fbb629431f46ab5e7a1116e2722, type: 3} + - {fileID: 21300000, guid: bc040a8e5ee5f754f9b878d4a339a279, type: 3} + - {fileID: 21300000, guid: 36bcff697733aa34fa2986971559fc55, type: 3} + - {fileID: 21300000, guid: ce6e4132558a3924ca82a55811c0cd72, type: 3} + - {fileID: 21300000, guid: a27dc7b04ffcb08409860e1e99a30018, type: 3} + - {fileID: 21300000, guid: 9105254dd0a9a234a9f9f1214cafc698, type: 3} + - {fileID: 21300000, guid: 01d69d645e23d48468844cd47313e689, type: 3} + - {fileID: 21300000, guid: f1bbde3889be9f3428771a901e772829, type: 3} + - {fileID: 21300000, guid: efa9e1bf524b33a40aff4ff7c8e6dac3, type: 3} +--- !u!1 &7827532842712473464 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3789096875493631698} + - component: {fileID: 3482060813162270968} + - component: {fileID: 5299890180674397444} + m_Layer: 5 + m_Name: MinMoveCount10 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3789096875493631698 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7827532842712473464} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 947415739964845906} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 414, y: 354} + m_SizeDelta: {x: 60, y: 84} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3482060813162270968 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7827532842712473464} + m_CullTransparentMesh: 1 +--- !u!114 &5299890180674397444 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7827532842712473464} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 2100000, guid: 7b3f00cdf31d54526a9400f5b7a0e441, type: 3} + m_Color: {r: 0.81960785, g: 0.8980392, b: 0.61960787, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 651c7cb75fa9faf4f9178abeb380bc42, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 diff --git a/Assets/Prefabs/GravityMinMoveCount.prefab.meta b/Assets/Prefabs/GravityMinMoveCount.prefab.meta new file mode 100644 index 0000000..49f4406 --- /dev/null +++ b/Assets/Prefabs/GravityMinMoveCount.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: e12109ae245e16f4d85e1bc6e4d67ac4 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/LanguageSetting.prefab b/Assets/Prefabs/LanguageSetting.prefab index 72c598c..323a323 100644 --- a/Assets/Prefabs/LanguageSetting.prefab +++ b/Assets/Prefabs/LanguageSetting.prefab @@ -1,5 +1,157 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &696225622449081380 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 752944638853733825} + - component: {fileID: 2661172088463356479} + - component: {fileID: 2782311741167966094} + m_Layer: 5 + m_Name: BackgroundImage + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &752944638853733825 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 696225622449081380} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 8027793274363365120} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: -12, y: 0} + m_SizeDelta: {x: 672, y: 324} + m_Pivot: {x: 0.5, y: 1} +--- !u!222 &2661172088463356479 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 696225622449081380} + m_CullTransparentMesh: 0 +--- !u!114 &2782311741167966094 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 696225622449081380} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.83921576, g: 0.83921576, b: 0.83921576, a: 1} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &4769199456210375266 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5140444734104528686} + - component: {fileID: 2670502044961322359} + - component: {fileID: 8268712871084305770} + m_Layer: 5 + m_Name: BottomImage + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5140444734104528686 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4769199456210375266} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 8027793274363365120} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 0, y: -312} + m_SizeDelta: {x: 720, y: 12} + m_Pivot: {x: 0.5, y: 1} +--- !u!222 &2670502044961322359 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4769199456210375266} + m_CullTransparentMesh: 0 +--- !u!114 &8268712871084305770 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4769199456210375266} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.37647063, g: 0.37647063, b: 0.37647063, a: 1} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!1 &8027793273716369195 GameObject: m_ObjectHideFlags: 0 @@ -29,6 +181,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8027793274741447482} m_RootOrder: 0 @@ -93,19 +246,20 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_TrackedObjects: - - id: 0 + - rid: 0 references: - version: 1 - 00000000: + version: 2 + RefIds: + - rid: 0 type: {class: TrackedUGuiGraphic, ns: UnityEngine.Localization.PropertyVariants.TrackedObjects, asm: Unity.Localization} data: m_Target: {fileID: 8027793273716369193} m_TrackedProperties: items: - - id: 1 + - rid: 1 m_UpdateType: 0 - 00000001: + - rid: 1 type: {class: LocalizedStringProperty, ns: UnityEngine.Localization.PropertyVariants.TrackedProperties, asm: Unity.Localization} data: @@ -147,15 +301,16 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8027793274363365120} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -348, y: 0} - m_SizeDelta: {x: 24, y: 288} - m_Pivot: {x: 0.5, y: 0.5} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: -354, y: 0} + m_SizeDelta: {x: 12, y: 324} + m_Pivot: {x: 0.5, y: 1} --- !u!222 &8027793273743669631 CanvasRenderer: m_ObjectHideFlags: 0 @@ -222,12 +377,13 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8027793274540290562} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.28333333} - m_AnchorMax: {x: 1, y: 0.575} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} @@ -297,15 +453,16 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8027793274363365120} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 300, y: 0} - m_SizeDelta: {x: 24, y: 288} - m_Pivot: {x: 0.5, y: 0.5} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 330, y: 0} + m_SizeDelta: {x: 12, y: 324} + m_Pivot: {x: 0.5, y: 1} --- !u!222 &8027793273916212481 CanvasRenderer: m_ObjectHideFlags: 0 @@ -373,15 +530,16 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 8027793275133233167} m_Father: {fileID: 8027793274363365120} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: 24, y: 288} - m_SizeDelta: {x: -96, y: 264} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: -36, y: 0} m_Pivot: {x: 0, y: 1} --- !u!222 &8027793273997252638 CanvasRenderer: @@ -464,6 +622,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 8027793274540290562} m_Father: {fileID: 8027793274363365120} @@ -472,7 +631,7 @@ RectTransform: m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 48, y: -24} + m_SizeDelta: {x: 36, y: 0} m_Pivot: {x: 1, y: 1} --- !u!222 &8027793274069789345 CanvasRenderer: @@ -555,8 +714,8 @@ MonoBehaviour: m_TargetGraphic: {fileID: 8027793273874828420} m_HandleRect: {fileID: 8027793273874828423} m_Direction: 2 - m_Value: 0.3999999 - m_Size: 0.29166666 + m_Value: 0 + m_Size: 1 m_NumberOfSteps: 6 m_OnValueChanged: m_PersistentCalls: @@ -602,21 +761,24 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: + - {fileID: 752944638853733825} - {fileID: 8027793273997252627} - {fileID: 8027793274069789349} - {fileID: 8027793275343388504} - {fileID: 8027793275594512417} - {fileID: 8027793273916212483} - {fileID: 8027793273743669617} + - {fileID: 5140444734104528686} - {fileID: 8027793274479873103} m_Father: {fileID: 8027793275362155128} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: -144} - m_SizeDelta: {x: 720, y: 288} + m_AnchoredPosition: {x: 0, y: -156} + m_SizeDelta: {x: 720, y: 324} m_Pivot: {x: 0.5, y: 1} --- !u!222 &8027793274363365135 CanvasRenderer: @@ -725,6 +887,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 8027793275269262312} - {fileID: 8027793275265516398} @@ -735,7 +898,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} m_AnchoredPosition: {x: 0, y: 12} - m_SizeDelta: {x: 0, y: 136} + m_SizeDelta: {x: 0, y: 120} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &8027793274464011145 MonoBehaviour: @@ -814,15 +977,16 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8027793274363365120} m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 324, y: 0} - m_SizeDelta: {x: 24, y: 288} - m_Pivot: {x: 0.5, y: 0.5} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 342, y: 0} + m_SizeDelta: {x: 12, y: 324} + m_Pivot: {x: 0.5, y: 1} --- !u!222 &8027793274479873101 CanvasRenderer: m_ObjectHideFlags: 0 @@ -901,6 +1065,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 8027793273874828423} m_Father: {fileID: 8027793274069789349} @@ -934,14 +1099,15 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8027793274741447485} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 8027793273716369192} - {fileID: 8027793275362155128} m_Father: {fileID: 0} - m_RootOrder: 0 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -976,15 +1142,16 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8027793274464011144} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 24, y: 0} - m_SizeDelta: {x: 565, y: 127} - m_Pivot: {x: 0.5, y: 0.5} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 84, y: 0} + m_SizeDelta: {x: 564, y: 120} + m_Pivot: {x: 0, y: 0.5} --- !u!222 &8027793274756309632 CanvasRenderer: m_ObjectHideFlags: 0 @@ -1055,6 +1222,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8027793275362155128} m_RootOrder: 0 @@ -1132,6 +1300,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 8027793274464011144} m_Father: {fileID: 8027793273997252627} @@ -1140,7 +1309,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 144} + m_SizeDelta: {x: 0, y: 120} m_Pivot: {x: 0.5, y: 1} --- !u!1 &8027793275265516385 GameObject: @@ -1170,15 +1339,16 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8027793274464011144} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -276, y: 0} - m_SizeDelta: {x: 20, y: 20} - m_Pivot: {x: 0.5, y: 0.5} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 36, y: 0} + m_SizeDelta: {x: 24, y: 24} + m_Pivot: {x: 0, y: 0.5} --- !u!222 &8027793275265516396 CanvasRenderer: m_ObjectHideFlags: 0 @@ -1245,15 +1415,16 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8027793274464011144} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 684, y: 140} - m_Pivot: {x: 0.5, y: 0.5} + m_SizeDelta: {x: 684, y: 120} + m_Pivot: {x: 0, y: 0.5} --- !u!222 &8027793275269262326 CanvasRenderer: m_ObjectHideFlags: 0 @@ -1320,15 +1491,16 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8027793274363365120} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: -132} - m_SizeDelta: {x: 720, y: 24} - m_Pivot: {x: 0.5, y: 0.5} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 0, y: 12} + m_SizeDelta: {x: 720, y: 12} + m_Pivot: {x: 0.5, y: 1} --- !u!222 &8027793275343388454 CanvasRenderer: m_ObjectHideFlags: 0 @@ -1397,6 +1569,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 8027793275061748209} - {fileID: 8027793274363365120} @@ -1436,8 +1609,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: abd3f91cd564fd5418729fe460ed88e1, type: 3} - m_Type: 3 + m_Sprite: {fileID: 21300000, guid: 0b7e54667301a584b9e29a5fadbd33a5, type: 3} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -1476,9 +1649,9 @@ MonoBehaviour: m_FadeDuration: 0.1 m_SpriteState: m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 21300000, guid: 7859e2e5499453e4a8d38a097fd1a69b, type: 3} + m_PressedSprite: {fileID: 21300000, guid: d8222f98f44df1348a6590633fe412e6, type: 3} m_SelectedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 21300000, guid: 7859e2e5499453e4a8d38a097fd1a69b, type: 3} + m_DisabledSprite: {fileID: 21300000, guid: d8222f98f44df1348a6590633fe412e6, type: 3} m_AnimationTriggers: m_NormalTrigger: Normal m_HighlightedTrigger: Highlighted @@ -1496,9 +1669,9 @@ MonoBehaviour: m_Options: m_Options: - m_Text: English - m_Image: {fileID: 21300000, guid: abd3f91cd564fd5418729fe460ed88e1, type: 3} - - m_Text: Korean - m_Image: {fileID: 21300000, guid: abd3f91cd564fd5418729fe460ed88e1, type: 3} + m_Image: {fileID: 21300000, guid: 0b7e54667301a584b9e29a5fadbd33a5, type: 3} + - m_Text: "\uD55C\uAD6D\uC5B4" + m_Image: {fileID: 21300000, guid: 0b7e54667301a584b9e29a5fadbd33a5, type: 3} m_OnValueChanged: m_PersistentCalls: m_Calls: @@ -1600,15 +1773,16 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8027793274363365120} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 348, y: 0} - m_SizeDelta: {x: 24, y: 288} - m_Pivot: {x: 0.5, y: 0.5} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 354, y: 0} + m_SizeDelta: {x: 12, y: 324} + m_Pivot: {x: 0.5, y: 1} --- !u!222 &8027793275594512431 CanvasRenderer: m_ObjectHideFlags: 0 diff --git a/Assets/Prefabs/MoveLimitDelimitImage.prefab b/Assets/Prefabs/MoveLimitDelimitImage.prefab new file mode 100644 index 0000000..f257ef4 --- /dev/null +++ b/Assets/Prefabs/MoveLimitDelimitImage.prefab @@ -0,0 +1,78 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &5647578259933864305 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7324693217127210383} + - component: {fileID: 1641192362770261273} + - component: {fileID: 1264330633294046056} + m_Layer: 5 + m_Name: MoveLimitDelimitImage + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7324693217127210383 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5647578259933864305} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: -306, y: -6} + m_SizeDelta: {x: -1068, y: 36} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1641192362770261273 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5647578259933864305} + m_CullTransparentMesh: 0 +--- !u!114 &1264330633294046056 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5647578259933864305} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.2509804, g: 0.2509804, b: 0.2509804, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 diff --git a/Assets/Prefabs/MoveLimitDelimitImage.prefab.meta b/Assets/Prefabs/MoveLimitDelimitImage.prefab.meta new file mode 100644 index 0000000..f528c3e --- /dev/null +++ b/Assets/Prefabs/MoveLimitDelimitImage.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: cd9ec8bedb3130e48a8eb78d1642d7e1 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/MoveLimitUI.prefab b/Assets/Prefabs/MoveLimitUI.prefab new file mode 100644 index 0000000..47c4591 --- /dev/null +++ b/Assets/Prefabs/MoveLimitUI.prefab @@ -0,0 +1,800 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &26417996050705398 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2287183742124216129} + - component: {fileID: 4267076044669106053} + - component: {fileID: 8282371214092344164} + m_Layer: 5 + m_Name: MoveLimitLabel1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2287183742124216129 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 26417996050705398} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 9100421025181478557} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: -24, y: -6} + m_SizeDelta: {x: 60, y: 84} + m_Pivot: {x: 1, y: 0.5} +--- !u!222 &4267076044669106053 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 26417996050705398} + m_CullTransparentMesh: 0 +--- !u!114 &8282371214092344164 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 26417996050705398} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 2100000, guid: 7b3f00cdf31d54526a9400f5b7a0e441, type: 3} + m_Color: {r: 1, g: 0, b: 0.86274517, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 651c7cb75fa9faf4f9178abeb380bc42, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &669597943179921896 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6654219091274685437} + - component: {fileID: 6306778593738417062} + - component: {fileID: 4960822360164043250} + m_Layer: 5 + m_Name: MoveLimitLabelImage2 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6654219091274685437 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 669597943179921896} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 9100421025181478557} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: -24, y: -6} + m_SizeDelta: {x: 204, y: 84} + m_Pivot: {x: 1, y: 0.5} +--- !u!222 &6306778593738417062 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 669597943179921896} + m_CullTransparentMesh: 0 +--- !u!114 &4960822360164043250 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 669597943179921896} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.21, g: 0.21, b: 0.21, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &735718962737406666 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2361835784664189655} + - component: {fileID: 6216505471303885818} + - component: {fileID: 4498933390028056764} + m_Layer: 5 + m_Name: MoveLimitLabelImage1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2361835784664189655 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 735718962737406666} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 9100421025181478557} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: -12, y: -6} + m_SizeDelta: {x: 228, y: 108} + m_Pivot: {x: 1, y: 0.5} +--- !u!222 &6216505471303885818 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 735718962737406666} + m_CullTransparentMesh: 0 +--- !u!114 &4498933390028056764 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 735718962737406666} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.25, g: 0.25, b: 0.25, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &1732545575104428331 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8218423448589352914} + - component: {fileID: 1966457439102283708} + - component: {fileID: 6641422168471248958} + m_Layer: 5 + m_Name: MoveLimitBar + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8218423448589352914 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1732545575104428331} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 9100421025181478557} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: -468, y: -6} + m_SizeDelta: {x: -1032, y: 36} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1966457439102283708 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1732545575104428331} + m_CullTransparentMesh: 0 +--- !u!114 &6641422168471248958 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1732545575104428331} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 0, b: 0.86274517, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &1979266711967160563 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2132629179406987755} + - component: {fileID: 2403099813473458964} + - component: {fileID: 888018669761444046} + m_Layer: 5 + m_Name: MoveLimitBackgroundImage2 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2132629179406987755 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1979266711967160563} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 9100421025181478557} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: -60, y: -6} + m_SizeDelta: {x: -216, y: 36} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2403099813473458964 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1979266711967160563} + m_CullTransparentMesh: 0 +--- !u!114 &888018669761444046 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1979266711967160563} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.37, g: 0.37, b: 0.37, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &4990531157770891876 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3265449700585543156} + m_Layer: 5 + m_Name: MoveLimitDelimiters + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3265449700585543156 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4990531157770891876} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 9100421025181478557} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &5173632761486987382 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1684801005309823525} + - component: {fileID: 6495020388920613747} + - component: {fileID: 2999095647081311533} + m_Layer: 5 + m_Name: MoveLimitImage + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1684801005309823525 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5173632761486987382} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 9100421025181478557} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 0, y: -6} + m_SizeDelta: {x: 108, y: 108} + m_Pivot: {x: 0, y: 0.5} +--- !u!222 &6495020388920613747 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5173632761486987382} + m_CullTransparentMesh: 0 +--- !u!114 &2999095647081311533 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5173632761486987382} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 7e8e946d30e135d4c84dba82aae29f7b, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &5464360231694924913 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 9100421025181478557} + - component: {fileID: 2242454143767789182} + m_Layer: 5 + m_Name: MoveLimitUI + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &9100421025181478557 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5464360231694924913} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 5612351007928153213} + - {fileID: 2132629179406987755} + - {fileID: 8218423448589352914} + - {fileID: 2361835784664189655} + - {fileID: 6654219091274685437} + - {fileID: 1237781080250604443} + - {fileID: 7631383627737818298} + - {fileID: 2287183742124216129} + - {fileID: 1684801005309823525} + - {fileID: 3265449700585543156} + m_Father: {fileID: 0} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &2242454143767789182 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5464360231694924913} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b447c785b894cf440ae12d9b23cf0899, type: 3} + m_Name: + m_EditorClassIdentifier: + mm: {fileID: 0} + moveLimitDelimitersParent: {fileID: 4990531157770891876} + moveLimitDelimiterPrefab: {fileID: 5647578259933864305, guid: cd9ec8bedb3130e48a8eb78d1642d7e1, + type: 3} + moveLimitBar: {fileID: 6641422168471248958} + moveLimitLabel100: {fileID: 1101023339683957012} + moveLimitLabel10: {fileID: 7588026324568998554} + moveLimitLabel1: {fileID: 8282371214092344164} + numberLabels: + - {fileID: 21300000, guid: 651c7cb75fa9faf4f9178abeb380bc42, type: 3} + - {fileID: 21300000, guid: 376e8fbb629431f46ab5e7a1116e2722, type: 3} + - {fileID: 21300000, guid: bc040a8e5ee5f754f9b878d4a339a279, type: 3} + - {fileID: 21300000, guid: 36bcff697733aa34fa2986971559fc55, type: 3} + - {fileID: 21300000, guid: ce6e4132558a3924ca82a55811c0cd72, type: 3} + - {fileID: 21300000, guid: a27dc7b04ffcb08409860e1e99a30018, type: 3} + - {fileID: 21300000, guid: 9105254dd0a9a234a9f9f1214cafc698, type: 3} + - {fileID: 21300000, guid: 01d69d645e23d48468844cd47313e689, type: 3} + - {fileID: 21300000, guid: f1bbde3889be9f3428771a901e772829, type: 3} + - {fileID: 21300000, guid: efa9e1bf524b33a40aff4ff7c8e6dac3, type: 3} +--- !u!1 &5578256503120328036 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1237781080250604443} + - component: {fileID: 2051291726308091083} + - component: {fileID: 1101023339683957012} + m_Layer: 5 + m_Name: MoveLimitLabel100 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1237781080250604443 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5578256503120328036} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 9100421025181478557} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: -168, y: -6} + m_SizeDelta: {x: 60, y: 84} + m_Pivot: {x: 1, y: 0.5} +--- !u!222 &2051291726308091083 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5578256503120328036} + m_CullTransparentMesh: 0 +--- !u!114 &1101023339683957012 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5578256503120328036} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 2100000, guid: 7b3f00cdf31d54526a9400f5b7a0e441, type: 3} + m_Color: {r: 1, g: 0, b: 0.86274517, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 651c7cb75fa9faf4f9178abeb380bc42, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &8838196135008603117 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7631383627737818298} + - component: {fileID: 4777900641839799446} + - component: {fileID: 7588026324568998554} + m_Layer: 5 + m_Name: MoveLimitLabel10 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7631383627737818298 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8838196135008603117} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 9100421025181478557} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: -96, y: -6} + m_SizeDelta: {x: 60, y: 84} + m_Pivot: {x: 1, y: 0.5} +--- !u!222 &4777900641839799446 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8838196135008603117} + m_CullTransparentMesh: 0 +--- !u!114 &7588026324568998554 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8838196135008603117} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 2100000, guid: 7b3f00cdf31d54526a9400f5b7a0e441, type: 3} + m_Color: {r: 1, g: 0, b: 0.86274517, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 651c7cb75fa9faf4f9178abeb380bc42, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &8990548349658913351 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5612351007928153213} + - component: {fileID: 5477083866162253796} + - component: {fileID: 3617999693016683178} + m_Layer: 5 + m_Name: MoveLimitBackgroundImage1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5612351007928153213 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8990548349658913351} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 9100421025181478557} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: -66, y: -6} + m_SizeDelta: {x: -204, y: 60} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5477083866162253796 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8990548349658913351} + m_CullTransparentMesh: 0 +--- !u!114 &3617999693016683178 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8990548349658913351} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.25, g: 0.25, b: 0.25, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 diff --git a/Assets/Prefabs/MoveLimitUI.prefab.meta b/Assets/Prefabs/MoveLimitUI.prefab.meta new file mode 100644 index 0000000..607d4ae --- /dev/null +++ b/Assets/Prefabs/MoveLimitUI.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 3e1882bc7f6d98c49814aa8f92076daa +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/PauseUI.prefab b/Assets/Prefabs/PauseUI.prefab index b226092..678f446 100644 --- a/Assets/Prefabs/PauseUI.prefab +++ b/Assets/Prefabs/PauseUI.prefab @@ -26,6 +26,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1788800191300486960} m_Father: {fileID: 1788800191063713007} @@ -64,6 +65,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1788800190577679318} - {fileID: 1788800190194448736} @@ -147,6 +149,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1788800189672343977} m_RootOrder: 6 @@ -228,6 +231,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1788800191260194137} m_RootOrder: 0 @@ -310,6 +314,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1788800191428183892} m_Father: {fileID: 1788800189672343977} @@ -426,6 +431,18 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 + - m_Target: {fileID: 0} + m_TargetAssemblyTypeName: PlayManager, Assembly-CSharp + m_MethodName: + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 --- !u!1 &1788800190199287470 GameObject: m_ObjectHideFlags: 0 @@ -456,6 +473,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1788800191566990182} m_Father: {fileID: 1788800189672343977} @@ -608,9 +626,21 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 + - m_Target: {fileID: 0} + m_TargetAssemblyTypeName: PlayManager, Assembly-CSharp + m_MethodName: + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 --- !u!95 &5207843850411096629 Animator: - serializedVersion: 3 + serializedVersion: 5 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -623,10 +653,12 @@ Animator: m_UpdateMode: 0 m_ApplyRootMotion: 0 m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorControllerStateOnDisable: 0 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 --- !u!1 &1788800190277157778 GameObject: m_ObjectHideFlags: 0 @@ -653,6 +685,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1788800191018905020} m_Father: {fileID: 1788800191537873201} @@ -691,6 +724,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1788800190657348598} m_RootOrder: 0 @@ -766,6 +800,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1788800189672343977} m_RootOrder: 0 @@ -843,6 +878,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1788800190535769285} m_Father: {fileID: 1788800191063713007} @@ -881,6 +917,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1788800190783031941} m_RootOrder: 0 @@ -954,6 +991,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1788800190766809434} m_Father: {fileID: 1788800191537873201} @@ -993,10 +1031,11 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1788800189672343977} m_Father: {fileID: 0} - m_RootOrder: 0 + m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -1088,6 +1127,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1788800190277157779} m_RootOrder: 0 @@ -1162,6 +1202,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1788800191163235467} - {fileID: 1788800190657348598} @@ -1265,6 +1306,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1788800191063713007} m_RootOrder: 0 @@ -1340,6 +1382,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1788800191537873201} m_RootOrder: 0 @@ -1416,6 +1459,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1788800190094284256} m_Father: {fileID: 1788800189672343977} @@ -1556,6 +1600,18 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 1 m_CallState: 2 + - m_Target: {fileID: 0} + m_TargetAssemblyTypeName: UnityEngine.UI.Selectable, UnityEngine.UI + m_MethodName: + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 1 + m_CallState: 2 --- !u!1 &1788800191300486963 GameObject: m_ObjectHideFlags: 0 @@ -1584,6 +1640,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1788800189624475005} m_RootOrder: 0 @@ -1659,6 +1716,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1788800190194448736} m_RootOrder: 0 @@ -1738,6 +1796,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1788800191188341333} - {fileID: 1788800190277157779} @@ -1868,6 +1927,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1788800190199287471} m_RootOrder: 0 @@ -1949,6 +2009,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1788800189672343977} m_RootOrder: 4 diff --git a/Assets/Scenes/Adventure.unity b/Assets/Scenes/Adventure.unity index 9a73489..9a2df0c 100644 --- a/Assets/Scenes/Adventure.unity +++ b/Assets/Scenes/Adventure.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.37311953, g: 0.38074014, b: 0.3587274, a: 1} + m_IndirectSpecularColor: {r: 0.37311918, g: 0.3807398, b: 0.35872716, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -105,7 +105,7 @@ NavMeshSettings: serializedVersion: 2 m_ObjectHideFlags: 0 m_BuildSettings: - serializedVersion: 2 + serializedVersion: 3 agentTypeID: 0 agentRadius: 0.5 agentHeight: 2 @@ -118,7 +118,7 @@ NavMeshSettings: cellSize: 0.16666667 manualTileSize: 0 tileSize: 256 - accuratePlacement: 0 + buildHeightMesh: 0 maxJobWorkers: 0 preserveTilesOutsideBounds: 0 debug: @@ -153,6 +153,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 591191597} - {fileID: 1264283925} @@ -264,6 +265,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1304023982} m_RootOrder: 7 @@ -339,6 +341,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1304023982} m_RootOrder: 2 @@ -414,6 +417,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 24088657} m_RootOrder: 7 @@ -490,6 +494,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0.38268343, w: 0.92387956} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1193669931} m_RootOrder: 0 @@ -622,6 +627,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4881330397220783443} m_RootOrder: 8 @@ -686,19 +692,20 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_TrackedObjects: - - id: 0 + - rid: 0 references: - version: 1 - 00000000: + version: 2 + RefIds: + - rid: 0 type: {class: TrackedUGuiGraphic, ns: UnityEngine.Localization.PropertyVariants.TrackedObjects, asm: Unity.Localization} data: m_Target: {fileID: 422010003} m_TrackedProperties: items: - - id: 1 + - rid: 1 m_UpdateType: 0 - 00000001: + - rid: 1 type: {class: LocalizedStringProperty, ns: UnityEngine.Localization.PropertyVariants.TrackedProperties, asm: Unity.Localization} data: @@ -740,6 +747,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1851242258} m_RootOrder: 0 @@ -816,6 +824,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4881330397220783443} m_RootOrder: 7 @@ -880,19 +889,20 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_TrackedObjects: - - id: 0 + - rid: 0 references: - version: 1 - 00000000: + version: 2 + RefIds: + - rid: 0 type: {class: TrackedUGuiGraphic, ns: UnityEngine.Localization.PropertyVariants.TrackedObjects, asm: Unity.Localization} data: m_Target: {fileID: 459338318} m_TrackedProperties: items: - - id: 1 + - rid: 1 m_UpdateType: 0 - 00000001: + - rid: 1 type: {class: LocalizedStringProperty, ns: UnityEngine.Localization.PropertyVariants.TrackedProperties, asm: Unity.Localization} data: @@ -945,6 +955,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0.5, y: 0.5, z: 1} m_LocalScale: {x: 11.111111, y: 11.111111, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1578408918} m_Father: {fileID: 0} @@ -981,6 +992,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 24088657} m_RootOrder: 2 @@ -1098,7 +1110,7 @@ CanvasRenderer: m_CullTransparentMesh: 0 --- !u!95 &520449380 Animator: - serializedVersion: 3 + serializedVersion: 5 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -1111,10 +1123,12 @@ Animator: m_UpdateMode: 0 m_ApplyRootMotion: 0 m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorControllerStateOnDisable: 0 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 --- !u!114 &520449381 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1163,6 +1177,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3} m_Name: m_EditorClassIdentifier: + m_SendPointerHoverToParent: 1 m_HorizontalAxis: Horizontal m_VerticalAxis: Vertical m_SubmitButton: Submit @@ -1195,6 +1210,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 6 @@ -1229,6 +1245,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 24088657} m_RootOrder: 0 @@ -1390,6 +1407,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1304023982} m_RootOrder: 1 @@ -1477,9 +1495,17 @@ Camera: m_projectionMatrixMode: 1 m_GateFitMode: 2 m_FOVAxisMode: 0 + m_Iso: 200 + m_ShutterSpeed: 0.005 + m_Aperture: 16 + m_FocusDistance: 10 + m_FocalLength: 50 + m_BladeCount: 5 + m_Curvature: {x: 2, y: 11} + m_BarrelClipping: 0.25 + m_Anamorphism: 0 m_SensorSize: {x: 36, y: 24} m_LensShift: {x: 0, y: 0} - m_FocalLength: 50 m_NormalizedViewPortRect: serializedVersion: 2 x: 0 @@ -1516,6 +1542,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 2, y: 1.5, z: -10} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0 @@ -1548,6 +1575,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1304023982} m_RootOrder: 6 @@ -1622,6 +1650,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 2 @@ -1637,6 +1666,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -1705,6 +1735,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1304023982} m_RootOrder: 4 @@ -1780,6 +1811,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1304023982} m_RootOrder: 0 @@ -1854,6 +1886,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1851242258} m_RootOrder: 8 @@ -1899,6 +1932,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4881330397220783443} m_RootOrder: 10 @@ -1984,6 +2018,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4881330397220783443} m_RootOrder: 6 @@ -2071,6 +2106,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 24088657} m_RootOrder: 5 @@ -2244,6 +2280,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1304023982} m_RootOrder: 5 @@ -2319,6 +2356,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 2068695178} m_Father: {fileID: 24088657} @@ -2395,6 +2433,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 382429607} m_Father: {fileID: 24088657} @@ -2472,6 +2511,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0.38268343, w: 0.92387956} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1517296250} m_RootOrder: 0 @@ -2606,6 +2646,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 24088657} m_RootOrder: 1 @@ -2617,7 +2658,7 @@ RectTransform: m_Pivot: {x: 0.5, y: 0.5} --- !u!95 &1264283926 Animator: - serializedVersion: 3 + serializedVersion: 5 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -2630,10 +2671,12 @@ Animator: m_UpdateMode: 0 m_ApplyRootMotion: 0 m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorControllerStateOnDisable: 0 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 --- !u!114 &1264283927 MonoBehaviour: m_ObjectHideFlags: 0 @@ -2787,6 +2830,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0.38268343, w: 0.92387956} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1816384655} m_RootOrder: 0 @@ -2917,6 +2961,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 729405784} - {fileID: 634394760} @@ -2992,6 +3037,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 24088657} m_RootOrder: 4 @@ -3097,7 +3143,7 @@ CanvasRenderer: m_CullTransparentMesh: 0 --- !u!95 &1404637736 Animator: - serializedVersion: 3 + serializedVersion: 5 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -3110,10 +3156,12 @@ Animator: m_UpdateMode: 0 m_ApplyRootMotion: 0 m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorControllerStateOnDisable: 0 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 --- !u!114 &1404637737 MonoBehaviour: m_ObjectHideFlags: 0 @@ -3159,6 +3207,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 7 @@ -3189,6 +3238,9 @@ MonoBehaviour: resultUI: {fileID: 2093335829947089830} tooltipUI: {fileID: 0} timerUI: {fileID: 1304023981} + moveLimitUI: {fileID: 0} + tryCountUis: [] + minMoveCountUis: [] openScrollContent: {fileID: 0} openButton: {fileID: 0} openHighlightedButton: {fileID: 0} @@ -3378,6 +3430,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1851242258} m_Modifications: - target: {fileID: 1167235146085382866, guid: d1ad3c89387d28e488ea573cdf2b5245, @@ -3502,6 +3555,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: d1ad3c89387d28e488ea573cdf2b5245, type: 3} --- !u!224 &1484046094 stripped RectTransform: @@ -3537,6 +3593,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1209234941} m_Father: {fileID: 24088657} @@ -3613,6 +3670,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4881330397220783443} m_RootOrder: 9 @@ -3692,6 +3750,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 488576794} m_RootOrder: 0 @@ -3707,6 +3766,7 @@ TilemapRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -3922,6 +3982,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 24088657} m_RootOrder: 12 @@ -3974,6 +4035,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 7063427215363646516, guid: 1db10a05a0fc004418a1b36bde2c72b0, @@ -4037,6 +4099,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 1db10a05a0fc004418a1b36bde2c72b0, type: 3} --- !u!224 &1635276894 stripped RectTransform: @@ -4049,6 +4114,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1851242258} m_Modifications: - target: {fileID: 38331144711701198, guid: ee2ae56dffbb07140b8f4228cfc061c5, @@ -4167,6 +4233,9 @@ PrefabInstance: value: Loading... objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: ee2ae56dffbb07140b8f4228cfc061c5, type: 3} --- !u!224 &1642279425 stripped RectTransform: @@ -4351,7 +4420,8 @@ MonoBehaviour: tryCount: 0 beforeFirstAction: 0 tryCountUpTrigger: 0 - hasClearedOnce: 0 + hasClearedOnceInTime: 0 + hasClearedOnceInMove: 0 --- !u!4 &1755156425 Transform: m_ObjectHideFlags: 0 @@ -4362,6 +4432,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 4 @@ -4397,6 +4468,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 24088657} m_RootOrder: 6 @@ -4526,7 +4598,7 @@ CanvasRenderer: m_CullTransparentMesh: 0 --- !u!95 &1783891386 Animator: - serializedVersion: 3 + serializedVersion: 5 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -4539,10 +4611,12 @@ Animator: m_UpdateMode: 0 m_ApplyRootMotion: 0 m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorControllerStateOnDisable: 0 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 --- !u!114 &1783891387 MonoBehaviour: m_ObjectHideFlags: 0 @@ -4558,7 +4632,7 @@ MonoBehaviour: tooltipPrefab: {fileID: 6095790650455668987, guid: 3617bb7300a723d468a84e27f5543876, type: 3} tooltipMessage: RetryTimeButton - tooltipWidth: 444 + tooltipWidth: 480 tooltipHeight: 168 pivot: 3 --- !u!1001 &1811126591 @@ -4566,6 +4640,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1851242258} m_Modifications: - target: {fileID: 4947973752511735336, guid: a97aafa8dc7aae24993ae294c8359b43, @@ -4694,6 +4769,13 @@ PrefabInstance: value: TimeoutPanel objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 3942173205810548199, guid: a97aafa8dc7aae24993ae294c8359b43, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1811126596} m_SourcePrefab: {fileID: 100100000, guid: a97aafa8dc7aae24993ae294c8359b43, type: 3} --- !u!1 &1811126592 stripped GameObject: @@ -4738,19 +4820,20 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_TrackedObjects: - - id: 0 + - rid: 0 references: - version: 1 - 00000000: + version: 2 + RefIds: + - rid: 0 type: {class: TrackedUGuiGraphic, ns: UnityEngine.Localization.PropertyVariants.TrackedObjects, asm: Unity.Localization} data: m_Target: {fileID: 1811126595} m_TrackedProperties: items: - - id: 1 + - rid: 1 m_UpdateType: 0 - 00000001: + - rid: 1 type: {class: LocalizedStringProperty, ns: UnityEngine.Localization.PropertyVariants.TrackedProperties, asm: Unity.Localization} data: @@ -4792,6 +4875,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1287567346} m_Father: {fileID: 24088657} @@ -4916,7 +5000,9 @@ Canvas: m_OverrideSorting: 0 m_OverridePixelPerfect: 0 m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 0 m_AdditionalShaderChannelsFlag: 0 + m_UpdateRectTransformForStandalone: 0 m_SortingLayerID: 0 m_SortingOrder: 0 m_TargetDisplay: 0 @@ -4930,6 +5016,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0, y: 0, z: 0} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 453556306} - {fileID: 1811126593} @@ -4954,6 +5041,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 24088657} m_Modifications: - target: {fileID: 772091377553154923, guid: 572232613a4c4f2419c8447db52259db, @@ -5082,6 +5170,13 @@ PrefabInstance: value: GravityButtonRetry objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 772091377553154925, guid: 572232613a4c4f2419c8447db52259db, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1877085895} m_SourcePrefab: {fileID: 100100000, guid: 572232613a4c4f2419c8447db52259db, type: 3} --- !u!224 &1877085892 stripped RectTransform: @@ -5153,6 +5248,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1851242258} m_RootOrder: 4 @@ -5228,6 +5324,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1304023982} m_RootOrder: 3 @@ -5304,6 +5401,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0.38268343, w: 0.92387956} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1191982079} m_RootOrder: 0 @@ -5425,6 +5523,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4881330397220783443} m_RootOrder: 2 @@ -5439,6 +5538,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1851242258} m_Modifications: - target: {fileID: 1788800189684379114, guid: ab016032a72db2d4cb0b255953e0dc4b, @@ -5461,6 +5561,11 @@ PrefabInstance: propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_Target value: objectReference: {fileID: 1430318116} + - target: {fileID: 1788800190194448737, guid: ab016032a72db2d4cb0b255953e0dc4b, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[2].m_Target + value: + objectReference: {fileID: 1430318116} - target: {fileID: 1788800190194448737, guid: ab016032a72db2d4cb0b255953e0dc4b, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName @@ -5471,6 +5576,16 @@ PrefabInstance: propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_MethodName value: PlayButtonSFX objectReference: {fileID: 0} + - target: {fileID: 1788800190194448737, guid: ab016032a72db2d4cb0b255953e0dc4b, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[2].m_MethodName + value: Resume + objectReference: {fileID: 0} + - target: {fileID: 1788800190194448737, guid: ab016032a72db2d4cb0b255953e0dc4b, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[2].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} - target: {fileID: 1788800190199287468, guid: ab016032a72db2d4cb0b255953e0dc4b, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target @@ -5491,6 +5606,11 @@ PrefabInstance: propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[4].m_Target value: objectReference: {fileID: 1430318116} + - target: {fileID: 1788800190199287468, guid: ab016032a72db2d4cb0b255953e0dc4b, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[5].m_Target + value: + objectReference: {fileID: 1430318116} - target: {fileID: 1788800190199287468, guid: ab016032a72db2d4cb0b255953e0dc4b, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName @@ -5511,6 +5631,16 @@ PrefabInstance: propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[4].m_MethodName value: PlayButtonSFX objectReference: {fileID: 0} + - target: {fileID: 1788800190199287468, guid: ab016032a72db2d4cb0b255953e0dc4b, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[5].m_MethodName + value: Resume + objectReference: {fileID: 0} + - target: {fileID: 1788800190199287468, guid: ab016032a72db2d4cb0b255953e0dc4b, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[5].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} - target: {fileID: 1788800190535769285, guid: ab016032a72db2d4cb0b255953e0dc4b, type: 3} propertyPath: m_AnchorMax.y @@ -5671,6 +5801,11 @@ PrefabInstance: propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[3].m_Target value: objectReference: {fileID: 591191598} + - target: {fileID: 1788800191260194214, guid: ab016032a72db2d4cb0b255953e0dc4b, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[4].m_Target + value: + objectReference: {fileID: 1430318116} - target: {fileID: 1788800191260194214, guid: ab016032a72db2d4cb0b255953e0dc4b, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName @@ -5686,6 +5821,21 @@ PrefabInstance: propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[3].m_MethodName value: set_interactable objectReference: {fileID: 0} + - target: {fileID: 1788800191260194214, guid: ab016032a72db2d4cb0b255953e0dc4b, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[4].m_MethodName + value: Resume + objectReference: {fileID: 0} + - target: {fileID: 1788800191260194214, guid: ab016032a72db2d4cb0b255953e0dc4b, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[4].m_TargetAssemblyTypeName + value: PlayManager, Assembly-CSharp + objectReference: {fileID: 0} + - target: {fileID: 1788800191260194214, guid: ab016032a72db2d4cb0b255953e0dc4b, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[4].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} - target: {fileID: 1788800191300486960, guid: ab016032a72db2d4cb0b255953e0dc4b, type: 3} propertyPath: m_AnchorMax.y @@ -5728,6 +5878,33 @@ PrefabInstance: value: objectReference: {fileID: 1430318116} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 1788800190577679305, guid: ab016032a72db2d4cb0b255953e0dc4b, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1788800191545070137} + - targetCorrespondingSourceObject: {fileID: 1788800191428183895, guid: ab016032a72db2d4cb0b255953e0dc4b, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1788800191545070136} + - targetCorrespondingSourceObject: {fileID: 1788800191566990105, guid: ab016032a72db2d4cb0b255953e0dc4b, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1788800191545070135} + - targetCorrespondingSourceObject: {fileID: 1788800190094284259, guid: ab016032a72db2d4cb0b255953e0dc4b, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1788800191545070134} + - targetCorrespondingSourceObject: {fileID: 1788800191633508124, guid: ab016032a72db2d4cb0b255953e0dc4b, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1788800191545070133} + - targetCorrespondingSourceObject: {fileID: 1788800189684379116, guid: ab016032a72db2d4cb0b255953e0dc4b, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1788800191545070132} m_SourcePrefab: {fileID: 100100000, guid: ab016032a72db2d4cb0b255953e0dc4b, type: 3} --- !u!114 &1788800191545070119 stripped MonoBehaviour: @@ -5862,19 +6039,20 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_TrackedObjects: - - id: 0 + - rid: 0 references: - version: 1 - 00000000: + version: 2 + RefIds: + - rid: 0 type: {class: TrackedUGuiGraphic, ns: UnityEngine.Localization.PropertyVariants.TrackedObjects, asm: Unity.Localization} data: m_Target: {fileID: 1788800191545070121} m_TrackedProperties: items: - - id: 1 + - rid: 1 m_UpdateType: 0 - 00000001: + - rid: 1 type: {class: LocalizedStringProperty, ns: UnityEngine.Localization.PropertyVariants.TrackedProperties, asm: Unity.Localization} data: @@ -5901,19 +6079,20 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_TrackedObjects: - - id: 0 + - rid: 0 references: - version: 1 - 00000000: + version: 2 + RefIds: + - rid: 0 type: {class: TrackedUGuiGraphic, ns: UnityEngine.Localization.PropertyVariants.TrackedObjects, asm: Unity.Localization} data: m_Target: {fileID: 1788800191545070123} m_TrackedProperties: items: - - id: 1 + - rid: 1 m_UpdateType: 0 - 00000001: + - rid: 1 type: {class: LocalizedStringProperty, ns: UnityEngine.Localization.PropertyVariants.TrackedProperties, asm: Unity.Localization} data: @@ -5940,19 +6119,20 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_TrackedObjects: - - id: 0 + - rid: 0 references: - version: 1 - 00000000: + version: 2 + RefIds: + - rid: 0 type: {class: TrackedUGuiGraphic, ns: UnityEngine.Localization.PropertyVariants.TrackedObjects, asm: Unity.Localization} data: m_Target: {fileID: 1788800191545070125} m_TrackedProperties: items: - - id: 1 + - rid: 1 m_UpdateType: 0 - 00000001: + - rid: 1 type: {class: LocalizedStringProperty, ns: UnityEngine.Localization.PropertyVariants.TrackedProperties, asm: Unity.Localization} data: @@ -5979,19 +6159,20 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_TrackedObjects: - - id: 0 + - rid: 0 references: - version: 1 - 00000000: + version: 2 + RefIds: + - rid: 0 type: {class: TrackedUGuiGraphic, ns: UnityEngine.Localization.PropertyVariants.TrackedObjects, asm: Unity.Localization} data: m_Target: {fileID: 1788800191545070127} m_TrackedProperties: items: - - id: 1 + - rid: 1 m_UpdateType: 0 - 00000001: + - rid: 1 type: {class: LocalizedStringProperty, ns: UnityEngine.Localization.PropertyVariants.TrackedProperties, asm: Unity.Localization} data: @@ -6018,19 +6199,20 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_TrackedObjects: - - id: 0 + - rid: 0 references: - version: 1 - 00000000: + version: 2 + RefIds: + - rid: 0 type: {class: TrackedUGuiGraphic, ns: UnityEngine.Localization.PropertyVariants.TrackedObjects, asm: Unity.Localization} data: m_Target: {fileID: 1788800191545070129} m_TrackedProperties: items: - - id: 1 + - rid: 1 m_UpdateType: 0 - 00000001: + - rid: 1 type: {class: LocalizedStringProperty, ns: UnityEngine.Localization.PropertyVariants.TrackedProperties, asm: Unity.Localization} data: @@ -6057,19 +6239,20 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_TrackedObjects: - - id: 0 + - rid: 0 references: - version: 1 - 00000000: + version: 2 + RefIds: + - rid: 0 type: {class: TrackedUGuiGraphic, ns: UnityEngine.Localization.PropertyVariants.TrackedObjects, asm: Unity.Localization} data: m_Target: {fileID: 1788800191545070131} m_TrackedProperties: items: - - id: 1 + - rid: 1 m_UpdateType: 0 - 00000001: + - rid: 1 type: {class: LocalizedStringProperty, ns: UnityEngine.Localization.PropertyVariants.TrackedProperties, asm: Unity.Localization} data: @@ -6145,6 +6328,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4881330397220783443} m_RootOrder: 13 @@ -6278,6 +6462,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4881330397220783443} m_RootOrder: 14 @@ -6353,6 +6538,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4881330397220783443} m_RootOrder: 20 @@ -6398,6 +6584,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0.2164396, w: 0.97629607} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4881330397220783443} m_RootOrder: 18 @@ -6467,7 +6654,7 @@ MonoBehaviour: pm: {fileID: 1430318116} --- !u!95 &2093335829947089833 Animator: - serializedVersion: 3 + serializedVersion: 5 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -6480,10 +6667,12 @@ Animator: m_UpdateMode: 0 m_ApplyRootMotion: 1 m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorControllerStateOnDisable: 0 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 --- !u!222 &2093335830023818976 CanvasRenderer: m_ObjectHideFlags: 0 @@ -6502,6 +6691,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0.2164396, w: 0.97629607} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4881330397220783443} m_RootOrder: 15 @@ -6569,6 +6759,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: -0.21643952, w: 0.97629607} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4881330397220783443} m_RootOrder: 19 @@ -6644,6 +6835,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: -0.21643952, w: 0.97629607} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4881330397220783443} m_RootOrder: 16 @@ -6776,6 +6968,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4881330397220783443} m_RootOrder: 12 @@ -6795,6 +6988,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4881330397220783443} m_RootOrder: 17 @@ -6927,6 +7121,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4881330397220783443} m_RootOrder: 11 @@ -6946,6 +7141,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4881330397220783443} m_RootOrder: 3 @@ -7209,19 +7405,20 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_TrackedObjects: - - id: 0 + - rid: 0 references: - version: 1 - 00000000: + version: 2 + RefIds: + - rid: 0 type: {class: TrackedUGuiGraphic, ns: UnityEngine.Localization.PropertyVariants.TrackedObjects, asm: Unity.Localization} data: m_Target: {fileID: 1851558759607549147} m_TrackedProperties: items: - - id: 1 + - rid: 1 m_UpdateType: 0 - 00000001: + - rid: 1 type: {class: LocalizedStringProperty, ns: UnityEngine.Localization.PropertyVariants.TrackedProperties, asm: Unity.Localization} data: @@ -7331,6 +7528,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 5897288939891842220} m_Father: {fileID: 4881330397220783443} @@ -7409,6 +7607,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 6024136763917752572} - {fileID: 8029268708876852181} @@ -7465,6 +7664,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4756894026808634373} m_RootOrder: 0 @@ -7484,6 +7684,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4881330397220783443} m_RootOrder: 0 @@ -7506,6 +7707,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 24088657} m_Modifications: - target: {fileID: 7455215711651687868, guid: afce227dd5870eb409e0dfddc78b5f22, @@ -7624,6 +7826,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: afce227dd5870eb409e0dfddc78b5f22, type: 3} --- !u!224 &7796572551360621833 RectTransform: @@ -7635,6 +7840,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4881330397220783443} m_RootOrder: 5 @@ -7673,6 +7879,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4881330397220783443} m_RootOrder: 1 @@ -7743,6 +7950,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 24088657} m_Modifications: - target: {fileID: 9082494344251303288, guid: 4542b2e8185596e4683fe00f2dfae572, @@ -7861,4 +8069,7 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4542b2e8185596e4683fe00f2dfae572, type: 3} diff --git a/Assets/Scenes/Custom.unity b/Assets/Scenes/Custom.unity index bd719ed..2372f16 100644 --- a/Assets/Scenes/Custom.unity +++ b/Assets/Scenes/Custom.unity @@ -104,7 +104,7 @@ NavMeshSettings: serializedVersion: 2 m_ObjectHideFlags: 0 m_BuildSettings: - serializedVersion: 2 + serializedVersion: 3 agentTypeID: 0 agentRadius: 0.5 agentHeight: 2 @@ -117,7 +117,7 @@ NavMeshSettings: cellSize: 0.16666667 manualTileSize: 0 tileSize: 256 - accuratePlacement: 0 + buildHeightMesh: 0 maxJobWorkers: 0 preserveTilesOutsideBounds: 0 debug: @@ -256,7 +256,7 @@ MonoBehaviour: m_PixelsPerUnitMultiplier: 1 --- !u!95 &21229931 Animator: - serializedVersion: 3 + serializedVersion: 5 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -269,10 +269,12 @@ Animator: m_UpdateMode: 0 m_ApplyRootMotion: 0 m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorControllerStateOnDisable: 0 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 --- !u!222 &21229932 CanvasRenderer: m_ObjectHideFlags: 0 @@ -291,6 +293,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 363787298} m_RootOrder: 12 @@ -315,7 +318,7 @@ MonoBehaviour: tooltipPrefab: {fileID: 6095790650455668987, guid: 3617bb7300a723d468a84e27f5543876, type: 3} tooltipMessage: RetryTimeButton - tooltipWidth: 444 + tooltipWidth: 480 tooltipHeight: 168 pivot: 3 --- !u!1 &21237445 @@ -344,6 +347,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1729040392} m_RootOrder: 1 @@ -381,6 +385,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 583662299} m_RootOrder: 0 @@ -599,7 +604,8 @@ MonoBehaviour: tryCount: 0 beforeFirstAction: 0 tryCountUpTrigger: 0 - hasClearedOnce: 0 + hasClearedOnceInTime: 0 + hasClearedOnceInMove: 0 --- !u!4 &57608225 Transform: m_ObjectHideFlags: 0 @@ -610,6 +616,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 4 @@ -619,6 +626,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 7063427215363646516, guid: 1db10a05a0fc004418a1b36bde2c72b0, @@ -682,6 +690,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 1db10a05a0fc004418a1b36bde2c72b0, type: 3} --- !u!1 &121398292 GameObject: @@ -724,8 +735,15 @@ MonoBehaviour: pauseUI: {fileID: 2025636551} pausePanel: {fileID: 1503042061} resultUI: {fileID: 0} - tooltipUI: {fileID: 1561156650} + tooltipUI: {fileID: 1547743682} timerUI: {fileID: 583662298} + moveLimitUI: {fileID: 7663139776663131578} + tryCountUis: + - {fileID: 906170567} + - {fileID: 558355873} + minMoveCountUis: + - {fileID: 1107897542} + - {fileID: 4404301370260597131} openScrollContent: {fileID: 21237445} openButton: {fileID: 1150334311} openHighlightedButton: {fileID: 1707545011} @@ -775,6 +793,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 5 @@ -807,6 +826,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1851494650} m_RootOrder: 2 @@ -863,6 +883,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1851494650} m_Modifications: - target: {fileID: 2672423829272442780, guid: d838f6f282b36a043ab18477971ef80d, @@ -986,6 +1007,9 @@ PrefabInstance: value: objectReference: {fileID: 121398293} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: d838f6f282b36a043ab18477971ef80d, type: 3} --- !u!224 &165664661 stripped RectTransform: @@ -1021,6 +1045,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 2004161940} m_Father: {fileID: 363787298} @@ -1145,7 +1170,9 @@ Canvas: m_OverrideSorting: 0 m_OverridePixelPerfect: 0 m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 0 m_AdditionalShaderChannelsFlag: 0 + m_UpdateRectTransformForStandalone: 0 m_SortingLayerID: 0 m_SortingOrder: 0 m_TargetDisplay: 0 @@ -1159,6 +1186,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0, y: 0, z: 0} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 2007145223} - {fileID: 1594013807} @@ -1167,6 +1195,7 @@ RectTransform: - {fileID: 286166420} - {fileID: 1503042064} - {fileID: 583662299} + - {fileID: 7663139776663131577} - {fileID: 1547743683} - {fileID: 2025636550} m_Father: {fileID: 0} @@ -1210,6 +1239,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1941152756} - {fileID: 1788414882} @@ -1265,6 +1295,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 363787298} m_RootOrder: 11 @@ -1436,6 +1467,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1078296942} - {fileID: 765417088} @@ -1451,6 +1483,7 @@ RectTransform: - {fileID: 353772680} - {fileID: 21229933} - {fileID: 863177613} + - {fileID: 1107897541} m_Father: {fileID: 1953199607} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1487,6 +1520,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -1537,6 +1571,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 7 @@ -1569,6 +1604,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1544317895} m_RootOrder: 3 @@ -1644,6 +1680,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 583662299} m_RootOrder: 1 @@ -1696,6 +1733,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 240587202} m_Modifications: - target: {fileID: 4947973752511735336, guid: a97aafa8dc7aae24993ae294c8359b43, @@ -1814,6 +1852,13 @@ PrefabInstance: value: TimeoutPanel objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 3942173205810548199, guid: a97aafa8dc7aae24993ae294c8359b43, + type: 3} + insertIndex: -1 + addedObject: {fileID: 551491375} m_SourcePrefab: {fileID: 100100000, guid: a97aafa8dc7aae24993ae294c8359b43, type: 3} --- !u!1 &551491372 stripped GameObject: @@ -1852,19 +1897,20 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_TrackedObjects: - - id: 0 + - rid: 0 references: - version: 1 - 00000000: + version: 2 + RefIds: + - rid: 0 type: {class: TrackedUGuiGraphic, ns: UnityEngine.Localization.PropertyVariants.TrackedObjects, asm: Unity.Localization} data: m_Target: {fileID: 551491374} m_TrackedProperties: items: - - id: 1 + - rid: 1 m_UpdateType: 0 - 00000001: + - rid: 1 type: {class: LocalizedStringProperty, ns: UnityEngine.Localization.PropertyVariants.TrackedProperties, asm: Unity.Localization} data: @@ -1878,6 +1924,12 @@ MonoBehaviour: m_WaitForCompletion: 0 m_LocalVariables: [] m_PropertyPath: m_Text +--- !u!1 &558355873 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 2672423829272442781, guid: d838f6f282b36a043ab18477971ef80d, + type: 3} + m_PrefabInstance: {fileID: 165664660} + m_PrefabAsset: {fileID: 0} --- !u!1 &583662298 GameObject: m_ObjectHideFlags: 0 @@ -1905,6 +1957,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 42046516} - {fileID: 494625614} @@ -1979,6 +2032,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 363787298} m_RootOrder: 6 @@ -2140,6 +2194,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1097684666} m_RootOrder: 0 @@ -2215,6 +2270,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 583662299} m_RootOrder: 6 @@ -2262,6 +2318,82 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 677060227} m_CullTransparentMesh: 0 +--- !u!1 &722460747 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 722460748} + - component: {fileID: 722460750} + - component: {fileID: 722460749} + m_Layer: 5 + m_Name: Background + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &722460748 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 722460747} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1211128526} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &722460749 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 722460747} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: fa10ea3f8ac98f94399d6e0b99544a5d, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &722460750 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 722460747} + m_CullTransparentMesh: 1 --- !u!1 &735985412 GameObject: m_ObjectHideFlags: 0 @@ -2291,6 +2423,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1097684666} m_Father: {fileID: 1544317895} @@ -2416,6 +2549,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1202332795} m_RootOrder: 0 @@ -2431,6 +2565,7 @@ TilemapRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -2646,6 +2781,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 363787298} m_RootOrder: 5 @@ -2721,6 +2857,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1313516119} m_Father: {fileID: 363787298} @@ -2797,6 +2934,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 2057554048} m_Father: {fileID: 363787298} @@ -2876,6 +3014,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 363787298} m_RootOrder: 9 @@ -2887,7 +3026,7 @@ RectTransform: m_Pivot: {x: 0.5, y: 0.5} --- !u!95 &826573660 Animator: - serializedVersion: 3 + serializedVersion: 5 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -2900,10 +3039,12 @@ Animator: m_UpdateMode: 0 m_ApplyRootMotion: 0 m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorControllerStateOnDisable: 0 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 --- !u!114 &826573661 MonoBehaviour: m_ObjectHideFlags: 0 @@ -3027,6 +3168,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 363787298} m_Modifications: - target: {fileID: 772091377553154923, guid: 572232613a4c4f2419c8447db52259db, @@ -3155,6 +3297,13 @@ PrefabInstance: value: GravityButtonRetry objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 772091377553154925, guid: 572232613a4c4f2419c8447db52259db, + type: 3} + insertIndex: -1 + addedObject: {fileID: 905412898} m_SourcePrefab: {fileID: 100100000, guid: 572232613a4c4f2419c8447db52259db, type: 3} --- !u!114 &905412896 stripped MonoBehaviour: @@ -3192,6 +3341,12 @@ MonoBehaviour: tooltipWidth: 324 tooltipHeight: 168 pivot: 3 +--- !u!1 &906170567 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 2672423829272442781, guid: d838f6f282b36a043ab18477971ef80d, + type: 3} + m_PrefabInstance: {fileID: 2672423830099704849} + m_PrefabAsset: {fileID: 0} --- !u!1 &1060893182 GameObject: m_ObjectHideFlags: 0 @@ -3223,6 +3378,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 363787298} m_RootOrder: 8 @@ -3234,7 +3390,7 @@ RectTransform: m_Pivot: {x: 0.5, y: 0.5} --- !u!95 &1060893184 Animator: - serializedVersion: 3 + serializedVersion: 5 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -3247,10 +3403,12 @@ Animator: m_UpdateMode: 0 m_ApplyRootMotion: 0 m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorControllerStateOnDisable: 0 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 --- !u!114 &1060893185 MonoBehaviour: m_ObjectHideFlags: 0 @@ -3403,6 +3561,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 363787298} m_RootOrder: 0 @@ -3476,6 +3635,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 665243131} m_Father: {fileID: 735985413} @@ -3486,6 +3646,146 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: -20, y: -20} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1001 &1107897540 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 363787298} + m_Modifications: + - target: {fileID: 947415739964845906, guid: e12109ae245e16f4d85e1bc6e4d67ac4, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 947415739964845906, guid: e12109ae245e16f4d85e1bc6e4d67ac4, + type: 3} + propertyPath: m_Pivot.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 947415739964845906, guid: e12109ae245e16f4d85e1bc6e4d67ac4, + type: 3} + propertyPath: m_RootOrder + value: 8 + objectReference: {fileID: 0} + - target: {fileID: 947415739964845906, guid: e12109ae245e16f4d85e1bc6e4d67ac4, + type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 947415739964845906, guid: e12109ae245e16f4d85e1bc6e4d67ac4, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 947415739964845906, guid: e12109ae245e16f4d85e1bc6e4d67ac4, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 947415739964845906, guid: e12109ae245e16f4d85e1bc6e4d67ac4, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 947415739964845906, guid: e12109ae245e16f4d85e1bc6e4d67ac4, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 947415739964845906, guid: e12109ae245e16f4d85e1bc6e4d67ac4, + type: 3} + propertyPath: m_SizeDelta.y + value: 960 + objectReference: {fileID: 0} + - target: {fileID: 947415739964845906, guid: e12109ae245e16f4d85e1bc6e4d67ac4, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 947415739964845906, guid: e12109ae245e16f4d85e1bc6e4d67ac4, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 947415739964845906, guid: e12109ae245e16f4d85e1bc6e4d67ac4, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 947415739964845906, guid: e12109ae245e16f4d85e1bc6e4d67ac4, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 947415739964845906, guid: e12109ae245e16f4d85e1bc6e4d67ac4, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 947415739964845906, guid: e12109ae245e16f4d85e1bc6e4d67ac4, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 947415739964845906, guid: e12109ae245e16f4d85e1bc6e4d67ac4, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 947415739964845906, guid: e12109ae245e16f4d85e1bc6e4d67ac4, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 947415739964845906, guid: e12109ae245e16f4d85e1bc6e4d67ac4, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 947415739964845906, guid: e12109ae245e16f4d85e1bc6e4d67ac4, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 947415739964845906, guid: e12109ae245e16f4d85e1bc6e4d67ac4, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 947415739964845906, guid: e12109ae245e16f4d85e1bc6e4d67ac4, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6530629739181965378, guid: e12109ae245e16f4d85e1bc6e4d67ac4, + type: 3} + propertyPath: mm + value: + objectReference: {fileID: 57608224} + - target: {fileID: 7479105889482343208, guid: e12109ae245e16f4d85e1bc6e4d67ac4, + type: 3} + propertyPath: m_Name + value: GravityMinMoveCount + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: e12109ae245e16f4d85e1bc6e4d67ac4, type: 3} +--- !u!224 &1107897541 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 947415739964845906, guid: e12109ae245e16f4d85e1bc6e4d67ac4, + type: 3} + m_PrefabInstance: {fileID: 1107897540} + m_PrefabAsset: {fileID: 0} +--- !u!1 &1107897542 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 7479105889482343208, guid: e12109ae245e16f4d85e1bc6e4d67ac4, + type: 3} + m_PrefabInstance: {fileID: 1107897540} + m_PrefabAsset: {fileID: 0} --- !u!1 &1150334308 GameObject: m_ObjectHideFlags: 0 @@ -3517,6 +3817,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1851494650} m_RootOrder: 4 @@ -3663,22 +3964,23 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_TrackedObjects: - - id: 0 + - rid: 0 references: - version: 1 - 00000000: + version: 2 + RefIds: + - rid: 0 type: {class: TrackedMonoBehaviourObject, ns: UnityEngine.Localization.PropertyVariants.TrackedObjects, asm: Unity.Localization} data: m_Target: {fileID: 1150334310} m_TrackedProperties: items: - - id: 1 + - rid: 1 m_UpdateType: 0 m_Changed: m_PersistentCalls: m_Calls: [] - 00000001: + - rid: 1 type: {class: LocalizedStringProperty, ns: UnityEngine.Localization.PropertyVariants.TrackedProperties, asm: Unity.Localization} data: @@ -3692,6 +3994,43 @@ MonoBehaviour: m_WaitForCompletion: 0 m_LocalVariables: [] m_PropertyPath: tooltipMessage +--- !u!1 &1157125510 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1157125511} + m_Layer: 5 + m_Name: Fill Area + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1157125511 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1157125510} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1325295891} + m_Father: {fileID: 1211128526} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: -6} + m_SizeDelta: {x: -24, y: -36} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1202332793 GameObject: m_ObjectHideFlags: 0 @@ -3731,12 +4070,13 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0.5, y: 0.5, z: 1} m_LocalScale: {x: 11.111111, y: 11.111111, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 743973700} m_Father: {fileID: 0} m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1313516118 +--- !u!1 &1211128525 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -3744,56 +4084,78 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1313516119} - - component: {fileID: 1313516122} - - component: {fileID: 1313516121} - - component: {fileID: 1313516120} + - component: {fileID: 1211128526} + - component: {fileID: 1211128528} + - component: {fileID: 1211128527} + - component: {fileID: 1211128529} m_Layer: 5 - m_Name: Button + m_Name: CustomSliderLimitMode m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1313516119 + m_IsActive: 0 +--- !u!224 &1211128526 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1313516118} - m_LocalRotation: {x: 0, y: 0, z: 0.38268343, w: 0.92387956} + m_GameObject: {fileID: 1211128525} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 765417088} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 45} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 722460748} + - {fileID: 1157125511} + - {fileID: 1698747285} + m_Father: {fileID: 1851494650} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 216} - m_SizeDelta: {x: 288, y: 288} + m_AnchoredPosition: {x: -60, y: -336} + m_SizeDelta: {x: 312, y: 144} m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1313516120 +--- !u!114 &1211128527 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1313516118} + m_GameObject: {fileID: 1211128525} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Script: {fileID: 11500000, guid: 553b47568e2e0c44bb55bbb1d95ae7af, type: 3} + m_Name: + m_EditorClassIdentifier: + handleImage: {fileID: 2012417385} + timeSprite: {fileID: 21300000, guid: 563350755ab067a40ae13360c134da0f, type: 3} + moveSprite: {fileID: 21300000, guid: 7f2638482ea96ff4688857163130092e, type: 3} + onClick: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &1211128528 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1211128525} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 67db9e8f0e2ae9c40bc1e2b64352a6b4, type: 3} m_Name: m_EditorClassIdentifier: m_Navigation: - m_Mode: 0 + m_Mode: 3 m_WrapAround: 0 m_SelectOnUp: {fileID: 0} m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} m_SelectOnRight: {fileID: 0} - m_Transition: 2 + m_Transition: 0 m_Colors: m_NormalColor: {r: 1, g: 1, b: 1, a: 1} m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} @@ -3804,9 +4166,9 @@ MonoBehaviour: m_FadeDuration: 0.1 m_SpriteState: m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 21300000, guid: 3723d3331dcfb4d4a86d96c7e822a014, type: 3} + m_PressedSprite: {fileID: 0} m_SelectedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 21300000, guid: 3723d3331dcfb4d4a86d96c7e822a014, type: 3} + m_DisabledSprite: {fileID: 0} m_AnimationTriggers: m_NormalTrigger: Normal m_HighlightedTrigger: Highlighted @@ -3814,13 +4176,20 @@ MonoBehaviour: m_SelectedTrigger: Selected m_DisabledTrigger: Disabled m_Interactable: 1 - m_TargetGraphic: {fileID: 765417089} - m_OnClick: + m_TargetGraphic: {fileID: 2012417385} + m_FillRect: {fileID: 1325295891} + m_HandleRect: {fileID: 2012417384} + m_Direction: 0 + m_MinValue: 0 + m_MaxValue: 12 + m_WholeNumbers: 1 + m_Value: 0 + m_OnValueChanged: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 57608224} - m_TargetAssemblyTypeName: MapManager, Assembly-CSharp - m_MethodName: ManipulateGravityUp + - m_Target: {fileID: 1211128527} + m_TargetAssemblyTypeName: LimitModeUI, Assembly-CSharp + m_MethodName: UpdateImage m_Mode: 1 m_Arguments: m_ObjectArgument: {fileID: 0} @@ -3830,7 +4199,129 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 ---- !u!114 &1313516121 +--- !u!114 &1211128529 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1211128525} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3383860e292e6cf45b668bb6d35310c0, type: 3} + m_Name: + m_EditorClassIdentifier: + onPointerUp: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1211128527} + m_TargetAssemblyTypeName: LimitModeUI, Assembly-CSharp + m_MethodName: Toggle + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 +--- !u!1 &1313516118 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1313516119} + - component: {fileID: 1313516122} + - component: {fileID: 1313516121} + - component: {fileID: 1313516120} + m_Layer: 5 + m_Name: Button + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1313516119 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1313516118} + m_LocalRotation: {x: 0, y: 0, z: 0.38268343, w: 0.92387956} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 765417088} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 45} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 216} + m_SizeDelta: {x: 288, y: 288} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1313516120 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1313516118} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 0 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 2 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 21300000, guid: 3723d3331dcfb4d4a86d96c7e822a014, type: 3} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 21300000, guid: 3723d3331dcfb4d4a86d96c7e822a014, type: 3} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 765417089} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 57608224} + m_TargetAssemblyTypeName: MapManager, Assembly-CSharp + m_MethodName: ManipulateGravityUp + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 +--- !u!114 &1313516121 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -3868,6 +4359,82 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1313516118} m_CullTransparentMesh: 0 +--- !u!1 &1325295890 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1325295891} + - component: {fileID: 1325295893} + - component: {fileID: 1325295892} + m_Layer: 5 + m_Name: Fill + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1325295891 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1325295890} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1157125511} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1325295892 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1325295890} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.21568629, g: 0.21568629, b: 0.21568629, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &1325295893 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1325295890} + m_CullTransparentMesh: 1 --- !u!1 &1448485172 GameObject: m_ObjectHideFlags: 0 @@ -3897,6 +4464,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1729040392} m_RootOrder: 0 @@ -3961,19 +4529,20 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_TrackedObjects: - - id: 0 + - rid: 0 references: - version: 1 - 00000000: + version: 2 + RefIds: + - rid: 0 type: {class: TrackedUGuiGraphic, ns: UnityEngine.Localization.PropertyVariants.TrackedObjects, asm: Unity.Localization} data: m_Target: {fileID: 1448485174} m_TrackedProperties: items: - - id: 1 + - rid: 1 m_UpdateType: 0 - 00000001: + - rid: 1 type: {class: LocalizedStringProperty, ns: UnityEngine.Localization.PropertyVariants.TrackedProperties, asm: Unity.Localization} data: @@ -4016,6 +4585,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0.38268343, w: 0.92387956} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2122479026} m_RootOrder: 0 @@ -4240,7 +4810,7 @@ MonoBehaviour: m_PixelsPerUnitMultiplier: 1 --- !u!95 &1492445044 Animator: - serializedVersion: 3 + serializedVersion: 5 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -4253,10 +4823,12 @@ Animator: m_UpdateMode: 0 m_ApplyRootMotion: 0 m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorControllerStateOnDisable: 0 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 --- !u!222 &1492445045 CanvasRenderer: m_ObjectHideFlags: 0 @@ -4275,6 +4847,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 363787298} m_RootOrder: 7 @@ -4368,6 +4941,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 240587202} m_RootOrder: 5 @@ -4406,6 +4980,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1729040392} - {fileID: 735985413} @@ -4515,6 +5090,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 240587202} m_RootOrder: 7 @@ -4532,50 +5108,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1547743682} m_CullTransparentMesh: 0 ---- !u!1 &1561156650 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1561156652} - - component: {fileID: 1561156651} - m_Layer: 5 - m_Name: TooltipUI - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!222 &1561156651 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1561156650} - m_CullTransparentMesh: 0 ---- !u!224 &1561156652 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1561156650} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 1851494650} - m_RootOrder: 7 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: 0, y: 240} - m_SizeDelta: {x: 0, y: 480} - m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1582923386 GameObject: m_ObjectHideFlags: 0 @@ -4605,6 +5137,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1851494650} m_RootOrder: 3 @@ -4754,6 +5287,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1544317895} m_RootOrder: 2 @@ -4829,6 +5363,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 583662299} m_RootOrder: 2 @@ -4876,6 +5411,43 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1667843905} m_CullTransparentMesh: 0 +--- !u!1 &1698747284 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1698747285} + m_Layer: 5 + m_Name: Handle Slide Area + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1698747285 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1698747284} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 2012417384} + m_Father: {fileID: 1211128526} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: -156, y: 0} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1707066806 GameObject: m_ObjectHideFlags: 0 @@ -4916,9 +5488,17 @@ Camera: m_projectionMatrixMode: 1 m_GateFitMode: 2 m_FOVAxisMode: 0 + m_Iso: 200 + m_ShutterSpeed: 0.005 + m_Aperture: 16 + m_FocusDistance: 10 + m_FocalLength: 50 + m_BladeCount: 5 + m_Curvature: {x: 2, y: 11} + m_BarrelClipping: 0.25 + m_Anamorphism: 0 m_SensorSize: {x: 36, y: 24} m_LensShift: {x: 0, y: 0} - m_FocalLength: 50 m_NormalizedViewPortRect: serializedVersion: 2 x: 0 @@ -4955,6 +5535,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 2, y: 1.5, z: -10} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0 @@ -4988,6 +5569,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1851494650} m_RootOrder: 5 @@ -5132,6 +5714,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1448485173} - {fileID: 21237446} @@ -5222,6 +5805,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 583662299} m_RootOrder: 4 @@ -5297,6 +5881,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 286166420} m_RootOrder: 1 @@ -5374,6 +5959,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3} m_Name: m_EditorClassIdentifier: + m_SendPointerHoverToParent: 1 m_HorizontalAxis: Horizontal m_VerticalAxis: Vertical m_SubmitButton: Submit @@ -5406,6 +5992,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 2 @@ -5438,6 +6025,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1851494650} m_RootOrder: 1 @@ -5511,6 +6099,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 2129345911} - {fileID: 1790638097} @@ -5518,9 +6107,10 @@ RectTransform: - {fileID: 1582923387} - {fileID: 1150334309} - {fileID: 1707545010} + - {fileID: 1211128526} - {fileID: 1544317895} - - {fileID: 1561156652} - {fileID: 165664661} + - {fileID: 4404301370260597130} m_Father: {fileID: 1953199607} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -5557,6 +6147,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 583662299} m_RootOrder: 3 @@ -5632,6 +6223,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 286166420} m_RootOrder: 0 @@ -5707,6 +6299,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 583662299} m_RootOrder: 5 @@ -5783,6 +6376,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 363787298} - {fileID: 1851494650} @@ -5882,6 +6476,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0.38268343, w: 0.92387956} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 211645960} m_RootOrder: 0 @@ -6013,6 +6608,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 240587202} m_RootOrder: 0 @@ -6060,27 +6656,104 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2007145222} m_CullTransparentMesh: 0 ---- !u!1001 &2025636549 -PrefabInstance: +--- !u!1 &2012417383 +GameObject: m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 240587202} - m_Modifications: - - target: {fileID: 1788800189684379114, guid: ab016032a72db2d4cb0b255953e0dc4b, - type: 3} - propertyPath: m_Text - value: "SFX\n\uBCFC\uB968" - objectReference: {fileID: 0} - - target: {fileID: 1788800190094284257, guid: ab016032a72db2d4cb0b255953e0dc4b, - type: 3} - propertyPath: m_Text - value: "\uC774 \uB9F5\n\uC2A4\uD0B5\uD558\uAE30" - objectReference: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2012417384} + - component: {fileID: 2012417386} + - component: {fileID: 2012417385} + m_Layer: 5 + m_Name: Handle + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2012417384 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2012417383} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1698747285} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 132, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &2012417385 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2012417383} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 563350755ab067a40ae13360c134da0f, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &2012417386 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2012417383} + m_CullTransparentMesh: 1 +--- !u!1001 &2025636549 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 240587202} + m_Modifications: + - target: {fileID: 1788800189684379114, guid: ab016032a72db2d4cb0b255953e0dc4b, + type: 3} + propertyPath: m_Text + value: "SFX\n\uBCFC\uB968" + objectReference: {fileID: 0} + - target: {fileID: 1788800190094284257, guid: ab016032a72db2d4cb0b255953e0dc4b, + type: 3} + propertyPath: m_Text + value: "\uC774 \uB9F5\n\uC2A4\uD0B5\uD558\uAE30" + objectReference: {fileID: 0} - target: {fileID: 1788800190194448737, guid: ab016032a72db2d4cb0b255953e0dc4b, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size - value: 4 + value: 5 objectReference: {fileID: 0} - target: {fileID: 1788800190194448737, guid: ab016032a72db2d4cb0b255953e0dc4b, type: 3} @@ -6092,6 +6765,11 @@ PrefabInstance: propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[3].m_Mode value: 6 objectReference: {fileID: 0} + - target: {fileID: 1788800190194448737, guid: ab016032a72db2d4cb0b255953e0dc4b, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[4].m_Mode + value: 1 + objectReference: {fileID: 0} - target: {fileID: 1788800190194448737, guid: ab016032a72db2d4cb0b255953e0dc4b, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target @@ -6112,6 +6790,11 @@ PrefabInstance: propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[3].m_Target value: objectReference: {fileID: 1503042061} + - target: {fileID: 1788800190194448737, guid: ab016032a72db2d4cb0b255953e0dc4b, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[4].m_Target + value: + objectReference: {fileID: 121398293} - target: {fileID: 1788800190194448737, guid: ab016032a72db2d4cb0b255953e0dc4b, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[2].m_CallState @@ -6122,6 +6805,11 @@ PrefabInstance: propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[3].m_CallState value: 2 objectReference: {fileID: 0} + - target: {fileID: 1788800190194448737, guid: ab016032a72db2d4cb0b255953e0dc4b, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[4].m_CallState + value: 2 + objectReference: {fileID: 0} - target: {fileID: 1788800190194448737, guid: ab016032a72db2d4cb0b255953e0dc4b, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName @@ -6142,6 +6830,11 @@ PrefabInstance: propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[3].m_MethodName value: SetActive objectReference: {fileID: 0} + - target: {fileID: 1788800190194448737, guid: ab016032a72db2d4cb0b255953e0dc4b, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[4].m_MethodName + value: Resume + objectReference: {fileID: 0} - target: {fileID: 1788800190194448737, guid: ab016032a72db2d4cb0b255953e0dc4b, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[2].m_TargetAssemblyTypeName @@ -6152,6 +6845,11 @@ PrefabInstance: propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[3].m_TargetAssemblyTypeName value: UnityEngine.GameObject, UnityEngine objectReference: {fileID: 0} + - target: {fileID: 1788800190194448737, guid: ab016032a72db2d4cb0b255953e0dc4b, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[4].m_TargetAssemblyTypeName + value: PlayManager, Assembly-CSharp + objectReference: {fileID: 0} - target: {fileID: 1788800190194448737, guid: ab016032a72db2d4cb0b255953e0dc4b, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[2].m_Arguments.m_ObjectArgumentAssemblyTypeName @@ -6162,6 +6860,11 @@ PrefabInstance: propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[3].m_Arguments.m_ObjectArgumentAssemblyTypeName value: UnityEngine.Object, UnityEngine objectReference: {fileID: 0} + - target: {fileID: 1788800190194448737, guid: ab016032a72db2d4cb0b255953e0dc4b, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[4].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} - target: {fileID: 1788800190199287468, guid: ab016032a72db2d4cb0b255953e0dc4b, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target @@ -6182,6 +6885,11 @@ PrefabInstance: propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[4].m_Target value: objectReference: {fileID: 121398293} + - target: {fileID: 1788800190199287468, guid: ab016032a72db2d4cb0b255953e0dc4b, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[5].m_Target + value: + objectReference: {fileID: 121398293} - target: {fileID: 1788800190199287468, guid: ab016032a72db2d4cb0b255953e0dc4b, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName @@ -6202,11 +6910,21 @@ PrefabInstance: propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[4].m_MethodName value: PlayButtonSFX objectReference: {fileID: 0} + - target: {fileID: 1788800190199287468, guid: ab016032a72db2d4cb0b255953e0dc4b, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[5].m_MethodName + value: Resume + objectReference: {fileID: 0} - target: {fileID: 1788800190199287468, guid: ab016032a72db2d4cb0b255953e0dc4b, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_Arguments.m_BoolArgument value: 1 objectReference: {fileID: 0} + - target: {fileID: 1788800190199287468, guid: ab016032a72db2d4cb0b255953e0dc4b, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[5].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} - target: {fileID: 1788800190535769285, guid: ab016032a72db2d4cb0b255953e0dc4b, type: 3} propertyPath: m_AnchorMax.y @@ -6367,6 +7085,11 @@ PrefabInstance: propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[3].m_Target value: objectReference: {fileID: 642344059} + - target: {fileID: 1788800191260194214, guid: ab016032a72db2d4cb0b255953e0dc4b, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[4].m_Target + value: + objectReference: {fileID: 121398293} - target: {fileID: 1788800191260194214, guid: ab016032a72db2d4cb0b255953e0dc4b, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName @@ -6382,6 +7105,21 @@ PrefabInstance: propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[3].m_MethodName value: set_interactable objectReference: {fileID: 0} + - target: {fileID: 1788800191260194214, guid: ab016032a72db2d4cb0b255953e0dc4b, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[4].m_MethodName + value: Resume + objectReference: {fileID: 0} + - target: {fileID: 1788800191260194214, guid: ab016032a72db2d4cb0b255953e0dc4b, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[4].m_TargetAssemblyTypeName + value: PlayManager, Assembly-CSharp + objectReference: {fileID: 0} + - target: {fileID: 1788800191260194214, guid: ab016032a72db2d4cb0b255953e0dc4b, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[4].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} - target: {fileID: 1788800191300486960, guid: ab016032a72db2d4cb0b255953e0dc4b, type: 3} propertyPath: m_AnchorMax.y @@ -6423,6 +7161,33 @@ PrefabInstance: value: PlayButtonSFX objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 1788800190577679305, guid: ab016032a72db2d4cb0b255953e0dc4b, + type: 3} + insertIndex: -1 + addedObject: {fileID: 2025636570} + - targetCorrespondingSourceObject: {fileID: 1788800191428183895, guid: ab016032a72db2d4cb0b255953e0dc4b, + type: 3} + insertIndex: -1 + addedObject: {fileID: 2025636569} + - targetCorrespondingSourceObject: {fileID: 1788800191566990105, guid: ab016032a72db2d4cb0b255953e0dc4b, + type: 3} + insertIndex: -1 + addedObject: {fileID: 2025636568} + - targetCorrespondingSourceObject: {fileID: 1788800190094284259, guid: ab016032a72db2d4cb0b255953e0dc4b, + type: 3} + insertIndex: -1 + addedObject: {fileID: 2025636567} + - targetCorrespondingSourceObject: {fileID: 1788800191633508124, guid: ab016032a72db2d4cb0b255953e0dc4b, + type: 3} + insertIndex: -1 + addedObject: {fileID: 2025636566} + - targetCorrespondingSourceObject: {fileID: 1788800189684379116, guid: ab016032a72db2d4cb0b255953e0dc4b, + type: 3} + insertIndex: -1 + addedObject: {fileID: 2025636565} m_SourcePrefab: {fileID: 100100000, guid: ab016032a72db2d4cb0b255953e0dc4b, type: 3} --- !u!224 &2025636550 stripped RectTransform: @@ -6569,19 +7334,20 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_TrackedObjects: - - id: 0 + - rid: 0 references: - version: 1 - 00000000: + version: 2 + RefIds: + - rid: 0 type: {class: TrackedUGuiGraphic, ns: UnityEngine.Localization.PropertyVariants.TrackedObjects, asm: Unity.Localization} data: m_Target: {fileID: 2025636554} m_TrackedProperties: items: - - id: 1 + - rid: 1 m_UpdateType: 0 - 00000001: + - rid: 1 type: {class: LocalizedStringProperty, ns: UnityEngine.Localization.PropertyVariants.TrackedProperties, asm: Unity.Localization} data: @@ -6608,19 +7374,20 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_TrackedObjects: - - id: 0 + - rid: 0 references: - version: 1 - 00000000: + version: 2 + RefIds: + - rid: 0 type: {class: TrackedUGuiGraphic, ns: UnityEngine.Localization.PropertyVariants.TrackedObjects, asm: Unity.Localization} data: m_Target: {fileID: 2025636556} m_TrackedProperties: items: - - id: 1 + - rid: 1 m_UpdateType: 0 - 00000001: + - rid: 1 type: {class: LocalizedStringProperty, ns: UnityEngine.Localization.PropertyVariants.TrackedProperties, asm: Unity.Localization} data: @@ -6647,19 +7414,20 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_TrackedObjects: - - id: 0 + - rid: 0 references: - version: 1 - 00000000: + version: 2 + RefIds: + - rid: 0 type: {class: TrackedUGuiGraphic, ns: UnityEngine.Localization.PropertyVariants.TrackedObjects, asm: Unity.Localization} data: m_Target: {fileID: 2025636558} m_TrackedProperties: items: - - id: 1 + - rid: 1 m_UpdateType: 0 - 00000001: + - rid: 1 type: {class: LocalizedStringProperty, ns: UnityEngine.Localization.PropertyVariants.TrackedProperties, asm: Unity.Localization} data: @@ -6686,19 +7454,20 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_TrackedObjects: - - id: 0 + - rid: 0 references: - version: 1 - 00000000: + version: 2 + RefIds: + - rid: 0 type: {class: TrackedUGuiGraphic, ns: UnityEngine.Localization.PropertyVariants.TrackedObjects, asm: Unity.Localization} data: m_Target: {fileID: 2025636560} m_TrackedProperties: items: - - id: 1 + - rid: 1 m_UpdateType: 0 - 00000001: + - rid: 1 type: {class: LocalizedStringProperty, ns: UnityEngine.Localization.PropertyVariants.TrackedProperties, asm: Unity.Localization} data: @@ -6725,19 +7494,20 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_TrackedObjects: - - id: 0 + - rid: 0 references: - version: 1 - 00000000: + version: 2 + RefIds: + - rid: 0 type: {class: TrackedUGuiGraphic, ns: UnityEngine.Localization.PropertyVariants.TrackedObjects, asm: Unity.Localization} data: m_Target: {fileID: 2025636562} m_TrackedProperties: items: - - id: 1 + - rid: 1 m_UpdateType: 0 - 00000001: + - rid: 1 type: {class: LocalizedStringProperty, ns: UnityEngine.Localization.PropertyVariants.TrackedProperties, asm: Unity.Localization} data: @@ -6764,19 +7534,20 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_TrackedObjects: - - id: 0 + - rid: 0 references: - version: 1 - 00000000: + version: 2 + RefIds: + - rid: 0 type: {class: TrackedUGuiGraphic, ns: UnityEngine.Localization.PropertyVariants.TrackedObjects, asm: Unity.Localization} data: m_Target: {fileID: 2025636564} m_TrackedProperties: items: - - id: 1 + - rid: 1 m_UpdateType: 0 - 00000001: + - rid: 1 type: {class: LocalizedStringProperty, ns: UnityEngine.Localization.PropertyVariants.TrackedProperties, asm: Unity.Localization} data: @@ -6818,6 +7589,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 286166420} m_RootOrder: 2 @@ -6897,6 +7669,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1544317895} m_RootOrder: 4 @@ -6973,6 +7746,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0.38268343, w: 0.92387956} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 773354118} m_RootOrder: 0 @@ -7104,6 +7878,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 583662299} m_RootOrder: 7 @@ -7179,6 +7954,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1469473966} m_Father: {fileID: 363787298} @@ -7255,6 +8031,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1851494650} m_RootOrder: 0 @@ -7312,6 +8089,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 240587202} m_RootOrder: 2 @@ -7382,6 +8160,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 363787298} m_Modifications: - target: {fileID: 2672423829272442780, guid: d838f6f282b36a043ab18477971ef80d, @@ -7505,4 +8284,302 @@ PrefabInstance: value: objectReference: {fileID: 121398293} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: d838f6f282b36a043ab18477971ef80d, type: 3} +--- !u!224 &4404301370260597130 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 947415739964845906, guid: e12109ae245e16f4d85e1bc6e4d67ac4, + type: 3} + m_PrefabInstance: {fileID: 7673319958531420355} + m_PrefabAsset: {fileID: 0} +--- !u!1 &4404301370260597131 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 7479105889482343208, guid: e12109ae245e16f4d85e1bc6e4d67ac4, + type: 3} + m_PrefabInstance: {fileID: 7673319958531420355} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &7663139776663131576 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 240587202} + m_Modifications: + - target: {fileID: 2242454143767789182, guid: 3e1882bc7f6d98c49814aa8f92076daa, + type: 3} + propertyPath: mm + value: + objectReference: {fileID: 57608224} + - target: {fileID: 5464360231694924913, guid: 3e1882bc7f6d98c49814aa8f92076daa, + type: 3} + propertyPath: m_Name + value: MoveLimitUI + objectReference: {fileID: 0} + - target: {fileID: 5464360231694924913, guid: 3e1882bc7f6d98c49814aa8f92076daa, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8218423448589352914, guid: 3e1882bc7f6d98c49814aa8f92076daa, + type: 3} + propertyPath: m_SizeDelta.x + value: -1080 + objectReference: {fileID: 0} + - target: {fileID: 8218423448589352914, guid: 3e1882bc7f6d98c49814aa8f92076daa, + type: 3} + propertyPath: m_AnchoredPosition.x + value: -444 + objectReference: {fileID: 0} + - target: {fileID: 9100421025181478557, guid: 3e1882bc7f6d98c49814aa8f92076daa, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 9100421025181478557, guid: 3e1882bc7f6d98c49814aa8f92076daa, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 9100421025181478557, guid: 3e1882bc7f6d98c49814aa8f92076daa, + type: 3} + propertyPath: m_RootOrder + value: -1 + objectReference: {fileID: 0} + - target: {fileID: 9100421025181478557, guid: 3e1882bc7f6d98c49814aa8f92076daa, + type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 9100421025181478557, guid: 3e1882bc7f6d98c49814aa8f92076daa, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 9100421025181478557, guid: 3e1882bc7f6d98c49814aa8f92076daa, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9100421025181478557, guid: 3e1882bc7f6d98c49814aa8f92076daa, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9100421025181478557, guid: 3e1882bc7f6d98c49814aa8f92076daa, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9100421025181478557, guid: 3e1882bc7f6d98c49814aa8f92076daa, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9100421025181478557, guid: 3e1882bc7f6d98c49814aa8f92076daa, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9100421025181478557, guid: 3e1882bc7f6d98c49814aa8f92076daa, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9100421025181478557, guid: 3e1882bc7f6d98c49814aa8f92076daa, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9100421025181478557, guid: 3e1882bc7f6d98c49814aa8f92076daa, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 9100421025181478557, guid: 3e1882bc7f6d98c49814aa8f92076daa, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9100421025181478557, guid: 3e1882bc7f6d98c49814aa8f92076daa, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9100421025181478557, guid: 3e1882bc7f6d98c49814aa8f92076daa, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9100421025181478557, guid: 3e1882bc7f6d98c49814aa8f92076daa, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9100421025181478557, guid: 3e1882bc7f6d98c49814aa8f92076daa, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9100421025181478557, guid: 3e1882bc7f6d98c49814aa8f92076daa, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9100421025181478557, guid: 3e1882bc7f6d98c49814aa8f92076daa, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9100421025181478557, guid: 3e1882bc7f6d98c49814aa8f92076daa, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 3e1882bc7f6d98c49814aa8f92076daa, type: 3} +--- !u!224 &7663139776663131577 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 9100421025181478557, guid: 3e1882bc7f6d98c49814aa8f92076daa, + type: 3} + m_PrefabInstance: {fileID: 7663139776663131576} + m_PrefabAsset: {fileID: 0} +--- !u!1 &7663139776663131578 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 5464360231694924913, guid: 3e1882bc7f6d98c49814aa8f92076daa, + type: 3} + m_PrefabInstance: {fileID: 7663139776663131576} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &7673319958531420355 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1851494650} + m_Modifications: + - target: {fileID: 947415739964845906, guid: e12109ae245e16f4d85e1bc6e4d67ac4, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 947415739964845906, guid: e12109ae245e16f4d85e1bc6e4d67ac4, + type: 3} + propertyPath: m_Pivot.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 947415739964845906, guid: e12109ae245e16f4d85e1bc6e4d67ac4, + type: 3} + propertyPath: m_RootOrder + value: 8 + objectReference: {fileID: 0} + - target: {fileID: 947415739964845906, guid: e12109ae245e16f4d85e1bc6e4d67ac4, + type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 947415739964845906, guid: e12109ae245e16f4d85e1bc6e4d67ac4, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 947415739964845906, guid: e12109ae245e16f4d85e1bc6e4d67ac4, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 947415739964845906, guid: e12109ae245e16f4d85e1bc6e4d67ac4, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 947415739964845906, guid: e12109ae245e16f4d85e1bc6e4d67ac4, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 947415739964845906, guid: e12109ae245e16f4d85e1bc6e4d67ac4, + type: 3} + propertyPath: m_SizeDelta.y + value: 960 + objectReference: {fileID: 0} + - target: {fileID: 947415739964845906, guid: e12109ae245e16f4d85e1bc6e4d67ac4, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 947415739964845906, guid: e12109ae245e16f4d85e1bc6e4d67ac4, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 947415739964845906, guid: e12109ae245e16f4d85e1bc6e4d67ac4, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 947415739964845906, guid: e12109ae245e16f4d85e1bc6e4d67ac4, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 947415739964845906, guid: e12109ae245e16f4d85e1bc6e4d67ac4, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 947415739964845906, guid: e12109ae245e16f4d85e1bc6e4d67ac4, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 947415739964845906, guid: e12109ae245e16f4d85e1bc6e4d67ac4, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 947415739964845906, guid: e12109ae245e16f4d85e1bc6e4d67ac4, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 947415739964845906, guid: e12109ae245e16f4d85e1bc6e4d67ac4, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 947415739964845906, guid: e12109ae245e16f4d85e1bc6e4d67ac4, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 947415739964845906, guid: e12109ae245e16f4d85e1bc6e4d67ac4, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 947415739964845906, guid: e12109ae245e16f4d85e1bc6e4d67ac4, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6530629739181965378, guid: e12109ae245e16f4d85e1bc6e4d67ac4, + type: 3} + propertyPath: mm + value: + objectReference: {fileID: 57608224} + - target: {fileID: 7479105889482343208, guid: e12109ae245e16f4d85e1bc6e4d67ac4, + type: 3} + propertyPath: m_Name + value: GravityMinMoveCount + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: e12109ae245e16f4d85e1bc6e4d67ac4, type: 3} diff --git a/Assets/Scenes/Editor.unity b/Assets/Scenes/Editor.unity index c1921ae..64ddf80 100644 --- a/Assets/Scenes/Editor.unity +++ b/Assets/Scenes/Editor.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.37311953, g: 0.38074014, b: 0.3587274, a: 1} + m_IndirectSpecularColor: {r: 0.37311924, g: 0.38073963, b: 0.3587269, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -105,7 +105,7 @@ NavMeshSettings: serializedVersion: 2 m_ObjectHideFlags: 0 m_BuildSettings: - serializedVersion: 2 + serializedVersion: 3 agentTypeID: 0 agentRadius: 0.5 agentHeight: 2 @@ -118,7 +118,7 @@ NavMeshSettings: cellSize: 0.16666667 manualTileSize: 0 tileSize: 256 - accuratePlacement: 0 + buildHeightMesh: 0 maxJobWorkers: 0 preserveTilesOutsideBounds: 0 debug: @@ -153,6 +153,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 866126770} m_Father: {fileID: 1126013225} @@ -286,6 +287,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 2140613538} - {fileID: 1026806516} @@ -397,6 +399,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 202744929} m_RootOrder: 0 @@ -473,6 +476,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1468324231} - {fileID: 942595288} @@ -536,7 +540,7 @@ MonoBehaviour: m_HideMobileInput: 0 m_CharacterValidation: 0 m_CharacterLimit: 24 - m_OnEndEdit: + m_OnSubmit: m_PersistentCalls: m_Calls: - m_Target: {fileID: 1073929001} @@ -551,6 +555,21 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 + m_OnDidEndEdit: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 32462373} + m_TargetAssemblyTypeName: InputFieldInset, Assembly-CSharp + m_MethodName: MapNameInputDeselected + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 m_OnValueChanged: m_PersistentCalls: m_Calls: [] @@ -628,6 +647,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 402214860} m_RootOrder: 2 @@ -701,6 +721,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1758314572} m_RootOrder: 1 @@ -738,6 +759,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 695394996} m_RootOrder: 0 @@ -816,6 +838,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 718947820} m_Father: {fileID: 1632630320} @@ -867,6 +890,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 569660068} - {fileID: 1125096442} @@ -981,6 +1005,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2022614171} m_RootOrder: 6 @@ -1098,7 +1123,7 @@ CanvasRenderer: m_CullTransparentMesh: 0 --- !u!95 &52850597 Animator: - serializedVersion: 3 + serializedVersion: 5 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -1111,10 +1136,12 @@ Animator: m_UpdateMode: 0 m_ApplyRootMotion: 0 m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorControllerStateOnDisable: 0 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 --- !u!114 &52850598 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1130,7 +1157,7 @@ MonoBehaviour: tooltipPrefab: {fileID: 6095790650455668987, guid: 3617bb7300a723d468a84e27f5543876, type: 3} tooltipMessage: RetryTimeButton - tooltipWidth: 444 + tooltipWidth: 480 tooltipHeight: 168 pivot: 3 --- !u!1 &55681740 @@ -1159,6 +1186,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1796690847} m_Father: {fileID: 1426870985} @@ -1197,6 +1225,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 23044018} m_RootOrder: 3 @@ -1272,6 +1301,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1684321090} m_RootOrder: 0 @@ -1347,6 +1377,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 23044018} m_RootOrder: 2 @@ -1423,6 +1454,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 440698924} m_Father: {fileID: 872817766} @@ -1513,6 +1545,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1614029792} m_Father: {fileID: 245574326} @@ -1602,6 +1635,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1367883868} m_RootOrder: 0 @@ -1677,6 +1711,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 872817766} m_RootOrder: 3 @@ -1752,6 +1787,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 46419465} m_RootOrder: 5 @@ -1827,6 +1863,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 389345989} m_RootOrder: 0 @@ -1906,6 +1943,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 546415786} m_RootOrder: 11 @@ -1982,6 +2020,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 293953716} - {fileID: 23044018} @@ -2140,6 +2179,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 524821821} - {fileID: 1554030507} @@ -2229,6 +2269,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1698377310} m_RootOrder: 1 @@ -2305,6 +2346,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1126013225} m_RootOrder: 3 @@ -2446,6 +2488,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 29889921} m_Father: {fileID: 1323915154} @@ -2484,6 +2527,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 920279547} - {fileID: 522417288} @@ -2614,6 +2658,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 23044018} m_RootOrder: 4 @@ -2687,6 +2732,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1085739499} m_RootOrder: 1 @@ -2724,6 +2770,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 810867328} m_RootOrder: 1 @@ -2803,6 +2850,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1129996990} m_Father: {fileID: 2022614171} @@ -2879,6 +2927,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 718947820} m_RootOrder: 3 @@ -2955,6 +3004,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 101421915} - {fileID: 1267848534} @@ -3066,6 +3116,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 292254065} m_RootOrder: 5 @@ -3144,6 +3195,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2022614171} m_RootOrder: 5 @@ -3290,22 +3342,23 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_TrackedObjects: - - id: 0 + - rid: 0 references: - version: 1 - 00000000: + version: 2 + RefIds: + - rid: 0 type: {class: TrackedMonoBehaviourObject, ns: UnityEngine.Localization.PropertyVariants.TrackedObjects, asm: Unity.Localization} data: m_Target: {fileID: 275147237} m_TrackedProperties: items: - - id: 1 + - rid: 1 m_UpdateType: 0 m_Changed: m_PersistentCalls: m_Calls: [] - 00000001: + - rid: 1 type: {class: LocalizedStringProperty, ns: UnityEngine.Localization.PropertyVariants.TrackedProperties, asm: Unity.Localization} data: @@ -3347,6 +3400,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1978816215} m_RootOrder: 2 @@ -3422,6 +3476,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 546415786} m_RootOrder: 10 @@ -3496,6 +3551,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1737785481} - {fileID: 482404194} @@ -3569,6 +3625,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1599849848} - {fileID: 1234804343} @@ -3680,6 +3737,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 179161244} m_RootOrder: 0 @@ -3761,6 +3819,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1684321090} m_Father: {fileID: 365396096} @@ -3897,6 +3956,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1652253826} - {fileID: 1426493156} @@ -3986,6 +4046,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2023273646} m_RootOrder: 2 @@ -4062,6 +4123,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2022614171} m_RootOrder: 2 @@ -4221,6 +4283,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 397022746} m_Father: {fileID: 208470215} @@ -4260,6 +4323,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 810867328} m_RootOrder: 0 @@ -4324,19 +4388,20 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_TrackedObjects: - - id: 0 + - rid: 0 references: - version: 1 - 00000000: + version: 2 + RefIds: + - rid: 0 type: {class: TrackedUGuiGraphic, ns: UnityEngine.Localization.PropertyVariants.TrackedObjects, asm: Unity.Localization} data: m_Target: {fileID: 359219908} m_TrackedProperties: items: - - id: 1 + - rid: 1 m_UpdateType: 0 - 00000001: + - rid: 1 type: {class: LocalizedStringProperty, ns: UnityEngine.Localization.PropertyVariants.TrackedProperties, asm: Unity.Localization} data: @@ -4379,6 +4444,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 546415786} m_RootOrder: 7 @@ -4511,6 +4577,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1632630320} - {fileID: 303667355} @@ -4625,6 +4692,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 546415786} m_RootOrder: 9 @@ -4771,22 +4839,23 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_TrackedObjects: - - id: 0 + - rid: 0 references: - version: 1 - 00000000: + version: 2 + RefIds: + - rid: 0 type: {class: TrackedMonoBehaviourObject, ns: UnityEngine.Localization.PropertyVariants.TrackedObjects, asm: Unity.Localization} data: m_Target: {fileID: 368163578} m_TrackedProperties: items: - - id: 1 + - rid: 1 m_UpdateType: 0 m_Changed: m_PersistentCalls: m_Calls: [] - 00000001: + - rid: 1 type: {class: LocalizedStringProperty, ns: UnityEngine.Localization.PropertyVariants.TrackedProperties, asm: Unity.Localization} data: @@ -4828,6 +4897,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1698377310} m_RootOrder: 0 @@ -4903,6 +4973,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2022614171} m_RootOrder: 7 @@ -4979,6 +5050,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1126013225} m_RootOrder: 1 @@ -5265,7 +5337,8 @@ MonoBehaviour: tryCount: 0 beforeFirstAction: 0 tryCountUpTrigger: 0 - hasClearedOnce: 0 + hasClearedOnceInTime: 0 + hasClearedOnceInMove: 0 --- !u!4 &387881937 Transform: m_ObjectHideFlags: 0 @@ -5276,6 +5349,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 6 @@ -5308,6 +5382,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 546415786} m_RootOrder: 15 @@ -5384,6 +5459,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 151441300} - {fileID: 245574326} @@ -5543,6 +5619,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 350572919} m_RootOrder: 0 @@ -5619,6 +5696,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 2005399913} - {fileID: 872817766} @@ -5776,6 +5854,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 2086147923} m_Father: {fileID: 1234804343} @@ -5812,6 +5891,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1893666554} - {fileID: 882245796} @@ -5857,6 +5937,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 292254065} m_RootOrder: 4 @@ -5931,6 +6012,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 583063816} m_Father: {fileID: 98732516} @@ -5981,6 +6063,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1063762956} m_RootOrder: 0 @@ -6056,6 +6139,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 546415786} m_RootOrder: 17 @@ -6131,6 +6215,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 365396096} m_RootOrder: 4 @@ -6207,6 +6292,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1126013225} m_RootOrder: 4 @@ -6351,6 +6437,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1085739499} - {fileID: 1337572406} @@ -6461,6 +6548,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 245574326} m_RootOrder: 5 @@ -6536,6 +6624,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 872817766} m_RootOrder: 4 @@ -6611,6 +6700,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 285889925} m_RootOrder: 1 @@ -6688,6 +6778,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1117662680} m_RootOrder: 10 @@ -6699,7 +6790,7 @@ RectTransform: m_Pivot: {x: 0.5, y: 0.5} --- !u!95 &516119128 Animator: - serializedVersion: 3 + serializedVersion: 5 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -6712,10 +6803,12 @@ Animator: m_UpdateMode: 0 m_ApplyRootMotion: 0 m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorControllerStateOnDisable: 0 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 --- !u!114 &516119129 MonoBehaviour: m_ObjectHideFlags: 0 @@ -6848,6 +6941,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1826358839} m_Father: {fileID: 208470215} @@ -6886,6 +6980,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 180467768} m_RootOrder: 0 @@ -6962,6 +7057,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1117662680} m_RootOrder: 8 @@ -7105,6 +7201,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1252051942} m_RootOrder: 2 @@ -7182,6 +7279,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1807883534} - {fileID: 1909207573} @@ -7237,6 +7335,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2022614171} m_RootOrder: 12 @@ -7313,6 +7412,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1438935049} m_Father: {fileID: 46419465} @@ -7401,6 +7501,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 752543497} - {fileID: 2003342302} @@ -7490,6 +7591,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 292254065} m_RootOrder: 3 @@ -7565,6 +7667,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1698377310} m_RootOrder: 2 @@ -7645,6 +7748,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1758314572} m_RootOrder: 0 @@ -7709,19 +7813,20 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_TrackedObjects: - - id: 0 + - rid: 0 references: - version: 1 - 00000000: + version: 2 + RefIds: + - rid: 0 type: {class: TrackedUGuiGraphic, ns: UnityEngine.Localization.PropertyVariants.TrackedObjects, asm: Unity.Localization} data: m_Target: {fileID: 597819661} m_TrackedProperties: items: - - id: 1 + - rid: 1 m_UpdateType: 0 - 00000001: + - rid: 1 type: {class: LocalizedStringProperty, ns: UnityEngine.Localization.PropertyVariants.TrackedProperties, asm: Unity.Localization} data: @@ -7775,6 +7880,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1541170115} m_Father: {fileID: 2022614171} @@ -7828,6 +7934,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 7063427215363646516, guid: 1db10a05a0fc004418a1b36bde2c72b0, @@ -7891,6 +7998,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 1db10a05a0fc004418a1b36bde2c72b0, type: 3} --- !u!1 &640365312 GameObject: @@ -7919,6 +8029,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1698377310} m_Father: {fileID: 2140613538} @@ -7970,6 +8081,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1097472927} m_Father: {fileID: 1314247929} @@ -8062,6 +8174,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1097472927} m_RootOrder: 1 @@ -8146,6 +8259,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 718947820} m_RootOrder: 0 @@ -8224,6 +8338,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2022614171} m_RootOrder: 1 @@ -8370,22 +8485,23 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_TrackedObjects: - - id: 0 + - rid: 0 references: - version: 1 - 00000000: + version: 2 + RefIds: + - rid: 0 type: {class: TrackedMonoBehaviourObject, ns: UnityEngine.Localization.PropertyVariants.TrackedObjects, asm: Unity.Localization} data: m_Target: {fileID: 656562813} m_TrackedProperties: items: - - id: 1 + - rid: 1 m_UpdateType: 0 m_Changed: m_PersistentCalls: m_Calls: [] - 00000001: + - rid: 1 type: {class: LocalizedStringProperty, ns: UnityEngine.Localization.PropertyVariants.TrackedProperties, asm: Unity.Localization} data: @@ -8427,6 +8543,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1610396825} m_RootOrder: 0 @@ -8503,6 +8620,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 42158367} - {fileID: 365396096} @@ -8664,6 +8782,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1117662680} m_RootOrder: 11 @@ -8675,7 +8794,7 @@ RectTransform: m_Pivot: {x: 0.5, y: 0.5} --- !u!95 &710941355 Animator: - serializedVersion: 3 + serializedVersion: 5 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -8688,10 +8807,12 @@ Animator: m_UpdateMode: 0 m_ApplyRootMotion: 0 m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorControllerStateOnDisable: 0 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 --- !u!114 &710941356 MonoBehaviour: m_ObjectHideFlags: 0 @@ -8826,6 +8947,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 46419465} m_RootOrder: 2 @@ -8900,6 +9022,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 656396413} - {fileID: 1710259418} @@ -8992,6 +9115,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1117662680} m_RootOrder: 1 @@ -9138,22 +9262,23 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_TrackedObjects: - - id: 0 + - rid: 0 references: - version: 1 - 00000000: + version: 2 + RefIds: + - rid: 0 type: {class: TrackedMonoBehaviourObject, ns: UnityEngine.Localization.PropertyVariants.TrackedObjects, asm: Unity.Localization} data: m_Target: {fileID: 723232615} m_TrackedProperties: items: - - id: 1 + - rid: 1 m_UpdateType: 0 m_Changed: m_PersistentCalls: m_Calls: [] - 00000001: + - rid: 1 type: {class: LocalizedStringProperty, ns: UnityEngine.Localization.PropertyVariants.TrackedProperties, asm: Unity.Localization} data: @@ -9196,6 +9321,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1117662680} m_RootOrder: 0 @@ -9340,6 +9466,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1117662680} m_RootOrder: 15 @@ -9484,6 +9611,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1097472927} m_RootOrder: 3 @@ -9603,6 +9731,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 546415786} m_RootOrder: 6 @@ -9678,6 +9807,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 583063816} m_RootOrder: 0 @@ -9753,6 +9883,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1532490924} m_Father: {fileID: 2022614171} @@ -9829,6 +9960,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 46419465} m_RootOrder: 3 @@ -9904,6 +10036,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 46419465} m_RootOrder: 4 @@ -9980,6 +10113,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 359219907} - {fileID: 221822376} @@ -10043,7 +10177,7 @@ MonoBehaviour: m_HideMobileInput: 0 m_CharacterValidation: 0 m_CharacterLimit: 24 - m_OnEndEdit: + m_OnSubmit: m_PersistentCalls: m_Calls: - m_Target: {fileID: 1073929001} @@ -10058,6 +10192,21 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 + m_OnDidEndEdit: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 810867329} + m_TargetAssemblyTypeName: InputFieldInset, Assembly-CSharp + m_MethodName: MapNameInputDeselected + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 m_OnValueChanged: m_PersistentCalls: m_Calls: [] @@ -10136,6 +10285,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1117662680} m_RootOrder: 14 @@ -10279,6 +10429,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 461123007} m_RootOrder: 4 @@ -10358,6 +10509,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2022614171} m_RootOrder: 0 @@ -10493,7 +10645,7 @@ MonoBehaviour: pivot: 0 --- !u!95 &857559770 Animator: - serializedVersion: 3 + serializedVersion: 5 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -10506,10 +10658,12 @@ Animator: m_UpdateMode: 0 m_ApplyRootMotion: 0 m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorControllerStateOnDisable: 0 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 --- !u!114 &857559771 MonoBehaviour: m_ObjectHideFlags: 0 @@ -10523,22 +10677,23 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_TrackedObjects: - - id: 0 + - rid: 0 references: - version: 1 - 00000000: + version: 2 + RefIds: + - rid: 0 type: {class: TrackedMonoBehaviourObject, ns: UnityEngine.Localization.PropertyVariants.TrackedObjects, asm: Unity.Localization} data: m_Target: {fileID: 857559769} m_TrackedProperties: items: - - id: 1 + - rid: 1 m_UpdateType: 0 m_Changed: m_PersistentCalls: m_Calls: [] - 00000001: + - rid: 1 type: {class: LocalizedStringProperty, ns: UnityEngine.Localization.PropertyVariants.TrackedProperties, asm: Unity.Localization} data: @@ -10580,6 +10735,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 21314365} m_RootOrder: 0 @@ -10657,6 +10813,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1458232609} m_Father: {fileID: 1125096442} @@ -10696,6 +10853,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 98732516} - {fileID: 1426870985} @@ -10807,6 +10965,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1610396825} m_RootOrder: 1 @@ -10885,6 +11044,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 423043110} m_RootOrder: 1 @@ -11031,22 +11191,23 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_TrackedObjects: - - id: 0 + - rid: 0 references: - version: 1 - 00000000: + version: 2 + RefIds: + - rid: 0 type: {class: TrackedMonoBehaviourObject, ns: UnityEngine.Localization.PropertyVariants.TrackedObjects, asm: Unity.Localization} data: m_Target: {fileID: 882245800} m_TrackedProperties: items: - - id: 1 + - rid: 1 m_UpdateType: 0 m_Changed: m_PersistentCalls: m_Calls: [] - 00000001: + - rid: 1 type: {class: LocalizedStringProperty, ns: UnityEngine.Localization.PropertyVariants.TrackedProperties, asm: Unity.Localization} data: @@ -11089,6 +11250,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1117662680} m_RootOrder: 7 @@ -11232,6 +11394,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 583063816} m_RootOrder: 3 @@ -11307,6 +11470,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 583063816} m_RootOrder: 2 @@ -11386,6 +11550,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1610396825} m_RootOrder: 2 @@ -11466,6 +11631,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 423043110} - {fileID: 1117662680} @@ -11568,6 +11734,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 208470215} m_RootOrder: 0 @@ -11643,6 +11810,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 32462372} m_RootOrder: 1 @@ -11723,6 +11891,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1258012560} m_RootOrder: 3 @@ -11865,9 +12034,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 951189566} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 2 + serializedVersion: 3 m_Size: {x: 1, y: 1, z: 1} m_Center: {x: 0, y: 0, z: 0} --- !u!23 &951189568 @@ -11881,6 +12058,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -11929,6 +12107,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 5.5, y: 5.5, z: 0} m_LocalScale: {x: 13, y: 13, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 8 @@ -11961,6 +12140,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 423043110} m_RootOrder: 4 @@ -12036,6 +12216,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 389345989} m_RootOrder: 2 @@ -12111,6 +12292,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 285889925} m_RootOrder: 5 @@ -12184,6 +12366,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1797938291} m_Father: {fileID: 1267848534} @@ -12222,6 +12405,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 292254065} m_RootOrder: 2 @@ -12297,6 +12481,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1252051942} m_RootOrder: 0 @@ -12372,6 +12557,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 461123007} m_RootOrder: 2 @@ -12449,6 +12635,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1063762956} m_Father: {fileID: 23044018} @@ -12586,6 +12773,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1591695605} m_RootOrder: 0 @@ -12663,6 +12851,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 441926529} m_Father: {fileID: 1026806516} @@ -12701,6 +12890,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1591333834} m_RootOrder: 0 @@ -12716,6 +12906,7 @@ TilemapRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -13027,6 +13218,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 7 @@ -13059,6 +13251,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 321315031} m_RootOrder: 2 @@ -13139,6 +13332,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1357826956} - {fileID: 212839058} @@ -13229,6 +13423,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1299832626} - {fileID: 643703364} @@ -13306,6 +13501,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 731792849} - {fileID: 723232611} @@ -13359,6 +13555,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1314247929} m_RootOrder: 8 @@ -13406,6 +13603,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 871929552} m_Father: {fileID: 46419465} @@ -13541,6 +13739,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 21314365} - {fileID: 387638532} @@ -13586,6 +13785,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0.38268343, w: 0.92387956} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 223052000} m_RootOrder: 0 @@ -13717,6 +13917,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1252051942} m_RootOrder: 1 @@ -13792,6 +13993,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2023273646} m_RootOrder: 0 @@ -13871,6 +14073,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 245574326} m_RootOrder: 4 @@ -13946,6 +14149,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 546415786} m_RootOrder: 16 @@ -14021,6 +14225,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 285889925} m_RootOrder: 4 @@ -14096,6 +14301,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 365396096} m_RootOrder: 5 @@ -14172,6 +14378,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1097472927} m_RootOrder: 2 @@ -14293,6 +14500,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 405442172} m_Father: {fileID: 292254065} @@ -14429,6 +14637,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 994038627} - {fileID: 1151884094} @@ -14516,6 +14725,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1775097592} - {fileID: 1921349114} @@ -14561,6 +14771,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0.38268343, w: 0.92387956} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2067889251} m_RootOrder: 0 @@ -14694,6 +14905,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2022614171} m_RootOrder: 3 @@ -14845,6 +15057,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 973681868} m_Father: {fileID: 245574326} @@ -14982,6 +15195,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 695394996} m_RootOrder: 2 @@ -15058,6 +15272,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1626242389} - {fileID: 1351726460} @@ -15121,7 +15336,7 @@ MonoBehaviour: m_HideMobileInput: 0 m_CharacterValidation: 0 m_CharacterLimit: 14 - m_OnEndEdit: + m_OnSubmit: m_PersistentCalls: m_Calls: - m_Target: {fileID: 1073929001} @@ -15136,6 +15351,9 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 + m_OnDidEndEdit: + m_PersistentCalls: + m_Calls: [] m_OnValueChanged: m_PersistentCalls: m_Calls: [] @@ -15213,6 +15431,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 285889925} m_RootOrder: 2 @@ -15288,6 +15507,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1591695605} m_RootOrder: 2 @@ -15411,7 +15631,9 @@ Canvas: m_OverrideSorting: 0 m_OverridePixelPerfect: 0 m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 0 m_AdditionalShaderChannelsFlag: 0 + m_UpdateRectTransformForStandalone: 0 m_SortingLayerID: 0 m_SortingOrder: 0 m_TargetDisplay: 0 @@ -15425,6 +15647,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0, y: 0, z: 0} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 2079794359} - {fileID: 628789791} @@ -15472,6 +15695,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 202744929} m_Father: {fileID: 1978816215} @@ -15609,9 +15833,17 @@ Camera: m_projectionMatrixMode: 1 m_GateFitMode: 2 m_FOVAxisMode: 0 + m_Iso: 200 + m_ShutterSpeed: 0.005 + m_Aperture: 16 + m_FocusDistance: 10 + m_FocalLength: 50 + m_BladeCount: 5 + m_Curvature: {x: 2, y: 11} + m_BarrelClipping: 0.25 + m_Anamorphism: 0 m_SensorSize: {x: 36, y: 24} m_LensShift: {x: 0, y: 0} - m_FocalLength: 50 m_NormalizedViewPortRect: serializedVersion: 2 x: 0 @@ -15648,6 +15880,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 5.5, y: 5.5, z: -10} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0 @@ -15681,6 +15914,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1367883868} m_Father: {fileID: 461123007} @@ -15806,6 +16040,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1299832626} m_RootOrder: 1 @@ -15886,6 +16121,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1085739499} m_RootOrder: 0 @@ -15950,19 +16186,20 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_TrackedObjects: - - id: 0 + - rid: 0 references: - version: 1 - 00000000: + version: 2 + RefIds: + - rid: 0 type: {class: TrackedUGuiGraphic, ns: UnityEngine.Localization.PropertyVariants.TrackedObjects, asm: Unity.Localization} data: m_Target: {fileID: 1357826957} m_TrackedProperties: items: - - id: 1 + - rid: 1 m_UpdateType: 0 - 00000001: + - rid: 1 type: {class: LocalizedStringProperty, ns: UnityEngine.Localization.PropertyVariants.TrackedProperties, asm: Unity.Localization} data: @@ -16002,6 +16239,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 123678967} m_Father: {fileID: 1337572406} @@ -16040,6 +16278,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1117662680} m_RootOrder: 4 @@ -16116,6 +16355,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1117662680} m_RootOrder: 6 @@ -16260,6 +16500,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1117662680} m_RootOrder: 12 @@ -16406,6 +16647,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1258012560} m_RootOrder: 4 @@ -16552,22 +16794,23 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_TrackedObjects: - - id: 0 + - rid: 0 references: - version: 1 - 00000000: + version: 2 + RefIds: + - rid: 0 type: {class: TrackedMonoBehaviourObject, ns: UnityEngine.Localization.PropertyVariants.TrackedObjects, asm: Unity.Localization} data: m_Target: {fileID: 1386566183} m_TrackedProperties: items: - - id: 1 + - rid: 1 m_UpdateType: 0 m_Changed: m_PersistentCalls: m_Calls: [] - 00000001: + - rid: 1 type: {class: LocalizedStringProperty, ns: UnityEngine.Localization.PropertyVariants.TrackedProperties, asm: Unity.Localization} data: @@ -16610,6 +16853,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1415819424} m_RootOrder: 0 @@ -16674,19 +16918,20 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_TrackedObjects: - - id: 0 + - rid: 0 references: - version: 1 - 00000000: + version: 2 + RefIds: + - rid: 0 type: {class: TrackedUGuiGraphic, ns: UnityEngine.Localization.PropertyVariants.TrackedObjects, asm: Unity.Localization} data: m_Target: {fileID: 1411502999} m_TrackedProperties: items: - - id: 1 + - rid: 1 m_UpdateType: 0 - 00000001: + - rid: 1 type: {class: LocalizedStringProperty, ns: UnityEngine.Localization.PropertyVariants.TrackedProperties, asm: Unity.Localization} data: @@ -16729,6 +16974,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1411502998} - {fileID: 1518944963} @@ -16792,7 +17038,7 @@ MonoBehaviour: m_HideMobileInput: 0 m_CharacterValidation: 0 m_CharacterLimit: 24 - m_OnEndEdit: + m_OnSubmit: m_PersistentCalls: m_Calls: - m_Target: {fileID: 1073929001} @@ -16807,6 +17053,21 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 + m_OnDidEndEdit: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1415819425} + m_TargetAssemblyTypeName: InputFieldInset, Assembly-CSharp + m_MethodName: MapNameInputDeselected + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 m_OnValueChanged: m_PersistentCalls: m_Calls: [] @@ -16884,6 +17145,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1258012560} m_RootOrder: 2 @@ -16963,6 +17225,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 321315031} m_RootOrder: 1 @@ -17040,6 +17303,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 55681741} m_Father: {fileID: 872817766} @@ -17176,6 +17440,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 180467768} m_Father: {fileID: 569660068} @@ -17226,6 +17491,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 871929552} m_RootOrder: 0 @@ -17301,6 +17567,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 285889925} m_RootOrder: 6 @@ -17377,6 +17644,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 32462372} m_RootOrder: 0 @@ -17441,19 +17709,20 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_TrackedObjects: - - id: 0 + - rid: 0 references: - version: 1 - 00000000: + version: 2 + RefIds: + - rid: 0 type: {class: TrackedUGuiGraphic, ns: UnityEngine.Localization.PropertyVariants.TrackedObjects, asm: Unity.Localization} data: m_Target: {fileID: 1468324232} m_TrackedProperties: items: - - id: 1 + - rid: 1 m_UpdateType: 0 - 00000001: + - rid: 1 type: {class: LocalizedStringProperty, ns: UnityEngine.Localization.PropertyVariants.TrackedProperties, asm: Unity.Localization} data: @@ -17495,6 +17764,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 365396096} m_RootOrder: 2 @@ -17570,6 +17840,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1415819424} m_RootOrder: 1 @@ -17650,6 +17921,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1117662680} m_RootOrder: 16 @@ -17794,6 +18066,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0.38268343, w: 0.92387956} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 788797108} m_RootOrder: 0 @@ -17926,6 +18199,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1117662680} m_RootOrder: 9 @@ -18069,6 +18343,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1698377310} m_RootOrder: 3 @@ -18145,6 +18420,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0.38268343, w: 0.92387956} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 635933923} m_RootOrder: 0 @@ -18276,6 +18552,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 180467768} m_RootOrder: 1 @@ -18352,6 +18629,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1661169137} - {fileID: 1921498733} @@ -18415,7 +18693,7 @@ MonoBehaviour: m_HideMobileInput: 0 m_CharacterValidation: 0 m_CharacterLimit: 24 - m_OnEndEdit: + m_OnSubmit: m_PersistentCalls: m_Calls: - m_Target: {fileID: 1073929001} @@ -18430,6 +18708,21 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 + m_OnDidEndEdit: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1558772166} + m_TargetAssemblyTypeName: InputFieldInset, Assembly-CSharp + m_MethodName: MapNameInputDeselected + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 m_OnValueChanged: m_PersistentCalls: m_Calls: [] @@ -18507,6 +18800,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 285889925} m_RootOrder: 7 @@ -18582,6 +18876,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 245574326} m_RootOrder: 2 @@ -18657,6 +18952,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 718947820} m_RootOrder: 2 @@ -18747,6 +19043,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0.5, y: 0.5, z: 1} m_LocalScale: {x: 11.111111, y: 11.111111, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1067972569} m_Father: {fileID: 0} @@ -18781,6 +19078,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1037776179} - {fileID: 46419465} @@ -18941,6 +19239,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1733042077} m_Father: {fileID: 292254065} @@ -19030,6 +19329,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 461123007} m_RootOrder: 3 @@ -19104,6 +19404,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 672401807} - {fileID: 875491416} @@ -19156,6 +19457,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 321315031} m_Father: {fileID: 101421915} @@ -19207,6 +19509,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1258012560} m_RootOrder: 5 @@ -19351,6 +19654,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1299832626} m_RootOrder: 0 @@ -19415,19 +19719,20 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_TrackedObjects: - - id: 0 + - rid: 0 references: - version: 1 - 00000000: + version: 2 + RefIds: + - rid: 0 type: {class: TrackedUGuiGraphic, ns: UnityEngine.Localization.PropertyVariants.TrackedObjects, asm: Unity.Localization} data: m_Target: {fileID: 1626242390} m_TrackedProperties: items: - - id: 1 + - rid: 1 m_UpdateType: 0 - 00000001: + - rid: 1 type: {class: LocalizedStringProperty, ns: UnityEngine.Localization.PropertyVariants.TrackedProperties, asm: Unity.Localization} data: @@ -19470,6 +19775,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 42185029} m_Father: {fileID: 365396096} @@ -19559,6 +19865,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 321315031} m_RootOrder: 0 @@ -19635,6 +19942,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1558772165} m_RootOrder: 0 @@ -19651,7 +19959,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1661169136} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} m_Name: @@ -19699,19 +20007,20 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_TrackedObjects: - - id: 0 + - rid: 0 references: - version: 1 - 00000000: + version: 2 + RefIds: + - rid: 0 type: {class: TrackedUGuiGraphic, ns: UnityEngine.Localization.PropertyVariants.TrackedObjects, asm: Unity.Localization} data: m_Target: {fileID: 1661169138} m_TrackedProperties: items: - - id: 1 + - rid: 1 m_UpdateType: 0 - 00000001: + - rid: 1 type: {class: LocalizedStringProperty, ns: UnityEngine.Localization.PropertyVariants.TrackedProperties, asm: Unity.Localization} data: @@ -19753,6 +20062,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 23044018} m_RootOrder: 5 @@ -19831,6 +20141,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2022614171} m_RootOrder: 4 @@ -19936,7 +20247,7 @@ CanvasRenderer: m_CullTransparentMesh: 0 --- !u!95 &1678934690 Animator: - serializedVersion: 3 + serializedVersion: 5 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -19949,10 +20260,12 @@ Animator: m_UpdateMode: 0 m_ApplyRootMotion: 0 m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorControllerStateOnDisable: 0 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 --- !u!114 &1678934691 MonoBehaviour: m_ObjectHideFlags: 0 @@ -19997,6 +20310,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 94303001} m_Father: {fileID: 303667355} @@ -20034,6 +20348,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 379493353} - {fileID: 183552730} @@ -20124,6 +20439,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 423043110} m_RootOrder: 6 @@ -20267,6 +20583,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 718947820} m_RootOrder: 1 @@ -20342,6 +20659,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 180467768} m_RootOrder: 2 @@ -20421,6 +20739,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 179161244} m_RootOrder: 2 @@ -20495,6 +20814,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1252051942} m_Father: {fileID: 1599849848} @@ -20545,6 +20865,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 285889925} m_RootOrder: 0 @@ -20621,6 +20942,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 546415786} m_RootOrder: 8 @@ -20752,6 +21074,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 245574326} m_RootOrder: 3 @@ -20828,6 +21151,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 597819660} - {fileID: 42072949} @@ -20918,6 +21242,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1258012560} m_RootOrder: 0 @@ -20993,6 +21318,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 55681741} m_RootOrder: 0 @@ -21068,6 +21394,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 973681868} m_RootOrder: 0 @@ -21143,6 +21470,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -21193,6 +21521,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 2 @@ -21226,6 +21555,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 546415786} m_RootOrder: 0 @@ -21369,6 +21699,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 522417288} m_RootOrder: 0 @@ -21447,6 +21778,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1126013225} m_RootOrder: 2 @@ -21593,22 +21925,23 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_TrackedObjects: - - id: 0 + - rid: 0 references: - version: 1 - 00000000: + version: 2 + RefIds: + - rid: 0 type: {class: TrackedMonoBehaviourObject, ns: UnityEngine.Localization.PropertyVariants.TrackedObjects, asm: Unity.Localization} data: m_Target: {fileID: 1826586379} m_TrackedProperties: items: - - id: 1 + - rid: 1 m_UpdateType: 0 m_Changed: m_PersistentCalls: m_Calls: [] - 00000001: + - rid: 1 type: {class: LocalizedStringProperty, ns: UnityEngine.Localization.PropertyVariants.TrackedProperties, asm: Unity.Localization} data: @@ -21651,6 +21984,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1117662680} m_RootOrder: 13 @@ -21794,6 +22128,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1252051942} m_RootOrder: 3 @@ -21869,6 +22204,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 872817766} m_RootOrder: 2 @@ -21944,6 +22280,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 546415786} m_RootOrder: 14 @@ -22020,6 +22357,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 423043110} m_RootOrder: 0 @@ -22166,6 +22504,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 546415786} m_RootOrder: 1 @@ -22312,22 +22651,23 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_TrackedObjects: - - id: 0 + - rid: 0 references: - version: 1 - 00000000: + version: 2 + RefIds: + - rid: 0 type: {class: TrackedMonoBehaviourObject, ns: UnityEngine.Localization.PropertyVariants.TrackedObjects, asm: Unity.Localization} data: m_Target: {fileID: 1909207577} m_TrackedProperties: items: - - id: 1 + - rid: 1 m_UpdateType: 0 m_Changed: m_PersistentCalls: m_Calls: [] - 00000001: + - rid: 1 type: {class: LocalizedStringProperty, ns: UnityEngine.Localization.PropertyVariants.TrackedProperties, asm: Unity.Localization} data: @@ -22369,6 +22709,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1258012560} m_RootOrder: 1 @@ -22444,6 +22785,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1558772165} m_RootOrder: 1 @@ -22523,6 +22865,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 365396096} m_RootOrder: 3 @@ -22598,6 +22941,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 546415786} m_RootOrder: 13 @@ -22674,6 +23018,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1758314572} - {fileID: 1323915154} @@ -22785,6 +23130,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 546415786} m_RootOrder: 2 @@ -22930,6 +23276,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3} m_Name: m_EditorClassIdentifier: + m_SendPointerHoverToParent: 1 m_HorizontalAxis: Horizontal m_VerticalAxis: Vertical m_SubmitButton: Submit @@ -22962,6 +23309,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 4 @@ -22995,6 +23343,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 423043110} m_RootOrder: 7 @@ -23138,6 +23487,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 583063816} m_RootOrder: 1 @@ -23213,6 +23563,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 402214860} m_RootOrder: 0 @@ -23292,6 +23643,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1978816215} m_RootOrder: 4 @@ -23367,6 +23719,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 180467768} m_RootOrder: 3 @@ -23440,6 +23793,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 857559765} - {fileID: 656562809} @@ -23491,6 +23845,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1165983218} - {fileID: 292254065} @@ -23650,6 +24005,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 872817766} m_RootOrder: 5 @@ -23725,6 +24081,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 321315031} m_RootOrder: 3 @@ -23800,6 +24157,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1261721477} m_Father: {fileID: 2022614171} @@ -23876,6 +24234,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 285889925} m_RootOrder: 3 @@ -23951,6 +24310,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1314247929} m_RootOrder: 0 @@ -24026,6 +24386,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 405442172} m_RootOrder: 0 @@ -24101,6 +24462,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1978816215} m_RootOrder: 3 @@ -24177,6 +24539,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 640365313} m_Father: {fileID: 23044018} @@ -24273,6 +24636,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1314247929} m_RootOrder: 3 @@ -24287,6 +24651,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1314247929} m_Modifications: - target: {fileID: 1167235146622771690, guid: d1ad3c89387d28e488ea573cdf2b5245, @@ -24405,12 +24770,16 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: d1ad3c89387d28e488ea573cdf2b5245, type: 3} --- !u!1001 &7497914684433071669 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1314247929} m_Modifications: - target: {fileID: 4947973752511735336, guid: a97aafa8dc7aae24993ae294c8359b43, @@ -24529,6 +24898,13 @@ PrefabInstance: value: TimeoutPanel objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 3942173205810548199, guid: a97aafa8dc7aae24993ae294c8359b43, + type: 3} + insertIndex: -1 + addedObject: {fileID: 7497914684433071672} m_SourcePrefab: {fileID: 100100000, guid: a97aafa8dc7aae24993ae294c8359b43, type: 3} --- !u!1 &7497914684433071670 stripped GameObject: @@ -24561,19 +24937,20 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_TrackedObjects: - - id: 0 + - rid: 0 references: - version: 1 - 00000000: + version: 2 + RefIds: + - rid: 0 type: {class: TrackedUGuiGraphic, ns: UnityEngine.Localization.PropertyVariants.TrackedObjects, asm: Unity.Localization} data: m_Target: {fileID: 7497914684433071671} m_TrackedProperties: items: - - id: 1 + - rid: 1 m_UpdateType: 0 - 00000001: + - rid: 1 type: {class: LocalizedStringProperty, ns: UnityEngine.Localization.PropertyVariants.TrackedProperties, asm: Unity.Localization} data: diff --git a/Assets/Scenes/First.unity b/Assets/Scenes/First.unity index 733ac03..06c5504 100644 --- a/Assets/Scenes/First.unity +++ b/Assets/Scenes/First.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.37311953, g: 0.38074014, b: 0.3587274, a: 1} + m_IndirectSpecularColor: {r: 0.37311924, g: 0.38073963, b: 0.3587269, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -104,7 +104,7 @@ NavMeshSettings: serializedVersion: 2 m_ObjectHideFlags: 0 m_BuildSettings: - serializedVersion: 2 + serializedVersion: 3 agentTypeID: 0 agentRadius: 0.5 agentHeight: 2 @@ -117,7 +117,7 @@ NavMeshSettings: cellSize: 0.16666667 manualTileSize: 0 tileSize: 256 - accuratePlacement: 0 + buildHeightMesh: 0 maxJobWorkers: 0 preserveTilesOutsideBounds: 0 debug: @@ -190,6 +190,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6823232689196254119} m_RootOrder: 8 @@ -217,6 +218,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6823232689196254119} m_RootOrder: 7 @@ -304,6 +306,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6823232689196254119} m_RootOrder: 2 @@ -315,7 +318,7 @@ RectTransform: m_Pivot: {x: 0.5, y: 0.5} --- !u!95 &443492058 Animator: - serializedVersion: 3 + serializedVersion: 5 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -328,10 +331,12 @@ Animator: m_UpdateMode: 0 m_ApplyRootMotion: 0 m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorControllerStateOnDisable: 0 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 --- !u!114 &443492059 MonoBehaviour: m_ObjectHideFlags: 0 @@ -410,9 +415,17 @@ Camera: m_projectionMatrixMode: 1 m_GateFitMode: 2 m_FOVAxisMode: 0 + m_Iso: 200 + m_ShutterSpeed: 0.005 + m_Aperture: 16 + m_FocusDistance: 10 + m_FocalLength: 50 + m_BladeCount: 5 + m_Curvature: {x: 2, y: 11} + m_BarrelClipping: 0.25 + m_Anamorphism: 0 m_SensorSize: {x: 36, y: 24} m_LensShift: {x: 0, y: 0} - m_FocalLength: 50 m_NormalizedViewPortRect: serializedVersion: 2 x: 0 @@ -449,6 +462,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 1, z: -10} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0 @@ -492,13 +506,14 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!95 &1028719965 Animator: - serializedVersion: 3 + serializedVersion: 5 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -511,10 +526,12 @@ Animator: m_UpdateMode: 0 m_ApplyRootMotion: 0 m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorControllerStateOnDisable: 0 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 --- !u!1 &1030269623 GameObject: m_ObjectHideFlags: 0 @@ -561,6 +578,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 5 @@ -595,6 +613,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3} m_Name: m_EditorClassIdentifier: + m_SendPointerHoverToParent: 1 m_HorizontalAxis: Horizontal m_VerticalAxis: Vertical m_SubmitButton: Submit @@ -627,6 +646,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 2 @@ -698,6 +718,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6823232689196254119} m_RootOrder: 6 @@ -712,6 +733,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 7063427215363646516, guid: 1db10a05a0fc004418a1b36bde2c72b0, @@ -775,6 +797,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 1db10a05a0fc004418a1b36bde2c72b0, type: 3} --- !u!1 &1430036976 GameObject: @@ -852,7 +877,9 @@ Canvas: m_OverrideSorting: 0 m_OverridePixelPerfect: 0 m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 0 m_AdditionalShaderChannelsFlag: 0 + m_UpdateRectTransformForStandalone: 0 m_SortingLayerID: 0 m_SortingOrder: 0 m_TargetDisplay: 0 @@ -866,6 +893,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0, y: 0, z: 0} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 6823232689196254119} m_Father: {fileID: 0} @@ -905,6 +933,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6823232689196254119} m_RootOrder: 4 @@ -1049,6 +1078,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6823232689196254119} m_RootOrder: 1 @@ -1116,19 +1146,20 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_TrackedObjects: - - id: 0 + - rid: 0 references: - version: 1 - 00000000: + version: 2 + RefIds: + - rid: 0 type: {class: TrackedUGuiGraphic, ns: UnityEngine.Localization.PropertyVariants.TrackedObjects, asm: Unity.Localization} data: m_Target: {fileID: 1689217153} m_TrackedProperties: items: - - id: 1 + - rid: 1 m_UpdateType: 0 - 00000001: + - rid: 1 type: {class: LocalizedStringProperty, ns: UnityEngine.Localization.PropertyVariants.TrackedProperties, asm: Unity.Localization} data: @@ -1147,6 +1178,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 6823232689196254119} m_Modifications: - target: {fileID: 8027793273716369192, guid: cfea33f06b7946349bd3c9939300d7c0, @@ -1319,6 +1351,11 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 612 objectReference: {fileID: 0} + - target: {fileID: 8027793275362155129, guid: cfea33f06b7946349bd3c9939300d7c0, + type: 3} + propertyPath: m_Options.m_Options.Array.data[1].m_Text + value: "\uD55C\uAD6D\uC5B4" + objectReference: {fileID: 0} - target: {fileID: 8027793275362155129, guid: cfea33f06b7946349bd3c9939300d7c0, type: 3} propertyPath: m_OnValueChanged.m_PersistentCalls.m_Calls.Array.data[0].m_Target @@ -1330,6 +1367,9 @@ PrefabInstance: value: ChangeLanguage objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: cfea33f06b7946349bd3c9939300d7c0, type: 3} --- !u!114 &1699306616 stripped MonoBehaviour: @@ -1434,6 +1474,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6823232689196254119} m_RootOrder: 5 @@ -1543,19 +1584,20 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_TrackedObjects: - - id: 0 + - rid: 0 references: - version: 1 - 00000000: + version: 2 + RefIds: + - rid: 0 type: {class: TrackedUGuiGraphic, ns: UnityEngine.Localization.PropertyVariants.TrackedObjects, asm: Unity.Localization} data: m_Target: {fileID: 3825228075727097871} m_TrackedProperties: items: - - id: 1 + - rid: 1 m_UpdateType: 0 - 00000001: + - rid: 1 type: {class: LocalizedStringProperty, ns: UnityEngine.Localization.PropertyVariants.TrackedProperties, asm: Unity.Localization} data: @@ -1613,6 +1655,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6823232689196254119} m_RootOrder: 3 @@ -1640,6 +1683,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6823232689196254119} m_RootOrder: 0 @@ -1725,6 +1769,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 6024136765182082464} - {fileID: 1689217152} diff --git a/Assets/Scenes/Setting.unity b/Assets/Scenes/Setting.unity index bb4519f..bedf7e6 100644 --- a/Assets/Scenes/Setting.unity +++ b/Assets/Scenes/Setting.unity @@ -104,7 +104,7 @@ NavMeshSettings: serializedVersion: 2 m_ObjectHideFlags: 0 m_BuildSettings: - serializedVersion: 2 + serializedVersion: 3 agentTypeID: 0 agentRadius: 0.5 agentHeight: 2 @@ -117,7 +117,7 @@ NavMeshSettings: cellSize: 0.16666667 manualTileSize: 0 tileSize: 256 - accuratePlacement: 0 + buildHeightMesh: 0 maxJobWorkers: 0 preserveTilesOutsideBounds: 0 debug: @@ -149,6 +149,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1468535896} m_Father: {fileID: 1241311265} @@ -193,6 +194,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1851810289} m_RootOrder: 0 @@ -240,6 +242,133 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 32249369} m_CullTransparentMesh: 1 +--- !u!1 &120813799 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 120813800} + - component: {fileID: 120813803} + - component: {fileID: 120813802} + - component: {fileID: 120813801} + m_Layer: 5 + m_Name: Scrollbar Vertical + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &120813800 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 120813799} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 416488890} + m_Father: {fileID: 1533663398} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 24, y: 0} + m_Pivot: {x: 1, y: 1} +--- !u!114 &120813801 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 120813799} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2a4db7a114972834c8e4117be1d82ba3, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 2117830346} + m_HandleRect: {fileID: 2117830345} + m_Direction: 2 + m_Value: 1 + m_Size: 0.20833333 + m_NumberOfSteps: 11 + m_OnValueChanged: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &120813802 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 120813799} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.7529412, g: 0.7529412, b: 0.7529412, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &120813803 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 120813799} + m_CullTransparentMesh: 1 --- !u!1 &179655816 GameObject: m_ObjectHideFlags: 0 @@ -268,6 +397,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 864389508} m_RootOrder: 1 @@ -344,6 +474,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 901823071} m_RootOrder: 0 @@ -419,6 +550,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 835632350} m_RootOrder: 0 @@ -495,6 +627,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 864389508} m_RootOrder: 4 @@ -559,19 +692,20 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_TrackedObjects: - - id: 0 + - rid: 0 references: - version: 1 - 00000000: + version: 2 + RefIds: + - rid: 0 type: {class: TrackedUGuiGraphic, ns: UnityEngine.Localization.PropertyVariants.TrackedObjects, asm: Unity.Localization} data: m_Target: {fileID: 370763372} m_TrackedProperties: items: - - id: 1 + - rid: 1 m_UpdateType: 0 - 00000001: + - rid: 1 type: {class: LocalizedStringProperty, ns: UnityEngine.Localization.PropertyVariants.TrackedProperties, asm: Unity.Localization} data: @@ -585,6 +719,43 @@ MonoBehaviour: m_WaitForCompletion: 0 m_LocalVariables: [] m_PropertyPath: m_Text +--- !u!1 &416488889 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 416488890} + m_Layer: 5 + m_Name: Sliding Area + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &416488890 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 416488889} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 2117830345} + m_Father: {fileID: 120813800} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: -24, y: -24} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &449985603 GameObject: m_ObjectHideFlags: 0 @@ -614,6 +785,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 864389508} m_RootOrder: 7 @@ -652,11 +824,10 @@ MonoBehaviour: m_ColorMultiplier: 1 m_FadeDuration: 0.1 m_SpriteState: - m_HighlightedSprite: {fileID: 21300000, guid: 77be56ab0926a3b4a82b6d1d12f0d4b0, - type: 3} - m_PressedSprite: {fileID: 21300000, guid: c74c01dd1efed854b952f0b62e94b923, type: 3} - m_SelectedSprite: {fileID: 21300000, guid: 77be56ab0926a3b4a82b6d1d12f0d4b0, type: 3} - m_DisabledSprite: {fileID: 21300000, guid: c74c01dd1efed854b952f0b62e94b923, type: 3} + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 21300000, guid: b3ba0b972b4cd3a4399c55bef6c4b766, type: 3} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 21300000, guid: b3ba0b972b4cd3a4399c55bef6c4b766, type: 3} m_AnimationTriggers: m_NormalTrigger: Normal m_HighlightedTrigger: Highlighted @@ -705,14 +876,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 0.7607843} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 77be56ab0926a3b4a82b6d1d12f0d4b0, type: 3} + m_Sprite: {fileID: 21300000, guid: 288348819de2f7d47bf1d815f8f5505b, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -760,6 +931,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3} m_Name: m_EditorClassIdentifier: + m_SendPointerHoverToParent: 1 m_HorizontalAxis: Horizontal m_VerticalAxis: Vertical m_SubmitButton: Submit @@ -792,6 +964,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 2 @@ -844,10 +1017,9 @@ MonoBehaviour: m_ColorMultiplier: 1 m_FadeDuration: 0.1 m_SpriteState: - m_HighlightedSprite: {fileID: 21300000, guid: e1e642dfcdb6e7546838ab35253039e9, - type: 3} + m_HighlightedSprite: {fileID: 0} m_PressedSprite: {fileID: 21300000, guid: 5fd3c33c3f2c7c343b62c5cde91abf36, type: 3} - m_SelectedSprite: {fileID: 21300000, guid: 5fd3c33c3f2c7c343b62c5cde91abf36, type: 3} + m_SelectedSprite: {fileID: 0} m_DisabledSprite: {fileID: 21300000, guid: 5fd3c33c3f2c7c343b62c5cde91abf36, type: 3} m_AnimationTriggers: m_NormalTrigger: Normal @@ -897,7 +1069,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 0.7607843} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -932,6 +1104,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 864389508} m_RootOrder: 6 @@ -969,6 +1142,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 864389508} m_RootOrder: 2 @@ -1046,6 +1220,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1301359097} m_RootOrder: 0 @@ -1110,19 +1285,20 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_TrackedObjects: - - id: 0 + - rid: 0 references: - version: 1 - 00000000: + version: 2 + RefIds: + - rid: 0 type: {class: TrackedUGuiGraphic, ns: UnityEngine.Localization.PropertyVariants.TrackedObjects, asm: Unity.Localization} data: m_Target: {fileID: 699200446} m_TrackedProperties: items: - - id: 1 + - rid: 1 m_UpdateType: 0 - 00000001: + - rid: 1 type: {class: LocalizedStringProperty, ns: UnityEngine.Localization.PropertyVariants.TrackedProperties, asm: Unity.Localization} data: @@ -1165,6 +1341,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1311274128} m_RootOrder: 0 @@ -1229,19 +1406,20 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_TrackedObjects: - - id: 0 + - rid: 0 references: - version: 1 - 00000000: + version: 2 + RefIds: + - rid: 0 type: {class: TrackedUGuiGraphic, ns: UnityEngine.Localization.PropertyVariants.TrackedObjects, asm: Unity.Localization} data: m_Target: {fileID: 744133978} m_TrackedProperties: items: - - id: 1 + - rid: 1 m_UpdateType: 0 - 00000001: + - rid: 1 type: {class: LocalizedStringProperty, ns: UnityEngine.Localization.PropertyVariants.TrackedProperties, asm: Unity.Localization} data: @@ -1282,6 +1460,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 324057794} - {fileID: 1851810289} @@ -1386,6 +1565,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1301359097} m_RootOrder: 3 @@ -1452,19 +1632,20 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_TrackedObjects: - - id: 0 + - rid: 0 references: - version: 1 - 00000000: + version: 2 + RefIds: + - rid: 0 type: {class: TrackedUGuiGraphic, ns: UnityEngine.Localization.PropertyVariants.TrackedObjects, asm: Unity.Localization} data: m_Target: {fileID: 854861585} m_TrackedProperties: items: - - id: 1 + - rid: 1 m_UpdateType: 0 - 00000001: + - rid: 1 type: {class: LocalizedStringProperty, ns: UnityEngine.Localization.PropertyVariants.TrackedProperties, asm: Unity.Localization} data: @@ -1507,6 +1688,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1338421972} - {fileID: 179655817} @@ -1611,6 +1793,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 195721943} m_Father: {fileID: 835632350} @@ -1650,6 +1833,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1301359097} m_RootOrder: 1 @@ -1716,19 +1900,20 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_TrackedObjects: - - id: 0 + - rid: 0 references: - version: 1 - 00000000: + version: 2 + RefIds: + - rid: 0 type: {class: TrackedUGuiGraphic, ns: UnityEngine.Localization.PropertyVariants.TrackedObjects, asm: Unity.Localization} data: m_Target: {fileID: 1008351861} m_TrackedProperties: items: - - id: 1 + - rid: 1 m_UpdateType: 0 - 00000001: + - rid: 1 type: {class: LocalizedStringProperty, ns: UnityEngine.Localization.PropertyVariants.TrackedProperties, asm: Unity.Localization} data: @@ -1770,6 +1955,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1311274128} m_RootOrder: 1 @@ -1847,6 +2033,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0, y: 0, z: 0} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 864389508} - {fileID: 1311274128} @@ -1915,7 +2102,9 @@ Canvas: m_OverrideSorting: 0 m_OverridePixelPerfect: 0 m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 0 m_AdditionalShaderChannelsFlag: 0 + m_UpdateRectTransformForStandalone: 0 m_SortingLayerID: 0 m_SortingOrder: 0 m_TargetDisplay: 0 @@ -1948,10 +2137,16 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 8b86b8b3a09e5d248bdb792244cd32f2, type: 3} m_Name: m_EditorClassIdentifier: - CreditPanel: {fileID: 1311274127} - QuitButton: {fileID: 554592408} - CreditButton: {fileID: 449985605} - BackSettingButton: {fileID: 1275285963} + creditPanel: {fileID: 1311274127} + quitButton: {fileID: 554592408} + creditButton: {fileID: 449985605} + backSettingButton: {fileID: 1275285963} + creditScrollContent: {fileID: 2037968019} + creditDescription: {fileID: 1569646674} + creditTeamLogo: {fileID: 1547360983} + creditTitleImage: {fileID: 1857622978} + creditTitleEnglish: {fileID: 21300000, guid: 734a15a7b66c9e04f8ea4995b9588d97, type: 3} + creditTitleKorean: {fileID: 21300000, guid: 278b292da397b3047bda7adfa8e5dd76, type: 3} isCredit: 0 isOnce: 0 languageSetting: {fileID: 1513800223} @@ -1965,6 +2160,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 4 @@ -1997,6 +2193,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1850208636} - {fileID: 14735396} @@ -2127,6 +2324,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1311274128} m_RootOrder: 2 @@ -2204,6 +2402,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1311274128} m_RootOrder: 5 @@ -2242,10 +2441,9 @@ MonoBehaviour: m_ColorMultiplier: 1 m_FadeDuration: 0.1 m_SpriteState: - m_HighlightedSprite: {fileID: 21300000, guid: e1e642dfcdb6e7546838ab35253039e9, - type: 3} + m_HighlightedSprite: {fileID: 0} m_PressedSprite: {fileID: 21300000, guid: 5fd3c33c3f2c7c343b62c5cde91abf36, type: 3} - m_SelectedSprite: {fileID: 21300000, guid: 5fd3c33c3f2c7c343b62c5cde91abf36, type: 3} + m_SelectedSprite: {fileID: 0} m_DisabledSprite: {fileID: 21300000, guid: 5fd3c33c3f2c7c343b62c5cde91abf36, type: 3} m_AnimationTriggers: m_NormalTrigger: Normal @@ -2295,7 +2493,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 0.7607843} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -2346,6 +2544,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 699200445} - {fileID: 1008351860} @@ -2389,6 +2588,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 744133977} - {fileID: 1094856846} @@ -2396,7 +2596,7 @@ RectTransform: - {fileID: 1423821193} - {fileID: 1479276588} - {fileID: 1275285962} - - {fileID: 1569646674} + - {fileID: 1533663398} m_Father: {fileID: 1147814361} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -2407,7 +2607,7 @@ RectTransform: m_Pivot: {x: 0.5, y: 0.5} --- !u!95 &1311274129 Animator: - serializedVersion: 3 + serializedVersion: 5 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -2420,10 +2620,12 @@ Animator: m_UpdateMode: 0 m_ApplyRootMotion: 1 m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorControllerStateOnDisable: 0 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 --- !u!114 &1311274130 MonoBehaviour: m_ObjectHideFlags: 0 @@ -2490,6 +2692,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 864389508} m_RootOrder: 0 @@ -2566,6 +2769,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1311274128} m_RootOrder: 3 @@ -2642,6 +2846,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 14735396} m_RootOrder: 0 @@ -2717,6 +2922,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1311274128} m_RootOrder: 4 @@ -2777,6 +2983,282 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0d0b652f32a2cc243917e4028fa0f046, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &1533663397 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1533663398} + - component: {fileID: 1533663401} + - component: {fileID: 1533663400} + - component: {fileID: 1533663399} + m_Layer: 5 + m_Name: Scroll View + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1533663398 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1533663397} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1540827316} + - {fileID: 120813800} + m_Father: {fileID: 1311274128} + m_RootOrder: 6 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 0, y: -400} + m_SizeDelta: {x: 960, y: 1200} + m_Pivot: {x: 0.5, y: 1} +--- !u!114 &1533663399 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1533663397} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1aa08ab6e0800fa44ae55d278d1423e3, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Content: {fileID: 2037968019} + m_Horizontal: 0 + m_Vertical: 1 + m_MovementType: 2 + m_Elasticity: 0.1 + m_Inertia: 1 + m_DecelerationRate: 0.135 + m_ScrollSensitivity: 1 + m_Viewport: {fileID: 1540827316} + m_HorizontalScrollbar: {fileID: 0} + m_VerticalScrollbar: {fileID: 120813801} + m_HorizontalScrollbarVisibility: 1 + m_VerticalScrollbarVisibility: 2 + m_HorizontalScrollbarSpacing: -3 + m_VerticalScrollbarSpacing: -3 + m_OnValueChanged: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &1533663400 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1533663397} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 0} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &1533663401 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1533663397} + m_CullTransparentMesh: 1 +--- !u!1 &1540827315 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1540827316} + - component: {fileID: 1540827319} + - component: {fileID: 1540827318} + - component: {fileID: 1540827317} + m_Layer: 5 + m_Name: Viewport + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1540827316 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1540827315} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 2037968019} + m_Father: {fileID: 1533663398} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: -21, y: 0} + m_Pivot: {x: 0, y: 1} +--- !u!114 &1540827317 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1540827315} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ShowMaskGraphic: 0 +--- !u!114 &1540827318 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1540827315} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10917, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &1540827319 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1540827315} + m_CullTransparentMesh: 1 +--- !u!1 &1547360982 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1547360983} + - component: {fileID: 1547360985} + - component: {fileID: 1547360984} + m_Layer: 5 + m_Name: TeamLogoImage + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1547360983 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1547360982} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2037968019} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 10.5, y: -5040} + m_SizeDelta: {x: 600, y: 600} + m_Pivot: {x: 0.5, y: 1} +--- !u!114 &1547360984 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1547360982} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 3a0bec89dbff82b4f8c8a0bd2727d5eb, type: 3} + m_Type: 0 + m_PreserveAspect: 1 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &1547360985 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1547360982} + m_CullTransparentMesh: 1 --- !u!1 &1569646673 GameObject: m_ObjectHideFlags: 0 @@ -2806,14 +3288,15 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 1311274128} - m_RootOrder: 6 + m_Father: {fileID: 2037968019} + m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 1} - m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: -400} - m_SizeDelta: {x: 960, y: 1200} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 10.5, y: -240} + m_SizeDelta: {x: 21, y: 4800} m_Pivot: {x: 0.5, y: 1} --- !u!114 &1569646675 MonoBehaviour: @@ -2837,7 +3320,7 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 12800000, guid: 7b3f00cdf31d54526a9400f5b7a0e441, type: 3} - m_FontSize: 36 + m_FontSize: 60 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 0 @@ -2847,7 +3330,7 @@ MonoBehaviour: m_RichText: 1 m_HorizontalOverflow: 0 m_VerticalOverflow: 0 - m_LineSpacing: 1.5 + m_LineSpacing: 1.2 m_Text: "\uD504\uB85C\uC81D\uD2B8 \uAD00\uB9AC,\n\uBA54\uC778 \uD504\uB85C\uADF8\uB798\uBC0D,\n\uC0AC\uC6B4\uB4DC \uB514\uC790\uC778,\nUI/UX \uB514\uC790\uC778,\n\uADF8\uB9AC\uACE0 \uB9F5 \uC81C\uC791\n\uC548\uB2E8\uD0DC\n\n\uC11C\uBE0C \uD504\uB85C\uADF8\uB798\uBC0D\n\uC5C4\uC900\uC6B0\n\n\uB9F5 @@ -2874,19 +3357,20 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_TrackedObjects: - - id: 0 + - rid: 0 references: - version: 1 - 00000000: + version: 2 + RefIds: + - rid: 0 type: {class: TrackedUGuiGraphic, ns: UnityEngine.Localization.PropertyVariants.TrackedObjects, asm: Unity.Localization} data: m_Target: {fileID: 1569646675} m_TrackedProperties: items: - - id: 1 + - rid: 1 m_UpdateType: 0 - 00000001: + - rid: 1 type: {class: LocalizedStringProperty, ns: UnityEngine.Localization.PropertyVariants.TrackedProperties, asm: Unity.Localization} data: @@ -2905,6 +3389,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 7063427215363646516, guid: 1db10a05a0fc004418a1b36bde2c72b0, @@ -2968,6 +3453,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 1db10a05a0fc004418a1b36bde2c72b0, type: 3} --- !u!1 &1673905273 GameObject: @@ -2997,6 +3485,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 864389508} m_RootOrder: 3 @@ -3085,9 +3574,17 @@ Camera: m_projectionMatrixMode: 1 m_GateFitMode: 2 m_FOVAxisMode: 0 + m_Iso: 200 + m_ShutterSpeed: 0.005 + m_Aperture: 16 + m_FocusDistance: 10 + m_FocalLength: 50 + m_BladeCount: 5 + m_Curvature: {x: 2, y: 11} + m_BarrelClipping: 0.25 + m_Anamorphism: 0 m_SensorSize: {x: 36, y: 24} m_LensShift: {x: 0, y: 0} - m_FocalLength: 50 m_NormalizedViewPortRect: serializedVersion: 2 x: 0 @@ -3124,6 +3621,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 1, z: -10} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0 @@ -3168,6 +3666,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1241311265} m_RootOrder: 0 @@ -3241,6 +3740,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 32249370} m_Father: {fileID: 835632350} @@ -3251,6 +3751,82 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: -48, y: -48} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &1857622976 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1857622977} + - component: {fileID: 1857622979} + - component: {fileID: 1857622978} + m_Layer: 5 + m_Name: TitleImage + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1857622977 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1857622976} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2037968019} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 10.5, y: 0} + m_SizeDelta: {x: 912, y: 204} + m_Pivot: {x: 0.5, y: 1} +--- !u!114 &1857622978 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1857622976} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 278b292da397b3047bda7adfa8e5dd76, type: 3} + m_Type: 0 + m_PreserveAspect: 1 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &1857622979 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1857622976} + m_CullTransparentMesh: 1 --- !u!224 &1899627356 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 8027793274741447482, guid: cfea33f06b7946349bd3c9939300d7c0, @@ -3283,6 +3859,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 2138566748} m_Father: {fileID: 1241311265} @@ -3293,6 +3870,121 @@ RectTransform: m_AnchoredPosition: {x: -6, y: 0} m_SizeDelta: {x: -36, y: 0} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &2037968018 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2037968019} + m_Layer: 5 + m_Name: Content + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2037968019 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2037968018} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1857622977} + - {fileID: 1569646674} + - {fileID: 1547360983} + m_Father: {fileID: 1540827316} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 5760} + m_Pivot: {x: 0, y: 1} +--- !u!1 &2117830344 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2117830345} + - component: {fileID: 2117830347} + - component: {fileID: 2117830346} + m_Layer: 5 + m_Name: Handle + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2117830345 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2117830344} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 416488890} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.7916667} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 24, y: 24} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &2117830346 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2117830344} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.5019608, g: 0.5019608, b: 0.5019608, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &2117830347 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2117830344} + m_CullTransparentMesh: 1 --- !u!1 &2138566747 GameObject: m_ObjectHideFlags: 0 @@ -3321,6 +4013,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1913220220} m_RootOrder: 0 @@ -3373,6 +4066,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 864389508} m_Modifications: - target: {fileID: 8027793274363365121, guid: cfea33f06b7946349bd3c9939300d7c0, @@ -3511,4 +4205,7 @@ PrefabInstance: value: objectReference: {fileID: 1185197183} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: cfea33f06b7946349bd3c9939300d7c0, type: 3} diff --git a/Assets/Scenes/Training.unity b/Assets/Scenes/Training.unity index fa75863..298c77d 100644 --- a/Assets/Scenes/Training.unity +++ b/Assets/Scenes/Training.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.37311915, g: 0.3807396, b: 0.35872662, a: 1} + m_IndirectSpecularColor: {r: 0.37311953, g: 0.38074014, b: 0.3587274, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -104,7 +104,7 @@ NavMeshSettings: serializedVersion: 2 m_ObjectHideFlags: 0 m_BuildSettings: - serializedVersion: 2 + serializedVersion: 3 agentTypeID: 0 agentRadius: 0.5 agentHeight: 2 @@ -117,7 +117,7 @@ NavMeshSettings: cellSize: 0.16666667 manualTileSize: 0 tileSize: 256 - accuratePlacement: 0 + buildHeightMesh: 0 maxJobWorkers: 0 preserveTilesOutsideBounds: 0 debug: @@ -128,6 +128,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 7063427215363646516, guid: 1db10a05a0fc004418a1b36bde2c72b0, @@ -191,6 +192,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 1db10a05a0fc004418a1b36bde2c72b0, type: 3} --- !u!1 &52489957 GameObject: @@ -220,6 +224,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1222790107} m_RootOrder: 4 @@ -272,6 +277,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 447558954} m_Modifications: - target: {fileID: 2672423829272442780, guid: d838f6f282b36a043ab18477971ef80d, @@ -395,6 +401,9 @@ PrefabInstance: value: objectReference: {fileID: 222567254} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: d838f6f282b36a043ab18477971ef80d, type: 3} --- !u!224 &165664661 stripped RectTransform: @@ -428,6 +437,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1983231435} m_RootOrder: 0 @@ -442,6 +452,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 2019226091} m_Modifications: - target: {fileID: 772091377553154923, guid: 572232613a4c4f2419c8447db52259db, @@ -570,6 +581,13 @@ PrefabInstance: value: GravityButtonRetry objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 772091377553154925, guid: 572232613a4c4f2419c8447db52259db, + type: 3} + insertIndex: -1 + addedObject: {fileID: 180292794} m_SourcePrefab: {fileID: 100100000, guid: 572232613a4c4f2419c8447db52259db, type: 3} --- !u!224 &180292792 stripped RectTransform: @@ -629,6 +647,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 703443031} m_Father: {fileID: 2019226091} @@ -704,6 +723,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1024448016} - {fileID: 1454435099} @@ -759,6 +779,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3} m_Name: m_EditorClassIdentifier: + m_SendPointerHoverToParent: 1 m_HorizontalAxis: Horizontal m_VerticalAxis: Vertical m_SubmitButton: Submit @@ -791,6 +812,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 2 @@ -824,6 +846,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1218764783} m_Father: {fileID: 1596867867} @@ -962,8 +985,15 @@ MonoBehaviour: pauseUI: {fileID: 338028290} pausePanel: {fileID: 1438200330} resultUI: {fileID: 0} - tooltipUI: {fileID: 870392478} + tooltipUI: {fileID: 2125959112} timerUI: {fileID: 1222790106} + moveLimitUI: {fileID: 994666866} + tryCountUis: + - {fileID: 474339944} + - {fileID: 685749599} + minMoveCountUis: + - {fileID: 874865383} + - {fileID: 963314594} openScrollContent: {fileID: 166110716} openButton: {fileID: 1154310592} openHighlightedButton: {fileID: 1340382089} @@ -1072,6 +1102,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 5 @@ -1104,6 +1135,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1596867867} m_RootOrder: 3 @@ -1179,6 +1211,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2019226091} m_RootOrder: 0 @@ -1231,6 +1264,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 780170217} m_Modifications: - target: {fileID: 1788800189684379114, guid: ab016032a72db2d4cb0b255953e0dc4b, @@ -1246,7 +1280,7 @@ PrefabInstance: - target: {fileID: 1788800190194448737, guid: ab016032a72db2d4cb0b255953e0dc4b, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size - value: 4 + value: 5 objectReference: {fileID: 0} - target: {fileID: 1788800190194448737, guid: ab016032a72db2d4cb0b255953e0dc4b, type: 3} @@ -1258,6 +1292,11 @@ PrefabInstance: propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[3].m_Mode value: 6 objectReference: {fileID: 0} + - target: {fileID: 1788800190194448737, guid: ab016032a72db2d4cb0b255953e0dc4b, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[4].m_Mode + value: 1 + objectReference: {fileID: 0} - target: {fileID: 1788800190194448737, guid: ab016032a72db2d4cb0b255953e0dc4b, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target @@ -1278,6 +1317,11 @@ PrefabInstance: propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[3].m_Target value: objectReference: {fileID: 1438200330} + - target: {fileID: 1788800190194448737, guid: ab016032a72db2d4cb0b255953e0dc4b, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[4].m_Target + value: + objectReference: {fileID: 222567254} - target: {fileID: 1788800190194448737, guid: ab016032a72db2d4cb0b255953e0dc4b, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[2].m_CallState @@ -1288,6 +1332,11 @@ PrefabInstance: propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[3].m_CallState value: 2 objectReference: {fileID: 0} + - target: {fileID: 1788800190194448737, guid: ab016032a72db2d4cb0b255953e0dc4b, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[4].m_CallState + value: 2 + objectReference: {fileID: 0} - target: {fileID: 1788800190194448737, guid: ab016032a72db2d4cb0b255953e0dc4b, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName @@ -1308,6 +1357,11 @@ PrefabInstance: propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[3].m_MethodName value: SetActive objectReference: {fileID: 0} + - target: {fileID: 1788800190194448737, guid: ab016032a72db2d4cb0b255953e0dc4b, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[4].m_MethodName + value: Resume + objectReference: {fileID: 0} - target: {fileID: 1788800190194448737, guid: ab016032a72db2d4cb0b255953e0dc4b, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[2].m_TargetAssemblyTypeName @@ -1318,6 +1372,11 @@ PrefabInstance: propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[3].m_TargetAssemblyTypeName value: UnityEngine.GameObject, UnityEngine objectReference: {fileID: 0} + - target: {fileID: 1788800190194448737, guid: ab016032a72db2d4cb0b255953e0dc4b, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[4].m_TargetAssemblyTypeName + value: PlayManager, Assembly-CSharp + objectReference: {fileID: 0} - target: {fileID: 1788800190194448737, guid: ab016032a72db2d4cb0b255953e0dc4b, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[2].m_Arguments.m_ObjectArgumentAssemblyTypeName @@ -1328,6 +1387,11 @@ PrefabInstance: propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[3].m_Arguments.m_ObjectArgumentAssemblyTypeName value: UnityEngine.Object, UnityEngine objectReference: {fileID: 0} + - target: {fileID: 1788800190194448737, guid: ab016032a72db2d4cb0b255953e0dc4b, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[4].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} - target: {fileID: 1788800190199287468, guid: ab016032a72db2d4cb0b255953e0dc4b, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target @@ -1348,6 +1412,11 @@ PrefabInstance: propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[4].m_Target value: objectReference: {fileID: 222567254} + - target: {fileID: 1788800190199287468, guid: ab016032a72db2d4cb0b255953e0dc4b, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[5].m_Target + value: + objectReference: {fileID: 222567254} - target: {fileID: 1788800190199287468, guid: ab016032a72db2d4cb0b255953e0dc4b, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName @@ -1368,6 +1437,16 @@ PrefabInstance: propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[4].m_MethodName value: PlayButtonSFX objectReference: {fileID: 0} + - target: {fileID: 1788800190199287468, guid: ab016032a72db2d4cb0b255953e0dc4b, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[5].m_MethodName + value: Resume + objectReference: {fileID: 0} + - target: {fileID: 1788800190199287468, guid: ab016032a72db2d4cb0b255953e0dc4b, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[5].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} - target: {fileID: 1788800190535769285, guid: ab016032a72db2d4cb0b255953e0dc4b, type: 3} propertyPath: m_AnchorMax.y @@ -1528,6 +1607,11 @@ PrefabInstance: propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[3].m_Target value: objectReference: {fileID: 596967301} + - target: {fileID: 1788800191260194214, guid: ab016032a72db2d4cb0b255953e0dc4b, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[4].m_Target + value: + objectReference: {fileID: 222567254} - target: {fileID: 1788800191260194214, guid: ab016032a72db2d4cb0b255953e0dc4b, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName @@ -1543,6 +1627,21 @@ PrefabInstance: propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[3].m_MethodName value: set_interactable objectReference: {fileID: 0} + - target: {fileID: 1788800191260194214, guid: ab016032a72db2d4cb0b255953e0dc4b, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[4].m_MethodName + value: Resume + objectReference: {fileID: 0} + - target: {fileID: 1788800191260194214, guid: ab016032a72db2d4cb0b255953e0dc4b, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[4].m_TargetAssemblyTypeName + value: PlayManager, Assembly-CSharp + objectReference: {fileID: 0} + - target: {fileID: 1788800191260194214, guid: ab016032a72db2d4cb0b255953e0dc4b, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[4].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} - target: {fileID: 1788800191300486960, guid: ab016032a72db2d4cb0b255953e0dc4b, type: 3} propertyPath: m_AnchorMax.y @@ -1584,6 +1683,33 @@ PrefabInstance: value: PlayButtonSFX objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 1788800190577679305, guid: ab016032a72db2d4cb0b255953e0dc4b, + type: 3} + insertIndex: -1 + addedObject: {fileID: 338028308} + - targetCorrespondingSourceObject: {fileID: 1788800191428183895, guid: ab016032a72db2d4cb0b255953e0dc4b, + type: 3} + insertIndex: -1 + addedObject: {fileID: 338028307} + - targetCorrespondingSourceObject: {fileID: 1788800191566990105, guid: ab016032a72db2d4cb0b255953e0dc4b, + type: 3} + insertIndex: -1 + addedObject: {fileID: 338028306} + - targetCorrespondingSourceObject: {fileID: 1788800190094284259, guid: ab016032a72db2d4cb0b255953e0dc4b, + type: 3} + insertIndex: -1 + addedObject: {fileID: 338028305} + - targetCorrespondingSourceObject: {fileID: 1788800191633508124, guid: ab016032a72db2d4cb0b255953e0dc4b, + type: 3} + insertIndex: -1 + addedObject: {fileID: 338028304} + - targetCorrespondingSourceObject: {fileID: 1788800189684379116, guid: ab016032a72db2d4cb0b255953e0dc4b, + type: 3} + insertIndex: -1 + addedObject: {fileID: 338028303} m_SourcePrefab: {fileID: 100100000, guid: ab016032a72db2d4cb0b255953e0dc4b, type: 3} --- !u!224 &338028288 stripped RectTransform: @@ -1730,19 +1856,20 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_TrackedObjects: - - id: 0 + - rid: 0 references: - version: 1 - 00000000: + version: 2 + RefIds: + - rid: 0 type: {class: TrackedUGuiGraphic, ns: UnityEngine.Localization.PropertyVariants.TrackedObjects, asm: Unity.Localization} data: m_Target: {fileID: 338028292} m_TrackedProperties: items: - - id: 1 + - rid: 1 m_UpdateType: 0 - 00000001: + - rid: 1 type: {class: LocalizedStringProperty, ns: UnityEngine.Localization.PropertyVariants.TrackedProperties, asm: Unity.Localization} data: @@ -1769,19 +1896,20 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_TrackedObjects: - - id: 0 + - rid: 0 references: - version: 1 - 00000000: + version: 2 + RefIds: + - rid: 0 type: {class: TrackedUGuiGraphic, ns: UnityEngine.Localization.PropertyVariants.TrackedObjects, asm: Unity.Localization} data: m_Target: {fileID: 338028294} m_TrackedProperties: items: - - id: 1 + - rid: 1 m_UpdateType: 0 - 00000001: + - rid: 1 type: {class: LocalizedStringProperty, ns: UnityEngine.Localization.PropertyVariants.TrackedProperties, asm: Unity.Localization} data: @@ -1808,19 +1936,20 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_TrackedObjects: - - id: 0 + - rid: 0 references: - version: 1 - 00000000: + version: 2 + RefIds: + - rid: 0 type: {class: TrackedUGuiGraphic, ns: UnityEngine.Localization.PropertyVariants.TrackedObjects, asm: Unity.Localization} data: m_Target: {fileID: 338028296} m_TrackedProperties: items: - - id: 1 + - rid: 1 m_UpdateType: 0 - 00000001: + - rid: 1 type: {class: LocalizedStringProperty, ns: UnityEngine.Localization.PropertyVariants.TrackedProperties, asm: Unity.Localization} data: @@ -1847,19 +1976,20 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_TrackedObjects: - - id: 0 + - rid: 0 references: - version: 1 - 00000000: + version: 2 + RefIds: + - rid: 0 type: {class: TrackedUGuiGraphic, ns: UnityEngine.Localization.PropertyVariants.TrackedObjects, asm: Unity.Localization} data: m_Target: {fileID: 338028298} m_TrackedProperties: items: - - id: 1 + - rid: 1 m_UpdateType: 0 - 00000001: + - rid: 1 type: {class: LocalizedStringProperty, ns: UnityEngine.Localization.PropertyVariants.TrackedProperties, asm: Unity.Localization} data: @@ -1886,19 +2016,20 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_TrackedObjects: - - id: 0 + - rid: 0 references: - version: 1 - 00000000: + version: 2 + RefIds: + - rid: 0 type: {class: TrackedUGuiGraphic, ns: UnityEngine.Localization.PropertyVariants.TrackedObjects, asm: Unity.Localization} data: m_Target: {fileID: 338028300} m_TrackedProperties: items: - - id: 1 + - rid: 1 m_UpdateType: 0 - 00000001: + - rid: 1 type: {class: LocalizedStringProperty, ns: UnityEngine.Localization.PropertyVariants.TrackedProperties, asm: Unity.Localization} data: @@ -1925,19 +2056,20 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_TrackedObjects: - - id: 0 + - rid: 0 references: - version: 1 - 00000000: + version: 2 + RefIds: + - rid: 0 type: {class: TrackedUGuiGraphic, ns: UnityEngine.Localization.PropertyVariants.TrackedObjects, asm: Unity.Localization} data: m_Target: {fileID: 338028302} m_TrackedProperties: items: - - id: 1 + - rid: 1 m_UpdateType: 0 - 00000001: + - rid: 1 type: {class: LocalizedStringProperty, ns: UnityEngine.Localization.PropertyVariants.TrackedProperties, asm: Unity.Localization} data: @@ -1979,6 +2111,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1222790107} m_RootOrder: 7 @@ -2026,6 +2159,82 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 351314864} m_CullTransparentMesh: 0 +--- !u!1 &380486042 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 380486043} + - component: {fileID: 380486045} + - component: {fileID: 380486044} + m_Layer: 5 + m_Name: Background + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &380486043 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 380486042} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1624171125} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &380486044 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 380486042} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: fa10ea3f8ac98f94399d6e0b99544a5d, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &380486045 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 380486042} + m_CullTransparentMesh: 1 --- !u!1 &386166162 GameObject: m_ObjectHideFlags: 0 @@ -2197,7 +2406,8 @@ MonoBehaviour: tryCount: 0 beforeFirstAction: 0 tryCountUpTrigger: 0 - hasClearedOnce: 0 + hasClearedOnceInTime: 0 + hasClearedOnceInMove: 0 --- !u!4 &386166164 Transform: m_ObjectHideFlags: 0 @@ -2208,6 +2418,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 4 @@ -2240,6 +2451,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1222790107} m_RootOrder: 5 @@ -2315,6 +2527,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 447558954} m_RootOrder: 1 @@ -2388,6 +2601,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1327791485} - {fileID: 446009398} @@ -2395,9 +2609,10 @@ RectTransform: - {fileID: 481322712} - {fileID: 1154310590} - {fileID: 1340382088} + - {fileID: 1624171125} - {fileID: 1596867867} - - {fileID: 870392479} - {fileID: 165664661} + - {fileID: 963314593} m_Father: {fileID: 1514476973} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -2406,6 +2621,12 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &474339944 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 2672423829272442781, guid: d838f6f282b36a043ab18477971ef80d, + type: 3} + m_PrefabInstance: {fileID: 1553784213} + m_PrefabAsset: {fileID: 0} --- !u!1 &481322711 GameObject: m_ObjectHideFlags: 0 @@ -2435,6 +2656,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 447558954} m_RootOrder: 3 @@ -2580,6 +2802,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2019226091} m_RootOrder: 11 @@ -2756,6 +2979,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2019226091} m_RootOrder: 9 @@ -2767,7 +2991,7 @@ RectTransform: m_Pivot: {x: 0.5, y: 0.5} --- !u!95 &565109132 Animator: - serializedVersion: 3 + serializedVersion: 5 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -2780,10 +3004,12 @@ Animator: m_UpdateMode: 0 m_ApplyRootMotion: 0 m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorControllerStateOnDisable: 0 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 --- !u!114 &565109133 MonoBehaviour: m_ObjectHideFlags: 0 @@ -2938,6 +3164,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2019226091} m_RootOrder: 7 @@ -3099,6 +3326,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1222790107} m_RootOrder: 6 @@ -3146,6 +3374,12 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 630556338} m_CullTransparentMesh: 0 +--- !u!1 &685749599 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 2672423829272442781, guid: d838f6f282b36a043ab18477971ef80d, + type: 3} + m_PrefabInstance: {fileID: 165664660} + m_PrefabAsset: {fileID: 0} --- !u!1 &703443030 GameObject: m_ObjectHideFlags: 0 @@ -3175,6 +3409,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0.38268343, w: 0.92387956} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 189013533} m_RootOrder: 0 @@ -3306,6 +3541,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 2049806775} m_Father: {fileID: 2019226091} @@ -3382,6 +3618,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1596867867} m_RootOrder: 4 @@ -3505,7 +3742,9 @@ Canvas: m_OverrideSorting: 0 m_OverridePixelPerfect: 0 m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 0 m_AdditionalShaderChannelsFlag: 0 + m_UpdateRectTransformForStandalone: 0 m_SortingLayerID: 0 m_SortingOrder: 0 m_TargetDisplay: 0 @@ -3519,6 +3758,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0, y: 0, z: 0} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1010265667} - {fileID: 1918277096} @@ -3527,6 +3767,7 @@ RectTransform: - {fileID: 194870465} - {fileID: 1438200331} - {fileID: 1222790107} + - {fileID: 994666865} - {fileID: 2125959113} - {fileID: 338028288} m_Father: {fileID: 0} @@ -3565,6 +3806,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1222790107} m_RootOrder: 2 @@ -3612,6 +3854,43 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 805649293} m_CullTransparentMesh: 0 +--- !u!1 &810573976 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 810573977} + m_Layer: 5 + m_Name: Fill Area + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &810573977 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 810573976} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1898427145} + m_Father: {fileID: 1624171125} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: -6} + m_SizeDelta: {x: -24, y: -36} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &832224649 GameObject: m_ObjectHideFlags: 0 @@ -3651,55 +3930,12 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0.5, y: 0.5, z: 1} m_LocalScale: {x: 11.111111, y: 11.111111, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 899461477} m_Father: {fileID: 0} m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &870392478 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 870392479} - - component: {fileID: 870392480} - m_Layer: 5 - m_Name: TooltipUI - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &870392479 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 870392478} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 447558954} - m_RootOrder: 7 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: 0, y: 240} - m_SizeDelta: {x: 0, y: 480} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &870392480 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 870392478} - m_CullTransparentMesh: 0 --- !u!1 &873401813 GameObject: m_ObjectHideFlags: 0 @@ -3728,6 +3964,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2019226091} m_RootOrder: 6 @@ -3775,71 +4012,213 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 873401813} m_CullTransparentMesh: 0 ---- !u!1 &899461476 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 899461477} - - component: {fileID: 899461479} - - component: {fileID: 899461478} - m_Layer: 0 - m_Name: Tilemap - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &899461477 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 899461476} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 832224651} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!483693784 &899461478 -TilemapRenderer: +--- !u!1001 &874865381 +PrefabInstance: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 899461476} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 0 - m_ReflectionProbeUsage: 0 - m_RayTracingMode: 0 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 2019226091} + m_Modifications: + - target: {fileID: 947415739964845906, guid: e12109ae245e16f4d85e1bc6e4d67ac4, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 947415739964845906, guid: e12109ae245e16f4d85e1bc6e4d67ac4, + type: 3} + propertyPath: m_Pivot.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 947415739964845906, guid: e12109ae245e16f4d85e1bc6e4d67ac4, + type: 3} + propertyPath: m_RootOrder + value: 8 + objectReference: {fileID: 0} + - target: {fileID: 947415739964845906, guid: e12109ae245e16f4d85e1bc6e4d67ac4, + type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 947415739964845906, guid: e12109ae245e16f4d85e1bc6e4d67ac4, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 947415739964845906, guid: e12109ae245e16f4d85e1bc6e4d67ac4, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 947415739964845906, guid: e12109ae245e16f4d85e1bc6e4d67ac4, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 947415739964845906, guid: e12109ae245e16f4d85e1bc6e4d67ac4, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 947415739964845906, guid: e12109ae245e16f4d85e1bc6e4d67ac4, + type: 3} + propertyPath: m_SizeDelta.y + value: 960 + objectReference: {fileID: 0} + - target: {fileID: 947415739964845906, guid: e12109ae245e16f4d85e1bc6e4d67ac4, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 947415739964845906, guid: e12109ae245e16f4d85e1bc6e4d67ac4, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 947415739964845906, guid: e12109ae245e16f4d85e1bc6e4d67ac4, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 947415739964845906, guid: e12109ae245e16f4d85e1bc6e4d67ac4, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 947415739964845906, guid: e12109ae245e16f4d85e1bc6e4d67ac4, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 947415739964845906, guid: e12109ae245e16f4d85e1bc6e4d67ac4, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 947415739964845906, guid: e12109ae245e16f4d85e1bc6e4d67ac4, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 947415739964845906, guid: e12109ae245e16f4d85e1bc6e4d67ac4, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 947415739964845906, guid: e12109ae245e16f4d85e1bc6e4d67ac4, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 947415739964845906, guid: e12109ae245e16f4d85e1bc6e4d67ac4, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 947415739964845906, guid: e12109ae245e16f4d85e1bc6e4d67ac4, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 947415739964845906, guid: e12109ae245e16f4d85e1bc6e4d67ac4, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6530629739181965378, guid: e12109ae245e16f4d85e1bc6e4d67ac4, + type: 3} + propertyPath: mm + value: + objectReference: {fileID: 386166163} + - target: {fileID: 7479105889482343208, guid: e12109ae245e16f4d85e1bc6e4d67ac4, + type: 3} + propertyPath: m_Name + value: GravityMinMoveCount + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: e12109ae245e16f4d85e1bc6e4d67ac4, type: 3} +--- !u!224 &874865382 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 947415739964845906, guid: e12109ae245e16f4d85e1bc6e4d67ac4, + type: 3} + m_PrefabInstance: {fileID: 874865381} + m_PrefabAsset: {fileID: 0} +--- !u!1 &874865383 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 7479105889482343208, guid: e12109ae245e16f4d85e1bc6e4d67ac4, + type: 3} + m_PrefabInstance: {fileID: 874865381} + m_PrefabAsset: {fileID: 0} +--- !u!1 &899461476 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 899461477} + - component: {fileID: 899461479} + - component: {fileID: 899461478} + m_Layer: 0 + m_Name: Tilemap + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &899461477 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 899461476} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 832224651} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!483693784 &899461478 +TilemapRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 899461476} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 0 + m_ReflectionProbeUsage: 0 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 @@ -4033,6 +4412,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1596867867} m_RootOrder: 2 @@ -4111,6 +4491,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2019226091} m_RootOrder: 12 @@ -4122,7 +4503,7 @@ RectTransform: m_Pivot: {x: 0.5, y: 0.5} --- !u!95 &954792812 Animator: - serializedVersion: 3 + serializedVersion: 5 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -4135,10 +4516,12 @@ Animator: m_UpdateMode: 0 m_ApplyRootMotion: 0 m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorControllerStateOnDisable: 0 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 --- !u!114 &954792813 MonoBehaviour: m_ObjectHideFlags: 0 @@ -4272,7 +4655,7 @@ MonoBehaviour: tooltipPrefab: {fileID: 6095790650455668987, guid: 3617bb7300a723d468a84e27f5543876, type: 3} tooltipMessage: RetryTimeButton - tooltipWidth: 444 + tooltipWidth: 480 tooltipHeight: 168 pivot: 3 --- !u!1 &955985467 @@ -4304,6 +4687,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0.38268343, w: 0.92387956} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1704928162} m_RootOrder: 0 @@ -4407,6 +4791,146 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 955985467} m_CullTransparentMesh: 0 +--- !u!1001 &963314592 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 447558954} + m_Modifications: + - target: {fileID: 947415739964845906, guid: e12109ae245e16f4d85e1bc6e4d67ac4, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 947415739964845906, guid: e12109ae245e16f4d85e1bc6e4d67ac4, + type: 3} + propertyPath: m_Pivot.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 947415739964845906, guid: e12109ae245e16f4d85e1bc6e4d67ac4, + type: 3} + propertyPath: m_RootOrder + value: 8 + objectReference: {fileID: 0} + - target: {fileID: 947415739964845906, guid: e12109ae245e16f4d85e1bc6e4d67ac4, + type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 947415739964845906, guid: e12109ae245e16f4d85e1bc6e4d67ac4, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 947415739964845906, guid: e12109ae245e16f4d85e1bc6e4d67ac4, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 947415739964845906, guid: e12109ae245e16f4d85e1bc6e4d67ac4, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 947415739964845906, guid: e12109ae245e16f4d85e1bc6e4d67ac4, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 947415739964845906, guid: e12109ae245e16f4d85e1bc6e4d67ac4, + type: 3} + propertyPath: m_SizeDelta.y + value: 960 + objectReference: {fileID: 0} + - target: {fileID: 947415739964845906, guid: e12109ae245e16f4d85e1bc6e4d67ac4, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 947415739964845906, guid: e12109ae245e16f4d85e1bc6e4d67ac4, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 947415739964845906, guid: e12109ae245e16f4d85e1bc6e4d67ac4, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 947415739964845906, guid: e12109ae245e16f4d85e1bc6e4d67ac4, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 947415739964845906, guid: e12109ae245e16f4d85e1bc6e4d67ac4, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 947415739964845906, guid: e12109ae245e16f4d85e1bc6e4d67ac4, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 947415739964845906, guid: e12109ae245e16f4d85e1bc6e4d67ac4, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 947415739964845906, guid: e12109ae245e16f4d85e1bc6e4d67ac4, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 947415739964845906, guid: e12109ae245e16f4d85e1bc6e4d67ac4, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 947415739964845906, guid: e12109ae245e16f4d85e1bc6e4d67ac4, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 947415739964845906, guid: e12109ae245e16f4d85e1bc6e4d67ac4, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 947415739964845906, guid: e12109ae245e16f4d85e1bc6e4d67ac4, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6530629739181965378, guid: e12109ae245e16f4d85e1bc6e4d67ac4, + type: 3} + propertyPath: mm + value: + objectReference: {fileID: 386166163} + - target: {fileID: 7479105889482343208, guid: e12109ae245e16f4d85e1bc6e4d67ac4, + type: 3} + propertyPath: m_Name + value: GravityMinMoveCount + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: e12109ae245e16f4d85e1bc6e4d67ac4, type: 3} +--- !u!224 &963314593 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 947415739964845906, guid: e12109ae245e16f4d85e1bc6e4d67ac4, + type: 3} + m_PrefabInstance: {fileID: 963314592} + m_PrefabAsset: {fileID: 0} +--- !u!1 &963314594 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 7479105889482343208, guid: e12109ae245e16f4d85e1bc6e4d67ac4, + type: 3} + m_PrefabInstance: {fileID: 963314592} + m_PrefabAsset: {fileID: 0} --- !u!1 &975769229 GameObject: m_ObjectHideFlags: 0 @@ -4438,6 +4962,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2019226091} m_RootOrder: 8 @@ -4449,7 +4974,7 @@ RectTransform: m_Pivot: {x: 0.5, y: 0.5} --- !u!95 &975769231 Animator: - serializedVersion: 3 + serializedVersion: 5 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -4462,10 +4987,12 @@ Animator: m_UpdateMode: 0 m_ApplyRootMotion: 0 m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorControllerStateOnDisable: 0 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 --- !u!114 &975769232 MonoBehaviour: m_ObjectHideFlags: 0 @@ -4590,6 +5117,146 @@ MonoBehaviour: tooltipWidth: 324 tooltipHeight: 168 pivot: 0 +--- !u!1001 &994666864 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 780170217} + m_Modifications: + - target: {fileID: 2242454143767789182, guid: 3e1882bc7f6d98c49814aa8f92076daa, + type: 3} + propertyPath: mm + value: + objectReference: {fileID: 386166163} + - target: {fileID: 5464360231694924913, guid: 3e1882bc7f6d98c49814aa8f92076daa, + type: 3} + propertyPath: m_Name + value: MoveLimitUI + objectReference: {fileID: 0} + - target: {fileID: 9100421025181478557, guid: 3e1882bc7f6d98c49814aa8f92076daa, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 9100421025181478557, guid: 3e1882bc7f6d98c49814aa8f92076daa, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 9100421025181478557, guid: 3e1882bc7f6d98c49814aa8f92076daa, + type: 3} + propertyPath: m_RootOrder + value: -1 + objectReference: {fileID: 0} + - target: {fileID: 9100421025181478557, guid: 3e1882bc7f6d98c49814aa8f92076daa, + type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 9100421025181478557, guid: 3e1882bc7f6d98c49814aa8f92076daa, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 9100421025181478557, guid: 3e1882bc7f6d98c49814aa8f92076daa, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9100421025181478557, guid: 3e1882bc7f6d98c49814aa8f92076daa, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9100421025181478557, guid: 3e1882bc7f6d98c49814aa8f92076daa, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9100421025181478557, guid: 3e1882bc7f6d98c49814aa8f92076daa, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9100421025181478557, guid: 3e1882bc7f6d98c49814aa8f92076daa, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9100421025181478557, guid: 3e1882bc7f6d98c49814aa8f92076daa, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9100421025181478557, guid: 3e1882bc7f6d98c49814aa8f92076daa, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9100421025181478557, guid: 3e1882bc7f6d98c49814aa8f92076daa, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 9100421025181478557, guid: 3e1882bc7f6d98c49814aa8f92076daa, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9100421025181478557, guid: 3e1882bc7f6d98c49814aa8f92076daa, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9100421025181478557, guid: 3e1882bc7f6d98c49814aa8f92076daa, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9100421025181478557, guid: 3e1882bc7f6d98c49814aa8f92076daa, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9100421025181478557, guid: 3e1882bc7f6d98c49814aa8f92076daa, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9100421025181478557, guid: 3e1882bc7f6d98c49814aa8f92076daa, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9100421025181478557, guid: 3e1882bc7f6d98c49814aa8f92076daa, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9100421025181478557, guid: 3e1882bc7f6d98c49814aa8f92076daa, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 3e1882bc7f6d98c49814aa8f92076daa, type: 3} +--- !u!224 &994666865 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 9100421025181478557, guid: 3e1882bc7f6d98c49814aa8f92076daa, + type: 3} + m_PrefabInstance: {fileID: 994666864} + m_PrefabAsset: {fileID: 0} +--- !u!1 &994666866 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 5464360231694924913, guid: 3e1882bc7f6d98c49814aa8f92076daa, + type: 3} + m_PrefabInstance: {fileID: 994666864} + m_PrefabAsset: {fileID: 0} --- !u!1 &1010265666 GameObject: m_ObjectHideFlags: 0 @@ -4618,6 +5285,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 780170217} m_RootOrder: 0 @@ -4693,6 +5361,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 194870465} m_RootOrder: 0 @@ -4769,6 +5438,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0.38268343, w: 0.92387956} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1230785330} m_RootOrder: 0 @@ -4872,6 +5542,82 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1122090535} m_CullTransparentMesh: 0 +--- !u!1 &1153195252 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1153195253} + - component: {fileID: 1153195255} + - component: {fileID: 1153195254} + m_Layer: 5 + m_Name: Handle + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1153195253 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1153195252} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1492507680} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 132, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1153195254 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1153195252} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 563350755ab067a40ae13360c134da0f, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &1153195255 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1153195252} + m_CullTransparentMesh: 1 --- !u!1 &1154310589 GameObject: m_ObjectHideFlags: 0 @@ -4903,6 +5649,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 447558954} m_RootOrder: 4 @@ -5049,22 +5796,23 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_TrackedObjects: - - id: 0 + - rid: 0 references: - version: 1 - 00000000: + version: 2 + RefIds: + - rid: 0 type: {class: TrackedMonoBehaviourObject, ns: UnityEngine.Localization.PropertyVariants.TrackedObjects, asm: Unity.Localization} data: m_Target: {fileID: 1154310591} m_TrackedProperties: items: - - id: 1 + - rid: 1 m_UpdateType: 0 m_Changed: m_PersistentCalls: m_Calls: [] - 00000001: + - rid: 1 type: {class: LocalizedStringProperty, ns: UnityEngine.Localization.PropertyVariants.TrackedProperties, asm: Unity.Localization} data: @@ -5104,6 +5852,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1962399329} m_Father: {fileID: 222247440} @@ -5141,6 +5890,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1233494439} - {fileID: 1374912743} @@ -5213,6 +5963,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1122090536} m_Father: {fileID: 2019226091} @@ -5289,6 +6040,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1222790107} m_RootOrder: 0 @@ -5364,6 +6116,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 447558954} m_RootOrder: 0 @@ -5440,6 +6193,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 447558954} m_RootOrder: 5 @@ -5583,6 +6337,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1222790107} m_RootOrder: 1 @@ -5658,6 +6413,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 194870465} m_RootOrder: 2 @@ -5737,6 +6493,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 780170217} m_RootOrder: 5 @@ -5812,6 +6569,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -5862,6 +6620,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 7 @@ -5894,6 +6653,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 194870465} m_RootOrder: 1 @@ -5941,6 +6701,43 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1454435098} m_CullTransparentMesh: 0 +--- !u!1 &1492507679 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1492507680} + m_Layer: 5 + m_Name: Handle Slide Area + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1492507680 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1492507679} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1153195253} + m_Father: {fileID: 1624171125} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: -156, y: 0} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1514476972 GameObject: m_ObjectHideFlags: 0 @@ -5970,6 +6767,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 2019226091} - {fileID: 447558954} @@ -6045,6 +6843,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 2019226091} m_Modifications: - target: {fileID: 2672423829272442780, guid: d838f6f282b36a043ab18477971ef80d, @@ -6168,6 +6967,9 @@ PrefabInstance: value: objectReference: {fileID: 222567254} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: d838f6f282b36a043ab18477971ef80d, type: 3} --- !u!224 &1553784214 stripped RectTransform: @@ -6204,6 +7006,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1983231435} - {fileID: 222247440} @@ -6286,6 +7089,156 @@ MonoBehaviour: m_OnValueChanged: m_PersistentCalls: m_Calls: [] +--- !u!1 &1624171124 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1624171125} + - component: {fileID: 1624171128} + - component: {fileID: 1624171127} + - component: {fileID: 1624171126} + m_Layer: 5 + m_Name: TrainingSliderLimitMode + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &1624171125 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1624171124} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 380486043} + - {fileID: 810573977} + - {fileID: 1492507680} + m_Father: {fileID: 447558954} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -60, y: -336} + m_SizeDelta: {x: 312, y: 144} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1624171126 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1624171124} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3383860e292e6cf45b668bb6d35310c0, type: 3} + m_Name: + m_EditorClassIdentifier: + onPointerUp: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1624171127} + m_TargetAssemblyTypeName: LimitModeUI, Assembly-CSharp + m_MethodName: Toggle + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 +--- !u!114 &1624171127 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1624171124} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 553b47568e2e0c44bb55bbb1d95ae7af, type: 3} + m_Name: + m_EditorClassIdentifier: + handleImage: {fileID: 1153195254} + timeSprite: {fileID: 21300000, guid: 563350755ab067a40ae13360c134da0f, type: 3} + moveSprite: {fileID: 21300000, guid: 7f2638482ea96ff4688857163130092e, type: 3} + onClick: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &1624171128 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1624171124} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 67db9e8f0e2ae9c40bc1e2b64352a6b4, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 0 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 1153195254} + m_FillRect: {fileID: 1898427145} + m_HandleRect: {fileID: 1153195253} + m_Direction: 0 + m_MinValue: 0 + m_MaxValue: 12 + m_WholeNumbers: 1 + m_Value: 0 + m_OnValueChanged: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1624171127} + m_TargetAssemblyTypeName: LimitModeUI, Assembly-CSharp + m_MethodName: UpdateImage + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 --- !u!1 &1649814708 GameObject: m_ObjectHideFlags: 0 @@ -6314,6 +7267,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 780170217} m_RootOrder: 2 @@ -6401,9 +7355,17 @@ Camera: m_projectionMatrixMode: 1 m_GateFitMode: 2 m_FOVAxisMode: 0 + m_Iso: 200 + m_ShutterSpeed: 0.005 + m_Aperture: 16 + m_FocusDistance: 10 + m_FocalLength: 50 + m_BladeCount: 5 + m_Curvature: {x: 2, y: 11} + m_BarrelClipping: 0.25 + m_Anamorphism: 0 m_SensorSize: {x: 36, y: 24} m_LensShift: {x: 0, y: 0} - m_FocalLength: 50 m_NormalizedViewPortRect: serializedVersion: 2 x: 0 @@ -6440,6 +7402,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 1, z: -10} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0 @@ -6472,6 +7435,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 955985468} m_Father: {fileID: 2019226091} @@ -6551,6 +7515,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2019226091} m_RootOrder: 10 @@ -6562,7 +7527,7 @@ RectTransform: m_Pivot: {x: 0.5, y: 0.5} --- !u!95 &1773613029 Animator: - serializedVersion: 3 + serializedVersion: 5 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -6575,10 +7540,12 @@ Animator: m_UpdateMode: 0 m_ApplyRootMotion: 0 m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorControllerStateOnDisable: 0 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 --- !u!114 &1773613030 MonoBehaviour: m_ObjectHideFlags: 0 @@ -6719,6 +7686,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 447558954} m_RootOrder: 2 @@ -6782,11 +7750,88 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &1898427144 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1898427145} + - component: {fileID: 1898427147} + - component: {fileID: 1898427146} + m_Layer: 5 + m_Name: Fill + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1898427145 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1898427144} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 810573977} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1898427146 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1898427144} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.21568629, g: 0.21568629, b: 0.21568629, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &1898427147 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1898427144} + m_CullTransparentMesh: 1 --- !u!1001 &1918277095 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 780170217} m_Modifications: - target: {fileID: 4947973752511735336, guid: a97aafa8dc7aae24993ae294c8359b43, @@ -6905,6 +7950,13 @@ PrefabInstance: value: TimeoutPanel objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 3942173205810548199, guid: a97aafa8dc7aae24993ae294c8359b43, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1918277099} m_SourcePrefab: {fileID: 100100000, guid: a97aafa8dc7aae24993ae294c8359b43, type: 3} --- !u!224 &1918277096 stripped RectTransform: @@ -6943,19 +7995,20 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_TrackedObjects: - - id: 0 + - rid: 0 references: - version: 1 - 00000000: + version: 2 + RefIds: + - rid: 0 type: {class: TrackedUGuiGraphic, ns: UnityEngine.Localization.PropertyVariants.TrackedObjects, asm: Unity.Localization} data: m_Target: {fileID: 1918277098} m_TrackedProperties: items: - - id: 1 + - rid: 1 m_UpdateType: 0 - 00000001: + - rid: 1 type: {class: LocalizedStringProperty, ns: UnityEngine.Localization.PropertyVariants.TrackedProperties, asm: Unity.Localization} data: @@ -6997,6 +8050,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1222790107} m_RootOrder: 3 @@ -7072,6 +8126,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1218764783} m_RootOrder: 0 @@ -7148,6 +8203,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 166110717} m_Father: {fileID: 1596867867} @@ -7235,6 +8291,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 299239696} - {fileID: 737857023} @@ -7250,6 +8307,7 @@ RectTransform: - {fileID: 530667193} - {fileID: 954792811} - {fileID: 1553784214} + - {fileID: 874865382} m_Father: {fileID: 1514476973} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -7287,6 +8345,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0.38268343, w: 0.92387956} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 737857023} m_RootOrder: 0 @@ -7408,7 +8467,7 @@ GameObject: - component: {fileID: 2125959114} m_Layer: 5 m_Name: TooltipUI - m_TagString: Untagged + m_TagString: TooltipUI m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -7423,6 +8482,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 780170217} m_RootOrder: 7 diff --git a/Assets/Scenes/Tutorial.unity b/Assets/Scenes/Tutorial.unity index 4de1ecb..87ecf33 100644 --- a/Assets/Scenes/Tutorial.unity +++ b/Assets/Scenes/Tutorial.unity @@ -105,7 +105,7 @@ NavMeshSettings: serializedVersion: 2 m_ObjectHideFlags: 0 m_BuildSettings: - serializedVersion: 2 + serializedVersion: 3 agentTypeID: 0 agentRadius: 0.5 agentHeight: 2 @@ -118,7 +118,7 @@ NavMeshSettings: cellSize: 0.16666667 manualTileSize: 0 tileSize: 256 - accuratePlacement: 0 + buildHeightMesh: 0 maxJobWorkers: 0 preserveTilesOutsideBounds: 0 debug: @@ -165,6 +165,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 591191597} - {fileID: 1264283925} @@ -275,6 +276,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1304023982} m_RootOrder: 7 @@ -350,6 +352,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1304023982} m_RootOrder: 2 @@ -424,6 +427,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1851242258} m_RootOrder: 4 @@ -481,6 +485,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 24088657} m_RootOrder: 7 @@ -533,6 +538,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 7063427215363646516, guid: 1db10a05a0fc004418a1b36bde2c72b0, @@ -596,6 +602,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 1db10a05a0fc004418a1b36bde2c72b0, type: 3} --- !u!1 &343747308 GameObject: @@ -624,6 +633,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 2, y: 2, z: 0} m_LocalScale: {x: 11.11111, y: 11.11111, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 713554044} m_RootOrder: 0 @@ -639,6 +649,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -709,6 +720,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0.38268343, w: 0.92387956} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1193669931} m_RootOrder: 0 @@ -858,6 +870,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1851242258} m_RootOrder: 0 @@ -968,6 +981,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0.5, y: 0.5, z: 1} m_LocalScale: {x: 11.111111, y: 11.111111, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1578408918} m_Father: {fileID: 0} @@ -1004,6 +1018,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 24088657} m_RootOrder: 2 @@ -1121,7 +1136,7 @@ CanvasRenderer: m_CullTransparentMesh: 0 --- !u!95 &520449380 Animator: - serializedVersion: 3 + serializedVersion: 5 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -1134,10 +1149,12 @@ Animator: m_UpdateMode: 0 m_ApplyRootMotion: 0 m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorControllerStateOnDisable: 0 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 --- !u!114 &520449381 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1161,6 +1178,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 24088657} m_Modifications: - target: {fileID: 9082494344251303288, guid: 4542b2e8185596e4683fe00f2dfae572, @@ -1279,6 +1297,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4542b2e8185596e4683fe00f2dfae572, type: 3} --- !u!224 &544216135 stripped RectTransform: @@ -1316,6 +1337,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3} m_Name: m_EditorClassIdentifier: + m_SendPointerHoverToParent: 1 m_HorizontalAxis: Horizontal m_VerticalAxis: Vertical m_SubmitButton: Submit @@ -1348,6 +1370,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 6 @@ -1382,6 +1405,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 24088657} m_RootOrder: 0 @@ -1543,6 +1567,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1304023982} m_RootOrder: 1 @@ -1630,9 +1655,17 @@ Camera: m_projectionMatrixMode: 1 m_GateFitMode: 2 m_FOVAxisMode: 0 + m_Iso: 200 + m_ShutterSpeed: 0.005 + m_Aperture: 16 + m_FocusDistance: 10 + m_FocalLength: 50 + m_BladeCount: 5 + m_Curvature: {x: 2, y: 11} + m_BarrelClipping: 0.25 + m_Anamorphism: 0 m_SensorSize: {x: 36, y: 24} m_LensShift: {x: 0, y: 0} - m_FocalLength: 50 m_NormalizedViewPortRect: serializedVersion: 2 x: 0 @@ -1669,6 +1702,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 2, y: 1.5, z: -10} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0 @@ -1701,6 +1735,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1304023982} m_RootOrder: 6 @@ -1775,6 +1810,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 343747309} - {fileID: 1828790662} @@ -1793,6 +1829,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -1861,6 +1898,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1304023982} m_RootOrder: 4 @@ -1936,6 +1974,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1304023982} m_RootOrder: 0 @@ -1988,6 +2027,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1851242258} m_Modifications: - target: {fileID: 1167235146622771689, guid: d1ad3c89387d28e488ea573cdf2b5245, @@ -2111,6 +2151,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: d1ad3c89387d28e488ea573cdf2b5245, type: 3} --- !u!224 &857531045 stripped RectTransform: @@ -2145,6 +2188,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1851242258} m_RootOrder: 9 @@ -2192,6 +2236,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 24088657} m_RootOrder: 5 @@ -2377,6 +2422,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1304023982} m_RootOrder: 5 @@ -2452,6 +2498,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 2068695178} m_Father: {fileID: 24088657} @@ -2528,6 +2575,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 382429607} m_Father: {fileID: 24088657} @@ -2606,6 +2654,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0.38268343, w: 0.92387956} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1517296250} m_RootOrder: 0 @@ -2758,6 +2807,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 24088657} m_RootOrder: 1 @@ -2769,7 +2819,7 @@ RectTransform: m_Pivot: {x: 0.5, y: 0.5} --- !u!95 &1264283926 Animator: - serializedVersion: 3 + serializedVersion: 5 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -2782,10 +2832,12 @@ Animator: m_UpdateMode: 0 m_ApplyRootMotion: 0 m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorControllerStateOnDisable: 0 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 --- !u!114 &1264283927 MonoBehaviour: m_ObjectHideFlags: 0 @@ -2940,6 +2992,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0.38268343, w: 0.92387956} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1816384655} m_RootOrder: 0 @@ -3088,6 +3141,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 729405784} - {fileID: 634394760} @@ -3159,6 +3213,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 2, y: 1, z: 0} m_LocalScale: {x: 11.11111, y: 11.11111, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 713554044} m_RootOrder: 2 @@ -3174,6 +3229,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -3245,6 +3301,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 24088657} m_RootOrder: 4 @@ -3362,7 +3419,7 @@ CanvasRenderer: m_CullTransparentMesh: 0 --- !u!95 &1404637736 Animator: - serializedVersion: 3 + serializedVersion: 5 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -3375,10 +3432,12 @@ Animator: m_UpdateMode: 0 m_ApplyRootMotion: 0 m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorControllerStateOnDisable: 0 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 --- !u!114 &1404637737 MonoBehaviour: m_ObjectHideFlags: 0 @@ -3424,6 +3483,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 7 @@ -3454,6 +3514,9 @@ MonoBehaviour: resultUI: {fileID: 5} tooltipUI: {fileID: 947665018} timerUI: {fileID: 0} + moveLimitUI: {fileID: 0} + tryCountUis: [] + minMoveCountUis: [] openScrollContent: {fileID: 0} openButton: {fileID: 0} openHighlightedButton: {fileID: 0} @@ -3529,6 +3592,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1209234941} m_Father: {fileID: 24088657} @@ -3605,6 +3669,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 488576794} m_RootOrder: 0 @@ -3620,6 +3685,7 @@ TilemapRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -3835,6 +3901,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 24088657} m_RootOrder: 12 @@ -3887,6 +3954,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1851242258} m_Modifications: - target: {fileID: 38331144711701198, guid: ee2ae56dffbb07140b8f4228cfc061c5, @@ -4005,6 +4073,9 @@ PrefabInstance: value: Loading... objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: ee2ae56dffbb07140b8f4228cfc061c5, type: 3} --- !u!224 &1642279425 stripped RectTransform: @@ -4189,7 +4260,8 @@ MonoBehaviour: tryCount: 0 beforeFirstAction: 0 tryCountUpTrigger: 0 - hasClearedOnce: 0 + hasClearedOnceInTime: 0 + hasClearedOnceInMove: 0 --- !u!4 &1755156425 Transform: m_ObjectHideFlags: 0 @@ -4200,6 +4272,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 4 @@ -4247,6 +4320,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 24088657} m_RootOrder: 6 @@ -4324,6 +4398,18 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 + - m_Target: {fileID: 1430318116} + m_TargetAssemblyTypeName: PlayManager, Assembly-CSharp + m_MethodName: TutorialTimeoutCountUp + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 - m_Target: {fileID: 224579977} m_TargetAssemblyTypeName: TutorialGuide, Assembly-CSharp m_MethodName: RetryButtonDown @@ -4376,7 +4462,7 @@ CanvasRenderer: m_CullTransparentMesh: 0 --- !u!95 &1783891386 Animator: - serializedVersion: 3 + serializedVersion: 5 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -4389,10 +4475,12 @@ Animator: m_UpdateMode: 0 m_ApplyRootMotion: 0 m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorControllerStateOnDisable: 0 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 --- !u!114 &1783891387 MonoBehaviour: m_ObjectHideFlags: 0 @@ -4408,7 +4496,7 @@ MonoBehaviour: tooltipPrefab: {fileID: 6095790650455668987, guid: 3617bb7300a723d468a84e27f5543876, type: 3} tooltipMessage: RetryTimeButton - tooltipWidth: 444 + tooltipWidth: 480 tooltipHeight: 168 pivot: 3 --- !u!1001 &1811126591 @@ -4416,6 +4504,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1851242258} m_Modifications: - target: {fileID: 4947973752511735336, guid: a97aafa8dc7aae24993ae294c8359b43, @@ -4534,6 +4623,13 @@ PrefabInstance: value: TimeoutPanel objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 3942173205810548199, guid: a97aafa8dc7aae24993ae294c8359b43, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1811126596} m_SourcePrefab: {fileID: 100100000, guid: a97aafa8dc7aae24993ae294c8359b43, type: 3} --- !u!1 &1811126592 stripped GameObject: @@ -4578,19 +4674,20 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_TrackedObjects: - - id: 0 + - rid: 0 references: - version: 1 - 00000000: + version: 2 + RefIds: + - rid: 0 type: {class: TrackedUGuiGraphic, ns: UnityEngine.Localization.PropertyVariants.TrackedObjects, asm: Unity.Localization} data: m_Target: {fileID: 1811126595} m_TrackedProperties: items: - - id: 1 + - rid: 1 m_UpdateType: 0 - 00000001: + - rid: 1 type: {class: LocalizedStringProperty, ns: UnityEngine.Localization.PropertyVariants.TrackedProperties, asm: Unity.Localization} data: @@ -4632,6 +4729,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1287567346} m_Father: {fileID: 24088657} @@ -4707,6 +4805,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 1, y: 2, z: 0} m_LocalScale: {x: 11.11111, y: 11.11111, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 713554044} m_RootOrder: 1 @@ -4722,6 +4821,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -4838,7 +4938,9 @@ Canvas: m_OverrideSorting: 0 m_OverridePixelPerfect: 0 m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 0 m_AdditionalShaderChannelsFlag: 0 + m_UpdateRectTransformForStandalone: 0 m_SortingLayerID: 0 m_SortingOrder: 0 m_TargetDisplay: 0 @@ -4852,6 +4954,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0, y: 0, z: 0} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 453556306} - {fileID: 1811126593} @@ -4877,6 +4980,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 24088657} m_Modifications: - target: {fileID: 772091377553154923, guid: 572232613a4c4f2419c8447db52259db, @@ -5045,6 +5149,13 @@ PrefabInstance: value: GravityButtonRetry objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 772091377553154925, guid: 572232613a4c4f2419c8447db52259db, + type: 3} + insertIndex: -1 + addedObject: {fileID: 457227424} m_SourcePrefab: {fileID: 100100000, guid: 572232613a4c4f2419c8447db52259db, type: 3} --- !u!224 &1877085892 stripped RectTransform: @@ -5069,6 +5180,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1851242258} m_Modifications: - target: {fileID: 1788800189684379114, guid: ab016032a72db2d4cb0b255953e0dc4b, @@ -5091,6 +5203,21 @@ PrefabInstance: propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_Target value: objectReference: {fileID: 1430318116} + - target: {fileID: 1788800190194448737, guid: ab016032a72db2d4cb0b255953e0dc4b, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[2].m_Target + value: + objectReference: {fileID: 1430318116} + - target: {fileID: 1788800190194448737, guid: ab016032a72db2d4cb0b255953e0dc4b, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[2].m_MethodName + value: Resume + objectReference: {fileID: 0} + - target: {fileID: 1788800190194448737, guid: ab016032a72db2d4cb0b255953e0dc4b, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[2].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} - target: {fileID: 1788800190199287468, guid: ab016032a72db2d4cb0b255953e0dc4b, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target @@ -5111,6 +5238,21 @@ PrefabInstance: propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[4].m_Target value: objectReference: {fileID: 1430318116} + - target: {fileID: 1788800190199287468, guid: ab016032a72db2d4cb0b255953e0dc4b, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[5].m_Target + value: + objectReference: {fileID: 1430318116} + - target: {fileID: 1788800190199287468, guid: ab016032a72db2d4cb0b255953e0dc4b, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[5].m_MethodName + value: Resume + objectReference: {fileID: 0} + - target: {fileID: 1788800190199287468, guid: ab016032a72db2d4cb0b255953e0dc4b, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[5].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} - target: {fileID: 1788800190535769285, guid: ab016032a72db2d4cb0b255953e0dc4b, type: 3} propertyPath: m_AnchorMax.y @@ -5266,6 +5408,26 @@ PrefabInstance: propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[3].m_Target value: objectReference: {fileID: 591191598} + - target: {fileID: 1788800191260194214, guid: ab016032a72db2d4cb0b255953e0dc4b, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[4].m_Target + value: + objectReference: {fileID: 1430318116} + - target: {fileID: 1788800191260194214, guid: ab016032a72db2d4cb0b255953e0dc4b, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[4].m_MethodName + value: Resume + objectReference: {fileID: 0} + - target: {fileID: 1788800191260194214, guid: ab016032a72db2d4cb0b255953e0dc4b, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[4].m_TargetAssemblyTypeName + value: PlayManager, Assembly-CSharp + objectReference: {fileID: 0} + - target: {fileID: 1788800191260194214, guid: ab016032a72db2d4cb0b255953e0dc4b, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[4].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} - target: {fileID: 1788800191300486960, guid: ab016032a72db2d4cb0b255953e0dc4b, type: 3} propertyPath: m_AnchorMax.y @@ -5302,6 +5464,33 @@ PrefabInstance: value: PlayButtonSFX objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 1788800190577679305, guid: ab016032a72db2d4cb0b255953e0dc4b, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1921234872} + - targetCorrespondingSourceObject: {fileID: 1788800191428183895, guid: ab016032a72db2d4cb0b255953e0dc4b, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1921234871} + - targetCorrespondingSourceObject: {fileID: 1788800191566990105, guid: ab016032a72db2d4cb0b255953e0dc4b, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1921234870} + - targetCorrespondingSourceObject: {fileID: 1788800190094284259, guid: ab016032a72db2d4cb0b255953e0dc4b, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1921234869} + - targetCorrespondingSourceObject: {fileID: 1788800191633508124, guid: ab016032a72db2d4cb0b255953e0dc4b, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1921234868} + - targetCorrespondingSourceObject: {fileID: 1788800189684379116, guid: ab016032a72db2d4cb0b255953e0dc4b, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1921234867} m_SourcePrefab: {fileID: 100100000, guid: ab016032a72db2d4cb0b255953e0dc4b, type: 3} --- !u!224 &1921234854 stripped RectTransform: @@ -5430,19 +5619,20 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_TrackedObjects: - - id: 0 + - rid: 0 references: - version: 1 - 00000000: + version: 2 + RefIds: + - rid: 0 type: {class: TrackedUGuiGraphic, ns: UnityEngine.Localization.PropertyVariants.TrackedObjects, asm: Unity.Localization} data: m_Target: {fileID: 1921234856} m_TrackedProperties: items: - - id: 1 + - rid: 1 m_UpdateType: 0 - 00000001: + - rid: 1 type: {class: LocalizedStringProperty, ns: UnityEngine.Localization.PropertyVariants.TrackedProperties, asm: Unity.Localization} data: @@ -5469,19 +5659,20 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_TrackedObjects: - - id: 0 + - rid: 0 references: - version: 1 - 00000000: + version: 2 + RefIds: + - rid: 0 type: {class: TrackedUGuiGraphic, ns: UnityEngine.Localization.PropertyVariants.TrackedObjects, asm: Unity.Localization} data: m_Target: {fileID: 1921234858} m_TrackedProperties: items: - - id: 1 + - rid: 1 m_UpdateType: 0 - 00000001: + - rid: 1 type: {class: LocalizedStringProperty, ns: UnityEngine.Localization.PropertyVariants.TrackedProperties, asm: Unity.Localization} data: @@ -5508,19 +5699,20 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_TrackedObjects: - - id: 0 + - rid: 0 references: - version: 1 - 00000000: + version: 2 + RefIds: + - rid: 0 type: {class: TrackedUGuiGraphic, ns: UnityEngine.Localization.PropertyVariants.TrackedObjects, asm: Unity.Localization} data: m_Target: {fileID: 1921234860} m_TrackedProperties: items: - - id: 1 + - rid: 1 m_UpdateType: 0 - 00000001: + - rid: 1 type: {class: LocalizedStringProperty, ns: UnityEngine.Localization.PropertyVariants.TrackedProperties, asm: Unity.Localization} data: @@ -5547,19 +5739,20 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_TrackedObjects: - - id: 0 + - rid: 0 references: - version: 1 - 00000000: + version: 2 + RefIds: + - rid: 0 type: {class: TrackedUGuiGraphic, ns: UnityEngine.Localization.PropertyVariants.TrackedObjects, asm: Unity.Localization} data: m_Target: {fileID: 1921234862} m_TrackedProperties: items: - - id: 1 + - rid: 1 m_UpdateType: 0 - 00000001: + - rid: 1 type: {class: LocalizedStringProperty, ns: UnityEngine.Localization.PropertyVariants.TrackedProperties, asm: Unity.Localization} data: @@ -5586,19 +5779,20 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_TrackedObjects: - - id: 0 + - rid: 0 references: - version: 1 - 00000000: + version: 2 + RefIds: + - rid: 0 type: {class: TrackedUGuiGraphic, ns: UnityEngine.Localization.PropertyVariants.TrackedObjects, asm: Unity.Localization} data: m_Target: {fileID: 1921234864} m_TrackedProperties: items: - - id: 1 + - rid: 1 m_UpdateType: 0 - 00000001: + - rid: 1 type: {class: LocalizedStringProperty, ns: UnityEngine.Localization.PropertyVariants.TrackedProperties, asm: Unity.Localization} data: @@ -5625,19 +5819,20 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_TrackedObjects: - - id: 0 + - rid: 0 references: - version: 1 - 00000000: + version: 2 + RefIds: + - rid: 0 type: {class: TrackedUGuiGraphic, ns: UnityEngine.Localization.PropertyVariants.TrackedObjects, asm: Unity.Localization} data: m_Target: {fileID: 1921234866} m_TrackedProperties: items: - - id: 1 + - rid: 1 m_UpdateType: 0 - 00000001: + - rid: 1 type: {class: LocalizedStringProperty, ns: UnityEngine.Localization.PropertyVariants.TrackedProperties, asm: Unity.Localization} data: @@ -5679,6 +5874,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1304023982} m_RootOrder: 3 @@ -5756,6 +5952,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0.38268343, w: 0.92387956} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1191982079} m_RootOrder: 0 @@ -5882,6 +6079,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1851242258} m_Modifications: - target: {fileID: 68448728184568793, guid: 148489a5a8f82564ba520981cd5363c1, @@ -6020,6 +6218,13 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 4286981598162945105, guid: 148489a5a8f82564ba520981cd5363c1, + type: 3} + insertIndex: -1 + addedObject: {fileID: 68448728184568799} m_SourcePrefab: {fileID: 100100000, guid: 148489a5a8f82564ba520981cd5363c1, type: 3} --- !u!1 &68448728184568797 stripped GameObject: @@ -6052,19 +6257,20 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_TrackedObjects: - - id: 0 + - rid: 0 references: - version: 1 - 00000000: + version: 2 + RefIds: + - rid: 0 type: {class: TrackedUGuiGraphic, ns: UnityEngine.Localization.PropertyVariants.TrackedObjects, asm: Unity.Localization} data: m_Target: {fileID: 68448728184568798} m_TrackedProperties: items: - - id: 1 + - rid: 1 m_UpdateType: 0 - 00000001: + - rid: 1 type: {class: LocalizedStringProperty, ns: UnityEngine.Localization.PropertyVariants.TrackedProperties, asm: Unity.Localization} data: @@ -6144,6 +6350,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1851242258} m_RootOrder: 5 diff --git a/Assets/Scripts/CreditManager.cs b/Assets/Scripts/CreditManager.cs deleted file mode 100644 index 054e69a..0000000 --- a/Assets/Scripts/CreditManager.cs +++ /dev/null @@ -1,19 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; -using UnityEngine.SceneManagement; - -public class CreditManager : MonoBehaviour -{ - private void Update() - { - if (Input.GetKeyUp(KeyCode.Escape) || Input.GetKeyUp(KeyCode.Return)) - { - GameManager.gm.PlayButtonSFX(); - GameManager.gm.LoadSetting(); - } - } - public void BackMainButtonDown(){ - GameManager.gm.LoadSetting(); - } -} diff --git a/Assets/Scripts/EditorManager.cs b/Assets/Scripts/EditorManager.cs index bfbf825..7de304c 100644 --- a/Assets/Scripts/EditorManager.cs +++ b/Assets/Scripts/EditorManager.cs @@ -1545,7 +1545,7 @@ public void EditOpenPhase() } catch (Exception e) { - statusUI.SetStatusMessageWithFlashing(e.Message, 2f); + statusUI.SetStatusMessageWithFlashing(e.ToString(), 2f); return; } #endif @@ -1555,12 +1555,12 @@ public void EditOpenPhase() if (!Directory.Exists(MapManager.MAP_ROOT_PATH)) { Debug.LogWarning("File warning: there is no directory \"" + MapManager.MAP_ROOT_PATH + "\""); - Directory.CreateDirectory(MapManager.MAP_ROOT_PATH); + MetaUtil.CreateDirectory(MapManager.MAP_ROOT_PATH); } } catch (Exception e) { - statusUI.SetStatusMessageWithFlashing(e.Message, 2f); + statusUI.SetStatusMessageWithFlashing(e.ToString(), 2f); return; } @@ -1834,7 +1834,7 @@ public void EditSavePhase() } catch (Exception e) { - statusUI.SetStatusMessageWithFlashing(e.Message, 2f); + statusUI.SetStatusMessageWithFlashing(e.ToString(), 2f); return; } #endif @@ -1842,7 +1842,7 @@ public void EditSavePhase() if (!Directory.Exists(MapManager.MAP_ROOT_PATH)) { Debug.LogWarning("File warning: there is no directory \"" + MapManager.MAP_ROOT_PATH + "\""); - Directory.CreateDirectory(MapManager.MAP_ROOT_PATH); + MetaUtil.CreateDirectory(MapManager.MAP_ROOT_PATH); } RenderSaveScrollView(MapManager.MAP_ROOT_PATH); @@ -2092,7 +2092,7 @@ private void CreateNewFolder() if (!Directory.Exists(currentSavePath.TrimEnd('/') + "/" + folderName)) { - Directory.CreateDirectory(currentSavePath.TrimEnd('/') + "/" + folderName); + MetaUtil.CreateDirectory(currentSavePath.TrimEnd('/') + "/" + folderName); statusUI.SetStatusMessageWithFlashing( LocalizationSettings.StringDatabase.GetLocalizedString(tableName, "editor_create_folder_success_part1") + folderName @@ -2148,7 +2148,7 @@ public void EditSave() { if (!Directory.Exists(currentSavePath.TrimEnd('/'))) { - Directory.CreateDirectory(currentSavePath.TrimEnd('/')); + MetaUtil.CreateDirectory(currentSavePath.TrimEnd('/')); } } catch (Exception e) @@ -2874,8 +2874,8 @@ public EditActionInfo(ObjectInfo oldObjectInfo, ObjectInfo newObjectInfo) /// /// Type: MassRemoval (Reset, New) /// - /// ������ null - /// ������ null + /// 없으면 null + /// 없으면 null public EditActionInfo(List oldRemovedWalls, List oldRemovedObjects) { type = Type.MassRemoval; diff --git a/Assets/Scripts/GameManager.cs b/Assets/Scripts/GameManager.cs index d4d7068..799e2c1 100644 --- a/Assets/Scripts/GameManager.cs +++ b/Assets/Scripts/GameManager.cs @@ -7,6 +7,7 @@ using UnityEngine; using UnityEngine.SceneManagement; using UnityEngine.Localization.Settings; +using UnityEngine.UI; #if UNITY_EDITOR using UnityEditor; #endif @@ -60,8 +61,14 @@ public int PlayingMapIndex{ public List starSfxs; public float sfxVolume = 0.8f; - public enum Language { English = 0, Korean = 1 } - +#if UNITY_STANDALONE_OSX + public KeyCode timeOutKey1 = KeyCode.LeftAlt; + public KeyCode timeOutKey2 = KeyCode.RightAlt; +#else + public KeyCode timeOutKey1 = KeyCode.LeftControl; + public KeyCode timeOutKey2 = KeyCode.RightControl; +#endif + private void Awake() { if (gm != null && gm != this) @@ -78,7 +85,8 @@ void Start() { bgmAudioSource.volume = Mathf.Clamp01(bgmVolume); sfxAudioSource.volume = 1f; - Initialize(); + LoadSettingsValue(); + Initialize(); #if UNITY_ANDROID && !UNITY_EDITOR if (!Permission.HasUserAuthorizedPermission(Permission.ExternalStorageWrite)) @@ -134,7 +142,7 @@ void Update() { mm.ManipulateGravityRight(); } - else if (Input.GetKeyUp(KeyCode.Space) && (Input.GetKey(KeyCode.LeftControl) || Input.GetKey(KeyCode.RightControl))) + else if (Input.GetKeyUp(KeyCode.Space) && (Input.GetKey(timeOutKey1) || Input.GetKey(timeOutKey2))) { if (mm.gravityRetryTimeButton != null && mm.gravityRetryTimeButton.gameObject.activeInHierarchy && mm.gravityRetryTimeButton.interactable) @@ -149,7 +157,7 @@ void Update() } else if (Input.GetKeyUp(KeyCode.Space)) { - if (mm.gravityRetryButton != null && + if (mm.gravityRetryButton != null && mm.gravityRetryButton.gameObject.activeInHierarchy && mm.gravityRetryButton.interactable) { mm.gravityRetryButton.onClick.Invoke(); @@ -160,7 +168,7 @@ void Update() mm.gravityRetryHighlightedButton.onClick.Invoke(); } } - else if (Input.GetKeyUp(KeyCode.Return) && (Input.GetKey(KeyCode.LeftControl) || Input.GetKey(KeyCode.RightControl)) + else if (Input.GetKeyUp(KeyCode.Return) && (Input.GetKey(timeOutKey1) || Input.GetKey(timeOutKey2)) && pm != null && pm.IsReady && SceneManager.GetActiveScene().name.Equals("Adventure")) { if (pm.nextButton != null && pm.nextButton.gameObject.activeInHierarchy && pm.nextButton.interactable) @@ -199,20 +207,28 @@ void Update() } */ } + else if (Input.GetKeyUp(KeyCode.Return) && SceneManager.GetActiveScene().name.Equals("Editor") && + em != null && em.editorNextButton4.gameObject.activeInHierarchy && em.editorNextButton4.interactable) + { + em.editorNextButton4.onClick.Invoke(); + } else if (Input.GetKeyUp(KeyCode.Escape) && pm != null) { if (pm.pauseButton != null && pm.pauseButton.gameObject.activeInHierarchy && pm.pauseButton.interactable) { pm.pauseButton.onClick.Invoke(); } - else if (pm.pauseUI != null && pm.pauseUI.gameObject.activeInHierarchy && pm.pauseUI.pauseReturnButton.interactable) - { - pm.pauseUI.pauseReturnButton.onClick.Invoke(); - } } } else { + if (Input.GetKeyUp(KeyCode.Escape) && pm != null) + { + if (pm.pauseUI != null && pm.pauseUI.gameObject.activeInHierarchy && pm.pauseUI.pauseReturnButton.interactable) + { + pm.pauseUI.pauseReturnButton.onClick.Invoke(); + } + } if (Input.GetKeyUp(KeyCode.Return)) { if (pm != null) //Custom, Training: pm의 객체에 속한 버튼을 누름 @@ -277,10 +293,16 @@ void Update() { em.editorOpenButton6.onClick.Invoke(); } - else if (em.editorSaveButton6.gameObject.activeInHierarchy && em.editorSaveButton6.interactable) + /* + else if (em.editorSaveButton6.gameObject.activeInHierarchy && em.editorSaveButton6.interactable && !em.isMapNameInputSelected) { em.editorSaveButton6.onClick.Invoke(); } + if (em.isMapNameInputSelected) + { + Debug.Log("editorMapNameInputs selected"); + } + */ break; } } @@ -298,7 +320,7 @@ void Initialize() bool isTutorialDone = true; try { - if (!File.Exists(Application.persistentDataPath + "/TutorialDone.txt")) + if (!File.Exists(Application.persistentDataPath.TrimEnd('/') + "/TutorialDone.txt")) { LoadFirst(); isTutorialDone = false; @@ -862,9 +884,9 @@ IEnumerator InitializeMode() walls.Add(new WallInfo(WallInfo.Type.Horizontal, 10, 1)); walls.Add(new WallInfo(WallInfo.Type.ExitVertical, 0, 3)); - if (File.Exists(Application.persistentDataPath + "/TutorialDone.txt")) + if (File.Exists(Application.persistentDataPath.TrimEnd('/') + "/TutorialDone.txt")) { - FileStream fs = new FileStream(Application.persistentDataPath + "/TutorialDone.txt", FileMode.Open, FileAccess.ReadWrite); + FileStream fs = new FileStream(Application.persistentDataPath.TrimEnd('/') + "/TutorialDone.txt", FileMode.Open, FileAccess.ReadWrite); StreamReader sr = new StreamReader(fs, Encoding.UTF8); try @@ -990,13 +1012,13 @@ IEnumerator InitializeAdventureLevel() walls.Add(new WallInfo(WallInfo.Type.Horizontal, 8, 1)); walls.Add(new WallInfo(WallInfo.Type.ExitVertical, 0, 3)); - if (!File.Exists(Application.persistentDataPath + "/AdventureLevel.txt")) + if (!File.Exists(Application.persistentDataPath.TrimEnd('/') + "/AdventureLevel.txt")) { FileStream fs = null; StreamWriter sw = null; try { - fs = new FileStream(Application.persistentDataPath + "/AdventureLevel.txt", FileMode.Create); + fs = new FileStream(Application.persistentDataPath.TrimEnd('/') + "/AdventureLevel.txt", FileMode.Create); sw = new StreamWriter(fs, Encoding.UTF8); sw.WriteLine("0"); sw.WriteLine("0"); @@ -1028,7 +1050,7 @@ IEnumerator InitializeAdventureLevel() bool hasReadSuccess = true; try { - fs = new FileStream(Application.persistentDataPath + "/AdventureLevel.txt", FileMode.Open); + fs = new FileStream(Application.persistentDataPath.TrimEnd('/') + "/AdventureLevel.txt", FileMode.Open); using (sr = new StreamReader(fs, Encoding.UTF8)) { string line; @@ -1075,7 +1097,7 @@ IEnumerator InitializeAdventureLevel() StreamWriter sw = null; try { - fs2 = new FileStream(Application.persistentDataPath + "/AdventureLevel.txt", FileMode.Create); + fs2 = new FileStream(Application.persistentDataPath.TrimEnd('/') + "/AdventureLevel.txt", FileMode.Create); sw = new StreamWriter(fs2, Encoding.UTF8); sw.WriteLine("0"); sw.WriteLine("0"); @@ -1309,11 +1331,11 @@ public void ReviseStar(PlayManager.Mode mode, int star) if (star < 0 || star > 3) return; - if (!File.Exists(Application.persistentDataPath + "/AdventureLevel.txt")) + if (!File.Exists(Application.persistentDataPath.TrimEnd('/') + "/AdventureLevel.txt")) { try { - fs = new FileStream(Application.persistentDataPath + "/AdventureLevel.txt", FileMode.Create); + fs = new FileStream(Application.persistentDataPath.TrimEnd('/') + "/AdventureLevel.txt", FileMode.Create); sw = new StreamWriter(fs, Encoding.UTF8); sw.WriteLine("0"); sw.WriteLine("0"); @@ -1330,7 +1352,7 @@ public void ReviseStar(PlayManager.Mode mode, int star) try { - fs = new FileStream(Application.persistentDataPath + "/AdventureLevel.txt", FileMode.Open, FileAccess.ReadWrite); + fs = new FileStream(Application.persistentDataPath.TrimEnd('/') + "/AdventureLevel.txt", FileMode.Open, FileAccess.ReadWrite); using (sr = new StreamReader(fs, Encoding.UTF8)) using (sw = new StreamWriter(fs, Encoding.UTF8)) { @@ -1399,4 +1421,114 @@ public void ReviseStar(PlayManager.Mode mode, int star) Debug.LogError(e.Message); } } + + public void LoadSettingsValue() + { + if (!File.Exists(Application.persistentDataPath.TrimEnd('/') + "/Settings.txt")) + { + SaveSettingsValue(); + } + else + { + FileStream fs = null; + StreamReader sr = null; + bool hasReadSuccess = true; + try + { + fs = new FileStream(Application.persistentDataPath.TrimEnd('/') + "/Settings.txt", FileMode.Open); + using (sr = new StreamReader(fs, Encoding.UTF8)) + { + string line; + + // 1st line: locale setting + line = sr.ReadLine().Trim(); + switch (line) + { + case "en": + case "ko": + LocalizationSettings.SelectedLocale = LocalizationSettings.AvailableLocales.GetLocale(line); + break; + default: + hasReadSuccess = false; + break; + } + + // 2nd line: BGM volume setting + line = sr.ReadLine().Trim(); + if (float.TryParse(line, out float bgmValue) && bgmValue >= 0f && bgmValue <= 1f) + { + bgmVolume = bgmValue; + } + else + { + hasReadSuccess = false; + } + + // 3rd line: SFX volume setting + line = sr.ReadLine().Trim(); + if (float.TryParse(line, out float sfxValue) && sfxValue >= 0f && sfxValue <= 1f) + { + sfxVolume = sfxValue; + } + else + { + hasReadSuccess = false; + } + } + } + catch (Exception e) + { + hasReadSuccess = false; + Debug.LogError(e.Message); + } + finally + { + sr.Close(); + fs.Close(); + } + + if (!hasReadSuccess) + { + Debug.LogWarning("File warning: Settings.txt seems to be corrupted"); + SaveSettingsValue(); + } + } + } + + public void SaveSettingsValue() + { + FileStream fs = null; + StreamWriter sw = null; + try + { + fs = new FileStream(Application.persistentDataPath.TrimEnd('/') + "/Settings.txt", FileMode.Create); + sw = new StreamWriter(fs, Encoding.UTF8); + string localeString = LocalizationSettings.SelectedLocale.ToString() switch + { + "English (en)" => "en", + "Korean (ko)" => "ko", + _ => "en", + }; + sw.WriteLine(localeString); + sw.WriteLine(bgmVolume.ToString()); + sw.WriteLine(sfxVolume.ToString()); + Debug.Log("Setting value saved"); + } + catch (Exception e) + { + Debug.LogError(e.Message); + } + finally + { + try + { + sw.Close(); + fs.Close(); + } + catch (Exception e) + { + Debug.LogError(e.Message); + } + } + } } diff --git a/Assets/Scripts/InputFieldInset.cs b/Assets/Scripts/InputFieldInset.cs index 361cae6..346586f 100644 --- a/Assets/Scripts/InputFieldInset.cs +++ b/Assets/Scripts/InputFieldInset.cs @@ -3,6 +3,7 @@ using UnityEngine; using UnityEngine.UI; using UnityEngine.EventSystems; +using UnityEditor; public class InputFieldInset : InputField { @@ -75,4 +76,18 @@ public void UpdateChildren() placeholder.rectTransform.localPosition = initialTextPos; } } + + public void MapNameInputDeselected() + { + StartCoroutine(DeselectAfterOneFrame()); + } + + IEnumerator DeselectAfterOneFrame() + { + onSubmit.Invoke(text); + yield return null; + if (EventSystem.current.currentSelectedGameObject != null && + EventSystem.current.currentSelectedGameObject.Equals(gameObject)) + EventSystem.current.SetSelectedGameObject(null); + } } diff --git a/Assets/Scripts/LimitModeUI.cs b/Assets/Scripts/LimitModeUI.cs new file mode 100644 index 0000000..abcb305 --- /dev/null +++ b/Assets/Scripts/LimitModeUI.cs @@ -0,0 +1,141 @@ +using System; +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.EventSystems; +using UnityEngine.Events; +using UnityEngine.UI; + +[Serializable] +public class LimitModeUI : MonoBehaviour, IPointerClickHandler +{ + public Image handleImage; + public Sprite timeSprite; + public Sprite moveSprite; + public UnityEvent onClick; + private Slider slider; + private float oldValue; + private bool isDragging; + + // Start is called before the first frame update + void Start() + { + slider = GetComponent(); + oldValue = slider.value; + isDragging = false; + if (GameManager.mm != null) + { + if (oldValue < (slider.minValue + slider.maxValue) * 0.5f) + { + GameManager.mm.LimitMode = MapManager.LimitModeEnum.Time; + } + else + { + GameManager.mm.LimitMode = MapManager.LimitModeEnum.Move; + } + } + } + + public void UpdateImage() + { + if (slider == null) return; + + if (slider.value < (slider.minValue + slider.maxValue) * 0.5f) + { + handleImage.sprite = timeSprite; + if (oldValue > (slider.minValue + slider.maxValue) * 0.5f) + { + isDragging = true; + } + } + else if (slider.value > (slider.minValue + slider.maxValue) * 0.5f) + { + handleImage.sprite = moveSprite; + if (oldValue < (slider.minValue + slider.maxValue) * 0.5f) + { + isDragging = true; + } + } + else // slider.value == (slider.minValue + slider.maxValue) * 0.5f + { + if (slider.value >= oldValue) + handleImage.sprite = timeSprite; + else + handleImage.sprite = moveSprite; + } + /* + if (slider.value != oldValue) + { + print("isDragging"); + isDragging = true; + } + */ + } + + /* + public void UpdateValue() + { + if (slider == null) return; + + if (slider.value < (slider.minValue + slider.maxValue) * 0.5f) + { + slider.value = slider.minValue; + } + else if (slider.value > (slider.minValue + slider.maxValue) * 0.5f) + { + slider.value = slider.maxValue; + } + else // slider.value == (slider.minValue + slider.maxValue) * 0.5f + { + if (slider.value >= oldValue) + slider.value = slider.minValue; + else + slider.value = slider.maxValue; + } + oldValue = slider.value; + isDragging = false; + } + */ + + public void Toggle() + { + if (slider == null) return; + + if (oldValue < (slider.minValue + slider.maxValue) * 0.5f && + (!isDragging || slider.value > (slider.minValue + slider.maxValue) * 0.5f)) + { + slider.value = slider.maxValue; + handleImage.sprite = moveSprite; + oldValue = slider.value; + } + else if (oldValue > (slider.minValue + slider.maxValue) * 0.5f && + (!isDragging || slider.value < (slider.minValue + slider.maxValue) * 0.5f)) + { + slider.value = slider.minValue; + handleImage.sprite = timeSprite; + oldValue = slider.value; + } + else + { + slider.value = oldValue; + } + isDragging = false; + + if (GameManager.mm != null) + { + if (oldValue < (slider.minValue + slider.maxValue) * 0.5f) + { + GameManager.mm.LimitMode = MapManager.LimitModeEnum.Time; + } + else + { + GameManager.mm.LimitMode = MapManager.LimitModeEnum.Move; + } + } + } + + public void OnPointerClick(PointerEventData eventData) + { + onClick.Invoke(); + } +} diff --git a/Assets/Scripts/CreditManager.cs.meta b/Assets/Scripts/LimitModeUI.cs.meta similarity index 83% rename from Assets/Scripts/CreditManager.cs.meta rename to Assets/Scripts/LimitModeUI.cs.meta index 27729b8..9a97d2b 100644 --- a/Assets/Scripts/CreditManager.cs.meta +++ b/Assets/Scripts/LimitModeUI.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 8fb96acb1be92bc4e94d93728112364f +guid: 553b47568e2e0c44bb55bbb1d95ae7af MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Scripts/MapManager.cs b/Assets/Scripts/MapManager.cs index 520886a..bebf8f9 100644 --- a/Assets/Scripts/MapManager.cs +++ b/Assets/Scripts/MapManager.cs @@ -7,8 +7,9 @@ using UnityEngine.Tilemaps; using UnityEngine.UI; using UnityEngine.SceneManagement; -using UnityEngine.Localization; using UnityEngine.Localization.Settings; +using Newtonsoft.Json; +using Newtonsoft.Json.Linq; public class MapManager : MonoBehaviour { @@ -25,6 +26,8 @@ public enum OpenFileFlag { Failed = 0, Success = 1, Restore = 2 } public enum RotationStatus { Original = 0, Clockwise90 = 1, Clockwise180 = 2, Clockwise270 = 3, UpsideDown = 4, UpsideDown90 = 5, UpsideDown180 = 6, UpsideDown270 = 7 } + public enum LimitModeEnum { Time = 0, Move = 1 } + public const int MIN_SIZE_X = 2; public const int MIN_SIZE_Y = 2; public const int MAX_SIZE_X = 9; @@ -40,6 +43,7 @@ public enum RotationStatus { Original = 0, Clockwise90 = 1, Clockwise180 = 2, Cl public const float DEFAULT_TIME_LIMIT = 30f; public const float MIN_TIME_LIMIT = 3f; public const float MAX_TIME_LIMIT = 30f; + public const float DEATH_ANIMATION_SPEED = 5f; public const int MAX_ENOUGH_DISTANCE = 100; [HideInInspector] @@ -91,11 +95,18 @@ public enum RotationStatus { Original = 0, Clockwise90 = 1, Clockwise180 = 2, Cl private int _originalSizeY = 0; private float _timeLimit; private bool _isReady = false; + private LimitModeEnum _limitMode = LimitModeEnum.Time; + [HideInInspector] public int tryCount = 0; + [HideInInspector] public bool beforeFirstAction = false; + [HideInInspector] public bool tryCountUpTrigger = false; - public bool hasClearedOnce = false; + [HideInInspector] + public bool hasClearedOnceInTime = false; + [HideInInspector] + public bool hasClearedOnceInMove = false; public int SizeX { @@ -129,6 +140,23 @@ public int ExitY get; private set; } + + public LimitModeEnum LimitMode + { + get + { + return _limitMode; + } + set + { + _limitMode = value; + + if (GameManager.pm != null) + { + GameManager.pm.ChangeLimitMode(_limitMode); + } + } + } public float TimeLimit { get @@ -160,6 +188,11 @@ public bool IsTimeActivated get; private set; } = false; + public int MoveLimit + { + get; + set; + } = int.MaxValue; public bool IsReady { @@ -202,13 +235,13 @@ public bool DoesTimeGoBy { get { - return IsReady && IsTimeActivated && IsTimePassing && !HasTimePaused && RemainingTime > 0f && !HasCleared; + return IsReady && LimitMode == LimitModeEnum.Time && IsTimeActivated && IsTimePassing && !HasTimePaused && RemainingTime > 0f && !HasCleared; } } void Update() { - gravityRetryButton.interactable = IsReady && ActionHistory != ""; + gravityRetryButton.interactable = IsReady && ActionHistory != "" && !HasCleared; if (DoesTimeGoBy) { RemainingTime -= Time.deltaTime; @@ -257,6 +290,7 @@ public void Initialize() IsTimePassing = false; HasTimePaused = false; RemainingTime = 0f; + MoveLimit = 0; tilemap.ClearAllTiles(); timeoutPanel.SetActive(false); } @@ -826,6 +860,7 @@ 여기 코드에서는 고쳤으나 MapManager의 인스펙터에서도 제 위 IsTimePassing = false; HasTimePaused = false; RemainingTime = 0f; + //MoveLimit = solution.Length; // TODO 메타 파일에서 최소 이동 횟수를 가져와야 함 tryCountUpTrigger = false; beforeFirstAction = true; //PrintMapCoord(); @@ -1087,8 +1122,11 @@ public void TimeActivate() gravityLeftButton.interactable = true; gravityRightButton.interactable = true; - RemainingTime = TimeLimit; - IsTimeActivated = true; + if (LimitMode == LimitModeEnum.Time) + { + RemainingTime = TimeLimit; + IsTimeActivated = true; + } IsTimePassing = false; HasTimePaused = false; timeoutPanel.SetActive(false); @@ -1097,19 +1135,19 @@ public void TimeActivate() public void TimePause() { - if (!IsReady || !IsTimeActivated) return; + if (!IsReady || LimitMode != LimitModeEnum.Time || !IsTimeActivated) return; HasTimePaused = true; } public void TimeResume() { - if (!IsReady || !IsTimeActivated) return; + if (!IsReady || LimitMode != LimitModeEnum.Time || !IsTimeActivated) return; HasTimePaused = false; } public void TimeSkip() { - if (!IsReady || !IsTimeActivated) return; + if (!IsReady || LimitMode != LimitModeEnum.Time || !IsTimeActivated) return; HasTimePaused = false; RemainingTime = 0f; timeoutPanel.SetActive(true); @@ -1121,6 +1159,7 @@ public void TimeSkip() private bool Simulate(Map map, Movable[,] initialMovableCoord, string solution) { + //print(solution); Movable[,] mutableMovableCoord = (Movable[,])initialMovableCoord.Clone(); foreach (char direction in solution.ToCharArray()) @@ -1163,7 +1202,7 @@ private bool Simulate(Map map, Movable[,] initialMovableCoord, string solution) /// public void RetryWithTime() { - if (!IsReady || (RemainingTime > 0f && !HasCleared)) return; + if (!IsReady || LimitMode != LimitModeEnum.Time || (RemainingTime > 0f && !HasCleared)) return; GameManager.gm.PlayRetrySFX(); TimeActivate(); RetryHelper(); @@ -1175,7 +1214,7 @@ public void RetryWithTime() /// public void Retry() { - if (!IsReady || RemainingTime <= 0f || HasCleared) return; + if (!IsReady || (LimitMode == LimitModeEnum.Time && RemainingTime <= 0f) || HasCleared) return; GameManager.gm.PlayRetrySFX(); RetryHelper(); } @@ -1235,7 +1274,9 @@ private void RetryHelper() public void ManipulateGravityUp() { - if (!IsReady || HasCleared || HasDied || RemainingTime <= 0f) return; + if (!IsReady || HasCleared || HasDied || + (LimitMode == LimitModeEnum.Time && RemainingTime <= 0f) || + (LimitMode == LimitModeEnum.Move && ActionHistory.Length >= MoveLimit)) return; IsTimePassing = true; if (beforeFirstAction) { @@ -1258,7 +1299,9 @@ public void ManipulateGravityUp() public void ManipulateGravityDown() { - if (!IsReady || HasCleared || HasDied || RemainingTime <= 0f) return; + if (!IsReady || HasCleared || HasDied || + (LimitMode == LimitModeEnum.Time && RemainingTime <= 0f) || + (LimitMode == LimitModeEnum.Move && ActionHistory.Length >= MoveLimit)) return; IsTimePassing = true; if (beforeFirstAction) { @@ -1281,7 +1324,9 @@ public void ManipulateGravityDown() public void ManipulateGravityLeft() { - if (!IsReady || HasCleared || HasDied || RemainingTime <= 0f) return; + if (!IsReady || HasCleared || HasDied || + (LimitMode == LimitModeEnum.Time && RemainingTime <= 0f) || + (LimitMode == LimitModeEnum.Move && ActionHistory.Length >= MoveLimit)) return; IsTimePassing = true; if (beforeFirstAction) { @@ -1304,7 +1349,9 @@ public void ManipulateGravityLeft() public void ManipulateGravityRight() { - if (!IsReady || HasCleared || HasDied || RemainingTime <= 0f) return; + if (!IsReady || HasCleared || HasDied || + (LimitMode == LimitModeEnum.Time && RemainingTime <= 0f) || + (LimitMode == LimitModeEnum.Move && ActionHistory.Length >= MoveLimit)) return; IsTimePassing = true; if (beforeFirstAction) { @@ -1327,28 +1374,18 @@ public void ManipulateGravityRight() public void TryCountUp(PlayManager pm, string metaPath, string mapHash) { - if (pm == null) return; + if (pm == null || LimitMode == LimitModeEnum.Move) return; tryCountUpTrigger = false; - Debug.Log("TryCount"); tryCount++; - Debug.Log(tryCount); - if (hasClearedOnce) return; - FileStream fs = new FileStream(metaPath, FileMode.OpenOrCreate, FileAccess.ReadWrite, FileShare.None); - StreamWriter sw = new StreamWriter(fs, Encoding.UTF8); - sw.WriteLine(tryCount.ToString()); - sw.WriteLine("False"); - sw.WriteLine(mapHash); - try - { - sw?.Close(); - fs?.Close(); - sw = null; - fs = null; - } - catch (Exception e) + Debug.Log("tryCount: " + tryCount); + if (hasClearedOnceInTime) return; + + Dictionary keyValuePairs = new Dictionary { - Debug.LogError(e.Message); - } + { "tryCount", tryCount } + }; + + MetaUtil.ModifyMetaFile(metaPath, mapHash, MapManager.LimitModeEnum.Time, keyValuePairs); } /// @@ -1359,7 +1396,9 @@ public void TryCountUp(PlayManager pm, string metaPath, string mapHash) public void Gravity(GameManager.GravityDirection gravityDirection, out Flag flag) { flag = Flag.Continued; - if (!IsReady || HasCleared || HasDied || RemainingTime <= 0f) return; + if (!IsReady || HasCleared || HasDied || + (LimitMode == LimitModeEnum.Time && RemainingTime <= 0f) || + (LimitMode == LimitModeEnum.Move && ActionHistory.Length >= MoveLimit)) return; // First, simulate to check if the ball can escape. Gravity(map.Clone(), (Movable[,])currentMovableCoord.Clone(), gravityDirection, true, out flag, out _, out _, out List moves); @@ -1373,24 +1412,26 @@ public void Gravity(GameManager.GravityDirection gravityDirection, out Flag flag { GameManager.gm.PlayEscapedSFX(); } - StartCoroutine(GravityWithAnimation(map, currentMovableCoord, gravityDirection, moves)); + StartCoroutine(GravityWithAnimation(map, currentMovableCoord, gravityDirection, moves, flag, 1f)); } else { - ActionHistory.Substring(0, ActionHistory.Length - 1); - currentMovableCoord = Gravity(map, currentMovableCoord, gravityDirection, false, out flag, out _, out _, out _); + ActionHistory = ActionHistory.Substring(0, ActionHistory.Length - 1); switch (flag) { case Flag.Squashed: HasDied = true; - GameManager.gm.PlaySquashedSFX(); + // GameManager.gm.PlaySquashedSFX(); + StartCoroutine(GravityWithAnimation(map, currentMovableCoord, gravityDirection, moves, flag, DEATH_ANIMATION_SPEED)); break; case Flag.Burned: HasDied = true; - GameManager.gm.PlayBurnedSFX(); + // GameManager.gm.PlayBurnedSFX(); + StartCoroutine(GravityWithAnimation(map, currentMovableCoord, gravityDirection, moves, flag, DEATH_ANIMATION_SPEED)); break; case Flag.Continued: + currentMovableCoord = Gravity(map, currentMovableCoord, gravityDirection, false, out flag, out _, out _, out _); Move ballMove = moves.Find(e => e.movable is Ball); if (Mathf.Max(Mathf.Abs(ballMove.newX - ballMove.oldX), Mathf.Abs(ballMove.newY - ballMove.oldY)) > 0) { @@ -1496,9 +1537,10 @@ public void Gravity(GameManager.GravityDirection gravityDirection, out Flag flag ballY = k + 1; move.newX = i + 1; move.newY = k + 1; + Debug.Log("The ball is burned at (" + ballX + ", " + ballY + ")"); + /* Unused if (!isSimulation) { - Debug.Log("The ball is burned at (" + ballX + ", " + ballY + ")"); GameObject g = Instantiate(flagBurnedPrefab, new Vector3(), Quaternion.identity, movableAndFixedGameObjects.transform); g.transform.localPosition = new Vector3(i + 1, k + 1, 0f); if (traceCoord[i, k] != null) @@ -1508,8 +1550,9 @@ public void Gravity(GameManager.GravityDirection gravityDirection, out Flag flag } traceCoord[i, k] = g; traces.Add(g); - mutableMovableCoord[i, j].gameObject.SetActive(false); + // mutableMovableCoord[i, j].gameObject.SetActive(false); } + */ mutableMovableCoord[i, j] = null; break; } @@ -1550,9 +1593,10 @@ public void Gravity(GameManager.GravityDirection gravityDirection, out Flag flag ballY = k + 1; move.newX = i + 1; move.newY = k + 1; + Debug.Log("The iron at (" + ballX + ", " + (j + 1) + ") squashes the ball at (" + ballX + ", " + ballY + ")"); + /* Unused if (!isSimulation) { - Debug.Log("The iron at (" + ballX + ", " + (j + 1) + ") squashes the ball at (" + ballX + ", " + ballY + ")"); GameObject g = Instantiate(flagSquashedPrefab, new Vector3(), Quaternion.identity, movableAndFixedGameObjects.transform); g.transform.localPosition = new Vector3(i + 1, k + 1, 0f); if (traceCoord[i, k] != null) @@ -1562,8 +1606,9 @@ public void Gravity(GameManager.GravityDirection gravityDirection, out Flag flag } traceCoord[i, k] = g; traces.Add(g); - mutableMovableCoord[i, k].gameObject.SetActive(false); + // mutableMovableCoord[i, k].gameObject.SetActive(false); } + */ mutableMovableCoord[i, k] = null; } if (CheckTileFlag(mutableMap.mapCoord[i, k], TileFlag.UpWall) || @@ -1692,9 +1737,10 @@ public void Gravity(GameManager.GravityDirection gravityDirection, out Flag flag ballY = k + 1; move.newX = i + 1; move.newY = k + 1; + Debug.Log("The ball is burned at (" + ballX + ", " + ballY + ")"); + /* Unused if (!isSimulation) { - Debug.Log("The ball is burned at (" + ballX + ", " + ballY + ")"); GameObject g = Instantiate(flagBurnedPrefab, new Vector3(), Quaternion.identity, movableAndFixedGameObjects.transform); g.transform.localPosition = new Vector3(i + 1, k + 1, 0f); if (traceCoord[i, k] != null) @@ -1704,8 +1750,9 @@ public void Gravity(GameManager.GravityDirection gravityDirection, out Flag flag } traceCoord[i, k] = g; traces.Add(g); - mutableMovableCoord[i, j].gameObject.SetActive(false); + // mutableMovableCoord[i, j].gameObject.SetActive(false); } + */ mutableMovableCoord[i, j] = null; break; } @@ -1746,9 +1793,10 @@ public void Gravity(GameManager.GravityDirection gravityDirection, out Flag flag ballY = k + 1; move.newX = i + 1; move.newY = k + 1; + Debug.Log("The iron at (" + ballX + ", " + (j + 1) + ") squashes the ball at (" + ballX + ", " + ballY + ")"); + /* Unused if (!isSimulation) { - Debug.Log("The iron at (" + ballX + ", " + (j + 1) + ") squashes the ball at (" + ballX + ", " + ballY + ")"); GameObject g = Instantiate(flagSquashedPrefab, new Vector3(), Quaternion.identity, movableAndFixedGameObjects.transform); g.transform.localPosition = new Vector3(i + 1, k + 1, 0f); if (traceCoord[i, k] != null) @@ -1758,8 +1806,9 @@ public void Gravity(GameManager.GravityDirection gravityDirection, out Flag flag } traceCoord[i, k] = g; traces.Add(g); - mutableMovableCoord[i, k].gameObject.SetActive(false); + // mutableMovableCoord[i, k].gameObject.SetActive(false); } + */ mutableMovableCoord[i, k] = null; } if (CheckTileFlag(mutableMap.mapCoord[i, k], TileFlag.DownWall) || @@ -1888,9 +1937,10 @@ public void Gravity(GameManager.GravityDirection gravityDirection, out Flag flag ballY = j + 1; move.newX = k + 1; move.newY = j + 1; + Debug.Log("The ball is burned at (" + ballX + ", " + ballY + ")"); + /* Unused if (!isSimulation) { - Debug.Log("The ball is burned at (" + ballX + ", " + ballY + ")"); GameObject g = Instantiate(flagBurnedPrefab, new Vector3(), Quaternion.identity, movableAndFixedGameObjects.transform); g.transform.localPosition = new Vector3(k + 1, j + 1, 0f); if (traceCoord[k, j] != null) @@ -1900,8 +1950,9 @@ public void Gravity(GameManager.GravityDirection gravityDirection, out Flag flag } traceCoord[k, j] = g; traces.Add(g); - mutableMovableCoord[i, j].gameObject.SetActive(false); + // mutableMovableCoord[i, j].gameObject.SetActive(false); } + */ mutableMovableCoord[i, j] = null; break; } @@ -1942,9 +1993,10 @@ public void Gravity(GameManager.GravityDirection gravityDirection, out Flag flag ballY = j + 1; move.newX = k + 1; move.newY = j + 1; + Debug.Log("The iron at (" + (i + 1) + ", " + ballY + ") squashes the ball at (" + ballX + ", " + ballY + ")"); + /* Unused if (!isSimulation) { - Debug.Log("The iron at (" + (i + 1) + ", " + ballY + ") squashes the ball at (" + ballX + ", " + ballY + ")"); GameObject g = Instantiate(flagSquashedPrefab, new Vector3(), Quaternion.identity, movableAndFixedGameObjects.transform); g.transform.localPosition = new Vector3(k + 1, j + 1, 0f); if (traceCoord[k, j] != null) @@ -1954,8 +2006,9 @@ public void Gravity(GameManager.GravityDirection gravityDirection, out Flag flag } traceCoord[k, j] = g; traces.Add(g); - mutableMovableCoord[k, j].gameObject.SetActive(false); + // mutableMovableCoord[k, j].gameObject.SetActive(false); } + */ mutableMovableCoord[k, j] = null; } if (CheckTileFlag(mutableMap.mapCoord[k, j], TileFlag.LeftWall) || @@ -2084,9 +2137,10 @@ public void Gravity(GameManager.GravityDirection gravityDirection, out Flag flag ballY = j + 1; move.newX = k + 1; move.newY = j + 1; + Debug.Log("The ball is burned at (" + ballX + ", " + ballY + ")"); + /* if (!isSimulation) { - Debug.Log("The ball is burned at (" + ballX + ", " + ballY + ")"); GameObject g = Instantiate(flagBurnedPrefab, new Vector3(), Quaternion.identity, movableAndFixedGameObjects.transform); g.transform.localPosition = new Vector3(k + 1, j + 1, 0f); if (traceCoord[k, j] != null) @@ -2096,8 +2150,9 @@ public void Gravity(GameManager.GravityDirection gravityDirection, out Flag flag } traceCoord[k, j] = g; traces.Add(g); - mutableMovableCoord[i, j].gameObject.SetActive(false); + // mutableMovableCoord[i, j].gameObject.SetActive(false); } + */ mutableMovableCoord[i, j] = null; break; } @@ -2264,9 +2319,10 @@ public void Gravity(GameManager.GravityDirection gravityDirection, out Flag flag ballY = j + 1; move.newX = k + 1; move.newY = j + 1; + Debug.Log("The iron at (" + (i + 1) + ", " + ballY + ") squashes the ball at (" + ballX + ", " + ballY + ")"); + /* Unused if (!isSimulation) { - Debug.Log("The iron at (" + (i + 1) + ", " + ballY + ") squashes the ball at (" + ballX + ", " + ballY + ")"); GameObject g = Instantiate(flagSquashedPrefab, new Vector3(), Quaternion.identity, movableAndFixedGameObjects.transform); g.transform.localPosition = new Vector3(k + 1, j + 1, 0f); if (traceCoord[k, j] != null) @@ -2276,8 +2332,9 @@ public void Gravity(GameManager.GravityDirection gravityDirection, out Flag flag } traceCoord[k, j] = g; traces.Add(g); - mutableMovableCoord[k, j].gameObject.SetActive(false); + // mutableMovableCoord[k, j].gameObject.SetActive(false); } + */ mutableMovableCoord[k, j] = null; } if (CheckTileFlag(mutableMap.mapCoord[k, j], TileFlag.RightWall) || @@ -2357,7 +2414,7 @@ public void Gravity(GameManager.GravityDirection gravityDirection, out Flag flag return mutableMovableCoord; } - IEnumerator GravityWithAnimation(Map mutableMap, Movable[,] mutableMovableCoord, GameManager.GravityDirection gravityDirection, List moves) + IEnumerator GravityWithAnimation(Map mutableMap, Movable[,] mutableMovableCoord, GameManager.GravityDirection gravityDirection, List moves, Flag flag, float animationSpeed) { float time = Time.time; if (traces != null) @@ -2371,11 +2428,11 @@ IEnumerator GravityWithAnimation(Map mutableMap, Movable[,] mutableMovableCoord, GameObject[,] traceCoord = new GameObject[mutableMap.sizeX, mutableMap.sizeY]; - while (Time.time <= time + 1.5f && IsReady && HasCleared) + while (Time.time <= time + 1.5f && IsReady && (HasCleared || HasDied)) { foreach (Move m in moves) { - bool hasPrevChanged = m.MoveAlongDirection(gravityDirection, Time.time - time, mutableMap); + bool hasPrevChanged = m.MoveAlongDirection(gravityDirection, Time.time - time, mutableMap, animationSpeed); if (hasPrevChanged) { int x, y; @@ -2386,7 +2443,7 @@ IEnumerator GravityWithAnimation(Map mutableMap, Movable[,] mutableMovableCoord, y = m.prevY - 1; if (m.movable is Ball) { - // Create a trace + // Create a trace of ball GameObject g = Instantiate(ballTracePrefabs[0], new Vector3(), Quaternion.identity, movableAndFixedGameObjects.transform); g.transform.localPosition = new Vector3(x, y, 0f); if (traceCoord[x - 1, y - 1] != null) @@ -2397,22 +2454,42 @@ IEnumerator GravityWithAnimation(Map mutableMap, Movable[,] mutableMovableCoord, traceCoord[x - 1, y - 1] = g; traces.Add(g); - // Activate a shutter - if (m.prevY - 1 < mutableMap.sizeY && CheckTileFlag(mutableMap.mapCoord[m.prevX - 1, m.prevY - 1], TileFlag.DownShutter)) + // Check if the ball is in the map + if (m.prevY - 1 < mutableMap.sizeY) { - mutableMap.mapCoord[m.prevX - 1, m.prevY - 1] -= (int)TileFlag.DownShutter / 2; - mutableMap.mapCoord[m.prevX - 1, m.prevY - 2] -= (int)TileFlag.UpShutter / 2; - tilemap.SetTile(new Vector3Int(m.prevX - 1, m.prevY - 1, 0), tiles[mutableMap.mapCoord[m.prevX - 1, m.prevY - 1] % 81]); - tilemap.SetTile(new Vector3Int(m.prevX - 1, m.prevY - 2, 0), tiles[mutableMap.mapCoord[m.prevX - 1, m.prevY - 2] % 81]); - GameManager.gm.PlayShutterSFX(); + // Activate a shutter + if (CheckTileFlag(mutableMap.mapCoord[m.prevX - 1, m.prevY - 1], TileFlag.DownShutter)) + { + mutableMap.mapCoord[m.prevX - 1, m.prevY - 1] -= (int)TileFlag.DownShutter / 2; + mutableMap.mapCoord[m.prevX - 1, m.prevY - 2] -= (int)TileFlag.UpShutter / 2; + tilemap.SetTile(new Vector3Int(m.prevX - 1, m.prevY - 1, 0), tiles[mutableMap.mapCoord[m.prevX - 1, m.prevY - 1] % 81]); + tilemap.SetTile(new Vector3Int(m.prevX - 1, m.prevY - 2, 0), tiles[mutableMap.mapCoord[m.prevX - 1, m.prevY - 2] % 81]); + GameManager.gm.PlayShutterSFX(); + } + + // Ball burned + if (CheckTileFlag(mutableMap.mapCoord[m.prevX - 1, m.prevY - 1], TileFlag.Fire)) + { + g = Instantiate(flagBurnedPrefab, new Vector3(), Quaternion.identity, movableAndFixedGameObjects.transform); + g.transform.localPosition = new Vector3(m.prevX, m.prevY, 0f); + if (traceCoord[m.prevX - 1, m.prevY - 1] != null) + { + traces.Remove(traceCoord[m.prevX - 1, m.prevY - 1]); + Destroy(traceCoord[m.prevX - 1, m.prevY - 1]); + } + traceCoord[m.prevX - 1, m.prevY - 1] = g; + traces.Add(g); + GameManager.gm.PlayBurnedSFX(); + m.movable.gameObject.SetActive(false); + } } } else if (m.movable is Iron) { - // Create a trace + // Create a trace of iron GameObject g = Instantiate(ironTracePrefabs[0], new Vector3(), Quaternion.identity, movableAndFixedGameObjects.transform); g.transform.localPosition = new Vector3(x, y, 0f); - if (traceCoord[x - 1, y - 1] != null) + if (traceCoord[x - 1, y - 1] != null && traceCoord[x - 1, y - 1].name.Contains("FlagBurned") == false) { traces.Remove(traceCoord[x - 1, y - 1]); Destroy(traceCoord[x - 1, y - 1]); @@ -2420,7 +2497,27 @@ IEnumerator GravityWithAnimation(Map mutableMap, Movable[,] mutableMovableCoord, traceCoord[x - 1, y - 1] = g; traces.Add(g); - if (Mathf.Approximately(m.movable.transform.localPosition.x, m.newX) && Mathf.Approximately(m.movable.transform.localPosition.y, m.newY)) + // Check if the iron is in the map + if (m.prevY - 1 < mutableMap.sizeY) + { + // Ball squashed + Move ballMove = moves.Find(e => e.movable is Ball); + if (m.prevX == ballMove.newX && m.prevY == ballMove.newY && m.prevX == m.newX && m.prevY == m.newY && flag == Flag.Squashed) + { + g = Instantiate(flagSquashedPrefab, new Vector3(), Quaternion.identity, movableAndFixedGameObjects.transform); + g.transform.localPosition = new Vector3(m.prevX, m.prevY, 0f); + if (traceCoord[m.prevX - 1, m.prevY - 1] != null) + { + traces.Remove(traceCoord[m.prevX - 1, m.prevY - 1]); + Destroy(traceCoord[m.prevX - 1, m.prevY - 1]); + } + traceCoord[m.prevX - 1, m.prevY - 1] = g; + traces.Add(g); + GameManager.gm.PlaySquashedSFX(); + } + } + + if (Mathf.Approximately(m.movable.transform.localPosition.x, m.newX) && Mathf.Approximately(m.movable.transform.localPosition.y, m.newY)) { GameManager.gm.PlayIronSFX(Mathf.Abs(m.newY - m.oldY)); } @@ -2431,7 +2528,7 @@ IEnumerator GravityWithAnimation(Map mutableMap, Movable[,] mutableMovableCoord, y = m.prevY + 1; if (m.movable is Ball) { - // Create a trace + // Create a trace of ball GameObject g = Instantiate(ballTracePrefabs[1], new Vector3(), Quaternion.identity, movableAndFixedGameObjects.transform); g.transform.localPosition = new Vector3(x, y, 0f); if (traceCoord[x - 1, y - 1] != null) @@ -2442,22 +2539,42 @@ IEnumerator GravityWithAnimation(Map mutableMap, Movable[,] mutableMovableCoord, traceCoord[x - 1, y - 1] = g; traces.Add(g); - // Activate a shutter - if (m.prevY - 1 >= 0 && CheckTileFlag(mutableMap.mapCoord[m.prevX - 1, m.prevY - 1], TileFlag.UpShutter)) + // Check if the ball is in the map + if (m.prevY - 1 >= 0) { - mutableMap.mapCoord[m.prevX - 1, m.prevY - 1] -= (int)TileFlag.UpShutter / 2; - mutableMap.mapCoord[m.prevX - 1, m.prevY] -= (int)TileFlag.DownShutter / 2; - tilemap.SetTile(new Vector3Int(m.prevX - 1, m.prevY - 1, 0), tiles[mutableMap.mapCoord[m.prevX - 1, m.prevY - 1] % 81]); - tilemap.SetTile(new Vector3Int(m.prevX - 1, m.prevY, 0), tiles[mutableMap.mapCoord[m.prevX - 1, m.prevY] % 81]); - GameManager.gm.PlayShutterSFX(); + // Activate a shutter + if (CheckTileFlag(mutableMap.mapCoord[m.prevX - 1, m.prevY - 1], TileFlag.UpShutter)) + { + mutableMap.mapCoord[m.prevX - 1, m.prevY - 1] -= (int)TileFlag.UpShutter / 2; + mutableMap.mapCoord[m.prevX - 1, m.prevY] -= (int)TileFlag.DownShutter / 2; + tilemap.SetTile(new Vector3Int(m.prevX - 1, m.prevY - 1, 0), tiles[mutableMap.mapCoord[m.prevX - 1, m.prevY - 1] % 81]); + tilemap.SetTile(new Vector3Int(m.prevX - 1, m.prevY, 0), tiles[mutableMap.mapCoord[m.prevX - 1, m.prevY] % 81]); + GameManager.gm.PlayShutterSFX(); + } + + // Ball burned + if (CheckTileFlag(mutableMap.mapCoord[m.prevX - 1, m.prevY - 1], TileFlag.Fire)) + { + g = Instantiate(flagBurnedPrefab, new Vector3(), Quaternion.identity, movableAndFixedGameObjects.transform); + g.transform.localPosition = new Vector3(m.prevX, m.prevY, 0f); + if (traceCoord[m.prevX - 1, m.prevY - 1] != null) + { + traces.Remove(traceCoord[m.prevX - 1, m.prevY - 1]); + Destroy(traceCoord[m.prevX - 1, m.prevY - 1]); + } + traceCoord[m.prevX - 1, m.prevY - 1] = g; + traces.Add(g); + GameManager.gm.PlayBurnedSFX(); + m.movable.gameObject.SetActive(false); + } } } else if (m.movable is Iron) { - // Create a trace + // Create a trace of iron GameObject g = Instantiate(ironTracePrefabs[1], new Vector3(), Quaternion.identity, movableAndFixedGameObjects.transform); g.transform.localPosition = new Vector3(x, y, 0f); - if (traceCoord[x - 1, y - 1] != null) + if (traceCoord[x - 1, y - 1] != null && traceCoord[x - 1, y - 1].name.Contains("FlagBurned") == false) { traces.Remove(traceCoord[x - 1, y - 1]); Destroy(traceCoord[x - 1, y - 1]); @@ -2465,6 +2582,26 @@ IEnumerator GravityWithAnimation(Map mutableMap, Movable[,] mutableMovableCoord, traceCoord[x - 1, y - 1] = g; traces.Add(g); + // Check if the iron is in the map + if (m.prevY - 1 < mutableMap.sizeY) + { + // Ball squashed + Move ballMove = moves.Find(e => e.movable is Ball); + if (m.prevX == ballMove.newX && m.prevY == ballMove.newY && m.prevX == m.newX && m.prevY == m.newY && flag == Flag.Squashed) + { + g = Instantiate(flagSquashedPrefab, new Vector3(), Quaternion.identity, movableAndFixedGameObjects.transform); + g.transform.localPosition = new Vector3(m.prevX, m.prevY, 0f); + if (traceCoord[m.prevX - 1, m.prevY - 1] != null) + { + traces.Remove(traceCoord[m.prevX - 1, m.prevY - 1]); + Destroy(traceCoord[m.prevX - 1, m.prevY - 1]); + } + traceCoord[m.prevX - 1, m.prevY - 1] = g; + traces.Add(g); + GameManager.gm.PlaySquashedSFX(); + } + } + if (Mathf.Approximately(m.movable.transform.localPosition.x, m.newX) && Mathf.Approximately(m.movable.transform.localPosition.y, m.newY)) { GameManager.gm.PlayIronSFX(Mathf.Abs(m.newY - m.oldY)); @@ -2476,7 +2613,7 @@ IEnumerator GravityWithAnimation(Map mutableMap, Movable[,] mutableMovableCoord, y = m.prevY; if (m.movable is Ball) { - // Create a trace + // Create a trace of ball GameObject g = Instantiate(ballTracePrefabs[2], new Vector3(), Quaternion.identity, movableAndFixedGameObjects.transform); g.transform.localPosition = new Vector3(x, y, 0f); if (traceCoord[x - 1, y - 1] != null) @@ -2487,22 +2624,42 @@ IEnumerator GravityWithAnimation(Map mutableMap, Movable[,] mutableMovableCoord, traceCoord[x - 1, y - 1] = g; traces.Add(g); - // Activate a shutter - if (m.prevX - 1 >= 0 && CheckTileFlag(mutableMap.mapCoord[m.prevX - 1, m.prevY - 1], TileFlag.RightShutter)) + // Check if the ball is in the map + if (m.prevX - 1 >= 0) { - mutableMap.mapCoord[m.prevX - 1, m.prevY - 1] -= (int)TileFlag.RightShutter / 2; - mutableMap.mapCoord[m.prevX, m.prevY - 1] -= (int)TileFlag.LeftShutter / 2; - tilemap.SetTile(new Vector3Int(m.prevX - 1, m.prevY - 1, 0), tiles[mutableMap.mapCoord[m.prevX - 1, m.prevY - 1] % 81]); - tilemap.SetTile(new Vector3Int(m.prevX, m.prevY - 1, 0), tiles[mutableMap.mapCoord[m.prevX, m.prevY - 1] % 81]); - GameManager.gm.PlayShutterSFX(); + // Activate a shutter + if (CheckTileFlag(mutableMap.mapCoord[m.prevX - 1, m.prevY - 1], TileFlag.RightShutter)) + { + mutableMap.mapCoord[m.prevX - 1, m.prevY - 1] -= (int)TileFlag.RightShutter / 2; + mutableMap.mapCoord[m.prevX, m.prevY - 1] -= (int)TileFlag.LeftShutter / 2; + tilemap.SetTile(new Vector3Int(m.prevX - 1, m.prevY - 1, 0), tiles[mutableMap.mapCoord[m.prevX - 1, m.prevY - 1] % 81]); + tilemap.SetTile(new Vector3Int(m.prevX, m.prevY - 1, 0), tiles[mutableMap.mapCoord[m.prevX, m.prevY - 1] % 81]); + GameManager.gm.PlayShutterSFX(); + } + + // Ball burned + if (CheckTileFlag(mutableMap.mapCoord[m.prevX - 1, m.prevY - 1], TileFlag.Fire)) + { + g = Instantiate(flagBurnedPrefab, new Vector3(), Quaternion.identity, movableAndFixedGameObjects.transform); + g.transform.localPosition = new Vector3(m.prevX, m.prevY, 0f); + if (traceCoord[m.prevX - 1, m.prevY - 1] != null) + { + traces.Remove(traceCoord[m.prevX - 1, m.prevY - 1]); + Destroy(traceCoord[m.prevX - 1, m.prevY - 1]); + } + traceCoord[m.prevX - 1, m.prevY - 1] = g; + traces.Add(g); + GameManager.gm.PlayBurnedSFX(); + m.movable.gameObject.SetActive(false); + } } } else if (m.movable is Iron) { - // Create a trace + // Create a trace of iron GameObject g = Instantiate(ironTracePrefabs[2], new Vector3(), Quaternion.identity, movableAndFixedGameObjects.transform); g.transform.localPosition = new Vector3(x, y, 0f); - if (traceCoord[x - 1, y - 1] != null) + if (traceCoord[x - 1, y - 1] != null && traceCoord[x - 1, y - 1].name.Contains("FlagBurned") == false) { traces.Remove(traceCoord[x - 1, y - 1]); Destroy(traceCoord[x - 1, y - 1]); @@ -2510,6 +2667,26 @@ IEnumerator GravityWithAnimation(Map mutableMap, Movable[,] mutableMovableCoord, traceCoord[x - 1, y - 1] = g; traces.Add(g); + // Check if the iron is in the map + if (m.prevY - 1 < mutableMap.sizeY) + { + // Ball squashed + Move ballMove = moves.Find(e => e.movable is Ball); + if (m.prevX == ballMove.newX && m.prevY == ballMove.newY && m.prevX == m.newX && m.prevY == m.newY && flag == Flag.Squashed) + { + g = Instantiate(flagSquashedPrefab, new Vector3(), Quaternion.identity, movableAndFixedGameObjects.transform); + g.transform.localPosition = new Vector3(m.prevX, m.prevY, 0f); + if (traceCoord[m.prevX - 1, m.prevY - 1] != null) + { + traces.Remove(traceCoord[m.prevX - 1, m.prevY - 1]); + Destroy(traceCoord[m.prevX - 1, m.prevY - 1]); + } + traceCoord[m.prevX - 1, m.prevY - 1] = g; + traces.Add(g); + GameManager.gm.PlaySquashedSFX(); + } + } + if (Mathf.Approximately(m.movable.transform.localPosition.x, m.newX) && Mathf.Approximately(m.movable.transform.localPosition.y, m.newY)) { GameManager.gm.PlayIronSFX(Mathf.Abs(m.newX - m.oldX)); @@ -2521,7 +2698,7 @@ IEnumerator GravityWithAnimation(Map mutableMap, Movable[,] mutableMovableCoord, y = m.prevY; if (m.movable is Ball) { - // Create a trace + // Create a trace of ball GameObject g = Instantiate(ballTracePrefabs[3], new Vector3(), Quaternion.identity, movableAndFixedGameObjects.transform); g.transform.localPosition = new Vector3(x, y, 0f); if (traceCoord[x - 1, y - 1] != null) @@ -2532,22 +2709,42 @@ IEnumerator GravityWithAnimation(Map mutableMap, Movable[,] mutableMovableCoord, traceCoord[x - 1, y - 1] = g; traces.Add(g); - // Activate a shutter - if (m.prevX - 1 < mutableMap.sizeX && CheckTileFlag(mutableMap.mapCoord[m.prevX - 1, m.prevY - 1], TileFlag.LeftShutter)) + // Check if the ball is in the map + if (m.prevX - 1 < mutableMap.sizeX) { - mutableMap.mapCoord[m.prevX - 1, m.prevY - 1] -= (int)TileFlag.LeftShutter / 2; - mutableMap.mapCoord[m.prevX - 2, m.prevY - 1] -= (int)TileFlag.RightShutter / 2; - tilemap.SetTile(new Vector3Int(m.prevX - 1, m.prevY - 1, 0), tiles[mutableMap.mapCoord[m.prevX - 1, m.prevY - 1] % 81]); - tilemap.SetTile(new Vector3Int(m.prevX - 2, m.prevY - 1, 0), tiles[mutableMap.mapCoord[m.prevX - 2, m.prevY - 1] % 81]); - GameManager.gm.PlayShutterSFX(); + // Activate a shutter + if (CheckTileFlag(mutableMap.mapCoord[m.prevX - 1, m.prevY - 1], TileFlag.LeftShutter)) + { + mutableMap.mapCoord[m.prevX - 1, m.prevY - 1] -= (int)TileFlag.LeftShutter / 2; + mutableMap.mapCoord[m.prevX - 2, m.prevY - 1] -= (int)TileFlag.RightShutter / 2; + tilemap.SetTile(new Vector3Int(m.prevX - 1, m.prevY - 1, 0), tiles[mutableMap.mapCoord[m.prevX - 1, m.prevY - 1] % 81]); + tilemap.SetTile(new Vector3Int(m.prevX - 2, m.prevY - 1, 0), tiles[mutableMap.mapCoord[m.prevX - 2, m.prevY - 1] % 81]); + GameManager.gm.PlayShutterSFX(); + } + + // Ball burned + if (CheckTileFlag(mutableMap.mapCoord[m.prevX - 1, m.prevY - 1], TileFlag.Fire)) + { + g = Instantiate(flagBurnedPrefab, new Vector3(), Quaternion.identity, movableAndFixedGameObjects.transform); + g.transform.localPosition = new Vector3(m.prevX, m.prevY, 0f); + if (traceCoord[m.prevX - 1, m.prevY - 1] != null) + { + traces.Remove(traceCoord[m.prevX - 1, m.prevY - 1]); + Destroy(traceCoord[m.prevX - 1, m.prevY - 1]); + } + traceCoord[m.prevX - 1, m.prevY - 1] = g; + traces.Add(g); + GameManager.gm.PlayBurnedSFX(); + m.movable.gameObject.SetActive(false); + } } } else if (m.movable is Iron) { - // Create a trace + // Create a trace of iron GameObject g = Instantiate(ironTracePrefabs[3], new Vector3(), Quaternion.identity, movableAndFixedGameObjects.transform); g.transform.localPosition = new Vector3(x, y, 0f); - if (traceCoord[x - 1, y - 1] != null) + if (traceCoord[x - 1, y - 1] != null && traceCoord[x - 1, y - 1].name.Contains("FlagBurned") == false) { traces.Remove(traceCoord[x - 1, y - 1]); Destroy(traceCoord[x - 1, y - 1]); @@ -2555,6 +2752,26 @@ IEnumerator GravityWithAnimation(Map mutableMap, Movable[,] mutableMovableCoord, traceCoord[x - 1, y - 1] = g; traces.Add(g); + // Check if the iron is in the map + if (m.prevY - 1 < mutableMap.sizeY) + { + // Ball squashed + Move ballMove = moves.Find(e => e.movable is Ball); + if (m.prevX == ballMove.newX && m.prevY == ballMove.newY && m.prevX == m.newX && m.prevY == m.newY && flag == Flag.Squashed) + { + g = Instantiate(flagSquashedPrefab, new Vector3(), Quaternion.identity, movableAndFixedGameObjects.transform); + g.transform.localPosition = new Vector3(m.prevX, m.prevY, 0f); + if (traceCoord[m.prevX - 1, m.prevY - 1] != null) + { + traces.Remove(traceCoord[m.prevX - 1, m.prevY - 1]); + Destroy(traceCoord[m.prevX - 1, m.prevY - 1]); + } + traceCoord[m.prevX - 1, m.prevY - 1] = g; + traces.Add(g); + GameManager.gm.PlaySquashedSFX(); + } + } + if (Mathf.Approximately(m.movable.transform.localPosition.x, m.newX) && Mathf.Approximately(m.movable.transform.localPosition.y, m.newY)) { GameManager.gm.PlayIronSFX(Mathf.Abs(m.newX - m.oldX)); @@ -2972,7 +3189,7 @@ public Move(Movable movable, int oldX, int oldY, int newX, int newY) this.prevY = oldY; } - public bool MoveAlongDirection(GameManager.GravityDirection gravityDirection, float t, Map map) + public bool MoveAlongDirection(GameManager.GravityDirection gravityDirection, float t, Map map, float animationSpeed) { bool hasPrevChanged = false; if (movable == null) return false; @@ -2981,7 +3198,7 @@ public bool MoveAlongDirection(GameManager.GravityDirection gravityDirection, fl switch (gravityDirection) { case GameManager.GravityDirection.Up: - transform.localPosition = new Vector3(transform.localPosition.x, Mathf.Clamp(Mathf.RoundToInt((oldY + 16 * t * t / 3) * 9) / 9f, oldY, newY), 0f); + transform.localPosition = new Vector3(transform.localPosition.x, Mathf.Clamp(Mathf.RoundToInt((oldY + 16 * t * t / 3 * animationSpeed) * 9) / 9f, oldY, newY), 0f); if (transform.localPosition.y >= prevY + 1 && prevY <= map.sizeY) { prevY += 1; @@ -2989,7 +3206,7 @@ public bool MoveAlongDirection(GameManager.GravityDirection gravityDirection, fl } break; case GameManager.GravityDirection.Down: - transform.localPosition = new Vector3(transform.localPosition.x, Mathf.Clamp(Mathf.RoundToInt((oldY - 16 * t * t / 3) * 9) / 9f, newY, oldY), 0f); + transform.localPosition = new Vector3(transform.localPosition.x, Mathf.Clamp(Mathf.RoundToInt((oldY - 16 * t * t / 3 * animationSpeed) * 9) / 9f, newY, oldY), 0f); if (transform.localPosition.y <= prevY - 1 && prevY >= 1) { prevY -= 1; @@ -2997,7 +3214,7 @@ public bool MoveAlongDirection(GameManager.GravityDirection gravityDirection, fl } break; case GameManager.GravityDirection.Left: - transform.localPosition = new Vector3(Mathf.Clamp(Mathf.RoundToInt((oldX - 16 * t * t / 3) * 9) / 9f, newX, oldX), transform.localPosition.y, 0f); + transform.localPosition = new Vector3(Mathf.Clamp(Mathf.RoundToInt((oldX - 16 * t * t / 3 * animationSpeed) * 9) / 9f, newX, oldX), transform.localPosition.y, 0f); if (transform.localPosition.x <= prevX - 1 && prevX >= 1) { prevX -= 1; @@ -3005,7 +3222,7 @@ public bool MoveAlongDirection(GameManager.GravityDirection gravityDirection, fl } break; case GameManager.GravityDirection.Right: - transform.localPosition = new Vector3(Mathf.Clamp(Mathf.RoundToInt((oldX + 16 * t * t / 3) * 9) / 9f, oldX, newX), transform.localPosition.y, 0f); + transform.localPosition = new Vector3(Mathf.Clamp(Mathf.RoundToInt((oldX + 16 * t * t / 3 * animationSpeed) * 9) / 9f, oldX, newX), transform.localPosition.y, 0f); if (transform.localPosition.x >= prevX + 1 && prevX <= map.sizeX) { prevX += 1; diff --git a/Assets/Scripts/MetaUtil.cs b/Assets/Scripts/MetaUtil.cs new file mode 100644 index 0000000..c53a3f6 --- /dev/null +++ b/Assets/Scripts/MetaUtil.cs @@ -0,0 +1,425 @@ +using System.Collections.Generic; +using System.IO; +using UnityEngine; +using Newtonsoft.Json; +using System.Text; +using System; +using Newtonsoft.Json.Linq; + +public class MetaUtil +{ + public static DirectoryInfo CreateDirectory(string path) + { + foreach (char c in Path.GetInvalidPathChars()) + { + if (path.Contains(c)) + { + Debug.LogError("File invalid: invalid directory name"); + return null; + } + } + path = path.Replace("\\", "/"); + while (path.Contains("//")) + { + path = path.Replace("//", "/"); + } + string[] dirs = path.Split('/'); + List validDirs = new List(); + foreach (string dir in dirs) + { + //Debug.Log(dir); + if (dir.Length == 0 || dir.Replace(".", "").Length != 0) + { + validDirs.Add(dir); + } + else + { + Debug.LogWarning("File warning: invalid directory name"); + } + } + path = string.Join("/", validDirs); + //Debug.Log(path); + return Directory.CreateDirectory(path); + } + + public static void CreateNewMetaFile(string metaPath, string mapHash, FileMode fileMode) + { + FileStream fs = null; + StringWriter sw = null; + try + { + fs = new FileStream(metaPath, fileMode, FileAccess.Write, FileShare.None); + StringBuilder sb = new StringBuilder(); + sw = new StringWriter(sb); + + using (JsonWriter writer = new JsonTextWriter(sw)) + { + writer.Formatting = Formatting.None; + writer.WriteStartObject(); + + writer.WritePropertyName("mapHash"); // Hash code + writer.WriteValue(mapHash); + + writer.WritePropertyName("timeLimitMode"); + writer.WriteStartObject(); + writer.WritePropertyName("tryCount"); // Try count for time limit mode + writer.WriteValue(0); + writer.WritePropertyName("hasClearedOnce"); // Has cleared in time limit mode? + writer.WriteValue(false); + writer.WriteEnd(); + + writer.WritePropertyName("moveLimitMode"); + writer.WriteStartObject(); + writer.WritePropertyName("minMoveCount"); // Minimum known move count for move limit mode + writer.WriteValue(int.MaxValue); + writer.WritePropertyName("hasClearedOnce"); // Has cleared in move limit mode? + writer.WriteValue(false); + writer.WriteEnd(); + + writer.WriteEndObject(); + + using (StreamWriter streamWriter = new(fs, Encoding.UTF8)) + { + streamWriter.WriteLine(sb.ToString()); + } + + /* Output meta JSON example (actually not indented): + * { + * "mapHash": "0d5b6b62ed79432c196462b962e02a3dc4de16496fbec63573fb0f010bef72c5", + * "timeLimitMode": { + * "tryCount": 0, + * "hasClearedOnce": False, + * }, + * "moveLimitMode": { + * "minMoveCount": 2147483647, + * "hasClearedOnce": False, + * } + * } + */ + } + } + catch (Exception e) + { + Debug.LogError(e); + } + finally + { + try + { + GameManager.mm.hasClearedOnceInTime = false; + GameManager.mm.tryCount = 0; + GameManager.mm.hasClearedOnceInMove = false; + GameManager.mm.MoveLimit = int.MaxValue; + sw?.Close(); + fs?.Close(); + } + catch (Exception e) + { + Debug.LogError(e); + } + } + } + + public static void ReinitializeMetaFile(string metaPath, string mapHash, MapManager.LimitModeEnum limitMode) + { + JObject json = ReadMetaFile(metaPath); + if (json == null) + { + CreateNewMetaFile(metaPath, mapHash, FileMode.Create); + return; + } + + FileStream fs = null; + StringBuilder sb = null; + StringWriter sw = null; + + if (limitMode == MapManager.LimitModeEnum.Time) { + JToken minMoveCount = GetValueFromMetaObject(json, mapHash, MapManager.LimitModeEnum.Move, "minMoveCount"); + JToken hasClearedOnceInMove = GetValueFromMetaObject(json, mapHash, MapManager.LimitModeEnum.Move, "hasClearedOnce"); + if (minMoveCount == null || hasClearedOnceInMove == null) + { + CreateNewMetaFile(metaPath, mapHash, FileMode.Create); + } + else + { + try + { + fs = new FileStream(metaPath, FileMode.Create, FileAccess.Write, FileShare.None); + sb = new StringBuilder(); + sw = new StringWriter(sb); + + using (JsonWriter writer = new JsonTextWriter(sw)) + { + writer.Formatting = Formatting.None; + writer.WriteStartObject(); + + writer.WritePropertyName("mapHash"); // Hash code + writer.WriteValue(mapHash); + + writer.WritePropertyName("timeLimitMode"); + writer.WriteStartObject(); + writer.WritePropertyName("tryCount"); // Try count for time limit mode + writer.WriteValue(0); + writer.WritePropertyName("hasClearedOnce"); // Has cleared in time limit mode? + writer.WriteValue(false); + writer.WriteEnd(); + + writer.WritePropertyName("moveLimitMode"); + writer.WriteStartObject(); + writer.WritePropertyName("minMoveCount"); // Minimum known move count for move limit mode + writer.WriteValue(minMoveCount); + writer.WritePropertyName("hasClearedOnce"); // Has cleared in move limit mode? + writer.WriteValue(hasClearedOnceInMove); + writer.WriteEnd(); + + writer.WriteEndObject(); + + using (StreamWriter streamWriter = new(fs, Encoding.UTF8)) + { + streamWriter.WriteLine(sb.ToString()); + } + + /* Output meta JSON example (actually not indented): + * { + * "mapHash": "0d5b6b62ed79432c196462b962e02a3dc4de16496fbec63573fb0f010bef72c5", + * "timeLimitMode": { + * "tryCount": 0, + * "hasClearedOnce": False, + * }, + * "moveLimitMode": { + * "minMoveCount": 17, + * "hasClearedOnce": True, + * } + * } + */ + } + } + catch (Exception e) + { + Debug.LogError(e); + } + finally + { + try + { + GameManager.mm.hasClearedOnceInTime = false; + GameManager.mm.tryCount = 0; + sw?.Close(); + fs?.Close(); + } + catch (Exception e) + { + Debug.LogError(e); + } + } + } + } + else // limitMode == MapManager.LimitModeEnum.Move + { + JToken tryCount = GetValueFromMetaObject(json, mapHash, MapManager.LimitModeEnum.Time, "tryCount"); + JToken hasClearedOnceInTime = GetValueFromMetaObject(json, mapHash, MapManager.LimitModeEnum.Time, "hasClearedOnce"); + if (tryCount == null || hasClearedOnceInTime == null) + { + CreateNewMetaFile(metaPath, mapHash, FileMode.Create); + } + else + { + try + { + fs = new FileStream(metaPath, FileMode.Create, FileAccess.Write, FileShare.None); + sb = new StringBuilder(); + sw = new StringWriter(sb); + + using (JsonWriter writer = new JsonTextWriter(sw)) + { + writer.Formatting = Formatting.None; + writer.WriteStartObject(); + + writer.WritePropertyName("mapHash"); // Hash code + writer.WriteValue(mapHash); + + writer.WritePropertyName("timeLimitMode"); + writer.WriteStartObject(); + writer.WritePropertyName("tryCount"); // Try count for time limit mode + writer.WriteValue(tryCount); + writer.WritePropertyName("hasClearedOnce"); // Has cleared in time limit mode? + writer.WriteValue(hasClearedOnceInTime); + writer.WriteEnd(); + + writer.WritePropertyName("moveLimitMode"); + writer.WriteStartObject(); + writer.WritePropertyName("minMoveCount"); // Minimum known move count for move limit mode + writer.WriteValue(int.MaxValue); + writer.WritePropertyName("hasClearedOnce"); // Has cleared in move limit mode? + writer.WriteValue(false); + writer.WriteEnd(); + + writer.WriteEndObject(); + + using (StreamWriter streamWriter = new(fs, Encoding.UTF8)) + { + streamWriter.WriteLine(sb.ToString()); + } + + /* Output meta JSON example (actually not indented): + * { + * "mapHash": "0d5b6b62ed79432c196462b962e02a3dc4de16496fbec63573fb0f010bef72c5", + * "timeLimitMode": { + * "tryCount": 6, + * "hasClearedOnce": True, + * }, + * "moveLimitMode": { + * "minMoveCount": 2147483647, + * "hasClearedOnce": False, + * } + * } + */ + } + } + catch (Exception e) + { + Debug.LogError(e); + } + finally + { + try + { + GameManager.mm.hasClearedOnceInMove = false; + GameManager.mm.MoveLimit = int.MaxValue; + sw?.Close(); + fs?.Close(); + } + catch (Exception e) + { + Debug.LogError(e); + } + } + } + } + + + } + + public static JObject ReadMetaFile(string metaPath) + { + string json = File.ReadAllText(metaPath); + UnityEngine.Debug.Log(metaPath); + UnityEngine.Debug.Log(json); + JObject jsonObj = JObject.Parse(json); + if (jsonObj == null) + { + Debug.LogWarning("File warning: meta file cannot be parsed into json"); + } + return jsonObj; + } + + public static void ModifyMetaFile(string metaPath, string mapHash, MapManager.LimitModeEnum limitMode, Dictionary keyValuePairs) + { + string json = File.ReadAllText(metaPath); + UnityEngine.Debug.Log(metaPath); + UnityEngine.Debug.Log(json); + JObject jsonObj = JObject.Parse(json); + if (jsonObj == null) + { + Debug.LogWarning("File warning: meta file cannot be parsed into json"); + return; + } + else if (jsonObj.GetValue("mapHash") == null || !((string)jsonObj.GetValue("mapHash")).Equals(mapHash)) + { + Debug.LogWarning("File warning: map hash of the meta file is invalid"); + return; + } + + string modeKey; + if (limitMode == MapManager.LimitModeEnum.Time) modeKey = "timeLimitMode"; + else modeKey = "moveLimitMode"; + + if (jsonObj.GetValue(modeKey) == null || jsonObj.GetValue(modeKey) is not JObject) + { + Debug.LogWarning("File warning: cannot find mode key from the meta file"); + return; + } + + foreach (KeyValuePair pair in keyValuePairs) + { + if (((JObject)jsonObj[modeKey]).GetValue(pair.Key) != null) + { + jsonObj[modeKey][pair.Key] = JToken.FromObject(pair.Value); + } + else + { + Debug.LogWarning("File warning: meta file doesn't have one of those keys"); + } + } + string output = JsonConvert.SerializeObject(jsonObj, Formatting.None); + + try + { + FileStream fs = new FileStream(metaPath, FileMode.Truncate, FileAccess.ReadWrite, FileShare.None); + using (StreamWriter sw = new StreamWriter(fs, Encoding.UTF8)) + { + sw.WriteLine(output); + } + fs?.Close(); + fs = null; + } + catch (Exception e) + { + Debug.LogError(e); + } + } + + public static JToken GetValueFromMetaObject(JObject metaObject, string mapHash, MapManager.LimitModeEnum limitMode, string key) + { + if (metaObject == null) + { + Debug.LogWarning("File warning: meta file cannot be parsed into json"); + return null; + } + else if (metaObject.GetValue("mapHash") == null || !((string)metaObject.GetValue("mapHash")).Equals(mapHash)) + { + Debug.LogWarning("File warning: map hash of the meta file is invalid"); + return null; + } + + string modeKey; + if (limitMode == MapManager.LimitModeEnum.Time) modeKey = "timeLimitMode"; + else modeKey = "moveLimitMode"; + + if (metaObject.GetValue(modeKey) == null || !(metaObject.GetValue(modeKey) is JObject)) + { + Debug.LogWarning("File warning: cannot find mode key from the meta file"); + return null; + } + + return ((JObject)metaObject[modeKey]).GetValue(key); + } + + public static string GetMapHashFromMetaObject(JObject metaObject) + { + if (metaObject == null) + { + Debug.LogWarning("File warning: meta file cannot be parsed into json"); + return null; + } + if (metaObject.GetValue("mapHash") == null) + { + return null; + } + return (string)metaObject.GetValue("mapHash"); + } + + public static string ExtentionTxtToJson(string txtPath) + { + string newPath = txtPath.TrimStart('/'); + int i = newPath.LastIndexOf('.'); + if (i == -1) + { + Debug.LogError("File error: " + txtPath + " is not a file"); + return txtPath; + } + newPath = newPath.Substring(0, i) + ".json"; + Debug.Log(newPath); + return newPath; + } +} diff --git a/Assets/Scripts/MetaUtil.cs.meta b/Assets/Scripts/MetaUtil.cs.meta new file mode 100644 index 0000000..0aeb37a --- /dev/null +++ b/Assets/Scripts/MetaUtil.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 9d3f5cc4e96db654098cbdaf79cd55ee +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/MinMoveCountUI.cs b/Assets/Scripts/MinMoveCountUI.cs new file mode 100644 index 0000000..a9a5b02 --- /dev/null +++ b/Assets/Scripts/MinMoveCountUI.cs @@ -0,0 +1,47 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.UI; + +public class MinMoveCountUI : MonoBehaviour +{ + public MapManager mm; + public Image minMoveCountLabel100; + public Image minMoveCountLabel10; + public Image minMoveCountLabel1; + public List numberLabels = new List(); + + + // Update is called once per frame + void Update() + { + if (!mm.IsReady) + { + minMoveCountLabel100.sprite = numberLabels[0]; + minMoveCountLabel10.sprite = numberLabels[0]; + minMoveCountLabel1.sprite = numberLabels[0]; + return; + } + + if (mm.MoveLimit > 999) + { + minMoveCountLabel100.sprite = numberLabels[9]; + minMoveCountLabel10.sprite = numberLabels[9]; + minMoveCountLabel1.sprite = numberLabels[9]; + } + else if (mm.MoveLimit < 0) + { + minMoveCountLabel100.sprite = numberLabels[0]; + minMoveCountLabel10.sprite = numberLabels[0]; + minMoveCountLabel1.sprite = numberLabels[0]; + } + else + { + minMoveCountLabel100.sprite = numberLabels[mm.MoveLimit / 100]; + minMoveCountLabel10.sprite = numberLabels[(mm.MoveLimit % 100) / 10]; + minMoveCountLabel1.sprite = numberLabels[mm.MoveLimit % 10]; + } + } + + +} diff --git a/Assets/Scripts/MinMoveCountUI.cs.meta b/Assets/Scripts/MinMoveCountUI.cs.meta new file mode 100644 index 0000000..1933975 --- /dev/null +++ b/Assets/Scripts/MinMoveCountUI.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 0013944cea7f0794da5e0e7fc2b06c0d +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/MoveLimitUI.cs b/Assets/Scripts/MoveLimitUI.cs new file mode 100644 index 0000000..df45715 --- /dev/null +++ b/Assets/Scripts/MoveLimitUI.cs @@ -0,0 +1,147 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.UI; + +public class MoveLimitUI : MonoBehaviour +{ + public MapManager mm; + public GameObject moveLimitDelimitersParent; + public GameObject moveLimitDelimiterPrefab; + public Image moveLimitBar; + public Image moveLimitLabel100; + public Image moveLimitLabel10; + public Image moveLimitLabel1; + public List numberLabels = new List(); + + private int oldMoveLimit = 0; + private List moveLimitDelimiters = new List(); + + // Update is called once per frame + void Update() + { + const float pixels = 744 / 12f; + + if (!mm.IsReady) + { + moveLimitLabel100.sprite = numberLabels[0]; + moveLimitLabel10.sprite = numberLabels[0]; + moveLimitLabel1.sprite = numberLabels[0]; + moveLimitBar.GetComponent().offsetMax = new Vector2( + -240 - pixels * 12, + moveLimitBar.GetComponent().offsetMax.y); + + return; + } + + int remainingMove = mm.MoveLimit - mm.ActionHistory.Length; + if (remainingMove < 0) + { + remainingMove = 0; + } + + if (remainingMove > 999f) + { + moveLimitLabel100.sprite = numberLabels[9]; + moveLimitLabel10.sprite = numberLabels[9]; + moveLimitLabel1.sprite = numberLabels[9]; + } + else + { + moveLimitLabel100.sprite = numberLabels[remainingMove / 100]; + moveLimitLabel10.sprite = numberLabels[remainingMove % 100 / 10]; + moveLimitLabel1.sprite = numberLabels[remainingMove % 10]; + } + + if (mm.MoveLimit <= 0) + { + if (oldMoveLimit != mm.MoveLimit) + { + oldMoveLimit = mm.MoveLimit; + foreach (GameObject delimiter in moveLimitDelimiters) + { + Destroy(delimiter); + } + moveLimitDelimiters.Clear(); + } + + moveLimitBar.GetComponent().offsetMax = new Vector2( + -240 - pixels * 12, + moveLimitBar.GetComponent().offsetMax.y); + } + /* + else + { + int t = Mathf.CeilToInt(Mathf.Clamp01((float)remainingMove / mm.MoveLimit) * pixels); + + moveLimitBar.GetComponent().offsetMax = new Vector2( + -240 - (pixels - t) * 12, + moveLimitBar.GetComponent().offsetMax.y); + } + */ + else if (mm.MoveLimit == 1) + { + if (oldMoveLimit != mm.MoveLimit) + { + oldMoveLimit = mm.MoveLimit; + foreach (GameObject delimiter in moveLimitDelimiters) + { + Destroy(delimiter); + } + moveLimitDelimiters.Clear(); + } + + moveLimitBar.GetComponent().offsetMax = new Vector2( + -984 + pixels * remainingMove * 12, + moveLimitBar.GetComponent().offsetMax.y); + } + else + { + int d = SegmentNum(mm.MoveLimit); // ĭ + int p; // ; ϴ ĭ + if (mm.ActionHistory.Length == 0) p = d; + else p = Mathf.CeilToInt(remainingMove / (float)(mm.MoveLimit - 1) * (d - 1)); + int dw; // (px) + if (d % 2 == 0) dw = 2; // 2 + else dw = 1; // 3, 7, 9 Ȥ 5 + float pw; // ĭ (px) + if (d == 5) pw = 12f; // d == 5 ̸ հ ĭ 11px, ߰ 12px + else if (d == 6) pw = 9f; // d == 6 ̸ հ ĭ 7px, ߰ 8px + else pw = (62 - (d - 1) * dw) / d; // ĭ px + float offset = 0f; + if (d == 5 || d == 6) offset = 12f; + + if (oldMoveLimit != mm.MoveLimit) + { + oldMoveLimit = mm.MoveLimit; + foreach (GameObject delimiter in moveLimitDelimiters) + { + Destroy(delimiter); + } + moveLimitDelimiters.Clear(); + + for (int i = 0; i < d - 1; i++) + { + GameObject delimiter = Instantiate(moveLimitDelimiterPrefab, moveLimitDelimitersParent.transform); + float dLeft = 96 - offset + (pw + i * (dw + pw)) * 12f; + float dRight = 984 + offset - (i + 1) * (dw + pw) * 12f; + delimiter.GetComponent().offsetMin = new Vector2(dLeft, delimiter.GetComponent().offsetMin.y); + delimiter.GetComponent().offsetMax = new Vector2(-dRight, delimiter.GetComponent().offsetMax.y); + moveLimitDelimiters.Add(delimiter); + } + } + moveLimitBar.GetComponent().offsetMax = new Vector2(-984 - offset + (p * pw + (p - 1) * dw) * 12f, moveLimitBar.GetComponent().offsetMax.y); + } + + } + + private int SegmentNum(int t) + { + int[] list = new int[] { 21, 16, 9, 8, 7, 6, 5, 4, 3, 2, 1 }; + foreach (int i in list) + { + if (i <= t) return i; + } + return 1; + } +} diff --git a/Assets/Scripts/MoveLimitUI.cs.meta b/Assets/Scripts/MoveLimitUI.cs.meta new file mode 100644 index 0000000..2896fa5 --- /dev/null +++ b/Assets/Scripts/MoveLimitUI.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: b447c785b894cf440ae12d9b23cf0899 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/OpenSaveScrollItem.cs b/Assets/Scripts/OpenSaveScrollItem.cs index 63fbed9..d912978 100644 --- a/Assets/Scripts/OpenSaveScrollItem.cs +++ b/Assets/Scripts/OpenSaveScrollItem.cs @@ -126,7 +126,6 @@ void Update() public void Select() { - Debug.Log("select"); if (em != null) { switch (type) diff --git a/Assets/Scripts/OpenScrollItemWithMark.cs b/Assets/Scripts/OpenScrollItemWithMark.cs index 68ec9f2..a6f21d8 100644 --- a/Assets/Scripts/OpenScrollItemWithMark.cs +++ b/Assets/Scripts/OpenScrollItemWithMark.cs @@ -10,16 +10,18 @@ public class OpenScrollItemWithMark : OpenSaveScrollItem public Sprite xMark; public Image markIcon; - public bool isCleared; + public bool isClearedInTime; + public bool isClearedInMove; - public void Initialize(Type type, string path, bool isFolder, bool isCleared, PlayManager pm, bool isUpOneLevel = false) + public void Initialize(Type type, string path, bool isFolder, bool isClearedInTime, bool isClearedInMove, PlayManager pm, bool isUpOneLevel = false) { this.type = type; this.pm = pm; this.isFolder = isFolder; this.isUpOneLevel = isFolder & isUpOneLevel; this.path = path.Replace('\\', '/'); - this.isCleared = isCleared; + this.isClearedInTime = isClearedInTime; + this.isClearedInMove = isClearedInMove; if (isFolder) { labelName = this.path.Substring(this.path.LastIndexOf('/') + 1); @@ -31,14 +33,15 @@ public void Initialize(Type type, string path, bool isFolder, bool isCleared, Pl Update(); } - public void Initialize(string name, bool isFolder, bool isCleared, PlayManager pm, TextAsset textAsset = null, bool isUpOneLevel = false) + public void Initialize(string name, bool isFolder, bool isClearedInTime, bool isClearedInMove, PlayManager pm, TextAsset textAsset = null, bool isUpOneLevel = false) { this.type = Type.TrainingOpen; this.pm = pm; this.isFolder = isFolder; this.isUpOneLevel = isFolder & isUpOneLevel; this.path = name; - this.isCleared = isCleared; + this.isClearedInTime = isClearedInTime; + this.isClearedInMove = isClearedInMove; labelName = name; this.textAsset = textAsset; Update(); @@ -93,15 +96,31 @@ void Update() { markIcon.gameObject.SetActive(false); } - else if (isCleared) + else if (GameManager.mm.LimitMode == MapManager.LimitModeEnum.Time) { - markIcon.gameObject.SetActive(true); - markIcon.sprite = okMark; + if (isClearedInTime) + { + markIcon.gameObject.SetActive(true); + markIcon.sprite = okMark; + } + else + { + markIcon.gameObject.SetActive(true); + markIcon.sprite = xMark; + } } else { - markIcon.gameObject.SetActive(true); - markIcon.sprite = xMark; + if (isClearedInMove) + { + markIcon.gameObject.SetActive(true); + markIcon.sprite = okMark; + } + else + { + markIcon.gameObject.SetActive(true); + markIcon.sprite = xMark; + } } } diff --git a/Assets/Scripts/PauseUI.cs b/Assets/Scripts/PauseUI.cs index 78fd62c..a56652a 100644 --- a/Assets/Scripts/PauseUI.cs +++ b/Assets/Scripts/PauseUI.cs @@ -3,6 +3,7 @@ using UnityEngine; using UnityEngine.Events; using UnityEngine.UI; +using static MapManager; public class PauseUI : MonoBehaviour { @@ -27,11 +28,11 @@ void Start(){ void Update() { if (GameManager.mm == null || !GameManager.mm.IsReady) return; - if (GameManager.mm.IsTimeActivated && GameManager.mm.RemainingTime > 0f && !GameManager.mm.HasCleared) + if (GameManager.mm.LimitMode == MapManager.LimitModeEnum.Time && GameManager.mm.IsTimeActivated && GameManager.mm.RemainingTime > 0f && !GameManager.mm.HasCleared) { pauseSkipButton.interactable = true; } - else if (GameManager.mm.IsTimeActivated && (GameManager.mm.RemainingTime <= 0f || GameManager.mm.HasCleared)) + else if (GameManager.mm.LimitMode != MapManager.LimitModeEnum.Time || (GameManager.mm.IsTimeActivated && (GameManager.mm.RemainingTime <= 0f || GameManager.mm.HasCleared))) { pauseSkipButton.interactable = false; } diff --git a/Assets/Scripts/PlayManager.cs b/Assets/Scripts/PlayManager.cs index 058ac24..6908b29 100644 --- a/Assets/Scripts/PlayManager.cs +++ b/Assets/Scripts/PlayManager.cs @@ -1,5 +1,4 @@ -using System.Collections; -using System.Collections.Generic; +using System.Collections.Generic; using System.Linq; using System.IO; using System.Text; @@ -8,8 +7,9 @@ using UnityEngine; using UnityEngine.UI; using UnityEngine.SceneManagement; -using UnityEngine.Localization; using UnityEngine.Localization.Settings; +using Newtonsoft.Json; +using Newtonsoft.Json.Linq; #if UNITY_ANDROID && !UNITY_EDITOR using UnityEngine.Android; #endif @@ -39,6 +39,10 @@ public enum TrainingMapSelect { Root = -1, Basic = 0, Fire = 1, Iron = 2, Block public ResultUI resultUI; public GameObject tooltipUI; public GameObject timerUI; + public GameObject moveLimitUI; + + public List tryCountUis = new List(); + public List minMoveCountUis = new List(); private OpenScrollItemWithMark selectedOpenScrollItem; public GameObject openScrollContent; @@ -203,6 +207,12 @@ public int EscapedCount private set; } = 0; + public int TimeoutCount + { + get; + private set; + } = 0; + public bool HasClearedAll { get @@ -228,6 +238,7 @@ public void Initialize(Mode mode, bool isRandomOrder = false, int maxPlayLength IsReady = false; EscapedCount = 0; SkippedCount = 0; + TimeoutCount = 0; playMode = mode; // messageUI.gameObject.SetActive(false); pauseUI.gameObject.SetActive(false); @@ -271,7 +282,7 @@ public void Initialize(Mode mode, bool isRandomOrder = false, int maxPlayLength case Mode.Custom: CustomOpenPhase(MapManager.MAP_ROOT_PATH); Life = int.MaxValue; - print("custom"); + customSelection = MapManager.MAP_ROOT_PATH; break; case Mode.Training: TrainingOpenPhase(TrainingMapSelect.Root); @@ -311,18 +322,24 @@ private List SeriesToMapFiles(List series, List ma private void Update() { if (GameManager.mm == null || !GameManager.mm.IsReady) return; - if (SceneManager.GetActiveScene().name.Equals("Custom") || SceneManager.GetActiveScene().name.Equals("Training")) + if (SceneManager.GetActiveScene().name.Equals("Custom") || SceneManager.GetActiveScene().name.Equals("Training")) { if (GameManager.mm.tryCountUpTrigger) { - Debug.Log("TryCountUp in PM "); + //Debug.Log("TryCountUp in PM "); GameManager.mm.TryCountUp(this, metaPath, mapHash); } } } + public void Resume() + { + GameManager.gm.SaveSettingsValue(); + GameManager.gm.canPlay = true; + } public void Pause() { + GameManager.gm.canPlay = false; pauseButton.interactable = false; pausePanel.SetActive(true); pauseUI.gameObject.SetActive(true); @@ -422,12 +439,12 @@ public void Ending() try { - sw = new StreamWriter(Application.persistentDataPath + "/TutorialDone.txt"); + sw = new StreamWriter(Application.persistentDataPath.TrimEnd('/') + "/TutorialDone.txt"); sw.WriteLine("3"); } catch (Exception e) { - Debug.LogError(e.Message); + Debug.LogError(e); } finally { @@ -437,7 +454,7 @@ public void Ending() } catch (Exception e) { - Debug.LogError(e.Message); + Debug.LogError(e); } } } @@ -447,6 +464,7 @@ public void Ending() public void TutorialNext() { GameManager.gm.TutorialNext(); + TimeoutCount = 0; if (HasClearedAll) { Ending(); @@ -506,6 +524,16 @@ public void TutorialRetryWithTime() if (EscapedCount > 0) EscapedCount--; } + public void TutorialTimeoutCountUp() + { + TimeoutCount++; + if (GameManager.gm.PlayingMapIndex + 1 == 9 && TimeoutCount >= 2) + { + GameManager.mm.TimeLimit = 24f; + GameManager.mm.TimeActivate(); + } + } + public void TutorialAfterGravity(MapManager.Flag flag) { if(tutorialGuide != null){ @@ -590,7 +618,7 @@ public void AdventureAfterGravity(MapManager.Flag flag) nextButton.interactable = false; break; case MapManager.Flag.Escaped: - retryButton.gameObject.SetActive(false); + retryButton.gameObject.SetActive(true); retryHighlightedButton.gameObject.SetActive(false); retryTimeButton.gameObject.SetActive(false); retryTimeHighlightedButton.gameObject.SetActive(false); @@ -671,7 +699,7 @@ public void CustomAfterGravity(MapManager.Flag flag) nextButton.interactable = false; break; case MapManager.Flag.Escaped: - retryButton.gameObject.SetActive(false); + retryButton.gameObject.SetActive(true); retryHighlightedButton.gameObject.SetActive(false); retryTimeButton.gameObject.SetActive(false); retryTimeHighlightedButton.gameObject.SetActive(false); @@ -681,26 +709,32 @@ public void CustomAfterGravity(MapManager.Flag flag) pauseButton.interactable = false; - if (!GameManager.mm.hasClearedOnce) + if (GameManager.mm.LimitMode == MapManager.LimitModeEnum.Time && !GameManager.mm.hasClearedOnceInTime) { - GameManager.mm.hasClearedOnce = true; - fileStream = new FileStream(metaPath, FileMode.OpenOrCreate, FileAccess.Write, FileShare.None); - streamWriter = new StreamWriter(fileStream, Encoding.UTF8); - fileStream.Position = 0; + GameManager.mm.hasClearedOnceInTime = true; + Dictionary keyValuePairs = new Dictionary(); if (GameManager.mm.ActionHistory.Length == 1) { - streamWriter.WriteLine((GameManager.mm.tryCount + 1).ToString()); + keyValuePairs.Add("tryCount", GameManager.mm.tryCount + 1); } else { - streamWriter.WriteLine(GameManager.mm.tryCount.ToString()); + keyValuePairs.Add("tryCount", GameManager.mm.tryCount); + } + keyValuePairs.Add("hasClearedOnce", GameManager.mm.hasClearedOnceInTime); + MetaUtil.ModifyMetaFile(metaPath, mapHash, MapManager.LimitModeEnum.Time, keyValuePairs); + } + else if (GameManager.mm.LimitMode == MapManager.LimitModeEnum.Move) + { + GameManager.mm.hasClearedOnceInMove = true; + Dictionary keyValuePairs = new Dictionary(); + if (GameManager.mm.ActionHistory.Length < GameManager.mm.MoveLimit) + { + // TODO 특별한 애니메이션으로 최소 이동 횟수 갱신 축하하기! + keyValuePairs.Add("minMoveCount", GameManager.mm.ActionHistory.Length); } - streamWriter.WriteLine(GameManager.mm.hasClearedOnce); - streamWriter.WriteLine(mapHash); - streamWriter?.Close(); - fileStream?.Close(); - streamWriter = null; - fileStream = null; + keyValuePairs.Add("hasClearedOnce", GameManager.mm.hasClearedOnceInMove); + MetaUtil.ModifyMetaFile(metaPath, mapHash, MapManager.LimitModeEnum.Move, keyValuePairs); } break; case MapManager.Flag.Burned: @@ -746,7 +780,7 @@ public void TrainingAfterGravity(MapManager.Flag flag) nextButton.interactable = false; break; case MapManager.Flag.Escaped: - retryButton.gameObject.SetActive(false); + retryButton.gameObject.SetActive(true); retryHighlightedButton.gameObject.SetActive(false); retryTimeButton.gameObject.SetActive(false); retryTimeHighlightedButton.gameObject.SetActive(false); @@ -755,27 +789,33 @@ public void TrainingAfterGravity(MapManager.Flag flag) quitHighlightedButton.gameObject.SetActive(true); pauseButton.interactable = false; - - if (!GameManager.mm.hasClearedOnce) + + if (GameManager.mm.LimitMode == MapManager.LimitModeEnum.Time && !GameManager.mm.hasClearedOnceInTime) { - GameManager.mm.hasClearedOnce = true; - fileStream = new FileStream(metaPath, FileMode.OpenOrCreate, FileAccess.Write, FileShare.None); - streamWriter = new StreamWriter(fileStream, Encoding.UTF8); - fileStream.Position = 0; + GameManager.mm.hasClearedOnceInTime = true; + Dictionary keyValuePairs = new Dictionary(); if (GameManager.mm.ActionHistory.Length == 1) { - streamWriter.WriteLine((GameManager.mm.tryCount + 1).ToString()); + keyValuePairs.Add("tryCount", GameManager.mm.tryCount + 1); } else { - streamWriter.WriteLine(GameManager.mm.tryCount.ToString()); + keyValuePairs.Add("tryCount", GameManager.mm.tryCount); + } + keyValuePairs.Add("hasClearedOnce", GameManager.mm.hasClearedOnceInTime); + MetaUtil.ModifyMetaFile(metaPath, mapHash, MapManager.LimitModeEnum.Time, keyValuePairs); + } + else if (GameManager.mm.LimitMode == MapManager.LimitModeEnum.Move) + { + GameManager.mm.hasClearedOnceInMove = true; + Dictionary keyValuePairs = new Dictionary(); + if (GameManager.mm.ActionHistory.Length < GameManager.mm.MoveLimit) + { + // TODO 특별한 애니메이션으로 최소 이동 횟수 갱신 축하하기! + keyValuePairs.Add("minMoveCount", GameManager.mm.ActionHistory.Length); } - streamWriter.WriteLine(GameManager.mm.hasClearedOnce); - streamWriter.WriteLine(mapHash); - streamWriter?.Close(); - fileStream?.Close(); - streamWriter = null; - fileStream = null; + keyValuePairs.Add("hasClearedOnce", GameManager.mm.hasClearedOnceInMove); + MetaUtil.ModifyMetaFile(metaPath, mapHash, MapManager.LimitModeEnum.Move, keyValuePairs); } break; case MapManager.Flag.Burned: @@ -795,11 +835,11 @@ public void TrainingAfterGravity(MapManager.Flag flag) retryHighlightedButton.gameObject.SetActive(false); retryTimeButton.gameObject.SetActive(false); retryTimeHighlightedButton.gameObject.SetActive(true); - nextButton.gameObject.SetActive(true); + //nextButton.gameObject.SetActive(true); quitHighlightedButton.gameObject.SetActive(false); pauseButton.interactable = true; - nextButton.interactable = true; + //nextButton.interactable = true; break; } @@ -839,7 +879,7 @@ public void CustomOpenPhase(string path) } catch (Exception e) { - statusUI.SetStatusMessageWithFlashing(e.Message, 2f); + statusUI.SetStatusMessageWithFlashing(e.ToString(), 2f); return; } #endif @@ -849,13 +889,13 @@ public void CustomOpenPhase(string path) if (!Directory.Exists(path)) { Debug.LogWarning("File warning: there is no directory \"" + path + "\""); - Directory.CreateDirectory(path); + MetaUtil.CreateDirectory(path); } } catch (Exception e) { - statusUI.SetStatusMessageWithFlashing(e.Message, 2f); - Debug.LogError(e.Message); + statusUI.SetStatusMessageWithFlashing(e.ToString(), 2f); + Debug.LogError(e); return; } @@ -883,7 +923,7 @@ public void TrainingOpenPhase(TrainingMapSelect selected) // 만들다 만 함 } catch (Exception e) { - statusUI.SetStatusMessageWithFlashing(e.Message, 2f); + statusUI.SetStatusMessageWithFlashing(e.ToString(), 2f); return; } #endif @@ -977,8 +1017,8 @@ private void RenderOpenScrollView(string openPath) { string[] metafiles; SHA256 sha256Hash = SHA256.Create(); - Debug.Log(openPath); - string metaPath = Application.persistentDataPath + "/Meta/" + openPath; + //Debug.Log(openPath); + string metaPath = Application.persistentDataPath.TrimEnd('/') + "/Meta/" + openPath.TrimStart('/'); string path = Application.persistentDataPath; string[] dirs2 = ("Meta/" + openPath.Replace('\\', '/')).Split('/'); @@ -987,46 +1027,63 @@ private void RenderOpenScrollView(string openPath) string dir = dirs2[i]; path += '/' + dir; if (!Directory.Exists(path)) { - Directory.CreateDirectory(path); + MetaUtil.CreateDirectory(path); } } - metafiles = Directory.GetFiles(metaPath, "*.txt"); + metafiles = Directory.GetFiles(metaPath, "*.json"); List metafiles2 = metafiles.ToList(); foreach (string s in files) { - bool isCleared = false; - string s2 = Application.persistentDataPath + "/Meta/" + s; - + bool isClearedInTime = false; + bool isClearedInMove = false; + string s2 = Application.persistentDataPath.TrimEnd('/') + "/Meta/" + MetaUtil.ExtentionTxtToJson(s); + print(s2); if (metafiles2.Contains(s2)) { try { + /* FileStream fs = new FileStream(s2.Replace('\\', '/'), FileMode.Open); StreamReader sr = new StreamReader(fs, Encoding.UTF8); sr.ReadLine(); bool b = bool.TryParse(sr.ReadLine(), out isCleared); if (!b) isCleared = false; string metaHash = sr.ReadToEnd().Trim(); - + */ + + JObject json = MetaUtil.ReadMetaFile(s2.Replace('\\', '/')); + string metaHash = MetaUtil.GetMapHashFromMetaObject(json); + FileStream fileStream = new FileStream(s.Replace('\\', '/'), FileMode.Open); StreamReader streamReader = new StreamReader(fileStream, Encoding.UTF8); string mapHash = GetHash(sha256Hash, streamReader.ReadToEnd().Trim()); if (!metaHash.Equals(mapHash)) { - isCleared = false; + isClearedInTime = false; + isClearedInMove = false; } streamReader.Close(); fileStream.Close(); - + + JToken cleared = MetaUtil.GetValueFromMetaObject(json, mapHash, MapManager.LimitModeEnum.Time, "hasClearedOnce"); + if (cleared == null) isClearedInTime = false; + else isClearedInTime = (bool)cleared; + + cleared = MetaUtil.GetValueFromMetaObject(json, mapHash, MapManager.LimitModeEnum.Move, "hasClearedOnce"); + if (cleared == null) isClearedInMove = false; + else isClearedInMove = (bool)cleared; + + /* sr.Close(); fs.Close(); + */ } catch (Exception e) { - Debug.Log(e.Message); + Debug.LogError(e); } metafiles2.Remove(s2); } @@ -1036,7 +1093,7 @@ private void RenderOpenScrollView(string openPath) g.GetComponent().offsetMax = new Vector2(-12f, SCROLL_ITEM_HEIGHT / 2); g.GetComponent().anchoredPosition = new Vector3(g.GetComponent().anchoredPosition.x, (SCROLL_ITEM_HEIGHT / 2) * (length - 1 - 2 * index), 0f); - g.GetComponent().Initialize(OpenScrollItemWithMark.Type.Open, s, false, isCleared, this); + g.GetComponent().Initialize(OpenScrollItemWithMark.Type.Open, s, false, isClearedInTime, isClearedInMove, this); index++; } @@ -1140,9 +1197,9 @@ private void RenderOpenScrollViewForTraining(TrainingMapSelect selection) string[] metafiles; SHA256 sha256Hash = SHA256.Create(); - Debug.Log(openPathText.text); + //Debug.Log(openPathText.text); - string metaPath = Application.persistentDataPath + "/Meta"; + string metaPath = Application.persistentDataPath.TrimEnd('/') + "/Meta"; if(openPathText.text.TrimEnd('/').LastIndexOf('/') >= 1) { metaPath += "/" + openPathText.text.Substring(0, openPathText.text.TrimEnd('/').LastIndexOf('/')); @@ -1167,11 +1224,11 @@ private void RenderOpenScrollViewForTraining(TrainingMapSelect selection) string dir = dirs2[i]; path += '/' + dir; if (!Directory.Exists(path)) { - Directory.CreateDirectory(path); + MetaUtil.CreateDirectory(path); } } - metafiles = Directory.GetFiles(metaPath.Replace("...", "Training"), "*.txt"); + metafiles = Directory.GetFiles(metaPath.Replace("...", "Training"), "*.json"); List metafiles2 = metafiles.ToList(); if (!isRoot) @@ -1205,30 +1262,35 @@ private void RenderOpenScrollViewForTraining(TrainingMapSelect selection) { foreach (TextAsset s in files) { - bool isCleared = false; - string s2 = Application.persistentDataPath + "/Meta/Training\\" + s.name + ".txt"; + bool isClearedInTime = false; + bool isClearedInMove = false; + + string s2 = Application.persistentDataPath.TrimEnd('/') + "/Meta/Training\\" + s.name + ".json"; + print(s2); if (metafiles2.Contains(s2.Replace('\\', '/')) || metafiles2.Contains(s2)) { try { - FileStream fs = new FileStream(s2.Replace('\\', '/'), FileMode.Open); - StreamReader sr = new StreamReader(fs, Encoding.UTF8); - sr.ReadLine(); - bool b = bool.TryParse(sr.ReadLine(), out isCleared); - if (!b) isCleared = false; - string metaHash = sr.ReadToEnd().Trim(); + JObject json = MetaUtil.ReadMetaFile(s2.Replace('\\', '/')); + string metaHash = MetaUtil.GetMapHashFromMetaObject(json); string mapHash = GetHash(sha256Hash, s.text.Trim()); if (!metaHash.Equals(mapHash)) { - isCleared = false; + isClearedInTime = false; + isClearedInMove = false; } - - sr.Close(); - fs.Close(); + + JToken cleared = MetaUtil.GetValueFromMetaObject(json, mapHash, MapManager.LimitModeEnum.Time, "hasClearedOnce"); + if (cleared == null) isClearedInTime = false; + else isClearedInTime = (bool)cleared; + + cleared = MetaUtil.GetValueFromMetaObject(json, mapHash, MapManager.LimitModeEnum.Move, "hasClearedOnce"); + if (cleared == null) isClearedInMove = false; + else isClearedInMove = (bool)cleared; } catch (Exception e) { - Debug.Log(e.Message); + Debug.LogError(e); } metafiles2.Remove(s2); } @@ -1237,7 +1299,7 @@ private void RenderOpenScrollViewForTraining(TrainingMapSelect selection) g.GetComponent().offsetMax = new Vector2(-12f, SCROLL_ITEM_HEIGHT / 2); g.GetComponent().anchoredPosition = new Vector3(g.GetComponent().anchoredPosition.x, (SCROLL_ITEM_HEIGHT / 2) * (length - 1 - 2 * index), 0f); - g.GetComponent().Initialize(s.name, false, isCleared, this, s, false); + g.GetComponent().Initialize(s.name, false, isClearedInTime, isClearedInMove, this, s, false); index++; } } @@ -1298,7 +1360,8 @@ public void OpenItemSelect(OpenScrollItemWithMark caller) if (caller.type == OpenScrollItemWithMark.Type.Open) { string s = selectedOpenScrollItem.path; - s = "/Meta/" + s; + s = "/Meta/" + MetaUtil.ExtentionTxtToJson(s); + print(s); CreateMeta(s); Debug.Log(metaPath); bool b = CustomOpenFile(selectedOpenScrollItem.path, true); @@ -1311,7 +1374,8 @@ public void OpenItemSelect(OpenScrollItemWithMark caller) { string s = selectedOpenScrollItem.path; Debug.Log(s); - s = "/Meta/Training/" + s + ".txt"; + s = "/Meta/Training/" + MetaUtil.ExtentionTxtToJson(s + ".json"); + print(s); CreateMeta(s); bool b = TrainingOpenFile(selectedOpenScrollItem.textAsset, true); openHighlightedButton.gameObject.SetActive(b); @@ -1409,7 +1473,11 @@ public bool CustomOpenFile(string path, bool isPreview) customPhase = CustomPhase.Ingame; GameManager.gm.CustomChangeBGM(customPhase); - metaPath = Application.persistentDataPath + "/Meta/" + mapPath; + metaPath = Application.persistentDataPath.TrimEnd('/') + "/Meta/" + MetaUtil.ExtentionTxtToJson(mapPath); + print(metaPath); + JObject metaObject = MetaUtil.ReadMetaFile(metaPath); + + /* fileStream = new FileStream(metaPath, FileMode.OpenOrCreate, FileAccess.ReadWrite, FileShare.None); streamReader = new StreamReader(fileStream, Encoding.UTF8); @@ -1455,6 +1523,7 @@ public bool CustomOpenFile(string path, bool isPreview) { Debug.LogError(e); } + */ ClearOpenScrollItems(); @@ -1463,7 +1532,57 @@ public bool CustomOpenFile(string path, bool isPreview) Destroy(t.gameObject); } statusUI.gameObject.SetActive(false); - timerUI.SetActive(true); + + if (GameManager.mm.LimitMode == MapManager.LimitModeEnum.Time) + { + JToken hasClearedOnce = MetaUtil.GetValueFromMetaObject(metaObject, mapHash, MapManager.LimitModeEnum.Time, "hasClearedOnce"); + JToken tryCount = MetaUtil.GetValueFromMetaObject(metaObject, mapHash, MapManager.LimitModeEnum.Time, "tryCount"); + + if (hasClearedOnce == null) + { + Debug.LogError("Meta invalid: hasClearedOnce"); + MetaUtil.ReinitializeMetaFile(metaPath, mapHash, MapManager.LimitModeEnum.Time); + } + else if (tryCount == null) + { + Debug.LogError("Meta invalid: try count"); + MetaUtil.ReinitializeMetaFile(metaPath, mapHash, MapManager.LimitModeEnum.Time); + } + else if ((bool)hasClearedOnce) + { + GameManager.mm.tryCount = 0; + } + else + { + GameManager.mm.tryCount = (int)tryCount; + } + timerUI.SetActive(true); + moveLimitUI.SetActive(false); + } + else + { + JToken hasClearedOnce = MetaUtil.GetValueFromMetaObject(metaObject, mapHash, MapManager.LimitModeEnum.Move, "hasClearedOnce"); + JToken minMoveCount = MetaUtil.GetValueFromMetaObject(metaObject, mapHash, MapManager.LimitModeEnum.Move, "minMoveCount"); + + if (hasClearedOnce == null) + { + Debug.LogError("Meta invalid: hasClearedOnce"); + MetaUtil.ReinitializeMetaFile(metaPath, mapHash, MapManager.LimitModeEnum.Move); + } + else if (minMoveCount == null) + { + Debug.LogError("Meta invalid: try count"); + MetaUtil.ReinitializeMetaFile(metaPath, mapHash, MapManager.LimitModeEnum.Move); + } + else + { + GameManager.mm.hasClearedOnceInMove = (bool)hasClearedOnce; + GameManager.mm.MoveLimit = (int)minMoveCount; + } + timerUI.SetActive(false); + moveLimitUI.SetActive(true); + } + GameManager.gm.canPlay = true; GameManager.mm.TimeActivate(); @@ -1508,61 +1627,68 @@ public bool TrainingOpenFile(TextAsset textAsset, bool isPreview) trainingPhase = TrainingPhase.Ingame; GameManager.gm.TrainingChangeBGM(trainingPhase); - metaPath = Application.persistentDataPath + "/Meta/" + mapPath; - fileStream = new FileStream(metaPath, FileMode.OpenOrCreate, FileAccess.ReadWrite, FileShare.None); - streamReader = new StreamReader(fileStream, Encoding.UTF8); + metaPath = Application.persistentDataPath.TrimEnd('/') + "/Meta/" + MetaUtil.ExtentionTxtToJson(mapPath); + print(metaPath); + JObject metaObject = MetaUtil.ReadMetaFile(metaPath); - int tryCount; - try + ClearOpenScrollItems(); + + foreach (var t in tooltipUI.GetComponentsInChildren()) { - bool b = int.TryParse(streamReader.ReadLine().Trim(), out tryCount); - bool hasClearedOnce = bool.Parse(streamReader.ReadLine().Trim()); + Destroy(t.gameObject); + } + statusUI.gameObject.SetActive(false); - if (!hasClearedOnce) + if (GameManager.mm.LimitMode == MapManager.LimitModeEnum.Time) + { + JToken hasClearedOnce = MetaUtil.GetValueFromMetaObject(metaObject, mapHash, MapManager.LimitModeEnum.Time, "hasClearedOnce"); + JToken tryCount = MetaUtil.GetValueFromMetaObject(metaObject, mapHash, MapManager.LimitModeEnum.Time, "tryCount"); + + if (hasClearedOnce == null) { - GameManager.mm.tryCount = tryCount; + Debug.LogError("Meta invalid: hasClearedOnce"); + MetaUtil.ReinitializeMetaFile(metaPath, mapHash, MapManager.LimitModeEnum.Time); } - else + else if (tryCount == null) { - GameManager.mm.tryCount = 0; + Debug.LogError("Meta invalid: try count"); + MetaUtil.ReinitializeMetaFile(metaPath, mapHash, MapManager.LimitModeEnum.Time); } - - streamReader.Close(); - if (!b) + else if ((bool)hasClearedOnce) { - Debug.LogError("Meta invalid"); - streamWriter = new StreamWriter(fileStream, Encoding.UTF8); - streamWriter.WriteLine("0"); - streamWriter.WriteLine("False"); - streamWriter.WriteLine(mapHash); GameManager.mm.tryCount = 0; } + else + { + GameManager.mm.tryCount = (int)tryCount; + } + timerUI.SetActive(true); + moveLimitUI.SetActive(false); } - catch (Exception e) + else { - Debug.LogError("Meta invalid: " + e.Message); - } + JToken hasClearedOnce = MetaUtil.GetValueFromMetaObject(metaObject, mapHash, MapManager.LimitModeEnum.Move, "hasClearedOnce"); + JToken minMoveCount = MetaUtil.GetValueFromMetaObject(metaObject, mapHash, MapManager.LimitModeEnum.Move, "minMoveCount"); - try - { - streamWriter?.Close(); - fileStream?.Close(); - streamWriter = null; - fileStream = null; - } - catch (Exception e) - { - Debug.LogError(e); + if (hasClearedOnce == null) + { + Debug.LogError("Meta invalid: hasClearedOnce"); + MetaUtil.ReinitializeMetaFile(metaPath, mapHash, MapManager.LimitModeEnum.Move); + } + else if (minMoveCount == null) + { + Debug.LogError("Meta invalid: try count"); + MetaUtil.ReinitializeMetaFile(metaPath, mapHash, MapManager.LimitModeEnum.Move); + } + else + { + GameManager.mm.hasClearedOnceInMove = (bool)hasClearedOnce; + GameManager.mm.MoveLimit = (int)minMoveCount; + } + timerUI.SetActive(false); + moveLimitUI.SetActive(true); } - ClearOpenScrollItems(); - - foreach (var t in tooltipUI.GetComponentsInChildren()) - { - Destroy(t.gameObject); - } - statusUI.gameObject.SetActive(false); - timerUI.SetActive(true); GameManager.gm.canPlay = true; GameManager.mm.TimeActivate(); @@ -1592,6 +1718,7 @@ public void CustomIngameToOpen() GameManager.mm.Initialize(); statusUI.gameObject.SetActive(true); timerUI.SetActive(false); + moveLimitUI.SetActive(false); nextButton.interactable = false; pauseButton.interactable = true; pausePanel.SetActive(false); @@ -1617,6 +1744,7 @@ public void TrainingIngameToOpen() GameManager.mm.Initialize(); statusUI.gameObject.SetActive(true); timerUI.SetActive(false); + moveLimitUI.SetActive(false); nextButton.interactable = false; pauseButton.interactable = true; // TODO @@ -1635,7 +1763,6 @@ public void CreateMeta(string s) string mapinfo = ""; if (SceneManager.GetActiveScene().name.Equals("Custom")) - { mapPath = selectedOpenScrollItem.path; try @@ -1676,24 +1803,29 @@ public void CreateMeta(string s) } finally { - GameManager.mm.hasClearedOnce = false; + GameManager.mm.hasClearedOnceInTime = false; GameManager.mm.tryCount = 0; + GameManager.mm.hasClearedOnceInMove = false; + GameManager.mm.MoveLimit = int.MaxValue; sr.Close(); fs.Close(); + sr = null; + fs = null; } } else if (SceneManager.GetActiveScene().name.Equals("Training")) { - mapPath = "Training/" + selectedOpenScrollItem.path + ".txt"; + mapPath = "Training/" + selectedOpenScrollItem.path.TrimStart('/') + ".txt"; mapinfo = selectedOpenScrollItem.textAsset.text.Trim(); mapHash = GetHash(sha256Hash, mapinfo); } - metaPath = Application.persistentDataPath + '/' + s; + metaPath = Application.persistentDataPath.TrimEnd('/') + '/' + MetaUtil.ExtentionTxtToJson(s); + print(metaPath); if (!File.Exists(metaPath)) { - StreamWriter sw = null; + //StreamWriter sw = null; string path = Application.persistentDataPath; string[] dirs = s.Split('/'); int len = dirs.Length - 1; @@ -1701,86 +1833,64 @@ public void CreateMeta(string s) string dir = dirs[i]; path += '/' + dir; if (!Directory.Exists(path)) { - Directory.CreateDirectory(path); - } - } - try - { - fs = new FileStream(metaPath, FileMode.OpenOrCreate, FileAccess.ReadWrite, FileShare.None); - sw = new StreamWriter(fs, Encoding.UTF8); - sw.WriteLine("0"); - sw.WriteLine("False"); - sw.WriteLine(mapHash); //Hash code - } - catch (Exception e) - { - Debug.LogError(e.Message); - } - finally - { - try - { - GameManager.mm.hasClearedOnce = false; - GameManager.mm.tryCount = 0; - sw.Close(); - fs.Close(); - } - catch (Exception e) - { - Debug.LogError(e.Message); + MetaUtil.CreateDirectory(path); } } + MetaUtil.CreateNewMetaFile(metaPath, mapHash, FileMode.OpenOrCreate); } else { try { - fs = new FileStream(metaPath, FileMode.Open, FileAccess.ReadWrite, FileShare.None); - sr = new StreamReader(fs, Encoding.UTF8); - int tryCount = int.Parse(sr.ReadLine().Trim()); - bool hasClearedOnce = bool.Parse(sr.ReadLine().Trim()); - string metaHash = sr.ReadToEnd().Trim(); - sr.Close(); + JObject json = MetaUtil.ReadMetaFile(metaPath); + string metaHash = MetaUtil.GetMapHashFromMetaObject(json); + JToken tryCount = MetaUtil.GetValueFromMetaObject(json, mapHash, MapManager.LimitModeEnum.Time, "tryCount"); + JToken hasClearedOnceInTime = MetaUtil.GetValueFromMetaObject(json, mapHash, MapManager.LimitModeEnum.Time, "hasClearedOnce"); + JToken minMoveCount = MetaUtil.GetValueFromMetaObject(json, mapHash, MapManager.LimitModeEnum.Move, "minMoveCount"); + JToken hasClearedOnceInMove = MetaUtil.GetValueFromMetaObject(json, mapHash, MapManager.LimitModeEnum.Move, "hasClearedOnce"); if (VerifyHash(sha256Hash, mapinfo.Trim(), metaHash)) { - //tryNum 표시하기 - GameManager.mm.hasClearedOnce = hasClearedOnce; - GameManager.mm.tryCount = tryCount; + bool b1 = true; + bool b2 = true; + if (tryCount == null || hasClearedOnceInTime == null) + { + MetaUtil.ReinitializeMetaFile(metaPath, mapHash, MapManager.LimitModeEnum.Time); + b1 = false; + } + + if (minMoveCount == null || hasClearedOnceInMove == null) + { + MetaUtil.ReinitializeMetaFile(metaPath, mapHash, MapManager.LimitModeEnum.Move); + b2 = false; + } + + if (b1) + { + GameManager.mm.hasClearedOnceInTime = (bool)hasClearedOnceInTime; + GameManager.mm.tryCount = (int)tryCount; + } + if (b2) + { + GameManager.mm.hasClearedOnceInMove = (bool)hasClearedOnceInMove; + GameManager.mm.MoveLimit = (int)minMoveCount; + } } else { - //다를 경우 - fs.Close(); - fs = new FileStream(metaPath, FileMode.Create, FileAccess.Write, FileShare.None); - StreamWriter sw = new StreamWriter(fs, Encoding.UTF8); - fs.Position = 0; - sw.WriteLine("0"); - sw.WriteLine("False"); - sw.WriteLine(mapHash); - sw.Close(); - GameManager.mm.tryCount = 0; - GameManager.mm.hasClearedOnce = false; + // 다를 경우 + MetaUtil.CreateNewMetaFile(metaPath, mapHash, FileMode.Create); } - fs.Close(); } catch (Exception) { sr?.Close(); fs?.Close(); - fileStream = new FileStream(metaPath, FileMode.Create, FileAccess.ReadWrite, FileShare.None); - streamWriter = new StreamWriter(fileStream, Encoding.UTF8); - streamWriter.WriteLine("0"); - streamWriter.WriteLine("False"); - streamWriter.WriteLine(mapHash); //Hash code - streamWriter.Close(); - fileStream.Close(); - GameManager.mm.tryCount = 0; - GameManager.mm.hasClearedOnce = false; + MetaUtil.CreateNewMetaFile(metaPath, mapHash, FileMode.Create); //Debug.LogError(e.Message); } } - + } public string GetHash(HashAlgorithm hashAlgorithm, string text) @@ -1807,4 +1917,30 @@ public bool VerifyHash(HashAlgorithm hashAlgorithm, string input, string hash) return comparer.Compare(hashOfInput, hash) == 0; } + + public void ChangeLimitMode(MapManager.LimitModeEnum limitMode) + { + if (limitMode == MapManager.LimitModeEnum.Time) + { + foreach (GameObject g in GameManager.pm.minMoveCountUis) + { + g.SetActive(false); + } + foreach (GameObject g in GameManager.pm.tryCountUis) + { + g.SetActive(true); + } + } + else + { + foreach (GameObject g in GameManager.pm.tryCountUis) + { + g.SetActive(false); + } + foreach (GameObject g in GameManager.pm.minMoveCountUis) + { + g.SetActive(true); + } + } + } } diff --git a/Assets/Scripts/SettingManager.cs b/Assets/Scripts/SettingManager.cs index 7d536ae..df2fce1 100644 --- a/Assets/Scripts/SettingManager.cs +++ b/Assets/Scripts/SettingManager.cs @@ -7,27 +7,50 @@ public class SettingManager : MonoBehaviour { - public GameObject CreditPanel; - public Button QuitButton; - public Button CreditButton; - public Button BackSettingButton; - - public bool isCredit=false; + public enum Language { English = 0, 한국어 = 1 } + + public GameObject creditPanel; + public Button quitButton; + public Button creditButton; + public Button backSettingButton; + public RectTransform creditScrollContent; + public RectTransform creditDescription; + public RectTransform creditTeamLogo; + public Image creditTitleImage; + public Sprite creditTitleEnglish; + public Sprite creditTitleKorean; + + public bool isCredit = false; public bool isOnce = false; public Dropdown languageSetting; - Animator PanelAnimation; + Animator panelAnimation; void Start() { if (SceneManager.GetActiveScene().name.Equals("Setting")) { - PanelAnimation = CreditPanel.GetComponent(); - CreditPanel.SetActive(false); + panelAnimation = creditPanel.GetComponent(); + creditPanel.SetActive(false); } string localeRaw = LocalizationSettings.SelectedLocale.ToString(); - string locale = localeRaw.Substring(0, localeRaw.IndexOf('(')).TrimEnd(' '); - languageSetting.value = (int)(GameManager.Language)System.Enum.Parse(typeof(GameManager.Language), locale); + string locale; + switch (localeRaw) + { + case "English (en)": + locale = "English"; + LocalizationSettings.SelectedLocale = LocalizationSettings.AvailableLocales.GetLocale("en"); + break; + case "Korean (ko)": + locale = "한국어"; + LocalizationSettings.SelectedLocale = LocalizationSettings.AvailableLocales.GetLocale("ko"); + break; + default: + locale = "Engilsh"; + LocalizationSettings.SelectedLocale = LocalizationSettings.AvailableLocales.GetLocale("en"); + break; + } + languageSetting.value = (int)(Language)System.Enum.Parse(typeof(Language), locale); } void Update() @@ -39,9 +62,9 @@ void Update() if (!isOnce) { isOnce = true; - QuitButton.interactable = false; - CreditButton.interactable = false; - CreditPanel.SetActive(true); + quitButton.interactable = false; + creditButton.interactable = false; + creditPanel.SetActive(true); StartCoroutine(SoundEffect()); } @@ -52,10 +75,25 @@ void Update() StartCoroutine(OffCreditAnimation()); GameManager.gm.PlayButtonSFX(); } + + if (LocalizationSettings.SelectedLocale == LocalizationSettings.AvailableLocales.GetLocale("en")) + { + creditTitleImage.sprite = creditTitleEnglish; + creditScrollContent.sizeDelta = new Vector2(creditScrollContent.sizeDelta.x, 5760); + creditDescription.sizeDelta = new Vector2(creditDescription.sizeDelta.x, 4800); + creditTeamLogo.anchoredPosition = new Vector2(creditTeamLogo.anchoredPosition.x, -5040); + } + else if (LocalizationSettings.SelectedLocale == LocalizationSettings.AvailableLocales.GetLocale("ko")) + { + creditTitleImage.sprite = creditTitleKorean; + creditScrollContent.sizeDelta = new Vector2(creditScrollContent.sizeDelta.x, 4920); + creditDescription.sizeDelta = new Vector2(creditDescription.sizeDelta.x, 3960); + creditTeamLogo.anchoredPosition = new Vector2(creditTeamLogo.anchoredPosition.x, -4200); + } } else { - if (QuitButton.interactable && (Input.GetKeyUp(KeyCode.Escape) || Input.GetKeyUp(KeyCode.Return))) + if (quitButton.interactable && (Input.GetKeyUp(KeyCode.Escape) || Input.GetKeyUp(KeyCode.Return))) { GameManager.gm.PlayButtonSFX(); GameManager.gm.LoadMain(); @@ -76,16 +114,17 @@ IEnumerator SoundEffect() IEnumerator OffCreditAnimation() { - PanelAnimation.SetTrigger("BackSettingDown"); + panelAnimation.SetTrigger("BackSettingDown"); yield return new WaitForSeconds(1.5f); - QuitButton.interactable = true; - CreditButton.interactable = true; - CreditPanel.SetActive(false); + quitButton.interactable = true; + creditButton.interactable = true; + creditPanel.SetActive(false); } public void BackMainButtonDown() { + GameManager.gm.SaveSettingsValue(); GameManager.gm.LoadMain(); } @@ -99,13 +138,13 @@ public void InSettingBackButtonDown() public void CreditButtonDown() { isCredit = true; - CreditPanel.SetActive(true); + creditPanel.SetActive(true); StartCoroutine(SoundEffect()); } public void ChangeLanguage() { - GameManager.Language selected = (GameManager.Language)System.Enum.Parse(typeof(GameManager.Language), languageSetting.options[languageSetting.value].text); + //Language selected = (Language)System.Enum.Parse(typeof(Language), languageSetting.options[languageSetting.value].text); //Debug.Log(selected); switch (languageSetting.options[languageSetting.value].text) @@ -113,7 +152,7 @@ public void ChangeLanguage() case "English": LocalizationSettings.SelectedLocale = LocalizationSettings.AvailableLocales.GetLocale("en"); break; - case "Korean": + case "한국어": LocalizationSettings.SelectedLocale = LocalizationSettings.AvailableLocales.GetLocale("ko"); break; } diff --git a/Assets/Scripts/SettingUI.cs b/Assets/Scripts/SettingUI.cs index 53cebfa..149b434 100644 --- a/Assets/Scripts/SettingUI.cs +++ b/Assets/Scripts/SettingUI.cs @@ -48,16 +48,16 @@ void Update() { if (m_IsButtonDowning && !changed) { - Vector3 temp = option.transform.position; + Vector3 temp = option.transform.localPosition; temp.y -= 24; - option.transform.position = temp; + option.transform.localPosition = temp; changed = true; } - if (!m_IsButtonDowning && changed) { - - Vector3 temp = option.transform.position; + if (!m_IsButtonDowning && changed) + { + Vector3 temp = option.transform.localPosition; temp.y += 24; - option.transform.position = temp; + option.transform.localPosition = temp; changed = false; } } diff --git a/Assets/Scripts/TimerUI.cs b/Assets/Scripts/TimerUI.cs index 83e8d3f..bd2a427 100644 --- a/Assets/Scripts/TimerUI.cs +++ b/Assets/Scripts/TimerUI.cs @@ -11,9 +11,18 @@ public class TimerUI : MonoBehaviour public Image timerLabel1; public List numberLabels = new List(); - private Color stoppedColor = new Color(1f, 0f, 0.8627452f); - private Color flowingColor1 = new Color(0.6980392f, 0f, 1f); - private Color flowingColor2 = new Color(0.827451f, 0.4313726f, 1f); + private Color normalColor_flow = new Color(195/255f, 90/255f, 244/255f); + private Color normalColor_stop = new Color(225/255f, 158/255f, 1); + + private Color warningColor_phase1_flow_bright = new Color(224/255f, 0, 209/255f); + private Color warningColor_phase1_flow_dark = new Color(195/255f, 0, 182/255f); + private Color warningColor_phase1_stop = new Color(1, 81/255f, 249/255f); + + private Color warningColor_phase2_flow_bright = new Color(244/255f, 41/255f, 85/255f); + private Color warningColor_phase2_flow_dark = new Color(213/255f, 35/255f, 74/255f); + private Color warningColor_phase2_stop = new Color(1, 94/255f, 137/255f); + + private int blink_frequency = 2; // Update is called once per frame void Update() @@ -28,9 +37,9 @@ void Update() -168 - pixels * 12, timerBar.GetComponent().offsetMax.y); - timerLabel10.color = stoppedColor; - timerLabel1.color = stoppedColor; - timerBar.color = stoppedColor; + timerLabel10.color = normalColor_stop; + timerLabel1.color = normalColor_stop; + timerBar.color = normalColor_stop; return; } @@ -51,9 +60,9 @@ void Update() -168 - pixels * 12, timerBar.GetComponent().offsetMax.y); - timerLabel10.color = stoppedColor; - timerLabel1.color = stoppedColor; - timerBar.color = stoppedColor; + timerLabel10.color = normalColor_stop; + timerLabel1.color = normalColor_stop; + timerBar.color = normalColor_stop; } else { @@ -63,17 +72,66 @@ void Update() -168 - (pixels - t) * 12, timerBar.GetComponent().offsetMax.y); + int remainingTimeInt = Mathf.FloorToInt(mm.RemainingTime); + int remainingTimeFloatQuotient = Mathf.FloorToInt((mm.RemainingTime - remainingTimeInt) * blink_frequency); + if (mm.DoesTimeGoBy) { - timerLabel10.color = flowingColor2; - timerLabel1.color = flowingColor2; - timerBar.color = flowingColor1; + switch (remainingTimeInt) + { + case < 10 and >= 5: + if (remainingTimeFloatQuotient % 2 == 1) { + timerLabel10.color = warningColor_phase1_flow_bright; + timerLabel1.color = warningColor_phase1_flow_bright; + timerBar.color = warningColor_phase1_flow_bright; + break; + } + else { + timerLabel10.color = warningColor_phase1_flow_dark; + timerLabel1.color = warningColor_phase1_flow_dark; + timerBar.color = warningColor_phase1_flow_dark; + break; + } + case < 5: + if (remainingTimeFloatQuotient % 2 == 1) { + timerLabel10.color = warningColor_phase2_flow_bright; + timerLabel1.color = warningColor_phase2_flow_bright; + timerBar.color = warningColor_phase2_flow_bright; + break; + } + else { + timerLabel10.color = warningColor_phase2_flow_dark; + timerLabel1.color = warningColor_phase2_flow_dark; + timerBar.color = warningColor_phase2_flow_dark; + break; + } + default: + timerLabel10.color = normalColor_flow; + timerLabel1.color = normalColor_flow; + timerBar.color = normalColor_flow; + break; + } } else { - timerLabel10.color = stoppedColor; - timerLabel1.color = stoppedColor; - timerBar.color = stoppedColor; + switch (remainingTimeInt) + { + case < 10 and >= 5: + timerLabel10.color = warningColor_phase1_stop; + timerLabel1.color = warningColor_phase1_stop; + timerBar.color = warningColor_phase1_stop; + break; + case < 5: + timerLabel10.color = warningColor_phase2_stop; + timerLabel1.color = warningColor_phase2_stop; + timerBar.color = warningColor_phase2_stop; + break; + default: + timerLabel10.color = normalColor_stop; + timerLabel1.color = normalColor_stop; + timerBar.color = normalColor_stop; + break; + } } } } diff --git a/Assets/Scripts/TooltipHoverPC.cs b/Assets/Scripts/TooltipHoverPC.cs index ba00758..7e380b2 100644 --- a/Assets/Scripts/TooltipHoverPC.cs +++ b/Assets/Scripts/TooltipHoverPC.cs @@ -38,17 +38,24 @@ public void OnPointerEnter(PointerEventData eventData) #if !(UNITY_IOS || UNITY_ANDROID) || UNITY_EDITOR - if (GetComponent