Sfoglia il codice sorgente

Update login apple logic

aleksey 3 anni fa
parent
commit
871ff0e125

+ 5 - 21
Unity3/Assets/2021/Scenes/Main.unity

@@ -6747,7 +6747,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_text: LOGIN
+  m_text: "Innskr\xE1ning"
   m_isRightToLeft: 0
   m_fontAsset: {fileID: 11400000, guid: 4b9532a5a34fa454a849f0a5e6a357a0, type: 2}
   m_sharedMaterial: {fileID: 8245310406705776545, guid: 4b9532a5a34fa454a849f0a5e6a357a0,
@@ -28758,7 +28758,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 1}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: -153.12341, y: -128.68073}
+  m_AnchoredPosition: {x: -153.12305, y: -128.68066}
   m_SizeDelta: {x: 424.273, y: 233.498}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &815957644
@@ -31224,7 +31224,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_text: GUEST
+  m_text: Gestaspilari
   m_isRightToLeft: 0
   m_fontAsset: {fileID: 11400000, guid: 4b9532a5a34fa454a849f0a5e6a357a0, type: 2}
   m_sharedMaterial: {fileID: 8245310406705776545, guid: 4b9532a5a34fa454a849f0a5e6a357a0,
@@ -39982,7 +39982,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0.91}
   m_AnchorMax: {x: 0.052, y: 1}
-  m_AnchoredPosition: {x: 19, y: 45.5}
+  m_AnchoredPosition: {x: 19, y: 45.500015}
   m_SizeDelta: {x: -96.10254, y: 9}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &1155985925
@@ -47779,7 +47779,6 @@ GameObject:
   - component: {fileID: 1332990562}
   - component: {fileID: 1332990561}
   - component: {fileID: 1332990560}
-  - component: {fileID: 1332990559}
   - component: {fileID: 1332990558}
   - component: {fileID: 1332990557}
   m_Layer: 5
@@ -47846,21 +47845,6 @@ Canvas:
   m_SortingLayerID: 0
   m_SortingOrder: 0
   m_TargetDisplay: 0
---- !u!114 &1332990559
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1332990555}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: f3513efa368171d4d915f37baebca510, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  target: {fileID: 1707092695}
-  functionName: Hide
-  includeChildren: 0
 --- !u!114 &1332990560
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -74752,7 +74736,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &1754528018
 RectTransform:
   m_ObjectHideFlags: 0

+ 168 - 0
Unity3/Assets/2021/Scenes/TestRequest.unity

@@ -0,0 +1,168 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!29 &1
+OcclusionCullingSettings:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_OcclusionBakeSettings:
+    smallestOccluder: 5
+    smallestHole: 0.25
+    backfaceThreshold: 100
+  m_SceneGUID: 00000000000000000000000000000000
+  m_OcclusionCullingData: {fileID: 0}
+--- !u!104 &2
+RenderSettings:
+  m_ObjectHideFlags: 0
+  serializedVersion: 9
+  m_Fog: 0
+  m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
+  m_FogMode: 3
+  m_FogDensity: 0.01
+  m_LinearFogStart: 0
+  m_LinearFogEnd: 300
+  m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1}
+  m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1}
+  m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1}
+  m_AmbientIntensity: 1
+  m_AmbientMode: 0
+  m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1}
+  m_SkyboxMaterial: {fileID: 10304, guid: 0000000000000000f000000000000000, type: 0}
+  m_HaloStrength: 0.5
+  m_FlareStrength: 1
+  m_FlareFadeSpeed: 3
+  m_HaloTexture: {fileID: 0}
+  m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0}
+  m_DefaultReflectionMode: 0
+  m_DefaultReflectionResolution: 128
+  m_ReflectionBounces: 1
+  m_ReflectionIntensity: 1
+  m_CustomReflection: {fileID: 0}
+  m_Sun: {fileID: 0}
+  m_IndirectSpecularColor: {r: 0.37311915, g: 0.3807396, b: 0.35872662, a: 1}
+  m_UseRadianceAmbientProbe: 0
+--- !u!157 &3
+LightmapSettings:
+  m_ObjectHideFlags: 0
+  serializedVersion: 12
+  m_GIWorkflowMode: 1
+  m_GISettings:
+    serializedVersion: 2
+    m_BounceScale: 1
+    m_IndirectOutputScale: 1
+    m_AlbedoBoost: 1
+    m_EnvironmentLightingMode: 0
+    m_EnableBakedLightmaps: 1
+    m_EnableRealtimeLightmaps: 0
+  m_LightmapEditorSettings:
+    serializedVersion: 12
+    m_Resolution: 2
+    m_BakeResolution: 40
+    m_AtlasSize: 1024
+    m_AO: 0
+    m_AOMaxDistance: 1
+    m_CompAOExponent: 1
+    m_CompAOExponentDirect: 0
+    m_ExtractAmbientOcclusion: 0
+    m_Padding: 2
+    m_LightmapParameters: {fileID: 0}
+    m_LightmapsBakeMode: 1
+    m_TextureCompression: 1
+    m_FinalGather: 0
+    m_FinalGatherFiltering: 1
+    m_FinalGatherRayCount: 256
+    m_ReflectionCompression: 2
+    m_MixedBakeMode: 2
+    m_BakeBackend: 1
+    m_PVRSampling: 1
+    m_PVRDirectSampleCount: 32
+    m_PVRSampleCount: 512
+    m_PVRBounces: 2
+    m_PVREnvironmentSampleCount: 256
+    m_PVREnvironmentReferencePointCount: 2048
+    m_PVRFilteringMode: 1
+    m_PVRDenoiserTypeDirect: 1
+    m_PVRDenoiserTypeIndirect: 1
+    m_PVRDenoiserTypeAO: 1
+    m_PVRFilterTypeDirect: 0
+    m_PVRFilterTypeIndirect: 0
+    m_PVRFilterTypeAO: 0
+    m_PVREnvironmentMIS: 1
+    m_PVRCulling: 1
+    m_PVRFilteringGaussRadiusDirect: 1
+    m_PVRFilteringGaussRadiusIndirect: 5
+    m_PVRFilteringGaussRadiusAO: 2
+    m_PVRFilteringAtrousPositionSigmaDirect: 0.5
+    m_PVRFilteringAtrousPositionSigmaIndirect: 2
+    m_PVRFilteringAtrousPositionSigmaAO: 1
+    m_ExportTrainingData: 0
+    m_TrainingDataDestination: TrainingData
+    m_LightProbeSampleCountMultiplier: 4
+  m_LightingDataAsset: {fileID: 0}
+  m_LightingSettings: {fileID: 0}
+--- !u!196 &4
+NavMeshSettings:
+  serializedVersion: 2
+  m_ObjectHideFlags: 0
+  m_BuildSettings:
+    serializedVersion: 2
+    agentTypeID: 0
+    agentRadius: 0.5
+    agentHeight: 2
+    agentSlope: 45
+    agentClimb: 0.4
+    ledgeDropHeight: 0
+    maxJumpAcrossDistance: 0
+    minRegionArea: 2
+    manualCellSize: 0
+    cellSize: 0.16666667
+    manualTileSize: 0
+    tileSize: 256
+    accuratePlacement: 0
+    maxJobWorkers: 0
+    preserveTilesOutsideBounds: 0
+    debug:
+      m_Flags: 0
+  m_NavMeshData: {fileID: 0}
+--- !u!1 &1508054684
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1508054686}
+  - component: {fileID: 1508054685}
+  m_Layer: 0
+  m_Name: GameObject
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!114 &1508054685
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1508054684}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 10b13ba125d0440f093c61c4d001b718, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+--- !u!4 &1508054686
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1508054684}
+  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_Children: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}

+ 7 - 0
Unity3/Assets/2021/Scenes/TestRequest.unity.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: da0bee2d5f7bc4de5b6b894aa569388c
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 47 - 0
Unity3/Assets/Core/ServerTime.cs

@@ -40,7 +40,34 @@ public class ServerTime : MonoBehaviour
 
 		_instance = this;
 		DontDestroyOnLoad(gameObject);
+		StartCoroutine(LoadServerTimeRoutine());
 	}
+
+	private IEnumerator LoadServerTimeRoutine()
+	{
+		string url = GameConstants.SERVER_BASE_URL + "serverTime.php";
+		var unityWebRequest = new UnityWebRequest(url);
+		yield return new WaitForSeconds(3);
+		Debug.Log("LoadServerTimeRoutine ");
+		//RetrieveServerTime(OnGetTime);
+		StartCoroutine(AwaitRequest(unityWebRequest,Results));
+	}
+
+	private void Results(long obj)
+	{
+		Debug.Log(obj);
+	}
+
+	private void Percentage(UnityWebRequest arg1, ulong arg2)
+	{
+		throw new NotImplementedException();
+	}
+
+	private void OnGetTime(long l)
+	{
+		Debug.Log("OnGetTime " + l);
+	}
+
 	#endregion
 
 	/// <summary>
@@ -53,7 +80,27 @@ public class ServerTime : MonoBehaviour
 		AVDebug.Assert(onComplete != null, "onComplete must not be null when requesting server time");
 		StartCoroutine(RetrieveServerTimeCoroutine(onComplete));
 	}
+	internal IEnumerator AwaitRequest(UnityWebRequest request, Action<long> result)
+	{
+		WWW www = new WWW(GameConstants.SERVER_BASE_URL + "serverTime.php");
+		yield return www;
 
+		if (www.error != null)
+		{
+			result(-1);
+		} else
+		{
+			long serverTime;
+			if (long.TryParse(www.text, out serverTime))
+			{
+				result(serverTime);
+			} else
+			{
+				result(-1); //parse error
+			}
+		}
+		
+	}
 	private Action<long> _onComplete;
 	IEnumerator RetrieveServerTimeCoroutine(Action<long> onComplete)
 	{

+ 1 - 1
Unity3/Assets/GameCore/Managers/AchievementsManager.cs

@@ -135,7 +135,7 @@ public class AchievementsManager : MonoBehaviour
 	void OnTransitToGameOver(Notification note)
 	{
 		GameOverData data = (GameOverData)note.data;
-		CheckForAchievements(data.reason);
+		//CheckForAchievements(data.reason);
 	}
 
 	void OnContinueAfterGameOver(Notification note)

+ 0 - 1
Unity3/Assets/GameCore/Managers/MenuManager.cs

@@ -842,7 +842,6 @@ public class MenuManager : MonoBehaviour
 
 	void ContinueToPlay()
 	{
-		Debug.LogError ("LOG " + _fsm.PreviousStateID);
 		MenuManager._instance.IsCelebrity = true;
 		_scoresUIManager.scoreViewMode = HighScoreUIManager.ScoreViewMode.GameOver;
 		playScreen.SetActive(true);

+ 0 - 33
Unity3/Assets/Plugins/Demigiant/DOTween/Editor/DOTweenUpgradeManager.dll.meta

@@ -1,33 +0,0 @@
-fileFormatVersion: 2
-guid: 2bf936a5d80799e4e88ec9270fea75a4
-PluginImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  iconMap: {}
-  executionOrder: {}
-  defineConstraints: []
-  isPreloaded: 0
-  isOverridable: 0
-  isExplicitlyReferenced: 0
-  validateReferences: 1
-  platformData:
-  - first:
-      Any: 
-    second:
-      enabled: 0
-      settings: {}
-  - first:
-      Editor: Editor
-    second:
-      enabled: 1
-      settings:
-        DefaultValueInitialized: true
-  - first:
-      Windows Store Apps: WindowsStoreApps
-    second:
-      enabled: 0
-      settings:
-        CPU: AnyCPU
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 1 - 1
Unity3/Assets/SocialNetworking/Scripts/SocialPlatform/GameDatabaseManager.cs

@@ -337,7 +337,7 @@ public class GameDatabaseManager : MonoBehaviour
 		Debug.Log("ID " + GetDevice());
 		WWWForm form = new WWWForm();
 		form.AddField("userDeviceId", deviceID);
-
+		Debug.Log("startCheckDevice");
 		WWW w = new WWW(loadDeviceUrl, form);
 		yield return w;
 

+ 2 - 2
Unity3/Assets/Unity Technologies/SignInWithApple/Samples/Scripts/SignInWithAppleTest_Callbacks.cs

@@ -1,11 +1,11 @@
 using System;
+using Facebook.Unity.Example;
 using UnityEngine;
 using UnityEngine.iOS;
 using UnityEngine.SignInWithApple;
 
 public class SignInWithAppleTest_Callbacks : MonoBehaviour
 {
-
     private string userId;
     
     public void ButtonPress()
@@ -39,7 +39,7 @@ public class SignInWithAppleTest_Callbacks : MonoBehaviour
             Debug.Log("Errors occurred: " + args.error);
             return;
         }
-
+        MenuManager._instance.ChangeLoginPopup.Hide();
         UnityEngine.SignInWithApple.UserInfo userInfo = args.userInfo;
 
         // Save the userId so we can use it later for other operations.

+ 7 - 4
Unity3/ProjectSettings/EditorBuildSettings.asset

@@ -11,6 +11,9 @@ EditorBuildSettings:
   - enabled: 0
     path: Assets/Scenes/LoadingScene.unity
     guid: 68ae1afac70c74c5bb29c6b0fa98b98a
+  - enabled: 0
+    path: Assets/2021/Scenes/TestRequest.unity
+    guid: da0bee2d5f7bc4de5b6b894aa569388c
   - enabled: 1
     path: Assets/2021/Scenes/Main.unity
     guid: 82ff5750db592844cb71ba1c86476730
@@ -36,14 +39,14 @@ EditorBuildSettings:
     path: 
     guid: 00000000000000000000000000000000
   - enabled: 0
-    path: Assets/EasyMovieTexture/Scene/Demo_FullScreen.unity
-    guid: c75f5cab28d14b545b7d90a78d6780c9
+    path: 
+    guid: 00000000000000000000000000000000
   - enabled: 0
     path: 
     guid: 00000000000000000000000000000000
   - enabled: 0
-    path: Assets/EasyMovieTexture/Scene/Demo_FullScreen.unity
-    guid: c75f5cab28d14b545b7d90a78d6780c9
+    path: 
+    guid: 00000000000000000000000000000000
   - enabled: 0
     path: 
     guid: 00000000000000000000000000000000

+ 2 - 2
Unity3/ProjectSettings/ProjectSettings.asset

@@ -128,7 +128,7 @@ PlayerSettings:
     16:10: 1
     16:9: 1
     Others: 1
-  bundleVersion: 2.0
+  bundleVersion: 3.0
   preloadedAssets: []
   metroInputSource: 0
   wsaTransparentSwapchain: 0
@@ -154,7 +154,7 @@ PlayerSettings:
     tvOS: gamatic.icts
   buildNumber:
     Standalone: 0
-    iPhone: 2
+    iPhone: 5
     tvOS: 0
   overrideDefaultApplicationIdentifier: 1
   AndroidBundleVersionCode: 9