This commit is contained in:
commit
08df50f0cf
|
|
@ -322,13 +322,17 @@ PrefabInstance:
|
|||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 52361805505633545, guid: 48f68b82a8b5b6a4b87c24c67a13ee27, type: 3}
|
||||
propertyPath: m_TagString
|
||||
value: "\u8D27\u7269"
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 919132149155446097, guid: 48f68b82a8b5b6a4b87c24c67a13ee27, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: "\u8D77\u91CD\u673A\u573A\u666F"
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3389427292126458697, guid: 48f68b82a8b5b6a4b87c24c67a13ee27, type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: -17.35
|
||||
value: -11.815
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 48f68b82a8b5b6a4b87c24c67a13ee27, type: 3}
|
||||
|
|
@ -353,7 +357,7 @@ Rigidbody:
|
|||
m_Mass: 1
|
||||
m_Drag: 0
|
||||
m_AngularDrag: 0.05
|
||||
m_UseGravity: 1
|
||||
m_UseGravity: 0
|
||||
m_IsKinematic: 0
|
||||
m_Interpolate: 0
|
||||
m_Constraints: 0
|
||||
|
|
@ -366,7 +370,7 @@ BoxCollider:
|
|||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 57948529}
|
||||
m_Material: {fileID: 0}
|
||||
m_IsTrigger: 0
|
||||
m_IsTrigger: 1
|
||||
m_Enabled: 1
|
||||
serializedVersion: 2
|
||||
m_Size: {x: 3.9299307, y: 0.3816965, z: 0.9609052}
|
||||
|
|
@ -736,8 +740,8 @@ BoxCollider:
|
|||
m_IsTrigger: 0
|
||||
m_Enabled: 1
|
||||
serializedVersion: 2
|
||||
m_Size: {x: 0.7674421, y: 0.40758458, z: 5.2867117}
|
||||
m_Center: {x: 0.000000059604766, y: -0.00000017881429, z: -2.9996777}
|
||||
m_Size: {x: 0.123840734, y: 0.28725383, z: 0.3019952}
|
||||
m_Center: {x: -0.12961413, y: -0.016970415, z: -0.50731903}
|
||||
--- !u!4 &573975657 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: -8679897200563217694, guid: 59c548e5ef54ae94eabee09a3d22a019, type: 3}
|
||||
|
|
@ -773,6 +777,7 @@ MonoBehaviour:
|
|||
hookBlendShapeIndex: 0
|
||||
minBlendShapeValue: 0
|
||||
maxBlendShapeValue: 100
|
||||
hookCollider: {fileID: 573975656}
|
||||
--- !u!65 &573975660
|
||||
BoxCollider:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -1068,6 +1073,24 @@ Transform:
|
|||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 6
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!4 &1478971612 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 6692294005839841995, guid: 59c548e5ef54ae94eabee09a3d22a019, type: 3}
|
||||
m_PrefabInstance: {fileID: 573975653}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!114 &1478971613
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 573975655}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: df0a1cac1b49c5f43aaeefdd3943f5f4, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
attachPoint: {fileID: 1478971612}
|
||||
--- !u!1 &1549388814
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
|
|||
|
|
@ -1,9 +1,8 @@
|
|||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using UnityEngine;
|
||||
|
||||
public class CraneController : MonoBehaviour
|
||||
{
|
||||
public static CraneController Instance;
|
||||
[Header("ÎïÌå")]
|
||||
public Transform bridge; // ºá¸Ë
|
||||
public Transform hook; // »¬ÂÖ
|
||||
|
|
@ -22,7 +21,7 @@ public class CraneController : MonoBehaviour
|
|||
public float bridgeMinZ = -5f;
|
||||
[Range(1, 20)]
|
||||
public float bridgeMaxZ = 5f;
|
||||
[Range(-1,5)]
|
||||
[Range(-1, 5)]
|
||||
public float hookMinZ = -3f;
|
||||
[Range(1, 5)]
|
||||
public float hookMaxZ = 3f;
|
||||
|
|
@ -33,12 +32,30 @@ public class CraneController : MonoBehaviour
|
|||
public float maxBlendShapeValue = 100f; // µõ¹³·ÅÏÂ
|
||||
|
||||
private float currentBlendValue = 0f;
|
||||
|
||||
private float baseColliderZ;
|
||||
|
||||
private float Max = 0f;
|
||||
private float Min = 0f;
|
||||
|
||||
public BoxCollider hookCollider; //¹³×ÓµÄÅöײ
|
||||
|
||||
private void Awake()
|
||||
{
|
||||
Instance = this;
|
||||
}
|
||||
public void Start()
|
||||
{
|
||||
Max = -(2.49513f - 0.5113189f) / 100;
|
||||
Min = (6.295807f - 0.3099952f) / 100;
|
||||
}
|
||||
// Update is called once per frame
|
||||
void Update()
|
||||
{
|
||||
HandleBridgeMovement();
|
||||
HandleHookMovement();
|
||||
HandleHookLift();
|
||||
hookSize();
|
||||
}
|
||||
|
||||
void HandleBridgeMovement()
|
||||
|
|
@ -69,7 +86,7 @@ public class CraneController : MonoBehaviour
|
|||
|
||||
void HandleHookLift()
|
||||
{
|
||||
if (hookRenderer == null)
|
||||
if (hookRenderer == null)
|
||||
return;
|
||||
|
||||
float input = 0;
|
||||
|
|
@ -83,4 +100,12 @@ public class CraneController : MonoBehaviour
|
|||
|
||||
hookRenderer.SetBlendShapeWeight(hookBlendShapeIndex, currentBlendValue);
|
||||
}
|
||||
public void hookSize()
|
||||
{
|
||||
if (hookCollider != null)
|
||||
{
|
||||
hookCollider.center = new Vector3(-0.1262663f, -0.01883008f, -0.5113189f + currentBlendValue * Max);
|
||||
hookCollider.size = new Vector3(0.1096101f, 0.2627291f, 0.3099952f + currentBlendValue *Min);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,68 @@
|
|||
using UnityEngine;
|
||||
|
||||
public class HookGrabber : MonoBehaviour
|
||||
{
|
||||
public Transform attachPoint; // 比如钩子底端的空物体
|
||||
|
||||
private GameObject candidateCargo; // 当前可被吸附的货物
|
||||
private GameObject grabbedCargo; // 已吸附的货物
|
||||
|
||||
private BoxCollider Hookcollider;
|
||||
|
||||
private float SizeZ;
|
||||
|
||||
//private float Min = 0f;
|
||||
|
||||
private void Start()
|
||||
{
|
||||
Hookcollider = GetComponent<BoxCollider>();
|
||||
//Min = (6.295807f - 0.3099952f) / 100;
|
||||
SizeZ = 5.95f - 1.008f;
|
||||
}
|
||||
void Update()
|
||||
{
|
||||
// 按N键:吸附货物
|
||||
if (candidateCargo != null && grabbedCargo == null && Input.GetKeyDown(KeyCode.N))
|
||||
{
|
||||
grabbedCargo = candidateCargo;
|
||||
grabbedCargo.transform.SetParent(attachPoint);
|
||||
// grabbedCargo.transform.position = attachPoint.position + (SizeZ/2);
|
||||
|
||||
Debug.Log("吸附到货物:" + grabbedCargo.name);
|
||||
}
|
||||
float currentValue = CraneController.Instance.hookRenderer.GetBlendShapeWeight(0);
|
||||
Debug.Log("currentValue:" + currentValue);
|
||||
Debug.Log("SizeZ:" + (SizeZ / 100 * (100 - currentValue)));
|
||||
Debug.Log("attachPoint.position.y:" + attachPoint.position.y);
|
||||
if (grabbedCargo != null)
|
||||
{
|
||||
grabbedCargo.transform.position = new Vector3(attachPoint.position.x, (attachPoint.position.y + (SizeZ / 100 * (100 - currentValue)) - 5.52f), attachPoint.position.z);
|
||||
|
||||
}
|
||||
// 按M键:释放货物
|
||||
if (grabbedCargo != null && Input.GetKeyDown(KeyCode.M))
|
||||
{
|
||||
grabbedCargo.transform.SetParent(null);
|
||||
grabbedCargo = null;
|
||||
Debug.Log("货物已分离");
|
||||
}
|
||||
}
|
||||
private void OnTriggerEnter(Collider other)
|
||||
{
|
||||
if (other.CompareTag("货物"))
|
||||
{
|
||||
candidateCargo = other.gameObject;
|
||||
Debug.Log("检测到货物:" + candidateCargo.name);
|
||||
}
|
||||
}
|
||||
|
||||
private void OnTriggerExit(Collider other)
|
||||
{
|
||||
// 离开触发区后,如果没吸附,就清空候选
|
||||
if (candidateCargo != null && other.gameObject == candidateCargo && grabbedCargo == null)
|
||||
{
|
||||
candidateCargo = null;
|
||||
Debug.Log("货物离开触发范围");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,11 @@
|
|||
fileFormatVersion: 2
|
||||
guid: df0a1cac1b49c5f43aaeefdd3943f5f4
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
defaultReferences: []
|
||||
executionOrder: 0
|
||||
icon: {instanceID: 0}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
|
@ -1,5 +1,9 @@
|
|||
fileFormatVersion: 2
|
||||
<<<<<<< HEAD
|
||||
guid: fb8b2b1d10e801c4e81e0be5557df54f
|
||||
=======
|
||||
guid: aa2db83ad2b14db43ab10b1d0961af8e
|
||||
>>>>>>> b7667df9ed1625aa601a88ccf374f13ce3b6adef
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 2100000
|
||||
|
|
|
|||
|
|
@ -1,5 +1,9 @@
|
|||
fileFormatVersion: 2
|
||||
<<<<<<< HEAD
|
||||
guid: cd1f84e1fd04a764d9f64463229185eb
|
||||
=======
|
||||
guid: f9bf5f5f54181d64fb958223a0c0e74f
|
||||
>>>>>>> b7667df9ed1625aa601a88ccf374f13ce3b6adef
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 2100000
|
||||
|
|
|
|||
|
|
@ -1,5 +1,9 @@
|
|||
fileFormatVersion: 2
|
||||
<<<<<<< HEAD
|
||||
guid: 1b28334542dd73b4baa4cb3e9e8b2a86
|
||||
=======
|
||||
guid: ddcfecce402a5aa4abdd92d95fcd7fe0
|
||||
>>>>>>> b7667df9ed1625aa601a88ccf374f13ce3b6adef
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 2100000
|
||||
|
|
|
|||
|
|
@ -1,5 +1,9 @@
|
|||
fileFormatVersion: 2
|
||||
<<<<<<< HEAD
|
||||
guid: 165cb2dcf5c639d4e9255ff6664935a3
|
||||
=======
|
||||
guid: b381d709d2901514ab379ef4155f5af3
|
||||
>>>>>>> b7667df9ed1625aa601a88ccf374f13ce3b6adef
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 2100000
|
||||
|
|
|
|||
|
|
@ -1,5 +1,9 @@
|
|||
fileFormatVersion: 2
|
||||
<<<<<<< HEAD
|
||||
guid: c986580bf934dc742bccba93b5bd8b35
|
||||
=======
|
||||
guid: 505a4955c6e144844a74d1626ab5e356
|
||||
>>>>>>> b7667df9ed1625aa601a88ccf374f13ce3b6adef
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 2100000
|
||||
|
|
|
|||
|
|
@ -1,5 +1,9 @@
|
|||
fileFormatVersion: 2
|
||||
<<<<<<< HEAD
|
||||
guid: f9663303110947d43b2dce40ef722377
|
||||
=======
|
||||
guid: a6ecab4fe45e23944bcb1b0b28dce8c2
|
||||
>>>>>>> b7667df9ed1625aa601a88ccf374f13ce3b6adef
|
||||
TextureImporter:
|
||||
internalIDToNameTable: []
|
||||
externalObjects: {}
|
||||
|
|
@ -89,6 +93,7 @@ TextureImporter:
|
|||
overridden: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||
<<<<<<< HEAD
|
||||
- serializedVersion: 3
|
||||
buildTarget: WebGL
|
||||
maxTextureSize: 2048
|
||||
|
|
@ -101,6 +106,8 @@ TextureImporter:
|
|||
overridden: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||
=======
|
||||
>>>>>>> b7667df9ed1625aa601a88ccf374f13ce3b6adef
|
||||
spriteSheet:
|
||||
serializedVersion: 2
|
||||
sprites: []
|
||||
|
|
|
|||
|
|
@ -1,5 +1,9 @@
|
|||
fileFormatVersion: 2
|
||||
<<<<<<< HEAD
|
||||
guid: 2739aca4630855d4f9ea3ec506d4657c
|
||||
=======
|
||||
guid: 6d012c23f5da2a7419166b1d9f75e877
|
||||
>>>>>>> b7667df9ed1625aa601a88ccf374f13ce3b6adef
|
||||
TextureImporter:
|
||||
internalIDToNameTable: []
|
||||
externalObjects: {}
|
||||
|
|
@ -89,6 +93,7 @@ TextureImporter:
|
|||
overridden: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||
<<<<<<< HEAD
|
||||
- serializedVersion: 3
|
||||
buildTarget: WebGL
|
||||
maxTextureSize: 2048
|
||||
|
|
@ -101,6 +106,8 @@ TextureImporter:
|
|||
overridden: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||
=======
|
||||
>>>>>>> b7667df9ed1625aa601a88ccf374f13ce3b6adef
|
||||
spriteSheet:
|
||||
serializedVersion: 2
|
||||
sprites: []
|
||||
|
|
|
|||
|
|
@ -1,5 +1,9 @@
|
|||
fileFormatVersion: 2
|
||||
<<<<<<< HEAD
|
||||
guid: da6e49f0ee361d44a97278ddb9f283cc
|
||||
=======
|
||||
guid: 3dc46484ea90b6b438ec89e7a80b64d1
|
||||
>>>>>>> b7667df9ed1625aa601a88ccf374f13ce3b6adef
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 2100000
|
||||
|
|
|
|||
|
|
@ -41,7 +41,11 @@ Material:
|
|||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
- _MainTex:
|
||||
<<<<<<< HEAD
|
||||
m_Texture: {fileID: 2800000, guid: f5f3feab94d2efb4495e42de104caff1, type: 3}
|
||||
=======
|
||||
m_Texture: {fileID: 0}
|
||||
>>>>>>> b7667df9ed1625aa601a88ccf374f13ce3b6adef
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
- _MetallicGlossMap:
|
||||
|
|
@ -75,6 +79,10 @@ Material:
|
|||
- _UVSec: 0
|
||||
- _ZWrite: 1
|
||||
m_Colors:
|
||||
<<<<<<< HEAD
|
||||
- _Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
=======
|
||||
- _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1}
|
||||
>>>>>>> b7667df9ed1625aa601a88ccf374f13ce3b6adef
|
||||
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
|
||||
m_BuildTextureStacks: []
|
||||
|
|
|
|||
|
|
@ -1,5 +1,9 @@
|
|||
fileFormatVersion: 2
|
||||
<<<<<<< HEAD
|
||||
guid: b0923760f75b83e43a8f94b1a005ca50
|
||||
=======
|
||||
guid: dde0a6b95fe836a4684d5c5f58513b63
|
||||
>>>>>>> b7667df9ed1625aa601a88ccf374f13ce3b6adef
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 2100000
|
||||
|
|
|
|||
|
|
@ -1,5 +1,9 @@
|
|||
fileFormatVersion: 2
|
||||
<<<<<<< HEAD
|
||||
guid: d73130d6c80109e488a552157e3a496c
|
||||
=======
|
||||
guid: 69d1425482ed8f948bc652d858d12e52
|
||||
>>>>>>> b7667df9ed1625aa601a88ccf374f13ce3b6adef
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 2100000
|
||||
|
|
|
|||
|
|
@ -12,7 +12,11 @@ Material:
|
|||
m_ValidKeywords:
|
||||
- _EMISSION
|
||||
m_InvalidKeywords: []
|
||||
<<<<<<< HEAD
|
||||
m_LightmapFlags: 1
|
||||
=======
|
||||
m_LightmapFlags: 5
|
||||
>>>>>>> b7667df9ed1625aa601a88ccf374f13ce3b6adef
|
||||
m_EnableInstancingVariants: 0
|
||||
m_DoubleSidedGI: 0
|
||||
m_CustomRenderQueue: -1
|
||||
|
|
|
|||
|
|
@ -1,5 +1,9 @@
|
|||
fileFormatVersion: 2
|
||||
<<<<<<< HEAD
|
||||
guid: 34352eb08b67e7f4b91238bbd63b72d8
|
||||
=======
|
||||
guid: 30c6ccf0a44c5044094a97327e236bee
|
||||
>>>>>>> b7667df9ed1625aa601a88ccf374f13ce3b6adef
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 2100000
|
||||
|
|
|
|||
|
|
@ -1,5 +1,9 @@
|
|||
fileFormatVersion: 2
|
||||
<<<<<<< HEAD
|
||||
guid: 638115a4549a4c34bb21b66e2dcbc434
|
||||
=======
|
||||
guid: d65cea5d1d6e31c409ef9133ca1d2180
|
||||
>>>>>>> b7667df9ed1625aa601a88ccf374f13ce3b6adef
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 2100000
|
||||
|
|
|
|||
|
|
@ -1,5 +1,9 @@
|
|||
fileFormatVersion: 2
|
||||
<<<<<<< HEAD
|
||||
guid: 23df7af10dfd66e44924e7ec6073ec64
|
||||
=======
|
||||
guid: 2397eb0b334dc5f408f64d02a7195ca9
|
||||
>>>>>>> b7667df9ed1625aa601a88ccf374f13ce3b6adef
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 2100000
|
||||
|
|
|
|||
|
|
@ -1,5 +1,9 @@
|
|||
fileFormatVersion: 2
|
||||
<<<<<<< HEAD
|
||||
guid: c1c1648ff22e7c242bd53febf22e5fe5
|
||||
=======
|
||||
guid: 9310ddcd38ec3c647b1678b4934a6551
|
||||
>>>>>>> b7667df9ed1625aa601a88ccf374f13ce3b6adef
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 2100000
|
||||
|
|
|
|||
Loading…
Reference in New Issue