提交日志-20240726-1425：

1、新增了系统设置偏好设置； 2、修复了收起首页数据展板时右侧未正常隐藏的问题；
2024-07-26 14:24:47 +08:00 · 2024-07-26 14:24:47 +08:00 · 5347d6bb00
parent 13c72713a5
commit 5347d6bb00
15 changed files with 619 additions and 46 deletions
--- a/BulkCargo_UnityProject/Assets/Fonts/UIFont/SourceHanSansCN-Regular
+++ b/BulkCargo_UnityProject/Assets/Fonts/UIFont/SourceHanSansCN-Regular
--- a/BulkCargo_UnityProject/Assets/GameAssets/UITextures/福州海关散货系统（文件+切图）/0719/展开.png.meta
+++ b/BulkCargo_UnityProject/Assets/GameAssets/UITextures/福州海关散货系统（文件+切图）/0719/展开.png.meta
@ -113,6 +113,18 @@ TextureImporter:
    overridden: 0
    androidETC2FallbackOverride: 0
    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
  spriteSheet:
    serializedVersion: 2
    sprites: []
--- a/BulkCargo_UnityProject/Assets/GameAssets/UITextures/福州海关散货系统（文件+切图）/0719/本年度累计进口总量本季度进口总量.png.meta
+++ b/BulkCargo_UnityProject/Assets/GameAssets/UITextures/福州海关散货系统（文件+切图）/0719/本年度累计进口总量本季度进口总量.png.meta
@ -113,6 +113,18 @@ TextureImporter:
    overridden: 0
    androidETC2FallbackOverride: 0
    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
  spriteSheet:
    serializedVersion: 2
    sprites: []
--- a/BulkCargo_UnityProject/Assets/GameAssets/UITextures/福州海关散货系统（文件+切图）/icon-配置.png.meta
+++ b/BulkCargo_UnityProject/Assets/GameAssets/UITextures/福州海关散货系统（文件+切图）/icon-配置.png.meta
@ -101,6 +101,30 @@ TextureImporter:
    overridden: 0
    androidETC2FallbackOverride: 0
    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
  spriteSheet:
    serializedVersion: 2
    sprites: []
--- a/BulkCargo_UnityProject/Assets/GameAssets/UITextures/福州海关散货系统（文件+切图）/icon-配置.psd.meta
+++ b/BulkCargo_UnityProject/Assets/GameAssets/UITextures/福州海关散货系统（文件+切图）/icon-配置.psd.meta
@ -101,6 +101,30 @@ TextureImporter:
    overridden: 0
    androidETC2FallbackOverride: 0
    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
  spriteSheet:
    serializedVersion: 2
    sprites: []
--- a/BulkCargo_UnityProject/Assets/GameAssets/UITextures/福州海关散货系统（文件+切图）/切图/bg-弹窗-计量秤.png.meta
+++ b/BulkCargo_UnityProject/Assets/GameAssets/UITextures/福州海关散货系统（文件+切图）/切图/bg-弹窗-计量秤.png.meta
@ -101,6 +101,30 @@ TextureImporter:
    overridden: 0
    androidETC2FallbackOverride: 0
    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
  spriteSheet:
    serializedVersion: 2
    sprites: []
--- a/BulkCargo_UnityProject/Assets/GameAssets/UITextures/福州海关散货系统（文件+切图）/切图/icon-在库总量.png.meta
+++ b/BulkCargo_UnityProject/Assets/GameAssets/UITextures/福州海关散货系统（文件+切图）/切图/icon-在库总量.png.meta
@ -101,6 +101,30 @@ TextureImporter:
    overridden: 0
    androidETC2FallbackOverride: 0
    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
  spriteSheet:
    serializedVersion: 2
    sprites: []
--- a/BulkCargo_UnityProject/Assets/GameAssets/UITextures/福州海关散货系统（文件+切图）/切图/icon.png.meta
+++ b/BulkCargo_UnityProject/Assets/GameAssets/UITextures/福州海关散货系统（文件+切图）/切图/icon.png.meta
@ -101,6 +101,30 @@ TextureImporter:
    overridden: 0
    androidETC2FallbackOverride: 0
    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
  spriteSheet:
    serializedVersion: 2
    sprites: []
--- a/BulkCargo_UnityProject/Assets/GameAssets/UITextures/福州海关散货系统（文件+切图）/切图/分割线1.png.meta
+++ b/BulkCargo_UnityProject/Assets/GameAssets/UITextures/福州海关散货系统（文件+切图）/切图/分割线1.png.meta
@ -101,6 +101,30 @@ TextureImporter:
    overridden: 0
    androidETC2FallbackOverride: 0
    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
  spriteSheet:
    serializedVersion: 2
    sprites: []
--- a/BulkCargo_UnityProject/Assets/GameAssets/UITextures/福州海关散货系统（文件+切图）/切图/切换-折线1.png.meta
+++ b/BulkCargo_UnityProject/Assets/GameAssets/UITextures/福州海关散货系统（文件+切图）/切图/切换-折线1.png.meta
@ -101,6 +101,30 @@ TextureImporter:
    overridden: 0
    androidETC2FallbackOverride: 0
    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
  spriteSheet:
    serializedVersion: 2
    sprites: []
--- a/BulkCargo_UnityProject/Assets/GameAssets/UITextures/福州海关散货系统（文件+切图）/切图2/icon-退出.png.meta
+++ b/BulkCargo_UnityProject/Assets/GameAssets/UITextures/福州海关散货系统（文件+切图）/切图2/icon-退出.png.meta
@ -101,6 +101,30 @@ TextureImporter:
    overridden: 0
    androidETC2FallbackOverride: 0
    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
  spriteSheet:
    serializedVersion: 2
    sprites: []
--- a/BulkCargo_UnityProject/Assets/Scenes/MainScene.unity
+++ b/BulkCargo_UnityProject/Assets/Scenes/MainScene.unity
@ -5431,6 +5431,9 @@ GameObject:
  serializedVersion: 6
  m_Component:
  - component: {fileID: 518552549}
+  - component: {fileID: 518552552}
+  - component: {fileID: 518552551}
+  - component: {fileID: 518552550}
  m_Layer: 0
  m_Name: RightMask
  m_TagString: Untagged
@ -5459,6 +5462,57 @@ RectTransform:
  m_AnchoredPosition: {x: -34, y: 0}
  m_SizeDelta: {x: 330, y: 0}
  m_Pivot: {x: 1, y: 0.5}
+--- !u!114 &518552550
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 518552548}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_ShowMaskGraphic: 0
+--- !u!114 &518552551
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 518552548}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 0
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!222 &518552552
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 518552548}
+  m_CullTransparentMesh: 1
 --- !u!1 &521238988
 GameObject:
  m_ObjectHideFlags: 0
@ -13145,6 +13199,7 @@ GameObject:
  - component: {fileID: 1216416868}
  - component: {fileID: 1216416870}
  - component: {fileID: 1216416872}
+  - component: {fileID: 1216416873}
  m_Layer: 0
  m_Name: Main
  m_TagString: Untagged
@ -13215,6 +13270,18 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: 89ed40b0a4e35fa40b11028fed730f14, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
+--- !u!114 &1216416873
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1216416867}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d0d80b712e455ba48a12f60335fa765b, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1 &1220937512
 GameObject:
  m_ObjectHideFlags: 0
--- a/BulkCargo_UnityProject/Assets/Scripts/wj/Manager/GameManager.cs
+++ b/BulkCargo_UnityProject/Assets/Scripts/wj/Manager/GameManager.cs
@ -0,0 +1,23 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class GameManager : MonoBehaviour
+{
+    // Start is called before the first frame update
+    void Start()
+    {
+        if (PlayerPrefs.HasKey("nearClipPlane"))
+        {
+            ModelRoot.Instance.MainCamera.nearClipPlane = PlayerPrefs.GetFloat("nearClipPlane");
+        }
+        if (PlayerPrefs.HasKey("farClipPlane"))
+        {
+            ModelRoot.Instance.MainCamera.farClipPlane = PlayerPrefs.GetInt("farClipPlane");
+        }
+        if (PlayerPrefs.HasKey("QualityLevel"))
+        {
+            QualitySettings.SetQualityLevel(PlayerPrefs.GetInt("QualityLevel"));
+        }
+    }
+}
--- a/BulkCargo_UnityProject/Assets/Scripts/wj/Manager/GameManager.cs.meta
+++ b/BulkCargo_UnityProject/Assets/Scripts/wj/Manager/GameManager.cs.meta
@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: d0d80b712e455ba48a12f60335fa765b
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/BulkCargo_UnityProject/Assets/Scripts/wj/Manager/QualityManager.cs
+++ b/BulkCargo_UnityProject/Assets/Scripts/wj/Manager/QualityManager.cs
@ -27,6 +27,19 @@ public class QualityManager : UITool
    // Start is called before the first frame update
    void Start()
    {
+        if (PlayerPrefs.HasKey("nearClipPlane"))
+        {
+            CameraClippingPlanes_Near = PlayerPrefs.GetFloat("nearClipPlane");
+        }
+        if (PlayerPrefs.HasKey("farClipPlane"))
+        {
+            CameraClippingPlanes_Far = PlayerPrefs.GetInt("farClipPlane");
+        }
+        if (PlayerPrefs.HasKey("QualityLevel"))
+        {
+            QualityIndex = PlayerPrefs.GetInt("QualityLevel");
+        }
+
        //³õÊ¼»¯
        NearInput.text = CameraClippingPlanes_Near.ToString();
        NearSlider.value = CameraClippingPlanes_Near;
@ -94,6 +107,10 @@ public class QualityManager : UITool
            QualityIndex = RenderQualityDropdown.value;
            hasChanged = false;

+            PlayerPrefs.SetFloat("nearClipPlane", CameraClippingPlanes_Near);
+            PlayerPrefs.SetInt("farClipPlane", CameraClippingPlanes_Far);
+            PlayerPrefs.SetInt("QualityLevel", QualityIndex);
+
            gameObject.SetActive(false);
        });