yangwu
/
popcorn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

兄弟アニメーション追加

This commit is contained in:
koya_15 2021-09-06 10:08:14 +09:00
parent 3e5ef59b99
commit 384efc96a6
6 changed files with 2712 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
popcorn/Assets/MyGame/Resource/Animation/Brother_pink.anim
View File

@ -1297,6 +1297,25 @@ AnimationClip:
path: AnimationPivot_pink/pink/wing/left
classID: 1
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_IsActive
path: ef_sleepy
classID: 1
script: {fileID: 0}
m_PPtrCurves: []
m_SampleRate: 60
m_WrapMode: 0
@ -1396,6 +1415,13 @@ AnimationClip:
typeID: 1
customType: 0
isPPtrCurve: 0
- serializedVersion: 2
path: 2794634128
attribute: 2086281974
script: {fileID: 0}
typeID: 1
customType: 0
isPPtrCurve: 0
- serializedVersion: 2
path: 3248977737
attribute: 1
@ -4861,6 +4887,25 @@ AnimationClip:
path: AnimationPivot_pink/pink/wing/left
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_IsActive
path: ef_sleepy
classID: 1
script: {fileID: 0}
m_EulerEditorCurves:
- curve:
serializedVersion: 2

29
popcorn/Assets/MyGame/Resource/Animation/Brother_pink.controller
View File

@ -1,5 +1,31 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1102 &-7965284502852626432
AnimatorState:
serializedVersion: 5
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Brother_pink_sleepy
m_Speed: 1
m_CycleOffset: 0
m_Transitions: []
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: 7400000, guid: fa7e2dee1601c8d4dbb49c19a068fade, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1107 &-7087719051262760774
AnimatorStateMachine:
serializedVersion: 5
@ -15,6 +41,9 @@ AnimatorStateMachine:
- serializedVersion: 1
m_State: {fileID: -5731495216582312521}
m_Position: {x: 235, y: 65, z: 0}
- serializedVersion: 1
m_State: {fileID: -7965284502852626432}
m_Position: {x: 270, y: 130, z: 0}
m_ChildStateMachines: []
m_AnyStateTransitions: []
m_EntryTransitions: []

45
popcorn/Assets/MyGame/Resource/Animation/Brother_pink_promotion.anim
View File

@ -640,6 +640,25 @@ AnimationClip:
path: Effect_promotion
classID: 212
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_IsActive
path: ef_sleepy
classID: 1
script: {fileID: 0}
m_PPtrCurves: []
m_SampleRate: 60
m_WrapMode: 0
@ -697,6 +716,13 @@ AnimationClip:
typeID: 212
customType: 0
isPPtrCurve: 0
- serializedVersion: 2
path: 2794634128
attribute: 2086281974
script: {fileID: 0}
typeID: 1
customType: 0
isPPtrCurve: 0
- serializedVersion: 2
path: 3248977737
attribute: 1
@ -2346,6 +2372,25 @@ AnimationClip:
path: AnimationPivot_pink
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_IsActive
path: ef_sleepy
classID: 1
script: {fileID: 0}
m_EulerEditorCurves:
- curve:
serializedVersion: 2

2575
popcorn/Assets/MyGame/Resource/Animation/Brother_pink_sleepy.anim Normal file
View File

File diff suppressed because it is too large Load Diff

8
popcorn/Assets/MyGame/Resource/Animation/Brother_pink_sleepy.anim.meta Normal file
View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: fa7e2dee1601c8d4dbb49c19a068fade
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 7400000
userData:
assetBundleName:
assetBundleVariant:

15
popcorn/Assets/MyGame/Scenes/marketing/marketing.unity
View File

@ -3701,7 +3701,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!4 &1199276395
Transform:
m_ObjectHideFlags: 0
@ -3710,7 +3710,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1199276394}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 1.5, z: 0}
m_LocalPosition: {x: 0, y: 1.34, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 668553843}
@ -11778,6 +11778,11 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 1749782974}
m_Modifications:
- target: {fileID: 367109441966676174, guid: 6fd79f86d9650b04d9580c9b3838be34,
type: 3}
propertyPath: m_SortingOrder
value: 30
objectReference: {fileID: 0}
- target: {fileID: 5241948539216047732, guid: 6fd79f86d9650b04d9580c9b3838be34,
type: 3}
propertyPath: m_RootOrder
@ -11786,17 +11791,17 @@ PrefabInstance:
- target: {fileID: 5241948539216047732, guid: 6fd79f86d9650b04d9580c9b3838be34,
type: 3}
propertyPath: m_LocalPosition.x
value: 0
value: 0.25
objectReference: {fileID: 0}
- target: {fileID: 5241948539216047732, guid: 6fd79f86d9650b04d9580c9b3838be34,
type: 3}
propertyPath: m_LocalPosition.y
value: 0
value: 0.73
objectReference: {fileID: 0}
- target: {fileID: 5241948539216047732, guid: 6fd79f86d9650b04d9580c9b3838be34,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
value: -0.05
objectReference: {fileID: 0}
- target: {fileID: 5241948539216047732, guid: 6fd79f86d9650b04d9580c9b3838be34,
type: 3}