ios快捷登录

Assets/AppleInfoController.cs

@@ -0,0 +1,159 @@
+using Assets.Scripts;
+using Newtonsoft.Json.Linq;
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.UI;
+
+public class AppleInfoController : PFUIPanel
+{
+    public Action afterClose = null;
+    private SignForm signForm;
+    private Dictionary<string, Selectable> signFormDict;
+    public bool startCaptcha = false;
+
+    protected override void Awake()
+    {
+        UIManager.AddEvent(transform.Find("FormContainer-Sign/btnClose").gameObject, UnityEngine.EventSystems.EventTriggerType.PointerClick, b =>
+         {
+             Close();
+             //if (afterClose != null) 
+             //{
+             //    afterClose.Invoke();
+             //}
+         });
+        
+        signForm = new SignForm()
+        {
+            email = transform.Find("FormContainer-Sign/FirstPage/Email").GetComponent<InputField>(),
+            captcha = transform.Find("FormContainer-Sign/FirstPage/Captcha").GetComponent<InputField>(),
+            password = transform.Find("FormContainer-Sign/FirstPage/Password").GetComponent<InputField>(),
+            cpassword = transform.Find("FormContainer-Sign/FirstPage/CPassword").GetComponent<InputField>(),
+        };
+        signFormDict = new Dictionary<string, Selectable>
+        {
+            { "Phone",signForm.email},
+            { "Captcha",signForm.captcha},
+            { "Pwd",signForm.password},
+            { "CPwd",signForm.cpassword},
+        };
+        signPage1 = transform.Find("FormContainer-Sign/FirstPage");
+        UIManager.AddEvent(signPage1.Find("Captcha").Find("BtnGet").gameObject, UnityEngine.EventSystems.EventTriggerType.PointerClick, b =>
+         {
+             GetCaptcha();
+         });
+        UIManager.AddEvent(signPage1.Find("next").gameObject, UnityEngine.EventSystems.EventTriggerType.PointerClick, b =>
+         {
+             Submit();
+         });
+    }
+
+    private async void Submit()
+    {
+        if (signForm.password.text != signForm.cpassword.text)
+        {
+            Utils.SetValidate(signFormDict, JArray.FromObject(new object[]
+            {
+                new { Field="Pwd"},
+                new { Field="CPwd"},
+            }));
+            Utils.showToast(gameObject, "Two password entries are inconsistent");//两次密码输入不一致
+            return;
+        }
+        var res = await ConfigHelper.userApi.AppleCompleteInfo(signForm.email.text, signForm.captcha.text, signForm.password.text);
+        if (res.result)
+        {
+            Utils.showToast(null, App.GetLocalString("Success"), type: 1);
+            App.CurrentUser.Phone = signForm.email.text;
+            if (afterClose != null) 
+            {
+                afterClose.Invoke();
+            }
+            Close();
+        }
+        else 
+        {
+            Utils.SetValidate(signFormDict, JArray.FromObject(res.data));
+            Utils.showToast(null, res.errMsg);
+        }
+    }
+
+    float timer = 1f;
+    int time = 60;
+    Transform signPage1;
+    async void GetCaptcha()
+    {
+        var btn = signPage1.Find("Captcha").Find("BtnGet");
+        btn.GetComponent<Button>().enabled = false;
+        btn.GetComponent<Button>().interactable = false;
+        var btnText = btn.Find("Text").GetComponent<Text>();
+        var Email = signForm.email;
+        var r = await ConfigHelper.userApi.GetCaptcha(Email.text);
+        //Timer t = new Ti
+        if (r.result)
+        {
+            //if (r.data.Value<bool>("isExist"))
+            //{
+            //    signPage1.Find("Password").gameObject.SetActive(false);
+            //    signPage1.Find("CPassword").gameObject.SetActive(false);
+            //}
+            //else
+            //{
+            //    signPage1.Find("Password").gameObject.SetActive(true);
+            //    signPage1.Find("CPassword").gameObject.SetActive(true);
+            //}
+            time = 60;
+            btnText.text = $"Again({time})";
+            btn.GetComponent<Button>().enabled = false;
+            btn.GetComponent<Button>().interactable = false;
+            startCaptcha = true;
+            //timer.Interval = 1000;
+            //timer.AutoReset = true;
+            //timer.Elapsed += new ElapsedEventHandler(CaptchaTimerTick);
+            //timer.Enabled = true;
+            //btnGet.
+        }
+        else
+        {
+            btn.GetComponent<Button>().enabled = true;
+            btn.GetComponent<Button>().interactable = true;
+            Utils.showToast(gameObject, r.errMsg);
+            Utils.SetValidate(signFormDict, r.errFieldMsg);
+        }
+    }
+
+    void CaptchaTimerTick()
+    {
+        timer -= Time.deltaTime;
+        if (timer <= 0)
+        {
+            var btn = signPage1.Find("Captcha").Find("BtnGet");
+            var btnText = signPage1.Find("Captcha").Find("BtnGet").Find("Text").GetComponent<Text>();
+            btnText.text = $"{App.GetLocalString("Again")}({time--})";
+            if (time < 0)
+            {
+                btnText.text = App.GetLocalString("Get");
+                btn.GetComponent<Button>().enabled = true;
+                btn.GetComponent<Button>().interactable = true;
+                startCaptcha = false;
+                //timer.Stop();
+            }
+            timer += 1.0f;
+        }
+    }
+    // Start is called before the first frame update
+    void Start()
+    {
+        
+    }
+
+    // Update is called once per frame
+    void Update()
+    {
+        if (startCaptcha) 
+        {
+            CaptchaTimerTick();
+        }
+    }
+}

Assets/AppleInfoController.cs.meta

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

Assets/Editor/XCodePostProcessBuild.cs

@@ -133,6 +133,7 @@ public static class XCodePostProcessBuild
         entitlements.AddAssociatedDomains(new string[] { "applinks:" + domainUrl });
         //苹果登录
         entitlements.AddSignInWithApple();
+        entitlements.AddPushNotifications(false);
         entitlements.WriteToFile();
     }
 

Assets/Resources/UI/Prefab/Panel/Mobile/AppleInfoModal.prefab.meta

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

Assets/Resources/UI/Prefab/Panel/Mobile/UserInfoPanel.prefab

@@ -2280,6 +2280,7 @@ RectTransform:
   m_Children:
   - {fileID: 5404217439945121858}
   - {fileID: 5404217439901075764}
+  - {fileID: 3659313448103665848}
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -6112,6 +6113,176 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: 8462
+--- !u!1001 &1833386218567010840
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 5404217438093112801}
+    m_Modifications:
+    - target: {fileID: 545917028276686471, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 40
+      objectReference: {fileID: 0}
+    - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_Pivot.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_Pivot.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_RootOrder
+      value: 2
+      objectReference: {fileID: 0}
+    - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_AnchorMin.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 112
+      objectReference: {fileID: 0}
+    - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 28
+      objectReference: {fileID: 0}
+    - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 262
+      objectReference: {fileID: 0}
+    - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -250
+      objectReference: {fileID: 0}
+    - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3150550772099312289, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_Name
+      value: InfoButton
+      objectReference: {fileID: 0}
+    - target: {fileID: 3150550772099312289, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3150550772916003707, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_Text
+      value: PERFECT INFORMATION
+      objectReference: {fileID: 0}
+    - target: {fileID: 3150550772916003707, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_FontData.m_MinSize
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 3150550772916003707, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_FontData.m_FontSize
+      value: 12
+      objectReference: {fileID: 0}
+    - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 20
+      objectReference: {fileID: 0}
+    - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+        type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3}
+--- !u!224 &3659313448103665848 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+    type: 3}
+  m_PrefabInstance: {fileID: 1833386218567010840}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &2826417434039928023
 PrefabInstance:
   m_ObjectHideFlags: 0

Assets/Resources/UI/language.json

@@ -618,7 +618,7 @@
     "View All": "View All",
     "ABOUT": "ABOUT",
     "No Net": "No Net",
-    "PERFECT INFORMATION": "COMPLETE INFORMATION",
+    "PERFECT INFORMATION": "COMPLETE INFO",
     "Distance King": "Distance King",
     "Power King": "Power King",
     "Climbing King": "Climbing King",

Assets/Scenes/Test2.unity

@@ -123,10 +123,96 @@ NavMeshSettings:
   m_NavMeshData: {fileID: 0}
 --- !u!224 &467445919 stripped
 RectTransform:
-  m_CorrespondingSourceObject: {fileID: 7004216018333768315, guid: edc776247d121174886c75e616e948a7,
+  m_CorrespondingSourceObject: {fileID: 245658337100488343, guid: cb6e4df8333395042a0b47930ac1b5d9,
     type: 3}
-  m_PrefabInstance: {fileID: 7004216018171998948}
+  m_PrefabInstance: {fileID: 245658336666613256}
   m_PrefabAsset: {fileID: 0}
+--- !u!21 &535438819
+Material:
+  serializedVersion: 6
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: RoundedCornersTextureMaterial(Clone)
+  m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3}
+  m_ShaderKeywords: 
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _BumpMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailAlbedoMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailMask:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailNormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _EmissionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MainTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MetallicGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _OcclusionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _ParallaxMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Floats:
+    - _BumpScale: 1
+    - _ColorMask: 15
+    - _Cutoff: 0.5
+    - _DetailNormalMapScale: 1
+    - _DstBlend: 0
+    - _GlossMapScale: 1
+    - _Glossiness: 0.5
+    - _GlossyReflections: 1
+    - _Height: 50
+    - _Metallic: 0
+    - _Mode: 0
+    - _OcclusionStrength: 1
+    - _Parallax: 0.02
+    - _Radius: 15
+    - _SmoothnessTextureChannel: 0
+    - _SpecularHighlights: 1
+    - _SrcBlend: 1
+    - _Stencil: 0
+    - _StencilComp: 8
+    - _StencilOp: 0
+    - _StencilReadMask: 255
+    - _StencilWriteMask: 255
+    - _UVSec: 0
+    - _UseUIAlphaClip: 0
+    - _Width: 50
+    - _ZWrite: 1
+    m_Colors:
+    - _Color: {r: 1, g: 1, b: 1, a: 1}
+    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+    - _WidthHeightRadius: {r: 354, g: 370, b: 40, a: 0}
 --- !u!1 &845512357
 GameObject:
   m_ObjectHideFlags: 0
@@ -300,92 +386,6 @@ Transform:
   m_Father: {fileID: 0}
   m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!21 &1043245393
-Material:
-  serializedVersion: 6
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: RoundedCornersTextureMaterial(Clone)
-  m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3}
-  m_ShaderKeywords: 
-  m_LightmapFlags: 4
-  m_EnableInstancingVariants: 0
-  m_DoubleSidedGI: 0
-  m_CustomRenderQueue: -1
-  stringTagMap: {}
-  disabledShaderPasses: []
-  m_SavedProperties:
-    serializedVersion: 3
-    m_TexEnvs:
-    - _BumpMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _DetailAlbedoMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _DetailMask:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _DetailNormalMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _EmissionMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _MainTex:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _MetallicGlossMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _OcclusionMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _ParallaxMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    m_Floats:
-    - _BumpScale: 1
-    - _ColorMask: 15
-    - _Cutoff: 0.5
-    - _DetailNormalMapScale: 1
-    - _DstBlend: 0
-    - _GlossMapScale: 1
-    - _Glossiness: 0.5
-    - _GlossyReflections: 1
-    - _Height: 50
-    - _Metallic: 0
-    - _Mode: 0
-    - _OcclusionStrength: 1
-    - _Parallax: 0.02
-    - _Radius: 15
-    - _SmoothnessTextureChannel: 0
-    - _SpecularHighlights: 1
-    - _SrcBlend: 1
-    - _Stencil: 0
-    - _StencilComp: 8
-    - _StencilOp: 0
-    - _StencilReadMask: 255
-    - _StencilWriteMask: 255
-    - _UVSec: 0
-    - _UseUIAlphaClip: 0
-    - _Width: 50
-    - _ZWrite: 1
-    m_Colors:
-    - _Color: {r: 1, g: 1, b: 1, a: 1}
-    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
-    - _WidthHeightRadius: {r: 52, g: 16, b: 16, a: 0}
 --- !u!1 &1079865532
 GameObject:
   m_ObjectHideFlags: 0
@@ -429,263 +429,6 @@ Transform:
   m_Father: {fileID: 0}
   m_RootOrder: 5
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!21 &1155198031
-Material:
-  serializedVersion: 6
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: IndependentCornersMaterial(Clone)
-  m_Shader: {fileID: 4800000, guid: d3beb88e61f88ca4393acdefb005fa70, type: 3}
-  m_ShaderKeywords: 
-  m_LightmapFlags: 4
-  m_EnableInstancingVariants: 0
-  m_DoubleSidedGI: 0
-  m_CustomRenderQueue: -1
-  stringTagMap: {}
-  disabledShaderPasses: []
-  m_SavedProperties:
-    serializedVersion: 3
-    m_TexEnvs:
-    - _BumpMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _DetailAlbedoMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _DetailMask:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _DetailNormalMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _EmissionMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _MainTex:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _MetallicGlossMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _OcclusionMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _ParallaxMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    m_Floats:
-    - _BumpScale: 1
-    - _ColorMask: 15
-    - _Cutoff: 0.5
-    - _DetailNormalMapScale: 1
-    - _DstBlend: 0
-    - _GlossMapScale: 1
-    - _Glossiness: 0.5
-    - _GlossyReflections: 1
-    - _Metallic: 0
-    - _Mode: 0
-    - _OcclusionStrength: 1
-    - _Parallax: 0.02
-    - _SmoothnessTextureChannel: 0
-    - _SpecularHighlights: 1
-    - _SrcBlend: 1
-    - _Stencil: 0
-    - _StencilComp: 8
-    - _StencilOp: 0
-    - _StencilReadMask: 255
-    - _StencilWriteMask: 255
-    - _UVSec: 0
-    - _UseUIAlphaClip: 0
-    - _ZWrite: 1
-    m_Colors:
-    - _Color: {r: 1, g: 1, b: 1, a: 1}
-    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
-    - _halfSize: {r: 18, g: 18, b: 0, a: 0}
-    - _r: {r: 0, g: 10, b: 0, a: 10}
-    - _rect2props: {r: 0.0000019073486, g: -0.000002861023, b: 25.455845, a: 18.384777}
---- !u!21 &1262593795
-Material:
-  serializedVersion: 6
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: RoundedCornersTextureMaterial(Clone)
-  m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3}
-  m_ShaderKeywords: 
-  m_LightmapFlags: 4
-  m_EnableInstancingVariants: 0
-  m_DoubleSidedGI: 0
-  m_CustomRenderQueue: -1
-  stringTagMap: {}
-  disabledShaderPasses: []
-  m_SavedProperties:
-    serializedVersion: 3
-    m_TexEnvs:
-    - _BumpMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _DetailAlbedoMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _DetailMask:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _DetailNormalMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _EmissionMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _MainTex:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _MetallicGlossMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _OcclusionMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _ParallaxMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    m_Floats:
-    - _BumpScale: 1
-    - _ColorMask: 15
-    - _Cutoff: 0.5
-    - _DetailNormalMapScale: 1
-    - _DstBlend: 0
-    - _GlossMapScale: 1
-    - _Glossiness: 0.5
-    - _GlossyReflections: 1
-    - _Height: 50
-    - _Metallic: 0
-    - _Mode: 0
-    - _OcclusionStrength: 1
-    - _Parallax: 0.02
-    - _Radius: 15
-    - _SmoothnessTextureChannel: 0
-    - _SpecularHighlights: 1
-    - _SrcBlend: 1
-    - _Stencil: 0
-    - _StencilComp: 8
-    - _StencilOp: 0
-    - _StencilReadMask: 255
-    - _StencilWriteMask: 255
-    - _UVSec: 0
-    - _UseUIAlphaClip: 0
-    - _Width: 50
-    - _ZWrite: 1
-    m_Colors:
-    - _Color: {r: 1, g: 1, b: 1, a: 1}
-    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
-    - _WidthHeightRadius: {r: 42, g: 16, b: 16, a: 0}
---- !u!21 &1274966330
-Material:
-  serializedVersion: 6
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: RoundedCornersTextureMaterial(Clone)
-  m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3}
-  m_ShaderKeywords: 
-  m_LightmapFlags: 4
-  m_EnableInstancingVariants: 0
-  m_DoubleSidedGI: 0
-  m_CustomRenderQueue: -1
-  stringTagMap: {}
-  disabledShaderPasses: []
-  m_SavedProperties:
-    serializedVersion: 3
-    m_TexEnvs:
-    - _BumpMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _DetailAlbedoMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _DetailMask:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _DetailNormalMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _EmissionMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _MainTex:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _MetallicGlossMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _OcclusionMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _ParallaxMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    m_Floats:
-    - _BumpScale: 1
-    - _ColorMask: 15
-    - _Cutoff: 0.5
-    - _DetailNormalMapScale: 1
-    - _DstBlend: 0
-    - _GlossMapScale: 1
-    - _Glossiness: 0.5
-    - _GlossyReflections: 1
-    - _Height: 50
-    - _Metallic: 0
-    - _Mode: 0
-    - _OcclusionStrength: 1
-    - _Parallax: 0.02
-    - _Radius: 15
-    - _SmoothnessTextureChannel: 0
-    - _SpecularHighlights: 1
-    - _SrcBlend: 1
-    - _Stencil: 0
-    - _StencilComp: 8
-    - _StencilOp: 0
-    - _StencilReadMask: 255
-    - _StencilWriteMask: 255
-    - _UVSec: 0
-    - _UseUIAlphaClip: 0
-    - _Width: 50
-    - _ZWrite: 1
-    m_Colors:
-    - _Color: {r: 1, g: 1, b: 1, a: 1}
-    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
-    - _WidthHeightRadius: {r: 242, g: 262, b: 20, a: 0}
 --- !u!1 &1362042230
 GameObject:
   m_ObjectHideFlags: 0
@@ -922,342 +665,137 @@ Transform:
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 48.593002, y: -4.8190002, z: -6.4140005}
---- !u!21 &1945109192
+--- !u!1001 &245658336666613256
-Material:
-  serializedVersion: 6
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: IndependentCornersMaterial(Clone)
-  m_Shader: {fileID: 4800000, guid: d3beb88e61f88ca4393acdefb005fa70, type: 3}
-  m_ShaderKeywords: 
-  m_LightmapFlags: 4
-  m_EnableInstancingVariants: 0
-  m_DoubleSidedGI: 0
-  m_CustomRenderQueue: -1
-  stringTagMap: {}
-  disabledShaderPasses: []
-  m_SavedProperties:
-    serializedVersion: 3
-    m_TexEnvs:
-    - _BumpMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _DetailAlbedoMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _DetailMask:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _DetailNormalMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _EmissionMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _MainTex:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _MetallicGlossMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _OcclusionMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _ParallaxMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    m_Floats:
-    - _BumpScale: 1
-    - _ColorMask: 15
-    - _Cutoff: 0.5
-    - _DetailNormalMapScale: 1
-    - _DstBlend: 0
-    - _GlossMapScale: 1
-    - _Glossiness: 0.5
-    - _GlossyReflections: 1
-    - _Metallic: 0
-    - _Mode: 0
-    - _OcclusionStrength: 1
-    - _Parallax: 0.02
-    - _SmoothnessTextureChannel: 0
-    - _SpecularHighlights: 1
-    - _SrcBlend: 1
-    - _Stencil: 0
-    - _StencilComp: 8
-    - _StencilOp: 0
-    - _StencilReadMask: 255
-    - _StencilWriteMask: 255
-    - _UVSec: 0
-    - _UseUIAlphaClip: 0
-    - _ZWrite: 1
-    m_Colors:
-    - _Color: {r: 1, g: 1, b: 1, a: 1}
-    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
-    - _halfSize: {r: 121, g: 76, b: 0, a: 0}
-    - _r: {r: 0, g: 0, b: 10, a: 10}
-    - _rect2props: {r: 0.000022888184, g: 5, b: 135.76451, a: 135.76451}
---- !u!21 &2059688514
-Material:
-  serializedVersion: 6
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: IndependentCornersMaterial(Clone)
-  m_Shader: {fileID: 4800000, guid: d3beb88e61f88ca4393acdefb005fa70, type: 3}
-  m_ShaderKeywords: 
-  m_LightmapFlags: 4
-  m_EnableInstancingVariants: 0
-  m_DoubleSidedGI: 0
-  m_CustomRenderQueue: -1
-  stringTagMap: {}
-  disabledShaderPasses: []
-  m_SavedProperties:
-    serializedVersion: 3
-    m_TexEnvs:
-    - _BumpMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _DetailAlbedoMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _DetailMask:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _DetailNormalMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _EmissionMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _MainTex:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _MetallicGlossMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _OcclusionMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _ParallaxMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    m_Floats:
-    - _BumpScale: 1
-    - _ColorMask: 15
-    - _Cutoff: 0.5
-    - _DetailNormalMapScale: 1
-    - _DstBlend: 0
-    - _GlossMapScale: 1
-    - _Glossiness: 0.5
-    - _GlossyReflections: 1
-    - _Metallic: 0
-    - _Mode: 0
-    - _OcclusionStrength: 1
-    - _Parallax: 0.02
-    - _SmoothnessTextureChannel: 0
-    - _SpecularHighlights: 1
-    - _SrcBlend: 1
-    - _Stencil: 0
-    - _StencilComp: 8
-    - _StencilOp: 0
-    - _StencilReadMask: 255
-    - _StencilWriteMask: 255
-    - _UVSec: 0
-    - _UseUIAlphaClip: 0
-    - _ZWrite: 1
-    m_Colors:
-    - _Color: {r: 1, g: 1, b: 1, a: 1}
-    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
-    - _halfSize: {r: 121, g: 55, b: 0, a: 0}
-    - _r: {r: 10, g: 10, b: 0, a: 0}
-    - _rect2props: {r: 0.000022888184, g: -5, b: 120.91527, a: 120.91527}
---- !u!1001 &7004216018171998948
 PrefabInstance:
   m_ObjectHideFlags: 0
   serializedVersion: 2
   m_Modification:
     m_TransformParent: {fileID: 1678571401}
     m_Modifications:
-    - target: {fileID: 979205245676435723, guid: edc776247d121174886c75e616e948a7,
+    - target: {fileID: 245658336711370113, guid: cb6e4df8333395042a0b47930ac1b5d9,
-        type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2592605196065449834, guid: edc776247d121174886c75e616e948a7,
-        type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2924335661984989294, guid: edc776247d121174886c75e616e948a7,
         type: 3}
       propertyPath: m_Material
       value: 
-      objectReference: {fileID: 1155198031}
+      objectReference: {fileID: 535438819}
-    - target: {fileID: 2924335662022809978, guid: edc776247d121174886c75e616e948a7,
+    - target: {fileID: 245658337100488342, guid: cb6e4df8333395042a0b47930ac1b5d9,
-        type: 3}
-      propertyPath: m_Material
-      value: 
-      objectReference: {fileID: 2059688514}
-    - target: {fileID: 2938177232169860251, guid: edc776247d121174886c75e616e948a7,
-        type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2938177233240175763, guid: edc776247d121174886c75e616e948a7,
-        type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 3490102416507399550, guid: edc776247d121174886c75e616e948a7,
-        type: 3}
-      propertyPath: m_Material
-      value: 
-      objectReference: {fileID: 1043245393}
-    - target: {fileID: 4853639132110315361, guid: edc776247d121174886c75e616e948a7,
-        type: 3}
-      propertyPath: m_Material
-      value: 
-      objectReference: {fileID: 1262593795}
-    - target: {fileID: 6314295579284939921, guid: edc776247d121174886c75e616e948a7,
-        type: 3}
-      propertyPath: m_Material
-      value: 
-      objectReference: {fileID: 1945109192}
-    - target: {fileID: 7004216018333768314, guid: edc776247d121174886c75e616e948a7,
         type: 3}
       propertyPath: m_Name
-      value: StartRideModal
+      value: AppleInfoModal
       objectReference: {fileID: 0}
-    - target: {fileID: 7004216018333768315, guid: edc776247d121174886c75e616e948a7,
+    - target: {fileID: 245658337100488343, guid: cb6e4df8333395042a0b47930ac1b5d9,
         type: 3}
       propertyPath: m_Pivot.x
       value: 0.5
       objectReference: {fileID: 0}
-    - target: {fileID: 7004216018333768315, guid: edc776247d121174886c75e616e948a7,
+    - target: {fileID: 245658337100488343, guid: cb6e4df8333395042a0b47930ac1b5d9,
         type: 3}
       propertyPath: m_Pivot.y
       value: 0.5
       objectReference: {fileID: 0}
-    - target: {fileID: 7004216018333768315, guid: edc776247d121174886c75e616e948a7,
+    - target: {fileID: 245658337100488343, guid: cb6e4df8333395042a0b47930ac1b5d9,
         type: 3}
       propertyPath: m_RootOrder
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 7004216018333768315, guid: edc776247d121174886c75e616e948a7,
+    - target: {fileID: 245658337100488343, guid: cb6e4df8333395042a0b47930ac1b5d9,
         type: 3}
       propertyPath: m_AnchorMax.x
       value: 1
       objectReference: {fileID: 0}
-    - target: {fileID: 7004216018333768315, guid: edc776247d121174886c75e616e948a7,
+    - target: {fileID: 245658337100488343, guid: cb6e4df8333395042a0b47930ac1b5d9,
         type: 3}
       propertyPath: m_AnchorMax.y
       value: 1
       objectReference: {fileID: 0}
-    - target: {fileID: 7004216018333768315, guid: edc776247d121174886c75e616e948a7,
+    - target: {fileID: 245658337100488343, guid: cb6e4df8333395042a0b47930ac1b5d9,
         type: 3}
       propertyPath: m_AnchorMin.x
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 7004216018333768315, guid: edc776247d121174886c75e616e948a7,
+    - target: {fileID: 245658337100488343, guid: cb6e4df8333395042a0b47930ac1b5d9,
         type: 3}
       propertyPath: m_AnchorMin.y
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 7004216018333768315, guid: edc776247d121174886c75e616e948a7,
+    - target: {fileID: 245658337100488343, guid: cb6e4df8333395042a0b47930ac1b5d9,
         type: 3}
       propertyPath: m_SizeDelta.x
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 7004216018333768315, guid: edc776247d121174886c75e616e948a7,
+    - target: {fileID: 245658337100488343, guid: cb6e4df8333395042a0b47930ac1b5d9,
         type: 3}
       propertyPath: m_SizeDelta.y
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 7004216018333768315, guid: edc776247d121174886c75e616e948a7,
+    - target: {fileID: 245658337100488343, guid: cb6e4df8333395042a0b47930ac1b5d9,
         type: 3}
       propertyPath: m_LocalPosition.x
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 7004216018333768315, guid: edc776247d121174886c75e616e948a7,
+    - target: {fileID: 245658337100488343, guid: cb6e4df8333395042a0b47930ac1b5d9,
         type: 3}
       propertyPath: m_LocalPosition.y
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 7004216018333768315, guid: edc776247d121174886c75e616e948a7,
+    - target: {fileID: 245658337100488343, guid: cb6e4df8333395042a0b47930ac1b5d9,
         type: 3}
       propertyPath: m_LocalPosition.z
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 7004216018333768315, guid: edc776247d121174886c75e616e948a7,
+    - target: {fileID: 245658337100488343, guid: cb6e4df8333395042a0b47930ac1b5d9,
         type: 3}
       propertyPath: m_LocalRotation.w
       value: 1
       objectReference: {fileID: 0}
-    - target: {fileID: 7004216018333768315, guid: edc776247d121174886c75e616e948a7,
+    - target: {fileID: 245658337100488343, guid: cb6e4df8333395042a0b47930ac1b5d9,
         type: 3}
       propertyPath: m_LocalRotation.x
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 7004216018333768315, guid: edc776247d121174886c75e616e948a7,
+    - target: {fileID: 245658337100488343, guid: cb6e4df8333395042a0b47930ac1b5d9,
         type: 3}
       propertyPath: m_LocalRotation.y
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 7004216018333768315, guid: edc776247d121174886c75e616e948a7,
+    - target: {fileID: 245658337100488343, guid: cb6e4df8333395042a0b47930ac1b5d9,
         type: 3}
       propertyPath: m_LocalRotation.z
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 7004216018333768315, guid: edc776247d121174886c75e616e948a7,
+    - target: {fileID: 245658337100488343, guid: cb6e4df8333395042a0b47930ac1b5d9,
         type: 3}
       propertyPath: m_AnchoredPosition.x
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 7004216018333768315, guid: edc776247d121174886c75e616e948a7,
+    - target: {fileID: 245658337100488343, guid: cb6e4df8333395042a0b47930ac1b5d9,
         type: 3}
       propertyPath: m_AnchoredPosition.y
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 7004216018333768315, guid: edc776247d121174886c75e616e948a7,
+    - target: {fileID: 245658337100488343, guid: cb6e4df8333395042a0b47930ac1b5d9,
         type: 3}
       propertyPath: m_LocalEulerAnglesHint.x
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 7004216018333768315, guid: edc776247d121174886c75e616e948a7,
+    - target: {fileID: 245658337100488343, guid: cb6e4df8333395042a0b47930ac1b5d9,
         type: 3}
       propertyPath: m_LocalEulerAnglesHint.y
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 7004216018333768315, guid: edc776247d121174886c75e616e948a7,
+    - target: {fileID: 245658337100488343, guid: cb6e4df8333395042a0b47930ac1b5d9,
         type: 3}
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 8517746833879852125, guid: edc776247d121174886c75e616e948a7,
+    - target: {fileID: 5376657005773271520, guid: cb6e4df8333395042a0b47930ac1b5d9,
         type: 3}
-      propertyPath: m_Material
+      propertyPath: m_AnchoredPosition.x
-      value: 
+      value: 0
-      objectReference: {fileID: 1274966330}
+      objectReference: {fileID: 0}
+    - target: {fileID: 5376657006350838078, guid: cb6e4df8333395042a0b47930ac1b5d9,
+        type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: edc776247d121174886c75e616e948a7, type: 3}
+  m_SourcePrefab: {fileID: 100100000, guid: cb6e4df8333395042a0b47930ac1b5d9, type: 3}

Assets/Scripts/Apis/UserApi.cs

@@ -84,6 +84,12 @@ namespace Assets.Scripts.Apis
                 return new JsonResult<UserResultModel>() { result = false, data = null, errMsg = ret.errMsg };
             }
         }
+
+        public async Task<JsonResult<object>> AppleCompleteInfo(string phone, string Captcha, string pwd)
+        {
+            return await PostAsync<JsonResult<object>>("User/AppleCompleteInfo", new { phone, Captcha, pwd });
+        }
+
         public async Task<JsonResult<object>> LoginV1(string phone, string pwd, string countryCode)
         {
             var param = new
@@ -299,6 +305,12 @@ namespace Assets.Scripts.Apis
             return GetDataAfterSetCookie(r);
         }
 
+        public async Task<JsonResult<object>> OnAppleQuickLogin(string userId, string token)
+        {
+            var r = await PostAsync<JsonResult<object>>("NoAuth/v1/OnAppleQuickLogin", new { appleUserId = userId, token });
+            return GetDataAfterSetCookie(r);
+        }
+
         public async Task<JsonResult<object>> OnFacebookLoginCheck(string userId, string token)
         {
             var r = await PostAsync<JsonResult<object>>("NoAuth/v1/OnFacebookLoginCheck", new { faceBookUserId = userId, token });
@@ -341,5 +353,6 @@ namespace Assets.Scripts.Apis
             return r;
         }
 
+        
     }
 }

Assets/Scripts/Scenes/LoginController.cs

@@ -571,22 +571,15 @@ public class LoginController : BaseScene
         appleUserId = userId;
         appleToken = token;
         signType = 2;
-        var res = await ConfigHelper.userApi.OnAppleIdLoginCheck(userId, token);
+        var res = await ConfigHelper.userApi.OnAppleQuickLogin(userId, token);
         if (res.result) //判断是否成功登录
         {
             var data = JObject.FromObject(res.data);
-            if (data.ContainsKey("success") && data.Value<string>("success") == "False")
+            RefreshWx3(data.ToObject<UserResultModel>(), 1);
-            {
+            wxLogin3.gameObject.SetActive(true);
-                goSign();
+            signContainer.gameObject.SetActive(false);
-            }
+            pageNums = 3;
-            else 
+            StartScrollPanel(2);
-            {
-                RefreshWx3(data.ToObject<UserResultModel>(), 1);
-                wxLogin3.gameObject.SetActive(true);
-                signContainer.gameObject.SetActive(false);
-                pageNums = 3;
-                StartScrollPanel(2);
-            }
         }
         else 
         {

Assets/Scripts/UI/Prefab/Panel/UserInfoController.cs

@@ -16,7 +16,13 @@ public class UserInfoController : PFUIPanel
     {
         this.transform.localPosition = new Vector3(0, 0, 0);
         Button exitBtn = this.transform.Find("InfoPanel").Find("Button").GetComponent<Button>();
-
+        UIManager.AddEvent(transform.Find("InfoButton").gameObject, EventTriggerType.PointerClick, b =>
+        {
+            UIManager.ShowAppleInfoModal(() =>
+            {
+                Load();
+            });
+        });
         UIManager.AddEvent(exitBtn.gameObject, EventTriggerType.PointerClick, (b) =>
         {
             UIManager.ShowPrePanel();
@@ -101,10 +107,11 @@ public class UserInfoController : PFUIPanel
             Debug.Log(user.CanCreateRace);
             Utils.DisplayHead(infoPanel.Find("Avatar").GetComponent<RawImage>(), user.WxHeadImg);
 
+            transform.Find("InfoButton").gameObject.SetActive(string.IsNullOrEmpty(user.Phone));
             infoPanel.Find("Status").Find("Country").GetComponent<RawImage>().texture
                 = UIManager.Instance.loginRegOptions.GetCountryImageByName(user.Country);
-            infoPanel.Find("Status").Find("Wx").gameObject.SetActive(
+            //infoPanel.Find("Status").Find("Wx").gameObject.SetActive(
-               !string.IsNullOrEmpty(user.Unionid));
+            //   !string.IsNullOrEmpty(user.Unionid));
             infoPanel.Find("IdText").GetComponent<Text>().text = $"ID:{user.Id.ToString("000000")}";
             infoPanel.Find("NameText").GetComponent<Text>().text = $"{user.Nickname}";
             infoPanel.Find("EmailText").GetComponent<Text>().text = $"{user.Phone}";

Assets/Scripts/UIManager.cs

@@ -33,6 +33,8 @@ public class UIManager : MonoBehaviour
             this.mMainPanel = value;
         }
     }
+
+    
     public Canvas MainCanvas 
     {
         get 
@@ -232,6 +234,22 @@ public class UIManager : MonoBehaviour
         //UIManager.Show(UIManager.Instance.RaceListPanel, UIManager.Instance.MainPanel);
     }
 
+    //苹果完善信息
+    private AppleInfoController mAppleInfoController;
+    public AppleInfoController AppleInfoController
+    {
+        get
+        {
+            return this.GetPanelInstance("AppleInfoModal", ref this.mAppleInfoController);
+        }
+    }
+    public static void ShowAppleInfoModal(Action afterClose)
+    {
+        UIManager.Instance.AppleInfoController.afterClose = afterClose;
+        UIManager.Show(UIManager.Instance.AppleInfoController, null, true);
+    }
+
+
     public static void CloseConfirm3()
     {
         if (UIManager.Instance.confirm3 != null)

ProjectSettings/EditorBuildSettings.asset

@@ -6,8 +6,8 @@ EditorBuildSettings:
   serializedVersion: 2
   m_Scenes:
   - enabled: 1
-    path: Assets/Scenes/Login.unity
+    path: Assets/Scenes/Login-Mobile.unity
-    guid: 6dce3e17997730b4492f91dd8fede429
+    guid: 4be878da00cf764499988cf403faf94d
   - enabled: 1
     path: Assets/Scenes/MainScene.unity
     guid: ab586a3c1bacd4a48a55178eb06fe0cc

ProjectSettings/ProjectSettings.asset

@@ -179,7 +179,7 @@ PlayerSettings:
   applicationIdentifier:
     Android: com.ZhiXingPai.PowerFunUnity
   buildNumber:
-    iPhone: 2.1.2.1
+    iPhone: 2.1.2.3
   AndroidBundleVersionCode: 16
   AndroidMinSdkVersion: 24
   AndroidTargetSdkVersion: 30