Commit cfa915df authored by Andrew R Van Buren's avatar Andrew R Van Buren

Merge branch 'music' into 'master'

Added meadow music and caramel camel

See merge request !52
parents 24be4a20 8c117d24
fileFormatVersion: 2
guid: 1ff9c473baea60c4db8872aead52d61b
folderAsset: yes
timeCreated: 1490920882
licenseType: Free
DefaultImporter:
userData:
assetBundleName:
assetBundleVariant:
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!91 &9100000
AnimatorController:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_Name: CaramelCamel
serializedVersion: 5
m_AnimatorParameters:
- m_Name: IsSpitting
m_Type: 4
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 9100000}
m_AnimatorLayers:
- serializedVersion: 5
m_Name: Base Layer
m_StateMachine: {fileID: 1107293039202701156}
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!1101 &1101416128883706006
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_Name:
m_Conditions:
- m_ConditionMode: 1
m_ConditionEvent: IsSpitting
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 1102280380472789500}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.25
m_TransitionOffset: 0
m_ExitTime: 0.64
m_HasExitTime: 1
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1101 &1101884533435633972
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_Name:
m_Conditions:
- m_ConditionMode: 2
m_ConditionEvent: IsSpitting
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 1102736237293744706}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.25
m_TransitionOffset: 0
m_ExitTime: 0.8125
m_HasExitTime: 1
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1102 &1102280380472789500
AnimatorState:
serializedVersion: 5
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_Name: Spit
m_Speed: 1
m_CycleOffset: 0
m_Transitions:
- {fileID: 1101884533435633972}
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_Motion: {fileID: 7400000, guid: d1317949245007243b0bb53aa0e674fe, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
--- !u!1102 &1102736237293744706
AnimatorState:
serializedVersion: 5
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_Name: Walk
m_Speed: 1
m_CycleOffset: 0
m_Transitions:
- {fileID: 1101416128883706006}
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_Motion: {fileID: 7400000, guid: 55fa946f0111099419f19c9b8b2b9b84, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
--- !u!1107 &1107293039202701156
AnimatorStateMachine:
serializedVersion: 5
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_Name: Base Layer
m_ChildStates:
- serializedVersion: 1
m_State: {fileID: 1102736237293744706}
m_Position: {x: 264, y: 36, z: 0}
- serializedVersion: 1
m_State: {fileID: 1102280380472789500}
m_Position: {x: 516, y: 36, z: 0}
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: 1102736237293744706}
fileFormatVersion: 2
guid: 22be9cdec6dc6c34dbbc2d9c750f26a1
timeCreated: 1491505213
licenseType: Free
NativeFormatImporter:
userData:
assetBundleName:
assetBundleVariant:
This diff is collapsed.
fileFormatVersion: 2
guid: c2082f1ab3fe07643ace388fd9c3f111
timeCreated: 1491525287
licenseType: Free
NativeFormatImporter:
userData:
assetBundleName:
assetBundleVariant:
This diff is collapsed.
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: c10c0be6d28fe4d539c4a39822fe301c, type: 3}
m_Name: CaramelCamelBones_10
m_EditorClassIdentifier:
m_ApiVersion: 3
m_Sprite: {fileID: 21300020, guid: fcda737c255f41c40a221d1d2a114205, type: 3}
m_SharedMesh: {fileID: 43024441333911256}
m_SharedMaterials:
- {fileID: 21881164637806846}
pivotPoint: {x: 0, y: 0}
texVertices: []
edges: []
holes: []
indices:
bindPoses: []
--- !u!21 &21881164637806846
Material:
serializedVersion: 6
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_Name: CaramelCamelBones_10_0
m_Shader: {fileID: 10753, guid: 0000000000000000f000000000000000, type: 0}
m_ShaderKeywords:
m_LightmapFlags: 5
m_CustomRenderQueue: -1
stringTagMap: {}
m_SavedProperties:
serializedVersion: 2
m_TexEnvs:
- first:
name: _MainTex
second:
m_Texture: {fileID: 2800000, guid: fcda737c255f41c40a221d1d2a114205, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- first:
name: PixelSnap
second: 0
m_Colors:
- first:
name: _Color
second: {r: 1, g: 1, b: 1, a: 1}
--- !u!43 &43024441333911256
Mesh:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_Name: CaramelCamelBones_10
serializedVersion: 8
m_SubMeshes:
- serializedVersion: 2
firstByte: 0
indexCount: 18
topology: 0
firstVertex: 0
vertexCount: 8
localAABB:
m_Center: {x: 0.107845426, y: -2.0490136, z: 0}
m_Extent: {x: 1.62, y: 0.97999996, z: 0}
m_Shapes:
vertices: []
shapes: []
channels: []
fullWeights: []
m_BindPose:
- e00: 0.99818265
e01: -0.06026805
e02: 0
e03: 0.15878662
e10: 0.06026805
e11: 0.99818265
e12: 0
e13: 2.2651482
e20: 0
e21: 0
e22: 1
e23: 0
e30: 0
e31: 0
e32: 0
e33: 1
m_BoneNameHashes:
m_RootBoneNameHash: 0
m_MeshCompression: 0
m_IsReadable: 1
m_KeepVertices: 1
m_KeepIndices: 1
m_IndexBuffer: 070006000500040005000600030005000400000003000400010003000000020001000000
m_Skin:
- weight[0]: 1
weight[1]: 0
weight[2]: 0
weight[3]: 0
boneIndex[0]: 0
boneIndex[1]: 0
boneIndex[2]: 0
boneIndex[3]: 0
- weight[0]: 1
weight[1]: 0
weight[2]: 0
weight[3]: 0
boneIndex[0]: 0
boneIndex[1]: 0
boneIndex[2]: 0
boneIndex[3]: 0
- weight[0]: 1
weight[1]: 0
weight[2]: 0
weight[3]: 0
boneIndex[0]: 0
boneIndex[1]: 0
boneIndex[2]: 0
boneIndex[3]: 0
- weight[0]: 1
weight[1]: 0
weight[2]: 0
weight[3]: 0
boneIndex[0]: 0
boneIndex[1]: 0
boneIndex[2]: 0
boneIndex[3]: 0
- weight[0]: 1
weight[1]: 0
weight[2]: 0
weight[3]: 0
boneIndex[0]: 0
boneIndex[1]: 0
boneIndex[2]: 0
boneIndex[3]: 0
- weight[0]: 1
weight[1]: 0
weight[2]: 0
weight[3]: 0
boneIndex[0]: 0
boneIndex[1]: 0
boneIndex[2]: 0
boneIndex[3]: 0
- weight[0]: 1
weight[1]: 0
weight[2]: 0
weight[3]: 0
boneIndex[0]: 0
boneIndex[1]: 0
boneIndex[2]: 0
boneIndex[3]: 0
- weight[0]: 1
weight[1]: 0
weight[2]: 0
weight[3]: 0
boneIndex[0]: 0
boneIndex[1]: 0
boneIndex[2]: 0
boneIndex[3]: 0
m_VertexData:
m_CurrentChannels: 11
m_VertexCount: 8
m_Channels:
- stream: 0
offset: 0
format: 0
dimension: 3
- stream: 0
offset: 12
format: 0
dimension: 3
- stream: 0
offset: 0
format: 0
dimension: 0
- stream: 1
offset: 0
format: 0
dimension: 2
- stream: 0
offset: 0
format: 0
dimension: 0
- stream: 0
offset: 0
format: 0
dimension: 0
- stream: 0
offset: 0
format: 0
dimension: 0
- stream: 0
offset: 0
format: 0
dimension: 0
m_DataSize: 256
_typelessdata: 0a2add3f1446c6bf000000000000000000000000000080bff67bd53fc34138c0000000000000000000000000000080bf0a2add3f29a82ec0000000000000000000000000000080bf1401c13f5cdb41c0000000000000000000000000000080bfeca4b13f71d588bf000000000000000000000000000080bf140815bf5cdb41c0000000000000000000000000000080bf488ec1bf71d588bf000000000000000000000000000080bf488ec1bf337f22c0000000000000000000000000000080bf00407e3f0000f03e00c07c3f0080ad3e00407e3f0000b53e00c0783f0000a63e00c0753f0000043f0080443f0000a63e00402d3f0000043f00402d3f0080be3e
m_CompressedMesh:
m_Vertices:
m_NumItems: 0
m_Range: 0
m_Start: 0
m_Data:
m_BitSize: 0
m_UV:
m_NumItems: 0
m_Range: 0
m_Start: 0
m_Data:
m_BitSize: 0
m_Normals:
m_NumItems: 0
m_Range: 0
m_Start: 0
m_Data:
m_BitSize: 0
m_Tangents:
m_NumItems: 0
m_Range: 0
m_Start: 0
m_Data:
m_BitSize: 0
m_Weights:
m_NumItems: 0
m_Data:
m_BitSize: 0
m_NormalSigns:
m_NumItems: 0
m_Data:
m_BitSize: 0
m_TangentSigns:
m_NumItems: 0
m_Data:
m_BitSize: 0
m_FloatColors:
m_NumItems: 0
m_Range: 0
m_Start: 0
m_Data:
m_BitSize: 0
m_BoneIndices:
m_NumItems: 0
m_Data:
m_BitSize: 0
m_Triangles:
m_NumItems: 0
m_Data:
m_BitSize: 0
m_UVInfo: 0
m_LocalAABB:
m_Center: {x: 0.107845426, y: -2.0490136, z: 0}
m_Extent: {x: 1.62, y: 0.97999996, z: 0}
m_MeshUsageFlags: 0
m_BakedConvexCollisionMesh:
m_BakedTriangleCollisionMesh:
m_MeshOptimized: 0
--- !u!114 &114018578457345738
MonoBehaviour:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 9e715ea371f114f4a8d2584ad476634d, type: 3}
m_Name: CaramelCamelBones_10_Data
m_EditorClassIdentifier:
m_PivotPoint: {x: 844.21545, y: 634.90137}
m_Vertices:
- {x: 1017, y: 480}
- {x: 1011, y: 347}
- {x: 1017, y: 362}
- {x: 995, y: 332}
- {x: 983, y: 528}
- {x: 786, y: 332}
- {x: 693, y: 528}
- {x: 693, y: 381}
m_BoneWeights:
- weight0: 1
weight1: 0
weight2: 0
weight3: 0
boneIndex0: 0
boneIndex1: -1
boneIndex2: -1
boneIndex3: -1
- weight0: 1
weight1: 0
weight2: 0
weight3: 0
boneIndex0: 0
boneIndex1: -1
boneIndex2: -1
boneIndex3: -1
- weight0: 1
weight1: 0
weight2: 0
weight3: 0
boneIndex0: 0
boneIndex1: -1
boneIndex2: -1
boneIndex3: -1
- weight0: 1
weight1: 0
weight2: 0
weight3: 0
boneIndex0: 0
boneIndex1: -1
boneIndex2: -1
boneIndex3: -1
- weight0: 1
weight1: 0
weight2: 0
weight3: 0
boneIndex0: 0
boneIndex1: -1
boneIndex2: -1
boneIndex3: -1
- weight0: 1
weight1: 0
weight2: 0
weight3: 0
boneIndex0: 0
boneIndex1: -1
boneIndex2: -1
boneIndex3: -1
- weight0: 1
weight1: 0
weight2: 0
weight3: 0
boneIndex0: 0
boneIndex1: -1
boneIndex2: -1
boneIndex3: -1
- weight0: 1
weight1: 0
weight2: 0
weight3: 0
boneIndex0: 0
boneIndex1: -1
boneIndex2: -1
boneIndex3: -1
m_Edges:
- index1: 7
index2: 6
- index1: 4
index2: 6
- index1: 7
index2: 5
- index1: 0
index2: 4
- index1: 3
index2: 5
- index1: 2
index2: 0
- index1: 1
index2: 3
- index1: 2
index2: 1
m_Holes: []
m_Indices: 070000000600000005000000040000000500000006000000030000000500000004000000000000000300000004000000010000000300000000000000020000000100000000000000
m_BindPoses:
- bindPose:
e00: 0.99818265
e01: 0.06026805
e02: 0
e03: 0
e10: -0.06026805
e11: 0.99818265
e12: 0
e13: 0
e20: 0
e21: 0
e22: 1
e23: 0
e30: 0.15878662
e31: 2.2651482
e32: 0
e33: 1
boneLength: 1.97
path:
name: 355f31
color:
r: 1
g: 0
b: 0
a: 1
zOrder: 0
m_Blendshapes: []
fileFormatVersion: 2
guid: 15b7bc84594f6e146abc8f529ab30d2f
timeCreated: 1491508148
licenseType: Free
NativeFormatImporter:
userData:
assetBundleName:
assetBundleVariant:
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: c10c0be6d28fe4d539c4a39822fe301c, type: 3}
m_Name: CaramelCamelBones_11
m_EditorClassIdentifier:
m_ApiVersion: 3
m_Sprite: {fileID: 21300022, guid: fcda737c255f41c40a221d1d2a114205, type: 3}
m_SharedMesh: {fileID: 43712868149597574}
m_SharedMaterials:
- {fileID: 21990397927277404}
pivotPoint: {x: 0, y: 0}
texVertices: []
edges: []
holes: []
indices:
bindPoses: []
--- !u!21 &21990397927277404
Material:
serializedVersion: 6
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_Name: CaramelCamelBones_11_0
m_Shader: {fileID: 10753, guid: 0000000000000000f000000000000000, type: 0}
m_ShaderKeywords:
m_LightmapFlags: 5
m_CustomRenderQueue: -1
stringTagMap: {}
m_SavedProperties:
serializedVersion: 2
m_TexEnvs: