diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index dd63020..6696938 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,7 +1,7 @@ name: Upload release + env: - MOD_ID: 3484 - KSP2_ID: 22407 + SPACEDOCK_MOD_ID: 3484 on: release: @@ -14,26 +14,29 @@ jobs: steps: - name: Checkout repository uses: actions/checkout@v4 + with: + lfs: true - name: Download NuGet id: download-nuget - run: | - sudo curl -o /usr/local/bin/nuget.exe https://dist.nuget.org/win-x86-commandline/latest/nuget.exe + run: sudo curl -o /usr/local/bin/nuget.exe https://dist.nuget.org/win-x86-commandline/latest/nuget.exe - name: Install jq uses: dcarbone/install-jq-action@v2.1.0 - name: Build the solution + run: dotnet build "CommunityResources.sln" -c Release + + - name: Extract current version + id: get-version run: | version=$(jq -r '.version' plugin_template/swinfo.json) echo "Version is $version" echo "version=$version" >> $GITHUB_ENV - dotnet build "CommunityResources.sln" -c Release echo "release_filename=CommunityResources-$version.zip" >> $GITHUB_ENV echo "zip=$(ls -1 dist/CommunityResources-*.zip | head -n 1)" >> $GITHUB_ENV echo "upload_url=$(wget -qO- https://api.github.com/repos/$GITHUB_REPOSITORY/releases | jq '.[0].upload_url' | tr -d \")" >> $GITHUB_ENV - echo "changelog=$(wget -qO- https://api.github.com/repos/$GITHUB_REPOSITORY/releases | jq '.[0].body' | tr -d \")" >> $GITHUB_ENV - echo "${{ env.changelog }}" > ./changelog.md + wget -qO- https://api.github.com/repos/$GITHUB_REPOSITORY/releases | jq -r '.[0].body' > ./changelog.md - name: Upload zip to release uses: shogo82148/actions-upload-release-asset@v1.7.2 @@ -44,32 +47,17 @@ jobs: asset_path: ${{ env.zip }} asset_name: ${{ env.release_filename }} asset_content_type: application/zip - + - name: Add Mask run: echo "::add-mask::${{ secrets.SPACEDOCK_PASSWORD }}" - - - name: Log in to spacedock - run: | - login_response=$(curl -F username=${{ secrets.SPACEDOCK_USER }} -F password=${{ secrets.SPACEDOCK_PASSWORD }} -c ./cookies "https://spacedock.info/api/login") - login_errored=$(echo $login_response | jq .error) - if [ "$login_errored" == "true" ]; then - echo "Login to space dock errored: $(echo $login_response | jq .reason)" - exit 1 - else - echo "Login to space dock successful" - fi - - - name: Query latest game version - run: | - echo "LATEST_GAME_VERSION=$(curl 'https://spacedock.info/api/${{ env.KSP2_ID }}/versions' | jq '.[0].friendly_version' | tr -d \")" >> $GITHUB_ENV - - - name: Update mod on spacedock - run: | - result=$(curl -b ./cookies -F "version=${{ env.version }}" -F "changelog=@./changelog.md" -F "game-version=${{ env.LATEST_GAME_VERSION }}" -F "notify-followers=yes" -F "zipball=@${{ env.zip }}" "https://spacedock.info/api/mod/${{ env.MOD_ID }}/update") - errored=$(echo $result | jq .error) - if [ "$errored" == "true" ]; then - echo "Upload to space dock errored: $(echo $result | jq .reason)" - exit 1 - else - echo "Upload to space dock successful" - fi + + - name: Update mod on SpaceDock + uses: KSP2Community/spacedock-upload@v1.0.0 + with: + username: ${{ secrets.SPACEDOCK_USER }} + password: ${{ secrets.SPACEDOCK_PASSWORD }} + game_id: 22407 + mod_id: ${{ env.SPACEDOCK_MOD_ID }} + version: ${{ env.version }} + zipball: ${{ env.zip }} + changelog: ./changelog.md \ No newline at end of file diff --git a/Unity/Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset b/Unity/Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset deleted file mode 100644 index b1323df..0000000 --- a/Unity/Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset +++ /dev/null @@ -1,40 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: bbb281ee3bf0b054c82ac2347e9e782c, type: 3} - m_Name: Default Local Group - m_EditorClassIdentifier: - m_GroupName: Default Local Group - m_Data: - m_SerializedData: [] - m_GUID: 3a5b7ca429dc31144b22e2fd82a4a16e - m_SerializeEntries: - - m_GUID: eb1871ffd0f3d7c46acfd28361abed4b - m_Address: Assets/CR_ICO_Water.png - m_ReadOnly: 0 - m_SerializedLabels: - - ui_sprite - - m_GUID: 63029092d26973d469c81be49089f7be - m_Address: Assets/CR_ICO_Oxygen.png - m_ReadOnly: 0 - m_SerializedLabels: - - ui_sprite - - m_GUID: 69151cf82d978b1489a1a660a98590c9 - m_Address: Assets/CR_ICO_Food.png - m_ReadOnly: 0 - m_SerializedLabels: - - ui_sprite - m_ReadOnly: 0 - m_Settings: {fileID: 11400000, guid: 3a7f458fd5b05d443a8f09f94e86c188, type: 2} - m_SchemaSet: - m_Schemas: - - {fileID: 11400000, guid: 81d19bba49853ef4cb2ece105a933d57, type: 2} - - {fileID: 11400000, guid: 4f32637e3013f0e4aa9c4e36773deab3, type: 2} diff --git a/Unity/ProjectSettings/ProjectVersion.txt b/Unity/ProjectSettings/ProjectVersion.txt deleted file mode 100644 index 02057f2..0000000 --- a/Unity/ProjectSettings/ProjectVersion.txt +++ /dev/null @@ -1,2 +0,0 @@ -m_EditorVersion: 2020.3.33f1 -m_EditorVersionWithRevision: 2020.3.33f1 (915a7af8b0d5) diff --git a/plugin_template/addressables/AddressablesLink/link.xml b/plugin_template/addressables/AddressablesLink/link.xml index b79471c..7dfb6f3 100644 --- a/plugin_template/addressables/AddressablesLink/link.xml +++ b/plugin_template/addressables/AddressablesLink/link.xml @@ -9,7 +9,7 @@ - + \ No newline at end of file diff --git a/plugin_template/addressables/StandaloneWindows64/communityresources_assets_all_68156aa968b13548006aa784a6601227.bundle b/plugin_template/addressables/StandaloneWindows64/communityresources_assets_all_68156aa968b13548006aa784a6601227.bundle new file mode 100644 index 0000000..73fb67e Binary files /dev/null and b/plugin_template/addressables/StandaloneWindows64/communityresources_assets_all_68156aa968b13548006aa784a6601227.bundle differ diff --git a/plugin_template/addressables/catalog.json b/plugin_template/addressables/catalog.json index f80374a..513f560 100644 --- a/plugin_template/addressables/catalog.json +++ b/plugin_template/addressables/catalog.json @@ -1 +1 @@ -{"m_LocatorId":"AddressablesMainContentCatalog","m_InstanceProviderData":{"m_Id":"UnityEngine.ResourceManagement.ResourceProviders.InstanceProvider","m_ObjectType":{"m_AssemblyName":"Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null","m_ClassName":"UnityEngine.ResourceManagement.ResourceProviders.InstanceProvider"},"m_Data":""},"m_SceneProviderData":{"m_Id":"UnityEngine.ResourceManagement.ResourceProviders.SceneProvider","m_ObjectType":{"m_AssemblyName":"Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null","m_ClassName":"UnityEngine.ResourceManagement.ResourceProviders.SceneProvider"},"m_Data":""},"m_ResourceProviderData":[{"m_Id":"UnityEngine.ResourceManagement.ResourceProviders.AssetBundleProvider","m_ObjectType":{"m_AssemblyName":"Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null","m_ClassName":"UnityEngine.ResourceManagement.ResourceProviders.AssetBundleProvider"},"m_Data":""},{"m_Id":"UnityEngine.ResourceManagement.ResourceProviders.BundledAssetProvider","m_ObjectType":{"m_AssemblyName":"Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null","m_ClassName":"UnityEngine.ResourceManagement.ResourceProviders.BundledAssetProvider"},"m_Data":""},{"m_Id":"UnityEngine.ResourceManagement.ResourceProviders.BundledAssetProvider","m_ObjectType":{"m_AssemblyName":"Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null","m_ClassName":"UnityEngine.ResourceManagement.ResourceProviders.BundledAssetProvider"},"m_Data":""}],"m_ProviderIds":["UnityEngine.ResourceManagement.ResourceProviders.AssetBundleProvider","UnityEngine.ResourceManagement.ResourceProviders.BundledAssetProvider"],"m_InternalIds":["{SpaceWarpPaths.CommunityResources}\\addressables\\StandaloneWindows64\\defaultlocalgroup_assets_all_ea3e451b5dc39c7ec9b3b86c3ec27c6a.bundle","Assets/CR_ICO_Food.png","Assets/CR_ICO_Oxygen.png","Assets/CR_ICO_Water.png"],"m_KeyDataString":"CAAAAABEAAAAZGVmYXVsdGxvY2FsZ3JvdXBfYXNzZXRzX2FsbF9lYTNlNDUxYjVkYzM5YzdlYzliM2I4NmMzZWMyN2M2YS5idW5kbGUAFgAAAEFzc2V0cy9DUl9JQ09fRm9vZC5wbmcAIAAAADY5MTUxY2Y4MmQ5NzhiMTQ4OWExYTY2MGE5ODU5MGM5AAkAAAB1aV9zcHJpdGUAGAAAAEFzc2V0cy9DUl9JQ09fT3h5Z2VuLnBuZwAgAAAANjMwMjkwOTJkMjY5NzNkNDY5YzgxYmU0OTA4OWY3YmUAFwAAAEFzc2V0cy9DUl9JQ09fV2F0ZXIucG5nACAAAABlYjE4NzFmZmQwZjNkN2M0NmFjZmQyODM2MWFiZWQ0Yg==","m_BucketDataString":"CAAAAAQAAAABAAAAAAAAAE0AAAACAAAAAQAAAAIAAABoAAAAAgAAAAEAAAACAAAAjQAAAAYAAAABAAAAAgAAAAMAAAAEAAAABQAAAAYAAACbAAAAAgAAAAMAAAAEAAAAuAAAAAIAAAADAAAABAAAAN0AAAACAAAABQAAAAYAAAD5AAAAAgAAAAUAAAAGAAAA","m_EntryDataString":"BwAAAAAAAAAAAAAA/////wAAAAAAAAAAAAAAAAAAAAABAAAAAQAAAAAAAADzAUaD/////wEAAAABAAAAAQAAAAEAAAAAAAAA8wFGg/////8BAAAAAgAAAAIAAAABAAAAAAAAAPMBRoP/////BAAAAAEAAAACAAAAAQAAAAAAAADzAUaD/////wQAAAACAAAAAwAAAAEAAAAAAAAA8wFGg/////8GAAAAAQAAAAMAAAABAAAAAAAAAPMBRoP/////BgAAAAIAAAA=","m_ExtraDataString":"B0xVbml0eS5SZXNvdXJjZU1hbmFnZXIsIFZlcnNpb249MC4wLjAuMCwgQ3VsdHVyZT1uZXV0cmFsLCBQdWJsaWNLZXlUb2tlbj1udWxsSlVuaXR5RW5naW5lLlJlc291cmNlTWFuYWdlbWVudC5SZXNvdXJjZVByb3ZpZGVycy5Bc3NldEJ1bmRsZVJlcXVlc3RPcHRpb25zqgIAAHsAIgBtAF8ASABhAHMAaAAiADoAIgBlAGEAMwBlADQANQAxAGIANQBkAGMAMwA5AGMANwBlAGMAOQBiADMAYgA4ADYAYwAzAGUAYwAyADcAYwA2AGEAIgAsACIAbQBfAEMAcgBjACIAOgAzADcANgAyADgANgA0ADkAMwA3ACwAIgBtAF8AVABpAG0AZQBvAHUAdAAiADoAMAAsACIAbQBfAEMAaAB1AG4AawBlAGQAVAByAGEAbgBzAGYAZQByACIAOgBmAGEAbABzAGUALAAiAG0AXwBSAGUAZABpAHIAZQBjAHQATABpAG0AaQB0ACIAOgAtADEALAAiAG0AXwBSAGUAdAByAHkAQwBvAHUAbgB0ACIAOgAwACwAIgBtAF8AQgB1AG4AZABsAGUATgBhAG0AZQAiADoAIgAyAGIAMgA4ADUAZAA4AGEANQA4AGMANAA2ADIAOAAyADAAOQBkAGQAMABmADYAYwBmAGYANAA0AGIAMQA0ADYAIgAsACIAbQBfAEEAcwBzAGUAdABMAG8AYQBkAE0AbwBkAGUAIgA6ADAALAAiAG0AXwBCAHUAbgBkAGwAZQBTAGkAegBlACIAOgA1ADQANQA1ACwAIgBtAF8AVQBzAGUAQwByAGMARgBvAHIAQwBhAGMAaABlAGQAQgB1AG4AZABsAGUAcwAiADoAdAByAHUAZQAsACIAbQBfAFUAcwBlAFUAVwBSAEYAbwByAEwAbwBjAGEAbABCAHUAbgBkAGwAZQBzACIAOgBmAGEAbABzAGUALAAiAG0AXwBDAGwAZQBhAHIATwB0AGgAZQByAEMAYQBjAGgAZQBkAFYAZQByAHMAaQBvAG4AcwBXAGgAZQBuAEwAbwBhAGQAZQBkACIAOgBmAGEAbABzAGUAfQA=","m_resourceTypes":[{"m_AssemblyName":"Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null","m_ClassName":"UnityEngine.ResourceManagement.ResourceProviders.IAssetBundleResource"},{"m_AssemblyName":"UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null","m_ClassName":"UnityEngine.Texture2D"},{"m_AssemblyName":"UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null","m_ClassName":"UnityEngine.Sprite"}],"m_InternalIdPrefixes":[]} \ No newline at end of file +{"m_LocatorId":"AddressablesMainContentCatalog","m_BuildResultHash":"dec71fea942764e18e3b433b420d7933","m_InstanceProviderData":{"m_Id":"UnityEngine.ResourceManagement.ResourceProviders.InstanceProvider","m_ObjectType":{"m_AssemblyName":"Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null","m_ClassName":"UnityEngine.ResourceManagement.ResourceProviders.InstanceProvider"},"m_Data":""},"m_SceneProviderData":{"m_Id":"UnityEngine.ResourceManagement.ResourceProviders.SceneProvider","m_ObjectType":{"m_AssemblyName":"Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null","m_ClassName":"UnityEngine.ResourceManagement.ResourceProviders.SceneProvider"},"m_Data":""},"m_ResourceProviderData":[{"m_Id":"UnityEngine.ResourceManagement.ResourceProviders.AssetBundleProvider","m_ObjectType":{"m_AssemblyName":"Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null","m_ClassName":"UnityEngine.ResourceManagement.ResourceProviders.AssetBundleProvider"},"m_Data":""},{"m_Id":"UnityEngine.ResourceManagement.ResourceProviders.BundledAssetProvider","m_ObjectType":{"m_AssemblyName":"Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null","m_ClassName":"UnityEngine.ResourceManagement.ResourceProviders.BundledAssetProvider"},"m_Data":""},{"m_Id":"UnityEngine.ResourceManagement.ResourceProviders.BundledAssetProvider","m_ObjectType":{"m_AssemblyName":"Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null","m_ClassName":"UnityEngine.ResourceManagement.ResourceProviders.BundledAssetProvider"},"m_Data":""}],"m_ProviderIds":["UnityEngine.ResourceManagement.ResourceProviders.AssetBundleProvider","UnityEngine.ResourceManagement.ResourceProviders.BundledAssetProvider"],"m_InternalIds":["{SpaceWarpPaths.CommunityResources}\\addressables\\StandaloneWindows64\\communityresources_assets_all_68156aa968b13548006aa784a6601227.bundle","Assets/Resource Icons/CR_ICO_Food.png","Assets/Resource Icons/CR_ICO_Oxygen.png","Assets/Resource Icons/CR_ICO_Water.png"],"m_KeyDataString":"CAAAAABFAAAAY29tbXVuaXR5cmVzb3VyY2VzX2Fzc2V0c19hbGxfNjgxNTZhYTk2OGIxMzU0ODAwNmFhNzg0YTY2MDEyMjcuYnVuZGxlAA8AAABDUl9JQ09fRm9vZC5wbmcAIAAAAGI4ZDkxZGM4NzBiNmIyNDQ3OGUzYjA3OGUwODI1YTljAAkAAAB1aV9zcHJpdGUAEQAAAENSX0lDT19PeHlnZW4ucG5nACAAAABlODQzZDJkM2IyYjFhZTY0NGJjZDdjOGNjMWFhYzk5MwAQAAAAQ1JfSUNPX1dhdGVyLnBuZwAgAAAAODY5NmI4Y2I0YzY1Yjk1NGE4NjAyMmZmMmRmYTZlMDA=","m_BucketDataString":"CAAAAAQAAAABAAAAAAAAAE4AAAACAAAAAQAAAAIAAABiAAAAAgAAAAEAAAACAAAAhwAAAAYAAAABAAAAAgAAAAMAAAAEAAAABQAAAAYAAACVAAAAAgAAAAMAAAAEAAAAqwAAAAIAAAADAAAABAAAANAAAAACAAAABQAAAAYAAADlAAAAAgAAAAUAAAAGAAAA","m_EntryDataString":"BwAAAAAAAAAAAAAA/////wAAAAAAAAAAAAAAAAAAAAABAAAAAQAAAAAAAABVVjQe/////wEAAAABAAAAAQAAAAEAAAAAAAAAVVY0Hv////8BAAAAAgAAAAIAAAABAAAAAAAAAFVWNB7/////BAAAAAEAAAACAAAAAQAAAAAAAABVVjQe/////wQAAAACAAAAAwAAAAEAAAAAAAAAVVY0Hv////8GAAAAAQAAAAMAAAABAAAAAAAAAFVWNB7/////BgAAAAIAAAA=","m_ExtraDataString":"B0xVbml0eS5SZXNvdXJjZU1hbmFnZXIsIFZlcnNpb249MC4wLjAuMCwgQ3VsdHVyZT1uZXV0cmFsLCBQdWJsaWNLZXlUb2tlbj1udWxsSlVuaXR5RW5naW5lLlJlc291cmNlTWFuYWdlbWVudC5SZXNvdXJjZVByb3ZpZGVycy5Bc3NldEJ1bmRsZVJlcXVlc3RPcHRpb25zqgIAAHsAIgBtAF8ASABhAHMAaAAiADoAIgA2ADgAMQA1ADYAYQBhADkANgA4AGIAMQAzADUANAA4ADAAMAA2AGEAYQA3ADgANABhADYANgAwADEAMgAyADcAIgAsACIAbQBfAEMAcgBjACIAOgAzADEAMQAwADMAMgA2ADAAMQA4ACwAIgBtAF8AVABpAG0AZQBvAHUAdAAiADoAMAAsACIAbQBfAEMAaAB1AG4AawBlAGQAVAByAGEAbgBzAGYAZQByACIAOgBmAGEAbABzAGUALAAiAG0AXwBSAGUAZABpAHIAZQBjAHQATABpAG0AaQB0ACIAOgAtADEALAAiAG0AXwBSAGUAdAByAHkAQwBvAHUAbgB0ACIAOgAwACwAIgBtAF8AQgB1AG4AZABsAGUATgBhAG0AZQAiADoAIgA3ADIAZAA0ADgAOABhAGIAMwBhADMANwAzAGQAMABlAGYAMQAwAGQANQAxAGQAMwBiADYAMwAwADUAOAA0AGUAIgAsACIAbQBfAEEAcwBzAGUAdABMAG8AYQBkAE0AbwBkAGUAIgA6ADAALAAiAG0AXwBCAHUAbgBkAGwAZQBTAGkAegBlACIAOgA1ADUAOAA0ACwAIgBtAF8AVQBzAGUAQwByAGMARgBvAHIAQwBhAGMAaABlAGQAQgB1AG4AZABsAGUAcwAiADoAdAByAHUAZQAsACIAbQBfAFUAcwBlAFUAVwBSAEYAbwByAEwAbwBjAGEAbABCAHUAbgBkAGwAZQBzACIAOgBmAGEAbABzAGUALAAiAG0AXwBDAGwAZQBhAHIATwB0AGgAZQByAEMAYQBjAGgAZQBkAFYAZQByAHMAaQBvAG4AcwBXAGgAZQBuAEwAbwBhAGQAZQBkACIAOgBmAGEAbABzAGUAfQA=","m_resourceTypes":[{"m_AssemblyName":"Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null","m_ClassName":"UnityEngine.ResourceManagement.ResourceProviders.IAssetBundleResource"},{"m_AssemblyName":"UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null","m_ClassName":"UnityEngine.Texture2D"},{"m_AssemblyName":"UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null","m_ClassName":"UnityEngine.Sprite"}],"m_InternalIdPrefixes":[]} \ No newline at end of file diff --git a/plugin_template/addressables/settings.json b/plugin_template/addressables/settings.json index 680568c..6096b82 100644 --- a/plugin_template/addressables/settings.json +++ b/plugin_template/addressables/settings.json @@ -1 +1 @@ -{"m_buildTarget":"StandaloneWindows64","m_SettingsHash":"","m_CatalogLocations":[{"m_Keys":["AddressablesMainContentCatalog"],"m_InternalId":"{UnityEngine.AddressableAssets.Addressables.RuntimePath}/catalog.json","m_Provider":"UnityEngine.AddressableAssets.ResourceProviders.ContentCatalogProvider","m_Dependencies":[],"m_ResourceType":{"m_AssemblyName":"Unity.Addressables, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null","m_ClassName":"UnityEngine.AddressableAssets.ResourceLocators.ContentCatalogData"},"SerializedData":[]}],"m_ProfileEvents":false,"m_LogResourceManagerExceptions":true,"m_ExtraInitializationData":[],"m_DisableCatalogUpdateOnStart":false,"m_IsLocalCatalogInBundle":false,"m_CertificateHandlerType":{"m_AssemblyName":"","m_ClassName":""},"m_AddressablesVersion":"1.18.19","m_maxConcurrentWebRequests":500,"m_CatalogRequestsTimeout":0} \ No newline at end of file +{"m_buildTarget":"StandaloneWindows64","m_SettingsHash":"1180c37427ee7b87d3329b4c4ddd63d1","m_CatalogLocations":[{"m_Keys":["AddressablesMainContentCatalog"],"m_InternalId":"{UnityEngine.AddressableAssets.Addressables.RuntimePath}/catalog.json","m_Provider":"UnityEngine.AddressableAssets.ResourceProviders.ContentCatalogProvider","m_Dependencies":[],"m_ResourceType":{"m_AssemblyName":"Unity.Addressables, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null","m_ClassName":"UnityEngine.AddressableAssets.ResourceLocators.ContentCatalogData"},"SerializedData":[7,76,85,110,105,116,121,46,82,101,115,111,117,114,99,101,77,97,110,97,103,101,114,44,32,86,101,114,115,105,111,110,61,48,46,48,46,48,46,48,44,32,67,117,108,116,117,114,101,61,110,101,117,116,114,97,108,44,32,80,117,98,108,105,99,75,101,121,84,111,107,101,110,61,110,117,108,108,75,85,110,105,116,121,69,110,103,105,110,101,46,82,101,115,111,117,114,99,101,77,97,110,97,103,101,109,101,110,116,46,82,101,115,111,117,114,99,101,80,114,111,118,105,100,101,114,115,46,80,114,111,118,105,100,101,114,76,111,97,100,82,101,113,117,101,115,116,79,112,116,105,111,110,115,50,0,0,0,123,0,34,0,109,0,95,0,73,0,103,0,110,0,111,0,114,0,101,0,70,0,97,0,105,0,108,0,117,0,114,0,101,0,115,0,34,0,58,0,116,0,114,0,117,0,101,0,125,0]}],"m_ProfileEvents":false,"m_LogResourceManagerExceptions":true,"m_ExtraInitializationData":[],"m_DisableCatalogUpdateOnStart":false,"m_IsLocalCatalogInBundle":false,"m_CertificateHandlerType":{"m_AssemblyName":"","m_ClassName":""},"m_AddressablesVersion":"1.21.20","m_maxConcurrentWebRequests":3,"m_CatalogRequestsTimeout":0} \ No newline at end of file diff --git a/plugin_template/localizations/localizations.csv b/plugin_template/localizations/localizations.csv new file mode 100644 index 0000000..169a0e9 --- /dev/null +++ b/plugin_template/localizations/localizations.csv @@ -0,0 +1,41 @@ +Key,Type,Desc,English,Chinese (Simplified),French + +Resource/DisplayName/Oxygen,Text,,Oxygen,氧气,Oxygène +Resource/Abbreviation/O2,Text,,O2,O2,O2 + +Resource/DisplayName/CarbonDioxide,Text,,Carbon Dioxide,二氧化碳,Dioxyde de Carbone +Resource/Abbreviation/CO2,Text,,CO2,CO2,CO2 + +Resource/DisplayName/Water,Text,,Water,水,Eau +Resource/Abbreviation/H2O,Text,,H2O,H2O,H2O + +Resource/DisplayName/WasteWater,Text,,Waste Water,废水,Eau Usée +Resource/Abbreviation/WaH2O,Text,,WaH2O,WaH2O,WaH2O + +Resource/DisplayName/Food,Text,,Food,食物,Nourriture +Resource/Abbreviation/FD,Text,,FD,FD,NT + +Resource/DisplayName/Waste,Text,,Waste,垃圾,Déchets +Resource/Abbreviation/WST,Text,,WST,WST,DE + +Resource/DisplayName/Fertilizer,Text,,Fertilizer,肥料,Engrais +Resource/Abbreviation/Frt,Text,,Frt,Frt,Eng + +Resource/DisplayName/Hydrolox,Text,,Hydrolox,氢基,Hydrolox +Resource/Abbreviation/HO,Text,,HO,HO,HO + +Resource/DisplayName/Argon,Text,,Argon Gas,氩气,Argon +Resource/Abbreviation/Ar,Text,,Ar,Ar,Ar + +Resource/DisplayName/Lithium,Text,,Lithium,锂,Lithium +Resource/Abbreviation/Li,Text,,Li,Li,Li + +VAB/Tooltip/Food,Text,,Food,食物,Nourriture +VAB/Tooltip/Water,Text,,Water,水,Eau +VAB/Tooltip/Oxygen,Text,,Oxygen,氧气,Oxygène +VAB/Tooltip/CarbonDioxide,Text,,Carbon Dioxide,二氧化碳,Dioxyde de Carbone +VAB/Tooltip/WasteWater,Text,,Waste Water,废水,Eau Usée +VAB/Tooltip/Waste,Text,,Waste,垃圾,Déchets +VAB/Tooltip/Fertilizer,Text,,Fertilizer,肥料,Engrais +VAB/Tooltip/Argon,Text,,Argon,氩,Argon +VAB/Tooltip/Lithium,Text,,Lithium,锂,Lithium diff --git a/plugin_template/patches/gasses.patch b/plugin_template/patches/gasses.patch index a5803f2..ad93242 100644 --- a/plugin_template/patches/gasses.patch +++ b/plugin_template/patches/gasses.patch @@ -38,7 +38,7 @@ transferMode: $TM_PUMP; costPerUnit: 0.8; NonStageable: true; - resourceIconAssetAddress: "Assets/CR_ICO_Oxygen.png"; + resourceIconAssetAddress: "CR_ICO_Oxygen.png"; vfxFuelType: "Pressurized"; } diff --git a/plugin_template/patches/libraries/_flowmodes.patch b/plugin_template/patches/libraries/_flowmodes.patch new file mode 100644 index 0000000..5a1b670 --- /dev/null +++ b/plugin_template/patches/libraries/_flowmodes.patch @@ -0,0 +1,14 @@ +// KSP.Sim.ResourceSystem.ResourceFlowMode +// 0 : ALL_VESSEL +// 1 : NO_FLOW +// 2 : NULL +// 3 : STACK_PRIORITY_SEARCH +// 4 : STAGE_PRIORITY_FLOW +// 5 : STAGE_STACK_FLOW_BALANCE + +$FM_ALL_VESSEL: 0; +$FM_NO_FLOW: 1; +$FM_NULL: 2; +$FM_STACK_PRIORITY_SEARCH: 3; +$FM_STAGE_PRIORITY_FLOW: 4; +$FM_STAGE_STACK_FLOW_BALANCE: 5; \ No newline at end of file diff --git a/plugin_template/patches/libraries/_transfermodes.patch b/plugin_template/patches/libraries/_transfermodes.patch new file mode 100644 index 0000000..646682f --- /dev/null +++ b/plugin_template/patches/libraries/_transfermodes.patch @@ -0,0 +1,6 @@ +// KSP.Sim.ResourceSystem.ResourceTransferMode +// 0 : NONE +// 1 : PUMP + +$TM_NONE: 0; +$TM_PUMP: 1; \ No newline at end of file diff --git a/plugin_template/patches/liquids.patch b/plugin_template/patches/liquids.patch index 4335c78..4320274 100644 --- a/plugin_template/patches/liquids.patch +++ b/plugin_template/patches/liquids.patch @@ -38,7 +38,7 @@ transferMode: $TM_PUMP; costPerUnit: 0.8; NonStageable: true; - resourceIconAssetAddress: "Assets/CR_ICO_Water.png"; + resourceIconAssetAddress: "CR_ICO_Water.png"; vfxFuelType: "NoFuel"; } diff --git a/plugin_template/patches/solids.patch b/plugin_template/patches/solids.patch index e410477..5af30f3 100644 --- a/plugin_template/patches/solids.patch +++ b/plugin_template/patches/solids.patch @@ -38,7 +38,7 @@ transferMode: $TM_PUMP; costPerUnit: 0.8; NonStageable: true; - resourceIconAssetAddress: "Assets/CR_ICO_Food.png"; + resourceIconAssetAddress: "CR_ICO_Food.png"; vfxFuelType: "NoFuel"; } diff --git a/plugin_template/swinfo.json b/plugin_template/swinfo.json index 7c22b7b..26bf573 100644 --- a/plugin_template/swinfo.json +++ b/plugin_template/swinfo.json @@ -1,30 +1,30 @@ { - "spec": "1.3", - "mod_id": "CommunityResources", - "author": "KSP2 Community", - "name": "Community Resources", - "description": "Adds generic resources for mods to use", - "source": "https://github.com/KSP2Community/CommunityResources", - "version": "0.2.1", - "version_check": "https://raw.githubusercontent.com/KSP2Community/CommunityResources/main/plugin_template/swinfo.json", - "ksp2_version": { - "min": "0.1.5", - "max": "*" - }, - "dependencies": [ + "spec": "2.0", + "mod_id": "CommunityResources", + "author": "KSP2 Community", + "name": "Community Resources", + "description": "Adds generic resources for mods to use", + "source": "https://github.com/KSP2Community/CommunityResources", + "version": "0.2.2", + "version_check": "https://raw.githubusercontent.com/KSP2Community/CommunityResources/main/plugin_template/swinfo.json", + "ksp2_version": { + "min": "0.2.0", + "max": "*" + }, + "dependencies": [ { - "id": "com.github.x606.spacewarp", - "version": { - "min": "1.5.0", - "max": "*" - } + "id": "com.github.x606.spacewarp", + "version": { + "min": "1.8.0", + "max": "*" + } }, { - "id": "PatchManager", - "version": { - "min": "0.3.0", - "max": "*" - } + "id": "PatchManager", + "version": { + "min": "0.9.3", + "max": "*" + } } - ] -} \ No newline at end of file + ] +} diff --git a/Unity/.gitignore b/src/CommunityResources.Unity/.gitignore similarity index 100% rename from Unity/.gitignore rename to src/CommunityResources.Unity/.gitignore diff --git a/Unity/Assets/AddressableAssetsData.meta b/src/CommunityResources.Unity/Assets/AddressableAssetsData.meta similarity index 77% rename from Unity/Assets/AddressableAssetsData.meta rename to src/CommunityResources.Unity/Assets/AddressableAssetsData.meta index 80e5bb6..520cf6a 100644 --- a/Unity/Assets/AddressableAssetsData.meta +++ b/src/CommunityResources.Unity/Assets/AddressableAssetsData.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 1b7b71232c1900845bb040bba3a27502 +guid: 9d19f365a6983f0439d2e764517c35c1 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Unity/Assets/AddressableAssetsData/AddressableAssetSettings.asset b/src/CommunityResources.Unity/Assets/AddressableAssetsData/AddressableAssetSettings.asset similarity index 53% rename from Unity/Assets/AddressableAssetsData/AddressableAssetSettings.asset rename to src/CommunityResources.Unity/Assets/AddressableAssetsData/AddressableAssetSettings.asset index efa315c..61e30d2 100644 --- a/Unity/Assets/AddressableAssetsData/AddressableAssetSettings.asset +++ b/src/CommunityResources.Unity/Assets/AddressableAssetsData/AddressableAssetSettings.asset @@ -12,7 +12,10 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 468a46d0ae32c3544b7d98094e6448a9, type: 3} m_Name: AddressableAssetSettings m_EditorClassIdentifier: - m_DefaultGroup: 3a5b7ca429dc31144b22e2fd82a4a16e + m_DefaultGroup: 9cb9494eeac173845b4d61f1b6a60910 + m_currentHash: + serializedVersion: 2 + Hash: 1180c37427ee7b87d3329b4c4ddd63d1 m_OptimizeCatalogSize: 0 m_BuildRemoteCatalog: 0 m_BundleLocalCatalog: 0 @@ -20,24 +23,30 @@ MonoBehaviour: m_DisableCatalogUpdateOnStart: 0 m_IgnoreUnsupportedFilesInBuild: 0 m_UniqueBundleIds: 0 - m_NonRecursiveBuilding: 0 - m_maxConcurrentWebRequests: 500 - m_ContiguousBundles: 0 + m_NonRecursiveBuilding: 1 + m_CCDEnabled: 0 + m_maxConcurrentWebRequests: 3 + m_ContiguousBundles: 1 m_StripUnityVersionFromBundleBuild: 0 m_DisableVisibleSubAssetRepresentations: 0 m_ShaderBundleNaming: 0 m_ShaderBundleCustomNaming: m_MonoScriptBundleNaming: 0 + m_CheckForContentUpdateRestrictionsOption: 0 m_MonoScriptBundleCustomNaming: m_RemoteCatalogBuildPath: - m_Id: + m_Id: fe5af4d273a97694aafcb38d53931b25 m_RemoteCatalogLoadPath: - m_Id: + m_Id: c8379339fe794054fb89a82b29b5bf4f + m_ContentStateBuildPathProfileVariableName: + m_CustomContentStateBuildPath: m_ContentStateBuildPath: - m_overridePlayerVersion: + m_BuildAddressablesWithPlayerBuild: 0 + m_overridePlayerVersion: '[UnityEditor.PlayerSettings.bundleVersion]' m_GroupAssets: - - {fileID: 11400000, guid: 77cc8b2aa11b12a4397e078f18347609, type: 2} - - {fileID: 11400000, guid: 6cc1da26f686a5d4e8485fdffe68f1c3, type: 2} + - {fileID: 11400000, guid: 7c728c096bd0658449a4980793381829, type: 2} + - {fileID: 11400000, guid: 5839582cfdaaf3f4f8165d588beeaa2f, type: 2} + - {fileID: 11400000, guid: ca3d0e04fd2c42240ab2e5e8bd523519, type: 2} m_BuildSettings: m_CompileScriptsInVirtualMode: 0 m_CleanupStreamingAssetsAfterBuilds: 1 @@ -46,34 +55,34 @@ MonoBehaviour: m_ProfileSettings: m_Profiles: - m_InheritedParent: - m_Id: d4a0945433418754289b0ae8d66136b2 + m_Id: 9c9e23d7a65171242a4613970072f200 m_ProfileName: Default m_Values: - - m_Id: 09203fa6c0ab9c344a6cce5fa6b0209c + - m_Id: f611b199066e0f643ab7c33ff8c47c52 m_Value: '[UnityEditor.EditorUserBuildSettings.activeBuildTarget]' - - m_Id: 4796619c4077b5d4585aeb6132f7dc45 + - m_Id: ef803372bac80f34287fecb7c800ecff m_Value: Library/com.unity.addressables/aa/Windows/StandaloneWindows64 - - m_Id: 58dee49d648a4ea49a722777346fce88 + - m_Id: d8bdd29ae4f16e7478832e1c57d99bbc m_Value: '{SpaceWarpPaths.CommunityResources}/addressables/StandaloneWindows64' - - m_Id: fc398d3718f50144f963b2586985653a + - m_Id: fe5af4d273a97694aafcb38d53931b25 m_Value: ServerData/[BuildTarget] - - m_Id: 403af1d145ded73419e6503889877950 - m_Value: http://localhost/[BuildTarget] + - m_Id: c8379339fe794054fb89a82b29b5bf4f + m_Value: http://[PrivateIpAddress]:[HostingServicePort] m_ProfileEntryNames: - - m_Id: 09203fa6c0ab9c344a6cce5fa6b0209c + - m_Id: f611b199066e0f643ab7c33ff8c47c52 m_Name: BuildTarget m_InlineUsage: 0 - - m_Id: 4796619c4077b5d4585aeb6132f7dc45 - m_Name: LocalBuildPath + - m_Id: ef803372bac80f34287fecb7c800ecff + m_Name: Local.BuildPath m_InlineUsage: 0 - - m_Id: 58dee49d648a4ea49a722777346fce88 - m_Name: LocalLoadPath + - m_Id: d8bdd29ae4f16e7478832e1c57d99bbc + m_Name: Local.LoadPath m_InlineUsage: 0 - - m_Id: fc398d3718f50144f963b2586985653a - m_Name: RemoteBuildPath + - m_Id: fe5af4d273a97694aafcb38d53931b25 + m_Name: Remote.BuildPath m_InlineUsage: 0 - - m_Id: 403af1d145ded73419e6503889877950 - m_Name: RemoteLoadPath + - m_Id: c8379339fe794054fb89a82b29b5bf4f + m_Name: Remote.LoadPath m_InlineUsage: 0 m_ProfileVersion: 1 m_LabelTable: @@ -82,20 +91,21 @@ MonoBehaviour: - ui_sprite m_SchemaTemplates: [] m_GroupTemplateObjects: - - {fileID: 11400000, guid: fe340054829bd4e4daf9f3331d04545d, type: 2} + - {fileID: 11400000, guid: 7a4898cf80f958749b1bfa363e91fed4, type: 2} m_InitializationObjects: [] m_CertificateHandlerType: m_AssemblyName: m_ClassName: m_ActivePlayerDataBuilderIndex: 3 m_DataBuilders: - - {fileID: 11400000, guid: 9629e1b9fd800564c88bf7a22f2a1bb5, type: 2} - - {fileID: 11400000, guid: 70b5f7363ccd73b42a04eb32d9d9d490, type: 2} - - {fileID: 11400000, guid: f99e317fbb098484bb693755ce935fd7, type: 2} - - {fileID: 11400000, guid: aa7999a3159085746b42706ae9865e45, type: 2} - m_ActiveProfileId: d4a0945433418754289b0ae8d66136b2 + - {fileID: 11400000, guid: 21d7600d776c53d458a69ccb4f290fd3, type: 2} + - {fileID: 11400000, guid: 518e024415a051146aced8be75e0f935, type: 2} + - {fileID: 11400000, guid: 4dc324bb484a0d4438e2c0fe0b27d13b, type: 2} + - {fileID: 11400000, guid: da57cf8df40b3e342989200a183b6bf9, type: 2} + m_ActiveProfileId: 9c9e23d7a65171242a4613970072f200 m_HostingServicesManager: m_HostingServiceInfos: [] m_Settings: {fileID: 11400000} m_NextInstanceId: 0 m_RegisteredServiceTypeRefs: [] + m_PingTimeoutInMilliseconds: 5000 diff --git a/Unity/Assets/AddressableAssetsData/AddressableAssetSettings.asset.meta b/src/CommunityResources.Unity/Assets/AddressableAssetsData/AddressableAssetSettings.asset.meta similarity index 79% rename from Unity/Assets/AddressableAssetsData/AddressableAssetSettings.asset.meta rename to src/CommunityResources.Unity/Assets/AddressableAssetsData/AddressableAssetSettings.asset.meta index 74f0c3a..5c88f2b 100644 --- a/Unity/Assets/AddressableAssetsData/AddressableAssetSettings.asset.meta +++ b/src/CommunityResources.Unity/Assets/AddressableAssetsData/AddressableAssetSettings.asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 3a7f458fd5b05d443a8f09f94e86c188 +guid: 4be7cdd01452bfb4fad780f91a6935ea NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/Unity/Assets/AddressableAssetsData/AssetGroupTemplates.meta b/src/CommunityResources.Unity/Assets/AddressableAssetsData/AssetGroupTemplates.meta similarity index 77% rename from Unity/Assets/AddressableAssetsData/AssetGroupTemplates.meta rename to src/CommunityResources.Unity/Assets/AddressableAssetsData/AssetGroupTemplates.meta index 8b472dd..6e2a892 100644 --- a/Unity/Assets/AddressableAssetsData/AssetGroupTemplates.meta +++ b/src/CommunityResources.Unity/Assets/AddressableAssetsData/AssetGroupTemplates.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 97cc5e12e3f920b49bafe95b0f44991f +guid: fc9ea5fce2856c345aeadea216a6015d folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Unity/Assets/AddressableAssetsData/AssetGroupTemplates/Packed Assets.asset b/src/CommunityResources.Unity/Assets/AddressableAssetsData/AssetGroupTemplates/Packed Assets.asset similarity index 89% rename from Unity/Assets/AddressableAssetsData/AssetGroupTemplates/Packed Assets.asset rename to src/CommunityResources.Unity/Assets/AddressableAssetsData/AssetGroupTemplates/Packed Assets.asset index 2f654de..ca872a0 100644 --- a/Unity/Assets/AddressableAssetsData/AssetGroupTemplates/Packed Assets.asset +++ b/src/CommunityResources.Unity/Assets/AddressableAssetsData/AssetGroupTemplates/Packed Assets.asset @@ -1,6 +1,37 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!114 &-6141893681221511558 +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1a3c5d64ac83548c09dd1678b9f6f1cd, type: 3} + m_Name: Packed Assets + m_EditorClassIdentifier: + m_SchemaObjects: + - {fileID: 5700247699187603203} + - {fileID: 4631282858593193577} + m_Description: Pack assets into asset bundles. + m_Settings: {fileID: 11400000, guid: 4be7cdd01452bfb4fad780f91a6935ea, type: 2} +--- !u!114 &4631282858593193577 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5834b5087d578d24c926ce20cd31e6d6, type: 3} + m_Name: ContentUpdateGroupSchema + m_EditorClassIdentifier: + m_Group: {fileID: 0} + m_StaticContent: 0 +--- !u!114 &5700247699187603203 MonoBehaviour: m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} @@ -43,34 +74,3 @@ MonoBehaviour: m_ClassName: m_BundleNaming: 0 m_AssetLoadMode: 0 ---- !u!114 &-1287599956978553664 -MonoBehaviour: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5834b5087d578d24c926ce20cd31e6d6, type: 3} - m_Name: ContentUpdateGroupSchema - m_EditorClassIdentifier: - m_Group: {fileID: 0} - m_StaticContent: 0 ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 1a3c5d64ac83548c09dd1678b9f6f1cd, type: 3} - m_Name: Packed Assets - m_EditorClassIdentifier: - m_SchemaObjects: - - {fileID: -6141893681221511558} - - {fileID: -1287599956978553664} - m_Description: Pack assets into asset bundles. - m_Settings: {fileID: 0} diff --git a/Unity/Assets/AddressableAssetsData/AssetGroupTemplates/Packed Assets.asset.meta b/src/CommunityResources.Unity/Assets/AddressableAssetsData/AssetGroupTemplates/Packed Assets.asset.meta similarity index 79% rename from Unity/Assets/AddressableAssetsData/AssetGroupTemplates/Packed Assets.asset.meta rename to src/CommunityResources.Unity/Assets/AddressableAssetsData/AssetGroupTemplates/Packed Assets.asset.meta index af93e34..aeb0504 100644 --- a/Unity/Assets/AddressableAssetsData/AssetGroupTemplates/Packed Assets.asset.meta +++ b/src/CommunityResources.Unity/Assets/AddressableAssetsData/AssetGroupTemplates/Packed Assets.asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: fe340054829bd4e4daf9f3331d04545d +guid: 7a4898cf80f958749b1bfa363e91fed4 NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/Unity/Assets/AddressableAssetsData/AssetGroups.meta b/src/CommunityResources.Unity/Assets/AddressableAssetsData/AssetGroups.meta similarity index 77% rename from Unity/Assets/AddressableAssetsData/AssetGroups.meta rename to src/CommunityResources.Unity/Assets/AddressableAssetsData/AssetGroups.meta index 526867c..7f01bfc 100644 --- a/Unity/Assets/AddressableAssetsData/AssetGroups.meta +++ b/src/CommunityResources.Unity/Assets/AddressableAssetsData/AssetGroups.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: e2e0560dd5dc55b439f90fe0d8db113f +guid: 776a7a2f7a35aca44aedd0f1c47601de folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Unity/Assets/AddressableAssetsData/AssetGroups/Built In Data.asset b/src/CommunityResources.Unity/Assets/AddressableAssetsData/AssetGroups/Built In Data.asset similarity index 72% rename from Unity/Assets/AddressableAssetsData/AssetGroups/Built In Data.asset rename to src/CommunityResources.Unity/Assets/AddressableAssetsData/AssetGroups/Built In Data.asset index 0800cfa..54b76ad 100644 --- a/Unity/Assets/AddressableAssetsData/AssetGroups/Built In Data.asset +++ b/src/CommunityResources.Unity/Assets/AddressableAssetsData/AssetGroups/Built In Data.asset @@ -15,18 +15,20 @@ MonoBehaviour: m_GroupName: Built In Data m_Data: m_SerializedData: [] - m_GUID: 22f0520092a5ecd43894775eb7486ad0 + m_GUID: 5e3d1b7a6b04b7441a008d545f8dd2e4 m_SerializeEntries: - m_GUID: Resources m_Address: Resources m_ReadOnly: 1 m_SerializedLabels: [] + FlaggedDuringContentUpdateRestriction: 0 - m_GUID: EditorSceneList m_Address: EditorSceneList m_ReadOnly: 1 m_SerializedLabels: [] + FlaggedDuringContentUpdateRestriction: 0 m_ReadOnly: 1 - m_Settings: {fileID: 11400000, guid: 3a7f458fd5b05d443a8f09f94e86c188, type: 2} + m_Settings: {fileID: 11400000, guid: 4be7cdd01452bfb4fad780f91a6935ea, type: 2} m_SchemaSet: m_Schemas: - - {fileID: 11400000, guid: 18a0a1ec4f7c8f743b624bd9b23803c5, type: 2} + - {fileID: 11400000, guid: 9c8c8ec758e8fa24f981db1a445ca54a, type: 2} diff --git a/Unity/Assets/AddressableAssetsData/AssetGroups/Built In Data.asset.meta b/src/CommunityResources.Unity/Assets/AddressableAssetsData/AssetGroups/Built In Data.asset.meta similarity index 79% rename from Unity/Assets/AddressableAssetsData/AssetGroups/Built In Data.asset.meta rename to src/CommunityResources.Unity/Assets/AddressableAssetsData/AssetGroups/Built In Data.asset.meta index 8fc780d..c108b96 100644 --- a/Unity/Assets/AddressableAssetsData/AssetGroups/Built In Data.asset.meta +++ b/src/CommunityResources.Unity/Assets/AddressableAssetsData/AssetGroups/Built In Data.asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 77cc8b2aa11b12a4397e078f18347609 +guid: 7c728c096bd0658449a4980793381829 NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/src/CommunityResources.Unity/Assets/AddressableAssetsData/AssetGroups/CommunityResources.asset b/src/CommunityResources.Unity/Assets/AddressableAssetsData/AssetGroups/CommunityResources.asset new file mode 100644 index 0000000..fc7f4fc --- /dev/null +++ b/src/CommunityResources.Unity/Assets/AddressableAssetsData/AssetGroups/CommunityResources.asset @@ -0,0 +1,43 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: bbb281ee3bf0b054c82ac2347e9e782c, type: 3} + m_Name: CommunityResources + m_EditorClassIdentifier: + m_GroupName: CommunityResources + m_Data: + m_SerializedData: [] + m_GUID: 9cb9494eeac173845b4d61f1b6a60910 + m_SerializeEntries: + - m_GUID: b8d91dc870b6b24478e3b078e0825a9c + m_Address: CR_ICO_Food.png + m_ReadOnly: 0 + m_SerializedLabels: + - ui_sprite + FlaggedDuringContentUpdateRestriction: 0 + - m_GUID: e843d2d3b2b1ae644bcd7c8cc1aac993 + m_Address: CR_ICO_Oxygen.png + m_ReadOnly: 0 + m_SerializedLabels: + - ui_sprite + FlaggedDuringContentUpdateRestriction: 0 + - m_GUID: 8696b8cb4c65b954a86022ff2dfa6e00 + m_Address: CR_ICO_Water.png + m_ReadOnly: 0 + m_SerializedLabels: + - ui_sprite + FlaggedDuringContentUpdateRestriction: 0 + m_ReadOnly: 0 + m_Settings: {fileID: 11400000, guid: 4be7cdd01452bfb4fad780f91a6935ea, type: 2} + m_SchemaSet: + m_Schemas: + - {fileID: 11400000, guid: 4ac46f42765176a47a44e546f009d52c, type: 2} + - {fileID: 11400000, guid: 08b64f5d98573154dab1a5b9d74d29c4, type: 2} diff --git a/src/CommunityResources.Unity/Assets/AddressableAssetsData/AssetGroups/CommunityResources.asset.meta b/src/CommunityResources.Unity/Assets/AddressableAssetsData/AssetGroups/CommunityResources.asset.meta new file mode 100644 index 0000000..f0f40ad --- /dev/null +++ b/src/CommunityResources.Unity/Assets/AddressableAssetsData/AssetGroups/CommunityResources.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ca3d0e04fd2c42240ab2e5e8bd523519 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/src/CommunityResources.Unity/Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset b/src/CommunityResources.Unity/Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset new file mode 100644 index 0000000..7db1713 --- /dev/null +++ b/src/CommunityResources.Unity/Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset @@ -0,0 +1,25 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: bbb281ee3bf0b054c82ac2347e9e782c, type: 3} + m_Name: Default Local Group + m_EditorClassIdentifier: + m_GroupName: Default Local Group + m_Data: + m_SerializedData: [] + m_GUID: c6f57729f8b0c7443a45a09eb9f93c9b + m_SerializeEntries: [] + m_ReadOnly: 0 + m_Settings: {fileID: 11400000, guid: 4be7cdd01452bfb4fad780f91a6935ea, type: 2} + m_SchemaSet: + m_Schemas: + - {fileID: 11400000, guid: 6aaae4a7c07e1a94498211ef593d637b, type: 2} + - {fileID: 11400000, guid: 6707aa98afee8824ea34dcf2ddd6b8a4, type: 2} diff --git a/Unity/Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset.meta b/src/CommunityResources.Unity/Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset.meta similarity index 79% rename from Unity/Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset.meta rename to src/CommunityResources.Unity/Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset.meta index 6f83836..8928d7d 100644 --- a/Unity/Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset.meta +++ b/src/CommunityResources.Unity/Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 6cc1da26f686a5d4e8485fdffe68f1c3 +guid: 5839582cfdaaf3f4f8165d588beeaa2f NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/Unity/Assets/AddressableAssetsData/AssetGroups/Schemas.meta b/src/CommunityResources.Unity/Assets/AddressableAssetsData/AssetGroups/Schemas.meta similarity index 77% rename from Unity/Assets/AddressableAssetsData/AssetGroups/Schemas.meta rename to src/CommunityResources.Unity/Assets/AddressableAssetsData/AssetGroups/Schemas.meta index d0bb497..f338650 100644 --- a/Unity/Assets/AddressableAssetsData/AssetGroups/Schemas.meta +++ b/src/CommunityResources.Unity/Assets/AddressableAssetsData/AssetGroups/Schemas.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 0e0b21d7ba9678b45816b71c98d0c8ff +guid: e218795018c188c4ca1aa8d9a8a9ebb5 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Unity/Assets/AddressableAssetsData/AssetGroups/Schemas/Built In Data_PlayerDataGroupSchema.asset b/src/CommunityResources.Unity/Assets/AddressableAssetsData/AssetGroups/Schemas/Built In Data_PlayerDataGroupSchema.asset similarity index 86% rename from Unity/Assets/AddressableAssetsData/AssetGroups/Schemas/Built In Data_PlayerDataGroupSchema.asset rename to src/CommunityResources.Unity/Assets/AddressableAssetsData/AssetGroups/Schemas/Built In Data_PlayerDataGroupSchema.asset index 7c674a7..3368099 100644 --- a/Unity/Assets/AddressableAssetsData/AssetGroups/Schemas/Built In Data_PlayerDataGroupSchema.asset +++ b/src/CommunityResources.Unity/Assets/AddressableAssetsData/AssetGroups/Schemas/Built In Data_PlayerDataGroupSchema.asset @@ -12,6 +12,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: b1487f5d688e4f94f828f879d599dbdc, type: 3} m_Name: Built In Data_PlayerDataGroupSchema m_EditorClassIdentifier: - m_Group: {fileID: 11400000, guid: 77cc8b2aa11b12a4397e078f18347609, type: 2} + m_Group: {fileID: 11400000, guid: 7c728c096bd0658449a4980793381829, type: 2} m_IncludeResourcesFolders: 1 m_IncludeBuildSettingsScenes: 1 diff --git a/Unity/Assets/AddressableAssetsData/AssetGroups/Schemas/Built In Data_PlayerDataGroupSchema.asset.meta b/src/CommunityResources.Unity/Assets/AddressableAssetsData/AssetGroups/Schemas/Built In Data_PlayerDataGroupSchema.asset.meta similarity index 79% rename from Unity/Assets/AddressableAssetsData/AssetGroups/Schemas/Built In Data_PlayerDataGroupSchema.asset.meta rename to src/CommunityResources.Unity/Assets/AddressableAssetsData/AssetGroups/Schemas/Built In Data_PlayerDataGroupSchema.asset.meta index a34d46f..d09d6cc 100644 --- a/Unity/Assets/AddressableAssetsData/AssetGroups/Schemas/Built In Data_PlayerDataGroupSchema.asset.meta +++ b/src/CommunityResources.Unity/Assets/AddressableAssetsData/AssetGroups/Schemas/Built In Data_PlayerDataGroupSchema.asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 18a0a1ec4f7c8f743b624bd9b23803c5 +guid: 9c8c8ec758e8fa24f981db1a445ca54a NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/src/CommunityResources.Unity/Assets/AddressableAssetsData/AssetGroups/Schemas/CommunityResources_BundledAssetGroupSchema.asset b/src/CommunityResources.Unity/Assets/AddressableAssetsData/AssetGroups/Schemas/CommunityResources_BundledAssetGroupSchema.asset new file mode 100644 index 0000000..d645cf6 --- /dev/null +++ b/src/CommunityResources.Unity/Assets/AddressableAssetsData/AssetGroups/Schemas/CommunityResources_BundledAssetGroupSchema.asset @@ -0,0 +1,45 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e5d17a21594effb4e9591490b009e7aa, type: 3} + m_Name: CommunityResources_BundledAssetGroupSchema + m_EditorClassIdentifier: + m_Group: {fileID: 11400000, guid: ca3d0e04fd2c42240ab2e5e8bd523519, type: 2} + m_InternalBundleIdMode: 1 + m_Compression: 1 + m_IncludeAddressInCatalog: 1 + m_IncludeGUIDInCatalog: 1 + m_IncludeLabelsInCatalog: 1 + m_InternalIdNamingMode: 0 + m_CacheClearBehavior: 0 + m_IncludeInBuild: 1 + m_BundledAssetProviderType: + m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + m_ClassName: UnityEngine.ResourceManagement.ResourceProviders.BundledAssetProvider + m_ForceUniqueProvider: 0 + m_UseAssetBundleCache: 1 + m_UseAssetBundleCrc: 1 + m_UseAssetBundleCrcForCachedBundles: 1 + m_UseUWRForLocalBundles: 0 + m_Timeout: 0 + m_ChunkedTransfer: 0 + m_RedirectLimit: -1 + m_RetryCount: 0 + m_BuildPath: + m_Id: ef803372bac80f34287fecb7c800ecff + m_LoadPath: + m_Id: d8bdd29ae4f16e7478832e1c57d99bbc + m_BundleMode: 0 + m_AssetBundleProviderType: + m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + m_ClassName: UnityEngine.ResourceManagement.ResourceProviders.AssetBundleProvider + m_BundleNaming: 0 + m_AssetLoadMode: 0 diff --git a/src/CommunityResources.Unity/Assets/AddressableAssetsData/AssetGroups/Schemas/CommunityResources_BundledAssetGroupSchema.asset.meta b/src/CommunityResources.Unity/Assets/AddressableAssetsData/AssetGroups/Schemas/CommunityResources_BundledAssetGroupSchema.asset.meta new file mode 100644 index 0000000..973311f --- /dev/null +++ b/src/CommunityResources.Unity/Assets/AddressableAssetsData/AssetGroups/Schemas/CommunityResources_BundledAssetGroupSchema.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 4ac46f42765176a47a44e546f009d52c +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/src/CommunityResources.Unity/Assets/AddressableAssetsData/AssetGroups/Schemas/CommunityResources_ContentUpdateGroupSchema.asset b/src/CommunityResources.Unity/Assets/AddressableAssetsData/AssetGroups/Schemas/CommunityResources_ContentUpdateGroupSchema.asset new file mode 100644 index 0000000..a457c24 --- /dev/null +++ b/src/CommunityResources.Unity/Assets/AddressableAssetsData/AssetGroups/Schemas/CommunityResources_ContentUpdateGroupSchema.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5834b5087d578d24c926ce20cd31e6d6, type: 3} + m_Name: CommunityResources_ContentUpdateGroupSchema + m_EditorClassIdentifier: + m_Group: {fileID: 11400000, guid: ca3d0e04fd2c42240ab2e5e8bd523519, type: 2} + m_StaticContent: 0 diff --git a/src/CommunityResources.Unity/Assets/AddressableAssetsData/AssetGroups/Schemas/CommunityResources_ContentUpdateGroupSchema.asset.meta b/src/CommunityResources.Unity/Assets/AddressableAssetsData/AssetGroups/Schemas/CommunityResources_ContentUpdateGroupSchema.asset.meta new file mode 100644 index 0000000..ca05e9b --- /dev/null +++ b/src/CommunityResources.Unity/Assets/AddressableAssetsData/AssetGroups/Schemas/CommunityResources_ContentUpdateGroupSchema.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 08b64f5d98573154dab1a5b9d74d29c4 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Unity/Assets/AddressableAssetsData/AssetGroups/Schemas/Default Local Group_BundledAssetGroupSchema.asset b/src/CommunityResources.Unity/Assets/AddressableAssetsData/AssetGroups/Schemas/Default Local Group_BundledAssetGroupSchema.asset similarity index 89% rename from Unity/Assets/AddressableAssetsData/AssetGroups/Schemas/Default Local Group_BundledAssetGroupSchema.asset rename to src/CommunityResources.Unity/Assets/AddressableAssetsData/AssetGroups/Schemas/Default Local Group_BundledAssetGroupSchema.asset index 0b5a32a..58e70bd 100644 --- a/Unity/Assets/AddressableAssetsData/AssetGroups/Schemas/Default Local Group_BundledAssetGroupSchema.asset +++ b/src/CommunityResources.Unity/Assets/AddressableAssetsData/AssetGroups/Schemas/Default Local Group_BundledAssetGroupSchema.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: e5d17a21594effb4e9591490b009e7aa, type: 3} m_Name: Default Local Group_BundledAssetGroupSchema m_EditorClassIdentifier: - m_Group: {fileID: 11400000, guid: 6cc1da26f686a5d4e8485fdffe68f1c3, type: 2} + m_Group: {fileID: 11400000, guid: 5839582cfdaaf3f4f8165d588beeaa2f, type: 2} m_InternalBundleIdMode: 1 m_Compression: 1 m_IncludeAddressInCatalog: 1 @@ -34,9 +34,9 @@ MonoBehaviour: m_RedirectLimit: -1 m_RetryCount: 0 m_BuildPath: - m_Id: 4796619c4077b5d4585aeb6132f7dc45 + m_Id: ef803372bac80f34287fecb7c800ecff m_LoadPath: - m_Id: 58dee49d648a4ea49a722777346fce88 + m_Id: d8bdd29ae4f16e7478832e1c57d99bbc m_BundleMode: 0 m_AssetBundleProviderType: m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null diff --git a/Unity/Assets/AddressableAssetsData/AssetGroups/Schemas/Default Local Group_BundledAssetGroupSchema.asset.meta b/src/CommunityResources.Unity/Assets/AddressableAssetsData/AssetGroups/Schemas/Default Local Group_BundledAssetGroupSchema.asset.meta similarity index 79% rename from Unity/Assets/AddressableAssetsData/AssetGroups/Schemas/Default Local Group_BundledAssetGroupSchema.asset.meta rename to src/CommunityResources.Unity/Assets/AddressableAssetsData/AssetGroups/Schemas/Default Local Group_BundledAssetGroupSchema.asset.meta index 3f25761..f217758 100644 --- a/Unity/Assets/AddressableAssetsData/AssetGroups/Schemas/Default Local Group_BundledAssetGroupSchema.asset.meta +++ b/src/CommunityResources.Unity/Assets/AddressableAssetsData/AssetGroups/Schemas/Default Local Group_BundledAssetGroupSchema.asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 4f32637e3013f0e4aa9c4e36773deab3 +guid: 6707aa98afee8824ea34dcf2ddd6b8a4 NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/Unity/Assets/AddressableAssetsData/AssetGroups/Schemas/Default Local Group_ContentUpdateGroupSchema.asset b/src/CommunityResources.Unity/Assets/AddressableAssetsData/AssetGroups/Schemas/Default Local Group_ContentUpdateGroupSchema.asset similarity index 85% rename from Unity/Assets/AddressableAssetsData/AssetGroups/Schemas/Default Local Group_ContentUpdateGroupSchema.asset rename to src/CommunityResources.Unity/Assets/AddressableAssetsData/AssetGroups/Schemas/Default Local Group_ContentUpdateGroupSchema.asset index d879728..a26b88b 100644 --- a/Unity/Assets/AddressableAssetsData/AssetGroups/Schemas/Default Local Group_ContentUpdateGroupSchema.asset +++ b/src/CommunityResources.Unity/Assets/AddressableAssetsData/AssetGroups/Schemas/Default Local Group_ContentUpdateGroupSchema.asset @@ -12,5 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 5834b5087d578d24c926ce20cd31e6d6, type: 3} m_Name: Default Local Group_ContentUpdateGroupSchema m_EditorClassIdentifier: - m_Group: {fileID: 11400000, guid: 6cc1da26f686a5d4e8485fdffe68f1c3, type: 2} + m_Group: {fileID: 11400000, guid: 5839582cfdaaf3f4f8165d588beeaa2f, type: 2} m_StaticContent: 0 diff --git a/Unity/Assets/AddressableAssetsData/AssetGroups/Schemas/Default Local Group_ContentUpdateGroupSchema.asset.meta b/src/CommunityResources.Unity/Assets/AddressableAssetsData/AssetGroups/Schemas/Default Local Group_ContentUpdateGroupSchema.asset.meta similarity index 79% rename from Unity/Assets/AddressableAssetsData/AssetGroups/Schemas/Default Local Group_ContentUpdateGroupSchema.asset.meta rename to src/CommunityResources.Unity/Assets/AddressableAssetsData/AssetGroups/Schemas/Default Local Group_ContentUpdateGroupSchema.asset.meta index 3dfcac5..eb2f212 100644 --- a/Unity/Assets/AddressableAssetsData/AssetGroups/Schemas/Default Local Group_ContentUpdateGroupSchema.asset.meta +++ b/src/CommunityResources.Unity/Assets/AddressableAssetsData/AssetGroups/Schemas/Default Local Group_ContentUpdateGroupSchema.asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 81d19bba49853ef4cb2ece105a933d57 +guid: 6aaae4a7c07e1a94498211ef593d637b NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/Unity/Assets/AddressableAssetsData/DataBuilders.meta b/src/CommunityResources.Unity/Assets/AddressableAssetsData/DataBuilders.meta similarity index 77% rename from Unity/Assets/AddressableAssetsData/DataBuilders.meta rename to src/CommunityResources.Unity/Assets/AddressableAssetsData/DataBuilders.meta index 1a90851..1f1aae9 100644 --- a/Unity/Assets/AddressableAssetsData/DataBuilders.meta +++ b/src/CommunityResources.Unity/Assets/AddressableAssetsData/DataBuilders.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 49e86c888574916448c3dd390a1eafce +guid: c6d9700adfda584459c60498d04049c9 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Unity/Assets/AddressableAssetsData/DataBuilders/BuildScriptFastMode.asset b/src/CommunityResources.Unity/Assets/AddressableAssetsData/DataBuilders/BuildScriptFastMode.asset similarity index 100% rename from Unity/Assets/AddressableAssetsData/DataBuilders/BuildScriptFastMode.asset rename to src/CommunityResources.Unity/Assets/AddressableAssetsData/DataBuilders/BuildScriptFastMode.asset diff --git a/Unity/Assets/AddressableAssetsData/DataBuilders/BuildScriptFastMode.asset.meta b/src/CommunityResources.Unity/Assets/AddressableAssetsData/DataBuilders/BuildScriptFastMode.asset.meta similarity index 79% rename from Unity/Assets/AddressableAssetsData/DataBuilders/BuildScriptFastMode.asset.meta rename to src/CommunityResources.Unity/Assets/AddressableAssetsData/DataBuilders/BuildScriptFastMode.asset.meta index b151325..225725f 100644 --- a/Unity/Assets/AddressableAssetsData/DataBuilders/BuildScriptFastMode.asset.meta +++ b/src/CommunityResources.Unity/Assets/AddressableAssetsData/DataBuilders/BuildScriptFastMode.asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 9629e1b9fd800564c88bf7a22f2a1bb5 +guid: 21d7600d776c53d458a69ccb4f290fd3 NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/Unity/Assets/AddressableAssetsData/DataBuilders/BuildScriptPackedMode.asset b/src/CommunityResources.Unity/Assets/AddressableAssetsData/DataBuilders/BuildScriptPackedMode.asset similarity index 100% rename from Unity/Assets/AddressableAssetsData/DataBuilders/BuildScriptPackedMode.asset rename to src/CommunityResources.Unity/Assets/AddressableAssetsData/DataBuilders/BuildScriptPackedMode.asset diff --git a/Unity/Assets/AddressableAssetsData/DataBuilders/BuildScriptPackedMode.asset.meta b/src/CommunityResources.Unity/Assets/AddressableAssetsData/DataBuilders/BuildScriptPackedMode.asset.meta similarity index 79% rename from Unity/Assets/AddressableAssetsData/DataBuilders/BuildScriptPackedMode.asset.meta rename to src/CommunityResources.Unity/Assets/AddressableAssetsData/DataBuilders/BuildScriptPackedMode.asset.meta index ae37547..051294f 100644 --- a/Unity/Assets/AddressableAssetsData/DataBuilders/BuildScriptPackedMode.asset.meta +++ b/src/CommunityResources.Unity/Assets/AddressableAssetsData/DataBuilders/BuildScriptPackedMode.asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: aa7999a3159085746b42706ae9865e45 +guid: da57cf8df40b3e342989200a183b6bf9 NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/Unity/Assets/AddressableAssetsData/DataBuilders/BuildScriptPackedPlayMode.asset b/src/CommunityResources.Unity/Assets/AddressableAssetsData/DataBuilders/BuildScriptPackedPlayMode.asset similarity index 100% rename from Unity/Assets/AddressableAssetsData/DataBuilders/BuildScriptPackedPlayMode.asset rename to src/CommunityResources.Unity/Assets/AddressableAssetsData/DataBuilders/BuildScriptPackedPlayMode.asset diff --git a/Unity/Assets/AddressableAssetsData/DataBuilders/BuildScriptPackedPlayMode.asset.meta b/src/CommunityResources.Unity/Assets/AddressableAssetsData/DataBuilders/BuildScriptPackedPlayMode.asset.meta similarity index 79% rename from Unity/Assets/AddressableAssetsData/DataBuilders/BuildScriptPackedPlayMode.asset.meta rename to src/CommunityResources.Unity/Assets/AddressableAssetsData/DataBuilders/BuildScriptPackedPlayMode.asset.meta index 02e7efd..fc09568 100644 --- a/Unity/Assets/AddressableAssetsData/DataBuilders/BuildScriptPackedPlayMode.asset.meta +++ b/src/CommunityResources.Unity/Assets/AddressableAssetsData/DataBuilders/BuildScriptPackedPlayMode.asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: f99e317fbb098484bb693755ce935fd7 +guid: 4dc324bb484a0d4438e2c0fe0b27d13b NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/Unity/Assets/AddressableAssetsData/DataBuilders/BuildScriptVirtualMode.asset b/src/CommunityResources.Unity/Assets/AddressableAssetsData/DataBuilders/BuildScriptVirtualMode.asset similarity index 100% rename from Unity/Assets/AddressableAssetsData/DataBuilders/BuildScriptVirtualMode.asset rename to src/CommunityResources.Unity/Assets/AddressableAssetsData/DataBuilders/BuildScriptVirtualMode.asset diff --git a/Unity/Assets/AddressableAssetsData/DataBuilders/BuildScriptVirtualMode.asset.meta b/src/CommunityResources.Unity/Assets/AddressableAssetsData/DataBuilders/BuildScriptVirtualMode.asset.meta similarity index 79% rename from Unity/Assets/AddressableAssetsData/DataBuilders/BuildScriptVirtualMode.asset.meta rename to src/CommunityResources.Unity/Assets/AddressableAssetsData/DataBuilders/BuildScriptVirtualMode.asset.meta index 5cf0826..29c9449 100644 --- a/Unity/Assets/AddressableAssetsData/DataBuilders/BuildScriptVirtualMode.asset.meta +++ b/src/CommunityResources.Unity/Assets/AddressableAssetsData/DataBuilders/BuildScriptVirtualMode.asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 70b5f7363ccd73b42a04eb32d9d9d490 +guid: 518e024415a051146aced8be75e0f935 NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/Unity/Assets/AddressableAssetsData/DefaultObject.asset b/src/CommunityResources.Unity/Assets/AddressableAssetsData/DefaultObject.asset similarity index 85% rename from Unity/Assets/AddressableAssetsData/DefaultObject.asset rename to src/CommunityResources.Unity/Assets/AddressableAssetsData/DefaultObject.asset index 52ede01..14ae2ca 100644 --- a/Unity/Assets/AddressableAssetsData/DefaultObject.asset +++ b/src/CommunityResources.Unity/Assets/AddressableAssetsData/DefaultObject.asset @@ -12,4 +12,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 3a189bb168d8d90478a09ea08c2f3d72, type: 3} m_Name: DefaultObject m_EditorClassIdentifier: - m_AddressableAssetSettingsGuid: 3a7f458fd5b05d443a8f09f94e86c188 + m_AddressableAssetSettingsGuid: 4be7cdd01452bfb4fad780f91a6935ea diff --git a/Unity/Assets/AddressableAssetsData/DefaultObject.asset.meta b/src/CommunityResources.Unity/Assets/AddressableAssetsData/DefaultObject.asset.meta similarity index 79% rename from Unity/Assets/AddressableAssetsData/DefaultObject.asset.meta rename to src/CommunityResources.Unity/Assets/AddressableAssetsData/DefaultObject.asset.meta index c400e65..13902f2 100644 --- a/Unity/Assets/AddressableAssetsData/DefaultObject.asset.meta +++ b/src/CommunityResources.Unity/Assets/AddressableAssetsData/DefaultObject.asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: d31382433f01edd4a8531648b080edb7 +guid: 032d28a27002a28409721976a51e6ac3 NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/src/CommunityResources.Unity/Assets/AddressableAssetsData/ProfileDataSourceSettings.asset b/src/CommunityResources.Unity/Assets/AddressableAssetsData/ProfileDataSourceSettings.asset new file mode 100644 index 0000000..588fc4c --- /dev/null +++ b/src/CommunityResources.Unity/Assets/AddressableAssetsData/ProfileDataSourceSettings.asset @@ -0,0 +1,34 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7e3976da977cb49238499ea3b4c237ae, type: 3} + m_Name: ProfileDataSourceSettings + m_EditorClassIdentifier: + profileGroupTypes: + - m_GroupTypePrefix: Built-In + m_Variables: + - m_Suffix: BuildPath + m_Value: '[UnityEngine.AddressableAssets.Addressables.BuildPath]/[BuildTarget]' + - m_Suffix: LoadPath + m_Value: '{UnityEngine.AddressableAssets.Addressables.RuntimePath}/[BuildTarget]' + - m_GroupTypePrefix: Editor Hosted + m_Variables: + - m_Suffix: BuildPath + m_Value: ServerData/[BuildTarget] + - m_Suffix: LoadPath + m_Value: http://[PrivateIpAddress]:[HostingServicePort] + environments: [] + currentEnvironment: + id: + projectId: + projectGenesisId: + name: + isDefault: 0 diff --git a/src/CommunityResources.Unity/Assets/AddressableAssetsData/ProfileDataSourceSettings.asset.meta b/src/CommunityResources.Unity/Assets/AddressableAssetsData/ProfileDataSourceSettings.asset.meta new file mode 100644 index 0000000..4d5d2f5 --- /dev/null +++ b/src/CommunityResources.Unity/Assets/AddressableAssetsData/ProfileDataSourceSettings.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a2304d93c7334834681a301cf6edfe15 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Unity/Assets/AddressableAssetsData/Windows.meta b/src/CommunityResources.Unity/Assets/AddressableAssetsData/Windows.meta similarity index 77% rename from Unity/Assets/AddressableAssetsData/Windows.meta rename to src/CommunityResources.Unity/Assets/AddressableAssetsData/Windows.meta index 91adfe9..8c9519a 100644 --- a/Unity/Assets/AddressableAssetsData/Windows.meta +++ b/src/CommunityResources.Unity/Assets/AddressableAssetsData/Windows.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: fc0ade48d944c054a956085278c89b71 +guid: de455453d36147746bfc8870792655f4 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/src/CommunityResources.Unity/Assets/Resource Icons.meta b/src/CommunityResources.Unity/Assets/Resource Icons.meta new file mode 100644 index 0000000..915c3fa --- /dev/null +++ b/src/CommunityResources.Unity/Assets/Resource Icons.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 6efb9e3126c037547b01e2b6202aed62 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Unity/Assets/CR_ICO_Food.kra b/src/CommunityResources.Unity/Assets/Resource Icons/CR_ICO_Food.kra similarity index 100% rename from Unity/Assets/CR_ICO_Food.kra rename to src/CommunityResources.Unity/Assets/Resource Icons/CR_ICO_Food.kra diff --git a/Unity/Assets/CR_ICO_Food.kra.meta b/src/CommunityResources.Unity/Assets/Resource Icons/CR_ICO_Food.kra.meta similarity index 74% rename from Unity/Assets/CR_ICO_Food.kra.meta rename to src/CommunityResources.Unity/Assets/Resource Icons/CR_ICO_Food.kra.meta index ffbb8f9..440ec9e 100644 --- a/Unity/Assets/CR_ICO_Food.kra.meta +++ b/src/CommunityResources.Unity/Assets/Resource Icons/CR_ICO_Food.kra.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 312b5e8e2dab951439845244c35b4a16 +guid: 916f8f38bb58f424c8c4216b433dc81f DefaultImporter: externalObjects: {} userData: diff --git a/Unity/Assets/CR_ICO_Food.png b/src/CommunityResources.Unity/Assets/Resource Icons/CR_ICO_Food.png similarity index 100% rename from Unity/Assets/CR_ICO_Food.png rename to src/CommunityResources.Unity/Assets/Resource Icons/CR_ICO_Food.png diff --git a/Unity/Assets/CR_ICO_Food.png.meta b/src/CommunityResources.Unity/Assets/Resource Icons/CR_ICO_Food.png.meta similarity index 78% rename from Unity/Assets/CR_ICO_Food.png.meta rename to src/CommunityResources.Unity/Assets/Resource Icons/CR_ICO_Food.png.meta index 76739b1..d01b7c1 100644 --- a/Unity/Assets/CR_ICO_Food.png.meta +++ b/src/CommunityResources.Unity/Assets/Resource Icons/CR_ICO_Food.png.meta @@ -1,9 +1,9 @@ fileFormatVersion: 2 -guid: 69151cf82d978b1489a1a660a98590c9 +guid: b8d91dc870b6b24478e3b078e0825a9c TextureImporter: internalIDToNameTable: [] externalObjects: {} - serializedVersion: 11 + serializedVersion: 12 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -20,10 +20,12 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 + flipGreenChannel: 0 isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 + ignoreMipmapLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -32,7 +34,7 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: 1 + filterMode: 0 aniso: 1 mipBias: 0 wrapU: 1 @@ -62,6 +64,8 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform @@ -73,6 +77,7 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 @@ -85,6 +90,20 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: @@ -100,9 +119,9 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] - spritePackingTag: + nameFileIdTable: {} + mipmapLimitGroupName: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Unity/Assets/CR_ICO_Oxygen.kra b/src/CommunityResources.Unity/Assets/Resource Icons/CR_ICO_Oxygen.kra similarity index 100% rename from Unity/Assets/CR_ICO_Oxygen.kra rename to src/CommunityResources.Unity/Assets/Resource Icons/CR_ICO_Oxygen.kra diff --git a/Unity/Assets/CR_ICO_Oxygen.kra.meta b/src/CommunityResources.Unity/Assets/Resource Icons/CR_ICO_Oxygen.kra.meta similarity index 74% rename from Unity/Assets/CR_ICO_Oxygen.kra.meta rename to src/CommunityResources.Unity/Assets/Resource Icons/CR_ICO_Oxygen.kra.meta index 3192b47..a2275fc 100644 --- a/Unity/Assets/CR_ICO_Oxygen.kra.meta +++ b/src/CommunityResources.Unity/Assets/Resource Icons/CR_ICO_Oxygen.kra.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: d5ec793e69c70704ca44e5ce52b732f8 +guid: 637a19d2918b3fe4fb873479ad7c83ab DefaultImporter: externalObjects: {} userData: diff --git a/Unity/Assets/CR_ICO_Oxygen.png b/src/CommunityResources.Unity/Assets/Resource Icons/CR_ICO_Oxygen.png similarity index 100% rename from Unity/Assets/CR_ICO_Oxygen.png rename to src/CommunityResources.Unity/Assets/Resource Icons/CR_ICO_Oxygen.png diff --git a/Unity/Assets/CR_ICO_Oxygen.png.meta b/src/CommunityResources.Unity/Assets/Resource Icons/CR_ICO_Oxygen.png.meta similarity index 78% rename from Unity/Assets/CR_ICO_Oxygen.png.meta rename to src/CommunityResources.Unity/Assets/Resource Icons/CR_ICO_Oxygen.png.meta index 52c7d30..d6f9b79 100644 --- a/Unity/Assets/CR_ICO_Oxygen.png.meta +++ b/src/CommunityResources.Unity/Assets/Resource Icons/CR_ICO_Oxygen.png.meta @@ -1,9 +1,9 @@ fileFormatVersion: 2 -guid: 63029092d26973d469c81be49089f7be +guid: e843d2d3b2b1ae644bcd7c8cc1aac993 TextureImporter: internalIDToNameTable: [] externalObjects: {} - serializedVersion: 11 + serializedVersion: 12 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -20,10 +20,12 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 + flipGreenChannel: 0 isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 + ignoreMipmapLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -32,7 +34,7 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: 1 + filterMode: 0 aniso: 1 mipBias: 0 wrapU: 1 @@ -62,6 +64,8 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform @@ -73,6 +77,7 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 @@ -85,6 +90,20 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: @@ -100,9 +119,9 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] - spritePackingTag: + nameFileIdTable: {} + mipmapLimitGroupName: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Unity/Assets/CR_ICO_Water.kra b/src/CommunityResources.Unity/Assets/Resource Icons/CR_ICO_Water.kra similarity index 100% rename from Unity/Assets/CR_ICO_Water.kra rename to src/CommunityResources.Unity/Assets/Resource Icons/CR_ICO_Water.kra diff --git a/Unity/Assets/CR_ICO_Water.kra.meta b/src/CommunityResources.Unity/Assets/Resource Icons/CR_ICO_Water.kra.meta similarity index 74% rename from Unity/Assets/CR_ICO_Water.kra.meta rename to src/CommunityResources.Unity/Assets/Resource Icons/CR_ICO_Water.kra.meta index 0522e2f..dacbb77 100644 --- a/Unity/Assets/CR_ICO_Water.kra.meta +++ b/src/CommunityResources.Unity/Assets/Resource Icons/CR_ICO_Water.kra.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 111b457b0d4119146aa9d73e9b55e090 +guid: 49c616d33d7cbe741b15f633305c0f85 DefaultImporter: externalObjects: {} userData: diff --git a/Unity/Assets/CR_ICO_Water.png b/src/CommunityResources.Unity/Assets/Resource Icons/CR_ICO_Water.png similarity index 100% rename from Unity/Assets/CR_ICO_Water.png rename to src/CommunityResources.Unity/Assets/Resource Icons/CR_ICO_Water.png diff --git a/Unity/Assets/CR_ICO_Water.png.meta b/src/CommunityResources.Unity/Assets/Resource Icons/CR_ICO_Water.png.meta similarity index 78% rename from Unity/Assets/CR_ICO_Water.png.meta rename to src/CommunityResources.Unity/Assets/Resource Icons/CR_ICO_Water.png.meta index 0b1b9c8..1ebf454 100644 --- a/Unity/Assets/CR_ICO_Water.png.meta +++ b/src/CommunityResources.Unity/Assets/Resource Icons/CR_ICO_Water.png.meta @@ -1,9 +1,9 @@ fileFormatVersion: 2 -guid: eb1871ffd0f3d7c46acfd28361abed4b +guid: 8696b8cb4c65b954a86022ff2dfa6e00 TextureImporter: internalIDToNameTable: [] externalObjects: {} - serializedVersion: 11 + serializedVersion: 12 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -20,10 +20,12 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 + flipGreenChannel: 0 isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 + ignoreMipmapLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -32,7 +34,7 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: 1 + filterMode: 0 aniso: 1 mipBias: 0 wrapU: 1 @@ -62,6 +64,8 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform @@ -73,6 +77,7 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 @@ -85,6 +90,20 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: @@ -100,9 +119,9 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] - spritePackingTag: + nameFileIdTable: {} + mipmapLimitGroupName: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Unity/Assets/Scenes.meta b/src/CommunityResources.Unity/Assets/Scenes.meta similarity index 77% rename from Unity/Assets/Scenes.meta rename to src/CommunityResources.Unity/Assets/Scenes.meta index db4dc97..ebd124e 100644 --- a/Unity/Assets/Scenes.meta +++ b/src/CommunityResources.Unity/Assets/Scenes.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 12b3c09670a09414195457942a4d6af8 +guid: 1eab8cf6bb0d5ca458bbfb2104b0d25e folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Unity/Assets/Scenes/SampleScene.unity b/src/CommunityResources.Unity/Assets/Scenes/SampleScene.unity similarity index 100% rename from Unity/Assets/Scenes/SampleScene.unity rename to src/CommunityResources.Unity/Assets/Scenes/SampleScene.unity diff --git a/Unity/Assets/Scenes/SampleScene.unity.meta b/src/CommunityResources.Unity/Assets/Scenes/SampleScene.unity.meta similarity index 100% rename from Unity/Assets/Scenes/SampleScene.unity.meta rename to src/CommunityResources.Unity/Assets/Scenes/SampleScene.unity.meta diff --git a/src/CommunityResources.Unity/Assets/UnityDefaultRuntimeTheme.tss b/src/CommunityResources.Unity/Assets/UnityDefaultRuntimeTheme.tss new file mode 100644 index 0000000..79453c7 --- /dev/null +++ b/src/CommunityResources.Unity/Assets/UnityDefaultRuntimeTheme.tss @@ -0,0 +1,2 @@ +@import url("unity-theme://default"); +VisualElement {} \ No newline at end of file diff --git a/src/CommunityResources.Unity/Assets/UnityDefaultRuntimeTheme.tss.meta b/src/CommunityResources.Unity/Assets/UnityDefaultRuntimeTheme.tss.meta new file mode 100644 index 0000000..12befb4 --- /dev/null +++ b/src/CommunityResources.Unity/Assets/UnityDefaultRuntimeTheme.tss.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: bb3279f7362d6014aa28b17142fde861 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 12388, guid: 0000000000000000e000000000000000, type: 0} + disableValidation: 0 diff --git a/Unity/ProjectSettings/AudioManager.asset b/src/CommunityResources.Unity/ProjectSettings/AudioManager.asset similarity index 100% rename from Unity/ProjectSettings/AudioManager.asset rename to src/CommunityResources.Unity/ProjectSettings/AudioManager.asset diff --git a/Unity/ProjectSettings/ClusterInputManager.asset b/src/CommunityResources.Unity/ProjectSettings/ClusterInputManager.asset similarity index 100% rename from Unity/ProjectSettings/ClusterInputManager.asset rename to src/CommunityResources.Unity/ProjectSettings/ClusterInputManager.asset diff --git a/Unity/ProjectSettings/DynamicsManager.asset b/src/CommunityResources.Unity/ProjectSettings/DynamicsManager.asset similarity index 100% rename from Unity/ProjectSettings/DynamicsManager.asset rename to src/CommunityResources.Unity/ProjectSettings/DynamicsManager.asset diff --git a/Unity/ProjectSettings/EditorBuildSettings.asset b/src/CommunityResources.Unity/ProjectSettings/EditorBuildSettings.asset similarity index 60% rename from Unity/ProjectSettings/EditorBuildSettings.asset rename to src/CommunityResources.Unity/ProjectSettings/EditorBuildSettings.asset index 44fde00..7baa73a 100644 --- a/Unity/ProjectSettings/EditorBuildSettings.asset +++ b/src/CommunityResources.Unity/ProjectSettings/EditorBuildSettings.asset @@ -6,4 +6,4 @@ EditorBuildSettings: serializedVersion: 2 m_Scenes: [] m_configObjects: - com.unity.addressableassets: {fileID: 11400000, guid: d31382433f01edd4a8531648b080edb7, type: 2} + com.unity.addressableassets: {fileID: 11400000, guid: 032d28a27002a28409721976a51e6ac3, type: 2} diff --git a/Unity/ProjectSettings/EditorSettings.asset b/src/CommunityResources.Unity/ProjectSettings/EditorSettings.asset similarity index 95% rename from Unity/ProjectSettings/EditorSettings.asset rename to src/CommunityResources.Unity/ProjectSettings/EditorSettings.asset index de5d0b2..1e44a0a 100644 --- a/Unity/ProjectSettings/EditorSettings.asset +++ b/src/CommunityResources.Unity/ProjectSettings/EditorSettings.asset @@ -27,4 +27,4 @@ EditorSettings: m_EnterPlayModeOptions: 3 m_ShowLightmapResolutionOverlay: 1 m_UseLegacyProbeSampleCount: 0 - m_SerializeInlineMappingsOnOneLine: 1 \ No newline at end of file + m_SerializeInlineMappingsOnOneLine: 1 diff --git a/Unity/ProjectSettings/GraphicsSettings.asset b/src/CommunityResources.Unity/ProjectSettings/GraphicsSettings.asset similarity index 100% rename from Unity/ProjectSettings/GraphicsSettings.asset rename to src/CommunityResources.Unity/ProjectSettings/GraphicsSettings.asset diff --git a/Unity/ProjectSettings/InputManager.asset b/src/CommunityResources.Unity/ProjectSettings/InputManager.asset similarity index 100% rename from Unity/ProjectSettings/InputManager.asset rename to src/CommunityResources.Unity/ProjectSettings/InputManager.asset diff --git a/src/CommunityResources.Unity/ProjectSettings/MemorySettings.asset b/src/CommunityResources.Unity/ProjectSettings/MemorySettings.asset new file mode 100644 index 0000000..5b5face --- /dev/null +++ b/src/CommunityResources.Unity/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/Unity/ProjectSettings/NavMeshAreas.asset b/src/CommunityResources.Unity/ProjectSettings/NavMeshAreas.asset similarity index 100% rename from Unity/ProjectSettings/NavMeshAreas.asset rename to src/CommunityResources.Unity/ProjectSettings/NavMeshAreas.asset diff --git a/Unity/ProjectSettings/PackageManagerSettings.asset b/src/CommunityResources.Unity/ProjectSettings/PackageManagerSettings.asset similarity index 77% rename from Unity/ProjectSettings/PackageManagerSettings.asset rename to src/CommunityResources.Unity/ProjectSettings/PackageManagerSettings.asset index be4a797..112a053 100644 --- a/Unity/ProjectSettings/PackageManagerSettings.asset +++ b/src/CommunityResources.Unity/ProjectSettings/PackageManagerSettings.asset @@ -12,10 +12,11 @@ MonoBehaviour: m_Script: {fileID: 13964, guid: 0000000000000000e000000000000000, type: 0} m_Name: m_EditorClassIdentifier: - m_EnablePreviewPackages: 0 + m_EnablePreReleasePackages: 0 m_EnablePackageDependencies: 0 m_AdvancedSettingsExpanded: 1 m_ScopedRegistriesSettingsExpanded: 1 + m_SeeAllPackageVersions: 0 oneTimeWarningShown: 0 m_Registries: - m_Id: main @@ -27,17 +28,8 @@ MonoBehaviour: m_UserSelectedRegistryName: m_UserAddingNewScopedRegistry: 0 m_RegistryInfoDraft: - m_ErrorMessage: - m_Original: - m_Id: - m_Name: - m_Url: - m_Scopes: [] - m_IsDefault: 0 - m_Capabilities: 0 m_Modified: 0 - m_Name: - m_Url: - m_Scopes: - - - m_SelectedScopeIndex: 0 + m_ErrorMessage: + m_UserModificationsInstanceId: -830 + m_OriginalInstanceId: -832 + m_LoadAssets: 0 diff --git a/Unity/ProjectSettings/Physics2DSettings.asset b/src/CommunityResources.Unity/ProjectSettings/Physics2DSettings.asset similarity index 100% rename from Unity/ProjectSettings/Physics2DSettings.asset rename to src/CommunityResources.Unity/ProjectSettings/Physics2DSettings.asset diff --git a/Unity/ProjectSettings/PresetManager.asset b/src/CommunityResources.Unity/ProjectSettings/PresetManager.asset similarity index 100% rename from Unity/ProjectSettings/PresetManager.asset rename to src/CommunityResources.Unity/ProjectSettings/PresetManager.asset diff --git a/Unity/ProjectSettings/ProjectSettings.asset b/src/CommunityResources.Unity/ProjectSettings/ProjectSettings.asset similarity index 86% rename from Unity/ProjectSettings/ProjectSettings.asset rename to src/CommunityResources.Unity/ProjectSettings/ProjectSettings.asset index 2f19497..f81e158 100644 --- a/Unity/ProjectSettings/ProjectSettings.asset +++ b/src/CommunityResources.Unity/ProjectSettings/ProjectSettings.asset @@ -3,8 +3,8 @@ --- !u!129 &1 PlayerSettings: m_ObjectHideFlags: 0 - serializedVersion: 22 - productGUID: 022b46673472b1e4b9a3674a3fbc8c8e + serializedVersion: 26 + productGUID: 426f87722099ab7428ffb5aa647337a5 AndroidProfiler: 0 AndroidFilterTouchesWhenObscured: 0 AndroidEnableSustainedPerformanceMode: 0 @@ -13,7 +13,7 @@ PlayerSettings: useOnDemandResources: 0 accelerometerFrequency: 60 companyName: DefaultCompany - productName: Unity + productName: CommunityResources.Unity defaultCursor: {fileID: 0} cursorHotspot: {x: 0, y: 0} m_SplashScreenBackgroundColor: {r: 0.13725491, g: 0.12156863, b: 0.1254902, a: 1} @@ -42,20 +42,21 @@ PlayerSettings: m_SplashScreenLogos: [] m_VirtualRealitySplashScreen: {fileID: 0} m_HolographicTrackingLossScreen: {fileID: 0} - defaultScreenWidth: 1024 - defaultScreenHeight: 768 + defaultScreenWidth: 1920 + defaultScreenHeight: 1080 defaultScreenWidthWeb: 960 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 @@ -119,21 +120,19 @@ PlayerSettings: switchNVNShaderPoolsGranularity: 33554432 switchNVNDefaultPoolsGranularity: 16777216 switchNVNOtherPoolsGranularity: 16777216 + switchGpuScratchPoolGranularity: 2097152 + switchAllowGpuScratchShrinking: 0 switchNVNMaxPublicTextureIDCount: 0 switchNVNMaxPublicSamplerIDCount: 0 + switchNVNGraphicsFirmwareMemory: 32 stadiaPresentMode: 0 stadiaTargetFramerate: 0 vulkanNumSwapchainBuffers: 3 vulkanEnableSetSRGBWrite: 0 - vulkanEnablePreTransform: 0 + vulkanEnablePreTransform: 1 vulkanEnableLateAcquireNextImage: 0 vulkanEnableCommandBufferRecycling: 1 - m_SupportedAspectRatios: - 4:3: 1 - 5:4: 1 - 16:10: 1 - 16:9: 1 - Others: 1 + loadStoreDebugModeEnabled: 0 bundleVersion: 0.1 preloadedAssets: [] metroInputSource: 0 @@ -145,21 +144,24 @@ PlayerSettings: enable360StereoCapture: 0 isWsaHolographicRemotingEnabled: 0 enableFrameTimingStats: 0 + enableOpenGLProfilerGPURecorders: 1 useHDRDisplay: 0 - D3DHDRBitDepth: 0 + hdrBitDepth: 0 m_ColorGamuts: 00000000 targetPixelDensity: 30 resolutionScalingMode: 0 + resetResolutionOnWindowResize: 0 androidSupportedAspectRatio: 1 androidMaxAspectRatio: 2.1 applicationIdentifier: {} buildNumber: Standalone: 0 + VisionOS: 0 iPhone: 0 tvOS: 0 overrideDefaultApplicationIdentifier: 0 AndroidBundleVersionCode: 1 - AndroidMinSdkVersion: 19 + AndroidMinSdkVersion: 22 AndroidTargetSdkVersion: 0 AndroidPreferredInstallLocation: 1 aotOptions: @@ -172,12 +174,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 @@ -215,6 +220,7 @@ PlayerSettings: iOSLaunchScreeniPadCustomStoryboardPath: iOSDeviceRequirements: [] iOSURLSchemes: [] + macOSURLSchemes: [] iOSBackgroundModes: 0 iOSMetalForceHardShadows: 0 metalEditorSupport: 1 @@ -224,15 +230,17 @@ PlayerSettings: appleDeveloperTeamID: iOSManualSigningProvisioningProfileID: tvOSManualSigningProvisioningProfileID: + VisionOSManualSigningProvisioningProfileID: iOSManualSigningProvisioningProfileType: 0 tvOSManualSigningProvisioningProfileType: 0 + VisionOSManualSigningProvisioningProfileType: 0 appleEnableAutomaticSigning: 0 iOSRequireARKit: 0 iOSAutomaticallyDetectAndAddCapabilities: 1 appleEnableProMotion: 0 shaderPrecisionModel: 0 clonedFromGUID: c0afd0d1d80e3634a9dac47e8a0426ea - templatePackageId: com.unity.template.3d@5.0.4 + templatePackageId: com.unity.template.3d@8.1.1 templateDefaultScene: Assets/Scenes/SampleScene.unity useCustomMainManifest: 0 useCustomLauncherManifest: 0 @@ -240,6 +248,7 @@ PlayerSettings: useCustomLauncherGradleManifest: 0 useCustomBaseGradleTemplate: 0 useCustomGradlePropertiesTemplate: 0 + useCustomGradleSettingsTemplate: 0 useCustomProguardFile: 0 AndroidTargetArchitectures: 1 AndroidTargetDevices: 0 @@ -247,6 +256,7 @@ PlayerSettings: androidSplashScreen: {fileID: 0} AndroidKeystoreName: AndroidKeyaliasName: + AndroidEnableArmv9SecurityFeatures: 0 AndroidBuildApkPerCpuArchitecture: 0 AndroidTVCompatibility: 0 AndroidIsGame: 1 @@ -260,7 +270,6 @@ PlayerSettings: banner: {fileID: 0} androidGamepadSupportLevel: 0 chromeosInputEmulation: 1 - AndroidMinifyWithR8: 0 AndroidMinifyRelease: 0 AndroidMinifyDebug: 0 AndroidValidateAppBundleSize: 1 @@ -283,6 +292,7 @@ PlayerSettings: - m_BuildTarget: WebGL m_StaticBatching: 0 m_DynamicBatching: 0 + m_BuildTargetShaderSettings: [] m_BuildTargetGraphicsJobs: - m_BuildTarget: MacStandaloneSupport m_GraphicsJobs: 0 @@ -318,7 +328,7 @@ PlayerSettings: m_BuildTargetGraphicsAPIs: - m_BuildTarget: AndroidPlayer m_APIs: 150000000b000000 - m_Automatic: 0 + m_Automatic: 1 - m_BuildTarget: iOSSupport m_APIs: 10000000 m_Automatic: 1 @@ -334,6 +344,8 @@ PlayerSettings: m_Devices: - Oculus - OpenVR + m_DefaultShaderChunkSizeInMB: 16 + m_DefaultShaderChunkCount: 0 openGLRequireES31: 0 openGLRequireES31AEP: 0 openGLRequireES32: 0 @@ -342,9 +354,32 @@ PlayerSettings: Android: 1 iPhone: 1 tvOS: 1 - m_BuildTargetGroupLightmapEncodingQuality: [] + m_BuildTargetGroupLightmapEncodingQuality: + - m_BuildTarget: Android + m_EncodingQuality: 1 + - m_BuildTarget: iPhone + m_EncodingQuality: 1 + - m_BuildTarget: tvOS + m_EncodingQuality: 1 + m_BuildTargetGroupHDRCubemapEncodingQuality: + - m_BuildTarget: Android + m_EncodingQuality: 1 + - m_BuildTarget: iPhone + m_EncodingQuality: 1 + - m_BuildTarget: tvOS + m_EncodingQuality: 1 m_BuildTargetGroupLightmapSettings: [] - m_BuildTargetNormalMapEncoding: [] + m_BuildTargetGroupLoadStoreDebugModeSettings: [] + m_BuildTargetNormalMapEncoding: + - m_BuildTarget: Android + m_Encoding: 1 + - m_BuildTarget: iPhone + m_Encoding: 1 + - m_BuildTarget: tvOS + m_Encoding: 1 + m_BuildTargetDefaultTextureCompressionFormat: + - m_BuildTarget: Android + m_Format: 3 playModeTestRunnerEnabled: 0 runPlayModeTestAsEditModeTest: 0 actionOnDotNetUnhandledException: 1 @@ -355,6 +390,7 @@ PlayerSettings: locationUsageDescription: microphoneUsageDescription: bluetoothUsageDescription: + macOSTargetOSVersion: 10.13.0 switchNMETAOverride: switchNetLibKey: switchSocketMemoryPoolSize: 6144 @@ -363,8 +399,10 @@ PlayerSettings: switchScreenResolutionBehavior: 2 switchUseCPUProfiler: 0 switchUseGOLDLinker: 0 + switchLTOSetting: 0 switchApplicationID: 0x01004b9000490000 switchNSODependencies: + switchCompilerFlags: switchTitleNames_0: switchTitleNames_1: switchTitleNames_2: @@ -438,7 +476,6 @@ PlayerSettings: switchReleaseVersion: 0 switchDisplayVersion: 1.0.0 switchStartupUserAccount: 0 - switchTouchScreenUsage: 0 switchSupportedLanguagesMask: 0 switchLogoType: 0 switchApplicationErrorCodeCategory: @@ -480,6 +517,7 @@ PlayerSettings: switchNativeFsCacheSize: 32 switchIsHoldTypeHorizontal: 0 switchSupportedNpadCount: 8 + switchEnableTouchScreen: 1 switchSocketConfigEnabled: 0 switchTcpInitialSendBufferSize: 32 switchTcpInitialReceiveBufferSize: 64 @@ -491,7 +529,8 @@ PlayerSettings: switchSocketInitializeEnabled: 1 switchNetworkInterfaceManagerInitializeEnabled: 1 switchPlayerConnectionEnabled: 1 - switchUseNewStyleFilepaths: 0 + switchUseNewStyleFilepaths: 1 + switchUseLegacyFmodPriorities: 0 switchUseMicroSleepForYield: 1 switchEnableRamDiskSupport: 0 switchMicroSleepForYieldTime: 25 @@ -579,6 +618,7 @@ PlayerSettings: webGLMemorySize: 16 webGLExceptionSupport: 1 webGLNameFilesAsHashes: 0 + webGLShowDiagnostics: 0 webGLDataCaching: 1 webGLDebugSymbols: 0 webGLEmscriptenArgs: @@ -591,34 +631,53 @@ PlayerSettings: webGLLinkerTarget: 1 webGLThreadsSupport: 0 webGLDecompressionFallback: 0 + webGLInitialMemorySize: 32 + webGLMaximumMemorySize: 2048 + webGLMemoryGrowthMode: 2 + webGLMemoryLinearGrowthStep: 16 + webGLMemoryGeometricGrowthStep: 0.2 + webGLMemoryGeometricGrowthCap: 96 + webGLPowerPreference: 2 scriptingDefineSymbols: {} additionalCompilerArguments: {} platformArchitecture: {} scriptingBackend: {} il2cppCompilerConfiguration: {} - managedStrippingLevel: {} + 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: 1 + 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 m_MobileRenderingPath: 1 - metroPackageName: Template_3D + metroPackageName: CommunityResources.Unity metroPackageVersion: metroCertificatePath: metroCertificatePassword: metroCertificateSubject: metroCertificateIssuer: metroCertificateNotAfter: 0000000000000000 - metroApplicationDescription: Template_3D + metroApplicationDescription: CommunityResources.Unity wsaImages: {} metroTileShortName: metroTileShowName: 0 @@ -679,8 +738,14 @@ PlayerSettings: luminVersion: m_VersionCode: 1 m_VersionName: + hmiPlayerDataPath: + hmiForceSRGBBlit: 1 + embeddedLinuxEnableGamepadInput: 1 + hmiLogStartupTiming: 0 + hmiCpuConfiguration: apiCompatibilityLevel: 6 activeInputHandler: 0 + windowsGamepadBackendHint: 0 cloudProjectId: framebufferDepthMemorylessMode: 0 qualitySettingsNames: [] @@ -688,4 +753,7 @@ PlayerSettings: organizationId: cloudEnabled: 0 legacyClampBlendShapeWeights: 0 + hmiLoadingImage: {fileID: 0} + platformRequiresReadableAssets: 0 virtualTexturingSupportEnabled: 0 + insecureHttpOption: 0 diff --git a/src/CommunityResources.Unity/ProjectSettings/ProjectVersion.txt b/src/CommunityResources.Unity/ProjectSettings/ProjectVersion.txt new file mode 100644 index 0000000..0a60761 --- /dev/null +++ b/src/CommunityResources.Unity/ProjectSettings/ProjectVersion.txt @@ -0,0 +1,2 @@ +m_EditorVersion: 2022.3.5f1 +m_EditorVersionWithRevision: 2022.3.5f1 (9674261d40ee) diff --git a/Unity/ProjectSettings/QualitySettings.asset b/src/CommunityResources.Unity/ProjectSettings/QualitySettings.asset similarity index 100% rename from Unity/ProjectSettings/QualitySettings.asset rename to src/CommunityResources.Unity/ProjectSettings/QualitySettings.asset diff --git a/Unity/ProjectSettings/TagManager.asset b/src/CommunityResources.Unity/ProjectSettings/TagManager.asset similarity index 100% rename from Unity/ProjectSettings/TagManager.asset rename to src/CommunityResources.Unity/ProjectSettings/TagManager.asset diff --git a/Unity/ProjectSettings/TimeManager.asset b/src/CommunityResources.Unity/ProjectSettings/TimeManager.asset similarity index 100% rename from Unity/ProjectSettings/TimeManager.asset rename to src/CommunityResources.Unity/ProjectSettings/TimeManager.asset diff --git a/Unity/ProjectSettings/UnityConnectSettings.asset b/src/CommunityResources.Unity/ProjectSettings/UnityConnectSettings.asset similarity index 95% rename from Unity/ProjectSettings/UnityConnectSettings.asset rename to src/CommunityResources.Unity/ProjectSettings/UnityConnectSettings.asset index 6125b30..a88bee0 100644 --- a/Unity/ProjectSettings/UnityConnectSettings.asset +++ b/src/CommunityResources.Unity/ProjectSettings/UnityConnectSettings.asset @@ -23,6 +23,7 @@ UnityConnectSettings: m_Enabled: 0 m_TestMode: 0 m_InitializeOnStartup: 1 + m_PackageRequiringCoreStatsPresent: 0 UnityAdsSettings: m_Enabled: 0 m_InitializeOnStartup: 1 diff --git a/Unity/ProjectSettings/VFXManager.asset b/src/CommunityResources.Unity/ProjectSettings/VFXManager.asset similarity index 100% rename from Unity/ProjectSettings/VFXManager.asset rename to src/CommunityResources.Unity/ProjectSettings/VFXManager.asset diff --git a/Unity/ProjectSettings/VersionControlSettings.asset b/src/CommunityResources.Unity/ProjectSettings/VersionControlSettings.asset similarity index 100% rename from Unity/ProjectSettings/VersionControlSettings.asset rename to src/CommunityResources.Unity/ProjectSettings/VersionControlSettings.asset diff --git a/Unity/ProjectSettings/XRSettings.asset b/src/CommunityResources.Unity/ProjectSettings/XRSettings.asset similarity index 100% rename from Unity/ProjectSettings/XRSettings.asset rename to src/CommunityResources.Unity/ProjectSettings/XRSettings.asset diff --git a/src/CommunityResources/CommunityResources.csproj b/src/CommunityResources/CommunityResources.csproj index 56b696a..2341c7b 100644 --- a/src/CommunityResources/CommunityResources.csproj +++ b/src/CommunityResources/CommunityResources.csproj @@ -12,10 +12,10 @@ - + - - + + \ No newline at end of file