diff --git a/Double Trouble/.vs/Double Trouble/v16/.suo b/Double Trouble/.vs/Double Trouble/v16/.suo
index f613d5628534a491a713f552394c342581ef5a98..e365ec1d3b697d0e4264035a6dabef29c74023b7 100644
Binary files a/Double Trouble/.vs/Double Trouble/v16/.suo and b/Double Trouble/.vs/Double Trouble/v16/.suo differ
diff --git a/Double Trouble/Library/ArtifactDB b/Double Trouble/Library/ArtifactDB
index c000b4cc8802eadeaaf19634fc20acb80f086107..eb706128982b4faabb3b371f8736e77f572e265c 100644
Binary files a/Double Trouble/Library/ArtifactDB and b/Double Trouble/Library/ArtifactDB differ
diff --git a/Double Trouble/Library/CurrentLayout-default.dwlt b/Double Trouble/Library/CurrentLayout-default.dwlt
index 9dafa7000e863ca73c9cc99d54dabcb7e82313c7..2d9ef00dfbf324857ee48f5b157bc337e31b9eaa 100644
--- a/Double Trouble/Library/CurrentLayout-default.dwlt
+++ b/Double Trouble/Library/CurrentLayout-default.dwlt
@@ -20,8 +20,8 @@ MonoBehaviour:
height: 778.4
m_ShowMode: 4
m_Title: Game
- m_RootView: {fileID: 2}
- m_MinSize: {x: 875, y: 542}
+ m_RootView: {fileID: 4}
+ m_MinSize: {x: 875, y: 300}
m_MaxSize: {x: 10000, y: 10000}
m_Maximized: 1
--- !u!114 &2
@@ -32,26 +32,24 @@ MonoBehaviour:
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_EditorHideFlags: 0
+ m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
+ m_Name: GameView
m_EditorClassIdentifier:
- m_Children:
- - {fileID: 3}
- - {fileID: 5}
- - {fileID: 4}
+ m_Children: []
m_Position:
serializedVersion: 2
x: 0
- y: 0
- width: 1419
- height: 778
- m_MinSize: {x: 875, y: 542}
- m_MaxSize: {x: 10000, y: 10000}
- m_UseTopView: 1
- m_TopViewHeight: 30
- m_UseBottomView: 1
- m_BottomViewHeight: 20
+ y: 320.8
+ width: 789.6
+ height: 407.60004
+ 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
--- !u!114 &3
MonoBehaviour:
m_ObjectHideFlags: 52
@@ -60,23 +58,23 @@ MonoBehaviour:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
- m_EditorHideFlags: 1
- m_Script: {fileID: 12011, guid: 0000000000000000e000000000000000, type: 0}
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0}
m_Name:
m_EditorClassIdentifier:
- m_Children: []
+ m_Children:
+ - {fileID: 8}
+ - {fileID: 2}
m_Position:
serializedVersion: 2
x: 0
y: 0
- width: 1419
- height: 30
- m_MinSize: {x: 0, y: 0}
- m_MaxSize: {x: 0, y: 0}
- m_LoadedToolbars:
- - {fileID: 22}
- m_MainToolbar: {fileID: 22}
- m_LastLoadedLayoutName:
+ width: 789.6
+ height: 728.4
+ m_MinSize: {x: 201, y: 442}
+ m_MaxSize: {x: 4001, y: 8042}
+ vertical: 1
+ controlID: 279
--- !u!114 &4
MonoBehaviour:
m_ObjectHideFlags: 52
@@ -86,18 +84,25 @@ MonoBehaviour:
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 1
- m_Script: {fileID: 12042, guid: 0000000000000000e000000000000000, type: 0}
+ m_Script: {fileID: 12008, guid: 0000000000000000e000000000000000, type: 0}
m_Name:
m_EditorClassIdentifier:
- m_Children: []
+ m_Children:
+ - {fileID: 5}
+ - {fileID: 6}
+ - {fileID: 7}
m_Position:
serializedVersion: 2
x: 0
- y: 758
- width: 1419
- height: 20
- m_MinSize: {x: 0, y: 0}
- m_MaxSize: {x: 0, y: 0}
+ y: 0
+ width: 1419.2001
+ height: 778.4
+ m_MinSize: {x: 875, y: 300}
+ m_MaxSize: {x: 10000, y: 10000}
+ m_UseTopView: 1
+ m_TopViewHeight: 30
+ m_UseBottomView: 1
+ m_BottomViewHeight: 20
--- !u!114 &5
MonoBehaviour:
m_ObjectHideFlags: 52
@@ -107,27 +112,22 @@ MonoBehaviour:
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 1
- m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0}
+ m_Script: {fileID: 12011, guid: 0000000000000000e000000000000000, type: 0}
m_Name:
m_EditorClassIdentifier:
- m_Children:
- - {fileID: 6}
- - {fileID: 9}
- - {fileID: 12}
+ m_Children: []
m_Position:
serializedVersion: 2
x: 0
- y: 30
- width: 1419
- height: 728
- m_MinSize: {x: 710, y: 492}
- m_MaxSize: {x: 18005, y: 14042}
- vertical: 0
-<<<<<<< HEAD
- controlID: 61
-=======
- controlID: 82
->>>>>>> viktor-test
+ y: 0
+ width: 1419.2001
+ height: 30
+ m_MinSize: {x: 0, y: 0}
+ m_MaxSize: {x: 0, y: 0}
+ m_LoadedToolbars:
+ - {fileID: 18}
+ m_MainToolbar: {fileID: 18}
+ m_LastLoadedLayoutName: Professional Layout
--- !u!114 &6
MonoBehaviour:
m_ObjectHideFlags: 52
@@ -136,27 +136,24 @@ MonoBehaviour:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
- m_EditorHideFlags: 0
+ m_EditorHideFlags: 1
m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0}
m_Name:
m_EditorClassIdentifier:
m_Children:
- - {fileID: 7}
- - {fileID: 8}
+ - {fileID: 3}
+ - {fileID: 9}
+ - {fileID: 10}
m_Position:
serializedVersion: 2
x: 0
- y: 0
- width: 737
- height: 728
- m_MinSize: {x: 201, y: 342}
- m_MaxSize: {x: 4001, y: 8042}
- vertical: 1
-<<<<<<< HEAD
- controlID: 62
-=======
- controlID: 18
->>>>>>> viktor-test
+ y: 30
+ width: 1419.2001
+ height: 728.4
+ m_MinSize: {x: 709, y: 492}
+ m_MaxSize: {x: 18004, y: 14042}
+ vertical: 0
+ controlID: 303
--- !u!114 &7
MonoBehaviour:
m_ObjectHideFlags: 52
@@ -166,24 +163,18 @@ MonoBehaviour:
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 1
- m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
- m_Name: AnimatorControllerTool
+ m_Script: {fileID: 12042, guid: 0000000000000000e000000000000000, type: 0}
+ m_Name:
m_EditorClassIdentifier:
m_Children: []
m_Position:
serializedVersion: 2
x: 0
- y: 0
- width: 737
- height: 344
- m_MinSize: {x: 101, y: 121}
- m_MaxSize: {x: 4001, y: 4021}
- m_ActualView: {fileID: 15}
- m_Panes:
- - {fileID: 14}
- - {fileID: 15}
- m_Selected: 1
- m_LastSelected: 0
+ y: 758.4
+ width: 1419.2001
+ height: 20
+ m_MinSize: {x: 0, y: 0}
+ m_MaxSize: {x: 0, y: 0}
--- !u!114 &8
MonoBehaviour:
m_ObjectHideFlags: 52
@@ -192,26 +183,24 @@ MonoBehaviour:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
- m_EditorHideFlags: 0
+ m_EditorHideFlags: 1
m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
- m_Name: GameView
+ m_Name: SceneView
m_EditorClassIdentifier:
m_Children: []
m_Position:
serializedVersion: 2
x: 0
- y: 344
- width: 737
- height: 384
+ y: 0
+ width: 789.6
+ height: 320.8
m_MinSize: {x: 201, y: 221}
m_MaxSize: {x: 4001, y: 4021}
- m_ActualView: {fileID: 13}
+ m_ActualView: {fileID: 16}
m_Panes:
- - {fileID: 13}
- {fileID: 16}
- - {fileID: 17}
m_Selected: 0
- m_LastSelected: 1
+ m_LastSelected: 0
--- !u!114 &9
MonoBehaviour:
m_ObjectHideFlags: 52
@@ -225,22 +214,18 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Children:
- - {fileID: 10}
- {fileID: 11}
+ - {fileID: 12}
m_Position:
serializedVersion: 2
- x: 737
+ x: 789.6
y: 0
- width: 348
- height: 728
+ width: 285.6
+ height: 728.4
m_MinSize: {x: 232, y: 492}
m_MaxSize: {x: 10002, y: 14042}
vertical: 1
-<<<<<<< HEAD
- controlID: 175
-=======
- controlID: 160
->>>>>>> viktor-test
+ controlID: 257
--- !u!114 &10
MonoBehaviour:
m_ObjectHideFlags: 52
@@ -256,15 +241,15 @@ MonoBehaviour:
m_Children: []
m_Position:
serializedVersion: 2
- x: 0
+ x: 1075.2
y: 0
- width: 348
- height: 386
- m_MinSize: {x: 200, y: 200}
- m_MaxSize: {x: 4000, y: 4000}
- m_ActualView: {fileID: 18}
+ width: 344.00012
+ height: 728.4
+ m_MinSize: {x: 276, y: 71}
+ m_MaxSize: {x: 4001, y: 4021}
+ m_ActualView: {fileID: 13}
m_Panes:
- - {fileID: 18}
+ - {fileID: 13}
m_Selected: 0
m_LastSelected: 0
--- !u!114 &11
@@ -277,20 +262,20 @@ MonoBehaviour:
m_Enabled: 1
m_EditorHideFlags: 1
m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
- m_Name: ProjectBrowser
+ m_Name:
m_EditorClassIdentifier:
m_Children: []
m_Position:
serializedVersion: 2
x: 0
- y: 386
- width: 348
- height: 342
- m_MinSize: {x: 232, y: 271}
- m_MaxSize: {x: 10002, y: 10021}
- m_ActualView: {fileID: 19}
+ y: 0
+ width: 285.6
+ height: 320.8
+ m_MinSize: {x: 202, y: 221}
+ m_MaxSize: {x: 4002, y: 4021}
+ m_ActualView: {fileID: 17}
m_Panes:
- - {fileID: 19}
+ - {fileID: 17}
m_Selected: 0
m_LastSelected: 0
--- !u!114 &12
@@ -303,24 +288,197 @@ MonoBehaviour:
m_Enabled: 1
m_EditorHideFlags: 1
m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
- m_Name: InspectorWindow
+ m_Name:
m_EditorClassIdentifier:
m_Children: []
m_Position:
serializedVersion: 2
- x: 1085
- y: 0
- width: 334
- height: 728
- m_MinSize: {x: 277, y: 71}
- m_MaxSize: {x: 4002, y: 4021}
- m_ActualView: {fileID: 20}
+ x: 0
+ y: 320.8
+ width: 285.6
+ height: 407.60004
+ m_MinSize: {x: 232, y: 271}
+ m_MaxSize: {x: 10002, y: 10021}
+ m_ActualView: {fileID: 14}
m_Panes:
- - {fileID: 20}
- - {fileID: 21}
+ - {fileID: 14}
m_Selected: 0
- m_LastSelected: 1
+ m_LastSelected: 0
--- !u!114 &13
+MonoBehaviour:
+ m_ObjectHideFlags: 52
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 0}
+ m_Enabled: 1
+ m_EditorHideFlags: 1
+ m_Script: {fileID: 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: -440750813802333266, guid: 0000000000000000d000000000000000,
+ type: 0}
+ m_Tooltip:
+ m_Pos:
+ serializedVersion: 2
+ x: 1149.6
+ y: 116
+ width: 343.00012
+ height: 707.4
+ 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_AssetGUID:
+ m_InstanceID: 0
+ m_LockTracker:
+ m_IsLocked: 0
+ m_PreviewWindow: {fileID: 0}
+--- !u!114 &14
+MonoBehaviour:
+ m_ObjectHideFlags: 52
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 0}
+ m_Enabled: 1
+ m_EditorHideFlags: 1
+ m_Script: {fileID: 12014, guid: 0000000000000000e000000000000000, type: 0}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_MinSize: {x: 230, y: 250}
+ m_MaxSize: {x: 10000, y: 10000}
+ m_TitleContent:
+ m_Text: Project
+ m_Image: {fileID: -5179483145760003458, guid: 0000000000000000d000000000000000,
+ type: 0}
+ m_Tooltip:
+ m_Pos:
+ serializedVersion: 2
+ x: 864
+ y: 436.80002
+ width: 283.6
+ height: 386.60004
+ m_ViewDataDictionary: {fileID: 0}
+ m_SearchFilter:
+ m_NameFilter:
+ m_ClassNames: []
+ m_AssetLabels: []
+ m_AssetBundleNames: []
+ m_VersionControlStates: []
+ m_SoftLockControlStates: []
+ m_ReferencingInstanceIDs:
+ m_SceneHandles:
+ m_ShowAllHits: 0
+ m_SkipHidden: 0
+ m_SearchArea: 1
+ m_Folders: []
+ m_Globs: []
+ m_ViewMode: 0
+ m_StartGridSize: 64
+ m_LastFolders: []
+ m_LastFoldersGridSize: -1
+ m_LastProjectPath: D:\Repositories\Gitlab\double-trouble\Double Trouble
+ m_LockTracker:
+ m_IsLocked: 0
+ m_FolderTreeState:
+ scrollPos: {x: 0, y: 0}
+ m_SelectedIDs: c23c0000
+ m_LastClickedID: 15554
+ m_ExpandedIDs: 00000000f0420000f2420000f4420000f6420000f8420000fa420000fc420000fe42000000430000024300000443000006430000084300000a4300000c4300000e43000000ca9a3b
+ m_RenameOverlay:
+ m_UserAcceptedRename: 0
+ m_Name:
+ m_OriginalName:
+ m_EditFieldRect:
+ serializedVersion: 2
+ x: 0
+ y: 0
+ width: 0
+ height: 0
+ m_UserData: 0
+ m_IsWaitingForDelay: 0
+ m_IsRenaming: 0
+ m_OriginalEventType: 11
+ m_IsRenamingFilename: 1
+ m_ClientGUIView: {fileID: 0}
+ m_SearchString:
+ m_CreateAssetUtility:
+ m_EndAction: {fileID: 0}
+ m_InstanceID: 0
+ m_Path:
+ m_Icon: {fileID: 0}
+ m_ResourceFile:
+ m_AssetTreeState:
+ scrollPos: {x: 0, y: 0}
+ m_SelectedIDs:
+ m_LastClickedID: 0
+ m_ExpandedIDs: ffffffff00000000f0420000f2420000f4420000f6420000f8420000fa420000fc420000fe42000000430000024300000443000006430000084300000a4300000c4300000e43000000ca9a3b
+ m_RenameOverlay:
+ m_UserAcceptedRename: 0
+ m_Name:
+ m_OriginalName:
+ m_EditFieldRect:
+ serializedVersion: 2
+ x: 0
+ y: 0
+ width: 0
+ height: 0
+ m_UserData: 0
+ m_IsWaitingForDelay: 0
+ m_IsRenaming: 0
+ m_OriginalEventType: 11
+ m_IsRenamingFilename: 1
+ m_ClientGUIView: {fileID: 0}
+ m_SearchString:
+ m_CreateAssetUtility:
+ m_EndAction: {fileID: 0}
+ m_InstanceID: 0
+ m_Path:
+ m_Icon: {fileID: 0}
+ m_ResourceFile:
+ m_ListAreaState:
+ m_SelectedInstanceIDs:
+ m_LastClickedInstanceID: 0
+ m_HadKeyboardFocusLastEvent: 0
+ m_ExpandedInstanceIDs: c6230000
+ m_RenameOverlay:
+ m_UserAcceptedRename: 0
+ m_Name:
+ m_OriginalName:
+ m_EditFieldRect:
+ serializedVersion: 2
+ x: 0
+ y: 0
+ width: 0
+ height: 0
+ m_UserData: 0
+ m_IsWaitingForDelay: 0
+ m_IsRenaming: 0
+ m_OriginalEventType: 11
+ m_IsRenamingFilename: 1
+ m_ClientGUIView: {fileID: 0}
+ m_CreateAssetUtility:
+ m_EndAction: {fileID: 0}
+ m_InstanceID: 0
+ m_Path:
+ m_Icon: {fileID: 0}
+ m_ResourceFile:
+ m_NewAssetIndexInList: -1
+ m_ScrollPosition: {x: 0, y: 0}
+ m_GridSize: 64
+ m_SkipHiddenPackages: 0
+ m_DirectoriesAreaWidth: 115
+--- !u!114 &15
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
@@ -342,9 +500,9 @@ MonoBehaviour:
m_Pos:
serializedVersion: 2
x: 74.4
- y: 460
- width: 736
- height: 363
+ y: 436.80002
+ width: 788.6
+ height: 386.60004
m_ViewDataDictionary: {fileID: 0}
m_SerializedViewNames: []
m_SerializedViewValues: []
@@ -352,7 +510,7 @@ MonoBehaviour:
m_ShowGizmos: 0
m_TargetDisplay: 0
m_ClearColor: {r: 0, g: 0, b: 0, a: 0}
- m_TargetSize: {x: 760, y: 427.5}
+ m_TargetSize: {x: 812, y: 457.00006}
m_TextureFilterMode: 0
m_TextureHideFlags: 61
m_RenderIMGUI: 1
@@ -367,10 +525,10 @@ MonoBehaviour:
m_VRangeLocked: 0
hZoomLockedByDefault: 0
vZoomLockedByDefault: 0
- m_HBaseRangeMin: -304
- m_HBaseRangeMax: 304
- m_VBaseRangeMin: -171
- m_VBaseRangeMax: 171
+ m_HBaseRangeMin: -324.80002
+ m_HBaseRangeMax: 324.80002
+ m_VBaseRangeMin: -182.80003
+ m_VBaseRangeMax: 182.80003
m_HAllowExceedBaseRangeMin: 1
m_HAllowExceedBaseRangeMax: 1
m_VAllowExceedBaseRangeMin: 1
@@ -388,29 +546,29 @@ MonoBehaviour:
serializedVersion: 2
x: 0
y: 21
- width: 736
- height: 342
- m_Scale: {x: 1, y: 1}
- m_Translation: {x: 368, y: 171}
+ width: 788.6
+ height: 365.60004
+ m_Scale: {x: 0.99999994, y: 0.99999994}
+ m_Translation: {x: 394.3, y: 182.80002}
m_MarginLeft: 0
m_MarginRight: 0
m_MarginTop: 0
m_MarginBottom: 0
m_LastShownAreaInsideMargins:
serializedVersion: 2
- x: -368
- y: -171
- width: 736
- height: 342
+ x: -394.30002
+ y: -182.80003
+ width: 788.60004
+ height: 365.60007
m_MinimalGUI: 1
- m_defaultScale: 1
- m_LastWindowPixelSize: {x: 920, y: 453.75}
+ m_defaultScale: 0.99999994
+ m_LastWindowPixelSize: {x: 985.75, y: 483.25006}
m_ClearInEditMode: 1
m_NoCameraWarning: 1
m_LowResolutionForAspectRatios: 00000000000000000000
m_XRRenderMode: 0
m_RenderTexture: {fileID: 0}
---- !u!114 &14
+--- !u!114 &16
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
@@ -433,8 +591,8 @@ MonoBehaviour:
serializedVersion: 2
x: 74.4
y: 116
- width: 736.6
- height: 323
+ width: 788.6
+ height: 299.8
m_ViewDataDictionary: {fileID: 0}
m_ShowContextualTools: 0
m_WindowGUID: e7d6685db26519b4db9df4ecbf526a12
@@ -478,9 +636,9 @@ MonoBehaviour:
m_Size: {x: 0, y: 0}
yGrid:
m_Fade:
- m_Target: 0
+ m_Target: 1
speed: 2
- m_Value: 0
+ m_Value: 1
m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4}
m_Pivot: {x: 0, y: 0, z: 0}
m_Size: {x: 1, y: 1}
@@ -492,7 +650,7 @@ MonoBehaviour:
m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4}
m_Pivot: {x: 0, y: 0, z: 0}
m_Size: {x: 1, y: 1}
- m_ShowGrid: 0
+ m_ShowGrid: 1
m_GridAxis: 1
m_gridOpacity: 0.5
m_Rotation:
@@ -508,8 +666,8 @@ MonoBehaviour:
speed: 2
m_Value: 0
m_CameraSettings:
- m_Speed: 0.9055
- m_SpeedNormalized: 0.45
+ m_Speed: 1
+ m_SpeedNormalized: 0.5
m_SpeedMin: 0.01
m_SpeedMax: 2
m_EasingEnabled: 1
@@ -524,129 +682,10 @@ MonoBehaviour:
m_LastSceneViewOrtho: 0
m_ReplacementShader: {fileID: 0}
m_ReplacementString:
- m_SceneVisActive: 0
+ m_SceneVisActive: 1
m_LastLockedObject: {fileID: 0}
m_ViewIsLockedToObject: 0
---- !u!114 &15
-MonoBehaviour:
- m_ObjectHideFlags: 52
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 0}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 12914, guid: 0000000000000000e000000000000000, type: 0}
- m_Name:
- m_EditorClassIdentifier:
- m_MinSize: {x: 100, y: 100}
- m_MaxSize: {x: 4000, y: 4000}
- m_TitleContent:
- m_Text: Animator
- m_Image: {fileID: 1711060831702674872, guid: 0000000000000000d000000000000000,
- type: 0}
- m_Tooltip:
- m_Pos:
- serializedVersion: 2
- x: 74.4
- y: 116
- width: 736
- height: 323
- m_ViewDataDictionary: {fileID: 0}
- m_ViewTransforms:
- m_KeySerializationHelper:
- - {fileID: 1107632418391388642, guid: d7c55390ab0320c47b84f63184ecb1b9, type: 2}
- m_ValueSerializationHelper:
- - e00: 0.590549
- e01: 0
- e02: 0
- e03: 156.5365
- e10: 0
- e11: 0.590549
- e12: 0
- e13: -77.60179
- e20: 0
- e21: 0
- e22: 1
- e23: 0
- e30: 0
- e31: 0
- e32: 0
- e33: 1
- m_PreviewAnimator: {fileID: 0}
- m_AnimatorController: {fileID: 9100000, guid: d7c55390ab0320c47b84f63184ecb1b9,
- type: 2}
- m_BreadCrumbs:
- - m_Target: {fileID: 1107632418391388642, guid: d7c55390ab0320c47b84f63184ecb1b9,
- type: 2}
- m_ScrollPosition: {x: 0, y: 0}
- stateMachineGraph: {fileID: 0}
- stateMachineGraphGUI: {fileID: 0}
- blendTreeGraph: {fileID: 0}
- blendTreeGraphGUI: {fileID: 0}
- m_AutoLiveLink: 1
- m_MiniTool: 0
- m_LockTracker:
- m_IsLocked: 0
- m_CurrentEditor: 1
- m_LayerEditor:
- m_SelectedLayerIndex: 0
---- !u!114 &16
-MonoBehaviour:
- m_ObjectHideFlags: 52
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 0}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 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: -4950941429401207979, guid: 0000000000000000d000000000000000,
- type: 0}
- m_Tooltip:
- m_Pos:
- serializedVersion: 2
- x: 74.4
- y: 460
- width: 736.6
- height: 363.40002
- m_ViewDataDictionary: {fileID: 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: 0
- m_Script: {fileID: 12071, guid: 0000000000000000e000000000000000, type: 0}
- m_Name:
- m_EditorClassIdentifier:
- m_MinSize: {x: 100, y: 100}
- m_MaxSize: {x: 4000, y: 4000}
- m_TitleContent:
- m_Text: Animation
- m_Image: {fileID: -3237396543322336831, guid: 0000000000000000d000000000000000,
- type: 0}
- m_Tooltip:
- m_Pos:
- serializedVersion: 2
- x: 74.4
- y: 460
- width: 736.6
- height: 363.40002
- m_ViewDataDictionary: {fileID: 0}
- m_LockTracker:
- m_IsLocked: 0
- m_LastSelectedObjectID: 14192
---- !u!114 &18
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
@@ -667,17 +706,17 @@ MonoBehaviour:
m_Tooltip:
m_Pos:
serializedVersion: 2
- x: 811.2
+ x: 864
y: 116
- width: 346
- height: 365
+ width: 283.6
+ height: 299.8
m_ViewDataDictionary: {fileID: 0}
m_SceneHierarchy:
m_TreeViewState:
scrollPos: {x: 0, y: 0}
- m_SelectedIDs:
+ m_SelectedIDs: f0420000
m_LastClickedID: 0
- m_ExpandedIDs: e072ffff
+ m_ExpandedIDs: daf7ffff5afbffff
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
@@ -693,7 +732,7 @@ MonoBehaviour:
m_IsRenaming: 0
m_OriginalEventType: 11
m_IsRenamingFilename: 0
- m_ClientGUIView: {fileID: 10}
+ m_ClientGUIView: {fileID: 11}
m_SearchString:
m_ExpandedScenes: []
m_CurrenRootInstanceID: 0
@@ -701,217 +740,7 @@ MonoBehaviour:
m_IsLocked: 0
m_CurrentSortingName: TransformSorting
m_WindowGUID: 05d5b8d113713084aabd2ca2e6ad0b26
---- !u!114 &19
-MonoBehaviour:
- m_ObjectHideFlags: 52
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 0}
- m_Enabled: 1
- m_EditorHideFlags: 1
- m_Script: {fileID: 12014, guid: 0000000000000000e000000000000000, type: 0}
- m_Name:
- m_EditorClassIdentifier:
- m_MinSize: {x: 230, y: 250}
- m_MaxSize: {x: 10000, y: 10000}
- m_TitleContent:
- m_Text: Project
- m_Image: {fileID: -5179483145760003458, guid: 0000000000000000d000000000000000,
- type: 0}
- m_Tooltip:
- m_Pos:
- serializedVersion: 2
- x: 811.2
- y: 501.6
- width: 346
- height: 321
- m_ViewDataDictionary: {fileID: 0}
- m_SearchFilter:
- m_NameFilter:
- m_ClassNames: []
- m_AssetLabels: []
- m_AssetBundleNames: []
- m_VersionControlStates: []
- m_SoftLockControlStates: []
- m_ReferencingInstanceIDs:
- m_SceneHandles:
- m_ShowAllHits: 0
- m_SkipHidden: 0
- m_SearchArea: 1
- m_Folders: []
- m_Globs: []
- m_ViewMode: 0
- m_StartGridSize: 64
- m_LastFolders: []
- m_LastFoldersGridSize: -1
- m_LastProjectPath: D:\Repositories\Gitlab\double-trouble\Double Trouble
- m_LockTracker:
- m_IsLocked: 0
- m_FolderTreeState:
- scrollPos: {x: 0, y: 0}
- m_SelectedIDs: c23c0000
- m_LastClickedID: 15554
-<<<<<<< HEAD
- m_ExpandedIDs: 00000000e0860000e2860000e4860000e6860000e8860000ea860000ec860000ee860000f0860000f2860000f4860000f6860000f8860000fa860000fc860000fe860000008700000287000004870000
-=======
- m_ExpandedIDs: 00000000e0860000e2860000e4860000e6860000e8860000ea860000ec860000ee860000f0860000f2860000f4860000f6860000f8860000fa860000fc860000fe860000
->>>>>>> viktor-test
- m_RenameOverlay:
- m_UserAcceptedRename: 0
- m_Name:
- m_OriginalName:
- m_EditFieldRect:
- serializedVersion: 2
- x: 0
- y: 0
- width: 0
- height: 0
- m_UserData: 0
- m_IsWaitingForDelay: 0
- m_IsRenaming: 0
- m_OriginalEventType: 11
- m_IsRenamingFilename: 1
- m_ClientGUIView: {fileID: 0}
- m_SearchString:
- m_CreateAssetUtility:
- m_EndAction: {fileID: 0}
- m_InstanceID: 0
- m_Path:
- m_Icon: {fileID: 0}
- m_ResourceFile:
- m_AssetTreeState:
-<<<<<<< HEAD
- scrollPos: {x: 0, y: 0}
- m_SelectedIDs:
- m_LastClickedID: 0
- m_ExpandedIDs: ffffffff00000000e0860000e2860000e4860000e6860000e8860000ea860000ec860000ee860000f0860000f2860000f4860000f6860000f8860000fa860000fc860000fe860000008700000287000004870000
-=======
- scrollPos: {x: 0, y: 200}
- m_SelectedIDs:
- m_LastClickedID: 0
- m_ExpandedIDs: ffffffff00000000e0860000e2860000e4860000e6860000e8860000ea860000ec860000ee860000f0860000f2860000f4860000f6860000f8860000fa860000fc860000fe860000
->>>>>>> viktor-test
- m_RenameOverlay:
- m_UserAcceptedRename: 0
- m_Name:
- m_OriginalName:
- m_EditFieldRect:
- serializedVersion: 2
- x: 0
- y: 0
- width: 0
- height: 0
- m_UserData: 0
- m_IsWaitingForDelay: 0
- m_IsRenaming: 0
- m_OriginalEventType: 11
- m_IsRenamingFilename: 1
- m_ClientGUIView: {fileID: 11}
- m_SearchString:
- m_CreateAssetUtility:
- m_EndAction: {fileID: 0}
- m_InstanceID: 0
- m_Path:
- m_Icon: {fileID: 0}
- m_ResourceFile:
- m_ListAreaState:
- m_SelectedInstanceIDs:
- m_LastClickedInstanceID: 0
- m_HadKeyboardFocusLastEvent: 0
- m_ExpandedInstanceIDs: c6230000
- m_RenameOverlay:
- m_UserAcceptedRename: 0
- m_Name:
- m_OriginalName:
- m_EditFieldRect:
- serializedVersion: 2
- x: 0
- y: 0
- width: 0
- height: 0
- m_UserData: 0
- m_IsWaitingForDelay: 0
- m_IsRenaming: 0
- m_OriginalEventType: 11
- m_IsRenamingFilename: 1
- m_ClientGUIView: {fileID: 0}
- m_CreateAssetUtility:
- m_EndAction: {fileID: 0}
- m_InstanceID: 0
- m_Path:
- m_Icon: {fileID: 0}
- m_ResourceFile:
- m_NewAssetIndexInList: -1
- m_ScrollPosition: {x: 0, y: 0}
- m_GridSize: 64
- m_SkipHiddenPackages: 0
- m_DirectoriesAreaWidth: 115
---- !u!114 &20
-MonoBehaviour:
- m_ObjectHideFlags: 52
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 0}
- m_Enabled: 1
- m_EditorHideFlags: 1
- m_Script: {fileID: 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: -440750813802333266, guid: 0000000000000000d000000000000000,
- type: 0}
- m_Tooltip:
- m_Pos:
- serializedVersion: 2
- x: 1159.2001
- y: 116
- width: 332
- height: 707
- 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_AssetGUID:
- m_InstanceID: 0
- m_LockTracker:
- m_IsLocked: 0
- m_PreviewWindow: {fileID: 0}
---- !u!114 &21
-MonoBehaviour:
- m_ObjectHideFlags: 52
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 0}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 12402, guid: 0000000000000000e000000000000000, type: 0}
- m_Name:
- m_EditorClassIdentifier:
- m_MinSize: {x: 300, y: 150}
- m_MaxSize: {x: 4000, y: 4000}
- m_TitleContent:
- m_Text: Services
- m_Image: {fileID: 0}
- m_Tooltip:
- m_Pos:
- serializedVersion: 2
- x: 1136.8
- y: 116
- width: 354.59998
- height: 707
- m_ViewDataDictionary: {fileID: 0}
---- !u!114 &22
+--- !u!114 &18
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
diff --git a/Double Trouble/Library/InspectorExpandedItems.asset b/Double Trouble/Library/InspectorExpandedItems.asset
index 2f86150699c30a64129b9288acab5154c69b489f..482f861627eb0ec784eeec2f90accb79ad4ccf6b 100644
Binary files a/Double Trouble/Library/InspectorExpandedItems.asset and b/Double Trouble/Library/InspectorExpandedItems.asset differ
diff --git a/Double Trouble/Library/SceneVisibilityState.asset b/Double Trouble/Library/SceneVisibilityState.asset
index 515d23c8d28944a70569d2758f2cb52da4729e02..802e061ffbc8ef46986ccde69d757560ca02fd72 100644
Binary files a/Double Trouble/Library/SceneVisibilityState.asset and b/Double Trouble/Library/SceneVisibilityState.asset differ
diff --git a/Double Trouble/Library/ShaderCache/EditorEncounteredVariants b/Double Trouble/Library/ShaderCache/EditorEncounteredVariants
index f1f0c19a3cc3d288c61a14133ce68b57a9506d24..d6a72b054070163e69bde17d80af6d6ddb6594bd 100644
Binary files a/Double Trouble/Library/ShaderCache/EditorEncounteredVariants and b/Double Trouble/Library/ShaderCache/EditorEncounteredVariants differ
diff --git a/Double Trouble/Library/SourceAssetDB b/Double Trouble/Library/SourceAssetDB
index fb4c85f3ae9aaf964f79ddfaa3163690cea8cfbe..e69ea3ee40c4fae734831cd84ef3c1fbc90dc7fa 100644
Binary files a/Double Trouble/Library/SourceAssetDB and b/Double Trouble/Library/SourceAssetDB differ
diff --git a/Double Trouble/Library/expandedItems b/Double Trouble/Library/expandedItems
index 3261915259ea21bb005f4292abf3db2e84747442..930528e25f614b6c503203ef693046c7f9b15e1c 100644
Binary files a/Double Trouble/Library/expandedItems and b/Double Trouble/Library/expandedItems differ
diff --git a/Double Trouble/Library/shadercompiler-UnityShaderCompiler.exe0.log b/Double Trouble/Library/shadercompiler-UnityShaderCompiler.exe0.log
index 16297c794dba247d23b8290a5092cb1c095cf68c..43d265040e30f83e59c720b8925381ea1ec83248 100644
--- a/Double Trouble/Library/shadercompiler-UnityShaderCompiler.exe0.log
+++ b/Double Trouble/Library/shadercompiler-UnityShaderCompiler.exe0.log
@@ -1,4 +1,2 @@
Base path: 'D:/Program Files/Unity/Hub/Editor/2020.1.9f1/Editor/Data', plugins path 'D:/Program Files/Unity/Hub/Editor/2020.1.9f1/Editor/Data/PlaybackEngines'
Cmd: initializeCompiler
-Cmd: preprocess
- insize=2414 outsize=2035 pd=UNITY_ENABLE_REFLECTION_BUFFERS UNITY_USE_DITHER_MASK_FOR_ALPHABLENDED_SHADOWS UNITY_PBS_USE_BRDF1 UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING UNITY_ENABLE_DETAIL_NORMALMAP SHADER_API_DESKTOP UNITY_COLORSPACE_GAMMA UNITY_LIGHT_PROBE_PROXY_VOLUME UNITY_LIGHTMAP_FULL_HDR dkw=UNITY_NO_DXT5nm UNITY_ENABLE_NATIVE_SHADOW_LOOKUPS UNITY_METAL_SHADOWS_USE_POINT_FILTERING UNITY_NO_SCREENSPACE_SHADOWS UNITY_PBS_USE_BRDF2 UNITY_PBS_USE_BRDF3 UNITY_NO_FULL_STANDARD_SHADER UNITY_HARDWARE_TIER1 UNITY_HARDWARE_TIER2 UNITY_HARDWARE_TIER3 UNITY_HALF_PRECISION_FRAGMENT_SHADER_REGISTERS UNITY_LIGHTMAP_DLDR_ENCODING UNITY_LIGHTMAP_RGBM_ENCODING UNITY_VIRTUAL_TEXTURING ok=1
diff --git a/Double Trouble/obj/Debug/Assembly-CSharp-Editor.csprojAssemblyReference.cache b/Double Trouble/obj/Debug/Assembly-CSharp-Editor.csprojAssemblyReference.cache
index 215ea69017e1a23784bef890eec39194d0c4fa0f..37003c5f5c55377b8d0ed533ee7a0396920d5510 100644
Binary files a/Double Trouble/obj/Debug/Assembly-CSharp-Editor.csprojAssemblyReference.cache and b/Double Trouble/obj/Debug/Assembly-CSharp-Editor.csprojAssemblyReference.cache differ
diff --git a/Double Trouble/obj/Debug/Assembly-CSharp.csprojAssemblyReference.cache b/Double Trouble/obj/Debug/Assembly-CSharp.csprojAssemblyReference.cache
index 9c4723475f48139b9ac290e1fece616c44d96dce..f05fe4880f570d340db59a917ca682c88fbcf763 100644
Binary files a/Double Trouble/obj/Debug/Assembly-CSharp.csprojAssemblyReference.cache and b/Double Trouble/obj/Debug/Assembly-CSharp.csprojAssemblyReference.cache differ