added switching

mohsr · Oct 28, 2017 · 263bb7d · 263bb7d
1 parent ab43538
commit 263bb7d
Show file tree

Hide file tree

Showing 48 changed files with 838 additions and 144 deletions.
diff --git a/Assembly-CSharp.csproj b/Assembly-CSharp.csproj
@@ -51,7 +51,8 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
-     <Compile Include="Assets\PlayerController.cs" />
+     <Compile Include="Assets\_Scripts\PlayerController.cs" />
+     <Compile Include="Assets\_Scripts\Switch.cs" />
  <Reference Include="UnityEngine.UI">
  <HintPath>/Applications/Unity/Unity.app/Contents/UnityExtensions/Unity/GUISystem/UnityEngine.UI.dll</HintPath>
  </Reference>

diff --git a/Assets/_Prefabs/Blue.meta b/Assets/_Prefabs/Blue.meta
diff --git a/Assets/_Prefabs/Blue/BluePlatform.prefab b/Assets/_Prefabs/Blue/BluePlatform.prefab
@@ -0,0 +1,351 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1001 &100100000
+Prefab:
+  m_ObjectHideFlags: 1
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 0}
+    m_Modifications: []
+    m_RemovedComponents: []
+  m_ParentPrefab: {fileID: 0}
+  m_RootGameObject: {fileID: 1280183456523458}
+  m_IsPrefabParent: 1
+--- !u!1 &1056922798721932
+GameObject:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 4424253454146704}
+  - component: {fileID: 212576006817051202}
+  - component: {fileID: 60775236964893686}
+  m_Layer: 0
+  m_Name: redorblue_23
+  m_TagString: Blue
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!1 &1225729194003600
+GameObject:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 4241075634680242}
+  - component: {fileID: 212221024281795792}
+  - component: {fileID: 61408581481366752}
+  m_Layer: 0
+  m_Name: redorblue_24
+  m_TagString: Blue
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!1 &1280183456523458
+GameObject:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 4883917575916594}
+  m_Layer: 0
+  m_Name: BluePlatform
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!1 &1397869457967740
+GameObject:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 4296240964759992}
+  - component: {fileID: 212216046901902830}
+  - component: {fileID: 60979739308363592}
+  m_Layer: 0
+  m_Name: redorblue_23 (1)
+  m_TagString: Blue
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &4241075634680242
+Transform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1225729194003600}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 4.41, y: -1.16, z: -0.16151035}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 4883917575916594}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!4 &4296240964759992
+Transform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1397869457967740}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 5.41, y: -1.16, z: -0.16151035}
+  m_LocalScale: {x: -1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 4883917575916594}
+  m_RootOrder: 2
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!4 &4424253454146704
+Transform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1056922798721932}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 3.41, y: -1.16, z: -0.16151035}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 4883917575916594}
+  m_RootOrder: 1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!4 &4883917575916594
+Transform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1280183456523458}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: -1.336751, y: 0.021306239, z: 0.16151035}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children:
+  - {fileID: 4241075634680242}
+  - {fileID: 4424253454146704}
+  - {fileID: 4296240964759992}
+  m_Father: {fileID: 0}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!60 &60775236964893686
+PolygonCollider2D:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1056922798721932}
+  m_Enabled: 1
+  m_Density: 1
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_UsedByEffector: 0
+  m_UsedByComposite: 0
+  m_Offset: {x: 0, y: 0}
+  m_SpriteTilingProperty:
+    border: {x: 0, y: 0, z: 0, w: 0}
+    pivot: {x: 0.5, y: 0.5}
+    oldSize: {x: 1, y: 1}
+    newSize: {x: 1, y: 1}
+    adaptiveTilingThreshold: 0.5
+    drawMode: 0
+    adaptiveTiling: 0
+  m_AutoTiling: 0
+  m_Points:
+    m_Paths:
+    - - {x: 0.12668037, y: 0.09211542}
+      - {x: 0.00097072124, y: 0.030059408}
+      - {x: 0.00097072124, y: -0.09114893}
+      - {x: 0.12757438, y: -0.15575984}
+      - {x: 0.5, y: -0.15560263}
+      - {x: 0.5, y: 0.09263852}
+--- !u!60 &60979739308363592
+PolygonCollider2D:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1397869457967740}
+  m_Enabled: 1
+  m_Density: 1
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_UsedByEffector: 0
+  m_UsedByComposite: 0
+  m_Offset: {x: 0, y: 0}
+  m_SpriteTilingProperty:
+    border: {x: 0, y: 0, z: 0, w: 0}
+    pivot: {x: 0.5, y: 0.5}
+    oldSize: {x: 1, y: 1}
+    newSize: {x: 1, y: 1}
+    adaptiveTilingThreshold: 0.5
+    drawMode: 0
+    adaptiveTiling: 0
+  m_AutoTiling: 0
+  m_Points:
+    m_Paths:
+    - - {x: 0.12668037, y: 0.09211542}
+      - {x: 0.00097072124, y: 0.030059408}
+      - {x: 0.00097072124, y: -0.09114893}
+      - {x: 0.12757438, y: -0.15575984}
+      - {x: 0.5, y: -0.15560263}
+      - {x: 0.5, y: 0.09263852}
+--- !u!61 &61408581481366752
+BoxCollider2D:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1225729194003600}
+  m_Enabled: 1
+  m_Density: 1
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_UsedByEffector: 0
+  m_UsedByComposite: 0
+  m_Offset: {x: 0, y: -0.031318396}
+  m_SpriteTilingProperty:
+    border: {x: 0, y: 0, z: 0, w: 0}
+    pivot: {x: 0.5, y: 0.5}
+    oldSize: {x: 1, y: 1}
+    newSize: {x: 1, y: 1}
+    adaptiveTilingThreshold: 0.5
+    drawMode: 0
+    adaptiveTiling: 0
+  m_AutoTiling: 0
+  serializedVersion: 2
+  m_Size: {x: 1, y: 0.24992281}
+  m_EdgeRadius: 0
+--- !u!212 &212216046901902830
+SpriteRenderer:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1397869457967740}
+  m_Enabled: 1
+  m_CastShadows: 0
+  m_ReceiveShadows: 0
+  m_DynamicOccludee: 1
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_Materials:
+  - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 0
+  m_SelectedEditorRenderState: 0
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 0
+  m_Sprite: {fileID: 21300046, guid: b30a302fe4d81493087462afd13695b2, type: 3}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_FlipX: 0
+  m_FlipY: 0
+  m_DrawMode: 0
+  m_Size: {x: 1, y: 1}
+  m_AdaptiveModeThreshold: 0.5
+  m_SpriteTileMode: 0
+  m_WasSpriteAssigned: 1
+  m_MaskInteraction: 0
+--- !u!212 &212221024281795792
+SpriteRenderer:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1225729194003600}
+  m_Enabled: 1
+  m_CastShadows: 0
+  m_ReceiveShadows: 0
+  m_DynamicOccludee: 1
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_Materials:
+  - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 0
+  m_SelectedEditorRenderState: 0
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 0
+  m_Sprite: {fileID: 21300048, guid: b30a302fe4d81493087462afd13695b2, type: 3}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_FlipX: 0
+  m_FlipY: 0
+  m_DrawMode: 0
+  m_Size: {x: 1, y: 1}
+  m_AdaptiveModeThreshold: 0.5
+  m_SpriteTileMode: 0
+  m_WasSpriteAssigned: 1
+  m_MaskInteraction: 0
+--- !u!212 &212576006817051202
+SpriteRenderer:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1056922798721932}
+  m_Enabled: 1
+  m_CastShadows: 0
+  m_ReceiveShadows: 0
+  m_DynamicOccludee: 1
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_Materials:
+  - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 0
+  m_SelectedEditorRenderState: 0
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 0
+  m_Sprite: {fileID: 21300046, guid: b30a302fe4d81493087462afd13695b2, type: 3}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_FlipX: 0
+  m_FlipY: 0
+  m_DrawMode: 0
+  m_Size: {x: 1, y: 1}
+  m_AdaptiveModeThreshold: 0.5
+  m_SpriteTileMode: 0
+  m_WasSpriteAssigned: 1
+  m_MaskInteraction: 0
diff --git a/Assets/_Prefabs/Blue/BluePlatform.prefab.meta b/Assets/_Prefabs/Blue/BluePlatform.prefab.meta
diff --git a/Assets/_Prefabs/Env.meta b/Assets/_Prefabs/Env.meta
diff --git a/Assets/_Prefabs/Grass_Bot_Mid.prefab → Assets/_Prefabs/Env/Grass_Bot_Mid.prefab b/Assets/_Prefabs/Grass_Bot_Mid.prefab → Assets/_Prefabs/Env/Grass_Bot_Mid.prefab
diff --git a/Assets/_Prefabs/Grass_Bot_Mid.prefab.meta → ...ts/_Prefabs/Env/Grass_Bot_Mid.prefab.meta b/Assets/_Prefabs/Grass_Bot_Mid.prefab.meta → ...ts/_Prefabs/Env/Grass_Bot_Mid.prefab.meta
diff --git a/Assets/_Prefabs/Grass_Mid_Left.prefab → Assets/_Prefabs/Env/Grass_Mid_Left.prefab b/Assets/_Prefabs/Grass_Mid_Left.prefab → Assets/_Prefabs/Env/Grass_Mid_Left.prefab
diff --git a/Assets/_Prefabs/Grass_Mid_Left.prefab.meta → ...s/_Prefabs/Env/Grass_Mid_Left.prefab.meta b/Assets/_Prefabs/Grass_Mid_Left.prefab.meta → ...s/_Prefabs/Env/Grass_Mid_Left.prefab.meta
diff --git a/Assets/_Prefabs/Grass_Mid_Mid.prefab → Assets/_Prefabs/Env/Grass_Mid_Mid.prefab b/Assets/_Prefabs/Grass_Mid_Mid.prefab → Assets/_Prefabs/Env/Grass_Mid_Mid.prefab
diff --git a/Assets/_Prefabs/Grass_Mid_Mid.prefab.meta → ...ts/_Prefabs/Env/Grass_Mid_Mid.prefab.meta b/Assets/_Prefabs/Grass_Mid_Mid.prefab.meta → ...ts/_Prefabs/Env/Grass_Mid_Mid.prefab.meta
diff --git a/Assets/_Prefabs/Grass_Mid_Right.prefab → Assets/_Prefabs/Env/Grass_Mid_Right.prefab b/Assets/_Prefabs/Grass_Mid_Right.prefab → Assets/_Prefabs/Env/Grass_Mid_Right.prefab
diff --git a/Assets/_Prefabs/Grass_Mid_Right.prefab.meta → .../_Prefabs/Env/Grass_Mid_Right.prefab.meta b/Assets/_Prefabs/Grass_Mid_Right.prefab.meta → .../_Prefabs/Env/Grass_Mid_Right.prefab.meta
diff --git a/Assets/_Prefabs/Grass_Top_Left.prefab → Assets/_Prefabs/Env/Grass_Top_Left.prefab b/Assets/_Prefabs/Grass_Top_Left.prefab → Assets/_Prefabs/Env/Grass_Top_Left.prefab
diff --git a/Assets/_Prefabs/Grass_Top_Left.prefab.meta → ...s/_Prefabs/Env/Grass_Top_Left.prefab.meta b/Assets/_Prefabs/Grass_Top_Left.prefab.meta → ...s/_Prefabs/Env/Grass_Top_Left.prefab.meta
diff --git a/Assets/_Prefabs/Grass_Top_Mid.prefab → Assets/_Prefabs/Env/Grass_Top_Mid.prefab b/Assets/_Prefabs/Grass_Top_Mid.prefab → Assets/_Prefabs/Env/Grass_Top_Mid.prefab
diff --git a/Assets/_Prefabs/Grass_Top_Mid.prefab.meta → ...ts/_Prefabs/Env/Grass_Top_Mid.prefab.meta b/Assets/_Prefabs/Grass_Top_Mid.prefab.meta → ...ts/_Prefabs/Env/Grass_Top_Mid.prefab.meta