카메라 ShoulderView 전환 오류 수정
This commit is contained in:
@@ -7,7 +7,6 @@ using UnityEngine.UI;
|
||||
public class Panel_ToolBarAlarm : PanelBase
|
||||
{
|
||||
private TextMeshProUGUI Content;
|
||||
private Image Image_Icon;
|
||||
public float fadeTime;
|
||||
public Vector3 offset;
|
||||
|
||||
@@ -20,9 +19,7 @@ public class Panel_ToolBarAlarm : PanelBase
|
||||
transform.position = new Vector3(pos.x + offset.x, pos.y + offset.y, 0);
|
||||
gameObject.SetActive(true);
|
||||
|
||||
Image_Icon.color = isSuccess ? Color.green : Color.red;
|
||||
Content.SetText(value);
|
||||
|
||||
StartCoroutine(ScaleDown());
|
||||
}
|
||||
private IEnumerator ScaleDown()
|
||||
|
||||
@@ -15,6 +15,11 @@ public class ViewManager : MonoBehaviour, ISingle
|
||||
public void ChangeViewWithButtonClick(ViewMode mode)
|
||||
{
|
||||
preViewMode = controller.viewMode;
|
||||
var preViewModeData = new CameraEntity();
|
||||
preViewModeData.distance = controller.option.currentDistance;
|
||||
preViewModeData.azimuth = controller.option.currentAzimuth;
|
||||
preViewModeData.elevation = controller.option.currentElevation;
|
||||
|
||||
controller.SetViewMode(mode);
|
||||
|
||||
switch (mode)
|
||||
@@ -28,7 +33,7 @@ public class ViewManager : MonoBehaviour, ISingle
|
||||
break;
|
||||
|
||||
case ViewMode.FirstPersonView:
|
||||
SetFirstPersonView(preViewMode);
|
||||
SetFirstPersonView(preViewMode, preViewModeData);
|
||||
break;
|
||||
}
|
||||
controller.LastPositioning(true);
|
||||
@@ -69,11 +74,15 @@ public class ViewManager : MonoBehaviour, ISingle
|
||||
slider.ChangeValueFromOutside(floorIndex);
|
||||
}
|
||||
}
|
||||
private void SetFirstPersonView(ViewMode preViewMode)
|
||||
private void SetFirstPersonView(ViewMode preViewMode, CameraEntity preViewModeData)
|
||||
{
|
||||
if (building.currentFloor.isEmptyFloor)
|
||||
{
|
||||
controller.SetViewMode(preViewMode);
|
||||
controller.option.currentDistance = preViewModeData.distance;
|
||||
controller.option.currentAzimuth = preViewModeData.azimuth;
|
||||
controller.option.currentElevation = preViewModeData.elevation;
|
||||
|
||||
return;
|
||||
}
|
||||
if (controller.saveTargetPositions[ViewMode.FirstPersonView] == null)
|
||||
|
||||
Reference in New Issue
Block a user