diff --git a/Prototype/Assets/Prefabs/goodSmile2.prefab b/Prototype/Assets/Prefabs/goodSmile2.prefab index 24b7c85..bb07b71 100644 --- a/Prototype/Assets/Prefabs/goodSmile2.prefab +++ b/Prototype/Assets/Prefabs/goodSmile2.prefab @@ -53,8 +53,8 @@ Transform: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1111747923641672} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 2.13, y: 1.213, z: 0} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 1.519425, y: 1.4104863, z: 0} m_LocalScale: {x: 0.2, y: 0.2, z: 0.20000002} m_Children: - {fileID: 4575707645286520} @@ -89,7 +89,7 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RenderingLayerMask: 4294967295 m_Materials: - - {fileID: 2100000, guid: f3b3738fb3608024ba94712d4daf62c3, type: 2} + - {fileID: 2100000, guid: 4f30c1adb9ec5c849b36746e980649a6, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -163,6 +163,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: gameController: {fileID: 0} + objectGoodSmile: {fileID: 1977251435392318} goodSmile: {fileID: 21300000, guid: a2bd550470c31e845b6c26f543e9e582, type: 3} badSmile: {fileID: 21300000, guid: caf166d1667cea7438d3a73945735d13, type: 3} goldSmile: {fileID: 21300000, guid: 9f9e496e96effc64486d79e3e6066ffa, type: 3} @@ -182,7 +183,7 @@ SpriteRenderer: m_ReflectionProbeUsage: 1 m_RenderingLayerMask: 4294967295 m_Materials: - - {fileID: 2100000, guid: c57af84aa93d7d34780f73276605b2a4, type: 2} + - {fileID: 0} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -202,7 +203,7 @@ SpriteRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_Sprite: {fileID: 21300000, guid: a2bd550470c31e845b6c26f543e9e582, type: 3} + m_Sprite: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 @@ -210,6 +211,6 @@ SpriteRenderer: m_Size: {x: 5.12, y: 5.12} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 + m_WasSpriteAssigned: 0 m_MaskInteraction: 0 m_SpriteSortPoint: 0 diff --git a/Prototype/Assets/Scenes/Play.unity b/Prototype/Assets/Scenes/Play.unity index d4230bb..945d9a6 100644 --- a/Prototype/Assets/Scenes/Play.unity +++ b/Prototype/Assets/Scenes/Play.unity @@ -52,8 +52,8 @@ LightmapSettings: m_AlbedoBoost: 1 m_TemporalCoherenceThreshold: 1 m_EnvironmentLightingMode: 0 - m_EnableBakedLightmaps: 0 - m_EnableRealtimeLightmaps: 0 + m_EnableBakedLightmaps: 1 + m_EnableRealtimeLightmaps: 1 m_LightmapEditorSettings: serializedVersion: 10 m_Resolution: 2 @@ -580,7 +580,7 @@ Light: m_Strength: 1 m_Bias: 0.2 m_NormalBias: 0.4 - m_NearPlane: 0.2 + m_NearPlane: 0.1 m_Cookie: {fileID: 0} m_DrawHalo: 0 m_Flare: {fileID: 0} @@ -602,13 +602,13 @@ Transform: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 736968034} - m_LocalRotation: {x: 0.4216722, y: -0.50462663, z: -0.028261488, w: 0.75282514} - m_LocalPosition: {x: 3, y: 0.19, z: -0.02} + m_LocalRotation: {x: 0.1464465, y: -0.3535538, z: 0.3535533, w: 0.8535533} + m_LocalPosition: {x: 3.53, y: 5.53, z: -0.76} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} m_RootOrder: 4 - m_LocalEulerAnglesHint: {x: 37.327003, y: -80.219, z: -36.065002} + m_LocalEulerAnglesHint: {x: 30.000002, y: -35.264, z: 35.264} --- !u!1 &809035882 GameObject: m_ObjectHideFlags: 0 diff --git a/Prototype/Assets/Scripts/CntrlSmile.cs b/Prototype/Assets/Scripts/CntrlSmile.cs index 3816103..8965b14 100644 --- a/Prototype/Assets/Scripts/CntrlSmile.cs +++ b/Prototype/Assets/Scripts/CntrlSmile.cs @@ -5,9 +5,7 @@ public class CntrlSmile : MonoBehaviour { public GameController gameController; - public Sprite goodSmile; - public Sprite badSmile; - public Sprite goldSmile; + public GameObject objectGoodSmile; public bool isGold = false; private float speed, tilt; @@ -27,22 +25,25 @@ private void Start() void Update() { transform.position = Vector3.MoveTowards(transform.position, target, Time.deltaTime * speed); - transform.Rotate(Vector3.back * tilt); + objectGoodSmile.transform.Rotate(Vector3.back * tilt); if (localScore % randomAngerActivator == 0 && localScore != 0) { isAnger = true; tilt = Random.Range(-10, 10); - GetComponent().sprite = badSmile; + objectGoodSmile.GetComponent().material.SetColor("_Color", Color.red + Color.black); + //GetComponent().sprite = badSmile; } else if (isAnger == false) { if (isGold) { - GetComponent().sprite = goldSmile; + objectGoodSmile.GetComponent().material.SetColor("_Color", Color.yellow ); + //GetComponent().sprite = goldSmile; } else { - GetComponent().sprite = goodSmile; + objectGoodSmile.GetComponent().material.SetColor("_Color", Color.gray + Color.black); + //GetComponent().sprite = goodSmile; } } diff --git a/Prototype/Assets/ToonShader/Demo/Materials/ShadowReceiver.mat b/Prototype/Assets/ToonShader/Demo/Materials/ShadowReceiver.mat index 241f638..467d57a 100644 --- a/Prototype/Assets/ToonShader/Demo/Materials/ShadowReceiver.mat +++ b/Prototype/Assets/ToonShader/Demo/Materials/ShadowReceiver.mat @@ -12,66 +12,12 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2001 + m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] m_SavedProperties: serializedVersion: 3 - m_TexEnvs: - - _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_TexEnvs: [] m_Floats: - - _Alpha: 0.5 - - _BumpScale: 1 - - _Cutoff: 0.5 - - _DetailNormalMapScale: 1 - - _DstBlend: 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: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _Alpha: 1 + m_Colors: [] diff --git a/Prototype/Assets/ToonShader/Demo/Materials/ToonCornflower.mat b/Prototype/Assets/ToonShader/Demo/Materials/ToonCornflower.mat index cc5fa2a..c2956bd 100644 --- a/Prototype/Assets/ToonShader/Demo/Materials/ToonCornflower.mat +++ b/Prototype/Assets/ToonShader/Demo/Materials/ToonCornflower.mat @@ -5,8 +5,7 @@ Material: serializedVersion: 6 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} + m_PrefabInternal: {fileID: 0} m_Name: ToonCornflower m_Shader: {fileID: 4800000, guid: 99bb36e9d2c76874e8e8e2baed6debca, type: 3} m_ShaderKeywords: @@ -67,7 +66,7 @@ Material: - _Mode: 0 - _OcclusionStrength: 1 - _Parallax: 0.02 - - _RimAmount: 0.716 + - _RimAmount: 0.5 - _RimThreshold: 0.1 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 @@ -76,7 +75,7 @@ Material: - _ZWrite: 1 m_Colors: - _AmbientColor: {r: 0.4, g: 0.4, b: 0.4, a: 1} - - _Color: {r: 0.49803925, g: 0.6489124, b: 1, a: 1} + - _Color: {r: 0.6, g: 0.3, b: 0.2, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _RimColor: {r: 1, g: 1, b: 1, a: 1} - _SpecularColor: {r: 0.9, g: 0.9, b: 0.9, a: 1} diff --git a/Prototype/Assets/ToonShader/Demo/Materials/ToonGlossy.mat b/Prototype/Assets/ToonShader/Demo/Materials/ToonGlossy.mat index abc07b8..6833adb 100644 --- a/Prototype/Assets/ToonShader/Demo/Materials/ToonGlossy.mat +++ b/Prototype/Assets/ToonShader/Demo/Materials/ToonGlossy.mat @@ -66,7 +66,7 @@ Material: - _Mode: 0 - _OcclusionStrength: 1 - _Parallax: 0.02 - - _RimAmount: 0.569 + - _RimAmount: 0.5 - _RimThreshold: 0 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 @@ -75,7 +75,7 @@ Material: - _ZWrite: 1 m_Colors: - _AmbientColor: {r: 0.4, g: 0.4, b: 0.4, a: 1} - - _Color: {r: 0.6509434, g: 0.532077, b: 0.08904416, a: 1} + - _Color: {r: 0.627451, g: 0.3529412, b: 0.15686275, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _RimColor: {r: 2, g: 2, b: 2, a: 1} - _SpecularColor: {r: 4.2870936, g: 4.2870936, b: 4.2870936, a: 1} diff --git a/Prototype/Library/CurrentLayout.dwlt b/Prototype/Library/CurrentLayout.dwlt index 3ea54f8..3b369de 100644 --- a/Prototype/Library/CurrentLayout.dwlt +++ b/Prototype/Library/CurrentLayout.dwlt @@ -20,7 +20,7 @@ MonoBehaviour: m_ShowMode: 4 m_Title: m_RootView: {fileID: 7} - m_MinSize: {x: 950, y: 300} + m_MinSize: {x: 950, y: 542} m_MaxSize: {x: 10000, y: 10000} --- !u!114 &2 MonoBehaviour: @@ -36,12 +36,12 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 1042 + x: 1033 y: 0 - width: 529 - height: 676 - m_MinSize: {x: 204, y: 221} - m_MaxSize: {x: 4004, y: 4021} + width: 528 + height: 607 + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 20} m_Panes: - {fileID: 20} @@ -67,10 +67,10 @@ MonoBehaviour: y: 30 width: 1920 height: 947 - m_MinSize: {x: 887, y: 492} - m_MaxSize: {x: 16012, y: 14042} + m_MinSize: {x: 881, y: 492} + m_MaxSize: {x: 16006, y: 14042} vertical: 0 - controlID: 92 + controlID: 74 --- !u!114 &4 MonoBehaviour: m_ObjectHideFlags: 52 @@ -85,9 +85,9 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 1571 + x: 1561 y: 0 - width: 349 + width: 359 height: 947 m_MinSize: {x: 277, y: 71} m_MaxSize: {x: 4002, y: 4021} @@ -112,8 +112,8 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 255 - height: 676 + width: 253 + height: 607 m_MinSize: {x: 200, y: 200} m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 18} @@ -136,9 +136,9 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 676 - width: 1571 - height: 271 + y: 607 + width: 1561 + height: 340 m_MinSize: {x: 232, y: 271} m_MaxSize: {x: 10002, y: 10021} m_ActualView: {fileID: 16} @@ -230,12 +230,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1571 + width: 1561 height: 947 - m_MinSize: {x: 610, y: 492} - m_MaxSize: {x: 12010, y: 14042} + m_MinSize: {x: 604, y: 492} + m_MaxSize: {x: 12004, y: 14042} vertical: 1 - controlID: 93 + controlID: 75 --- !u!114 &11 MonoBehaviour: m_ObjectHideFlags: 52 @@ -255,12 +255,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1571 - height: 676 - m_MinSize: {x: 610, y: 221} - m_MaxSize: {x: 12010, y: 4021} + width: 1561 + height: 607 + m_MinSize: {x: 604, y: 221} + m_MaxSize: {x: 12004, y: 4021} vertical: 0 - controlID: 94 + controlID: 76 --- !u!114 &12 MonoBehaviour: m_ObjectHideFlags: 52 @@ -275,10 +275,10 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 255 + x: 253 y: 0 - width: 787 - height: 676 + width: 780 + height: 607 m_MinSize: {x: 204, y: 221} m_MaxSize: {x: 4004, y: 4021} m_ActualView: {fileID: 19} @@ -372,14 +372,14 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 763 - width: 1584 - height: 255 + y: 699 + width: 1559 + height: 319 m_PersistentViewDataDictionary: {fileID: 0} m_AnimEditor: {fileID: 0} m_LockTracker: m_IsLocked: 0 - m_LastSelectedObjectID: 12070 + m_LastSelectedObjectID: -306956 --- !u!114 &15 MonoBehaviour: m_ObjectHideFlags: 52 @@ -426,9 +426,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 768 - width: 1569 - height: 250 + y: 699 + width: 1559 + height: 319 m_PersistentViewDataDictionary: {fileID: 0} m_SearchFilter: m_NameFilter: @@ -442,34 +442,34 @@ MonoBehaviour: m_ShowAllHits: 0 m_SearchArea: 1 m_Folders: - - Assets/Objects + - Assets/Prefabs m_ViewMode: 1 m_StartGridSize: 64 m_LastFolders: - - Assets/Objects + - Assets/Prefabs m_LastFoldersGridSize: -1 m_LastProjectPath: D:\Documents\Prototype\Prototype m_LockTracker: m_IsLocked: 0 m_FolderTreeState: - scrollPos: {x: 0, y: 11} - m_SelectedIDs: be2a0000 - m_LastClickedID: 10942 - m_ExpandedIDs: 00000000fe29000000ca9a3b + scrollPos: {x: 0, y: 6} + m_SelectedIDs: 5c2c0000 + m_LastClickedID: 11356 + m_ExpandedIDs: 00000000f2290000ee2b0000282c000000ca9a3b m_RenameOverlay: m_UserAcceptedRename: 0 - m_Name: Scripts - m_OriginalName: Scripts + m_Name: + m_OriginalName: m_EditFieldRect: serializedVersion: 2 x: 0 y: 0 width: 0 height: 0 - m_UserData: 11502 + m_UserData: 0 m_IsWaitingForDelay: 0 m_IsRenaming: 0 - m_OriginalEventType: 0 + m_OriginalEventType: 11 m_IsRenamingFilename: 1 m_ClientGUIView: {fileID: 6} m_SearchString: @@ -483,7 +483,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 00000000fe290000 + m_ExpandedIDs: 00000000f2290000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -511,7 +511,7 @@ MonoBehaviour: m_SelectedInstanceIDs: m_LastClickedInstanceID: 0 m_HadKeyboardFocusLastEvent: 1 - m_ExpandedInstanceIDs: c623000000700200000000007c260000448ef7ff342b0000 + m_ExpandedInstanceIDs: c623000000700200000000007c260000448ef7ff342b0000a02a0000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -558,9 +558,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 1573 + x: 1563 y: 92 - width: 347 + width: 357 height: 926 m_PersistentViewDataDictionary: {fileID: 0} m_ObjectsLockedBeforeSerialization: [] @@ -594,14 +594,14 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 92 - width: 253 - height: 655 + width: 251 + height: 586 m_PersistentViewDataDictionary: {fileID: 0} m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: e22c0000 + m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: c627fbffbc3afbff5c4efbff6c52fbff5653fbff1c5ffbff0c61fbfff461fbff100dfcff5234fcffd4d8ffffd6d8ffff82e1ffff14fbffff00000000b6320000ac330000 + m_ExpandedIDs: f650fbff1661fbff7286fbffc4bdfbff64eefbff7e9bfcff28dafcffd273fdffc61effffda20ffffd8e5ffffe4fbffff00000000982d0000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -644,20 +644,20 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 257 + x: 255 y: 92 - width: 783 - height: 655 + width: 776 + height: 586 m_PersistentViewDataDictionary: {fileID: 0} m_SceneLighting: 0 lastFramingTime: 639.0342762 - m_2DMode: 0 + m_2DMode: 1 m_isRotationLocked: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: 1.4818639, y: 1.4605672, z: -0.5137255} + m_Target: {x: -1.3314466, y: -2.994093, z: -2.4767282} speed: 2 - m_Value: {x: 1.4818639, y: 1.4605672, z: -0.5137255} + m_Value: {x: -1.3314466, y: -2.994093, z: -2.4767282} m_RenderMode: 2 m_CameraMode: drawMode: 2 @@ -677,27 +677,27 @@ MonoBehaviour: speed: 2 m_Value: 0 yGrid: - m_Target: 1 - speed: 2 - m_Value: 1 - zGrid: m_Target: 0 speed: 2 m_Value: 0 + zGrid: + m_Target: 1 + speed: 2 + m_Value: 1 m_Rotation: - m_Target: {x: 0.04979137, y: 0.0053963163, z: -0.00026912946, w: 0.998745} + m_Target: {x: 0, y: 0, z: 0, w: 1} speed: 2 - m_Value: {x: 0.04979137, y: 0.0053963163, z: -0.00026912946, w: 0.998745} + m_Value: {x: 0, y: 0, z: 0, w: 1} m_Size: - m_Target: 12.475426 + m_Target: 11.590765 speed: 2 - m_Value: 12.475426 + m_Value: 11.590765 m_Ortho: - m_Target: 0 + m_Target: 1 speed: 2 - m_Value: 0 + m_Value: 1 m_ShowGlobalGrid: 1 - m_LastSceneViewRotation: {x: -0.08717229, y: 0.89959055, z: -0.21045254, w: -0.3726226} + m_LastSceneViewRotation: {x: 0.29981273, y: -0.39445835, z: 0.13789852, w: 0.8576123} m_LastSceneViewOrtho: 0 m_ReplacementShader: {fileID: 0} m_ReplacementString: @@ -723,10 +723,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 1044 + x: 1035 y: 92 - width: 525 - height: 655 + width: 524 + height: 586 m_PersistentViewDataDictionary: {fileID: 0} m_MaximizeOnPlay: 0 m_Gizmos: 0 @@ -738,10 +738,10 @@ MonoBehaviour: m_VRangeLocked: 0 hZoomLockedByDefault: 0 vZoomLockedByDefault: 0 - m_HBaseRangeMin: -179.5 - m_HBaseRangeMax: 179.5 - m_VBaseRangeMin: -319 - m_VBaseRangeMax: 319 + m_HBaseRangeMin: -160 + m_HBaseRangeMax: 160 + m_VBaseRangeMin: -284.5 + m_VBaseRangeMax: 284.5 m_HAllowExceedBaseRangeMin: 1 m_HAllowExceedBaseRangeMax: 1 m_VAllowExceedBaseRangeMin: 1 @@ -759,25 +759,25 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 17 - width: 525 - height: 638 + width: 524 + height: 569 m_Scale: {x: 1, y: 1} - m_Translation: {x: 262.5, y: 319} + m_Translation: {x: 262, y: 284.5} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 m_MarginBottom: 0 m_LastShownAreaInsideMargins: serializedVersion: 2 - x: -262.5 - y: -319 - width: 525 - height: 638 + x: -262 + y: -284.5 + width: 524 + height: 569 m_MinimalGUI: 1 m_defaultScale: 1 m_TargetTexture: {fileID: 0} m_CurrentColorSpace: 0 - m_LastWindowPixelSize: {x: 525, y: 655} + m_LastWindowPixelSize: {x: 524, y: 586} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 01000001000100000100 @@ -803,7 +803,7 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 768 - width: 1569 - height: 250 + y: 699 + width: 1559 + height: 319 m_PersistentViewDataDictionary: {fileID: 0} diff --git a/Prototype/Library/LastSceneManagerSetup.txt b/Prototype/Library/LastSceneManagerSetup.txt index 88234d9..3201e86 100644 --- a/Prototype/Library/LastSceneManagerSetup.txt +++ b/Prototype/Library/LastSceneManagerSetup.txt @@ -1,4 +1,4 @@ sceneSetups: -- path: Assets/Scenes/Main menu.unity +- path: Assets/Scenes/Play.unity isLoaded: 1 isActive: 1 diff --git a/Prototype/Library/ScriptAssemblies/Assembly-CSharp.dll b/Prototype/Library/ScriptAssemblies/Assembly-CSharp.dll index b3a02e1..52f769f 100644 Binary files a/Prototype/Library/ScriptAssemblies/Assembly-CSharp.dll and b/Prototype/Library/ScriptAssemblies/Assembly-CSharp.dll differ diff --git a/Prototype/Library/assetDatabase3 b/Prototype/Library/assetDatabase3 index 157be16..ddbf125 100644 Binary files a/Prototype/Library/assetDatabase3 and b/Prototype/Library/assetDatabase3 differ diff --git a/Prototype/Library/expandedItems b/Prototype/Library/expandedItems index 82eb5b7..1594ca0 100644 Binary files a/Prototype/Library/expandedItems and b/Prototype/Library/expandedItems differ diff --git a/Prototype/Library/metadata/4f/4f30c1adb9ec5c849b36746e980649a6.info b/Prototype/Library/metadata/4f/4f30c1adb9ec5c849b36746e980649a6.info index 37d6291..06321fe 100644 Binary files a/Prototype/Library/metadata/4f/4f30c1adb9ec5c849b36746e980649a6.info and b/Prototype/Library/metadata/4f/4f30c1adb9ec5c849b36746e980649a6.info differ diff --git a/Prototype/Library/metadata/7d/7d181943fa45fee4d934b0f420862447.info b/Prototype/Library/metadata/7d/7d181943fa45fee4d934b0f420862447.info index e34a73e..6dd3e39 100644 Binary files a/Prototype/Library/metadata/7d/7d181943fa45fee4d934b0f420862447.info and b/Prototype/Library/metadata/7d/7d181943fa45fee4d934b0f420862447.info differ diff --git a/Prototype/Library/metadata/f3/f3b3738fb3608024ba94712d4daf62c3.info b/Prototype/Library/metadata/f3/f3b3738fb3608024ba94712d4daf62c3.info index 7568db2..1bdda43 100644 Binary files a/Prototype/Library/metadata/f3/f3b3738fb3608024ba94712d4daf62c3.info and b/Prototype/Library/metadata/f3/f3b3738fb3608024ba94712d4daf62c3.info differ diff --git a/Prototype/Library/metadata/fa/fadd07783bf438e41bd40dc68e79337c b/Prototype/Library/metadata/fa/fadd07783bf438e41bd40dc68e79337c index a60b730..52e228d 100644 Binary files a/Prototype/Library/metadata/fa/fadd07783bf438e41bd40dc68e79337c and b/Prototype/Library/metadata/fa/fadd07783bf438e41bd40dc68e79337c differ diff --git a/Prototype/Library/shadercompiler-UnityShaderCompiler.exe0.log b/Prototype/Library/shadercompiler-UnityShaderCompiler.exe0.log index 1dccaa0..5d8b9a3 100644 --- a/Prototype/Library/shadercompiler-UnityShaderCompiler.exe0.log +++ b/Prototype/Library/shadercompiler-UnityShaderCompiler.exe0.log @@ -1,9 +1,41 @@ Base path: C:/Program Files/Unity/Hub/Editor/2018.2.21f1/Editor/Data Cmd: initializeCompiler -Cmd: compileSnippet - api=4 type=0 insize=3944 outsize=1074 kw=UNITY_PASS_FORWARDBASE DIRECTIONAL pd=UNITY_NO_DXT5nm UNITY_ENABLE_REFLECTION_BUFFERS UNITY_NO_CUBEMAP_ARRAY UNITY_NO_SCREENSPACE_SHADOWS UNITY_PBS_USE_BRDF2 SHADER_API_DESKTOP UNITY_HARDWARE_TIER3 UNITY_COLORSPACE_GAMMA UNITY_LIGHTMAP_DLDR_ENCODING ok=1 -Cmd: compileSnippet - api=4 type=1 insize=3944 outsize=1650 kw=UNITY_PASS_FORWARDBASE DIRECTIONAL pd=UNITY_NO_DXT5nm UNITY_ENABLE_REFLECTION_BUFFERS UNITY_NO_CUBEMAP_ARRAY UNITY_NO_SCREENSPACE_SHADOWS UNITY_PBS_USE_BRDF2 SHADER_API_DESKTOP UNITY_HARDWARE_TIER3 UNITY_COLORSPACE_GAMMA UNITY_LIGHTMAP_DLDR_ENCODING ok=1 +Cmd: initializeCompiler +Cmd: initializeCompiler +Cmd: initializeCompiler +Cmd: initializeCompiler +Cmd: initializeCompiler +Cmd: initializeCompiler +Cmd: initializeCompiler +Cmd: initializeCompiler +Cmd: initializeCompiler +Cmd: initializeCompiler +Cmd: initializeCompiler +Cmd: initializeCompiler +Cmd: initializeCompiler +Cmd: initializeCompiler +Cmd: initializeCompiler +Cmd: initializeCompiler +Cmd: initializeCompiler +Cmd: initializeCompiler +Cmd: initializeCompiler +Cmd: initializeCompiler +Cmd: initializeCompiler +Cmd: initializeCompiler +Cmd: initializeCompiler +Cmd: initializeCompiler +Cmd: initializeCompiler +Cmd: initializeCompiler +Cmd: initializeCompiler +Cmd: initializeCompiler +Cmd: initializeCompiler +Cmd: initializeCompiler +Cmd: initializeCompiler +Cmd: initializeCompiler +Cmd: initializeCompiler +Cmd: initializeCompiler +Cmd: initializeCompiler +Cmd: initializeCompiler Cmd: initializeCompiler Cmd: initializeCompiler Cmd: initializeCompiler