diff --git a/Assets/Scenes/SampleScene.unity b/Assets/Scenes/SampleScene.unity index 221c535..5a60c56 100644 --- a/Assets/Scenes/SampleScene.unity +++ b/Assets/Scenes/SampleScene.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.37311992, g: 0.38074034, b: 0.35872713, a: 1} + m_IndirectSpecularColor: {r: 0.37311953, g: 0.38074014, b: 0.3587274, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -244,11 +244,11 @@ MonoBehaviour: lineCount: 1 pageCount: 1 materialCount: 1 - m_havePropertiesChanged: 0 + m_havePropertiesChanged: 1 m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 m_spriteAnimator: {fileID: 0} - m_isInputParsingRequired: 0 + m_isInputParsingRequired: 1 m_inputSource: 0 m_hasFontAssetChanged: 0 m_subTextObjects: @@ -7205,12 +7205,22 @@ Prefab: - target: {fileID: 114405877542956250, guid: 89e9215b05511f648b3306ce05aae35f, type: 2} propertyPath: m_havePropertiesChanged - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 114405877542956250, guid: 89e9215b05511f648b3306ce05aae35f, type: 2} propertyPath: m_isInputParsingRequired - value: 1 + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 114335858491737490, guid: 89e9215b05511f648b3306ce05aae35f, + type: 2} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 114405877542956250, guid: 89e9215b05511f648b3306ce05aae35f, + type: 2} + propertyPath: m_Enabled + value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 89e9215b05511f648b3306ce05aae35f, type: 2} @@ -7441,6 +7451,14 @@ Prefab: propertyPath: m_isInputParsingRequired value: 1 objectReference: {fileID: 0} + - target: {fileID: 1298629106624868, guid: 89e9215b05511f648b3306ce05aae35f, type: 2} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1975049635866488, guid: 89e9215b05511f648b3306ce05aae35f, type: 2} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 89e9215b05511f648b3306ce05aae35f, type: 2} m_IsPrefabAsset: 0 @@ -8606,12 +8624,22 @@ Prefab: - target: {fileID: 114405877542956250, guid: 89e9215b05511f648b3306ce05aae35f, type: 2} propertyPath: m_havePropertiesChanged - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 114405877542956250, guid: 89e9215b05511f648b3306ce05aae35f, type: 2} propertyPath: m_isInputParsingRequired - value: 1 + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 114335858491737490, guid: 89e9215b05511f648b3306ce05aae35f, + type: 2} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 114405877542956250, guid: 89e9215b05511f648b3306ce05aae35f, + type: 2} + propertyPath: m_Enabled + value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 89e9215b05511f648b3306ce05aae35f, type: 2} @@ -9147,12 +9175,22 @@ Prefab: - target: {fileID: 114405877542956250, guid: 89e9215b05511f648b3306ce05aae35f, type: 2} propertyPath: m_havePropertiesChanged - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 114405877542956250, guid: 89e9215b05511f648b3306ce05aae35f, type: 2} propertyPath: m_isInputParsingRequired - value: 1 + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 114335858491737490, guid: 89e9215b05511f648b3306ce05aae35f, + type: 2} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 114405877542956250, guid: 89e9215b05511f648b3306ce05aae35f, + type: 2} + propertyPath: m_Enabled + value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 89e9215b05511f648b3306ce05aae35f, type: 2} @@ -9826,7 +9864,7 @@ MonoBehaviour: m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 m_spriteAnimator: {fileID: 0} - m_isInputParsingRequired: 0 + m_isInputParsingRequired: 1 m_inputSource: 0 m_hasFontAssetChanged: 0 m_subTextObjects: @@ -9847,6 +9885,77 @@ CanvasRenderer: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1457582163} m_CullTransparentMesh: 0 +--- !u!1 &1470635746 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1470635747} + - component: {fileID: 1470635749} + - component: {fileID: 1470635748} + m_Layer: 5 + m_Name: LooseScreen + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &1470635747 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1470635746} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.9999951, y: 0.9999951, z: 0.9999951} + m_Children: + - {fileID: 1722986559} + - {fileID: 1862955497} + m_Father: {fileID: 2138102597} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0.000061035156, y: 0.000030517578} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1470635748 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1470635746} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 2100000, guid: 9cb2100ed638f004e991129ea84744aa, type: 2} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 +--- !u!222 &1470635749 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1470635746} + m_CullTransparentMesh: 0 --- !u!1 &1475634574 GameObject: m_ObjectHideFlags: 0 @@ -10047,12 +10156,22 @@ Prefab: - target: {fileID: 114405877542956250, guid: 89e9215b05511f648b3306ce05aae35f, type: 2} propertyPath: m_havePropertiesChanged - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 114405877542956250, guid: 89e9215b05511f648b3306ce05aae35f, type: 2} propertyPath: m_isInputParsingRequired - value: 1 + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 114335858491737490, guid: 89e9215b05511f648b3306ce05aae35f, + type: 2} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 114405877542956250, guid: 89e9215b05511f648b3306ce05aae35f, + type: 2} + propertyPath: m_Enabled + value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 89e9215b05511f648b3306ce05aae35f, type: 2} @@ -10199,12 +10318,22 @@ Prefab: - target: {fileID: 114405877542956250, guid: 89e9215b05511f648b3306ce05aae35f, type: 2} propertyPath: m_havePropertiesChanged - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 114405877542956250, guid: 89e9215b05511f648b3306ce05aae35f, type: 2} propertyPath: m_isInputParsingRequired - value: 1 + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 114335858491737490, guid: 89e9215b05511f648b3306ce05aae35f, + type: 2} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 114405877542956250, guid: 89e9215b05511f648b3306ce05aae35f, + type: 2} + propertyPath: m_Enabled + value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 89e9215b05511f648b3306ce05aae35f, type: 2} @@ -13761,6 +13890,162 @@ GameObject: m_CorrespondingSourceObject: {fileID: 1472403156812664, guid: 89e9215b05511f648b3306ce05aae35f, type: 2} m_PrefabInternal: {fileID: 1136437093} +--- !u!1 &1722986558 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1722986559} + - component: {fileID: 1722986561} + - component: {fileID: 1722986560} + m_Layer: 5 + m_Name: LooseText + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1722986559 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1722986558} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1470635747} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1722986560 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1722986558} + 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_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_text: OUT OF SPACE (or Skill) + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: ec3cd6eedf31b8240acafae391fca301, type: 2} + m_sharedMaterial: {fileID: 21461864525935096, guid: ec3cd6eedf31b8240acafae391fca301, + 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_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_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_outlineColor: + serializedVersion: 2 + rgba: 4278190080 + m_fontSize: 96 + m_fontSizeBase: 96 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_textAlignment: 2050 + m_isAlignmentEnumConverted: 1 + 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_firstOverflowCharacterIndex: -1 + m_linkedTextComponent: {fileID: 0} + m_isLinkedTextComponent: 0 + m_isTextTruncated: 0 + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_ignoreRectMaskCulling: 0 + m_ignoreCulling: 1 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_firstVisibleCharacter: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_textInfo: + textComponent: {fileID: 1722986560} + characterCount: 23 + spriteCount: 0 + spaceCount: 4 + wordCount: 5 + linkCount: 0 + lineCount: 1 + pageCount: 1 + materialCount: 1 + m_havePropertiesChanged: 0 + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_spriteAnimator: {fileID: 0} + m_isInputParsingRequired: 0 + m_inputSource: 0 + m_hasFontAssetChanged: 0 + m_subTextObjects: + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &1722986561 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1722986558} + m_CullTransparentMesh: 0 --- !u!1 &1724986182 GameObject: m_ObjectHideFlags: 0 @@ -14194,6 +14479,7 @@ MonoBehaviour: minDrop: 1 itemDrop: 5 WinUI: {fileID: 1264435080} + LooseUI: {fileID: 1470635746} --- !u!1 &1774186325 stripped GameObject: m_CorrespondingSourceObject: {fileID: 1472403156812664, guid: 89e9215b05511f648b3306ce05aae35f, @@ -14439,12 +14725,22 @@ Prefab: - target: {fileID: 114405877542956250, guid: 89e9215b05511f648b3306ce05aae35f, type: 2} propertyPath: m_havePropertiesChanged - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 114405877542956250, guid: 89e9215b05511f648b3306ce05aae35f, type: 2} propertyPath: m_isInputParsingRequired - value: 1 + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 114335858491737490, guid: 89e9215b05511f648b3306ce05aae35f, + type: 2} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 114405877542956250, guid: 89e9215b05511f648b3306ce05aae35f, + type: 2} + propertyPath: m_Enabled + value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 89e9215b05511f648b3306ce05aae35f, type: 2} @@ -14460,6 +14756,162 @@ MonoBehaviour: type: 2} m_PrefabInternal: {fileID: 1832592737} m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} +--- !u!1 &1862955496 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1862955497} + - component: {fileID: 1862955499} + - component: {fileID: 1862955498} + m_Layer: 5 + m_Name: Restart + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1862955497 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1862955496} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1470635747} + 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: -2.2955215, y: -105.80001} + m_SizeDelta: {x: 431, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1862955498 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1862955496} + 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_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_text: Press R to restart + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: ec3cd6eedf31b8240acafae391fca301, type: 2} + m_sharedMaterial: {fileID: 21461864525935096, guid: ec3cd6eedf31b8240acafae391fca301, + 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_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_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_outlineColor: + serializedVersion: 2 + rgba: 4278190080 + m_fontSize: 36 + m_fontSizeBase: 36 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_textAlignment: 258 + m_isAlignmentEnumConverted: 1 + 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_firstOverflowCharacterIndex: -1 + m_linkedTextComponent: {fileID: 0} + m_isLinkedTextComponent: 0 + m_isTextTruncated: 0 + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_ignoreRectMaskCulling: 0 + m_ignoreCulling: 1 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_firstVisibleCharacter: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: -0.45846644, w: 0} + m_textInfo: + textComponent: {fileID: 1862955498} + characterCount: 18 + spriteCount: 0 + spaceCount: 3 + wordCount: 4 + linkCount: 0 + lineCount: 1 + pageCount: 1 + materialCount: 1 + m_havePropertiesChanged: 0 + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_spriteAnimator: {fileID: 0} + m_isInputParsingRequired: 0 + m_inputSource: 0 + m_hasFontAssetChanged: 0 + m_subTextObjects: + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &1862955499 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1862955496} + m_CullTransparentMesh: 0 --- !u!1 &1946267752 stripped GameObject: m_CorrespondingSourceObject: {fileID: 1472403156812664, guid: 89e9215b05511f648b3306ce05aae35f, @@ -14906,6 +15358,7 @@ RectTransform: - {fileID: 1169353275} - {fileID: 972967527} - {fileID: 1264435081} + - {fileID: 1470635747} m_Father: {fileID: 0} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Assets/Script/InventoryManager.cs b/Assets/Script/InventoryManager.cs index ff40253..aa3b66e 100644 --- a/Assets/Script/InventoryManager.cs +++ b/Assets/Script/InventoryManager.cs @@ -48,7 +48,7 @@ public class InventoryManager : MonoBehaviour items[draggedPosition].count -= 1; slots[draggedPosition].transform.GetChild(1).position = defaultPos; TextMeshProUGUI CompteurItem = slots[draggedPosition].GetComponentInChildren(); - CompteurItem.text = items[draggedPosition].count.ToString().Length < 10 ? "0" + items[draggedPosition].count.ToString() : items[draggedPosition].count.ToString(); + CompteurItem.text = items[draggedPosition].count.ToString().Length < 10 ? ("0" + items[draggedPosition].count.ToString()) : items[draggedPosition].count.ToString(); if (items[draggedPosition].count < 1) { slots[draggedPosition].transform.GetChild(1).GetComponent().sprite = items[draggedPosition].iconGris; @@ -89,7 +89,7 @@ public class InventoryManager : MonoBehaviour private bool CanPlantAt(int index, TreeItem item) { - if (index != -1 && (plots[index].treePlaced == TreeType.Nothing/* || (plots[index].treePlaced & item.canOverrideTree) != 0*/) && (plots[index].type & item.canBePlacedOn) != 0) + if (index != -1 && plots[index].treePlaced == TreeType.Nothing && (plots[index].type & item.canBePlacedOn) != 0) { return true; } @@ -314,6 +314,10 @@ public class InventoryManager : MonoBehaviour { GetComponent().HasWon(); } + else if (UserHasLoose()) + { + GetComponent().LooseUI.SetActive(true); + } } private bool UserHasWon() @@ -329,6 +333,19 @@ public class InventoryManager : MonoBehaviour return true; } + private bool UserHasLoose() + { + int freePlots = 0; + foreach (Plot plot in plots) + if (plot.treePlaced == TreeType.Nothing) + freePlots++; + + if (freePlots == 0) + return true; + else + return false; + } + public void ClearBoard() { for (int i = 0; i < 25; i++) @@ -354,7 +371,7 @@ public class InventoryManager : MonoBehaviour { for (int i = 0; i < slots.Length; i++) { - slots[i].GetComponentInChildren().text = items[i].count.ToString().Length < 10 ? "0" + items[i].count.ToString(): items[i].count.ToString(); + slots[i].GetComponentInChildren().text = items[i].count.ToString().Length < 10 ? ("0" + items[i].count.ToString()) : items[i].count.ToString(); if(items[i].count == 0) slots[i].transform.GetChild(1).GetComponent().sprite = items[i].iconGris; else diff --git a/Assets/Script/Mission.cs b/Assets/Script/Mission.cs index b009322..172575d 100644 --- a/Assets/Script/Mission.cs +++ b/Assets/Script/Mission.cs @@ -10,6 +10,7 @@ public class Mission : MonoBehaviour { public int itemDrop; public Dictionary Objectifs = new Dictionary(); public GameObject WinUI; + public GameObject LooseUI; private void Start() { items = GetComponent().items; @@ -31,6 +32,7 @@ public class Mission : MonoBehaviour { public void GenerateMission() { + Objectifs = new Dictionary(); for (int i = 0; i < difficulte; i++) { AddTree();