From d243ef6e3b1d4df1bb393ba213b3fb76b48365e5 Mon Sep 17 00:00:00 2001 From: SnowShow Date: Fri, 9 May 2025 08:33:14 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=A0=86=E5=9E=9B=E6=9C=BA?= =?UTF-8?q?=E5=8F=96=E8=B4=A7=E5=AE=8C=E6=88=90=20=E6=94=BE=E7=BD=AE?= =?UTF-8?q?=E8=B4=A7=E7=89=A9=E5=8A=A8=E7=94=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Resources/So/Shelf/shelfConfig_1.asset | 6 +- .../Resources/So/ShelfMachineBehaviour.asset | 6 +- .../model/prefab/原材料立库 Variant.prefab | 55 +++-- .../Game/Common/Enum/ToolActionType.cs | 10 + .../Game/Common/Enum/ToolActionType.cs.meta | 3 + Assets/GameLogic/Game/Core/Actor/Actor.cs | 6 +- .../GameLogic/Game/Core/Actor/ShelfActor.cs | 4 +- .../Game/Core/Actor/ShelfMachineToolActor.cs | 170 ++++++++++++-- Assets/GameLogic/Game/Core/Component.meta | 8 + .../Core/Component/AnimationEventComponent.cs | 41 ++++ .../Component/AnimationEventComponent.cs.meta | 2 + Assets/GameLogic/Game/Data/ContainerInfo.cs | 2 + .../Game/Extension/GameObjectExtension.cs | 5 + Assets/GameLogic/Game/Moduie.meta | 8 + Assets/GameLogic/Game/Moduie/GameEvent.cs | 146 ++++++++++++ .../GameLogic/Game/Moduie/GameEvent.cs.meta | 2 + Assets/GameLogic/Game/Setting/EventSetting.cs | 9 + .../Game/Setting/EventSetting.cs.meta | 3 + Assets/GameLogic/Game/Utility/DataUtility.cs | 26 +++ .../Game/Utility/DataUtility.cs.meta | 2 + .../Game/Utility/Factory/ContainerFactory.cs | 4 +- .../Game/Utility/SO/So_ShelfConfig.cs | 7 + .../Origin/device/stacker/右浅伸.anim | 9 +- .../Origin/device/stacker/右浅缩.anim | 63 +++--- .../Origin/device/stacker/右浅缩.anim.meta | 2 +- .../Origin/device/stacker/右深伸.anim | 9 +- .../Origin/device/stacker/右深缩.anim | 9 +- .../Origin/device/stacker/左浅伸.anim | 2 +- .../Origin/device/stacker/左浅缩.anim | 63 +++--- .../Origin/device/stacker/左浅缩.anim.meta | 2 +- .../Origin/device/stacker/左深伸.anim | 9 +- .../Origin/device/stacker/左深缩 .anim | 9 +- Assets/Scenes/main.unity | 12 +- Assets/右缩叉.anim | 9 +- .../Layouts/CurrentMaximizeLayout.dwlt | 210 +++++++++--------- UserSettings/Layouts/default-6000.dwlt | 160 ++++++------- 36 files changed, 778 insertions(+), 315 deletions(-) create mode 100644 Assets/GameLogic/Game/Common/Enum/ToolActionType.cs create mode 100644 Assets/GameLogic/Game/Common/Enum/ToolActionType.cs.meta create mode 100644 Assets/GameLogic/Game/Core/Component.meta create mode 100644 Assets/GameLogic/Game/Core/Component/AnimationEventComponent.cs create mode 100644 Assets/GameLogic/Game/Core/Component/AnimationEventComponent.cs.meta create mode 100644 Assets/GameLogic/Game/Moduie.meta create mode 100644 Assets/GameLogic/Game/Moduie/GameEvent.cs create mode 100644 Assets/GameLogic/Game/Moduie/GameEvent.cs.meta create mode 100644 Assets/GameLogic/Game/Setting/EventSetting.cs create mode 100644 Assets/GameLogic/Game/Setting/EventSetting.cs.meta create mode 100644 Assets/GameLogic/Game/Utility/DataUtility.cs create mode 100644 Assets/GameLogic/Game/Utility/DataUtility.cs.meta diff --git a/Assets/AssetRaw/Resources/So/Shelf/shelfConfig_1.asset b/Assets/AssetRaw/Resources/So/Shelf/shelfConfig_1.asset index 745b44f..6b20e33 100644 --- a/Assets/AssetRaw/Resources/So/Shelf/shelfConfig_1.asset +++ b/Assets/AssetRaw/Resources/So/Shelf/shelfConfig_1.asset @@ -17,9 +17,9 @@ MonoBehaviour: SerializedBytes: ReferencedUnityObjects: - {fileID: 7400000, guid: c005c0711278dbd4eafdb92b99794612, type: 2} - - {fileID: 7400000, guid: c7c24aeb0ca291d4583b5e28baf58f80, type: 2} - - {fileID: 7400000, guid: e9fa085935da61b4ba9a30d5b095cb45, type: 2} - {fileID: 7400000, guid: 35f948453d152a04986763f636b3c194, type: 2} + - {fileID: 7400000, guid: e9fa085935da61b4ba9a30d5b095cb45, type: 2} + - {fileID: 7400000, guid: c7c24aeb0ca291d4583b5e28baf58f80, type: 2} - {fileID: 7400000, guid: b5ae0aa7adc17f54988962e81404e636, type: 2} - {fileID: 7400000, guid: d933409f8eec3814bad938a7aad0ab37, type: 2} SerializedBytesString: @@ -46,7 +46,7 @@ MonoBehaviour: Data: - Name: $k Entry: 3 - Data: 2 + Data: 3 - Name: $v Entry: 7 Data: 2|GameLogic.ShelfRowAnimData, Assembly-CSharp diff --git a/Assets/AssetRaw/Resources/So/ShelfMachineBehaviour.asset b/Assets/AssetRaw/Resources/So/ShelfMachineBehaviour.asset index 81f0fe2..41c6c80 100644 --- a/Assets/AssetRaw/Resources/So/ShelfMachineBehaviour.asset +++ b/Assets/AssetRaw/Resources/So/ShelfMachineBehaviour.asset @@ -12,13 +12,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a686a47eee2fa44cb0a34b5d86e4d5e, type: 3} m_Name: ShelfMachineBehaviour m_EditorClassIdentifier: - _serializedGraph: '{"type":"NodeCanvas.BehaviourTrees.BehaviourTree","nodes":[{"selectionMode":1,"intCase":{},"enumCase":{"_type":"System.Enum","_name":"shelfToolActionType","_targetVariableID":"046106d6-ba37-46e3-8cc2-cbaac14b6e2b"},"_position":{"x":234.3504,"y":94.13937},"$type":"NodeCanvas.BehaviourTrees.Switch","$id":"0"},{"_position":{"x":-63.01494,"y":227.9567},"$type":"NodeCanvas.BehaviourTrees.ActionNode","$id":"1"},{"_position":{"x":268.3969,"y":265.9767},"$type":"NodeCanvas.BehaviourTrees.Sequencer","$id":"2"},{"repeaterMode":1,"repeatTimes":{"_value":1},"_position":{"x":-45.46437,"y":382.2221},"$type":"NodeCanvas.BehaviourTrees.Repeater","$id":"3"},{"_condition":{"method":{"_baseInfo":"GameLogic.ShelfMachineToolActor|InitLoadPositionComplete|System.Boolean","_paramsInfo":""},"parameters":[],"checkValue":{"_type":"System.Boolean","_value":{"$content":false,"$type":"System.Boolean"}},"$type":"NodeCanvas.Tasks.Conditions.CheckFunction_Multiplatform"},"_position":{"x":-131.8135,"y":472.9961},"$type":"NodeCanvas.BehaviourTrees.ConditionNode","$id":"4"}],"connections":[{"_sourceNode":{"$ref":"0"},"_targetNode":{"$ref":"1"},"$type":"NodeCanvas.BehaviourTrees.BTConnection"},{"_sourceNode":{"$ref":"0"},"_targetNode":{"$ref":"2"},"$type":"NodeCanvas.BehaviourTrees.BTConnection"},{"_sourceNode":{"$ref":"2"},"_targetNode":{"$ref":"3"},"$type":"NodeCanvas.BehaviourTrees.BTConnection"},{"_sourceNode":{"$ref":"3"},"_targetNode":{"$ref":"4"},"$type":"NodeCanvas.BehaviourTrees.BTConnection"}],"canvasGroups":[],"localBlackboard":{"_variables":{}},"derivedData":{"$type":"NodeCanvas.BehaviourTrees.BehaviourTree+DerivedSerializationData"}}' + _serializedGraph: '{"type":"NodeCanvas.BehaviourTrees.BehaviourTree","nodes":[{"selectionMode":1,"intCase":{},"enumCase":{"_type":"System.Enum","_name":"shelfToolActionType","_targetVariableID":"046106d6-ba37-46e3-8cc2-cbaac14b6e2b"},"_position":{"x":234.3504,"y":94.13937},"$type":"NodeCanvas.BehaviourTrees.Switch","$id":"0"},{"_position":{"x":-550.9409,"y":220.5786},"$type":"NodeCanvas.BehaviourTrees.ActionNode","$id":"1"},{"_position":{"x":36.05078,"y":209.6188},"$type":"NodeCanvas.BehaviourTrees.Sequencer","$id":"2"},{"repeaterMode":1,"repeatTimes":{"_value":1},"_position":{"x":-425.4755,"y":326.8681},"$type":"NodeCanvas.BehaviourTrees.Repeater","$id":"3"},{"_condition":{"method":{"_baseInfo":"GameLogic.ShelfMachineToolActor|InitLoadPositionComplete|System.Boolean","_paramsInfo":""},"parameters":[],"checkValue":{"_type":"System.Boolean","_value":{"$content":true,"$type":"System.Boolean"}},"$type":"NodeCanvas.Tasks.Conditions.CheckFunction_Multiplatform"},"_position":{"x":-512.8286,"y":417.6421},"$type":"NodeCanvas.BehaviourTrees.ConditionNode","$id":"4"},{"repeaterMode":1,"repeatTimes":{"_value":1},"_position":{"x":-131.0505,"y":322.1024},"$type":"NodeCanvas.BehaviourTrees.Repeater","$id":"5"},{"_condition":{"method":{"_baseInfo":"GameLogic.ShelfMachineToolActor|EnableLoadStartAnimation|System.Boolean","_paramsInfo":""},"parameters":[],"checkValue":{"_type":"System.Boolean","_value":{"$content":true,"$type":"System.Boolean"}},"$type":"NodeCanvas.Tasks.Conditions.CheckFunction_Multiplatform"},"_position":{"x":-219.3914,"y":414.4665},"$type":"NodeCanvas.BehaviourTrees.ConditionNode","$id":"6"},{"repeaterMode":1,"repeatTimes":{"_value":1},"_position":{"x":169.3494,"y":318.844},"$type":"NodeCanvas.BehaviourTrees.Repeater","$id":"7"},{"_condition":{"method":{"_baseInfo":"GameLogic.ShelfMachineToolActor|EnableStartLoadToShelfPosition|System.Boolean","_paramsInfo":""},"parameters":[],"checkValue":{"_type":"System.Boolean","_value":{"$content":true,"$type":"System.Boolean"}},"$type":"NodeCanvas.Tasks.Conditions.CheckFunction_Multiplatform"},"_position":{"x":64.6575,"y":414.7119},"$type":"NodeCanvas.BehaviourTrees.ConditionNode","$id":"8"}],"connections":[{"_sourceNode":{"$ref":"0"},"_targetNode":{"$ref":"1"},"$type":"NodeCanvas.BehaviourTrees.BTConnection"},{"_sourceNode":{"$ref":"0"},"_targetNode":{"$ref":"2"},"$type":"NodeCanvas.BehaviourTrees.BTConnection"},{"_sourceNode":{"$ref":"2"},"_targetNode":{"$ref":"3"},"$type":"NodeCanvas.BehaviourTrees.BTConnection"},{"_sourceNode":{"$ref":"2"},"_targetNode":{"$ref":"5"},"$type":"NodeCanvas.BehaviourTrees.BTConnection"},{"_sourceNode":{"$ref":"2"},"_targetNode":{"$ref":"7"},"$type":"NodeCanvas.BehaviourTrees.BTConnection"},{"_sourceNode":{"$ref":"3"},"_targetNode":{"$ref":"4"},"$type":"NodeCanvas.BehaviourTrees.BTConnection"},{"_sourceNode":{"$ref":"5"},"_targetNode":{"$ref":"6"},"$type":"NodeCanvas.BehaviourTrees.BTConnection"},{"_sourceNode":{"$ref":"7"},"_targetNode":{"$ref":"8"},"$type":"NodeCanvas.BehaviourTrees.BTConnection"}],"canvasGroups":[],"localBlackboard":{"_variables":{}},"derivedData":{"$type":"NodeCanvas.BehaviourTrees.BehaviourTree+DerivedSerializationData"}}' _objectReferences: [] _graphSource: _version: 3.32 _category: _comments: - _translation: {x: 267, y: -174} - _zoomFactor: 0.9961413 + _translation: {x: 489, y: -20} + _zoomFactor: 0.8562181 _haltSerialization: 0 _externalSerializationFile: {fileID: 0} diff --git a/Assets/AssetRaw/model/prefab/原材料立库 Variant.prefab b/Assets/AssetRaw/model/prefab/原材料立库 Variant.prefab index 4236419..60c9dd1 100644 --- a/Assets/AssetRaw/model/prefab/原材料立库 Variant.prefab +++ b/Assets/AssetRaw/model/prefab/原材料立库 Variant.prefab @@ -14051,7 +14051,7 @@ Transform: m_GameObject: {fileID: 868756411426590201} serializedVersion: 2 m_LocalRotation: {x: -0.00000003774895, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 31.3795, y: -0.5468, z: 18.12402} + m_LocalPosition: {x: 31.3795, y: -0.5468, z: 18.167} m_LocalScale: {x: 40, y: 40, z: 21.459848} m_ConstrainProportionsScale: 0 m_Children: [] @@ -14509,7 +14509,7 @@ Transform: m_GameObject: {fileID: 911021538588560277} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0.0067, z: 0.1885142} + m_LocalPosition: {x: 0, y: 0.0067, z: 0.086} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -61059,7 +61059,7 @@ Transform: m_GameObject: {fileID: 3927719797116447903} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0.03550415, y: -0.08799982, z: -0.083} + m_LocalPosition: {x: -0.03550415, y: -0.08799982, z: -0.096} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -148391,10 +148391,10 @@ GameObject: - component: {fileID: 1156921127742574850} - component: {fileID: 8879110240668749875} - component: {fileID: 674022236643372559} - - component: {fileID: 985939372251501228} - component: {fileID: 2816475710813172509} - component: {fileID: 2484824061119159576} - - component: {fileID: 2665616410597944383} + - component: {fileID: 985939372251501228} + - component: {fileID: 7671920962013540943} m_Layer: 9 m_Name: ShelfMachineTool m_TagString: Untagged @@ -148520,23 +148520,6 @@ MonoBehaviour: - _json: '{"_propertyPath":"GameLogic.ShelfMachineToolActor._actionType","_name":"shelfToolActionType","_id":"046106d6-ba37-46e3-8cc2-cbaac14b6e2b","$type":"NodeCanvas.Framework.Variable`1[[System.Enum, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089]]"}' _references: [] ---- !u!114 &985939372251501228 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9166426542987334128} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a0e58b47bf55898428028fa90be72aa2, type: 3} - m_Name: - m_EditorClassIdentifier: - _id: 0 - _actionType: 0 - _moveSpeed: 5 - _moveSeconds: 0 - _isInitLoadPositionComplete: 0 --- !u!95 &2816475710813172509 Animator: serializedVersion: 7 @@ -148574,7 +148557,7 @@ MonoBehaviour: _Animator: {fileID: 2816475710813172509} _Transitions: {fileID: 0} _ActionOnDisable: 0 ---- !u!114 &2665616410597944383 +--- !u!114 &985939372251501228 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -148583,14 +148566,26 @@ MonoBehaviour: m_GameObject: {fileID: 9166426542987334128} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: bd4c361dd5a388a41b638b1d55ed2b8e, type: 3} + m_Script: {fileID: 11500000, guid: a0e58b47bf55898428028fa90be72aa2, type: 3} + m_Name: + m_EditorClassIdentifier: + _id: 0 + _actionType: 0 + _moveSpeed: 5 + _moveSeconds: 0 + _shelfconfig: {fileID: 0} +--- !u!114 &7671920962013540943 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9166426542987334128} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6e8ba6bad3c56e84d878078b440529f3, type: 3} m_Name: m_EditorClassIdentifier: - _Animator: {fileID: 2816475710813172509} - _Clip: {fileID: 7400000, guid: 195eb18070fc5fd47bd765069fba517d, type: 2} - _NormalizedStartTime: 0 - _Speed: 1 - _ApplyInEditMode: 1 --- !u!1 &9191604057375691552 GameObject: m_ObjectHideFlags: 0 @@ -150194,7 +150189,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: _id: 0 - _group: + _shelfConfig: {fileID: 0} --- !u!1001 &5956433743207170642 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/GameLogic/Game/Common/Enum/ToolActionType.cs b/Assets/GameLogic/Game/Common/Enum/ToolActionType.cs new file mode 100644 index 0000000..3618365 --- /dev/null +++ b/Assets/GameLogic/Game/Common/Enum/ToolActionType.cs @@ -0,0 +1,10 @@ +using Sirenix.OdinInspector; + +namespace GameLogic +{ + public enum ToolActionType : int + { + [LabelText("放下")]PutDown = 0, + [LabelText("拿起")]PickUp = 1, + } +} \ No newline at end of file diff --git a/Assets/GameLogic/Game/Common/Enum/ToolActionType.cs.meta b/Assets/GameLogic/Game/Common/Enum/ToolActionType.cs.meta new file mode 100644 index 0000000..b843343 --- /dev/null +++ b/Assets/GameLogic/Game/Common/Enum/ToolActionType.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 2bcef26c07d84c549bda615a07a7a513 +timeCreated: 1746688068 \ No newline at end of file diff --git a/Assets/GameLogic/Game/Core/Actor/Actor.cs b/Assets/GameLogic/Game/Core/Actor/Actor.cs index ad24609..c73cdf2 100644 --- a/Assets/GameLogic/Game/Core/Actor/Actor.cs +++ b/Assets/GameLogic/Game/Core/Actor/Actor.cs @@ -11,17 +11,21 @@ namespace GameLogic #region 生命周期 protected virtual void OnLoad(){} protected virtual void OnUpdate(){} - protected virtual void OnActorDestroy(){} + protected virtual void RegisterEvent(){} private void Awake() { OnLoad(); + RegisterEvent(); } + + private void Update() { } + #endregion diff --git a/Assets/GameLogic/Game/Core/Actor/ShelfActor.cs b/Assets/GameLogic/Game/Core/Actor/ShelfActor.cs index d182bb6..5ac0de5 100644 --- a/Assets/GameLogic/Game/Core/Actor/ShelfActor.cs +++ b/Assets/GameLogic/Game/Core/Actor/ShelfActor.cs @@ -60,11 +60,11 @@ namespace GameLogic { var containerPrefab = Resources.Load(AssetLocationSetting.ContainerPath); GameObject go = Instantiate(containerPrefab); + container.container = go; go.SetTransformNoScale(stationT); station = stationT; } - - _shelfMachineToolActor.Load(station,container); + _shelfMachineToolActor.Load(station,container,_shelfConfig); } diff --git a/Assets/GameLogic/Game/Core/Actor/ShelfMachineToolActor.cs b/Assets/GameLogic/Game/Core/Actor/ShelfMachineToolActor.cs index a372c15..683e17a 100644 --- a/Assets/GameLogic/Game/Core/Actor/ShelfMachineToolActor.cs +++ b/Assets/GameLogic/Game/Core/Actor/ShelfMachineToolActor.cs @@ -1,8 +1,11 @@ +using System; +using Animancer; using GameLogic; using NodeCanvas.BehaviourTrees; using PrimeTween; using Sirenix.OdinInspector; using UnityEngine; +using UnityEngine.Serialization; namespace GameLogic { @@ -12,52 +15,180 @@ namespace GameLogic [ShowInInspector,ReadOnly]public ShelfToolActionType _actionType = ShelfToolActionType.None; [ShowInInspector,ReadOnly] public float _moveSpeed = 5; - [ShowInInspector,ReadOnly] public float _moveSeconds; - - + [ShowInInspector,ReadOnly] public float _moveSeconds = 0; + [ShowInInspector] public So_ShelfConfig _shelfconfig = null; + - [LabelText("ӹ̨")]private Transform _caroparent; + + [Title("˽в")] + [ShowInInspector,ReadOnly] private bool _isPlayingAnim = false; + [ShowInInspector,ReadOnly] private ShelfRowAnimData _shelfRowAnimData = null; + [ShowInInspector,ReadOnly] private Transform _containerPlaceToolParent = null; + + [Title("")] + private Transform _caroparent; private Transform _station; - private ContainerInfo _container; - [Tooltip("ز")] - [ShowInInspector,BoxGroup("Load")]public bool _isInitLoadPositionComplete = false; + private ContainerInfo _currentContainerInfo; + private AnimancerComponent _animancer; + + + [LabelText("Ѷȡﶯƫ")] public float _upOffest = 0.2F; + [LabelText("Ѷ»ﶯƫ")] public float _downOffest = -0.2F; + + + [Title("ز")] + [ShowInInspector,BoxGroup("Load"),ReadOnly]public bool _isInitLoadPositionComplete = false; + [ShowInInspector,BoxGroup("Load"),ReadOnly]public bool _isEnableLoadStartAnimationComplete = false; + [ShowInInspector,BoxGroup("Load"),ReadOnly]public bool _isEnableStartLoadToShelfPosition = false; protected override void OnLoad() { base.OnLoad(); _behaviourTreeOwner = GetComponent(); + _animancer = GetComponent(); _caroparent = transform.Find("Caro-parent").Find("Cargo"); + _containerPlaceToolParent = _caroparent.Find("fork").Find("k"); } + protected override void RegisterEvent() + { + base.RegisterEvent(); + + } + + private void OnDestroy() + { + // GameEvent.RemoveListener(EventSetting.PlayStretchComplete,PlayLoadStretchComplete); + } + + /// + /// ٶ + /// + /// + private void CalculateSpeedSecond(float distance) + { + _moveSeconds = distance / _moveSpeed; + } #region װ /// /// װ /// - public void Load(Transform station,ContainerInfo containerInfo) + public void Load(Transform station,ContainerInfo containerInfo,So_ShelfConfig config) { _actionType = ShelfToolActionType.Load; _station = station; - _container = containerInfo; + _currentContainerInfo = containerInfo; + _shelfconfig = config; _behaviourTreeOwner.StartBehaviour(); } + + public void ResetParam() + { + _isPlayingAnim = false; + } + + /// + /// һƶʼλõ + /// + /// public bool InitLoadPositionComplete() { - _isInitLoadPositionComplete = false; - CalculateSpeedSecond(Vector3.Distance(transform.position, _station.position)); - Tween.PositionX(transform, _station.position.x, _moveSeconds,Ease.Linear).OnComplete(()=>_isInitLoadPositionComplete=true); - Tween.PositionY(_caroparent, _station.position.y+0.14f, _moveSeconds, Ease.Linear); + if (!_isPlayingAnim) + { + _isPlayingAnim = true; + CalculateSpeedSecond(Vector3.Distance(transform.position, _station.position)); + Tween.PositionX(transform, _station.position.x, _moveSeconds,Ease.Linear).OnComplete(()=> + { + Debug.Log("ɳʼ"); + _isInitLoadPositionComplete = true; + ResetParam(); + }); + Tween.PositionY(_caroparent, _station.position.y+0.14f, _moveSeconds, Ease.Linear); + } return _isInitLoadPositionComplete; } + /// + /// ڶװ + /// + /// + public bool EnableLoadStartAnimation() + { + if (!_isPlayingAnim) + { + GameEvent.AddListener(EventSetting.PlayStretchPickUpComplete,PlayLoadStretchPickUpComplete); + GameEvent.AddListener(EventSetting.PlayShrinkComplete,PlayLoadShrinkComplete); + + Debug.Log("ʼ춯" + DataUtility.GetRow(_station.name)); + _isPlayingAnim = true; + _shelfRowAnimData = _shelfconfig.GetAnimaData(DataUtility.GetRow(_station.name)); + _shelfRowAnimData.stretch.events = GetAnimationEvent(ToolActionType.PickUp); + _animancer.Play(_shelfRowAnimData.stretch); + } + return _isEnableLoadStartAnimationComplete; + } + + /// + /// λλ + /// + /// + public bool EnableStartLoadToShelfPosition() + { + if (!_isPlayingAnim) + { + _isPlayingAnim = true; + CalculateSpeedSecond(Vector3.Distance(transform.position,_currentContainerInfo.mapContainer.transform.position)); + Tween.PositionX(transform, _currentContainerInfo.mapContainer.transform.position.x, _moveSeconds,Ease.Linear).OnComplete(()=> + { + Debug.Log("λ"); + _isEnableStartLoadToShelfPosition = true; + ResetParam(); + }); + Tween.PositionY(_caroparent, _currentContainerInfo.mapContainer.transform.position.y, _moveSeconds, Ease.Linear); + } + return _isEnableStartLoadToShelfPosition; + } + + + + private AnimationEvent[] GetAnimationEvent(ToolActionType actionType) + { + AnimationEvent evt = _shelfRowAnimData.stretch.events[0]; + evt.functionName = "PlayStretchComplete"; + evt.intParameter = (int)actionType; + return new AnimationEvent[] { evt }; + } + + + + #region + + public void PlayLoadStretchPickUpComplete(object data) + { + Debug.Log("춯"); + _currentContainerInfo.container.SetParent(_containerPlaceToolParent); + Tween.LocalPosition(_currentContainerInfo.container.transform, Vector3.zero, 0.1f).OnComplete(() => + { + ResetParam(); + }); + Tween.PositionY(_caroparent, _caroparent.transform.position.y+_upOffest, 1f).OnComplete(() => + { + _animancer.Play(_shelfRowAnimData.shrink); + }); + // + } + public void PlayLoadShrinkComplete(object data) + { + _isEnableLoadStartAnimationComplete = true; + } #endregion + #endregion + - private void CalculateSpeedSecond(float distance) - { - _moveSeconds = distance / _moveSpeed; - } + #region ȡ /// /// ȡ @@ -65,8 +196,11 @@ namespace GameLogic public void UnLoad() { _actionType = ShelfToolActionType.UnLoad; - } + + #endregion + + } } diff --git a/Assets/GameLogic/Game/Core/Component.meta b/Assets/GameLogic/Game/Core/Component.meta new file mode 100644 index 0000000..2351dba --- /dev/null +++ b/Assets/GameLogic/Game/Core/Component.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 0084f04044682644a82e08aa38fd3db2 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GameLogic/Game/Core/Component/AnimationEventComponent.cs b/Assets/GameLogic/Game/Core/Component/AnimationEventComponent.cs new file mode 100644 index 0000000..c30d7e8 --- /dev/null +++ b/Assets/GameLogic/Game/Core/Component/AnimationEventComponent.cs @@ -0,0 +1,41 @@ +using System; +using UnityEngine; + +namespace GameLogic +{ + public class AnimationEventComponent : MonoBehaviour + { + public void PlayStretchComplete(int data) + { + if (Enum.IsDefined(typeof(ToolActionType), data)) + { + ToolActionType action = (ToolActionType)data; + Debug.Log($"Received ToolActionType: {action}"); + + switch (action) + { + case ToolActionType.PickUp: + GameEvent.Send(EventSetting.PlayStretchPickUpComplete); + break; + case ToolActionType.PutDown: + GameEvent.Send(EventSetting.PlayStretchPutDownComplete); + break; + default: + Debug.LogWarning($"Unhandled ToolActionType: {action}"); + break; + } + } + else + { + Debug.LogWarning($"Invalid ToolActionType value: {data}"); + } + } + + public void PlayShrinkComplete() + { + + GameEvent.Send(EventSetting.PlayShrinkComplete); + } + + } +} diff --git a/Assets/GameLogic/Game/Core/Component/AnimationEventComponent.cs.meta b/Assets/GameLogic/Game/Core/Component/AnimationEventComponent.cs.meta new file mode 100644 index 0000000..b49a532 --- /dev/null +++ b/Assets/GameLogic/Game/Core/Component/AnimationEventComponent.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 6e8ba6bad3c56e84d878078b440529f3 \ No newline at end of file diff --git a/Assets/GameLogic/Game/Data/ContainerInfo.cs b/Assets/GameLogic/Game/Data/ContainerInfo.cs index 76b851b..511cef5 100644 --- a/Assets/GameLogic/Game/Data/ContainerInfo.cs +++ b/Assets/GameLogic/Game/Data/ContainerInfo.cs @@ -1,11 +1,13 @@ using Sirenix.OdinInspector; using UnityEngine; +using UnityEngine.Serialization; namespace GameLogic { [System.Serializable] public class ContainerInfo { + [LabelText("货物")] public GameObject mapContainer; [LabelText("货物")] public GameObject container; [LabelText("货架")] public ShelfActor shelf; diff --git a/Assets/GameLogic/Game/Extension/GameObjectExtension.cs b/Assets/GameLogic/Game/Extension/GameObjectExtension.cs index e94960d..43983fa 100644 --- a/Assets/GameLogic/Game/Extension/GameObjectExtension.cs +++ b/Assets/GameLogic/Game/Extension/GameObjectExtension.cs @@ -24,5 +24,10 @@ namespace GameLogic self.transform.rotation = transform.rotation; self.transform.localScale = transform.localScale; } + + public static void SetParent(this GameObject self, Transform parent) + { + self.transform.SetParent(parent); + } } } \ No newline at end of file diff --git a/Assets/GameLogic/Game/Moduie.meta b/Assets/GameLogic/Game/Moduie.meta new file mode 100644 index 0000000..0ed13bf --- /dev/null +++ b/Assets/GameLogic/Game/Moduie.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 05c9f423a585a4d48a7f7348eebb38d0 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GameLogic/Game/Moduie/GameEvent.cs b/Assets/GameLogic/Game/Moduie/GameEvent.cs new file mode 100644 index 0000000..3297738 --- /dev/null +++ b/Assets/GameLogic/Game/Moduie/GameEvent.cs @@ -0,0 +1,146 @@ +using System; +using System.Collections.Generic; +using UnityEngine; + +/// +/// Ϸ¼ϵͳ - ̬ +/// ṩӼ¼ƳĹ +/// +public static class GameEvent +{ + // ʹֵ洢¼ƺͶӦļб + private static Dictionary>> eventDictionary = new Dictionary>>(); + + /// + /// ¼ + /// + /// ¼ + /// ¼ + public static void AddListener(string eventName, Action listener) + { + // ¼ǷΪ + if (string.IsNullOrEmpty(eventName)) + { + Debug.LogError("GameEvent: ¼ƲΪգ"); + return; + } + + // ǷΪ + if (listener == null) + { + Debug.LogError("GameEvent: Ϊգ"); + return; + } + + // ¼ڣµļб + if (!eventDictionary.ContainsKey(eventName)) + { + eventDictionary[eventName] = new List>(); + } + + // Ӽб + eventDictionary[eventName].Add(listener); + } + + /// + /// ¼ + /// + /// ¼ + /// ¼ + public static void Send(string eventName, object param = null) + { + // ¼ǷΪ + if (string.IsNullOrEmpty(eventName)) + { + Debug.LogError("GameEvent: ¼ƲΪգ"); + return; + } + + // ¼ڣֱӷ + if (!eventDictionary.ContainsKey(eventName)) + { + return; + } + + // ȡб + List> listeners = eventDictionary[eventName]; + + // м + for (int i = 0; i < listeners.Count; i++) + { + try + { + listeners[i].Invoke(param); + } + catch (Exception e) + { + Debug.LogError($"GameEvent: ִ¼ '{eventName}' ļʱ쳣: {e.Message}"); + } + } + } + + /// + /// Ƴ¼ + /// + /// ¼ + /// ¼ + public static void RemoveListener(string eventName, Action listener) + { + // ¼ǷΪ + if (string.IsNullOrEmpty(eventName)) + { + Debug.LogError("GameEvent: ¼ƲΪգ"); + return; + } + + // ǷΪ + if (listener == null) + { + Debug.LogError("GameEvent: Ϊգ"); + return; + } + + // ¼ڣֱӷ + if (!eventDictionary.ContainsKey(eventName)) + { + return; + } + + // бƳ + eventDictionary[eventName].Remove(listener); + + // бΪգƳ¼ + if (eventDictionary[eventName].Count == 0) + { + eventDictionary.Remove(eventName); + } + } + + /// + /// ¼ + /// + public static void ClearAllEvents() + { + eventDictionary.Clear(); + } + + /// + /// ָ¼м + /// + /// ¼ + public static void ClearEvent(string eventName) + { + // ¼ǷΪ + if (string.IsNullOrEmpty(eventName)) + { + Debug.LogError("GameEvent: ¼ƲΪգ"); + return; + } + + // ¼ڣƳ¼ + if (eventDictionary.ContainsKey(eventName)) + { + eventDictionary.Remove(eventName); + } + } +} \ No newline at end of file diff --git a/Assets/GameLogic/Game/Moduie/GameEvent.cs.meta b/Assets/GameLogic/Game/Moduie/GameEvent.cs.meta new file mode 100644 index 0000000..a9645d9 --- /dev/null +++ b/Assets/GameLogic/Game/Moduie/GameEvent.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 6c9829ebe0411e346b713453e904b1c0 \ No newline at end of file diff --git a/Assets/GameLogic/Game/Setting/EventSetting.cs b/Assets/GameLogic/Game/Setting/EventSetting.cs new file mode 100644 index 0000000..fb66025 --- /dev/null +++ b/Assets/GameLogic/Game/Setting/EventSetting.cs @@ -0,0 +1,9 @@ +namespace GameLogic +{ + public static class EventSetting + { + public static readonly string PlayStretchPickUpComplete = "PlayStretchPickUpComplete"; + public static readonly string PlayStretchPutDownComplete = "PlayStretchPutDownComplete"; + public static readonly string PlayShrinkComplete = "PlayShrinkComplete"; + } +} \ No newline at end of file diff --git a/Assets/GameLogic/Game/Setting/EventSetting.cs.meta b/Assets/GameLogic/Game/Setting/EventSetting.cs.meta new file mode 100644 index 0000000..e152c52 --- /dev/null +++ b/Assets/GameLogic/Game/Setting/EventSetting.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: c5c04078ec0a4988ae596c3ae0c564ac +timeCreated: 1746686567 \ No newline at end of file diff --git a/Assets/GameLogic/Game/Utility/DataUtility.cs b/Assets/GameLogic/Game/Utility/DataUtility.cs new file mode 100644 index 0000000..4ed6e1b --- /dev/null +++ b/Assets/GameLogic/Game/Utility/DataUtility.cs @@ -0,0 +1,26 @@ +using UnityEngine; + +namespace GameLogic +{ + public static class DataUtility + { + public static int GetRow(string data) + { + var array = data.Split('-'); + return int.Parse(array[0]); + } + + public static int GetColumn(string data) + { + var array = data.Split('-'); + return int.Parse(array[1]); + } + + public static int GetLayer(string data) + { + var array = data.Split('-'); + return int.Parse(array[2]); + } + } + +} diff --git a/Assets/GameLogic/Game/Utility/DataUtility.cs.meta b/Assets/GameLogic/Game/Utility/DataUtility.cs.meta new file mode 100644 index 0000000..98a80a5 --- /dev/null +++ b/Assets/GameLogic/Game/Utility/DataUtility.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 4afb7fbb72f215d4aae9cca6e4e9badc \ No newline at end of file diff --git a/Assets/GameLogic/Game/Utility/Factory/ContainerFactory.cs b/Assets/GameLogic/Game/Utility/Factory/ContainerFactory.cs index 3caf486..aae5be5 100644 --- a/Assets/GameLogic/Game/Utility/Factory/ContainerFactory.cs +++ b/Assets/GameLogic/Game/Utility/Factory/ContainerFactory.cs @@ -5,11 +5,11 @@ namespace GameLogic { public static class ContainerFactory { - public static ContainerInfo CreateInfo(GameObject container, ShelfActor shelf, int shelfRow, int shelColumn, + public static ContainerInfo CreateInfo(GameObject mapContainer, ShelfActor shelf, int shelfRow, int shelColumn, int shelfLayer) { var containerInfo = Activator.CreateInstance(); - containerInfo.container = container; + containerInfo.mapContainer = mapContainer; containerInfo.shelf = shelf; containerInfo.shelfRow = shelfRow; containerInfo.shelColumn = shelColumn; diff --git a/Assets/GameLogic/Game/Utility/SO/So_ShelfConfig.cs b/Assets/GameLogic/Game/Utility/SO/So_ShelfConfig.cs index c9b027c..6e9e07b 100644 --- a/Assets/GameLogic/Game/Utility/SO/So_ShelfConfig.cs +++ b/Assets/GameLogic/Game/Utility/SO/So_ShelfConfig.cs @@ -11,6 +11,13 @@ namespace GameLogic { [LabelText(""),ShowInInspector] public List groups = new List(); [LabelText(""),ShowInInspector]public Dictionary shelfAnimDatas = new Dictionary(); + + + + public ShelfRowAnimData GetAnimaData(int row) + { + return shelfAnimDatas.GetValueOrDefault(row); + } } } diff --git a/Assets/GameLogic/Origin/device/stacker/右浅伸.anim b/Assets/GameLogic/Origin/device/stacker/右浅伸.anim index c700724..c0dc86e 100644 --- a/Assets/GameLogic/Origin/device/stacker/右浅伸.anim +++ b/Assets/GameLogic/Origin/device/stacker/右浅伸.anim @@ -334,4 +334,11 @@ AnimationClip: m_EulerEditorCurves: [] m_HasGenericRootTransform: 0 m_HasMotionFloatCurves: 0 - m_Events: [] + m_Events: + - time: 1.3333334 + functionName: PlayStretchComplete + data: + objectReferenceParameter: {fileID: 0} + floatParameter: 0 + intParameter: 0 + messageOptions: 0 diff --git a/Assets/GameLogic/Origin/device/stacker/右浅缩.anim b/Assets/GameLogic/Origin/device/stacker/右浅缩.anim index 3495316..eb72a33 100644 --- a/Assets/GameLogic/Origin/device/stacker/右浅缩.anim +++ b/Assets/GameLogic/Origin/device/stacker/右浅缩.anim @@ -20,7 +20,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: 0, y: 0.0067, z: 0.71499926} + value: {x: 0, y: 0.0067, z: -0.536} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -28,17 +28,17 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 0.8333333 - value: {x: 0, y: 0.0067, z: 0.364} - inSlope: {x: 0, y: 0, z: -0.46888837} - outSlope: {x: 0, y: 0, z: -0.46888837} + time: 0.6666667 + value: {x: 0, y: 0.0067, z: -0.223} + inSlope: {x: 0, y: 0, z: 0.46785003} + outSlope: {x: 0, y: 0, z: 0.46785003} tangentMode: 0 weightedMode: 0 inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 1.35 - value: {x: 0, y: 0.0067, z: 0.082} + time: 1.3333334 + value: {x: 0, y: 0.0067, z: 0.0878} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -54,7 +54,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: 31.3795, y: -0.5468, z: 18.414} + value: {x: 31.3795, y: -0.5468, z: 17.854} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -62,8 +62,8 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 1.35 - value: {x: 31.3795, y: -0.5468, z: 18.132004} + time: 1.3333334 + value: {x: 31.3795, y: -0.5468, z: 18.1648} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -108,7 +108,7 @@ AnimationClip: m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 1.35 + m_StopTime: 1.3333334 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 @@ -138,7 +138,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.8333333 + time: 0.6666667 value: 0 inSlope: 0 outSlope: 0 @@ -147,7 +147,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1.35 + time: 1.3333334 value: 0 inSlope: 0 outSlope: 0 @@ -177,7 +177,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.8333333 + time: 0.6666667 value: 0.0067 inSlope: 0 outSlope: 0 @@ -186,7 +186,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1.35 + time: 1.3333334 value: 0.0067 inSlope: 0 outSlope: 0 @@ -208,7 +208,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0.71499926 + value: -0.536 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -216,17 +216,17 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.8333333 - value: 0.364 - inSlope: -0.46888837 - outSlope: -0.46888837 + time: 0.6666667 + value: -0.223 + inSlope: 0.46785003 + outSlope: 0.46785003 tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1.35 - value: 0.082 + time: 1.3333334 + value: 0.0878 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -255,7 +255,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1.35 + time: 1.3333334 value: 31.3795 inSlope: 0 outSlope: 0 @@ -285,7 +285,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1.35 + time: 1.3333334 value: -0.5468 inSlope: 0 outSlope: 0 @@ -307,7 +307,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 18.414 + value: 17.854 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -315,8 +315,8 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1.35 - value: 18.132004 + time: 1.3333334 + value: 18.1648 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -334,4 +334,11 @@ AnimationClip: m_EulerEditorCurves: [] m_HasGenericRootTransform: 0 m_HasMotionFloatCurves: 0 - m_Events: [] + m_Events: + - time: 1.3333334 + functionName: PlayShrinkComplete + data: + objectReferenceParameter: {fileID: 0} + floatParameter: 0 + intParameter: 0 + messageOptions: 0 diff --git a/Assets/GameLogic/Origin/device/stacker/右浅缩.anim.meta b/Assets/GameLogic/Origin/device/stacker/右浅缩.anim.meta index a04ca3f..4330c79 100644 --- a/Assets/GameLogic/Origin/device/stacker/右浅缩.anim.meta +++ b/Assets/GameLogic/Origin/device/stacker/右浅缩.anim.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 35f948453d152a04986763f636b3c194 +guid: c7c24aeb0ca291d4583b5e28baf58f80 NativeFormatImporter: externalObjects: {} mainObjectFileID: 7400000 diff --git a/Assets/GameLogic/Origin/device/stacker/右深伸.anim b/Assets/GameLogic/Origin/device/stacker/右深伸.anim index ab2e408..9997ffc 100644 --- a/Assets/GameLogic/Origin/device/stacker/右深伸.anim +++ b/Assets/GameLogic/Origin/device/stacker/右深伸.anim @@ -494,4 +494,11 @@ AnimationClip: m_EulerEditorCurves: [] m_HasGenericRootTransform: 0 m_HasMotionFloatCurves: 0 - m_Events: [] + m_Events: + - time: 2 + functionName: PlayStretchComplete + data: + objectReferenceParameter: {fileID: 0} + floatParameter: 0 + intParameter: 0 + messageOptions: 0 diff --git a/Assets/GameLogic/Origin/device/stacker/右深缩.anim b/Assets/GameLogic/Origin/device/stacker/右深缩.anim index f2a361a..f934887 100644 --- a/Assets/GameLogic/Origin/device/stacker/右深缩.anim +++ b/Assets/GameLogic/Origin/device/stacker/右深缩.anim @@ -458,4 +458,11 @@ AnimationClip: m_EulerEditorCurves: [] m_HasGenericRootTransform: 0 m_HasMotionFloatCurves: 0 - m_Events: [] + m_Events: + - time: 1.6666666 + functionName: PlayShrinkComplete + data: + objectReferenceParameter: {fileID: 0} + floatParameter: 0 + intParameter: 0 + messageOptions: 0 diff --git a/Assets/GameLogic/Origin/device/stacker/左浅伸.anim b/Assets/GameLogic/Origin/device/stacker/左浅伸.anim index d72e069..9fd633b 100644 --- a/Assets/GameLogic/Origin/device/stacker/左浅伸.anim +++ b/Assets/GameLogic/Origin/device/stacker/左浅伸.anim @@ -336,7 +336,7 @@ AnimationClip: m_HasMotionFloatCurves: 0 m_Events: - time: 1 - functionName: + functionName: PlayStretchComplete data: objectReferenceParameter: {fileID: 0} floatParameter: 0 diff --git a/Assets/GameLogic/Origin/device/stacker/左浅缩.anim b/Assets/GameLogic/Origin/device/stacker/左浅缩.anim index 483c9f3..8ae0b28 100644 --- a/Assets/GameLogic/Origin/device/stacker/左浅缩.anim +++ b/Assets/GameLogic/Origin/device/stacker/左浅缩.anim @@ -20,7 +20,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: 0, y: 0.0067, z: -0.536} + value: {x: 0, y: 0.0067, z: 0.71499926} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -28,17 +28,17 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 0.6666667 - value: {x: 0, y: 0.0067, z: -0.223} - inSlope: {x: 0, y: 0, z: 0.46785003} - outSlope: {x: 0, y: 0, z: 0.46785003} + time: 0.8333333 + value: {x: 0, y: 0.0067, z: 0.364} + inSlope: {x: 0, y: 0, z: -0.46888837} + outSlope: {x: 0, y: 0, z: -0.46888837} tangentMode: 0 weightedMode: 0 inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 1.3333334 - value: {x: 0, y: 0.0067, z: 0.0878} + time: 1.35 + value: {x: 0, y: 0.0067, z: 0.082} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -54,7 +54,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: 31.3795, y: -0.5468, z: 17.854} + value: {x: 31.3795, y: -0.5468, z: 18.414} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -62,8 +62,8 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 1.3333334 - value: {x: 31.3795, y: -0.5468, z: 18.1648} + time: 1.35 + value: {x: 31.3795, y: -0.5468, z: 18.132004} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -108,7 +108,7 @@ AnimationClip: m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 1.3333334 + m_StopTime: 1.35 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 @@ -138,7 +138,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.6666667 + time: 0.8333333 value: 0 inSlope: 0 outSlope: 0 @@ -147,7 +147,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1.3333334 + time: 1.35 value: 0 inSlope: 0 outSlope: 0 @@ -177,7 +177,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.6666667 + time: 0.8333333 value: 0.0067 inSlope: 0 outSlope: 0 @@ -186,7 +186,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1.3333334 + time: 1.35 value: 0.0067 inSlope: 0 outSlope: 0 @@ -208,7 +208,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: -0.536 + value: 0.71499926 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -216,17 +216,17 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.6666667 - value: -0.223 - inSlope: 0.46785003 - outSlope: 0.46785003 + time: 0.8333333 + value: 0.364 + inSlope: -0.46888837 + outSlope: -0.46888837 tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1.3333334 - value: 0.0878 + time: 1.35 + value: 0.082 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -255,7 +255,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1.3333334 + time: 1.35 value: 31.3795 inSlope: 0 outSlope: 0 @@ -285,7 +285,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1.3333334 + time: 1.35 value: -0.5468 inSlope: 0 outSlope: 0 @@ -307,7 +307,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 17.854 + value: 18.414 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -315,8 +315,8 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1.3333334 - value: 18.1648 + time: 1.35 + value: 18.132004 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -334,4 +334,11 @@ AnimationClip: m_EulerEditorCurves: [] m_HasGenericRootTransform: 0 m_HasMotionFloatCurves: 0 - m_Events: [] + m_Events: + - time: 1.35 + functionName: PlayShrinkComplete + data: + objectReferenceParameter: {fileID: 0} + floatParameter: 0 + intParameter: 0 + messageOptions: 0 diff --git a/Assets/GameLogic/Origin/device/stacker/左浅缩.anim.meta b/Assets/GameLogic/Origin/device/stacker/左浅缩.anim.meta index 4330c79..a04ca3f 100644 --- a/Assets/GameLogic/Origin/device/stacker/左浅缩.anim.meta +++ b/Assets/GameLogic/Origin/device/stacker/左浅缩.anim.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: c7c24aeb0ca291d4583b5e28baf58f80 +guid: 35f948453d152a04986763f636b3c194 NativeFormatImporter: externalObjects: {} mainObjectFileID: 7400000 diff --git a/Assets/GameLogic/Origin/device/stacker/左深伸.anim b/Assets/GameLogic/Origin/device/stacker/左深伸.anim index 1a42fbe..7138317 100644 --- a/Assets/GameLogic/Origin/device/stacker/左深伸.anim +++ b/Assets/GameLogic/Origin/device/stacker/左深伸.anim @@ -530,4 +530,11 @@ AnimationClip: m_EulerEditorCurves: [] m_HasGenericRootTransform: 0 m_HasMotionFloatCurves: 0 - m_Events: [] + m_Events: + - time: 1.6666666 + functionName: PlayStretchComplete + data: + objectReferenceParameter: {fileID: 0} + floatParameter: 0 + intParameter: 0 + messageOptions: 0 diff --git a/Assets/GameLogic/Origin/device/stacker/左深缩 .anim b/Assets/GameLogic/Origin/device/stacker/左深缩 .anim index b143d8e..4c4ff6d 100644 --- a/Assets/GameLogic/Origin/device/stacker/左深缩 .anim +++ b/Assets/GameLogic/Origin/device/stacker/左深缩 .anim @@ -458,4 +458,11 @@ AnimationClip: m_EulerEditorCurves: [] m_HasGenericRootTransform: 0 m_HasMotionFloatCurves: 0 - m_Events: [] + m_Events: + - time: 1.6833333 + functionName: PlayShrinkComplete + data: + objectReferenceParameter: {fileID: 0} + floatParameter: 0 + intParameter: 0 + messageOptions: 0 diff --git a/Assets/Scenes/main.unity b/Assets/Scenes/main.unity index cc5a8a4..0ad424d 100644 --- a/Assets/Scenes/main.unity +++ b/Assets/Scenes/main.unity @@ -32254,7 +32254,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0.00016001519} + m_AnchoredPosition: {x: 0, y: -0.000058218837} m_SizeDelta: {x: 0, y: 300} m_Pivot: {x: 0, y: 1} --- !u!114 &478527198 @@ -66764,8 +66764,8 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 963194225} serializedVersion: 2 - m_LocalRotation: {x: 0.06113388, y: -0.9031976, z: 0.13733405, w: 0.40204} - m_LocalPosition: {x: 90.59197, y: 24.513542, z: 24.777458} + m_LocalRotation: {x: -0.059602156, y: -0.8828924, z: 0.116679616, w: -0.45092642} + m_LocalPosition: {x: 21.895561, y: 26.234213, z: 22.103218} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -90712,7 +90712,7 @@ MonoBehaviour: m_HandleRect: {fileID: 1614015367} m_Direction: 2 m_Value: 0 - m_Size: 0.99902284 + m_Size: 1 m_NumberOfSteps: 0 m_OnValueChanged: m_PersistentCalls: @@ -109084,7 +109084,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8516180839313075434, guid: 7827ccff2c5319541bbaf34e30e83074, type: 3} propertyPath: m_LocalPosition.z - value: 18.135 + value: 18.132004 objectReference: {fileID: 0} - target: {fileID: 8560599259290696241, guid: 7827ccff2c5319541bbaf34e30e83074, type: 3} propertyPath: m_Name @@ -109148,7 +109148,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 9149438089919446606, guid: 7827ccff2c5319541bbaf34e30e83074, type: 3} propertyPath: m_LocalPosition.z - value: 0.08000162 + value: 0.082 objectReference: {fileID: 0} - target: {fileID: 9164810454042893205, guid: 7827ccff2c5319541bbaf34e30e83074, type: 3} propertyPath: m_Name diff --git a/Assets/右缩叉.anim b/Assets/右缩叉.anim index 349a018..df9a9e3 100644 --- a/Assets/右缩叉.anim +++ b/Assets/右缩叉.anim @@ -530,4 +530,11 @@ AnimationClip: m_EulerEditorCurves: [] m_HasGenericRootTransform: 0 m_HasMotionFloatCurves: 0 - m_Events: [] + m_Events: + - time: 1.6666666 + functionName: PlayShrinkComplete + data: + objectReferenceParameter: {fileID: 0} + floatParameter: 0 + intParameter: 0 + messageOptions: 0 diff --git a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt index ff1fad6..93628a3 100644 --- a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt +++ b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt @@ -23,7 +23,7 @@ MonoBehaviour: m_MinSize: {x: 500, y: 100} m_MaxSize: {x: 40480, y: 16192} vertical: 1 - controlID: 55 + controlID: 47 draggingID: 0 --- !u!114 &2 MonoBehaviour: @@ -46,10 +46,10 @@ MonoBehaviour: m_TextWithWhitespace: "Game\u200B" m_Pos: serializedVersion: 2 - x: 706 + x: 718 y: 79 - width: 445 - height: 341 + width: 379 + height: 691 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -103,10 +103,10 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 21 - width: 445 - height: 320 - m_Scale: {x: 0.115885414, y: 0.115885414} - m_Translation: {x: 222.5, y: 160} + width: 379 + height: 670 + m_Scale: {x: 0.098697916, y: 0.098697916} + m_Translation: {x: 189.5, y: 335} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 @@ -114,12 +114,12 @@ MonoBehaviour: m_LastShownAreaInsideMargins: serializedVersion: 2 x: -1920 - y: -1380.6742 + y: -3394.1953 width: 3840 - height: 2761.3484 + height: 6788.3906 m_MinimalGUI: 1 - m_defaultScale: 0.115885414 - m_LastWindowPixelSize: {x: 445, y: 341} + m_defaultScale: 0.098697916 + m_LastWindowPixelSize: {x: 379, y: 691} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 01000000000000000000 @@ -150,7 +150,7 @@ MonoBehaviour: m_MinSize: {x: 500, y: 100} m_MaxSize: {x: 40480, y: 16192} vertical: 0 - controlID: 56 + controlID: 48 draggingID: 0 --- !u!114 &4 MonoBehaviour: @@ -171,12 +171,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1253 + width: 1252 height: 941 m_MinSize: {x: 400, y: 100} m_MaxSize: {x: 32384, y: 16192} vertical: 1 - controlID: 57 + controlID: 49 draggingID: 0 --- !u!114 &5 MonoBehaviour: @@ -199,12 +199,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1253 - height: 367 + width: 1252 + height: 717 m_MinSize: {x: 400, y: 50} m_MaxSize: {x: 32384, y: 8096} vertical: 0 - controlID: 58 + controlID: 50 draggingID: 0 --- !u!114 &6 MonoBehaviour: @@ -223,10 +223,10 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 521 - height: 367 - m_MinSize: {x: 201, y: 226} - m_MaxSize: {x: 4001, y: 4026} + width: 321 + height: 717 + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 7} m_Panes: - {fileID: 7} @@ -255,8 +255,8 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 79 - width: 520 - height: 341 + width: 320 + height: 691 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -270,10 +270,10 @@ MonoBehaviour: m_OverlaysVisible: 1 m_SceneHierarchy: m_TreeViewState: - scrollPos: {x: 0, y: 6115} - m_SelectedIDs: 1ad4feff - m_LastClickedID: -76774 - m_ExpandedIDs: c234f1fff037f1fff63af1ff70eff5ff7eeff5ff260bf6ffa00bf6ffae0bf6ffae0ef6ffbc0ef6ff0845f9ff1645f9ffe61cfeff9a35feffe238feff9651feff9a8ffeff0692feff2a92feff3092feff4492feff56b1feff0acafefffccafeffc6d2feff0cd4feff14d4feff62d5feff70d5feff80d5feff1cdbfeffc80fffff0217ffffb62ffffffe32ffffb24bffffa44cffffe688ffffec88ffff0089ffffcaa4ffffb8c1ffff26c2ffff36c2ffff3cc2ffff08fbffff0afbffffaa9c00005aa1000094a80000e4aa000080ae00008ab100009ab1000028b2000088b40000c2b4000046b50000c8b600007ebb0000a4bb00001abd00000ac00000d0c000008ec7000034c80000a4ca0000cecb000006ce0000f2ce0000 + scrollPos: {x: 0, y: 1730} + m_SelectedIDs: f4087bfe + m_LastClickedID: 0 + m_ExpandedIDs: e6b47ffef4b47ffe34b1a4fe42b1a4fefeb53bff0cb63bff604f3cffa84a64ffb64a64ff96da6bff8e5fa3ff2c91a3ff4091a3ff5091a3ff5691a3ff6c91a3ff846dc2ff926dc2ff5ab2ddff6eb2ddff7eb2ddff84b2ddff64b6e5ff62cdebff3200ffffd209ffffe609fffff609fffffc09ffffd041ffffcc42fffffe48ffff0a4bffff06fbffffaaa6000068ab0000b2c00000e0c10000bac4000010c90000c8cc0000aecf000004d500009cd60000d6da0000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -313,12 +313,12 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 521 + x: 321 y: 0 - width: 185 - height: 367 - m_MinSize: {x: 102, y: 126} - m_MaxSize: {x: 4002, y: 4026} + width: 397 + height: 717 + m_MinSize: {x: 100, y: 100} + m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 9} m_Panes: - {fileID: 9} @@ -345,10 +345,10 @@ MonoBehaviour: m_TextWithWhitespace: "Scene\u200B" m_Pos: serializedVersion: 2 - x: 521 + x: 321 y: 79 - width: 183 - height: 341 + width: 395 + height: 691 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -363,12 +363,12 @@ MonoBehaviour: displayed: 1 id: Tool Settings index: 0 - contents: '{"m_Layout":1,"m_Collapsed":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":24.0,"y":-24.0},"m_SnapOffsetDelta":{"x":0.0,"y":0.0},"m_FloatingSnapCorner":2,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' + contents: '{"m_Layout":1,"m_Collapsed":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":-187.0,"y":-24.0},"m_SnapOffsetDelta":{"x":0.0,"y":0.0},"m_FloatingSnapCorner":3,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' floating: 0 collapsed: 0 - snapOffset: {x: 24, y: -24} + snapOffset: {x: -187, y: -24} snapOffsetDelta: {x: 0, y: 0} - snapCorner: 2 + snapCorner: 3 layout: 1 size: {x: 0, y: 0} sizeOverridden: 0 @@ -391,10 +391,10 @@ MonoBehaviour: displayed: 1 id: unity-scene-view-toolbar index: 0 - contents: '{"m_Layout":1,"m_Collapsed":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":24.0,"y":5.0},"m_SnapOffsetDelta":{"x":0.0,"y":0.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' + contents: '{"m_Layout":1,"m_Collapsed":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":24.0,"y":25.0},"m_SnapOffsetDelta":{"x":0.0,"y":0.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' floating: 0 collapsed: 0 - snapOffset: {x: 24, y: 5} + snapOffset: {x: 24, y: 25} snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 layout: 1 @@ -419,10 +419,10 @@ MonoBehaviour: displayed: 1 id: unity-transform-toolbar index: 0 - contents: '{"m_Layout":2,"m_Collapsed":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":24.0,"y":13.0},"m_SnapOffsetDelta":{"x":0.0,"y":0.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' + contents: '{"m_Layout":2,"m_Collapsed":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":24.0,"y":25.0},"m_SnapOffsetDelta":{"x":0.0,"y":0.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' floating: 0 collapsed: 0 - snapOffset: {x: 24, y: 13} + snapOffset: {x: 24, y: 25} snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 layout: 2 @@ -685,11 +685,11 @@ MonoBehaviour: displayed: 1 id: AINavigationOverlay index: 0 - contents: '{"m_Layout":4,"m_Collapsed":true,"m_Floating":false,"m_FloatingSnapOffset":{"x":-206.0,"y":-239.0},"m_SnapOffsetDelta":{"x":4.0,"y":0.0},"m_FloatingSnapCorner":3,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' + contents: '{"m_Layout":4,"m_Collapsed":true,"m_Floating":false,"m_FloatingSnapOffset":{"x":-206.0,"y":-239.0},"m_SnapOffsetDelta":{"x":0.0,"y":0.0},"m_FloatingSnapCorner":3,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' floating: 0 collapsed: 1 snapOffset: {x: -206, y: -239} - snapOffsetDelta: {x: 4, y: 0} + snapOffsetDelta: {x: 0, y: 0} snapCorner: 3 layout: 4 size: {x: 0, y: 0} @@ -741,10 +741,10 @@ MonoBehaviour: displayed: 1 id: unity-scene-view-camera-mode-toolbar index: 1 - contents: '{"m_Layout":4,"m_Collapsed":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":24.0,"y":0.0},"m_SnapOffsetDelta":{"x":0.0,"y":0.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' + contents: '{"m_Layout":4,"m_Collapsed":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":24.0,"y":25.0},"m_SnapOffsetDelta":{"x":0.0,"y":0.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' floating: 0 collapsed: 0 - snapOffset: {x: 24, y: 0} + snapOffset: {x: 24, y: 25} snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 layout: 4 @@ -769,10 +769,10 @@ MonoBehaviour: displayed: 1 id: Overlays/OverlayMenu index: 1 - contents: '{"m_Layout":1,"m_Collapsed":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":24.0,"y":0.0},"m_SnapOffsetDelta":{"x":0.0,"y":0.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' + contents: '{"m_Layout":1,"m_Collapsed":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":24.0,"y":25.0},"m_SnapOffsetDelta":{"x":0.0,"y":0.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' floating: 0 collapsed: 0 - snapOffset: {x: 24, y: 0} + snapOffset: {x: 24, y: 25} snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 layout: 1 @@ -833,9 +833,9 @@ MonoBehaviour: m_AudioPlay: 0 m_DebugDrawModesUseInteractiveLightBakingData: 0 m_Position: - m_Target: {x: 36.210182, y: 6.233741, z: 5.8355374} + m_Target: {x: 31.27479, y: 10.917541, z: -11.026852} speed: 2 - m_Value: {x: 36.210182, y: 6.233741, z: 5.8355374} + m_Value: {x: 31.27479, y: 10.917541, z: -11.026852} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -881,20 +881,20 @@ MonoBehaviour: m_GridAxis: 1 m_gridOpacity: 0.5 m_Rotation: - m_Target: {x: 0.0018041452, y: -0.07794278, z: 0.00015256705, w: 0.99701273} + m_Target: {x: 0.20840421, y: -0.5749407, z: 0.15515602, w: 0.77603394} speed: 2 - m_Value: {x: 0.0018040434, y: -0.077938385, z: 0.00015255845, w: 0.9969565} + m_Value: {x: 0.20837389, y: -0.574857, z: 0.15513344, w: 0.775921} m_Size: - m_Target: 10 + m_Target: 0.29763865 speed: 2 - m_Value: 10 + m_Value: 0.29763865 m_Ortho: m_Target: 0 speed: 2 m_Value: 0 m_CameraSettings: - m_Speed: 0.34829998 - m_SpeedNormalized: 0.16999999 + m_Speed: 0.28859997 + m_SpeedNormalized: 0.13999999 m_SpeedMin: 0.01 m_SpeedMax: 2 m_EasingEnabled: 1 @@ -905,7 +905,7 @@ MonoBehaviour: m_FarClip: 10000 m_DynamicClip: 1 m_OcclusionCulling: 0 - m_LastSceneViewRotation: {x: -0.08717229, y: 0.89959055, z: -0.21045254, w: -0.3726226} + m_LastSceneViewRotation: {x: 0.12731908, y: -0.6607324, z: 0.11560551, w: 0.7308248} m_LastSceneViewOrtho: 0 m_Viewpoint: m_SceneView: {fileID: 9} @@ -936,12 +936,12 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 706 + x: 718 y: 0 - width: 447 - height: 367 - m_MinSize: {x: 100, y: 100} - m_MaxSize: {x: 4000, y: 4000} + width: 381 + height: 717 + m_MinSize: {x: 102, y: 126} + m_MaxSize: {x: 4002, y: 4026} m_ActualView: {fileID: 2} m_Panes: - {fileID: 2} @@ -962,12 +962,12 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 1153 + x: 1099 y: 0 - width: 100 - height: 367 - m_MinSize: {x: 100, y: 100} - m_MaxSize: {x: 4000, y: 4000} + width: 153 + height: 717 + m_MinSize: {x: 102, y: 126} + m_MaxSize: {x: 4002, y: 4026} m_ActualView: {fileID: 12} m_Panes: - {fileID: 12} @@ -994,10 +994,10 @@ MonoBehaviour: m_TextWithWhitespace: "Timeline\u200B" m_Pos: serializedVersion: 2 - x: 1153 + x: 1099 y: 79 - width: 98 - height: 341 + width: 151 + height: 691 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -1036,13 +1036,13 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 367 - width: 1253 - height: 574 + y: 717 + width: 1252 + height: 224 m_MinSize: {x: 200, y: 50} m_MaxSize: {x: 16192, y: 8096} vertical: 0 - controlID: 32287 + controlID: 154 draggingID: 0 --- !u!114 &14 MonoBehaviour: @@ -1061,8 +1061,8 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 629 - height: 574 + width: 525 + height: 224 m_MinSize: {x: 231, y: 276} m_MaxSize: {x: 10001, y: 10026} m_ActualView: {fileID: 15} @@ -1092,9 +1092,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 446 - width: 628 - height: 548 + y: 796 + width: 524 + height: 198 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -1117,7 +1117,7 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets/AssetRaw/Material + - Packages/com.kybernetik.animancer m_Globs: [] m_ProductIds: m_AnyWithAssetOrigin: 0 @@ -1127,30 +1127,30 @@ MonoBehaviour: m_ViewMode: 1 m_StartGridSize: 64 m_LastFolders: - - Assets/AssetRaw/Material + - Packages/com.kybernetik.animancer m_LastFoldersGridSize: -1 m_LastProjectPath: D:\UGit\AK056 m_LockTracker: m_IsLocked: 0 m_FolderTreeState: - scrollPos: {x: 0, y: 125} - m_SelectedIDs: 26be1400 - m_LastClickedID: 1359398 - m_ExpandedIDs: 000000009c120100a212010026130100381301000a140100201e0100f03b0200184302002c430200764d03008c4d0300944d03003ec30300acc30300c4c3030000ca9a3bffffff7f + scrollPos: {x: 0, y: 830} + m_SelectedIDs: d6a01900 + m_LastClickedID: 1679574 + m_ExpandedIDs: 00000000841e0100861e0100881e01008a1e01008c1e0100901e0100941e0100961e0100981e01009a1e01009c1e01009e1e0100a01e0100a21e01002e1f0100341f0100361f0100381f0100701f01003419120000ca9a3bffffff7f m_RenameOverlay: m_UserAcceptedRename: 0 - m_Name: - m_OriginalName: + m_Name: Fonts + m_OriginalName: Fonts m_EditFieldRect: serializedVersion: 2 x: 0 y: 0 width: 0 height: 0 - m_UserData: 0 + m_UserData: 1185918 m_IsWaitingForDelay: 0 m_IsRenaming: 0 - m_OriginalEventType: 11 + m_OriginalEventType: 0 m_IsRenamingFilename: 1 m_TrimLeadingAndTrailingWhitespace: 0 m_ClientGUIView: {fileID: 14} @@ -1165,7 +1165,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 000000009c1201009e120100a0120100a2120100 + m_ExpandedIDs: 00000000841e0100861e0100881e01008a1e01008c1e01008e1e0100901e0100921e0100941e0100961e0100981e01009a1e01009c1e01009e1e0100a01e0100a21e0100 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1191,8 +1191,8 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_ListAreaState: - m_SelectedInstanceIDs: 1ad4feff - m_LastClickedInstanceID: -76774 + m_SelectedInstanceIDs: f4087bfe + m_LastClickedInstanceID: -25491212 m_HadKeyboardFocusLastEvent: 1 m_ExpandedInstanceIDs: c6230000901d0600d2510500a2a305008ea0050010cb010044a200007e69000004a5780076d9790094da7900e0590400383d04002871000000000000 m_RenameOverlay: @@ -1238,10 +1238,10 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 629 + x: 525 y: 0 - width: 624 - height: 574 + width: 727 + height: 224 m_MinSize: {x: 102, y: 126} m_MaxSize: {x: 4002, y: 4026} m_ActualView: {fileID: 17} @@ -1270,10 +1270,10 @@ MonoBehaviour: m_TextWithWhitespace: "Console\u200B" m_Pos: serializedVersion: 2 - x: 629 - y: 446 - width: 622 - height: 548 + x: 525 + y: 796 + width: 725 + height: 198 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -1300,9 +1300,9 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 1253 + x: 1252 y: 0 - width: 667 + width: 668 height: 941 m_MinSize: {x: 276, y: 126} m_MaxSize: {x: 4001, y: 4026} @@ -1332,9 +1332,9 @@ MonoBehaviour: m_TextWithWhitespace: "Inspector\u200B" m_Pos: serializedVersion: 2 - x: 1253 + x: 1252 y: 79 - width: 666 + width: 667 height: 915 m_SerializedDataModeController: m_DataMode: 0 @@ -1350,7 +1350,7 @@ MonoBehaviour: m_ObjectsLockedBeforeSerialization: [] m_InstanceIDsLockedBeforeSerialization: m_PreviewResizer: - m_CachedPref: 350 + m_CachedPref: 151 m_ControlHash: 1412526313 m_PrefName: Preview_InspectorPreview m_LastInspectedObjectInstanceID: -1 diff --git a/UserSettings/Layouts/default-6000.dwlt b/UserSettings/Layouts/default-6000.dwlt index 220c1bb..8986e8f 100644 --- a/UserSettings/Layouts/default-6000.dwlt +++ b/UserSettings/Layouts/default-6000.dwlt @@ -19,7 +19,7 @@ MonoBehaviour: width: 1920 height: 997 m_ShowMode: 4 - m_Title: Hierarchy + m_Title: Scene m_RootView: {fileID: 2} m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} @@ -118,7 +118,7 @@ MonoBehaviour: m_MinSize: {x: 500, y: 100} m_MaxSize: {x: 40480, y: 16192} vertical: 1 - controlID: 183 + controlID: 191 draggingID: 0 --- !u!114 &6 MonoBehaviour: @@ -144,7 +144,7 @@ MonoBehaviour: m_MinSize: {x: 500, y: 100} m_MaxSize: {x: 40480, y: 16192} vertical: 0 - controlID: 184 + controlID: 192 draggingID: 0 --- !u!114 &7 MonoBehaviour: @@ -165,12 +165,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1253 + width: 1608 height: 941 m_MinSize: {x: 400, y: 100} m_MaxSize: {x: 32384, y: 16192} vertical: 1 - controlID: 153 + controlID: 161 draggingID: 0 --- !u!114 &8 MonoBehaviour: @@ -193,12 +193,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1253 - height: 554 + width: 1608 + height: 578 m_MinSize: {x: 400, y: 50} m_MaxSize: {x: 32384, y: 8096} vertical: 0 - controlID: 75 + controlID: 90 draggingID: 0 --- !u!114 &9 MonoBehaviour: @@ -217,8 +217,8 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 265 - height: 554 + width: 413 + height: 578 m_MinSize: {x: 201, y: 226} m_MaxSize: {x: 4001, y: 4026} m_ActualView: {fileID: 18} @@ -241,10 +241,10 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 265 + x: 413 y: 0 - width: 768 - height: 554 + width: 722 + height: 578 m_MinSize: {x: 102, y: 126} m_MaxSize: {x: 4002, y: 4026} m_ActualView: {fileID: 19} @@ -267,10 +267,10 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 1033 + x: 1135 y: 0 - width: 120 - height: 554 + width: 345 + height: 578 m_MinSize: {x: 102, y: 126} m_MaxSize: {x: 4002, y: 4026} m_ActualView: {fileID: 17} @@ -293,10 +293,10 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 1153 + x: 1480 y: 0 - width: 100 - height: 554 + width: 128 + height: 578 m_MinSize: {x: 102, y: 126} m_MaxSize: {x: 4002, y: 4026} m_ActualView: {fileID: 20} @@ -322,13 +322,13 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 554 - width: 1253 - height: 387 + y: 578 + width: 1608 + height: 363 m_MinSize: {x: 200, y: 50} m_MaxSize: {x: 16192, y: 8096} vertical: 0 - controlID: 154 + controlID: 162 draggingID: 0 --- !u!114 &14 MonoBehaviour: @@ -347,8 +347,8 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 629 - height: 387 + width: 837 + height: 363 m_MinSize: {x: 231, y: 276} m_MaxSize: {x: 10001, y: 10026} m_ActualView: {fileID: 21} @@ -371,10 +371,10 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 629 + x: 837 y: 0 - width: 624 - height: 387 + width: 771 + height: 363 m_MinSize: {x: 102, y: 126} m_MaxSize: {x: 4002, y: 4026} m_ActualView: {fileID: 22} @@ -397,9 +397,9 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 1253 + x: 1608 y: 0 - width: 667 + width: 312 height: 941 m_MinSize: {x: 276, y: 126} m_MaxSize: {x: 4001, y: 4026} @@ -429,10 +429,10 @@ MonoBehaviour: m_TextWithWhitespace: "Game\u200B" m_Pos: serializedVersion: 2 - x: 1034 + x: 1136 y: 24 - width: 118 - height: 528 + width: 343 + height: 552 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -474,7 +474,7 @@ MonoBehaviour: m_VAllowExceedBaseRangeMin: 1 m_VAllowExceedBaseRangeMax: 1 m_ScaleWithWindow: 0 - m_HSlider: 0 + m_HSlider: 1 m_VSlider: 0 m_IgnoreScrollWheelUntilClicked: 0 m_EnableMouseInput: 1 @@ -486,23 +486,23 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 21 - width: 118 - height: 507 - m_Scale: {x: 0.030729167, y: 0.030729167} - m_Translation: {x: 59, y: 253.5} + width: 343 + height: 531 + m_Scale: {x: 0.11881512, y: 0.11881512} + m_Translation: {x: 163.07335, y: 265.5} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 m_MarginBottom: 0 m_LastShownAreaInsideMargins: serializedVersion: 2 - x: -1920 - y: -8249.491 - width: 3840 - height: 16498.982 + x: -1372.4967 + y: -2234.5642 + width: 2886.8381 + height: 4469.1284 m_MinimalGUI: 1 - m_defaultScale: 0.030729167 - m_LastWindowPixelSize: {x: 118, y: 528} + m_defaultScale: 0.08932292 + m_LastWindowPixelSize: {x: 343, y: 552} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 01000000000000000000 @@ -532,8 +532,8 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 24 - width: 264 - height: 528 + width: 412 + height: 552 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -550,7 +550,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: c234f1fff63af1ff70eff5ff7eeff5ff260bf6ffa00bf6ffae0bf6ffae0ef6ffbc0ef6ff0845f9ff1645f9ffe61cfeff9a35feffe238feff9651feff0692feff2a92feff3092feff4492feff56b1feff0acafefffccafeffc2cffeffd2cffeffd6cffeff1cd1feff24d1feff94d2feff9cd2feffc6d2feff0cd4feff14d4feff62d5feff68d5feff70d5feffeed7fefff4d7feff08d8feff1cdbfeffc80fffff0217ffffb62ffffffe32ffffb24bffffe688ffffec88ffff0089ffffcaa4ffff26c2ffff36c2ffff3cc2ffff0afbffffaa9c00005aa1000094a80000e4aa000080ae00008ab100009ab1000028b2000088b40000c2b4000046b50000c8b600007ebb0000a4bb00001abd00000ac00000d0c00000fac100008ec7000034c80000a4ca0000cecb000006ce0000f2ce0000 + m_ExpandedIDs: 527d2afe607d2afe6ebd32febcc537fecac537fe9c886dfeaa886dfee6b47ffef4b47ffe34b1a4fe42b1a4fefeb53bff0cb63bff604f3cffa84a64ffb64a64ff96da6bff8e5fa3ff2c91a3ff4091a3ff5091a3ff5691a3ff6c91a3ff846dc2ff926dc2ff5ab2ddff6eb2ddff7eb2ddff84b2ddff64b6e5ff62cdebff3200ffffd209ffffe609fffff609fffffc09ffffd041ffffcc42fffffe48ffff0a4bffff06fbffffaaa6000068ab000096b30000b2c00000e0c10000bac4000010c90000c8cc0000aecf000088d30000d6da0000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -596,10 +596,10 @@ MonoBehaviour: m_TextWithWhitespace: "Scene\u200B" m_Pos: serializedVersion: 2 - x: 266 + x: 414 y: 24 - width: 766 - height: 528 + width: 720 + height: 552 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -614,12 +614,12 @@ MonoBehaviour: displayed: 1 id: Tool Settings index: 0 - contents: '{"m_Layout":1,"m_Collapsed":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":24.0,"y":-24.0},"m_SnapOffsetDelta":{"x":0.0,"y":0.0},"m_FloatingSnapCorner":2,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' + contents: '{"m_Layout":1,"m_Collapsed":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":-187.0,"y":-24.0},"m_SnapOffsetDelta":{"x":0.0,"y":0.0},"m_FloatingSnapCorner":3,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' floating: 0 collapsed: 0 - snapOffset: {x: 24, y: -24} + snapOffset: {x: -187, y: -24} snapOffsetDelta: {x: 0, y: 0} - snapCorner: 2 + snapCorner: 3 layout: 1 size: {x: 0, y: 0} sizeOverridden: 0 @@ -1059,7 +1059,7 @@ MonoBehaviour: sizeOverridden: 0 m_ContainerData: - containerId: overlay-toolbar__top - scrollOffset: 27 + scrollOffset: 0 - containerId: overlay-toolbar__left scrollOffset: 0 - containerId: overlay-container--left @@ -1084,9 +1084,9 @@ MonoBehaviour: m_AudioPlay: 0 m_DebugDrawModesUseInteractiveLightBakingData: 0 m_Position: - m_Target: {x: 11.0107, y: 9.7778, z: 7.5220566} + m_Target: {x: 30.08455, y: 10.310582, z: -10.408478} speed: 2 - m_Value: {x: 11.0107, y: 9.7778, z: 7.5220566} + m_Value: {x: 30.08455, y: 10.310582, z: -10.408478} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -1132,20 +1132,20 @@ MonoBehaviour: m_GridAxis: 1 m_gridOpacity: 0.5 m_Rotation: - m_Target: {x: 0.16529064, y: -0.7567191, z: 0.20974568, w: 0.59681594} + m_Target: {x: 0.018437939, y: -0.96893644, z: 0.234387, w: 0.07871986} speed: 2 - m_Value: {x: -0.16528012, y: 0.75667095, z: -0.20973232, w: -0.596778} + m_Value: {x: -0.018435063, y: 0.9687854, z: -0.23435046, w: -0.07870758} m_Size: - m_Target: 20.626644 + m_Target: 0.3666551 speed: 2 - m_Value: 20.626644 + m_Value: 0.3666551 m_Ortho: m_Target: 0 speed: 2 m_Value: 0 m_CameraSettings: - m_Speed: 0.34829998 - m_SpeedNormalized: 0.16999999 + m_Speed: 0.28859997 + m_SpeedNormalized: 0.13999999 m_SpeedMin: 0.01 m_SpeedMax: 2 m_EasingEnabled: 1 @@ -1156,7 +1156,7 @@ MonoBehaviour: m_FarClip: 10000 m_DynamicClip: 1 m_OcclusionCulling: 0 - m_LastSceneViewRotation: {x: -0.08717229, y: 0.89959055, z: -0.21045254, w: -0.3726226} + m_LastSceneViewRotation: {x: 0.12731908, y: -0.6607324, z: 0.11560551, w: 0.7308248} m_LastSceneViewOrtho: 0 m_Viewpoint: m_SceneView: {fileID: 19} @@ -1193,10 +1193,10 @@ MonoBehaviour: m_TextWithWhitespace: "Timeline\u200B" m_Pos: serializedVersion: 2 - x: 1154 + x: 1481 y: 24 - width: 98 - height: 528 + width: 126 + height: 552 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -1240,8 +1240,8 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 24 - width: 628 - height: 361 + width: 836 + height: 337 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -1264,7 +1264,7 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets/GameLogic/Game/Common/Enum + - Packages/com.kybernetik.animancer m_Globs: [] m_ProductIds: m_AnyWithAssetOrigin: 0 @@ -1274,16 +1274,16 @@ MonoBehaviour: m_ViewMode: 1 m_StartGridSize: 64 m_LastFolders: - - Assets/GameLogic/Game/Common/Enum + - Packages/com.kybernetik.animancer m_LastFoldersGridSize: -1 m_LastProjectPath: D:\UGit\AK056 m_LockTracker: m_IsLocked: 0 m_FolderTreeState: - scrollPos: {x: 0, y: 65} - m_SelectedIDs: 921f0100 - m_LastClickedID: 73618 - m_ExpandedIDs: 00000000841e0100861e0100881e01008a1e01008c1e01008e1e0100901e0100921e0100941e0100961e0100981e01009a1e01009c1e01009e1e0100a01e0100a21e01003a1f010000ca9a3bffffff7f + scrollPos: {x: 0, y: 691} + m_SelectedIDs: 06260100 + m_LastClickedID: 75270 + m_ExpandedIDs: 000000000425010006250100082501000a2501000c2501000e25010010250100122501001425010016250100182501001a2501001c2501001e250100202501002225010024250100262501002825010000ca9a3bffffff7f m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1312,7 +1312,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 00000000841e0100861e0100881e01008a1e01008c1e01008e1e0100901e0100921e0100941e0100961e0100981e01009a1e01009c1e01009e1e0100a01e0100a21e0100 + m_ExpandedIDs: 000000000425010006250100082501000a2501000c2501000e25010010250100122501001425010016250100182501001a2501001c2501001e2501002025010022250100242501002625010028250100 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1391,10 +1391,10 @@ MonoBehaviour: m_TextWithWhitespace: "Console\u200B" m_Pos: serializedVersion: 2 - x: 630 + x: 838 y: 24 - width: 622 - height: 361 + width: 769 + height: 337 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -1427,9 +1427,9 @@ MonoBehaviour: m_TextWithWhitespace: "Inspector\u200B" m_Pos: serializedVersion: 2 - x: 1254 + x: 1609 y: 24 - width: 666 + width: 311 height: 915 m_SerializedDataModeController: m_DataMode: 0