Commit b9bfce8c authored by wanqing's avatar wanqing

修改场景

parent f31b2ece
...@@ -224,7 +224,14 @@ public class BombView : MonoBehaviour ...@@ -224,7 +224,14 @@ public class BombView : MonoBehaviour
//{ //{
// varPos.y = m_hitPoint.y - 2.0f; // varPos.y = m_hitPoint.y - 2.0f;
//} //}
if (m_curModelIndex == 1)
{
m_lerpPos.z = varPos.z + m_hitPoint.z+0.7f;
}
else
{
m_lerpPos.z = varPos.z + m_hitPoint.z; m_lerpPos.z = varPos.z + m_hitPoint.z;
}
m_bLerp = true; m_bLerp = true;
m_bIsFinishAni = false; m_bIsFinishAni = false;
float varWaitTime = 1.0f; float varWaitTime = 1.0f;
...@@ -495,7 +502,6 @@ public class BombView : MonoBehaviour ...@@ -495,7 +502,6 @@ public class BombView : MonoBehaviour
{ {
return; return;
} }
//Slice();
if (m_bFinishCut/* && m_bDelayFinishCut*/) if (m_bFinishCut/* && m_bDelayFinishCut*/)
{ {
if (Input.GetMouseButtonDown(0)) if (Input.GetMouseButtonDown(0))
...@@ -546,6 +552,7 @@ public class BombView : MonoBehaviour ...@@ -546,6 +552,7 @@ public class BombView : MonoBehaviour
{ {
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);
//Slice();
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;
......
...@@ -2565,7 +2565,7 @@ RectTransform: ...@@ -2565,7 +2565,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 564} m_AnchoredPosition: {x: 0, y: 364}
m_SizeDelta: {x: 512, y: 512} m_SizeDelta: {x: 512, y: 512}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &551544052248828899 --- !u!222 &551544052248828899
...@@ -5514,7 +5514,7 @@ RectTransform: ...@@ -5514,7 +5514,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 461} m_AnchoredPosition: {x: 0, y: 261}
m_SizeDelta: {x: 239, y: 61} m_SizeDelta: {x: 239, y: 61}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2381672036289364098 --- !u!222 &2381672036289364098
...@@ -6026,7 +6026,7 @@ RectTransform: ...@@ -6026,7 +6026,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 484} m_AnchoredPosition: {x: 0, y: 284}
m_SizeDelta: {x: 746, y: 754} m_SizeDelta: {x: 746, y: 754}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2786070646649537601 --- !u!222 &2786070646649537601
...@@ -6412,7 +6412,7 @@ RectTransform: ...@@ -6412,7 +6412,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 200} m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 786, y: 112} m_SizeDelta: {x: 786, y: 112}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3166921200652898927 --- !u!222 &3166921200652898927
...@@ -7589,7 +7589,7 @@ RectTransform: ...@@ -7589,7 +7589,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 0} m_AnchorMin: {x: 1, y: 0}
m_AnchorMax: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 0}
m_AnchoredPosition: {x: -20, y: 30} m_AnchoredPosition: {x: -20, y: 230}
m_SizeDelta: {x: 200, y: 600} m_SizeDelta: {x: 200, y: 600}
m_Pivot: {x: 1, y: 0} m_Pivot: {x: 1, y: 0}
--- !u!222 &4123035164145855317 --- !u!222 &4123035164145855317
...@@ -9951,7 +9951,7 @@ RectTransform: ...@@ -9951,7 +9951,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: -139}
m_SizeDelta: {x: 100, y: 100} m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &5471890004041652114 --- !u!1 &5471890004041652114
...@@ -15932,7 +15932,7 @@ RectTransform: ...@@ -15932,7 +15932,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 20, y: 30} m_AnchoredPosition: {x: 20, y: 230}
m_SizeDelta: {x: 240, y: 240} m_SizeDelta: {x: 240, y: 240}
m_Pivot: {x: 0, y: 0} m_Pivot: {x: 0, y: 0}
--- !u!1 &7251358910425099633 --- !u!1 &7251358910425099633
...@@ -18555,7 +18555,7 @@ RectTransform: ...@@ -18555,7 +18555,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 1} m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1}
m_AnchoredPosition: {x: 40, y: -320} m_AnchoredPosition: {x: 40, y: -420}
m_SizeDelta: {x: 600, y: 40} m_SizeDelta: {x: 600, y: 40}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &115026455693364947 --- !u!222 &115026455693364947
......
...@@ -10316,6 +10316,10 @@ MonoBehaviour: ...@@ -10316,6 +10316,10 @@ MonoBehaviour:
lineRenderer: {fileID: 3451800650340832984} lineRenderer: {fileID: 3451800650340832984}
m_normalObj: {fileID: 5320918402582742454} m_normalObj: {fileID: 5320918402582742454}
m_cutOffObj: {fileID: 5795836104360549552} m_cutOffObj: {fileID: 5795836104360549552}
crossMaterial: {fileID: 0}
layerMask:
serializedVersion: 2
m_Bits: 0
--- !u!65 &4809511935948006901 --- !u!65 &4809511935948006901
BoxCollider: BoxCollider:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -16381,7 +16385,7 @@ Camera: ...@@ -16381,7 +16385,7 @@ Camera:
height: 1 height: 1
near clip plane: 0.3 near clip plane: 0.3
far clip plane: 1000 far clip plane: 1000
field of view: 50 field of view: 60
orthographic: 0 orthographic: 0
orthographic size: 5 orthographic size: 5
m_Depth: -1 m_Depth: -1
......
...@@ -3874,7 +3874,7 @@ Camera: ...@@ -3874,7 +3874,7 @@ Camera:
height: 1 height: 1
near clip plane: 0.3 near clip plane: 0.3
far clip plane: 1000 far clip plane: 1000
field of view: 50 field of view: 60
orthographic: 0 orthographic: 0
orthographic size: 5 orthographic size: 5
m_Depth: -1 m_Depth: -1
...@@ -8382,6 +8382,10 @@ MonoBehaviour: ...@@ -8382,6 +8382,10 @@ MonoBehaviour:
lineRenderer: {fileID: 8917163246960790500} lineRenderer: {fileID: 8917163246960790500}
m_normalObj: {fileID: 1515827164576319142} m_normalObj: {fileID: 1515827164576319142}
m_cutOffObj: {fileID: 1275820557086522631} m_cutOffObj: {fileID: 1275820557086522631}
crossMaterial: {fileID: 0}
layerMask:
serializedVersion: 2
m_Bits: 0
--- !u!1 &8917163246579906844 --- !u!1 &8917163246579906844
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
......
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