diff --git a/Assets/Prefabs/UI/EducationItem.prefab b/Assets/Prefabs/UI/EducationItem.prefab new file mode 100644 index 00000000..a305fe40 --- /dev/null +++ b/Assets/Prefabs/UI/EducationItem.prefab @@ -0,0 +1,1101 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &1402130886854618066 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4104292198911527695} + - component: {fileID: 930127345241834450} + - component: {fileID: 3870220567668916177} + m_Layer: 5 + m_Name: Description + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4104292198911527695 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1402130886854618066} + 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: 7254749674437777779} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.22343591, y: 0.46666667} + m_AnchorMax: {x: 0.9768718, y: 0.98888886} + m_AnchoredPosition: {x: 0, y: 6.7678} + m_SizeDelta: {x: 0, y: -11.536} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &930127345241834450 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1402130886854618066} + m_CullTransparentMesh: 1 +--- !u!114 &3870220567668916177 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1402130886854618066} + 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: Mathematics + 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: 4286922509 + m_fontColor: {r: 0.050980393, g: 0.24705882, b: 0.52156866, 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: 30 + m_fontSizeBase: 30 + 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_TextWrappingMode: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_EmojiFallbackSupport: 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!1 &1716477342205779047 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8380643456073108452} + - component: {fileID: 1881419570309390241} + - component: {fileID: 990405839469229349} + m_Layer: 5 + m_Name: Price + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8380643456073108452 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1716477342205779047} + m_LocalRotation: {x: 0.00000037450707, y: 5.361278e-11, z: 0.0001431556, 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: 7254749674437777779} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0.016} + m_AnchorMin: {x: 0.22343591, y: 0} + m_AnchorMax: {x: 0.8391283, y: 0.46666667} + m_AnchoredPosition: {x: 146.92, y: -2.9155998} + m_SizeDelta: {x: -186.4, y: -12.529} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1881419570309390241 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1716477342205779047} + m_CullTransparentMesh: 1 +--- !u!114 &990405839469229349 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1716477342205779047} + 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 + 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: 4288645717 + m_fontColor: {r: 0.33333334, g: 0.5411765, b: 0.62352943, 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: 25 + m_fontSizeBase: 25 + 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_TextWrappingMode: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_EmojiFallbackSupport: 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!1 &3310662501840371697 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 9065471836884485705} + - component: {fileID: 9018781955098760075} + - component: {fileID: 5596640423752899459} + m_Layer: 5 + m_Name: EducationItem + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &9065471836884485705 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3310662501840371697} + 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: 7254749674437777779} + m_Father: {fileID: 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: 390, y: 90} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &9018781955098760075 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3310662501840371697} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 0 + m_VerticalFit: 0 +--- !u!114 &5596640423752899459 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3310662501840371697} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ae4f157b0a61c52409c1c86ea3826ab1, type: 3} + m_Name: + m_EditorClassIdentifier: + _description: {fileID: 3870220567668916177} + _duration: {fileID: 2787096983671346797} + _price: {fileID: 990405839469229349} + _icon: {fileID: 5333122869086954718} + _button: {fileID: 7544413826500446465} +--- !u!1 &3687832963426323659 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3025894484085524769} + - component: {fileID: 454700132730788234} + - component: {fileID: 5333122869086954718} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3025894484085524769 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3687832963426323659} + 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: 7254749674437777779} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.014285715, y: 0.13333336} + m_AnchorMax: {x: 0.18857141, y: 0.8666668} + m_AnchoredPosition: {x: 0.5, y: 0} + m_SizeDelta: {x: -1, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &454700132730788234 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3687832963426323659} + m_CullTransparentMesh: 1 +--- !u!114 &5333122869086954718 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3687832963426323659} + 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: 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!1 &4457095011060925891 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2191777638713591907} + - component: {fileID: 3879907441489196519} + - component: {fileID: 2587354648394751318} + m_Layer: 5 + m_Name: Hours + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2191777638713591907 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4457095011060925891} + m_LocalRotation: {x: 0.00000037450707, y: 5.361278e-11, z: 0.0001431556, 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: 7254749674437777779} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0.016} + m_AnchorMin: {x: 0.22343591, y: 0} + m_AnchorMax: {x: 0.8391283, y: 0.46666667} + m_AnchoredPosition: {x: 69.2, y: 22.678} + m_SizeDelta: {x: -138.3996, y: -20.284} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3879907441489196519 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4457095011060925891} + m_CullTransparentMesh: 1 +--- !u!114 &2587354648394751318 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4457095011060925891} + 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: Hours + 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: 4288645717 + m_fontColor: {r: 0.33333334, g: 0.5411765, b: 0.62352943, 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: 25 + m_fontSizeBase: 25 + 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_TextWrappingMode: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_EmojiFallbackSupport: 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!1 &5399704626302060193 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7707189450545850178} + - component: {fileID: 7005118373736911168} + - component: {fileID: 5348778865947662906} + m_Layer: 5 + m_Name: Duration + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7707189450545850178 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5399704626302060193} + m_LocalRotation: {x: 0.00000037450707, y: 5.361278e-11, z: 0.0001431556, 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: 7254749674437777779} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0.016} + m_AnchorMin: {x: 0.22343591, y: 0} + m_AnchorMax: {x: 0.8391283, y: 0.46666667} + m_AnchoredPosition: {x: -69.19979, y: 22.678} + m_SizeDelta: {x: -138.3996, y: -20.284} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7005118373736911168 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5399704626302060193} + m_CullTransparentMesh: 1 +--- !u!114 &5348778865947662906 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5399704626302060193} + 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: Duration + 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: 4288645717 + m_fontColor: {r: 0.33333334, g: 0.5411765, b: 0.62352943, 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: 25 + m_fontSizeBase: 25 + 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_TextWrappingMode: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_EmojiFallbackSupport: 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!1 &5457663378976431617 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6440515614282709497} + - component: {fileID: 5235484089769332296} + - component: {fileID: 2787096983671346797} + m_Layer: 5 + m_Name: DurationVal + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6440515614282709497 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5457663378976431617} + 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: 7254749674437777779} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.8492566, y: 0.022222223} + m_AnchorMax: {x: 0.9768718, y: 0.46666667} + m_AnchoredPosition: {x: -142.35, y: 21.678} + m_SizeDelta: {x: 0, y: -18.285} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5235484089769332296 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5457663378976431617} + m_CullTransparentMesh: 1 +--- !u!114 &2787096983671346797 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5457663378976431617} + 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 + 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: 4288645717 + m_fontColor: {r: 0.33333334, g: 0.5411765, b: 0.62352943, 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: 25 + m_fontSizeBase: 25 + 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_TextWrappingMode: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_EmojiFallbackSupport: 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!1 &5761646621931476650 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7254749674437777779} + - component: {fileID: 6626853770728912630} + - component: {fileID: 4798811243242991943} + - component: {fileID: 7544413826500446465} + m_Layer: 5 + m_Name: Button + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7254749674437777779 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5761646621931476650} + 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: 3025894484085524769} + - {fileID: 4104292198911527695} + - {fileID: 7707189450545850178} + - {fileID: 6440515614282709497} + - {fileID: 2191777638713591907} + - {fileID: 7893795395824254312} + - {fileID: 8380643456073108452} + m_Father: {fileID: 9065471836884485705} + 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 &6626853770728912630 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5761646621931476650} + m_CullTransparentMesh: 1 +--- !u!114 &4798811243242991943 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5761646621931476650} + 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: 6378526cf23ea4d4b94a8b3bcc6c007a, 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 &7544413826500446465 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5761646621931476650} + 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: 0.93333334, g: 0.9843137, b: 0.96862745, a: 1} + m_HighlightedColor: {r: 0.67058825, g: 0.92156863, b: 1, a: 1} + m_PressedColor: {r: 0.7058824, g: 0.84313726, b: 1, a: 1} + m_SelectedColor: {r: 0.67058825, g: 0.92156863, b: 1, 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: 4798811243242991943} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 0} + m_TargetAssemblyTypeName: JobItemUITemplate, Assembly-CSharp + m_MethodName: Click + 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!1 &8369435806056659698 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7893795395824254312} + - component: {fileID: 2627980977827835409} + - component: {fileID: 2144572893965709250} + m_Layer: 5 + m_Name: Enroll + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7893795395824254312 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8369435806056659698} + m_LocalRotation: {x: 0.00000037450707, y: 5.361278e-11, z: 0.0001431556, 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: 7254749674437777779} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0.016} + m_AnchorMin: {x: 0.22343591, y: 0} + m_AnchorMax: {x: 0.8391283, y: 0.46666667} + m_AnchoredPosition: {x: -33.4068, y: -6.2644} + m_SizeDelta: {x: -66.8136, y: -12.5288} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2627980977827835409 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8369435806056659698} + m_CullTransparentMesh: 1 +--- !u!114 &2144572893965709250 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8369435806056659698} + 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: Enroll price + 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: 4288645717 + m_fontColor: {r: 0.33333334, g: 0.5411765, b: 0.62352943, 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: 25 + m_fontSizeBase: 25 + 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_TextWrappingMode: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_EmojiFallbackSupport: 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} diff --git a/Assets/Prefabs/UI/EducationItem.prefab.meta b/Assets/Prefabs/UI/EducationItem.prefab.meta new file mode 100644 index 00000000..2af177d3 --- /dev/null +++ b/Assets/Prefabs/UI/EducationItem.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 4c9d1546155d57e45a5dc96e1772cad4 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/UI/JobItemUiTemplate.prefab b/Assets/Prefabs/UI/JobItem.prefab similarity index 99% rename from Assets/Prefabs/UI/JobItemUiTemplate.prefab rename to Assets/Prefabs/UI/JobItem.prefab index af6e66a3..1e17aa84 100644 --- a/Assets/Prefabs/UI/JobItemUiTemplate.prefab +++ b/Assets/Prefabs/UI/JobItem.prefab @@ -147,7 +147,7 @@ GameObject: - component: {fileID: 4899774397145829728} - component: {fileID: 9018781955098760075} m_Layer: 5 - m_Name: JobItemUiTemplate + m_Name: JobItem m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 diff --git a/Assets/Prefabs/UI/JobItemUiTemplate.prefab.meta b/Assets/Prefabs/UI/JobItem.prefab.meta similarity index 100% rename from Assets/Prefabs/UI/JobItemUiTemplate.prefab.meta rename to Assets/Prefabs/UI/JobItem.prefab.meta diff --git a/Assets/Scenes/City.unity b/Assets/Scenes/City.unity index b47aec22..7e51ba55 100644 --- a/Assets/Scenes/City.unity +++ b/Assets/Scenes/City.unity @@ -1685,9 +1685,9 @@ RectTransform: m_Children: [] m_Father: {fileID: 349281313} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 250, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 250, y: -90} m_SizeDelta: {x: 480, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &249161732 @@ -4097,7 +4097,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 749553635} serializedVersion: 2 - m_LocalRotation: {x: 0.38268346, y: -0.000000022481213, z: 0.000000009312023, w: 0.92387956} + m_LocalRotation: {x: 0.38268346, y: 0.000000022481224, z: -0.0000000093120285, w: 0.92387956} m_LocalPosition: {x: 29.11, y: 5, z: -5} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 @@ -4697,7 +4697,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 835327588} serializedVersion: 2 - m_LocalRotation: {x: 0.38268346, y: -0.000000022481213, z: 0.000000009312023, w: 0.92387956} + m_LocalRotation: {x: 0.38268346, y: 0.000000022481224, z: -0.0000000093120285, w: 0.92387956} m_LocalPosition: {x: 29.11, y: 5, z: -5} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 diff --git a/Assets/Scenes/School.unity b/Assets/Scenes/School.unity index 5114d759..1906f5e7 100644 --- a/Assets/Scenes/School.unity +++ b/Assets/Scenes/School.unity @@ -485,7 +485,7 @@ PrefabInstance: - target: {fileID: -8679921383154817045, guid: 9bd342097a69da64daea3e6f3814ad3e, type: 3} propertyPath: m_LocalPosition.y - value: 0.84 + value: 0.811 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 9bd342097a69da64daea3e6f3814ad3e, type: 3} @@ -534,9 +534,44 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: -8679921383154817045, guid: 9bd342097a69da64daea3e6f3814ad3e, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1086470460} + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 9bd342097a69da64daea3e6f3814ad3e, + type: 3} + insertIndex: -1 + addedObject: {fileID: 202296547} m_SourcePrefab: {fileID: 100100000, guid: 9bd342097a69da64daea3e6f3814ad3e, type: 3} +--- !u!1 &202296545 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 9bd342097a69da64daea3e6f3814ad3e, + type: 3} + m_PrefabInstance: {fileID: 202296544} + m_PrefabAsset: {fileID: 0} +--- !u!4 &202296546 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 9bd342097a69da64daea3e6f3814ad3e, + type: 3} + m_PrefabInstance: {fileID: 202296544} + m_PrefabAsset: {fileID: 0} +--- !u!114 &202296547 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 202296545} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 05e7f5c95d24c174ba832e4264e9d224, type: 3} + m_Name: + m_EditorClassIdentifier: + _interactionPoint: {fileID: 1086470460} + _dialogSO: {fileID: 11400000, guid: 40d509fd76291394285fd38512792c46, type: 2} + _dialogOptionsSO: {fileID: 0} --- !u!1001 &385599245 PrefabInstance: m_ObjectHideFlags: 0 @@ -2259,6 +2294,37 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1032387547} m_PrefabAsset: {fileID: 0} +--- !u!1 &1086470459 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1086470460} + m_Layer: 0 + m_Name: GameObject + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1086470460 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1086470459} + serializedVersion: 2 + m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068} + m_LocalPosition: {x: -0, y: 0.022, z: -0.492} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 202296546} + m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} --- !u!1001 &1125387878 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/InteractableObjects/OfficeTable.cs b/Assets/Scripts/InteractableObjects/OfficeTable.cs index deff901a..6ed125e3 100644 --- a/Assets/Scripts/InteractableObjects/OfficeTable.cs +++ b/Assets/Scripts/InteractableObjects/OfficeTable.cs @@ -1,9 +1,8 @@ +using Assets.Scripts.Interfaces; using UnityEngine; public class OfficeTable : BaseInteractableObject { - [SerializeField] - private DialogCategorySO _dialogOptionsSO; [SerializeField] private DialogSO _dialogSO; protected override void PrepareMenuActions() @@ -16,9 +15,9 @@ public class OfficeTable : BaseInteractableObject GameManager.Instance.UI.ShowTabObtionsDialog(_dialogSO, null, OnConfirm); } - private void OnConfirm(JobInfoSO selectedJob) + private void OnConfirm(IDialogOption selectedJob) { - _player.JobPosition = selectedJob.JobPosition; + _player.JobPosition = (selectedJob as JobInfoSO).JobPosition; print($"player selected position is {_player.JobPosition}"); } } diff --git a/Assets/Scripts/InteractableObjects/SecretaryDesk.cs b/Assets/Scripts/InteractableObjects/SecretaryDesk.cs index a43187de..7f0815e2 100644 --- a/Assets/Scripts/InteractableObjects/SecretaryDesk.cs +++ b/Assets/Scripts/InteractableObjects/SecretaryDesk.cs @@ -5,8 +5,6 @@ public class SecretaryDesk : BaseInteractableObject { [SerializeField] private DialogSO _dialogSO; - [SerializeField] - private DialogCategorySO _dialogOptionsSO; protected override void PrepareMenuActions() { @@ -21,6 +19,6 @@ public class SecretaryDesk : BaseInteractableObject private void OnConfirm(IDialogOption selectedOption) { //_player.JobPosition = (selectedOption as EducationInfoSO).JobPosition; - print($"player selected position is {_player.JobPosition}"); + print($"player selected position is {(selectedOption as EducationInfoSO).Description}"); } } diff --git a/Assets/Scripts/Interfaces/IDialogOption.cs b/Assets/Scripts/Interfaces/IDialogOption.cs index b9864a07..7a3bca6e 100644 --- a/Assets/Scripts/Interfaces/IDialogOption.cs +++ b/Assets/Scripts/Interfaces/IDialogOption.cs @@ -4,6 +4,7 @@ namespace Assets.Scripts.Interfaces { public interface IDialogItemUI { + IDialogOption Item { get; } void SetItem(DialogOptionsUI parent, IDialogOption item); } public class IDialogOption: ScriptableObject diff --git a/Assets/Scripts/ScriptableObjects/JobPositions.meta b/Assets/Scripts/ScriptableObjects/DialogOptions.meta similarity index 100% rename from Assets/Scripts/ScriptableObjects/JobPositions.meta rename to Assets/Scripts/ScriptableObjects/DialogOptions.meta diff --git a/Assets/Scripts/ScriptableObjects/DialogOptions/JobAgency.meta b/Assets/Scripts/ScriptableObjects/DialogOptions/JobAgency.meta new file mode 100644 index 00000000..91a4a3a1 --- /dev/null +++ b/Assets/Scripts/ScriptableObjects/DialogOptions/JobAgency.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 050d5c1f23823194b8c24759c2dc67d1 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/ScriptableObjects/JobPositions/Cashier.asset b/Assets/Scripts/ScriptableObjects/DialogOptions/JobAgency/Cashier.asset similarity index 100% rename from Assets/Scripts/ScriptableObjects/JobPositions/Cashier.asset rename to Assets/Scripts/ScriptableObjects/DialogOptions/JobAgency/Cashier.asset diff --git a/Assets/Scripts/ScriptableObjects/JobPositions/Cashier.asset.meta b/Assets/Scripts/ScriptableObjects/DialogOptions/JobAgency/Cashier.asset.meta similarity index 100% rename from Assets/Scripts/ScriptableObjects/JobPositions/Cashier.asset.meta rename to Assets/Scripts/ScriptableObjects/DialogOptions/JobAgency/Cashier.asset.meta diff --git a/Assets/Scripts/ScriptableObjects/JobPositions/Clerk.asset b/Assets/Scripts/ScriptableObjects/DialogOptions/JobAgency/Clerk.asset similarity index 100% rename from Assets/Scripts/ScriptableObjects/JobPositions/Clerk.asset rename to Assets/Scripts/ScriptableObjects/DialogOptions/JobAgency/Clerk.asset diff --git a/Assets/Scripts/ScriptableObjects/JobPositions/Clerk.asset.meta b/Assets/Scripts/ScriptableObjects/DialogOptions/JobAgency/Clerk.asset.meta similarity index 100% rename from Assets/Scripts/ScriptableObjects/JobPositions/Clerk.asset.meta rename to Assets/Scripts/ScriptableObjects/DialogOptions/JobAgency/Clerk.asset.meta diff --git a/Assets/Scripts/ScriptableObjects/JobPositions/JobAgency.asset b/Assets/Scripts/ScriptableObjects/DialogOptions/JobAgency/JobAgency.asset similarity index 100% rename from Assets/Scripts/ScriptableObjects/JobPositions/JobAgency.asset rename to Assets/Scripts/ScriptableObjects/DialogOptions/JobAgency/JobAgency.asset diff --git a/Assets/Scripts/ScriptableObjects/JobPositions/JobAgency.asset.meta b/Assets/Scripts/ScriptableObjects/DialogOptions/JobAgency/JobAgency.asset.meta similarity index 100% rename from Assets/Scripts/ScriptableObjects/JobPositions/JobAgency.asset.meta rename to Assets/Scripts/ScriptableObjects/DialogOptions/JobAgency/JobAgency.asset.meta diff --git a/Assets/Scripts/ScriptableObjects/JobPositions/Manager.asset b/Assets/Scripts/ScriptableObjects/DialogOptions/JobAgency/Manager.asset similarity index 100% rename from Assets/Scripts/ScriptableObjects/JobPositions/Manager.asset rename to Assets/Scripts/ScriptableObjects/DialogOptions/JobAgency/Manager.asset diff --git a/Assets/Scripts/ScriptableObjects/JobPositions/Manager.asset.meta b/Assets/Scripts/ScriptableObjects/DialogOptions/JobAgency/Manager.asset.meta similarity index 100% rename from Assets/Scripts/ScriptableObjects/JobPositions/Manager.asset.meta rename to Assets/Scripts/ScriptableObjects/DialogOptions/JobAgency/Manager.asset.meta diff --git a/Assets/Scripts/ScriptableObjects/JobPositions/ManagerAssistant.asset b/Assets/Scripts/ScriptableObjects/DialogOptions/JobAgency/ManagerAssistant.asset similarity index 100% rename from Assets/Scripts/ScriptableObjects/JobPositions/ManagerAssistant.asset rename to Assets/Scripts/ScriptableObjects/DialogOptions/JobAgency/ManagerAssistant.asset diff --git a/Assets/Scripts/ScriptableObjects/JobPositions/ManagerAssistant.asset.meta b/Assets/Scripts/ScriptableObjects/DialogOptions/JobAgency/ManagerAssistant.asset.meta similarity index 100% rename from Assets/Scripts/ScriptableObjects/JobPositions/ManagerAssistant.asset.meta rename to Assets/Scripts/ScriptableObjects/DialogOptions/JobAgency/ManagerAssistant.asset.meta diff --git a/Assets/Scripts/ScriptableObjects/JobPositions/Minimarket.asset b/Assets/Scripts/ScriptableObjects/DialogOptions/JobAgency/Minimarket.asset similarity index 100% rename from Assets/Scripts/ScriptableObjects/JobPositions/Minimarket.asset rename to Assets/Scripts/ScriptableObjects/DialogOptions/JobAgency/Minimarket.asset diff --git a/Assets/Scripts/ScriptableObjects/JobPositions/Minimarket.asset.meta b/Assets/Scripts/ScriptableObjects/DialogOptions/JobAgency/Minimarket.asset.meta similarity index 100% rename from Assets/Scripts/ScriptableObjects/JobPositions/Minimarket.asset.meta rename to Assets/Scripts/ScriptableObjects/DialogOptions/JobAgency/Minimarket.asset.meta diff --git a/Assets/Scripts/ScriptableObjects/JobPositions/Office.asset b/Assets/Scripts/ScriptableObjects/DialogOptions/JobAgency/Office.asset similarity index 100% rename from Assets/Scripts/ScriptableObjects/JobPositions/Office.asset rename to Assets/Scripts/ScriptableObjects/DialogOptions/JobAgency/Office.asset diff --git a/Assets/Scripts/ScriptableObjects/JobPositions/Office.asset.meta b/Assets/Scripts/ScriptableObjects/DialogOptions/JobAgency/Office.asset.meta similarity index 100% rename from Assets/Scripts/ScriptableObjects/JobPositions/Office.asset.meta rename to Assets/Scripts/ScriptableObjects/DialogOptions/JobAgency/Office.asset.meta diff --git a/Assets/Scripts/ScriptableObjects/DialogOptions/School.meta b/Assets/Scripts/ScriptableObjects/DialogOptions/School.meta new file mode 100644 index 00000000..566c5ce0 --- /dev/null +++ b/Assets/Scripts/ScriptableObjects/DialogOptions/School.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: edc1273ddc4c788449fe69fe20d2c07f +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/ScriptableObjects/DialogOptions/School/HighSchool.asset b/Assets/Scripts/ScriptableObjects/DialogOptions/School/HighSchool.asset new file mode 100644 index 00000000..ba56b87d --- /dev/null +++ b/Assets/Scripts/ScriptableObjects/DialogOptions/School/HighSchool.asset @@ -0,0 +1,17 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f667daa0686227b49a9ca2ebd6326a98, type: 3} + m_Name: HighSchool + m_EditorClassIdentifier: + Title: Hight School + Icon: {fileID: 21300000, guid: aef64b4574ccbc74897f2d9cd98cdf12, type: 3} + OptionsList: [] diff --git a/Assets/Scripts/ScriptableObjects/DialogOptions/School/HighSchool.asset.meta b/Assets/Scripts/ScriptableObjects/DialogOptions/School/HighSchool.asset.meta new file mode 100644 index 00000000..efebe153 --- /dev/null +++ b/Assets/Scripts/ScriptableObjects/DialogOptions/School/HighSchool.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f4995fdc1159dde4f89ae0a1b1be42f8 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/ScriptableObjects/DialogOptions/School/Mathematics.asset b/Assets/Scripts/ScriptableObjects/DialogOptions/School/Mathematics.asset new file mode 100644 index 00000000..f645409c --- /dev/null +++ b/Assets/Scripts/ScriptableObjects/DialogOptions/School/Mathematics.asset @@ -0,0 +1,19 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3ba71c02cddb93d408c7c1b2f9846099, type: 3} + m_Name: Mathematics + m_EditorClassIdentifier: + Icon: {fileID: 21300000, guid: 03db7f2d5bccf674c95ce74426db7fbb, type: 3} + Description: 'Mathematics ' + Duration: 5 + EnrollPrice: 10 + Skill: 0 diff --git a/Assets/Scripts/ScriptableObjects/DialogOptions/School/Mathematics.asset.meta b/Assets/Scripts/ScriptableObjects/DialogOptions/School/Mathematics.asset.meta new file mode 100644 index 00000000..bfdcde32 --- /dev/null +++ b/Assets/Scripts/ScriptableObjects/DialogOptions/School/Mathematics.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b2f41f944cd1f3f4f82130491c97d5da +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/ScriptableObjects/DialogOptions/School/School.asset b/Assets/Scripts/ScriptableObjects/DialogOptions/School/School.asset new file mode 100644 index 00000000..d55b7f8c --- /dev/null +++ b/Assets/Scripts/ScriptableObjects/DialogOptions/School/School.asset @@ -0,0 +1,19 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: bf7ee1c503cbe524b8a52dc86566b3b6, type: 3} + m_Name: School + m_EditorClassIdentifier: + Title: School + UITemplate: {fileID: 9018781955098760075, guid: 4c9d1546155d57e45a5dc96e1772cad4, + type: 3} + CategoriesSO: + - {fileID: 11400000, guid: f4995fdc1159dde4f89ae0a1b1be42f8, type: 2} diff --git a/Assets/Scripts/ScriptableObjects/DialogOptions/School/School.asset.meta b/Assets/Scripts/ScriptableObjects/DialogOptions/School/School.asset.meta new file mode 100644 index 00000000..26efdcf2 --- /dev/null +++ b/Assets/Scripts/ScriptableObjects/DialogOptions/School/School.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 40d509fd76291394285fd38512792c46 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/ScriptableObjects/EducationInfoSO.cs b/Assets/Scripts/ScriptableObjects/EducationInfoSO.cs index d660ce7a..a866dc64 100644 --- a/Assets/Scripts/ScriptableObjects/EducationInfoSO.cs +++ b/Assets/Scripts/ScriptableObjects/EducationInfoSO.cs @@ -5,6 +5,7 @@ using UnityEngine; public class EducationInfoSO : IDialogOption { public string Description; - public float Price; + public int Duration; + public float EnrollPrice; public EducationSkill Skill; } diff --git a/Assets/Scripts/UIElements/DialogOptionsUI.cs b/Assets/Scripts/UIElements/DialogOptionsUI.cs index 7b629f92..fb12808b 100644 --- a/Assets/Scripts/UIElements/DialogOptionsUI.cs +++ b/Assets/Scripts/UIElements/DialogOptionsUI.cs @@ -1,3 +1,4 @@ +using Assets.Scripts.Interfaces; using System; using TMPro; using UnityEngine; @@ -24,10 +25,10 @@ public class DialogOptionsUI : MonoBehaviour private DialogTabUITemplate _dialogTabUI; private DialogTabUITemplate _selectedTab; - private JobItemUITemplate _selectedItem; + private IDialogItemUI _selectedItem; private DialogSO _dialogSO; - public void ShowCategoriesDialog(DialogSO dialogSO, Action onCancel, Action onConfirm) + public void ShowCategoriesDialog(DialogSO dialogSO, Action onCancel, Action onConfirm) { GameManager.Instance.UI.Freeze(); @@ -78,7 +79,7 @@ public class DialogOptionsUI : MonoBehaviour { var itemUI = Instantiate(_dialogSO.UITemplate, _itemsContainer); itemUI.gameObject.SetActive(true); - itemUI.GetComponent().SetItem(this, job); + itemUI.GetComponent().SetItem(this, job); } } @@ -86,9 +87,8 @@ public class DialogOptionsUI : MonoBehaviour { } - public void OnItemSelected(JobItemUITemplate button) + public void OnItemSelected(IDialogItemUI button) { - print($"selected job {button.Item.name}"); _selectedItem = button; } diff --git a/Assets/Scripts/UIElements/EducationItemUI.cs b/Assets/Scripts/UIElements/EducationItemUI.cs new file mode 100644 index 00000000..bccc0acd --- /dev/null +++ b/Assets/Scripts/UIElements/EducationItemUI.cs @@ -0,0 +1,49 @@ +using Assets.Scripts.Interfaces; +using TMPro; +using UnityEngine; +using UnityEngine.EventSystems; +using UnityEngine.UI; + +public class EducationItemUI : MonoBehaviour, IDialogItemUI ,IPointerEnterHandler +{ + [SerializeField] + private TextMeshProUGUI _description; + [SerializeField] + private TextMeshProUGUI _duration; + [SerializeField] + private TextMeshProUGUI _price; + [SerializeField] + private Image _icon; + + [SerializeField] + private Button _button; + + private DialogOptionsUI _parent; + private EducationInfoSO _item; + public IDialogOption Item => _item; + + public void SetItem(DialogOptionsUI parent,IDialogOption item) + { + _item= item as EducationInfoSO; + _parent = parent; + _duration.text = _item.Duration.ToString(); + _description.text = _item.Description; + _price.text = $"{_item.EnrollPrice}$"; + _icon.sprite = item.Icon; + _button.enabled = true; + } + + + public void Click() + { + if (_button.enabled) + { + _parent.OnItemSelected(this); + } + } + + public void OnPointerEnter(PointerEventData eventData) + { + if (!_button.enabled) { print("Not enough education"); } + } +} diff --git a/Assets/Scripts/UIElements/EducationItemUI.cs.meta b/Assets/Scripts/UIElements/EducationItemUI.cs.meta new file mode 100644 index 00000000..c2c868a0 --- /dev/null +++ b/Assets/Scripts/UIElements/EducationItemUI.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: ae4f157b0a61c52409c1c86ea3826ab1 \ No newline at end of file diff --git a/Assets/Scripts/UIElements/JobItemUITemplate.cs b/Assets/Scripts/UIElements/JobItemUITemplate.cs index c5415e3e..ca88e864 100644 --- a/Assets/Scripts/UIElements/JobItemUITemplate.cs +++ b/Assets/Scripts/UIElements/JobItemUITemplate.cs @@ -18,7 +18,7 @@ public class JobItemUITemplate : MonoBehaviour, IDialogItemUI ,IPointerEnterHan private DialogOptionsUI _parent; private JobInfoSO _item; - public JobInfoSO Item=> _item; + public IDialogOption Item=> _item; public void SetItem(DialogOptionsUI parent,IDialogOption item) { diff --git a/Assets/Scripts/UIElements/UISystem.cs b/Assets/Scripts/UIElements/UISystem.cs index 66f0ffa7..db6a81f3 100644 --- a/Assets/Scripts/UIElements/UISystem.cs +++ b/Assets/Scripts/UIElements/UISystem.cs @@ -1,3 +1,4 @@ +using Assets.Scripts.Interfaces; using Cysharp.Threading.Tasks; using System; using System.Collections.Generic; @@ -27,7 +28,7 @@ public class UISystem : MonoBehaviour timeSlider.ShowTimeSliderDialog(title, description, onCancel, onConfirm); } - public void ShowTabObtionsDialog(DialogSO dialogSO, Action onCancel, Action onConfirm) + public void ShowTabObtionsDialog(DialogSO dialogSO, Action onCancel, Action onConfirm) { var dialog = Instantiate(_DialogUIPrefab, transform); dialog.ShowCategoriesDialog(dialogSO, onCancel, onConfirm); diff --git a/Assets/Textures/Icons/Mathematics_0.png b/Assets/Textures/Icons/Mathematics_0.png new file mode 100644 index 00000000..bb7698b5 Binary files /dev/null and b/Assets/Textures/Icons/Mathematics_0.png differ diff --git a/Assets/Textures/Icons/Mathematics_0.png.meta b/Assets/Textures/Icons/Mathematics_0.png.meta new file mode 100644 index 00000000..59c3c7ad --- /dev/null +++ b/Assets/Textures/Icons/Mathematics_0.png.meta @@ -0,0 +1,114 @@ +fileFormatVersion: 2 +guid: 03db7f2d5bccf674c95ce74426db7fbb +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 128 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Textures/Icons/school-icon.jpg b/Assets/Textures/Icons/school-icon.jpg new file mode 100644 index 00000000..577ad55d Binary files /dev/null and b/Assets/Textures/Icons/school-icon.jpg differ diff --git a/Assets/Textures/Icons/school-icon.jpg.meta b/Assets/Textures/Icons/school-icon.jpg.meta new file mode 100644 index 00000000..baa3dbc1 --- /dev/null +++ b/Assets/Textures/Icons/school-icon.jpg.meta @@ -0,0 +1,114 @@ +fileFormatVersion: 2 +guid: aef64b4574ccbc74897f2d9cd98cdf12 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 512 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: