From 56dd9d17cb12951e3ab3807a3b7b2bd6d348d6cd Mon Sep 17 00:00:00 2001
From: colourstar <colourstar27@qq.com>
Date: Wed, 6 Apr 2022 15:49:16 +0800
Subject: [PATCH] =?UTF-8?q?1.=20=E4=BF=AE=E5=A4=8D=E4=BA=8C=E8=BF=9B?=
 =?UTF-8?q?=E5=88=B6=E6=96=87=E4=BB=B6=E5=8A=A0=E8=BD=BD=E6=97=B6=E7=9A=84?=
 =?UTF-8?q?BUG=202.=20=E4=BF=AE=E5=A4=8D=E5=8A=A0=E5=AF=86=E8=A7=A3?=
 =?UTF-8?q?=E5=AF=86=E6=97=B6=E9=95=BF=E5=BA=A6=E8=8E=B7=E5=8F=96=E4=B8=8D?=
 =?UTF-8?q?=E5=AF=B9=E7=9A=84BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 GameFramework/Resource/ResourceManager.ResourceLoader.cs | 2 +-
 GameFramework/Utility/Utility.Encryption.cs              | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/GameFramework/Resource/ResourceManager.ResourceLoader.cs b/GameFramework/Resource/ResourceManager.ResourceLoader.cs
index 4659931bd..c6469ad30 100644
--- a/GameFramework/Resource/ResourceManager.ResourceLoader.cs
+++ b/GameFramework/Resource/ResourceManager.ResourceLoader.cs
@@ -639,7 +639,7 @@ public byte[] LoadBinaryFromFileSystem(string binaryAssetName)
                 }
 
                 IFileSystem fileSystem = m_ResourceManager.GetFileSystem(resourceInfo.FileSystemName, resourceInfo.StorageInReadOnly);
-                byte[] bytes = fileSystem.ReadFile(resourceInfo.ResourceName.FullName);
+                byte[] bytes = fileSystem.ReadFile(binaryAssetName);
                 if (bytes == null)
                 {
                     return null;
diff --git a/GameFramework/Utility/Utility.Encryption.cs b/GameFramework/Utility/Utility.Encryption.cs
index ae40afce6..b10477225 100644
--- a/GameFramework/Utility/Utility.Encryption.cs
+++ b/GameFramework/Utility/Utility.Encryption.cs
@@ -26,7 +26,7 @@ public static class Encryption
             /// <returns>异或后的二进制流。</returns>
             public static byte[] GetQuickXorBytes(byte[] bytes, byte[] code)
             {
-                return GetXorBytes(bytes, 0, QuickEncryptLength, code);
+                return GetXorBytes(bytes, 0, Math.Min(QuickEncryptLength, bytes.Length), code);
             }
 
             /// <summary>
@@ -36,7 +36,7 @@ public static byte[] GetQuickXorBytes(byte[] bytes, byte[] code)
             /// <param name="code">异或二进制流。</param>
             public static void GetQuickSelfXorBytes(byte[] bytes, byte[] code)
             {
-                GetSelfXorBytes(bytes, 0, QuickEncryptLength, code);
+                GetSelfXorBytes(bytes, 0, Math.Min(QuickEncryptLength, bytes.Length), code);
             }
 
             /// <summary>