Fixes an issue causing in-game date and time to not update when loading an existing saved game

fix
Jonathan Miller 4 years ago
parent a8ca3fe39d
commit d55df21e82

@ -340,8 +340,8 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: m_Children:
- {fileID: 1624835593}
- {fileID: 763930719} - {fileID: 763930719}
- {fileID: 1624835593}
m_Father: {fileID: 426045439} m_Father: {fileID: 426045439}
m_RootOrder: 0 m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -1036,7 +1036,7 @@ Transform:
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: [] m_Children: []
m_Father: {fileID: 225795624} m_Father: {fileID: 225795624}
m_RootOrder: 1 m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &50938466 --- !u!114 &50938466
MonoBehaviour: MonoBehaviour:
@ -2402,6 +2402,43 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 144756343} m_GameObject: {fileID: 144756343}
m_CullTransparentMesh: 0 m_CullTransparentMesh: 0
--- !u!84 &150461754
RenderTexture:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_ImageContentsHash:
serializedVersion: 2
Hash: 00000000000000000000000000000000
m_ForcedFallbackFormat: 4
m_DownscaleFallback: 0
m_IsAlphaChannelOptional: 0
serializedVersion: 5
m_Width: 2048
m_Height: 2048
m_AntiAliasing: 1
m_MipCount: -1
m_DepthStencilFormat: 0
m_ColorFormat: 8
m_MipMap: 0
m_GenerateMips: 1
m_SRGB: 0
m_UseDynamicScale: 0
m_BindMS: 0
m_EnableCompatibleFormat: 1
m_TextureSettings:
serializedVersion: 2
m_FilterMode: 1
m_Aniso: 1
m_MipBias: 0
m_WrapU: 0
m_WrapV: 0
m_WrapW: 0
m_Dimension: 2
m_VolumeDepth: 1
m_ShadowSamplingMode: 2
--- !u!1 &152691451 --- !u!1 &152691451
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -4053,12 +4090,11 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: m_Children:
- {fileID: 2146755576}
- {fileID: 805514563} - {fileID: 805514563}
- {fileID: 50938465} - {fileID: 50938465}
- {fileID: 2146755576}
- {fileID: 760202425} - {fileID: 760202425}
- {fileID: 1344094592} - {fileID: 2066939326}
- {fileID: 1047116816}
m_Father: {fileID: 1736888501} m_Father: {fileID: 1736888501}
m_RootOrder: 1 m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -4353,7 +4389,6 @@ MonoBehaviour:
CameraManager: {fileID: 246307071} CameraManager: {fileID: 246307071}
InventoryManager: {fileID: 1479906068440689338} InventoryManager: {fileID: 1479906068440689338}
Selector: {fileID: 246307075} Selector: {fileID: 246307075}
loader: {fileID: 0}
CommandConsole: {fileID: 246307076} CommandConsole: {fileID: 246307076}
--- !u!81 &246307073 --- !u!81 &246307073
AudioListener: AudioListener:
@ -4465,49 +4500,6 @@ MonoBehaviour:
CurrentArea: CurrentArea:
CurrentLocale: CurrentLocale:
CurrentRegion: CurrentRegion:
--- !u!114 &248751025
MonoBehaviour:
m_ObjectHideFlags: 0
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: 8334a49e76cafef4da22976db1613959, type: 3}
m_Name: Default Aura Quality Settings
m_EditorClassIdentifier:
displayVolumetricLightingBuffer: 0
frustumGridResolution: {x: 160, y: 88, z: 128}
enableAutomaticStereoResizing: 1
farClipPlaneDistance: 128
depthBiasCoefficient: 0.35
enableVolumes: 1
enableVolumesTexture2DMask: 1
enableVolumesTexture3DMask: 1
enableVolumesNoiseMask: 1
enableAmbientLighting: 1
enableDirectionalLights: 1
enableDirectionalLightsShadows: 1
enableSpotLights: 1
enableSpotLightsShadows: 1
enablePointLights: 1
enablePointLightsShadows: 1
enableLightsCookies: 1
enableDithering: 1
texture3DFiltering: 1
EXPERIMENTAL_enableDenoisingFilter: 0
EXPERIMENTAL_denoisingFilterRange: 0
EXPERIMENTAL_enableBlurFilter: 0
EXPERIMENTAL_blurFilterRange: 0
EXPERIMENTAL_blurFilterType: 0
EXPERIMENTAL_blurFilterGaussianDeviation: 0.0025
enableTemporalReprojection: 1
temporalReprojectionFactor: 0.95
enableOcclusionCulling: 1
debugOcclusionCulling: 0
occlusionCullingAccuracy: 0
enableLightProbes: 0
--- !u!1 &256163722 --- !u!1 &256163722
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -4727,7 +4719,7 @@ MonoBehaviour:
- {fileID: 813997369} - {fileID: 813997369}
- {fileID: 1473146349} - {fileID: 1473146349}
PutAwayTechnique: {fileID: 813997369} PutAwayTechnique: {fileID: 813997369}
EquipmentManager: {fileID: 1479906068440689336} EquipmentManager: {fileID: 0}
Actor: {fileID: 0} Actor: {fileID: 0}
PhysicalMaterial: 6 PhysicalMaterial: 6
OnHit: OnHit:
@ -5452,43 +5444,6 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 319264438} m_GameObject: {fileID: 319264438}
m_CullTransparentMesh: 0 m_CullTransparentMesh: 0
--- !u!84 &327241818
RenderTexture:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_ImageContentsHash:
serializedVersion: 2
Hash: 00000000000000000000000000000000
m_ForcedFallbackFormat: 4
m_DownscaleFallback: 0
m_IsAlphaChannelOptional: 0
serializedVersion: 5
m_Width: 2048
m_Height: 2048
m_AntiAliasing: 1
m_MipCount: -1
m_DepthStencilFormat: 0
m_ColorFormat: 8
m_MipMap: 0
m_GenerateMips: 1
m_SRGB: 0
m_UseDynamicScale: 0
m_BindMS: 0
m_EnableCompatibleFormat: 1
m_TextureSettings:
serializedVersion: 2
m_FilterMode: 1
m_Aniso: 1
m_MipBias: 0
m_WrapU: 0
m_WrapV: 0
m_WrapW: 0
m_Dimension: 2
m_VolumeDepth: 1
m_ShadowSamplingMode: 2
--- !u!1 &327885261 --- !u!1 &327885261
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -6423,6 +6378,37 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 380113132} m_GameObject: {fileID: 380113132}
m_CullTransparentMesh: 0 m_CullTransparentMesh: 0
--- !u!1 &380355665
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 380355666}
m_Layer: 0
m_Name: Instances
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &380355666
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 380355665}
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: 426045439}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &382703002 --- !u!1 &382703002
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -6563,7 +6549,7 @@ MonoBehaviour:
Description: An old iron helmet with a full face cover. Description: An old iron helmet with a full face cover.
Effects: [] Effects: []
DroppableItem: {fileID: 1172523327} DroppableItem: {fileID: 1172523327}
InventoryManager: {fileID: 1479906068440689335} InventoryManager: {fileID: 0}
ReadMenuManager: {fileID: 0} ReadMenuManager: {fileID: 0}
Type: 2 Type: 2
EquipableType: 1 EquipableType: 1
@ -6644,7 +6630,7 @@ MonoBehaviour:
Description: A simple iron sword. Description: A simple iron sword.
Effects: [] Effects: []
DroppableItem: {fileID: 919132148481559242} DroppableItem: {fileID: 919132148481559242}
InventoryManager: {fileID: 1479906068440689335} InventoryManager: {fileID: 0}
ReadMenuManager: {fileID: 0} ReadMenuManager: {fileID: 0}
Type: 2 Type: 2
EquipableType: 1 EquipableType: 1
@ -6658,7 +6644,7 @@ MonoBehaviour:
UseStart: UseStart:
m_PersistentCalls: m_PersistentCalls:
m_Calls: m_Calls:
- m_Target: {fileID: 1479906068440689336} - m_Target: {fileID: 0}
m_TargetAssemblyTypeName: SiegeSong.CustomEquipmentManager, Assembly-CSharp m_TargetAssemblyTypeName: SiegeSong.CustomEquipmentManager, Assembly-CSharp
m_MethodName: AddEquipmentToSlots m_MethodName: AddEquipmentToSlots
m_Mode: 2 m_Mode: 2
@ -6673,7 +6659,7 @@ MonoBehaviour:
UseEnd: UseEnd:
m_PersistentCalls: m_PersistentCalls:
m_Calls: m_Calls:
- m_Target: {fileID: 1479906068440689336} - m_Target: {fileID: 0}
m_TargetAssemblyTypeName: SiegeSong.CustomEquipmentManager, Assembly-CSharp m_TargetAssemblyTypeName: SiegeSong.CustomEquipmentManager, Assembly-CSharp
m_MethodName: RemoveEquipmentFromSlots m_MethodName: RemoveEquipmentFromSlots
m_Mode: 2 m_Mode: 2
@ -6685,7 +6671,7 @@ MonoBehaviour:
m_StringArgument: m_StringArgument:
m_BoolArgument: 0 m_BoolArgument: 0
m_CallState: 2 m_CallState: 2
- m_Target: {fileID: 1479906068440689336} - m_Target: {fileID: 0}
m_TargetAssemblyTypeName: SiegeSong.CustomEquipmentManager, Assembly-CSharp m_TargetAssemblyTypeName: SiegeSong.CustomEquipmentManager, Assembly-CSharp
m_MethodName: RemoveEquipmentFromSlots m_MethodName: RemoveEquipmentFromSlots
m_Mode: 2 m_Mode: 2
@ -7375,6 +7361,7 @@ Transform:
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: m_Children:
- {fileID: 11280055} - {fileID: 11280055}
- {fileID: 380355666}
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 0 m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -7391,6 +7378,7 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
SpeciesDefinitionsContainer: {fileID: 763930718} SpeciesDefinitionsContainer: {fileID: 763930718}
ActorInstanceContainer: {fileID: 380355665}
CurrentPlayerInstanceID: CurrentPlayerInstanceID:
Instances: [] Instances: []
InstanceIDs: [] InstanceIDs: []
@ -8160,8 +8148,8 @@ MonoBehaviour:
FriendlyName: Downward Slash FriendlyName: Downward Slash
EquipSlots: 2 EquipSlots: 2
HitBoxes: HitBoxes:
- {fileID: 171480660} - {fileID: 0}
CharacterAnimator: {fileID: 3659534947324946862} CharacterAnimator: {fileID: 0}
OnUse: OnUse:
m_PersistentCalls: m_PersistentCalls:
m_Calls: [] m_Calls: []
@ -14643,7 +14631,7 @@ SkinnedMeshRenderer:
m_SkinnedMotionVectors: 1 m_SkinnedMotionVectors: 1
m_Mesh: {fileID: 1423337216127417539, guid: 237c7718788313b4dadf5806956945e2, type: 3} m_Mesh: {fileID: 1423337216127417539, guid: 237c7718788313b4dadf5806956945e2, type: 3}
m_Bones: m_Bones:
- {fileID: 2551130484558059431} - {fileID: 0}
- {fileID: 0} - {fileID: 0}
- {fileID: 0} - {fileID: 0}
- {fileID: 0} - {fileID: 0}
@ -14742,7 +14730,7 @@ SkinnedMeshRenderer:
- {fileID: 0} - {fileID: 0}
- {fileID: 0} - {fileID: 0}
m_BlendShapeWeights: [] m_BlendShapeWeights: []
m_RootBone: {fileID: 3659534947324655101} m_RootBone: {fileID: 0}
m_AABB: m_AABB:
m_Center: {x: 0.1858912, y: -0.2235601, z: -0.36934292} m_Center: {x: 0.1858912, y: -0.2235601, z: -0.36934292}
m_Extent: {x: 0.02240868, y: 0.504559, z: 0.5698551} m_Extent: {x: 0.02240868, y: 0.504559, z: 0.5698551}
@ -20502,43 +20490,6 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 625967589} m_GameObject: {fileID: 625967589}
m_CullTransparentMesh: 0 m_CullTransparentMesh: 0
--- !u!84 &627146785
RenderTexture:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_ImageContentsHash:
serializedVersion: 2
Hash: 00000000000000000000000000000000
m_ForcedFallbackFormat: 4
m_DownscaleFallback: 0
m_IsAlphaChannelOptional: 0
serializedVersion: 5
m_Width: 512
m_Height: 512
m_AntiAliasing: 1
m_MipCount: -1
m_DepthStencilFormat: 0
m_ColorFormat: 48
m_MipMap: 0
m_GenerateMips: 1
m_SRGB: 0
m_UseDynamicScale: 0
m_BindMS: 0
m_EnableCompatibleFormat: 1
m_TextureSettings:
serializedVersion: 2
m_FilterMode: 1
m_Aniso: 1
m_MipBias: 0
m_WrapU: 0
m_WrapV: 0
m_WrapW: 0
m_Dimension: 2
m_VolumeDepth: 1
m_ShadowSamplingMode: 2
--- !u!1 &628599323 --- !u!1 &628599323
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -25396,7 +25347,7 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
frustumSettings: frustumSettings:
baseSettings: {fileID: 1435039246} baseSettings: {fileID: 0}
qualitySettings: {fileID: 0} qualitySettings: {fileID: 0}
--- !u!20 &653442161 --- !u!20 &653442161
Camera: Camera:
@ -26263,7 +26214,7 @@ MonoBehaviour:
Description: Description:
Effects: [] Effects: []
DroppableItem: {fileID: 0} DroppableItem: {fileID: 0}
InventoryManager: {fileID: 1479906068440689335} InventoryManager: {fileID: 0}
ReadMenuManager: {fileID: 0} ReadMenuManager: {fileID: 0}
Type: 2 Type: 2
EquipableType: 0 EquipableType: 0
@ -26508,7 +26459,7 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
frustumSettings: frustumSettings:
baseSettings: {fileID: 1974794646} baseSettings: {fileID: 0}
qualitySettings: {fileID: 0} qualitySettings: {fileID: 0}
--- !u!20 &703952208 --- !u!20 &703952208
Camera: Camera:
@ -49937,7 +49888,7 @@ Transform:
m_Children: m_Children:
- {fileID: 3659534947324654861} - {fileID: 3659534947324654861}
m_Father: {fileID: 11280055} m_Father: {fileID: 11280055}
m_RootOrder: 1 m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &763992464 --- !u!1 &763992464
GameObject: GameObject:
@ -50738,7 +50689,7 @@ Transform:
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: [] m_Children: []
m_Father: {fileID: 225795624} m_Father: {fileID: 225795624}
m_RootOrder: 0 m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &805514564 --- !u!114 &805514564
MonoBehaviour: MonoBehaviour:
@ -51003,14 +50954,14 @@ MonoBehaviour:
m_MethodName: Activate m_MethodName: Activate
m_Mode: 2 m_Mode: 2
m_Arguments: m_Arguments:
m_ObjectArgument: {fileID: 1479906068440689338} m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: SiegeSong.InventoryManager, Assembly-CSharp m_ObjectArgumentAssemblyTypeName: SiegeSong.InventoryManager, Assembly-CSharp
m_IntArgument: 0 m_IntArgument: 0
m_FloatArgument: 0 m_FloatArgument: 0
m_StringArgument: m_StringArgument:
m_BoolArgument: 0 m_BoolArgument: 0
m_CallState: 2 m_CallState: 2
InventoryManager: {fileID: 1479906068440689338} InventoryManager: {fileID: 0}
Container: {fileID: 0} Container: {fileID: 0}
--- !u!136 &807639818 --- !u!136 &807639818
CapsuleCollider: CapsuleCollider:
@ -51368,7 +51319,7 @@ MonoBehaviour:
FriendlyName: Sheathe FriendlyName: Sheathe
EquipSlots: 2 EquipSlots: 2
HitBoxes: [] HitBoxes: []
CharacterAnimator: {fileID: 3659534947324946862} CharacterAnimator: {fileID: 0}
OnUse: OnUse:
m_PersistentCalls: m_PersistentCalls:
m_Calls: m_Calls:
@ -51384,7 +51335,7 @@ MonoBehaviour:
m_StringArgument: m_StringArgument:
m_BoolArgument: 1 m_BoolArgument: 1
m_CallState: 2 m_CallState: 2
- m_Target: {fileID: 4453293319134496385} - m_Target: {fileID: 0}
m_TargetAssemblyTypeName: Weapon, Assembly-CSharp m_TargetAssemblyTypeName: Weapon, Assembly-CSharp
m_MethodName: ToggleEnabled m_MethodName: ToggleEnabled
m_Mode: 6 m_Mode: 6
@ -51794,18 +51745,6 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 823232533} m_GameObject: {fileID: 823232533}
m_CullTransparentMesh: 1 m_CullTransparentMesh: 1
--- !u!134 &826634148
PhysicMaterial:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Flesh (Instance)
dynamicFriction: 0.1
staticFriction: 0.1
bounciness: 0.1
frictionCombine: 2
bounceCombine: 1
--- !u!1 &829178569 stripped --- !u!1 &829178569 stripped
GameObject: GameObject:
m_CorrespondingSourceObject: {fileID: 7017359880257786997, guid: 3efd5121f5b72b64e945acfccea41f4b, type: 3} m_CorrespondingSourceObject: {fileID: 7017359880257786997, guid: 3efd5121f5b72b64e945acfccea41f4b, type: 3}
@ -53876,14 +53815,14 @@ Transform:
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 987703138} m_GameObject: {fileID: 987703138}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: m_Children:
- {fileID: 1947751786} - {fileID: 1947751786}
m_Father: {fileID: 0} m_Father: {fileID: 2066939326}
m_RootOrder: 2 m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &987703142 --- !u!114 &987703142
MonoBehaviour: MonoBehaviour:
@ -54653,8 +54592,8 @@ Transform:
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: m_Children:
- {fileID: 41890088} - {fileID: 41890088}
m_Father: {fileID: 225795624} m_Father: {fileID: 2066939326}
m_RootOrder: 5 m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1047116817 --- !u!114 &1047116817
MonoBehaviour: MonoBehaviour:
@ -54853,6 +54792,43 @@ RectTransform:
m_AnchoredPosition: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 100, y: 100} m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!84 &1058805786
RenderTexture:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_ImageContentsHash:
serializedVersion: 2
Hash: 00000000000000000000000000000000
m_ForcedFallbackFormat: 4
m_DownscaleFallback: 0
m_IsAlphaChannelOptional: 0
serializedVersion: 5
m_Width: 512
m_Height: 512
m_AntiAliasing: 1
m_MipCount: -1
m_DepthStencilFormat: 0
m_ColorFormat: 48
m_MipMap: 0
m_GenerateMips: 1
m_SRGB: 0
m_UseDynamicScale: 0
m_BindMS: 0
m_EnableCompatibleFormat: 1
m_TextureSettings:
serializedVersion: 2
m_FilterMode: 1
m_Aniso: 1
m_MipBias: 0
m_WrapU: 0
m_WrapV: 0
m_WrapW: 0
m_Dimension: 2
m_VolumeDepth: 1
m_ShadowSamplingMode: 2
--- !u!1 &1058956125 --- !u!1 &1058956125
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -55285,7 +55261,7 @@ MonoBehaviour:
Techniques: Techniques:
- {fileID: 1210908335} - {fileID: 1210908335}
PutAwayTechnique: {fileID: 0} PutAwayTechnique: {fileID: 0}
EquipmentManager: {fileID: 1479906068440689336} EquipmentManager: {fileID: 0}
Actor: {fileID: 0} Actor: {fileID: 0}
PhysicalMaterial: 6 PhysicalMaterial: 6
OnHit: OnHit:
@ -62477,14 +62453,14 @@ MonoBehaviour:
m_MethodName: Activate m_MethodName: Activate
m_Mode: 2 m_Mode: 2
m_Arguments: m_Arguments:
m_ObjectArgument: {fileID: 1479906068440689338} m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: SiegeSong.InventoryManager, Assembly-CSharp m_ObjectArgumentAssemblyTypeName: SiegeSong.InventoryManager, Assembly-CSharp
m_IntArgument: 0 m_IntArgument: 0
m_FloatArgument: 0 m_FloatArgument: 0
m_StringArgument: m_StringArgument:
m_BoolArgument: 0 m_BoolArgument: 0
m_CallState: 2 m_CallState: 2
InventoryManager: {fileID: 1479906068440689338} InventoryManager: {fileID: 0}
Container: {fileID: 0} Container: {fileID: 0}
--- !u!136 &1172523334 --- !u!136 &1172523334
CapsuleCollider: CapsuleCollider:
@ -63670,11 +63646,11 @@ MonoBehaviour:
FriendlyName: Unsheathe FriendlyName: Unsheathe
EquipSlots: 2 EquipSlots: 2
HitBoxes: [] HitBoxes: []
CharacterAnimator: {fileID: 3659534947324946862} CharacterAnimator: {fileID: 0}
OnUse: OnUse:
m_PersistentCalls: m_PersistentCalls:
m_Calls: m_Calls:
- m_Target: {fileID: 4453293319134496385} - m_Target: {fileID: 0}
m_TargetAssemblyTypeName: Weapon, Assembly-CSharp m_TargetAssemblyTypeName: Weapon, Assembly-CSharp
m_MethodName: ToggleEnabled m_MethodName: ToggleEnabled
m_Mode: 6 m_Mode: 6
@ -64633,14 +64609,14 @@ MonoBehaviour:
m_MethodName: Activate m_MethodName: Activate
m_Mode: 2 m_Mode: 2
m_Arguments: m_Arguments:
m_ObjectArgument: {fileID: 1479906068440689338} m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: SiegeSong.InventoryManager, Assembly-CSharp m_ObjectArgumentAssemblyTypeName: SiegeSong.InventoryManager, Assembly-CSharp
m_IntArgument: 0 m_IntArgument: 0
m_FloatArgument: 0 m_FloatArgument: 0
m_StringArgument: m_StringArgument:
m_BoolArgument: 0 m_BoolArgument: 0
m_CallState: 2 m_CallState: 2
InventoryManager: {fileID: 1479906068440689338} InventoryManager: {fileID: 0}
Container: {fileID: 0} Container: {fileID: 0}
--- !u!136 &1248072511 --- !u!136 &1248072511
CapsuleCollider: CapsuleCollider:
@ -66474,50 +66450,6 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1343021523} m_GameObject: {fileID: 1343021523}
m_CullTransparentMesh: 1 m_CullTransparentMesh: 1
--- !u!1 &1344094591
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1344094592}
- component: {fileID: 1344094593}
m_Layer: 0
m_Name: Gaia Water
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &1344094592
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1344094591}
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: 225795624}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1344094593
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1344094591}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 9aa5b69fd603c4c449abee1322720797, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &1344846279 --- !u!1 &1344846279
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -66882,32 +66814,6 @@ RectTransform:
m_AnchoredPosition: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: -20, y: -20} m_SizeDelta: {x: -20, y: -20}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1369033831
MonoBehaviour:
m_ObjectHideFlags: 0
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: 59306422a2ca4454aabce3daa79c3334, type: 3}
m_Name: New Aura Base Settings
m_EditorClassIdentifier:
useDensity: 1
density: 0.025
useScattering: 1
scattering: 0.75
useAmbientLighting: 1
ambientLightingStrength: 1
useColor: 0
color: {r: 0, g: 0.5, b: 0.5, a: 0.5}
colorStrength: 1
useTint: 0
tint: {r: 1, g: 0.92156863, b: 0.015686275, a: 1}
tintStrength: 1
useExtinction: 0
extinction: 0.75
--- !u!1 &1373113406 --- !u!1 &1373113406
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -67696,32 +67602,6 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1430325323} m_GameObject: {fileID: 1430325323}
m_CullTransparentMesh: 1 m_CullTransparentMesh: 1
--- !u!114 &1435039246
MonoBehaviour:
m_ObjectHideFlags: 0
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: 59306422a2ca4454aabce3daa79c3334, type: 3}
m_Name: New Aura Base Settings
m_EditorClassIdentifier:
useDensity: 1
density: 0.025
useScattering: 1
scattering: 0.75
useAmbientLighting: 1
ambientLightingStrength: 1
useColor: 0
color: {r: 0, g: 0.5, b: 0.5, a: 0.5}
colorStrength: 1
useTint: 0
tint: {r: 1, g: 0.92156863, b: 0.015686275, a: 1}
tintStrength: 1
useExtinction: 0
extinction: 0.75
--- !u!1 &1436477699 --- !u!1 &1436477699
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -68189,8 +68069,8 @@ MonoBehaviour:
FriendlyName: Forehand Slash FriendlyName: Forehand Slash
EquipSlots: 2 EquipSlots: 2
HitBoxes: HitBoxes:
- {fileID: 171480660} - {fileID: 0}
CharacterAnimator: {fileID: 3659534947324946862} CharacterAnimator: {fileID: 0}
OnUse: OnUse:
m_PersistentCalls: m_PersistentCalls:
m_Calls: [] m_Calls: []
@ -69821,8 +69701,8 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
frustumSettings: frustumSettings:
baseSettings: {fileID: 1887390550} baseSettings: {fileID: 0}
qualitySettings: {fileID: 248751025} qualitySettings: {fileID: 0}
--- !u!20 &1573881494 --- !u!20 &1573881494
Camera: Camera:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -70599,7 +70479,7 @@ Transform:
- {fileID: 696208005} - {fileID: 696208005}
- {fileID: 387452624} - {fileID: 387452624}
m_Father: {fileID: 11280055} m_Father: {fileID: 11280055}
m_RootOrder: 0 m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1628670853 --- !u!1 &1628670853
GameObject: GameObject:
@ -71421,7 +71301,7 @@ MonoBehaviour:
Description: A worn pair of pants made out of sack cloth. Description: A worn pair of pants made out of sack cloth.
Effects: [] Effects: []
DroppableItem: {fileID: 1248072504} DroppableItem: {fileID: 1248072504}
InventoryManager: {fileID: 1479906068440689335} InventoryManager: {fileID: 0}
ReadMenuManager: {fileID: 0} ReadMenuManager: {fileID: 0}
Type: 2 Type: 2
EquipableType: 1 EquipableType: 1
@ -74588,8 +74468,8 @@ Transform:
- {fileID: 1001017413} - {fileID: 1001017413}
- {fileID: 595332582} - {fileID: 595332582}
- {fileID: 510499962} - {fileID: 510499962}
m_Father: {fileID: 0} m_Father: {fileID: 2066939326}
m_RootOrder: 3 m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1859961611 --- !u!1 &1859961611
GameObject: GameObject:
@ -74921,32 +74801,6 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1887349623} m_GameObject: {fileID: 1887349623}
m_CullTransparentMesh: 0 m_CullTransparentMesh: 0
--- !u!114 &1887390550
MonoBehaviour:
m_ObjectHideFlags: 0
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: 59306422a2ca4454aabce3daa79c3334, type: 3}
m_Name: New Aura Base Settings
m_EditorClassIdentifier:
useDensity: 1
density: 0.025
useScattering: 1
scattering: 0.75
useAmbientLighting: 0
ambientLightingStrength: 1
useColor: 0
color: {r: 0, g: 0.5, b: 0.5, a: 0.5}
colorStrength: 1
useTint: 0
tint: {r: 1, g: 0.92156863, b: 0.015686275, a: 1}
tintStrength: 1
useExtinction: 0
extinction: 0.75
--- !u!1 &1887425689 --- !u!1 &1887425689
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -75152,7 +75006,7 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
frustumSettings: frustumSettings:
baseSettings: {fileID: 1369033831} baseSettings: {fileID: 0}
qualitySettings: {fileID: 0} qualitySettings: {fileID: 0}
--- !u!20 &1896741966 --- !u!20 &1896741966
Camera: Camera:
@ -75968,8 +75822,8 @@ MonoBehaviour:
m_EditorClassIdentifier: m_EditorClassIdentifier:
profile: {fileID: 11400000, guid: 94ffe4588b85ed542b2608df93952ec5, type: 2} profile: {fileID: 11400000, guid: 94ffe4588b85ed542b2608df93952ec5, type: 2}
profileLoaded: 1 profileLoaded: 1
Player: {fileID: 3659534947324946797} Player: {fileID: 0}
PlayerCamera: {fileID: 1573881494} PlayerCamera: {fileID: 0}
AssignInRuntime: 1 AssignInRuntime: 1
PlayerTag: Player PlayerTag: Player
CameraTag: MainCamera CameraTag: MainCamera
@ -78008,11 +77862,11 @@ MonoBehaviour:
LST: 634.01245 LST: 634.01245
lastHourUpdate: 12 lastHourUpdate: 12
hourTime: 0 hourTime: 0
cloudAnim: {x: 0.1, y: -0.94208217, z: 0.2055437} cloudAnim: {x: 0.1, y: -0.82772964, z: -0.6200652}
cloudFlatBaseAnim: {x: 0, y: -0.7074633} cloudFlatBaseAnim: {x: 0, y: -0.89609236}
cloudFlatDetailAnim: {x: 0, y: -0.82446134} cloudFlatDetailAnim: {x: 0, y: 0.42150342}
cloudAnimNonScaled: {x: 0, y: -4.7078557} cloudAnimNonScaled: {x: 0, y: -4.896507}
cirrusAnim: {x: 0, y: -0.008359559} cirrusAnim: {x: 0, y: -0.0888431}
windIntensity: 0.27499998 windIntensity: 0.27499998
shadowIntensityMod: 0 shadowIntensityMod: 0
interiorMode: 0 interiorMode: 0
@ -78160,9 +78014,9 @@ MonoBehaviour:
auroraIntensity: 0 auroraIntensity: 0
currentActiveCloudsQualityPreset: {fileID: 11400000, guid: a836f7605a4cd2b46977d5caf63945fc, type: 2} currentActiveCloudsQualityPreset: {fileID: 11400000, guid: a836f7605a4cd2b46977d5caf63945fc, type: 2}
cloudsRenderTarget: {fileID: 0} cloudsRenderTarget: {fileID: 0}
weatherMap: {fileID: 627146785} weatherMap: {fileID: 1058805786}
satRenderTarget: {fileID: 0} satRenderTarget: {fileID: 0}
cloudShadowMap: {fileID: 327241818} cloudShadowMap: {fileID: 150461754}
skyMat: {fileID: 1808374981} skyMat: {fileID: 1808374981}
skyReflectionMat: {fileID: 0} skyReflectionMat: {fileID: 0}
cloudsQualityList: cloudsQualityList:
@ -83281,32 +83135,6 @@ RectTransform:
m_AnchoredPosition: {x: 75, y: 0} m_AnchoredPosition: {x: 75, y: 0}
m_SizeDelta: {x: 315, y: 0} m_SizeDelta: {x: 315, y: 0}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1974794646
MonoBehaviour:
m_ObjectHideFlags: 0
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: 59306422a2ca4454aabce3daa79c3334, type: 3}
m_Name: New Aura Base Settings
m_EditorClassIdentifier:
useDensity: 1
density: 0.025
useScattering: 1
scattering: 0.75
useAmbientLighting: 0
ambientLightingStrength: 1
useColor: 0
color: {r: 0, g: 0.5, b: 0.5, a: 0.5}
colorStrength: 1
useTint: 0
tint: {r: 1, g: 0.92156863, b: 0.015686275, a: 1}
tintStrength: 1
useExtinction: 0
extinction: 0.75
--- !u!1001 &1975642196 --- !u!1001 &1975642196
PrefabInstance: PrefabInstance:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -83849,7 +83677,7 @@ MonoBehaviour:
Description: A bolted-together iron curiass. Description: A bolted-together iron curiass.
Effects: [] Effects: []
DroppableItem: {fileID: 807639811} DroppableItem: {fileID: 807639811}
InventoryManager: {fileID: 1479906068440689335} InventoryManager: {fileID: 0}
ReadMenuManager: {fileID: 0} ReadMenuManager: {fileID: 0}
Type: 2 Type: 2
EquipableType: 1 EquipableType: 1
@ -84678,6 +84506,40 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2062460152} m_GameObject: {fileID: 2062460152}
m_CullTransparentMesh: 0 m_CullTransparentMesh: 0
--- !u!1 &2066939325
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2066939326}
m_Layer: 0
m_Name: Weather
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &2066939326
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2066939325}
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:
- {fileID: 987703141}
- {fileID: 1852464751}
- {fileID: 1047116816}
m_Father: {fileID: 225795624}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &2068330368 --- !u!1 &2068330368
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -86102,7 +85964,7 @@ GameObject:
- component: {fileID: 2146755576} - component: {fileID: 2146755576}
- component: {fileID: 2146755577} - component: {fileID: 2146755577}
m_Layer: 0 m_Layer: 0
m_Name: Gaia Player m_Name: Player Tracker
m_TagString: Untagged m_TagString: Untagged
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
@ -86121,7 +85983,7 @@ Transform:
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: [] m_Children: []
m_Father: {fileID: 225795624} m_Father: {fileID: 225795624}
m_RootOrder: 2 m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &2146755577 --- !u!114 &2146755577
MonoBehaviour: MonoBehaviour:
@ -87661,14 +87523,14 @@ MonoBehaviour:
m_MethodName: Activate m_MethodName: Activate
m_Mode: 2 m_Mode: 2
m_Arguments: m_Arguments:
m_ObjectArgument: {fileID: 1479906068440689338} m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: SiegeSong.InventoryManager, Assembly-CSharp m_ObjectArgumentAssemblyTypeName: SiegeSong.InventoryManager, Assembly-CSharp
m_IntArgument: 0 m_IntArgument: 0
m_FloatArgument: 0 m_FloatArgument: 0
m_StringArgument: m_StringArgument:
m_BoolArgument: 0 m_BoolArgument: 0
m_CallState: 2 m_CallState: 2
InventoryManager: {fileID: 1479906068440689338} InventoryManager: {fileID: 0}
Container: {fileID: 0} Container: {fileID: 0}
--- !u!136 &3469287838264975319 --- !u!136 &3469287838264975319
CapsuleCollider: CapsuleCollider:
@ -93134,7 +92996,7 @@ CapsuleCollider:
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3659534947324946797} m_GameObject: {fileID: 3659534947324946797}
m_Material: {fileID: 826634148} m_Material: {fileID: 0}
m_IsTrigger: 0 m_IsTrigger: 0
m_Enabled: 1 m_Enabled: 1
m_Radius: 0.25 m_Radius: 0.25
@ -93581,7 +93443,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 190f7b08d83ecf040a47a0243df89462, type: 3} m_Script: {fileID: 11500000, guid: 190f7b08d83ecf040a47a0243df89462, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
ActorLoader: {fileID: 0}
Stats: Stats:
ID: 0 ID: 0
InstanceID: InstanceID:

@ -10,8 +10,6 @@ namespace SiegeSong
{ {
public class StatisticsManager : MonoBehaviour public class StatisticsManager : MonoBehaviour
{ {
public ActorLoader ActorLoader;
public Statistics Stats; public Statistics Stats;
public InventoryManager Inventory; public InventoryManager Inventory;

@ -190,14 +190,14 @@ namespace SiegeSong
void SpawnActor(string instaceID, int? instanceCount = 1) void SpawnActor(string instaceID, int? instanceCount = 1)
{ {
var actor = InstanceManager.GetInstanceByID(instaceID).GetComponent<StatisticsManager>(); var actor = InstanceManager.GetInstanceByID(instaceID).GetComponent<StatisticsManager>();
for(var i = 0; i < instanceCount; i++) //for(var i = 0; i < instanceCount; i++)
actor.ActorLoader.LoadActor(); // actor.ActorLoader.LoadActor();
} }
void RespawnActor(string instaceID) void RespawnActor(string instaceID)
{ {
var actor = InstanceManager.GetInstanceByID(instaceID).GetComponent<StatisticsManager>(); var actor = InstanceManager.GetInstanceByID(instaceID).GetComponent<StatisticsManager>();
actor.ActorLoader.LoadActor(true); //actor.ActorLoader.LoadActor(true);
} }
void DespawnActor(string instaceID) void DespawnActor(string instaceID)

@ -15,7 +15,6 @@ namespace SiegeSong
public InventoryManager InventoryManager; public InventoryManager InventoryManager;
public Selector Selector; public Selector Selector;
public ActorLoader loader;
public CommandConsole CommandConsole; public CommandConsole CommandConsole;
public Dictionary<string, bool> HandleButtonInputOldState; public Dictionary<string, bool> HandleButtonInputOldState;

@ -230,6 +230,9 @@ namespace SiegeSong
void UpdateSaveLoadMetaDataTextDisplay() void UpdateSaveLoadMetaDataTextDisplay()
{ {
var selectedSavedGame = !(saveLoadSubmenuInSavingMode && subMenuSelectedIndex == 0) ? SavedGames[subMenuSelectedIndex - (saveLoadSubmenuInSavingMode ? 1 : 0)] : new MetaData(); var selectedSavedGame = !(saveLoadSubmenuInSavingMode && subMenuSelectedIndex == 0) ? SavedGames[subMenuSelectedIndex - (saveLoadSubmenuInSavingMode ? 1 : 0)] : new MetaData();
if (!saveLoadSubmenuInSavingMode)
SaveFileLoader.ActiveSaveFileLocation = $"{Application.persistentDataPath.Replace("/", "\\")}\\{SaveFileLoader.DirectoryName}\\{SavedGames[subMenuSelectedIndex].PlayerFullName.Replace(" ", "_")}_{SavedGames[subMenuSelectedIndex].FileNameSuffix}";
SaveLoadMetaDataTextDisplay.GetComponent<Text>().text = $"{selectedSavedGame.PlayerFullName}\n{selectedSavedGame.PlayerLevel}\n{selectedSavedGame.PlayerActiveQuestFriendlyName}\n{selectedSavedGame.InGameDate}\n{selectedSavedGame.LastPlayedOn}"; SaveLoadMetaDataTextDisplay.GetComponent<Text>().text = $"{selectedSavedGame.PlayerFullName}\n{selectedSavedGame.PlayerLevel}\n{selectedSavedGame.PlayerActiveQuestFriendlyName}\n{selectedSavedGame.InGameDate}\n{selectedSavedGame.LastPlayedOn}";
} }
@ -246,6 +249,7 @@ namespace SiegeSong
void ResumeGame() void ResumeGame()
{ {
startMenu = false;
menuOpen = false; menuOpen = false;
saveLoadSubmenuOpen = false; saveLoadSubmenuOpen = false;
saveLoadSubmenuInSavingMode = false; saveLoadSubmenuInSavingMode = false;
@ -339,7 +343,6 @@ namespace SiegeSong
void ExitGame() void ExitGame()
{ {
startMenu = false;
if (startMenu) if (startMenu)
startMenu = false; startMenu = false;
else else

@ -108,6 +108,7 @@ namespace SiegeSong
i++; i++;
saveFileNameSuffix = i.ToString("D5"); saveFileNameSuffix = i.ToString("D5");
} }
ActiveSaveFileMeta.FileNameSuffix = saveFileNameSuffix;
ActiveSaveFileLocation = $"{Application.persistentDataPath}/{DirectoryName}/{ActiveSaveFileMeta.PlayerFullName.Replace(" ", "_")}_{saveFileNameSuffix}"; ActiveSaveFileLocation = $"{Application.persistentDataPath}/{DirectoryName}/{ActiveSaveFileMeta.PlayerFullName.Replace(" ", "_")}_{saveFileNameSuffix}";
ActiveSaveFileMeta.Title = $"{playerFriendlyFullName} - Save Game {i}"; ActiveSaveFileMeta.Title = $"{playerFriendlyFullName} - Save Game {i}";
System.IO.File.WriteAllText($"{ActiveSaveFileLocation.Replace("/", "\\")}.ssng", JsonUtility.ToJson(ActiveSaveFile)); System.IO.File.WriteAllText($"{ActiveSaveFileLocation.Replace("/", "\\")}.ssng", JsonUtility.ToJson(ActiveSaveFile));

@ -1,468 +0,0 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using Gaia;
using SiegeSong;
namespace SiegeSong
{
public class ActorLoader : MonoBehaviour
{
public string Input;
public GameObject Species;
public GameObject Instance;
public InstanceManager InstanceManager;
public Transform StartLocation;
public GameObject PlayerTracker;
public bool IsPlayer;
public int ActorID;
void Start()
{
if (Input.Length > 0)
LoadActor2();
}
void Update()
{
}
public void LoadActor2(bool despawnOldInstance = false)
{
var stats = JsonUtility.FromJson<Statistics>(Input);
if (Instance != null && despawnOldInstance)
GameObject.Destroy(Instance);
Instance = GameObject.Instantiate(Species);
Instance.transform.position = StartLocation.position;
if (Instance.GetComponent<StatisticsManager>() == null)
Instance.AddComponent<StatisticsManager>();
var actor = Instance.GetComponent<StatisticsManager>();
if (actor.Stats == null)
actor.Stats = new Statistics();
actor.Stats.ID = ActorID;
actor.ActorLoader = this;
if (!Instance.active)
Instance.active = true;
if (stats.IsPlayer)
{
for (var j = 0; j < Instance.transform.childCount; j++)
{
if (Instance.transform.GetChild(j).name == "PlayerAgent")
{
Instance.transform.GetChild(j).gameObject.active = true;
PlayerTracker.transform.parent = Instance.transform;
}
}
}
actor.Stats = stats;
Instance.transform.eulerAngles = new Vector3(stats.RotationX, stats.RotationY, stats.RotationZ);
Instance.transform.position = new Vector3(stats.LocationX, stats.LocationY, stats.LocationZ);
for (var i = 0; i < stats.InventoryItemIDs.Count; i++)
{
actor.Inventory.SelectedItemID = stats.InventoryItemIDs[i];
actor.Inventory.SelectedAmount = stats.InventoryItemQuantities[i];
actor.Inventory.AddItem();
actor.Inventory.SelectedItemID = 0;
actor.Inventory.SelectedAmount = 0;
actor.Inventory.SelectedItemIndex = 0;
}
foreach (var itemId in stats.ActiveInventoryItemIDs)
{
if (actor.Inventory.GetItemByID(itemId).GetComponent<Equipable>() != null)
actor.Inventory.EquipmentManager.AddEquipmentToSlots(actor.Inventory.GetItemByID(itemId));
}
actor.Inventory.ApparrelManager.CurrentlyActiveIDs = stats.ActiveInventoryItemIDs.ToArray();
actor.Inventory.ApparrelManager.UpdateApparrel();
actor.Stats.InstanceID = InstanceManager.GenerateInstanceID();
Instance.gameObject.name = $"{actor.Stats.FirstName} {actor.Stats.LastName}";
InstanceManager.AddInstance(actor.Stats.InstanceID, Instance);
if (stats.IsPlayer)
{
//InstanceManager.CurrentPlayerInstanceID = actor.Stats.InstanceID;
//InstanceManager.RuntimeManager.PlayerInstance = Instance;
//InstanceManager.RuntimeManager.PopulateReferences();
}
}
public void SaveActor2()
{
var stats = Instance.GetComponentInChildren<StatisticsManager>().Stats;
for (var j = 0; j < Instance.transform.childCount; j++)
{
if (Instance.transform.GetChild(j).name == "PlayerAgent" && Instance.transform.GetChild(j).gameObject.active)
stats.IsPlayer = true;
}
var statsString = JsonUtility.ToJson(stats);
Input = statsString;
}
public void SaveActor()
{
var actorDataString = "A-";
var value = "";
if (Instance.GetComponentInChildren<StatisticsManager>().Stats.SkillValueCategories == null)
Instance.GetComponentInChildren<StatisticsManager>().Stats.SkillValueCategories = new Dictionary<int, Dictionary<int, int>>();
if (Instance.GetComponentInChildren<StatisticsManager>().Stats.RespectForActor == null)
Instance.GetComponentInChildren<StatisticsManager>().Stats.RespectForActor = new Dictionary<int, int>();
if (Instance.GetComponentInChildren<StatisticsManager>().Stats.AdmirationForActor == null)
Instance.GetComponentInChildren<StatisticsManager>().Stats.AdmirationForActor = new Dictionary<int, int>();
if (Instance.GetComponentInChildren<StatisticsManager>().Stats.SuspicionOfActor == null)
Instance.GetComponentInChildren<StatisticsManager>().Stats.SuspicionOfActor = new Dictionary<int, int>();
if (Instance.GetComponentInChildren<StatisticsManager>().Stats.FactionRank == null)
Instance.GetComponentInChildren<StatisticsManager>().Stats.FactionRank = new Dictionary<int, int>();
if (Instance.GetComponentInChildren<StatisticsManager>().Stats.RegionalBounty == null)
Instance.GetComponentInChildren<StatisticsManager>().Stats.RegionalBounty = new Dictionary<int, int>();
if (Instance.GetComponentInChildren<StatisticsManager>().Stats.RegionalFame == null)
Instance.GetComponentInChildren<StatisticsManager>().Stats.RegionalFame = new Dictionary<int, int>();
if (Instance.GetComponentInChildren<BlendshapeLoader>().Blendshapes == null)
Instance.GetComponentInChildren<BlendshapeLoader>().Blendshapes = new Dictionary<string, float>();
if (Instance.GetComponentInChildren<InventoryManager>().Inventory.Contents == null)
Instance.GetComponentInChildren<InventoryManager>().Inventory.Contents = new Dictionary<int, int>();
foreach (var skillCategory in Instance.GetComponentInChildren<StatisticsManager>().Stats.SkillValueCategories.Keys)
{
if (Instance.GetComponentInChildren<StatisticsManager>().Stats.SkillValueCategories[skillCategory] == null)
Instance.GetComponentInChildren<StatisticsManager>().Stats.SkillValueCategories[skillCategory] = new Dictionary<int, int>();
foreach (var skill in Instance.GetComponentInChildren<StatisticsManager>().Stats.SkillValueCategories[skillCategory])
{
actorDataString += $"sc{skillCategory.ToString("00")}_{skill.Key.ToString("00")}_{skill.Value.ToString("00")}/";
}
}
foreach (var id in Instance.GetComponentInChildren<StatisticsManager>().Stats.RespectForActor.Keys)
{
actorDataString += $"ra{id}_{Instance.GetComponentInChildren<StatisticsManager>().Stats.RespectForActor[id]}/";
value = Instance.GetComponentInChildren<StatisticsManager>().Stats.RespectForActor[id] != null ? Instance.GetComponentInChildren<StatisticsManager>().Stats.RespectForActor[id].ToString() : "0";
actorDataString += $"ra{id}_{value}/";
}
foreach (var id in Instance.GetComponentInChildren<StatisticsManager>().Stats.AdmirationForActor.Keys)
{
value = Instance.GetComponentInChildren<StatisticsManager>().Stats.AdmirationForActor[id] != null ? Instance.GetComponentInChildren<StatisticsManager>().Stats.AdmirationForActor[id].ToString() : "0";
actorDataString += $"aa{id}_{value}/";
}
foreach (var id in Instance.GetComponentInChildren<StatisticsManager>().Stats.SuspicionOfActor.Keys)
{
actorDataString += $"sa{id}_{Instance.GetComponentInChildren<StatisticsManager>().Stats.SuspicionOfActor[id]}/";
value = Instance.GetComponentInChildren<StatisticsManager>().Stats.SuspicionOfActor[id] != null ? Instance.GetComponentInChildren<StatisticsManager>().Stats.SuspicionOfActor[id].ToString() : "0";
actorDataString += $"sa{id}_{value}/";
}
foreach (var id in Instance.GetComponentInChildren<StatisticsManager>().Stats.FactionRank.Keys)
{
actorDataString += $"fr{id}_{Instance.GetComponentInChildren<StatisticsManager>().Stats.FactionRank[id]}/";
value = Instance.GetComponentInChildren<StatisticsManager>().Stats.FactionRank[id] != null ? Instance.GetComponentInChildren<StatisticsManager>().Stats.FactionRank[id].ToString() : "0";
actorDataString += $"fr{id}_{value}/";
}
foreach (var id in Instance.GetComponentInChildren<StatisticsManager>().Stats.RegionalBounty.Keys)
{
actorDataString += $"rb{id}_{Instance.GetComponentInChildren<StatisticsManager>().Stats.RegionalBounty[id]}/";
value = Instance.GetComponentInChildren<StatisticsManager>().Stats.RegionalBounty[id] != null ? Instance.GetComponentInChildren<StatisticsManager>().Stats.RegionalBounty[id].ToString() : "0";
actorDataString += $"rb{id}_{value}/";
}
foreach (var id in Instance.GetComponentInChildren<StatisticsManager>().Stats.RegionalFame.Keys)
{
actorDataString += $"rf{id}_{Instance.GetComponentInChildren<StatisticsManager>().Stats.RegionalFame[id]}/";
value = Instance.GetComponentInChildren<StatisticsManager>().Stats.RegionalFame[id] != null ? Instance.GetComponentInChildren<StatisticsManager>().Stats.RegionalFame[id].ToString() : "0";
actorDataString += $"rf{id}_{value}/";
}
foreach (var blendshape in Instance.GetComponentInChildren<BlendshapeLoader>().Blendshapes.Keys)
{
actorDataString += $"bs{blendshape}_{Instance.GetComponentInChildren<BlendshapeLoader>().Blendshapes[blendshape]}/";
value = Instance.GetComponentInChildren<BlendshapeLoader>().Blendshapes[blendshape] != null ? Instance.GetComponentInChildren<BlendshapeLoader>().Blendshapes[blendshape].ToString() : "0";
actorDataString += $"bs{blendshape}_{value}/";
}
actorDataString += $"pl{IsPlayer}/";
actorDataString += $"lx{Instance.transform.position.x.ToString("00000")}/";
actorDataString += $"ly{Instance.transform.position.y.ToString("00000")}/";
actorDataString += $"lz{Instance.transform.position.z.ToString("00000")}/";
actorDataString += $"hs{Instance.GetComponentInChildren<BlendshapeLoader>().HairstyleID.ToString("00")}/";
actorDataString += $"fh{Instance.GetComponentInChildren<BlendshapeLoader>().FacialHairID.ToString("00")}/";
actorDataString += $"fd{Instance.GetComponentInChildren<BlendshapeLoader>().FacialDetailID.ToString("00")}/";
actorDataString += $"hr{Instance.GetComponentInChildren<BlendshapeLoader>().HairColorR.ToString("000")}/";
actorDataString += $"hg{Instance.GetComponentInChildren<BlendshapeLoader>().HairColorG.ToString("000")}/";
actorDataString += $"hb{Instance.GetComponentInChildren<BlendshapeLoader>().HairColorB.ToString("000")}/";
actorDataString += $"ha{Instance.GetComponentInChildren<BlendshapeLoader>().HairColorA.ToString("000")}/";
actorDataString += $"mm{Instance.GetComponentInChildren<StatisticsManager>().Stats.MaxMagic}/";
actorDataString += $"ms{Instance.GetComponentInChildren<StatisticsManager>().Stats.MaxStamina}/";
actorDataString += $"mh{Instance.GetComponentInChildren<StatisticsManager>().Stats.MaxHealth}/";
foreach (var item in Instance.GetComponentInChildren<StatisticsManager>().Inventory.Inventory.Contents)
{
if (item.Key != 0)
{
actorDataString += $"iid{item.Key.ToString("00")}";
//actorDataString += $"-ius{Instance.GetComponentInChildren<StatisticsManager>().Inventory.GetItemByID(item.Key).GetComponent<InventoryItem>().Using}";
actorDataString += $"-icn{Instance.GetComponentInChildren<StatisticsManager>().Inventory.GetItemByID(item.Key).GetComponent<InventoryItem>().PhysicalCondition.ToString("00")}";
actorDataString += $"-/";
}
}
Input = actorDataString;
}
public void LoadActor(bool despawnOldInstance = false)
{
if (IsPlayer)
{
PlayerTracker.transform.parent = null;
}
if (Instance != null && despawnOldInstance)
GameObject.Destroy(Instance);
Instance = GameObject.Instantiate(Species);
Instance.transform.position = StartLocation.position;
if (Instance.GetComponent<StatisticsManager>().Stats == null)
Instance.GetComponent<StatisticsManager>().Stats = new Statistics();
Instance.GetComponent<StatisticsManager>().Stats.ID = ActorID;
Instance.GetComponent<StatisticsManager>().ActorLoader = this;
if (!Instance.active)
Instance.active = true;
if (IsPlayer)
{
PlayerTracker.transform.parent = Instance.transform;
}
var parsedText = "";
var parseStartIndex = 2;
var id = -1;
var key = "";
var subId = 0;
var valueStartIndex = -1;
var integerValue = 0;
var floatValue = 0.0f;
var itemId = -1;
for (var i = parseStartIndex; i < Input.Length; i++)
{
if (Input[i] == '/')
{
parsedText = Input.Substring(parseStartIndex, i - parseStartIndex);
parseStartIndex = i + 1;
if (parsedText.Length > 2)
{
var parsedTextPrefix = parsedText.Substring(0, 2);
switch (parsedTextPrefix)
{
case "sc":
id = int.Parse(parsedText.Substring(2, 2));
subId = int.Parse(parsedText.Substring(5, 2));
integerValue = int.Parse(parsedText.Substring(8, 2));
if (Instance.GetComponent<StatisticsManager>().Stats.SkillValueCategories == null)
Instance.GetComponent<StatisticsManager>().Stats.SkillValueCategories = new Dictionary<int, Dictionary<int, int>>();
if (!Instance.GetComponent<StatisticsManager>().Stats.SkillValueCategories.ContainsKey(id))
Instance.GetComponent<StatisticsManager>().Stats.SkillValueCategories[id] = new Dictionary<int, int>();
if (!Instance.GetComponent<StatisticsManager>().Stats.SkillValueCategories[id].ContainsKey(subId))
Instance.GetComponent<StatisticsManager>().Stats.SkillValueCategories[id].Add(subId, integerValue);
else
Instance.GetComponent<StatisticsManager>().Stats.SkillValueCategories[id][subId] = integerValue;
break;
case "ra":
valueStartIndex = parsedText.Substring(3, 2).IndexOf('_');
id = int.Parse(parsedText.Substring(2, valueStartIndex));
integerValue = int.Parse(parsedText.Substring(valueStartIndex));
Instance.GetComponent<StatisticsManager>().Stats.RespectForActor[id] = integerValue;
break;
case "aa":
valueStartIndex = parsedText.Substring(2, 2).IndexOf('_');
id = int.Parse(parsedText.Substring(2, valueStartIndex));
integerValue = int.Parse(parsedText.Substring(valueStartIndex));
Instance.GetComponent<StatisticsManager>().Stats.AdmirationForActor[id] = integerValue;
break;
case "sa":
valueStartIndex = parsedText.Substring(2, 2).IndexOf('_');
id = int.Parse(parsedText.Substring(2, valueStartIndex));
integerValue = int.Parse(parsedText.Substring(valueStartIndex));
Instance.GetComponent<StatisticsManager>().Stats.SuspicionOfActor[id] = integerValue;
break;
case "fr":
valueStartIndex = parsedText.Substring(2, 2).IndexOf('_');
id = int.Parse(parsedText.Substring(2, valueStartIndex));
integerValue = int.Parse(parsedText.Substring(valueStartIndex));
Instance.GetComponent<StatisticsManager>().Stats.FactionRank[id] = integerValue;
break;
case "rb":
valueStartIndex = parsedText.Substring(2, 2).IndexOf('_');
id = int.Parse(parsedText.Substring(2, valueStartIndex));
integerValue = int.Parse(parsedText.Substring(valueStartIndex));
Instance.GetComponent<StatisticsManager>().Stats.RegionalBounty[id] = integerValue;
break;
case "rf":
valueStartIndex = parsedText.Substring(2, 2).IndexOf('_');
id = int.Parse(parsedText.Substring(2, valueStartIndex));
integerValue = int.Parse(parsedText.Substring(valueStartIndex));
Instance.GetComponent<StatisticsManager>().Stats.RegionalFame[id] = integerValue;
break;
case "bs":
valueStartIndex = parsedText.Substring(2, 2).IndexOf('_');
key = parsedText.Substring(2, valueStartIndex);
integerValue = int.Parse(parsedText.Substring(valueStartIndex));
Instance.GetComponent<BlendshapeLoader>().Blendshapes[key] = floatValue;
break;
case "pl":
IsPlayer = parsedText.Substring(2, 4) == "True";
for (var j = 0; j < Instance.transform.childCount; j++)
{
if (Instance.transform.GetChild(j).name == "PlayerAgent")
Instance.transform.GetChild(j).gameObject.active = IsPlayer;
}
break;
case "hs":
id = int.Parse(parsedText.Substring(2, 2));
Instance.GetComponent<BlendshapeLoader>().HairstyleID = id;
break;
case "fh":
id = int.Parse(parsedText.Substring(2, 2));
Instance.GetComponent<BlendshapeLoader>().FacialHairID = id;
break;
case "fd":
id = int.Parse(parsedText.Substring(2, 2));
Instance.GetComponent<BlendshapeLoader>().FacialDetailID = id;
break;
case "hr":
id = int.Parse(parsedText.Substring(2, 3));
Instance.GetComponent<BlendshapeLoader>().HairColorR = id;
break;
case "hg":
id = int.Parse(parsedText.Substring(2, 3));
Instance.GetComponent<BlendshapeLoader>().HairColorG = id;
break;
case "hb":
id = int.Parse(parsedText.Substring(2, 3));
Instance.GetComponent<BlendshapeLoader>().HairColorB = id;
break;
case "ha":
id = int.Parse(parsedText.Substring(2, 3));
Instance.GetComponent<BlendshapeLoader>().HairColorA = id;
break;
case "mm":
id = int.Parse(parsedText.Substring(2, 3));
Instance.GetComponent<StatisticsManager>().Stats.MaxMagic = id;
break;
case "nm":
Instance.GetComponent<StatisticsManager>().Stats.FirstName = parsedText.Substring(2).Contains("_") ? parsedText.Substring(2, parsedText.IndexOf("_") - 2) : parsedText.Substring(2);
if (parsedText.Substring(2).Contains("_"))
Instance.GetComponent<StatisticsManager>().Stats.LastName = parsedText.Substring(parsedText.IndexOf("_") + 1);
Instance.name = parsedText.Substring(2).Replace("_", " ");
break;
case "ms":
id = int.Parse(parsedText.Substring(2, 3));
Instance.GetComponent<StatisticsManager>().Stats.MaxStamina = id;
break;
case "mh":
id = int.Parse(parsedText.Substring(2, 3));
Instance.GetComponent<StatisticsManager>().Stats.MaxHealth = id;
break;
//case "lx":
// if (parsedText[2] == '-')
// integerValue = int.Parse(parsedText.Substring(2, 6));
// else
// integerValue = int.Parse(parsedText.Substring(2, 5));
// Instance.transform.position = new Vector3((float)integerValue, Instance.transform.position.y, Instance.transform.position.z);
// break;
//case "ly":
// if (parsedText[2] == '-')
// integerValue = int.Parse(parsedText.Substring(2, 6));
// else
// integerValue = int.Parse(parsedText.Substring(2, 5));
// Instance.transform.position = new Vector3(Instance.transform.position.x, (float)integerValue, Instance.transform.position.z);
// break;
//case "lz":
// if (parsedText[2] == '-')
// integerValue = int.Parse(parsedText.Substring(2, 6));
// else
// integerValue = int.Parse(parsedText.Substring(2, 5));
// Instance.transform.position = new Vector3(Instance.transform.position.x, Instance.transform.position.y, (float)integerValue);
break;
case "ii":
var parsedSubText = "";
var parseSubStartIndex = 0;
itemId = int.Parse(parsedText.Substring(3, 2));
for (var j = parseSubStartIndex; j < parsedText.Length - 2; j++)
{
if (parsedText[j] == '-')
{
parsedSubText = parsedText.Substring(parseSubStartIndex, j - parseSubStartIndex);
parseSubStartIndex = j + 1;
if (parsedSubText.Length > 2)
{
var parsedSubTextPrefix = parsedSubText.Substring(0, 3);
var subKey = "";
var subSubId = 0;
var subValueStartIndex = -1;
var subIntegerValue = 0;
var subFloatValue = 0.0f;
switch (parsedSubTextPrefix)
{
case "iid":
itemId = int.Parse(parsedText.Substring(3, 2));
Instance.GetComponent<StatisticsManager>().Inventory.SelectedItemID = itemId;
Instance.GetComponent<StatisticsManager>().Inventory.SelectedAmount = 1;
Instance.GetComponent<StatisticsManager>().Inventory.AddItem();
Instance.GetComponent<StatisticsManager>().Inventory.SelectedItemID = 0;
Instance.GetComponent<StatisticsManager>().Inventory.SelectedAmount = 0;
Instance.GetComponent<StatisticsManager>().Inventory.SelectedItemIndex = 0;
break;
case "icn":
Instance.GetComponent<StatisticsManager>().Inventory.GetItemByID(itemId).GetComponentInChildren<InventoryItem>().PhysicalCondition = integerValue;
integerValue = int.Parse(parsedSubText.Substring(3, 2));
break;
case "ius":
var boolValue = parsedSubText.Substring(3, 4) == "True";
//Instance.GetComponent<StatisticsManager>().Inventory.GetItemByID(itemId).GetComponentInChildren<InventoryItem>().Using = boolValue;
if (boolValue)
{
var newArray = new int[Instance.GetComponent<StatisticsManager>().Inventory.ApparrelManager.CurrentlyActiveIDs.Length + 1];
Instance.GetComponent<StatisticsManager>().Inventory.ApparrelManager.CurrentlyActiveIDs.CopyTo(newArray, 1);
newArray[0] = itemId;
Instance.GetComponent<StatisticsManager>().Inventory.ApparrelManager.CurrentlyActiveIDs = newArray;
Instance.GetComponent<StatisticsManager>().Inventory.ApparrelManager.UpdateApparrel();
if (Instance.GetComponent<StatisticsManager>().Inventory.GetItemByID(itemId).GetComponent<Equipable>() != null)
Instance.GetComponent<StatisticsManager>().Inventory.EquipmentManager.AddEquipmentToSlots(Instance.GetComponent<StatisticsManager>().Inventory.GetItemByID(itemId));
}
break;
}
}
}
}
break;
}
}
}
}
Instance.GetComponent<StatisticsManager>().Stats.InstanceID = InstanceManager.GenerateInstanceID();
InstanceManager.AddInstance(Instance.GetComponent<StatisticsManager>().Stats.InstanceID, Instance);
if (IsPlayer)
{
InstanceManager.CurrentPlayerInstanceID = Instance.GetComponent<StatisticsManager>().Stats.InstanceID;
//InstanceManager.RuntimeManager.PlayerInstance = Instance;
//InstanceManager.RuntimeManager.PopulateReferences();
}
}
}
}

@ -1,11 +0,0 @@
fileFormatVersion: 2
guid: b3ada8e0f22f75f45b590de5f3070973
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

@ -1,208 +0,0 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using SiegeSong;
namespace SiegeSong
{
public class BlendshapeLoader : MonoBehaviour
{
public Dictionary<string, float> Blendshapes;
public int HairstyleID;
public int FacialHairID;
public int FacialDetailID;
public int HairColorR;
public int HairColorG;
public int HairColorB;
public int HairColorA;
public SkinnedMeshRenderer MeshRenderer;
#region FACE
public string JawDefinitionName = "JawDefinition";
public string ForeheadWidthName = "ForeheadWidth";
public string HeadShape02Name = "HeadShape02";
public string HeadShape03Name = "HeadShape03";
public string CheekboneSizeName = "CheekboneSize";
public string CheekbonesThinName = "CheekbonesThin";
public string CheeksDepthName = "CheeksDepth";
#endregion
#region EYES
public string EyelidsDepthName = "EyelidsDepth";
public string EyelidsSizeName = "EyelidsSize";
public string EyelidsTopName = "EyelidsTop";
public string EyelidsTopHeightName = "EyelidsTopHeight";
public string EyelidsInnerShapeName = "EyelidsInnerShape";
public string EyelidsOuterShapeName = "EyelidsOuterShape";
public string EyesAngleName = "EyesAngle";
public string EyeInsideDepthName = "EyeInsideDepth";
#endregion
#region CHIN
public string ChinDepthName = "ChinDepth";
public string ChinDimpleName = "ChinDimple";
public string ChinFillName = "ChinFill";
public string ChinWidthName = "ChinWidth";
public string ChinNarrowName = "ChinNarrow";
public string CleftChinName = "CleftChin";
#endregion
#region MOUTH
public string LipPeakName = "LipPeak";
public string LipShape1Name = "LipShape1";
public string LipShape2Name = "LipShape2";
public string LipShape3Name = "LipShape3";
public string LowerLipSizeName = "LowerLipSize";
public string LowerLipWidthName = "LowerLipWidth";
public string LowerLipDepthName = "LowerLipDepth";
public string UpperLipSizeName = "UpperLipSize";
public string UpperLipWidthName = "UpperLipWidth";
public string UpperLipDepthName = "UpperLipDepth";
public string MouthHeightName = "MouthHeight";
public string MouthSizeName = "MouthSize";
public string MouthWidthName = "MouthWidth";
#endregion
#region NOSE
public string NoseAngleName = "NoseAngle";
public string NoseBridgeDepthName = "NoseBridgeDepth";
public string NoseBridgeHeightName = "NoseBridgeHeight";
public string NoseBridgeScewName = "NoseBridgeScew";
public string NoseBridgeSlopeName = "NoseBridgeSlope";
public string NoseBridgeWidthName = "NoseBridgeWidth";
public string NoseBumpName = "NoseBump";
public string NoseDepthName = "NoseDepth";
public string NoseHeightName = "NoseHeight";
public string NosePinchName = "NosePinch";
public string NoseRidgeName = "NoseRidge";
public string NoseRidgeWidthName = "NoseRidgeWidth";
public string NoseSidePositionName = "NoseSidePosition";
public string NoseSizeName = "NoseSize";
#endregion
void Start()
{
}
void Update()
{
}
public void LoadBlendshapes(Dictionary<string, float> blendshapes)
{
Debug.Log($"csbss - {MeshRenderer.sharedMesh.blendShapeCount}");
// for (int i = 0; i < MeshRenderer.BlendShapes.Count; i++)
// {
// if (Blendshapes.ContainsKey(MeshRenderer.BlendShapes[i].key))
// {
// MeshRenderer.BlendShapes[i].value = blendshapes[MeshRenderer.BlendShapes[i].key];
// }
// }
//}
//public void SaveBlendshapes()
//{
// var blendshapes = new Dictionary<string, float>();
// for (int j = 0; j < BlendManager.blendShapeGameObjects.Count; j++)
// {
// if (MeshRenderer.BlendShapes[i].key == ForeheadWidthName)
// blendshapes.Add(ForeheadWidthName, BlendManager.blendShapeGameObjects[j].blendShapeValues[i].value);
// if (MeshRenderer.BlendShapes[i].key == JawDefinitionName)
// blendshapes.Add(JawDefinitionName, BlendManager.blendShapeGameObjects[j].blendShapeValues[i].value);
// if (MeshRenderer.BlendShapes[i].key == HeadShape02Name)
// blendshapes.Add(HeadShape02Name, BlendManager.blendShapeGameObjects[j].blendShapeValues[i].value);
// if (MeshRenderer.BlendShapes[i].key == HeadShape03Name)
// blendshapes.Add(HeadShape03Name, BlendManager.blendShapeGameObjects[j].blendShapeValues[i].value);
// if (MeshRenderer.BlendShapes[i].key == CheekboneSizeName)
// blendshapes.Add(CheekboneSizeName, BlendManager.blendShapeGameObjects[j].blendShapeValues[i].value);
// if (MeshRenderer.BlendShapes[i].key == CheekbonesThinName)
// blendshapes.Add(CheekbonesThinName, BlendManager.blendShapeGameObjects[j].blendShapeValues[i].value);
// if (MeshRenderer.BlendShapes[i].key == CheeksDepthName)
// blendshapes.Add(CheeksDepthName, BlendManager.blendShapeGameObjects[j].blendShapeValues[i].value);
// if (MeshRenderer.BlendShapes[i].key == EyelidsDepthName)
// blendshapes.Add(EyelidsDepthName, BlendManager.blendShapeGameObjects[j].blendShapeValues[i].value);
// if (MeshRenderer.BlendShapes[i].key == EyelidsSizeName)
// blendshapes.Add(EyelidsSizeName, BlendManager.blendShapeGameObjects[j].blendShapeValues[i].value);
// if (MeshRenderer.BlendShapes[i].key == EyelidsTopName)
// blendshapes.Add(EyelidsTopName, BlendManager.blendShapeGameObjects[j].blendShapeValues[i].value);
// if (MeshRenderer.BlendShapes[i].key == EyelidsTopHeightName)
// blendshapes.Add(EyelidsTopHeightName, BlendManager.blendShapeGameObjects[j].blendShapeValues[i].value);
// if (MeshRenderer.BlendShapes[i].key == EyelidsInnerShapeName)
// blendshapes.Add(EyelidsInnerShapeName, BlendManager.blendShapeGameObjects[j].blendShapeValues[i].value);
// if (MeshRenderer.BlendShapes[i].key == EyelidsOuterShapeName)
// blendshapes.Add(EyelidsOuterShapeName, BlendManager.blendShapeGameObjects[j].blendShapeValues[i].value);
// if (MeshRenderer.BlendShapes[i].key == EyesAngleName)
// blendshapes.Add(EyesAngleName, BlendManager.blendShapeGameObjects[j].blendShapeValues[i].value);
// if (MeshRenderer.BlendShapes[i].key == EyeInsideDepthName)
// blendshapes.Add(EyeInsideDepthName, BlendManager.blendShapeGameObjects[j].blendShapeValues[i].value);
// if (MeshRenderer.BlendShapes[i].key == ChinDepthName)
// blendshapes.Add(ChinDepthName, BlendManager.blendShapeGameObjects[j].blendShapeValues[i].value);
// if (MeshRenderer.BlendShapes[i].key == ChinDimpleName)
// blendshapes.Add(ChinDimpleName, BlendManager.blendShapeGameObjects[j].blendShapeValues[i].value);
// if (MeshRenderer.BlendShapes[i].key == HeadShape03Name)
// blendshapes.Add(HeadShape03Name, BlendManager.blendShapeGameObjects[j].blendShapeValues[i].value);
// if (MeshRenderer.BlendShapes[i].key == ChinFillName)
// blendshapes.Add(ChinFillName, BlendManager.blendShapeGameObjects[j].blendShapeValues[i].value);
// if (MeshRenderer.BlendShapes[i].key == ChinWidthName)
// blendshapes.Add(ChinWidthName, BlendManager.blendShapeGameObjects[j].blendShapeValues[i].value);
// if (MeshRenderer.BlendShapes[i].key == ChinNarrowName)
// blendshapes.Add(ChinNarrowName, BlendManager.blendShapeGameObjects[j].blendShapeValues[i].value);
// if (MeshRenderer.BlendShapes[i].key == CleftChinName)
// blendshapes.Add(CleftChinName, BlendManager.blendShapeGameObjects[j].blendShapeValues[i].value);
// if (MeshRenderer.BlendShapes[i].key == LipPeakName)
// blendshapes.Add(LipPeakName, BlendManager.blendShapeGameObjects[j].blendShapeValues[i].value);
// if (MeshRenderer.BlendShapes[i].key == LipShape1Name)
// blendshapes.Add(LipShape1Name, BlendManager.blendShapeGameObjects[j].blendShapeValues[i].value);
// if (MeshRenderer.BlendShapes[i].key == LipShape2Name)
// blendshapes.Add(LipShape2Name, BlendManager.blendShapeGameObjects[j].blendShapeValues[i].value);
// if (MeshRenderer.BlendShapes[i].key == LipShape3Name)
// blendshapes.Add(LipShape3Name, BlendManager.blendShapeGameObjects[j].blendShapeValues[i].value);
// if (MeshRenderer.BlendShapes[i].key == LowerLipSizeName)
// blendshapes.Add(LowerLipSizeName, BlendManager.blendShapeGameObjects[j].blendShapeValues[i].value);
// if (MeshRenderer.BlendShapes[i].key == LowerLipWidthName)
// blendshapes.Add(LowerLipWidthName, BlendManager.blendShapeGameObjects[j].blendShapeValues[i].value);
// if (MeshRenderer.BlendShapes[i].key == LowerLipDepthName)
// blendshapes.Add(LowerLipDepthName, BlendManager.blendShapeGameObjects[j].blendShapeValues[i].value);
// if (MeshRenderer.BlendShapes[i].key == UpperLipSizeName)
// blendshapes.Add(UpperLipSizeName, BlendManager.blendShapeGameObjects[j].blendShapeValues[i].value);
// if (MeshRenderer.BlendShapes[i].key == UpperLipWidthName)
// blendshapes.Add(UpperLipWidthName, BlendManager.blendShapeGameObjects[j].blendShapeValues[i].value);
// if (MeshRenderer.BlendShapes[i].key == UpperLipDepthName)
// blendshapes.Add(UpperLipDepthName, BlendManager.blendShapeGameObjects[j].blendShapeValues[i].value);
// if (MeshRenderer.BlendShapes[i].key == MouthHeightName)
// blendshapes.Add(MouthHeightName, BlendManager.blendShapeGameObjects[j].blendShapeValues[i].value);
// if (MeshRenderer.BlendShapes[i].key == MouthSizeName)
// blendshapes.Add(MouthSizeName, BlendManager.blendShapeGameObjects[j].blendShapeValues[i].value);
// if (MeshRenderer.BlendShapes[i].key == MouthWidthName)
// blendshapes.Add(MouthWidthName, BlendManager.blendShapeGameObjects[j].blendShapeValues[i].value);
// if (MeshRenderer.BlendShapes[i].key == NoseAngleName)
// blendshapes.Add(NoseAngleName, BlendManager.blendShapeGameObjects[j].blendShapeValues[i].value);
// if (MeshRenderer.BlendShapes[i].key == NoseBridgeDepthName)
// blendshapes.Add(NoseBridgeDepthName, BlendManager.blendShapeGameObjects[j].blendShapeValues[i].value);
// if (MeshRenderer.BlendShapes[i].key == NoseBridgeHeightName)
// blendshapes.Add(NoseBridgeHeightName, BlendManager.blendShapeGameObjects[j].blendShapeValues[i].value);
// if (MeshRenderer.BlendShapes[i].key == NoseBridgeScewName)
// blendshapes.Add(NoseBridgeScewName, BlendManager.blendShapeGameObjects[j].blendShapeValues[i].value);
// if (MeshRenderer.BlendShapes[i].key == NoseBridgeSlopeName)
// blendshapes.Add(NoseBridgeSlopeName, BlendManager.blendShapeGameObjects[j].blendShapeValues[i].value);
// if (MeshRenderer.BlendShapes[i].key == NoseBridgeWidthName)
// blendshapes.Add(NoseBridgeWidthName, BlendManager.blendShapeGameObjects[j].blendShapeValues[i].value);
// if (MeshRenderer.BlendShapes[i].key == NoseBumpName)
// blendshapes.Add(NoseBumpName, BlendManager.blendShapeGameObjects[j].blendShapeValues[i].value);
// if (MeshRenderer.BlendShapes[i].key == NoseDepthName)
// blendshapes.Add(NoseDepthName, BlendManager.blendShapeGameObjects[j].blendShapeValues[i].value);
// if (MeshRenderer.BlendShapes[i].key == NoseHeightName)
// blendshapes.Add(NoseHeightName, BlendManager.blendShapeGameObjects[j].blendShapeValues[i].value);
// if (MeshRenderer.BlendShapes[i].key == NosePinchName)
// blendshapes.Add(NosePinchName, BlendManager.blendShapeGameObjects[j].blendShapeValues[i].value);
// if (MeshRenderer.BlendShapes[i].key == NoseRidgeName)
// blendshapes.Add(NoseRidgeName, BlendManager.blendShapeGameObjects[j].blendShapeValues[i].value);
// if (MeshRenderer.BlendShapes[i].key == NoseRidgeWidthName)
// blendshapes.Add(NoseRidgeWidthName, BlendManager.blendShapeGameObjects[j].blendShapeValues[i].value);
// if (MeshRenderer.BlendShapes[i].key == NoseSidePositionName)
// blendshapes.Add(NoseSidePositionName, BlendManager.blendShapeGameObjects[j].blendShapeValues[i].value);
// if (MeshRenderer.BlendShapes[i].key == NoseSizeName)
// blendshapes.Add(NoseSizeName, BlendManager.blendShapeGameObjects[j].blendShapeValues[i].value);
// }
}
}
}

@ -1,11 +0,0 @@
fileFormatVersion: 2
guid: 8d55739e437d1cd4abf03c446543bf5b
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

@ -19,18 +19,12 @@ namespace SiegeSong
public void SetDateTime(Calendar newDateTime) public void SetDateTime(Calendar newDateTime)
{ {
EnviroSky.instance.GameTime.Minutes = newDateTime.Minute; EnviroSky.instance.SetTime(newDateTime.Year, newDateTime.Day, newDateTime.Hour, newDateTime.Minute, 0);
EnviroSky.instance.GameTime.Hours = newDateTime.Hour;
EnviroSky.instance.GameTime.Days = newDateTime.Day;
EnviroSky.instance.GameTime.Years = newDateTime.Year;
} }
public void SetDateTime(int minute, int hour, int day, int year) public void SetDateTime(int minute, int hour, int day, int year)
{ {
EnviroSky.instance.GameTime.Minutes = minute; EnviroSky.instance.SetTime(year, day, hour, minute, 0);
EnviroSky.instance.GameTime.Hours = hour;
EnviroSky.instance.GameTime.Days = day;
EnviroSky.instance.GameTime.Years = year;
} }
// Logic to be executed at the start of every hour // Logic to be executed at the start of every hour

@ -8,6 +8,7 @@ namespace SiegeSong
public class InstanceManager : MonoBehaviour public class InstanceManager : MonoBehaviour
{ {
public GameObject SpeciesDefinitionsContainer; public GameObject SpeciesDefinitionsContainer;
public GameObject ActorInstanceContainer;
public string CurrentPlayerInstanceID; public string CurrentPlayerInstanceID;
public GameObject[] Instances; public GameObject[] Instances;
public string[] InstanceIDs; public string[] InstanceIDs;
@ -85,6 +86,7 @@ namespace SiegeSong
newInstanceIDArray[newInstanceIDArray.Length - 1] = instanceID; newInstanceIDArray[newInstanceIDArray.Length - 1] = instanceID;
Instances = newInstanceArray; Instances = newInstanceArray;
InstanceIDs = newInstanceIDArray; InstanceIDs = newInstanceIDArray;
newInstance.transform.parent = ActorInstanceContainer.transform;
} }
public void RemoveInstance(string instanceID) public void RemoveInstance(string instanceID)
@ -101,7 +103,6 @@ namespace SiegeSong
if (InstanceIDs[iterator].ToLower() == instanceID.ToLower()) if (InstanceIDs[iterator].ToLower() == instanceID.ToLower())
{ {
var instanceObject = Instances[iterator]; var instanceObject = Instances[iterator];
GameObject.Destroy(instanceObject); GameObject.Destroy(instanceObject);
} }
else else

@ -542,21 +542,21 @@ namespace SiegeSong
public void NextCreationStep() public void NextCreationStep()
{ {
SceneManager.LoadScene("World"); SceneManager.LoadScene("World");
var instance = GameObject.Find("PlayerLoader")?.GetComponent<ActorLoader>()?.Instance; //var instance = GameObject.Find("PlayerLoader")?.GetComponent<ActorLoader>()?.Instance;
if (instance != null) //if (instance != null)
{ //{
for (var i = 0; i < instance.transform.childCount; i++) // for (var i = 0; i < instance.transform.childCount; i++)
{ // {
if (instance.transform.GetChild(i).name == "Body" && instance.transform.GetChild(i).GetComponent<SkinnedMeshRenderer>() != null) // if (instance.transform.GetChild(i).name == "Body" && instance.transform.GetChild(i).GetComponent<SkinnedMeshRenderer>() != null)
{ // {
//foreach (var blendShape in Blendshapes) // //foreach (var blendShape in Blendshapes)
{ // {
//instance.transform.GetChild(i).GetComponent<SkinnedMeshRenderer>().BlendShapes[blendShape.key] = blendShape.value; // //instance.transform.GetChild(i).GetComponent<SkinnedMeshRenderer>().BlendShapes[blendShape.key] = blendShape.value;
} // }
} // }
} // }
} //}
SceneManager.UnloadScene("CharacterCreation"); //SceneManager.UnloadScene("CharacterCreation");
} }
void Update() void Update()

Binary file not shown.

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save