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

Merge remote-tracking branch 'origin/feture/update_ver1.1.0' into feture/update_ver1.1.0

This commit is contained in:
kimura 2022-02-07 13:12:28 +09:00
parent c4939ba828 96c09cdc70
commit 8d7be09a89
4 changed files with 1256 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,31 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1102 &-8472486010882271892
AnimatorState:
serializedVersion: 5
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: customer_nomal_stay_front
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: 48736c9bfe2979144a5d8c97fa5bc336, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1101 &-8401196184388869647
AnimatorStateTransition:
m_ObjectHideFlags: 1
@ -353,6 +379,9 @@ AnimatorStateMachine:
- serializedVersion: 1
m_State: {fileID: 6535728550172591273}
m_Position: {x: 570, y: 360, z: 0}
- serializedVersion: 1
m_State: {fileID: -8472486010882271892}
m_Position: {x: 605, y: 425, z: 0}
m_ChildStateMachines: []
m_AnyStateTransitions:
- {fileID: 3241850798776372350}

1213
popcorn/Assets/MyGame/Resource/Animation/customer_nomal_stay_front.anim Normal file
View File

File diff suppressed because it is too large Load Diff

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

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

12
popcorn/Assets/MyGame/Resources/Avatars/customer_Luxury_Gray.prefab
View File

@ -1275,18 +1275,18 @@ Transform:
type: 3}
m_PrefabInstance: {fileID: 6244917521789390651}
m_PrefabAsset: {fileID: 0}
--- !u!4 &8476357287308305102 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 2524396702732955125, guid: 8c6dcd9482c51504e89ba42234369eda,
type: 3}
m_PrefabInstance: {fileID: 6244917521789390651}
m_PrefabAsset: {fileID: 0}
--- !u!4 &8476357289219494445 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 2524396703577414934, guid: 8c6dcd9482c51504e89ba42234369eda,
type: 3}
m_PrefabInstance: {fileID: 6244917521789390651}
m_PrefabAsset: {fileID: 0}
--- !u!4 &8476357287308305102 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 2524396702732955125, guid: 8c6dcd9482c51504e89ba42234369eda,
type: 3}
m_PrefabInstance: {fileID: 6244917521789390651}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &6601841578865518209
PrefabInstance:
m_ObjectHideFlags: 0