Minor refactorings

ciroi · Mar 26, 2022 · 38971d9 · 38971d9
1 parent 3bb1fe2
commit 38971d9
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 33 deletions.
diff --git a/Assets/Scripts/Core/DataReader/Pol/PolFileReader.cs b/Assets/Scripts/Core/DataReader/Pol/PolFileReader.cs
@@ -86,7 +86,6 @@ private static TagNode ReadTagNodeInfo(BinaryReader reader)
                 Tx = reader.ReadSingle(), Ty = reader.ReadSingle(), Tz = reader.ReadSingle(), Tw = reader.ReadSingle()
             });
             var origin = GameBoxInterpreter.ToUnityPosition(transformMatrix.MultiplyPoint(Vector3.zero));
-            Debug.Log("Transform position from matrix is: " + origin);
 
             var type = reader.ReadInt32();
             var customColorStringLength = reader.ReadInt32();

diff --git a/Assets/Scripts/Core/Utils/UnsafeBinaryReader.cs b/Assets/Scripts/Core/Utils/UnsafeBinaryReader.cs
@@ -9,8 +9,6 @@
 namespace Core.Utils
 {
     using System;
-    using System.Collections.Generic;
-    using System.Linq;
     using System.Runtime.CompilerServices;
     using System.Runtime.InteropServices;
     using System.Text;
@@ -19,15 +17,10 @@ namespace Core.Utils
     public sealed unsafe class UnsafeBinaryReader : IDisposable
     {
         private const int GBK_CODE_PAGE = 936; // GBK Encoding's code page
-
         private readonly byte[] _data;
-
         private byte* _dataPtr;
-
         private GCHandle _handle;
 
-        private bool _disposedValue;
-
         public UnsafeBinaryReader(byte[] data)
         {
             _data = data;
@@ -171,6 +164,7 @@ public void Close()
             Dispose(true);
         }
 
+        private bool _disposedValue;
         private void Dispose(bool disposing)
         {
             if (!_disposedValue)

diff --git a/Assets/Scripts/Editor/GameVariantSwitcher.cs b/Assets/Scripts/Editor/GameVariantSwitcher.cs
@@ -31,10 +31,9 @@ private static void ApplyPlayerSettingsForVariant(string appName)
         {
             PlayerSettings.productName = appName;
             PlayerSettings.companyName = GameConstants.CompanyName;
-            PlayerSettings.bundleVersion = GameConstants.Version;
-            PlayerSettings.SetApplicationIdentifier(
-                EditorUserBuildSettings.selectedBuildTargetGroup,
-                $"{GameConstants.AppIdentifierPrefix}.{appName}");
+             PlayerSettings.SetApplicationIdentifier(
+                 EditorUserBuildSettings.selectedBuildTargetGroup,
+                 $"{GameConstants.AppIdentifierPrefix}.{appName}");
             // TODO: Add icon based on variant
             //PlayerSettings.SetIconsForTargetGroup(BuildTargetGroup.Unknown, icons);
             AssetDatabase.SaveAssets();

diff --git a/Assets/Scripts/Pal3/MetaData/GameConstants.cs b/Assets/Scripts/Pal3/MetaData/GameConstants.cs
@@ -17,8 +17,6 @@ public static class GameConstants
         public const string AppNameCNFull = "仙剑奇侠传三外传";
         #endif
 
-        public const string Version = "0.15";
-
         public const string CompanyName = "OSS";
 
         public const string AppIdentifierPrefix = "com" + "." + CompanyName;

diff --git a/Assets/Scripts/Pal3/UI/InformationManager.cs b/Assets/Scripts/Pal3/UI/InformationManager.cs
@@ -51,7 +51,7 @@ private void OnEnable()
                 $"CPU: {SystemInfo.processorType.Trim()} GPU: {SystemInfo.graphicsDeviceName.Trim()}\n" +
                 $"RAM: {SystemInfo.systemMemorySize / 1024f:0.0} GB VRAM: {SystemInfo.graphicsMemorySize / 1024f:0.0} GB\n" +
                 $"{GameConstants.ContactInfo}\n" +
-                $"Version: Alpha v{GameConstants.Version}\n";
+                $"Version: Alpha v{Application.version}\n";
 
             _debugInfoStringFormat = deviceInfo + "Heap size: {0:0.00} MB\n" + "{1:0.} fps";
 
@@ -65,7 +65,7 @@ private void OnDisable()
             if (_noteAnimation != null) StopCoroutine(_noteAnimation);
             CommandExecutorRegistry<ICommand>.Instance.UnRegister(this);
         }
-        
+
         private void Update()
         {
             var currentTime = Time.realtimeSinceStartupAsDouble;

diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset
@@ -136,20 +136,6 @@ PlayerSettings:
     Others: 1
   bundleVersion: 0.15
   preloadedAssets:
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
   metroInputSource: 0
   wsaTransparentSwapchain: 0
   m_HolographicPauseOnTrackingLoss: 1
@@ -168,8 +154,8 @@ PlayerSettings:
   androidMaxAspectRatio: 2.1
   applicationIdentifier:
     Android: com.OSS.PAL3
-    Standalone: com.OSS.PAL3
-    iPhone: com.OSS.PAL3
+    Standalone: com.Jackil.PAL3
+    iPhone: com.Jackil.PAL3
   buildNumber:
     Standalone: 0
     iPhone: 0
@@ -239,7 +225,7 @@ PlayerSettings:
   metalAPIValidation: 1
   iOSRenderExtraFrameOnPause: 0
   iosCopyPluginsCodeInsteadOfSymlink: 0
-  appleDeveloperTeamID: 
+  appleDeveloperTeamID: 4997CKN8MT
   iOSManualSigningProvisioningProfileID: 
   tvOSManualSigningProvisioningProfileID: 
   iOSManualSigningProvisioningProfileType: 0