ktyl
/
revival
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
revival/game/Assets/Prefabs/Player.prefab

857 lines
27 KiB
Plaintext
Raw Normal View History

fixed ci issue
2021-02-12 15:12:26 +01:00
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
Feature/character controller
2021-02-15 19:09:32 +01:00
--- !u!1 &13726836532781110
fixed ci issue
2021-02-12 15:12:26 +01:00
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
Feature/character controller
2021-02-15 19:09:32 +01:00
- component: {fileID: 13726836532781129}
- component: {fileID: 13726836532781131}
- component: {fileID: 13726836532781128}
fixed ci issue
2021-02-12 15:12:26 +01:00
m_Layer: 0
Feature/character controller
2021-02-15 19:09:32 +01:00
m_Name: Cylinder
fixed ci issue
2021-02-12 15:12:26 +01:00
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
update player prefab
2021-03-05 19:00:50 +01:00
m_IsActive: 0
Feature/character controller
2021-02-15 19:09:32 +01:00
--- !u!4 &13726836532781129
fixed ci issue
2021-02-12 15:12:26 +01:00
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
Feature/character controller
2021-02-15 19:09:32 +01:00
m_GameObject: {fileID: 13726836532781110}
m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: 0.7071068}
m_LocalPosition: {x: 0, y: 0.5, z: 0.177}
m_LocalScale: {x: 0.65, y: 0.4, z: 0.5}
fixed ci issue
2021-02-12 15:12:26 +01:00
m_Children: []
Feature/character controller
2021-02-15 19:09:32 +01:00
m_Father: {fileID: 13726837642651460}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0}
--- !u!33 &13726836532781131
fixed ci issue
2021-02-12 15:12:26 +01:00
MeshFilter:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
Feature/character controller
2021-02-15 19:09:32 +01:00
m_GameObject: {fileID: 13726836532781110}
m_Mesh: {fileID: 10206, guid: 0000000000000000e000000000000000, type: 0}
--- !u!23 &13726836532781128
fixed ci issue
2021-02-12 15:12:26 +01:00
MeshRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
Feature/character controller
2021-02-15 19:09:32 +01:00
m_GameObject: {fileID: 13726836532781110}
fixed ci issue
2021-02-12 15:12:26 +01:00
m_Enabled: 1
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
m_RayTraceProcedural: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
Feature/character controller
2021-02-15 19:09:32 +01:00
- {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2}
fixed ci issue
2021-02-12 15:12:26 +01:00
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 1
m_SelectedEditorRenderState: 3
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
Feature/character controller
2021-02-15 19:09:32 +01:00
--- !u!1 &13726836969441781
fixed ci issue
2021-02-12 15:12:26 +01:00
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
Feature/character controller
2021-02-15 19:09:32 +01:00
- component: {fileID: 13726836969441544}
- component: {fileID: 13726836969441545}
- component: {fileID: 13726836969441783}
- component: {fileID: 13726836969441780}
- component: {fileID: 13726836969441782}
- component: {fileID: 13726837176080779}
Merge branch 'main' into artefacts_list
2021-02-22 10:01:33 +01:00
- component: {fileID: 3320306143821152633}
update player prefab
2021-03-05 19:00:50 +01:00
- component: {fileID: 4397130014773710380}
use SO-based references for respawn position and events
2021-03-03 13:53:52 +01:00
- component: {fileID: 4537570682397675320}
- component: {fileID: 2167937473989734407}
artefact ui overhaul
2021-03-11 14:12:19 +01:00
- component: {fileID: 6606601648879830728}
- component: {fileID: 6685677556849761150}
Merge branch 'main' into ArrowWall
2021-03-12 18:41:34 +01:00
- component: {fileID: 4463072970378110064}
fixed ci issue
2021-02-12 15:12:26 +01:00
m_Layer: 0
m_Name: Player
clean up trap floor prefab
2021-03-05 17:24:50 +01:00
m_TagString: Player
fixed ci issue
2021-02-12 15:12:26 +01:00
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
Feature/character controller
2021-02-15 19:09:32 +01:00
--- !u!4 &13726836969441544
fixed ci issue
2021-02-12 15:12:26 +01:00
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
Feature/character controller
2021-02-15 19:09:32 +01:00
m_GameObject: {fileID: 13726836969441781}
fixed ci issue
2021-02-12 15:12:26 +01:00
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_Children:
Feature/character controller
2021-02-15 19:09:32 +01:00
- {fileID: 13726837642651460}
fixed ci issue
2021-02-12 15:12:26 +01:00
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
Feature/character controller
2021-02-15 19:09:32 +01:00
--- !u!143 &13726836969441545
CharacterController:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 13726836969441781}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 2
updated animation controller, got new anims in-game
2021-03-23 12:48:43 +01:00
m_Height: 1.5
Feature/character controller
2021-02-15 19:09:32 +01:00
m_Radius: 0.4
m_SlopeLimit: 45
m_StepOffset: 0.3
m_SkinWidth: 0.01
m_MinMoveDistance: 0.001
updated animation controller, got new anims in-game
2021-03-23 12:48:43 +01:00
m_Center: {x: 0, y: 0.75, z: 0}
Feature/character controller
2021-02-15 19:09:32 +01:00
--- !u!114 &13726836969441783
fixed ci issue
2021-02-12 15:12:26 +01:00
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
Feature/character controller
2021-02-15 19:09:32 +01:00
m_GameObject: {fileID: 13726836969441781}
fixed ci issue
2021-02-12 15:12:26 +01:00
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: a734b8e2d64ba604795fd5cef5d741f4, type: 3}
m_Name:
m_EditorClassIdentifier:
_movementSettings: {fileID: 11400000, guid: 0c168708f93291545b51df2eec8f4ac3, type: 2}
Feature/character controller
2021-02-15 19:09:32 +01:00
_inputHandler: {fileID: 13726836969441782}
_controller: {fileID: 13726836969441545}
updated animation controller, got new anims in-game
2021-03-23 12:48:43 +01:00
_animController: {fileID: 4397130014773710380}
Feature/character controller
2021-02-15 19:09:32 +01:00
_powers: {fileID: 13726837176080779}
_graphics: {fileID: 13726837642651460}
_renderers:
- {fileID: 13726837642651463}
- {fileID: 13726836532781128}
_groundedColor: {r: 0, g: 1, b: 0.39492488, a: 0}
_jumpColor: {r: 1, g: 0.95084643, b: 0, a: 0}
_boostColor: {r: 1, g: 0, b: 0.9173207, a: 0}
_exhaustedColor: {r: 1, g: 0, b: 0, a: 0}
messy messy merge >n<
2021-03-24 13:45:19 +01:00
objectTimeScale: {fileID: 11400000, guid: 9b68e167db44c0c42837e9a679da964e, type: 2}
frozenTime: {fileID: 11400000, guid: 19273ba4ac237ab4381926cfb195dda8, type: 2}
Feature/character controller
2021-02-15 19:09:32 +01:00
--- !u!114 &13726836969441780
fixed ci issue
2021-02-12 15:12:26 +01:00
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
Feature/character controller
2021-02-15 19:09:32 +01:00
m_GameObject: {fileID: 13726836969441781}
fixed ci issue
2021-02-12 15:12:26 +01:00
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 62899f850307741f2a39c98a8b639597, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Actions: {fileID: -944628639613478452, guid: d4d9eb5db7beac84ca3cb36cfc09cd0a, type: 3}
m_NotificationBehavior: 2
m_UIInputModule: {fileID: 0}
m_DeviceLostEvent:
m_PersistentCalls:
m_Calls: []
m_DeviceRegainedEvent:
m_PersistentCalls:
m_Calls: []
m_ControlsChangedEvent:
m_PersistentCalls:
inject input prompt sprites into dialogue
2021-03-11 21:25:09 +01:00
m_Calls:
- m_Target: {fileID: 11400000, guid: 56369c4e83cc59e44bf55cd16fafc4e8, type: 2}
m_TargetAssemblyTypeName: DialogueSystem, Assembly-CSharp
m_MethodName: UpdateControlPrompts
m_Mode: 2
m_Arguments:
m_ObjectArgument: {fileID: 13726836969441780}
m_ObjectArgumentAssemblyTypeName: UnityEngine.InputSystem.PlayerInput,
Unity.InputSystem
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
fixed ci issue
2021-02-12 15:12:26 +01:00
m_ActionEvents:
- m_PersistentCalls:
m_Calls:
Feature/character controller
2021-02-15 19:09:32 +01:00
- m_Target: {fileID: 13726836969441782}
fixed ci issue
2021-02-12 15:12:26 +01:00
m_TargetAssemblyTypeName: PlayerInputHandler, Assembly-CSharp
m_MethodName: Move
m_Mode: 0
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
m_ActionId: 5c440996-60ec-4084-9223-75d39638108a
m_ActionName: CoreMap/Move[/Keyboard/w,/Keyboard/s,/Keyboard/a,/Keyboard/d,/XInputControllerWindows/leftStick]
- m_PersistentCalls:
m_Calls:
fixed camera rotation issues'
2021-03-02 19:28:13 +01:00
- m_Target: {fileID: 11500000, guid: f1cbb1d5d2a7715478647c26d4e71482, type: 3}
m_TargetAssemblyTypeName: FreeLookAddOn, Assembly-CSharp
m_MethodName:
fixed ci issue
2021-02-12 15:12:26 +01:00
m_Mode: 0
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
m_ActionId: d271942b-8516-4550-88ae-552350feb4b1
m_ActionName: CoreMap/Look[/Mouse/delta,/XInputControllerWindows/rightStick]
- m_PersistentCalls:
m_Calls:
Feature/character controller
2021-02-15 19:09:32 +01:00
- m_Target: {fileID: 13726836969441782}
fixed ci issue
2021-02-12 15:12:26 +01:00
m_TargetAssemblyTypeName: PlayerInputHandler, Assembly-CSharp
m_MethodName: Jump
m_Mode: 0
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
m_ActionId: da936947-fcfa-4872-a4e3-15763afe56b6
m_ActionName: CoreMap/Jump[/Keyboard/space,/XInputControllerWindows/buttonSouth]
- m_PersistentCalls:
m_Calls:
Feature/character controller
2021-02-15 19:09:32 +01:00
- m_Target: {fileID: 13726836969441782}
fixed ci issue
2021-02-12 15:12:26 +01:00
m_TargetAssemblyTypeName: PlayerInputHandler, Assembly-CSharp
m_MethodName: Use
m_Mode: 0
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
m_ActionId: 2bbc2e93-6016-4544-8399-0c4ee222850c
m_ActionName: CoreMap/Use[/Keyboard/e,/XInputControllerWindows/buttonWest]
Feature/character controller
2021-02-15 19:09:32 +01:00
- m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 13726836969441782}
m_TargetAssemblyTypeName: PlayerInputHandler, Assembly-CSharp
m_MethodName: Blink
m_Mode: 0
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
m_ActionId: 0eb55067-1328-4b0a-9494-b427befe049a
m_ActionName: CoreMap/New action
minor bugfixes
2021-03-09 15:24:31 +01:00
- m_PersistentCalls:
Merge branch 'main' into ArrowWall
2021-03-12 18:41:34 +01:00
m_Calls: []
m_ActionId: 5b0a923b-469a-4829-8f31-6fcd7cb49281
m_ActionName: ArtefactPreview/LookEnable[/Mouse/leftButton]
- m_PersistentCalls:
m_Calls: []
m_ActionId: 0a5c2191-e93e-44ba-880e-189b8b33e10a
m_ActionName: ArtefactPreview/LookVelocity
- m_PersistentCalls:
m_Calls: []
m_ActionId: b118302a-6162-4223-8a6c-38ff2d6b4133
m_ActionName: ArtefactPreview/LookDelta[/Mouse/delta]
messy messy merge >n<
2021-03-24 13:45:19 +01:00
- m_PersistentCalls:
m_Calls: []
minor bugfixes
2021-03-09 15:24:31 +01:00
m_ActionId: 29f1599e-fe43-47df-ad25-8e712263d0ab
m_ActionName: CoreMap/Freeze[/Keyboard/g]
inject input prompt sprites into dialogue
2021-03-11 21:25:09 +01:00
m_NeverAutoSwitchControlSchemes: 0
fixed ci issue
2021-02-12 15:12:26 +01:00
m_DefaultControlScheme: Gamepad
m_DefaultActionMap: CoreMap
m_SplitScreenIndex: -1
Now have a work around for the camera.
2021-03-01 19:03:30 +01:00
m_Camera: {fileID: 0}
Feature/character controller
2021-02-15 19:09:32 +01:00
--- !u!114 &13726836969441782
fixed ci issue
2021-02-12 15:12:26 +01:00
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
Feature/character controller
2021-02-15 19:09:32 +01:00
m_GameObject: {fileID: 13726836969441781}
fixed ci issue
2021-02-12 15:12:26 +01:00
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: e12816fc78a8ca3429be019aa4e51fdd, type: 3}
m_Name:
m_EditorClassIdentifier:
Merge branch 'main' into artefacts_list
2021-02-22 10:01:33 +01:00
_nearbyArtefactID: {fileID: 11400000, guid: caba70196fbb1c549a934f7566f7a247, type: 2}
fixed ci issue
2021-02-12 15:12:26 +01:00
_inputSettings: {fileID: 11400000, guid: 09b165d6ce14f86459be7213da9688a7, type: 2}
fixed camera rotation issues'
2021-03-02 19:28:13 +01:00
_camera: {fileID: 0}
inject input prompt sprites into dialogue
2021-03-11 21:25:09 +01:00
_dialogue: {fileID: 11400000, guid: 56369c4e83cc59e44bf55cd16fafc4e8, type: 2}
Feature/character controller
2021-02-15 19:09:32 +01:00
--- !u!114 &13726837176080779
MonoBehaviour:
fixed ci issue
2021-02-12 15:12:26 +01:00
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
Feature/character controller
2021-02-15 19:09:32 +01:00
m_GameObject: {fileID: 13726836969441781}
fixed ci issue
2021-02-12 15:12:26 +01:00
m_Enabled: 1
Feature/character controller
2021-02-15 19:09:32 +01:00
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 0e73a47345d899f4ca1e5e08683c2b82, type: 3}
m_Name:
m_EditorClassIdentifier:
updated animation controller, got new anims in-game
2021-03-23 12:48:43 +01:00
_cheatBlink: 0
_cheatBoost: 0
minor bugfixes
2021-03-09 15:24:31 +01:00
_cheatFreeze: 0
Feature/character controller
2021-02-15 19:09:32 +01:00
_blink: {fileID: 11400000, guid: b47ea197a7cc2ed4eb15271cef672997, type: 2}
_boost: {fileID: 11400000, guid: d5ed942937d8cca478f3ec97f6b9c8a2, type: 2}
minor bugfixes
2021-03-09 15:24:31 +01:00
_freeze: {fileID: 0}
Merge branch 'main' into artefacts_list
2021-02-22 10:01:33 +01:00
--- !u!114 &3320306143821152633
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 13726836969441781}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 005bf73dff204914c9e1bbd60c843451, type: 3}
m_Name:
m_EditorClassIdentifier:
update player prefab
2021-03-05 19:00:50 +01:00
--- !u!114 &4397130014773710380
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 13726836969441781}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: a5bca717120a7734c8c5fa335cd78c1f, type: 3}
m_Name:
m_EditorClassIdentifier:
_animator: {fileID: 2255102273586669739}
_controller: {fileID: 13726836969441545}
use SO-based references for respawn position and events
2021-03-03 13:53:52 +01:00
--- !u!114 &4537570682397675320
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 13726836969441781}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 0a5de09a27d949d4db67034f55c57e6b, type: 3}
m_Name:
m_EditorClassIdentifier:
_event: {fileID: 11400000, guid: 22fd384aef0d08146831d35c2ab7f983, type: 2}
_response:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 13726836969441783}
m_TargetAssemblyTypeName: UnityEngine.Behaviour, UnityEngine
m_MethodName: set_enabled
m_Mode: 6
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
--- !u!114 &2167937473989734407
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 13726836969441781}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 0a5de09a27d949d4db67034f55c57e6b, type: 3}
m_Name:
m_EditorClassIdentifier:
_event: {fileID: 11400000, guid: 6e31084a96bb93a44a85563a6208d0da, type: 2}
_response:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 13726836969441783}
m_TargetAssemblyTypeName: UnityEngine.Behaviour, UnityEngine
m_MethodName: set_enabled
m_Mode: 6
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 1
m_CallState: 2
artefact ui overhaul
2021-03-11 14:12:19 +01:00
--- !u!114 &6606601648879830728
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 13726836969441781}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 0a5de09a27d949d4db67034f55c57e6b, type: 3}
m_Name:
m_EditorClassIdentifier:
_event: {fileID: 11400000, guid: d8c4272694282b64e9cd1d4a42477262, type: 2}
_response:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 13726836969441780}
m_TargetAssemblyTypeName: UnityEngine.Behaviour, UnityEngine
m_MethodName: set_enabled
m_Mode: 6
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 1
m_CallState: 2
--- !u!114 &6685677556849761150
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 13726836969441781}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 0a5de09a27d949d4db67034f55c57e6b, type: 3}
m_Name:
m_EditorClassIdentifier:
_event: {fileID: 11400000, guid: 0fc36e00903fc7047b48bb1844e6f12b, type: 2}
_response:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 13726836969441780}
m_TargetAssemblyTypeName: UnityEngine.Behaviour, UnityEngine
m_MethodName: set_enabled
m_Mode: 6
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
Merge branch 'main' into ArrowWall
2021-03-12 18:41:34 +01:00
--- !u!114 &4463072970378110064
Made changes as per code review.
2021-03-12 12:52:56 +01:00
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 13726836969441781}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: bb840fd42f6526f4893e136a093cf1bd, type: 3}
m_Name:
m_EditorClassIdentifier:
Merge branch 'main' into ArrowWall
2021-03-12 18:41:34 +01:00
_respawnPosition: {fileID: 11400000, guid: 20fad56702134eb469a652ba680b48b2, type: 2}
_playerDeath: {fileID: 11400000, guid: 22fd384aef0d08146831d35c2ab7f983, type: 2}
_playerRespawn: {fileID: 11400000, guid: 6e31084a96bb93a44a85563a6208d0da, type: 2}
Now have a work around for the camera.
2021-03-01 19:03:30 +01:00
--- !u!1 &13726837642651461
fixed ci issue
2021-02-12 15:12:26 +01:00
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
Now have a work around for the camera.
2021-03-01 19:03:30 +01:00
- component: {fileID: 13726837642651460}
- component: {fileID: 13726837642651462}
- component: {fileID: 13726837642651463}
fixed ci issue
2021-02-12 15:12:26 +01:00
m_Layer: 0
Now have a work around for the camera.
2021-03-01 19:03:30 +01:00
m_Name: Graphics
fixed ci issue
2021-02-12 15:12:26 +01:00
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
Now have a work around for the camera.
2021-03-01 19:03:30 +01:00
--- !u!4 &13726837642651460
fixed ci issue
2021-02-12 15:12:26 +01:00
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
Now have a work around for the camera.
2021-03-01 19:03:30 +01:00
m_GameObject: {fileID: 13726837642651461}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
update player prefab
2021-03-05 19:00:50 +01:00
m_LocalPosition: {x: 0, y: 0, z: 0}
updated animation controller, got new anims in-game
2021-03-23 12:48:43 +01:00
m_LocalScale: {x: 0.7, y: 0.75, z: 0.7}
Now have a work around for the camera.
2021-03-01 19:03:30 +01:00
m_Children:
- {fileID: 3910566560202895193}
- {fileID: 13726836532781129}
- {fileID: 7741442472643640439}
update player prefab
2021-03-05 19:00:50 +01:00
- {fileID: 2883153423186464107}
Feature/character controller
2021-02-15 19:09:32 +01:00
m_Father: {fileID: 13726836969441544}
Now have a work around for the camera.
2021-03-01 19:03:30 +01:00
m_RootOrder: 0
fixed ci issue
2021-02-12 15:12:26 +01:00
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
Now have a work around for the camera.
2021-03-01 19:03:30 +01:00
--- !u!33 &13726837642651462
MeshFilter:
fixed ci issue
2021-02-12 15:12:26 +01:00
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
Now have a work around for the camera.
2021-03-01 19:03:30 +01:00
m_GameObject: {fileID: 13726837642651461}
m_Mesh: {fileID: 10208, guid: 0000000000000000e000000000000000, type: 0}
--- !u!23 &13726837642651463
MeshRenderer:
play audio via FMOD using key from dialogue database
2021-02-22 16:29:17 +01:00
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
Now have a work around for the camera.
2021-03-01 19:03:30 +01:00
m_GameObject: {fileID: 13726837642651461}
update player prefab
2021-03-05 19:00:50 +01:00
m_Enabled: 0
Now have a work around for the camera.
2021-03-01 19:03:30 +01:00
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
m_RayTraceProcedural: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 1
m_SelectedEditorRenderState: 3
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
--- !u!1 &1703779518772407877
Feature/character controller
2021-02-15 19:09:32 +01:00
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
Now have a work around for the camera.
2021-03-01 19:03:30 +01:00
- component: {fileID: 7741442472643640439}
- component: {fileID: 631285144798126309}
- component: {fileID: 420649584177745496}
- component: {fileID: 8195219718842661232}
Feature/character controller
2021-02-15 19:09:32 +01:00
m_Layer: 0
fixed camera rotation issues'
2021-03-02 19:28:13 +01:00
m_Name: FollowTarget
Feature/character controller
2021-02-15 19:09:32 +01:00
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
Now have a work around for the camera.
2021-03-01 19:03:30 +01:00
--- !u!4 &7741442472643640439
Feature/character controller
2021-02-15 19:09:32 +01:00
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
Now have a work around for the camera.
2021-03-01 19:03:30 +01:00
m_GameObject: {fileID: 1703779518772407877}
Feature/character controller
2021-02-15 19:09:32 +01:00
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
updated animation controller, got new anims in-game
2021-03-23 12:48:43 +01:00
m_LocalPosition: {x: -0.036, y: 1.403, z: -0.093}
Now have a work around for the camera.
2021-03-01 19:03:30 +01:00
m_LocalScale: {x: 0.1, y: 0.1, z: 0.1}
m_Children: []
m_Father: {fileID: 13726837642651460}
m_RootOrder: 2
Feature/character controller
2021-02-15 19:09:32 +01:00
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
Now have a work around for the camera.
2021-03-01 19:03:30 +01:00
--- !u!33 &631285144798126309
Feature/character controller
2021-02-15 19:09:32 +01:00
MeshFilter:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
Now have a work around for the camera.
2021-03-01 19:03:30 +01:00
m_GameObject: {fileID: 1703779518772407877}
m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0}
--- !u!23 &420649584177745496
Feature/character controller
2021-02-15 19:09:32 +01:00
MeshRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
Now have a work around for the camera.
2021-03-01 19:03:30 +01:00
m_GameObject: {fileID: 1703779518772407877}
update player prefab
2021-03-05 19:00:50 +01:00
m_Enabled: 0
Feature/character controller
2021-02-15 19:09:32 +01:00
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
m_RayTraceProcedural: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 1
m_SelectedEditorRenderState: 3
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
Now have a work around for the camera.
2021-03-01 19:03:30 +01:00
--- !u!135 &8195219718842661232
SphereCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1703779518772407877}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 0
serializedVersion: 2
m_Radius: 0.38
m_Center: {x: 0, y: 0, z: 0}
update player prefab
2021-03-05 19:00:50 +01:00
--- !u!95 &2255102273586669739
Animator:
serializedVersion: 3
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2542515566603360209}
m_Enabled: 1
m_Avatar: {fileID: 0}
m_Controller: {fileID: 9100000, guid: 1b223a4181bb94640936f28ce880ce7b, type: 2}
m_CullingMode: 0
m_UpdateMode: 0
m_ApplyRootMotion: 0
m_LinearVelocityBlending: 0
m_WarningMessage:
m_HasTransformHierarchy: 1
m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorControllerStateOnDisable: 0
Feature/character controller
2021-02-15 19:09:32 +01:00
--- !u!1 &2625718689509414053
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 3910566560202895193}
- component: {fileID: 7229600687471556246}
m_Layer: 0
m_Name: Spot Light
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &3910566560202895193
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2625718689509414053}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0.50000006, z: 0.013}
m_LocalScale: {x: 0.65, y: 0.39999998, z: 0.49999997}
m_Children: []
m_Father: {fileID: 13726837642651460}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!108 &7229600687471556246
Light:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2625718689509414053}
m_Enabled: 1
serializedVersion: 10
m_Type: 0
m_Shape: 0
m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1}
m_Intensity: 2
m_Range: 10
m_SpotAngle: 116.77128
m_InnerSpotAngle: 41.896492
m_CookieSize: 10
m_Shadows:
m_Type: 2
m_Resolution: -1
m_CustomResolution: -1
m_Strength: 1
m_Bias: 0.02
m_NormalBias: 0.1
m_NearPlane: 0.1
m_CullingMatrixOverride:
e00: 1
e01: 0
e02: 0
e03: 0
e10: 0
e11: 1
e12: 0
e13: 0
e20: 0
e21: 0
e22: 1
e23: 0
e30: 0
e31: 0
e32: 0
e33: 1
m_UseCullingMatrixOverride: 0
m_Cookie: {fileID: 0}
m_DrawHalo: 0
m_Flare: {fileID: 0}
m_RenderMode: 0
m_CullingMask:
serializedVersion: 2
m_Bits: 4294967295
m_RenderingLayerMask: 1
m_Lightmapping: 4
m_LightShadowCasterMode: 0
m_AreaSize: {x: 1, y: 1}
m_BounceIntensity: 1
m_ColorTemperature: 6570
m_UseColorTemperature: 0
m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0}
m_UseBoundingSphereOverride: 0
m_UseViewFrustumForShadowCasterCull: 1
m_ShadowRadius: 0
m_ShadowAngle: 0
update player prefab
2021-03-05 19:00:50 +01:00
--- !u!1001 &3425477616327879296
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 13726837642651460}
m_Modifications:
- target: {fileID: -8679921383154817045, guid: dc837b43c4e9cd44d8b86fefed7e0f0e, type: 3}
propertyPath: m_RootOrder
value: 3
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: dc837b43c4e9cd44d8b86fefed7e0f0e, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: dc837b43c4e9cd44d8b86fefed7e0f0e, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: dc837b43c4e9cd44d8b86fefed7e0f0e, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: dc837b43c4e9cd44d8b86fefed7e0f0e, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: dc837b43c4e9cd44d8b86fefed7e0f0e, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: dc837b43c4e9cd44d8b86fefed7e0f0e, type: 3}
propertyPath: m_LocalRotation.y
value: -0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: dc837b43c4e9cd44d8b86fefed7e0f0e, type: 3}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: dc837b43c4e9cd44d8b86fefed7e0f0e, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: dc837b43c4e9cd44d8b86fefed7e0f0e, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: dc837b43c4e9cd44d8b86fefed7e0f0e, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 919132149155446097, guid: dc837b43c4e9cd44d8b86fefed7e0f0e, type: 3}
propertyPath: m_Name
value: A_Idle
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: dc837b43c4e9cd44d8b86fefed7e0f0e, type: 3}
--- !u!1 &2542515566603360209 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: dc837b43c4e9cd44d8b86fefed7e0f0e, type: 3}
m_PrefabInstance: {fileID: 3425477616327879296}
m_PrefabAsset: {fileID: 0}
--- !u!4 &2883153423186464107 stripped
Transform:
m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: dc837b43c4e9cd44d8b86fefed7e0f0e, type: 3}
m_PrefabInstance: {fileID: 3425477616327879296}
m_PrefabAsset: {fileID: 0}