diff --git a/unity_Project/Assets/Character/9-10_Character_Animations_01_Clean.fbx.meta b/unity_Project/Assets/Character/9-10_Character_Animations_01_Clean.fbx.meta index 8d8308f..b726dd2 100644 --- a/unity_Project/Assets/Character/9-10_Character_Animations_01_Clean.fbx.meta +++ b/unity_Project/Assets/Character/9-10_Character_Animations_01_Clean.fbx.meta @@ -661,7 +661,7 @@ ModelImporter: - serializedVersion: 16 name: GunForward takeName: Take 001 - firstFrame: 90 + firstFrame: 89 lastFrame: 90 wrapMode: 0 orientationOffsetY: 0 @@ -1090,7 +1090,7 @@ ModelImporter: name: Jump_Hang takeName: Take 001 firstFrame: 115 - lastFrame: 115 + lastFrame: 116 wrapMode: 0 orientationOffsetY: 0 level: 0 @@ -1524,7 +1524,7 @@ ModelImporter: level: 0 cycleOffset: 0 loop: 0 - loopTime: 0 + loopTime: 1 loopBlend: 0 loopBlendOrientation: 0 loopBlendPositionY: 0 @@ -2801,7 +2801,7 @@ ModelImporter: isReadable: 1 meshes: lODScreenPercentages: [] - globalScale: 1 + globalScale: 15 meshCompression: 0 addColliders: 0 importBlendShapes: 1 @@ -2834,10 +2834,8 @@ ModelImporter: legStretch: .0500000007 feetSpacing: 0 rootMotionBoneName: - hasTranslationDoF: 0 lastHumanDescriptionAvatarSource: {instanceID: 0} animationType: 2 - humanoidOversampling: 1 additionalBone: 0 userData: assetBundleName: diff --git a/unity_Project/Assets/Character/Character_Animation.controller b/unity_Project/Assets/Character/Character_Animation.controller index 3295d59..72f0847 100644 Binary files a/unity_Project/Assets/Character/Character_Animation.controller and b/unity_Project/Assets/Character/Character_Animation.controller differ diff --git a/unity_Project/Assets/Textures.meta b/unity_Project/Assets/Textures.meta deleted file mode 100644 index 8915b1d..0000000 --- a/unity_Project/Assets/Textures.meta +++ /dev/null @@ -1,9 +0,0 @@ -fileFormatVersion: 2 -guid: 97def69cc8aa8f0458d67929f23873dd -folderAsset: yes -timeCreated: 1444371283 -licenseType: Free -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/unity_Project/Assets/_Scenes/MainLevel.unity b/unity_Project/Assets/_Scenes/MainLevel.unity index 629e4a2..857165c 100644 Binary files a/unity_Project/Assets/_Scenes/MainLevel.unity and b/unity_Project/Assets/_Scenes/MainLevel.unity differ diff --git a/unity_Project/ProjectSettings/ProjectSettings.asset b/unity_Project/ProjectSettings/ProjectSettings.asset index b274a9a..ac67012 100644 Binary files a/unity_Project/ProjectSettings/ProjectSettings.asset and b/unity_Project/ProjectSettings/ProjectSettings.asset differ diff --git a/unity_Project/ProjectSettings/ProjectVersion.txt b/unity_Project/ProjectSettings/ProjectVersion.txt index e040c5c..8c353d8 100644 --- a/unity_Project/ProjectSettings/ProjectVersion.txt +++ b/unity_Project/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 5.2.0f3 +m_EditorVersion: 5.1.2f1 m_StandardAssetsVersion: 0