no message

This commit is contained in:
2025-08-11 18:17:39 +02:00
parent 7882b84cf5
commit baa4133324
8 changed files with 10913 additions and 839 deletions

View File

@@ -1650,6 +1650,34 @@ MonoBehaviour:
rotatePlayerTowardsTarget: 0
rotationActivationAngle: 45
debug: 0
--- !u!1102 &-6417270015348946273
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: BlockEnd
m_Speed: 1
m_CycleOffset: 0
m_Transitions:
- {fileID: 606547565327860363}
m_StateMachineBehaviours:
- {fileID: -4885966736990036633}
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: 0}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!114 &-6392689329446905468
MonoBehaviour:
m_ObjectHideFlags: 1
@@ -2675,6 +2703,22 @@ MonoBehaviour:
rotatePlayerTowardsTarget: 1
degreeThreshold: 100
debug: 0
--- !u!114 &-4885966736990036633
MonoBehaviour:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f223dbf5c9c4b5f46a7dbfa1a717fc27, type: 3}
m_Name:
m_EditorClassIdentifier:
eventTriggers:
- eventName: BlockEnd
eventTriggerType: 0
normalizedTime: 0
--- !u!114 &-4859208400828985047
MonoBehaviour:
m_ObjectHideFlags: 1
@@ -4214,6 +4258,22 @@ AnimatorTransition:
m_Mute: 0
m_IsExit: 1
serializedVersion: 1
--- !u!114 &-2754185028515903289
MonoBehaviour:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f223dbf5c9c4b5f46a7dbfa1a717fc27, type: 3}
m_Name:
m_EditorClassIdentifier:
eventTriggers:
- eventName: BlockStart
eventTriggerType: 0
normalizedTime: 0
--- !u!1107 &-2752789322842852168
AnimatorStateMachine:
serializedVersion: 6
@@ -26276,6 +26336,28 @@ AnimatorStateTransition:
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1101 &606547565327860363
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions: []
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 0}
m_Solo: 0
m_Mute: 0
m_IsExit: 1
serializedVersion: 3
m_TransitionDuration: 0.25
m_TransitionOffset: 0
m_ExitTime: 0.75
m_HasExitTime: 1
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1102 &665386389290822477
AnimatorState:
serializedVersion: 6
@@ -27626,31 +27708,6 @@ AnimatorStateTransition:
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1101 &1101000013815412478
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions:
- m_ConditionMode: 2
m_ConditionEvent: IsBlocking
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 0}
m_Solo: 0
m_Mute: 0
m_IsExit: 1
serializedVersion: 3
m_TransitionDuration: 0.25
m_TransitionOffset: 0
m_ExitTime: 0.84210527
m_HasExitTime: 0
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1101 &1101000013858046740
AnimatorStateTransition:
m_ObjectHideFlags: 1
@@ -33799,8 +33856,9 @@ AnimatorState:
m_Speed: 1
m_CycleOffset: 0
m_Transitions:
- {fileID: 1101000013815412478}
m_StateMachineBehaviours: []
- {fileID: 3922363800509573469}
m_StateMachineBehaviours:
- {fileID: -2754185028515903289}
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
m_WriteDefaultValues: 1
@@ -38805,10 +38863,13 @@ AnimatorStateMachine:
m_ChildStates:
- serializedVersion: 1
m_State: {fileID: 1102000010440148278}
m_Position: {x: 530, y: 130, z: 0}
m_Position: {x: 500, y: 130, z: 0}
- serializedVersion: 1
m_State: {fileID: 1102000014231688144}
m_Position: {x: 264, y: 132, z: 0}
- serializedVersion: 1
m_State: {fileID: -6417270015348946273}
m_Position: {x: 740, y: 130, z: 0}
m_ChildStateMachines: []
m_AnyStateTransitions: []
m_EntryTransitions: []
@@ -38816,7 +38877,7 @@ AnimatorStateMachine:
m_StateMachineBehaviours: []
m_AnyStatePosition: {x: 48, y: 108, z: 0}
m_EntryPosition: {x: 48, y: 144, z: 0}
m_ExitPosition: {x: 780, y: 144, z: 0}
m_ExitPosition: {x: 1000, y: 130, z: 0}
m_ParentStateMachinePosition: {x: 24, y: 36, z: 0}
m_DefaultState: {fileID: 1102000014231688144}
--- !u!1107 &1107000010808252344
@@ -38916,7 +38977,7 @@ AnimatorStateMachine:
m_Position: {x: 410, y: 160, z: 0}
- serializedVersion: 1
m_State: {fileID: 1102000010708744708}
m_Position: {x: 408, y: 108, z: 0}
m_Position: {x: 410, y: 110, z: 0}
- serializedVersion: 1
m_State: {fileID: 1102000012484611174}
m_Position: {x: 408, y: 60, z: 0}
@@ -46099,6 +46160,31 @@ MonoBehaviour:
stateInfos: []
tags:
- CustomAction
--- !u!1101 &3922363800509573469
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions:
- m_ConditionMode: 2
m_ConditionEvent: IsBlocking
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: -6417270015348946273}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.25
m_TransitionOffset: 0
m_ExitTime: 0.8181818
m_HasExitTime: 1
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!114 &3957802851973084061
MonoBehaviour:
m_ObjectHideFlags: 1

File diff suppressed because it is too large Load Diff

View File

@@ -15139,42 +15139,42 @@ PrefabInstance:
- target: {fileID: 564995907207171390, guid: 851e8e61247888340bdec90fc8aa37f5,
type: 3}
propertyPath: m_AnchorMax.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 564995907207171390, guid: 851e8e61247888340bdec90fc8aa37f5,
type: 3}
propertyPath: m_AnchorMin.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 564995907207171390, guid: 851e8e61247888340bdec90fc8aa37f5,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 210
value: 0
objectReference: {fileID: 0}
- target: {fileID: 564995907207171390, guid: 851e8e61247888340bdec90fc8aa37f5,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -135
value: 0
objectReference: {fileID: 0}
- target: {fileID: 616128472424357225, guid: 851e8e61247888340bdec90fc8aa37f5,
type: 3}
propertyPath: m_AnchorMax.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 616128472424357225, guid: 851e8e61247888340bdec90fc8aa37f5,
type: 3}
propertyPath: m_AnchorMin.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 616128472424357225, guid: 851e8e61247888340bdec90fc8aa37f5,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 210.00003
value: 0
objectReference: {fileID: 0}
- target: {fileID: 616128472424357225, guid: 851e8e61247888340bdec90fc8aa37f5,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -45
value: 0
objectReference: {fileID: 0}
- target: {fileID: 763034042805173548, guid: 851e8e61247888340bdec90fc8aa37f5,
type: 3}
@@ -16030,22 +16030,22 @@ PrefabInstance:
- target: {fileID: 4202610206940879906, guid: 851e8e61247888340bdec90fc8aa37f5,
type: 3}
propertyPath: m_AnchorMax.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4202610206940879906, guid: 851e8e61247888340bdec90fc8aa37f5,
type: 3}
propertyPath: m_AnchorMin.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4202610206940879906, guid: 851e8e61247888340bdec90fc8aa37f5,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 210
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4202610206940879906, guid: 851e8e61247888340bdec90fc8aa37f5,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -225
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4310148345887150382, guid: 851e8e61247888340bdec90fc8aa37f5,
type: 3}
@@ -16285,22 +16285,22 @@ PrefabInstance:
- target: {fileID: 4796023216948086302, guid: 851e8e61247888340bdec90fc8aa37f5,
type: 3}
propertyPath: m_AnchorMax.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4796023216948086302, guid: 851e8e61247888340bdec90fc8aa37f5,
type: 3}
propertyPath: m_AnchorMin.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4796023216948086302, guid: 851e8e61247888340bdec90fc8aa37f5,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 210
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4796023216948086302, guid: 851e8e61247888340bdec90fc8aa37f5,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -315
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4907318199456855652, guid: 851e8e61247888340bdec90fc8aa37f5,
type: 3}
@@ -17650,22 +17650,22 @@ PrefabInstance:
- target: {fileID: 7465903852046106667, guid: 851e8e61247888340bdec90fc8aa37f5,
type: 3}
propertyPath: m_AnchorMax.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7465903852046106667, guid: 851e8e61247888340bdec90fc8aa37f5,
type: 3}
propertyPath: m_AnchorMin.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7465903852046106667, guid: 851e8e61247888340bdec90fc8aa37f5,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 210
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7465903852046106667, guid: 851e8e61247888340bdec90fc8aa37f5,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -405
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7534046934194550914, guid: 851e8e61247888340bdec90fc8aa37f5,
type: 3}

File diff suppressed because it is too large Load Diff

View File

@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: c2054cc84c42b468ea5151eb12eeac2c
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -0,0 +1,224 @@
using System.Collections;
using System.Collections.Generic;
using Sirenix.OdinInspector;
using UnityEngine;
using DG;
using DG.Tweening;
using PixelCrushers.DialogueSystem;
using System;
public class ShieldCreationEffect : MonoBehaviour
{
[SerializeField] private MeshRenderer m_mesh;
private Material m_material;
// Handler for block start event
private void OnBlockStartEvent()
{
// Add your event handling logic here
Debug.Log("BlockStart event triggered.", gameObject);
}
[ColorUsageAttribute(true, true)]
public Color m_FresnelColor;
public float m_dissolveTime = 1f;
public float m_fresnelTime = 0.3f;
public float m_lightIntensity = 3f;
public Light m_light;
[SerializeField] private ParticleSystem m_particles;
[SerializeField] private ParticleSystem m_distortions;
private bool hasValidBehaviours;
private bool hasAnimator;
const string blockStartEvent = "BlockStart";
const string blockEndEvent = "BlockEnd";
private void OnDisable()
{
RemoveEvents();
}
public void OnEnable()
{
if (hasAnimator && hasValidBehaviours)
{
RemoveEvents();
RegisterEvents();
}
}
private void OnDestroy()
{
RemoveEvents();
}
public virtual void RegisterEvents()
{
//if (animatorEvents.Count > 0)
{
var animator = GetComponentInParent<Animator>();
if (animator)
{
hasAnimator = true;
var behaviours = animator.GetBehaviours<Invector.vEventSystems.vAnimatorEvent>();
{
var hasEvent = false;
for (int i = 0; i < behaviours.Length; i++)
{
if (behaviours[i].HasEvent(blockStartEvent))
{
behaviours[i].RegisterEvents(blockStartEvent, OnBlockStartEvent);
hasValidBehaviours = true;
hasEvent = true;
}
if (behaviours[i].HasEvent(blockEndEvent))
{
behaviours[i].RegisterEvents(blockEndEvent, OnBlockEndEvent);
hasValidBehaviours = true;
hasEvent = true;
}
}
}
}
else
{
Debug.LogWarning("Can't Find Animator to register Events in " + gameObject.name, gameObject);
}
}
}
private void OnBlockStartEvent(string eventName)
{
Create();
}
private void OnBlockEndEvent(string eventName)
{
Uncreate();
}
public virtual void RemoveEvents()
{
if (!hasAnimator || !hasValidBehaviours)
{
return;
}
var animator = GetComponentInParent<Animator>();
if (animator)
{
var behaviours = animator.GetBehaviours<Invector.vEventSystems.vAnimatorEvent>();
for (int i = 0; i < behaviours.Length; i++)
{
if (behaviours[i].HasEvent(blockStartEvent))
{
behaviours[i].RemoveEvents(blockStartEvent, OnBlockStartEvent);
}
if (behaviours[i].HasEvent(blockEndEvent))
{
behaviours[i].RemoveEvents(blockEndEvent, OnBlockEndEvent);
}
}
}
}
private void Awake()
{
if (m_mesh == null)
m_mesh = GetComponent<MeshRenderer>();
if (m_mesh == null)
{
Debug.LogError("No mesh renderer found!");
return;
}
m_material = m_mesh.material;
if (m_light)
m_light.intensity = 0f;
ParticlesEmission(false);
SetLight(false);
m_mesh.enabled = false;
}
private void SetLight(bool enabled)
{
if (m_light)
{
m_light.intensity = enabled ? m_lightIntensity : 0f;
m_light.enabled = enabled;
}
}
private void Start()
{
RegisterEvents();
}
private void ParticlesEmission(bool enabled)
{
if (m_particles != null)
{
var emm = m_particles.emission;//.enabled = false;
emm.enabled = enabled;
}
if (m_distortions != null)
{
var emm = m_distortions.emission;//.enabled = false;
emm.enabled = enabled;
}
}
[Button]
public void Uncreate()
{
m_mesh.enabled = false;
ParticlesEmission(false);
SetLight(false);
}
/*
private IEnumerator CreateCoroutine()
{
m_material.SetFloat("_Threshold", 1f);
Sequence sq = DOTween.Sequence();
sq.Append(m_material.DOFloat(0f, "_Threshold", m_dissolveTime));
ParticlesEmission(true);
yield return new WaitForSeconds(1f);
ParticlesEmission(false);
//yield return new WaitForSeconds(1f);
DOTween.Kill(m_material);
m_material.SetColor("_FresnelColor", Color.black);
m_material.SetFloat("_EffectThreshold", 1f);
sq.Append(m_material.DOColor(m_FresnelColor, "_FresnelColor", m_fresnelTime).SetEase(Ease.InSine));
sq.Append(m_material.DOColor(Color.black, "_FresnelColor", m_fresnelTime).SetEase(Ease.InSine));
m_material.DOFloat(0f, "_EffectThreshold", m_dissolveTime * 2f).SetEase(Ease.Linear).SetLoops(-1, LoopType.Yoyo);//.SetDelay(m_dissolveTime+2f* m_fresnelTime);
if (m_light)
{
m_light.intensity = 0f;
sq = DOTween.Sequence();
sq.Append(m_light.DOIntensity(m_lightIntensity, m_dissolveTime + m_fresnelTime).SetEase(Ease.InSine));
sq.Append(m_light.DOIntensity(0f, m_fresnelTime).SetEase(Ease.InSine));
}
//m_particles.DO
//m_material.DOs
// m_material.DOFloat(0f, "_Threshold", 1f);
//set fresnel color
//m_material.DOColor(m_FresnelColor, "_FresnelColor", 2f);
yield return null;
}
*/
[Button]
public void Create()
{
m_mesh.enabled = true;
ParticlesEmission(true);
SetLight(true);
//StartCoroutine(CreateCoroutine());
}
}

View File

@@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: e1cc36b0bbe5b4738945c430e3455caa
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -6,6 +6,7 @@ using UnityEngine.UI;
using UnityEngine.Rendering.Universal;
using TMPro;
using System.Collections;
using RootMotion.FinalIK;
namespace Beyond
{
@@ -375,11 +376,14 @@ namespace Beyond
public void EnableDamageSprite(vDamage damage)
{
if (damageImage != null)
if (damageImage != null && damage.hitReaction)
{
damageImage.enabled = true;
damaged = true;
damaged = true;
}
}
private void UpdateDebugWindow(vThirdPersonController cc)
{
if (cc.debugWindow)