浏览代码

Updated Alert animation and clean up branch

/main
treivize 4 年前
当前提交
e9e05bd8
共有 9 个文件被更改,包括 593 次插入775 次删除
  1. 10
      UOP1_Project/Assets/Art/Characters/PlantCritter/Animation/PlantCritter.controller
  2. 985
      UOP1_Project/Assets/Art/Characters/PlantCritter/Animation/PlantCritter.fbx
  3. 125
      UOP1_Project/Assets/Art/Characters/PlantCritter/Animation/PlantCritter.fbx.meta
  4. 34
      UOP1_Project/Assets/Prefabs/Characters/PlantCritter.prefab
  5. 2
      UOP1_Project/Assets/Prefabs/Characters/PlantCritter.prefab.meta
  6. 107
      UOP1_Project/Assets/Art/Characters/PlantCritter/PlantCritterEye.mat
  7. 8
      UOP1_Project/Assets/Art/Characters/PlantCritter/PlantCritterEye.mat.meta
  8. 5
      UOP1_Project/Assets/Art/Characters/PlantCritter/PlantCritterEye_Albedo.png
  9. 92
      UOP1_Project/Assets/Art/Characters/PlantCritter/PlantCritterEye_Albedo.png.meta

10
UOP1_Project/Assets/Art/Characters/PlantCritter/Animation/PlantCritter.controller


m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Armature|Spawn
m_Name: Spawn
m_Speed: 0.5
m_CycleOffset: 0
m_Transitions:

m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 0}
m_Controller: {fileID: 9100000}
m_Controller: {fileID: 0}
m_Controller: {fileID: 9100000}
m_Controller: {fileID: 0}
m_Controller: {fileID: 9100000}
m_Controller: {fileID: 0}
m_Controller: {fileID: 9100000}
m_AnimatorLayers:
- serializedVersion: 5
m_Name: Base Layer

985
UOP1_Project/Assets/Art/Characters/PlantCritter/Animation/PlantCritter.fbx
文件差异内容过多而无法显示
查看文件

125
UOP1_Project/Assets/Art/Characters/PlantCritter/Animation/PlantCritter.fbx.meta


serializedVersion: 19301
internalIDToNameTable:
- first:
74: 3680201527246846624
second: Armature|Attack.001
- first:
74: 5702659241440815421
second: Armature|Attack.002
- first:
74: 7755149593934853502
second: Armature|BeenHit.001
- first:
74: -8945691123924629249
second: Armature|Idle
- first:
74: -1151124304740770259
second: Armature|WakeUp.001
- first:
74: -4544704078080460278
second: Armature|xxx
- first:
74: -3100369314251171874
second: Idle
- first:
74: -3745917278484660868
second: Alert
- first:

74: -8728307009303576639
second: BeenHit
74: -5236701712879215102
second: WakeUp
- first:
74: -7177579191635037161
second: Faint

- first:
74: 7933569904715140662
second: Armature|WakeUp
74: -3100369314251171874
second: Idle
74: -5236701712879215102
second: WakeUp
74: -8728307009303576639
second: BeenHit
- first:
74: 2610310362927318821
second: Armature|Alert
- first:
74: -8945691123924629249
second: Armature|Idle
- first:
74: -1151124304740770259
second: Armature|WakeUp.001
externalObjects: {}
materials:
materialImportMode: 0

extraUserProperties: []
clipAnimations:
- serializedVersion: 16
name: Idle
takeName: Idle
name: Alert
takeName: Alert
lastFrame: 100
lastFrame: 20
wrapMode: 0
orientationOffsetY: 0
level: 0

maskSource: {instanceID: 0}
additiveReferencePoseFrame: 0
- serializedVersion: 16
name: Alert
takeName: Alert
name: Attack
takeName: Attack
lastFrame: 60
lastFrame: 20
wrapMode: 0
orientationOffsetY: 0
level: 0

maskSource: {instanceID: 0}
additiveReferencePoseFrame: 0
- serializedVersion: 16
name: Attack
takeName: Attack
name: WakeUp
takeName: WakeUp
lastFrame: 20
lastFrame: 25
wrapMode: 0
orientationOffsetY: 0
level: 0

maskSource: {instanceID: 0}
additiveReferencePoseFrame: 0
- serializedVersion: 16
name: BeenHit
takeName: BeenHit
internalID: 0
firstFrame: 0
lastFrame: 20
wrapMode: 0
orientationOffsetY: 0
level: 0
cycleOffset: 0
loop: 0
hasAdditiveReferencePose: 0
loopTime: 0
loopBlend: 0
loopBlendOrientation: 0
loopBlendPositionY: 0
loopBlendPositionXZ: 0
keepOriginalOrientation: 0
keepOriginalPositionY: 1
keepOriginalPositionXZ: 0
heightFromFeet: 0
mirror: 0
bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000
curves: []
events: []
transformMask: []
maskType: 3
maskSource: {instanceID: 0}
additiveReferencePoseFrame: 0
- serializedVersion: 16
name: Faint
takeName: Faint
internalID: 0

maskSource: {instanceID: 0}
additiveReferencePoseFrame: 0
- serializedVersion: 16
name: WakeUp
takeName: WakeUp
name: Idle
takeName: Idle
internalID: 0
firstFrame: 0
lastFrame: 100
wrapMode: 0
orientationOffsetY: 0
level: 0
cycleOffset: 0
loop: 0
hasAdditiveReferencePose: 0
loopTime: 0
loopBlend: 0
loopBlendOrientation: 0
loopBlendPositionY: 0
loopBlendPositionXZ: 0
keepOriginalOrientation: 0
keepOriginalPositionY: 1
keepOriginalPositionXZ: 0
heightFromFeet: 0
mirror: 0
bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000
curves: []
events: []
transformMask: []
maskType: 3
maskSource: {instanceID: 0}
additiveReferencePoseFrame: 0
- serializedVersion: 16
name: BeenHit
takeName: BeenHit
lastFrame: 25
lastFrame: 20
wrapMode: 0
orientationOffsetY: 0
level: 0

34
UOP1_Project/Assets/Prefabs/Characters/PlantCritter.prefab


%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!95 &2001902748
--- !u!95 &950100416
Animator:
serializedVersion: 3
m_ObjectHideFlags: 0

m_GameObject: {fileID: 568315005168524731}
m_GameObject: {fileID: 8745063237678790951}
m_Enabled: 1
m_Avatar: {fileID: 0}
m_Controller: {fileID: 9100000, guid: 09488c58707d24448b2f90833fb5ff7f, type: 2}

m_HasTransformHierarchy: 1
m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorControllerStateOnDisable: 0
--- !u!114 &3336853071055180379
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 568315005168524731}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 1eeda163c70b3cb4ebb88ba92f608fd8, type: 3}
m_Name:
m_EditorClassIdentifier:
CurrentState:
debug: 0
_initialStateSO: {fileID: 0}
--- !u!1001 &802316579383877866
--- !u!1001 &8475173613595968630
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2

- target: {fileID: -8679921383154817045, guid: 415e24332f8993c4da4c452ed27d2873,
type: 3}
propertyPath: m_LocalPosition.x
value: -3.0826454
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 415e24332f8993c4da4c452ed27d2873,
type: 3}

- target: {fileID: -8679921383154817045, guid: 415e24332f8993c4da4c452ed27d2873,
type: 3}
propertyPath: m_LocalPosition.z
value: 0.8637123
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 415e24332f8993c4da4c452ed27d2873,
type: 3}

propertyPath: m_Materials.Array.data[0]
value:
objectReference: {fileID: 2100000, guid: c9e39aa4c3b2f8140902a78a91d0e674, type: 2}
- target: {fileID: 8417361359673230750, guid: 415e24332f8993c4da4c452ed27d2873,
type: 3}
propertyPath: m_Materials.Array.data[1]
value:
objectReference: {fileID: 2100000, guid: 31e737939205c194e887deccd872ab84, type: 2}
--- !u!1 &568315005168524731 stripped
--- !u!1 &8745063237678790951 stripped
m_PrefabInstance: {fileID: 802316579383877866}
m_PrefabInstance: {fileID: 8475173613595968630}
m_PrefabAsset: {fileID: 0}

2
UOP1_Project/Assets/Prefabs/Characters/PlantCritter.prefab.meta


fileFormatVersion: 2
guid: e2d15b979af942242b0b84b4ae881d6f
guid: 9f7b0cb7955c190418da560e89736c38
PrefabImporter:
externalObjects: {}
userData:

107
UOP1_Project/Assets/Art/Characters/PlantCritter/PlantCritterEye.mat


%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &-8572662280079119843
MonoBehaviour:
m_ObjectHideFlags: 11
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 2
--- !u!21 &2100000
Material:
serializedVersion: 6
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: PlantCritterEye
m_Shader: {fileID: -6465566751694194690, guid: bf36778a400a0894b86a1f49c422fa62,
type: 3}
m_ShaderKeywords:
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _BaseMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _BumpMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _EmissionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTexture:
m_Texture: {fileID: 2800000, guid: 6ffb44f77bd01e94badaf053a71530e7, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _OcclusionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _SpecGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _SpecularMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- Vector1_67F8CDC0: 2
- _AlphaClip: 0
- _Blend: 0
- _BumpScale: 1
- _Cull: 2
- _Cutoff: 0.5
- _DstBlend: 0
- _EnvironmentReflections: 1
- _GlossMapScale: 0
- _Glossiness: 0
- _GlossyReflections: 0
- _LightProbeContribution: 3.5
- _Metallic: 0
- _OcclusionStrength: 1
- _OutlineDepthSensitivity: 1
- _OutlineNormalsSensitivity: 1
- _OutlineThickness: 1
- _QueueOffset: 0
- _ReceiveShadows: 1
- _Smoothness: 0.5
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
- _Surface: 0
- _WorkflowMode: 1
- _ZWrite: 1
m_Colors:
- _BaseColor: {r: 1, g: 1, b: 1, a: 1}
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _MainColor: {r: 1, g: 1, b: 1, a: 0}
- _Offset: {r: 0, g: 0, b: 0, a: 0}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
- _SpecularColor: {r: 1, g: 1, b: 1, a: 0}
- _Tiling: {r: 1, g: 1, b: 0, a: 0}

8
UOP1_Project/Assets/Art/Characters/PlantCritter/PlantCritterEye.mat.meta


fileFormatVersion: 2
guid: 31e737939205c194e887deccd872ab84
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 0
userData:
assetBundleName:
assetBundleVariant:

5
UOP1_Project/Assets/Art/Characters/PlantCritter/PlantCritterEye_Albedo.png

之前 之后

92
UOP1_Project/Assets/Art/Characters/PlantCritter/PlantCritterEye_Albedo.png.meta


fileFormatVersion: 2
guid: 6ffb44f77bd01e94badaf053a71530e7
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 11
mipmaps:
mipMapMode: 0
enableMipMap: 1
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: -1
aniso: -1
mipBias: -100
wrapU: -1
wrapV: -1
wrapW: -1
nPOTScale: 1
lightmap: 0
compressionQuality: 50
spriteMode: 0
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 0
spriteTessellationDetail: -1
textureType: 0
textureShape: 1
singleChannelComponent: 0
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
applyGammaDecoding: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID:
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:
正在加载...
取消
保存