svenm_admin/SixShopSimulator
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(shop): add box pickup/carry, pour-into-shelf, and package flight visuals

Browse Source 
- Carryable: generic pickup/carry component, cosmetic per-peer follow of
  the carrier's HandSocket instead of NGO reparenting (camera pitch isn't
  networked, so root-level reparenting wouldn't tilt with the view)
- PlayerCarry: mutual exclusion with PlayerHands, server-timed hold-to-pour
  tick (client only signals start/stop, never per-unit requests)
- IPourSource/IPourTarget: decouple PlayerInteractor from concrete Shop
  types, same pattern as IInteractable
- Lieferkarton: gains product data (productId/quantity), two-stage
  Interact() (open, then pick up), IPourSource
- ShelfSlot: implements IPourTarget, fills the previous RefreshVisuals TODO
- PackageDisplay: renders quantity as a proper column x row grid that
  stacks into further layers as space runs out, reused by both containers
- FlyingPackage: small non-networked cosmetic visual that arcs a package
  from the carried box to its exact landing slot in the shelf grid on
  every successful pour tick, broadcast via Rpc(SendTo.Everyone)
- StorageCrate: rejects pickup while the player is carrying a box

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
This commit is contained in:
svenm_admin
2026-08-14 20:28:55 +02:00
co-authored by Claude Sonnet 5
parent 2fd424b2bf
commit a999b0182a
19 changed files with 859 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/Scenes/Shop.unity
+217 -1
View File
@@ -450,6 +450,37 @@ MonoBehaviour:
m_SelectedFaces:
m_SelectedEdges: []
m_SelectedVertices:
--- !u!1 &53478574
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 53478575}
m_Layer: 0
m_Name: ContentsRoot
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &53478575
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 53478574}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: -0.243, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 959439192}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &64083402
GameObject:
m_ObjectHideFlags: 0
@@ -3863,7 +3894,10 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedGameObjects:
- targetCorrespondingSourceObject: {fileID: -8679921383154817045, guid: 280091748b47569469096b4ec9745729, type: 3}
insertIndex: -1
addedObject: {fileID: 53478575}
m_AddedComponents:
- targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 280091748b47569469096b4ec9745729, type: 3}
insertIndex: -1
@@ -3883,6 +3917,9 @@ PrefabInstance:
- targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 280091748b47569469096b4ec9745729, type: 3}
insertIndex: -1
addedObject: {fileID: 959439197}
- targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 280091748b47569469096b4ec9745729, type: 3}
insertIndex: -1
addedObject: {fileID: 959439200}
m_SourcePrefab: {fileID: 100100000, guid: 280091748b47569469096b4ec9745729, type: 3}
--- !u!1 &959439188 stripped
GameObject:
@@ -3925,6 +3962,11 @@ Transform:
m_CorrespondingSourceObject: {fileID: -7629218545453614500, guid: 280091748b47569469096b4ec9745729, type: 3}
m_PrefabInstance: {fileID: 959439187}
m_PrefabAsset: {fileID: 0}
--- !u!4 &959439192 stripped
Transform:
m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 280091748b47569469096b4ec9745729, type: 3}
m_PrefabInstance: {fileID: 959439187}
m_PrefabAsset: {fileID: 0}
--- !u!114 &959439195
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -3942,6 +3984,11 @@ MonoBehaviour:
deckelRechts: {fileID: 959439190}
oeffnungsWinkel: 170
geschwindigkeit: 5
_catalog: {fileID: 11400000, guid: e173fe210071dba4790dd003a88e4fcd, type: 2}
_productId: 1
_startingQuantity: 12
_contentsRoot: {fileID: 53478575}
_maxVisiblePackages: 12
--- !u!65 &959439196
BoxCollider:
m_ObjectHideFlags: 0
@@ -4053,6 +4100,22 @@ Rigidbody:
m_Interpolate: 0
m_Constraints: 0
m_CollisionDetection: 0
--- !u!114 &959439200
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 959439188}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: b73b32288703e1c4995e220e80249f35, type: 3}
m_Name:
m_EditorClassIdentifier: AfterHours.Runtime::AfterHours.Interaction.Carryable
ShowTopMostFoldoutHeaderGroup: 1
_collidersToDisableWhileCarried: []
_networkTransform: {fileID: 0}
_rigidbody: {fileID: 0}
--- !u!1 &975800552
GameObject:
m_ObjectHideFlags: 0
@@ -5468,6 +5531,157 @@ Transform:
m_Children: []
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &1637614133
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: -8679921383154817045, guid: 0d912f468f12f1a48b2df1314b991b38, type: 3}
propertyPath: m_LocalPosition.x
value: -4.018
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 0d912f468f12f1a48b2df1314b991b38, type: 3}
propertyPath: m_LocalPosition.y
value: 1.047
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 0d912f468f12f1a48b2df1314b991b38, type: 3}
propertyPath: m_LocalPosition.z
value: 0.603
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 0d912f468f12f1a48b2df1314b991b38, type: 3}
propertyPath: m_LocalRotation.w
value: 0.7071067
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 0d912f468f12f1a48b2df1314b991b38, type: 3}
propertyPath: m_LocalRotation.x
value: -0.7071068
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 0d912f468f12f1a48b2df1314b991b38, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 0d912f468f12f1a48b2df1314b991b38, type: 3}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 0d912f468f12f1a48b2df1314b991b38, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 0d912f468f12f1a48b2df1314b991b38, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 0d912f468f12f1a48b2df1314b991b38, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: -7511558181221131132, guid: 0d912f468f12f1a48b2df1314b991b38, type: 3}
propertyPath: 'm_Materials.Array.data[0]'
value:
objectReference: {fileID: 2100000, guid: 9ff3d1c8bfaace6428d25719c6afa121, type: 2}
- target: {fileID: 919132149155446097, guid: 0d912f468f12f1a48b2df1314b991b38, type: 3}
propertyPath: m_Name
value: Meshy_AI_wooden_shelf_3_compar_0814175655_image-to-3d-texture
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 0d912f468f12f1a48b2df1314b991b38, type: 3}
--- !u!1 &1658583203
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1658583206}
- component: {fileID: 1658583205}
- component: {fileID: 1658583204}
m_Layer: 0
m_Name: mesh_node
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!23 &1658583204
MeshRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1658583203}
m_Enabled: 1
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
m_RayTraceProcedural: 0
m_RayTracingAccelStructBuildFlagsOverride: 0
m_RayTracingAccelStructBuildFlags: 1
m_SmallMeshCulling: 1
m_ForceMeshLod: -1
m_MeshLodSelectionBias: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 0}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 1
m_SelectedEditorRenderState: 3
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_GlobalIlluminationMeshLod: 0
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_MaskInteraction: 0
m_AdditionalVertexStreams: {fileID: 0}
--- !u!33 &1658583205
MeshFilter:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1658583203}
m_Mesh: {fileID: 7158796146257112550, guid: 0d912f468f12f1a48b2df1314b991b38, type: 3}
--- !u!4 &1658583206
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1658583203}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -4.069018, y: 0.00000036529013, z: 0.19831897}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!43 &1899577878
Mesh:
m_ObjectHideFlags: 0
@@ -6020,3 +6234,5 @@ SceneRoots:
- {fileID: 959439187}
- {fileID: 1091476159}
- {fileID: 1417349271}
- {fileID: 1637614133}
- {fileID: 1658583206}