diff --git a/Prototype/Assets/Animation/BlackHole.controller b/Prototype/Assets/Animation/BlackHole.controller index 4179246..6992004 100644 --- a/Prototype/Assets/Animation/BlackHole.controller +++ b/Prototype/Assets/Animation/BlackHole.controller @@ -21,31 +21,6 @@ AnimatorController: m_IKPass: 0 m_SyncedLayerAffectsTiming: 0 m_Controller: {fileID: 9100000} ---- !u!1102 &1102488505682959082 -AnimatorState: - serializedVersion: 5 - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_Name: Trans - m_Speed: 1 - m_CycleOffset: 0 - m_Transitions: [] - m_StateMachineBehaviours: [] - m_Position: {x: 50, y: 50, z: 0} - m_IKOnFeet: 0 - m_WriteDefaultValues: 1 - m_Mirror: 0 - m_SpeedParameterActive: 0 - m_MirrorParameterActive: 0 - m_CycleOffsetParameterActive: 0 - m_TimeParameterActive: 0 - m_Motion: {fileID: 7400000, guid: 1bfa418ac91a3974baa9125f9f088fdb, type: 2} - m_Tag: - m_SpeedParameter: - m_MirrorParameter: - m_CycleOffsetParameter: - m_TimeParameter: --- !u!1107 &1107800983886738192 AnimatorStateMachine: serializedVersion: 5 @@ -53,34 +28,14 @@ AnimatorStateMachine: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_Name: Base Layer - m_ChildStates: - - serializedVersion: 1 - m_State: {fileID: 1102488505682959082} - m_Position: {x: 324, y: 204, z: 0} + m_ChildStates: [] m_ChildStateMachines: [] m_AnyStateTransitions: [] - m_EntryTransitions: - - {fileID: 1109480327902700522} + m_EntryTransitions: [] m_StateMachineTransitions: {} m_StateMachineBehaviours: [] m_AnyStatePosition: {x: 50, y: 20, z: 0} m_EntryPosition: {x: 48, y: 120, z: 0} m_ExitPosition: {x: 800, y: 120, z: 0} m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} - m_DefaultState: {fileID: 1102488505682959082} ---- !u!1109 &1109480327902700522 -AnimatorTransition: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_Name: - m_Conditions: - - m_ConditionMode: 3 - m_ConditionEvent: - m_EventTreshold: 0 - m_DstStateMachine: {fileID: 0} - m_DstState: {fileID: 1102488505682959082} - m_Solo: 0 - m_Mute: 0 - m_IsExit: 0 - serializedVersion: 1 + m_DefaultState: {fileID: 0} diff --git a/Prototype/Assets/Scenes/Main menu.unity b/Prototype/Assets/Scenes/Main menu.unity index e27591a..d871d6a 100644 --- a/Prototype/Assets/Scenes/Main menu.unity +++ b/Prototype/Assets/Scenes/Main menu.unity @@ -123,8 +123,9 @@ GameObject: - component: {fileID: 202154160} - component: {fileID: 202154161} - component: {fileID: 202154162} + - component: {fileID: 202154163} m_Layer: 0 - m_Name: 'backgroundButton ' + m_Name: ScoreboardButton m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -219,6 +220,19 @@ BoxCollider2D: serializedVersion: 2 m_Size: {x: 7.5, y: 7.5} m_EdgeRadius: 0 +--- !u!114 &202154163 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 202154159} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6e92c96e95066574aa3130ef9cde1514, type: 3} + m_Name: + m_EditorClassIdentifier: + SpriteOnMouseUpButton: {fileID: 0} + SpriteOnMouseDownButton: {fileID: 0} --- !u!1 &511442102 GameObject: m_ObjectHideFlags: 0 @@ -501,8 +515,9 @@ GameObject: - component: {fileID: 927701440} - component: {fileID: 927701441} - component: {fileID: 927701442} + - component: {fileID: 927701443} m_Layer: 0 - m_Name: backgroundButton + m_Name: AdsButton m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -597,6 +612,19 @@ BoxCollider2D: serializedVersion: 2 m_Size: {x: 7.5, y: 7.5} m_EdgeRadius: 0 +--- !u!114 &927701443 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 927701439} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6e92c96e95066574aa3130ef9cde1514, type: 3} + m_Name: + m_EditorClassIdentifier: + SpriteOnMouseUpButton: {fileID: 0} + SpriteOnMouseDownButton: {fileID: 0} --- !u!1 &1017778124 GameObject: m_ObjectHideFlags: 0 @@ -607,8 +635,9 @@ GameObject: - component: {fileID: 1017778125} - component: {fileID: 1017778126} - component: {fileID: 1017778127} + - component: {fileID: 1017778128} m_Layer: 0 - m_Name: backgroundButton + m_Name: TutorialButton m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -703,6 +732,19 @@ BoxCollider2D: serializedVersion: 2 m_Size: {x: 7.5, y: 7.5} m_EdgeRadius: 0 +--- !u!114 &1017778128 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1017778124} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6e92c96e95066574aa3130ef9cde1514, type: 3} + m_Name: + m_EditorClassIdentifier: + SpriteOnMouseUpButton: {fileID: 0} + SpriteOnMouseDownButton: {fileID: 0} --- !u!1 &1170947644 GameObject: m_ObjectHideFlags: 0 @@ -1030,8 +1072,9 @@ GameObject: - component: {fileID: 1439351811} - component: {fileID: 1439351812} - component: {fileID: 1439351813} + - component: {fileID: 1439351814} m_Layer: 0 - m_Name: backgroundButton + m_Name: MarketButton m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -1126,6 +1169,19 @@ BoxCollider2D: serializedVersion: 2 m_Size: {x: 7.5, y: 7.5} m_EdgeRadius: 0 +--- !u!114 &1439351814 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1439351810} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6e92c96e95066574aa3130ef9cde1514, type: 3} + m_Name: + m_EditorClassIdentifier: + SpriteOnMouseUpButton: {fileID: 0} + SpriteOnMouseDownButton: {fileID: 0} --- !u!1 &1566214676 GameObject: m_ObjectHideFlags: 0 diff --git a/Prototype/Assets/Scenes/Tutorial.unity b/Prototype/Assets/Scenes/Tutorial.unity new file mode 100644 index 0000000..4d6e646 --- /dev/null +++ b/Prototype/Assets/Scenes/Tutorial.unity @@ -0,0 +1,192 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!29 &1 +OcclusionCullingSettings: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_OcclusionBakeSettings: + smallestOccluder: 5 + smallestHole: 0.25 + backfaceThreshold: 100 + m_SceneGUID: 00000000000000000000000000000000 + m_OcclusionCullingData: {fileID: 0} +--- !u!104 &2 +RenderSettings: + m_ObjectHideFlags: 0 + serializedVersion: 9 + m_Fog: 0 + m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_FogMode: 3 + m_FogDensity: 0.01 + m_LinearFogStart: 0 + m_LinearFogEnd: 300 + m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1} + m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1} + m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1} + m_AmbientIntensity: 1 + m_AmbientMode: 3 + m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1} + m_SkyboxMaterial: {fileID: 0} + m_HaloStrength: 0.5 + m_FlareStrength: 1 + m_FlareFadeSpeed: 3 + m_HaloTexture: {fileID: 0} + m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0} + m_DefaultReflectionMode: 0 + m_DefaultReflectionResolution: 128 + m_ReflectionBounces: 1 + m_ReflectionIntensity: 1 + m_CustomReflection: {fileID: 0} + m_Sun: {fileID: 0} + m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1} + m_UseRadianceAmbientProbe: 0 +--- !u!157 &3 +LightmapSettings: + m_ObjectHideFlags: 0 + serializedVersion: 11 + m_GIWorkflowMode: 1 + m_GISettings: + serializedVersion: 2 + m_BounceScale: 1 + m_IndirectOutputScale: 1 + m_AlbedoBoost: 1 + m_TemporalCoherenceThreshold: 1 + m_EnvironmentLightingMode: 0 + m_EnableBakedLightmaps: 0 + m_EnableRealtimeLightmaps: 0 + m_LightmapEditorSettings: + serializedVersion: 10 + m_Resolution: 2 + m_BakeResolution: 40 + m_AtlasSize: 1024 + m_AO: 0 + m_AOMaxDistance: 1 + m_CompAOExponent: 1 + m_CompAOExponentDirect: 0 + m_Padding: 2 + m_LightmapParameters: {fileID: 0} + m_LightmapsBakeMode: 1 + m_TextureCompression: 1 + m_FinalGather: 0 + m_FinalGatherFiltering: 1 + m_FinalGatherRayCount: 256 + m_ReflectionCompression: 2 + m_MixedBakeMode: 2 + m_BakeBackend: 1 + m_PVRSampling: 1 + m_PVRDirectSampleCount: 32 + m_PVRSampleCount: 500 + m_PVRBounces: 2 + m_PVRFilterTypeDirect: 0 + m_PVRFilterTypeIndirect: 0 + m_PVRFilterTypeAO: 0 + m_PVRFilteringMode: 1 + m_PVRCulling: 1 + m_PVRFilteringGaussRadiusDirect: 1 + m_PVRFilteringGaussRadiusIndirect: 5 + m_PVRFilteringGaussRadiusAO: 2 + m_PVRFilteringAtrousPositionSigmaDirect: 0.5 + m_PVRFilteringAtrousPositionSigmaIndirect: 2 + m_PVRFilteringAtrousPositionSigmaAO: 1 + m_ShowResolutionOverlay: 1 + m_LightingDataAsset: {fileID: 0} + m_UseShadowmask: 1 +--- !u!196 &4 +NavMeshSettings: + serializedVersion: 2 + m_ObjectHideFlags: 0 + m_BuildSettings: + serializedVersion: 2 + agentTypeID: 0 + agentRadius: 0.5 + agentHeight: 2 + agentSlope: 45 + agentClimb: 0.4 + ledgeDropHeight: 0 + maxJumpAcrossDistance: 0 + minRegionArea: 2 + manualCellSize: 0 + cellSize: 0.16666667 + manualTileSize: 0 + tileSize: 256 + accuratePlacement: 0 + debug: + m_Flags: 0 + m_NavMeshData: {fileID: 0} +--- !u!1 &667946872 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 667946875} + - component: {fileID: 667946874} + - component: {fileID: 667946873} + m_Layer: 0 + m_Name: Main Camera + m_TagString: MainCamera + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!81 &667946873 +AudioListener: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 667946872} + m_Enabled: 1 +--- !u!20 &667946874 +Camera: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 667946872} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 1 + m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} + m_projectionMatrixMode: 1 + m_SensorSize: {x: 36, y: 24} + m_LensShift: {x: 0, y: 0} + m_FocalLength: 50 + m_NormalizedViewPortRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + near clip plane: 0.3 + far clip plane: 10 + field of view: 60 + orthographic: 1 + orthographic size: 5 + m_Depth: -1 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingPath: -1 + m_TargetTexture: {fileID: 0} + m_TargetDisplay: 0 + m_TargetEye: 3 + m_HDR: 1 + m_AllowMSAA: 1 + m_AllowDynamicResolution: 0 + m_ForceIntoRT: 0 + m_OcclusionCulling: 1 + m_StereoConvergence: 10 + m_StereoSeparation: 0.022 +--- !u!4 &667946875 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 667946872} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -10} + 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} diff --git a/Prototype/Assets/Scenes/Tutorial.unity.meta b/Prototype/Assets/Scenes/Tutorial.unity.meta new file mode 100644 index 0000000..e4446e1 --- /dev/null +++ b/Prototype/Assets/Scenes/Tutorial.unity.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: b81f90e945c407144be90702af1799ff +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Prototype/Assets/Scripts/MainMenuButton.cs b/Prototype/Assets/Scripts/MainMenuButton.cs index 04de51e..6d91219 100644 --- a/Prototype/Assets/Scripts/MainMenuButton.cs +++ b/Prototype/Assets/Scripts/MainMenuButton.cs @@ -24,6 +24,18 @@ private void OnMouseUpAsButton() case "PlayButton": SceneManager.LoadScene("Play"); break; + case "TutorialButton": + SceneManager.LoadScene("Tutorial"); + break; + case "MarketButton": + SceneManager.LoadScene("Market"); + break; + case "AdsButton": + SceneManager.LoadScene("Ads"); + break; + case "ScoreboardButton": + SceneManager.LoadScene("Scoreboard"); + break; } } } diff --git a/Prototype/Assets/ToonShader.meta b/Prototype/Assets/ToonShader.meta new file mode 100644 index 0000000..76cfade --- /dev/null +++ b/Prototype/Assets/ToonShader.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 3a1d57eaf38345a4286b8b460aae760e +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Prototype/Library/CurrentLayout.dwlt b/Prototype/Library/CurrentLayout.dwlt index eaee8cd..b3d7897 100644 --- a/Prototype/Library/CurrentLayout.dwlt +++ b/Prototype/Library/CurrentLayout.dwlt @@ -13,10 +13,10 @@ MonoBehaviour: m_EditorClassIdentifier: m_PixelRect: serializedVersion: 2 - x: 7.2000003 - y: 50.4 - width: 1522 - height: 777 + x: 0 + y: 43 + width: 1920 + height: 997 m_ShowMode: 4 m_Title: m_RootView: {fileID: 7} @@ -36,12 +36,12 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 817 + x: 1031 y: 0 - width: 428 - height: 456 - m_MinSize: {x: 200, y: 200} - m_MaxSize: {x: 4000, y: 4000} + width: 540 + height: 594 + m_MinSize: {x: 204, y: 221} + m_MaxSize: {x: 4004, y: 4021} m_ActualView: {fileID: 20} m_Panes: - {fileID: 20} @@ -65,12 +65,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 30 - width: 1522 - height: 727 - m_MinSize: {x: 783, y: 492} - m_MaxSize: {x: 16008, y: 14042} + width: 1920 + height: 947 + m_MinSize: {x: 887, y: 492} + m_MaxSize: {x: 16012, y: 14042} vertical: 0 - controlID: 90 + controlID: 109 --- !u!114 &4 MonoBehaviour: m_ObjectHideFlags: 52 @@ -85,10 +85,10 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 1245 + x: 1571 y: 0 - width: 277 - height: 727 + width: 349 + height: 947 m_MinSize: {x: 277, y: 71} m_MaxSize: {x: 4002, y: 4021} m_ActualView: {fileID: 17} @@ -112,8 +112,8 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 202 - height: 456 + width: 255 + height: 594 m_MinSize: {x: 202, y: 221} m_MaxSize: {x: 4002, y: 4021} m_ActualView: {fileID: 18} @@ -136,9 +136,9 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 456 - width: 1245 - height: 271 + y: 594 + width: 1571 + height: 353 m_MinSize: {x: 232, y: 271} m_MaxSize: {x: 10002, y: 10021} m_ActualView: {fileID: 16} @@ -167,8 +167,8 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1522 - height: 777 + width: 1920 + height: 997 m_MinSize: {x: 950, y: 300} m_MaxSize: {x: 10000, y: 10000} --- !u!114 &8 @@ -187,7 +187,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1522 + width: 1920 height: 30 m_MinSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0} @@ -207,8 +207,8 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 757 - width: 1522 + y: 977 + width: 1920 height: 20 m_MinSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0} @@ -230,12 +230,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1245 - height: 727 - m_MinSize: {x: 506, y: 492} - m_MaxSize: {x: 12006, y: 14042} + width: 1571 + height: 947 + m_MinSize: {x: 610, y: 492} + m_MaxSize: {x: 12010, y: 14042} vertical: 1 - controlID: 91 + controlID: 110 --- !u!114 &11 MonoBehaviour: m_ObjectHideFlags: 52 @@ -255,12 +255,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1245 - height: 456 - m_MinSize: {x: 506, y: 221} - m_MaxSize: {x: 12006, y: 4021} + width: 1571 + height: 594 + m_MinSize: {x: 610, y: 221} + m_MaxSize: {x: 12010, y: 4021} vertical: 0 - controlID: 92 + controlID: 111 --- !u!114 &12 MonoBehaviour: m_ObjectHideFlags: 52 @@ -275,19 +275,19 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 202 + x: 255 y: 0 - width: 615 - height: 456 - m_MinSize: {x: 104, y: 121} - m_MaxSize: {x: 4004, y: 4021} - m_ActualView: {fileID: 13} + width: 776 + height: 594 + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} + m_ActualView: {fileID: 19} m_Panes: - {fileID: 19} - {fileID: 13} - {fileID: 15} - m_Selected: 1 - m_LastSelected: 0 + m_Selected: 0 + m_LastSelected: 1 --- !u!114 &13 MonoBehaviour: m_ObjectHideFlags: 52 @@ -308,10 +308,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 212 - y: 100 - width: 611 - height: 435 + x: 257 + y: 92 + width: 772 + height: 573 m_PersistentViewDataDictionary: {fileID: 0} m_ViewTransforms: m_KeySerializationHelper: @@ -379,7 +379,7 @@ MonoBehaviour: m_AnimEditor: {fileID: 0} m_LockTracker: m_IsLocked: 0 - m_LastSelectedObjectID: 13770 + m_LastSelectedObjectID: 12070 --- !u!114 &15 MonoBehaviour: m_ObjectHideFlags: 52 @@ -425,10 +425,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 7.2000003 - y: 556 - width: 1243 - height: 250 + x: 0 + y: 686 + width: 1569 + height: 332 m_PersistentViewDataDictionary: {fileID: 0} m_SearchFilter: m_NameFilter: @@ -448,28 +448,28 @@ MonoBehaviour: m_LastFolders: - Assets/Scenes m_LastFoldersGridSize: -1 - m_LastProjectPath: C:\Users\Dell\Documents\Git\Prototype\Prototype + m_LastProjectPath: D:\Documents\Prototype\Prototype m_LockTracker: m_IsLocked: 0 m_FolderTreeState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: 4c2b0000 - m_LastClickedID: 11084 - m_ExpandedIDs: 00000000242b000000ca9a3b + m_SelectedIDs: ea2b0000 + m_LastClickedID: 11242 + m_ExpandedIDs: 00000000c22b000000ca9a3b m_RenameOverlay: m_UserAcceptedRename: 0 - m_Name: - m_OriginalName: + m_Name: Scenes + m_OriginalName: Scenes m_EditFieldRect: serializedVersion: 2 x: 0 y: 0 width: 0 height: 0 - m_UserData: 0 + m_UserData: 11242 m_IsWaitingForDelay: 0 m_IsRenaming: 0 - m_OriginalEventType: 11 + m_OriginalEventType: 0 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: 00000000242b0000 + m_ExpandedIDs: 00000000c22b0000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -511,7 +511,7 @@ MonoBehaviour: m_SelectedInstanceIDs: m_LastClickedInstanceID: 0 m_HadKeyboardFocusLastEvent: 1 - m_ExpandedInstanceIDs: c623000000700200000000007c260000448ef7ff + m_ExpandedInstanceIDs: c623000000700200000000007c260000448ef7ff342b0000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -558,10 +558,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 1254.4 - y: 100 - width: 275 - height: 706 + x: 1573 + y: 92 + width: 347 + height: 926 m_PersistentViewDataDictionary: {fileID: 0} m_ObjectsLockedBeforeSerialization: [] m_InstanceIDsLockedBeforeSerialization: @@ -592,30 +592,30 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 7.2000003 - y: 100 - width: 200 - height: 435 + x: 0 + y: 92 + width: 253 + height: 573 m_PersistentViewDataDictionary: {fileID: 0} m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: d42a0000 + m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 0a48ffffe24effffba50ffff5e78ffff0cfaffff00000000da2d00002e2e0000382e00006c330000ba330000c4330000e8390000 + m_ExpandedIDs: 743effffa64cffff60f3ffff98f7ffff000000007c2f0000 m_RenameOverlay: m_UserAcceptedRename: 0 - m_Name: 'backgroundButton ' - m_OriginalName: 'backgroundButton ' + m_Name: + m_OriginalName: m_EditFieldRect: serializedVersion: 2 x: 0 y: 0 width: 0 height: 0 - m_UserData: 11730 + m_UserData: 0 m_IsWaitingForDelay: 0 m_IsRenaming: 0 - m_OriginalEventType: 0 + m_OriginalEventType: 11 m_IsRenamingFilename: 0 m_ClientGUIView: {fileID: 5} m_SearchString: @@ -644,10 +644,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 212 - y: 100 - width: 573 - height: 435 + x: 257 + y: 92 + width: 772 + height: 573 m_PersistentViewDataDictionary: {fileID: 0} m_SceneLighting: 0 lastFramingTime: 1715.2497317 @@ -655,9 +655,9 @@ MonoBehaviour: m_isRotationLocked: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: -0.16802078, y: -0.17251231, z: 0.02317008} + m_Target: {x: -0.8227798, y: 0.08733089, z: -2.3027344} speed: 2 - m_Value: {x: -0.16802078, y: -0.17251231, z: 0.02317008} + m_Value: {x: -0.8227798, y: 0.08733089, z: -2.3027344} m_RenderMode: 2 m_CameraMode: drawMode: 2 @@ -689,15 +689,15 @@ MonoBehaviour: speed: 2 m_Value: {x: 0, y: 0, z: 0, w: 1} m_Size: - m_Target: 10.565144 + m_Target: 13.967337 speed: 2 - m_Value: 10.565144 + m_Value: 13.967337 m_Ortho: m_Target: 1 speed: 2 m_Value: 1 m_ShowGlobalGrid: 1 - m_LastSceneViewRotation: {x: -0.08717229, y: 0.89959055, z: -0.21045254, w: -0.3726226} + m_LastSceneViewRotation: {x: 0.17757675, y: -0.6983766, z: 0.18564084, w: 0.66803753} m_LastSceneViewOrtho: 0 m_ReplacementShader: {fileID: 0} m_ReplacementString: @@ -723,10 +723,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 826.4 - y: 100 - width: 424 - height: 435 + x: 1033 + y: 92 + width: 536 + height: 573 m_PersistentViewDataDictionary: {fileID: 0} m_MaximizeOnPlay: 0 m_Gizmos: 0 @@ -738,10 +738,10 @@ MonoBehaviour: m_VRangeLocked: 0 hZoomLockedByDefault: 0 vZoomLockedByDefault: 0 - m_HBaseRangeMin: -94 - m_HBaseRangeMax: 94 - m_VBaseRangeMin: -167.2 - m_VBaseRangeMax: 167.2 + m_HBaseRangeMin: -156.5 + m_HBaseRangeMax: 156.5 + m_VBaseRangeMin: -278 + m_VBaseRangeMax: 278 m_HAllowExceedBaseRangeMin: 1 m_HAllowExceedBaseRangeMax: 1 m_VAllowExceedBaseRangeMin: 1 @@ -759,25 +759,25 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 17 - width: 424 - height: 418 - m_Scale: {x: 1.25, y: 1.25} - m_Translation: {x: 212, y: 209} + width: 536 + height: 556 + m_Scale: {x: 1, y: 1} + m_Translation: {x: 268, y: 278} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 m_MarginBottom: 0 m_LastShownAreaInsideMargins: serializedVersion: 2 - x: -169.6 - y: -167.2 - width: 339.2 - height: 334.4 + x: -268 + y: -278 + width: 536 + height: 556 m_MinimalGUI: 1 m_defaultScale: 1 m_TargetTexture: {fileID: 0} m_CurrentColorSpace: 0 - m_LastWindowPixelSize: {x: 530, y: 543.75} + m_LastWindowPixelSize: {x: 536, y: 573} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 01000001000100000100 @@ -803,7 +803,7 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 763 - width: 1584 - height: 255 + y: 686 + width: 1569 + height: 332 m_PersistentViewDataDictionary: {fileID: 0} diff --git a/Prototype/Library/ScriptAssemblies/Assembly-CSharp.dll b/Prototype/Library/ScriptAssemblies/Assembly-CSharp.dll index 4e8b5a0..b3a02e1 100644 Binary files a/Prototype/Library/ScriptAssemblies/Assembly-CSharp.dll and b/Prototype/Library/ScriptAssemblies/Assembly-CSharp.dll differ diff --git a/Prototype/Library/ScriptMapper b/Prototype/Library/ScriptMapper index d255005..20680ea 100644 Binary files a/Prototype/Library/ScriptMapper and b/Prototype/Library/ScriptMapper differ diff --git a/Prototype/Library/ShaderCache/2/229aea97a6a842170179181a3f717298.bin b/Prototype/Library/ShaderCache/2/229aea97a6a842170179181a3f717298.bin new file mode 100644 index 0000000..f81a373 Binary files /dev/null and b/Prototype/Library/ShaderCache/2/229aea97a6a842170179181a3f717298.bin differ diff --git a/Prototype/Library/ShaderCache/3/3dc65d81593fd0b5214b17a39615d8c8.bin b/Prototype/Library/ShaderCache/3/3dc65d81593fd0b5214b17a39615d8c8.bin new file mode 100644 index 0000000..937c71b Binary files /dev/null and b/Prototype/Library/ShaderCache/3/3dc65d81593fd0b5214b17a39615d8c8.bin differ diff --git a/Prototype/Library/ShaderCache/5/56f5a24acf969195a103410524e3d39d.bin b/Prototype/Library/ShaderCache/5/56f5a24acf969195a103410524e3d39d.bin new file mode 100644 index 0000000..ecdf2d2 Binary files /dev/null and b/Prototype/Library/ShaderCache/5/56f5a24acf969195a103410524e3d39d.bin differ diff --git a/Prototype/Library/ShaderCache/7/7cad6f5a7966f81340f602e2d6e7d2a1.bin b/Prototype/Library/ShaderCache/7/7cad6f5a7966f81340f602e2d6e7d2a1.bin new file mode 100644 index 0000000..b436ba2 Binary files /dev/null and b/Prototype/Library/ShaderCache/7/7cad6f5a7966f81340f602e2d6e7d2a1.bin differ diff --git a/Prototype/Library/ShaderCache/8/837372cb98d9b53eeb371ad39a54a23d.bin b/Prototype/Library/ShaderCache/8/837372cb98d9b53eeb371ad39a54a23d.bin new file mode 100644 index 0000000..f9cc30e Binary files /dev/null and b/Prototype/Library/ShaderCache/8/837372cb98d9b53eeb371ad39a54a23d.bin differ diff --git a/Prototype/Library/ShaderCache/9/9c37937762f6e68b52eb2a426b5a9698.bin b/Prototype/Library/ShaderCache/9/9c37937762f6e68b52eb2a426b5a9698.bin new file mode 100644 index 0000000..b436ba2 Binary files /dev/null and b/Prototype/Library/ShaderCache/9/9c37937762f6e68b52eb2a426b5a9698.bin differ diff --git a/Prototype/Library/ShaderCache/a/a9c30f6b41cfa9c84b9fdc20f20a234d.bin b/Prototype/Library/ShaderCache/a/a9c30f6b41cfa9c84b9fdc20f20a234d.bin new file mode 100644 index 0000000..ac9e04c Binary files /dev/null and b/Prototype/Library/ShaderCache/a/a9c30f6b41cfa9c84b9fdc20f20a234d.bin differ diff --git a/Prototype/Library/ShaderCache/c/c15dcd02b664297d01ddd43974e6552d.bin b/Prototype/Library/ShaderCache/c/c15dcd02b664297d01ddd43974e6552d.bin new file mode 100644 index 0000000..76b4197 Binary files /dev/null and b/Prototype/Library/ShaderCache/c/c15dcd02b664297d01ddd43974e6552d.bin differ diff --git a/Prototype/Library/ShaderCache/d/d61700b80c1f11234e58948c5a63e898.bin b/Prototype/Library/ShaderCache/d/d61700b80c1f11234e58948c5a63e898.bin new file mode 100644 index 0000000..f9cc30e Binary files /dev/null and b/Prototype/Library/ShaderCache/d/d61700b80c1f11234e58948c5a63e898.bin differ diff --git a/Prototype/Library/ShaderCache/e/e408a9581649656d88e8068a301f99af.bin b/Prototype/Library/ShaderCache/e/e408a9581649656d88e8068a301f99af.bin new file mode 100644 index 0000000..cbdaef2 Binary files /dev/null and b/Prototype/Library/ShaderCache/e/e408a9581649656d88e8068a301f99af.bin differ diff --git a/Prototype/Library/ShaderCache/f/f60615458058963b5288f521ce957aeb.bin b/Prototype/Library/ShaderCache/f/f60615458058963b5288f521ce957aeb.bin new file mode 100644 index 0000000..ac9e04c Binary files /dev/null and b/Prototype/Library/ShaderCache/f/f60615458058963b5288f521ce957aeb.bin differ diff --git a/Prototype/Library/ShaderCache/f/fe059bff5948abbd76a7a436483b84b2.bin b/Prototype/Library/ShaderCache/f/fe059bff5948abbd76a7a436483b84b2.bin new file mode 100644 index 0000000..f81a373 Binary files /dev/null and b/Prototype/Library/ShaderCache/f/fe059bff5948abbd76a7a436483b84b2.bin differ diff --git a/Prototype/Library/assetDatabase3 b/Prototype/Library/assetDatabase3 index 65fadf1..b6866fd 100644 Binary files a/Prototype/Library/assetDatabase3 and b/Prototype/Library/assetDatabase3 differ diff --git a/Prototype/Library/metadata/01/01264942e63954943ba47aa2d6d52740.info b/Prototype/Library/metadata/01/01264942e63954943ba47aa2d6d52740.info index f69852e..8b830b5 100644 Binary files a/Prototype/Library/metadata/01/01264942e63954943ba47aa2d6d52740.info and b/Prototype/Library/metadata/01/01264942e63954943ba47aa2d6d52740.info differ diff --git a/Prototype/Library/metadata/07/0717917ee9a78eb4491cd021efe50ae9 b/Prototype/Library/metadata/07/0717917ee9a78eb4491cd021efe50ae9 new file mode 100644 index 0000000..15b1257 Binary files /dev/null and b/Prototype/Library/metadata/07/0717917ee9a78eb4491cd021efe50ae9 differ diff --git a/Prototype/Library/metadata/07/0717917ee9a78eb4491cd021efe50ae9.info b/Prototype/Library/metadata/07/0717917ee9a78eb4491cd021efe50ae9.info new file mode 100644 index 0000000..0b6a0b2 Binary files /dev/null and b/Prototype/Library/metadata/07/0717917ee9a78eb4491cd021efe50ae9.info differ diff --git a/Prototype/Library/metadata/16/16241155db75a6a4e9792a5e74457af5.info b/Prototype/Library/metadata/16/16241155db75a6a4e9792a5e74457af5.info index a7e157d..7cc6c69 100644 Binary files a/Prototype/Library/metadata/16/16241155db75a6a4e9792a5e74457af5.info and b/Prototype/Library/metadata/16/16241155db75a6a4e9792a5e74457af5.info differ diff --git a/Prototype/Library/metadata/1b/1b9f0dc52adb0ed448cd5f8b127732d7.info b/Prototype/Library/metadata/1b/1b9f0dc52adb0ed448cd5f8b127732d7.info index 1542ba5..cd50171 100644 Binary files a/Prototype/Library/metadata/1b/1b9f0dc52adb0ed448cd5f8b127732d7.info and b/Prototype/Library/metadata/1b/1b9f0dc52adb0ed448cd5f8b127732d7.info differ diff --git a/Prototype/Library/metadata/1c/1c225884260d9a845be82b707451acc0.info b/Prototype/Library/metadata/1c/1c225884260d9a845be82b707451acc0.info index c4e18c0..a21f47a 100644 Binary files a/Prototype/Library/metadata/1c/1c225884260d9a845be82b707451acc0.info and b/Prototype/Library/metadata/1c/1c225884260d9a845be82b707451acc0.info differ diff --git a/Prototype/Library/metadata/23/23e38294485842248a20d0937d14ea1d b/Prototype/Library/metadata/23/23e38294485842248a20d0937d14ea1d new file mode 100644 index 0000000..bd242b7 Binary files /dev/null and b/Prototype/Library/metadata/23/23e38294485842248a20d0937d14ea1d differ diff --git a/Prototype/Library/metadata/23/23e38294485842248a20d0937d14ea1d.info b/Prototype/Library/metadata/23/23e38294485842248a20d0937d14ea1d.info new file mode 100644 index 0000000..5e10235 Binary files /dev/null and b/Prototype/Library/metadata/23/23e38294485842248a20d0937d14ea1d.info differ diff --git a/Prototype/Library/metadata/2f/2fd710b516a7b8b4db7ee14717321410.info b/Prototype/Library/metadata/2f/2fd710b516a7b8b4db7ee14717321410.info index 9da1da4..3977550 100644 Binary files a/Prototype/Library/metadata/2f/2fd710b516a7b8b4db7ee14717321410.info and b/Prototype/Library/metadata/2f/2fd710b516a7b8b4db7ee14717321410.info differ diff --git a/Prototype/Library/metadata/3a/3a1d57eaf38345a4286b8b460aae760e b/Prototype/Library/metadata/3a/3a1d57eaf38345a4286b8b460aae760e new file mode 100644 index 0000000..bc0dc63 Binary files /dev/null and b/Prototype/Library/metadata/3a/3a1d57eaf38345a4286b8b460aae760e differ diff --git a/Prototype/Library/metadata/3a/3a1d57eaf38345a4286b8b460aae760e.info b/Prototype/Library/metadata/3a/3a1d57eaf38345a4286b8b460aae760e.info new file mode 100644 index 0000000..a561c28 Binary files /dev/null and b/Prototype/Library/metadata/3a/3a1d57eaf38345a4286b8b460aae760e.info differ diff --git a/Prototype/Library/metadata/3d/3d7bbfe23d0b5274fbbf0b3255b813b3 b/Prototype/Library/metadata/3d/3d7bbfe23d0b5274fbbf0b3255b813b3 new file mode 100644 index 0000000..7bcaebb Binary files /dev/null and b/Prototype/Library/metadata/3d/3d7bbfe23d0b5274fbbf0b3255b813b3 differ diff --git a/Prototype/Library/metadata/3d/3d7bbfe23d0b5274fbbf0b3255b813b3.info b/Prototype/Library/metadata/3d/3d7bbfe23d0b5274fbbf0b3255b813b3.info new file mode 100644 index 0000000..f90b014 Binary files /dev/null and b/Prototype/Library/metadata/3d/3d7bbfe23d0b5274fbbf0b3255b813b3.info differ diff --git a/Prototype/Library/metadata/44/4481b657e1d4b394fa8f8dd5545585b9.info b/Prototype/Library/metadata/44/4481b657e1d4b394fa8f8dd5545585b9.info index fc03ea0..bad2236 100644 Binary files a/Prototype/Library/metadata/44/4481b657e1d4b394fa8f8dd5545585b9.info and b/Prototype/Library/metadata/44/4481b657e1d4b394fa8f8dd5545585b9.info differ diff --git a/Prototype/Library/metadata/4b/4b05bbc4b93d80941b7803bb8e52f409.info b/Prototype/Library/metadata/4b/4b05bbc4b93d80941b7803bb8e52f409.info index 67052f2..d15e46b 100644 Binary files a/Prototype/Library/metadata/4b/4b05bbc4b93d80941b7803bb8e52f409.info and b/Prototype/Library/metadata/4b/4b05bbc4b93d80941b7803bb8e52f409.info differ diff --git a/Prototype/Library/metadata/4b/4ba0c5889f476964ca9a1531b6a9d0e8 b/Prototype/Library/metadata/4b/4ba0c5889f476964ca9a1531b6a9d0e8 new file mode 100644 index 0000000..9f2af6a Binary files /dev/null and b/Prototype/Library/metadata/4b/4ba0c5889f476964ca9a1531b6a9d0e8 differ diff --git a/Prototype/Library/metadata/4b/4ba0c5889f476964ca9a1531b6a9d0e8.info b/Prototype/Library/metadata/4b/4ba0c5889f476964ca9a1531b6a9d0e8.info new file mode 100644 index 0000000..feaee18 Binary files /dev/null and b/Prototype/Library/metadata/4b/4ba0c5889f476964ca9a1531b6a9d0e8.info differ diff --git a/Prototype/Library/metadata/4d/4da8c50f26ec84a4b9e746048dec1a30.info b/Prototype/Library/metadata/4d/4da8c50f26ec84a4b9e746048dec1a30.info index d606726..8640bd8 100644 Binary files a/Prototype/Library/metadata/4d/4da8c50f26ec84a4b9e746048dec1a30.info and b/Prototype/Library/metadata/4d/4da8c50f26ec84a4b9e746048dec1a30.info differ diff --git a/Prototype/Library/metadata/4f/4f30c1adb9ec5c849b36746e980649a6 b/Prototype/Library/metadata/4f/4f30c1adb9ec5c849b36746e980649a6 new file mode 100644 index 0000000..71349f3 Binary files /dev/null and b/Prototype/Library/metadata/4f/4f30c1adb9ec5c849b36746e980649a6 differ diff --git a/Prototype/Library/metadata/4f/4f30c1adb9ec5c849b36746e980649a6.info b/Prototype/Library/metadata/4f/4f30c1adb9ec5c849b36746e980649a6.info new file mode 100644 index 0000000..37d6291 Binary files /dev/null and b/Prototype/Library/metadata/4f/4f30c1adb9ec5c849b36746e980649a6.info differ diff --git a/Prototype/Library/metadata/54/5446abaaef8a6504fb56bc92d6062a10.info b/Prototype/Library/metadata/54/5446abaaef8a6504fb56bc92d6062a10.info index 87d17b1..5faff54 100644 Binary files a/Prototype/Library/metadata/54/5446abaaef8a6504fb56bc92d6062a10.info and b/Prototype/Library/metadata/54/5446abaaef8a6504fb56bc92d6062a10.info differ diff --git a/Prototype/Library/metadata/68/682e1664041e6554ba5443ff17800566.info b/Prototype/Library/metadata/68/682e1664041e6554ba5443ff17800566.info index e5678bc..11879a6 100644 Binary files a/Prototype/Library/metadata/68/682e1664041e6554ba5443ff17800566.info and b/Prototype/Library/metadata/68/682e1664041e6554ba5443ff17800566.info differ diff --git a/Prototype/Library/metadata/68/686e065bf45f45b45b88594546f9ab40.info b/Prototype/Library/metadata/68/686e065bf45f45b45b88594546f9ab40.info index a9a45cd..fe6ac35 100644 Binary files a/Prototype/Library/metadata/68/686e065bf45f45b45b88594546f9ab40.info and b/Prototype/Library/metadata/68/686e065bf45f45b45b88594546f9ab40.info differ diff --git a/Prototype/Library/metadata/6d/6d28ad8e514b7ff4b9159ef2e9577ed2.info b/Prototype/Library/metadata/6d/6d28ad8e514b7ff4b9159ef2e9577ed2.info index a45d9c0..1157109 100644 Binary files a/Prototype/Library/metadata/6d/6d28ad8e514b7ff4b9159ef2e9577ed2.info and b/Prototype/Library/metadata/6d/6d28ad8e514b7ff4b9159ef2e9577ed2.info differ diff --git a/Prototype/Library/metadata/6e/6e92c96e95066574aa3130ef9cde1514 b/Prototype/Library/metadata/6e/6e92c96e95066574aa3130ef9cde1514 index ee437cf..7c680ea 100644 Binary files a/Prototype/Library/metadata/6e/6e92c96e95066574aa3130ef9cde1514 and b/Prototype/Library/metadata/6e/6e92c96e95066574aa3130ef9cde1514 differ diff --git a/Prototype/Library/metadata/78/782a9362f3503a3458666d3b28a30267.info b/Prototype/Library/metadata/78/782a9362f3503a3458666d3b28a30267.info index cc44a3b..04cc414 100644 Binary files a/Prototype/Library/metadata/78/782a9362f3503a3458666d3b28a30267.info and b/Prototype/Library/metadata/78/782a9362f3503a3458666d3b28a30267.info differ diff --git a/Prototype/Library/metadata/81/81a5d6b7c54176b4b8325a30d8e1e04f.info b/Prototype/Library/metadata/81/81a5d6b7c54176b4b8325a30d8e1e04f.info index 2e23c5c..fb01cc0 100644 Binary files a/Prototype/Library/metadata/81/81a5d6b7c54176b4b8325a30d8e1e04f.info and b/Prototype/Library/metadata/81/81a5d6b7c54176b4b8325a30d8e1e04f.info differ diff --git a/Prototype/Library/metadata/83/831331d4cfcb7404bb558893ddcc6cf3 b/Prototype/Library/metadata/83/831331d4cfcb7404bb558893ddcc6cf3 new file mode 100644 index 0000000..48a83c0 Binary files /dev/null and b/Prototype/Library/metadata/83/831331d4cfcb7404bb558893ddcc6cf3 differ diff --git a/Prototype/Library/metadata/83/831331d4cfcb7404bb558893ddcc6cf3.info b/Prototype/Library/metadata/83/831331d4cfcb7404bb558893ddcc6cf3.info new file mode 100644 index 0000000..c1dafc9 Binary files /dev/null and b/Prototype/Library/metadata/83/831331d4cfcb7404bb558893ddcc6cf3.info differ diff --git a/Prototype/Library/metadata/94/9422b07d94ecea04ca5386722f2e8e39 b/Prototype/Library/metadata/94/9422b07d94ecea04ca5386722f2e8e39 new file mode 100644 index 0000000..15a1d68 Binary files /dev/null and b/Prototype/Library/metadata/94/9422b07d94ecea04ca5386722f2e8e39 differ diff --git a/Prototype/Library/metadata/94/9422b07d94ecea04ca5386722f2e8e39.info b/Prototype/Library/metadata/94/9422b07d94ecea04ca5386722f2e8e39.info new file mode 100644 index 0000000..a3cdb02 Binary files /dev/null and b/Prototype/Library/metadata/94/9422b07d94ecea04ca5386722f2e8e39.info differ diff --git a/Prototype/Library/metadata/99/99bb36e9d2c76874e8e8e2baed6debca b/Prototype/Library/metadata/99/99bb36e9d2c76874e8e8e2baed6debca new file mode 100644 index 0000000..fb3ca78 Binary files /dev/null and b/Prototype/Library/metadata/99/99bb36e9d2c76874e8e8e2baed6debca differ diff --git a/Prototype/Library/metadata/99/99bb36e9d2c76874e8e8e2baed6debca.info b/Prototype/Library/metadata/99/99bb36e9d2c76874e8e8e2baed6debca.info new file mode 100644 index 0000000..51f02bb Binary files /dev/null and b/Prototype/Library/metadata/99/99bb36e9d2c76874e8e8e2baed6debca.info differ diff --git a/Prototype/Library/metadata/9f/9f9e496e96effc64486d79e3e6066ffa.info b/Prototype/Library/metadata/9f/9f9e496e96effc64486d79e3e6066ffa.info index f0600ea..135b869 100644 Binary files a/Prototype/Library/metadata/9f/9f9e496e96effc64486d79e3e6066ffa.info and b/Prototype/Library/metadata/9f/9f9e496e96effc64486d79e3e6066ffa.info differ diff --git a/Prototype/Library/metadata/a2/a2bd550470c31e845b6c26f543e9e582.info b/Prototype/Library/metadata/a2/a2bd550470c31e845b6c26f543e9e582.info index ef0200a..cc5750c 100644 Binary files a/Prototype/Library/metadata/a2/a2bd550470c31e845b6c26f543e9e582.info and b/Prototype/Library/metadata/a2/a2bd550470c31e845b6c26f543e9e582.info differ diff --git a/Prototype/Library/metadata/ae/aea442802cb7f4644b03104c1a211b7b.info b/Prototype/Library/metadata/ae/aea442802cb7f4644b03104c1a211b7b.info index 7378ede..b7ae7c7 100644 Binary files a/Prototype/Library/metadata/ae/aea442802cb7f4644b03104c1a211b7b.info and b/Prototype/Library/metadata/ae/aea442802cb7f4644b03104c1a211b7b.info differ diff --git a/Prototype/Library/metadata/b3/b3f7557f4e5ca79439aab2055628d76f b/Prototype/Library/metadata/b3/b3f7557f4e5ca79439aab2055628d76f new file mode 100644 index 0000000..460a336 Binary files /dev/null and b/Prototype/Library/metadata/b3/b3f7557f4e5ca79439aab2055628d76f differ diff --git a/Prototype/Library/metadata/b3/b3f7557f4e5ca79439aab2055628d76f.info b/Prototype/Library/metadata/b3/b3f7557f4e5ca79439aab2055628d76f.info new file mode 100644 index 0000000..056eb57 Binary files /dev/null and b/Prototype/Library/metadata/b3/b3f7557f4e5ca79439aab2055628d76f.info differ diff --git a/Prototype/Library/metadata/b6/b67f76bd1934e9b4caf7475a67b37d7a b/Prototype/Library/metadata/b6/b67f76bd1934e9b4caf7475a67b37d7a new file mode 100644 index 0000000..0b86e97 Binary files /dev/null and b/Prototype/Library/metadata/b6/b67f76bd1934e9b4caf7475a67b37d7a differ diff --git a/Prototype/Library/metadata/b6/b67f76bd1934e9b4caf7475a67b37d7a.info b/Prototype/Library/metadata/b6/b67f76bd1934e9b4caf7475a67b37d7a.info new file mode 100644 index 0000000..e1bf7b4 Binary files /dev/null and b/Prototype/Library/metadata/b6/b67f76bd1934e9b4caf7475a67b37d7a.info differ diff --git a/Prototype/Library/metadata/b8/b81f90e945c407144be90702af1799ff b/Prototype/Library/metadata/b8/b81f90e945c407144be90702af1799ff new file mode 100644 index 0000000..a5abd09 Binary files /dev/null and b/Prototype/Library/metadata/b8/b81f90e945c407144be90702af1799ff differ diff --git a/Prototype/Library/metadata/b8/b81f90e945c407144be90702af1799ff.info b/Prototype/Library/metadata/b8/b81f90e945c407144be90702af1799ff.info new file mode 100644 index 0000000..68d0285 Binary files /dev/null and b/Prototype/Library/metadata/b8/b81f90e945c407144be90702af1799ff.info differ diff --git a/Prototype/Library/metadata/bc/bc7686edf239fb04eaa4c02c7f61a8dd.info b/Prototype/Library/metadata/bc/bc7686edf239fb04eaa4c02c7f61a8dd.info index bceefcb..88c683a 100644 Binary files a/Prototype/Library/metadata/bc/bc7686edf239fb04eaa4c02c7f61a8dd.info and b/Prototype/Library/metadata/bc/bc7686edf239fb04eaa4c02c7f61a8dd.info differ diff --git a/Prototype/Library/metadata/c5/c57af84aa93d7d34780f73276605b2a4 b/Prototype/Library/metadata/c5/c57af84aa93d7d34780f73276605b2a4 new file mode 100644 index 0000000..119655e Binary files /dev/null and b/Prototype/Library/metadata/c5/c57af84aa93d7d34780f73276605b2a4 differ diff --git a/Prototype/Library/metadata/c5/c57af84aa93d7d34780f73276605b2a4.info b/Prototype/Library/metadata/c5/c57af84aa93d7d34780f73276605b2a4.info new file mode 100644 index 0000000..576d88b Binary files /dev/null and b/Prototype/Library/metadata/c5/c57af84aa93d7d34780f73276605b2a4.info differ diff --git a/Prototype/Library/metadata/ca/caf166d1667cea7438d3a73945735d13.info b/Prototype/Library/metadata/ca/caf166d1667cea7438d3a73945735d13.info index 3a04a28..a6bb390 100644 Binary files a/Prototype/Library/metadata/ca/caf166d1667cea7438d3a73945735d13.info and b/Prototype/Library/metadata/ca/caf166d1667cea7438d3a73945735d13.info differ diff --git a/Prototype/Library/metadata/d0/d02db9999c804c6489859fc7661eeaf2 b/Prototype/Library/metadata/d0/d02db9999c804c6489859fc7661eeaf2 new file mode 100644 index 0000000..185166f Binary files /dev/null and b/Prototype/Library/metadata/d0/d02db9999c804c6489859fc7661eeaf2 differ diff --git a/Prototype/Library/metadata/d0/d02db9999c804c6489859fc7661eeaf2.info b/Prototype/Library/metadata/d0/d02db9999c804c6489859fc7661eeaf2.info new file mode 100644 index 0000000..8b19799 Binary files /dev/null and b/Prototype/Library/metadata/d0/d02db9999c804c6489859fc7661eeaf2.info differ diff --git a/Prototype/Library/metadata/d3/d3709742b4fe5bc4e83d065677bc2095 b/Prototype/Library/metadata/d3/d3709742b4fe5bc4e83d065677bc2095 new file mode 100644 index 0000000..0debc05 Binary files /dev/null and b/Prototype/Library/metadata/d3/d3709742b4fe5bc4e83d065677bc2095 differ diff --git a/Prototype/Library/metadata/d3/d3709742b4fe5bc4e83d065677bc2095.info b/Prototype/Library/metadata/d3/d3709742b4fe5bc4e83d065677bc2095.info new file mode 100644 index 0000000..3877c09 Binary files /dev/null and b/Prototype/Library/metadata/d3/d3709742b4fe5bc4e83d065677bc2095.info differ diff --git a/Prototype/Library/metadata/d3/d3eb8ab5a726be34eb716fcfcd7f38be b/Prototype/Library/metadata/d3/d3eb8ab5a726be34eb716fcfcd7f38be new file mode 100644 index 0000000..9911cfe Binary files /dev/null and b/Prototype/Library/metadata/d3/d3eb8ab5a726be34eb716fcfcd7f38be differ diff --git a/Prototype/Library/metadata/d3/d3eb8ab5a726be34eb716fcfcd7f38be.info b/Prototype/Library/metadata/d3/d3eb8ab5a726be34eb716fcfcd7f38be.info new file mode 100644 index 0000000..6f1a20f Binary files /dev/null and b/Prototype/Library/metadata/d3/d3eb8ab5a726be34eb716fcfcd7f38be.info differ diff --git a/Prototype/Library/metadata/d8/d8e21d65e4be3494fbcd3be260d7a7ca b/Prototype/Library/metadata/d8/d8e21d65e4be3494fbcd3be260d7a7ca new file mode 100644 index 0000000..024d66b Binary files /dev/null and b/Prototype/Library/metadata/d8/d8e21d65e4be3494fbcd3be260d7a7ca differ diff --git a/Prototype/Library/metadata/d8/d8e21d65e4be3494fbcd3be260d7a7ca.info b/Prototype/Library/metadata/d8/d8e21d65e4be3494fbcd3be260d7a7ca.info new file mode 100644 index 0000000..f5b662c Binary files /dev/null and b/Prototype/Library/metadata/d8/d8e21d65e4be3494fbcd3be260d7a7ca.info differ diff --git a/Prototype/Library/metadata/e5/e57ca4cbec3126a468352fa1ecbad40e b/Prototype/Library/metadata/e5/e57ca4cbec3126a468352fa1ecbad40e new file mode 100644 index 0000000..2f8bb56 Binary files /dev/null and b/Prototype/Library/metadata/e5/e57ca4cbec3126a468352fa1ecbad40e differ diff --git a/Prototype/Library/metadata/e5/e57ca4cbec3126a468352fa1ecbad40e.info b/Prototype/Library/metadata/e5/e57ca4cbec3126a468352fa1ecbad40e.info new file mode 100644 index 0000000..e6576cf Binary files /dev/null and b/Prototype/Library/metadata/e5/e57ca4cbec3126a468352fa1ecbad40e.info differ diff --git a/Prototype/Library/metadata/ea/ea988fa9618a562419453bd51c2ff8b6 b/Prototype/Library/metadata/ea/ea988fa9618a562419453bd51c2ff8b6 new file mode 100644 index 0000000..ac9dfcd Binary files /dev/null and b/Prototype/Library/metadata/ea/ea988fa9618a562419453bd51c2ff8b6 differ diff --git a/Prototype/Library/metadata/ea/ea988fa9618a562419453bd51c2ff8b6.info b/Prototype/Library/metadata/ea/ea988fa9618a562419453bd51c2ff8b6.info new file mode 100644 index 0000000..98d4f5f Binary files /dev/null and b/Prototype/Library/metadata/ea/ea988fa9618a562419453bd51c2ff8b6.info differ diff --git a/Prototype/Library/metadata/ea/eaf9ae0a767253740baccfddf19e1a96 b/Prototype/Library/metadata/ea/eaf9ae0a767253740baccfddf19e1a96 new file mode 100644 index 0000000..e47a1ac Binary files /dev/null and b/Prototype/Library/metadata/ea/eaf9ae0a767253740baccfddf19e1a96 differ diff --git a/Prototype/Library/metadata/ea/eaf9ae0a767253740baccfddf19e1a96.info b/Prototype/Library/metadata/ea/eaf9ae0a767253740baccfddf19e1a96.info new file mode 100644 index 0000000..e4d37c0 Binary files /dev/null and b/Prototype/Library/metadata/ea/eaf9ae0a767253740baccfddf19e1a96.info differ diff --git a/Prototype/Library/metadata/f0/f008d585ba679544ca71f1927ce4e867.info b/Prototype/Library/metadata/f0/f008d585ba679544ca71f1927ce4e867.info index a847ed2..dd6aab5 100644 Binary files a/Prototype/Library/metadata/f0/f008d585ba679544ca71f1927ce4e867.info and b/Prototype/Library/metadata/f0/f008d585ba679544ca71f1927ce4e867.info differ diff --git a/Prototype/Library/metadata/f3/f3b3738fb3608024ba94712d4daf62c3 b/Prototype/Library/metadata/f3/f3b3738fb3608024ba94712d4daf62c3 new file mode 100644 index 0000000..b05d056 Binary files /dev/null and b/Prototype/Library/metadata/f3/f3b3738fb3608024ba94712d4daf62c3 differ diff --git a/Prototype/Library/metadata/f3/f3b3738fb3608024ba94712d4daf62c3.info b/Prototype/Library/metadata/f3/f3b3738fb3608024ba94712d4daf62c3.info new file mode 100644 index 0000000..70697da Binary files /dev/null and b/Prototype/Library/metadata/f3/f3b3738fb3608024ba94712d4daf62c3.info differ diff --git a/Prototype/Library/metadata/f7/f75019554a695024da7226ef41ac6caa b/Prototype/Library/metadata/f7/f75019554a695024da7226ef41ac6caa new file mode 100644 index 0000000..0d666bf Binary files /dev/null and b/Prototype/Library/metadata/f7/f75019554a695024da7226ef41ac6caa differ diff --git a/Prototype/Library/metadata/f7/f75019554a695024da7226ef41ac6caa.info b/Prototype/Library/metadata/f7/f75019554a695024da7226ef41ac6caa.info new file mode 100644 index 0000000..883685a Binary files /dev/null and b/Prototype/Library/metadata/f7/f75019554a695024da7226ef41ac6caa.info differ diff --git a/Prototype/Library/shadercompiler-UnityShaderCompiler.exe0.log b/Prototype/Library/shadercompiler-UnityShaderCompiler.exe0.log index d6f3619..87913f0 100644 --- a/Prototype/Library/shadercompiler-UnityShaderCompiler.exe0.log +++ b/Prototype/Library/shadercompiler-UnityShaderCompiler.exe0.log @@ -1,16 +1,33 @@ Base path: C:/Program Files/Unity/Hub/Editor/2018.2.21f1/Editor/Data 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: preprocess + insize=4582 outsize=1112 ok=1 +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_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_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_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_DLDR_ENCODING ok=1 +Cmd: compileSnippet + api=4 type=0 insize=944 outsize=1414 kw=UNITY_PASS_SHADOWCASTER SHADOWS_DEPTH pd=UNITY_NO_DXT5nm UNITY_ENABLE_REFLECTION_BUFFERS UNITY_NO_CUBEMAP_ARRAY 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_DLDR_ENCODING ok=1 +Cmd: compileSnippet + api=4 type=1 insize=944 outsize=218 kw=UNITY_PASS_SHADOWCASTER SHADOWS_DEPTH pd=UNITY_NO_DXT5nm UNITY_ENABLE_REFLECTION_BUFFERS UNITY_NO_CUBEMAP_ARRAY 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_DLDR_ENCODING ok=1 +Cmd: preprocess + insize=912 outsize=356 ok=1 +Cmd: compileSnippet + api=4 type=0 insize=1028 outsize=538 kw=DIRECTIONAL pd=UNITY_NO_DXT5nm UNITY_ENABLE_REFLECTION_BUFFERS UNITY_NO_CUBEMAP_ARRAY 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_DLDR_ENCODING ok=1 +Cmd: compileSnippet + api=4 type=1 insize=1028 outsize=218 kw=DIRECTIONAL pd=UNITY_NO_DXT5nm UNITY_ENABLE_REFLECTION_BUFFERS UNITY_NO_CUBEMAP_ARRAY 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_DLDR_ENCODING ok=1 +Cmd: preprocess + insize=4591 outsize=1121 ok=1 +Cmd: compileSnippet + api=4 type=0 insize=944 outsize=1414 kw=UNITY_PASS_SHADOWCASTER SHADOWS_DEPTH 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=944 outsize=218 kw=UNITY_PASS_SHADOWCASTER SHADOWS_DEPTH 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=0 insize=3944 outsize=1074 kw=UNITY_PASS_FORWARDBASE DIRECTIONAL LIGHTPROBE_SH 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 LIGHTPROBE_SH 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=0 insize=1028 outsize=538 kw=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=1028 outsize=218 kw=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