Skip to content

Commit

Permalink
Added layers
Browse files Browse the repository at this point in the history
  • Loading branch information
zane-c committed Nov 20, 2017
1 parent 679a125 commit 19e879f
Show file tree
Hide file tree
Showing 66 changed files with 613 additions and 22,227 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -41,3 +41,4 @@ Thumbs.db
# not sure #
# ============ #
ProjectSettings/ProjectVersion.txt
dist/
24 changes: 12 additions & 12 deletions Assets/Prefabs/Gizmos/Conveyor.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ GameObject:
- component: {fileID: 4397442209825386}
- component: {fileID: 212800630795265254}
- component: {fileID: 114644695007550062}
m_Layer: 0
m_Layer: 10
m_Name: Gear (3)
m_TagString: Untagged
m_Icon: {fileID: 0}
Expand All @@ -37,7 +37,7 @@ GameObject:
m_Component:
- component: {fileID: 4845778314610000}
- component: {fileID: 61681759478025306}
m_Layer: 0
m_Layer: 10
m_Name: Direction
m_TagString: Flippable
m_Icon: {fileID: 0}
Expand All @@ -53,7 +53,7 @@ GameObject:
m_Component:
- component: {fileID: 4236330637201670}
- component: {fileID: 212064071393408690}
m_Layer: 0
m_Layer: 10
m_Name: directionArrow
m_TagString: Untagged
m_Icon: {fileID: 0}
Expand All @@ -70,7 +70,7 @@ GameObject:
- component: {fileID: 4855251656120432}
- component: {fileID: 212494138343018334}
- component: {fileID: 114105480488287890}
m_Layer: 0
m_Layer: 10
m_Name: Gear
m_TagString: Untagged
m_Icon: {fileID: 0}
Expand All @@ -87,7 +87,7 @@ GameObject:
- component: {fileID: 4579015691268826}
- component: {fileID: 212588493608310366}
- component: {fileID: 114236875765205626}
m_Layer: 0
m_Layer: 10
m_Name: Gear (1)
m_TagString: Untagged
m_Icon: {fileID: 0}
Expand All @@ -103,7 +103,7 @@ GameObject:
m_Component:
- component: {fileID: 4317248321062450}
- component: {fileID: 61138777438691322}
m_Layer: 0
m_Layer: 10
m_Name: Rotator
m_TagString: Rotatable
m_Icon: {fileID: 0}
Expand All @@ -120,7 +120,7 @@ GameObject:
- component: {fileID: 4399029004068526}
- component: {fileID: 212341811876683554}
- component: {fileID: 114810039279882106}
m_Layer: 0
m_Layer: 10
m_Name: Gear (4)
m_TagString: Untagged
m_Icon: {fileID: 0}
Expand All @@ -137,7 +137,7 @@ GameObject:
- component: {fileID: 4283681368140990}
- component: {fileID: 212084641564764808}
- component: {fileID: 114766494112889716}
m_Layer: 0
m_Layer: 10
m_Name: Gear (2)
m_TagString: Untagged
m_Icon: {fileID: 0}
Expand All @@ -153,7 +153,7 @@ GameObject:
m_Component:
- component: {fileID: 4944521360783106}
- component: {fileID: 212528937519572282}
m_Layer: 0
m_Layer: 10
m_Name: tag
m_TagString: ConveyorBelt
m_Icon: {fileID: 0}
Expand All @@ -169,7 +169,7 @@ GameObject:
m_Component:
- component: {fileID: 4656993033745324}
- component: {fileID: 212699039007535484}
m_Layer: 0
m_Layer: 10
m_Name: rotateArrow
m_TagString: Untagged
m_Icon: {fileID: 0}
Expand All @@ -190,7 +190,7 @@ GameObject:
- component: {fileID: 61723897635277602}
- component: {fileID: 61489742916714720}
- component: {fileID: 114823018389043974}
m_Layer: 0
m_Layer: 10
m_Name: Conveyor
m_TagString: Draggable
m_Icon: {fileID: 0}
Expand All @@ -205,7 +205,7 @@ GameObject:
serializedVersion: 5
m_Component:
- component: {fileID: 4516954565257926}
m_Layer: 0
m_Layer: 10
m_Name: Gears
m_TagString: Untagged
m_Icon: {fileID: 0}
Expand Down
10 changes: 4 additions & 6 deletions Assets/Prefabs/LevelOpstacles/GreenPaint.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ GameObject:
m_Component:
- component: {fileID: 4608767035123580}
- component: {fileID: 212397181043079884}
m_Layer: 8
m_Layer: 9
m_Name: GreenPaint
m_TagString: Untagged
m_Icon: {fileID: 0}
Expand All @@ -36,7 +36,7 @@ GameObject:
m_Component:
- component: {fileID: 4452686394988550}
- component: {fileID: 61618752130142434}
m_Layer: 0
m_Layer: 9
m_Name: RightWall
m_TagString: Untagged
m_Icon: {fileID: 0}
Expand All @@ -52,7 +52,7 @@ GameObject:
m_Component:
- component: {fileID: 4059335512991360}
- component: {fileID: 61772414166993062}
m_Layer: 0
m_Layer: 9
m_Name: LeftWall
m_TagString: Untagged
m_Icon: {fileID: 0}
Expand All @@ -69,7 +69,7 @@ GameObject:
- component: {fileID: 4426621194040186}
- component: {fileID: 61418259312958112}
- component: {fileID: 114049862641286256}
m_Layer: 0
m_Layer: 9
m_Name: Trigger
m_TagString: Green
m_Icon: {fileID: 0}
Expand Down Expand Up @@ -227,7 +227,6 @@ SpriteRenderer:
m_Enabled: 1
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
Expand All @@ -243,7 +242,6 @@ SpriteRenderer:
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 0
m_SelectedEditorRenderState: 0
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ GameObject:
- component: {fileID: 212918763638959256}
- component: {fileID: 114966503293429476}
- component: {fileID: 61194537501835734}
m_Layer: 0
m_Layer: 9
m_Name: Multiplier
m_TagString: Multiplier
m_Icon: {fileID: 0}
Expand Down Expand Up @@ -120,5 +120,5 @@ SpriteRenderer:
m_Size: {x: 4.6099997, y: 0.8899999}
m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0
m_WasSpriteAssigned: 1
m_WasSpriteAssigned: 0
m_MaskInteraction: 0
36 changes: 32 additions & 4 deletions Assets/Prefabs/LevelOpstacles/SpinnyDing.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ GameObject:
- component: {fileID: 4252796987511964}
- component: {fileID: 212160690801380278}
- component: {fileID: 61350122254529010}
m_Layer: 0
m_Layer: 9
m_Name: GameObject (2)
m_TagString: Untagged
m_Icon: {fileID: 0}
Expand All @@ -37,7 +37,9 @@ GameObject:
m_Component:
- component: {fileID: 4273271135666932}
- component: {fileID: 50558891409495676}
m_Layer: 0
- component: {fileID: 58263060775498444}
- component: {fileID: 114434913654669068}
m_Layer: 9
m_Name: SpinnyDing
m_TagString: Untagged
m_Icon: {fileID: 0}
Expand All @@ -54,7 +56,7 @@ GameObject:
- component: {fileID: 4222797516256432}
- component: {fileID: 212125819995520674}
- component: {fileID: 61085075849809964}
m_Layer: 0
m_Layer: 9
m_Name: GameObject (3)
m_TagString: Untagged
m_Icon: {fileID: 0}
Expand Down Expand Up @@ -94,7 +96,7 @@ Transform:
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1730485605309694}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -0.03, y: -1.08, z: 0}
m_LocalPosition: {x: -3.2177303, y: -7.19, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 4252796987511964}
Expand Down Expand Up @@ -122,6 +124,21 @@ Rigidbody2D:
m_SleepingMode: 1
m_CollisionDetection: 1
m_Constraints: 3
--- !u!58 &58263060775498444
CircleCollider2D:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1730485605309694}
m_Enabled: 1
m_Density: 1
m_Material: {fileID: 0}
m_IsTrigger: 1
m_UsedByEffector: 0
m_UsedByComposite: 0
m_Offset: {x: 0, y: 0}
serializedVersion: 2
m_Radius: 1.6
--- !u!61 &61085075849809964
BoxCollider2D:
m_ObjectHideFlags: 1
Expand Down Expand Up @@ -172,6 +189,17 @@ BoxCollider2D:
serializedVersion: 2
m_Size: {x: 1.7666667, y: 0.24333334}
m_EdgeRadius: 0
--- !u!114 &114434913654669068
MonoBehaviour:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1730485605309694}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 252c856c61f731348835880834ce7517, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!212 &212125819995520674
SpriteRenderer:
m_ObjectHideFlags: 1
Expand Down
4 changes: 3 additions & 1 deletion Assets/Prefabs/balls/Blue.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ GameObject:
- component: {fileID: 114856406163422654}
- component: {fileID: 61795682242879282}
- component: {fileID: 58724480628618474}
m_Layer: 0
m_Layer: 11
m_Name: Blue
m_TagString: Ball
m_Icon: {fileID: 0}
Expand Down Expand Up @@ -115,7 +115,9 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: bddc5a2d02691471bacab127605152e3, type: 3}
m_Name:
m_EditorClassIdentifier:
painted: 0
GhostBall: {fileID: 1118720360438174, guid: 38c7fad19737da2478f832de202fe85b, type: 2}
isDead: 0
--- !u!212 &212951391944248036
SpriteRenderer:
m_ObjectHideFlags: 1
Expand Down
2 changes: 1 addition & 1 deletion Assets/Prefabs/balls/DemoWhite.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ GameObject:
- component: {fileID: 61773102026118022}
- component: {fileID: 58030177317385052}
- component: {fileID: 114303603314580050}
m_Layer: 0
m_Layer: 11
m_Name: DemoWhite
m_TagString: Ball
m_Icon: {fileID: 0}
Expand Down
4 changes: 3 additions & 1 deletion Assets/Prefabs/balls/Green.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ GameObject:
- component: {fileID: 114540664210402994}
- component: {fileID: 61667239311915710}
- component: {fileID: 58780556329637438}
m_Layer: 0
m_Layer: 11
m_Name: Green
m_TagString: Ball
m_Icon: {fileID: 0}
Expand Down Expand Up @@ -115,7 +115,9 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: bddc5a2d02691471bacab127605152e3, type: 3}
m_Name:
m_EditorClassIdentifier:
painted: 0
GhostBall: {fileID: 1815695007746654, guid: e9717c0dca609174397d191649ba18d8, type: 2}
isDead: 0
--- !u!212 &212465493498537502
SpriteRenderer:
m_ObjectHideFlags: 1
Expand Down
4 changes: 3 additions & 1 deletion Assets/Prefabs/balls/Orange.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ GameObject:
- component: {fileID: 114982146219225190}
- component: {fileID: 61651587634095868}
- component: {fileID: 58811185572618346}
m_Layer: 0
m_Layer: 11
m_Name: Orange
m_TagString: Ball
m_Icon: {fileID: 0}
Expand Down Expand Up @@ -115,7 +115,9 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: bddc5a2d02691471bacab127605152e3, type: 3}
m_Name:
m_EditorClassIdentifier:
painted: 0
GhostBall: {fileID: 1346637605302966, guid: b55310fe6696aa449a0c887a32794252, type: 2}
isDead: 0
--- !u!212 &212533332308966528
SpriteRenderer:
m_ObjectHideFlags: 1
Expand Down
4 changes: 3 additions & 1 deletion Assets/Prefabs/balls/Pink.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ GameObject:
- component: {fileID: 114270952693092350}
- component: {fileID: 61619419345928026}
- component: {fileID: 58813477922634694}
m_Layer: 0
m_Layer: 11
m_Name: Pink
m_TagString: Ball
m_Icon: {fileID: 0}
Expand Down Expand Up @@ -115,7 +115,9 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: bddc5a2d02691471bacab127605152e3, type: 3}
m_Name:
m_EditorClassIdentifier:
painted: 0
GhostBall: {fileID: 1328428696864192, guid: e5cc386ffa1c4d445b6725b8fcf59f7d, type: 2}
isDead: 0
--- !u!212 &212046036226989934
SpriteRenderer:
m_ObjectHideFlags: 1
Expand Down
4 changes: 3 additions & 1 deletion Assets/Prefabs/balls/Purple.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ GameObject:
- component: {fileID: 114406207661636102}
- component: {fileID: 61271614459313860}
- component: {fileID: 58695169892276780}
m_Layer: 0
m_Layer: 11
m_Name: Purple
m_TagString: Ball
m_Icon: {fileID: 0}
Expand Down Expand Up @@ -115,7 +115,9 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: bddc5a2d02691471bacab127605152e3, type: 3}
m_Name:
m_EditorClassIdentifier:
painted: 0
GhostBall: {fileID: 1062766603258220, guid: 36555f412fceb6642b302394be99b814, type: 2}
isDead: 0
--- !u!212 &212510467642300806
SpriteRenderer:
m_ObjectHideFlags: 1
Expand Down
4 changes: 3 additions & 1 deletion Assets/Prefabs/balls/White.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ GameObject:
- component: {fileID: 114037711357325586}
- component: {fileID: 61046146932272828}
- component: {fileID: 58038630921590622}
m_Layer: 0
m_Layer: 11
m_Name: White
m_TagString: Ball
m_Icon: {fileID: 0}
Expand Down Expand Up @@ -115,7 +115,9 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: bddc5a2d02691471bacab127605152e3, type: 3}
m_Name:
m_EditorClassIdentifier:
painted: 0
GhostBall: {fileID: 1453882086366866, guid: 03432d5f6e8c2db42af129740a1124ed, type: 2}
isDead: 0
--- !u!212 &212713566929360780
SpriteRenderer:
m_ObjectHideFlags: 1
Expand Down
Loading

0 comments on commit 19e879f

Please sign in to comment.