增加第三方信息绑定，修改细节

2022-01-12 18:16:17 +08:00 · 2022-01-12 18:16:17 +08:00 · c53fbffe55
commit c53fbffe55
parent 02111a57b1
7 changed files with 34 additions and 23 deletions
--- a/Assets/Resources/UI/Prefab/Panel/Mobile/EditUserPanel.prefab
+++ b/Assets/Resources/UI/Prefab/Panel/Mobile/EditUserPanel.prefab
@ -638,6 +638,7 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: 6d865b6d0ecb54044a4600bc590d8c29, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
+  newNav: {fileID: 0}
 --- !u!1 &1273472110172321477
 GameObject:
  m_ObjectHideFlags: 0
@ -858,7 +859,7 @@ RectTransform:
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children: []
  m_Father: {fileID: 1569894540830352816}
-  m_RootOrder: 1
+  m_RootOrder: 3
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0, y: 0}
  m_AnchorMax: {x: 0, y: 0}
@ -1858,9 +1859,9 @@ RectTransform:
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children:
  - {fileID: 1569894539194797782}
-  - {fileID: 1569894539192063988}
-  - {fileID: 1569894539226892726}
  - {fileID: 1569894541186943689}
+  - {fileID: 1569894539226892726}
+  - {fileID: 1569894539192063988}
  m_Father: {fileID: 956475306156679521}
  m_RootOrder: 7
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -2132,7 +2133,7 @@ RectTransform:
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children: []
  m_Father: {fileID: 1569894540830352816}
-  m_RootOrder: 3
+  m_RootOrder: 1
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0, y: 0}
  m_AnchorMax: {x: 0, y: 0}
--- a/Assets/Resources/UI/Prefab/Panel/Mobile/UserInfoPanel.prefab
+++ b/Assets/Resources/UI/Prefab/Panel/Mobile/UserInfoPanel.prefab
@ -2300,6 +2300,7 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: d53c11af00252ab409587459f4a0f3f6, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
+  newNav: {fileID: 0}
 --- !u!222 &1298315926268858870
 CanvasRenderer:
  m_ObjectHideFlags: 0
@ -3318,7 +3319,7 @@ GameObject:
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &6411762837365507617
 RectTransform:
  m_ObjectHideFlags: 0
@ -3333,9 +3334,9 @@ RectTransform:
  m_Father: {fileID: 6411762836704884641}
  m_RootOrder: 1
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 0, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 30, y: -8}
  m_SizeDelta: {x: 16, y: 16}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6411762837365507623
--- a/Assets/Resources/UI/Prefab/Panel/UserInfoPanel.prefab
+++ b/Assets/Resources/UI/Prefab/Panel/UserInfoPanel.prefab
@ -2357,6 +2357,7 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: d53c11af00252ab409587459f4a0f3f6, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
+  newNav: {fileID: 0}
 --- !u!222 &1298315926268858870
 CanvasRenderer:
  m_ObjectHideFlags: 0
@ -3337,7 +3338,7 @@ GameObject:
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &6411762837365507617
 RectTransform:
  m_ObjectHideFlags: 0
@ -3352,9 +3353,9 @@ RectTransform:
  m_Father: {fileID: 6411762836704884641}
  m_RootOrder: 1
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 0, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 46, y: -12}
  m_SizeDelta: {x: 24, y: 24}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6411762837365507623
--- a/Assets/Resources/UI/language.json
+++ b/Assets/Resources/UI/language.json
@ -615,7 +615,7 @@
    "View All": "View All",
    "ABOUT": "ABOUT",
    "No Net": "No Net",
-    "PERFECT INFORMATION": "PERFECT INFORMATION",
+    "PERFECT INFORMATION": "COMPLETE INFORMATION",
    "Distance King": "Distance King",
    "Power King": "Power King",
    "Climbing King": "Climbing King",
--- a/Assets/Scripts/App.cs
+++ b/Assets/Scripts/App.cs
@ -19,7 +19,7 @@ public delegate void ChangeLanguageDelegate();

 public static class App
 {
-    public static string Host = "http://192.168.0.101:5084/";
+    public static string Host = "http://192.168.0.101:5083/";

    public static string AppVersion = Application.version;

@ -190,18 +190,18 @@ public static class App
        InitLanguage();
 #if !UNITY_EDITOR
      //测试服务器
-      Host = "http://pf.juze.pro/";
-      UdpAddress = new IPEndPoint(IPAddress.Parse("47.97.84.8"), 21000);
-      TcpAddress = new IPEndPoint(IPAddress.Parse("47.97.84.8"), 21001);
+      //Host = "http://pf.juze.pro/";
+      //UdpAddress = new IPEndPoint(IPAddress.Parse("47.97.84.8"), 21000);
+      //TcpAddress = new IPEndPoint(IPAddress.Parse("47.97.84.8"), 21001);
      //线上
-        //Host = "https://wx.powerfun.com.cn/";
-        //UdpAddress = new IPEndPoint(IPAddress.Parse("47.97.84.8"), 11000);
-        //TcpAddress = new IPEndPoint(IPAddress.Parse("47.97.84.8"), 11001);
+        Host = "https://wx.powerfun.com.cn/";
+        UdpAddress = new IPEndPoint(IPAddress.Parse("47.97.84.8"), 11000);
+        TcpAddress = new IPEndPoint(IPAddress.Parse("47.97.84.8"), 11001);
        //本地
        //Host = "http://192.168.0.101:5085/";
        //UdpAddress = new IPEndPoint(IPAddress.Parse("192.168.0.97"), 11000);
        //TcpAddress = new IPEndPoint(IPAddress.Parse("192.168.0.102"), 21001);
-        //Debug.unityLogger.logEnabled = false;
+        Debug.unityLogger.logEnabled = false;
 #else 
        //Host = "http://pf.juze.pro/";
        //Host = "http://192.168.0.101:5087/";
--- a/Assets/Scripts/UI/Prefab/Panel/EditUserController.cs
+++ b/Assets/Scripts/UI/Prefab/Panel/EditUserController.cs
@ -284,6 +284,14 @@ public class EditUserController : PFUIPanel, INativeOnMobileImageSelect
            string.IsNullOrEmpty(currentUser.Unionid)
            ? Resources.Load<Sprite>("Images/Wechat_person_0")
            : Resources.Load<Sprite>("Images/Wechat_person_1");
+        linkContainer.Find("Fb").GetComponent<Image>().sprite =
+            string.IsNullOrEmpty(currentUser.FacebookUserId)
+            ? Resources.Load<Sprite>("Images/link-facebook")
+            : Resources.Load<Sprite>("Images/Login_Facebook");
+        linkContainer.Find("Ap").GetComponent<Image>().sprite =
+            string.IsNullOrEmpty(currentUser.AppleUserId)
+            ? Resources.Load<Sprite>("Images/link-apple")
+            : Resources.Load<Sprite>("Images/Login_Apple");
    }
    // Start is called before the first frame update
    protected override void Start()
--- a/ProjectSettings/EditorBuildSettings.asset
+++ b/ProjectSettings/EditorBuildSettings.asset
@ -6,8 +6,8 @@ EditorBuildSettings:
  serializedVersion: 2
  m_Scenes:
  - enabled: 1
-    path: Assets/Scenes/Login-Mobile.unity
-    guid: 4be878da00cf764499988cf403faf94d
+    path: Assets/Scenes/Login.unity
+    guid: 6dce3e17997730b4492f91dd8fede429
  - enabled: 1
    path: Assets/Scenes/MainScene.unity
    guid: ab586a3c1bacd4a48a55178eb06fe0cc