diff --git a/.gitignore b/.gitignore index 5803d59..14f9b8e 100644 --- a/.gitignore +++ b/.gitignore @@ -38,6 +38,8 @@ *.app *.exe *.*_data +.vsconfig +*.dwlt # Unity3D generated meta files *.pidb.meta diff --git a/Assets/PackageExporter.meta b/Assets/PackageExporter.meta new file mode 100644 index 0000000..2f96116 --- /dev/null +++ b/Assets/PackageExporter.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 5f0c8382b16846143a01712905f45f40 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/PackageExporter/Editor.meta b/Assets/PackageExporter/Editor.meta new file mode 100644 index 0000000..c6d91b3 --- /dev/null +++ b/Assets/PackageExporter/Editor.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d517cfe235b5029439f2cc60892a254c +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/PackageExporter/Editor/PackageExporter.dll b/Assets/PackageExporter/Editor/PackageExporter.dll new file mode 100644 index 0000000..61d9e18 Binary files /dev/null and b/Assets/PackageExporter/Editor/PackageExporter.dll differ diff --git a/Assets/PackageExporter/Editor/PackageExporter.dll.meta b/Assets/PackageExporter/Editor/PackageExporter.dll.meta new file mode 100644 index 0000000..932ff10 --- /dev/null +++ b/Assets/PackageExporter/Editor/PackageExporter.dll.meta @@ -0,0 +1,33 @@ +fileFormatVersion: 2 +guid: 52e7e818d0a98674bae61a8fd842187d +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Any: + second: + enabled: 0 + settings: {} + - first: + Editor: Editor + second: + enabled: 1 + settings: + DefaultValueInitialized: true + - first: + Windows Store Apps: WindowsStoreApps + second: + enabled: 0 + settings: + CPU: AnyCPU + userData: + assetBundleName: + assetBundleVariant: diff --git a/LICENSE.txt b/Assets/PackageExporter/LICENSE.txt similarity index 81% rename from LICENSE.txt rename to Assets/PackageExporter/LICENSE.txt index e412d58..57a788c 100644 --- a/LICENSE.txt +++ b/Assets/PackageExporter/LICENSE.txt @@ -1,19 +1,21 @@ -Copyright (c) 2020 Jen-Chieh Shen +MIT License -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is +Copyright (c) Pixisoft Corporation. + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: -The above copyright notice and this permission notice shall be included in all +The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/Assets/PackageExporter/LICENSE.txt.meta b/Assets/PackageExporter/LICENSE.txt.meta new file mode 100644 index 0000000..3207976 --- /dev/null +++ b/Assets/PackageExporter/LICENSE.txt.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 775caf45e7564a84bb5d82e776e43433 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/PackageExporter/README.pdf b/Assets/PackageExporter/README.pdf new file mode 100644 index 0000000..a40996a Binary files /dev/null and b/Assets/PackageExporter/README.pdf differ diff --git a/Assets/PackageExporter/README.pdf.meta b/Assets/PackageExporter/README.pdf.meta new file mode 100644 index 0000000..4ae43fe --- /dev/null +++ b/Assets/PackageExporter/README.pdf.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 6fe54e1506eb9c94abb363a31e447307 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/PackageExporter/template.meta b/Assets/PackageExporter/template.meta new file mode 100644 index 0000000..2a1edf9 --- /dev/null +++ b/Assets/PackageExporter/template.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2a5918c51b1522c4ab586d753996f1b6 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/PackageExporter/template/template.unityignore b/Assets/PackageExporter/template/template.unityignore new file mode 100644 index 0000000..ea6cfe7 --- /dev/null +++ b/Assets/PackageExporter/template/template.unityignore @@ -0,0 +1,15 @@ +# +# Thank you for using `Package Exporter`. This is the generated +# unityignore file. +# +# Package Name: [PACKAGE_NAME] +# Version: [VERSION_NO] +# Creation Date: [CREATION_DATE] +# +# Package Link: https://github.com/jcs090218/PackageExporter +# Author: Shen, Jen-Chieh +# Email: jcs090218@gmail.com +# + +# Ignore this plugin itself. +PackageExporter/ diff --git a/Assets/PackageExporter/template/template.unityignore.meta b/Assets/PackageExporter/template/template.unityignore.meta new file mode 100644 index 0000000..30f2b64 --- /dev/null +++ b/Assets/PackageExporter/template/template.unityignore.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 7bbea4aa32de490498c55735c8464dca +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/PackageExporter/unityignore.meta b/Assets/PackageExporter/unityignore.meta new file mode 100644 index 0000000..29e0470 --- /dev/null +++ b/Assets/PackageExporter/unityignore.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 13cb79343efbb0d488b863b5ebff4616 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/PackageExporter/unityignore/README.txt b/Assets/PackageExporter/unityignore/README.txt new file mode 100644 index 0000000..5906d7a --- /dev/null +++ b/Assets/PackageExporter/unityignore/README.txt @@ -0,0 +1 @@ +All .unityignore files should be under this folder! diff --git a/Assets/PackageExporter/unityignore/README.txt.meta b/Assets/PackageExporter/unityignore/README.txt.meta new file mode 100644 index 0000000..fcdb276 --- /dev/null +++ b/Assets/PackageExporter/unityignore/README.txt.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 5594f646605a2134d9503d1d053f26a5 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/PackageExporter/unityignore/UnityLua.unityignore b/Assets/PackageExporter/unityignore/UnityLua.unityignore new file mode 100644 index 0000000..ba55b68 --- /dev/null +++ b/Assets/PackageExporter/unityignore/UnityLua.unityignore @@ -0,0 +1,15 @@ +# +# Thank you for using 'Unity Package Exporter'. This is the generated +# unityignore file. +# +# Package Name: UnityLua +# Version: 0.1.1 +# Creation Date: 2020-03-24 17:15:43 +# +# Package Link: https://github.com/jcs090218/UnityPackageExporter +# Author: Shen, Jen-Chieh +# Email: jcs090218@gmail.com +# + +# Ignore this plugin itself. +UnityPackageExporter diff --git a/Assets/PackageExporter/unityignore/UnityLua.unityignore.meta b/Assets/PackageExporter/unityignore/UnityLua.unityignore.meta new file mode 100644 index 0000000..9ad914d --- /dev/null +++ b/Assets/PackageExporter/unityignore/UnityLua.unityignore.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 719fbd78e2c254d4a821609f58596dc8 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ToLua/Source/Generate/UnityEngine_AnimatorWrap.cs b/Assets/ToLua/Source/Generate/UnityEngine_AnimatorWrap.cs index b98e793..f5d3879 100644 --- a/Assets/ToLua/Source/Generate/UnityEngine_AnimatorWrap.cs +++ b/Assets/ToLua/Source/Generate/UnityEngine_AnimatorWrap.cs @@ -2476,7 +2476,7 @@ static int get_keepAnimatorControllerStateOnDisable(IntPtr L) { o = ToLua.ToObject(L, 1); UnityEngine.Animator obj = (UnityEngine.Animator)o; - bool ret = obj.keepAnimatorControllerStateOnDisable; + bool ret = obj.keepAnimatorStateOnDisable; LuaDLL.lua_pushboolean(L, ret); return 1; } @@ -2838,7 +2838,7 @@ static int set_keepAnimatorControllerStateOnDisable(IntPtr L) o = ToLua.ToObject(L, 1); UnityEngine.Animator obj = (UnityEngine.Animator)o; bool arg0 = LuaDLL.luaL_checkboolean(L, 2); - obj.keepAnimatorControllerStateOnDisable = arg0; + obj.keepAnimatorStateOnDisable = arg0; return 0; } catch(Exception e) diff --git a/Assets/ToLua/Source/Generate/UnityEngine_ColliderWrap.cs b/Assets/ToLua/Source/Generate/UnityEngine_ColliderWrap.cs index dd538a8..0007bda 100644 --- a/Assets/ToLua/Source/Generate/UnityEngine_ColliderWrap.cs +++ b/Assets/ToLua/Source/Generate/UnityEngine_ColliderWrap.cs @@ -226,7 +226,7 @@ static int get_sharedMaterial(IntPtr L) { o = ToLua.ToObject(L, 1); UnityEngine.Collider obj = (UnityEngine.Collider)o; - UnityEngine.PhysicMaterial ret = obj.sharedMaterial; + UnityEngine.PhysicsMaterial ret = obj.sharedMaterial; ToLua.Push(L, ret); return 1; } @@ -245,7 +245,7 @@ static int get_material(IntPtr L) { o = ToLua.ToObject(L, 1); UnityEngine.Collider obj = (UnityEngine.Collider)o; - UnityEngine.PhysicMaterial ret = obj.material; + UnityEngine.PhysicsMaterial ret = obj.material; ToLua.Push(L, ret); return 1; } @@ -321,7 +321,7 @@ static int set_sharedMaterial(IntPtr L) { o = ToLua.ToObject(L, 1); UnityEngine.Collider obj = (UnityEngine.Collider)o; - UnityEngine.PhysicMaterial arg0 = (UnityEngine.PhysicMaterial)ToLua.CheckObject(L, 2); + UnityEngine.PhysicsMaterial arg0 = (UnityEngine.PhysicsMaterial)ToLua.CheckObject(L, 2); obj.sharedMaterial = arg0; return 0; } @@ -340,7 +340,7 @@ static int set_material(IntPtr L) { o = ToLua.ToObject(L, 1); UnityEngine.Collider obj = (UnityEngine.Collider)o; - UnityEngine.PhysicMaterial arg0 = (UnityEngine.PhysicMaterial)ToLua.CheckObject(L, 2); + UnityEngine.PhysicsMaterial arg0 = (UnityEngine.PhysicsMaterial)ToLua.CheckObject(L, 2); obj.material = arg0; return 0; } diff --git a/Assets/ToLua/Source/Generate/UnityEngine_LightTypeWrap.cs b/Assets/ToLua/Source/Generate/UnityEngine_LightTypeWrap.cs index 28e5c34..e1e9de2 100644 --- a/Assets/ToLua/Source/Generate/UnityEngine_LightTypeWrap.cs +++ b/Assets/ToLua/Source/Generate/UnityEngine_LightTypeWrap.cs @@ -53,7 +53,7 @@ static int get_Point(IntPtr L) [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))] static int get_Area(IntPtr L) { - ToLua.Push(L, UnityEngine.LightType.Area); + ToLua.Push(L, UnityEngine.LightType.Rectangle); return 1; } diff --git a/Assets/ToLua/Source/Generate/UnityEngine_QualitySettingsWrap.cs b/Assets/ToLua/Source/Generate/UnityEngine_QualitySettingsWrap.cs index 7c339cc..f0bc9bb 100644 --- a/Assets/ToLua/Source/Generate/UnityEngine_QualitySettingsWrap.cs +++ b/Assets/ToLua/Source/Generate/UnityEngine_QualitySettingsWrap.cs @@ -364,7 +364,7 @@ static int get_masterTextureLimit(IntPtr L) { try { - LuaDLL.lua_pushinteger(L, UnityEngine.QualitySettings.masterTextureLimit); + LuaDLL.lua_pushinteger(L, UnityEngine.QualitySettings.globalTextureMipmapLimit); return 1; } catch (Exception e) @@ -867,7 +867,7 @@ static int set_masterTextureLimit(IntPtr L) try { int arg0 = (int)LuaDLL.luaL_checknumber(L, 2); - UnityEngine.QualitySettings.masterTextureLimit = arg0; + UnityEngine.QualitySettings.globalTextureMipmapLimit = arg0; return 0; } catch (Exception e) diff --git a/Assets/ToLua/Source/Generate/UnityEngine_RigidbodyWrap.cs b/Assets/ToLua/Source/Generate/UnityEngine_RigidbodyWrap.cs index 5eb481e..7ce9c41 100644 --- a/Assets/ToLua/Source/Generate/UnityEngine_RigidbodyWrap.cs +++ b/Assets/ToLua/Source/Generate/UnityEngine_RigidbodyWrap.cs @@ -679,7 +679,7 @@ static int get_velocity(IntPtr L) { o = ToLua.ToObject(L, 1); UnityEngine.Rigidbody obj = (UnityEngine.Rigidbody)o; - UnityEngine.Vector3 ret = obj.velocity; + UnityEngine.Vector3 ret = obj.linearVelocity; ToLua.Push(L, ret); return 1; } @@ -717,7 +717,7 @@ static int get_drag(IntPtr L) { o = ToLua.ToObject(L, 1); UnityEngine.Rigidbody obj = (UnityEngine.Rigidbody)o; - float ret = obj.drag; + float ret = obj.linearDamping; LuaDLL.lua_pushnumber(L, ret); return 1; } @@ -736,7 +736,7 @@ static int get_angularDrag(IntPtr L) { o = ToLua.ToObject(L, 1); UnityEngine.Rigidbody obj = (UnityEngine.Rigidbody)o; - float ret = obj.angularDrag; + float ret = obj.angularDamping; LuaDLL.lua_pushnumber(L, ret); return 1; } @@ -1117,7 +1117,7 @@ static int set_velocity(IntPtr L) o = ToLua.ToObject(L, 1); UnityEngine.Rigidbody obj = (UnityEngine.Rigidbody)o; UnityEngine.Vector3 arg0 = ToLua.ToVector3(L, 2); - obj.velocity = arg0; + obj.linearVelocity = arg0; return 0; } catch(Exception e) @@ -1155,7 +1155,7 @@ static int set_drag(IntPtr L) o = ToLua.ToObject(L, 1); UnityEngine.Rigidbody obj = (UnityEngine.Rigidbody)o; float arg0 = (float)LuaDLL.luaL_checknumber(L, 2); - obj.drag = arg0; + obj.linearDamping = arg0; return 0; } catch(Exception e) @@ -1174,7 +1174,7 @@ static int set_angularDrag(IntPtr L) o = ToLua.ToObject(L, 1); UnityEngine.Rigidbody obj = (UnityEngine.Rigidbody)o; float arg0 = (float)LuaDLL.luaL_checknumber(L, 2); - obj.angularDrag = arg0; + obj.angularDamping = arg0; return 0; } catch(Exception e) diff --git a/Assets/ToLua/Source/Generate/UnityEngine_Texture2DWrap.cs b/Assets/ToLua/Source/Generate/UnityEngine_Texture2DWrap.cs index 8bd0df0..4f01d32 100644 --- a/Assets/ToLua/Source/Generate/UnityEngine_Texture2DWrap.cs +++ b/Assets/ToLua/Source/Generate/UnityEngine_Texture2DWrap.cs @@ -648,7 +648,7 @@ static int Resize(IntPtr L) UnityEngine.Texture2D obj = (UnityEngine.Texture2D)ToLua.CheckObject(L, 1, typeof(UnityEngine.Texture2D)); int arg0 = (int)LuaDLL.luaL_checknumber(L, 2); int arg1 = (int)LuaDLL.luaL_checknumber(L, 3); - bool o = obj.Resize(arg0, arg1); + bool o = obj.Reinitialize(arg0, arg1); LuaDLL.lua_pushboolean(L, o); return 1; } @@ -659,7 +659,7 @@ static int Resize(IntPtr L) int arg1 = (int)LuaDLL.luaL_checknumber(L, 3); UnityEngine.TextureFormat arg2 = (UnityEngine.TextureFormat)ToLua.CheckObject(L, 4, typeof(UnityEngine.TextureFormat)); bool arg3 = LuaDLL.luaL_checkboolean(L, 5); - bool o = obj.Resize(arg0, arg1, arg2, arg3); + bool o = obj.Reinitialize(arg0, arg1, arg2, arg3); LuaDLL.lua_pushboolean(L, o); return 1; } diff --git a/Assets/ToLua/Source/Generate/UnityEngine_TextureWrap.cs b/Assets/ToLua/Source/Generate/UnityEngine_TextureWrap.cs index 1b2012e..9432fd9 100644 --- a/Assets/ToLua/Source/Generate/UnityEngine_TextureWrap.cs +++ b/Assets/ToLua/Source/Generate/UnityEngine_TextureWrap.cs @@ -150,7 +150,7 @@ static int get_masterTextureLimit(IntPtr L) { try { - LuaDLL.lua_pushinteger(L, UnityEngine.Texture.masterTextureLimit); + LuaDLL.lua_pushinteger(L, UnityEngine.Texture.globalMipmapLimit); return 1; } catch (Exception e) @@ -660,7 +660,7 @@ static int set_masterTextureLimit(IntPtr L) try { int arg0 = (int)LuaDLL.luaL_checknumber(L, 2); - UnityEngine.Texture.masterTextureLimit = arg0; + UnityEngine.Texture.globalMipmapLimit = arg0; return 0; } catch (Exception e) diff --git a/CHANGELOG.md b/CHANGELOG.md index 848148b..505062f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,8 +5,13 @@ All notable changes to this project will be documented in this file. Check [Keep a Changelog](http://keepachangelog.com/) for recommendations on how to structure this file. +### 2021-03-05 + +* Update project's Unity Engine version to 2020.1.2f1. + ### 2020-03-24 +* Added [UnityPackageExporter](https://github.com/jcs090218/UnityPackageExporter) for package exporting management. * Added example for calling lua function from C#. * Imported the newest version of `tolua`. * First release. diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..f247d60 --- /dev/null +++ b/LICENSE @@ -0,0 +1,19 @@ +Copyright (c) 2020-2022 Jen-Chieh Shen + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/Packages/manifest.json b/Packages/manifest.json index c6e423d..85fc6ec 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -1,12 +1,14 @@ { "dependencies": { - "com.unity.collab-proxy": "1.2.16", - "com.unity.ide.rider": "1.1.4", - "com.unity.ide.vscode": "1.1.4", - "com.unity.test-framework": "1.1.11", - "com.unity.textmeshpro": "2.0.1", - "com.unity.timeline": "1.2.12", - "com.unity.ugui": "1.0.0", + "com.unity.ai.navigation": "2.0.0", + "com.unity.collab-proxy": "2.4.3", + "com.unity.ide.rider": "3.0.28", + "com.unity.ide.visualstudio": "2.0.22", + "com.unity.test-framework": "1.4.4", + "com.unity.timeline": "1.8.7", + "com.unity.toolchain.win-x86_64-linux-x86_64": "2.0.9", + "com.unity.ugui": "2.0.0", + "com.unity.modules.accessibility": "1.0.0", "com.unity.modules.ai": "1.0.0", "com.unity.modules.androidjni": "1.0.0", "com.unity.modules.animation": "1.0.0", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json new file mode 100644 index 0000000..a038017 --- /dev/null +++ b/Packages/packages-lock.json @@ -0,0 +1,359 @@ +{ + "dependencies": { + "com.unity.ai.navigation": { + "version": "2.0.0", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.modules.ai": "1.0.0" + }, + "url": "https://packages.unity.com" + }, + "com.unity.collab-proxy": { + "version": "2.4.3", + "depth": 0, + "source": "registry", + "dependencies": {}, + "url": "https://packages.unity.com" + }, + "com.unity.ext.nunit": { + "version": "2.0.5", + "depth": 1, + "source": "registry", + "dependencies": {}, + "url": "https://packages.unity.com" + }, + "com.unity.ide.rider": { + "version": "3.0.28", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.ext.nunit": "1.0.6" + }, + "url": "https://packages.unity.com" + }, + "com.unity.ide.visualstudio": { + "version": "2.0.22", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.test-framework": "1.1.9" + }, + "url": "https://packages.unity.com" + }, + "com.unity.sysroot": { + "version": "2.0.10", + "depth": 1, + "source": "registry", + "dependencies": {}, + "url": "https://packages.unity.com" + }, + "com.unity.sysroot.linux-x86_64": { + "version": "2.0.9", + "depth": 1, + "source": "registry", + "dependencies": { + "com.unity.sysroot": "2.0.10" + }, + "url": "https://packages.unity.com" + }, + "com.unity.test-framework": { + "version": "1.4.4", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.ext.nunit": "2.0.3", + "com.unity.modules.imgui": "1.0.0", + "com.unity.modules.jsonserialize": "1.0.0" + }, + "url": "https://packages.unity.com" + }, + "com.unity.timeline": { + "version": "1.8.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.toolchain.win-x86_64-linux-x86_64": { + "version": "2.0.9", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.sysroot": "2.0.10", + "com.unity.sysroot.linux-x86_64": "2.0.9" + }, + "url": "https://packages.unity.com" + }, + "com.unity.ugui": { + "version": "2.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.ui": "1.0.0", + "com.unity.modules.imgui": "1.0.0" + } + }, + "com.unity.modules.accessibility": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "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.hierarchycore": { + "version": "1.0.0", + "depth": 1, + "source": "builtin", + "dependencies": {} + }, + "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.hierarchycore": "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/MemorySettings.asset b/ProjectSettings/MemorySettings.asset new file mode 100644 index 0000000..5b5face --- /dev/null +++ b/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/ProjectSettings/MultiplayerManager.asset b/ProjectSettings/MultiplayerManager.asset new file mode 100644 index 0000000..2a93664 --- /dev/null +++ b/ProjectSettings/MultiplayerManager.asset @@ -0,0 +1,7 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!655991488 &1 +MultiplayerManager: + m_ObjectHideFlags: 0 + m_EnableMultiplayerRoles: 0 + m_StrippingTypes: {} diff --git a/ProjectSettings/PackageManagerSettings.asset b/ProjectSettings/PackageManagerSettings.asset new file mode 100644 index 0000000..102c612 --- /dev/null +++ b/ProjectSettings/PackageManagerSettings.asset @@ -0,0 +1,45 @@ +%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_EnablePreReleasePackages: 0 + m_EnablePackageDependencies: 0 + m_AdvancedSettingsExpanded: 1 + m_ScopedRegistriesSettingsExpanded: 1 + m_SeeAllPackageVersions: 0 + 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 + m_LoadAssets: 0 diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index d573bde..50221ce 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -3,7 +3,7 @@ --- !u!129 &1 PlayerSettings: m_ObjectHideFlags: 0 - serializedVersion: 20 + serializedVersion: 23 productGUID: 6155c94c35774a44493f09712cd56e63 AndroidProfiler: 0 AndroidFilterTouchesWhenObscured: 0 @@ -49,6 +49,8 @@ PlayerSettings: m_StereoRenderingPath: 0 m_ActiveColorSpace: 0 m_MTRendering: 1 + mipStripping: 0 + numberOfMipsStripped: 0 m_StackTraceTypes: 010000000100000001000000010000000100000001000000 iosShowActivityIndicatorOnLoading: -1 androidShowActivityIndicatorOnLoading: -1 @@ -66,6 +68,12 @@ PlayerSettings: androidRenderOutsideSafeArea: 1 androidUseSwappy: 0 androidBlitType: 0 + androidResizableWindow: 0 + androidDefaultWindowWidth: 1920 + androidDefaultWindowHeight: 1080 + androidMinimumWindowWidth: 400 + androidMinimumWindowHeight: 300 + androidFullscreenMode: 1 defaultIsNativeResolution: 1 macRetinaSupport: 1 runInBackground: 1 @@ -111,8 +119,15 @@ PlayerSettings: switchNVNShaderPoolsGranularity: 33554432 switchNVNDefaultPoolsGranularity: 16777216 switchNVNOtherPoolsGranularity: 16777216 + switchNVNMaxPublicTextureIDCount: 0 + switchNVNMaxPublicSamplerIDCount: 0 + stadiaPresentMode: 0 + stadiaTargetFramerate: 0 vulkanNumSwapchainBuffers: 3 vulkanEnableSetSRGBWrite: 0 + vulkanEnablePreTransform: 0 + vulkanEnableLateAcquireNextImage: 0 + vulkanEnableCommandBufferRecycling: 1 m_SupportedAspectRatios: 4:3: 1 5:4: 1 @@ -127,31 +142,6 @@ PlayerSettings: xboxOneDisableKinectGpuReservation: 1 xboxOneEnable7thCore: 1 vrSettings: - cardboard: - depthFormat: 0 - enableTransitionView: 0 - daydream: - depthFormat: 0 - useSustainedPerformanceMode: 0 - enableVideoLayer: 0 - useProtectedVideoMemory: 0 - minimumSupportedHeadTracking: 0 - maximumSupportedHeadTracking: 1 - hololens: - depthFormat: 1 - depthBufferSharingEnabled: 1 - lumin: - depthFormat: 0 - frameTiming: 2 - enableGLCache: 0 - glCacheMaxBlobSize: 524288 - glCacheMaxFileSize: 8388608 - oculus: - sharedDepthBuffer: 1 - dashSupport: 1 - lowOverheadMode: 0 - protectedContext: 0 - v2Signing: 1 enable360StereoCapture: 0 isWsaHolographicRemotingEnabled: 0 enableFrameTimingStats: 0 @@ -162,10 +152,15 @@ PlayerSettings: resolutionScalingMode: 0 androidSupportedAspectRatio: 1 androidMaxAspectRatio: 2.1 - applicationIdentifier: {} - buildNumber: {} + applicationIdentifier: + Standalone: com.DefaultCompany.UnityLua + buildNumber: + Standalone: 0 + iPhone: 0 + tvOS: 0 + overrideDefaultApplicationIdentifier: 0 AndroidBundleVersionCode: 1 - AndroidMinSdkVersion: 19 + AndroidMinSdkVersion: 22 AndroidTargetSdkVersion: 0 AndroidPreferredInstallLocation: 1 aotOptions: @@ -180,32 +175,16 @@ PlayerSettings: StripUnusedMeshComponents: 1 VertexChannelCompressionMask: 4054 iPhoneSdkVersion: 988 - iOSTargetOSVersionString: 10.0 + iOSTargetOSVersionString: 11.0 tvOSSdkVersion: 0 tvOSRequireExtendedGameController: 0 - tvOSTargetOSVersionString: 10.0 + tvOSTargetOSVersionString: 11.0 uIPrerenderedIcon: 0 uIRequiresPersistentWiFi: 0 uIRequiresFullScreen: 1 uIStatusBarHidden: 1 uIExitOnSuspend: 0 uIStatusBarStyle: 0 - iPhoneSplashScreen: {fileID: 0} - iPhoneHighResSplashScreen: {fileID: 0} - iPhoneTallHighResSplashScreen: {fileID: 0} - iPhone47inSplashScreen: {fileID: 0} - iPhone55inPortraitSplashScreen: {fileID: 0} - iPhone55inLandscapeSplashScreen: {fileID: 0} - iPhone58inPortraitSplashScreen: {fileID: 0} - iPhone58inLandscapeSplashScreen: {fileID: 0} - iPadPortraitSplashScreen: {fileID: 0} - iPadHighResPortraitSplashScreen: {fileID: 0} - iPadLandscapeSplashScreen: {fileID: 0} - iPadHighResLandscapeSplashScreen: {fileID: 0} - iPhone65inPortraitSplashScreen: {fileID: 0} - iPhone65inLandscapeSplashScreen: {fileID: 0} - iPhone61inPortraitSplashScreen: {fileID: 0} - iPhone61inLandscapeSplashScreen: {fileID: 0} appleTVSplashScreen: {fileID: 0} appleTVSplashScreen2x: {fileID: 0} tvOSSmallIconLayers: [] @@ -233,15 +212,17 @@ PlayerSettings: iOSLaunchScreeniPadFillPct: 100 iOSLaunchScreeniPadSize: 100 iOSLaunchScreeniPadCustomXibPath: - iOSUseLaunchScreenStoryboard: 0 iOSLaunchScreenCustomStoryboardPath: + iOSLaunchScreeniPadCustomStoryboardPath: iOSDeviceRequirements: [] iOSURLSchemes: [] + macOSURLSchemes: [] iOSBackgroundModes: 0 iOSMetalForceHardShadows: 0 metalEditorSupport: 1 metalAPIValidation: 1 iOSRenderExtraFrameOnPause: 0 + iosCopyPluginsCodeInsteadOfSymlink: 0 appleDeveloperTeamID: iOSManualSigningProvisioningProfileID: tvOSManualSigningProvisioningProfileID: @@ -251,10 +232,19 @@ PlayerSettings: iOSRequireARKit: 0 iOSAutomaticallyDetectAndAddCapabilities: 1 appleEnableProMotion: 0 + shaderPrecisionModel: 0 clonedFromGUID: c0afd0d1d80e3634a9dac47e8a0426ea templatePackageId: com.unity.template.3d@4.2.6 templateDefaultScene: Assets/Scenes/SampleScene.unity + useCustomMainManifest: 0 + useCustomLauncherManifest: 0 + useCustomMainGradleTemplate: 0 + useCustomLauncherGradleManifest: 0 + useCustomBaseGradleTemplate: 0 + useCustomGradlePropertiesTemplate: 0 + useCustomProguardFile: 0 AndroidTargetArchitectures: 1 + AndroidTargetDevices: 0 AndroidSplashScreenScale: 0 androidSplashScreen: {fileID: 0} AndroidKeystoreName: @@ -271,10 +261,203 @@ PlayerSettings: height: 180 banner: {fileID: 0} androidGamepadSupportLevel: 0 + chromeosInputEmulation: 1 + AndroidMinifyWithR8: 0 + AndroidMinifyRelease: 0 + AndroidMinifyDebug: 0 AndroidValidateAppBundleSize: 1 AndroidAppBundleSizeToValidate: 150 m_BuildTargetIcons: [] - m_BuildTargetPlatformIcons: [] + m_BuildTargetPlatformIcons: + - m_BuildTarget: iPhone + m_Icons: + - m_Textures: [] + m_Width: 180 + m_Height: 180 + m_Kind: 0 + m_SubKind: iPhone + - m_Textures: [] + m_Width: 120 + m_Height: 120 + m_Kind: 0 + m_SubKind: iPhone + - m_Textures: [] + m_Width: 167 + m_Height: 167 + m_Kind: 0 + m_SubKind: iPad + - m_Textures: [] + m_Width: 152 + m_Height: 152 + m_Kind: 0 + m_SubKind: iPad + - m_Textures: [] + m_Width: 76 + m_Height: 76 + m_Kind: 0 + m_SubKind: iPad + - m_Textures: [] + m_Width: 120 + m_Height: 120 + m_Kind: 3 + m_SubKind: iPhone + - m_Textures: [] + m_Width: 80 + m_Height: 80 + m_Kind: 3 + m_SubKind: iPhone + - m_Textures: [] + m_Width: 80 + m_Height: 80 + m_Kind: 3 + m_SubKind: iPad + - m_Textures: [] + m_Width: 40 + m_Height: 40 + m_Kind: 3 + m_SubKind: iPad + - m_Textures: [] + m_Width: 87 + m_Height: 87 + m_Kind: 1 + m_SubKind: iPhone + - m_Textures: [] + m_Width: 58 + m_Height: 58 + m_Kind: 1 + m_SubKind: iPhone + - m_Textures: [] + m_Width: 29 + m_Height: 29 + m_Kind: 1 + m_SubKind: iPhone + - m_Textures: [] + m_Width: 58 + m_Height: 58 + m_Kind: 1 + m_SubKind: iPad + - m_Textures: [] + m_Width: 29 + m_Height: 29 + m_Kind: 1 + m_SubKind: iPad + - m_Textures: [] + m_Width: 60 + m_Height: 60 + m_Kind: 2 + m_SubKind: iPhone + - m_Textures: [] + m_Width: 40 + m_Height: 40 + m_Kind: 2 + m_SubKind: iPhone + - m_Textures: [] + m_Width: 40 + m_Height: 40 + m_Kind: 2 + m_SubKind: iPad + - m_Textures: [] + m_Width: 20 + m_Height: 20 + m_Kind: 2 + m_SubKind: iPad + - m_Textures: [] + m_Width: 1024 + m_Height: 1024 + m_Kind: 4 + m_SubKind: App Store + - m_BuildTarget: Android + m_Icons: + - m_Textures: [] + m_Width: 432 + m_Height: 432 + m_Kind: 2 + m_SubKind: + - m_Textures: [] + m_Width: 324 + m_Height: 324 + m_Kind: 2 + m_SubKind: + - m_Textures: [] + m_Width: 216 + m_Height: 216 + m_Kind: 2 + m_SubKind: + - m_Textures: [] + m_Width: 162 + m_Height: 162 + m_Kind: 2 + m_SubKind: + - m_Textures: [] + m_Width: 108 + m_Height: 108 + m_Kind: 2 + m_SubKind: + - m_Textures: [] + m_Width: 81 + m_Height: 81 + m_Kind: 2 + m_SubKind: + - m_Textures: [] + m_Width: 192 + m_Height: 192 + m_Kind: 1 + m_SubKind: + - m_Textures: [] + m_Width: 144 + m_Height: 144 + m_Kind: 1 + m_SubKind: + - m_Textures: [] + m_Width: 96 + m_Height: 96 + m_Kind: 1 + m_SubKind: + - m_Textures: [] + m_Width: 72 + m_Height: 72 + m_Kind: 1 + m_SubKind: + - m_Textures: [] + m_Width: 48 + m_Height: 48 + m_Kind: 1 + m_SubKind: + - m_Textures: [] + m_Width: 36 + m_Height: 36 + m_Kind: 1 + m_SubKind: + - m_Textures: [] + m_Width: 192 + m_Height: 192 + m_Kind: 0 + m_SubKind: + - m_Textures: [] + m_Width: 144 + m_Height: 144 + m_Kind: 0 + m_SubKind: + - m_Textures: [] + m_Width: 96 + m_Height: 96 + m_Kind: 0 + m_SubKind: + - m_Textures: [] + m_Width: 72 + m_Height: 72 + m_Kind: 0 + m_SubKind: + - m_Textures: [] + m_Width: 48 + m_Height: 48 + m_Kind: 0 + m_SubKind: + - m_Textures: [] + m_Width: 36 + m_Height: 36 + m_Kind: 0 + m_SubKind: m_BuildTargetBatching: - m_BuildTarget: Standalone m_StaticBatching: 1 @@ -326,13 +509,13 @@ PlayerSettings: m_BuildTargetGraphicsAPIs: - m_BuildTarget: AndroidPlayer m_APIs: 150000000b000000 - m_Automatic: 0 + m_Automatic: 1 - m_BuildTarget: iOSSupport m_APIs: 10000000 m_Automatic: 1 - m_BuildTarget: AppleTVSupport m_APIs: 10000000 - m_Automatic: 0 + m_Automatic: 1 - m_BuildTarget: WebGLSupport m_APIs: 0b000000 m_Automatic: 1 @@ -352,6 +535,8 @@ PlayerSettings: tvOS: 1 m_BuildTargetGroupLightmapEncodingQuality: [] m_BuildTargetGroupLightmapSettings: [] + m_BuildTargetNormalMapEncoding: [] + m_BuildTargetDefaultTextureCompressionFormat: [] playModeTestRunnerEnabled: 0 runPlayModeTestAsEditModeTest: 0 actionOnDotNetUnhandledException: 1 @@ -361,12 +546,16 @@ PlayerSettings: cameraUsageDescription: locationUsageDescription: microphoneUsageDescription: + bluetoothUsageDescription: + switchNMETAOverride: switchNetLibKey: switchSocketMemoryPoolSize: 6144 switchSocketAllocatorPoolSize: 128 switchSocketConcurrencyLimit: 14 switchScreenResolutionBehavior: 2 switchUseCPUProfiler: 0 + switchUseGOLDLinker: 0 + switchLTOSetting: 0 switchApplicationID: 0x01004b9000490000 switchNSODependencies: switchTitleNames_0: @@ -384,6 +573,7 @@ PlayerSettings: switchTitleNames_12: switchTitleNames_13: switchTitleNames_14: + switchTitleNames_15: switchPublisherNames_0: switchPublisherNames_1: switchPublisherNames_2: @@ -399,6 +589,7 @@ PlayerSettings: switchPublisherNames_12: switchPublisherNames_13: switchPublisherNames_14: + switchPublisherNames_15: switchIcons_0: {fileID: 0} switchIcons_1: {fileID: 0} switchIcons_2: {fileID: 0} @@ -414,6 +605,7 @@ PlayerSettings: switchIcons_12: {fileID: 0} switchIcons_13: {fileID: 0} switchIcons_14: {fileID: 0} + switchIcons_15: {fileID: 0} switchSmallIcons_0: {fileID: 0} switchSmallIcons_1: {fileID: 0} switchSmallIcons_2: {fileID: 0} @@ -429,6 +621,7 @@ PlayerSettings: switchSmallIcons_12: {fileID: 0} switchSmallIcons_13: {fileID: 0} switchSmallIcons_14: {fileID: 0} + switchSmallIcons_15: {fileID: 0} switchManualHTML: switchAccessibleURLs: switchLegalInformation: @@ -491,6 +684,11 @@ PlayerSettings: switchSocketInitializeEnabled: 1 switchNetworkInterfaceManagerInitializeEnabled: 1 switchPlayerConnectionEnabled: 1 + switchUseNewStyleFilepaths: 0 + switchUseMicroSleepForYield: 1 + switchEnableRamDiskSupport: 0 + switchMicroSleepForYieldTime: 25 + switchRamDiskSpaceSize: 12 ps4NPAgeRating: 12 ps4NPTitleSecret: ps4NPTrophyPackPath: @@ -517,6 +715,7 @@ PlayerSettings: ps4ShareFilePath: ps4ShareOverlayImagePath: ps4PrivacyGuardImagePath: + ps4ExtraSceSysFile: ps4NPtitleDatPath: ps4RemotePlayKeyAssignment: -1 ps4RemotePlayKeyMappingDir: @@ -542,6 +741,7 @@ PlayerSettings: ps4UseResolutionFallback: 0 ps4ReprojectionSupport: 0 ps4UseAudio3dBackend: 0 + ps4UseLowGarlicFragmentationMode: 1 ps4SocialScreenEnabled: 0 ps4ScriptOptimizationLevel: 0 ps4Audio3dVirtualSpeakerCount: 14 @@ -558,6 +758,8 @@ PlayerSettings: ps4disableAutoHideSplash: 0 ps4videoRecordingFeaturesUsed: 0 ps4contentSearchFeaturesUsed: 0 + ps4CompatibilityPS5: 0 + ps4GPU800MHz: 1 ps4attribEyeToEyeDistanceSettingVR: 0 ps4IncludedModules: [] ps4attribVROutputEnabled: 0 @@ -577,19 +779,25 @@ PlayerSettings: webGLAnalyzeBuildSize: 0 webGLUseEmbeddedResources: 0 webGLCompressionFormat: 1 + webGLWasmArithmeticExceptions: 0 webGLLinkerTarget: 1 webGLThreadsSupport: 0 - webGLWasmStreaming: 0 + webGLDecompressionFallback: 0 scriptingDefineSymbols: {} + additionalCompilerArguments: {} platformArchitecture: {} scriptingBackend: {} il2cppCompilerConfiguration: {} managedStrippingLevel: {} incrementalIl2cppBuild: {} + suppressCommonWarnings: 1 allowUnsafeCode: 0 + useDeterministicCompilation: 1 + enableRoslynAnalyzers: 1 additionalIl2CppArgs: scriptingRuntimeVersion: 1 gcIncremental: 0 + assemblyVersionValidation: 1 gcWBarrierValidation: 0 apiCompatibilityLevelPerPlatform: {} m_RenderingPath: 1 @@ -639,6 +847,7 @@ PlayerSettings: XboxOneCapability: [] XboxOneGameRating: {} XboxOneIsContentPackage: 0 + XboxOneEnhancedXboxCompatibilityMode: 0 XboxOneEnableGPUVariability: 1 XboxOneSockets: {} XboxOneSplashScreen: {fileID: 0} @@ -646,10 +855,8 @@ PlayerSettings: XboxOnePersistentLocalStorageSize: 0 XboxOneXTitleMemory: 8 XboxOneOverrideIdentityName: - vrEditorSettings: - daydream: - daydreamIconForeground: {fileID: 0} - daydreamIconBackground: {fileID: 0} + XboxOneOverrideIdentityPublisher: + vrEditorSettings: {} cloudServicesEnabled: UNet: 1 luminIcon: @@ -664,11 +871,15 @@ PlayerSettings: m_VersionCode: 1 m_VersionName: apiCompatibilityLevel: 6 + activeInputHandler: 0 cloudProjectId: framebufferDepthMemorylessMode: 0 + qualitySettingsNames: [] projectName: organizationId: cloudEnabled: 0 - enableNativePlatformBackendsForNewInputSystem: 0 - disableOldInputManagerSupport: 0 legacyClampBlendShapeWeights: 0 + playerDataPath: + forceSRGBBlit: 1 + virtualTexturingSupportEnabled: 0 + uploadClearedTextureDataAfterCreationFromScript: 1 diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index a8d6725..160a677 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2019.3.3f1 -m_EditorVersionWithRevision: 2019.3.3f1 (7ceaae5f7503) +m_EditorVersion: 6000.0.11f1 +m_EditorVersionWithRevision: 6000.0.11f1 (fa01dd6b76d5) diff --git a/ProjectSettings/VersionControlSettings.asset b/ProjectSettings/VersionControlSettings.asset new file mode 100644 index 0000000..dca2881 --- /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/README.md b/README.md index d54e0e5..738e58f 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,12 @@ -[![Build Status](https://travis-ci.com/jcs090218/UnityLua.svg?branch=master)](https://travis-ci.com/jcs090218/UnityLua) -[![Unity Engine](https://img.shields.io/badge/Unity%20Engine-2019.3.3f1-blue.svg)](https://unity3d.com/get-unity/download/archive) -[![Release Tag](https://img.shields.io/github/tag/jcs090218/UnityLua.svg?label=release)](https://github.com/jcs090218/UnityLua/releases/latest) -[![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT) +[![License: MIT](https://img.shields.io/badge/License-MIT-green.svg)](https://opensource.org/licenses/MIT) +[![Unity Engine](https://img.shields.io/badge/unity-6000.0.11f1-black.svg?style=flat&logo=unity)](https://unity3d.com/get-unity/download/archive) +[![Release](https://img.shields.io/github/release/jcs090218/UnityLua.svg?logo=github)](https://github.com/jcs090218/UnityLua/releases/latest) # Unity Lua > Use Lua scripting language in Unity to accomplish hot update/fix functionality. +[![Build Status](https://travis-ci.com/jcs090218/UnityLua.svg?branch=master)](https://travis-ci.com/jcs090218/UnityLua) + Project built on top of the [tolua](https://github.com/topameng/tolua) by [topameng](https://github.com/topameng). This is the minimal project that shows you how to use `tolua` in your diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset new file mode 100644 index 0000000..d997aee --- /dev/null +++ b/UserSettings/EditorUserSettings.asset @@ -0,0 +1,33 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!162 &1 +EditorUserSettings: + m_ObjectHideFlags: 0 + serializedVersion: 4 + m_ConfigSettings: + lightmappingBakingProfile: + value: 51 + flags: 0 + lightmappingDeviceAndPlatform: + value: 53 + flags: 0 + vcSharedLogLevel: + value: 0d5e400f0650 + flags: 0 + m_VCAutomaticAdd: 1 + m_VCDebugCom: 0 + m_VCDebugCmd: 0 + m_VCDebugOut: 0 + m_SemanticMergeMode: 2 + m_DesiredImportWorkerCount: 6 + m_StandbyImportWorkerCount: 2 + m_IdleImportWorkerShutdownDelay: 60000 + m_VCShowFailedCheckout: 1 + m_VCOverwriteFailedCheckoutAssets: 1 + m_VCProjectOverlayIcons: 1 + m_VCHierarchyOverlayIcons: 1 + m_VCOtherOverlayIcons: 1 + m_VCAllowAsyncUpdate: 0 + m_VCScanLocalPackagesOnConnect: 1 + m_ArtifactGarbageCollection: 1 + m_CompressAssetsOnImport: 1 diff --git a/UserSettings/Search.index b/UserSettings/Search.index new file mode 100644 index 0000000..299c246 --- /dev/null +++ b/UserSettings/Search.index @@ -0,0 +1,13 @@ +{ + "name": "Assets", + "roots": ["Assets"], + "includes": [], + "excludes": ["Temp/", "External/"], + "options": { + "types": true, + "properties": false, + "extended": false, + "dependencies": false + }, + "baseScore": 999 +} \ No newline at end of file diff --git a/UserSettings/Search.settings b/UserSettings/Search.settings new file mode 100644 index 0000000..eda2089 --- /dev/null +++ b/UserSettings/Search.settings @@ -0,0 +1,53 @@ +trackSelection = true +fetchPreview = true +wantsMore = false +keepOpen = false +queryFolder = "Assets" +onBoardingDoNotAskAgain = true +showPackageIndexes = false +showStatusBar = false +scopes = { +} +providers = { + asset = { + active = true + priority = 25 + defaultAction = null + } + store = { + active = true + priority = 100 + defaultAction = null + } + find = { + active = true + priority = 25 + defaultAction = null + } + log = { + active = false + priority = 210 + defaultAction = null + } + packages = { + active = true + priority = 90 + defaultAction = null + } + scene = { + active = true + priority = 50 + defaultAction = null + } + query = { + active = true + priority = 100 + defaultAction = null + } +} +recentSearches = [ +] +searchItemFavorites = [ +] +savedSearchesSortOrder = 0 +showSavedSearchPanel = false \ No newline at end of file