From 527f0993d6dbde73d68faed234c10aafd086b8c5 Mon Sep 17 00:00:00 2001 From: kimura Date: Fri, 3 Jun 2022 18:23:03 +0900 Subject: [PATCH] =?UTF-8?q?=E3=82=A2=E3=83=8B=E3=83=A1=E3=83=BC=E3=82=B7?= =?UTF-8?q?=E3=83=A7=E3=83=B3=E8=AA=BF=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Animation/MaterialDirecting_Seasoning_Salt.anim | 2 +- .../Resource/Animation/material_BlackPepper.controller | 2 +- .../Resource/Animation/material_GratedCheese.controller | 2 +- .../Resource/Animation/material_GreenLaver.controller | 2 +- .../Assets/MyGame/Resource/Animation/material_Matcha.anim | 2 +- .../MyGame/Resource/Animation/material_Matcha.controller | 2 +- .../Resource/Animation/material_SkimSilk.controller | 2 +- .../Resource/Animation/material_SoySauce.controller | 2 +- .../Resource/Animation/material_StrawberryPowder.anim | 2 +- .../Animation/material_StrawberryPowder.controller | 2 +- .../Resource/Animation/material_caramel&butter.controller | 2 +- .../Resource/Animation/material_chocolate.controller | 2 +- .../Assets/MyGame/Resource/Animation/material_honey.anim | 2 +- .../MyGame/Resource/Animation/material_honey.controller | 2 +- .../MyGame/Resource/Animation/material_salt.controller | 8 ++++---- 15 files changed, 18 insertions(+), 18 deletions(-) diff --git a/popcorn/Assets/MyGame/Resource/Animation/MaterialDirecting_Seasoning_Salt.anim b/popcorn/Assets/MyGame/Resource/Animation/MaterialDirecting_Seasoning_Salt.anim index b0af1786..894a854d 100644 --- a/popcorn/Assets/MyGame/Resource/Animation/MaterialDirecting_Seasoning_Salt.anim +++ b/popcorn/Assets/MyGame/Resource/Animation/MaterialDirecting_Seasoning_Salt.anim @@ -234,7 +234,7 @@ AnimationClip: m_Level: 0 m_CycleOffset: 0 m_HasAdditiveReferencePose: 0 - m_LoopTime: 1 + m_LoopTime: 0 m_LoopBlend: 0 m_LoopBlendOrientation: 0 m_LoopBlendPositionY: 0 diff --git a/popcorn/Assets/MyGame/Resource/Animation/material_BlackPepper.controller b/popcorn/Assets/MyGame/Resource/Animation/material_BlackPepper.controller index 9129a6a6..181e659b 100644 --- a/popcorn/Assets/MyGame/Resource/Animation/material_BlackPepper.controller +++ b/popcorn/Assets/MyGame/Resource/Animation/material_BlackPepper.controller @@ -7,7 +7,7 @@ AnimatorState: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: material_BlackPepper + m_Name: Effect m_Speed: 1 m_CycleOffset: 0 m_Transitions: [] diff --git a/popcorn/Assets/MyGame/Resource/Animation/material_GratedCheese.controller b/popcorn/Assets/MyGame/Resource/Animation/material_GratedCheese.controller index c96f204b..4610d6d7 100644 --- a/popcorn/Assets/MyGame/Resource/Animation/material_GratedCheese.controller +++ b/popcorn/Assets/MyGame/Resource/Animation/material_GratedCheese.controller @@ -7,7 +7,7 @@ AnimatorState: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: material_GratedCheese + m_Name: Effect m_Speed: 1 m_CycleOffset: 0 m_Transitions: [] diff --git a/popcorn/Assets/MyGame/Resource/Animation/material_GreenLaver.controller b/popcorn/Assets/MyGame/Resource/Animation/material_GreenLaver.controller index 555b544d..38f420dd 100644 --- a/popcorn/Assets/MyGame/Resource/Animation/material_GreenLaver.controller +++ b/popcorn/Assets/MyGame/Resource/Animation/material_GreenLaver.controller @@ -81,7 +81,7 @@ AnimatorState: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: material_GreenLaver + m_Name: Effect m_Speed: 1 m_CycleOffset: 0 m_Transitions: [] diff --git a/popcorn/Assets/MyGame/Resource/Animation/material_Matcha.anim b/popcorn/Assets/MyGame/Resource/Animation/material_Matcha.anim index 86b06225..fe05094e 100644 --- a/popcorn/Assets/MyGame/Resource/Animation/material_Matcha.anim +++ b/popcorn/Assets/MyGame/Resource/Animation/material_Matcha.anim @@ -450,7 +450,7 @@ AnimationClip: m_Level: 0 m_CycleOffset: 0 m_HasAdditiveReferencePose: 0 - m_LoopTime: 1 + m_LoopTime: 0 m_LoopBlend: 0 m_LoopBlendOrientation: 0 m_LoopBlendPositionY: 0 diff --git a/popcorn/Assets/MyGame/Resource/Animation/material_Matcha.controller b/popcorn/Assets/MyGame/Resource/Animation/material_Matcha.controller index 91c8afb9..1353518c 100644 --- a/popcorn/Assets/MyGame/Resource/Animation/material_Matcha.controller +++ b/popcorn/Assets/MyGame/Resource/Animation/material_Matcha.controller @@ -109,7 +109,7 @@ AnimatorState: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: material_Matcha + m_Name: Effect m_Speed: 1 m_CycleOffset: 0 m_Transitions: [] diff --git a/popcorn/Assets/MyGame/Resource/Animation/material_SkimSilk.controller b/popcorn/Assets/MyGame/Resource/Animation/material_SkimSilk.controller index c66cdf12..a50639cc 100644 --- a/popcorn/Assets/MyGame/Resource/Animation/material_SkimSilk.controller +++ b/popcorn/Assets/MyGame/Resource/Animation/material_SkimSilk.controller @@ -61,7 +61,7 @@ AnimatorState: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: material_SkimSilk + m_Name: Effect m_Speed: 1 m_CycleOffset: 0 m_Transitions: [] diff --git a/popcorn/Assets/MyGame/Resource/Animation/material_SoySauce.controller b/popcorn/Assets/MyGame/Resource/Animation/material_SoySauce.controller index bf0b3ebf..e5ec8d50 100644 --- a/popcorn/Assets/MyGame/Resource/Animation/material_SoySauce.controller +++ b/popcorn/Assets/MyGame/Resource/Animation/material_SoySauce.controller @@ -7,7 +7,7 @@ AnimatorState: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: material_SoySauce + m_Name: Effect m_Speed: 1 m_CycleOffset: 0 m_Transitions: [] diff --git a/popcorn/Assets/MyGame/Resource/Animation/material_StrawberryPowder.anim b/popcorn/Assets/MyGame/Resource/Animation/material_StrawberryPowder.anim index db878b0b..0207ea81 100644 --- a/popcorn/Assets/MyGame/Resource/Animation/material_StrawberryPowder.anim +++ b/popcorn/Assets/MyGame/Resource/Animation/material_StrawberryPowder.anim @@ -322,7 +322,7 @@ AnimationClip: m_Level: 0 m_CycleOffset: 0 m_HasAdditiveReferencePose: 0 - m_LoopTime: 1 + m_LoopTime: 0 m_LoopBlend: 0 m_LoopBlendOrientation: 0 m_LoopBlendPositionY: 0 diff --git a/popcorn/Assets/MyGame/Resource/Animation/material_StrawberryPowder.controller b/popcorn/Assets/MyGame/Resource/Animation/material_StrawberryPowder.controller index 73fec32f..59a1a40d 100644 --- a/popcorn/Assets/MyGame/Resource/Animation/material_StrawberryPowder.controller +++ b/popcorn/Assets/MyGame/Resource/Animation/material_StrawberryPowder.controller @@ -55,7 +55,7 @@ AnimatorState: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: material_StrawberryPowder + m_Name: Effect m_Speed: 1 m_CycleOffset: 0 m_Transitions: [] diff --git a/popcorn/Assets/MyGame/Resource/Animation/material_caramel&butter.controller b/popcorn/Assets/MyGame/Resource/Animation/material_caramel&butter.controller index b2c4f055..adf02f27 100644 --- a/popcorn/Assets/MyGame/Resource/Animation/material_caramel&butter.controller +++ b/popcorn/Assets/MyGame/Resource/Animation/material_caramel&butter.controller @@ -61,7 +61,7 @@ AnimatorState: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: material_caramel&butter + m_Name: Effect m_Speed: 1 m_CycleOffset: 0 m_Transitions: [] diff --git a/popcorn/Assets/MyGame/Resource/Animation/material_chocolate.controller b/popcorn/Assets/MyGame/Resource/Animation/material_chocolate.controller index 36118654..73a3fff7 100644 --- a/popcorn/Assets/MyGame/Resource/Animation/material_chocolate.controller +++ b/popcorn/Assets/MyGame/Resource/Animation/material_chocolate.controller @@ -57,7 +57,7 @@ AnimatorState: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: material_chocolate + m_Name: Effect m_Speed: 1 m_CycleOffset: 0 m_Transitions: [] diff --git a/popcorn/Assets/MyGame/Resource/Animation/material_honey.anim b/popcorn/Assets/MyGame/Resource/Animation/material_honey.anim index eecd9293..dc3568fc 100644 --- a/popcorn/Assets/MyGame/Resource/Animation/material_honey.anim +++ b/popcorn/Assets/MyGame/Resource/Animation/material_honey.anim @@ -833,7 +833,7 @@ AnimationClip: m_Level: 0 m_CycleOffset: 0 m_HasAdditiveReferencePose: 0 - m_LoopTime: 1 + m_LoopTime: 0 m_LoopBlend: 0 m_LoopBlendOrientation: 0 m_LoopBlendPositionY: 0 diff --git a/popcorn/Assets/MyGame/Resource/Animation/material_honey.controller b/popcorn/Assets/MyGame/Resource/Animation/material_honey.controller index a21f5fee..54991d66 100644 --- a/popcorn/Assets/MyGame/Resource/Animation/material_honey.controller +++ b/popcorn/Assets/MyGame/Resource/Animation/material_honey.controller @@ -55,7 +55,7 @@ AnimatorState: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: material_honey + m_Name: Effect m_Speed: 1 m_CycleOffset: 0 m_Transitions: [] diff --git a/popcorn/Assets/MyGame/Resource/Animation/material_salt.controller b/popcorn/Assets/MyGame/Resource/Animation/material_salt.controller index f8b3c927..d84acbe2 100644 --- a/popcorn/Assets/MyGame/Resource/Animation/material_salt.controller +++ b/popcorn/Assets/MyGame/Resource/Animation/material_salt.controller @@ -37,13 +37,13 @@ AnimatorStateMachine: m_ChildStates: - serializedVersion: 1 m_State: {fileID: 4553817119623703275} - m_Position: {x: 200, y: 0, z: 0} + m_Position: {x: 300, y: 60, z: 0} - serializedVersion: 1 m_State: {fileID: -5292140600084145523} - m_Position: {x: 240, y: 60, z: 0} + m_Position: {x: 340, y: 140, z: 0} - serializedVersion: 1 m_State: {fileID: 1246927147831885679} - m_Position: {x: 270, y: 130, z: 0} + m_Position: {x: 280, y: -10, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: [] m_EntryTransitions: [] @@ -83,7 +83,7 @@ AnimatorState: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: MaterialDirecting_Seasoning_Salt + m_Name: Effect m_Speed: 1 m_CycleOffset: 0 m_Transitions: []