조아혜 / smart-home-training

Go to a project
Toggle navigation Toggle navigation pinning
김유현
cf479aed 1 parent e4e2f7d3

0614 : develop to master

Inline Side-by-side
Showing 53 changed files with 505 additions and 570 deletions
...@@ -57,7 +57,6 @@ ...@@ -57,7 +57,6 @@
57 </ItemGroup> 57 </ItemGroup>
58 <ItemGroup> 58 <ItemGroup>
59 <Compile Include="Assets\VIDE\Data\Editor\VIDE_AssignC.cs" /> 59 <Compile Include="Assets\VIDE\Data\Editor\VIDE_AssignC.cs" />
60 - <Compile Include="Assets\TopDown 2D RPG BE3\ReadMe\Scripts\Editor\ReadmeEditorBE3.cs" />
61 <Compile Include="Assets\VIDE\Data\Editor\VIDE_Editor.cs" /> 60 <Compile Include="Assets\VIDE\Data\Editor\VIDE_Editor.cs" />
62 <Compile Include="Assets\VIDE\Data\Editor\VDE.cs" /> 61 <Compile Include="Assets\VIDE\Data\Editor\VDE.cs" />
63 </ItemGroup> 62 </ItemGroup>
...@@ -293,9 +292,6 @@ ...@@ -293,9 +292,6 @@
293 <Reference Include="SyntaxTree.VisualStudio.Unity.Bridge"> 292 <Reference Include="SyntaxTree.VisualStudio.Unity.Bridge">
294 <HintPath>C:\Program Files (x86)\Microsoft Visual Studio Tools for Unity\16.0\Editor\SyntaxTree.VisualStudio.Unity.Bridge.dll</HintPath> 293 <HintPath>C:\Program Files (x86)\Microsoft Visual Studio Tools for Unity\16.0\Editor\SyntaxTree.VisualStudio.Unity.Bridge.dll</HintPath>
295 </Reference> 294 </Reference>
296 - <Reference Include="Valve.Newtonsoft.Json">
297 - <HintPath>Assets\SteamVR\Input\Plugins\JSON.NET\Valve.Newtonsoft.Json.dll</HintPath>
298 - </Reference>
299 <Reference Include="nunit.framework"> 295 <Reference Include="nunit.framework">
300 <HintPath>Library\PackageCache\com.unity.ext.nunit@1.0.6\net35\unity-custom\nunit.framework.dll</HintPath> 296 <HintPath>Library\PackageCache\com.unity.ext.nunit@1.0.6\net35\unity-custom\nunit.framework.dll</HintPath>
301 </Reference> 297 </Reference>
...@@ -653,18 +649,12 @@ ...@@ -653,18 +649,12 @@
653 <Reference Include="Unity.VSCode.Editor"> 649 <Reference Include="Unity.VSCode.Editor">
654 <HintPath>Library\ScriptAssemblies\Unity.VSCode.Editor.dll</HintPath> 650 <HintPath>Library\ScriptAssemblies\Unity.VSCode.Editor.dll</HintPath>
655 </Reference> 651 </Reference>
656 - <Reference Include="Unity.XR.OpenVR">
657 - <HintPath>Library\ScriptAssemblies\Unity.XR.OpenVR.dll</HintPath>
658 - </Reference>
659 <Reference Include="Unity.TextMeshPro.Editor"> 652 <Reference Include="Unity.TextMeshPro.Editor">
660 <HintPath>Library\ScriptAssemblies\Unity.TextMeshPro.Editor.dll</HintPath> 653 <HintPath>Library\ScriptAssemblies\Unity.TextMeshPro.Editor.dll</HintPath>
661 </Reference> 654 </Reference>
662 <Reference Include="Unity.VisualStudio.Editor"> 655 <Reference Include="Unity.VisualStudio.Editor">
663 <HintPath>Library\ScriptAssemblies\Unity.VisualStudio.Editor.dll</HintPath> 656 <HintPath>Library\ScriptAssemblies\Unity.VisualStudio.Editor.dll</HintPath>
664 </Reference> 657 </Reference>
665 - <Reference Include="Unity.XR.Management.Editor">
666 - <HintPath>Library\ScriptAssemblies\Unity.XR.Management.Editor.dll</HintPath>
667 - </Reference>
668 <Reference Include="Unity.Timeline"> 658 <Reference Include="Unity.Timeline">
669 <HintPath>Library\ScriptAssemblies\Unity.Timeline.dll</HintPath> 659 <HintPath>Library\ScriptAssemblies\Unity.Timeline.dll</HintPath>
670 </Reference> 660 </Reference>
...@@ -674,9 +664,6 @@ ...@@ -674,9 +664,6 @@
674 <Reference Include="Unity.2D.Sprite.Editor"> 664 <Reference Include="Unity.2D.Sprite.Editor">
675 <HintPath>Library\ScriptAssemblies\Unity.2D.Sprite.Editor.dll</HintPath> 665 <HintPath>Library\ScriptAssemblies\Unity.2D.Sprite.Editor.dll</HintPath>
676 </Reference> 666 </Reference>
677 - <Reference Include="Unity.Subsystem.Registration">
678 - <HintPath>Library\ScriptAssemblies\Unity.Subsystem.Registration.dll</HintPath>
679 - </Reference>
680 <Reference Include="UnityEditor.UI"> 667 <Reference Include="UnityEditor.UI">
681 <HintPath>Library\ScriptAssemblies\UnityEditor.UI.dll</HintPath> 668 <HintPath>Library\ScriptAssemblies\UnityEditor.UI.dll</HintPath>
682 </Reference> 669 </Reference>
...@@ -686,53 +673,15 @@ ...@@ -686,53 +673,15 @@
686 <Reference Include="UnityEngine.UI"> 673 <Reference Include="UnityEngine.UI">
687 <HintPath>Library\ScriptAssemblies\UnityEngine.UI.dll</HintPath> 674 <HintPath>Library\ScriptAssemblies\UnityEngine.UI.dll</HintPath>
688 </Reference> 675 </Reference>
689 - <Reference Include="UnityEngine.SpatialTracking">
690 - <HintPath>Library\ScriptAssemblies\UnityEngine.SpatialTracking.dll</HintPath>
691 - </Reference>
692 - <Reference Include="Unity.XR.OpenVR.Editor">
693 - <HintPath>Library\ScriptAssemblies\Unity.XR.OpenVR.Editor.dll</HintPath>
694 - </Reference>
695 - <Reference Include="UnityEngine.XR.LegacyInputHelpers">
696 - <HintPath>Library\ScriptAssemblies\UnityEngine.XR.LegacyInputHelpers.dll</HintPath>
697 - </Reference>
698 <Reference Include="Unity.Timeline.Editor"> 676 <Reference Include="Unity.Timeline.Editor">
699 <HintPath>Library\ScriptAssemblies\Unity.Timeline.Editor.dll</HintPath> 677 <HintPath>Library\ScriptAssemblies\Unity.Timeline.Editor.dll</HintPath>
700 </Reference> 678 </Reference>
701 - <Reference Include="UnityEditor.XR.LegacyInputHelpers">
702 - <HintPath>Library\ScriptAssemblies\UnityEditor.XR.LegacyInputHelpers.dll</HintPath>
703 - </Reference>
704 - <Reference Include="Unity.XR.Management">
705 - <HintPath>Library\ScriptAssemblies\Unity.XR.Management.dll</HintPath>
706 - </Reference>
707 - <Reference Include="UnityEditor.SpatialTracking">
708 - <HintPath>Library\ScriptAssemblies\UnityEditor.SpatialTracking.dll</HintPath>
709 - </Reference>
710 </ItemGroup> 679 </ItemGroup>
711 <ItemGroup> 680 <ItemGroup>
712 <ProjectReference Include="Assembly-CSharp.csproj"> 681 <ProjectReference Include="Assembly-CSharp.csproj">
713 <Project>{60310D78-8B7A-FABB-FD83-119000786342}</Project> 682 <Project>{60310D78-8B7A-FABB-FD83-119000786342}</Project>
714 <Name>Assembly-CSharp</Name> 683 <Name>Assembly-CSharp</Name>
715 </ProjectReference> 684 </ProjectReference>
716 - <ProjectReference Include="SteamVR_Input_Editor.csproj">
717 - <Project>{6F22B42F-899A-E42E-814F-38FF0E3DB215}</Project>
718 - <Name>SteamVR_Input_Editor</Name>
719 - </ProjectReference>
720 - <ProjectReference Include="SteamVR.csproj">
721 - <Project>{310FB4FB-53C9-90A1-9768-DD7F26101DCF}</Project>
722 - <Name>SteamVR</Name>
723 - </ProjectReference>
724 - <ProjectReference Include="SteamVR_Windows_EditorHelper.csproj">
725 - <Project>{A6E1F8DF-CF60-3F45-FA82-919780E1A707}</Project>
726 - <Name>SteamVR_Windows_EditorHelper</Name>
727 - </ProjectReference>
728 - <ProjectReference Include="SteamVR_Actions.csproj">
729 - <Project>{76F1EB3F-53DB-5748-8114-33E09C8762F0}</Project>
730 - <Name>SteamVR_Actions</Name>
731 - </ProjectReference>
732 - <ProjectReference Include="SteamVR_Editor.csproj">
733 - <Project>{D6858D21-A814-528C-DEEF-67B0183BCC89}</Project>
734 - <Name>SteamVR_Editor</Name>
735 - </ProjectReference>
736 </ItemGroup> 685 </ItemGroup>
737 <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> 686 <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
738 <Target Name="GenerateTargetFrameworkMonikerAttribute" /> 687 <Target Name="GenerateTargetFrameworkMonikerAttribute" />
......
...@@ -58,13 +58,13 @@ ...@@ -58,13 +58,13 @@
58 <ItemGroup> 58 <ItemGroup>
59 <Compile Include="Assets\VIDE\Data\VIDE_Data.cs" /> 59 <Compile Include="Assets\VIDE\Data\VIDE_Data.cs" />
60 <Compile Include="Assets\DDSystem\Demo\Scripts\TestMessage_Selection.cs" /> 60 <Compile Include="Assets\DDSystem\Demo\Scripts\TestMessage_Selection.cs" />
61 - <Compile Include="Assets\TopDown 2D RPG BE3\ReadMe\Scripts\ReadmeBE3.cs" />
62 <Compile Include="Assets\VIDE\Data\MiniJSON_VIDE.cs" /> 61 <Compile Include="Assets\VIDE\Data\MiniJSON_VIDE.cs" />
63 <Compile Include="Assets\VIDE\Data\VIDE_Localization.cs" /> 62 <Compile Include="Assets\VIDE\Data\VIDE_Localization.cs" />
64 <Compile Include="Assets\VIDE\Demos\PlayerInteraction\demoScripts\VIDEDemoPlayer.cs" /> 63 <Compile Include="Assets\VIDE\Demos\PlayerInteraction\demoScripts\VIDEDemoPlayer.cs" />
65 <Compile Include="Assets\DDSystem\Demo\Scripts\TestMessage.cs" /> 64 <Compile Include="Assets\DDSystem\Demo\Scripts\TestMessage.cs" />
66 <Compile Include="Assets\VIDE\Demos\MultiInstances\VIDEUIManager3.cs" /> 65 <Compile Include="Assets\VIDE\Demos\MultiInstances\VIDEUIManager3.cs" />
67 <Compile Include="Assets\DDSystem\Script\DialogManager.cs" /> 66 <Compile Include="Assets\DDSystem\Script\DialogManager.cs" />
67 + <Compile Include="Assets\Scripts\UIManager.cs" />
68 <Compile Include="Assets\VIDE\Demos\Narration\DEMO_UIManager.cs" /> 68 <Compile Include="Assets\VIDE\Demos\Narration\DEMO_UIManager.cs" />
69 <Compile Include="Assets\Scripts\ControllerGrabObject.cs" /> 69 <Compile Include="Assets\Scripts\ControllerGrabObject.cs" />
70 <Compile Include="Assets\VIDE\Demos\PlayerInteraction\demoScripts\QuestChartDemo.cs" /> 70 <Compile Include="Assets\VIDE\Demos\PlayerInteraction\demoScripts\QuestChartDemo.cs" />
...@@ -88,7 +88,7 @@ ...@@ -88,7 +88,7 @@
88 <Compile Include="Assets\VIDE\Demos\Localization\VIDEUIManager2.cs" /> 88 <Compile Include="Assets\VIDE\Demos\Localization\VIDEUIManager2.cs" />
89 <Compile Include="Assets\Scripts\LaserPointer.cs" /> 89 <Compile Include="Assets\Scripts\LaserPointer.cs" />
90 <Compile Include="Assets\Scripts\ActionTest.cs" /> 90 <Compile Include="Assets\Scripts\ActionTest.cs" />
91 - <Compile Include="Assets\Scripts\UIManager.cs" /> 91 + <Compile Include="Assets\Scripts\CameraMoving.cs" />
92 </ItemGroup> 92 </ItemGroup>
93 <ItemGroup> 93 <ItemGroup>
94 <None Include="Assets\LowPolyOfficeProps_LITE\About.txt" /> 94 <None Include="Assets\LowPolyOfficeProps_LITE\About.txt" />
...@@ -324,9 +324,6 @@ ...@@ -324,9 +324,6 @@
324 <Reference Include="UnityEditor.UnityConnectModule"> 324 <Reference Include="UnityEditor.UnityConnectModule">
325 <HintPath>D:\Unity\Editor\Data\Managed\UnityEngine\UnityEditor.UnityConnectModule.dll</HintPath> 325 <HintPath>D:\Unity\Editor\Data\Managed\UnityEngine\UnityEditor.UnityConnectModule.dll</HintPath>
326 </Reference> 326 </Reference>
327 - <Reference Include="Valve.Newtonsoft.Json">
328 - <HintPath>Assets\SteamVR\Input\Plugins\JSON.NET\Valve.Newtonsoft.Json.dll</HintPath>
329 - </Reference>
330 <Reference Include="netstandard"> 327 <Reference Include="netstandard">
331 <HintPath>D:\Unity\Editor\Data\NetStandard\ref\2.0.0\netstandard.dll</HintPath> 328 <HintPath>D:\Unity\Editor\Data\NetStandard\ref\2.0.0\netstandard.dll</HintPath>
332 </Reference> 329 </Reference>
...@@ -675,18 +672,12 @@ ...@@ -675,18 +672,12 @@
675 <Reference Include="Unity.VSCode.Editor"> 672 <Reference Include="Unity.VSCode.Editor">
676 <HintPath>Library\ScriptAssemblies\Unity.VSCode.Editor.dll</HintPath> 673 <HintPath>Library\ScriptAssemblies\Unity.VSCode.Editor.dll</HintPath>
677 </Reference> 674 </Reference>
678 - <Reference Include="Unity.XR.OpenVR">
679 - <HintPath>Library\ScriptAssemblies\Unity.XR.OpenVR.dll</HintPath>
680 - </Reference>
681 <Reference Include="Unity.TextMeshPro.Editor"> 675 <Reference Include="Unity.TextMeshPro.Editor">
682 <HintPath>Library\ScriptAssemblies\Unity.TextMeshPro.Editor.dll</HintPath> 676 <HintPath>Library\ScriptAssemblies\Unity.TextMeshPro.Editor.dll</HintPath>
683 </Reference> 677 </Reference>
684 <Reference Include="Unity.VisualStudio.Editor"> 678 <Reference Include="Unity.VisualStudio.Editor">
685 <HintPath>Library\ScriptAssemblies\Unity.VisualStudio.Editor.dll</HintPath> 679 <HintPath>Library\ScriptAssemblies\Unity.VisualStudio.Editor.dll</HintPath>
686 </Reference> 680 </Reference>
687 - <Reference Include="Unity.XR.Management.Editor">
688 - <HintPath>Library\ScriptAssemblies\Unity.XR.Management.Editor.dll</HintPath>
689 - </Reference>
690 <Reference Include="Unity.Timeline"> 681 <Reference Include="Unity.Timeline">
691 <HintPath>Library\ScriptAssemblies\Unity.Timeline.dll</HintPath> 682 <HintPath>Library\ScriptAssemblies\Unity.Timeline.dll</HintPath>
692 </Reference> 683 </Reference>
...@@ -696,9 +687,6 @@ ...@@ -696,9 +687,6 @@
696 <Reference Include="Unity.2D.Sprite.Editor"> 687 <Reference Include="Unity.2D.Sprite.Editor">
697 <HintPath>Library\ScriptAssemblies\Unity.2D.Sprite.Editor.dll</HintPath> 688 <HintPath>Library\ScriptAssemblies\Unity.2D.Sprite.Editor.dll</HintPath>
698 </Reference> 689 </Reference>
699 - <Reference Include="Unity.Subsystem.Registration">
700 - <HintPath>Library\ScriptAssemblies\Unity.Subsystem.Registration.dll</HintPath>
701 - </Reference>
702 <Reference Include="UnityEditor.UI"> 690 <Reference Include="UnityEditor.UI">
703 <HintPath>Library\ScriptAssemblies\UnityEditor.UI.dll</HintPath> 691 <HintPath>Library\ScriptAssemblies\UnityEditor.UI.dll</HintPath>
704 </Reference> 692 </Reference>
...@@ -708,49 +696,11 @@ ...@@ -708,49 +696,11 @@
708 <Reference Include="UnityEngine.UI"> 696 <Reference Include="UnityEngine.UI">
709 <HintPath>Library\ScriptAssemblies\UnityEngine.UI.dll</HintPath> 697 <HintPath>Library\ScriptAssemblies\UnityEngine.UI.dll</HintPath>
710 </Reference> 698 </Reference>
711 - <Reference Include="UnityEngine.SpatialTracking">
712 - <HintPath>Library\ScriptAssemblies\UnityEngine.SpatialTracking.dll</HintPath>
713 - </Reference>
714 - <Reference Include="Unity.XR.OpenVR.Editor">
715 - <HintPath>Library\ScriptAssemblies\Unity.XR.OpenVR.Editor.dll</HintPath>
716 - </Reference>
717 - <Reference Include="UnityEngine.XR.LegacyInputHelpers">
718 - <HintPath>Library\ScriptAssemblies\UnityEngine.XR.LegacyInputHelpers.dll</HintPath>
719 - </Reference>
720 <Reference Include="Unity.Timeline.Editor"> 699 <Reference Include="Unity.Timeline.Editor">
721 <HintPath>Library\ScriptAssemblies\Unity.Timeline.Editor.dll</HintPath> 700 <HintPath>Library\ScriptAssemblies\Unity.Timeline.Editor.dll</HintPath>
722 </Reference> 701 </Reference>
723 - <Reference Include="UnityEditor.XR.LegacyInputHelpers">
724 - <HintPath>Library\ScriptAssemblies\UnityEditor.XR.LegacyInputHelpers.dll</HintPath>
725 - </Reference>
726 - <Reference Include="Unity.XR.Management">
727 - <HintPath>Library\ScriptAssemblies\Unity.XR.Management.dll</HintPath>
728 - </Reference>
729 - <Reference Include="UnityEditor.SpatialTracking">
730 - <HintPath>Library\ScriptAssemblies\UnityEditor.SpatialTracking.dll</HintPath>
731 - </Reference>
732 </ItemGroup> 702 </ItemGroup>
733 <ItemGroup> 703 <ItemGroup>
734 - <ProjectReference Include="SteamVR_Input_Editor.csproj">
735 - <Project>{6F22B42F-899A-E42E-814F-38FF0E3DB215}</Project>
736 - <Name>SteamVR_Input_Editor</Name>
737 - </ProjectReference>
738 - <ProjectReference Include="SteamVR.csproj">
739 - <Project>{310FB4FB-53C9-90A1-9768-DD7F26101DCF}</Project>
740 - <Name>SteamVR</Name>
741 - </ProjectReference>
742 - <ProjectReference Include="SteamVR_Windows_EditorHelper.csproj">
743 - <Project>{A6E1F8DF-CF60-3F45-FA82-919780E1A707}</Project>
744 - <Name>SteamVR_Windows_EditorHelper</Name>
745 - </ProjectReference>
746 - <ProjectReference Include="SteamVR_Actions.csproj">
747 - <Project>{76F1EB3F-53DB-5748-8114-33E09C8762F0}</Project>
748 - <Name>SteamVR_Actions</Name>
749 - </ProjectReference>
750 - <ProjectReference Include="SteamVR_Editor.csproj">
751 - <Project>{D6858D21-A814-528C-DEEF-67B0183BCC89}</Project>
752 - <Name>SteamVR_Editor</Name>
753 - </ProjectReference>
754 </ItemGroup> 704 </ItemGroup>
755 <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> 705 <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
756 <Target Name="GenerateTargetFrameworkMonikerAttribute" /> 706 <Target Name="GenerateTargetFrameworkMonikerAttribute" />
......
...@@ -333,7 +333,7 @@ Transform: ...@@ -333,7 +333,7 @@ Transform:
333 - {fileID: 1205289291} 333 - {fileID: 1205289291}
334 - {fileID: 766042417} 334 - {fileID: 766042417}
335 m_Father: {fileID: 0} 335 m_Father: {fileID: 0}
336 - m_RootOrder: 32 336 + m_RootOrder: 31
337 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} 337 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
338 --- !u!1001 &56326134 338 --- !u!1001 &56326134
339 PrefabInstance: 339 PrefabInstance:
...@@ -1492,7 +1492,7 @@ PrefabInstance: ...@@ -1492,7 +1492,7 @@ PrefabInstance:
1492 objectReference: {fileID: 0} 1492 objectReference: {fileID: 0}
1493 - target: {fileID: 4467394157264018, guid: 67cc81d5424ea4fccbc7267473502366, type: 3} 1493 - target: {fileID: 4467394157264018, guid: 67cc81d5424ea4fccbc7267473502366, type: 3}
1494 propertyPath: m_RootOrder 1494 propertyPath: m_RootOrder
1495 - value: 21 1495 + value: 20
1496 objectReference: {fileID: 0} 1496 objectReference: {fileID: 0}
1497 - target: {fileID: 4467394157264018, guid: 67cc81d5424ea4fccbc7267473502366, type: 3} 1497 - target: {fileID: 4467394157264018, guid: 67cc81d5424ea4fccbc7267473502366, type: 3}
1498 propertyPath: m_LocalScale.y 1498 propertyPath: m_LocalScale.y
...@@ -3199,7 +3199,7 @@ PrefabInstance: ...@@ -3199,7 +3199,7 @@ PrefabInstance:
3199 objectReference: {fileID: 0} 3199 objectReference: {fileID: 0}
3200 - target: {fileID: 4839676560386254, guid: 20661e78605491946911818aa730569b, type: 3} 3200 - target: {fileID: 4839676560386254, guid: 20661e78605491946911818aa730569b, type: 3}
3201 propertyPath: m_RootOrder 3201 propertyPath: m_RootOrder
3202 - value: 4 3202 + value: 3
3203 objectReference: {fileID: 0} 3203 objectReference: {fileID: 0}
3204 - target: {fileID: 4839676560386254, guid: 20661e78605491946911818aa730569b, type: 3} 3204 - target: {fileID: 4839676560386254, guid: 20661e78605491946911818aa730569b, type: 3}
3205 propertyPath: m_LocalScale.x 3205 propertyPath: m_LocalScale.x
...@@ -4636,7 +4636,7 @@ PrefabInstance: ...@@ -4636,7 +4636,7 @@ PrefabInstance:
4636 objectReference: {fileID: 0} 4636 objectReference: {fileID: 0}
4637 - target: {fileID: 472606, guid: 0b8c2ad763f1b8147b1b4f56db8d9e0a, type: 3} 4637 - target: {fileID: 472606, guid: 0b8c2ad763f1b8147b1b4f56db8d9e0a, type: 3}
4638 propertyPath: m_RootOrder 4638 propertyPath: m_RootOrder
4639 - value: 19 4639 + value: 18
4640 objectReference: {fileID: 0} 4640 objectReference: {fileID: 0}
4641 - target: {fileID: 472606, guid: 0b8c2ad763f1b8147b1b4f56db8d9e0a, type: 3} 4641 - target: {fileID: 472606, guid: 0b8c2ad763f1b8147b1b4f56db8d9e0a, type: 3}
4642 propertyPath: m_LocalScale.x 4642 propertyPath: m_LocalScale.x
...@@ -5304,7 +5304,7 @@ Transform: ...@@ -5304,7 +5304,7 @@ Transform:
5304 m_LocalScale: {x: 1, y: 1, z: 1} 5304 m_LocalScale: {x: 1, y: 1, z: 1}
5305 m_Children: [] 5305 m_Children: []
5306 m_Father: {fileID: 0} 5306 m_Father: {fileID: 0}
5307 - m_RootOrder: 34 5307 + m_RootOrder: 33
5308 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} 5308 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
5309 --- !u!1001 &615697915 5309 --- !u!1001 &615697915
5310 PrefabInstance: 5310 PrefabInstance:
...@@ -5447,7 +5447,7 @@ PrefabInstance: ...@@ -5447,7 +5447,7 @@ PrefabInstance:
5447 objectReference: {fileID: 0} 5447 objectReference: {fileID: 0}
5448 - target: {fileID: 4821364316237510, guid: 748077ed833c34102965ab1dad2a8817, type: 3} 5448 - target: {fileID: 4821364316237510, guid: 748077ed833c34102965ab1dad2a8817, type: 3}
5449 propertyPath: m_RootOrder 5449 propertyPath: m_RootOrder
5450 - value: 22 5450 + value: 21
5451 objectReference: {fileID: 0} 5451 objectReference: {fileID: 0}
5452 - target: {fileID: 4821364316237510, guid: 748077ed833c34102965ab1dad2a8817, type: 3} 5452 - target: {fileID: 4821364316237510, guid: 748077ed833c34102965ab1dad2a8817, type: 3}
5453 propertyPath: m_LocalScale.y 5453 propertyPath: m_LocalScale.y
...@@ -5512,7 +5512,7 @@ PrefabInstance: ...@@ -5512,7 +5512,7 @@ PrefabInstance:
5512 objectReference: {fileID: 0} 5512 objectReference: {fileID: 0}
5513 - target: {fileID: 4461402307424116, guid: bd7dac146a034144fb4a57250777c4d9, type: 3} 5513 - target: {fileID: 4461402307424116, guid: bd7dac146a034144fb4a57250777c4d9, type: 3}
5514 propertyPath: m_RootOrder 5514 propertyPath: m_RootOrder
5515 - value: 7 5515 + value: 6
5516 objectReference: {fileID: 0} 5516 objectReference: {fileID: 0}
5517 - target: {fileID: 4461402307424116, guid: bd7dac146a034144fb4a57250777c4d9, type: 3} 5517 - target: {fileID: 4461402307424116, guid: bd7dac146a034144fb4a57250777c4d9, type: 3}
5518 propertyPath: m_LocalScale.x 5518 propertyPath: m_LocalScale.x
...@@ -7491,7 +7491,7 @@ PrefabInstance: ...@@ -7491,7 +7491,7 @@ PrefabInstance:
7491 objectReference: {fileID: 0} 7491 objectReference: {fileID: 0}
7492 - target: {fileID: 4367695987642534, guid: b5bf67069f5950943afac56320c54b69, type: 3} 7492 - target: {fileID: 4367695987642534, guid: b5bf67069f5950943afac56320c54b69, type: 3}
7493 propertyPath: m_RootOrder 7493 propertyPath: m_RootOrder
7494 - value: 11 7494 + value: 10
7495 objectReference: {fileID: 0} 7495 objectReference: {fileID: 0}
7496 - target: {fileID: 4367695987642534, guid: b5bf67069f5950943afac56320c54b69, type: 3} 7496 - target: {fileID: 4367695987642534, guid: b5bf67069f5950943afac56320c54b69, type: 3}
7497 propertyPath: m_LocalPosition.x 7497 propertyPath: m_LocalPosition.x
...@@ -8223,7 +8223,7 @@ Transform: ...@@ -8223,7 +8223,7 @@ Transform:
8223 m_LocalScale: {x: 1, y: 1, z: 1} 8223 m_LocalScale: {x: 1, y: 1, z: 1}
8224 m_Children: [] 8224 m_Children: []
8225 m_Father: {fileID: 0} 8225 m_Father: {fileID: 0}
8226 - m_RootOrder: 27 8226 + m_RootOrder: 26
8227 m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} 8227 m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0}
8228 --- !u!1 &867978179 8228 --- !u!1 &867978179
8229 GameObject: 8229 GameObject:
...@@ -8752,6 +8752,98 @@ Camera: ...@@ -8752,6 +8752,98 @@ Camera:
8752 m_CorrespondingSourceObject: {fileID: 20000014031267948, guid: 4d293c8e162f3874b982baadd71153d2, type: 3} 8752 m_CorrespondingSourceObject: {fileID: 20000014031267948, guid: 4d293c8e162f3874b982baadd71153d2, type: 3}
8753 m_PrefabInstance: {fileID: 1699070949} 8753 m_PrefabInstance: {fileID: 1699070949}
8754 m_PrefabAsset: {fileID: 0} 8754 m_PrefabAsset: {fileID: 0}
8755 +--- !u!1 &956320738
8756 +GameObject:
8757 + m_ObjectHideFlags: 0
8758 + m_CorrespondingSourceObject: {fileID: 0}
8759 + m_PrefabInstance: {fileID: 0}
8760 + m_PrefabAsset: {fileID: 0}
8761 + serializedVersion: 6
8762 + m_Component:
8763 + - component: {fileID: 956320739}
8764 + - component: {fileID: 956320742}
8765 + - component: {fileID: 956320741}
8766 + - component: {fileID: 956320740}
8767 + m_Layer: 0
8768 + m_Name: Step
8769 + m_TagString: Untagged
8770 + m_Icon: {fileID: 0}
8771 + m_NavMeshLayer: 0
8772 + m_StaticEditorFlags: 0
8773 + m_IsActive: 1
8774 +--- !u!224 &956320739
8775 +RectTransform:
8776 + m_ObjectHideFlags: 0
8777 + m_CorrespondingSourceObject: {fileID: 0}
8778 + m_PrefabInstance: {fileID: 0}
8779 + m_PrefabAsset: {fileID: 0}
8780 + m_GameObject: {fileID: 956320738}
8781 + m_LocalRotation: {x: -0.546923, y: 0.2505262, z: -0.17587502, w: 0.7792175}
8782 + m_LocalPosition: {x: 0, y: 0, z: 1973.3727}
8783 + m_LocalScale: {x: 0.9992892, y: 0.99928933, z: 0.9992892}
8784 + m_Children: []
8785 + m_Father: {fileID: 996248351}
8786 + m_RootOrder: 2
8787 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
8788 + m_AnchorMin: {x: 0.5, y: 0.5}
8789 + m_AnchorMax: {x: 0.5, y: 0.5}
8790 + m_AnchoredPosition: {x: 271.61374, y: -488.85272}
8791 + m_SizeDelta: {x: 160, y: 30}
8792 + m_Pivot: {x: 0.5, y: 0.5}
8793 +--- !u!114 &956320740
8794 +MonoBehaviour:
8795 + m_ObjectHideFlags: 0
8796 + m_CorrespondingSourceObject: {fileID: 0}
8797 + m_PrefabInstance: {fileID: 0}
8798 + m_PrefabAsset: {fileID: 0}
8799 + m_GameObject: {fileID: 956320738}
8800 + m_Enabled: 1
8801 + m_EditorHideFlags: 0
8802 + m_Script: {fileID: 11500000, guid: 382ec4a5d0bf2844287301f5182d007e, type: 3}
8803 + m_Name:
8804 + m_EditorClassIdentifier:
8805 +--- !u!114 &956320741
8806 +MonoBehaviour:
8807 + m_ObjectHideFlags: 0
8808 + m_CorrespondingSourceObject: {fileID: 0}
8809 + m_PrefabInstance: {fileID: 0}
8810 + m_PrefabAsset: {fileID: 0}
8811 + m_GameObject: {fileID: 956320738}
8812 + m_Enabled: 1
8813 + m_EditorHideFlags: 0
8814 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
8815 + m_Name:
8816 + m_EditorClassIdentifier:
8817 + m_Material: {fileID: 0}
8818 + m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
8819 + m_RaycastTarget: 1
8820 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
8821 + m_Maskable: 1
8822 + m_OnCullStateChanged:
8823 + m_PersistentCalls:
8824 + m_Calls: []
8825 + m_FontData:
8826 + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
8827 + m_FontSize: 14
8828 + m_FontStyle: 0
8829 + m_BestFit: 0
8830 + m_MinSize: 10
8831 + m_MaxSize: 40
8832 + m_Alignment: 0
8833 + m_AlignByGeometry: 0
8834 + m_RichText: 1
8835 + m_HorizontalOverflow: 0
8836 + m_VerticalOverflow: 0
8837 + m_LineSpacing: 1
8838 + m_Text: 'Step : 0'
8839 +--- !u!222 &956320742
8840 +CanvasRenderer:
8841 + m_ObjectHideFlags: 0
8842 + m_CorrespondingSourceObject: {fileID: 0}
8843 + m_PrefabInstance: {fileID: 0}
8844 + m_PrefabAsset: {fileID: 0}
8845 + m_GameObject: {fileID: 956320738}
8846 + m_CullTransparentMesh: 1
8755 --- !u!1 &956939991 8847 --- !u!1 &956939991
8756 GameObject: 8848 GameObject:
8757 m_ObjectHideFlags: 0 8849 m_ObjectHideFlags: 0
...@@ -8829,7 +8921,7 @@ Transform: ...@@ -8829,7 +8921,7 @@ Transform:
8829 - {fileID: 2074906520} 8921 - {fileID: 2074906520}
8830 - {fileID: 287987384} 8922 - {fileID: 287987384}
8831 m_Father: {fileID: 0} 8923 m_Father: {fileID: 0}
8832 - m_RootOrder: 33 8924 + m_RootOrder: 32
8833 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} 8925 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
8834 --- !u!1001 &968424725 8926 --- !u!1001 &968424725
8835 PrefabInstance: 8927 PrefabInstance:
...@@ -9058,7 +9150,7 @@ PrefabInstance: ...@@ -9058,7 +9150,7 @@ PrefabInstance:
9058 objectReference: {fileID: 0} 9150 objectReference: {fileID: 0}
9059 - target: {fileID: 4357540483046180, guid: 6009a5cb76b01ad41b78f123a6aeee96, type: 3} 9151 - target: {fileID: 4357540483046180, guid: 6009a5cb76b01ad41b78f123a6aeee96, type: 3}
9060 propertyPath: m_RootOrder 9152 propertyPath: m_RootOrder
9061 - value: 18 9153 + value: 17
9062 objectReference: {fileID: 0} 9154 objectReference: {fileID: 0}
9063 - target: {fileID: 4357540483046180, guid: 6009a5cb76b01ad41b78f123a6aeee96, type: 3} 9155 - target: {fileID: 4357540483046180, guid: 6009a5cb76b01ad41b78f123a6aeee96, type: 3}
9064 propertyPath: m_LocalScale.x 9156 propertyPath: m_LocalScale.x
...@@ -9243,8 +9335,9 @@ RectTransform: ...@@ -9243,8 +9335,9 @@ RectTransform:
9243 m_Children: 9335 m_Children:
9244 - {fileID: 265212107} 9336 - {fileID: 265212107}
9245 - {fileID: 1630667454} 9337 - {fileID: 1630667454}
9338 + - {fileID: 956320739}
9246 m_Father: {fileID: 0} 9339 m_Father: {fileID: 0}
9247 - m_RootOrder: 17 9340 + m_RootOrder: 16
9248 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} 9341 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
9249 m_AnchorMin: {x: 0, y: 0} 9342 m_AnchorMin: {x: 0, y: 0}
9250 m_AnchorMax: {x: 0, y: 0} 9343 m_AnchorMax: {x: 0, y: 0}
...@@ -9743,7 +9836,7 @@ Transform: ...@@ -9743,7 +9836,7 @@ Transform:
9743 - {fileID: 867978180} 9836 - {fileID: 867978180}
9744 - {fileID: 599391491} 9837 - {fileID: 599391491}
9745 m_Father: {fileID: 0} 9838 m_Father: {fileID: 0}
9746 - m_RootOrder: 31 9839 + m_RootOrder: 30
9747 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} 9840 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
9748 --- !u!1001 &1071544980 9841 --- !u!1001 &1071544980
9749 PrefabInstance: 9842 PrefabInstance:
...@@ -10230,7 +10323,7 @@ PrefabInstance: ...@@ -10230,7 +10323,7 @@ PrefabInstance:
10230 objectReference: {fileID: 0} 10323 objectReference: {fileID: 0}
10231 - target: {fileID: 4467394157264018, guid: 67cc81d5424ea4fccbc7267473502366, type: 3} 10324 - target: {fileID: 4467394157264018, guid: 67cc81d5424ea4fccbc7267473502366, type: 3}
10232 propertyPath: m_RootOrder 10325 propertyPath: m_RootOrder
10233 - value: 20 10326 + value: 19
10234 objectReference: {fileID: 0} 10327 objectReference: {fileID: 0}
10235 - target: {fileID: 4467394157264018, guid: 67cc81d5424ea4fccbc7267473502366, type: 3} 10328 - target: {fileID: 4467394157264018, guid: 67cc81d5424ea4fccbc7267473502366, type: 3}
10236 propertyPath: m_LocalScale.y 10329 propertyPath: m_LocalScale.y
...@@ -10521,7 +10614,7 @@ PrefabInstance: ...@@ -10521,7 +10614,7 @@ PrefabInstance:
10521 objectReference: {fileID: 0} 10614 objectReference: {fileID: 0}
10522 - target: {fileID: 4000010883411580, guid: eae0d75f8edbe3349b65105f0c6b5665, type: 3} 10615 - target: {fileID: 4000010883411580, guid: eae0d75f8edbe3349b65105f0c6b5665, type: 3}
10523 propertyPath: m_RootOrder 10616 propertyPath: m_RootOrder
10524 - value: 26 10617 + value: 25
10525 objectReference: {fileID: 0} 10618 objectReference: {fileID: 0}
10526 - target: {fileID: 4000010883411580, guid: eae0d75f8edbe3349b65105f0c6b5665, type: 3} 10619 - target: {fileID: 4000010883411580, guid: eae0d75f8edbe3349b65105f0c6b5665, type: 3}
10527 propertyPath: m_LocalScale.x 10620 propertyPath: m_LocalScale.x
...@@ -10794,7 +10887,7 @@ PrefabInstance: ...@@ -10794,7 +10887,7 @@ PrefabInstance:
10794 objectReference: {fileID: 0} 10887 objectReference: {fileID: 0}
10795 - target: {fileID: 4467394157264018, guid: 67cc81d5424ea4fccbc7267473502366, type: 3} 10888 - target: {fileID: 4467394157264018, guid: 67cc81d5424ea4fccbc7267473502366, type: 3}
10796 propertyPath: m_RootOrder 10889 propertyPath: m_RootOrder
10797 - value: 15 10890 + value: 14
10798 objectReference: {fileID: 0} 10891 objectReference: {fileID: 0}
10799 - target: {fileID: 4467394157264018, guid: 67cc81d5424ea4fccbc7267473502366, type: 3} 10892 - target: {fileID: 4467394157264018, guid: 67cc81d5424ea4fccbc7267473502366, type: 3}
10800 propertyPath: m_LocalScale.y 10893 propertyPath: m_LocalScale.y
...@@ -11563,7 +11656,7 @@ GameObject: ...@@ -11563,7 +11656,7 @@ GameObject:
11563 m_Icon: {fileID: 0} 11656 m_Icon: {fileID: 0}
11564 m_NavMeshLayer: 0 11657 m_NavMeshLayer: 0
11565 m_StaticEditorFlags: 0 11658 m_StaticEditorFlags: 0
11566 - m_IsActive: 0 11659 + m_IsActive: 1
11567 --- !u!114 &1266734319 11660 --- !u!114 &1266734319
11568 MonoBehaviour: 11661 MonoBehaviour:
11569 m_ObjectHideFlags: 0 11662 m_ObjectHideFlags: 0
...@@ -11640,7 +11733,7 @@ RectTransform: ...@@ -11640,7 +11733,7 @@ RectTransform:
11640 m_LocalScale: {x: 1, y: 1, z: 1} 11733 m_LocalScale: {x: 1, y: 1, z: 1}
11641 m_Children: [] 11734 m_Children: []
11642 m_Father: {fileID: 0} 11735 m_Father: {fileID: 0}
11643 - m_RootOrder: 16 11736 + m_RootOrder: 15
11644 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} 11737 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
11645 m_AnchorMin: {x: 0.5, y: 0.5} 11738 m_AnchorMin: {x: 0.5, y: 0.5}
11646 m_AnchorMax: {x: 0.5, y: 0.5} 11739 m_AnchorMax: {x: 0.5, y: 0.5}
...@@ -11660,7 +11753,7 @@ PrefabInstance: ...@@ -11660,7 +11753,7 @@ PrefabInstance:
11660 objectReference: {fileID: 0} 11753 objectReference: {fileID: 0}
11661 - target: {fileID: 4000010883411580, guid: eae0d75f8edbe3349b65105f0c6b5665, type: 3} 11754 - target: {fileID: 4000010883411580, guid: eae0d75f8edbe3349b65105f0c6b5665, type: 3}
11662 propertyPath: m_RootOrder 11755 propertyPath: m_RootOrder
11663 - value: 24 11756 + value: 23
11664 objectReference: {fileID: 0} 11757 objectReference: {fileID: 0}
11665 - target: {fileID: 4000010883411580, guid: eae0d75f8edbe3349b65105f0c6b5665, type: 3} 11758 - target: {fileID: 4000010883411580, guid: eae0d75f8edbe3349b65105f0c6b5665, type: 3}
11666 propertyPath: m_LocalScale.y 11759 propertyPath: m_LocalScale.y
...@@ -11768,7 +11861,7 @@ Transform: ...@@ -11768,7 +11861,7 @@ Transform:
11768 - {fileID: 707604053} 11861 - {fileID: 707604053}
11769 - {fileID: 1722546857} 11862 - {fileID: 1722546857}
11770 m_Father: {fileID: 0} 11863 m_Father: {fileID: 0}
11771 - m_RootOrder: 36 11864 + m_RootOrder: 35
11772 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} 11865 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
11773 --- !u!1 &1291687868 11866 --- !u!1 &1291687868
11774 GameObject: 11867 GameObject:
...@@ -11900,7 +11993,7 @@ PrefabInstance: ...@@ -11900,7 +11993,7 @@ PrefabInstance:
11900 objectReference: {fileID: 0} 11993 objectReference: {fileID: 0}
11901 - target: {fileID: 4839676560386254, guid: 20661e78605491946911818aa730569b, type: 3} 11994 - target: {fileID: 4839676560386254, guid: 20661e78605491946911818aa730569b, type: 3}
11902 propertyPath: m_RootOrder 11995 propertyPath: m_RootOrder
11903 - value: 5 11996 + value: 4
11904 objectReference: {fileID: 0} 11997 objectReference: {fileID: 0}
11905 - target: {fileID: 4839676560386254, guid: 20661e78605491946911818aa730569b, type: 3} 11998 - target: {fileID: 4839676560386254, guid: 20661e78605491946911818aa730569b, type: 3}
11906 propertyPath: m_LocalScale.x 11999 propertyPath: m_LocalScale.x
...@@ -11973,7 +12066,7 @@ PrefabInstance: ...@@ -11973,7 +12066,7 @@ PrefabInstance:
11973 objectReference: {fileID: 0} 12066 objectReference: {fileID: 0}
11974 - target: {fileID: 4000010883411580, guid: eae0d75f8edbe3349b65105f0c6b5665, type: 3} 12067 - target: {fileID: 4000010883411580, guid: eae0d75f8edbe3349b65105f0c6b5665, type: 3}
11975 propertyPath: m_RootOrder 12068 propertyPath: m_RootOrder
11976 - value: 23 12069 + value: 22
11977 objectReference: {fileID: 0} 12070 objectReference: {fileID: 0}
11978 - target: {fileID: 4000010883411580, guid: eae0d75f8edbe3349b65105f0c6b5665, type: 3} 12071 - target: {fileID: 4000010883411580, guid: eae0d75f8edbe3349b65105f0c6b5665, type: 3}
11979 propertyPath: m_LocalScale.y 12072 propertyPath: m_LocalScale.y
...@@ -12042,7 +12135,7 @@ PrefabInstance: ...@@ -12042,7 +12135,7 @@ PrefabInstance:
12042 objectReference: {fileID: 0} 12135 objectReference: {fileID: 0}
12043 - target: {fileID: 4839676560386254, guid: 20661e78605491946911818aa730569b, type: 3} 12136 - target: {fileID: 4839676560386254, guid: 20661e78605491946911818aa730569b, type: 3}
12044 propertyPath: m_RootOrder 12137 propertyPath: m_RootOrder
12045 - value: 3 12138 + value: 2
12046 objectReference: {fileID: 0} 12139 objectReference: {fileID: 0}
12047 - target: {fileID: 4839676560386254, guid: 20661e78605491946911818aa730569b, type: 3} 12140 - target: {fileID: 4839676560386254, guid: 20661e78605491946911818aa730569b, type: 3}
12048 propertyPath: m_LocalScale.x 12141 propertyPath: m_LocalScale.x
...@@ -12640,7 +12733,7 @@ PrefabInstance: ...@@ -12640,7 +12733,7 @@ PrefabInstance:
12640 objectReference: {fileID: 0} 12733 objectReference: {fileID: 0}
12641 - target: {fileID: 4105059492611526, guid: acd1035e6037f5340b25cdc9d4460022, type: 3} 12734 - target: {fileID: 4105059492611526, guid: acd1035e6037f5340b25cdc9d4460022, type: 3}
12642 propertyPath: m_RootOrder 12735 propertyPath: m_RootOrder
12643 - value: 8 12736 + value: 7
12644 objectReference: {fileID: 0} 12737 objectReference: {fileID: 0}
12645 - target: {fileID: 4105059492611526, guid: acd1035e6037f5340b25cdc9d4460022, type: 3} 12738 - target: {fileID: 4105059492611526, guid: acd1035e6037f5340b25cdc9d4460022, type: 3}
12646 propertyPath: m_LocalPosition.x 12739 propertyPath: m_LocalPosition.x
...@@ -12833,7 +12926,7 @@ PrefabInstance: ...@@ -12833,7 +12926,7 @@ PrefabInstance:
12833 objectReference: {fileID: 0} 12926 objectReference: {fileID: 0}
12834 - target: {fileID: 4827324919176084, guid: e0ef6083a5069634e8cc03171793c34d, type: 3} 12927 - target: {fileID: 4827324919176084, guid: e0ef6083a5069634e8cc03171793c34d, type: 3}
12835 propertyPath: m_RootOrder 12928 propertyPath: m_RootOrder
12836 - value: 14 12929 + value: 13
12837 objectReference: {fileID: 0} 12930 objectReference: {fileID: 0}
12838 - target: {fileID: 4827324919176084, guid: e0ef6083a5069634e8cc03171793c34d, type: 3} 12931 - target: {fileID: 4827324919176084, guid: e0ef6083a5069634e8cc03171793c34d, type: 3}
12839 propertyPath: m_LocalScale.x 12932 propertyPath: m_LocalScale.x
...@@ -13876,7 +13969,7 @@ Transform: ...@@ -13876,7 +13969,7 @@ Transform:
13876 - {fileID: 1645529049} 13969 - {fileID: 1645529049}
13877 - {fileID: 1160877884} 13970 - {fileID: 1160877884}
13878 m_Father: {fileID: 0} 13971 m_Father: {fileID: 0}
13879 - m_RootOrder: 37 13972 + m_RootOrder: 36
13880 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} 13973 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
13881 --- !u!1001 &1526463800 13974 --- !u!1001 &1526463800
13882 PrefabInstance: 13975 PrefabInstance:
...@@ -15268,7 +15361,7 @@ PrefabInstance: ...@@ -15268,7 +15361,7 @@ PrefabInstance:
15268 objectReference: {fileID: 0} 15361 objectReference: {fileID: 0}
15269 - target: {fileID: 420908, guid: 4d293c8e162f3874b982baadd71153d2, type: 3} 15362 - target: {fileID: 420908, guid: 4d293c8e162f3874b982baadd71153d2, type: 3}
15270 propertyPath: m_RootOrder 15363 propertyPath: m_RootOrder
15271 - value: 35 15364 + value: 34
15272 objectReference: {fileID: 0} 15365 objectReference: {fileID: 0}
15273 - target: {fileID: 420908, guid: 4d293c8e162f3874b982baadd71153d2, type: 3} 15366 - target: {fileID: 420908, guid: 4d293c8e162f3874b982baadd71153d2, type: 3}
15274 propertyPath: m_LocalScale.x 15367 propertyPath: m_LocalScale.x
...@@ -15425,13 +15518,6 @@ MonoBehaviour: ...@@ -15425,13 +15518,6 @@ MonoBehaviour:
15425 m_Script: {fileID: 11500000, guid: bc0ffd84c6247fa49b8db0e93d7ed3cc, type: 3} 15518 m_Script: {fileID: 11500000, guid: bc0ffd84c6247fa49b8db0e93d7ed3cc, type: 3}
15426 m_Name: 15519 m_Name:
15427 m_EditorClassIdentifier: 15520 m_EditorClassIdentifier:
15428 - handType: 1
15429 - teleportAction:
15430 - actionPath: /actions/default/in/Teleport
15431 - needsReinit: 0
15432 - grabAction:
15433 - actionPath: /actions/default/in/Grab
15434 - needsReinit: 0
15435 --- !u!114 &1699070955 stripped 15521 --- !u!114 &1699070955 stripped
15436 MonoBehaviour: 15522 MonoBehaviour:
15437 m_CorrespondingSourceObject: {fileID: 114000010110554832, guid: 4d293c8e162f3874b982baadd71153d2, type: 3} 15523 m_CorrespondingSourceObject: {fileID: 114000010110554832, guid: 4d293c8e162f3874b982baadd71153d2, type: 3}
...@@ -15584,7 +15670,7 @@ Transform: ...@@ -15584,7 +15670,7 @@ Transform:
15584 - {fileID: 648900221} 15670 - {fileID: 648900221}
15585 - {fileID: 682303263} 15671 - {fileID: 682303263}
15586 m_Father: {fileID: 0} 15672 m_Father: {fileID: 0}
15587 - m_RootOrder: 30 15673 + m_RootOrder: 29
15588 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} 15674 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
15589 --- !u!1001 &1720039324 15675 --- !u!1001 &1720039324
15590 PrefabInstance: 15676 PrefabInstance:
...@@ -15911,7 +15997,7 @@ Transform: ...@@ -15911,7 +15997,7 @@ Transform:
15911 - {fileID: 596709212} 15997 - {fileID: 596709212}
15912 - {fileID: 387298199} 15998 - {fileID: 387298199}
15913 m_Father: {fileID: 0} 15999 m_Father: {fileID: 0}
15914 - m_RootOrder: 29 16000 + m_RootOrder: 28
15915 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} 16001 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
15916 --- !u!1001 &1741749969 16002 --- !u!1001 &1741749969
15917 PrefabInstance: 16003 PrefabInstance:
...@@ -15926,7 +16012,7 @@ PrefabInstance: ...@@ -15926,7 +16012,7 @@ PrefabInstance:
15926 objectReference: {fileID: 0} 16012 objectReference: {fileID: 0}
15927 - target: {fileID: 4203470457943290, guid: 01c14961d9931d94f9ccb0cf0c46ba9f, type: 3} 16013 - target: {fileID: 4203470457943290, guid: 01c14961d9931d94f9ccb0cf0c46ba9f, type: 3}
15928 propertyPath: m_RootOrder 16014 propertyPath: m_RootOrder
15929 - value: 10 16015 + value: 9
15930 objectReference: {fileID: 0} 16016 objectReference: {fileID: 0}
15931 - target: {fileID: 4203470457943290, guid: 01c14961d9931d94f9ccb0cf0c46ba9f, type: 3} 16017 - target: {fileID: 4203470457943290, guid: 01c14961d9931d94f9ccb0cf0c46ba9f, type: 3}
15932 propertyPath: m_LocalScale.x 16018 propertyPath: m_LocalScale.x
...@@ -16784,7 +16870,7 @@ Transform: ...@@ -16784,7 +16870,7 @@ Transform:
16784 - {fileID: 706541498} 16870 - {fileID: 706541498}
16785 - {fileID: 925031071} 16871 - {fileID: 925031071}
16786 m_Father: {fileID: 0} 16872 m_Father: {fileID: 0}
16787 - m_RootOrder: 28 16873 + m_RootOrder: 27
16788 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} 16874 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
16789 --- !u!1001 &1835754029 16875 --- !u!1001 &1835754029
16790 PrefabInstance: 16876 PrefabInstance:
...@@ -16891,7 +16977,7 @@ PrefabInstance: ...@@ -16891,7 +16977,7 @@ PrefabInstance:
16891 objectReference: {fileID: 0} 16977 objectReference: {fileID: 0}
16892 - target: {fileID: 4755620223891304, guid: 889859d3862ff3b46b48aa6898f9773e, type: 3} 16978 - target: {fileID: 4755620223891304, guid: 889859d3862ff3b46b48aa6898f9773e, type: 3}
16893 propertyPath: m_RootOrder 16979 propertyPath: m_RootOrder
16894 - value: 12 16980 + value: 11
16895 objectReference: {fileID: 0} 16981 objectReference: {fileID: 0}
16896 - target: {fileID: 4755620223891304, guid: 889859d3862ff3b46b48aa6898f9773e, type: 3} 16982 - target: {fileID: 4755620223891304, guid: 889859d3862ff3b46b48aa6898f9773e, type: 3}
16897 propertyPath: m_LocalScale.x 16983 propertyPath: m_LocalScale.x
...@@ -18237,7 +18323,7 @@ PrefabInstance: ...@@ -18237,7 +18323,7 @@ PrefabInstance:
18237 objectReference: {fileID: 0} 18323 objectReference: {fileID: 0}
18238 - target: {fileID: 4402626770144814, guid: a76d0962e5aaba2479107524e448f23d, type: 3} 18324 - target: {fileID: 4402626770144814, guid: a76d0962e5aaba2479107524e448f23d, type: 3}
18239 propertyPath: m_RootOrder 18325 propertyPath: m_RootOrder
18240 - value: 6 18326 + value: 5
18241 objectReference: {fileID: 0} 18327 objectReference: {fileID: 0}
18242 - target: {fileID: 4402626770144814, guid: a76d0962e5aaba2479107524e448f23d, type: 3} 18328 - target: {fileID: 4402626770144814, guid: a76d0962e5aaba2479107524e448f23d, type: 3}
18243 propertyPath: m_LocalScale.x 18329 propertyPath: m_LocalScale.x
...@@ -18372,7 +18458,7 @@ PrefabInstance: ...@@ -18372,7 +18458,7 @@ PrefabInstance:
18372 objectReference: {fileID: 0} 18458 objectReference: {fileID: 0}
18373 - target: {fileID: 4527064727974542, guid: 00931e932c93cef48ae2d8cc87408c66, type: 3} 18459 - target: {fileID: 4527064727974542, guid: 00931e932c93cef48ae2d8cc87408c66, type: 3}
18374 propertyPath: m_RootOrder 18460 propertyPath: m_RootOrder
18375 - value: 9 18461 + value: 8
18376 objectReference: {fileID: 0} 18462 objectReference: {fileID: 0}
18377 - target: {fileID: 4527064727974542, guid: 00931e932c93cef48ae2d8cc87408c66, type: 3} 18463 - target: {fileID: 4527064727974542, guid: 00931e932c93cef48ae2d8cc87408c66, type: 3}
18378 propertyPath: m_LocalPosition.x 18464 propertyPath: m_LocalPosition.x
...@@ -18511,7 +18597,7 @@ PrefabInstance: ...@@ -18511,7 +18597,7 @@ PrefabInstance:
18511 objectReference: {fileID: 0} 18597 objectReference: {fileID: 0}
18512 - target: {fileID: 4565365290390660, guid: d114356fbca98b441817a460d0ce759e, type: 3} 18598 - target: {fileID: 4565365290390660, guid: d114356fbca98b441817a460d0ce759e, type: 3}
18513 propertyPath: m_RootOrder 18599 propertyPath: m_RootOrder
18514 - value: 13 18600 + value: 12
18515 objectReference: {fileID: 0} 18601 objectReference: {fileID: 0}
18516 - target: {fileID: 4565365290390660, guid: d114356fbca98b441817a460d0ce759e, type: 3} 18602 - target: {fileID: 4565365290390660, guid: d114356fbca98b441817a460d0ce759e, type: 3}
18517 propertyPath: m_LocalScale.x 18603 propertyPath: m_LocalScale.x
...@@ -18862,7 +18948,7 @@ PrefabInstance: ...@@ -18862,7 +18948,7 @@ PrefabInstance:
18862 objectReference: {fileID: 0} 18948 objectReference: {fileID: 0}
18863 - target: {fileID: 4000010883411580, guid: eae0d75f8edbe3349b65105f0c6b5665, type: 3} 18949 - target: {fileID: 4000010883411580, guid: eae0d75f8edbe3349b65105f0c6b5665, type: 3}
18864 propertyPath: m_RootOrder 18950 propertyPath: m_RootOrder
18865 - value: 25 18951 + value: 24
18866 objectReference: {fileID: 0} 18952 objectReference: {fileID: 0}
18867 - target: {fileID: 4000010883411580, guid: eae0d75f8edbe3349b65105f0c6b5665, type: 3} 18953 - target: {fileID: 4000010883411580, guid: eae0d75f8edbe3349b65105f0c6b5665, type: 3}
18868 propertyPath: m_LocalScale.x 18954 propertyPath: m_LocalScale.x
...@@ -18922,103 +19008,6 @@ PrefabInstance: ...@@ -18922,103 +19008,6 @@ PrefabInstance:
18922 objectReference: {fileID: 0} 19008 objectReference: {fileID: 0}
18923 m_RemovedComponents: [] 19009 m_RemovedComponents: []
18924 m_SourcePrefab: {fileID: 100100000, guid: eae0d75f8edbe3349b65105f0c6b5665, type: 3} 19010 m_SourcePrefab: {fileID: 100100000, guid: eae0d75f8edbe3349b65105f0c6b5665, type: 3}
18925 ---- !u!1001 &2080877014
18926 -PrefabInstance:
18927 - m_ObjectHideFlags: 0
18928 - serializedVersion: 2
18929 - m_Modification:
18930 - m_TransformParent: {fileID: 0}
18931 - m_Modifications:
18932 - - target: {fileID: 8206358605457009698, guid: b1e781a67c6f97f4d9cfb50a61f30655, type: 3}
18933 - propertyPath: m_Pivot.x
18934 - value: 1
18935 - objectReference: {fileID: 0}
18936 - - target: {fileID: 8206358605457009698, guid: b1e781a67c6f97f4d9cfb50a61f30655, type: 3}
18937 - propertyPath: m_Pivot.y
18938 - value: 0.5
18939 - objectReference: {fileID: 0}
18940 - - target: {fileID: 8206358605457009698, guid: b1e781a67c6f97f4d9cfb50a61f30655, type: 3}
18941 - propertyPath: m_RootOrder
18942 - value: 2
18943 - objectReference: {fileID: 0}
18944 - - target: {fileID: 8206358605457009698, guid: b1e781a67c6f97f4d9cfb50a61f30655, type: 3}
18945 - propertyPath: m_AnchorMax.x
18946 - value: 1
18947 - objectReference: {fileID: 0}
18948 - - target: {fileID: 8206358605457009698, guid: b1e781a67c6f97f4d9cfb50a61f30655, type: 3}
18949 - propertyPath: m_AnchorMax.y
18950 - value: 1
18951 - objectReference: {fileID: 0}
18952 - - target: {fileID: 8206358605457009698, guid: b1e781a67c6f97f4d9cfb50a61f30655, type: 3}
18953 - propertyPath: m_AnchorMin.x
18954 - value: 0
18955 - objectReference: {fileID: 0}
18956 - - target: {fileID: 8206358605457009698, guid: b1e781a67c6f97f4d9cfb50a61f30655, type: 3}
18957 - propertyPath: m_AnchorMin.y
18958 - value: 0
18959 - objectReference: {fileID: 0}
18960 - - target: {fileID: 8206358605457009698, guid: b1e781a67c6f97f4d9cfb50a61f30655, type: 3}
18961 - propertyPath: m_SizeDelta.x
18962 - value: 0
18963 - objectReference: {fileID: 0}
18964 - - target: {fileID: 8206358605457009698, guid: b1e781a67c6f97f4d9cfb50a61f30655, type: 3}
18965 - propertyPath: m_SizeDelta.y
18966 - value: 0
18967 - objectReference: {fileID: 0}
18968 - - target: {fileID: 8206358605457009698, guid: b1e781a67c6f97f4d9cfb50a61f30655, type: 3}
18969 - propertyPath: m_LocalPosition.x
18970 - value: 0
18971 - objectReference: {fileID: 0}
18972 - - target: {fileID: 8206358605457009698, guid: b1e781a67c6f97f4d9cfb50a61f30655, type: 3}
18973 - propertyPath: m_LocalPosition.y
18974 - value: 0
18975 - objectReference: {fileID: 0}
18976 - - target: {fileID: 8206358605457009698, guid: b1e781a67c6f97f4d9cfb50a61f30655, type: 3}
18977 - propertyPath: m_LocalPosition.z
18978 - value: 530.058
18979 - objectReference: {fileID: 0}
18980 - - target: {fileID: 8206358605457009698, guid: b1e781a67c6f97f4d9cfb50a61f30655, type: 3}
18981 - propertyPath: m_LocalRotation.w
18982 - value: 1
18983 - objectReference: {fileID: 0}
18984 - - target: {fileID: 8206358605457009698, guid: b1e781a67c6f97f4d9cfb50a61f30655, type: 3}
18985 - propertyPath: m_LocalRotation.x
18986 - value: -0
18987 - objectReference: {fileID: 0}
18988 - - target: {fileID: 8206358605457009698, guid: b1e781a67c6f97f4d9cfb50a61f30655, type: 3}
18989 - propertyPath: m_LocalRotation.y
18990 - value: -0
18991 - objectReference: {fileID: 0}
18992 - - target: {fileID: 8206358605457009698, guid: b1e781a67c6f97f4d9cfb50a61f30655, type: 3}
18993 - propertyPath: m_LocalRotation.z
18994 - value: -0
18995 - objectReference: {fileID: 0}
18996 - - target: {fileID: 8206358605457009698, guid: b1e781a67c6f97f4d9cfb50a61f30655, type: 3}
18997 - propertyPath: m_AnchoredPosition.x
18998 - value: 364.32
18999 - objectReference: {fileID: 0}
19000 - - target: {fileID: 8206358605457009698, guid: b1e781a67c6f97f4d9cfb50a61f30655, type: 3}
19001 - propertyPath: m_AnchoredPosition.y
19002 - value: 273.06735
19003 - objectReference: {fileID: 0}
19004 - - target: {fileID: 8206358605457009698, guid: b1e781a67c6f97f4d9cfb50a61f30655, type: 3}
19005 - propertyPath: m_LocalEulerAnglesHint.x
19006 - value: 0
19007 - objectReference: {fileID: 0}
19008 - - target: {fileID: 8206358605457009698, guid: b1e781a67c6f97f4d9cfb50a61f30655, type: 3}
19009 - propertyPath: m_LocalEulerAnglesHint.y
19010 - value: 0
19011 - objectReference: {fileID: 0}
19012 - - target: {fileID: 8206358605457009698, guid: b1e781a67c6f97f4d9cfb50a61f30655, type: 3}
19013 - propertyPath: m_LocalEulerAnglesHint.z
19014 - value: 0
19015 - objectReference: {fileID: 0}
19016 - - target: {fileID: 8206358605457009709, guid: b1e781a67c6f97f4d9cfb50a61f30655, type: 3}
19017 - propertyPath: m_Name
19018 - value: Character
19019 - objectReference: {fileID: 0}
19020 - m_RemovedComponents: []
19021 - m_SourcePrefab: {fileID: 100100000, guid: b1e781a67c6f97f4d9cfb50a61f30655, type: 3}
19022 --- !u!1 &2093542905 19011 --- !u!1 &2093542905
19023 GameObject: 19012 GameObject:
19024 m_ObjectHideFlags: 0 19013 m_ObjectHideFlags: 0
......
...@@ -3176,7 +3176,7 @@ PrefabInstance: ...@@ -3176,7 +3176,7 @@ PrefabInstance:
3176 objectReference: {fileID: 0} 3176 objectReference: {fileID: 0}
3177 - target: {fileID: 4000010883411580, guid: eae0d75f8edbe3349b65105f0c6b5665, type: 3} 3177 - target: {fileID: 4000010883411580, guid: eae0d75f8edbe3349b65105f0c6b5665, type: 3}
3178 propertyPath: m_RootOrder 3178 propertyPath: m_RootOrder
3179 - value: 32 3179 + value: 31
3180 objectReference: {fileID: 0} 3180 objectReference: {fileID: 0}
3181 - target: {fileID: 4000010883411580, guid: eae0d75f8edbe3349b65105f0c6b5665, type: 3} 3181 - target: {fileID: 4000010883411580, guid: eae0d75f8edbe3349b65105f0c6b5665, type: 3}
3182 propertyPath: m_LocalScale.x 3182 propertyPath: m_LocalScale.x
...@@ -4517,7 +4517,7 @@ Transform: ...@@ -4517,7 +4517,7 @@ Transform:
4517 m_LocalScale: {x: 1, y: 1, z: 1} 4517 m_LocalScale: {x: 1, y: 1, z: 1}
4518 m_Children: [] 4518 m_Children: []
4519 m_Father: {fileID: 0} 4519 m_Father: {fileID: 0}
4520 - m_RootOrder: 31 4520 + m_RootOrder: 30
4521 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} 4521 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
4522 --- !u!1001 &473136902 4522 --- !u!1001 &473136902
4523 PrefabInstance: 4523 PrefabInstance:
...@@ -4636,11 +4636,6 @@ MonoBehaviour: ...@@ -4636,11 +4636,6 @@ MonoBehaviour:
4636 m_Script: {fileID: 11500000, guid: b741eff1bc82afe4ba5f37912f3ac273, type: 3} 4636 m_Script: {fileID: 11500000, guid: b741eff1bc82afe4ba5f37912f3ac273, type: 3}
4637 m_Name: 4637 m_Name:
4638 m_EditorClassIdentifier: 4638 m_EditorClassIdentifier:
4639 - handType: 1
4640 - controllerPose: {fileID: 475158531}
4641 - grabAction:
4642 - actionPath: /actions/default/in/Grab
4643 - needsReinit: 0
4644 --- !u!114 &475158528 4639 --- !u!114 &475158528
4645 MonoBehaviour: 4640 MonoBehaviour:
4646 m_ObjectHideFlags: 0 4641 m_ObjectHideFlags: 0
...@@ -4653,13 +4648,6 @@ MonoBehaviour: ...@@ -4653,13 +4648,6 @@ MonoBehaviour:
4653 m_Script: {fileID: 11500000, guid: bc0ffd84c6247fa49b8db0e93d7ed3cc, type: 3} 4648 m_Script: {fileID: 11500000, guid: bc0ffd84c6247fa49b8db0e93d7ed3cc, type: 3}
4654 m_Name: 4649 m_Name:
4655 m_EditorClassIdentifier: 4650 m_EditorClassIdentifier:
4656 - handType: 1
4657 - teleportAction:
4658 - actionPath: /actions/default/in/Teleport
4659 - needsReinit: 0
4660 - grabAction:
4661 - actionPath: /actions/default/in/Grab
4662 - needsReinit: 0
4663 --- !u!65 &475158529 4651 --- !u!65 &475158529
4664 BoxCollider: 4652 BoxCollider:
4665 m_ObjectHideFlags: 0 4653 m_ObjectHideFlags: 0
...@@ -4689,17 +4677,6 @@ Rigidbody: ...@@ -4689,17 +4677,6 @@ Rigidbody:
4689 m_Interpolate: 0 4677 m_Interpolate: 0
4690 m_Constraints: 0 4678 m_Constraints: 0
4691 m_CollisionDetection: 0 4679 m_CollisionDetection: 0
4692 ---- !u!114 &475158531 stripped
4693 -MonoBehaviour:
4694 - m_CorrespondingSourceObject: {fileID: 114000010876603736, guid: 4d293c8e162f3874b982baadd71153d2, type: 3}
4695 - m_PrefabInstance: {fileID: 622780135}
4696 - m_PrefabAsset: {fileID: 0}
4697 - m_GameObject: {fileID: 475158525}
4698 - m_Enabled: 1
4699 - m_EditorHideFlags: 0
4700 - m_Script: {fileID: 11500000, guid: 9a5fb0ca93b55ef4b8d54b512b103341, type: 3}
4701 - m_Name:
4702 - m_EditorClassIdentifier:
4703 --- !u!1001 &479322653 4680 --- !u!1001 &479322653
4704 PrefabInstance: 4681 PrefabInstance:
4705 m_ObjectHideFlags: 0 4682 m_ObjectHideFlags: 0
...@@ -5292,7 +5269,7 @@ Transform: ...@@ -5292,7 +5269,7 @@ Transform:
5292 m_LocalScale: {x: 1, y: 1, z: 1} 5269 m_LocalScale: {x: 1, y: 1, z: 1}
5293 m_Children: [] 5270 m_Children: []
5294 m_Father: {fileID: 0} 5271 m_Father: {fileID: 0}
5295 - m_RootOrder: 24 5272 + m_RootOrder: 23
5296 m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} 5273 m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0}
5297 --- !u!1001 &539393728 5274 --- !u!1001 &539393728
5298 PrefabInstance: 5275 PrefabInstance:
...@@ -5464,8 +5441,9 @@ RectTransform: ...@@ -5464,8 +5441,9 @@ RectTransform:
5464 - {fileID: 807098431} 5441 - {fileID: 807098431}
5465 - {fileID: 121635379} 5442 - {fileID: 121635379}
5466 - {fileID: 1121220103} 5443 - {fileID: 1121220103}
5444 + - {fileID: 1956171693}
5467 m_Father: {fileID: 0} 5445 m_Father: {fileID: 0}
5468 - m_RootOrder: 38 5446 + m_RootOrder: 37
5469 m_LocalEulerAnglesHint: {x: 0, y: 20, z: 0} 5447 m_LocalEulerAnglesHint: {x: 0, y: 20, z: 0}
5470 m_AnchorMin: {x: 0, y: 0} 5448 m_AnchorMin: {x: 0, y: 0}
5471 m_AnchorMax: {x: 0, y: 0} 5449 m_AnchorMax: {x: 0, y: 0}
...@@ -5837,7 +5815,7 @@ PrefabInstance: ...@@ -5837,7 +5815,7 @@ PrefabInstance:
5837 objectReference: {fileID: 0} 5815 objectReference: {fileID: 0}
5838 - target: {fileID: 420908, guid: 4d293c8e162f3874b982baadd71153d2, type: 3} 5816 - target: {fileID: 420908, guid: 4d293c8e162f3874b982baadd71153d2, type: 3}
5839 propertyPath: m_RootOrder 5817 propertyPath: m_RootOrder
5840 - value: 34 5818 + value: 33
5841 objectReference: {fileID: 0} 5819 objectReference: {fileID: 0}
5842 - target: {fileID: 420908, guid: 4d293c8e162f3874b982baadd71153d2, type: 3} 5820 - target: {fileID: 420908, guid: 4d293c8e162f3874b982baadd71153d2, type: 3}
5843 propertyPath: m_LocalScale.x 5821 propertyPath: m_LocalScale.x
...@@ -6385,7 +6363,7 @@ Transform: ...@@ -6385,7 +6363,7 @@ Transform:
6385 - {fileID: 861607982} 6363 - {fileID: 861607982}
6386 - {fileID: 1369722278} 6364 - {fileID: 1369722278}
6387 m_Father: {fileID: 0} 6365 m_Father: {fileID: 0}
6388 - m_RootOrder: 28 6366 + m_RootOrder: 27
6389 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} 6367 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
6390 --- !u!1001 &698658308 6368 --- !u!1001 &698658308
6391 PrefabInstance: 6369 PrefabInstance:
...@@ -9786,7 +9764,7 @@ PrefabInstance: ...@@ -9786,7 +9764,7 @@ PrefabInstance:
9786 objectReference: {fileID: 0} 9764 objectReference: {fileID: 0}
9787 - target: {fileID: 4000010883411580, guid: eae0d75f8edbe3349b65105f0c6b5665, type: 3} 9765 - target: {fileID: 4000010883411580, guid: eae0d75f8edbe3349b65105f0c6b5665, type: 3}
9788 propertyPath: m_RootOrder 9766 propertyPath: m_RootOrder
9789 - value: 36 9767 + value: 35
9790 objectReference: {fileID: 0} 9768 objectReference: {fileID: 0}
9791 - target: {fileID: 4000010883411580, guid: eae0d75f8edbe3349b65105f0c6b5665, type: 3} 9769 - target: {fileID: 4000010883411580, guid: eae0d75f8edbe3349b65105f0c6b5665, type: 3}
9792 propertyPath: m_LocalScale.x 9770 propertyPath: m_LocalScale.x
...@@ -11111,103 +11089,6 @@ Transform: ...@@ -11111,103 +11089,6 @@ Transform:
11111 m_CorrespondingSourceObject: {fileID: 4208458315195486, guid: c96016c34e7be62488e588470988ef5b, type: 3} 11089 m_CorrespondingSourceObject: {fileID: 4208458315195486, guid: c96016c34e7be62488e588470988ef5b, type: 3}
11112 m_PrefabInstance: {fileID: 1184554966} 11090 m_PrefabInstance: {fileID: 1184554966}
11113 m_PrefabAsset: {fileID: 0} 11091 m_PrefabAsset: {fileID: 0}
11114 ---- !u!1001 &1185146243
11115 -PrefabInstance:
11116 - m_ObjectHideFlags: 0
11117 - serializedVersion: 2
11118 - m_Modification:
11119 - m_TransformParent: {fileID: 0}
11120 - m_Modifications:
11121 - - target: {fileID: 8206358605457009698, guid: b1e781a67c6f97f4d9cfb50a61f30655, type: 3}
11122 - propertyPath: m_Pivot.x
11123 - value: 1
11124 - objectReference: {fileID: 0}
11125 - - target: {fileID: 8206358605457009698, guid: b1e781a67c6f97f4d9cfb50a61f30655, type: 3}
11126 - propertyPath: m_Pivot.y
11127 - value: 0.5
11128 - objectReference: {fileID: 0}
11129 - - target: {fileID: 8206358605457009698, guid: b1e781a67c6f97f4d9cfb50a61f30655, type: 3}
11130 - propertyPath: m_RootOrder
11131 - value: 23
11132 - objectReference: {fileID: 0}
11133 - - target: {fileID: 8206358605457009698, guid: b1e781a67c6f97f4d9cfb50a61f30655, type: 3}
11134 - propertyPath: m_AnchorMax.x
11135 - value: 1
11136 - objectReference: {fileID: 0}
11137 - - target: {fileID: 8206358605457009698, guid: b1e781a67c6f97f4d9cfb50a61f30655, type: 3}
11138 - propertyPath: m_AnchorMax.y
11139 - value: 1
11140 - objectReference: {fileID: 0}
11141 - - target: {fileID: 8206358605457009698, guid: b1e781a67c6f97f4d9cfb50a61f30655, type: 3}
11142 - propertyPath: m_AnchorMin.x
11143 - value: 0
11144 - objectReference: {fileID: 0}
11145 - - target: {fileID: 8206358605457009698, guid: b1e781a67c6f97f4d9cfb50a61f30655, type: 3}
11146 - propertyPath: m_AnchorMin.y
11147 - value: 0
11148 - objectReference: {fileID: 0}
11149 - - target: {fileID: 8206358605457009698, guid: b1e781a67c6f97f4d9cfb50a61f30655, type: 3}
11150 - propertyPath: m_SizeDelta.x
11151 - value: 0
11152 - objectReference: {fileID: 0}
11153 - - target: {fileID: 8206358605457009698, guid: b1e781a67c6f97f4d9cfb50a61f30655, type: 3}
11154 - propertyPath: m_SizeDelta.y
11155 - value: 0
11156 - objectReference: {fileID: 0}
11157 - - target: {fileID: 8206358605457009698, guid: b1e781a67c6f97f4d9cfb50a61f30655, type: 3}
11158 - propertyPath: m_LocalPosition.x
11159 - value: 0
11160 - objectReference: {fileID: 0}
11161 - - target: {fileID: 8206358605457009698, guid: b1e781a67c6f97f4d9cfb50a61f30655, type: 3}
11162 - propertyPath: m_LocalPosition.y
11163 - value: 0
11164 - objectReference: {fileID: 0}
11165 - - target: {fileID: 8206358605457009698, guid: b1e781a67c6f97f4d9cfb50a61f30655, type: 3}
11166 - propertyPath: m_LocalPosition.z
11167 - value: 530.058
11168 - objectReference: {fileID: 0}
11169 - - target: {fileID: 8206358605457009698, guid: b1e781a67c6f97f4d9cfb50a61f30655, type: 3}
11170 - propertyPath: m_LocalRotation.w
11171 - value: 1
11172 - objectReference: {fileID: 0}
11173 - - target: {fileID: 8206358605457009698, guid: b1e781a67c6f97f4d9cfb50a61f30655, type: 3}
11174 - propertyPath: m_LocalRotation.x
11175 - value: -0
11176 - objectReference: {fileID: 0}
11177 - - target: {fileID: 8206358605457009698, guid: b1e781a67c6f97f4d9cfb50a61f30655, type: 3}
11178 - propertyPath: m_LocalRotation.y
11179 - value: -0
11180 - objectReference: {fileID: 0}
11181 - - target: {fileID: 8206358605457009698, guid: b1e781a67c6f97f4d9cfb50a61f30655, type: 3}
11182 - propertyPath: m_LocalRotation.z
11183 - value: -0
11184 - objectReference: {fileID: 0}
11185 - - target: {fileID: 8206358605457009698, guid: b1e781a67c6f97f4d9cfb50a61f30655, type: 3}
11186 - propertyPath: m_AnchoredPosition.x
11187 - value: 364.32
11188 - objectReference: {fileID: 0}
11189 - - target: {fileID: 8206358605457009698, guid: b1e781a67c6f97f4d9cfb50a61f30655, type: 3}
11190 - propertyPath: m_AnchoredPosition.y
11191 - value: 273.06735
11192 - objectReference: {fileID: 0}
11193 - - target: {fileID: 8206358605457009698, guid: b1e781a67c6f97f4d9cfb50a61f30655, type: 3}
11194 - propertyPath: m_LocalEulerAnglesHint.x
11195 - value: 0
11196 - objectReference: {fileID: 0}
11197 - - target: {fileID: 8206358605457009698, guid: b1e781a67c6f97f4d9cfb50a61f30655, type: 3}
11198 - propertyPath: m_LocalEulerAnglesHint.y
11199 - value: 0
11200 - objectReference: {fileID: 0}
11201 - - target: {fileID: 8206358605457009698, guid: b1e781a67c6f97f4d9cfb50a61f30655, type: 3}
11202 - propertyPath: m_LocalEulerAnglesHint.z
11203 - value: 0
11204 - objectReference: {fileID: 0}
11205 - - target: {fileID: 8206358605457009709, guid: b1e781a67c6f97f4d9cfb50a61f30655, type: 3}
11206 - propertyPath: m_Name
11207 - value: Character
11208 - objectReference: {fileID: 0}
11209 - m_RemovedComponents: []
11210 - m_SourcePrefab: {fileID: 100100000, guid: b1e781a67c6f97f4d9cfb50a61f30655, type: 3}
11211 --- !u!1001 &1188418979 11092 --- !u!1001 &1188418979
11212 PrefabInstance: 11093 PrefabInstance:
11213 m_ObjectHideFlags: 0 11094 m_ObjectHideFlags: 0
...@@ -11782,7 +11663,7 @@ Transform: ...@@ -11782,7 +11663,7 @@ Transform:
11782 - {fileID: 1472816424} 11663 - {fileID: 1472816424}
11783 - {fileID: 765141863} 11664 - {fileID: 765141863}
11784 m_Father: {fileID: 0} 11665 m_Father: {fileID: 0}
11785 - m_RootOrder: 29 11666 + m_RootOrder: 28
11786 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} 11667 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
11787 --- !u!1001 &1245877495 11668 --- !u!1001 &1245877495
11788 PrefabInstance: 11669 PrefabInstance:
...@@ -12146,7 +12027,7 @@ Transform: ...@@ -12146,7 +12027,7 @@ Transform:
12146 - {fileID: 1206319978} 12027 - {fileID: 1206319978}
12147 - {fileID: 125511233} 12028 - {fileID: 125511233}
12148 m_Father: {fileID: 0} 12029 m_Father: {fileID: 0}
12149 - m_RootOrder: 26 12030 + m_RootOrder: 25
12150 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} 12031 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
12151 --- !u!1001 &1325057063 12032 --- !u!1001 &1325057063
12152 PrefabInstance: 12033 PrefabInstance:
...@@ -12231,7 +12112,7 @@ PrefabInstance: ...@@ -12231,7 +12112,7 @@ PrefabInstance:
12231 objectReference: {fileID: 0} 12112 objectReference: {fileID: 0}
12232 - target: {fileID: 4000010883411580, guid: eae0d75f8edbe3349b65105f0c6b5665, type: 3} 12113 - target: {fileID: 4000010883411580, guid: eae0d75f8edbe3349b65105f0c6b5665, type: 3}
12233 propertyPath: m_RootOrder 12114 propertyPath: m_RootOrder
12234 - value: 35 12115 + value: 34
12235 objectReference: {fileID: 0} 12116 objectReference: {fileID: 0}
12236 - target: {fileID: 4000010883411580, guid: eae0d75f8edbe3349b65105f0c6b5665, type: 3} 12117 - target: {fileID: 4000010883411580, guid: eae0d75f8edbe3349b65105f0c6b5665, type: 3}
12237 propertyPath: m_LocalScale.x 12118 propertyPath: m_LocalScale.x
...@@ -14637,7 +14518,7 @@ PrefabInstance: ...@@ -14637,7 +14518,7 @@ PrefabInstance:
14637 objectReference: {fileID: 0} 14518 objectReference: {fileID: 0}
14638 - target: {fileID: 4000010883411580, guid: eae0d75f8edbe3349b65105f0c6b5665, type: 3} 14519 - target: {fileID: 4000010883411580, guid: eae0d75f8edbe3349b65105f0c6b5665, type: 3}
14639 propertyPath: m_RootOrder 14520 propertyPath: m_RootOrder
14640 - value: 33 14521 + value: 32
14641 objectReference: {fileID: 0} 14522 objectReference: {fileID: 0}
14642 - target: {fileID: 4000010883411580, guid: eae0d75f8edbe3349b65105f0c6b5665, type: 3} 14523 - target: {fileID: 4000010883411580, guid: eae0d75f8edbe3349b65105f0c6b5665, type: 3}
14643 propertyPath: m_LocalScale.x 14524 propertyPath: m_LocalScale.x
...@@ -15221,7 +15102,7 @@ Transform: ...@@ -15221,7 +15102,7 @@ Transform:
15221 - {fileID: 1241739553} 15102 - {fileID: 1241739553}
15222 - {fileID: 799124673} 15103 - {fileID: 799124673}
15223 m_Father: {fileID: 0} 15104 m_Father: {fileID: 0}
15224 - m_RootOrder: 25 15105 + m_RootOrder: 24
15225 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} 15106 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
15226 --- !u!1001 &1759165066 15107 --- !u!1001 &1759165066
15227 PrefabInstance: 15108 PrefabInstance:
...@@ -15917,7 +15798,7 @@ PrefabInstance: ...@@ -15917,7 +15798,7 @@ PrefabInstance:
15917 m_Modifications: 15798 m_Modifications:
15918 - target: {fileID: 4252784401376168, guid: 22a3fd8d3e59a1149bdcd775c0e87241, type: 3} 15799 - target: {fileID: 4252784401376168, guid: 22a3fd8d3e59a1149bdcd775c0e87241, type: 3}
15919 propertyPath: m_RootOrder 15800 propertyPath: m_RootOrder
15920 - value: 37 15801 + value: 36
15921 objectReference: {fileID: 0} 15802 objectReference: {fileID: 0}
15922 - target: {fileID: 4252784401376168, guid: 22a3fd8d3e59a1149bdcd775c0e87241, type: 3} 15803 - target: {fileID: 4252784401376168, guid: 22a3fd8d3e59a1149bdcd775c0e87241, type: 3}
15923 propertyPath: m_LocalPosition.x 15804 propertyPath: m_LocalPosition.x
...@@ -17111,8 +16992,100 @@ Transform: ...@@ -17111,8 +16992,100 @@ Transform:
17111 - {fileID: 1175340315} 16992 - {fileID: 1175340315}
17112 - {fileID: 1184554967} 16993 - {fileID: 1184554967}
17113 m_Father: {fileID: 0} 16994 m_Father: {fileID: 0}
17114 - m_RootOrder: 30 16995 + m_RootOrder: 29
17115 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} 16996 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
16997 +--- !u!1 &1956171692
16998 +GameObject:
16999 + m_ObjectHideFlags: 0
17000 + m_CorrespondingSourceObject: {fileID: 0}
17001 + m_PrefabInstance: {fileID: 0}
17002 + m_PrefabAsset: {fileID: 0}
17003 + serializedVersion: 6
17004 + m_Component:
17005 + - component: {fileID: 1956171693}
17006 + - component: {fileID: 1956171695}
17007 + - component: {fileID: 1956171694}
17008 + - component: {fileID: 1956171696}
17009 + m_Layer: 0
17010 + m_Name: Step
17011 + m_TagString: Untagged
17012 + m_Icon: {fileID: 0}
17013 + m_NavMeshLayer: 0
17014 + m_StaticEditorFlags: 0
17015 + m_IsActive: 1
17016 +--- !u!224 &1956171693
17017 +RectTransform:
17018 + m_ObjectHideFlags: 0
17019 + m_CorrespondingSourceObject: {fileID: 0}
17020 + m_PrefabInstance: {fileID: 0}
17021 + m_PrefabAsset: {fileID: 0}
17022 + m_GameObject: {fileID: 1956171692}
17023 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
17024 + m_LocalPosition: {x: 0, y: 0, z: 0}
17025 + m_LocalScale: {x: 1, y: 1, z: 1}
17026 + m_Children: []
17027 + m_Father: {fileID: 555046268}
17028 + m_RootOrder: 5
17029 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
17030 + m_AnchorMin: {x: 0.5, y: 0.5}
17031 + m_AnchorMax: {x: 0.5, y: 0.5}
17032 + m_AnchoredPosition: {x: 0, y: 0}
17033 + m_SizeDelta: {x: 160, y: 30}
17034 + m_Pivot: {x: 0.5, y: 0.5}
17035 +--- !u!114 &1956171694
17036 +MonoBehaviour:
17037 + m_ObjectHideFlags: 0
17038 + m_CorrespondingSourceObject: {fileID: 0}
17039 + m_PrefabInstance: {fileID: 0}
17040 + m_PrefabAsset: {fileID: 0}
17041 + m_GameObject: {fileID: 1956171692}
17042 + m_Enabled: 1
17043 + m_EditorHideFlags: 0
17044 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
17045 + m_Name:
17046 + m_EditorClassIdentifier:
17047 + m_Material: {fileID: 0}
17048 + m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
17049 + m_RaycastTarget: 1
17050 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
17051 + m_Maskable: 1
17052 + m_OnCullStateChanged:
17053 + m_PersistentCalls:
17054 + m_Calls: []
17055 + m_FontData:
17056 + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
17057 + m_FontSize: 14
17058 + m_FontStyle: 0
17059 + m_BestFit: 0
17060 + m_MinSize: 10
17061 + m_MaxSize: 40
17062 + m_Alignment: 0
17063 + m_AlignByGeometry: 0
17064 + m_RichText: 1
17065 + m_HorizontalOverflow: 0
17066 + m_VerticalOverflow: 0
17067 + m_LineSpacing: 1
17068 + m_Text: 'Step : 0'
17069 +--- !u!222 &1956171695
17070 +CanvasRenderer:
17071 + m_ObjectHideFlags: 0
17072 + m_CorrespondingSourceObject: {fileID: 0}
17073 + m_PrefabInstance: {fileID: 0}
17074 + m_PrefabAsset: {fileID: 0}
17075 + m_GameObject: {fileID: 1956171692}
17076 + m_CullTransparentMesh: 1
17077 +--- !u!114 &1956171696
17078 +MonoBehaviour:
17079 + m_ObjectHideFlags: 0
17080 + m_CorrespondingSourceObject: {fileID: 0}
17081 + m_PrefabInstance: {fileID: 0}
17082 + m_PrefabAsset: {fileID: 0}
17083 + m_GameObject: {fileID: 1956171692}
17084 + m_Enabled: 1
17085 + m_EditorHideFlags: 0
17086 + m_Script: {fileID: 11500000, guid: 382ec4a5d0bf2844287301f5182d007e, type: 3}
17087 + m_Name:
17088 + m_EditorClassIdentifier:
17116 --- !u!1001 &1961720881 17089 --- !u!1001 &1961720881
17117 PrefabInstance: 17090 PrefabInstance:
17118 m_ObjectHideFlags: 0 17091 m_ObjectHideFlags: 0
...@@ -17325,7 +17298,7 @@ Transform: ...@@ -17325,7 +17298,7 @@ Transform:
17325 - {fileID: 108109176} 17298 - {fileID: 108109176}
17326 - {fileID: 307417224} 17299 - {fileID: 307417224}
17327 m_Father: {fileID: 0} 17300 m_Father: {fileID: 0}
17328 - m_RootOrder: 27 17301 + m_RootOrder: 26
17329 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} 17302 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
17330 --- !u!1001 &1996048716 17303 --- !u!1001 &1996048716
17331 PrefabInstance: 17304 PrefabInstance:
......
1 +using System.Collections;
2 +using System.Collections.Generic;
3 +using UnityEngine;
4 +using UnityEngine.UI;
5 +using UnityEngine.EventSystems;
6 +using Windows.Kinect;
7 +using System;
8 +using System.IO;
9 +
10 +public class CameraMoving : MonoBehaviour
11 +{
12 + private KinectSensor _Sensor;
13 + private BodyFrameReader _Reader;
14 + private Body[] _Data = null;
15 +
16 + public Text stepText;
17 +
18 + public Body[] GetData()
19 + {
20 + return _Data;
21 + }
22 +
23 + int step = 0;
24 + float speed = 2f;
25 +
26 + KinectManager manager;
27 +
28 + void Start()
29 + {
30 + _Sensor = KinectSensor.GetDefault();
31 +
32 + if (_Sensor != null)
33 + {
34 + _Reader = _Sensor.BodyFrameSource.OpenReader();
35 +
36 + if (!_Sensor.IsOpen)
37 + {
38 + _Sensor.Open();
39 + Debug.Log(_Sensor.IsOpen);
40 +
41 + }
42 + }
43 +
44 + }
45 +
46 + // Update is called once per frame
47 + void Update()
48 + {
49 + if (_Reader != null)
50 + {
51 + var frame = _Reader.AcquireLatestFrame();
52 + if (frame != null)
53 + {
54 + //Debug.Log("frame");
55 +
56 + if (_Data == null)
57 + {
58 + //Debug.Log("data");
59 +
60 + _Data = new Body[_Sensor.BodyFrameSource.BodyCount];
61 + Debug.Log("2");
62 +
63 + transform.Translate(Vector3.forward * Time.deltaTime * speed);
64 + //Debug.Log("3");
65 +
66 + step = manager.UpdateKinect(_Data);
67 + Debug.Log(step);
68 +
69 + stepText.text = "Step: " + step;
70 +
71 + }
72 +
73 + frame.GetAndRefreshBodyData(_Data);
74 +
75 +
76 + frame.Dispose();
77 + frame = null;
78 + }
79 + }
80 +
81 + }
82 +}
83 +
84 +public class KinectManager
85 +{
86 + int step_num = 0;
87 +
88 + //var bodyIndexFrame =
89 +
90 + public int UpdateKinect(Windows.Kinect.Body[] bodies)
91 + {
92 + //Debug.Log("1");
93 + var body = bodies[0];
94 + var joints = body.Joints;
95 + //Debug.Log("2");
96 +
97 + //if (body == null || !body.IsTracked) return 0;
98 +
99 + JointType left_knee = (Windows.Kinect.JointType)13;
100 + JointType right_knee = (Windows.Kinect.JointType)17;
101 + //Debug.Log("3");
102 +
103 + var left_knee_position = joints[left_knee].Position;
104 + var right_knee_position = joints[right_knee].Position;
105 + //Debug.Log("4");
106 + //Walking
107 + if (right_knee_position.X < left_knee_position.X && right_knee_position.Y < left_knee_position.Y)
108 + {
109 + Debug.Log(string.Format("{0} STEP", step_num.ToString()));
110 + //Console.WriteLine(string.Format("{0} STEP", step_num.ToString()));
111 + step_num++;
112 + }
113 + else if (right_knee_position.X > left_knee_position.X && right_knee_position.Y > left_knee_position.Y)
114 + {
115 + Debug.Log(string.Format("{0} STEP", step_num.ToString()));
116 + //Console.WriteLine(string.Format("{0} STEP", step_num.ToString()));
117 + step_num++;
118 + }
119 + else
120 + {
121 + Debug.Log("not walking");
122 + //Console.WriteLine("not walking");
123 + }
124 + return step_num;
125 + }
126 +
127 +}
1 +fileFormatVersion: 2
2 +guid: 382ec4a5d0bf2844287301f5182d007e
3 +MonoImporter:
4 + externalObjects: {}
5 + serializedVersion: 2
6 + defaultReferences: []
7 + executionOrder: 0
8 + icon: {instanceID: 0}
9 + userData:
10 + assetBundleName:
11 + assetBundleVariant:
...@@ -14,6 +14,10 @@ public class GaugeIncreasing : MonoBehaviour ...@@ -14,6 +14,10 @@ public class GaugeIncreasing : MonoBehaviour
14 GameObject clue; 14 GameObject clue;
15 GameObject panel; 15 GameObject panel;
16 GameObject apple; 16 GameObject apple;
17 + GameObject step;
18 + Text stepText;
19 + int beforeStep;
20 + int afterStep;
17 //GameObject controller_L; 21 //GameObject controller_L;
18 GameObject controller_R; 22 GameObject controller_R;
19 23
...@@ -39,6 +43,10 @@ public class GaugeIncreasing : MonoBehaviour ...@@ -39,6 +43,10 @@ public class GaugeIncreasing : MonoBehaviour
39 panel = GameObject.Find("Panel"); 43 panel = GameObject.Find("Panel");
40 apple = GameObject.Find("4"); 44 apple = GameObject.Find("4");
41 cheerUp = GameObject.Find("CheerUp"); 45 cheerUp = GameObject.Find("CheerUp");
46 + step = GameObject.Find("Step");
47 + stepText = step.GetComponent<Text>();
48 + beforeStep = int.Parse(stepText.text);
49 +
42 color = new Color(255f, 0, 0); 50 color = new Color(255f, 0, 0);
43 timeSpan = 0.0f; 51 timeSpan = 0.0f;
44 checkTime = 0.1667f; 52 checkTime = 0.1667f;
...@@ -75,15 +83,18 @@ public class GaugeIncreasing : MonoBehaviour ...@@ -75,15 +83,18 @@ public class GaugeIncreasing : MonoBehaviour
75 83
76 } 84 }
77 } 85 }
78 - timeSpan += Time.deltaTime; 86 +
79 - if (timeSpan > checkTime) 87 + afterStep = int.Parse(stepText.text);
88 +
89 + if (beforeStep != afterStep)
80 { 90 {
81 gauge.value += 0.01f; 91 gauge.value += 0.01f;
82 apple.transform.localScale += new Vector3(0.05f, 0.05f, 0.05f); 92 apple.transform.localScale += new Vector3(0.05f, 0.05f, 0.05f);
83 93
84 - timeSpan = 0; 94 + beforeStep = afterStep;
85 } 95 }
86 96
97 +
87 } 98 }
88 99
89 } 100 }
......
1 using System.Collections; 1 using System.Collections;
2 using System.Collections.Generic; 2 using System.Collections.Generic;
3 using UnityEngine; 3 using UnityEngine;
4 -using UnityEngine.SceneManagement; 4 +using UnityEngine.UI;
5 +using UnityEngine.EventSystems;
5 6
6 -public class MoveCtrl : MonoBehaviour { 7 +public class MoveCtrl : MonoBehaviour
8 +{
7 9
8 public enum MoveType 10 public enum MoveType
9 { 11 {
...@@ -11,10 +13,6 @@ public class MoveCtrl : MonoBehaviour { ...@@ -11,10 +13,6 @@ public class MoveCtrl : MonoBehaviour {
11 LOOK_AT, 13 LOOK_AT,
12 DAYDREAM 14 DAYDREAM
13 } 15 }
14 -
15 -
16 - public GameObject UIManager;
17 - GameObject controller_R;
18 public MoveType moveType = MoveType.WAY_POINT; // 이동 방식 16 public MoveType moveType = MoveType.WAY_POINT; // 이동 방식
19 public float speed = 1.0f; // 이동 속도 17 public float speed = 1.0f; // 이동 속도
20 public float damping = 3.0f; // 회전 속도를 조절할 계수 18 public float damping = 3.0f; // 회전 속도를 조절할 계수
...@@ -23,58 +21,60 @@ public class MoveCtrl : MonoBehaviour { ...@@ -23,58 +21,60 @@ public class MoveCtrl : MonoBehaviour {
23 private CharacterController cc; 21 private CharacterController cc;
24 private Transform[] points; // 웨이포인트를 저장할 배열 22 private Transform[] points; // 웨이포인트를 저장할 배열
25 private int nextIdx = 1; // 다음에 이동해야 할 위치 변수 23 private int nextIdx = 1; // 다음에 이동해야 할 위치 변수
26 - private static GameObject apple; 24 +
27 public static bool isStopped = false; 25 public static bool isStopped = false;
26 + public Text stepText;
27 + public int afterStep;
28 + public int beforeStep;
29 +
28 30
31 + GameObject Step;
29 void Start() 32 void Start()
30 { 33 {
31 tr = GetComponent<Transform>(); 34 tr = GetComponent<Transform>();
32 camTr = Camera.main.GetComponent<Transform>(); 35 camTr = Camera.main.GetComponent<Transform>();
33 cc = GetComponent<CharacterController>(); 36 cc = GetComponent<CharacterController>();
34 - points = GameObject.Find("WayPointGroup2").GetComponentsInChildren<Transform>(); 37 + points = GameObject.Find("WayPointGroup").GetComponentsInChildren<Transform>();
35 - apple = GameObject.Find("사과4"); 38 + Step = GameObject.Find("Step");
36 - controller_R = GameObject.Find("Controller (right)"); 39 + stepText = Step.GetComponent<Text>();
37 - 40 + beforeStep = int.Parse(stepText.text);
38 } 41 }
39 -
40 void Update() 42 void Update()
41 { 43 {
42 if (isStopped) 44 if (isStopped)
43 return; 45 return;
44 - 46 + switch (moveType)
45 - switch(moveType)
46 { 47 {
47 case MoveType.WAY_POINT: 48 case MoveType.WAY_POINT:
48 MoveWayPoint(); 49 MoveWayPoint();
49 break; 50 break;
50 -
51 case MoveType.LOOK_AT: 51 case MoveType.LOOK_AT:
52 MoveLookAt(); 52 MoveLookAt();
53 break; 53 break;
54 -
55 case MoveType.DAYDREAM: 54 case MoveType.DAYDREAM:
56 break; 55 break;
57 } 56 }
58 } 57 }
59 -
60 void MoveWayPoint() 58 void MoveWayPoint()
61 { 59 {
60 + afterStep = int.Parse(stepText.text);
61 +
62 + if (beforeStep != afterStep)
63 + {
64 + beforeStep = afterStep;
62 // 현재 위치에서 다음 웨이포인트를 바로보는 벡터를 계산 65 // 현재 위치에서 다음 웨이포인트를 바로보는 벡터를 계산
63 Debug.Log(nextIdx.ToString()); 66 Debug.Log(nextIdx.ToString());
64 - if (nextIdx < points.Length)
65 - {
66 Vector3 direction = points[nextIdx].position - tr.position; 67 Vector3 direction = points[nextIdx].position - tr.position;
67 // 산출된 벡터의 회전 각도를 쿼터니언 타입으로 산출 68 // 산출된 벡터의 회전 각도를 쿼터니언 타입으로 산출
68 Quaternion rot = Quaternion.LookRotation(direction); 69 Quaternion rot = Quaternion.LookRotation(direction);
69 // 현재 각도에서 회전해야 할 각도까지 부드럽게 회전 처리 70 // 현재 각도에서 회전해야 할 각도까지 부드럽게 회전 처리
70 tr.rotation = Quaternion.Slerp(tr.rotation, rot, Time.deltaTime * damping); 71 tr.rotation = Quaternion.Slerp(tr.rotation, rot, Time.deltaTime * damping);
71 -
72 // 전진 방향으로 이동 처리 72 // 전진 방향으로 이동 처리
73 tr.Translate(Vector3.forward * Time.deltaTime * speed); 73 tr.Translate(Vector3.forward * Time.deltaTime * speed);
74 - }
75 74
76 } 75 }
77 76
77 + }
78 void MoveLookAt() 78 void MoveLookAt()
79 { 79 {
80 // 메인카메라가 바라보는 방향 80 // 메인카메라가 바라보는 방향
...@@ -82,35 +82,17 @@ public class MoveCtrl : MonoBehaviour { ...@@ -82,35 +82,17 @@ public class MoveCtrl : MonoBehaviour {
82 // dir 벡터의 방향으로 초당 speed만큼씩 이동 82 // dir 벡터의 방향으로 초당 speed만큼씩 이동
83 cc.SimpleMove(dir * speed); 83 cc.SimpleMove(dir * speed);
84 } 84 }
85 -
86 void OnTriggerEnter(Collider coll) 85 void OnTriggerEnter(Collider coll)
87 { 86 {
88 - Debug.Log(coll.name);
89 // 웨이포인트(Point 게임오브젝트)에 충돌 여부 판단 87 // 웨이포인트(Point 게임오브젝트)에 충돌 여부 판단
90 - if(coll.CompareTag("WAY_POINT")) 88 + if (coll.CompareTag("WAY_POINT"))
91 { 89 {
92 // 맨 마지막 웨이포인트에 도달했을 때 처음 인덱스로 변경 90 // 맨 마지막 웨이포인트에 도달했을 때 처음 인덱스로 변경
93 - if (nextIdx < points.Length){ 91 + if (++nextIdx >= points.Length)
94 - nextIdx++;
95 - }
96 -
97 - }
98 -
99 - else if(coll.name== "rpgpp_lt_tree_pine_01")
100 { 92 {
101 - if (apple.activeSelf == true)
102 - {
103 - apple.SetActive(false);
104 - Debug.Log(apple.activeSelf);
105 - SceneManager.LoadScene("IntervalTraining");
106 - }
107 - }
108 -
109 - else if (coll.CompareTag("NPC"))
110 - {
111 - Debug.Log("NPC");
112 } 93 }
113 94
114 95
115 } 96 }
97 + }
116 } 98 }
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -19,9 +19,9 @@ MonoBehaviour: ...@@ -19,9 +19,9 @@ MonoBehaviour:
19 width: 1920 19 width: 1920
20 height: 997 20 height: 997
21 m_ShowMode: 4 21 m_ShowMode: 4
22 - m_Title: Console 22 + m_Title: Inspector
23 m_RootView: {fileID: 2} 23 m_RootView: {fileID: 2}
24 - m_MinSize: {x: 875, y: 371} 24 + m_MinSize: {x: 875, y: 542}
25 m_MaxSize: {x: 10000, y: 10000} 25 m_MaxSize: {x: 10000, y: 10000}
26 m_Maximized: 1 26 m_Maximized: 1
27 --- !u!114 &2 27 --- !u!114 &2
...@@ -46,7 +46,7 @@ MonoBehaviour: ...@@ -46,7 +46,7 @@ MonoBehaviour:
46 y: 0 46 y: 0
47 width: 1920 47 width: 1920
48 height: 997 48 height: 997
49 - m_MinSize: {x: 875, y: 371} 49 + m_MinSize: {x: 875, y: 542}
50 m_MaxSize: {x: 10000, y: 10000} 50 m_MaxSize: {x: 10000, y: 10000}
51 m_UseTopView: 1 51 m_UseTopView: 1
52 m_TopViewHeight: 30 52 m_TopViewHeight: 30
...@@ -74,8 +74,8 @@ MonoBehaviour: ...@@ -74,8 +74,8 @@ MonoBehaviour:
74 m_MinSize: {x: 0, y: 0} 74 m_MinSize: {x: 0, y: 0}
75 m_MaxSize: {x: 0, y: 0} 75 m_MaxSize: {x: 0, y: 0}
76 m_LoadedToolbars: 76 m_LoadedToolbars:
77 - - {fileID: 19} 77 + - {fileID: 18}
78 - m_MainToolbar: {fileID: 19} 78 + m_MainToolbar: {fileID: 18}
79 m_LastLoadedLayoutName: 79 m_LastLoadedLayoutName:
80 --- !u!114 &4 80 --- !u!114 &4
81 MonoBehaviour: 81 MonoBehaviour:
...@@ -120,10 +120,10 @@ MonoBehaviour: ...@@ -120,10 +120,10 @@ MonoBehaviour:
120 y: 30 120 y: 30
121 width: 1920 121 width: 1920
122 height: 947 122 height: 947
123 - m_MinSize: {x: 676, y: 321} 123 + m_MinSize: {x: 679, y: 342}
124 - m_MaxSize: {x: 12001, y: 8021} 124 + m_MaxSize: {x: 12004, y: 8042}
125 vertical: 0 125 vertical: 0
126 - controlID: 364 126 + controlID: 66
127 --- !u!114 &6 127 --- !u!114 &6
128 MonoBehaviour: 128 MonoBehaviour:
129 m_ObjectHideFlags: 52 129 m_ObjectHideFlags: 52
...@@ -145,10 +145,10 @@ MonoBehaviour: ...@@ -145,10 +145,10 @@ MonoBehaviour:
145 y: 0 145 y: 0
146 width: 1144 146 width: 1144
147 height: 947 147 height: 947
148 - m_MinSize: {x: 201, y: 321} 148 + m_MinSize: {x: 201, y: 342}
149 - m_MaxSize: {x: 4001, y: 8021} 149 + m_MaxSize: {x: 4001, y: 8042}
150 vertical: 1 150 vertical: 1
151 - controlID: 365 151 + controlID: 67
152 --- !u!114 &7 152 --- !u!114 &7
153 MonoBehaviour: 153 MonoBehaviour:
154 m_ObjectHideFlags: 52 154 m_ObjectHideFlags: 52
...@@ -175,7 +175,6 @@ MonoBehaviour: ...@@ -175,7 +175,6 @@ MonoBehaviour:
175 - {fileID: 12} 175 - {fileID: 12}
176 - {fileID: 11} 176 - {fileID: 11}
177 - {fileID: 13} 177 - {fileID: 13}
178 - - {fileID: 14}
179 m_Selected: 0 178 m_Selected: 0
180 m_LastSelected: 1 179 m_LastSelected: 1
181 --- !u!114 &8 180 --- !u!114 &8
...@@ -199,10 +198,10 @@ MonoBehaviour: ...@@ -199,10 +198,10 @@ MonoBehaviour:
199 height: 271 198 height: 271
200 m_MinSize: {x: 101, y: 121} 199 m_MinSize: {x: 101, y: 121}
201 m_MaxSize: {x: 4001, y: 4021} 200 m_MaxSize: {x: 4001, y: 4021}
202 - m_ActualView: {fileID: 16} 201 + m_ActualView: {fileID: 15}
203 m_Panes: 202 m_Panes:
203 + - {fileID: 14}
204 - {fileID: 15} 204 - {fileID: 15}
205 - - {fileID: 16}
206 m_Selected: 1 205 m_Selected: 1
207 m_LastSelected: 0 206 m_LastSelected: 0
208 --- !u!114 &9 207 --- !u!114 &9
...@@ -226,9 +225,9 @@ MonoBehaviour: ...@@ -226,9 +225,9 @@ MonoBehaviour:
226 height: 947 225 height: 947
227 m_MinSize: {x: 202, y: 221} 226 m_MinSize: {x: 202, y: 221}
228 m_MaxSize: {x: 4002, y: 4021} 227 m_MaxSize: {x: 4002, y: 4021}
229 - m_ActualView: {fileID: 17} 228 + m_ActualView: {fileID: 16}
230 m_Panes: 229 m_Panes:
231 - - {fileID: 17} 230 + - {fileID: 16}
232 m_Selected: 0 231 m_Selected: 0
233 m_LastSelected: 0 232 m_LastSelected: 0
234 --- !u!114 &10 233 --- !u!114 &10
...@@ -252,9 +251,9 @@ MonoBehaviour: ...@@ -252,9 +251,9 @@ MonoBehaviour:
252 height: 947 251 height: 947
253 m_MinSize: {x: 276, y: 71} 252 m_MinSize: {x: 276, y: 71}
254 m_MaxSize: {x: 4001, y: 4021} 253 m_MaxSize: {x: 4001, y: 4021}
255 - m_ActualView: {fileID: 18} 254 + m_ActualView: {fileID: 17}
256 m_Panes: 255 m_Panes:
257 - - {fileID: 18} 256 + - {fileID: 17}
258 m_Selected: 0 257 m_Selected: 0
259 m_LastSelected: 0 258 m_LastSelected: 0
260 --- !u!114 &11 259 --- !u!114 &11
...@@ -278,7 +277,7 @@ MonoBehaviour: ...@@ -278,7 +277,7 @@ MonoBehaviour:
278 m_Pos: 277 m_Pos:
279 serializedVersion: 2 278 serializedVersion: 2
280 x: 0 279 x: 0
281 - y: 19 280 + y: 73
282 width: 1143 281 width: 1143
283 height: 655 282 height: 655
284 m_ViewDataDictionary: {fileID: 0} 283 m_ViewDataDictionary: {fileID: 0}
...@@ -303,10 +302,10 @@ MonoBehaviour: ...@@ -303,10 +302,10 @@ MonoBehaviour:
303 m_VRangeLocked: 0 302 m_VRangeLocked: 0
304 hZoomLockedByDefault: 0 303 hZoomLockedByDefault: 0
305 vZoomLockedByDefault: 0 304 vZoomLockedByDefault: 0
306 - m_HBaseRangeMin: -960 305 + m_HBaseRangeMin: -571.5
307 - m_HBaseRangeMax: 960 306 + m_HBaseRangeMax: 571.5
308 - m_VBaseRangeMin: -453.5 307 + m_VBaseRangeMin: -327.5
309 - m_VBaseRangeMax: 453.5 308 + m_VBaseRangeMax: 327.5
310 m_HAllowExceedBaseRangeMin: 1 309 m_HAllowExceedBaseRangeMin: 1
311 m_HAllowExceedBaseRangeMax: 1 310 m_HAllowExceedBaseRangeMax: 1
312 m_VAllowExceedBaseRangeMin: 1 311 m_VAllowExceedBaseRangeMin: 1
...@@ -315,7 +314,7 @@ MonoBehaviour: ...@@ -315,7 +314,7 @@ MonoBehaviour:
315 m_HSlider: 0 314 m_HSlider: 0
316 m_VSlider: 0 315 m_VSlider: 0
317 m_IgnoreScrollWheelUntilClicked: 0 316 m_IgnoreScrollWheelUntilClicked: 0
318 - m_EnableMouseInput: 0 317 + m_EnableMouseInput: 1
319 m_EnableSliderZoomHorizontal: 0 318 m_EnableSliderZoomHorizontal: 0
320 m_EnableSliderZoomVertical: 0 319 m_EnableSliderZoomVertical: 0
321 m_UniformScale: 1 320 m_UniformScale: 1
...@@ -323,24 +322,24 @@ MonoBehaviour: ...@@ -323,24 +322,24 @@ MonoBehaviour:
323 m_DrawArea: 322 m_DrawArea:
324 serializedVersion: 2 323 serializedVersion: 2
325 x: 0 324 x: 0
326 - y: 21 325 + y: 0
327 - width: 1920 326 + width: 1143
328 - height: 907 327 + height: 655
329 m_Scale: {x: 1, y: 1} 328 m_Scale: {x: 1, y: 1}
330 - m_Translation: {x: 960, y: 453.5} 329 + m_Translation: {x: 571.5, y: 327.5}
331 m_MarginLeft: 0 330 m_MarginLeft: 0
332 m_MarginRight: 0 331 m_MarginRight: 0
333 m_MarginTop: 0 332 m_MarginTop: 0
334 m_MarginBottom: 0 333 m_MarginBottom: 0
335 m_LastShownAreaInsideMargins: 334 m_LastShownAreaInsideMargins:
336 serializedVersion: 2 335 serializedVersion: 2
337 - x: -960 336 + x: -571.5
338 - y: -453.5 337 + y: -327.5
339 - width: 1920 338 + width: 1143
340 - height: 907 339 + height: 655
341 m_MinimalGUI: 1 340 m_MinimalGUI: 1
342 m_defaultScale: 1 341 m_defaultScale: 1
343 - m_LastWindowPixelSize: {x: 1920, y: 928} 342 + m_LastWindowPixelSize: {x: 1143, y: 655}
344 m_ClearInEditMode: 1 343 m_ClearInEditMode: 1
345 m_NoCameraWarning: 1 344 m_NoCameraWarning: 1
346 m_LowResolutionForAspectRatios: 01000000000000000000 345 m_LowResolutionForAspectRatios: 01000000000000000000
...@@ -382,9 +381,9 @@ MonoBehaviour: ...@@ -382,9 +381,9 @@ MonoBehaviour:
382 m_PlayAudio: 0 381 m_PlayAudio: 0
383 m_AudioPlay: 0 382 m_AudioPlay: 0
384 m_Position: 383 m_Position:
385 - m_Target: {x: 16.727427, y: 24.669638, z: 56.92263} 384 + m_Target: {x: 0, y: 0, z: 0}
386 speed: 2 385 speed: 2
387 - m_Value: {x: 16.727427, y: 24.669638, z: 56.92263} 386 + m_Value: {x: 0, y: 0, z: 0}
388 m_RenderMode: 0 387 m_RenderMode: 0
389 m_CameraMode: 388 m_CameraMode:
390 drawMode: 0 389 drawMode: 0
...@@ -431,13 +430,13 @@ MonoBehaviour: ...@@ -431,13 +430,13 @@ MonoBehaviour:
431 m_GridAxis: 1 430 m_GridAxis: 1
432 m_gridOpacity: 0.5 431 m_gridOpacity: 0.5
433 m_Rotation: 432 m_Rotation:
434 - m_Target: {x: 0.01842599, y: 0.6389657, z: 0.0153768435, w: -0.7689856} 433 + m_Target: {x: -0.20108002, y: 0.68039685, z: -0.2026781, w: -0.6750927}
435 speed: 2 434 speed: 2
436 - m_Value: {x: 0.01842599, y: 0.6389657, z: 0.015376843, w: -0.7689856} 435 + m_Value: {x: -0.2013635, y: 0.679315, z: -0.20235583, w: -0.67604434}
437 m_Size: 436 m_Size:
438 - m_Target: 28.358118 437 + m_Target: 71.60626
439 speed: 2 438 speed: 2
440 - m_Value: 28.358118 439 + m_Value: 68.522736
441 m_Ortho: 440 m_Ortho:
442 m_Target: 0 441 m_Target: 0
443 speed: 2 442 speed: 2
...@@ -548,33 +547,6 @@ MonoBehaviour: ...@@ -548,33 +547,6 @@ MonoBehaviour:
548 m_PrefabAsset: {fileID: 0} 547 m_PrefabAsset: {fileID: 0}
549 m_GameObject: {fileID: 0} 548 m_GameObject: {fileID: 0}
550 m_Enabled: 1 549 m_Enabled: 1
551 - m_EditorHideFlags: 0
552 - m_Script: {fileID: 11500000, guid: 75bf4c05d7c98dc41996f096840a5376, type: 3}
553 - m_Name:
554 - m_EditorClassIdentifier:
555 - m_MinSize: {x: 100, y: 100}
556 - m_MaxSize: {x: 4000, y: 4000}
557 - m_TitleContent:
558 - m_Text: ' VIDE Editor'
559 - m_Image: {fileID: 2800000, guid: 17e4c23917a8d1b448cfc8223c092c78, type: 3}
560 - m_Tooltip:
561 - m_Pos:
562 - serializedVersion: 2
563 - x: 0
564 - y: 73
565 - width: 1143
566 - height: 655
567 - m_ViewDataDictionary: {fileID: 0}
568 - namespaceBlackList:
569 - - UnityEngine
570 ---- !u!114 &15
571 -MonoBehaviour:
572 - m_ObjectHideFlags: 52
573 - m_CorrespondingSourceObject: {fileID: 0}
574 - m_PrefabInstance: {fileID: 0}
575 - m_PrefabAsset: {fileID: 0}
576 - m_GameObject: {fileID: 0}
577 - m_Enabled: 1
578 m_EditorHideFlags: 1 550 m_EditorHideFlags: 1
579 m_Script: {fileID: 12014, guid: 0000000000000000e000000000000000, type: 0} 551 m_Script: {fileID: 12014, guid: 0000000000000000e000000000000000, type: 0}
580 m_Name: 552 m_Name:
...@@ -605,22 +577,22 @@ MonoBehaviour: ...@@ -605,22 +577,22 @@ MonoBehaviour:
605 m_SkipHidden: 0 577 m_SkipHidden: 0
606 m_SearchArea: 1 578 m_SearchArea: 1
607 m_Folders: 579 m_Folders:
608 - - Assets/AnimeGirls/BaseCharacter/BaseCharacter/Sourcefiles 580 + - Assets/Scripts
609 m_Globs: [] 581 m_Globs: []
610 m_OriginalText: 582 m_OriginalText:
611 m_ViewMode: 1 583 m_ViewMode: 1
612 - m_StartGridSize: 64 584 + m_StartGridSize: 68
613 m_LastFolders: 585 m_LastFolders:
614 - - Assets/AnimeGirls/BaseCharacter/BaseCharacter/Sourcefiles 586 + - Assets/Scripts
615 - m_LastFoldersGridSize: -1 587 + m_LastFoldersGridSize: 68
616 - m_LastProjectPath: C:\Users\youhyeoneee\Desktop\JSH_Project1\src\unity\creating-map 588 + m_LastProjectPath: "C:\\Users\\youhyeoneee\\Desktop\\\uCEA1\uB514\\JSH_Project1\\src\\unity\\creating-map"
617 m_LockTracker: 589 m_LockTracker:
618 m_IsLocked: 0 590 m_IsLocked: 0
619 m_FolderTreeState: 591 m_FolderTreeState:
620 - scrollPos: {x: 0, y: 18} 592 + scrollPos: {x: 0, y: 106}
621 - m_SelectedIDs: fa410900 593 + m_SelectedIDs: 44530000
622 - m_LastClickedID: 606714 594 + m_LastClickedID: 21316
623 - m_ExpandedIDs: 0000000020550000225500002455000026550000285500002a5500002c5500002e55000030550000325500003455000036550000385500003a5500003c5500003e55000040550000425500004455000046550000485500004a5500004c5500004e55000050550000525500005455000056550000585500005a5500005c5500005e550000 595 + m_ExpandedIDs: 00000000cc520000ce520000d0520000d2520000d4520000d6520000d8520000da520000dc520000de520000e0520000e2520000e4520000e6520000e8520000ea520000ec520000ee520000f0520000f2520000f4520000f6520000f8520000fa520000fc520000fe52000000530000025300000453000000ca9a3b
624 m_RenameOverlay: 596 m_RenameOverlay:
625 m_UserAcceptedRename: 0 597 m_UserAcceptedRename: 0
626 m_Name: 598 m_Name:
...@@ -636,7 +608,7 @@ MonoBehaviour: ...@@ -636,7 +608,7 @@ MonoBehaviour:
636 m_IsRenaming: 0 608 m_IsRenaming: 0
637 m_OriginalEventType: 11 609 m_OriginalEventType: 11
638 m_IsRenamingFilename: 1 610 m_IsRenamingFilename: 1
639 - m_ClientGUIView: {fileID: 0} 611 + m_ClientGUIView: {fileID: 8}
640 m_SearchString: 612 m_SearchString:
641 m_CreateAssetUtility: 613 m_CreateAssetUtility:
642 m_EndAction: {fileID: 0} 614 m_EndAction: {fileID: 0}
...@@ -648,7 +620,7 @@ MonoBehaviour: ...@@ -648,7 +620,7 @@ MonoBehaviour:
648 scrollPos: {x: 0, y: 0} 620 scrollPos: {x: 0, y: 0}
649 m_SelectedIDs: 621 m_SelectedIDs:
650 m_LastClickedID: 0 622 m_LastClickedID: 0
651 - m_ExpandedIDs: 0000000020550000225500002455000026550000285500002a5500002c5500002e55000030550000325500003455000036550000385500003a5500003c5500003e55000040550000425500004455000046550000485500004a5500004c5500004e55000050550000525500005455000056550000585500005a5500005c5500005e550000 623 + m_ExpandedIDs: 00000000cc520000ce520000d0520000d2520000d4520000d6520000d8520000da520000dc520000de520000e0520000e2520000e4520000e6520000e8520000ea520000ec520000ee520000f0520000f2520000f4520000f6520000f8520000fa520000fc520000fe520000005300000253000004530000
652 m_RenameOverlay: 624 m_RenameOverlay:
653 m_UserAcceptedRename: 0 625 m_UserAcceptedRename: 0
654 m_Name: 626 m_Name:
...@@ -673,9 +645,9 @@ MonoBehaviour: ...@@ -673,9 +645,9 @@ MonoBehaviour:
673 m_Icon: {fileID: 0} 645 m_Icon: {fileID: 0}
674 m_ResourceFile: 646 m_ResourceFile:
675 m_ListAreaState: 647 m_ListAreaState:
676 - m_SelectedInstanceIDs: 04e7feff 648 + m_SelectedInstanceIDs: 3c400000
677 - m_LastClickedInstanceID: -71932 649 + m_LastClickedInstanceID: 16444
678 - m_HadKeyboardFocusLastEvent: 0 650 + m_HadKeyboardFocusLastEvent: 1
679 m_ExpandedInstanceIDs: c6230000c83b000094550000be9c00000000000094d10400ead004007cd1040084d104008cd104004ad1040052d104005ad10400d6d10400 651 m_ExpandedInstanceIDs: c6230000c83b000094550000be9c00000000000094d10400ead004007cd1040084d104008cd104004ad1040052d104005ad10400d6d10400
680 m_RenameOverlay: 652 m_RenameOverlay:
681 m_UserAcceptedRename: 0 653 m_UserAcceptedRename: 0
...@@ -701,10 +673,10 @@ MonoBehaviour: ...@@ -701,10 +673,10 @@ MonoBehaviour:
701 m_ResourceFile: 673 m_ResourceFile:
702 m_NewAssetIndexInList: -1 674 m_NewAssetIndexInList: -1
703 m_ScrollPosition: {x: 0, y: 0} 675 m_ScrollPosition: {x: 0, y: 0}
704 - m_GridSize: 64 676 + m_GridSize: 68
705 m_SkipHiddenPackages: 0 677 m_SkipHiddenPackages: 0
706 m_DirectoriesAreaWidth: 327 678 m_DirectoriesAreaWidth: 327
707 ---- !u!114 &16 679 +--- !u!114 &15
708 MonoBehaviour: 680 MonoBehaviour:
709 m_ObjectHideFlags: 52 681 m_ObjectHideFlags: 52
710 m_CorrespondingSourceObject: {fileID: 0} 682 m_CorrespondingSourceObject: {fileID: 0}
...@@ -729,7 +701,7 @@ MonoBehaviour: ...@@ -729,7 +701,7 @@ MonoBehaviour:
729 width: 1143 701 width: 1143
730 height: 250 702 height: 250
731 m_ViewDataDictionary: {fileID: 0} 703 m_ViewDataDictionary: {fileID: 0}
732 ---- !u!114 &17 704 +--- !u!114 &16
733 MonoBehaviour: 705 MonoBehaviour:
734 m_ObjectHideFlags: 52 706 m_ObjectHideFlags: 52
735 m_CorrespondingSourceObject: {fileID: 0} 707 m_CorrespondingSourceObject: {fileID: 0}
...@@ -756,10 +728,10 @@ MonoBehaviour: ...@@ -756,10 +728,10 @@ MonoBehaviour:
756 m_ViewDataDictionary: {fileID: 0} 728 m_ViewDataDictionary: {fileID: 0}
757 m_SceneHierarchy: 729 m_SceneHierarchy:
758 m_TreeViewState: 730 m_TreeViewState:
759 - scrollPos: {x: 0, y: 0} 731 + scrollPos: {x: 0, y: 403}
760 - m_SelectedIDs: 90550000 732 + m_SelectedIDs: 3c400000
761 - m_LastClickedID: 0 733 + m_LastClickedID: 16444
762 - m_ExpandedIDs: 734 + m_ExpandedIDs: 32fbffff34fbffffc03e0000883f0000284f0000c84f0000
763 m_RenameOverlay: 735 m_RenameOverlay:
764 m_UserAcceptedRename: 0 736 m_UserAcceptedRename: 0
765 m_Name: 737 m_Name:
...@@ -783,7 +755,7 @@ MonoBehaviour: ...@@ -783,7 +755,7 @@ MonoBehaviour:
783 m_IsLocked: 0 755 m_IsLocked: 0
784 m_CurrentSortingName: TransformSorting 756 m_CurrentSortingName: TransformSorting
785 m_WindowGUID: 4c969a2b90040154d917609493e03593 757 m_WindowGUID: 4c969a2b90040154d917609493e03593
786 ---- !u!114 &18 758 +--- !u!114 &17
787 MonoBehaviour: 759 MonoBehaviour:
788 m_ObjectHideFlags: 52 760 m_ObjectHideFlags: 52
789 m_CorrespondingSourceObject: {fileID: 0} 761 m_CorrespondingSourceObject: {fileID: 0}
...@@ -820,7 +792,7 @@ MonoBehaviour: ...@@ -820,7 +792,7 @@ MonoBehaviour:
820 m_LockTracker: 792 m_LockTracker:
821 m_IsLocked: 0 793 m_IsLocked: 0
822 m_PreviewWindow: {fileID: 0} 794 m_PreviewWindow: {fileID: 0}
823 ---- !u!114 &19 795 +--- !u!114 &18
824 MonoBehaviour: 796 MonoBehaviour:
825 m_ObjectHideFlags: 0 797 m_ObjectHideFlags: 0
826 m_CorrespondingSourceObject: {fileID: 0} 798 m_CorrespondingSourceObject: {fileID: 0}
......
1 m_ProjectFiles: 1 m_ProjectFiles:
2 m_ManifestFileStatus: 2 m_ManifestFileStatus:
3 - m_FilePath: C:/Users/youhyeoneee/Desktop/JSH_Project1/src/unity/creating-map/Packages/manifest.json 3 + m_FilePath: "C:/Users/youhyeoneee/Desktop/\uCEA1\uB514/JSH_Project1/src/unity/creating-map/Packages/manifest.json"
4 m_PathExists: 1 4 m_PathExists: 1
5 m_ContentTrackingEnabled: 1 5 m_ContentTrackingEnabled: 1
6 m_ModificationDate: 6 m_ModificationDate:
7 serializedVersion: 2 7 serializedVersion: 2
8 - ticks: 637583853425922659 8 + ticks: 637592683570349939
9 m_Hash: 442138865 9 m_Hash: 442138865
10 m_LockFileStatus: 10 m_LockFileStatus:
11 - m_FilePath: C:/Users/youhyeoneee/Desktop/JSH_Project1/src/unity/creating-map/Packages/packages-lock.json 11 + m_FilePath: "C:/Users/youhyeoneee/Desktop/\uCEA1\uB514/JSH_Project1/src/unity/creating-map/Packages/packages-lock.json"
12 m_PathExists: 1 12 m_PathExists: 1
13 m_ContentTrackingEnabled: 1 13 m_ContentTrackingEnabled: 1
14 m_ModificationDate: 14 m_ModificationDate:
15 serializedVersion: 2 15 serializedVersion: 2
16 - ticks: 637583853425932632 16 + ticks: 637592683570359907
17 m_Hash: 2647499342 17 m_Hash: 2647499342
18 m_EmbeddedPackageManifests: 18 m_EmbeddedPackageManifests:
19 m_ManifestsStatus: {} 19 m_ManifestsStatus: {}
...@@ -76,7 +76,7 @@ m_PackageAssets: ...@@ -76,7 +76,7 @@ m_PackageAssets:
76 isDirectDependency: 1 76 isDirectDependency: 1
77 version: 1.3.9 77 version: 1.3.9
78 source: 1 78 source: 1
79 - resolvedPath: C:\Users\youhyeoneee\Desktop\JSH_Project1\src\unity\creating-map\Library\PackageCache\com.unity.collab-proxy@1.3.9 79 + resolvedPath: "C:\\Users\\youhyeoneee\\Desktop\\\uCEA1\uB514\\JSH_Project1\\src\\unity\\creating-map\\Library\\PackageCache\\com.unity.collab-proxy@1.3.9"
80 assetPath: Packages/com.unity.collab-proxy 80 assetPath: Packages/com.unity.collab-proxy
81 name: com.unity.collab-proxy 81 name: com.unity.collab-proxy
82 displayName: Unity Collaborate 82 displayName: Unity Collaborate
...@@ -173,7 +173,7 @@ m_PackageAssets: ...@@ -173,7 +173,7 @@ m_PackageAssets:
173 isDirectDependency: 1 173 isDirectDependency: 1
174 version: 2.0.7 174 version: 2.0.7
175 source: 1 175 source: 1
176 - resolvedPath: C:\Users\youhyeoneee\Desktop\JSH_Project1\src\unity\creating-map\Library\PackageCache\com.unity.ide.rider@2.0.7 176 + resolvedPath: "C:\\Users\\youhyeoneee\\Desktop\\\uCEA1\uB514\\JSH_Project1\\src\\unity\\creating-map\\Library\\PackageCache\\com.unity.ide.rider@2.0.7"
177 assetPath: Packages/com.unity.ide.rider 177 assetPath: Packages/com.unity.ide.rider
178 name: com.unity.ide.rider 178 name: com.unity.ide.rider
179 displayName: JetBrains Rider Editor 179 displayName: JetBrains Rider Editor
...@@ -280,7 +280,7 @@ m_PackageAssets: ...@@ -280,7 +280,7 @@ m_PackageAssets:
280 isDirectDependency: 1 280 isDirectDependency: 1
281 version: 2.0.7 281 version: 2.0.7
282 source: 1 282 source: 1
283 - resolvedPath: C:\Users\youhyeoneee\Desktop\JSH_Project1\src\unity\creating-map\Library\PackageCache\com.unity.ide.visualstudio@2.0.7 283 + resolvedPath: "C:\\Users\\youhyeoneee\\Desktop\\\uCEA1\uB514\\JSH_Project1\\src\\unity\\creating-map\\Library\\PackageCache\\com.unity.ide.visualstudio@2.0.7"
284 assetPath: Packages/com.unity.ide.visualstudio 284 assetPath: Packages/com.unity.ide.visualstudio
285 name: com.unity.ide.visualstudio 285 name: com.unity.ide.visualstudio
286 displayName: Visual Studio Editor 286 displayName: Visual Studio Editor
...@@ -365,7 +365,7 @@ m_PackageAssets: ...@@ -365,7 +365,7 @@ m_PackageAssets:
365 isDirectDependency: 1 365 isDirectDependency: 1
366 version: 1.2.3 366 version: 1.2.3
367 source: 1 367 source: 1
368 - resolvedPath: C:\Users\youhyeoneee\Desktop\JSH_Project1\src\unity\creating-map\Library\PackageCache\com.unity.ide.vscode@1.2.3 368 + resolvedPath: "C:\\Users\\youhyeoneee\\Desktop\\\uCEA1\uB514\\JSH_Project1\\src\\unity\\creating-map\\Library\\PackageCache\\com.unity.ide.vscode@1.2.3"
369 assetPath: Packages/com.unity.ide.vscode 369 assetPath: Packages/com.unity.ide.vscode
370 name: com.unity.ide.vscode 370 name: com.unity.ide.vscode
371 displayName: Visual Studio Code Editor 371 displayName: Visual Studio Code Editor
...@@ -434,7 +434,7 @@ m_PackageAssets: ...@@ -434,7 +434,7 @@ m_PackageAssets:
434 isDirectDependency: 1 434 isDirectDependency: 1
435 version: 1.1.24 435 version: 1.1.24
436 source: 1 436 source: 1
437 - resolvedPath: C:\Users\youhyeoneee\Desktop\JSH_Project1\src\unity\creating-map\Library\PackageCache\com.unity.test-framework@1.1.24 437 + resolvedPath: "C:\\Users\\youhyeoneee\\Desktop\\\uCEA1\uB514\\JSH_Project1\\src\\unity\\creating-map\\Library\\PackageCache\\com.unity.test-framework@1.1.24"
438 assetPath: Packages/com.unity.test-framework 438 assetPath: Packages/com.unity.test-framework
439 name: com.unity.test-framework 439 name: com.unity.test-framework
440 displayName: Test Framework 440 displayName: Test Framework
...@@ -524,7 +524,7 @@ m_PackageAssets: ...@@ -524,7 +524,7 @@ m_PackageAssets:
524 isDirectDependency: 1 524 isDirectDependency: 1
525 version: 3.0.4 525 version: 3.0.4
526 source: 1 526 source: 1
527 - resolvedPath: C:\Users\youhyeoneee\Desktop\JSH_Project1\src\unity\creating-map\Library\PackageCache\com.unity.textmeshpro@3.0.4 527 + resolvedPath: "C:\\Users\\youhyeoneee\\Desktop\\\uCEA1\uB514\\JSH_Project1\\src\\unity\\creating-map\\Library\\PackageCache\\com.unity.textmeshpro@3.0.4"
528 assetPath: Packages/com.unity.textmeshpro 528 assetPath: Packages/com.unity.textmeshpro
529 name: com.unity.textmeshpro 529 name: com.unity.textmeshpro
530 displayName: TextMeshPro 530 displayName: TextMeshPro
...@@ -683,7 +683,7 @@ m_PackageAssets: ...@@ -683,7 +683,7 @@ m_PackageAssets:
683 isDirectDependency: 1 683 isDirectDependency: 1
684 version: 1.4.6 684 version: 1.4.6
685 source: 1 685 source: 1
686 - resolvedPath: C:\Users\youhyeoneee\Desktop\JSH_Project1\src\unity\creating-map\Library\PackageCache\com.unity.timeline@1.4.6 686 + resolvedPath: "C:\\Users\\youhyeoneee\\Desktop\\\uCEA1\uB514\\JSH_Project1\\src\\unity\\creating-map\\Library\\PackageCache\\com.unity.timeline@1.4.6"
687 assetPath: Packages/com.unity.timeline 687 assetPath: Packages/com.unity.timeline
688 name: com.unity.timeline 688 name: com.unity.timeline
689 displayName: Timeline 689 displayName: Timeline
...@@ -889,12 +889,12 @@ m_PackageAssets: ...@@ -889,12 +889,12 @@ m_PackageAssets:
889 url: 889 url:
890 revision: 890 revision:
891 path: 891 path:
892 - - packageId: com.valvesoftware.unity.openvr@file:C:\Users\youhyeoneee\Desktop\JSH_Project1\src\unity\creating-map\Assets\SteamVR\OpenVRUnityXRPackage\Editor\com.valvesoftware.unity.openvr-1.1.4.tgz 892 + - packageId: "com.valvesoftware.unity.openvr@file:C:\\Users\\youhyeoneee\\Desktop\\\uCEA1\uB514\\JSH_Project1\\src\\unity\\creating-map\\Assets\\SteamVR\\OpenVRUnityXRPackage\\Editor\\com.valvesoftware.unity.openvr-1.1.4.tgz"
893 testable: 0 893 testable: 0
894 isDirectDependency: 1 894 isDirectDependency: 1
895 version: 1.1.4 895 version: 1.1.4
896 source: 6 896 source: 6
897 - resolvedPath: C:\Users\youhyeoneee\Desktop\JSH_Project1\src\unity\creating-map\Library\PackageCache\com.valvesoftware.unity.openvr@89805b0408bd-1622788537939 897 + resolvedPath: "C:\\Users\\youhyeoneee\\Desktop\\\uCEA1\uB514\\JSH_Project1\\src\\unity\\creating-map\\Library\\PackageCache\\com.valvesoftware.unity.openvr@21a04b0ca135-1623671553058"
898 assetPath: Packages/com.valvesoftware.unity.openvr 898 assetPath: Packages/com.valvesoftware.unity.openvr
899 name: com.valvesoftware.unity.openvr 899 name: com.valvesoftware.unity.openvr
900 displayName: OpenVR XR Plugin 900 displayName: OpenVR XR Plugin
...@@ -2721,7 +2721,7 @@ m_PackageAssets: ...@@ -2721,7 +2721,7 @@ m_PackageAssets:
2721 isDirectDependency: 0 2721 isDirectDependency: 0
2722 version: 3.2.13 2722 version: 3.2.13
2723 source: 1 2723 source: 1
2724 - resolvedPath: C:\Users\youhyeoneee\Desktop\JSH_Project1\src\unity\creating-map\Library\PackageCache\com.unity.xr.management@3.2.13 2724 + resolvedPath: "C:\\Users\\youhyeoneee\\Desktop\\\uCEA1\uB514\\JSH_Project1\\src\\unity\\creating-map\\Library\\PackageCache\\com.unity.xr.management@3.2.13"
2725 assetPath: Packages/com.unity.xr.management 2725 assetPath: Packages/com.unity.xr.management
2726 name: com.unity.xr.management 2726 name: com.unity.xr.management
2727 displayName: XR Plugin Management 2727 displayName: XR Plugin Management
...@@ -2845,7 +2845,7 @@ m_PackageAssets: ...@@ -2845,7 +2845,7 @@ m_PackageAssets:
2845 isDirectDependency: 0 2845 isDirectDependency: 0
2846 version: 2.1.7 2846 version: 2.1.7
2847 source: 1 2847 source: 1
2848 - resolvedPath: C:\Users\youhyeoneee\Desktop\JSH_Project1\src\unity\creating-map\Library\PackageCache\com.unity.xr.legacyinputhelpers@2.1.7 2848 + resolvedPath: "C:\\Users\\youhyeoneee\\Desktop\\\uCEA1\uB514\\JSH_Project1\\src\\unity\\creating-map\\Library\\PackageCache\\com.unity.xr.legacyinputhelpers@2.1.7"
2849 assetPath: Packages/com.unity.xr.legacyinputhelpers 2849 assetPath: Packages/com.unity.xr.legacyinputhelpers
2850 name: com.unity.xr.legacyinputhelpers 2850 name: com.unity.xr.legacyinputhelpers
2851 displayName: XR Legacy Input Helpers 2851 displayName: XR Legacy Input Helpers
...@@ -2937,7 +2937,7 @@ m_PackageAssets: ...@@ -2937,7 +2937,7 @@ m_PackageAssets:
2937 isDirectDependency: 0 2937 isDirectDependency: 0
2938 version: 1.0.6 2938 version: 1.0.6
2939 source: 1 2939 source: 1
2940 - resolvedPath: C:\Users\youhyeoneee\Desktop\JSH_Project1\src\unity\creating-map\Library\PackageCache\com.unity.ext.nunit@1.0.6 2940 + resolvedPath: "C:\\Users\\youhyeoneee\\Desktop\\\uCEA1\uB514\\JSH_Project1\\src\\unity\\creating-map\\Library\\PackageCache\\com.unity.ext.nunit@1.0.6"
2941 assetPath: Packages/com.unity.ext.nunit 2941 assetPath: Packages/com.unity.ext.nunit
2942 name: com.unity.ext.nunit 2942 name: com.unity.ext.nunit
2943 displayName: Custom NUnit 2943 displayName: Custom NUnit
...@@ -2998,7 +2998,7 @@ m_PackageAssets: ...@@ -2998,7 +2998,7 @@ m_PackageAssets:
2998 isDirectDependency: 0 2998 isDirectDependency: 0
2999 version: 1.0.6 2999 version: 1.0.6
3000 source: 1 3000 source: 1
3001 - resolvedPath: C:\Users\youhyeoneee\Desktop\JSH_Project1\src\unity\creating-map\Library\PackageCache\com.unity.subsystemregistration@1.0.6 3001 + resolvedPath: "C:\\Users\\youhyeoneee\\Desktop\\\uCEA1\uB514\\JSH_Project1\\src\\unity\\creating-map\\Library\\PackageCache\\com.unity.subsystemregistration@1.0.6"
3002 assetPath: Packages/com.unity.subsystemregistration 3002 assetPath: Packages/com.unity.subsystemregistration
3003 name: com.unity.subsystemregistration 3003 name: com.unity.subsystemregistration
3004 displayName: Subsystem Registration 3004 displayName: Subsystem Registration
...@@ -3051,19 +3051,19 @@ m_PackageAssets: ...@@ -3051,19 +3051,19 @@ m_PackageAssets:
3051 path: 3051 path:
3052 m_LocalPackages: 3052 m_LocalPackages:
3053 m_LocalFileStatus: 3053 m_LocalFileStatus:
3054 - - m_FilePath: C:\Users\youhyeoneee\Desktop\JSH_Project1\src\unity\creating-map\Assets\SteamVR\OpenVRUnityXRPackage\Editor\com.valvesoftware.unity.openvr-1.1.4.tgz/package.json 3054 + - m_FilePath: "C:\\Users\\youhyeoneee\\Desktop\\\uCEA1\uB514\\JSH_Project1\\src\\unity\\creating-map\\Assets\\SteamVR\\OpenVRUnityXRPackage\\Editor\\com.valvesoftware.unity.openvr-1.1.4.tgz/package.json"
3055 m_PathExists: 0 3055 m_PathExists: 0
3056 m_ContentTrackingEnabled: 1 3056 m_ContentTrackingEnabled: 1
3057 m_ModificationDate: 3057 m_ModificationDate:
3058 serializedVersion: 2 3058 serializedVersion: 2
3059 ticks: 0 3059 ticks: 0
3060 m_Hash: 0 3060 m_Hash: 0
3061 - - m_FilePath: C:\Users\youhyeoneee\Desktop\JSH_Project1\src\unity\creating-map\Assets\SteamVR\OpenVRUnityXRPackage\Editor\com.valvesoftware.unity.openvr-1.1.4.tgz 3061 + - m_FilePath: "C:\\Users\\youhyeoneee\\Desktop\\\uCEA1\uB514\\JSH_Project1\\src\\unity\\creating-map\\Assets\\SteamVR\\OpenVRUnityXRPackage\\Editor\\com.valvesoftware.unity.openvr-1.1.4.tgz"
3062 m_PathExists: 1 3062 m_PathExists: 1
3063 m_ContentTrackingEnabled: 1 3063 m_ContentTrackingEnabled: 1
3064 m_ModificationDate: 3064 m_ModificationDate:
3065 serializedVersion: 2 3065 serializedVersion: 2
3066 - ticks: 637583853379390702 3066 + ticks: 637592683530582630
3067 m_Hash: 2919789393 3067 m_Hash: 2919789393
3068 -m_ProjectPath: C:/Users/youhyeoneee/Desktop/JSH_Project1/src/unity/creating-map/Packages 3068 +m_ProjectPath: "C:/Users/youhyeoneee/Desktop/\uCEA1\uB514/JSH_Project1/src/unity/creating-map/Packages"
3069 m_EditorVersion: 2020.3.3f1 (76626098c1c4) 3069 m_EditorVersion: 2020.3.3f1 (76626098c1c4)
......
1 -4b0e31f17bc0df0858e1e4c08217baab
...\ No newline at end of file ...\ No newline at end of file
1 +e32d0a75b4d9a6dcf2ca11d0d68d3f5a
...\ No newline at end of file ...\ No newline at end of file
......
1 -08d8f186a5a6aa00.08d8f186b0613f00
...\ 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":false,"pivot":{"x":16.727426528930665,"y":24.66963768005371,"z":56.922630310058597},"rotation":{"x":0.018425989896059037,"y":0.6389657258987427,"z":0.015376843512058258,"w":-0.7689856290817261},"size":28.358118057250978,"orthographic":false}
...\ 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":false,"pivot":{"x":0.0,"y":0.0,"z":0.0},"rotation":{"x":-0.20108002424240113,"y":0.6803968548774719,"z":-0.20267809927463532,"w":-0.6750926971435547},"size":71.60626220703125,"orthographic":false}
...\ No newline at end of file ...\ No newline at end of file
......
This diff could not be displayed because it is too large.
1 Base path: 'D:/Unity/Editor/Data', plugins path 'D:/Unity/Editor/Data/PlaybackEngines' 1 Base path: 'D:/Unity/Editor/Data', plugins path 'D:/Unity/Editor/Data/PlaybackEngines'
2 Cmd: initializeCompiler 2 Cmd: initializeCompiler
3 3
4 +Cmd: compileSnippet
5 + insize=17274 path=Assets/DefaultResourcesExtra/Mobile cachingPP=1 ppOnly=0 stripLineD=0 buildPlatform=19 rsLen=0 pKW=UNITY_ENABLE_REFLECTION_BUFFERS UNITY_USE_DITHER_MASK_FOR_ALPHABLENDED_SHADOWS UNITY_PBS_USE_BRDF1 UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING UNITY_ENABLE_DETAIL_NORMALMAP SHADER_API_DESKTOP UNITY_LIGHT_PROBE_PROXY_VOLUME UNITY_LIGHTMAP_FULL_HDR UNITY_PASS_FORWARDBASE uKW=DIRECTIONAL LIGHTPROBE_SH FOG_LINEAR dKW=INSTANCING_ON FOG_EXP FOG_EXP2 SHADOWS_SHADOWMASK DYNAMICLIGHTMAP_ON LIGHTMAP_ON LIGHTMAP_SHADOW_MIXING DIRLIGHTMAP_COMBINED SHADOWS_SCREEN VERTEXLIGHT_ON UNITY_NO_DXT5nm UNITY_ENABLE_NATIVE_SHADOW_LOOKUPS UNITY_METAL_SHADOWS_USE_POINT_FILTERING UNITY_NO_SCREENSPACE_SHADOWS UNITY_PBS_USE_BRDF2 UNITY_PBS_USE_BRDF3 UNITY_NO_FULL_STANDARD_SHADER UNITY_HARDWARE_TIER1 UNITY_HARDWARE_TIER2 UNITY_HARDWARE_TIER3 UNITY_COLORSPACE_GAMMA UNITY_HALF_PRECISION_FRAGMENT_SHADER_REGISTERS UNITY_LIGHTMAP_DLDR_ENCODING UNITY_LIGHTMAP_RGBM_ENCODING UNITY_VIRTUAL_TEXTURING UNITY_PRETRANSFORM_TO_DISPLAY_ORIENTATION UNITY_ASTC_NORMALMAP_ENCODING SHADER_API_GLES30 flags=0 lang=0 type=Vertex platform=d3d11 reqs=33 mask=6 start=23 ok=1 outsize=1962
6 +
4 Cmd: shutdown 7 Cmd: shutdown
......
1 Base path: 'D:/Unity/Editor/Data', plugins path 'D:/Unity/Editor/Data/PlaybackEngines' 1 Base path: 'D:/Unity/Editor/Data', plugins path 'D:/Unity/Editor/Data/PlaybackEngines'
2 Cmd: initializeCompiler 2 Cmd: initializeCompiler
3 3
4 +Cmd: compileSnippet
5 + insize=17274 path=Assets/DefaultResourcesExtra/Mobile cachingPP=1 ppOnly=0 stripLineD=0 buildPlatform=19 rsLen=0 pKW=UNITY_ENABLE_REFLECTION_BUFFERS UNITY_USE_DITHER_MASK_FOR_ALPHABLENDED_SHADOWS UNITY_PBS_USE_BRDF1 UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING UNITY_ENABLE_DETAIL_NORMALMAP SHADER_API_DESKTOP UNITY_LIGHT_PROBE_PROXY_VOLUME UNITY_LIGHTMAP_FULL_HDR UNITY_PASS_FORWARDBASE uKW=DIRECTIONAL LIGHTPROBE_SH FOG_LINEAR dKW=INSTANCING_ON FOG_EXP FOG_EXP2 SHADOWS_SHADOWMASK DYNAMICLIGHTMAP_ON LIGHTMAP_ON LIGHTMAP_SHADOW_MIXING DIRLIGHTMAP_COMBINED SHADOWS_SCREEN UNITY_NO_DXT5nm UNITY_ENABLE_NATIVE_SHADOW_LOOKUPS UNITY_METAL_SHADOWS_USE_POINT_FILTERING UNITY_NO_SCREENSPACE_SHADOWS UNITY_PBS_USE_BRDF2 UNITY_PBS_USE_BRDF3 UNITY_NO_FULL_STANDARD_SHADER UNITY_HARDWARE_TIER1 UNITY_HARDWARE_TIER2 UNITY_HARDWARE_TIER3 UNITY_COLORSPACE_GAMMA UNITY_HALF_PRECISION_FRAGMENT_SHADER_REGISTERS UNITY_LIGHTMAP_DLDR_ENCODING UNITY_LIGHTMAP_RGBM_ENCODING UNITY_VIRTUAL_TEXTURING UNITY_PRETRANSFORM_TO_DISPLAY_ORIENTATION UNITY_ASTC_NORMALMAP_ENCODING SHADER_API_GLES30 flags=0 lang=0 type=Fragment platform=d3d11 reqs=33 mask=6 start=23 ok=1 outsize=1402
6 +
4 Cmd: shutdown 7 Cmd: shutdown
......
1 -Base path: 'D:/Unity/Editor/Data', plugins path 'D:/Unity/Editor/Data/PlaybackEngines'
2 -Cmd: initializeCompiler
3 -
4 -Cmd: shutdown
1  1 
2 Microsoft Visual Studio Solution File, Format Version 12.00 2 Microsoft Visual Studio Solution File, Format Version 12.00
3 # Visual Studio 15 3 # Visual Studio 15
4 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SteamVR", "SteamVR.csproj", "{310FB4FB-53C9-90A1-9768-DD7F26101DCF}"
5 -EndProject
6 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Assembly-CSharp", "Assembly-CSharp.csproj", "{60310D78-8B7A-FABB-FD83-119000786342}" 4 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Assembly-CSharp", "Assembly-CSharp.csproj", "{60310D78-8B7A-FABB-FD83-119000786342}"
7 EndProject 5 EndProject
8 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SteamVR_Actions", "SteamVR_Actions.csproj", "{76F1EB3F-53DB-5748-8114-33E09C8762F0}"
9 -EndProject
10 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SteamVR_Input_Editor", "SteamVR_Input_Editor.csproj", "{6F22B42F-899A-E42E-814F-38FF0E3DB215}"
11 -EndProject
12 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Assembly-CSharp-Editor", "Assembly-CSharp-Editor.csproj", "{E151A80B-4015-8B74-3038-60EA22E7A25E}" 6 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Assembly-CSharp-Editor", "Assembly-CSharp-Editor.csproj", "{E151A80B-4015-8B74-3038-60EA22E7A25E}"
13 EndProject 7 EndProject
14 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SteamVR_Editor", "SteamVR_Editor.csproj", "{D6858D21-A814-528C-DEEF-67B0183BCC89}"
15 -EndProject
16 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SteamVR_Windows_EditorHelper", "SteamVR_Windows_EditorHelper.csproj", "{A6E1F8DF-CF60-3F45-FA82-919780E1A707}"
17 -EndProject
18 Global 8 Global
19 GlobalSection(SolutionConfigurationPlatforms) = preSolution 9 GlobalSection(SolutionConfigurationPlatforms) = preSolution
20 Debug|Any CPU = Debug|Any CPU 10 Debug|Any CPU = Debug|Any CPU
21 Release|Any CPU = Release|Any CPU 11 Release|Any CPU = Release|Any CPU
22 EndGlobalSection 12 EndGlobalSection
23 GlobalSection(ProjectConfigurationPlatforms) = postSolution 13 GlobalSection(ProjectConfigurationPlatforms) = postSolution
24 - {310FB4FB-53C9-90A1-9768-DD7F26101DCF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
25 - {310FB4FB-53C9-90A1-9768-DD7F26101DCF}.Debug|Any CPU.Build.0 = Debug|Any CPU
26 - {310FB4FB-53C9-90A1-9768-DD7F26101DCF}.Release|Any CPU.ActiveCfg = Release|Any CPU
27 - {310FB4FB-53C9-90A1-9768-DD7F26101DCF}.Release|Any CPU.Build.0 = Release|Any CPU
28 {60310D78-8B7A-FABB-FD83-119000786342}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 14 {60310D78-8B7A-FABB-FD83-119000786342}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
29 {60310D78-8B7A-FABB-FD83-119000786342}.Debug|Any CPU.Build.0 = Debug|Any CPU 15 {60310D78-8B7A-FABB-FD83-119000786342}.Debug|Any CPU.Build.0 = Debug|Any CPU
30 {60310D78-8B7A-FABB-FD83-119000786342}.Release|Any CPU.ActiveCfg = Release|Any CPU 16 {60310D78-8B7A-FABB-FD83-119000786342}.Release|Any CPU.ActiveCfg = Release|Any CPU
31 {60310D78-8B7A-FABB-FD83-119000786342}.Release|Any CPU.Build.0 = Release|Any CPU 17 {60310D78-8B7A-FABB-FD83-119000786342}.Release|Any CPU.Build.0 = Release|Any CPU
32 - {76F1EB3F-53DB-5748-8114-33E09C8762F0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
33 - {76F1EB3F-53DB-5748-8114-33E09C8762F0}.Debug|Any CPU.Build.0 = Debug|Any CPU
34 - {76F1EB3F-53DB-5748-8114-33E09C8762F0}.Release|Any CPU.ActiveCfg = Release|Any CPU
35 - {76F1EB3F-53DB-5748-8114-33E09C8762F0}.Release|Any CPU.Build.0 = Release|Any CPU
36 - {6F22B42F-899A-E42E-814F-38FF0E3DB215}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
37 - {6F22B42F-899A-E42E-814F-38FF0E3DB215}.Debug|Any CPU.Build.0 = Debug|Any CPU
38 - {6F22B42F-899A-E42E-814F-38FF0E3DB215}.Release|Any CPU.ActiveCfg = Release|Any CPU
39 - {6F22B42F-899A-E42E-814F-38FF0E3DB215}.Release|Any CPU.Build.0 = Release|Any CPU
40 {E151A80B-4015-8B74-3038-60EA22E7A25E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 18 {E151A80B-4015-8B74-3038-60EA22E7A25E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
41 {E151A80B-4015-8B74-3038-60EA22E7A25E}.Debug|Any CPU.Build.0 = Debug|Any CPU 19 {E151A80B-4015-8B74-3038-60EA22E7A25E}.Debug|Any CPU.Build.0 = Debug|Any CPU
42 {E151A80B-4015-8B74-3038-60EA22E7A25E}.Release|Any CPU.ActiveCfg = Release|Any CPU 20 {E151A80B-4015-8B74-3038-60EA22E7A25E}.Release|Any CPU.ActiveCfg = Release|Any CPU
43 {E151A80B-4015-8B74-3038-60EA22E7A25E}.Release|Any CPU.Build.0 = Release|Any CPU 21 {E151A80B-4015-8B74-3038-60EA22E7A25E}.Release|Any CPU.Build.0 = Release|Any CPU
44 - {D6858D21-A814-528C-DEEF-67B0183BCC89}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
45 - {D6858D21-A814-528C-DEEF-67B0183BCC89}.Debug|Any CPU.Build.0 = Debug|Any CPU
46 - {D6858D21-A814-528C-DEEF-67B0183BCC89}.Release|Any CPU.ActiveCfg = Release|Any CPU
47 - {D6858D21-A814-528C-DEEF-67B0183BCC89}.Release|Any CPU.Build.0 = Release|Any CPU
48 - {A6E1F8DF-CF60-3F45-FA82-919780E1A707}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
49 - {A6E1F8DF-CF60-3F45-FA82-919780E1A707}.Debug|Any CPU.Build.0 = Debug|Any CPU
50 - {A6E1F8DF-CF60-3F45-FA82-919780E1A707}.Release|Any CPU.ActiveCfg = Release|Any CPU
51 - {A6E1F8DF-CF60-3F45-FA82-919780E1A707}.Release|Any CPU.Build.0 = Release|Any CPU
52 EndGlobalSection 22 EndGlobalSection
53 GlobalSection(SolutionProperties) = preSolution 23 GlobalSection(SolutionProperties) = preSolution
54 HideSolutionNode = FALSE 24 HideSolutionNode = FALSE
......