Skip to content

Commit

Permalink
Fixes for Games (#126)
Browse files Browse the repository at this point in the history 
* Camera fixes:

* Level 3,9 fixes

* lvl 9 pause added

* Removed cancel button

* Start Screen fixed
  • Loading branch information
@Bharath1998
Bharath1998 authored Nov 26, 2022
1 parent 1ca617c commit 6636b64
Show file tree
Hide file tree
Showing 11 changed files with 65 additions and 822 deletions.
223 changes: 4 additions & 219 deletions Assets/Scenes/Final_Level2.unity
View file
Original file line number Diff line number Diff line change
Expand Up @@ -886,7 +886,7 @@ Camera:
far clip plane: 1000
field of view: 60
orthographic: 1
orthographic size: 14
orthographic size: 15
m_Depth: -1
m_CullingMask:
serializedVersion: 2
Expand Down Expand Up @@ -1884,7 +1884,6 @@ RectTransform:
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 2067048587}
- {fileID: 778036302}
- {fileID: 286674434}
- {fileID: 722563904}
- {fileID: 1582260847}
Expand Down Expand Up @@ -2424,7 +2423,7 @@ RectTransform:
- {fileID: 826170259}
- {fileID: 241711138}
m_Father: {fileID: 258604308}
m_RootOrder: 2
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
Expand Down Expand Up @@ -6969,7 +6968,7 @@ RectTransform:
- {fileID: 208207246}
- {fileID: 1386535226}
m_Father: {fileID: 258604308}
m_RootOrder: 3
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
Expand Down Expand Up @@ -9041,144 +9040,6 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 777111814}
m_CullTransparentMesh: 0
--- !u!1 &778036301
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 778036302}
- component: {fileID: 778036306}
- component: {fileID: 778036305}
- component: {fileID: 778036304}
- component: {fileID: 778036303}
m_Layer: 5
m_Name: Button_Close
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &778036302
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 778036301}
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_ConstrainProportionsScale: 0
m_Children:
- {fileID: 1592841523}
m_Father: {fileID: 258604308}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: -39.30005, y: -42.500946}
m_SizeDelta: {x: 104, y: 110}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &778036303
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 778036301}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: cfabb0440166ab443bba8876756fdfa9, type: 3}
m_Name:
m_EditorClassIdentifier:
m_EffectColor: {r: 0, g: 0, b: 0, a: 0.101960786}
m_EffectDistance: {x: 0, y: -10}
m_UseGraphicAlpha: 1
--- !u!114 &778036304
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 778036301}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Navigation:
m_Mode: 3
m_WrapAround: 0
m_SelectOnUp: {fileID: 0}
m_SelectOnDown: {fileID: 0}
m_SelectOnLeft: {fileID: 0}
m_SelectOnRight: {fileID: 0}
m_Transition: 1
m_Colors:
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
m_ColorMultiplier: 1
m_FadeDuration: 0.1
m_SpriteState:
m_HighlightedSprite: {fileID: 0}
m_PressedSprite: {fileID: 0}
m_SelectedSprite: {fileID: 0}
m_DisabledSprite: {fileID: 0}
m_AnimationTriggers:
m_NormalTrigger: Normal
m_HighlightedTrigger: Highlighted
m_PressedTrigger: Pressed
m_SelectedTrigger: Selected
m_DisabledTrigger: Disabled
m_Interactable: 1
m_TargetGraphic: {fileID: 778036305}
m_OnClick:
m_PersistentCalls:
m_Calls: []
--- !u!114 &778036305
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 778036301}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: b66b96c6acb4f456898d981f7bc06784, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!222 &778036306
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 778036301}
m_CullTransparentMesh: 0
--- !u!1 &781214396
GameObject:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -14281,7 +14142,7 @@ RectTransform:
- {fileID: 173388159}
- {fileID: 1142497226}
m_Father: {fileID: 258604308}
m_RootOrder: 4
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
Expand Down Expand Up @@ -14623,82 +14484,6 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1588799791}
m_CullTransparentMesh: 1
--- !u!1 &1592841522
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1592841523}
- component: {fileID: 1592841525}
- component: {fileID: 1592841524}
m_Layer: 5
m_Name: Icon
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1592841523
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1592841522}
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_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 778036302}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 1.3, y: 1.1}
m_SizeDelta: {x: 41, y: 41}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1592841524
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1592841522}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: b8b989f3e09bf4a00bf053c4a44bb82e, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!222 &1592841525
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1592841522}
m_CullTransparentMesh: 0
--- !u!1001 &1609513086
PrefabInstance:
m_ObjectHideFlags: 0
Expand Down
2 changes: 1 addition & 1 deletion Assets/Scenes/Level 1.unity
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5272,7 +5272,7 @@ Camera:
far clip plane: 1000
field of view: 60
orthographic: 1
orthographic size: 14
orthographic size: 15
m_Depth: -1
m_CullingMask:
serializedVersion: 2
Expand Down
22 changes: 11 additions & 11 deletions Assets/Scenes/Level 3.unity
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7187,7 +7187,7 @@ Camera:
far clip plane: 1000
field of view: 60
orthographic: 1
orthographic size: 14
orthographic size: 15
m_Depth: -1
m_CullingMask:
serializedVersion: 2
Expand Down Expand Up @@ -9782,9 +9782,9 @@ RectTransform:
m_Father: {fileID: 768147580}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 726.6666, y: -106.5}
m_SizeDelta: {x: 260, y: 210.4079}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1168090903
Expand Down Expand Up @@ -10757,7 +10757,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!114 &1339920993
MonoBehaviour:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -16396,9 +16396,9 @@ RectTransform:
m_Father: {fileID: 768147580}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 133.33333, y: -106.5}
m_SizeDelta: {x: 260, y: 210.4079}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1733905245
Expand Down Expand Up @@ -16993,9 +16993,9 @@ RectTransform:
m_Father: {fileID: 768147580}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 430, y: -106.5}
m_SizeDelta: {x: 260, y: 210.4079}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1806974408
Expand Down
Loading

0 comments on commit 6636b64

Please sign in to comment.