-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Island and movement bugs fixed, wild battle system added
- pre urp convert commit
- Loading branch information
Showing
1,226 changed files
with
1,626,921 additions
and
5,592 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,27 @@ | ||
using System.Collections; | ||
using System.Collections.Generic; | ||
using UnityEngine; | ||
|
||
public class AreaManager : MonoBehaviour | ||
{ | ||
|
||
[SerializeField] BattleSystem battleSystem; | ||
public GameObject player; | ||
[SerializeField] Toyo wildToyo; | ||
|
||
[SerializeField] public MapArea mapArea; | ||
|
||
private PlayerMovement playerMovement; | ||
|
||
// Start is called before the first frame update | ||
void Start() | ||
{ | ||
mapArea = FindAnyObjectByType<MapArea>(); | ||
} | ||
|
||
// Update is called once per frame | ||
void Update() | ||
{ | ||
|
||
} | ||
} |
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,12 @@ | ||
{ | ||
"roots": ["Assets"], | ||
"includes": [], | ||
"excludes": [], | ||
"options": { | ||
"types": true, | ||
"properties": true, | ||
"extended": true, | ||
"dependencies": true | ||
}, | ||
"baseScore": 9999 | ||
} |
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,51 @@ | ||
using System.Collections; | ||
using System.Collections.Generic; | ||
using UnityEngine; | ||
using UnityEngine.SceneManagement; | ||
|
||
public class BattleArea : MonoBehaviour | ||
{ | ||
[SerializeField] public GameController controller; | ||
float resetTimer = 5f; | ||
// Start is called before the first frame update | ||
void Start() | ||
{ | ||
controller = FindAnyObjectByType<GameController>(); | ||
} | ||
|
||
// Update is called once per frame | ||
void Update() | ||
{ | ||
|
||
} | ||
|
||
private void OnTriggerEnter(Collider other) | ||
{ | ||
|
||
} | ||
|
||
private void OnTriggerStay(Collider other) | ||
{ | ||
|
||
if (other.TryGetComponent(out PlayerMovement playerMove) && resetTimer < 0) | ||
{ | ||
BattleChance(); | ||
resetTimer = 3f; | ||
} | ||
resetTimer -= Time.deltaTime; | ||
//Debug.Log(resetTimer); | ||
} | ||
|
||
private void BattleChance() | ||
{ | ||
float isBattle = Random.Range(0f, 100f); | ||
|
||
if(isBattle > 10f) | ||
{ | ||
|
||
Debug.Log("battle triggered"); | ||
controller.CallBattleStartMethod(); | ||
} | ||
|
||
} | ||
} |
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,22 @@ | ||
using Cinemachine; | ||
using System.Collections; | ||
using System.Collections.Generic; | ||
using UnityEngine; | ||
|
||
public class CameraSetup : MonoBehaviour | ||
{ | ||
public ThirdPersonCam playerCam; | ||
public CinemachineFreeLook freeLookCam; | ||
|
||
// Start is called before the first frame update | ||
void Start() | ||
{ | ||
|
||
} | ||
|
||
// Update is called once per frame | ||
void Update() | ||
{ | ||
|
||
} | ||
} |
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
2 changes: 1 addition & 1 deletion
2
...Assets/Fantasy Adventure Environment.meta → ...Assets/Fantasy Adventure Environment.meta
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
Oops, something went wrong.