diff --git a/Assets/GoogleSigninSDK/GoogleSignInManager.cs b/Assets/GoogleSigninSDK/GoogleSignInManager.cs
index 40d51a75..41af25db 100644
--- a/Assets/GoogleSigninSDK/GoogleSignInManager.cs
+++ b/Assets/GoogleSigninSDK/GoogleSignInManager.cs
@@ -21,22 +21,14 @@ public class GoogleSignInManager : MonoBehaviour
{
configuration = new GoogleSignInConfiguration
{
- WebClientId = "1021701058525-72qg4sbvqv3m3q7it4eck2h86ekoflla.apps.googleusercontent.com",
+ WebClientId = GameConstants.iOS_ClientID,
RequestEmail = true,
RequestAuthCode = true
};
GoogleSignIn.Configuration = configuration;
Application.quitting += SyncPlayerPrefsToPlayFabOnQuit;
- string ons_id = "";
-#if UNITY_ANDROID
- ons_id = GameConstants.OSN_Android;
-#elif UNITY_IOS
- ons_id = GameConstants.OSN_iOS;
-#endif
- Debug.Log($"Initializing with appId {ons_id}");
- OneSignal.Debug.LogLevel = LogLevel.Debug;
- OneSignal.Initialize(ons_id);
+
}
void Start()
diff --git a/Assets/PipeOut/Scenes/Loading.unity b/Assets/PipeOut/Scenes/Loading.unity
index eb838cd1..f7bf5c69 100644
--- a/Assets/PipeOut/Scenes/Loading.unity
+++ b/Assets/PipeOut/Scenes/Loading.unity
@@ -169,7 +169,7 @@ Transform:
m_Children: []
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!21 &38116014
+--- !u!21 &70808961
Material:
serializedVersion: 8
m_ObjectHideFlags: 0
@@ -204,7 +204,7 @@ Material:
m_Floats:
- _Alpha: 0
- _ColorMask: 15
- - _Distortion: 0.7683495
+ - _Distortion: 1.1646811
- _Stencil: 0
- _StencilComp: 8
- _StencilOp: 0
@@ -957,6 +957,50 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 439213423}
m_CullTransparentMesh: 1
+--- !u!1 &509783898
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 509783900}
+ - component: {fileID: 509783899}
+ m_Layer: 0
+ m_Name: OSNInit
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!114 &509783899
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 509783898}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: afb77ce3ddce9b34b8539e880cb78cb2, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+--- !u!4 &509783900
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 509783898}
+ serializedVersion: 2
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 324.34393, y: 886.0344, z: 473073.66}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_ConstrainProportionsScale: 0
+ m_Children: []
+ m_Father: {fileID: 0}
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &515619138
GameObject:
m_ObjectHideFlags: 0
@@ -2756,7 +2800,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
- m_Material: {fileID: 38116014}
+ m_Material: {fileID: 70808961}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
@@ -3608,3 +3652,4 @@ SceneRoots:
- {fileID: 1797903893}
- {fileID: 11358293}
- {fileID: 1466205357}
+ - {fileID: 509783900}
diff --git a/Assets/Scripts/Dev/GameConstants.cs b/Assets/Scripts/Dev/GameConstants.cs
index 3c74ddc8..dc0cc772 100644
--- a/Assets/Scripts/Dev/GameConstants.cs
+++ b/Assets/Scripts/Dev/GameConstants.cs
@@ -14,6 +14,8 @@ public class GameConstants
public static string OSN_Android = "3ee530aa-8613-485b-9cbd-0263727badc5";
public static string OSN_iOS = "aabdcf42-77ef-47c3-83f7-c97a1af87a5f";
+ public static string iOS_ClientID = "1021701058525-vp54583d95oknnamu739smqfihhoivnk.apps.googleusercontent.com";
+ public static string iOS_URL_Scheme = "com.googleusercontent.apps.1021701058525-vp54583d95oknnamu739smqfihhoivnk";
public static string AndroidURL =
"https://play.google.com/store/apps/details?id=com.rizze.pipuzzle&hl=en-US&ah=gfIMAf3ZQA42PzRKpRnkmyC0Sek&pli=1";
diff --git a/Assets/Scripts/OSNInitializer.cs b/Assets/Scripts/OSNInitializer.cs
new file mode 100644
index 00000000..acc587a8
--- /dev/null
+++ b/Assets/Scripts/OSNInitializer.cs
@@ -0,0 +1,23 @@
+using System.Collections;
+using System.Collections.Generic;
+using OneSignalSDK;
+using OneSignalSDK.Debug.Models;
+using UnityEngine;
+
+public class OSNInitializer : MonoBehaviour
+{
+ // Start is called before the first frame update
+ void Start()
+ {
+ string ons_id = "";
+#if UNITY_ANDROID
+ ons_id = GameConstants.OSN_Android;
+#elif UNITY_IOS
+ ons_id = GameConstants.OSN_iOS;
+#endif
+ Debug.Log($"Initializing with appId {ons_id}");
+ OneSignal.Debug.LogLevel = LogLevel.Debug;
+ OneSignal.Initialize(ons_id);
+ }
+
+}
diff --git a/Assets/Scripts/OSNInitializer.cs.meta b/Assets/Scripts/OSNInitializer.cs.meta
new file mode 100644
index 00000000..44f6574b
--- /dev/null
+++ b/Assets/Scripts/OSNInitializer.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: afb77ce3ddce9b34b8539e880cb78cb2
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant: