Skip to content

Commit 212463c

Browse files
joefspirojoefspiro
committed
Changes made as part of "Supplement and complement crash reports with custom keys, logs and custom errors"
1 parent 545e03e commit 212463c

File tree

4 files changed

+106
-52
lines changed

4 files changed

+106
-52
lines changed

‎Assets/Hamster/Prefabs/Menus/DebugMenu.prefab

Lines changed: 1 addition & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ RectTransform:
2929
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
3030
m_LocalPosition: {x: 0, y: 0, z: 11.575897}
3131
m_LocalScale: {x: 0.02, y: 0.02, z: 0.02}
32-
m_ConstrainProportionsScale: 0
3332
m_Children:
3433
- {fileID: 224647990851437630}
3534
m_Father: {fileID: 0}
@@ -83,7 +82,7 @@ MonoBehaviour:
8382
m_FallbackScreenDPI: 96
8483
m_DefaultSpriteDPI: 96
8584
m_DynamicPixelsPerUnit: 2
86-
m_PresetInfoIsWorld: 0
85+
m_PresetInfoIsWorld: 1
8786
--- !u!114 &3823003004682667166
8887
MonoBehaviour:
8988
m_ObjectHideFlags: 0
@@ -134,7 +133,6 @@ RectTransform:
134133
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
135134
m_LocalPosition: {x: 0, y: 0, z: 0}
136135
m_LocalScale: {x: 1, y: 1, z: 1}
137-
m_ConstrainProportionsScale: 0
138136
m_Children: []
139137
m_Father: {fileID: 224317168898000186}
140138
m_RootOrder: 0
@@ -214,7 +212,6 @@ RectTransform:
214212
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
215213
m_LocalPosition: {x: 0, y: 0, z: 0}
216214
m_LocalScale: {x: 1, y: 1, z: 1}
217-
m_ConstrainProportionsScale: 0
218215
m_Children:
219216
- {fileID: 224258547558102142}
220217
- {fileID: 224317168898000186}
@@ -300,7 +297,6 @@ RectTransform:
300297
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
301298
m_LocalPosition: {x: 0, y: 0, z: -20}
302299
m_LocalScale: {x: 1, y: 1, z: 1}
303-
m_ConstrainProportionsScale: 0
304300
m_Children: []
305301
m_Father: {fileID: 224647990851437630}
306302
m_RootOrder: 0
@@ -381,7 +377,6 @@ RectTransform:
381377
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
382378
m_LocalPosition: {x: 0, y: 0, z: -19.99998}
383379
m_LocalScale: {x: 1, y: 1, z: 1}
384-
m_ConstrainProportionsScale: 0
385380
m_Children:
386381
- {fileID: 224640650075360786}
387382
m_Father: {fileID: 224647990851437630}
@@ -473,7 +468,6 @@ RectTransform:
473468
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
474469
m_LocalPosition: {x: 0, y: 0, z: 0}
475470
m_LocalScale: {x: 1, y: 1, z: 1}
476-
m_ConstrainProportionsScale: 0
477471
m_Children: []
478472
m_Father: {fileID: 7064658406785790662}
479473
m_RootOrder: 0
@@ -554,7 +548,6 @@ RectTransform:
554548
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
555549
m_LocalPosition: {x: 0, y: 0, z: -19.99998}
556550
m_LocalScale: {x: 1, y: 1, z: 1}
557-
m_ConstrainProportionsScale: 0
558551
m_Children:
559552
- {fileID: 4109250507045347376}
560553
m_Father: {fileID: 224647990851437630}
@@ -647,7 +640,6 @@ RectTransform:
647640
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
648641
m_LocalPosition: {x: 0, y: 0, z: -0.19999981}
649642
m_LocalScale: {x: 0.02, y: 0.02, z: 0.02}
650-
m_ConstrainProportionsScale: 0
651643
m_Children:
652644
- {fileID: 6309219395377107617}
653645
m_Father: {fileID: 768178967663672101}
@@ -740,7 +732,6 @@ RectTransform:
740732
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
741733
m_LocalPosition: {x: 0, y: 0, z: -19.99998}
742734
m_LocalScale: {x: 1, y: 1, z: 1}
743-
m_ConstrainProportionsScale: 0
744735
m_Children:
745736
- {fileID: 8918396775147988388}
746737
m_Father: {fileID: 224647990851437630}
@@ -830,7 +821,6 @@ Transform:
830821
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
831822
m_LocalPosition: {x: 0, y: 0, z: -10}
832823
m_LocalScale: {x: 50, y: 50, z: 50}
833-
m_ConstrainProportionsScale: 0
834824
m_Children:
835825
- {fileID: 4938586899008836194}
836826
- {fileID: 1678484980996986306}
@@ -865,7 +855,6 @@ RectTransform:
865855
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
866856
m_LocalPosition: {x: 0, y: 0, z: 0}
867857
m_LocalScale: {x: 1, y: 1, z: 1}
868-
m_ConstrainProportionsScale: 0
869858
m_Children: []
870859
m_Father: {fileID: 3542865490116833156}
871860
m_RootOrder: 0
@@ -945,7 +934,6 @@ RectTransform:
945934
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
946935
m_LocalPosition: {x: 0, y: 0, z: 0}
947936
m_LocalScale: {x: 1, y: 1, z: 1}
948-
m_ConstrainProportionsScale: 0
949937
m_Children: []
950938
m_Father: {fileID: 4938586899008836194}
951939
m_RootOrder: 0
@@ -1028,7 +1016,6 @@ RectTransform:
10281016
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
10291017
m_LocalPosition: {x: 0, y: 0, z: -19.99998}
10301018
m_LocalScale: {x: 1, y: 1, z: 1}
1031-
m_ConstrainProportionsScale: 0
10321019
m_Children:
10331020
- {fileID: 3302991896177308354}
10341021
m_Father: {fileID: 224647990851437630}
@@ -1120,7 +1107,6 @@ RectTransform:
11201107
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
11211108
m_LocalPosition: {x: 0, y: 0, z: 0}
11221109
m_LocalScale: {x: 1, y: 1, z: 1}
1123-
m_ConstrainProportionsScale: 0
11241110
m_Children: []
11251111
m_Father: {fileID: 1678484980996986306}
11261112
m_RootOrder: 0
@@ -1200,7 +1186,6 @@ RectTransform:
12001186
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
12011187
m_LocalPosition: {x: 0, y: 0, z: 0}
12021188
m_LocalScale: {x: 1, y: 1, z: 1}
1203-
m_ConstrainProportionsScale: 0
12041189
m_Children: []
12051190
m_Father: {fileID: 8008595033866840674}
12061191
m_RootOrder: 0
@@ -1280,7 +1265,6 @@ RectTransform:
12801265
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
12811266
m_LocalPosition: {x: 0, y: 0, z: 0}
12821267
m_LocalScale: {x: 1, y: 1, z: 1}
1283-
m_ConstrainProportionsScale: 0
12841268
m_Children: []
12851269
m_Father: {fileID: 1769018353878161575}
12861270
m_RootOrder: 0
@@ -1360,7 +1344,6 @@ RectTransform:
13601344
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
13611345
m_LocalPosition: {x: 0, y: 0, z: 0}
13621346
m_LocalScale: {x: 1, y: 1, z: 1}
1363-
m_ConstrainProportionsScale: 0
13641347
m_Children: []
13651348
m_Father: {fileID: 2633762835440639359}
13661349
m_RootOrder: 0
@@ -1441,7 +1424,6 @@ RectTransform:
14411424
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
14421425
m_LocalPosition: {x: 0, y: 0, z: -0.19999981}
14431426
m_LocalScale: {x: 0.02, y: 0.02, z: 0.02}
1444-
m_ConstrainProportionsScale: 0
14451427
m_Children:
14461428
- {fileID: 7649950905452481446}
14471429
m_Father: {fileID: 768178967663672101}
@@ -1533,7 +1515,6 @@ RectTransform:
15331515
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
15341516
m_LocalPosition: {x: 0, y: 0, z: 0}
15351517
m_LocalScale: {x: 1, y: 1, z: 1}
1536-
m_ConstrainProportionsScale: 0
15371518
m_Children: []
15381519
m_Father: {fileID: 4514937704372255736}
15391520
m_RootOrder: 0
@@ -1614,7 +1595,6 @@ RectTransform:
16141595
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
16151596
m_LocalPosition: {x: 0, y: 0, z: -19.99998}
16161597
m_LocalScale: {x: 1, y: 1, z: 1}
1617-
m_ConstrainProportionsScale: 0
16181598
m_Children:
16191599
- {fileID: 7348477961437658639}
16201600
m_Father: {fileID: 224647990851437630}
@@ -1707,7 +1687,6 @@ RectTransform:
17071687
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
17081688
m_LocalPosition: {x: 0, y: 0, z: -19.99998}
17091689
m_LocalScale: {x: 1, y: 1, z: 1}
1710-
m_ConstrainProportionsScale: 0
17111690
m_Children:
17121691
- {fileID: 4211617212186313411}
17131692
m_Father: {fileID: 224647990851437630}
@@ -1800,7 +1779,6 @@ RectTransform:
18001779
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
18011780
m_LocalPosition: {x: 0, y: 0, z: -19.99998}
18021781
m_LocalScale: {x: 1, y: 1, z: 1}
1803-
m_ConstrainProportionsScale: 0
18041782
m_Children:
18051783
- {fileID: 2395772332585807687}
18061784
m_Father: {fileID: 224647990851437630}
@@ -1893,7 +1871,6 @@ RectTransform:
18931871
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
18941872
m_LocalPosition: {x: 0, y: 0, z: -19.99998}
18951873
m_LocalScale: {x: 1, y: 1, z: 1}
1896-
m_ConstrainProportionsScale: 0
18971874
m_Children:
18981875
- {fileID: 4478448215106773557}
18991876
m_Father: {fileID: 224647990851437630}
@@ -1985,7 +1962,6 @@ RectTransform:
19851962
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
19861963
m_LocalPosition: {x: 0, y: 0, z: 0}
19871964
m_LocalScale: {x: 1, y: 1, z: 1}
1988-
m_ConstrainProportionsScale: 0
19891965
m_Children: []
19901966
m_Father: {fileID: 7649016178413963064}
19911967
m_RootOrder: 0

‎Assets/Hamster/Prefabs/Menus/MainMenu.prefab

Lines changed: 5 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ RectTransform:
2828
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
2929
m_LocalPosition: {x: 0, y: 0, z: 0}
3030
m_LocalScale: {x: 1, y: 1, z: 1}
31-
m_ConstrainProportionsScale: 0
3231
m_Children: []
3332
m_Father: {fileID: 224921695750590384}
3433
m_RootOrder: 0
@@ -110,7 +109,6 @@ RectTransform:
110109
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
111110
m_LocalPosition: {x: 0, y: 0, z: 0}
112111
m_LocalScale: {x: 1, y: 1, z: 1}
113-
m_ConstrainProportionsScale: 0
114112
m_Children: []
115113
m_Father: {fileID: 224884339265297600}
116114
m_RootOrder: 0
@@ -191,7 +189,6 @@ RectTransform:
191189
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
192190
m_LocalPosition: {x: 0, y: 0, z: -20}
193191
m_LocalScale: {x: 1, y: 1, z: 1}
194-
m_ConstrainProportionsScale: 0
195192
m_Children:
196193
- {fileID: 224480594825076448}
197194
m_Father: {fileID: 224703550482448650}
@@ -284,7 +281,6 @@ RectTransform:
284281
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
285282
m_LocalPosition: {x: 0, y: 0, z: -19.99998}
286283
m_LocalScale: {x: 1, y: 1, z: 1}
287-
m_ConstrainProportionsScale: 0
288284
m_Children:
289285
- {fileID: 224088100203456210}
290286
m_Father: {fileID: 224703550482448650}
@@ -377,7 +373,6 @@ RectTransform:
377373
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
378374
m_LocalPosition: {x: 0, y: 0, z: -19.99998}
379375
m_LocalScale: {x: 1, y: 1, z: 1}
380-
m_ConstrainProportionsScale: 0
381376
m_Children:
382377
- {fileID: 224071729476491318}
383378
m_Father: {fileID: 224703550482448650}
@@ -470,7 +465,6 @@ RectTransform:
470465
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
471466
m_LocalPosition: {x: 0, y: 0, z: 0}
472467
m_LocalScale: {x: 1, y: 1, z: 1}
473-
m_ConstrainProportionsScale: 0
474468
m_Children:
475469
- {fileID: 224564986093952686}
476470
- {fileID: 224884339265297600}
@@ -577,7 +571,6 @@ RectTransform:
577571
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
578572
m_LocalPosition: {x: 0, y: 0, z: -19.99998}
579573
m_LocalScale: {x: 1, y: 1, z: 1}
580-
m_ConstrainProportionsScale: 0
581574
m_Children: []
582575
m_Father: {fileID: 224431914256755566}
583576
m_RootOrder: 1
@@ -658,7 +651,6 @@ RectTransform:
658651
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
659652
m_LocalPosition: {x: 0, y: 0, z: 10}
660653
m_LocalScale: {x: 0.02, y: 0.02, z: 0.02}
661-
m_ConstrainProportionsScale: 0
662654
m_Children:
663655
- {fileID: 224703550482448650}
664656
- {fileID: 224764318859703644}
@@ -713,7 +705,7 @@ MonoBehaviour:
713705
m_FallbackScreenDPI: 96
714706
m_DefaultSpriteDPI: 96
715707
m_DynamicPixelsPerUnit: 2
716-
m_PresetInfoIsWorld: 0
708+
m_PresetInfoIsWorld: 1
717709
--- !u!114 &114284253540390844
718710
MonoBehaviour:
719711
m_ObjectHideFlags: 0
@@ -761,7 +753,6 @@ RectTransform:
761753
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
762754
m_LocalPosition: {x: 0, y: 0, z: 0}
763755
m_LocalScale: {x: 1, y: 1, z: 1}
764-
m_ConstrainProportionsScale: 0
765756
m_Children: []
766757
m_Father: {fileID: 224247601441905012}
767758
m_RootOrder: 0
@@ -841,7 +832,6 @@ RectTransform:
841832
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
842833
m_LocalPosition: {x: 0, y: 0, z: -20}
843834
m_LocalScale: {x: 1, y: 1, z: 1}
844-
m_ConstrainProportionsScale: 0
845835
m_Children: []
846836
m_Father: {fileID: 224703550482448650}
847837
m_RootOrder: 0
@@ -921,7 +911,6 @@ RectTransform:
921911
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
922912
m_LocalPosition: {x: 0, y: 0, z: 0}
923913
m_LocalScale: {x: 1, y: 1, z: 1}
924-
m_ConstrainProportionsScale: 0
925914
m_Children: []
926915
m_Father: {fileID: 77608933434497189}
927916
m_RootOrder: 0
@@ -991,7 +980,7 @@ GameObject:
991980
m_Icon: {fileID: 0}
992981
m_NavMeshLayer: 0
993982
m_StaticEditorFlags: 0
994-
m_IsActive: 0
983+
m_IsActive: 1
995984
--- !u!224 &77608933434497189
996985
RectTransform:
997986
m_ObjectHideFlags: 0
@@ -1002,15 +991,14 @@ RectTransform:
1002991
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
1003992
m_LocalPosition: {x: 0, y: 0, z: -19.99998}
1004993
m_LocalScale: {x: 1, y: 1, z: 1}
1005-
m_ConstrainProportionsScale: 0
1006994
m_Children:
1007995
- {fileID: 1992729626421901825}
1008996
m_Father: {fileID: 224703550482448650}
1009997
m_RootOrder: 4
1010998
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
1011-
m_AnchorMin: {x: 0, y: 1}
1012-
m_AnchorMax: {x: 0, y: 1}
1013-
m_AnchoredPosition: {x: 250, y: -173.5}
999+
m_AnchorMin: {x: 0, y: 0}
1000+
m_AnchorMax: {x: 0, y: 0}
1001+
m_AnchoredPosition: {x: 0, y: 0}
10141002
m_SizeDelta: {x: 160, y: 25}
10151003
m_Pivot: {x: 0.5, y: 0.5}
10161004
--- !u!222 &6013548410687448273

‎Assets/Hamster/Scripts/MainGame.cs

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
using System.Collections;
1818
using System.Collections.Generic;
1919
using System.Threading.Tasks;
20+
using Firebase.Extensions;
2021

2122
namespace Hamster
2223
{
@@ -76,7 +77,7 @@ public int SoundFxVolume {
7677
void Start()
7778
{
7879
Screen.SetResolution(Screen.width / 2, Screen.height / 2, true);
79-
InitializeCommonDataAndStartGame();
80+
InitializeFirebaseAndStartGame();
8081
}
8182

8283
void Update() {
@@ -165,10 +166,25 @@ void InitializeCommonDataAndStartGame()
165166
stateManager.PushState(new States.MainMenu());
166167
}
167168

169+
public Firebase.FirebaseApp app = null;
170+
168171
// Begins the firebase initialization process and afterwards, opens the main menu.
169172
private void InitializeFirebaseAndStartGame()
170173
{
171-
throw new System.NotImplementedException();
174+
Firebase.FirebaseApp.CheckAndFixDependenciesAsync().ContinueWithOnMainThread(
175+
previousTask =>
176+
{
177+
var dependencyStatus = previousTask.Result;
178+
if (dependencyStatus == Firebase.DependencyStatus.Available) {
179+
// Create and hold a reference to your FirebaseApp,
180+
app = Firebase.FirebaseApp.DefaultInstance;
181+
InitializeCommonDataAndStartGame();
182+
} else {
183+
UnityEngine.Debug.LogError(
184+
$"Could not resolve all Firebase dependencies: {dependencyStatus}\n" +
185+
"Firebase Unity SDK is not safe to use here");
186+
}
187+
});
172188
}
173189

174190
// Sets Remote Config default values and fetchs new ones

0 commit comments

Comments
 (0)