完成堆垛机装货和卸货
This commit is contained in:
parent
d243ef6e3b
commit
2657b3b1d0
File diff suppressed because one or more lines are too long
@ -54,6 +54,22 @@ namespace GameLogic
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
if (Input.GetKeyDown(KeyCode.T))
|
||||
{
|
||||
try
|
||||
{
|
||||
Debug.LogWarning("取货03-01-02");
|
||||
var co = _containerInfos["03-01-02"];
|
||||
co.shelf.UnLoadTest(co);
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
Debug.LogWarning("货物不存在");
|
||||
throw;
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -68,6 +68,28 @@ namespace GameLogic
|
||||
|
||||
}
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// 取货
|
||||
/// </summary>
|
||||
public void UnLoadTest(ContainerInfo container)
|
||||
{
|
||||
Debug.LogWarning("取货成功");
|
||||
_currentContainerInfo = container;
|
||||
Transform station = null;
|
||||
foreach (var stationT in _stations.Values)
|
||||
{
|
||||
// var containerPrefab = Resources.Load<GameObject>(AssetLocationSetting.ContainerPath);
|
||||
// GameObject go = Instantiate(containerPrefab);
|
||||
// container.container = go;
|
||||
// go.SetTransformNoScale(stationT);
|
||||
station = stationT;
|
||||
}
|
||||
_shelfMachineToolActor.UnLoad(station,container,_shelfConfig);
|
||||
|
||||
}
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// 判断这个货物是否包含这个组内
|
||||
/// </summary>
|
||||
|
||||
@ -12,34 +12,45 @@ namespace GameLogic
|
||||
public class ShelfMachineToolActor : Actor
|
||||
{
|
||||
[ShowInInspector,ReadOnly]private BehaviourTreeOwner _behaviourTreeOwner;
|
||||
[ShowInInspector,ReadOnly]public ShelfToolActionType _actionType = ShelfToolActionType.None;
|
||||
[ShowInInspector,ReadOnly]private ShelfToolActionType _actionType = ShelfToolActionType.None;
|
||||
|
||||
[ShowInInspector,ReadOnly] public float _moveSpeed = 5;
|
||||
[ShowInInspector,ReadOnly] public float _moveSeconds = 0;
|
||||
[ShowInInspector] public So_ShelfConfig _shelfconfig = null;
|
||||
[ShowInInspector,ReadOnly] private float _moveSpeed = 200;
|
||||
[ShowInInspector,ReadOnly] private float _moveSeconds = 0;
|
||||
|
||||
|
||||
[Title("外部赋值参数")]
|
||||
[ShowInInspector,ReadOnly] private So_ShelfConfig _shelfconfig = null;
|
||||
[ShowInInspector,ReadOnly] private ShelfRowAnimData _shelfRowAnimData = null;
|
||||
[ShowInInspector,ReadOnly]private Transform _station;
|
||||
[ShowInInspector,ReadOnly]private ContainerInfo _currentContainerInfo;
|
||||
|
||||
[Title("私有参数")]
|
||||
[ShowInInspector,ReadOnly] private bool _isPlayingAnim = false;
|
||||
[ShowInInspector,ReadOnly] private ShelfRowAnimData _shelfRowAnimData = null;
|
||||
[ShowInInspector,ReadOnly] private Transform _containerPlaceToolParent = null;
|
||||
[LabelText("堆垛机拿取货物动画上偏移"),ShowInInspector,ReadOnly] public float _loadPickUpOffest = 0.2F;
|
||||
[LabelText("堆垛机放下货物动画下偏移"),ShowInInspector,ReadOnly] public float _loadPutDownOffest = 0.2F;
|
||||
[LabelText("堆垛机卸货拿取货物动画上偏移"),ShowInInspector,ReadOnly] public float _UnloadPickUpOffest = 0.2F;
|
||||
[LabelText("堆垛机卸货放下货物动画下偏移"),ShowInInspector,ReadOnly] public float _UnloadPutDownOffest = 0.2F;
|
||||
[ShowInInspector] private Vector3 _initPosition;
|
||||
[ShowInInspector,ReadOnly]private bool _isRunning = false;
|
||||
[ShowInInspector] private Tween _defaultPosTween;
|
||||
|
||||
[Title("组件参数")]
|
||||
[Title("一些组件参数")]
|
||||
private Transform _caroparent;
|
||||
private Transform _station;
|
||||
private ContainerInfo _currentContainerInfo;
|
||||
private AnimancerComponent _animancer;
|
||||
|
||||
|
||||
[LabelText("堆垛机拿取货物动画上偏移")] public float _upOffest = 0.2F;
|
||||
[LabelText("堆垛机放下货物动画下偏移")] public float _downOffest = -0.2F;
|
||||
[Title("装货行为树参数")]
|
||||
[ShowInInspector,BoxGroup("Load"),ReadOnly]private bool _isEnableArriveStationPositionComplete = false;
|
||||
[ShowInInspector,BoxGroup("Load"),ReadOnly]private bool _isEnablePickUpAnimationComplete = false;
|
||||
[ShowInInspector,BoxGroup("Load"),ReadOnly]private bool _isEnableArriveContainerPositionComplete = false;
|
||||
[ShowInInspector,BoxGroup("Load"),ReadOnly]private bool _isEnablePutDownAnimationComplete = false;
|
||||
|
||||
|
||||
[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;
|
||||
[Title("取货行为树参数")]
|
||||
[ShowInInspector,BoxGroup("UnLoad"),ReadOnly]private bool _isEnableUnLoadArriveContainerPositionComplete = false;
|
||||
[ShowInInspector,BoxGroup("UnLoad"),ReadOnly]private bool _isEnableUnLoadPickUpAnimationComplete = false;
|
||||
[ShowInInspector,BoxGroup("UnLoad"),ReadOnly]private bool _isEnableUnLoadArriveStationPositionComplete = false;
|
||||
[ShowInInspector,BoxGroup("UnLoad"),ReadOnly]private bool _isEnableUnLoadPutDownAnimationComplete = false;
|
||||
protected override void OnLoad()
|
||||
{
|
||||
base.OnLoad();
|
||||
@ -47,6 +58,11 @@ namespace GameLogic
|
||||
_animancer = GetComponent<AnimancerComponent>();
|
||||
_caroparent = transform.Find("Caro-parent").Find("Cargo");
|
||||
_containerPlaceToolParent = _caroparent.Find("fork").Find("k");
|
||||
|
||||
_loadPickUpOffest = 0.1F;
|
||||
_loadPutDownOffest = 0.2F;
|
||||
_UnloadPickUpOffest = 0.08F;
|
||||
_UnloadPutDownOffest = 0.2F;
|
||||
}
|
||||
|
||||
protected override void RegisterEvent()
|
||||
@ -60,131 +76,86 @@ namespace GameLogic
|
||||
// GameEvent.RemoveListener(EventSetting.PlayStretchComplete,PlayLoadStretchComplete);
|
||||
}
|
||||
|
||||
#region 私有公共方法
|
||||
/// <summary>
|
||||
/// 计算速度
|
||||
/// </summary>
|
||||
/// <param name="distance"></param>
|
||||
private void CalculateSpeedSecond(float distance)
|
||||
{
|
||||
_moveSeconds = distance / _moveSpeed;
|
||||
_moveSeconds = distance / (_moveSpeed*Time.deltaTime);
|
||||
}
|
||||
private AnimationEvent[] GetAnimationEvent(string functionName,ToolActionType actionType)
|
||||
{
|
||||
AnimationEvent evt = _shelfRowAnimData.stretch.events[0];
|
||||
evt.functionName = functionName;
|
||||
evt.intParameter = (int)actionType;
|
||||
return new AnimationEvent[] { evt };
|
||||
}
|
||||
private void SetUp(Transform station, ContainerInfo containerInfo, So_ShelfConfig config)
|
||||
{
|
||||
|
||||
_station = station;
|
||||
_currentContainerInfo = containerInfo;
|
||||
_shelfconfig = config;
|
||||
}
|
||||
private void ResetRuntimeParam()
|
||||
{
|
||||
_isPlayingAnim = false;
|
||||
}
|
||||
private void Reset()
|
||||
{
|
||||
_isRunning = false;
|
||||
_isEnableArriveStationPositionComplete = false;
|
||||
_isEnablePickUpAnimationComplete = false;
|
||||
_isEnableArriveContainerPositionComplete = false;
|
||||
_isEnablePutDownAnimationComplete = false;
|
||||
_shelfconfig = null;
|
||||
_shelfRowAnimData = null;
|
||||
_station = null;
|
||||
_currentContainerInfo = null;
|
||||
}
|
||||
|
||||
#region 装货
|
||||
#endregion
|
||||
|
||||
#region 装货
|
||||
/// <summary>
|
||||
/// 装货
|
||||
/// </summary>
|
||||
public void Load(Transform station,ContainerInfo containerInfo,So_ShelfConfig config)
|
||||
{
|
||||
if(_isRunning) return;
|
||||
_actionType = ShelfToolActionType.Load;
|
||||
_station = station;
|
||||
_currentContainerInfo = containerInfo;
|
||||
_shelfconfig = config;
|
||||
SetUp(station, containerInfo, config);
|
||||
_behaviourTreeOwner.StartBehaviour();
|
||||
}
|
||||
|
||||
|
||||
public void ResetParam()
|
||||
{
|
||||
_isPlayingAnim = false;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 第一步移动到初始位置点
|
||||
/// 装货开始
|
||||
/// </summary>
|
||||
/// <returns></returns>
|
||||
public bool InitLoadPositionComplete()
|
||||
public void LoadStart()
|
||||
{
|
||||
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;
|
||||
GameEvent.AddListener(EventSetting.PlayStretchPickUpComplete,PlayLoadStretchPickUpComplete);
|
||||
GameEvent.AddListener(EventSetting.PlayStretchPutDownComplete,PlayLoadStretchPutDownComplete);
|
||||
GameEvent.AddListener(EventSetting.PlayShrinkPickUpComplete,PlayShrinkPickUpComplete);
|
||||
GameEvent.AddListener(EventSetting.PlayShrinkPutDownComplete,PlayShrinkPutDownComplete);
|
||||
_initPosition = transform.position;
|
||||
Tween.StopAll(transform);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 第二部开启装货动画
|
||||
/// 结束装货
|
||||
/// </summary>
|
||||
/// <returns></returns>
|
||||
public bool EnableLoadStartAnimation()
|
||||
public void LoadEnd()
|
||||
{
|
||||
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;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 第三步定位位置
|
||||
/// </summary>
|
||||
/// <returns></returns>
|
||||
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;
|
||||
GameEvent.RemoveListener(EventSetting.PlayStretchPickUpComplete,PlayLoadStretchPickUpComplete);
|
||||
GameEvent.RemoveListener(EventSetting.PlayStretchPutDownComplete,PlayLoadStretchPickUpComplete);
|
||||
GameEvent.RemoveListener(EventSetting.PlayShrinkPickUpComplete,PlayShrinkPickUpComplete);
|
||||
GameEvent.RemoveListener(EventSetting.PlayShrinkPutDownComplete,PlayShrinkPutDownComplete);
|
||||
Reset();
|
||||
Debug.Log("结束装货");
|
||||
}
|
||||
|
||||
|
||||
|
||||
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
|
||||
|
||||
|
||||
@ -193,14 +164,189 @@ namespace GameLogic
|
||||
/// <summary>
|
||||
/// 取货
|
||||
/// </summary>
|
||||
public void UnLoad()
|
||||
public void UnLoad(Transform station,ContainerInfo containerInfo,So_ShelfConfig config)
|
||||
{
|
||||
if(_isRunning) return;
|
||||
_actionType = ShelfToolActionType.UnLoad;
|
||||
SetUp(station, containerInfo, config);
|
||||
_behaviourTreeOwner.StartBehaviour();
|
||||
}
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// 1: 取货开始
|
||||
/// </summary>
|
||||
public void UnLoadStart()
|
||||
{
|
||||
GameEvent.AddListener(EventSetting.PlayStretchPickUpComplete,PlayUnLoadStretchPickUpComplete);
|
||||
GameEvent.AddListener(EventSetting.PlayStretchPutDownComplete, PlayUnLoadStretchPutDownComplete);
|
||||
GameEvent.AddListener(EventSetting.PlayShrinkPickUpComplete,PlayShrinkPickUpComplete);
|
||||
GameEvent.AddListener(EventSetting.PlayShrinkPutDownComplete,PlayShrinkPutDownComplete);
|
||||
_initPosition = transform.position;
|
||||
Tween.StopAll(transform);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 6：取货结束
|
||||
/// </summary>
|
||||
public void UnLoadEnd()
|
||||
{
|
||||
GameEvent.RemoveListener(EventSetting.PlayStretchPickUpComplete,PlayUnLoadStretchPickUpComplete);
|
||||
GameEvent.RemoveListener(EventSetting.PlayStretchPutDownComplete, PlayUnLoadStretchPutDownComplete);
|
||||
GameEvent.RemoveListener(EventSetting.PlayShrinkPickUpComplete,PlayShrinkPickUpComplete);
|
||||
GameEvent.RemoveListener(EventSetting.PlayShrinkPutDownComplete,PlayShrinkPutDownComplete);
|
||||
Reset();
|
||||
Debug.Log("结束卸货");
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region 装货卸货（拿取卸下动画）
|
||||
private void PlayLoadStretchPickUpComplete(object data)
|
||||
{
|
||||
Debug.Log("伸动画完成");
|
||||
_currentContainerInfo.container.SetParent(_containerPlaceToolParent);
|
||||
Tween.LocalPosition(_currentContainerInfo.container.transform, Vector3.zero, 0.1f);
|
||||
Tween.PositionY(_caroparent, _caroparent.transform.position.y+_loadPickUpOffest, 1f).OnComplete(() =>
|
||||
{
|
||||
_shelfRowAnimData.shrink.events = GetAnimationEvent("PlayShrinkComplete",ToolActionType.PickUp);
|
||||
_animancer.Play(_shelfRowAnimData.shrink);
|
||||
});
|
||||
}
|
||||
|
||||
private void PlayLoadStretchPutDownComplete(object data)
|
||||
{
|
||||
Debug.Log("开始放置动画");
|
||||
//Tween.LocalPosition(_currentContainerInfo.container.transform, Vector3.zero, 0.1f);
|
||||
Tween.PositionY(_caroparent, _caroparent.transform.position.y - _loadPutDownOffest + 0.08f, 1f).OnComplete(() =>
|
||||
{
|
||||
_currentContainerInfo.container.gameObject.SetParent(_currentContainerInfo.mapContainer.transform);
|
||||
_shelfRowAnimData.shrink.events = GetAnimationEvent("PlayShrinkComplete",ToolActionType.PutDown);
|
||||
_animancer.Play(_shelfRowAnimData.shrink);
|
||||
});
|
||||
}
|
||||
|
||||
private void PlayUnLoadStretchPickUpComplete(object data)
|
||||
{
|
||||
Debug.Log("伸动画完成");
|
||||
_currentContainerInfo.container.SetParent(_containerPlaceToolParent);
|
||||
Tween.LocalPosition(_currentContainerInfo.container.transform, Vector3.zero, 0.1f);
|
||||
Tween.PositionY(_caroparent, _caroparent.transform.position.y+_loadPickUpOffest, 1f).OnComplete(() =>
|
||||
{
|
||||
_shelfRowAnimData.shrink.events = GetAnimationEvent("PlayShrinkComplete",ToolActionType.PickUp);
|
||||
_animancer.Play(_shelfRowAnimData.shrink);
|
||||
});
|
||||
}
|
||||
|
||||
private void PlayUnLoadStretchPutDownComplete(object data)
|
||||
{
|
||||
Debug.Log("开始放置动画");
|
||||
//Tween.LocalPosition(_currentContainerInfo.container.transform, Vector3.zero, 0.1f);
|
||||
Tween.PositionY(_caroparent, _caroparent.transform.position.y - _loadPutDownOffest + 0.08f, 1f).OnComplete(() =>
|
||||
{
|
||||
_currentContainerInfo.container.gameObject.SetParent(_currentContainerInfo.mapContainer.transform);
|
||||
_shelfRowAnimData.shrink.events = GetAnimationEvent("PlayShrinkComplete",ToolActionType.PutDown);
|
||||
_animancer.Play(_shelfRowAnimData.shrink);
|
||||
});
|
||||
}
|
||||
#endregion
|
||||
#region 公共动画事件
|
||||
|
||||
public void PlayShrinkPickUpComplete(object data)
|
||||
{
|
||||
_isEnablePickUpAnimationComplete = true;
|
||||
ResetRuntimeParam();
|
||||
}
|
||||
public void PlayShrinkPutDownComplete(object data)
|
||||
{
|
||||
_isEnablePutDownAnimationComplete= true;
|
||||
ResetRuntimeParam();
|
||||
}
|
||||
|
||||
#endregion
|
||||
#region 公共行为步骤
|
||||
|
||||
/// <summary>
|
||||
/// 步骤: 移动到站台位置
|
||||
/// </summary>
|
||||
/// <returns></returns>
|
||||
public bool EnableArriveStationPositionComplete(float offest)
|
||||
{
|
||||
_isRunning = true;
|
||||
if (_isEnableArriveStationPositionComplete) return true;
|
||||
if (!_isPlayingAnim)
|
||||
{
|
||||
_isPlayingAnim = true;
|
||||
CalculateSpeedSecond(Vector3.Distance(transform.position, _station.position));
|
||||
Tween.PositionX(transform, _station.position.x, _moveSeconds,Ease.Linear).OnComplete(()=>
|
||||
{
|
||||
Debug.Log("到达站点位置");
|
||||
_isEnableArriveStationPositionComplete = true;
|
||||
ResetRuntimeParam();
|
||||
});
|
||||
Tween.PositionY(_caroparent, _station.position.y + offest, _moveSeconds, Ease.Linear);
|
||||
}
|
||||
return _isEnableArriveStationPositionComplete;
|
||||
}
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// 步骤: 开启装货动画
|
||||
/// </summary>
|
||||
/// <returns></returns>
|
||||
public bool EnableLoadPickUpAnimation()
|
||||
{
|
||||
if (_isEnablePickUpAnimationComplete) return true;
|
||||
if (!_isPlayingAnim)
|
||||
{
|
||||
Debug.Log("开始装货");
|
||||
_isPlayingAnim = true;
|
||||
_shelfRowAnimData = _shelfconfig.GetAnimaData(DataUtility.GetRow(_station.name));
|
||||
_shelfRowAnimData.stretch.events = GetAnimationEvent("PlayStretchComplete",ToolActionType.PickUp);
|
||||
_animancer.Play(_shelfRowAnimData.stretch);
|
||||
}
|
||||
return _isEnablePickUpAnimationComplete;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 步骤：移动到容器位置
|
||||
/// </summary>
|
||||
/// <returns></returns>
|
||||
public bool EnableArriveContainerPosition(float offest)
|
||||
{
|
||||
if (_isEnableArriveContainerPositionComplete) return true;
|
||||
if (!_isPlayingAnim)
|
||||
{
|
||||
_isPlayingAnim = true;
|
||||
CalculateSpeedSecond(Vector3.Distance(transform.position,_currentContainerInfo.mapContainer.transform.position));
|
||||
Debug.Log($"移动时间{_moveSeconds}");
|
||||
Tween.PositionX(transform, _currentContainerInfo.mapContainer.transform.position.x, _moveSeconds,Ease.Linear).OnComplete(()=>
|
||||
{
|
||||
Debug.Log("到达货物放置位置");
|
||||
_isEnableArriveContainerPositionComplete = true;
|
||||
ResetRuntimeParam();
|
||||
});
|
||||
Tween.PositionY(_caroparent, _currentContainerInfo.mapContainer.transform.position.y + offest, _moveSeconds, Ease.Linear);
|
||||
}
|
||||
return _isEnableArriveContainerPositionComplete;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 步骤：启动放货动画
|
||||
/// </summary>
|
||||
/// <param name="actionType"></param>
|
||||
/// <returns></returns>
|
||||
public bool EnableLoadPutDownAnimation()
|
||||
{
|
||||
if (_isEnablePutDownAnimationComplete) return true;
|
||||
if (!_isPlayingAnim)
|
||||
{
|
||||
_isPlayingAnim = true;
|
||||
_shelfRowAnimData.stretch.events = GetAnimationEvent("PlayStretchComplete",ToolActionType.PutDown);
|
||||
_animancer.Play(_shelfRowAnimData.stretch);
|
||||
}
|
||||
return _isEnablePutDownAnimationComplete;
|
||||
}
|
||||
#endregion
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@ -31,10 +31,32 @@ namespace GameLogic
|
||||
}
|
||||
}
|
||||
|
||||
public void PlayShrinkComplete()
|
||||
public void PlayShrinkComplete(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.PlayShrinkPickUpComplete);
|
||||
break;
|
||||
case ToolActionType.PutDown:
|
||||
GameEvent.Send(EventSetting.PlayShrinkPutDownComplete);
|
||||
break;
|
||||
default:
|
||||
Debug.LogWarning($"Unhandled ToolActionType: {action}");
|
||||
break;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
Debug.LogWarning($"Invalid ToolActionType value: {data}");
|
||||
}
|
||||
Debug.Log("Ëõ¶¯»Íê³É");
|
||||
|
||||
GameEvent.Send(EventSetting.PlayShrinkComplete);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@ -1,4 +1,5 @@
|
||||
using UnityEngine;
|
||||
using PrimeTween;
|
||||
using UnityEngine;
|
||||
|
||||
namespace GameLogic
|
||||
{
|
||||
@ -29,5 +30,10 @@ namespace GameLogic
|
||||
{
|
||||
self.transform.SetParent(parent);
|
||||
}
|
||||
public static void SetParentLocalPositionZero(this GameObject self, Transform parent)
|
||||
{
|
||||
self.transform.SetParent(parent);
|
||||
Tween.LocalPosition(self.transform, Vector3.zero, 0.5f);
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -4,6 +4,9 @@
|
||||
{
|
||||
public static readonly string PlayStretchPickUpComplete = "PlayStretchPickUpComplete";
|
||||
public static readonly string PlayStretchPutDownComplete = "PlayStretchPutDownComplete";
|
||||
public static readonly string PlayShrinkComplete = "PlayShrinkComplete";
|
||||
|
||||
public static readonly string PlayShrinkPickUpComplete = "PlayShrinkPickUpComplete";
|
||||
public static readonly string PlayShrinkPutDownComplete = "PlayShrinkPutDownComplete";
|
||||
|
||||
}
|
||||
}
|
||||
@ -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.000058218837}
|
||||
m_AnchoredPosition: {x: 0, y: 0.0006180698}
|
||||
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.059602156, y: -0.8828924, z: 0.116679616, w: -0.45092642}
|
||||
m_LocalPosition: {x: 21.895561, y: 26.234213, z: 22.103218}
|
||||
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_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: 1
|
||||
m_Size: 0.999477
|
||||
m_NumberOfSteps: 0
|
||||
m_OnValueChanged:
|
||||
m_PersistentCalls:
|
||||
|
||||
@ -23,7 +23,7 @@ MonoBehaviour:
|
||||
m_MinSize: {x: 500, y: 100}
|
||||
m_MaxSize: {x: 40480, y: 16192}
|
||||
vertical: 1
|
||||
controlID: 47
|
||||
controlID: 159
|
||||
draggingID: 0
|
||||
--- !u!114 &2
|
||||
MonoBehaviour:
|
||||
@ -33,23 +33,23 @@ MonoBehaviour:
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 0}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 12015, guid: 0000000000000000e000000000000000, type: 0}
|
||||
m_EditorHideFlags: 1
|
||||
m_Script: {fileID: 12003, guid: 0000000000000000e000000000000000, type: 0}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_MinSize: {x: 100, y: 100}
|
||||
m_MaxSize: {x: 4000, y: 4000}
|
||||
m_TitleContent:
|
||||
m_Text: Game
|
||||
m_Image: {fileID: -6423792434712278376, guid: 0000000000000000d000000000000000, type: 0}
|
||||
m_Text: Console
|
||||
m_Image: {fileID: -4327648978806127646, guid: 0000000000000000d000000000000000, type: 0}
|
||||
m_Tooltip:
|
||||
m_TextWithWhitespace: "Game\u200B"
|
||||
m_TextWithWhitespace: "Console\u200B"
|
||||
m_Pos:
|
||||
serializedVersion: 2
|
||||
x: 718
|
||||
y: 79
|
||||
width: 379
|
||||
height: 691
|
||||
x: 697
|
||||
y: 620
|
||||
width: 643
|
||||
height: 374
|
||||
m_SerializedDataModeController:
|
||||
m_DataMode: 0
|
||||
m_PreferredDataMode: 0
|
||||
@ -61,71 +61,6 @@ MonoBehaviour:
|
||||
m_SaveData: []
|
||||
m_ContainerData: []
|
||||
m_OverlaysVisible: 1
|
||||
m_SerializedViewNames: []
|
||||
m_SerializedViewValues: []
|
||||
m_PlayModeViewName: GameView
|
||||
m_ShowGizmos: 0
|
||||
m_TargetDisplay: 0
|
||||
m_ClearColor: {r: 0, g: 0, b: 0, a: 0}
|
||||
m_TargetSize: {x: 3840, y: 2160}
|
||||
m_TextureFilterMode: 0
|
||||
m_TextureHideFlags: 61
|
||||
m_RenderIMGUI: 1
|
||||
m_EnterPlayModeBehavior: 0
|
||||
m_UseMipMap: 0
|
||||
m_VSyncEnabled: 0
|
||||
m_Gizmos: 0
|
||||
m_Stats: 0
|
||||
m_SelectedSizes: 06000000000000000000000000000000000000000000000000000000000000000000000000000000
|
||||
m_ZoomArea:
|
||||
m_HRangeLocked: 0
|
||||
m_VRangeLocked: 0
|
||||
hZoomLockedByDefault: 0
|
||||
vZoomLockedByDefault: 0
|
||||
m_HBaseRangeMin: -1920
|
||||
m_HBaseRangeMax: 1920
|
||||
m_VBaseRangeMin: -1080
|
||||
m_VBaseRangeMax: 1080
|
||||
m_HAllowExceedBaseRangeMin: 1
|
||||
m_HAllowExceedBaseRangeMax: 1
|
||||
m_VAllowExceedBaseRangeMin: 1
|
||||
m_VAllowExceedBaseRangeMax: 1
|
||||
m_ScaleWithWindow: 0
|
||||
m_HSlider: 0
|
||||
m_VSlider: 0
|
||||
m_IgnoreScrollWheelUntilClicked: 0
|
||||
m_EnableMouseInput: 0
|
||||
m_EnableSliderZoomHorizontal: 0
|
||||
m_EnableSliderZoomVertical: 0
|
||||
m_UniformScale: 1
|
||||
m_UpDirection: 1
|
||||
m_DrawArea:
|
||||
serializedVersion: 2
|
||||
x: 0
|
||||
y: 21
|
||||
width: 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
|
||||
m_MarginBottom: 0
|
||||
m_LastShownAreaInsideMargins:
|
||||
serializedVersion: 2
|
||||
x: -1920
|
||||
y: -3394.1953
|
||||
width: 3840
|
||||
height: 6788.3906
|
||||
m_MinimalGUI: 1
|
||||
m_defaultScale: 0.098697916
|
||||
m_LastWindowPixelSize: {x: 379, y: 691}
|
||||
m_ClearInEditMode: 1
|
||||
m_NoCameraWarning: 1
|
||||
m_LowResolutionForAspectRatios: 01000000000000000000
|
||||
m_XRRenderMode: 0
|
||||
m_RenderTexture: {fileID: 0}
|
||||
m_showToolbar: 1
|
||||
--- !u!114 &3
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 52
|
||||
@ -150,7 +85,7 @@ MonoBehaviour:
|
||||
m_MinSize: {x: 500, y: 100}
|
||||
m_MaxSize: {x: 40480, y: 16192}
|
||||
vertical: 0
|
||||
controlID: 48
|
||||
controlID: 160
|
||||
draggingID: 0
|
||||
--- !u!114 &4
|
||||
MonoBehaviour:
|
||||
@ -166,17 +101,17 @@ MonoBehaviour:
|
||||
m_EditorClassIdentifier:
|
||||
m_Children:
|
||||
- {fileID: 5}
|
||||
- {fileID: 13}
|
||||
- {fileID: 14}
|
||||
m_Position:
|
||||
serializedVersion: 2
|
||||
x: 0
|
||||
y: 0
|
||||
width: 1252
|
||||
width: 1342
|
||||
height: 941
|
||||
m_MinSize: {x: 400, y: 100}
|
||||
m_MaxSize: {x: 32384, y: 16192}
|
||||
vertical: 1
|
||||
controlID: 49
|
||||
controlID: 161
|
||||
draggingID: 0
|
||||
--- !u!114 &5
|
||||
MonoBehaviour:
|
||||
@ -194,17 +129,17 @@ MonoBehaviour:
|
||||
- {fileID: 6}
|
||||
- {fileID: 8}
|
||||
- {fileID: 10}
|
||||
- {fileID: 11}
|
||||
- {fileID: 12}
|
||||
m_Position:
|
||||
serializedVersion: 2
|
||||
x: 0
|
||||
y: 0
|
||||
width: 1252
|
||||
height: 717
|
||||
width: 1342
|
||||
height: 541
|
||||
m_MinSize: {x: 400, y: 50}
|
||||
m_MaxSize: {x: 32384, y: 8096}
|
||||
vertical: 0
|
||||
controlID: 50
|
||||
controlID: 59
|
||||
draggingID: 0
|
||||
--- !u!114 &6
|
||||
MonoBehaviour:
|
||||
@ -223,10 +158,10 @@ MonoBehaviour:
|
||||
serializedVersion: 2
|
||||
x: 0
|
||||
y: 0
|
||||
width: 321
|
||||
height: 717
|
||||
m_MinSize: {x: 200, y: 200}
|
||||
m_MaxSize: {x: 4000, y: 4000}
|
||||
width: 341
|
||||
height: 541
|
||||
m_MinSize: {x: 201, y: 226}
|
||||
m_MaxSize: {x: 4001, y: 4026}
|
||||
m_ActualView: {fileID: 7}
|
||||
m_Panes:
|
||||
- {fileID: 7}
|
||||
@ -255,8 +190,8 @@ MonoBehaviour:
|
||||
serializedVersion: 2
|
||||
x: 0
|
||||
y: 79
|
||||
width: 320
|
||||
height: 691
|
||||
width: 340
|
||||
height: 515
|
||||
m_SerializedDataModeController:
|
||||
m_DataMode: 0
|
||||
m_PreferredDataMode: 0
|
||||
@ -270,10 +205,10 @@ MonoBehaviour:
|
||||
m_OverlaysVisible: 1
|
||||
m_SceneHierarchy:
|
||||
m_TreeViewState:
|
||||
scrollPos: {x: 0, y: 1730}
|
||||
m_SelectedIDs: f4087bfe
|
||||
scrollPos: {x: 0, y: 780}
|
||||
m_SelectedIDs: 7caa0000
|
||||
m_LastClickedID: 0
|
||||
m_ExpandedIDs: e6b47ffef4b47ffe34b1a4fe42b1a4fefeb53bff0cb63bff604f3cffa84a64ffb64a64ff96da6bff8e5fa3ff2c91a3ff4091a3ff5091a3ff5691a3ff6c91a3ff846dc2ff926dc2ff5ab2ddff6eb2ddff7eb2ddff84b2ddff64b6e5ff62cdebff3200ffffd209ffffe609fffff609fffffc09ffffd041ffffcc42fffffe48ffff0a4bffff06fbffffaaa6000068ab0000b2c00000e0c10000bac4000010c90000c8cc0000aecf000004d500009cd60000d6da0000
|
||||
m_ExpandedIDs: 5443daff6243daff0293feff1693feff2893feff4893feff54cbfeff58cbfeff4cccfeff06fbffffdec60000e4ca00003acf0000c4dc0000
|
||||
m_RenameOverlay:
|
||||
m_UserAcceptedRename: 0
|
||||
m_Name:
|
||||
@ -313,12 +248,12 @@ MonoBehaviour:
|
||||
m_Children: []
|
||||
m_Position:
|
||||
serializedVersion: 2
|
||||
x: 321
|
||||
x: 341
|
||||
y: 0
|
||||
width: 397
|
||||
height: 717
|
||||
m_MinSize: {x: 100, y: 100}
|
||||
m_MaxSize: {x: 4000, y: 4000}
|
||||
width: 561
|
||||
height: 541
|
||||
m_MinSize: {x: 102, y: 126}
|
||||
m_MaxSize: {x: 4002, y: 4026}
|
||||
m_ActualView: {fileID: 9}
|
||||
m_Panes:
|
||||
- {fileID: 9}
|
||||
@ -345,10 +280,10 @@ MonoBehaviour:
|
||||
m_TextWithWhitespace: "Scene\u200B"
|
||||
m_Pos:
|
||||
serializedVersion: 2
|
||||
x: 321
|
||||
x: 341
|
||||
y: 79
|
||||
width: 395
|
||||
height: 691
|
||||
width: 559
|
||||
height: 515
|
||||
m_SerializedDataModeController:
|
||||
m_DataMode: 0
|
||||
m_PreferredDataMode: 0
|
||||
@ -833,9 +768,9 @@ MonoBehaviour:
|
||||
m_AudioPlay: 0
|
||||
m_DebugDrawModesUseInteractiveLightBakingData: 0
|
||||
m_Position:
|
||||
m_Target: {x: 31.27479, y: 10.917541, z: -11.026852}
|
||||
m_Target: {x: 28.024916, y: 5.7644134, z: -9.9908285}
|
||||
speed: 2
|
||||
m_Value: {x: 31.27479, y: 10.917541, z: -11.026852}
|
||||
m_Value: {x: 28.024916, y: 5.7644134, z: -9.9908285}
|
||||
m_RenderMode: 0
|
||||
m_CameraMode:
|
||||
drawMode: 0
|
||||
@ -881,13 +816,13 @@ MonoBehaviour:
|
||||
m_GridAxis: 1
|
||||
m_gridOpacity: 0.5
|
||||
m_Rotation:
|
||||
m_Target: {x: 0.20840421, y: -0.5749407, z: 0.15515602, w: 0.77603394}
|
||||
m_Target: {x: 0.03983221, y: -0.58761424, z: 0.029870179, w: 0.8078217}
|
||||
speed: 2
|
||||
m_Value: {x: 0.20837389, y: -0.574857, z: 0.15513344, w: 0.775921}
|
||||
m_Value: {x: 0.041036524, y: -0.5874674, z: 0.030746657, w: 0.80762166}
|
||||
m_Size:
|
||||
m_Target: 0.29763865
|
||||
m_Target: 1.1572351
|
||||
speed: 2
|
||||
m_Value: 0.29763865
|
||||
m_Value: 1.1572351
|
||||
m_Ortho:
|
||||
m_Target: 0
|
||||
speed: 2
|
||||
@ -936,18 +871,119 @@ MonoBehaviour:
|
||||
m_Children: []
|
||||
m_Position:
|
||||
serializedVersion: 2
|
||||
x: 718
|
||||
x: 902
|
||||
y: 0
|
||||
width: 381
|
||||
height: 717
|
||||
width: 330
|
||||
height: 541
|
||||
m_MinSize: {x: 102, y: 126}
|
||||
m_MaxSize: {x: 4002, y: 4026}
|
||||
m_ActualView: {fileID: 2}
|
||||
m_ActualView: {fileID: 11}
|
||||
m_Panes:
|
||||
- {fileID: 2}
|
||||
- {fileID: 11}
|
||||
m_Selected: 0
|
||||
m_LastSelected: 0
|
||||
--- !u!114 &11
|
||||
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: 12015, guid: 0000000000000000e000000000000000, type: 0}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_MinSize: {x: 100, y: 100}
|
||||
m_MaxSize: {x: 4000, y: 4000}
|
||||
m_TitleContent:
|
||||
m_Text: Game
|
||||
m_Image: {fileID: -6423792434712278376, guid: 0000000000000000d000000000000000, type: 0}
|
||||
m_Tooltip:
|
||||
m_TextWithWhitespace: "Game\u200B"
|
||||
m_Pos:
|
||||
serializedVersion: 2
|
||||
x: 902
|
||||
y: 79
|
||||
width: 328
|
||||
height: 515
|
||||
m_SerializedDataModeController:
|
||||
m_DataMode: 0
|
||||
m_PreferredDataMode: 0
|
||||
m_SupportedDataModes:
|
||||
isAutomatic: 1
|
||||
m_ViewDataDictionary: {fileID: 0}
|
||||
m_OverlayCanvas:
|
||||
m_LastAppliedPresetName: Default
|
||||
m_SaveData: []
|
||||
m_ContainerData: []
|
||||
m_OverlaysVisible: 1
|
||||
m_SerializedViewNames: []
|
||||
m_SerializedViewValues: []
|
||||
m_PlayModeViewName: GameView
|
||||
m_ShowGizmos: 0
|
||||
m_TargetDisplay: 0
|
||||
m_ClearColor: {r: 0, g: 0, b: 0, a: 0}
|
||||
m_TargetSize: {x: 3840, y: 2160}
|
||||
m_TextureFilterMode: 0
|
||||
m_TextureHideFlags: 61
|
||||
m_RenderIMGUI: 1
|
||||
m_EnterPlayModeBehavior: 0
|
||||
m_UseMipMap: 0
|
||||
m_VSyncEnabled: 0
|
||||
m_Gizmos: 0
|
||||
m_Stats: 0
|
||||
m_SelectedSizes: 06000000000000000000000000000000000000000000000000000000000000000000000000000000
|
||||
m_ZoomArea:
|
||||
m_HRangeLocked: 0
|
||||
m_VRangeLocked: 0
|
||||
hZoomLockedByDefault: 0
|
||||
vZoomLockedByDefault: 0
|
||||
m_HBaseRangeMin: -1920
|
||||
m_HBaseRangeMax: 1920
|
||||
m_VBaseRangeMin: -1080
|
||||
m_VBaseRangeMax: 1080
|
||||
m_HAllowExceedBaseRangeMin: 1
|
||||
m_HAllowExceedBaseRangeMax: 1
|
||||
m_VAllowExceedBaseRangeMin: 1
|
||||
m_VAllowExceedBaseRangeMax: 1
|
||||
m_ScaleWithWindow: 0
|
||||
m_HSlider: 0
|
||||
m_VSlider: 0
|
||||
m_IgnoreScrollWheelUntilClicked: 0
|
||||
m_EnableMouseInput: 1
|
||||
m_EnableSliderZoomHorizontal: 0
|
||||
m_EnableSliderZoomVertical: 0
|
||||
m_UniformScale: 1
|
||||
m_UpDirection: 1
|
||||
m_DrawArea:
|
||||
serializedVersion: 2
|
||||
x: 0
|
||||
y: 21
|
||||
width: 328
|
||||
height: 494
|
||||
m_Scale: {x: 0.08541667, y: 0.08541667}
|
||||
m_Translation: {x: 164, y: 247}
|
||||
m_MarginLeft: 0
|
||||
m_MarginRight: 0
|
||||
m_MarginTop: 0
|
||||
m_MarginBottom: 0
|
||||
m_LastShownAreaInsideMargins:
|
||||
serializedVersion: 2
|
||||
x: -1920
|
||||
y: -2891.7073
|
||||
width: 3840
|
||||
height: 5783.4146
|
||||
m_MinimalGUI: 1
|
||||
m_defaultScale: 0.08541667
|
||||
m_LastWindowPixelSize: {x: 328, y: 515}
|
||||
m_ClearInEditMode: 1
|
||||
m_NoCameraWarning: 1
|
||||
m_LowResolutionForAspectRatios: 01000000000000000000
|
||||
m_XRRenderMode: 0
|
||||
m_RenderTexture: {fileID: 0}
|
||||
m_showToolbar: 1
|
||||
--- !u!114 &12
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 52
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
@ -962,18 +998,18 @@ MonoBehaviour:
|
||||
m_Children: []
|
||||
m_Position:
|
||||
serializedVersion: 2
|
||||
x: 1099
|
||||
x: 1232
|
||||
y: 0
|
||||
width: 153
|
||||
height: 717
|
||||
width: 110
|
||||
height: 541
|
||||
m_MinSize: {x: 102, y: 126}
|
||||
m_MaxSize: {x: 4002, y: 4026}
|
||||
m_ActualView: {fileID: 12}
|
||||
m_ActualView: {fileID: 13}
|
||||
m_Panes:
|
||||
- {fileID: 12}
|
||||
- {fileID: 13}
|
||||
m_Selected: 0
|
||||
m_LastSelected: 0
|
||||
--- !u!114 &12
|
||||
--- !u!114 &13
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 52
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
@ -994,10 +1030,10 @@ MonoBehaviour:
|
||||
m_TextWithWhitespace: "Timeline\u200B"
|
||||
m_Pos:
|
||||
serializedVersion: 2
|
||||
x: 1099
|
||||
x: 1232
|
||||
y: 79
|
||||
width: 151
|
||||
height: 691
|
||||
width: 108
|
||||
height: 515
|
||||
m_SerializedDataModeController:
|
||||
m_DataMode: 0
|
||||
m_PreferredDataMode: 0
|
||||
@ -1018,7 +1054,7 @@ MonoBehaviour:
|
||||
m_SequencePath:
|
||||
m_SelectionRoot: 0
|
||||
m_SubElements: []
|
||||
--- !u!114 &13
|
||||
--- !u!114 &14
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 52
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
@ -1031,20 +1067,20 @@ MonoBehaviour:
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Children:
|
||||
- {fileID: 14}
|
||||
- {fileID: 16}
|
||||
- {fileID: 15}
|
||||
- {fileID: 17}
|
||||
m_Position:
|
||||
serializedVersion: 2
|
||||
x: 0
|
||||
y: 717
|
||||
width: 1252
|
||||
height: 224
|
||||
y: 541
|
||||
width: 1342
|
||||
height: 400
|
||||
m_MinSize: {x: 200, y: 50}
|
||||
m_MaxSize: {x: 16192, y: 8096}
|
||||
vertical: 0
|
||||
controlID: 154
|
||||
controlID: 162
|
||||
draggingID: 0
|
||||
--- !u!114 &14
|
||||
--- !u!114 &15
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 52
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
@ -1061,16 +1097,16 @@ MonoBehaviour:
|
||||
serializedVersion: 2
|
||||
x: 0
|
||||
y: 0
|
||||
width: 525
|
||||
height: 224
|
||||
width: 697
|
||||
height: 400
|
||||
m_MinSize: {x: 231, y: 276}
|
||||
m_MaxSize: {x: 10001, y: 10026}
|
||||
m_ActualView: {fileID: 15}
|
||||
m_ActualView: {fileID: 16}
|
||||
m_Panes:
|
||||
- {fileID: 15}
|
||||
- {fileID: 16}
|
||||
m_Selected: 0
|
||||
m_LastSelected: 0
|
||||
--- !u!114 &15
|
||||
--- !u!114 &16
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 52
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
@ -1092,9 +1128,9 @@ MonoBehaviour:
|
||||
m_Pos:
|
||||
serializedVersion: 2
|
||||
x: 0
|
||||
y: 796
|
||||
width: 524
|
||||
height: 198
|
||||
y: 620
|
||||
width: 696
|
||||
height: 374
|
||||
m_SerializedDataModeController:
|
||||
m_DataMode: 0
|
||||
m_PreferredDataMode: 0
|
||||
@ -1133,27 +1169,27 @@ MonoBehaviour:
|
||||
m_LockTracker:
|
||||
m_IsLocked: 0
|
||||
m_FolderTreeState:
|
||||
scrollPos: {x: 0, y: 830}
|
||||
m_SelectedIDs: d6a01900
|
||||
m_LastClickedID: 1679574
|
||||
m_ExpandedIDs: 00000000841e0100861e0100881e01008a1e01008c1e0100901e0100941e0100961e0100981e01009a1e01009c1e01009e1e0100a01e0100a21e01002e1f0100341f0100361f0100381f0100701f01003419120000ca9a3bffffff7f
|
||||
scrollPos: {x: 0, y: 654}
|
||||
m_SelectedIDs: 06260100
|
||||
m_LastClickedID: 75270
|
||||
m_ExpandedIDs: 000000000425010006250100082501000a2501000c2501000e25010010250100122501001425010016250100182501001a2501001c2501001e2501002025010022250100242501002625010028250100c425010000ca9a3bffffff7f
|
||||
m_RenameOverlay:
|
||||
m_UserAcceptedRename: 0
|
||||
m_Name: Fonts
|
||||
m_OriginalName: Fonts
|
||||
m_Name:
|
||||
m_OriginalName:
|
||||
m_EditFieldRect:
|
||||
serializedVersion: 2
|
||||
x: 0
|
||||
y: 0
|
||||
width: 0
|
||||
height: 0
|
||||
m_UserData: 1185918
|
||||
m_UserData: 0
|
||||
m_IsWaitingForDelay: 0
|
||||
m_IsRenaming: 0
|
||||
m_OriginalEventType: 0
|
||||
m_OriginalEventType: 11
|
||||
m_IsRenamingFilename: 1
|
||||
m_TrimLeadingAndTrailingWhitespace: 0
|
||||
m_ClientGUIView: {fileID: 14}
|
||||
m_ClientGUIView: {fileID: 15}
|
||||
m_SearchString:
|
||||
m_CreateAssetUtility:
|
||||
m_EndAction: {fileID: 0}
|
||||
@ -1165,7 +1201,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:
|
||||
@ -1191,8 +1227,8 @@ MonoBehaviour:
|
||||
m_Icon: {fileID: 0}
|
||||
m_ResourceFile:
|
||||
m_ListAreaState:
|
||||
m_SelectedInstanceIDs: f4087bfe
|
||||
m_LastClickedInstanceID: -25491212
|
||||
m_SelectedInstanceIDs: 7caa0000
|
||||
m_LastClickedInstanceID: 43644
|
||||
m_HadKeyboardFocusLastEvent: 1
|
||||
m_ExpandedInstanceIDs: c6230000901d0600d2510500a2a305008ea0050010cb010044a200007e69000004a5780076d9790094da7900e0590400383d04002871000000000000
|
||||
m_RenameOverlay:
|
||||
@ -1211,7 +1247,7 @@ MonoBehaviour:
|
||||
m_OriginalEventType: 11
|
||||
m_IsRenamingFilename: 1
|
||||
m_TrimLeadingAndTrailingWhitespace: 0
|
||||
m_ClientGUIView: {fileID: 14}
|
||||
m_ClientGUIView: {fileID: 15}
|
||||
m_CreateAssetUtility:
|
||||
m_EndAction: {fileID: 0}
|
||||
m_InstanceID: 0
|
||||
@ -1223,7 +1259,7 @@ MonoBehaviour:
|
||||
m_GridSize: 64
|
||||
m_SkipHiddenPackages: 0
|
||||
m_DirectoriesAreaWidth: 287
|
||||
--- !u!114 &16
|
||||
--- !u!114 &17
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 52
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
@ -1238,53 +1274,17 @@ MonoBehaviour:
|
||||
m_Children: []
|
||||
m_Position:
|
||||
serializedVersion: 2
|
||||
x: 525
|
||||
x: 697
|
||||
y: 0
|
||||
width: 727
|
||||
height: 224
|
||||
width: 645
|
||||
height: 400
|
||||
m_MinSize: {x: 102, y: 126}
|
||||
m_MaxSize: {x: 4002, y: 4026}
|
||||
m_ActualView: {fileID: 17}
|
||||
m_ActualView: {fileID: 2}
|
||||
m_Panes:
|
||||
- {fileID: 17}
|
||||
- {fileID: 2}
|
||||
m_Selected: 0
|
||||
m_LastSelected: 0
|
||||
--- !u!114 &17
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 52
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 0}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 1
|
||||
m_Script: {fileID: 12003, guid: 0000000000000000e000000000000000, type: 0}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_MinSize: {x: 100, y: 100}
|
||||
m_MaxSize: {x: 4000, y: 4000}
|
||||
m_TitleContent:
|
||||
m_Text: Console
|
||||
m_Image: {fileID: -4327648978806127646, guid: 0000000000000000d000000000000000, type: 0}
|
||||
m_Tooltip:
|
||||
m_TextWithWhitespace: "Console\u200B"
|
||||
m_Pos:
|
||||
serializedVersion: 2
|
||||
x: 525
|
||||
y: 796
|
||||
width: 725
|
||||
height: 198
|
||||
m_SerializedDataModeController:
|
||||
m_DataMode: 0
|
||||
m_PreferredDataMode: 0
|
||||
m_SupportedDataModes:
|
||||
isAutomatic: 1
|
||||
m_ViewDataDictionary: {fileID: 0}
|
||||
m_OverlayCanvas:
|
||||
m_LastAppliedPresetName: Default
|
||||
m_SaveData: []
|
||||
m_ContainerData: []
|
||||
m_OverlaysVisible: 1
|
||||
--- !u!114 &18
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 52
|
||||
@ -1300,9 +1300,9 @@ MonoBehaviour:
|
||||
m_Children: []
|
||||
m_Position:
|
||||
serializedVersion: 2
|
||||
x: 1252
|
||||
x: 1342
|
||||
y: 0
|
||||
width: 668
|
||||
width: 578
|
||||
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: 1252
|
||||
x: 1342
|
||||
y: 79
|
||||
width: 667
|
||||
width: 577
|
||||
height: 915
|
||||
m_SerializedDataModeController:
|
||||
m_DataMode: 0
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user