Commit da67cfae authored by wanqing's avatar wanqing

修改脚本

parent 9b65694b
...@@ -6,13 +6,21 @@ public class SecondLevelTrigger : MonoBehaviour ...@@ -6,13 +6,21 @@ public class SecondLevelTrigger : MonoBehaviour
{ {
private bool m_bControl = true; private bool m_bControl = true;
private List<MeshRenderer> m_lst = new List<MeshRenderer>(); private List<MeshRenderer> m_lst = new List<MeshRenderer>();
private void OnTriggerEnter(Collider other) private void OnTriggerStay(Collider other)
{ {
if (other.gameObject.CompareTag("Target")) if (other.gameObject.CompareTag("Target"))
{ {
StorageView varView = BattleCtrl.instance.levelManager.curLevel.storageView; StorageView varView = BattleCtrl.instance.levelManager.curLevel.storageView;
if(varView && !varView.curTargetTrans) if(varView && !varView.curTargetTrans)
{ {
Rigidbody varBody = other.GetComponent<Rigidbody>();
if(varBody)
{
if(varBody.velocity.y < 0)
{
return;
}
}
MeshRenderer varMesh = other.GetComponent<MeshRenderer>(); MeshRenderer varMesh = other.GetComponent<MeshRenderer>();
if (varMesh && !m_lst.Contains(varMesh)) if (varMesh && !m_lst.Contains(varMesh))
{ {
......
...@@ -495,7 +495,16 @@ public class StorageView : MonoBehaviour ...@@ -495,7 +495,16 @@ public class StorageView : MonoBehaviour
m_dicBox[varBox] = false; m_dicBox[varBox] = false;
} }
Rigidbody varBody = m_curTargetTrans.GetComponent<Rigidbody>(); Rigidbody varBody = m_curTargetTrans.GetComponent<Rigidbody>();
varBody.constraints = RigidbodyConstraints.None; //if (BattleCtrl.instance.levelManager.CurLevelIndex == LevelEnum.levelEightIndex ||
// BattleCtrl.instance.levelManager.CurLevelIndex == LevelEnum.levelNineIndex)
//{
// varBody.constraints = RigidbodyConstraints.FreezeRotationY;
//}
//else
{
varBody.constraints = RigidbodyConstraints.None;
varBody.velocity = Vector3.zero;
}
varBody.isKinematic = false; varBody.isKinematic = false;
m_curTargetTrans = null; m_curTargetTrans = null;
} }
......
...@@ -9492,6 +9492,20 @@ Rigidbody: ...@@ -9492,6 +9492,20 @@ Rigidbody:
m_Interpolate: 0 m_Interpolate: 0
m_Constraints: 0 m_Constraints: 0
m_CollisionDetection: 0 m_CollisionDetection: 0
--- !u!64 &8736184324907998887
MeshCollider:
m_ObjectHideFlags: 10
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1111088554673867607}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 4
m_Convex: 1
m_CookingOptions: 30
m_Mesh: {fileID: 1259799638878855867, guid: 0622e02e03a3de641b2fe4d56189351c, type: 2}
--- !u!114 &5794006671520906204 --- !u!114 &5794006671520906204
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -9522,20 +9536,6 @@ MonoBehaviour: ...@@ -9522,20 +9536,6 @@ MonoBehaviour:
m_material: {fileID: 0} m_material: {fileID: 0}
m_showColliders: 0 m_showColliders: 0
m_colliderAsset: {fileID: 11400000, guid: 0622e02e03a3de641b2fe4d56189351c, type: 2} m_colliderAsset: {fileID: 11400000, guid: 0622e02e03a3de641b2fe4d56189351c, type: 2}
--- !u!64 &8736184324907998887
MeshCollider:
m_ObjectHideFlags: 10
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1111088554673867607}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 4
m_Convex: 1
m_CookingOptions: 30
m_Mesh: {fileID: 1259799638878855867, guid: 0622e02e03a3de641b2fe4d56189351c, type: 2}
--- !u!1 &1166944828174422386 --- !u!1 &1166944828174422386
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -116030,7 +116030,7 @@ PrefabInstance: ...@@ -116030,7 +116030,7 @@ PrefabInstance:
- target: {fileID: 6929364722880124094, guid: 5b1464ccc6293b645ad3bb978bd8086e, - target: {fileID: 6929364722880124094, guid: 5b1464ccc6293b645ad3bb978bd8086e,
type: 3} type: 3}
propertyPath: m_LocalPosition.x propertyPath: m_LocalPosition.x
value: -0.31 value: -0.56
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 6929364722880124094, guid: 5b1464ccc6293b645ad3bb978bd8086e, - target: {fileID: 6929364722880124094, guid: 5b1464ccc6293b645ad3bb978bd8086e,
type: 3} type: 3}
...@@ -116040,7 +116040,7 @@ PrefabInstance: ...@@ -116040,7 +116040,7 @@ PrefabInstance:
- target: {fileID: 6929364722880124094, guid: 5b1464ccc6293b645ad3bb978bd8086e, - target: {fileID: 6929364722880124094, guid: 5b1464ccc6293b645ad3bb978bd8086e,
type: 3} type: 3}
propertyPath: m_LocalPosition.z propertyPath: m_LocalPosition.z
value: -3.872 value: -3.26
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 6929364722880124094, guid: 5b1464ccc6293b645ad3bb978bd8086e, - target: {fileID: 6929364722880124094, guid: 5b1464ccc6293b645ad3bb978bd8086e,
type: 3} type: 3}
...@@ -116247,7 +116247,7 @@ PrefabInstance: ...@@ -116247,7 +116247,7 @@ PrefabInstance:
- target: {fileID: 2104312745476564078, guid: 12483245eada61746b6f5e7f36eb0c84, - target: {fileID: 2104312745476564078, guid: 12483245eada61746b6f5e7f36eb0c84,
type: 3} type: 3}
propertyPath: m_LocalPosition.y propertyPath: m_LocalPosition.y
value: -0.3 value: -0.02
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 2104312745476564078, guid: 12483245eada61746b6f5e7f36eb0c84, - target: {fileID: 2104312745476564078, guid: 12483245eada61746b6f5e7f36eb0c84,
type: 3} type: 3}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment