diff --git a/.idea/.idea.FutureMen2/.idea/workspace.xml b/.idea/.idea.FutureMen2/.idea/workspace.xml index a061b420..1f5e20aa 100644 --- a/.idea/.idea.FutureMen2/.idea/workspace.xml +++ b/.idea/.idea.FutureMen2/.idea/workspace.xml @@ -5,96 +5,33 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + - - - + + - - - - - - - + + + + - - - - - - - - - - - + diff --git a/Assets/AI/AIController.cs b/Assets/AI/AIController.cs index 6061bb2c..b1e86752 100644 --- a/Assets/AI/AIController.cs +++ b/Assets/AI/AIController.cs @@ -11,21 +11,21 @@ using UnityEngine.UI; public class AIController : MonoBehaviour { - public AudioClip introAudio;//Ƶ + public AudioClip introAudio;//��������Ƶ - // - public string waveAnimationTrigger = "Wave";//к - public string leaveAnimationTrigger = "Leave";//뿪 + //�������� + public string waveAnimationTrigger = "Wave";//���к����������� + public string leaveAnimationTrigger = "Leave";//�뿪���������� - //תɲ - public float rotationDuration = 1.5f;//תʱ - public float spawnDistance = 2f;//ɾ - public float rotationSmoothness = 5f;//תƽ + //��ת���ɲ��� + public float rotationDuration = 1.5f;//��ת����ʱ�� + public float spawnDistance = 2f;//���ɾ��� + public float rotationSmoothness = 5f;//��תƽ���� - //ʾ - public float charDisplayDelay = 0.5f;//ÿַʾӳʱ + //����������ʾ���� + public float charDisplayDelay = 0.5f;//ÿ���ַ���ʾ���ӳ�ʱ�� - //¼ + //��������¼� public event Action OnIntroductionComplete; private AudioSource audioSource; @@ -34,17 +34,17 @@ public class AIController : MonoBehaviour private Transform playerTransform; private Coroutine introductionCoroutine; private Coroutine textDisplayCoroutine; - private bool hasIntroductionCompleted = false;//ӱ־λ - private bool isDuringIntroduction = false;//Ƿڽڼ + private bool hasIntroductionCompleted = false;//���ӱ�־λ + private bool isDuringIntroduction = false;//����Ƿ��ڽ����ڼ� - //ı + //�ı����� public TMP_Text speedTxt; - private const float TxtSpeed = 1; //ʾʱ - public Image dialogBoxImage;//Իͼ + private const float TxtSpeed = 1; //������ʾʱ�� + public Image dialogBoxImage;//�Ի���ͼ�� - //תǶ - private Quaternion specialRotationOffset;//תƫת + //������ת�Ƕ� + private Quaternion specialRotationOffset;//������תƫת private void Awake() { @@ -54,7 +54,7 @@ public class AIController : MonoBehaviour audioSource = gameObject.AddComponent(); } animator = GetComponent(); - //޸ģתƫ + //�޸ģ�����������תƫ�� specialRotationOffset = Quaternion.Euler(0, 90, 0); } @@ -62,12 +62,12 @@ public class AIController : MonoBehaviour { FindPlayer(); - //ʼʱı + //��ʼʱ�����ı� if (speedTxt != null) { speedTxt.gameObject.SetActive(false); } - //ʼʱضԻ + //��ʼʱ���ضԻ��� if (dialogBoxImage != null) { dialogBoxImage.gameObject.SetActive(false); @@ -77,43 +77,43 @@ public class AIController : MonoBehaviour private void Update() { - //ڽڼʵʱ + //�ڽ����ڼ�ʵʱ������� if (isDuringIntroduction && playerTransform != null) { FacePlayerWithOffset(); } } - //̬Player + //��̬����Player private void FindPlayer() { - //ͨGameManagerȡPlayer + //ͨ��GameManager��ȡPlayer if (GameManager.Ins != null && GameManager.Ins.player != null) { playerTransform = GameManager.Ins.player.transform; - Debug.Log("GameManagerҵPlayer"); + Debug.Log("��GameManager���ҵ�Player"); return; } - //ͨǩPlayer + //ͨ����ǩ����Player GameObject playerObj = GameObject.FindGameObjectWithTag("Player"); if (playerObj != null) { playerTransform = playerObj.transform; - Debug.Log("ҵPlayerǩ"); + Debug.Log("�ҵ�Player��ǩ"); return; } - //ͨͲPlayer + //ͨ�����Ͳ���Player��� Player playerController = FindObjectOfType(); if (playerController != null) { playerTransform = playerController.transform; - Debug.Log("ҵplayer"); + Debug.Log("�ҵ�player���"); return; } - Debug.LogError("Playerûҵ"); + Debug.LogError("Playerû���ҵ���������"); StartCoroutine(RetryFindPlayer()); } @@ -126,169 +126,169 @@ public class AIController : MonoBehaviour { if (isIntroductionStarted) return; - //ȷPlayer + //ȷ��������Player���� if (playerTransform == null) { FindPlayer(); if (playerTransform == null) { - Debug.LogError("ܿʼܣҲοǿյ"); + Debug.LogError("���ܿ�ʼ���ܣ���Ҳο��ǿյ�"); return; } } isIntroductionStarted = true; - Debug.Log("AIܿʼ"); + Debug.Log("AI���ܿ�ʼ"); - //ֹͣκеЭ + //ֹͣ�κ����е�Э�� if (introductionCoroutine != null) { StopCoroutine(introductionCoroutine); } - //Э + //����������Э�� introductionCoroutine = StartCoroutine(IntroductionRoutine()); } private IEnumerator IntroductionRoutine() { - Debug.Log("ʼܿ"); + Debug.Log("��ʼ���ܿ�����"); isDuringIntroduction = true; - //ʼ + //��ʼ������� FacePlayerWithOffset(); - //Ӧת + //Ӧ��������ת if (playerTransform != null) { - //ҵķ + //����������ҵķ��� Vector3 directionToPlayer = playerTransform.position - transform.position; - directionToPlayer.y = 0;//ˮƽ + directionToPlayer.y = 0;//����ˮƽ���� if (directionToPlayer != Vector3.zero) { - // + //��������� Quaternion lookAtPlayer = Quaternion.LookRotation(directionToPlayer); - //Ӧתƫ + //Ӧ��������תƫ�� Quaternion targetRotation = lookAtPlayer * specialRotationOffset; - //ƽתĿǶ + //ƽ����ת��Ŀ��Ƕ� yield return StartCoroutine(SmoothRotate(targetRotation, rotationDuration)); } } - //Ŵк + //���Ŵ��к����� if (animator != null && !string.IsNullOrEmpty(waveAnimationTrigger)) { animator.SetTrigger(waveAnimationTrigger); - Debug.Log("Ŵк"); + Debug.Log("���Ŵ��к�����"); - //ͬʱſƵ + //ͬʱ���ſ�������Ƶ if (introAudio != null) { - //ֻڴкʱʾı + //ֻ�ڴ��к���ʱ����ʾ�ı� if (speedTxt != null) { speedTxt.gameObject.SetActive(true); - string fullText = "ӭħӳδ磬׶ԴԴϵǵأЯŬ磬Dzܵ˺"; + string fullText = "��ӭ����ħ���ӳ���δ�����磬������׶�������ԴԴ���ϵ��������ǵ���أ�������Я��Ŭ������������磬�������Dz����ܵ��˺���"; textDisplayCoroutine = StartCoroutine(DisplayTextCharByChar(fullText)); - //ȴֿʼʾٲ + //�ȴ����ֿ�ʼ��ʾ���ٲ������� yield return new WaitForSeconds(0.5f); } - Debug.Log("Ƶţ" + introAudio.name); + Debug.Log("�����Ƶ���ţ�" + introAudio.name); audioSource.clip = introAudio; audioSource.Play(); - //ȴƵţڽǰ2ı + //�ȴ���Ƶ���ţ����ڽ���ǰ2�������ı� float audioLength = introAudio.length; - yield return new WaitForSeconds(audioLength - 2f);//ǰ + yield return new WaitForSeconds(audioLength - 2f);//��ǰ���� - //ƵϺı + //��Ƶ������Ϻ������ı� if (speedTxt != null) { HideTxt(); } - //ȴʣ2Ƶʱ + //�ȴ�ʣ���2����Ƶ����ʱ�� yield return new WaitForSeconds(2f); - Debug.Log("Ƶ"); + Debug.Log("������Ƶ���"); } else { - //ûƵȴ12ı - yield return new WaitForSeconds(10f);//ٵȴʱ䣬ΪҪȴƵ + //���û����Ƶ���ȴ�12��������ı� + yield return new WaitForSeconds(10f);//���ٵȴ�ʱ�䣬��Ϊ����Ҫ�ȴ���Ƶ if (speedTxt != null) { HideTxt(); } - yield return new WaitForSeconds(2f);//ٵȴ + yield return new WaitForSeconds(2f);//�ٵȴ����� } } else { - Debug.LogError("AIûнƵ"); + Debug.LogError("AI����û�н�����Ƶ"); yield return new WaitForSeconds(3f); } - //ֹܽͣʵʱ + //���ܽ�����ֹͣʵʱ���� isDuringIntroduction = false; - //뿪 + //�����뿪���� if (animator != null && !string.IsNullOrEmpty(leaveAnimationTrigger)) { - //ȴһʱ󲥷뿪 + //�ȴ�һ��ʱ��󲥷��뿪���� yield return new WaitForSeconds(2f); - //ת180 + //��ת180�� Quaternion targetRotation = transform.rotation * Quaternion.Euler(0, 180, 0); yield return StartCoroutine(SmoothRotate(targetRotation, rotationDuration)); animator.SetTrigger(leaveAnimationTrigger); - Debug.Log("뿪"); + Debug.Log("�����뿪����"); - //ȴ뿪 + //�ȴ��뿪�������� yield return new WaitForSeconds(2f); } - //¼ + //������������¼� hasIntroductionCompleted = true; OnIntroductionComplete?.Invoke(); - Debug.Log("AIɣ׼뿪"); + Debug.Log("AI������ɣ�׼���뿪"); - //AIɫ + //����AI��ɫ gameObject.SetActive(false); } - //ʾıЭ + //������ʾ�ı���Э�� private IEnumerator DisplayTextCharByChar(string fullText) { if (speedTxt == null) yield break; - //ʾԻ + //�����ʾ�Ի��� if (dialogBoxImage != null) { dialogBoxImage.gameObject.SetActive(true); - //öԻʼ͸Ϊ0 + //���öԻ����ʼ͸����Ϊ0 dialogBoxImage.color = new Color(dialogBoxImage.color.r, dialogBoxImage.color.g, dialogBoxImage.color.b, 0f); - //Ի + //�Ի����� dialogBoxImage.DOFade(1f, TxtSpeed).SetEase(Ease.Linear); } - //ʼʱֵ͸Ϊ0ȫ͸ + //��ʼʱ�������ֵ�͸����Ϊ0����ȫ͸���� speedTxt.color = new Color(speedTxt.color.r, speedTxt.color.g, speedTxt.color.b, 0f); - //Ƚı + //�Ƚ����ı����� speedTxt.DOFade(1f, TxtSpeed).SetEase(Ease.Linear); yield return new WaitForSeconds(TxtSpeed); - //ʾı - speedTxt.text = "";//ı + //������ʾ�ı� + speedTxt.text = "";//����ı� for (int i = 0; i < fullText.Length; i++) { @@ -297,26 +297,26 @@ public class AIController : MonoBehaviour } } - //ʵʱ + //ʵʱ������� private void FacePlayerWithOffset() { if (playerTransform == null) return; - //ҵķ + //����������ҵķ��� Vector3 directionToPlayer = playerTransform.position - transform.position; - directionToPlayer.y = 0;//ˮƽ + directionToPlayer.y = 0;//����ˮƽ���� if (directionToPlayer != Vector3.zero) { - //ҵת + //����������ҵ���ת Quaternion lookRotation = Quaternion.LookRotation(directionToPlayer); - //Ӧתƫ + //Ӧ��������תƫ�� Quaternion targetRotation = lookRotation * specialRotationOffset; - //ƽתĿǶ + //ƽ����ת��Ŀ��Ƕ� transform.rotation = Quaternion.Slerp(transform.rotation, targetRotation, Time.deltaTime * rotationSmoothness); } } - //ƽתЭ + //ƽ����תЭ�� private IEnumerator SmoothRotate(Quaternion targetRotation, float duration) { float elapsedTime = 0f; @@ -329,7 +329,7 @@ public class AIController : MonoBehaviour yield return null; } - //ȷתĿǶ + //ȷ��������ת��Ŀ��Ƕ� transform.rotation = targetRotation; } @@ -338,42 +338,42 @@ public class AIController : MonoBehaviour if (speedTxt == null) return; speedTxt.text = txt; - //ʼʱֵ͸Ϊ0ȫ͸ + //��ʼʱ�������ֵ�͸����Ϊ0����ȫ͸���� speedTxt.color = new Color(speedTxt.color.r, speedTxt.color.g, speedTxt.color.b, 0f); - // ʹDoTweenʵֵĽЧ + // ʹ��DoTweenʵ�����ֵĽ���Ч�� speedTxt.DOFade(1f, TxtSpeed).SetEase(Ease.Linear).OnComplete(() => { cb?.Invoke(); - }); // Եȫ͸ʹԻЧ + }); // ���Ե���ȫ��͸����ʹ�����Ի���Ч�� } - //ıķ + //�����ı��ķ��� public void HideTxt(Action cb = null) { if (speedTxt == null) return; - //ֹͣκڽеıʾЭ + //ֹͣ�κ����ڽ��е��ı���ʾЭ�� if (textDisplayCoroutine != null) { StopCoroutine(textDisplayCoroutine); } - //ͬʱıͶԻ + //����������ͬʱ�����ı��ͶԻ��� Sequence hideSequence = DOTween.Sequence(); - //ı + //�����ı����������� if (speedTxt != null) { hideSequence.Join(speedTxt.DOFade(0f, TxtSpeed).SetEase(Ease.Linear)); } - //ӶԻ + //���ӶԻ����������� if (dialogBoxImage != null) { hideSequence.Join(dialogBoxImage.DOFade(0f, TxtSpeed).SetEase(Ease.Linear)); } - //ɺϷ󲢵ûص + //������ɺ�������Ϸ���󲢵��ûص� hideSequence.OnComplete(() => { if (speedTxt != null) @@ -390,7 +390,7 @@ public class AIController : MonoBehaviour private void OnDestroy() { - //Э + //����Э�� if (introductionCoroutine != null) { StopCoroutine(introductionCoroutine); @@ -401,7 +401,7 @@ public class AIController : MonoBehaviour StopCoroutine(textDisplayCoroutine); } - // Tween + // ��������Tween���� if (speedTxt != null) { speedTxt.DOKill(); diff --git a/Assets/Monsters Full Pack Vol 1/Monsters Pack Vol 5/Bufomorph/FBX Files/Buformorph@TongueAttack.FBX.meta b/Assets/Monsters Full Pack Vol 1/Monsters Pack Vol 5/Bufomorph/FBX Files/Buformorph@TongueAttack.FBX.meta index 55c829e4..ab93987b 100644 --- a/Assets/Monsters Full Pack Vol 1/Monsters Pack Vol 5/Bufomorph/FBX Files/Buformorph@TongueAttack.FBX.meta +++ b/Assets/Monsters Full Pack Vol 1/Monsters Pack Vol 5/Bufomorph/FBX Files/Buformorph@TongueAttack.FBX.meta @@ -1,121 +1,341 @@ fileFormatVersion: 2 guid: e3b4ea609a97c1148a35255796aef495 ModelImporter: - serializedVersion: 23 - fileIDToRecycleName: - 100000: Bufomorph_ - 100002: Bufomorph_ Head - 100004: Bufomorph_ L Calf - 100006: Bufomorph_ L Clavicle - 100008: Bufomorph_ L Finger0 - 100010: Bufomorph_ L Finger01 - 100012: Bufomorph_ L Finger1 - 100014: Bufomorph_ L Finger11 - 100016: Bufomorph_ L Finger2 - 100018: Bufomorph_ L Finger21 - 100020: Bufomorph_ L Foot - 100022: Bufomorph_ L Forearm - 100024: Bufomorph_ L Hand - 100026: Bufomorph_ L HorseLink - 100028: Bufomorph_ L Thigh - 100030: Bufomorph_ L Toe0 - 100032: Bufomorph_ L Toe1 - 100034: Bufomorph_ L Toe2 - 100036: Bufomorph_ L UpperArm - 100038: Bufomorph_ Neck - 100040: Bufomorph_ Pelvis - 100042: Bufomorph_ R Calf - 100044: Bufomorph_ R Clavicle - 100046: Bufomorph_ R Finger0 - 100048: Bufomorph_ R Finger01 - 100050: Bufomorph_ R Finger1 - 100052: Bufomorph_ R Finger11 - 100054: Bufomorph_ R Finger2 - 100056: Bufomorph_ R Finger21 - 100058: Bufomorph_ R Foot - 100060: Bufomorph_ R Forearm - 100062: Bufomorph_ R Hand - 100064: Bufomorph_ R HorseLink - 100066: Bufomorph_ R Thigh - 100068: Bufomorph_ R Toe0 - 100070: Bufomorph_ R Toe1 - 100072: Bufomorph_ R Toe2 - 100074: Bufomorph_ R UpperArm - 100076: Bufomorph_ Spine - 100078: Bufomorph_ Spine1 - 100080: Bufomorph_JawLeft - 100082: Bufomorph_JawRight - 100084: Bufomorph_JawUpper - 100086: Bufomorph_Tongue1 - 100088: Bufomorph_Tongue2 - 100090: Bufomorph_Tongue3 - 100092: Bufomorph_Tongue4 - 100094: Bufomorph_Tongue5 - 100096: Bufomorph_Tongue6 - 100098: Bufomorph_Tongue7 - 100100: Bufomorph_Tongue8 - 100102: Bufomorph_Tongue9 - 100104: //RootNode - 100106: root - 400000: Bufomorph_ - 400002: Bufomorph_ Head - 400004: Bufomorph_ L Calf - 400006: Bufomorph_ L Clavicle - 400008: Bufomorph_ L Finger0 - 400010: Bufomorph_ L Finger01 - 400012: Bufomorph_ L Finger1 - 400014: Bufomorph_ L Finger11 - 400016: Bufomorph_ L Finger2 - 400018: Bufomorph_ L Finger21 - 400020: Bufomorph_ L Foot - 400022: Bufomorph_ L Forearm - 400024: Bufomorph_ L Hand - 400026: Bufomorph_ L HorseLink - 400028: Bufomorph_ L Thigh - 400030: Bufomorph_ L Toe0 - 400032: Bufomorph_ L Toe1 - 400034: Bufomorph_ L Toe2 - 400036: Bufomorph_ L UpperArm - 400038: Bufomorph_ Neck - 400040: Bufomorph_ Pelvis - 400042: Bufomorph_ R Calf - 400044: Bufomorph_ R Clavicle - 400046: Bufomorph_ R Finger0 - 400048: Bufomorph_ R Finger01 - 400050: Bufomorph_ R Finger1 - 400052: Bufomorph_ R Finger11 - 400054: Bufomorph_ R Finger2 - 400056: Bufomorph_ R Finger21 - 400058: Bufomorph_ R Foot - 400060: Bufomorph_ R Forearm - 400062: Bufomorph_ R Hand - 400064: Bufomorph_ R HorseLink - 400066: Bufomorph_ R Thigh - 400068: Bufomorph_ R Toe0 - 400070: Bufomorph_ R Toe1 - 400072: Bufomorph_ R Toe2 - 400074: Bufomorph_ R UpperArm - 400076: Bufomorph_ Spine - 400078: Bufomorph_ Spine1 - 400080: Bufomorph_JawLeft - 400082: Bufomorph_JawRight - 400084: Bufomorph_JawUpper - 400086: Bufomorph_Tongue1 - 400088: Bufomorph_Tongue2 - 400090: Bufomorph_Tongue3 - 400092: Bufomorph_Tongue4 - 400094: Bufomorph_Tongue5 - 400096: Bufomorph_Tongue6 - 400098: Bufomorph_Tongue7 - 400100: Bufomorph_Tongue8 - 400102: Bufomorph_Tongue9 - 400104: //RootNode - 400106: root - 7400000: TongueAttack - 9500000: //RootNode + serializedVersion: 22200 + internalIDToNameTable: + - first: + 1: 100000 + second: Bufomorph_ + - first: + 1: 100002 + second: Bufomorph_ Head + - first: + 1: 100004 + second: Bufomorph_ L Calf + - first: + 1: 100006 + second: Bufomorph_ L Clavicle + - first: + 1: 100008 + second: Bufomorph_ L Finger0 + - first: + 1: 100010 + second: Bufomorph_ L Finger01 + - first: + 1: 100012 + second: Bufomorph_ L Finger1 + - first: + 1: 100014 + second: Bufomorph_ L Finger11 + - first: + 1: 100016 + second: Bufomorph_ L Finger2 + - first: + 1: 100018 + second: Bufomorph_ L Finger21 + - first: + 1: 100020 + second: Bufomorph_ L Foot + - first: + 1: 100022 + second: Bufomorph_ L Forearm + - first: + 1: 100024 + second: Bufomorph_ L Hand + - first: + 1: 100026 + second: Bufomorph_ L HorseLink + - first: + 1: 100028 + second: Bufomorph_ L Thigh + - first: + 1: 100030 + second: Bufomorph_ L Toe0 + - first: + 1: 100032 + second: Bufomorph_ L Toe1 + - first: + 1: 100034 + second: Bufomorph_ L Toe2 + - first: + 1: 100036 + second: Bufomorph_ L UpperArm + - first: + 1: 100038 + second: Bufomorph_ Neck + - first: + 1: 100040 + second: Bufomorph_ Pelvis + - first: + 1: 100042 + second: Bufomorph_ R Calf + - first: + 1: 100044 + second: Bufomorph_ R Clavicle + - first: + 1: 100046 + second: Bufomorph_ R Finger0 + - first: + 1: 100048 + second: Bufomorph_ R Finger01 + - first: + 1: 100050 + second: Bufomorph_ R Finger1 + - first: + 1: 100052 + second: Bufomorph_ R Finger11 + - first: + 1: 100054 + second: Bufomorph_ R Finger2 + - first: + 1: 100056 + second: Bufomorph_ R Finger21 + - first: + 1: 100058 + second: Bufomorph_ R Foot + - first: + 1: 100060 + second: Bufomorph_ R Forearm + - first: + 1: 100062 + second: Bufomorph_ R Hand + - first: + 1: 100064 + second: Bufomorph_ R HorseLink + - first: + 1: 100066 + second: Bufomorph_ R Thigh + - first: + 1: 100068 + second: Bufomorph_ R Toe0 + - first: + 1: 100070 + second: Bufomorph_ R Toe1 + - first: + 1: 100072 + second: Bufomorph_ R Toe2 + - first: + 1: 100074 + second: Bufomorph_ R UpperArm + - first: + 1: 100076 + second: Bufomorph_ Spine + - first: + 1: 100078 + second: Bufomorph_ Spine1 + - first: + 1: 100080 + second: Bufomorph_JawLeft + - first: + 1: 100082 + second: Bufomorph_JawRight + - first: + 1: 100084 + second: Bufomorph_JawUpper + - first: + 1: 100086 + second: Bufomorph_Tongue1 + - first: + 1: 100088 + second: Bufomorph_Tongue2 + - first: + 1: 100090 + second: Bufomorph_Tongue3 + - first: + 1: 100092 + second: Bufomorph_Tongue4 + - first: + 1: 100094 + second: Bufomorph_Tongue5 + - first: + 1: 100096 + second: Bufomorph_Tongue6 + - first: + 1: 100098 + second: Bufomorph_Tongue7 + - first: + 1: 100100 + second: Bufomorph_Tongue8 + - first: + 1: 100102 + second: Bufomorph_Tongue9 + - first: + 1: 100104 + second: //RootNode + - first: + 1: 100106 + second: root + - first: + 4: 400000 + second: Bufomorph_ + - first: + 4: 400002 + second: Bufomorph_ Head + - first: + 4: 400004 + second: Bufomorph_ L Calf + - first: + 4: 400006 + second: Bufomorph_ L Clavicle + - first: + 4: 400008 + second: Bufomorph_ L Finger0 + - first: + 4: 400010 + second: Bufomorph_ L Finger01 + - first: + 4: 400012 + second: Bufomorph_ L Finger1 + - first: + 4: 400014 + second: Bufomorph_ L Finger11 + - first: + 4: 400016 + second: Bufomorph_ L Finger2 + - first: + 4: 400018 + second: Bufomorph_ L Finger21 + - first: + 4: 400020 + second: Bufomorph_ L Foot + - first: + 4: 400022 + second: Bufomorph_ L Forearm + - first: + 4: 400024 + second: Bufomorph_ L Hand + - first: + 4: 400026 + second: Bufomorph_ L HorseLink + - first: + 4: 400028 + second: Bufomorph_ L Thigh + - first: + 4: 400030 + second: Bufomorph_ L Toe0 + - first: + 4: 400032 + second: Bufomorph_ L Toe1 + - first: + 4: 400034 + second: Bufomorph_ L Toe2 + - first: + 4: 400036 + second: Bufomorph_ L UpperArm + - first: + 4: 400038 + second: Bufomorph_ Neck + - first: + 4: 400040 + second: Bufomorph_ Pelvis + - first: + 4: 400042 + second: Bufomorph_ R Calf + - first: + 4: 400044 + second: Bufomorph_ R Clavicle + - first: + 4: 400046 + second: Bufomorph_ R Finger0 + - first: + 4: 400048 + second: Bufomorph_ R Finger01 + - first: + 4: 400050 + second: Bufomorph_ R Finger1 + - first: + 4: 400052 + second: Bufomorph_ R Finger11 + - first: + 4: 400054 + second: Bufomorph_ R Finger2 + - first: + 4: 400056 + second: Bufomorph_ R Finger21 + - first: + 4: 400058 + second: Bufomorph_ R Foot + - first: + 4: 400060 + second: Bufomorph_ R Forearm + - first: + 4: 400062 + second: Bufomorph_ R Hand + - first: + 4: 400064 + second: Bufomorph_ R HorseLink + - first: + 4: 400066 + second: Bufomorph_ R Thigh + - first: + 4: 400068 + second: Bufomorph_ R Toe0 + - first: + 4: 400070 + second: Bufomorph_ R Toe1 + - first: + 4: 400072 + second: Bufomorph_ R Toe2 + - first: + 4: 400074 + second: Bufomorph_ R UpperArm + - first: + 4: 400076 + second: Bufomorph_ Spine + - first: + 4: 400078 + second: Bufomorph_ Spine1 + - first: + 4: 400080 + second: Bufomorph_JawLeft + - first: + 4: 400082 + second: Bufomorph_JawRight + - first: + 4: 400084 + second: Bufomorph_JawUpper + - first: + 4: 400086 + second: Bufomorph_Tongue1 + - first: + 4: 400088 + second: Bufomorph_Tongue2 + - first: + 4: 400090 + second: Bufomorph_Tongue3 + - first: + 4: 400092 + second: Bufomorph_Tongue4 + - first: + 4: 400094 + second: Bufomorph_Tongue5 + - first: + 4: 400096 + second: Bufomorph_Tongue6 + - first: + 4: 400098 + second: Bufomorph_Tongue7 + - first: + 4: 400100 + second: Bufomorph_Tongue8 + - first: + 4: 400102 + second: Bufomorph_Tongue9 + - first: + 4: 400104 + second: //RootNode + - first: + 4: 400106 + second: root + - first: + 74: 7400000 + second: TongueAttack + - first: + 95: 9500000 + second: //RootNode externalObjects: {} materials: - importMaterials: 1 + materialImportMode: 1 materialName: 0 materialSearch: 1 materialLocation: 1 @@ -124,6 +344,7 @@ ModelImporter: bakeSimulation: 0 resampleCurves: 1 optimizeGameObjects: 0 + removeConstantScaleCurves: 0 motionNodeName: rigImportErrors: rigImportWarnings: @@ -144,6 +365,7 @@ ModelImporter: - serializedVersion: 16 name: TongueAttack takeName: Take 001 + internalID: 0 firstFrame: 0 lastFrame: 20 wrapMode: 0 @@ -152,7 +374,7 @@ ModelImporter: cycleOffset: 0 loop: 0 hasAdditiveReferencePose: 0 - loopTime: 1 + loopTime: 0 loopBlend: 0 loopBlendOrientation: 1 loopBlendPositionY: 1 @@ -176,25 +398,36 @@ ModelImporter: meshCompression: 0 addColliders: 0 useSRGBMaterialColor: 1 + sortHierarchyByName: 1 + importPhysicalCameras: 1 importVisibility: 1 importBlendShapes: 1 importCameras: 1 importLights: 1 + nodeNameCollisionStrategy: 0 + fileIdsGeneration: 1 swapUVChannels: 0 generateSecondaryUV: 0 useFileUnits: 1 - optimizeMeshForGPU: 1 keepQuads: 0 weldVertices: 1 + bakeAxisConversion: 0 preserveHierarchy: 0 + skinWeightsMode: 0 + maxBonesPerVertex: 4 + minBoneWeight: 0.001 + optimizeBones: 1 + meshOptimizationFlags: -1 indexFormat: 0 secondaryUVAngleDistortion: 8 secondaryUVAreaDistortion: 15.000001 secondaryUVHardAngle: 88 + secondaryUVMarginMethod: 0 + secondaryUVMinLightmapResolution: 40 + secondaryUVMinObjectScale: 1 secondaryUVPackMargin: 4 useFileScale: 1 - previousCalculatedGlobalScale: 0.01 - hasPreviousCalculatedGlobalScale: 1 + strictVertexDataChecks: 0 tangentSpace: normalSmoothAngle: 60 normalImportMode: 0 @@ -203,10 +436,10 @@ ModelImporter: legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0 blendShapeNormalImportMode: 1 normalSmoothingSource: 0 + referencedClips: [] importAnimation: 1 - copyAvatar: 1 humanDescription: - serializedVersion: 2 + serializedVersion: 3 human: [] skeleton: [] armTwist: 0.5 @@ -216,14 +449,19 @@ ModelImporter: armStretch: 0.05 legStretch: 0.05 feetSpacing: 0 + globalScale: 1 rootMotionBoneName: root hasTranslationDoF: 0 hasExtraRoot: 0 skeletonHasParents: 1 - lastHumanDescriptionAvatarSource: {fileID: 9000000, guid: 5308777144e1ee24db01c2109245bfb4, - type: 3} + lastHumanDescriptionAvatarSource: {fileID: 9000000, guid: 5308777144e1ee24db01c2109245bfb4, type: 3} + autoGenerateAvatarMappingIfUnspecified: 1 animationType: 2 humanoidOversampling: 1 + avatarSetup: 2 + addHumanoidExtraRootOnlyWhenUsingAvatar: 0 + importBlendShapeDeformPercent: 0 + remapMaterialsIfMaterialImportModeIsNone: 1 additionalBone: 0 userData: assetBundleName: diff --git a/Assets/Piloto Studio/Materials/Shared/Flecks_Clipped_Alpha.mat b/Assets/Piloto Studio/Materials/Shared/Flecks_Clipped_Alpha.mat index 5cb03a5d..5b94c325 100644 --- a/Assets/Piloto Studio/Materials/Shared/Flecks_Clipped_Alpha.mat +++ b/Assets/Piloto Studio/Materials/Shared/Flecks_Clipped_Alpha.mat @@ -50,12 +50,13 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Flecks_Clipped_Alpha - m_Shader: {fileID: -6465566751694194690, guid: 7f11fe28133f1a74594785107b98f2fe, type: 3} + m_Shader: {fileID: 4800000, guid: 18ab32eb7444174499d422a08d7cd77d, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _SURFACE_TYPE_TRANSPARENT - m_InvalidKeywords: [] + m_InvalidKeywords: + - _FLIPBOOKBLENDING_OFF m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -78,10 +79,22 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _BaseMap: + m_Texture: {fileID: 2800000, guid: 8b01c0ee0fc4eee48aafddb5e7805659, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _DetailNoise: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _MainTex: m_Texture: {fileID: 2800000, guid: 8b01c0ee0fc4eee48aafddb5e7805659, type: 3} m_Scale: {x: 1, y: 1} @@ -126,33 +139,47 @@ Material: - _BUILTIN_ZWriteControl: 0 - _Blend: 0 - _BlendMode: 0 + - _BlendOp: 0 + - _CameraFadingEnabled: 0 + - _CameraFarFadeDistance: 2 + - _CameraNearFadeDistance: 1 - _CastShadows: 0 + - _ColorMode: 0 - _ConservativeDepthOffsetEnable: 0 - _Cull: 2 - _CullMode: 2 - _CullModeForward: 2 - _Culling: 0 + - _Cutoff: 0.5 - _DISABLEEROSION: 0 - _DepthOffsetEnable: 0 - _Desaturate: 0 - _DisableErosion: 0 + - _DistortionBlend: 0.5 - _DistortionEnable: 0 + - _DistortionEnabled: 0 - _DistortionIntensity: 0 - _DistortionOnly: 0 + - _DistortionStrength: 1 + - _DistortionStrengthScaled: 0.1 - _DoubleSidedEnable: 0 - _DoubleSidedGIMode: 0 - _DoubleSidedNormalMode: 2 - _DstBlend: 10 + - _DstBlendAlpha: 10 - _EnableBlendModePreserveSpecularLighting: 0 - _EnableFogOnTransparent: 0 - _ExcludeFromTUAndAA: 0 - _FRESNEL: 0 + - _FlipbookBlending: 0 + - _FlipbookMode: 0 - _Fresnel: 0 - _FresnelPower: 1 - _FresnelScale: 1 - _Invert_Fresnel: 0 - _MiddlePointPos: 0.5 - _MiddlePointPos1: 0.5 + - _Mode: 0 - _MultiplyNoiseDesaturation: 1 - _OpaqueCullMode: 2 - _QueueControl: 1 @@ -162,8 +189,12 @@ Material: - _RenderQueueType: 4 - _RequireSplitLighting: 0 - _SoftFadeFactor: 0 + - _SoftParticlesEnabled: 0 + - _SoftParticlesFarFadeDistance: 1 + - _SoftParticlesNearFadeDistance: 0 - _SourceBlendRGB: 10 - _SrcBlend: 5 + - _SrcBlendAlpha: 1 - _StencilRef: 0 - _StencilRefDepth: 1 - _StencilRefDistortionVec: 4 @@ -205,6 +236,10 @@ Material: m_Colors: - _AlphaOverrideChannel: {r: 1, g: 0, b: 0, a: 0} - _AlphaOverridePanning: {r: 0, g: 0, b: 0, a: 0} + - _BaseColor: {r: 1, g: 1, b: 1, a: 1} + - _BaseColorAddSubDiff: {r: 0, g: 0, b: 0, a: 0} + - _CameraFadeParams: {r: 0, g: Infinity, b: 0, a: 0} + - _Color: {r: 1, g: 1, b: 1, a: 1} - _DetailAdditiveChannel: {r: 0, g: 0, b: 0, a: 0} - _DetailDisolveChannel: {r: 0, g: 0, b: 0, a: 1} - _DetailDistortionChannel: {r: 0, g: 0, b: 0, a: 0} @@ -223,6 +258,7 @@ Material: - _MainTexturePanning: {r: 0, g: 0, b: 0, a: 0} - _MidColor: {r: 1, g: 0.44479147, b: 0, a: 0} - _Resolution: {r: 64, g: 64, b: 0, a: 0} + - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0} - _UnlitColorMap_MipInfo: {r: 0, g: 0, b: 0, a: 0} - _WhiteColor: {r: 1, g: 0.8950032, b: 0, a: 0} m_BuildTextureStacks: [] diff --git a/Assets/Piloto Studio/Materials/Shock/ElectricityFlipbook_Faded.mat b/Assets/Piloto Studio/Materials/Shock/ElectricityFlipbook_Faded.mat index 61d3c175..8be80ba7 100644 --- a/Assets/Piloto Studio/Materials/Shock/ElectricityFlipbook_Faded.mat +++ b/Assets/Piloto Studio/Materials/Shock/ElectricityFlipbook_Faded.mat @@ -37,14 +37,13 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: ElectricityFlipbook_Faded - m_Shader: {fileID: -6465566751694194690, guid: 7f11fe28133f1a74594785107b98f2fe, type: 3} + m_Shader: {fileID: 4800000, guid: 18ab32eb7444174499d422a08d7cd77d, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _SURFACE_TYPE_TRANSPARENT - - _USEALPHAOVERRIDE - - _USESOFTALPHA - m_InvalidKeywords: [] + m_InvalidKeywords: + - _FLIPBOOKBLENDING_OFF m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -67,10 +66,22 @@ Material: m_Texture: {fileID: 2800000, guid: 71d4e959bd233204083ba6393d9248a8, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _BaseMap: + m_Texture: {fileID: 2800000, guid: 71d4e959bd233204083ba6393d9248a8, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _DetailNoise: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _MainTex: m_Texture: {fileID: 2800000, guid: 71d4e959bd233204083ba6393d9248a8, type: 3} m_Scale: {x: 1, y: 1} @@ -115,33 +126,47 @@ Material: - _BUILTIN_ZWriteControl: 0 - _Blend: 0 - _BlendMode: 0 + - _BlendOp: 0 + - _CameraFadingEnabled: 0 + - _CameraFarFadeDistance: 2 + - _CameraNearFadeDistance: 1 - _CastShadows: 0 + - _ColorMode: 0 - _ConservativeDepthOffsetEnable: 0 - _Cull: 2 - _CullMode: 2 - _CullModeForward: 2 - _Culling: 0 + - _Cutoff: 0.5 - _DISABLEEROSION: 0 - _DepthOffsetEnable: 0 - _Desaturate: 0 - _DisableErosion: 0 + - _DistortionBlend: 0.5 - _DistortionEnable: 0 + - _DistortionEnabled: 0 - _DistortionIntensity: 0 - _DistortionOnly: 0 + - _DistortionStrength: 1 + - _DistortionStrengthScaled: 0.1 - _DoubleSidedEnable: 0 - _DoubleSidedGIMode: 0 - _DoubleSidedNormalMode: 2 - _DstBlend: 10 + - _DstBlendAlpha: 10 - _EnableBlendModePreserveSpecularLighting: 0 - _EnableFogOnTransparent: 0 - _ExcludeFromTUAndAA: 0 - _FRESNEL: 0 + - _FlipbookBlending: 0 + - _FlipbookMode: 0 - _Fresnel: 0 - _FresnelPower: 1 - _FresnelScale: 1 - _Invert_Fresnel: 0 - _MiddlePointPos: 0.5 - _MiddlePointPos1: 0.5 + - _Mode: 0 - _MultiplyNoiseDesaturation: 1 - _OpaqueCullMode: 2 - _QueueControl: 1 @@ -151,8 +176,12 @@ Material: - _RenderQueueType: 4 - _RequireSplitLighting: 0 - _SoftFadeFactor: 1 + - _SoftParticlesEnabled: 0 + - _SoftParticlesFarFadeDistance: 1 + - _SoftParticlesNearFadeDistance: 0 - _SourceBlendRGB: 10 - _SrcBlend: 5 + - _SrcBlendAlpha: 1 - _StencilRef: 0 - _StencilRefDepth: 1 - _StencilRefDistortionVec: 4 @@ -194,6 +223,10 @@ Material: m_Colors: - _AlphaOverrideChannel: {r: 0, g: 0, b: 0, a: 1} - _AlphaOverridePanning: {r: 0, g: 0, b: 0, a: 0} + - _BaseColor: {r: 1, g: 1, b: 1, a: 1} + - _BaseColorAddSubDiff: {r: 0, g: 0, b: 0, a: 0} + - _CameraFadeParams: {r: 0, g: Infinity, b: 0, a: 0} + - _Color: {r: 1, g: 1, b: 1, a: 1} - _DetailAdditiveChannel: {r: 0, g: 0, b: 0, a: 0} - _DetailDisolveChannel: {r: 0, g: 0, b: 0, a: 1} - _DetailDistortionChannel: {r: 0, g: 0, b: 0, a: 0} @@ -212,6 +245,7 @@ Material: - _MainTexturePanning: {r: 0, g: 0, b: 0, a: 0} - _MidColor: {r: 1, g: 0.44479147, b: 0, a: 0} - _Resolution: {r: 64, g: 64, b: 0, a: 0} + - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0} - _UnlitColorMap_MipInfo: {r: 0, g: 0, b: 0, a: 0} - _WhiteColor: {r: 1, g: 0.8950032, b: 0, a: 0} m_BuildTextureStacks: [] diff --git a/Assets/Piloto Studio/Materials/Tech/FX_Tech_Grid_Lines_M.mat b/Assets/Piloto Studio/Materials/Tech/FX_Tech_Grid_Lines_M.mat index a1158a05..d3b4db37 100644 --- a/Assets/Piloto Studio/Materials/Tech/FX_Tech_Grid_Lines_M.mat +++ b/Assets/Piloto Studio/Materials/Tech/FX_Tech_Grid_Lines_M.mat @@ -37,16 +37,16 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: FX_Tech_Grid_Lines_M - m_Shader: {fileID: -6465566751694194690, guid: 7f11fe28133f1a74594785107b98f2fe, type: 3} + m_Shader: {fileID: 4800000, guid: 18ab32eb7444174499d422a08d7cd77d, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _SURFACE_TYPE_TRANSPARENT - - _USESOFTALPHA - m_InvalidKeywords: [] + m_InvalidKeywords: + - _FLIPBOOKBLENDING_OFF m_LightmapFlags: 4 m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 + m_DoubleSidedGI: 1 m_CustomRenderQueue: 3000 stringTagMap: MotionVector: User @@ -66,10 +66,22 @@ Material: m_Texture: {fileID: 2800000, guid: 5be6cbba81b9bb44e8e5b24f8f79c204, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _BaseMap: + m_Texture: {fileID: 2800000, guid: 12f6ca2d037970643a3505d5b08e4d28, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _DetailNoise: m_Texture: {fileID: 2800000, guid: 31956de0b11523f42a42380e881d8aef, type: 3} m_Scale: {x: 1, y: 3} m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _MainTex: m_Texture: {fileID: 2800000, guid: 12f6ca2d037970643a3505d5b08e4d28, type: 3} m_Scale: {x: 1, y: 2} @@ -118,8 +130,13 @@ Material: - _BUILTIN_ZWriteControl: 0 - _Blend: 0 - _BlendMode: 0 + - _BlendOp: 0 - _BumpScale: 1 + - _CameraFadingEnabled: 0 + - _CameraFarFadeDistance: 2 + - _CameraNearFadeDistance: 1 - _CastShadows: 0 + - _ColorMode: 0 - _ConservativeDepthOffsetEnable: 0 - _Cull: 1 - _CullMode: 1 @@ -131,17 +148,24 @@ Material: - _Desaturate: 1 - _DetailNormalMapScale: 1 - _DisableErosion: 0 + - _DistortionBlend: 0.5 - _DistortionEnable: 0 + - _DistortionEnabled: 0 - _DistortionIntensity: 0 - _DistortionOnly: 0 + - _DistortionStrength: 1 + - _DistortionStrengthScaled: 0.1 - _DoubleSidedEnable: 0 - _DoubleSidedGIMode: 0 - _DoubleSidedNormalMode: 2 - _DstBlend: 10 + - _DstBlendAlpha: 10 - _EnableBlendModePreserveSpecularLighting: 0 - _EnableFogOnTransparent: 0 - _ExcludeFromTUAndAA: 0 - _FRESNEL: 0 + - _FlipbookBlending: 0 + - _FlipbookMode: 0 - _Fresnel: 0 - _FresnelPower: 1 - _FresnelScale: 1 @@ -166,9 +190,13 @@ Material: - _RequireSplitLighting: 0 - _SmoothnessTextureChannel: 0 - _SoftFadeFactor: 0.339 + - _SoftParticlesEnabled: 0 + - _SoftParticlesFarFadeDistance: 1 + - _SoftParticlesNearFadeDistance: 0 - _SourceBlendRGB: 10 - _SpecularHighlights: 1 - _SrcBlend: 5 + - _SrcBlendAlpha: 1 - _StencilRef: 0 - _StencilRefDepth: 1 - _StencilRefDistortionVec: 4 @@ -216,6 +244,9 @@ Material: m_Colors: - _AlphaOverrideChannel: {r: 20, g: 0, b: 0, a: 0} - _AlphaOverridePanning: {r: 0, g: 0, b: 0, a: 0} + - _BaseColor: {r: 1, g: 1, b: 1, a: 1} + - _BaseColorAddSubDiff: {r: 0, g: 0, b: 0, a: 0} + - _CameraFadeParams: {r: 0, g: Infinity, b: 0, a: 0} - _Color: {r: 1, g: 1, b: 1, a: 1} - _Color0: {r: 1, g: 1, b: 1, a: 1} - _DetailAdditiveChannel: {r: 0, g: 0, b: 0, a: 0} @@ -234,6 +265,7 @@ Material: - _MainTexturePanning: {r: -0.2, g: -0.25, b: 0, a: 0} - _MidColor: {r: 1, g: 0.4447915, b: 0, a: 0} - _Resolution: {r: 64, g: 64, b: 0, a: 0} + - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0} - _UnlitColorMap_MipInfo: {r: 0, g: 0, b: 0, a: 0} - _WhiteColor: {r: 1, g: 0.8950032, b: 0, a: 0} - _diff_c: {r: 0.1541919, g: 0.4053115, b: 0.7264151, a: 1} diff --git a/Assets/Piloto Studio/Materials/Tech/FX_Tech_Shapes_Lined_Distorted_M.mat b/Assets/Piloto Studio/Materials/Tech/FX_Tech_Shapes_Lined_Distorted_M.mat index 7ae5ffc6..fd723d81 100644 --- a/Assets/Piloto Studio/Materials/Tech/FX_Tech_Shapes_Lined_Distorted_M.mat +++ b/Assets/Piloto Studio/Materials/Tech/FX_Tech_Shapes_Lined_Distorted_M.mat @@ -37,13 +37,13 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: FX_Tech_Shapes_Lined_Distorted_M - m_Shader: {fileID: -6465566751694194690, guid: 7f11fe28133f1a74594785107b98f2fe, type: 3} + m_Shader: {fileID: 4800000, guid: 18ab32eb7444174499d422a08d7cd77d, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _SURFACE_TYPE_TRANSPARENT m_InvalidKeywords: - - _DOUBLESIDED_ON + - _FLIPBOOKBLENDING_OFF m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 1 @@ -66,10 +66,22 @@ Material: m_Texture: {fileID: 2800000, guid: 85957549a386b2f4a83934260e7a9367, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _BaseMap: + m_Texture: {fileID: 2800000, guid: ab98f8d2dd87e994abfc49274d8db510, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _DetailNoise: m_Texture: {fileID: 2800000, guid: 644a357d80155ca4fa56df0e50f683d1, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _MainTex: m_Texture: {fileID: 2800000, guid: ab98f8d2dd87e994abfc49274d8db510, type: 3} m_Scale: {x: 1, y: 1} @@ -118,8 +130,13 @@ Material: - _BUILTIN_ZWriteControl: 0 - _Blend: 2 - _BlendMode: 1 + - _BlendOp: 0 - _BumpScale: 1 + - _CameraFadingEnabled: 0 + - _CameraFarFadeDistance: 2 + - _CameraNearFadeDistance: 1 - _CastShadows: 0 + - _ColorMode: 0 - _ConservativeDepthOffsetEnable: 0 - _Cull: 0 - _CullMode: 0 @@ -131,17 +148,24 @@ Material: - _Desaturate: 1 - _DetailNormalMapScale: 1 - _DisableErosion: 0 + - _DistortionBlend: 0.5 - _DistortionEnable: 0 + - _DistortionEnabled: 0 - _DistortionIntensity: 0 - _DistortionOnly: 0 + - _DistortionStrength: 1 + - _DistortionStrengthScaled: 0.1 - _DoubleSidedEnable: 1 - _DoubleSidedGIMode: 0 - _DoubleSidedNormalMode: 2 - _DstBlend: 1 + - _DstBlendAlpha: 1 - _EnableBlendModePreserveSpecularLighting: 0 - _EnableFogOnTransparent: 0 - _ExcludeFromTUAndAA: 0 - _FRESNEL: 0 + - _FlipbookBlending: 0 + - _FlipbookMode: 0 - _Fresnel: 0 - _FresnelPower: 1 - _FresnelScale: 1 @@ -165,9 +189,13 @@ Material: - _RequireSplitLighting: 0 - _SmoothnessTextureChannel: 0 - _SoftFadeFactor: 0.1 + - _SoftParticlesEnabled: 0 + - _SoftParticlesFarFadeDistance: 1 + - _SoftParticlesNearFadeDistance: 0 - _SourceBlendRGB: 1 - _SpecularHighlights: 1 - _SrcBlend: 5 + - _SrcBlendAlpha: 1 - _StencilRef: 0 - _StencilRefDepth: 1 - _StencilRefDistortionVec: 4 @@ -214,6 +242,9 @@ Material: m_Colors: - _AlphaOverrideChannel: {r: 0, g: 0, b: 0, a: 0} - _AlphaOverridePanning: {r: 0, g: 0, b: 0, a: 0} + - _BaseColor: {r: 1, g: 1, b: 1, a: 1} + - _BaseColorAddSubDiff: {r: 0, g: 0, b: 0, a: 0} + - _CameraFadeParams: {r: 0, g: Infinity, b: 0, a: 0} - _Color: {r: 1, g: 1, b: 1, a: 1} - _DetailAdditiveChannel: {r: 0, g: 0, b: 0, a: 0} - _DetailDisolveChannel: {r: 1, g: 0, b: 0, a: 0} @@ -231,6 +262,7 @@ Material: - _MainTexturePanning: {r: 0, g: 0, b: 0, a: 0} - _MidColor: {r: 0, g: 0.507105, b: 2.6390157, a: 0} - _Resolution: {r: 64, g: 64, b: 0, a: 0} + - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0} - _UnlitColorMap_MipInfo: {r: 0, g: 0, b: 0, a: 0} - _WhiteColor: {r: 1.6248058, g: 0.2690761, b: 1.9766746, a: 0} - _diff_c: {r: 0.6320754, g: 0.6320754, b: 0.6320754, a: 1} diff --git a/Assets/Piloto Studio/Materials/Tech/FX_Tech_Trail_Lined_M.mat b/Assets/Piloto Studio/Materials/Tech/FX_Tech_Trail_Lined_M.mat index 9dcb3bec..496aa644 100644 --- a/Assets/Piloto Studio/Materials/Tech/FX_Tech_Trail_Lined_M.mat +++ b/Assets/Piloto Studio/Materials/Tech/FX_Tech_Trail_Lined_M.mat @@ -208,7 +208,7 @@ Material: - _Disolve_Fade_Range: {r: -0.25, g: 1, b: 0, a: 0} - _DoubleSidedConstants: {r: 1, g: 1, b: -1, a: 0} - _EmissionColor: {r: 1, g: 1, b: 1, a: 1} - - _FresnelColor: {r: 1, g: 1, b: 1, a: 1} + - _FresnelColor: {r: 1, g: 0, b: 0, a: 1} - _LastColor: {r: 0, g: 0.14100643, b: 0.5566038, a: 0} - _MainAlphaChannel: {r: 0, g: 0, b: 0, a: 1} - _MainTextureChannel: {r: 1, g: 1, b: 1, a: 0} diff --git a/Assets/StreamingAssets/build_info b/Assets/StreamingAssets/build_info index 1cfb95e0..bab9c457 100644 --- a/Assets/StreamingAssets/build_info +++ b/Assets/StreamingAssets/build_info @@ -1 +1 @@ -Build from CHINAMI-UKDLSK3 at 2026/1/29 17:33:42 \ No newline at end of file +Build from CHINAMI-UKDLSK3 at 2026/1/29 19:08:16 \ No newline at end of file diff --git a/Assets/_FutureMen2/Prefabs/Enemys/DeathKnightBoss/DeathKnightBoss.prefab b/Assets/_FutureMen2/Prefabs/Enemys/DeathKnightBoss/DeathKnightBoss.prefab index 5cdd6baa..1f5eb9a0 100644 --- a/Assets/_FutureMen2/Prefabs/Enemys/DeathKnightBoss/DeathKnightBoss.prefab +++ b/Assets/_FutureMen2/Prefabs/Enemys/DeathKnightBoss/DeathKnightBoss.prefab @@ -6066,7 +6066,7 @@ Transform: serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 2.3, y: 2.3, z: 2.3} + m_LocalScale: {x: 1.8, y: 1.8, z: 1.8} m_ConstrainProportionsScale: 1 m_Children: - {fileID: 4038051567966124574} diff --git a/Assets/_FutureMen2/Prefabs/Enemys/DeathKnightBoss/DeathKnightPhantom.prefab b/Assets/_FutureMen2/Prefabs/Enemys/DeathKnightBoss/DeathKnightPhantom.prefab index 34aa95b6..395dc467 100644 --- a/Assets/_FutureMen2/Prefabs/Enemys/DeathKnightBoss/DeathKnightPhantom.prefab +++ b/Assets/_FutureMen2/Prefabs/Enemys/DeathKnightBoss/DeathKnightPhantom.prefab @@ -4232,7 +4232,7 @@ Transform: serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalScale: {x: 1.8, y: 1.8, z: 1.8} m_ConstrainProportionsScale: 1 m_Children: - {fileID: 8732222001177498588} diff --git a/Assets/_FutureMen2/Prefabs/Enemys/DeathKnightBoss/house.controller b/Assets/_FutureMen2/Prefabs/Enemys/DeathKnightBoss/house.controller index 0a5e2f7a..a09dff9b 100644 --- a/Assets/_FutureMen2/Prefabs/Enemys/DeathKnightBoss/house.controller +++ b/Assets/_FutureMen2/Prefabs/Enemys/DeathKnightBoss/house.controller @@ -1,5 +1,30 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1101 &-8387178298016709888 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 6 + m_ConditionEvent: state + m_EventTreshold: 1 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 1102436855738092934} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.765625 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!1101 &-7199384949825812257 AnimatorStateTransition: m_ObjectHideFlags: 1 @@ -25,6 +50,33 @@ AnimatorStateTransition: m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 +--- !u!1102 &-7077551258985546606 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: H_Walk_Back + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: -8387178298016709888} + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: 3413039a7e2e44d458218c8349044b9b, type: 3} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: --- !u!1101 &-5743855412712938900 AnimatorStateTransition: m_ObjectHideFlags: 1 @@ -268,6 +320,7 @@ AnimatorState: - {fileID: -7199384949825812257} - {fileID: -5608958749774703882} - {fileID: 3846439419596354817} + - {fileID: 7677147272364179372} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -294,7 +347,7 @@ AnimatorStateMachine: m_ChildStates: - serializedVersion: 1 m_State: {fileID: 1102436855738092934} - m_Position: {x: 470, y: 90, z: 0} + m_Position: {x: 460, y: 90, z: 0} - serializedVersion: 1 m_State: {fileID: -236287579955131425} m_Position: {x: 470, y: 190, z: 0} @@ -313,6 +366,9 @@ AnimatorStateMachine: - serializedVersion: 1 m_State: {fileID: -1003798292713834707} m_Position: {x: 510, y: -240, z: 0} + - serializedVersion: 1 + m_State: {fileID: -7077551258985546606} + m_Position: {x: 450, y: -60, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: - {fileID: -5743855412712938900} @@ -425,6 +481,31 @@ AnimatorStateTransition: m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 +--- !u!1101 &7677147272364179372 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 6 + m_ConditionEvent: state + m_EventTreshold: 4 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -7077551258985546606} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.925 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!1101 &8930892437980686301 AnimatorStateTransition: m_ObjectHideFlags: 1 diff --git a/Assets/_FutureMen2/Prefabs/Enemys/FrogBoss/FrogBoss.asset b/Assets/_FutureMen2/Prefabs/Enemys/FrogBoss/FrogBoss.asset index 62ea877e..e8be235b 100644 --- a/Assets/_FutureMen2/Prefabs/Enemys/FrogBoss/FrogBoss.asset +++ b/Assets/_FutureMen2/Prefabs/Enemys/FrogBoss/FrogBoss.asset @@ -41,7 +41,7 @@ MonoBehaviour: Bleep Attack","Instant":true,"SingletongueSpeed":25,"Singledamage":30},{"Type":"SetEnemyState","NodeData":{"Offset":"(301.763,152.9411)"},"ID":27,"Name":"Set Enemy State","Instant":true,"SharedIntCurEnemyState":{"Type":"BehaviorDesigner.Runtime.SharedInt","Name":null,"Int32mValue":1}}]}]},{"Type":"BehaviorDesigner.Runtime.Tasks.Sequence","NodeData":{"Offset":"(856.9219,125.071754)"},"ID":28,"Name":"Sequence","Instant":true,"AbortTypeabortType":"None","Children":[{"Type":"CheckEnemyState","NodeData":{"Offset":"(-92.63159,200.6238)"},"ID":29,"Name":"Check Enemy State","Instant":true,"SharedIntCurEnemyState":{"Type":"BehaviorDesigner.Runtime.SharedInt","Name":null,"Int32mValue":1}},{"Type":"FrogIdleMove","NodeData":{"Offset":"(287.2224,209.761536)"},"ID":30,"Name":"Frog - Idle Move","Instant":true,"SinglemoveRadius":4,"SinglemoveAngle":90,"SinglestayTime":1.5,"SinglerotateSpeed":360,"SingleminPlayerDistance":10,"SinglemaxPlayerDistance":20}]}]},"DetachedTasks":[{"Type":"BehaviorDesigner.Runtime.Tasks.Sequence","NodeData":{"Offset":"(-1353.33228,1086.19006)"},"ID":31,"Name":"Sequence","Instant":true,"AbortTypeabortType":"None","Children":[{"Type":"CheckCooldown","NodeData":{"Offset":"(-215.1163,191.6279)"},"ID":32,"Name":"Check + Idle Move","Instant":true,"SinglestayTime":1.5,"SinglerotateSpeed":360,"SingleminPlayerDistance":10,"SinglemaxPlayerDistance":20,"SingleminMoveStep":10}]}]},"DetachedTasks":[{"Type":"BehaviorDesigner.Runtime.Tasks.Sequence","NodeData":{"Offset":"(-1353.33228,1086.19006)"},"ID":31,"Name":"Sequence","Instant":true,"AbortTypeabortType":"None","Children":[{"Type":"CheckCooldown","NodeData":{"Offset":"(-215.1163,191.6279)"},"ID":32,"Name":"Check Cooldown","Instant":true,"CooldownTypetype":"Teleport"},{"Type":"SetEnemyState","NodeData":{"Offset":"(-36.0469666,193.953125)"},"ID":33,"Name":"Set Enemy State","Instant":true,"SharedIntCurEnemyState":{"Type":"BehaviorDesigner.Runtime.SharedInt","Name":null,"Int32mValue":3}},{"Type":"OctopusTeleport","NodeData":{"Offset":"(129.693481,190.210541)"},"ID":34,"Name":"Octopus Teleport","Instant":true,"SinglemoveDuration":2,"SinglehideDuration":0.5},{"Type":"SetEnemyState","NodeData":{"Offset":"(295.5813,200)"},"ID":35,"Name":"Set diff --git a/Assets/_FutureMen2/Prefabs/Enemys/FrogBoss/FrogBoss.controller b/Assets/_FutureMen2/Prefabs/Enemys/FrogBoss/FrogBoss.controller index 3c9149cc..1da82523 100644 --- a/Assets/_FutureMen2/Prefabs/Enemys/FrogBoss/FrogBoss.controller +++ b/Assets/_FutureMen2/Prefabs/Enemys/FrogBoss/FrogBoss.controller @@ -179,6 +179,31 @@ AnimatorStateTransition: m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 +--- !u!1101 &-2711222080453594139 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 6 + m_ConditionEvent: State + m_EventTreshold: 6 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -1078497401144232932} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.875 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!1101 &-2671363019568319060 AnimatorStateTransition: m_ObjectHideFlags: 1 @@ -251,6 +276,83 @@ AnimatorStateTransition: m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 +--- !u!1101 &-1921253264493656767 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 6 + m_ConditionEvent: State + m_EventTreshold: 6 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -1078497401144232932} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.625 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &-1844182377805025264 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 6 + m_ConditionEvent: State + m_EventTreshold: 1 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 1102663596461928382} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.5 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1102 &-1078497401144232932 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: HopBackwards + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: -1844182377805025264} + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: 1fd1a970ac46ddf4689f5bf3bb11c39e, type: 3} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: --- !u!1101 &-592652105016937593 AnimatorStateTransition: m_ObjectHideFlags: 1 @@ -392,6 +494,7 @@ AnimatorState: - {fileID: -2671363019568319060} - {fileID: -5557026917707908089} - {fileID: -8642213485797055358} + - {fileID: -2711222080453594139} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -415,10 +518,11 @@ AnimatorState: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: TongueAttack - m_Speed: 1 + m_Speed: 0.5 m_CycleOffset: 0 m_Transitions: - {fileID: 1870223107423465540} + - {fileID: -1921253264493656767} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -523,6 +627,9 @@ AnimatorStateMachine: - serializedVersion: 1 m_State: {fileID: -6259595215397375389} m_Position: {x: 80, y: -210, z: 0} + - serializedVersion: 1 + m_State: {fileID: -1078497401144232932} + m_Position: {x: 60, y: 60, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: - {fileID: -592652105016937593} diff --git a/Assets/_FutureMen2/Prefabs/Enemys/FrogBoss/FrogBoss.prefab b/Assets/_FutureMen2/Prefabs/Enemys/FrogBoss/FrogBoss.prefab index 69cb67e4..a9a9f77a 100644 --- a/Assets/_FutureMen2/Prefabs/Enemys/FrogBoss/FrogBoss.prefab +++ b/Assets/_FutureMen2/Prefabs/Enemys/FrogBoss/FrogBoss.prefab @@ -21411,7 +21411,7 @@ Transform: m_GameObject: {fileID: 3154779473439688865} serializedVersion: 2 m_LocalRotation: {x: 0.5215236, y: -0.47750643, z: -0.52152437, w: -0.47750723} - m_LocalPosition: {x: -0.21141642, y: -0.26153922, z: 0.046999507} + m_LocalPosition: {x: 0.064, y: 0.261, z: 0.047} m_LocalScale: {x: 0.3333334, y: 0.33333325, z: 0.33333328} m_ConstrainProportionsScale: 0 m_Children: @@ -63134,7 +63134,7 @@ Transform: m_GameObject: {fileID: 9162391593857776990} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0.015, y: -0.95, z: 1.512} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] diff --git a/Assets/_FutureMen2/Prefabs/Enemys/OctopusBoss/Circle.prefab b/Assets/_FutureMen2/Prefabs/Enemys/OctopusBoss/Circle.prefab index 4c049012..ba7c1e49 100644 --- a/Assets/_FutureMen2/Prefabs/Enemys/OctopusBoss/Circle.prefab +++ b/Assets/_FutureMen2/Prefabs/Enemys/OctopusBoss/Circle.prefab @@ -9,7 +9,6 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 3320046986086588041} - - component: {fileID: 1905757065019250271} - component: {fileID: -1523142734516482809} m_Layer: 0 m_Name: Circle @@ -27,64 +26,13 @@ Transform: m_GameObject: {fileID: 2285512047395473266} serializedVersion: 2 m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068} - m_LocalPosition: {x: 0, y: 0.01, z: 0} - m_LocalScale: {x: 3, y: 3, z: 3} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 1 - m_Children: [] + m_Children: + - {fileID: 6320871657136772738} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} ---- !u!212 &1905757065019250271 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2285512047395473266} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 0 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 0 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_Sprite: {fileID: -2413806693520163455, guid: a86470a33a6bf42c4b3595704624658b, type: 3} - m_Color: {r: 1, g: 0, b: 0, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 1, y: 1} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 --- !u!114 &-1523142734516482809 MonoBehaviour: m_ObjectHideFlags: 0 @@ -99,3 +47,165 @@ MonoBehaviour: m_EditorClassIdentifier: desTime: 0 isSetDieTime: 1 +--- !u!1001 &1539014401033496611 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 3320046986086588041} + m_Modifications: + - target: {fileID: 2464587756893014244, guid: 2d8a353bdd9c9724eab1d2f6133288ad, type: 3} + propertyPath: InitialModule.startColor.maxColor.b + value: 0.34509802 + objectReference: {fileID: 0} + - target: {fileID: 2464587756893014244, guid: 2d8a353bdd9c9724eab1d2f6133288ad, type: 3} + propertyPath: InitialModule.startColor.maxColor.g + value: 0.35022202 + objectReference: {fileID: 0} + - target: {fileID: 2464587756893014244, guid: 2d8a353bdd9c9724eab1d2f6133288ad, type: 3} + propertyPath: InitialModule.startColor.maxColor.r + value: 0.90588236 + objectReference: {fileID: 0} + - target: {fileID: 2464587756893014247, guid: 2d8a353bdd9c9724eab1d2f6133288ad, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2464587757183695290, guid: 2d8a353bdd9c9724eab1d2f6133288ad, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2464587757183695303, guid: 2d8a353bdd9c9724eab1d2f6133288ad, type: 3} + propertyPath: InitialModule.startColor.maxColor.b + value: 0.06666668 + objectReference: {fileID: 0} + - target: {fileID: 2464587757183695303, guid: 2d8a353bdd9c9724eab1d2f6133288ad, type: 3} + propertyPath: InitialModule.startColor.maxColor.g + value: 0.18784815 + objectReference: {fileID: 0} + - target: {fileID: 2464587757183695303, guid: 2d8a353bdd9c9724eab1d2f6133288ad, type: 3} + propertyPath: InitialModule.startColor.maxColor.r + value: 0.83137256 + objectReference: {fileID: 0} + - target: {fileID: 2464587757413755030, guid: 2d8a353bdd9c9724eab1d2f6133288ad, type: 3} + propertyPath: InitialModule.startColor.maxColor.b + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2464587757413755030, guid: 2d8a353bdd9c9724eab1d2f6133288ad, type: 3} + propertyPath: InitialModule.startColor.maxColor.g + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2464587757413755030, guid: 2d8a353bdd9c9724eab1d2f6133288ad, type: 3} + propertyPath: InitialModule.startColor.maxColor.r + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2464587757802451121, guid: 2d8a353bdd9c9724eab1d2f6133288ad, type: 3} + propertyPath: InitialModule.startColor.maxColor.b + value: 0.008803844 + objectReference: {fileID: 0} + - target: {fileID: 2464587757802451121, guid: 2d8a353bdd9c9724eab1d2f6133288ad, type: 3} + propertyPath: InitialModule.startColor.maxColor.g + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2464587757802451121, guid: 2d8a353bdd9c9724eab1d2f6133288ad, type: 3} + propertyPath: InitialModule.startColor.maxColor.r + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2464587757802451124, guid: 2d8a353bdd9c9724eab1d2f6133288ad, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4819856801898284651, guid: 2d8a353bdd9c9724eab1d2f6133288ad, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4819856801965100619, guid: 2d8a353bdd9c9724eab1d2f6133288ad, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4819856802861501857, guid: 2d8a353bdd9c9724eab1d2f6133288ad, type: 3} + propertyPath: InitialModule.startColor.maxColor.b + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4819856802861501857, guid: 2d8a353bdd9c9724eab1d2f6133288ad, type: 3} + propertyPath: InitialModule.startColor.maxColor.g + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4819856802861501857, guid: 2d8a353bdd9c9724eab1d2f6133288ad, type: 3} + propertyPath: InitialModule.startColor.maxColor.r + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4819856802861501862, guid: 2d8a353bdd9c9724eab1d2f6133288ad, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4819856803372448194, guid: 2d8a353bdd9c9724eab1d2f6133288ad, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4819856803883335328, guid: 2d8a353bdd9c9724eab1d2f6133288ad, type: 3} + propertyPath: m_Name + value: BlackHole_Tech_Loop + objectReference: {fileID: 0} + - target: {fileID: 4819856803883335328, guid: 2d8a353bdd9c9724eab1d2f6133288ad, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4819856803883335329, guid: 2d8a353bdd9c9724eab1d2f6133288ad, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4819856803883335329, guid: 2d8a353bdd9c9724eab1d2f6133288ad, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4819856803883335329, guid: 2d8a353bdd9c9724eab1d2f6133288ad, type: 3} + propertyPath: m_LocalPosition.z + value: -0.5 + objectReference: {fileID: 0} + - target: {fileID: 4819856803883335329, guid: 2d8a353bdd9c9724eab1d2f6133288ad, type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 4819856803883335329, guid: 2d8a353bdd9c9724eab1d2f6133288ad, type: 3} + propertyPath: m_LocalRotation.x + value: -0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 4819856803883335329, guid: 2d8a353bdd9c9724eab1d2f6133288ad, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4819856803883335329, guid: 2d8a353bdd9c9724eab1d2f6133288ad, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4819856803883335329, guid: 2d8a353bdd9c9724eab1d2f6133288ad, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: -90 + objectReference: {fileID: 0} + - target: {fileID: 4819856803883335329, guid: 2d8a353bdd9c9724eab1d2f6133288ad, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4819856803883335329, guid: 2d8a353bdd9c9724eab1d2f6133288ad, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4819856803909404036, guid: 2d8a353bdd9c9724eab1d2f6133288ad, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: + - {fileID: 7268959093297405008, guid: 2d8a353bdd9c9724eab1d2f6133288ad, type: 3} + - {fileID: 4819856803909404036, guid: 2d8a353bdd9c9724eab1d2f6133288ad, type: 3} + - {fileID: 4819856801898284651, guid: 2d8a353bdd9c9724eab1d2f6133288ad, type: 3} + - {fileID: 4819856801965100619, guid: 2d8a353bdd9c9724eab1d2f6133288ad, type: 3} + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 2d8a353bdd9c9724eab1d2f6133288ad, type: 3} +--- !u!4 &6320871657136772738 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4819856803883335329, guid: 2d8a353bdd9c9724eab1d2f6133288ad, type: 3} + m_PrefabInstance: {fileID: 1539014401033496611} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/_FutureMen2/Prefabs/Player.prefab b/Assets/_FutureMen2/Prefabs/Player.prefab index 8c704ae9..212b12ca 100644 --- a/Assets/_FutureMen2/Prefabs/Player.prefab +++ b/Assets/_FutureMen2/Prefabs/Player.prefab @@ -80671,9 +80671,6 @@ GameObject: - component: {fileID: 3725749376190324970} - component: {fileID: 4466946086566809613} - component: {fileID: 4750601385798454190} - - component: {fileID: 1150322761938357700} - - component: {fileID: 3137991373021067334} - - component: {fileID: 7223512661646424289} m_Layer: 7 m_Name: Player m_TagString: Player @@ -81014,141 +81011,6 @@ CapsuleCollider: m_Height: 0.64 m_Direction: 1 m_Center: {x: 0.26, y: 0.43, z: 0.3} ---- !u!114 &1150322761938357700 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4948796608574586180} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 560112f876f5746c780eca0d404e7139, type: 3} - m_Name: - m_EditorClassIdentifier: - version: 1073741824 - radiusBackingField: 0.5 - heightBackingField: 2 - centerBackingField: 1 - locked: 0 - lockWhenNotMoving: 0 - agentTimeHorizon: 2 - obstacleTimeHorizon: 0.5 - maxNeighbours: 10 - layer: 1 - collidesWith: -1 - wallAvoidForce: 1 - wallAvoidFalloff: 1 - priority: 0.5 - debug: 0 ---- !u!114 &3137991373021067334 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4948796608574586180} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 373b52eb9bf8c40f785bb6947a1aee66, type: 3} - m_Name: - m_EditorClassIdentifier: - version: 1073741824 - drawGizmos: 1 - detailedGizmos: 0 - startEndModifier: - addPoints: 0 - exactStartPoint: 3 - exactEndPoint: 3 - useRaycasting: 0 - mask: - serializedVersion: 2 - m_Bits: 4294967295 - useGraphRaycasting: 0 - traversableTags: -1 - tagCostMultipliers: - - 1 - - 1 - - 1 - - 1 - - 1 - - 1 - - 1 - - 1 - - 1 - - 1 - - 1 - - 1 - - 1 - - 1 - - 1 - - 1 - - 1 - - 1 - - 1 - - 1 - - 1 - - 1 - - 1 - - 1 - - 1 - - 1 - - 1 - - 1 - - 1 - - 1 - - 1 - - 1 - tagEntryCosts: 0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 - graphMask: - value: -1 ---- !u!114 &7223512661646424289 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4948796608574586180} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f6eb1402c17e84a9282a7f0f62eb584f, type: 3} - m_Name: - m_EditorClassIdentifier: - version: 1073741824 - radius: 0.5 - height: 2 - simulateMovement: 1 - maxSpeed: 1 - gravity: {x: NaN, y: NaN, z: NaN} - groundMask: - serializedVersion: 2 - m_Bits: 4294967295 - endReachedDistance: 0.2 - whenCloseToDestination: 0 - rvoDensityBehavior: - enabled: 1 - densityThreshold: 0.5 - returnAfterBeingPushedAway: 0 - progressAverage: 0 - lastJobDensityResult: 0 - repathRateCompatibility: NaN - canSearchCompability: 0 - orientation: 0 - enableRotation: 1 - autoRepath: - mode: 2 - period: 0.5 - sensitivity: 10 - maximumPeriod: 2 - visualizeSensitivity: 0 - maxAcceleration: -2.5 - rotationSpeed: 360 - slowdownDistance: 0.6 - pickNextWaypointDist: 2 - alwaysDrawGizmos: 0 - slowWhenNotFacingTarget: 1 - preventMovingBackwards: 0 - constrainInsideGraph: 0 --- !u!1 &4948796609349078463 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/_FutureMen2/Resources/Data.json b/Assets/_FutureMen2/Resources/Data.json index 1d78dcc1..bb1dded3 100644 --- a/Assets/_FutureMen2/Resources/Data.json +++ b/Assets/_FutureMen2/Resources/Data.json @@ -1 +1 @@ -{"EnemyInfo":{"Columns":["ID","EnemyId","Name","Name_CN","Atk_1P","Atk_1B","Atk_2","Atk_2dot","Atk_2Time","Atk_3","Speed","Speed_C","Rate_1","Rate_2","Rate_CF","Hp","Hp_CS1","Hp_CS2"],"Values":[[ 1, 2001,"zhangyu","\u5317\u6D77\u5DE8\u5996", 3, 4, 2, 0, 0, 10,0.5, 1, 6, 30, 20, 160000, 36000, 0],[ 2, 2002,"shachong","\u6C99\u4E18\u7206\u541B", 3, 0, 4, 0, 0, 10, 1, 1, 6, 30, 20, 180000, 0, 0],[ 3, 2003,"dazui","\u6DF1\u6E0A\u6BD2\u540E", 3, 0, 3, 2, 5, 1, 0, 1, 6, 30, 20, 200000, 300, 500],[ 4, 2004,"siwangqishi","\u6B7B\u4EA1\u9A91\u58EB", 5, 5, 8, 2, 5, 10, 1, 1, 6, 30, 20, 240000, 0, 0]]},"PlayerBulletData":{"Columns":["ID","Name","Name_CN","Damage","Number"],"Values":[[ 1,"PlayerWeapon1","\u521D\u59CB\u5355\u70B9\u67AA","((60,180))",-1],[ 2,"PlayerWeapon2","LV1\u67AA","((100,200))", 60],[ 3,"PlayerWeapon3","LV2\u67AA","((200,300))", 60],[ 4,"PlayerWeapon4","LV3\u67AA","((300,400))", 60]]}} +{"EnemyInfo":{"Columns":["ID","EnemyId","Name","Name_CN","Atk_1P","Atk_1B","Atk_2","Atk_2dot","Atk_2Time","Atk_3","Speed","Speed_C","Rate_1","Rate_2","Rate_CF","Hp","Hp_CS1","Hp_CS2"],"Values":[[ 1, 2001,"zhangyu","\u5317\u6D77\u5DE8\u5996", 3, 4, 2, 0, 0, 10,0.5, 1, 6, 30, 20, 160000, 18000, 0],[ 2, 2002,"shachong","\u6C99\u4E18\u7206\u541B", 3, 0, 4, 0, 0, 10, 1, 1, 6, 30, 20, 180000, 0, 0],[ 3, 2003,"dazui","\u6DF1\u6E0A\u6BD2\u540E", 3, 0, 3, 2, 5, 1, 0, 1, 6, 30, 20, 200000, 300, 500],[ 4, 2004,"siwangqishi","\u6B7B\u4EA1\u9A91\u58EB", 5, 5, 8, 2, 5, 10, 1, 1, 6, 30, 20, 240000, 0, 0]]},"PlayerBulletData":{"Columns":["ID","Name","Name_CN","Damage","Number"],"Values":[[ 1,"PlayerWeapon1","\u521D\u59CB\u5355\u70B9\u67AA","((60,180))",-1],[ 2,"PlayerWeapon2","LV1\u67AA","((100,200))", 60],[ 3,"PlayerWeapon3","LV2\u67AA","((200,300))", 60],[ 4,"PlayerWeapon4","LV3\u67AA","((300,400))", 60]]}} diff --git a/Assets/_FutureMen2/Resources/《银河守护者2-异型》怪物配置标.xlsx b/Assets/_FutureMen2/Resources/《银河守护者2-异型》怪物配置标.xlsx index 97978a95..361f972e 100644 Binary files a/Assets/_FutureMen2/Resources/《银河守护者2-异型》怪物配置标.xlsx and b/Assets/_FutureMen2/Resources/《银河守护者2-异型》怪物配置标.xlsx differ diff --git a/Assets/_FutureMen2/Scenes/Company1Floor.unity b/Assets/_FutureMen2/Scenes/Company1Floor.unity index b6cf32a9..b1ad9bb6 100644 --- a/Assets/_FutureMen2/Scenes/Company1Floor.unity +++ b/Assets/_FutureMen2/Scenes/Company1Floor.unity @@ -26028,7 +26028,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!65 &2110442822 BoxCollider: m_ObjectHideFlags: 0 diff --git a/Assets/_FutureMen2/Scripts/Actions/DeathKnightActions.cs b/Assets/_FutureMen2/Scripts/Actions/DeathKnightActions.cs index 605a4856..6467b5ea 100644 --- a/Assets/_FutureMen2/Scripts/Actions/DeathKnightActions.cs +++ b/Assets/_FutureMen2/Scripts/Actions/DeathKnightActions.cs @@ -14,7 +14,7 @@ public class DeathKnightChargeAtk : Action private bool isFinished; [Header("Sprint")] - public float sprintDistance = 3f; + public float sprintDistance = 6f; public float sprintSpeed = 6f; [Header("Angry Trample")] @@ -214,6 +214,9 @@ public class DeathPhantomChargeAtk : Action // 1️⃣ 转向玩家 yield return boss.RotateToPlayer(); + //后撤 + yield return boss.BossRetreat(); + // 2️⃣ 播放蓄力 / 咆哮 boss.Roar(); yield return new WaitForSeconds(0.8f); diff --git a/Assets/_FutureMen2/Scripts/Actions/FrogBossActions.cs b/Assets/_FutureMen2/Scripts/Actions/FrogBossActions.cs index bb0040be..4443238f 100644 --- a/Assets/_FutureMen2/Scripts/Actions/FrogBossActions.cs +++ b/Assets/_FutureMen2/Scripts/Actions/FrogBossActions.cs @@ -23,6 +23,10 @@ public class FrogBleepAttack : Action public float damage = 30f; private float rotateSpeed = 360f; // 每秒旋转角度 + + public float retreatDistance = 8f; + public float retreatSpeed = 6f; + public override void OnStart() { @@ -48,25 +52,51 @@ public class FrogBleepAttack : Action ); } - // 2️⃣ 锁定玩家位置（关键） + // 2️⃣ 锁定玩家位置 Vector3 lockPos = GameManager.Ins.player.transform.position; - // 面向玩家 + // 3️⃣ 面向玩家 yield return RotateToPlayer(); - // 3️⃣ 吐舌头 + // 4️⃣ 吐舌 boss.TongueAttack(); - yield return new WaitForSeconds(0.4f); - - float dis = Vector3.Distance(boss.mouthPoint.position, lockPos); - float time = dis / tongueSpeed; + yield return new WaitForSeconds(3f); - yield return new WaitForSeconds(time); + float dis = Vector3.Distance(boss.mouthPoint.position, lockPos); + yield return new WaitForSeconds(dis / tongueSpeed); + boss.Idle(); + // 5️⃣ 攻击结束 → 后撤（🔥关键） + yield return RetreatFromPlayer(); boss.Idle(); isFinished = true; } + IEnumerator RetreatFromPlayer() + { + Transform player = GameManager.Ins.player.transform; + + Vector3 dir = (transform.position - player.position); + dir.y = 0; + dir.Normalize(); + + Vector3 targetPos = transform.position + dir * retreatDistance; + + NNInfo nn = AstarPath.active.GetNearest(targetPos); + if (nn.node == null || !nn.node.Walkable) + yield break; + + boss.aiPath.isStopped = false; + boss.aiPath.maxSpeed = retreatSpeed; + boss.aiPath.destination = nn.position; + boss.Retreat(); + while (!boss.aiPath.reachedEndOfPath) + yield return null; + boss.aiPath.isStopped = true; + } + + + IEnumerator RotateToPlayer() { Transform player = GameManager.Ins.player.transform; @@ -288,11 +318,11 @@ public class FrogIdleMove : Action public float rotateSpeed = 360f; [Header("Distance To Player")] - public float minPlayerDistance = 6f; // 离玩家最近距离 - public float maxPlayerDistance = 15f; // 离玩家最远距离 + public float minPlayerDistance = 10f; // 离玩家最近距离 + public float maxPlayerDistance = 25f; // 离玩家最远距离 [Header("Patrol")] - public float minMoveStep = 5f; // 每次移动的最小距离（关键） + public float minMoveStep = 10f; // 每次移动的最小距离（关键） private FrogBoss boss; @@ -386,12 +416,12 @@ public class FrogIdleMove : Action Vector3 bossPos = transform.position; Vector3 playerPos = player.position; - const int MAX_TRY = 20; + const int MAX_TRY = 25; for (int i = 0; i < MAX_TRY; i++) { - // 🎯 以玩家为中心选点（而不是 boss） - float angle = Random.Range(0f, 360f); + float baseAngle = Quaternion.LookRotation(bossPos - playerPos).eulerAngles.y; + float angle = baseAngle + Random.Range(-120f, 120f); float radius = Random.Range(minPlayerDistance, maxPlayerDistance); @@ -399,11 +429,10 @@ public class FrogIdleMove : Action Vector3 candidate = playerPos + offset; candidate.y = bossPos.y; - // 👉 保证和当前点“足够远” + // 强制不要靠太近当前位置 if (Vector3.Distance(candidate, bossPos) < minMoveStep) continue; - // 👉 A* 校正 NNInfo nn = AstarPath.active.GetNearest(candidate); if (nn.node != null && nn.node.Walkable) { @@ -413,13 +442,14 @@ public class FrogIdleMove : Action } } - // 🛑 兜底：往侧前方大步走 - Vector3 fallbackDir = Vector3.Cross(Vector3.up, (playerPos - bossPos)).normalized; - curTarget = bossPos + fallbackDir * minMoveStep; + // fallback：侧移 + Vector3 side = Vector3.Cross(Vector3.up, (bossPos - playerPos)).normalized; + curTarget = bossPos + side * minMoveStep; boss.aiPath.isStopped = false; } + #endregion } diff --git a/Assets/_FutureMen2/Scripts/Actions/OctopusActions.cs b/Assets/_FutureMen2/Scripts/Actions/OctopusActions.cs index 57e0c833..1bbfbeee 100644 --- a/Assets/_FutureMen2/Scripts/Actions/OctopusActions.cs +++ b/Assets/_FutureMen2/Scripts/Actions/OctopusActions.cs @@ -211,7 +211,7 @@ public class OctopusSpikeAttack : Action yield return new WaitForSeconds(2f); float playerDiameter = 0.5f * 2f; - float redCircleDiameter = playerDiameter * 3f; + float redCircleDiameter = playerDiameter * 1.5f; var points = SpikeAreaGenerator.Generate( GameManager.Ins.player.transform.position, diff --git a/Assets/_FutureMen2/Scripts/Enemy/DeathKnightBoss/DeathKnightBoss.cs b/Assets/_FutureMen2/Scripts/Enemy/DeathKnightBoss/DeathKnightBoss.cs index 290d2dd1..4f22157a 100644 --- a/Assets/_FutureMen2/Scripts/Enemy/DeathKnightBoss/DeathKnightBoss.cs +++ b/Assets/_FutureMen2/Scripts/Enemy/DeathKnightBoss/DeathKnightBoss.cs @@ -120,6 +120,11 @@ public class DeathKnightBoss : Enemy GameManager.Ins.PlaySound3D("1.2", transform); } + public void Retreat() + { + houseAnim.SetInteger("state", 4); + } + public void Run() { bossManAnim.SetInteger("state",2); @@ -190,6 +195,26 @@ public class DeathKnightBoss : Enemy } Idle(); } + + public float retreatDis = 15; + public float retreatSpeed = 4; + public IEnumerator BossRetreat() + { + Retreat(); + Transform player = GameManager.Ins.player.transform; + float curDis=Vector3.Distance(player.position.ReflectVectorXOZ(), transform.position.ReflectVectorXOZ()); + Vector3 startPos = transform.position; + Vector3 forward = (player.position - startPos).normalized; + forward.y = 0; + while (curDis < retreatDis) + { + float step = retreatSpeed * Time.deltaTime; + transform.position -= forward * step; + curDis=Vector3.Distance(player.position.ReflectVectorXOZ(), transform.position.ReflectVectorXOZ()); + yield return null; + } + Idle(); + } public void LaunchSword() { diff --git a/Assets/_FutureMen2/Scripts/Enemy/FrogBoss/FrogBoss.cs b/Assets/_FutureMen2/Scripts/Enemy/FrogBoss/FrogBoss.cs index 2e0794a0..c692770b 100644 --- a/Assets/_FutureMen2/Scripts/Enemy/FrogBoss/FrogBoss.cs +++ b/Assets/_FutureMen2/Scripts/Enemy/FrogBoss/FrogBoss.cs @@ -141,6 +141,16 @@ public class FrogBoss : Enemy GameManager.Ins.PlaySound3D("1.19", transform); } + /// + /// 后撤 + /// + public void Retreat() + { + bossAnim.SetInteger("State", 6); + Debug.LogError("后撤"); + GameManager.Ins.PlaySound3D("1.19", transform); + } + public void Idle() { bossAnim.SetInteger("State", 1); diff --git a/Assets/_FutureMen2/Scripts/Manager/GameManager.cs b/Assets/_FutureMen2/Scripts/Manager/GameManager.cs index e4e68b19..11e1c350 100644 --- a/Assets/_FutureMen2/Scripts/Manager/GameManager.cs +++ b/Assets/_FutureMen2/Scripts/Manager/GameManager.cs @@ -17,31 +17,31 @@ using Random = UnityEngine.Random; /// public enum GamePlace { - // Test = -1, + // Test = -1, Company1Floor = 0, + Company1FloorShiwai=-999, LiaoningAnShan = 1, - Liaoning_AnShan_Lishan_Dayuecheng=-1, + Liaoning_AnShan_Lishan_Dayuecheng =-1, HangZhouLongHuTianJie = 2, Nanjing_Yuhua_Wanxiang = 3, Nanjing_Xianlin_WanDaMao = 4, Yangzhou_Hanjiang_Tansuozhongxin = 5, Yangzhou_Hanjiang_TansuoZhongxin_wai = -5, Zhejiang_Jinhua_KeJiGuan = 6, - Guangzhou_Panyv_Zhanting = 7, Anhui_Wuhu_Guanwei = 8, - Shandong_Jining_Shangchang = 9, - Shandong_Jining_Shangchang_nei = -9, - ShanDong_Langfang_QingzhouTaihuacheng = 10, + Shandong_Jining_Wanhuicheng_nei = -9, + Shandong_Langfang_QingzhouTaihuacheng = 10, Hubei_Xiangyang_Kejiguan = 11, - Zhejiang_Shaoxing_Shengzhou_WuyueGuangchang=12, - Hunan_Jishou_Qianzhou_Tianhong=13, - Jilin_Tonghua_Liuhe=14, + Zhejiang_Shaoxing_Shengzhou_WuyueGuangchang = 12, + Hunan_Jishou_Qianzhou_Tianhong = 13, + Jilin_Tonghua_Liuhe = 14, Shandong_Jinan_Huaiyin_ShengfutongShangmao = 15, Shandong_Jinan_Huaiyin_ShengfutongShangmao_wai = -15, Henan_Xinzheng_Shuanghudadao_Longhujinyicheng = 16, Nanjing_Qixia_Yaohuamen_Jindiguangchang = 17, Nanjing_Qixia_Yaohuamen_Jindiguangchang_nei = -17, - Anshan_Suzhou_Yueshan_Guchengshangyejie = 18, + Anhui_Suzhou_Yueshan_Guchengshangyejie = 18, + Anhui_Suzhou_Yueshan_Guchengshangyejie_2=-18, Gansu_Longnan_Shicheng_Dongsheng = 19, Shandong_Heze_Yuncheng_Gefuli = 20, Wulanhaote_Ouya_Shangchang = 21, @@ -53,25 +53,56 @@ public enum GamePlace Yunnan_Lincang_Linxiang_Hengji = 25, Yunnan_Lincang_Linxiang_Hengji_Dixia = -25, Guangxi_Guilin_Gongcheng_Shijixincheng = 26, - Guangdong_Shenzhen_Guangming_Wanda = 27, + Guangdong_shenzheng_Guangming_Shijiguangchang=27, Gansu_Jinchang_Jinchuan_Shijiguangchang = 28, Gansu_Jinchang_Jinchuan_Shijiguangchang_Shiwai=-28, - Jiangsu_Xvzhou_Fengxian_Wuyueguangchang =29, + Jiangsu_Xvzhou_Fengxian_Wuyueguangchang = 29, Hebei_Tangshan_Qianan_Tianyuangu = 30, Guangdong_Guangzhou_Yanghaiyan = 31, Guangdong_Guangzhou_Yanghaiyan_Lihu=-31, Zhejiang_Hangzhou_Linping_Yintaicheng = 32, - Zhejiang_Hangzhou_Linping_Yintaicheng_Shinei= -32, - Henan_Xinxiang_Wandaguangchang =33, - Henan_Xinxiang_Wandaguangchang_Shinei=-33, + Zhejiang_Hangzhou_Linping_Yintaicheng_Shinei = -32, + Henan_Xinxiang_Wandaguangchang = 33, + Henan_Xinxiang_Wandaguangchang_Shinei = -33, Yangzhou_Hanjiang_TansuoZhongxin_Waidai =34, Nanjing_Pukou_Longhutianjie=35, Jiangsu_Xvzhou_Guolou_Oulebao=36, Jiangsu_Xvzhou_Guolou_Oulebao_2=-36, Jiangsu_Xvzhou_Suning_Guangchang =37, - Jiangsu_Xvzhou_Suning_Guangchang_1=-37, + Jiangsu_Xvzhou_Suning_Guangchang_1 = -37, Shanxi_Baoji_Meixian_TianlongShangcheng = 38, Hunan_Changde_Lixian_WandaGuangchang=39, + Jilin_Changchun_Beihu_WyueGuangchang=41, + Chongqing_Yuzhong_Hongyadong_Xiakexing=42, + Chongqing_Yuzhong_Hongyadong_Xiakexing_shiwan=-42, + Chengdu_Shuangliu_ShengfeiXuexiao =43, + Hebei_Hengshui_Xinji_WandaGuangchang=44, + Hebei_Hengshui_Taocheng_WandaGuangchang = -44, + Ningxia_Yinchuan_Jinfeng_XinhualianGuangchang = 45, + Hunan_Zhuzhou_Wanda_Shennongcheng_Chaowanshe = 46, + Anhui_Suzhou_Yueshan_Guchengshangyejie_Shinei=47, + Zhejiang_Wenzhou_Cangnan_Yintaicheng = 48, + Shandong_Jining_Shangchang_3=49, + Anhui_Manshan_XingyueGuangchang = 50, + Shandong_Weifang_Linqu_WandaGuangchang = 51, + Guangdong_Foushan_Haiyangguang = 52, + Jilin_Changchun_Chaoyang_OuyaMaichang=53, + Shandong_Weifang_Linqu_WandaGuangchang_Shinei = 54, + Liaoning_Panjin_Shuangtaizi_Shuangtaicheng = 55, + Liaoning_Dalian_Pulandian_WandaGuangchang = 56, + Jiangxi_Ganzhou_Longnan_WandaGuangchang=57, + Jiangxi_Ganzhou_Longnan_WandaGuangchang_Shinei=58, + Jiangxi_Ganzhou_Zhanggong_GanzhouShucheng = 59, + Henan_Shangqiu_Juyang_WuyueGuangchang = 60, + Guangdong_Meizhou_Meixian_TianhongShangchang = 61, + Beijing_Tongzhou_Luyijie_XiangrikuiGuangchang = 62, + Ningxia_Yinchuang_Shizuishan_WandaGuangchang = 63, + Jilin_Jilin_Chuangying_Zhongdongxinshenghuo = 64, + Jiangxi_Nanchang_Xinjian_XvhuiGuangchang=65, + Shandong_Weihai_Jingqu_W37=66, + Hunan_Xiangxi_Yongshun_XintiandiShangchang=67, + Shanxi_Yuncheng_Yanhu_WandaGuangchang = 68, + Bejing_Miyun_RuijiaShangchang = 69, } public enum GameKey @@ -125,7 +156,7 @@ public class GameManager : MonoBehaviour public float buffAtk = 0f; public float buffDef = 0f; - public LoginInfo loginInfo = new LoginInfo(); + public LoginInfo authInfo = new LoginInfo(); public Enemy curBoss; @@ -165,42 +196,51 @@ public class GameManager : MonoBehaviour } cb?.Invoke(req, response); }); - loginInfo.deviceSn = GetPicoSn(); - loginInfo.startAt = ConvertTimestampToDateTime(GetTimestamp()) + ""; - loginInfo.shop = 0; + authInfo.deviceSn = GetPicoSn(); + authInfo.startAt = ConvertTimestampToDateTime(GetTimestamp()) + ""; + authInfo.shop = 0; #if !UNITY_EDITOR && UNITY_ANDROID && PICO - loginInfo.shop = (int)GameInit.Ins.gamePlace; - if(GameInit.Ins.gamePlace== GamePlace.Liaoning_AnShan_Lishan_Dayuecheng) - loginInfo.shop = 1; - if(GameInit.Ins.gamePlace== GamePlace.Yangzhou_Hanjiang_TansuoZhongxin_wai) - loginInfo.shop = 5; - if(GameInit.Ins.gamePlace== GamePlace.Shandong_Jining_Shangchang_nei) - loginInfo.shop = 9; - if(GameInit.Ins.gamePlace== GamePlace.Shandong_Jinan_Huaiyin_ShengfutongShangmao_wai) - loginInfo.shop = 15; - if(GameInit.Ins.gamePlace== GamePlace.Nanjing_Qixia_Yaohuamen_Jindiguangchang_nei) - loginInfo.shop = 17; - if(GameInit.Ins.gamePlace== GamePlace.Wulanhaote_Wanda_Shangchang) - loginInfo.shop = 21; - if(GameInit.Ins.gamePlace== GamePlace.Hunan_Hengyang_Zhuhui_Dongzhoudao_nei) - loginInfo.shop = 24; - if(GameInit.Ins.gamePlace== GamePlace.Yunnan_Lincang_Linxiang_Hengji_Dixia) - loginInfo.shop = 25; - if(GameInit.Ins.gamePlace== GamePlace. Gansu_Jinchang_Jinchuan_Shijiguangchang_Shiwai) - loginInfo.shop = 28; - if(GameInit.Ins.gamePlace== GamePlace. Guangdong_Guangzhou_Yanghaiyan_Lihu) - loginInfo.shop = 31; - if(GameInit.Ins.gamePlace== GamePlace.Zhejiang_Hangzhou_Linping_Yintaicheng_Shinei) - loginInfo.shop = 32; - if(GameInit.Ins.gamePlace== GamePlace.Henan_Xinxiang_Wandaguangchang_Shinei) - loginInfo.shop = 33; - if(GameInit.Ins.gamePlace== GamePlace.Jiangsu_Xvzhou_Guolou_Oulebao_2) - loginInfo.shop = 36; - if(GameInit.Ins.gamePlace== GamePlace.Jiangsu_Xvzhou_Suning_Guangchang_1) - loginInfo.shop = 37; + authInfo.shop = (int)GameInit.Ins.gamePlace; + if(GameInit.Ins.gamePlace== GamePlace.Liaoning_AnShan_Lishan_Dayuecheng) + authInfo.shop = 1; + if(GameInit.Ins.gamePlace== GamePlace.Yangzhou_Hanjiang_TansuoZhongxin_wai) + authInfo.shop = 5; + if (GameInit.Ins.gamePlace == GamePlace.Shandong_Jining_Wanhuicheng_nei) + authInfo.shop = 9; + if (GameInit.Ins.gamePlace == GamePlace.Shandong_Jinan_Huaiyin_ShengfutongShangmao_wai) + authInfo.shop = 15; + if (GameInit.Ins.gamePlace == GamePlace.Nanjing_Qixia_Yaohuamen_Jindiguangchang_nei) + authInfo.shop = 17; + if (GameInit.Ins.gamePlace == GamePlace.Anhui_Suzhou_Yueshan_Guchengshangyejie_2) + authInfo.shop = 18; + if (GameInit.Ins.gamePlace == GamePlace.Wulanhaote_Wanda_Shangchang) + authInfo.shop = 21; + if (GameInit.Ins.gamePlace == GamePlace.Hunan_Hengyang_Zhuhui_Dongzhoudao_nei) + authInfo.shop = 24; + if (GameInit.Ins.gamePlace == GamePlace.Yunnan_Lincang_Linxiang_Hengji_Dixia) + authInfo.shop = 25; + if (GameInit.Ins.gamePlace == GamePlace.Gansu_Jinchang_Jinchuan_Shijiguangchang_Shiwai) + authInfo.shop = 28; + if (GameInit.Ins.gamePlace == GamePlace.Guangdong_Guangzhou_Yanghaiyan_Lihu) + authInfo.shop = 31; + if (GameInit.Ins.gamePlace == GamePlace.Zhejiang_Hangzhou_Linping_Yintaicheng_Shinei) + authInfo.shop = 32; + if (GameInit.Ins.gamePlace == GamePlace.Henan_Xinxiang_Wandaguangchang_Shinei) + authInfo.shop = 33; + if (GameInit.Ins.gamePlace == GamePlace.Jiangsu_Xvzhou_Guolou_Oulebao_2) + authInfo.shop = 36; + if (GameInit.Ins.gamePlace == GamePlace.Jiangsu_Xvzhou_Suning_Guangchang_1) + authInfo.shop = 37; + if (GameInit.Ins.gamePlace == GamePlace.Chongqing_Yuzhong_Hongyadong_Xiakexing_shiwan) + authInfo.shop = 42; + if (GameInit.Ins.gamePlace == GamePlace. Hebei_Hengshui_Taocheng_WandaGuangchang ) + authInfo.shop = 44; + if (GameInit.Ins.gamePlace == GamePlace.Company1FloorShiwai) + authInfo.shop = 0; #endif - loginInfo.gameId = (int)GameInit.Ins.gameId; - string authJson = JsonUtility.ToJson(loginInfo); + + authInfo.gameId = (int)GameInit.Ins.gameId; + string authJson = JsonUtility.ToJson(authInfo); Debug.Log("发送数据 -> " + authJson); request.RawData = System.Text.Encoding.UTF8.GetBytes(authJson); request.AddHeader("Content-Type", "application/json"); @@ -275,15 +315,14 @@ public class GameManager : MonoBehaviour public void GamePlay() { //修改处：创建AI角色 - //CreateAICharacter(); - - isGamePlay = true; - CreateBoss(GameInit.Ins.allBossPos[0].position); + CreateAICharacter(); PlayerUIMessage(0); // CoroutineTaskManager.Instance.WaitSecondTodo(() => // AudioManager.Ins?.SoundPlay("bgm2", true), 10f); // CoroutineTaskManager.Instance.WaitSecondTodo(() => // AudioManager.Ins?.SoundPlay("2.39BGM", true), 30f); + // isGamePlay = true; + // CreateBoss(GameInit.Ins.allBossPos[0].position); } //修改处：添加AI介绍完成后的游戏开始方法 @@ -294,6 +333,7 @@ public class GameManager : MonoBehaviour Debug.Log("AI介绍完成，开始游戏正常流程"); + //创建Boss CreateBoss(GameInit.Ins.allBossPos[0].position); @@ -395,7 +435,7 @@ public class GameManager : MonoBehaviour { point.transform.position = new Vector3(-2, 0, 2); } - if (GameInit.Ins.gamePlace == GamePlace.ShanDong_Langfang_QingzhouTaihuacheng) + if (GameInit.Ins.gamePlace == GamePlace.Shandong_Langfang_QingzhouTaihuacheng) { point.transform.position = new Vector3(7.46f, 0, 1.65f); } diff --git a/Assets/_FutureMen2/Scripts/Player/Player.cs b/Assets/_FutureMen2/Scripts/Player/Player.cs index b63ce0e0..e0ae13be 100644 --- a/Assets/_FutureMen2/Scripts/Player/Player.cs +++ b/Assets/_FutureMen2/Scripts/Player/Player.cs @@ -243,7 +243,6 @@ public class Player : MonoBehaviour { CurGunId = 1; playerHands.PickUpAndSwitchTo(1, 10000); - Debug.LogError("切换成初始枪"); } #endregion