diff --git a/Assets/Prefabs/Bug.prefab b/Assets/Prefabs/Bug.prefab index 3372fb4..3f9f735 100644 --- a/Assets/Prefabs/Bug.prefab +++ b/Assets/Prefabs/Bug.prefab @@ -145,7 +145,7 @@ Transform: m_GameObject: {fileID: 1887677565572348} 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_LocalScale: {x: 1.3, y: 1.3, z: 1} m_Children: - {fileID: 4193287044024648} - {fileID: 4528190223728408} diff --git a/Assets/Prefabs/Player.prefab b/Assets/Prefabs/Player.prefab index 082c5f3..53f2126 100644 --- a/Assets/Prefabs/Player.prefab +++ b/Assets/Prefabs/Player.prefab @@ -482,7 +482,7 @@ MonoBehaviour: turnSpeed: 2 drift: 1 brake: 2 - maxBrakeTime: 15 + maxBrakeTime: 20 accelerationTime: 2.115 decelerationTime: 1.2346 --- !u!198 &198306026557504490 diff --git a/Assets/Prefabs/SlimeBullet.prefab b/Assets/Prefabs/SlimeBullet.prefab index 5e38fb9..42a015b 100644 --- a/Assets/Prefabs/SlimeBullet.prefab +++ b/Assets/Prefabs/SlimeBullet.prefab @@ -38,7 +38,7 @@ Transform: m_GameObject: {fileID: 1340970730445882} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.15, y: 0.15, z: 1} + m_LocalScale: {x: 0.25, y: 0.25, z: 1} m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0 @@ -99,7 +99,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0cfff064e4589e34cb5b415dcc016dc1, type: 3} m_Name: m_EditorClassIdentifier: - speed: 8 + speed: 5 damage: 0 start: 0 --- !u!212 &212627463552776370 diff --git a/Assets/Prefabs/Spider.prefab b/Assets/Prefabs/Spider.prefab index 1e70bd9..a6b8f33 100644 --- a/Assets/Prefabs/Spider.prefab +++ b/Assets/Prefabs/Spider.prefab @@ -129,7 +129,7 @@ Transform: m_GameObject: {fileID: 1427119512090924} 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_LocalScale: {x: 2.5, y: 2.5, z: 1} m_Children: - {fileID: 4630971220485204} - {fileID: 4211621010230988} diff --git a/Assets/Prefabs/Tiles/rock.prefab b/Assets/Prefabs/Tiles/rock.prefab index 4df6c92..03cce7a 100644 --- a/Assets/Prefabs/Tiles/rock.prefab +++ b/Assets/Prefabs/Tiles/rock.prefab @@ -23,7 +23,7 @@ GameObject: - component: {fileID: 61891926131160174} m_Layer: 0 m_Name: rock - m_TagString: wall + m_TagString: rock m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 diff --git a/Assets/Prefabs/Tiles/rockD.prefab b/Assets/Prefabs/Tiles/rockD.prefab index c80a1a1..3b3f577 100644 --- a/Assets/Prefabs/Tiles/rockD.prefab +++ b/Assets/Prefabs/Tiles/rockD.prefab @@ -23,7 +23,7 @@ GameObject: - component: {fileID: 61798303579644032} m_Layer: 0 m_Name: rockD - m_TagString: wall + m_TagString: rock m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 diff --git a/Assets/Prefabs/Tiles/rockDL.prefab b/Assets/Prefabs/Tiles/rockDL.prefab index 9ce7eb4..4328552 100644 --- a/Assets/Prefabs/Tiles/rockDL.prefab +++ b/Assets/Prefabs/Tiles/rockDL.prefab @@ -23,7 +23,7 @@ GameObject: - component: {fileID: 61362440249651478} m_Layer: 0 m_Name: rockDL - m_TagString: wall + m_TagString: rock m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 diff --git a/Assets/Prefabs/Tiles/rockDLU.prefab b/Assets/Prefabs/Tiles/rockDLU.prefab index 2ecc283..7f6f8c1 100644 --- a/Assets/Prefabs/Tiles/rockDLU.prefab +++ b/Assets/Prefabs/Tiles/rockDLU.prefab @@ -23,7 +23,7 @@ GameObject: - component: {fileID: 61364379581901728} m_Layer: 0 m_Name: rockDLU - m_TagString: wall + m_TagString: rock m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 diff --git a/Assets/Prefabs/Tiles/rockDLUR.prefab b/Assets/Prefabs/Tiles/rockDLUR.prefab index 2e0c08d..2f66869 100644 --- a/Assets/Prefabs/Tiles/rockDLUR.prefab +++ b/Assets/Prefabs/Tiles/rockDLUR.prefab @@ -23,7 +23,7 @@ GameObject: - component: {fileID: 61031428949727204} m_Layer: 0 m_Name: rockDLUR - m_TagString: wall + m_TagString: rock m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 diff --git a/Assets/Prefabs/Tiles/rockDU.prefab b/Assets/Prefabs/Tiles/rockDU.prefab index 508358c..6476f48 100644 --- a/Assets/Prefabs/Tiles/rockDU.prefab +++ b/Assets/Prefabs/Tiles/rockDU.prefab @@ -23,7 +23,7 @@ GameObject: - component: {fileID: 61867638451973766} m_Layer: 0 m_Name: rockDU - m_TagString: wall + m_TagString: rock m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 diff --git a/Assets/Prefabs/Tiles/rockL.prefab b/Assets/Prefabs/Tiles/rockL.prefab index 1322fc9..6ee6939 100644 --- a/Assets/Prefabs/Tiles/rockL.prefab +++ b/Assets/Prefabs/Tiles/rockL.prefab @@ -23,7 +23,7 @@ GameObject: - component: {fileID: 61829153926485560} m_Layer: 0 m_Name: rockL - m_TagString: wall + m_TagString: rock m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 diff --git a/Assets/Prefabs/Tiles/rockLR.prefab b/Assets/Prefabs/Tiles/rockLR.prefab index 3652e33..db8b76c 100644 --- a/Assets/Prefabs/Tiles/rockLR.prefab +++ b/Assets/Prefabs/Tiles/rockLR.prefab @@ -23,7 +23,7 @@ GameObject: - component: {fileID: 61236632091580028} m_Layer: 0 m_Name: rockLR - m_TagString: wall + m_TagString: rock m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 diff --git a/Assets/Prefabs/Tiles/rockLU.prefab b/Assets/Prefabs/Tiles/rockLU.prefab index 8694778..d44f3c9 100644 --- a/Assets/Prefabs/Tiles/rockLU.prefab +++ b/Assets/Prefabs/Tiles/rockLU.prefab @@ -23,7 +23,7 @@ GameObject: - component: {fileID: 61902424584989724} m_Layer: 0 m_Name: rockLU - m_TagString: wall + m_TagString: rock m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 diff --git a/Assets/Prefabs/Tiles/rockLUR.prefab b/Assets/Prefabs/Tiles/rockLUR.prefab index 4cb797f..6cfae4c 100644 --- a/Assets/Prefabs/Tiles/rockLUR.prefab +++ b/Assets/Prefabs/Tiles/rockLUR.prefab @@ -23,7 +23,7 @@ GameObject: - component: {fileID: 61035825138540804} m_Layer: 0 m_Name: rockLUR - m_TagString: wall + m_TagString: rock m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 diff --git a/Assets/Prefabs/Tiles/rockR.prefab b/Assets/Prefabs/Tiles/rockR.prefab index 2a7d5a0..c06fa39 100644 --- a/Assets/Prefabs/Tiles/rockR.prefab +++ b/Assets/Prefabs/Tiles/rockR.prefab @@ -23,7 +23,7 @@ GameObject: - component: {fileID: 61456461862167858} m_Layer: 0 m_Name: rockR - m_TagString: wall + m_TagString: rock m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 diff --git a/Assets/Prefabs/Tiles/rockRD.prefab b/Assets/Prefabs/Tiles/rockRD.prefab index b36a94e..1d053d5 100644 --- a/Assets/Prefabs/Tiles/rockRD.prefab +++ b/Assets/Prefabs/Tiles/rockRD.prefab @@ -23,7 +23,7 @@ GameObject: - component: {fileID: 61341370786779490} m_Layer: 0 m_Name: rockRD - m_TagString: wall + m_TagString: rock m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 diff --git a/Assets/Prefabs/Tiles/rockRDL.prefab b/Assets/Prefabs/Tiles/rockRDL.prefab index 6f38382..94d329b 100644 --- a/Assets/Prefabs/Tiles/rockRDL.prefab +++ b/Assets/Prefabs/Tiles/rockRDL.prefab @@ -23,7 +23,7 @@ GameObject: - component: {fileID: 61487560770014174} m_Layer: 0 m_Name: rockRDL - m_TagString: wall + m_TagString: rock m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 diff --git a/Assets/Prefabs/Tiles/rockU.prefab b/Assets/Prefabs/Tiles/rockU.prefab index 2a32832..1e7f1aa 100644 --- a/Assets/Prefabs/Tiles/rockU.prefab +++ b/Assets/Prefabs/Tiles/rockU.prefab @@ -23,7 +23,7 @@ GameObject: - component: {fileID: 61699217941965386} m_Layer: 0 m_Name: rockU - m_TagString: wall + m_TagString: rock m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 diff --git a/Assets/Prefabs/Tiles/rockUR.prefab b/Assets/Prefabs/Tiles/rockUR.prefab index f9e31d7..6cca9dd 100644 --- a/Assets/Prefabs/Tiles/rockUR.prefab +++ b/Assets/Prefabs/Tiles/rockUR.prefab @@ -23,7 +23,7 @@ GameObject: - component: {fileID: 61699965863900698} m_Layer: 0 m_Name: rockUR - m_TagString: wall + m_TagString: rock m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 diff --git a/Assets/Prefabs/Tiles/rockURD.prefab b/Assets/Prefabs/Tiles/rockURD.prefab index 7b6889c..a796c1e 100644 --- a/Assets/Prefabs/Tiles/rockURD.prefab +++ b/Assets/Prefabs/Tiles/rockURD.prefab @@ -23,7 +23,7 @@ GameObject: - component: {fileID: 61660594946959392} m_Layer: 0 m_Name: rockURD - m_TagString: wall + m_TagString: rock m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 diff --git a/Assets/Prefabs/UI.prefab b/Assets/Prefabs/UI.prefab index e880894..e8b05e5 100644 --- a/Assets/Prefabs/UI.prefab +++ b/Assets/Prefabs/UI.prefab @@ -260,6 +260,8 @@ GameObject: - component: {fileID: 114474847320342008} - component: {fileID: 114289704439636748} - component: {fileID: 114357770329230070} + - component: {fileID: 114056294736790042} + - component: {fileID: 114768702460390076} m_Layer: 5 m_Name: MessagePanel m_TagString: Untagged @@ -362,6 +364,7 @@ GameObject: - component: {fileID: 114395085421692120} - component: {fileID: 114700265308343224} - component: {fileID: 114325107130871454} + - component: {fileID: 114935065996460616} m_Layer: 5 m_Name: MessageText m_TagString: Untagged @@ -552,7 +555,7 @@ MonoBehaviour: 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_HighlightedColor: {r: 0.7075472, g: 0.7075472, b: 0.7075472, a: 1} m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} m_ColorMultiplier: 1 @@ -636,6 +639,19 @@ MonoBehaviour: m_CallState: 2 m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null +--- !u!114 &114056294736790042 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1738841749900334} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 2 + m_VerticalFit: 0 --- !u!114 &114060586777901180 MonoBehaviour: m_ObjectHideFlags: 1 @@ -753,11 +769,11 @@ MonoBehaviour: m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 17 + m_Font: {fileID: 12800000, guid: 12f77943eccfc5e47ae5cdb66e214d9f, type: 3} + m_FontSize: 20 m_FontStyle: 0 m_BestFit: 0 - m_MinSize: 1 + m_MinSize: 0 m_MaxSize: 40 m_Alignment: 4 m_AlignByGeometry: 0 @@ -849,14 +865,14 @@ MonoBehaviour: m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 40 - m_FontStyle: 1 - m_BestFit: 0 + m_Font: {fileID: 12800000, guid: 3823bf7b0b0a6aa4b8d23a5aa57a18d5, type: 3} + m_FontSize: 80 + m_FontStyle: 0 + m_BestFit: 1 m_MinSize: 4 - m_MaxSize: 40 + m_MaxSize: 80 m_Alignment: 4 - m_AlignByGeometry: 0 + m_AlignByGeometry: 1 m_RichText: 1 m_HorizontalOverflow: 1 m_VerticalOverflow: 1 @@ -895,7 +911,7 @@ MonoBehaviour: 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_HighlightedColor: {r: 0.8018868, g: 0.8018868, b: 0.8018868, a: 1} m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} m_ColorMultiplier: 1 @@ -1147,10 +1163,10 @@ MonoBehaviour: m_FillRect: {fileID: 224030602021903918} m_HandleRect: {fileID: 224899125652206328} m_Direction: 0 - m_MinValue: 0 - m_MaxValue: 100 + m_MinValue: -60 + m_MaxValue: 20 m_WholeNumbers: 0 - m_Value: 70 + m_Value: 0 m_OnValueChanged: m_PersistentCalls: m_Calls: @@ -1198,8 +1214,8 @@ MonoBehaviour: m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 30 + m_Font: {fileID: 12800000, guid: 12f77943eccfc5e47ae5cdb66e214d9f, type: 3} + m_FontSize: 35 m_FontStyle: 1 m_BestFit: 0 m_MinSize: 3 @@ -1245,11 +1261,11 @@ MonoBehaviour: m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 14 + m_Font: {fileID: 12800000, guid: 12f77943eccfc5e47ae5cdb66e214d9f, type: 3} + m_FontSize: 20 m_FontStyle: 1 m_BestFit: 0 - m_MinSize: 10 + m_MinSize: 2 m_MaxSize: 40 m_Alignment: 4 m_AlignByGeometry: 0 @@ -1364,15 +1380,15 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 0.3726415, b: 0.3726415, a: 0.392} + m_Color: {r: 0.8113208, g: 0.8113208, b: 0.8113208, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 + m_Sprite: {fileID: 21300000, guid: 106ee2c5b569c9a4489a53f7c09ec01d, type: 3} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -1406,6 +1422,28 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 +--- !u!114 &114768702460390076 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1738841749900334} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -405508275, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 10 + m_Right: 10 + m_Top: 10 + m_Bottom: 10 + m_ChildAlignment: 4 + m_Spacing: 10 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 1 + m_ChildControlWidth: 1 + m_ChildControlHeight: 1 --- !u!114 &114829834214915798 MonoBehaviour: m_ObjectHideFlags: 1 @@ -1471,6 +1509,19 @@ MonoBehaviour: m_FallbackScreenDPI: 96 m_DefaultSpriteDPI: 96 m_DynamicPixelsPerUnit: 1 +--- !u!114 &114935065996460616 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1783803660317794} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 2 + m_VerticalFit: 0 --- !u!114 &114956533738794260 MonoBehaviour: m_ObjectHideFlags: 1 @@ -1491,14 +1542,14 @@ MonoBehaviour: m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 40 - m_FontStyle: 1 - m_BestFit: 0 + m_Font: {fileID: 12800000, guid: 3823bf7b0b0a6aa4b8d23a5aa57a18d5, type: 3} + m_FontSize: 80 + m_FontStyle: 0 + m_BestFit: 1 m_MinSize: 4 - m_MaxSize: 40 + m_MaxSize: 80 m_Alignment: 4 - m_AlignByGeometry: 0 + m_AlignByGeometry: 1 m_RichText: 1 m_HorizontalOverflow: 1 m_VerticalOverflow: 1 @@ -1524,12 +1575,12 @@ MonoBehaviour: m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 40 - m_FontStyle: 1 + m_Font: {fileID: 12800000, guid: 3823bf7b0b0a6aa4b8d23a5aa57a18d5, type: 3} + m_FontSize: 250 + m_FontStyle: 0 m_BestFit: 0 - m_MinSize: 4 - m_MaxSize: 40 + m_MinSize: 0 + m_MaxSize: 300 m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 @@ -1776,15 +1827,15 @@ RectTransform: m_GameObject: {fileID: 1160732466323946} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.4, y: 0.4, z: 1} + m_LocalScale: {x: 0.3, y: 0.3, z: 1} m_Children: [] m_Father: {fileID: 224827547678119310} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchoredPosition: {x: 0.97, y: -0} + m_SizeDelta: {x: 194.2, y: 21.3} m_Pivot: {x: 0.5, y: 0.5} --- !u!224 &224075842277440546 RectTransform: @@ -1819,8 +1870,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchoredPosition: {x: 0.8, y: -0.23} + m_SizeDelta: {x: 196.21, y: 18.18} m_Pivot: {x: 0.5, y: 0.5} --- !u!224 &224138068996382362 RectTransform: @@ -1853,10 +1904,10 @@ RectTransform: m_Father: {fileID: 224035875368067210} 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: 39.513885, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 38.545288, y: -25} + m_SizeDelta: {x: 0, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!224 &224218339018349506 RectTransform: @@ -1870,12 +1921,12 @@ RectTransform: m_Children: - {fileID: 224104588010532506} m_Father: {fileID: 224484966753135898} - m_RootOrder: 2 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 1} - m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: -235.94} - m_SizeDelta: {x: 160, y: 40} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0.000012398, y: -156.9} + m_SizeDelta: {x: 254.9, y: 63.8} m_Pivot: {x: 0.5, y: 0.5} --- !u!224 &224351136746992674 RectTransform: @@ -1924,8 +1975,8 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 224539401731723566} - - {fileID: 224827547678119310} - {fileID: 224218339018349506} + - {fileID: 224827547678119310} m_Father: {fileID: 224011665836974194} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1963,15 +2014,15 @@ RectTransform: m_GameObject: {fileID: 1491047117667172} 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_LocalScale: {x: 0.4, y: 0.3, z: 1} m_Children: [] m_Father: {fileID: 224484966753135898} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 1} - m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: -94.8} - m_SizeDelta: {x: 160, y: 30} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 1.100029, y: 84.00001} + m_SizeDelta: {x: 873.6, y: 295} m_Pivot: {x: 0.5, y: 0.5} --- !u!224 &224578694025659052 RectTransform: @@ -2120,12 +2171,12 @@ RectTransform: m_Children: - {fileID: 224071502787034986} m_Father: {fileID: 224484966753135898} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 1} - m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: -167.24} - m_SizeDelta: {x: 160, y: 40} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0.0000061989, y: -73.8} + m_SizeDelta: {x: 272.7, y: 68.2} m_Pivot: {x: 0.5, y: 0.5} --- !u!224 &224833383346886274 RectTransform: diff --git a/Assets/Scenes/CodeDEV.unity b/Assets/Scenes/CodeDEV.unity index 6530665..9d0ffe0 100644 --- a/Assets/Scenes/CodeDEV.unity +++ b/Assets/Scenes/CodeDEV.unity @@ -519,24 +519,6 @@ AudioSource: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 ---- !u!1 &679787156 stripped -GameObject: - m_PrefabParentObject: {fileID: 1783803660317794, guid: 460d856ea4eb14cedb5fecde1fe6d743, - type: 2} - m_PrefabInternal: {fileID: 1379476068} ---- !u!114 &679787158 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 679787156} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_HorizontalFit: 2 - m_VerticalFit: 0 --- !u!1 &734498091 GameObject: m_ObjectHideFlags: 0 @@ -1440,101 +1422,21 @@ Prefab: propertyPath: m_Pivot.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 114516921110256910, guid: 460d856ea4eb14cedb5fecde1fe6d743, + type: 2} + propertyPath: m_OnValueChanged.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 881384373} - target: {fileID: 114052756276606012, guid: 460d856ea4eb14cedb5fecde1fe6d743, type: 2} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target value: objectReference: {fileID: 2063368133} - - target: {fileID: 224030602021903918, guid: 460d856ea4eb14cedb5fecde1fe6d743, - type: 2} - propertyPath: m_AnchorMax.x - value: 0.7 - objectReference: {fileID: 0} - - target: {fileID: 224030602021903918, guid: 460d856ea4eb14cedb5fecde1fe6d743, - type: 2} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 224899125652206328, guid: 460d856ea4eb14cedb5fecde1fe6d743, - type: 2} - propertyPath: m_AnchorMin.x - value: 0.7 - objectReference: {fileID: 0} - - target: {fileID: 224899125652206328, guid: 460d856ea4eb14cedb5fecde1fe6d743, - type: 2} - propertyPath: m_AnchorMax.x - value: 0.7 - objectReference: {fileID: 0} - - target: {fileID: 224899125652206328, guid: 460d856ea4eb14cedb5fecde1fe6d743, - type: 2} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1139220909146914, guid: 460d856ea4eb14cedb5fecde1fe6d743, type: 2} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 224899125652206328, guid: 460d856ea4eb14cedb5fecde1fe6d743, - type: 2} - propertyPath: m_LocalScale.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 224899125652206328, guid: 460d856ea4eb14cedb5fecde1fe6d743, - type: 2} - propertyPath: m_LocalScale.x - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 114077156432934238, guid: 460d856ea4eb14cedb5fecde1fe6d743, - type: 2} - propertyPath: m_Sprite - value: - objectReference: {fileID: 21300000, guid: 271a63eb548b41e489d3338148bb0cb5, - type: 3} - - target: {fileID: 114829834214915798, guid: 460d856ea4eb14cedb5fecde1fe6d743, - type: 2} - propertyPath: m_Color.r - value: 0.32156864 - objectReference: {fileID: 0} - - target: {fileID: 114829834214915798, guid: 460d856ea4eb14cedb5fecde1fe6d743, - type: 2} - propertyPath: m_Color.g - value: 0.2901961 - objectReference: {fileID: 0} - - target: {fileID: 114829834214915798, guid: 460d856ea4eb14cedb5fecde1fe6d743, - type: 2} - propertyPath: m_Color.b - value: 0.2901961 - objectReference: {fileID: 0} - - target: {fileID: 114660984839350690, guid: 460d856ea4eb14cedb5fecde1fe6d743, - type: 2} - propertyPath: m_Color.r - value: 0.24528301 - objectReference: {fileID: 0} - - target: {fileID: 114660984839350690, guid: 460d856ea4eb14cedb5fecde1fe6d743, - type: 2} - propertyPath: m_Color.g - value: 0.2233001 - objectReference: {fileID: 0} - - target: {fileID: 114660984839350690, guid: 460d856ea4eb14cedb5fecde1fe6d743, - type: 2} - propertyPath: m_Color.b - value: 0.2233001 - objectReference: {fileID: 0} - - target: {fileID: 224150154901314796, guid: 460d856ea4eb14cedb5fecde1fe6d743, - type: 2} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - target: {fileID: 224150154901314796, guid: 460d856ea4eb14cedb5fecde1fe6d743, type: 2} propertyPath: m_AnchorMin.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 224150154901314796, guid: 460d856ea4eb14cedb5fecde1fe6d743, - type: 2} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - target: {fileID: 224150154901314796, guid: 460d856ea4eb14cedb5fecde1fe6d743, type: 2} propertyPath: m_AnchorMax.y @@ -1550,218 +1452,22 @@ Prefab: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 114474847320342008, guid: 460d856ea4eb14cedb5fecde1fe6d743, + - target: {fileID: 224150154901314796, guid: 460d856ea4eb14cedb5fecde1fe6d743, type: 2} - propertyPath: m_Sprite - value: - objectReference: {fileID: 0} - - target: {fileID: 114474847320342008, guid: 460d856ea4eb14cedb5fecde1fe6d743, - type: 2} - propertyPath: m_Type - value: 1 + propertyPath: m_SizeDelta.y + value: 0 objectReference: {fileID: 0} - target: {fileID: 224150154901314796, guid: 460d856ea4eb14cedb5fecde1fe6d743, type: 2} propertyPath: m_SizeDelta.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 224150154901314796, guid: 460d856ea4eb14cedb5fecde1fe6d743, - type: 2} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 114373005502633030, guid: 460d856ea4eb14cedb5fecde1fe6d743, - type: 2} - propertyPath: m_HorizontalFit - value: 2 - objectReference: {fileID: 0} - target: {fileID: 224035875368067210, guid: 460d856ea4eb14cedb5fecde1fe6d743, type: 2} propertyPath: m_SizeDelta.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 114373005502633030, guid: 460d856ea4eb14cedb5fecde1fe6d743, - type: 2} - propertyPath: m_VerticalFit - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 224035875368067210, guid: 460d856ea4eb14cedb5fecde1fe6d743, - type: 2} - propertyPath: m_SizeDelta.y - value: 50 - objectReference: {fileID: 0} - - target: {fileID: 114395085421692120, guid: 460d856ea4eb14cedb5fecde1fe6d743, - type: 2} - propertyPath: m_FontData.m_FontSize - value: 30 - objectReference: {fileID: 0} - - target: {fileID: 114395085421692120, guid: 460d856ea4eb14cedb5fecde1fe6d743, - type: 2} - propertyPath: m_FontData.m_MinSize - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 114395085421692120, guid: 460d856ea4eb14cedb5fecde1fe6d743, - type: 2} - propertyPath: m_FontData.m_HorizontalOverflow - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 114395085421692120, guid: 460d856ea4eb14cedb5fecde1fe6d743, - type: 2} - propertyPath: m_FontData.m_BestFit - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 224150154901314796, guid: 460d856ea4eb14cedb5fecde1fe6d743, - type: 2} - propertyPath: m_LocalScale.x - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 224150154901314796, guid: 460d856ea4eb14cedb5fecde1fe6d743, - type: 2} - propertyPath: m_LocalScale.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 114395085421692120, guid: 460d856ea4eb14cedb5fecde1fe6d743, - type: 2} - propertyPath: m_FontData.m_RichText - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 114395085421692120, guid: 460d856ea4eb14cedb5fecde1fe6d743, - type: 2} - propertyPath: m_FontData.m_VerticalOverflow - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 224035875368067210, guid: 460d856ea4eb14cedb5fecde1fe6d743, - type: 2} - propertyPath: m_AnchoredPosition.y - value: -46.619995 - objectReference: {fileID: 0} - - target: {fileID: 224035875368067210, guid: 460d856ea4eb14cedb5fecde1fe6d743, - type: 2} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 224035875368067210, guid: 460d856ea4eb14cedb5fecde1fe6d743, - type: 2} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 224035875368067210, guid: 460d856ea4eb14cedb5fecde1fe6d743, - type: 2} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 224035875368067210, guid: 460d856ea4eb14cedb5fecde1fe6d743, - type: 2} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 114474847320342008, guid: 460d856ea4eb14cedb5fecde1fe6d743, - type: 2} - propertyPath: m_PreserveAspect - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 224035875368067210, guid: 460d856ea4eb14cedb5fecde1fe6d743, - type: 2} - propertyPath: m_AnchorMin.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 224035875368067210, guid: 460d856ea4eb14cedb5fecde1fe6d743, - type: 2} - propertyPath: m_AnchorMax.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 114395085421692120, guid: 460d856ea4eb14cedb5fecde1fe6d743, - type: 2} - propertyPath: m_Color.a - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 114474847320342008, guid: 460d856ea4eb14cedb5fecde1fe6d743, - type: 2} - propertyPath: m_Color.a - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 114164855268691286, guid: 460d856ea4eb14cedb5fecde1fe6d743, - type: 2} - propertyPath: m_FontData.m_Font - value: - objectReference: {fileID: 12800000, guid: 12f77943eccfc5e47ae5cdb66e214d9f, - type: 3} - - target: {fileID: 114634244626046608, guid: 460d856ea4eb14cedb5fecde1fe6d743, - type: 2} - propertyPath: m_FontData.m_Font - value: - objectReference: {fileID: 12800000, guid: 12f77943eccfc5e47ae5cdb66e214d9f, - type: 3} - - target: {fileID: 114627022317662968, guid: 460d856ea4eb14cedb5fecde1fe6d743, - type: 2} - propertyPath: m_FontData.m_Font - value: - objectReference: {fileID: 12800000, guid: 12f77943eccfc5e47ae5cdb66e214d9f, - type: 3} - - target: {fileID: 114634244626046608, guid: 460d856ea4eb14cedb5fecde1fe6d743, - type: 2} - propertyPath: m_FontData.m_FontSize - value: 20 - objectReference: {fileID: 0} - - target: {fileID: 114634244626046608, guid: 460d856ea4eb14cedb5fecde1fe6d743, - type: 2} - propertyPath: m_FontData.m_MinSize - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 114164855268691286, guid: 460d856ea4eb14cedb5fecde1fe6d743, - type: 2} - propertyPath: m_FontData.m_FontSize - value: 20 - objectReference: {fileID: 0} - - target: {fileID: 114164855268691286, guid: 460d856ea4eb14cedb5fecde1fe6d743, - type: 2} - propertyPath: m_FontData.m_MinSize - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 114627022317662968, guid: 460d856ea4eb14cedb5fecde1fe6d743, - type: 2} - propertyPath: m_FontData.m_FontSize - value: 35 - objectReference: {fileID: 0} - - target: {fileID: 114956533738794260, guid: 460d856ea4eb14cedb5fecde1fe6d743, - type: 2} - propertyPath: m_FontData.m_Font - value: - objectReference: {fileID: 12800000, guid: 12f77943eccfc5e47ae5cdb66e214d9f, - type: 3} - - target: {fileID: 114311258538206922, guid: 460d856ea4eb14cedb5fecde1fe6d743, - type: 2} - propertyPath: m_FontData.m_Font - value: - objectReference: {fileID: 12800000, guid: 12f77943eccfc5e47ae5cdb66e214d9f, - type: 3} - - target: {fileID: 114516921110256910, guid: 460d856ea4eb14cedb5fecde1fe6d743, - type: 2} - propertyPath: m_MinValue - value: -60 - objectReference: {fileID: 0} - - target: {fileID: 114516921110256910, guid: 460d856ea4eb14cedb5fecde1fe6d743, - type: 2} - propertyPath: m_MaxValue - value: 20 - objectReference: {fileID: 0} - - target: {fileID: 114516921110256910, guid: 460d856ea4eb14cedb5fecde1fe6d743, - type: 2} - propertyPath: m_OnValueChanged.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 881384373} - - target: {fileID: 114516921110256910, guid: 460d856ea4eb14cedb5fecde1fe6d743, - type: 2} - propertyPath: m_OnValueChanged.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: SetMasterVolume - objectReference: {fileID: 0} - - target: {fileID: 114516921110256910, guid: 460d856ea4eb14cedb5fecde1fe6d743, - type: 2} - propertyPath: m_Value - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: - - {fileID: 114373005502633030, guid: 460d856ea4eb14cedb5fecde1fe6d743, type: 2} + m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: 460d856ea4eb14cedb5fecde1fe6d743, type: 2} m_IsPrefabParent: 0 --- !u!1 &1379476069 stripped @@ -1769,46 +1475,6 @@ GameObject: m_PrefabParentObject: {fileID: 1998375241450644, guid: 460d856ea4eb14cedb5fecde1fe6d743, type: 2} m_PrefabInternal: {fileID: 1379476068} ---- !u!1 &1379476070 stripped -GameObject: - m_PrefabParentObject: {fileID: 1738841749900334, guid: 460d856ea4eb14cedb5fecde1fe6d743, - type: 2} - m_PrefabInternal: {fileID: 1379476068} ---- !u!114 &1379476071 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1379476070} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_HorizontalFit: 2 - m_VerticalFit: 0 ---- !u!114 &1379476072 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1379476070} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -405508275, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Padding: - m_Left: 10 - m_Right: 10 - m_Top: 10 - m_Bottom: 10 - m_ChildAlignment: 4 - m_Spacing: 10 - m_ChildForceExpandWidth: 1 - m_ChildForceExpandHeight: 1 - m_ChildControlWidth: 1 - m_ChildControlHeight: 1 --- !u!1001 &1543828915 Prefab: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/TitleScene.unity b/Assets/Scenes/TitleScene.unity index 4c5dfc9..cbc6683 100644 --- a/Assets/Scenes/TitleScene.unity +++ b/Assets/Scenes/TitleScene.unity @@ -1206,6 +1206,7 @@ RectTransform: - {fileID: 1100252403} - {fileID: 2026061257} - {fileID: 1321930645} + - {fileID: 1983703758} m_Father: {fileID: 1622722979} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -2503,6 +2504,133 @@ Transform: m_Father: {fileID: 1027617338} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1983703757 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 1983703758} + - component: {fileID: 1983703761} + - component: {fileID: 1983703760} + - component: {fileID: 1983703759} + m_Layer: 5 + m_Name: Mute + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1983703758 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1983703757} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.5, y: 0.5, z: 1} + m_Children: [] + m_Father: {fileID: 626823871} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -9, y: -8} + m_SizeDelta: {x: 321.8, y: 55} + m_Pivot: {x: 1, y: 1} +--- !u!114 &1983703759 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1983703757} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1392445389, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + 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.764151, g: 0.764151, b: 0.764151, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, 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_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 1983703760} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1027617339} + m_MethodName: ToggleMuteMaster + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null +--- !u!114 &1983703760 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1983703757} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.754717, g: 0.754717, b: 0.754717, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 50 + m_FontStyle: 1 + m_BestFit: 0 + m_MinSize: 5 + m_MaxSize: 50 + m_Alignment: 0 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: Mute/Unmute +--- !u!222 &1983703761 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1983703757} --- !u!1 &2015154021 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/AudioControl.cs b/Assets/Scripts/AudioControl.cs index 4c12230..86677c7 100644 --- a/Assets/Scripts/AudioControl.cs +++ b/Assets/Scripts/AudioControl.cs @@ -16,6 +16,7 @@ public class AudioControl : MonoBehaviour private const float lvlbgm = 5.725f; private const float gobgm = 14.157f; private const float loopdelay = 0.025f; + private float prevVolume = -80f; // Use this for initialization void Start() @@ -90,5 +91,12 @@ public class AudioControl : MonoBehaviour { mixer.SetFloat("sfxVolume", Mathf.Clamp(nvol, -80f, 20f)); } + + public void ToggleMuteMaster() { + float t = 0f; + mixer.GetFloat("masterVolume", out t); + SetMasterVolume(prevVolume); + prevVolume = t; + } } diff --git a/Assets/Scripts/Entities/Attack/SingleShot.cs b/Assets/Scripts/Entities/Attack/SingleShot.cs index dbf1129..1eabfed 100644 --- a/Assets/Scripts/Entities/Attack/SingleShot.cs +++ b/Assets/Scripts/Entities/Attack/SingleShot.cs @@ -38,6 +38,10 @@ namespace Assets.Scripts.Entities.Attack { this.bulletPrefab = bullet; } + public void SetRange(int range) { + this.range = range; + } + public void Attack() { if ( bulletPrefab == null ) { Debug.Log("SingleShot: No Prefab defined for Bullet!"); diff --git a/Assets/Scripts/Entities/Bug.cs b/Assets/Scripts/Entities/Bug.cs index 02bb621..fd8fec8 100644 --- a/Assets/Scripts/Entities/Bug.cs +++ b/Assets/Scripts/Entities/Bug.cs @@ -16,12 +16,12 @@ namespace Assets.Scripts.Entities { } protected override void Start() { - base.Start(); - SingleShot s = new SingleShot(this.gameObject); - s.SetCooldown(3); + SingleShot s = new SingleShot(this.gameObject, 8, 3, 8 ); + s.SetRange(3); s.SetPrefab(bullet); s.SetSpawn(bulletSpawn); - SetAttack(s); + SetAttack(s); + base.Start(); } } } diff --git a/Assets/Scripts/Entities/Enemy.cs b/Assets/Scripts/Entities/Enemy.cs index 829f816..43e139d 100644 --- a/Assets/Scripts/Entities/Enemy.cs +++ b/Assets/Scripts/Entities/Enemy.cs @@ -32,12 +32,12 @@ namespace Assets.Scripts.Entities { if ( ply != null ) victim = ply.gameObject; } - - + + if (attack != null) + nextAttackTime = Time.timeSinceLevelLoad + attack.GetCooldownTime() * (UnityEngine.Random.value + 0.5f); } void Update() { - if ( victim == null || attack == null ) { if ( objective != null ) { Player ply = objective.GetPlayer(); @@ -53,8 +53,8 @@ namespace Assets.Scripts.Entities { RaycastHit2D hit = rh.Find(x => x.fraction != 0); if ( hit.collider != null && hit.collider.gameObject == victim ) { Debug.Log("Attacking Player!!!"); - attack.Attack(); - nextAttackTime = Time.timeSinceLevelLoad + attack.GetCooldownTime(); + attack.Attack(); + nextAttackTime = Time.timeSinceLevelLoad + attack.GetCooldownTime() * (UnityEngine.Random.value + 0.25f); } } diff --git a/Assets/Scripts/Entities/Player.cs b/Assets/Scripts/Entities/Player.cs index 1baa1ab..0fe565d 100644 --- a/Assets/Scripts/Entities/Player.cs +++ b/Assets/Scripts/Entities/Player.cs @@ -24,7 +24,11 @@ public class Player : Mob { SetAttack(s); } - void Update() { + void Update() { + if (Input.GetAxis("Reset") > 0) + { + GameController.instance.GetUI().Restart(); + } if ( Time.timeSinceLevelLoad >= nextAttackTime && attack != null) { if ( Input.GetAxis("Fire") > 0 ) { attack.Attack(); @@ -50,7 +54,12 @@ public class Player : Mob { if ( collision.collider.tag == "wall" ) { //InflictDamage(maxHP / 2); Death(); - } else if ( collision.collider.tag == "Enemy" ) { + } else if (collision.collider.tag == "rock") + { + InflictDamage(maxHP / 10); + //Death(); + } + else if ( collision.collider.tag == "Enemy" ) { Mob m = collision.collider.GetComponent(typeof(Mob)) as Mob; if ( m != null ) { //m.InflictDamage(carDamage); diff --git a/Assets/Scripts/Entities/Spider.cs b/Assets/Scripts/Entities/Spider.cs index ae738a5..55f6d54 100644 --- a/Assets/Scripts/Entities/Spider.cs +++ b/Assets/Scripts/Entities/Spider.cs @@ -11,16 +11,17 @@ namespace Assets.Scripts.Entities { [SerializeField] private GameObject bullet; - public Spider() : base(25) { + public Spider() : base(15) { } protected override void Start() { - base.Start(); SingleShot s = new SingleShot(this.gameObject, 25, 4, 2); + s.SetRange(10); s.SetPrefab(bullet); s.SetSpawn(bulletSpawn); - SetAttack(s); + SetAttack(s); + base.Start(); } } } diff --git a/Assets/Scripts/Generation/DungeonGenerator.cs b/Assets/Scripts/Generation/DungeonGenerator.cs index c8ba6f9..43c733b 100644 --- a/Assets/Scripts/Generation/DungeonGenerator.cs +++ b/Assets/Scripts/Generation/DungeonGenerator.cs @@ -457,9 +457,9 @@ public class DungeonGenerator { } float prob2 = 0.04f; if (UnityEngine.Random.value > 1 - prob2 - && x > r.bounds.x +2 + && x > r.bounds.x + 2 && x < r.bounds.x + r.bounds.width-2 - && y > r.bounds.y+2 + && y > r.bounds.y+ 2 && y < r.bounds.y + r.bounds.height-2) { r.spawnpoints.Add(pos); @@ -474,12 +474,14 @@ public class DungeonGenerator { Objective o = null; - int rand = UnityEngine.Random.Range(0, 7); + int rand = UnityEngine.Random.Range(0, 8); switch (rand) { - case 1: { + case 0: + case 7: + { // Scorpion Attack!!!!: List lg = new List(); - int count = Math.Min(UnityEngine.Random.Range(1, ( int ) Mathf.Floor(r.GetSpawnpoints().Count)), 4); + int count = UnityEngine.Random.Range(1, ( int ) Math.Min(Mathf.Floor(r.GetSpawnpoints().Count), 4)); for ( int c = 0; c < count; c++ ) { lg.Add(enemyPrefabs[Entity.Entities.SCORPION]); } @@ -514,11 +516,11 @@ public class DungeonGenerator { } break; case 6: - case 0: + case 1: { - // Coins!!!!: + // Siders!!!!: List lg = new List(); - int count = Math.Min(UnityEngine.Random.Range(1, (int)Mathf.Floor(r.GetSpawnpoints().Count)), 3); + int count = Math.Min(UnityEngine.Random.Range(1, (int)Mathf.Floor(r.GetSpawnpoints().Count)), 5); for (int c = 0; c < count; c++) { lg.Add(enemyPrefabs[Entity.Entities.SPIDER]); diff --git a/Assets/Scripts/PlayerMovement.cs b/Assets/Scripts/PlayerMovement.cs index 875673c..330cc3d 100644 --- a/Assets/Scripts/PlayerMovement.cs +++ b/Assets/Scripts/PlayerMovement.cs @@ -6,6 +6,8 @@ public class PlayerMovement : MonoBehaviour { [SerializeField] public float acceleration = 3; + [SerializeField] + public float boost = 2; [SerializeField] public float friction = 0.1f; [SerializeField] @@ -137,6 +139,8 @@ public class PlayerMovement : MonoBehaviour { Vector3 acc = transform.up * acceleration; if (braking) acc *= 0; + if (Input.GetAxis("Vertical") > 0) + acc *= boost; rb.AddForce(acc); } {// Drag diff --git a/Assets/Scripts/UIController.cs b/Assets/Scripts/UIController.cs index 63d0af3..7dada41 100644 --- a/Assets/Scripts/UIController.cs +++ b/Assets/Scripts/UIController.cs @@ -32,7 +32,7 @@ public class UIController : MonoBehaviour void Update() { if (Input.GetAxis("Reset") > 0 && GameController.instance.GameEnded()) { - LoadSceneByIndex(firstSceneIndex); + Restart(); } } @@ -44,6 +44,10 @@ public class UIController : MonoBehaviour pauseMenu.SetActive(false); } + public void Restart() { + LoadSceneByIndex(firstSceneIndex); + } + public void LoadSceneByIndex(int index) { Debug.Log("Loaded scene " + index); SceneManager.LoadScene(index); diff --git a/Assets/graphics/textures/UI/messageBox.png.meta b/Assets/graphics/textures/UI/messageBox.png.meta index eeccfac..a1d10e3 100644 --- a/Assets/graphics/textures/UI/messageBox.png.meta +++ b/Assets/graphics/textures/UI/messageBox.png.meta @@ -45,7 +45,7 @@ TextureImporter: alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 - spriteBorder: {x: 380, y: 296, z: 503, w: 271} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 1 diff --git a/Assets/sound/AudioMixer.mixer b/Assets/sound/AudioMixer.mixer index 11b4d77..5ed1b6d 100644 --- a/Assets/sound/AudioMixer.mixer +++ b/Assets/sound/AudioMixer.mixer @@ -80,16 +80,18 @@ AudioMixerSnapshotController: m_SnapshotID: d3789ccdbdc046a448f1887d94c3f7f5 m_FloatValues: aa6b64c186541834a990dc7d71ef0490: -9.833286 - 2531afd284b58274a93052c093565106: -9.960263 + 9f873922b4189f746a4d13a9b60e6375: 2.4583216 + 2531afd284b58274a93052c093565106: -8.963343 25123d234de4ec84aafee1d0c380f3ad: 0.025578512 af748c25161478f4c933cb5cf60cf925: -4.560346 - 8b04b72683f112d418bf818b2395ba51: -9.833286 + 8b04b72683f112d418bf818b2395ba51: -9.332112 ce741f86488e78548ad32eec9ad31803: -13.0627575 3085c47799436ad43a18d4ae4adb712d: -9.833286 - 7e224658afaf14242ba3996793ac12a1: -0.02577656 + 7e224658afaf14242ba3996793ac12a1: -5.3230715 644f6589fc60a074a98ad67d609f2bfb: 5.1526957 5da050aa578318a4f8f1fed71a509fce: -14.816608 bf89843b5f1f52248935471e56d764be: -9.833286 + 43685e8fb476ee342aecf379591bcac4: 0 m_TransitionOverrides: {} --- !u!243 &243021022379401452 AudioMixerGroupController: diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset index bafd5bc..1d332da 100644 --- a/ProjectSettings/TagManager.asset +++ b/ProjectSettings/TagManager.asset @@ -9,6 +9,7 @@ TagManager: - DoorRoot - SpawnlistRoot - Enemy + - rock layers: - Default - TransparentFX