Commit 18f9e56b authored by wanqing's avatar wanqing

修改场景

parent 9d497d6f
...@@ -142,6 +142,7 @@ public class BombView : MonoBehaviour ...@@ -142,6 +142,7 @@ public class BombView : MonoBehaviour
m_curPropModelObj = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.prop3Obj); m_curPropModelObj = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.prop3Obj);
m_curPropAnimator = m_curPropModelObj.GetComponentInChildren<Animator>(); m_curPropAnimator = m_curPropModelObj.GetComponentInChildren<Animator>();
PlayIdle(); PlayIdle();
m_curPropModelObj.transform.localScale = Vector3.one * 0.7f;
m_curPropModelObj.transform.position = m_propStartPos[3].position; m_curPropModelObj.transform.position = m_propStartPos[3].position;
SetNormalState(true); SetNormalState(true);
Invoke("InvokeCreateProp", 0.1f); Invoke("InvokeCreateProp", 0.1f);
...@@ -185,14 +186,29 @@ public class BombView : MonoBehaviour ...@@ -185,14 +186,29 @@ public class BombView : MonoBehaviour
void PlayAttackAnimator() void PlayAttackAnimator()
{ {
Vector3 varPos = m_curPropModelObj.transform.position; Vector3 varPos = m_curPropModelObj.transform.position;
if(BattleCtrl.instance.levelManager.CurLevelIndex == LevelEnum.levelOneIndex) if (BattleCtrl.instance.levelManager.CurLevelIndex == LevelEnum.levelOneIndex)
{ {
m_lerpPos.x = m_hitPoint.x + 6.0f; if (m_curModelIndex == 3)
{
m_lerpPos.x = varPos.x - 2.5f;
}
else
{
m_lerpPos.x = m_hitPoint.x + 6.0f;
}
} }
else if(BattleCtrl.instance.levelManager.CurLevelIndex == LevelEnum.levelTwoIndex) else if (BattleCtrl.instance.levelManager.CurLevelIndex == LevelEnum.levelTwoIndex)
{ {
m_lerpPos.x = m_hitPoint.x + 6.0f; if (m_curModelIndex == 3)
{
m_lerpPos.x = varPos.x - 2.5f;
}
else
{
m_lerpPos.x = m_hitPoint.x + 6.0f;
}
} }
//m_lerpPos.x = varPos.x - 3.0f;
m_lerpPos.y = m_hitPoint.y; m_lerpPos.y = m_hitPoint.y;
//if (m_curModelIndex == 1) //if (m_curModelIndex == 1)
//{ //{
......
...@@ -16747,7 +16747,7 @@ Transform: ...@@ -16747,7 +16747,7 @@ Transform:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8587577854304250064} m_GameObject: {fileID: 8587577854304250064}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 15.24, y: 0.8, z: -0.82} m_LocalPosition: {x: 15.24, y: 0.5, z: -1.1}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 1633887187434432277} m_Father: {fileID: 1633887187434432277}
......
...@@ -8303,7 +8303,7 @@ Transform: ...@@ -8303,7 +8303,7 @@ Transform:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8917163245743546928} m_GameObject: {fileID: 8917163245743546928}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 15.24, y: 0.8, z: -0.82} m_LocalPosition: {x: 15.24, y: 0.5, z: -1.1}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 8917163246664590761} m_Father: {fileID: 8917163246664590761}
......
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