Commit 7a3797d3 authored by taitue2000's avatar taitue2000

update

parent 0ca315ba
fileFormatVersion: 2
guid: 9d8ff8cc2c7c6ee41a32611637b53b45
timeCreated: 1715247515
licenseType: Free
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: 476097be91b616449863e30fb3f6c12a
guid: ff9b4a4d52f3bd44d93d618bc931b99b
timeCreated: 1715247515
licenseType: Free
DefaultImporter:
......
This diff is collapsed.
This diff is collapsed.
fileFormatVersion: 2
guid: c6546786ce4fe134db3b35d17ba43cda
timeCreated: 1715247515
licenseType: Free
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
This diff is collapsed.
This diff is collapsed.
fileFormatVersion: 2
guid: 5ebc3e0dc1d87f14f8821f62880619ee
timeCreated: 1715247515
licenseType: Free
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
......@@ -4,13 +4,18 @@ using UnityEngine;
public class BallCheckOut : MonoBehaviour
{
[SerializeField] int type = 0;
private void OnCollisionEnter(Collision collision)
{
if (collision.gameObject.CompareTag("Ball"))
{
if (GetComponent<AudioSource>() != null)
GetComponent<AudioSource>().Play();
if (type == 1)
{
GameManager.intance.MainCamera.GetComponent<ShakeCamera>().PlayCameraShake(0.4f);
}
}
}
}
......@@ -19,6 +19,7 @@ public class BallController : MonoBehaviour
[SerializeField] AudioClip Catch;
[SerializeField] AudioClip Kick;
[SerializeField] TrailRenderer train;
Rigidbody rb;
void Start()
......@@ -32,9 +33,7 @@ public class BallController : MonoBehaviour
void Update()
{
if (!isCanShot) return;
//if (isSelected)
//{
//PlayerDataReceiver.intance.SendItemData(gameObject.name, gameObject.transform.position.ToString(), gameObject.transform.rotation.ToString(), gameObject.transform.localScale.ToString());
if (Input.GetMouseButtonDown(0))
{
// Ghi lại thời gian khi chuột được nhấn và vị trí ban đầu
......@@ -53,6 +52,9 @@ public class BallController : MonoBehaviour
// Lấy vị trí chuột khi được thả ra
endPos = Input.mousePosition;
//endPos = Camera.main.ScreenToWorldPoint(new Vector3(endPos.x, endPos.y, Camera.main.transform.position.y));
//startPos = Camera.main.ScreenToWorldPoint(new Vector3(startPos.x, startPos.y, Camera.main.transform.position.y));
//endPos.
//float a = Mathf.Clamp(endPos.y, 0, 600f);
//endPos = new Vector3(endPos.x, a, endPos.y);
......@@ -64,8 +66,10 @@ public class BallController : MonoBehaviour
//direction = new Vector2(a, b);
// Thêm lực cho rigidbody của đối tượng 3D dựa trên hướng và lực ném
rb.isKinematic = false;
// rb.isKinematic = false;
rb.AddForce(-direction.x * throwForceInXandY, -direction.y * throwForceInXandY, throwForceInZ / timeInterval);
isCanShot = false;
ballAudio.PlayOneShot(Kick);
// Hủy đối tượng sau 3 giây
......@@ -106,19 +110,25 @@ public class BallController : MonoBehaviour
transform.position = Vector3.zero;
gameObject.SetActive(false);
//transform.position.vecto
rb.velocity = Vector3.zero;
rb.angularVelocity = Vector3.zero;
train.enabled= false;
//Debug.Log(transform.position);
GameManager.intance.SetUpGame();
isCanShot = true;
}
public void OpenTrain()
{
train.enabled = true;
}
private void OnCollisionEnter(Collision collision)
{
if (collision.gameObject.CompareTag("Player"))
{
//ballAudio.clip = Catch;
ballAudio.PlayOneShot(Catch);
}
......
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
public class GKController : MonoBehaviour
{
void Start()
{
}
void Update()
{
}
}
fileFormatVersion: 2
guid: b437b8220d533674ebd24538ba19b703
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
......@@ -24,13 +24,21 @@ public class GameManager : MonoBehaviour
}
public void SetUpGame()
{
MainCamera.transform.position = new Vector3 ( Random.Range(-14f,14f),1.3f,Random.Range(55, 70));
//MainCamera.transform.position = new Vector3 ( Random.Range(-14f,14f),1.3f,Random.Range(55, 65));
MainCamera.transform.position = new Vector3(0, 1.3f, 61.5f);
MainCamera.transform.LookAt(LookAtTarget.transform);
goalkeeperAnimator.gameObject.transform.LookAt(BallPrefabs.transform);
goalkeeperAnimator.Play("Idle");
//goalkeeperAnimator.gameObject.transform.LookAt(BallPrefabs.transform);
Vector3 ballPosition = MainCamera.transform.position - MainCamera.transform.forward * offset.z + MainCamera.transform.up * offset.y;
ballPosition = new Vector3(ballPosition.x, 0.2f, ballPosition.z);
//Instantiate(BallPrefabs, MainCamera.transform.position - offset, Quaternion.identity);
Instantiate(BallPrefabs, ballPosition, Quaternion.identity);
//Instantiate(BallPrefabs, ballPosition, Quaternion.identity);
//Instantiate(BallPrefabs, new Vector3 (MainCamera.transform.position.x - offset.x , 0.2f, MainCamera.transform.position.z - offset.z), Quaternion.identity);
//new Vector3(0, 0.2f, 68.38f);
BallPrefabs.transform.position = ballPosition;
BallPrefabs.SetActive(true);
BallPrefabs.GetComponent<BallController>().OpenTrain();
}
}
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
public class ShakeCamera : MonoBehaviour
{
float shakeDuration = 1f;
float shakeMagnitude = 0.2f;
Vector3 initialPosition;
void Start()
{
initialPosition = transform.position;
}
public void PlayCameraShake(float shakeTime)
{
shakeDuration = shakeTime;
StartCoroutine(ShakeCameraAction());
}
IEnumerator ShakeCameraAction()
{
float elapsedTime = 0;
while (elapsedTime < shakeDuration)
{
transform.position = initialPosition + (Vector3)Random.insideUnitCircle * shakeMagnitude;
elapsedTime += Time.deltaTime;
yield return new WaitForEndOfFrame();
}
transform.position = initialPosition;
}
}
fileFormatVersion: 2
guid: c9717514b15d95045b3547ec1c20f2aa
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
......@@ -12,6 +12,7 @@ public class VarCheckGoal : MonoBehaviour
Score++;
GetComponent<AudioSource>().Play();
BackGroundView.intance.ShowCheckImage(true);
GameManager.intance.MainCamera.GetComponent<ShakeCamera>().PlayCameraShake(1f);
}
}
}
{
"dependencies": {
"com.unity.cinemachine": "2.9.7",
"com.unity.collab-proxy": "2.3.1",
"com.unity.feature.development": "1.0.1",
"com.unity.textmeshpro": "3.0.8",
......
{
"dependencies": {
"com.unity.cinemachine": {
"version": "2.9.7",
"depth": 0,
"source": "registry",
"dependencies": {
"com.unity.test-framework": "1.1.31"
},
"url": "https://packages.unity.com"
},
"com.unity.collab-proxy": {
"version": "2.3.1",
"depth": 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