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

Fixy, tutek

Browse Source
This commit is contained in:
szczuras4
2025-02-18 17:43:10 +01:00
parent 96378ff8f4
commit a33fcabe1c
5 changed files with 1664 additions and 399 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Assets/AddressableAssetsData/AddressableAssetSettings.asset
View File

@@ -15,7 +15,7 @@ MonoBehaviour:
m_DefaultGroup: bc074d00982114f0388e9c98de91d44f
m_currentHash:
serializedVersion: 2
Hash: ef672e941747c2eb6b19db828d740a6a
Hash: 00000000000000000000000000000000
m_OptimizeCatalogSize: 0
m_BuildRemoteCatalog: 0
m_CatalogRequestsTimeout: 0

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

@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 649ae2fbc5c16b74289fd75a8c99b6a7
guid: 1a607fb7c63245148a4b4c4861689c00
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000

194
Assets/Dialogue/TestDialogueBase.asset
View File

@@ -12519,6 +12519,200 @@ MonoBehaviour:
height: 30
canvasScrollPosition: {x: 0, y: 0}
canvasZoom: 1
- id: 39
fields:
- title: Title
value: CH01/WASTELAND/CH01_wasteland_vo_soil_wanderer_01
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: 1
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: 1
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: 39
isRoot: 0
isGroup: 0
nodeColor:
delaySimStatus: 0
falseConditionAction:
conditionPriority: 2
outgoingLinks:
- originConversationID: 39
originDialogueID: 0
destinationConversationID: 39
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: 1
type: 5
typeString: CustomFieldType_Actor
- title: Menu Text
value:
type: 0
typeString: CustomFieldType_Text
- title: Dialogue Text
value: The soil seems good here. Strange. If only I had any seeds...
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/CH01/CH01_wasteland_vo_soil_wanderer_01)
type: 0
typeString: CustomFieldType_Text
- title: pl
value:
type: 4
typeString: CustomFieldType_Localization
conversationID: 39
isRoot: 0
isGroup: 0
nodeColor:
delaySimStatus: 0
falseConditionAction: Block
conditionPriority: 2
outgoingLinks: []
conditionsString:
userScript:
onExecute:
m_PersistentCalls:
m_Calls: []
canvasRect:
serializedVersion: 2
x: 20
y: 80
width: 160
height: 30
canvasScrollPosition: {x: 0, y: 0}
canvasZoom: 1
syncInfo:
syncActors: 0
syncItems: 0

91
Assets/Prefabs/Items/Consumables/Purple coneflowers Variant.prefab
View File

@@ -24,6 +24,7 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 132548684370759355}
serializedVersion: 2
m_LocalRotation: {x: 0.000000021855694, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
@@ -34,7 +35,6 @@ Transform:
- {fileID: 818741804345729046}
- {fileID: 8140855708190059642}
m_Father: {fileID: 7215417275878502720}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!205 &2004632276995490420
LODGroup:
@@ -88,13 +88,13 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 996308445902183158}
serializedVersion: 2
m_LocalRotation: {x: 0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 133985509449862931}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!33 &7868380274279925993
MeshFilter:
@@ -121,6 +121,9 @@ MeshRenderer:
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:
@@ -171,13 +174,13 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2672665733969772547}
serializedVersion: 2
m_LocalRotation: {x: -0.000000021855694, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0.086, y: 0.911, z: 0.039}
m_LocalScale: {x: 1.4414157, y: 3.4554386, z: 1.2842565}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 7215417275878502720}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0}
--- !u!198 &9094426819952241345
ParticleSystem:
@@ -397,6 +400,7 @@ ParticleSystem:
atime6: 0
atime7: 0
m_Mode: 0
m_ColorSpace: -1
m_NumColorKeys: 2
m_NumAlphaKeys: 2
minGradient:
@@ -426,6 +430,7 @@ ParticleSystem:
atime6: 0
atime7: 0
m_Mode: 0
m_ColorSpace: -1
m_NumColorKeys: 2
m_NumAlphaKeys: 2
startSize:
@@ -747,6 +752,7 @@ ParticleSystem:
m_PostInfinity: 2
m_RotationOrder: 4
randomizeRotationDirection: 1
gravitySource: 0
maxNumParticles: 60
customEmitterVelocity: {x: 0, y: 0, z: 0}
size3D: 1
@@ -1476,6 +1482,7 @@ ParticleSystem:
atime6: 0
atime7: 0
m_Mode: 0
m_ColorSpace: -1
m_NumColorKeys: 2
m_NumAlphaKeys: 2
minGradient:
@@ -1505,6 +1512,7 @@ ParticleSystem:
atime6: 0
atime7: 0
m_Mode: 0
m_ColorSpace: -1
m_NumColorKeys: 2
m_NumAlphaKeys: 2
UVModule:
@@ -3725,6 +3733,7 @@ ParticleSystem:
atime6: 0
atime7: 0
m_Mode: 0
m_ColorSpace: -1
m_NumColorKeys: 2
m_NumAlphaKeys: 2
minGradient:
@@ -3754,6 +3763,7 @@ ParticleSystem:
atime6: 0
atime7: 0
m_Mode: 0
m_ColorSpace: -1
m_NumColorKeys: 2
m_NumAlphaKeys: 2
range: {x: 0, y: 1}
@@ -4131,6 +4141,7 @@ ParticleSystem:
m_RotationOrder: 4
minVertexDistance: 0.2
textureMode: 0
textureScale: {x: 1, y: 1}
ribbonCount: 1
shadowBias: 0.5
worldSpace: 0
@@ -4173,6 +4184,7 @@ ParticleSystem:
atime6: 0
atime7: 0
m_Mode: 0
m_ColorSpace: -1
m_NumColorKeys: 2
m_NumAlphaKeys: 2
minGradient:
@@ -4202,6 +4214,7 @@ ParticleSystem:
atime6: 0
atime7: 0
m_Mode: 0
m_ColorSpace: -1
m_NumColorKeys: 2
m_NumAlphaKeys: 2
widthOverTrail:
@@ -4289,6 +4302,7 @@ ParticleSystem:
atime6: 0
atime7: 0
m_Mode: 0
m_ColorSpace: -1
m_NumColorKeys: 2
m_NumAlphaKeys: 2
minGradient:
@@ -4318,6 +4332,7 @@ ParticleSystem:
atime6: 0
atime7: 0
m_Mode: 0
m_ColorSpace: -1
m_NumColorKeys: 2
m_NumAlphaKeys: 2
CustomDataModule:
@@ -4356,6 +4371,7 @@ ParticleSystem:
atime6: 0
atime7: 0
m_Mode: 0
m_ColorSpace: -1
m_NumColorKeys: 2
m_NumAlphaKeys: 2
minGradient:
@@ -4385,6 +4401,7 @@ ParticleSystem:
atime6: 0
atime7: 0
m_Mode: 0
m_ColorSpace: -1
m_NumColorKeys: 2
m_NumAlphaKeys: 2
colorLabel0: Color
@@ -4638,6 +4655,7 @@ ParticleSystem:
atime6: 0
atime7: 0
m_Mode: 0
m_ColorSpace: -1
m_NumColorKeys: 2
m_NumAlphaKeys: 2
minGradient:
@@ -4667,6 +4685,7 @@ ParticleSystem:
atime6: 0
atime7: 0
m_Mode: 0
m_ColorSpace: -1
m_NumColorKeys: 2
m_NumAlphaKeys: 2
colorLabel1: Color
@@ -4904,6 +4923,9 @@ ParticleSystemRenderer:
m_ReflectionProbeUsage: 0
m_RayTracingMode: 0
m_RayTraceProcedural: 0
m_RayTracingAccelStructBuildFlagsOverride: 0
m_RayTracingAccelStructBuildFlags: 1
m_SmallMeshCulling: 1
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
@@ -4942,13 +4964,15 @@ ParticleSystemRenderer:
m_RenderAlignment: 0
m_Pivot: {x: 0, y: 0, z: 0}
m_Flip: {x: 0, y: 0, z: 0}
m_UseCustomVertexStreams: 0
m_EnableGPUInstancing: 1
m_ApplyActiveColorSpace: 1
m_AllowRoll: 1
m_FreeformStretching: 0
m_RotateWithStretchDirection: 1
m_UseCustomVertexStreams: 0
m_VertexStreams: 00010304
m_UseCustomTrailVertexStreams: 0
m_TrailVertexStreams: 00010304
m_Mesh: {fileID: 0}
m_Mesh1: {fileID: 0}
m_Mesh2: {fileID: 0}
@@ -4985,13 +5009,13 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5179872230787962445}
serializedVersion: 2
m_LocalRotation: {x: 0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 133985509449862931}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!33 &5044254345943335312
MeshFilter:
@@ -5018,6 +5042,9 @@ MeshRenderer:
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:
@@ -5200,13 +5227,13 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5993705252689449099}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -1.545, y: -0.79, z: -0.466}
m_LocalScale: {x: 12.022677, y: 1.5007, z: 12.022673}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 5997087460151426325}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!33 &6007578435178584009
MeshFilter:
@@ -5233,6 +5260,9 @@ MeshRenderer:
m_ReflectionProbeUsage: 0
m_RayTracingMode: 2
m_RayTraceProcedural: 0
m_RayTracingAccelStructBuildFlagsOverride: 0
m_RayTracingAccelStructBuildFlags: 1
m_SmallMeshCulling: 1
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
@@ -5297,6 +5327,7 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5994168880033222965}
serializedVersion: 2
m_LocalRotation: {x: -0, y: 0.79832006, z: -0, w: 0.60223347}
m_LocalPosition: {x: 0.05104619, y: 0.3375754, z: -0.41696915}
m_LocalScale: {x: 0.2906873, y: 0.29068732, z: 0.2906873}
@@ -5304,7 +5335,6 @@ Transform:
m_Children:
- {fileID: 5997097253248375245}
m_Father: {fileID: 7215417275878502720}
m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &6435277130626004675
GameObject:
@@ -5329,13 +5359,13 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6435277130626004675}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 1.159, z: -0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 133985509449862931}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &6948106870602697656
GameObject:
@@ -5362,13 +5392,13 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6948106870602697656}
serializedVersion: 2
m_LocalRotation: {x: 0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 133985509449862931}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!33 &7006592268976361129
MeshFilter:
@@ -5395,6 +5425,9 @@ MeshRenderer:
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:
@@ -5445,13 +5478,13 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8930810447781783052}
serializedVersion: 2
m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068}
m_LocalPosition: {x: 0, y: 2.436, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 7215417275878502720}
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0}
--- !u!108 &5640045627463641439
Light:
@@ -5461,9 +5494,8 @@ Light:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8930810447781783052}
m_Enabled: 1
serializedVersion: 10
serializedVersion: 11
m_Type: 0
m_Shape: 0
m_Color: {r: 0.8679245, g: 0.118725546, b: 0.7113758, a: 1}
m_Intensity: 3.94
m_Range: 4.46
@@ -5513,8 +5545,12 @@ Light:
m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0}
m_UseBoundingSphereOverride: 0
m_UseViewFrustumForShadowCasterCull: 1
m_ForceVisible: 0
m_ShadowRadius: 0
m_ShadowAngle: 0
m_LightUnit: 1
m_LuxAtDistance: 1
m_EnableSpotReflector: 1
--- !u!114 &511143275461232652
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -5527,19 +5563,23 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Version: 1
m_Version: 3
m_UsePipelineSettings: 1
m_AdditionalLightsShadowResolutionTier: 0
m_LightLayerMask: 1
m_RenderingLayers: 1
m_CustomShadowLayers: 0
m_ShadowLayerMask: 1
m_ShadowRenderingLayers: 1
m_LightCookieSize: {x: 1, y: 1}
m_LightCookieOffset: {x: 0, y: 0}
m_SoftShadowQuality: 1
--- !u!1001 &71105098966632897
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 63918909, guid: 01a728c57efab194d9fc0f56fcad1ee0, type: 3}
@@ -5805,7 +5845,7 @@ PrefabInstance:
- target: {fileID: 7268478284679980811, guid: 01a728c57efab194d9fc0f56fcad1ee0,
type: 3}
propertyPath: m_Text
value: ' Purple Cornflower'
value: Kingsyarrow
objectReference: {fileID: 0}
- target: {fileID: 7268478284679980811, guid: 01a728c57efab194d9fc0f56fcad1ee0,
type: 3}
@@ -5859,6 +5899,29 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents:
- {fileID: 4289954311539212669, guid: 01a728c57efab194d9fc0f56fcad1ee0, type: 3}
m_RemovedGameObjects: []
m_AddedGameObjects:
- targetCorrespondingSourceObject: {fileID: 7268478284668893313, guid: 01a728c57efab194d9fc0f56fcad1ee0,
type: 3}
insertIndex: -1
addedObject: {fileID: 133985509449862931}
- targetCorrespondingSourceObject: {fileID: 7268478284668893313, guid: 01a728c57efab194d9fc0f56fcad1ee0,
type: 3}
insertIndex: -1
addedObject: {fileID: 3776421531069379522}
- targetCorrespondingSourceObject: {fileID: 7268478284668893313, guid: 01a728c57efab194d9fc0f56fcad1ee0,
type: 3}
insertIndex: -1
addedObject: {fileID: 7019251980953234364}
- targetCorrespondingSourceObject: {fileID: 7268478284668893313, guid: 01a728c57efab194d9fc0f56fcad1ee0,
type: 3}
insertIndex: -1
addedObject: {fileID: 5997087460151426325}
m_AddedComponents:
- targetCorrespondingSourceObject: {fileID: 5370236875489733667, guid: 01a728c57efab194d9fc0f56fcad1ee0,
type: 3}
insertIndex: -1
addedObject: {fileID: 5752720053066459169}
m_SourcePrefab: {fileID: 100100000, guid: 01a728c57efab194d9fc0f56fcad1ee0, type: 3}
--- !u!114 &4551726417661791919 stripped
MonoBehaviour:

1774
Assets/Scenes/Land_01/Land_Of_Death_Demo.unity
View File

File diff suppressed because it is too large Load Diff