Skip to content

Commit a893673

Browse files
authored
Merge pull request #32 from mockba1501/artyomSoundFromMain
#5 UISettings for Music and Sound bug fixed
2 parents ecd3634 + e92e010 commit a893673

File tree

10 files changed

+6663
-169
lines changed

10 files changed

+6663
-169
lines changed

Assets/Scenes/Levels/Level0.unity

Lines changed: 134 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -503,6 +503,7 @@ RectTransform:
503503
- {fileID: 1770323449}
504504
- {fileID: 79068560}
505505
- {fileID: 759562117}
506+
- {fileID: 1709545592}
506507
m_Father: {fileID: 730423544}
507508
m_RootOrder: 12
508509
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -150492,6 +150493,139 @@ RectTransform:
150492150493
m_AnchoredPosition: {x: 132, y: -453}
150493150494
m_SizeDelta: {x: 147.42993, y: 72.733}
150494150495
m_Pivot: {x: 0, y: 1}
150496+
--- !u!1 &1709545591
150497+
GameObject:
150498+
m_ObjectHideFlags: 0
150499+
m_CorrespondingSourceObject: {fileID: 0}
150500+
m_PrefabInstance: {fileID: 0}
150501+
m_PrefabAsset: {fileID: 0}
150502+
serializedVersion: 6
150503+
m_Component:
150504+
- component: {fileID: 1709545592}
150505+
- component: {fileID: 1709545595}
150506+
- component: {fileID: 1709545594}
150507+
- component: {fileID: 1709545593}
150508+
m_Layer: 6
150509+
m_Name: CloseTheDialoge
150510+
m_TagString: Untagged
150511+
m_Icon: {fileID: 0}
150512+
m_NavMeshLayer: 0
150513+
m_StaticEditorFlags: 0
150514+
m_IsActive: 1
150515+
--- !u!224 &1709545592
150516+
RectTransform:
150517+
m_ObjectHideFlags: 0
150518+
m_CorrespondingSourceObject: {fileID: 0}
150519+
m_PrefabInstance: {fileID: 0}
150520+
m_PrefabAsset: {fileID: 0}
150521+
m_GameObject: {fileID: 1709545591}
150522+
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
150523+
m_LocalPosition: {x: 0, y: 0, z: 0}
150524+
m_LocalScale: {x: 1, y: 1, z: 1}
150525+
m_ConstrainProportionsScale: 0
150526+
m_Children: []
150527+
m_Father: {fileID: 205750157}
150528+
m_RootOrder: 3
150529+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
150530+
m_AnchorMin: {x: 0.5, y: 0.5}
150531+
m_AnchorMax: {x: 0.5, y: 0.5}
150532+
m_AnchoredPosition: {x: 259.65085, y: 27.975}
150533+
m_SizeDelta: {x: 27.9583, y: 30}
150534+
m_Pivot: {x: 0.5, y: 0.5}
150535+
--- !u!114 &1709545593
150536+
MonoBehaviour:
150537+
m_ObjectHideFlags: 0
150538+
m_CorrespondingSourceObject: {fileID: 0}
150539+
m_PrefabInstance: {fileID: 0}
150540+
m_PrefabAsset: {fileID: 0}
150541+
m_GameObject: {fileID: 1709545591}
150542+
m_Enabled: 1
150543+
m_EditorHideFlags: 0
150544+
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
150545+
m_Name:
150546+
m_EditorClassIdentifier:
150547+
m_Navigation:
150548+
m_Mode: 3
150549+
m_WrapAround: 0
150550+
m_SelectOnUp: {fileID: 0}
150551+
m_SelectOnDown: {fileID: 0}
150552+
m_SelectOnLeft: {fileID: 0}
150553+
m_SelectOnRight: {fileID: 0}
150554+
m_Transition: 1
150555+
m_Colors:
150556+
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
150557+
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
150558+
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
150559+
m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
150560+
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
150561+
m_ColorMultiplier: 1
150562+
m_FadeDuration: 0.1
150563+
m_SpriteState:
150564+
m_HighlightedSprite: {fileID: 0}
150565+
m_PressedSprite: {fileID: 0}
150566+
m_SelectedSprite: {fileID: 0}
150567+
m_DisabledSprite: {fileID: 0}
150568+
m_AnimationTriggers:
150569+
m_NormalTrigger: Normal
150570+
m_HighlightedTrigger: Highlighted
150571+
m_PressedTrigger: Pressed
150572+
m_SelectedTrigger: Selected
150573+
m_DisabledTrigger: Disabled
150574+
m_Interactable: 1
150575+
m_TargetGraphic: {fileID: 1709545594}
150576+
m_OnClick:
150577+
m_PersistentCalls:
150578+
m_Calls:
150579+
- m_Target: {fileID: 856154434}
150580+
m_TargetAssemblyTypeName: DialogueStarter, Assembly-CSharp
150581+
m_MethodName: HideDialogue
150582+
m_Mode: 1
150583+
m_Arguments:
150584+
m_ObjectArgument: {fileID: 0}
150585+
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
150586+
m_IntArgument: 0
150587+
m_FloatArgument: 0
150588+
m_StringArgument:
150589+
m_BoolArgument: 0
150590+
m_CallState: 2
150591+
--- !u!114 &1709545594
150592+
MonoBehaviour:
150593+
m_ObjectHideFlags: 0
150594+
m_CorrespondingSourceObject: {fileID: 0}
150595+
m_PrefabInstance: {fileID: 0}
150596+
m_PrefabAsset: {fileID: 0}
150597+
m_GameObject: {fileID: 1709545591}
150598+
m_Enabled: 1
150599+
m_EditorHideFlags: 0
150600+
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
150601+
m_Name:
150602+
m_EditorClassIdentifier:
150603+
m_Material: {fileID: 0}
150604+
m_Color: {r: 1, g: 1, b: 1, a: 1}
150605+
m_RaycastTarget: 1
150606+
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
150607+
m_Maskable: 1
150608+
m_OnCullStateChanged:
150609+
m_PersistentCalls:
150610+
m_Calls: []
150611+
m_Sprite: {fileID: 21300000, guid: a3e491f99ea3ad74f8731ca93e84c497, type: 3}
150612+
m_Type: 0
150613+
m_PreserveAspect: 0
150614+
m_FillCenter: 1
150615+
m_FillMethod: 4
150616+
m_FillAmount: 1
150617+
m_FillClockwise: 1
150618+
m_FillOrigin: 0
150619+
m_UseSpriteMesh: 0
150620+
m_PixelsPerUnitMultiplier: 1
150621+
--- !u!222 &1709545595
150622+
CanvasRenderer:
150623+
m_ObjectHideFlags: 0
150624+
m_CorrespondingSourceObject: {fileID: 0}
150625+
m_PrefabInstance: {fileID: 0}
150626+
m_PrefabAsset: {fileID: 0}
150627+
m_GameObject: {fileID: 1709545591}
150628+
m_CullTransparentMesh: 1
150495150629
--- !u!114 &1738811603 stripped
150496150630
MonoBehaviour:
150497150631
m_CorrespondingSourceObject: {fileID: 6936182878465463480, guid: b463baf2ed6b7a1978ea7dab4b791ea0, type: 3}

0 commit comments

Comments
 (0)