Merge pull request #6 from VyronLee/develop

Add readme

Author: VyronLee

.github/workflows/upm-vfs-unity.yml

@@ -0,0 +1,28 @@
+name: Update-UPM-VFS-Unity-Branch
+
+on:
+  push:
+    tags:
+      - v*
+
+jobs:
+  update:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+
+      - name: Tag name
+        id: tag
+        run: echo ::set-output name=name::${GITHUB_REF#refs/tags/v}
+
+      - name: Create UPM Core Unity Branches
+        uses: hecomi/create-upm-branch-action@main
+        with:
+          git-tag: ${{ steps.tag.outputs.name }}
+          main-branch: master
+          upm-branch: upm-vfs-unity
+          root-files: "README.md README_en.md LICENSE"
+          pkg-root-dir-path: Assets/vFrame.Core.Unity

.github/workflows/upm-vfs.yml

@@ -0,0 +1,28 @@
+name: Update-UPM-VFS-Branch
+
+on:
+  push:
+    tags:
+      - v*
+
+jobs:
+  update:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+
+      - name: Tag name
+        id: tag
+        run: echo ::set-output name=name::${GITHUB_REF#refs/tags/v}
+
+      - name: Create UPM Core Branches
+        uses: hecomi/create-upm-branch-action@main
+        with:
+          git-tag: ${{ steps.tag.outputs.name }}
+          main-branch: master
+          upm-branch: upm-vfs
+          root-files: "README.md README_en.md LICENSE"
+          pkg-root-dir-path: Assets/vFrame.Core

Assembly-CSharp.csproj.DotSettings

@@ -9,7 +9,7 @@
 // ============================================================
 
 using System.IO;
-using vFrame.Core.Utils;
+using vFrame.Core.Unity.Utils;
 
 namespace vFrame.VFS.UnityExtension
 {

Assets/vFrame.VFS.UnityExtension/Runtime/VFSFile.cs

@@ -24,7 +24,7 @@ public struct PackageHeader
         public long Reserved3;
 
         // 80 bytes
-        public static int GetMarshalSize() {
+        public static int GetStructSize() {
             return sizeof(long) * 10;
         }
     }
@@ -38,7 +38,7 @@ public struct PackageBlockInfo
         public long EncryptKey;
 
         // 40 bytes
-        public static int GetMarshalSize() {
+        public static int GetStructSize() {
             return sizeof(long) * 5;
         }
 

Assets/vFrame.VFS/Runtime/Package/PackageStruct.cs

@@ -209,7 +209,7 @@ private void ValidateBlockInfo(Stream inputStream) {
                 throw new PackageBlockDisposedException();
             }
 
-            var sizeOfHeader = PackageHeader.GetMarshalSize();
+            var sizeOfHeader = PackageHeader.GetStructSize();
             if (_blockInfo.Offset < sizeOfHeader) {
                 throw new PackageBlockOffsetErrorException(_blockInfo.Offset, sizeOfHeader);
             }

Assets/vFrame.VFS/Runtime/Package/PackageVirtualFileStream.cs

@@ -6,7 +6,7 @@ namespace vFrame.VFS
     public partial class PackageVirtualFileSystem
     {
         private bool ReadHeader() {
-            if (_vpkStream.Length < PackageHeader.GetMarshalSize()) {
+            if (_vpkStream.Length < PackageHeader.GetStructSize()) {
                 return false;
             }
 
@@ -87,10 +87,10 @@ private bool ReadBlockTable() {
         private static bool ValidateHeader(PackageHeader header) {
             return header.Id == PackageFileSystemConst.Id
                    && header.Version == PackageFileSystemConst.Version
-                   && header.TotalSize > PackageHeader.GetMarshalSize()
+                   && header.TotalSize > PackageHeader.GetStructSize()
                    && header.BlockTableOffset >= header.BlockOffset + header.BlockSize
-                   && header.BlockTableSize % PackageBlockInfo.GetMarshalSize() == 0
-                   && header.BlockOffset >= PackageHeader.GetMarshalSize()
+                   && header.BlockTableSize % PackageBlockInfo.GetStructSize() == 0
+                   && header.BlockOffset >= PackageHeader.GetStructSize()
                    && header.BlockSize >= 0
                 ;
         }

Assets/vFrame.VFS/Runtime/Package/PackageVirtualFileSystem.Reader.cs

@@ -75,16 +75,16 @@ private void RecalculateHeader(bool skipDeleted) {
             var validBlocks = _blockInfos.Where(
                 v => !skipDeleted || (v.Flags & BlockFlags.BlockDeleted) <= 0).ToList();
             var blockSize = validBlocks.Sum(v => v.CompressedSize);
-            var blockTableSize = PackageBlockInfo.GetMarshalSize() * validBlocks.Count;
-            var headerSize = PackageHeader.GetMarshalSize();
+            var blockTableSize = PackageBlockInfo.GetStructSize() * validBlocks.Count;
+            var headerSize = PackageHeader.GetStructSize();
             var totalSize = headerSize + blockTableSize + blockSize;
 
             _header.Id = PackageFileSystemConst.Id;
             _header.Version = PackageFileSystemConst.Version;
             _header.TotalSize = totalSize;
             _header.BlockTableOffset = totalSize - blockTableSize;
             _header.BlockTableSize = blockTableSize;
-            _header.BlockOffset = PackageHeader.GetMarshalSize();
+            _header.BlockOffset = PackageHeader.GetStructSize();
             _header.BlockSize = blockSize;
             _header.Reserved1 = 0;
             _header.Reserved2 = 0;

Assets/vFrame.VFS/Runtime/Package/PackageVirtualFileSystem.Writer.cs

@@ -35,10 +35,10 @@ public PackageVirtualFileSystem() {
             _header = new PackageHeader {
                 Id = PackageFileSystemConst.Id,
                 Version = PackageFileSystemConst.Version,
-                TotalSize = PackageHeader.GetMarshalSize(),
-                BlockTableOffset = PackageHeader.GetMarshalSize(),
+                TotalSize = PackageHeader.GetStructSize(),
+                BlockTableOffset = PackageHeader.GetStructSize(),
                 BlockTableSize = 0,
-                BlockOffset = PackageHeader.GetMarshalSize(),
+                BlockOffset = PackageHeader.GetStructSize(),
                 BlockSize = 0,
                 Reserved1 = 0,
                 Reserved2 = 0,