Commit 895d1ec7 authored by wanqing's avatar wanqing

打开调试模式,震动修改

parent d1118b2d
......@@ -245,8 +245,8 @@ public class BattleUI : MonoBehaviour
m_battleObj.SetActive(bool_);
//m_successResultObj.SetActive(bool_);
//m_successResultMaskObj.SetActive(!bool_);
//m_ShowMouseObj.SetActive(!bool_);
//m_HideMouseObj.SetActive(!bool_);
m_ShowMouseObj.SetActive(!bool_);
m_HideMouseObj.SetActive(!bool_);
}
//设置手势位置
public void SetMousePos(float x,float y)
......
......@@ -595,7 +595,7 @@ public class ChainRopeView : MonoBehaviour
if (m_bCatchTouchUp)
{
m_bIsClawUp = false;
PlayShake();
//PlayShake();
cursor.ChangeLength(rope.restLength + GameServices.configService.playerConfig.ropeExtendSpeed * Time.deltaTime);
}
else
......@@ -612,7 +612,7 @@ public class ChainRopeView : MonoBehaviour
//PlayShake();
}
m_bIsClawUp = true;
PlayShake();
//PlayShake();
cursor.ChangeLength(rope.restLength - GameServices.configService.playerConfig.ropeReduceSpeed * Time.deltaTime);
}
else
......@@ -625,16 +625,20 @@ public class ChainRopeView : MonoBehaviour
m_bIsCatch = false;
m_bIsNeedRotate = true;
m_bIsCathchObjHitTarget = false;
ResetLightPos();
SetJoyStickDirectTrans(m_topCollider.transform);
//ResetLightPos();
//SetJoyStickDirectTrans(m_topCollider.transform);
}
m_addAngleSpeed -= Time.deltaTime * varRotateSpeed;
if (m_addAngleSpeed <= 0)
if (m_addAngleSpeed < 0)
{
m_addAngleSpeed = 0;
}
else
{
m_leftClawTrans.localRotation = Quaternion.Euler(0, m_leftClawStartRatateY, -m_addAngleSpeed);
m_rightClawTrans.localRotation = Quaternion.Euler(0, m_rightClawStartRatateY, m_addAngleSpeed);
PlayShake();
}
}
else
{
......@@ -647,12 +651,12 @@ public class ChainRopeView : MonoBehaviour
//PlayShake();
}
m_bIsClawUp = true;
PlayShake();
//PlayShake();
cursor.ChangeLength(rope.restLength - GameServices.configService.playerConfig.ropeReduceSpeed * Time.deltaTime);
}
else
{
SetJoyStickDirectTrans(m_topCollider.transform);
//SetJoyStickDirectTrans(m_topCollider.transform);
//if (m_clawDownOrUpAudioSource)
//{
// GameServices.audioServices.AudioPlayFinished(m_clawDownOrUpAudioSource);
......@@ -673,7 +677,7 @@ public class ChainRopeView : MonoBehaviour
if (m_bPress)
{
m_bIsClawUp = false;
PlayShake();
//PlayShake();
cursor.ChangeLength(rope.restLength + GameServices.configService.playerConfig.ropeExtendSpeed * Time.deltaTime);
}
if (m_bColliderTarget)
......@@ -681,6 +685,7 @@ public class ChainRopeView : MonoBehaviour
if (m_bIsMaxAngle)
{
m_addAngleSpeed += Time.deltaTime * varRotateSpeed;
PlayShake();
if (m_addAngleSpeed >= varMaxAngle)
{
m_addAngleSpeed = varMaxAngle;
......@@ -699,7 +704,7 @@ public class ChainRopeView : MonoBehaviour
//PlayShake();
}
m_bIsClawUp = true;
PlayShake();
//PlayShake();
cursor.ChangeLength(rope.restLength - GameServices.configService.playerConfig.ropeReduceSpeed * Time.deltaTime);
}
else
......@@ -710,14 +715,18 @@ public class ChainRopeView : MonoBehaviour
// m_clawDownOrUpAudioSource = null;
//}
m_bIsNeedRotate = true;
ResetLightPos();
SetJoyStickDirectTrans(m_topCollider.transform);
//ResetLightPos();
//SetJoyStickDirectTrans(m_topCollider.transform);
}
m_addAngleSpeed -= Time.deltaTime * varRotateSpeed;
if (m_addAngleSpeed <= 0)
if (m_addAngleSpeed < 0)
{
m_addAngleSpeed = 0;
}
else
{
PlayShake();
}
}
m_leftClawTrans.localRotation = Quaternion.Euler(0, m_leftClawStartRatateY, -m_addAngleSpeed);
m_rightClawTrans.localRotation = Quaternion.Euler(0, m_rightClawStartRatateY, m_addAngleSpeed);
......@@ -726,12 +735,15 @@ public class ChainRopeView : MonoBehaviour
else
{
m_addAngleSpeed -= Time.deltaTime * varRotateSpeed;
if (m_addAngleSpeed <= 0)
if (m_addAngleSpeed < 0)
{
m_addAngleSpeed = 0;
}
else
{
m_leftClawTrans.localRotation = Quaternion.Euler(0, m_leftClawStartRatateY, -m_addAngleSpeed);
m_rightClawTrans.localRotation = Quaternion.Euler(0, m_rightClawStartRatateY, m_addAngleSpeed);
}
//m_threeClawTrans.localRotation = Quaternion.Euler(0, m_threeClawStartRatateY, m_addAngleSpeed);
}
}
......
......@@ -6604,7 +6604,7 @@ MonoBehaviour:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6064464677632144689}
m_Enabled: 0
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 14433df62b9b3554e93abbfbc187fc8c, type: 3}
m_Name:
......
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