diff --git a/Assets/Prefabs/Shop.prefab b/Assets/Prefabs/Shop.prefab
index ce2036dc0015830dded6fa7ffe192b9c6f6162e1..6f162e935db47529af9b1ea48e9ec3d89411e0f1 100644
--- a/Assets/Prefabs/Shop.prefab
+++ b/Assets/Prefabs/Shop.prefab
@@ -522,21 +522,21 @@ AudioSource:
m_GameObject: {fileID: 4160127699956994035}
m_Enabled: 1
serializedVersion: 4
- OutputAudioMixerGroup: {fileID: 24300001, guid: 5b84db49d40ea449aa4f3e3bd229ab5b, type: 2}
+ OutputAudioMixerGroup: {fileID: 24300001, guid: 8434b04884c414ac6b468e10945685e6, type: 2}
m_audioClip: {fileID: 8300000, guid: 05cb51766bd043044951dfdece839bc6, type: 3}
m_PlayOnAwake: 1
- m_Volume: 1
+ m_Volume: 0.602
m_Pitch: 1
- Loop: 1
+ Loop: 0
Mute: 0
Spatialize: 0
SpatializePostEffects: 0
Priority: 128
DopplerLevel: 1
MinDistance: 1
- MaxDistance: 500
+ MaxDistance: 20
Pan2D: 0
- rolloffMode: 1
+ rolloffMode: 0
BypassEffects: 0
BypassListenerEffects: 0
BypassReverbZones: 0
@@ -748,6 +748,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
ShopModel: {fileID: 4160127699956994035}
+ ShopSpawner: {fileID: 7137542289196247827}
--- !u!1 &8836449725484051236
GameObject:
m_ObjectHideFlags: 0
diff --git a/Assets/Scenes/GameOver.unity b/Assets/Scenes/GameOver.unity
index f8b1056f16eb04c9d0c48566e2789023e266a800..9e226297fd9d8d6d8ee780769fe084dce4e18966 100644
--- a/Assets/Scenes/GameOver.unity
+++ b/Assets/Scenes/GameOver.unity
@@ -123,6 +123,140 @@ NavMeshSettings:
debug:
m_Flags: 0
m_NavMeshData: {fileID: 0}
+--- !u!1 &76293339
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 76293344}
+ - component: {fileID: 76293343}
+ - component: {fileID: 76293342}
+ - component: {fileID: 76293341}
+ m_Layer: 5
+ m_Name: Try Again
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!114 &76293341
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 76293339}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Navigation:
+ m_Mode: 3
+ m_WrapAround: 0
+ m_SelectOnUp: {fileID: 0}
+ m_SelectOnDown: {fileID: 0}
+ m_SelectOnLeft: {fileID: 0}
+ m_SelectOnRight: {fileID: 0}
+ m_Transition: 1
+ m_Colors:
+ m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+ m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+ m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+ m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+ m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+ m_ColorMultiplier: 1
+ m_FadeDuration: 0.1
+ m_SpriteState:
+ m_HighlightedSprite: {fileID: 0}
+ m_PressedSprite: {fileID: 0}
+ m_SelectedSprite: {fileID: 0}
+ m_DisabledSprite: {fileID: 0}
+ m_AnimationTriggers:
+ m_NormalTrigger: Normal
+ m_HighlightedTrigger: Highlighted
+ m_PressedTrigger: Pressed
+ m_SelectedTrigger: Selected
+ m_DisabledTrigger: Disabled
+ m_Interactable: 1
+ m_TargetGraphic: {fileID: 76293342}
+ m_OnClick:
+ m_PersistentCalls:
+ m_Calls:
+ - m_Target: {fileID: 764329883}
+ m_TargetAssemblyTypeName: RetryGameManager, Assembly-CSharp
+ m_MethodName: RetryToLevel1
+ m_Mode: 1
+ m_Arguments:
+ m_ObjectArgument: {fileID: 0}
+ m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+ m_IntArgument: 0
+ m_FloatArgument: 0
+ m_StringArgument:
+ m_BoolArgument: 0
+ m_CallState: 2
+--- !u!114 &76293342
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 76293339}
+ 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: 10905, 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 &76293343
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 76293339}
+ m_CullTransparentMesh: 1
+--- !u!224 &76293344
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 76293339}
+ 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: 572848216}
+ m_Father: {fileID: 764329879}
+ m_RootOrder: 1
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0.5, y: 0}
+ m_AnchorMax: {x: 0.5, y: 0}
+ m_AnchoredPosition: {x: -153.84026, y: 63.1}
+ m_SizeDelta: {x: 307.6805, y: 78.5758}
+ m_Pivot: {x: 0, y: 0}
--- !u!1 &140295793
GameObject:
m_ObjectHideFlags: 0
@@ -425,6 +559,141 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 498582930}
m_CullTransparentMesh: 1
+--- !u!1 &572848215
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 572848216}
+ - component: {fileID: 572848218}
+ - component: {fileID: 572848217}
+ m_Layer: 5
+ m_Name: Text (TMP)
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &572848216
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 572848215}
+ 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: 76293344}
+ 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 &572848217
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 572848215}
+ 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: Try Again
+ m_isRightToLeft: 0
+ m_fontAsset: {fileID: 11400000, guid: 125cb55b44b24c4393181402bc6200e6, type: 2}
+ m_sharedMaterial: {fileID: 2100000, guid: 125cb55b44b24c4393181402bc6200e6, type: 2}
+ m_fontSharedMaterials: []
+ m_fontMaterial: {fileID: 0}
+ m_fontMaterials: []
+ m_fontColor32:
+ serializedVersion: 2
+ rgba: 4281479730
+ m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, 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: 24
+ m_fontSizeBase: 24
+ m_fontWeight: 400
+ m_enableAutoSizing: 0
+ m_fontSizeMin: 18
+ m_fontSizeMax: 72
+ m_fontStyle: 0
+ m_HorizontalAlignment: 2
+ m_VerticalAlignment: 512
+ m_textAlignment: 65535
+ m_characterSpacing: 0
+ m_wordSpacing: 0
+ m_lineSpacing: 0
+ m_lineSpacingMax: 0
+ m_paragraphSpacing: 0
+ m_charWidthMaxAdj: 0
+ m_enableWordWrapping: 1
+ m_wordWrappingRatios: 0.4
+ m_overflowMode: 0
+ m_linkedTextComponent: {fileID: 0}
+ parentLinkedComponent: {fileID: 0}
+ m_enableKerning: 1
+ m_enableExtraPadding: 0
+ checkPaddingRequired: 0
+ m_isRichText: 1
+ m_parseCtrlCharacters: 1
+ m_isOrthographic: 1
+ m_isCullingEnabled: 0
+ m_horizontalMapping: 0
+ m_verticalMapping: 0
+ m_uvLineOffset: 0
+ m_geometrySortingOrder: 0
+ m_IsTextObjectScaleStatic: 0
+ m_VertexBufferAutoSizeReduction: 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 &572848218
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 572848215}
+ m_CullTransparentMesh: 1
--- !u!1 &764329878
GameObject:
m_ObjectHideFlags: 0
@@ -437,6 +706,7 @@ GameObject:
- component: {fileID: 764329882}
- component: {fileID: 764329881}
- component: {fileID: 764329880}
+ - component: {fileID: 764329883}
m_Layer: 5
m_Name: CutsceneCanvas
m_TagString: Untagged
@@ -457,6 +727,7 @@ RectTransform:
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 498582931}
+ - {fileID: 76293344}
m_Father: {fileID: 0}
m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -526,6 +797,18 @@ Canvas:
m_SortingLayerID: 0
m_SortingOrder: 0
m_TargetDisplay: 0
+--- !u!114 &764329883
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 764329878}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 03ff3b175c111a047bec4c5d8be52167, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
--- !u!1 &776088646
GameObject:
m_ObjectHideFlags: 0
@@ -970,11 +1253,18 @@ PlayableDirector:
value: {fileID: 212700394}
- key: {fileID: 6385088734934427215, guid: 8118d7d2360018840bd5a58cb7f8b721, type: 2}
value: {fileID: 0}
+ - key: {fileID: 5334973313309480880, guid: 8118d7d2360018840bd5a58cb7f8b721, type: 2}
+ value: {fileID: 76293339}
+ - key: {fileID: 3105804146456125153, guid: 8118d7d2360018840bd5a58cb7f8b721, type: 2}
+ value: {fileID: 76293339}
m_ExposedReferences:
m_References:
- dd9cea05000d0ed4ba98174621c5a233: {fileID: 140295793}
- e4288266b3aa14f4fa534ab97807a1aa: {fileID: 1082960936}
- 71abf996a020b3e4ba2261449440c6de: {fileID: 366938223}
+ - c6b3aac9e1c4d7e4aa8f8a73e9dd140c: {fileID: 76293339}
+ - e7fc0c23e029c09499bd955b51d06b8f: {fileID: 76293339}
+ - 84e06458a84e21845a2992ab99543151: {fileID: 76293339}
--- !u!4 &1285426476
Transform:
m_ObjectHideFlags: 0
diff --git a/Assets/Scenes/Level_01.unity b/Assets/Scenes/Level_01.unity
index c6f82ad10bee7fada0a9984bcfa183496cf7b608..629956b026e1f7b91011e452c0e9e1761bd63d5c 100644
--- a/Assets/Scenes/Level_01.unity
+++ b/Assets/Scenes/Level_01.unity
@@ -48901,6 +48901,107 @@ MeshFilter:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2087062120}
m_Mesh: {fileID: 2534964839176971238, guid: f93eab62ea9bae546a47034341e32324, type: 3}
+--- !u!1 &2089575848 stripped
+GameObject:
+ m_CorrespondingSourceObject: {fileID: 4160127699956994035, guid: 9f4287f0448cadc4884d8659dd50dcfb, type: 3}
+ m_PrefabInstance: {fileID: 5827184748629873689}
+ m_PrefabAsset: {fileID: 0}
+--- !u!82 &2089575855
+AudioSource:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2089575848}
+ m_Enabled: 1
+ serializedVersion: 4
+ OutputAudioMixerGroup: {fileID: 0}
+ m_audioClip: {fileID: 0}
+ m_PlayOnAwake: 1
+ m_Volume: 1
+ m_Pitch: 1
+ Loop: 0
+ Mute: 0
+ Spatialize: 0
+ SpatializePostEffects: 0
+ Priority: 128
+ DopplerLevel: 1
+ MinDistance: 1
+ MaxDistance: 12
+ Pan2D: 0
+ rolloffMode: 0
+ BypassEffects: 0
+ BypassListenerEffects: 0
+ BypassReverbZones: 0
+ rolloffCustomCurve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 1
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 0
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 1
+ value: 0
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 0
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ panLevelCustomCurve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 0
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 0
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ spreadCustomCurve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 0
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 0
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ reverbZoneMixCustomCurve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 1
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 0
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
--- !u!1001 &2090455100
PrefabInstance:
m_ObjectHideFlags: 0
diff --git a/Assets/Scripts/Managers/RetryGameManager.cs b/Assets/Scripts/Managers/RetryGameManager.cs
new file mode 100644
index 0000000000000000000000000000000000000000..7cf536dc619def87953d115940227665a58e5cc4
--- /dev/null
+++ b/Assets/Scripts/Managers/RetryGameManager.cs
@@ -0,0 +1,18 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.SceneManagement;
+
+public class RetryGameManager : MonoBehaviour
+{
+ void Start()
+ {
+ Debug.Log("Started Retry Manager");
+ }
+ // Start is called before the first frame update
+ void RetryToLevel1()
+ {
+ Debug.Log("Try Again Clicked");
+ SceneManager.LoadScene("Level_01");
+ }
+}
\ No newline at end of file
diff --git a/Assets/Scripts/Managers/RetryGameManager.cs.meta b/Assets/Scripts/Managers/RetryGameManager.cs.meta
new file mode 100644
index 0000000000000000000000000000000000000000..1e110c8174cce5d07c03068cbc68d72748c187e4
--- /dev/null
+++ b/Assets/Scripts/Managers/RetryGameManager.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 03ff3b175c111a047bec4c5d8be52167
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Scripts/Save/SaveMenuController.cs b/Assets/Scripts/Save/SaveMenuController.cs
index beac37f499ad0b5c59adec5bf31b5c2710170de8..cfa0cd6735d06155d720fa11e8aad2474b89ca10 100644
--- a/Assets/Scripts/Save/SaveMenuController.cs
+++ b/Assets/Scripts/Save/SaveMenuController.cs
@@ -55,6 +55,7 @@ public class SaveMenuController : MonoBehaviour
tempTitle = getSlotTitle(slot);
tempSlot = slot;
slot[0].focusable = true;
+ slot[0].Focus();
}
private void PromptConfirmation(BlurEvent evt, VisualElement slot)
diff --git a/Assets/Scripts/Save/TabbedMenu.uxml b/Assets/Scripts/Save/TabbedMenu.uxml
index 823b5b3e52d7d483d22197ce8077acc8f97181ec..73f14f1e7a232c12a7a5d3965e2947bd0e48955e 100644
--- a/Assets/Scripts/Save/TabbedMenu.uxml
+++ b/Assets/Scripts/Save/TabbedMenu.uxml
@@ -14,13 +14,13 @@
<ui:TextField picking-mode="Ignore" text="Save Slot 2" name="slotTitle" is-delayed="false" max-length="15" focusable="true" class="slotTitle slotTitleInput TextField" style="width: 100%;" />
<ui:Label display-tooltip-when-elided="true" name="slotDate" enable-rich-text="false" class="slot-date" />
<ui:Label display-tooltip-when-elided="true" name="finishedQuest" enable-rich-text="false" class="finished-quest" />
- <ui:Label text="1" display-tooltip-when-elided="true" name="slotNumber" style="display: none; visibility: visible;" />
+ <ui:Label text="2" display-tooltip-when-elided="true" name="slotNumber" style="display: none; visibility: visible;" />
</ui:VisualElement>
<ui:VisualElement name="card" class="card" style="padding-left: 5px; padding-right: 5px; padding-top: 5px; padding-bottom: 5px; color: rgb(255, 18, 18); transition-property: scale; transition-timing-function: linear; transition-duration: 0.1s; justify-content: space-around; align-items: center; margin-left: 0; margin-right: 0; margin-top: 0; margin-bottom: 0; border-top-left-radius: 20px; border-bottom-left-radius: 20px; border-top-right-radius: 20px; border-bottom-right-radius: 20px;">
<ui:TextField picking-mode="Ignore" text="Save Slot 3" name="slotTitle" is-delayed="false" max-length="15" focusable="true" class="slotTitle slotTitleInput TextField" style="width: 100%;" />
<ui:Label display-tooltip-when-elided="true" name="slotDate" enable-rich-text="false" class="slot-date" />
<ui:Label display-tooltip-when-elided="true" name="finishedQuest" enable-rich-text="false" class="finished-quest" />
- <ui:Label text="1" display-tooltip-when-elided="true" name="slotNumber" style="display: none; visibility: visible;" />
+ <ui:Label text="3" display-tooltip-when-elided="true" name="slotNumber" style="display: none; visibility: visible;" />
</ui:VisualElement>
</ui:VisualElement>
<ui:VisualElement name="PromptConfirmation" focusable="false" style="display: none; position: absolute; width: 100%; height: 100%; opacity: 0.71; background-image: url('project://database/Assets/Textures/_opacity.jpg?fileID=2800000&guid=44884c03736864560a55f7f08709bd01&type=3#_opacity'); -unity-background-image-tint-color: rgb(0, 0, 0); justify-content: center; align-items: center;">
diff --git a/Assets/Scripts/Shop/ShopSpawn.cs b/Assets/Scripts/Shop/ShopSpawn.cs
index be33b6dd595d1fc69389ae66371a40660536dc44..b065317755def4aedacd0417fc2c5cf40a4f237f 100644
--- a/Assets/Scripts/Shop/ShopSpawn.cs
+++ b/Assets/Scripts/Shop/ShopSpawn.cs
@@ -8,10 +8,11 @@ public class ShopSpawn : MonoBehaviour
private float shopSpawnTime;
private bool isShown = false;
public GameObject ShopModel;
+ public GameObject ShopSpawner;
// Start is called before the first frame update
void Start()
{
- shopSpawnTime = Random.Range(15,25);
+ shopSpawnTime = Random.Range(30,40);
}
// Update is called once per frame
@@ -22,7 +23,7 @@ public class ShopSpawn : MonoBehaviour
{
isShown = true;
ShopModel.SetActive(true);
- Destroy(this);
+ Destroy(ShopSpawner);
}
}
}
diff --git a/Assets/Timeline/GameOver.playable b/Assets/Timeline/GameOver.playable
index 67e84a8b1001981eaecf63fa8391495ce60a66db..18cd99e5b77ff395d46cb4648baad51ea9c5c787 100644
--- a/Assets/Timeline/GameOver.playable
+++ b/Assets/Timeline/GameOver.playable
@@ -40,7 +40,7 @@ MonoBehaviour:
m_bufferingTime: 0.1
m_ClipProperties:
volume: 0.112
---- !u!114 &-5629423741901131117
+--- !u!114 &-4606953914403256468
MonoBehaviour:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
@@ -53,11 +53,11 @@ MonoBehaviour:
m_Name: ControlPlayableAsset
m_EditorClassIdentifier:
sourceGameObject:
- exposedName: dd9cea05000d0ed4ba98174621c5a233
+ exposedName: ede7574d65c549a4ba169360647ebd62
defaultValue: {fileID: 0}
prefabGameObject: {fileID: 0}
updateParticle: 1
- particleRandomSeed: 6428
+ particleRandomSeed: 841
updateDirector: 1
updateITimeControl: 1
searchHierarchy: 0
@@ -431,7 +431,7 @@ MonoBehaviour:
m_Start: 3.6333333333333333
m_ClipIn: 0
m_Asset: {fileID: -6990790481619438696}
- m_Duration: 5
+ m_Duration: 3.4499999999999997
m_TimeScale: 1
m_ParentTrack: {fileID: 7517559949988463186}
m_EaseInDuration: 0
@@ -497,10 +497,10 @@ MonoBehaviour:
m_PreExtrapolationTime: 0
m_DisplayName: Makam
- m_Version: 1
- m_Start: 8.633333333333333
+ m_Start: 7.083333333333333
m_ClipIn: 0
- m_Asset: {fileID: -5629423741901131117}
- m_Duration: 1.8499999999999996
+ m_Asset: {fileID: -4606953914403256468}
+ m_Duration: 5
m_TimeScale: 1
m_ParentTrack: {fileID: 7517559949988463186}
m_EaseInDuration: 0
diff --git a/Assets/customsave.cssav b/Assets/customsave.cssav
index 22b95d434d83fc3de420fe1f4e3dfebe0fcf3f30..987fa24e8fe2944b0419fcb961c8fc73b886457c 100644
Binary files a/Assets/customsave.cssav and b/Assets/customsave.cssav differ