Skip to content

B
BoomMaster
Commit d9eef904 authored by wanqing's avatar wanqing
Browse files
Options

修改代码

parent 21712683
Hide whitespace changes
Inline Side-by-side
Showing with 44 additions and 44 deletions
BoomMaster/Assets/#A2_Scripts/Battle/View/BombView.cs
View file @ d9eef904
...@@ -154,8 +154,8 @@ public class BombView : MonoBehaviour ...@@ -154,8 +154,8 @@ public class BombView : MonoBehaviour
m_curPropModelObj.transform.position = m_propStartPos[4].position; m_curPropModelObj.transform.position = m_propStartPos[4].position;
m_curPropModelObj.transform.rotation = Quaternion.identity; m_curPropModelObj.transform.rotation = Quaternion.identity;
SetNormalState(false); SetNormalState(false);
m_rayFireBlade = m_curPropModelObj.transform.Find("Props4/Props4/Blade_Target").GetComponent<RayfireBlade>(); //m_rayFireBlade = m_curPropModelObj.transform.Find("Props4/Props4/Blade_Target").GetComponent<RayfireBlade>();
m_rayFireBlade.SetTarget(m_childCutTrans.gameObject); //m_rayFireBlade.SetTarget(m_childCutTrans.gameObject);
Invoke("InvokeCreateProp", 0.1f); Invoke("InvokeCreateProp", 0.1f);
} }
void InvokeCreateProp() void InvokeCreateProp()
...@@ -426,7 +426,7 @@ public class BombView : MonoBehaviour ...@@ -426,7 +426,7 @@ public class BombView : MonoBehaviour
{ {
return; return;
} }
if(m_bFinishCut && m_bDelayFinishCut) if(m_bFinishCut/* && m_bDelayFinishCut*/)
{ {
if (Input.GetMouseButtonDown(0)) if (Input.GetMouseButtonDown(0))
{ {
...@@ -465,51 +465,51 @@ public class BombView : MonoBehaviour ...@@ -465,51 +465,51 @@ public class BombView : MonoBehaviour
{ {
m_lineIndex = 0; m_lineIndex = 0;
m_bMouseUpEnd = false; m_bMouseUpEnd = false;
m_bDelayFinishCut = false; //m_bDelayFinishCut = false;
m_pathPos.Clear(); m_pathPos.Clear();
m_curPropModelObj.transform.position = m_firstBombPos; m_curPropModelObj.transform.position = m_firstBombPos;
m_curPropModelObj.transform.rotation = m_kniftDefaultRotate[m_mouseUpIndex - 1]; m_curPropModelObj.transform.rotation = m_kniftDefaultRotate[m_mouseUpIndex - 1];
} }
} }
//画完线开始切割 //画完线开始切割
if(m_lineIndex == 0 && m_mouseUpIndex > 0 && m_curPropModelObj && !m_bFinishCut && !m_bDelayFinishCut) if(m_lineIndex == 0 && m_mouseUpIndex > 0 && m_curPropModelObj && !m_bFinishCut/* && !m_bDelayFinishCut*/)
{ {
m_curPropModelObj.transform.position = Vector3.Lerp(m_curPropModelObj.transform.position, m_secondBombPos,0.2f); m_curPropModelObj.transform.position = Vector3.Lerp(m_curPropModelObj.transform.position, m_secondBombPos,0.2f);
if(Vector3.SqrMagnitude(m_curPropModelObj.transform.position - m_secondBombPos) <= 0.5f) if(Vector3.SqrMagnitude(m_curPropModelObj.transform.position - m_secondBombPos) <= 0.5f)
{ {
lineRenderer.positionCount = 0; lineRenderer.positionCount = 0;
m_bFinishCut = true; m_bFinishCut = true;
m_rayFireBlade.SliceTarget(); //m_rayFireBlade.SliceTarget();
GameServices.timerServices.Push(this, 2.0f, delegate //GameServices.timerServices.Push(this, 2.0f, delegate
{ //{
if(BattleCtrl.instance.levelManager.CurLevelIndex == LevelEnum.levelOneIndex) // if(BattleCtrl.instance.levelManager.CurLevelIndex == LevelEnum.levelOneIndex)
{ // {
if (m_mouseUpIndex == 1) // if (m_mouseUpIndex == 1)
{ // {
m_childCutTrans = m_cutOffObj.transform.Find("column_root/column_fr_0"); // m_childCutTrans = m_cutOffObj.transform.Find("column_root/column_fr_0");
} // }
else if (m_mouseUpIndex == 2) // else if (m_mouseUpIndex == 2)
{ // {
m_childCutTrans = m_cutOffObj.transform.Find("column_root/column_fr_0_root/column_fr_0_fr_0"); // m_childCutTrans = m_cutOffObj.transform.Find("column_root/column_fr_0_root/column_fr_0_fr_0");
} // }
} // }
else if(BattleCtrl.instance.levelManager.CurLevelIndex == LevelEnum.levelTwoIndex) // else if(BattleCtrl.instance.levelManager.CurLevelIndex == LevelEnum.levelTwoIndex)
{ // {
if (m_mouseUpIndex == 1) // if (m_mouseUpIndex == 1)
{ // {
m_childCutTrans = m_cutOffObj.transform.Find("people_root/people_fr_0"); // m_childCutTrans = m_cutOffObj.transform.Find("people_root/people_fr_0");
} // }
else if (m_mouseUpIndex == 2) // else if (m_mouseUpIndex == 2)
{ // {
m_childCutTrans = m_cutOffObj.transform.Find("people_root/people_fr_0_root/people_fr_0_fr_0"); // m_childCutTrans = m_cutOffObj.transform.Find("people_root/people_fr_0_root/people_fr_0_fr_0");
} // }
} // }
if(m_childCutTrans) // if(m_childCutTrans)
{ // {
m_bDelayFinishCut = true; // m_bDelayFinishCut = true;
m_rayFireBlade.SetTarget(m_childCutTrans.gameObject); // m_rayFireBlade.SetTarget(m_childCutTrans.gameObject);
} // }
}); //});
} }
} }
//if (Input.GetMouseButtonDown(0)) //if (Input.GetMouseButtonDown(0))
......
BoomMaster/Assets/#E1_Plugins/RayFire/Scripts/Components/RayfireBlade.cs
View file @ d9eef904
...@@ -76,23 +76,23 @@ namespace RayFire ...@@ -76,23 +76,23 @@ namespace RayFire
transForm = GetComponent<Transform>(); transForm = GetComponent<Transform>();
// Check collider // Check collider
//colLider = GetComponent<Collider>(); colLider = GetComponent<Collider>();
//No collider. Add own //No collider. Add own
//if (colLider == null) if (colLider == null)
// colLider = gameObject.AddComponent<MeshCollider>(); colLider = gameObject.AddComponent<MeshCollider>();
//if (colLider is MeshCollider) if (colLider is MeshCollider)
// ((MeshCollider)colLider).convex = true; ((MeshCollider)colLider).convex = true;
//colLider.isTrigger = true; colLider.isTrigger = true;
} }
/// ///////////////////////////////////////////////////////// /// /////////////////////////////////////////////////////////
/// Triggers /// Triggers
/// ///////////////////////////////////////////////////////// /// /////////////////////////////////////////////////////////
// Check for trigger // Check for trigger
void OnTriggerEnter (Collider col) void OnTriggerEnter (Collider col)
{ {
......
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