Skip to content

Commit cb1438d

Browse files
Russell-Sng-Unity3DRussell-Sng-Unity3D
committed
Pushing fix for Compilation Error
1 parent 34cf591 commit cb1438d

4 files changed

Lines changed: 61 additions & 6 deletions

File tree

‎Assets/Scenes/LoadingScene.unity‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,7 @@ RectTransform:
151151
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
152152
m_LocalPosition: {x: 0, y: 0, z: 0}
153153
m_LocalScale: {x: 1, y: 1, z: 1}
154+
m_ConstrainProportionsScale: 0
154155
m_Children: []
155156
m_Father: {fileID: 1562072775}
156157
m_RootOrder: 2
@@ -212,6 +213,7 @@ GameObject:
212213
m_Component:
213214
- component: {fileID: 652876738}
214215
- component: {fileID: 652876737}
216+
- component: {fileID: 652876739}
215217
m_Layer: 0
216218
m_Name: Directional Light
217219
m_TagString: Untagged
@@ -291,10 +293,31 @@ Transform:
291293
m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261}
292294
m_LocalPosition: {x: 0, y: 3, z: 0}
293295
m_LocalScale: {x: 1, y: 1, z: 1}
296+
m_ConstrainProportionsScale: 0
294297
m_Children: []
295298
m_Father: {fileID: 0}
296299
m_RootOrder: 1
297300
m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0}
301+
--- !u!114 &652876739
302+
MonoBehaviour:
303+
m_ObjectHideFlags: 0
304+
m_CorrespondingSourceObject: {fileID: 0}
305+
m_PrefabInstance: {fileID: 0}
306+
m_PrefabAsset: {fileID: 0}
307+
m_GameObject: {fileID: 652876736}
308+
m_Enabled: 1
309+
m_EditorHideFlags: 0
310+
m_Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3}
311+
m_Name:
312+
m_EditorClassIdentifier:
313+
m_Version: 1
314+
m_UsePipelineSettings: 1
315+
m_AdditionalLightsShadowResolutionTier: 2
316+
m_LightLayerMask: 1
317+
m_CustomShadowLayers: 0
318+
m_ShadowLayerMask: 1
319+
m_LightCookieSize: {x: 1, y: 1}
320+
m_LightCookieOffset: {x: 0, y: 0}
298321
--- !u!1 &775615889
299322
GameObject:
300323
m_ObjectHideFlags: 0
@@ -322,6 +345,7 @@ Transform:
322345
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
323346
m_LocalPosition: {x: 0.06999993, y: 0.553, z: -0.05099988}
324347
m_LocalScale: {x: 1, y: 1, z: 1}
348+
m_ConstrainProportionsScale: 0
325349
m_Children: []
326350
m_Father: {fileID: 0}
327351
m_RootOrder: 4
@@ -340,6 +364,7 @@ MonoBehaviour:
340364
m_EditorClassIdentifier:
341365
m_LoadingSlider: {fileID: 1880866496}
342366
m_PlayButton: {fileID: 1956782723}
367+
m_LoadingText: {fileID: 53019759}
343368
--- !u!1 &813797211
344369
GameObject:
345370
m_ObjectHideFlags: 0
@@ -368,6 +393,7 @@ RectTransform:
368393
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
369394
m_LocalPosition: {x: 0, y: 0, z: 0}
370395
m_LocalScale: {x: 1, y: 1, z: 1}
396+
m_ConstrainProportionsScale: 0
371397
m_Children: []
372398
m_Father: {fileID: 1880866495}
373399
m_RootOrder: 0
@@ -443,6 +469,7 @@ RectTransform:
443469
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
444470
m_LocalPosition: {x: 0, y: 0, z: 0}
445471
m_LocalScale: {x: 1, y: 1, z: 1}
472+
m_ConstrainProportionsScale: 0
446473
m_Children: []
447474
m_Father: {fileID: 1616703204}
448475
m_RootOrder: 0
@@ -569,6 +596,7 @@ Transform:
569596
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
570597
m_LocalPosition: {x: 0, y: 1, z: -10}
571598
m_LocalScale: {x: 1, y: 1, z: 1}
599+
m_ConstrainProportionsScale: 0
572600
m_Children: []
573601
m_Father: {fileID: 0}
574602
m_RootOrder: 0
@@ -663,6 +691,7 @@ RectTransform:
663691
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
664692
m_LocalPosition: {x: 0, y: 0, z: 0}
665693
m_LocalScale: {x: 0, y: 0, z: 0}
694+
m_ConstrainProportionsScale: 0
666695
m_Children:
667696
- {fileID: 1941039800}
668697
- {fileID: 1880866495}
@@ -702,6 +731,7 @@ RectTransform:
702731
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
703732
m_LocalPosition: {x: 0, y: 0, z: 0}
704733
m_LocalScale: {x: 1, y: 1, z: 1}
734+
m_ConstrainProportionsScale: 0
705735
m_Children:
706736
- {fileID: 1020116464}
707737
m_Father: {fileID: 1880866495}
@@ -740,6 +770,7 @@ RectTransform:
740770
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
741771
m_LocalPosition: {x: 0, y: 0, z: 0}
742772
m_LocalScale: {x: 1, y: 1, z: 1}
773+
m_ConstrainProportionsScale: 0
743774
m_Children: []
744775
m_Father: {fileID: 1956782724}
745776
m_RootOrder: 0
@@ -853,6 +884,7 @@ Transform:
853884
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
854885
m_LocalPosition: {x: 0, y: 0, z: 0}
855886
m_LocalScale: {x: 1, y: 1, z: 1}
887+
m_ConstrainProportionsScale: 0
856888
m_Children: []
857889
m_Father: {fileID: 0}
858890
m_RootOrder: 3
@@ -884,6 +916,7 @@ RectTransform:
884916
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
885917
m_LocalPosition: {x: 0, y: 0, z: 0}
886918
m_LocalScale: {x: 1, y: 1, z: 1}
919+
m_ConstrainProportionsScale: 0
887920
m_Children:
888921
- {fileID: 813797212}
889922
- {fileID: 1616703204}
@@ -974,6 +1007,7 @@ RectTransform:
9741007
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
9751008
m_LocalPosition: {x: 0, y: 0, z: 0}
9761009
m_LocalScale: {x: 1, y: 1, z: 1}
1010+
m_ConstrainProportionsScale: 0
9771011
m_Children: []
9781012
m_Father: {fileID: 1562072775}
9791013
m_RootOrder: 0
@@ -1047,6 +1081,7 @@ RectTransform:
10471081
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
10481082
m_LocalPosition: {x: 0, y: 0, z: 0}
10491083
m_LocalScale: {x: 1, y: 1, z: 1}
1084+
m_ConstrainProportionsScale: 0
10501085
m_Children:
10511086
- {fileID: 1654366043}
10521087
m_Father: {fileID: 1562072775}

‎Assets/Scripts/ApplyRemoteConfigSettings.cs‎

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,32 +15,44 @@ public class ApplyRemoteConfigSettings : MonoBehaviour
1515
{
1616
public static ApplyRemoteConfigSettings Instance {get; private set;}
1717

18+
// We'll be using these variables throughout the project
1819
public string language = "English";
1920
public float characterSize = 1.0f;
2021
public float characterSpeed = 1.0f;
2122
public int activeHat = 0;
2223

24+
// References to Start and Store text components
2325
public GameObject StartButtonText;
2426
public GameObject StoreButtonText;
2527

2628
public struct userAttributes
2729
{
2830
// Optionally declare variables for any custom user attributes:
31+
// This variable can be updated as the game progresses and then used in Campaign Audience Targeting!
32+
33+
// user.inventory.item
34+
// user.levelsCompleted
2935
}
3036

3137
public struct appAttributes
3238
{
33-
// // Optionally declare variables for any custom app attributes:
39+
// Optionally declare variables for any custom app attributes:
40+
41+
// i.e
3442
// public int level;
3543
// public string appVersion;
3644
}
3745

46+
//Much like coroutines and the yield statement, async methods
47+
//and await methods can be paused (waiting for result from an asynchronous call) and then resumed.
48+
//The key difference, however, is async methods can return data.
3849
async Task InitializeRemoteConfigAsync()
3950
{
40-
// initialize handlers for unity game services
51+
// initialize handlers for Unity game services
4152
await UnityServices.InitializeAsync();
4253

43-
// remote config requires authentication for managing environment information
54+
// As of Remote Config 3.0.0 SDK,
55+
// * Remote Config now requires Authentication for managing environment information and retrieving Settings *
4456
if (!AuthenticationService.Instance.IsSignedIn)
4557
{
4658
await AuthenticationService.Instance.SignInAnonymouslyAsync();
@@ -61,10 +73,11 @@ void Awake()
6173

6274
async void Start()
6375
{
76+
// call with await keyword our async Task function
6477
await InitializeRemoteConfigAsync();
6578

6679
// Fetch the Dashboard Remote Config from RemoteConfigManager
67-
//RemoteConfigManagerScript.FetchConfigs();
80+
// We also append the userAttributes and appAttributes struct in our Fetch request
6881
ConfigManager.FetchConfigs<userAttributes, appAttributes>(new userAttributes(){}, new appAttributes(){});
6982

7083
// Optional Settings

‎Assets/Scripts/Loading.cs‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ public class Loading : MonoBehaviour
1111
private Slider m_LoadingSlider;
1212

1313
[SerializeField]
14-
private GameObject m_PlayButton;
14+
private GameObject m_PlayButton, m_LoadingText;
1515

1616
private string language;
1717

@@ -36,18 +36,22 @@ private void OnSceneLoaded(AsyncOperationHandle obj)
3636
if (language == "English")
3737
{
3838
m_PlayButton.GetComponentInChildren<Text>().text = "Play";
39+
m_LoadingText.GetComponent<Text>().text = "Loading...";
3940
}
4041
else if (language == "Spanish")
4142
{
4243
m_PlayButton.GetComponentInChildren<Text>().text = "Jugar";
44+
m_LoadingText.GetComponent<Text>().text = "Cargando...";
4345
}
4446
else if (language == "French")
4547
{
4648
m_PlayButton.GetComponentInChildren<Text>().text = "Jouer";
49+
m_LoadingText.GetComponent<Text>().text = "Chargement...";
4750
}
4851
else if (language == "German")
4952
{
5053
m_PlayButton.GetComponentInChildren<Text>().text = "Abspielen";
54+
m_LoadingText.GetComponent<Text>().text = "Die Beladung...";
5155
}
5256

5357
m_PlayButton.SetActive(true);

‎Assets/Scripts/PlayerController.cs‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,10 @@ void Awake()
3838

3939
void Start()
4040
{
41-
SetMovementSpeed(rcInstance.characterSpeed);
41+
if (rcInstance)
42+
{
43+
SetMovementSpeed(rcInstance.characterSpeed);
44+
}
4245

4346
m_Rigidbody = GetComponent<Rigidbody>();
4447
m_MainCamera = Camera.main;

0 commit comments

Comments
 (0)