Skip to content
Extraits de code Groupes Projets
Valider 29305a03 rédigé par Joséphine Barthel's avatar Joséphine Barthel
Parcourir les fichiers

Merge branch 'dev' of https://git.iiens.net/labane2013/tekajam into dev

parents b076b9e8 d82d006a
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
Affichage de
avec 117 ajouts et 88 suppressions
...@@ -17,21 +17,49 @@ AnimationClip: ...@@ -17,21 +17,49 @@ AnimationClip:
m_PositionCurves: [] m_PositionCurves: []
m_ScaleCurves: [] m_ScaleCurves: []
m_FloatCurves: [] m_FloatCurves: []
m_PPtrCurves: [] m_PPtrCurves:
m_SampleRate: 60 - curve:
- time: 0
value: {fileID: -7191105378189866728, guid: 76d48e4ed5e734747ae0a5ec3ed3d650,
type: 3}
- time: 0.083333336
value: {fileID: -2568042730344263758, guid: 76d48e4ed5e734747ae0a5ec3ed3d650,
type: 3}
- time: 0.16666667
value: {fileID: 2336415242956950666, guid: 76d48e4ed5e734747ae0a5ec3ed3d650,
type: 3}
- time: 0.25
value: {fileID: -4329476993096501442, guid: 76d48e4ed5e734747ae0a5ec3ed3d650,
type: 3}
attribute: m_Sprite
path:
classID: 212
script: {fileID: 0}
m_SampleRate: 12
m_WrapMode: 0 m_WrapMode: 0
m_Bounds: m_Bounds:
m_Center: {x: 0, y: 0, z: 0} m_Center: {x: 0, y: 0, z: 0}
m_Extent: {x: 0, y: 0, z: 0} m_Extent: {x: 0, y: 0, z: 0}
m_ClipBindingConstant: m_ClipBindingConstant:
genericBindings: [] genericBindings:
pptrCurveMapping: [] - serializedVersion: 2
path: 0
attribute: 0
script: {fileID: 0}
typeID: 212
customType: 23
isPPtrCurve: 1
pptrCurveMapping:
- {fileID: -7191105378189866728, guid: 76d48e4ed5e734747ae0a5ec3ed3d650, type: 3}
- {fileID: -2568042730344263758, guid: 76d48e4ed5e734747ae0a5ec3ed3d650, type: 3}
- {fileID: 2336415242956950666, guid: 76d48e4ed5e734747ae0a5ec3ed3d650, type: 3}
- {fileID: -4329476993096501442, guid: 76d48e4ed5e734747ae0a5ec3ed3d650, type: 3}
m_AnimationClipSettings: m_AnimationClipSettings:
serializedVersion: 2 serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0 m_AdditiveReferencePoseTime: 0
m_StartTime: 0 m_StartTime: 0
m_StopTime: 1 m_StopTime: 0.33333334
m_OrientationOffsetY: 0 m_OrientationOffsetY: 0
m_Level: 0 m_Level: 0
m_CycleOffset: 0 m_CycleOffset: 0
......
...@@ -20,57 +20,22 @@ AnimationClip: ...@@ -20,57 +20,22 @@ AnimationClip:
m_PPtrCurves: m_PPtrCurves:
- curve: - curve:
- time: 0 - time: 0
value: {fileID: -6035198323484584581, guid: a5f1cacbc729d2f438be4c8535f5c749, value: {fileID: -8110033421052298560, guid: 25358e4787ff6e249b94ce988253091c,
type: 3} type: 3}
- time: 0.083333336 - time: 0.083333336
value: {fileID: 2303852143255586727, guid: a5f1cacbc729d2f438be4c8535f5c749, value: {fileID: 4399915327577904522, guid: 25358e4787ff6e249b94ce988253091c,
type: 3} type: 3}
- time: 0.16666667 - time: 0.16666667
value: {fileID: 90072850326552456, guid: a5f1cacbc729d2f438be4c8535f5c749, type: 3} value: {fileID: 2669691853359153199, guid: 25358e4787ff6e249b94ce988253091c,
type: 3}
- time: 0.25 - time: 0.25
value: {fileID: 4470770905331974204, guid: a5f1cacbc729d2f438be4c8535f5c749, value: {fileID: -1666631276788681395, guid: 25358e4787ff6e249b94ce988253091c,
type: 3} type: 3}
- time: 0.33333334 - time: 0.33333334
value: {fileID: 4145097113387001990, guid: a5f1cacbc729d2f438be4c8535f5c749, value: {fileID: -7165058996076027596, guid: 25358e4787ff6e249b94ce988253091c,
type: 3} type: 3}
- time: 0.41666666 - time: 0.41666666
value: {fileID: 6446869939242326220, guid: a5f1cacbc729d2f438be4c8535f5c749, value: {fileID: 5056149580859517942, guid: 25358e4787ff6e249b94ce988253091c,
type: 3}
- time: 0.5
value: {fileID: -4571335008401796961, guid: a5f1cacbc729d2f438be4c8535f5c749,
type: 3}
- time: 0.5833333
value: {fileID: -5140612369115349627, guid: a5f1cacbc729d2f438be4c8535f5c749,
type: 3}
- time: 0.6666667
value: {fileID: 8164595165708743126, guid: a5f1cacbc729d2f438be4c8535f5c749,
type: 3}
- time: 0.75
value: {fileID: -9004415310525556266, guid: a5f1cacbc729d2f438be4c8535f5c749,
type: 3}
- time: 0.8333333
value: {fileID: 6213195786121436837, guid: a5f1cacbc729d2f438be4c8535f5c749,
type: 3}
- time: 0.9166667
value: {fileID: -6119130353935335158, guid: a5f1cacbc729d2f438be4c8535f5c749,
type: 3}
- time: 1
value: {fileID: -6821573177214688077, guid: a5f1cacbc729d2f438be4c8535f5c749,
type: 3}
- time: 1.0833334
value: {fileID: 995755038939216784, guid: a5f1cacbc729d2f438be4c8535f5c749,
type: 3}
- time: 1.1666666
value: {fileID: -7757175850570952243, guid: a5f1cacbc729d2f438be4c8535f5c749,
type: 3}
- time: 1.25
value: {fileID: -7035989477814015886, guid: a5f1cacbc729d2f438be4c8535f5c749,
type: 3}
- time: 1.3333334
value: {fileID: 7617224370104719062, guid: a5f1cacbc729d2f438be4c8535f5c749,
type: 3}
- time: 1.4166666
value: {fileID: 4687022968534964866, guid: a5f1cacbc729d2f438be4c8535f5c749,
type: 3} type: 3}
attribute: m_Sprite attribute: m_Sprite
path: path:
...@@ -91,30 +56,18 @@ AnimationClip: ...@@ -91,30 +56,18 @@ AnimationClip:
customType: 23 customType: 23
isPPtrCurve: 1 isPPtrCurve: 1
pptrCurveMapping: pptrCurveMapping:
- {fileID: -6035198323484584581, guid: a5f1cacbc729d2f438be4c8535f5c749, type: 3} - {fileID: -8110033421052298560, guid: 25358e4787ff6e249b94ce988253091c, type: 3}
- {fileID: 2303852143255586727, guid: a5f1cacbc729d2f438be4c8535f5c749, type: 3} - {fileID: 4399915327577904522, guid: 25358e4787ff6e249b94ce988253091c, type: 3}
- {fileID: 90072850326552456, guid: a5f1cacbc729d2f438be4c8535f5c749, type: 3} - {fileID: 2669691853359153199, guid: 25358e4787ff6e249b94ce988253091c, type: 3}
- {fileID: 4470770905331974204, guid: a5f1cacbc729d2f438be4c8535f5c749, type: 3} - {fileID: -1666631276788681395, guid: 25358e4787ff6e249b94ce988253091c, type: 3}
- {fileID: 4145097113387001990, guid: a5f1cacbc729d2f438be4c8535f5c749, type: 3} - {fileID: -7165058996076027596, guid: 25358e4787ff6e249b94ce988253091c, type: 3}
- {fileID: 6446869939242326220, guid: a5f1cacbc729d2f438be4c8535f5c749, type: 3} - {fileID: 5056149580859517942, guid: 25358e4787ff6e249b94ce988253091c, type: 3}
- {fileID: -4571335008401796961, guid: a5f1cacbc729d2f438be4c8535f5c749, type: 3}
- {fileID: -5140612369115349627, guid: a5f1cacbc729d2f438be4c8535f5c749, type: 3}
- {fileID: 8164595165708743126, guid: a5f1cacbc729d2f438be4c8535f5c749, type: 3}
- {fileID: -9004415310525556266, guid: a5f1cacbc729d2f438be4c8535f5c749, type: 3}
- {fileID: 6213195786121436837, guid: a5f1cacbc729d2f438be4c8535f5c749, type: 3}
- {fileID: -6119130353935335158, guid: a5f1cacbc729d2f438be4c8535f5c749, type: 3}
- {fileID: -6821573177214688077, guid: a5f1cacbc729d2f438be4c8535f5c749, type: 3}
- {fileID: 995755038939216784, guid: a5f1cacbc729d2f438be4c8535f5c749, type: 3}
- {fileID: -7757175850570952243, guid: a5f1cacbc729d2f438be4c8535f5c749, type: 3}
- {fileID: -7035989477814015886, guid: a5f1cacbc729d2f438be4c8535f5c749, type: 3}
- {fileID: 7617224370104719062, guid: a5f1cacbc729d2f438be4c8535f5c749, type: 3}
- {fileID: 4687022968534964866, guid: a5f1cacbc729d2f438be4c8535f5c749, type: 3}
m_AnimationClipSettings: m_AnimationClipSettings:
serializedVersion: 2 serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0 m_AdditiveReferencePoseTime: 0
m_StartTime: 0 m_StartTime: 0
m_StopTime: 1.5 m_StopTime: 0.5
m_OrientationOffsetY: 0 m_OrientationOffsetY: 0
m_Level: 0 m_Level: 0
m_CycleOffset: 0 m_CycleOffset: 0
......
...@@ -10,12 +10,14 @@ MonoBehaviour: ...@@ -10,12 +10,14 @@ MonoBehaviour:
m_Enabled: 1 m_Enabled: 1
m_EditorHideFlags: 0 m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 9d9096f239b36c5468a259941b1009ef, type: 3} m_Script: {fileID: 11500000, guid: 9d9096f239b36c5468a259941b1009ef, type: 3}
m_Name: CostaHummingFight7-11 m_Name: CostaHummingFight11-13
m_EditorClassIdentifier: m_EditorClassIdentifier:
bird: {fileID: 498878385731201535, guid: 39963b9ecc6e40e49a45816d4f379193, type: 3} bird: {fileID: 498878385731201535, guid: 39963b9ecc6e40e49a45816d4f379193, type: 3}
scoreToMatch: 20 scoreToMatch: 20
tierMin: 7 tierMin: 11
tierMax: 11 tierMax: 13
FightDescription: 'Coastal Hummingbird the Annoying. Score : 20. Decreases your
draw.'
alterationEffects: alterationEffects:
- validity: 1 - validity: 1
type: 5 type: 5
......
...@@ -10,12 +10,14 @@ MonoBehaviour: ...@@ -10,12 +10,14 @@ MonoBehaviour:
m_Enabled: 1 m_Enabled: 1
m_EditorHideFlags: 0 m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 9d9096f239b36c5468a259941b1009ef, type: 3} m_Script: {fileID: 11500000, guid: 9d9096f239b36c5468a259941b1009ef, type: 3}
m_Name: CostaHummingFight4-6 m_Name: CostaHummingFight8-10
m_EditorClassIdentifier: m_EditorClassIdentifier:
bird: {fileID: 498878385731201535, guid: 39963b9ecc6e40e49a45816d4f379193, type: 3} bird: {fileID: 498878385731201535, guid: 39963b9ecc6e40e49a45816d4f379193, type: 3}
scoreToMatch: 16 scoreToMatch: 16
tierMin: 4 tierMin: 8
tierMax: 6 tierMax: 10
FightDescription: 'Coastal Hummingbird the Annoying. Score : 16. Decreases your
draw.'
alterationEffects: alterationEffects:
- validity: 1 - validity: 1
type: 5 type: 5
......
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
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: 9d9096f239b36c5468a259941b1009ef, type: 3}
m_Name: EvilDuck
m_EditorClassIdentifier:
bird: {fileID: 1695193658733767104, guid: f7d632d63b642d14d9ae01213b67367d, type: 3}
scoreToMatch: 60
tierMin: 14
tierMax: 14
FightDescription: Evil Duck, your archnemesis.
alterationEffects:
- validity: 1
type: 2
value: -1
- validity: 1
type: 0
value: -1
fileFormatVersion: 2
guid: d8e96a72ccdd5dc4996a8d19d7e4a494
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:
...@@ -32,3 +32,4 @@ MonoBehaviour: ...@@ -32,3 +32,4 @@ MonoBehaviour:
- {fileID: 11400000, guid: b8033fb6859374147a1d0ec69d3e0da4, type: 2} - {fileID: 11400000, guid: b8033fb6859374147a1d0ec69d3e0da4, type: 2}
- {fileID: 11400000, guid: e869eece8fc7644408f640e8a1948c50, type: 2} - {fileID: 11400000, guid: e869eece8fc7644408f640e8a1948c50, type: 2}
- {fileID: 11400000, guid: ce075116411ddfd4a8685407103d6740, type: 2} - {fileID: 11400000, guid: ce075116411ddfd4a8685407103d6740, type: 2}
- {fileID: 11400000, guid: d8e96a72ccdd5dc4996a8d19d7e4a494, type: 2}
...@@ -16,4 +16,5 @@ MonoBehaviour: ...@@ -16,4 +16,5 @@ MonoBehaviour:
scoreToMatch: 6 scoreToMatch: 6
tierMin: 1 tierMin: 1
tierMax: 1 tierMax: 1
FightDescription: 'Flame Bowerbird the Plain. Score : 6.'
alterationEffects: [] alterationEffects: []
...@@ -10,10 +10,11 @@ MonoBehaviour: ...@@ -10,10 +10,11 @@ MonoBehaviour:
m_Enabled: 1 m_Enabled: 1
m_EditorHideFlags: 0 m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 9d9096f239b36c5468a259941b1009ef, type: 3} m_Script: {fileID: 11500000, guid: 9d9096f239b36c5468a259941b1009ef, type: 3}
m_Name: FlameBowerFight7-11 m_Name: FlameBowerFight11-13
m_EditorClassIdentifier: m_EditorClassIdentifier:
bird: {fileID: 5083819637802795338, guid: c1345dc568727664fa5489acdedd80af, type: 3} bird: {fileID: 5083819637802795338, guid: c1345dc568727664fa5489acdedd80af, type: 3}
scoreToMatch: 32 scoreToMatch: 32
tierMin: 7 tierMin: 11
tierMax: 11 tierMax: 13
FightDescription: 'Flame Bowerbird the Plain. Score : 32.'
alterationEffects: [] alterationEffects: []
...@@ -10,10 +10,11 @@ MonoBehaviour: ...@@ -10,10 +10,11 @@ MonoBehaviour:
m_Enabled: 1 m_Enabled: 1
m_EditorHideFlags: 0 m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 9d9096f239b36c5468a259941b1009ef, type: 3} m_Script: {fileID: 11500000, guid: 9d9096f239b36c5468a259941b1009ef, type: 3}
m_Name: FlameBowerFight2 m_Name: FlameBowerFight2-4
m_EditorClassIdentifier: m_EditorClassIdentifier:
bird: {fileID: 5083819637802795338, guid: c1345dc568727664fa5489acdedd80af, type: 3} bird: {fileID: 5083819637802795338, guid: c1345dc568727664fa5489acdedd80af, type: 3}
scoreToMatch: 12 scoreToMatch: 12
tierMin: 2 tierMin: 2
tierMax: 2 tierMax: 4
FightDescription: 'Flame Bowerbird the Plain. Score : 12.'
alterationEffects: [] alterationEffects: []
...@@ -10,10 +10,11 @@ MonoBehaviour: ...@@ -10,10 +10,11 @@ MonoBehaviour:
m_Enabled: 1 m_Enabled: 1
m_EditorHideFlags: 0 m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 9d9096f239b36c5468a259941b1009ef, type: 3} m_Script: {fileID: 11500000, guid: 9d9096f239b36c5468a259941b1009ef, type: 3}
m_Name: FlameBowerFight3 m_Name: FlameBowerFight5-7
m_EditorClassIdentifier: m_EditorClassIdentifier:
bird: {fileID: 5083819637802795338, guid: c1345dc568727664fa5489acdedd80af, type: 3} bird: {fileID: 5083819637802795338, guid: c1345dc568727664fa5489acdedd80af, type: 3}
scoreToMatch: 18 scoreToMatch: 18
tierMin: 3 tierMin: 5
tierMax: 3 tierMax: 7
FightDescription: 'Flame Bowerbird the Plain. Score : 18.'
alterationEffects: [] alterationEffects: []
...@@ -10,10 +10,11 @@ MonoBehaviour: ...@@ -10,10 +10,11 @@ MonoBehaviour:
m_Enabled: 1 m_Enabled: 1
m_EditorHideFlags: 0 m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 9d9096f239b36c5468a259941b1009ef, type: 3} m_Script: {fileID: 11500000, guid: 9d9096f239b36c5468a259941b1009ef, type: 3}
m_Name: FlameBowerFight4-6 m_Name: FlameBowerFight8-10
m_EditorClassIdentifier: m_EditorClassIdentifier:
bird: {fileID: 5083819637802795338, guid: c1345dc568727664fa5489acdedd80af, type: 3} bird: {fileID: 5083819637802795338, guid: c1345dc568727664fa5489acdedd80af, type: 3}
scoreToMatch: 24 scoreToMatch: 24
tierMin: 4 tierMin: 8
tierMax: 6 tierMax: 10
FightDescription: 'Flame Bowerbird the Plain. Score : 24.'
alterationEffects: [] alterationEffects: []
...@@ -14,8 +14,10 @@ MonoBehaviour: ...@@ -14,8 +14,10 @@ MonoBehaviour:
m_EditorClassIdentifier: m_EditorClassIdentifier:
bird: {fileID: 6750887986308946089, guid: 36eb6cce5668d95429e4a26c874240c0, type: 3} bird: {fileID: 6750887986308946089, guid: 36eb6cce5668d95429e4a26c874240c0, type: 3}
scoreToMatch: 16 scoreToMatch: 16
tierMin: 7 tierMin: 11
tierMax: 11 tierMax: 13
FightDescription: 'Greater Bird of Paradise, the Stunning. Score : 16. Leeches score
from your actions.'
alterationEffects: alterationEffects:
- validity: 1 - validity: 1
type: 0 type: 0
......
...@@ -10,12 +10,14 @@ MonoBehaviour: ...@@ -10,12 +10,14 @@ MonoBehaviour:
m_Enabled: 1 m_Enabled: 1
m_EditorHideFlags: 0 m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 9d9096f239b36c5468a259941b1009ef, type: 3} m_Script: {fileID: 11500000, guid: 9d9096f239b36c5468a259941b1009ef, type: 3}
m_Name: MagnificentRiflefight7-11 m_Name: MagnificentRiflefight11-13
m_EditorClassIdentifier: m_EditorClassIdentifier:
bird: {fileID: 7700743239997283471, guid: d3e52fce826412e4e8a960dda34214e8, type: 3} bird: {fileID: 7700743239997283471, guid: d3e52fce826412e4e8a960dda34214e8, type: 3}
scoreToMatch: 18 scoreToMatch: 18
tierMin: 7 tierMin: 11
tierMax: 11 tierMax: 13
FightDescription: 'Magnificent Riflebird the Copycat. Score : 18. Gains score when
you do.'
alterationEffects: alterationEffects:
- validity: 1 - validity: 1
type: 3 type: 3
......
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Veuillez vous inscrire ou vous pour commenter