diff --git a/Projects/Corgi1-1/Assets/CorgiEngine/Demos/Minimal/MinimalLevel.unity b/Projects/Corgi1-1/Assets/CorgiEngine/Demos/Minimal/MinimalLevel.unity index 43a414f7..8b16b341 100644 --- a/Projects/Corgi1-1/Assets/CorgiEngine/Demos/Minimal/MinimalLevel.unity +++ b/Projects/Corgi1-1/Assets/CorgiEngine/Demos/Minimal/MinimalLevel.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b00630a81471c4b3533dd5e9c56359b6416e80138364ba843d8751acdfb519bc -size 110592 +oid sha256:036f3c7b9975d4a255d17ab6ac234cb54b23e70d38221dce66dc1a66b25bd1a7 +size 212814 diff --git a/Projects/Corgi1-1/Assets/CorgiEngine/Demos/SuperHipsterBros/Sprites/Materials.meta b/Projects/Corgi1-1/Assets/CorgiEngine/Demos/SuperHipsterBros/Sprites/Materials.meta new file mode 100644 index 00000000..4266229b --- /dev/null +++ b/Projects/Corgi1-1/Assets/CorgiEngine/Demos/SuperHipsterBros/Sprites/Materials.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2aae428dff1b950449fe2d2d30b66564 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Projects/Corgi1-1/Assets/CorgiEngine/Demos/SuperHipsterBros/Sprites/Materials/pipe.mat b/Projects/Corgi1-1/Assets/CorgiEngine/Demos/SuperHipsterBros/Sprites/Materials/pipe.mat new file mode 100644 index 00000000..ed8d9b27 --- /dev/null +++ b/Projects/Corgi1-1/Assets/CorgiEngine/Demos/SuperHipsterBros/Sprites/Materials/pipe.mat @@ -0,0 +1,36 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: pipe + m_Shader: {fileID: 10753, guid: 0000000000000000f000000000000000, type: 0} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _AlphaTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: 09351ad2054c8ea439a94b85c36140e1, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - PixelSnap: 0 + - _EnableExternalAlpha: 0 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _Flip: {r: 1, g: 1, b: 1, a: 1} + - _RendererColor: {r: 1, g: 1, b: 1, a: 1} diff --git a/Projects/Corgi1-1/Assets/CorgiEngine/Demos/SuperHipsterBros/Sprites/Materials/pipe.mat.meta b/Projects/Corgi1-1/Assets/CorgiEngine/Demos/SuperHipsterBros/Sprites/Materials/pipe.mat.meta new file mode 100644 index 00000000..843d4646 --- /dev/null +++ b/Projects/Corgi1-1/Assets/CorgiEngine/Demos/SuperHipsterBros/Sprites/Materials/pipe.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f3d57d8baf7f7d64cbe6e64bf47bdb8d +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Projects/Corgi1-1/Assets/_Materials.meta b/Projects/Corgi1-1/Assets/_Materials.meta new file mode 100644 index 00000000..78000501 --- /dev/null +++ b/Projects/Corgi1-1/Assets/_Materials.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 154a44033d05e904cbe5b9500aac6567 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Projects/Corgi1-1/Assets/_Materials/Sky.mat b/Projects/Corgi1-1/Assets/_Materials/Sky.mat new file mode 100644 index 00000000..5cd30630 --- /dev/null +++ b/Projects/Corgi1-1/Assets/_Materials/Sky.mat @@ -0,0 +1,85 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Sky + m_Shader: {fileID: 10753, guid: 0000000000000000f000000000000000, type: 0} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _AlphaTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - PixelSnap: 0 + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _EnableExternalAlpha: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 0, g: 0.7345291, b: 0.8113208, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _Flip: {r: 1, g: 1, b: 1, a: 1} + - _RendererColor: {r: 1, g: 1, b: 1, a: 1} diff --git a/Projects/Corgi1-1/Assets/_Materials/Sky.mat.meta b/Projects/Corgi1-1/Assets/_Materials/Sky.mat.meta new file mode 100644 index 00000000..0810da88 --- /dev/null +++ b/Projects/Corgi1-1/Assets/_Materials/Sky.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 41b0ba81b76adec458b39bca540c88f8 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Projects/Corgi1-1/Assets/_Prefabs/MinimalGuy.prefab b/Projects/Corgi1-1/Assets/_Prefabs/MinimalGuy.prefab index ecd068f7..f8c037a7 100644 --- a/Projects/Corgi1-1/Assets/_Prefabs/MinimalGuy.prefab +++ b/Projects/Corgi1-1/Assets/_Prefabs/MinimalGuy.prefab @@ -328,7 +328,7 @@ MonoBehaviour: AbilityStartFeedbacks: {fileID: 0} AbilityStopFeedbacks: {fileID: 0} AbilityPermitted: 1 - WalkSpeed: 6 + WalkSpeed: 3.7 MovementSpeedMultiplier: 1 PushSpeedMultiplier: 1 StateSpeedMultiplier: 1 @@ -366,7 +366,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 9097166755155768433} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: d2bb48ea7e7fc4c0fa43dce17235f4f1, type: 3} m_Name: @@ -393,7 +393,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 9097166755155768433} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 157b891c059034cea94ae0c9e235df50, type: 3} m_Name: @@ -410,7 +410,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 9097166755155768433} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 98ba246fa819940cb8f8f89f002bb088, type: 3} m_Name: @@ -435,9 +435,9 @@ MonoBehaviour: AbilityStartFeedbacks: {fileID: 0} AbilityStopFeedbacks: {fileID: 0} AbilityPermitted: 1 - NumberOfJumps: 2 - JumpHeight: 3.025 - JumpRestrictions: 2 + NumberOfJumps: 1 + JumpHeight: 5 + JumpRestrictions: 0 JumpTimeWindow: 0 ResetCameraOffsetOnJump: 0 JumpIsProportionalToThePressTime: 1 @@ -462,7 +462,7 @@ MonoBehaviour: AbilityStartFeedbacks: {fileID: 0} AbilityStopFeedbacks: {fileID: 0} AbilityPermitted: 1 - RunSpeed: 16 + RunSpeed: 9.1 --- !u!114 &7086588647183671927 MonoBehaviour: m_ObjectHideFlags: 0 @@ -470,7 +470,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 9097166755155768433} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 3d37391d2147a467db78bf732ae24daa, type: 3} m_Name: @@ -494,7 +494,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 9097166755155768433} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 4a40489dc31af43749444be35e176198, type: 3} m_Name: @@ -528,7 +528,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 9097166755155768433} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 51d7707613113491a9d85f1caab5837b, type: 3} m_Name: @@ -547,7 +547,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 9097166755155768433} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: eeabffc5d6e694a8287c891288b0a4be, type: 3} m_Name: @@ -564,7 +564,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 9097166755155768433} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: d96ed8ea1ca8048f6a2b90871e211025, type: 3} m_Name: diff --git a/Projects/Corgi1-1/Assets/_Prefabs/PipeTop.prefab b/Projects/Corgi1-1/Assets/_Prefabs/PipeTop.prefab new file mode 100644 index 00000000..3d50582c --- /dev/null +++ b/Projects/Corgi1-1/Assets/_Prefabs/PipeTop.prefab @@ -0,0 +1,109 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &2770726241976323932 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5925717607492138941} + - component: {fileID: 1393652394548093601} + - component: {fileID: 803998763876986503} + m_Layer: 8 + m_Name: PipeTop + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5925717607492138941 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2770726241976323932} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -160, y: 18, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &1393652394548093601 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2770726241976323932} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 21300000, guid: 958b04106a037834f896a2cf243cbe87, type: 3} + m_Color: {r: 0, g: 0.9528302, b: 0.19491257, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 2, y: 2} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!61 &803998763876986503 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2770726241976323932} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0.15} + oldSize: {x: 2, y: 2} + newSize: {x: 2, y: 2} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 2, y: 2} + m_EdgeRadius: 0 diff --git a/Projects/Corgi1-1/Assets/_Prefabs/PipeTop.prefab.meta b/Projects/Corgi1-1/Assets/_Prefabs/PipeTop.prefab.meta new file mode 100644 index 00000000..3765a6fb --- /dev/null +++ b/Projects/Corgi1-1/Assets/_Prefabs/PipeTop.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 2fb043dea26d8c14abb8118952fa42ef +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Projects/Corgi1-1/Assets/_Textures/Base pack/Items/cloud1.asset b/Projects/Corgi1-1/Assets/_Textures/Base pack/Items/cloud1.asset new file mode 100644 index 00000000..183c92eb --- /dev/null +++ b/Projects/Corgi1-1/Assets/_Textures/Base pack/Items/cloud1.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:33d950ad19b378d51caf14fe9f46f1b4147266d99363b096743973cfde79c17d +size 769 diff --git a/Projects/Corgi1-1/Assets/_Textures/Base pack/Items/cloud1.asset.meta b/Projects/Corgi1-1/Assets/_Textures/Base pack/Items/cloud1.asset.meta new file mode 100644 index 00000000..eeccf559 --- /dev/null +++ b/Projects/Corgi1-1/Assets/_Textures/Base pack/Items/cloud1.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 262c4d71fec32af498fae8cebbc17065 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Projects/Corgi1-1/Assets/_Textures/Base pack/Tiles/Ground/Ground.prefab b/Projects/Corgi1-1/Assets/_Textures/Base pack/Tiles/Ground/Ground.prefab index 822853e2..8145116a 100644 --- a/Projects/Corgi1-1/Assets/_Textures/Base pack/Tiles/Ground/Ground.prefab +++ b/Projects/Corgi1-1/Assets/_Textures/Base pack/Tiles/Ground/Ground.prefab @@ -10,7 +10,7 @@ GameObject: m_Component: - component: {fileID: 5174989589272972565} - component: {fileID: 3601193001178899204} - m_Layer: 8 + m_Layer: 31 m_Name: Ground m_TagString: Untagged m_Icon: {fileID: 0} @@ -40,7 +40,7 @@ Grid: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 281833324379396518} m_Enabled: 1 - m_CellSize: {x: 1, y: 1, z: 0} + m_CellSize: {x: 1.0144928, y: 1.0144928, z: 0} m_CellGap: {x: 0, y: 0, z: 0} m_CellLayout: 0 m_CellSwizzle: 0 @@ -55,7 +55,7 @@ GameObject: - component: {fileID: 1777784519082121611} - component: {fileID: 6230333125641773748} - component: {fileID: 1583580793510926626} - m_Layer: 8 + m_Layer: 31 m_Name: Layer1 m_TagString: Untagged m_Icon: {fileID: 0} @@ -85,6 +85,15 @@ Tilemap: m_GameObject: {fileID: 3419449712380456699} m_Enabled: 1 m_Tiles: + - first: {x: -2, y: -4, z: 0} + second: + m_TileIndex: 6 + m_TileSpriteIndex: 6 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_ObjectToInstantiate: {fileID: 0} + m_TileFlags: 1 + m_ColliderType: 1 - first: {x: -1, y: -3, z: 0} second: m_TileIndex: 1 @@ -153,6 +162,8 @@ Tilemap: m_Data: {fileID: 11400000, guid: 549d5152f36916746b1c4eb4bf0f5650, type: 2} - m_RefCount: 1 m_Data: {fileID: 11400000, guid: 924571d971965eb43a74a97e4f8014d1, type: 2} + - m_RefCount: 1 + m_Data: {fileID: 11400000, guid: dd4aaff40a2f5e2419faf790126c537b, type: 2} m_TileSpriteArray: - m_RefCount: 1 m_Data: {fileID: 6744677850816432832, guid: 5a68bcd20594e8945825f46917f79a7a, @@ -171,8 +182,10 @@ Tilemap: - m_RefCount: 1 m_Data: {fileID: -3266854579302559228, guid: 5a68bcd20594e8945825f46917f79a7a, type: 3} + - m_RefCount: 1 + m_Data: {fileID: 21300000, guid: 3e2e0bcd769ab3948902f7c9596546ab, type: 3} m_TileMatrixArray: - - m_RefCount: 6 + - m_RefCount: 7 m_Data: e00: 1 e01: 0 @@ -191,12 +204,14 @@ Tilemap: e32: 0 e33: 1 m_TileColorArray: - - m_RefCount: 6 + - m_RefCount: 7 m_Data: {r: 1, g: 1, b: 1, a: 1} + - m_RefCount: 0 + m_Data: {r: 7.489649e-28, g: 7.489649e-28, b: 7.489649e-28, a: 7.489649e-28} m_AnimationFrameRate: 1 m_Color: {r: 1, g: 1, b: 1, a: 1} - m_Origin: {x: -1, y: -3, z: 0} - m_Size: {x: 3, y: 3, z: 1} + m_Origin: {x: -2, y: -5, z: 0} + m_Size: {x: 4, y: 5, z: 1} m_TileAnchor: {x: 0.5, y: 0.5, z: 0} m_TileOrientation: 0 m_TileOrientationMatrix: @@ -255,7 +270,7 @@ TilemapRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_ChunkSize: {x: 32, y: 32, z: 32} - m_ChunkCullingBounds: {x: 0, y: 0, z: 0} + m_ChunkCullingBounds: {x: 0.007246375, y: 0.007246375, z: 0} m_MaxChunkCount: 16 m_MaxFrameAge: 16 m_SortOrder: 0 diff --git a/Projects/Corgi1-1/Assets/_Textures/Base pack/Tiles/stoneCenter.asset b/Projects/Corgi1-1/Assets/_Textures/Base pack/Tiles/stoneCenter.asset new file mode 100644 index 00000000..d06e463c --- /dev/null +++ b/Projects/Corgi1-1/Assets/_Textures/Base pack/Tiles/stoneCenter.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:994e8a160f457fe98520ce2ebccf69b64f953e55ec83bc9d0f4298f7e3aae1b0 +size 774 diff --git a/Projects/Corgi1-1/Assets/_Textures/Base pack/Tiles/stoneCenter.asset.meta b/Projects/Corgi1-1/Assets/_Textures/Base pack/Tiles/stoneCenter.asset.meta new file mode 100644 index 00000000..6bd2970b --- /dev/null +++ b/Projects/Corgi1-1/Assets/_Textures/Base pack/Tiles/stoneCenter.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: dd4aaff40a2f5e2419faf790126c537b +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Projects/Corgi1-1/Assets/_Textures/Base pack/Tiles/stoneCenter.png.meta b/Projects/Corgi1-1/Assets/_Textures/Base pack/Tiles/stoneCenter.png.meta index af5e12b7..313b52b4 100644 --- a/Projects/Corgi1-1/Assets/_Textures/Base pack/Tiles/stoneCenter.png.meta +++ b/Projects/Corgi1-1/Assets/_Textures/Base pack/Tiles/stoneCenter.png.meta @@ -45,7 +45,7 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 + spritePixelsToUnits: 70 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 @@ -70,6 +70,54 @@ TextureImporter: overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Projects/Corgi1-1/Assets/_Textures/Base pack/Tiles/tiles_spritesheet.png.meta b/Projects/Corgi1-1/Assets/_Textures/Base pack/Tiles/tiles_spritesheet.png.meta index 0b21afce..5bc676c0 100644 --- a/Projects/Corgi1-1/Assets/_Textures/Base pack/Tiles/tiles_spritesheet.png.meta +++ b/Projects/Corgi1-1/Assets/_Textures/Base pack/Tiles/tiles_spritesheet.png.meta @@ -552,7 +552,7 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 70 + spritePixelsToUnits: 69 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 diff --git a/Projects/Corgi1-1/Assets/_Textures/chimney.png b/Projects/Corgi1-1/Assets/_Textures/chimney.png new file mode 100644 index 00000000..7fe09a07 --- /dev/null +++ b/Projects/Corgi1-1/Assets/_Textures/chimney.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d28ddde25caef3c7a96bd78bbe437cdbbbc290fcb466eab883ccb000fec56c34 +size 1071 diff --git a/Projects/Corgi1-1/Assets/_Textures/chimney.png.meta b/Projects/Corgi1-1/Assets/_Textures/chimney.png.meta new file mode 100644 index 00000000..2cdaf0eb --- /dev/null +++ b/Projects/Corgi1-1/Assets/_Textures/chimney.png.meta @@ -0,0 +1,163 @@ +fileFormatVersion: 2 +guid: 958b04106a037834f896a2cf243cbe87 +TextureImporter: + internalIDToNameTable: + - first: + 213: 4932885788753223205 + second: chimney_0 + externalObjects: {} + serializedVersion: 10 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 35 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: + - serializedVersion: 2 + name: chimney_0 + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 70 + height: 70 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 48} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 3a67fe9d74f801d40a1d650b971f78e6 + internalID: 4932885788753223205 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Projects/Corgi1-1/Assets/_Textures/chimneyBody.png b/Projects/Corgi1-1/Assets/_Textures/chimneyBody.png new file mode 100644 index 00000000..21a29afb --- /dev/null +++ b/Projects/Corgi1-1/Assets/_Textures/chimneyBody.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0b2844bcc82ddf7ae648b0e4a1804ec04f52555edc84ff39e1b3d771464ed718 +size 174 diff --git a/Projects/Corgi1-1/Assets/_Textures/chimneyBody.png.meta b/Projects/Corgi1-1/Assets/_Textures/chimneyBody.png.meta new file mode 100644 index 00000000..dd59cf32 --- /dev/null +++ b/Projects/Corgi1-1/Assets/_Textures/chimneyBody.png.meta @@ -0,0 +1,139 @@ +fileFormatVersion: 2 +guid: 68d8acb1b704e8b4c997b19addfe27a6 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 10 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 35 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Projects/Corgi1-1/Assets/_Textures/chimneyLow.png b/Projects/Corgi1-1/Assets/_Textures/chimneyLow.png new file mode 100644 index 00000000..98a66692 --- /dev/null +++ b/Projects/Corgi1-1/Assets/_Textures/chimneyLow.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:61a8a08cf5aa384dbacb83ee5d8869f04556978696108ab8308a73b46ae4190d +size 1079 diff --git a/Projects/Corgi1-1/Assets/_Textures/chimneyLow.png.meta b/Projects/Corgi1-1/Assets/_Textures/chimneyLow.png.meta new file mode 100644 index 00000000..81f86e4c --- /dev/null +++ b/Projects/Corgi1-1/Assets/_Textures/chimneyLow.png.meta @@ -0,0 +1,91 @@ +fileFormatVersion: 2 +guid: 9e494e8adad512541bb2edc09aee5996 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 10 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Projects/Corgi1-1/Library/CurrentLayout-default.dwlt b/Projects/Corgi1-1/Library/CurrentLayout-default.dwlt index b740e32f..96528b84 100644 --- a/Projects/Corgi1-1/Library/CurrentLayout-default.dwlt +++ b/Projects/Corgi1-1/Library/CurrentLayout-default.dwlt @@ -1,29 +1,6 @@ %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: 1172 - y: 108 - width: 373.33334 - height: 451.33334 - m_ShowMode: 0 - m_Title: - m_RootView: {fileID: 4} - m_MinSize: {x: 242, y: 220} - m_MaxSize: {x: 4002, y: 4020} ---- !u!114 &2 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -43,60 +20,10 @@ MonoBehaviour: height: 984 m_ShowMode: 4 m_Title: - m_RootView: {fileID: 11} + m_RootView: {fileID: 8} m_MinSize: {x: 950, y: 544} m_MaxSize: {x: 10000, y: 10000} ---- !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: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_Children: [] - m_Position: - serializedVersion: 2 - x: 0 - y: 0 - width: 374 - height: 452 - m_MinSize: {x: 242, y: 220} - m_MaxSize: {x: 4002, y: 4020} - m_ActualView: {fileID: 15} - m_Panes: - - {fileID: 15} - m_Selected: 0 - m_LastSelected: 0 ---- !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: 12010, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_Children: - - {fileID: 3} - m_Position: - serializedVersion: 2 - x: 0 - y: 0 - width: 374 - height: 452 - m_MinSize: {x: 242, y: 220} - m_MaxSize: {x: 4002, y: 4020} - vertical: 0 - controlID: 15274 ---- !u!114 &5 +--- !u!114 &2 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -113,18 +40,18 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1182 + width: 1132 height: 628 m_MinSize: {x: 202, y: 222} m_MaxSize: {x: 4002, y: 4022} - m_ActualView: {fileID: 20} + m_ActualView: {fileID: 16} m_Panes: + - {fileID: 12} - {fileID: 16} - - {fileID: 20} - - {fileID: 21} + - {fileID: 17} m_Selected: 1 m_LastSelected: 2 ---- !u!114 &6 +--- !u!114 &3 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -141,16 +68,16 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 699 - width: 525 + width: 575 height: 235 - m_MinSize: {x: 200, y: 200} - m_MaxSize: {x: 4000, y: 4000} - m_ActualView: {fileID: 19} + m_MinSize: {x: 204, y: 222} + m_MaxSize: {x: 4004, y: 4022} + m_ActualView: {fileID: 15} m_Panes: - - {fileID: 19} + - {fileID: 15} m_Selected: 0 m_LastSelected: 0 ---- !u!114 &7 +--- !u!114 &4 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -163,19 +90,19 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Children: - - {fileID: 9} - {fileID: 6} + - {fileID: 3} m_Position: serializedVersion: 2 - x: 1182 + x: 1132 y: 0 - width: 525 + width: 575 height: 934 - m_MinSize: {x: 279, y: 272} - m_MaxSize: {x: 4004, y: 8022} + m_MinSize: {x: 279, y: 294} + m_MaxSize: {x: 4004, y: 8044} vertical: 1 - controlID: 93 ---- !u!114 &8 + controlID: 89 +--- !u!114 &5 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -188,8 +115,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Children: - - {fileID: 14} - - {fileID: 7} + - {fileID: 11} + - {fileID: 4} m_Position: serializedVersion: 2 x: 0 @@ -199,8 +126,8 @@ MonoBehaviour: m_MinSize: {x: 511, y: 494} m_MaxSize: {x: 14006, y: 14044} vertical: 0 - controlID: 92 ---- !u!114 &9 + controlID: 88 +--- !u!114 &6 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -217,16 +144,16 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 525 + width: 575 height: 699 m_MinSize: {x: 279, y: 72} m_MaxSize: {x: 4004, y: 4022} - m_ActualView: {fileID: 18} + m_ActualView: {fileID: 14} m_Panes: - - {fileID: 18} + - {fileID: 14} m_Selected: 0 m_LastSelected: 1 ---- !u!114 &10 +--- !u!114 &7 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -243,17 +170,17 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 628 - width: 1182 + width: 1132 height: 306 m_MinSize: {x: 232, y: 272} m_MaxSize: {x: 10002, y: 10022} - m_ActualView: {fileID: 17} + m_ActualView: {fileID: 13} m_Panes: - - {fileID: 17} - - {fileID: 22} + - {fileID: 13} + - {fileID: 18} m_Selected: 0 m_LastSelected: 1 ---- !u!114 &11 +--- !u!114 &8 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -266,9 +193,9 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Children: - - {fileID: 12} - - {fileID: 8} - - {fileID: 13} + - {fileID: 9} + - {fileID: 5} + - {fileID: 10} m_Position: serializedVersion: 2 x: 0 @@ -277,7 +204,7 @@ MonoBehaviour: height: 984 m_MinSize: {x: 950, y: 300} m_MaxSize: {x: 10000, y: 10000} ---- !u!114 &12 +--- !u!114 &9 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -299,7 +226,7 @@ MonoBehaviour: m_MinSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0} m_LastLoadedLayoutName: ---- !u!114 &13 +--- !u!114 &10 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -320,7 +247,7 @@ MonoBehaviour: height: 20 m_MinSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0} ---- !u!114 &14 +--- !u!114 &11 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -333,50 +260,19 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Children: - - {fileID: 5} - - {fileID: 10} + - {fileID: 2} + - {fileID: 7} m_Position: serializedVersion: 2 x: 0 y: 0 - width: 1182 + width: 1132 height: 934 m_MinSize: {x: 232, y: 494} m_MaxSize: {x: 10002, y: 14044} vertical: 1 - controlID: 14 ---- !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: 0 - m_Script: {fileID: 11500000, guid: 3f683d99f24875748a6656966ca9cea0, type: 3} - m_Name: - m_EditorClassIdentifier: - m_MinSize: {x: 240, y: 200} - m_MaxSize: {x: 4000, y: 4000} - m_TitleContent: - m_Text: Tile Palette - m_Image: {fileID: 0} - m_Tooltip: - m_Pos: - serializedVersion: 2 - x: 1172 - y: 108 - width: 374 - height: 431 - m_ViewDataDictionary: {fileID: 0} - m_PreviewResizer: - m_CachedPref: 90 - m_ControlHash: 1964396721 - m_PrefName: Preview_TilemapBrushInspector - m_Palette: {fileID: 281833324379396518, guid: f4f7d017c6b17e24393501b20ee89a60, - type: 3} ---- !u!114 &16 + controlID: 67 +--- !u!114 &12 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -402,7 +298,7 @@ MonoBehaviour: width: 1182 height: 609 m_ViewDataDictionary: {fileID: 0} ---- !u!114 &17 +--- !u!114 &13 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -425,7 +321,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 700.6667 - width: 1182 + width: 1132 height: 287 m_ViewDataDictionary: {fileID: 0} m_SearchFilter: @@ -441,20 +337,20 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets/_Textures/Base pack + - Assets/_Textures m_ViewMode: 1 m_StartGridSize: 16 m_LastFolders: - - Assets/_Textures/Base pack + - Assets/_Textures m_LastFoldersGridSize: 16 m_LastProjectPath: D:\DMD 2500 Dev Environment\GitHub\msDMDGames\Projects\Corgi1-1 m_LockTracker: m_IsLocked: 0 m_FolderTreeState: - scrollPos: {x: 0, y: 0} - m_SelectedIDs: 868e0000 - m_LastClickedID: 36486 - m_ExpandedIDs: 00000000843d00004a3e0000a8520000be540000625700005e660000266e00005c760000247700002e780000868e000000ca9a3b + scrollPos: {x: 0, y: 1} + m_SelectedIDs: 76500000 + m_LastClickedID: 20598 + m_ExpandedIDs: 000000007a3d00007650000022520000585200005e54000022680000526f0000e66f0000d0700000ee7f0000f07f000000ca9a3b m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -482,7 +378,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 00000000843d0000be540000266e0000247700002e780000 + m_ExpandedIDs: 000000007a3d00007650000022520000585200005e54000022680000526f0000e66f0000d0700000ee7f0000f07f0000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -510,23 +406,23 @@ MonoBehaviour: m_SelectedInstanceIDs: m_LastClickedInstanceID: 0 m_HadKeyboardFocusLastEvent: 1 - m_ExpandedInstanceIDs: c6230000 + m_ExpandedInstanceIDs: c6230000fa5700001a550000ee70000034a600006e8800006688000070a60000 m_RenameOverlay: m_UserAcceptedRename: 0 - m_Name: Player - m_OriginalName: Player + m_Name: chimney + m_OriginalName: chimney m_EditFieldRect: serializedVersion: 2 x: 0 y: 0 width: 0 height: 0 - m_UserData: 16418 + m_UserData: 34918 m_IsWaitingForDelay: 0 m_IsRenaming: 0 m_OriginalEventType: 0 m_IsRenamingFilename: 1 - m_ClientGUIView: {fileID: 10} + m_ClientGUIView: {fileID: 7} m_CreateAssetUtility: m_EndAction: {fileID: 0} m_InstanceID: 0 @@ -538,7 +434,7 @@ MonoBehaviour: m_GridSize: 16 m_SkipHiddenPackages: 0 m_DirectoriesAreaWidth: 291 ---- !u!114 &18 +--- !u!114 &14 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -559,9 +455,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 1182 + x: 1132 y: 72.66667 - width: 523 + width: 573 height: 680 m_ViewDataDictionary: {fileID: 0} m_OpenAddComponentMenu: 0 @@ -576,7 +472,7 @@ MonoBehaviour: m_PreviewWindow: {fileID: 0} m_LastInspectedObjectInstanceID: -1 m_LastVerticalScrollValue: 0 ---- !u!114 &19 +--- !u!114 &15 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -597,17 +493,17 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 1182 + x: 1132 y: 772 - width: 523 + width: 573 height: 216 m_ViewDataDictionary: {fileID: 0} m_SceneHierarchy: m_TreeViewState: - scrollPos: {x: 0, y: 0} - m_SelectedIDs: 3a850000 - m_LastClickedID: 34106 - m_ExpandedIDs: 042effff2ef9ffff6cfbffff528500005e850000 + scrollPos: {x: 0, y: 105} + m_SelectedIDs: 2043fdff + m_LastClickedID: -179424 + m_ExpandedIDs: 2043fdffe04efdff72fbfffff4ffffff907c0000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -623,7 +519,7 @@ MonoBehaviour: m_IsRenaming: 0 m_OriginalEventType: 11 m_IsRenamingFilename: 0 - m_ClientGUIView: {fileID: 6} + m_ClientGUIView: {fileID: 3} m_SearchString: m_ExpandedScenes: [] m_CurrenRootInstanceID: 0 @@ -631,7 +527,7 @@ MonoBehaviour: m_IsLocked: 0 m_CurrentSortingName: TransformSorting m_WindowGUID: 04d64de681738d141afcd44bebed1917 ---- !u!114 &20 +--- !u!114 &16 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -654,7 +550,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 72.66667 - width: 1182 + width: 1132 height: 609 m_ViewDataDictionary: {fileID: 0} m_ShowContextualTools: 0 @@ -667,9 +563,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: -177.57124, y: 21.823002, z: -241.38281} + m_Target: {x: -163.53363, y: 20.921871, z: -274.67407} speed: 2 - m_Value: {x: -177.57124, y: 21.823002, z: -241.38281} + m_Value: {x: -163.53363, y: 20.921871, z: -274.67407} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -702,9 +598,9 @@ MonoBehaviour: speed: 2 m_Value: {x: 0, y: 0, z: 0, w: 1} m_Size: - m_Target: 17.769402 + m_Target: 17.997185 speed: 2 - m_Value: 17.004211 + m_Value: 17.997185 m_Ortho: m_Target: 1 speed: 2 @@ -730,7 +626,7 @@ MonoBehaviour: m_SceneVisActive: 1 m_LastLockedObject: {fileID: 0} m_ViewIsLockedToObject: 0 ---- !u!114 &21 +--- !u!114 &17 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -753,7 +649,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 72.66667 - width: 1182 + width: 1132 height: 609 m_ViewDataDictionary: {fileID: 0} m_VSyncEnabled: 0 @@ -767,8 +663,8 @@ MonoBehaviour: m_VRangeLocked: 0 hZoomLockedByDefault: 0 vZoomLockedByDefault: 0 - m_HBaseRangeMin: -591 - m_HBaseRangeMax: 591 + m_HBaseRangeMin: -566 + m_HBaseRangeMax: 566 m_VBaseRangeMin: -296 m_VBaseRangeMax: 296 m_HAllowExceedBaseRangeMin: 1 @@ -788,30 +684,30 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 17 - width: 1182 + width: 1132 height: 592 m_Scale: {x: 1, y: 1} - m_Translation: {x: 591, y: 296} + m_Translation: {x: 566, y: 296} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 m_MarginBottom: 0 m_LastShownAreaInsideMargins: serializedVersion: 2 - x: -591 + x: -566 y: -296 - width: 1182 + width: 1132 height: 592 m_MinimalGUI: 1 m_defaultScale: 1 m_TargetTexture: {fileID: 0} m_CurrentColorSpace: 0 - m_LastWindowPixelSize: {x: 1773, y: 913.5} + m_LastWindowPixelSize: {x: 1698, y: 913.5} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 00000000000000000000 m_XRRenderMode: 0 ---- !u!114 &22 +--- !u!114 &18 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} diff --git a/Projects/Corgi1-1/Library/GridBrush/UnityEditor.Tilemaps.GridBrush.asset b/Projects/Corgi1-1/Library/GridBrush/UnityEditor.Tilemaps.GridBrush.asset index 18d83c97..a9a65d58 100644 --- a/Projects/Corgi1-1/Library/GridBrush/UnityEditor.Tilemaps.GridBrush.asset +++ b/Projects/Corgi1-1/Library/GridBrush/UnityEditor.Tilemaps.GridBrush.asset @@ -13,7 +13,7 @@ MonoBehaviour: m_Name: Default Brush m_EditorClassIdentifier: m_Cells: - - m_Tile: {fileID: 11400000, guid: 8241850dd9cce844ea584e419a872e7e, type: 2} + - m_Tile: {fileID: 11400000, guid: dd4aaff40a2f5e2419faf790126c537b, type: 2} m_Matrix: e00: 1 e01: 0 diff --git a/Projects/Corgi1-1/Library/InspectorExpandedItems.asset b/Projects/Corgi1-1/Library/InspectorExpandedItems.asset index 69767e69..0d103e02 100644 Binary files a/Projects/Corgi1-1/Library/InspectorExpandedItems.asset and b/Projects/Corgi1-1/Library/InspectorExpandedItems.asset differ diff --git a/Projects/Corgi1-1/Library/ShaderCache/0/0aead6e16ad52b1340d79c995adc8af7.bin b/Projects/Corgi1-1/Library/ShaderCache/0/0aead6e16ad52b1340d79c995adc8af7.bin new file mode 100644 index 00000000..732e5d28 Binary files /dev/null and b/Projects/Corgi1-1/Library/ShaderCache/0/0aead6e16ad52b1340d79c995adc8af7.bin differ diff --git a/Projects/Corgi1-1/Library/ShaderCache/6/621bb7cedf74f287424dc550a86e66a2.bin b/Projects/Corgi1-1/Library/ShaderCache/6/621bb7cedf74f287424dc550a86e66a2.bin new file mode 100644 index 00000000..1807195b Binary files /dev/null and b/Projects/Corgi1-1/Library/ShaderCache/6/621bb7cedf74f287424dc550a86e66a2.bin differ diff --git a/Projects/Corgi1-1/Library/ShaderCache/6/628c719e7846cf23eda5d6cf875b9c51.bin b/Projects/Corgi1-1/Library/ShaderCache/6/628c719e7846cf23eda5d6cf875b9c51.bin new file mode 100644 index 00000000..4df3c546 Binary files /dev/null and b/Projects/Corgi1-1/Library/ShaderCache/6/628c719e7846cf23eda5d6cf875b9c51.bin differ diff --git a/Projects/Corgi1-1/Library/ShaderCache/7/7080363396d50a0d1836c299efac9a18.bin b/Projects/Corgi1-1/Library/ShaderCache/7/7080363396d50a0d1836c299efac9a18.bin new file mode 100644 index 00000000..2997f484 Binary files /dev/null and b/Projects/Corgi1-1/Library/ShaderCache/7/7080363396d50a0d1836c299efac9a18.bin differ diff --git a/Projects/Corgi1-1/Library/ShaderCache/EditorEncounteredVariants b/Projects/Corgi1-1/Library/ShaderCache/EditorEncounteredVariants index 5e0d8103..9609f996 100644 Binary files a/Projects/Corgi1-1/Library/ShaderCache/EditorEncounteredVariants and b/Projects/Corgi1-1/Library/ShaderCache/EditorEncounteredVariants differ diff --git a/Projects/Corgi1-1/Library/ShaderCache/a/abd0951e492f858ec28f5138482d025d.bin b/Projects/Corgi1-1/Library/ShaderCache/a/abd0951e492f858ec28f5138482d025d.bin new file mode 100644 index 00000000..ecc27a20 Binary files /dev/null and b/Projects/Corgi1-1/Library/ShaderCache/a/abd0951e492f858ec28f5138482d025d.bin differ diff --git a/Projects/Corgi1-1/Library/ShaderCache/a/af1c853506fa86b7ae7aae6944358a78.bin b/Projects/Corgi1-1/Library/ShaderCache/a/af1c853506fa86b7ae7aae6944358a78.bin new file mode 100644 index 00000000..dd993948 Binary files /dev/null and b/Projects/Corgi1-1/Library/ShaderCache/a/af1c853506fa86b7ae7aae6944358a78.bin differ diff --git a/Projects/Corgi1-1/Library/ShaderCache/b/badcb6636dcd6943d6c70b9248abbdf4.bin b/Projects/Corgi1-1/Library/ShaderCache/b/badcb6636dcd6943d6c70b9248abbdf4.bin new file mode 100644 index 00000000..f52f38d2 Binary files /dev/null and b/Projects/Corgi1-1/Library/ShaderCache/b/badcb6636dcd6943d6c70b9248abbdf4.bin differ diff --git a/Projects/Corgi1-1/Library/ShaderCache/c/cc990becbbf8771e2168ec1444cc7a35.bin b/Projects/Corgi1-1/Library/ShaderCache/c/cc990becbbf8771e2168ec1444cc7a35.bin new file mode 100644 index 00000000..4e6d2155 Binary files /dev/null and b/Projects/Corgi1-1/Library/ShaderCache/c/cc990becbbf8771e2168ec1444cc7a35.bin differ diff --git a/Projects/Corgi1-1/Library/ShaderCache/e/eade34bf5f706c05ed579474e209e745.bin b/Projects/Corgi1-1/Library/ShaderCache/e/eade34bf5f706c05ed579474e209e745.bin new file mode 100644 index 00000000..93c93f47 Binary files /dev/null and b/Projects/Corgi1-1/Library/ShaderCache/e/eade34bf5f706c05ed579474e209e745.bin differ diff --git a/Projects/Corgi1-1/Library/ShaderCache/f/f0fb4b9e8db8ce89ca352122d767b606.bin b/Projects/Corgi1-1/Library/ShaderCache/f/f0fb4b9e8db8ce89ca352122d767b606.bin new file mode 100644 index 00000000..ebdefa20 Binary files /dev/null and b/Projects/Corgi1-1/Library/ShaderCache/f/f0fb4b9e8db8ce89ca352122d767b606.bin differ diff --git a/Projects/Corgi1-1/Library/StateCache/Hierarchy/04d64d-ce6c6990487ae694da.json b/Projects/Corgi1-1/Library/StateCache/Hierarchy/04d64d-ce6c6990487ae694da.json new file mode 100644 index 00000000..60dd7fe8 --- /dev/null +++ b/Projects/Corgi1-1/Library/StateCache/Hierarchy/04d64d-ce6c6990487ae694da.json @@ -0,0 +1 @@ +{"m_ExpandedPrefabGameObjectFileIDs":[],"m_ExpandedSceneGameObjectInstanceIDs":[],"m_ScrollY":0.0,"m_LastClickedFileID":9097166755155768433,"m_LastClickedInstanceID":0} \ No newline at end of file diff --git a/Projects/Corgi1-1/Library/StateCache/SceneView/406314-ce6c6990487ae694da.json b/Projects/Corgi1-1/Library/StateCache/SceneView/406314-ce6c6990487ae694da.json new file mode 100644 index 00000000..662e84b7 --- /dev/null +++ b/Projects/Corgi1-1/Library/StateCache/SceneView/406314-ce6c6990487ae694da.json @@ -0,0 +1 @@ +{"cameraMode":{"drawMode":0,"name":"Shaded","section":"Shading Mode"},"sceneLighting":false,"audioPlay":false,"sceneViewState":{"showFog":true,"showMaterialUpdate":false,"showSkybox":false,"showFlares":true,"showImageEffects":true,"showParticleSystems":true},"in2DMode":true,"pivot":{"x":-73.31489562988281,"y":-5.901524543762207,"z":-19.17156410217285},"rotation":{"x":0.0,"y":0.0,"z":0.0,"w":1.0},"size":3.048262119293213,"orthographic":true} \ No newline at end of file diff --git a/Projects/Corgi1-1/Library/StateCache/SceneView/406314-mainStage.json b/Projects/Corgi1-1/Library/StateCache/SceneView/406314-mainStage.json index 4f90723a..175e7303 100644 --- a/Projects/Corgi1-1/Library/StateCache/SceneView/406314-mainStage.json +++ b/Projects/Corgi1-1/Library/StateCache/SceneView/406314-mainStage.json @@ -1 +1 @@ -{"cameraMode":{"drawMode":0,"name":"Shaded","section":"Shading Mode"},"sceneLighting":true,"audioPlay":false,"sceneViewState":{"showFog":true,"showMaterialUpdate":false,"showSkybox":true,"showFlares":true,"showImageEffects":true,"showParticleSystems":true},"in2DMode":true,"pivot":{"x":-177.5712432861328,"y":21.823001861572267,"z":-241.3828125},"rotation":{"x":0.0,"y":0.0,"z":0.0,"w":1.0},"size":17.76940155029297,"orthographic":true} \ No newline at end of file +{"cameraMode":{"drawMode":0,"name":"Shaded","section":"Shading Mode"},"sceneLighting":true,"audioPlay":false,"sceneViewState":{"showFog":true,"showMaterialUpdate":false,"showSkybox":true,"showFlares":true,"showImageEffects":true,"showParticleSystems":true},"in2DMode":true,"pivot":{"x":-163.53363037109376,"y":20.921871185302736,"z":-274.674072265625},"rotation":{"x":0.0,"y":0.0,"z":0.0,"w":1.0},"size":17.99718475341797,"orthographic":true} \ No newline at end of file diff --git a/Projects/Corgi1-1/Library/assetDatabase3 b/Projects/Corgi1-1/Library/assetDatabase3 index af330b21..359c3877 100644 Binary files a/Projects/Corgi1-1/Library/assetDatabase3 and b/Projects/Corgi1-1/Library/assetDatabase3 differ diff --git a/Projects/Corgi1-1/Library/expandedItems b/Projects/Corgi1-1/Library/expandedItems index ceef6fab..1cba3791 100644 Binary files a/Projects/Corgi1-1/Library/expandedItems and b/Projects/Corgi1-1/Library/expandedItems differ diff --git a/Projects/Corgi1-1/Library/metadata/15/154a44033d05e904cbe5b9500aac6567 b/Projects/Corgi1-1/Library/metadata/15/154a44033d05e904cbe5b9500aac6567 new file mode 100644 index 00000000..fd46e8c5 Binary files /dev/null and b/Projects/Corgi1-1/Library/metadata/15/154a44033d05e904cbe5b9500aac6567 differ diff --git a/Projects/Corgi1-1/Library/metadata/15/154a44033d05e904cbe5b9500aac6567.info b/Projects/Corgi1-1/Library/metadata/15/154a44033d05e904cbe5b9500aac6567.info new file mode 100644 index 00000000..0f943ce9 Binary files /dev/null and b/Projects/Corgi1-1/Library/metadata/15/154a44033d05e904cbe5b9500aac6567.info differ diff --git a/Projects/Corgi1-1/Library/metadata/26/262c4d71fec32af498fae8cebbc17065 b/Projects/Corgi1-1/Library/metadata/26/262c4d71fec32af498fae8cebbc17065 new file mode 100644 index 00000000..a939520b Binary files /dev/null and b/Projects/Corgi1-1/Library/metadata/26/262c4d71fec32af498fae8cebbc17065 differ diff --git a/Projects/Corgi1-1/Library/metadata/26/262c4d71fec32af498fae8cebbc17065.info b/Projects/Corgi1-1/Library/metadata/26/262c4d71fec32af498fae8cebbc17065.info new file mode 100644 index 00000000..c5cbe308 Binary files /dev/null and b/Projects/Corgi1-1/Library/metadata/26/262c4d71fec32af498fae8cebbc17065.info differ diff --git a/Projects/Corgi1-1/Library/metadata/2a/2aae428dff1b950449fe2d2d30b66564 b/Projects/Corgi1-1/Library/metadata/2a/2aae428dff1b950449fe2d2d30b66564 new file mode 100644 index 00000000..60fa0a41 Binary files /dev/null and b/Projects/Corgi1-1/Library/metadata/2a/2aae428dff1b950449fe2d2d30b66564 differ diff --git a/Projects/Corgi1-1/Library/metadata/2a/2aae428dff1b950449fe2d2d30b66564.info b/Projects/Corgi1-1/Library/metadata/2a/2aae428dff1b950449fe2d2d30b66564.info new file mode 100644 index 00000000..c0756757 Binary files /dev/null and b/Projects/Corgi1-1/Library/metadata/2a/2aae428dff1b950449fe2d2d30b66564.info differ diff --git a/Projects/Corgi1-1/Library/metadata/2f/2fb043dea26d8c14abb8118952fa42ef b/Projects/Corgi1-1/Library/metadata/2f/2fb043dea26d8c14abb8118952fa42ef new file mode 100644 index 00000000..026546e5 Binary files /dev/null and b/Projects/Corgi1-1/Library/metadata/2f/2fb043dea26d8c14abb8118952fa42ef differ diff --git a/Projects/Corgi1-1/Library/metadata/2f/2fb043dea26d8c14abb8118952fa42ef.info b/Projects/Corgi1-1/Library/metadata/2f/2fb043dea26d8c14abb8118952fa42ef.info new file mode 100644 index 00000000..9fc706e8 Binary files /dev/null and b/Projects/Corgi1-1/Library/metadata/2f/2fb043dea26d8c14abb8118952fa42ef.info differ diff --git a/Projects/Corgi1-1/Library/metadata/3e/3e2e0bcd769ab3948902f7c9596546ab b/Projects/Corgi1-1/Library/metadata/3e/3e2e0bcd769ab3948902f7c9596546ab index 19ba0a71..0530b9ad 100644 Binary files a/Projects/Corgi1-1/Library/metadata/3e/3e2e0bcd769ab3948902f7c9596546ab and b/Projects/Corgi1-1/Library/metadata/3e/3e2e0bcd769ab3948902f7c9596546ab differ diff --git a/Projects/Corgi1-1/Library/metadata/41/41b0ba81b76adec458b39bca540c88f8 b/Projects/Corgi1-1/Library/metadata/41/41b0ba81b76adec458b39bca540c88f8 new file mode 100644 index 00000000..6fd8baca Binary files /dev/null and b/Projects/Corgi1-1/Library/metadata/41/41b0ba81b76adec458b39bca540c88f8 differ diff --git a/Projects/Corgi1-1/Library/metadata/41/41b0ba81b76adec458b39bca540c88f8.info b/Projects/Corgi1-1/Library/metadata/41/41b0ba81b76adec458b39bca540c88f8.info new file mode 100644 index 00000000..749a6e99 Binary files /dev/null and b/Projects/Corgi1-1/Library/metadata/41/41b0ba81b76adec458b39bca540c88f8.info differ diff --git a/Projects/Corgi1-1/Library/metadata/5a/5a68bcd20594e8945825f46917f79a7a b/Projects/Corgi1-1/Library/metadata/5a/5a68bcd20594e8945825f46917f79a7a index f46bd86c..1996cac9 100644 Binary files a/Projects/Corgi1-1/Library/metadata/5a/5a68bcd20594e8945825f46917f79a7a and b/Projects/Corgi1-1/Library/metadata/5a/5a68bcd20594e8945825f46917f79a7a differ diff --git a/Projects/Corgi1-1/Library/metadata/68/68d8acb1b704e8b4c997b19addfe27a6 b/Projects/Corgi1-1/Library/metadata/68/68d8acb1b704e8b4c997b19addfe27a6 new file mode 100644 index 00000000..b7690c47 Binary files /dev/null and b/Projects/Corgi1-1/Library/metadata/68/68d8acb1b704e8b4c997b19addfe27a6 differ diff --git a/Projects/Corgi1-1/Library/metadata/68/68d8acb1b704e8b4c997b19addfe27a6.info b/Projects/Corgi1-1/Library/metadata/68/68d8acb1b704e8b4c997b19addfe27a6.info new file mode 100644 index 00000000..7175c245 Binary files /dev/null and b/Projects/Corgi1-1/Library/metadata/68/68d8acb1b704e8b4c997b19addfe27a6.info differ diff --git a/Projects/Corgi1-1/Library/metadata/95/958b04106a037834f896a2cf243cbe87 b/Projects/Corgi1-1/Library/metadata/95/958b04106a037834f896a2cf243cbe87 new file mode 100644 index 00000000..0033ceca Binary files /dev/null and b/Projects/Corgi1-1/Library/metadata/95/958b04106a037834f896a2cf243cbe87 differ diff --git a/Projects/Corgi1-1/Library/metadata/95/958b04106a037834f896a2cf243cbe87.info b/Projects/Corgi1-1/Library/metadata/95/958b04106a037834f896a2cf243cbe87.info new file mode 100644 index 00000000..71313503 Binary files /dev/null and b/Projects/Corgi1-1/Library/metadata/95/958b04106a037834f896a2cf243cbe87.info differ diff --git a/Projects/Corgi1-1/Library/metadata/9e/9e494e8adad512541bb2edc09aee5996 b/Projects/Corgi1-1/Library/metadata/9e/9e494e8adad512541bb2edc09aee5996 new file mode 100644 index 00000000..2a3802c5 Binary files /dev/null and b/Projects/Corgi1-1/Library/metadata/9e/9e494e8adad512541bb2edc09aee5996 differ diff --git a/Projects/Corgi1-1/Library/metadata/9e/9e494e8adad512541bb2edc09aee5996.info b/Projects/Corgi1-1/Library/metadata/9e/9e494e8adad512541bb2edc09aee5996.info new file mode 100644 index 00000000..094ab769 Binary files /dev/null and b/Projects/Corgi1-1/Library/metadata/9e/9e494e8adad512541bb2edc09aee5996.info differ diff --git a/Projects/Corgi1-1/Library/metadata/ce/ce6c6990487ae694dae005eaaa108861 b/Projects/Corgi1-1/Library/metadata/ce/ce6c6990487ae694dae005eaaa108861 index e5506a07..d0797f7f 100644 Binary files a/Projects/Corgi1-1/Library/metadata/ce/ce6c6990487ae694dae005eaaa108861 and b/Projects/Corgi1-1/Library/metadata/ce/ce6c6990487ae694dae005eaaa108861 differ diff --git a/Projects/Corgi1-1/Library/metadata/ce/ce6c6990487ae694dae005eaaa108861.info b/Projects/Corgi1-1/Library/metadata/ce/ce6c6990487ae694dae005eaaa108861.info index 0dd7be77..9709f1f6 100644 Binary files a/Projects/Corgi1-1/Library/metadata/ce/ce6c6990487ae694dae005eaaa108861.info and b/Projects/Corgi1-1/Library/metadata/ce/ce6c6990487ae694dae005eaaa108861.info differ diff --git a/Projects/Corgi1-1/Library/metadata/dd/dd4aaff40a2f5e2419faf790126c537b b/Projects/Corgi1-1/Library/metadata/dd/dd4aaff40a2f5e2419faf790126c537b new file mode 100644 index 00000000..476fd15d Binary files /dev/null and b/Projects/Corgi1-1/Library/metadata/dd/dd4aaff40a2f5e2419faf790126c537b differ diff --git a/Projects/Corgi1-1/Library/metadata/dd/dd4aaff40a2f5e2419faf790126c537b.info b/Projects/Corgi1-1/Library/metadata/dd/dd4aaff40a2f5e2419faf790126c537b.info new file mode 100644 index 00000000..7859dc47 Binary files /dev/null and b/Projects/Corgi1-1/Library/metadata/dd/dd4aaff40a2f5e2419faf790126c537b.info differ diff --git a/Projects/Corgi1-1/Library/metadata/f3/f3d57d8baf7f7d64cbe6e64bf47bdb8d b/Projects/Corgi1-1/Library/metadata/f3/f3d57d8baf7f7d64cbe6e64bf47bdb8d new file mode 100644 index 00000000..eb3f4919 Binary files /dev/null and b/Projects/Corgi1-1/Library/metadata/f3/f3d57d8baf7f7d64cbe6e64bf47bdb8d differ diff --git a/Projects/Corgi1-1/Library/metadata/f3/f3d57d8baf7f7d64cbe6e64bf47bdb8d.info b/Projects/Corgi1-1/Library/metadata/f3/f3d57d8baf7f7d64cbe6e64bf47bdb8d.info new file mode 100644 index 00000000..14ffceb7 Binary files /dev/null and b/Projects/Corgi1-1/Library/metadata/f3/f3d57d8baf7f7d64cbe6e64bf47bdb8d.info differ diff --git a/Projects/Corgi1-1/Library/metadata/f4/f4f7d017c6b17e24393501b20ee89a60 b/Projects/Corgi1-1/Library/metadata/f4/f4f7d017c6b17e24393501b20ee89a60 index cd6ee275..fd2d117d 100644 Binary files a/Projects/Corgi1-1/Library/metadata/f4/f4f7d017c6b17e24393501b20ee89a60 and b/Projects/Corgi1-1/Library/metadata/f4/f4f7d017c6b17e24393501b20ee89a60 differ diff --git a/Projects/Corgi1-1/Library/metadata/f4/f4f7d017c6b17e24393501b20ee89a60.info b/Projects/Corgi1-1/Library/metadata/f4/f4f7d017c6b17e24393501b20ee89a60.info index 0a4bf806..334f78de 100644 Binary files a/Projects/Corgi1-1/Library/metadata/f4/f4f7d017c6b17e24393501b20ee89a60.info and b/Projects/Corgi1-1/Library/metadata/f4/f4f7d017c6b17e24393501b20ee89a60.info differ diff --git a/Projects/Corgi1-1/Library/shadercompiler-UnityShaderCompiler.exe0.log b/Projects/Corgi1-1/Library/shadercompiler-UnityShaderCompiler.exe0.log index 5d06ca94..91838e95 100644 --- a/Projects/Corgi1-1/Library/shadercompiler-UnityShaderCompiler.exe0.log +++ b/Projects/Corgi1-1/Library/shadercompiler-UnityShaderCompiler.exe0.log @@ -1,2 +1,18 @@ Base path: 'D:/DMD 2500 Dev Environment/2019.2.19f1/Editor/Data', plugins path 'D:/DMD 2500 Dev Environment/2019.2.19f1/Editor/Data/PlaybackEngines' Cmd: initializeCompiler +Cmd: compileSnippet + api=4 type=0 insize=1302 outsize=1414 kw=UNITY_PASS_SHADOWCASTER SHADOWS_DEPTH pd=UNITY_ENABLE_REFLECTION_BUFFERS UNITY_USE_DITHER_MASK_FOR_ALPHABLENDED_SHADOWS UNITY_PBS_USE_BRDF1 UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING UNITY_ENABLE_DETAIL_NORMALMAP SHADER_API_DESKTOP UNITY_COLORSPACE_GAMMA UNITY_LIGHT_PROBE_PROXY_VOLUME UNITY_LIGHTMAP_RGBM_ENCODING ok=1 +Cmd: compileSnippet + api=4 type=1 insize=1302 outsize=218 kw=UNITY_PASS_SHADOWCASTER SHADOWS_DEPTH pd=UNITY_ENABLE_REFLECTION_BUFFERS UNITY_USE_DITHER_MASK_FOR_ALPHABLENDED_SHADOWS UNITY_PBS_USE_BRDF1 UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING UNITY_ENABLE_DETAIL_NORMALMAP SHADER_API_DESKTOP UNITY_COLORSPACE_GAMMA UNITY_LIGHT_PROBE_PROXY_VOLUME UNITY_LIGHTMAP_RGBM_ENCODING ok=1 +Cmd: compileSnippet + api=4 type=0 insize=1596 outsize=1894 kw=UNITY_PASS_FORWARDBASE DIRECTIONAL LIGHTPROBE_SH pd=UNITY_ENABLE_REFLECTION_BUFFERS UNITY_USE_DITHER_MASK_FOR_ALPHABLENDED_SHADOWS UNITY_PBS_USE_BRDF1 UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING UNITY_ENABLE_DETAIL_NORMALMAP SHADER_API_DESKTOP UNITY_COLORSPACE_GAMMA UNITY_LIGHT_PROBE_PROXY_VOLUME UNITY_LIGHTMAP_RGBM_ENCODING ok=1 +Cmd: compileSnippet + api=4 type=1 insize=1596 outsize=6814 kw=UNITY_PASS_FORWARDBASE DIRECTIONAL LIGHTPROBE_SH pd=UNITY_ENABLE_REFLECTION_BUFFERS UNITY_USE_DITHER_MASK_FOR_ALPHABLENDED_SHADOWS UNITY_PBS_USE_BRDF1 UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING UNITY_ENABLE_DETAIL_NORMALMAP SHADER_API_DESKTOP UNITY_COLORSPACE_GAMMA UNITY_LIGHT_PROBE_PROXY_VOLUME UNITY_LIGHTMAP_RGBM_ENCODING ok=1 +Cmd: compileSnippet + api=4 type=0 insize=1596 outsize=1914 kw=UNITY_PASS_FORWARDBASE DIRECTIONAL LIGHTPROBE_SH FOG_EXP2 pd=UNITY_ENABLE_REFLECTION_BUFFERS UNITY_USE_DITHER_MASK_FOR_ALPHABLENDED_SHADOWS UNITY_PBS_USE_BRDF1 UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING UNITY_ENABLE_DETAIL_NORMALMAP SHADER_API_DESKTOP UNITY_COLORSPACE_GAMMA UNITY_LIGHT_PROBE_PROXY_VOLUME UNITY_LIGHTMAP_RGBM_ENCODING ok=1 +Cmd: compileSnippet + api=4 type=1 insize=1596 outsize=7130 kw=UNITY_PASS_FORWARDBASE DIRECTIONAL LIGHTPROBE_SH FOG_EXP2 pd=UNITY_ENABLE_REFLECTION_BUFFERS UNITY_USE_DITHER_MASK_FOR_ALPHABLENDED_SHADOWS UNITY_PBS_USE_BRDF1 UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING UNITY_ENABLE_DETAIL_NORMALMAP SHADER_API_DESKTOP UNITY_COLORSPACE_GAMMA UNITY_LIGHT_PROBE_PROXY_VOLUME UNITY_LIGHTMAP_RGBM_ENCODING ok=1 +Cmd: compileSnippet + api=4 type=0 insize=1454 outsize=1710 kw=UNITY_PASS_FORWARDADD DIRECTIONAL FOG_EXP2 pd=UNITY_ENABLE_REFLECTION_BUFFERS UNITY_USE_DITHER_MASK_FOR_ALPHABLENDED_SHADOWS UNITY_PBS_USE_BRDF1 UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING UNITY_ENABLE_DETAIL_NORMALMAP SHADER_API_DESKTOP UNITY_COLORSPACE_GAMMA UNITY_LIGHT_PROBE_PROXY_VOLUME UNITY_LIGHTMAP_RGBM_ENCODING ok=1 +Cmd: compileSnippet + api=4 type=1 insize=1454 outsize=3646 kw=UNITY_PASS_FORWARDADD DIRECTIONAL FOG_EXP2 pd=UNITY_ENABLE_REFLECTION_BUFFERS UNITY_USE_DITHER_MASK_FOR_ALPHABLENDED_SHADOWS UNITY_PBS_USE_BRDF1 UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING UNITY_ENABLE_DETAIL_NORMALMAP SHADER_API_DESKTOP UNITY_COLORSPACE_GAMMA UNITY_LIGHT_PROBE_PROXY_VOLUME UNITY_LIGHTMAP_RGBM_ENCODING ok=1 diff --git a/Projects/Corgi1-1/Library/shadercompiler-UnityShaderCompiler.exe1.log b/Projects/Corgi1-1/Library/shadercompiler-UnityShaderCompiler.exe1.log index 84b3ef98..f8c5241c 100644 --- a/Projects/Corgi1-1/Library/shadercompiler-UnityShaderCompiler.exe1.log +++ b/Projects/Corgi1-1/Library/shadercompiler-UnityShaderCompiler.exe1.log @@ -1,4 +1,4 @@ Base path: 'D:/DMD 2500 Dev Environment/2019.2.19f1/Editor/Data', plugins path 'D:/DMD 2500 Dev Environment/2019.2.19f1/Editor/Data/PlaybackEngines' Cmd: initializeCompiler Cmd: compileSnippet - api=4 type=0 insize=2295 outsize=858 kw=UNITY_UI_ALPHACLIP pd=UNITY_ENABLE_REFLECTION_BUFFERS UNITY_USE_DITHER_MASK_FOR_ALPHABLENDED_SHADOWS UNITY_PBS_USE_BRDF1 UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING UNITY_ENABLE_DETAIL_NORMALMAP SHADER_API_DESKTOP UNITY_COLORSPACE_GAMMA UNITY_LIGHT_PROBE_PROXY_VOLUME UNITY_LIGHTMAP_RGBM_ENCODING ok=1 + api=4 type=1 insize=11538 outsize=1466 kw=FINALPASS pd=UNITY_ENABLE_REFLECTION_BUFFERS UNITY_USE_DITHER_MASK_FOR_ALPHABLENDED_SHADOWS UNITY_PBS_USE_BRDF1 UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING UNITY_ENABLE_DETAIL_NORMALMAP SHADER_API_DESKTOP UNITY_COLORSPACE_GAMMA UNITY_LIGHT_PROBE_PROXY_VOLUME UNITY_LIGHTMAP_RGBM_ENCODING ok=1 diff --git a/Projects/Corgi1-1/Library/shadercompiler-UnityShaderCompiler.exe2.log b/Projects/Corgi1-1/Library/shadercompiler-UnityShaderCompiler.exe2.log index 96d905f1..7b5d453f 100644 --- a/Projects/Corgi1-1/Library/shadercompiler-UnityShaderCompiler.exe2.log +++ b/Projects/Corgi1-1/Library/shadercompiler-UnityShaderCompiler.exe2.log @@ -1,4 +1,4 @@ Base path: 'D:/DMD 2500 Dev Environment/2019.2.19f1/Editor/Data', plugins path 'D:/DMD 2500 Dev Environment/2019.2.19f1/Editor/Data/PlaybackEngines' Cmd: initializeCompiler Cmd: compileSnippet - api=4 type=1 insize=2295 outsize=542 kw=UNITY_UI_ALPHACLIP pd=UNITY_ENABLE_REFLECTION_BUFFERS UNITY_USE_DITHER_MASK_FOR_ALPHABLENDED_SHADOWS UNITY_PBS_USE_BRDF1 UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING UNITY_ENABLE_DETAIL_NORMALMAP SHADER_API_DESKTOP UNITY_COLORSPACE_GAMMA UNITY_LIGHT_PROBE_PROXY_VOLUME UNITY_LIGHTMAP_RGBM_ENCODING ok=1 + api=4 type=0 insize=11538 outsize=538 kw=FINALPASS pd=UNITY_ENABLE_REFLECTION_BUFFERS UNITY_USE_DITHER_MASK_FOR_ALPHABLENDED_SHADOWS UNITY_PBS_USE_BRDF1 UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING UNITY_ENABLE_DETAIL_NORMALMAP SHADER_API_DESKTOP UNITY_COLORSPACE_GAMMA UNITY_LIGHT_PROBE_PROXY_VOLUME UNITY_LIGHTMAP_RGBM_ENCODING ok=1