中文调整

Assets/Resources/UI/Control/PFUIInputField.prefab

@@ -11,6 +11,7 @@ GameObject:
   - component: {fileID: 8306171861788952873}
   - component: {fileID: 3566600873913421943}
   - component: {fileID: 7204820797918493515}
+  - component: {fileID: 3933748842939903915}
   m_Layer: 5
   m_Name: Placeholder
   m_TagString: Untagged
@@ -78,6 +79,19 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: Enter text...
+--- !u!114 &3933748842939903915
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 92744388873403988}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: e47f6ee11b78f3247a0b474b6c36e2cd, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  key: 
 --- !u!1 &1827088261433348456
 GameObject:
   m_ObjectHideFlags: 0
@@ -89,6 +103,7 @@ GameObject:
   - component: {fileID: 8098460543711191387}
   - component: {fileID: 2612167359391694885}
   - component: {fileID: 7511924356665468489}
+  - component: {fileID: 8119156731135992212}
   m_Layer: 5
   m_Name: Text
   m_TagString: Untagged
@@ -156,6 +171,19 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: 
+--- !u!114 &8119156731135992212
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1827088261433348456}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: e47f6ee11b78f3247a0b474b6c36e2cd, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  key: 
 --- !u!1 &4589186191166513557
 GameObject:
   m_ObjectHideFlags: 0

Assets/Resources/UI/Prefab/Panel/EditUserPanel.prefab

@@ -179,7 +179,7 @@ MonoBehaviour:
     m_BestFit: 0
     m_MinSize: 1
     m_MaxSize: 40
-    m_Alignment: 4
+    m_Alignment: 3
     m_AlignByGeometry: 0
     m_RichText: 1
     m_HorizontalOverflow: 0
@@ -1364,7 +1364,7 @@ MonoBehaviour:
     m_BestFit: 0
     m_MinSize: 1
     m_MaxSize: 40
-    m_Alignment: 0
+    m_Alignment: 1
     m_AlignByGeometry: 0
     m_RichText: 1
     m_HorizontalOverflow: 0
@@ -3597,6 +3597,7 @@ GameObject:
   - component: {fileID: 5377764333629162855}
   - component: {fileID: 5377764333629162853}
   - component: {fileID: 5377764333629162852}
+  - component: {fileID: 6788729204167551342}
   m_Layer: 5
   m_Name: Text
   m_TagString: Untagged
@@ -3664,6 +3665,19 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: Nickname
+--- !u!114 &6788729204167551342
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5377764333629162854}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: e47f6ee11b78f3247a0b474b6c36e2cd, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  key: 
 --- !u!1 &5377764333894728495
 GameObject:
   m_ObjectHideFlags: 0

Assets/Resources/UI/Prefab/Panel/HomePanel.prefab

@@ -1451,6 +1451,11 @@ PrefabInstance:
       propertyPath: m_AnchoredPosition.y
       value: -500
       objectReference: {fileID: 0}
+    - target: {fileID: 5922912691081905187, guid: 652cdefe0475dfd429e5a7e92bc3fa31,
+        type: 3}
+      propertyPath: key
+      value: More
+      objectReference: {fileID: 0}
     - target: {fileID: 7275502706204060242, guid: 652cdefe0475dfd429e5a7e92bc3fa31,
         type: 3}
       propertyPath: m_Pivot.y

Assets/Scripts/Apis/ApiBase.cs

@@ -103,7 +103,7 @@ namespace Assets.Scripts.Apis
             //yield return request.Send();
 
             var client = new HttpClient(httpClientHandler);
-            client.DefaultRequestHeaders.Add("Language", "en");
+            //client.DefaultRequestHeaders.Add("Language", "en");
             HandleHeaders(client.DefaultRequestHeaders);
 
             var result = await client.GetByteArrayAsync(_url).ConfigureAwait(false);
@@ -123,6 +123,8 @@ namespace Assets.Scripts.Apis
             defaultRequestHeaders.UserAgent.Add(new ProductInfoHeaderValue("Unity", ConfigHelper.AppVersion));
 #endif
             defaultRequestHeaders.Add("deviceUniqueIdentifier", SystemInfo.deviceUniqueIdentifier);
+            defaultRequestHeaders.Remove("Language");
+            defaultRequestHeaders.Add("Language", App.GetLocalLanguage());
         }
 
         protected async Task<byte[]> GetUrlAsync(string url)

Assets/Scripts/Apis/JsonResult.cs

@@ -1,4 +1,5 @@
-using Newtonsoft.Json.Linq;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -14,6 +15,10 @@ namespace Assets.Scripts.Apis
         //public dynamic data { get; set; }
         public string errMsg { get; set; }
         public JArray errFieldMsg { get; set; }
+        public override string ToString()
+        {
+            return JsonConvert.SerializeObject(this);
+        }
     }
 
     public class JsonResult<T> : JsonResult

Assets/Scripts/App.cs

@@ -18,7 +18,7 @@ public delegate void ChangeLanguageDelegate();
 
 public static class App
 {
-    public static string Host = "http://192.168.0.102:5082/";
+    public static string Host = "http://192.168.0.101:5084/";
 
     public static string AppVersion = Application.version;
 
@@ -175,7 +175,7 @@ public static class App
         {
             App._IsRowerMode = bool.Parse(isRower);
         }
+        //App.ChangeLanguage("en");
         Screen.sleepTimeout = SleepTimeout.NeverSleep;
-        Debug.Log(SystemInfo.deviceUniqueIdentifier);
     }
 }

Assets/Scripts/Scenes/LoginController.cs

@@ -631,7 +631,9 @@ public class LoginController : BaseScene
     private void AdjustWxQrCode()
     {
 #if !(UNITY_IOS || UNITY_ANDROID)
-        wxBrowser.EvalJSCSP(@"
+        if (App.GetLocalLanguage() == "en")
+        {
+            wxBrowser.EvalJSCSP(@"
             document.getElementsByClassName('qrcode')[0].style.marginTop = 0;
             document.getElementsByClassName('title')[0].style.display = 'none';
             document.getElementById('wx_default_tip').childNodes[3].innerHTML = `""PowerFun""`;
@@ -640,6 +642,20 @@ public class LoginController : BaseScene
             document.body.style.transformOrigin = 'top left';
             document.body.style.transform = 'scale(0.85106382978)';
             document.body.style.padding = '0';").Done();
+        }
+        else 
+        {
+            wxBrowser.EvalJSCSP(@"
+            document.getElementsByClassName('qrcode')[0].style.marginTop = 0;
+            document.getElementsByClassName('title')[0].style.display = 'none';
+            document.getElementById('wx_default_tip').childNodes[1].innerHTML = `请使用微信扫描二维码登录`;
+            document.body.style.background = '#272732';
+            document.body.style.overflow = 'hidden';
+            document.body.style.transformOrigin = 'top left';
+            document.body.style.transform = 'scale(0.85106382978)';
+            document.body.style.padding = '0';").Done();
+        }
+        
 #endif
     }
     //浏览器加载回调

Assets/Scripts/UI/Control/PFUIText.cs

@@ -35,10 +35,10 @@ namespace Assets.Scripts.UI.Control
         }
         protected void Start()
         {
-            Debug.Log(text.text);
+            //Debug.Log(text.text);
             if (App.LanguageManager != null && App.LanguageManager.ContainsKey(key))
             {
-                Debug.Log(text.text);
+                //Debug.Log(text.text);
                 text.text = App.LanguageManager[key];
             }
             App.ChangeLanguageEvent += App_ChangeLanguageEvent;

Assets/Scripts/UI/Prefab/Device/ConnectDeviceModal.cs

@@ -83,7 +83,7 @@ public class ConnectDeviceModal : PFUIPanel
 
         UIManager.AddEvent(connectBtn.gameObject, EventTriggerType.PointerClick, new UnityEngine.Events.UnityAction<BaseEventData>(e =>
         {
-            if (!connectBtnText.text.Equals("DISCONNECT"))
+            if (!connectBtnText.text.Equals(App.GetLocalString("DISCONNECT")))
             {
                 foreach (var item in deviceList)
                 {
@@ -208,11 +208,13 @@ public class ConnectDeviceModal : PFUIPanel
                     var nontrainer = deviceItemObj.DeviceInfo.Sensor != SensorType.Trainer && SensorType != SensorType.Trainer && deviceItemObj.DeviceInfo.State == DeviceState.Connected;
                     if (trainer || nontrainer)
                     {
-                        connectBtnText.text = "DISCONNECT";
+                        connectBtnText.text = App.GetLocalString("DISCONNECT");
+                        connectBtnText.GetComponent<PFUIText>().key = "DISCONNECT";
                     }
                     else
                     {
-                        connectBtnText.text = "CONNECT";
+                        connectBtnText.text = App.GetLocalString("CONNECT");
+                        connectBtnText.GetComponent<PFUIText>().key = "CONNECT";
                     }
 
                     foreach (var item in deviceList)
@@ -248,10 +250,12 @@ public class ConnectDeviceModal : PFUIPanel
                     if(trainer || nontrainer)
                     {
                         connectBtnText.text = App.GetLocalString("DISCONNECT");
+                        connectBtnText.GetComponent<PFUIText>().key = "DISCONNECT";
                     }
                     else
                     {
                         connectBtnText.text = App.GetLocalString("CONNECT");
+                        connectBtnText.GetComponent<PFUIText>().key = "CONNECT";
                     }
                     //connectBtn.text.text = "DISCOUNECT";
                     noDevice.text = firstDevice.DeviceInfo.Name;

Assets/Scripts/UI/Prefab/Device/DeviceView.cs

@@ -286,7 +286,7 @@ public class DeviceView : MonoBehaviour
             else {
                 hasDevice = App.MainDeviceAdapter.GetDevices().Any(d => d.Sensor == SensorType);
             }
-            Debug.Log(hasDevice);
+            //Debug.Log(hasDevice);
             if (hasDevice)
             {
                 mSearchButton.SetActive(false);

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

@@ -128,6 +128,7 @@ public class EarthController : PFUIPanel
         map.OnCountryEnter += (int countryIndex, int regionIndex) =>
         {
             map.autoRotationSpeed = 0f;
+
             var country = map.countries[countryIndex];
             if (country.name.ToLower().Contains("taiwan"))
             {