WXDC-DT/AK056
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

接入后台数据

Browse Source
This commit is contained in:
SnowShow 2025-05-10 15:07:53 +08:00
parent e03ed1cc33
commit 0e625781ed
30 changed files with 724 additions and 251 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Assets/AssetRaw/Resources/YCLZT.prefab
View File

@ -28,15 +28,15 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1463875728381155855}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: -0.24723434, z: 0.00069999695}
m_LocalPosition: {x: 29.905596, y: 5.2858033, z: -11.171248}
m_LocalScale: {x: 40, y: 40, z: 40}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 1979337017449765378}
- {fileID: 1738210822441970718}
m_Father: {fileID: 0}
m_RootOrder: -1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!33 &1243910439156176604
MeshFilter:
@ -63,6 +63,9 @@ MeshRenderer:
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
m_RayTraceProcedural: 0
m_RayTracingAccelStructBuildFlagsOverride: 0
m_RayTracingAccelStructBuildFlags: 1
m_SmallMeshCulling: 1
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
@ -191,13 +194,13 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3974195268925661852}
serializedVersion: 2
m_LocalRotation: {x: 0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1979337017449765378}
m_RootOrder: -1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!33 &1645298029397508805
MeshFilter:
@ -224,6 +227,9 @@ MeshRenderer:
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
m_RayTraceProcedural: 0
m_RayTracingAccelStructBuildFlagsOverride: 0
m_RayTracingAccelStructBuildFlags: 1
m_SmallMeshCulling: 1
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
@ -294,13 +300,13 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4083658423770177791}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 2796289093211776686}
m_RootOrder: -1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &5625827281408904982
GameObject:
@ -326,6 +332,7 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5625827281408904982}
serializedVersion: 2
m_LocalRotation: {x: 0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -0, y: 0.00673, z: 0}
m_LocalScale: {x: 0.9, y: 0.9, z: 0.9}
@ -333,7 +340,6 @@ Transform:
m_Children:
- {fileID: 2331976593730317526}
m_Father: {fileID: 2796289093211776686}
m_RootOrder: -1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!64 &2819274301053293605
MeshCollider:

6
Assets/AssetRaw/model/prefab/原材料立库 Variant.prefab
View File

@ -150167,7 +150167,7 @@ PrefabInstance:
addedObject: {fileID: 6092765321511910216}
- targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: a8fcb4c823a21fb40ba82978968e1c21, type: 3}
insertIndex: -1
addedObject: {fileID: 3084122142851895118}
addedObject: {fileID: 1167612482395007229}
m_SourcePrefab: {fileID: 100100000, guid: a8fcb4c823a21fb40ba82978968e1c21, type: 3}
--- !u!4 &4816128638542576846 stripped
Transform:
@ -150193,7 +150193,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
_id: 0
_shelfConfig: {fileID: 0}
--- !u!114 &3084122142851895118
--- !u!114 &1167612482395007229
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@ -150202,7 +150202,7 @@ MonoBehaviour:
m_GameObject: {fileID: 5304540892573083252}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 20e0d00e57698f84887368e168629083, type: 3}
m_Script: {fileID: 11500000, guid: 74772396b9124a22bffa41331fef4cf7, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1001 &5956433743207170642

9
Assets/GameLogic/Game/Common/Enum/DevelopMode.cs Normal file
View File

@ -0,0 +1,9 @@
namespace GameLogic
{
public enum DevelopMode
{
Release,
Develop,
Behavior
}
}

3
Assets/GameLogic/Game/Common/Enum/DevelopMode.cs.meta Normal file
View File

@ -0,0 +1,3 @@
fileFormatVersion: 2
guid: 4a99e2d97abd4f3a961ad2d8dd23edcd
timeCreated: 1746852581

12
Assets/GameLogic/Game/Core/Actor/ActorMgr.cs
View File

@ -93,8 +93,16 @@ namespace GameLogic
int row = int.Parse(groups[0]);
int column = int.Parse(groups[1]);
int layer = int.Parse(groups[2]);
var containerInfo = ContainerFactory.CreateInfo(obj, GetShelfBySort(row), row, column, layer);
_containerInfos.Add(obj.name, containerInfo);
try
{
var containerInfo = ContainerFactory.CreateInfo(obj, GetShelfBySort(row), row, column, layer);
_containerInfos.Add(obj.name, containerInfo);
}
catch (Exception e)
{
continue;
}
}
}
}

210
Assets/GameLogic/Game/Core/Actor/ShelfActor.cs
View File

@ -1,53 +1,67 @@
using System.Collections.Generic;
using System.Linq;
using Sirenix.OdinInspector;
using UnityEngine;
using UnityEngine.Serialization;
namespace GameLogic
{
public class ShelfActor : Actor
{
[LabelText("配置文件"), ShowInInspector] public So_ShelfConfig _shelfConfig;
[LabelText("货物所属工具组"), ShowInInspector]
public Dictionary<string, Transform> _stations = new Dictionary<string, Transform>();
[LabelText("容器信息"), ShowInInspector]
public Dictionary<string, ContainerInfo> _containerInfos = new Dictionary<string, ContainerInfo>();
[ShowInInspector] private ContainerInfo _currentContainerInfo = null;
private ShelfMachineToolActor _shelfMachineTool;
[LabelText("配置文件"),ShowInInspector] public So_ShelfConfig _shelfConfig;
[LabelText("货物所属工具组"),ShowInInspector] public Dictionary<string,Transform> _stations = new Dictionary<string, Transform>();
[ShowInInspector]private ContainerInfo _currentContainerInfo = null;
private ShelfMachineToolActor _shelfMachineToolActor;
protected override void OnLoad()
{
base.OnLoad();
_shelfConfig = Resources.Load<So_ShelfConfig>(AssetLocationSetting.SoSelfConfig + _id);
_shelfMachineToolActor = GetComponentInChildren<ShelfMachineToolActor>();
_shelfMachineTool = GetComponentInChildren<ShelfMachineToolActor>();
InitStations();
}
public void AddContainerInfo(string postion, ContainerInfo containerInfo)
{
if (!_containerInfos.ContainsKey(postion))
{
_containerInfos.Add(postion, containerInfo);
}
}
/// <summary>
/// 初始化装取货站台数据
/// </summary>
private void InitStations()
{
var stations = GameObject.FindGameObjectsWithTag(TagSetting.ShelfStation);
Debug.Log(stations.Length);
foreach (var stationGo in stations)
{
var stationData = stationGo.name.Split('-');
int row = int.Parse(stationData[0]);
int column = int.Parse(stationData[1]);
int layer = int.Parse(stationData[2]);
if (!IsContainGroup(row)) continue;
_stations.Add(stationGo.name,stationGo.transform);
}
var stations = GameObject.FindGameObjectsWithTag(TagSetting.ShelfStation);
Debug.Log(stations.Length);
foreach (var stationGo in stations)
{
var stationData = stationGo.name.Split('-');
int row = int.Parse(stationData[0]);
int column = int.Parse(stationData[1]);
int layer = int.Parse(stationData[2]);
if (!IsContainGroup(row)) continue;
_stations.Add(stationGo.name, stationGo.transform);
}
}
/// <summary>
/// 取货
/// </summary>
public void LoadContainer(string station,GameObject container,ContainerInfo coInfo)
public void LoadContainer(string station, GameObject container, ContainerInfo coInfo)
{
}
/// <summary>
/// 装货
/// </summary>
@ -62,15 +76,14 @@ namespace GameLogic
GameObject go = Instantiate(containerPrefab);
container.container = go;
go.SetTransformNoScale(stationT);
station = stationT;
}
_shelfMachineToolActor.Load(station,container,_shelfConfig);
_shelfMachineTool.Load(station, container, _shelfConfig);
}
/// <summary>
/// 取货
/// </summary>
@ -87,11 +100,11 @@ namespace GameLogic
// go.SetTransformNoScale(stationT);
station = stationT;
}
_shelfMachineToolActor.UnLoad(station,container,_shelfConfig);
_shelfMachineTool.UnLoad(station, container, _shelfConfig);
}
/// <summary>
/// 判断这个货物是否包含这个组内
/// </summary>
@ -102,8 +115,133 @@ namespace GameLogic
return _shelfConfig.groups.Contains(group);
}
public string GetRandomStation()
{
var keys = _stations.Keys.ToList(); // 转换为 List 才能索引访问
var station = keys[Random.Range(0, keys.Count)];
return station;
}
public string GetRandomContainer()
{
var keys = _containerInfos.Keys.ToList(); // 转换为 List 才能索引访问
var container = keys[Random.Range(0, keys.Count)];
return container;
}
#region 堆垛机指令
/// <summary>
/// 堆垛机移动指令
/// </summary>
public void ExecuteStackerMovePosition(StackerData stackerData)
{
if (stackerData.toRow == 0 && stackerData.toColumn == 0 && stackerData.toLayer == 0) return;
var position = DataUtility.GetPosition(stackerData.toRow, stackerData.toColumn, stackerData.toLayer);
if (_lastPosition == position ) return;
if (_stations.ContainsKey(position))
{
_shelfMachineTool.SetUpStation(_stations[position], _shelfConfig);
var offest = stackerData.frontForkHasGoods
? _shelfMachineTool._UnloadPutDownOffest
: _shelfMachineTool._loadPickUpOffest;
_shelfMachineTool.EnableArriveStationPositionComplete(offest);
_lastPosition = position;
return;
}
if (_containerInfos.ContainsKey(position))
{
_shelfMachineTool.SetUpContainer(_containerInfos[position], _shelfConfig);
var offest = stackerData.frontForkHasGoods
? _shelfMachineTool._loadPutDownOffest
: _shelfMachineTool._UnloadPickUpOffest;
_shelfMachineTool.EnableArriveContainerPosition(offest);
_lastPosition = position;
return;
}
Debug.Log($"{_shelfConfig.deviceCode} 不存在 这个位置信息 {position}");
}
public bool _isRunningStretch = false;
[FormerlySerializedAs("lastPosition")] public string _lastPosition = "";
public void ExecuteStretchAmination(StackerData stackerData)
{
switch (stackerData.frontForkAction)
{
case StackerForkActionEnum.ForkRest:
_isRunningStretch = false;
break;
case StackerForkActionEnum.LeftExtendFork:
if (!_isRunningStretch)
{
HandlerAnimation(stackerData);
}
_isRunningStretch = true;
break;
case StackerForkActionEnum.LeftRetractFork:
break;
case StackerForkActionEnum.RightExtendFork:
if (!_isRunningStretch)
{
HandlerAnimation(stackerData);
}
_isRunningStretch = true;
break;
case StackerForkActionEnum.RightRetractFork:
break;
}
}
private void HandlerAnimation(StackerData stackerData)
{
//var containerGo = ContainersManage.Instance.GetContainerByCode(stackerData.frontContainerCode).gameObject;
var position = DataUtility.GetPosition(stackerData.toRow, stackerData.toColumn, stackerData.toLayer);
GameObject containerGo = null;
Debug.Log("伸位置"+position);
if (_stations.ContainsKey(position) && stackerData.frontForkHasGoods) //目标点是站点 且堆垛机上有货 卸货
{
_shelfMachineTool.RemoveUnLoadListener();
_shelfMachineTool.AddUnLoadListener();
_shelfMachineTool.EnableLoadPutDownAnimation(position);
}
else if (_stations.ContainsKey(position) && !stackerData.frontForkHasGoods) //目标点是站点 且堆垛机上无货 装货
{
_shelfMachineTool.RemoveLoadListener();
_shelfMachineTool.AddLoadListener();
containerGo = ContainersManage.Instance.GetTestContainer(_stations[position].position);
_shelfMachineTool.EnableLoadPickUpAnimation(position);
_shelfMachineTool.SetUpContainerGo(containerGo);
}
else if (_containerInfos.ContainsKey(position) && stackerData.frontForkHasGoods) //目标点是容器点 且堆垛机上有货
{
_shelfMachineTool.RemoveLoadListener();
_shelfMachineTool.AddLoadListener();
_shelfMachineTool.EnableLoadPutDownAnimation(position);
//containerGo = ContainersManage.Instance.GetTestContainer(_containerInfos[position].mapContainer.transform.position);
}
else if (_containerInfos.ContainsKey(position) && !stackerData.frontForkHasGoods) //目标点是容器点 且堆垛机上无货 卸货
{
containerGo = ContainersManage.Instance.GetTestContainer(_containerInfos[position].mapContainer.transform.position);
var co =_containerInfos[position];
co.container = containerGo;
_shelfMachineTool.SetUpContainer(co,_shelfConfig);
_shelfMachineTool.SetUpContainerGo(containerGo);
_shelfMachineTool.RemoveUnLoadListener();
_shelfMachineTool.AddUnLoadListener();
_shelfMachineTool.EnableLoadPickUpAnimation(position);
}
}
#endregion
}
}
}

234
Assets/GameLogic/Game/Core/Actor/ShelfMachineToolActor.cs
View File

@ -44,6 +44,11 @@ namespace GameLogic
[ShowInInspector,BoxGroup("Load"),ReadOnly]private bool _isEnablePickUpAnimationComplete = false;
[ShowInInspector,BoxGroup("Load"),ReadOnly]private bool _isEnableArriveContainerPositionComplete = false;
[ShowInInspector,BoxGroup("Load"),ReadOnly]private bool _isEnablePutDownAnimationComplete = false;
[ShowInInspector]private GameObject _containerGo;
public DevelopMode _developMode = DevelopMode.Release;
protected override void OnLoad()
{
@ -69,7 +74,7 @@ namespace GameLogic
{
// GameEvent.RemoveListener(EventSetting.PlayStretchComplete,PlayLoadStretchComplete);
}
#region 私有公共方法
/// <summary>
/// 计算速度
@ -88,11 +93,24 @@ namespace GameLogic
}
private void SetUp(Transform station, ContainerInfo containerInfo, So_ShelfConfig config)
{
_station = station;
_currentContainerInfo = containerInfo;
_shelfconfig = config;
}
public void SetUpStation(Transform station,So_ShelfConfig config)
{
_station = station;
//_currentContainerInfo = containerInfo;
_shelfconfig = config;
}
public void SetUpContainer(ContainerInfo containerInfo,So_ShelfConfig config)
{
//_station = station;
_currentContainerInfo = containerInfo;
_shelfconfig = config;
}
private void ResetRuntimeParam()
{
_isPlayingAnim = false;
@ -110,6 +128,11 @@ namespace GameLogic
_currentContainerInfo = null;
}
public void SetUpContainerGo(GameObject containerGo)
{
_containerGo = containerGo;
}
#endregion
#region 装货
@ -128,22 +151,18 @@ namespace GameLogic
/// </summary>
public void LoadStart()
{
GameEvent.AddListener(EventSetting.PlayStretchPickUpComplete,PlayLoadStretchPickUpComplete);
GameEvent.AddListener(EventSetting.PlayStretchPutDownComplete,PlayLoadStretchPutDownComplete);
GameEvent.AddListener(EventSetting.PlayShrinkPickUpComplete,PlayShrinkPickUpComplete);
GameEvent.AddListener(EventSetting.PlayShrinkPutDownComplete,PlayShrinkPutDownComplete);
AddLoadListener();
_initPosition = transform.position;
Tween.StopAll(transform);
}
/// <summary>
/// 结束装货
/// </summary>
public void LoadEnd()
{
GameEvent.RemoveListener(EventSetting.PlayStretchPickUpComplete,PlayLoadStretchPickUpComplete);
GameEvent.RemoveListener(EventSetting.PlayStretchPutDownComplete,PlayLoadStretchPickUpComplete);
GameEvent.RemoveListener(EventSetting.PlayShrinkPickUpComplete,PlayShrinkPickUpComplete);
GameEvent.RemoveListener(EventSetting.PlayShrinkPutDownComplete,PlayShrinkPutDownComplete);
RemoveLoadListener();
Reset();
Debug.Log("结束装货");
}
@ -172,34 +191,39 @@ namespace GameLogic
/// </summary>
public void UnLoadStart()
{
GameEvent.AddListener(EventSetting.PlayStretchPickUpComplete,PlayUnLoadStretchPickUpComplete);
GameEvent.AddListener(EventSetting.PlayStretchPutDownComplete, PlayUnLoadStretchPutDownComplete);
GameEvent.AddListener(EventSetting.PlayShrinkPickUpComplete,PlayShrinkPickUpComplete);
GameEvent.AddListener(EventSetting.PlayShrinkPutDownComplete,PlayShrinkPutDownComplete);
AddUnLoadListener();
_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);
RemoveUnLoadListener();
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);
if (_containerGo != null)
{
_containerGo.SetParent(_containerPlaceToolParent);
}
else
{
_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);
@ -213,16 +237,50 @@ namespace GameLogic
//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);
if (_developMode == DevelopMode.Release)
{
if (_containerGo != null)
{
_containerGo.SetParent(_currentContainerInfo.mapContainer.transform);
}
else
{
var go = _containerPlaceToolParent.GetComponentInChildren<Container>().gameObject;
go?.SetParent(_currentContainerInfo.mapContainer.transform);
}
}
else
{
if (_containerGo != null)
{
_containerGo.SetParent(_currentContainerInfo.mapContainer.transform);
}
else
{
_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);
if (_containerGo != null)
{
_containerGo.SetParent(_containerPlaceToolParent);
}
else
{
_currentContainerInfo.container.SetParent(_containerPlaceToolParent);
}
Tween.LocalPosition(_currentContainerInfo.container.transform, Vector3.zero, 0.1f);
Tween.PositionY(_caroparent, _caroparent.transform.position.y+_loadPickUpOffest, 1f).OnComplete(() =>
{
@ -237,23 +295,58 @@ namespace GameLogic
//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);
if (_developMode == DevelopMode.Release)
{
if (_containerGo != null)
{
_containerGo.SetParent(_currentContainerInfo.mapContainer.transform);
}
else
{
var go = _containerPlaceToolParent.GetComponentInChildren<Container>().gameObject;
go?.SetParent(_currentContainerInfo.mapContainer.transform);
}
}
else
{
if (_containerGo != null)
{
_containerGo.SetParent(_currentContainerInfo.mapContainer.transform);
}
else
{
_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();
DevelopLoadPickUpParam();
if (_developMode == DevelopMode.Release)
{
_isEnablePickUpAnimationComplete = false;
}
}
public void PlayShrinkPutDownComplete(object data)
{
_isEnablePutDownAnimationComplete= true;
ResetRuntimeParam();
DevelopLoadPutDownParam();
if (_developMode == DevelopMode.Release)
{
_isEnablePutDownAnimationComplete = false;
}
}
#endregion
@ -273,11 +366,19 @@ namespace GameLogic
CalculateSpeedSecond(Vector3.Distance(transform.position, _station.position));
Tween.PositionX(transform, _station.position.x, _moveSeconds,Ease.Linear).OnComplete(()=>
{
Debug.Log("µ½´ïÕ¾µãλÖÃ");
_isEnableArriveStationPositionComplete = true;
// _isEnableArriveStationPositionComplete = true;
ResetRuntimeParam();
});
Tween.PositionY(_caroparent, _station.position.y + offest, _moveSeconds, Ease.Linear);
Tween.PositionY(_caroparent, _station.position.y + offest, _moveSeconds, Ease.Linear).OnComplete(() =>
{
Debug.Log("µ½´ïÕ¾µãλÖÃ");
if (_developMode == DevelopMode.Release)
{
_isEnableArriveStationPositionComplete = false;
}
});
}
return _isEnableArriveStationPositionComplete;
}
@ -287,14 +388,21 @@ namespace GameLogic
/// 步骤: 开启装货动画
/// </summary>
/// <returns></returns>
public bool EnableLoadPickUpAnimation()
public bool EnableLoadPickUpAnimation(string position ="")
{
if (_isEnablePickUpAnimationComplete) return true;
if (!_isPlayingAnim)
{
Debug.Log("开始装货");
_isPlayingAnim = true;
_shelfRowAnimData = _shelfconfig.GetAnimaData(DataUtility.GetRow(_station.name));
if (position.Length > 0)
{
_shelfRowAnimData = _shelfconfig.GetAnimaData(DataUtility.GetRow(position));
}
else
{
_shelfRowAnimData = _shelfconfig.GetAnimaData(DataUtility.GetRow(_station.name));
}
_shelfRowAnimData.stretch.events = GetAnimationEvent("PlayStretchComplete",ToolActionType.PickUp);
_animancer.Play(_shelfRowAnimData.stretch);
}
@ -316,7 +424,11 @@ namespace GameLogic
Tween.PositionX(transform, _currentContainerInfo.mapContainer.transform.position.x, _moveSeconds,Ease.Linear).OnComplete(()=>
{
Debug.Log("到达货物放置位置");
_isEnableArriveContainerPositionComplete = true;
if (_developMode == DevelopMode.Release)
{
_isEnableArriveContainerPositionComplete = false;
}
ResetRuntimeParam();
});
Tween.PositionY(_caroparent, _currentContainerInfo.mapContainer.transform.position.y + offest, _moveSeconds, Ease.Linear);
@ -329,18 +441,76 @@ namespace GameLogic
/// </summary>
/// <param name="actionType"></param>
/// <returns></returns>
public bool EnableLoadPutDownAnimation()
public bool EnableLoadPutDownAnimation(string position = "")
{
if (_isEnablePutDownAnimationComplete) return true;
if (!_isPlayingAnim)
{
_isPlayingAnim = true;
if (position.Length > 0)
{
_shelfRowAnimData = _shelfconfig.GetAnimaData(DataUtility.GetRow(position));
}
else
{
_shelfRowAnimData = _shelfconfig.GetAnimaData(DataUtility.GetRow(_station.name));
}
_shelfRowAnimData.stretch.events = GetAnimationEvent("PlayStretchComplete",ToolActionType.PutDown);
_animancer.Play(_shelfRowAnimData.stretch);
}
return _isEnablePutDownAnimationComplete;
}
#endregion
#region ʼþ
public void AddLoadListener()
{
GameEvent.AddListener(EventSetting.PlayStretchPickUpComplete,PlayLoadStretchPickUpComplete);
GameEvent.AddListener(EventSetting.PlayStretchPutDownComplete,PlayLoadStretchPutDownComplete);
GameEvent.AddListener(EventSetting.PlayShrinkPickUpComplete,PlayShrinkPickUpComplete);
GameEvent.AddListener(EventSetting.PlayShrinkPutDownComplete,PlayShrinkPutDownComplete);
}
public void RemoveLoadListener()
{
GameEvent.RemoveListener(EventSetting.PlayStretchPickUpComplete,PlayLoadStretchPickUpComplete);
GameEvent.RemoveListener(EventSetting.PlayStretchPutDownComplete,PlayLoadStretchPutDownComplete);
GameEvent.RemoveListener(EventSetting.PlayShrinkPickUpComplete,PlayShrinkPickUpComplete);
GameEvent.RemoveListener(EventSetting.PlayShrinkPutDownComplete,PlayShrinkPutDownComplete);
}
public void AddUnLoadListener()
{
GameEvent.AddListener(EventSetting.PlayStretchPickUpComplete,PlayUnLoadStretchPickUpComplete);
GameEvent.AddListener(EventSetting.PlayStretchPutDownComplete, PlayUnLoadStretchPutDownComplete);
GameEvent.AddListener(EventSetting.PlayShrinkPickUpComplete,PlayShrinkPickUpComplete);
GameEvent.AddListener(EventSetting.PlayShrinkPutDownComplete,PlayShrinkPutDownComplete);
}
public void RemoveUnLoadListener()
{
GameEvent.RemoveListener(EventSetting.PlayStretchPickUpComplete,PlayUnLoadStretchPickUpComplete);
GameEvent.RemoveListener(EventSetting.PlayStretchPutDownComplete, PlayUnLoadStretchPutDownComplete);
GameEvent.RemoveListener(EventSetting.PlayShrinkPickUpComplete,PlayShrinkPickUpComplete);
GameEvent.RemoveListener(EventSetting.PlayShrinkPutDownComplete,PlayShrinkPutDownComplete);
}
#endregion
public void DevelopLoadPickUpParam()
{
var shelfToolListenNet = GetComponentInParent<ShelfNetListenerComponent>();
// shelfToolListenNet.stackerData.frontForkHasGoods = true;
shelfToolListenNet.TestToContainer();
shelfToolListenNet.stackerData.frontForkAction = StackerForkActionEnum.ForkRest;
}
public void DevelopLoadPutDownParam()
{
var shelfToolListenNet = GetComponentInParent<ShelfNetListenerComponent>();
shelfToolListenNet.stackerData.frontForkHasGoods = false;
shelfToolListenNet.stackerData.frontForkAction = StackerForkActionEnum.ForkRest;
}
}
}

140
Assets/GameLogic/Game/Core/Component/ShelfNetListenerComponent.cs
View File

@ -1,57 +1,99 @@
using System;
using System;
using System.Linq;
using Animancer;
using EasyInject.Attributes;
using GameLogic;
using Newtonsoft.Json;
using NUnit.Framework;
using Sirenix.OdinInspector;
using UnityEngine;
using Random = UnityEngine.Random;
[GameObjectBean(ENameType.GameObjectName)]
public class ShelfNetListenerComponent : MonoBehaviour,IWcsSocketDataHandle
namespace GameLogic
{
public Transform Transform { get; }
public DeviceData DeviceData { get; }
public T DynamicData<T>()
[GameObjectBean(ENameType.GameObjectName)]
public class ShelfNetListenerComponent : MonoBehaviour, IWcsSocketDataHandle
{
throw new System.NotImplementedException();
public Transform Transform { get; }
public DeviceData DeviceData { get; }
public T DynamicData<T>()
{
throw new System.NotImplementedException();
}
public string DeviceCode { get => _deviceCode; }
public string DeviceType { get=> _deviceType; }
public event IDevice.DataChangeEvent DataChange;
public event IDevice.DataChangeEvent ErrorMessage;
[ShowInInspector]private string _deviceCode;
[ShowInInspector]private string _deviceType;
[ShowInInspector]private ShelfActor _shelfActor;
private void Start()
{
_shelfActor = GetComponent<ShelfActor>();
_deviceCode = _shelfActor._shelfConfig.deviceCode ;
_deviceType = _shelfActor._shelfConfig.deviceType;
}
public void DataHandle(object data, object other = null)
{
var stackerData = JsonConvert.DeserializeObject<StackerData>(JsonConvert.SerializeObject(data));
//frontHasGoodsDesc = stackerData.frontForkHasGoods == true ? "前叉有货" : "无货";
Debug.Log("DataHandle");
}
public StackerData stackerData =new StackerData();
private void Update()
{
if (string.IsNullOrEmpty(_deviceCode) || string.IsNullOrEmpty(_deviceType) ||
_shelfActor == null || _deviceCode.Length <= 0 || _deviceType.Length <= 0) return;
if (Input.GetKeyDown(KeyCode.R))
{
stackerData.frontForkHasGoods = false;
var station = _shelfActor.GetRandomStation();
var data = DataUtility.GetRowAndColumnAndLayer(station);
Debug.Log(data);
stackerData.toRow = data.row;
stackerData.toColumn = data.column;
stackerData.toLayer = data.layer;
//接收数据
}
if (Input.GetKeyDown(KeyCode.T))
{
var container = _shelfActor.GetRandomContainer();
var data = DataUtility.GetRowAndColumnAndLayer(container);
Debug.Log(data);
stackerData.toRow = data.row;
stackerData.toColumn = data.column;
stackerData.toLayer = data.layer;
//接收数据
}
if (Input.GetKeyDown(KeyCode.Y))
{
stackerData.frontForkAction = StackerForkActionEnum.LeftExtendFork;
//接收数据
}
if (stackerData == null) return;
_shelfActor.ExecuteStackerMovePosition(stackerData);
_shelfActor.ExecuteStretchAmination(stackerData);
}
public void TestToContainer()
{
stackerData.frontForkHasGoods = true;
var container = _shelfActor.GetRandomContainer();
var data = DataUtility.GetRowAndColumnAndLayer(container);
Debug.Log(data);
stackerData.toRow = data.row;
stackerData.toColumn = data.column;
stackerData.toLayer = data.layer;
}
}
[ShowInInspector]public string DeviceCode => _deviceCode;
[ShowInInspector]public string DeviceType => _deviceType;
private string _deviceCode ;
private string _deviceType;
public event IDevice.DataChangeEvent DataChange;
public event IDevice.DataChangeEvent ErrorMessage;
[ShowInInspector]public ShelfActor _shelfActor;
private void Start()
{
_shelfActor = GetComponent<ShelfActor>();
_deviceCode = "DDJ01";
// _deviceCode = _shelfActor._shelfConfig.deviceCode;
// _deviceType = _shelfActor._shelfConfig.deviceType;
_deviceType = "STACKER";
}
public void DataHandle(object data, object other = null)
{
Debug.Log("DataHandle");
// if (string.IsNullOrEmpty(_deviceCode) || _deviceCode.Length <=0) return;
// //if (! (data is StackerData stackerData)) return;
// //½ÓÊÕÊý¾Ý
// var stackerData = JsonConvert.DeserializeObject<StackerData>(JsonConvert.SerializeObject(data));
// //frontHasGoodsDesc = stackerData.frontForkHasGoods == true ? "Ç°²æÓлõ" : "ÎÞ»õ";
// var deviceData = JsonConvert.DeserializeObject<DeviceData>(JsonConvert.SerializeObject(other));
// Debug.Log(StackerDeviceDataUtility.GetPositionInfo(stackerData));
// if (stackerData.frontForkHasGoods);
// {
//
// }
}
}
}

3
Assets/GameLogic/Game/Core/Component/ShelfNetListenerComponent.cs.meta
View File

@ -1,2 +1,3 @@
fileFormatVersion: 2
guid: 20e0d00e57698f84887368e168629083
guid: 74772396b9124a22bffa41331fef4cf7
timeCreated: 1746777853

11
Assets/GameLogic/Game/Utility/DataUtility.cs
View File

@ -21,6 +21,17 @@ namespace GameLogic
var array = data.Split('-');
return int.Parse(array[2]);
}
public static (int row, int column, int layer) GetRowAndColumnAndLayer(string data)
{
var array = data.Split('-');
return (int.Parse(array[0]), int.Parse(array[1]), int.Parse(array[2]));
}
public static string GetPosition(int row, int column, int layer)
{
return $"{row:D2}-{column:D2}-{layer:D2}";
}
}

2
Assets/GameLogic/Game/Utility/Factory/ContainerFactory.cs
View File

@ -14,6 +14,8 @@ namespace GameLogic
containerInfo.shelfRow = shelfRow;
containerInfo.shelColumn = shelColumn;
containerInfo.shelfLayer = shelfLayer;
containerInfo.shelf.AddContainerInfo(DataUtility.GetPosition(shelfRow, shelColumn, shelfLayer), containerInfo);
return containerInfo;
}
}

2
Assets/GameLogic/Game/Utility/SO/So_ShelfConfig.cs
View File

@ -15,7 +15,7 @@ namespace GameLogic
[LabelText(""), ShowInInspector] public string deviceType = "STACKER";
[LabelText("货物所属工具组"),ShowInInspector] public List<int> groups = new List<int>();
[LabelText("伸缩动画"),ShowInInspector]public Dictionary<int,ShelfRowAnimData> shelfAnimDatas = new Dictionary<int, ShelfRowAnimData>();
// [LabelText("缩插动画")]public Dictionary<StackerForkActionEnum,AnimationClip> forkAnimations = new Dictionary<StackerForkActionEnum,AnimationClip>();
public ShelfRowAnimData GetAnimaData(int row)

2
Assets/GameLogic/Origin/data/StackerData.cs
View File

@ -63,6 +63,8 @@ public class StackerData
/// </summary>
public Boolean frontForkHasGoods;
//public bool? backForkHasGoods;
public string strategyCode;
public string strategyName;
//public string stageTrackLength;

13
Assets/GameLogic/Origin/device/container/ContainersManage.cs
View File

@ -5,11 +5,12 @@ using System.Collections.Generic;
using UnityEngine.AI;
using Unity.VisualScripting;
using System;
using GameLogic;
[GameObjectBean]
[AddComponentMenu("WXDC/Container/ContainerManage")]
public class ContainersManage : MonoBehaviour, IApplcationShutdown
public class ContainersManage : Singleton<ContainersManage>,IApplcationShutdown
{
[Autowired]
private EventCompent eventCompent;
@ -130,6 +131,16 @@ public class ContainersManage : MonoBehaviour, IApplcationShutdown
{
return ApplicationBoot.Instance.GetBean<Container>(containerCode);
}
public GameObject GetTestContainer(Vector3 position)
{
var containPrefab = Resources.Load<GameObject>("YCLZT");
var cotianerGo = Instantiate(containPrefab);
cotianerGo.SetPosition(position);
return cotianerGo;
}
/// <summary>
/// 从场景中移除该容器
/// </summary>

104
Assets/GameLogic/Origin/device/stacker/右深缩.anim
View File

@ -20,7 +20,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: {x: 31.3795, y: -0.5468, z: 18.541}
value: {x: -0.03550415, y: -0.08799982, z: -0.548}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
@ -28,8 +28,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.6666666
value: {x: 31.3795, y: -0.5468, z: 18.171999}
time: 0.6666667
value: {x: -0.03550415, y: -0.08799982, z: -0.084}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
@ -39,13 +39,13 @@ AnimationClip:
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
path: Caro-parent/Cargo/fork/geo_gunmetal_1.002 (1)
path: Caro-parent/Cargo/fork
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: {x: 0, y: 0.0067, z: 0.878}
value: {x: 0, y: 0.0067, z: -0.685}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
@ -53,16 +53,16 @@ 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
value: {x: 0, y: 0.0067, z: 0.456}
inSlope: {x: 0, y: 0, z: -0.47460002}
outSlope: {x: 0, y: 0, z: -0.47460002}
time: 1.1666666
value: {x: 0, y: 0.0067, z: -0.31}
inSlope: {x: 0, y: 0, z: 0.45861387}
outSlope: {x: 0, y: 0, z: 0.45861387}
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.6666666
time: 1.6833333
value: {x: 0, y: 0.0067, z: 0.087}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
@ -79,7 +79,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: {x: -0.03550415, y: -0.08799982, z: 0.265}
value: {x: 31.3795, y: -0.5468, z: 17.778002}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
@ -87,8 +87,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: 0.75
value: {x: -0.03550415, y: -0.08799982, z: -0.089}
time: 1.6833333
value: {x: 31.3795, y: -0.5468, z: 18.175001}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
@ -98,7 +98,7 @@ AnimationClip:
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
path: Caro-parent/Cargo/fork
path: Caro-parent/Cargo/fork/geo_gunmetal_1.002 (1)
m_ScaleCurves: []
m_FloatCurves: []
m_PPtrCurves: []
@ -110,7 +110,7 @@ AnimationClip:
m_ClipBindingConstant:
genericBindings:
- serializedVersion: 2
path: 1921414330
path: 158827227
attribute: 1
script: {fileID: 0}
typeID: 4
@ -128,7 +128,7 @@ AnimationClip:
isIntCurve: 0
isSerializeReferenceCurve: 0
- serializedVersion: 2
path: 158827227
path: 1921414330
attribute: 1
script: {fileID: 0}
typeID: 4
@ -142,7 +142,7 @@ AnimationClip:
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
m_StopTime: 1.6666666
m_StopTime: 1.6833333
m_OrientationOffsetY: 0
m_Level: 0
m_CycleOffset: 0
@ -164,7 +164,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: 31.3795
value: -0.03550415
inSlope: 0
outSlope: 0
tangentMode: 136
@ -172,8 +172,8 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1.6666666
value: 31.3795
time: 0.6666667
value: -0.03550415
inSlope: 0
outSlope: 0
tangentMode: 136
@ -184,7 +184,7 @@ AnimationClip:
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalPosition.x
path: Caro-parent/Cargo/fork/geo_gunmetal_1.002 (1)
path: Caro-parent/Cargo/fork
classID: 4
script: {fileID: 0}
flags: 0
@ -194,7 +194,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: -0.5468
value: -0.08799982
inSlope: 0
outSlope: 0
tangentMode: 136
@ -202,8 +202,8 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1.6666666
value: -0.5468
time: 0.6666667
value: -0.08799982
inSlope: 0
outSlope: 0
tangentMode: 136
@ -214,7 +214,7 @@ AnimationClip:
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalPosition.y
path: Caro-parent/Cargo/fork/geo_gunmetal_1.002 (1)
path: Caro-parent/Cargo/fork
classID: 4
script: {fileID: 0}
flags: 0
@ -224,7 +224,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: 18.541
value: -0.548
inSlope: 0
outSlope: 0
tangentMode: 136
@ -232,8 +232,8 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1.6666666
value: 18.171999
time: 0.6666667
value: -0.084
inSlope: 0
outSlope: 0
tangentMode: 136
@ -244,7 +244,7 @@ AnimationClip:
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalPosition.z
path: Caro-parent/Cargo/fork/geo_gunmetal_1.002 (1)
path: Caro-parent/Cargo/fork
classID: 4
script: {fileID: 0}
flags: 0
@ -262,7 +262,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1
time: 1.1666666
value: 0
inSlope: 0
outSlope: 0
@ -271,7 +271,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1.6666666
time: 1.6833333
value: 0
inSlope: 0
outSlope: 0
@ -301,7 +301,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1
time: 1.1666666
value: 0.0067
inSlope: 0
outSlope: 0
@ -310,7 +310,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1.6666666
time: 1.6833333
value: 0.0067
inSlope: 0
outSlope: 0
@ -332,7 +332,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: 0.878
value: -0.685
inSlope: 0
outSlope: 0
tangentMode: 136
@ -340,16 +340,16 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1
value: 0.456
inSlope: -0.47460002
outSlope: -0.47460002
time: 1.1666666
value: -0.31
inSlope: 0.45861387
outSlope: 0.45861387
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1.6666666
time: 1.6833333
value: 0.087
inSlope: 0
outSlope: 0
@ -371,7 +371,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: -0.03550415
value: 31.3795
inSlope: 0
outSlope: 0
tangentMode: 136
@ -379,8 +379,8 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.75
value: -0.03550415
time: 1.6833333
value: 31.3795
inSlope: 0
outSlope: 0
tangentMode: 136
@ -391,7 +391,7 @@ AnimationClip:
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalPosition.x
path: Caro-parent/Cargo/fork
path: Caro-parent/Cargo/fork/geo_gunmetal_1.002 (1)
classID: 4
script: {fileID: 0}
flags: 0
@ -401,7 +401,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: -0.08799982
value: -0.5468
inSlope: 0
outSlope: 0
tangentMode: 136
@ -409,8 +409,8 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.75
value: -0.08799982
time: 1.6833333
value: -0.5468
inSlope: 0
outSlope: 0
tangentMode: 136
@ -421,7 +421,7 @@ AnimationClip:
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalPosition.y
path: Caro-parent/Cargo/fork
path: Caro-parent/Cargo/fork/geo_gunmetal_1.002 (1)
classID: 4
script: {fileID: 0}
flags: 0
@ -431,7 +431,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: 0.265
value: 17.778002
inSlope: 0
outSlope: 0
tangentMode: 136
@ -439,8 +439,8 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.75
value: -0.089
time: 1.6833333
value: 18.175001
inSlope: 0
outSlope: 0
tangentMode: 136
@ -451,7 +451,7 @@ AnimationClip:
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalPosition.z
path: Caro-parent/Cargo/fork
path: Caro-parent/Cargo/fork/geo_gunmetal_1.002 (1)
classID: 4
script: {fileID: 0}
flags: 0
@ -459,7 +459,7 @@ AnimationClip:
m_HasGenericRootTransform: 0
m_HasMotionFloatCurves: 0
m_Events:
- time: 1.6666666
- time: 1.6833333
functionName: PlayShrinkComplete
data:
objectReferenceParameter: {fileID: 0}

2
Assets/GameLogic/Origin/device/stacker/右深缩.anim.meta
View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 3661f80aa7a090c4f9b88bc9390468d6
guid: d933409f8eec3814bad938a7aad0ab37
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 7400000

108
Assets/GameLogic/Origin/device/stacker/左深缩 .anim → Assets/GameLogic/Origin/device/stacker/左深缩.anim
View File

@ -6,7 +6,7 @@ AnimationClip:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: "\u5DE6\u6DF1\u7F29 "
m_Name: "\u5DE6\u6DF1\u7F29"
serializedVersion: 7
m_Legacy: 0
m_Compressed: 0
@ -20,7 +20,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: {x: -0.03550415, y: -0.08799982, z: -0.548}
value: {x: 31.3795, y: -0.5468, z: 18.541}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
@ -28,8 +28,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: 0.6666667
value: {x: -0.03550415, y: -0.08799982, z: -0.084}
time: 1.6666666
value: {x: 31.3795, y: -0.5468, z: 18.171999}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
@ -39,13 +39,13 @@ AnimationClip:
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
path: Caro-parent/Cargo/fork
path: Caro-parent/Cargo/fork/geo_gunmetal_1.002 (1)
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: {x: 0, y: 0.0067, z: -0.685}
value: {x: 0, y: 0.0067, z: 0.878}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
@ -53,16 +53,16 @@ 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.1666666
value: {x: 0, y: 0.0067, z: -0.31}
inSlope: {x: 0, y: 0, z: 0.45861387}
outSlope: {x: 0, y: 0, z: 0.45861387}
time: 1
value: {x: 0, y: 0.0067, z: 0.456}
inSlope: {x: 0, y: 0, z: -0.47460002}
outSlope: {x: 0, y: 0, z: -0.47460002}
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.6833333
time: 1.6666666
value: {x: 0, y: 0.0067, z: 0.087}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
@ -79,7 +79,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: {x: 31.3795, y: -0.5468, z: 17.778002}
value: {x: -0.03550415, y: -0.08799982, z: 0.265}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
@ -87,8 +87,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.6833333
value: {x: 31.3795, y: -0.5468, z: 18.175001}
time: 0.75
value: {x: -0.03550415, y: -0.08799982, z: -0.089}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
@ -98,7 +98,7 @@ AnimationClip:
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
path: Caro-parent/Cargo/fork/geo_gunmetal_1.002 (1)
path: Caro-parent/Cargo/fork
m_ScaleCurves: []
m_FloatCurves: []
m_PPtrCurves: []
@ -110,7 +110,7 @@ AnimationClip:
m_ClipBindingConstant:
genericBindings:
- serializedVersion: 2
path: 158827227
path: 1921414330
attribute: 1
script: {fileID: 0}
typeID: 4
@ -128,7 +128,7 @@ AnimationClip:
isIntCurve: 0
isSerializeReferenceCurve: 0
- serializedVersion: 2
path: 1921414330
path: 158827227
attribute: 1
script: {fileID: 0}
typeID: 4
@ -142,12 +142,12 @@ AnimationClip:
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
m_StopTime: 1.6833333
m_StopTime: 1.6666666
m_OrientationOffsetY: 0
m_Level: 0
m_CycleOffset: 0
m_HasAdditiveReferencePose: 0
m_LoopTime: 1
m_LoopTime: 0
m_LoopBlend: 0
m_LoopBlendOrientation: 0
m_LoopBlendPositionY: 0
@ -164,7 +164,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: -0.03550415
value: 31.3795
inSlope: 0
outSlope: 0
tangentMode: 136
@ -172,8 +172,8 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.6666667
value: -0.03550415
time: 1.6666666
value: 31.3795
inSlope: 0
outSlope: 0
tangentMode: 136
@ -184,7 +184,7 @@ AnimationClip:
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalPosition.x
path: Caro-parent/Cargo/fork
path: Caro-parent/Cargo/fork/geo_gunmetal_1.002 (1)
classID: 4
script: {fileID: 0}
flags: 0
@ -194,7 +194,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: -0.08799982
value: -0.5468
inSlope: 0
outSlope: 0
tangentMode: 136
@ -202,8 +202,8 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.6666667
value: -0.08799982
time: 1.6666666
value: -0.5468
inSlope: 0
outSlope: 0
tangentMode: 136
@ -214,7 +214,7 @@ AnimationClip:
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalPosition.y
path: Caro-parent/Cargo/fork
path: Caro-parent/Cargo/fork/geo_gunmetal_1.002 (1)
classID: 4
script: {fileID: 0}
flags: 0
@ -224,7 +224,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: -0.548
value: 18.541
inSlope: 0
outSlope: 0
tangentMode: 136
@ -232,8 +232,8 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.6666667
value: -0.084
time: 1.6666666
value: 18.171999
inSlope: 0
outSlope: 0
tangentMode: 136
@ -244,7 +244,7 @@ AnimationClip:
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalPosition.z
path: Caro-parent/Cargo/fork
path: Caro-parent/Cargo/fork/geo_gunmetal_1.002 (1)
classID: 4
script: {fileID: 0}
flags: 0
@ -262,7 +262,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1.1666666
time: 1
value: 0
inSlope: 0
outSlope: 0
@ -271,7 +271,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1.6833333
time: 1.6666666
value: 0
inSlope: 0
outSlope: 0
@ -301,7 +301,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1.1666666
time: 1
value: 0.0067
inSlope: 0
outSlope: 0
@ -310,7 +310,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1.6833333
time: 1.6666666
value: 0.0067
inSlope: 0
outSlope: 0
@ -332,7 +332,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: -0.685
value: 0.878
inSlope: 0
outSlope: 0
tangentMode: 136
@ -340,16 +340,16 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1.1666666
value: -0.31
inSlope: 0.45861387
outSlope: 0.45861387
time: 1
value: 0.456
inSlope: -0.47460002
outSlope: -0.47460002
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1.6833333
time: 1.6666666
value: 0.087
inSlope: 0
outSlope: 0
@ -371,7 +371,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: 31.3795
value: -0.03550415
inSlope: 0
outSlope: 0
tangentMode: 136
@ -379,8 +379,8 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1.6833333
value: 31.3795
time: 0.75
value: -0.03550415
inSlope: 0
outSlope: 0
tangentMode: 136
@ -391,7 +391,7 @@ AnimationClip:
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalPosition.x
path: Caro-parent/Cargo/fork/geo_gunmetal_1.002 (1)
path: Caro-parent/Cargo/fork
classID: 4
script: {fileID: 0}
flags: 0
@ -401,7 +401,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: -0.5468
value: -0.08799982
inSlope: 0
outSlope: 0
tangentMode: 136
@ -409,8 +409,8 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1.6833333
value: -0.5468
time: 0.75
value: -0.08799982
inSlope: 0
outSlope: 0
tangentMode: 136
@ -421,7 +421,7 @@ AnimationClip:
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalPosition.y
path: Caro-parent/Cargo/fork/geo_gunmetal_1.002 (1)
path: Caro-parent/Cargo/fork
classID: 4
script: {fileID: 0}
flags: 0
@ -431,7 +431,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: 17.778002
value: 0.265
inSlope: 0
outSlope: 0
tangentMode: 136
@ -439,8 +439,8 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1.6833333
value: 18.175001
time: 0.75
value: -0.089
inSlope: 0
outSlope: 0
tangentMode: 136
@ -451,7 +451,7 @@ AnimationClip:
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalPosition.z
path: Caro-parent/Cargo/fork/geo_gunmetal_1.002 (1)
path: Caro-parent/Cargo/fork
classID: 4
script: {fileID: 0}
flags: 0
@ -459,7 +459,7 @@ AnimationClip:
m_HasGenericRootTransform: 0
m_HasMotionFloatCurves: 0
m_Events:
- time: 1.6833333
- time: 1.6666666
functionName: PlayShrinkComplete
data:
objectReferenceParameter: {fileID: 0}

2
Assets/GameLogic/Origin/device/stacker/左深缩 .anim.meta → Assets/GameLogic/Origin/device/stacker/左深缩.anim.meta
View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: d933409f8eec3814bad938a7aad0ab37
guid: 3661f80aa7a090c4f9b88bc9390468d6
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 7400000

7
Assets/GameLogic/Origin/lib/Best HTTP (Pro)/Unity 2017.2 and up - Editor.csproj.meta Normal file
View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 3dff95aad8aa1714f9a63beb65eecdd1
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

7
Assets/GameLogic/Origin/lib/Best HTTP (Pro)/Unity 2017.2 and up - UWP.csproj.meta Normal file
View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 02196b990df06b642926439dc75d6e54
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

7
Assets/GameLogic/Origin/lib/Best HTTP (Pro)/Unity 5.x and up - Editor.csproj.meta Normal file
View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 11c82f406762a3842b5edee2b83f1916
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

7
Assets/GameLogic/Origin/lib/Best HTTP (Pro)/Unity 5.x and up - General.csproj.meta Normal file
View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 1e0079ac594f4ff419a323c142b3bea9
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

7
Assets/GameLogic/Origin/lib/Best HTTP (Pro)/Unity 5.x and up - UWP.csproj.meta Normal file
View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: ce8ec2ceeba19f7488c66865724f75a4
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

7
Assets/GameLogic/Origin/lib/Best HTTP (Pro)/Unity 5.x and up - WebGL.csproj.meta Normal file
View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: b6778a8babcdfad48a043ac6fdb2800f
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

7
Assets/Plugins/Sirenix/Demos/Custom Attribute Processors.unitypackage.meta Normal file
View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: f597f19f656ba56eae4f6a3a7cc528f4
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

7
Assets/Plugins/Sirenix/Demos/Custom Drawers.unitypackage.meta Normal file
View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 48e08dc33330d11e9d4a1b246c52e4f6
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

7
Assets/Plugins/Sirenix/Demos/Editor Windows.unitypackage.meta Normal file
View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: ed09910c0094cb27be8f3ca264680da3
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

7
Assets/Plugins/Sirenix/Demos/Sample - RPG Editor.unitypackage.meta Normal file
View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: cc355dd4cf1e6173beaeb22c2858cbe1
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

8
Assets/Scenes/main.unity
View File

@ -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.00013542175}
m_AnchoredPosition: {x: 0, y: -0.000038004546}
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.9923016
m_NumberOfSteps: 0
m_OnValueChanged:
m_PersistentCalls:

18
UserSettings/Layouts/default-6000.dwlt
View File

@ -118,7 +118,7 @@ MonoBehaviour:
m_MinSize: {x: 500, y: 100}
m_MaxSize: {x: 40480, y: 16192}
vertical: 1
controlID: 5264
controlID: 129
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: 5265
controlID: 130
draggingID: 0
--- !u!114 &7
MonoBehaviour:
@ -170,7 +170,7 @@ MonoBehaviour:
m_MinSize: {x: 400, y: 100}
m_MaxSize: {x: 32384, y: 16192}
vertical: 1
controlID: 5266
controlID: 100
draggingID: 0
--- !u!114 &8
MonoBehaviour:
@ -198,7 +198,7 @@ MonoBehaviour:
m_MinSize: {x: 400, y: 50}
m_MaxSize: {x: 32384, y: 8096}
vertical: 0
controlID: 5267
controlID: 83
draggingID: 0
--- !u!114 &9
MonoBehaviour:
@ -1033,7 +1033,7 @@ MonoBehaviour:
m_AudioPlay: 0
m_DebugDrawModesUseInteractiveLightBakingData: 0
m_Position:
m_Target: {x: -13.607471, y: -10.823122, z: 64.385284}
m_Target: {x: 29.905596, y: 5.2858033, z: -9.947343}
speed: 2
m_Value: {x: -13.607471, y: -10.823122, z: 64.385284}
m_RenderMode: 0
@ -1081,11 +1081,11 @@ MonoBehaviour:
m_GridAxis: 1
m_gridOpacity: 0.5
m_Rotation:
m_Target: {x: 0.09291093, y: -0.25663817, z: 0.024818702, w: 0.96177644}
m_Target: {x: 0.1313412, y: -0.54928225, z: 0.09168796, w: 0.8204994}
speed: 2
m_Value: {x: -0.09291093, y: 0.25663817, z: -0.024818702, w: -0.96177644}
m_Size:
m_Target: 51.567867
m_Target: 0.56670046
speed: 2
m_Value: 51.567867
m_Ortho:
@ -1232,7 +1232,7 @@ MonoBehaviour:
scrollPos: {x: 0, y: 154}
m_SelectedIDs: fa160100
m_LastClickedID: 71418
m_ExpandedIDs: 00000000361d0100381d01003a1d01003c1d01003e1d0100401d0100421d0100441d0100461d0100481d01004a1d0100
m_ExpandedIDs: 00000000027301000473010006730100087301000a7301000c7301000e73010010730100127301001473010016730100187301001a7301001c7301001e73010020730100227301002473010026730100
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
@ -1261,7 +1261,7 @@ MonoBehaviour:
scrollPos: {x: 0, y: 0}
m_SelectedIDs:
m_LastClickedID: 0
m_ExpandedIDs: 00000000361d0100381d01003a1d01003c1d01003e1d0100401d0100421d0100441d0100461d0100481d01004a1d0100
m_ExpandedIDs: 00000000027301000473010006730100087301000a7301000c7301000e73010010730100127301001473010016730100187301001a7301001c7301001e73010020730100227301002473010026730100
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name: