diff --git a/Assets/Animations/Crow.meta b/Assets/Animations/Crow.meta new file mode 100644 index 0000000..28f39b2 --- /dev/null +++ b/Assets/Animations/Crow.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 35187311bb59fa043a0db5e91cd2ba26 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animations/Crow/Crow.controller b/Assets/Animations/Crow/Crow.controller new file mode 100644 index 0000000..8b09eed --- /dev/null +++ b/Assets/Animations/Crow/Crow.controller @@ -0,0 +1,156 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1101 &-4126144341959590489 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: [] + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 698993273349478160} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.6875 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1107 &-3341553991187090043 +AnimatorStateMachine: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Base Layer + m_ChildStates: + - serializedVersion: 1 + m_State: {fileID: 698993273349478160} + m_Position: {x: 360, y: 120, z: 0} + - serializedVersion: 1 + m_State: {fileID: 422183774714630404} + m_Position: {x: 370, y: 260, z: 0} + m_ChildStateMachines: [] + m_AnyStateTransitions: [] + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: 50, y: 20, z: 0} + m_EntryPosition: {x: 50, y: 120, z: 0} + m_ExitPosition: {x: 800, y: 120, z: 0} + m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} + m_DefaultState: {fileID: 698993273349478160} +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Crow + serializedVersion: 5 + m_AnimatorParameters: + - m_Name: Dive + m_Type: 9 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 0} + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: -3341553991187090043} + m_Mask: {fileID: 0} + m_Motions: [] + m_Behaviours: [] + m_BlendingMode: 0 + m_SyncedLayerIndex: -1 + m_DefaultWeight: 0 + m_IKPass: 0 + m_SyncedLayerAffectsTiming: 0 + m_Controller: {fileID: 9100000} +--- !u!1102 &422183774714630404 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Dive + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: -4126144341959590489} + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: -4997883480733216339, guid: f33e0b3b8cad1984b9d447b6aa8e16b9, type: 3} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1102 &698993273349478160 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Idle + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: 818938347786427326} + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 3374748389425109202, guid: c4e28a80f501f4b4ab7145e99e926d37, type: 3} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1101 &818938347786427326 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: Dive + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 422183774714630404} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.5 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 diff --git a/Assets/Animations/Crow/Crow.controller.meta b/Assets/Animations/Crow/Crow.controller.meta new file mode 100644 index 0000000..ebefa1b --- /dev/null +++ b/Assets/Animations/Crow/Crow.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 8a5897c543cb83f48986b912626ef9dc +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GameData/Action/Abilities/DashNCrash.asset b/Assets/GameData/Action/Abilities/DashNCrash.asset index 7b71cc3..cf40a63 100644 --- a/Assets/GameData/Action/Abilities/DashNCrash.asset +++ b/Assets/GameData/Action/Abilities/DashNCrash.asset @@ -18,7 +18,7 @@ MonoBehaviour: abilityMagnitude: 0.3 abilityDuration: 3 abilityCooldownTime: 3 - abilityApplicationRadius: 3 + abilityApplicationRadius: 15 prefab: {fileID: 5818330108676053786, guid: 4979352732bf84b44a9c789bef80b18a, type: 3} dashSpeed: 15 dashDuration: 0.5 diff --git a/Assets/GameData/Action/Abilities/FreezeThrow.asset b/Assets/GameData/Action/Abilities/FreezeThrow.asset index 2eebace..92838f6 100644 --- a/Assets/GameData/Action/Abilities/FreezeThrow.asset +++ b/Assets/GameData/Action/Abilities/FreezeThrow.asset @@ -18,6 +18,6 @@ MonoBehaviour: abilityMagnitude: 3 abilityDuration: 3 abilityCooldownTime: 3 - abilityApplicationRadius: 3 + abilityApplicationRadius: 15 prefab: {fileID: 6216300034370971352, guid: f9c332b27cf965044b8d1499bfcd9059, type: 3} projectileSpeed: 10 diff --git a/Assets/GameData/Action/Abilities/Vector Fence.asset b/Assets/GameData/Action/Abilities/Vector Fence.asset index 9bafa6b..57bb620 100644 --- a/Assets/GameData/Action/Abilities/Vector Fence.asset +++ b/Assets/GameData/Action/Abilities/Vector Fence.asset @@ -18,7 +18,7 @@ MonoBehaviour: abilityMagnitude: 0 abilityDuration: 5 abilityCooldownTime: 3 - abilityApplicationRadius: 3 + abilityApplicationRadius: 15 prefab: {fileID: 9694722736535169, guid: 9b94ed8895919e84aa669628b0761eaf, type: 3} wallLength: 8 wallWidth: 0.01 diff --git a/Assets/Models/Crow/Bird_Idle.fbx.meta b/Assets/Models/Crow/Bird_Idle.fbx.meta index 22ad594..e931a8e 100644 --- a/Assets/Models/Crow/Bird_Idle.fbx.meta +++ b/Assets/Models/Crow/Bird_Idle.fbx.meta @@ -31,11 +31,40 @@ ModelImporter: animationWrapMode: 0 extraExposedTransformPaths: [] extraUserProperties: [] - clipAnimations: [] + clipAnimations: + - serializedVersion: 16 + name: rig|rigAction + takeName: rig|rigAction + internalID: 3374748389425109202 + firstFrame: 0 + lastFrame: 15 + wrapMode: 0 + orientationOffsetY: 0 + level: 0 + cycleOffset: 0 + loop: 0 + hasAdditiveReferencePose: 0 + loopTime: 1 + loopBlend: 0 + loopBlendOrientation: 0 + loopBlendPositionY: 0 + loopBlendPositionXZ: 0 + keepOriginalOrientation: 0 + keepOriginalPositionY: 1 + keepOriginalPositionXZ: 0 + heightFromFeet: 0 + mirror: 0 + bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000 + curves: [] + events: [] + transformMask: [] + maskType: 3 + maskSource: {instanceID: 0} + additiveReferencePoseFrame: 0 isReadable: 0 meshes: lODScreenPercentages: [] - globalScale: 1 + globalScale: 0.13 meshCompression: 0 addColliders: 0 useSRGBMaterialColor: 1 @@ -90,7 +119,7 @@ ModelImporter: armStretch: 0.05 legStretch: 0.05 feetSpacing: 0 - globalScale: 1 + globalScale: 0.13 rootMotionBoneName: hasTranslationDoF: 0 hasExtraRoot: 0 diff --git a/Assets/Models/Crow/Dive.fbx.meta b/Assets/Models/Crow/Dive.fbx.meta index df85039..c63e296 100644 --- a/Assets/Models/Crow/Dive.fbx.meta +++ b/Assets/Models/Crow/Dive.fbx.meta @@ -35,7 +35,7 @@ ModelImporter: isReadable: 0 meshes: lODScreenPercentages: [] - globalScale: 1 + globalScale: 0.13 meshCompression: 0 addColliders: 0 useSRGBMaterialColor: 1 @@ -90,7 +90,7 @@ ModelImporter: armStretch: 0.05 legStretch: 0.05 feetSpacing: 0 - globalScale: 1 + globalScale: 0.0012999999 rootMotionBoneName: hasTranslationDoF: 0 hasExtraRoot: 0 diff --git a/Assets/Prefabs/Character/Crow.prefab b/Assets/Prefabs/Character/Crow.prefab new file mode 100644 index 0000000..b9ba4c5 --- /dev/null +++ b/Assets/Prefabs/Character/Crow.prefab @@ -0,0 +1,240 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &5935320730402577130 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1914257455311964169} + m_Layer: 0 + m_Name: Crow + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1914257455311964169 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5935320730402577130} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0.5, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 8283444244820185786} + - {fileID: 1652797526898234972} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &1822549030716984768 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1914257455311964169} + m_Modifications: + - target: {fileID: 1127329511162150513, guid: 88216f2256ea0b2448679a6dc469acb1, type: 3} + propertyPath: playOnAwake + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1127329511545934241, guid: 88216f2256ea0b2448679a6dc469acb1, type: 3} + propertyPath: playOnAwake + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1127329511631128072, guid: 88216f2256ea0b2448679a6dc469acb1, type: 3} + propertyPath: playOnAwake + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1127329511983100182, guid: 88216f2256ea0b2448679a6dc469acb1, type: 3} + propertyPath: playOnAwake + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1127329512095983412, guid: 88216f2256ea0b2448679a6dc469acb1, type: 3} + propertyPath: playOnAwake + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1127329512105670394, guid: 88216f2256ea0b2448679a6dc469acb1, type: 3} + propertyPath: playOnAwake + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1127329512174361500, guid: 88216f2256ea0b2448679a6dc469acb1, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1127329512174361500, guid: 88216f2256ea0b2448679a6dc469acb1, type: 3} + propertyPath: m_LocalPosition.y + value: 0.917 + objectReference: {fileID: 0} + - target: {fileID: 1127329512174361500, guid: 88216f2256ea0b2448679a6dc469acb1, type: 3} + propertyPath: m_LocalPosition.z + value: 0.467 + objectReference: {fileID: 0} + - target: {fileID: 1127329512174361500, guid: 88216f2256ea0b2448679a6dc469acb1, type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 1127329512174361500, guid: 88216f2256ea0b2448679a6dc469acb1, type: 3} + propertyPath: m_LocalRotation.x + value: -0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 1127329512174361500, guid: 88216f2256ea0b2448679a6dc469acb1, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1127329512174361500, guid: 88216f2256ea0b2448679a6dc469acb1, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1127329512174361500, guid: 88216f2256ea0b2448679a6dc469acb1, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: -90 + objectReference: {fileID: 0} + - target: {fileID: 1127329512174361500, guid: 88216f2256ea0b2448679a6dc469acb1, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1127329512174361500, guid: 88216f2256ea0b2448679a6dc469acb1, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1127329512174361569, guid: 88216f2256ea0b2448679a6dc469acb1, type: 3} + propertyPath: m_Name + value: FX_Caster_attack1_hit + objectReference: {fileID: 0} + - target: {fileID: 1127329512174361571, guid: 88216f2256ea0b2448679a6dc469acb1, type: 3} + propertyPath: playOnAwake + value: 1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 88216f2256ea0b2448679a6dc469acb1, type: 3} +--- !u!4 &1652797526898234972 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1127329512174361500, guid: 88216f2256ea0b2448679a6dc469acb1, type: 3} + m_PrefabInstance: {fileID: 1822549030716984768} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &8466219580799300945 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1914257455311964169} + m_Modifications: + - target: {fileID: -8679921383154817045, guid: c4e28a80f501f4b4ab7145e99e926d37, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: c4e28a80f501f4b4ab7145e99e926d37, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: c4e28a80f501f4b4ab7145e99e926d37, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: c4e28a80f501f4b4ab7145e99e926d37, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: c4e28a80f501f4b4ab7145e99e926d37, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: c4e28a80f501f4b4ab7145e99e926d37, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: c4e28a80f501f4b4ab7145e99e926d37, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: c4e28a80f501f4b4ab7145e99e926d37, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: c4e28a80f501f4b4ab7145e99e926d37, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: c4e28a80f501f4b4ab7145e99e926d37, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: c4e28a80f501f4b4ab7145e99e926d37, type: 3} + propertyPath: m_Name + value: Bird_Idle + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: c4e28a80f501f4b4ab7145e99e926d37, type: 3} + insertIndex: -1 + addedObject: {fileID: 5357157497809083932} + - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: c4e28a80f501f4b4ab7145e99e926d37, type: 3} + insertIndex: -1 + addedObject: {fileID: 4540772495729758339} + m_SourcePrefab: {fileID: 100100000, guid: c4e28a80f501f4b4ab7145e99e926d37, type: 3} +--- !u!4 &8283444244820185786 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: c4e28a80f501f4b4ab7145e99e926d37, type: 3} + m_PrefabInstance: {fileID: 8466219580799300945} + m_PrefabAsset: {fileID: 0} +--- !u!1 &8772840600433231872 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: c4e28a80f501f4b4ab7145e99e926d37, type: 3} + m_PrefabInstance: {fileID: 8466219580799300945} + m_PrefabAsset: {fileID: 0} +--- !u!95 &5357157497809083932 +Animator: + serializedVersion: 5 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8772840600433231872} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 8a5897c543cb83f48986b912626ef9dc, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 +--- !u!114 &4540772495729758339 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8772840600433231872} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e8d0727d5ae3244e3b569694d3912374, type: 3} + m_Name: + m_EditorClassIdentifier: + TransitionStateInfoList: + - IsCrossFadeExit: 0 + Layer: 0 + OriginatingState: 2081823275 + DestinationState: 914991998 + TransitionDuration: 0.25 + TriggerNameHash: 914991998 + TransitionIndex: 0 + m_Animator: {fileID: 5357157497809083932} diff --git a/Assets/Prefabs/Character/Crow.prefab.meta b/Assets/Prefabs/Character/Crow.prefab.meta new file mode 100644 index 0000000..5115319 --- /dev/null +++ b/Assets/Prefabs/Character/Crow.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: d3e4ffd5da62ee94e9eccf3ab52ec129 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Character/PlayerAvatar.prefab b/Assets/Prefabs/Character/PlayerAvatar.prefab index f72b5fb..8da911a 100644 --- a/Assets/Prefabs/Character/PlayerAvatar.prefab +++ b/Assets/Prefabs/Character/PlayerAvatar.prefab @@ -297,6 +297,109 @@ Transform: m_CorrespondingSourceObject: {fileID: 3764456690617734740, guid: 63d404b949e644e4a92db7444ae88671, type: 3} m_PrefabInstance: {fileID: 3984775118419009769} m_PrefabAsset: {fileID: 0} +--- !u!1001 &4134200829793049931 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 6009713983291384766} + m_Modifications: + - target: {fileID: 1652797526828464954, guid: d3e4ffd5da62ee94e9eccf3ab52ec129, type: 3} + propertyPath: looping + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1652797526838209268, guid: d3e4ffd5da62ee94e9eccf3ab52ec129, type: 3} + propertyPath: looping + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1652797526898234915, guid: d3e4ffd5da62ee94e9eccf3ab52ec129, type: 3} + propertyPath: looping + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1652797526898234915, guid: d3e4ffd5da62ee94e9eccf3ab52ec129, type: 3} + propertyPath: InitialModule.startSize.scalar + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 1652797526898234972, guid: d3e4ffd5da62ee94e9eccf3ab52ec129, type: 3} + propertyPath: m_ConstrainProportionsScale + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1652797527379729505, guid: d3e4ffd5da62ee94e9eccf3ab52ec129, type: 3} + propertyPath: looping + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1652797527428746184, guid: d3e4ffd5da62ee94e9eccf3ab52ec129, type: 3} + propertyPath: looping + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1652797528304530353, guid: d3e4ffd5da62ee94e9eccf3ab52ec129, type: 3} + propertyPath: looping + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1914257455311964169, guid: d3e4ffd5da62ee94e9eccf3ab52ec129, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1914257455311964169, guid: d3e4ffd5da62ee94e9eccf3ab52ec129, type: 3} + propertyPath: m_LocalPosition.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 1914257455311964169, guid: d3e4ffd5da62ee94e9eccf3ab52ec129, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1914257455311964169, guid: d3e4ffd5da62ee94e9eccf3ab52ec129, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1914257455311964169, guid: d3e4ffd5da62ee94e9eccf3ab52ec129, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1914257455311964169, guid: d3e4ffd5da62ee94e9eccf3ab52ec129, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1914257455311964169, guid: d3e4ffd5da62ee94e9eccf3ab52ec129, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1914257455311964169, guid: d3e4ffd5da62ee94e9eccf3ab52ec129, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1914257455311964169, guid: d3e4ffd5da62ee94e9eccf3ab52ec129, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1914257455311964169, guid: d3e4ffd5da62ee94e9eccf3ab52ec129, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5935320730402577130, guid: d3e4ffd5da62ee94e9eccf3ab52ec129, type: 3} + propertyPath: m_Name + value: Crow + objectReference: {fileID: 0} + - target: {fileID: 5935320730402577130, guid: d3e4ffd5da62ee94e9eccf3ab52ec129, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: d3e4ffd5da62ee94e9eccf3ab52ec129, type: 3} +--- !u!4 &2580402896402371906 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1914257455311964169, guid: d3e4ffd5da62ee94e9eccf3ab52ec129, type: 3} + m_PrefabInstance: {fileID: 4134200829793049931} + m_PrefabAsset: {fileID: 0} +--- !u!1 &7710689235683559329 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 5935320730402577130, guid: d3e4ffd5da62ee94e9eccf3ab52ec129, type: 3} + m_PrefabInstance: {fileID: 4134200829793049931} + m_PrefabAsset: {fileID: 0} --- !u!1001 &7831782662127126385 PrefabInstance: m_ObjectHideFlags: 0 @@ -347,7 +450,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4600110157238723790, guid: 0d2d836e2e83b754fa1a1c4022d6d65d, type: 3} propertyPath: GlobalObjectIdHash - value: 3737985212 + value: 3177087589 objectReference: {fileID: 0} - target: {fileID: 4600110157238723790, guid: 0d2d836e2e83b754fa1a1c4022d6d65d, type: 3} propertyPath: PrefabHashGenerator @@ -401,6 +504,10 @@ PrefabInstance: propertyPath: animator value: objectReference: {fileID: 1829276847453002016} + - target: {fileID: 7420593339233078707, guid: 0d2d836e2e83b754fa1a1c4022d6d65d, type: 3} + propertyPath: crowModel + value: + objectReference: {fileID: 7710689235683559329} - target: {fileID: 7420593339233078707, guid: 0d2d836e2e83b754fa1a1c4022d6d65d, type: 3} propertyPath: m_ClientCharacter value: @@ -429,6 +536,9 @@ PrefabInstance: - targetCorrespondingSourceObject: {fileID: 4600110157238723791, guid: 0d2d836e2e83b754fa1a1c4022d6d65d, type: 3} insertIndex: -1 addedObject: {fileID: 7902288483105483375} + - targetCorrespondingSourceObject: {fileID: 4600110157238723791, guid: 0d2d836e2e83b754fa1a1c4022d6d65d, type: 3} + insertIndex: -1 + addedObject: {fileID: 2580402896402371906} - targetCorrespondingSourceObject: {fileID: 4600110157238723791, guid: 0d2d836e2e83b754fa1a1c4022d6d65d, type: 3} insertIndex: -1 addedObject: {fileID: 248483794971195069} @@ -856,6 +966,7 @@ MonoBehaviour: TransitionIndex: 1 m_Animator: {fileID: 1829276847453002016} m_NetworkAvatarGuidState: {fileID: 6438351454149486027} + m_ServerCharacter: {fileID: 741733315856861890} --- !u!114 &7232939173259361562 MonoBehaviour: m_ObjectHideFlags: 0 @@ -967,7 +1078,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: maxStamina: 100 - sprintStaminaCostPerSecond: 50 staminaRegenRate: 10 staminaRegenDelay: 1 --- !u!4 &6009713983291384766 stripped diff --git a/Assets/Scenes/BossRoom.unity b/Assets/Scenes/BossRoom.unity index 180b897..f8c88f8 100644 --- a/Assets/Scenes/BossRoom.unity +++ b/Assets/Scenes/BossRoom.unity @@ -9529,11 +9529,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1676734515771252668, guid: 0193228de87741d40a42e561901c9083, type: 3} propertyPath: m_LocalRotation.y - value: 0.28987613 + value: 0.28987604 objectReference: {fileID: 0} - target: {fileID: 1676734515771252668, guid: 0193228de87741d40a42e561901c9083, type: 3} propertyPath: m_LocalRotation.z - value: -0.1815204 + value: -0.1815203 objectReference: {fileID: 0} - target: {fileID: 1676734516302391364, guid: 0193228de87741d40a42e561901c9083, type: 3} propertyPath: m_UpdateMethod diff --git a/Assets/Scripts/Gameplay/CrowManager.cs b/Assets/Scripts/Gameplay/CrowManager.cs index 961499c..591f850 100644 --- a/Assets/Scripts/Gameplay/CrowManager.cs +++ b/Assets/Scripts/Gameplay/CrowManager.cs @@ -128,12 +128,14 @@ public class CrowManager : NetworkBehaviour if (player.OwnerClientId == crowClientId) { player.SetAsCrow(true); + player.SwitchToCrowModel(); currentCrow = player; Debug.Log($"Client: {player.name} is the new Crow."); } else { player.SetAsCrow(false); + player.SwitchToPlayerModel(); } } } diff --git a/Assets/Scripts/Gameplay/DashNCrashAbility.cs b/Assets/Scripts/Gameplay/DashNCrashAbility.cs index b1f96ab..1df067e 100644 --- a/Assets/Scripts/Gameplay/DashNCrashAbility.cs +++ b/Assets/Scripts/Gameplay/DashNCrashAbility.cs @@ -2,6 +2,7 @@ using System.Collections; using Unity.BossRoom.Gameplay.GameplayObjects.Character; using UnityEngine; using Unity.Netcode; +using Unity.Netcode.Components; [CreateAssetMenu(menuName = "Abilities/DashNCrash")] public class DashNCrashAbility : Ability @@ -17,7 +18,24 @@ public class DashNCrashAbility : Ability // Start the dash character.Movement.StartDash(targetPosition, dashSpeed, dashDuration); - + // Ensure the crowModel exists and has a NetworkAnimator + if (character.crowModel != null) + { + NetworkAnimator networkAnimator = character.crowModel.GetComponentInChildren(); + if (networkAnimator != null) + { + Debug.Log("Triggering Dive animation for crow model."); + networkAnimator.SetTrigger("Dive"); + } + else + { + Debug.LogError("NetworkAnimator component missing on crow model!"); + } + } + else + { + Debug.LogError("Crow model is not assigned!"); + } // Delay spawning the slow zone until after the dash character.StartCoroutine(SpawnSlowZoneAfterDash(character, targetPosition)); } diff --git a/Assets/Scripts/Gameplay/GameplayObjects/Character/ClientPlayerAvatarNetworkAnimator.cs b/Assets/Scripts/Gameplay/GameplayObjects/Character/ClientPlayerAvatarNetworkAnimator.cs index d895ce3..e84bd4b 100644 --- a/Assets/Scripts/Gameplay/GameplayObjects/Character/ClientPlayerAvatarNetworkAnimator.cs +++ b/Assets/Scripts/Gameplay/GameplayObjects/Character/ClientPlayerAvatarNetworkAnimator.cs @@ -16,6 +16,7 @@ namespace Unity.BossRoom.Gameplay.GameplayObjects.Character [SerializeField] NetworkAvatarGuidState m_NetworkAvatarGuidState; + [SerializeField] private ServerCharacter m_ServerCharacter; bool m_AvatarInstantiated; public override void OnNetworkSpawn() @@ -70,8 +71,8 @@ namespace Unity.BossRoom.Gameplay.GameplayObjects.Character } // spawn avatar graphics GameObject - Instantiate(m_NetworkAvatarGuidState.RegisteredAvatar.Graphics, Animator.transform); - + GameObject graphics = Instantiate(m_NetworkAvatarGuidState.RegisteredAvatar.Graphics, Animator.transform); + m_ServerCharacter.playerModel = graphics; Animator.Rebind(); m_AvatarInstantiated = true; diff --git a/Assets/Scripts/Gameplay/GameplayObjects/Character/ServerCharacter.cs b/Assets/Scripts/Gameplay/GameplayObjects/Character/ServerCharacter.cs index 28dccd6..8a11797 100644 --- a/Assets/Scripts/Gameplay/GameplayObjects/Character/ServerCharacter.cs +++ b/Assets/Scripts/Gameplay/GameplayObjects/Character/ServerCharacter.cs @@ -153,7 +153,8 @@ namespace Unity.BossRoom.Gameplay.GameplayObjects.Character public UIStateDisplayHandler uIStateDisplayHandler; - + public GameObject playerModel; // Original player model + public GameObject crowModel; void Awake() { m_ServerActionPlayer = new ServerActionPlayer(this); @@ -197,7 +198,7 @@ namespace Unity.BossRoom.Gameplay.GameplayObjects.Character } } - + public void SetAsCrow(bool status) { if (IsServer) @@ -211,6 +212,19 @@ namespace Unity.BossRoom.Gameplay.GameplayObjects.Character } } + + public void SwitchToCrowModel() + { + playerModel.SetActive(false); + crowModel.SetActive(true); + } + + public void SwitchToPlayerModel() + { + playerModel.SetActive(true); + crowModel.SetActive(false); + } + [ClientRpc] private void UpdateCrowStatusClientRpc(bool status) {