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

test portal, test hub, animation improvements

Browse Source
This commit is contained in:
marcin
2025-09-19 14:49:14 +02:00
parent 9653e67a99
commit 6feee0019a
14 changed files with 51109 additions and 416 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Assets/Prefabs/Characters/Beasiculus/Bascileus_BaseModel.prefab
View File

@@ -105637,9 +105637,9 @@ MonoBehaviour:
strafeRollBackwardAnim: Roll_Backward
strafeRollLeftAnim: Roll_Left
strafeRollRightAnim: Roll_Right
strafeRollLeftCorrectionAngle: 70.6
strafeRollRightCorrectionAngle: 70
strafeRollBackwardCorrectionAngle: 0
strafeRollLeftCorrectionAngle: -20
strafeRollRightCorrectionAngle: -10
strafeRollBackwardCorrectionAngle: 180
--- !u!114 &9202663235077955828
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -106839,10 +106839,11 @@ MonoBehaviour:
m_cantDoThatYetClips:
- {fileID: 8300000, guid: 39649c732d19e414ebf837a58b79d98f, type: 3}
m_BrightnessLostClips:
- {fileID: 8300000, guid: 70b6e007003158e4fa167f9b0a084a77, type: 3}
- {fileID: 8300000, guid: 953c761b795ef4a4bbd3f42bbdb193fe, type: 3}
m_BrightnessGainedClips:
- {fileID: 8300000, guid: 31c7da78bc3b6e142a8a64e9f9d29952, type: 3}
m_deathClips: []
- {fileID: 8300000, guid: 953c761b795ef4a4bbd3f42bbdb193fe, type: 3}
m_deathClips:
- {fileID: 8300000, guid: cf5b4bdff527225438fc8acd4b3f8320, type: 3}
consumeDefaultSounds:
- {fileID: 8300000, guid: ece0d61d971152c49bbc8737d314d3e8, type: 3}
- {fileID: 8300000, guid: f48895212e8041645ab0e3b0aaee22c8, type: 3}

285
Assets/Prefabs/Characters/Player/Animator/Invector@MeleeCombat Player PRO2.controller
View File

@@ -22,28 +22,6 @@ AnimatorStateMachine:
m_ExitPosition: {x: 800, y: 120, z: 0}
m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
m_DefaultState: {fileID: -2074274001345678418}
--- !u!1101 &-9191327555805306621
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: 1102861933717182418}
m_Solo: 0
m_Mute: 1
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.25
m_TransitionOffset: 0
m_ExitTime: 0.6808511
m_HasExitTime: 1
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1102 &-9143515860420698953
AnimatorState:
serializedVersion: 6
@@ -779,9 +757,9 @@ MonoBehaviour:
positionLerpSpeed: 2
stoppingDistance: 1.2
useComboTimingWindow: 1
comboWindowStartTime: 0.7
comboWindowDuration: 0.3
comboWindowTimeScale: 0.4
comboWindowStartTime: 0.479
comboWindowDuration: 0.4
comboWindowTimeScale: 0.5
useAttackTimeScale: 0
maxTargetDistance: 3
lowHealthTh: 10
@@ -2755,10 +2733,10 @@ MonoBehaviour:
positionLerpSpeed: 2
stoppingDistance: 1.2
useComboTimingWindow: 1
comboWindowStartTime: 0.6
comboWindowDuration: 0.3
comboWindowTimeScale: 0.4
useAttackTimeScale: 1
comboWindowStartTime: 0.5
comboWindowDuration: 0.4
comboWindowTimeScale: 0.5
useAttackTimeScale: 0
maxTargetDistance: 3
lowHealthTh: 30
attackTimeScale: 0.1
@@ -2783,6 +2761,31 @@ MonoBehaviour:
- eventName: BlockEnd
eventTriggerType: 0
normalizedTime: 0
--- !u!1101 &-4867086802079766587
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions:
- m_ConditionMode: 1
m_ConditionEvent: WeakAttack
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 1102466317250516052}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.06981671
m_TransitionOffset: 0.035479035
m_ExitTime: 0.9141674
m_HasExitTime: 0
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!114 &-4859208400828985047
MonoBehaviour:
m_ObjectHideFlags: 1
@@ -4625,24 +4628,6 @@ AnimatorStateTransition:
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!114 &-2385230577109390366
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: 5f3b04f29aa5b134b99e94c78b296dcf, type: 3}
m_Name:
m_EditorClassIdentifier:
stateInfos: []
debug: 0
tags:
- tagName: Attack
tagType: 3
normalizedTime: {x: 0.1, y: 0.8}
--- !u!206 &-2382170802819547054
BlendTree:
m_ObjectHideFlags: 1
@@ -4871,28 +4856,6 @@ AnimatorState:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1101 &-1951197489304851175
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: -262143111545491946}
m_Solo: 0
m_Mute: 1
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0
m_TransitionOffset: 0
m_ExitTime: 0.99222386
m_HasExitTime: 1
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1102 &-1890823228988152332
AnimatorState:
serializedVersion: 6
@@ -5005,6 +4968,31 @@ MonoBehaviour:
- eventName: evadeStart
eventTriggerType: 0
normalizedTime: 0.22
--- !u!1101 &-1669139036731441096
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions:
- m_ConditionMode: 1
m_ConditionEvent: WeakAttack
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 1102186001672383516}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.08263171
m_TransitionOffset: 0
m_ExitTime: 0.8717949
m_HasExitTime: 0
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!206 &-1658071834102011323
BlendTree:
m_ObjectHideFlags: 1
@@ -5222,10 +5210,10 @@ MonoBehaviour:
positionLerpSpeed: 2
stoppingDistance: 1.2
useComboTimingWindow: 1
comboWindowStartTime: 0.6
comboWindowDuration: 0.3
comboWindowTimeScale: 0.4
useAttackTimeScale: 1
comboWindowStartTime: 0.35
comboWindowDuration: 0.4
comboWindowTimeScale: 0.5
useAttackTimeScale: 0
maxTargetDistance: 3
lowHealthTh: 10
attackTimeScale: 0.1
@@ -6145,36 +6133,6 @@ MonoBehaviour:
stateInfos: []
tags:
- CustomAction
--- !u!1102 &-262143111545491946
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: A1
m_Speed: 1.4
m_CycleOffset: 0
m_Transitions:
- {fileID: 3665975024854504718}
- {fileID: -9191327555805306621}
m_StateMachineBehaviours:
- {fileID: -2385230577109390366}
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 1
m_WriteDefaultValues: 1
m_Mirror: 0
m_SpeedParameterActive: 0
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 6399467581995111687, guid: fb07a934dbc1969468121112ca048964,
type: 3}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1109 &-164828508768324166
AnimatorTransition:
m_ObjectHideFlags: 1
@@ -29574,31 +29532,6 @@ AnimatorStateTransition:
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1101 &1101262937642278562
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions:
- m_ConditionMode: 1
m_ConditionEvent: WeakAttack
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 1102186001672383516}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.17750603
m_TransitionOffset: 0.12662058
m_ExitTime: 0.8490755
m_HasExitTime: 0
m_HasFixedDuration: 0
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1101 &1101264055223708130
AnimatorStateTransition:
m_ObjectHideFlags: 1
@@ -33899,31 +33832,6 @@ AnimatorStateTransition:
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1101 &1101963861138605418
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions:
- m_ConditionMode: 1
m_ConditionEvent: WeakAttack
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 1102861933717182418}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.15347171
m_TransitionOffset: 0.008216396
m_ExitTime: 0.8888667
m_HasExitTime: 0
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1101 &1101967999082563810
AnimatorStateTransition:
m_ObjectHideFlags: 1
@@ -36690,12 +36598,11 @@ AnimatorState:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: A0
m_Speed: 1.3
m_Speed: 1.2
m_CycleOffset: 0
m_Transitions:
- {fileID: 1101963861138605418}
- {fileID: 1101255493625229458}
- {fileID: -1951197489304851175}
- {fileID: -1669139036731441096}
m_StateMachineBehaviours:
- {fileID: 114405241802589726}
- {fileID: 114667135945300734}
@@ -38486,11 +38393,11 @@ AnimatorState:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: B
m_Speed: 1.4
m_Speed: 1.3
m_CycleOffset: 0
m_Transitions:
- {fileID: 1101262937642278562}
- {fileID: 1101559597476362148}
- {fileID: -4867086802079766587}
m_StateMachineBehaviours:
- {fileID: 114312089054784788}
- {fileID: 114756031459307912}
@@ -40819,13 +40726,13 @@ AnimatorStateMachine:
m_ChildStates:
- serializedVersion: 1
m_State: {fileID: 1102466317250516052}
m_Position: {x: 170, y: 140, z: 0}
m_Position: {x: 200, y: 70, z: 0}
- serializedVersion: 1
m_State: {fileID: 1102861933717182418}
m_Position: {x: 170, y: 20, z: 0}
m_Position: {x: 200, y: 180, z: 0}
- serializedVersion: 1
m_State: {fileID: 1102186001672383516}
m_Position: {x: 400, y: -50, z: 0}
m_Position: {x: 190, y: -60, z: 0}
- serializedVersion: 1
m_State: {fileID: 2206263804988382436}
m_Position: {x: 390, y: -140, z: 0}
@@ -40836,8 +40743,8 @@ AnimatorStateMachine:
m_State: {fileID: -3801079781883241350}
m_Position: {x: 270, y: -330, z: 0}
- serializedVersion: 1
m_State: {fileID: -262143111545491946}
m_Position: {x: 440, y: 150, z: 0}
m_State: {fileID: 9038867287444795064}
m_Position: {x: 1044.7456, y: 205.8801, z: 0}
m_ChildStateMachines: []
m_AnyStateTransitions: []
m_EntryTransitions: []
@@ -40847,7 +40754,7 @@ AnimatorStateMachine:
m_EntryPosition: {x: -30, y: 140, z: 0}
m_ExitPosition: {x: 680, y: 40, z: 0}
m_ParentStateMachinePosition: {x: 710, y: -50, z: 0}
m_DefaultState: {fileID: 1102466317250516052}
m_DefaultState: {fileID: 1102861933717182418}
--- !u!1107 &1107517961391708756
AnimatorStateMachine:
serializedVersion: 6
@@ -45451,7 +45358,7 @@ AnimatorState:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: default D
m_Speed: 1
m_Speed: 0.9
m_CycleOffset: 0
m_Transitions:
- {fileID: -1115075941929099510}
@@ -46145,28 +46052,6 @@ MonoBehaviour:
- tagName: LockRotation
tagType: 3
normalizedTime: {x: 0.35, y: 0.65}
--- !u!1101 &3665975024854504718
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.8717949
m_HasExitTime: 1
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!114 &3671708723907702589
MonoBehaviour:
m_ObjectHideFlags: 1
@@ -49911,6 +49796,32 @@ AnimatorStateMachine:
m_ExitPosition: {x: 800, y: 120, z: 0}
m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
m_DefaultState: {fileID: -7827896047371427883}
--- !u!1102 &9038867287444795064
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Longs_Attack_D
m_Speed: 1
m_CycleOffset: 0
m_Transitions: []
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: 7400036, guid: fb07a934dbc1969468121112ca048964, type: 3}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1109 &9070476794695178595
AnimatorTransition:
m_ObjectHideFlags: 1

14686
Assets/Prefabs/Debug/PORTAL.prefab Normal file
View File

File diff suppressed because it is too large Load Diff

7
Assets/Prefabs/Debug/PORTAL.prefab.meta Normal file
View File

@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: cd8f9cb3aae974fbc9aedcaba4d732ef
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

432
Assets/Prefabs/Debug/TestPortalTrigger.prefab Normal file
View File

@@ -0,0 +1,432 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &3897518412598620603
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2343288757411488203}
- component: {fileID: 2817429699706329555}
- component: {fileID: 7415726620335452925}
- component: {fileID: 5141158706004911779}
- component: {fileID: 915461623958344526}
- component: {fileID: 3051200452071723059}
- component: {fileID: 206881277360184858}
m_Layer: 0
m_Name: TestPortalTrigger
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &2343288757411488203
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3897518412598620603}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 1.2079734, y: 1.217, z: 78.177124}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!33 &2817429699706329555
MeshFilter:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3897518412598620603}
m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
--- !u!23 &7415726620335452925
MeshRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3897518412598620603}
m_Enabled: 1
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
m_RayTraceProcedural: 0
m_RayTracingAccelStructBuildFlagsOverride: 0
m_RayTracingAccelStructBuildFlags: 1
m_SmallMeshCulling: 1
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2}
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: 3
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
--- !u!65 &5141158706004911779
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3897518412598620603}
m_Material: {fileID: 0}
m_IncludeLayers:
serializedVersion: 2
m_Bits: 0
m_ExcludeLayers:
serializedVersion: 2
m_Bits: 0
m_LayerOverridePriority: 0
m_IsTrigger: 1
m_ProvidesContacts: 0
m_Enabled: 1
serializedVersion: 3
m_Size: {x: 2, y: 2, z: 2}
m_Center: {x: 0, y: 0, z: 0}
--- !u!114 &915461623958344526
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3897518412598620603}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: c593457cd8105e148906690e1707c592, type: 3}
m_Name:
m_EditorClassIdentifier:
trigger: 32
fireOnce: 1
condition:
luaConditions: []
questConditions: []
acceptedTags: []
acceptedGameObjects: []
luaWizardIndex: -1
lastEvaluationValue: 0
setQuestState: 1
questName:
questState: 0
setQuestEntryState: 0
questEntryNumber: 1
questEntryState: 0
luaCode:
sequence:
sequenceSpeaker: {fileID: 0}
sequenceListener: {fileID: 0}
waitOneFrameOnStartOrEnable: 1
alertMessage:
textTable: {fileID: 0}
alertDuration: 0
sendMessages: []
barkSource: 0
barkConversation:
barkText:
barkTextSequence:
barker: {fileID: 0}
barkTarget: {fileID: 0}
barkOrder: 0
allowBarksDuringConversations: 0
skipBarkIfNoValidEntries: 0
cacheBarkLines: 0
conversation: PortalConversation
conversationConversant: {fileID: 0}
conversationActor: {fileID: 0}
startConversationEntryID: -1
exclusive: 0
skipIfNoValidEntries: 0
stopConversationOnTriggerExit: 0
stopConversationIfTooFar: 0
maxConversationDistance: 5
monitorConversationDistanceFrequency: 1
showCursorDuringConversation: 0
pauseGameDuringConversation: 0
setActiveActions: []
setEnabledActions: []
setAnimatorStateActions: []
onExecute:
m_PersistentCalls:
m_Calls: []
useConversationTitlePicker: 1
useBarkTitlePicker: 1
useQuestNamePicker: 1
selectedDatabase: {fileID: 11400000, guid: d6f6a47305abab144b7fc1a5e1f080ef, type: 2}
--- !u!114 &3051200452071723059
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3897518412598620603}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: ed2afc8944f91a9439d30e3a99739f1f, type: 3}
m_Name:
m_EditorClassIdentifier:
openCloseEvents: 0
openCloseWindow: 0
selectedToolbar: 4
inputType: 0
actionInput:
useInput: 1
isAxisInUse: 0
isUnityInput: 0
keyboard: E
keyboardAxis: 0
joystick: A
joystickAxis: 0
mobile: A
mobileAxis: 0
joystickAxisInvert: 0
keyboardAxisInvert: 0
mobileAxisInvert: 0
timeButtonWasPressed: 0
lastTimeTheButtonWasPressed: 0
inButtomTimer: 0
buttonTimer: 3
inputDelay: 0.1
playAnimationWhileHoldingButton: 1
doubleButtomTime: 0.25
actionName: Action
actionTag: Action
disableOnStart: 0
disableCollision: 0
disableGravity: 0
activeFromForward: 0
forwardAngle: 55
useTriggerRotation: 0
destroyAfter: 0
destroyDelay: 0
customCameraState:
playAnimation:
crossFadeTransition: 0.25
animatorLayer: 0
endActionManualy: 0
endExitTimeAnimation: 0.8
animatorActionState: 0
resetAnimatorActionState: 1
matchTarget: {fileID: 0}
avatarTarget: 0
useLocalX: 0
useLocalZ: 1
matchPositionXZCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 0.5
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 1
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
matchPositionYCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 0.5
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 1
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
matchRotationCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 0.5
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 1
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
onPressActionDelay: 0
OnPressActionInput:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 915461623958344526}
m_TargetAssemblyTypeName: PixelCrushers.DialogueSystem.DialogueSystemTrigger,
Assembly-CSharp-firstpass
m_MethodName: OnUse
m_Mode: 1
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
onPressActionInputWithTarget:
m_PersistentCalls:
m_Calls: []
OnCancelActionInput:
m_PersistentCalls:
m_Calls: []
OnFinishActionInput:
m_PersistentCalls:
m_Calls: []
OnUpdateButtonTimer:
m_PersistentCalls:
m_Calls: []
OnStartAnimation:
m_PersistentCalls:
m_Calls: []
OnEndAnimation:
m_PersistentCalls:
m_Calls: []
OnPlayerEnter:
m_PersistentCalls:
m_Calls: []
OnPlayerStay:
m_PersistentCalls:
m_Calls: []
OnPlayerExit:
m_PersistentCalls:
m_Calls: []
OnValidate:
m_PersistentCalls:
m_Calls: []
OnInvalidate:
m_PersistentCalls:
m_Calls: []
m_questCondition:
luaConditions: []
questConditions: []
acceptedTags: []
acceptedGameObjects: []
luaWizardIndex: -1
lastEvaluationValue: 0
m_itemChecking: 0
m_itemToCheckId: 0
disableHUD: 1
triggerType: 2
OnPlayerMatchTargetPosition:
m_PersistentCalls:
m_Calls: []
useFadeOnMatchingToTarget: 0
m_fadeInCurve:
serializedVersion: 2
m_Curve: []
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
m_fadeOutCurve:
serializedVersion: 2
m_Curve: []
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
m_fadeSpeed: 2
m_enableInteractionLegality: 0
m_guilt: {fileID: 0}
animationDelay: 0
--- !u!114 &206881277360184858
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3897518412598620603}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f3b3447942dac4c33842b778b7f6f439, type: 3}
m_Name:
m_EditorClassIdentifier:
m_exludeLevel: 0

7
Assets/Prefabs/Debug/TestPortalTrigger.prefab.meta Normal file
View File

@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: eff13c23b3c35454a9e0fb9591fb3b48
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

4
Assets/Prefabs/PlayerWithUI.prefab
View File

@@ -18974,8 +18974,8 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
maxTargetingDistance: 7
autoLockOnDistance: 3
unlockDistanceThreshold: 4
autoLockOnDistance: 2
unlockDistanceThreshold: 3
targetingInterval: 0.25
targetingAngleThreshold: 120
playerRotationSpeed: 300

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

@@ -16344,42 +16344,42 @@ PrefabInstance:
- target: {fileID: 564995907207171390, guid: 851e8e61247888340bdec90fc8aa37f5,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 564995907207171390, guid: 851e8e61247888340bdec90fc8aa37f5,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 564995907207171390, guid: 851e8e61247888340bdec90fc8aa37f5,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
value: 210
objectReference: {fileID: 0}
- target: {fileID: 564995907207171390, guid: 851e8e61247888340bdec90fc8aa37f5,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
value: -135
objectReference: {fileID: 0}
- target: {fileID: 616128472424357225, guid: 851e8e61247888340bdec90fc8aa37f5,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 616128472424357225, guid: 851e8e61247888340bdec90fc8aa37f5,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 616128472424357225, guid: 851e8e61247888340bdec90fc8aa37f5,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
value: 210.00003
objectReference: {fileID: 0}
- target: {fileID: 616128472424357225, guid: 851e8e61247888340bdec90fc8aa37f5,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
value: -45
objectReference: {fileID: 0}
- target: {fileID: 763034042805173548, guid: 851e8e61247888340bdec90fc8aa37f5,
type: 3}
@@ -16421,11 +16421,6 @@ PrefabInstance:
propertyPath: m_Layer
value: 5
objectReference: {fileID: 0}
- target: {fileID: 1385765897516864307, guid: 851e8e61247888340bdec90fc8aa37f5,
type: 3}
propertyPath: openCloseWindow
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1494204689157949844, guid: 851e8e61247888340bdec90fc8aa37f5,
type: 3}
propertyPath: m_Layer
@@ -17157,26 +17152,6 @@ PrefabInstance:
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3830035321481100824, guid: 851e8e61247888340bdec90fc8aa37f5,
type: 3}
propertyPath: m_deathClips.Array.size
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3830035321481100824, guid: 851e8e61247888340bdec90fc8aa37f5,
type: 3}
propertyPath: 'm_deathClips.Array.data[0]'
value:
objectReference: {fileID: 8300000, guid: cf5b4bdff527225438fc8acd4b3f8320, type: 3}
- target: {fileID: 3830035321481100824, guid: 851e8e61247888340bdec90fc8aa37f5,
type: 3}
propertyPath: 'm_BrightnessLostClips.Array.data[0]'
value:
objectReference: {fileID: 8300000, guid: 953c761b795ef4a4bbd3f42bbdb193fe, type: 3}
- target: {fileID: 3830035321481100824, guid: 851e8e61247888340bdec90fc8aa37f5,
type: 3}
propertyPath: 'm_BrightnessGainedClips.Array.data[0]'
value:
objectReference: {fileID: 8300000, guid: 953c761b795ef4a4bbd3f42bbdb193fe, type: 3}
- target: {fileID: 3925395170508564942, guid: 851e8e61247888340bdec90fc8aa37f5,
type: 3}
propertyPath: m_Layer
@@ -17245,22 +17220,22 @@ PrefabInstance:
- target: {fileID: 4202610206940879906, guid: 851e8e61247888340bdec90fc8aa37f5,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4202610206940879906, guid: 851e8e61247888340bdec90fc8aa37f5,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4202610206940879906, guid: 851e8e61247888340bdec90fc8aa37f5,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
value: 210
objectReference: {fileID: 0}
- target: {fileID: 4202610206940879906, guid: 851e8e61247888340bdec90fc8aa37f5,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
value: -225
objectReference: {fileID: 0}
- target: {fileID: 4310148345887150382, guid: 851e8e61247888340bdec90fc8aa37f5,
type: 3}
@@ -17387,46 +17362,6 @@ PrefabInstance:
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4704300330561169846, guid: 851e8e61247888340bdec90fc8aa37f5,
type: 3}
propertyPath: rollSpeed
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4704300330561169846, guid: 851e8e61247888340bdec90fc8aa37f5,
type: 3}
propertyPath: maxStamina
value: 100
objectReference: {fileID: 0}
- target: {fileID: 4704300330561169846, guid: 851e8e61247888340bdec90fc8aa37f5,
type: 3}
propertyPath: rollStamina
value: 30
objectReference: {fileID: 0}
- target: {fileID: 4704300330561169846, guid: 851e8e61247888340bdec90fc8aa37f5,
type: 3}
propertyPath: rollTransition
value: 0.1
objectReference: {fileID: 0}
- target: {fileID: 4704300330561169846, guid: 851e8e61247888340bdec90fc8aa37f5,
type: 3}
propertyPath: selectedToolbar
value: 7
objectReference: {fileID: 0}
- target: {fileID: 4704300330561169846, guid: 851e8e61247888340bdec90fc8aa37f5,
type: 3}
propertyPath: rollRotationSpeed
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4704300330561169846, guid: 851e8e61247888340bdec90fc8aa37f5,
type: 3}
propertyPath: useRollRootMotion
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4704300330561169846, guid: 851e8e61247888340bdec90fc8aa37f5,
type: 3}
propertyPath: groundLayer.m_Bits
value: 268435457
objectReference: {fileID: 0}
- target: {fileID: 4704300330561169846, guid: 851e8e61247888340bdec90fc8aa37f5,
type: 3}
propertyPath: strafeRollDuration
@@ -17452,56 +17387,11 @@ PrefabInstance:
propertyPath: strafeRollCorrectionAngle
value: 71.9
objectReference: {fileID: 0}
- target: {fileID: 4704300330561169846, guid: 851e8e61247888340bdec90fc8aa37f5,
type: 3}
propertyPath: strafeRollLeftCorrectionAngle
value: -20
objectReference: {fileID: 0}
- target: {fileID: 4704300330561169846, guid: 851e8e61247888340bdec90fc8aa37f5,
type: 3}
propertyPath: strafeRollRightCorrectionAngle
value: -10
objectReference: {fileID: 0}
- target: {fileID: 4704300330561169846, guid: 851e8e61247888340bdec90fc8aa37f5,
type: 3}
propertyPath: strafeRollBackwardCorrectionAngle
value: 180
objectReference: {fileID: 0}
- target: {fileID: 4704300330561169846, guid: 851e8e61247888340bdec90fc8aa37f5,
type: 3}
propertyPath: _onReceiveDamage.m_PersistentCalls.m_Calls.Array.size
value: 2
objectReference: {fileID: 0}
- target: {fileID: 4704300330561169846, guid: 851e8e61247888340bdec90fc8aa37f5,
type: 3}
propertyPath: _onReceiveDamage.m_PersistentCalls.m_Calls.Array.data[1].m_Mode
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4704300330561169846, guid: 851e8e61247888340bdec90fc8aa37f5,
type: 3}
propertyPath: _onReceiveDamage.m_PersistentCalls.m_Calls.Array.data[1].m_Target
value:
objectReference: {fileID: 100411026}
- target: {fileID: 4704300330561169846, guid: 851e8e61247888340bdec90fc8aa37f5,
type: 3}
propertyPath: _onReceiveDamage.m_PersistentCalls.m_Calls.Array.data[1].m_CallState
value: 2
objectReference: {fileID: 0}
- target: {fileID: 4704300330561169846, guid: 851e8e61247888340bdec90fc8aa37f5,
type: 3}
propertyPath: _onReceiveDamage.m_PersistentCalls.m_Calls.Array.data[1].m_MethodName
value: Play
objectReference: {fileID: 0}
- target: {fileID: 4704300330561169846, guid: 851e8e61247888340bdec90fc8aa37f5,
type: 3}
propertyPath: _onReceiveDamage.m_PersistentCalls.m_Calls.Array.data[1].m_TargetAssemblyTypeName
value: UnityEngine.ParticleSystem, UnityEngine
objectReference: {fileID: 0}
- target: {fileID: 4704300330561169846, guid: 851e8e61247888340bdec90fc8aa37f5,
type: 3}
propertyPath: _onReceiveDamage.m_PersistentCalls.m_Calls.Array.data[1].m_Arguments.m_ObjectArgumentAssemblyTypeName
value: UnityEngine.Object, UnityEngine
objectReference: {fileID: 0}
- target: {fileID: 4752828547953277668, guid: 851e8e61247888340bdec90fc8aa37f5,
type: 3}
propertyPath: m_AnchoredPosition.x
@@ -17510,22 +17400,22 @@ PrefabInstance:
- target: {fileID: 4796023216948086302, guid: 851e8e61247888340bdec90fc8aa37f5,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4796023216948086302, guid: 851e8e61247888340bdec90fc8aa37f5,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4796023216948086302, guid: 851e8e61247888340bdec90fc8aa37f5,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
value: 210
objectReference: {fileID: 0}
- target: {fileID: 4796023216948086302, guid: 851e8e61247888340bdec90fc8aa37f5,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
value: -315
objectReference: {fileID: 0}
- target: {fileID: 4907318199456855652, guid: 851e8e61247888340bdec90fc8aa37f5,
type: 3}
@@ -17552,16 +17442,6 @@ PrefabInstance:
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
- target: {fileID: 5054440825960491160, guid: 851e8e61247888340bdec90fc8aa37f5,
type: 3}
propertyPath: autoLockOnDistance
value: 2
objectReference: {fileID: 0}
- target: {fileID: 5054440825960491160, guid: 851e8e61247888340bdec90fc8aa37f5,
type: 3}
propertyPath: unlockDistanceThreshold
value: 3
objectReference: {fileID: 0}
- target: {fileID: 5083365752064418721, guid: 851e8e61247888340bdec90fc8aa37f5,
type: 3}
propertyPath: m_AnchorMax.x
@@ -18885,22 +18765,22 @@ PrefabInstance:
- target: {fileID: 7465903852046106667, guid: 851e8e61247888340bdec90fc8aa37f5,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7465903852046106667, guid: 851e8e61247888340bdec90fc8aa37f5,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7465903852046106667, guid: 851e8e61247888340bdec90fc8aa37f5,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
value: 210
objectReference: {fileID: 0}
- target: {fileID: 7465903852046106667, guid: 851e8e61247888340bdec90fc8aa37f5,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
value: -405
objectReference: {fileID: 0}
- target: {fileID: 7534046934194550914, guid: 851e8e61247888340bdec90fc8aa37f5,
type: 3}
@@ -19429,7 +19309,9 @@ MonoBehaviour:
m_sunLight: {fileID: 1976683114}
m_moonLight: {fileID: 0}
WeatherPresent: 0
WeatherSystem: {fileID: 0}
m_sunLightExists: 1
m_moonLightExists: 0
--- !u!4 &1013064392
Transform:
m_ObjectHideFlags: 10
@@ -23000,6 +22882,8 @@ MonoBehaviour:
x: 250
y: 250
z: 250
m_allFloatingPointFixMembers: []
m_allWorldSpaceParticleSystems: []
m_originTargetTileX: 0
m_originTargetTileZ: 0
m_terrainUnloadMemoryTreshold: 4294967296

35668
Assets/Scenes/TestHub.unity Normal file
View File

File diff suppressed because it is too large Load Diff

7
Assets/Scenes/TestHub.unity.meta Normal file
View File

@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 236f59b04e57a4940aab8cfaeccb71b5
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

4
Assets/Scripts/Controllers/PortalController.cs
View File

@@ -80,12 +80,12 @@ namespace Beyond
Debug.LogError("Probably there is no data for scene : " + LevelToLoadName + " in levelLoaderData");
return;
}
/*
if (!_levelToLoadData.IsUnlocked)
{
return;
}
*/
_trigger.enabled = false;
FadeCanvasGroup.Instance.BeforeLoadingFade();
}

12
Assets/Scripts/ScriptableObjects/LevelLoaderData.cs
View File

@@ -1,4 +1,3 @@
using System.Collections;
using System.Collections.Generic;
using System.Linq;
using UnityEngine;
@@ -11,10 +10,17 @@ namespace Beyond
{
[SerializeField] private List<LevelData> _levelData = new List<LevelData>();
public List<LevelData> LevelDataList => _levelData;
public LevelData GetData(string levelName)
{
return _levelData.FirstOrDefault(x => x.LevelName == levelName);
}
public List<string> GetAllLevelNames()
{
return _levelData.Select(x => x.LevelName).ToList();
}
}
[System.Serializable]
@@ -22,8 +28,8 @@ namespace Beyond
{
public string LevelName;
public string LevelNameToDisplay;
public string DialogueVariableName; // This is used to check if the level is unlocked
public LoadSceneMode LoadSceneMode;
public bool IsUnlocked;
// The "public bool IsUnlocked;" field has been removed.
}
}

230
Assets/Scripts/Triggers/PortalTrigger.cs
View File

@@ -1,77 +1,98 @@
using System;
using System.Collections;
using System.Collections.Generic;
using Invector;
using PixelCrushers.DialogueSystem;
using Sirenix.OdinInspector;
using UnityEngine;
using System.Collections;
namespace Beyond
{
[RequireComponent(typeof(DialogueSystemTrigger))]
[RequireComponent(typeof(bTriggerGenericAction))]
//[vClassHeader("PortalTrigger", false, iconName = "triggerIcon")]
public class PortalTrigger : MonoBehaviour
{
private static bool s_luaMethodRegistered = false;
private static bool s_luaMethodRegistered = false;
private DialogueSystemTrigger m_dialogueTrigger;
private bTriggerGenericAction m_genericTrigger;
private string m_levelToLoad;
private string[] m_levelVariableName =
{
"", "WastelandTravelUnlocked", "GardenTravelUnlocked","TempleTravelUnlocked",
"ValleyTravelUnlocked", "ChamberTravelUnlocked", "CourtTravelUnlocked"
};
public enum Levels
{
NONE,
WASTELAND,
GARDEN,
TEMPLE,
RIVER_VALLEY,
SCROLL_CHAMBER,
COURT,
};
public Levels m_exludeLevel;
private bool m_wasExluded;
void SetDialogueVariable(Levels level, bool unlocked)
{
DialogueLua.SetVariable(m_levelVariableName[(int)level], unlocked);
}
[Title("Level Configuration")]
[Tooltip("Assign your LevelLoaderData ScriptableObject here. This is the source for all level information.")]
[Required]
public LevelLoaderData levelLoaderData;
bool GetDialogueVariable(Levels level)
[Title("Direct Loading")]
[Tooltip("If true, the trigger will load the specified level directly without showing a dialogue.")]
public bool useDirectLoad = false;
[Tooltip("The name of the level to load directly.")]
[ShowIf("useDirectLoad")]
[ValueDropdown("GetLevelNamesForDropdown")]
public string directLoadLevelName;
[Title("Dialogue Configuration")]
[Tooltip("A list of levels to temporarily hide from the dialogue-based level selection.")]
[HideIf("useDirectLoad")]
[ValueDropdown("GetLevelNamesForDropdown")]
public List<string> excludedLevels = new List<string>();
private Dictionary<string, bool> m_originalDialogueStates = new Dictionary<string, bool>();
#region Lua & Dialogue Variable Management
void SetDialogueVariable(string levelName, bool unlocked)
{
return DialogueLua.GetVariable(m_levelVariableName[(int)level]).asBool;
if (levelLoaderData == null) return;
LevelData data = levelLoaderData.GetData(levelName);
if (data != null && !string.IsNullOrEmpty(data.DialogueVariableName))
{
DialogueLua.SetVariable(data.DialogueVariableName, unlocked);
}
}
public void ExcludeLevel(Levels level, bool exclude)
bool GetDialogueVariable(string levelName)
{
if (level == Levels.NONE)
return;
if (exclude)
if (levelLoaderData == null) return false;
LevelData data = levelLoaderData.GetData(levelName);
if (data != null && !string.IsNullOrEmpty(data.DialogueVariableName))
{
if (!m_wasExluded && GetDialogueVariable(level))
return DialogueLua.GetVariable(data.DialogueVariableName).asBool;
}
return false;
}
private void ExcludeSelectedLevels()
{
m_originalDialogueStates.Clear();
foreach (string levelName in excludedLevels)
{
bool originalState = GetDialogueVariable(levelName);
m_originalDialogueStates[levelName] = originalState;
if (originalState)
{
SetDialogueVariable(level, false);
m_wasExluded = true;
}
}
else if (m_wasExluded)
{
SetDialogueVariable(level, true);
m_wasExluded = false;
SetDialogueVariable(levelName, false);
}
}
}
private void RestoreExcludedLevels()
{
if (m_originalDialogueStates.Count == 0) return;
foreach (var entry in m_originalDialogueStates)
{
SetDialogueVariable(entry.Key, entry.Value);
}
m_originalDialogueStates.Clear();
}
private void RegisterLuaFunctions()
{
if (!s_luaMethodRegistered)
{
Lua.RegisterFunction("LoadLevel", this, SymbolExtensions.GetMethodInfo(() => LoadLevel((string) null)));
// Note: The Lua function is still named "LoadLevel" for consistency with your Dialogue entries.
// It correctly calls our C# method StartLevelLoad.
Lua.RegisterFunction("LoadLevel", this, SymbolExtensions.GetMethodInfo(() => StartLevelLoad((string)null)));
s_luaMethodRegistered = true;
}
}
@@ -84,54 +105,117 @@ namespace Beyond
s_luaMethodRegistered = false;
}
}
// Start is called before the first frame update
#endregion
#region Unity Lifecycle & Triggers
protected void Start()
{
//base.Start();
m_dialogueTrigger = GetComponent<DialogueSystemTrigger>();
m_genericTrigger = GetComponent<bTriggerGenericAction>();
FadeCanvasGroup.Instance.OnLoadingFadeOutEnd.AddListener(LoadLevel);
// ### FIX HERE ###
// Changed "LoadLevel" to "LoadLevelScene" to match the renamed method.
FadeCanvasGroup.Instance.OnLoadingFadeOutEnd.AddListener(LoadLevelScene);
m_genericTrigger.OnPressActionInput.AddListener(OnPressAction);
m_genericTrigger.OnPlayerExit.AddListener((arg0 => { UnregisterLuaFunctions();}));
m_genericTrigger.OnPlayerExit.AddListener((go) =>
{
RestoreExcludedLevels();
UnregisterLuaFunctions();
});
}
private void OnDestroy()
{
if (FadeCanvasGroup.Instance != null)
{
// ### FIX HERE ###
// Changed "LoadLevel" to "LoadLevelScene" to match the renamed method.
FadeCanvasGroup.Instance.OnLoadingFadeOutEnd.RemoveListener(LoadLevelScene);
}
if (m_genericTrigger != null)
{
m_genericTrigger.OnPressActionInput.RemoveListener(OnPressAction);
}
RestoreExcludedLevels();
UnregisterLuaFunctions();
}
private void OnPressAction()
{
RegisterLuaFunctions();
ExcludeLevel(m_exludeLevel, true);
if (m_exludeLevel != Levels.NONE)
if (useDirectLoad)
{
StartLevelLoad(directLoadLevelName);
}
else
{
RegisterLuaFunctions();
ExcludeSelectedLevels();
m_dialogueTrigger.OnUse();
}
m_dialogueTrigger.OnUse();
}
private void OnDestroy()
{
FadeCanvasGroup.Instance.OnLoadingFadeOutEnd.RemoveListener(LoadLevel);
ExcludeLevel(m_exludeLevel, false);
m_genericTrigger.OnPressActionInput.RemoveListener(m_dialogueTrigger.OnUse);
UnregisterLuaFunctions();
}
[Button]
public void UnloackLevel(Levels level)
{
SetDialogueVariable(level, true);
}
#endregion
private void LoadLevel()
{
ProxySceneLoader.LoadScene(m_levelToLoad);
#region Level Loading
}
private void LoadLevel(string name)
/// <summary>
/// This is called by Lua from dialogue or directly by OnPressAction. It begins the fade out.
/// </summary>
private void StartLevelLoad(string name)
{
if (string.IsNullOrEmpty(name) || levelLoaderData.GetData(name) == null)
{
Debug.LogError($"Level '{name}' not found in LevelLoaderData or name is invalid.");
return;
}
m_levelToLoad = name;
FadeCanvasGroup.Instance.BeforeLoadingFade();
}
/// <summary>
/// This is called after the fade-out animation has finished. It loads the scene.
/// </summary>
private void LoadLevelScene()
{
if (string.IsNullOrEmpty(m_levelToLoad)) return;
LevelData levelData = levelLoaderData.GetData(m_levelToLoad);
if (levelData != null)
{
ProxySceneLoader.LoadScene(levelData.LevelName);
}
else
{
Debug.LogError($"Failed to find level data for '{m_levelToLoad}' during scene loading.");
}
}
#endregion
#region Editor & Debugging
private IEnumerable GetLevelNamesForDropdown()
{
if (levelLoaderData != null)
{
return levelLoaderData.GetAllLevelNames();
}
return new List<string>();
}
[Button("Unlock Level (For Debugging)")]
public void UnlockLevel([ValueDropdown("GetLevelNamesForDropdown")] string levelName)
{
if(!string.IsNullOrEmpty(levelName))
{
SetDialogueVariable(levelName, true);
Debug.Log($"Set {levelName} to unlocked.");
}
}
#endregion
}
}