Pārlūkot izejas kodu

Add popup change login

alex_gs 3 gadi atpakaļ
vecāks
revīzija
d0a0c829c8

Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 1865 - 116
Unity3/Assets/2021/Scenes/Main.unity


BIN
Unity3/Assets/2021/UISources/Menu/17639236_1785253958471956_282550797298827264_n.png


+ 132 - 0
Unity3/Assets/2021/UISources/Menu/17639236_1785253958471956_282550797298827264_n.png.meta

@@ -0,0 +1,132 @@
+fileFormatVersion: 2
+guid: 42684615a5295f74a9d0e00187052aec
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -100
+    wrapU: 1
+    wrapV: 1
+    wrapW: -1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 10 - 3
Unity3/Assets/GameCore/Managers/MenuManager.cs

@@ -79,6 +79,7 @@ public class MenuManager : MonoBehaviour
     public ScreenBase CouponeMessage;
     public ScreenBase RescueMomentMessage;
     public ScreenBase NoLivesShowAdInGame;
+	public ScreenBase ChangeLoginPopup;
 	public ScreenBase Loader;
     public CommonInfoDialog commonInfoDialog;
 	public ObjectivesDialog objectivesDialog;
@@ -1269,7 +1270,13 @@ public class MenuManager : MonoBehaviour
 		//NotificationCenter.Post(NotificationType.ShowGenericNotification, Localization.instance.Get("prize.OnActionLevelNineStart"));
 
 	}
-	#endregion
-	
-	
+
+    public void ShowChangeLoginPopup()
+    {
+		ChangeLoginPopup.Show();
+
+	}
+    #endregion
+
+
 }

+ 28 - 0
Unity3/Assets/UI/Screens/ChangeLoginPopup.cs

@@ -0,0 +1,28 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class ChangeLoginPopup : ScreenBase
+{
+    // Start is called before the first frame update
+    void Start()
+    {
+        
+    }
+
+    // Update is called once per frame
+    public void OnLoginFB()
+    {
+        WrapperFB.Login();
+    }
+
+    public void OnLoginGuest()
+    {
+        WrapperFB.Login();
+    }
+
+    public void OnLoginApple()
+    {
+        WrapperFB.Login();
+    }
+}

+ 11 - 0
Unity3/Assets/UI/Screens/ChangeLoginPopup.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: e93b9d142891df346a5d619c94649299
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 7 - 0
Unity3/Assets/UI/Screens/FacebookLoginRequiredDialog.cs

@@ -6,7 +6,14 @@ public class FacebookLoginRequiredDialog : ScreenBase
 	void OnLoginButtonMsg()
 	{
 		Logger.LogFlurryEvent("Facebook Login from Login Required Dialog");
+
+#if UNITY_IPHONE
+	MenuManager._instance.ShowChangeLoginPopup();
+		
+#endif
+#if UNITY_ANDROID
 		WrapperFB.Login();
+#endif
 		Hide();
 	}
 }