Skip to content

Commit

Permalink
Update to prototype scene with both falling_platform and vine
Browse files Browse the repository at this point in the history
Currently, the prototype level that we will hopefully use is almost done,
just need the climbable tree and then we should be ready to build and
submit.
  • Loading branch information
Matt committed Mar 26, 2020
1 parent 9fcb88a commit 61b94e1
Show file tree
Hide file tree
Showing 30 changed files with 6,101 additions and 76 deletions.
5,785 changes: 5,785 additions & 0 deletions Projects/Prototype/Assets/_Prefabs/ProtoRectangle.prefab

Large diffs are not rendered by default.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

142 changes: 142 additions & 0 deletions Projects/Prototype/Assets/_Prefabs/falling_platform.prefab
Original file line number Diff line number Diff line change
@@ -0,0 +1,142 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &8551842165914704872
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 8551842165914406760}
- component: {fileID: 8551842165935577370}
- component: {fileID: 8551842165919210000}
- component: {fileID: 8551842165907571266}
- component: {fileID: 8591575830701765828}
m_Layer: 8
m_Name: falling_platform
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &8551842165914406760
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8551842165914704872}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -106.77, y: 4.99, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!212 &8551842165935577370
SpriteRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8551842165914704872}
m_Enabled: 1
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
m_MotionVectors: 1
m_LightProbeUsage: 0
m_ReflectionProbeUsage: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 1
m_SelectedEditorRenderState: 0
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 600026165
m_SortingLayer: 3
m_SortingOrder: 0
m_Sprite: {fileID: 21300070, guid: dbb1ff0fb3145da4581e36c16ce3cb72, 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
m_SpriteSortPoint: 0
--- !u!61 &8551842165919210000
BoxCollider2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8551842165914704872}
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: 2, y: 2}
newSize: {x: 1, y: 1}
adaptiveTilingThreshold: 0.5
drawMode: 0
adaptiveTiling: 0
m_AutoTiling: 0
serializedVersion: 2
m_Size: {x: 2, y: 2}
m_EdgeRadius: 0
--- !u!114 &8551842165907571266
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8551842165914704872}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 6ea2ea465c9684f96b42d2d13eefd088, type: 3}
m_Name:
m_EditorClassIdentifier:
TimeBeforeFall: 0.17
FallSpeed: 15
Tolerance: 0.1
--- !u!114 &8591575830701765828
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8551842165914704872}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: df1508296b0904b1ba069c225eb6482a, type: 3}
m_Name:
m_EditorClassIdentifier:
RespawnOnPlayerRespawn: 1
RepositionToInitOnPlayerRespawn: 0
AutoRespawnDuration: 0
RespawnFeedback: {fileID: 0}

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -1,46 +1,77 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &4458088003251907359
--- !u!1 &6597745182012253302
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 4458088003251907355}
- component: {fileID: 4458088003251907353}
- component: {fileID: 4458088003251907352}
- component: {fileID: 4458088003251907348}
- component: {fileID: 4458088003251907354}
- component: {fileID: 6597745182012253303}
m_Layer: 15
m_Name: fixedVineProto
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &6597745182012253303
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6597745182012253302}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 6597745182360107757}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &6597745182360107756
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 6597745182360107757}
- component: {fileID: 6597745182360107758}
- component: {fileID: 6597745182360107761}
- component: {fileID: 6597745182360107760}
- component: {fileID: 6597745182360107759}
m_Layer: 15
m_Name: Vine
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &4458088003251907355
--- !u!4 &6597745182360107757
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4458088003251907359}
m_GameObject: {fileID: 6597745182360107756}
m_LocalRotation: {x: 0, y: 0, z: 0.7071068, w: 0.7071068}
m_LocalPosition: {x: -72.94, y: -4.68, z: 0}
m_LocalPosition: {x: -13.16, y: -3.99, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_Father: {fileID: 6597745182012253303}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90}
--- !u!212 &4458088003251907353
--- !u!212 &6597745182360107758
SpriteRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4458088003251907359}
m_GameObject: {fileID: 6597745182360107756}
m_Enabled: 1
m_CastShadows: 0
m_ReceiveShadows: 0
Expand Down Expand Up @@ -72,24 +103,24 @@ SpriteRenderer:
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_Sprite: {fileID: 21300036, guid: dbb1ff0fb3145da4581e36c16ce3cb72, type: 3}
m_Color: {r: 0.12519169, g: 1, b: 0, a: 1}
m_Sprite: {fileID: 21300038, guid: dbb1ff0fb3145da4581e36c16ce3cb72, type: 3}
m_Color: {r: 0.1254902, g: 1, b: 0, a: 1}
m_FlipX: 0
m_FlipY: 0
m_DrawMode: 0
m_Size: {x: 4.28, y: 2.61}
m_Size: {x: 4, y: 0.25}
m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!61 &4458088003251907352
--- !u!61 &6597745182360107761
BoxCollider2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4458088003251907359}
m_GameObject: {fileID: 6597745182360107756}
m_Enabled: 1
m_Density: 1
m_Material: {fileID: 0}
Expand All @@ -100,22 +131,22 @@ BoxCollider2D:
m_SpriteTilingProperty:
border: {x: 0, y: 0, z: 0, w: 0}
pivot: {x: 0.5, y: 0.5}
oldSize: {x: 4, y: 0.25}
newSize: {x: 4.28, y: 2.61}
oldSize: {x: 5, y: 0.25}
newSize: {x: 4, y: 0.25}
adaptiveTilingThreshold: 0.5
drawMode: 0
adaptiveTiling: 0
m_AutoTiling: 0
serializedVersion: 2
m_Size: {x: 4, y: 0.5}
m_Size: {x: 5, y: 0.4}
m_EdgeRadius: 0
--- !u!114 &4458088003251907348
--- !u!114 &6597745182360107760
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4458088003251907359}
m_GameObject: {fileID: 6597745182360107756}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 2e9a0571a618b5d4680ffd26656dbde7, type: 3}
Expand All @@ -124,9 +155,9 @@ MonoBehaviour:
CycleOption: 0
LoopInitialMovementDirection: 0
PathElements:
- PathElementPosition: {x: -3.5, y: 0, z: 0}
- PathElementPosition: {x: 0, y: 0, z: 0}
Delay: 0
- PathElementPosition: {x: 2.5, y: 0, z: 0}
- PathElementPosition: {x: 11, y: 0, z: 0}
Delay: 0
MovementSpeed: 2
AccelerationType: 0
Expand Down Expand Up @@ -163,13 +194,13 @@ MonoBehaviour:
ToggleButton: 0
ChangeDirectionButton: 0
ResetEndReachedButton: 0
--- !u!114 &4458088003251907354
--- !u!114 &6597745182360107759
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4458088003251907359}
m_GameObject: {fileID: 6597745182360107756}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: c37f407a033957e49a81d1712b702276, type: 3}
Expand Down
7 changes: 7 additions & 0 deletions Projects/Prototype/Assets/_Prefabs/fixedVineProto.prefab.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Projects/Prototype/Assets/_Scenes/ProtoMinimalLevel.unity
Git LFS file not shown
Git LFS file not shown

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 61b94e1

Please sign in to comment.