Merge remote-tracking branch 'origin/master'

This commit is contained in:
Jakub Sztuba 2023-01-15 13:48:28 +01:00
commit 5594c1c996
20 changed files with 330 additions and 5070 deletions

View File

@ -214,6 +214,7 @@ MonoBehaviour:
chestModel: {fileID: 5754902894522036729}
ChestType: 3
Content: []
IsLocked: 1
--- !u!95 &-5583331179158830126
Animator:
serializedVersion: 3

View File

@ -19,7 +19,7 @@ MonoBehaviour:
value: 0
image: {fileID: 7977443681283346765, guid: 866adc2eb813e72438343756fc3b4e01, type: 3}
itemModel: {fileID: 8707952282648172651, guid: 7e7c7a913b3a569458a1f9ed3e86314f, type: 3}
price: 35
price: 30
useEffect:
m_PersistentCalls:
m_Calls: []

View File

@ -19,7 +19,7 @@ MonoBehaviour:
value: 0
image: {fileID: 1359165526104252653, guid: 866adc2eb813e72438343756fc3b4e01, type: 3}
itemModel: {fileID: 1237314003543356901, guid: 2c8ec2b57fbe0e44d9219a8a8278e17c, type: 3}
price: 75
price: 65
useEffect:
m_PersistentCalls:
m_Calls: []

View File

@ -19,7 +19,7 @@ MonoBehaviour:
value: 0
image: {fileID: 2163354836892620996, guid: 866adc2eb813e72438343756fc3b4e01, type: 3}
itemModel: {fileID: 3590270392808210390, guid: 12fa744d3c4942f478b360c9a359c171, type: 3}
price: 50
price: 40
useEffect:
m_PersistentCalls:
m_Calls: []

View File

@ -13,7 +13,7 @@ MonoBehaviour:
m_Name: ScrollOfDarkness
m_EditorClassIdentifier:
id: 0
name: Scroll of Darkness
name: Scroll Of Darkness
description: Scroll written in a werid language
level: 0
value: 0

View File

@ -12,11 +12,11 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 67587597537a4344cad65ddbcebee119, type: 3}
m_Name: ArchibaldQuestDialENG
m_EditorClassIdentifier:
SpeakerName:
CurrentStep: 0
SpeakerName: Archibald
CurrentStep: 4
DialogueSteps:
- Header:
WasDisplayed: 0
- Header: Archibald
WasDisplayed: 1
ListOfSentences:
- Sentence: Hey there, could you help me?
Buttons:
@ -40,6 +40,23 @@ MonoBehaviour:
- Sentence: Up this road there are monsters. They attack me everytime I try to
get through the forest. Kill four of them and I will reward you.
Buttons:
- ButtonName: Do it yourself, coward.
Type: 1
ButtonActions:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 11400000}
m_TargetAssemblyTypeName: MissionDialogue, Assembly-CSharp
m_MethodName: RejectMission
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
- ButtonName: Consider it done.
Type: 1
ButtonActions:
@ -69,23 +86,6 @@ MonoBehaviour:
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
- ButtonName: Do it yourself, coward.
Type: 1
ButtonActions:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 11400000}
m_TargetAssemblyTypeName: MissionDialogue, Assembly-CSharp
m_MethodName: RejectMission
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
EndOfDialogueStepAction:
m_PersistentCalls:
m_Calls:
@ -101,36 +101,19 @@ MonoBehaviour:
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
- Header:
WasDisplayed: 0
- Header: Archibald
WasDisplayed: 1
ListOfSentences:
- Sentence: Thank you Mercenary!
Buttons: []
EndOfDialogueStepAction:
m_PersistentCalls:
m_Calls: []
- Header:
WasDisplayed: 0
- Header: Archibald
WasDisplayed: 1
ListOfSentences:
- Sentence: Have you killed them?
Buttons:
- ButtonName: Yes, I did.
Type: 1
ButtonActions:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 11400000}
m_TargetAssemblyTypeName: MissionDialogue, Assembly-CSharp
m_MethodName: HandleCondition
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
- ButtonName: Not yet.
Type: 1
ButtonActions:
@ -148,18 +131,35 @@ MonoBehaviour:
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
- ButtonName: Yes, I did.
Type: 1
ButtonActions:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 11400000}
m_TargetAssemblyTypeName: MissionDialogue, Assembly-CSharp
m_MethodName: HandleCondition
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
EndOfDialogueStepAction:
m_PersistentCalls:
m_Calls: []
- Header:
WasDisplayed: 0
- Header: Archibald
WasDisplayed: 1
ListOfSentences:
- Sentence: You're a good man.
Buttons: []
- Sentence: Here is your reward.
Buttons:
- ButtonName: <Take>
Type: 0
Type: 1
ButtonActions:
m_PersistentCalls:
m_Calls:

View File

@ -12,11 +12,11 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 67587597537a4344cad65ddbcebee119, type: 3}
m_Name: ArchibaldQuestDialPL
m_EditorClassIdentifier:
SpeakerName:
CurrentStep: 0
SpeakerName: Archibald
CurrentStep: 1
DialogueSteps:
- Header:
WasDisplayed: 0
- Header: Archibald
WasDisplayed: 1
ListOfSentences:
- Sentence: Witaj, czy moglbys mi pomoc?
Buttons:
@ -40,6 +40,23 @@ MonoBehaviour:
- Sentence: Na koncu tej drogi sa potwory. Atakuja mnie, kiedy probuje przejsc
przez las. Zabij cztery z nich, a cie nagrodze.
Buttons:
- ButtonName: Radz sobie sam.
Type: 1
ButtonActions:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 11400000}
m_TargetAssemblyTypeName: MissionDialogue, Assembly-CSharp
m_MethodName: RejectMission
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
- ButtonName: Zalatwione.
Type: 1
ButtonActions:
@ -69,23 +86,6 @@ MonoBehaviour:
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
- ButtonName: Radz sobie sam.
Type: 1
ButtonActions:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 11400000}
m_TargetAssemblyTypeName: MissionDialogue, Assembly-CSharp
m_MethodName: RejectMission
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
EndOfDialogueStepAction:
m_PersistentCalls:
m_Calls:
@ -101,7 +101,7 @@ MonoBehaviour:
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
- Header:
- Header: Archibald
WasDisplayed: 0
ListOfSentences:
- Sentence: Dziekuje najemniku!
@ -109,7 +109,7 @@ MonoBehaviour:
EndOfDialogueStepAction:
m_PersistentCalls:
m_Calls: []
- Header:
- Header: Archibald
WasDisplayed: 0
ListOfSentences:
- Sentence: Zabiles je?
@ -151,7 +151,7 @@ MonoBehaviour:
EndOfDialogueStepAction:
m_PersistentCalls:
m_Calls: []
- Header:
- Header: Archibald
WasDisplayed: 0
ListOfSentences:
- Sentence: Jestes dobrym czlowiekiem
@ -159,7 +159,7 @@ MonoBehaviour:
- Sentence: Oto twoja nagroda
Buttons:
- ButtonName: <Zabierz>
Type: 0
Type: 1
ButtonActions:
m_PersistentCalls:
m_Calls:

View File

@ -18,14 +18,14 @@ MonoBehaviour:
title: Kill four monsters
description: Zabij potwory strzegace lasu
difficulty: 0
SpeakerName:
Status: 1
SpeakerName: Archibald
Status: 3
CurrentStep: 0
MissionStepsList:
- SpeakerName:
- SpeakerName: Archibald
Status: 2
MissionIssue:
DialogueStep: {fileID: 11400000, guid: 2fd131f89cb088543b1ff75b8a5ea828, type: 2}
DialogueStep: {fileID: 11400000, guid: 7574389e1d42bc84c88d32488588d940, type: 2}
MissionConditions:
Key: 0
Value:

View File

@ -202,7 +202,12 @@ MonoBehaviour:
keyToOpen: 101
CanBeOpened: 1
OpenInDefaultWay: 1
MissionTemplate: {fileID: 11400000, guid: 41b9ce58379acd64e9a7491e94671e6f, type: 2}
missionLanguageDetector:
InstanceTemplates:
- Key: 0
Value: {fileID: 11400000, guid: 578891406eb5573499c8e34b30989be6, type: 2}
- Key: 1
Value: {fileID: 11400000, guid: 41b9ce58379acd64e9a7491e94671e6f, type: 2}
Mission: {fileID: 0}
OpenMissionInDefaultWay: 1
FreeDialogue:

View File

@ -56222,6 +56222,7 @@ GameObject:
- component: {fileID: 1467027547}
- component: {fileID: 1467027546}
- component: {fileID: 1467027553}
- component: {fileID: 1467027554}
m_Layer: 0
m_Name: UiManager
m_TagString: Untagged
@ -56364,6 +56365,20 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 3e405827d28ed5344a3b97ebbae780f3, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!114 &1467027554
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1467027544}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: dbf560da69f41534780f479f1d5566eb, type: 3}
m_Name:
m_EditorClassIdentifier:
DynamicPanel: {fileID: 0}
keyToOpen: 0
--- !u!1 &1475557201
GameObject:
m_ObjectHideFlags: 0

View File

@ -260109,8 +260109,12 @@ MonoBehaviour:
Value: {fileID: 11400000, guid: 5e28ddfc23a61b842bb3007b766d1649, type: 2}
- Key: 23
Value: {fileID: 11400000, guid: 74bb221206536b94caf425820b9d626d, type: 2}
- Key: 28
- Key: 15
Value: {fileID: 11400000, guid: aa2aa2f5d3647d5468c0323e288324f5, type: 2}
- Key: 18
Value: {fileID: 11400000, guid: 636125c4ce4a6f340870acbecd05c23b, type: 2}
- Key: 17
Value: {fileID: 11400000, guid: 4b0dfebf56b2bd34fae27445554126ee, type: 2}
--- !u!114 &593922350
MonoBehaviour:
m_ObjectHideFlags: 0
@ -611908,7 +611912,12 @@ MonoBehaviour:
keyToOpen: 101
CanBeOpened: 0
OpenInDefaultWay: 0
MissionTemplate: {fileID: 11400000, guid: eb3bbf628b0534844b19c488ea4b9843, type: 2}
missionLanguageDetector:
InstanceTemplates:
- Key: 1
Value: {fileID: 11400000, guid: eb3bbf628b0534844b19c488ea4b9843, type: 2}
- Key: 0
Value: {fileID: 11400000, guid: a0c5953fbf02eaf47bcaa72f846a917b, type: 2}
Mission: {fileID: 11400000, guid: eb3bbf628b0534844b19c488ea4b9843, type: 2}
OpenMissionInDefaultWay: 0
FreeDialogue:
@ -611930,7 +611939,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: a13ccc76cd22a814287fc3a36a9cac71, type: 3}
m_Name:
m_EditorClassIdentifier:
Name:
Name: Archibald
State: 4
--- !u!1 &2002123028
GameObject:

View File

@ -966,16 +966,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 1126efb434c50f446b49891f5584c786, type: 3}
m_Name:
m_EditorClassIdentifier:
ElementsToBuildOnSceneList:
- Key: 1
Value:
EquippableItem: {fileID: 11400000, guid: 43fcc69d78c8c3847bbedde817f35b45, type: 2}
- Key: 0
Value:
EquippableItem: {fileID: 11400000, guid: e76017225f130f3459860a42d4169494, type: 2}
- Key: 2
Value:
EquippableItem: {fileID: 11400000, guid: 414cc7af49ae5914a95e2c334a55af99, type: 2}
ElementsToBuildOnSceneList: []
convertedData: []
--- !u!1 &72027011
GameObject:

File diff suppressed because it is too large Load Diff

View File

@ -59636,6 +59636,133 @@ Transform:
m_CorrespondingSourceObject: {fileID: 6772741684851832271, guid: d7f7c3cfda2b1f84da080a72252626bc, type: 3}
m_PrefabInstance: {fileID: 386057677}
m_PrefabAsset: {fileID: 0}
--- !u!1 &389817837
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 389817839}
- component: {fileID: 389817838}
m_Layer: 0
m_Name: AmbienceOutsideWizardHouse
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!82 &389817838
AudioSource:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 389817837}
m_Enabled: 1
serializedVersion: 4
OutputAudioMixerGroup: {fileID: 0}
m_audioClip: {fileID: 8300000, guid: 254736acf6353194482609db57480719, type: 3}
m_PlayOnAwake: 1
m_Volume: 0.4
m_Pitch: 1
Loop: 1
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!4 &389817839
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 389817837}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 37.864067, y: -5.0793505, z: -14.286615}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 18
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &390735778 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 8988639829210330897, guid: 3445ae9e3f2916e49a0b3c12a6345032, type: 3}
@ -164151,6 +164278,10 @@ PrefabInstance:
propertyPath: m_Name
value: Sign
objectReference: {fileID: 0}
- target: {fileID: 8988639829210330908, guid: 3445ae9e3f2916e49a0b3c12a6345032, type: 3}
propertyPath: CanBeOpened
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8988639829210330911, guid: 3445ae9e3f2916e49a0b3c12a6345032, type: 3}
propertyPath: m_RootOrder
value: 3

View File

@ -2455,7 +2455,7 @@ MonoBehaviour:
Position: {x: 0.6, y: 75.6, z: 10}
Content: []
- ChestName: Gold Chest
ChestPrefab: {fileID: 4669568061092186072, guid: 5cf1cdd5626b6894f824d7c7edcdc166, type: 3}
ChestPrefab: {fileID: 4669568061092186072, guid: 4520021e6b079444fb51d3289cb049a4, type: 3}
Position: {x: 56.6, y: 0.8, z: 10}
Content:
- Key: 0

View File

@ -44832,63 +44832,6 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2109855382}
m_CullTransparentMesh: 1
--- !u!1001 &2115511153
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 3372166038178475857, guid: 7f90c54472a8fe94f9b70805d288429b, type: 3}
propertyPath: m_Name
value: ScrollOfDarkness
objectReference: {fileID: 0}
- target: {fileID: 6816388368617782066, guid: 7f90c54472a8fe94f9b70805d288429b, type: 3}
propertyPath: m_RootOrder
value: 15
objectReference: {fileID: 0}
- target: {fileID: 6816388368617782066, guid: 7f90c54472a8fe94f9b70805d288429b, type: 3}
propertyPath: m_LocalPosition.x
value: 2.6638236
objectReference: {fileID: 0}
- target: {fileID: 6816388368617782066, guid: 7f90c54472a8fe94f9b70805d288429b, type: 3}
propertyPath: m_LocalPosition.y
value: -8.376754
objectReference: {fileID: 0}
- target: {fileID: 6816388368617782066, guid: 7f90c54472a8fe94f9b70805d288429b, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6816388368617782066, guid: 7f90c54472a8fe94f9b70805d288429b, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6816388368617782066, guid: 7f90c54472a8fe94f9b70805d288429b, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6816388368617782066, guid: 7f90c54472a8fe94f9b70805d288429b, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6816388368617782066, guid: 7f90c54472a8fe94f9b70805d288429b, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6816388368617782066, guid: 7f90c54472a8fe94f9b70805d288429b, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6816388368617782066, guid: 7f90c54472a8fe94f9b70805d288429b, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6816388368617782066, guid: 7f90c54472a8fe94f9b70805d288429b, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 7f90c54472a8fe94f9b70805d288429b, type: 3}
--- !u!1 &2116489012
GameObject:
m_ObjectHideFlags: 0
@ -45343,5 +45286,21 @@ PrefabInstance:
propertyPath: m_TagString
value: NPC
objectReference: {fileID: 0}
- target: {fileID: 8779487345608277763, guid: 417d111e604a8124cb960805d809e513, type: 3}
propertyPath: missionLanguageDetector.InstanceTemplates.Array.size
value: 2
objectReference: {fileID: 0}
- target: {fileID: 8779487345608277763, guid: 417d111e604a8124cb960805d809e513, type: 3}
propertyPath: missionLanguageDetector.InstanceTemplates.Array.data[1].Key
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8779487345608277763, guid: 417d111e604a8124cb960805d809e513, type: 3}
propertyPath: missionLanguageDetector.InstanceTemplates.Array.data[0].Value
value:
objectReference: {fileID: 11400000, guid: 578891406eb5573499c8e34b30989be6, type: 2}
- target: {fileID: 8779487345608277763, guid: 417d111e604a8124cb960805d809e513, type: 3}
propertyPath: missionLanguageDetector.InstanceTemplates.Array.data[1].Value
value:
objectReference: {fileID: 11400000, guid: 41b9ce58379acd64e9a7491e94671e6f, type: 2}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 417d111e604a8124cb960805d809e513, type: 3}

View File

@ -8,9 +8,9 @@ using UnityEngine;
//[CreateAssetMenu(fileName = "New Mission", menuName = "Mission/New Mission")]
public class NpcMissionManager : DialogueManager // ScriptableObject
{
{
[SerializeField]
public Mission MissionTemplate;
public LanguageDetector<Mission> missionLanguageDetector;
/* We user object CLONED TO PREVENT overwritting changes in main object inassets */
[SerializeField]
@ -135,7 +135,7 @@ public class NpcMissionManager : DialogueManager // ScriptableObject
public override void CreateInstanceBasedOnLanguage()
{
// DONT CLONE TO HAVE CONSTANT DATA - init - deep copy - to prevent overwritting chil;dern :D
Mission = MissionTemplate;
Mission = missionLanguageDetector.DetectInstanceBasedOnLanguage();
Mission.ResetMission();
/* var cloneDialogues = new List<IndexValuePair<int, Dialogue>>(Dialogue.Dialogues);

View File

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

View File

@ -65,4 +65,10 @@ EditorBuildSettings:
- enabled: 1
path: Assets/Scenes/Dungeon.unity
guid: b6120123e7d93d84491a51c1d12dc291
- enabled: 1
path: Assets/Scenes/TheCave.unity
guid: 45edbcf97cb2b2a46bedf0262e40533c
- enabled: 1
path: Assets/Scenes/BossFightLabirynthCave.unity
guid: 6d29c730c97162247bbd642d1abec871
m_configObjects: {}

View File

@ -6,35 +6,35 @@ EditorUserSettings:
serializedVersion: 4
m_ConfigSettings:
RecentlyUsedScenePath-0:
value: 22424703114646680e0b0227036c6f11021f0f2b3566333e243d04
flags: 0
RecentlyUsedScenePath-1:
value: 22424703114646680e0b0227036c791f04120b3e1b293f7e38271427fb
flags: 0
RecentlyUsedScenePath-2:
value: 22424703114646680e0b0227036c761e1821112620292135633c133af6f9
flags: 0
RecentlyUsedScenePath-3:
value: 22424703114646680e0b0227036c71150130192729686b700e261335ebf23939f6ee39e7a92f31352d1b
flags: 0
RecentlyUsedScenePath-4:
value: 22424703114646680e0b0227036c7c1100123d24383a273e2e2c5326ece92021
flags: 0
RecentlyUsedScenePath-5:
value: 22424703114646680e0b0227036c791904040c1c25242a312a2c5326ece92021
flags: 0
RecentlyUsedScenePath-6:
value: 22424703114646680e0b0227036c6c111b07142f1f2b233e2867083debf42d
flags: 0
RecentlyUsedScenePath-7:
value: 22424703114646680e0b0227036c72111f1958072926337e38271427fb
flags: 0
RecentlyUsedScenePath-8:
value: 22424703114646680e0b0227036c70050204112e291f2f2a2c3b1920caef212be7a923e7ee2e26
flags: 0
RecentlyUsedScenePath-9:
RecentlyUsedScenePath-1:
value: 22424703114646680e0b0227036c7b0518101d252266333e243d04
flags: 0
RecentlyUsedScenePath-2:
value: 22424703114646680e0b0227036c68190c160a2e042733232867083debf42d
flags: 0
RecentlyUsedScenePath-3:
value: 22424703114646680e0b0227036c6b181334193c2966333e243d04
flags: 0
RecentlyUsedScenePath-4:
value: 22424703114646680e0b0227036c7d1f05043e232b20321c2c2b1421fbee2030c1e620eca92f31352d1b
flags: 0
RecentlyUsedScenePath-5:
value: 22424703114646680e0b0227036c6c111b07142f1f2b233e2867083debf42d
flags: 0
RecentlyUsedScenePath-6:
value: 22424703114646680e0b0227036c6f11021f0f2b3566333e243d04
flags: 0
RecentlyUsedScenePath-7:
value: 22424703114646680e0b0227036c7c1102161b25212a357e38271427fb
flags: 0
RecentlyUsedScenePath-8:
value: 22424703114646680e0b0227036c791904040c1c25242a312a2c5326ece92021
flags: 0
RecentlyUsedScenePath-9:
value: 22424703114646680e0b0227036c791f04120b3e1b293f7e38271427fb
flags: 0
vcSharedLogLevel:
value: 0d5e400f0650
flags: 0