工具栏问题修改，中文

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

@@ -57,6 +57,8 @@ GameObject:
   - component: {fileID: 1204184041306570108}
   - component: {fileID: 6241200257939278553}
   - component: {fileID: 1901175034002257139}
+  - component: {fileID: 352352729889857952}
+  - component: {fileID: 6046467388211646977}
   m_Layer: 5
   m_Name: Text
   m_TagString: Untagged
@@ -124,6 +126,62 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: NO RIDERS
+--- !u!114 &352352729889857952
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 835134348180586308}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 1
+  m_Colors:
+    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 0}
+    m_SelectedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_SelectedTrigger: Selected
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 1901175034002257139}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
+--- !u!114 &6046467388211646977
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 835134348180586308}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: e47f6ee11b78f3247a0b474b6c36e2cd, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  key: 
 --- !u!1 &1089974325122592620
 GameObject:
   m_ObjectHideFlags: 0

Assets/Resources/UI/language.json

@@ -313,7 +313,8 @@
     "Climbing King": "爬坡王",
     "WAIT": "稍后",
     "RIDERS": "骑行人数",
-    "Current ride distance too short to save.": "当前骑行距离过短无法保存"
+    "Current ride distance too short to save.": "当前骑行距离过短无法保存",
+    "NO RIDERS": "暂无用户"
   },
   "en": {
     "HOT ROUTES": "HOT ROUTES",
@@ -621,6 +622,7 @@
     "Climbing King": "Climbing King",
     "WAIT": "WAIT",
     "RIDERS": "RIDERS",
-    "Current ride distance too short to save.": "Current ride distance too short to save."
+    "Current ride distance too short to save.": "Current ride distance too short to save.",
+    "NO RIDERS": "NO RIDERS"
   }
 }

Assets/Scripts/App.cs

@@ -205,8 +205,8 @@ public static class App
 #else 
         //Host = "http://pf.juze.pro/";
         //Host = "http://192.168.0.101:5087/";
-        UdpAddress = new IPEndPoint(IPAddress.Parse("47.97.84.8"), 21000);
+        UdpAddress = new IPEndPoint(IPAddress.Parse("47.97.84.8"), 11000);
-        TcpAddress = new IPEndPoint(IPAddress.Parse("47.97.84.8"), 21001);
+        TcpAddress = new IPEndPoint(IPAddress.Parse("47.97.84.8"), 11001);
         //UdpAddress = new IPEndPoint(IPAddress.Parse("192.168.0.102"), 21001);
         //TcpAddress = new IPEndPoint(IPAddress.Parse("192.168.0.102"), 21001);
 #endif

Assets/Scripts/Scenes/MainController.cs

@@ -391,11 +391,20 @@ public class MainController : BaseScene
     float emptyt = 0;//用于无消息计时
     float t = 1f;
     float scanTicks = 0;
+    float clearcachet = 30;
     // Update is called once per frame
     protected override void Update()
     {
         base.Update();
-        
+
+        clearcachet -= Time.deltaTime;
+        if (clearcachet <= 0) 
+        {
+            Debug.Log("清一次");
+            Resources.UnloadUnusedAssets();
+            GC.Collect();
+            clearcachet = 30;
+        }
         if (App.canvasWidth != transform.GetComponent<RectTransform>().sizeDelta.x) 
         {
             App.canvasWidth = transform.GetComponent<RectTransform>().sizeDelta.x;

Assets/Scripts/UI/Control/PfUIButton.cs

@@ -10,6 +10,8 @@ using UnityEngine.Events;
 using DG.Tweening;
 using System.Timers;
 using System.Collections;
+using DG.Tweening.Core;
+using DG.Tweening.Plugins.Options;
 
 namespace Assets.Scripts.UI.Control
 {
@@ -33,6 +35,9 @@ namespace Assets.Scripts.UI.Control
         private Outline outline;
         private Button mButton;
         private Sequence se = null;
+        private Sequence a;
+        private TweenerCore<float, float, FloatOptions> b;
+        private TweenerCore<float, float, FloatOptions> c;
 
         protected void Awake()
         {
@@ -146,7 +151,7 @@ namespace Assets.Scripts.UI.Control
                 if (!string.IsNullOrWhiteSpace(Tooltips) && showTooltip)
                 {
 #endif
-
+                    
                     //tooltips.SetActive(true);
                     //tooltips.GetComponent<CanvasGroup>().DOFade(1, 0.5f);
 
@@ -157,12 +162,13 @@ namespace Assets.Scripts.UI.Control
                     se.SetDelay(1);
                     se.AppendCallback(() =>
                     {
-                        DOTween.Complete(tooltips,true);
+                        if(a!=null) a.Complete(true);
+                        if (b != null) b.Complete(true);
                         tooltips.SetActive(true);
                         tooltips.GetComponent<CanvasGroup>().alpha = 0f;
-                        tooltips.GetComponent<CanvasGroup>().DOFade(1, 0.5f);
+                        c = tooltips.GetComponent<CanvasGroup>().DOFade(1, 0.5f);
                     });
-                    se.Play();
+                    a = se.Play();
                     //StartCoroutine(DelayShowTooltip());
                     //timer.Start();
                 }
@@ -200,9 +206,11 @@ namespace Assets.Scripts.UI.Control
 #else
                 if (!string.IsNullOrWhiteSpace(Tooltips) && showTooltip)
                 {
-#endif          
+#endif
-                    DOTween.Complete(tooltips,true);
+                    if (a != null) a.Complete(true);
-                    group.DOFade(0, 1f).onComplete += () => {
+                    if (c != null) c.Complete(true);
+                    b = group.DOFade(0, 1f);
+                    b.onComplete += () => {
                         tooltips.SetActive(false);
                     };
                 }
@@ -234,8 +242,11 @@ namespace Assets.Scripts.UI.Control
             UIManager.AddEvent(this.gameObject, EventTriggerType.PointerDown, new UnityEngine.Events.UnityAction<BaseEventData>(e =>
             {
                 if (!this.isActiveAndEnabled) return;
-                DOTween.Complete(tooltips,true);
+                if (a != null) a.Complete(true);
+                if (b != null) b.Complete(true);
+                if (c != null) c.Complete(true);
                 tooltips.SetActive(false);
+
                 //else
                 //{
                 //    DOTween.CompleteAll(true);

ProjectSettings/AndroidResolverDependencies.xml

@@ -22,7 +22,7 @@
     <setting name="packageDir" value="Assets/Plugins/Android" />
     <setting name="patchAndroidManifest" value="True" />
     <setting name="patchMainTemplateGradle" value="True" />
-    <setting name="projectExportEnabled" value="True" />
+    <setting name="projectExportEnabled" value="False" />
     <setting name="useJetifier" value="False" />
   </settings>
 </dependencies>

ProjectSettings/EditorBuildSettings.asset

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

ProjectSettings/GraphicsSettings.asset

@@ -38,7 +38,6 @@ GraphicsSettings:
   - {fileID: 16000, guid: 0000000000000000f000000000000000, type: 0}
   - {fileID: 16001, guid: 0000000000000000f000000000000000, type: 0}
   - {fileID: 17000, guid: 0000000000000000f000000000000000, type: 0}
-  - {fileID: 16003, guid: 0000000000000000f000000000000000, type: 0}
   m_PreloadedShaders: []
   m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000,
     type: 0}

ProjectSettings/ProjectSettings.asset

@@ -179,7 +179,7 @@ PlayerSettings:
   applicationIdentifier:
     Android: com.ZhiXingPai.PowerFunUnity
   buildNumber:
-    iPhone: 2.1.1.1
+    iPhone: 2.1.1.2
   AndroidBundleVersionCode: 15
   AndroidMinSdkVersion: 24
   AndroidTargetSdkVersion: 30