marcin/beyond
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

improvements to magic attacks, full arena logic, improvements to NPCs fresnel rendering for targetting

Browse Source
This commit is contained in:
marcin
2025-05-23 09:54:57 +02:00
parent 2705b6c4cb
commit abc5ef0332
6 changed files with 673 additions and 237 deletions
Download Patch File Download Diff File Expand all files Collapse all files

453
Assets/Scenes/Fight_Arena/Fight_Arena.unity
View File

@@ -626,6 +626,12 @@ MeshFilter:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 87289192}
m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
--- !u!1 &87992052 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 2631004785151738407, guid: bdcc0504e0c523b4492037e978d716f4,
type: 3}
m_PrefabInstance: {fileID: 1905404674}
m_PrefabAsset: {fileID: 0}
--- !u!4 &99479629 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 8361884480791188460, guid: 851e8e61247888340bdec90fc8aa37f5,
@@ -2210,8 +2216,10 @@ GameObject:
- component: {fileID: 289966094}
- component: {fileID: 289966093}
- component: {fileID: 289966092}
- component: {fileID: 289966097}
- component: {fileID: 289966096}
m_Layer: 0
m_Name: Cube
m_Name: StartTrigger
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@@ -2306,6 +2314,170 @@ Transform:
m_Children: []
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: -39.5, z: 0}
--- !u!114 &289966096
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 289966091}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d3ee7654fb1dcff41b62c9ccb5f3111f, type: 3}
m_Name:
m_EditorClassIdentifier:
m_key:
m_appendSaverTypeToKey: 0
m_saveAcrossSceneChanges: 1
m_restoreStateOnStart: 0
m_fireOnce: 0
m_wasFired: 0
m_objectsToEnable: []
m_objectsToDisable: []
m_fireOnStart: 0
m_triggersToFire: []
m_delay: -1
m_actionResponse:
barkConversation:
audioClip: {fileID: 0}
responseEvent:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 289966091}
m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine
m_MethodName: SetActive
m_Mode: 6
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
- m_Target: {fileID: 609186452}
m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine
m_MethodName: SetActive
m_Mode: 6
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 1
m_CallState: 2
- m_Target: {fileID: 796152177}
m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine
m_MethodName: SetActive
m_Mode: 6
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 1
m_CallState: 2
delay: 0
m_materialsToChange: []
--- !u!82 &289966097
AudioSource:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 289966091}
m_Enabled: 1
serializedVersion: 4
OutputAudioMixerGroup: {fileID: 0}
m_audioClip: {fileID: 0}
m_Resource: {fileID: 0}
m_PlayOnAwake: 1
m_Volume: 1
m_Pitch: 1
Loop: 0
Mute: 0
Spatialize: 0
SpatializePostEffects: 0
Priority: 128
DopplerLevel: 1
MinDistance: 1
MaxDistance: 500
Pan2D: 0
rolloffMode: 0
BypassEffects: 0
BypassListenerEffects: 0
BypassReverbZones: 0
rolloffCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
panLevelCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
spreadCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
reverbZoneMixCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
--- !u!1 &293997863
GameObject:
m_ObjectHideFlags: 0
@@ -12886,7 +13058,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!4 &796152178
Transform:
m_ObjectHideFlags: 0
@@ -12965,17 +13137,17 @@ MonoBehaviour:
OnTrigger:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 796152179}
m_TargetAssemblyTypeName: Beyond.EnemySpawnerManager, Assembly-CSharp
m_MethodName: ResetAllManagedSpawners
m_Mode: 1
- m_Target: {fileID: 87992052}
m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine
m_MethodName: SetActive
m_Mode: 6
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_BoolArgument: 1
m_CallState: 2
--- !u!1 &799294618
GameObject:
@@ -19814,6 +19986,18 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 04fcf3aba7782a94e9ad337e474800d7, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!114 &1516777702 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 7158301901963754683, guid: 851e8e61247888340bdec90fc8aa37f5,
type: 3}
m_PrefabInstance: {fileID: 1004473948}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1447701206}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 38b9f160099a9484b936b7192dd82968, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!21 &1523257492
Material:
serializedVersion: 8
@@ -21577,6 +21761,261 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 2631004785151738405, guid: bdcc0504e0c523b4492037e978d716f4,
type: 3}
propertyPath: selectedToolbar
value: 4
objectReference: {fileID: 0}
- target: {fileID: 2631004785151738405, guid: bdcc0504e0c523b4492037e978d716f4,
type: 3}
propertyPath: OnEndAnimation.m_PersistentCalls.m_Calls.Array.size
value: 5
objectReference: {fileID: 0}
- target: {fileID: 2631004785151738405, guid: bdcc0504e0c523b4492037e978d716f4,
type: 3}
propertyPath: OnPressActionInput.m_PersistentCalls.m_Calls.Array.size
value: 2
objectReference: {fileID: 0}
- target: {fileID: 2631004785151738405, guid: bdcc0504e0c523b4492037e978d716f4,
type: 3}
propertyPath: OnEndAnimation.m_PersistentCalls.m_Calls.Array.data[1].m_Mode
value: 6
objectReference: {fileID: 0}
- target: {fileID: 2631004785151738405, guid: bdcc0504e0c523b4492037e978d716f4,
type: 3}
propertyPath: OnEndAnimation.m_PersistentCalls.m_Calls.Array.data[2].m_Mode
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2631004785151738405, guid: bdcc0504e0c523b4492037e978d716f4,
type: 3}
propertyPath: OnEndAnimation.m_PersistentCalls.m_Calls.Array.data[3].m_Mode
value: 6
objectReference: {fileID: 0}
- target: {fileID: 2631004785151738405, guid: bdcc0504e0c523b4492037e978d716f4,
type: 3}
propertyPath: OnEndAnimation.m_PersistentCalls.m_Calls.Array.data[4].m_Mode
value: 6
objectReference: {fileID: 0}
- target: {fileID: 2631004785151738405, guid: bdcc0504e0c523b4492037e978d716f4,
type: 3}
propertyPath: OnEndAnimation.m_PersistentCalls.m_Calls.Array.data[1].m_Target
value:
objectReference: {fileID: 796152177}
- target: {fileID: 2631004785151738405, guid: bdcc0504e0c523b4492037e978d716f4,
type: 3}
propertyPath: OnEndAnimation.m_PersistentCalls.m_Calls.Array.data[2].m_Target
value:
objectReference: {fileID: 1516777702}
- target: {fileID: 2631004785151738405, guid: bdcc0504e0c523b4492037e978d716f4,
type: 3}
propertyPath: OnEndAnimation.m_PersistentCalls.m_Calls.Array.data[3].m_Target
value:
objectReference: {fileID: 609186452}
- target: {fileID: 2631004785151738405, guid: bdcc0504e0c523b4492037e978d716f4,
type: 3}
propertyPath: OnEndAnimation.m_PersistentCalls.m_Calls.Array.data[4].m_Target
value:
objectReference: {fileID: 289966091}
- target: {fileID: 2631004785151738405, guid: bdcc0504e0c523b4492037e978d716f4,
type: 3}
propertyPath: OnPressActionInput.m_PersistentCalls.m_Calls.Array.data[2].m_Mode
value: 6
objectReference: {fileID: 0}
- target: {fileID: 2631004785151738405, guid: bdcc0504e0c523b4492037e978d716f4,
type: 3}
propertyPath: OnPressActionInput.m_PersistentCalls.m_Calls.Array.data[3].m_Mode
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2631004785151738405, guid: bdcc0504e0c523b4492037e978d716f4,
type: 3}
propertyPath: OnPressActionInput.m_PersistentCalls.m_Calls.Array.data[4].m_Mode
value: 6
objectReference: {fileID: 0}
- target: {fileID: 2631004785151738405, guid: bdcc0504e0c523b4492037e978d716f4,
type: 3}
propertyPath: OnPressActionInput.m_PersistentCalls.m_Calls.Array.data[5].m_Mode
value: 6
objectReference: {fileID: 0}
- target: {fileID: 2631004785151738405, guid: bdcc0504e0c523b4492037e978d716f4,
type: 3}
propertyPath: OnEndAnimation.m_PersistentCalls.m_Calls.Array.data[3].m_CallState
value: 2
objectReference: {fileID: 0}
- target: {fileID: 2631004785151738405, guid: bdcc0504e0c523b4492037e978d716f4,
type: 3}
propertyPath: OnEndAnimation.m_PersistentCalls.m_Calls.Array.data[4].m_CallState
value: 2
objectReference: {fileID: 0}
- target: {fileID: 2631004785151738405, guid: bdcc0504e0c523b4492037e978d716f4,
type: 3}
propertyPath: OnEndAnimation.m_PersistentCalls.m_Calls.Array.data[1].m_MethodName
value: SetActive
objectReference: {fileID: 0}
- target: {fileID: 2631004785151738405, guid: bdcc0504e0c523b4492037e978d716f4,
type: 3}
propertyPath: OnEndAnimation.m_PersistentCalls.m_Calls.Array.data[2].m_MethodName
value: Respawn
objectReference: {fileID: 0}
- target: {fileID: 2631004785151738405, guid: bdcc0504e0c523b4492037e978d716f4,
type: 3}
propertyPath: OnEndAnimation.m_PersistentCalls.m_Calls.Array.data[3].m_MethodName
value: SetActive
objectReference: {fileID: 0}
- target: {fileID: 2631004785151738405, guid: bdcc0504e0c523b4492037e978d716f4,
type: 3}
propertyPath: OnEndAnimation.m_PersistentCalls.m_Calls.Array.data[4].m_MethodName
value: SetActive
objectReference: {fileID: 0}
- target: {fileID: 2631004785151738405, guid: bdcc0504e0c523b4492037e978d716f4,
type: 3}
propertyPath: OnPressActionInput.m_PersistentCalls.m_Calls.Array.data[2].m_Target
value:
objectReference: {fileID: 796152177}
- target: {fileID: 2631004785151738405, guid: bdcc0504e0c523b4492037e978d716f4,
type: 3}
propertyPath: OnPressActionInput.m_PersistentCalls.m_Calls.Array.data[3].m_Target
value:
objectReference: {fileID: 1516777702}
- target: {fileID: 2631004785151738405, guid: bdcc0504e0c523b4492037e978d716f4,
type: 3}
propertyPath: OnPressActionInput.m_PersistentCalls.m_Calls.Array.data[4].m_Target
value:
objectReference: {fileID: 609186452}
- target: {fileID: 2631004785151738405, guid: bdcc0504e0c523b4492037e978d716f4,
type: 3}
propertyPath: OnPressActionInput.m_PersistentCalls.m_Calls.Array.data[5].m_Target
value:
objectReference: {fileID: 289966091}
- target: {fileID: 2631004785151738405, guid: bdcc0504e0c523b4492037e978d716f4,
type: 3}
propertyPath: OnPressActionInput.m_PersistentCalls.m_Calls.Array.data[3].m_CallState
value: 2
objectReference: {fileID: 0}
- target: {fileID: 2631004785151738405, guid: bdcc0504e0c523b4492037e978d716f4,
type: 3}
propertyPath: OnPressActionInput.m_PersistentCalls.m_Calls.Array.data[4].m_CallState
value: 2
objectReference: {fileID: 0}
- target: {fileID: 2631004785151738405, guid: bdcc0504e0c523b4492037e978d716f4,
type: 3}
propertyPath: OnPressActionInput.m_PersistentCalls.m_Calls.Array.data[5].m_CallState
value: 2
objectReference: {fileID: 0}
- target: {fileID: 2631004785151738405, guid: bdcc0504e0c523b4492037e978d716f4,
type: 3}
propertyPath: OnPressActionInput.m_PersistentCalls.m_Calls.Array.data[2].m_MethodName
value: SetActive
objectReference: {fileID: 0}
- target: {fileID: 2631004785151738405, guid: bdcc0504e0c523b4492037e978d716f4,
type: 3}
propertyPath: OnPressActionInput.m_PersistentCalls.m_Calls.Array.data[3].m_MethodName
value: Respawn
objectReference: {fileID: 0}
- target: {fileID: 2631004785151738405, guid: bdcc0504e0c523b4492037e978d716f4,
type: 3}
propertyPath: OnPressActionInput.m_PersistentCalls.m_Calls.Array.data[4].m_MethodName
value: SetActive
objectReference: {fileID: 0}
- target: {fileID: 2631004785151738405, guid: bdcc0504e0c523b4492037e978d716f4,
type: 3}
propertyPath: OnPressActionInput.m_PersistentCalls.m_Calls.Array.data[5].m_MethodName
value: SetActive
objectReference: {fileID: 0}
- target: {fileID: 2631004785151738405, guid: bdcc0504e0c523b4492037e978d716f4,
type: 3}
propertyPath: OnEndAnimation.m_PersistentCalls.m_Calls.Array.data[1].m_TargetAssemblyTypeName
value: UnityEngine.GameObject, UnityEngine
objectReference: {fileID: 0}
- target: {fileID: 2631004785151738405, guid: bdcc0504e0c523b4492037e978d716f4,
type: 3}
propertyPath: OnEndAnimation.m_PersistentCalls.m_Calls.Array.data[2].m_TargetAssemblyTypeName
value: Beyond.Respawner, Assembly-CSharp
objectReference: {fileID: 0}
- target: {fileID: 2631004785151738405, guid: bdcc0504e0c523b4492037e978d716f4,
type: 3}
propertyPath: OnEndAnimation.m_PersistentCalls.m_Calls.Array.data[3].m_TargetAssemblyTypeName
value: UnityEngine.GameObject, UnityEngine
objectReference: {fileID: 0}
- target: {fileID: 2631004785151738405, guid: bdcc0504e0c523b4492037e978d716f4,
type: 3}
propertyPath: OnEndAnimation.m_PersistentCalls.m_Calls.Array.data[4].m_TargetAssemblyTypeName
value: UnityEngine.GameObject, UnityEngine
objectReference: {fileID: 0}
- target: {fileID: 2631004785151738405, guid: bdcc0504e0c523b4492037e978d716f4,
type: 3}
propertyPath: OnEndAnimation.m_PersistentCalls.m_Calls.Array.data[1].m_Arguments.m_BoolArgument
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2631004785151738405, guid: bdcc0504e0c523b4492037e978d716f4,
type: 3}
propertyPath: OnEndAnimation.m_PersistentCalls.m_Calls.Array.data[4].m_Arguments.m_BoolArgument
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2631004785151738405, guid: bdcc0504e0c523b4492037e978d716f4,
type: 3}
propertyPath: OnPressActionInput.m_PersistentCalls.m_Calls.Array.data[2].m_TargetAssemblyTypeName
value: UnityEngine.GameObject, UnityEngine
objectReference: {fileID: 0}
- target: {fileID: 2631004785151738405, guid: bdcc0504e0c523b4492037e978d716f4,
type: 3}
propertyPath: OnPressActionInput.m_PersistentCalls.m_Calls.Array.data[3].m_TargetAssemblyTypeName
value: Beyond.Respawner, Assembly-CSharp
objectReference: {fileID: 0}
- target: {fileID: 2631004785151738405, guid: bdcc0504e0c523b4492037e978d716f4,
type: 3}
propertyPath: OnPressActionInput.m_PersistentCalls.m_Calls.Array.data[4].m_TargetAssemblyTypeName
value: UnityEngine.GameObject, UnityEngine
objectReference: {fileID: 0}
- target: {fileID: 2631004785151738405, guid: bdcc0504e0c523b4492037e978d716f4,
type: 3}
propertyPath: OnPressActionInput.m_PersistentCalls.m_Calls.Array.data[5].m_TargetAssemblyTypeName
value: UnityEngine.GameObject, UnityEngine
objectReference: {fileID: 0}
- target: {fileID: 2631004785151738405, guid: bdcc0504e0c523b4492037e978d716f4,
type: 3}
propertyPath: OnPressActionInput.m_PersistentCalls.m_Calls.Array.data[2].m_Arguments.m_BoolArgument
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2631004785151738405, guid: bdcc0504e0c523b4492037e978d716f4,
type: 3}
propertyPath: OnPressActionInput.m_PersistentCalls.m_Calls.Array.data[5].m_Arguments.m_BoolArgument
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2631004785151738405, guid: bdcc0504e0c523b4492037e978d716f4,
type: 3}
propertyPath: OnEndAnimation.m_PersistentCalls.m_Calls.Array.data[3].m_Arguments.m_ObjectArgumentAssemblyTypeName
value: UnityEngine.Object, UnityEngine
objectReference: {fileID: 0}
- target: {fileID: 2631004785151738405, guid: bdcc0504e0c523b4492037e978d716f4,
type: 3}
propertyPath: OnEndAnimation.m_PersistentCalls.m_Calls.Array.data[4].m_Arguments.m_ObjectArgumentAssemblyTypeName
value: UnityEngine.Object, UnityEngine
objectReference: {fileID: 0}
- target: {fileID: 2631004785151738405, guid: bdcc0504e0c523b4492037e978d716f4,
type: 3}
propertyPath: OnPressActionInput.m_PersistentCalls.m_Calls.Array.data[2].m_Arguments.m_ObjectArgumentAssemblyTypeName
value: UnityEngine.Object, UnityEngine
objectReference: {fileID: 0}
- target: {fileID: 2631004785151738405, guid: bdcc0504e0c523b4492037e978d716f4,
type: 3}
propertyPath: OnPressActionInput.m_PersistentCalls.m_Calls.Array.data[3].m_Arguments.m_ObjectArgumentAssemblyTypeName
value: UnityEngine.Object, UnityEngine
objectReference: {fileID: 0}
- target: {fileID: 2631004785151738405, guid: bdcc0504e0c523b4492037e978d716f4,
type: 3}
propertyPath: OnPressActionInput.m_PersistentCalls.m_Calls.Array.data[4].m_Arguments.m_ObjectArgumentAssemblyTypeName
value: UnityEngine.Object, UnityEngine
objectReference: {fileID: 0}
- target: {fileID: 2631004785151738405, guid: bdcc0504e0c523b4492037e978d716f4,
type: 3}
propertyPath: OnPressActionInput.m_PersistentCalls.m_Calls.Array.data[5].m_Arguments.m_ObjectArgumentAssemblyTypeName
value: UnityEngine.Object, UnityEngine
objectReference: {fileID: 0}
- target: {fileID: 2631004785151738407, guid: bdcc0504e0c523b4492037e978d716f4,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8404356872023224400, guid: bdcc0504e0c523b4492037e978d716f4,
type: 3}
propertyPath: m_Name