diff --git a/FlufflParty/.idea/.idea.FlufflParty/.idea/workspace.xml b/FlufflParty/.idea/.idea.FlufflParty/.idea/workspace.xml
index 80d9f74..05ec03a 100644
--- a/FlufflParty/.idea/.idea.FlufflParty/.idea/workspace.xml
+++ b/FlufflParty/.idea/.idea.FlufflParty/.idea/workspace.xml
@@ -145,7 +145,7 @@
-
+
diff --git a/FlufflParty/Assets/BlenderFiles/Characters/Chicken (Not Animated)/Chicken2.blend b/FlufflParty/Assets/BlenderFiles/Characters/Chicken (Not Animated)/Chicken2.blend
index 94cd719..c315888 100644
Binary files a/FlufflParty/Assets/BlenderFiles/Characters/Chicken (Not Animated)/Chicken2.blend and b/FlufflParty/Assets/BlenderFiles/Characters/Chicken (Not Animated)/Chicken2.blend differ
diff --git a/FlufflParty/Assets/BlenderFiles/Characters/Chicken (Not Animated)/Chicken2.blend1 b/FlufflParty/Assets/BlenderFiles/Characters/Chicken (Not Animated)/Chicken2.blend1
index e0ab6b9..5e8f5d8 100644
Binary files a/FlufflParty/Assets/BlenderFiles/Characters/Chicken (Not Animated)/Chicken2.blend1 and b/FlufflParty/Assets/BlenderFiles/Characters/Chicken (Not Animated)/Chicken2.blend1 differ
diff --git a/FlufflParty/ProjectSettings/ProjectSettings.asset b/FlufflParty/ProjectSettings/ProjectSettings.asset
index 435dcaf..df99f39 100644
--- a/FlufflParty/ProjectSettings/ProjectSettings.asset
+++ b/FlufflParty/ProjectSettings/ProjectSettings.asset
@@ -137,9 +137,7 @@ PlayerSettings:
16:9: 1
Others: 1
bundleVersion: 0.14
- preloadedAssets:
- - {fileID: -6390619424234631034, guid: 90cd1b71078984c4980fcd1aa03eaaa3, type: 2}
- - {fileID: 11400000, guid: 48bf7376b3770c44cbfe3f40e77359ab, type: 2}
+ preloadedAssets: []
metroInputSource: 0
wsaTransparentSwapchain: 0
m_HolographicPauseOnTrackingLoss: 1
diff --git a/FlufflParty/UserSettings/Layouts/default-2021.dwlt b/FlufflParty/UserSettings/Layouts/default-2021.dwlt
index c8e6591..960d034 100644
--- a/FlufflParty/UserSettings/Layouts/default-2021.dwlt
+++ b/FlufflParty/UserSettings/Layouts/default-2021.dwlt
@@ -19,7 +19,7 @@ MonoBehaviour:
width: 1920
height: 1117
m_ShowMode: 4
- m_Title: Project
+ m_Title: Game
m_RootView: {fileID: 2}
m_MinSize: {x: 875, y: 300}
m_MaxSize: {x: 10000, y: 10000}
@@ -118,7 +118,7 @@ MonoBehaviour:
m_MinSize: {x: 300, y: 200}
m_MaxSize: {x: 24288, y: 16192}
vertical: 1
- controlID: 52
+ controlID: 105
--- !u!114 &6
MonoBehaviour:
m_ObjectHideFlags: 52
@@ -143,7 +143,7 @@ MonoBehaviour:
m_MinSize: {x: 300, y: 200}
m_MaxSize: {x: 24288, y: 16192}
vertical: 0
- controlID: 53
+ controlID: 106
--- !u!114 &7
MonoBehaviour:
m_ObjectHideFlags: 52
@@ -168,7 +168,7 @@ MonoBehaviour:
m_MinSize: {x: 200, y: 200}
m_MaxSize: {x: 16192, y: 16192}
vertical: 1
- controlID: 54
+ controlID: 107
--- !u!114 &8
MonoBehaviour:
m_ObjectHideFlags: 52
@@ -193,7 +193,7 @@ MonoBehaviour:
m_MinSize: {x: 200, y: 100}
m_MaxSize: {x: 16192, y: 8096}
vertical: 0
- controlID: 55
+ controlID: 108
--- !u!114 &9
MonoBehaviour:
m_ObjectHideFlags: 52
@@ -215,9 +215,9 @@ MonoBehaviour:
height: 755
m_MinSize: {x: 200, y: 200}
m_MaxSize: {x: 4000, y: 4000}
- m_ActualView: {fileID: 14}
+ m_ActualView: {fileID: 15}
m_Panes:
- - {fileID: 14}
+ - {fileID: 15}
m_Selected: 0
m_LastSelected: 0
--- !u!114 &10
@@ -241,12 +241,13 @@ MonoBehaviour:
height: 755
m_MinSize: {x: 102, y: 121}
m_MaxSize: {x: 4002, y: 4021}
- m_ActualView: {fileID: 15}
+ m_ActualView: {fileID: 16}
m_Panes:
- - {fileID: 15}
- - {fileID: 19}
+ - {fileID: 16}
+ - {fileID: 20}
+ - {fileID: 13}
m_Selected: 0
- m_LastSelected: 0
+ m_LastSelected: 1
--- !u!114 &11
MonoBehaviour:
m_ObjectHideFlags: 52
@@ -268,10 +269,10 @@ MonoBehaviour:
height: 312
m_MinSize: {x: 231, y: 271}
m_MaxSize: {x: 10001, y: 10021}
- m_ActualView: {fileID: 13}
+ m_ActualView: {fileID: 14}
m_Panes:
- - {fileID: 13}
- - {fileID: 16}
+ - {fileID: 14}
+ - {fileID: 17}
m_Selected: 0
m_LastSelected: 1
--- !u!114 &12
@@ -295,13 +296,77 @@ MonoBehaviour:
height: 1067
m_MinSize: {x: 276, y: 71}
m_MaxSize: {x: 4001, y: 4021}
- m_ActualView: {fileID: 17}
+ m_ActualView: {fileID: 18}
m_Panes:
- - {fileID: 17}
- {fileID: 18}
+ - {fileID: 19}
m_Selected: 0
m_LastSelected: 1
--- !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: 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: -1673928668082335149, guid: 0000000000000000d000000000000000, type: 0}
+ m_Tooltip:
+ m_Pos:
+ serializedVersion: 2
+ x: 313
+ y: 73
+ width: 1236
+ height: 734
+ m_ViewDataDictionary: {fileID: 0}
+ m_OverlayCanvas:
+ m_LastAppliedPresetName: Default
+ m_SaveData: []
+ m_ViewTransforms:
+ m_KeySerializationHelper:
+ - {fileID: 5410316880928953953, guid: 18ddec0df1a82934599c3a24ece02aaf, type: 2}
+ m_ValueSerializationHelper:
+ - e00: 1
+ e01: 0
+ e02: 0
+ e03: -167
+ e10: 0
+ e11: 1
+ e12: 0
+ e13: -29
+ 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: 18ddec0df1a82934599c3a24ece02aaf, type: 2}
+ m_BreadCrumbs:
+ - m_Target: {fileID: 5410316880928953953, guid: 18ddec0df1a82934599c3a24ece02aaf, 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 &14
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
@@ -342,22 +407,22 @@ MonoBehaviour:
m_SkipHidden: 0
m_SearchArea: 1
m_Folders:
- - Assets/BlenderFiles/Characters/Chicken (Not Animated)
+ - Assets/Animations
m_Globs: []
m_OriginalText:
m_ViewMode: 1
m_StartGridSize: 64
m_LastFolders:
- - Assets/BlenderFiles/Characters/Chicken (Not Animated)
+ - Assets/Animations
m_LastFoldersGridSize: -1
m_LastProjectPath: D:\Unity\flufflparty\FlufflParty
m_LockTracker:
m_IsLocked: 0
m_FolderTreeState:
scrollPos: {x: 0, y: 0}
- m_SelectedIDs: 0c6b0000
- m_LastClickedID: 27404
- m_ExpandedIDs: 00000000dc6a0000de6a0000e06a0000e26a0000e46a000000ca9a3b
+ m_SelectedIDs: c06a0000
+ m_LastClickedID: 27328
+ m_ExpandedIDs: 00000000ae6a0000b06a0000b26a0000b46a0000b66a000000ca9a3b
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
@@ -385,7 +450,7 @@ MonoBehaviour:
scrollPos: {x: 0, y: 0}
m_SelectedIDs:
m_LastClickedID: 0
- m_ExpandedIDs: 00000000dc6a0000de6a0000e06a0000e26a0000e46a0000
+ m_ExpandedIDs: 00000000ae6a0000b06a0000b26a0000b46a0000b66a0000
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
@@ -413,7 +478,7 @@ MonoBehaviour:
m_SelectedInstanceIDs:
m_LastClickedInstanceID: 0
m_HadKeyboardFocusLastEvent: 1
- m_ExpandedInstanceIDs: c6230000906400007e6d0000485d00002c610000fa0b020046650000e2780000
+ m_ExpandedInstanceIDs: c6230000906400007e6d0000485d00002c610000fa0b020046650000e2780000466b0000
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
@@ -441,7 +506,7 @@ MonoBehaviour:
m_GridSize: 64
m_SkipHiddenPackages: 0
m_DirectoriesAreaWidth: 207
---- !u!114 &14
+--- !u!114 &15
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
@@ -472,9 +537,9 @@ MonoBehaviour:
m_SceneHierarchy:
m_TreeViewState:
scrollPos: {x: 0, y: 0}
- m_SelectedIDs: b46b0000
+ m_SelectedIDs:
m_LastClickedID: 0
- m_ExpandedIDs: 9ad5fffffad5fffff2d9ffff2adaffff18f5ffff18f6ffff06fbffff306c0000606c0000
+ m_ExpandedIDs: 6681ffffb681ffffb285ffffea85ffffa48cfffff68cfffff290ffff2a91ffff06fbffff96630000
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
@@ -498,7 +563,7 @@ MonoBehaviour:
m_IsLocked: 0
m_CurrentSortingName: TransformSorting
m_WindowGUID: 4c969a2b90040154d917609493e03593
---- !u!114 &15
+--- !u!114 &16
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
@@ -756,9 +821,9 @@ MonoBehaviour:
m_PlayAudio: 0
m_AudioPlay: 0
m_Position:
- m_Target: {x: 94.84213, y: 0.72376204, z: 125.883934}
+ m_Target: {x: 95.65947, y: 0.008669116, z: 125.39522}
speed: 2
- m_Value: {x: 94.84213, y: 0.72376204, z: 125.883934}
+ m_Value: {x: 95.65947, y: 0.008669116, z: 125.39522}
m_RenderMode: 0
m_CameraMode:
drawMode: 0
@@ -805,9 +870,9 @@ MonoBehaviour:
m_GridAxis: 1
m_gridOpacity: 0.5
m_Rotation:
- m_Target: {x: -0.12373468, y: -0.8689215, z: 0.39375728, w: -0.2736711}
+ m_Target: {x: -0.019448288, y: -0.97338825, z: 0.20993572, w: -0.09133823}
speed: 2
- m_Value: {x: -0.124308065, y: -0.8683905, z: 0.39351705, w: -0.27493632}
+ m_Value: {x: -0.01944558, y: -0.9732527, z: 0.2099065, w: -0.091325514}
m_Size:
m_Target: 3.5334451
speed: 2
@@ -836,7 +901,7 @@ MonoBehaviour:
m_SceneVisActive: 1
m_LastLockedObject: {fileID: 0}
m_ViewIsLockedToObject: 0
---- !u!114 &16
+--- !u!114 &17
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
@@ -864,7 +929,7 @@ MonoBehaviour:
m_OverlayCanvas:
m_LastAppliedPresetName: Default
m_SaveData: []
---- !u!114 &17
+--- !u!114 &18
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
@@ -905,7 +970,7 @@ MonoBehaviour:
m_LockTracker:
m_IsLocked: 0
m_PreviewWindow: {fileID: 0}
---- !u!114 &18
+--- !u!114 &19
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
@@ -933,7 +998,7 @@ MonoBehaviour:
m_OverlayCanvas:
m_LastAppliedPresetName: Default
m_SaveData: []
---- !u!114 &19
+--- !u!114 &20
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}