Commit 221b32af authored by wanqing's avatar wanqing

增加死亡动画

parent 1dca60ae
...@@ -23,6 +23,7 @@ public class SixLevelPlayerCollision : MonoBehaviour ...@@ -23,6 +23,7 @@ public class SixLevelPlayerCollision : MonoBehaviour
if (other.collider.gameObject.CompareTag("Ball") && m_bCollider) if (other.collider.gameObject.CompareTag("Ball") && m_bCollider)
{ {
m_bCollider = false; m_bCollider = false;
m_animator.Play("Die");
BattleCtrl.instance.OnBattleFail(); BattleCtrl.instance.OnBattleFail();
} }
} }
......
...@@ -198,11 +198,25 @@ public class ChainHandle : MonoBehaviour ...@@ -198,11 +198,25 @@ public class ChainHandle : MonoBehaviour
// Mathf.Clamp(transform.position.z, varMinY, varMaxY)); // Mathf.Clamp(transform.position.z, varMinY, varMaxY));
//} //}
//铁球有去无回 //铁球有去无回
if(transform.localEulerAngles.x > 180.0f && transform.localEulerAngles.x <= 330.0f && m_controlRotate) if(transform.localEulerAngles.x > 180.0f && m_controlRotate)
{ {
m_controlRotate = false; if (m_hingJoint)
m_rigidBody.isKinematic = true; {
transform.localRotation = Quaternion.Euler(-90, 0, 0); GameObject.Destroy(m_hingJoint);
m_hingJoint = null;
}
if (m_rigidBody)
{
GameObject.Destroy(m_rigidBody);
m_rigidBody = null;
}
Quaternion varVec3 = transform.localRotation;
varVec3.x -= Time.deltaTime/2;
transform.localRotation = varVec3;
if(transform.localEulerAngles.x <= 280.0f)
{
m_controlRotate = false;
}
} }
} }
...@@ -221,7 +235,10 @@ public class ChainHandle : MonoBehaviour ...@@ -221,7 +235,10 @@ public class ChainHandle : MonoBehaviour
float varY = (Input.mousePosition.y - Screen.height / 2f) / (Screen.width / GlobalConfig.NormalWidth); float varY = (Input.mousePosition.y - Screen.height / 2f) / (Screen.width / GlobalConfig.NormalWidth);
BattleCtrl.instance.battleUI.SetSymbolPos(varX, varY); BattleCtrl.instance.battleUI.SetSymbolPos(varX, varY);
//重置状态 //重置状态
m_rigidBody.isKinematic = true; if(m_rigidBody)
{
m_rigidBody.isKinematic = true;
}
if(m_hingJoint) if(m_hingJoint)
{ {
GameObject.Destroy(m_hingJoint); GameObject.Destroy(m_hingJoint);
...@@ -238,6 +255,10 @@ public class ChainHandle : MonoBehaviour ...@@ -238,6 +255,10 @@ public class ChainHandle : MonoBehaviour
m_parentTrans.position = varVec3; m_parentTrans.position = varVec3;
GameServices.timerServices.Push(this, 0.1f, delegate GameServices.timerServices.Push(this, 0.1f, delegate
{ {
if (!m_rigidBody)
{
m_rigidBody = gameObject.AddComponent<Rigidbody>();
}
if (!m_hingJoint) if (!m_hingJoint)
{ {
m_hingJoint = gameObject.AddComponent<HingeJoint>(); m_hingJoint = gameObject.AddComponent<HingeJoint>();
......
%YAML 1.1 %YAML 1.1
%TAG !u! tag:unity3d.com,2011: %TAG !u! tag:unity3d.com,2011:
--- !u!1102 &-8974096978781679025
AnimatorState:
serializedVersion: 5
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Die
m_Speed: 1.5
m_CycleOffset: 0
m_Transitions: []
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
m_WriteDefaultValues: 1
m_Mirror: 0
m_SpeedParameterActive: 0
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 1827226128182048838, guid: 791a1773ec195c144b380a12f10e88e8,
type: 3}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!91 &9100000 --- !u!91 &9100000
AnimatorController: AnimatorController:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -14,7 +41,7 @@ AnimatorController: ...@@ -14,7 +41,7 @@ AnimatorController:
m_DefaultFloat: 0 m_DefaultFloat: 0
m_DefaultInt: 0 m_DefaultInt: 0
m_DefaultBool: 0 m_DefaultBool: 0
m_Controller: {fileID: 0} m_Controller: {fileID: 9100000}
m_AnimatorLayers: m_AnimatorLayers:
- serializedVersion: 5 - serializedVersion: 5
m_Name: Base Layer m_Name: Base Layer
...@@ -43,6 +70,9 @@ AnimatorStateMachine: ...@@ -43,6 +70,9 @@ AnimatorStateMachine:
- serializedVersion: 1 - serializedVersion: 1
m_State: {fileID: 7199662585890832343} m_State: {fileID: 7199662585890832343}
m_Position: {x: 322.25034, y: 181.77106, z: 0} m_Position: {x: 322.25034, y: 181.77106, z: 0}
- serializedVersion: 1
m_State: {fileID: -8974096978781679025}
m_Position: {x: 320, y: 290, z: 0}
m_ChildStateMachines: [] m_ChildStateMachines: []
m_AnyStateTransitions: [] m_AnyStateTransitions: []
m_EntryTransitions: [] m_EntryTransitions: []
......
...@@ -4442,8 +4442,8 @@ Transform: ...@@ -4442,8 +4442,8 @@ Transform:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5493773560976184134} m_GameObject: {fileID: 5493773560976184134}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: -16.88, z: 0} m_LocalPosition: {x: 0, y: -17.1, z: 0}
m_LocalScale: {x: 1.5, y: 1.5, z: 1.5} m_LocalScale: {x: 2, y: 2, z: 2}
m_Children: [] m_Children: []
m_Father: {fileID: 8412891822539276460} m_Father: {fileID: 8412891822539276460}
m_RootOrder: 1 m_RootOrder: 1
......
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