diff --git a/Assets/勍/脚本/Person.cs b/Assets/勍/脚本/Person.cs index efa5e72..41795d1 100644 --- a/Assets/勍/脚本/Person.cs +++ b/Assets/勍/脚本/Person.cs @@ -58,6 +58,8 @@ public class Person : MonoBehaviour private Rigidbody2D m_rigidbody2D; + private Animator m_animator; + void Start(){ //Init @@ -65,6 +67,7 @@ public class Person : MonoBehaviour //Find defaultTrackingPoint = GameObject.Find("人的默认位置(不可改名)").transform; m_rigidbody2D = GetComponent(); + m_animator = GetComponentInChildren(); //Find } void Update(){ diff --git a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt index 8e3c4ba..90b96f5 100644 --- a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt +++ b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt @@ -26,7 +26,7 @@ MonoBehaviour: m_MinSize: {x: 400, y: 200} m_MaxSize: {x: 32384, y: 16192} vertical: 0 - controlID: 29633 + controlID: 83 --- !u!114 &2 MonoBehaviour: m_ObjectHideFlags: 52 @@ -143,7 +143,7 @@ MonoBehaviour: m_MinSize: {x: 100, y: 200} m_MaxSize: {x: 8096, y: 16192} vertical: 1 - controlID: 29614 + controlID: 52 --- !u!114 &4 MonoBehaviour: m_ObjectHideFlags: 52 @@ -204,8 +204,8 @@ MonoBehaviour: floating: 0 collapsed: 0 displayed: 1 - snapOffset: {x: -101, y: -26} - snapOffsetDelta: {x: 0, y: 0} + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: -100, y: -25.600006} snapCorner: 3 id: Tool Settings index: 0 @@ -215,9 +215,9 @@ MonoBehaviour: floating: 0 collapsed: 0 displayed: 1 - snapOffset: {x: -141, y: -194.20001} + snapOffset: {x: -141, y: 149} snapOffsetDelta: {x: 0, y: 0} - snapCorner: 3 + snapCorner: 1 id: unity-grid-and-snap-toolbar index: 1 layout: 1 @@ -226,7 +226,7 @@ MonoBehaviour: floating: 0 collapsed: 0 displayed: 1 - snapOffset: {x: 0, y: 24.8} + snapOffset: {x: 0, y: 0} snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 id: unity-scene-view-toolbar @@ -270,7 +270,7 @@ MonoBehaviour: floating: 0 collapsed: 0 displayed: 1 - snapOffset: {x: 0, y: 24.8} + snapOffset: {x: 0, y: 0} snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 id: unity-transform-toolbar @@ -409,7 +409,7 @@ MonoBehaviour: index: 10 layout: 4 m_WindowGUID: 932fa420110f25f488f2a7bbcd1fb02a - m_Gizmos: 1 + m_Gizmos: 0 m_OverrideSceneCullingMask: 6917529027641081856 m_SceneIsLit: 1 m_SceneLighting: 1 @@ -418,9 +418,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: 13.682084, y: 5.7280016, z: -0.48869893} + m_Target: {x: -18.450768, y: 3.2206218, z: -0.041112717} speed: 2 - m_Value: {x: 13.682084, y: 5.7280016, z: -0.48869893} + m_Value: {x: -18.450768, y: 3.2206218, z: -0.041112717} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -471,9 +471,9 @@ MonoBehaviour: speed: 2 m_Value: {x: 0, y: 0, z: 0, w: 1} m_Size: - m_Target: 20.502565 + m_Target: 7.513276 speed: 2 - m_Value: 20.502565 + m_Value: 7.513276 m_Ortho: m_Target: 1 speed: 2 @@ -581,8 +581,8 @@ MonoBehaviour: y: 388.8 width: 591.2 height: 334 - m_MinSize: {x: 200, y: 200} - m_MaxSize: {x: 4000, y: 4000} + m_MinSize: {x: 201, y: 221} + m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 2} m_Panes: - {fileID: 2} @@ -647,7 +647,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 50a6feff40b6feffcec1feffc6dffeffe424ffff409bffffa4b7ffffdaddffffd8e0ffff0efbffff58b600007cb600000ab7000094b700009eee000090ef00008ec80200 + m_ExpandedIDs: 0efbffff m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -690,8 +690,8 @@ MonoBehaviour: y: 0 width: 362.40002 height: 722.8 - m_MinSize: {x: 230, y: 250} - m_MaxSize: {x: 10000, y: 10000} + m_MinSize: {x: 232, y: 271} + m_MaxSize: {x: 10002, y: 10021} m_ActualView: {fileID: 11} m_Panes: - {fileID: 11} @@ -751,9 +751,9 @@ MonoBehaviour: m_IsLocked: 0 m_FolderTreeState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: 4a7a0000 - m_LastClickedID: 31306 - m_ExpandedIDs: 00000000087a00000a7a00000c7a00000e7a0000107a0000127a0000147a0000 + m_SelectedIDs: 547a0000 + m_LastClickedID: 31316 + m_ExpandedIDs: 000000000a7a00000c7a00000e7a0000107a0000127a0000147a0000167a0000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -781,7 +781,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 00000000087a00000a7a00000c7a00000e7a0000107a0000127a0000147a0000 + m_ExpandedIDs: 000000000a7a00000c7a00000e7a0000107a0000127a0000147a0000167a0000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -806,8 +806,8 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_ListAreaState: - m_SelectedInstanceIDs: 4eb60000 - m_LastClickedInstanceID: 46670 + m_SelectedInstanceIDs: + m_LastClickedInstanceID: 0 m_HadKeyboardFocusLastEvent: 0 m_ExpandedInstanceIDs: ee770000 m_RenameOverlay: @@ -897,7 +897,7 @@ MonoBehaviour: m_CachedPref: -160 m_ControlHash: -371814159 m_PrefName: Preview_InspectorPreview - m_LastInspectedObjectInstanceID: 46670 + m_LastInspectedObjectInstanceID: -1 m_LastVerticalScrollValue: 0 m_GlobalObjectId: m_InspectorMode: 0 diff --git a/UserSettings/Layouts/default-2021.dwlt b/UserSettings/Layouts/default-2021.dwlt index c57e525..360a6a2 100644 --- a/UserSettings/Layouts/default-2021.dwlt +++ b/UserSettings/Layouts/default-2021.dwlt @@ -121,7 +121,7 @@ MonoBehaviour: m_MinSize: {x: 400, y: 200} m_MaxSize: {x: 32384, y: 16192} vertical: 0 - controlID: 20 + controlID: 124 --- !u!114 &6 MonoBehaviour: m_ObjectHideFlags: 52 @@ -141,12 +141,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 488 + width: 591.2 height: 722.8 m_MinSize: {x: 100, y: 200} m_MaxSize: {x: 8096, y: 16192} vertical: 1 - controlID: 115 + controlID: 113 --- !u!114 &7 MonoBehaviour: m_ObjectHideFlags: 52 @@ -164,14 +164,14 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 488 - height: 584 + width: 591.2 + height: 388.8 m_MinSize: {x: 201, y: 221} m_MaxSize: {x: 4001, y: 4021} - m_ActualView: {fileID: 14} + m_ActualView: {fileID: 13} m_Panes: + - {fileID: 13} - {fileID: 14} - - {fileID: 12} m_Selected: 0 m_LastSelected: 1 --- !u!114 &8 @@ -190,14 +190,14 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 584 - width: 488 - height: 138.79999 + y: 388.8 + width: 591.2 + height: 334 m_MinSize: {x: 201, y: 221} m_MaxSize: {x: 4001, y: 4021} - m_ActualView: {fileID: 13} + m_ActualView: {fileID: 12} m_Panes: - - {fileID: 13} + - {fileID: 12} m_Selected: 0 m_LastSelected: 0 --- !u!114 &9 @@ -215,9 +215,9 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 488 + x: 591.2 y: 0 - width: 276 + width: 203.20001 height: 722.8 m_MinSize: {x: 202, y: 221} m_MaxSize: {x: 4002, y: 4021} @@ -241,9 +241,9 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 764 + x: 794.4 y: 0 - width: 392.80005 + width: 362.40002 height: 722.8 m_MinSize: {x: 232, y: 271} m_MaxSize: {x: 10002, y: 10021} @@ -279,70 +279,6 @@ MonoBehaviour: m_Selected: 0 m_LastSelected: 0 --- !u!114 &12 -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: "\u52A8\u753B\u5668" - m_Image: {fileID: 1711060831702674872, guid: 0000000000000000d000000000000000, type: 0} - m_Tooltip: - m_Pos: - serializedVersion: 2 - x: 0 - y: 73.6 - width: 487 - height: 259 - m_ViewDataDictionary: {fileID: 0} - m_OverlayCanvas: - m_LastAppliedPresetName: Default - m_SaveData: [] - m_ViewTransforms: - m_KeySerializationHelper: - - {fileID: -4858452638209796299, guid: 167c464036054f94aa70e6c7b4457afd, type: 2} - m_ValueSerializationHelper: - - e00: 0.98381555 - e01: 0 - e02: 0 - e03: -100.0116 - e10: 0 - e11: 0.98381555 - e12: 0 - e13: 115.50764 - 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: 167c464036054f94aa70e6c7b4457afd, type: 2} - m_BreadCrumbs: - - m_Target: {fileID: -4858452638209796299, guid: 167c464036054f94aa70e6c7b4457afd, 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: 0 - m_LayerEditor: - m_SelectedLayerIndex: 0 ---- !u!114 &13 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -363,9 +299,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 657.60004 - width: 487 - height: 117.79999 + y: 462.4 + width: 590.2 + height: 313 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -376,7 +312,7 @@ MonoBehaviour: m_ShowGizmos: 0 m_TargetDisplay: 0 m_ClearColor: {r: 0, g: 0, b: 0, a: 0} - m_TargetSize: {x: 215, y: 120.999985} + m_TargetSize: {x: 649, y: 365} m_TextureFilterMode: 0 m_TextureHideFlags: 61 m_RenderIMGUI: 1 @@ -391,10 +327,10 @@ MonoBehaviour: m_VRangeLocked: 0 hZoomLockedByDefault: 0 vZoomLockedByDefault: 0 - m_HBaseRangeMin: -86 - m_HBaseRangeMax: 86 - m_VBaseRangeMin: -48.399994 - m_VBaseRangeMax: 48.399994 + m_HBaseRangeMin: -259.6 + m_HBaseRangeMax: 259.6 + m_VBaseRangeMin: -146 + m_VBaseRangeMax: 146 m_HAllowExceedBaseRangeMin: 1 m_HAllowExceedBaseRangeMax: 1 m_VAllowExceedBaseRangeMin: 1 @@ -412,29 +348,29 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 21 - width: 487 - height: 96.79999 + width: 590.2 + height: 292 m_Scale: {x: 1, y: 1} - m_Translation: {x: 243.5, y: 48.399994} + m_Translation: {x: 295.1, y: 146} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 m_MarginBottom: 0 m_LastShownAreaInsideMargins: serializedVersion: 2 - x: -243.5 - y: -48.399994 - width: 487 - height: 96.79999 + x: -295.1 + y: -146 + width: 590.2 + height: 292 m_MinimalGUI: 1 m_defaultScale: 1 - m_LastWindowPixelSize: {x: 608.75, y: 147.24998} + m_LastWindowPixelSize: {x: 737.75, y: 391.25} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 00000000000000000000 m_XRRenderMode: 0 m_RenderTexture: {fileID: 0} ---- !u!114 &14 +--- !u!114 &13 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -456,8 +392,8 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 73.6 - width: 487 - height: 563 + width: 590.2 + height: 367.8 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -468,7 +404,7 @@ MonoBehaviour: collapsed: 0 displayed: 1 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: -100, y: -25.599976} + snapOffsetDelta: {x: -100, y: -25.600006} snapCorner: 3 id: Tool Settings index: 0 @@ -681,9 +617,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: -16.314135, y: 1.2690217, z: 0.10704366} + m_Target: {x: -18.450768, y: 3.2206218, z: -0.041112717} speed: 2 - m_Value: {x: -16.314135, y: 1.2690217, z: 0.10704366} + m_Value: {x: -18.450768, y: 3.2206218, z: -0.041112717} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -734,9 +670,9 @@ MonoBehaviour: speed: 2 m_Value: {x: 0, y: 0, z: 0, w: 1} m_Size: - m_Target: 6.7788815 + m_Target: 7.513276 speed: 2 - m_Value: 6.7788815 + m_Value: 7.513276 m_Ortho: m_Target: 1 speed: 2 @@ -761,6 +697,70 @@ MonoBehaviour: m_SceneVisActive: 1 m_LastLockedObject: {fileID: 0} m_ViewIsLockedToObject: 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: 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: "\u52A8\u753B\u5668" + m_Image: {fileID: 1711060831702674872, guid: 0000000000000000d000000000000000, type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 0 + y: 73.6 + width: 487 + height: 259 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_ViewTransforms: + m_KeySerializationHelper: + - {fileID: -4858452638209796299, guid: 167c464036054f94aa70e6c7b4457afd, type: 2} + m_ValueSerializationHelper: + - e00: 0.98381555 + e01: 0 + e02: 0 + e03: -100.0116 + e10: 0 + e11: 0.98381555 + e12: 0 + e13: 115.50764 + 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: 167c464036054f94aa70e6c7b4457afd, type: 2} + m_BreadCrumbs: + - m_Target: {fileID: -4858452638209796299, guid: 167c464036054f94aa70e6c7b4457afd, 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: 0 + m_LayerEditor: + m_SelectedLayerIndex: 0 --- !u!114 &15 MonoBehaviour: m_ObjectHideFlags: 52 @@ -781,9 +781,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 488 + x: 591.2 y: 73.6 - width: 274 + width: 201.20001 height: 701.8 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: @@ -838,9 +838,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 764 + x: 794.4 y: 73.6 - width: 390.80005 + width: 360.40002 height: 701.8 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: @@ -859,22 +859,22 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - "Assets/\u52CD/\u811A\u672C" + - "Assets/\u52CD" m_Globs: [] m_OriginalText: m_ViewMode: 1 m_StartGridSize: 64 m_LastFolders: - - "Assets/\u52CD/\u811A\u672C" + - "Assets/\u52CD" m_LastFoldersGridSize: -1 m_LastProjectPath: "C:\\Users\\13259\\Desktop\\\u8D5B\u9A6C" m_LockTracker: m_IsLocked: 0 m_FolderTreeState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: 4e7a0000 - m_LastClickedID: 31310 - m_ExpandedIDs: 00000000087a00000a7a00000c7a00000e7a0000107a0000127a0000147a0000567a0000 + m_SelectedIDs: 2e7a0000 + m_LastClickedID: 31278 + m_ExpandedIDs: 000000000a7a00000c7a00000e7a0000107a0000127a0000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -902,7 +902,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 00000000087a00000a7a00000c7a00000e7a0000107a0000127a0000147a0000 + m_ExpandedIDs: 000000000a7a00000c7a00000e7a0000107a0000127a0000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -929,7 +929,7 @@ MonoBehaviour: m_ListAreaState: m_SelectedInstanceIDs: m_LastClickedInstanceID: 0 - m_HadKeyboardFocusLastEvent: 1 + m_HadKeyboardFocusLastEvent: 0 m_ExpandedInstanceIDs: ee770000 m_RenameOverlay: m_UserAcceptedRename: 0