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

Merge branch 'NewStory' of http://185.56.209.148/beyond/beyond into NewStory

Browse Source
This commit is contained in:
ziolo
2025-10-20 12:32:11 +02:00
parent 3c5de97991 b476865a34
commit af75f9afea
9 changed files with 3856 additions and 867 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
Assets/AddressableAssetsData/iOS/addressables_content_state.bin
View File

Binary file not shown.

765
Assets/Dialogue/TestDialogueBase (Auto-Backup).asset
View File

@@ -905,6 +905,34 @@ MonoBehaviour:
value:
type: 0
typeString: CustomFieldType_Text
- id: 21
fields:
- title: Name
value: CH02SpiderBossKilled
type: 0
typeString: CustomFieldType_Text
- title: Initial Value
value: False
type: 2
typeString: CustomFieldType_Boolean
- title: Description
value:
type: 0
typeString: CustomFieldType_Text
- id: 22
fields:
- title: Name
value: CH02HannaHouseVisited
type: 0
typeString: CustomFieldType_Text
- title: Initial Value
value: False
type: 2
typeString: CustomFieldType_Boolean
- title: Description
value:
type: 0
typeString: CustomFieldType_Text
conversations:
- id: 1
fields:
@@ -24067,7 +24095,7 @@ MonoBehaviour:
- title: Title
value: START
type: 0
typeString:
typeString: CustomFieldType_Text
- title: Pictures
value: '[]'
type: 3
@@ -24075,7 +24103,7 @@ MonoBehaviour:
- title: Description
value:
type: 0
typeString:
typeString: CustomFieldType_Text
- title: Actor
value: 1
type: 5
@@ -24087,15 +24115,15 @@ MonoBehaviour:
- title: Menu Text
value:
type: 0
typeString:
typeString: CustomFieldType_Text
- title: Dialogue Text
value:
type: 0
typeString:
typeString: CustomFieldType_Text
- title: Parenthetical
value:
type: 0
typeString:
typeString: CustomFieldType_Text
- title: Audio Files
value: '[]'
type: 3
@@ -24103,11 +24131,11 @@ MonoBehaviour:
- title: Video File
value:
type: 0
typeString:
typeString: CustomFieldType_Text
- title: Sequence
value: None()
type: 0
typeString:
typeString: CustomFieldType_Text
- title: pl
value:
type: 4
@@ -24132,6 +24160,12 @@ MonoBehaviour:
destinationDialogueID: 10
isConnector: 0
priority: 2
- originConversationID: 96
originDialogueID: 0
destinationConversationID: 96
destinationDialogueID: 11
isConnector: 0
priority: 2
conditionsString:
userScript:
onExecute:
@@ -24562,7 +24596,7 @@ MonoBehaviour:
type: 0
typeString: CustomFieldType_Text
- title: Sequence
value:
value: AudioWait(Dialogues/TimeToEscape Beggar Dialogue/New_Story/On_Herbalist/Q3_Beggar_n_4)
type: 0
typeString: CustomFieldType_Text
- title: pl
@@ -24583,7 +24617,8 @@ MonoBehaviour:
destinationDialogueID: 8
isConnector: 0
priority: 2
conditionsString: Variable["CH02HerbalistSpoke"] == true
conditionsString: Variable["CH02HerbalistSpoke"] == true and (Variable["CH02SpiderBossKilled"]
== false)
userScript:
onExecute:
m_PersistentCalls:
@@ -24638,7 +24673,7 @@ MonoBehaviour:
type: 0
typeString: CustomFieldType_Text
- title: Sequence
value:
value: AudioWait(Dialogues/TimeToEscape Beggar Dialogue/New_Story/On_Herbalist/Q3_Beggar_n_5)
type: 0
typeString: CustomFieldType_Text
- title: pl
@@ -24713,7 +24748,7 @@ MonoBehaviour:
type: 0
typeString: CustomFieldType_Text
- title: Sequence
value:
value: Audio(Dialogues/VO/CH02/Beggar/CH02_vo_herbalist_wanderer_03)
type: 0
typeString: CustomFieldType_Text
- title: pl
@@ -24815,6 +24850,152 @@ MonoBehaviour:
y: 101
width: 160
height: 30
- id: 11
fields:
- title: Title
value:
type: 0
typeString: CustomFieldType_Text
- title: Pictures
value: '[]'
type: 3
typeString: CustomFieldType_Files
- title: Description
value:
type: 0
typeString: CustomFieldType_Text
- title: Actor
value: 2
type: 5
typeString: CustomFieldType_Actor
- title: Conversant
value: 1
type: 5
typeString: CustomFieldType_Actor
- title: Menu Text
value:
type: 0
typeString: CustomFieldType_Text
- title: Dialogue Text
value: The spider crone is dead... After all these years of terror... Alas,
her brood survives, and soon another shall take her place.
type: 0
typeString: CustomFieldType_Text
- title: Parenthetical
value:
type: 0
typeString: CustomFieldType_Text
- title: Audio Files
value: '[]'
type: 3
typeString: CustomFieldType_Files
- title: Video File
value:
type: 0
typeString: CustomFieldType_Text
- title: Sequence
value: AudioWait(Dialogues/TimeToEscape Beggar Dialogue/New_Story/On_Spider_Boss/Q3_Beggar_n_6)
type: 0
typeString: CustomFieldType_Text
- title: pl
value:
type: 4
typeString: CustomFieldType_Localization
conversationID: 96
isRoot: 0
isGroup: 0
nodeColor:
delaySimStatus: 0
falseConditionAction: Block
conditionPriority: 2
outgoingLinks:
- originConversationID: 96
originDialogueID: 11
destinationConversationID: 96
destinationDialogueID: 12
isConnector: 0
priority: 2
conditionsString: Variable["CH02SpiderBossKilled"] == true
userScript:
onExecute:
m_PersistentCalls:
m_Calls: []
canvasRect:
serializedVersion: 2
x: 478
y: 71
width: 160
height: 30
- id: 12
fields:
- title: Title
value:
type: 0
typeString: CustomFieldType_Text
- title: Pictures
value: '[]'
type: 3
typeString: CustomFieldType_Files
- title: Description
value:
type: 0
typeString: CustomFieldType_Text
- title: Actor
value: 2
type: 5
typeString: CustomFieldType_Actor
- title: Conversant
value: 1
type: 5
typeString: CustomFieldType_Actor
- title: Menu Text
value:
type: 0
typeString: CustomFieldType_Text
- title: Dialogue Text
value: And her poison still defiles the river. Nothing ever changes. This
land is beyond hope.
type: 0
typeString: CustomFieldType_Text
- title: Parenthetical
value:
type: 0
typeString: CustomFieldType_Text
- title: Audio Files
value: '[]'
type: 3
typeString: CustomFieldType_Files
- title: Video File
value:
type: 0
typeString: CustomFieldType_Text
- title: Sequence
value: AudioWait(Dialogues/TimeToEscape Beggar Dialogue/New_Story/On_Spider_Boss/Q3_Beggar_n_7)
type: 0
typeString: CustomFieldType_Text
- title: pl
value:
type: 4
typeString: CustomFieldType_Localization
conversationID: 96
isRoot: 0
isGroup: 0
nodeColor:
delaySimStatus: 0
falseConditionAction: Block
conditionPriority: 2
outgoingLinks: []
conditionsString:
userScript:
onExecute:
m_PersistentCalls:
m_Calls: []
canvasRect:
serializedVersion: 2
x: 478
y: 121
width: 160
height: 30
canvasScrollPosition: {x: 0, y: 0}
canvasZoom: 1
- id: 97
@@ -26964,7 +27145,7 @@ MonoBehaviour:
- id: 108
fields:
- title: Title
value: CH02/RUINEDTOWN/HerbalistDialogue
value: CH02/RUINEDTOWN/WitchDialogue
type: 0
typeString: CustomFieldType_Text
- title: Pictures
@@ -27070,7 +27251,7 @@ MonoBehaviour:
- originConversationID: 108
originDialogueID: 0
destinationConversationID: 108
destinationDialogueID: 1
destinationDialogueID: 4
isConnector: 0
priority: 2
conditionsString:
@@ -27084,7 +27265,7 @@ MonoBehaviour:
y: 30
width: 160
height: 30
- id: 1
- id: 4
fields:
- title: Title
value:
@@ -27099,11 +27280,11 @@ MonoBehaviour:
type: 0
typeString: CustomFieldType_Text
- title: Actor
value: 8
value: 1
type: 5
typeString: CustomFieldType_Actor
- title: Conversant
value: 1
value: 2
type: 5
typeString: CustomFieldType_Actor
- title: Menu Text
@@ -27111,8 +27292,7 @@ MonoBehaviour:
type: 0
typeString: CustomFieldType_Text
- title: Dialogue Text
value: Aaah, yes. Do you like my crystal? if you are interested, I will gladly
trade it for something I need.
value: Your voice... Your face... They feel familiar somehow.
type: 0
typeString: CustomFieldType_Text
- title: Parenthetical
@@ -27128,7 +27308,7 @@ MonoBehaviour:
type: 0
typeString: CustomFieldType_Text
- title: Sequence
value:
value: AudioWait(Dialogues/VO/CH02/herbalist/New_Story/Witch/CH02_vo_witch_wonderer_00)
type: 0
typeString: CustomFieldType_Text
- title: pl
@@ -27144,9 +27324,9 @@ MonoBehaviour:
conditionPriority: 2
outgoingLinks:
- originConversationID: 108
originDialogueID: 1
originDialogueID: 4
destinationConversationID: 108
destinationDialogueID: 2
destinationDialogueID: 5
isConnector: 0
priority: 2
conditionsString:
@@ -27156,11 +27336,11 @@ MonoBehaviour:
m_Calls: []
canvasRect:
serializedVersion: 2
x: 20
y: 80
x: 28.079865
y: 109.3712
width: 160
height: 30
- id: 2
- id: 5
fields:
- title: Title
value:
@@ -27175,11 +27355,11 @@ MonoBehaviour:
type: 0
typeString: CustomFieldType_Text
- title: Actor
value: 1
value: 2
type: 5
typeString: CustomFieldType_Actor
- title: Conversant
value: 8
value: 1
type: 5
typeString: CustomFieldType_Actor
- title: Menu Text
@@ -27187,7 +27367,8 @@ MonoBehaviour:
type: 0
typeString: CustomFieldType_Text
- title: Dialogue Text
value: And what would that be?
value: Liar... You knew my starlight, but you only though you knew him, yes...
And you listened to the dark whispers. And you fell.
type: 0
typeString: CustomFieldType_Text
- title: Parenthetical
@@ -27203,7 +27384,7 @@ MonoBehaviour:
type: 0
typeString: CustomFieldType_Text
- title: Sequence
value:
value: AudioWait(Dialogues/VO/CH02/herbalist/New_Story/Witch/CH02_vo_witch_witch_01)
type: 0
typeString: CustomFieldType_Text
- title: pl
@@ -27219,9 +27400,9 @@ MonoBehaviour:
conditionPriority: 2
outgoingLinks:
- originConversationID: 108
originDialogueID: 2
originDialogueID: 5
destinationConversationID: 108
destinationDialogueID: 3
destinationDialogueID: 6
isConnector: 0
priority: 2
conditionsString:
@@ -27231,11 +27412,11 @@ MonoBehaviour:
m_Calls: []
canvasRect:
serializedVersion: 2
x: 20
y: 130
x: 28.079865
y: 159.3712
width: 160
height: 30
- id: 3
- id: 6
fields:
- title: Title
value:
@@ -27250,11 +27431,11 @@ MonoBehaviour:
type: 0
typeString: CustomFieldType_Text
- title: Actor
value: 8
value: 1
type: 5
typeString: CustomFieldType_Actor
- title: Conversant
value: 1
value: 2
type: 5
typeString: CustomFieldType_Actor
- title: Menu Text
@@ -27262,9 +27443,8 @@ MonoBehaviour:
type: 0
typeString: CustomFieldType_Text
- title: Dialogue Text
value: Take this key. It opens a gate to an old courtyard. A foul creature
named Xasarath made her lair there... Bring me her poison gland, and I
will trade you the crystal.
value: It cannot be... Are you Zora? The wisest sorceress among the Princes
of the Light? I remember you! What happened to you?!
type: 0
typeString: CustomFieldType_Text
- title: Parenthetical
@@ -27280,7 +27460,160 @@ MonoBehaviour:
type: 0
typeString: CustomFieldType_Text
- title: Sequence
value: AudioWait(Dialogues/VO/CH02/herbalist/New_Story/Witch/CH02_vo_witch_wonderer_02)
type: 0
typeString: CustomFieldType_Text
- title: pl
value:
type: 4
typeString: CustomFieldType_Localization
conversationID: 108
isRoot: 0
isGroup: 0
nodeColor:
delaySimStatus: 0
falseConditionAction: Block
conditionPriority: 2
outgoingLinks:
- originConversationID: 108
originDialogueID: 6
destinationConversationID: 108
destinationDialogueID: 7
isConnector: 0
priority: 2
conditionsString:
userScript:
onExecute:
m_PersistentCalls:
m_Calls: []
canvasRect:
serializedVersion: 2
x: 28.079865
y: 241.3712
width: 160
height: 30
- id: 7
fields:
- title: Title
value:
type: 0
typeString: CustomFieldType_Text
- title: Pictures
value: '[]'
type: 3
typeString: CustomFieldType_Files
- title: Description
value:
type: 0
typeString: CustomFieldType_Text
- title: Actor
value: 2
type: 5
typeString: CustomFieldType_Actor
- title: Conversant
value: 1
type: 5
typeString: CustomFieldType_Actor
- title: Menu Text
value:
type: 0
typeString: CustomFieldType_Text
- title: Dialogue Text
value: Speak not as if you KNOW me, deceiver! You are as blind to the greater
truths now, as you were before! Cast not thy judgements upon your betters!
Leave me and my starlight alone in our misery!
type: 0
typeString: CustomFieldType_Text
- title: Parenthetical
value:
type: 0
typeString: CustomFieldType_Text
- title: Audio Files
value: '[]'
type: 3
typeString: CustomFieldType_Files
- title: Video File
value:
type: 0
typeString: CustomFieldType_Text
- title: Sequence
value: AudioWait(Dialogues/VO/CH02/herbalist/New_Story/Witch/CH02_vo_witch_witch_02)
type: 0
typeString: CustomFieldType_Text
- title: pl
value:
type: 4
typeString: CustomFieldType_Localization
conversationID: 108
isRoot: 0
isGroup: 0
nodeColor:
delaySimStatus: 0
falseConditionAction: Block
conditionPriority: 2
outgoingLinks:
- originConversationID: 108
originDialogueID: 7
destinationConversationID: 108
destinationDialogueID: 8
isConnector: 0
priority: 2
conditionsString:
userScript:
onExecute:
m_PersistentCalls:
m_Calls: []
canvasRect:
serializedVersion: 2
x: 28.079865
y: 291.37122
width: 160
height: 30
- id: 8
fields:
- title: Title
value:
type: 0
typeString: CustomFieldType_Text
- title: Pictures
value: '[]'
type: 3
typeString: CustomFieldType_Files
- title: Description
value:
type: 0
typeString: CustomFieldType_Text
- title: Actor
value: 1
type: 5
typeString: CustomFieldType_Actor
- title: Conversant
value: 2
type: 5
typeString: CustomFieldType_Actor
- title: Menu Text
value:
type: 0
typeString: CustomFieldType_Text
- title: Dialogue Text
value: I'm sorry, Zora. I'm sorry for whatever happened to you. I will try
to fix it, I swear.
type: 0
typeString: CustomFieldType_Text
- title: Parenthetical
value:
type: 0
typeString: CustomFieldType_Text
- title: Audio Files
value: '[]'
type: 3
typeString: CustomFieldType_Files
- title: Video File
value:
type: 0
typeString: CustomFieldType_Text
- title: Sequence
value: AudioWait(Dialogues/VO/CH02/herbalist/New_Story/Witch/CH02_vo_witch_wonderer_03)
type: 0
typeString: CustomFieldType_Text
- title: pl
@@ -27302,12 +27635,12 @@ MonoBehaviour:
m_Calls: []
canvasRect:
serializedVersion: 2
x: 25
y: 189
x: 28.079865
y: 341.37122
width: 160
height: 30
canvasScrollPosition: {x: 0, y: 0}
canvasZoom: 1
canvasScrollPosition: {x: 52.319527, y: 14.465763}
canvasZoom: 1.0760005
- id: 109
fields:
- title: Title
@@ -31784,6 +32117,354 @@ MonoBehaviour:
height: 30
canvasScrollPosition: {x: 0, y: 0}
canvasZoom: 1
- id: 132
fields:
- title: Title
value: CH02/RUINEDTOWN/WitchHouse
type: 0
typeString: CustomFieldType_Text
- title: Pictures
value: '[]'
type: 3
typeString: CustomFieldType_Files
- title: Description
value:
type: 0
typeString: CustomFieldType_Text
- title: Actor
value: 1
type: 5
typeString: CustomFieldType_Actor
- title: Conversant
value: 8
type: 5
typeString: CustomFieldType_Actor
overrideSettings:
useOverrides: 0
overrideSubtitleSettings: 0
showNPCSubtitlesDuringLine: 1
showNPCSubtitlesWithResponses: 1
showPCSubtitlesDuringLine: 0
skipPCSubtitleAfterResponseMenu: 0
subtitleCharsPerSecond: 30
minSubtitleSeconds: 2
continueButton: 0
overrideSequenceSettings: 0
defaultSequence:
defaultPlayerSequence:
defaultResponseMenuSequence:
overrideInputSettings: 0
alwaysForceResponseMenu: 1
includeInvalidEntries: 0
responseTimeout: 0
cancelSubtitle:
key: 27
buttonName:
cancelConversation:
key: 27
buttonName:
nodeColor:
dialogueEntries:
- id: 0
fields:
- title: Title
value: START
type: 0
typeString:
- title: Pictures
value: '[]'
type: 3
typeString: CustomFieldType_Files
- title: Description
value:
type: 0
typeString:
- title: Actor
value: 1
type: 5
typeString: CustomFieldType_Actor
- title: Conversant
value: 8
type: 5
typeString: CustomFieldType_Actor
- title: Menu Text
value:
type: 0
typeString:
- title: Dialogue Text
value:
type: 0
typeString:
- title: Parenthetical
value:
type: 0
typeString:
- title: Audio Files
value: '[]'
type: 3
typeString: CustomFieldType_Files
- title: Video File
value:
type: 0
typeString:
- title: Sequence
value: None()
type: 0
typeString:
- title: pl
value:
type: 4
typeString: CustomFieldType_Localization
conversationID: 132
isRoot: 0
isGroup: 0
nodeColor:
delaySimStatus: 0
falseConditionAction:
conditionPriority: 2
outgoingLinks:
- originConversationID: 132
originDialogueID: 0
destinationConversationID: 132
destinationDialogueID: 1
isConnector: 0
priority: 2
conditionsString:
userScript:
onExecute:
m_PersistentCalls:
m_Calls: []
canvasRect:
serializedVersion: 2
x: 20
y: 30
width: 160
height: 30
- id: 1
fields:
- title: Title
value:
type: 0
typeString: CustomFieldType_Text
- title: Pictures
value: '[]'
type: 3
typeString: CustomFieldType_Files
- title: Description
value:
type: 0
typeString: CustomFieldType_Text
- title: Actor
value: 1
type: 5
typeString: CustomFieldType_Actor
- title: Conversant
value: 8
type: 5
typeString: CustomFieldType_Actor
- title: Menu Text
value:
type: 0
typeString: CustomFieldType_Text
- title: Dialogue Text
value: And who might you be, wanderer? You come with your sword oh so bright,
you come into my home, and what do you bring, huh? What do you bring beside
more lies and misery?
type: 0
typeString: CustomFieldType_Text
- title: Parenthetical
value:
type: 0
typeString: CustomFieldType_Text
- title: Audio Files
value: '[]'
type: 3
typeString: CustomFieldType_Files
- title: Video File
value:
type: 0
typeString: CustomFieldType_Text
- title: Sequence
value: AudioWait(Dialogues/VO/CH02/herbalist/New_Story/House/CH02_vo_witch_witch_00)
type: 0
typeString: CustomFieldType_Text
- title: pl
value:
type: 4
typeString: CustomFieldType_Localization
conversationID: 132
isRoot: 0
isGroup: 0
nodeColor:
delaySimStatus: 0
falseConditionAction: Block
conditionPriority: 2
outgoingLinks:
- originConversationID: 132
originDialogueID: 1
destinationConversationID: 132
destinationDialogueID: 2
isConnector: 0
priority: 2
conditionsString: Variable["CH02HannaHouseVisited"] == false
userScript:
onExecute:
m_PersistentCalls:
m_Calls: []
canvasRect:
serializedVersion: 2
x: 20
y: 80
width: 160
height: 30
- id: 2
fields:
- title: Title
value:
type: 0
typeString: CustomFieldType_Text
- title: Pictures
value: '[]'
type: 3
typeString: CustomFieldType_Files
- title: Description
value:
type: 0
typeString: CustomFieldType_Text
- title: Actor
value: 8
type: 5
typeString: CustomFieldType_Actor
- title: Conversant
value: 1
type: 5
typeString: CustomFieldType_Actor
- title: Menu Text
value:
type: 0
typeString: CustomFieldType_Text
- title: Dialogue Text
value: I... Am looking for someone. You needn't fear me, my lady.
type: 0
typeString: CustomFieldType_Text
- title: Parenthetical
value:
type: 0
typeString: CustomFieldType_Text
- title: Audio Files
value: '[]'
type: 3
typeString: CustomFieldType_Files
- title: Video File
value:
type: 0
typeString: CustomFieldType_Text
- title: Sequence
value: AudioWait(Dialogues/VO/CH02/herbalist/New_Story/House/CH02_vo_witch_wonderer_01)
type: 0
typeString: CustomFieldType_Text
- title: pl
value:
type: 4
typeString: CustomFieldType_Localization
conversationID: 132
isRoot: 0
isGroup: 0
nodeColor:
delaySimStatus: 0
falseConditionAction: Block
conditionPriority: 2
outgoingLinks:
- originConversationID: 132
originDialogueID: 2
destinationConversationID: 132
destinationDialogueID: 3
isConnector: 0
priority: 2
conditionsString:
userScript:
onExecute:
m_PersistentCalls:
m_Calls: []
canvasRect:
serializedVersion: 2
x: 20
y: 130
width: 160
height: 30
- id: 3
fields:
- title: Title
value:
type: 0
typeString: CustomFieldType_Text
- title: Pictures
value: '[]'
type: 3
typeString: CustomFieldType_Files
- title: Description
value:
type: 0
typeString: CustomFieldType_Text
- title: Actor
value: 1
type: 5
typeString: CustomFieldType_Actor
- title: Conversant
value: 8
type: 5
typeString: CustomFieldType_Actor
- title: Menu Text
value:
type: 0
typeString: CustomFieldType_Text
- title: Dialogue Text
value: Lady, he says. Lady, he titles me. Liar. And madman.
type: 0
typeString: CustomFieldType_Text
- title: Parenthetical
value:
type: 0
typeString: CustomFieldType_Text
- title: Audio Files
value: '[]'
type: 3
typeString: CustomFieldType_Files
- title: Video File
value:
type: 0
typeString: CustomFieldType_Text
- title: Sequence
value: AudioWait(Dialogues/VO/CH02/herbalist/New_Story/House/CH02_vo_witch_witch_03)
type: 0
typeString: CustomFieldType_Text
- title: pl
value:
type: 4
typeString: CustomFieldType_Localization
conversationID: 132
isRoot: 0
isGroup: 0
nodeColor:
delaySimStatus: 0
falseConditionAction: Block
conditionPriority: 2
outgoingLinks: []
conditionsString:
userScript: 'Variable["CH02HannaHouseVisited"] = true;
'
onExecute:
m_PersistentCalls:
m_Calls: []
canvasRect:
serializedVersion: 2
x: 20
y: 180
width: 160
height: 30
canvasScrollPosition: {x: 0, y: 0}
canvasZoom: 0.9990002
syncInfo:
syncActors: 0
syncItems: 0

2
Assets/Dialogue/TestDialogueBase (Auto-Backup).asset.meta
View File

@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 3c84b775d4f6240b185527d49e09404f
guid: 8aff4fa97fd094b00a15ff4a0a2ffc3e
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000

1218
Assets/Dialogue/TestDialogueBase.asset
View File

File diff suppressed because it is too large Load Diff

2
Assets/Meshes/scroll/scrollMat2D.mat
View File

@@ -138,7 +138,7 @@ Material:
- _MaxBrightness: 1
- _Metallic: 0
- _MinBrightness: 0
- _NoiseScale: 1.0038235
- _NoiseScale: 1.013747
- _OcclusionStrength: 1
- _Parallax: 0.005
- _QueueControl: 0

2647
Assets/Scenes/02_Ruined_Town/Ruined_Town.unity
View File

File diff suppressed because it is too large Load Diff

6
Assets/Scripts/Save/ConditionalEventTrigger.cs
View File

@@ -23,13 +23,15 @@ namespace Beyond
[Header("Events")]
[Tooltip("Actions to perform if the condition is true.")]
public UnityEvent onConditionTrue;
[Tooltip("Actions to perform if the condition is false.")]
public UnityEvent onConditionFalse;
// This field is used by the custom editor for the Lua wizard.
[HideInInspector]
public DialogueDatabase selectedDatabase = null;
[Tooltip("How often to check the condition (in seconds). If zero, only checks on start/load.")]
public float CheckInterval = 1.0f;
private bool hasFired = false;
@@ -40,6 +42,8 @@ namespace Beyond
{
base.Start();
CheckConditionAndExecute();
if (CheckInterval > 0)
InvokeRepeating("CheckConditionAndExecute", CheckInterval + (Random.value * CheckInterval), CheckInterval);
}
/// <summary>

81
Assets/Scripts/Utils/BarkManager.cs
View File

@@ -70,6 +70,9 @@ namespace Beyond // Ensure this namespace matches your project structure
public bool IsPlaying => m_audioSource != null && m_audioSource.isPlaying;
// --- NEW: Flag to control bark playback ---
private bool m_isPaused = false;
// --- Core Methods ---
public override void Awake()
@@ -93,6 +96,29 @@ namespace Beyond // Ensure this namespace matches your project structure
SetupAudioSource();
InitializeSaveData();
BuildConversationLookup();
}
// --- NEW: Subscribe to Dialogue System events ---
private void OnEnable()
{
var dialogueSystemEvents = DialogueManager.instance.GetComponent<DialogueSystemEvents>();
if (dialogueSystemEvents != null)
{
dialogueSystemEvents.conversationEvents.onConversationStart.AddListener(OnConversationStart);
dialogueSystemEvents.conversationEvents.onConversationEnd.AddListener(OnConversationEnd);
}
}
// --- NEW: Unsubscribe from Dialogue System events ---
private void OnDisable()
{
var dialogueSystemEvents = DialogueManager.instance.GetComponent<DialogueSystemEvents>();
if (dialogueSystemEvents != null)
{
dialogueSystemEvents.conversationEvents.onConversationStart.RemoveListener(OnConversationStart);
dialogueSystemEvents.conversationEvents.onConversationEnd.RemoveListener(OnConversationEnd);
}
}
private void SetupAudioSource()
@@ -152,6 +178,9 @@ namespace Beyond // Ensure this namespace matches your project structure
/// <returns>The AudioClip that will be played (or null if none/delayed).</returns>
public AudioClip PlayBark(int entryIndex, Transform barkTarget = null, int specificBarkIndex = -1)
{
// --- MODIFIED: Check if barks are paused ---
if (m_isPaused) return null;
if (entryIndex < 0 || entryIndex >= m_barks.Length)
{
Debug.LogError($"BarkManager: Invalid entryIndex {entryIndex}.", this);
@@ -223,6 +252,9 @@ namespace Beyond // Ensure this namespace matches your project structure
/// </summary>
public void PlayBark(string conversation, Transform barkTarget = null)
{
// --- MODIFIED: Check if barks are paused ---
if (m_isPaused) return;
if (m_conversationToEntry.TryGetValue(conversation, out int entryIndex))
{
// Determine target *before* queuing, store null if Player isn't available/needed
@@ -248,6 +280,9 @@ namespace Beyond // Ensure this namespace matches your project structure
/// </summary>
public void PlayBarkFromQueue(int entryIndex, Transform barkTarget = null)
{
// --- MODIFIED: Check if barks are paused ---
if (m_isPaused) return;
// Queue the original target (null if default intended). Update loop will resolve Player.Instance if needed.
m_barkQueue.Enqueue(new QueuedBarkRequest { entryIndex = entryIndex, target = barkTarget });
}
@@ -267,6 +302,9 @@ namespace Beyond // Ensure this namespace matches your project structure
/// </summary>
private AudioClip PlayBarkImmediately(BarkEntry barkEntry, Transform targetForText, int specificBarkIndex = -1)
{
// --- MODIFIED: Check if barks are paused ---
if (m_isPaused) return null;
if (barkEntry.barks == null || barkEntry.barks.Length == 0) return null;
Bark barkToPlay = null;
@@ -361,6 +399,9 @@ namespace Beyond // Ensure this namespace matches your project structure
private void Update()
{
// --- MODIFIED: Check if barks are paused ---
if (m_isPaused) return;
// Process the queue for externally triggered RANDOM barks
if (m_barkQueue.Count > 0 && !IsPlaying)
{
@@ -382,5 +423,45 @@ namespace Beyond // Ensure this namespace matches your project structure
PlayBark(request.entryIndex, targetForText, -1);
}
}
// --- NEW: Event handlers for conversation start and end ---
private void OnConversationStart(Transform actor)
{
//PauseBarks();
StopBarks();
}
private void OnConversationEnd(Transform actor)
{
//ResumeBarks();
}
// --- NEW: Public methods to pause and resume barks ---
public void StopBarks()
{
if (m_audioSource != null && m_audioSource.isPlaying)
{
m_audioSource.Stop();
}
m_barkQueue.Clear(); // Clear any pending barks
}
public void PauseBarks()
{
m_isPaused = true;
if (m_audioSource != null && m_audioSource.isPlaying)
{
m_audioSource.Pause();
}
m_barkQueue.Clear(); // Clear any pending barks
}
public void ResumeBarks()
{
m_isPaused = false;
if (m_audioSource != null)
{
m_audioSource.UnPause();
}
}
}
}

2
Assets/ThirdParty/PARTICLES/EffectExamples/Fire & Explosion Effects/Materials/SmokeDark.mat vendored
View File

@@ -130,7 +130,7 @@ Material:
- _BaseColor: {r: 1, g: 0.524691, b: 0.07075471, a: 0.48235294}
- _BaseColorAddSubDiff: {r: 0, g: 0, b: 0, a: 0}
- _CameraFadeParams: {r: 0, g: Infinity, b: 0, a: 0}
- _Color: {r: 1, g: 0.524691, b: 0.070754685, a: 0.48235294}
- _Color: {r: 1, g: 0.5246909, b: 0.070754685, a: 0.48235294}
- _EmisColor: {r: 0, g: 0, b: 0, a: 0}
- _EmissionColor: {r: 0.030037379, g: 0.045851335, b: 0.14150941, a: 1}
- _SoftParticleFadeParams: {r: 0, g: 1, b: 0, a: 0}