diff --git a/Assets/Game/Scenes/GameScene/GameScene.unity b/Assets/Game/Scenes/GameScene/GameScene.unity index dd7f09f54..353444692 100644 --- a/Assets/Game/Scenes/GameScene/GameScene.unity +++ b/Assets/Game/Scenes/GameScene/GameScene.unity @@ -7989,8 +7989,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 1375.5, y: -513.4278} - m_SizeDelta: {x: 475, y: 1026.8556} + m_AnchoredPosition: {x: 836.5, y: -513.42773} + m_SizeDelta: {x: 475, y: 1026.8555} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &23935264 MonoBehaviour: @@ -8127,8 +8127,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 780.84503, y: -72.5} - m_SizeDelta: {x: 470.56332, y: 145} + m_AnchoredPosition: {x: 780.53503, y: -72.5} + m_SizeDelta: {x: 470.35666, y: 145} m_Pivot: {x: 0.5, y: 0.5} --- !u!225 &26592881 CanvasGroup: @@ -11168,8 +11168,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 207.5, y: -698.95667} - m_SizeDelta: {x: 415, y: 452.6378} + m_AnchoredPosition: {x: 207.5, y: -698.9566} + m_SizeDelta: {x: 415, y: 452.63773} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &52810033 MonoBehaviour: @@ -14422,9 +14422,9 @@ RectTransform: m_Father: {fileID: 1494891730} m_RootOrder: 4 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: 960.6, y: 1.7} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 2133.3496, y: -62.891724} m_SizeDelta: {x: 321.5, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &71913404 @@ -25431,6 +25431,140 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 129768664} m_CullTransparentMesh: 0 +--- !u!1 &129966972 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 129966973} + - component: {fileID: 129966975} + - component: {fileID: 129966974} + m_Layer: 5 + m_Name: Text_Item (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &129966973 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 129966972} + 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_Children: [] + m_Father: {fileID: 2051584425} + m_RootOrder: 4 + 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: 0, y: -188.8} + m_SizeDelta: {x: 446.03644, y: 126.77298} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &129966974 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 129966972} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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_text: Lucky Chest + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 50c12c23294124aa48490c44ac65a9e4, type: 2} + m_sharedMaterial: {fileID: 7746803525459343344, guid: 50c12c23294124aa48490c44ac65a9e4, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 40 + m_fontSizeBase: 40 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: -7.3 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 1 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 59.985046} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &129966975 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 129966972} + m_CullTransparentMesh: 0 --- !u!1 &130515263 GameObject: m_ObjectHideFlags: 0 @@ -34643,8 +34777,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 207.5, y: -226.3189} - m_SizeDelta: {x: 415, y: 452.6378} + m_AnchoredPosition: {x: 207.5, y: -226.31886} + m_SizeDelta: {x: 415, y: 452.63773} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &184652673 MonoBehaviour: @@ -72110,6 +72244,7 @@ GameObject: - component: {fileID: 341739989} - component: {fileID: 341739988} - component: {fileID: 341739990} + - component: {fileID: 341739991} m_Layer: 5 m_Name: Item_Gold m_TagString: Untagged @@ -72133,13 +72268,14 @@ RectTransform: - {fileID: 2054287396} - {fileID: 1980852315} - {fileID: 130515264} + - {fileID: 858461948} m_Father: {fileID: 446527132} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 207.5, y: -698.95667} - m_SizeDelta: {x: 415, y: 452.6378} + m_AnchoredPosition: {x: 207.5, y: -698.9566} + m_SizeDelta: {x: 415, y: 452.63773} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &341739988 MonoBehaviour: @@ -72222,19 +72358,37 @@ MonoBehaviour: m_TargetGraphic: {fileID: 341739988} m_OnClick: m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 981460999} - m_TargetAssemblyTypeName: ChestOpener, Assembly-CSharp - m_MethodName: OpenChest - 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_Calls: [] +--- !u!114 &341739991 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 341739986} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3a00d06b92d7a4dd78fab8529a589430, type: 3} + m_Name: + m_EditorClassIdentifier: + IsSpecial: 0 + readFromTexts: 1 + txtPrice: {fileID: 421105402} + txtChestName: {fileID: 2054287397} + Price: 60 + minLuck: 30 + maxLuck: 103 + btnInfo: {fileID: 858461949} + infoTxt: 'Gold + + Gems : 72.6% + + Common Skin : 45.2% + + Rare Skin : 24.7% + + Legendary + Skin : 11.0%' --- !u!1001 &342170071 PrefabInstance: m_ObjectHideFlags: 0 @@ -83420,8 +83574,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 207.5, y: -462.6378} - m_SizeDelta: {x: 415, y: 925.2756} + m_AnchoredPosition: {x: 207.5, y: -462.63773} + m_SizeDelta: {x: 415, y: 925.27545} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &380277005 MonoBehaviour: @@ -98144,6 +98298,8 @@ GameObject: - component: {fileID: 440509685} - component: {fileID: 440509687} - component: {fileID: 440509686} + - component: {fileID: 440509688} + - component: {fileID: 440509689} m_Layer: 5 m_Name: Item_Gold m_TagString: Untagged @@ -98173,8 +98329,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 207.5, y: -226.3189} - m_SizeDelta: {x: 415, y: 452.6378} + m_AnchoredPosition: {x: 207.5, y: -226.31886} + m_SizeDelta: {x: 415, y: 452.63773} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &440509686 MonoBehaviour: @@ -98214,6 +98370,67 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 440509684} m_CullTransparentMesh: 0 +--- !u!114 &440509688 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 440509684} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5cf2108220cbbf8449f5acdb4be74f69, type: 3} + m_Name: + m_EditorClassIdentifier: + autoReadFromText: 1 + txtAmount: {fileID: 650149009} + txtPrice: {fileID: 2107756274} + Amount: 12000 + Price: 120 +--- !u!114 &440509689 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 440509684} + 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: 440509686} + m_OnClick: + m_PersistentCalls: + m_Calls: [] --- !u!1001 &440579650 PrefabInstance: m_ObjectHideFlags: 0 @@ -98951,8 +99168,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 237.5, y: -539.2178} - m_SizeDelta: {x: 415, y: 925.2756} + m_AnchoredPosition: {x: 237.5, y: -539.2177} + m_SizeDelta: {x: 415, y: 925.27545} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &446527133 MonoBehaviour: @@ -100823,7 +101040,7 @@ RectTransform: - {fileID: 318418382} - {fileID: 1914956084} m_Father: {fileID: 1284162106} - m_RootOrder: 5 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -108368,8 +108585,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 652.5, y: -462.6378} - m_SizeDelta: {x: 415, y: 925.2756} + m_AnchoredPosition: {x: 652.5, y: -462.63773} + m_SizeDelta: {x: 415, y: 925.27545} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &470392185 MonoBehaviour: @@ -112011,8 +112228,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 780.84503, y: -72.5} - m_SizeDelta: {x: 470.56332, y: 145} + m_AnchoredPosition: {x: 780.53503, y: -72.5} + m_SizeDelta: {x: 470.35666, y: 145} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &491269042 MonoBehaviour: @@ -118223,8 +118440,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 30, y: -539.2178} - m_SizeDelta: {x: 1305, y: 925.2756} + m_AnchoredPosition: {x: 30, y: -539.2177} + m_SizeDelta: {x: 1305, y: 925.27545} m_Pivot: {x: 0, y: 0.5} --- !u!114 &530519547 MonoBehaviour: @@ -136767,8 +136984,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 1097.5, y: -462.6378} - m_SizeDelta: {x: 415, y: 925.2756} + m_AnchoredPosition: {x: 1097.5, y: -462.63773} + m_SizeDelta: {x: 415, y: 925.27545} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &623609379 MonoBehaviour: @@ -151774,7 +151991,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 0, y: -642.8} - m_SizeDelta: {x: 1016.12665, y: 145} + m_SizeDelta: {x: 1015.7133, y: 145} m_Pivot: {x: 0, y: 0.5} --- !u!114 &690634868 MonoBehaviour: @@ -155537,6 +155754,7 @@ GameObject: m_Component: - component: {fileID: 720751228} - component: {fileID: 720751227} + - component: {fileID: 720751229} m_Layer: 5 m_Name: Shop m_TagString: Untagged @@ -155580,6 +155798,22 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &720751229 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 720751226} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b15c5b3b610c912db8c1355f50b9f3d8, type: 3} + m_Name: + m_EditorClassIdentifier: + quantity: 3 + chestButton: {fileID: 2051584429} + txtTimeLeft: {fileID: 1123795181} + button: {fileID: 2051584428} --- !u!1001 &721166286 PrefabInstance: m_ObjectHideFlags: 0 @@ -163135,7 +163369,6 @@ ParticleSystemRenderer: m_RendererPriority: 0 m_Materials: - {fileID: 0} - - {fileID: 0} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -169213,8 +169446,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 235.28166, y: -72.5} - m_SizeDelta: {x: 470.56332, y: 145} + m_AnchoredPosition: {x: 235.17833, y: -72.5} + m_SizeDelta: {x: 470.35666, y: 145} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &742468144 MonoBehaviour: @@ -184131,9 +184364,9 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 879d2339866da49968a95d6b3f418194, type: 3} + m_Sprite: {fileID: 21300000, guid: 988d7450862c2fdfab23f6e1521b16f1, type: 3} m_Type: 0 - m_PreserveAspect: 0 + m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 @@ -200702,6 +200935,126 @@ Transform: m_CorrespondingSourceObject: {fileID: 4393057226660512, guid: b7a00c1a485ba0a439f0ccb8bef0a2a1, type: 3} m_PrefabInstance: {fileID: 2129575535} m_PrefabAsset: {fileID: 0} +--- !u!1 &845051785 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 845051786} + - component: {fileID: 845051789} + - component: {fileID: 845051788} + - component: {fileID: 845051787} + m_Layer: 5 + m_Name: Button_Info (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &845051786 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 845051785} + 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_Children: [] + m_Father: {fileID: 1118207884} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -52.299988, y: -57.9} + m_SizeDelta: {x: 65, y: 69} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &845051787 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 845051785} + 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: 845051788} + m_OnClick: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &845051788 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 845051785} + 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: 6be115246fe9b40b8b37ad9f4e2be66a, 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 &845051789 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 845051785} + m_CullTransparentMesh: 0 --- !u!4 &845209523 stripped Transform: m_CorrespondingSourceObject: {fileID: 4605106085939642, guid: f5a8c4384185b584d9506b7adf58388c, type: 3} @@ -202838,6 +203191,8 @@ GameObject: - component: {fileID: 857995330} - component: {fileID: 857995332} - component: {fileID: 857995331} + - component: {fileID: 857995333} + - component: {fileID: 857995334} m_Layer: 5 m_Name: Item_Gold m_TagString: Untagged @@ -202866,8 +203221,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 207.5, y: -698.95667} - m_SizeDelta: {x: 415, y: 452.6378} + m_AnchoredPosition: {x: 207.5, y: -698.9566} + m_SizeDelta: {x: 415, y: 452.63773} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &857995331 MonoBehaviour: @@ -202907,6 +203262,67 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 857995329} m_CullTransparentMesh: 0 +--- !u!114 &857995333 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 857995329} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5cf2108220cbbf8449f5acdb4be74f69, type: 3} + m_Name: + m_EditorClassIdentifier: + autoReadFromText: 1 + txtAmount: {fileID: 780772332} + txtPrice: {fileID: 598535019} + Amount: 25000 + Price: 240 +--- !u!114 &857995334 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 857995329} + 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: 857995331} + m_OnClick: + m_PersistentCalls: + m_Calls: [] --- !u!1 &858020366 GameObject: m_ObjectHideFlags: 0 @@ -203103,6 +203519,126 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: d0b52e9de414b434a88e023d6f763fd4, type: 3} +--- !u!1 &858461947 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 858461948} + - component: {fileID: 858461951} + - component: {fileID: 858461950} + - component: {fileID: 858461949} + m_Layer: 5 + m_Name: Button_Info (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &858461948 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 858461947} + 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_Children: [] + m_Father: {fileID: 341739987} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -52.30005, y: -57.9} + m_SizeDelta: {x: 65, y: 69} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &858461949 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 858461947} + 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: 858461950} + m_OnClick: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &858461950 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 858461947} + 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: 6be115246fe9b40b8b37ad9f4e2be66a, 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 &858461951 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 858461947} + m_CullTransparentMesh: 0 --- !u!4 &858615819 stripped Transform: m_CorrespondingSourceObject: {fileID: 4241811459315326, guid: b0c5c3f9b8286e14f95e62362776397f, type: 3} @@ -205566,6 +206102,139 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 868199739} m_CullTransparentMesh: 0 +--- !u!1 &868225000 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 868225001} + - component: {fileID: 868225004} + - component: {fileID: 868225003} + - component: {fileID: 868225002} + m_Layer: 5 + m_Name: btn_signout + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &868225001 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 868225000} + 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_Children: + - {fileID: 1860131636} + m_Father: {fileID: 1284162106} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: -331.18, y: 165.7} + m_SizeDelta: {x: 470.56323, y: 145} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &868225002 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 868225000} + 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: 868225003} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 981460997} + m_TargetAssemblyTypeName: GameManager, Assembly-CSharp + m_MethodName: Signout + 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 +--- !u!114 &868225003 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 868225000} + 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: 681db73f19fb24efe843aad713eccb43, type: 3} + m_Type: 1 + 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 &868225004 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 868225000} + m_CullTransparentMesh: 0 --- !u!1001 &868397485 PrefabInstance: m_ObjectHideFlags: 0 @@ -211118,8 +211787,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 652.5, y: -462.6378} - m_SizeDelta: {x: 415, y: 925.2756} + m_AnchoredPosition: {x: 652.5, y: -462.63773} + m_SizeDelta: {x: 415, y: 925.27545} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &911187322 MonoBehaviour: @@ -215577,6 +216246,8 @@ GameObject: - component: {fileID: 936287494} - component: {fileID: 936287496} - component: {fileID: 936287495} + - component: {fileID: 936287497} + - component: {fileID: 936287498} m_Layer: 5 m_Name: Item_Gold m_TagString: Untagged @@ -215605,8 +216276,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 207.5, y: -698.95667} - m_SizeDelta: {x: 415, y: 452.6378} + m_AnchoredPosition: {x: 207.5, y: -698.9566} + m_SizeDelta: {x: 415, y: 452.63773} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &936287495 MonoBehaviour: @@ -215646,6 +216317,67 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 936287493} m_CullTransparentMesh: 0 +--- !u!114 &936287497 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 936287493} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5cf2108220cbbf8449f5acdb4be74f69, type: 3} + m_Name: + m_EditorClassIdentifier: + autoReadFromText: 1 + txtAmount: {fileID: 1640933582} + txtPrice: {fileID: 1813003874} + Amount: 4000 + Price: 48 +--- !u!114 &936287498 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 936287493} + 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: 936287495} + m_OnClick: + m_PersistentCalls: + m_Calls: [] --- !u!4 &936334184 stripped Transform: m_CorrespondingSourceObject: {fileID: 4949689053285384, guid: 4015e071c1c47b3418d5ea02a291e62e, type: 3} @@ -216991,7 +217723,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 0, y: -452.7} - m_SizeDelta: {x: 1016.12665, y: 145} + m_SizeDelta: {x: 1015.7133, y: 145} m_Pivot: {x: 0, y: 0.5} --- !u!114 &942580085 MonoBehaviour: @@ -220548,8 +221280,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 207.5, y: -462.6378} - m_SizeDelta: {x: 415, y: 925.2756} + m_AnchoredPosition: {x: 207.5, y: -462.63773} + m_SizeDelta: {x: 415, y: 925.27545} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &963034068 MonoBehaviour: @@ -222852,12 +223584,12 @@ RectTransform: - {fileID: 942580084} - {fileID: 690634867} m_Father: {fileID: 1284162106} - m_RootOrder: 4 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.4743627, y: 0.5} - m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: -24.910156, y: 300.5} - m_SizeDelta: {x: -141.28668, y: 715.3} + m_AnchorMin: {x: 1, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: -603.41016, y: 808.5} + m_SizeDelta: {x: 1015.7133, y: 715.3} m_Pivot: {x: 0.5, y: 1} --- !u!114 &973246137 MonoBehaviour: @@ -224161,7 +224893,7 @@ MonoBehaviour: - {fileID: 326947668} btn_select: {fileID: 605833029} - name: SGP - ip: 194.233.70.117 + ip: 154.26.136.228 ping: 0 pingTxts: - {fileID: 885285188} @@ -231025,7 +231757,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 0, y: -72.5} - m_SizeDelta: {x: 1016.12665, y: 145} + m_SizeDelta: {x: 1015.7133, y: 145} m_Pivot: {x: 0, y: 0.5} --- !u!114 &1024013933 MonoBehaviour: @@ -242299,8 +243031,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 207.5, y: -226.3189} - m_SizeDelta: {x: 415, y: 452.6378} + m_AnchoredPosition: {x: 207.5, y: -226.31886} + m_SizeDelta: {x: 415, y: 452.63773} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1090080046 MonoBehaviour: @@ -250473,6 +251205,8 @@ GameObject: - component: {fileID: 1111511279} - component: {fileID: 1111511281} - component: {fileID: 1111511280} + - component: {fileID: 1111511282} + - component: {fileID: 1111511283} m_Layer: 5 m_Name: Item_Gold m_TagString: Untagged @@ -250501,8 +251235,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 207.5, y: -226.3189} - m_SizeDelta: {x: 415, y: 452.6378} + m_AnchoredPosition: {x: 207.5, y: -226.31886} + m_SizeDelta: {x: 415, y: 452.63773} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1111511280 MonoBehaviour: @@ -250542,6 +251276,67 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1111511278} m_CullTransparentMesh: 0 +--- !u!114 &1111511282 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1111511278} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5cf2108220cbbf8449f5acdb4be74f69, type: 3} + m_Name: + m_EditorClassIdentifier: + autoReadFromText: 1 + txtAmount: {fileID: 1664663675} + txtPrice: {fileID: 642103080} + Amount: 1500 + Price: 12 +--- !u!114 &1111511283 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1111511278} + 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: 1111511280} + m_OnClick: + m_PersistentCalls: + m_Calls: [] --- !u!1 &1111604446 GameObject: m_ObjectHideFlags: 0 @@ -251831,6 +252626,7 @@ GameObject: - component: {fileID: 1118207886} - component: {fileID: 1118207885} - component: {fileID: 1118207887} + - component: {fileID: 1118207888} m_Layer: 5 m_Name: Item_Gold m_TagString: Untagged @@ -251854,13 +252650,14 @@ RectTransform: - {fileID: 93847098} - {fileID: 1783009139} - {fileID: 177182110} + - {fileID: 845051786} m_Father: {fileID: 446527132} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 207.5, y: -226.3189} - m_SizeDelta: {x: 415, y: 452.6378} + m_AnchoredPosition: {x: 207.5, y: -226.31886} + m_SizeDelta: {x: 415, y: 452.63773} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1118207885 MonoBehaviour: @@ -251943,19 +252740,37 @@ MonoBehaviour: m_TargetGraphic: {fileID: 1118207885} m_OnClick: m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 981460999} - m_TargetAssemblyTypeName: ChestOpener, Assembly-CSharp - m_MethodName: OpenChest - 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_Calls: [] +--- !u!114 &1118207888 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1118207883} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3a00d06b92d7a4dd78fab8529a589430, type: 3} + m_Name: + m_EditorClassIdentifier: + IsSpecial: 0 + readFromTexts: 1 + txtPrice: {fileID: 1235985419} + txtChestName: {fileID: 1783009140} + Price: 12 + minLuck: 0 + maxLuck: 96 + btnInfo: {fileID: 845051787} + infoTxt: 'Gold + + Gems : 47.9% + + Common Skin : 27.1% + + Rare Skin : 11.5% + + Legendary + Skin : 1.0%' --- !u!4 &1118684821 stripped Transform: m_CorrespondingSourceObject: {fileID: 4715379540816738, guid: b225b6c4fbbf1f5419c8b635c434c1c4, type: 3} @@ -267304,6 +268119,8 @@ GameObject: - component: {fileID: 1181079421} - component: {fileID: 1181079420} - component: {fileID: 1181079419} + - component: {fileID: 1181079423} + - component: {fileID: 1181079422} m_Layer: 5 m_Name: Item_Gold m_TagString: Untagged @@ -267331,8 +268148,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 1097.5, y: -462.6378} - m_SizeDelta: {x: 415, y: 925.2756} + m_AnchoredPosition: {x: 1097.5, y: -462.63773} + m_SizeDelta: {x: 415, y: 925.27545} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1181079419 MonoBehaviour: @@ -267392,6 +268209,67 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1181079417} m_CullTransparentMesh: 0 +--- !u!114 &1181079422 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1181079417} + 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: 1181079420} + m_OnClick: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &1181079423 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1181079417} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5cf2108220cbbf8449f5acdb4be74f69, type: 3} + m_Name: + m_EditorClassIdentifier: + autoReadFromText: 1 + txtAmount: {fileID: 2068986380} + txtPrice: {fileID: 2054724685} + Amount: 60000 + Price: 490 --- !u!4 &1182434527 stripped Transform: m_CorrespondingSourceObject: {fileID: 4942385766064988, guid: 5f9778f740335b248967fbaa111f011e, type: 3} @@ -274850,7 +275728,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 4493, y: -123.542725} + m_SizeDelta: {x: 3954, y: -123.542725} m_Pivot: {x: 0, y: 0.5} --- !u!114 &1199026939 MonoBehaviour: @@ -308504,6 +309382,7 @@ RectTransform: - {fileID: 163833856} - {fileID: 1028287004} - {fileID: 1588536478} + - {fileID: 868225001} - {fileID: 1541978234} - {fileID: 973246136} - {fileID: 452196196} @@ -308513,7 +309392,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} m_AnchoredPosition: {x: 0, y: -6.1999993} - m_SizeDelta: {x: -358.07617, y: 1016.15027} + m_SizeDelta: {x: -758.9696, y: 900} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1284162107 MonoBehaviour: @@ -309349,8 +310228,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 235.28166, y: -72.5} - m_SizeDelta: {x: 470.56332, y: 145} + m_AnchoredPosition: {x: 235.17833, y: -72.5} + m_SizeDelta: {x: 470.35666, y: 145} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1294821869 MonoBehaviour: @@ -309727,7 +310606,6 @@ ParticleSystemRenderer: m_RendererPriority: 0 m_Materials: - {fileID: 10308, guid: 0000000000000000f000000000000000, type: 0} - - {fileID: 0} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -341011,7 +341889,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 0, y: -262.6} - m_SizeDelta: {x: 1016.12665, y: 145} + m_SizeDelta: {x: 1015.7133, y: 145} m_Pivot: {x: 0, y: 0.5} --- !u!114 &1380396587 MonoBehaviour: @@ -342652,8 +343530,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 3750.5, y: -513.4278} - m_SizeDelta: {x: 1365, y: 1026.8556} + m_AnchoredPosition: {x: 3211.5, y: -513.42773} + m_SizeDelta: {x: 1365, y: 1026.8555} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1392175379 MonoBehaviour: @@ -352698,9 +353576,9 @@ RectTransform: m_Father: {fileID: 1494891730} m_RootOrder: 2 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: -319.5, y: 1.7} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 426.66992, y: -62.891724} m_SizeDelta: {x: 321.5, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1469263524 @@ -356876,6 +357754,7 @@ GameObject: - component: {fileID: 1494891730} - component: {fileID: 1494891732} - component: {fileID: 1494891731} + - component: {fileID: 1494891733} m_Layer: 5 m_Name: Tap m_TagString: Untagged @@ -356945,6 +357824,32 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1494891729} m_CullTransparentMesh: 0 +--- !u!114 &1494891733 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1494891729} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 4 + m_Spacing: 0 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 1 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 + m_ChildScaleWidth: 0 + m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 --- !u!1 &1495003075 GameObject: m_ObjectHideFlags: 0 @@ -359878,8 +360783,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 780.84503, y: -72.5} - m_SizeDelta: {x: 470.56332, y: 145} + m_AnchoredPosition: {x: 780.53503, y: -72.5} + m_SizeDelta: {x: 470.35666, y: 145} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1508706402 MonoBehaviour: @@ -370268,8 +371173,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 207.5, y: -698.95667} - m_SizeDelta: {x: 415, y: 452.6378} + m_AnchoredPosition: {x: 207.5, y: -698.9566} + m_SizeDelta: {x: 415, y: 452.63773} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1537685548 MonoBehaviour: @@ -370699,11 +371604,11 @@ RectTransform: - {fileID: 448385556} - {fileID: 1459657714} m_Father: {fileID: 1284162106} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0.4743627, y: 0.5} - m_AnchoredPosition: {x: 30.5, y: 321.99997} + m_AnchoredPosition: {x: 30.500061, y: 321.99997} m_SizeDelta: {x: -134.45142, y: 186.56} m_Pivot: {x: 0.5, y: 1} --- !u!114 &1541978235 @@ -378265,8 +379170,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 2340.5, y: -513.4278} - m_SizeDelta: {x: 1365, y: 1026.8556} + m_AnchoredPosition: {x: 1801.5, y: -513.42773} + m_SizeDelta: {x: 1365, y: 1026.8555} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1552140527 MonoBehaviour: @@ -400271,7 +401176,6 @@ ParticleSystemRenderer: m_RendererPriority: 0 m_Materials: - {fileID: 10308, guid: 0000000000000000f000000000000000, type: 0} - - {fileID: 0} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -415539,8 +416443,8 @@ RectTransform: 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: 0, y: -188.8} - m_SizeDelta: {x: 446.03644, y: 126.77298} + m_AnchoredPosition: {x: 0, y: -215} + m_SizeDelta: {x: 446.0364, y: 71.4021} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1674363969 MonoBehaviour: @@ -415562,9 +416466,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: 'Lucky Chest - - x3' + m_text: x3 m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 50c12c23294124aa48490c44ac65a9e4, type: 2} m_sharedMaterial: {fileID: 7746803525459343344, guid: 50c12c23294124aa48490c44ac65a9e4, type: 2} @@ -417887,8 +418789,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 780.84503, y: -72.5} - m_SizeDelta: {x: 470.56332, y: 145} + m_AnchoredPosition: {x: 780.53503, y: -72.5} + m_SizeDelta: {x: 470.35666, y: 145} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1688086607 MonoBehaviour: @@ -422870,6 +423772,7 @@ GameObject: - component: {fileID: 1722684514} - component: {fileID: 1722684516} - component: {fileID: 1722684515} + - component: {fileID: 1722684517} m_Layer: 5 m_Name: Button_Info m_TagString: Untagged @@ -422889,7 +423792,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 2051584425} - m_RootOrder: 3 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} @@ -422934,6 +423837,50 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1722684513} m_CullTransparentMesh: 0 +--- !u!114 &1722684517 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1722684513} + 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: 1722684515} + m_OnClick: + m_PersistentCalls: + m_Calls: [] --- !u!1 &1723190335 GameObject: m_ObjectHideFlags: 0 @@ -429517,7 +430464,6 @@ ParticleSystemRenderer: m_RendererPriority: 0 m_Materials: - {fileID: 10308, guid: 0000000000000000f000000000000000, type: 0} - - {fileID: 0} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -442801,7 +443747,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 2051584425} - m_RootOrder: 4 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} @@ -444108,7 +445054,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1785747395 RectTransform: m_ObjectHideFlags: 0 @@ -465793,9 +466739,9 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: bc4a084373ec44b99b49e7a2a4f5da2d, type: 3} + m_Sprite: {fileID: 21300000, guid: 0d1a9d421a6c35f4391d8c82675a23a3, type: 3} m_Type: 0 - m_PreserveAspect: 0 + m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 @@ -466273,8 +467219,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 235.28166, y: -72.5} - m_SizeDelta: {x: 470.56332, y: 145} + m_AnchoredPosition: {x: 235.17833, y: -72.5} + m_SizeDelta: {x: 470.35666, y: 145} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1832668385 MonoBehaviour: @@ -467885,8 +468831,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 30, y: -539.2178} - m_SizeDelta: {x: 1305, y: 925.2756} + m_AnchoredPosition: {x: 30, y: -539.2177} + m_SizeDelta: {x: 1305, y: 925.27545} m_Pivot: {x: 0, y: 0.5} --- !u!114 &1840016937 MonoBehaviour: @@ -470406,6 +471352,140 @@ Transform: m_CorrespondingSourceObject: {fileID: 4256436337220446, guid: 34c9bb90a728e0c4e9562ec33f5c8f94, type: 3} m_PrefabInstance: {fileID: 943881755} m_PrefabAsset: {fileID: 0} +--- !u!1 &1860131635 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1860131636} + - component: {fileID: 1860131638} + - component: {fileID: 1860131637} + m_Layer: 5 + m_Name: Text_About + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1860131636 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1860131635} + 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_Children: [] + m_Father: {fileID: 868225001} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: -0.00012207031, y: 12.6} + m_SizeDelta: {x: -51.17392, y: 76.73653} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1860131637 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1860131635} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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_text: Sign Out + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: c2f49fe8c22d94f9a9e6cd06ad490155, type: 2} + m_sharedMaterial: {fileID: 3074828514974314926, guid: c2f49fe8c22d94f9a9e6cd06ad490155, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 50 + m_fontSizeBase: 50 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 1 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &1860131638 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1860131635} + m_CullTransparentMesh: 0 --- !u!1 &1860652924 GameObject: m_ObjectHideFlags: 0 @@ -479137,7 +480217,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1909526404 RectTransform: m_ObjectHideFlags: 0 @@ -497937,6 +499017,7 @@ GameObject: - component: {fileID: 2003864920} - component: {fileID: 2003864922} - component: {fileID: 2003864921} + - component: {fileID: 2003864923} m_Layer: 5 m_Name: Slider05_Frame m_TagString: Untagged @@ -498003,6 +499084,62 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2003864919} m_CullTransparentMesh: 0 +--- !u!114 &2003864923 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2003864919} + 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: 0 + 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: 2003864921} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1748768622} + m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine + m_MethodName: SetActive + m_Mode: 6 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 1 + m_CallState: 2 --- !u!1001 &2004084166 PrefabInstance: m_ObjectHideFlags: 0 @@ -508243,9 +509380,9 @@ RectTransform: m_Father: {fileID: 1494891730} 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: 319, y: 1.7} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 1280.0098, y: -62.891724} m_SizeDelta: {x: 321.5, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2039340972 @@ -510386,6 +511523,7 @@ GameObject: - component: {fileID: 2051584427} - component: {fileID: 2051584426} - component: {fileID: 2051584428} + - component: {fileID: 2051584429} m_Layer: 5 m_Name: Item_1 m_TagString: Untagged @@ -510407,18 +511545,19 @@ RectTransform: - {fileID: 1526467758} - {fileID: 252722530} - {fileID: 189558787} - - {fileID: 1722684514} - {fileID: 1778172779} + - {fileID: 129966973} - {fileID: 1674363968} - {fileID: 340545072} - {fileID: 1028362469} + - {fileID: 1722684514} m_Father: {fileID: 1199026938} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 846, y: -513.4278} - m_SizeDelta: {x: 494, y: 1026.8556} + m_AnchoredPosition: {x: 307, y: -513.42773} + m_SizeDelta: {x: 494, y: 1026.8555} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2051584426 MonoBehaviour: @@ -510501,19 +511640,37 @@ MonoBehaviour: m_TargetGraphic: {fileID: 2051584426} m_OnClick: m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 981460999} - m_TargetAssemblyTypeName: ChestOpener, Assembly-CSharp - m_MethodName: OpenChest - 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_Calls: [] +--- !u!114 &2051584429 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2051584424} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3a00d06b92d7a4dd78fab8529a589430, type: 3} + m_Name: + m_EditorClassIdentifier: + IsSpecial: 1 + readFromTexts: 1 + txtPrice: {fileID: 737186283} + txtChestName: {fileID: 129966974} + Price: 29 + minLuck: 0 + maxLuck: 96 + btnInfo: {fileID: 1722684517} + infoTxt: 'Gold + + Gems : 47.9% + + Common Skin : 27.1% + + Rare Skin : 11.5% + + Legendary + Skin : 1.0%' --- !u!4 &2051673085 stripped Transform: m_CorrespondingSourceObject: {fileID: 4321181462240980, guid: e29af4285b196934e8a0dc3db5c695da, type: 3} @@ -529679,8 +530836,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 235.28166, y: -72.5} - m_SizeDelta: {x: 470.56332, y: 145} + m_AnchoredPosition: {x: 235.17833, y: -72.5} + m_SizeDelta: {x: 470.35666, y: 145} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2112997475 MonoBehaviour: @@ -543928,7 +545085,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &2144704617 RectTransform: m_ObjectHideFlags: 0 @@ -543950,8 +545107,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 307, y: -513.4278} - m_SizeDelta: {x: 494, y: 1026.8556} + m_AnchoredPosition: {x: 307, y: -513.42773} + m_SizeDelta: {x: 494, y: 1026.8555} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2144704618 MonoBehaviour: diff --git a/Assets/Game/Scenes/GameScene/Login.unity b/Assets/Game/Scenes/GameScene/Login.unity index 5f77d94f9..6841694d2 100644 --- a/Assets/Game/Scenes/GameScene/Login.unity +++ b/Assets/Game/Scenes/GameScene/Login.unity @@ -873,6 +873,84 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &634221807 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 634221808} + - component: {fileID: 634221810} + - component: {fileID: 634221809} + m_Layer: 5 + m_Name: TitleLine + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &634221808 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 634221807} + 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_Children: + - {fileID: 7675510707747234999} + - {fileID: 7675510707268893562} + - {fileID: 7675510707298469670} + m_Father: {fileID: 7675510707679350540} + 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_SizeDelta: {x: 1120.3, y: 140.3} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &634221809 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 634221807} + m_Enabled: 0 + 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: 0} + 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 &634221810 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 634221807} + m_CullTransparentMesh: 1 --- !u!1 &634778741 GameObject: m_ObjectHideFlags: 0 @@ -2040,153 +2118,6 @@ RectTransform: m_CorrespondingSourceObject: {fileID: 1122908926327601336, guid: f1c38827cf8d35ea8bb29a9d8d0ec0a8, type: 3} m_PrefabInstance: {fileID: 1823654559} m_PrefabAsset: {fileID: 0} ---- !u!1001 &2059670464 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 2099029542} - m_Modifications: - - target: {fileID: 7675510706023642998, guid: 46fce459b689a1d88a04f46961c63ae8, type: 3} - propertyPath: m_text - value: Error - objectReference: {fileID: 0} - - target: {fileID: 7675510706189243184, guid: 46fce459b689a1d88a04f46961c63ae8, type: 3} - propertyPath: m_Name - value: Popup_Checking - objectReference: {fileID: 0} - - target: {fileID: 7675510706189243184, guid: 46fce459b689a1d88a04f46961c63ae8, type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7675510706189243187, guid: 46fce459b689a1d88a04f46961c63ae8, type: 3} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 7675510706189243187, guid: 46fce459b689a1d88a04f46961c63ae8, type: 3} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 7675510706189243187, guid: 46fce459b689a1d88a04f46961c63ae8, type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7675510706189243187, guid: 46fce459b689a1d88a04f46961c63ae8, type: 3} - propertyPath: m_AnchorMax.x - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7675510706189243187, guid: 46fce459b689a1d88a04f46961c63ae8, type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7675510706189243187, guid: 46fce459b689a1d88a04f46961c63ae8, type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7675510706189243187, guid: 46fce459b689a1d88a04f46961c63ae8, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7675510706189243187, guid: 46fce459b689a1d88a04f46961c63ae8, type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7675510706189243187, guid: 46fce459b689a1d88a04f46961c63ae8, type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7675510706189243187, guid: 46fce459b689a1d88a04f46961c63ae8, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7675510706189243187, guid: 46fce459b689a1d88a04f46961c63ae8, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7675510706189243187, guid: 46fce459b689a1d88a04f46961c63ae8, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7675510706189243187, guid: 46fce459b689a1d88a04f46961c63ae8, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7675510706189243187, guid: 46fce459b689a1d88a04f46961c63ae8, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 7675510706189243187, guid: 46fce459b689a1d88a04f46961c63ae8, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 7675510706189243187, guid: 46fce459b689a1d88a04f46961c63ae8, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 7675510706189243187, guid: 46fce459b689a1d88a04f46961c63ae8, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7675510706189243187, guid: 46fce459b689a1d88a04f46961c63ae8, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7675510706189243187, guid: 46fce459b689a1d88a04f46961c63ae8, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7675510706189243187, guid: 46fce459b689a1d88a04f46961c63ae8, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7675510706189243187, guid: 46fce459b689a1d88a04f46961c63ae8, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7675510706437162315, guid: 46fce459b689a1d88a04f46961c63ae8, type: 3} - propertyPath: m_text - value: "Sorry, We couldn't log you in. \nReason: no user found!" - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 46fce459b689a1d88a04f46961c63ae8, type: 3} ---- !u!114 &2059670465 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 7675510707114807737, guid: 46fce459b689a1d88a04f46961c63ae8, type: 3} - m_PrefabInstance: {fileID: 2059670464} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!224 &2059670466 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 7675510706189243187, guid: 46fce459b689a1d88a04f46961c63ae8, type: 3} - m_PrefabInstance: {fileID: 2059670464} - m_PrefabAsset: {fileID: 0} ---- !u!114 &2059670467 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 7675510706437162315, guid: 46fce459b689a1d88a04f46961c63ae8, type: 3} - m_PrefabInstance: {fileID: 2059670464} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &2059670468 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 7675510706023642998, guid: 46fce459b689a1d88a04f46961c63ae8, type: 3} - m_PrefabInstance: {fileID: 2059670464} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &2099029536 GameObject: m_ObjectHideFlags: 0 @@ -2202,7 +2133,7 @@ GameObject: - component: {fileID: 2099029538} - component: {fileID: 2099029537} m_Layer: 5 - m_Name: Canvas (1) + m_Name: Message m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -2220,9 +2151,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 3f3da2feee9b5e021927efdd7602355e, type: 3} m_Name: m_EditorClassIdentifier: - titleTxt: {fileID: 2059670468} - messageTxt: {fileID: 2059670467} - actionBtn: {fileID: 2059670465} + titleTxt: {fileID: 7675510707747234998} + messageTxt: {fileID: 7675510707330291339} + actionBtn: {fileID: 7675510706683052665} --- !u!225 &2099029538 CanvasGroup: m_ObjectHideFlags: 0 @@ -2294,7 +2225,7 @@ Canvas: m_SortingBucketNormalizedSize: 0 m_AdditionalShaderChannelsFlag: 25 m_SortingLayerID: 0 - m_SortingOrder: 1 + m_SortingOrder: 20 m_TargetDisplay: 0 --- !u!224 &2099029542 RectTransform: @@ -2307,7 +2238,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0, y: 0, z: 0} m_Children: - - {fileID: 2059670466} + - {fileID: 7675510707443073267} m_Father: {fileID: 0} m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -2863,7 +2794,7 @@ MonoBehaviour: m_CaretColor: {r: 0.121568635, g: 0.72156864, b: 0.98823535, a: 1} m_CustomCaretColor: 1 m_SelectionColor: {r: 0.65882355, g: 0.80784315, b: 1, a: 0.7529412} - m_Text: King + m_Text: m_CaretBlinkRate: 0.85 m_CaretWidth: 5 m_ReadOnly: 0 @@ -2983,7 +2914,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1352124585668732834} - m_Enabled: 0 + m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} m_Name: @@ -3018,7 +2949,7 @@ MonoBehaviour: m_spriteAsset: {fileID: 0} m_tintAllSprites: 0 m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: 0 + m_TextStyleHashCode: -1183493901 m_overrideHtmlColors: 0 m_faceColor: serializedVersion: 2 @@ -3617,7 +3548,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: "King\u200B" + m_text: "\u200B" m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: c1482dbce654844b9ba1c753cbea5d80, type: 2} m_sharedMaterial: {fileID: 7374927986402738804, guid: c1482dbce654844b9ba1c753cbea5d80, type: 2} @@ -4921,6 +4852,25 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1352124587237562812} m_CullTransparentMesh: 0 +--- !u!224 &5360182080170649713 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5916539649839865184} + 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_Children: [] + m_Father: {fileID: 7675510707298469670} + 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: 0, y: 5.4} + m_SizeDelta: {x: 49, y: 53} + m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5400831500666047900 CanvasRenderer: m_ObjectHideFlags: 0 @@ -5042,6 +4992,24 @@ RectTransform: m_AnchoredPosition: {x: -42.400024, y: -40.799988} m_SizeDelta: {x: 106.99986, y: 103} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &5916539649839865184 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5360182080170649713} + - component: {fileID: 6624494645370422933} + - component: {fileID: 9106166243140170996} + m_Layer: 5 + m_Name: Icon + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 --- !u!114 &5978506992124278525 MonoBehaviour: m_ObjectHideFlags: 0 @@ -5056,6 +5024,14 @@ MonoBehaviour: m_EditorClassIdentifier: otherPanels: - {fileID: 0} +--- !u!222 &6624494645370422933 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5916539649839865184} + m_CullTransparentMesh: 0 --- !u!114 &6784925740649348723 MonoBehaviour: m_ObjectHideFlags: 0 @@ -5105,6 +5081,1106 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 5.4} m_SizeDelta: {x: 49, y: 53} m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7675510706271282584 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7675510706271282599} + m_CullTransparentMesh: 0 +--- !u!114 &7675510706271282585 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7675510706271282599} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 2100000, guid: 728fa64fe6dd24aa5ae13b1da2514961, type: 2} + m_Color: {r: 0.9198113, g: 0.98496586, b: 1, a: 0.09803922} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 73d8983007ddd4830baf7ecba1debd74, 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!224 &7675510706271282598 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7675510706271282599} + 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_Children: [] + m_Father: {fileID: 7675510707443073267} + 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: -649.3976} + m_SizeDelta: {x: 971, y: 970} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &7675510706271282599 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7675510706271282598} + - component: {fileID: 7675510706271282584} + - component: {fileID: 7675510706271282585} + m_Layer: 5 + m_Name: BackGlow + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7675510706666573576 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7675510706666573577} + 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_Children: + - {fileID: 7675510707783447632} + m_Father: {fileID: 7675510706683052550} + 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: 0.23, y: 8.53} + m_SizeDelta: {x: 111.503265, y: 77.188614} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &7675510706666573577 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7675510706666573576} + - component: {fileID: 7675510706666573578} + - component: {fileID: 7675510706666573579} + m_Layer: 5 + m_Name: Text_Ok + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!222 &7675510706666573578 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7675510706666573577} + m_CullTransparentMesh: 0 +--- !u!114 &7675510706666573579 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7675510706666573577} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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_text: Ok + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: c2f49fe8c22d94f9a9e6cd06ad490155, type: 2} + m_sharedMaterial: {fileID: 3074828514974314926, guid: c2f49fe8c22d94f9a9e6cd06ad490155, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 50 + m_fontSizeBase: 50 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 1 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!224 &7675510706683052550 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7675510706683052551} + 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_Children: + - {fileID: 7675510706666573576} + m_Father: {fileID: 7675510707679350540} + 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_SizeDelta: {x: 442.50793, y: 145} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &7675510706683052551 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7675510706683052550} + - component: {fileID: 7675510706683052667} + - component: {fileID: 7675510706683052664} + - component: {fileID: 7675510706683052665} + m_Layer: 5 + m_Name: Button_Ok + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &7675510706683052664 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7675510706683052551} + 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: 6bbcba4e267be464998897741b81d508, type: 3} + m_Type: 1 + 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!114 &7675510706683052665 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7675510706683052551} + 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: 7675510706683052664} + m_OnClick: + m_PersistentCalls: + m_Calls: [] +--- !u!222 &7675510706683052667 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7675510706683052551} + m_CullTransparentMesh: 0 +--- !u!114 &7675510707072810568 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7675510707072810582} + 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: 5551461a712fd427aa2b059aac398cd4, type: 3} + m_Type: 1 + 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!224 &7675510707072810569 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7675510707072810582} + 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_Children: [] + m_Father: {fileID: 7675510707443073267} + 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_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7675510707072810571 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7675510707072810582} + m_CullTransparentMesh: 0 +--- !u!1 &7675510707072810582 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7675510707072810569} + - component: {fileID: 7675510707072810571} + - component: {fileID: 7675510707072810568} + m_Layer: 5 + m_Name: Dimed + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7675510707268893562 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7675510707268893563} + 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_Children: [] + m_Father: {fileID: 634221808} + 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: 2.6020343, y: -168.3028} + m_SizeDelta: {x: 1071.4692, y: 56} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &7675510707268893563 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7675510707268893562} + - component: {fileID: 7675510707268893564} + - component: {fileID: 7675510707268893565} + m_Layer: 5 + m_Name: TitleLine + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!222 &7675510707268893564 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7675510707268893563} + m_CullTransparentMesh: 0 +--- !u!114 &7675510707268893565 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7675510707268893563} + 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: 228b09b7fa1c5455eab8432a85fac4ee, 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!114 &7675510707298469656 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7675510707298469671} + 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: 93c93e80f179c4cae911a48ab2fc913b, type: 3} + m_Type: 1 + 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!114 &7675510707298469657 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7675510707298469671} + 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: 7675510707298469656} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 2099029537} + m_TargetAssemblyTypeName: MessageDialog, Assembly-CSharp + m_MethodName: SetActive + m_Mode: 6 + 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 +--- !u!222 &7675510707298469659 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7675510707298469671} + m_CullTransparentMesh: 0 +--- !u!224 &7675510707298469670 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7675510707298469671} + 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_Children: + - {fileID: 5360182080170649713} + m_Father: {fileID: 634221808} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -42.392048, y: -40.797546} + m_SizeDelta: {x: 106.99986, y: 103} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &7675510707298469671 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7675510707298469670} + - component: {fileID: 7675510707298469659} + - component: {fileID: 7675510707298469656} + - component: {fileID: 7675510707298469657} + 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 &7675510707330291336 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7675510707330291337} + 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_Children: [] + m_Father: {fileID: 7675510707679350540} + 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: 560.156, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &7675510707330291337 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7675510707330291336} + - component: {fileID: 7675510707330291338} + - component: {fileID: 7675510707330291339} + - component: {fileID: 7675510707330291340} + m_Layer: 5 + m_Name: Text_Info + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!222 &7675510707330291338 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7675510707330291337} + m_CullTransparentMesh: 0 +--- !u!114 &7675510707330291339 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7675510707330291337} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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_text: "Sorry, We couldn't log you in. \nReason: no user found!" + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: c1482dbce654844b9ba1c753cbea5d80, type: 2} + m_sharedMaterial: {fileID: 7374927986402738804, guid: c1482dbce654844b9ba1c753cbea5d80, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 43 + m_fontSizeBase: 43 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: -1 + m_wordSpacing: 0 + m_lineSpacing: 7.03 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 1 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!114 &7675510707330291340 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7675510707330291337} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 2 + m_VerticalFit: 2 +--- !u!1 &7675510707443073264 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7675510707443073267} + - component: {fileID: 9011286272097245822} + m_Layer: 5 + m_Name: Popup_Checking + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7675510707443073267 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7675510707443073264} + 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_Children: + - {fileID: 7675510707072810569} + - {fileID: 7675510707679350540} + - {fileID: 7675510706271282598} + m_Father: {fileID: 2099029542} + 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_Pivot: {x: 0.5, y: 0.5} +--- !u!224 &7675510707679350540 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7675510707679350541} + 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_Children: + - {fileID: 634221808} + - {fileID: 7675510707330291336} + - {fileID: 7675510706683052550} + m_Father: {fileID: 7675510707443073267} + 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} + m_AnchoredPosition: {x: 0, y: -2.6} + m_SizeDelta: {x: 1120.312, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &7675510707679350541 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7675510707679350540} + - component: {fileID: 7675510707679350542} + - component: {fileID: 7675510707679350543} + - component: {fileID: 7675510707679350545} + - component: {fileID: 7675510707679350544} + m_Layer: 5 + m_Name: Popup + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!222 &7675510707679350542 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7675510707679350541} + m_CullTransparentMesh: 0 +--- !u!114 &7675510707679350543 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7675510707679350541} + 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: eb3db5b0868bc4f348e3d3a1dfbf32a8, type: 3} + m_Type: 1 + 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!114 &7675510707679350544 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7675510707679350541} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 0 + m_VerticalFit: 2 +--- !u!114 &7675510707679350545 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7675510707679350541} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 50 + m_ChildAlignment: 1 + m_Spacing: 50 + m_ChildForceExpandWidth: 0 + m_ChildForceExpandHeight: 1 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 + m_ChildScaleWidth: 0 + m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 +--- !u!222 &7675510707747234985 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7675510707747234996} + m_CullTransparentMesh: 0 +--- !u!1 &7675510707747234996 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7675510707747234999} + - component: {fileID: 7675510707747234985} + - component: {fileID: 7675510707747234998} + m_Layer: 5 + m_Name: Text_Title + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &7675510707747234998 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7675510707747234996} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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_text: Error + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 605433b68313d491a8ab88bc03a41651, type: 2} + m_sharedMaterial: {fileID: 2830636965969884548, guid: 605433b68313d491a8ab88bc03a41651, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 57 + m_fontSizeBase: 57 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 1 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!224 &7675510707747234999 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7675510707747234996} + 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_Children: [] + m_Father: {fileID: 634221808} + 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.0020345054, y: -75.94047} + m_SizeDelta: {x: 681.2191, y: 95.1859} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!224 &7675510707783447632 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7675510707783447633} + 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_Children: [] + m_Father: {fileID: 7675510706666573576} + 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_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &7675510707783447633 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7675510707783447632} + - component: {fileID: 7675510707783447634} + m_Layer: 5 + m_Name: TMP SubMeshUI [LiberationSans SDF Material] + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!222 &7675510707783447634 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7675510707783447633} + m_CullTransparentMesh: 0 --- !u!1 &8245170103217493991 GameObject: m_ObjectHideFlags: 0 @@ -5131,3 +6207,47 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8245170103217493991} m_CullTransparentMesh: 0 +--- !u!114 &9011286272097245822 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7675510707443073264} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9a00128818eda43dfaa959b83527b255, type: 3} + m_Name: + m_EditorClassIdentifier: + otherPanels: + - {fileID: 0} +--- !u!114 &9106166243140170996 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5916539649839865184} + 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: 70f78e062098c4496b852abefff63acf, 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 diff --git a/Assets/Game/Scenes/Minigame/Minigame.unity b/Assets/Game/Scenes/Minigame/Minigame.unity index 43100dfe9..e3193a509 100644 --- a/Assets/Game/Scenes/Minigame/Minigame.unity +++ b/Assets/Game/Scenes/Minigame/Minigame.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.44402248, g: 0.49316555, b: 0.5722324, a: 1} + m_IndirectSpecularColor: {r: 0.4465791, g: 0.4964133, b: 0.57481784, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -123,49 +123,6 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} ---- !u!1 &5820110 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5820111} - - component: {fileID: 5820112} - m_Layer: 0 - m_Name: SpawnPoint (10) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &5820111 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5820110} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -202, y: -89, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 945516891} - m_RootOrder: 9 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &5820112 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5820110} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 41f84591ce72545258ea98cb7518d8b9, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &7902094 GameObject: m_ObjectHideFlags: 0 @@ -5211,7 +5168,7 @@ MonoBehaviour: authenticator: {fileID: 0} playerPrefab: {fileID: 5431987895376475548, guid: e811a838f2ebb2f4fb8055331ed295e9, type: 3} autoCreatePlayer: 1 - playerSpawnMethod: 0 + playerSpawnMethod: 1 spawnPrefabs: - {fileID: 5339383961425506408, guid: ad54ea1b437d2b344add56c18d1efb3e, type: 3} - {fileID: 8298505072154104440, guid: 8cfd89c315493e64782e167885b4b498, type: 3} @@ -5256,6 +5213,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: isClient: 1 + isRanked: 0 + transport: {fileID: 0} --- !u!1 &43679075 GameObject: m_ObjectHideFlags: 0 @@ -5959,6 +5918,7 @@ MonoBehaviour: metalEarnings: {fileID: 5001849304093201857} survivalTimeTxt: {fileID: 139961636} mostTimeTxt: {fileID: 2120458708} + gameOverTxt: {fileID: 0} boostBtn: {fileID: 2133876932} timerTxt: {fileID: 297250423} --- !u!4 &332697609 @@ -5989,9 +5949,14 @@ MonoBehaviour: m_EditorClassIdentifier: syncMode: 0 syncInterval: 0.1 - mapRadius: 500 - maxMoons: 700 - maxStars: 1000 + isRanked: 0 + RankedGameStarted: 0 + winnerId: -1 + waitingScreen: {fileID: 0} + rankedSummary: {fileID: 0} + mapRadius: 250 + maxMoons: 350 + maxStars: 500 pickupItemsParent: {fileID: 41572335} moon: {fileID: 5339383961425506408, guid: ad54ea1b437d2b344add56c18d1efb3e, type: 3} star: {fileID: 8298505072154104440, guid: 8cfd89c315493e64782e167885b4b498, type: 3} @@ -6579,7 +6544,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 494509960} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -678, y: -58, z: 0} + m_LocalPosition: {x: -439, y: -244, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 945516891} @@ -6969,7 +6934,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 613727044} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -571, y: -748, z: 0} + m_LocalPosition: {x: -308, y: -341, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 945516891} @@ -7229,7 +7194,7 @@ Transform: m_GameObject: {fileID: 725845372} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 32.2, y: 32.2, z: 1} + m_LocalScale: {x: 16.1, y: 16.1, z: 1} m_Children: [] m_Father: {fileID: 0} m_RootOrder: 10 @@ -8011,7 +7976,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 871230063} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -264, y: -527, z: 0} + m_LocalPosition: {x: -356, y: -562, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 945516891} @@ -8239,7 +8204,6 @@ Transform: - {fileID: 1837953384} - {fileID: 494509961} - {fileID: 1398901127} - - {fileID: 5820111} m_Father: {fileID: 0} m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -8588,6 +8552,7 @@ MonoBehaviour: - {fileID: 37150598} - {fileID: 2145051021} updateInterval: 0.5 + isRanked: 0 --- !u!1 &1118240007 GameObject: m_ObjectHideFlags: 0 @@ -9280,7 +9245,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1398901126} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -642, y: -349, z: 0} + m_LocalPosition: {x: -328, y: -556, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 945516891} @@ -9398,7 +9363,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1474265870} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -270, y: -746, z: 0} + m_LocalPosition: {x: -250, y: -411, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 945516891} @@ -9915,7 +9880,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1837953383} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -356, y: -510, z: 0} + m_LocalPosition: {x: -382, y: -597, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 945516891} @@ -9958,7 +9923,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1853399998} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -472, y: -531, z: 0} + m_LocalPosition: {x: -572, y: -423, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 945516891} @@ -10440,7 +10405,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &2133876931 RectTransform: m_ObjectHideFlags: 0 diff --git a/Assets/Game/Scenes/Minigame/MinigameRanked.unity b/Assets/Game/Scenes/Minigame/MinigameRanked.unity index 63e5d2e2e..7373e82ee 100644 --- a/Assets/Game/Scenes/Minigame/MinigameRanked.unity +++ b/Assets/Game/Scenes/Minigame/MinigameRanked.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.4465791, g: 0.4964133, b: 0.57481784, a: 1} + m_IndirectSpecularColor: {r: 0.44402248, g: 0.49316555, b: 0.5722324, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -5343,140 +5343,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 83788680} m_CullTransparentMesh: 1 ---- !u!1 &139961634 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 139961635} - - component: {fileID: 139961637} - - component: {fileID: 139961636} - m_Layer: 5 - m_Name: content - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &139961635 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 139961634} - 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_Children: [] - m_Father: {fileID: 810023545} - 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: 310.99997, y: 0} - m_SizeDelta: {x: 295.947, y: 82.9552} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &139961636 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 139961634} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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_text: 2:05 - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 7659f6d6ec9b642db8be29bc45fe97cc, type: 2} - m_sharedMaterial: {fileID: 8690591861142563998, guid: 7659f6d6ec9b642db8be29bc45fe97cc, type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: -1183493901 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_fontSize: 45 - m_fontSizeBase: 45 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 - m_fontSizeMax: 72 - m_fontStyle: 0 - m_HorizontalAlignment: 1 - m_VerticalAlignment: 512 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 1 - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 1 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 1 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_baseMaterial: {fileID: 0} - m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!222 &139961637 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 139961634} - m_CullTransparentMesh: 0 --- !u!1 &290750407 GameObject: m_ObjectHideFlags: 0 @@ -5502,7 +5368,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 290750407} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -456.5, y: -308.3, z: 0} + m_LocalPosition: {x: -381.7, y: -418.8, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 945516891} @@ -5761,6 +5627,81 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &310233814 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 310233815} + - component: {fileID: 310233817} + - component: {fileID: 310233816} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &310233815 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 310233814} + 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_Children: [] + m_Father: {fileID: 810023545} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: -49.1, y: 0} + m_SizeDelta: {x: 80, y: 80} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &310233816 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 310233814} + 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: 9eda7fdd65e344e1e95eac4d16ccf7da, 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 &310233817 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 310233814} + m_CullTransparentMesh: 1 --- !u!1 &332697607 GameObject: m_ObjectHideFlags: 0 @@ -5773,6 +5714,7 @@ GameObject: - component: {fileID: 332697608} - component: {fileID: 332697611} - component: {fileID: 332697610} + - component: {fileID: 332697612} m_Layer: 0 m_Name: GameManager m_TagString: Untagged @@ -5796,8 +5738,9 @@ MonoBehaviour: deadScreen: {fileID: 2181381953112870397} xpEarnings: {fileID: 5001849302636537842} metalEarnings: {fileID: 5001849304093201857} - survivalTimeTxt: {fileID: 139961636} - mostTimeTxt: {fileID: 2120458708} + survivalTimeTxt: {fileID: 0} + mostTimeTxt: {fileID: 0} + gameOverTxt: {fileID: 789429595} boostBtn: {fileID: 2133876932} timerTxt: {fileID: 297250423} --- !u!4 &332697609 @@ -5830,10 +5773,13 @@ MonoBehaviour: syncInterval: 0.1 isRanked: 1 RankedGameStarted: 0 + winnerId: -1 + startedTime: 0 waitingScreen: {fileID: 1105111915} - mapRadius: 166.66667 - maxMoons: 233 - maxStars: 333 + rankedSummary: {fileID: 2181381953112870398} + mapRadius: 41.666676 + maxMoons: 40 + maxStars: 30 pickupItemsParent: {fileID: 41572335} moon: {fileID: 5339383961425506408, guid: ad54ea1b437d2b344add56c18d1efb3e, type: 3} star: {fileID: 8298505072154104440, guid: 8cfd89c315493e64782e167885b4b498, type: 3} @@ -5856,6 +5802,20 @@ MonoBehaviour: visible: 0 m_AssetId: hasSpawned: 0 +--- !u!114 &332697612 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 332697607} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 812537ae82c3b8c56ada62732b76a181, type: 3} + m_Name: + m_EditorClassIdentifier: + txtGameOver: {fileID: 789429595} + txtTrophies: {fileID: 0} --- !u!1 &422557611 GameObject: m_ObjectHideFlags: 0 @@ -6508,10 +6468,10 @@ RectTransform: m_Father: {fileID: 1541841919} 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: 82.32, y: 0} - m_SizeDelta: {x: 0, y: 64} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 82.32, y: -50} + m_SizeDelta: {x: 164.64, y: 64} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &532150900 MonoBehaviour: @@ -6985,7 +6945,7 @@ Transform: m_GameObject: {fileID: 725845372} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 10.75, y: 10.75, z: 1} + m_LocalScale: {x: 2.6875, y: 2.6875, z: 1} m_Children: [] m_Father: {fileID: 0} m_RootOrder: 9 @@ -7069,6 +7029,140 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 731361769} m_CullTransparentMesh: 1 +--- !u!1 &789429593 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 789429594} + - component: {fileID: 789429596} + - component: {fileID: 789429595} + m_Layer: 5 + m_Name: txtWon + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &789429594 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 789429593} + 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_Children: [] + m_Father: {fileID: 5001849302241710808} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: 0, y: 228.9} + m_SizeDelta: {x: 0, y: 155.61017} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &789429595 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 789429593} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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_text: YOU WON! + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 7659f6d6ec9b642db8be29bc45fe97cc, type: 2} + m_sharedMaterial: {fileID: 8690591861142563998, guid: 7659f6d6ec9b642db8be29bc45fe97cc, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4283694990 + m_fontColor: {r: 0.5563712, g: 1, b: 0.32549024, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 135 + m_fontSizeBase: 135 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 1 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &789429596 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 789429593} + m_CullTransparentMesh: 0 --- !u!1 &799128814 GameObject: m_ObjectHideFlags: 0 @@ -7215,7 +7309,7 @@ GameObject: - component: {fileID: 810023547} - component: {fileID: 810023546} m_Layer: 5 - m_Name: txt_survivalTime + m_Name: txt_trophies m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -7232,15 +7326,15 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 139961635} + - {fileID: 310233815} m_Father: {fileID: 5001849302241710808} - m_RootOrder: 5 + m_RootOrder: 4 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: 95, y: -93} - m_SizeDelta: {x: 295.947, y: 82.9552} - m_Pivot: {x: 1, y: 0.5} + m_AnchoredPosition: {x: 0, y: -93} + m_SizeDelta: {x: 136.2, y: 82.9552} + m_Pivot: {x: 0, y: 0.5} --- !u!114 &810023546 MonoBehaviour: m_ObjectHideFlags: 0 @@ -7261,7 +7355,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: 'Survival Time :' + m_text: + 15 m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 7659f6d6ec9b642db8be29bc45fe97cc, type: 2} m_sharedMaterial: {fileID: 8690591861142563998, guid: 7659f6d6ec9b642db8be29bc45fe97cc, type: 2} @@ -7270,8 +7364,8 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4285098485 - m_fontColor: {r: 0.9622642, g: 0.41304737, b: 0.41304737, a: 1} + rgba: 4278255401 + m_fontColor: {r: 0.161767, g: 1, b: 0, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -7295,7 +7389,7 @@ MonoBehaviour: m_fontSizeMin: 18 m_fontSizeMax: 72 m_fontStyle: 0 - m_HorizontalAlignment: 2 + m_HorizontalAlignment: 1 m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 @@ -7742,49 +7836,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 854798432} m_CullTransparentMesh: 1 ---- !u!1 &871230063 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 871230064} - - component: {fileID: 871230065} - m_Layer: 0 - m_Name: SpawnPoint (3) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &871230064 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 871230063} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -307.1, y: -409.9, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 945516891} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &871230065 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 871230063} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 41f84591ce72545258ea98cb7518d8b9, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &908462432 GameObject: m_ObjectHideFlags: 0 @@ -7988,7 +8039,6 @@ Transform: m_Children: - {fileID: 1853399999} - {fileID: 290750408} - - {fileID: 871230064} m_Father: {fileID: 0} m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -8025,10 +8075,10 @@ RectTransform: m_Father: {fileID: 532150899} 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_SizeDelta: {x: 0, y: 91} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 180.64, y: -32} + m_SizeDelta: {x: 68, y: 91} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &981173702 MonoBehaviour: @@ -8252,9 +8302,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fa3e9285a9018d093ab853b5f879544f, type: 3} m_Name: m_EditorClassIdentifier: - isClient: 0 + isClient: 1 isRanked: 1 - lrm: {fileID: 5010164752600225294} + transport: {fileID: 5010164752600225290} --- !u!1 &1083193386 GameObject: m_ObjectHideFlags: 0 @@ -8706,10 +8756,10 @@ RectTransform: m_Father: {fileID: 532150899} 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_SizeDelta: {x: 0, y: 50} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 103.32, y: -32} + m_SizeDelta: {x: 46.64, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1251195779 MonoBehaviour: @@ -9287,7 +9337,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1541841919 RectTransform: m_ObjectHideFlags: 0 @@ -9306,7 +9356,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} m_AnchoredPosition: {x: 25.49, y: 222.01994} - m_SizeDelta: {x: 0, y: 100} + m_SizeDelta: {x: 164.64, y: 100} m_Pivot: {x: 0, y: 0.5} --- !u!114 &1541841920 MonoBehaviour: @@ -9454,141 +9504,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1627288508} m_CullTransparentMesh: 1 ---- !u!1 &1688835262 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1688835263} - - component: {fileID: 1688835265} - - component: {fileID: 1688835264} - m_Layer: 5 - m_Name: txt_personalBest - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1688835263 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1688835262} - 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_Children: - - {fileID: 2120458707} - m_Father: {fileID: 5001849302241710808} - m_RootOrder: 6 - 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: 104, y: -153.99998} - m_SizeDelta: {x: 295.947, y: 82.9552} - m_Pivot: {x: 1, y: 0.5} ---- !u!114 &1688835264 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1688835262} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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_text: 'Personal Best :' - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 7659f6d6ec9b642db8be29bc45fe97cc, type: 2} - m_sharedMaterial: {fileID: 8690591861142563998, guid: 7659f6d6ec9b642db8be29bc45fe97cc, type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4288544662 - m_fontColor: {r: 0.5896226, g: 1, b: 0.6175092, a: 1} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: -1183493901 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_fontSize: 39.5 - m_fontSizeBase: 39.5 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 - m_fontSizeMax: 72 - m_fontStyle: 0 - m_HorizontalAlignment: 2 - m_VerticalAlignment: 512 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 1 - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 1 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 1 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_baseMaterial: {fileID: 0} - m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!222 &1688835265 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1688835262} - m_CullTransparentMesh: 0 --- !u!1 &1689565360 GameObject: m_ObjectHideFlags: 0 @@ -9689,7 +9604,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1853399998} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -472, y: -531, z: 0} + m_LocalPosition: {x: -425, y: -415.2, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 945516891} @@ -9977,140 +9892,6 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 0} ---- !u!1 &2120458706 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2120458707} - - component: {fileID: 2120458709} - - component: {fileID: 2120458708} - m_Layer: 5 - m_Name: content - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &2120458707 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2120458706} - 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_Children: [] - m_Father: {fileID: 1688835263} - 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: 291, y: 0} - m_SizeDelta: {x: 295.947, y: 82.9552} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &2120458708 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2120458706} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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_text: 10:56 - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 7659f6d6ec9b642db8be29bc45fe97cc, type: 2} - m_sharedMaterial: {fileID: 8690591861142563998, guid: 7659f6d6ec9b642db8be29bc45fe97cc, type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: -1183493901 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_fontSize: 39.5 - m_fontSizeBase: 39.5 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 - m_fontSizeMax: 72 - m_fontStyle: 0 - m_HorizontalAlignment: 1 - m_VerticalAlignment: 512 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 1 - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 1 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 1 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_baseMaterial: {fileID: 0} - m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!222 &2120458709 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2120458706} - m_CullTransparentMesh: 0 --- !u!1 &2133876930 GameObject: m_ObjectHideFlags: 0 @@ -10768,140 +10549,6 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 0 ---- !u!222 &2181381952468530338 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2181381952468530343} - m_CullTransparentMesh: 0 ---- !u!224 &2181381952468530340 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2181381952468530343} - 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_Children: [] - m_Father: {fileID: 5001849302241710808} - m_RootOrder: 4 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.5} - m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: 0, y: 329.8} - m_SizeDelta: {x: 0, y: 155.61017} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &2181381952468530341 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2181381952468530343} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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_text: GAME OVER! - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 7659f6d6ec9b642db8be29bc45fe97cc, type: 2} - m_sharedMaterial: {fileID: 8690591861142563998, guid: 7659f6d6ec9b642db8be29bc45fe97cc, type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4283651071 - m_fontColor: {r: 1, g: 0.3254717, b: 0.3254717, a: 1} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: -1183493901 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_fontSize: 83.7 - m_fontSizeBase: 83.7 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 - m_fontSizeMax: 72 - m_fontStyle: 0 - m_HorizontalAlignment: 2 - m_VerticalAlignment: 512 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 1 - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 1 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 1 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_baseMaterial: {fileID: 0} - m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!1 &2181381952468530343 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2181381952468530340} - - component: {fileID: 2181381952468530338} - - component: {fileID: 2181381952468530341} - m_Layer: 5 - m_Name: Text_LevelUp! (1) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 --- !u!223 &2181381953112870392 Canvas: m_ObjectHideFlags: 0 @@ -10995,6 +10642,7 @@ GameObject: - component: {fileID: 2181381953112870392} - component: {fileID: 2181381953112870395} - component: {fileID: 2181381953112870394} + - component: {fileID: 2181381953112870398} m_Layer: 5 m_Name: GameOverCanvas m_TagString: Untagged @@ -11002,6 +10650,20 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 0 +--- !u!114 &2181381953112870398 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2181381953112870397} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 812537ae82c3b8c56ada62732b76a181, type: 3} + m_Name: + m_EditorClassIdentifier: + txtGameOver: {fileID: 789429595} + txtTrophies: {fileID: 810023546} --- !u!1 &2181381953304182528 GameObject: m_ObjectHideFlags: 0 @@ -11206,7 +10868,7 @@ RectTransform: m_Children: - {fileID: 2181381953304182529} m_Father: {fileID: 5001849302241710808} - m_RootOrder: 9 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -11300,10 +10962,8 @@ RectTransform: - {fileID: 5001849303285244145} - {fileID: 5001849302513345289} - {fileID: 5001849302629682031} - - {fileID: 5001849303737466000} - - {fileID: 2181381952468530340} + - {fileID: 789429594} - {fileID: 810023545} - - {fileID: 1688835263} - {fileID: 5001849304187709370} - {fileID: 5001849304324205333} - {fileID: 2181381953458012766} @@ -21298,7 +20958,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.6925271} m_AnchorMax: {x: 0.5, y: 0.6925271} - m_AnchoredPosition: {x: -13, y: 42} + m_AnchoredPosition: {x: -13, y: -9.5} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &5001849302513345290 @@ -51773,140 +51433,6 @@ ParticleSystem: m_PostInfinity: 2 m_RotationOrder: 4 vectorLabel1_3: W ---- !u!224 &5001849303737466000 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5001849303737466095} - 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_Children: [] - m_Father: {fileID: 5001849302241710808} - m_RootOrder: 3 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.5} - m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: 0, y: 179} - m_SizeDelta: {x: 0, y: 155.61017} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &5001849303737466001 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5001849303737466095} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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_text: BETTER LUCK NEXT TIME! - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 7659f6d6ec9b642db8be29bc45fe97cc, type: 2} - m_sharedMaterial: {fileID: 8690591861142563998, guid: 7659f6d6ec9b642db8be29bc45fe97cc, type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: -1183493901 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_fontSize: 120 - m_fontSizeBase: 120 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 - m_fontSizeMax: 72 - m_fontStyle: 0 - m_HorizontalAlignment: 2 - m_VerticalAlignment: 512 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 1 - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 1 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 1 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_baseMaterial: {fileID: 0} - m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!222 &5001849303737466002 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5001849303737466095} - m_CullTransparentMesh: 0 ---- !u!1 &5001849303737466095 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5001849303737466000} - - component: {fileID: 5001849303737466002} - - component: {fileID: 5001849303737466001} - m_Layer: 5 - m_Name: Text_LevelUp! - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 --- !u!1 &5001849303776086977 GameObject: m_ObjectHideFlags: 0 @@ -57162,7 +56688,7 @@ RectTransform: - {fileID: 5001849303377151116} - {fileID: 5001849302348518454} m_Father: {fileID: 5001849302241710808} - m_RootOrder: 7 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.18455672} m_AnchorMax: {x: 0.5, y: 0.18455672} @@ -62232,7 +61758,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &5001849304324205333 RectTransform: m_ObjectHideFlags: 0 @@ -62246,7 +61772,7 @@ RectTransform: m_Children: - {fileID: 5001849304092323074} m_Father: {fileID: 5001849302241710808} - m_RootOrder: 8 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 0} @@ -62357,9 +61883,8 @@ GameObject: m_Component: - component: {fileID: 5010164752600225292} - component: {fileID: 5010164752600225291} - - component: {fileID: 5010164752600225293} - - component: {fileID: 5010164752600225294} - component: {fileID: 5010164752600225290} + - component: {fileID: 5010164752600225293} - component: {fileID: 1067080657} m_Layer: 0 m_Name: NetworkManager @@ -62377,195 +61902,6 @@ MonoBehaviour: m_GameObject: {fileID: 5010164752600225289} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 9c4cbff877abc42448dd829920c6c233, type: 3} - m_Name: - m_EditorClassIdentifier: - directConnectTransport: {fileID: 5010164753662842926} - showDebugLogs: 0 ---- !u!114 &5010164752600225291 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5010164752600225289} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 8aab4c8111b7c411b9b92cf3dbc5bd4e, type: 3} - m_Name: - m_EditorClassIdentifier: - dontDestroyOnLoad: 1 - runInBackground: 1 - autoStartServerBuild: 1 - serverTickRate: 30 - offlineScene: - onlineScene: - transport: {fileID: 5010164752600225294} - networkAddress: vps.playpoolstudios.com - maxConnections: 100 - authenticator: {fileID: 0} - playerPrefab: {fileID: 5431987895376475548, guid: e811a838f2ebb2f4fb8055331ed295e9, type: 3} - autoCreatePlayer: 1 - playerSpawnMethod: 0 - spawnPrefabs: - - {fileID: 5339383961425506408, guid: ad54ea1b437d2b344add56c18d1efb3e, type: 3} - - {fileID: 8298505072154104440, guid: 8cfd89c315493e64782e167885b4b498, type: 3} ---- !u!4 &5010164752600225292 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5010164752600225289} - 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_Children: - - {fileID: 5010164753057090672} - - {fileID: 5010164753662842927} - m_Father: {fileID: 0} - m_RootOrder: 11 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &5010164752600225293 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5010164752600225289} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 6442dc8070ceb41f094e44de0bf87274, type: 3} - m_Name: - m_EditorClassIdentifier: - offsetX: 0 - offsetY: 0 ---- !u!114 &5010164752600225294 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5010164752600225289} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 7064b1b1d0671194baf55fa8d5f564d6, type: 3} - m_Name: - m_EditorClassIdentifier: - clientToServerTransport: {fileID: 5010164753057090703} - serverIP: 194.233.70.117 - serverPort: 7000 - endpointServerPort: 8250 - heartBeatInterval: 3 - connectOnAwake: 1 - authenticationKey: 4KiE8032f6RjX0FbPzf - disconnectedFromRelay: - m_PersistentCalls: - m_Calls: [] - connectedToRelay: - m_PersistentCalls: - m_Calls: [] - useNATPunch: 1 - NATPunchtroughPort: 1 - useLoadBalancer: 0 - loadBalancerPort: 7070 - loadBalancerAddress: 127.0.0.1 - serverName: My awesome server! - extraServerData: Map 1 - maxServerPlayers: 10 - isPublicServer: 1 - serverListUpdated: - m_PersistentCalls: - m_Calls: [] - serverStatus: Not Started. - serverId: - region: 1 ---- !u!4 &5010164753057090672 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5010164753057090702} - 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_Children: [] - m_Father: {fileID: 5010164752600225292} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &5010164753057090702 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5010164753057090672} - - component: {fileID: 5010164753057090703} - m_Layer: 0 - m_Name: LRM - Connector - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &5010164753057090703 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5010164753057090702} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 6b0fecffa3f624585964b0d0eb21b18e, type: 3} - m_Name: - m_EditorClassIdentifier: - Port: 7000 - DualMode: 1 - NoDelay: 1 - Interval: 10 - Timeout: 10000 - FastResend: 2 - CongestionWindow: 0 - SendWindowSize: 4096 - ReceiveWindowSize: 4096 - MaxRetransmit: 40 - NonAlloc: 1 - MaximizeSendReceiveBuffersToOSLimit: 1 - ReliableMaxMessageSize: 298449 - UnreliableMaxMessageSize: 1199 - debugLog: 0 - statisticsGUI: 0 - statisticsLog: 0 ---- !u!1 &5010164753662842925 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5010164753662842927} - - component: {fileID: 5010164753662842926} - m_Layer: 0 - m_Name: LRM - Direct Connect - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &5010164753662842926 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5010164753662842925} - m_Enabled: 1 - m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 6b0fecffa3f624585964b0d0eb21b18e, type: 3} m_Name: m_EditorClassIdentifier: @@ -62586,17 +61922,59 @@ MonoBehaviour: debugLog: 0 statisticsGUI: 0 statisticsLog: 0 ---- !u!4 &5010164753662842927 +--- !u!114 &5010164752600225291 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5010164752600225289} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8aab4c8111b7c411b9b92cf3dbc5bd4e, type: 3} + m_Name: + m_EditorClassIdentifier: + dontDestroyOnLoad: 0 + runInBackground: 1 + autoStartServerBuild: 0 + serverTickRate: 30 + offlineScene: + onlineScene: + transport: {fileID: 5010164752600225290} + networkAddress: vps.playpoolstudios.com + maxConnections: 100 + authenticator: {fileID: 0} + playerPrefab: {fileID: 5431987895376475548, guid: e811a838f2ebb2f4fb8055331ed295e9, type: 3} + autoCreatePlayer: 1 + playerSpawnMethod: 1 + spawnPrefabs: + - {fileID: 5339383961425506408, guid: ad54ea1b437d2b344add56c18d1efb3e, type: 3} + - {fileID: 8298505072154104440, guid: 8cfd89c315493e64782e167885b4b498, type: 3} +--- !u!4 &5010164752600225292 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5010164753662842925} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_GameObject: {fileID: 5010164752600225289} + 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_Children: [] - m_Father: {fileID: 5010164752600225292} - m_RootOrder: 1 + m_Father: {fileID: 0} + m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &5010164752600225293 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5010164752600225289} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6442dc8070ceb41f094e44de0bf87274, type: 3} + m_Name: + m_EditorClassIdentifier: + offsetX: 0 + offsetY: 0 diff --git a/Assets/Game/Scenes/Minigame/ship_skins.zip b/Assets/Game/Scenes/Minigame/ship_skins.zip new file mode 100644 index 000000000..47e0c360c Binary files /dev/null and b/Assets/Game/Scenes/Minigame/ship_skins.zip differ diff --git a/Assets/Game/Scenes/Minigame/ship_skins.zip.meta b/Assets/Game/Scenes/Minigame/ship_skins.zip.meta new file mode 100644 index 000000000..4f48d7b27 --- /dev/null +++ b/Assets/Game/Scenes/Minigame/ship_skins.zip.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 9874c3508c7e3534ab371989fd8cf992 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Game/Scripts/ChestOpener.cs b/Assets/Game/Scripts/ChestOpener.cs index a10af33b0..a725895e4 100644 --- a/Assets/Game/Scripts/ChestOpener.cs +++ b/Assets/Game/Scripts/ChestOpener.cs @@ -11,6 +11,7 @@ public class ChestOpener : MonoBehaviour public GameObject chestOpenPopup; + public bool active => chestOpenPopup.activeSelf; public Animator chestAnim; public GameObject gemsDrop; public GameObject goldDrop; @@ -24,10 +25,10 @@ public class ChestOpener : MonoBehaviour instance = this; } - public async void OpenChest(){ + public async void OpenChest(int minLuck, int maxLuck){ chestOpenPopup.SetActive(true); okButton.SetActive(false); - int luckiness= Random.Range(0,100); + int luckiness= Random.Range(minLuck,maxLuck); List baseSkins = new List(); List rareSkins = new List(); List legendarySkins = new List(); diff --git a/Assets/Game/Scripts/DBmanager.cs b/Assets/Game/Scripts/DBmanager.cs index 751661053..ed9f6ed7a 100644 --- a/Assets/Game/Scripts/DBmanager.cs +++ b/Assets/Game/Scripts/DBmanager.cs @@ -10,7 +10,7 @@ using System.Net; using System.Net.Sockets; public class DBmanager : MonoBehaviour { - public static string phpRoot = "http://vps.playpoolstudios.com/upf/"; + public static string phpRoot = "http://vmi1005083.contaboserver.net/upf/"; public static string username = null; @@ -22,6 +22,7 @@ public class DBmanager : MonoBehaviour private static int trophies = 0; private static int mostTime=0; private static int doubleKills,tripleKills,quadKills,pentaKills = 0; + private static DateTime lastCollectedDailyChest; private static List inventory; private static List expPassCollected = new List(); @@ -39,6 +40,7 @@ public class DBmanager : MonoBehaviour public static int TripleKills => tripleKills; public static int QuadKills => quadKills; public static int PentaKills => pentaKills; + public static DateTime LastCollectedDailyChest => lastCollectedDailyChest; public static float Level => level; public static int LevelInt => Mathf.CeilToInt(level); public static List ExpPassCollected => expPassCollected; @@ -218,7 +220,9 @@ public class DBmanager : MonoBehaviour WWWForm form = new WWWForm(); form.AddField("name", username); form.AddField("gems", newValue); - if (justOffline) { gems = newValue; return; } + int oldVal = Gems; + gems = newValue; + if (justOffline) {return; } using (UnityWebRequest www = UnityWebRequest.Post(phpRoot + "set_gems.php", form)) { var operation = www.SendWebRequest(); @@ -235,6 +239,7 @@ public class DBmanager : MonoBehaviour { Debug.Log("Response : " + www.downloadHandler.text); Debug.LogWarning("Failed to set gems to " + newValue); + gems = oldVal; } } @@ -247,7 +252,9 @@ public class DBmanager : MonoBehaviour WWWForm form = new WWWForm(); form.AddField("name", username); form.AddField("metal", newValue); - if (justOffline) { metal = newValue; return; } + int oldVal = metal; + metal = newValue; + if (justOffline) { return; } using (UnityWebRequest www = UnityWebRequest.Post(phpRoot + "set_metal.php", form)) { var operation = www.SendWebRequest(); @@ -265,6 +272,7 @@ public class DBmanager : MonoBehaviour { Debug.Log("Response : " + www.downloadHandler.text); Debug.LogWarning("Failed to set metal to " + newValue); + metal = oldVal; } } @@ -461,6 +469,40 @@ public class DBmanager : MonoBehaviour OnStateChanged.Invoke(); } + public async static void SetLastCollectedDailyChest(string newValue, bool justOffline = false) + { + WWWForm form = new WWWForm(); + form.AddField("name", username); + form.AddField("value", newValue); + DateTime oldValue = lastCollectedDailyChest; + lastCollectedDailyChest = DateTime.Parse(newValue); + Debug.Log(newValue + ":"+lastCollectedDailyChest); + if (justOffline) { return; } + using (UnityWebRequest www = UnityWebRequest.Post(phpRoot + "set_daily_chest_collected.php", form)) + { + var operation = www.SendWebRequest(); + while (!operation.isDone) + { + await Task.Yield(); + } + + if (www.downloadHandler.text == "0") + { + + } + else + { + lastCollectedDailyChest = oldValue; + Debug.Log("Response : " + www.downloadHandler.text); + Debug.LogWarning("Failed to set lastCollectedDailyChest to " + newValue); + } + } + + GameManager.Refresh(); + OnStateChanged.Invoke(); + } + + public static void SetExpPassCollected(string rawData, bool justOffline = false) { try diff --git a/Assets/Game/Scripts/GameManager.cs b/Assets/Game/Scripts/GameManager.cs index eb65703c7..06112118c 100644 --- a/Assets/Game/Scripts/GameManager.cs +++ b/Assets/Game/Scripts/GameManager.cs @@ -132,5 +132,33 @@ public class GameManager : MonoBehaviour public void LoadRanked(){ LoadingScreen.instance.LoadLevel("MinigameMatchmaking"); } + + + public void Signout(){ + PlayerPrefs.DeleteAll(); + PlayerPrefs.Save(); + + LoadingScreen.instance.LoadLevel("Login"); + } + + public void BuyChest(ChestButton button){ + if(DBmanager.Gems < button.Price){ + MessageDialog.instance.ShowDialog("Failed", "Insufficient Gems to complete the purchase"); + return; + } + + DBmanager.SetGems(DBmanager.Gems-button.Price); + ChestOpener.instance.OpenChest((int)button.minLuck, (int)button.maxLuck); + } + + public void BuyGold(GoldPackButton button){ + if(DBmanager.Gems < button.Price){ + MessageDialog.instance.ShowDialog("Failed", "Insufficient Gems to complete the purchase"); + return; + } + + DBmanager.SetGems(DBmanager.Gems-button.Price); + DBmanager.SetCoins(DBmanager.Coins + button.Amount); + } } diff --git a/Assets/Game/Scripts/LoadingScreen.cs b/Assets/Game/Scripts/LoadingScreen.cs index 612772a5e..113b1c261 100644 --- a/Assets/Game/Scripts/LoadingScreen.cs +++ b/Assets/Game/Scripts/LoadingScreen.cs @@ -9,6 +9,8 @@ public class LoadingScreen : MonoBehaviour CanvasGroup canvasGroup; public Slider loadingProgress; public TMPro.TMP_Text loadingProgressTxt; + private static bool loading; + public static bool Loading => loading; void Awake(){ instance =this; @@ -20,10 +22,12 @@ public class LoadingScreen : MonoBehaviour } public void LoadLevel(string levelName){ + if(loading){return;}loading=true; StartCoroutine(loadlLevel(levelName)); } IEnumerator loadlLevel(string levelName){ + loading=true; canvasGroup.alpha=0; canvasGroup.blocksRaycasts=true; SetProgress(0); @@ -53,10 +57,11 @@ public class LoadingScreen : MonoBehaviour canvasGroup.alpha-=0.03f; yield return new WaitForFixedUpdate(); } + loading=false; } void SetProgress(float value){ - loadingProgress.value = value; - loadingProgressTxt.text = (int)(value*100) + "%"; + loadingProgress.value = value; + loadingProgressTxt.text = (int)(value*100) + "%"; } } diff --git a/Assets/Game/Scripts/LoginManager.cs b/Assets/Game/Scripts/LoginManager.cs index ea65aca63..b4dc715ca 100644 --- a/Assets/Game/Scripts/LoginManager.cs +++ b/Assets/Game/Scripts/LoginManager.cs @@ -81,6 +81,7 @@ public class LoginManager : MonoBehaviour PlayerPrefs.Save();} DBmanager.username = login_username.text; + DBmanager.SetLastCollectedDailyChest(www.text.Split('\t')[15],true); DBmanager.SetPentaKills(int.Parse(www.text.Split('\t')[14]),true); DBmanager.SetQuadKills(int.Parse(www.text.Split('\t')[13]),true); DBmanager.SetTripleKills(int.Parse(www.text.Split('\t')[12]),true); diff --git a/Assets/Game/Scripts/MessageDialog.cs b/Assets/Game/Scripts/MessageDialog.cs index 9ed87cff8..bfda826e4 100644 --- a/Assets/Game/Scripts/MessageDialog.cs +++ b/Assets/Game/Scripts/MessageDialog.cs @@ -1,5 +1,6 @@ using System.Collections; using System.Collections.Generic; +using System.Threading.Tasks; using UnityEngine; using UnityEngine.UI; @@ -20,6 +21,7 @@ public class MessageDialog : MonoBehaviour m_instance = this; actionBtn.onClick.AddListener(OnAction); SetActive(false); + DontDestroyOnLoad(gameObject); } void OnAction(){ @@ -28,11 +30,19 @@ public class MessageDialog : MonoBehaviour } } - public void ShowDialog(string title, string message){ + public async void ShowDialog(string title, string message){ titleTxt.text = title; messageTxt.text = message; + SetActive(true); + Canvas.ForceUpdateCanvases(); + GetComponentInChildren().enabled=false; + GetComponentInChildren().enabled=true; + + + + // messageTxt.gameObject.SetActive(true); } public void SetActive(bool value){ diff --git a/Assets/Game/Scripts/Minigame/AutoConnect.cs b/Assets/Game/Scripts/Minigame/AutoConnect.cs index 251a1aa9c..670147384 100644 --- a/Assets/Game/Scripts/Minigame/AutoConnect.cs +++ b/Assets/Game/Scripts/Minigame/AutoConnect.cs @@ -6,56 +6,120 @@ using LightReflectiveMirror; public class AutoConnect : MonoBehaviour { public bool isClient; - public static bool isRankedServer; - public static string serverName; + public static int serverPort; public bool isRanked; - public LightReflectiveMirrorTransport lrm; + public kcp2k.KcpTransport transport; void Start() { - if(isRanked){ + if (isRanked) + { - if(!isRankedServer){ - lrm.serverListUpdated.AddListener(OnServerListUpdated); - StartCoroutine(refreshList()); - }else{ - StartCoroutine(startHost()); + // if(!isRankedServer){ + // lrm.serverListUpdated.AddListener(OnServerListUpdated); + // StartCoroutine(refreshList()); + // }else{ + // StartCoroutine(startHost()); + + // } + string[] args = System.Environment.GetCommandLineArgs(); + string input = ""; + for (int i = 0; i < args.Length; i++) + { + // Debug.Log("ARG " + i + ": " + args[i]); + if (args[i] == "-port") + { + input = args[i + 1]; + } + } + + ushort port = 7777; + try + { + port = ushort.Parse(input); + } + catch + { + } - }else{ - if(isClient){ + + + if(!isClient){ + Debug.Log("Setting port to " + port); + transport.Port = port; + NetworkManager.singleton.StartServer(); + }else{ + NetworkManager.singleton.networkAddress = RegionManager.selectedServer.ip; + transport.Port = (ushort)serverPort; + NetworkManager.singleton.StartClient(); + } + } + else + { + if (isClient) + { FindObjectOfType().networkAddress = RegionManager.selectedServer.ip; FindObjectOfType().StartClient(); } } } - - IEnumerator startHost(){ - while(!lrm.isConnectedToRelay){ - yield return new WaitForSeconds(1); - } - lrm.serverName = serverName; - lrm.isPublicServer=true; - NetworkManager.singleton.StartHost(); - } - IEnumerator refreshList(){ - while(!lrm.isConnectedToRelay){ - yield return new WaitForSeconds(1); - } - while(!NetworkManager.singleton.isNetworkActive){ - yield return new WaitForSeconds(1); - lrm.RequestServerList(); - } - } - - void OnServerListUpdated(){ - Debug.Log("Got new server list of " + lrm.relayServerList.Count); - foreach(Room room in lrm.relayServerList){ - if(room.serverName == serverName){ - Debug.Log("Found server for me! Joining now"); - NetworkManager.singleton.networkAddress = room.serverId; - NetworkManager.singleton.StartClient(); + float t; + void Update(){ + if(isRanked && !isClient){ + //timer + t += Time.deltaTime; + if(t > 30 && FindObjectsOfType().Length ==0){ + //No players joined, or they left, gotta close my self + t=0; + StartCoroutine(CloseRoom()); } } } + + IEnumerator CloseRoom(){ + WWWForm form = new WWWForm(); + form.AddField("port", serverPort); + WWW req = new WWW(DBmanager.phpRoot+"clear_ranked_room.php",form); + yield return req; + + Application.Quit(); + } + + // IEnumerator startHost() + // { + // while (!lrm.isConnectedToRelay) + // { + // yield return new WaitForSeconds(1); + // } + // lrm.serverName = serverName; + // lrm.isPublicServer = true; + // NetworkManager.singleton.StartHost(); + // } + // IEnumerator refreshList() + // { + // while (!lrm.isConnectedToRelay) + // { + // yield return new WaitForSeconds(1); + // } + // while (!NetworkManager.singleton.isNetworkActive) + // { + // yield return new WaitForSeconds(1); + // lrm.RequestServerList(); + // } + // } + + // void OnServerListUpdated() + // { + // Debug.Log("Got new server list of " + lrm.relayServerList.Count); + // foreach (Room room in lrm.relayServerList) + // { + // if (room.serverName == serverName) + // { + // Debug.Log("Found server for me! Joining now"); + // NetworkManager.singleton.networkAddress = room.serverId; + // NetworkManager.singleton.StartClient(); + // } + // } + // } } diff --git a/Assets/Game/Scripts/Minigame/Leaderboard.cs b/Assets/Game/Scripts/Minigame/Leaderboard.cs index 2bef4269a..03d042ec8 100644 --- a/Assets/Game/Scripts/Minigame/Leaderboard.cs +++ b/Assets/Game/Scripts/Minigame/Leaderboard.cs @@ -36,7 +36,7 @@ public class Leaderboard : MonoBehaviour { for (int i = 0; i <= players.Length - 2; i++) { - if ( (isRanked ? players[i].moonsCollected : players[i].Scores) > (isRanked? players[i+1].moonsCollected : players[i + 1].Scores)) + if ( (!isRanked ? players[i].moonsCollected : players[i].Scores) > (!isRanked? players[i+1].moonsCollected : players[i + 1].Scores)) { temp = players[i + 1]; players[i + 1] = players[i]; @@ -51,7 +51,7 @@ public class Leaderboard : MonoBehaviour SpaceshipController thisPlayer = players[players.Length-i-1]; leaderboardItems[i].gameObject.SetActive(true); leaderboardItems[i].text = (i+1) + ". " +thisPlayer.pname; - if(isRanked){ + if(!isRanked){ leaderboardItems[i].transform.GetChild(0).GetComponent().text = thisPlayer.Scores.ToString(); }else{ leaderboardItems[i].transform.GetChild(0).GetComponent().text = (((float)Mathf.Clamp(thisPlayer.moonsCollected,0,30)/ 30f)*100f).ToString("n1") + " %"; diff --git a/Assets/Game/Scripts/Minigame/MatchMaker.cs b/Assets/Game/Scripts/Minigame/MatchMaker.cs index de01f5897..ad0c4c4f4 100644 --- a/Assets/Game/Scripts/Minigame/MatchMaker.cs +++ b/Assets/Game/Scripts/Minigame/MatchMaker.cs @@ -14,7 +14,6 @@ public class MatchMaker : MonoBehaviour public TMP_Text timerTxt; public Button btn_cancel; float timer; - public string serverName; void Start() { if(!DBmanager.LoggedIn){ @@ -47,8 +46,6 @@ public class MatchMaker : MonoBehaviour } } - - bool isServer =false; IEnumerator FetchMatchmake(){ WWWForm form = new WWWForm(); @@ -58,19 +55,31 @@ public class MatchMaker : MonoBehaviour WWW req = new WWW(DBmanager.phpRoot+"matchmake.php", form); yield return req; Debug.Log(req.text); - if(req.text.Contains(DBmanager.username) && !loadedScene){ - //Room created! - isServer= req.text.Substring(0,DBmanager.username.Length) == DBmanager.username; - serverName=req.text; - AutoConnect.serverName = serverName; - AutoConnect.isRankedServer = isServer; - // AutoConnect.isRanked = true; - Debug.Log($"Room created! [{req.text}] am I the server? : " + isServer); + // if(req.text.Contains(DBmanager.username) && !loadedScene){ + // int port + // //Room created! + // // isServer= req.text.Substring(0,DBmanager.username.Length) == DBmanager.username; + // // serverName=req.text; + // // AutoConnect.serverName = serverName; + // // AutoConnect.isRankedServer = isServer; + // // AutoConnect.isRanked = true; + // Debug.Log($"Room created! [{req.text}] am I the server? : "); - LoadingScreen.instance.LoadLevel("MinigameRanked"); + // LoadingScreen.instance.LoadLevel("MinigameRanked"); + + // }else{ + // //Waiting + // } + + try{ + int port = int.Parse(req.text); + if(port > 5000){ + Debug.Log("Got the port, Lets go!"); + AutoConnect.serverPort = port; + LoadingScreen.instance.LoadLevel("MinigameRanked"); + } + }catch{ - }else{ - //Waiting } } diff --git a/Assets/Game/Scripts/Minigame/MinigameManager.cs b/Assets/Game/Scripts/Minigame/MinigameManager.cs index 8149a96fa..d764361fc 100644 --- a/Assets/Game/Scripts/Minigame/MinigameManager.cs +++ b/Assets/Game/Scripts/Minigame/MinigameManager.cs @@ -11,7 +11,12 @@ public class MinigameManager : NetworkBehaviour public static MinigameManager instance; public bool isRanked; public bool RankedGameStarted=false; + [SyncVar(hook =nameof(OnWinnerChanged))] + public int winnerId=-1; + [SyncVar] + public double startedTime = 0; public GameObject waitingScreen; + public RankedGameSummary rankedSummary; public float mapRadius; public int maxMoons, maxStars = 100; public Transform pickupItemsParent; @@ -38,7 +43,13 @@ public class MinigameManager : NetworkBehaviour // if(!DBmanager.LoggedIn){SceneManager.LoadScene(0);} //Signed out, no game for u if(isRanked){ - RankedGameStarted= (FindObjectsOfType().Length >=2); + // RankedGameStarted= (FindObjectsOfType().Length >=2); + if(!RankedGameStarted && !isServer){ + SpaceshipController[] players = FindObjectsOfType(); + if(players.Length >= 2){ + RankedGameStarted=true; + } + } waitingScreen.SetActive(!RankedGameStarted); } @@ -46,7 +57,51 @@ public class MinigameManager : NetworkBehaviour HandlePickupSpawn(); KillOutOfBoundsPlayers(); + if(isRanked){RankedMechanics();} + } + void RankedMechanics(){ + SpaceshipController[] players = FindObjectsOfType(); + if(players.Length < 2){ + //Not enough players + }else{ + if(!RankedGameStarted){ + startedTime=NetworkTime.time; + } + RankedGameStarted=true; + if(players[0].moonsCollected >= 30){ + //player 1 has won + winnerId = (int)players[0].netId; + // players[0].WonRanked(); + // players[1].LostRanked(); + }else if(players[1].moonsCollected >= 30){ + //player 2 has won + winnerId = (int)players[1].netId; + + // players[0].WonRanked(); + // players[1].LostRanked(); + } + } + + if(RankedGameStarted && players.Length < 2){ + //Forfeited! + winnerId = (int)players[0].netId; + // players[0].WonRanked(); + } + } + + void OnWinnerChanged(int oldVal, int newVal){ + if(newVal<= 0){return;} + Debug.Log($"{newVal} id won!"); + SpaceshipController localPlayer = SceneData.localPlayer.GetComponent(); + if(newVal == localPlayer.netId){ + //We won + localPlayer.CmdWonRanked(); + Debug.Log("Its Me!, I won!"); + }else{ + Debug.Log("Its not me, I lost!"); + localPlayer.CmdLostRanked(); + } } void KillOutOfBoundsPlayers() diff --git a/Assets/Game/Scripts/Minigame/RankedGameSummary.cs b/Assets/Game/Scripts/Minigame/RankedGameSummary.cs new file mode 100644 index 000000000..82297fd8b --- /dev/null +++ b/Assets/Game/Scripts/Minigame/RankedGameSummary.cs @@ -0,0 +1,22 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using TMPro; +public class RankedGameSummary : MonoBehaviour +{ + public TMP_Text txtGameOver; + public TMP_Text txtTrophies; + + + public void ShowWin(){ + txtGameOver.text = "You Won!"; + txtTrophies.text= "+30"; + txtTrophies.color = Color.green; + } + + public void ShowLoss(){ + txtGameOver.text = "You Lost!"; + txtTrophies.text= "-15"; + txtTrophies.color = Color.red; + } +} diff --git a/Assets/Game/Scripts/Minigame/RankedGameSummary.cs.meta b/Assets/Game/Scripts/Minigame/RankedGameSummary.cs.meta new file mode 100644 index 000000000..94ec3a5d9 --- /dev/null +++ b/Assets/Game/Scripts/Minigame/RankedGameSummary.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 812537ae82c3b8c56ada62732b76a181 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Game/Scripts/Minigame/SceneDataHolder.cs b/Assets/Game/Scripts/Minigame/SceneDataHolder.cs index f6eb81e4a..1e7a20ee3 100644 --- a/Assets/Game/Scripts/Minigame/SceneDataHolder.cs +++ b/Assets/Game/Scripts/Minigame/SceneDataHolder.cs @@ -13,6 +13,7 @@ public class SceneDataHolder : MonoBehaviour public GameObject metalEarnings; public TMP_Text survivalTimeTxt; public TMP_Text mostTimeTxt; + public TMP_Text gameOverTxt; public EventTrigger boostBtn; public TMP_Text timerTxt; void Awake() @@ -32,8 +33,12 @@ public class SceneDataHolder : MonoBehaviour xpEarnings.SetActive(xpEarned > 0); metalEarnings.SetActive(metalEarned > 0); xpEarnings.GetComponentInChildren().text = xpEarned.ToString(); metalEarnings.GetComponentInChildren().text = metalEarned.ToString(); - survivalTimeTxt.text = SceneData.SecondsToText(survivalTime); - mostTimeTxt.text = SceneData.SecondsToText(DBmanager.MostTime); + if(!MinigameManager.instance.isRanked){ + survivalTimeTxt.text = SceneData.SecondsToText(survivalTime); + mostTimeTxt.text = SceneData.SecondsToText(DBmanager.MostTime); + }else{ + // MinigameManager.instance.rankedSummary.ShowLoss(); + } } } diff --git a/Assets/Game/Scripts/Minigame/SpaceshipController.cs b/Assets/Game/Scripts/Minigame/SpaceshipController.cs index 86cca37e5..992e0ff35 100644 --- a/Assets/Game/Scripts/Minigame/SpaceshipController.cs +++ b/Assets/Game/Scripts/Minigame/SpaceshipController.cs @@ -3,20 +3,21 @@ using UnityEngine; using Mirror; using System.Linq; using UnityEngine.UI; +using System.Collections; public class SpaceshipController : NetworkBehaviour { public SpriteRenderer playerImg; public SkinsData skins; - [SyncVar(hook=nameof(OnSkinChanged))] + [SyncVar(hook = nameof(OnSkinChanged))] public string skinName = null; - [SyncVar(hook=nameof(OnPnameChanged))] + [SyncVar(hook = nameof(OnPnameChanged))] public string pname; - [SyncVar(hook=nameof(OnScoresChanged))] + [SyncVar(hook = nameof(OnScoresChanged))] public int Scores; - [SyncVar(hook=nameof(OnKillsChanged))] + [SyncVar(hook = nameof(OnKillsChanged))] public int Kills; - [SyncVar(hook=nameof(OnTrailTimeChanged))] + [SyncVar(hook = nameof(OnTrailTimeChanged))] public float trailTime; [SyncVar] public int moonsCollected; @@ -25,8 +26,8 @@ public class SpaceshipController : NetworkBehaviour public bool dead; [SyncVar] public float speed; - [SyncVar(hook=nameof(OnScaleChanged))] - public float scaleMultiplier=1; + [SyncVar(hook = nameof(OnScaleChanged))] + public float scaleMultiplier = 1; public Text pnameTxt; public Transform body; public TrailMgr trailMgr; @@ -39,87 +40,108 @@ public class SpaceshipController : NetworkBehaviour [Header("Client Prediction")] public SortedDictionary serverStateBuffer = new SortedDictionary(); - public Vector3 DetourError = new Vector3(0,0.2f,0); + public Vector3 DetourError = new Vector3(0, 0.2f, 0); public Vector3 Detour = Vector3.zero; public Quaternion RotationDetour = Quaternion.identity; public float DetourCorrectionFactor = 0.5f; public float timeDelayErrorFix = 1f; public bool showDebugHUD = false; - public float distanceFromCenter= 0; + public float distanceFromCenter = 0; [Command] - void CmdSetPname(string value){ + void CmdSetPname(string value) + { pname = value; } - void OnPnameChanged(string oldName, string newName){ + void OnPnameChanged(string oldName, string newName) + { pnameTxt.text = newName; } [Command] - void CmdSetSkin(string newSkin){ + void CmdSetSkin(string newSkin) + { skinName = newSkin; } - void OnSkinChanged(string oldSkin, string newSkin){ + void OnSkinChanged(string oldSkin, string newSkin) + { ChangeSkin(newSkin); } - void ChangeSkin(string name){ - Sprite newSprite = SkinManagerHelper.getSkinSprite(name,skins); + void ChangeSkin(string name) + { + Sprite newSprite = SkinManagerHelper.getSkinSprite(name, skins); playerImg.sprite = newSprite; } - void OnScoresChanged(int oldScores, int newScores){ - Debug.Log($"Add scores { newScores - oldScores}, (total: {newScores})"); + void OnScoresChanged(int oldScores, int newScores) + { + Debug.Log($"Add scores {newScores - oldScores}, (total: {newScores})"); } - void OnTrailTimeChanged(float oldValue, float newValue){ + void OnTrailTimeChanged(float oldValue, float newValue) + { trailMgr.trail.time = newValue; } - void OnBoostDown(){ - if(isLocalPlayer){ - if(isServer){ - boosting=true; - }else{ + void OnBoostDown() + { + if (isLocalPlayer) + { + if (isServer) + { + boosting = true; + } + else + { CmdSetBoosting(true); } } } - void OnBoostUp(){ - if(isLocalPlayer){ - if(isServer){ - boosting=false; - }else{ + void OnBoostUp() + { + if (isLocalPlayer) + { + if (isServer) + { + boosting = false; + } + else + { CmdSetBoosting(false); } } } - void OnScaleChanged(float oldScale, float newScale){ - if(isLocalPlayer){ - SceneData.holder.boostBtn.gameObject.SetActive(newScale>1); + void OnScaleChanged(float oldScale, float newScale) + { + if (isLocalPlayer) + { + SceneData.holder.boostBtn.gameObject.SetActive(newScale > 1); } } [Command] - void CmdSetBoosting(bool value){ - boosting=value; + void CmdSetBoosting(bool value) + { + boosting = value; } [SyncVar] double startedTime = 0; - void ResetStats(){ + void ResetStats() + { startedXp = DBmanager.Xp; startedMetal = DBmanager.Metal; } void Start() { - scaleMultiplier=1; + scaleMultiplier = 1; if (isLocalPlayer) { ResetStats(); @@ -130,17 +152,25 @@ public class SpaceshipController : NetworkBehaviour SceneData.OnBoostDown.AddListener(OnBoostDown); SceneData.OnBoostUp.AddListener(OnBoostUp); //Set username - if(isServer){pname=myName;}else{ + if (isServer) { pname = myName; } + else + { CmdSetPname(myName); } //Set Skin - if(!DBmanager.SkinsPurchased.Contains(SkinShopManager.GetEquipedSkin())){ + if (!DBmanager.SkinsPurchased.Contains(SkinShopManager.GetEquipedSkin())) + { //False skin purchase - }else{ - if(isServer){ + } + else + { + if (isServer) + { skinName = SkinShopManager.GetEquipedSkin(); - }else{ + } + else + { CmdSetSkin(SkinShopManager.GetEquipedSkin()); } } @@ -162,27 +192,29 @@ public class SpaceshipController : NetworkBehaviour int lastClientUpdateTime = 0; void FixedUpdate() { - if(MinigameManager.instance.isRanked && !MinigameManager.instance.RankedGameStarted){return;} + if (MinigameManager.instance.isRanked && !MinigameManager.instance.RankedGameStarted) { return; } distanceFromCenter = Vector3.Distance(transform.position, Vector3.zero); pnameTxt.rectTransform.rotation = Quaternion.Euler(Vector3.zero); //Update size of trail and spaceship - transform.localScale = Vector3.Lerp(transform.localScale,new Vector3(scaleMultiplier,scaleMultiplier,scaleMultiplier),0.1f); - trailMgr.trail.startWidth = Mathf.Lerp(trailMgr.trail.startWidth,scaleMultiplier,0.1f); + transform.localScale = Vector3.Lerp(transform.localScale, new Vector3(scaleMultiplier, scaleMultiplier, scaleMultiplier), 0.1f); + trailMgr.trail.startWidth = Mathf.Lerp(trailMgr.trail.startWidth, scaleMultiplier, 0.1f); - if(dead){return;} + if (dead) { return; } if (isLocalPlayer) { joyInput = joystick.input; //Cheats => TODO: Remove this - if(Input.GetKeyDown(KeyCode.F)){ + if (Input.GetKeyDown(KeyCode.F)) + { CmdCheatKills(); } // Debug.Log(startedTime-NetworkTime.time); - double survivalTime = (startedTime ==0) ? 0 :NetworkTime.time - startedTime; - if(DBmanager.MostTime < (int)survivalTime){ + double survivalTime = (startedTime == 0) ? 0 : NetworkTime.time - ((MinigameManager.instance.isRanked)? MinigameManager.instance.startedTime :startedTime); + if (DBmanager.MostTime < (int)survivalTime) + { DBmanager.SetMostTime((int)survivalTime); } SceneData.SetTimerTxt(survivalTime); @@ -197,15 +229,19 @@ public class SpaceshipController : NetworkBehaviour } } - if(isServer){ + if (isServer) + { //boost check - if(boosting && scaleMultiplier > 1){ - speed= movingSpeed*2; - scaleMultiplier-=Time.deltaTime; - - if(scaleMultiplier<1){scaleMultiplier=1;} //Clamp in case gets lower - }else{ - speed=movingSpeed; + if (boosting && scaleMultiplier > 1) + { + speed = movingSpeed * 2; + scaleMultiplier -= Time.deltaTime; + + if (scaleMultiplier < 1) { scaleMultiplier = 1; } //Clamp in case gets lower + } + else + { + speed = movingSpeed; } } ///Diff = rot1 . rot2 @@ -221,15 +257,16 @@ public class SpaceshipController : NetworkBehaviour { Vector3 newPosition = body.position + Detour; Quaternion newRotation = body.rotation * RotationDetour; - if(Detour.magnitude > 0.5f){ - trailMgr.trail.emitting =false; + if (Detour.magnitude > 0.5f) + { + trailMgr.trail.emitting = false; } - body.position = Vector3.Lerp(body.position, newPosition, (Mathf.Abs(Detour.magnitude) > 0.2f) ? DetourCorrectionFactor * 2 * Detour.magnitude : DetourCorrectionFactor); + body.position = Vector3.Lerp(body.position, newPosition, (Mathf.Abs(Detour.magnitude) > 0.2f) ? DetourCorrectionFactor * 2 * Detour.magnitude : DetourCorrectionFactor); Detour = newPosition - body.position; body.rotation = Quaternion.Lerp(body.rotation, newRotation, DetourCorrectionFactor * ((joystick.touchDown) ? 0.1f : 1)); RotationDetour = Quaternion.Inverse(transform.rotation) * newRotation; - trailMgr.trail.emitting=true; + trailMgr.trail.emitting = true; } } @@ -258,7 +295,9 @@ public class SpaceshipController : NetworkBehaviour } RpcUpdatePosition(joyInput, transform.position, transform.rotation, timeInMillis); RpcUpdateTrail(trailMgr.positions); - }else{ + } + else + { transform.position = Vector3.Lerp(transform.position, targetPosition, 0.1f); transform.rotation = Quaternion.Lerp(transform.rotation, targetRotation, 0.1f); } @@ -266,7 +305,7 @@ public class SpaceshipController : NetworkBehaviour Vector3 targetPosition; Quaternion targetRotation; - + void Turn(Vector2 input) { @@ -298,7 +337,7 @@ public class SpaceshipController : NetworkBehaviour payloadToCompare = lastServerState; if (lastServerState.Time < time) { - // Debug.Log("Server doesn't have that data yet\nYou asked for " + time + " best I can do is " + lastServerState.Time); + // Debug.Log("Server doesn't have that data yet\nYou asked for " + time + " best I can do is " + lastServerState.Time); } else { @@ -327,7 +366,7 @@ public class SpaceshipController : NetworkBehaviour } else { - // Debug.Log($"RB : {positionDiff.magnitude} [{timeDiff}ms]"); + // Debug.Log($"RB : {positionDiff.magnitude} [{timeDiff}ms]"); RpcRubberBand(joyInput, serverStateBuffer.Values.Last().Position, serverStateBuffer.Values.Last().Rotation, trailMgr.positions, timeInMillis); } @@ -336,21 +375,21 @@ public class SpaceshipController : NetworkBehaviour [ClientRpc] void RpcUpdatePosition(Vector2 input, Vector3 position, Quaternion rotation, double sentTime) { - if(isLocalPlayer || isServer){return;} + if (isLocalPlayer || isServer) { return; } double delay = (timeInMillis - sentTime) * timeDelayErrorFix; - int numberOfFrames = (int)((float)(delay/1000f) *50f); - + int numberOfFrames = (int)((float)(delay / 1000f) * 50f); + Quaternion newRotation = rotation; Vector3 direction = (rotation * Vector3.forward).normalized; Vector3 newPosition = position + ((direction * speed) * numberOfFrames); - + for (int i = 0; i < numberOfFrames; i++) { newRotation = Quaternion.Lerp(newRotation, getTurnAngle(input), turningSmoothFactor * input.magnitude); } targetPosition = newPosition - DetourError; - + targetRotation = newRotation; } double lastRubberBandTime = 0; @@ -363,12 +402,12 @@ public class SpaceshipController : NetworkBehaviour if (sentTime < lastRubberBandTime) { Debug.Log("Old rubber band rpc, ignoree..."); return; } //Lag comprehension double delay = (timeInMillis - sentTime) * timeDelayErrorFix; - int numberOfFrames = (int)((float)(delay/1000f) * 50f); - + int numberOfFrames = (int)((float)(delay / 1000f) * 50f); + Quaternion newRotation = rotation; Vector3 direction = (rotation * Vector3.forward).normalized; Vector3 newPosition = position + ((direction * speed) * numberOfFrames); - + for (int i = 0; i < numberOfFrames; i++) { newRotation = Quaternion.Lerp(newRotation, getTurnAngle(input), turningSmoothFactor * input.magnitude); @@ -402,12 +441,13 @@ public class SpaceshipController : NetworkBehaviour RotationDetour = Quaternion.Inverse(transform.rotation) * newRotation; lastRubberBandTime = sentTime; -// Debug.Log($"Rubber banded (Detour of pos:{Detour}, rotation: {RotationDetour}) you to {transform.position}, @ {sentTime} (delay: {delay}"); + // Debug.Log($"Rubber banded (Detour of pos:{Detour}, rotation: {RotationDetour}) you to {transform.position}, @ {sentTime} (delay: {delay}"); } } [ClientRpc] - void RpcUpdateTrail(Vector3[] positions){ + void RpcUpdateTrail(Vector3[] positions) + { //trailMgr.trail.SetPositions(positions); } @@ -438,15 +478,18 @@ public class SpaceshipController : NetworkBehaviour { body = transform; } - if(trailMgr==null){ + if (trailMgr == null) + { trailMgr = GetComponent(); } } - public void TrailCollided(Collider2D hit){ - if(!isServer){ + public void TrailCollided(Collider2D hit) + { + if (!isServer) + { Debug.Log("Got hit : " + hit.name); // Debug.Log("This cannot run on client, That's illegal!"); // <-- What this log says return; @@ -454,55 +497,64 @@ public class SpaceshipController : NetworkBehaviour SpaceshipController deadPlayer = hit.GetComponent(); Debug.Log("got hit by player? : " + deadPlayer != null); - if(deadPlayer!=null && !deadPlayer.dead){ // <-- okay we killed someone | KILLCODE + if (deadPlayer != null && !deadPlayer.dead && (NetworkTime.time- deadPlayer.startedTime) > 5) + { // <-- okay we killed someone | KILLCODE deadPlayer.Die(pname); Debug.Log($"{pname} killed {deadPlayer.pname}"); - OnKill(); + OnKill(); } } - void OnKill(){ + void OnKill() + { Kills++; - Scores+= 10; //TODO: Need to change Scores on kills? - scaleMultiplier+=0.05f; - OnScaleChanged(scaleMultiplier,scaleMultiplier); + Scores += 10; //TODO: Need to change Scores on kills? + scaleMultiplier += 0.05f; + OnScaleChanged(scaleMultiplier, scaleMultiplier); IncreaseTrail(trailIncrementRate); RpcOnKill(); } [ClientRpc] - void RpcOnKill(){ - + void RpcOnKill() + { + } - void OnKillsChanged(int oldVal, int newVal){ - if(isLocalPlayer){ + void OnKillsChanged(int oldVal, int newVal) + { + if (isLocalPlayer) + { Debug.Log("Show kills for " + newVal); KillText.Show(newVal); } } - void IncreaseTrail(float rate){ - trailTime = trailMgr.trail.time+ rate; + void IncreaseTrail(float rate) + { + trailTime = trailMgr.trail.time + rate; trailMgr.trail.time = trailTime; Debug.Log("Increasing trail of" + pname); } [Command] - void CmdCheatKills(){ + void CmdCheatKills() + { OnKill(); } - public void CollectPickup(PickupItem.PickupType type){ - if(!isServer){Debug.Log("Server function ran on client. That's illegal!");} // <-- What this log says - switch(type){ + public void CollectPickup(PickupItem.PickupType type) + { + if (!isServer) { Debug.Log("Server function ran on client. That's illegal!"); } // <-- What this log says + switch (type) + { case PickupItem.PickupType.Moon: IncreaseTrail(trailIncrementRate); moonsCollected++; break; - + case PickupItem.PickupType.Star: - IncreaseTrail(trailIncrementRate/2f); + IncreaseTrail(trailIncrementRate / 2f); break; } @@ -510,24 +562,27 @@ public class SpaceshipController : NetworkBehaviour } [ClientRpc] - void RpcCollectPickup(PickupItem.PickupType type){ - if(isLocalPlayer){ - MinigameManager.instance.GainMetals((type==PickupItem.PickupType.Star) ? 10 : 30); + void RpcCollectPickup(PickupItem.PickupType type) + { + if (isLocalPlayer) + { + MinigameManager.instance.GainMetals((type == PickupItem.PickupType.Star) ? 2 : 5); } } - public void Die(string killer){ - + public void Die(string killer) + { + MinigameManager.instance.SpawnLeftoverPickups(transform.position, Scores); Debug.Log($"Sending death signal to {pname} by {killer}"); //Handle Respawning - OnScaleChanged(scaleMultiplier,1); - scaleMultiplier=1; - dead=true; - Scores=0; - Kills=0; - startedTime=NetworkTime.time; + OnScaleChanged(scaleMultiplier, 1); + scaleMultiplier = 1; + dead = true; + Scores = 0; + Kills = 0; + startedTime = NetworkTime.time; trailTime = 1; trailMgr.trail.time = trailTime; RpcDie(killer); @@ -538,59 +593,153 @@ public class SpaceshipController : NetworkBehaviour private int startedXp; private int startedMetal; + bool RewardedRankedMetal =false; + [ClientRpc] - public void RpcDie(string killer){ + public void RpcDie(string killer) + { Debug.Log($"{killer} killed {pname} : isItMe? -> {isLocalPlayer}"); KillfeedMgr.instance.AddNewEntry($"{pname} was killed by {killer}"); gameObject.SetActive(false); - if(isLocalPlayer){ + if (isLocalPlayer) + { //TODO: Death message goes here SceneData.holder.ShowDeadscreen(DBmanager.Xp - startedXp, DBmanager.Metal - startedMetal, NetworkTime.time - startedTime); + if (MinigameManager.instance.isRanked) + { + // MinigameManager.instance.rankedSummary.ShowLoss(); + // StartCoroutine(ShowRankedResults()); + if(MinigameManager.instance.winnerId<=0){ + Debug.LogError("Winner ID not synced yet"); + } + if (MinigameManager.instance.winnerId != netId) + { + //LOSER! + MinigameManager.instance.rankedSummary.ShowLoss(); + } + else + { + MinigameManager.instance.rankedSummary.ShowWin(); + } + } } } - public void Respawn(Vector3 respawnPoint){ + IEnumerator ShowRankedResults() + { + while (MinigameManager.instance.winnerId <= 0) + { + yield return new WaitForFixedUpdate(); + } + + + } + + public void Respawn(Vector3 respawnPoint) + { Debug.Log("Respawning " + pname); - if(isServer){ + if (isServer) + { respawn(respawnPoint); - }else{ + } + else + { CmdRespawn(respawnPoint); } } [Command] - void CmdRespawn(Vector3 respawnPoint){ + void CmdRespawn(Vector3 respawnPoint) + { respawn(respawnPoint); } - public void respawn(Vector3 respawnPoint){ - dead=false; - trailMgr.trail.emitting =false; + public void respawn(Vector3 respawnPoint) + { + dead = false; + trailMgr.trail.emitting = false; trailMgr.trail.Clear(); RpcRespawn(respawnPoint); transform.position = respawnPoint; - trailMgr.trail.emitting=true; + trailMgr.trail.emitting = true; gameObject.SetActive(true); } [ClientRpc] - public void RpcRespawn(Vector3 respawnPoint){ - - GetComponent().enableValidation=false; + public void RpcRespawn(Vector3 respawnPoint) + { + + GetComponent().enableValidation = false; trailMgr.trail.Clear(); trailMgr.positions = new Vector3[0]; trailMgr.trail.emitting = false; transform.position = respawnPoint; - trailMgr.trail.emitting=true; - GetComponent().enableValidation=true; + trailMgr.trail.emitting = true; + GetComponent().enableValidation = true; gameObject.SetActive(true); - if(isLocalPlayer){ + if (isLocalPlayer) + { SceneData.holder.deadScreen.SetActive(false); ResetStats(); } } + [Command] + public void CmdWonRanked(){ + WonRanked(); + } + + [Command] + public void CmdLostRanked(){ + LostRanked(); + } + public void WonRanked() + { + if (!isServer) + { + return; + } + + RpcWonRanked(); + Die("server"); + } + + [ClientRpc] + void RpcWonRanked() + { + if (isLocalPlayer) + { + DBmanager.SetMetal(DBmanager.Metal+500); + MinigameManager.instance.rankedSummary.ShowWin(); + //Add trophies + DBmanager.SetTrophies(DBmanager.Trophies + 30); + } + } + + public void LostRanked() + { + if (!isServer) + { + return; + } + + + RpcLostRanked(); + Die("server"); + } + + void RpcLostRanked() + { + if (isLocalPlayer) + { + DBmanager.SetMetal(DBmanager.Metal+250); + + MinigameManager.instance.rankedSummary.ShowLoss(); + DBmanager.SetTrophies(Mathf.Clamp(DBmanager.Trophies - 15, 0, int.MaxValue)); + + } + } } diff --git a/Assets/Game/Scripts/RegionManager.cs b/Assets/Game/Scripts/RegionManager.cs index 71698bb36..6e38839c8 100644 --- a/Assets/Game/Scripts/RegionManager.cs +++ b/Assets/Game/Scripts/RegionManager.cs @@ -19,6 +19,11 @@ public class RegionManager : MonoBehaviour UpdateSelectedRegion(); foreach(RegionServerData server in servers){ + if(PlayerPrefs.HasKey("regionOverride")){ + if(PlayerPrefs.GetString("regionOverride") == server.name){ + selectedServer = server; + } + } server.btn_select.onClick.AddListener(()=>{SetRegionOverride(server.name);}); } btn_auto.onClick.AddListener(()=>{ SetRegionOverride(""); }); diff --git a/Assets/Game/Scripts/Shop.meta b/Assets/Game/Scripts/Shop.meta new file mode 100644 index 000000000..19362a381 --- /dev/null +++ b/Assets/Game/Scripts/Shop.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f3f4943072bf1ac4d8c69666654fc1f4 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Game/Scripts/Shop/ChestButton.cs b/Assets/Game/Scripts/Shop/ChestButton.cs new file mode 100644 index 000000000..09a2e3b34 --- /dev/null +++ b/Assets/Game/Scripts/Shop/ChestButton.cs @@ -0,0 +1,84 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.UI; +using TMPro; +public class ChestButton : MonoBehaviour +{ + public bool IsSpecial = false; + public bool readFromTexts; + public TMP_Text txtPrice; + public TMP_Text txtChestName; + public string ChestName => txtChestName.text; + public int Price; + public float minLuck = 0; + public float maxLuck = 100; + public Button btnInfo; + [TextArea] + public string infoTxt; + + void Start() + { + btnInfo.onClick.AddListener(OnClickedInfo); + + if(!IsSpecial)GetComponent