From d4b41e270eb56f7db0386b52d00df1fd239169a2 Mon Sep 17 00:00:00 2001 From: Maxwell Kang Date: Mon, 17 Jun 2024 20:11:39 -0700 Subject: [PATCH] bump unity sample and package version --- README.md | 2 +- .../001 - Define Sheet Container/HeroSheet.cs | 2 +- .../002 - Import From Excel/Excel/Heroes.xlsx | Bin 10255 -> 6318 bytes .../Extras/AssetPath/Direct/Image01.png.meta | 31 ++++- .../AssetPath/Resources/Image01.png.meta | 31 ++++- .../Extras/ScriptableObject/Heroes.asset | 6 +- .../Assets/StreamingAssets/Excel/Heroes.json | 2 +- .../Packages/com.cathei.bakingsheet/README.md | 119 +++++++++--------- .../com.cathei.bakingsheet/package.json | 2 +- UnityProject/Packages/manifest.json | 9 +- UnityProject/Packages/packages-lock.json | 34 +++-- .../ProjectSettings/MemorySettings.asset | 35 ++++++ .../ProjectSettings/ProjectSettings.asset | 84 ++++++++++--- .../ProjectSettings/ProjectVersion.txt | 4 +- copy.ps1 | 6 + 15 files changed, 253 insertions(+), 114 deletions(-) create mode 100644 UnityProject/ProjectSettings/MemorySettings.asset create mode 100644 copy.ps1 diff --git a/README.md b/README.md index 4f7bede..2345641 100644 --- a/README.md +++ b/README.md @@ -65,7 +65,7 @@ For C# projects or server, download with [NuGet](https://www.nuget.org/packages? For Unity projects, add git package from Package Manager. ``` -https://github.com/cathei/BakingSheet.git?path=UnityProject/Packages/com.cathei.bakingsheet#v4.1.2 +https://github.com/cathei/BakingSheet.git?path=UnityProject/Packages/com.cathei.bakingsheet#v4.1.3 ``` Or install it via [OpenUPM](https://openupm.com/packages/com.cathei.bakingsheet/). diff --git a/UnityProject/Assets/Samples/001 - Define Sheet Container/HeroSheet.cs b/UnityProject/Assets/Samples/001 - Define Sheet Container/HeroSheet.cs index 1c5eccb..3361f08 100644 --- a/UnityProject/Assets/Samples/001 - Define Sheet Container/HeroSheet.cs +++ b/UnityProject/Assets/Samples/001 - Define Sheet Container/HeroSheet.cs @@ -11,7 +11,7 @@ public class Row : SheetRowArray public string Name { get; private set; } public int Strength { get; private set; } - public int Inteligence { get; private set; } + public int Intelligence { get; private set; } public int Vitality { get; private set; } public Elem GetLevel(int level) diff --git a/UnityProject/Assets/Samples/002 - Import From Excel/Excel/Heroes.xlsx b/UnityProject/Assets/Samples/002 - Import From Excel/Excel/Heroes.xlsx index d480283df51e2a5c39299824ed121626aac1bd8d..1b142e7d7365ff94c0f0d907a5b5933529345f49 100644 GIT binary patch literal 6318 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 literal 10255 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 e7VTf?f4ChrrF-zv1pqMMpCI^D#hdQOum1 Markdown version -| Id | Name | Price | $Comment | -|----------------|-------------------|-------|------------| -| ITEM_LVUP001 | Warrior's Shield | 10000 | Warrior Lv up material | -| ITEM_LVUP002 | Mage's Staff | 10000 | Mage Lv up material | -| ITEM_LVUP003 | Assassin's Dagger | 10000 | Assassin Lv up material | -| ITEM_POTION001 | Health Potion | 30 | Heal 20 Hp | -| ITEM_POTION002 | Mana Potion | 50 | Heal 20 Mp | +| Id | Name | Price | $Comment | +|------------|-------------------|-------|------------| +| LVUP_001 | Warrior's Shield | 10000 | Warrior Lv up material | +| LVUP_002 | Mage's Staff | 10000 | Mage Lv up material | +| LVUP_003 | Assassin's Dagger | 10000 | Assassin Lv up material | +| POTION_001 | Health Potion | 30 | Heal 20 Hp | +| POTION_002 | Mana Potion | 50 | Heal 20 Mp | Code below is corresponding BakingSheet class. ```csharp -public class ItemSheet : Sheet +public class ConsumableSheet : Sheet { public class Row : SheetRow { @@ -112,7 +112,7 @@ public class ItemSheet : Sheet } } ``` -You can see there are two classes, `ItemSheet` and `ItemSheet.Row`. Each represents a page of sheet and a single row. `ItemSheet` is surrounding `Row` class (It is not forced but recommended convention). Important part is they will inherit from `Sheet` and `SheetRow`. +You can see there are two classes, `ConsumableSheet` and `ConsumableSheet.Row`. Each represents a page of sheet and a single row. `ConsumableSheet` is surrounding `Row` class (It is not forced but recommended convention). Important part is they will inherit from `Sheet` and `SheetRow`. `Id` column is mandatory, so it is already defined in base `SheetRow` class. `Id` is `string` by default, but you can change type. See [this section](#using-non-string-column-as-id) to use non-string type for `Id`. @@ -123,9 +123,9 @@ public class SheetContainer : SheetContainerBase public SheetContainer(Microsoft.Extensions.Logging.ILogger logger) : base(logger) {} // property name matches with corresponding sheet name - // for .xlsx or google sheet, it is name of the sheet tab in the workbook - // for .csv or .json, it is name of the file - public ItemSheet Items { get; private set; } + // for .xlsx or google sheet, **property name matches with the name of sheet tab in workbook** + // for .csv or .json, **property name matches with the name of file** + public ConsumableSheet Consumables { get; private set; } // add other sheets as you extend your project public CharacterSheet Characters { get; private set; } @@ -230,11 +230,11 @@ You can extend `JsonSheetConverter` to customize serialization process. For exam > If you are using `StreamingAssets` on Android, also see [Reading From StreamingAssets](docs/streaming-assets.md). ## Accessing Row -Now you have `SheetContainer` loaded from your data, accessing to the row is fairly simple. Below code shows how to access specific `ItemSheet.Row`. +Now you have `SheetContainer` loaded from your data, accessing to the row is fairly simple. Below code shows how to access specific `ConsumableSheet.Row`. ```csharp -// same as sheetContainer.Items.Find("ITEM_LVUP003"); +// same as sheetContainer.Consumables.Find("LVUP_003"); // returns null if no row found -var row = sheetContainer.Items["ITEM_LVUP003"]; +var row = sheetContainer.Consumables["LVUP_003"]; // print "Assassin's dagger" logger.LogInformation(row.Name); @@ -243,12 +243,12 @@ logger.LogInformation(row.Name); `Sheet` is `KeyedCollection`, you can loop through it and order is guaranteed to be as same as your spreadsheet. Plus of course you can use all benefits of `IEnumerable`. ```csharp // loop through all rows and print their names -foreach (var row in sheetContainer.Items) +foreach (var row in sheetContainer.Consumables) logger.LogInformation(row.Name); -// loop through item ids that price over 5000 -foreach (var itemId in sheetContainer.Items.Where(row => row.Price > 5000).Select(row => row.Id)) - logger.LogInformation(itemId); +// loop through consumable ids that price over 5000 +foreach (var consumableId in sheetContainer.Consumables.Where(row => row.Price > 5000).Select(row => row.Id)) + logger.LogInformation(consumableId); ``` ## Using List Column @@ -259,22 +259,22 @@ List columns are used for simple array.
Flat header -| Id | Name | Monsters:1 | Monsters:2 | Monsters:3 | Items:1 | Items:2 | -| ---------- | ------------- | ---------- | ---------- | ---------- | -------------- | ------------ | -| DUNGEON001 | Easy Field | MONSTER001 | | | ITEM_POTION001 | ITEM_LVUP001 | -| DUNGEON002 | Expert Zone | MONSTER001 | MONSTER002 | | ITEM_POTION002 | ITEM_LVUP002 | -| DUNGEON003 | Dragon’s Nest | MONSTER003 | MONSTER004 | MONSTER005 | ITEM_LVUP003 | | +| Id | Name | Monsters:1 | Monsters:2 | Monsters:3 | Loots:1 | Loots:2 | +| ---------- | ------------- | ---------- | ---------- | ---------- |------------|----------| +| DUNGEON001 | Easy Field | MONSTER001 | | | POTION_001 | LVUP_001 | +| DUNGEON002 | Expert Zone | MONSTER001 | MONSTER002 | | POTION_002 | LVUP_002 | +| DUNGEON003 | Dragon’s Nest | MONSTER003 | MONSTER004 | MONSTER005 | LVUP_003 | |
Split header -| Id | Name | Monsters | | | Items | | -|------------|---------------|------------|------------|------------|----------------|--------------| -| | | 1 | 2 | 3 | 1 | 2 | -| DUNGEON001 | Easy Field | MONSTER001 | | | ITEM_POTION001 | ITEM_LVUP001 | -| DUNGEON002 | Expert Zone | MONSTER001 | MONSTER002 | | ITEM_POTION002 | ITEM_LVUP002 | -| DUNGEON003 | Dragon’s Nest | MONSTER003 | MONSTER004 | MONSTER005 | ITEM_LVUP003 | | +| Id | Name | Monsters | | | Loots | | +|------------|---------------|------------|------------|------------|------------|----------| +| | | 1 | 2 | 3 | 1 | 2 | +| DUNGEON001 | Easy Field | MONSTER001 | | | POTION_001 | LVUP_001 | +| DUNGEON002 | Expert Zone | MONSTER001 | MONSTER002 | | POTION_002 | LVUP_002 | +| DUNGEON003 | Dragon’s Nest | MONSTER003 | MONSTER004 | MONSTER005 | LVUP_003 | |
```csharp @@ -287,7 +287,7 @@ public class DungeonSheet : Sheet // you can use any supported type as list // to know more about sheet reference types, see cross-sheet reference section public List Monsters { get; private set; } - public List Items { get; private set; } + public List Loots { get; private set; } } } ``` @@ -395,23 +395,23 @@ Row arrays are used for 2-dimentional structure. Below is example content of fil
Markdown version -| Id | Name | Strength | Inteligence | Vitality | StatMultiplier | RequiredExp | RequiredItem | -|---------|----------|----------|-------------|----------|----------------|-------------|--------------| -| HERO001 | Warrior | 100 | 80 | 140 | 1 | 0 | | -| | | | | | 1.2 | 10 | | -| | | | | | 1.4 | 20 | | -| | | | | | 1.6 | 40 | | -| | | | | | 2 | 100 | ITEM_LVUP001 | -| HERO002 | Mage | 60 | 160 | 80 | 1 | 0 | | -| | | | | | 1.2 | 10 | | -| | | | | | 1.4 | 20 | | -| | | | | | 1.6 | 40 | | -| | | | | | 2 | 100 | ITEM_LVUP002 | -| HERO003 | Assassin | 140 | 100 | 80 | 1 | 0 | | -| | | | | | 1.2 | 10 | | -| | | | | | 1.4 | 20 | | -| | | | | | 1.6 | 40 | | -| | | | | | 2 | 100 | ITEM_LVUP003 | +| Id | Name | Strength | Inteligence | Vitality | StatMultiplier | RequiredExp | RequiredMaterial | +|---------|----------|----------|-------------|----------|----------------|-------------|------------------| +| HERO001 | Warrior | 100 | 80 | 140 | 1 | 0 | | +| | | | | | 1.2 | 10 | | +| | | | | | 1.4 | 20 | | +| | | | | | 1.6 | 40 | | +| | | | | | 2 | 100 | LVUP_001 | +| HERO002 | Mage | 60 | 160 | 80 | 1 | 0 | | +| | | | | | 1.2 | 10 | | +| | | | | | 1.4 | 20 | | +| | | | | | 1.6 | 40 | | +| | | | | | 2 | 100 | LVUP_002 | +| HERO003 | Assassin | 140 | 100 | 80 | 1 | 0 | | +| | | | | | 1.2 | 10 | | +| | | | | | 1.4 | 20 | | +| | | | | | 1.6 | 40 | | +| | | | | | 2 | 100 | LVUP_003 |
Rows without `Id` is considered as part of previous row. You can merge the non-array cells to make it visually intuitive. Below corresponding code shows how to define row arrays. @@ -441,7 +441,7 @@ public class HeroSheet : Sheet { public float StatMultiplier { get; private set; } public int RequiredExp { get; private set; } - public string RequiredItem { get; private set; } + public string RequiredMaterial { get; private set; } } } ``` @@ -451,7 +451,7 @@ public class HeroSheet : Sheet > It is worth mention you can use `VerticalList` to cover the case you want to vertically extend your `List` without pairing them as `Elem`. Though we recommend to split the sheet in that case if possible. ## Using Cross-Sheet Reference -Below code shows how to replace `string RequiredItem` to `ItemSheet.Reference RequiredItem` to add extra reliablity. `Sheet.Reference` type is serialized as `TKey`, and verifies that row with same id exists in the sheet. +Below code shows how to replace `string RequiredMaterial` to `ConsumableSheet.Reference RequiredMaterial` to add extra reliablity. `Sheet.Reference` type is serialized as `TKey`, and verifies that row with same id exists in the sheet. ```csharp public class HeroSheet : Sheet @@ -465,7 +465,7 @@ public class HeroSheet : Sheet { public float StatMultiplier { get; private set; } public int RequiredExp { get; private set; } - public ItemSheet.Reference RequiredItem { get; private set; } + public ConsumableSheet.Reference RequiredMaterial { get; private set; } } } ``` @@ -477,21 +477,21 @@ public class SheetContainer : SheetContainerBase // use name of each matching sheet name from source public HeroSheet Heroes { get; private set; } - public ItemSheet Items { get; private set; } + public ConsumableSheet Consumables { get; private set; } } ``` -Both `ItemSheet` and `HeroSheet` must be the properties on same `SheetContainer` class to reference each other's row. +Both `ConsumableSheet` and `HeroSheet` must be the properties on same `SheetContainer` class to reference each other's row. -Now, not only error message will pop up when `RequiredItem` doesn't exist in `SheetContainer.Items`, you can access `ItemSheet.Row` directly through it. +Now, not only error message will pop up when `RequiredMaterial` doesn't exist in `SheetContainer.Consumables`, you can access `ConsumableSheet.Row` directly through it. ```csharp var heroRow = sheetContainer.Heroes["HERO001"]; -// ITEM_LVUP001 from Items sheet -var itemRow = heroRow.GetLevel(5).RequiredItem.Ref; +// LVUP_001 from Consumables sheet +var consumableRow = heroRow.GetLevel(5).RequiredMaterial.Ref; // print "Warrior's Shield" -logger.LogInformation(itemRow.Name); +logger.LogInformation(consumableRow.Name); ``` ## Using Non-String Column as Id @@ -637,3 +637,4 @@ There is few optional symbols that can be defined for runtime usage. By default |-------------------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------| | BAKINGSHEET_RUNTIME_GOOGLECONVERTER | Include Google Converter to your build.
See also: [Google Sheet Converter](docs/google-sheet-import.md#how-to-use-google-sheet-converter-on-runtime) | | BAKINGSHEET_RUNTIME_CSVCONVERTER | Include CSV Converter to your build. | +| BAKINGSHEET_EXTERNAL_LOGGING_DLL | Use external `Microsoft.Extensions.Logging.Abstractions.dll`. Useful if you already have same dll in your project for different dependency. | diff --git a/UnityProject/Packages/com.cathei.bakingsheet/package.json b/UnityProject/Packages/com.cathei.bakingsheet/package.json index bc66864..aa671e7 100644 --- a/UnityProject/Packages/com.cathei.bakingsheet/package.json +++ b/UnityProject/Packages/com.cathei.bakingsheet/package.json @@ -4,7 +4,7 @@ "author": { "name": "Maxwell Keonwoo Kang" }, - "version": "4.1.2", + "version": "4.1.3", "unity": "2019.4", "description": "Easy datasheet management for C# and Unity.\nSupports Excel, Google Sheet, JSON and CSV format.", "license": "MIT", diff --git a/UnityProject/Packages/manifest.json b/UnityProject/Packages/manifest.json index c8879a0..c63ae6d 100644 --- a/UnityProject/Packages/manifest.json +++ b/UnityProject/Packages/manifest.json @@ -2,13 +2,14 @@ "dependencies": { "com.cathei.betterstreamingassets": "https://github.com/cathei/BetterStreamingAssets-Package.git", "com.unity.2d.sprite": "1.0.0", - "com.unity.addressables": "1.18.19", - "com.unity.ide.rider": "3.0.21", - "com.unity.ide.visualstudio": "2.0.18", + "com.unity.addressables": "1.21.19", + "com.unity.ai.navigation": "1.1.5", + "com.unity.ide.rider": "3.0.28", + "com.unity.ide.visualstudio": "2.0.22", "com.unity.ide.vscode": "1.2.5", "com.unity.test-framework": "1.1.33", "com.unity.textmeshpro": "3.0.6", - "com.unity.timeline": "1.4.8", + "com.unity.timeline": "1.7.6", "com.unity.ugui": "1.0.0", "com.unity.modules.ai": "1.0.0", "com.unity.modules.androidjni": "1.0.0", diff --git a/UnityProject/Packages/packages-lock.json b/UnityProject/Packages/packages-lock.json index f497654..212d95a 100644 --- a/UnityProject/Packages/packages-lock.json +++ b/UnityProject/Packages/packages-lock.json @@ -22,11 +22,11 @@ "dependencies": {} }, "com.unity.addressables": { - "version": "1.18.19", + "version": "1.21.19", "depth": 0, "source": "registry", "dependencies": { - "com.unity.scriptablebuildpipeline": "1.19.2", + "com.unity.scriptablebuildpipeline": "1.21.21", "com.unity.modules.assetbundle": "1.0.0", "com.unity.modules.imageconversion": "1.0.0", "com.unity.modules.jsonserialize": "1.0.0", @@ -35,6 +35,15 @@ }, "url": "https://packages.unity.com" }, + "com.unity.ai.navigation": { + "version": "1.1.5", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.modules.ai": "1.0.0" + }, + "url": "https://packages.unity.com" + }, "com.unity.asset-store-tools": { "version": "file:com.unity.asset-store-tools", "depth": 0, @@ -49,7 +58,7 @@ "url": "https://packages.unity.com" }, "com.unity.ide.rider": { - "version": "3.0.21", + "version": "3.0.28", "depth": 0, "source": "registry", "dependencies": { @@ -58,7 +67,7 @@ "url": "https://packages.unity.com" }, "com.unity.ide.visualstudio": { - "version": "2.0.18", + "version": "2.0.22", "depth": 0, "source": "registry", "dependencies": { @@ -74,14 +83,14 @@ "url": "https://packages.unity.com" }, "com.unity.nuget.newtonsoft-json": { - "version": "3.0.2", + "version": "3.2.1", "depth": 1, "source": "registry", "dependencies": {}, "url": "https://packages.unity.com" }, "com.unity.scriptablebuildpipeline": { - "version": "1.19.2", + "version": "1.21.21", "depth": 1, "source": "registry", "dependencies": {}, @@ -108,7 +117,7 @@ "url": "https://packages.unity.com" }, "com.unity.timeline": { - "version": "1.4.8", + "version": "1.7.6", "depth": 0, "source": "registry", "dependencies": { @@ -260,17 +269,6 @@ "version": "1.0.0", "depth": 0, "source": "builtin", - "dependencies": { - "com.unity.modules.ui": "1.0.0", - "com.unity.modules.imgui": "1.0.0", - "com.unity.modules.jsonserialize": "1.0.0", - "com.unity.modules.uielementsnative": "1.0.0" - } - }, - "com.unity.modules.uielementsnative": { - "version": "1.0.0", - "depth": 1, - "source": "builtin", "dependencies": { "com.unity.modules.ui": "1.0.0", "com.unity.modules.imgui": "1.0.0", diff --git a/UnityProject/ProjectSettings/MemorySettings.asset b/UnityProject/ProjectSettings/MemorySettings.asset new file mode 100644 index 0000000..5b5face --- /dev/null +++ b/UnityProject/ProjectSettings/MemorySettings.asset @@ -0,0 +1,35 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!387306366 &1 +MemorySettings: + m_ObjectHideFlags: 0 + m_EditorMemorySettings: + m_MainAllocatorBlockSize: -1 + m_ThreadAllocatorBlockSize: -1 + m_MainGfxBlockSize: -1 + m_ThreadGfxBlockSize: -1 + m_CacheBlockSize: -1 + m_TypetreeBlockSize: -1 + m_ProfilerBlockSize: -1 + m_ProfilerEditorBlockSize: -1 + m_BucketAllocatorGranularity: -1 + m_BucketAllocatorBucketsCount: -1 + m_BucketAllocatorBlockSize: -1 + m_BucketAllocatorBlockCount: -1 + m_ProfilerBucketAllocatorGranularity: -1 + m_ProfilerBucketAllocatorBucketsCount: -1 + m_ProfilerBucketAllocatorBlockSize: -1 + m_ProfilerBucketAllocatorBlockCount: -1 + m_TempAllocatorSizeMain: -1 + m_JobTempAllocatorBlockSize: -1 + m_BackgroundJobTempAllocatorBlockSize: -1 + m_JobTempAllocatorReducedBlockSize: -1 + m_TempAllocatorSizeGIBakingWorker: -1 + m_TempAllocatorSizeNavMeshWorker: -1 + m_TempAllocatorSizeAudioWorker: -1 + m_TempAllocatorSizeCloudWorker: -1 + m_TempAllocatorSizeGfx: -1 + m_TempAllocatorSizeJobWorker: -1 + m_TempAllocatorSizeBackgroundWorker: -1 + m_TempAllocatorSizePreloadManager: -1 + m_PlatformMemorySettings: {} diff --git a/UnityProject/ProjectSettings/ProjectSettings.asset b/UnityProject/ProjectSettings/ProjectSettings.asset index 1691202..24dc85a 100644 --- a/UnityProject/ProjectSettings/ProjectSettings.asset +++ b/UnityProject/ProjectSettings/ProjectSettings.asset @@ -3,7 +3,7 @@ --- !u!129 &1 PlayerSettings: m_ObjectHideFlags: 0 - serializedVersion: 23 + serializedVersion: 26 productGUID: c4596d9fccfa48a4a84b372234386325 AndroidProfiler: 0 AndroidFilterTouchesWhenObscured: 0 @@ -48,14 +48,15 @@ PlayerSettings: defaultScreenHeightWeb: 600 m_StereoRenderingPath: 0 m_ActiveColorSpace: 0 + m_SpriteBatchVertexThreshold: 300 m_MTRendering: 1 mipStripping: 0 numberOfMipsStripped: 0 + numberOfMipsStrippedPerMipmapLimitGroup: {} m_StackTraceTypes: 010000000100000001000000010000000100000001000000 iosShowActivityIndicatorOnLoading: -1 androidShowActivityIndicatorOnLoading: -1 iosUseCustomAppBackgroundBehavior: 0 - iosAllowHTTPDownload: 1 allowedAutorotateToPortrait: 1 allowedAutorotateToPortraitUpsideDown: 1 allowedAutorotateToLandscapeRight: 1 @@ -85,6 +86,7 @@ PlayerSettings: hideHomeButton: 0 submitAnalytics: 1 usePlayerLog: 1 + dedicatedServerOptimizations: 0 bakeCollisionMeshes: 0 forceSingleInstance: 0 useFlipModelSwapchain: 1 @@ -119,8 +121,12 @@ PlayerSettings: switchNVNShaderPoolsGranularity: 33554432 switchNVNDefaultPoolsGranularity: 16777216 switchNVNOtherPoolsGranularity: 16777216 + switchGpuScratchPoolGranularity: 2097152 + switchAllowGpuScratchShrinking: 0 switchNVNMaxPublicTextureIDCount: 0 switchNVNMaxPublicSamplerIDCount: 0 + switchNVNGraphicsFirmwareMemory: 32 + switchMaxWorkerMultiple: 8 stadiaPresentMode: 0 stadiaTargetFramerate: 0 vulkanNumSwapchainBuffers: 3 @@ -128,12 +134,7 @@ PlayerSettings: vulkanEnablePreTransform: 0 vulkanEnableLateAcquireNextImage: 0 vulkanEnableCommandBufferRecycling: 1 - m_SupportedAspectRatios: - 4:3: 1 - 5:4: 1 - 16:10: 1 - 16:9: 1 - Others: 1 + loadStoreDebugModeEnabled: 0 bundleVersion: 1.0.0 preloadedAssets: [] metroInputSource: 0 @@ -145,8 +146,10 @@ PlayerSettings: enable360StereoCapture: 0 isWsaHolographicRemotingEnabled: 0 enableFrameTimingStats: 0 + enableOpenGLProfilerGPURecorders: 1 + allowHDRDisplaySupport: 0 useHDRDisplay: 0 - D3DHDRBitDepth: 0 + hdrBitDepth: 0 m_ColorGamuts: 00000000 targetPixelDensity: 30 resolutionScalingMode: 0 @@ -159,11 +162,12 @@ PlayerSettings: iPhone: com.Cathei.BakingSheet buildNumber: Standalone: 0 + VisionOS: 0 iPhone: 0 tvOS: 0 overrideDefaultApplicationIdentifier: 0 AndroidBundleVersionCode: 1 - AndroidMinSdkVersion: 19 + AndroidMinSdkVersion: 22 AndroidTargetSdkVersion: 0 AndroidPreferredInstallLocation: 1 aotOptions: @@ -176,12 +180,15 @@ PlayerSettings: APKExpansionFiles: 0 keepLoadedShadersAlive: 0 StripUnusedMeshComponents: 1 + strictShaderVariantMatching: 0 VertexChannelCompressionMask: 4054 iPhoneSdkVersion: 988 - iOSTargetOSVersionString: 11.0 + iOSTargetOSVersionString: 12.0 tvOSSdkVersion: 0 tvOSRequireExtendedGameController: 0 - tvOSTargetOSVersionString: 11.0 + tvOSTargetOSVersionString: 12.0 + VisionOSSdkVersion: 0 + VisionOSTargetOSVersionString: 1.0 uIPrerenderedIcon: 0 uIRequiresPersistentWiFi: 0 uIRequiresFullScreen: 1 @@ -219,6 +226,7 @@ PlayerSettings: iOSLaunchScreeniPadCustomStoryboardPath: iOSDeviceRequirements: [] iOSURLSchemes: [] + macOSURLSchemes: [] iOSBackgroundModes: 0 iOSMetalForceHardShadows: 0 metalEditorSupport: 1 @@ -228,8 +236,10 @@ PlayerSettings: appleDeveloperTeamID: iOSManualSigningProvisioningProfileID: tvOSManualSigningProvisioningProfileID: + VisionOSManualSigningProvisioningProfileID: iOSManualSigningProvisioningProfileType: 0 tvOSManualSigningProvisioningProfileType: 0 + VisionOSManualSigningProvisioningProfileType: 0 appleEnableAutomaticSigning: 0 iOSRequireARKit: 0 iOSAutomaticallyDetectAndAddCapabilities: 1 @@ -244,6 +254,7 @@ PlayerSettings: useCustomLauncherGradleManifest: 0 useCustomBaseGradleTemplate: 0 useCustomGradlePropertiesTemplate: 0 + useCustomGradleSettingsTemplate: 0 useCustomProguardFile: 0 AndroidTargetArchitectures: 1 AndroidTargetDevices: 0 @@ -251,6 +262,7 @@ PlayerSettings: androidSplashScreen: {fileID: 0} AndroidKeystoreName: AndroidKeyaliasName: + AndroidEnableArmv9SecurityFeatures: 0 AndroidBuildApkPerCpuArchitecture: 0 AndroidTVCompatibility: 0 AndroidIsGame: 1 @@ -264,7 +276,6 @@ PlayerSettings: banner: {fileID: 0} androidGamepadSupportLevel: 0 chromeosInputEmulation: 1 - AndroidMinifyWithR8: 0 AndroidMinifyRelease: 0 AndroidMinifyDebug: 0 AndroidValidateAppBundleSize: 1 @@ -379,6 +390,7 @@ PlayerSettings: - m_BuildTarget: WebGL m_StaticBatching: 0 m_DynamicBatching: 0 + m_BuildTargetShaderSettings: [] m_BuildTargetGraphicsJobs: - m_BuildTarget: MacStandaloneSupport m_GraphicsJobs: 0 @@ -430,6 +442,8 @@ PlayerSettings: m_Devices: - Oculus - OpenVR + m_DefaultShaderChunkSizeInMB: 16 + m_DefaultShaderChunkCount: 0 openGLRequireES31: 0 openGLRequireES31AEP: 0 openGLRequireES32: 0 @@ -439,8 +453,11 @@ PlayerSettings: iPhone: 1 tvOS: 1 m_BuildTargetGroupLightmapEncodingQuality: [] + m_BuildTargetGroupHDRCubemapEncodingQuality: [] m_BuildTargetGroupLightmapSettings: [] + m_BuildTargetGroupLoadStoreDebugModeSettings: [] m_BuildTargetNormalMapEncoding: [] + m_BuildTargetDefaultTextureCompressionFormat: [] playModeTestRunnerEnabled: 0 runPlayModeTestAsEditModeTest: 0 actionOnDotNetUnhandledException: 1 @@ -451,6 +468,7 @@ PlayerSettings: locationUsageDescription: microphoneUsageDescription: bluetoothUsageDescription: + macOSTargetOSVersion: 10.13.0 switchNMETAOverride: switchNetLibKey: switchSocketMemoryPoolSize: 6144 @@ -458,9 +476,12 @@ PlayerSettings: switchSocketConcurrencyLimit: 14 switchScreenResolutionBehavior: 2 switchUseCPUProfiler: 0 + switchEnableFileSystemTrace: 0 switchUseGOLDLinker: 0 + switchLTOSetting: 0 switchApplicationID: 0x01004b9000490000 switchNSODependencies: + switchCompilerFlags: switchTitleNames_0: switchTitleNames_1: switchTitleNames_2: @@ -534,7 +555,6 @@ PlayerSettings: switchReleaseVersion: 0 switchDisplayVersion: 1.0.0 switchStartupUserAccount: 0 - switchTouchScreenUsage: 0 switchSupportedLanguagesMask: 0 switchLogoType: 0 switchApplicationErrorCodeCategory: @@ -576,6 +596,7 @@ PlayerSettings: switchNativeFsCacheSize: 32 switchIsHoldTypeHorizontal: 0 switchSupportedNpadCount: 8 + switchEnableTouchScreen: 1 switchSocketConfigEnabled: 0 switchTcpInitialSendBufferSize: 32 switchTcpInitialReceiveBufferSize: 64 @@ -586,7 +607,6 @@ PlayerSettings: switchSocketBufferEfficiency: 4 switchSocketInitializeEnabled: 1 switchNetworkInterfaceManagerInitializeEnabled: 1 - switchPlayerConnectionEnabled: 1 switchUseNewStyleFilepaths: 0 switchUseLegacyFmodPriorities: 1 switchUseMicroSleepForYield: 1 @@ -676,6 +696,7 @@ PlayerSettings: webGLMemorySize: 16 webGLExceptionSupport: 1 webGLNameFilesAsHashes: 0 + webGLShowDiagnostics: 0 webGLDataCaching: 1 webGLDebugSymbols: 0 webGLEmscriptenArgs: @@ -688,24 +709,43 @@ PlayerSettings: webGLLinkerTarget: 1 webGLThreadsSupport: 0 webGLDecompressionFallback: 0 + webGLInitialMemorySize: 32 + webGLMaximumMemorySize: 2048 + webGLMemoryGrowthMode: 2 + webGLMemoryLinearGrowthStep: 16 + webGLMemoryGeometricGrowthStep: 0.2 + webGLMemoryGeometricGrowthCap: 96 + webGLPowerPreference: 2 scriptingDefineSymbols: 1: + Standalone: BAKINGSHEET_RUNTIME_GOOGLECONVERTER additionalCompilerArguments: {} platformArchitecture: {} scriptingBackend: {} il2cppCompilerConfiguration: {} + il2cppCodeGeneration: {} managedStrippingLevel: + EmbeddedLinux: 1 + GameCoreScarlett: 1 + GameCoreXboxOne: 1 + Nintendo Switch: 1 + PS4: 1 + PS5: 1 + QNX: 1 + Stadia: 1 + VisionOS: 1 + WebGL: 1 + Windows Store Apps: 1 + XboxOne: 1 iPhone: 3 + tvOS: 1 incrementalIl2cppBuild: {} suppressCommonWarnings: 1 allowUnsafeCode: 0 useDeterministicCompilation: 1 - useReferenceAssemblies: 1 - enableRoslynAnalyzers: 1 additionalIl2CppArgs: scriptingRuntimeVersion: 1 gcIncremental: 1 - assemblyVersionValidation: 1 gcWBarrierValidation: 0 apiCompatibilityLevelPerPlatform: {} m_RenderingPath: 1 @@ -778,6 +818,11 @@ PlayerSettings: luminVersion: m_VersionCode: 1 m_VersionName: + hmiPlayerDataPath: + hmiForceSRGBBlit: 1 + embeddedLinuxEnableGamepadInput: 1 + hmiLogStartupTiming: 0 + hmiCpuConfiguration: apiCompatibilityLevel: 6 activeInputHandler: 0 windowsGamepadBackendHint: 0 @@ -788,4 +833,7 @@ PlayerSettings: organizationId: cloudEnabled: 0 legacyClampBlendShapeWeights: 0 + hmiLoadingImage: {fileID: 0} + platformRequiresReadableAssets: 0 virtualTexturingSupportEnabled: 0 + insecureHttpOption: 0 diff --git a/UnityProject/ProjectSettings/ProjectVersion.txt b/UnityProject/ProjectSettings/ProjectVersion.txt index da76706..629f7d4 100644 --- a/UnityProject/ProjectSettings/ProjectVersion.txt +++ b/UnityProject/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2020.3.48f1 -m_EditorVersionWithRevision: 2020.3.48f1 (b805b124c6b7) +m_EditorVersion: 2022.3.29f1 +m_EditorVersionWithRevision: 2022.3.29f1 (8d510ca76d2b) diff --git a/copy.ps1 b/copy.ps1 new file mode 100644 index 0000000..a9c567a --- /dev/null +++ b/copy.ps1 @@ -0,0 +1,6 @@ +cp -R -force BakingSheet/Src/* UnityProject/Packages/com.cathei.bakingsheet/Runtime/Core +cp BakingSheet.Converters.Excel/*.cs UnityProject/Packages/com.cathei.bakingsheet/Runtime/Converters/Excel +cp BakingSheet.Converters.Google/*.cs UnityProject/Packages/com.cathei.bakingsheet/Runtime/Converters/Google +cp BakingSheet.Converters.Csv/*.cs UnityProject/Packages/com.cathei.bakingsheet/Runtime/Converters/Csv +cp BakingSheet.Converters.Json/*.cs UnityProject/Packages/com.cathei.bakingsheet/Runtime/Converters/Json +cp *.md UnityProject/Packages/com.cathei.bakingsheet/ \ No newline at end of file