Skip to content

Commit 63a9ac1

Browse files
committed
final version?
1 parent d9c9901 commit 63a9ac1

27 files changed

+204
-22
lines changed

forest/Assets/Animal pack deluxe/Scenes.meta

+8
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

forest/Assets/FImpossible Creations/FBasic Assets/Behaviours/Animations.meta

+8
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

forest/Assets/FImpossible Creations/FBasic Assets/Behaviours/Cameras.meta

+8
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

forest/Assets/FImpossible Creations/FBasic Assets/Behaviours/Utilities/Bases.meta

+8
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

forest/Assets/FImpossible Creations/FBasic Assets/Editor Tools.meta

+8
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

forest/Assets/FImpossible Creations/FBasic Assets/FHelpers.meta

+8
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

forest/Assets/FImpossible Creations/FBasic Assets/Models/Feetle/Materials.meta

+8
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

forest/Assets/FImpossible Creations/FBasic Assets/Models/Fhreeped.meta

+8
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

forest/Assets/FImpossible Creations/FBasic Assets/Models/Folf.meta

+8
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

forest/Assets/FImpossible Creations/FBasic Assets/Models/Fpider/Materials.meta

+8
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

forest/Assets/FImpossible Creations/FBasic Assets/Models/Props/FLogo.meta

+8
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

forest/Assets/FImpossible Creations/FBasic Assets/Scripts.meta

+8
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

forest/Assets/FImpossible Creations/FBasic Assets/Shared Materials.meta

+8
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

forest/Assets/FImpossible Creations/Ground Fitter/Demo Ground Fitter/Other.meta

+8
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

forest/Assets/FImpossible Creations/Ground Fitter/Demo Ground Fitter/Prefabs.meta

+8
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

forest/Assets/FImpossible Creations/Ground Fitter/Demo Ground Fitter/S_GroundFitter_Demo NavMesh.meta

+8
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

forest/Assets/FImpossible Creations/Ground Fitter/Demo Ground Fitter/Scripts.meta

+8
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

forest/Assets/FImpossible Creations/Ground Fitter/Scripts/Base.meta

+8
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

forest/Assets/Gizmos/FIMSpace/GroundFitter.meta

+8
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

forest/Assets/Prefabs.meta

+8
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

forest/Assets/Scenes/SampleScene.unity

+4-4
Original file line numberDiff line numberDiff line change
@@ -408,7 +408,7 @@ MonoBehaviour:
408408
m_GameObject: {fileID: 604803764}
409409
m_Enabled: 1
410410
m_EditorHideFlags: 0
411-
m_Script: {fileID: 11500000, guid: 738f4eed96e113443b6eb276bab1e6c8, type: 3}
411+
m_Script: {fileID: 11500000, guid: febdb8c0b0bc13c469a0ba8e4966527c, type: 3}
412412
m_Name:
413413
m_EditorClassIdentifier:
414414
speed: 5
@@ -728,7 +728,7 @@ MonoBehaviour:
728728
m_GameObject: {fileID: 1003224501}
729729
m_Enabled: 1
730730
m_EditorHideFlags: 0
731-
m_Script: {fileID: 11500000, guid: 738f4eed96e113443b6eb276bab1e6c8, type: 3}
731+
m_Script: {fileID: 11500000, guid: febdb8c0b0bc13c469a0ba8e4966527c, type: 3}
732732
m_Name:
733733
m_EditorClassIdentifier:
734734
speed: 5
@@ -1444,7 +1444,7 @@ MonoBehaviour:
14441444
m_GameObject: {fileID: 1872049743}
14451445
m_Enabled: 1
14461446
m_EditorHideFlags: 0
1447-
m_Script: {fileID: 11500000, guid: 738f4eed96e113443b6eb276bab1e6c8, type: 3}
1447+
m_Script: {fileID: 11500000, guid: febdb8c0b0bc13c469a0ba8e4966527c, type: 3}
14481448
m_Name:
14491449
m_EditorClassIdentifier:
14501450
speed: 5
@@ -1789,7 +1789,7 @@ MonoBehaviour:
17891789
m_GameObject: {fileID: 2093699749}
17901790
m_Enabled: 1
17911791
m_EditorHideFlags: 0
1792-
m_Script: {fileID: 11500000, guid: 738f4eed96e113443b6eb276bab1e6c8, type: 3}
1792+
m_Script: {fileID: 11500000, guid: febdb8c0b0bc13c469a0ba8e4966527c, type: 3}
17931793
m_Name:
17941794
m_EditorClassIdentifier:
17951795
speed: 5

forest/Assets/Scripts/SimpleMove.cs

+23-15
Original file line numberDiff line numberDiff line change
@@ -29,36 +29,43 @@ void Awake()
2929
heading = Random.Range(0, 360);
3030
transform.eulerAngles = new Vector3(0, heading, 0);
3131

32-
StartCoroutine(NewHeading());
32+
//Change target rotation to a random angle.
33+
NewHeadingRoutine();
3334

3435

3536

3637
}
3738

3839
void Update()
3940
{
41+
//If the eular angle reach the target angle, then we should start for a new target angle.
42+
4043
if (Vector3.Distance(transform.position, player.position) < 50f)
4144
{
4245

43-
anim.SetBool("Walk", false);
44-
anim.SetBool("Run", true);
45-
46-
transform.eulerAngles = Vector3.Slerp(transform.eulerAngles, targetRotation, Time.deltaTime * directionChangeInterval);
47-
var forward = transform.TransformDirection((-player.position + transform.position).normalized);
48-
controller.SimpleMove(forward * speed*2);
46+
anim.SetBool("Walk", false);
47+
anim.SetBool("Run", true);
48+
//targetRotation = Quaternion.LookRotation(player.position - transform.position);
49+
//targetRotation = new Vector3(0, Quaternion.LookRotation(player.position-transform.position).eulerAngles.y, 0);
50+
//targetRotation =new Vector3( 0, Mathf.Atan((-player.position + transform.position).z/ (-player.position + transform.position).x), 0);
51+
//transform.eulerAngles = Vector3.Slerp(transform.eulerAngles, targetRotation, Time.deltaTime);
52+
//transform.rotation = Quaternion.RotateTowards(transform.rotation, targetRotation, Time.deltaTime/15);
53+
transform.LookAt(player);
4954
}
5055
else
5156
{
5257

53-
anim.SetBool("Walk", true);
54-
anim.SetBool("Run", false);
55-
56-
transform.eulerAngles = Vector3.Slerp(transform.eulerAngles, targetRotation, Time.deltaTime * directionChangeInterval);
58+
59+
anim.SetBool("Walk", true);
60+
anim.SetBool("Run", false);
61+
//transform.eulerAngles = Vector3.Slerp(transform.eulerAngles, targetRotation, Time.deltaTime * directionChangeInterval);
62+
transform.rotation = Quaternion.RotateTowards(transform.rotation, Quaternion.LookRotation ( targetRotation), Time.deltaTime);
5763

58-
var forward = transform.TransformDirection(Vector3.forward);
59-
controller.SimpleMove(forward * speed);
64+
6065
}
61-
66+
var forward = transform.TransformDirection(Vector3.forward);
67+
controller.SimpleMove(forward * speed * 2);
68+
Debug.Log(targetRotation);
6269
}
6370

6471
/// <summary>
@@ -82,7 +89,8 @@ void NewHeadingRoutine()
8289
var floor = Mathf.Clamp(heading - maxHeadingChange, 0, 360);
8390
var ceil = Mathf.Clamp(heading + maxHeadingChange, 0, 360);
8491
heading = Random.Range(floor, ceil);
85-
targetRotation = new Vector3(0, heading, 0);
92+
93+
targetRotation =new Vector3(0,heading,0);
8694
}
8795
}
8896

forest/Assets/Scripts/SimpleMove.cs.meta

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

forest/Assets/_TerrainAutoUpgrade.meta

+8
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

forest/ProjectSettings/EditorBuildSettings.asset

+4-1
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,8 @@
44
EditorBuildSettings:
55
m_ObjectHideFlags: 0
66
serializedVersion: 2
7-
m_Scenes: []
7+
m_Scenes:
8+
- enabled: 1
9+
path: Assets/Scenes/SampleScene.unity
10+
guid: 9fc0d4010bbf28b4594072e72b8655ab
811
m_configObjects: {}

forest/ProjectSettings/GraphicsSettings.asset

+3
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,9 @@ GraphicsSettings:
3535
- {fileID: 15106, guid: 0000000000000000f000000000000000, type: 0}
3636
- {fileID: 10753, guid: 0000000000000000f000000000000000, type: 0}
3737
- {fileID: 10770, guid: 0000000000000000f000000000000000, type: 0}
38+
- {fileID: 16000, guid: 0000000000000000f000000000000000, type: 0}
39+
- {fileID: 16001, guid: 0000000000000000f000000000000000, type: 0}
40+
- {fileID: 17000, guid: 0000000000000000f000000000000000, type: 0}
3841
m_PreloadedShaders: []
3942
m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000,
4043
type: 0}
+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
m_EditorVersion: 2019.3.4f1
2-
m_EditorVersionWithRevision: 2019.3.4f1 (3274385dcda2)
2+
m_EditorVersionWithRevision: 2019.3.4f1 (4f139db2fdbd)

0 commit comments

Comments
 (0)