Commit 5c9ebc89 authored by KenzyAshour2's avatar KenzyAshour2

finished banana scene and the apple scene

parent 68afdd11
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1101 &-8939975362573032735
AnimatorStateTransition:
--- !u!1102 &-5656800004592474614
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions:
- m_ConditionMode: 1
m_ConditionEvent: Cut
m_EventTreshold: 0
- m_ConditionMode: 1
m_ConditionEvent: Eat
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 3036579087346775312}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.25
m_TransitionOffset: 0
m_ExitTime: 0.9166667
m_HasExitTime: 0
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1102 &-5656800004592474614
m_Name: metarig|Idle
m_Speed: 1
m_CycleOffset: 0
m_Transitions:
- {fileID: -3633853428949304950}
- {fileID: -2657926775319273014}
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: -5324238279805231817, guid: de76d67d0ab88dc439b10b32370775ea,
type: 3}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1102 &-4020391940991724357
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: metarig|Idle
m_Name: Cut
m_Speed: 1
m_CycleOffset: 0
m_Transitions:
- {fileID: -8939975362573032735}
- {fileID: 7076688798185116210}
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
......@@ -49,31 +50,34 @@ AnimatorState:
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: -5324238279805231817, guid: de76d67d0ab88dc439b10b32370775ea,
m_Motion: {fileID: -203655887218126122, guid: 54b8af34d6d9f2b4b95b7f1525b5b698,
type: 3}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1101 &-4452572215727776319
--- !u!1101 &-3633853428949304950
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions: []
m_Conditions:
- m_ConditionMode: 1
m_ConditionEvent: Cut
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: -5656800004592474614}
m_DstState: {fileID: -4020391940991724357}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.25
m_TransitionOffset: 0
m_ExitTime: 0.93303573
m_HasExitTime: 1
m_ExitTime: 0.9166667
m_HasExitTime: 0
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
......@@ -89,10 +93,13 @@ AnimatorStateMachine:
m_ChildStates:
- serializedVersion: 1
m_State: {fileID: -5656800004592474614}
m_Position: {x: 340, y: 150, z: 0}
m_Position: {x: 330, y: 300, z: 0}
- serializedVersion: 1
m_State: {fileID: -4020391940991724357}
m_Position: {x: 350, y: 130, z: 0}
- serializedVersion: 1
m_State: {fileID: 3036579087346775312}
m_Position: {x: 320, y: 50, z: 0}
m_State: {fileID: -675413817306232560}
m_Position: {x: 550, y: 220, z: 0}
m_ChildStateMachines: []
m_AnyStateTransitions: []
m_EntryTransitions: []
......@@ -103,6 +110,81 @@ AnimatorStateMachine:
m_ExitPosition: {x: 800, y: 120, z: 0}
m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
m_DefaultState: {fileID: -5656800004592474614}
--- !u!1101 &-2657926775319273014
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions:
- m_ConditionMode: 1
m_ConditionEvent: Eat
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: -675413817306232560}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.25
m_TransitionOffset: 0
m_ExitTime: 0.9166667
m_HasExitTime: 0
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1101 &-2022502464859050187
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: -5656800004592474614}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.25
m_TransitionOffset: 0
m_ExitTime: 0.9013158
m_HasExitTime: 1
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1102 &-675413817306232560
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: mixamo_com
m_Speed: 1
m_CycleOffset: 0
m_Transitions:
- {fileID: -2022502464859050187}
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: -203655887218126122, guid: 9c4a7f8f00bf7374488173bdf0895e7b,
type: 3}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!91 &9100000
AnimatorController:
m_ObjectHideFlags: 0
......@@ -137,31 +219,25 @@ AnimatorController:
m_IKPass: 0
m_SyncedLayerAffectsTiming: 0
m_Controller: {fileID: 9100000}
--- !u!1102 &3036579087346775312
AnimatorState:
serializedVersion: 6
--- !u!1101 &7076688798185116210
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: mixamo_com
m_Speed: 1
m_CycleOffset: 0
m_Transitions:
- {fileID: -4452572215727776319}
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: -203655887218126122, guid: 54b8af34d6d9f2b4b95b7f1525b5b698,
type: 3}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
m_Name:
m_Conditions: []
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: -5656800004592474614}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.25
m_TransitionOffset: 0
m_ExitTime: 0.93303573
m_HasExitTime: 1
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
This diff is collapsed.
fileFormatVersion: 2
guid: 70c87c53dda1cc048acb7bb395470ece
MonoImporter:
guid: d56ecedfe4a647b4897f9c844c8a242c
PrefabImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
......@@ -32149,7 +32149,8 @@ PrefabInstance:
value: 1
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_RemovedGameObjects:
- {fileID: 1030985946, guid: abc00000000002083595614244433792, type: 3}
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: abc00000000002083595614244433792, type: 3}
......@@ -16155,7 +16155,8 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
animator: {fileID: 751560028}
eatSound: {fileID: 8300000, guid: ca9e527ec1269d14789d63e00580c141, type: 3}
soundEffect: {fileID: 8300000, guid: ca9e527ec1269d14789d63e00580c141, type: 3}
animationTriggerName: Eat
onClick:
m_PersistentCalls:
m_Calls:
......@@ -32122,7 +32123,8 @@ PrefabInstance:
value: 1
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_RemovedGameObjects:
- {fileID: 1030985946, guid: abc00000000002083595614244433792, type: 3}
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: abc00000000002083595614244433792, type: 3}
......@@ -41269,6 +41271,11 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 581083644411005233, guid: 7d67ac5cfda0b944580afbed7561ec82,
type: 3}
propertyPath: animator
value:
objectReference: {fileID: 751560028}
- target: {fileID: 4882481920500871233, guid: 7d67ac5cfda0b944580afbed7561ec82,
type: 3}
propertyPath: m_LocalScale.x
......@@ -41339,9 +41346,11 @@ PrefabInstance:
propertyPath: m_Name
value: Peasant Nolant Green(Free Version)
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedComponents:
- {fileID: 581083644411005233, guid: 7d67ac5cfda0b944580afbed7561ec82, type: 3}
m_RemovedGameObjects:
- {fileID: 4392110915302834388, guid: 7d67ac5cfda0b944580afbed7561ec82, type: 3}
- {fileID: 4389815541730414224, guid: 7d67ac5cfda0b944580afbed7561ec82, type: 3}
m_AddedGameObjects:
- targetCorrespondingSourceObject: {fileID: 3316999126745487271, guid: 7d67ac5cfda0b944580afbed7561ec82,
type: 3}
This diff is collapsed.
fileFormatVersion: 2
guid: 9b29499a7c371ce4a94dc6f508a3128a
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
......@@ -15801,7 +15801,7 @@ PrefabInstance:
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 2045524333}
m_TransformParent: {fileID: 1610124913}
m_Modifications:
- target: {fileID: 126886, guid: bf8fa835e0d27434c81b42db21ae1aba, type: 3}
propertyPath: m_Name
......@@ -15813,43 +15813,43 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 442322, guid: bf8fa835e0d27434c81b42db21ae1aba, type: 3}
propertyPath: m_LocalScale.x
value: 0.00085604447
value: 0.0008560444
objectReference: {fileID: 0}
- target: {fileID: 442322, guid: bf8fa835e0d27434c81b42db21ae1aba, type: 3}
propertyPath: m_LocalScale.y
value: 0.00085604435
value: 0.0008560445
objectReference: {fileID: 0}
- target: {fileID: 442322, guid: bf8fa835e0d27434c81b42db21ae1aba, type: 3}
propertyPath: m_LocalScale.z
value: 0.0008560439
value: 0.000856044
objectReference: {fileID: 0}
- target: {fileID: 442322, guid: bf8fa835e0d27434c81b42db21ae1aba, type: 3}
propertyPath: m_LocalPosition.x
value: 0.0009517493
value: 0.000983718
objectReference: {fileID: 0}
- target: {fileID: 442322, guid: bf8fa835e0d27434c81b42db21ae1aba, type: 3}
propertyPath: m_LocalPosition.y
value: 0.000066605186
value: 0.0000720054
objectReference: {fileID: 0}
- target: {fileID: 442322, guid: bf8fa835e0d27434c81b42db21ae1aba, type: 3}
propertyPath: m_LocalPosition.z
value: -0.000017878565
value: -0.000024411594
objectReference: {fileID: 0}
- target: {fileID: 442322, guid: bf8fa835e0d27434c81b42db21ae1aba, type: 3}
propertyPath: m_LocalRotation.w
value: -0.6592133
value: -0.72043306
objectReference: {fileID: 0}
- target: {fileID: 442322, guid: bf8fa835e0d27434c81b42db21ae1aba, type: 3}
propertyPath: m_LocalRotation.x
value: -0.54537034
value: -0.5884149
objectReference: {fileID: 0}
- target: {fileID: 442322, guid: bf8fa835e0d27434c81b42db21ae1aba, type: 3}
propertyPath: m_LocalRotation.y
value: 0.2939182
value: 0.19409145
objectReference: {fileID: 0}
- target: {fileID: 442322, guid: bf8fa835e0d27434c81b42db21ae1aba, type: 3}
propertyPath: m_LocalRotation.z
value: 0.42617035
value: 0.31156492
objectReference: {fileID: 0}
- target: {fileID: 442322, guid: bf8fa835e0d27434c81b42db21ae1aba, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
......@@ -16239,7 +16239,8 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
animator: {fileID: 751560028}
eatSound: {fileID: 8300000, guid: a6ca47ffdb3a7db4694de89bee87e3cc, type: 3}
soundEffect: {fileID: 0}
animationTriggerName:
onClick:
m_PersistentCalls:
m_Calls:
......@@ -33725,6 +33726,12 @@ Transform:
type: 3}
m_PrefabInstance: {fileID: 1608977376}
m_PrefabAsset: {fileID: 0}
--- !u!4 &1610124913 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 3524842002473181899, guid: 7d67ac5cfda0b944580afbed7561ec82,
type: 3}
m_PrefabInstance: {fileID: 1940409799}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &1619252962
PrefabInstance:
m_ObjectHideFlags: 0
......@@ -41278,6 +41285,61 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 581083644411005233, guid: 7d67ac5cfda0b944580afbed7561ec82,
type: 3}
propertyPath: animator
value:
objectReference: {fileID: 751560028}
- target: {fileID: 581083644411005233, guid: 7d67ac5cfda0b944580afbed7561ec82,
type: 3}
propertyPath: soundEffect
value:
objectReference: {fileID: 8300000, guid: a6ca47ffdb3a7db4694de89bee87e3cc, type: 3}
- target: {fileID: 581083644411005233, guid: 7d67ac5cfda0b944580afbed7561ec82,
type: 3}
propertyPath: animationTriggerName
value: Eat
objectReference: {fileID: 0}
- target: {fileID: 581083644411005233, guid: 7d67ac5cfda0b944580afbed7561ec82,
type: 3}
propertyPath: onClick.m_PersistentCalls.m_Calls.Array.size
value: 1
objectReference: {fileID: 0}
- target: {fileID: 581083644411005233, guid: 7d67ac5cfda0b944580afbed7561ec82,
type: 3}
propertyPath: onClick.m_PersistentCalls.m_Calls.Array.data[0].m_Mode
value: 6
objectReference: {fileID: 0}
- target: {fileID: 581083644411005233, guid: 7d67ac5cfda0b944580afbed7561ec82,
type: 3}
propertyPath: onClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
value:
objectReference: {fileID: 1531035744}
- target: {fileID: 581083644411005233, guid: 7d67ac5cfda0b944580afbed7561ec82,
type: 3}
propertyPath: onClick.m_PersistentCalls.m_Calls.Array.data[0].m_CallState
value: 2
objectReference: {fileID: 0}
- target: {fileID: 581083644411005233, guid: 7d67ac5cfda0b944580afbed7561ec82,
type: 3}
propertyPath: onClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
value: SetActive
objectReference: {fileID: 0}
- target: {fileID: 581083644411005233, guid: 7d67ac5cfda0b944580afbed7561ec82,
type: 3}
propertyPath: onClick.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName
value: UnityEngine.GameObject, UnityEngine
objectReference: {fileID: 0}
- target: {fileID: 581083644411005233, guid: 7d67ac5cfda0b944580afbed7561ec82,
type: 3}
propertyPath: onClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_BoolArgument
value: 1
objectReference: {fileID: 0}
- target: {fileID: 581083644411005233, guid: 7d67ac5cfda0b944580afbed7561ec82,
type: 3}
propertyPath: onClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName
value: UnityEngine.Object, UnityEngine
objectReference: {fileID: 0}
- target: {fileID: 4882481920500871233, guid: 7d67ac5cfda0b944580afbed7561ec82,
type: 3}
propertyPath: m_LocalScale.x
......@@ -41351,10 +41413,11 @@ PrefabInstance:
m_RemovedComponents: []
m_RemovedGameObjects:
- {fileID: 4392110915302834388, guid: 7d67ac5cfda0b944580afbed7561ec82, type: 3}
- {fileID: 4389815541730414224, guid: 7d67ac5cfda0b944580afbed7561ec82, type: 3}
m_AddedGameObjects:
- targetCorrespondingSourceObject: {fileID: 3316999126745487271, guid: 7d67ac5cfda0b944580afbed7561ec82,
- targetCorrespondingSourceObject: {fileID: 3524842002473181899, guid: 7d67ac5cfda0b944580afbed7561ec82,
type: 3}
insertIndex: -1
insertIndex: 0
addedObject: {fileID: 730728244}
m_AddedComponents:
- targetCorrespondingSourceObject: {fileID: 5226954981596785403, guid: 7d67ac5cfda0b944580afbed7561ec82,
......@@ -44373,12 +44436,6 @@ Transform:
m_Children: []
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &2045524333 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 3316999126745487271, guid: 7d67ac5cfda0b944580afbed7561ec82,
type: 3}
m_PrefabInstance: {fileID: 1940409799}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &2045878014
PrefabInstance:
m_ObjectHideFlags: 0
This diff is collapsed.
using UnityEngine;
using DG.Tweening;
using UnityEngine.Events;
public class CharacterInteraction : MonoBehaviour
{
[SerializeField] private Animator animator;
[SerializeField] private AudioClip eatSound;
[SerializeField] private AudioClip soundEffect;
[SerializeField] private string animationTriggerName;
[SerializeField] private UnityEvent onClick;
private void OnMouseDown()
{
animator.SetTrigger("Eat");
if (animator != null)
{
animator.SetTrigger(animationTriggerName);
}
if (AudioManager.Instance != null)
{
AudioManager.Instance.PlaySound(eatSound);
AudioManager.Instance.PlaySound(soundEffect);
}
onClick?.Invoke();
}
......
using UnityEngine;
using DG.Tweening;
using UnityEngine.Events;
public class CharacterInteraction1 : MonoBehaviour
{
[SerializeField] private Animator animator;
[SerializeField] private UnityEvent onClick;
private void OnMouseDown()
{
animator.SetTrigger("Cut");
onClick?.Invoke();
}
}
\ No newline at end of file
fileFormatVersion: 2
guid: 8828d7c910feade4f9548c8ad8353e10
AudioImporter:
externalObjects: {}
serializedVersion: 7
defaultSettings:
serializedVersion: 2
loadType: 0
sampleRateSetting: 0
sampleRateOverride: 44100
compressionFormat: 1
quality: 1
conversionMode: 0
preloadAudioData: 0
platformSettingOverrides: {}
forceToMono: 0
normalize: 1
loadInBackground: 0
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:
......@@ -20,4 +20,13 @@ EditorBuildSettings:
- enabled: 1
path: Assets/Scenes/3dScenebanana3.unity
guid: 154fab0173955b744aee9473e36d4195
- enabled: 1
path: Assets/Scenes/3dSceneApple1.unity
guid: 285a7dd57076f0d4eabb4a1df4250dd9
- enabled: 1
path: Assets/Scenes/3dSceneApple2.unity
guid: 302b8d18b32fd5340a28f80f40c6a271
- enabled: 1
path: Assets/Scenes/3dSceneApple3.unity
guid: 9b29499a7c371ce4a94dc6f508a3128a
m_configObjects: {}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment