diff --git a/Assets/Artists/Animtions/Character/Locomotion/Character_Rifle_New_Idle_Humanoid.fbx b/Assets/Artists/Animtions/Character/Locomotion/Character_Rifle_New_Idle_Humanoid.fbx deleted file mode 100644 index b9a1e978f..000000000 Binary files a/Assets/Artists/Animtions/Character/Locomotion/Character_Rifle_New_Idle_Humanoid.fbx and /dev/null differ diff --git a/Assets/Artists/Configs/Animator/EntityRifle.overrideController b/Assets/Artists/Configs/Animator/EntityRifle.overrideController index 0db904179..59dbadef9 100644 --- a/Assets/Artists/Configs/Animator/EntityRifle.overrideController +++ b/Assets/Artists/Configs/Animator/EntityRifle.overrideController @@ -9,18 +9,6 @@ AnimatorOverrideController: m_Name: EntityRifle m_Controller: {fileID: 9100000, guid: cb43cb1bf42184e45b920b0bb77554f9, type: 2} m_Clips: - - m_OriginalClip: {fileID: 7400000, guid: ad24d1ce30ed48945a9b68be9827bc90, type: 2} - m_OverrideClip: {fileID: 8816525237524189043, guid: 8458c01c2fdae5447bf770e0341e9ccb, - type: 3} - - m_OriginalClip: {fileID: 7400000, guid: 01214145ea75a2d4b80363bba2f1a65e, type: 2} - m_OverrideClip: {fileID: -5858036045953447646, guid: 8458c01c2fdae5447bf770e0341e9ccb, - type: 3} - - m_OriginalClip: {fileID: 7400000, guid: 451f983af0dd44c419406ca1d1a0b591, type: 2} - m_OverrideClip: {fileID: 7433315730774535304, guid: 8458c01c2fdae5447bf770e0341e9ccb, - type: 3} - - m_OriginalClip: {fileID: 7400000, guid: 9bc28f4633c671a428bc05bc4b6e6a8c, type: 2} - m_OverrideClip: {fileID: 197974373799447605, guid: 8458c01c2fdae5447bf770e0341e9ccb, - type: 3} - m_OriginalClip: {fileID: 7400000, guid: 68182865c01bbae4fb3027ea32634e3f, type: 2} m_OverrideClip: {fileID: 541215467601930624, guid: f6c625b850088b948bf4a11919b23be2, type: 3} @@ -126,3 +114,15 @@ AnimatorOverrideController: - m_OriginalClip: {fileID: 7400000, guid: 87615f3d6179d5149a4bd20a314bb372, type: 2} m_OverrideClip: {fileID: 806794535615196031, guid: 6515624bbb09409469ca9784688969a8, type: 3} + - m_OriginalClip: {fileID: 7400000, guid: 01214145ea75a2d4b80363bba2f1a65e, type: 2} + m_OverrideClip: {fileID: -5858036045953447646, guid: 8458c01c2fdae5447bf770e0341e9ccb, + type: 3} + - m_OriginalClip: {fileID: 7400000, guid: ad24d1ce30ed48945a9b68be9827bc90, type: 2} + m_OverrideClip: {fileID: 8816525237524189043, guid: 8458c01c2fdae5447bf770e0341e9ccb, + type: 3} + - m_OriginalClip: {fileID: 7400000, guid: 451f983af0dd44c419406ca1d1a0b591, type: 2} + m_OverrideClip: {fileID: 7433315730774535304, guid: 8458c01c2fdae5447bf770e0341e9ccb, + type: 3} + - m_OriginalClip: {fileID: 7400000, guid: 9bc28f4633c671a428bc05bc4b6e6a8c, type: 2} + m_OverrideClip: {fileID: 197974373799447605, guid: 8458c01c2fdae5447bf770e0341e9ccb, + type: 3} diff --git a/Assets/Artists/Configs/Animator/Pixel Upper Additive.mask b/Assets/Artists/Configs/Animator/Pixel Upper Additive.mask index ce4f8c8a4..d7e61ef76 100644 --- a/Assets/Artists/Configs/Animator/Pixel Upper Additive.mask +++ b/Assets/Artists/Configs/Animator/Pixel Upper Additive.mask @@ -7,7 +7,7 @@ AvatarMask: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Pixel Upper Additive - m_Mask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000 + m_Mask: 00000000010000000100000000000000000000000100000001000000010000000100000000000000000000000100000001000000 m_Elements: - m_Path: m_Weight: 1 diff --git a/Assets/Artists/Configs/Animator/Pixel Upper.mask b/Assets/Artists/Configs/Animator/Pixel Upper.mask index 34a6b52ec..10e8e020e 100644 --- a/Assets/Artists/Configs/Animator/Pixel Upper.mask +++ b/Assets/Artists/Configs/Animator/Pixel Upper.mask @@ -7,7 +7,7 @@ AvatarMask: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Pixel Upper - m_Mask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000 + m_Mask: 00000000010000000100000000000000000000000100000001000000010000000100000000000000000000000100000001000000 m_Elements: - m_Path: m_Weight: 1 diff --git a/Assets/Artists/Models/Character/Character_Humanoid.fbx b/Assets/Artists/Models/Character/Character_Humanoid.fbx deleted file mode 100644 index 13f930092..000000000 Binary files a/Assets/Artists/Models/Character/Character_Humanoid.fbx and /dev/null differ diff --git a/Assets/Artists/Models/Props/Paquete de modelos psx 3/Prefabs/Bed_08.prefab b/Assets/Artists/Models/Props/Paquete de modelos psx 3/Prefabs/Bed_08.prefab index efca898ac..df06d4307 100644 --- a/Assets/Artists/Models/Props/Paquete de modelos psx 3/Prefabs/Bed_08.prefab +++ b/Assets/Artists/Models/Props/Paquete de modelos psx 3/Prefabs/Bed_08.prefab @@ -107,8 +107,8 @@ BoxCollider: m_ProvidesContacts: 0 m_Enabled: 1 serializedVersion: 3 - m_Size: {x: 0.012339168, y: 0.025882503, z: 0.005909813} - m_Center: {x: -1.571532e-17, y: 0.00089429616, z: -0.0013475455} + m_Size: {x: 0.012339168, y: 0.025882503, z: 0.0035980714} + m_Center: {x: -1.4127675e-18, y: 0.00089429616, z: -0.00019167557} --- !u!65 &8909336572364058817 BoxCollider: m_ObjectHideFlags: 0 diff --git a/Assets/Artists/Prefabs/Zombie.prefab b/Assets/Artists/Prefabs/Zombie.prefab index 0d6ee6b08..1b9ed3a14 100644 --- a/Assets/Artists/Prefabs/Zombie.prefab +++ b/Assets/Artists/Prefabs/Zombie.prefab @@ -44,13 +44,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1610736432900663163} serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 2, y: 0, z: 2} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 3509096854786611592} - - {fileID: 5612917868120347697} - {fileID: 261189247636088016} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -206,7 +205,7 @@ NavMeshAgent: m_GameObject: {fileID: 1610736432900663163} m_Enabled: 1 m_AgentTypeID: 0 - m_Radius: 0.16 + m_Radius: 0.32 m_Speed: 3.5 m_Acceleration: 8 avoidancePriority: 50 @@ -215,7 +214,7 @@ NavMeshAgent: m_AutoTraverseOffMeshLink: 1 m_AutoBraking: 0 m_AutoRepath: 0 - m_Height: 2 + m_Height: 1.6 m_BaseOffset: 0 m_WalkableMask: 4294967295 m_ObstacleAvoidanceType: 4 @@ -359,7 +358,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c78fe9fd58f5efc4abdeb6d193bf258b, type: 3} m_Name: m_EditorClassIdentifier: - animator: {fileID: 673930142905110667} + animator: {fileID: 0} rigidbodies: - {fileID: 6212079510373085893} - {fileID: 2627371083418363332} @@ -468,13 +467,29 @@ MonoBehaviour: - rid: 7707058030789525625 type: {class: Idle, ns: BITFALL.Movement.MotionBased.States, asm: BITFALL.Entities.Movement.Runtime} data: - clip: {fileID: -4391933643253906413, guid: 6e5372ccf7beb464e965194eb4d564e8, - type: 3} + clip: {fileID: 7400000, guid: 8a914a73777e46445af7079140a911a6, type: 3} - rid: 7707058030789525626 type: {class: Walk, ns: BITFALL.Movement.MotionBased.States, asm: BITFALL.Entities.Movement.Runtime} data: - clip: {fileID: -203655887218126122, guid: 372c0d71272a8fb4cbfa41f52ef78994, - type: 3} + _state: + _FadeDuration: 0.25 + _Events: + _NormalizedTimes: [] + _Callbacks: [] + _Names: [] + _Speed: 1 + _Animations: + - {fileID: 7400000, guid: a1a9219f954bc644d8380dc091e54347, type: 3} + - {fileID: 7400000, guid: 6fb4b5a9e960f374b966988f0807ae1a, type: 3} + - {fileID: 7400000, guid: 503e6c5caa2ffa9469ac8986db8b0a03, type: 3} + _Speeds: [] + _SynchronizeChildren: + _Thresholds: + - -1 + - 0 + - 1 + _DefaultParameter: 0 + _ExtrapolateSpeed: 1 - rid: 7707058030789525638 type: {class: IdleTurn, ns: BITFALL.Movement.MotionBased.States, asm: BITFALL.Entities.Movement.Runtime} data: @@ -512,9 +527,8 @@ MonoBehaviour: - {fileID: -203655887218126122, guid: 6c5cbd0e33d4ba742948bd8098f1beeb, type: 3} - Key: Melee Value: - - {fileID: -203655887218126122, guid: d319bd8b8d6b0274f91bddd4691c70e6, type: 3} - - {fileID: -203655887218126122, guid: cce3cdea83ca5d4488b9306b257adaa8, type: 3} - - {fileID: -203655887218126122, guid: 2af77d9f71b3eef4c908b9396adeb551, type: 3} + - {fileID: 7400000, guid: 7a068e9bd4d92a74faa3ca3c225ea7ab, type: 3} + - {fileID: 7400000, guid: 4a410aae47385784da16b5814337ad97, type: 3} - Key: HitStun Value: - {fileID: -203655887218126122, guid: 82c9040f74a95ef4ca987d174540a848, type: 3} @@ -528,14 +542,15 @@ MonoBehaviour: - {fileID: -203655887218126122, guid: f5508ff7aab49d7438f7b931bb543fd4, type: 3} - Key: Death Value: - - {fileID: -203655887218126122, guid: 40e6b9a4c94e8984aa455def690dd91a, type: 3} - - {fileID: -203655887218126122, guid: 055450a83fcb47f4a8c34eb6b457d5f8, type: 3} - - {fileID: -203655887218126122, guid: a91772e7f4001264d870ee5a2cbc1048, type: 3} + - {fileID: 7400000, guid: 509a212e9c348a74997ce6f304818732, type: 3} + - {fileID: 7400000, guid: ee64f27c88f96304f91f1b945481dc2b, type: 3} + - {fileID: 7400000, guid: c1d3b61ec26c27e4a9ef066aef8e0b2e, type: 3} + - {fileID: 7400000, guid: dd782cce8d8754143ac43a11da776507, type: 3} avatarMasks: _serializedList: - Key: 16 Value: {fileID: 31900000, guid: 263eecbb6a522144aac2b10bef460052, type: 2} - allowDeathAnimation: 0 + allowDeathAnimation: 1 --- !u!114 &2332545226796783687 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1187,7 +1202,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 5964803017347144284} + m_TransformParent: {fileID: 8104504566599589718} m_Modifications: - target: {fileID: 6256051358093332725, guid: 2ad4d682518910847b19ed8106c0071a, type: 3} @@ -1212,17 +1227,17 @@ PrefabInstance: - target: {fileID: 6256051358093332725, guid: 2ad4d682518910847b19ed8106c0071a, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 6256051358093332725, guid: 2ad4d682518910847b19ed8106c0071a, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 6256051358093332725, guid: 2ad4d682518910847b19ed8106c0071a, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 6256051358093332725, guid: 2ad4d682518910847b19ed8106c0071a, type: 3} @@ -1524,7 +1539,11 @@ PrefabInstance: - {fileID: 7613617252232372131, guid: 5f9e9216c9925af4bafec02dca8c438e, type: 3} - {fileID: 1311415486234117464, guid: 5f9e9216c9925af4bafec02dca8c438e, type: 3} m_RemovedGameObjects: [] - m_AddedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 2155766259452216820, guid: 5f9e9216c9925af4bafec02dca8c438e, + type: 3} + insertIndex: -1 + addedObject: {fileID: 5612917868120347697} m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 5f9e9216c9925af4bafec02dca8c438e, type: 3} --- !u!54 &797937506702059996 stripped diff --git a/Assets/Artists/Scenes/Game/DMZ.unity b/Assets/Artists/Scenes/Game/DMZ.unity index 4d2e0aba8..18faa5f98 100644 --- a/Assets/Artists/Scenes/Game/DMZ.unity +++ b/Assets/Artists/Scenes/Game/DMZ.unity @@ -1602,22 +1602,22 @@ PrefabInstance: - target: {fileID: 3772777254845134042, guid: f25aeccf4aba96b43a20d93ee9fa4e6e, type: 3} propertyPath: m_LocalPosition.x - value: 53.821 + value: 17.461002 objectReference: {fileID: 0} - target: {fileID: 3772777254845134042, guid: f25aeccf4aba96b43a20d93ee9fa4e6e, type: 3} propertyPath: m_LocalPosition.y - value: 1.4299991 + value: 1.6051528 objectReference: {fileID: 0} - target: {fileID: 3772777254845134042, guid: f25aeccf4aba96b43a20d93ee9fa4e6e, type: 3} propertyPath: m_LocalPosition.z - value: -62.513924 + value: -39.053925 objectReference: {fileID: 0} - target: {fileID: 3772777254845134042, guid: f25aeccf4aba96b43a20d93ee9fa4e6e, type: 3} propertyPath: m_LocalRotation.w - value: 1 + value: 0.7071068 objectReference: {fileID: 0} - target: {fileID: 3772777254845134042, guid: f25aeccf4aba96b43a20d93ee9fa4e6e, type: 3} @@ -1627,7 +1627,7 @@ PrefabInstance: - target: {fileID: 3772777254845134042, guid: f25aeccf4aba96b43a20d93ee9fa4e6e, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: 0.7071068 objectReference: {fileID: 0} - target: {fileID: 3772777254845134042, guid: f25aeccf4aba96b43a20d93ee9fa4e6e, type: 3} @@ -3979,18 +3979,6 @@ Rigidbody: m_Interpolate: 0 m_Constraints: 0 m_CollisionDetection: 0 ---- !u!4 &61786857 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 7825844732988498872, guid: 78578ed9b40010141b32dcdbbf1a81a7, - type: 3} - m_PrefabInstance: {fileID: 2528610911360317876} - m_PrefabAsset: {fileID: 0} ---- !u!54 &61786858 stripped -Rigidbody: - m_CorrespondingSourceObject: {fileID: 136774175190047077, guid: 78578ed9b40010141b32dcdbbf1a81a7, - type: 3} - m_PrefabInstance: {fileID: 2528610911360317876} - m_PrefabAsset: {fileID: 0} --- !u!1 &62423130 GameObject: m_ObjectHideFlags: 0 @@ -6465,12 +6453,6 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 123430279} m_PrefabAsset: {fileID: 0} ---- !u!4 &123947535 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 7482487960528685477, guid: 78578ed9b40010141b32dcdbbf1a81a7, - type: 3} - m_PrefabInstance: {fileID: 2528610911360317876} - m_PrefabAsset: {fileID: 0} --- !u!1001 &125320316 PrefabInstance: m_ObjectHideFlags: 0 @@ -7137,12 +7119,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 142329862} m_PrefabAsset: {fileID: 0} ---- !u!4 &143040370 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 8850268860742117298, guid: 78578ed9b40010141b32dcdbbf1a81a7, - type: 3} - m_PrefabInstance: {fileID: 2528610911360317876} - m_PrefabAsset: {fileID: 0} --- !u!1001 &143502026 PrefabInstance: m_ObjectHideFlags: 0 @@ -7356,12 +7332,6 @@ MonoBehaviour: blendDistance: 0 weight: 1 sharedProfile: {fileID: 11400000, guid: 291a106b25af4384f89ad564ba3eeac7, type: 2} ---- !u!54 &153545166 stripped -Rigidbody: - m_CorrespondingSourceObject: {fileID: 2126447731747193561, guid: 78578ed9b40010141b32dcdbbf1a81a7, - type: 3} - m_PrefabInstance: {fileID: 2528610911360317876} - m_PrefabAsset: {fileID: 0} --- !u!1001 &154602111 PrefabInstance: m_ObjectHideFlags: 0 @@ -10023,18 +9993,6 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 224088730} m_PrefabAsset: {fileID: 0} ---- !u!4 &229678932 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 3307018151594486756, guid: 78578ed9b40010141b32dcdbbf1a81a7, - type: 3} - m_PrefabInstance: {fileID: 2528610911360317876} - m_PrefabAsset: {fileID: 0} ---- !u!54 &229678933 stripped -Rigidbody: - m_CorrespondingSourceObject: {fileID: 7347894364474258208, guid: 78578ed9b40010141b32dcdbbf1a81a7, - type: 3} - m_PrefabInstance: {fileID: 2528610911360317876} - m_PrefabAsset: {fileID: 0} --- !u!1001 &230507591 PrefabInstance: m_ObjectHideFlags: 0 @@ -11265,7 +11223,7 @@ ConfigurableJoint: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 265186337} - m_ConnectedBody: {fileID: 943742812} + m_ConnectedBody: {fileID: 0} m_ConnectedArticulationBody: {fileID: 0} m_Anchor: {x: 0, y: 0, z: 0} m_Axis: {x: 1, y: 0, z: 0} @@ -13030,7 +12988,7 @@ ConfigurableJoint: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 298658816} - m_ConnectedBody: {fileID: 2081923480} + m_ConnectedBody: {fileID: 0} m_ConnectedArticulationBody: {fileID: 0} m_Anchor: {x: 0, y: 0, z: 0} m_Axis: {x: 1, y: 0, z: 0} @@ -13982,6 +13940,74 @@ Transform: type: 3} m_PrefabInstance: {fileID: 326772179} m_PrefabAsset: {fileID: 0} +--- !u!1001 &327989753 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 1610736432900663163, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_Name + value: Zombie (5) + objectReference: {fileID: 0} + - target: {fileID: 5964803017347144284, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalPosition.x + value: 35.75028 + objectReference: {fileID: 0} + - target: {fileID: 5964803017347144284, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalPosition.y + value: 0.00000047683716 + objectReference: {fileID: 0} + - target: {fileID: 5964803017347144284, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalPosition.z + value: -36.04734 + objectReference: {fileID: 0} + - target: {fileID: 5964803017347144284, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 5964803017347144284, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5964803017347144284, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalRotation.y + value: 0.70710677 + objectReference: {fileID: 0} + - target: {fileID: 5964803017347144284, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5964803017347144284, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5964803017347144284, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 90 + objectReference: {fileID: 0} + - target: {fileID: 5964803017347144284, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 87496a4c1c33c9f4a9a90a9757655d40, type: 3} --- !u!1001 &330879608 PrefabInstance: m_ObjectHideFlags: 0 @@ -15438,6 +15464,74 @@ Transform: type: 3} m_PrefabInstance: {fileID: 364356320} m_PrefabAsset: {fileID: 0} +--- !u!1001 &367675237 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 1610736432900663163, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_Name + value: Zombie (4) + objectReference: {fileID: 0} + - target: {fileID: 5964803017347144284, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalPosition.x + value: 38.15028 + objectReference: {fileID: 0} + - target: {fileID: 5964803017347144284, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalPosition.y + value: 0.00000047683716 + objectReference: {fileID: 0} + - target: {fileID: 5964803017347144284, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalPosition.z + value: -30.447342 + objectReference: {fileID: 0} + - target: {fileID: 5964803017347144284, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 5964803017347144284, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5964803017347144284, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalRotation.y + value: 0.70710677 + objectReference: {fileID: 0} + - target: {fileID: 5964803017347144284, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5964803017347144284, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5964803017347144284, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 90 + objectReference: {fileID: 0} + - target: {fileID: 5964803017347144284, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 87496a4c1c33c9f4a9a90a9757655d40, type: 3} --- !u!1001 &373383639 PrefabInstance: m_ObjectHideFlags: 0 @@ -15934,7 +16028,7 @@ ConfigurableJoint: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 382774991} - m_ConnectedBody: {fileID: 229678933} + m_ConnectedBody: {fileID: 0} m_ConnectedArticulationBody: {fileID: 0} m_Anchor: {x: 0, y: 0, z: 0} m_Axis: {x: 1, y: 0, z: 0} @@ -18218,18 +18312,74 @@ Transform: type: 3} m_PrefabInstance: {fileID: 418354604} m_PrefabAsset: {fileID: 0} ---- !u!4 &422526894 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 3147753399250015454, guid: 78578ed9b40010141b32dcdbbf1a81a7, - type: 3} - m_PrefabInstance: {fileID: 2528610911360317876} - m_PrefabAsset: {fileID: 0} ---- !u!54 &422526895 stripped -Rigidbody: - m_CorrespondingSourceObject: {fileID: 8636768166220051591, guid: 78578ed9b40010141b32dcdbbf1a81a7, - type: 3} - m_PrefabInstance: {fileID: 2528610911360317876} - m_PrefabAsset: {fileID: 0} +--- !u!1001 &420660739 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 1610736432900663163, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_Name + value: Zombie (9) + objectReference: {fileID: 0} + - target: {fileID: 5964803017347144284, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalPosition.x + value: 38.15028 + objectReference: {fileID: 0} + - target: {fileID: 5964803017347144284, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalPosition.y + value: 0.00000047683716 + objectReference: {fileID: 0} + - target: {fileID: 5964803017347144284, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalPosition.z + value: -30.447342 + objectReference: {fileID: 0} + - target: {fileID: 5964803017347144284, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 5964803017347144284, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5964803017347144284, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalRotation.y + value: 0.70710677 + objectReference: {fileID: 0} + - target: {fileID: 5964803017347144284, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5964803017347144284, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5964803017347144284, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 90 + objectReference: {fileID: 0} + - target: {fileID: 5964803017347144284, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 87496a4c1c33c9f4a9a90a9757655d40, type: 3} --- !u!1001 &423794868 PrefabInstance: m_ObjectHideFlags: 0 @@ -19259,7 +19409,7 @@ ConfigurableJoint: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 447516865} - m_ConnectedBody: {fileID: 61786858} + m_ConnectedBody: {fileID: 0} m_ConnectedArticulationBody: {fileID: 0} m_Anchor: {x: 0, y: 0, z: 0} m_Axis: {x: 1, y: 0, z: 0} @@ -20991,7 +21141,7 @@ ConfigurableJoint: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 482347557} - m_ConnectedBody: {fileID: 934329458} + m_ConnectedBody: {fileID: 0} m_ConnectedArticulationBody: {fileID: 0} m_Anchor: {x: 0, y: 0, z: 0} m_Axis: {x: 1, y: 0, z: 0} @@ -22576,12 +22726,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 496273031} m_PrefabAsset: {fileID: 0} ---- !u!4 &505303611 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 8644423026648841935, guid: 78578ed9b40010141b32dcdbbf1a81a7, - type: 3} - m_PrefabInstance: {fileID: 2528610911360317876} - m_PrefabAsset: {fileID: 0} --- !u!1001 &507357727 PrefabInstance: m_ObjectHideFlags: 0 @@ -23338,6 +23482,74 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 526770212} m_PrefabAsset: {fileID: 0} +--- !u!1001 &529669960 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 1610736432900663163, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_Name + value: Zombie (2) + objectReference: {fileID: 0} + - target: {fileID: 5964803017347144284, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalPosition.x + value: 33.51028 + objectReference: {fileID: 0} + - target: {fileID: 5964803017347144284, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalPosition.y + value: 0.00000047683716 + objectReference: {fileID: 0} + - target: {fileID: 5964803017347144284, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalPosition.z + value: -29.96734 + objectReference: {fileID: 0} + - target: {fileID: 5964803017347144284, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 5964803017347144284, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5964803017347144284, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalRotation.y + value: 0.70710677 + objectReference: {fileID: 0} + - target: {fileID: 5964803017347144284, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5964803017347144284, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5964803017347144284, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 90 + objectReference: {fileID: 0} + - target: {fileID: 5964803017347144284, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 87496a4c1c33c9f4a9a90a9757655d40, type: 3} --- !u!1001 &529860062 PrefabInstance: m_ObjectHideFlags: 0 @@ -25867,18 +26079,6 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!4 &589450235 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 2058332350341543695, guid: 78578ed9b40010141b32dcdbbf1a81a7, - type: 3} - m_PrefabInstance: {fileID: 2528610911360317876} - m_PrefabAsset: {fileID: 0} ---- !u!54 &589450236 stripped -Rigidbody: - m_CorrespondingSourceObject: {fileID: 4371349262209788090, guid: 78578ed9b40010141b32dcdbbf1a81a7, - type: 3} - m_PrefabInstance: {fileID: 2528610911360317876} - m_PrefabAsset: {fileID: 0} --- !u!1 &591226019 stripped GameObject: m_CorrespondingSourceObject: {fileID: 1301019947510714, guid: b89fe3f03a968ea40b750113555e1169, @@ -26208,6 +26408,74 @@ MeshFilter: type: 3} m_PrefabInstance: {fileID: 395867860} m_PrefabAsset: {fileID: 0} +--- !u!1001 &598908707 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 1610736432900663163, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_Name + value: Zombie (6) + objectReference: {fileID: 0} + - target: {fileID: 5964803017347144284, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalPosition.x + value: 37.51028 + objectReference: {fileID: 0} + - target: {fileID: 5964803017347144284, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalPosition.y + value: 0.00000047683716 + objectReference: {fileID: 0} + - target: {fileID: 5964803017347144284, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalPosition.z + value: -33.167343 + objectReference: {fileID: 0} + - target: {fileID: 5964803017347144284, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 5964803017347144284, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5964803017347144284, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalRotation.y + value: 0.70710677 + objectReference: {fileID: 0} + - target: {fileID: 5964803017347144284, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5964803017347144284, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5964803017347144284, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 90 + objectReference: {fileID: 0} + - target: {fileID: 5964803017347144284, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 87496a4c1c33c9f4a9a90a9757655d40, type: 3} --- !u!1001 &602295480 PrefabInstance: m_ObjectHideFlags: 0 @@ -26708,7 +26976,7 @@ ConfigurableJoint: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 609655922} - m_ConnectedBody: {fileID: 153545166} + m_ConnectedBody: {fileID: 0} m_ConnectedArticulationBody: {fileID: 0} m_Anchor: {x: 0, y: 0, z: 0} m_Axis: {x: 1, y: 0, z: 0} @@ -26816,7 +27084,7 @@ ConfigurableJoint: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 620800467} - m_ConnectedBody: {fileID: 1418618360} + m_ConnectedBody: {fileID: 0} m_ConnectedArticulationBody: {fileID: 0} m_Anchor: {x: 0, y: 0, z: 0} m_Axis: {x: 1, y: 0, z: 0} @@ -27058,18 +27326,6 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 626801303} m_PrefabAsset: {fileID: 0} ---- !u!4 &627982695 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 2431113013255169257, guid: 78578ed9b40010141b32dcdbbf1a81a7, - type: 3} - m_PrefabInstance: {fileID: 2528610911360317876} - m_PrefabAsset: {fileID: 0} ---- !u!54 &627982696 stripped -Rigidbody: - m_CorrespondingSourceObject: {fileID: 7674299568144277791, guid: 78578ed9b40010141b32dcdbbf1a81a7, - type: 3} - m_PrefabInstance: {fileID: 2528610911360317876} - m_PrefabAsset: {fileID: 0} --- !u!1001 &629991598 PrefabInstance: m_ObjectHideFlags: 0 @@ -31477,11 +31733,21 @@ PrefabInstance: propertyPath: m_LocalPosition.x value: 0.10000038 objectReference: {fileID: 0} + - target: {fileID: 1224507104424488257, guid: e5d265393747af741b4f5d719598831a, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} - target: {fileID: 1224507104424488257, guid: e5d265393747af741b4f5d719598831a, type: 3} propertyPath: m_LocalPosition.z value: 0.27000046 objectReference: {fileID: 0} + - target: {fileID: 1224507104424488257, guid: e5d265393747af741b4f5d719598831a, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} - target: {fileID: 1663075863122967674, guid: e5d265393747af741b4f5d719598831a, type: 3} propertyPath: m_TranslationOffsets.Array.data[0].z @@ -31492,6 +31758,16 @@ PrefabInstance: propertyPath: m_LocalPosition.x value: -0.10000038 objectReference: {fileID: 0} + - target: {fileID: 1757217011023232459, guid: e5d265393747af741b4f5d719598831a, + type: 3} + propertyPath: m_RotationOffsets.Array.data[0].x + value: -89.980225 + objectReference: {fileID: 0} + - target: {fileID: 1757217011023232459, guid: e5d265393747af741b4f5d719598831a, + type: 3} + propertyPath: m_RotationOffsets.Array.data[0].z + value: -180 + objectReference: {fileID: 0} - target: {fileID: 1839138478267618740, guid: e5d265393747af741b4f5d719598831a, type: 3} propertyPath: m_LocalPosition.x @@ -31502,11 +31778,46 @@ PrefabInstance: propertyPath: m_LocalPosition.x value: 0.79999924 objectReference: {fileID: 0} + - target: {fileID: 2367504132869257504, guid: e5d265393747af741b4f5d719598831a, + type: 3} + propertyPath: m_LocalRotation.w + value: -0.0000001986123 + objectReference: {fileID: 0} + - target: {fileID: 2809694002191985922, guid: e5d265393747af741b4f5d719598831a, + type: 3} + propertyPath: m_RotationOffsets.Array.data[0].x + value: -89.89165 + objectReference: {fileID: 0} - target: {fileID: 2917424819654314717, guid: e5d265393747af741b4f5d719598831a, type: 3} propertyPath: m_LocalPosition.x value: -0.29999924 objectReference: {fileID: 0} + - target: {fileID: 3549189266544117135, guid: e5d265393747af741b4f5d719598831a, + type: 3} + propertyPath: m_RotationOffsets.Array.data[0].x + value: -89.980225 + objectReference: {fileID: 0} + - target: {fileID: 3549189266544117135, guid: e5d265393747af741b4f5d719598831a, + type: 3} + propertyPath: m_RotationOffsets.Array.data[0].z + value: -180 + objectReference: {fileID: 0} + - target: {fileID: 3956412582329371354, guid: e5d265393747af741b4f5d719598831a, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3956412582329371354, guid: e5d265393747af741b4f5d719598831a, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4733985430205684710, guid: e5d265393747af741b4f5d719598831a, + type: 3} + propertyPath: m_LocalPosition.x + value: 0.00000047683716 + objectReference: {fileID: 0} - target: {fileID: 4733985430205684710, guid: e5d265393747af741b4f5d719598831a, type: 3} propertyPath: m_LocalPosition.y @@ -31517,6 +31828,16 @@ PrefabInstance: propertyPath: m_LocalPosition.z value: 0.000000059604645 objectReference: {fileID: 0} + - target: {fileID: 4733985430205684710, guid: e5d265393747af741b4f5d719598831a, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.00000006621555 + objectReference: {fileID: 0} + - target: {fileID: 4733985430205684710, guid: e5d265393747af741b4f5d719598831a, + type: 3} + propertyPath: m_LocalRotation.x + value: -0.00000006619268 + objectReference: {fileID: 0} - target: {fileID: 4826102346843731729, guid: e5d265393747af741b4f5d719598831a, type: 3} propertyPath: m_Name @@ -31572,6 +31893,16 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 5017534167110761723, guid: e5d265393747af741b4f5d719598831a, + type: 3} + propertyPath: m_RotationOffsets.Array.data[0].x + value: -89.980225 + objectReference: {fileID: 0} + - target: {fileID: 5017534167110761723, guid: e5d265393747af741b4f5d719598831a, + type: 3} + propertyPath: m_RotationOffsets.Array.data[0].z + value: -180 + objectReference: {fileID: 0} - target: {fileID: 5833942975014147397, guid: e5d265393747af741b4f5d719598831a, type: 3} propertyPath: m_TranslationOffsets.Array.data[0].z @@ -31592,6 +31923,36 @@ PrefabInstance: propertyPath: m_LocalPosition.z value: 0.000000059604645 objectReference: {fileID: 0} + - target: {fileID: 6272986916291105450, guid: e5d265393747af741b4f5d719598831a, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.00000006621555 + objectReference: {fileID: 0} + - target: {fileID: 6272986916291105450, guid: e5d265393747af741b4f5d719598831a, + type: 3} + propertyPath: m_LocalRotation.x + value: -0.00000006619268 + objectReference: {fileID: 0} + - target: {fileID: 6272986916291105450, guid: e5d265393747af741b4f5d719598831a, + type: 3} + propertyPath: m_LocalRotation.y + value: -0.7069847 + objectReference: {fileID: 0} + - target: {fileID: 6272986916291105450, guid: e5d265393747af741b4f5d719598831a, + type: 3} + propertyPath: m_LocalRotation.z + value: -0.7072289 + objectReference: {fileID: 0} + - target: {fileID: 6543478755785382772, guid: e5d265393747af741b4f5d719598831a, + type: 3} + propertyPath: m_RotationOffsets.Array.data[0].x + value: -89.980225 + objectReference: {fileID: 0} + - target: {fileID: 6543478755785382772, guid: e5d265393747af741b4f5d719598831a, + type: 3} + propertyPath: m_RotationOffsets.Array.data[0].z + value: -180 + objectReference: {fileID: 0} - target: {fileID: 6653858650446533293, guid: e5d265393747af741b4f5d719598831a, type: 3} propertyPath: m_LocalPosition.x @@ -31607,11 +31968,26 @@ PrefabInstance: propertyPath: m_LocalPosition.z value: 0.000000059604645 objectReference: {fileID: 0} + - target: {fileID: 6653858650446533293, guid: e5d265393747af741b4f5d719598831a, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6653858650446533293, guid: e5d265393747af741b4f5d719598831a, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} - target: {fileID: 6812050277568474034, guid: e5d265393747af741b4f5d719598831a, type: 3} propertyPath: m_LocalPosition.x value: 0.10000038 objectReference: {fileID: 0} + - target: {fileID: 6812050277568474034, guid: e5d265393747af741b4f5d719598831a, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} - target: {fileID: 6943288602036401220, guid: e5d265393747af741b4f5d719598831a, type: 3} propertyPath: originalObjects.Array.size @@ -32007,6 +32383,74 @@ Transform: m_Children: [] m_Father: {fileID: 62423131} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &737730575 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 1610736432900663163, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_Name + value: Zombie (1) + objectReference: {fileID: 0} + - target: {fileID: 5964803017347144284, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalPosition.x + value: 34.15028 + objectReference: {fileID: 0} + - target: {fileID: 5964803017347144284, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalPosition.y + value: 0.00000047683716 + objectReference: {fileID: 0} + - target: {fileID: 5964803017347144284, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalPosition.z + value: -34.76734 + objectReference: {fileID: 0} + - target: {fileID: 5964803017347144284, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 5964803017347144284, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5964803017347144284, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalRotation.y + value: 0.70710677 + objectReference: {fileID: 0} + - target: {fileID: 5964803017347144284, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5964803017347144284, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5964803017347144284, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 90 + objectReference: {fileID: 0} + - target: {fileID: 5964803017347144284, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 87496a4c1c33c9f4a9a90a9757655d40, type: 3} --- !u!1001 &737974991 PrefabInstance: m_ObjectHideFlags: 0 @@ -37790,12 +38234,6 @@ Mesh: offset: 0 size: 0 path: ---- !u!4 &830196196 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 1436953889258592859, guid: 78578ed9b40010141b32dcdbbf1a81a7, - type: 3} - m_PrefabInstance: {fileID: 2528610911360317876} - m_PrefabAsset: {fileID: 0} --- !u!1001 &831218679 PrefabInstance: m_ObjectHideFlags: 0 @@ -38197,80 +38635,6 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 831801475} m_PrefabAsset: {fileID: 0} ---- !u!1001 &832773408 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 2601377014284619026, guid: 78578ed9b40010141b32dcdbbf1a81a7, - type: 3} - propertyPath: managedReferences[7707058030789525626].clip - value: - objectReference: {fileID: -203655887218126122, guid: 0e015c64afddc1a42b7af831b4338168, - type: 3} - - target: {fileID: 8689051918916117328, guid: 78578ed9b40010141b32dcdbbf1a81a7, - type: 3} - propertyPath: m_LocalPosition.x - value: 33.98 - objectReference: {fileID: 0} - - target: {fileID: 8689051918916117328, guid: 78578ed9b40010141b32dcdbbf1a81a7, - type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8689051918916117328, guid: 78578ed9b40010141b32dcdbbf1a81a7, - type: 3} - propertyPath: m_LocalPosition.z - value: -26.115007 - objectReference: {fileID: 0} - - target: {fileID: 8689051918916117328, guid: 78578ed9b40010141b32dcdbbf1a81a7, - type: 3} - propertyPath: m_LocalRotation.w - value: -0.7071067 - objectReference: {fileID: 0} - - target: {fileID: 8689051918916117328, guid: 78578ed9b40010141b32dcdbbf1a81a7, - type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 8689051918916117328, guid: 78578ed9b40010141b32dcdbbf1a81a7, - type: 3} - propertyPath: m_LocalRotation.y - value: -0.7071069 - objectReference: {fileID: 0} - - target: {fileID: 8689051918916117328, guid: 78578ed9b40010141b32dcdbbf1a81a7, - type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 8689051918916117328, guid: 78578ed9b40010141b32dcdbbf1a81a7, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8689051918916117328, guid: 78578ed9b40010141b32dcdbbf1a81a7, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: -270 - objectReference: {fileID: 0} - - target: {fileID: 8689051918916117328, guid: 78578ed9b40010141b32dcdbbf1a81a7, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 9153498656495333926, guid: 78578ed9b40010141b32dcdbbf1a81a7, - type: 3} - propertyPath: m_Name - value: Physics Fast Zombie - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 78578ed9b40010141b32dcdbbf1a81a7, type: 3} --- !u!1001 &834558889 PrefabInstance: m_ObjectHideFlags: 0 @@ -38663,12 +39027,6 @@ MonoBehaviour: trunkWindSpeed: 10 trunkWindWeight: 1 trunkWindSwinging: 0.5 ---- !u!54 &840554930 stripped -Rigidbody: - m_CorrespondingSourceObject: {fileID: 2944281116642761581, guid: 78578ed9b40010141b32dcdbbf1a81a7, - type: 3} - m_PrefabInstance: {fileID: 2528610911360317876} - m_PrefabAsset: {fileID: 0} --- !u!1001 &842107814 PrefabInstance: m_ObjectHideFlags: 0 @@ -42950,18 +43308,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 934281413} m_PrefabAsset: {fileID: 0} ---- !u!4 &934329457 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 727672878812062134, guid: 78578ed9b40010141b32dcdbbf1a81a7, - type: 3} - m_PrefabInstance: {fileID: 2528610911360317876} - m_PrefabAsset: {fileID: 0} ---- !u!54 &934329458 stripped -Rigidbody: - m_CorrespondingSourceObject: {fileID: 4031255020915963985, guid: 78578ed9b40010141b32dcdbbf1a81a7, - type: 3} - m_PrefabInstance: {fileID: 2528610911360317876} - m_PrefabAsset: {fileID: 0} --- !u!1001 &935712235 PrefabInstance: m_ObjectHideFlags: 0 @@ -43471,6 +43817,74 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 938874121} m_PrefabAsset: {fileID: 0} +--- !u!1001 &939574248 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 1610736432900663163, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_Name + value: Zombie (3) + objectReference: {fileID: 0} + - target: {fileID: 5964803017347144284, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalPosition.x + value: 33.99028 + objectReference: {fileID: 0} + - target: {fileID: 5964803017347144284, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalPosition.y + value: 0.00000047683716 + objectReference: {fileID: 0} + - target: {fileID: 5964803017347144284, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalPosition.z + value: -32.52734 + objectReference: {fileID: 0} + - target: {fileID: 5964803017347144284, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 5964803017347144284, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5964803017347144284, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalRotation.y + value: 0.70710677 + objectReference: {fileID: 0} + - target: {fileID: 5964803017347144284, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5964803017347144284, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5964803017347144284, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 90 + objectReference: {fileID: 0} + - target: {fileID: 5964803017347144284, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 87496a4c1c33c9f4a9a90a9757655d40, type: 3} --- !u!1001 &941302927 PrefabInstance: m_ObjectHideFlags: 0 @@ -43534,18 +43948,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 941302927} m_PrefabAsset: {fileID: 0} ---- !u!4 &943742811 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 8945004021234411519, guid: 78578ed9b40010141b32dcdbbf1a81a7, - type: 3} - m_PrefabInstance: {fileID: 2528610911360317876} - m_PrefabAsset: {fileID: 0} ---- !u!54 &943742812 stripped -Rigidbody: - m_CorrespondingSourceObject: {fileID: 6958467168310211354, guid: 78578ed9b40010141b32dcdbbf1a81a7, - type: 3} - m_PrefabInstance: {fileID: 2528610911360317876} - m_PrefabAsset: {fileID: 0} --- !u!1001 &946014112 PrefabInstance: m_ObjectHideFlags: 0 @@ -44331,7 +44733,7 @@ ConfigurableJoint: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 953886830} - m_ConnectedBody: {fileID: 1803569864} + m_ConnectedBody: {fileID: 0} m_ConnectedArticulationBody: {fileID: 0} m_Anchor: {x: 0, y: 0, z: 0} m_Axis: {x: 1, y: 0, z: 0} @@ -47610,7 +48012,7 @@ ConfigurableJoint: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1009672770} - m_ConnectedBody: {fileID: 422526895} + m_ConnectedBody: {fileID: 0} m_ConnectedArticulationBody: {fileID: 0} m_Anchor: {x: 0, y: 0, z: 0} m_Axis: {x: 1, y: 0, z: 0} @@ -54798,7 +55200,7 @@ ConfigurableJoint: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1171587975} - m_ConnectedBody: {fileID: 627982696} + m_ConnectedBody: {fileID: 0} m_ConnectedArticulationBody: {fileID: 0} m_Anchor: {x: 0, y: 0, z: 0} m_Axis: {x: 1, y: 0, z: 0} @@ -56943,6 +57345,74 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 1216822520} m_PrefabAsset: {fileID: 0} +--- !u!1001 &1217950287 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 1610736432900663163, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_Name + value: Zombie (10) + objectReference: {fileID: 0} + - target: {fileID: 5964803017347144284, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalPosition.x + value: 10.950283 + objectReference: {fileID: 0} + - target: {fileID: 5964803017347144284, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalPosition.y + value: 0.00000047683716 + objectReference: {fileID: 0} + - target: {fileID: 5964803017347144284, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalPosition.z + value: -38.287342 + objectReference: {fileID: 0} + - target: {fileID: 5964803017347144284, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 5964803017347144284, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5964803017347144284, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalRotation.y + value: 0.70710677 + objectReference: {fileID: 0} + - target: {fileID: 5964803017347144284, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5964803017347144284, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5964803017347144284, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 90 + objectReference: {fileID: 0} + - target: {fileID: 5964803017347144284, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 87496a4c1c33c9f4a9a90a9757655d40, type: 3} --- !u!1001 &1223904574 PrefabInstance: m_ObjectHideFlags: 0 @@ -60024,6 +60494,74 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1295412310} m_PrefabAsset: {fileID: 0} +--- !u!1001 &1296933877 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 1610736432900663163, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_Name + value: Zombie (11) + objectReference: {fileID: 0} + - target: {fileID: 5964803017347144284, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalPosition.x + value: 13.190281 + objectReference: {fileID: 0} + - target: {fileID: 5964803017347144284, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalPosition.y + value: 0.00000047683716 + objectReference: {fileID: 0} + - target: {fileID: 5964803017347144284, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalPosition.z + value: -16.687344 + objectReference: {fileID: 0} + - target: {fileID: 5964803017347144284, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 5964803017347144284, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5964803017347144284, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalRotation.y + value: 0.70710677 + objectReference: {fileID: 0} + - target: {fileID: 5964803017347144284, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5964803017347144284, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5964803017347144284, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 90 + objectReference: {fileID: 0} + - target: {fileID: 5964803017347144284, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 87496a4c1c33c9f4a9a90a9757655d40, type: 3} --- !u!1001 &1297445803 PrefabInstance: m_ObjectHideFlags: 0 @@ -63725,18 +64263,6 @@ Transform: m_Children: [] m_Father: {fileID: 2057076194} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!4 &1375726042 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 2959809113715590856, guid: 78578ed9b40010141b32dcdbbf1a81a7, - type: 3} - m_PrefabInstance: {fileID: 2528610911360317876} - m_PrefabAsset: {fileID: 0} ---- !u!54 &1375726043 stripped -Rigidbody: - m_CorrespondingSourceObject: {fileID: 160270051152302013, guid: 78578ed9b40010141b32dcdbbf1a81a7, - type: 3} - m_PrefabInstance: {fileID: 2528610911360317876} - m_PrefabAsset: {fileID: 0} --- !u!1001 &1380747660 PrefabInstance: m_ObjectHideFlags: 0 @@ -65451,12 +65977,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1417540063} m_PrefabAsset: {fileID: 0} ---- !u!54 &1418618360 stripped -Rigidbody: - m_CorrespondingSourceObject: {fileID: 5133925065161787641, guid: 78578ed9b40010141b32dcdbbf1a81a7, - type: 3} - m_PrefabInstance: {fileID: 2528610911360317876} - m_PrefabAsset: {fileID: 0} --- !u!1001 &1424082785 PrefabInstance: m_ObjectHideFlags: 0 @@ -69641,7 +70161,7 @@ ConfigurableJoint: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1525610375} - m_ConnectedBody: {fileID: 1972272394} + m_ConnectedBody: {fileID: 0} m_ConnectedArticulationBody: {fileID: 0} m_Anchor: {x: 0, y: 0, z: 0} m_Axis: {x: 1, y: 0, z: 0} @@ -73832,7 +74352,7 @@ ConfigurableJoint: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1611222955} - m_ConnectedBody: {fileID: 1711070106} + m_ConnectedBody: {fileID: 0} m_ConnectedArticulationBody: {fileID: 0} m_Anchor: {x: 0, y: 0, z: 0} m_Axis: {x: 1, y: 0, z: 0} @@ -78492,18 +79012,6 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: f7b831c9117af914d81247e3a751b182, type: 3} ---- !u!4 &1711070105 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 8499183269464109603, guid: 78578ed9b40010141b32dcdbbf1a81a7, - type: 3} - m_PrefabInstance: {fileID: 2528610911360317876} - m_PrefabAsset: {fileID: 0} ---- !u!54 &1711070106 stripped -Rigidbody: - m_CorrespondingSourceObject: {fileID: 7459791088285275282, guid: 78578ed9b40010141b32dcdbbf1a81a7, - type: 3} - m_PrefabInstance: {fileID: 2528610911360317876} - m_PrefabAsset: {fileID: 0} --- !u!1 &1712456735 stripped GameObject: m_CorrespondingSourceObject: {fileID: 6155485094068053252, guid: c332bc1caa59c234197931b60f008785, @@ -78517,7 +79025,7 @@ ConfigurableJoint: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1712456735} - m_ConnectedBody: {fileID: 589450236} + m_ConnectedBody: {fileID: 0} m_ConnectedArticulationBody: {fileID: 0} m_Anchor: {x: 0, y: 0, z: 0} m_Axis: {x: 1, y: 0, z: 0} @@ -82857,18 +83365,6 @@ Transform: - {fileID: 2057338219} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!4 &1803569863 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 501755161128246745, guid: 78578ed9b40010141b32dcdbbf1a81a7, - type: 3} - m_PrefabInstance: {fileID: 2528610911360317876} - m_PrefabAsset: {fileID: 0} ---- !u!54 &1803569864 stripped -Rigidbody: - m_CorrespondingSourceObject: {fileID: 6412578701059744665, guid: 78578ed9b40010141b32dcdbbf1a81a7, - type: 3} - m_PrefabInstance: {fileID: 2528610911360317876} - m_PrefabAsset: {fileID: 0} --- !u!1001 &1808263179 PrefabInstance: m_ObjectHideFlags: 0 @@ -84420,6 +84916,74 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1845181457} m_PrefabAsset: {fileID: 0} +--- !u!1001 &1848319088 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 1610736432900663163, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_Name + value: Zombie (7) + objectReference: {fileID: 0} + - target: {fileID: 5964803017347144284, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalPosition.x + value: 37.19028 + objectReference: {fileID: 0} + - target: {fileID: 5964803017347144284, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalPosition.y + value: 0.00000047683716 + objectReference: {fileID: 0} + - target: {fileID: 5964803017347144284, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalPosition.z + value: -25.647343 + objectReference: {fileID: 0} + - target: {fileID: 5964803017347144284, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 5964803017347144284, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5964803017347144284, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalRotation.y + value: 0.70710677 + objectReference: {fileID: 0} + - target: {fileID: 5964803017347144284, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5964803017347144284, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5964803017347144284, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 90 + objectReference: {fileID: 0} + - target: {fileID: 5964803017347144284, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 87496a4c1c33c9f4a9a90a9757655d40, type: 3} --- !u!1001 &1851558200 PrefabInstance: m_ObjectHideFlags: 0 @@ -84515,7 +85079,7 @@ ConfigurableJoint: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1857528257} - m_ConnectedBody: {fileID: 1375726043} + m_ConnectedBody: {fileID: 0} m_ConnectedArticulationBody: {fileID: 0} m_Anchor: {x: 0, y: 0, z: 0} m_Axis: {x: 1, y: 0, z: 0} @@ -84975,6 +85539,74 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 49de140ea41b23442b0d59ec1db8220d, type: 3} +--- !u!1001 &1864886639 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 1610736432900663163, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_Name + value: Zombie (8) + objectReference: {fileID: 0} + - target: {fileID: 5964803017347144284, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalPosition.x + value: 33.99028 + objectReference: {fileID: 0} + - target: {fileID: 5964803017347144284, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalPosition.y + value: 0.00000047683716 + objectReference: {fileID: 0} + - target: {fileID: 5964803017347144284, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalPosition.z + value: -25.487343 + objectReference: {fileID: 0} + - target: {fileID: 5964803017347144284, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 5964803017347144284, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5964803017347144284, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalRotation.y + value: 0.70710677 + objectReference: {fileID: 0} + - target: {fileID: 5964803017347144284, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5964803017347144284, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5964803017347144284, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 90 + objectReference: {fileID: 0} + - target: {fileID: 5964803017347144284, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 87496a4c1c33c9f4a9a90a9757655d40, type: 3} --- !u!1001 &1870505222 PrefabInstance: m_ObjectHideFlags: 0 @@ -89585,12 +90217,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1972063865} m_PrefabAsset: {fileID: 0} ---- !u!54 &1972272394 stripped -Rigidbody: - m_CorrespondingSourceObject: {fileID: 541636072964171174, guid: 78578ed9b40010141b32dcdbbf1a81a7, - type: 3} - m_PrefabInstance: {fileID: 2528610911360317876} - m_PrefabAsset: {fileID: 0} --- !u!1001 &1972282229 PrefabInstance: m_ObjectHideFlags: 0 @@ -92047,7 +92673,7 @@ ConfigurableJoint: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2019545777} - m_ConnectedBody: {fileID: 840554930} + m_ConnectedBody: {fileID: 0} m_ConnectedArticulationBody: {fileID: 0} m_Anchor: {x: 0, y: 0, z: 0} m_Axis: {x: 1, y: 0, z: 0} @@ -95716,18 +96342,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 2079884193} m_PrefabAsset: {fileID: 0} ---- !u!4 &2081923479 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 2365484509505519460, guid: 78578ed9b40010141b32dcdbbf1a81a7, - type: 3} - m_PrefabInstance: {fileID: 2528610911360317876} - m_PrefabAsset: {fileID: 0} ---- !u!54 &2081923480 stripped -Rigidbody: - m_CorrespondingSourceObject: {fileID: 7913537342847088362, guid: 78578ed9b40010141b32dcdbbf1a81a7, - type: 3} - m_PrefabInstance: {fileID: 2528610911360317876} - m_PrefabAsset: {fileID: 0} --- !u!1001 &2082767413 PrefabInstance: m_ObjectHideFlags: 0 @@ -123502,74 +124116,6 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 49b382019c702974cb5c1ae3306d01a2, type: 3} ---- !u!1001 &2528610911360317876 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 8689051918916117328, guid: 78578ed9b40010141b32dcdbbf1a81a7, - type: 3} - propertyPath: m_LocalPosition.x - value: 33.98 - objectReference: {fileID: 0} - - target: {fileID: 8689051918916117328, guid: 78578ed9b40010141b32dcdbbf1a81a7, - type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8689051918916117328, guid: 78578ed9b40010141b32dcdbbf1a81a7, - type: 3} - propertyPath: m_LocalPosition.z - value: -28.615007 - objectReference: {fileID: 0} - - target: {fileID: 8689051918916117328, guid: 78578ed9b40010141b32dcdbbf1a81a7, - type: 3} - propertyPath: m_LocalRotation.w - value: -0.7071067 - objectReference: {fileID: 0} - - target: {fileID: 8689051918916117328, guid: 78578ed9b40010141b32dcdbbf1a81a7, - type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 8689051918916117328, guid: 78578ed9b40010141b32dcdbbf1a81a7, - type: 3} - propertyPath: m_LocalRotation.y - value: -0.7071069 - objectReference: {fileID: 0} - - target: {fileID: 8689051918916117328, guid: 78578ed9b40010141b32dcdbbf1a81a7, - type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 8689051918916117328, guid: 78578ed9b40010141b32dcdbbf1a81a7, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8689051918916117328, guid: 78578ed9b40010141b32dcdbbf1a81a7, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: -270 - objectReference: {fileID: 0} - - target: {fileID: 8689051918916117328, guid: 78578ed9b40010141b32dcdbbf1a81a7, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 9153498656495333926, guid: 78578ed9b40010141b32dcdbbf1a81a7, - type: 3} - propertyPath: m_Name - value: Physics Zombie - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 78578ed9b40010141b32dcdbbf1a81a7, type: 3} --- !u!1001 &2581080958033185948 PrefabInstance: m_ObjectHideFlags: 0 @@ -123864,7 +124410,7 @@ PrefabInstance: type: 3} propertyPath: m_ConnectedBody value: - objectReference: {fileID: 1803569864} + objectReference: {fileID: 0} - target: {fileID: 303486682702111883, guid: c332bc1caa59c234197931b60f008785, type: 3} propertyPath: m_ConnectedAnchor.x @@ -124014,7 +124560,7 @@ PrefabInstance: type: 3} propertyPath: root.Item2 value: - objectReference: {fileID: 229678932} + objectReference: {fileID: 0} - target: {fileID: 2889386559131234303, guid: c332bc1caa59c234197931b60f008785, type: 3} propertyPath: rootSync.value.Item1 @@ -124024,7 +124570,7 @@ PrefabInstance: type: 3} propertyPath: rootSync.value.Item2 value: - objectReference: {fileID: 229678932} + objectReference: {fileID: 0} - target: {fileID: 2889386559131234303, guid: c332bc1caa59c234197931b60f008785, type: 3} propertyPath: overrideAngularMotion.allow @@ -124039,62 +124585,62 @@ PrefabInstance: type: 3} propertyPath: jointConfigures.Array.data[0].animate value: - objectReference: {fileID: 934329457} + objectReference: {fileID: 0} - target: {fileID: 2889386559131234303, guid: c332bc1caa59c234197931b60f008785, type: 3} propertyPath: jointConfigures.Array.data[1].animate value: - objectReference: {fileID: 422526894} + objectReference: {fileID: 0} - target: {fileID: 2889386559131234303, guid: c332bc1caa59c234197931b60f008785, type: 3} propertyPath: jointConfigures.Array.data[2].animate value: - objectReference: {fileID: 627982695} + objectReference: {fileID: 0} - target: {fileID: 2889386559131234303, guid: c332bc1caa59c234197931b60f008785, type: 3} propertyPath: jointConfigures.Array.data[3].animate value: - objectReference: {fileID: 505303611} + objectReference: {fileID: 0} - target: {fileID: 2889386559131234303, guid: c332bc1caa59c234197931b60f008785, type: 3} propertyPath: jointConfigures.Array.data[4].animate value: - objectReference: {fileID: 830196196} + objectReference: {fileID: 0} - target: {fileID: 2889386559131234303, guid: c332bc1caa59c234197931b60f008785, type: 3} propertyPath: jointConfigures.Array.data[5].animate value: - objectReference: {fileID: 589450235} + objectReference: {fileID: 0} - target: {fileID: 2889386559131234303, guid: c332bc1caa59c234197931b60f008785, type: 3} propertyPath: jointConfigures.Array.data[6].animate value: - objectReference: {fileID: 143040370} + objectReference: {fileID: 0} - target: {fileID: 2889386559131234303, guid: c332bc1caa59c234197931b60f008785, type: 3} propertyPath: jointConfigures.Array.data[7].animate value: - objectReference: {fileID: 123947535} + objectReference: {fileID: 0} - target: {fileID: 2889386559131234303, guid: c332bc1caa59c234197931b60f008785, type: 3} propertyPath: jointConfigures.Array.data[8].animate value: - objectReference: {fileID: 1803569863} + objectReference: {fileID: 0} - target: {fileID: 2889386559131234303, guid: c332bc1caa59c234197931b60f008785, type: 3} propertyPath: jointConfigures.Array.data[9].animate value: - objectReference: {fileID: 943742811} + objectReference: {fileID: 0} - target: {fileID: 2889386559131234303, guid: c332bc1caa59c234197931b60f008785, type: 3} propertyPath: jointConfigures.Array.data[10].animate value: - objectReference: {fileID: 1375726042} + objectReference: {fileID: 0} - target: {fileID: 2889386559131234303, guid: c332bc1caa59c234197931b60f008785, type: 3} propertyPath: jointConfigures.Array.data[11].animate value: - objectReference: {fileID: 1711070105} + objectReference: {fileID: 0} - target: {fileID: 2889386559131234303, guid: c332bc1caa59c234197931b60f008785, type: 3} propertyPath: jointConfigures.Array.data[12].animate @@ -124104,12 +124650,12 @@ PrefabInstance: type: 3} propertyPath: jointConfigures.Array.data[13].animate value: - objectReference: {fileID: 2081923479} + objectReference: {fileID: 0} - target: {fileID: 2889386559131234303, guid: c332bc1caa59c234197931b60f008785, type: 3} propertyPath: jointConfigures.Array.data[14].animate value: - objectReference: {fileID: 61786857} + objectReference: {fileID: 0} - target: {fileID: 3665151837850631921, guid: c332bc1caa59c234197931b60f008785, type: 3} propertyPath: m_Layer @@ -124129,7 +124675,7 @@ PrefabInstance: type: 3} propertyPath: m_ConnectedBody value: - objectReference: {fileID: 153545166} + objectReference: {fileID: 0} - target: {fileID: 4277682428209377291, guid: c332bc1caa59c234197931b60f008785, type: 3} propertyPath: m_ConnectedAnchor.x @@ -125867,8 +126413,17 @@ SceneRoots: - {fileID: 50664353} - {fileID: 59200419} - {fileID: 66299826} - - {fileID: 2528610911360317876} - - {fileID: 832773408} + - {fileID: 737730575} + - {fileID: 367675237} + - {fileID: 420660739} + - {fileID: 1864886639} + - {fileID: 1848319088} + - {fileID: 598908707} + - {fileID: 327989753} + - {fileID: 939574248} + - {fileID: 529669960} + - {fileID: 1217950287} + - {fileID: 1296933877} - {fileID: 663811207} - {fileID: 4397988261444489944} - {fileID: 758967405} diff --git a/Assets/Artists/Scenes/Game/NewSix.unity b/Assets/Artists/Scenes/Game/NewSix.unity index b5ff8e36b..a42f036ff 100644 --- a/Assets/Artists/Scenes/Game/NewSix.unity +++ b/Assets/Artists/Scenes/Game/NewSix.unity @@ -97,7 +97,7 @@ LightmapSettings: m_ExportTrainingData: 0 m_TrainingDataDestination: TrainingData m_LightProbeSampleCountMultiplier: 4 - m_LightingDataAsset: {fileID: 112000000, guid: a7cb36f24fa5b034db74b6f5814a8546, + m_LightingDataAsset: {fileID: 112000000, guid: 6fcbd6ef8df73ad4a9a140be3d235359, type: 2} m_LightingSettings: {fileID: 4890085278179872738, guid: 5c24fa37c63ff9440b03786512d4ac56, type: 2} @@ -213,6 +213,80 @@ ReflectionProbe: m_UseOcclusionCulling: 1 m_Importance: 1 m_CustomBakedTexture: {fileID: 0} +--- !u!1001 &35673566 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1826980432} + m_Modifications: + - target: {fileID: 2912657673940515616, guid: e5ff4635697757a43bc8b359bbf33049, + type: 3} + propertyPath: m_Name + value: Glock_Magazine Variant (2) + objectReference: {fileID: 0} + - target: {fileID: 2912657673940515623, guid: e5ff4635697757a43bc8b359bbf33049, + type: 3} + propertyPath: m_LocalPosition.x + value: -2.625 + objectReference: {fileID: 0} + - target: {fileID: 2912657673940515623, guid: e5ff4635697757a43bc8b359bbf33049, + type: 3} + propertyPath: m_LocalPosition.y + value: 0.157 + objectReference: {fileID: 0} + - target: {fileID: 2912657673940515623, guid: e5ff4635697757a43bc8b359bbf33049, + type: 3} + propertyPath: m_LocalPosition.z + value: -16.865 + objectReference: {fileID: 0} + - target: {fileID: 2912657673940515623, guid: e5ff4635697757a43bc8b359bbf33049, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2912657673940515623, guid: e5ff4635697757a43bc8b359bbf33049, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2912657673940515623, guid: e5ff4635697757a43bc8b359bbf33049, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2912657673940515623, guid: e5ff4635697757a43bc8b359bbf33049, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2912657673940515623, guid: e5ff4635697757a43bc8b359bbf33049, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2912657673940515623, guid: e5ff4635697757a43bc8b359bbf33049, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2912657673940515623, guid: e5ff4635697757a43bc8b359bbf33049, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: e5ff4635697757a43bc8b359bbf33049, type: 3} +--- !u!4 &35673567 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 2912657673940515623, guid: e5ff4635697757a43bc8b359bbf33049, + type: 3} + m_PrefabInstance: {fileID: 35673566} + m_PrefabAsset: {fileID: 0} --- !u!1 &46208124 GameObject: m_ObjectHideFlags: 0 @@ -309,6 +383,49 @@ Transform: m_Children: [] m_Father: {fileID: 1181579606} m_LocalEulerAnglesHint: {x: 90, y: 0, z: 90} +--- !u!114 &50028691 +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: ec0b4dd729a12d046982652f834580a2, type: 3} + m_Name: NewSix_LMA3 + m_EditorClassIdentifier: + resolution: 2048 + bitmask: 1 + id: 3 + sortingID: 4 + isImplicit: 1 + area: 0 + totalVertexCount: 0 + vertexCounter: 0 + sceneLodLevel: -1 + autoResolution: 0 + sceneName: + tag: -1 + containsTerrains: 0 + probes: 0 + mode: 1 + renderMode: 1000 + renderDirMode: 1000 + atlasPacker: 1000 + computeSSS: 0 + sssSamples: 16 + sssDensity: 10 + sssColor: {r: 1, g: 1, b: 1, a: 1} + sssScale: 1 + fakeShadowBias: 0 + transparentSelfShadow: 0 + flipNormal: 0 + parentName: + overridePath: + fixPos3D: 0 + voxelSize: {x: 1, y: 1, z: 1} + passedFilter: 0 --- !u!64 &53945614 MeshCollider: m_ObjectHideFlags: 0 @@ -497,6 +614,56 @@ MonoBehaviour: onDestory: m_PersistentCalls: m_Calls: [] +--- !u!1 &62063926 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 62063928} + - component: {fileID: 62063927} + m_Layer: 0 + m_Name: Light Probe Group (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!220 &62063927 +LightProbeGroup: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 62063926} + m_Enabled: 1 + m_SourcePositions: + - {x: 1, y: 1, z: 1} + - {x: 1, y: 1, z: -1} + - {x: 1, y: -1, z: 1} + - {x: 1, y: -1, z: -1} + - {x: -1, y: 1, z: 1} + - {x: -1, y: 1, z: -1} + - {x: -1, y: -1, z: 1} + - {x: -1, y: -1, z: -1} + m_Dering: 1 +--- !u!4 &62063928 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 62063926} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0.22130358, y: 2.148, z: -18.13} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &64238954 GameObject: m_ObjectHideFlags: 0 @@ -530,6 +697,7 @@ Transform: - {fileID: 1416519957} - {fileID: 562886971} - {fileID: 1647225220} + - {fileID: 438175416} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!64 &95611307 @@ -695,6 +863,49 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &135710131 +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: ec0b4dd729a12d046982652f834580a2, type: 3} + m_Name: probes + m_EditorClassIdentifier: + resolution: 16 + bitmask: 1 + id: 4 + sortingID: 0 + isImplicit: 1 + area: 0 + totalVertexCount: 26 + vertexCounter: 0 + sceneLodLevel: -1 + autoResolution: 0 + sceneName: + tag: -1 + containsTerrains: 0 + probes: 1 + mode: 2 + renderMode: 1000 + renderDirMode: 5 + atlasPacker: 1000 + computeSSS: 0 + sssSamples: 16 + sssDensity: 10 + sssColor: {r: 1, g: 1, b: 1, a: 1} + sssScale: 1 + fakeShadowBias: 0 + transparentSelfShadow: 0 + flipNormal: 0 + parentName: + overridePath: + fixPos3D: 0 + voxelSize: {x: 1, y: 1, z: 1} + passedFilter: 0 --- !u!1001 &150627985 PrefabInstance: m_ObjectHideFlags: 0 @@ -799,6 +1010,8 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 727839472} + - {fileID: 667077342} + - {fileID: 490914836} m_Father: {fileID: 1853216120} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!64 &183655291 @@ -823,6 +1036,80 @@ MeshCollider: m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: -9161102096504281861, guid: e17aada14f1fae9419bb140c6553b6bf, type: 3} +--- !u!1001 &184667482 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1826980432} + m_Modifications: + - target: {fileID: 2912657673940515616, guid: e5ff4635697757a43bc8b359bbf33049, + type: 3} + propertyPath: m_Name + value: Glock_Magazine Variant (3) + objectReference: {fileID: 0} + - target: {fileID: 2912657673940515623, guid: e5ff4635697757a43bc8b359bbf33049, + type: 3} + propertyPath: m_LocalPosition.x + value: -2.625 + objectReference: {fileID: 0} + - target: {fileID: 2912657673940515623, guid: e5ff4635697757a43bc8b359bbf33049, + type: 3} + propertyPath: m_LocalPosition.y + value: 0.157 + objectReference: {fileID: 0} + - target: {fileID: 2912657673940515623, guid: e5ff4635697757a43bc8b359bbf33049, + type: 3} + propertyPath: m_LocalPosition.z + value: -16.921 + objectReference: {fileID: 0} + - target: {fileID: 2912657673940515623, guid: e5ff4635697757a43bc8b359bbf33049, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2912657673940515623, guid: e5ff4635697757a43bc8b359bbf33049, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2912657673940515623, guid: e5ff4635697757a43bc8b359bbf33049, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2912657673940515623, guid: e5ff4635697757a43bc8b359bbf33049, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2912657673940515623, guid: e5ff4635697757a43bc8b359bbf33049, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2912657673940515623, guid: e5ff4635697757a43bc8b359bbf33049, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2912657673940515623, guid: e5ff4635697757a43bc8b359bbf33049, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: e5ff4635697757a43bc8b359bbf33049, type: 3} +--- !u!4 &184667483 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 2912657673940515623, guid: e5ff4635697757a43bc8b359bbf33049, + type: 3} + m_PrefabInstance: {fileID: 184667482} + m_PrefabAsset: {fileID: 0} --- !u!1 &197289105 GameObject: m_ObjectHideFlags: 0 @@ -2154,6 +2441,49 @@ MonoBehaviour: shadowmaskGroupID: 0 directionMode: 0 maskChannel: -1 +--- !u!114 &402550608 +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: ec0b4dd729a12d046982652f834580a2, type: 3} + m_Name: NewSix_LMA2 + m_EditorClassIdentifier: + resolution: 4096 + bitmask: 1 + id: 2 + sortingID: 3 + isImplicit: 1 + area: 0 + totalVertexCount: 0 + vertexCounter: 0 + sceneLodLevel: -1 + autoResolution: 0 + sceneName: + tag: -1 + containsTerrains: 0 + probes: 0 + mode: 1 + renderMode: 1000 + renderDirMode: 1000 + atlasPacker: 1000 + computeSSS: 0 + sssSamples: 16 + sssDensity: 10 + sssColor: {r: 1, g: 1, b: 1, a: 1} + sssScale: 1 + fakeShadowBias: 0 + transparentSelfShadow: 0 + flipNormal: 0 + parentName: + overridePath: + fixPos3D: 0 + voxelSize: {x: 1, y: 1, z: 1} + passedFilter: 0 --- !u!64 &406448583 MeshCollider: m_ObjectHideFlags: 0 @@ -2176,6 +2506,79 @@ MeshCollider: m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: -4898149001930229030, guid: e17aada14f1fae9419bb140c6553b6bf, type: 3} +--- !u!1001 &410856757 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 1610736432900663163, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_Name + value: Zombie (1) + objectReference: {fileID: 0} + - target: {fileID: 5964803017347144284, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalPosition.x + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 5964803017347144284, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5964803017347144284, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalPosition.z + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 5964803017347144284, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5964803017347144284, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5964803017347144284, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5964803017347144284, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5964803017347144284, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5964803017347144284, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5964803017347144284, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6530587526832555870, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: managedReferences[7707058030789525626].clip + value: + objectReference: {fileID: 7400000, guid: 6fe7dd2cb9094c24182f1224b8581362, type: 3} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 87496a4c1c33c9f4a9a90a9757655d40, type: 3} --- !u!1001 &429445517 PrefabInstance: m_ObjectHideFlags: 0 @@ -2255,6 +2658,38 @@ Transform: type: 3} m_PrefabInstance: {fileID: 429445517} m_PrefabAsset: {fileID: 0} +--- !u!1 &438175415 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 438175416} + m_Layer: 0 + m_Name: Clips + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &438175416 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 438175415} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1143251018} + m_Father: {fileID: 64238955} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!64 &447249681 MeshCollider: m_ObjectHideFlags: 0 @@ -2321,6 +2756,38 @@ MeshCollider: m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 6821386435194512148, guid: e17aada14f1fae9419bb140c6553b6bf, type: 3} +--- !u!1 &490914835 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 490914836} + m_Layer: 0 + m_Name: GunModify_Light Variant + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &490914836 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 490914835} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1245595180} + m_Father: {fileID: 154992013} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!64 &503726616 MeshCollider: m_ObjectHideFlags: 0 @@ -3237,6 +3704,38 @@ Transform: type: 3} m_PrefabInstance: {fileID: 659490896} m_PrefabAsset: {fileID: 0} +--- !u!1 &667077341 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 667077342} + m_Layer: 0 + m_Name: Weapon_Glock Variant + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &667077342 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 667077341} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 894506504} + m_Father: {fileID: 154992013} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!64 &701551621 MeshCollider: m_ObjectHideFlags: 0 @@ -3835,6 +4334,80 @@ BoxCollider: serializedVersion: 3 m_Size: {x: 0.011916055, y: 0.0026489787, z: 0.024984712} m_Center: {x: -0.005952666, y: 0.000000007501287, z: 0.00012585007} +--- !u!1001 &894506503 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 667077342} + m_Modifications: + - target: {fileID: 8889410696358529545, guid: bc90096cf6047474a8195137fb77e890, + type: 3} + propertyPath: m_Name + value: Weapon_Glock Variant + objectReference: {fileID: 0} + - target: {fileID: 8889410696358529550, guid: bc90096cf6047474a8195137fb77e890, + type: 3} + propertyPath: m_LocalPosition.x + value: -2.179 + objectReference: {fileID: 0} + - target: {fileID: 8889410696358529550, guid: bc90096cf6047474a8195137fb77e890, + type: 3} + propertyPath: m_LocalPosition.y + value: 0.128 + objectReference: {fileID: 0} + - target: {fileID: 8889410696358529550, guid: bc90096cf6047474a8195137fb77e890, + type: 3} + propertyPath: m_LocalPosition.z + value: -16.926 + objectReference: {fileID: 0} + - target: {fileID: 8889410696358529550, guid: bc90096cf6047474a8195137fb77e890, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.70710653 + objectReference: {fileID: 0} + - target: {fileID: 8889410696358529550, guid: bc90096cf6047474a8195137fb77e890, + type: 3} + propertyPath: m_LocalRotation.x + value: 0.70710707 + objectReference: {fileID: 0} + - target: {fileID: 8889410696358529550, guid: bc90096cf6047474a8195137fb77e890, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8889410696358529550, guid: bc90096cf6047474a8195137fb77e890, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8889410696358529550, guid: bc90096cf6047474a8195137fb77e890, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 90 + objectReference: {fileID: 0} + - target: {fileID: 8889410696358529550, guid: bc90096cf6047474a8195137fb77e890, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8889410696358529550, guid: bc90096cf6047474a8195137fb77e890, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: bc90096cf6047474a8195137fb77e890, type: 3} +--- !u!4 &894506504 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8889410696358529550, guid: bc90096cf6047474a8195137fb77e890, + type: 3} + m_PrefabInstance: {fileID: 894506503} + m_PrefabAsset: {fileID: 0} --- !u!64 &898942988 MeshCollider: m_ObjectHideFlags: 0 @@ -3964,7 +4537,7 @@ MonoBehaviour: renderSettingsRTPVHDR: 0 renderSettingsRTPVWidth: 640 renderSettingsRTPVHeight: 360 - lastBakeTime: 176 + lastBakeTime: 201 enlightenWarningShown: 0 enlightenWarningShown2: 0 uniqueLights: @@ -4994,121 +5567,123 @@ MonoBehaviour: angle: 179 UID: 32 implicitGroups: - - {fileID: 1730214906} - - {fileID: 1730214906} - - {fileID: 1730214906} - - {fileID: 1730214906} - - {fileID: 1730214906} - - {fileID: 1730214906} - - {fileID: 1730214906} - - {fileID: 1730214906} - - {fileID: 1730214906} - - {fileID: 1730214906} - - {fileID: 1730214906} - - {fileID: 1730214906} - - {fileID: 1730214906} - - {fileID: 1730214906} - - {fileID: 1730214906} - - {fileID: 1730214906} - - {fileID: 1730214906} - - {fileID: 1730214906} - - {fileID: 1730214906} - - {fileID: 1730214906} - - {fileID: 1730214906} - - {fileID: 2107757019} - - {fileID: 1730214906} - - {fileID: 1730214906} - - {fileID: 1730214906} - - {fileID: 1173133986} - - {fileID: 1730214906} - - {fileID: 1730214906} - - {fileID: 1730214906} - - {fileID: 1730214906} - - {fileID: 1730214906} - - {fileID: 1730214906} - - {fileID: 1730214906} - - {fileID: 1730214906} - - {fileID: 1730214906} - - {fileID: 1730214906} - - {fileID: 1730214906} - - {fileID: 1730214906} - - {fileID: 1730214906} - - {fileID: 1730214906} - - {fileID: 1730214906} - - {fileID: 1730214906} - - {fileID: 1730214906} - - {fileID: 1730214906} - - {fileID: 1730214906} - - {fileID: 1730214906} - - {fileID: 1730214906} - - {fileID: 1730214906} - - {fileID: 1730214906} - - {fileID: 1730214906} - - {fileID: 1730214906} - - {fileID: 1730214906} - - {fileID: 1730214906} - - {fileID: 1730214906} - - {fileID: 1730214906} - - {fileID: 1730214906} - - {fileID: 1730214906} - - {fileID: 1730214906} - - {fileID: 1730214906} - - {fileID: 1730214906} - - {fileID: 1730214906} - - {fileID: 1730214906} - - {fileID: 1730214906} - - {fileID: 1730214906} - - {fileID: 1498312841} - - {fileID: 1730214906} - - {fileID: 1730214906} - - {fileID: 1730214906} - - {fileID: 1730214906} - - {fileID: 1730214906} - - {fileID: 1730214906} - - {fileID: 1730214906} - - {fileID: 1730214906} - - {fileID: 1730214906} - - {fileID: 1730214906} - - {fileID: 1730214906} - - {fileID: 1730214906} - - {fileID: 1730214906} - - {fileID: 1730214906} - - {fileID: 1730214906} - - {fileID: 1730214906} - - {fileID: 1730214906} - - {fileID: 1730214906} - - {fileID: 1730214906} - - {fileID: 1730214906} - - {fileID: 1730214906} - - {fileID: 1173133986} - - {fileID: 1730214906} - - {fileID: 1730214906} - - {fileID: 1730214906} - - {fileID: 1730214906} - - {fileID: 1730214906} - - {fileID: 1730214906} - - {fileID: 1730214906} - - {fileID: 1730214906} - - {fileID: 1730214906} - - {fileID: 1730214906} - - {fileID: 1730214906} - - {fileID: 1730214906} - - {fileID: 1730214906} - - {fileID: 1730214906} - - {fileID: 1730214906} - - {fileID: 1730214906} - - {fileID: 1730214906} - - {fileID: 1730214906} - - {fileID: 1730214906} - - {fileID: 1730214906} - - {fileID: 1730214906} - - {fileID: 1730214906} - - {fileID: 1730214906} - - {fileID: 1730214906} - - {fileID: 1730214906} - - {fileID: 1730214906} - - {fileID: 1730214906} + - {fileID: 135710131} + - {fileID: 1370540270} + - {fileID: 1370540270} + - {fileID: 1370540270} + - {fileID: 1370540270} + - {fileID: 1370540270} + - {fileID: 1370540270} + - {fileID: 1370540270} + - {fileID: 1370540270} + - {fileID: 1370540270} + - {fileID: 1370540270} + - {fileID: 1370540270} + - {fileID: 1370540270} + - {fileID: 1370540270} + - {fileID: 1370540270} + - {fileID: 1370540270} + - {fileID: 1370540270} + - {fileID: 1370540270} + - {fileID: 1370540270} + - {fileID: 1370540270} + - {fileID: 1370540270} + - {fileID: 1370540270} + - {fileID: 1597352810} + - {fileID: 1370540270} + - {fileID: 1370540270} + - {fileID: 1370540270} + - {fileID: 402550608} + - {fileID: 1370540270} + - {fileID: 1370540270} + - {fileID: 1370540270} + - {fileID: 1370540270} + - {fileID: 1370540270} + - {fileID: 1370540270} + - {fileID: 1370540270} + - {fileID: 1370540270} + - {fileID: 1370540270} + - {fileID: 1370540270} + - {fileID: 1370540270} + - {fileID: 1370540270} + - {fileID: 1370540270} + - {fileID: 1370540270} + - {fileID: 1370540270} + - {fileID: 1370540270} + - {fileID: 1370540270} + - {fileID: 1370540270} + - {fileID: 1370540270} + - {fileID: 1370540270} + - {fileID: 1370540270} + - {fileID: 1370540270} + - {fileID: 1370540270} + - {fileID: 1370540270} + - {fileID: 1370540270} + - {fileID: 1370540270} + - {fileID: 1370540270} + - {fileID: 1370540270} + - {fileID: 1370540270} + - {fileID: 1370540270} + - {fileID: 1370540270} + - {fileID: 1370540270} + - {fileID: 1370540270} + - {fileID: 1370540270} + - {fileID: 1370540270} + - {fileID: 1370540270} + - {fileID: 1370540270} + - {fileID: 1370540270} + - {fileID: 50028691} + - {fileID: 1370540270} + - {fileID: 1370540270} + - {fileID: 1370540270} + - {fileID: 1370540270} + - {fileID: 1370540270} + - {fileID: 1370540270} + - {fileID: 1370540270} + - {fileID: 1370540270} + - {fileID: 1370540270} + - {fileID: 1370540270} + - {fileID: 1370540270} + - {fileID: 1370540270} + - {fileID: 1370540270} + - {fileID: 1370540270} + - {fileID: 1370540270} + - {fileID: 1370540270} + - {fileID: 1370540270} + - {fileID: 1370540270} + - {fileID: 1370540270} + - {fileID: 1370540270} + - {fileID: 1370540270} + - {fileID: 402550608} + - {fileID: 1370540270} + - {fileID: 1370540270} + - {fileID: 1370540270} + - {fileID: 1370540270} + - {fileID: 1370540270} + - {fileID: 1370540270} + - {fileID: 1370540270} + - {fileID: 1370540270} + - {fileID: 1370540270} + - {fileID: 1370540270} + - {fileID: 1370540270} + - {fileID: 1370540270} + - {fileID: 1370540270} + - {fileID: 1370540270} + - {fileID: 1370540270} + - {fileID: 1370540270} + - {fileID: 1370540270} + - {fileID: 1370540270} + - {fileID: 1370540270} + - {fileID: 1370540270} + - {fileID: 1370540270} + - {fileID: 1370540270} + - {fileID: 1370540270} + - {fileID: 1370540270} + - {fileID: 1370540270} + - {fileID: 1370540270} + - {fileID: 1370540270} implicitGroupedObjects: + - {fileID: 0} - {fileID: 948852313} - {fileID: 1247667003} - {fileID: 1247667005} @@ -5232,6 +5807,8 @@ MonoBehaviour: m_Extent: {x: 46.55171, y: 4.1444864, z: 56.338917} - m_Center: {x: 15.922738, y: -0.49061972, z: 2.6654966} m_Extent: {x: 36.415504, y: 0.05452058, z: 56.16435} + - m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 5000, y: 5000, z: 5000} hasEmissive: 01010101 uvBuffOffsets: uvBuffLengths: @@ -5244,10 +5821,10 @@ MonoBehaviour: lmGroupMinLOD: lmGroupLODMatrix: serverGetFileList: [] - lightmapHasColor: 01010101 - lightmapHasMask: 00000000000000000000000000000000 - lightmapHasDir: 00000000 - lightmapHasRNM: 00000000 + lightmapHasColor: 0101010101 + lightmapHasMask: 0000000000000000000000000000000000000000 + lightmapHasDir: 0000000000 + lightmapHasRNM: 0000000001 modifiedAssetPathList: [] modifiedAssets: [] maps: @@ -5697,11 +6274,11 @@ MonoBehaviour: rnmMaps2: [] mapsMode: bakedRenderers: - - {fileID: 1732889750} - - {fileID: 1732889752} + - {fileID: 948852317} - {fileID: 1247667004} - {fileID: 1247667006} - - {fileID: 948852317} + - {fileID: 1732889750} + - {fileID: 1732889752} - {fileID: 6951939110273735693} - {fileID: 4839594909536584937} - {fileID: 652090598865044585} @@ -5726,6 +6303,7 @@ MonoBehaviour: - {fileID: 2483930350590028487} - {fileID: 8632932037925344865} - {fileID: 8434507710890790350} + - {fileID: 709402263207051233} - {fileID: 4394914718212371842} - {fileID: 1365005595570137092} - {fileID: 4256739886300846368} @@ -5751,6 +6329,7 @@ MonoBehaviour: - {fileID: 3004764996580677568} - {fileID: 8402790212679116635} - {fileID: 8722998538370480905} + - {fileID: 42727491241490376} - {fileID: 6581258462624372359} - {fileID: 6562524965822180399} - {fileID: 8179821179385927208} @@ -5770,6 +6349,7 @@ MonoBehaviour: - {fileID: 2208195900329733398} - {fileID: 6157370410190434389} - {fileID: 56424755150102484} + - {fileID: 1694347607021467359} - {fileID: 1061121935375271237} - {fileID: 5946915702185566046} - {fileID: 8318306452960725000} @@ -5786,6 +6366,7 @@ MonoBehaviour: - {fileID: 7991352752473606354} - {fileID: 7267908619679182057} - {fileID: 3770232770571289141} + - {fileID: 4990988470764336868} - {fileID: 2420333417944977086} - {fileID: 1696335546363294994} - {fileID: 8580312574387279235} @@ -5808,8 +6389,10 @@ MonoBehaviour: - {fileID: 2809480073777719519} - {fileID: 281385961083569216} - {fileID: 6440929623629653895} + - {fileID: 142102491735828974} - {fileID: 2945896682818942884} - {fileID: 5254407319812988452} + - {fileID: 5876547473653404757} - {fileID: 943957216096221673} - {fileID: 7529678117093311047} - {fileID: 4481567666828231577} @@ -5820,24 +6403,24 @@ MonoBehaviour: - {fileID: 2669829231022981659} - {fileID: 7267173629919303507} - {fileID: 3573939661082339846} - bakedIDs: 0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffff00000000ffffffff00000000ffffffff000000000000000000000000000000000000000001000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffff0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000ffffffff0000000000000000ffffffff0000000000000000ffffffff00000000ffffffff00000000000000000000000000000000ffffffff0000000000000000ffffffff0000000000000000020000000000000000000000000000000000000000000000000000000000000000000000ffffffff00000000ffffffff000000000000000000000000000000000000000000000000000000000000000000000000ffffffff0000000000000000ffffffff000000000000000000000000ffffffff0000000000000000 + bakedIDs: 0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffff00000000ffffffff00000000ffffffff00000000000000000000000000000000000000000100000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffff00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000ffffffff0000000000000000ffffffff0000000000000000ffffffff00000000ffffffff00000000000000000000000000000000ffffffff000000000000000000000000ffffffff0000000000000000020000000000000000000000000000000000000000000000000000000000000000000000ffffffff00000000ffffffff0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffff0000000000000000ffffffff000000000000000000000000ffffffff0000000000000000 bakedScaleOffset: - - {x: 0.0037780113, y: 0.0037780113, z: 0.9773773, w: 0.31149015} - - {x: 1.2951174, y: 1.3751849, z: -0.1316194, w: 0.41898075} + - {x: 0.00048390077, y: 0.00047509515, z: 0.99764615, w: 0.16652599} - {x: 0.003778013, y: 0.003778013, z: 0.95912683, w: 0.31149015} - - {x: 1.2951186, y: 1.3751862, z: -0.13161953, w: 0.38179398} - - {x: 0.00048390077, y: 0.00047509515, z: 0.99764615, w: 0.060963552} + - {x: 1.2951186, y: 1.3751862, z: 0.6794968, w: 0.30079454} + - {x: 0.0037780113, y: 0.0037780113, z: 0.9773773, w: 0.31149015} + - {x: 1.2951174, y: 1.3751849, z: -0.1316194, w: 0.47698608} - {x: 0.06049122, y: 0.060374454, z: 0.8265458, w: 0.57713336} - - {x: 0.011009926, y: 0.011517576, z: 0.8132144, w: 0.6460174} - - {x: 0.014325964, y: 0.014321599, z: 0.96019095, w: 0.6164025} + - {x: 0.011009926, y: 0.011517576, z: 0.8132144, w: 0.637263} + - {x: 0.014325964, y: 0.014321599, z: 0.97472006, w: 0.6164025} - {x: 0.038935214, y: 0.03893634, z: 0.8265913, w: 0.6727322} - - {x: 0.023342248, y: 0.023329107, z: 0.97224087, w: 0.15050884} - - {x: 0.023342246, y: 0.023329103, z: 0.97224087, w: 0.17398846} + - {x: 0.023342248, y: 0.023329107, z: 0.975534, w: 0.6334817} + - {x: 0.023342246, y: 0.023329103, z: 0.9614347, w: 0.730725} - {x: 0.038935225, y: 0.038936347, z: 0.8265913, w: 0.63348824} - {x: 0.030164981, y: 0.030159006, z: 0.96847546, w: 0.45049736} - {x: 0.007318857, y: 0.00743687, z: 0.91916656, w: 0.41092014} - {x: 1, y: 1, z: 0, w: 0} - - {x: 0.023342207, y: 0.023329064, z: 0.90323573, w: 0.739866} + - {x: 0.023342207, y: 0.023329064, z: 0.000003031274, w: 0.7889605} - {x: 1, y: 1, z: 0, w: 0} - {x: 0.04494331, y: 0.044915408, z: 0.7661243, w: 0.6844648} - {x: 1, y: 1, z: 0, w: 0} @@ -5851,15 +6434,16 @@ MonoBehaviour: - {x: 0.024215057, y: 0.02457763, z: 0.977037, w: 0.52712804} - {x: 0.007107394, y: 0.0071005616, z: 0.87433654, w: 0.41098994} - {x: 0.32240063, y: 0.3224002, z: 0.00087981747, w: 0.6771202} - - {x: 0.00068751664, y: 0.000311424, z: 0.9975627, w: 0.062861145} + - {x: 0.026375625, y: 0.026360527, z: 0.97222334, w: 0.10764838} + - {x: 0.00068751664, y: 0.000311424, z: 0.9975627, w: 0.16842358} - {x: 0.0062816264, y: 0.0062805004, z: 0.90516883, w: 0.41137215} - {x: 0.012513784, y: 0.012568974, z: 0.93928874, w: 0.5644258} - {x: 0.0033902947, y: 0.003450748, z: 0.9922993, w: 0.34065953} - - {x: 0.007794858, y: 0.0078050992, z: 0.81385785, w: 0.6379512} + - {x: 0.007794858, y: 0.0078050992, z: 0.9867958, w: 0.56767136} - {x: 0.0046858224, y: 0.004627795, z: 0.9331794, w: 0.41097865} - - {x: 0.011509892, y: 0.011482704, z: 0.96340644, w: 0.56444675} - - {x: 0.008977231, y: 0.008892743, z: 0.9865247, w: 0.5673482} - - {x: 0.011509893, y: 0.011482706, z: 0.9515668, w: 0.56444675} + - {x: 0.011509892, y: 0.011482704, z: 0.9515668, w: 0.56444675} + - {x: 0.008977231, y: 0.008892743, z: 0.9771729, w: 0.56725115} + - {x: 0.011509893, y: 0.011482706, z: 0.98794854, w: 0.18490654} - {x: 0.007990237, y: 0.007811372, z: 0.8817498, w: 0.41091153} - {x: 0.017970478, y: 0.0178943, z: 0.96843976, w: 0.48052746} - {x: 0.036724277, y: 0.03677533, z: 0.9039652, w: 0.6342107} @@ -5867,37 +6451,39 @@ MonoBehaviour: - {x: 0.038935225, y: 0.038936347, z: 0.96021, w: 0.57717735} - {x: 0.07334068, y: 0.07333851, z: 0.8407454, w: 0.5027851} - {x: 0.07395921, y: 0.07284587, z: 0.88672, w: 0.5766193} - - {x: 0.023342248, y: 0.023329107, z: 0.97224087, w: 0.103549555} + - {x: 0.023342248, y: 0.023329107, z: 0.8022818, w: 0.7286456} - {x: 1, y: 1, z: 0, w: 0} - {x: 0.006404121, y: 0.0063986056, z: 0.9264071, w: 0.41099113} - {x: 0.060043566, y: 0.060042176, z: 0.7661668, w: 0.5771962} - - {x: -0.00012098119, y: -0.00022422563, z: 0.9976638, w: 0.06460092} - - {x: 0.0010727635, y: 0.0015339531, z: 0.99751455, w: 0.05806874} + - {x: -0.00012098119, y: -0.00022422563, z: 0.9976638, w: 0.17016336} + - {x: 0.0010727635, y: 0.0015339531, z: 0.99751455, w: 0.16363117} - {x: 0.021095993, y: 0.021012178, z: 0.87167114, w: 0.30426508} - {x: 0.027509557, y: 0.0274877, z: 0.9722181, w: 0.02743634} - {x: 0.04855878, y: 0.048553, z: 0.94293123, w: 0.32689995} + - {x: 0.026367664, y: 0.02635655, z: 0.9722236, w: 0.08124443} - {x: 0.0044587622, y: 0.0042193853, z: 0.95192266, w: 0.3225207} - {x: 0.019611787, y: 0.01959836, z: 0.89307207, w: 0.30429703} - {x: 0.019878412, y: 0.019871226, z: 0.91296256, w: 0.3042675} - {x: 0.04207015, y: 0.04200112, z: 0.942862, w: 0.37559852} - - {x: 0.0014153754, y: 0.0015568011, z: 0.99747175, w: 0.055365127} + - {x: 0.0014153754, y: 0.0015568011, z: 0.99747175, w: 0.16092758} - {x: 0.018962754, y: 0.018910974, z: 0.9327881, w: 0.30426714} - {x: 0.037376978, y: 0.03737698, z: 0.8657984, w: 0.63348067} - {x: 0.037376978, y: 0.03737698, z: 0.8657984, w: 0.67091745} - {x: 0.012843673, y: 0.012847031, z: 0.9866647, w: 0.48056868} - {x: 0.047079936, y: 0.047067165, z: 0.7661348, w: 0.6375511} - {x: 0.0034873954, y: 0.0034953246, z: 0.992301, w: 0.33186013} - - {x: 0.023342248, y: 0.023329107, z: 0.97224087, w: 0.1270292} + - {x: 0.023342248, y: 0.023329107, z: 0.96614563, w: 0.7023025} - {x: 1.000474, y: 3.1100252, z: 0.0007324219, w: 0.0007324219} - - {x: -0.00020262231, y: -0.0003732348, z: 0.9990418, w: 0.06461955} + - {x: -0.00020262231, y: -0.0003732348, z: 0.9990418, w: 0.17018199} - {x: 0.030119553, y: 0.030149832, z: 0.967465, w: 0.6712463} - {x: 0.12515512, y: 0.12485951, z: 0.87157786, w: 0.20040973} - {x: 0.008588466, y: 0.008586971, z: 0.9866709, w: 0.49375936} - {x: 0.014172463, y: 0.014171074, z: 0.9850037, w: 0.39063957} - {x: 0.003487397, y: 0.0034953263, z: 0.93858975, w: 0.41140026} + - {x: 0.026313305, y: 0.026306996, z: 0.9722251, w: 0.054814707} - {x: 1, y: 1, z: 0, w: 0} - - {x: 0.0090438565, y: 0.009011306, z: 0.97720253, w: 0.56737334} - - {x: 0.023342246, y: 0.023329103, z: 0.975534, w: 0.6334817} + - {x: 0.0090438565, y: 0.009011306, z: 0.9634152, w: 0.56445646} + - {x: 0.023342246, y: 0.023329103, z: 0.9377546, w: 0.730725} - {x: 1, y: 1, z: 0, w: 0} - {x: 0.037376978, y: 0.03737698, z: 0.8657984, w: 0.70835423} - {x: 0.092232935, y: 0.09223301, z: 0.7661499, w: 0.3268906} @@ -5906,20 +6492,21 @@ MonoBehaviour: - {x: 1, y: 1, z: 0, w: 0} - {x: 0.007671069, y: 0.007657571, z: 0.8587516, w: 0.41097933} - {x: 0.035725642, y: 0.03572565, z: 0.9397478, w: 0.63347805} - - {x: 0.0033732753, y: 0.002999117, z: 0.9381333, w: 0.3232647} - - {x: 0.026449202, y: 0.026300646, z: 0.9721696, w: 0.079287976} + - {x: 0.0033732753, y: 0.002999117, z: 0.9918702, w: 0.19697224} + - {x: 0.026449202, y: 0.026300646, z: 0.90316445, w: 0.73979884} - {x: 1, y: 1, z: 0, w: 0} - {x: 0.0031883218, y: 0.0031691643, z: 0.95712346, w: 0.32299003} - {x: 0.0033539291, y: 0.0033672967, z: 0.9923074, w: 0.33629158} + - {x: 0.023741096, y: 0.023803782, z: -0.000032618722, w: 0.81240207} - {x: 1, y: 1, z: 0, w: 0} - {x: 0.2044067, y: 0.20227574, z: 0.7650739, w: 0.41843814} - {x: 0.007521818, y: 0.0076364554, z: 0.89737964, w: 0.41092166} - {x: 0.6754978, y: 0.6754986, z: 0.00022015165, w: 0.00022015086} - - {x: 0.024329055, y: 0.024319423, z: 0.9722338, w: 0.054823495} - - {x: 0.0025104089, y: 0.002504159, z: 0.9963832, w: 0.104012035} + - {x: 0.024329055, y: 0.024319423, z: 0.9722338, w: 0.16038594} + - {x: 0.0025104089, y: 0.002504159, z: 0.98842317, w: 0.19702491} - {x: 0.034215383, y: 0.03420599, z: 0.9032301, w: 0.6712474} - {x: 0.012513793, y: 0.012568984, z: 0.9270265, w: 0.5644258} - - {x: 0.0154269235, y: 0.0154069895, z: 0.9771974, w: 0.5518416} + - {x: 0.0154269235, y: 0.0154069895, z: 0.9722321, w: 0.18490939} - {x: 0.010750002, y: 0.010723436, z: 0.9884856, w: 0.31548107} - {x: 0.036095057, y: 0.03609662, z: 0.7661302, w: 0.72863436} - {x: 0.007677308, y: 0.007823685, z: 0.8899662, w: 0.41091028} @@ -5930,14 +6517,16 @@ MonoBehaviour: - {x: 0.2058364, y: 0.2057955, z: 0.76626736, w: 0.00012955874} - {x: 0.0038830226, y: 0.003765427, z: 0.99227685, w: 0.32730046} - {x: 0.0137624135, y: 0.013757927, z: 0.9850115, w: 0.40516397} - - {x: 0.0044739502, y: 0.0036412526, z: 0.94169575, w: 0.3227234} + - {x: 0.0044739502, y: 0.0036412526, z: 0.93743503, w: 0.3227234} - {x: 0.014614561, y: 0.014623424, z: 0.9850094, w: 0.37564954} - {x: 0.034215383, y: 0.034205988, z: 0.9032301, w: 0.70555377} - - {x: 0.023342246, y: 0.023329103, z: 0.8022818, w: 0.7286456} + - {x: 0.023741094, y: 0.02380378, z: -0.000032618656, w: 0.8365183} + - {x: 0.023342246, y: 0.023329103, z: 0.0000030300507, w: 0.7654809} - {x: 0.0072726924, y: 0.0072823525, z: 0.8667787, w: 0.41097185} + - {x: 0.026373167, y: 0.02635805, z: 0.9722234, w: 0.13401285} - {x: 1, y: 1, z: 0, w: 0} - - {x: 0.014172448, y: 0.014171059, z: 0.81111526, w: 0.6999048} - - {x: 0.01512254, y: 0.015128608, z: 0.81111044, w: 0.6844718} + - {x: 0.014172448, y: 0.014171059, z: 0.9601989, w: 0.61641026} + - {x: 0.01512254, y: 0.015128608, z: 0.97719723, w: 0.5518402} - {x: 1, y: 1, z: 0, w: 0} - {x: 0.7658366, y: 0.76583534, z: -0.000015412052, w: -0.000015410837} - {x: 0.028538357, y: 0.028540075, z: 0.9377315, w: 0.70227903} @@ -6069,6 +6658,12 @@ MonoBehaviour: - {fileID: 0} - {fileID: 0} - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} bakedRenderersTerrain: [] bakedIDsTerrain: bakedScaleOffsetTerrain: [] @@ -6088,6 +6683,80 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &918222710 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1826980432} + m_Modifications: + - target: {fileID: 2912657673940515616, guid: e5ff4635697757a43bc8b359bbf33049, + type: 3} + propertyPath: m_Name + value: Glock_Magazine Variant (4) + objectReference: {fileID: 0} + - target: {fileID: 2912657673940515623, guid: e5ff4635697757a43bc8b359bbf33049, + type: 3} + propertyPath: m_LocalPosition.x + value: -2.625 + objectReference: {fileID: 0} + - target: {fileID: 2912657673940515623, guid: e5ff4635697757a43bc8b359bbf33049, + type: 3} + propertyPath: m_LocalPosition.y + value: 0.157 + objectReference: {fileID: 0} + - target: {fileID: 2912657673940515623, guid: e5ff4635697757a43bc8b359bbf33049, + type: 3} + propertyPath: m_LocalPosition.z + value: -16.97 + objectReference: {fileID: 0} + - target: {fileID: 2912657673940515623, guid: e5ff4635697757a43bc8b359bbf33049, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2912657673940515623, guid: e5ff4635697757a43bc8b359bbf33049, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2912657673940515623, guid: e5ff4635697757a43bc8b359bbf33049, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2912657673940515623, guid: e5ff4635697757a43bc8b359bbf33049, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2912657673940515623, guid: e5ff4635697757a43bc8b359bbf33049, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2912657673940515623, guid: e5ff4635697757a43bc8b359bbf33049, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2912657673940515623, guid: e5ff4635697757a43bc8b359bbf33049, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: e5ff4635697757a43bc8b359bbf33049, type: 3} +--- !u!4 &918222711 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 2912657673940515623, guid: e5ff4635697757a43bc8b359bbf33049, + type: 3} + m_PrefabInstance: {fileID: 918222710} + m_PrefabAsset: {fileID: 0} --- !u!64 &931433016 MeshCollider: m_ObjectHideFlags: 0 @@ -7122,6 +7791,74 @@ MonoBehaviour: data: index: -1101812471 keyword: env_newsix_after_toilet +--- !u!1001 &1080184758 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 1610736432900663163, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_Name + value: Zombie + objectReference: {fileID: 0} + - target: {fileID: 5964803017347144284, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalPosition.x + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 5964803017347144284, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5964803017347144284, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalPosition.z + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 5964803017347144284, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5964803017347144284, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5964803017347144284, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5964803017347144284, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5964803017347144284, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5964803017347144284, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5964803017347144284, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 87496a4c1c33c9f4a9a90a9757655d40, type: 3} --- !u!43 &1081383469 Mesh: m_ObjectHideFlags: 0 @@ -7970,6 +8707,38 @@ MeshCollider: m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: -6198231399432010932, guid: e17aada14f1fae9419bb140c6553b6bf, type: 3} +--- !u!1 &1143251017 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1143251018} + m_Layer: 0 + m_Name: PIN + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1143251018 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1143251017} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1826980432} + m_Father: {fileID: 438175416} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!64 &1145992788 MeshCollider: m_ObjectHideFlags: 0 @@ -8036,49 +8805,66 @@ MeshCollider: m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 6702357246162969039, guid: e17aada14f1fae9419bb140c6553b6bf, type: 3} ---- !u!114 &1173133986 -MonoBehaviour: +--- !u!1 &1176005995 +GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1176005997} + - component: {fileID: 1176005996} + m_Layer: 0 + m_Name: Light Probe Group + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 2147483647 + m_IsActive: 1 +--- !u!220 &1176005996 +LightProbeGroup: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1176005995} m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ec0b4dd729a12d046982652f834580a2, type: 3} - m_Name: NewSix_LMA2 - m_EditorClassIdentifier: - resolution: 4096 - bitmask: 1 - id: 2 - sortingID: 2 - isImplicit: 1 - area: 0 - totalVertexCount: 0 - vertexCounter: 0 - sceneLodLevel: -1 - autoResolution: 0 - sceneName: - tag: -1 - containsTerrains: 0 - probes: 0 - mode: 1 - renderMode: 1000 - renderDirMode: 1000 - atlasPacker: 1000 - computeSSS: 0 - sssSamples: 16 - sssDensity: 10 - sssColor: {r: 1, g: 1, b: 1, a: 1} - sssScale: 1 - fakeShadowBias: 0 - transparentSelfShadow: 0 - flipNormal: 0 - parentName: - overridePath: - fixPos3D: 0 - voxelSize: {x: 1, y: 1, z: 1} - passedFilter: 0 + m_SourcePositions: + - {x: 1, y: 1, z: 1} + - {x: 1, y: 1, z: -1} + - {x: -0.5930989, y: -1, z: 3.436201} + - {x: 1, y: -1, z: -1} + - {x: -2.738532, y: 1, z: -0.19425249} + - {x: -1, y: 1, z: -1} + - {x: -4.925142, y: -1, z: 2.9896603} + - {x: -1, y: -1, z: -1} + - {x: 4.5489216, y: 0.48635864, z: -4.4367194} + - {x: -0.5307379, y: 0.6763722, z: -7.0993633} + - {x: -4.382635, y: 0.14230812, z: -6.836036} + - {x: 9.363578, y: 0.6839063, z: -0.627285} + - {x: 0.53357506, y: -1.1065986, z: -0.53954697} + - {x: -3.9168344, y: -1.1065986, z: -0.1942687} + - {x: 7.0004053, y: -1.1065986, z: 1.2227235} + - {x: 3.1427042, y: -1.1065986, z: 2.38351} + - {x: -1.8079829, y: -1.1065986, z: 2.0856476} + - {x: -7.639022, y: -1.1065986, z: -1.7800035} + m_Dering: 1 +--- !u!4 &1176005997 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1176005995} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 2.0799425, y: 1.1065986, z: 2.4813514} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!64 &1179670339 MeshCollider: m_ObjectHideFlags: 0 @@ -8148,6 +8934,7 @@ Transform: - {fileID: 1085855515} - {fileID: 1582922307} - {fileID: 1645979371} + - {fileID: 2078697637} - {fileID: 605803856} - {fileID: 281745725} - {fileID: 1830163699} @@ -8175,6 +8962,69 @@ MeshCollider: m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: -9056273479995001589, guid: e17aada14f1fae9419bb140c6553b6bf, type: 3} +--- !u!1 &1189825615 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1189825617} + - component: {fileID: 1189825616} + m_Layer: 0 + m_Name: Navmesh Surface + m_TagString: Untagged + m_Icon: {fileID: 2800000, guid: e4f97225bcfb64760a1c81f460837f01, type: 3} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1189825616 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1189825615} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7a5ac11cc976e418e8d13136b07e1f52, type: 3} + m_Name: + m_EditorClassIdentifier: + m_AgentTypeID: 0 + m_CollectObjects: 0 + m_Size: {x: 10, y: 10, z: 10} + m_Center: {x: 0, y: 2, z: 0} + m_LayerMask: + serializedVersion: 2 + m_Bits: 1 + m_UseGeometry: 1 + m_DefaultArea: 0 + m_GenerateLinks: 0 + m_IgnoreNavMeshAgent: 1 + m_IgnoreNavMeshObstacle: 1 + m_OverrideTileSize: 0 + m_TileSize: 256 + m_OverrideVoxelSize: 0 + m_VoxelSize: 0.05333333 + m_MinRegionArea: 2 + m_NavMeshData: {fileID: 23800000, guid: 1f12635bac0e5bf43aaab553b33ded86, type: 2} + m_BuildHeightMesh: 0 +--- !u!4 &1189825617 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1189825615} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!64 &1201149964 MeshCollider: m_ObjectHideFlags: 0 @@ -8321,6 +9171,80 @@ MeshCollider: m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: -5072188773914483968, guid: e17aada14f1fae9419bb140c6553b6bf, type: 3} +--- !u!1001 &1245595179 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 490914836} + m_Modifications: + - target: {fileID: 1275605982261414178, guid: b4d97f62efaf01a4ea564225ea57ecdd, + type: 3} + propertyPath: m_LocalPosition.x + value: -2.25 + objectReference: {fileID: 0} + - target: {fileID: 1275605982261414178, guid: b4d97f62efaf01a4ea564225ea57ecdd, + type: 3} + propertyPath: m_LocalPosition.y + value: 0.132 + objectReference: {fileID: 0} + - target: {fileID: 1275605982261414178, guid: b4d97f62efaf01a4ea564225ea57ecdd, + type: 3} + propertyPath: m_LocalPosition.z + value: -17.075 + objectReference: {fileID: 0} + - target: {fileID: 1275605982261414178, guid: b4d97f62efaf01a4ea564225ea57ecdd, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1275605982261414178, guid: b4d97f62efaf01a4ea564225ea57ecdd, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1275605982261414178, guid: b4d97f62efaf01a4ea564225ea57ecdd, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1275605982261414178, guid: b4d97f62efaf01a4ea564225ea57ecdd, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1275605982261414178, guid: b4d97f62efaf01a4ea564225ea57ecdd, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1275605982261414178, guid: b4d97f62efaf01a4ea564225ea57ecdd, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1275605982261414178, guid: b4d97f62efaf01a4ea564225ea57ecdd, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1275605982261414181, guid: b4d97f62efaf01a4ea564225ea57ecdd, + type: 3} + propertyPath: m_Name + value: GunModify_Light Variant + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: b4d97f62efaf01a4ea564225ea57ecdd, type: 3} +--- !u!4 &1245595180 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1275605982261414178, guid: b4d97f62efaf01a4ea564225ea57ecdd, + type: 3} + m_PrefabInstance: {fileID: 1245595179} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1247667001 PrefabInstance: m_ObjectHideFlags: 0 @@ -9290,6 +10214,21 @@ PrefabInstance: propertyPath: m_LocalRotation.z value: 0.7071068 objectReference: {fileID: 0} + - target: {fileID: 6417910595033156401, guid: e5d265393747af741b4f5d719598831a, + type: 3} + propertyPath: m_WarningMessage + value: "\nBinding warning: Some generic clip(s) animate transforms that are + already bound by a Humanoid avatar. These transforms can only be changed + by Humanoid clips.\n\tTransform 'Spine'\n\tTransform 'Right_Foot'\n\tTransform + 'UpperChest'\n\tTransform 'Left_UpperArm'\n\tTransform 'Right_LowerLeg'\n\tTransform + 'Neck'\n\tTransform 'Hips'\n\tTransform 'Left_LowerLeg'\n\tTransform 'Left_Hand'\n\tTransform + 'Right_Hand'\n\tand more ...\n\tFrom animation clip 'Rifle Crouch'\n\tFrom + animation clip 'Rifle Crouch Forward'\n\tFrom animation clip 'Rifle Crouch + BackForward'\n\tFrom animation clip 'Rifle Crouch Left'\n\tFrom animation + clip 'Rifle Crouch Right'\n\tFrom animation clip 'Rifle Jump'\n\tFrom animation + clip 'Rifle Air Idle'\n\tFrom animation clip 'Rifle Vault'\n\tFrom animation + clip 'Rifle Run'\n\tFrom animation clip 'Rifle Sprint'\n\tand more ..." + objectReference: {fileID: 0} - target: {fileID: 6543478755785382772, guid: e5d265393747af741b4f5d719598831a, type: 3} propertyPath: m_RotationOffsets.Array.data[0].x @@ -9514,6 +10453,49 @@ MeshCollider: m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: -2473439689419763042, guid: e17aada14f1fae9419bb140c6553b6bf, type: 3} +--- !u!114 &1370540270 +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: ec0b4dd729a12d046982652f834580a2, type: 3} + m_Name: NewSix_LM0 + m_EditorClassIdentifier: + resolution: 4096 + bitmask: 1 + id: 0 + sortingID: 1 + isImplicit: 1 + area: 73809.57 + totalVertexCount: 0 + vertexCounter: 0 + sceneLodLevel: -1 + autoResolution: 0 + sceneName: + tag: -1 + containsTerrains: 0 + probes: 0 + mode: 1 + renderMode: 1000 + renderDirMode: 1000 + atlasPacker: 1000 + computeSSS: 0 + sssSamples: 16 + sssDensity: 10 + sssColor: {r: 1, g: 1, b: 1, a: 1} + sssScale: 1 + fakeShadowBias: 0 + transparentSelfShadow: 0 + flipNormal: 0 + parentName: + overridePath: + fixPos3D: 0 + voxelSize: {x: 1, y: 1, z: 1} + passedFilter: 0 --- !u!114 &1371663016 MonoBehaviour: m_ObjectHideFlags: 0 @@ -9572,6 +10554,154 @@ MonoBehaviour: shadowmaskGroupID: 0 directionMode: 0 maskChannel: -1 +--- !u!1001 &1372653453 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1826980432} + m_Modifications: + - target: {fileID: 2912657673940515616, guid: e5ff4635697757a43bc8b359bbf33049, + type: 3} + propertyPath: m_Name + value: Glock_Magazine Variant (5) + objectReference: {fileID: 0} + - target: {fileID: 2912657673940515623, guid: e5ff4635697757a43bc8b359bbf33049, + type: 3} + propertyPath: m_LocalPosition.x + value: -2.625 + objectReference: {fileID: 0} + - target: {fileID: 2912657673940515623, guid: e5ff4635697757a43bc8b359bbf33049, + type: 3} + propertyPath: m_LocalPosition.y + value: 0.157 + objectReference: {fileID: 0} + - target: {fileID: 2912657673940515623, guid: e5ff4635697757a43bc8b359bbf33049, + type: 3} + propertyPath: m_LocalPosition.z + value: -17.029 + objectReference: {fileID: 0} + - target: {fileID: 2912657673940515623, guid: e5ff4635697757a43bc8b359bbf33049, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2912657673940515623, guid: e5ff4635697757a43bc8b359bbf33049, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2912657673940515623, guid: e5ff4635697757a43bc8b359bbf33049, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2912657673940515623, guid: e5ff4635697757a43bc8b359bbf33049, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2912657673940515623, guid: e5ff4635697757a43bc8b359bbf33049, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2912657673940515623, guid: e5ff4635697757a43bc8b359bbf33049, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2912657673940515623, guid: e5ff4635697757a43bc8b359bbf33049, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: e5ff4635697757a43bc8b359bbf33049, type: 3} +--- !u!4 &1372653454 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 2912657673940515623, guid: e5ff4635697757a43bc8b359bbf33049, + type: 3} + m_PrefabInstance: {fileID: 1372653453} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &1373583052 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1826980432} + m_Modifications: + - target: {fileID: 2912657673940515616, guid: e5ff4635697757a43bc8b359bbf33049, + type: 3} + propertyPath: m_Name + value: Glock_Magazine Variant (1) + objectReference: {fileID: 0} + - target: {fileID: 2912657673940515623, guid: e5ff4635697757a43bc8b359bbf33049, + type: 3} + propertyPath: m_LocalPosition.x + value: -2.625 + objectReference: {fileID: 0} + - target: {fileID: 2912657673940515623, guid: e5ff4635697757a43bc8b359bbf33049, + type: 3} + propertyPath: m_LocalPosition.y + value: 0.157 + objectReference: {fileID: 0} + - target: {fileID: 2912657673940515623, guid: e5ff4635697757a43bc8b359bbf33049, + type: 3} + propertyPath: m_LocalPosition.z + value: -17.029 + objectReference: {fileID: 0} + - target: {fileID: 2912657673940515623, guid: e5ff4635697757a43bc8b359bbf33049, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2912657673940515623, guid: e5ff4635697757a43bc8b359bbf33049, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2912657673940515623, guid: e5ff4635697757a43bc8b359bbf33049, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2912657673940515623, guid: e5ff4635697757a43bc8b359bbf33049, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2912657673940515623, guid: e5ff4635697757a43bc8b359bbf33049, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2912657673940515623, guid: e5ff4635697757a43bc8b359bbf33049, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2912657673940515623, guid: e5ff4635697757a43bc8b359bbf33049, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: e5ff4635697757a43bc8b359bbf33049, type: 3} +--- !u!4 &1373583053 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 2912657673940515623, guid: e5ff4635697757a43bc8b359bbf33049, + type: 3} + m_PrefabInstance: {fileID: 1373583052} + m_PrefabAsset: {fileID: 0} --- !u!64 &1381918116 MeshCollider: m_ObjectHideFlags: 0 @@ -9718,6 +10848,80 @@ Transform: - {fileID: 1861072836} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &1412516528 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1826980432} + m_Modifications: + - target: {fileID: 2912657673940515616, guid: e5ff4635697757a43bc8b359bbf33049, + type: 3} + propertyPath: m_Name + value: Glock_Magazine Variant + objectReference: {fileID: 0} + - target: {fileID: 2912657673940515623, guid: e5ff4635697757a43bc8b359bbf33049, + type: 3} + propertyPath: m_LocalPosition.x + value: -2.625 + objectReference: {fileID: 0} + - target: {fileID: 2912657673940515623, guid: e5ff4635697757a43bc8b359bbf33049, + type: 3} + propertyPath: m_LocalPosition.y + value: 0.157 + objectReference: {fileID: 0} + - target: {fileID: 2912657673940515623, guid: e5ff4635697757a43bc8b359bbf33049, + type: 3} + propertyPath: m_LocalPosition.z + value: -16.81 + objectReference: {fileID: 0} + - target: {fileID: 2912657673940515623, guid: e5ff4635697757a43bc8b359bbf33049, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2912657673940515623, guid: e5ff4635697757a43bc8b359bbf33049, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2912657673940515623, guid: e5ff4635697757a43bc8b359bbf33049, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2912657673940515623, guid: e5ff4635697757a43bc8b359bbf33049, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2912657673940515623, guid: e5ff4635697757a43bc8b359bbf33049, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2912657673940515623, guid: e5ff4635697757a43bc8b359bbf33049, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2912657673940515623, guid: e5ff4635697757a43bc8b359bbf33049, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: e5ff4635697757a43bc8b359bbf33049, type: 3} +--- !u!4 &1412516529 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 2912657673940515623, guid: e5ff4635697757a43bc8b359bbf33049, + type: 3} + m_PrefabInstance: {fileID: 1412516528} + m_PrefabAsset: {fileID: 0} --- !u!64 &1414665008 MeshCollider: m_ObjectHideFlags: 0 @@ -10012,49 +11216,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1458392626} m_PrefabAsset: {fileID: 0} ---- !u!114 &1498312841 -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: ec0b4dd729a12d046982652f834580a2, type: 3} - m_Name: NewSix_LMA3 - m_EditorClassIdentifier: - resolution: 2048 - bitmask: 1 - id: 3 - sortingID: 3 - isImplicit: 1 - area: 0 - totalVertexCount: 0 - vertexCounter: 0 - sceneLodLevel: -1 - autoResolution: 0 - sceneName: - tag: -1 - containsTerrains: 0 - probes: 0 - mode: 1 - renderMode: 1000 - renderDirMode: 1000 - atlasPacker: 1000 - computeSSS: 0 - sssSamples: 16 - sssDensity: 10 - sssColor: {r: 1, g: 1, b: 1, a: 1} - sssScale: 1 - fakeShadowBias: 0 - transparentSelfShadow: 0 - flipNormal: 0 - parentName: - overridePath: - fixPos3D: 0 - voxelSize: {x: 1, y: 1, z: 1} - passedFilter: 0 --- !u!64 &1510778367 MeshCollider: m_ObjectHideFlags: 0 @@ -10546,6 +11707,49 @@ MonoBehaviour: shadowmaskGroupID: 0 directionMode: 0 maskChannel: -1 +--- !u!114 &1597352810 +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: ec0b4dd729a12d046982652f834580a2, type: 3} + m_Name: NewSix_LMA1 + m_EditorClassIdentifier: + resolution: 4096 + bitmask: 1 + id: 1 + sortingID: 2 + isImplicit: 1 + area: 0 + totalVertexCount: 0 + vertexCounter: 0 + sceneLodLevel: -1 + autoResolution: 0 + sceneName: + tag: -1 + containsTerrains: 0 + probes: 0 + mode: 1 + renderMode: 1000 + renderDirMode: 1000 + atlasPacker: 1000 + computeSSS: 0 + sssSamples: 16 + sssDensity: 10 + sssColor: {r: 1, g: 1, b: 1, a: 1} + sssScale: 1 + fakeShadowBias: 0 + transparentSelfShadow: 0 + flipNormal: 0 + parentName: + overridePath: + fixPos3D: 0 + voxelSize: {x: 1, y: 1, z: 1} + passedFilter: 0 --- !u!1001 &1602832142 PrefabInstance: m_ObjectHideFlags: 0 @@ -11268,49 +12472,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1717571667} m_PrefabAsset: {fileID: 0} ---- !u!114 &1730214906 -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: ec0b4dd729a12d046982652f834580a2, type: 3} - m_Name: NewSix_LM0 - m_EditorClassIdentifier: - resolution: 4096 - bitmask: 1 - id: 0 - sortingID: 0 - isImplicit: 1 - area: 73809.57 - totalVertexCount: 0 - vertexCounter: 0 - sceneLodLevel: -1 - autoResolution: 0 - sceneName: - tag: -1 - containsTerrains: 0 - probes: 0 - mode: 1 - renderMode: 1000 - renderDirMode: 1000 - atlasPacker: 1000 - computeSSS: 0 - sssSamples: 16 - sssDensity: 10 - sssColor: {r: 1, g: 1, b: 1, a: 1} - sssScale: 1 - fakeShadowBias: 0 - transparentSelfShadow: 0 - flipNormal: 0 - parentName: - overridePath: - fixPos3D: 0 - voxelSize: {x: 1, y: 1, z: 1} - passedFilter: 0 --- !u!1001 &1732889747 PrefabInstance: m_ObjectHideFlags: 0 @@ -11850,6 +13011,43 @@ MeshCollider: m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 8281742534907519844, guid: e17aada14f1fae9419bb140c6553b6bf, type: 3} +--- !u!1 &1826980431 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1826980432} + m_Layer: 0 + m_Name: Glock_Magazine Variant + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1826980432 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1826980431} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1412516529} + - {fileID: 1373583053} + - {fileID: 1372653454} + - {fileID: 918222711} + - {fileID: 184667483} + - {fileID: 35673567} + m_Father: {fileID: 1143251018} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!64 &1827477877 MeshCollider: m_ObjectHideFlags: 0 @@ -13187,6 +14385,124 @@ MeshCollider: m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 1690405143876182202, guid: e17aada14f1fae9419bb140c6553b6bf, type: 3} +--- !u!1 &2078697636 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2078697637} + - component: {fileID: 2078697639} + - component: {fileID: 2078697638} + m_Layer: 0 + m_Name: Spot Light (5) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2078697637 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2078697636} + serializedVersion: 2 + m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: 0.7071068} + m_LocalPosition: {x: -14.962, y: 3.8, z: 5.189} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1181579606} + m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} +--- !u!114 &2078697638 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2078697636} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Version: 3 + m_UsePipelineSettings: 1 + m_AdditionalLightsShadowResolutionTier: 2 + m_LightLayerMask: 1 + m_RenderingLayers: 1 + m_CustomShadowLayers: 0 + m_ShadowLayerMask: 1 + m_ShadowRenderingLayers: 1 + m_LightCookieSize: {x: 1, y: 1} + m_LightCookieOffset: {x: 0, y: 0} + m_SoftShadowQuality: 0 +--- !u!108 &2078697639 +Light: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2078697636} + m_Enabled: 1 + serializedVersion: 10 + m_Type: 0 + m_Shape: 0 + m_Color: {r: 1, g: 0.7176471, b: 0, a: 1} + m_Intensity: 16 + m_Range: 16 + m_SpotAngle: 120 + m_InnerSpotAngle: 21.80208 + m_CookieSize: 10 + m_Shadows: + m_Type: 2 + m_Resolution: -1 + m_CustomResolution: -1 + m_Strength: 1 + m_Bias: 0.05 + m_NormalBias: 0.4 + m_NearPlane: 0.2 + 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: 0 + m_ColorTemperature: 3968 + m_UseColorTemperature: 1 + m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} + m_UseBoundingSphereOverride: 0 + m_UseViewFrustumForShadowCasterCull: 1 + m_ShadowRadius: 0 + m_ShadowAngle: 0 --- !u!64 &2081234041 MeshCollider: m_ObjectHideFlags: 0 @@ -13397,49 +14713,6 @@ MeshCollider: m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: -768073159331053217, guid: e17aada14f1fae9419bb140c6553b6bf, type: 3} ---- !u!114 &2107757019 -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: ec0b4dd729a12d046982652f834580a2, type: 3} - m_Name: NewSix_LMA1 - m_EditorClassIdentifier: - resolution: 4096 - bitmask: 1 - id: 1 - sortingID: 1 - isImplicit: 1 - area: 0 - totalVertexCount: 0 - vertexCounter: 0 - sceneLodLevel: -1 - autoResolution: 0 - sceneName: - tag: -1 - containsTerrains: 0 - probes: 0 - mode: 1 - renderMode: 1000 - renderDirMode: 1000 - atlasPacker: 1000 - computeSSS: 0 - sssSamples: 16 - sssDensity: 10 - sssColor: {r: 1, g: 1, b: 1, a: 1} - sssScale: 1 - fakeShadowBias: 0 - transparentSelfShadow: 0 - flipNormal: 0 - parentName: - overridePath: - fixPos3D: 0 - voxelSize: {x: 1, y: 1, z: 1} - passedFilter: 0 --- !u!1001 &2122517404 PrefabInstance: m_ObjectHideFlags: 0 @@ -26625,6 +27898,7 @@ SceneRoots: - {fileID: 56798384} - {fileID: 1301686272} - {fileID: 340041803} + - {fileID: 1189825617} - {fileID: 917867926} - {fileID: 760266619} - {fileID: 313681833} @@ -26634,7 +27908,11 @@ SceneRoots: - {fileID: 948852312} - {fileID: 6023002340561843004} - {fileID: 1408424573} + - {fileID: 1176005997} - {fileID: 953450480} - {fileID: 128794103} - {fileID: 1335177834} - {fileID: 64238955} + - {fileID: 1080184758} + - {fileID: 410856757} + - {fileID: 62063928} diff --git a/Assets/Artists/Scenes/Game/NewSix/NavMesh-Navmesh Surface.asset b/Assets/Artists/Scenes/Game/NewSix/NavMesh-Navmesh Surface.asset new file mode 100644 index 000000000..abd8bcfb3 Binary files /dev/null and b/Assets/Artists/Scenes/Game/NewSix/NavMesh-Navmesh Surface.asset differ diff --git a/Assets/Artists/Scripts/Entities/Core/Character/EntityProxyCharacter.cs b/Assets/Artists/Scripts/Entities/Core/Character/EntityProxyCharacter.cs index 691fe065a..4b791a724 100644 --- a/Assets/Artists/Scripts/Entities/Core/Character/EntityProxyCharacter.cs +++ b/Assets/Artists/Scripts/Entities/Core/Character/EntityProxyCharacter.cs @@ -22,6 +22,8 @@ namespace BITFALL.Entites [Inject] private IEntityOverride _override; private readonly List<(Transform transform,Vector3 initialPosition, Quaternion initialRotation)> _initialJoint = new(); + + private bool _updateNextFrame; public override void OnStart() { base.OnStart(); @@ -44,7 +46,16 @@ namespace BITFALL.Entites } } - + public override void OnUpdate(float deltaTime) + { + base.OnUpdate(deltaTime); + if (_updateNextFrame) + { + EnsurePhysicsAnimation(); + _updateNextFrame = false; + } + } + private void EnsurePhysicsAnimation() { @@ -56,13 +67,22 @@ namespace BITFALL.Entites } else { - animator.enabled = _health.IsAlive; + if (_override is not null) + { + animator.enabled = _health.IsAlive || _override.IsOvering; + } + else + { + animator.enabled = _health.IsAlive; + } + } } private void OnOverride(bool obj) { - EnsurePhysicsAnimation(); + //EnsurePhysicsAnimation(); + _updateNextFrame = true; } public void OnSetAlive(bool alive) { @@ -76,7 +96,8 @@ namespace BITFALL.Entites x.transform.localPosition = x.initialPosition; } } - EnsurePhysicsAnimation(); + //EnsurePhysicsAnimation(); + _updateNextFrame = true; } public void OnSetHP(int hp) diff --git a/Assets/Artists/Scripts/Entities/Movement/MotionBasedAnimancerState.cs b/Assets/Artists/Scripts/Entities/Movement/MotionBasedAnimancerState.cs new file mode 100644 index 000000000..b75c51104 --- /dev/null +++ b/Assets/Artists/Scripts/Entities/Movement/MotionBasedAnimancerState.cs @@ -0,0 +1,19 @@ +using System; +using System.Collections; +using System.Collections.Generic; +using Animancer; +using UnityEngine; + +namespace BITFALL.Movement.MotionBased +{ + [Serializable] + public sealed class MotionBasedClipTransition : ClipTransition, IMotionBasedAnimationState + { + object ICloneable.Clone() => MemberwiseClone(); + } + [Serializable] + public sealed class MotionBasedMixTransition : LinearMixerTransition, IMotionBasedAnimationState + { + object ICloneable.Clone() => MemberwiseClone(); + } +} diff --git a/Assets/Artists/Scripts/Entities/Movement/MotionBasedBehavior.cs b/Assets/Artists/Scripts/Entities/Movement/MotionBasedBehavior.cs index e53fb9fbd..d07cb1b7c 100644 --- a/Assets/Artists/Scripts/Entities/Movement/MotionBasedBehavior.cs +++ b/Assets/Artists/Scripts/Entities/Movement/MotionBasedBehavior.cs @@ -38,23 +38,25 @@ namespace BITFALL.Movement.MotionBased { if (obj) { - _override.RemoveOverride(-1); + //_override.RemoveOverride(-1); animancerComponent.Layers[8].Stop(); } else if( allowDeathAnimation) { - animancerComponent.Layers[1].Stop(); - _override.AddOverride(-1); - if (animationClips.TryGetValue("Death", out var clips) is false) return; - var state = animancerComponent.Layers[8].Play(clips.Random()); - state.Events.OnEnd += OnEnd; - return; - void OnEnd() - { - _override.RemoveOverride(-1); - state.Events.OnEnd = null; - animancerComponent.Layers[8].Stop(); - } + //animancerComponent.Layers[1].Stop(); + Play("Death",false,8); + + // _override.AddOverride(-1); + // if (animationClips.TryGetValue("Death", out var clips) is false) return; + // var state = animancerComponent.Layers[8].Play(clips.Random()); + // state.Events.OnEnd += OnEnd; + // return; + // void OnEnd() + // { + // _override.RemoveOverride(-1); + // state.Events.OnEnd = null; + // animancerComponent.Layers[8].Stop(); + // } } } @@ -69,10 +71,11 @@ namespace BITFALL.Movement.MotionBased // } } public void Play(string animationName)=>Play(animationName,false); - public void Play(string animationName, bool isAdditive) + public void Play(string animationName, bool isAdditive,int layer = -1) { if (animationClips.TryGetValue(animationName, out var clip) is false) return; - var layer = isAdditive ? 2 : 1; + layer = layer is -1 ? isAdditive ? 2 : 1 : layer; + if (string.IsNullOrEmpty(lastAnimationName) is false) { _override.RemoveOverride(lastAnimationName); @@ -90,6 +93,7 @@ namespace BITFALL.Movement.MotionBased { state.Events.OnEnd = null; animancerComponent.Layers[layer].Stop(); + UnityEntity.Invoke(Constant.Animation.OnPlayEnd,animationName); if (isAdditive is false) _override.RemoveOverride(animationName); } diff --git a/Assets/Artists/Scripts/Entities/Movement/MotionBasedMovement.cs b/Assets/Artists/Scripts/Entities/Movement/MotionBasedMovement.cs index 7daa96ef1..20871d223 100644 --- a/Assets/Artists/Scripts/Entities/Movement/MotionBasedMovement.cs +++ b/Assets/Artists/Scripts/Entities/Movement/MotionBasedMovement.cs @@ -16,6 +16,14 @@ namespace BITFALL.Movement.MotionBased public interface IMotionBasedState : IEntityMovementState { void OnAnimatorMove(); + } + public interface IMotionBasedAnimationState:ICloneable + { + } + public interface IMotionBasedAnimationClip{} + public abstract class MotionBasedAnimationState + { + } [CustomType(typeof(MotionBasedMovement))] public sealed class MotionBasedMovement : StateBasedBehavior,IEntityMovement @@ -151,8 +159,7 @@ namespace BITFALL.Movement.MotionBased get => Transform.rotation; set => Transform.rotation = value; } - - Vector3 IEntityMovement.Forward => Transform.forward; + public Vector3 Forward => Rotation * Vector3.forward; Vector3 IEntityMovement.ViewForward => Transform.forward; diff --git a/Assets/Artists/Scripts/Entities/Movement/MotionBasedStates.cs b/Assets/Artists/Scripts/Entities/Movement/MotionBasedStates.cs index 7f303076f..2133141a3 100644 --- a/Assets/Artists/Scripts/Entities/Movement/MotionBasedStates.cs +++ b/Assets/Artists/Scripts/Entities/Movement/MotionBasedStates.cs @@ -7,6 +7,7 @@ using AYellowpaper.SerializedCollections; using BITKit; using BITKit.Entities; using BITKit.StateMachine; +using Unity.Mathematics; using UnityEngine; using UnityEngine.AI; using UnityEngine.Splines; @@ -21,6 +22,8 @@ namespace BITFALL.Movement.MotionBased.States [Inject] protected IHealth health; protected Vector3 MotionVelocity { get; private set; } + protected Vector3 MotionAngularVelocity { get; private set; } + protected Quaternion MotionDeltaRotation { get; private set; } public virtual bool Enabled { get; set; } public virtual void Initialize() { @@ -63,6 +66,8 @@ namespace BITFALL.Movement.MotionBased.States public virtual void OnAnimatorMove() { MotionVelocity = animancerComponent.Animator.velocity; + MotionAngularVelocity = animancerComponent.Animator.angularVelocity; + MotionDeltaRotation = animancerComponent.Animator.deltaRotation; } } @@ -161,11 +166,21 @@ namespace BITFALL.Movement.MotionBased.States [Serializable] public sealed class Walk : MotionBasedState { - [SerializeField] private AnimationClip clip; + [SerializeField] private LinearMixerTransition _state; + + private AnimancerState _playingState; + + private float rot = 0; public override void OnStateEntry(IState old) { base.OnStateEntry(old); - animancerComponent.Play(clip,0.1f); + _playingState = animancerComponent.Play(_state); + } + + public override void OnStateExit(IState old, IState newState) + { + base.OnStateExit(old, newState); + _playingState = null; } public override void OnStateUpdate(float deltaTime) @@ -198,18 +213,44 @@ namespace BITFALL.Movement.MotionBased.States public override void UpdateRotation(ref Quaternion currentRotation, float deltaTime) { base.UpdateRotation(ref currentRotation, deltaTime); + + var pathRotation = currentRotation; + var lerpRotation = currentRotation; + var direction = agent.steeringTarget - agent.transform.position; if(direction.sqrMagnitude>0.1f) { direction = Vector3.ProjectOnPlane(direction, Vector3.up); - currentRotation = + pathRotation = Quaternion.LookRotation(direction); + lerpRotation = Quaternion.RotateTowards( currentRotation, - Quaternion.LookRotation(direction), + pathRotation, 360 * deltaTime ) ; } + + + if (_playingState is not null) + { + var dir = pathRotation * Vector3.forward; //位置差，方向 + var dot = Vector3.Dot(movement.Forward, dir.normalized);//点乘判断前后：dot >0在前，<0在后 + var dot1 = Vector3.Dot(movement.transform.right, dir.normalized);//点乘判断左右： dot1>0在右，<0在左 + var angle = Mathf.Acos(Vector3.Dot(movement.Forward.normalized, dir.normalized)) * Mathf.Rad2Deg;//通过点乘求出 + + angle = dot1 > 0 ? angle : -angle; + + var clamp = Mathf.Clamp(angle/45, -1, 1); + + rot = Mathf.MoveTowards(rot, clamp, 8 * deltaTime); + + _state.State.Parameter =rot ; + + //Debug.Log($"angle:{angle} dot:{dot} dot1:{dot1} clamp:{clamp}"); + + } + currentRotation = lerpRotation; } } diff --git a/Assets/Artists/Scripts/Player/CharacterControllerPro/PlayerCharacterStates.cs b/Assets/Artists/Scripts/Player/CharacterControllerPro/PlayerCharacterStates.cs index 05b3111c3..3353c3e31 100644 --- a/Assets/Artists/Scripts/Player/CharacterControllerPro/PlayerCharacterStates.cs +++ b/Assets/Artists/Scripts/Player/CharacterControllerPro/PlayerCharacterStates.cs @@ -32,6 +32,10 @@ namespace BITFALL.Entities.Player.Movement.States public override void AfterUpdateMovement(float deltaTime) { + if (knockdown.IsKnockdown) + { + characterController.TransitionState(); + } if (knockdown.IsKnockdown is false && characterController.ExpectParachute.shouldBe) { characterController.TransitionState(); @@ -216,6 +220,7 @@ namespace BITFALL.Entities.Player.Movement.States public override void AfterUpdateMovement(float deltaTime) { base.AfterUpdateMovement(deltaTime); + if (characterController.CurrentState != this) return; switch (characterController.ExpectRun.shouldBe,characterController.ExpectCrouch.shouldBe) { case (_,true): diff --git a/Assets/BITKit/Unity/Scripts/Entity/Components/Physics/EntityPhysics.cs b/Assets/BITKit/Unity/Scripts/Entity/Components/Physics/EntityPhysics.cs index 24954069b..313bf8dc9 100644 --- a/Assets/BITKit/Unity/Scripts/Entity/Components/Physics/EntityPhysics.cs +++ b/Assets/BITKit/Unity/Scripts/Entity/Components/Physics/EntityPhysics.cs @@ -15,40 +15,64 @@ namespace BITKit.Entities [SerializeField] private Collider[] ragdollColliders; [SerializeField] private Joint[] joints; [SerializeField] private new Rigidbody rigidbody; - [Inject] + + [Inject(true)] private IHealth _health; + + [Inject(true)] private IEntityOverride _override; + private readonly Dictionary _jointXMotions=new(); private readonly Dictionary _jointYMotions=new(); private readonly Dictionary _jointZMotions=new(); private readonly Dictionary _jointAngularXMotions=new(); private readonly Dictionary _jointAngularYMotions=new(); private readonly Dictionary _jointAngularZMotions=new(); - + public override void OnAwake() { _health.OnSetAlive += OnSetAlive; - _health.OnSetHealthPoint += OnSetHP; foreach (var x in joints) { switch (x) { - case ConfigurableJoint configurableJoint: - _jointXMotions.Add(configurableJoint,configurableJoint.xMotion); - _jointYMotions.Add(configurableJoint,configurableJoint.yMotion); - _jointZMotions.Add(configurableJoint,configurableJoint.zMotion); - _jointAngularXMotions.Add(configurableJoint,configurableJoint.angularXMotion); - _jointAngularYMotions.Add(configurableJoint,configurableJoint.angularYMotion); - _jointAngularZMotions.Add(configurableJoint,configurableJoint.angularZMotion); + case ConfigurableJoint configurableJoint: + _jointXMotions.Add(configurableJoint, configurableJoint.xMotion); + _jointYMotions.Add(configurableJoint, configurableJoint.yMotion); + _jointZMotions.Add(configurableJoint, configurableJoint.zMotion); + _jointAngularXMotions.Add(configurableJoint, configurableJoint.angularXMotion); + _jointAngularYMotions.Add(configurableJoint, configurableJoint.angularYMotion); + _jointAngularZMotions.Add(configurableJoint, configurableJoint.angularZMotion); break; } } + + if (_override is not null) + _override.OnOverride += OnOverride; } - private async void OnSetAlive(bool alive) + private void OnOverride(bool obj) { - IsPhysics = !alive; + EnsureConf(); + } + + private void OnSetAlive(bool alive) + { + EnsureConf(); + } + + private async void EnsureConf() + { + var allow = (_health, _override) switch + { + (not null,not null)=>_health.IsAlive || _override.IsOvering, + (not null,null)=>_health.IsAlive, + (null,not null)=>_override.IsOvering, + _=>false, + }; if (animator) - animator.enabled = alive; + { + animator.enabled = allow; + } try { await Task.Delay(10, destroyCancellationToken); @@ -56,13 +80,13 @@ namespace BITKit.Entities foreach (var x in rigidbodies) { //x.isKinematic = alive; - x.gameObject.SetActive(!alive); + x.gameObject.SetActive(!allow); } foreach (var x in ragdollColliders) { - x.enabled = !alive; + x.enabled = !allow; } - OnSetPhysics?.Invoke(!alive); + OnSetPhysics?.Invoke(!allow); } catch (OperationCanceledException) { @@ -74,25 +98,20 @@ namespace BITKit.Entities switch (joint) { case ConfigurableJoint configurableJoint: - configurableJoint.xMotion = alive ? _jointXMotions[joint] : ConfigurableJointMotion.Free; - configurableJoint.yMotion = alive ? _jointYMotions[joint] : ConfigurableJointMotion.Free; - configurableJoint.zMotion = alive ? _jointZMotions[joint] : ConfigurableJointMotion.Free; + configurableJoint.xMotion = allow ? _jointXMotions[joint] : ConfigurableJointMotion.Free; + configurableJoint.yMotion = allow ? _jointYMotions[joint] : ConfigurableJointMotion.Free; + configurableJoint.zMotion = allow ? _jointZMotions[joint] : ConfigurableJointMotion.Free; configurableJoint.angularXMotion = - alive ? _jointAngularXMotions[joint] : ConfigurableJointMotion.Free; + allow ? _jointAngularXMotions[joint] : ConfigurableJointMotion.Free; configurableJoint.angularYMotion = - alive ? _jointAngularYMotions[joint] : ConfigurableJointMotion.Free; + allow ? _jointAngularYMotions[joint] : ConfigurableJointMotion.Free; configurableJoint.angularZMotion = - alive ? _jointAngularZMotions[joint] : ConfigurableJointMotion.Free; + allow ? _jointAngularZMotions[joint] : ConfigurableJointMotion.Free; break; } } } - - public void OnSetHP(int hp) - { - } - public Vector3 Center => rigidbody.worldCenterOfMass; public bool IsPhysics { get; private set; } public Vector3 Velocity diff --git a/Assets/Bakery/_tempScene.unity b/Assets/Bakery/_tempScene.unity new file mode 100644 index 000000000..840eeef58 --- /dev/null +++ b/Assets/Bakery/_tempScene.unity @@ -0,0 +1,306 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!29 &1 +OcclusionCullingSettings: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_OcclusionBakeSettings: + smallestOccluder: 5 + smallestHole: 0.25 + backfaceThreshold: 100 + m_SceneGUID: 00000000000000000000000000000000 + m_OcclusionCullingData: {fileID: 0} +--- !u!104 &2 +RenderSettings: + m_ObjectHideFlags: 0 + serializedVersion: 9 + m_Fog: 0 + m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_FogMode: 3 + m_FogDensity: 0.01 + m_LinearFogStart: 0 + m_LinearFogEnd: 300 + m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1} + m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1} + m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1} + m_AmbientIntensity: 1 + m_AmbientMode: 0 + m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1} + m_SkyboxMaterial: {fileID: 0} + m_HaloStrength: 0.5 + m_FlareStrength: 1 + m_FlareFadeSpeed: 3 + m_HaloTexture: {fileID: 0} + m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0} + m_DefaultReflectionMode: 0 + m_DefaultReflectionResolution: 128 + m_ReflectionBounces: 1 + m_ReflectionIntensity: 1 + m_CustomReflection: {fileID: 0} + m_Sun: {fileID: 0} + m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1} + m_UseRadianceAmbientProbe: 0 +--- !u!157 &3 +LightmapSettings: + m_ObjectHideFlags: 0 + serializedVersion: 12 + m_GIWorkflowMode: 1 + m_GISettings: + serializedVersion: 2 + m_BounceScale: 1 + m_IndirectOutputScale: 1 + m_AlbedoBoost: 1 + m_EnvironmentLightingMode: 0 + m_EnableBakedLightmaps: 1 + m_EnableRealtimeLightmaps: 0 + m_LightmapEditorSettings: + serializedVersion: 12 + m_Resolution: 2 + m_BakeResolution: 40 + m_AtlasSize: 1024 + m_AO: 0 + m_AOMaxDistance: 1 + m_CompAOExponent: 1 + m_CompAOExponentDirect: 0 + m_ExtractAmbientOcclusion: 0 + m_Padding: 2 + m_LightmapParameters: {fileID: 0} + m_LightmapsBakeMode: 1 + m_TextureCompression: 1 + m_FinalGather: 0 + m_FinalGatherFiltering: 1 + m_FinalGatherRayCount: 256 + m_ReflectionCompression: 2 + m_MixedBakeMode: 2 + m_BakeBackend: 1 + m_PVRSampling: 1 + m_PVRDirectSampleCount: 32 + m_PVRSampleCount: 512 + m_PVRBounces: 2 + m_PVREnvironmentSampleCount: 256 + m_PVREnvironmentReferencePointCount: 2048 + m_PVRFilteringMode: 1 + m_PVRDenoiserTypeDirect: 1 + m_PVRDenoiserTypeIndirect: 1 + m_PVRDenoiserTypeAO: 1 + m_PVRFilterTypeDirect: 0 + m_PVRFilterTypeIndirect: 0 + m_PVRFilterTypeAO: 0 + m_PVREnvironmentMIS: 1 + m_PVRCulling: 1 + m_PVRFilteringGaussRadiusDirect: 1 + m_PVRFilteringGaussRadiusIndirect: 5 + m_PVRFilteringGaussRadiusAO: 2 + m_PVRFilteringAtrousPositionSigmaDirect: 0.5 + m_PVRFilteringAtrousPositionSigmaIndirect: 2 + m_PVRFilteringAtrousPositionSigmaAO: 1 + m_ExportTrainingData: 0 + m_TrainingDataDestination: TrainingData + m_LightProbeSampleCountMultiplier: 4 + m_LightingDataAsset: {fileID: 112000000, guid: 6fcbd6ef8df73ad4a9a140be3d235359, + type: 2} + m_LightingSettings: {fileID: 790793462} +--- !u!196 &4 +NavMeshSettings: + serializedVersion: 2 + m_ObjectHideFlags: 0 + m_BuildSettings: + serializedVersion: 3 + agentTypeID: 0 + agentRadius: 0.5 + agentHeight: 2 + agentSlope: 45 + agentClimb: 0.4 + ledgeDropHeight: 0 + maxJumpAcrossDistance: 0 + minRegionArea: 2 + manualCellSize: 0 + cellSize: 0.16666667 + manualTileSize: 0 + tileSize: 256 + buildHeightMesh: 0 + maxJobWorkers: 0 + preserveTilesOutsideBounds: 0 + debug: + m_Flags: 0 + m_NavMeshData: {fileID: 0} +--- !u!1 &425500979 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 425500981} + - component: {fileID: 425500980} + m_Layer: 0 + m_Name: New Game Object + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!220 &425500980 +LightProbeGroup: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 425500979} + m_Enabled: 1 + m_SourcePositions: + - {x: 1, y: 1, z: 1} + - {x: 1, y: 1, z: -1} + - {x: 1, y: -1, z: 1} + - {x: 1, y: -1, z: -1} + - {x: -1, y: 1, z: 1} + - {x: -1, y: 1, z: -1} + - {x: -1, y: -1, z: 1} + - {x: -1, y: -1, z: -1} + m_Dering: 1 +--- !u!4 &425500981 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 425500979} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0.22130358, y: 2.148, z: -18.13} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!850595691 &790793462 +LightingSettings: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + serializedVersion: 6 + m_GIWorkflowMode: 1 + m_EnableBakedLightmaps: 1 + m_EnableRealtimeLightmaps: 0 + m_RealtimeEnvironmentLighting: 1 + m_BounceScale: 1 + m_AlbedoBoost: 1 + m_IndirectOutputScale: 1 + m_UsingShadowmask: 1 + m_BakeBackend: 1 + m_LightmapMaxSize: 1024 + m_BakeResolution: 40 + m_Padding: 2 + m_LightmapCompression: 3 + m_AO: 0 + m_AOMaxDistance: 1 + m_CompAOExponent: 1 + m_CompAOExponentDirect: 0 + m_ExtractAO: 0 + m_MixedBakeMode: 2 + m_LightmapsBakeMode: 1 + m_FilterMode: 1 + m_LightmapParameters: {fileID: 15204, guid: 0000000000000000f000000000000000, type: 0} + m_ExportTrainingData: 0 + m_TrainingDataDestination: TrainingData + m_RealtimeResolution: 2 + m_ForceWhiteAlbedo: 0 + m_ForceUpdates: 0 + m_FinalGather: 0 + m_FinalGatherRayCount: 256 + m_FinalGatherFiltering: 1 + m_PVRCulling: 1 + m_PVRSampling: 1 + m_PVRDirectSampleCount: 32 + m_PVRSampleCount: 512 + m_PVREnvironmentSampleCount: 256 + m_PVREnvironmentReferencePointCount: 2048 + m_LightProbeSampleCountMultiplier: 4 + m_PVRBounces: 2 + m_PVRMinBounces: 2 + m_PVREnvironmentImportanceSampling: 1 + m_PVRFilteringMode: 1 + m_PVRDenoiserTypeDirect: 1 + m_PVRDenoiserTypeIndirect: 1 + m_PVRDenoiserTypeAO: 1 + m_PVRFilterTypeDirect: 0 + m_PVRFilterTypeIndirect: 0 + m_PVRFilterTypeAO: 0 + m_PVRFilteringGaussRadiusDirect: 1 + m_PVRFilteringGaussRadiusIndirect: 5 + m_PVRFilteringGaussRadiusAO: 2 + m_PVRFilteringAtrousPositionSigmaDirect: 0.5 + m_PVRFilteringAtrousPositionSigmaIndirect: 2 + m_PVRFilteringAtrousPositionSigmaAO: 1 + m_PVRTiledBaking: 0 + m_NumRaysToShootPerTexel: -1 + m_RespectSceneVisibilityWhenBakingGI: 0 +--- !u!1 &891640504 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 891640506} + - component: {fileID: 891640505} + m_Layer: 0 + m_Name: New Game Object + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!220 &891640505 +LightProbeGroup: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 891640504} + m_Enabled: 1 + m_SourcePositions: + - {x: 1, y: 1, z: 1} + - {x: 1, y: 1, z: -1} + - {x: -0.5930989, y: -1, z: 3.436201} + - {x: 1, y: -1, z: -1} + - {x: -2.738532, y: 1, z: -0.19425249} + - {x: -1, y: 1, z: -1} + - {x: -4.925142, y: -1, z: 2.9896603} + - {x: -1, y: -1, z: -1} + - {x: 4.5489216, y: 0.48635864, z: -4.4367194} + - {x: -0.5307379, y: 0.6763722, z: -7.0993633} + - {x: -4.382635, y: 0.14230812, z: -6.836036} + - {x: 9.363578, y: 0.6839063, z: -0.627285} + - {x: 0.53357506, y: -1.1065986, z: -0.53954697} + - {x: -3.9168344, y: -1.1065986, z: -0.1942687} + - {x: 7.0004053, y: -1.1065986, z: 1.2227235} + - {x: 3.1427042, y: -1.1065986, z: 2.38351} + - {x: -1.8079829, y: -1.1065986, z: 2.0856476} + - {x: -7.639022, y: -1.1065986, z: -1.7800035} + m_Dering: 1 +--- !u!4 &891640506 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 891640504} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 2.0799425, y: 1.1065986, z: 2.4813514} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1660057539 &9223372036854775807 +SceneRoots: + m_ObjectHideFlags: 0 + m_Roots: + - {fileID: 425500981} + - {fileID: 891640506} diff --git a/Assets/Bakery/_tempScene/LightingData.asset b/Assets/Bakery/_tempScene/LightingData.asset new file mode 100644 index 000000000..c236b2d98 Binary files /dev/null and b/Assets/Bakery/_tempScene/LightingData.asset differ diff --git a/Assets/Bakery/ftGlobalStorage.asset b/Assets/Bakery/ftGlobalStorage.asset index b00f9d3f7..599356ebb 100644 --- a/Assets/Bakery/ftGlobalStorage.asset +++ b/Assets/Bakery/ftGlobalStorage.asset @@ -2954,7 +2954,8 @@ MonoBehaviour: - Assets/Zombie_27/Animation/Root_Motion/Zombie_Death_Hit_Right_1.fbx - Assets/Zombie_27/Animation/Root_Motion/Zombie_Atk_End_3.fbx - Assets/Artists/Animtions/Character/Locomotion/Character_Rifle_New_Idle 1.fbx - uvOverlapAssetList: 00000000ffffffff01010000010100000101000000000000010100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000101000000000000010100000101000000000000000000000000000000000000000000000000000000000000010100000101000000000000000000000000000000000000000000000000000001010000000000000101000001010000000000000000000000000000000000000000000000000000010100000101000000000000000000000101000000000000000000000101000001010000000000000000000000000000000000000000000001010000000000000000000001010000000000000000000000000000000000000000000001010000000000000101000000000000000000000000000000000000000000000101000000000000000000000101000000000000000000000000000000000000000000000101000000000000010100000000000001010000000000000000000000000000000000000101000000000000010100000000000000000000000000000000000000000000000000000000000000000000000000000101000000000000000000000000000001010000000000000000000000000000010100000101000000000000010100000000000001010000000000000101000000000000010100000101000000000000010100000000000000000000010100000000000001010000010100000000000001010000000000000000000000000000010100000000000000000000000000000000000000000000000000000000000000000000010100000000000001010000010100000101000001010000000000000000000000000000000000000101000000000000000000000000000000000000000000000000000000000000010100000000000001010000000000000101000000000000010100000000000000000000000000000000000001010000000000000000000000000000000000000000000000000000010100000101000000000000000000000000000000000000000000000000000000000000000000000000000001010000000000000000000000000000000000000000000001010000000000000000000000000000000000000000000000000000000000000101000000000000000000000000000001010000000000000000000000000000000000000000000000000000000000000000000001010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001010000000000000101000000000000000000000000000000000000000000000000000000000000010100000000000000000000010100000000000000000000000000000000000000000000010100000000000001010000000000000000000000000000000000000000000000000000000000000000000001010000000000000101000000000000000000000000000000000000000000000000000000000000000000000000000001010000000000000000000000000000010100000000000001010000000000000000000001010000010100000000000000000000010100000000000000000000000000000000000000000000010100000101000000000000000000000000000000000000000000000101000001010000000000000000000000000000000000000000000001010000010100000101000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010100000000000000000000000000000000000001010000000000000101000000000000000000000000000000000000000000000000000001010000000000000000000000000000010100000101000001010000000000000000000000000000000000000101000001010000000000000000000000000000010100000000000000000000000000000101000000000000010100000000000000000000000000000101000001010000000000000101000001010000010100000000000001010000010100000101000000000000000000000000000001010000000000000101000000000000000000000000000000000000000000000101000000000000000000000101000000000000000000000000000001010000000000000101000000000000000000000101000001010000000000000101000000000000000000000000000000000000000000000000000000000000000000000101000000000000010100000101000000000000010100000101000000000000000000000000000001010000000000000000000000000000010100000000000000000000000000000000000000000000000000000101000000000000000000000000000000000000000000000101000000000000010100000000000001010000000000000000000001010000000000000000000000000000010100000000000000000000000000000101000000000000000000000101000000000000000000000101000000000000000000000000000000000000000000000000000001010000000000000101000000000000000000000000000000000000000000000000000000000000000000000000000000000000010100000000000001010000000000000101000000000000010100000000000001010000000000000101000000000000000000000101000000000000000000000000000001010000000000000000000001010000000000000000000000000000000000000000000000000000000000000000000000000000000000000101000001010000000000000000000000000000010100000000000000000000000000000000000000000000010100000101000000000000000000000101000000000000000000000101000000000000000000000000000000000000010100000000000000000000000000000000000000000000000000000000000001010000000000000000000000000000010100000000000000000000000000000000000000000000000000000000000001010000010100000000000000000000000000000000000000000000010100000101000000000000000000000101000000000000010100000000000000000000000000000000000000000000010100000101000001010000010100000101000000000000000000000101000000000000000000000101000001010000000000000000000000000000000000000000000000000000000000000000000000000000010100000000000000000000000000000000000001010000010100000101000000000000010100000000000000000000010100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001010000000000000101000000000000000000000101000000000000000000000000000000000000000000000000000001010000000000000000000000000000010100000000000000000000000000000101000000000000010100000000000000000000000000000000000000000000000000000101000001010000000000000101000000000000010100000000000001010000000000000000000000000000010100000000000000000000000000000101000000000000000000000101000000000000010100000000000000000000000000000101000001010000000000000000000000000000000000000000000000000000000000000000000001010000010100000000000000000000010100000000000000000000000000000000000001010000010100000000000001010000010100000101000000000000010100000101000001010000000000000000000001010000000000000000000000000000000000000000000000000000010100000000000000000000000000000000000000000000000000000101000000000000000000000101000000000000010100000000000000000000000000000101000000000000000000000000000000000000000000000101000000000000000000000000000000000000010100000101000000000000010100000000000000000000010100000000000000000000000000000101000000000000000000000000000001010000000000000000000000000000010100000101000000000000010100000000000001010000000000000000000000000000000000000101000000000000000000000101000000000000000000000000000000000000010100000000000001010000010100000000000001010000000000000000000001010000010100000101000000000000000000000000000001010000000000000000000000000000000000000101000000000000010100000000000000000000000000000000000000000000000000000000000001010000000000000000000001010000000000000000000000000000000000000101000000000000000000000101000000000000000000000000000000000000000000000000000000000000010100000101000000000000000000000101000001010000000000000000000000000000000000000000000000000000000000000000000001010000000000000000000000000000010100000101000001010000000000000000000000000000000000000000000000000000000000000101000000000000010100000000000000000000000000000101000000000000000000000101000000000000000000000000000001010000000000000101000001010000000000000000000000000000010100000101000000000000000000000101000000000000000000000000000000000000000000000101000001010000010100000000000000000000000000000101000001010000000000000000000001010000000000000000000001010000000000000000000000000000000000000000000000000000000000000000000001010000010100000000000001010000000000000101000000000000000000000000000000000000000000000000000000000000010100000000000000000000010100000000000001010000000000000000000000000000000000000000000001010000000000000000000000000000000000000000000000000000010100000000000000000000000000000000000000000000010100000000000000000000000000000000000000000000010100000000000000000000010100000000000000000000000000000000000001010000010100000000000000000000000000000101000001010000000000000000000000000000000000000000000000000000000000000000000001010000000000000101000000000000000000000000000000000000000000000000000001010000010100000000000000000000000000000000000000000000010100000101000000000000000000000000000000000000010100000000000001010000010100000000000001010000000000000000000000000000000000000000000000000000010100000000000000000000000000000000000001010000000000000000000000000000000000000101000000000000000000000101000001010000010100000000000000000000010100000000000001010000000000000101000001010000000000000000000000000000000000000101000000000000000000000101000000000000000000000000000000000000010100000000000001010000000000000000000000000000000000000101000000000000000000000000000000000000000000000000000001010000000000000000000001010000000000000000000001010000000000000101000000000000000000000000000000000000000000000000000000000000000000000101000000000000010100000000000000000000000000000000000000000000010100000000000000000000000000000000000000000000010100000000000000000000000000000000000001010000000000000000000000000000000000000000000000000000000000000101000000000000000000000000000000000000000000000000000000000000000000000000000000000000010100000000000000000000000000000000000001010000000000000000000001010000000000000000000000000000000000000101000001010000000000000101000000000000010100000101000000000000000000000000000001010000000000000000000001010000000000000101000001010000000000000101000000000000000000000000000000000000000000000101000000000000000000000000000000000000010100000000000000000000000000000000000000000000000000000101000000000000000000000000000000000000000000000000000001010000000000000000000001010000000000000000000000000000000000000000000000000000010100000000000000000000000000000000000001010000010100000000000000000000000000000101000000000000000000000000000000000000000000000000000000000000010100000000000000000000000000000000000000000000000000000000000000000000000000000101000000000000000000000101000000000000010100000000000001010000010100000101000000000000000000000000000000000000000000000000000000000000000000000101000000000000000000000101000000000000000000000000000001010000000000000000000000000000000000000101000000000000000000000000000000000000000000000101000000000000000000000000000000000000000000000101000000000000000000000101000000000000010100000101000000000000000000000101000000000000000000000000000001010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001010000000000000000000001010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010100000000000001010000010100000000000000000000010100000000000000000000000000000000000000000000010100000000000000000000000000000000000000000000000000000101000000000000000000000000000000000000000000000000000000000000000000000000000001010000000000000000000000000000000000000101000001010000000000000000000000000000000000000000000001010000000000000000000000000000010100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010100000000000000000000000000000101000001010000000000000000000000000000000000000000000000000000000000000000000000000000000000000101000001010000010100000000000000000000010100000101000000000000000000000000000000000000000000000000000000000000010100000000000000000000000000000000000000000000000000000000000000000000010100000000000000000000010100000000000001010000000000000000000001010000000000000000000000000000010100000000000000000000000000000000000000000000000000000000000000000000000000000000000001010000000000000000000000000000010100000101000000000000000000000000000001010000000000000000000000000000000000000000000000000000000000000101000000000000000000000000000000000000000000000000000000000000000000000101000000000000010100000000000000000000000000000000000000000000000000000000000000000000000000000101000000000000000000000000000001010000010100000000000000000000000000000000000000000000000000000000000000000000000000000101000000000000010100000000000000000000010100000000000000000000010100000101000000000000000000000000000000000000000000000101000001010000000000000000000000000000000000000000000001010000010100000101000000000000010100000000000000000000000000000000000000000000000000000000000000000000010100000000000000000000000000000101000001010000000000000000000000000000010100000000000001010000010100000000000000000000000000000101000000000000000000000000000000000000000000000000000000000000010100000000000000000000010100000000000000000000000000000000000001010000000000000101000000000000000000000000000001010000000000000000000001010000000000000000000000000000000000000000000000000000010100000000000000000000000000000000000000000000000000000101000000000000010100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001010000010100000000000000000000000000000000000001010000000000000101000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010100000101000001010000010100000101000000000000000000000101000000000000000000000000000000000000000000000000000000000000000000000000000001010000000000000101000000000000000000000000000000000000010100000000000000000000010100000000000000000000000000000000000000000000000000000000000001010000010100000101000000000000010100000000000001010000000000000101000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000101000001010000000000000101000000000000000000000101000001010000000000000000000000000000010100000101000000000000000000000000000001010000000000000000000001010000000000000000000000000000010100000000000000000000010100000000000000000000000000000000000000000000000000000101000000000000000000000000000000000000000000000000000001010000000000000101000000000000010100000101000000000000000000000000000001010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001010000000000000000000001010000010100000000000000000000000000000000000001010000000000000000000001010000000000000000000000000000010100000101000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010100000000000000000000000000000000000000000000000000000000000000000000010100000000000000000000000000000000000000000000010100000101000000000000000000000000000000000000000000000101000000000000010100000000000000000000000000000101000000000000000000000101000000000000010100000101000000000000010100000000000000000000000000000000000000000000000000000000000000000000000000000000000001010000010100000000000001010000000000000000000000000000000000000101000000000000000000000000000000000000000000000000000000000000000000000101000000000000000000000000000001010000000000000000000000000000000000000000000001010000000000000101000001010000010100000000000000000000000000000000000001010000010100000000000000000000000000000101000000000000000000000000000001010000000000000000000000000000000000000000000000000000000000000000000000000000000000000101000000000000010100000000000000000000000000000000000000000000010100000000000000000000000000000000000000000000000000000101000000000000000000000000000001010000000000000000000001010000000000000000000000000000000000000000000000000000000000000101000000000000000000000000000000000000000000000101000001010000010100000000000001010000000000000101000000000000000000000101000001010000000000000000000000000000010100000000000000000000000000000000000000000000000000000000000000000000000000000000000001010000000000000000000000000000010100000101000001010000000000000101000001010000000000000000000000000000010100000000000000000000010100000000000001010000000000000000000000000000000000000000000001010000000000000000000001010000000000000000000001010000010100000000000000000000000000000000000001010000010100000101000001010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001010000000000000101000001010000000000000000000000000000000000000101000001010000010100000000000001010000010100000000000000000000010100000101000000000000000000000000000000000000010100000101000001010000010100000101000000000000010100000101000001010000010100000101000001010000010100000101000000000000010100000000000000000000010100000101000001010000010100000000000000000000010100000101000001010000000000000101000001010000000000000000000001010000000000000101000000000000010100000101000000000000010100000000000000000000000000000101000001010000000000000101000000000000000000000101000000000000010100000000000000000000010100000000000001010000000000000101000000000000010100000000000000000000010100000101000000000000000000000101000001010000010100000101000000000000010100000000000001010000010100000101000001010000010100000000000001010000010100000101000001010000000000000101000000000000010100000000000001010000000000000101000000000000000000000000000001010000000000000000000001010000010100000000000000000000010100000000000001010000000000000000000001010000000000000000000000000000010100000101000001010000000000000101000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 + - Assets/Artists/Animtions/Character/Locomotion/Character_Rifle_New_Idle_Humanoid.fbx + uvOverlapAssetList: 00000000ffffffff0101000001010000010100000000000001010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010100000000000001010000010100000000000000000000000000000000000000000000000000000000000001010000010100000000000000000000000000000000000000000000000000000101000000000000010100000101000000000000000000000000000000000000000000000000000001010000010100000000000000000000010100000000000000000000010100000101000000000000000000000000000000000000000000000101000000000000000000000101000000000000000000000000000000000000000000000101000000000000010100000000000000000000000000000000000000000000010100000000000000000000010100000000000000000000000000000000000000000000010100000000000001010000000000000101000000000000000000000000000000000000010100000000000001010000000000000000000000000000000000000000000000000000000000000000000000000000010100000000000000000000000000000101000000000000000000000000000001010000010100000000000001010000000000000101000000000000010100000000000001010000010100000000000001010000000000000000000001010000000000000101000001010000000000000101000000000000000000000000000001010000000000000000000000000000000000000000000000000000000000000000000001010000000000000101000001010000010100000101000000000000000000000000000000000000010100000000000000000000000000000000000000000000000000000000000001010000000000000101000000000000010100000000000001010000000000000000000000000000000000000101000000000000000000000000000000000000000000000000000001010000010100000000000000000000000000000000000000000000000000000000000000000000000000000101000000000000000000000000000000000000000000000101000000000000000000000000000000000000000000000000000000000000010100000000000000000000000000000101000000000000000000000000000000000000000000000000000000000000000000000101000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000101000000000000010100000000000000000000000000000000000000000000000000000000000001010000000000000000000001010000000000000000000000000000000000000000000001010000000000000101000000000000000000000000000000000000000000000000000000000000000000000101000000000000010100000000000000000000000000000000000000000000000000000000000000000000000000000101000000000000000000000000000001010000000000000101000000000000000000000101000001010000000000000000000001010000000000000000000000000000000000000000000001010000010100000000000000000000000000000000000000000000010100000101000000000000000000000000000000000000000000000101000001010000010100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001010000000000000000000000000000000000000101000000000000010100000000000000000000000000000000000000000000000000000101000000000000000000000000000001010000010100000101000000000000000000000000000000000000010100000101000000000000000000000000000001010000000000000000000000000000010100000000000001010000000000000000000000000000010100000101000000000000010100000101000001010000000000000101000001010000010100000000000000000000000000000101000000000000010100000000000000000000000000000000000000000000010100000000000000000000010100000000000000000000000000000101000000000000010100000000000000000000010100000101000000000000010100000000000000000000000000000000000000000000000000000000000000000000010100000000000001010000010100000000000001010000010100000000000000000000000000000101000000000000000000000000000001010000000000000000000000000000000000000000000000000000010100000000000000000000000000000000000000000000010100000000000001010000000000000101000000000000000000000101000000000000000000000000000001010000000000000000000000000000010100000000000000000000010100000000000000000000010100000000000000000000000000000000000000000000000000000101000000000000010100000000000000000000000000000000000000000000000000000000000000000000000000000000000001010000000000000101000000000000010100000000000001010000000000000101000000000000010100000000000000000000010100000000000000000000000000000101000000000000000000000101000000000000000000000000000000000000000000000000000000000000000000000000000000000000010100000101000000000000000000000000000001010000000000000000000000000000000000000000000001010000010100000000000000000000010100000000000000000000010100000000000000000000000000000000000001010000000000000000000000000000000000000000000000000000000000000101000000000000000000000000000001010000000000000000000000000000000000000000000000000000000000000101000001010000000000000000000000000000000000000000000001010000010100000000000000000000010100000000000001010000000000000000000000000000000000000000000001010000010100000101000001010000010100000000000000000000010100000000000000000000010100000101000000000000000000000000000000000000000000000000000000000000000000000000000001010000000000000000000000000000000000000101000001010000010100000000000001010000000000000000000001010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000101000000000000010100000000000000000000010100000000000000000000000000000000000000000000000000000101000000000000000000000000000001010000000000000000000000000000010100000000000001010000000000000000000000000000000000000000000000000000010100000101000000000000010100000000000001010000000000000101000000000000000000000000000001010000000000000000000000000000010100000000000000000000010100000000000001010000000000000000000000000000010100000101000000000000000000000000000000000000000000000000000000000000000000000101000001010000000000000000000001010000000000000000000000000000000000000101000001010000000000000101000001010000010100000000000001010000010100000101000000000000000000000101000000000000000000000000000000000000000000000000000001010000000000000000000000000000000000000000000000000000010100000000000000000000010100000000000001010000000000000000000000000000010100000000000000000000000000000000000000000000010100000000000000000000000000000000000001010000010100000000000001010000000000000000000001010000000000000000000000000000010100000000000000000000000000000101000000000000000000000000000001010000010100000000000001010000000000000101000000000000000000000000000000000000010100000000000000000000010100000000000000000000000000000000000001010000000000000101000001010000000000000101000000000000000000000101000001010000010100000000000000000000000000000101000000000000000000000000000000000000010100000000000001010000000000000000000000000000000000000000000000000000000000000101000000000000000000000101000000000000000000000000000000000000010100000000000000000000010100000000000000000000000000000000000000000000000000000000000001010000010100000000000000000000010100000101000000000000000000000000000000000000000000000000000000000000000000000101000000000000000000000000000001010000010100000101000000000000000000000000000000000000000000000000000000000000010100000000000001010000000000000000000000000000010100000000000000000000010100000000000000000000000000000101000000000000010100000101000000000000000000000000000001010000010100000000000000000000010100000000000000000000000000000000000000000000010100000101000001010000000000000000000000000000010100000101000000000000000000000101000000000000000000000101000000000000000000000000000000000000000000000000000000000000000000000101000001010000000000000101000000000000010100000000000000000000000000000000000000000000000000000000000001010000000000000000000001010000000000000101000000000000000000000000000000000000000000000101000000000000000000000000000000000000000000000000000001010000000000000000000000000000000000000000000001010000000000000000000000000000000000000000000001010000000000000000000001010000000000000000000000000000000000000101000001010000000000000000000000000000010100000101000000000000000000000000000000000000000000000000000000000000000000000101000000000000010100000000000000000000000000000000000000000000000000000101000001010000000000000000000000000000000000000000000001010000010100000000000000000000000000000000000001010000000000000101000001010000000000000101000000000000000000000000000000000000000000000000000001010000000000000000000000000000000000000101000000000000000000000000000000000000010100000000000000000000010100000101000001010000000000000000000001010000000000000101000000000000010100000101000000000000000000000000000000000000010100000000000000000000010100000000000000000000000000000000000001010000000000000101000000000000000000000000000000000000010100000000000000000000000000000000000000000000000000000101000000000000000000000101000000000000000000000101000000000000010100000000000000000000000000000000000000000000000000000000000000000000010100000000000001010000000000000000000000000000000000000000000001010000000000000000000000000000000000000000000001010000000000000000000000000000000000000101000000000000000000000000000000000000000000000000000000000000010100000000000000000000000000000000000000000000000000000000000000000000000000000000000001010000000000000000000000000000000000000101000000000000000000000101000000000000000000000000000000000000010100000101000000000000010100000000000001010000010100000000000000000000000000000101000000000000000000000101000000000000010100000101000000000000010100000000000000000000000000000000000000000000010100000000000000000000000000000000000001010000000000000000000000000000000000000000000000000000010100000000000000000000000000000000000000000000000000000101000000000000000000000101000000000000000000000000000000000000000000000000000001010000000000000000000000000000000000000101000001010000000000000000000000000000010100000000000000000000000000000000000000000000000000000000000001010000000000000000000000000000000000000000000000000000000000000000000000000000010100000000000000000000010100000000000001010000000000000101000001010000010100000000000000000000000000000000000000000000000000000000000000000000010100000000000000000000010100000000000000000000000000000101000000000000000000000000000000000000010100000000000000000000000000000000000000000000010100000000000000000000000000000000000000000000010100000000000000000000010100000000000001010000010100000000000000000000010100000000000000000000000000000101000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000101000000000000000000000101000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001010000000000000101000001010000000000000000000001010000000000000000000000000000000000000000000001010000000000000000000000000000000000000000000000000000010100000000000000000000000000000000000000000000000000000000000000000000000000000101000000000000000000000000000000000000010100000101000000000000000000000000000000000000000000000101000000000000000000000000000001010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001010000000000000000000000000000010100000101000000000000000000000000000000000000000000000000000000000000000000000000000000000000010100000101000001010000000000000000000001010000010100000000000000000000000000000000000000000000000000000000000001010000000000000000000000000000000000000000000000000000000000000000000001010000000000000000000001010000000000000101000000000000000000000101000000000000000000000000000001010000000000000000000000000000000000000000000000000000000000000000000000000000000000000101000000000000000000000000000001010000010100000000000000000000000000000101000000000000000000000000000000000000000000000000000000000000010100000000000000000000000000000000000000000000000000000000000000000000010100000000000001010000000000000000000000000000000000000000000000000000000000000000000000000000010100000000000000000000000000000101000001010000000000000000000000000000000000000000000000000000000000000000000000000000010100000000000001010000000000000000000001010000000000000000000001010000010100000000000000000000000000000000000000000000010100000101000000000000000000000000000000000000000000000101000001010000010100000000000001010000000000000000000000000000000000000000000000000000000000000000000001010000000000000000000000000000010100000101000000000000000000000000000001010000000000000101000001010000000000000000000000000000010100000000000000000000000000000000000000000000000000000000000001010000000000000000000001010000000000000000000000000000000000000101000000000000010100000000000000000000000000000101000000000000000000000101000000000000000000000000000000000000000000000000000001010000000000000000000000000000000000000000000000000000010100000000000001010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000101000001010000000000000000000000000000000000000101000000000000010100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001010000010100000101000001010000010100000000000000000000010100000000000000000000000000000000000000000000000000000000000000000000000000000101000000000000010100000000000000000000000000000000000001010000000000000000000001010000000000000000000000000000000000000000000000000000000000000101000001010000010100000000000001010000000000000101000000000000010100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010100000101000000000000010100000000000000000000010100000101000000000000000000000000000001010000010100000000000000000000000000000101000000000000000000000101000000000000000000000000000001010000000000000000000001010000000000000000000000000000000000000000000000000000010100000000000000000000000000000000000000000000000000000101000000000000010100000000000001010000010100000000000000000000000000000101000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000101000000000000000000000101000001010000000000000000000000000000000000000101000000000000000000000101000000000000000000000000000001010000010100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001010000000000000000000000000000000000000000000000000000000000000000000001010000000000000000000000000000000000000000000001010000010100000000000000000000000000000000000000000000010100000000000001010000000000000000000000000000010100000000000000000000010100000000000001010000010100000000000001010000000000000000000000000000000000000000000000000000000000000000000000000000000000000101000001010000000000000101000000000000000000000000000000000000010100000000000000000000000000000000000000000000000000000000000000000000010100000000000000000000000000000101000000000000000000000000000000000000000000000101000000000000010100000101000001010000000000000000000000000000000000000101000001010000000000000000000000000000010100000000000000000000000000000101000000000000000000000000000000000000000000000000000000000000000000000000000000000000010100000000000001010000000000000000000000000000000000000000000001010000000000000000000000000000000000000000000000000000010100000000000000000000000000000101000000000000000000000101000000000000000000000000000000000000000000000000000000000000010100000000000000000000000000000000000000000000010100000101000001010000000000000101000000000000010100000000000000000000010100000101000000000000000000000000000001010000000000000000000000000000000000000000000000000000000000000000000000000000000000000101000000000000000000000000000001010000010100000101000000000000010100000101000000000000000000000000000001010000000000000000000001010000000000000101000000000000000000000000000000000000000000000101000000000000000000000101000000000000000000000101000001010000000000000000000000000000000000000101000001010000010100000101000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000101000000000000010100000101000000000000000000000000000000000000010100000101000001010000000000000101000001010000000000000000000001010000010100000000000000000000000000000000000001010000010100000101000001010000010100000000000001010000010100000101000001010000010100000101000001010000010100000000000001010000000000000000000001010000010100000101000001010000000000000000000001010000010100000101000000000000010100000101000000000000000000000101000000000000010100000000000001010000010100000000000001010000000000000000000000000000010100000101000000000000010100000000000000000000010100000000000001010000000000000000000001010000000000000101000000000000010100000000000001010000000000000000000001010000010100000000000000000000010100000101000001010000010100000000000001010000000000000101000001010000010100000101000001010000000000000101000001010000010100000101000000000000010100000000000001010000000000000101000000000000010100000000000000000000000000000101000000000000000000000101000001010000000000000000000001010000000000000101000000000000000000000101000000000000000000000000000001010000010100000101000000000000010100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 xatlasWarningShown: 0 foundCompatibleSetup: 1 gpuName: NVIDIA GeForce RTX 3070 Laptop GPU diff --git a/Assets/BakeryLightmaps/NewSix_371857150_probes.asset b/Assets/BakeryLightmaps/NewSix_371857150_probes.asset new file mode 100644 index 000000000..8057750eb Binary files /dev/null and b/Assets/BakeryLightmaps/NewSix_371857150_probes.asset differ diff --git a/Assets/BakeryLightmaps/NewSix_LM0_final.hdr b/Assets/BakeryLightmaps/NewSix_LM0_final.hdr index 5b1e92128..5c2a8a8ba 100644 Binary files a/Assets/BakeryLightmaps/NewSix_LM0_final.hdr and b/Assets/BakeryLightmaps/NewSix_LM0_final.hdr differ diff --git a/Assets/BakeryLightmaps/NewSix_LMA1_final.hdr b/Assets/BakeryLightmaps/NewSix_LMA1_final.hdr index 32b488c26..fc4450d33 100644 Binary files a/Assets/BakeryLightmaps/NewSix_LMA1_final.hdr and b/Assets/BakeryLightmaps/NewSix_LMA1_final.hdr differ diff --git a/Assets/BakeryLightmaps/NewSix_LMA2_final.hdr b/Assets/BakeryLightmaps/NewSix_LMA2_final.hdr index 567c66b63..d0c0fe9c3 100644 Binary files a/Assets/BakeryLightmaps/NewSix_LMA2_final.hdr and b/Assets/BakeryLightmaps/NewSix_LMA2_final.hdr differ diff --git a/Assets/BakeryLightmaps/NewSix_LMA3_final.hdr b/Assets/BakeryLightmaps/NewSix_LMA3_final.hdr index 0a179b823..1c6fe79b7 100644 Binary files a/Assets/BakeryLightmaps/NewSix_LMA3_final.hdr and b/Assets/BakeryLightmaps/NewSix_LMA3_final.hdr differ diff --git a/Assets/Plugins/PluginMaster/DesignTools/Editor/PrefabWorldBuilder/Resources/Data/PWBData.txt b/Assets/Plugins/PluginMaster/DesignTools/Editor/PrefabWorldBuilder/Resources/Data/PWBData.txt index 02e71ecd9..43ca19684 100644 --- a/Assets/Plugins/PluginMaster/DesignTools/Editor/PrefabWorldBuilder/Resources/Data/PWBData.txt +++ b/Assets/Plugins/PluginMaster/DesignTools/Editor/PrefabWorldBuilder/Resources/Data/PWBData.txt @@ -16,7 +16,7 @@ "_showBrushName": false, "_viewList": false, "_showTabsInMultipleRows": false, - "_iconSize": 64 + "_iconSize": 73 }, "pinManager": { "_profileKeys": [ diff --git a/Screenshots/NewSix_Custom..._27.12.2023_00-35-33.png b/Screenshots/NewSix_Custom..._27.12.2023_00-35-33.png new file mode 100644 index 000000000..c9ec5cf61 Binary files /dev/null and b/Screenshots/NewSix_Custom..._27.12.2023_00-35-33.png differ