diff --git a/Assets/Models/Turret.blend b/Asset Sources/Turret.blend similarity index 100% rename from Assets/Models/Turret.blend rename to Asset Sources/Turret.blend diff --git a/Assets/Models/high-res-sphere.blend b/Asset Sources/high-res-sphere.blend similarity index 100% rename from Assets/Models/high-res-sphere.blend rename to Asset Sources/high-res-sphere.blend diff --git a/Assets/Models/mine.blend b/Asset Sources/mine.blend similarity index 100% rename from Assets/Models/mine.blend rename to Asset Sources/mine.blend diff --git a/Assets/Models/primitives.blend b/Asset Sources/primitives.blend similarity index 100% rename from Assets/Models/primitives.blend rename to Asset Sources/primitives.blend diff --git a/Assets/Allegorithmic/Plugins/Substance.Game.dll b/Assets/Allegorithmic/Plugins/Substance.Game.dll index 60c2aa009..601f08682 100644 --- a/Assets/Allegorithmic/Plugins/Substance.Game.dll +++ b/Assets/Allegorithmic/Plugins/Substance.Game.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:85f01f7ca8b0c9e1f6e39ae6f595e95fd150dabfec4c253a2d516d06baaf8813 +oid sha256:a660d79eae3a8764b160fb592a4f3d96bd2d9ac89840d914702448fa37b37459 size 56320 diff --git a/Assets/Allegorithmic/Plugins/Substance/Substance Engine/Editor/Substance.Editor.dll b/Assets/Allegorithmic/Plugins/Substance/Substance Engine/Editor/Substance.Editor.dll index 7ebb71b25..1470a0ec0 100644 --- a/Assets/Allegorithmic/Plugins/Substance/Substance Engine/Editor/Substance.Editor.dll +++ b/Assets/Allegorithmic/Plugins/Substance/Substance Engine/Editor/Substance.Editor.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b7fe6363917f56eaa5fe34a9d0c748a8b8ddf3366b6379377d0b27814239c9b7 +oid sha256:7856e55518b4cd6fdebaf9fbe6f7c753ad9c7619ef6c0a89e0cb5c78a09b0bf3 size 146944 diff --git a/Assets/Materials/Substance/Metal/Pickup Base.sbsar.meta b/Assets/Materials/Substance/Metal/Pickup Base.sbsar.meta index 6d99d8ddf..2966159bc 100644 --- a/Assets/Materials/Substance/Metal/Pickup Base.sbsar.meta +++ b/Assets/Materials/Substance/Metal/Pickup Base.sbsar.meta @@ -75,7 +75,7 @@ ScriptedImporter: shaderName: Standard materialProperties: shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - shaderKeywords: _MAINTEX _METALLICGLOSSMAP _NORMALMAP _OCCLUSIONMAP _PARALLAXMAP + shaderKeywords: lightmapFlags: 4 enableInstancingVariants: 0 doubleSidedGI: 0 diff --git a/Assets/Materials/Substance/Metal/Pickup Trim.sbsar.meta b/Assets/Materials/Substance/Metal/Pickup Trim.sbsar.meta index 17898eab9..302e453b5 100644 --- a/Assets/Materials/Substance/Metal/Pickup Trim.sbsar.meta +++ b/Assets/Materials/Substance/Metal/Pickup Trim.sbsar.meta @@ -74,7 +74,7 @@ ScriptedImporter: shaderName: Standard materialProperties: shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - shaderKeywords: _MAINTEX _METALLICGLOSSMAP _NORMALMAP _OCCLUSIONMAP _PARALLAXMAP + shaderKeywords: lightmapFlags: 4 enableInstancingVariants: 0 doubleSidedGI: 0 diff --git a/Assets/Materials/Substance/Metal/galvanized_001.sbsar.meta b/Assets/Materials/Substance/Metal/galvanized_001.sbsar.meta index c79d5f023..9815351c0 100644 --- a/Assets/Materials/Substance/Metal/galvanized_001.sbsar.meta +++ b/Assets/Materials/Substance/Metal/galvanized_001.sbsar.meta @@ -62,7 +62,7 @@ ScriptedImporter: shaderName: Standard materialProperties: shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - shaderKeywords: _MAINTEX _METALLICGLOSSMAP _NORMALMAP _OCCLUSIONMAP _PARALLAXMAP + shaderKeywords: lightmapFlags: 4 enableInstancingVariants: 0 doubleSidedGI: 0 diff --git a/Assets/Materials/Substance/Metal/iron_damaged.sbsar.meta b/Assets/Materials/Substance/Metal/iron_damaged.sbsar.meta index f443c3a1a..d7a4d07d7 100644 --- a/Assets/Materials/Substance/Metal/iron_damaged.sbsar.meta +++ b/Assets/Materials/Substance/Metal/iron_damaged.sbsar.meta @@ -22,7 +22,7 @@ ScriptedImporter: shaderName: Standard materialProperties: shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - shaderKeywords: _MAINTEX _METALLICGLOSSMAP _NORMALMAP _OCCLUSIONMAP _PARALLAXMAP + shaderKeywords: lightmapFlags: 4 enableInstancingVariants: 0 doubleSidedGI: 0 diff --git a/Assets/Materials/Substance/Metal/iron_rugged.sbsar.meta b/Assets/Materials/Substance/Metal/iron_rugged.sbsar.meta index 4fadc9424..4d3540662 100644 --- a/Assets/Materials/Substance/Metal/iron_rugged.sbsar.meta +++ b/Assets/Materials/Substance/Metal/iron_rugged.sbsar.meta @@ -22,7 +22,7 @@ ScriptedImporter: shaderName: Standard materialProperties: shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - shaderKeywords: _MAINTEX _METALLICGLOSSMAP _NORMALMAP _OCCLUSIONMAP _PARALLAXMAP + shaderKeywords: lightmapFlags: 4 enableInstancingVariants: 0 doubleSidedGI: 0 diff --git a/Assets/Materials/Substance/Metal/metal_002.sbsar.meta b/Assets/Materials/Substance/Metal/metal_002.sbsar.meta index b491d1c2c..725363c0a 100644 --- a/Assets/Materials/Substance/Metal/metal_002.sbsar.meta +++ b/Assets/Materials/Substance/Metal/metal_002.sbsar.meta @@ -65,7 +65,7 @@ ScriptedImporter: shaderName: Standard materialProperties: shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - shaderKeywords: _MAINTEX _METALLICGLOSSMAP _NORMALMAP _OCCLUSIONMAP _PARALLAXMAP + shaderKeywords: lightmapFlags: 4 enableInstancingVariants: 0 doubleSidedGI: 0 diff --git a/Assets/Materials/Substance/Metal/metal_003.sbsar.meta b/Assets/Materials/Substance/Metal/metal_003.sbsar.meta index aea33fa51..f3ab67932 100644 --- a/Assets/Materials/Substance/Metal/metal_003.sbsar.meta +++ b/Assets/Materials/Substance/Metal/metal_003.sbsar.meta @@ -65,7 +65,7 @@ ScriptedImporter: shaderName: Standard materialProperties: shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - shaderKeywords: _MAINTEX _METALLICGLOSSMAP _NORMALMAP _OCCLUSIONMAP _PARALLAXMAP + shaderKeywords: lightmapFlags: 4 enableInstancingVariants: 0 doubleSidedGI: 0 diff --git a/Assets/Materials/Substance/Metal/metal_006.sbsar.meta b/Assets/Materials/Substance/Metal/metal_006.sbsar.meta index fdc9e35f6..f304dd2c0 100644 --- a/Assets/Materials/Substance/Metal/metal_006.sbsar.meta +++ b/Assets/Materials/Substance/Metal/metal_006.sbsar.meta @@ -62,7 +62,7 @@ ScriptedImporter: shaderName: Standard materialProperties: shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - shaderKeywords: _MAINTEX _METALLICGLOSSMAP _NORMALMAP _OCCLUSIONMAP _PARALLAXMAP + shaderKeywords: lightmapFlags: 4 enableInstancingVariants: 0 doubleSidedGI: 0 diff --git a/Assets/Materials/Substance/Metal/metal_aluminium.sbsar.meta b/Assets/Materials/Substance/Metal/metal_aluminium.sbsar.meta index d45a1291d..95addd8d7 100644 --- a/Assets/Materials/Substance/Metal/metal_aluminium.sbsar.meta +++ b/Assets/Materials/Substance/Metal/metal_aluminium.sbsar.meta @@ -66,7 +66,7 @@ ScriptedImporter: shaderName: Standard materialProperties: shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - shaderKeywords: _MAINTEX _METALLICGLOSSMAP _NORMALMAP _OCCLUSIONMAP _PARALLAXMAP + shaderKeywords: lightmapFlags: 4 enableInstancingVariants: 0 doubleSidedGI: 0 diff --git a/Assets/Materials/Substance/Metal/metal_aluminium_brushed.sbsar.meta b/Assets/Materials/Substance/Metal/metal_aluminium_brushed.sbsar.meta index 61e018847..cafdf3d25 100644 --- a/Assets/Materials/Substance/Metal/metal_aluminium_brushed.sbsar.meta +++ b/Assets/Materials/Substance/Metal/metal_aluminium_brushed.sbsar.meta @@ -66,7 +66,7 @@ ScriptedImporter: shaderName: Standard materialProperties: shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - shaderKeywords: _MAINTEX _METALLICGLOSSMAP _NORMALMAP _OCCLUSIONMAP _PARALLAXMAP + shaderKeywords: lightmapFlags: 4 enableInstancingVariants: 0 doubleSidedGI: 0 diff --git a/Assets/Materials/Substance/Metal/metal_brass.sbsar.meta b/Assets/Materials/Substance/Metal/metal_brass.sbsar.meta index 711044c49..dad220291 100644 --- a/Assets/Materials/Substance/Metal/metal_brass.sbsar.meta +++ b/Assets/Materials/Substance/Metal/metal_brass.sbsar.meta @@ -68,7 +68,7 @@ ScriptedImporter: shaderName: Standard materialProperties: shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - shaderKeywords: _MAINTEX _METALLICGLOSSMAP _NORMALMAP _OCCLUSIONMAP _PARALLAXMAP + shaderKeywords: lightmapFlags: 4 enableInstancingVariants: 0 doubleSidedGI: 0 diff --git a/Assets/Materials/Substance/Metal/metal_car_paint 1.sbsar.meta b/Assets/Materials/Substance/Metal/metal_car_paint 1.sbsar.meta index d64489bda..d6786ba5e 100644 --- a/Assets/Materials/Substance/Metal/metal_car_paint 1.sbsar.meta +++ b/Assets/Materials/Substance/Metal/metal_car_paint 1.sbsar.meta @@ -72,7 +72,7 @@ ScriptedImporter: shaderName: Standard materialProperties: shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - shaderKeywords: _MAINTEX _METALLICGLOSSMAP _NORMALMAP _OCCLUSIONMAP _PARALLAXMAP + shaderKeywords: lightmapFlags: 4 enableInstancingVariants: 0 doubleSidedGI: 0 diff --git a/Assets/Materials/Substance/Metal/metal_car_paint Magenta.sbsar.meta b/Assets/Materials/Substance/Metal/metal_car_paint Magenta.sbsar.meta index 6cf77f1a8..c839a27b8 100644 --- a/Assets/Materials/Substance/Metal/metal_car_paint Magenta.sbsar.meta +++ b/Assets/Materials/Substance/Metal/metal_car_paint Magenta.sbsar.meta @@ -74,7 +74,7 @@ ScriptedImporter: shaderName: Standard materialProperties: shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - shaderKeywords: _MAINTEX _METALLICGLOSSMAP _NORMALMAP _OCCLUSIONMAP _PARALLAXMAP + shaderKeywords: lightmapFlags: 4 enableInstancingVariants: 0 doubleSidedGI: 0 diff --git a/Assets/Materials/Substance/Metal/metal_car_paint red.sbsar.meta b/Assets/Materials/Substance/Metal/metal_car_paint red.sbsar.meta index 8d2a60963..ded098ca6 100644 --- a/Assets/Materials/Substance/Metal/metal_car_paint red.sbsar.meta +++ b/Assets/Materials/Substance/Metal/metal_car_paint red.sbsar.meta @@ -74,7 +74,7 @@ ScriptedImporter: shaderName: Standard materialProperties: shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - shaderKeywords: _MAINTEX _METALLICGLOSSMAP _NORMALMAP _OCCLUSIONMAP _PARALLAXMAP + shaderKeywords: lightmapFlags: 4 enableInstancingVariants: 0 doubleSidedGI: 0 diff --git a/Assets/Materials/Substance/Metal/metal_car_paint white.sbsar.meta b/Assets/Materials/Substance/Metal/metal_car_paint white.sbsar.meta index accd5a6d0..98f20f5ea 100644 --- a/Assets/Materials/Substance/Metal/metal_car_paint white.sbsar.meta +++ b/Assets/Materials/Substance/Metal/metal_car_paint white.sbsar.meta @@ -75,7 +75,7 @@ ScriptedImporter: shaderName: Standard materialProperties: shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - shaderKeywords: _MAINTEX _METALLICGLOSSMAP _NORMALMAP _OCCLUSIONMAP _PARALLAXMAP + shaderKeywords: lightmapFlags: 4 enableInstancingVariants: 0 doubleSidedGI: 0 diff --git a/Assets/Materials/Substance/Metal/metal_copper.sbsar.meta b/Assets/Materials/Substance/Metal/metal_copper.sbsar.meta index cd87324ed..d1afb9abd 100644 --- a/Assets/Materials/Substance/Metal/metal_copper.sbsar.meta +++ b/Assets/Materials/Substance/Metal/metal_copper.sbsar.meta @@ -62,7 +62,7 @@ ScriptedImporter: shaderName: Standard materialProperties: shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - shaderKeywords: _MAINTEX _METALLICGLOSSMAP _NORMALMAP _OCCLUSIONMAP _PARALLAXMAP + shaderKeywords: lightmapFlags: 4 enableInstancingVariants: 0 doubleSidedGI: 0 diff --git a/Assets/Materials/Substance/Metal/metal_corrugated_002.sbsar.meta b/Assets/Materials/Substance/Metal/metal_corrugated_002.sbsar.meta index 28bc8ec54..3de9c9e1e 100644 --- a/Assets/Materials/Substance/Metal/metal_corrugated_002.sbsar.meta +++ b/Assets/Materials/Substance/Metal/metal_corrugated_002.sbsar.meta @@ -62,7 +62,7 @@ ScriptedImporter: shaderName: Standard materialProperties: shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - shaderKeywords: _MAINTEX _METALLICGLOSSMAP _NORMALMAP _OCCLUSIONMAP _PARALLAXMAP + shaderKeywords: lightmapFlags: 4 enableInstancingVariants: 0 doubleSidedGI: 0 diff --git a/Assets/Materials/Substance/Metal/metal_floor_002.sbsar.meta b/Assets/Materials/Substance/Metal/metal_floor_002.sbsar.meta index c7ed06c18..c100570af 100644 --- a/Assets/Materials/Substance/Metal/metal_floor_002.sbsar.meta +++ b/Assets/Materials/Substance/Metal/metal_floor_002.sbsar.meta @@ -62,7 +62,7 @@ ScriptedImporter: shaderName: Standard materialProperties: shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - shaderKeywords: _MAINTEX _METALLICGLOSSMAP _NORMALMAP _OCCLUSIONMAP _PARALLAXMAP + shaderKeywords: lightmapFlags: 4 enableInstancingVariants: 0 doubleSidedGI: 0 diff --git a/Assets/Materials/Substance/Metal/metal_floor_004.sbsar.meta b/Assets/Materials/Substance/Metal/metal_floor_004.sbsar.meta index 1729294eb..031cbe6c4 100644 --- a/Assets/Materials/Substance/Metal/metal_floor_004.sbsar.meta +++ b/Assets/Materials/Substance/Metal/metal_floor_004.sbsar.meta @@ -62,7 +62,7 @@ ScriptedImporter: shaderName: Standard materialProperties: shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - shaderKeywords: _MAINTEX _METALLICGLOSSMAP _NORMALMAP _OCCLUSIONMAP _PARALLAXMAP + shaderKeywords: lightmapFlags: 4 enableInstancingVariants: 0 doubleSidedGI: 0 diff --git a/Assets/Materials/Substance/Metal/metal_floor_006.sbsar.meta b/Assets/Materials/Substance/Metal/metal_floor_006.sbsar.meta index 19ae5cea1..91f291c9d 100644 --- a/Assets/Materials/Substance/Metal/metal_floor_006.sbsar.meta +++ b/Assets/Materials/Substance/Metal/metal_floor_006.sbsar.meta @@ -62,7 +62,7 @@ ScriptedImporter: shaderName: Standard materialProperties: shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - shaderKeywords: _MAINTEX _METALLICGLOSSMAP _NORMALMAP _OCCLUSIONMAP _PARALLAXMAP + shaderKeywords: lightmapFlags: 4 enableInstancingVariants: 0 doubleSidedGI: 0 diff --git a/Assets/Materials/Substance/Metal/metal_gold.sbsar.meta b/Assets/Materials/Substance/Metal/metal_gold.sbsar.meta index 80997d54b..c4e7f4644 100644 --- a/Assets/Materials/Substance/Metal/metal_gold.sbsar.meta +++ b/Assets/Materials/Substance/Metal/metal_gold.sbsar.meta @@ -66,7 +66,7 @@ ScriptedImporter: shaderName: Standard materialProperties: shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - shaderKeywords: _MAINTEX _METALLICGLOSSMAP _NORMALMAP _OCCLUSIONMAP _PARALLAXMAP + shaderKeywords: lightmapFlags: 4 enableInstancingVariants: 0 doubleSidedGI: 0 diff --git a/Assets/Materials/Substance/Metal/metal_nickel.sbsar.meta b/Assets/Materials/Substance/Metal/metal_nickel.sbsar.meta index 24f377bde..65531754c 100644 --- a/Assets/Materials/Substance/Metal/metal_nickel.sbsar.meta +++ b/Assets/Materials/Substance/Metal/metal_nickel.sbsar.meta @@ -62,7 +62,7 @@ ScriptedImporter: shaderName: Standard materialProperties: shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - shaderKeywords: _MAINTEX _METALLICGLOSSMAP _NORMALMAP _OCCLUSIONMAP _PARALLAXMAP + shaderKeywords: lightmapFlags: 4 enableInstancingVariants: 0 doubleSidedGI: 0 diff --git a/Assets/Materials/Substance/Metal/metal_painted_steel.sbsar.meta b/Assets/Materials/Substance/Metal/metal_painted_steel.sbsar.meta index b504894e6..467fa07bd 100644 --- a/Assets/Materials/Substance/Metal/metal_painted_steel.sbsar.meta +++ b/Assets/Materials/Substance/Metal/metal_painted_steel.sbsar.meta @@ -69,7 +69,7 @@ ScriptedImporter: shaderName: Standard materialProperties: shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - shaderKeywords: _MAINTEX _METALLICGLOSSMAP _NORMALMAP _OCCLUSIONMAP _PARALLAXMAP + shaderKeywords: lightmapFlags: 4 enableInstancingVariants: 0 doubleSidedGI: 0 diff --git a/Assets/Materials/Substance/Metal/metal_panels_001.sbsar.meta b/Assets/Materials/Substance/Metal/metal_panels_001.sbsar.meta index eebed5324..a423b3b51 100644 --- a/Assets/Materials/Substance/Metal/metal_panels_001.sbsar.meta +++ b/Assets/Materials/Substance/Metal/metal_panels_001.sbsar.meta @@ -62,7 +62,7 @@ ScriptedImporter: shaderName: Standard materialProperties: shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - shaderKeywords: _MAINTEX _METALLICGLOSSMAP _NORMALMAP _OCCLUSIONMAP _PARALLAXMAP + shaderKeywords: lightmapFlags: 4 enableInstancingVariants: 0 doubleSidedGI: 0 diff --git a/Assets/Materials/Substance/Metal/metal_panels_002.sbsar.meta b/Assets/Materials/Substance/Metal/metal_panels_002.sbsar.meta index 74215bc06..fe8ecd2b6 100644 --- a/Assets/Materials/Substance/Metal/metal_panels_002.sbsar.meta +++ b/Assets/Materials/Substance/Metal/metal_panels_002.sbsar.meta @@ -62,7 +62,7 @@ ScriptedImporter: shaderName: Standard materialProperties: shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - shaderKeywords: _MAINTEX _METALLICGLOSSMAP _NORMALMAP _OCCLUSIONMAP _PARALLAXMAP + shaderKeywords: lightmapFlags: 4 enableInstancingVariants: 0 doubleSidedGI: 0 diff --git a/Assets/Materials/Substance/Metal/metal_plate_001.sbsar.meta b/Assets/Materials/Substance/Metal/metal_plate_001.sbsar.meta index 864a0aeb5..9a0327632 100644 --- a/Assets/Materials/Substance/Metal/metal_plate_001.sbsar.meta +++ b/Assets/Materials/Substance/Metal/metal_plate_001.sbsar.meta @@ -62,7 +62,7 @@ ScriptedImporter: shaderName: Standard materialProperties: shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - shaderKeywords: _MAINTEX _METALLICGLOSSMAP _NORMALMAP _OCCLUSIONMAP _PARALLAXMAP + shaderKeywords: lightmapFlags: 4 enableInstancingVariants: 0 doubleSidedGI: 0 diff --git a/Assets/Materials/Substance/Metal/metal_plate_004.sbsar.meta b/Assets/Materials/Substance/Metal/metal_plate_004.sbsar.meta index 39bc5f8a9..fd4373932 100644 --- a/Assets/Materials/Substance/Metal/metal_plate_004.sbsar.meta +++ b/Assets/Materials/Substance/Metal/metal_plate_004.sbsar.meta @@ -62,7 +62,7 @@ ScriptedImporter: shaderName: Standard materialProperties: shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - shaderKeywords: _MAINTEX _METALLICGLOSSMAP _NORMALMAP _OCCLUSIONMAP _PARALLAXMAP + shaderKeywords: lightmapFlags: 4 enableInstancingVariants: 0 doubleSidedGI: 0 diff --git a/Assets/Materials/Substance/Metal/metal_plate_011.sbsar.meta b/Assets/Materials/Substance/Metal/metal_plate_011.sbsar.meta index 0953ebd37..55c1cd50c 100644 --- a/Assets/Materials/Substance/Metal/metal_plate_011.sbsar.meta +++ b/Assets/Materials/Substance/Metal/metal_plate_011.sbsar.meta @@ -62,7 +62,7 @@ ScriptedImporter: shaderName: Standard materialProperties: shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - shaderKeywords: _MAINTEX _METALLICGLOSSMAP _NORMALMAP _OCCLUSIONMAP _PARALLAXMAP + shaderKeywords: lightmapFlags: 4 enableInstancingVariants: 0 doubleSidedGI: 0 diff --git a/Assets/Materials/Substance/Metal/metal_platinum.sbsar.meta b/Assets/Materials/Substance/Metal/metal_platinum.sbsar.meta index cb80479df..f39efaf0d 100644 --- a/Assets/Materials/Substance/Metal/metal_platinum.sbsar.meta +++ b/Assets/Materials/Substance/Metal/metal_platinum.sbsar.meta @@ -65,7 +65,7 @@ ScriptedImporter: shaderName: Standard materialProperties: shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - shaderKeywords: _MAINTEX _METALLICGLOSSMAP _NORMALMAP _OCCLUSIONMAP _PARALLAXMAP + shaderKeywords: lightmapFlags: 4 enableInstancingVariants: 0 doubleSidedGI: 0 diff --git a/Assets/Materials/Substance/Metal/metal_roll_up.sbsar.meta b/Assets/Materials/Substance/Metal/metal_roll_up.sbsar.meta index ae0e93c6d..3d93351e8 100644 --- a/Assets/Materials/Substance/Metal/metal_roll_up.sbsar.meta +++ b/Assets/Materials/Substance/Metal/metal_roll_up.sbsar.meta @@ -62,7 +62,7 @@ ScriptedImporter: shaderName: Standard materialProperties: shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - shaderKeywords: _MAINTEX _METALLICGLOSSMAP _NORMALMAP _OCCLUSIONMAP _PARALLAXMAP + shaderKeywords: lightmapFlags: 4 enableInstancingVariants: 0 doubleSidedGI: 0 diff --git a/Assets/Materials/Substance/Metal/metal_silver.sbsar.meta b/Assets/Materials/Substance/Metal/metal_silver.sbsar.meta index 5dfe7113a..326559316 100644 --- a/Assets/Materials/Substance/Metal/metal_silver.sbsar.meta +++ b/Assets/Materials/Substance/Metal/metal_silver.sbsar.meta @@ -62,7 +62,7 @@ ScriptedImporter: shaderName: Standard materialProperties: shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - shaderKeywords: _MAINTEX _METALLICGLOSSMAP _NORMALMAP _OCCLUSIONMAP _PARALLAXMAP + shaderKeywords: lightmapFlags: 4 enableInstancingVariants: 0 doubleSidedGI: 0 diff --git a/Assets/Materials/Substance/Metal/metal_steel.sbsar.meta b/Assets/Materials/Substance/Metal/metal_steel.sbsar.meta index 930b760a6..172d4668b 100644 --- a/Assets/Materials/Substance/Metal/metal_steel.sbsar.meta +++ b/Assets/Materials/Substance/Metal/metal_steel.sbsar.meta @@ -68,7 +68,7 @@ ScriptedImporter: shaderName: Standard materialProperties: shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - shaderKeywords: _MAINTEX _METALLICGLOSSMAP _NORMALMAP _OCCLUSIONMAP _PARALLAXMAP + shaderKeywords: lightmapFlags: 4 enableInstancingVariants: 0 doubleSidedGI: 0 diff --git a/Assets/Materials/Substance/Metal/metal_steel_brushed.sbsar.meta b/Assets/Materials/Substance/Metal/metal_steel_brushed.sbsar.meta index 04dc22a12..d08c0d290 100644 --- a/Assets/Materials/Substance/Metal/metal_steel_brushed.sbsar.meta +++ b/Assets/Materials/Substance/Metal/metal_steel_brushed.sbsar.meta @@ -63,7 +63,7 @@ ScriptedImporter: shaderName: Standard materialProperties: shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - shaderKeywords: _MAINTEX _METALLICGLOSSMAP _NORMALMAP _OCCLUSIONMAP _PARALLAXMAP + shaderKeywords: lightmapFlags: 4 enableInstancingVariants: 0 doubleSidedGI: 0 diff --git a/Assets/Materials/Substance/Metal/metal_steel_bumped.sbsar.meta b/Assets/Materials/Substance/Metal/metal_steel_bumped.sbsar.meta index 9273139f0..1dd652796 100644 --- a/Assets/Materials/Substance/Metal/metal_steel_bumped.sbsar.meta +++ b/Assets/Materials/Substance/Metal/metal_steel_bumped.sbsar.meta @@ -62,7 +62,7 @@ ScriptedImporter: shaderName: Standard materialProperties: shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - shaderKeywords: _MAINTEX _METALLICGLOSSMAP _NORMALMAP _OCCLUSIONMAP _PARALLAXMAP + shaderKeywords: lightmapFlags: 4 enableInstancingVariants: 0 doubleSidedGI: 0 diff --git a/Assets/Materials/Substance/Metal/metal_steel_parkerized.sbsar.meta b/Assets/Materials/Substance/Metal/metal_steel_parkerized.sbsar.meta index e55178947..a7cabf9ff 100644 --- a/Assets/Materials/Substance/Metal/metal_steel_parkerized.sbsar.meta +++ b/Assets/Materials/Substance/Metal/metal_steel_parkerized.sbsar.meta @@ -62,7 +62,7 @@ ScriptedImporter: shaderName: Standard materialProperties: shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - shaderKeywords: _MAINTEX _METALLICGLOSSMAP _NORMALMAP _OCCLUSIONMAP _PARALLAXMAP + shaderKeywords: lightmapFlags: 4 enableInstancingVariants: 0 doubleSidedGI: 0 diff --git a/Assets/Materials/Substance/Metal/metal_titanium.sbsar.meta b/Assets/Materials/Substance/Metal/metal_titanium.sbsar.meta index 521d05bba..e4ece6915 100644 --- a/Assets/Materials/Substance/Metal/metal_titanium.sbsar.meta +++ b/Assets/Materials/Substance/Metal/metal_titanium.sbsar.meta @@ -62,7 +62,7 @@ ScriptedImporter: shaderName: Standard materialProperties: shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - shaderKeywords: _MAINTEX _METALLICGLOSSMAP _NORMALMAP _OCCLUSIONMAP _PARALLAXMAP + shaderKeywords: lightmapFlags: 4 enableInstancingVariants: 0 doubleSidedGI: 0 diff --git a/Assets/Materials/Substance/Metal/metal_used.sbsar.meta b/Assets/Materials/Substance/Metal/metal_used.sbsar.meta index 30f356508..37fcc6a20 100644 --- a/Assets/Materials/Substance/Metal/metal_used.sbsar.meta +++ b/Assets/Materials/Substance/Metal/metal_used.sbsar.meta @@ -64,7 +64,7 @@ ScriptedImporter: shaderName: Standard materialProperties: shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - shaderKeywords: _MAINTEX _METALLICGLOSSMAP _NORMALMAP _OCCLUSIONMAP _PARALLAXMAP + shaderKeywords: lightmapFlags: 4 enableInstancingVariants: 0 doubleSidedGI: 0 diff --git a/Assets/Materials/Substance/Metal/metal_weapon.sbsar.meta b/Assets/Materials/Substance/Metal/metal_weapon.sbsar.meta index 05a55c60c..05d1fcf4b 100644 --- a/Assets/Materials/Substance/Metal/metal_weapon.sbsar.meta +++ b/Assets/Materials/Substance/Metal/metal_weapon.sbsar.meta @@ -66,7 +66,7 @@ ScriptedImporter: shaderName: Standard materialProperties: shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - shaderKeywords: _MAINTEX _METALLICGLOSSMAP _NORMALMAP _OCCLUSIONMAP _PARALLAXMAP + shaderKeywords: lightmapFlags: 4 enableInstancingVariants: 0 doubleSidedGI: 0 diff --git a/Assets/Materials/Substance/Metal/metal_woven.sbsar.meta b/Assets/Materials/Substance/Metal/metal_woven.sbsar.meta index a6763cd64..27d8bfafe 100644 --- a/Assets/Materials/Substance/Metal/metal_woven.sbsar.meta +++ b/Assets/Materials/Substance/Metal/metal_woven.sbsar.meta @@ -62,7 +62,7 @@ ScriptedImporter: shaderName: Standard materialProperties: shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - shaderKeywords: _MAINTEX _METALLICGLOSSMAP _NORMALMAP _OCCLUSIONMAP _PARALLAXMAP + shaderKeywords: lightmapFlags: 4 enableInstancingVariants: 0 doubleSidedGI: 0 diff --git a/Assets/Materials/Substance/Metal/snatched_metal.sbsar.meta b/Assets/Materials/Substance/Metal/snatched_metal.sbsar.meta index c50fb10a8..3da7ab6e7 100644 --- a/Assets/Materials/Substance/Metal/snatched_metal.sbsar.meta +++ b/Assets/Materials/Substance/Metal/snatched_metal.sbsar.meta @@ -22,7 +22,7 @@ ScriptedImporter: shaderName: Standard materialProperties: shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - shaderKeywords: _MAINTEX _METALLICGLOSSMAP _NORMALMAP _OCCLUSIONMAP _PARALLAXMAP + shaderKeywords: lightmapFlags: 4 enableInstancingVariants: 0 doubleSidedGI: 0 diff --git a/Assets/Materials/Substance/marble_002.sbsar.meta b/Assets/Materials/Substance/marble_002.sbsar.meta index 1942b6abf..624e0d1a6 100644 --- a/Assets/Materials/Substance/marble_002.sbsar.meta +++ b/Assets/Materials/Substance/marble_002.sbsar.meta @@ -25,7 +25,7 @@ ScriptedImporter: shaderName: Standard materialProperties: shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - shaderKeywords: _MAINTEX _METALLICGLOSSMAP _NORMALMAP _OCCLUSIONMAP _PARALLAXMAP + shaderKeywords: lightmapFlags: 4 enableInstancingVariants: 0 doubleSidedGI: 0 diff --git a/Assets/Materials/UI/Asteroid.mat b/Assets/Materials/UI/Asteroid.mat index 4c2dd5278..87fc42fac 100644 --- a/Assets/Materials/UI/Asteroid.mat +++ b/Assets/Materials/UI/Asteroid.mat @@ -2,14 +2,16 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Asteroid m_Shader: {fileID: 4800000, guid: f69be63d97f3ffe499bc8ad9f5a104c6, type: 3} - m_ShaderKeywords: _ALPHAPREMULTIPLY_ON + m_ValidKeywords: + - _ALPHABLEND_ON + m_InvalidKeywords: [] m_LightmapFlags: 0 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -57,6 +59,7 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - _BlendOp: 0 - _BumpScale: 1 @@ -79,7 +82,7 @@ Material: - _GlossyReflections: 1 - _LightingEnabled: 0 - _Metallic: 0 - - _Mode: 3 + - _Mode: 2 - _OcclusionStrength: 1 - _Parallax: 0.02 - _SmoothnessTextureChannel: 0 @@ -87,7 +90,7 @@ Material: - _SoftParticlesFarFadeDistance: 1 - _SoftParticlesNearFadeDistance: 0 - _SpecularHighlights: 1 - - _SrcBlend: 1 + - _SrcBlend: 5 - _UVSec: 0 - _ZWrite: 0 m_Colors: diff --git a/Assets/Materials/UI/Gas Giant.mat b/Assets/Materials/UI/Gas Giant.mat index 9e8282e3f..cc87d0f7b 100644 --- a/Assets/Materials/UI/Gas Giant.mat +++ b/Assets/Materials/UI/Gas Giant.mat @@ -2,14 +2,16 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Gas Giant m_Shader: {fileID: 4800000, guid: f69be63d97f3ffe499bc8ad9f5a104c6, type: 3} - m_ShaderKeywords: _ALPHAPREMULTIPLY_ON + m_ValidKeywords: + - _ALPHABLEND_ON + m_InvalidKeywords: [] m_LightmapFlags: 0 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -57,6 +59,7 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - _BlendOp: 0 - _BumpScale: 1 @@ -80,7 +83,7 @@ Material: - _InvFade: 1 - _LightingEnabled: 0 - _Metallic: 0 - - _Mode: 3 + - _Mode: 2 - _OcclusionStrength: 1 - _Parallax: 0.02 - _SmoothnessTextureChannel: 0 @@ -88,7 +91,7 @@ Material: - _SoftParticlesFarFadeDistance: 1 - _SoftParticlesNearFadeDistance: 0 - _SpecularHighlights: 1 - - _SrcBlend: 1 + - _SrcBlend: 5 - _UVSec: 0 - _ZWrite: 0 m_Colors: diff --git a/Assets/Materials/UI/Map Background Tint.mat b/Assets/Materials/UI/Map Background Tint.mat index 3ea415358..3b6f8899a 100644 --- a/Assets/Materials/UI/Map Background Tint.mat +++ b/Assets/Materials/UI/Map Background Tint.mat @@ -2,14 +2,15 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Map Background Tint m_Shader: {fileID: 4800000, guid: 7f0d70008f44b3844809e7f6385eb51c, type: 3} - m_ShaderKeywords: + m_ValidKeywords: [] + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -59,11 +60,12 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - _BumpScale: 1 - _ColorMask: 15 - _Cutoff: 0.5 - - _DetailGamma: 2 + - _DetailGamma: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 - _GlossMapScale: 1 @@ -85,6 +87,6 @@ Material: - _UseUIAlphaClip: 0 - _ZWrite: 1 m_Colors: - - _Color: {r: 0.1254902, g: 0.1254902, b: 0.1254902, a: 1} + - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/Materials/UI/Map Gravity Lines.mat b/Assets/Materials/UI/Map Gravity Lines.mat index 749d876be..900067638 100644 --- a/Assets/Materials/UI/Map Gravity Lines.mat +++ b/Assets/Materials/UI/Map Gravity Lines.mat @@ -2,14 +2,16 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Map Gravity Lines m_Shader: {fileID: 4800000, guid: f5505d3747493e24c91b7cb141fd7b8c, type: 3} - m_ShaderKeywords: SCREEN_SPACE + m_ValidKeywords: + - SCREEN_SPACE + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -63,6 +65,7 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - _Angle2Fade: 1.1 - _Angle2Width: 0.5 @@ -86,7 +89,7 @@ Material: - _Mode: 0 - _OcclusionStrength: 1 - _Parallax: 0.02 - - _Scale: 0.5 + - _Scale: 4.6483793 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 diff --git a/Assets/Materials/UI/Map Icons.mat b/Assets/Materials/UI/Map Icons.mat index 936861d17..4bd48280f 100644 --- a/Assets/Materials/UI/Map Icons.mat +++ b/Assets/Materials/UI/Map Icons.mat @@ -2,14 +2,15 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Map Icons m_Shader: {fileID: 4800000, guid: 16ca943590e909145a2f5b7aaeef334e, type: 3} - m_ShaderKeywords: + m_ValidKeywords: [] + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -59,6 +60,7 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - _BumpScale: 1 - _ColorMask: 15 diff --git a/Assets/Materials/UI/Map Influence.mat b/Assets/Materials/UI/Map Influence.mat index f8e0e102a..942ec05f6 100644 --- a/Assets/Materials/UI/Map Influence.mat +++ b/Assets/Materials/UI/Map Influence.mat @@ -2,14 +2,16 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Map Influence m_Shader: {fileID: 4800000, guid: b54e04e391774a2289f8de9a13045f3d, type: 3} - m_ShaderKeywords: SCREEN_SPACE + m_ValidKeywords: + - SCREEN_SPACE + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -59,6 +61,7 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - _Blend: 0.2 - _BumpScale: 1 diff --git a/Assets/Materials/UI/Orbital.mat b/Assets/Materials/UI/Orbital.mat index 89720d8c1..63a9deaa0 100644 --- a/Assets/Materials/UI/Orbital.mat +++ b/Assets/Materials/UI/Orbital.mat @@ -2,14 +2,16 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Orbital m_Shader: {fileID: 4800000, guid: f69be63d97f3ffe499bc8ad9f5a104c6, type: 3} - m_ShaderKeywords: _ALPHAPREMULTIPLY_ON + m_ValidKeywords: + - _ALPHABLEND_ON + m_InvalidKeywords: [] m_LightmapFlags: 0 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -57,6 +59,7 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - _BlendOp: 0 - _BumpScale: 1 @@ -80,7 +83,7 @@ Material: - _InvFade: 1 - _LightingEnabled: 0 - _Metallic: 0 - - _Mode: 3 + - _Mode: 2 - _OcclusionStrength: 1 - _Parallax: 0.02 - _SmoothnessTextureChannel: 0 @@ -88,7 +91,7 @@ Material: - _SoftParticlesFarFadeDistance: 1 - _SoftParticlesNearFadeDistance: 0 - _SpecularHighlights: 1 - - _SrcBlend: 1 + - _SrcBlend: 5 - _UVSec: 0 - _ZWrite: 0 m_Colors: diff --git a/Assets/Materials/UI/Planet.mat b/Assets/Materials/UI/Planet.mat index 72b74546f..a1a9c0315 100644 --- a/Assets/Materials/UI/Planet.mat +++ b/Assets/Materials/UI/Planet.mat @@ -2,14 +2,16 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Planet m_Shader: {fileID: 4800000, guid: f69be63d97f3ffe499bc8ad9f5a104c6, type: 3} - m_ShaderKeywords: _ALPHAPREMULTIPLY_ON + m_ValidKeywords: + - _ALPHABLEND_ON + m_InvalidKeywords: [] m_LightmapFlags: 0 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -57,6 +59,7 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - _BlendOp: 0 - _BumpScale: 1 @@ -80,7 +83,7 @@ Material: - _InvFade: 1 - _LightingEnabled: 0 - _Metallic: 0 - - _Mode: 3 + - _Mode: 2 - _OcclusionStrength: 1 - _Parallax: 0.02 - _SmoothnessTextureChannel: 0 @@ -88,7 +91,7 @@ Material: - _SoftParticlesFarFadeDistance: 1 - _SoftParticlesNearFadeDistance: 0 - _SpecularHighlights: 1 - - _SrcBlend: 1 + - _SrcBlend: 5 - _UVSec: 0 - _ZWrite: 0 m_Colors: diff --git a/Assets/Materials/UI/Planetoid.mat b/Assets/Materials/UI/Planetoid.mat index e98f64bb1..a379ec083 100644 --- a/Assets/Materials/UI/Planetoid.mat +++ b/Assets/Materials/UI/Planetoid.mat @@ -2,14 +2,16 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Planetoid m_Shader: {fileID: 4800000, guid: f69be63d97f3ffe499bc8ad9f5a104c6, type: 3} - m_ShaderKeywords: _ALPHAPREMULTIPLY_ON + m_ValidKeywords: + - _ALPHABLEND_ON + m_InvalidKeywords: [] m_LightmapFlags: 0 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -57,6 +59,7 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - _BlendOp: 0 - _BumpScale: 1 @@ -80,7 +83,7 @@ Material: - _InvFade: 1 - _LightingEnabled: 0 - _Metallic: 0 - - _Mode: 3 + - _Mode: 2 - _OcclusionStrength: 1 - _Parallax: 0.02 - _SmoothnessTextureChannel: 0 @@ -88,7 +91,7 @@ Material: - _SoftParticlesFarFadeDistance: 1 - _SoftParticlesNearFadeDistance: 0 - _SpecularHighlights: 1 - - _SrcBlend: 1 + - _SrcBlend: 5 - _UVSec: 0 - _ZWrite: 0 m_Colors: diff --git a/Assets/Materials/UI/Ship.mat b/Assets/Materials/UI/Ship.mat index 5f8373a8d..aadafb492 100644 --- a/Assets/Materials/UI/Ship.mat +++ b/Assets/Materials/UI/Ship.mat @@ -2,14 +2,16 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Ship m_Shader: {fileID: 4800000, guid: f69be63d97f3ffe499bc8ad9f5a104c6, type: 3} - m_ShaderKeywords: _ALPHAPREMULTIPLY_ON + m_ValidKeywords: + - _ALPHABLEND_ON + m_InvalidKeywords: [] m_LightmapFlags: 0 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -57,6 +59,7 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - _BlendOp: 0 - _BumpScale: 1 @@ -80,7 +83,7 @@ Material: - _InvFade: 1 - _LightingEnabled: 0 - _Metallic: 0 - - _Mode: 3 + - _Mode: 2 - _OcclusionStrength: 1 - _Parallax: 0.02 - _SmoothnessTextureChannel: 0 @@ -88,7 +91,7 @@ Material: - _SoftParticlesFarFadeDistance: 1 - _SoftParticlesNearFadeDistance: 0 - _SpecularHighlights: 1 - - _SrcBlend: 1 + - _SrcBlend: 5 - _UVSec: 0 - _ZWrite: 0 m_Colors: diff --git a/Assets/Materials/UI/Sun.mat b/Assets/Materials/UI/Sun.mat index 941f0c19c..a751f5a95 100644 --- a/Assets/Materials/UI/Sun.mat +++ b/Assets/Materials/UI/Sun.mat @@ -2,14 +2,16 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Sun m_Shader: {fileID: 4800000, guid: f69be63d97f3ffe499bc8ad9f5a104c6, type: 3} - m_ShaderKeywords: _ALPHAPREMULTIPLY_ON + m_ValidKeywords: + - _ALPHABLEND_ON + m_InvalidKeywords: [] m_LightmapFlags: 0 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -57,6 +59,7 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - _BlendOp: 0 - _BumpScale: 1 @@ -80,7 +83,7 @@ Material: - _InvFade: 1 - _LightingEnabled: 0 - _Metallic: 0 - - _Mode: 3 + - _Mode: 2 - _OcclusionStrength: 1 - _Parallax: 0.02 - _SmoothnessTextureChannel: 0 @@ -88,7 +91,7 @@ Material: - _SoftParticlesFarFadeDistance: 1 - _SoftParticlesNearFadeDistance: 0 - _SpecularHighlights: 1 - - _SrcBlend: 1 + - _SrcBlend: 5 - _UVSec: 0 - _ZWrite: 0 m_Colors: diff --git a/Assets/Materials/UI/Turret.mat b/Assets/Materials/UI/Turret.mat index 47e3459f4..876c32bdf 100644 --- a/Assets/Materials/UI/Turret.mat +++ b/Assets/Materials/UI/Turret.mat @@ -2,14 +2,16 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Turret m_Shader: {fileID: 4800000, guid: f69be63d97f3ffe499bc8ad9f5a104c6, type: 3} - m_ShaderKeywords: _ALPHAPREMULTIPLY_ON + m_ValidKeywords: + - _ALPHABLEND_ON + m_InvalidKeywords: [] m_LightmapFlags: 0 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -57,6 +59,7 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - _BlendOp: 0 - _BumpScale: 1 @@ -80,7 +83,7 @@ Material: - _InvFade: 1 - _LightingEnabled: 0 - _Metallic: 0 - - _Mode: 3 + - _Mode: 2 - _OcclusionStrength: 1 - _Parallax: 0.02 - _SmoothnessTextureChannel: 0 @@ -88,7 +91,7 @@ Material: - _SoftParticlesFarFadeDistance: 1 - _SoftParticlesNearFadeDistance: 0 - _SpecularHighlights: 1 - - _SrcBlend: 1 + - _SrcBlend: 5 - _UVSec: 0 - _ZWrite: 0 m_Colors: diff --git a/Assets/Models/Turret.blend1 b/Assets/Models/Turret.blend1 deleted file mode 100644 index e01cdb7d6..000000000 Binary files a/Assets/Models/Turret.blend1 and /dev/null differ diff --git a/Assets/Models/Turret.blend1.meta b/Assets/Models/Turret.blend1.meta deleted file mode 100644 index 94759c1ec..000000000 --- a/Assets/Models/Turret.blend1.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 96ecd9c5f2c60bc4ca2262833d2f8955 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Models/high-res-sphere.blend.meta b/Assets/Models/high-res-sphere.blend.meta deleted file mode 100644 index fa2da8c17..000000000 --- a/Assets/Models/high-res-sphere.blend.meta +++ /dev/null @@ -1,104 +0,0 @@ -fileFormatVersion: 2 -guid: 2db351ec28722ea439e55a7c981c79ec -ModelImporter: - serializedVersion: 20101 - internalIDToNameTable: - - first: - 74: 1989289236423521904 - second: Default Take - externalObjects: {} - materials: - materialImportMode: 1 - materialName: 0 - materialSearch: 1 - materialLocation: 1 - animations: - legacyGenerateAnimations: 4 - bakeSimulation: 0 - resampleCurves: 1 - optimizeGameObjects: 0 - motionNodeName: - rigImportErrors: - rigImportWarnings: - animationImportErrors: - animationImportWarnings: - animationRetargetingWarnings: - animationDoRetargetingWarnings: 0 - importAnimatedCustomProperties: 0 - importConstraints: 0 - animationCompression: 1 - animationRotationError: 0.5 - animationPositionError: 0.5 - animationScaleError: 0.5 - animationWrapMode: 0 - extraExposedTransformPaths: [] - extraUserProperties: [] - clipAnimations: [] - isReadable: 0 - meshes: - lODScreenPercentages: [] - globalScale: 1 - meshCompression: 0 - addColliders: 0 - useSRGBMaterialColor: 1 - sortHierarchyByName: 1 - importVisibility: 0 - importBlendShapes: 0 - importCameras: 0 - importLights: 0 - fileIdsGeneration: 2 - swapUVChannels: 0 - generateSecondaryUV: 0 - useFileUnits: 1 - keepQuads: 0 - weldVertices: 1 - bakeAxisConversion: 0 - preserveHierarchy: 0 - skinWeightsMode: 0 - maxBonesPerVertex: 4 - minBoneWeight: 0.001 - meshOptimizationFlags: -1 - indexFormat: 0 - secondaryUVAngleDistortion: 8 - secondaryUVAreaDistortion: 15.000001 - secondaryUVHardAngle: 88 - secondaryUVMarginMethod: 1 - secondaryUVMinLightmapResolution: 40 - secondaryUVMinObjectScale: 1 - secondaryUVPackMargin: 4 - useFileScale: 1 - tangentSpace: - normalSmoothAngle: 60 - normalImportMode: 1 - tangentImportMode: 3 - normalCalculationMode: 4 - legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0 - blendShapeNormalImportMode: 1 - normalSmoothingSource: 2 - referencedClips: [] - importAnimation: 1 - humanDescription: - serializedVersion: 3 - human: [] - skeleton: [] - armTwist: 0.5 - foreArmTwist: 0.5 - upperLegTwist: 0.5 - legTwist: 0.5 - armStretch: 0.05 - legStretch: 0.05 - feetSpacing: 0 - globalScale: 1 - rootMotionBoneName: - hasTranslationDoF: 0 - hasExtraRoot: 0 - skeletonHasParents: 1 - lastHumanDescriptionAvatarSource: {instanceID: 0} - autoGenerateAvatarMappingIfUnspecified: 1 - animationType: 2 - humanoidOversampling: 1 - avatarSetup: 0 - additionalBone: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Models/high-res-sphere.fbx b/Assets/Models/high-res-sphere.fbx new file mode 100644 index 000000000..54315b33c --- /dev/null +++ b/Assets/Models/high-res-sphere.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:065da4735c19efaab6daddc255e53d5e85dd9c0a8e22f67d5f180fae74a1af27 +size 161644 diff --git a/Assets/Models/Turret.blend.meta b/Assets/Models/high-res-sphere.fbx.meta similarity index 87% rename from Assets/Models/Turret.blend.meta rename to Assets/Models/high-res-sphere.fbx.meta index 449040393..d79e36030 100644 --- a/Assets/Models/Turret.blend.meta +++ b/Assets/Models/high-res-sphere.fbx.meta @@ -1,14 +1,11 @@ fileFormatVersion: 2 -guid: f143db2fec0aefa45b3255990a395382 +guid: bce53b531ceb1f14aa1a674cf91556d1 ModelImporter: - serializedVersion: 20101 - internalIDToNameTable: - - first: - 74: -623603649343465320 - second: Scene + serializedVersion: 21300 + internalIDToNameTable: [] externalObjects: {} materials: - materialImportMode: 1 + materialImportMode: 2 materialName: 0 materialSearch: 1 materialLocation: 1 @@ -17,6 +14,7 @@ ModelImporter: bakeSimulation: 0 resampleCurves: 1 optimizeGameObjects: 0 + removeConstantScaleCurves: 1 motionNodeName: rigImportErrors: rigImportWarnings: @@ -46,6 +44,7 @@ ModelImporter: importBlendShapes: 1 importCameras: 1 importLights: 1 + nodeNameCollisionStrategy: 1 fileIdsGeneration: 2 swapUVChannels: 0 generateSecondaryUV: 0 @@ -57,6 +56,7 @@ ModelImporter: skinWeightsMode: 0 maxBonesPerVertex: 4 minBoneWeight: 0.001 + optimizeBones: 1 meshOptimizationFlags: -1 indexFormat: 0 secondaryUVAngleDistortion: 8 @@ -66,10 +66,10 @@ ModelImporter: secondaryUVMinLightmapResolution: 40 secondaryUVMinObjectScale: 1 secondaryUVPackMargin: 4 - useFileScale: 1 + useFileScale: 0 tangentSpace: normalSmoothAngle: 60 - normalImportMode: 1 + normalImportMode: 0 tangentImportMode: 3 normalCalculationMode: 4 legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0 @@ -98,6 +98,8 @@ ModelImporter: animationType: 2 humanoidOversampling: 1 avatarSetup: 0 + addHumanoidExtraRootOnlyWhenUsingAvatar: 1 + remapMaterialsIfMaterialImportModeIsNone: 0 additionalBone: 0 userData: assetBundleName: diff --git a/Assets/Models/mine.blend1 b/Assets/Models/mine.blend1 deleted file mode 100644 index c623802d1..000000000 Binary files a/Assets/Models/mine.blend1 and /dev/null differ diff --git a/Assets/Models/mine.blend1.meta b/Assets/Models/mine.blend1.meta deleted file mode 100644 index 6aaf9291a..000000000 --- a/Assets/Models/mine.blend1.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 3b4931b15f744294aaf72137792526dd -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Models/mine.fbx b/Assets/Models/mine.fbx new file mode 100644 index 000000000..0322afdc9 --- /dev/null +++ b/Assets/Models/mine.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:92076e51bcfb262246250c3c966ba83cb4fda04835330cf77d9abbeac252f6dc +size 51420 diff --git a/Assets/Models/primitives.blend.meta b/Assets/Models/mine.fbx.meta similarity index 83% rename from Assets/Models/primitives.blend.meta rename to Assets/Models/mine.fbx.meta index a8fdd5815..f7fec4fae 100644 --- a/Assets/Models/primitives.blend.meta +++ b/Assets/Models/mine.fbx.meta @@ -1,19 +1,11 @@ fileFormatVersion: 2 -guid: b4479e2dcccbdc048878a980f116a96b +guid: dab8e1a18a1b825458e8e6356cf00cd2 ModelImporter: - serializedVersion: 20200 - internalIDToNameTable: - - first: - 74: 1989289236423521904 - second: Default Take - externalObjects: - - first: - type: UnityEngine:Material - assembly: UnityEngine.CoreModule - name: unnamed - second: {fileID: 2100000, guid: e8eadcbc063926d4989c42109e9e7dee, type: 2} + serializedVersion: 21300 + internalIDToNameTable: [] + externalObjects: {} materials: - materialImportMode: 1 + materialImportMode: 2 materialName: 0 materialSearch: 1 materialLocation: 1 @@ -22,6 +14,7 @@ ModelImporter: bakeSimulation: 0 resampleCurves: 1 optimizeGameObjects: 0 + removeConstantScaleCurves: 1 motionNodeName: rigImportErrors: rigImportWarnings: @@ -51,6 +44,7 @@ ModelImporter: importBlendShapes: 1 importCameras: 1 importLights: 1 + nodeNameCollisionStrategy: 1 fileIdsGeneration: 2 swapUVChannels: 0 generateSecondaryUV: 0 @@ -62,6 +56,7 @@ ModelImporter: skinWeightsMode: 0 maxBonesPerVertex: 4 minBoneWeight: 0.001 + optimizeBones: 1 meshOptimizationFlags: -1 indexFormat: 0 secondaryUVAngleDistortion: 8 @@ -71,10 +66,10 @@ ModelImporter: secondaryUVMinLightmapResolution: 40 secondaryUVMinObjectScale: 1 secondaryUVPackMargin: 4 - useFileScale: 1 + useFileScale: 0 tangentSpace: normalSmoothAngle: 60 - normalImportMode: 1 + normalImportMode: 0 tangentImportMode: 3 normalCalculationMode: 4 legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0 @@ -103,7 +98,8 @@ ModelImporter: animationType: 2 humanoidOversampling: 1 avatarSetup: 0 - addHumanoidExtraRootOnlyWhenUsingAvatar: 0 + addHumanoidExtraRootOnlyWhenUsingAvatar: 1 + remapMaterialsIfMaterialImportModeIsNone: 0 additionalBone: 0 userData: assetBundleName: diff --git a/Assets/Models/primitives.blend1 b/Assets/Models/primitives.blend1 deleted file mode 100644 index 561b4b0cb..000000000 Binary files a/Assets/Models/primitives.blend1 and /dev/null differ diff --git a/Assets/Models/primitives.blend1.meta b/Assets/Models/primitives.blend1.meta deleted file mode 100644 index 59ee41d85..000000000 --- a/Assets/Models/primitives.blend1.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 7178aa3840d8f0d41b5b2d19b5e60dc0 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Models/primitives.fbx b/Assets/Models/primitives.fbx new file mode 100644 index 000000000..0921cb365 --- /dev/null +++ b/Assets/Models/primitives.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:dc49d440230ea00d06c38c71803907e85b1e5199fc59e670c3df93e3e8e34f41 +size 81804 diff --git a/Assets/Models/mine.blend.meta b/Assets/Models/primitives.fbx.meta similarity index 92% rename from Assets/Models/mine.blend.meta rename to Assets/Models/primitives.fbx.meta index 697ad6a69..294244609 100644 --- a/Assets/Models/mine.blend.meta +++ b/Assets/Models/primitives.fbx.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 -guid: 2fa3cccc07ee9c045b6b02b22367433f +guid: 46bf5a48bbc37fc4b99b10cba1987ebb ModelImporter: - serializedVersion: 20200 + serializedVersion: 21300 internalIDToNameTable: [] externalObjects: {} materials: @@ -14,6 +14,7 @@ ModelImporter: bakeSimulation: 0 resampleCurves: 1 optimizeGameObjects: 0 + removeConstantScaleCurves: 1 motionNodeName: rigImportErrors: rigImportWarnings: @@ -43,6 +44,7 @@ ModelImporter: importBlendShapes: 1 importCameras: 1 importLights: 1 + nodeNameCollisionStrategy: 1 fileIdsGeneration: 2 swapUVChannels: 0 generateSecondaryUV: 0 @@ -54,6 +56,7 @@ ModelImporter: skinWeightsMode: 0 maxBonesPerVertex: 4 minBoneWeight: 0.001 + optimizeBones: 1 meshOptimizationFlags: -1 indexFormat: 0 secondaryUVAngleDistortion: 8 @@ -96,6 +99,7 @@ ModelImporter: humanoidOversampling: 1 avatarSetup: 0 addHumanoidExtraRootOnlyWhenUsingAvatar: 1 + remapMaterialsIfMaterialImportModeIsNone: 0 additionalBone: 0 userData: assetBundleName: diff --git a/Assets/Plugins/Celestial Body/Scripts/Shading/CelestialBodyShading.cs b/Assets/Plugins/Celestial Body/Scripts/Shading/CelestialBodyShading.cs index 39bcaaabf..440fc3664 100644 --- a/Assets/Plugins/Celestial Body/Scripts/Shading/CelestialBodyShading.cs +++ b/Assets/Plugins/Celestial Body/Scripts/Shading/CelestialBodyShading.cs @@ -78,7 +78,7 @@ public abstract class CelestialBodyShading : ScriptableObject { if (texture == null) { texture = new Texture2D (width, 1); } else if (texture.width != width) { - texture.Resize (width, 1); + texture.Reinitialize (width, 1); } if (gradient == null) { gradient = new Gradient (); diff --git a/Assets/Plugins/Newtonsoft.Json.dll b/Assets/Plugins/Newtonsoft.Json.dll deleted file mode 100644 index 29e37ae3b..000000000 --- a/Assets/Plugins/Newtonsoft.Json.dll +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0268d88516035eb67851e15fea5bd2787100e55f4ed6a9c8b4349fe933c39329 -size 639488 diff --git a/Assets/Plugins/Newtonsoft.Json.dll.meta b/Assets/Plugins/Newtonsoft.Json.dll.meta deleted file mode 100644 index 7398e9e97..000000000 --- a/Assets/Plugins/Newtonsoft.Json.dll.meta +++ /dev/null @@ -1,33 +0,0 @@ -fileFormatVersion: 2 -guid: eb30e0065a874324cb38d7ca7f3d1b87 -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - Any: - second: - enabled: 1 - settings: {} - - first: - Editor: Editor - second: - enabled: 0 - settings: - DefaultValueInitialized: true - - first: - Windows Store Apps: WindowsStoreApps - second: - enabled: 0 - settings: - CPU: AnyCPU - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Prefabs/RPG/Pickups/Dodecahedron.prefab b/Assets/Prefabs/RPG/Pickups/Dodecahedron.prefab index 620c46bfa..ed52273bd 100644 --- a/Assets/Prefabs/RPG/Pickups/Dodecahedron.prefab +++ b/Assets/Prefabs/RPG/Pickups/Dodecahedron.prefab @@ -26,6 +26,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 9133920759869389018} m_Father: {fileID: 8489385781787202308} @@ -63,6 +64,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 2.76403, y: 0, z: 0} m_LocalScale: {x: 3, y: 3, z: 3} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 6463386671854692106} m_Father: {fileID: 0} @@ -75,7 +77,7 @@ MeshFilter: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5284461483464579928} - m_Mesh: {fileID: 4241688549776596879, guid: b4479e2dcccbdc048878a980f116a96b, type: 3} + m_Mesh: {fileID: 4241688549776596879, guid: 46bf5a48bbc37fc4b99b10cba1987ebb, type: 3} --- !u!23 &2093307059618178533 MeshRenderer: m_ObjectHideFlags: 0 @@ -87,6 +89,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -312,12 +315,6 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e7877477dc889804ea9d04f7ffd08e9b, type: 3} ---- !u!224 &9133920759869389018 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 8827822687143161231, guid: e7877477dc889804ea9d04f7ffd08e9b, - type: 3} - m_PrefabInstance: {fileID: 306400354849379669} - m_PrefabAsset: {fileID: 0} --- !u!114 &3355762817961458026 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 3085702413493447743, guid: e7877477dc889804ea9d04f7ffd08e9b, @@ -330,3 +327,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 9541d86e2fd84c1d9990edf0852d74ab, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!224 &9133920759869389018 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 8827822687143161231, guid: e7877477dc889804ea9d04f7ffd08e9b, + type: 3} + m_PrefabInstance: {fileID: 306400354849379669} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Prefabs/RPG/Pickups/Hexahedron.prefab b/Assets/Prefabs/RPG/Pickups/Hexahedron.prefab index 7e449197b..1a3bdc861 100644 --- a/Assets/Prefabs/RPG/Pickups/Hexahedron.prefab +++ b/Assets/Prefabs/RPG/Pickups/Hexahedron.prefab @@ -26,6 +26,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 7638477100053754924} m_Father: {fileID: 3419130779256825702} @@ -63,6 +64,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 3, y: 3, z: 3} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 3601651121922051457} m_Father: {fileID: 0} @@ -75,7 +77,7 @@ MeshFilter: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7643266616531142933} - m_Mesh: {fileID: 3976614008025827415, guid: b4479e2dcccbdc048878a980f116a96b, type: 3} + m_Mesh: {fileID: 3976614008025827415, guid: 46bf5a48bbc37fc4b99b10cba1987ebb, type: 3} --- !u!23 &7427774873968414741 MeshRenderer: m_ObjectHideFlags: 0 @@ -87,6 +89,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -312,12 +315,6 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e7877477dc889804ea9d04f7ffd08e9b, type: 3} ---- !u!224 &7638477100053754924 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 8827822687143161231, guid: e7877477dc889804ea9d04f7ffd08e9b, - type: 3} - m_PrefabInstance: {fileID: 1190053687094253987} - m_PrefabAsset: {fileID: 0} --- !u!114 &4202270197902620060 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 3085702413493447743, guid: e7877477dc889804ea9d04f7ffd08e9b, @@ -330,3 +327,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 9541d86e2fd84c1d9990edf0852d74ab, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!224 &7638477100053754924 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 8827822687143161231, guid: e7877477dc889804ea9d04f7ffd08e9b, + type: 3} + m_PrefabInstance: {fileID: 1190053687094253987} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Prefabs/RPG/Pickups/Icosahedron.prefab b/Assets/Prefabs/RPG/Pickups/Icosahedron.prefab index 65d429108..338345d75 100644 --- a/Assets/Prefabs/RPG/Pickups/Icosahedron.prefab +++ b/Assets/Prefabs/RPG/Pickups/Icosahedron.prefab @@ -26,6 +26,7 @@ Transform: m_LocalRotation: {x: 0.7069834, y: -0, z: -0, w: 0.7072302} m_LocalPosition: {x: 0, y: -0.9858858, z: 0.000344038} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 5373456011921669618} m_Father: {fileID: 7548484292876150345} @@ -63,6 +64,7 @@ Transform: m_LocalRotation: {x: -0.7069834, y: 0, z: 0, w: 0.7072302} m_LocalPosition: {x: -0, y: 0, z: -2.9576573} m_LocalScale: {x: 3, y: 3, z: 3} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 4002800527770282731} m_Father: {fileID: 0} @@ -75,7 +77,7 @@ MeshFilter: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7167547457198401877} - m_Mesh: {fileID: -7230695461121354804, guid: b4479e2dcccbdc048878a980f116a96b, type: 3} + m_Mesh: {fileID: -7230695461121354804, guid: 46bf5a48bbc37fc4b99b10cba1987ebb, type: 3} --- !u!23 &6960669510133879758 MeshRenderer: m_ObjectHideFlags: 0 @@ -87,6 +89,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -312,12 +315,6 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e7877477dc889804ea9d04f7ffd08e9b, type: 3} ---- !u!224 &5373456011921669618 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 8827822687143161231, guid: e7877477dc889804ea9d04f7ffd08e9b, - type: 3} - m_PrefabInstance: {fileID: 3463514625940279421} - m_PrefabAsset: {fileID: 0} --- !u!114 &1928241908402748482 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 3085702413493447743, guid: e7877477dc889804ea9d04f7ffd08e9b, @@ -330,3 +327,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 9541d86e2fd84c1d9990edf0852d74ab, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!224 &5373456011921669618 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 8827822687143161231, guid: e7877477dc889804ea9d04f7ffd08e9b, + type: 3} + m_PrefabInstance: {fileID: 3463514625940279421} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Prefabs/RPG/Pickups/Octahedron.prefab b/Assets/Prefabs/RPG/Pickups/Octahedron.prefab index 7d07605aa..72204df41 100644 --- a/Assets/Prefabs/RPG/Pickups/Octahedron.prefab +++ b/Assets/Prefabs/RPG/Pickups/Octahedron.prefab @@ -26,6 +26,7 @@ Transform: m_LocalRotation: {x: 0.7069834, y: -0, z: -0, w: 0.7072302} m_LocalPosition: {x: 0, y: 0.9264834, z: -0.0003232956} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 7372978312502119311} m_Father: {fileID: 5807113421007930924} @@ -63,6 +64,7 @@ Transform: m_LocalRotation: {x: -0.7069834, y: 0, z: 0, w: 0.7072302} m_LocalPosition: {x: -0, y: 0, z: 2.7794502} m_LocalScale: {x: 3, y: 3, z: 3} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 2388751103296260666} m_Father: {fileID: 0} @@ -75,7 +77,7 @@ MeshFilter: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8555821447211356933} - m_Mesh: {fileID: 3635823603335089682, guid: b4479e2dcccbdc048878a980f116a96b, type: 3} + m_Mesh: {fileID: 3635823603335089682, guid: 46bf5a48bbc37fc4b99b10cba1987ebb, type: 3} --- !u!23 &1691511938472729356 MeshRenderer: m_ObjectHideFlags: 0 @@ -87,6 +89,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -312,12 +315,6 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e7877477dc889804ea9d04f7ffd08e9b, type: 3} ---- !u!224 &7372978312502119311 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 8827822687143161231, guid: e7877477dc889804ea9d04f7ffd08e9b, - type: 3} - m_PrefabInstance: {fileID: 2076349920387032576} - m_PrefabAsset: {fileID: 0} --- !u!114 &3891726626588969535 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 3085702413493447743, guid: e7877477dc889804ea9d04f7ffd08e9b, @@ -330,3 +327,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 9541d86e2fd84c1d9990edf0852d74ab, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!224 &7372978312502119311 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 8827822687143161231, guid: e7877477dc889804ea9d04f7ffd08e9b, + type: 3} + m_PrefabInstance: {fileID: 2076349920387032576} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Prefabs/RPG/Pickups/Tetrahedron.prefab b/Assets/Prefabs/RPG/Pickups/Tetrahedron.prefab index c81b41104..fc4110b3b 100644 --- a/Assets/Prefabs/RPG/Pickups/Tetrahedron.prefab +++ b/Assets/Prefabs/RPG/Pickups/Tetrahedron.prefab @@ -26,6 +26,7 @@ Transform: m_LocalRotation: {x: 0.7069834, y: -0, z: -0, w: 0.7072302} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 3300919539099916088} m_Father: {fileID: 8414659055235772867} @@ -63,6 +64,7 @@ Transform: m_LocalRotation: {x: -0.7069834, y: 0, z: 0, w: 0.7072302} m_LocalPosition: {x: -0, y: 0, z: 0} m_LocalScale: {x: 3, y: 3, z: 3} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 7682789761269032435} m_Father: {fileID: 0} @@ -75,7 +77,7 @@ MeshFilter: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7767746557817481743} - m_Mesh: {fileID: -7178685034035712819, guid: b4479e2dcccbdc048878a980f116a96b, type: 3} + m_Mesh: {fileID: -7178685034035712819, guid: 46bf5a48bbc37fc4b99b10cba1987ebb, type: 3} --- !u!23 &6959931328227918623 MeshRenderer: m_ObjectHideFlags: 0 @@ -87,6 +89,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 diff --git a/Assets/Prefabs/RPG/Planets/Gas Giant.prefab b/Assets/Prefabs/RPG/Planets/Gas Giant.prefab index 93ff3c81e..46ae7a3b1 100644 --- a/Assets/Prefabs/RPG/Planets/Gas Giant.prefab +++ b/Assets/Prefabs/RPG/Planets/Gas Giant.prefab @@ -27,6 +27,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 3973935122748960680} - {fileID: 3973935121058605868} @@ -81,6 +82,7 @@ Transform: m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: 0.7071068} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3973935120991099173} m_RootOrder: 1 @@ -104,6 +106,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -162,6 +165,7 @@ Transform: m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: 0.7071068} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3973935120991099173} m_RootOrder: 3 @@ -185,6 +189,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -243,6 +248,7 @@ Transform: m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: 0.7071068} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3973935120991099173} m_RootOrder: 2 @@ -266,6 +272,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -326,6 +333,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3973935120991099173} m_RootOrder: 0 @@ -337,7 +345,7 @@ MeshFilter: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3973935122748960663} - m_Mesh: {fileID: 289301614986012343, guid: 2db351ec28722ea439e55a7c981c79ec, type: 3} + m_Mesh: {fileID: 289301614986012343, guid: bce53b531ceb1f14aa1a674cf91556d1, type: 3} --- !u!23 &3973935122748960683 MeshRenderer: m_ObjectHideFlags: 0 @@ -349,6 +357,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 diff --git a/Assets/Prefabs/RPG/Planets/Planet.prefab b/Assets/Prefabs/RPG/Planets/Planet.prefab index 42705c0f7..336b3430b 100644 --- a/Assets/Prefabs/RPG/Planets/Planet.prefab +++ b/Assets/Prefabs/RPG/Planets/Planet.prefab @@ -28,6 +28,7 @@ Transform: m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8859079004937162792} m_RootOrder: 2 @@ -51,6 +52,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -109,6 +111,7 @@ Transform: m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8859079004937162792} m_RootOrder: 1 @@ -132,6 +135,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -190,6 +194,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 8859079005270853336} - {fileID: 8859079004671924239} @@ -262,6 +267,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8859079004937162792} m_RootOrder: 0 @@ -273,7 +279,7 @@ MeshFilter: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8859079005270853335} - m_Mesh: {fileID: 289301614986012343, guid: 2db351ec28722ea439e55a7c981c79ec, type: 3} + m_Mesh: {fileID: 289301614986012343, guid: bce53b531ceb1f14aa1a674cf91556d1, type: 3} --- !u!23 &8859079005270853338 MeshRenderer: m_ObjectHideFlags: 0 @@ -285,6 +291,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 diff --git a/Assets/Prefabs/RPG/Planets/Sun.prefab b/Assets/Prefabs/RPG/Planets/Sun.prefab index b6ae42f25..a7950f448 100644 --- a/Assets/Prefabs/RPG/Planets/Sun.prefab +++ b/Assets/Prefabs/RPG/Planets/Sun.prefab @@ -27,6 +27,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 7852221720971737233} - {fileID: 7852221720969441490} @@ -84,6 +85,7 @@ Transform: m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: 0.7071068} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7852221720480299767} m_RootOrder: 2 @@ -107,6 +109,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -165,6 +168,7 @@ Transform: m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: 0.7071068} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7852221720480299767} m_RootOrder: 3 @@ -188,6 +192,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -246,6 +251,7 @@ Transform: m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: 0.7071068} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7852221720480299767} m_RootOrder: 4 @@ -269,6 +275,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -327,6 +334,7 @@ Transform: m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: 0.7071068} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7852221720480299767} m_RootOrder: 1 @@ -350,6 +358,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -411,6 +420,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7852221720480299767} m_RootOrder: 0 @@ -422,7 +432,7 @@ MeshFilter: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7852221720971737232} - m_Mesh: {fileID: 289301614986012343, guid: 2db351ec28722ea439e55a7c981c79ec, type: 3} + m_Mesh: {fileID: 289301614986012343, guid: bce53b531ceb1f14aa1a674cf91556d1, type: 3} --- !u!23 &7852221720971737229 MeshRenderer: m_ObjectHideFlags: 0 @@ -434,6 +444,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 diff --git a/Assets/Resources/Prefabs/Weapons/Mine Launcher.prefab b/Assets/Resources/Prefabs/Weapons/Mine Launcher.prefab index f183326fb..05171242b 100644 --- a/Assets/Resources/Prefabs/Weapons/Mine Launcher.prefab +++ b/Assets/Resources/Prefabs/Weapons/Mine Launcher.prefab @@ -31,6 +31,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 466182245789483358} m_RootOrder: 1 @@ -42,7 +43,7 @@ MeshFilter: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 756302067359749329} - m_Mesh: {fileID: -5495902117074765545, guid: 2fa3cccc07ee9c045b6b02b22367433f, type: 3} + m_Mesh: {fileID: -5495902117074765545, guid: dab8e1a18a1b825458e8e6356cf00cd2, type: 3} --- !u!23 &4535912766998605946 MeshRenderer: m_ObjectHideFlags: 0 @@ -54,6 +55,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -201,6 +203,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 3865250807623958572} - {fileID: 3605572244125604411} @@ -221,30 +224,6 @@ MonoBehaviour: m_EditorClassIdentifier: ProjectilePrototype: {fileID: 2069293240452108309} InheritVelocity: 1 ---- !u!114 &3349939966709198091 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3866425147859458464} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 1281fe44325f9b548aa42dc331b17266, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &5700147869379115258 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3866425147859458464} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: db021a309de3d324588c5603de40c29f, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1001 &3867385469207619610 PrefabInstance: m_ObjectHideFlags: 0 @@ -319,15 +298,39 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e1b08032bec16ba4eb1ae23cbd572664, type: 3} ---- !u!1 &3866425147859458464 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 1121192042590650, guid: e1b08032bec16ba4eb1ae23cbd572664, - type: 3} - m_PrefabInstance: {fileID: 3867385469207619610} - m_PrefabAsset: {fileID: 0} --- !u!4 &3865250807623958572 stripped Transform: m_CorrespondingSourceObject: {fileID: 4388947112716342, guid: e1b08032bec16ba4eb1ae23cbd572664, type: 3} m_PrefabInstance: {fileID: 3867385469207619610} m_PrefabAsset: {fileID: 0} +--- !u!1 &3866425147859458464 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1121192042590650, guid: e1b08032bec16ba4eb1ae23cbd572664, + type: 3} + m_PrefabInstance: {fileID: 3867385469207619610} + m_PrefabAsset: {fileID: 0} +--- !u!114 &3349939966709198091 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3866425147859458464} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1281fe44325f9b548aa42dc331b17266, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &5700147869379115258 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3866425147859458464} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: db021a309de3d324588c5603de40c29f, type: 3} + m_Name: + m_EditorClassIdentifier: diff --git a/Assets/Resources/Sprites/Flat UI/64px/Flat UI 64.psd.meta b/Assets/Resources/Sprites/Flat UI/64px/Flat UI 64.psd.meta index 91c1a5b4b..bb549e030 100644 --- a/Assets/Resources/Sprites/Flat UI/64px/Flat UI 64.psd.meta +++ b/Assets/Resources/Sprites/Flat UI/64px/Flat UI 64.psd.meta @@ -36,6 +36,7 @@ TextureImporter: streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 + ignoreMasterTextureLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -44,9 +45,9 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 + filterMode: 1 + aniso: 1 + mipBias: 0 wrapU: 1 wrapV: 1 wrapW: 1 @@ -67,6 +68,8 @@ TextureImporter: textureType: 8 textureShape: 1 singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 @@ -206,6 +209,11 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] + nameFileIdTable: + Flat UI 64_2: -7822570697569483854 + Flat UI 64_0: 1277571774178720806 + Flat UI 64_1: 6022874309888470837 + Flat UI 64_3: 5475660467928285601 spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 1 diff --git a/Assets/Resources/Sprites/Flat UI/Nodes/Nodes8.png.meta b/Assets/Resources/Sprites/Flat UI/Nodes/Nodes8.png.meta index 9e9a43358..c929d60d0 100644 --- a/Assets/Resources/Sprites/Flat UI/Nodes/Nodes8.png.meta +++ b/Assets/Resources/Sprites/Flat UI/Nodes/Nodes8.png.meta @@ -1560,6 +1560,7 @@ TextureImporter: streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 + ignoreMasterTextureLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -1569,8 +1570,8 @@ TextureImporter: textureSettings: serializedVersion: 2 filterMode: 1 - aniso: -1 - mipBias: -100 + aniso: 1 + mipBias: 0 wrapU: 1 wrapV: 1 wrapW: 1 @@ -1591,6 +1592,8 @@ TextureImporter: textureType: 8 textureShape: 1 singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 @@ -12398,6 +12401,519 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] + nameFileIdTable: + Nodes8_481: 7765305298184468306 + Nodes8_394: -2173840114905907640 + Nodes8_283: 5490465287690530074 + Nodes8_82: 7733216126497439870 + Nodes8_13: 4749243711944661391 + Nodes8_285: -4406094821277745773 + Nodes8_91: -1833705122930507847 + Nodes8_370: -6410928753946199210 + Nodes8_432: -7041875534296296028 + Nodes8_476: 7108576655288738855 + Nodes8_359: -4374323131456696949 + Nodes8_35: 7454889051342231181 + Nodes8_160: -3768580895158373067 + Nodes8_488: 5333601996616500960 + Nodes8_188: 2193497189671576515 + Nodes8_242: 3309486581533439889 + Nodes8_108: -1219617722761383444 + Nodes8_195: 397058041978507000 + Nodes8_479: -8593612015791184093 + Nodes8_486: -1899549168694923690 + Nodes8_230: -7415116669044628430 + Nodes8_170: -1609932420755878475 + Nodes8_288: 7169270939306127936 + Nodes8_128: 3179751170413717293 + Nodes8_256: 7765787580483129356 + Nodes8_302: -3029452926137928298 + Nodes8_472: 6704346446063960240 + Nodes8_400: 5109480570482620475 + Nodes8_510: -3137123266071239926 + Nodes8_123: 2110866313956930724 + Nodes8_439: 1908371401029920676 + Nodes8_198: 6182508604659561419 + Nodes8_275: -4466919832081176491 + Nodes8_96: -5461275584831503233 + Nodes8_385: 5276638999553049102 + Nodes8_57: -1217438281098273321 + Nodes8_68: -2256915463285003053 + Nodes8_98: 2692257972745647315 + Nodes8_280: 6297218543274767130 + Nodes8_260: -6381300828842627699 + Nodes8_350: 3732249229496457240 + Nodes8_200: -6613324669956734149 + Nodes8_320: -6937536880387430288 + Nodes8_427: 6734703785739441877 + Nodes8_286: -8174053033399970330 + Nodes8_429: -5895206309896252637 + Nodes8_245: -3750568392383905796 + Nodes8_364: 3842938720864651592 + Nodes8_55: -2930047018962497376 + Nodes8_191: -7327470363055267568 + Nodes8_7: 7172960545813729980 + Nodes8_404: 2493202378523110837 + Nodes8_51: -7463101837821065923 + Nodes8_197: 3480079707338374353 + Nodes8_389: 5657578110139227919 + Nodes8_159: -3827395885420089563 + Nodes8_202: -2739276977804641210 + Nodes8_189: -3952025661717732170 + Nodes8_178: 6236436028045176301 + Nodes8_408: 758533388142450117 + Nodes8_74: 6768761704374029093 + Nodes8_319: 5374933143973742359 + Nodes8_445: -8284755936044297565 + Nodes8_330: 6552251245139087617 + Nodes8_8: -4965822430229482037 + Nodes8_106: -4354662842375892067 + Nodes8_223: -6004326240789312025 + Nodes8_383: 5988626842830366304 + Nodes8_172: 5495134902521240101 + Nodes8_215: -3904322326181701321 + Nodes8_121: -5588204999086342583 + Nodes8_361: -6607404363896439472 + Nodes8_392: -2252077722405633011 + Nodes8_490: -7530530910686308167 + Nodes8_48: 8328593484025762328 + Nodes8_443: 654069581570951529 + Nodes8_62: -4727858466952689046 + Nodes8_446: 5791006097885888620 + Nodes8_95: 7316857332581228753 + Nodes8_453: 1938496848949585929 + Nodes8_297: 6975688482046624517 + Nodes8_341: 3493690406835382023 + Nodes8_388: -4889219245121782075 + Nodes8_46: -6058456628510777808 + Nodes8_144: 5696902897903018111 + Nodes8_475: 5308365742176140752 + Nodes8_494: -7508884998867404283 + Nodes8_314: -7455258137034274641 + Nodes8_139: 1878417912345966135 + Nodes8_386: -8313823912532936949 + Nodes8_86: 6174484551675080019 + Nodes8_14: 518844736399981534 + Nodes8_173: -8879509841513454891 + Nodes8_213: -1322070246924351471 + Nodes8_317: 2709146826625015907 + Nodes8_251: 4996974056373600104 + Nodes8_171: 2401290162592770010 + Nodes8_127: 1685888131279914877 + Nodes8_232: 2719957092981641361 + Nodes8_180: 6259577699958198641 + Nodes8_273: 7948155785931955392 + Nodes8_363: 5533256756639854929 + Nodes8_462: -2331876767893403564 + Nodes8_250: -4157302151046272440 + Nodes8_174: 7304254054490829105 + Nodes8_498: 3742348639685727124 + Nodes8_310: 5337605079291600975 + Nodes8_437: -2384414107746919308 + Nodes8_204: -2958125185642525529 + Nodes8_311: -8954818505536572468 + Nodes8_451: -4280356719612175606 + Nodes8_235: -8102457323118838107 + Nodes8_77: -997832013825497921 + Nodes8_360: 200229895452471654 + Nodes8_487: -3509935722409350928 + Nodes8_120: 1363496749339000404 + Nodes8_502: 7160758027038747358 + Nodes8_505: 6133273895581697694 + Nodes8_52: -771631131808087129 + Nodes8_221: 6917702358569073615 + Nodes8_434: 7129998781002523731 + Nodes8_118: -4415280946452953550 + Nodes8_340: -2513583562999426853 + Nodes8_423: -7563987008295990285 + Nodes8_238: 2777522944455130214 + Nodes8_36: -1432564176364525480 + Nodes8_329: 6984462235865259693 + Nodes8_448: 8024958247502667289 + Nodes8_69: 4422405016297959753 + Nodes8_412: 3793571703198944901 + Nodes8_258: -1467868194888164368 + Nodes8_485: -5011207692415655117 + Nodes8_406: 5862729956276617412 + Nodes8_53: 3637848937998573106 + Nodes8_122: 8022588812926259958 + Nodes8_442: -6279664814791097550 + Nodes8_80: -7187116281394142687 + Nodes8_37: 5549123798673209804 + Nodes8_326: 4178419759771022875 + Nodes8_376: -4802039284622582149 + Nodes8_199: 2446822684036395783 + Nodes8_113: -5539995266943635231 + Nodes8_72: 1261107129905536779 + Nodes8_141: -2373880601856980490 + Nodes8_274: -1628398095321187176 + Nodes8_368: 4578834927920786561 + Nodes8_420: -8062270303442947876 + Nodes8_469: 5389919923107147709 + Nodes8_99: 2718549133448271411 + Nodes8_134: -4007530297934576523 + Nodes8_405: 711357550122512242 + Nodes8_33: -519673914761315187 + Nodes8_508: 605703412026216774 + Nodes8_71: -7564506012557559768 + Nodes8_132: -2878285999051025767 + Nodes8_40: -1255793124322199394 + Nodes8_166: -6157084383756980532 + Nodes8_419: -5552108197566896169 + Nodes8_100: 6262985741603585210 + Nodes8_142: -851191184603617713 + Nodes8_107: 6565993644218550619 + Nodes8_183: -1022050699890302098 + Nodes8_353: 8552619974607515934 + Nodes8_407: -1289940208997778277 + Nodes8_461: -8352127573054485724 + Nodes8_16: 1393093695412614520 + Nodes8_362: -5293717570851110287 + Nodes8_397: -8994887544535922187 + Nodes8_182: 4554628312819598260 + Nodes8_154: 6674829183782304053 + Nodes8_184: 5397757746454676057 + Nodes8_292: -3246584957889109497 + Nodes8_459: 494733865617215172 + Nodes8_267: -4521896228003937757 + Nodes8_161: -4358721990873435827 + Nodes8_334: -2085619763591347279 + Nodes8_413: 605439191082661360 + Nodes8_417: 8747582075013832154 + Nodes8_338: 6827672034702825060 + Nodes8_28: 3983871652116138318 + Nodes8_281: 6417048138655041849 + Nodes8_471: 6458843348911150390 + Nodes8_193: -1450777456858752933 + Nodes8_321: 1969236556631360814 + Nodes8_470: 3597950060698176067 + Nodes8_138: -7265880581442179367 + Nodes8_322: 7053531050247892611 + Nodes8_444: -5300486652002358691 + Nodes8_94: 3378848449727364635 + Nodes8_328: -610966575523864218 + Nodes8_424: -5548722684054251010 + Nodes8_58: 1256521930602759822 + Nodes8_347: -139705387842483219 + Nodes8_228: 983263558990172566 + Nodes8_88: -3077488519435838862 + Nodes8_298: -1647140233977670105 + Nodes8_249: -5186633960000686307 + Nodes8_312: -5679746910290568305 + Nodes8_504: -2792574030262748375 + Nodes8_262: -7088504120207558361 + Nodes8_496: -6820185517634282561 + Nodes8_315: -4568183428947906088 + Nodes8_433: -6326550563381365588 + Nodes8_97: -311695158282960517 + Nodes8_458: -5134331301971718175 + Nodes8_356: 7274040785592133482 + Nodes8_92: -7414993353708363003 + Nodes8_430: 1096121524013826934 + Nodes8_252: -8211346026922035613 + Nodes8_464: 5125931643987295613 + Nodes8_10: -2584129685730603337 + Nodes8_253: -5473728227133781833 + Nodes8_375: 84419753453303095 + Nodes8_186: 4535160047027281131 + Nodes8_396: 7839085010037900809 + Nodes8_270: -3324059592770581293 + Nodes8_493: 6140817488872091750 + Nodes8_452: -3536753868940390577 + Nodes8_497: -4985556675176270415 + Nodes8_483: -2222773764229481012 + Nodes8_30: 4646896231774859263 + Nodes8_276: 5286269842361278704 + Nodes8_143: 940818774833646007 + Nodes8_382: 2794710262796457193 + Nodes8_503: 5905743528844505065 + Nodes8_509: 6047394896708382521 + Nodes8_6: 95935498887469717 + Nodes8_192: -4157065418126290812 + Nodes8_224: -4459528234296915276 + Nodes8_306: -6619929353274205801 + Nodes8_346: 6112612573619901291 + Nodes8_153: -3668883858395061664 + Nodes8_27: -3460145125335970318 + Nodes8_325: 8503718203013437536 + Nodes8_219: 1243132762753124361 + Nodes8_130: 4106112242729209059 + Nodes8_15: -134468233401069099 + Nodes8_307: 2447211185962979271 + Nodes8_129: -7976920777850025216 + Nodes8_218: 1313489230901094867 + Nodes8_425: 3824151834631069753 + Nodes8_70: -4293199243167668004 + Nodes8_421: 6050231947928739589 + Nodes8_78: -3324610269421874568 + Nodes8_201: -2010096667174085734 + Nodes8_67: 3187073684952194937 + Nodes8_66: 7037865489514614146 + Nodes8_282: -7443910051521880545 + Nodes8_162: 1343421867839558558 + Nodes8_112: -5957966428951946861 + Nodes8_76: -4436145519681084992 + Nodes8_151: 251422323648772422 + Nodes8_158: 695136745782295574 + Nodes8_89: -4246048745667971837 + Nodes8_49: -5357040465969270072 + Nodes8_156: 7347420563889128033 + Nodes8_185: -2087833247695423335 + Nodes8_81: 9004210889551940280 + Nodes8_21: 3912102462830086882 + Nodes8_290: -3728980931045005078 + Nodes8_259: -9051687781391838827 + Nodes8_0: 447277437350272159 + Nodes8_24: -6219027582740367999 + Nodes8_309: 9059084921785348741 + Nodes8_348: 8369556277229352680 + Nodes8_391: -1815080923772020904 + Nodes8_85: -7923114602199087799 + Nodes8_468: 1549689779652505795 + Nodes8_301: 1442099706443029159 + Nodes8_372: 7487569425783085881 + Nodes8_44: 6214692142633498797 + Nodes8_220: -4775065822124622219 + Nodes8_210: 3019859925522920401 + Nodes8_268: 2408840858946801858 + Nodes8_147: -8808949992927829642 + Nodes8_87: -133614477806533132 + Nodes8_206: 1731974611436534092 + Nodes8_299: -2245159127289975829 + Nodes8_155: -2535509493778985531 + Nodes8_234: 8207153204675907346 + Nodes8_473: -5662160420945392741 + Nodes8_395: 3482956889989655909 + Nodes8_243: -8814109533371802597 + Nodes8_208: 5483757380907465591 + Nodes8_3: -4316693128651368164 + Nodes8_90: -3972110675959357747 + Nodes8_103: 2612410010790117103 + Nodes8_73: -884193646540778424 + Nodes8_102: 7067717793359142511 + Nodes8_495: -3386591573478503563 + Nodes8_380: 4447110183672118226 + Nodes8_83: -8178950635322805388 + Nodes8_164: 5928144386861839099 + Nodes8_342: 2759626979823058948 + Nodes8_203: -7410814657859377333 + Nodes8_157: 4906920756614623960 + Nodes8_371: 5803561301503632513 + Nodes8_61: -932149691477552059 + Nodes8_303: -1451256704776858267 + Nodes8_291: -8248581809824847528 + Nodes8_323: -2909021044834050774 + Nodes8_335: -6144357089847060515 + Nodes8_39: -7895772369708171777 + Nodes8_441: -248066324229788253 + Nodes8_47: 6690432652226804550 + Nodes8_387: -3922478914367360799 + Nodes8_308: 2552170291922090617 + Nodes8_474: -5552699946050883146 + Nodes8_489: 3716404312882605346 + Nodes8_447: -7582981205302939140 + Nodes8_181: 4582035055883280546 + Nodes8_284: -745683452868559933 + Nodes8_410: -7382638708735597050 + Nodes8_440: -1788139109778535848 + Nodes8_176: -5859105785535972803 + Nodes8_29: 7258092859784942291 + Nodes8_169: -1552620614666195941 + Nodes8_272: 2419598782921329410 + Nodes8_304: 542040480703561850 + Nodes8_402: 2752674022693330408 + Nodes8_333: 3907434391764735750 + Nodes8_209: -3809132755344599605 + Nodes8_217: -5071873636964205814 + Nodes8_357: 6442622129260376486 + Nodes8_246: -6185205992461717245 + Nodes8_131: -2484617771385380278 + Nodes8_454: -891505083526902395 + Nodes8_22: -3070589838740751251 + Nodes8_225: 1540463862037618730 + Nodes8_50: -6806815763500592686 + Nodes8_438: 1517574678594895634 + Nodes8_358: -7176319669527096722 + Nodes8_1: -2642516622600302819 + Nodes8_115: -2874279635142413086 + Nodes8_414: 4369365927578286153 + Nodes8_467: -7938633330850475769 + Nodes8_511: 6575361018301538774 + Nodes8_265: 7478740729779345737 + Nodes8_244: 2819691012446359799 + Nodes8_390: -7377330281774364624 + Nodes8_38: 7503367037013100325 + Nodes8_248: 723775900857703740 + Nodes8_449: -1911087886638866176 + Nodes8_43: -6559329867929373895 + Nodes8_149: 5265696611571658636 + Nodes8_480: 5161399416479202706 + Nodes8_455: -1659839101159674079 + Nodes8_110: 6225934854431882001 + Nodes8_4: -4064983232884784874 + Nodes8_313: -6749617496870663353 + Nodes8_428: -2152391743749980638 + Nodes8_277: 7885271767490158455 + Nodes8_133: 1193407040191248952 + Nodes8_426: 7434697530141868645 + Nodes8_211: 5026815160158577172 + Nodes8_365: 4138974680636635221 + Nodes8_450: 8274354925809854195 + Nodes8_19: -3992519171459786436 + Nodes8_9: -5454067182338299413 + Nodes8_135: -4633277862074692087 + Nodes8_187: 4311688910846022485 + Nodes8_300: -5078461211725662066 + Nodes8_212: 604055760805351614 + Nodes8_379: 770387946232027505 + Nodes8_465: 226641853770299644 + Nodes8_305: -1338731325667401178 + Nodes8_194: 4481466358619184544 + Nodes8_266: -8456902144597523791 + Nodes8_499: -7583757353166631120 + Nodes8_140: 6125165469163354365 + Nodes8_34: -2923741091222024458 + Nodes8_278: 1836488368635079293 + Nodes8_114: -5779382240667897187 + Nodes8_399: 1983768546291692217 + Nodes8_152: 6767801096930183419 + Nodes8_293: 4215310473148606213 + Nodes8_226: -1815930995182786777 + Nodes8_165: 5462900531816217408 + Nodes8_287: -1516831071423904690 + Nodes8_119: 4735889236920260029 + Nodes8_236: 9212974630925882568 + Nodes8_344: -6341715953896782048 + Nodes8_343: -4492562700339396294 + Nodes8_167: 6376902902892993317 + Nodes8_65: -880689661836270275 + Nodes8_11: 8603182135149810322 + Nodes8_116: -318766852481220298 + Nodes8_145: -7687466366588241567 + Nodes8_84: -8260213510431053947 + Nodes8_457: 2343310030401321928 + Nodes8_289: -4198048568084561933 + Nodes8_241: -1369465288598851300 + Nodes8_354: -930951537256264753 + Nodes8_377: -6939612240922190456 + Nodes8_237: 6402661130838703808 + Nodes8_381: -5063998598705434147 + Nodes8_296: -870453665917825562 + Nodes8_20: -2941335583291332957 + Nodes8_146: -8509434090217649892 + Nodes8_175: -7750221740002543048 + Nodes8_93: 6006774288955445167 + Nodes8_205: -9032342223859165549 + Nodes8_231: 4559200965730980040 + Nodes8_401: -6818842030352746379 + Nodes8_295: 1938451378467672830 + Nodes8_117: -7668417341972444346 + Nodes8_415: -3364135242999671111 + Nodes8_32: -4907509821539378384 + Nodes8_54: -5073449086627560339 + Nodes8_339: -8868821944227862203 + Nodes8_150: 769688429359771595 + Nodes8_240: -8550868306368365664 + Nodes8_324: -2572872483459214466 + Nodes8_63: 166674667875302371 + Nodes8_26: 4387254557659587692 + Nodes8_477: -1611969304494846144 + Nodes8_17: 9108676635408637674 + Nodes8_366: 8109112618358228374 + Nodes8_104: 6870815752175130089 + Nodes8_327: 2192076243480054171 + Nodes8_126: 9142090307517690818 + Nodes8_336: -5145968994496400046 + Nodes8_352: 7990176940421307078 + Nodes8_179: 7317329217813941658 + Nodes8_261: 2119351830242765716 + Nodes8_456: 6594412940461799517 + Nodes8_109: 9193478867257581254 + Nodes8_500: -6305712171521517077 + Nodes8_25: 1851240011989458372 + Nodes8_111: 1844227151680479838 + Nodes8_332: -250756390200326435 + Nodes8_124: 7413059053454119052 + Nodes8_207: -8839107657879556988 + Nodes8_229: -2884265314256922081 + Nodes8_233: 9010418502333807229 + Nodes8_463: 1023007185905625397 + Nodes8_294: -5604475321710102838 + Nodes8_137: -1389159018175682843 + Nodes8_239: -7902198991598466884 + Nodes8_247: -426417820956550206 + Nodes8_460: -6304052949445627285 + Nodes8_23: 2620083712105054629 + Nodes8_501: -5952903176615411219 + Nodes8_56: 2583556593264859510 + Nodes8_378: 8598990850610024105 + Nodes8_263: -4277326241718632453 + Nodes8_436: 5622149990733416765 + Nodes8_337: 5466853462041683644 + Nodes8_60: -73211303376179603 + Nodes8_316: -4389469457937427180 + Nodes8_506: 3225054928250064832 + Nodes8_398: 8755088149903215023 + Nodes8_45: 6053850988368597943 + Nodes8_416: 9128311705995869122 + Nodes8_216: -3918639076992056286 + Nodes8_393: 238490543895851585 + Nodes8_369: 8734113102734864087 + Nodes8_403: -6495152084517208754 + Nodes8_466: -9179030105920049064 + Nodes8_484: 6715767235421276204 + Nodes8_177: 8855199402005920120 + Nodes8_349: -334198314599449665 + Nodes8_64: -1707066636190589640 + Nodes8_264: 2379135570128910525 + Nodes8_125: -4161006274090221090 + Nodes8_214: -3975091152880291137 + Nodes8_411: -2063765041082201140 + Nodes8_31: -6873255369264990914 + Nodes8_136: -5014434612522129269 + Nodes8_196: -8482710882739974482 + Nodes8_257: -9025716911804666128 + Nodes8_41: 6082317510885087970 + Nodes8_331: 8984572056198628050 + Nodes8_5: 5224191217090565503 + Nodes8_227: -2634767709704523097 + Nodes8_409: 7885519408436144291 + Nodes8_254: -737683475579604097 + Nodes8_59: -6443835414373844727 + Nodes8_431: -6313447318919617372 + Nodes8_269: -8598909642622824529 + Nodes8_12: -7551085014206945968 + Nodes8_482: -6439772924815619515 + Nodes8_163: 8181354602320516412 + Nodes8_492: -4412326337744773488 + Nodes8_271: 1035973164666767814 + Nodes8_507: 966591109097286792 + Nodes8_148: -3879745484370421274 + Nodes8_384: 1018246494546310458 + Nodes8_101: 1639755026535131732 + Nodes8_190: -6009156775071640016 + Nodes8_367: -599109155124060567 + Nodes8_255: 885313887582480832 + Nodes8_105: -1803138065856771057 + Nodes8_478: 5663918802421100597 + Nodes8_435: 4079553741506889857 + Nodes8_373: 2981821338095939650 + Nodes8_355: 8280500503689192553 + Nodes8_491: 6166439770229566031 + Nodes8_422: -2888562424370788393 + Nodes8_18: -2746315968572970910 + Nodes8_374: -2847499825847791570 + Nodes8_42: -7564794515239127472 + Nodes8_168: 8317977238978415595 + Nodes8_79: -8401045660484009378 + Nodes8_418: -7656867936896144743 + Nodes8_222: 6820094529208335810 + Nodes8_279: -515048075871494523 + Nodes8_75: -7232271273454706433 + Nodes8_345: 1229668851039736511 + Nodes8_318: -650924582707574031 + Nodes8_351: -1951994345314951696 + Nodes8_2: -7099052688380159628 spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 diff --git a/Assets/Resources/Sprites/Flat UI/Nodes/Nodes8BG.png.meta b/Assets/Resources/Sprites/Flat UI/Nodes/Nodes8BG.png.meta index a30b87f41..367f7b5d5 100644 --- a/Assets/Resources/Sprites/Flat UI/Nodes/Nodes8BG.png.meta +++ b/Assets/Resources/Sprites/Flat UI/Nodes/Nodes8BG.png.meta @@ -792,6 +792,7 @@ TextureImporter: streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 + ignoreMasterTextureLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -800,12 +801,12 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 + filterMode: 1 + aniso: 1 + mipBias: 0 wrapU: 1 wrapV: 1 - wrapW: -1 + wrapW: 0 nPOTScale: 0 lightmap: 0 compressionQuality: 50 @@ -823,6 +824,8 @@ TextureImporter: textureType: 8 textureShape: 1 singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 @@ -6254,6 +6257,263 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] + nameFileIdTable: + Nodes8BG_217: 8166485115019018139 + Nodes8BG_52: 1733524047710952250 + Nodes8BG_5: -2643431356032879779 + Nodes8BG_56: 3021830918981013876 + Nodes8BG_60: 3457421642495904657 + Nodes8BG_163: -6033659483820948244 + Nodes8BG_53: 3506877335217733962 + Nodes8BG_50: -7435408962317716226 + Nodes8BG_54: 2661996820352515278 + Nodes8BG_146: 4782471972189956506 + Nodes8BG_183: -8030871709373485481 + Nodes8BG_179: 5349643026792014816 + Nodes8BG_112: 3598633230125056137 + Nodes8BG_141: -1477077582486481761 + Nodes8BG_126: 2737099684351340660 + Nodes8BG_51: 138202805687054925 + Nodes8BG_47: 4498281472512311928 + Nodes8BG_19: 4205231485750456070 + Nodes8BG_39: 1269113623839146803 + Nodes8BG_180: 4665247422316029495 + Nodes8BG_223: 2157059133614953853 + Nodes8BG_143: 1860775816202198134 + Nodes8BG_243: -7351190522344097208 + Nodes8BG_178: -5976952605806052137 + Nodes8BG_25: -8765547014354120591 + Nodes8BG_193: 5130616855641558757 + Nodes8BG_176: 2237570033911157214 + Nodes8BG_218: 4457284309056862032 + Nodes8BG_26: 6952422413737705325 + Nodes8BG_69: -5763806307716576081 + Nodes8BG_200: 9167237275434237204 + Nodes8BG_198: -2517250317027208361 + Nodes8BG_35: 564811024471342645 + Nodes8BG_32: 7114053869949279385 + Nodes8BG_166: -4013851988371093733 + Nodes8BG_2: -3917947003626264088 + Nodes8BG_3: -8210191144177934881 + Nodes8BG_14: 4898856133173222125 + Nodes8BG_235: 5831381618852927524 + Nodes8BG_185: 4736012263943254544 + Nodes8BG_118: -5170436933936117849 + Nodes8BG_101: 4996225679012729412 + Nodes8BG_170: 5072477783181274538 + Nodes8BG_161: 5472796264908594787 + Nodes8BG_246: -7693687745047039509 + Nodes8BG_74: 4929423186384401681 + Nodes8BG_224: 3632123523419731038 + Nodes8BG_93: -2176752285364911769 + Nodes8BG_165: 4147551444458063486 + Nodes8BG_240: -3323873690411336624 + Nodes8BG_147: -6945781257284175730 + Nodes8BG_129: 4768445453770288771 + Nodes8BG_194: -8264981327073066900 + Nodes8BG_106: -7275362924174266143 + Nodes8BG_124: 4365727452164300659 + Nodes8BG_168: -1447552762731324031 + Nodes8BG_89: -5703674735060841425 + Nodes8BG_189: 3363146001100581831 + Nodes8BG_177: -2366343993199997692 + Nodes8BG_75: -5168927979146797938 + Nodes8BG_206: -5692361477467740848 + Nodes8BG_27: -4256333280346567830 + Nodes8BG_33: -7698202726586076176 + Nodes8BG_139: -2417113724966695608 + Nodes8BG_79: -1284367260915950353 + Nodes8BG_125: 3139984226790562926 + Nodes8BG_48: -2193947467903691406 + Nodes8BG_21: -6885100042466894722 + Nodes8BG_120: -3745805844691385915 + Nodes8BG_160: 2852533387348986909 + Nodes8BG_44: 1127526268494626402 + Nodes8BG_175: -8198602797795733144 + Nodes8BG_207: 5088807272104261335 + Nodes8BG_113: -8625141138209731190 + Nodes8BG_138: 5827691148954559295 + Nodes8BG_247: 2909699445510056551 + Nodes8BG_88: 7687710449739828020 + Nodes8BG_174: 2161507617646333094 + Nodes8BG_30: 826312238967031789 + Nodes8BG_108: -1576322724512087822 + Nodes8BG_231: -2366770569260437519 + Nodes8BG_158: 5965239996924938136 + Nodes8BG_216: -8869101996155354350 + Nodes8BG_13: -3306175840130698133 + Nodes8BG_10: 3521652144757081453 + Nodes8BG_4: -457016208676947884 + Nodes8BG_98: -1679913451113052836 + Nodes8BG_17: -6616566309747706700 + Nodes8BG_36: 804569968357926944 + Nodes8BG_205: 5510281038234894231 + Nodes8BG_228: -8349385416217224319 + Nodes8BG_77: -3017328924928994274 + Nodes8BG_184: 4299934960023911711 + Nodes8BG_63: 6300138107236220954 + Nodes8BG_109: -4349641247197244681 + Nodes8BG_173: 2229088102534388839 + Nodes8BG_181: -1084725711212545873 + Nodes8BG_132: 5528871909899681522 + Nodes8BG_94: 3057106282616256598 + Nodes8BG_245: -9022860326341559344 + Nodes8BG_12: -5192510962035101141 + Nodes8BG_82: -8843590035112175510 + Nodes8BG_23: 6089422662255472370 + Nodes8BG_31: -5367813289904786726 + Nodes8BG_162: -4587579920275951142 + Nodes8BG_226: 6103491273115133148 + Nodes8BG_150: -1329068034890422115 + Nodes8BG_128: -1466150913191706982 + Nodes8BG_92: -3239958494175849456 + Nodes8BG_130: 6876306666402375864 + Nodes8BG_91: -1880660190643596390 + Nodes8BG_131: -9043052416370495838 + Nodes8BG_155: 6429425385656107035 + Nodes8BG_144: 3057137882146940880 + Nodes8BG_244: 2521422214035971351 + Nodes8BG_204: -206628278697450115 + Nodes8BG_182: -4082189361868780822 + Nodes8BG_40: 8887698802641393929 + Nodes8BG_233: 5412884749461197141 + Nodes8BG_90: 6775745225501389903 + Nodes8BG_115: 7071430812157055572 + Nodes8BG_196: 9149117490803448074 + Nodes8BG_105: -9211802276413629358 + Nodes8BG_8: 3503768164542189703 + Nodes8BG_209: -2976873714432330943 + Nodes8BG_104: -3569694631432404910 + Nodes8BG_167: 5233044881454030387 + Nodes8BG_38: 924728570411451940 + Nodes8BG_1: 2115398974705819552 + Nodes8BG_208: 2995637105667101635 + Nodes8BG_85: -2148884357218057110 + Nodes8BG_145: 4778523869629175214 + Nodes8BG_220: 5273439971792734226 + Nodes8BG_136: 4079125148807721314 + Nodes8BG_227: -1746872550690250689 + Nodes8BG_219: 5961876137321229386 + Nodes8BG_100: -7029853660815812541 + Nodes8BG_169: 6674133928972707688 + Nodes8BG_201: 470769855502976100 + Nodes8BG_152: -1192209444175047542 + Nodes8BG_72: 3152337839274362975 + Nodes8BG_123: -8461211539097952600 + Nodes8BG_84: 3489081594259925771 + Nodes8BG_134: -8925123812655906803 + Nodes8BG_87: -9164298819962141262 + Nodes8BG_221: -3822476587949003320 + Nodes8BG_18: -5752789180819155309 + Nodes8BG_210: 6276641400030637334 + Nodes8BG_58: 7392365826199295703 + Nodes8BG_83: -2414833249116437819 + Nodes8BG_252: 3670144286203889596 + Nodes8BG_65: -3186846174551791044 + Nodes8BG_16: 4840700035213915802 + Nodes8BG_192: 6394564375783263150 + Nodes8BG_22: -1333157509587208539 + Nodes8BG_86: -3888663728487953321 + Nodes8BG_197: 1643311545311474544 + Nodes8BG_29: -2314366185884348512 + Nodes8BG_95: -4237527435945941609 + Nodes8BG_76: 3265571399507585591 + Nodes8BG_66: 1320845674306131133 + Nodes8BG_9: 7809947791882780470 + Nodes8BG_103: 2956833755456255703 + Nodes8BG_251: 7440164980553020475 + Nodes8BG_64: -9012391868356985468 + Nodes8BG_61: 1175598783620631007 + Nodes8BG_225: -624021450498029332 + Nodes8BG_70: 5900920010977852056 + Nodes8BG_133: -576576919876274472 + Nodes8BG_212: 5494618625931660733 + Nodes8BG_107: -7763451286712153674 + Nodes8BG_230: -8952848295345229027 + Nodes8BG_238: 6913090425554366168 + Nodes8BG_137: 5202363413636735238 + Nodes8BG_215: -845832346932012554 + Nodes8BG_110: -5775234408619938776 + Nodes8BG_71: -4116127005851028631 + Nodes8BG_237: -3255808020502649422 + Nodes8BG_195: 4399171150786783245 + Nodes8BG_232: -302989575004660099 + Nodes8BG_156: 2578177084443587106 + Nodes8BG_62: -3348155980997213509 + Nodes8BG_242: -853510017345081074 + Nodes8BG_164: 7257935236149628161 + Nodes8BG_127: 6858244950355173355 + Nodes8BG_214: 7008877619395589315 + Nodes8BG_116: -4944481917672394536 + Nodes8BG_81: 2799722068418958140 + Nodes8BG_211: 5686746025200404357 + Nodes8BG_7: 2374993158967451649 + Nodes8BG_68: 4912147126471412 + Nodes8BG_6: 5928721419278155306 + Nodes8BG_114: 8180210225106242322 + Nodes8BG_67: 8585232249589900906 + Nodes8BG_213: 6520301453726554913 + Nodes8BG_229: -2817797315461919686 + Nodes8BG_149: -908507070231868146 + Nodes8BG_203: 2255885655261514910 + Nodes8BG_236: 1905294342271219258 + Nodes8BG_122: 1549105078648193727 + Nodes8BG_142: -3299270554000538893 + Nodes8BG_171: -4795312445551664043 + Nodes8BG_20: 3121750227872538358 + Nodes8BG_34: -1716991398209348200 + Nodes8BG_78: 7228744588148459906 + Nodes8BG_154: -2515661859599136357 + Nodes8BG_111: -7512616530087115080 + Nodes8BG_153: 146764981126390217 + Nodes8BG_117: 9107306493535147600 + Nodes8BG_202: 4445728156181440634 + Nodes8BG_15: 4909017801856461585 + Nodes8BG_151: -2716471367829969917 + Nodes8BG_43: -7678628840059917316 + Nodes8BG_253: 7443985793196283146 + Nodes8BG_59: -5095656893371103704 + Nodes8BG_140: 1555646468759215644 + Nodes8BG_188: -8641880180027242812 + Nodes8BG_234: 2407539239158175964 + Nodes8BG_24: -2805152798140921176 + Nodes8BG_249: 3071429991273276785 + Nodes8BG_250: 5363756861703353984 + Nodes8BG_11: -8805923932288759383 + Nodes8BG_73: -3792717805357554673 + Nodes8BG_99: 8182466603561287464 + Nodes8BG_121: -5684460753008425353 + Nodes8BG_239: -6342554852119552662 + Nodes8BG_241: 6462138237582003339 + Nodes8BG_45: -3271638851300496266 + Nodes8BG_254: 8108522031404256323 + Nodes8BG_37: -8899748460944701379 + Nodes8BG_28: -3291808035052036581 + Nodes8BG_57: 1430834802416304891 + Nodes8BG_148: -1291234209637341415 + Nodes8BG_190: -3340031429203467162 + Nodes8BG_49: -8268126963253423288 + Nodes8BG_102: -7297401844833743237 + Nodes8BG_46: -3268505434792189474 + Nodes8BG_0: -7421115223572569992 + Nodes8BG_96: -5784859607193377890 + Nodes8BG_55: -5883065903039973125 + Nodes8BG_172: 6944583593054600778 + Nodes8BG_159: -1852578471923577438 + Nodes8BG_191: 3277937020182790336 + Nodes8BG_41: -9171854385380750635 + Nodes8BG_255: -2174629579577706817 + Nodes8BG_42: -4763425477265822139 + Nodes8BG_135: 4809538775903219248 + Nodes8BG_222: -2486070965647728038 + Nodes8BG_119: 7855476570762774555 + Nodes8BG_186: 8827861746511382235 + Nodes8BG_248: -1596674737556537511 + Nodes8BG_187: -2527193215767156445 + Nodes8BG_97: 3940681566662966511 + Nodes8BG_80: 5318057129198068246 + Nodes8BG_157: -7310301822728036135 + Nodes8BG_199: -4175901881848134451 spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 diff --git a/Assets/Resources/Sprites/Flat UI/pipes.psd.meta b/Assets/Resources/Sprites/Flat UI/pipes.psd.meta index 9e468924a..b85775b27 100644 --- a/Assets/Resources/Sprites/Flat UI/pipes.psd.meta +++ b/Assets/Resources/Sprites/Flat UI/pipes.psd.meta @@ -72,6 +72,7 @@ TextureImporter: streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 + ignoreMasterTextureLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -80,12 +81,12 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 + filterMode: 1 + aniso: 1 + mipBias: 0 wrapU: 1 wrapV: 1 - wrapW: -1 + wrapW: 0 nPOTScale: 0 lightmap: 0 compressionQuality: 50 @@ -484,6 +485,23 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] + nameFileIdTable: + pipes_13: 2949637312520497048 + pipes_8: 1571344320749704877 + pipes_5: -2508138221163281763 + pipes_15: -2189814545099003515 + pipes_0: 3624413539235301459 + pipes_7: -4505807909773429587 + pipes_4: -8507936627233245176 + pipes_14: 6572578204425805008 + pipes_10: -7524521870618806978 + pipes_1: 7631404538767374335 + pipes_9: -6624953910322571867 + pipes_11: -551590714208027187 + pipes_3: -2120189714087908947 + pipes_6: -9264146362022084 + pipes_2: -4752754735582442470 + pipes_12: -2054774350801148439 spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 1 diff --git a/Assets/Resources/Sprites/Indicators/Indicator.Target.png.meta b/Assets/Resources/Sprites/Indicators/Indicator.Target.png.meta index 08589d795..fb98e260a 100644 --- a/Assets/Resources/Sprites/Indicators/Indicator.Target.png.meta +++ b/Assets/Resources/Sprites/Indicators/Indicator.Target.png.meta @@ -36,6 +36,7 @@ TextureImporter: streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 + ignoreMasterTextureLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -44,12 +45,12 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 + filterMode: 1 + aniso: 1 + mipBias: 0 wrapU: 1 wrapV: 1 - wrapW: -1 + wrapW: 0 nPOTScale: 0 lightmap: 0 compressionQuality: 50 @@ -196,6 +197,11 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] + nameFileIdTable: + Indicator.Target_3: 937476731365896359 + Indicator.Target_1: -845328899698044167 + Indicator.Target_2: 3846040896246953147 + Indicator.Target_0: 8181828922831246326 spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 diff --git a/Assets/Scenes/Main Menu.unity b/Assets/Scenes/Main Menu.unity index 236c2661d..e2264df13 100644 --- a/Assets/Scenes/Main Menu.unity +++ b/Assets/Scenes/Main Menu.unity @@ -26,7 +26,7 @@ RenderSettings: m_AmbientIntensity: 1 m_AmbientMode: 0 m_SubtractiveShadowColor: {r: 0.2830189, g: 0.2830189, b: 0.2830189, a: 1} - m_SkyboxMaterial: {fileID: 1992980593} + m_SkyboxMaterial: {fileID: 0} m_HaloStrength: 0.5 m_FlareStrength: 1 m_FlareFadeSpeed: 3 @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.99999905, g: 0, b: 0.99999905, a: 1} + m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -151,6 +151,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1734434094} m_RootOrder: 2 @@ -166,6 +167,7 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 0 + m_StaticShadowCaster: 0 m_MotionVectors: 2 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -244,6 +246,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 801832274} m_Father: {fileID: 0} @@ -277,6 +280,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1734434094} m_RootOrder: 1 @@ -292,6 +296,7 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 0 + m_StaticShadowCaster: 0 m_MotionVectors: 2 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -360,6 +365,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 512.312, y: 512.416, z: 29.00662} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 741153269} m_RootOrder: 0 @@ -493,8 +499,10 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 01614664b831546d2ae94a42149d80ac, type: 3} m_Name: m_EditorClassIdentifier: + m_SendPointerHoverToParent: 1 m_MoveRepeatDelay: 0.5 m_MoveRepeatRate: 0.1 + m_XRTrackingOrigin: {fileID: 0} m_ActionsAsset: {fileID: -944628639613478452, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} m_PointAction: {fileID: 1054132383583890850, guid: ca9f5fa95ffab41fb9a615ab714db018, @@ -544,6 +552,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -0.03, y: 0, z: -0.01} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 10 @@ -576,6 +585,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.25, y: 0.25, z: 0.25} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1340266884} m_RootOrder: 1 @@ -591,6 +601,7 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 0 + m_StaticShadowCaster: 0 m_MotionVectors: 2 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -657,6 +668,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1340266884} m_RootOrder: 0 @@ -672,6 +684,7 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 0 + m_StaticShadowCaster: 0 m_MotionVectors: 2 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -736,6 +749,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1311800796} - {fileID: 1872107549} @@ -786,7 +800,10 @@ MonoBehaviour: NearClipPlane: 1 FarClipPlane: 1024 Dutch: 0 + ModeOverride: 0 LensShift: {x: 0, y: 0} + GateFit: 2 + m_SensorSize: {x: 1.7777778, y: 1} m_Transitions: m_BlendHint: 0 m_InheritPosition: 0 @@ -805,6 +822,7 @@ Transform: m_LocalRotation: {x: 0.17419034, y: 0.82403576, z: -0.4098015, w: 0.3502649} m_LocalPosition: {x: -255.6498, y: 261.96085, z: 220.16467} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 412917866} m_Father: {fileID: 0} @@ -839,6 +857,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 3 @@ -927,6 +946,7 @@ Transform: m_LocalRotation: {x: 0, y: 0.7071068, z: -0.7071068, w: 0} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1172538221} m_RootOrder: 1 @@ -1143,6 +1163,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 11 @@ -1255,6 +1276,7 @@ Transform: m_LocalRotation: {x: 0.17419034, y: 0.82403576, z: -0.4098015, w: 0.3502649} m_LocalPosition: {x: -255.6498, y: 261.96085, z: 220.16467} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0 @@ -1388,6 +1410,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1734434094} m_RootOrder: 0 @@ -1403,6 +1426,7 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 0 + m_StaticShadowCaster: 0 m_MotionVectors: 2 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -1467,6 +1491,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 10, z: 0} m_LocalScale: {x: 1000, y: 1000, z: 1000} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1572994236} - {fileID: 765320285} @@ -1503,6 +1528,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 678287591} m_RootOrder: 0 @@ -1518,6 +1544,7 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 0 + m_StaticShadowCaster: 0 m_MotionVectors: 2 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -1600,6 +1627,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 1 @@ -1630,6 +1658,7 @@ Transform: m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068} m_LocalPosition: {x: 0, y: -5, z: 0} m_LocalScale: {x: 3000, y: 3000, z: 3000} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 591465738} - {fileID: 564164469} @@ -1664,6 +1693,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: -125, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 8 @@ -1807,6 +1837,7 @@ Transform: m_LocalRotation: {x: 0, y: 0.7071068, z: -0.7071068, w: 0} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1172538221} m_RootOrder: 0 @@ -1839,6 +1870,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 678287591} m_RootOrder: 2 @@ -1854,6 +1886,7 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 0 + m_StaticShadowCaster: 0 m_MotionVectors: 2 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -1981,6 +2014,7 @@ Transform: m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 12 @@ -2011,6 +2045,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1131053607} - {fileID: 356429274} @@ -2046,6 +2081,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 678287591} m_RootOrder: 1 @@ -2061,6 +2097,7 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 0 + m_StaticShadowCaster: 0 m_MotionVectors: 2 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -2126,6 +2163,7 @@ Transform: m_LocalRotation: {x: 0, y: 0.7071068, z: -0.7071068, w: 0} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1172538221} m_RootOrder: 3 @@ -2173,28 +2211,6 @@ Camera: m_OcclusionCulling: 0 m_StereoConvergence: 10 m_StereoSeparation: 0.022 ---- !u!21 &1992980593 -Material: - serializedVersion: 6 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Skybox/AtmosphereScatteringPrecomputed - m_Shader: {fileID: 4800000, guid: e2088dd19a71d1244976cd0de1ff68a7, type: 3} - m_ShaderKeywords: - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: [] - m_Floats: [] - m_Colors: [] - m_BuildTextureStacks: [] --- !u!1 &2103364769 GameObject: m_ObjectHideFlags: 0 @@ -2222,6 +2238,7 @@ Transform: m_LocalRotation: {x: 0, y: 0.7071068, z: -0.7071068, w: 0} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1172538221} m_RootOrder: 2 diff --git a/Assets/Scripts/AetheriaInput.cs b/Assets/Scripts/AetheriaInput.cs index 9c3d0fa35..6c33c1dc2 100644 --- a/Assets/Scripts/AetheriaInput.cs +++ b/Assets/Scripts/AetheriaInput.cs @@ -1,4 +1,13 @@ -// GENERATED AUTOMATICALLY FROM 'Assets/Resources/Aetheria.inputactions' +//------------------------------------------------------------------------------ +// +// This code was auto-generated by com.unity.inputsystem:InputActionCodeGenerator +// version 1.3.0 +// from Assets/Resources/Aetheria.inputactions +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ using System; using System.Collections; @@ -6,7 +15,7 @@ using System.Collections.Generic; using UnityEngine.InputSystem; using UnityEngine.InputSystem.Utilities; -public class @AetheriaInput : IInputActionCollection, IDisposable +public partial class @AetheriaInput : IInputActionCollection2, IDisposable { public InputActionAsset asset { get; } public @AetheriaInput() @@ -24,7 +33,8 @@ public class @AetheriaInput : IInputActionCollection, IDisposable ""id"": ""197ba05c-054a-44fc-8328-0d37e8ac00db"", ""expectedControlType"": ""Vector2"", ""processors"": """", - ""interactions"": """" + ""interactions"": """", + ""initialStateCheck"": true }, { ""name"": ""Look"", @@ -32,7 +42,8 @@ public class @AetheriaInput : IInputActionCollection, IDisposable ""id"": ""323b9ea0-f916-4609-b697-322fc0ef9420"", ""expectedControlType"": ""Vector2"", ""processors"": """", - ""interactions"": """" + ""interactions"": """", + ""initialStateCheck"": true }, { ""name"": ""Minimap Zoom"", @@ -40,7 +51,8 @@ public class @AetheriaInput : IInputActionCollection, IDisposable ""id"": ""5708685d-78bd-4d2b-8796-712704f21bfb"", ""expectedControlType"": ""Button"", ""processors"": """", - ""interactions"": """" + ""interactions"": """", + ""initialStateCheck"": false }, { ""name"": ""Target Reticle"", @@ -48,7 +60,8 @@ public class @AetheriaInput : IInputActionCollection, IDisposable ""id"": ""86f2e6cc-b895-4c55-aa19-70220df477d2"", ""expectedControlType"": ""Button"", ""processors"": """", - ""interactions"": """" + ""interactions"": """", + ""initialStateCheck"": false }, { ""name"": ""Target Previous"", @@ -56,7 +69,8 @@ public class @AetheriaInput : IInputActionCollection, IDisposable ""id"": ""2cf8e2b2-1463-463b-8f55-e79884f3767d"", ""expectedControlType"": ""Button"", ""processors"": """", - ""interactions"": """" + ""interactions"": """", + ""initialStateCheck"": false }, { ""name"": ""Target Next"", @@ -64,7 +78,8 @@ public class @AetheriaInput : IInputActionCollection, IDisposable ""id"": ""1e2bd5af-e174-4533-8c57-b04b7e9df92c"", ""expectedControlType"": ""Button"", ""processors"": """", - ""interactions"": """" + ""interactions"": """", + ""initialStateCheck"": false }, { ""name"": ""Target Nearest"", @@ -72,7 +87,8 @@ public class @AetheriaInput : IInputActionCollection, IDisposable ""id"": ""b2a42777-c22b-48f3-9e74-8dc715449845"", ""expectedControlType"": ""Button"", ""processors"": """", - ""interactions"": """" + ""interactions"": """", + ""initialStateCheck"": false }, { ""name"": ""Toggle Heatsinks"", @@ -80,7 +96,8 @@ public class @AetheriaInput : IInputActionCollection, IDisposable ""id"": ""e6c6ff6a-4ac2-4e53-a3c9-9461f52e723f"", ""expectedControlType"": ""Button"", ""processors"": """", - ""interactions"": """" + ""interactions"": """", + ""initialStateCheck"": false }, { ""name"": ""Toggle Shield"", @@ -88,7 +105,8 @@ public class @AetheriaInput : IInputActionCollection, IDisposable ""id"": ""5566504f-ee89-4eb9-9bbb-03f4b22dfe7d"", ""expectedControlType"": ""Button"", ""processors"": """", - ""interactions"": """" + ""interactions"": """", + ""initialStateCheck"": false }, { ""name"": ""Override Shutdown"", @@ -96,7 +114,8 @@ public class @AetheriaInput : IInputActionCollection, IDisposable ""id"": ""62a64686-4670-43c9-81ee-bbb8578e284b"", ""expectedControlType"": ""Button"", ""processors"": """", - ""interactions"": """" + ""interactions"": """", + ""initialStateCheck"": false }, { ""name"": ""Ping"", @@ -104,7 +123,8 @@ public class @AetheriaInput : IInputActionCollection, IDisposable ""id"": ""cfc95f69-9b8a-41d5-a071-003b4e292524"", ""expectedControlType"": ""Button"", ""processors"": """", - ""interactions"": """" + ""interactions"": """", + ""initialStateCheck"": false }, { ""name"": ""Hide UI"", @@ -112,7 +132,8 @@ public class @AetheriaInput : IInputActionCollection, IDisposable ""id"": ""1cdb2515-91e1-4895-879d-8a7347e60b21"", ""expectedControlType"": ""Button"", ""processors"": """", - ""interactions"": """" + ""interactions"": """", + ""initialStateCheck"": false }, { ""name"": ""Tractor Beam"", @@ -120,7 +141,8 @@ public class @AetheriaInput : IInputActionCollection, IDisposable ""id"": ""e61d5d8e-eaf7-449d-8d54-624e15b6c964"", ""expectedControlType"": """", ""processors"": """", - ""interactions"": """" + ""interactions"": """", + ""initialStateCheck"": true } ], ""bindings"": [ @@ -367,7 +389,8 @@ public class @AetheriaInput : IInputActionCollection, IDisposable ""id"": ""add1d35f-58cd-4789-8868-f0afb51d87bc"", ""expectedControlType"": ""Vector2"", ""processors"": """", - ""interactions"": """" + ""interactions"": """", + ""initialStateCheck"": true }, { ""name"": ""Submit"", @@ -375,7 +398,8 @@ public class @AetheriaInput : IInputActionCollection, IDisposable ""id"": ""766f9151-3f3d-4e12-8ade-ce5aacd3940f"", ""expectedControlType"": ""Button"", ""processors"": """", - ""interactions"": """" + ""interactions"": """", + ""initialStateCheck"": false }, { ""name"": ""Cancel"", @@ -383,7 +407,8 @@ public class @AetheriaInput : IInputActionCollection, IDisposable ""id"": ""9dc56d99-ed81-42c3-b38d-1a7e76688b34"", ""expectedControlType"": ""Button"", ""processors"": """", - ""interactions"": """" + ""interactions"": """", + ""initialStateCheck"": false }, { ""name"": ""Point"", @@ -391,7 +416,8 @@ public class @AetheriaInput : IInputActionCollection, IDisposable ""id"": ""dfeef3e2-b0cc-4a9c-97ea-48ab693ac37f"", ""expectedControlType"": ""Vector2"", ""processors"": """", - ""interactions"": """" + ""interactions"": """", + ""initialStateCheck"": false }, { ""name"": ""Click"", @@ -399,7 +425,8 @@ public class @AetheriaInput : IInputActionCollection, IDisposable ""id"": ""aae7decd-7584-44f4-87ad-09c14c406ead"", ""expectedControlType"": ""Button"", ""processors"": """", - ""interactions"": """" + ""interactions"": """", + ""initialStateCheck"": false }, { ""name"": ""ScrollWheel"", @@ -407,7 +434,8 @@ public class @AetheriaInput : IInputActionCollection, IDisposable ""id"": ""25891af2-479b-4104-9a29-158aee22fa73"", ""expectedControlType"": ""Vector2"", ""processors"": """", - ""interactions"": """" + ""interactions"": """", + ""initialStateCheck"": false }, { ""name"": ""MiddleClick"", @@ -415,7 +443,8 @@ public class @AetheriaInput : IInputActionCollection, IDisposable ""id"": ""dc9af334-4f90-46dc-9b77-f381faa04a79"", ""expectedControlType"": """", ""processors"": """", - ""interactions"": """" + ""interactions"": """", + ""initialStateCheck"": false }, { ""name"": ""RightClick"", @@ -423,7 +452,8 @@ public class @AetheriaInput : IInputActionCollection, IDisposable ""id"": ""27901940-469e-42cd-92b3-f5f787a8d1d6"", ""expectedControlType"": """", ""processors"": """", - ""interactions"": """" + ""interactions"": """", + ""initialStateCheck"": false }, { ""name"": ""Drag"", @@ -431,7 +461,8 @@ public class @AetheriaInput : IInputActionCollection, IDisposable ""id"": ""0c96ec22-9571-46c8-94bf-199e70e919ed"", ""expectedControlType"": ""Vector2"", ""processors"": """", - ""interactions"": """" + ""interactions"": """", + ""initialStateCheck"": true } ], ""bindings"": [ @@ -821,7 +852,8 @@ public class @AetheriaInput : IInputActionCollection, IDisposable ""id"": ""e43f020b-dec0-43d2-a83b-1390d45819be"", ""expectedControlType"": ""Button"", ""processors"": """", - ""interactions"": """" + ""interactions"": """", + ""initialStateCheck"": false }, { ""name"": ""Galaxy Map"", @@ -829,7 +861,8 @@ public class @AetheriaInput : IInputActionCollection, IDisposable ""id"": ""d198f18c-8c55-4a31-a694-4959c763f664"", ""expectedControlType"": ""Button"", ""processors"": """", - ""interactions"": """" + ""interactions"": """", + ""initialStateCheck"": false }, { ""name"": ""Inventory"", @@ -837,7 +870,8 @@ public class @AetheriaInput : IInputActionCollection, IDisposable ""id"": ""dafe13a7-da46-408e-853e-6954e37da5c8"", ""expectedControlType"": ""Button"", ""processors"": """", - ""interactions"": """" + ""interactions"": """", + ""initialStateCheck"": false }, { ""name"": ""Main Menu"", @@ -845,7 +879,8 @@ public class @AetheriaInput : IInputActionCollection, IDisposable ""id"": ""0515c617-9dff-406f-ab3e-763971d532d3"", ""expectedControlType"": ""Button"", ""processors"": """", - ""interactions"": """" + ""interactions"": """", + ""initialStateCheck"": false }, { ""name"": ""Input Screen"", @@ -853,7 +888,8 @@ public class @AetheriaInput : IInputActionCollection, IDisposable ""id"": ""e76aa7e9-e24d-47e1-865d-ffe72ba5c1c2"", ""expectedControlType"": ""Button"", ""processors"": """", - ""interactions"": """" + ""interactions"": """", + ""initialStateCheck"": false }, { ""name"": ""Interact"", @@ -861,7 +897,8 @@ public class @AetheriaInput : IInputActionCollection, IDisposable ""id"": ""31f7b7e1-d15e-40e8-b74f-2d0dc4195d4d"", ""expectedControlType"": ""Button"", ""processors"": """", - ""interactions"": """" + ""interactions"": """", + ""initialStateCheck"": false } ], ""bindings"": [ @@ -1054,6 +1091,16 @@ public class @AetheriaInput : IInputActionCollection, IDisposable { asset.Disable(); } + public IEnumerable bindings => asset.bindings; + + public InputAction FindAction(string actionNameOrId, bool throwIfNotFound = false) + { + return asset.FindAction(actionNameOrId, throwIfNotFound); + } + public int FindBinding(InputBinding bindingMask, out InputAction action) + { + return asset.FindBinding(bindingMask, out action); + } // Player private readonly InputActionMap m_Player; diff --git a/Assets/Scripts/CultCache/Editor/Inspectors/DictionaryInspector.cs b/Assets/Scripts/CultCache/Editor/Inspectors/DictionaryInspector.cs index fd3e1a61b..7d2128b5e 100644 --- a/Assets/Scripts/CultCache/Editor/Inspectors/DictionaryInspector.cs +++ b/Assets/Scripts/CultCache/Editor/Inspectors/DictionaryInspector.cs @@ -52,8 +52,8 @@ public class FloatDictionaryInspector : BaseInspector, I if (v.rect.Contains(Event.current.mousePosition)) { var dragData = DragAndDrop.GetGenericData("Item"); - var isId = dragData is Guid guid; - var dragEntry = isId ? DatabaseInspector.CultCache.Get(guid) : null; + var isId = dragData is Guid; + var dragEntry = isId ? DatabaseInspector.CultCache.Get((Guid)dragData) : null; var correctType = attribute.EntryType.IsInstanceOfType(dragEntry); if(Event.current.type == EventType.DragUpdated) DragAndDrop.visualMode = correctType ? DragAndDropVisualMode.Copy : DragAndDropVisualMode.Rejected; @@ -62,7 +62,7 @@ public class FloatDictionaryInspector : BaseInspector, I if (isId && correctType) { DragAndDrop.AcceptDrag(); - value[guid] = 1; + value[(Guid)dragData] = 1; GUI.changed = true; } } @@ -121,8 +121,8 @@ public class RangedFloatDictionaryInspector : BaseInspector, Inspe if (v.rect.Contains(Event.current.mousePosition)) { var dragData = DragAndDrop.GetGenericData("Item"); - var isId = dragData is Guid guid; - var dragEntry = isId ? DatabaseInspector.CultCache.Get(guid) : null; + var isId = dragData is Guid; + var dragEntry = isId ? DatabaseInspector.CultCache.Get((Guid)dragData) : null; var correctType = attribute.EntryType.IsInstanceOfType(dragEntry); if(Event.current.type == EventType.DragUpdated) DragAndDrop.visualMode = correctType ? DragAndDropVisualMode.Copy : DragAndDropVisualMode.Rejected; @@ -199,7 +199,7 @@ public class IntDictionaryInspector : BaseInspector, Inspe if (isId && correctType) { DragAndDrop.AcceptDrag(); - value[guid] = 1; + value[(Guid)dragData] = 1; GUI.changed = true; } } diff --git a/GameData/PlayerSettings.msgpack b/GameData/PlayerSettings.msgpack index 927a7bfd9..d21aeeeb8 100644 --- a/GameData/PlayerSettings.msgpack +++ b/GameData/PlayerSettings.msgpack @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7e327b2b242d3d42d43ca192f29d9691aa3e59c71e62b2d438b3270c0cda5545 +oid sha256:4145c821a0238ed933d1dc71012fe24a64bdb41c5a3c2d1bece5b3a99c126fb7 size 24360 diff --git a/Packages/manifest.json b/Packages/manifest.json index 0f25040b5..7116bdc09 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -2,21 +2,21 @@ "dependencies": { "com.unity.2d.sprite": "1.0.0", "com.unity.2d.tilemap": "1.0.0", - "com.unity.burst": "1.4.3", - "com.unity.cinemachine": "2.6.3", - "com.unity.ide.rider": "2.0.7", - "com.unity.ide.visualstudio": "2.0.7", - "com.unity.ide.vscode": "1.2.3", - "com.unity.inputsystem": "1.0.2", - "com.unity.localization": "0.11.1-preview", - "com.unity.mathematics": "1.2.1", - "com.unity.postprocessing": "3.1.0", - "com.unity.recorder": "2.5.5", - "com.unity.test-framework": "1.1.24", + "com.unity.burst": "1.6.6", + "com.unity.cinemachine": "2.8.6", + "com.unity.ide.rider": "3.0.15", + "com.unity.ide.visualstudio": "2.0.16", + "com.unity.ide.vscode": "1.2.5", + "com.unity.inputsystem": "1.3.0", + "com.unity.localization": "1.3.1", + "com.unity.mathematics": "1.2.6", + "com.unity.postprocessing": "3.2.2", + "com.unity.recorder": "3.0.3", + "com.unity.test-framework": "1.1.31", "com.unity.textmeshpro": "3.0.6", - "com.unity.timeline": "1.4.6", + "com.unity.timeline": "1.6.4", "com.unity.ugui": "1.0.0", - "com.unity.xr.legacyinputhelpers": "2.1.7", + "com.unity.xr.legacyinputhelpers": "2.1.9", "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 index b90e76047..013de66bd 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -13,11 +13,11 @@ "dependencies": {} }, "com.unity.addressables": { - "version": "1.17.15", + "version": "1.19.19", "depth": 1, "source": "registry", "dependencies": { - "com.unity.scriptablebuildpipeline": "1.17.0", + "com.unity.scriptablebuildpipeline": "1.19.6", "com.unity.modules.assetbundle": "1.0.0", "com.unity.modules.imageconversion": "1.0.0", "com.unity.modules.jsonserialize": "1.0.0", @@ -27,7 +27,7 @@ "url": "https://packages.unity.com" }, "com.unity.burst": { - "version": "1.4.3", + "version": "1.6.6", "depth": 0, "source": "registry", "dependencies": { @@ -36,7 +36,7 @@ "url": "https://packages.unity.com" }, "com.unity.cinemachine": { - "version": "2.6.3", + "version": "2.8.6", "depth": 0, "source": "registry", "dependencies": {}, @@ -50,16 +50,16 @@ "url": "https://packages.unity.com" }, "com.unity.ide.rider": { - "version": "2.0.7", + "version": "3.0.15", "depth": 0, "source": "registry", "dependencies": { - "com.unity.test-framework": "1.1.1" + "com.unity.ext.nunit": "1.0.6" }, "url": "https://packages.unity.com" }, "com.unity.ide.visualstudio": { - "version": "2.0.7", + "version": "2.0.16", "depth": 0, "source": "registry", "dependencies": { @@ -68,37 +68,47 @@ "url": "https://packages.unity.com" }, "com.unity.ide.vscode": { - "version": "1.2.3", + "version": "1.2.5", "depth": 0, "source": "registry", "dependencies": {}, "url": "https://packages.unity.com" }, "com.unity.inputsystem": { - "version": "1.0.2", + "version": "1.3.0", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.modules.uielements": "1.0.0" + }, + "url": "https://packages.unity.com" + }, + "com.unity.localization": { + "version": "1.3.1", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.addressables": "1.19.19", + "com.unity.nuget.newtonsoft-json": "2.0.0" + }, + "url": "https://packages.unity.com" + }, + "com.unity.mathematics": { + "version": "1.2.6", "depth": 0, "source": "registry", "dependencies": {}, "url": "https://packages.unity.com" }, - "com.unity.localization": { - "version": "0.11.1-preview", - "depth": 0, - "source": "registry", - "dependencies": { - "com.unity.addressables": "1.17.15" - }, - "url": "https://packages.unity.com" - }, - "com.unity.mathematics": { - "version": "1.2.1", - "depth": 0, + "com.unity.nuget.newtonsoft-json": { + "version": "3.0.2", + "depth": 1, "source": "registry", "dependencies": {}, "url": "https://packages.unity.com" }, "com.unity.postprocessing": { - "version": "3.1.0", + "version": "3.2.2", "depth": 0, "source": "registry", "dependencies": { @@ -107,7 +117,7 @@ "url": "https://packages.unity.com" }, "com.unity.recorder": { - "version": "2.5.5", + "version": "3.0.3", "depth": 0, "source": "registry", "dependencies": { @@ -116,14 +126,14 @@ "url": "https://packages.unity.com" }, "com.unity.scriptablebuildpipeline": { - "version": "1.17.0", + "version": "1.20.1", "depth": 2, "source": "registry", "dependencies": {}, "url": "https://packages.unity.com" }, "com.unity.test-framework": { - "version": "1.1.24", + "version": "1.1.31", "depth": 0, "source": "registry", "dependencies": { @@ -143,7 +153,7 @@ "url": "https://packages.unity.com" }, "com.unity.timeline": { - "version": "1.4.6", + "version": "1.6.4", "depth": 0, "source": "registry", "dependencies": { @@ -164,7 +174,7 @@ } }, "com.unity.xr.legacyinputhelpers": { - "version": "2.1.7", + "version": "2.1.9", "depth": 0, "source": "registry", "dependencies": { diff --git a/ProjectSettings/MemorySettings.asset b/ProjectSettings/MemorySettings.asset new file mode 100644 index 000000000..cd6af44a4 --- /dev/null +++ b/ProjectSettings/MemorySettings.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1e8379a461b10ae09f3f696911088c16875d63e87ed5f2d95df9e1892703f9fd +size 1192 diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index ba05fefb8..601371914 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:47b786b9d593d0b681095702addc1be73a352f640dd614aa9cc6a88e79549267 -size 20115 +oid sha256:164ebdfddfcc09d18a82205dd07e68da3ab291306628b6bf9a4b30c8491803cb +size 21026 diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index 6260f2cc9..4cb046008 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2020.3.2f1 -m_EditorVersionWithRevision: 2020.3.2f1 (8fd9074bf66c) +m_EditorVersion: 2021.3.6f1 +m_EditorVersionWithRevision: 2021.3.6f1 (7da38d85baf6) diff --git a/ProjectSettings/ProjectVersionPrevious.txt b/ProjectSettings/ProjectVersionPrevious.txt index 6260f2cc9..4cb046008 100644 --- a/ProjectSettings/ProjectVersionPrevious.txt +++ b/ProjectSettings/ProjectVersionPrevious.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2020.3.2f1 -m_EditorVersionWithRevision: 2020.3.2f1 (8fd9074bf66c) +m_EditorVersion: 2021.3.6f1 +m_EditorVersionWithRevision: 2021.3.6f1 (7da38d85baf6) diff --git a/ProjectSettings/QualitySettings.asset b/ProjectSettings/QualitySettings.asset index 942eb32b5..a6d501c74 100644 --- a/ProjectSettings/QualitySettings.asset +++ b/ProjectSettings/QualitySettings.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f253c7f983785fb34a264fa16966fd40851a687e31c5e25e7dd2438d09e25ae2 -size 1454 +oid sha256:b9a9991d751d8db1a528e0547a648abdf2a18cb812f96944136086b3a224cf09 +size 1468 diff --git a/ProjectSettings/boot.config b/ProjectSettings/boot.config new file mode 100644 index 000000000..e69de29bb diff --git a/UserSettings/Layouts/default-2021.dwlt b/UserSettings/Layouts/default-2021.dwlt new file mode 100644 index 000000000..0bf195877 --- /dev/null +++ b/UserSettings/Layouts/default-2021.dwlt @@ -0,0 +1,1099 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &1 +MonoBehaviour: + m_ObjectHideFlags: 52 + 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: 12004, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_PixelRect: + serializedVersion: 2 + x: 71 + y: 43 + width: 1849 + height: 1037 + m_ShowMode: 4 + m_Title: Game + m_RootView: {fileID: 11} + m_MinSize: {x: 875, y: 371} + m_MaxSize: {x: 10000, y: 10000} + m_Maximized: 1 +--- !u!114 &2 +MonoBehaviour: + m_ObjectHideFlags: 52 + 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: 12006, guid: 0000000000000000e000000000000000, type: 0} + m_Name: SceneView + m_EditorClassIdentifier: + m_Children: [] + m_Position: + serializedVersion: 2 + x: 0 + y: 0 + width: 708 + height: 321 + m_MinSize: {x: 201, y: 221} + m_MaxSize: {x: 4001, y: 4021} + m_ActualView: {fileID: 20} + m_Panes: + - {fileID: 20} + m_Selected: 0 + m_LastSelected: 0 +--- !u!114 &3 +MonoBehaviour: + m_ObjectHideFlags: 52 + 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: 12010, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_Children: + - {fileID: 2} + - {fileID: 4} + m_Position: + serializedVersion: 2 + x: 0 + y: 0 + width: 1110 + height: 321 + m_MinSize: {x: 200, y: 100} + m_MaxSize: {x: 16192, y: 8096} + vertical: 0 + controlID: 787 +--- !u!114 &4 +MonoBehaviour: + m_ObjectHideFlags: 52 + 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: 12006, guid: 0000000000000000e000000000000000, type: 0} + m_Name: ConsoleWindow + m_EditorClassIdentifier: + m_Children: [] + m_Position: + serializedVersion: 2 + x: 708 + y: 0 + width: 402 + height: 321 + m_MinSize: {x: 102, y: 121} + m_MaxSize: {x: 4002, y: 4021} + m_ActualView: {fileID: 22} + m_Panes: + - {fileID: 22} + m_Selected: 0 + m_LastSelected: 0 +--- !u!114 &5 +MonoBehaviour: + m_ObjectHideFlags: 52 + 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: 12010, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_Children: + - {fileID: 3} + - {fileID: 15} + m_Position: + serializedVersion: 2 + x: 0 + y: 0 + width: 1110 + height: 987 + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 16192, y: 16192} + vertical: 1 + controlID: 786 +--- !u!114 &6 +MonoBehaviour: + m_ObjectHideFlags: 52 + 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: 12006, guid: 0000000000000000e000000000000000, type: 0} + m_Name: ProjectBrowser + m_EditorClassIdentifier: + m_Children: [] + m_Position: + serializedVersion: 2 + x: 0 + y: 534 + width: 392 + height: 453 + m_MinSize: {x: 232, y: 271} + m_MaxSize: {x: 10002, y: 10021} + m_ActualView: {fileID: 17} + m_Panes: + - {fileID: 17} + m_Selected: 0 + m_LastSelected: 0 +--- !u!114 &7 +MonoBehaviour: + m_ObjectHideFlags: 52 + 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: 12010, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_Children: + - {fileID: 8} + - {fileID: 6} + m_Position: + serializedVersion: 2 + x: 1110 + y: 0 + width: 392 + height: 987 + m_MinSize: {x: 100, y: 200} + m_MaxSize: {x: 8096, y: 16192} + vertical: 1 + controlID: 606 +--- !u!114 &8 +MonoBehaviour: + m_ObjectHideFlags: 52 + 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: 12006, guid: 0000000000000000e000000000000000, type: 0} + m_Name: SceneHierarchyWindow + m_EditorClassIdentifier: + m_Children: [] + m_Position: + serializedVersion: 2 + x: 0 + y: 0 + width: 392 + height: 534 + m_MinSize: {x: 202, y: 221} + m_MaxSize: {x: 4002, y: 4021} + m_ActualView: {fileID: 19} + m_Panes: + - {fileID: 19} + m_Selected: 0 + m_LastSelected: 0 +--- !u!114 &9 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_Children: + - {fileID: 14} + - {fileID: 10} + m_Position: + serializedVersion: 2 + x: 0 + y: 30 + width: 1849 + height: 987 + m_MinSize: {x: 400, y: 200} + m_MaxSize: {x: 32384, y: 16192} + vertical: 0 + controlID: 604 +--- !u!114 &10 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} + m_Name: InspectorWindow + m_EditorClassIdentifier: + m_Children: [] + m_Position: + serializedVersion: 2 + x: 1502 + y: 0 + width: 347 + height: 987 + m_MinSize: {x: 276, y: 71} + m_MaxSize: {x: 4001, y: 4021} + m_ActualView: {fileID: 18} + m_Panes: + - {fileID: 18} + - {fileID: 16} + m_Selected: 0 + m_LastSelected: 1 +--- !u!114 &11 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12008, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_Children: + - {fileID: 12} + - {fileID: 9} + - {fileID: 13} + m_Position: + serializedVersion: 2 + x: 0 + y: 0 + width: 1849 + height: 1037 + m_MinSize: {x: 875, y: 300} + m_MaxSize: {x: 10000, y: 10000} + m_UseTopView: 1 + m_TopViewHeight: 30 + m_UseBottomView: 1 + m_BottomViewHeight: 20 +--- !u!114 &12 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12011, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_Children: [] + m_Position: + serializedVersion: 2 + x: 0 + y: 0 + width: 1849 + height: 30 + m_MinSize: {x: 0, y: 0} + m_MaxSize: {x: 0, y: 0} + m_LastLoadedLayoutName: Mine +--- !u!114 &13 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12042, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_Children: [] + m_Position: + serializedVersion: 2 + x: 0 + y: 1017 + width: 1849 + height: 20 + m_MinSize: {x: 0, y: 0} + m_MaxSize: {x: 0, y: 0} +--- !u!114 &14 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_Children: + - {fileID: 5} + - {fileID: 7} + m_Position: + serializedVersion: 2 + x: 0 + y: 0 + width: 1502 + height: 987 + m_MinSize: {x: 300, y: 200} + m_MaxSize: {x: 24288, y: 16192} + vertical: 0 + controlID: 605 +--- !u!114 &15 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} + m_Name: GameView + m_EditorClassIdentifier: + m_Children: [] + m_Position: + serializedVersion: 2 + x: 0 + y: 321 + width: 1110 + height: 666 + m_MinSize: {x: 201, y: 221} + m_MaxSize: {x: 4001, y: 4021} + m_ActualView: {fileID: 21} + m_Panes: + - {fileID: 21} + m_Selected: 0 + m_LastSelected: 0 +--- !u!114 &16 +MonoBehaviour: + m_ObjectHideFlags: 52 + 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: 12079, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 390, y: 390} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: Lighting + m_Image: {fileID: -1347227620855488341, guid: 0000000000000000d000000000000000, + type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 1566 + y: 73 + width: 353 + height: 966 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] +--- !u!114 &17 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12014, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 230, y: 250} + m_MaxSize: {x: 10000, y: 10000} + m_TitleContent: + m_Text: Project + m_Image: {fileID: -5467254957812901981, guid: 0000000000000000d000000000000000, + type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 1181 + y: 607 + width: 390 + height: 432 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_SearchFilter: + m_NameFilter: + m_ClassNames: [] + m_AssetLabels: [] + m_AssetBundleNames: [] + m_VersionControlStates: [] + m_SoftLockControlStates: [] + m_ReferencingInstanceIDs: + m_SceneHandles: + m_ShowAllHits: 0 + m_SkipHidden: 0 + m_SearchArea: 1 + m_Folders: + - Assets/Resources + m_Globs: [] + m_OriginalText: + m_ViewMode: 1 + m_StartGridSize: 16 + m_LastFolders: + - Assets/Resources + m_LastFoldersGridSize: 16 + m_LastProjectPath: E:\Projects\Aetheria-Economy + m_LockTracker: + m_IsLocked: 0 + m_FolderTreeState: + scrollPos: {x: 0, y: 0} + m_SelectedIDs: 06960000 + m_LastClickedID: 38406 + m_ExpandedIDs: 00000000e4950000e6950000f2950000f8950000049600000696000094dc0000e2df000090e10000a4e1000000ca9a3bffffff7f + m_RenameOverlay: + m_UserAcceptedRename: 0 + m_Name: + m_OriginalName: + m_EditFieldRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0 + height: 0 + m_UserData: 0 + m_IsWaitingForDelay: 0 + m_IsRenaming: 0 + m_OriginalEventType: 11 + m_IsRenamingFilename: 1 + m_ClientGUIView: {fileID: 0} + m_SearchString: + m_CreateAssetUtility: + m_EndAction: {fileID: 0} + m_InstanceID: 0 + m_Path: + m_Icon: {fileID: 0} + m_ResourceFile: + m_AssetTreeState: + scrollPos: {x: 0, y: 0} + m_SelectedIDs: + m_LastClickedID: 0 + m_ExpandedIDs: 00000000e495000000ca9a3bffffff7f + m_RenameOverlay: + m_UserAcceptedRename: 0 + m_Name: + m_OriginalName: + m_EditFieldRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0 + height: 0 + m_UserData: 0 + m_IsWaitingForDelay: 0 + m_IsRenaming: 0 + m_OriginalEventType: 11 + m_IsRenamingFilename: 1 + m_ClientGUIView: {fileID: 0} + m_SearchString: + m_CreateAssetUtility: + m_EndAction: {fileID: 0} + m_InstanceID: 0 + m_Path: + m_Icon: {fileID: 0} + m_ResourceFile: + m_ListAreaState: + m_SelectedInstanceIDs: + m_LastClickedInstanceID: 0 + m_HadKeyboardFocusLastEvent: 1 + m_ExpandedInstanceIDs: c6230000b2db0000fefa00000cfb0000 + m_RenameOverlay: + m_UserAcceptedRename: 0 + m_Name: Mine Launcher + m_OriginalName: Mine Launcher + m_EditFieldRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0 + height: 0 + m_UserData: 60898 + m_IsWaitingForDelay: 0 + m_IsRenaming: 0 + m_OriginalEventType: 0 + m_IsRenamingFilename: 1 + m_ClientGUIView: {fileID: 6} + m_CreateAssetUtility: + m_EndAction: {fileID: 0} + m_InstanceID: 0 + m_Path: + m_Icon: {fileID: 0} + m_ResourceFile: + m_NewAssetIndexInList: -1 + m_ScrollPosition: {x: 0, y: 79} + m_GridSize: 16 + m_SkipHiddenPackages: 0 + m_DirectoriesAreaWidth: 207 +--- !u!114 &18 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12019, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 275, y: 50} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: Inspector + m_Image: {fileID: -2667387946076563598, guid: 0000000000000000d000000000000000, + type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 1573 + y: 73 + width: 346 + height: 966 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_ObjectsLockedBeforeSerialization: [] + m_InstanceIDsLockedBeforeSerialization: + m_PreviewResizer: + m_CachedPref: 330 + m_ControlHash: -371814159 + m_PrefName: Preview_InspectorPreview + m_LastInspectedObjectInstanceID: -1 + m_LastVerticalScrollValue: 0 + m_GlobalObjectId: + m_InspectorMode: 0 + m_LockTracker: + m_IsLocked: 0 + m_PreviewWindow: {fileID: 0} +--- !u!114 &19 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12061, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: Hierarchy + m_Image: {fileID: 7966133145522015247, guid: 0000000000000000d000000000000000, + type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 1181 + y: 73 + width: 390 + height: 513 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_SceneHierarchy: + m_TreeViewState: + scrollPos: {x: 0, y: 0} + m_SelectedIDs: + m_LastClickedID: 0 + m_ExpandedIDs: d615feff9222feff8c96ffff7e020100ea0301002a050100ee0801004c090100b80a0100640b0100 + m_RenameOverlay: + m_UserAcceptedRename: 0 + m_Name: + m_OriginalName: + m_EditFieldRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0 + height: 0 + m_UserData: 0 + m_IsWaitingForDelay: 0 + m_IsRenaming: 0 + m_OriginalEventType: 11 + m_IsRenamingFilename: 0 + m_ClientGUIView: {fileID: 0} + m_SearchString: + m_ExpandedScenes: [] + m_CurrenRootInstanceID: 0 + m_LockTracker: + m_IsLocked: 0 + m_CurrentSortingName: TransformSorting + m_WindowGUID: 4c969a2b90040154d917609493e03593 +--- !u!114 &20 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12013, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: Scene + m_Image: {fileID: 2593428753322112591, guid: 0000000000000000d000000000000000, + type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 71 + y: 73 + width: 707 + height: 300 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: + - dockPosition: 0 + containerId: overlay-toolbar__top + floating: 0 + collapsed: 0 + displayed: 1 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: -101, y: -26} + snapCorner: 3 + id: Tool Settings + index: 0 + layout: 1 + - dockPosition: 0 + containerId: overlay-toolbar__top + floating: 0 + collapsed: 0 + displayed: 1 + snapOffset: {x: -141, y: 149} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 1 + id: unity-grid-and-snap-toolbar + index: 1 + layout: 1 + - dockPosition: 1 + containerId: overlay-toolbar__top + floating: 0 + collapsed: 0 + displayed: 1 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: unity-scene-view-toolbar + index: 0 + layout: 1 + - dockPosition: 1 + containerId: overlay-toolbar__top + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 1 + id: unity-search-toolbar + index: 1 + layout: 1 + - dockPosition: 1 + containerId: overlay-toolbar__top + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Open Tile Palette + index: 2 + layout: 4 + - dockPosition: 1 + containerId: overlay-toolbar__top + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Tilemap Focus + index: 3 + layout: 4 + - dockPosition: 0 + containerId: overlay-container--left + floating: 0 + collapsed: 0 + displayed: 1 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: unity-transform-toolbar + index: 0 + layout: 2 + - dockPosition: 0 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 1 + snapOffset: {x: 67.5, y: 86} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Orientation + index: 0 + layout: 4 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Light Settings + index: 0 + layout: 4 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Camera + index: 1 + layout: 4 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Cloth Constraints + index: 2 + layout: 4 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Cloth Collisions + index: 3 + layout: 4 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Navmesh Display + index: 4 + layout: 4 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Agent Display + index: 5 + layout: 4 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Obstacle Display + index: 6 + layout: 4 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Occlusion Culling + index: 7 + layout: 4 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Physics Debugger + index: 8 + layout: 4 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Scene Visibility + index: 9 + layout: 4 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Particles + index: 10 + layout: 4 + m_WindowGUID: cc27987af1a868c49b0894db9c0f5429 + m_Gizmos: 1 + m_OverrideSceneCullingMask: 6917529027641081856 + m_SceneIsLit: 1 + m_SceneLighting: 1 + m_2DMode: 0 + m_isRotationLocked: 0 + m_PlayAudio: 0 + m_AudioPlay: 0 + m_Position: + m_Target: {x: 1464.1172, y: -37.497505, z: 2015.4597} + speed: 2 + m_Value: {x: 1464.1172, y: -37.497505, z: 2015.4597} + m_RenderMode: 0 + m_CameraMode: + drawMode: 0 + name: Shaded + section: Shading Mode + m_ValidateTrueMetals: 0 + m_DoValidateTrueMetals: 0 + m_ExposureSliderValue: 0 + m_SceneViewState: + m_AlwaysRefresh: 0 + showFog: 1 + showSkybox: 0 + showFlares: 1 + showImageEffects: 1 + showParticleSystems: 1 + showVisualEffectGraphs: 1 + m_FxEnabled: 0 + m_Grid: + xGrid: + m_Fade: + m_Target: 0 + speed: 2 + m_Value: 0 + m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4} + m_Pivot: {x: 0, y: 0, z: 0} + m_Size: {x: 0, y: 0} + yGrid: + m_Fade: + m_Target: 1 + speed: 2 + m_Value: 1 + m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4} + m_Pivot: {x: 0, y: 0, z: 0} + m_Size: {x: 1, y: 1} + zGrid: + m_Fade: + m_Target: 0 + speed: 2 + m_Value: 0 + m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4} + m_Pivot: {x: 0, y: 0, z: 0} + m_Size: {x: 0, y: 0} + m_ShowGrid: 1 + m_GridAxis: 1 + m_gridOpacity: 0.5 + m_Rotation: + m_Target: {x: -0.5623667, y: -0.011908458, z: 0.008101885, w: -0.8267735} + speed: 2 + m_Value: {x: -0.56112087, y: -0.011920489, z: 0.00808394, w: -0.82760864} + m_Size: + m_Target: 88.38835 + speed: 2 + m_Value: 88.38835 + m_Ortho: + m_Target: 0 + speed: 2 + m_Value: 0 + m_CameraSettings: + m_Speed: 1 + m_SpeedNormalized: 0.5 + m_SpeedMin: 0.001 + m_SpeedMax: 2 + m_EasingEnabled: 1 + m_EasingDuration: 0.4 + m_AccelerationEnabled: 1 + m_FieldOfViewHorizontalOrVertical: 60 + m_NearClip: 0.03 + m_FarClip: 10000 + m_DynamicClip: 1 + m_OcclusionCulling: 0 + m_LastSceneViewRotation: {x: 0, y: 0, z: 0, w: 0} + m_LastSceneViewOrtho: 0 + m_ReplacementShader: {fileID: 0} + m_ReplacementString: + m_SceneVisActive: 1 + m_LastLockedObject: {fileID: 0} + m_ViewIsLockedToObject: 0 +--- !u!114 &21 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12015, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: Game + m_Image: {fileID: -6423792434712278376, guid: 0000000000000000d000000000000000, + type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 71 + y: 394 + width: 1109 + height: 645 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_SerializedViewNames: [] + m_SerializedViewValues: [] + m_PlayModeViewName: GameView + m_ShowGizmos: 0 + m_TargetDisplay: 0 + m_ClearColor: {r: 0, g: 0, b: 0, a: 0} + m_TargetSize: {x: 1920, y: 1080} + m_TextureFilterMode: 0 + m_TextureHideFlags: 61 + m_RenderIMGUI: 1 + m_EnterPlayModeBehavior: 0 + m_UseMipMap: 0 + m_VSyncEnabled: 0 + m_Gizmos: 0 + m_Stats: 0 + m_SelectedSizes: 0a000000000000000000000000000000000000000000000000000000000000000000000000000000 + m_ZoomArea: + m_HRangeLocked: 0 + m_VRangeLocked: 0 + hZoomLockedByDefault: 0 + vZoomLockedByDefault: 0 + m_HBaseRangeMin: -960 + m_HBaseRangeMax: 960 + m_VBaseRangeMin: -540 + m_VBaseRangeMax: 540 + m_HAllowExceedBaseRangeMin: 1 + m_HAllowExceedBaseRangeMax: 1 + m_VAllowExceedBaseRangeMin: 1 + m_VAllowExceedBaseRangeMax: 1 + m_ScaleWithWindow: 0 + m_HSlider: 0 + m_VSlider: 0 + m_IgnoreScrollWheelUntilClicked: 0 + m_EnableMouseInput: 1 + m_EnableSliderZoomHorizontal: 0 + m_EnableSliderZoomVertical: 0 + m_UniformScale: 1 + m_UpDirection: 1 + m_DrawArea: + serializedVersion: 2 + x: 0 + y: 21 + width: 1109 + height: 624 + m_Scale: {x: 0.5776042, y: 0.5776042} + m_Translation: {x: 554.5, y: 312} + m_MarginLeft: 0 + m_MarginRight: 0 + m_MarginTop: 0 + m_MarginBottom: 0 + m_LastShownAreaInsideMargins: + serializedVersion: 2 + x: -960 + y: -540.1623 + width: 1920 + height: 1080.3246 + m_MinimalGUI: 1 + m_defaultScale: 0.5776042 + m_LastWindowPixelSize: {x: 1109, y: 645} + m_ClearInEditMode: 1 + m_NoCameraWarning: 1 + m_LowResolutionForAspectRatios: 01000000000000000000 + m_XRRenderMode: 0 + m_RenderTexture: {fileID: 0} +--- !u!114 &22 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12003, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 100, y: 100} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: Console + m_Image: {fileID: -4327648978806127646, guid: 0000000000000000d000000000000000, + type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 779 + y: 73 + width: 400 + height: 300 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] diff --git a/UserSettings/Search.settings b/UserSettings/Search.settings new file mode 100644 index 000000000..9e26dfeeb --- /dev/null +++ b/UserSettings/Search.settings @@ -0,0 +1 @@ +{} \ No newline at end of file