diff --git a/.gitignore b/.gitignore index abd16d328..30bea76fb 100644 --- a/.gitignore +++ b/.gitignore @@ -80,4 +80,6 @@ crashlytics-build.properties **/.DS_Store **/._.DS_Store -.env \ No newline at end of file +.env + +mono_crash.* \ No newline at end of file diff --git a/Assets/Shared/Scripts/UI/UnlockedSkinScreen.cs b/Assets/Shared/Scripts/UI/UnlockedSkinScreen.cs index 4cd280532..0b563d450 100644 --- a/Assets/Shared/Scripts/UI/UnlockedSkinScreen.cs +++ b/Assets/Shared/Scripts/UI/UnlockedSkinScreen.cs @@ -45,7 +45,7 @@ public CraftSkinState? CraftState get => m_CraftState; set { - m_CraftState = value; + CraftState = value; switch (m_CraftState) { case CraftSkinState.Crafting: @@ -113,12 +113,12 @@ public async void OnEnable() private async void Craft() { - m_CraftState = CraftSkinState.Crafting; + CraftState = CraftSkinState.Crafting; // Burn tokens and mint a new skin i.e. crafting a skin await Task.Delay(TimeSpan.FromSeconds(5)); - m_CraftState = CraftSkinState.Crafted; + CraftState = CraftSkinState.Crafted; // If successfully crafted skin and this screen is visible, go to collect skin screen // otherwise it will be picked in the OnEnable function above when this screen reappears @@ -131,7 +131,7 @@ private async void Craft() private void CollectSkin() { m_CollectSkinEvent.Raise(); - m_CraftState = null; + CraftState = null; } private void OnCraftButtonClicked() diff --git a/ProjectSettings/PackageManagerSettings.asset b/ProjectSettings/PackageManagerSettings.asset index 384f72cc6..d1579e102 100644 --- a/ProjectSettings/PackageManagerSettings.asset +++ b/ProjectSettings/PackageManagerSettings.asset @@ -32,5 +32,5 @@ MonoBehaviour: m_Modified: 0 m_ErrorMessage: m_UserModificationsInstanceId: -828 - m_OriginalInstanceId: -830 + m_OriginalInstanceId: -832 m_LoadAssets: 0 diff --git a/mint-backend/.gitignore b/mint-backend/.gitignore index 30bc16279..f33b660bb 100644 --- a/mint-backend/.gitignore +++ b/mint-backend/.gitignore @@ -1 +1,3 @@ -/node_modules \ No newline at end of file +/node_modules +/dist +/.parcel-cache \ No newline at end of file