diff --git a/Assets/Prefabs/Art3D/Character.prefab b/Assets/Prefabs/Art3D/Character.prefab index 8a65645..af0e113 100644 --- a/Assets/Prefabs/Art3D/Character.prefab +++ b/Assets/Prefabs/Art3D/Character.prefab @@ -29,10 +29,10 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 706957102024296084} + - {fileID: 3763190728227356656} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1001 &1028268498706784639 +--- !u!1001 &3725377916057786395 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 @@ -40,85 +40,69 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 6812304174526681661} m_Modifications: - - target: {fileID: -9041317220418388901, guid: 5360f0c79ef63c048af55ea29d3be3aa, - type: 3} - propertyPath: m_Materials.Array.data[0] - value: - objectReference: {fileID: 2100000, guid: c416f83c5071bba478c6762cda95ecca, type: 2} - - target: {fileID: -9041317220418388901, guid: 5360f0c79ef63c048af55ea29d3be3aa, - type: 3} - propertyPath: m_Materials.Array.data[1] - value: - objectReference: {fileID: 2100000, guid: c50db264a5686ed418b4821b21fa533f, type: 2} - - target: {fileID: -9041317220418388901, guid: 5360f0c79ef63c048af55ea29d3be3aa, - type: 3} - propertyPath: m_Materials.Array.data[2] - value: - objectReference: {fileID: 2100000, guid: 772f79a46fd28d844bd98c93f10436b0, type: 2} - - target: {fileID: -8679921383154817045, guid: 5360f0c79ef63c048af55ea29d3be3aa, + - target: {fileID: -8679921383154817045, guid: a5e9b155d3591d148a80b7c45f032f9f, type: 3} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 5360f0c79ef63c048af55ea29d3be3aa, + - target: {fileID: -8679921383154817045, guid: a5e9b155d3591d148a80b7c45f032f9f, type: 3} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 5360f0c79ef63c048af55ea29d3be3aa, + - target: {fileID: -8679921383154817045, guid: a5e9b155d3591d148a80b7c45f032f9f, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 5360f0c79ef63c048af55ea29d3be3aa, + - target: {fileID: -8679921383154817045, guid: a5e9b155d3591d148a80b7c45f032f9f, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 5360f0c79ef63c048af55ea29d3be3aa, + - target: {fileID: -8679921383154817045, guid: a5e9b155d3591d148a80b7c45f032f9f, type: 3} propertyPath: m_LocalRotation.x value: -0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 5360f0c79ef63c048af55ea29d3be3aa, + - target: {fileID: -8679921383154817045, guid: a5e9b155d3591d148a80b7c45f032f9f, type: 3} propertyPath: m_LocalRotation.y value: -0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 5360f0c79ef63c048af55ea29d3be3aa, + - target: {fileID: -8679921383154817045, guid: a5e9b155d3591d148a80b7c45f032f9f, type: 3} propertyPath: m_LocalRotation.z value: -0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 5360f0c79ef63c048af55ea29d3be3aa, + - target: {fileID: -8679921383154817045, guid: a5e9b155d3591d148a80b7c45f032f9f, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 5360f0c79ef63c048af55ea29d3be3aa, + - target: {fileID: -8679921383154817045, guid: a5e9b155d3591d148a80b7c45f032f9f, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 5360f0c79ef63c048af55ea29d3be3aa, + - target: {fileID: -8679921383154817045, guid: a5e9b155d3591d148a80b7c45f032f9f, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 919132149155446097, guid: 5360f0c79ef63c048af55ea29d3be3aa, + - target: {fileID: 919132149155446097, guid: a5e9b155d3591d148a80b7c45f032f9f, type: 3} propertyPath: m_Name - value: Character_V001 + value: Character_V002 objectReference: {fileID: 0} m_RemovedComponents: [] - m_RemovedGameObjects: - - {fileID: -8391222552659086748, guid: 5360f0c79ef63c048af55ea29d3be3aa, type: 3} + m_RemovedGameObjects: [] m_AddedGameObjects: [] m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 5360f0c79ef63c048af55ea29d3be3aa, type: 3} ---- !u!4 &706957102024296084 stripped + m_SourcePrefab: {fileID: 100100000, guid: a5e9b155d3591d148a80b7c45f032f9f, type: 3} +--- !u!4 &3763190728227356656 stripped Transform: - m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 5360f0c79ef63c048af55ea29d3be3aa, + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: a5e9b155d3591d148a80b7c45f032f9f, type: 3} - m_PrefabInstance: {fileID: 1028268498706784639} + m_PrefabInstance: {fileID: 3725377916057786395} m_PrefabAsset: {fileID: 0} diff --git a/Assets/Tmp/Character/Character_V001.controller b/Assets/Tmp/Character/Character_V001.controller deleted file mode 100644 index bb19e54..0000000 --- a/Assets/Tmp/Character/Character_V001.controller +++ /dev/null @@ -1,43 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!91 &9100000 -AnimatorController: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Character_V001 - serializedVersion: 5 - m_AnimatorParameters: [] - m_AnimatorLayers: - - serializedVersion: 5 - m_Name: Base Layer - m_StateMachine: {fileID: 593256987451643658} - 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!1107 &593256987451643658 -AnimatorStateMachine: - serializedVersion: 6 - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Base Layer - m_ChildStates: [] - 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: 0} diff --git a/Assets/Tmp/Character/Character_V001.controller.meta b/Assets/Tmp/Character/Character_V001.controller.meta deleted file mode 100644 index cc64214..0000000 --- a/Assets/Tmp/Character/Character_V001.controller.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: c901c9a361bf7ea46af244b1fd21dc33 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 9100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Tmp/Character/Character_V001.fbx b/Assets/Tmp/Character/Character_V001.fbx deleted file mode 100644 index d5761b9..0000000 Binary files a/Assets/Tmp/Character/Character_V001.fbx and /dev/null differ diff --git a/Assets/Tmp/Character/Character_V002.fbx b/Assets/Tmp/Character/Character_V002.fbx new file mode 100644 index 0000000..2737885 Binary files /dev/null and b/Assets/Tmp/Character/Character_V002.fbx differ diff --git a/Assets/Tmp/Character/Character_V001.fbx.meta b/Assets/Tmp/Character/Character_V002.fbx.meta similarity index 98% rename from Assets/Tmp/Character/Character_V001.fbx.meta rename to Assets/Tmp/Character/Character_V002.fbx.meta index 92a2904..f5679c1 100644 --- a/Assets/Tmp/Character/Character_V001.fbx.meta +++ b/Assets/Tmp/Character/Character_V002.fbx.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 5360f0c79ef63c048af55ea29d3be3aa +guid: a5e9b155d3591d148a80b7c45f032f9f ModelImporter: serializedVersion: 22200 internalIDToNameTable: []