diff --git a/Assets/Prefabs/UI.prefab b/Assets/Prefabs/UI.prefab index 68a5000..e880894 100644 --- a/Assets/Prefabs/UI.prefab +++ b/Assets/Prefabs/UI.prefab @@ -62,7 +62,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!1 &1160732466323946 GameObject: m_ObjectHideFlags: 1 @@ -257,8 +257,9 @@ GameObject: m_Component: - component: {fileID: 224035875368067210} - component: {fileID: 222221304479498010} - - component: {fileID: 114373005502633030} - component: {fileID: 114474847320342008} + - component: {fileID: 114289704439636748} + - component: {fileID: 114357770329230070} m_Layer: 5 m_Name: MessagePanel m_TagString: Untagged @@ -360,6 +361,7 @@ GameObject: - component: {fileID: 222407216902702286} - component: {fileID: 114395085421692120} - component: {fileID: 114700265308343224} + - component: {fileID: 114325107130871454} m_Layer: 5 m_Name: MessageText m_TagString: Untagged @@ -805,6 +807,28 @@ MonoBehaviour: m_FirstSelected: {fileID: 0} m_sendNavigationEvents: 1 m_DragThreshold: 10 +--- !u!114 &114289704439636748 +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 &114311258538206922 MonoBehaviour: m_ObjectHideFlags: 1 @@ -838,6 +862,19 @@ MonoBehaviour: m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: Back to Menu +--- !u!114 &114325107130871454 +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 &114333100955944072 MonoBehaviour: m_ObjectHideFlags: 1 @@ -890,7 +927,7 @@ MonoBehaviour: m_CallState: 2 m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null ---- !u!114 &114373005502633030 +--- !u!114 &114357770329230070 MonoBehaviour: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} @@ -901,7 +938,7 @@ MonoBehaviour: m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: m_EditorClassIdentifier: - m_HorizontalFit: 0 + m_HorizontalFit: 2 m_VerticalFit: 0 --- !u!114 &114395085421692120 MonoBehaviour: @@ -924,10 +961,10 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 200 + m_FontSize: 30 m_FontStyle: 1 - m_BestFit: 1 - m_MinSize: 11 + m_BestFit: 0 + m_MinSize: 0 m_MaxSize: 200 m_Alignment: 4 m_AlignByGeometry: 1 @@ -1056,16 +1093,16 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 0} 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: 21300000, guid: aef4053338277214c9f32a70117fa370, type: 3} - m_Type: 0 - m_PreserveAspect: 1 + m_Sprite: {fileID: 0} + m_Type: 1 + m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 @@ -1233,7 +1270,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.16037738, g: 0.16037738, b: 0.16037738, a: 1} + m_Color: {r: 0.24528301, g: 0.2233001, b: 0.2233001, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -1381,7 +1418,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.3207547, g: 0.3207547, b: 0.3207547, a: 1} + m_Color: {r: 0.32156864, g: 0.2901961, b: 0.2901961, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -1690,7 +1727,7 @@ RectTransform: m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} + m_AnchorMax: {x: 0.7, y: 1} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 10, y: 0} m_Pivot: {x: 0.5, y: 0.5} @@ -1708,11 +1745,11 @@ RectTransform: m_Father: {fileID: 224011665836974194} 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} - m_AnchoredPosition: {x: 161.7, y: -3.84} - m_SizeDelta: {x: 323.4, y: 162.53} - m_Pivot: {x: 1, y: 0.5} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 0, y: -46.619995} + m_SizeDelta: {x: 0, y: 50} + m_Pivot: {x: 0.5, y: 0.5} --- !u!224 &224070954714188902 RectTransform: m_ObjectHideFlags: 1 @@ -1811,15 +1848,15 @@ RectTransform: m_GameObject: {fileID: 1783803660317794} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.1, y: 0.1, z: 1} + m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 224035875368067210} 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.3500061, y: 2.56} - m_SizeDelta: {x: 2031.38, y: 714.52} + 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_Pivot: {x: 0.5, y: 0.5} --- !u!224 &224218339018349506 RectTransform: @@ -2122,8 +2159,8 @@ RectTransform: m_Father: {fileID: 224927698272889066} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} + m_AnchorMin: {x: 0.7, y: 0} + m_AnchorMax: {x: 0.7, y: 1} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 20, y: 0} m_Pivot: {x: 0.5, y: 0.5} diff --git a/Assets/Scenes/CodeDEV.unity b/Assets/Scenes/CodeDEV.unity index 30e1a6e..2fdc073 100644 --- a/Assets/Scenes/CodeDEV.unity +++ b/Assets/Scenes/CodeDEV.unity @@ -519,6 +519,24 @@ 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 @@ -987,8 +1005,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 5d9a051e822e2cf4ea3ca01c5a4df37c, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: followSpeed: 0.05 minZoom: 5 zoomFactor: 4 @@ -1004,8 +1022,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 4e40ea81463f7264a8ce9334d6bf62ac, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: mixer: {fileID: 24100000, guid: efb934a745665924d8c7dd46c0a117ae, type: 2} maintheme: {fileID: 1600556435} menutheme: {fileID: 30160411} @@ -1425,36 +1443,36 @@ Prefab: - target: {fileID: 114052756276606012, guid: 460d856ea4eb14cedb5fecde1fe6d743, type: 2} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: + value: objectReference: {fileID: 2063368133} - target: {fileID: 224030602021903918, guid: 460d856ea4eb14cedb5fecde1fe6d743, type: 2} propertyPath: m_AnchorMax.x - value: 0 + value: 0.7 objectReference: {fileID: 0} - target: {fileID: 224030602021903918, guid: 460d856ea4eb14cedb5fecde1fe6d743, type: 2} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 224899125652206328, guid: 460d856ea4eb14cedb5fecde1fe6d743, type: 2} propertyPath: m_AnchorMin.x - value: 0 + value: 0.7 objectReference: {fileID: 0} - target: {fileID: 224899125652206328, guid: 460d856ea4eb14cedb5fecde1fe6d743, type: 2} propertyPath: m_AnchorMax.x - value: 0 + value: 0.7 objectReference: {fileID: 0} - target: {fileID: 224899125652206328, guid: 460d856ea4eb14cedb5fecde1fe6d743, type: 2} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 1139220909146914, guid: 460d856ea4eb14cedb5fecde1fe6d743, type: 2} propertyPath: m_IsActive - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 224899125652206328, guid: 460d856ea4eb14cedb5fecde1fe6d743, type: 2} @@ -1469,7 +1487,7 @@ Prefab: - target: {fileID: 114077156432934238, guid: 460d856ea4eb14cedb5fecde1fe6d743, type: 2} propertyPath: m_Sprite - value: + value: objectReference: {fileID: 21300000, guid: 271a63eb548b41e489d3338148bb0cb5, type: 3} - target: {fileID: 114829834214915798, guid: 460d856ea4eb14cedb5fecde1fe6d743, @@ -1502,32 +1520,168 @@ Prefab: propertyPath: m_Color.b value: 0.2233001 objectReference: {fileID: 0} - - target: {fileID: 114516921110256910, guid: 460d856ea4eb14cedb5fecde1fe6d743, + - target: {fileID: 224150154901314796, 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_MinValue - value: -80 - 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_Value + propertyPath: m_AnchorMin.x value: 0 objectReference: {fileID: 0} - m_RemovedComponents: [] + - 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 + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 224150154901314796, guid: 460d856ea4eb14cedb5fecde1fe6d743, + type: 2} + propertyPath: m_AnchoredPosition.x + value: 39.513885 + objectReference: {fileID: 0} + - target: {fileID: 224150154901314796, guid: 460d856ea4eb14cedb5fecde1fe6d743, + type: 2} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 114474847320342008, guid: 460d856ea4eb14cedb5fecde1fe6d743, + type: 2} + propertyPath: m_Sprite + value: + objectReference: {fileID: 0} + - target: {fileID: 114474847320342008, guid: 460d856ea4eb14cedb5fecde1fe6d743, + type: 2} + propertyPath: m_Type + value: 1 + 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} + m_RemovedComponents: + - {fileID: 114373005502633030, guid: 460d856ea4eb14cedb5fecde1fe6d743, type: 2} m_ParentPrefab: {fileID: 100100000, guid: 460d856ea4eb14cedb5fecde1fe6d743, type: 2} m_IsPrefabParent: 0 --- !u!1 &1379476069 stripped @@ -1535,6 +1689,46 @@ 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 @@ -2364,8 +2558,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 87d25c2cd3eb97749b79f2cb5f7c5cea, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: scorpion: {fileID: 1303102899095328, guid: 4c5ecfd27b4038941a6e493a8117ea0a, type: 2} bug: {fileID: 1887677565572348, guid: dd625f75dbf83194392a299951cf04fb, type: 2} coin: {fileID: 1974526777167790, guid: 35e8b8e102a45a1489ef949961dca4a6, type: 2}