Skip to content

Commit

Permalink
Changes made as part of "Supplement and complement crash reports with…
Browse files Browse the repository at this point in the history
… custom keys, logs and custom errors"
  • Loading branch information
joefspiro committed Feb 21, 2023
1 parent 545e03e commit 212463c
Show file tree
Hide file tree
Showing 4 changed files with 106 additions and 52 deletions.
26 changes: 1 addition & 25 deletions Assets/Hamster/Prefabs/Menus/DebugMenu.prefab
Expand Up @@ -29,7 +29,6 @@ RectTransform:
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 11.575897}
m_LocalScale: {x: 0.02, y: 0.02, z: 0.02}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 224647990851437630}
m_Father: {fileID: 0}
Expand Down Expand Up @@ -83,7 +82,7 @@ MonoBehaviour:
m_FallbackScreenDPI: 96
m_DefaultSpriteDPI: 96
m_DynamicPixelsPerUnit: 2
m_PresetInfoIsWorld: 0
m_PresetInfoIsWorld: 1
--- !u!114 &3823003004682667166
MonoBehaviour:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -134,7 +133,6 @@ RectTransform:
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: 224317168898000186}
m_RootOrder: 0
Expand Down Expand Up @@ -214,7 +212,6 @@ RectTransform:
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: 224258547558102142}
- {fileID: 224317168898000186}
Expand Down Expand Up @@ -300,7 +297,6 @@ RectTransform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: -20}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 224647990851437630}
m_RootOrder: 0
Expand Down Expand Up @@ -381,7 +377,6 @@ RectTransform:
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: -19.99998}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 224640650075360786}
m_Father: {fileID: 224647990851437630}
Expand Down Expand Up @@ -473,7 +468,6 @@ RectTransform:
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: 7064658406785790662}
m_RootOrder: 0
Expand Down Expand Up @@ -554,7 +548,6 @@ RectTransform:
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: -19.99998}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 4109250507045347376}
m_Father: {fileID: 224647990851437630}
Expand Down Expand Up @@ -647,7 +640,6 @@ RectTransform:
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: -0.19999981}
m_LocalScale: {x: 0.02, y: 0.02, z: 0.02}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 6309219395377107617}
m_Father: {fileID: 768178967663672101}
Expand Down Expand Up @@ -740,7 +732,6 @@ RectTransform:
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: -19.99998}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 8918396775147988388}
m_Father: {fileID: 224647990851437630}
Expand Down Expand Up @@ -830,7 +821,6 @@ Transform:
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: -10}
m_LocalScale: {x: 50, y: 50, z: 50}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 4938586899008836194}
- {fileID: 1678484980996986306}
Expand Down Expand Up @@ -865,7 +855,6 @@ RectTransform:
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: 3542865490116833156}
m_RootOrder: 0
Expand Down Expand Up @@ -945,7 +934,6 @@ RectTransform:
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: 4938586899008836194}
m_RootOrder: 0
Expand Down Expand Up @@ -1028,7 +1016,6 @@ RectTransform:
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: -19.99998}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 3302991896177308354}
m_Father: {fileID: 224647990851437630}
Expand Down Expand Up @@ -1120,7 +1107,6 @@ RectTransform:
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: 1678484980996986306}
m_RootOrder: 0
Expand Down Expand Up @@ -1200,7 +1186,6 @@ RectTransform:
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: 8008595033866840674}
m_RootOrder: 0
Expand Down Expand Up @@ -1280,7 +1265,6 @@ RectTransform:
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: 1769018353878161575}
m_RootOrder: 0
Expand Down Expand Up @@ -1360,7 +1344,6 @@ RectTransform:
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: 2633762835440639359}
m_RootOrder: 0
Expand Down Expand Up @@ -1441,7 +1424,6 @@ RectTransform:
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: -0.19999981}
m_LocalScale: {x: 0.02, y: 0.02, z: 0.02}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 7649950905452481446}
m_Father: {fileID: 768178967663672101}
Expand Down Expand Up @@ -1533,7 +1515,6 @@ RectTransform:
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: 4514937704372255736}
m_RootOrder: 0
Expand Down Expand Up @@ -1614,7 +1595,6 @@ RectTransform:
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: -19.99998}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 7348477961437658639}
m_Father: {fileID: 224647990851437630}
Expand Down Expand Up @@ -1707,7 +1687,6 @@ RectTransform:
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: -19.99998}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 4211617212186313411}
m_Father: {fileID: 224647990851437630}
Expand Down Expand Up @@ -1800,7 +1779,6 @@ RectTransform:
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: -19.99998}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 2395772332585807687}
m_Father: {fileID: 224647990851437630}
Expand Down Expand Up @@ -1893,7 +1871,6 @@ RectTransform:
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: -19.99998}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 4478448215106773557}
m_Father: {fileID: 224647990851437630}
Expand Down Expand Up @@ -1985,7 +1962,6 @@ RectTransform:
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: 7649016178413963064}
m_RootOrder: 0
Expand Down
22 changes: 5 additions & 17 deletions Assets/Hamster/Prefabs/Menus/MainMenu.prefab
Expand Up @@ -28,7 +28,6 @@ RectTransform:
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: 224921695750590384}
m_RootOrder: 0
Expand Down Expand Up @@ -110,7 +109,6 @@ RectTransform:
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: 224884339265297600}
m_RootOrder: 0
Expand Down Expand Up @@ -191,7 +189,6 @@ RectTransform:
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: -20}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 224480594825076448}
m_Father: {fileID: 224703550482448650}
Expand Down Expand Up @@ -284,7 +281,6 @@ RectTransform:
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: -19.99998}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 224088100203456210}
m_Father: {fileID: 224703550482448650}
Expand Down Expand Up @@ -377,7 +373,6 @@ RectTransform:
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: -19.99998}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 224071729476491318}
m_Father: {fileID: 224703550482448650}
Expand Down Expand Up @@ -470,7 +465,6 @@ RectTransform:
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: 224564986093952686}
- {fileID: 224884339265297600}
Expand Down Expand Up @@ -577,7 +571,6 @@ RectTransform:
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: -19.99998}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 224431914256755566}
m_RootOrder: 1
Expand Down Expand Up @@ -658,7 +651,6 @@ RectTransform:
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 10}
m_LocalScale: {x: 0.02, y: 0.02, z: 0.02}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 224703550482448650}
- {fileID: 224764318859703644}
Expand Down Expand Up @@ -713,7 +705,7 @@ MonoBehaviour:
m_FallbackScreenDPI: 96
m_DefaultSpriteDPI: 96
m_DynamicPixelsPerUnit: 2
m_PresetInfoIsWorld: 0
m_PresetInfoIsWorld: 1
--- !u!114 &114284253540390844
MonoBehaviour:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -761,7 +753,6 @@ RectTransform:
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: 224247601441905012}
m_RootOrder: 0
Expand Down Expand Up @@ -841,7 +832,6 @@ RectTransform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: -20}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 224703550482448650}
m_RootOrder: 0
Expand Down Expand Up @@ -921,7 +911,6 @@ RectTransform:
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: 77608933434497189}
m_RootOrder: 0
Expand Down Expand Up @@ -991,7 +980,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!224 &77608933434497189
RectTransform:
m_ObjectHideFlags: 0
Expand All @@ -1002,15 +991,14 @@ RectTransform:
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: -19.99998}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 1992729626421901825}
m_Father: {fileID: 224703550482448650}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 250, y: -173.5}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 160, y: 25}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6013548410687448273
Expand Down
20 changes: 18 additions & 2 deletions Assets/Hamster/Scripts/MainGame.cs
Expand Up @@ -17,6 +17,7 @@
using System.Collections;
using System.Collections.Generic;
using System.Threading.Tasks;
using Firebase.Extensions;

namespace Hamster
{
Expand Down Expand Up @@ -76,7 +77,7 @@ public class MainGame : MonoBehaviour {
void Start()
{
Screen.SetResolution(Screen.width / 2, Screen.height / 2, true);
InitializeCommonDataAndStartGame();
InitializeFirebaseAndStartGame();
}

void Update() {
Expand Down Expand Up @@ -165,10 +166,25 @@ void InitializeCommonDataAndStartGame()
stateManager.PushState(new States.MainMenu());
}

public Firebase.FirebaseApp app = null;

// Begins the firebase initialization process and afterwards, opens the main menu.
private void InitializeFirebaseAndStartGame()
{
throw new System.NotImplementedException();
Firebase.FirebaseApp.CheckAndFixDependenciesAsync().ContinueWithOnMainThread(
previousTask =>
{
var dependencyStatus = previousTask.Result;
if (dependencyStatus == Firebase.DependencyStatus.Available) {
// Create and hold a reference to your FirebaseApp,
app = Firebase.FirebaseApp.DefaultInstance;
InitializeCommonDataAndStartGame();
} else {
UnityEngine.Debug.LogError(
$"Could not resolve all Firebase dependencies: {dependencyStatus}\n" +
"Firebase Unity SDK is not safe to use here");
}
});
}

// Sets Remote Config default values and fetchs new ones
Expand Down

0 comments on commit 212463c

Please sign in to comment.