diff --git a/FlufflParty/.idea/.idea.FlufflParty/.idea/workspace.xml b/FlufflParty/.idea/.idea.FlufflParty/.idea/workspace.xml index 974829c..80d9f74 100644 --- a/FlufflParty/.idea/.idea.FlufflParty/.idea/workspace.xml +++ b/FlufflParty/.idea/.idea.FlufflParty/.idea/workspace.xml @@ -145,7 +145,7 @@ - + diff --git a/FlufflParty/Assets/Animations/Chicken.controller b/FlufflParty/Assets/Animations/Chicken.controller new file mode 100644 index 0000000..790a674 --- /dev/null +++ b/FlufflParty/Assets/Animations/Chicken.controller @@ -0,0 +1,682 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1101 &-8666460018071674365 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 6 + m_ConditionEvent: value + m_EventTreshold: 1 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 6811921787494585261} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.78571427 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1102 &-8062680078393266239 +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: 2009259118338622224} + - {fileID: -6211319990529613758} + - {fileID: 6471934142534801623} + - {fileID: 675081572360035249} + - {fileID: 2775358733453534417} + 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: -8206857311389296499, guid: d48ca8c9cc936814a807ce19a68c97ae, type: 3} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1102 &-7552555183249389472 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Jump + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: -4732224705561109180} + - {fileID: 1742514890017005427} + 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: -626948583029366203, guid: d48ca8c9cc936814a807ce19a68c97ae, type: 3} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1102 &-6385607418254347299 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Flatter + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: 303328823029619191} + - {fileID: 2683460769776148252} + - {fileID: 3987748843758294227} + 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: 1963079803359675471, guid: d48ca8c9cc936814a807ce19a68c97ae, type: 3} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1101 &-6211319990529613758 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 6 + m_ConditionEvent: value + m_EventTreshold: 2 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -7552555183249389472} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &-6128629841776264020 +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: -8062680078393266239} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.78571427 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &-4732224705561109180 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 6 + m_ConditionEvent: value + m_EventTreshold: 1 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 6811921787494585261} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.71428573 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1102 &-4284731727828343707 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: FootTap + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: 3748694197871359267} + - {fileID: -2363628186834647742} + - {fileID: 2845126558459583911} + 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: -1609281748187839663, guid: d48ca8c9cc936814a807ce19a68c97ae, type: 3} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1101 &-2363628186834647742 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 6 + m_ConditionEvent: value + m_EventTreshold: 1 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 6811921787494585261} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.6666666 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1102 &-455586630231115066 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Wabble + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: 8422467497138784195} + - {fileID: -8666460018071674365} + - {fileID: -6128629841776264020} + 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: 723096430288179899, guid: d48ca8c9cc936814a807ce19a68c97ae, type: 3} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Chicken + serializedVersion: 5 + m_AnimatorParameters: + - m_Name: value + m_Type: 3 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 9100000} + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: 5410316880928953953} + 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!1101 &303328823029619191 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 6 + m_ConditionEvent: value + m_EventTreshold: 2 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -7552555183249389472} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.8181819 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &675081572360035249 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 6 + m_ConditionEvent: value + m_EventTreshold: 4 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -4284731727828343707} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &1742514890017005427 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 6 + m_ConditionEvent: value + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -8062680078393266239} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.71428573 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &2009259118338622224 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 6 + m_ConditionEvent: value + m_EventTreshold: 1 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 6811921787494585261} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &2683460769776148252 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 6 + m_ConditionEvent: value + m_EventTreshold: 1 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 6811921787494585261} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.8181819 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &2775358733453534417 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 6 + m_ConditionEvent: value + m_EventTreshold: 5 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -6385607418254347299} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &2845126558459583911 +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: -8062680078393266239} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.6666666 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &3362391878852833191 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 6 + m_ConditionEvent: value + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -8062680078393266239} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.6666666 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &3748694197871359267 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 6 + m_ConditionEvent: value + m_EventTreshold: 2 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -7552555183249389472} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.6666666 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &3987748843758294227 +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: -8062680078393266239} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.8181819 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1107 &5410316880928953953 +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: -8062680078393266239} + m_Position: {x: 303.25253, y: 188.90945, z: 0} + - serializedVersion: 1 + m_State: {fileID: 6811921787494585261} + m_Position: {x: 604.9745, y: 205.87375, z: 0} + - serializedVersion: 1 + m_State: {fileID: -7552555183249389472} + m_Position: {x: 770, y: 370, z: 0} + - serializedVersion: 1 + m_State: {fileID: -455586630231115066} + m_Position: {x: 270.5357, y: 616.65186, z: 0} + - serializedVersion: 1 + m_State: {fileID: -4284731727828343707} + m_Position: {x: 501.97705, y: 632.4044, z: 0} + - serializedVersion: 1 + m_State: {fileID: -6385607418254347299} + m_Position: {x: 789.1582, y: 643.31, 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: -8062680078393266239} +--- !u!1101 &6471934142534801623 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 6 + m_ConditionEvent: value + m_EventTreshold: 3 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -455586630231115066} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1102 &6811921787494585261 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Walk + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: 3362391878852833191} + - {fileID: 6906376798154083209} + 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: -623603649343465320, guid: d48ca8c9cc936814a807ce19a68c97ae, type: 3} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1101 &6906376798154083209 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 6 + m_ConditionEvent: value + m_EventTreshold: 2 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -7552555183249389472} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.6666666 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &8422467497138784195 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 6 + m_ConditionEvent: value + m_EventTreshold: 2 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -7552555183249389472} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.78571427 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 diff --git a/FlufflParty/Assets/Animations/Chicken.controller.meta b/FlufflParty/Assets/Animations/Chicken.controller.meta new file mode 100644 index 0000000..1fd25e1 --- /dev/null +++ b/FlufflParty/Assets/Animations/Chicken.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 18ddec0df1a82934599c3a24ece02aaf +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/FlufflParty/Assets/Animations/MonkeyAnimator.controller b/FlufflParty/Assets/Animations/MonkeyAnimator.controller index 3c9bd4d..0fe0571 100644 --- a/FlufflParty/Assets/Animations/MonkeyAnimator.controller +++ b/FlufflParty/Assets/Animations/MonkeyAnimator.controller @@ -145,7 +145,7 @@ AnimatorStateTransition: m_TransitionDuration: 0.25 m_TransitionOffset: 0 m_ExitTime: 0.6666666 - m_HasExitTime: 1 + m_HasExitTime: 0 m_HasFixedDuration: 1 m_InterruptionSource: 0 m_OrderedInterruption: 1 diff --git a/FlufflParty/Assets/BlenderFiles/Characters/Chicken (Not Animated)/Chicken2.blend b/FlufflParty/Assets/BlenderFiles/Characters/Chicken (Not Animated)/Chicken2.blend index a4d72e0..94cd719 100644 Binary files a/FlufflParty/Assets/BlenderFiles/Characters/Chicken (Not Animated)/Chicken2.blend and b/FlufflParty/Assets/BlenderFiles/Characters/Chicken (Not Animated)/Chicken2.blend differ diff --git a/FlufflParty/Assets/BlenderFiles/Characters/Chicken (Not Animated)/Chicken2.blend.meta b/FlufflParty/Assets/BlenderFiles/Characters/Chicken (Not Animated)/Chicken2.blend.meta index 97f9f18..52e10dc 100644 --- a/FlufflParty/Assets/BlenderFiles/Characters/Chicken (Not Animated)/Chicken2.blend.meta +++ b/FlufflParty/Assets/BlenderFiles/Characters/Chicken (Not Animated)/Chicken2.blend.meta @@ -31,7 +31,181 @@ ModelImporter: animationWrapMode: 0 extraExposedTransformPaths: [] extraUserProperties: [] - clipAnimations: [] + clipAnimations: + - serializedVersion: 16 + name: Walk + takeName: Scene + internalID: -623603649343465320 + firstFrame: 1 + lastFrame: 19 + 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: 1 + - serializedVersion: 16 + name: FootTap + takeName: Scene + internalID: -1609281748187839663 + firstFrame: 21 + lastFrame: 39 + wrapMode: 0 + orientationOffsetY: 0 + level: 0 + cycleOffset: 0 + loop: 0 + hasAdditiveReferencePose: 0 + loopTime: 0 + 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: 1 + - serializedVersion: 16 + name: Wabble + takeName: Scene + internalID: 723096430288179899 + firstFrame: 41 + lastFrame: 69 + wrapMode: 0 + orientationOffsetY: 0 + level: 0 + cycleOffset: 0 + loop: 0 + hasAdditiveReferencePose: 0 + loopTime: 0 + 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: 1 + - serializedVersion: 16 + name: Flatter + takeName: Scene + internalID: 1963079803359675471 + firstFrame: 71 + lastFrame: 104 + wrapMode: 0 + orientationOffsetY: 0 + level: 0 + cycleOffset: 0 + loop: 0 + hasAdditiveReferencePose: 0 + loopTime: 0 + 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: 1 + - serializedVersion: 16 + name: Jump + takeName: Scene + internalID: -626948583029366203 + firstFrame: 108 + lastFrame: 129 + wrapMode: 0 + orientationOffsetY: 0 + level: 0 + cycleOffset: 0 + loop: 0 + hasAdditiveReferencePose: 0 + loopTime: 0 + 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: 1 + - serializedVersion: 16 + name: Idle + takeName: Scene + internalID: -8206857311389296499 + firstFrame: 131 + lastFrame: 135 + 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: 1 isReadable: 0 meshes: lODScreenPercentages: [] diff --git a/FlufflParty/Assets/BlenderFiles/Characters/Chicken (Not Animated)/Chicken2.blend1 b/FlufflParty/Assets/BlenderFiles/Characters/Chicken (Not Animated)/Chicken2.blend1 index ad85d30..e0ab6b9 100644 Binary files a/FlufflParty/Assets/BlenderFiles/Characters/Chicken (Not Animated)/Chicken2.blend1 and b/FlufflParty/Assets/BlenderFiles/Characters/Chicken (Not Animated)/Chicken2.blend1 differ diff --git a/FlufflParty/Assets/Prefabs/Chicken.prefab b/FlufflParty/Assets/Prefabs/Chicken.prefab new file mode 100644 index 0000000..63aa944 --- /dev/null +++ b/FlufflParty/Assets/Prefabs/Chicken.prefab @@ -0,0 +1,1517 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &705383364510594076 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3169415619599438160} + m_Layer: 0 + m_Name: Arm.l + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3169415619599438160 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 705383364510594076} + m_LocalRotation: {x: 0.8697141, y: 0.0000003153711, z: 0.0000003524787, w: -0.49355584} + m_LocalPosition: {x: 0.00000022866715, y: 1.8037854, z: 0.000000117346644} + m_LocalScale: {x: 1, y: 1.0000001, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 7327979285999548355} + m_Father: {fileID: 459758706915196860} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1014174154984954705 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4062967119934737218} + - component: {fileID: 4276422679073684461} + - component: {fileID: 5416275679001624436} + m_Layer: 6 + m_Name: Text (TMP) (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4062967119934737218 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1014174154984954705} + m_LocalRotation: {x: 0.6256104, y: 0.3295629, z: -0.32956293, w: 0.62561035} + m_LocalPosition: {x: 0, y: 0, z: -13.904537} + m_LocalScale: {x: 3.0465515, y: 3.046551, z: 3.0465515} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 8113162970676992002} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 90, y: 180, z: 120.725} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -10.151962, y: 57.07894} + m_SizeDelta: {x: 20, y: 5} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!23 &4276422679073684461 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1014174154984954705} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: -996942129922571021, guid: 30b250cb342768045acde7309e218e46, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!114 &5416275679001624436 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1014174154984954705} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9541d86e2fd84c1d9990edf0852d74ab, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: aaaaaaaa + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 30b250cb342768045acde7309e218e46, type: 2} + m_sharedMaterial: {fileID: -996942129922571021, guid: 30b250cb342768045acde7309e218e46, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 11.72 + m_fontSizeBase: 11.72 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 1 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 0 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + _SortingLayer: 0 + _SortingLayerID: 0 + _SortingOrder: 0 + m_hasFontAssetChanged: 0 + m_renderer: {fileID: 4276422679073684461} + m_maskType: 0 +--- !u!1 &1309482777366524643 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8842471568903326293} + m_Layer: 0 + m_Name: IK.r_end + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8842471568903326293 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1309482777366524643} + m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -0, y: 1.2714984, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2473865998913040544} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1637236296727560918 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 875787324618033308} + m_Layer: 0 + m_Name: Armature + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &875787324618033308 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1637236296727560918} + m_LocalRotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071067} + m_LocalPosition: {x: -0, y: 0, z: 0} + m_LocalScale: {x: 0.7864736, y: 0.7864736, z: 0.7864736} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 3189420637940673520} + - {fileID: 8181783995332220861} + - {fileID: 5445328713556267659} + - {fileID: 8256622735027776384} + - {fileID: 2473865998913040544} + - {fileID: 5512089129895554918} + - {fileID: 3338188134394293162} + m_Father: {fileID: 8113162970676992002} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1688857333384325358 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2473865998913040544} + m_Layer: 0 + m_Name: IK.r + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2473865998913040544 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1688857333384325358} + m_LocalRotation: {x: -0.00000009375496, y: 0, z: -0, w: 1} + m_LocalPosition: {x: 0.71241313, y: 1.2173979, z: 0.42713094} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 8842471568903326293} + m_Father: {fileID: 875787324618033308} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1708545543312658783 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5507934368977675425} + m_Layer: 0 + m_Name: Foot.l + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5507934368977675425 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1708545543312658783} + m_LocalRotation: {x: 0.00423081, y: -0.0021447837, z: 0.66058874, w: 0.7507331} + m_LocalPosition: {x: 0.000000022351742, y: 1.7869233, z: 0.000000019092113} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 7183280164366044121} + m_Father: {fileID: 3525158559829335855} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1857945253031012985 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5512089129895554918} + m_Layer: 0 + m_Name: OK.l + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5512089129895554918 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1857945253031012985} + m_LocalRotation: {x: -0.00000009375494, y: 0, z: -0, w: 1} + m_LocalPosition: {x: -0.7673968, y: -7.0863123, z: 1.8329873} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 7897258688180304611} + m_Father: {fileID: 875787324618033308} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &2047023831146044383 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5047947239765080033} + m_Layer: 0 + m_Name: Shoulder.r + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5047947239765080033 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2047023831146044383} + m_LocalRotation: {x: 0.12535898, y: -0.3918554, z: -0.5885998, w: 0.6959057} + m_LocalPosition: {x: 0.0000000037252903, y: 1.4038911, z: -0.00000007216385} + m_LocalScale: {x: 1.0000001, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1881110983965089546} + m_Father: {fileID: 3189420637940673520} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &2179398890303511079 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3525158559829335855} + m_Layer: 0 + m_Name: Leg.l + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3525158559829335855 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2179398890303511079} + m_LocalRotation: {x: -0.73241514, y: 0.008736529, z: 0.009167269, w: 0.6807406} + m_LocalPosition: {x: 0.00000011920929, y: 0.7646282, z: 0.000000007450581} + m_LocalScale: {x: 1, y: 0.9999997, z: 0.9999996} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 5507934368977675425} + m_Father: {fileID: 8181783995332220861} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &2188509356481581984 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7327979285999548355} + m_Layer: 0 + m_Name: Arm.l_end + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7327979285999548355 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2188509356481581984} + m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -0, y: 1.9149264, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 3169415619599438160} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &2938775052219363916 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3189420637940673520} + m_Layer: 0 + m_Name: Bone + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3189420637940673520 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2938775052219363916} + m_LocalRotation: {x: 0.8359909, y: 0.0034102446, z: -0.005195721, w: 0.5487081} + m_LocalPosition: {x: 0.000000001805852, y: 0.5584899, z: 1.8374319} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 5800765300337133435} + - {fileID: 459758706915196860} + - {fileID: 5047947239765080033} + m_Father: {fileID: 875787324618033308} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &3031063197708345429 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7717894608005298686} + m_Layer: 0 + m_Name: Leg.r + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7717894608005298686 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3031063197708345429} + m_LocalRotation: {x: -0.8092554, y: -0.007537598, z: -0.010129038, w: 0.5873213} + m_LocalPosition: {x: 0.00000016391277, y: 0.7646282, z: 0.000000029802322} + m_LocalScale: {x: 1, y: 0.99999976, z: 0.9999996} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1619730143095519638} + m_Father: {fileID: 5445328713556267659} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &3452271405592814067 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5569441641397567080} + m_Layer: 0 + m_Name: Foot.r_end + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5569441641397567080 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3452271405592814067} + m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -0, y: 0.5722081, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1619730143095519638} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &3595772806779914908 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3338188134394293162} + m_Layer: 0 + m_Name: OK.r + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3338188134394293162 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3595772806779914908} + m_LocalRotation: {x: -0.00000009375494, y: 0, z: -0, w: 1} + m_LocalPosition: {x: 0.7673968, y: 9.729152, z: 1.8329873} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 2021746376982845946} + m_Father: {fileID: 875787324618033308} + m_RootOrder: 6 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &3890406611409286243 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4631537899848750270} + m_Layer: 0 + m_Name: Bone.002 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4631537899848750270 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3890406611409286243} + m_LocalRotation: {x: -0.22951658, y: 1.476415e-10, z: -9.718174e-11, w: 0.97330475} + m_LocalPosition: {x: -0.000000010244548, y: 1.3927814, z: 0.00000007194467} + m_LocalScale: {x: 1, y: 1, z: 1.0000001} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 3642758275338588306} + m_Father: {fileID: 5800765300337133435} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &3894526527903786431 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1881110983965089546} + m_Layer: 0 + m_Name: Arm.r + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1881110983965089546 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3894526527903786431} + m_LocalRotation: {x: 0.87327474, y: -0.00000031214955, z: -0.0000003629686, w: -0.4872281} + m_LocalPosition: {x: -0.00000007360097, y: 1.8037854, z: 0.00000016577542} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 6838073563711074964} + m_Father: {fileID: 5047947239765080033} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &4586037185331455367 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8181783995332220861} + m_Layer: 0 + m_Name: Hips.l + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8181783995332220861 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4586037185331455367} + m_LocalRotation: {x: -0.13517646, y: 0.18212831, z: 0.7144843, w: 0.6618678} + m_LocalPosition: {x: 4.4289177e-18, y: 0.5584899, z: 1.8374319} + m_LocalScale: {x: 0.99999994, y: 0.99999994, z: 0.99999994} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 3525158559829335855} + m_Father: {fileID: 875787324618033308} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &4586221223808459050 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6838073563711074964} + m_Layer: 0 + m_Name: Arm.r_end + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6838073563711074964 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4586221223808459050} + m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -0, y: 1.9149264, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1881110983965089546} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &4939972547847857000 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3642758275338588306} + m_Layer: 0 + m_Name: Bone.002_end + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3642758275338588306 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4939972547847857000} + m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -0, y: 1.9041722, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 4631537899848750270} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &5753735294177838040 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5445328713556267659} + m_Layer: 0 + m_Name: Hips.r + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5445328713556267659 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5753735294177838040} + m_LocalRotation: {x: 0.2621893, y: 0.035079796, z: -0.6638449, w: 0.69952565} + m_LocalPosition: {x: -4.4289177e-18, y: 0.5584899, z: 1.8374319} + m_LocalScale: {x: 0.9999998, y: 1, z: 0.99999994} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 7717894608005298686} + m_Father: {fileID: 875787324618033308} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &5974411849745863805 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8256622735027776384} + m_Layer: 0 + m_Name: IK.l + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8256622735027776384 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5974411849745863805} + m_LocalRotation: {x: -0.00000009375496, y: 0, z: -0, w: 1} + m_LocalPosition: {x: -0.71241313, y: -0.3009411, z: 0.31033558} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 4460937883928113300} + m_Father: {fileID: 875787324618033308} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &6937257173519562372 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1619730143095519638} + m_Layer: 0 + m_Name: Foot.r + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1619730143095519638 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6937257173519562372} + m_LocalRotation: {x: 0.0006120354, y: 0.00013480756, z: -0.6893877, w: 0.7243924} + m_LocalPosition: {x: -0.000000059604645, y: 1.7869232, z: 0.000000037252903} + m_LocalScale: {x: 1, y: 0.99999994, z: 0.99999994} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 5569441641397567080} + m_Father: {fileID: 7717894608005298686} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &6949262971277513677 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7183280164366044121} + m_Layer: 0 + m_Name: Foot.l_end + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7183280164366044121 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6949262971277513677} + m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -0, y: 0.5722081, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 5507934368977675425} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &7127597152727822219 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3790106226870488582} + - component: {fileID: 279203971703720064} + m_Layer: 0 + m_Name: Cube.004 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3790106226870488582 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7127597152727822219} + m_LocalRotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071067} + m_LocalPosition: {x: -0, y: 0, z: 0} + m_LocalScale: {x: 1.5510696, y: 1.5510696, z: 1.160572} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 8113162970676992002} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!137 &279203971703720064 +SkinnedMeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7127597152727822219} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 3 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: -8724759458602826897, guid: d48ca8c9cc936814a807ce19a68c97ae, type: 3} + - {fileID: -9103484930961366303, guid: d48ca8c9cc936814a807ce19a68c97ae, type: 3} + - {fileID: 6098924145076851180, guid: d48ca8c9cc936814a807ce19a68c97ae, type: 3} + - {fileID: 679688280586237918, guid: d48ca8c9cc936814a807ce19a68c97ae, type: 3} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + serializedVersion: 2 + m_Quality: 0 + m_UpdateWhenOffscreen: 0 + m_SkinnedMotionVectors: 1 + m_Mesh: {fileID: -5053925668127403250, guid: d48ca8c9cc936814a807ce19a68c97ae, type: 3} + m_Bones: + - {fileID: 3189420637940673520} + - {fileID: 5800765300337133435} + - {fileID: 4631537899848750270} + - {fileID: 459758706915196860} + - {fileID: 3169415619599438160} + - {fileID: 5047947239765080033} + - {fileID: 1881110983965089546} + - {fileID: 8181783995332220861} + - {fileID: 3525158559829335855} + - {fileID: 5507934368977675425} + - {fileID: 5445328713556267659} + - {fileID: 7717894608005298686} + - {fileID: 1619730143095519638} + - {fileID: 8256622735027776384} + - {fileID: 5512089129895554918} + - {fileID: 2473865998913040544} + - {fileID: 3338188134394293162} + m_BlendShapeWeights: [] + m_RootBone: {fileID: 3189420637940673520} + m_AABB: + m_Center: {x: 0.013707042, y: 1.515387, z: -0.16541898} + m_Extent: {x: 3.941327, y: 3.8514142, z: 3.9361439} + m_DirtyAABB: 0 +--- !u!1 &7184805530774824151 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4460937883928113300} + m_Layer: 0 + m_Name: IK.l_end + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4460937883928113300 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7184805530774824151} + m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -0, y: 1.2714984, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 8256622735027776384} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &7362167672947261179 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2021746376982845946} + m_Layer: 0 + m_Name: OK.r_end + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2021746376982845946 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7362167672947261179} + m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -0, y: 1.2714987, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 3338188134394293162} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &7435491809973364371 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 459758706915196860} + m_Layer: 0 + m_Name: Shoulder.l + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &459758706915196860 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7435491809973364371} + m_LocalRotation: {x: 0.12535898, y: 0.3918554, z: 0.5885998, w: 0.6959057} + m_LocalPosition: {x: 0.0000000037252903, y: 1.4038911, z: -0.00000007216385} + m_LocalScale: {x: 1.0000001, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 3169415619599438160} + m_Father: {fileID: 3189420637940673520} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &8053849081899673523 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5800765300337133435} + m_Layer: 0 + m_Name: Bone.001 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5800765300337133435 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8053849081899673523} + m_LocalRotation: {x: 0.028966188, y: -0.002583782, z: -0.00071412866, w: 0.9995768} + m_LocalPosition: {x: 0.0000000037252903, y: 1.4038911, z: -0.00000007216385} + m_LocalScale: {x: 1, y: 0.9999999, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 4631537899848750270} + m_Father: {fileID: 3189420637940673520} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &8097489691934671114 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7837846359349468239} + - component: {fileID: 5040331569447038078} + - component: {fileID: 5470671639685965961} + - component: {fileID: 5025468088982337612} + m_Layer: 0 + m_Name: Text (TMP) (2) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7837846359349468239 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8097489691934671114} + m_LocalRotation: {x: -0, y: 0.95767283, z: -0, w: 0.28785893} + m_LocalPosition: {x: 0, y: 0, z: -0.41} + m_LocalScale: {x: 3.0465515, y: 3.046551, z: 3.0465515} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 8113162970676992002} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 150.256, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -0.04, y: 7.913252} + m_SizeDelta: {x: 20, y: 5} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!23 &5040331569447038078 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8097489691934671114} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: -996942129922571021, guid: 30b250cb342768045acde7309e218e46, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!114 &5470671639685965961 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8097489691934671114} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9541d86e2fd84c1d9990edf0852d74ab, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: aaaaaaaa + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 30b250cb342768045acde7309e218e46, type: 2} + m_sharedMaterial: {fileID: -996942129922571021, guid: 30b250cb342768045acde7309e218e46, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 6.7 + m_fontSizeBase: 6.7 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 1 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 0 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + _SortingLayer: 0 + _SortingLayerID: 0 + _SortingOrder: 0 + m_hasFontAssetChanged: 0 + m_renderer: {fileID: 5040331569447038078} + m_maskType: 0 +--- !u!114 &5025468088982337612 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8097489691934671114} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 02c404c54096ffb47993bd51b2a3e8d4, type: 3} + m_Name: + m_EditorClassIdentifier: + orgY: 146.54 +--- !u!1 &8925129576854471352 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8113162970676992002} + - component: {fileID: 4317162709733504972} + - component: {fileID: 5338766736821448153} + - component: {fileID: 3795912341625257883} + m_Layer: 0 + m_Name: Chicken + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8113162970676992002 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8925129576854471352} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 97.09, y: 2, z: 129.11} + m_LocalScale: {x: 0.32824, y: 0.32824, z: 0.32824} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 875787324618033308} + - {fileID: 3790106226870488582} + - {fileID: 4075828293638298187} + - {fileID: 4062967119934737218} + - {fileID: 7837846359349468239} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!54 &4317162709733504972 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8925129576854471352} + serializedVersion: 2 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 0.05 + m_UseGravity: 0 + m_IsKinematic: 0 + m_Interpolate: 0 + m_Constraints: 126 + m_CollisionDetection: 0 +--- !u!65 &5338766736821448153 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8925129576854471352} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 2.7277572, y: 5.0975194, z: 2.3205237} + m_Center: {x: -0.12872003, y: 2.0487583, z: 0.0136931185} +--- !u!95 &3795912341625257883 +Animator: + serializedVersion: 5 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8925129576854471352} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 18ddec0df1a82934599c3a24ece02aaf, 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 +--- !u!1 &9046182286325009016 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7897258688180304611} + m_Layer: 0 + m_Name: OK.l_end + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7897258688180304611 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9046182286325009016} + m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -0, y: 1.2714987, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 5512089129895554918} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &5772119260187576217 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 8113162970676992002} + m_Modifications: + - target: {fileID: 7188096243511822184, guid: 7a8ef933fd6c53841a03ec09e8f7d327, type: 3} + propertyPath: m_Name + value: CoinAnimated + objectReference: {fileID: 0} + - target: {fileID: 7188096243511822184, guid: 7a8ef933fd6c53841a03ec09e8f7d327, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 7533097070461705682, guid: 7a8ef933fd6c53841a03ec09e8f7d327, type: 3} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 7533097070461705682, guid: 7a8ef933fd6c53841a03ec09e8f7d327, type: 3} + propertyPath: m_LocalScale.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7533097070461705682, guid: 7a8ef933fd6c53841a03ec09e8f7d327, type: 3} + propertyPath: m_LocalScale.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7533097070461705682, guid: 7a8ef933fd6c53841a03ec09e8f7d327, type: 3} + propertyPath: m_LocalScale.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7533097070461705682, guid: 7a8ef933fd6c53841a03ec09e8f7d327, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7533097070461705682, guid: 7a8ef933fd6c53841a03ec09e8f7d327, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7533097070461705682, guid: 7a8ef933fd6c53841a03ec09e8f7d327, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7533097070461705682, guid: 7a8ef933fd6c53841a03ec09e8f7d327, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7533097070461705682, guid: 7a8ef933fd6c53841a03ec09e8f7d327, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7533097070461705682, guid: 7a8ef933fd6c53841a03ec09e8f7d327, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7533097070461705682, guid: 7a8ef933fd6c53841a03ec09e8f7d327, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7533097070461705682, guid: 7a8ef933fd6c53841a03ec09e8f7d327, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7533097070461705682, guid: 7a8ef933fd6c53841a03ec09e8f7d327, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7533097070461705682, guid: 7a8ef933fd6c53841a03ec09e8f7d327, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 7a8ef933fd6c53841a03ec09e8f7d327, type: 3} +--- !u!1 &3736739270920782065 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 7188096243511822184, guid: 7a8ef933fd6c53841a03ec09e8f7d327, type: 3} + m_PrefabInstance: {fileID: 5772119260187576217} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1728508718736464182 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3736739270920782065} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 787dbc4f3dfef2342a9cc6b5a6b706e2, type: 3} + m_Name: + m_EditorClassIdentifier: + anim: {fileID: 4547220829094641058} +--- !u!4 &4075828293638298187 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7533097070461705682, guid: 7a8ef933fd6c53841a03ec09e8f7d327, type: 3} + m_PrefabInstance: {fileID: 5772119260187576217} + m_PrefabAsset: {fileID: 0} +--- !u!95 &4547220829094641058 stripped +Animator: + m_CorrespondingSourceObject: {fileID: 7998488195783899707, guid: 7a8ef933fd6c53841a03ec09e8f7d327, type: 3} + m_PrefabInstance: {fileID: 5772119260187576217} + m_PrefabAsset: {fileID: 0} diff --git a/FlufflParty/Assets/Prefabs/Chicken.prefab.meta b/FlufflParty/Assets/Prefabs/Chicken.prefab.meta new file mode 100644 index 0000000..f752745 --- /dev/null +++ b/FlufflParty/Assets/Prefabs/Chicken.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: dacabcc369b57cd4699cbd9028805bb8 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/FlufflParty/Assets/Scenes/Start.unity b/FlufflParty/Assets/Scenes/Start.unity index 61c1939..6509d9c 100644 --- a/FlufflParty/Assets/Scenes/Start.unity +++ b/FlufflParty/Assets/Scenes/Start.unity @@ -4344,7 +4344,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1844490421 RectTransform: m_ObjectHideFlags: 0 diff --git a/FlufflParty/Assets/Scenes/WesternMap.unity b/FlufflParty/Assets/Scenes/WesternMap.unity index 36e53ab..4e2ed8a 100644 --- a/FlufflParty/Assets/Scenes/WesternMap.unity +++ b/FlufflParty/Assets/Scenes/WesternMap.unity @@ -550,7 +550,10 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: textLeftMoves: {fileID: 2122811708} - playerPrefab: {fileID: 8816567085985930771, guid: 5fb5cbebdcdde5e4381eed73785da900, type: 3} + playerPrefab: + - {fileID: 8816567085985930771, guid: 5fb5cbebdcdde5e4381eed73785da900, type: 3} + - {fileID: 5247910453208470208, guid: 59e100ca14490c747a2f7e7419c67425, type: 3} + - {fileID: 8925129576854471352, guid: dacabcc369b57cd4699cbd9028805bb8, type: 3} dice: {fileID: 1676575018} nextField: {fileID: 1406090859} cam: {fileID: 1328561024} @@ -589,6 +592,15 @@ MonoBehaviour: - {fileID: 1895315791} - {fileID: 457507620} - {fileID: 1647129475} + playerIconInfoImages: + - {fileID: 1173785702} + - {fileID: 1011403535} + - {fileID: 2101210735} + - {fileID: 651699163} + playerIconInfoImagesPrefabs: + - {fileID: 21300000, guid: 57e3c75103e6feb49985654c7af4524c, type: 3} + - {fileID: 21300000, guid: 84910def6c534a342b64c363954757f5, type: 3} + - {fileID: 21300000, guid: 6ce91f2676559c8498bf6cf0e6db698f, type: 3} --- !u!114 &47812149 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/FlufflParty/Assets/Scripts/Client.cs b/FlufflParty/Assets/Scripts/Client.cs index 3900ec3..6dd0134 100644 --- a/FlufflParty/Assets/Scripts/Client.cs +++ b/FlufflParty/Assets/Scripts/Client.cs @@ -15,7 +15,7 @@ public class Client : MonoBehaviour [SerializeField] private TMP_Text textLeftMoves; private TcpClient client; private Stream stream; - [SerializeField] private GameObject playerPrefab; + [SerializeField] private GameObject[] playerPrefab; private Player[] players = new Player[4]; private Queue jobs = new Queue(); [SerializeField] private GameObject dice; @@ -37,6 +37,10 @@ public class Client : MonoBehaviour [SerializeField] private Image imageCurrentItem; [SerializeField] private Image[] playerItemInfoImages; + + //Icon + [SerializeField] private Image[] playerIconInfoImages; + [SerializeField] private Sprite[] playerIconInfoImagesPrefabs; private static Client thisClient; @@ -72,7 +76,7 @@ public class Client : MonoBehaviour string name = PlayerPrefs.GetString("name"); stream.Write(Encoding.ASCII.GetBytes(name), 0, 10); int characterID = PlayerPrefs.GetInt("characterID"); - + stream.Write(new byte[] { (byte)characterID, 0, 0, 0, 0, 0, 0, 0, 0, 0 },0, 10); for (int i = 0; i < playerInfo.Length; i++) { @@ -148,7 +152,8 @@ public class Client : MonoBehaviour //player is playable if (job.data[1] == 1) { - GameObject player = Instantiate(playerPrefab); + GameObject player = Instantiate(playerPrefab[job.data[9]]); + playerIconInfoImages[job.data[5]].sprite = playerIconInfoImagesPrefabs[job.data[9]]; player.transform.position = new Vector3(job.data[2], job.data[3] + 0.5f, job.data[4]); @@ -180,7 +185,8 @@ public class Client : MonoBehaviour //player is not playable else { - GameObject player = Instantiate(playerPrefab); + GameObject player = Instantiate(playerPrefab[job.data[9]]); + playerIconInfoImages[job.data[5]].sprite = playerIconInfoImagesPrefabs[job.data[9]]; player.transform.position = new Vector3(job.data[2], job.data[3] + 0.5f, job.data[4]); diff --git a/FlufflParty/Assets/Scripts/Start/StartHandler.cs b/FlufflParty/Assets/Scripts/Start/StartHandler.cs index 20a8ad6..4f7a7ce 100644 --- a/FlufflParty/Assets/Scripts/Start/StartHandler.cs +++ b/FlufflParty/Assets/Scripts/Start/StartHandler.cs @@ -39,8 +39,8 @@ public class StartHandler : MonoBehaviour } else { - PlayerPrefs.SetInt("characterID", 0); - imageShowSelectedCharacter.sprite = characterFaces[0]; + PlayerPrefs.SetInt("characterID", 1); + imageShowSelectedCharacter.sprite = characterFaces[1]; } copiedMessage.SetActive(false); diff --git a/FlufflParty/ProjectSettings/ProjectSettings.asset b/FlufflParty/ProjectSettings/ProjectSettings.asset index df99f39..435dcaf 100644 --- a/FlufflParty/ProjectSettings/ProjectSettings.asset +++ b/FlufflParty/ProjectSettings/ProjectSettings.asset @@ -137,7 +137,9 @@ PlayerSettings: 16:9: 1 Others: 1 bundleVersion: 0.14 - preloadedAssets: [] + preloadedAssets: + - {fileID: -6390619424234631034, guid: 90cd1b71078984c4980fcd1aa03eaaa3, type: 2} + - {fileID: 11400000, guid: 48bf7376b3770c44cbfe3f40e77359ab, type: 2} metroInputSource: 0 wsaTransparentSwapchain: 0 m_HolographicPauseOnTrackingLoss: 1 diff --git a/FlufflParty/UserSettings/Layouts/default-2021.dwlt b/FlufflParty/UserSettings/Layouts/default-2021.dwlt index 9341136..c8e6591 100644 --- a/FlufflParty/UserSettings/Layouts/default-2021.dwlt +++ b/FlufflParty/UserSettings/Layouts/default-2021.dwlt @@ -1,30 +1,6 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: --- !u!114 &1 -MonoBehaviour: - m_ObjectHideFlags: 52 - 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: 12004, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_PixelRect: - serializedVersion: 2 - x: 613 - y: 243 - width: 641 - height: 662 - m_ShowMode: 0 - m_Title: Build Settings - m_RootView: {fileID: 4} - m_MinSize: {x: 640, y: 601} - m_MaxSize: {x: 4000, y: 4021} - m_Maximized: 0 ---- !u!114 &2 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -43,62 +19,12 @@ MonoBehaviour: width: 1920 height: 1117 m_ShowMode: 4 - m_Title: Inspector - m_RootView: {fileID: 5} + m_Title: Project + m_RootView: {fileID: 2} m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} m_Maximized: 1 ---- !u!114 &3 -MonoBehaviour: - m_ObjectHideFlags: 52 - 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: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: BuildPlayerWindow - m_EditorClassIdentifier: - m_Children: [] - m_Position: - serializedVersion: 2 - x: 0 - y: 0 - width: 641 - height: 662 - m_MinSize: {x: 640, y: 601} - m_MaxSize: {x: 4000, y: 4021} - m_ActualView: {fileID: 16} - m_Panes: - - {fileID: 16} - m_Selected: 0 - m_LastSelected: 0 ---- !u!114 &4 -MonoBehaviour: - m_ObjectHideFlags: 52 - 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: 12010, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_Children: - - {fileID: 3} - m_Position: - serializedVersion: 2 - x: 0 - y: 0 - width: 641 - height: 662 - m_MinSize: {x: 640, y: 601} - m_MaxSize: {x: 4000, y: 4021} - vertical: 0 - controlID: 1715 ---- !u!114 &5 +--- !u!114 &2 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -111,9 +37,9 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Children: - - {fileID: 6} - - {fileID: 8} - - {fileID: 7} + - {fileID: 3} + - {fileID: 5} + - {fileID: 4} m_Position: serializedVersion: 2 x: 0 @@ -126,7 +52,7 @@ MonoBehaviour: m_TopViewHeight: 30 m_UseBottomView: 1 m_BottomViewHeight: 20 ---- !u!114 &6 +--- !u!114 &3 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -148,7 +74,7 @@ MonoBehaviour: m_MinSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0} m_LastLoadedLayoutName: ---- !u!114 &7 +--- !u!114 &4 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -169,7 +95,7 @@ MonoBehaviour: height: 20 m_MinSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0} ---- !u!114 &8 +--- !u!114 &5 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -182,7 +108,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Children: - - {fileID: 9} + - {fileID: 6} m_Position: serializedVersion: 2 x: 0 @@ -192,8 +118,8 @@ MonoBehaviour: m_MinSize: {x: 300, y: 200} m_MaxSize: {x: 24288, y: 16192} vertical: 1 - controlID: 178 ---- !u!114 &9 + controlID: 52 +--- !u!114 &6 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -206,8 +132,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Children: - - {fileID: 10} - - {fileID: 15} + - {fileID: 7} + - {fileID: 12} m_Position: serializedVersion: 2 x: 0 @@ -217,8 +143,8 @@ MonoBehaviour: m_MinSize: {x: 300, y: 200} m_MaxSize: {x: 24288, y: 16192} vertical: 0 - controlID: 179 ---- !u!114 &10 + controlID: 53 +--- !u!114 &7 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -231,8 +157,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Children: + - {fileID: 8} - {fileID: 11} - - {fileID: 14} m_Position: serializedVersion: 2 x: 0 @@ -242,8 +168,8 @@ MonoBehaviour: m_MinSize: {x: 200, y: 200} m_MaxSize: {x: 16192, y: 16192} vertical: 1 - controlID: 122 ---- !u!114 &11 + controlID: 54 +--- !u!114 &8 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -256,8 +182,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Children: - - {fileID: 12} - - {fileID: 13} + - {fileID: 9} + - {fileID: 10} m_Position: serializedVersion: 2 x: 0 @@ -267,8 +193,8 @@ MonoBehaviour: m_MinSize: {x: 200, y: 100} m_MaxSize: {x: 16192, y: 8096} vertical: 0 - controlID: 123 ---- !u!114 &12 + controlID: 55 +--- !u!114 &9 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -287,14 +213,14 @@ MonoBehaviour: y: 0 width: 313 height: 755 - m_MinSize: {x: 201, y: 221} - m_MaxSize: {x: 4001, y: 4021} - m_ActualView: {fileID: 18} + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} + m_ActualView: {fileID: 14} m_Panes: - - {fileID: 18} + - {fileID: 14} m_Selected: 0 m_LastSelected: 0 ---- !u!114 &13 +--- !u!114 &10 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -315,14 +241,13 @@ MonoBehaviour: height: 755 m_MinSize: {x: 102, y: 121} m_MaxSize: {x: 4002, y: 4021} - m_ActualView: {fileID: 20} + m_ActualView: {fileID: 15} m_Panes: - - {fileID: 20} + - {fileID: 15} - {fileID: 19} - - {fileID: 24} m_Selected: 0 - m_LastSelected: 2 ---- !u!114 &14 + m_LastSelected: 0 +--- !u!114 &11 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -343,13 +268,13 @@ MonoBehaviour: height: 312 m_MinSize: {x: 231, y: 271} m_MaxSize: {x: 10001, y: 10021} - m_ActualView: {fileID: 17} + m_ActualView: {fileID: 13} m_Panes: - - {fileID: 17} - - {fileID: 21} + - {fileID: 13} + - {fileID: 16} m_Selected: 0 m_LastSelected: 1 ---- !u!114 &15 +--- !u!114 &12 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -370,63 +295,13 @@ MonoBehaviour: height: 1067 m_MinSize: {x: 276, y: 71} m_MaxSize: {x: 4001, y: 4021} - m_ActualView: {fileID: 22} + m_ActualView: {fileID: 17} m_Panes: - - {fileID: 22} - - {fileID: 23} + - {fileID: 17} + - {fileID: 18} m_Selected: 0 m_LastSelected: 1 ---- !u!114 &16 -MonoBehaviour: - m_ObjectHideFlags: 52 - 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: 12043, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_MinSize: {x: 640, y: 580} - m_MaxSize: {x: 4000, y: 4000} - m_TitleContent: - m_Text: Build Settings - m_Image: {fileID: 0} - m_Tooltip: - m_Pos: - serializedVersion: 2 - x: 613 - y: 243 - width: 641 - height: 641 - m_ViewDataDictionary: {fileID: 0} - m_OverlayCanvas: - m_LastAppliedPresetName: Default - m_SaveData: [] - m_TreeViewState: - scrollPos: {x: 0, y: 0} - m_SelectedIDs: - m_LastClickedID: 0 - m_ExpandedIDs: - m_RenameOverlay: - m_UserAcceptedRename: 0 - m_Name: - m_OriginalName: - m_EditFieldRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 0 - height: 0 - m_UserData: 0 - m_IsWaitingForDelay: 0 - m_IsRenaming: 0 - m_OriginalEventType: 11 - m_IsRenamingFilename: 0 - m_ClientGUIView: {fileID: 0} - m_SearchString: ---- !u!114 &17 +--- !u!114 &13 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -467,22 +342,22 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets + - Assets/BlenderFiles/Characters/Chicken (Not Animated) m_Globs: [] m_OriginalText: m_ViewMode: 1 m_StartGridSize: 64 m_LastFolders: - - Assets + - Assets/BlenderFiles/Characters/Chicken (Not Animated) m_LastFoldersGridSize: -1 m_LastProjectPath: D:\Unity\flufflparty\FlufflParty m_LockTracker: m_IsLocked: 0 m_FolderTreeState: - scrollPos: {x: 0, y: 79} - m_SelectedIDs: 9c690000 - m_LastClickedID: 27036 - m_ExpandedIDs: 000000009c6900009e690000a0690000a2690000a469000000ca9a3b + scrollPos: {x: 0, y: 0} + m_SelectedIDs: 0c6b0000 + m_LastClickedID: 27404 + m_ExpandedIDs: 00000000dc6a0000de6a0000e06a0000e26a0000e46a000000ca9a3b m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -510,7 +385,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 000000009c6900009e690000a0690000a2690000a4690000 + m_ExpandedIDs: 00000000dc6a0000de6a0000e06a0000e26a0000e46a0000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -538,7 +413,7 @@ MonoBehaviour: m_SelectedInstanceIDs: m_LastClickedInstanceID: 0 m_HadKeyboardFocusLastEvent: 1 - m_ExpandedInstanceIDs: c6230000906400007e6d0000485d00002c610000fa0b020046650000 + m_ExpandedInstanceIDs: c6230000906400007e6d0000485d00002c610000fa0b020046650000e2780000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -554,7 +429,7 @@ MonoBehaviour: m_IsRenaming: 0 m_OriginalEventType: 11 m_IsRenamingFilename: 1 - m_ClientGUIView: {fileID: 14} + m_ClientGUIView: {fileID: 11} m_CreateAssetUtility: m_EndAction: {fileID: 0} m_InstanceID: 0 @@ -566,7 +441,7 @@ MonoBehaviour: m_GridSize: 64 m_SkipHiddenPackages: 0 m_DirectoriesAreaWidth: 207 ---- !u!114 &18 +--- !u!114 &14 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -597,9 +472,9 @@ MonoBehaviour: m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: + m_SelectedIDs: b46b0000 m_LastClickedID: 0 - m_ExpandedIDs: e0d3ffff32d4ffff58d8ffff88d8ffff8edbffffdedbffff04e0ffff34e0fffface9ffff06fbffffee6d00003c6e0000686e0000 + m_ExpandedIDs: 9ad5fffffad5fffff2d9ffff2adaffff18f5ffff18f6ffff06fbffff306c0000606c0000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -615,7 +490,7 @@ MonoBehaviour: m_IsRenaming: 0 m_OriginalEventType: 11 m_IsRenamingFilename: 0 - m_ClientGUIView: {fileID: 12} + m_ClientGUIView: {fileID: 9} m_SearchString: m_ExpandedScenes: [] m_CurrenRootInstanceID: 0 @@ -623,139 +498,7 @@ MonoBehaviour: m_IsLocked: 0 m_CurrentSortingName: TransformSorting m_WindowGUID: 4c969a2b90040154d917609493e03593 ---- !u!114 &19 -MonoBehaviour: - m_ObjectHideFlags: 52 - 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: 12914, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_MinSize: {x: 100, y: 100} - m_MaxSize: {x: 4000, y: 4000} - m_TitleContent: - m_Text: Animator - m_Image: {fileID: -1673928668082335149, guid: 0000000000000000d000000000000000, type: 0} - m_Tooltip: - m_Pos: - serializedVersion: 2 - x: 313 - y: 73 - width: 1236 - height: 734 - m_ViewDataDictionary: {fileID: 0} - m_OverlayCanvas: - m_LastAppliedPresetName: Default - m_SaveData: [] - m_ViewTransforms: - m_KeySerializationHelper: - - {fileID: 575121510650230631, guid: 32f1ccb535c04d5499bee46726dc7754, type: 2} - - {fileID: -724036225730276578, guid: f2f77a1f959da1044b07ed06d554a69b, type: 2} - - {fileID: 7066694291420368678, guid: 815797d8f652ff44b8dab25ff9a0cde3, type: 2} - - {fileID: 4626693171902715256, guid: 62b28fe48d7491a4db5f941cb066e3ec, type: 2} - - {fileID: 1990495500464979279, guid: 9518d5f73cb8c844aa4165b745c672cb, type: 2} - m_ValueSerializationHelper: - - 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 - - e00: 0.94549483 - e01: 0 - e02: 0 - e03: 31.649342 - e10: 0 - e11: 0.94549483 - e12: 0 - e13: 190.78792 - e20: 0 - e21: 0 - e22: 1 - e23: 0 - e30: 0 - e31: 0 - e32: 0 - e33: 1 - - e00: 0.7126316 - e01: 0 - e02: 0 - e03: -20.631592 - e10: 0 - e11: 0.7126316 - e12: 0 - e13: 176.23685 - e20: 0 - e21: 0 - e22: 1 - e23: 0 - e30: 0 - e31: 0 - e32: 0 - e33: 1 - - e00: 0.7126316 - e01: 0 - e02: 0 - e03: 29.368404 - e10: 0 - e11: 0.7126316 - e12: 0 - e13: 210.8 - e20: 0 - e21: 0 - e22: 1 - e23: 0 - e30: 0 - e31: 0 - e32: 0 - e33: 1 - - e00: 0.7855881 - e01: 0 - e02: 0 - e03: 2.5650291 - e10: 0 - e11: 0.7855881 - e12: 0 - e13: 179.7382 - e20: 0 - e21: 0 - e22: 1 - e23: 0 - e30: 0 - e31: 0 - e32: 0 - e33: 1 - m_PreviewAnimator: {fileID: 0} - m_AnimatorController: {fileID: 9100000, guid: 9518d5f73cb8c844aa4165b745c672cb, type: 2} - m_BreadCrumbs: - - m_Target: {fileID: 1990495500464979279, guid: 9518d5f73cb8c844aa4165b745c672cb, type: 2} - m_ScrollPosition: {x: 0, y: 0} - stateMachineGraph: {fileID: 0} - stateMachineGraphGUI: {fileID: 0} - blendTreeGraph: {fileID: 0} - blendTreeGraphGUI: {fileID: 0} - m_AutoLiveLink: 1 - m_MiniTool: 0 - m_LockTracker: - m_IsLocked: 0 - m_CurrentEditor: 1 - m_LayerEditor: - m_SelectedLayerIndex: 0 ---- !u!114 &20 +--- !u!114 &15 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1008,14 +751,14 @@ MonoBehaviour: m_OverrideSceneCullingMask: 6917529027641081856 m_SceneIsLit: 1 m_SceneLighting: 1 - m_2DMode: 1 + m_2DMode: 0 m_isRotationLocked: 0 m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: 884.68835, y: 244.03244, z: 2.0766582} + m_Target: {x: 94.84213, y: 0.72376204, z: 125.883934} speed: 2 - m_Value: {x: 884.68835, y: 244.03244, z: 2.0766582} + m_Value: {x: 94.84213, y: 0.72376204, z: 125.883934} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -1062,17 +805,17 @@ MonoBehaviour: m_GridAxis: 1 m_gridOpacity: 0.5 m_Rotation: - m_Target: {x: 0, y: 0, z: 0, w: 1} + m_Target: {x: -0.12373468, y: -0.8689215, z: 0.39375728, w: -0.2736711} speed: 2 - m_Value: {x: -0, y: -0, z: 0, w: -0.99999994} + m_Value: {x: -0.124308065, y: -0.8683905, z: 0.39351705, w: -0.27493632} m_Size: - m_Target: 335.76297 + m_Target: 3.5334451 speed: 2 - m_Value: 335.76297 + m_Value: 3.5334451 m_Ortho: - m_Target: 1 + m_Target: 0 speed: 2 - m_Value: 1 + m_Value: 0 m_CameraSettings: m_Speed: 1.005 m_SpeedNormalized: 0.5 @@ -1086,14 +829,14 @@ MonoBehaviour: m_FarClip: 10000 m_DynamicClip: 1 m_OcclusionCulling: 0 - m_LastSceneViewRotation: {x: -0.03943621, y: -0.9346003, z: 0.3361925, w: -0.10956729} + m_LastSceneViewRotation: {x: -0.08717229, y: 0.89959055, z: -0.21045254, w: -0.3726226} m_LastSceneViewOrtho: 0 m_ReplacementShader: {fileID: 0} m_ReplacementString: m_SceneVisActive: 1 m_LastLockedObject: {fileID: 0} m_ViewIsLockedToObject: 0 ---- !u!114 &21 +--- !u!114 &16 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1121,7 +864,7 @@ MonoBehaviour: m_OverlayCanvas: m_LastAppliedPresetName: Default m_SaveData: [] ---- !u!114 &22 +--- !u!114 &17 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1162,7 +905,7 @@ MonoBehaviour: m_LockTracker: m_IsLocked: 0 m_PreviewWindow: {fileID: 0} ---- !u!114 &23 +--- !u!114 &18 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1182,15 +925,15 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 1381 + x: 1551 y: 73 - width: 538 + width: 368 height: 1046 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default m_SaveData: [] ---- !u!114 &24 +--- !u!114 &19 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1253,7 +996,7 @@ MonoBehaviour: m_HSlider: 0 m_VSlider: 0 m_IgnoreScrollWheelUntilClicked: 0 - m_EnableMouseInput: 1 + m_EnableMouseInput: 0 m_EnableSliderZoomHorizontal: 0 m_EnableSliderZoomVertical: 0 m_UniformScale: 1 diff --git a/Server/.idea/workspace.xml b/Server/.idea/workspace.xml index f9f4beb..17e000c 100644 --- a/Server/.idea/workspace.xml +++ b/Server/.idea/workspace.xml @@ -97,6 +97,7 @@ + diff --git a/Server/out/artifacts/Server_jar/Server.jar b/Server/out/artifacts/Server_jar/Server.jar index 196cdb9..63763aa 100644 Binary files a/Server/out/artifacts/Server_jar/Server.jar and b/Server/out/artifacts/Server_jar/Server.jar differ diff --git a/Server/out/production/Server/Client.class b/Server/out/production/Server/Client.class index 6bb37a8..7130b33 100644 Binary files a/Server/out/production/Server/Client.class and b/Server/out/production/Server/Client.class differ diff --git a/Server/out/production/Server/Room.class b/Server/out/production/Server/Room.class index bcb57c9..9696510 100644 Binary files a/Server/out/production/Server/Room.class and b/Server/out/production/Server/Room.class differ diff --git a/Server/out/production/Server/Server$1.class b/Server/out/production/Server/Server$1.class index de9d95b..8a221e2 100644 Binary files a/Server/out/production/Server/Server$1.class and b/Server/out/production/Server/Server$1.class differ diff --git a/Server/out/production/Server/Server.class b/Server/out/production/Server/Server.class index 6da51d6..b176a3c 100644 Binary files a/Server/out/production/Server/Server.class and b/Server/out/production/Server/Server.class differ diff --git a/Server/src/Client.java b/Server/src/Client.java index d995470..77356c8 100644 --- a/Server/src/Client.java +++ b/Server/src/Client.java @@ -12,16 +12,18 @@ public class Client public Socket socket; public String name; + public int characterID; public long lastTimeSendTimeOutCheck = -1; - public Client(DataOutputStream output, DataInputStream input, Socket socket, String name) + public Client(DataOutputStream output, DataInputStream input, Socket socket, String name, int characterID) { this.output = output; this.input = input; this.socket = socket; this.name = name; + this.characterID = characterID; } public void close() diff --git a/Server/src/Room.java b/Server/src/Room.java index e90fc1e..ab887b8 100644 --- a/Server/src/Room.java +++ b/Server/src/Room.java @@ -273,7 +273,7 @@ public class Room try { //sends the inital message to the player - players[j].output.write(new byte[]{1, 1, (byte) startPositions[k].x, (byte) startPositions[k].y, (byte) startPositions[k].z, (byte) k, 0, 0, 0, 0}); + players[j].output.write(new byte[]{1, 1, (byte) startPositions[k].x, (byte) startPositions[k].y, (byte) startPositions[k].z, (byte) k, 0, 0, 0, (byte)players[k].characterID}); //sends the name of the player (ASCII encoding)............................................................................ byte[] name = players[k].name.substring(0, 8).getBytes(StandardCharsets.US_ASCII); @@ -298,7 +298,7 @@ public class Room { try { - players[j].output.write(new byte[]{1, 0, (byte) startPositions[k].x, (byte) startPositions[k].y, (byte) startPositions[k].z, (byte) k, 0, 0, 0, 0}); + players[j].output.write(new byte[]{1, 0, (byte) startPositions[k].x, (byte) startPositions[k].y, (byte) startPositions[k].z, (byte) k, 0, 0, 0, (byte)players[k].characterID}); byte[] name = players[k].name.substring(0, 8).getBytes(StandardCharsets.US_ASCII); byte[] send = new byte[10]; send[0] = 5; diff --git a/Server/src/Server.java b/Server/src/Server.java index ca1bf42..bfb8037 100644 --- a/Server/src/Server.java +++ b/Server/src/Server.java @@ -134,11 +134,15 @@ public class Server String name = new String(readData, StandardCharsets.US_ASCII); name = name.replace("?", " "); + input.read(readData); + + int characterID = readData[0]; + //check if the room exists if (rooms.containsKey(roomCode)) { //create the reference to the client - Client client1 = new Client(output, input, client, name); + Client client1 = new Client(output, input, client, name, characterID); //move the client to the room rooms.get(roomCode).addClient(client1);