diff --git a/.vs/omega/v16/.suo b/.vs/omega/v16/.suo new file mode 100644 index 00000000..7a38624e Binary files /dev/null and b/.vs/omega/v16/.suo differ diff --git a/Assets/Prefabs/Cards/BigDamage2.0.prefab b/Assets/Prefabs/Cards/BigDamage2.0.prefab new file mode 100644 index 00000000..e09fba88 --- /dev/null +++ b/Assets/Prefabs/Cards/BigDamage2.0.prefab @@ -0,0 +1,753 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &180161071884897504 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6260354203227432148} + - component: {fileID: 5305405617702461058} + - component: {fileID: 7452676335175294479} + m_Layer: 5 + m_Name: Type + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6260354203227432148 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 180161071884897504} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.10754341, y: 0.10754341, z: 0.10754341} + m_Children: [] + m_Father: {fileID: 5275281635973267119} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -72.6, y: -62.9} + m_SizeDelta: {x: 543.4585, y: 388.6396} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5305405617702461058 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 180161071884897504} + m_CullTransparentMesh: 0 +--- !u!114 &7452676335175294479 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 180161071884897504} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 12800000, guid: 0598d25ccfa0d93409546a6ced54eaf1, type: 3} + m_FontSize: 300 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 3 + m_MaxSize: 300 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: Atk +--- !u!1 &629325215165448514 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8767717931599302190} + - component: {fileID: 6736994546382182834} + - component: {fileID: 9137540258689416172} + m_Layer: 5 + m_Name: Cost + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8767717931599302190 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 629325215165448514} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.10754341, y: 0.10754341, z: 0.10754341} + m_Children: [] + m_Father: {fileID: 5275281635973267119} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 74.9, y: -110.8} + m_SizeDelta: {x: 543.4585, y: 388.6396} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6736994546382182834 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 629325215165448514} + m_CullTransparentMesh: 0 +--- !u!114 &9137540258689416172 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 629325215165448514} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 12800000, guid: 0598d25ccfa0d93409546a6ced54eaf1, type: 3} + m_FontSize: 300 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 3 + m_MaxSize: 300 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: 2 +--- !u!1 &791335171018799650 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6182847522874783006} + - component: {fileID: 7262567844125658110} + - component: {fileID: 7496223879175152235} + - component: {fileID: 98511617725100211} + m_Layer: 5 + m_Name: Button + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6182847522874783006 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 791335171018799650} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 5275281635973267119} + m_RootOrder: 7 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0.0029296875, y: -0.00012207031} + m_SizeDelta: {x: 209.58911, y: 280.18066} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7262567844125658110 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 791335171018799650} + m_CullTransparentMesh: 0 +--- !u!114 &7496223879175152235 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 791335171018799650} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 0} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &98511617725100211 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 791335171018799650} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 7496223879175152235} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 577170475477919847} + m_TargetAssemblyTypeName: + m_MethodName: OnClick + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 +--- !u!1 &3884985340433146482 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 40552388036781699} + - component: {fileID: 1692196595981314415} + - component: {fileID: 5275574657873467134} + m_Layer: 5 + m_Name: Quantity + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &40552388036781699 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3884985340433146482} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.10754341, y: 0.10754341, z: 0.10754341} + m_Children: [] + m_Father: {fileID: 5275281635973267119} + m_RootOrder: 6 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -72.6, y: -110.8} + m_SizeDelta: {x: 543.4585, y: 388.6396} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1692196595981314415 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3884985340433146482} + m_CullTransparentMesh: 0 +--- !u!114 &5275574657873467134 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3884985340433146482} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 12800000, guid: 0598d25ccfa0d93409546a6ced54eaf1, type: 3} + m_FontSize: 300 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 3 + m_MaxSize: 300 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: 15 +--- !u!1 &5275281635973267118 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5275281635973267119} + - component: {fileID: 577170475477919847} + - component: {fileID: 6018476990147119635} + m_Layer: 5 + m_Name: BigDamage2.0 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5275281635973267119 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5275281635973267118} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 2826315097877943005} + - {fileID: 5275281636253898635} + - {fileID: 9109685917471376313} + - {fileID: 2134085545811277071} + - {fileID: 8767717931599302190} + - {fileID: 6260354203227432148} + - {fileID: 40552388036781699} + - {fileID: 6182847522874783006} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -13.724008, y: -3.3837428} + m_SizeDelta: {x: 209.59491, y: 280.18555} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &577170475477919847 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5275281635973267118} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c0cf382e614d3e84194ce693591df5d5, type: 3} + m_Name: + m_EditorClassIdentifier: + cardConfig: {fileID: 11400000, guid: 5169032180a01ac43905ed44dbad9b24, type: 2} + number: 0 + cardObject: {fileID: 5275281635973267118} + picture: {fileID: 3867272884074437558} + nameCard: {fileID: 0} + costTitle: {fileID: 5790211280368897764} + cost: {fileID: 9137540258689416172} + type: {fileID: 7452676335175294479} + quantity: {fileID: 5275574657873467134} +--- !u!222 &6018476990147119635 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5275281635973267118} + m_CullTransparentMesh: 0 +--- !u!1 &5275281636253898634 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5275281636253898635} + - component: {fileID: 5275281636253898633} + - component: {fileID: 5275281636253898632} + m_Layer: 5 + m_Name: BakgroundCard + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5275281636253898635 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5275281636253898634} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 5275281635973267119} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -0.000011444092, y: 0} + m_SizeDelta: {x: 209.59454, y: 280.18082} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5275281636253898633 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5275281636253898634} + m_CullTransparentMesh: 0 +--- !u!114 &5275281636253898632 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5275281636253898634} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &5371169253990228673 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2134085545811277071} + - component: {fileID: 5593008885591940988} + - component: {fileID: 5790211280368897764} + m_Layer: 5 + m_Name: CostTitle + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2134085545811277071 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5371169253990228673} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.10754341, y: 0.10754341, z: 0.10754341} + m_Children: [] + m_Father: {fileID: 5275281635973267119} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 74.9, y: -62.9} + m_SizeDelta: {x: 543.4585, y: 388.6396} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5593008885591940988 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5371169253990228673} + m_CullTransparentMesh: 0 +--- !u!114 &5790211280368897764 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5371169253990228673} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 12800000, guid: 0598d25ccfa0d93409546a6ced54eaf1, type: 3} + m_FontSize: 300 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 3 + m_MaxSize: 300 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: Stam +--- !u!1 &5732298070313197020 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2826315097877943005} + - component: {fileID: 2767704628927238152} + - component: {fileID: 3867272884074437558} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2826315097877943005 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5732298070313197020} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 5275281635973267119} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2767704628927238152 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5732298070313197020} + m_CullTransparentMesh: 0 +--- !u!114 &3867272884074437558 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5732298070313197020} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &7938349915442049418 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 9109685917471376313} + - component: {fileID: 8469703323797673536} + - component: {fileID: 1868264929454610775} + m_Layer: 5 + m_Name: Name + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &9109685917471376313 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7938349915442049418} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.10754341, y: 0.10754341, z: 0.10754341} + m_Children: [] + m_Father: {fileID: 5275281635973267119} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0.00024414, y: 103} + m_SizeDelta: {x: 1948.9277, y: 388.6396} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8469703323797673536 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7938349915442049418} + m_CullTransparentMesh: 0 +--- !u!114 &1868264929454610775 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7938349915442049418} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 12800000, guid: 0598d25ccfa0d93409546a6ced54eaf1, type: 3} + m_FontSize: 300 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 3 + m_MaxSize: 300 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: Big attack diff --git a/Assets/Prefabs/Cards/BigDamage2.0.prefab.meta b/Assets/Prefabs/Cards/BigDamage2.0.prefab.meta new file mode 100644 index 00000000..9d2d7d14 --- /dev/null +++ b/Assets/Prefabs/Cards/BigDamage2.0.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 57646900771fe384190cb1680ecf2215 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/SampleScene.unity b/Assets/Scenes/SampleScene.unity index c07a8a72..fdda6887 100644 --- a/Assets/Scenes/SampleScene.unity +++ b/Assets/Scenes/SampleScene.unity @@ -789,7 +789,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &519420034 MonoBehaviour: @@ -1016,7 +1016,7 @@ Transform: - {fileID: 1278751375} - {fileID: 1486114460} m_Father: {fileID: 0} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &770121095 GameObject: @@ -1680,7 +1680,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1193153763 GameObject: @@ -2174,6 +2174,22 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 + - config: {fileID: 11400000, guid: b9a9200a18ccfab4eb3d8871e3c75a3f, type: 2} + attackLoop: + - m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1357456002} + m_TargetAssemblyTypeName: LibraryTurnMethods, Assembly-CSharp + m_MethodName: Healing + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 currentEnemy: {fileID: 0} --- !u!114 &1357456002 MonoBehaviour: @@ -2930,3 +2946,100 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2146044858} m_CullTransparentMesh: 0 +--- !u!1001 &6779858315213757362 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 5275281635973267118, guid: 57646900771fe384190cb1680ecf2215, type: 3} + propertyPath: m_Name + value: BigDamage2.0 + objectReference: {fileID: 0} + - target: {fileID: 5275281635973267119, guid: 57646900771fe384190cb1680ecf2215, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 5275281635973267119, guid: 57646900771fe384190cb1680ecf2215, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 5275281635973267119, guid: 57646900771fe384190cb1680ecf2215, type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5275281635973267119, guid: 57646900771fe384190cb1680ecf2215, type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 5275281635973267119, guid: 57646900771fe384190cb1680ecf2215, type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 5275281635973267119, guid: 57646900771fe384190cb1680ecf2215, type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 5275281635973267119, guid: 57646900771fe384190cb1680ecf2215, type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 5275281635973267119, guid: 57646900771fe384190cb1680ecf2215, type: 3} + propertyPath: m_SizeDelta.x + value: 209.59491 + objectReference: {fileID: 0} + - target: {fileID: 5275281635973267119, guid: 57646900771fe384190cb1680ecf2215, type: 3} + propertyPath: m_SizeDelta.y + value: 280.18555 + objectReference: {fileID: 0} + - target: {fileID: 5275281635973267119, guid: 57646900771fe384190cb1680ecf2215, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5275281635973267119, guid: 57646900771fe384190cb1680ecf2215, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5275281635973267119, guid: 57646900771fe384190cb1680ecf2215, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5275281635973267119, guid: 57646900771fe384190cb1680ecf2215, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5275281635973267119, guid: 57646900771fe384190cb1680ecf2215, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5275281635973267119, guid: 57646900771fe384190cb1680ecf2215, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5275281635973267119, guid: 57646900771fe384190cb1680ecf2215, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5275281635973267119, guid: 57646900771fe384190cb1680ecf2215, type: 3} + propertyPath: m_AnchoredPosition.x + value: -13.724008 + objectReference: {fileID: 0} + - target: {fileID: 5275281635973267119, guid: 57646900771fe384190cb1680ecf2215, type: 3} + propertyPath: m_AnchoredPosition.y + value: -3.3837428 + objectReference: {fileID: 0} + - target: {fileID: 5275281635973267119, guid: 57646900771fe384190cb1680ecf2215, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5275281635973267119, guid: 57646900771fe384190cb1680ecf2215, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5275281635973267119, guid: 57646900771fe384190cb1680ecf2215, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 57646900771fe384190cb1680ecf2215, type: 3} diff --git a/Assets/Scripts/Enemy/LibraryTurnMethods.cs b/Assets/Scripts/Enemy/LibraryTurnMethods.cs index 93a02a71..3f426dd8 100644 --- a/Assets/Scripts/Enemy/LibraryTurnMethods.cs +++ b/Assets/Scripts/Enemy/LibraryTurnMethods.cs @@ -18,9 +18,8 @@ public class LibraryTurnMethods : MonoBehaviour Enemy _enemy = BaseEnemyTurn.basic.currentEnemy.GetComponent(); int _healing = _enemy.enemyConfig.enemyCharacteristics.healing; - Debug.Log(_enemy + " " + _healing); - _enemy.ChangeHp(-_healing); + _enemy.ChangeHp(-_healing); } } diff --git a/Library/Artifacts/13/135bed32508cff3fabc004308a22c12f b/Library/Artifacts/13/135bed32508cff3fabc004308a22c12f new file mode 100644 index 00000000..222f43b5 Binary files /dev/null and b/Library/Artifacts/13/135bed32508cff3fabc004308a22c12f differ diff --git a/Library/Artifacts/2b/2b051e81a8d23183afb06a373a5036cd b/Library/Artifacts/2b/2b051e81a8d23183afb06a373a5036cd new file mode 100644 index 00000000..2f2780f2 Binary files /dev/null and b/Library/Artifacts/2b/2b051e81a8d23183afb06a373a5036cd differ diff --git a/Library/Artifacts/2c/2cec2e392cb790127892f054996e942e b/Library/Artifacts/2c/2cec2e392cb790127892f054996e942e new file mode 100644 index 00000000..dcb73083 Binary files /dev/null and b/Library/Artifacts/2c/2cec2e392cb790127892f054996e942e differ diff --git a/Library/Artifacts/35/354dc0c94e7c1c0a6c1838e405bf427f b/Library/Artifacts/35/354dc0c94e7c1c0a6c1838e405bf427f new file mode 100644 index 00000000..9fe4fccb Binary files /dev/null and b/Library/Artifacts/35/354dc0c94e7c1c0a6c1838e405bf427f differ diff --git a/Library/Artifacts/3a/3abd71d593717e22fc906c0428d05352 b/Library/Artifacts/3a/3abd71d593717e22fc906c0428d05352 new file mode 100644 index 00000000..e402ce67 Binary files /dev/null and b/Library/Artifacts/3a/3abd71d593717e22fc906c0428d05352 differ diff --git a/Library/Artifacts/3e/3edc6b5b4a9eac394687dce4e8e897a4 b/Library/Artifacts/3e/3edc6b5b4a9eac394687dce4e8e897a4 new file mode 100644 index 00000000..83b73a44 Binary files /dev/null and b/Library/Artifacts/3e/3edc6b5b4a9eac394687dce4e8e897a4 differ diff --git a/Library/Artifacts/4f/4fbb660eed498ff2d7d2ecad5bcc0439 b/Library/Artifacts/4f/4fbb660eed498ff2d7d2ecad5bcc0439 new file mode 100644 index 00000000..5c41871b Binary files /dev/null and b/Library/Artifacts/4f/4fbb660eed498ff2d7d2ecad5bcc0439 differ diff --git a/Library/Artifacts/52/529fd0e53f5127e5a9f71cd1b3f6daa8 b/Library/Artifacts/52/529fd0e53f5127e5a9f71cd1b3f6daa8 new file mode 100644 index 00000000..0d7250f3 Binary files /dev/null and b/Library/Artifacts/52/529fd0e53f5127e5a9f71cd1b3f6daa8 differ diff --git a/Library/Artifacts/60/601b88bd9bd37621f82c5d2dce944b4c b/Library/Artifacts/60/601b88bd9bd37621f82c5d2dce944b4c new file mode 100644 index 00000000..23c3628e Binary files /dev/null and b/Library/Artifacts/60/601b88bd9bd37621f82c5d2dce944b4c differ diff --git a/Library/Artifacts/61/61217e80c110570962c6e7939452fcc9 b/Library/Artifacts/61/61217e80c110570962c6e7939452fcc9 new file mode 100644 index 00000000..e3e0429f Binary files /dev/null and b/Library/Artifacts/61/61217e80c110570962c6e7939452fcc9 differ diff --git a/Library/Artifacts/70/7092a06003003590e9231af6b8121b9c b/Library/Artifacts/70/7092a06003003590e9231af6b8121b9c new file mode 100644 index 00000000..15e6c753 Binary files /dev/null and b/Library/Artifacts/70/7092a06003003590e9231af6b8121b9c differ diff --git a/Library/Artifacts/76/7698b31a2be09fa44fed242ef1879a06 b/Library/Artifacts/76/7698b31a2be09fa44fed242ef1879a06 new file mode 100644 index 00000000..f968e30c Binary files /dev/null and b/Library/Artifacts/76/7698b31a2be09fa44fed242ef1879a06 differ diff --git a/Library/Artifacts/7a/7abeb7e98b03a62023a907b54082f601 b/Library/Artifacts/7a/7abeb7e98b03a62023a907b54082f601 new file mode 100644 index 00000000..feddd8a5 Binary files /dev/null and b/Library/Artifacts/7a/7abeb7e98b03a62023a907b54082f601 differ diff --git a/Library/Artifacts/7c/7cf76d16dbc002ecff1256119a4692f4 b/Library/Artifacts/7c/7cf76d16dbc002ecff1256119a4692f4 new file mode 100644 index 00000000..dc397c64 Binary files /dev/null and b/Library/Artifacts/7c/7cf76d16dbc002ecff1256119a4692f4 differ diff --git a/Library/Artifacts/81/81f87345a821c49e3e5968f00fc0c743 b/Library/Artifacts/81/81f87345a821c49e3e5968f00fc0c743 new file mode 100644 index 00000000..adbee371 Binary files /dev/null and b/Library/Artifacts/81/81f87345a821c49e3e5968f00fc0c743 differ diff --git a/Library/Artifacts/89/89477e0f84f72905c4d45749d2fefdde b/Library/Artifacts/89/89477e0f84f72905c4d45749d2fefdde new file mode 100644 index 00000000..f6920133 Binary files /dev/null and b/Library/Artifacts/89/89477e0f84f72905c4d45749d2fefdde differ diff --git a/Library/Artifacts/97/97e2407f68010e6023c5ef9c805b78e0 b/Library/Artifacts/97/97e2407f68010e6023c5ef9c805b78e0 new file mode 100644 index 00000000..42e718ef Binary files /dev/null and b/Library/Artifacts/97/97e2407f68010e6023c5ef9c805b78e0 differ diff --git a/Library/Artifacts/a6/a6f273b53565253fe0bd661b75e44c32 b/Library/Artifacts/a6/a6f273b53565253fe0bd661b75e44c32 new file mode 100644 index 00000000..54326a78 Binary files /dev/null and b/Library/Artifacts/a6/a6f273b53565253fe0bd661b75e44c32 differ diff --git a/Library/Artifacts/ae/ae4fd7dbc4085c68dd25d62da2e39c3e b/Library/Artifacts/ae/ae4fd7dbc4085c68dd25d62da2e39c3e new file mode 100644 index 00000000..2ce5a8ec Binary files /dev/null and b/Library/Artifacts/ae/ae4fd7dbc4085c68dd25d62da2e39c3e differ diff --git a/Library/Artifacts/af/af05c55c58798e06ce7e61864e25200d b/Library/Artifacts/af/af05c55c58798e06ce7e61864e25200d new file mode 100644 index 00000000..706e735a Binary files /dev/null and b/Library/Artifacts/af/af05c55c58798e06ce7e61864e25200d differ diff --git a/Library/Artifacts/af/afd141cf9aa09b1f24d7d35f07ee6584 b/Library/Artifacts/af/afd141cf9aa09b1f24d7d35f07ee6584 new file mode 100644 index 00000000..4898e52d Binary files /dev/null and b/Library/Artifacts/af/afd141cf9aa09b1f24d7d35f07ee6584 differ diff --git a/Library/Artifacts/b8/b81d4c32a4eb0defcf17e37b8da30f52 b/Library/Artifacts/b8/b81d4c32a4eb0defcf17e37b8da30f52 new file mode 100644 index 00000000..f5fa3600 Binary files /dev/null and b/Library/Artifacts/b8/b81d4c32a4eb0defcf17e37b8da30f52 differ diff --git a/Library/Artifacts/c1/c18d5f460ad370a2219303c73f9d1b7a b/Library/Artifacts/c1/c18d5f460ad370a2219303c73f9d1b7a new file mode 100644 index 00000000..3ca6c562 Binary files /dev/null and b/Library/Artifacts/c1/c18d5f460ad370a2219303c73f9d1b7a differ diff --git a/Library/Artifacts/c8/c8365094b84ebf089d65861ad06a6691 b/Library/Artifacts/c8/c8365094b84ebf089d65861ad06a6691 new file mode 100644 index 00000000..5a98e13c Binary files /dev/null and b/Library/Artifacts/c8/c8365094b84ebf089d65861ad06a6691 differ diff --git a/Library/Artifacts/ce/ce93173dece2bc5ac6e856ef4b91890e b/Library/Artifacts/ce/ce93173dece2bc5ac6e856ef4b91890e new file mode 100644 index 00000000..b1de1f39 Binary files /dev/null and b/Library/Artifacts/ce/ce93173dece2bc5ac6e856ef4b91890e differ diff --git a/Library/Artifacts/d2/d24a2507d94aa98291de356d4c665562 b/Library/Artifacts/d2/d24a2507d94aa98291de356d4c665562 new file mode 100644 index 00000000..5695004c Binary files /dev/null and b/Library/Artifacts/d2/d24a2507d94aa98291de356d4c665562 differ diff --git a/Library/Artifacts/da/da3d88676c51d25b9f0ba25cb7a53090 b/Library/Artifacts/da/da3d88676c51d25b9f0ba25cb7a53090 new file mode 100644 index 00000000..9cbbd501 Binary files /dev/null and b/Library/Artifacts/da/da3d88676c51d25b9f0ba25cb7a53090 differ diff --git a/Library/Artifacts/e7/e7d9df2803e80245d7abe42d535cd147 b/Library/Artifacts/e7/e7d9df2803e80245d7abe42d535cd147 new file mode 100644 index 00000000..c96ab9a9 Binary files /dev/null and b/Library/Artifacts/e7/e7d9df2803e80245d7abe42d535cd147 differ diff --git a/Library/Artifacts/e9/e99aa890e04fa823cccb688886fb96a0 b/Library/Artifacts/e9/e99aa890e04fa823cccb688886fb96a0 new file mode 100644 index 00000000..4028b67b Binary files /dev/null and b/Library/Artifacts/e9/e99aa890e04fa823cccb688886fb96a0 differ diff --git a/Library/Artifacts/f8/f8b10b1ab0d50100b4433abe69e2b46d b/Library/Artifacts/f8/f8b10b1ab0d50100b4433abe69e2b46d new file mode 100644 index 00000000..d0655ff6 Binary files /dev/null and b/Library/Artifacts/f8/f8b10b1ab0d50100b4433abe69e2b46d differ diff --git a/Library/CurrentLayout-default.dwlt b/Library/CurrentLayout-default.dwlt index fa25aa02..b501b77b 100644 --- a/Library/CurrentLayout-default.dwlt +++ b/Library/CurrentLayout-default.dwlt @@ -15,12 +15,12 @@ MonoBehaviour: m_PixelRect: serializedVersion: 2 x: 0 - y: 43.2 - width: 1536 - height: 780.8 + y: 43 + width: 1920 + height: 997 m_ShowMode: 4 - m_Title: Hierarchy - m_RootView: {fileID: 2} + m_Title: Scene + m_RootView: {fileID: 6} m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} m_Maximized: 1 @@ -33,16 +33,16 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 1 - m_Script: {fileID: 12008, guid: 0000000000000000e000000000000000, type: 0} + m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0} m_Name: m_EditorClassIdentifier: m_Children: + - {fileID: 9} - {fileID: 3} - - {fileID: 4} - - {fileID: 5} m_Position: serializedVersion: 2 x: 0 +<<<<<<< HEAD y: 0 width: 1536 height: 780.8 @@ -52,7 +52,150 @@ MonoBehaviour: m_TopViewHeight: 30 m_UseBottomView: 1 m_BottomViewHeight: 20 +======= + y: 30 + width: 1920 + height: 947 + m_MinSize: {x: 679, y: 492} + m_MaxSize: {x: 14002, y: 14042} + vertical: 0 + controlID: 599 +>>>>>>> f40b9c3824b3dc0c23f55e77dcc5a951712e02e8 --- !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: 1 + m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_Children: [] + m_Position: + serializedVersion: 2 + x: 1437 + y: 0 + width: 483 + height: 947 + m_MinSize: {x: 276, y: 71} + m_MaxSize: {x: 4001, y: 4021} + m_ActualView: {fileID: 14} + m_Panes: + - {fileID: 14} + 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: 1 + m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_Children: [] + m_Position: + serializedVersion: 2 + x: 0 +<<<<<<< HEAD + y: 30 + width: 1536 + height: 730.8 + m_MinSize: {x: 911, y: 442} + m_MaxSize: {x: 22006, y: 10021} + vertical: 0 + controlID: 478 +======= + y: 0 + width: 346 + height: 573 + m_MinSize: {x: 201, y: 221} + m_MaxSize: {x: 4001, y: 4021} + m_ActualView: {fileID: 15} + m_Panes: + - {fileID: 15} + m_Selected: 0 + m_LastSelected: 0 +>>>>>>> f40b9c3824b3dc0c23f55e77dcc5a951712e02e8 +--- !u!114 &5 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_Children: [] + m_Position: + serializedVersion: 2 + x: 0 +<<<<<<< HEAD + y: 760.8 + width: 1536 + height: 20 + m_MinSize: {x: 0, y: 0} + m_MaxSize: {x: 0, y: 0} +======= + y: 573 + width: 1437 + height: 374 + m_MinSize: {x: 231, y: 271} + m_MaxSize: {x: 10001, y: 10021} + m_ActualView: {fileID: 13} + m_Panes: + - {fileID: 13} + - {fileID: 18} + m_Selected: 0 + m_LastSelected: 0 +>>>>>>> f40b9c3824b3dc0c23f55e77dcc5a951712e02e8 +--- !u!114 &6 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12008, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_Children: + - {fileID: 7} + - {fileID: 2} + - {fileID: 8} + m_Position: + serializedVersion: 2 + x: 0 + y: 0 +<<<<<<< HEAD + width: 712 + height: 730.8 + m_MinSize: {x: 201, y: 442} + m_MaxSize: {x: 4001, y: 8042} + vertical: 1 + controlID: 479 +======= + width: 1920 + height: 997 + m_MinSize: {x: 875, y: 300} + m_MaxSize: {x: 10000, y: 10000} + m_UseTopView: 1 + m_TopViewHeight: 30 + m_UseBottomView: 1 + m_BottomViewHeight: 20 +>>>>>>> f40b9c3824b3dc0c23f55e77dcc5a951712e02e8 +--- !u!114 &7 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -69,42 +212,27 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1536 +<<<<<<< HEAD + width: 245.6 + height: 730.8 + m_MinSize: {x: 202, y: 221} + m_MaxSize: {x: 4002, y: 4021} + m_ActualView: {fileID: 12} + m_Panes: + - {fileID: 12} + m_Selected: 0 + m_LastSelected: 0 +======= + width: 1920 height: 30 m_MinSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0} m_LoadedToolbars: - - {fileID: 17} - m_MainToolbar: {fileID: 17} - m_LastLoadedLayoutName: ---- !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: 1 - m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_Children: - - {fileID: 6} - - {fileID: 7} - - {fileID: 8} - - {fileID: 9} - m_Position: - serializedVersion: 2 - x: 0 - y: 30 - width: 1536 - height: 730.8 - m_MinSize: {x: 911, y: 442} - m_MaxSize: {x: 22006, y: 10021} - vertical: 0 - controlID: 478 ---- !u!114 &5 + - {fileID: 19} + m_MainToolbar: {fileID: 19} + m_LastLoadedLayoutName: Default +>>>>>>> f40b9c3824b3dc0c23f55e77dcc5a951712e02e8 +--- !u!114 &8 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -119,13 +247,27 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 +<<<<<<< HEAD + x: 957.6 + y: 0 + width: 234.4 + height: 730.8 + m_MinSize: {x: 232, y: 271} + m_MaxSize: {x: 10002, y: 10021} + m_ActualView: {fileID: 14} + m_Panes: + - {fileID: 14} + m_Selected: 0 + m_LastSelected: 0 +======= x: 0 - y: 760.8 - width: 1536 + y: 977 + width: 1920 height: 20 m_MinSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0} ---- !u!114 &6 +>>>>>>> f40b9c3824b3dc0c23f55e77dcc5a951712e02e8 +--- !u!114 &9 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -139,86 +281,12 @@ MonoBehaviour: m_EditorClassIdentifier: m_Children: - {fileID: 10} - - {fileID: 11} + - {fileID: 5} m_Position: serializedVersion: 2 x: 0 y: 0 - width: 712 - height: 730.8 - m_MinSize: {x: 201, y: 442} - m_MaxSize: {x: 4001, y: 8042} - vertical: 1 - controlID: 479 ---- !u!114 &7 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 1 - m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_Children: [] - m_Position: - serializedVersion: 2 - x: 712 - y: 0 - width: 245.6 - height: 730.8 - m_MinSize: {x: 202, y: 221} - m_MaxSize: {x: 4002, y: 4021} - m_ActualView: {fileID: 12} - m_Panes: - - {fileID: 12} - m_Selected: 0 - m_LastSelected: 0 ---- !u!114 &8 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 1 - m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_Children: [] - m_Position: - serializedVersion: 2 - x: 957.6 - y: 0 - width: 234.4 - height: 730.8 - m_MinSize: {x: 232, y: 271} - m_MaxSize: {x: 10002, y: 10021} - m_ActualView: {fileID: 14} - m_Panes: - - {fileID: 14} - m_Selected: 0 - m_LastSelected: 0 ---- !u!114 &9 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 1 - m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_Children: [] - m_Position: - serializedVersion: 2 - x: 1192 - y: 0 +<<<<<<< HEAD width: 344 height: 730.8 m_MinSize: {x: 276, y: 71} @@ -228,6 +296,14 @@ MonoBehaviour: - {fileID: 13} m_Selected: 0 m_LastSelected: 0 +======= + width: 1437 + height: 947 + m_MinSize: {x: 403, y: 492} + m_MaxSize: {x: 10001, y: 14042} + vertical: 1 + controlID: 600 +>>>>>>> f40b9c3824b3dc0c23f55e77dcc5a951712e02e8 --- !u!114 &10 MonoBehaviour: m_ObjectHideFlags: 52 @@ -237,23 +313,22 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 1 - m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} + m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0} m_Name: m_EditorClassIdentifier: - m_Children: [] + m_Children: + - {fileID: 4} + - {fileID: 11} m_Position: serializedVersion: 2 x: 0 y: 0 - width: 712 - height: 245.6 - m_MinSize: {x: 201, y: 221} - m_MaxSize: {x: 4001, y: 4021} - m_ActualView: {fileID: 16} - m_Panes: - - {fileID: 16} - m_Selected: 0 - m_LastSelected: 0 + width: 1437 + height: 573 + m_MinSize: {x: 403, y: 221} + m_MaxSize: {x: 8003, y: 4021} + vertical: 0 + controlID: 601 --- !u!114 &11 MonoBehaviour: m_ObjectHideFlags: 52 @@ -264,11 +339,12 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: + m_Name: SceneView m_EditorClassIdentifier: m_Children: [] m_Position: serializedVersion: 2 +<<<<<<< HEAD x: 0 y: 245.6 width: 712 @@ -276,10 +352,21 @@ MonoBehaviour: m_MinSize: {x: 201, y: 221} m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 15} +======= + x: 346 + y: 0 + width: 1091 + height: 573 + m_MinSize: {x: 202, y: 221} + m_MaxSize: {x: 4002, y: 4021} + m_ActualView: {fileID: 16} +>>>>>>> f40b9c3824b3dc0c23f55e77dcc5a951712e02e8 m_Panes: - - {fileID: 15} + - {fileID: 16} + - {fileID: 17} + - {fileID: 12} m_Selected: 0 - m_LastSelected: 0 + m_LastSelected: 1 --- !u!114 &12 MonoBehaviour: m_ObjectHideFlags: 52 @@ -289,17 +376,18 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 1 - m_Script: {fileID: 12061, guid: 0000000000000000e000000000000000, type: 0} + m_Script: {fileID: 12111, guid: 0000000000000000e000000000000000, type: 0} m_Name: m_EditorClassIdentifier: - m_MinSize: {x: 200, y: 200} - m_MaxSize: {x: 4000, y: 4000} + m_MinSize: {x: 400, y: 100} + m_MaxSize: {x: 2048, y: 2048} m_TitleContent: - m_Text: Hierarchy - m_Image: {fileID: -3734745235275155857, guid: 0000000000000000d000000000000000, type: 0} + m_Text: Asset Store + m_Image: {fileID: -8693916549880196297, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: m_Pos: serializedVersion: 2 +<<<<<<< HEAD x: 712 y: 73.6 width: 243.6 @@ -334,6 +422,13 @@ MonoBehaviour: m_IsLocked: 0 m_CurrentSortingName: TransformSorting m_WindowGUID: 9e2b48974dcbc4042a43721353337445 +======= + x: 468 + y: 181 + width: 973 + height: 501 + m_ViewDataDictionary: {fileID: 0} +>>>>>>> f40b9c3824b3dc0c23f55e77dcc5a951712e02e8 --- !u!114 &13 MonoBehaviour: m_ObjectHideFlags: 52 @@ -343,6 +438,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 1 +<<<<<<< HEAD m_Script: {fileID: 12019, guid: 0000000000000000e000000000000000, type: 0} m_Name: m_EditorClassIdentifier: @@ -380,6 +476,8 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 1 +======= +>>>>>>> f40b9c3824b3dc0c23f55e77dcc5a951712e02e8 m_Script: {fileID: 12014, guid: 0000000000000000e000000000000000, type: 0} m_Name: m_EditorClassIdentifier: @@ -387,14 +485,21 @@ MonoBehaviour: m_MaxSize: {x: 10000, y: 10000} m_TitleContent: m_Text: Project - m_Image: {fileID: -5179483145760003458, guid: 0000000000000000d000000000000000, type: 0} + m_Image: {fileID: -5467254957812901981, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: m_Pos: serializedVersion: 2 +<<<<<<< HEAD x: 957.60004 y: 73.6 width: 232.4 height: 709.8 +======= + x: 0 + y: 646 + width: 1436 + height: 353 +>>>>>>> f40b9c3824b3dc0c23f55e77dcc5a951712e02e8 m_ViewDataDictionary: {fileID: 0} m_SearchFilter: m_NameFilter: @@ -409,22 +514,28 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets/Prefabs/Enemy + - Assets/Scripts/Configs m_Globs: [] m_OriginalText: m_ViewMode: 1 - m_StartGridSize: 16 + m_StartGridSize: 64 m_LastFolders: - - Assets/Prefabs/Enemy - m_LastFoldersGridSize: 16 - m_LastProjectPath: C:\Users\Dara\Documents\1\PO + - Assets/Scripts/Configs + m_LastFoldersGridSize: -1 + m_LastProjectPath: "E:\\Projects \u0441#\\Unity\\omega" m_LockTracker: m_IsLocked: 0 m_FolderTreeState: scrollPos: {x: 0, y: 0} +<<<<<<< HEAD m_SelectedIDs: e0410000 m_LastClickedID: 16864 m_ExpandedIDs: 00000000c4410000c8410000cc410000d2410000dc41000000ca9a3b +======= + m_SelectedIDs: 4c500000 + m_LastClickedID: 20556 + m_ExpandedIDs: 000000009c470000a6470000aa470000904b00004c50000000ca9a3b +>>>>>>> f40b9c3824b3dc0c23f55e77dcc5a951712e02e8 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -452,7 +563,11 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 +<<<<<<< HEAD m_ExpandedIDs: 00000000c441000000ca9a3b +======= + m_ExpandedIDs: 000000009c47000000ca9a3b +>>>>>>> f40b9c3824b3dc0c23f55e77dcc5a951712e02e8 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -480,7 +595,7 @@ MonoBehaviour: m_SelectedInstanceIDs: m_LastClickedInstanceID: 0 m_HadKeyboardFocusLastEvent: 1 - m_ExpandedInstanceIDs: + m_ExpandedInstanceIDs: c6230000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: Enemy_1 @@ -496,7 +611,7 @@ MonoBehaviour: m_IsRenaming: 0 m_OriginalEventType: 0 m_IsRenamingFilename: 1 - m_ClientGUIView: {fileID: 8} + m_ClientGUIView: {fileID: 0} m_CreateAssetUtility: m_EndAction: {fileID: 0} m_InstanceID: 0 @@ -505,9 +620,46 @@ MonoBehaviour: m_ResourceFile: m_NewAssetIndexInList: -1 m_ScrollPosition: {x: 0, y: 0} - m_GridSize: 16 + m_GridSize: 64 m_SkipHiddenPackages: 0 - m_DirectoriesAreaWidth: 110 + m_DirectoriesAreaWidth: 115 +--- !u!114 &14 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12019, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 275, y: 50} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: Inspector + m_Image: {fileID: -2667387946076563598, guid: 0000000000000000d000000000000000, type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 1437 + y: 73 + width: 482 + height: 926 + m_ViewDataDictionary: {fileID: 0} + m_ObjectsLockedBeforeSerialization: [] + m_InstanceIDsLockedBeforeSerialization: + m_PreviewResizer: + m_CachedPref: 160 + m_ControlHash: -371814159 + m_PrefName: Preview_InspectorPreview + m_LastInspectedObjectInstanceID: -1 + m_LastVerticalScrollValue: 0 + m_GlobalObjectId: + m_LockTracker: + m_IsLocked: 0 + m_PreviewWindow: {fileID: 0} --- !u!114 &15 MonoBehaviour: m_ObjectHideFlags: 52 @@ -517,18 +669,19 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 1 - m_Script: {fileID: 12015, guid: 0000000000000000e000000000000000, type: 0} + m_Script: {fileID: 12061, guid: 0000000000000000e000000000000000, type: 0} m_Name: m_EditorClassIdentifier: m_MinSize: {x: 200, y: 200} m_MaxSize: {x: 4000, y: 4000} m_TitleContent: - m_Text: Game - m_Image: {fileID: 4621777727084837110, guid: 0000000000000000d000000000000000, type: 0} + m_Text: Hierarchy + m_Image: {fileID: 7966133145522015247, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: m_Pos: serializedVersion: 2 x: 0 +<<<<<<< HEAD y: 319.2 width: 711 height: 464.19998 @@ -597,6 +750,41 @@ MonoBehaviour: m_LowResolutionForAspectRatios: 00000000000000000000 m_XRRenderMode: 0 m_RenderTexture: {fileID: 0} +======= + y: 73 + width: 345 + height: 552 + m_ViewDataDictionary: {fileID: 0} + m_SceneHierarchy: + m_TreeViewState: + scrollPos: {x: 0, y: 0} + m_SelectedIDs: f00c0000 + m_LastClickedID: 0 + m_ExpandedIDs: 6cfaffffa2450000 + m_RenameOverlay: + m_UserAcceptedRename: 0 + m_Name: + m_OriginalName: + m_EditFieldRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0 + height: 0 + m_UserData: 0 + m_IsWaitingForDelay: 0 + m_IsRenaming: 0 + m_OriginalEventType: 11 + m_IsRenamingFilename: 0 + m_ClientGUIView: {fileID: 0} + m_SearchString: + m_ExpandedScenes: [] + m_CurrenRootInstanceID: 0 + m_LockTracker: + m_IsLocked: 0 + m_CurrentSortingName: TransformSorting + m_WindowGUID: 48cd9c2ffbaeea94e8fe8c25b35c20f2 +>>>>>>> f40b9c3824b3dc0c23f55e77dcc5a951712e02e8 --- !u!114 &16 MonoBehaviour: m_ObjectHideFlags: 52 @@ -613,17 +801,17 @@ MonoBehaviour: m_MaxSize: {x: 4000, y: 4000} m_TitleContent: m_Text: Scene - m_Image: {fileID: 8634526014445323508, guid: 0000000000000000d000000000000000, type: 0} + m_Image: {fileID: 2593428753322112591, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: m_Pos: serializedVersion: 2 - x: 0 - y: 73.6 - width: 711 - height: 224.6 + x: 346 + y: 73 + width: 1089 + height: 552 m_ViewDataDictionary: {fileID: 0} m_ShowContextualTools: 0 - m_WindowGUID: fb2415ee78c1c6440873dec6365fe6db + m_WindowGUID: dcb296e780664f348b5987933a84ec2c m_Gizmos: 1 m_OverrideSceneCullingMask: 6917529027641081856 m_SceneIsLit: 1 @@ -633,9 +821,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: 1030.3785, y: 590.83777, z: -271.31418} + m_Target: {x: 0, y: 0, z: 0} speed: 2 - m_Value: {x: 1030.3785, y: 590.83777, z: -271.31418} + m_Value: {x: 0, y: 0, z: 0} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -686,9 +874,9 @@ MonoBehaviour: speed: 2 m_Value: {x: 0, y: 0, z: 0, w: 1} m_Size: - m_Target: 885.8325 + m_Target: 10 speed: 2 - m_Value: 885.8325 + m_Value: 10 m_Ortho: m_Target: 1 speed: 2 @@ -714,6 +902,120 @@ MonoBehaviour: m_LastLockedObject: {fileID: 0} m_ViewIsLockedToObject: 0 --- !u!114 &17 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12015, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: Game + m_Image: {fileID: -6423792434712278376, guid: 0000000000000000d000000000000000, type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 346 + y: 73 + width: 1089 + height: 552 + m_ViewDataDictionary: {fileID: 0} + m_SerializedViewNames: [] + m_SerializedViewValues: [] + m_PlayModeViewName: GameView + m_ShowGizmos: 0 + m_TargetDisplay: 0 + m_ClearColor: {r: 0, g: 0, b: 0, a: 0} + m_TargetSize: {x: 1920, y: 1080} + m_TextureFilterMode: 0 + m_TextureHideFlags: 61 + m_RenderIMGUI: 1 + m_MaximizeOnPlay: 0 + m_UseMipMap: 0 + m_VSyncEnabled: 0 + m_Gizmos: 0 + m_Stats: 0 + m_SelectedSizes: 00000000000000000000000006000000000000000000000000000000000000000000000000000000 + m_ZoomArea: + m_HRangeLocked: 0 + m_VRangeLocked: 0 + hZoomLockedByDefault: 0 + vZoomLockedByDefault: 0 + m_HBaseRangeMin: -960 + m_HBaseRangeMax: 960 + m_VBaseRangeMin: -540 + m_VBaseRangeMax: 540 + m_HAllowExceedBaseRangeMin: 1 + m_HAllowExceedBaseRangeMax: 1 + m_VAllowExceedBaseRangeMin: 1 + m_VAllowExceedBaseRangeMax: 1 + m_ScaleWithWindow: 0 + m_HSlider: 0 + m_VSlider: 0 + m_IgnoreScrollWheelUntilClicked: 0 + m_EnableMouseInput: 0 + m_EnableSliderZoomHorizontal: 0 + m_EnableSliderZoomVertical: 0 + m_UniformScale: 1 + m_UpDirection: 1 + m_DrawArea: + serializedVersion: 2 + x: 0 + y: 21 + width: 1089 + height: 531 + m_Scale: {x: 0.49166667, y: 0.49166667} + m_Translation: {x: 544.5, y: 265.5} + m_MarginLeft: 0 + m_MarginRight: 0 + m_MarginTop: 0 + m_MarginBottom: 0 + m_LastShownAreaInsideMargins: + serializedVersion: 2 + x: -1107.4576 + y: -540 + width: 2214.9153 + height: 1080 + m_MinimalGUI: 1 + m_defaultScale: 0.49166667 + m_LastWindowPixelSize: {x: 1089, y: 552} + m_ClearInEditMode: 1 + m_NoCameraWarning: 1 + m_LowResolutionForAspectRatios: 01000001000000000000 + m_XRRenderMode: 0 + m_RenderTexture: {fileID: 0} +--- !u!114 &18 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12003, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 100, y: 100} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: Console + m_Image: {fileID: -4327648978806127646, guid: 0000000000000000d000000000000000, type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 8 + y: 718 + width: 1366 + height: 308 + m_ViewDataDictionary: {fileID: 0} +--- !u!114 &19 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} diff --git a/Library/PackageManager/ProjectCache b/Library/PackageManager/ProjectCache index 9f67bb39..a74f7efc 100644 --- a/Library/PackageManager/ProjectCache +++ b/Library/PackageManager/ProjectCache @@ -1,20 +1,20 @@ m_ProjectFiles: m_ManifestFileStatus: - m_FilePath: C:/Users/Dara/Documents/1/PO/Packages/manifest.json + m_FilePath: "E:/Projects \u0441#/Unity/omega/Packages/manifest.json" m_PathExists: 1 m_ContentTrackingEnabled: 1 m_ModificationDate: serializedVersion: 2 - ticks: 637775701382787131 - m_Hash: 1047088217 + ticks: 637776731680169865 + m_Hash: 3969132510 m_LockFileStatus: - m_FilePath: C:/Users/Dara/Documents/1/PO/Packages/packages-lock.json + m_FilePath: "E:/Projects \u0441#/Unity/omega/Packages/packages-lock.json" m_PathExists: 1 m_ContentTrackingEnabled: 1 m_ModificationDate: serializedVersion: 2 - ticks: 637775804813421276 - m_Hash: 1522590259 + ticks: 637776731680169865 + m_Hash: 397170090 m_EmbeddedPackageManifests: m_ManifestsStatus: {} m_PackageAssets: @@ -25,7 +25,7 @@ m_PackageAssets: isDirectDependency: 1 version: 5.0.7 source: 1 - resolvedPath: C:\Users\Dara\Documents\1\PO\Library\PackageCache\com.unity.2d.animation@5.0.7 + resolvedPath: "E:\\Projects \u0441#\\Unity\\omega\\Library\\PackageCache\\com.unity.2d.animation@5.0.7" assetPath: Packages/com.unity.2d.animation name: com.unity.2d.animation displayName: 2D Animation @@ -184,7 +184,7 @@ m_PackageAssets: isDirectDependency: 1 version: 4.0.1 source: 1 - resolvedPath: C:\Users\Dara\Documents\1\PO\Library\PackageCache\com.unity.2d.pixel-perfect@4.0.1 + resolvedPath: "E:\\Projects \u0441#\\Unity\\omega\\Library\\PackageCache\\com.unity.2d.pixel-perfect@4.0.1" assetPath: Packages/com.unity.2d.pixel-perfect name: com.unity.2d.pixel-perfect displayName: 2D Pixel Perfect @@ -259,7 +259,7 @@ m_PackageAssets: isDirectDependency: 1 version: 4.1.0 source: 1 - resolvedPath: C:\Users\Dara\Documents\1\PO\Library\PackageCache\com.unity.2d.psdimporter@4.1.0 + resolvedPath: "E:\\Projects \u0441#\\Unity\\omega\\Library\\PackageCache\\com.unity.2d.psdimporter@4.1.0" assetPath: Packages/com.unity.2d.psdimporter name: com.unity.2d.psdimporter displayName: 2D PSD Importer @@ -390,7 +390,7 @@ m_PackageAssets: isDirectDependency: 1 version: 1.0.0 source: 2 - resolvedPath: C:\Users\Dara\Documents\1\PO\Library\PackageCache\com.unity.2d.sprite@1.0.0 + resolvedPath: "E:\\Projects \u0441#\\Unity\\omega\\Library\\PackageCache\\com.unity.2d.sprite@1.0.0" assetPath: Packages/com.unity.2d.sprite name: com.unity.2d.sprite displayName: 2D Sprite @@ -441,7 +441,7 @@ m_PackageAssets: isDirectDependency: 1 version: 5.1.4 source: 1 - resolvedPath: C:\Users\Dara\Documents\1\PO\Library\PackageCache\com.unity.2d.spriteshape@5.1.4 + resolvedPath: "E:\\Projects \u0441#\\Unity\\omega\\Library\\PackageCache\\com.unity.2d.spriteshape@5.1.4" assetPath: Packages/com.unity.2d.spriteshape name: com.unity.2d.spriteshape displayName: 2D SpriteShape @@ -592,7 +592,7 @@ m_PackageAssets: isDirectDependency: 1 version: 1.0.0 source: 2 - resolvedPath: C:\Users\Dara\Documents\1\PO\Library\PackageCache\com.unity.2d.tilemap@1.0.0 + resolvedPath: "E:\\Projects \u0441#\\Unity\\omega\\Library\\PackageCache\\com.unity.2d.tilemap@1.0.0" assetPath: Packages/com.unity.2d.tilemap name: com.unity.2d.tilemap displayName: 2D Tilemap Editor @@ -642,7 +642,7 @@ m_PackageAssets: isDirectDependency: 1 version: 1.9.0 source: 1 - resolvedPath: C:\Users\Dara\Documents\1\PO\Library\PackageCache\com.unity.collab-proxy@1.9.0 + resolvedPath: "E:\\Projects \u0441#\\Unity\\omega\\Library\\PackageCache\\com.unity.collab-proxy@1.9.0" assetPath: Packages/com.unity.collab-proxy name: com.unity.collab-proxy displayName: Version Control @@ -767,7 +767,7 @@ m_PackageAssets: isDirectDependency: 1 version: 2.0.7 source: 1 - resolvedPath: C:\Users\Dara\Documents\1\PO\Library\PackageCache\com.unity.ide.rider@2.0.7 + resolvedPath: "E:\\Projects \u0441#\\Unity\\omega\\Library\\PackageCache\\com.unity.ide.rider@2.0.7" assetPath: Packages/com.unity.ide.rider name: com.unity.ide.rider displayName: JetBrains Rider Editor @@ -876,7 +876,7 @@ m_PackageAssets: isDirectDependency: 1 version: 2.0.11 source: 1 - resolvedPath: C:\Users\Dara\Documents\1\PO\Library\PackageCache\com.unity.ide.visualstudio@2.0.11 + resolvedPath: "E:\\Projects \u0441#\\Unity\\omega\\Library\\PackageCache\\com.unity.ide.visualstudio@2.0.11" assetPath: Packages/com.unity.ide.visualstudio name: com.unity.ide.visualstudio displayName: Visual Studio Editor @@ -965,7 +965,7 @@ m_PackageAssets: isDirectDependency: 1 version: 1.2.4 source: 1 - resolvedPath: C:\Users\Dara\Documents\1\PO\Library\PackageCache\com.unity.ide.vscode@1.2.4 + resolvedPath: "E:\\Projects \u0441#\\Unity\\omega\\Library\\PackageCache\\com.unity.ide.vscode@1.2.4" assetPath: Packages/com.unity.ide.vscode name: com.unity.ide.vscode displayName: Visual Studio Code Editor @@ -1036,7 +1036,7 @@ m_PackageAssets: isDirectDependency: 1 version: 1.1.29 source: 1 - resolvedPath: C:\Users\Dara\Documents\1\PO\Library\PackageCache\com.unity.test-framework@1.1.29 + resolvedPath: "E:\\Projects \u0441#\\Unity\\omega\\Library\\PackageCache\\com.unity.test-framework@1.1.29" assetPath: Packages/com.unity.test-framework name: com.unity.test-framework displayName: Test Framework @@ -1129,7 +1129,7 @@ m_PackageAssets: isDirectDependency: 1 version: 3.0.6 source: 1 - resolvedPath: C:\Users\Dara\Documents\1\PO\Library\PackageCache\com.unity.textmeshpro@3.0.6 + resolvedPath: "E:\\Projects \u0441#\\Unity\\omega\\Library\\PackageCache\\com.unity.textmeshpro@3.0.6" assetPath: Packages/com.unity.textmeshpro name: com.unity.textmeshpro displayName: TextMeshPro @@ -1292,7 +1292,7 @@ m_PackageAssets: isDirectDependency: 1 version: 1.4.8 source: 1 - resolvedPath: C:\Users\Dara\Documents\1\PO\Library\PackageCache\com.unity.timeline@1.4.8 + resolvedPath: "E:\\Projects \u0441#\\Unity\\omega\\Library\\PackageCache\\com.unity.timeline@1.4.8" assetPath: Packages/com.unity.timeline name: com.unity.timeline displayName: Timeline @@ -1450,7 +1450,7 @@ m_PackageAssets: isDirectDependency: 1 version: 1.0.0 source: 1 - resolvedPath: C:\Users\Dara\Documents\1\PO\Library\PackageCache\com.unity.toolchain.win-x86_64-linux-x86_64@1.0.0 + resolvedPath: "E:\\Projects \u0441#\\Unity\\omega\\Library\\PackageCache\\com.unity.toolchain.win-x86_64-linux-x86_64@1.0.0" assetPath: Packages/com.unity.toolchain.win-x86_64-linux-x86_64 name: com.unity.toolchain.win-x86_64-linux-x86_64 displayName: Toolchain Win Linux x64 @@ -1544,7 +1544,7 @@ m_PackageAssets: isDirectDependency: 1 version: 1.0.0 source: 2 - resolvedPath: C:\Users\Dara\Documents\1\PO\Library\PackageCache\com.unity.ugui@1.0.0 + resolvedPath: "E:\\Projects \u0441#\\Unity\\omega\\Library\\PackageCache\\com.unity.ugui@1.0.0" assetPath: Packages/com.unity.ugui name: com.unity.ugui displayName: Unity UI @@ -1607,7 +1607,7 @@ m_PackageAssets: isDirectDependency: 1 version: 1.0.0 source: 2 - resolvedPath: C:\Users\Dara\Documents\1\PO\Library\PackageCache\com.unity.modules.ai@1.0.0 + resolvedPath: "E:\\Projects \u0441#\\Unity\\omega\\Library\\PackageCache\\com.unity.modules.ai@1.0.0" assetPath: Packages/com.unity.modules.ai name: com.unity.modules.ai displayName: AI @@ -1655,7 +1655,7 @@ m_PackageAssets: isDirectDependency: 1 version: 1.0.0 source: 2 - resolvedPath: C:\Users\Dara\Documents\1\PO\Library\PackageCache\com.unity.modules.androidjni@1.0.0 + resolvedPath: "E:\\Projects \u0441#\\Unity\\omega\\Library\\PackageCache\\com.unity.modules.androidjni@1.0.0" assetPath: Packages/com.unity.modules.androidjni name: com.unity.modules.androidjni displayName: Android JNI @@ -1703,7 +1703,7 @@ m_PackageAssets: isDirectDependency: 1 version: 1.0.0 source: 2 - resolvedPath: C:\Users\Dara\Documents\1\PO\Library\PackageCache\com.unity.modules.animation@1.0.0 + resolvedPath: "E:\\Projects \u0441#\\Unity\\omega\\Library\\PackageCache\\com.unity.modules.animation@1.0.0" assetPath: Packages/com.unity.modules.animation name: com.unity.modules.animation displayName: Animation @@ -1751,7 +1751,7 @@ m_PackageAssets: isDirectDependency: 1 version: 1.0.0 source: 2 - resolvedPath: C:\Users\Dara\Documents\1\PO\Library\PackageCache\com.unity.modules.assetbundle@1.0.0 + resolvedPath: "E:\\Projects \u0441#\\Unity\\omega\\Library\\PackageCache\\com.unity.modules.assetbundle@1.0.0" assetPath: Packages/com.unity.modules.assetbundle name: com.unity.modules.assetbundle displayName: Asset Bundle @@ -1799,7 +1799,7 @@ m_PackageAssets: isDirectDependency: 1 version: 1.0.0 source: 2 - resolvedPath: C:\Users\Dara\Documents\1\PO\Library\PackageCache\com.unity.modules.audio@1.0.0 + resolvedPath: "E:\\Projects \u0441#\\Unity\\omega\\Library\\PackageCache\\com.unity.modules.audio@1.0.0" assetPath: Packages/com.unity.modules.audio name: com.unity.modules.audio displayName: Audio @@ -1847,7 +1847,7 @@ m_PackageAssets: isDirectDependency: 1 version: 1.0.0 source: 2 - resolvedPath: C:\Users\Dara\Documents\1\PO\Library\PackageCache\com.unity.modules.cloth@1.0.0 + resolvedPath: "E:\\Projects \u0441#\\Unity\\omega\\Library\\PackageCache\\com.unity.modules.cloth@1.0.0" assetPath: Packages/com.unity.modules.cloth name: com.unity.modules.cloth displayName: Cloth @@ -1899,7 +1899,7 @@ m_PackageAssets: isDirectDependency: 1 version: 1.0.0 source: 2 - resolvedPath: C:\Users\Dara\Documents\1\PO\Library\PackageCache\com.unity.modules.director@1.0.0 + resolvedPath: "E:\\Projects \u0441#\\Unity\\omega\\Library\\PackageCache\\com.unity.modules.director@1.0.0" assetPath: Packages/com.unity.modules.director name: com.unity.modules.director displayName: Director @@ -1955,7 +1955,7 @@ m_PackageAssets: isDirectDependency: 1 version: 1.0.0 source: 2 - resolvedPath: C:\Users\Dara\Documents\1\PO\Library\PackageCache\com.unity.modules.imageconversion@1.0.0 + resolvedPath: "E:\\Projects \u0441#\\Unity\\omega\\Library\\PackageCache\\com.unity.modules.imageconversion@1.0.0" assetPath: Packages/com.unity.modules.imageconversion name: com.unity.modules.imageconversion displayName: Image Conversion @@ -2004,7 +2004,7 @@ m_PackageAssets: isDirectDependency: 1 version: 1.0.0 source: 2 - resolvedPath: C:\Users\Dara\Documents\1\PO\Library\PackageCache\com.unity.modules.imgui@1.0.0 + resolvedPath: "E:\\Projects \u0441#\\Unity\\omega\\Library\\PackageCache\\com.unity.modules.imgui@1.0.0" assetPath: Packages/com.unity.modules.imgui name: com.unity.modules.imgui displayName: IMGUI @@ -2052,7 +2052,7 @@ m_PackageAssets: isDirectDependency: 1 version: 1.0.0 source: 2 - resolvedPath: C:\Users\Dara\Documents\1\PO\Library\PackageCache\com.unity.modules.jsonserialize@1.0.0 + resolvedPath: "E:\\Projects \u0441#\\Unity\\omega\\Library\\PackageCache\\com.unity.modules.jsonserialize@1.0.0" assetPath: Packages/com.unity.modules.jsonserialize name: com.unity.modules.jsonserialize displayName: JSONSerialize @@ -2100,7 +2100,7 @@ m_PackageAssets: isDirectDependency: 1 version: 1.0.0 source: 2 - resolvedPath: C:\Users\Dara\Documents\1\PO\Library\PackageCache\com.unity.modules.particlesystem@1.0.0 + resolvedPath: "E:\\Projects \u0441#\\Unity\\omega\\Library\\PackageCache\\com.unity.modules.particlesystem@1.0.0" assetPath: Packages/com.unity.modules.particlesystem name: com.unity.modules.particlesystem displayName: Particle System @@ -2148,7 +2148,7 @@ m_PackageAssets: isDirectDependency: 1 version: 1.0.0 source: 2 - resolvedPath: C:\Users\Dara\Documents\1\PO\Library\PackageCache\com.unity.modules.physics@1.0.0 + resolvedPath: "E:\\Projects \u0441#\\Unity\\omega\\Library\\PackageCache\\com.unity.modules.physics@1.0.0" assetPath: Packages/com.unity.modules.physics name: com.unity.modules.physics displayName: Physics @@ -2196,7 +2196,7 @@ m_PackageAssets: isDirectDependency: 1 version: 1.0.0 source: 2 - resolvedPath: C:\Users\Dara\Documents\1\PO\Library\PackageCache\com.unity.modules.physics2d@1.0.0 + resolvedPath: "E:\\Projects \u0441#\\Unity\\omega\\Library\\PackageCache\\com.unity.modules.physics2d@1.0.0" assetPath: Packages/com.unity.modules.physics2d name: com.unity.modules.physics2d displayName: Physics 2D @@ -2244,7 +2244,7 @@ m_PackageAssets: isDirectDependency: 1 version: 1.0.0 source: 2 - resolvedPath: C:\Users\Dara\Documents\1\PO\Library\PackageCache\com.unity.modules.screencapture@1.0.0 + resolvedPath: "E:\\Projects \u0441#\\Unity\\omega\\Library\\PackageCache\\com.unity.modules.screencapture@1.0.0" assetPath: Packages/com.unity.modules.screencapture name: com.unity.modules.screencapture displayName: Screen Capture @@ -2296,7 +2296,7 @@ m_PackageAssets: isDirectDependency: 1 version: 1.0.0 source: 2 - resolvedPath: C:\Users\Dara\Documents\1\PO\Library\PackageCache\com.unity.modules.terrain@1.0.0 + resolvedPath: "E:\\Projects \u0441#\\Unity\\omega\\Library\\PackageCache\\com.unity.modules.terrain@1.0.0" assetPath: Packages/com.unity.modules.terrain name: com.unity.modules.terrain displayName: Terrain @@ -2344,7 +2344,7 @@ m_PackageAssets: isDirectDependency: 1 version: 1.0.0 source: 2 - resolvedPath: C:\Users\Dara\Documents\1\PO\Library\PackageCache\com.unity.modules.terrainphysics@1.0.0 + resolvedPath: "E:\\Projects \u0441#\\Unity\\omega\\Library\\PackageCache\\com.unity.modules.terrainphysics@1.0.0" assetPath: Packages/com.unity.modules.terrainphysics name: com.unity.modules.terrainphysics displayName: Terrain Physics @@ -2400,7 +2400,7 @@ m_PackageAssets: isDirectDependency: 1 version: 1.0.0 source: 2 - resolvedPath: C:\Users\Dara\Documents\1\PO\Library\PackageCache\com.unity.modules.tilemap@1.0.0 + resolvedPath: "E:\\Projects \u0441#\\Unity\\omega\\Library\\PackageCache\\com.unity.modules.tilemap@1.0.0" assetPath: Packages/com.unity.modules.tilemap name: com.unity.modules.tilemap displayName: Tilemap @@ -2452,7 +2452,7 @@ m_PackageAssets: isDirectDependency: 1 version: 1.0.0 source: 2 - resolvedPath: C:\Users\Dara\Documents\1\PO\Library\PackageCache\com.unity.modules.ui@1.0.0 + resolvedPath: "E:\\Projects \u0441#\\Unity\\omega\\Library\\PackageCache\\com.unity.modules.ui@1.0.0" assetPath: Packages/com.unity.modules.ui name: com.unity.modules.ui displayName: UI @@ -2500,7 +2500,7 @@ m_PackageAssets: isDirectDependency: 1 version: 1.0.0 source: 2 - resolvedPath: C:\Users\Dara\Documents\1\PO\Library\PackageCache\com.unity.modules.uielements@1.0.0 + resolvedPath: "E:\\Projects \u0441#\\Unity\\omega\\Library\\PackageCache\\com.unity.modules.uielements@1.0.0" assetPath: Packages/com.unity.modules.uielements name: com.unity.modules.uielements displayName: UIElements @@ -2564,7 +2564,7 @@ m_PackageAssets: isDirectDependency: 1 version: 1.0.0 source: 2 - resolvedPath: C:\Users\Dara\Documents\1\PO\Library\PackageCache\com.unity.modules.umbra@1.0.0 + resolvedPath: "E:\\Projects \u0441#\\Unity\\omega\\Library\\PackageCache\\com.unity.modules.umbra@1.0.0" assetPath: Packages/com.unity.modules.umbra name: com.unity.modules.umbra displayName: Umbra @@ -2612,7 +2612,7 @@ m_PackageAssets: isDirectDependency: 1 version: 1.0.0 source: 2 - resolvedPath: C:\Users\Dara\Documents\1\PO\Library\PackageCache\com.unity.modules.unityanalytics@1.0.0 + resolvedPath: "E:\\Projects \u0441#\\Unity\\omega\\Library\\PackageCache\\com.unity.modules.unityanalytics@1.0.0" assetPath: Packages/com.unity.modules.unityanalytics name: com.unity.modules.unityanalytics displayName: Unity Analytics @@ -2668,7 +2668,7 @@ m_PackageAssets: isDirectDependency: 1 version: 1.0.0 source: 2 - resolvedPath: C:\Users\Dara\Documents\1\PO\Library\PackageCache\com.unity.modules.unitywebrequest@1.0.0 + resolvedPath: "E:\\Projects \u0441#\\Unity\\omega\\Library\\PackageCache\\com.unity.modules.unitywebrequest@1.0.0" assetPath: Packages/com.unity.modules.unitywebrequest name: com.unity.modules.unitywebrequest displayName: Unity Web Request @@ -2716,7 +2716,7 @@ m_PackageAssets: isDirectDependency: 1 version: 1.0.0 source: 2 - resolvedPath: C:\Users\Dara\Documents\1\PO\Library\PackageCache\com.unity.modules.unitywebrequestassetbundle@1.0.0 + resolvedPath: "E:\\Projects \u0441#\\Unity\\omega\\Library\\PackageCache\\com.unity.modules.unitywebrequestassetbundle@1.0.0" assetPath: Packages/com.unity.modules.unitywebrequestassetbundle name: com.unity.modules.unitywebrequestassetbundle displayName: Unity Web Request Asset Bundle @@ -2772,7 +2772,7 @@ m_PackageAssets: isDirectDependency: 1 version: 1.0.0 source: 2 - resolvedPath: C:\Users\Dara\Documents\1\PO\Library\PackageCache\com.unity.modules.unitywebrequestaudio@1.0.0 + resolvedPath: "E:\\Projects \u0441#\\Unity\\omega\\Library\\PackageCache\\com.unity.modules.unitywebrequestaudio@1.0.0" assetPath: Packages/com.unity.modules.unitywebrequestaudio name: com.unity.modules.unitywebrequestaudio displayName: Unity Web Request Audio @@ -2828,7 +2828,7 @@ m_PackageAssets: isDirectDependency: 1 version: 1.0.0 source: 2 - resolvedPath: C:\Users\Dara\Documents\1\PO\Library\PackageCache\com.unity.modules.unitywebrequesttexture@1.0.0 + resolvedPath: "E:\\Projects \u0441#\\Unity\\omega\\Library\\PackageCache\\com.unity.modules.unitywebrequesttexture@1.0.0" assetPath: Packages/com.unity.modules.unitywebrequesttexture name: com.unity.modules.unitywebrequesttexture displayName: Unity Web Request Texture @@ -2884,7 +2884,7 @@ m_PackageAssets: isDirectDependency: 1 version: 1.0.0 source: 2 - resolvedPath: C:\Users\Dara\Documents\1\PO\Library\PackageCache\com.unity.modules.unitywebrequestwww@1.0.0 + resolvedPath: "E:\\Projects \u0441#\\Unity\\omega\\Library\\PackageCache\\com.unity.modules.unitywebrequestwww@1.0.0" assetPath: Packages/com.unity.modules.unitywebrequestwww name: com.unity.modules.unitywebrequestwww displayName: Unity Web Request WWW @@ -2956,7 +2956,7 @@ m_PackageAssets: isDirectDependency: 1 version: 1.0.0 source: 2 - resolvedPath: C:\Users\Dara\Documents\1\PO\Library\PackageCache\com.unity.modules.vehicles@1.0.0 + resolvedPath: "E:\\Projects \u0441#\\Unity\\omega\\Library\\PackageCache\\com.unity.modules.vehicles@1.0.0" assetPath: Packages/com.unity.modules.vehicles name: com.unity.modules.vehicles displayName: Vehicles @@ -3008,7 +3008,7 @@ m_PackageAssets: isDirectDependency: 1 version: 1.0.0 source: 2 - resolvedPath: C:\Users\Dara\Documents\1\PO\Library\PackageCache\com.unity.modules.video@1.0.0 + resolvedPath: "E:\\Projects \u0441#\\Unity\\omega\\Library\\PackageCache\\com.unity.modules.video@1.0.0" assetPath: Packages/com.unity.modules.video name: com.unity.modules.video displayName: Video @@ -3068,7 +3068,7 @@ m_PackageAssets: isDirectDependency: 1 version: 1.0.0 source: 2 - resolvedPath: C:\Users\Dara\Documents\1\PO\Library\PackageCache\com.unity.modules.vr@1.0.0 + resolvedPath: "E:\\Projects \u0441#\\Unity\\omega\\Library\\PackageCache\\com.unity.modules.vr@1.0.0" assetPath: Packages/com.unity.modules.vr name: com.unity.modules.vr displayName: VR @@ -3130,7 +3130,7 @@ m_PackageAssets: isDirectDependency: 1 version: 1.0.0 source: 2 - resolvedPath: C:\Users\Dara\Documents\1\PO\Library\PackageCache\com.unity.modules.wind@1.0.0 + resolvedPath: "E:\\Projects \u0441#\\Unity\\omega\\Library\\PackageCache\\com.unity.modules.wind@1.0.0" assetPath: Packages/com.unity.modules.wind name: com.unity.modules.wind displayName: Wind @@ -3178,7 +3178,7 @@ m_PackageAssets: isDirectDependency: 1 version: 1.0.0 source: 2 - resolvedPath: C:\Users\Dara\Documents\1\PO\Library\PackageCache\com.unity.modules.xr@1.0.0 + resolvedPath: "E:\\Projects \u0441#\\Unity\\omega\\Library\\PackageCache\\com.unity.modules.xr@1.0.0" assetPath: Packages/com.unity.modules.xr name: com.unity.modules.xr displayName: XR @@ -3238,7 +3238,7 @@ m_PackageAssets: isDirectDependency: 0 version: 1.0.0 source: 2 - resolvedPath: C:\Users\Dara\Documents\1\PO\Library\PackageCache\com.unity.modules.subsystems@1.0.0 + resolvedPath: "E:\\Projects \u0441#\\Unity\\omega\\Library\\PackageCache\\com.unity.modules.subsystems@1.0.0" assetPath: Packages/com.unity.modules.subsystems name: com.unity.modules.subsystems displayName: Subsystems @@ -3290,7 +3290,7 @@ m_PackageAssets: isDirectDependency: 0 version: 1.0.0 source: 2 - resolvedPath: C:\Users\Dara\Documents\1\PO\Library\PackageCache\com.unity.modules.uielementsnative@1.0.0 + resolvedPath: "E:\\Projects \u0441#\\Unity\\omega\\Library\\PackageCache\\com.unity.modules.uielementsnative@1.0.0" assetPath: Packages/com.unity.modules.uielementsnative name: com.unity.modules.uielementsnative displayName: UIElements Native @@ -3349,7 +3349,7 @@ m_PackageAssets: isDirectDependency: 0 version: 1.0.0 source: 1 - resolvedPath: C:\Users\Dara\Documents\1\PO\Library\PackageCache\com.unity.sysroot@1.0.0 + resolvedPath: "E:\\Projects \u0441#\\Unity\\omega\\Library\\PackageCache\\com.unity.sysroot@1.0.0" assetPath: Packages/com.unity.sysroot name: com.unity.sysroot displayName: Sysroot Base @@ -3424,7 +3424,7 @@ m_PackageAssets: isDirectDependency: 0 version: 1.0.0 source: 1 - resolvedPath: C:\Users\Dara\Documents\1\PO\Library\PackageCache\com.unity.sysroot.linux-x86_64@1.0.0 + resolvedPath: "E:\\Projects \u0441#\\Unity\\omega\\Library\\PackageCache\\com.unity.sysroot.linux-x86_64@1.0.0" assetPath: Packages/com.unity.sysroot.linux-x86_64 name: com.unity.sysroot.linux-x86_64 displayName: Sysroot Linux x64 @@ -3498,7 +3498,7 @@ m_PackageAssets: isDirectDependency: 0 version: 1.0.6 source: 1 - resolvedPath: C:\Users\Dara\Documents\1\PO\Library\PackageCache\com.unity.ext.nunit@1.0.6 + resolvedPath: "E:\\Projects \u0441#\\Unity\\omega\\Library\\PackageCache\\com.unity.ext.nunit@1.0.6" assetPath: Packages/com.unity.ext.nunit name: com.unity.ext.nunit displayName: Custom NUnit @@ -3514,18 +3514,8 @@ m_PackageAssets: errors: [] versions: all: - - 0.1.5-preview - - 0.1.6-preview - - 0.1.9-preview - - 1.0.0 - - 1.0.5 - 1.0.6 compatible: - - 0.1.5-preview - - 0.1.6-preview - - 0.1.9-preview - - 1.0.0 - - 1.0.5 - 1.0.6 verified: 1.0.6 dependencies: [] @@ -3546,7 +3536,7 @@ m_PackageAssets: entitlements: isAllowed: 1 isAssetStorePackage: 0 - datePublishedTicks: 637429759280000000 + datePublishedTicks: 0 documentationUrl: hasRepository: 1 repository: @@ -3559,7 +3549,7 @@ m_PackageAssets: isDirectDependency: 0 version: 1.1.0 source: 1 - resolvedPath: C:\Users\Dara\Documents\1\PO\Library\PackageCache\com.unity.mathematics@1.1.0 + resolvedPath: "E:\\Projects \u0441#\\Unity\\omega\\Library\\PackageCache\\com.unity.mathematics@1.1.0" assetPath: Packages/com.unity.mathematics name: com.unity.mathematics displayName: Mathematics @@ -3575,40 +3565,12 @@ m_PackageAssets: errors: [] versions: all: - - 0.0.12-preview.2 - - 0.0.12-preview.5 - - 0.0.12-preview.8 - - 0.0.12-preview.10 - - 0.0.12-preview.11 - - 0.0.12-preview.13 - - 0.0.12-preview.17 - - 0.0.12-preview.19 - - 0.0.12-preview.20 - - 1.0.0-preview.1 - - 1.0.1 - - 1.1.0-preview.1 - 1.1.0 - 1.2.1 - - 1.2.4 - - 1.2.5 compatible: - - 0.0.12-preview.2 - - 0.0.12-preview.5 - - 0.0.12-preview.8 - - 0.0.12-preview.10 - - 0.0.12-preview.11 - - 0.0.12-preview.13 - - 0.0.12-preview.17 - - 0.0.12-preview.19 - - 0.0.12-preview.20 - - 1.0.0-preview.1 - - 1.0.1 - - 1.1.0-preview.1 - 1.1.0 - 1.2.1 - - 1.2.4 - - 1.2.5 - verified: 1.2.5 + verified: 1.2.1 dependencies: [] resolvedDependencies: [] keywords: @@ -3625,7 +3587,7 @@ m_PackageAssets: entitlements: isAllowed: 1 isAssetStorePackage: 0 - datePublishedTicks: 636984649280000000 + datePublishedTicks: 0 documentationUrl: hasRepository: 1 repository: @@ -3638,7 +3600,7 @@ m_PackageAssets: isDirectDependency: 0 version: 4.0.3 source: 1 - resolvedPath: C:\Users\Dara\Documents\1\PO\Library\PackageCache\com.unity.2d.common@4.0.3 + resolvedPath: "E:\\Projects \u0441#\\Unity\\omega\\Library\\PackageCache\\com.unity.2d.common@4.0.3" assetPath: Packages/com.unity.2d.common name: com.unity.2d.common displayName: 2D Common @@ -3670,6 +3632,7 @@ m_PackageAssets: - 4.0.1 - 4.0.2 - 4.0.3 + - 4.0.4 - 5.0.0-pre.1 - 5.0.0-pre.2 - 5.0.0 @@ -3678,10 +3641,13 @@ m_PackageAssets: - 6.0.0-pre.4 - 6.0.0 - 6.0.1 + - 6.0.2 - 7.0.0-pre.3 + - 7.0.0-pre.4 compatible: - 4.0.3 - verified: 4.0.3 + - 4.0.4 + verified: 4.0.4 dependencies: - name: com.unity.2d.sprite version: 1.0.0 @@ -3727,7 +3693,7 @@ m_PackageAssets: isDirectDependency: 0 version: 4.0.2 source: 1 - resolvedPath: C:\Users\Dara\Documents\1\PO\Library\PackageCache\com.unity.2d.path@4.0.2 + resolvedPath: "E:\\Projects \u0441#\\Unity\\omega\\Library\\PackageCache\\com.unity.2d.path@4.0.2" assetPath: Packages/com.unity.2d.path name: com.unity.2d.path displayName: 2D Path @@ -3793,5 +3759,5 @@ m_PackageAssets: path: m_LocalPackages: m_LocalFileStatus: [] -m_ProjectPath: C:/Users/Dara/Documents/1/PO/Packages +m_ProjectPath: "E:/Projects \u0441#/Unity/omega/Packages" m_EditorVersion: 2020.3.19f1 (68f137dc9bbe) diff --git a/Library/PackageManager/ProjectCache.md5 b/Library/PackageManager/ProjectCache.md5 index 2b970949..53eb027a 100644 --- a/Library/PackageManager/ProjectCache.md5 +++ b/Library/PackageManager/ProjectCache.md5 @@ -1 +1 @@ -b4db11b227f21399b8c465ccc9c9db12 \ No newline at end of file +4f722bf03d9b00cab5a9e050cfe24946 \ No newline at end of file diff --git a/Library/ShaderCache/1/10d7f277d4e4058b0fefff9b7c6f5907.bin b/Library/ShaderCache/1/10d7f277d4e4058b0fefff9b7c6f5907.bin new file mode 100644 index 00000000..a27618db Binary files /dev/null and b/Library/ShaderCache/1/10d7f277d4e4058b0fefff9b7c6f5907.bin differ diff --git a/Library/ShaderCache/1/147f8e849dacbff49f2f0f010a6e1003.bin b/Library/ShaderCache/1/147f8e849dacbff49f2f0f010a6e1003.bin new file mode 100644 index 00000000..eb7ab758 Binary files /dev/null and b/Library/ShaderCache/1/147f8e849dacbff49f2f0f010a6e1003.bin differ diff --git a/Library/ShaderCache/1/15bd32fc19ef5694ab34c0a5e62609a8.bin b/Library/ShaderCache/1/15bd32fc19ef5694ab34c0a5e62609a8.bin new file mode 100644 index 00000000..8dcee396 Binary files /dev/null and b/Library/ShaderCache/1/15bd32fc19ef5694ab34c0a5e62609a8.bin differ diff --git a/Library/ShaderCache/2/26c150e34db75f81889ca6acb9b8998a.bin b/Library/ShaderCache/2/26c150e34db75f81889ca6acb9b8998a.bin new file mode 100644 index 00000000..db8b765c Binary files /dev/null and b/Library/ShaderCache/2/26c150e34db75f81889ca6acb9b8998a.bin differ diff --git a/Library/ShaderCache/2/270dd7923ff52af926b3e599b96d76b6.bin b/Library/ShaderCache/2/270dd7923ff52af926b3e599b96d76b6.bin new file mode 100644 index 00000000..ba7b4150 Binary files /dev/null and b/Library/ShaderCache/2/270dd7923ff52af926b3e599b96d76b6.bin differ diff --git a/Library/ShaderCache/2/2f03ee997783561a76fde3a0c4480c96.bin b/Library/ShaderCache/2/2f03ee997783561a76fde3a0c4480c96.bin new file mode 100644 index 00000000..a947a393 Binary files /dev/null and b/Library/ShaderCache/2/2f03ee997783561a76fde3a0c4480c96.bin differ diff --git a/Library/ShaderCache/3/305f19713fb56191d2f0383cebde49c4.bin b/Library/ShaderCache/3/305f19713fb56191d2f0383cebde49c4.bin new file mode 100644 index 00000000..dbb7dbbc Binary files /dev/null and b/Library/ShaderCache/3/305f19713fb56191d2f0383cebde49c4.bin differ diff --git a/Library/ShaderCache/3/3aa2038e4fdd69ed0b4d35d78105bd5f.bin b/Library/ShaderCache/3/3aa2038e4fdd69ed0b4d35d78105bd5f.bin new file mode 100644 index 00000000..65b0e9e5 Binary files /dev/null and b/Library/ShaderCache/3/3aa2038e4fdd69ed0b4d35d78105bd5f.bin differ diff --git a/Library/ShaderCache/4/437821105a190ba58fd0c169923acc31.bin b/Library/ShaderCache/4/437821105a190ba58fd0c169923acc31.bin new file mode 100644 index 00000000..79177ab3 Binary files /dev/null and b/Library/ShaderCache/4/437821105a190ba58fd0c169923acc31.bin differ diff --git a/Library/ShaderCache/4/4725e5ad2465bb29dc1ba1cca6edd807.bin b/Library/ShaderCache/4/4725e5ad2465bb29dc1ba1cca6edd807.bin new file mode 100644 index 00000000..871c9f83 Binary files /dev/null and b/Library/ShaderCache/4/4725e5ad2465bb29dc1ba1cca6edd807.bin differ diff --git a/Library/ShaderCache/4/47a1173f2cbf0bb6e6b0f1cf50f27b5d.bin b/Library/ShaderCache/4/47a1173f2cbf0bb6e6b0f1cf50f27b5d.bin new file mode 100644 index 00000000..242db694 Binary files /dev/null and b/Library/ShaderCache/4/47a1173f2cbf0bb6e6b0f1cf50f27b5d.bin differ diff --git a/Library/ShaderCache/5/5dfbfae1258fedd23b650389ed5eb47d.bin b/Library/ShaderCache/5/5dfbfae1258fedd23b650389ed5eb47d.bin new file mode 100644 index 00000000..dc3a340a Binary files /dev/null and b/Library/ShaderCache/5/5dfbfae1258fedd23b650389ed5eb47d.bin differ diff --git a/Library/ShaderCache/6/67e05de7e1bf2d0fe3395c069db2a1bd.bin b/Library/ShaderCache/6/67e05de7e1bf2d0fe3395c069db2a1bd.bin new file mode 100644 index 00000000..d05c3089 Binary files /dev/null and b/Library/ShaderCache/6/67e05de7e1bf2d0fe3395c069db2a1bd.bin differ diff --git a/Library/ShaderCache/6/6a96dde9a795b42548218573b0507526.bin b/Library/ShaderCache/6/6a96dde9a795b42548218573b0507526.bin new file mode 100644 index 00000000..0e14b6fd Binary files /dev/null and b/Library/ShaderCache/6/6a96dde9a795b42548218573b0507526.bin differ diff --git a/Library/ShaderCache/7/7146044dc006eea36dde49461078e570.bin b/Library/ShaderCache/7/7146044dc006eea36dde49461078e570.bin new file mode 100644 index 00000000..2e1cb512 Binary files /dev/null and b/Library/ShaderCache/7/7146044dc006eea36dde49461078e570.bin differ diff --git a/Library/ShaderCache/7/7528a1a3501935a816efcbc07f392b57.bin b/Library/ShaderCache/7/7528a1a3501935a816efcbc07f392b57.bin new file mode 100644 index 00000000..36efab9a Binary files /dev/null and b/Library/ShaderCache/7/7528a1a3501935a816efcbc07f392b57.bin differ diff --git a/Library/ShaderCache/8/896bb48db8b02d6e4dc95182193d0a3f.bin b/Library/ShaderCache/8/896bb48db8b02d6e4dc95182193d0a3f.bin new file mode 100644 index 00000000..30646a3c Binary files /dev/null and b/Library/ShaderCache/8/896bb48db8b02d6e4dc95182193d0a3f.bin differ diff --git a/Library/ShaderCache/9/91cc5c04cbd52341a97c991fca794c3b.bin b/Library/ShaderCache/9/91cc5c04cbd52341a97c991fca794c3b.bin new file mode 100644 index 00000000..9006c3e2 Binary files /dev/null and b/Library/ShaderCache/9/91cc5c04cbd52341a97c991fca794c3b.bin differ diff --git a/Library/ShaderCache/9/91e7d4135ad286efaa3cc099f63da5f2.bin b/Library/ShaderCache/9/91e7d4135ad286efaa3cc099f63da5f2.bin new file mode 100644 index 00000000..6d63448e Binary files /dev/null and b/Library/ShaderCache/9/91e7d4135ad286efaa3cc099f63da5f2.bin differ diff --git a/Library/ShaderCache/9/97a37ea46bb742cff1e755595abe4189.bin b/Library/ShaderCache/9/97a37ea46bb742cff1e755595abe4189.bin new file mode 100644 index 00000000..fa00166f Binary files /dev/null and b/Library/ShaderCache/9/97a37ea46bb742cff1e755595abe4189.bin differ diff --git a/Library/ShaderCache/a/a3131b3a4d34f5186b0c8e73f048ead5.bin b/Library/ShaderCache/a/a3131b3a4d34f5186b0c8e73f048ead5.bin new file mode 100644 index 00000000..9da7c0d0 Binary files /dev/null and b/Library/ShaderCache/a/a3131b3a4d34f5186b0c8e73f048ead5.bin differ diff --git a/Library/ShaderCache/a/a32ea29a7073e1aa9046e11725ebb2af.bin b/Library/ShaderCache/a/a32ea29a7073e1aa9046e11725ebb2af.bin new file mode 100644 index 00000000..cf443932 Binary files /dev/null and b/Library/ShaderCache/a/a32ea29a7073e1aa9046e11725ebb2af.bin differ diff --git a/Library/ShaderCache/a/a5b3c09fb8d1718cea9f49b3061cbec5.bin b/Library/ShaderCache/a/a5b3c09fb8d1718cea9f49b3061cbec5.bin new file mode 100644 index 00000000..2e1cb512 Binary files /dev/null and b/Library/ShaderCache/a/a5b3c09fb8d1718cea9f49b3061cbec5.bin differ diff --git a/Library/ShaderCache/a/a7c3b6a5e32d82fd63e6ee1be57a3477.bin b/Library/ShaderCache/a/a7c3b6a5e32d82fd63e6ee1be57a3477.bin new file mode 100644 index 00000000..9006c3e2 Binary files /dev/null and b/Library/ShaderCache/a/a7c3b6a5e32d82fd63e6ee1be57a3477.bin differ diff --git a/Library/ShaderCache/b/b61469bef4ba53725e756d24c4cbbb31.bin b/Library/ShaderCache/b/b61469bef4ba53725e756d24c4cbbb31.bin new file mode 100644 index 00000000..5a426634 Binary files /dev/null and b/Library/ShaderCache/b/b61469bef4ba53725e756d24c4cbbb31.bin differ diff --git a/Library/ShaderCache/b/bad7ef642de456d49c64c9fadf3b7773.bin b/Library/ShaderCache/b/bad7ef642de456d49c64c9fadf3b7773.bin new file mode 100644 index 00000000..ba7b4150 Binary files /dev/null and b/Library/ShaderCache/b/bad7ef642de456d49c64c9fadf3b7773.bin differ diff --git a/Library/ShaderCache/c/c4a25852fc7bdceefa34e8034db043b2.bin b/Library/ShaderCache/c/c4a25852fc7bdceefa34e8034db043b2.bin new file mode 100644 index 00000000..32dedc6e Binary files /dev/null and b/Library/ShaderCache/c/c4a25852fc7bdceefa34e8034db043b2.bin differ diff --git a/Library/ShaderCache/d/d3a502710624706510bdd3be2f02dc88.bin b/Library/ShaderCache/d/d3a502710624706510bdd3be2f02dc88.bin new file mode 100644 index 00000000..871c9f83 Binary files /dev/null and b/Library/ShaderCache/d/d3a502710624706510bdd3be2f02dc88.bin differ diff --git a/Library/ShaderCache/d/d9841e4c784d99507e9241a265c0f502.bin b/Library/ShaderCache/d/d9841e4c784d99507e9241a265c0f502.bin new file mode 100644 index 00000000..a104ee59 Binary files /dev/null and b/Library/ShaderCache/d/d9841e4c784d99507e9241a265c0f502.bin differ diff --git a/Library/ShaderCache/d/deed2e9ffa4f90dffd156d9ee07d7d71.bin b/Library/ShaderCache/d/deed2e9ffa4f90dffd156d9ee07d7d71.bin new file mode 100644 index 00000000..5f9e16fe Binary files /dev/null and b/Library/ShaderCache/d/deed2e9ffa4f90dffd156d9ee07d7d71.bin differ diff --git a/Library/ShaderCache/e/e0ce193b871798d1c41ad19cfffac815.bin b/Library/ShaderCache/e/e0ce193b871798d1c41ad19cfffac815.bin new file mode 100644 index 00000000..79177ab3 Binary files /dev/null and b/Library/ShaderCache/e/e0ce193b871798d1c41ad19cfffac815.bin differ diff --git a/Library/ShaderCache/e/e9c63d9213d684f522a74b2f3200fbb1.bin b/Library/ShaderCache/e/e9c63d9213d684f522a74b2f3200fbb1.bin new file mode 100644 index 00000000..6d63448e Binary files /dev/null and b/Library/ShaderCache/e/e9c63d9213d684f522a74b2f3200fbb1.bin differ diff --git a/Library/ShaderCache/f/f0f55efb4a8aae92336b1c59bd200475.bin b/Library/ShaderCache/f/f0f55efb4a8aae92336b1c59bd200475.bin new file mode 100644 index 00000000..30646a3c Binary files /dev/null and b/Library/ShaderCache/f/f0f55efb4a8aae92336b1c59bd200475.bin differ diff --git a/Library/ShaderCache/f/fc039da6e1733a11ef644fbacbb87104.bin b/Library/ShaderCache/f/fc039da6e1733a11ef644fbacbb87104.bin new file mode 100644 index 00000000..cf443932 Binary files /dev/null and b/Library/ShaderCache/f/fc039da6e1733a11ef644fbacbb87104.bin differ diff --git a/Library/StateCache/MainStageHierarchy/21/21cdc808b271872e07bcb7ca60ff1025.json b/Library/StateCache/MainStageHierarchy/21/21cdc808b271872e07bcb7ca60ff1025.json index 8ef437d2..691b9c67 100644 --- a/Library/StateCache/MainStageHierarchy/21/21cdc808b271872e07bcb7ca60ff1025.json +++ b/Library/StateCache/MainStageHierarchy/21/21cdc808b271872e07bcb7ca60ff1025.json @@ -1 +1 @@ -{"m_ScrollY":0.0,"m_ExpandedSceneGameObjectInstanceIDs":[],"m_LastClickedInstanceID":0,"m_OpenSceneGUIDs":[]} \ No newline at end of file +{"m_ScrollY":0.0,"m_ExpandedSceneGameObjectInstanceIDs":[-1428],"m_LastClickedInstanceID":0,"m_OpenSceneGUIDs":["2cda990e2423bbf4892e6590ba056729"]} \ No newline at end of file diff --git a/Library/StateCache/MainStageHierarchy/40/405ba8490b2dfcc2c86e0b0dcf096a15.json b/Library/StateCache/MainStageHierarchy/40/405ba8490b2dfcc2c86e0b0dcf096a15.json new file mode 100644 index 00000000..8ef437d2 --- /dev/null +++ b/Library/StateCache/MainStageHierarchy/40/405ba8490b2dfcc2c86e0b0dcf096a15.json @@ -0,0 +1 @@ +{"m_ScrollY":0.0,"m_ExpandedSceneGameObjectInstanceIDs":[],"m_LastClickedInstanceID":0,"m_OpenSceneGUIDs":[]} \ No newline at end of file diff --git a/Library/StateCache/MainStageHierarchy/5e/5e4273dd12045ed9dd2facdfcc8fc4ac.json b/Library/StateCache/MainStageHierarchy/5e/5e4273dd12045ed9dd2facdfcc8fc4ac.json new file mode 100644 index 00000000..d6a0e0fb --- /dev/null +++ b/Library/StateCache/MainStageHierarchy/5e/5e4273dd12045ed9dd2facdfcc8fc4ac.json @@ -0,0 +1 @@ +{"m_ScrollY":0.0,"m_ExpandedSceneGameObjectInstanceIDs":[],"m_LastClickedInstanceID":0,"m_OpenSceneGUIDs":["2cda990e2423bbf4892e6590ba056729"]} \ No newline at end of file diff --git a/Library/StateCache/SceneView/38/38c4cb189d61e3ab19b07ae4fcb90589.json b/Library/StateCache/SceneView/38/38c4cb189d61e3ab19b07ae4fcb90589.json new file mode 100644 index 00000000..253d82ac --- /dev/null +++ b/Library/StateCache/SceneView/38/38c4cb189d61e3ab19b07ae4fcb90589.json @@ -0,0 +1 @@ +{"cameraMode":{"drawMode":0,"name":"Shaded","section":"Shading Mode"},"sceneLighting":true,"audioPlay":false,"sceneViewState":{"m_AlwaysRefresh":false,"showFog":true,"showSkybox":true,"showFlares":true,"showImageEffects":true,"showParticleSystems":true,"showVisualEffectGraphs":true,"m_FxEnabled":true},"in2DMode":true,"pivot":{"x":0.0,"y":0.0,"z":0.0},"rotation":{"x":0.0,"y":0.0,"z":0.0,"w":1.0},"size":10.0,"orthographic":true} \ No newline at end of file diff --git a/Library/StateCache/SceneView/5f/5f3d788910343b2ab9e4d66e5727ee93.json b/Library/StateCache/SceneView/5f/5f3d788910343b2ab9e4d66e5727ee93.json new file mode 100644 index 00000000..253d82ac --- /dev/null +++ b/Library/StateCache/SceneView/5f/5f3d788910343b2ab9e4d66e5727ee93.json @@ -0,0 +1 @@ +{"cameraMode":{"drawMode":0,"name":"Shaded","section":"Shading Mode"},"sceneLighting":true,"audioPlay":false,"sceneViewState":{"m_AlwaysRefresh":false,"showFog":true,"showSkybox":true,"showFlares":true,"showImageEffects":true,"showParticleSystems":true,"showVisualEffectGraphs":true,"m_FxEnabled":true},"in2DMode":true,"pivot":{"x":0.0,"y":0.0,"z":0.0},"rotation":{"x":0.0,"y":0.0,"z":0.0,"w":1.0},"size":10.0,"orthographic":true} \ No newline at end of file diff --git a/Library/StateCache/SceneView/6f/6f472f75b12f18064a74840d2db12cb4.json b/Library/StateCache/SceneView/6f/6f472f75b12f18064a74840d2db12cb4.json new file mode 100644 index 00000000..253d82ac --- /dev/null +++ b/Library/StateCache/SceneView/6f/6f472f75b12f18064a74840d2db12cb4.json @@ -0,0 +1 @@ +{"cameraMode":{"drawMode":0,"name":"Shaded","section":"Shading Mode"},"sceneLighting":true,"audioPlay":false,"sceneViewState":{"m_AlwaysRefresh":false,"showFog":true,"showSkybox":true,"showFlares":true,"showImageEffects":true,"showParticleSystems":true,"showVisualEffectGraphs":true,"m_FxEnabled":true},"in2DMode":true,"pivot":{"x":0.0,"y":0.0,"z":0.0},"rotation":{"x":0.0,"y":0.0,"z":0.0,"w":1.0},"size":10.0,"orthographic":true} \ No newline at end of file diff --git a/Library/StateCache/SceneView/ed/ed932c76a4f9984e99c56ba504a04aef.json b/Library/StateCache/SceneView/ed/ed932c76a4f9984e99c56ba504a04aef.json new file mode 100644 index 00000000..253d82ac --- /dev/null +++ b/Library/StateCache/SceneView/ed/ed932c76a4f9984e99c56ba504a04aef.json @@ -0,0 +1 @@ +{"cameraMode":{"drawMode":0,"name":"Shaded","section":"Shading Mode"},"sceneLighting":true,"audioPlay":false,"sceneViewState":{"m_AlwaysRefresh":false,"showFog":true,"showSkybox":true,"showFlares":true,"showImageEffects":true,"showParticleSystems":true,"showVisualEffectGraphs":true,"m_FxEnabled":true},"in2DMode":true,"pivot":{"x":0.0,"y":0.0,"z":0.0},"rotation":{"x":0.0,"y":0.0,"z":0.0,"w":1.0},"size":10.0,"orthographic":true} \ No newline at end of file diff --git a/Library/StateCache/SceneView/f5/f5835675f178d7f69624e638a78a062c.json b/Library/StateCache/SceneView/f5/f5835675f178d7f69624e638a78a062c.json new file mode 100644 index 00000000..253d82ac --- /dev/null +++ b/Library/StateCache/SceneView/f5/f5835675f178d7f69624e638a78a062c.json @@ -0,0 +1 @@ +{"cameraMode":{"drawMode":0,"name":"Shaded","section":"Shading Mode"},"sceneLighting":true,"audioPlay":false,"sceneViewState":{"m_AlwaysRefresh":false,"showFog":true,"showSkybox":true,"showFlares":true,"showImageEffects":true,"showParticleSystems":true,"showVisualEffectGraphs":true,"m_FxEnabled":true},"in2DMode":true,"pivot":{"x":0.0,"y":0.0,"z":0.0},"rotation":{"x":0.0,"y":0.0,"z":0.0,"w":1.0},"size":10.0,"orthographic":true} \ No newline at end of file diff --git a/Logs/AssetImportWorker0.log b/Logs/AssetImportWorker0.log index b9ee4b3a..107ca516 100644 --- a/Logs/AssetImportWorker0.log +++ b/Logs/AssetImportWorker0.log @@ -1,6 +1,6 @@ Using pre-set license Built from '2020.3/staging' branch; Version is '2020.3.19f1 (68f137dc9bbe) revision 6877495'; Using compiler version '192528614'; Build Type 'Release' -OS: 'Windows 10 Home; OS build 19043.1466; Version 2009; 64bit' Language: 'ru' Physical Memory: 8029 MB +OS: 'Windows 10 Pro; OS build 19043.1415; Version 2009; 64bit' Language: 'ru' Physical Memory: 32637 MB BatchMode: 1, IsHumanControllingUs: 0, StartBugReporterOnCrash: 0, Is64bit: 1, IsPro: 0 COMMAND LINE ARGUMENTS: @@ -11,36 +11,47 @@ C:\Program Files\Unity\Hub\Editor\2020.3.19f1\Editor\Unity.exe -name AssetImportWorker0 -projectPath -C:/Users/Dara/Documents/1/PO +E:/Projects с#/Unity/omega -logFile Logs/AssetImportWorker0.log -srvPort +<<<<<<< HEAD 61130 Successfully changed project path to: C:/Users/Dara/Documents/1/PO C:/Users/Dara/Documents/1/PO Using Asset Import Pipeline V2. Refreshing native plugins compatible for Editor in 49.27 ms, found 3 plugins. +======= +51107 +Successfully changed project path to: E:/Projects с#/Unity/omega +E:/Projects с#/Unity/omega +Using Asset Import Pipeline V2. +Refreshing native plugins compatible for Editor in 32.84 ms, found 3 plugins. +>>>>>>> f40b9c3824b3dc0c23f55e77dcc5a951712e02e8 Preloading 0 native plugins for Editor in 0.00 ms. Initialize engine version: 2020.3.19f1 (68f137dc9bbe) [Subsystems] Discovering subsystems at path C:/Program Files/Unity/Hub/Editor/2020.3.19f1/Editor/Data/Resources/UnitySubsystems -[Subsystems] Discovering subsystems at path C:/Users/Dara/Documents/1/PO/Assets +[Subsystems] Discovering subsystems at path E:/Projects с#/Unity/omega/Assets GfxDevice: creating device client; threaded=0 Direct3D: - Version: Direct3D 11.0 [level 11.1] - Renderer: NVIDIA GeForce GTX 1650 (ID=0x1f99) + Version: Direct3D 11.0 [level 11.0] + Renderer: NVIDIA GeForce GT 730 (ID=0x1287) Vendor: - VRAM: 3962 MB - Driver: 30.0.14.9709 + VRAM: 984 MB + Driver: 30.0.14.7212 Initialize mono Mono path[0] = 'C:/Program Files/Unity/Hub/Editor/2020.3.19f1/Editor/Data/Managed' Mono path[1] = 'C:/Program Files/Unity/Hub/Editor/2020.3.19f1/Editor/Data/MonoBleedingEdge/lib/mono/unityjit' Mono config path = 'C:/Program Files/Unity/Hub/Editor/2020.3.19f1/Editor/Data/MonoBleedingEdge/etc' +<<<<<<< HEAD Using monoOptions --debugger-agent=transport=dt_socket,embedding=1,server=y,suspend=n,address=127.0.0.1:56056 +======= +Using monoOptions --debugger-agent=transport=dt_socket,embedding=1,server=y,suspend=n,address=127.0.0.1:56696 +>>>>>>> f40b9c3824b3dc0c23f55e77dcc5a951712e02e8 Begin MonoManager ReloadAssembly Registering precompiled unity dll's ... -Register platform support module: C:/Program Files/Unity/Hub/Editor/2020.3.19f1/Editor/Data/PlaybackEngines/WebGLSupport/UnityEditor.WebGL.Extensions.dll -Register platform support module: C:/Program Files/Unity/Hub/Editor/2020.3.19f1/Editor/Data/PlaybackEngines/MacStandaloneSupport/UnityEditor.OSXStandalone.Extensions.dll Register platform support module: C:/Program Files/Unity/Hub/Editor/2020.3.19f1/Editor/Data/PlaybackEngines/WindowsStandaloneSupport/UnityEditor.WindowsStandalone.Extensions.dll +<<<<<<< HEAD Register platform support module: C:/Program Files/Unity/Hub/Editor/2020.3.19f1/Editor/Data/PlaybackEngines/LinuxStandaloneSupport/UnityEditor.LinuxStandalone.Extensions.dll Registered in 0.002366 seconds. Native extension for LinuxStandalone target not found @@ -54,11 +65,23 @@ Mono: successfully reloaded assembly Domain Reload Profiling: ReloadAssembly (3595ms) BeginReloadAssembly (63ms) +======= +Registered in 0.001218 seconds. +Native extension for WindowsStandalone target not found +Refreshing native plugins compatible for Editor in 31.57 ms, found 3 plugins. +Preloading 0 native plugins for Editor in 0.00 ms. +Mono: successfully reloaded assembly +- Completed reload, in 1.326 seconds +Domain Reload Profiling: + ReloadAssembly (1326ms) + BeginReloadAssembly (38ms) +>>>>>>> f40b9c3824b3dc0c23f55e77dcc5a951712e02e8 ExecutionOrderSort (0ms) DisableScriptedObjects (0ms) BackupInstance (0ms) ReleaseScriptingObjects (0ms) CreateAndSetChildDomain (1ms) +<<<<<<< HEAD EndReloadAssembly (577ms) LoadAssemblies (62ms) RebuildTransferFunctionScriptingTraits (0ms) @@ -66,23 +89,43 @@ Domain Reload Profiling: ReleaseScriptCaches (0ms) RebuildScriptCaches (31ms) SetupLoadedEditorAssemblies (216ms) +======= + EndReloadAssembly (293ms) + LoadAssemblies (36ms) + RebuildTransferFunctionScriptingTraits (0ms) + SetupTypeCache (99ms) + ReleaseScriptCaches (0ms) + RebuildScriptCaches (20ms) + SetupLoadedEditorAssemblies (123ms) +>>>>>>> f40b9c3824b3dc0c23f55e77dcc5a951712e02e8 LogAssemblyErrors (0ms) - InitializePlatformSupportModulesInManaged (6ms) + InitializePlatformSupportModulesInManaged (3ms) SetLoadedEditorAssemblies (0ms) +<<<<<<< HEAD RefreshPlugins (41ms) BeforeProcessingInitializeOnLoad (18ms) ProcessInitializeOnLoadAttributes (107ms) ProcessInitializeOnLoadMethodAttributes (43ms) +======= + RefreshPlugins (32ms) + BeforeProcessingInitializeOnLoad (12ms) + ProcessInitializeOnLoadAttributes (57ms) + ProcessInitializeOnLoadMethodAttributes (19ms) +>>>>>>> f40b9c3824b3dc0c23f55e77dcc5a951712e02e8 AfterProcessingInitializeOnLoad (0ms) EditorAssembliesLoaded (0ms) ExecutionOrderSort2 (0ms) AwakeInstancesAfterBackupRestoration (0ms) Platform modules already initialized, skipping Registering precompiled user dll's ... +<<<<<<< HEAD Registered in 0.002608 seconds. +======= +Registered in 0.001441 seconds. +>>>>>>> f40b9c3824b3dc0c23f55e77dcc5a951712e02e8 Begin MonoManager ReloadAssembly -Native extension for LinuxStandalone target not found Native extension for WindowsStandalone target not found +<<<<<<< HEAD Native extension for OSXStandalone target not found Native extension for WebGL target not found Refreshing native plugins compatible for Editor in 43.18 ms, found 3 plugins. @@ -92,10 +135,20 @@ Mono: successfully reloaded assembly Domain Reload Profiling: ReloadAssembly (1197ms) BeginReloadAssembly (166ms) +======= +Refreshing native plugins compatible for Editor in 32.53 ms, found 3 plugins. +Preloading 0 native plugins for Editor in 0.00 ms. +Mono: successfully reloaded assembly +- Completed reload, in 0.760 seconds +Domain Reload Profiling: + ReloadAssembly (761ms) + BeginReloadAssembly (99ms) +>>>>>>> f40b9c3824b3dc0c23f55e77dcc5a951712e02e8 ExecutionOrderSort (0ms) - DisableScriptedObjects (4ms) + DisableScriptedObjects (3ms) BackupInstance (0ms) ReleaseScriptingObjects (0ms) +<<<<<<< HEAD CreateAndSetChildDomain (26ms) EndReloadAssembly (962ms) LoadAssemblies (95ms) @@ -127,6 +180,39 @@ System memory in use after: 95.8 MB. Unloading 26 unused Assets to reduce memory usage. Loaded Objects now: 2564. Total: 3.456500 ms (FindLiveObjects: 0.201400 ms CreateObjectMapping: 0.082200 ms MarkObjects: 3.073300 ms DeleteObjects: 0.097200 ms) +======= + CreateAndSetChildDomain (14ms) + EndReloadAssembly (619ms) + LoadAssemblies (61ms) + RebuildTransferFunctionScriptingTraits (0ms) + SetupTypeCache (194ms) + ReleaseScriptCaches (0ms) + RebuildScriptCaches (31ms) + SetupLoadedEditorAssemblies (249ms) + LogAssemblyErrors (0ms) + InitializePlatformSupportModulesInManaged (3ms) + SetLoadedEditorAssemblies (0ms) + RefreshPlugins (33ms) + BeforeProcessingInitializeOnLoad (54ms) + ProcessInitializeOnLoadAttributes (145ms) + ProcessInitializeOnLoadMethodAttributes (11ms) + AfterProcessingInitializeOnLoad (4ms) + EditorAssembliesLoaded (0ms) + ExecutionOrderSort2 (0ms) + AwakeInstancesAfterBackupRestoration (5ms) +Platform modules already initialized, skipping +======================================================================== +Worker process is ready to serve import requests +Launched and connected shader compiler UnityShaderCompiler.exe after 0.03 seconds +Refreshing native plugins compatible for Editor in 0.34 ms, found 3 plugins. +Preloading 0 native plugins for Editor in 0.00 ms. +Unloading 2126 Unused Serialized files (Serialized files now loaded: 0) +System memory in use before: 95.9 MB. +System memory in use after: 96.0 MB. + +Unloading 26 unused Assets to reduce memory usage. Loaded Objects now: 2566. +Total: 2.240600 ms (FindLiveObjects: 0.143900 ms CreateObjectMapping: 0.068700 ms MarkObjects: 1.970500 ms DeleteObjects: 0.056700 ms) +>>>>>>> f40b9c3824b3dc0c23f55e77dcc5a951712e02e8 AssetImportParameters requested are different than current active one (requested -> active): custom:framework-win-MediaFoundation: 216162199b28c13a410421893ffa2e32 -> @@ -140,18 +226,61 @@ AssetImportParameters requested are different than current active one (requested custom:audio-encoder-webm-vorbis: bf7c407c2cedff20999df2af8eb42d56 -> ======================================================================== Received Import Request. +<<<<<<< HEAD path: Assets/Scripts/Configs/CardConfig.cs artifactKey: Guid(9c4c6a3d3a1809644803be5d2cb70212) Importer(815301076,1909f56bfc062723c751e8b465ee728b) Start importing Assets/Scripts/Configs/CardConfig.cs using Guid(9c4c6a3d3a1809644803be5d2cb70212) Importer(815301076,1909f56bfc062723c751e8b465ee728b) -> (artifact id: '3890cfe4d392fc504854b2f0925cbd4d') in 0.031211 seconds Import took 0.035034 seconds . +======= + path: Assets/Scripts/Configs/EnemyConfigs/Snake.asset + artifactKey: Guid(b9a9200a18ccfab4eb3d8871e3c75a3f) Importer(815301076,1909f56bfc062723c751e8b465ee728b) +Start importing Assets/Scripts/Configs/EnemyConfigs/Snake.asset using Guid(b9a9200a18ccfab4eb3d8871e3c75a3f) Importer(815301076,1909f56bfc062723c751e8b465ee728b) -> (artifact id: '46001076841c0f58d0d02b36f5f35824') in 0.020750 seconds + Import took 0.023282 seconds . + +======================================================================== +Received Import Request. + Time since last request: 0.000149 seconds. + path: Assets/Scripts/Configs/EnemyConfigs/Zombie.asset + artifactKey: Guid(311edf240c8ea15449adcfbad6d87fbe) Importer(815301076,1909f56bfc062723c751e8b465ee728b) +Start importing Assets/Scripts/Configs/EnemyConfigs/Zombie.asset using Guid(311edf240c8ea15449adcfbad6d87fbe) Importer(815301076,1909f56bfc062723c751e8b465ee728b) -> (artifact id: '6cbb714ca8f826188fe2b42c8a6dae4d') in 0.001364 seconds + Import took 0.003799 seconds . + +======================================================================== +Received Import Request. + Time since last request: 70.076327 seconds. + path: Assets/Scripts + artifactKey: Guid(74101b1addeb2064895101d2b1aac376) Importer(815301076,1909f56bfc062723c751e8b465ee728b) +Start importing Assets/Scripts using Guid(74101b1addeb2064895101d2b1aac376) Importer(815301076,1909f56bfc062723c751e8b465ee728b) -> (artifact id: 'c25a1d281167645a33bf722f65337e25') in 0.001155 seconds + Import took 0.003904 seconds . + +======================================================================== +Received Import Request. + Time since last request: 1.894932 seconds. + path: Assets/Scripts/Player.cs + artifactKey: Guid(a797a7d28ee3d2d4c85df06375b9a2c7) Importer(815301076,1909f56bfc062723c751e8b465ee728b) +Start importing Assets/Scripts/Player.cs using Guid(a797a7d28ee3d2d4c85df06375b9a2c7) Importer(815301076,1909f56bfc062723c751e8b465ee728b) -> (artifact id: 'de5cb48ee2fcc6e04202d0d128e1fe45') in 0.002263 seconds + Import took 0.004913 seconds . + +======================================================================== +Received Import Request. + Time since last request: 46.178115 seconds. + path: Assets/Scripts/Enemy.cs + artifactKey: Guid(587c6949cb7f3474e9ceb46c0268bb12) Importer(815301076,1909f56bfc062723c751e8b465ee728b) +Start importing Assets/Scripts/Enemy.cs using Guid(587c6949cb7f3474e9ceb46c0268bb12) Importer(815301076,1909f56bfc062723c751e8b465ee728b) -> (artifact id: '31bf36da221dc0048a16ecbe3a6ace85') in 0.001183 seconds + Import took 0.004222 seconds . +>>>>>>> f40b9c3824b3dc0c23f55e77dcc5a951712e02e8 ======================================================================== Received Prepare Registering precompiled user dll's ... +<<<<<<< HEAD Registered in 0.002423 seconds. +======= +Registered in 0.001288 seconds. +>>>>>>> f40b9c3824b3dc0c23f55e77dcc5a951712e02e8 Begin MonoManager ReloadAssembly -Native extension for LinuxStandalone target not found Native extension for WindowsStandalone target not found +<<<<<<< HEAD Native extension for OSXStandalone target not found Native extension for WebGL target not found Refreshing native plugins compatible for Editor in 0.45 ms, found 3 plugins. @@ -187,13 +316,53 @@ Domain Reload Profiling: Platform modules already initialized, skipping Switching build target platform(19) subTarget(0) extendedPlatform(0) -> platform(13) subTarget(537395200) extendedPlatform(0) Refreshing native plugins compatible for Editor in 0.41 ms, found 3 plugins. +======= +Refreshing native plugins compatible for Editor in 0.34 ms, found 3 plugins. +Preloading 0 native plugins for Editor in 0.00 ms. +Mono: successfully reloaded assembly +- Completed reload, in 0.828 seconds +Domain Reload Profiling: + ReloadAssembly (829ms) + BeginReloadAssembly (92ms) + ExecutionOrderSort (0ms) + DisableScriptedObjects (4ms) + BackupInstance (0ms) + ReleaseScriptingObjects (0ms) + CreateAndSetChildDomain (32ms) + EndReloadAssembly (674ms) + LoadAssemblies (66ms) + RebuildTransferFunctionScriptingTraits (0ms) + SetupTypeCache (227ms) + ReleaseScriptCaches (1ms) + RebuildScriptCaches (49ms) + SetupLoadedEditorAssemblies (244ms) + LogAssemblyErrors (0ms) + InitializePlatformSupportModulesInManaged (4ms) + SetLoadedEditorAssemblies (0ms) + RefreshPlugins (0ms) + BeforeProcessingInitializeOnLoad (74ms) + ProcessInitializeOnLoadAttributes (157ms) + ProcessInitializeOnLoadMethodAttributes (4ms) + AfterProcessingInitializeOnLoad (4ms) + EditorAssembliesLoaded (0ms) + ExecutionOrderSort2 (0ms) + AwakeInstancesAfterBackupRestoration (8ms) +Platform modules already initialized, skipping +Switching build target platform(19) subTarget(0) extendedPlatform(0) -> platform(13) subTarget(537395200) extendedPlatform(0) +Refreshing native plugins compatible for Editor in 0.32 ms, found 3 plugins. +>>>>>>> f40b9c3824b3dc0c23f55e77dcc5a951712e02e8 Preloading 0 native plugins for Editor in 0.00 ms. Unloading 2105 Unused Serialized files (Serialized files now loaded: 0) System memory in use before: 94.0 MB. System memory in use after: 94.1 MB. +<<<<<<< HEAD Unloading 15 unused Assets to reduce memory usage. Loaded Objects now: 2566. Total: 2.988000 ms (FindLiveObjects: 0.391600 ms CreateObjectMapping: 0.123000 ms MarkObjects: 2.456700 ms DeleteObjects: 0.015500 ms) +======= +Unloading 15 unused Assets to reduce memory usage. Loaded Objects now: 2568. +Total: 1.965800 ms (FindLiveObjects: 0.148500 ms CreateObjectMapping: 0.051800 ms MarkObjects: 1.752300 ms DeleteObjects: 0.012400 ms) +>>>>>>> f40b9c3824b3dc0c23f55e77dcc5a951712e02e8 AssetImportParameters requested are different than current active one (requested -> active): custom:framework-win-MediaFoundation: 216162199b28c13a410421893ffa2e32 -> @@ -208,19 +377,55 @@ AssetImportParameters requested are different than current active one (requested custom:audio-encoder-webm-vorbis: bf7c407c2cedff20999df2af8eb42d56 -> ======================================================================== Received Import Request. +<<<<<<< HEAD Time since last request: 16.201129 seconds. path: Assets/Scripts/Configs/CardConfigs/AddStamina.asset artifactKey: Guid(6edd37042b6a0064ba2364da30fe92c9) Importer(815301076,1909f56bfc062723c751e8b465ee728b) Start importing Assets/Scripts/Configs/CardConfigs/AddStamina.asset using Guid(6edd37042b6a0064ba2364da30fe92c9) Importer(815301076,1909f56bfc062723c751e8b465ee728b) -> (artifact id: '06b9b2fe740eb471f37ffabcf9c6f0c3') in 0.033292 seconds Import took 0.039617 seconds . +======= + Time since last request: 16.992814 seconds. + path: Assets/Scripts/Session.cs + artifactKey: Guid(bb773d3a31f3ff84d9872e7cee1125bd) Importer(815301076,1909f56bfc062723c751e8b465ee728b) +Start importing Assets/Scripts/Session.cs using Guid(bb773d3a31f3ff84d9872e7cee1125bd) Importer(815301076,1909f56bfc062723c751e8b465ee728b) -> (artifact id: 'f044e226ab7565f6f557c819a383d86e') in 0.003285 seconds + Import took 0.005768 seconds . + +======================================================================== +Received Import Request. + Time since last request: 26.960590 seconds. + path: Assets/Prefabs + artifactKey: Guid(dbe8dd53cca2a5b4d9f554a483056b69) Importer(815301076,1909f56bfc062723c751e8b465ee728b) +Start importing Assets/Prefabs using Guid(dbe8dd53cca2a5b4d9f554a483056b69) Importer(815301076,1909f56bfc062723c751e8b465ee728b) -> (artifact id: '4722b95463dd97ba4aa8d14403194875') in 0.001027 seconds + Import took 0.003435 seconds . + +======================================================================== +Received Import Request. + Time since last request: 0.972055 seconds. + path: Assets/Prefabs/Enemy + artifactKey: Guid(903e667a5ca406d49a7980c001b6af85) Importer(815301076,1909f56bfc062723c751e8b465ee728b) +Start importing Assets/Prefabs/Enemy using Guid(903e667a5ca406d49a7980c001b6af85) Importer(815301076,1909f56bfc062723c751e8b465ee728b) -> (artifact id: '7fce1d80a97414ba1c8e8727fb455b85') in 0.001200 seconds + Import took 0.003817 seconds . + +======================================================================== +Received Import Request. + Time since last request: 0.065922 seconds. + path: Assets/Prefabs/Enemy/Enemy_1.prefab + artifactKey: Guid(644f958e0b6df60408efa28ad8002e42) Importer(815301076,1909f56bfc062723c751e8b465ee728b) +Start importing Assets/Prefabs/Enemy/Enemy_1.prefab using Guid(644f958e0b6df60408efa28ad8002e42) Importer(815301076,1909f56bfc062723c751e8b465ee728b) -> (artifact id: '0cea2212f86d5089e033abdbce0da82f') in 0.032971 seconds + Import took 0.035549 seconds . +>>>>>>> f40b9c3824b3dc0c23f55e77dcc5a951712e02e8 ======================================================================== Received Prepare Registering precompiled user dll's ... +<<<<<<< HEAD Registered in 0.002565 seconds. +======= +Registered in 0.001579 seconds. +>>>>>>> f40b9c3824b3dc0c23f55e77dcc5a951712e02e8 Begin MonoManager ReloadAssembly -Native extension for LinuxStandalone target not found Native extension for WindowsStandalone target not found +<<<<<<< HEAD Native extension for OSXStandalone target not found Native extension for WebGL target not found Refreshing native plugins compatible for Editor in 0.55 ms, found 3 plugins. @@ -242,9 +447,31 @@ Domain Reload Profiling: ReleaseScriptCaches (1ms) RebuildScriptCaches (53ms) SetupLoadedEditorAssemblies (290ms) +======= +Refreshing native plugins compatible for Editor in 0.35 ms, found 3 plugins. +Preloading 0 native plugins for Editor in 0.00 ms. +Mono: successfully reloaded assembly +- Completed reload, in 0.779 seconds +Domain Reload Profiling: + ReloadAssembly (779ms) + BeginReloadAssembly (100ms) + ExecutionOrderSort (0ms) + DisableScriptedObjects (4ms) + BackupInstance (0ms) + ReleaseScriptingObjects (0ms) + CreateAndSetChildDomain (28ms) + EndReloadAssembly (627ms) + LoadAssemblies (65ms) + RebuildTransferFunctionScriptingTraits (0ms) + SetupTypeCache (209ms) + ReleaseScriptCaches (2ms) + RebuildScriptCaches (38ms) + SetupLoadedEditorAssemblies (228ms) +>>>>>>> f40b9c3824b3dc0c23f55e77dcc5a951712e02e8 LogAssemblyErrors (0ms) - InitializePlatformSupportModulesInManaged (7ms) + InitializePlatformSupportModulesInManaged (4ms) SetLoadedEditorAssemblies (0ms) +<<<<<<< HEAD RefreshPlugins (1ms) BeforeProcessingInitializeOnLoad (82ms) ProcessInitializeOnLoadAttributes (189ms) @@ -256,13 +483,31 @@ Domain Reload Profiling: Platform modules already initialized, skipping Switching build target platform(19) subTarget(0) extendedPlatform(0) -> platform(13) subTarget(537395200) extendedPlatform(0) Refreshing native plugins compatible for Editor in 0.43 ms, found 3 plugins. +======= + RefreshPlugins (0ms) + BeforeProcessingInitializeOnLoad (67ms) + ProcessInitializeOnLoadAttributes (147ms) + ProcessInitializeOnLoadMethodAttributes (5ms) + AfterProcessingInitializeOnLoad (4ms) + EditorAssembliesLoaded (0ms) + ExecutionOrderSort2 (0ms) + AwakeInstancesAfterBackupRestoration (7ms) +Platform modules already initialized, skipping +Switching build target platform(19) subTarget(0) extendedPlatform(0) -> platform(13) subTarget(537395200) extendedPlatform(0) +Refreshing native plugins compatible for Editor in 0.32 ms, found 3 plugins. +>>>>>>> f40b9c3824b3dc0c23f55e77dcc5a951712e02e8 Preloading 0 native plugins for Editor in 0.00 ms. Unloading 2105 Unused Serialized files (Serialized files now loaded: 0) System memory in use before: 94.0 MB. System memory in use after: 94.1 MB. +<<<<<<< HEAD Unloading 15 unused Assets to reduce memory usage. Loaded Objects now: 2568. Total: 3.008400 ms (FindLiveObjects: 0.197600 ms CreateObjectMapping: 0.080100 ms MarkObjects: 2.713700 ms DeleteObjects: 0.015900 ms) +======= +Unloading 16 unused Assets to reduce memory usage. Loaded Objects now: 2570. +Total: 1.996000 ms (FindLiveObjects: 0.169400 ms CreateObjectMapping: 0.042300 ms MarkObjects: 1.753000 ms DeleteObjects: 0.030700 ms) +>>>>>>> f40b9c3824b3dc0c23f55e77dcc5a951712e02e8 AssetImportParameters requested are different than current active one (requested -> active): custom:framework-win-MediaFoundation: 216162199b28c13a410421893ffa2e32 -> @@ -278,10 +523,14 @@ AssetImportParameters requested are different than current active one (requested ======================================================================== Received Prepare Registering precompiled user dll's ... +<<<<<<< HEAD Registered in 0.003893 seconds. +======= +Registered in 0.001647 seconds. +>>>>>>> f40b9c3824b3dc0c23f55e77dcc5a951712e02e8 Begin MonoManager ReloadAssembly -Native extension for LinuxStandalone target not found Native extension for WindowsStandalone target not found +<<<<<<< HEAD Native extension for OSXStandalone target not found Native extension for WebGL target not found Refreshing native plugins compatible for Editor in 0.43 ms, found 3 plugins. @@ -291,10 +540,20 @@ Mono: successfully reloaded assembly Domain Reload Profiling: ReloadAssembly (1094ms) BeginReloadAssembly (143ms) +======= +Refreshing native plugins compatible for Editor in 0.32 ms, found 3 plugins. +Preloading 0 native plugins for Editor in 0.00 ms. +Mono: successfully reloaded assembly +- Completed reload, in 0.771 seconds +Domain Reload Profiling: + ReloadAssembly (771ms) + BeginReloadAssembly (98ms) +>>>>>>> f40b9c3824b3dc0c23f55e77dcc5a951712e02e8 ExecutionOrderSort (0ms) - DisableScriptedObjects (6ms) + DisableScriptedObjects (5ms) BackupInstance (0ms) ReleaseScriptingObjects (0ms) +<<<<<<< HEAD CreateAndSetChildDomain (53ms) EndReloadAssembly (885ms) LoadAssemblies (111ms) @@ -303,27 +562,53 @@ Domain Reload Profiling: ReleaseScriptCaches (1ms) RebuildScriptCaches (74ms) SetupLoadedEditorAssemblies (279ms) +======= + CreateAndSetChildDomain (28ms) + EndReloadAssembly (628ms) + LoadAssemblies (73ms) + RebuildTransferFunctionScriptingTraits (0ms) + SetupTypeCache (216ms) + ReleaseScriptCaches (1ms) + RebuildScriptCaches (34ms) + SetupLoadedEditorAssemblies (225ms) +>>>>>>> f40b9c3824b3dc0c23f55e77dcc5a951712e02e8 LogAssemblyErrors (0ms) - InitializePlatformSupportModulesInManaged (7ms) + InitializePlatformSupportModulesInManaged (3ms) SetLoadedEditorAssemblies (0ms) RefreshPlugins (0ms) +<<<<<<< HEAD BeforeProcessingInitializeOnLoad (81ms) ProcessInitializeOnLoadAttributes (180ms) ProcessInitializeOnLoadMethodAttributes (6ms) AfterProcessingInitializeOnLoad (5ms) +======= + BeforeProcessingInitializeOnLoad (68ms) + ProcessInitializeOnLoadAttributes (145ms) + ProcessInitializeOnLoadMethodAttributes (5ms) + AfterProcessingInitializeOnLoad (4ms) +>>>>>>> f40b9c3824b3dc0c23f55e77dcc5a951712e02e8 EditorAssembliesLoaded (0ms) ExecutionOrderSort2 (0ms) - AwakeInstancesAfterBackupRestoration (9ms) + AwakeInstancesAfterBackupRestoration (8ms) Platform modules already initialized, skipping Switching build target platform(19) subTarget(0) extendedPlatform(0) -> platform(13) subTarget(537395200) extendedPlatform(0) +<<<<<<< HEAD Refreshing native plugins compatible for Editor in 0.41 ms, found 3 plugins. +======= +Refreshing native plugins compatible for Editor in 0.32 ms, found 3 plugins. +>>>>>>> f40b9c3824b3dc0c23f55e77dcc5a951712e02e8 Preloading 0 native plugins for Editor in 0.00 ms. Unloading 2105 Unused Serialized files (Serialized files now loaded: 0) System memory in use before: 94.0 MB. System memory in use after: 94.2 MB. +<<<<<<< HEAD Unloading 15 unused Assets to reduce memory usage. Loaded Objects now: 2570. Total: 2.970200 ms (FindLiveObjects: 0.186700 ms CreateObjectMapping: 0.073800 ms MarkObjects: 2.694200 ms DeleteObjects: 0.014200 ms) +======= +Unloading 15 unused Assets to reduce memory usage. Loaded Objects now: 2572. +Total: 2.168400 ms (FindLiveObjects: 0.119200 ms CreateObjectMapping: 0.041400 ms MarkObjects: 1.987800 ms DeleteObjects: 0.019300 ms) +>>>>>>> f40b9c3824b3dc0c23f55e77dcc5a951712e02e8 AssetImportParameters requested are different than current active one (requested -> active): custom:framework-win-MediaFoundation: 216162199b28c13a410421893ffa2e32 -> @@ -339,10 +624,14 @@ AssetImportParameters requested are different than current active one (requested ======================================================================== Received Prepare Registering precompiled user dll's ... +<<<<<<< HEAD Registered in 0.003240 seconds. +======= +Registered in 0.001208 seconds. +>>>>>>> f40b9c3824b3dc0c23f55e77dcc5a951712e02e8 Begin MonoManager ReloadAssembly -Native extension for LinuxStandalone target not found Native extension for WindowsStandalone target not found +<<<<<<< HEAD Native extension for OSXStandalone target not found Native extension for WebGL target not found Refreshing native plugins compatible for Editor in 0.45 ms, found 3 plugins. @@ -352,10 +641,20 @@ Mono: successfully reloaded assembly Domain Reload Profiling: ReloadAssembly (1109ms) BeginReloadAssembly (110ms) +======= +Refreshing native plugins compatible for Editor in 0.35 ms, found 3 plugins. +Preloading 0 native plugins for Editor in 0.00 ms. +Mono: successfully reloaded assembly +- Completed reload, in 0.735 seconds +Domain Reload Profiling: + ReloadAssembly (736ms) + BeginReloadAssembly (85ms) +>>>>>>> f40b9c3824b3dc0c23f55e77dcc5a951712e02e8 ExecutionOrderSort (0ms) - DisableScriptedObjects (6ms) + DisableScriptedObjects (4ms) BackupInstance (0ms) ReleaseScriptingObjects (0ms) +<<<<<<< HEAD CreateAndSetChildDomain (41ms) EndReloadAssembly (912ms) LoadAssemblies (83ms) @@ -364,10 +663,21 @@ Domain Reload Profiling: ReleaseScriptCaches (1ms) RebuildScriptCaches (49ms) SetupLoadedEditorAssemblies (308ms) +======= + CreateAndSetChildDomain (24ms) + EndReloadAssembly (608ms) + LoadAssemblies (62ms) + RebuildTransferFunctionScriptingTraits (0ms) + SetupTypeCache (197ms) + ReleaseScriptCaches (1ms) + RebuildScriptCaches (34ms) + SetupLoadedEditorAssemblies (224ms) +>>>>>>> f40b9c3824b3dc0c23f55e77dcc5a951712e02e8 LogAssemblyErrors (0ms) - InitializePlatformSupportModulesInManaged (8ms) + InitializePlatformSupportModulesInManaged (4ms) SetLoadedEditorAssemblies (0ms) RefreshPlugins (0ms) +<<<<<<< HEAD BeforeProcessingInitializeOnLoad (97ms) ProcessInitializeOnLoadAttributes (191ms) ProcessInitializeOnLoadMethodAttributes (5ms) @@ -378,13 +688,30 @@ Domain Reload Profiling: Platform modules already initialized, skipping Switching build target platform(19) subTarget(0) extendedPlatform(0) -> platform(13) subTarget(537395200) extendedPlatform(0) Refreshing native plugins compatible for Editor in 0.46 ms, found 3 plugins. +======= + BeforeProcessingInitializeOnLoad (61ms) + ProcessInitializeOnLoadAttributes (150ms) + ProcessInitializeOnLoadMethodAttributes (4ms) + AfterProcessingInitializeOnLoad (4ms) + EditorAssembliesLoaded (0ms) + ExecutionOrderSort2 (0ms) + AwakeInstancesAfterBackupRestoration (8ms) +Platform modules already initialized, skipping +Switching build target platform(19) subTarget(0) extendedPlatform(0) -> platform(13) subTarget(537395200) extendedPlatform(0) +Refreshing native plugins compatible for Editor in 0.32 ms, found 3 plugins. +>>>>>>> f40b9c3824b3dc0c23f55e77dcc5a951712e02e8 Preloading 0 native plugins for Editor in 0.00 ms. Unloading 2105 Unused Serialized files (Serialized files now loaded: 0) System memory in use before: 94.1 MB. System memory in use after: 94.2 MB. +<<<<<<< HEAD Unloading 15 unused Assets to reduce memory usage. Loaded Objects now: 2572. Total: 2.717400 ms (FindLiveObjects: 0.195100 ms CreateObjectMapping: 0.081400 ms MarkObjects: 2.422900 ms DeleteObjects: 0.017000 ms) +======= +Unloading 15 unused Assets to reduce memory usage. Loaded Objects now: 2574. +Total: 2.452100 ms (FindLiveObjects: 0.128000 ms CreateObjectMapping: 0.048500 ms MarkObjects: 2.253600 ms DeleteObjects: 0.021100 ms) +>>>>>>> f40b9c3824b3dc0c23f55e77dcc5a951712e02e8 AssetImportParameters requested are different than current active one (requested -> active): custom:framework-win-MediaFoundation: 216162199b28c13a410421893ffa2e32 -> @@ -398,6 +725,7 @@ AssetImportParameters requested are different than current active one (requested custom:audio-decoder-ogg-vorbis: bf7c407c2cedff20999df2af8eb42d56 -> custom:audio-encoder-webm-vorbis: bf7c407c2cedff20999df2af8eb42d56 -> ======================================================================== +<<<<<<< HEAD Received Prepare Registering precompiled user dll's ... Registered in 0.002625 seconds. @@ -446,25 +774,122 @@ System memory in use after: 94.2 MB. Unloading 15 unused Assets to reduce memory usage. Loaded Objects now: 2574. Total: 3.629200 ms (FindLiveObjects: 0.272600 ms CreateObjectMapping: 0.150900 ms MarkObjects: 3.179000 ms DeleteObjects: 0.025000 ms) +======= +Received Import Request. + Time since last request: 248.663425 seconds. + path: Assets/Scripts/Configs + artifactKey: Guid(585041ddc6a9fb342971f358b51b4014) Importer(815301076,1909f56bfc062723c751e8b465ee728b) +Start importing Assets/Scripts/Configs using Guid(585041ddc6a9fb342971f358b51b4014) Importer(815301076,1909f56bfc062723c751e8b465ee728b) -> (artifact id: 'ee0ede7d3d1e8288bf6e1c9db58df68f') in 0.004466 seconds + Import took 0.007723 seconds . + +======================================================================== +Received Import Request. + Time since last request: 1.321640 seconds. + path: Assets/Scripts/Configs/BattleConfigs + artifactKey: Guid(e7f3193a74c328e458d9f0e38c6f7a13) Importer(815301076,1909f56bfc062723c751e8b465ee728b) +Start importing Assets/Scripts/Configs/BattleConfigs using Guid(e7f3193a74c328e458d9f0e38c6f7a13) Importer(815301076,1909f56bfc062723c751e8b465ee728b) -> (artifact id: '159c939416d92be392de3edaa27fe508') in 0.001058 seconds + Import took 0.003838 seconds . + +======================================================================== +Received Import Request. + Time since last request: 0.068002 seconds. + path: Assets/Scripts/Configs/BattleConfigs/FirstBattle.asset + artifactKey: Guid(5ecf77a7ffbea54479cfcd94f4314069) Importer(815301076,1909f56bfc062723c751e8b465ee728b) +Start importing Assets/Scripts/Configs/BattleConfigs/FirstBattle.asset using Guid(5ecf77a7ffbea54479cfcd94f4314069) Importer(815301076,1909f56bfc062723c751e8b465ee728b) -> (artifact id: '52125e102db972ff0612d5a76a87a1f2') in 0.007889 seconds + Import took 0.010634 seconds . + +======================================================================== +Received Import Request. + Time since last request: 1.624825 seconds. + path: Assets/Scripts/Configs/BattleConfig.cs + artifactKey: Guid(b33bbefb941268c4b8f526cc6ecc1eba) Importer(815301076,1909f56bfc062723c751e8b465ee728b) +Start importing Assets/Scripts/Configs/BattleConfig.cs using Guid(b33bbefb941268c4b8f526cc6ecc1eba) Importer(815301076,1909f56bfc062723c751e8b465ee728b) -> (artifact id: '413ed641904f78eca62b0c9b32930bda') in 0.001123 seconds + Import took 0.003661 seconds . + +======================================================================== +Received Import Request. + Time since last request: 58.802205 seconds. + path: Assets/Scripts/Configs/PlayerConfig.cs + artifactKey: Guid(4bf4cbb13736ac54f8e9fdca4327535f) Importer(815301076,1909f56bfc062723c751e8b465ee728b) +Start importing Assets/Scripts/Configs/PlayerConfig.cs using Guid(4bf4cbb13736ac54f8e9fdca4327535f) Importer(815301076,1909f56bfc062723c751e8b465ee728b) -> (artifact id: '65a2ee1059b4e06c8077822db5b31a71') in 0.001424 seconds + Import took 0.004606 seconds . + +======================================================================== +Received Import Request. + Time since last request: 33.977771 seconds. + path: Assets/Scripts/Configs/CardConfigs + artifactKey: Guid(de0abea23ac17564fa1fb5c18818f7a2) Importer(815301076,1909f56bfc062723c751e8b465ee728b) +Start importing Assets/Scripts/Configs/CardConfigs using Guid(de0abea23ac17564fa1fb5c18818f7a2) Importer(815301076,1909f56bfc062723c751e8b465ee728b) -> (artifact id: '873ffc677639d70fca4cb3c11cfd4d98') in 0.001323 seconds + Import took 0.003838 seconds . + +======================================================================== +Received Import Request. + Time since last request: 0.055693 seconds. + path: Assets/Scripts/Configs/CardConfigs/BigDamage.asset + artifactKey: Guid(5169032180a01ac43905ed44dbad9b24) Importer(815301076,1909f56bfc062723c751e8b465ee728b) +Start importing Assets/Scripts/Configs/CardConfigs/BigDamage.asset using Guid(5169032180a01ac43905ed44dbad9b24) Importer(815301076,1909f56bfc062723c751e8b465ee728b) -> (artifact id: '66111d77e92eea126628a45f5eb7648b') in 0.001901 seconds + Import took 0.004569 seconds . + +======================================================================== +Received Import Request. + Time since last request: 0.000248 seconds. + path: Assets/Scripts/Configs/CardConfigs/BigHealing.asset + artifactKey: Guid(bcf3a6ca876cd0541958d36a4735087a) Importer(815301076,1909f56bfc062723c751e8b465ee728b) +Start importing Assets/Scripts/Configs/CardConfigs/BigHealing.asset using Guid(bcf3a6ca876cd0541958d36a4735087a) Importer(815301076,1909f56bfc062723c751e8b465ee728b) -> (artifact id: '7554aaed1df013ce92c308c193063ec2') in 0.001435 seconds + Import took 0.003749 seconds . + +======================================================================== +Received Import Request. + Time since last request: 0.000204 seconds. + path: Assets/Scripts/Configs/CardConfigs/SmallHealing.asset + artifactKey: Guid(60dce809256fdb34a91732594e0d5a34) Importer(815301076,1909f56bfc062723c751e8b465ee728b) +Start importing Assets/Scripts/Configs/CardConfigs/SmallHealing.asset using Guid(60dce809256fdb34a91732594e0d5a34) Importer(815301076,1909f56bfc062723c751e8b465ee728b) -> (artifact id: '3c8d303ce3731ec0aaf0579b5d3019d7') in 0.001561 seconds + Import took 0.004413 seconds . + +======================================================================== +Received Import Request. + Time since last request: 0.000213 seconds. + path: Assets/Scripts/Configs/CardConfigs/SmallDamage.asset + artifactKey: Guid(a116d916027f0084c95f421e6398e3a1) Importer(815301076,1909f56bfc062723c751e8b465ee728b) +Start importing Assets/Scripts/Configs/CardConfigs/SmallDamage.asset using Guid(a116d916027f0084c95f421e6398e3a1) Importer(815301076,1909f56bfc062723c751e8b465ee728b) -> (artifact id: '70f2cf701e5c8dbba2fff8e8c999af15') in 0.001932 seconds + Import took 0.004567 seconds . + +======================================================================== +Received Import Request. + Time since last request: 29.019930 seconds. + path: Assets/Scripts/Configs/CardConfig.cs + artifactKey: Guid(9c4c6a3d3a1809644803be5d2cb70212) Importer(815301076,1909f56bfc062723c751e8b465ee728b) +Start importing Assets/Scripts/Configs/CardConfig.cs using Guid(9c4c6a3d3a1809644803be5d2cb70212) Importer(815301076,1909f56bfc062723c751e8b465ee728b) -> (artifact id: '9947db179059febc7d606fbc25afcc84') in 0.001391 seconds + Import took 0.004195 seconds . + +======================================================================== +Received Import Request. + Time since last request: 40.478499 seconds. + path: Assets/Scripts/Card.cs + artifactKey: Guid(c0cf382e614d3e84194ce693591df5d5) Importer(815301076,1909f56bfc062723c751e8b465ee728b) +Start importing Assets/Scripts/Card.cs using Guid(c0cf382e614d3e84194ce693591df5d5) Importer(815301076,1909f56bfc062723c751e8b465ee728b) -> (artifact id: '3f7a5c9170634031f53bda92a8a9872d') in 0.000984 seconds + Import took 0.003413 seconds . + +======================================================================== +Received Import Request. + Time since last request: 46.772673 seconds. + path: Assets/Scripts/Card.cs + artifactKey: Guid(c0cf382e614d3e84194ce693591df5d5) Importer(815301076,1909f56bfc062723c751e8b465ee728b) +Start importing Assets/Scripts/Card.cs using Guid(c0cf382e614d3e84194ce693591df5d5) Importer(815301076,1909f56bfc062723c751e8b465ee728b) -> (artifact id: 'cc7a0712df68924727c80f3abb96ea87') in 0.001264 seconds + Import took 0.004584 seconds . +>>>>>>> f40b9c3824b3dc0c23f55e77dcc5a951712e02e8 -AssetImportParameters requested are different than current active one (requested -> active): - custom:framework-win-MediaFoundation: 216162199b28c13a410421893ffa2e32 -> - custom:video-decoder-ogg-theora: a1e56fd34408186e4bbccfd4996cb3dc -> - custom:container-muxer-webm: aa71ff27fc2769a1b78a27578f13a17b -> - custom:container-demuxer-webm: 4f35f7cbe854078d1ac9338744f61a02 -> - custom:container-demuxer-ogg: 62fdf1f143b41e24485cea50d1cbac27 -> - custom:video-encoder-webm-vp8: eb34c28f22e8b96e1ab97ce403110664 -> - custom:video-decoder-webm-vp8: 9c59270c3fd7afecdb556c50c9e8de78 -> - custom:graphics/normal-map-encoding: 01000000000000000000000000000000 -> 02000000000000000000000000000000 - custom:audio-decoder-ogg-vorbis: bf7c407c2cedff20999df2af8eb42d56 -> - custom:audio-encoder-webm-vorbis: bf7c407c2cedff20999df2af8eb42d56 -> ======================================================================== Received Prepare Registering precompiled user dll's ... +<<<<<<< HEAD Registered in 0.003992 seconds. +======= +Registered in 0.001459 seconds. +>>>>>>> f40b9c3824b3dc0c23f55e77dcc5a951712e02e8 Begin MonoManager ReloadAssembly -Native extension for LinuxStandalone target not found Native extension for WindowsStandalone target not found +<<<<<<< HEAD Native extension for OSXStandalone target not found Native extension for WebGL target not found Refreshing native plugins compatible for Editor in 2.08 ms, found 3 plugins. @@ -474,10 +899,20 @@ Mono: successfully reloaded assembly Domain Reload Profiling: ReloadAssembly (1205ms) BeginReloadAssembly (143ms) +======= +Refreshing native plugins compatible for Editor in 0.41 ms, found 3 plugins. +Preloading 0 native plugins for Editor in 0.00 ms. +Mono: successfully reloaded assembly +- Completed reload, in 0.744 seconds +Domain Reload Profiling: + ReloadAssembly (745ms) + BeginReloadAssembly (91ms) +>>>>>>> f40b9c3824b3dc0c23f55e77dcc5a951712e02e8 ExecutionOrderSort (0ms) DisableScriptedObjects (6ms) BackupInstance (0ms) ReleaseScriptingObjects (0ms) +<<<<<<< HEAD CreateAndSetChildDomain (53ms) EndReloadAssembly (992ms) LoadAssemblies (99ms) @@ -500,13 +935,42 @@ Domain Reload Profiling: Platform modules already initialized, skipping Switching build target platform(19) subTarget(0) extendedPlatform(0) -> platform(13) subTarget(537395200) extendedPlatform(0) Refreshing native plugins compatible for Editor in 0.45 ms, found 3 plugins. +======= + CreateAndSetChildDomain (26ms) + EndReloadAssembly (608ms) + LoadAssemblies (65ms) + RebuildTransferFunctionScriptingTraits (0ms) + SetupTypeCache (189ms) + ReleaseScriptCaches (1ms) + RebuildScriptCaches (34ms) + SetupLoadedEditorAssemblies (225ms) + LogAssemblyErrors (0ms) + InitializePlatformSupportModulesInManaged (4ms) + SetLoadedEditorAssemblies (0ms) + RefreshPlugins (0ms) + BeforeProcessingInitializeOnLoad (63ms) + ProcessInitializeOnLoadAttributes (150ms) + ProcessInitializeOnLoadMethodAttributes (4ms) + AfterProcessingInitializeOnLoad (4ms) + EditorAssembliesLoaded (0ms) + ExecutionOrderSort2 (0ms) + AwakeInstancesAfterBackupRestoration (7ms) +Platform modules already initialized, skipping +Switching build target platform(19) subTarget(0) extendedPlatform(0) -> platform(13) subTarget(537395200) extendedPlatform(0) +Refreshing native plugins compatible for Editor in 0.32 ms, found 3 plugins. +>>>>>>> f40b9c3824b3dc0c23f55e77dcc5a951712e02e8 Preloading 0 native plugins for Editor in 0.00 ms. Unloading 2105 Unused Serialized files (Serialized files now loaded: 0) System memory in use before: 94.1 MB. -System memory in use after: 94.2 MB. +System memory in use after: 94.3 MB. +<<<<<<< HEAD Unloading 15 unused Assets to reduce memory usage. Loaded Objects now: 2576. Total: 5.107800 ms (FindLiveObjects: 1.314300 ms CreateObjectMapping: 0.283100 ms MarkObjects: 3.484000 ms DeleteObjects: 0.023100 ms) +======= +Unloading 18 unused Assets to reduce memory usage. Loaded Objects now: 2576. +Total: 2.043200 ms (FindLiveObjects: 0.147000 ms CreateObjectMapping: 0.076100 ms MarkObjects: 1.785300 ms DeleteObjects: 0.034000 ms) +>>>>>>> f40b9c3824b3dc0c23f55e77dcc5a951712e02e8 AssetImportParameters requested are different than current active one (requested -> active): custom:framework-win-MediaFoundation: 216162199b28c13a410421893ffa2e32 -> @@ -520,6 +984,7 @@ AssetImportParameters requested are different than current active one (requested custom:audio-decoder-ogg-vorbis: bf7c407c2cedff20999df2af8eb42d56 -> custom:audio-encoder-webm-vorbis: bf7c407c2cedff20999df2af8eb42d56 -> ======================================================================== +<<<<<<< HEAD Received Prepare Registering precompiled user dll's ... Registered in 0.003408 seconds. @@ -568,19 +1033,33 @@ System memory in use after: 94.2 MB. Unloading 15 unused Assets to reduce memory usage. Loaded Objects now: 2578. Total: 3.310900 ms (FindLiveObjects: 0.246400 ms CreateObjectMapping: 0.097700 ms MarkObjects: 2.945200 ms DeleteObjects: 0.020400 ms) +======= +Received Import Request. + Time since last request: 63.495219 seconds. + path: Assets/Prefabs/Cards + artifactKey: Guid(53ea0b7335cdd21469dc3165d732f2ab) Importer(815301076,1909f56bfc062723c751e8b465ee728b) +Start importing Assets/Prefabs/Cards using Guid(53ea0b7335cdd21469dc3165d732f2ab) Importer(815301076,1909f56bfc062723c751e8b465ee728b) -> (artifact id: 'd9137cc1dfb62f08ed4a20ec7765ef2b') in 0.003383 seconds + Import took 0.006093 seconds . -AssetImportParameters requested are different than current active one (requested -> active): - custom:framework-win-MediaFoundation: 216162199b28c13a410421893ffa2e32 -> - custom:video-decoder-ogg-theora: a1e56fd34408186e4bbccfd4996cb3dc -> - custom:container-muxer-webm: aa71ff27fc2769a1b78a27578f13a17b -> - custom:container-demuxer-webm: 4f35f7cbe854078d1ac9338744f61a02 -> - custom:container-demuxer-ogg: 62fdf1f143b41e24485cea50d1cbac27 -> - custom:video-encoder-webm-vp8: eb34c28f22e8b96e1ab97ce403110664 -> - custom:video-decoder-webm-vp8: 9c59270c3fd7afecdb556c50c9e8de78 -> - custom:graphics/normal-map-encoding: 01000000000000000000000000000000 -> 02000000000000000000000000000000 - custom:audio-decoder-ogg-vorbis: bf7c407c2cedff20999df2af8eb42d56 -> - custom:audio-encoder-webm-vorbis: bf7c407c2cedff20999df2af8eb42d56 -> ======================================================================== +Received Import Request. + Time since last request: 0.071670 seconds. + path: Assets/Prefabs/Cards/BigDamagePrefab.prefab + artifactKey: Guid(ae1ab462daf0a5c4ca40701af32d6f47) Importer(815301076,1909f56bfc062723c751e8b465ee728b) +Start importing Assets/Prefabs/Cards/BigDamagePrefab.prefab using Guid(ae1ab462daf0a5c4ca40701af32d6f47) Importer(815301076,1909f56bfc062723c751e8b465ee728b) -> (artifact id: '17930dea7790af130fd25cf101391f07') in 0.025648 seconds + Import took 0.028443 seconds . + +======================================================================== +Received Import Request. + Time since last request: 0.000202 seconds. + path: Assets/Prefabs/Cards/SmallHealing.prefab + artifactKey: Guid(4a71400765e99464aa6e72caa20d2a07) Importer(815301076,1909f56bfc062723c751e8b465ee728b) +Start importing Assets/Prefabs/Cards/SmallHealing.prefab using Guid(4a71400765e99464aa6e72caa20d2a07) Importer(815301076,1909f56bfc062723c751e8b465ee728b) -> (artifact id: 'd1f4c8b0ac94f0e28761c5d13e0bb14f') in 0.004089 seconds + Import took 0.006959 seconds . +>>>>>>> f40b9c3824b3dc0c23f55e77dcc5a951712e02e8 + +======================================================================== +<<<<<<< HEAD Received Prepare Registering precompiled user dll's ... Registered in 0.003862 seconds. @@ -629,33 +1108,58 @@ System memory in use after: 94.2 MB. Unloading 15 unused Assets to reduce memory usage. Loaded Objects now: 2580. Total: 2.819200 ms (FindLiveObjects: 0.228700 ms CreateObjectMapping: 0.092000 ms MarkObjects: 2.476400 ms DeleteObjects: 0.020700 ms) +======= +Received Import Request. + Time since last request: 0.000193 seconds. + path: Assets/Prefabs/Cards/BigHealing.prefab + artifactKey: Guid(0d2efa65672e3534cbd062025129b645) Importer(815301076,1909f56bfc062723c751e8b465ee728b) +Start importing Assets/Prefabs/Cards/BigHealing.prefab using Guid(0d2efa65672e3534cbd062025129b645) Importer(815301076,1909f56bfc062723c751e8b465ee728b) -> (artifact id: '5a27fe1a3145d22106b3a640d0cb5989') in 0.004661 seconds + Import took 0.007614 seconds . -AssetImportParameters requested are different than current active one (requested -> active): - custom:framework-win-MediaFoundation: 216162199b28c13a410421893ffa2e32 -> - custom:video-decoder-ogg-theora: a1e56fd34408186e4bbccfd4996cb3dc -> - custom:container-muxer-webm: aa71ff27fc2769a1b78a27578f13a17b -> - custom:container-demuxer-webm: 4f35f7cbe854078d1ac9338744f61a02 -> - custom:container-demuxer-ogg: 62fdf1f143b41e24485cea50d1cbac27 -> - custom:video-encoder-webm-vp8: eb34c28f22e8b96e1ab97ce403110664 -> - custom:video-decoder-webm-vp8: 9c59270c3fd7afecdb556c50c9e8de78 -> - custom:graphics/normal-map-encoding: 01000000000000000000000000000000 -> 02000000000000000000000000000000 - custom:audio-decoder-ogg-vorbis: bf7c407c2cedff20999df2af8eb42d56 -> - custom:audio-encoder-webm-vorbis: bf7c407c2cedff20999df2af8eb42d56 -> ======================================================================== Received Import Request. + Time since last request: 0.000178 seconds. + path: Assets/Prefabs/Cards/SmallDamagePrefab.prefab + artifactKey: Guid(f4414f7ff83c0354186c32ac62c7044d) Importer(815301076,1909f56bfc062723c751e8b465ee728b) +Start importing Assets/Prefabs/Cards/SmallDamagePrefab.prefab using Guid(f4414f7ff83c0354186c32ac62c7044d) Importer(815301076,1909f56bfc062723c751e8b465ee728b) -> (artifact id: '29299d968bfb21ce61367b939435c264') in 0.003548 seconds + Import took 0.006192 seconds . +>>>>>>> f40b9c3824b3dc0c23f55e77dcc5a951712e02e8 + +======================================================================== +Received Import Request. +<<<<<<< HEAD Time since last request: 1413.187064 seconds. path: Assets/Prefabs/Cards/Standart artifactKey: Guid(f7a728ee00e2164428f0d51ae86d8938) Importer(815301076,1909f56bfc062723c751e8b465ee728b) Start importing Assets/Prefabs/Cards/Standart using Guid(f7a728ee00e2164428f0d51ae86d8938) Importer(815301076,1909f56bfc062723c751e8b465ee728b) -> (artifact id: 'c3dff83632a8c4cb0a4dde2c69ad8007') in 0.019093 seconds Import took 0.024947 seconds . +======= + Time since last request: 6.065087 seconds. + path: Assets/Prefabs/Cards/Standart + artifactKey: Guid(f7a728ee00e2164428f0d51ae86d8938) Importer(815301076,1909f56bfc062723c751e8b465ee728b) +Start importing Assets/Prefabs/Cards/Standart using Guid(f7a728ee00e2164428f0d51ae86d8938) Importer(815301076,1909f56bfc062723c751e8b465ee728b) -> (artifact id: 'fd1e456ffc1d53380b85263f577168b1') in 0.001065 seconds + Import took 0.003584 seconds . + +======================================================================== +Received Import Request. + Time since last request: 0.066705 seconds. + path: Assets/Prefabs/Cards/Standart/Card.prefab + artifactKey: Guid(7d06a9bec9705b64fac3381d9c611a91) Importer(815301076,1909f56bfc062723c751e8b465ee728b) +Start importing Assets/Prefabs/Cards/Standart/Card.prefab using Guid(7d06a9bec9705b64fac3381d9c611a91) Importer(815301076,1909f56bfc062723c751e8b465ee728b) -> (artifact id: 'ec9765f8a8f3f5c73930b4533e0304f8') in 0.003273 seconds + Import took 0.005991 seconds . +>>>>>>> f40b9c3824b3dc0c23f55e77dcc5a951712e02e8 ======================================================================== Received Prepare Registering precompiled user dll's ... +<<<<<<< HEAD Registered in 0.007257 seconds. +======= +Registered in 0.001286 seconds. +>>>>>>> f40b9c3824b3dc0c23f55e77dcc5a951712e02e8 Begin MonoManager ReloadAssembly -Native extension for LinuxStandalone target not found Native extension for WindowsStandalone target not found +<<<<<<< HEAD Native extension for OSXStandalone target not found Native extension for WebGL target not found Refreshing native plugins compatible for Editor in 0.45 ms, found 3 plugins. @@ -698,6 +1202,48 @@ System memory in use after: 94.2 MB. Unloading 15 unused Assets to reduce memory usage. Loaded Objects now: 2582. Total: 5.936100 ms (FindLiveObjects: 0.575600 ms CreateObjectMapping: 0.254800 ms MarkObjects: 5.080000 ms DeleteObjects: 0.023200 ms) +======= +Refreshing native plugins compatible for Editor in 0.34 ms, found 3 plugins. +Preloading 0 native plugins for Editor in 0.00 ms. +Mono: successfully reloaded assembly +- Completed reload, in 0.738 seconds +Domain Reload Profiling: + ReloadAssembly (739ms) + BeginReloadAssembly (92ms) + ExecutionOrderSort (0ms) + DisableScriptedObjects (4ms) + BackupInstance (0ms) + ReleaseScriptingObjects (0ms) + CreateAndSetChildDomain (24ms) + EndReloadAssembly (604ms) + LoadAssemblies (61ms) + RebuildTransferFunctionScriptingTraits (0ms) + SetupTypeCache (190ms) + ReleaseScriptCaches (1ms) + RebuildScriptCaches (33ms) + SetupLoadedEditorAssemblies (224ms) + LogAssemblyErrors (0ms) + InitializePlatformSupportModulesInManaged (4ms) + SetLoadedEditorAssemblies (0ms) + RefreshPlugins (0ms) + BeforeProcessingInitializeOnLoad (64ms) + ProcessInitializeOnLoadAttributes (148ms) + ProcessInitializeOnLoadMethodAttributes (5ms) + AfterProcessingInitializeOnLoad (4ms) + EditorAssembliesLoaded (0ms) + ExecutionOrderSort2 (0ms) + AwakeInstancesAfterBackupRestoration (7ms) +Platform modules already initialized, skipping +Switching build target platform(19) subTarget(0) extendedPlatform(0) -> platform(13) subTarget(537395200) extendedPlatform(0) +Refreshing native plugins compatible for Editor in 0.32 ms, found 3 plugins. +Preloading 0 native plugins for Editor in 0.00 ms. +Unloading 2107 Unused Serialized files (Serialized files now loaded: 0) +System memory in use before: 94.2 MB. +System memory in use after: 94.3 MB. + +Unloading 19 unused Assets to reduce memory usage. Loaded Objects now: 2578. +Total: 2.344600 ms (FindLiveObjects: 0.160600 ms CreateObjectMapping: 0.043900 ms MarkObjects: 2.103300 ms DeleteObjects: 0.036000 ms) +>>>>>>> f40b9c3824b3dc0c23f55e77dcc5a951712e02e8 AssetImportParameters requested are different than current active one (requested -> active): custom:framework-win-MediaFoundation: 216162199b28c13a410421893ffa2e32 -> @@ -712,6 +1258,7 @@ AssetImportParameters requested are different than current active one (requested custom:audio-encoder-webm-vorbis: bf7c407c2cedff20999df2af8eb42d56 -> ======================================================================== Received Import Request. +<<<<<<< HEAD Time since last request: 11.811585 seconds. path: Assets/Prefabs/Cards/Standart/Card.prefab artifactKey: Guid(7d06a9bec9705b64fac3381d9c611a91) Importer(815301076,1909f56bfc062723c751e8b465ee728b) @@ -733,14 +1280,33 @@ Received Import Request. artifactKey: Guid(cef8186f91858aa43ac1d7dd281ecaec) Importer(815301076,1909f56bfc062723c751e8b465ee728b) Start importing Assets/Prefabs/Cards/AddStamina.prefab using Guid(cef8186f91858aa43ac1d7dd281ecaec) Importer(815301076,1909f56bfc062723c751e8b465ee728b) -> (artifact id: '41ff44f8353d437ce0d515ba25a0ddcb') in 0.009931 seconds Import took 0.014468 seconds . +======= + Time since last request: 76.175630 seconds. + path: Assets/Prefabs/Cards/BigDamage2.0.prefab + artifactKey: Guid(57646900771fe384190cb1680ecf2215) Importer(815301076,1909f56bfc062723c751e8b465ee728b) +Start importing Assets/Prefabs/Cards/BigDamage2.0.prefab using Guid(57646900771fe384190cb1680ecf2215) Importer(815301076,1909f56bfc062723c751e8b465ee728b) -> (artifact id: 'b2378ee4fc4e26dbac6857e61970da79') in 0.029646 seconds + Import took 0.032174 seconds . + +======================================================================== +Received Import Request. + Time since last request: 141.856994 seconds. + path: Assets/Graphics + artifactKey: Guid(867d9666565b3a0499fda8648dea0771) Importer(815301076,1909f56bfc062723c751e8b465ee728b) +Start importing Assets/Graphics using Guid(867d9666565b3a0499fda8648dea0771) Importer(815301076,1909f56bfc062723c751e8b465ee728b) -> (artifact id: '2c78f3d8ddeda74415dd6ce63d344cd1') in 0.001136 seconds + Import took 0.003677 seconds . +>>>>>>> f40b9c3824b3dc0c23f55e77dcc5a951712e02e8 ======================================================================== Received Prepare Registering precompiled user dll's ... +<<<<<<< HEAD Registered in 0.004633 seconds. +======= +Registered in 0.001294 seconds. +>>>>>>> f40b9c3824b3dc0c23f55e77dcc5a951712e02e8 Begin MonoManager ReloadAssembly -Native extension for LinuxStandalone target not found Native extension for WindowsStandalone target not found +<<<<<<< HEAD Native extension for OSXStandalone target not found Native extension for WebGL target not found Refreshing native plugins compatible for Editor in 1.17 ms, found 3 plugins. @@ -1043,6 +1609,48 @@ System memory in use after: 94.3 MB. Unloading 15 unused Assets to reduce memory usage. Loaded Objects now: 2592. Total: 2.952000 ms (FindLiveObjects: 0.223200 ms CreateObjectMapping: 0.102600 ms MarkObjects: 2.603800 ms DeleteObjects: 0.021300 ms) +======= +Refreshing native plugins compatible for Editor in 0.37 ms, found 3 plugins. +Preloading 0 native plugins for Editor in 0.00 ms. +Mono: successfully reloaded assembly +- Completed reload, in 0.730 seconds +Domain Reload Profiling: + ReloadAssembly (731ms) + BeginReloadAssembly (91ms) + ExecutionOrderSort (0ms) + DisableScriptedObjects (5ms) + BackupInstance (0ms) + ReleaseScriptingObjects (0ms) + CreateAndSetChildDomain (25ms) + EndReloadAssembly (595ms) + LoadAssemblies (64ms) + RebuildTransferFunctionScriptingTraits (0ms) + SetupTypeCache (189ms) + ReleaseScriptCaches (1ms) + RebuildScriptCaches (34ms) + SetupLoadedEditorAssemblies (212ms) + LogAssemblyErrors (0ms) + InitializePlatformSupportModulesInManaged (4ms) + SetLoadedEditorAssemblies (0ms) + RefreshPlugins (0ms) + BeforeProcessingInitializeOnLoad (61ms) + ProcessInitializeOnLoadAttributes (139ms) + ProcessInitializeOnLoadMethodAttributes (4ms) + AfterProcessingInitializeOnLoad (4ms) + EditorAssembliesLoaded (0ms) + ExecutionOrderSort2 (0ms) + AwakeInstancesAfterBackupRestoration (7ms) +Platform modules already initialized, skipping +Switching build target platform(19) subTarget(0) extendedPlatform(0) -> platform(13) subTarget(537395200) extendedPlatform(0) +Refreshing native plugins compatible for Editor in 0.32 ms, found 3 plugins. +Preloading 0 native plugins for Editor in 0.00 ms. +Unloading 2107 Unused Serialized files (Serialized files now loaded: 0) +System memory in use before: 94.2 MB. +System memory in use after: 94.3 MB. + +Unloading 16 unused Assets to reduce memory usage. Loaded Objects now: 2580. +Total: 2.055300 ms (FindLiveObjects: 0.138500 ms CreateObjectMapping: 0.050500 ms MarkObjects: 1.841700 ms DeleteObjects: 0.023900 ms) +>>>>>>> f40b9c3824b3dc0c23f55e77dcc5a951712e02e8 AssetImportParameters requested are different than current active one (requested -> active): custom:framework-win-MediaFoundation: 216162199b28c13a410421893ffa2e32 -> diff --git a/Logs/shadercompiler-UnityShaderCompiler.exe0.log b/Logs/shadercompiler-UnityShaderCompiler.exe0.log index 7e7a2d34..6a951cba 100644 --- a/Logs/shadercompiler-UnityShaderCompiler.exe0.log +++ b/Logs/shadercompiler-UnityShaderCompiler.exe0.log @@ -1,3 +1,46 @@ Base path: 'C:/Program Files/Unity/Hub/Editor/2020.3.19f1/Editor/Data', plugins path 'C:/Program Files/Unity/Hub/Editor/2020.3.19f1/Editor/Data/PlaybackEngines' Cmd: initializeCompiler +<<<<<<< HEAD +======= +Cmd: preprocess + insize=7883 file=Assets/TextMesh Pro/Shaders/TMP_SDF-Mobile Overlay.shader surfaceOnly=0 cachingPP=1 buildPlatform=13 pKW=UNITY_NO_DXT5nm UNITY_ENABLE_REFLECTION_BUFFERS UNITY_NO_CUBEMAP_ARRAY UNITY_NO_SCREENSPACE_SHADOWS UNITY_PBS_USE_BRDF3 UNITY_NO_FULL_STANDARD_SHADER UNITY_COLORSPACE_GAMMA UNITY_LIGHTMAP_DLDR_ENCODING dKW=UNITY_ENABLE_NATIVE_SHADOW_LOOKUPS UNITY_METAL_SHADOWS_USE_POINT_FILTERING UNITY_USE_DITHER_MASK_FOR_ALPHABLENDED_SHADOWS UNITY_PBS_USE_BRDF1 UNITY_PBS_USE_BRDF2 UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING UNITY_ENABLE_DETAIL_NORMALMAP UNITY_HARDWARE_TIER1 UNITY_HARDWARE_TIER2 UNITY_HARDWARE_TIER3 UNITY_LIGHT_PROBE_PROXY_VOLUME UNITY_HALF_PRECISION_FRAGMENT_SHADER_REGISTERS UNITY_LIGHTMAP_RGBM_ENCODING UNITY_LIGHTMAP_FULL_HDR UNITY_VIRTUAL_TEXTURING UNITY_PRETRANSFORM_TO_DISPLAY_ORIENTATION UNITY_ASTC_NORMALMAP_ENCODING SHADER_API_GLES30 ok=1 outsize=2542 + +Cmd: preprocess + insize=3642 file=Assets/TextMesh Pro/Shaders/TMP_Bitmap.shader surfaceOnly=0 cachingPP=1 buildPlatform=13 pKW=UNITY_NO_DXT5nm UNITY_ENABLE_REFLECTION_BUFFERS UNITY_NO_CUBEMAP_ARRAY UNITY_NO_SCREENSPACE_SHADOWS UNITY_PBS_USE_BRDF3 UNITY_NO_FULL_STANDARD_SHADER UNITY_COLORSPACE_GAMMA UNITY_LIGHTMAP_DLDR_ENCODING dKW=UNITY_ENABLE_NATIVE_SHADOW_LOOKUPS UNITY_METAL_SHADOWS_USE_POINT_FILTERING UNITY_USE_DITHER_MASK_FOR_ALPHABLENDED_SHADOWS UNITY_PBS_USE_BRDF1 UNITY_PBS_USE_BRDF2 UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING UNITY_ENABLE_DETAIL_NORMALMAP UNITY_HARDWARE_TIER1 UNITY_HARDWARE_TIER2 UNITY_HARDWARE_TIER3 UNITY_LIGHT_PROBE_PROXY_VOLUME UNITY_HALF_PRECISION_FRAGMENT_SHADER_REGISTERS UNITY_LIGHTMAP_RGBM_ENCODING UNITY_LIGHTMAP_FULL_HDR UNITY_VIRTUAL_TEXTURING UNITY_PRETRANSFORM_TO_DISPLAY_ORIENTATION UNITY_ASTC_NORMALMAP_ENCODING SHADER_API_GLES30 ok=1 outsize=1299 + +Cmd: preprocess + insize=12310 file=Assets/TextMesh Pro/Shaders/TMP_SDF SSD.shader surfaceOnly=0 cachingPP=1 buildPlatform=13 pKW=UNITY_NO_DXT5nm UNITY_ENABLE_REFLECTION_BUFFERS UNITY_NO_CUBEMAP_ARRAY UNITY_NO_SCREENSPACE_SHADOWS UNITY_PBS_USE_BRDF3 UNITY_NO_FULL_STANDARD_SHADER UNITY_COLORSPACE_GAMMA UNITY_LIGHTMAP_DLDR_ENCODING dKW=UNITY_ENABLE_NATIVE_SHADOW_LOOKUPS UNITY_METAL_SHADOWS_USE_POINT_FILTERING UNITY_USE_DITHER_MASK_FOR_ALPHABLENDED_SHADOWS UNITY_PBS_USE_BRDF1 UNITY_PBS_USE_BRDF2 UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING UNITY_ENABLE_DETAIL_NORMALMAP UNITY_HARDWARE_TIER1 UNITY_HARDWARE_TIER2 UNITY_HARDWARE_TIER3 UNITY_LIGHT_PROBE_PROXY_VOLUME UNITY_HALF_PRECISION_FRAGMENT_SHADER_REGISTERS UNITY_LIGHTMAP_RGBM_ENCODING UNITY_LIGHTMAP_FULL_HDR UNITY_VIRTUAL_TEXTURING UNITY_PRETRANSFORM_TO_DISPLAY_ORIENTATION UNITY_ASTC_NORMALMAP_ENCODING SHADER_API_GLES30 ok=1 outsize=4702 + +Cmd: preprocess + insize=3662 file=Assets/TextMesh Pro/Shaders/TMP_SDF-Surface-Mobile.shader surfaceOnly=0 cachingPP=1 buildPlatform=13 pKW=UNITY_NO_DXT5nm UNITY_ENABLE_REFLECTION_BUFFERS UNITY_NO_CUBEMAP_ARRAY UNITY_NO_SCREENSPACE_SHADOWS UNITY_PBS_USE_BRDF3 UNITY_NO_FULL_STANDARD_SHADER UNITY_COLORSPACE_GAMMA UNITY_LIGHTMAP_DLDR_ENCODING dKW=UNITY_ENABLE_NATIVE_SHADOW_LOOKUPS UNITY_METAL_SHADOWS_USE_POINT_FILTERING UNITY_USE_DITHER_MASK_FOR_ALPHABLENDED_SHADOWS UNITY_PBS_USE_BRDF1 UNITY_PBS_USE_BRDF2 UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING UNITY_ENABLE_DETAIL_NORMALMAP UNITY_HARDWARE_TIER1 UNITY_HARDWARE_TIER2 UNITY_HARDWARE_TIER3 UNITY_LIGHT_PROBE_PROXY_VOLUME UNITY_HALF_PRECISION_FRAGMENT_SHADER_REGISTERS UNITY_LIGHTMAP_RGBM_ENCODING UNITY_LIGHTMAP_FULL_HDR UNITY_VIRTUAL_TEXTURING UNITY_PRETRANSFORM_TO_DISPLAY_ORIENTATION UNITY_ASTC_NORMALMAP_ENCODING SHADER_API_GLES30 ok=1 outsize=2718 + +Cmd: preprocess + insize=4513 file=Assets/TextMesh Pro/Shaders/TMP_SDF-Surface.shader surfaceOnly=0 cachingPP=1 buildPlatform=13 pKW=UNITY_NO_DXT5nm UNITY_ENABLE_REFLECTION_BUFFERS UNITY_NO_CUBEMAP_ARRAY UNITY_NO_SCREENSPACE_SHADOWS UNITY_PBS_USE_BRDF3 UNITY_NO_FULL_STANDARD_SHADER UNITY_COLORSPACE_GAMMA UNITY_LIGHTMAP_DLDR_ENCODING dKW=UNITY_ENABLE_NATIVE_SHADOW_LOOKUPS UNITY_METAL_SHADOWS_USE_POINT_FILTERING UNITY_USE_DITHER_MASK_FOR_ALPHABLENDED_SHADOWS UNITY_PBS_USE_BRDF1 UNITY_PBS_USE_BRDF2 UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING UNITY_ENABLE_DETAIL_NORMALMAP UNITY_HARDWARE_TIER1 UNITY_HARDWARE_TIER2 UNITY_HARDWARE_TIER3 UNITY_LIGHT_PROBE_PROXY_VOLUME UNITY_HALF_PRECISION_FRAGMENT_SHADER_REGISTERS UNITY_LIGHTMAP_RGBM_ENCODING UNITY_LIGHTMAP_FULL_HDR UNITY_VIRTUAL_TEXTURING UNITY_PRETRANSFORM_TO_DISPLAY_ORIENTATION UNITY_ASTC_NORMALMAP_ENCODING SHADER_API_GLES30 ok=1 outsize=3751 + +Cmd: preprocess + insize=3640 file=Assets/TextMesh Pro/Shaders/TMP_Bitmap-Custom-Atlas.shader surfaceOnly=0 cachingPP=1 buildPlatform=13 pKW=UNITY_NO_DXT5nm UNITY_ENABLE_REFLECTION_BUFFERS UNITY_NO_CUBEMAP_ARRAY UNITY_NO_SCREENSPACE_SHADOWS UNITY_PBS_USE_BRDF3 UNITY_NO_FULL_STANDARD_SHADER UNITY_COLORSPACE_GAMMA UNITY_LIGHTMAP_DLDR_ENCODING dKW=UNITY_ENABLE_NATIVE_SHADOW_LOOKUPS UNITY_METAL_SHADOWS_USE_POINT_FILTERING UNITY_USE_DITHER_MASK_FOR_ALPHABLENDED_SHADOWS UNITY_PBS_USE_BRDF1 UNITY_PBS_USE_BRDF2 UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING UNITY_ENABLE_DETAIL_NORMALMAP UNITY_HARDWARE_TIER1 UNITY_HARDWARE_TIER2 UNITY_HARDWARE_TIER3 UNITY_LIGHT_PROBE_PROXY_VOLUME UNITY_HALF_PRECISION_FRAGMENT_SHADER_REGISTERS UNITY_LIGHTMAP_RGBM_ENCODING UNITY_LIGHTMAP_FULL_HDR UNITY_VIRTUAL_TEXTURING UNITY_PRETRANSFORM_TO_DISPLAY_ORIENTATION UNITY_ASTC_NORMALMAP_ENCODING SHADER_API_GLES30 ok=1 outsize=1347 + +Cmd: preprocess + insize=10917 file=Assets/TextMesh Pro/Shaders/TMP_SDF.shader surfaceOnly=0 cachingPP=1 buildPlatform=13 pKW=UNITY_NO_DXT5nm UNITY_ENABLE_REFLECTION_BUFFERS UNITY_NO_CUBEMAP_ARRAY UNITY_NO_SCREENSPACE_SHADOWS UNITY_PBS_USE_BRDF3 UNITY_NO_FULL_STANDARD_SHADER UNITY_COLORSPACE_GAMMA UNITY_LIGHTMAP_DLDR_ENCODING dKW=UNITY_ENABLE_NATIVE_SHADOW_LOOKUPS UNITY_METAL_SHADOWS_USE_POINT_FILTERING UNITY_USE_DITHER_MASK_FOR_ALPHABLENDED_SHADOWS UNITY_PBS_USE_BRDF1 UNITY_PBS_USE_BRDF2 UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING UNITY_ENABLE_DETAIL_NORMALMAP UNITY_HARDWARE_TIER1 UNITY_HARDWARE_TIER2 UNITY_HARDWARE_TIER3 UNITY_LIGHT_PROBE_PROXY_VOLUME UNITY_HALF_PRECISION_FRAGMENT_SHADER_REGISTERS UNITY_LIGHTMAP_RGBM_ENCODING UNITY_LIGHTMAP_FULL_HDR UNITY_VIRTUAL_TEXTURING UNITY_PRETRANSFORM_TO_DISPLAY_ORIENTATION UNITY_ASTC_NORMALMAP_ENCODING SHADER_API_GLES30 ok=1 outsize=4057 + +Cmd: preprocess + insize=3177 file=Assets/TextMesh Pro/Shaders/TMP_SDF-Mobile SSD.shader surfaceOnly=0 cachingPP=1 buildPlatform=13 pKW=UNITY_NO_DXT5nm UNITY_ENABLE_REFLECTION_BUFFERS UNITY_NO_CUBEMAP_ARRAY UNITY_NO_SCREENSPACE_SHADOWS UNITY_PBS_USE_BRDF3 UNITY_NO_FULL_STANDARD_SHADER UNITY_COLORSPACE_GAMMA UNITY_LIGHTMAP_DLDR_ENCODING dKW=UNITY_ENABLE_NATIVE_SHADOW_LOOKUPS UNITY_METAL_SHADOWS_USE_POINT_FILTERING UNITY_USE_DITHER_MASK_FOR_ALPHABLENDED_SHADOWS UNITY_PBS_USE_BRDF1 UNITY_PBS_USE_BRDF2 UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING UNITY_ENABLE_DETAIL_NORMALMAP UNITY_HARDWARE_TIER1 UNITY_HARDWARE_TIER2 UNITY_HARDWARE_TIER3 UNITY_LIGHT_PROBE_PROXY_VOLUME UNITY_HALF_PRECISION_FRAGMENT_SHADER_REGISTERS UNITY_LIGHTMAP_RGBM_ENCODING UNITY_LIGHTMAP_FULL_HDR UNITY_VIRTUAL_TEXTURING UNITY_PRETRANSFORM_TO_DISPLAY_ORIENTATION UNITY_ASTC_NORMALMAP_ENCODING SHADER_API_GLES30 ok=1 outsize=2815 + +Cmd: preprocess + insize=8069 file=Assets/TextMesh Pro/Shaders/TMP_SDF-Mobile Masking.shader surfaceOnly=0 cachingPP=1 buildPlatform=13 pKW=UNITY_NO_DXT5nm UNITY_ENABLE_REFLECTION_BUFFERS UNITY_NO_CUBEMAP_ARRAY UNITY_NO_SCREENSPACE_SHADOWS UNITY_PBS_USE_BRDF3 UNITY_NO_FULL_STANDARD_SHADER UNITY_COLORSPACE_GAMMA UNITY_LIGHTMAP_DLDR_ENCODING dKW=UNITY_ENABLE_NATIVE_SHADOW_LOOKUPS UNITY_METAL_SHADOWS_USE_POINT_FILTERING UNITY_USE_DITHER_MASK_FOR_ALPHABLENDED_SHADOWS UNITY_PBS_USE_BRDF1 UNITY_PBS_USE_BRDF2 UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING UNITY_ENABLE_DETAIL_NORMALMAP UNITY_HARDWARE_TIER1 UNITY_HARDWARE_TIER2 UNITY_HARDWARE_TIER3 UNITY_LIGHT_PROBE_PROXY_VOLUME UNITY_HALF_PRECISION_FRAGMENT_SHADER_REGISTERS UNITY_LIGHTMAP_RGBM_ENCODING UNITY_LIGHTMAP_FULL_HDR UNITY_VIRTUAL_TEXTURING UNITY_PRETRANSFORM_TO_DISPLAY_ORIENTATION UNITY_ASTC_NORMALMAP_ENCODING SHADER_API_GLES30 ok=1 outsize=2811 + +Cmd: preprocess + insize=10902 file=Assets/TextMesh Pro/Shaders/TMP_SDF Overlay.shader surfaceOnly=0 cachingPP=1 buildPlatform=13 pKW=UNITY_NO_DXT5nm UNITY_ENABLE_REFLECTION_BUFFERS UNITY_NO_CUBEMAP_ARRAY UNITY_NO_SCREENSPACE_SHADOWS UNITY_PBS_USE_BRDF3 UNITY_NO_FULL_STANDARD_SHADER UNITY_COLORSPACE_GAMMA UNITY_LIGHTMAP_DLDR_ENCODING dKW=UNITY_ENABLE_NATIVE_SHADOW_LOOKUPS UNITY_METAL_SHADOWS_USE_POINT_FILTERING UNITY_USE_DITHER_MASK_FOR_ALPHABLENDED_SHADOWS UNITY_PBS_USE_BRDF1 UNITY_PBS_USE_BRDF2 UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING UNITY_ENABLE_DETAIL_NORMALMAP UNITY_HARDWARE_TIER1 UNITY_HARDWARE_TIER2 UNITY_HARDWARE_TIER3 UNITY_LIGHT_PROBE_PROXY_VOLUME UNITY_HALF_PRECISION_FRAGMENT_SHADER_REGISTERS UNITY_LIGHTMAP_RGBM_ENCODING UNITY_LIGHTMAP_FULL_HDR UNITY_VIRTUAL_TEXTURING UNITY_PRETRANSFORM_TO_DISPLAY_ORIENTATION UNITY_ASTC_NORMALMAP_ENCODING SHADER_API_GLES30 ok=1 outsize=4047 + +Cmd: preprocess + insize=3694 file=Assets/TextMesh Pro/Shaders/TMP_Bitmap-Mobile.shader surfaceOnly=0 cachingPP=1 buildPlatform=13 pKW=UNITY_NO_DXT5nm UNITY_ENABLE_REFLECTION_BUFFERS UNITY_NO_CUBEMAP_ARRAY UNITY_NO_SCREENSPACE_SHADOWS UNITY_PBS_USE_BRDF3 UNITY_NO_FULL_STANDARD_SHADER UNITY_COLORSPACE_GAMMA UNITY_LIGHTMAP_DLDR_ENCODING dKW=UNITY_ENABLE_NATIVE_SHADOW_LOOKUPS UNITY_METAL_SHADOWS_USE_POINT_FILTERING UNITY_USE_DITHER_MASK_FOR_ALPHABLENDED_SHADOWS UNITY_PBS_USE_BRDF1 UNITY_PBS_USE_BRDF2 UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING UNITY_ENABLE_DETAIL_NORMALMAP UNITY_HARDWARE_TIER1 UNITY_HARDWARE_TIER2 UNITY_HARDWARE_TIER3 UNITY_LIGHT_PROBE_PROXY_VOLUME UNITY_HALF_PRECISION_FRAGMENT_SHADER_REGISTERS UNITY_LIGHTMAP_RGBM_ENCODING UNITY_LIGHTMAP_FULL_HDR UNITY_VIRTUAL_TEXTURING UNITY_PRETRANSFORM_TO_DISPLAY_ORIENTATION UNITY_ASTC_NORMALMAP_ENCODING SHADER_API_GLES30 ok=1 outsize=1723 + +Cmd: preprocess + insize=7914 file=Assets/TextMesh Pro/Shaders/TMP_SDF-Mobile.shader surfaceOnly=0 cachingPP=1 buildPlatform=13 pKW=UNITY_NO_DXT5nm UNITY_ENABLE_REFLECTION_BUFFERS UNITY_NO_CUBEMAP_ARRAY UNITY_NO_SCREENSPACE_SHADOWS UNITY_PBS_USE_BRDF3 UNITY_NO_FULL_STANDARD_SHADER UNITY_COLORSPACE_GAMMA UNITY_LIGHTMAP_DLDR_ENCODING dKW=UNITY_ENABLE_NATIVE_SHADOW_LOOKUPS UNITY_METAL_SHADOWS_USE_POINT_FILTERING UNITY_USE_DITHER_MASK_FOR_ALPHABLENDED_SHADOWS UNITY_PBS_USE_BRDF1 UNITY_PBS_USE_BRDF2 UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING UNITY_ENABLE_DETAIL_NORMALMAP UNITY_HARDWARE_TIER1 UNITY_HARDWARE_TIER2 UNITY_HARDWARE_TIER3 UNITY_LIGHT_PROBE_PROXY_VOLUME UNITY_HALF_PRECISION_FRAGMENT_SHADER_REGISTERS UNITY_LIGHTMAP_RGBM_ENCODING UNITY_LIGHTMAP_FULL_HDR UNITY_VIRTUAL_TEXTURING UNITY_PRETRANSFORM_TO_DISPLAY_ORIENTATION UNITY_ASTC_NORMALMAP_ENCODING SHADER_API_GLES30 ok=1 outsize=2554 + +Cmd: preprocess + insize=2468 file=Assets/TextMesh Pro/Shaders/TMP_Sprite.shader surfaceOnly=0 cachingPP=1 buildPlatform=13 pKW=UNITY_NO_DXT5nm UNITY_ENABLE_REFLECTION_BUFFERS UNITY_NO_CUBEMAP_ARRAY UNITY_NO_SCREENSPACE_SHADOWS UNITY_PBS_USE_BRDF3 UNITY_NO_FULL_STANDARD_SHADER UNITY_COLORSPACE_GAMMA UNITY_LIGHTMAP_DLDR_ENCODING dKW=UNITY_ENABLE_NATIVE_SHADOW_LOOKUPS UNITY_METAL_SHADOWS_USE_POINT_FILTERING UNITY_USE_DITHER_MASK_FOR_ALPHABLENDED_SHADOWS UNITY_PBS_USE_BRDF1 UNITY_PBS_USE_BRDF2 UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING UNITY_ENABLE_DETAIL_NORMALMAP UNITY_HARDWARE_TIER1 UNITY_HARDWARE_TIER2 UNITY_HARDWARE_TIER3 UNITY_LIGHT_PROBE_PROXY_VOLUME UNITY_HALF_PRECISION_FRAGMENT_SHADER_REGISTERS UNITY_LIGHTMAP_RGBM_ENCODING UNITY_LIGHTMAP_FULL_HDR UNITY_VIRTUAL_TEXTURING UNITY_PRETRANSFORM_TO_DISPLAY_ORIENTATION UNITY_ASTC_NORMALMAP_ENCODING SHADER_API_GLES30 ok=1 outsize=1177 + +Cmd: shutdown +>>>>>>> f40b9c3824b3dc0c23f55e77dcc5a951712e02e8 diff --git a/Logs/shadercompiler-UnityShaderCompiler.exe1.log b/Logs/shadercompiler-UnityShaderCompiler.exe1.log index 7e7a2d34..016af47d 100644 --- a/Logs/shadercompiler-UnityShaderCompiler.exe1.log +++ b/Logs/shadercompiler-UnityShaderCompiler.exe1.log @@ -1,3 +1,31 @@ Base path: 'C:/Program Files/Unity/Hub/Editor/2020.3.19f1/Editor/Data', plugins path 'C:/Program Files/Unity/Hub/Editor/2020.3.19f1/Editor/Data/PlaybackEngines' Cmd: initializeCompiler +Cmd: compileSnippet + insize=8050 file=Assets/TextMesh Pro/Shaders/TextMeshPro/Distance Field SSD pass= cachingPP=1 ppOnly=0 stripLineD=0 buildPlatform=13 rsLen=0 pKW=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 uKW= dKW=BEVEL_ON UNDERLAY_ON UNDERLAY_INNER GLOW_ON FORCE_LINEAR UNITY_UI_CLIP_RECT UNITY_UI_ALPHACLIP UNITY_ENABLE_NATIVE_SHADOW_LOOKUPS UNITY_METAL_SHADOWS_USE_POINT_FILTERING UNITY_USE_DITHER_MASK_FOR_ALPHABLENDED_SHADOWS UNITY_PBS_USE_BRDF1 UNITY_PBS_USE_BRDF3 UNITY_NO_FULL_STANDARD_SHADER UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING UNITY_ENABLE_DETAIL_NORMALMAP UNITY_HARDWARE_TIER1 UNITY_HARDWARE_TIER2 UNITY_LIGHT_PROBE_PROXY_VOLUME UNITY_HALF_PRECISION_FRAGMENT_SHADER_REGISTERS UNITY_LIGHTMAP_RGBM_ENCODING UNITY_LIGHTMAP_FULL_HDR UNITY_VIRTUAL_TEXTURING UNITY_PRETRANSFORM_TO_DISPLAY_ORIENTATION UNITY_ASTC_NORMALMAP_ENCODING SHADER_API_GLES30 flags=0 lang=0 type=Vertex platform=d3d11 reqs=227 mask=6 start=113 ok=1 outsize=1866 + +Cmd: compileSnippet + insize=2786 file=Assets/TextMesh Pro/Shaders/TextMeshPro/Bitmap pass= cachingPP=1 ppOnly=0 stripLineD=0 buildPlatform=13 rsLen=0 pKW=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 uKW= dKW=UNITY_UI_CLIP_RECT UNITY_UI_ALPHACLIP UNITY_ENABLE_NATIVE_SHADOW_LOOKUPS UNITY_METAL_SHADOWS_USE_POINT_FILTERING UNITY_USE_DITHER_MASK_FOR_ALPHABLENDED_SHADOWS UNITY_PBS_USE_BRDF1 UNITY_PBS_USE_BRDF3 UNITY_NO_FULL_STANDARD_SHADER UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING UNITY_ENABLE_DETAIL_NORMALMAP UNITY_HARDWARE_TIER1 UNITY_HARDWARE_TIER2 UNITY_LIGHT_PROBE_PROXY_VOLUME UNITY_HALF_PRECISION_FRAGMENT_SHADER_REGISTERS UNITY_LIGHTMAP_RGBM_ENCODING UNITY_LIGHTMAP_FULL_HDR UNITY_VIRTUAL_TEXTURING UNITY_PRETRANSFORM_TO_DISPLAY_ORIENTATION UNITY_ASTC_NORMALMAP_ENCODING SHADER_API_GLES30 flags=0 lang=0 type=Fragment platform=d3d11 reqs=33 mask=6 start=48 ok=1 outsize=558 + +Cmd: compileSnippet + insize=43644 file=Assets/TextMesh Pro/Shaders/TextMeshPro/Distance Field (Surface) pass=FORWARD cachingPP=1 ppOnly=0 stripLineD=0 buildPlatform=13 rsLen=0 pKW=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 UNITY_PASS_FORWARDBASE uKW=DIRECTIONAL dKW=GLOW_ON INSTANCING_ON FOG_LINEAR FOG_EXP FOG_EXP2 LIGHTPROBE_SH VERTEXLIGHT_ON UNITY_ENABLE_NATIVE_SHADOW_LOOKUPS UNITY_METAL_SHADOWS_USE_POINT_FILTERING UNITY_USE_DITHER_MASK_FOR_ALPHABLENDED_SHADOWS UNITY_PBS_USE_BRDF1 UNITY_PBS_USE_BRDF3 UNITY_NO_FULL_STANDARD_SHADER UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING UNITY_ENABLE_DETAIL_NORMALMAP UNITY_HARDWARE_TIER1 UNITY_HARDWARE_TIER2 UNITY_LIGHT_PROBE_PROXY_VOLUME UNITY_HALF_PRECISION_FRAGMENT_SHADER_REGISTERS UNITY_LIGHTMAP_RGBM_ENCODING UNITY_LIGHTMAP_FULL_HDR UNITY_VIRTUAL_TEXTURING UNITY_PRETRANSFORM_TO_DISPLAY_ORIENTATION UNITY_ASTC_NORMALMAP_ENCODING SHADER_API_GLES30 flags=0 lang=0 type=Vertex platform=d3d11 reqs=227 mask=6 start=87 ok=1 outsize=3994 + +Cmd: compileSnippet + insize=13472 file=Assets/TextMesh Pro/Shaders/TextMeshPro/Distance Field (Surface) pass=FORWARD cachingPP=1 ppOnly=0 stripLineD=0 buildPlatform=13 rsLen=0 pKW=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 UNITY_PASS_FORWARDADD uKW=POINT dKW=GLOW_ON FOG_LINEAR FOG_EXP FOG_EXP2 DIRECTIONAL SPOT POINT_COOKIE DIRECTIONAL_COOKIE UNITY_ENABLE_NATIVE_SHADOW_LOOKUPS UNITY_METAL_SHADOWS_USE_POINT_FILTERING UNITY_USE_DITHER_MASK_FOR_ALPHABLENDED_SHADOWS UNITY_PBS_USE_BRDF1 UNITY_PBS_USE_BRDF3 UNITY_NO_FULL_STANDARD_SHADER UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING UNITY_ENABLE_DETAIL_NORMALMAP UNITY_HARDWARE_TIER1 UNITY_HARDWARE_TIER2 UNITY_LIGHT_PROBE_PROXY_VOLUME UNITY_HALF_PRECISION_FRAGMENT_SHADER_REGISTERS UNITY_LIGHTMAP_RGBM_ENCODING UNITY_LIGHTMAP_FULL_HDR UNITY_VIRTUAL_TEXTURING UNITY_PRETRANSFORM_TO_DISPLAY_ORIENTATION UNITY_ASTC_NORMALMAP_ENCODING SHADER_API_GLES30 flags=0 lang=0 type=Vertex platform=d3d11 reqs=227 mask=6 start=371 ok=1 outsize=3934 + +Cmd: compileSnippet + insize=1280 file=Assets/TextMesh Pro/Shaders/TextMeshPro/Distance Field (Surface) pass=Caster cachingPP=1 ppOnly=0 stripLineD=0 buildPlatform=13 rsLen=0 pKW=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 UNITY_PASS_SHADOWCASTER uKW=SHADOWS_DEPTH dKW=SHADOWS_CUBE UNITY_ENABLE_NATIVE_SHADOW_LOOKUPS UNITY_METAL_SHADOWS_USE_POINT_FILTERING UNITY_USE_DITHER_MASK_FOR_ALPHABLENDED_SHADOWS UNITY_PBS_USE_BRDF1 UNITY_PBS_USE_BRDF3 UNITY_NO_FULL_STANDARD_SHADER UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING UNITY_ENABLE_DETAIL_NORMALMAP UNITY_HARDWARE_TIER1 UNITY_HARDWARE_TIER2 UNITY_LIGHT_PROBE_PROXY_VOLUME UNITY_HALF_PRECISION_FRAGMENT_SHADER_REGISTERS UNITY_LIGHTMAP_RGBM_ENCODING UNITY_LIGHTMAP_FULL_HDR UNITY_VIRTUAL_TEXTURING UNITY_PRETRANSFORM_TO_DISPLAY_ORIENTATION UNITY_ASTC_NORMALMAP_ENCODING SHADER_API_GLES30 flags=0 lang=0 type=Vertex platform=d3d11 reqs=33 mask=6 start=115 ok=1 outsize=1246 + +Cmd: compileSnippet + insize=802 file=Assets/TextMesh Pro/Shaders/TextMeshPro/Mobile/Distance Field SSD pass= cachingPP=1 ppOnly=0 stripLineD=0 buildPlatform=13 rsLen=0 pKW=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 uKW= dKW=OUTLINE_ON UNDERLAY_ON UNDERLAY_INNER UNITY_UI_CLIP_RECT UNITY_UI_ALPHACLIP UNITY_ENABLE_NATIVE_SHADOW_LOOKUPS UNITY_METAL_SHADOWS_USE_POINT_FILTERING UNITY_USE_DITHER_MASK_FOR_ALPHABLENDED_SHADOWS UNITY_PBS_USE_BRDF1 UNITY_PBS_USE_BRDF3 UNITY_NO_FULL_STANDARD_SHADER UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING UNITY_ENABLE_DETAIL_NORMALMAP UNITY_HARDWARE_TIER1 UNITY_HARDWARE_TIER2 UNITY_LIGHT_PROBE_PROXY_VOLUME UNITY_HALF_PRECISION_FRAGMENT_SHADER_REGISTERS UNITY_LIGHTMAP_RGBM_ENCODING UNITY_LIGHTMAP_FULL_HDR UNITY_VIRTUAL_TEXTURING UNITY_PRETRANSFORM_TO_DISPLAY_ORIENTATION UNITY_ASTC_NORMALMAP_ENCODING SHADER_API_GLES30 flags=0 lang=0 type=Vertex platform=d3d11 reqs=33 mask=6 start=86 ok=1 outsize=1814 + +Cmd: compileSnippet + insize=2736 file=Assets/TextMesh Pro/Shaders/TextMeshPro/Bitmap Custom Atlas pass= cachingPP=1 ppOnly=0 stripLineD=0 buildPlatform=13 rsLen=0 pKW=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 uKW= dKW=UNITY_UI_CLIP_RECT UNITY_UI_ALPHACLIP UNITY_ENABLE_NATIVE_SHADOW_LOOKUPS UNITY_METAL_SHADOWS_USE_POINT_FILTERING UNITY_USE_DITHER_MASK_FOR_ALPHABLENDED_SHADOWS UNITY_PBS_USE_BRDF1 UNITY_PBS_USE_BRDF3 UNITY_NO_FULL_STANDARD_SHADER UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING UNITY_ENABLE_DETAIL_NORMALMAP UNITY_HARDWARE_TIER1 UNITY_HARDWARE_TIER2 UNITY_LIGHT_PROBE_PROXY_VOLUME UNITY_HALF_PRECISION_FRAGMENT_SHADER_REGISTERS UNITY_LIGHTMAP_RGBM_ENCODING UNITY_LIGHTMAP_FULL_HDR UNITY_VIRTUAL_TEXTURING UNITY_PRETRANSFORM_TO_DISPLAY_ORIENTATION UNITY_ASTC_NORMALMAP_ENCODING SHADER_API_GLES30 flags=0 lang=0 type=Vertex platform=d3d11 reqs=33 mask=6 start=49 ok=1 outsize=1786 + +Cmd: compileSnippet + insize=1292 file=Assets/TextMesh Pro/Shaders/TextMeshPro/Mobile/Distance Field (Surface) pass=Caster cachingPP=1 ppOnly=0 stripLineD=0 buildPlatform=13 rsLen=0 pKW=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 UNITY_PASS_SHADOWCASTER uKW=SHADOWS_DEPTH dKW=SHADOWS_CUBE UNITY_ENABLE_NATIVE_SHADOW_LOOKUPS UNITY_METAL_SHADOWS_USE_POINT_FILTERING UNITY_USE_DITHER_MASK_FOR_ALPHABLENDED_SHADOWS UNITY_PBS_USE_BRDF1 UNITY_PBS_USE_BRDF3 UNITY_NO_FULL_STANDARD_SHADER UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING UNITY_ENABLE_DETAIL_NORMALMAP UNITY_HARDWARE_TIER1 UNITY_HARDWARE_TIER2 UNITY_LIGHT_PROBE_PROXY_VOLUME UNITY_HALF_PRECISION_FRAGMENT_SHADER_REGISTERS UNITY_LIGHTMAP_RGBM_ENCODING UNITY_LIGHTMAP_FULL_HDR UNITY_VIRTUAL_TEXTURING UNITY_PRETRANSFORM_TO_DISPLAY_ORIENTATION UNITY_ASTC_NORMALMAP_ENCODING SHADER_API_GLES30 flags=0 lang=0 type=Vertex platform=d3d11 reqs=33 mask=6 start=96 ok=1 outsize=1246 + +Cmd: compileSnippet + insize=5784 file=Assets/TextMesh Pro/Shaders/TextMeshPro/Mobile/Distance Field Overlay pass= cachingPP=1 ppOnly=0 stripLineD=0 buildPlatform=13 rsLen=0 pKW=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 uKW= dKW=OUTLINE_ON UNDERLAY_ON UNDERLAY_INNER UNITY_UI_CLIP_RECT UNITY_UI_ALPHACLIP UNITY_ENABLE_NATIVE_SHADOW_LOOKUPS UNITY_METAL_SHADOWS_USE_POINT_FILTERING UNITY_USE_DITHER_MASK_FOR_ALPHABLENDED_SHADOWS UNITY_PBS_USE_BRDF1 UNITY_PBS_USE_BRDF3 UNITY_NO_FULL_STANDARD_SHADER UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING UNITY_ENABLE_DETAIL_NORMALMAP UNITY_HARDWARE_TIER1 UNITY_HARDWARE_TIER2 UNITY_LIGHT_PROBE_PROXY_VOLUME UNITY_HALF_PRECISION_FRAGMENT_SHADER_REGISTERS UNITY_LIGHTMAP_RGBM_ENCODING UNITY_LIGHTMAP_FULL_HDR UNITY_VIRTUAL_TEXTURING UNITY_PRETRANSFORM_TO_DISPLAY_ORIENTATION UNITY_ASTC_NORMALMAP_ENCODING SHADER_API_GLES30 flags=0 lang=0 type=Vertex platform=d3d11 reqs=33 mask=6 start=83 ok=1 outsize=3130 + +Cmd: shutdown diff --git a/Logs/shadercompiler-UnityShaderCompiler.exe10.log b/Logs/shadercompiler-UnityShaderCompiler.exe10.log new file mode 100644 index 00000000..289ffbdb --- /dev/null +++ b/Logs/shadercompiler-UnityShaderCompiler.exe10.log @@ -0,0 +1,7 @@ +Base path: 'C:/Program Files/Unity/Hub/Editor/2020.3.19f1/Editor/Data', plugins path 'C:/Program Files/Unity/Hub/Editor/2020.3.19f1/Editor/Data/PlaybackEngines' +Cmd: initializeCompiler + +Cmd: compileSnippet + insize=1734 file=Assets/TextMesh Pro/Shaders/TextMeshPro/Sprite pass= cachingPP=1 ppOnly=0 stripLineD=0 buildPlatform=13 rsLen=0 pKW=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 uKW= dKW=UNITY_UI_CLIP_RECT UNITY_UI_ALPHACLIP UNITY_ENABLE_NATIVE_SHADOW_LOOKUPS UNITY_METAL_SHADOWS_USE_POINT_FILTERING UNITY_USE_DITHER_MASK_FOR_ALPHABLENDED_SHADOWS UNITY_PBS_USE_BRDF1 UNITY_PBS_USE_BRDF3 UNITY_NO_FULL_STANDARD_SHADER UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING UNITY_ENABLE_DETAIL_NORMALMAP UNITY_HARDWARE_TIER1 UNITY_HARDWARE_TIER2 UNITY_LIGHT_PROBE_PROXY_VOLUME UNITY_HALF_PRECISION_FRAGMENT_SHADER_REGISTERS UNITY_LIGHTMAP_RGBM_ENCODING UNITY_LIGHTMAP_FULL_HDR UNITY_VIRTUAL_TEXTURING UNITY_PRETRANSFORM_TO_DISPLAY_ORIENTATION UNITY_ASTC_NORMALMAP_ENCODING SHADER_API_GLES30 flags=0 lang=0 type=Fragment platform=d3d11 reqs=33 mask=6 start=50 ok=1 outsize=478 + +Cmd: shutdown diff --git a/Logs/shadercompiler-UnityShaderCompiler.exe11.log b/Logs/shadercompiler-UnityShaderCompiler.exe11.log new file mode 100644 index 00000000..4fb3a128 --- /dev/null +++ b/Logs/shadercompiler-UnityShaderCompiler.exe11.log @@ -0,0 +1,7 @@ +Base path: 'C:/Program Files/Unity/Hub/Editor/2020.3.19f1/Editor/Data', plugins path 'C:/Program Files/Unity/Hub/Editor/2020.3.19f1/Editor/Data/PlaybackEngines' +Cmd: initializeCompiler + +Cmd: compileSnippet + insize=2786 file=Assets/TextMesh Pro/Shaders/TextMeshPro/Bitmap pass= cachingPP=1 ppOnly=0 stripLineD=0 buildPlatform=13 rsLen=0 pKW=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 uKW= dKW=UNITY_UI_CLIP_RECT UNITY_UI_ALPHACLIP UNITY_ENABLE_NATIVE_SHADOW_LOOKUPS UNITY_METAL_SHADOWS_USE_POINT_FILTERING UNITY_USE_DITHER_MASK_FOR_ALPHABLENDED_SHADOWS UNITY_PBS_USE_BRDF1 UNITY_PBS_USE_BRDF3 UNITY_NO_FULL_STANDARD_SHADER UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING UNITY_ENABLE_DETAIL_NORMALMAP UNITY_HARDWARE_TIER1 UNITY_HARDWARE_TIER2 UNITY_LIGHT_PROBE_PROXY_VOLUME UNITY_HALF_PRECISION_FRAGMENT_SHADER_REGISTERS UNITY_LIGHTMAP_RGBM_ENCODING UNITY_LIGHTMAP_FULL_HDR UNITY_VIRTUAL_TEXTURING UNITY_PRETRANSFORM_TO_DISPLAY_ORIENTATION UNITY_ASTC_NORMALMAP_ENCODING SHADER_API_GLES30 flags=0 lang=0 type=Vertex platform=d3d11 reqs=33 mask=6 start=48 ok=1 outsize=1786 + +Cmd: shutdown diff --git a/Logs/shadercompiler-UnityShaderCompiler.exe2.log b/Logs/shadercompiler-UnityShaderCompiler.exe2.log index 7e7a2d34..9f4a3acb 100644 --- a/Logs/shadercompiler-UnityShaderCompiler.exe2.log +++ b/Logs/shadercompiler-UnityShaderCompiler.exe2.log @@ -1,3 +1,25 @@ Base path: 'C:/Program Files/Unity/Hub/Editor/2020.3.19f1/Editor/Data', plugins path 'C:/Program Files/Unity/Hub/Editor/2020.3.19f1/Editor/Data/PlaybackEngines' Cmd: initializeCompiler +Cmd: compileSnippet + insize=8050 file=Assets/TextMesh Pro/Shaders/TextMeshPro/Distance Field SSD pass= cachingPP=1 ppOnly=0 stripLineD=0 buildPlatform=13 rsLen=0 pKW=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 uKW= dKW=BEVEL_ON UNDERLAY_ON UNDERLAY_INNER GLOW_ON FORCE_LINEAR UNITY_UI_CLIP_RECT UNITY_UI_ALPHACLIP UNITY_ENABLE_NATIVE_SHADOW_LOOKUPS UNITY_METAL_SHADOWS_USE_POINT_FILTERING UNITY_USE_DITHER_MASK_FOR_ALPHABLENDED_SHADOWS UNITY_PBS_USE_BRDF1 UNITY_PBS_USE_BRDF3 UNITY_NO_FULL_STANDARD_SHADER UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING UNITY_ENABLE_DETAIL_NORMALMAP UNITY_HARDWARE_TIER1 UNITY_HARDWARE_TIER2 UNITY_LIGHT_PROBE_PROXY_VOLUME UNITY_HALF_PRECISION_FRAGMENT_SHADER_REGISTERS UNITY_LIGHTMAP_RGBM_ENCODING UNITY_LIGHTMAP_FULL_HDR UNITY_VIRTUAL_TEXTURING UNITY_PRETRANSFORM_TO_DISPLAY_ORIENTATION UNITY_ASTC_NORMALMAP_ENCODING SHADER_API_GLES30 flags=0 lang=0 type=Fragment platform=d3d11 reqs=227 mask=6 start=113 ok=1 outsize=1850 + +Cmd: compileSnippet + insize=43644 file=Assets/TextMesh Pro/Shaders/TextMeshPro/Distance Field (Surface) pass=FORWARD cachingPP=1 ppOnly=0 stripLineD=0 buildPlatform=13 rsLen=0 pKW=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 UNITY_PASS_FORWARDBASE uKW=DIRECTIONAL dKW=GLOW_ON INSTANCING_ON FOG_LINEAR FOG_EXP FOG_EXP2 LIGHTPROBE_SH UNITY_ENABLE_NATIVE_SHADOW_LOOKUPS UNITY_METAL_SHADOWS_USE_POINT_FILTERING UNITY_USE_DITHER_MASK_FOR_ALPHABLENDED_SHADOWS UNITY_PBS_USE_BRDF1 UNITY_PBS_USE_BRDF3 UNITY_NO_FULL_STANDARD_SHADER UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING UNITY_ENABLE_DETAIL_NORMALMAP UNITY_HARDWARE_TIER1 UNITY_HARDWARE_TIER2 UNITY_LIGHT_PROBE_PROXY_VOLUME UNITY_HALF_PRECISION_FRAGMENT_SHADER_REGISTERS UNITY_LIGHTMAP_RGBM_ENCODING UNITY_LIGHTMAP_FULL_HDR UNITY_VIRTUAL_TEXTURING UNITY_PRETRANSFORM_TO_DISPLAY_ORIENTATION UNITY_ASTC_NORMALMAP_ENCODING SHADER_API_GLES30 flags=0 lang=0 type=Fragment platform=d3d11 reqs=227 mask=6 start=87 ok=1 outsize=5410 + +Cmd: compileSnippet + insize=1280 file=Assets/TextMesh Pro/Shaders/TextMeshPro/Distance Field (Surface) pass=Caster cachingPP=1 ppOnly=0 stripLineD=0 buildPlatform=13 rsLen=0 pKW=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 UNITY_PASS_SHADOWCASTER uKW=SHADOWS_DEPTH dKW=SHADOWS_CUBE UNITY_ENABLE_NATIVE_SHADOW_LOOKUPS UNITY_METAL_SHADOWS_USE_POINT_FILTERING UNITY_USE_DITHER_MASK_FOR_ALPHABLENDED_SHADOWS UNITY_PBS_USE_BRDF1 UNITY_PBS_USE_BRDF3 UNITY_NO_FULL_STANDARD_SHADER UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING UNITY_ENABLE_DETAIL_NORMALMAP UNITY_HARDWARE_TIER1 UNITY_HARDWARE_TIER2 UNITY_LIGHT_PROBE_PROXY_VOLUME UNITY_HALF_PRECISION_FRAGMENT_SHADER_REGISTERS UNITY_LIGHTMAP_RGBM_ENCODING UNITY_LIGHTMAP_FULL_HDR UNITY_VIRTUAL_TEXTURING UNITY_PRETRANSFORM_TO_DISPLAY_ORIENTATION UNITY_ASTC_NORMALMAP_ENCODING SHADER_API_GLES30 flags=0 lang=0 type=Fragment platform=d3d11 reqs=33 mask=6 start=115 ok=1 outsize=502 + +Cmd: compileSnippet + insize=802 file=Assets/TextMesh Pro/Shaders/TextMeshPro/Mobile/Distance Field SSD pass= cachingPP=1 ppOnly=0 stripLineD=0 buildPlatform=13 rsLen=0 pKW=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 uKW= dKW=OUTLINE_ON UNDERLAY_ON UNDERLAY_INNER UNITY_UI_CLIP_RECT UNITY_UI_ALPHACLIP UNITY_ENABLE_NATIVE_SHADOW_LOOKUPS UNITY_METAL_SHADOWS_USE_POINT_FILTERING UNITY_USE_DITHER_MASK_FOR_ALPHABLENDED_SHADOWS UNITY_PBS_USE_BRDF1 UNITY_PBS_USE_BRDF3 UNITY_NO_FULL_STANDARD_SHADER UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING UNITY_ENABLE_DETAIL_NORMALMAP UNITY_HARDWARE_TIER1 UNITY_HARDWARE_TIER2 UNITY_LIGHT_PROBE_PROXY_VOLUME UNITY_HALF_PRECISION_FRAGMENT_SHADER_REGISTERS UNITY_LIGHTMAP_RGBM_ENCODING UNITY_LIGHTMAP_FULL_HDR UNITY_VIRTUAL_TEXTURING UNITY_PRETRANSFORM_TO_DISPLAY_ORIENTATION UNITY_ASTC_NORMALMAP_ENCODING SHADER_API_GLES30 flags=0 lang=0 type=Fragment platform=d3d11 reqs=33 mask=6 start=86 ok=1 outsize=834 + +Cmd: compileSnippet + insize=7300 file=Assets/TextMesh Pro/Shaders/TextMeshPro/Distance Field Overlay pass= cachingPP=1 ppOnly=0 stripLineD=0 buildPlatform=13 rsLen=0 pKW=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 uKW= dKW=BEVEL_ON UNDERLAY_ON UNDERLAY_INNER GLOW_ON UNITY_UI_CLIP_RECT UNITY_UI_ALPHACLIP UNITY_ENABLE_NATIVE_SHADOW_LOOKUPS UNITY_METAL_SHADOWS_USE_POINT_FILTERING UNITY_USE_DITHER_MASK_FOR_ALPHABLENDED_SHADOWS UNITY_PBS_USE_BRDF1 UNITY_PBS_USE_BRDF3 UNITY_NO_FULL_STANDARD_SHADER UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING UNITY_ENABLE_DETAIL_NORMALMAP UNITY_HARDWARE_TIER1 UNITY_HARDWARE_TIER2 UNITY_LIGHT_PROBE_PROXY_VOLUME UNITY_HALF_PRECISION_FRAGMENT_SHADER_REGISTERS UNITY_LIGHTMAP_RGBM_ENCODING UNITY_LIGHTMAP_FULL_HDR UNITY_VIRTUAL_TEXTURING UNITY_PRETRANSFORM_TO_DISPLAY_ORIENTATION UNITY_ASTC_NORMALMAP_ENCODING SHADER_API_GLES30 flags=0 lang=0 type=Fragment platform=d3d11 reqs=227 mask=6 start=114 ok=1 outsize=1594 + +Cmd: compileSnippet + insize=42987 file=Assets/TextMesh Pro/Shaders/TextMeshPro/Mobile/Distance Field (Surface) pass=FORWARD cachingPP=1 ppOnly=0 stripLineD=0 buildPlatform=13 rsLen=0 pKW=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 UNITY_PASS_FORWARDBASE uKW=DIRECTIONAL dKW=GLOW_ON INSTANCING_ON FOG_LINEAR FOG_EXP FOG_EXP2 LIGHTPROBE_SH VERTEXLIGHT_ON UNITY_ENABLE_NATIVE_SHADOW_LOOKUPS UNITY_METAL_SHADOWS_USE_POINT_FILTERING UNITY_USE_DITHER_MASK_FOR_ALPHABLENDED_SHADOWS UNITY_PBS_USE_BRDF1 UNITY_PBS_USE_BRDF3 UNITY_NO_FULL_STANDARD_SHADER UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING UNITY_ENABLE_DETAIL_NORMALMAP UNITY_HARDWARE_TIER1 UNITY_HARDWARE_TIER2 UNITY_LIGHT_PROBE_PROXY_VOLUME UNITY_HALF_PRECISION_FRAGMENT_SHADER_REGISTERS UNITY_LIGHTMAP_RGBM_ENCODING UNITY_LIGHTMAP_FULL_HDR UNITY_VIRTUAL_TEXTURING UNITY_PRETRANSFORM_TO_DISPLAY_ORIENTATION UNITY_ASTC_NORMALMAP_ENCODING SHADER_API_GLES30 flags=0 lang=0 type=Vertex platform=d3d11 reqs=227 mask=6 start=73 ok=1 outsize=3994 + +Cmd: compileSnippet + insize=1149 file=/TextMeshPro/Mobile/Bitmap pass= cachingPP=1 ppOnly=0 stripLineD=0 buildPlatform=13 rsLen=0 pKW=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 uKW= dKW=UNITY_ENABLE_NATIVE_SHADOW_LOOKUPS UNITY_METAL_SHADOWS_USE_POINT_FILTERING UNITY_USE_DITHER_MASK_FOR_ALPHABLENDED_SHADOWS UNITY_PBS_USE_BRDF1 UNITY_PBS_USE_BRDF3 UNITY_NO_FULL_STANDARD_SHADER UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING UNITY_ENABLE_DETAIL_NORMALMAP UNITY_HARDWARE_TIER1 UNITY_HARDWARE_TIER2 UNITY_LIGHT_PROBE_PROXY_VOLUME UNITY_HALF_PRECISION_FRAGMENT_SHADER_REGISTERS UNITY_LIGHTMAP_RGBM_ENCODING UNITY_LIGHTMAP_FULL_HDR UNITY_VIRTUAL_TEXTURING UNITY_PRETRANSFORM_TO_DISPLAY_ORIENTATION UNITY_ASTC_NORMALMAP_ENCODING SHADER_API_GLES30 flags=0 lang=0 type=Vertex platform=d3d11 reqs=1 mask=6 start=1 ok=1 outsize=822 + +Cmd: shutdown diff --git a/Logs/shadercompiler-UnityShaderCompiler.exe3.log b/Logs/shadercompiler-UnityShaderCompiler.exe3.log index 7e7a2d34..8efa316e 100644 --- a/Logs/shadercompiler-UnityShaderCompiler.exe3.log +++ b/Logs/shadercompiler-UnityShaderCompiler.exe3.log @@ -1,3 +1,22 @@ Base path: 'C:/Program Files/Unity/Hub/Editor/2020.3.19f1/Editor/Data', plugins path 'C:/Program Files/Unity/Hub/Editor/2020.3.19f1/Editor/Data/PlaybackEngines' Cmd: initializeCompiler +Cmd: compileSnippet + insize=5800 file=Assets/TextMesh Pro/Shaders/TextMeshPro/Distance Field SSD pass= cachingPP=1 ppOnly=0 stripLineD=0 buildPlatform=13 rsLen=0 pKW=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 uKW= dKW=OUTLINE_ON UNDERLAY_ON UNDERLAY_INNER UNITY_UI_CLIP_RECT UNITY_UI_ALPHACLIP UNITY_ENABLE_NATIVE_SHADOW_LOOKUPS UNITY_METAL_SHADOWS_USE_POINT_FILTERING UNITY_USE_DITHER_MASK_FOR_ALPHABLENDED_SHADOWS UNITY_PBS_USE_BRDF1 UNITY_PBS_USE_BRDF3 UNITY_NO_FULL_STANDARD_SHADER UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING UNITY_ENABLE_DETAIL_NORMALMAP UNITY_HARDWARE_TIER1 UNITY_HARDWARE_TIER2 UNITY_LIGHT_PROBE_PROXY_VOLUME UNITY_HALF_PRECISION_FRAGMENT_SHADER_REGISTERS UNITY_LIGHTMAP_RGBM_ENCODING UNITY_LIGHTMAP_FULL_HDR UNITY_VIRTUAL_TEXTURING UNITY_PRETRANSFORM_TO_DISPLAY_ORIENTATION UNITY_ASTC_NORMALMAP_ENCODING SHADER_API_GLES30 flags=0 lang=0 type=Vertex platform=d3d11 reqs=33 mask=6 start=83 ok=1 outsize=3130 + +Cmd: compileSnippet + insize=13472 file=Assets/TextMesh Pro/Shaders/TextMeshPro/Distance Field (Surface) pass=FORWARD cachingPP=1 ppOnly=0 stripLineD=0 buildPlatform=13 rsLen=0 pKW=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 UNITY_PASS_FORWARDADD uKW=POINT dKW=GLOW_ON FOG_LINEAR FOG_EXP FOG_EXP2 DIRECTIONAL SPOT POINT_COOKIE DIRECTIONAL_COOKIE UNITY_ENABLE_NATIVE_SHADOW_LOOKUPS UNITY_METAL_SHADOWS_USE_POINT_FILTERING UNITY_USE_DITHER_MASK_FOR_ALPHABLENDED_SHADOWS UNITY_PBS_USE_BRDF1 UNITY_PBS_USE_BRDF3 UNITY_NO_FULL_STANDARD_SHADER UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING UNITY_ENABLE_DETAIL_NORMALMAP UNITY_HARDWARE_TIER1 UNITY_HARDWARE_TIER2 UNITY_LIGHT_PROBE_PROXY_VOLUME UNITY_HALF_PRECISION_FRAGMENT_SHADER_REGISTERS UNITY_LIGHTMAP_RGBM_ENCODING UNITY_LIGHTMAP_FULL_HDR UNITY_VIRTUAL_TEXTURING UNITY_PRETRANSFORM_TO_DISPLAY_ORIENTATION UNITY_ASTC_NORMALMAP_ENCODING SHADER_API_GLES30 flags=0 lang=0 type=Fragment platform=d3d11 reqs=227 mask=6 start=371 ok=1 outsize=4878 + +Cmd: compileSnippet + insize=2736 file=Assets/TextMesh Pro/Shaders/TextMeshPro/Bitmap Custom Atlas pass= cachingPP=1 ppOnly=0 stripLineD=0 buildPlatform=13 rsLen=0 pKW=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 uKW= dKW=UNITY_UI_CLIP_RECT UNITY_UI_ALPHACLIP UNITY_ENABLE_NATIVE_SHADOW_LOOKUPS UNITY_METAL_SHADOWS_USE_POINT_FILTERING UNITY_USE_DITHER_MASK_FOR_ALPHABLENDED_SHADOWS UNITY_PBS_USE_BRDF1 UNITY_PBS_USE_BRDF3 UNITY_NO_FULL_STANDARD_SHADER UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING UNITY_ENABLE_DETAIL_NORMALMAP UNITY_HARDWARE_TIER1 UNITY_HARDWARE_TIER2 UNITY_LIGHT_PROBE_PROXY_VOLUME UNITY_HALF_PRECISION_FRAGMENT_SHADER_REGISTERS UNITY_LIGHTMAP_RGBM_ENCODING UNITY_LIGHTMAP_FULL_HDR UNITY_VIRTUAL_TEXTURING UNITY_PRETRANSFORM_TO_DISPLAY_ORIENTATION UNITY_ASTC_NORMALMAP_ENCODING SHADER_API_GLES30 flags=0 lang=0 type=Fragment platform=d3d11 reqs=33 mask=6 start=49 ok=1 outsize=558 + +Cmd: compileSnippet + insize=42987 file=Assets/TextMesh Pro/Shaders/TextMeshPro/Mobile/Distance Field (Surface) pass=FORWARD cachingPP=1 ppOnly=0 stripLineD=0 buildPlatform=13 rsLen=0 pKW=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 UNITY_PASS_FORWARDBASE uKW=DIRECTIONAL dKW=GLOW_ON INSTANCING_ON FOG_LINEAR FOG_EXP FOG_EXP2 LIGHTPROBE_SH UNITY_ENABLE_NATIVE_SHADOW_LOOKUPS UNITY_METAL_SHADOWS_USE_POINT_FILTERING UNITY_USE_DITHER_MASK_FOR_ALPHABLENDED_SHADOWS UNITY_PBS_USE_BRDF1 UNITY_PBS_USE_BRDF3 UNITY_NO_FULL_STANDARD_SHADER UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING UNITY_ENABLE_DETAIL_NORMALMAP UNITY_HARDWARE_TIER1 UNITY_HARDWARE_TIER2 UNITY_LIGHT_PROBE_PROXY_VOLUME UNITY_HALF_PRECISION_FRAGMENT_SHADER_REGISTERS UNITY_LIGHTMAP_RGBM_ENCODING UNITY_LIGHTMAP_FULL_HDR UNITY_VIRTUAL_TEXTURING UNITY_PRETRANSFORM_TO_DISPLAY_ORIENTATION UNITY_ASTC_NORMALMAP_ENCODING SHADER_API_GLES30 flags=0 lang=0 type=Fragment platform=d3d11 reqs=227 mask=6 start=73 ok=1 outsize=2430 + +Cmd: compileSnippet + insize=2414 file=Assets/TextMesh Pro/Shaders/TextMeshPro/Mobile/Bitmap pass= cachingPP=1 ppOnly=0 stripLineD=0 buildPlatform=13 rsLen=0 pKW=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 uKW= dKW=UNITY_UI_CLIP_RECT UNITY_UI_ALPHACLIP UNITY_ENABLE_NATIVE_SHADOW_LOOKUPS UNITY_METAL_SHADOWS_USE_POINT_FILTERING UNITY_USE_DITHER_MASK_FOR_ALPHABLENDED_SHADOWS UNITY_PBS_USE_BRDF1 UNITY_PBS_USE_BRDF3 UNITY_NO_FULL_STANDARD_SHADER UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING UNITY_ENABLE_DETAIL_NORMALMAP UNITY_HARDWARE_TIER1 UNITY_HARDWARE_TIER2 UNITY_LIGHT_PROBE_PROXY_VOLUME UNITY_HALF_PRECISION_FRAGMENT_SHADER_REGISTERS UNITY_LIGHTMAP_RGBM_ENCODING UNITY_LIGHTMAP_FULL_HDR UNITY_VIRTUAL_TEXTURING UNITY_PRETRANSFORM_TO_DISPLAY_ORIENTATION UNITY_ASTC_NORMALMAP_ENCODING SHADER_API_GLES30 flags=0 lang=0 type=Vertex platform=d3d11 reqs=33 mask=6 start=48 ok=1 outsize=1514 + +Cmd: compileSnippet + insize=1149 file=/TextMeshPro/Mobile/Bitmap pass= cachingPP=1 ppOnly=0 stripLineD=0 buildPlatform=13 rsLen=0 pKW=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 uKW= dKW=UNITY_ENABLE_NATIVE_SHADOW_LOOKUPS UNITY_METAL_SHADOWS_USE_POINT_FILTERING UNITY_USE_DITHER_MASK_FOR_ALPHABLENDED_SHADOWS UNITY_PBS_USE_BRDF1 UNITY_PBS_USE_BRDF3 UNITY_NO_FULL_STANDARD_SHADER UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING UNITY_ENABLE_DETAIL_NORMALMAP UNITY_HARDWARE_TIER1 UNITY_HARDWARE_TIER2 UNITY_LIGHT_PROBE_PROXY_VOLUME UNITY_HALF_PRECISION_FRAGMENT_SHADER_REGISTERS UNITY_LIGHTMAP_RGBM_ENCODING UNITY_LIGHTMAP_FULL_HDR UNITY_VIRTUAL_TEXTURING UNITY_PRETRANSFORM_TO_DISPLAY_ORIENTATION UNITY_ASTC_NORMALMAP_ENCODING SHADER_API_GLES30 flags=0 lang=0 type=Fragment platform=d3d11 reqs=1 mask=6 start=1 ok=1 outsize=458 + +Cmd: shutdown diff --git a/Logs/shadercompiler-UnityShaderCompiler.exe4.log b/Logs/shadercompiler-UnityShaderCompiler.exe4.log index 7e7a2d34..23ac6f14 100644 --- a/Logs/shadercompiler-UnityShaderCompiler.exe4.log +++ b/Logs/shadercompiler-UnityShaderCompiler.exe4.log @@ -1,3 +1,22 @@ Base path: 'C:/Program Files/Unity/Hub/Editor/2020.3.19f1/Editor/Data', plugins path 'C:/Program Files/Unity/Hub/Editor/2020.3.19f1/Editor/Data/PlaybackEngines' Cmd: initializeCompiler +<<<<<<< HEAD +======= +Cmd: compileSnippet + insize=5800 file=Assets/TextMesh Pro/Shaders/TextMeshPro/Distance Field SSD pass= cachingPP=1 ppOnly=0 stripLineD=0 buildPlatform=13 rsLen=0 pKW=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 uKW= dKW=OUTLINE_ON UNDERLAY_ON UNDERLAY_INNER UNITY_UI_CLIP_RECT UNITY_UI_ALPHACLIP UNITY_ENABLE_NATIVE_SHADOW_LOOKUPS UNITY_METAL_SHADOWS_USE_POINT_FILTERING UNITY_USE_DITHER_MASK_FOR_ALPHABLENDED_SHADOWS UNITY_PBS_USE_BRDF1 UNITY_PBS_USE_BRDF3 UNITY_NO_FULL_STANDARD_SHADER UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING UNITY_ENABLE_DETAIL_NORMALMAP UNITY_HARDWARE_TIER1 UNITY_HARDWARE_TIER2 UNITY_LIGHT_PROBE_PROXY_VOLUME UNITY_HALF_PRECISION_FRAGMENT_SHADER_REGISTERS UNITY_LIGHTMAP_RGBM_ENCODING UNITY_LIGHTMAP_FULL_HDR UNITY_VIRTUAL_TEXTURING UNITY_PRETRANSFORM_TO_DISPLAY_ORIENTATION UNITY_ASTC_NORMALMAP_ENCODING SHADER_API_GLES30 flags=0 lang=0 type=Fragment platform=d3d11 reqs=33 mask=6 start=83 ok=1 outsize=530 + +Cmd: compileSnippet + insize=7300 file=Assets/TextMesh Pro/Shaders/TextMeshPro/Distance Field Overlay pass= cachingPP=1 ppOnly=0 stripLineD=0 buildPlatform=13 rsLen=0 pKW=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 uKW= dKW=BEVEL_ON UNDERLAY_ON UNDERLAY_INNER GLOW_ON UNITY_UI_CLIP_RECT UNITY_UI_ALPHACLIP UNITY_ENABLE_NATIVE_SHADOW_LOOKUPS UNITY_METAL_SHADOWS_USE_POINT_FILTERING UNITY_USE_DITHER_MASK_FOR_ALPHABLENDED_SHADOWS UNITY_PBS_USE_BRDF1 UNITY_PBS_USE_BRDF3 UNITY_NO_FULL_STANDARD_SHADER UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING UNITY_ENABLE_DETAIL_NORMALMAP UNITY_HARDWARE_TIER1 UNITY_HARDWARE_TIER2 UNITY_LIGHT_PROBE_PROXY_VOLUME UNITY_HALF_PRECISION_FRAGMENT_SHADER_REGISTERS UNITY_LIGHTMAP_RGBM_ENCODING UNITY_LIGHTMAP_FULL_HDR UNITY_VIRTUAL_TEXTURING UNITY_PRETRANSFORM_TO_DISPLAY_ORIENTATION UNITY_ASTC_NORMALMAP_ENCODING SHADER_API_GLES30 flags=0 lang=0 type=Vertex platform=d3d11 reqs=227 mask=6 start=114 ok=1 outsize=3090 + +Cmd: compileSnippet + insize=1292 file=Assets/TextMesh Pro/Shaders/TextMeshPro/Mobile/Distance Field (Surface) pass=Caster cachingPP=1 ppOnly=0 stripLineD=0 buildPlatform=13 rsLen=0 pKW=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 UNITY_PASS_SHADOWCASTER uKW=SHADOWS_DEPTH dKW=SHADOWS_CUBE UNITY_ENABLE_NATIVE_SHADOW_LOOKUPS UNITY_METAL_SHADOWS_USE_POINT_FILTERING UNITY_USE_DITHER_MASK_FOR_ALPHABLENDED_SHADOWS UNITY_PBS_USE_BRDF1 UNITY_PBS_USE_BRDF3 UNITY_NO_FULL_STANDARD_SHADER UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING UNITY_ENABLE_DETAIL_NORMALMAP UNITY_HARDWARE_TIER1 UNITY_HARDWARE_TIER2 UNITY_LIGHT_PROBE_PROXY_VOLUME UNITY_HALF_PRECISION_FRAGMENT_SHADER_REGISTERS UNITY_LIGHTMAP_RGBM_ENCODING UNITY_LIGHTMAP_FULL_HDR UNITY_VIRTUAL_TEXTURING UNITY_PRETRANSFORM_TO_DISPLAY_ORIENTATION UNITY_ASTC_NORMALMAP_ENCODING SHADER_API_GLES30 flags=0 lang=0 type=Fragment platform=d3d11 reqs=33 mask=6 start=96 ok=1 outsize=502 + +Cmd: compileSnippet + insize=5784 file=Assets/TextMesh Pro/Shaders/TextMeshPro/Mobile/Distance Field Overlay pass= cachingPP=1 ppOnly=0 stripLineD=0 buildPlatform=13 rsLen=0 pKW=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 uKW= dKW=OUTLINE_ON UNDERLAY_ON UNDERLAY_INNER UNITY_UI_CLIP_RECT UNITY_UI_ALPHACLIP UNITY_ENABLE_NATIVE_SHADOW_LOOKUPS UNITY_METAL_SHADOWS_USE_POINT_FILTERING UNITY_USE_DITHER_MASK_FOR_ALPHABLENDED_SHADOWS UNITY_PBS_USE_BRDF1 UNITY_PBS_USE_BRDF3 UNITY_NO_FULL_STANDARD_SHADER UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING UNITY_ENABLE_DETAIL_NORMALMAP UNITY_HARDWARE_TIER1 UNITY_HARDWARE_TIER2 UNITY_LIGHT_PROBE_PROXY_VOLUME UNITY_HALF_PRECISION_FRAGMENT_SHADER_REGISTERS UNITY_LIGHTMAP_RGBM_ENCODING UNITY_LIGHTMAP_FULL_HDR UNITY_VIRTUAL_TEXTURING UNITY_PRETRANSFORM_TO_DISPLAY_ORIENTATION UNITY_ASTC_NORMALMAP_ENCODING SHADER_API_GLES30 flags=0 lang=0 type=Fragment platform=d3d11 reqs=33 mask=6 start=83 ok=1 outsize=530 + +Cmd: compileSnippet + insize=2414 file=Assets/TextMesh Pro/Shaders/TextMeshPro/Mobile/Bitmap pass= cachingPP=1 ppOnly=0 stripLineD=0 buildPlatform=13 rsLen=0 pKW=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 uKW= dKW=UNITY_UI_CLIP_RECT UNITY_UI_ALPHACLIP UNITY_ENABLE_NATIVE_SHADOW_LOOKUPS UNITY_METAL_SHADOWS_USE_POINT_FILTERING UNITY_USE_DITHER_MASK_FOR_ALPHABLENDED_SHADOWS UNITY_PBS_USE_BRDF1 UNITY_PBS_USE_BRDF3 UNITY_NO_FULL_STANDARD_SHADER UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING UNITY_ENABLE_DETAIL_NORMALMAP UNITY_HARDWARE_TIER1 UNITY_HARDWARE_TIER2 UNITY_LIGHT_PROBE_PROXY_VOLUME UNITY_HALF_PRECISION_FRAGMENT_SHADER_REGISTERS UNITY_LIGHTMAP_RGBM_ENCODING UNITY_LIGHTMAP_FULL_HDR UNITY_VIRTUAL_TEXTURING UNITY_PRETRANSFORM_TO_DISPLAY_ORIENTATION UNITY_ASTC_NORMALMAP_ENCODING SHADER_API_GLES30 flags=0 lang=0 type=Fragment platform=d3d11 reqs=33 mask=6 start=48 ok=1 outsize=450 + +Cmd: shutdown +>>>>>>> f40b9c3824b3dc0c23f55e77dcc5a951712e02e8 diff --git a/Logs/shadercompiler-UnityShaderCompiler.exe5.log b/Logs/shadercompiler-UnityShaderCompiler.exe5.log index 7e7a2d34..94b8d7ca 100644 --- a/Logs/shadercompiler-UnityShaderCompiler.exe5.log +++ b/Logs/shadercompiler-UnityShaderCompiler.exe5.log @@ -1,3 +1,10 @@ Base path: 'C:/Program Files/Unity/Hub/Editor/2020.3.19f1/Editor/Data', plugins path 'C:/Program Files/Unity/Hub/Editor/2020.3.19f1/Editor/Data/PlaybackEngines' Cmd: initializeCompiler +<<<<<<< HEAD +======= +Cmd: compileSnippet + insize=7305 file=Assets/TextMesh Pro/Shaders/TextMeshPro/Distance Field pass= cachingPP=1 ppOnly=0 stripLineD=0 buildPlatform=13 rsLen=0 pKW=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 uKW= dKW=BEVEL_ON UNDERLAY_ON UNDERLAY_INNER GLOW_ON UNITY_UI_CLIP_RECT UNITY_UI_ALPHACLIP UNITY_ENABLE_NATIVE_SHADOW_LOOKUPS UNITY_METAL_SHADOWS_USE_POINT_FILTERING UNITY_USE_DITHER_MASK_FOR_ALPHABLENDED_SHADOWS UNITY_PBS_USE_BRDF1 UNITY_PBS_USE_BRDF3 UNITY_NO_FULL_STANDARD_SHADER UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING UNITY_ENABLE_DETAIL_NORMALMAP UNITY_HARDWARE_TIER1 UNITY_HARDWARE_TIER2 UNITY_LIGHT_PROBE_PROXY_VOLUME UNITY_HALF_PRECISION_FRAGMENT_SHADER_REGISTERS UNITY_LIGHTMAP_RGBM_ENCODING UNITY_LIGHTMAP_FULL_HDR UNITY_VIRTUAL_TEXTURING UNITY_PRETRANSFORM_TO_DISPLAY_ORIENTATION UNITY_ASTC_NORMALMAP_ENCODING SHADER_API_GLES30 flags=0 lang=0 type=Vertex platform=d3d11 reqs=227 mask=6 start=114 ok=1 outsize=3090 + +Cmd: shutdown +>>>>>>> f40b9c3824b3dc0c23f55e77dcc5a951712e02e8 diff --git a/Logs/shadercompiler-UnityShaderCompiler.exe6.log b/Logs/shadercompiler-UnityShaderCompiler.exe6.log index 7e7a2d34..d2f6df01 100644 --- a/Logs/shadercompiler-UnityShaderCompiler.exe6.log +++ b/Logs/shadercompiler-UnityShaderCompiler.exe6.log @@ -1,3 +1,10 @@ Base path: 'C:/Program Files/Unity/Hub/Editor/2020.3.19f1/Editor/Data', plugins path 'C:/Program Files/Unity/Hub/Editor/2020.3.19f1/Editor/Data/PlaybackEngines' Cmd: initializeCompiler +<<<<<<< HEAD +======= +Cmd: compileSnippet + insize=7305 file=Assets/TextMesh Pro/Shaders/TextMeshPro/Distance Field pass= cachingPP=1 ppOnly=0 stripLineD=0 buildPlatform=13 rsLen=0 pKW=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 uKW= dKW=BEVEL_ON UNDERLAY_ON UNDERLAY_INNER GLOW_ON UNITY_UI_CLIP_RECT UNITY_UI_ALPHACLIP UNITY_ENABLE_NATIVE_SHADOW_LOOKUPS UNITY_METAL_SHADOWS_USE_POINT_FILTERING UNITY_USE_DITHER_MASK_FOR_ALPHABLENDED_SHADOWS UNITY_PBS_USE_BRDF1 UNITY_PBS_USE_BRDF3 UNITY_NO_FULL_STANDARD_SHADER UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING UNITY_ENABLE_DETAIL_NORMALMAP UNITY_HARDWARE_TIER1 UNITY_HARDWARE_TIER2 UNITY_LIGHT_PROBE_PROXY_VOLUME UNITY_HALF_PRECISION_FRAGMENT_SHADER_REGISTERS UNITY_LIGHTMAP_RGBM_ENCODING UNITY_LIGHTMAP_FULL_HDR UNITY_VIRTUAL_TEXTURING UNITY_PRETRANSFORM_TO_DISPLAY_ORIENTATION UNITY_ASTC_NORMALMAP_ENCODING SHADER_API_GLES30 flags=0 lang=0 type=Fragment platform=d3d11 reqs=227 mask=6 start=114 ok=1 outsize=1594 + +Cmd: shutdown +>>>>>>> f40b9c3824b3dc0c23f55e77dcc5a951712e02e8 diff --git a/Logs/shadercompiler-UnityShaderCompiler.exe7.log b/Logs/shadercompiler-UnityShaderCompiler.exe7.log index 7e7a2d34..70af247c 100644 --- a/Logs/shadercompiler-UnityShaderCompiler.exe7.log +++ b/Logs/shadercompiler-UnityShaderCompiler.exe7.log @@ -1,3 +1,10 @@ Base path: 'C:/Program Files/Unity/Hub/Editor/2020.3.19f1/Editor/Data', plugins path 'C:/Program Files/Unity/Hub/Editor/2020.3.19f1/Editor/Data/PlaybackEngines' Cmd: initializeCompiler +<<<<<<< HEAD +======= +Cmd: compileSnippet + insize=5696 file=Assets/TextMesh Pro/Shaders/TextMeshPro/Mobile/Distance Field - Masking pass= cachingPP=1 ppOnly=0 stripLineD=0 buildPlatform=13 rsLen=0 pKW=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 uKW= dKW=OUTLINE_ON UNDERLAY_ON UNDERLAY_INNER UNITY_UI_CLIP_RECT UNITY_UI_ALPHACLIP UNITY_ENABLE_NATIVE_SHADOW_LOOKUPS UNITY_METAL_SHADOWS_USE_POINT_FILTERING UNITY_USE_DITHER_MASK_FOR_ALPHABLENDED_SHADOWS UNITY_PBS_USE_BRDF1 UNITY_PBS_USE_BRDF3 UNITY_NO_FULL_STANDARD_SHADER UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING UNITY_ENABLE_DETAIL_NORMALMAP UNITY_HARDWARE_TIER1 UNITY_HARDWARE_TIER2 UNITY_LIGHT_PROBE_PROXY_VOLUME UNITY_HALF_PRECISION_FRAGMENT_SHADER_REGISTERS UNITY_LIGHTMAP_RGBM_ENCODING UNITY_LIGHTMAP_FULL_HDR UNITY_VIRTUAL_TEXTURING UNITY_PRETRANSFORM_TO_DISPLAY_ORIENTATION UNITY_ASTC_NORMALMAP_ENCODING SHADER_API_GLES30 flags=0 lang=0 type=Vertex platform=d3d11 reqs=33 mask=6 start=88 ok=1 outsize=3130 + +Cmd: shutdown +>>>>>>> f40b9c3824b3dc0c23f55e77dcc5a951712e02e8 diff --git a/Logs/shadercompiler-UnityShaderCompiler.exe8.log b/Logs/shadercompiler-UnityShaderCompiler.exe8.log new file mode 100644 index 00000000..9e86ff1c --- /dev/null +++ b/Logs/shadercompiler-UnityShaderCompiler.exe8.log @@ -0,0 +1,7 @@ +Base path: 'C:/Program Files/Unity/Hub/Editor/2020.3.19f1/Editor/Data', plugins path 'C:/Program Files/Unity/Hub/Editor/2020.3.19f1/Editor/Data/PlaybackEngines' +Cmd: initializeCompiler + +Cmd: compileSnippet + insize=5696 file=Assets/TextMesh Pro/Shaders/TextMeshPro/Mobile/Distance Field - Masking pass= cachingPP=1 ppOnly=0 stripLineD=0 buildPlatform=13 rsLen=0 pKW=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 uKW= dKW=OUTLINE_ON UNDERLAY_ON UNDERLAY_INNER UNITY_UI_CLIP_RECT UNITY_UI_ALPHACLIP UNITY_ENABLE_NATIVE_SHADOW_LOOKUPS UNITY_METAL_SHADOWS_USE_POINT_FILTERING UNITY_USE_DITHER_MASK_FOR_ALPHABLENDED_SHADOWS UNITY_PBS_USE_BRDF1 UNITY_PBS_USE_BRDF3 UNITY_NO_FULL_STANDARD_SHADER UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING UNITY_ENABLE_DETAIL_NORMALMAP UNITY_HARDWARE_TIER1 UNITY_HARDWARE_TIER2 UNITY_LIGHT_PROBE_PROXY_VOLUME UNITY_HALF_PRECISION_FRAGMENT_SHADER_REGISTERS UNITY_LIGHTMAP_RGBM_ENCODING UNITY_LIGHTMAP_FULL_HDR UNITY_VIRTUAL_TEXTURING UNITY_PRETRANSFORM_TO_DISPLAY_ORIENTATION UNITY_ASTC_NORMALMAP_ENCODING SHADER_API_GLES30 flags=0 lang=0 type=Fragment platform=d3d11 reqs=33 mask=6 start=88 ok=1 outsize=1134 + +Cmd: shutdown diff --git a/Logs/shadercompiler-UnityShaderCompiler.exe9.log b/Logs/shadercompiler-UnityShaderCompiler.exe9.log new file mode 100644 index 00000000..f743ae05 --- /dev/null +++ b/Logs/shadercompiler-UnityShaderCompiler.exe9.log @@ -0,0 +1,7 @@ +Base path: 'C:/Program Files/Unity/Hub/Editor/2020.3.19f1/Editor/Data', plugins path 'C:/Program Files/Unity/Hub/Editor/2020.3.19f1/Editor/Data/PlaybackEngines' +Cmd: initializeCompiler + +Cmd: compileSnippet + insize=1734 file=Assets/TextMesh Pro/Shaders/TextMeshPro/Sprite pass= cachingPP=1 ppOnly=0 stripLineD=0 buildPlatform=13 rsLen=0 pKW=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 uKW= dKW=UNITY_UI_CLIP_RECT UNITY_UI_ALPHACLIP UNITY_ENABLE_NATIVE_SHADOW_LOOKUPS UNITY_METAL_SHADOWS_USE_POINT_FILTERING UNITY_USE_DITHER_MASK_FOR_ALPHABLENDED_SHADOWS UNITY_PBS_USE_BRDF1 UNITY_PBS_USE_BRDF3 UNITY_NO_FULL_STANDARD_SHADER UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING UNITY_ENABLE_DETAIL_NORMALMAP UNITY_HARDWARE_TIER1 UNITY_HARDWARE_TIER2 UNITY_LIGHT_PROBE_PROXY_VOLUME UNITY_HALF_PRECISION_FRAGMENT_SHADER_REGISTERS UNITY_LIGHTMAP_RGBM_ENCODING UNITY_LIGHTMAP_FULL_HDR UNITY_VIRTUAL_TEXTURING UNITY_PRETRANSFORM_TO_DISPLAY_ORIENTATION UNITY_ASTC_NORMALMAP_ENCODING SHADER_API_GLES30 flags=0 lang=0 type=Vertex platform=d3d11 reqs=33 mask=6 start=50 ok=1 outsize=866 + +Cmd: shutdown diff --git a/obj/Debug/Assembly-CSharp.csproj.AssemblyReference.cache b/obj/Debug/Assembly-CSharp.csproj.AssemblyReference.cache index 25e57a34..589af8b1 100644 Binary files a/obj/Debug/Assembly-CSharp.csproj.AssemblyReference.cache and b/obj/Debug/Assembly-CSharp.csproj.AssemblyReference.cache differ diff --git a/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 54602135..ed1f0f19 100644 Binary files a/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ