暂存

Assets/AppCenter/AppCenterBehavior.cs

@@ -10,7 +10,7 @@ using System.Linq;
 using Assets.Scenes.Ride.Scripts;
 
 [HelpURL("https://docs.microsoft.com/en-us/appcenter/sdk/crashes/unity")]
-public class AppCenterBehavior : MonoSingleton<AppCenterBehavior>
+public class AppCenterBehavior : MonoBehaviour
 {
     public static event Action InitializingServices;
     public static event Action InitializedAppCenterAndServices;
@@ -25,8 +25,8 @@ public class AppCenterBehavior : MonoSingleton<AppCenterBehavior>
         // Make sure that App Center have only one instance.
         if (_instance != null)
         {
-            //Debug.LogError("App Center Behavior should have only one instance!");
+            Debug.LogError("App Center Behavior should have only one instance!");
-            //DestroyImmediate(gameObject);
+            DestroyImmediate(gameObject);
             return;
         }
         _instance = this;

Assets/Resources/UI/Prefab/MainNav.prefab

@@ -158,7 +158,7 @@ PrefabInstance:
     - target: {fileID: 545917028276686471, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
         type: 3}
       propertyPath: m_SizeDelta.x
-      value: 0
+      value: 40
       objectReference: {fileID: 0}
     - target: {fileID: 545917028276686471, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
         type: 3}
@@ -204,7 +204,7 @@ PrefabInstance:
     - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
         type: 3}
       propertyPath: m_AnchorMax.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
         type: 3}
@@ -214,7 +214,7 @@ PrefabInstance:
     - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
         type: 3}
       propertyPath: m_AnchorMin.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
         type: 3}
@@ -264,12 +264,12 @@ PrefabInstance:
     - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
         type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 0
+      value: 172
       objectReference: {fileID: 0}
     - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
         type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 0
+      value: -32
       objectReference: {fileID: 0}
     - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
         type: 3}
@@ -291,15 +291,20 @@ PrefabInstance:
       propertyPath: m_Name
       value: Delay
       objectReference: {fileID: 0}
-    - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
+    - target: {fileID: 3150550772099312289, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
         type: 3}
-      propertyPath: m_AnchorMax.y
+      propertyPath: m_IsActive
       value: 0
       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: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
         type: 3}
@@ -309,7 +314,7 @@ PrefabInstance:
     - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
         type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 0
+      value: -9
       objectReference: {fileID: 0}
     - target: {fileID: 8688565590564084001, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
         type: 3}
@@ -505,12 +510,12 @@ PrefabInstance:
     - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
         type: 3}
       propertyPath: m_AnchorMax.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
         type: 3}
       propertyPath: m_AnchorMin.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
         type: 3}
@@ -520,7 +525,7 @@ PrefabInstance:
     - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
         type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 0
+      value: -9
       objectReference: {fileID: 0}
     - target: {fileID: 8688565590564084001, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
         type: 3}
@@ -686,12 +691,12 @@ PrefabInstance:
     - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
         type: 3}
       propertyPath: m_AnchorMax.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
         type: 3}
       propertyPath: m_AnchorMin.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
         type: 3}
@@ -701,7 +706,7 @@ PrefabInstance:
     - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
         type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 0
+      value: -9
       objectReference: {fileID: 0}
     - target: {fileID: 8688565590564084001, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
         type: 3}
@@ -892,12 +897,12 @@ PrefabInstance:
     - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
         type: 3}
       propertyPath: m_AnchorMax.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
         type: 3}
       propertyPath: m_AnchorMin.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
         type: 3}
@@ -912,7 +917,7 @@ PrefabInstance:
     - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
         type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 0
+      value: -2
       objectReference: {fileID: 0}
     - target: {fileID: 8688565590564084001, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
         type: 3}
@@ -1078,12 +1083,12 @@ PrefabInstance:
     - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
         type: 3}
       propertyPath: m_AnchorMax.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
         type: 3}
       propertyPath: m_AnchorMin.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
         type: 3}
@@ -1093,7 +1098,7 @@ PrefabInstance:
     - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
         type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 0
+      value: -9
       objectReference: {fileID: 0}
     - target: {fileID: 8688565590564084001, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
         type: 3}

Assets/Scripts/Apis/ApiBase.cs

@@ -31,13 +31,12 @@ namespace Assets.Scripts.Apis
         }
         //protected static EasyHttp.Http.HttpClient http;
         private static System.Net.Http.HttpClient httpClient;
-        private static PfHttpClientHandler httpClientHandler;
+        private static HttpClientHandler httpClientHandler;
         static ApiBase()
         {
             //http = new EasyHttp.Http.HttpClient();
             //http.Request.PersistCookies = true;
-
+            httpClientHandler = new HttpClientHandler();
-            httpClientHandler = new PfHttpClientHandler();
             httpClientHandler.AutomaticDecompression = DecompressionMethods.GZip | DecompressionMethods.Deflate;
             httpClientHandler.Proxy = WebRequest.GetSystemWebProxy();
             httpClientHandler.CookieContainer = _cookieCollection;

Assets/Scripts/Scenes/BaseScene.cs

@@ -17,8 +17,8 @@ namespace Assets.Scripts.Scenes
         {
             Debug.Log("base scene awake");
             Application.logMessageReceived += Application_logMessageReceived;
-            StopCoroutine("Ping");
+            //StopCoroutine("Ping");
-            StartCoroutine(Ping());
+            //StartCoroutine(Ping());
         }
 
         private IEnumerator Ping()
@@ -49,6 +49,7 @@ namespace Assets.Scripts.Scenes
         {
             MapUDPService.Dispose();
             App.MainDeviceAdapter.Dispose();
+            Debug.Log("i am Quit");
         }
 
         private void OnApplicationPause(bool focus)
@@ -64,19 +65,19 @@ namespace Assets.Scripts.Scenes
         }
         protected virtual void Update()
         {
-            if (Application.internetReachability == NetworkReachability.NotReachable)
+            //if (Application.internetReachability == NetworkReachability.NotReachable)
-            {
+            //{
-                isNetWorkLose = true;
+            //    isNetWorkLose = true;
-                App.delayTime = -1;
+            //    App.delayTime = -1;
-            }
+            //}
-            else if (null != ping && ping.isDone)
+            //else if (null != ping && ping.isDone)
-            {
+            //{
-                isNetWorkLose = false;
+            //    isNetWorkLose = false;
-                App.delayTime = ping.time;
+            //    App.delayTime = ping.time;
-                Debug.Log(App.delayTime);
+            //    Debug.Log(App.delayTime);
-                ping.DestroyPing();
+            //    ping.DestroyPing();
-                ping = null;
+            //    ping = null;
-            }
+            //}
         }
     }
 }

Assets/Scripts/Scenes/Ride/Scripts/PlayerController.cs

@@ -60,9 +60,9 @@ namespace Assets.Scenes.Ride.Scripts
 				cadance = mainController.UpdateCadence();
 				weight = App.CurrentUser.Weight;
 				bicycleWeight = App.CurrentUser.BicycleWeight;
-#if UNITY_EDITOR
+//#if UNITY_EDITOR
                 power = 343;
-#endif
+//#endif
                 mainController.TrackResistance(currentSlope * App.RideSetting.Sensitivity / 100);
 			}
 			catch (Exception ex)

ProjectSettings/ProjectSettings.asset

@@ -179,7 +179,7 @@ PlayerSettings:
   applicationIdentifier:
     Android: com.ZhiXingPai.PowerFunUnity
   buildNumber:
-    iPhone: 2.0.5.0
+    iPhone: 2.0.6.1
   AndroidBundleVersionCode: 8
   AndroidMinSdkVersion: 24
   AndroidTargetSdkVersion: 30
@@ -877,7 +877,7 @@ PlayerSettings:
   allowUnsafeCode: 0
   additionalIl2CppArgs: 
   scriptingRuntimeVersion: 1
-  gcIncremental: 0
+  gcIncremental: 1
   assemblyVersionValidation: 1
   gcWBarrierValidation: 0
   apiCompatibilityLevelPerPlatform:

ProjectSettings/QualitySettings.asset

@@ -4,7 +4,7 @@
 QualitySettings:
   m_ObjectHideFlags: 0
   serializedVersion: 5
-  m_CurrentQuality: 5
+  m_CurrentQuality: 2
   m_QualitySettings:
   - serializedVersion: 2
     name: Very Low
@@ -18,7 +18,7 @@ QualitySettings:
     shadowCascade2Split: 0.33333334
     shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667}
     shadowmaskMode: 0
-    blendWeights: 1
+    skinWeights: 1
     textureQuality: 1
     anisotropicTextures: 0
     antiAliasing: 0
@@ -40,6 +40,7 @@ QualitySettings:
     asyncUploadBufferSize: 16
     asyncUploadPersistentBuffer: 1
     resolutionScalingFixedDPIFactor: 1
+    customRenderPipeline: {fileID: 0}
     excludedTargetPlatforms: []
   - serializedVersion: 2
     name: Low
@@ -53,7 +54,7 @@ QualitySettings:
     shadowCascade2Split: 0.33333334
     shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667}
     shadowmaskMode: 0
-    blendWeights: 2
+    skinWeights: 2
     textureQuality: 0
     anisotropicTextures: 0
     antiAliasing: 0
@@ -75,6 +76,7 @@ QualitySettings:
     asyncUploadBufferSize: 16
     asyncUploadPersistentBuffer: 1
     resolutionScalingFixedDPIFactor: 1
+    customRenderPipeline: {fileID: 0}
     excludedTargetPlatforms: []
   - serializedVersion: 2
     name: Medium
@@ -88,7 +90,7 @@ QualitySettings:
     shadowCascade2Split: 0.33333334
     shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667}
     shadowmaskMode: 0
-    blendWeights: 2
+    skinWeights: 2
     textureQuality: 0
     anisotropicTextures: 1
     antiAliasing: 0
@@ -110,6 +112,7 @@ QualitySettings:
     asyncUploadBufferSize: 16
     asyncUploadPersistentBuffer: 1
     resolutionScalingFixedDPIFactor: 1
+    customRenderPipeline: {fileID: 0}
     excludedTargetPlatforms: []
   - serializedVersion: 2
     name: High
@@ -123,7 +126,7 @@ QualitySettings:
     shadowCascade2Split: 0.33333334
     shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667}
     shadowmaskMode: 1
-    blendWeights: 2
+    skinWeights: 2
     textureQuality: 0
     anisotropicTextures: 1
     antiAliasing: 0
@@ -145,6 +148,7 @@ QualitySettings:
     asyncUploadBufferSize: 16
     asyncUploadPersistentBuffer: 1
     resolutionScalingFixedDPIFactor: 1
+    customRenderPipeline: {fileID: 0}
     excludedTargetPlatforms: []
   - serializedVersion: 2
     name: Very High
@@ -158,7 +162,7 @@ QualitySettings:
     shadowCascade2Split: 0.33333334
     shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667}
     shadowmaskMode: 1
-    blendWeights: 4
+    skinWeights: 4
     textureQuality: 0
     anisotropicTextures: 2
     antiAliasing: 2
@@ -180,6 +184,7 @@ QualitySettings:
     asyncUploadBufferSize: 16
     asyncUploadPersistentBuffer: 1
     resolutionScalingFixedDPIFactor: 1
+    customRenderPipeline: {fileID: 0}
     excludedTargetPlatforms: []
   - serializedVersion: 2
     name: Ultra
@@ -193,7 +198,7 @@ QualitySettings:
     shadowCascade2Split: 0.33333334
     shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667}
     shadowmaskMode: 1
-    blendWeights: 4
+    skinWeights: 4
     textureQuality: 0
     anisotropicTextures: 2
     antiAliasing: 2
@@ -215,6 +220,7 @@ QualitySettings:
     asyncUploadBufferSize: 16
     asyncUploadPersistentBuffer: 1
     resolutionScalingFixedDPIFactor: 1
+    customRenderPipeline: {fileID: 0}
     excludedTargetPlatforms: []
   m_PerPlatformDefaultQuality:
     Android: 2