diff --git a/Assets/Scenes/TestPoly.unity b/Assets/Scenes/TestPoly.unity index 04537113..82a6655e 100644 --- a/Assets/Scenes/TestPoly.unity +++ b/Assets/Scenes/TestPoly.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 705507994} - m_IndirectSpecularColor: {r: 0.44965446, g: 0.4997244, b: 0.5756495, a: 1} + m_IndirectSpecularColor: {r: 0.4496541, g: 0.4997235, b: 0.57564855, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -221,6 +221,164 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2525149} m_Mesh: {fileID: 4300000, guid: 391ef46e275c80b408f222be809688a5, type: 3} +--- !u!1 &3676870 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3676871} + - component: {fileID: 3676877} + - component: {fileID: 3676876} + - component: {fileID: 3676875} + - component: {fileID: 3676874} + - component: {fileID: 3676873} + - component: {fileID: 3676872} + m_Layer: 5 + m_Name: ToolTip + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3676871 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3676870} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 2082085697} + - {fileID: 65222388} + m_Father: {fileID: 334943722} + 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: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &3676872 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3676870} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: feff04ad815f5974cb387c4ae348a844, type: 3} + m_Name: + m_EditorClassIdentifier: + headerField: {fileID: 2082085698} + contentField: {fileID: 65222389} + layoutElement: {fileID: 3676873} + characterWrapLimit: 80 +--- !u!114 &3676873 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3676870} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreLayout: 0 + m_MinWidth: -1 + m_MinHeight: -1 + m_PreferredWidth: 500 + m_PreferredHeight: -1 + m_FlexibleWidth: -1 + m_FlexibleHeight: -1 + m_LayoutPriority: 1 +--- !u!114 &3676874 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3676870} + 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!114 &3676875 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3676870} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 10 + m_Right: 10 + m_Top: 10 + m_Bottom: 10 + m_ChildAlignment: 0 + m_Spacing: 10 + m_ChildForceExpandWidth: 0 + m_ChildForceExpandHeight: 0 + m_ChildControlWidth: 1 + m_ChildControlHeight: 1 + m_ChildScaleWidth: 0 + m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 +--- !u!114 &3676876 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3676870} + 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: 0.7161356, g: 0.7264151, b: 0.72368324, a: 0.4117647} + 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: 10907, guid: 0000000000000000f000000000000000, type: 0} + 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 &3676877 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3676870} + m_CullTransparentMesh: 1 --- !u!1 &7919526 GameObject: m_ObjectHideFlags: 0 @@ -731,6 +889,141 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 65062262} m_Mesh: {fileID: 4300000, guid: 631028b3a30f092428e370d8a925482c, type: 3} +--- !u!1 &65222387 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 65222388} + - component: {fileID: 65222390} + - component: {fileID: 65222389} + m_Layer: 5 + m_Name: Content + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &65222388 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 65222387} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 3676871} + 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: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &65222389 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 65222387} + 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: New Text + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, 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: 21 + m_fontSizeBase: 21 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 256 + 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: 0 + 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 &65222390 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 65222387} + m_CullTransparentMesh: 1 --- !u!1 &68202017 GameObject: m_ObjectHideFlags: 0 @@ -1016,7 +1309,7 @@ Transform: - {fileID: 1152324441} - {fileID: 1382752553} m_Father: {fileID: 0} - m_RootOrder: 6 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &107380536 GameObject: @@ -1566,8 +1859,8 @@ Transform: m_Children: - {fileID: 275203134} - {fileID: 638177610} - - {fileID: 1715783104} - {fileID: 869775877} + - {fileID: 1715783104} - {fileID: 485854489} - {fileID: 1211799701} - {fileID: 488952345} @@ -1587,7 +1880,7 @@ Transform: - {fileID: 2099301586} - {fileID: 1776614918} m_Father: {fileID: 0} - m_RootOrder: 5 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} --- !u!1 &275203133 GameObject: @@ -1811,8 +2104,8 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 4 + m_Father: {fileID: 971260931} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &327257703 GameObject: @@ -1960,10 +2253,10 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} m_Name: m_EditorClassIdentifier: - m_UiScaleMode: 0 + m_UiScaleMode: 1 m_ReferencePixelsPerUnit: 100 m_ScaleFactor: 1 - m_ReferenceResolution: {x: 800, y: 600} + m_ReferenceResolution: {x: 1920, y: 1080} m_ScreenMatchMode: 0 m_MatchWidthOrHeight: 0 m_PhysicalUnit: 3 @@ -2005,16 +2298,117 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 497576566} - - {fileID: 2137624722} - {fileID: 1928618662} + - {fileID: 2137624722} m_Father: {fileID: 0} - m_RootOrder: 1 + 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: 0, y: 0} m_Pivot: {x: 0, y: 0} +--- !u!1 &334943721 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 334943722} + - component: {fileID: 334943725} + - component: {fileID: 334943724} + - component: {fileID: 334943723} + m_Layer: 5 + m_Name: ToolTip Canvas + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &334943722 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 334943721} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0, y: 0, z: 0} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 3676871} + m_Father: {fileID: 0} + m_RootOrder: 9 + 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: 0} + m_Pivot: {x: 0, y: 0} +--- !u!114 &334943723 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 334943721} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 4294967295 +--- !u!114 &334943724 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 334943721} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UiScaleMode: 1 + m_ReferencePixelsPerUnit: 100 + m_ScaleFactor: 1 + m_ReferenceResolution: {x: 1920, y: 1080} + m_ScreenMatchMode: 0 + m_MatchWidthOrHeight: 0 + m_PhysicalUnit: 3 + m_FallbackScreenDPI: 96 + m_DefaultSpriteDPI: 96 + m_DynamicPixelsPerUnit: 1 + m_PresetInfoIsWorld: 0 +--- !u!223 &334943725 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 334943721} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 0 + m_Camera: {fileID: 0} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_AdditionalShaderChannelsFlag: 25 + m_SortingLayerID: 0 + m_SortingOrder: 32767 + m_TargetDisplay: 0 --- !u!1001 &378672267 PrefabInstance: m_ObjectHideFlags: 0 @@ -2305,10 +2699,10 @@ RectTransform: m_Father: {fileID: 1006389537} 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: 19.5585, y: -0.0203} - m_SizeDelta: {x: 100, y: 18} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &443940496 MonoBehaviour: @@ -2357,8 +2751,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 15 - m_fontSizeBase: 15 + m_fontSize: 36 + m_fontSizeBase: 36 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -2697,6 +3091,51 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 470205195} m_Mesh: {fileID: 4300000, guid: 631028b3a30f092428e370d8a925482c, type: 3} +--- !u!1 &476025398 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 476025399} + - component: {fileID: 476025400} + m_Layer: 0 + m_Name: Game manager + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &476025399 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 476025398} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 971260931} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &476025400 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 476025398} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 90d55fcea99d3d14db40fb1ce5deca37, type: 3} + m_Name: + m_EditorClassIdentifier: + Player: {fileID: 0} --- !u!1001 &477926200 PrefabInstance: m_ObjectHideFlags: 0 @@ -2908,10 +3347,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 2051386991} - - {fileID: 1006389537} - - {fileID: 1235246448} - - {fileID: 1613486730} - - {fileID: 737469174} m_Father: {fileID: 329780516} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -3984,20 +4419,20 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 737469173} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1326618497} - {fileID: 1764865642} - m_Father: {fileID: 497576566} - m_RootOrder: 4 + m_Father: {fileID: 2051386991} + 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: -337.8, y: -17.039} - m_SizeDelta: {x: 100, y: 21.462} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!4 &766474797 stripped Transform: @@ -4034,7 +4469,7 @@ Transform: m_Children: - {fileID: 595812469} m_Father: {fileID: 0} - m_RootOrder: 10 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &774418990 PrefabInstance: @@ -4219,10 +4654,10 @@ RectTransform: m_Father: {fileID: 1006389537} 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: 17, y: 0} - m_SizeDelta: {x: 30, y: 15} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &779251535 MonoBehaviour: @@ -4564,7 +4999,7 @@ Transform: m_Children: - {fileID: 1287883233} m_Father: {fileID: 274182514} - m_RootOrder: 3 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &871823183 GameObject: @@ -4668,7 +5103,7 @@ Transform: m_Children: - {fileID: 1476341267} m_Father: {fileID: 0} - m_RootOrder: 9 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!195 &871823190 NavMeshAgent: @@ -6230,7 +6665,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 0 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 39.475, y: 0, z: 0} --- !u!114 &963194229 MonoBehaviour: @@ -6246,6 +6681,41 @@ MonoBehaviour: m_EditorClassIdentifier: _player: {fileID: 871823189} _smoothFactor: 0.814 +--- !u!1 &971260930 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 971260931} + m_Layer: 0 + m_Name: Managers + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &971260931 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 971260930} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 307039700} + - {fileID: 2047049769} + - {fileID: 1550470211} + - {fileID: 476025399} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &1001356368 stripped Transform: m_CorrespondingSourceObject: {fileID: 427308, guid: c50789636e1fc5c4b8a37e2700e4a3c1, type: 3} @@ -6260,6 +6730,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1006389537} + - component: {fileID: 1006389539} m_Layer: 5 m_Name: Money m_TagString: Untagged @@ -6274,21 +6745,47 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1006389536} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 779251534} - {fileID: 443940495} - m_Father: {fileID: 497576566} - m_RootOrder: 1 + m_Father: {fileID: 2051386991} + 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: -15.599976, y: -16.3} - m_SizeDelta: {x: 147.30078, y: 21.462} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 500, y: 50} m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1006389539 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1006389536} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 5 + m_Right: 5 + m_Top: 10 + m_Bottom: 0 + m_ChildAlignment: 0 + m_Spacing: 0 + m_ChildForceExpandWidth: 0 + m_ChildForceExpandHeight: 0 + m_ChildControlWidth: 1 + m_ChildControlHeight: 1 + m_ChildScaleWidth: 0 + m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 --- !u!114 &1023905085 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 3806516703338386376, guid: ea47665625ccfd4408f6411caf45f910, type: 3} @@ -7469,20 +7966,20 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1235246447} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1030855392} - {fileID: 2089282902} - m_Father: {fileID: 497576566} - m_RootOrder: 2 + m_Father: {fileID: 2051386991} + 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: 132.42029, y: -16.299986} - m_SizeDelta: {x: 148.7307, y: 21.462} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1260049133 GameObject: @@ -12913,13 +13410,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1359374188} - m_LocalRotation: {x: -0.7071068, y: 0, z: 0, w: 0.7071068} - m_LocalPosition: {x: 0, y: 0.527, z: -0} + m_LocalRotation: {x: -0.7071068, y: -0, z: -0, w: 0.7071068} + m_LocalPosition: {x: 1.856, y: 0.049, z: 1.86} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 8 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0} --- !u!4 &1379288160 stripped Transform: @@ -13691,6 +14188,11 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!224 &1521470879 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 3806516704876462308, guid: ea47665625ccfd4408f6411caf45f910, type: 3} + m_PrefabInstance: {fileID: 2135138522} + m_PrefabAsset: {fileID: 0} --- !u!1 &1530649887 GameObject: m_ObjectHideFlags: 0 @@ -13849,12 +14351,12 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1550470208} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 0} + m_Father: {fileID: 971260931} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1552961642 @@ -14142,6 +14644,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1613486730} + - component: {fileID: 1613486731} m_Layer: 5 m_Name: Energy m_TagString: Untagged @@ -14156,21 +14659,41 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1613486729} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 910851331} - {fileID: 1726465721} - m_Father: {fileID: 497576566} - m_RootOrder: 3 + m_Father: {fileID: 2051386991} + 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: -437.8, y: -17.039} - m_SizeDelta: {x: 100, y: 21.462} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1613486731 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1613486729} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreLayout: 0 + m_MinWidth: -1 + m_MinHeight: -1 + m_PreferredWidth: 150 + m_PreferredHeight: 50 + m_FlexibleWidth: -1 + m_FlexibleHeight: -1 + m_LayoutPriority: 1 --- !u!4 &1641324328 stripped Transform: m_CorrespondingSourceObject: {fileID: 4497011438508190, guid: 7446a392a730ac14d9cc70d21cf7ace0, type: 3} @@ -15774,8 +16297,9 @@ RectTransform: - {fileID: 1997986295} - {fileID: 26194718} - {fileID: 1396013896} + - {fileID: 1521470879} m_Father: {fileID: 329780516} - m_RootOrder: 2 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -15796,7 +16320,8 @@ MonoBehaviour: m_EditorClassIdentifier: _title: {fileID: 107380538} _choiceButton: {fileID: 890493768} - _closeBtn: {fileID: 1396013895} + _btnApply: {fileID: 0} + _btnClose: {fileID: 0} _playerManager: {fileID: 871823188} conversationChangeEvent: m_PersistentCalls: @@ -17256,13 +17781,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2047049764} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0.65, y: 3.46, z: -17.134588} m_LocalScale: {x: 0.4125, y: 0.39875, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 7 + m_Father: {fileID: 971260931} + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2051386990 GameObject: @@ -17275,6 +17800,8 @@ GameObject: - component: {fileID: 2051386991} - component: {fileID: 2051386993} - component: {fileID: 2051386992} + - component: {fileID: 2051386994} + - component: {fileID: 2051386995} m_Layer: 5 m_Name: Panel m_TagString: Untagged @@ -17293,14 +17820,18 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 1613486730} + - {fileID: 737469174} + - {fileID: 1006389537} + - {fileID: 1235246448} m_Father: {fileID: 497576566} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.33900002, y: 0} - m_AnchorMax: {x: 0.65355104, y: 0.5} - m_AnchoredPosition: {x: 4.38, y: -15.1362} - m_SizeDelta: {x: 807, y: 36.4047} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: -14.8904} + m_SizeDelta: {x: 1920, y: 58.3525} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2051386992 MonoBehaviour: @@ -17340,6 +17871,52 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2051386990} m_CullTransparentMesh: 1 +--- !u!114 &2051386994 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2051386990} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 50 + m_Right: 50 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 0 + 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!114 &2051386995 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2051386990} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreLayout: 0 + m_MinWidth: -1 + m_MinHeight: -1 + m_PreferredWidth: 1920 + m_PreferredHeight: 50 + m_FlexibleWidth: -1 + m_FlexibleHeight: -1 + m_LayoutPriority: 1 --- !u!4 &2066035922 stripped Transform: m_CorrespondingSourceObject: {fileID: 434952, guid: 180ae0328a9b63d4ca285487efd1305a, type: 3} @@ -17480,6 +18057,141 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2068384140} m_CullTransparentMesh: 1 +--- !u!1 &2082085696 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2082085697} + - component: {fileID: 2082085699} + - component: {fileID: 2082085698} + m_Layer: 5 + m_Name: Header + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2082085697 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2082085696} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 3676871} + 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: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &2082085698 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2082085696} + 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: 'New Text ' + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, 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: 36 + m_fontSizeBase: 36 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 256 + 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: 0 + 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 &2082085699 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2082085696} + m_CullTransparentMesh: 1 --- !u!1 &2085197805 GameObject: m_ObjectHideFlags: 0 @@ -18060,11 +18772,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3806516704876462308, guid: ea47665625ccfd4408f6411caf45f910, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: -129 objectReference: {fileID: 0} - target: {fileID: 3806516704876462308, guid: ea47665625ccfd4408f6411caf45f910, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: 0.00047302246 objectReference: {fileID: 0} - target: {fileID: 3806516704876462308, guid: ea47665625ccfd4408f6411caf45f910, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -18418,6 +19130,103 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2121386443} m_Mesh: {fileID: 4300000, guid: 72e65272e9752d842a914dd27fd86306, type: 3} +--- !u!1001 &2135138522 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1928618662} + m_Modifications: + - target: {fileID: 3806516704876462308, guid: ea47665625ccfd4408f6411caf45f910, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3806516704876462308, guid: ea47665625ccfd4408f6411caf45f910, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3806516704876462308, guid: ea47665625ccfd4408f6411caf45f910, type: 3} + propertyPath: m_RootOrder + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 3806516704876462308, guid: ea47665625ccfd4408f6411caf45f910, type: 3} + propertyPath: m_AnchorMax.x + value: 0.96800005 + objectReference: {fileID: 0} + - target: {fileID: 3806516704876462308, guid: ea47665625ccfd4408f6411caf45f910, type: 3} + propertyPath: m_AnchorMax.y + value: 0.24948958 + objectReference: {fileID: 0} + - target: {fileID: 3806516704876462308, guid: ea47665625ccfd4408f6411caf45f910, type: 3} + propertyPath: m_AnchorMin.x + value: 0.791 + objectReference: {fileID: 0} + - target: {fileID: 3806516704876462308, guid: ea47665625ccfd4408f6411caf45f910, type: 3} + propertyPath: m_AnchorMin.y + value: 0.11000001 + objectReference: {fileID: 0} + - target: {fileID: 3806516704876462308, guid: ea47665625ccfd4408f6411caf45f910, type: 3} + propertyPath: m_SizeDelta.x + value: 15.872 + objectReference: {fileID: 0} + - target: {fileID: 3806516704876462308, guid: ea47665625ccfd4408f6411caf45f910, type: 3} + propertyPath: m_SizeDelta.y + value: -42.943 + objectReference: {fileID: 0} + - target: {fileID: 3806516704876462308, guid: ea47665625ccfd4408f6411caf45f910, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3806516704876462308, guid: ea47665625ccfd4408f6411caf45f910, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3806516704876462308, guid: ea47665625ccfd4408f6411caf45f910, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3806516704876462308, guid: ea47665625ccfd4408f6411caf45f910, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3806516704876462308, guid: ea47665625ccfd4408f6411caf45f910, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3806516704876462308, guid: ea47665625ccfd4408f6411caf45f910, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3806516704876462308, guid: ea47665625ccfd4408f6411caf45f910, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3806516704876462308, guid: ea47665625ccfd4408f6411caf45f910, type: 3} + propertyPath: m_AnchoredPosition.x + value: -0.76797485 + objectReference: {fileID: 0} + - target: {fileID: 3806516704876462308, guid: ea47665625ccfd4408f6411caf45f910, type: 3} + propertyPath: m_AnchoredPosition.y + value: -58.611 + objectReference: {fileID: 0} + - target: {fileID: 3806516704876462308, guid: ea47665625ccfd4408f6411caf45f910, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3806516704876462308, guid: ea47665625ccfd4408f6411caf45f910, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3806516704876462308, guid: ea47665625ccfd4408f6411caf45f910, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3806516704876462309, guid: ea47665625ccfd4408f6411caf45f910, type: 3} + propertyPath: m_Name + value: btnApply + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: ea47665625ccfd4408f6411caf45f910, type: 3} --- !u!1 &2137624721 GameObject: m_ObjectHideFlags: 0 @@ -18452,7 +19261,7 @@ RectTransform: - {fileID: 2106039998} - {fileID: 1024192185} m_Father: {fileID: 329780516} - m_RootOrder: 1 + 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} diff --git a/Assets/Scripts/Actions/Eat.cs b/Assets/Scripts/Actions/Eat.cs index 1fa162c1..7eb0eb88 100644 --- a/Assets/Scripts/Actions/Eat.cs +++ b/Assets/Scripts/Actions/Eat.cs @@ -2,20 +2,26 @@ namespace Assets.Scripts.Actions { - public class Eat : BaseAction, ISellableItem + public class Eat : IPlayerAction, Interfaces.ISellable { - public float Price { get; private set; } + public decimal Price { get; private set; } + + public string Name { get; private set; } + + public string Description => $"{Name} - {Price}$"; private int _energy; - public Eat(int duration, int energy, float price) : base(duration) + + public Eat(string name, int energy, decimal price) { + Name = name; Price = price; _energy = energy; } - public override void ApplyAction(PlayerManager playerController) + public void ApplyAction(PlayerManager playerController) { - playerController.food.increase(_energy); + playerController.PlayerStats[GameManager.StatsId.Food].increase(_energy); } } } diff --git a/Assets/Scripts/Actions/Interfaces/ISellableItem.cs b/Assets/Scripts/Actions/Interfaces/ISellableItem.cs deleted file mode 100644 index 283ffb45..00000000 --- a/Assets/Scripts/Actions/Interfaces/ISellableItem.cs +++ /dev/null @@ -1,8 +0,0 @@ - -namespace Assets.Scripts.Actions.Interfaces -{ - internal interface ISellableItem - { - public float Price { get; } - } -} diff --git a/Assets/Scripts/Actions/Interfaces/Interfaces.cs b/Assets/Scripts/Actions/Interfaces/Interfaces.cs new file mode 100644 index 00000000..42d08347 --- /dev/null +++ b/Assets/Scripts/Actions/Interfaces/Interfaces.cs @@ -0,0 +1,20 @@ +namespace Assets.Scripts.Actions.Interfaces +{ + public enum JobId { Unemployed, HotDogs }; + public interface IPlayerAction + { + public string Description { get; } + public void ApplyAction(PlayerManager player); + } + + public interface ISellable + { + public decimal Price { get; } + } + + public interface IWorkPlace + { + public JobId JobID { get; } + public decimal Sallary { get; } + } +} diff --git a/Assets/Scripts/Actions/Interfaces/ISellableItem.cs.meta b/Assets/Scripts/Actions/Interfaces/Interfaces.cs.meta similarity index 83% rename from Assets/Scripts/Actions/Interfaces/ISellableItem.cs.meta rename to Assets/Scripts/Actions/Interfaces/Interfaces.cs.meta index 61d5e68a..7ad994f4 100644 --- a/Assets/Scripts/Actions/Interfaces/ISellableItem.cs.meta +++ b/Assets/Scripts/Actions/Interfaces/Interfaces.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 11ca03325bf76704b91eb2f9b2fafec9 +guid: 5b7ba6deb189bc44ca6f628a799c8667 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Scripts/Actions/JobPosition.cs b/Assets/Scripts/Actions/JobPosition.cs new file mode 100644 index 00000000..db39a44b --- /dev/null +++ b/Assets/Scripts/Actions/JobPosition.cs @@ -0,0 +1,24 @@ +using Assets.Scripts.Actions.Interfaces; + +namespace Assets.Scripts.Actions +{ + public class JobPosition : IPlayerAction, IWorkPlace + { + public string Description => $"{_position} - {Sallary}$ per hour"; + public decimal Sallary { get; private set; } + public JobId JobID { get; private set; } + + + private string _position; + + public JobPosition(string position, decimal sallary, JobId jobId) + { + _position = position; + Sallary = sallary; + } + public void ApplyAction(PlayerManager playerController) + { + playerController.WorkPlace = this; + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/Actions/Work.cs.meta b/Assets/Scripts/Actions/JobPosition.cs.meta similarity index 83% rename from Assets/Scripts/Actions/Work.cs.meta rename to Assets/Scripts/Actions/JobPosition.cs.meta index aca3e4b7..a54fd82c 100644 --- a/Assets/Scripts/Actions/Work.cs.meta +++ b/Assets/Scripts/Actions/JobPosition.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: a40c2851bc6f1454789ac4d529a148c9 +guid: 80cfc634ca94f1e4fa1726ca19eab626 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Scripts/Actions/Jobs.meta b/Assets/Scripts/Actions/Jobs.meta new file mode 100644 index 00000000..eb6d5cc0 --- /dev/null +++ b/Assets/Scripts/Actions/Jobs.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 46382eb4a7b5812458ddf7287b5a65ff +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Actions/Relax.cs b/Assets/Scripts/Actions/Relax.cs index ec9cd953..e38d1b19 100644 --- a/Assets/Scripts/Actions/Relax.cs +++ b/Assets/Scripts/Actions/Relax.cs @@ -1,15 +1,20 @@ -namespace Assets.Scripts.Actions +using Assets.Scripts.Actions.Interfaces; + +namespace Assets.Scripts.Actions { - public class Relax : BaseAction + public class Relax : IPlayerAction { private int _energyPerTick; - public Relax(int duration, int energyPerTick) : base(duration) + public Relax(int duration, int energyPerTick) { _energyPerTick = energyPerTick; } - public override void ApplyAction(PlayerManager playerController) + + public string Description => throw new System.NotImplementedException(); + + public void ApplyAction(PlayerManager playerController) { - playerController.energy.increase(_energyPerTick); + playerController.PlayerStats[GameManager.StatsId.Energy].increase(_energyPerTick); } } } diff --git a/Assets/Scripts/Actions/Work.cs b/Assets/Scripts/Actions/Work.cs deleted file mode 100644 index 79d9b86e..00000000 --- a/Assets/Scripts/Actions/Work.cs +++ /dev/null @@ -1,17 +0,0 @@ -namespace Assets.Scripts.Actions -{ - public class Work : BaseAction - { - private PlayerManager playerController; - private int energyPerTick; - public Work(PlayerManager player, int duration, int energyPerTick) : base(duration) - { - this.playerController = player; - this.energyPerTick = energyPerTick; - } - public override void ApplyAction(PlayerManager playerController) - { - throw new System.NotImplementedException(); - } - } -} diff --git a/Assets/Scripts/Buildings/Building.cs b/Assets/Scripts/Buildings/Building.cs index e1be7071..12fa29d5 100644 --- a/Assets/Scripts/Buildings/Building.cs +++ b/Assets/Scripts/Buildings/Building.cs @@ -1,4 +1,4 @@ -using Assets.Scripts.Actions; +using Assets.Scripts.Actions.Interfaces; using System.Collections.Generic; using UnityEngine; @@ -7,13 +7,13 @@ namespace Assets.Scripts.Buildings public abstract class BaseCell : MonoBehaviour { protected string _name; - protected Dictionary _optionsList; + protected List _optionsList; [SerializeField] private ConversationController _conversationController; // Start is called before the first frame update void Start() { - _optionsList = new Dictionary(); + _optionsList = new List(); Initialize(); BuildOptionsList(); } diff --git a/Assets/Scripts/Buildings/Burger.cs b/Assets/Scripts/Buildings/Burger.cs index 2ca21e17..38d75287 100644 --- a/Assets/Scripts/Buildings/Burger.cs +++ b/Assets/Scripts/Buildings/Burger.cs @@ -1,6 +1,4 @@ -using Assets.Scripts.Actions; - -namespace Assets.Scripts.Buildings +namespace Assets.Scripts.Buildings { public class Burger : BaseCell { @@ -11,12 +9,12 @@ namespace Assets.Scripts.Buildings protected override void BuildOptionsList() { - _optionsList.Add("Hamburgers - 83$", new Eat(6, 10, 83)); - _optionsList.Add("Cheesburger - 94$", new Eat(6, 1, 94)); - _optionsList.Add("Astro chicken - 131$", new Eat(6, 1, 131)); - _optionsList.Add("Fries - 68$", new Eat(6, 1, 68)); - _optionsList.Add("Shakes - 108$", new Eat(6, 1, 108)); - _optionsList.Add("Colas - 73$", new Eat(6, 1, 73)); + //_optionsList.Add("Hamburgers - 83$", new Eat(6, 10, 83)); + //_optionsList.Add("Cheesburger - 94$", new Eat(6, 1, 94)); + //_optionsList.Add("Astro chicken - 131$", new Eat(6, 1, 131)); + //_optionsList.Add("Fries - 68$", new Eat(6, 1, 68)); + //_optionsList.Add("Shakes - 108$", new Eat(6, 1, 108)); + //_optionsList.Add("Colas - 73$", new Eat(6, 1, 73)); } } diff --git a/Assets/Scripts/Buildings/HotDogs.cs b/Assets/Scripts/Buildings/HotDogs.cs index 95c3af80..f707a3e2 100644 --- a/Assets/Scripts/Buildings/HotDogs.cs +++ b/Assets/Scripts/Buildings/HotDogs.cs @@ -11,8 +11,8 @@ namespace Assets.Scripts.Buildings protected override void BuildOptionsList() { - _optionsList.Add("Hot Dog - 20$", new Eat(6, 15, 83)); - _optionsList.Add("Colas - 10$", new Eat(6, 10, 73)); + _optionsList.Add(new Eat("Hot Dog", 15, 20)); + _optionsList.Add(new Eat("Cola", 10, 10)); } } diff --git a/Assets/Scripts/Buildings/House.cs b/Assets/Scripts/Buildings/House.cs index 035ba2eb..3f8a955a 100644 --- a/Assets/Scripts/Buildings/House.cs +++ b/Assets/Scripts/Buildings/House.cs @@ -1,12 +1,10 @@ -using Assets.Scripts.Actions; - -namespace Assets.Scripts.Buildings +namespace Assets.Scripts.Buildings { public class House : BaseCell { protected override void BuildOptionsList() { - _optionsList.Add("Rest", new Relax(6, 1)); + //_optionsList.Add(new Relax("Rest", 6, 1)); } protected override void Initialize() diff --git a/Assets/Scripts/Buildings/JobAgency.cs b/Assets/Scripts/Buildings/JobAgency.cs new file mode 100644 index 00000000..95e0a033 --- /dev/null +++ b/Assets/Scripts/Buildings/JobAgency.cs @@ -0,0 +1,19 @@ +using Assets.Scripts.Actions; +using Assets.Scripts.Actions.Interfaces; + +namespace Assets.Scripts.Buildings +{ + public class JobAgency : BaseCell + { + protected override void Initialize() + { + _name = "Job Agency"; + } + + protected override void BuildOptionsList() + { + _optionsList.Add(new JobPosition("Hot Dogs sailer ", 20, JobId.HotDogs)); + } + + } +} diff --git a/Assets/Scripts/Buildings/JobAgency.cs.meta b/Assets/Scripts/Buildings/JobAgency.cs.meta new file mode 100644 index 00000000..36fa763d --- /dev/null +++ b/Assets/Scripts/Buildings/JobAgency.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 16925e4f4154a004dadcfa7300af1bbe +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/DialogueSystem/ChoiceController.cs b/Assets/Scripts/DialogueSystem/ChoiceController.cs index 0306d21e..2a4bd6de 100644 --- a/Assets/Scripts/DialogueSystem/ChoiceController.cs +++ b/Assets/Scripts/DialogueSystem/ChoiceController.cs @@ -1,19 +1,18 @@ -using Assets.Scripts.Actions; -using System.Collections.Generic; +using Assets.Scripts.Actions.Interfaces; using TMPro; using UnityEngine; using UnityEngine.Events; using UnityEngine.UI; [System.Serializable] -public class ConversationChangeEvent : UnityEvent { } +public class ConversationChangeEvent : UnityEvent { } public class ChoiceController : MonoBehaviour { - public KeyValuePair _option; + public IPlayerAction _option; public ConversationChangeEvent conversationChangeEvent; // Update is called once per frame - public static ChoiceController AddChoiceButton(Button choiceButtonTemplate, KeyValuePair option, int index) + public static ChoiceController AddChoiceButton(Button choiceButtonTemplate, IPlayerAction option, int index) { int buttonSpacing = -50; @@ -22,7 +21,7 @@ public class ChoiceController : MonoBehaviour button.transform.SetParent(choiceButtonTemplate.transform.parent); button.transform.localScale = Vector3.one; button.transform.localPosition = choiceButtonTemplate.transform.localPosition + new Vector3(0, index * buttonSpacing, 0); - button.name = option.Key; + button.name = option.Description; button.gameObject.SetActive(true); ChoiceController choiceController = button.GetComponent(); choiceController._option = option; @@ -36,11 +35,11 @@ public class ChoiceController : MonoBehaviour var btn = GetComponent