diff --git a/.idea/.idea.SHK-Unity-master/.idea/codeStyles/codeStyleConfig.xml b/.idea/.idea.SHK-Unity-master/.idea/codeStyles/codeStyleConfig.xml new file mode 100644 index 00000000..7ad1bf11 --- /dev/null +++ b/.idea/.idea.SHK-Unity-master/.idea/codeStyles/codeStyleConfig.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/.idea/.idea.SHK-Unity-master/.idea/contentModel.xml b/.idea/.idea.SHK-Unity-master/.idea/contentModel.xml new file mode 100644 index 00000000..4c75a8d4 --- /dev/null +++ b/.idea/.idea.SHK-Unity-master/.idea/contentModel.xml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/.idea.SHK-Unity-master/.idea/encodings.xml b/.idea/.idea.SHK-Unity-master/.idea/encodings.xml new file mode 100644 index 00000000..df87cf95 --- /dev/null +++ b/.idea/.idea.SHK-Unity-master/.idea/encodings.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/.idea/.idea.SHK-Unity-master/.idea/indexLayout.xml b/.idea/.idea.SHK-Unity-master/.idea/indexLayout.xml new file mode 100644 index 00000000..27ba142e --- /dev/null +++ b/.idea/.idea.SHK-Unity-master/.idea/indexLayout.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/.idea.SHK-Unity-master/.idea/modules.xml b/.idea/.idea.SHK-Unity-master/.idea/modules.xml new file mode 100644 index 00000000..3d8b9139 --- /dev/null +++ b/.idea/.idea.SHK-Unity-master/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/.idea.SHK-Unity-master/.idea/projectSettingsUpdater.xml b/.idea/.idea.SHK-Unity-master/.idea/projectSettingsUpdater.xml new file mode 100644 index 00000000..4bb9f4d2 --- /dev/null +++ b/.idea/.idea.SHK-Unity-master/.idea/projectSettingsUpdater.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/.idea/.idea.SHK-Unity-master/.idea/workspace.xml b/.idea/.idea.SHK-Unity-master/.idea/workspace.xml new file mode 100644 index 00000000..0e2f5628 --- /dev/null +++ b/.idea/.idea.SHK-Unity-master/.idea/workspace.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + + 1626720173740 + + + + + + + + \ No newline at end of file diff --git a/.idea/.idea.SHK-Unity-master/riderModule.iml b/.idea/.idea.SHK-Unity-master/riderModule.iml new file mode 100644 index 00000000..1a4e0d95 --- /dev/null +++ b/.idea/.idea.SHK-Unity-master/riderModule.iml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/Assets/Resources.meta b/Assets/Resources.meta new file mode 100644 index 00000000..5afcb189 --- /dev/null +++ b/Assets/Resources.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 87b4e7282d53bc649abdc32c7f460394 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/BillingMode.json b/Assets/Resources/BillingMode.json new file mode 100644 index 00000000..6f4bfb71 --- /dev/null +++ b/Assets/Resources/BillingMode.json @@ -0,0 +1 @@ +{"androidStore":"GooglePlay"} \ No newline at end of file diff --git a/Assets/Resources/BillingMode.json.meta b/Assets/Resources/BillingMode.json.meta new file mode 100644 index 00000000..26557d30 --- /dev/null +++ b/Assets/Resources/BillingMode.json.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 406cfa4f3fc4cbc409a50fc8163a87d9 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Logs/AssetImportWorker0-prev.log b/Logs/AssetImportWorker0-prev.log new file mode 100644 index 00000000..cc95a529 --- /dev/null +++ b/Logs/AssetImportWorker0-prev.log @@ -0,0 +1,173 @@ +Using pre-set license +Built from '2020.3/staging' branch; Version is '2020.3.8f1 (507919d4fff5) revision 5273881'; Using compiler version '192528614'; Build Type 'Release' +OS: 'Windows 10 Home; OS build 19042.1083; Version 2009; 64bit' Language: 'ru' Physical Memory: 20428 MB +BatchMode: 1, IsHumanControllingUs: 0, StartBugReporterOnCrash: 0, Is64bit: 1, IsPro: 0 + + COMMAND LINE ARGUMENTS: +C:\Program Files\Unity\Hub\Editor\2020.3.8f1\Editor\Unity.exe +-adb2 +-batchMode +-noUpm +-name +AssetImportWorker0 +-projectPath +C:/Users/karam/OneDrive/Рабочий стол/SHK-Unity-master +-logFile +Logs/AssetImportWorker0.log +-srvPort +53696 +Successfully changed project path to: C:/Users/karam/OneDrive/Рабочий стол/SHK-Unity-master +C:/Users/karam/OneDrive/Рабочий стол/SHK-Unity-master +Using Asset Import Pipeline V2. +Refreshing native plugins compatible for Editor in 72.08 ms, found 0 plugins. +Preloading 0 native plugins for Editor in 0.00 ms. +Initialize engine version: 2020.3.8f1 (507919d4fff5) +[Subsystems] Discovering subsystems at path C:/Program Files/Unity/Hub/Editor/2020.3.8f1/Editor/Data/Resources/UnitySubsystems +[Subsystems] Discovering subsystems at path C:/Users/karam/OneDrive/Рабочий стол/SHK-Unity-master/Assets +GfxDevice: creating device client; threaded=0 +Direct3D: + Version: Direct3D 11.0 [level 11.0] + Renderer: AMD Radeon HD 7500 Series (ID=0x675d) + Vendor: + VRAM: 1008 MB + Driver: 15.201.1151.1008 +Initialize mono +Mono path[0] = 'C:/Program Files/Unity/Hub/Editor/2020.3.8f1/Editor/Data/Managed' +Mono path[1] = 'C:/Program Files/Unity/Hub/Editor/2020.3.8f1/Editor/Data/MonoBleedingEdge/lib/mono/unityjit' +Mono config path = 'C:/Program Files/Unity/Hub/Editor/2020.3.8f1/Editor/Data/MonoBleedingEdge/etc' +Using monoOptions --debugger-agent=transport=dt_socket,embedding=1,server=y,suspend=n,address=127.0.0.1:56644 +Begin MonoManager ReloadAssembly +Registering precompiled unity dll's ... +Register platform support module: C:/Program Files/Unity/Hub/Editor/2020.3.8f1/Editor/Data/PlaybackEngines/WindowsStandaloneSupport/UnityEditor.WindowsStandalone.Extensions.dll +Registered in 0.002793 seconds. +Native extension for WindowsStandalone target not found +Refreshing native plugins compatible for Editor in 47.96 ms, found 0 plugins. +Preloading 0 native plugins for Editor in 0.00 ms. +Mono: successfully reloaded assembly +- Completed reload, in 2.241 seconds +Platform modules already initialized, skipping +Registering precompiled user dll's ... +Registered in 0.002985 seconds. +Begin MonoManager ReloadAssembly +Native extension for WindowsStandalone target not found +Refreshing native plugins compatible for Editor in 0.63 ms, found 0 plugins. +Preloading 0 native plugins for Editor in 0.00 ms. +Mono: successfully reloaded assembly +- Completed reload, in 1.036 seconds +Platform modules already initialized, skipping +======================================================================== +Worker process is ready to serve import requests +Launched and connected shader compiler UnityShaderCompiler.exe after 0.05 seconds +Refreshing native plugins compatible for Editor in 0.89 ms, found 0 plugins. +Preloading 0 native plugins for Editor in 0.00 ms. +Unloading 1659 Unused Serialized files (Serialized files now loaded: 0) +System memory in use before: 71.0 MB. +System memory in use after: 71.1 MB. + +Unloading 49 unused Assets to reduce memory usage. Loaded Objects now: 2073. +Total: 5.824800 ms (FindLiveObjects: 0.214300 ms CreateObjectMapping: 0.041200 ms MarkObjects: 5.478100 ms DeleteObjects: 0.089000 ms) + +======================================================================== +Received Import Request. + path: Assets/Group1 + artifactKey: Guid(ee4993931bc84204e884e5e0f07a5fe7) Importer(815301076,1909f56bfc062723c751e8b465ee728b) +Start importing Assets/Group1 using Guid(ee4993931bc84204e884e5e0f07a5fe7) Importer(815301076,1909f56bfc062723c751e8b465ee728b) -> (artifact id: '7ab55a343144e84f82bb8f4ba61eb58f') in 0.005700 seconds + Import took 0.008447 seconds . + +======================================================================== +Received Import Request. + Time since last request: 0.000305 seconds. + path: Assets/Group1/Player.png + artifactKey: Guid(e3d497cf399ca0d42af41c518d283eb2) Importer(815301076,1909f56bfc062723c751e8b465ee728b) +Start importing Assets/Group1/Player.png using Guid(e3d497cf399ca0d42af41c518d283eb2) Importer(815301076,1909f56bfc062723c751e8b465ee728b) -> (artifact id: 'ec3e76e9bd7ddf8c296996f1505e156c') in 0.130179 seconds + Import took 0.132778 seconds . + +======================================================================== +Received Import Request. + Time since last request: 0.000308 seconds. + path: Assets/Group1/enemy.png + artifactKey: Guid(c393ddce902166c4fb0e2130d216d549) Importer(815301076,1909f56bfc062723c751e8b465ee728b) +Start importing Assets/Group1/enemy.png using Guid(c393ddce902166c4fb0e2130d216d549) Importer(815301076,1909f56bfc062723c751e8b465ee728b) -> (artifact id: '59c15cf410789729be88a1ed9d47fc14') in 0.011008 seconds + Import took 0.013575 seconds . + +======================================================================== +Received Import Request. + Time since last request: 0.000299 seconds. + path: Assets/Group1/Scenes + artifactKey: Guid(c1fba93d5f718bb42bc2548dd7f1976c) Importer(815301076,1909f56bfc062723c751e8b465ee728b) +Start importing Assets/Group1/Scenes using Guid(c1fba93d5f718bb42bc2548dd7f1976c) Importer(815301076,1909f56bfc062723c751e8b465ee728b) -> (artifact id: 'bcf7829fbf679d98569dd8957f71481d') in 0.002801 seconds + Import took 0.005185 seconds . + +======================================================================== +Received Import Request. + Time since last request: 0.000285 seconds. + path: Assets/Group1/Scenes/KillAllEnemies.unity + artifactKey: Guid(d0a731de6bc19cc479a2474de64e9b3b) Importer(815301076,1909f56bfc062723c751e8b465ee728b) +Start importing Assets/Group1/Scenes/KillAllEnemies.unity using Guid(d0a731de6bc19cc479a2474de64e9b3b) Importer(815301076,1909f56bfc062723c751e8b465ee728b) -> (artifact id: '9dd012adba59797b2151c226b58ec647') in 0.003164 seconds + Import took 0.005450 seconds . + +======================================================================== +Received Import Request. + Time since last request: 1.883718 seconds. + path: Assets/Group1/Scenes/KillAllEnemies.unity + artifactKey: Guid(d0a731de6bc19cc479a2474de64e9b3b) Importer(815301076,1909f56bfc062723c751e8b465ee728b) +Start importing Assets/Group1/Scenes/KillAllEnemies.unity using Guid(d0a731de6bc19cc479a2474de64e9b3b) Importer(815301076,1909f56bfc062723c751e8b465ee728b) -> (artifact id: '9dd012adba59797b2151c226b58ec647') in 0.002769 seconds + Import took 0.005493 seconds . + +======================================================================== +Received Prepare +Registering precompiled user dll's ... +Registered in 0.002788 seconds. +Begin MonoManager ReloadAssembly +Native extension for WindowsStandalone target not found +Refreshing native plugins compatible for Editor in 0.65 ms, found 0 plugins. +Preloading 0 native plugins for Editor in 0.00 ms. +Mono: successfully reloaded assembly +- Completed reload, in 0.957 seconds +Platform modules already initialized, skipping +Refreshing native plugins compatible for Editor in 1.02 ms, found 0 plugins. +Preloading 0 native plugins for Editor in 0.00 ms. +Unloading 1653 Unused Serialized files (Serialized files now loaded: 0) +System memory in use before: 74.0 MB. +System memory in use after: 74.1 MB. + +Unloading 40 unused Assets to reduce memory usage. Loaded Objects now: 2081. +Total: 5.489500 ms (FindLiveObjects: 0.174000 ms CreateObjectMapping: 0.040500 ms MarkObjects: 5.249900 ms DeleteObjects: 0.023900 ms) + +======================================================================== +Received Import Request. + Time since last request: 256.981468 seconds. + path: Assets/Group1/Scripts + artifactKey: Guid(599af706dd3de294dbbc342814c5e602) Importer(815301076,1909f56bfc062723c751e8b465ee728b) +Start importing Assets/Group1/Scripts using Guid(599af706dd3de294dbbc342814c5e602) Importer(815301076,1909f56bfc062723c751e8b465ee728b) -> (artifact id: 'e0f887e1d96ad52532e1584aec539124') in 0.006298 seconds + Import took 0.009087 seconds . + +======================================================================== +Received Import Request. + Time since last request: 1.286542 seconds. + path: Assets/Group1/Scripts/e.cs + artifactKey: Guid(65f7df4705b7dae48944a39b48934484) Importer(815301076,1909f56bfc062723c751e8b465ee728b) +Start importing Assets/Group1/Scripts/e.cs using Guid(65f7df4705b7dae48944a39b48934484) Importer(815301076,1909f56bfc062723c751e8b465ee728b) -> (artifact id: '6d4461953c39b26ce0e72472ffbe494e') in 0.006609 seconds + Import took 0.009225 seconds . + +======================================================================== +Received Prepare +Registering precompiled user dll's ... +Registered in 0.002699 seconds. +Begin MonoManager ReloadAssembly +Native extension for WindowsStandalone target not found +Refreshing native plugins compatible for Editor in 0.65 ms, found 0 plugins. +Preloading 0 native plugins for Editor in 0.00 ms. +Mono: successfully reloaded assembly +- Completed reload, in 0.930 seconds +Platform modules already initialized, skipping +Refreshing native plugins compatible for Editor in 0.71 ms, found 0 plugins. +Preloading 0 native plugins for Editor in 0.00 ms. +Unloading 1653 Unused Serialized files (Serialized files now loaded: 0) +System memory in use before: 74.0 MB. +System memory in use after: 74.1 MB. + +Unloading 40 unused Assets to reduce memory usage. Loaded Objects now: 2084. +Total: 5.218000 ms (FindLiveObjects: 0.189300 ms CreateObjectMapping: 0.041500 ms MarkObjects: 4.964700 ms DeleteObjects: 0.021200 ms) + +AssetImportWorkerClient::OnTransportError - code=2 error=End of file diff --git a/Logs/AssetImportWorker0.log b/Logs/AssetImportWorker0.log new file mode 100644 index 00000000..cf83579c --- /dev/null +++ b/Logs/AssetImportWorker0.log @@ -0,0 +1,104 @@ +Using pre-set license +Built from '2020.3/staging' branch; Version is '2020.3.8f1 (507919d4fff5) revision 5273881'; Using compiler version '192528614'; Build Type 'Release' +OS: 'Windows 10 Home; OS build 19042.1083; Version 2009; 64bit' Language: 'ru' Physical Memory: 20428 MB +BatchMode: 1, IsHumanControllingUs: 0, StartBugReporterOnCrash: 0, Is64bit: 1, IsPro: 0 + + COMMAND LINE ARGUMENTS: +C:\Program Files\Unity\Hub\Editor\2020.3.8f1\Editor\Unity.exe +-adb2 +-batchMode +-noUpm +-name +AssetImportWorker0 +-projectPath +C:/Users/karam/OneDrive/Рабочий стол/SHK-Unity-master +-logFile +Logs/AssetImportWorker0.log +-srvPort +50807 +Successfully changed project path to: C:/Users/karam/OneDrive/Рабочий стол/SHK-Unity-master +C:/Users/karam/OneDrive/Рабочий стол/SHK-Unity-master +Using Asset Import Pipeline V2. +Refreshing native plugins compatible for Editor in 62.81 ms, found 0 plugins. +Preloading 0 native plugins for Editor in 0.00 ms. +Initialize engine version: 2020.3.8f1 (507919d4fff5) +[Subsystems] Discovering subsystems at path C:/Program Files/Unity/Hub/Editor/2020.3.8f1/Editor/Data/Resources/UnitySubsystems +[Subsystems] Discovering subsystems at path C:/Users/karam/OneDrive/Рабочий стол/SHK-Unity-master/Assets +GfxDevice: creating device client; threaded=0 +Direct3D: + Version: Direct3D 11.0 [level 11.0] + Renderer: AMD Radeon HD 7500 Series (ID=0x675d) + Vendor: + VRAM: 1008 MB + Driver: 15.201.1151.1008 +Initialize mono +Mono path[0] = 'C:/Program Files/Unity/Hub/Editor/2020.3.8f1/Editor/Data/Managed' +Mono path[1] = 'C:/Program Files/Unity/Hub/Editor/2020.3.8f1/Editor/Data/MonoBleedingEdge/lib/mono/unityjit' +Mono config path = 'C:/Program Files/Unity/Hub/Editor/2020.3.8f1/Editor/Data/MonoBleedingEdge/etc' +Using monoOptions --debugger-agent=transport=dt_socket,embedding=1,server=y,suspend=n,address=127.0.0.1:56900 +Begin MonoManager ReloadAssembly +Registering precompiled unity dll's ... +Register platform support module: C:/Program Files/Unity/Hub/Editor/2020.3.8f1/Editor/Data/PlaybackEngines/WindowsStandaloneSupport/UnityEditor.WindowsStandalone.Extensions.dll +Registered in 0.002992 seconds. +Native extension for WindowsStandalone target not found +Refreshing native plugins compatible for Editor in 45.98 ms, found 0 plugins. +Preloading 0 native plugins for Editor in 0.00 ms. +Mono: successfully reloaded assembly +- Completed reload, in 2.665 seconds +Platform modules already initialized, skipping +Registering precompiled user dll's ... +Registered in 0.003339 seconds. +Begin MonoManager ReloadAssembly +Native extension for WindowsStandalone target not found +Refreshing native plugins compatible for Editor in 0.61 ms, found 0 plugins. +Preloading 0 native plugins for Editor in 0.00 ms. +Mono: successfully reloaded assembly +- Completed reload, in 1.017 seconds +Platform modules already initialized, skipping +======================================================================== +Worker process is ready to serve import requests +Launched and connected shader compiler UnityShaderCompiler.exe after 0.07 seconds +Refreshing native plugins compatible for Editor in 0.92 ms, found 0 plugins. +Preloading 0 native plugins for Editor in 0.00 ms. +Unloading 1659 Unused Serialized files (Serialized files now loaded: 0) +System memory in use before: 71.0 MB. +System memory in use after: 71.1 MB. + +Unloading 49 unused Assets to reduce memory usage. Loaded Objects now: 2073. +Total: 5.323500 ms (FindLiveObjects: 0.185600 ms CreateObjectMapping: 0.040900 ms MarkObjects: 5.020500 ms DeleteObjects: 0.075500 ms) + +======================================================================== +Received Import Request. + path: Assets/Group1/Scripts/GameController.cs + artifactKey: Guid(cd6d0074e725a114e850d2e604fe4b0d) Importer(815301076,1909f56bfc062723c751e8b465ee728b) +Start importing Assets/Group1/Scripts/GameController.cs using Guid(cd6d0074e725a114e850d2e604fe4b0d) Importer(815301076,1909f56bfc062723c751e8b465ee728b) -> (artifact id: 'eeecd9e3ee568175c326a1bf8418e384') in 0.029282 seconds + Import took 0.032135 seconds . + +======================================================================== +Received Import Request. + Time since last request: 91.396486 seconds. + path: Assets/Group1/Scripts/NewBehaviourScript1.cs + artifactKey: Guid(dede9e7d6741aea4cb07b98da83cc6a8) Importer(815301076,1909f56bfc062723c751e8b465ee728b) +Start importing Assets/Group1/Scripts/NewBehaviourScript1.cs using Guid(dede9e7d6741aea4cb07b98da83cc6a8) Importer(815301076,1909f56bfc062723c751e8b465ee728b) -> (artifact id: '1a8277b854734e3290880bd1fd4767e4') in 0.002926 seconds + Import took 0.006059 seconds . + +======================================================================== +Received Prepare +Registering precompiled user dll's ... +Registered in 0.003104 seconds. +Begin MonoManager ReloadAssembly +Native extension for WindowsStandalone target not found +Refreshing native plugins compatible for Editor in 0.70 ms, found 0 plugins. +Preloading 0 native plugins for Editor in 0.00 ms. +Mono: successfully reloaded assembly +- Completed reload, in 0.980 seconds +Platform modules already initialized, skipping +Refreshing native plugins compatible for Editor in 0.96 ms, found 0 plugins. +Preloading 0 native plugins for Editor in 0.00 ms. +Unloading 1653 Unused Serialized files (Serialized files now loaded: 0) +System memory in use before: 70.9 MB. +System memory in use after: 71.0 MB. + +Unloading 40 unused Assets to reduce memory usage. Loaded Objects now: 2076. +Total: 5.212300 ms (FindLiveObjects: 0.197300 ms CreateObjectMapping: 0.040400 ms MarkObjects: 4.948700 ms DeleteObjects: 0.024700 ms) + diff --git a/Logs/shadercompiler-AssetImportWorker0.log b/Logs/shadercompiler-AssetImportWorker0.log new file mode 100644 index 00000000..2b3f86cc --- /dev/null +++ b/Logs/shadercompiler-AssetImportWorker0.log @@ -0,0 +1,3 @@ +Base path: 'C:/Program Files/Unity/Hub/Editor/2020.3.8f1/Editor/Data', plugins path 'C:/Program Files/Unity/Hub/Editor/2020.3.8f1/Editor/Data/PlaybackEngines' +Cmd: initializeCompiler + diff --git a/Logs/shadercompiler-UnityShaderCompiler.exe0.log b/Logs/shadercompiler-UnityShaderCompiler.exe0.log new file mode 100644 index 00000000..2b3f86cc --- /dev/null +++ b/Logs/shadercompiler-UnityShaderCompiler.exe0.log @@ -0,0 +1,3 @@ +Base path: 'C:/Program Files/Unity/Hub/Editor/2020.3.8f1/Editor/Data', plugins path 'C:/Program Files/Unity/Hub/Editor/2020.3.8f1/Editor/Data/PlaybackEngines' +Cmd: initializeCompiler + diff --git a/Packages/manifest.json b/Packages/manifest.json index 8392bea1..485423e0 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -1,12 +1,21 @@ { "dependencies": { - "com.unity.ads": "2.0.8", - "com.unity.analytics": "3.2.2", - "com.unity.collab-proxy": "1.2.15", - "com.unity.package-manager-ui": "2.0.7", - "com.unity.purchasing": "2.0.3", - "com.unity.textmeshpro": "1.3.0", + "com.unity.2d.sprite": "1.0.0", + "com.unity.2d.tilemap": "1.0.0", + "com.unity.ads": "3.7.1", + "com.unity.analytics": "3.5.3", + "com.unity.collab-proxy": "1.3.9", + "com.unity.ide.rider": "2.0.7", + "com.unity.ide.visualstudio": "2.0.7", + "com.unity.ide.vscode": "1.2.3", + "com.unity.purchasing": "3.0.2", + "com.unity.test-framework": "1.1.24", + "com.unity.textmeshpro": "3.0.1", + "com.unity.timeline": "1.4.7", + "com.unity.ugui": "1.0.0", + "com.unity.xr.legacyinputhelpers": "2.1.7", "com.unity.modules.ai": "1.0.0", + "com.unity.modules.androidjni": "1.0.0", "com.unity.modules.animation": "1.0.0", "com.unity.modules.assetbundle": "1.0.0", "com.unity.modules.audio": "1.0.0", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json new file mode 100644 index 00000000..c10a886c --- /dev/null +++ b/Packages/packages-lock.json @@ -0,0 +1,391 @@ +{ + "dependencies": { + "com.unity.2d.sprite": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.2d.tilemap": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.ads": { + "version": "3.7.1", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.ugui": "1.0.0" + }, + "url": "https://packages.unity.com" + }, + "com.unity.analytics": { + "version": "3.5.3", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.ugui": "1.0.0" + }, + "url": "https://packages.unity.com" + }, + "com.unity.collab-proxy": { + "version": "1.3.9", + "depth": 0, + "source": "registry", + "dependencies": {}, + "url": "https://packages.unity.com" + }, + "com.unity.ext.nunit": { + "version": "1.0.6", + "depth": 1, + "source": "registry", + "dependencies": {}, + "url": "https://packages.unity.com" + }, + "com.unity.ide.rider": { + "version": "2.0.7", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.test-framework": "1.1.1" + }, + "url": "https://packages.unity.com" + }, + "com.unity.ide.visualstudio": { + "version": "2.0.7", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.test-framework": "1.1.9" + }, + "url": "https://packages.unity.com" + }, + "com.unity.ide.vscode": { + "version": "1.2.3", + "depth": 0, + "source": "registry", + "dependencies": {}, + "url": "https://packages.unity.com" + }, + "com.unity.purchasing": { + "version": "3.0.2", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.ugui": "1.0.0", + "com.unity.modules.unityanalytics": "1.0.0", + "com.unity.modules.unitywebrequest": "1.0.0", + "com.unity.modules.jsonserialize": "1.0.0", + "com.unity.modules.androidjni": "1.0.0" + }, + "url": "https://packages.unity.com" + }, + "com.unity.test-framework": { + "version": "1.1.24", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.ext.nunit": "1.0.6", + "com.unity.modules.imgui": "1.0.0", + "com.unity.modules.jsonserialize": "1.0.0" + }, + "url": "https://packages.unity.com" + }, + "com.unity.textmeshpro": { + "version": "3.0.1", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.ugui": "1.0.0" + }, + "url": "https://packages.unity.com" + }, + "com.unity.timeline": { + "version": "1.4.7", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.modules.director": "1.0.0", + "com.unity.modules.animation": "1.0.0", + "com.unity.modules.audio": "1.0.0", + "com.unity.modules.particlesystem": "1.0.0" + }, + "url": "https://packages.unity.com" + }, + "com.unity.ugui": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.ui": "1.0.0", + "com.unity.modules.imgui": "1.0.0" + } + }, + "com.unity.xr.legacyinputhelpers": { + "version": "2.1.7", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.modules.vr": "1.0.0", + "com.unity.modules.xr": "1.0.0" + }, + "url": "https://packages.unity.com" + }, + "com.unity.modules.ai": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.androidjni": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.animation": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.assetbundle": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.audio": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.cloth": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.physics": "1.0.0" + } + }, + "com.unity.modules.director": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.audio": "1.0.0", + "com.unity.modules.animation": "1.0.0" + } + }, + "com.unity.modules.imageconversion": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.imgui": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.jsonserialize": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.particlesystem": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.physics": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.physics2d": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.screencapture": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.imageconversion": "1.0.0" + } + }, + "com.unity.modules.subsystems": { + "version": "1.0.0", + "depth": 1, + "source": "builtin", + "dependencies": { + "com.unity.modules.jsonserialize": "1.0.0" + } + }, + "com.unity.modules.terrain": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.terrainphysics": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.physics": "1.0.0", + "com.unity.modules.terrain": "1.0.0" + } + }, + "com.unity.modules.tilemap": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.physics2d": "1.0.0" + } + }, + "com.unity.modules.ui": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.uielements": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.ui": "1.0.0", + "com.unity.modules.imgui": "1.0.0", + "com.unity.modules.jsonserialize": "1.0.0", + "com.unity.modules.uielementsnative": "1.0.0" + } + }, + "com.unity.modules.uielementsnative": { + "version": "1.0.0", + "depth": 1, + "source": "builtin", + "dependencies": { + "com.unity.modules.ui": "1.0.0", + "com.unity.modules.imgui": "1.0.0", + "com.unity.modules.jsonserialize": "1.0.0" + } + }, + "com.unity.modules.umbra": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.unityanalytics": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.unitywebrequest": "1.0.0", + "com.unity.modules.jsonserialize": "1.0.0" + } + }, + "com.unity.modules.unitywebrequest": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.unitywebrequestassetbundle": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.assetbundle": "1.0.0", + "com.unity.modules.unitywebrequest": "1.0.0" + } + }, + "com.unity.modules.unitywebrequestaudio": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.unitywebrequest": "1.0.0", + "com.unity.modules.audio": "1.0.0" + } + }, + "com.unity.modules.unitywebrequesttexture": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.unitywebrequest": "1.0.0", + "com.unity.modules.imageconversion": "1.0.0" + } + }, + "com.unity.modules.unitywebrequestwww": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.unitywebrequest": "1.0.0", + "com.unity.modules.unitywebrequestassetbundle": "1.0.0", + "com.unity.modules.unitywebrequestaudio": "1.0.0", + "com.unity.modules.audio": "1.0.0", + "com.unity.modules.assetbundle": "1.0.0", + "com.unity.modules.imageconversion": "1.0.0" + } + }, + "com.unity.modules.vehicles": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.physics": "1.0.0" + } + }, + "com.unity.modules.video": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.audio": "1.0.0", + "com.unity.modules.ui": "1.0.0", + "com.unity.modules.unitywebrequest": "1.0.0" + } + }, + "com.unity.modules.vr": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.jsonserialize": "1.0.0", + "com.unity.modules.physics": "1.0.0", + "com.unity.modules.xr": "1.0.0" + } + }, + "com.unity.modules.wind": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.xr": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.physics": "1.0.0", + "com.unity.modules.jsonserialize": "1.0.0", + "com.unity.modules.subsystems": "1.0.0" + } + } + } +} diff --git a/ProjectSettings/PackageManagerSettings.asset b/ProjectSettings/PackageManagerSettings.asset new file mode 100644 index 00000000..be4a7974 --- /dev/null +++ b/ProjectSettings/PackageManagerSettings.asset @@ -0,0 +1,43 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &1 +MonoBehaviour: + m_ObjectHideFlags: 61 + 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: 13964, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_EnablePreviewPackages: 0 + m_EnablePackageDependencies: 0 + m_AdvancedSettingsExpanded: 1 + m_ScopedRegistriesSettingsExpanded: 1 + oneTimeWarningShown: 0 + m_Registries: + - m_Id: main + m_Name: + m_Url: https://packages.unity.com + m_Scopes: [] + m_IsDefault: 1 + m_Capabilities: 7 + 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 diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index 6dfd6c14..4e87e307 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1 +1,2 @@ -m_EditorVersion: 2018.3.14f1 +m_EditorVersion: 2020.3.8f1 +m_EditorVersionWithRevision: 2020.3.8f1 (507919d4fff5) diff --git a/ProjectSettings/VersionControlSettings.asset b/ProjectSettings/VersionControlSettings.asset new file mode 100644 index 00000000..dca28814 --- /dev/null +++ b/ProjectSettings/VersionControlSettings.asset @@ -0,0 +1,8 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!890905787 &1 +VersionControlSettings: + m_ObjectHideFlags: 0 + m_Mode: Visible Meta Files + m_CollabEditorSettings: + inProgressEnabled: 1 diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset new file mode 100644 index 00000000..aae3070b --- /dev/null +++ b/UserSettings/EditorUserSettings.asset @@ -0,0 +1,24 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!162 &1 +EditorUserSettings: + m_ObjectHideFlags: 0 + serializedVersion: 4 + m_ConfigSettings: + RecentlyUsedScenePath-0: + value: 224247031146467c1f011932416c6c1313191d3963032f3c2108113fc7ee3135ebe225a7f234362820 + flags: 0 + vcSharedLogLevel: + value: 0d5e400f0650 + flags: 0 + m_VCAutomaticAdd: 1 + m_VCDebugCom: 0 + m_VCDebugCmd: 0 + m_VCDebugOut: 0 + m_SemanticMergeMode: 2 + m_VCShowFailedCheckout: 1 + m_VCOverwriteFailedCheckoutAssets: 1 + m_VCProjectOverlayIcons: 1 + m_VCHierarchyOverlayIcons: 1 + m_VCOtherOverlayIcons: 1 + m_VCAllowAsyncUpdate: 1