Added tree grwoth camera animation, fixed combat camera state, fixed many errors in the console
This commit is contained in:
@@ -26,7 +26,7 @@ namespace Beyond
|
||||
|
||||
private void OnCombatEnd()
|
||||
{
|
||||
//if (wasTriggerd)
|
||||
if (GameStateManager.Instance)
|
||||
{
|
||||
GameStateManager.Instance.OnCombatEnd(m_fsm);
|
||||
// wasTriggerd = false;
|
||||
|
||||
@@ -310,3 +310,30 @@ MonoBehaviour:
|
||||
fixedAngle: {x: 0, y: 0}
|
||||
lookPoints: []
|
||||
cameraMode: 0
|
||||
- Name: Tree
|
||||
forward: -1
|
||||
right: 0.13
|
||||
defaultDistance: 8
|
||||
maxDistance: 12
|
||||
minDistance: 6
|
||||
height: 2.5
|
||||
smooth: 5
|
||||
smoothDamp: 1
|
||||
xMouseSensitivity: 4
|
||||
yMouseSensitivity: 2
|
||||
yMinLimit: -45
|
||||
yMaxLimit: 45
|
||||
xMinLimit: -360
|
||||
xMaxLimit: 360
|
||||
rotationOffSet: {x: 5, y: 0, z: 0}
|
||||
cullingHeight: 2.31
|
||||
cullingMinDist: 0.01
|
||||
fov: 59.5
|
||||
useZoom: 0
|
||||
fixedAngle: {x: 0, y: 0}
|
||||
lookPoints:
|
||||
- pointName: point_01
|
||||
positionPoint: {x: 0, y: 1, z: -10}
|
||||
eulerAngle: {x: -0, y: 0, z: 0}
|
||||
freeRotation: 0
|
||||
cameraMode: 0
|
||||
|
||||
@@ -217,7 +217,7 @@ namespace Beyond
|
||||
animationName = growinAnimation;
|
||||
leavesMaterials.ForEach(material => material.DOColor(initialColor, leavesColorName, 1f));
|
||||
}
|
||||
|
||||
//Player.Instance.PlayerInput.ChangeCameraStateWithLerp("Default");
|
||||
StartCoroutine(ShowFruitsCoroutine());
|
||||
|
||||
//animLayer = 0;
|
||||
@@ -599,7 +599,7 @@ namespace Beyond
|
||||
(size - startingSize));
|
||||
}
|
||||
}
|
||||
|
||||
Player.Instance.PlayerInput.ChangeCameraStateWithLerp("Default");
|
||||
treeAnimator.enabled = false;
|
||||
}
|
||||
|
||||
@@ -608,6 +608,8 @@ namespace Beyond
|
||||
/// </summary>
|
||||
public void GrowTree()
|
||||
{
|
||||
|
||||
Player.Instance.PlayerInput.ChangeCameraStateWithLerp("Tree");
|
||||
switch (currentTreeState)
|
||||
{
|
||||
case TreeState.Empty:
|
||||
|
||||
Reference in New Issue
Block a user