Commit 431a61e0 authored by wanqing's avatar wanqing

修改场景预制体

parent da67cfae
......@@ -57,6 +57,7 @@ public class StorageView : MonoBehaviour
private MeshCollider m_meshCollider;//自身碰撞网格
private float m_boxHeight = 0.0f;//盒子高度
private float m_specialZLimit = 0.0f;//z轴限制位置
private float m_selfHeight = 3.0f;
// Start is called before the first frame update
void Start()
{
......@@ -185,6 +186,11 @@ public class StorageView : MonoBehaviour
//{
// varBody.isKinematic = true;
//}
Rigidbody varBody = other.gameObject.GetComponent<Rigidbody>();
if (varBody)
{
varBody.velocity = Vector3.zero;
}
m_insideBoxNum++;
BattleCtrl.instance.battleUI.SetTakeBtnState(m_insideBoxNum >= m_TotalNum);
}
......@@ -317,11 +323,11 @@ public class StorageView : MonoBehaviour
//}
if (value)
{
//for (int i = 0; i < m_targetTrans.Length; i++)
//{
// m_targetTrans[i].GetComponent<Rigidbody>().isKinematic = true;
//}
if(m_animator)
for (int i = 0; i < m_targetTrans.Length; i++)
{
m_targetTrans[i].GetComponent<Rigidbody>().isKinematic = true;
}
if (m_animator)
{
string varStr = GlobalConfig.WinAnimatorName();
m_animator.Play(varStr);
......@@ -430,11 +436,19 @@ public class StorageView : MonoBehaviour
else
{
if(m_dicPos.ContainsKey(m_curTargetTrans))
{
//如果超过这个高度,则不处理,避免碰到底部货物
if (varPos.y >= m_selfHeight)
{
//varPos.y = m_dicPos[m_curTargetTrans];
}
else
{
varPos.y = m_dicPos[m_curTargetTrans];
}
}
}
}
if (varPos.y < m_dicPos[m_curTargetTrans])
{
varPos.y = m_dicPos[m_curTargetTrans];
......@@ -457,7 +471,7 @@ public class StorageView : MonoBehaviour
for (int i = 0; i < m_targetTrans.Length; i++)
{
Vector3 varPos = m_targetTrans[i].transform.position;
if (varPos.y < m_dicPos[m_targetTrans[i]] - 1.0f)
if (varPos.y < m_dicPos[m_targetTrans[i]] - 2.0f)
{
varPos.y = m_dicPos[m_targetTrans[i]];
}
......
......@@ -9635,8 +9635,8 @@ Rigidbody:
m_UseGravity: 1
m_IsKinematic: 0
m_Interpolate: 0
m_Constraints: 112
m_CollisionDetection: 3
m_Constraints: 0
m_CollisionDetection: 0
--- !u!64 &5456284061586060835
MeshCollider:
m_ObjectHideFlags: 10
......@@ -19398,8 +19398,8 @@ Rigidbody:
m_UseGravity: 1
m_IsKinematic: 0
m_Interpolate: 0
m_Constraints: 112
m_CollisionDetection: 3
m_Constraints: 0
m_CollisionDetection: 0
--- !u!64 &218733972402938279
MeshCollider:
m_ObjectHideFlags: 10
......@@ -19407,7 +19407,7 @@ MeshCollider:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1836285497934110341}
m_Material: {fileID: 13400000, guid: 1da711aeda7da53409ccf9a4cad5f5cf, type: 2}
m_Material: {fileID: 13400000, guid: 1a98884085d3d63449affccb1e96f296, type: 2}
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 4
......@@ -19453,7 +19453,7 @@ MonoBehaviour:
m_colliders:
- {fileID: 218733972402938279}
m_isTrigger: 0
m_material: {fileID: 13400000, guid: 1da711aeda7da53409ccf9a4cad5f5cf, type: 2}
m_material: {fileID: 13400000, guid: 1a98884085d3d63449affccb1e96f296, type: 2}
m_showColliders: 0
m_colliderAsset: {fileID: 11400000, guid: 93a0efc913d12ac46b7c21c9b953d386, type: 2}
--- !u!1 &1843368597236988458
......@@ -67278,8 +67278,8 @@ Rigidbody:
m_UseGravity: 1
m_IsKinematic: 0
m_Interpolate: 0
m_Constraints: 112
m_CollisionDetection: 3
m_Constraints: 0
m_CollisionDetection: 0
--- !u!64 &6667677189276912151
MeshCollider:
m_ObjectHideFlags: 10
......@@ -67287,7 +67287,7 @@ MeshCollider:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4838169749583274747}
m_Material: {fileID: 13400000, guid: 1da711aeda7da53409ccf9a4cad5f5cf, type: 2}
m_Material: {fileID: 13400000, guid: 1a98884085d3d63449affccb1e96f296, type: 2}
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 4
......@@ -67333,7 +67333,7 @@ MonoBehaviour:
m_colliders:
- {fileID: 6667677189276912151}
m_isTrigger: 0
m_material: {fileID: 13400000, guid: 1da711aeda7da53409ccf9a4cad5f5cf, type: 2}
m_material: {fileID: 13400000, guid: 1a98884085d3d63449affccb1e96f296, type: 2}
m_showColliders: 0
m_colliderAsset: {fileID: 11400000, guid: e1a06ba52681e2b4e8a5ff37f6b9d5ee, type: 2}
--- !u!1 &5036803459208687269
......@@ -72708,8 +72708,8 @@ Rigidbody:
m_UseGravity: 1
m_IsKinematic: 0
m_Interpolate: 0
m_Constraints: 112
m_CollisionDetection: 3
m_Constraints: 0
m_CollisionDetection: 0
--- !u!64 &7889781899146021192
MeshCollider:
m_ObjectHideFlags: 10
......@@ -82404,8 +82404,8 @@ Rigidbody:
m_UseGravity: 1
m_IsKinematic: 0
m_Interpolate: 0
m_Constraints: 112
m_CollisionDetection: 3
m_Constraints: 0
m_CollisionDetection: 0
--- !u!64 &3040068319997445528
MeshCollider:
m_ObjectHideFlags: 10
......@@ -82413,7 +82413,7 @@ MeshCollider:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6637261569637956200}
m_Material: {fileID: 13400000, guid: 9992e0792ee74b74cbca42123e4db065, type: 2}
m_Material: {fileID: 13400000, guid: 1a98884085d3d63449affccb1e96f296, type: 2}
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 4
......@@ -82459,7 +82459,7 @@ MonoBehaviour:
m_colliders:
- {fileID: 3040068319997445528}
m_isTrigger: 0
m_material: {fileID: 13400000, guid: 9992e0792ee74b74cbca42123e4db065, type: 2}
m_material: {fileID: 13400000, guid: 1a98884085d3d63449affccb1e96f296, type: 2}
m_showColliders: 0
m_colliderAsset: {fileID: 11400000, guid: 21af9fe23e1ef4948aab8f3c1496cfd9, type: 2}
--- !u!1 &6911763109860884303
......@@ -96594,8 +96594,8 @@ Rigidbody:
m_UseGravity: 1
m_IsKinematic: 0
m_Interpolate: 0
m_Constraints: 112
m_CollisionDetection: 3
m_Constraints: 0
m_CollisionDetection: 0
--- !u!64 &389980249717342607
MeshCollider:
m_ObjectHideFlags: 10
......@@ -117495,6 +117495,11 @@ PrefabInstance:
propertyPath: m_Enabled
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8267413534687462486, guid: 76028ca93ec1247489ae29f7fe3029de,
type: 3}
propertyPath: m_Mesh
value:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 76028ca93ec1247489ae29f7fe3029de, type: 3}
--- !u!4 &3395874881895050390 stripped
......@@ -117616,13 +117621,18 @@ PrefabInstance:
- target: {fileID: -1449416405033231382, guid: 34c287f0eee86f94390ac388d48d3c4c,
type: 3}
propertyPath: m_Convex
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: -1449416405033231382, guid: 34c287f0eee86f94390ac388d48d3c4c,
type: 3}
propertyPath: m_Enabled
value: 0
objectReference: {fileID: 0}
- target: {fileID: -1449416405033231382, guid: 34c287f0eee86f94390ac388d48d3c4c,
type: 3}
propertyPath: m_Mesh
value:
objectReference: {fileID: 0}
- target: {fileID: 5643268623140087546, guid: 34c287f0eee86f94390ac388d48d3c4c,
type: 3}
propertyPath: m_LocalPosition.x
......@@ -117737,13 +117747,18 @@ PrefabInstance:
- target: {fileID: 3485543512851328073, guid: f02e3b0696312e249866fffcc4058aed,
type: 3}
propertyPath: m_Convex
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3485543512851328073, guid: f02e3b0696312e249866fffcc4058aed,
type: 3}
propertyPath: m_Enabled
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3485543512851328073, guid: f02e3b0696312e249866fffcc4058aed,
type: 3}
propertyPath: m_Mesh
value:
objectReference: {fileID: 0}
- target: {fileID: 3529744534045466093, guid: f02e3b0696312e249866fffcc4058aed,
type: 3}
propertyPath: m_LocalPosition.x
......@@ -117908,13 +117923,18 @@ PrefabInstance:
- target: {fileID: 6399659366233946609, guid: 73fc888352243184782b63bf95b35683,
type: 3}
propertyPath: m_Convex
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6399659366233946609, guid: 73fc888352243184782b63bf95b35683,
type: 3}
propertyPath: m_Enabled
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6399659366233946609, guid: 73fc888352243184782b63bf95b35683,
type: 3}
propertyPath: m_Mesh
value:
objectReference: {fileID: 0}
- target: {fileID: 8656428431439255845, guid: 73fc888352243184782b63bf95b35683,
type: 3}
propertyPath: m_Name
......@@ -118104,13 +118124,18 @@ PrefabInstance:
- target: {fileID: 2995027284413623377, guid: fdb827194d056b14f85bf8d71540ad6a,
type: 3}
propertyPath: m_Convex
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2995027284413623377, guid: fdb827194d056b14f85bf8d71540ad6a,
type: 3}
propertyPath: m_Enabled
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2995027284413623377, guid: fdb827194d056b14f85bf8d71540ad6a,
type: 3}
propertyPath: m_Mesh
value:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: fdb827194d056b14f85bf8d71540ad6a, type: 3}
--- !u!1 &6228675061950813085 stripped
......@@ -118222,6 +118247,11 @@ PrefabInstance:
propertyPath: m_Enabled
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4069251918964216807, guid: 73b913978f53cb3468f3f518e86f8f73,
type: 3}
propertyPath: m_Mesh
value:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 73b913978f53cb3468f3f518e86f8f73, type: 3}
--- !u!4 &8466758606600360168 stripped
......@@ -23799,8 +23799,8 @@ Rigidbody:
m_UseGravity: 1
m_IsKinematic: 0
m_Interpolate: 0
m_Constraints: 112
m_CollisionDetection: 3
m_Constraints: 0
m_CollisionDetection: 0
--- !u!64 &2738989211538391472
MeshCollider:
m_ObjectHideFlags: 10
......@@ -48172,8 +48172,8 @@ Rigidbody:
m_UseGravity: 1
m_IsKinematic: 0
m_Interpolate: 0
m_Constraints: 112
m_CollisionDetection: 3
m_Constraints: 0
m_CollisionDetection: 0
--- !u!64 &7481850427872920027
MeshCollider:
m_ObjectHideFlags: 10
......@@ -48181,7 +48181,7 @@ MeshCollider:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4247836945817865428}
m_Material: {fileID: 13400000, guid: 1da711aeda7da53409ccf9a4cad5f5cf, type: 2}
m_Material: {fileID: 13400000, guid: 1a98884085d3d63449affccb1e96f296, type: 2}
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 4
......@@ -48227,7 +48227,7 @@ MonoBehaviour:
m_colliders:
- {fileID: 7481850427872920027}
m_isTrigger: 0
m_material: {fileID: 13400000, guid: 1da711aeda7da53409ccf9a4cad5f5cf, type: 2}
m_material: {fileID: 13400000, guid: 1a98884085d3d63449affccb1e96f296, type: 2}
m_showColliders: 0
m_colliderAsset: {fileID: 11400000, guid: 00db0ef1b0c02a4468362b8a776c76b6, type: 2}
--- !u!1 &4367437363668762897
......@@ -57843,8 +57843,8 @@ Rigidbody:
m_UseGravity: 1
m_IsKinematic: 0
m_Interpolate: 0
m_Constraints: 112
m_CollisionDetection: 3
m_Constraints: 0
m_CollisionDetection: 0
--- !u!64 &1923886939358369826
MeshCollider:
m_ObjectHideFlags: 10
......@@ -57852,7 +57852,7 @@ MeshCollider:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4869330585920949664}
m_Material: {fileID: 13400000, guid: 1da711aeda7da53409ccf9a4cad5f5cf, type: 2}
m_Material: {fileID: 13400000, guid: 1a98884085d3d63449affccb1e96f296, type: 2}
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 4
......@@ -57886,7 +57886,7 @@ MonoBehaviour:
m_colliders:
- {fileID: 1923886939358369826}
m_isTrigger: 0
m_material: {fileID: 13400000, guid: 1da711aeda7da53409ccf9a4cad5f5cf, type: 2}
m_material: {fileID: 13400000, guid: 1a98884085d3d63449affccb1e96f296, type: 2}
m_showColliders: 0
m_colliderAsset: {fileID: 11400000, guid: e1a06ba52681e2b4e8a5ff37f6b9d5ee, type: 2}
--- !u!114 &7395948471543289605
......@@ -73470,7 +73470,7 @@ MonoBehaviour:
cachedMesh: {fileID: 993419639201786619, guid: 5cf58c6137fac2d4694d7c32c4b1b4be,
type: 3}
InvisibleUpdate: 0
readable: 1
readable: 0
--- !u!114 &5300965306534286967
MonoBehaviour:
m_ObjectHideFlags: 0
......@@ -77057,8 +77057,8 @@ Rigidbody:
m_UseGravity: 1
m_IsKinematic: 0
m_Interpolate: 0
m_Constraints: 112
m_CollisionDetection: 3
m_Constraints: 0
m_CollisionDetection: 0
--- !u!64 &1138017287812997269
MeshCollider:
m_ObjectHideFlags: 10
......@@ -91444,8 +91444,8 @@ Rigidbody:
m_UseGravity: 1
m_IsKinematic: 0
m_Interpolate: 0
m_Constraints: 112
m_CollisionDetection: 3
m_Constraints: 0
m_CollisionDetection: 0
--- !u!64 &2154842315408777657
MeshCollider:
m_ObjectHideFlags: 10
......@@ -91453,7 +91453,7 @@ MeshCollider:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6918611504877657115}
m_Material: {fileID: 13400000, guid: 1da711aeda7da53409ccf9a4cad5f5cf, type: 2}
m_Material: {fileID: 13400000, guid: 1a98884085d3d63449affccb1e96f296, type: 2}
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 4
......@@ -91467,7 +91467,7 @@ MeshCollider:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6918611504877657115}
m_Material: {fileID: 13400000, guid: 1da711aeda7da53409ccf9a4cad5f5cf, type: 2}
m_Material: {fileID: 13400000, guid: 1a98884085d3d63449affccb1e96f296, type: 2}
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 4
......@@ -91502,7 +91502,7 @@ MonoBehaviour:
- {fileID: 5470400440288310384}
- {fileID: 2154842315408777657}
m_isTrigger: 0
m_material: {fileID: 13400000, guid: 1da711aeda7da53409ccf9a4cad5f5cf, type: 2}
m_material: {fileID: 13400000, guid: 1a98884085d3d63449affccb1e96f296, type: 2}
m_showColliders: 0
m_colliderAsset: {fileID: 11400000, guid: 83ff3a498b5eccf4682bf36a84344906, type: 2}
--- !u!114 &2110733077624515787
......@@ -101409,8 +101409,8 @@ Rigidbody:
m_UseGravity: 1
m_IsKinematic: 0
m_Interpolate: 0
m_Constraints: 112
m_CollisionDetection: 3
m_Constraints: 0
m_CollisionDetection: 0
--- !u!64 &166506014804444706
MeshCollider:
m_ObjectHideFlags: 10
......@@ -115727,13 +115727,18 @@ PrefabInstance:
- target: {fileID: -3819540379677461157, guid: 8cf12027a4d70fc408225cb32a2b0d72,
type: 3}
propertyPath: m_Convex
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: -3819540379677461157, guid: 8cf12027a4d70fc408225cb32a2b0d72,
type: 3}
propertyPath: m_Enabled
value: 0
objectReference: {fileID: 0}
- target: {fileID: -3819540379677461157, guid: 8cf12027a4d70fc408225cb32a2b0d72,
type: 3}
propertyPath: m_Mesh
value:
objectReference: {fileID: 0}
- target: {fileID: 5014471192311814343, guid: 8cf12027a4d70fc408225cb32a2b0d72,
type: 3}
propertyPath: m_Name
......@@ -116010,13 +116015,18 @@ PrefabInstance:
- target: {fileID: 1640871209334238836, guid: 5b1464ccc6293b645ad3bb978bd8086e,
type: 3}
propertyPath: m_Convex
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1640871209334238836, guid: 5b1464ccc6293b645ad3bb978bd8086e,
type: 3}
propertyPath: m_Enabled
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1640871209334238836, guid: 5b1464ccc6293b645ad3bb978bd8086e,
type: 3}
propertyPath: m_Mesh
value:
objectReference: {fileID: 0}
- target: {fileID: 6228853597785974445, guid: 5b1464ccc6293b645ad3bb978bd8086e,
type: 3}
propertyPath: m_Name
......@@ -116121,13 +116131,18 @@ PrefabInstance:
- target: {fileID: -6332742746014836843, guid: cb3f19b2e3d3828479388604f2f75114,
type: 3}
propertyPath: m_Convex
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: -6332742746014836843, guid: cb3f19b2e3d3828479388604f2f75114,
type: 3}
propertyPath: m_Enabled
value: 0
objectReference: {fileID: 0}
- target: {fileID: -6332742746014836843, guid: cb3f19b2e3d3828479388604f2f75114,
type: 3}
propertyPath: m_Mesh
value:
objectReference: {fileID: 0}
- target: {fileID: 5799510528017385999, guid: cb3f19b2e3d3828479388604f2f75114,
type: 3}
propertyPath: m_Name
......@@ -116232,13 +116247,18 @@ PrefabInstance:
- target: {fileID: 1637276429603433267, guid: 12483245eada61746b6f5e7f36eb0c84,
type: 3}
propertyPath: m_Convex
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1637276429603433267, guid: 12483245eada61746b6f5e7f36eb0c84,
type: 3}
propertyPath: m_Enabled
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1637276429603433267, guid: 12483245eada61746b6f5e7f36eb0c84,
type: 3}
propertyPath: m_Mesh
value:
objectReference: {fileID: 0}
- target: {fileID: 2104312745476564078, guid: 12483245eada61746b6f5e7f36eb0c84,
type: 3}
propertyPath: m_LocalPosition.x
......@@ -116343,13 +116363,18 @@ PrefabInstance:
- target: {fileID: -7350152777436080692, guid: 4f5930e3d2b45ea468a44ae2a3a1eb3a,
type: 3}
propertyPath: m_Convex
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: -7350152777436080692, guid: 4f5930e3d2b45ea468a44ae2a3a1eb3a,
type: 3}
propertyPath: m_Enabled
value: 0
objectReference: {fileID: 0}
- target: {fileID: -7350152777436080692, guid: 4f5930e3d2b45ea468a44ae2a3a1eb3a,
type: 3}
propertyPath: m_Mesh
value:
objectReference: {fileID: 0}
- target: {fileID: 4686351489640203416, guid: 4f5930e3d2b45ea468a44ae2a3a1eb3a,
type: 3}
propertyPath: m_LocalPosition.x
......@@ -116541,6 +116566,11 @@ PrefabInstance:
propertyPath: m_Enabled
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4069251918964216807, guid: 73b913978f53cb3468f3f518e86f8f73,
type: 3}
propertyPath: m_Mesh
value:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 73b913978f53cb3468f3f518e86f8f73, type: 3}
--- !u!1 &4869330585920949664 stripped
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