2021-1-capstone-design1 / JSH_Project4

Go to a project
Toggle navigation Toggle navigation pinning
이종상
53f88099 1 parent 866dd00a

ignored

Expand all
Inline Side-by-side
Showing 92 changed files with 23 additions and 43 deletions
1 +Assets/
...\ No newline at end of file ...\ No newline at end of file
This file is too large to display.
This file is too large to display.
...@@ -19,7 +19,7 @@ MonoBehaviour: ...@@ -19,7 +19,7 @@ MonoBehaviour:
19 width: 1920 19 width: 1920
20 height: 997 20 height: 997
21 m_ShowMode: 4 21 m_ShowMode: 4
22 - m_Title: Hierarchy 22 + m_Title: Scene
23 m_RootView: {fileID: 7} 23 m_RootView: {fileID: 7}
24 m_MinSize: {x: 875, y: 542} 24 m_MinSize: {x: 875, y: 542}
25 m_MaxSize: {x: 10000, y: 10000} 25 m_MaxSize: {x: 10000, y: 10000}
...@@ -74,7 +74,7 @@ MonoBehaviour: ...@@ -74,7 +74,7 @@ MonoBehaviour:
74 m_MinSize: {x: 881, y: 492} 74 m_MinSize: {x: 881, y: 492}
75 m_MaxSize: {x: 16006, y: 14042} 75 m_MaxSize: {x: 16006, y: 14042}
76 vertical: 0 76 vertical: 0
77 - controlID: 132 77 + controlID: 42
78 --- !u!114 &4 78 --- !u!114 &4
79 MonoBehaviour: 79 MonoBehaviour:
80 m_ObjectHideFlags: 52 80 m_ObjectHideFlags: 52
...@@ -252,7 +252,7 @@ MonoBehaviour: ...@@ -252,7 +252,7 @@ MonoBehaviour:
252 m_MinSize: {x: 605, y: 492} 252 m_MinSize: {x: 605, y: 492}
253 m_MaxSize: {x: 12005, y: 14042} 253 m_MaxSize: {x: 12005, y: 14042}
254 vertical: 1 254 vertical: 1
255 - controlID: 133 255 + controlID: 43
256 --- !u!114 &11 256 --- !u!114 &11
257 MonoBehaviour: 257 MonoBehaviour:
258 m_ObjectHideFlags: 52 258 m_ObjectHideFlags: 52
...@@ -278,7 +278,7 @@ MonoBehaviour: ...@@ -278,7 +278,7 @@ MonoBehaviour:
278 m_MinSize: {x: 605, y: 221} 278 m_MinSize: {x: 605, y: 221}
279 m_MaxSize: {x: 12005, y: 4021} 279 m_MaxSize: {x: 12005, y: 4021}
280 vertical: 0 280 vertical: 0
281 - controlID: 134 281 + controlID: 44
282 --- !u!114 &12 282 --- !u!114 &12
283 MonoBehaviour: 283 MonoBehaviour:
284 m_ObjectHideFlags: 52 284 m_ObjectHideFlags: 52
...@@ -298,8 +298,8 @@ MonoBehaviour: ...@@ -298,8 +298,8 @@ MonoBehaviour:
298 y: 0 298 y: 0
299 width: 409 299 width: 409
300 height: 671 300 height: 671
301 - m_MinSize: {x: 200, y: 200} 301 + m_MinSize: {x: 202, y: 221}
302 - m_MaxSize: {x: 4000, y: 4000} 302 + m_MaxSize: {x: 4002, y: 4021}
303 m_ActualView: {fileID: 17} 303 m_ActualView: {fileID: 17}
304 m_Panes: 304 m_Panes:
305 - {fileID: 17} 305 - {fileID: 17}
...@@ -369,22 +369,22 @@ MonoBehaviour: ...@@ -369,22 +369,22 @@ MonoBehaviour:
369 m_SkipHidden: 0 369 m_SkipHidden: 0
370 m_SearchArea: 1 370 m_SearchArea: 1
371 m_Folders: 371 m_Folders:
372 - - Assets/scripts 372 + - Assets/Scenes
373 m_Globs: [] 373 m_Globs: []
374 m_OriginalText: 374 m_OriginalText:
375 m_ViewMode: 1 375 m_ViewMode: 1
376 m_StartGridSize: 64 376 m_StartGridSize: 64
377 m_LastFolders: 377 m_LastFolders:
378 - - Assets/scripts 378 + - Assets/Scenes
379 m_LastFoldersGridSize: -1 379 m_LastFoldersGridSize: -1
380 - m_LastProjectPath: F:\gradle_2 380 + m_LastProjectPath: F:\JSH_Project4
381 m_LockTracker: 381 m_LockTracker:
382 m_IsLocked: 0 382 m_IsLocked: 0
383 m_FolderTreeState: 383 m_FolderTreeState:
384 scrollPos: {x: 0, y: 0} 384 scrollPos: {x: 0, y: 0}
385 - m_SelectedIDs: 0c410000 385 + m_SelectedIDs: e4430000
386 - m_LastClickedID: 16652 386 + m_LastClickedID: 17380
387 - m_ExpandedIDs: 00000000f6400000f840000000ca9a3b 387 + m_ExpandedIDs: 00000000d4430000d643000000ca9a3b
388 m_RenameOverlay: 388 m_RenameOverlay:
389 m_UserAcceptedRename: 0 389 m_UserAcceptedRename: 0
390 m_Name: 390 m_Name:
...@@ -412,7 +412,7 @@ MonoBehaviour: ...@@ -412,7 +412,7 @@ MonoBehaviour:
412 scrollPos: {x: 0, y: 0} 412 scrollPos: {x: 0, y: 0}
413 m_SelectedIDs: 413 m_SelectedIDs:
414 m_LastClickedID: 0 414 m_LastClickedID: 0
415 - m_ExpandedIDs: 00000000f6400000f8400000 415 + m_ExpandedIDs: 00000000d4430000d6430000
416 m_RenameOverlay: 416 m_RenameOverlay:
417 m_UserAcceptedRename: 0 417 m_UserAcceptedRename: 0
418 m_Name: 418 m_Name:
...@@ -533,9 +533,9 @@ MonoBehaviour: ...@@ -533,9 +533,9 @@ MonoBehaviour:
533 m_SceneHierarchy: 533 m_SceneHierarchy:
534 m_TreeViewState: 534 m_TreeViewState:
535 scrollPos: {x: 0, y: 0} 535 scrollPos: {x: 0, y: 0}
536 - m_SelectedIDs: 536 + m_SelectedIDs: 08470000
537 - m_LastClickedID: 0 537 + m_LastClickedID: 18184
538 - m_ExpandedIDs: b0d7ffffced7ffffd0d7ffffd4d7ffffd8d7ffff50d9ffff6ed9ffff70d9ffff74d9ffff78d9ffff00daffff1edaffff20daffff24daffff28daffff90dcffffaedcffffb0dcffffb4dcffffb8dcffff96dfffffb4dfffffb6dfffffbadfffffbedfffffd8e4fffff6e4ffffdee5ffffe2e5ffffe8e5ffffdce9fffffae9ffffe2eaffffe6eaffffeceaffffd4eeffff46f1ffff64f1ffff4cf2ffff50f2ffff56f2ffff80f7ffff9ef7ffff86f8ffff8af8ffff90f8ffff10fbffff82450000ae450000be4500001c4600003c4b0000d64b00009450000086560000c2560000105c00008a600000a2600000246700009e6b0000 538 + m_ExpandedIDs: 42f6ffff64f6ffff8ef6ffffa6f6ffffb4f7ffff504600008c460000
539 m_RenameOverlay: 539 m_RenameOverlay:
540 m_UserAcceptedRename: 0 540 m_UserAcceptedRename: 0
541 m_Name: 541 m_Name:
...@@ -595,9 +595,9 @@ MonoBehaviour: ...@@ -595,9 +595,9 @@ MonoBehaviour:
595 m_PlayAudio: 0 595 m_PlayAudio: 0
596 m_AudioPlay: 0 596 m_AudioPlay: 0
597 m_Position: 597 m_Position:
598 - m_Target: {x: 299.6211, y: 488.29703, z: -47.93785} 598 + m_Target: {x: 254.33757, y: 305.6943, z: -80.178635}
599 speed: 2 599 speed: 2
600 - m_Value: {x: 295.05762, y: 498.91055, z: -46.53662} 600 + m_Value: {x: 254.33757, y: 305.6943, z: -80.178635}
601 m_RenderMode: 0 601 m_RenderMode: 0
602 m_CameraMode: 602 m_CameraMode:
603 drawMode: 0 603 drawMode: 0
...@@ -648,9 +648,9 @@ MonoBehaviour: ...@@ -648,9 +648,9 @@ MonoBehaviour:
648 speed: 2 648 speed: 2
649 m_Value: {x: 0, y: 0, z: 0, w: 1} 649 m_Value: {x: 0, y: 0, z: 0, w: 1}
650 m_Size: 650 m_Size:
651 - m_Target: 325.3968 651 + m_Target: 348.9175
652 speed: 2 652 speed: 2
653 - m_Value: 311.3845 653 + m_Value: 348.9175
654 m_Ortho: 654 m_Ortho:
655 m_Target: 1 655 m_Target: 1
656 speed: 2 656 speed: 2
......
This diff is collapsed. Click to expand it.
1 -735ad1ca8d55225f44e6ae4a412401da
...\ No newline at end of file ...\ No newline at end of file
1 +9178ea1cea9af601f9c497c65bee7a0d
...\ No newline at end of file ...\ No newline at end of file
......
No preview for this file type
1 -{"cameraMode":{"drawMode":0,"name":"Shaded","section":"Shading Mode"},"sceneLighting":true,"audioPlay":false,"sceneViewState":{"m_AlwaysRefresh":false,"showFog":true,"showSkybox":true,"showFlares":true,"showImageEffects":true,"showParticleSystems":true,"showVisualEffectGraphs":true,"m_FxEnabled":true},"in2DMode":true,"pivot":{"x":299.62109375,"y":488.2970275878906,"z":-47.93785095214844},"rotation":{"x":0.0,"y":0.0,"z":0.0,"w":1.0},"size":325.39678955078127,"orthographic":true}
...\ No newline at end of file ...\ No newline at end of file
1 +{"cameraMode":{"drawMode":0,"name":"Shaded","section":"Shading Mode"},"sceneLighting":true,"audioPlay":false,"sceneViewState":{"m_AlwaysRefresh":false,"showFog":true,"showSkybox":true,"showFlares":true,"showImageEffects":true,"showParticleSystems":true,"showVisualEffectGraphs":true,"m_FxEnabled":true},"in2DMode":true,"pivot":{"x":254.3375701904297,"y":305.6943054199219,"z":-80.17863464355469},"rotation":{"x":0.0,"y":0.0,"z":0.0,"w":1.0},"size":348.9175109863281,"orthographic":true}
...\ No newline at end of file ...\ No newline at end of file
......
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
1 -Base path: 'C:/2020.3.1f1/Editor/Data', plugins path 'C:/2020.3.1f1/Editor/Data/PlaybackEngines'
2 -Cmd: initializeCompiler
3 -
1 -Base path: 'C:/2020.3.1f1/Editor/Data', plugins path 'C:/2020.3.1f1/Editor/Data/PlaybackEngines'
2 -Cmd: initializeCompiler
3 -
1 -Base path: 'C:/2020.3.1f1/Editor/Data', plugins path 'C:/2020.3.1f1/Editor/Data/PlaybackEngines'
2 -Cmd: initializeCompiler
3 -
1 -Base path: 'C:/2020.3.1f1/Editor/Data', plugins path 'C:/2020.3.1f1/Editor/Data/PlaybackEngines'
2 -Cmd: initializeCompiler
3 -
1 -Base path: 'C:/2020.3.1f1/Editor/Data', plugins path 'C:/2020.3.1f1/Editor/Data/PlaybackEngines'
2 -Cmd: initializeCompiler
3 -
1 -Base path: 'C:/2020.3.1f1/Editor/Data', plugins path 'C:/2020.3.1f1/Editor/Data/PlaybackEngines'
2 -Cmd: initializeCompiler
3 -
1 -Base path: 'C:/2020.3.1f1/Editor/Data', plugins path 'C:/2020.3.1f1/Editor/Data/PlaybackEngines'
2 -Cmd: initializeCompiler
3 -