diff --git a/Assets/Animations/fitness/FitnessAnimation.anim b/Assets/Animations/fitness/FitnessAnimation.anim index 0a11c616f..c204ce13f 100644 --- a/Assets/Animations/fitness/FitnessAnimation.anim +++ b/Assets/Animations/fitness/FitnessAnimation.anim @@ -23,24 +23,15 @@ AnimationClip: - serializedVersion: 3 time: -1 value: 0 -<<<<<<< HEAD - inSlope: 4.5243287 - outSlope: 4.5243287 -======= - inSlope: 0.32372805 - outSlope: 0.32372805 ->>>>>>> Develop + inSlope: 1.4323635 + outSlope: 1.4323635 tangentMode: 0 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 time: 0 -<<<<<<< HEAD - value: 4.5243287 -======= - value: 0.32372805 ->>>>>>> Develop + value: 1.4323635 inSlope: 0.5 outSlope: 0.5 tangentMode: 0 @@ -50,43 +41,33 @@ AnimationClip: - serializedVersion: 3 time: 1 value: 1 -<<<<<<< HEAD - inSlope: -1.6243408 - outSlope: -1.6243408 -======= - inSlope: 0 - outSlope: 0 ->>>>>>> Develop + inSlope: -0.38318127 + outSlope: -0.38318127 tangentMode: 0 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 time: 2 -<<<<<<< HEAD - value: 1.2756472 - inSlope: 0.27564716 - outSlope: 0.27564716 -======= - value: 0.32372805 - inSlope: -0.37711877 - outSlope: -0.37711877 + value: 0.66600096 + inSlope: -0.25955778 + outSlope: -0.25955778 tangentMode: 0 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 time: 3 - value: 0.24576247 - inSlope: -0.038982794 - outSlope: -0.038982794 + value: 0.48088443 + inSlope: -0.092558265 + outSlope: -0.092558265 tangentMode: 0 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 time: 4 - value: 0.24576247 + value: 0.48088443 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -95,43 +76,43 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 5 - value: 0.24576247 - inSlope: 0.12900639 - outSlope: 0.12900639 + value: 0.48088443 + inSlope: 0 + outSlope: 0 tangentMode: 0 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 time: 6 - value: 0.50377524 - inSlope: 0.12900639 - outSlope: 0.12900639 + value: 0.48088443 + inSlope: 0.08671507 + outSlope: 0.08671507 tangentMode: 0 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 time: 7 - value: 0.50377524 - inSlope: -0.14947923 - outSlope: -0.14947923 + value: 0.6543146 + inSlope: 0.08671507 + outSlope: 0.08671507 tangentMode: 0 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 time: 8 - value: 0.20481679 - inSlope: -0.14947923 - outSlope: -0.14947923 + value: 0.6543146 + inSlope: 0 + outSlope: 0 tangentMode: 0 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 time: 9 - value: 0.20481679 + value: 0.6543146 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -140,7 +121,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 10 - value: 0.20481679 + value: 0.6543146 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -149,25 +130,25 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 11 - value: 0.20481679 - inSlope: 0.023835316 - outSlope: 0.023835316 + value: 0.6543146 + inSlope: 0 + outSlope: 0 tangentMode: 0 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 time: 12 - value: 0.25248742 - inSlope: 0.023835316 - outSlope: 0.023835316 + value: 0.6543146 + inSlope: 0 + outSlope: 0 tangentMode: 0 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 time: 13 - value: 0.25248742 + value: 0.6543146 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -176,43 +157,43 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 14 - value: 0.25248742 - inSlope: -0.0011959672 - outSlope: -0.0011959672 + value: 0.6543146 + inSlope: 0 + outSlope: 0 tangentMode: 0 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 time: 15 - value: 0.2500955 - inSlope: -0.0011959672 - outSlope: -0.0011959672 + value: 0.6543146 + inSlope: 0 + outSlope: 0 tangentMode: 0 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 time: 16 - value: 0.2500955 - inSlope: 0 - outSlope: 0 + value: 0.6543146 + inSlope: -0.09894097 + outSlope: -0.09894097 tangentMode: 0 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 time: 17 - value: 0.2500955 - inSlope: 0 - outSlope: 0 + value: 0.45643264 + inSlope: -0.09894097 + outSlope: -0.09894097 tangentMode: 0 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 time: 18 - value: 0.2500955 + value: 0.45643264 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -221,7 +202,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 19 - value: 0.2500955 + value: 0.45643264 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -230,7 +211,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 20 - value: 0.2500955 + value: 0.45643264 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -239,7 +220,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 21 - value: 0.2500955 + value: 0.45643264 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -248,34 +229,34 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 22 - value: 0.2500955 - inSlope: -0.0544737 - outSlope: -0.0544737 + value: 0.45643264 + inSlope: 0 + outSlope: 0 tangentMode: 0 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 time: 23 - value: 0.14114809 - inSlope: -0.05732102 - outSlope: -0.05732102 + value: 0.45643264 + inSlope: 0 + outSlope: 0 tangentMode: 0 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 time: 24 - value: 0.13545345 - inSlope: -0.0028473213 - outSlope: -0.0028473213 + value: 0.45643264 + inSlope: 0 + outSlope: 0 tangentMode: 0 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 time: 25 - value: 0.13545345 + value: 0.45643264 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -284,7 +265,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 26 - value: 0.13545345 + value: 0.45643264 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -293,7 +274,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 27 - value: 0.13545345 + value: 0.45643264 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -302,34 +283,34 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 28 - value: 0.13545345 - inSlope: 0 - outSlope: 0 + value: 0.45643264 + inSlope: 0.03236282 + outSlope: 0.03236282 tangentMode: 0 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 time: 29 - value: 0.13545345 - inSlope: -0.002342917 - outSlope: -0.002342917 + value: 0.5211583 + inSlope: 0.08822596 + outSlope: 0.08822596 tangentMode: 0 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 time: 30 - value: 0.13076761 - inSlope: -0.002342917 - outSlope: -0.002342917 + value: 0.63288456 + inSlope: 0.055863142 + outSlope: 0.055863142 tangentMode: 0 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 time: 31 - value: 0.13076761 + value: 0.63288456 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -338,7 +319,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 32 - value: 0.13076761 + value: 0.63288456 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -347,7 +328,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 33 - value: 0.13076761 + value: 0.63288456 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -356,7 +337,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 34 - value: 0.13076761 + value: 0.63288456 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -365,7 +346,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 35 - value: 0.13076761 + value: 0.63288456 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -374,7 +355,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 36 - value: 0.13076761 + value: 0.63288456 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -383,7 +364,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 37 - value: 0.13076761 + value: 0.63288456 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -392,7 +373,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 38 - value: 0.13076761 + value: 0.63288456 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -401,7 +382,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 39 - value: 0.13076761 + value: 0.63288456 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -410,7 +391,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 40 - value: 0.13076761 + value: 0.63288456 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -419,7 +400,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 41 - value: 0.13076761 + value: 0.63288456 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -428,7 +409,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 42 - value: 0.13076761 + value: 0.63288456 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -437,7 +418,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 43 - value: 0.13076761 + value: 0.63288456 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -446,7 +427,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 44 - value: 0.13076761 + value: 0.63288456 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -455,7 +436,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 45 - value: 0.13076761 + value: 0.63288456 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -464,7 +445,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 46 - value: 0.13076761 + value: 0.63288456 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -473,7 +454,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 47 - value: 0.13076761 + value: 0.63288456 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -482,7 +463,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 48 - value: 0.13076761 + value: 0.63288456 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -491,7 +472,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 49 - value: 0.13076761 + value: 0.63288456 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -500,25 +481,25 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 50 - value: 0.13076761 - inSlope: 0 - outSlope: 0 + value: 0.63288456 + inSlope: -0.11719085 + outSlope: -0.11719085 tangentMode: 0 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 time: 51 - value: 0.13076761 - inSlope: 0 - outSlope: 0 + value: 0.39850286 + inSlope: -0.11719085 + outSlope: -0.11719085 tangentMode: 0 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 time: 52 - value: 0.13076761 + value: 0.39850286 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -527,7 +508,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 53 - value: 0.13076761 + value: 0.39850286 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -536,7 +517,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 54 - value: 0.13076761 + value: 0.39850286 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -545,7 +526,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 55 - value: 0.13076761 + value: 0.39850286 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -554,7 +535,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 56 - value: 0.13076761 + value: 0.39850286 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -563,7 +544,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 57 - value: 0.13076761 + value: 0.39850286 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -572,7 +553,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 58 - value: 0.13076761 + value: 0.39850286 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -581,7 +562,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 59 - value: 0.13076761 + value: 0.39850286 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -590,7 +571,187 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 60 - value: 0.13076761 + value: 0.39850286 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 61 + value: 0.39850286 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 62 + value: 0.39850286 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 63 + value: 0.39850286 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 64 + value: 0.39850286 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 65 + value: 0.39850286 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 66 + value: 0.39850286 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 67 + value: 0.39850286 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 68 + value: 0.39850286 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 69 + value: 0.39850286 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 70 + value: 0.39850286 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 71 + value: 0.39850286 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 72 + value: 0.39850286 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 73 + value: 0.39850286 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 74 + value: 0.39850286 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 75 + value: 0.39850286 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 76 + value: 0.39850286 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 77 + value: 0.39850286 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 78 + value: 0.39850286 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 79 + value: 0.39850286 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 80 + value: 0.39850286 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -610,15 +771,15 @@ AnimationClip: - serializedVersion: 3 time: -1 value: 0 - inSlope: 0 - outSlope: 0 + inSlope: 0.15204677 + outSlope: 0.15204677 tangentMode: 0 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 time: 0 - value: 0 + value: 0.15204677 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -628,8 +789,8 @@ AnimationClip: - serializedVersion: 3 time: 1 value: 0 - inSlope: 0 - outSlope: 0 + inSlope: -0.076023385 + outSlope: -0.076023385 tangentMode: 0 weightedMode: 0 inWeight: 0.33333334 @@ -682,24 +843,24 @@ AnimationClip: - serializedVersion: 3 time: 7 value: 0 - inSlope: 0.012287335 - outSlope: 0.012287335 + inSlope: 0 + outSlope: 0 tangentMode: 0 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 time: 8 - value: 0.02457467 - inSlope: 0.012287335 - outSlope: 0.012287335 + value: 0 + inSlope: 0 + outSlope: 0 tangentMode: 0 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 time: 9 - value: 0.02457467 + value: 0 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -708,7 +869,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 10 - value: 0.02457467 + value: 0 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -717,25 +878,25 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 11 - value: 0.02457467 - inSlope: 0.015973534 - outSlope: 0.015973534 + value: 0 + inSlope: 0 + outSlope: 0 tangentMode: 0 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 time: 12 - value: 0.056521736 - inSlope: 0.015973534 - outSlope: 0.015973534 + value: 0 + inSlope: 0 + outSlope: 0 tangentMode: 0 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 time: 13 - value: 0.056521736 + value: 0 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -744,7 +905,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 14 - value: 0.056521736 + value: 0 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -753,7 +914,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 15 - value: 0.056521736 + value: 0 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -762,7 +923,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 16 - value: 0.056521736 + value: 0 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -771,7 +932,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 17 - value: 0.056521736 + value: 0 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -780,7 +941,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 18 - value: 0.056521736 + value: 0 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -789,7 +950,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 19 - value: 0.056521736 + value: 0 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -798,7 +959,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 20 - value: 0.056521736 + value: 0 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -807,7 +968,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 21 - value: 0.056521736 + value: 0 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -816,9 +977,9 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 22 - value: 0.056521736 - inSlope: -0.028260868 - outSlope: -0.028260868 + value: 0 + inSlope: 0 + outSlope: 0 tangentMode: 0 weightedMode: 0 inWeight: 0.33333334 @@ -826,8 +987,8 @@ AnimationClip: - serializedVersion: 3 time: 23 value: 0 - inSlope: -0.028260868 - outSlope: -0.028260868 + inSlope: 0 + outSlope: 0 tangentMode: 0 weightedMode: 0 inWeight: 0.33333334 @@ -1165,37 +1326,27 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: usageCurve - path: - classID: 114 - script: {fileID: 11500000, guid: 37ab87ce3d4646a2acf848037c5236da, type: 3} - - curve: - serializedVersion: 2 - m_Curve: - serializedVersion: 3 - time: -1 + time: 61 value: 0 - inSlope: 0.1532696 - outSlope: 0.1532696 + inSlope: 0 + outSlope: 0 tangentMode: 0 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0 - value: 0.1532696 - inSlope: 0.0766348 - outSlope: 0.0766348 + time: 62 + value: 0 + inSlope: 0 + outSlope: 0 tangentMode: 0 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1 - value: 0.1532696 + time: 63 + value: 0 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -1203,26 +1354,26 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 2 - value: 0.1532696 - inSlope: -0.03014807 - outSlope: -0.03014807 + time: 64 + value: 0 + inSlope: 0 + outSlope: 0 tangentMode: 0 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 3 - value: 0.09297346 - inSlope: -0.03014807 - outSlope: -0.03014807 + time: 65 + value: 0 + inSlope: 0 + outSlope: 0 tangentMode: 0 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 4 - value: 0.09297346 + time: 66 + value: 0 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -1230,44 +1381,44 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 5 - value: 0.09297346 - inSlope: -0.004400082 - outSlope: -0.004400082 + time: 67 + value: 0 + inSlope: 0 + outSlope: 0 tangentMode: 0 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 6 - value: 0.0841733 - inSlope: -0.004400082 - outSlope: -0.004400082 + time: 68 + value: 0 + inSlope: 0 + outSlope: 0 tangentMode: 0 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 7 - value: 0.0841733 - inSlope: -0.007387243 - outSlope: -0.007387243 + time: 69 + value: 0 + inSlope: 0 + outSlope: 0 tangentMode: 0 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 8 - value: 0.06939881 - inSlope: -0.007387243 - outSlope: -0.007387243 + time: 70 + value: 0 + inSlope: 0 + outSlope: 0 tangentMode: 0 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 9 - value: 0.06939881 + time: 71 + value: 0 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -1275,8 +1426,8 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 10 - value: 0.06939881 + time: 72 + value: 0 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -1284,26 +1435,26 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 11 - value: 0.06939881 - inSlope: 0.006439578 - outSlope: 0.006439578 + time: 73 + value: 0 + inSlope: 0 + outSlope: 0 tangentMode: 0 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 12 - value: 0.08227797 - inSlope: 0.006439578 - outSlope: 0.006439578 + time: 74 + value: 0 + inSlope: 0 + outSlope: 0 tangentMode: 0 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 13 - value: 0.08227797 + time: 75 + value: 0 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -1311,26 +1462,26 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 14 - value: 0.08227797 - inSlope: -0.0011959635 - outSlope: -0.0011959635 + time: 76 + value: 0 + inSlope: 0 + outSlope: 0 tangentMode: 0 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 15 - value: 0.07988604 - inSlope: -0.0011959635 - outSlope: -0.0011959635 + time: 77 + value: 0 + inSlope: 0 + outSlope: 0 tangentMode: 0 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 16 - value: 0.07988604 + time: 78 + value: 0 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -1338,8 +1489,8 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 17 - value: 0.07988604 + time: 79 + value: 0 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -1347,71 +1498,81 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 18 - value: 0.07988604 + time: 80 + value: 0 inSlope: 0 outSlope: 0 tangentMode: 0 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: usageCurve + path: + classID: 114 + script: {fileID: 11500000, guid: 37ab87ce3d4646a2acf848037c5236da, type: 3} + - curve: + serializedVersion: 2 + m_Curve: - serializedVersion: 3 - time: 19 - value: 0.07988604 - inSlope: 0 - outSlope: 0 + time: -1 + value: 0 + inSlope: 0.010814459 + outSlope: 0.010814459 tangentMode: 0 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 20 - value: 0.07988604 - inSlope: 0 - outSlope: 0 + time: 0 + value: 0.010814459 + inSlope: 0.010597516 + outSlope: 0.010597516 tangentMode: 0 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 21 - value: 0.07988604 - inSlope: 0 - outSlope: 0 + time: 1 + value: 0.021195032 + inSlope: 0.007168615 + outSlope: 0.007168615 tangentMode: 0 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 22 - value: 0.07988604 - inSlope: 0.002048038 - outSlope: 0.002048038 + time: 2 + value: 0.025151689 + inSlope: 0.002349698 + outSlope: 0.002349698 tangentMode: 0 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 23 - value: 0.08398212 - inSlope: -0.0007992871 - outSlope: -0.0007992871 + time: 3 + value: 0.025894428 + inSlope: 0.00037136953 + outSlope: 0.00037136953 tangentMode: 0 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 24 - value: 0.07828747 - inSlope: -0.002847325 - outSlope: -0.002847325 + time: 4 + value: 0.025894428 + inSlope: 0 + outSlope: 0 tangentMode: 0 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 25 - value: 0.07828747 + time: 5 + value: 0.025894428 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -1419,26 +1580,26 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 26 - value: 0.07828747 - inSlope: 0 - outSlope: 0 + time: 6 + value: 0.025894428 + inSlope: -0.004047326 + outSlope: -0.004047326 tangentMode: 0 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 27 - value: 0.07828747 - inSlope: 0 - outSlope: 0 + time: 7 + value: 0.017799776 + inSlope: -0.004047326 + outSlope: -0.004047326 tangentMode: 0 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 28 - value: 0.07828747 + time: 8 + value: 0.017799776 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -1446,26 +1607,26 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 29 - value: 0.07828747 - inSlope: -0.0023429133 - outSlope: -0.0023429133 + time: 9 + value: 0.017799776 + inSlope: 0 + outSlope: 0 tangentMode: 0 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 30 - value: 0.07360164 - inSlope: -0.0023429133 - outSlope: -0.0023429133 + time: 10 + value: 0.017799776 + inSlope: 0 + outSlope: 0 tangentMode: 0 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 31 - value: 0.07360164 + time: 11 + value: 0.017799776 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -1473,8 +1634,8 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 32 - value: 0.07360164 + time: 12 + value: 0.017799776 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -1482,8 +1643,8 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 33 - value: 0.07360164 + time: 13 + value: 0.017799776 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -1491,8 +1652,8 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 34 - value: 0.07360164 + time: 14 + value: 0.017799776 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -1500,8 +1661,8 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 35 - value: 0.07360164 + time: 15 + value: 0.017799776 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -1509,26 +1670,26 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 36 - value: 0.07360164 - inSlope: 0 - outSlope: 0 + time: 16 + value: 0.017799776 + inSlope: 0.00001228787 + outSlope: 0.00001228787 tangentMode: 0 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 37 - value: 0.07360164 - inSlope: 0 - outSlope: 0 + time: 17 + value: 0.017824352 + inSlope: 0.00001228787 + outSlope: 0.00001228787 tangentMode: 0 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 38 - value: 0.07360164 + time: 18 + value: 0.017824352 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -1536,8 +1697,8 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 39 - value: 0.07360164 + time: 19 + value: 0.017824352 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -1545,8 +1706,8 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 40 - value: 0.07360164 + time: 20 + value: 0.017824352 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -1554,8 +1715,8 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 41 - value: 0.07360164 + time: 21 + value: 0.017824352 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -1563,8 +1724,8 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 42 - value: 0.07360164 + time: 22 + value: 0.017824352 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -1572,8 +1733,8 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 43 - value: 0.07360164 + time: 23 + value: 0.017824352 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -1581,8 +1742,8 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 44 - value: 0.07360164 + time: 24 + value: 0.017824352 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -1590,8 +1751,8 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 45 - value: 0.07360164 + time: 25 + value: 0.017824352 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -1599,8 +1760,8 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 46 - value: 0.07360164 + time: 26 + value: 0.017824352 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -1608,8 +1769,8 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 47 - value: 0.07360164 + time: 27 + value: 0.017824352 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -1617,35 +1778,35 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 48 - value: 0.07360164 - inSlope: 0 - outSlope: 0 + time: 28 + value: 0.017824352 + inSlope: -0.0011588712 + outSlope: -0.0011588712 tangentMode: 0 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 49 - value: 0.07360164 - inSlope: 0 - outSlope: 0 + time: 29 + value: 0.015506609 + inSlope: -0.0025438066 + outSlope: -0.0025438066 tangentMode: 0 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 50 - value: 0.07360164 - inSlope: 0 - outSlope: 0 + time: 30 + value: 0.012736739 + inSlope: -0.0013849353 + outSlope: -0.0013849353 tangentMode: 0 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 51 - value: 0.07360164 + time: 31 + value: 0.012736739 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -1653,8 +1814,8 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 52 - value: 0.07360164 + time: 32 + value: 0.012736739 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -1662,8 +1823,8 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 53 - value: 0.07360164 + time: 33 + value: 0.012736739 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -1671,8 +1832,8 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 54 - value: 0.07360164 + time: 34 + value: 0.012736739 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -1680,8 +1841,8 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 55 - value: 0.07360164 + time: 35 + value: 0.012736739 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -1689,8 +1850,8 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 56 - value: 0.07360164 + time: 36 + value: 0.012736739 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -1698,8 +1859,8 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 57 - value: 0.07360164 + time: 37 + value: 0.012736739 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -1707,8 +1868,8 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 58 - value: 0.07360164 + time: 38 + value: 0.012736739 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -1716,8 +1877,8 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 59 - value: 0.07360164 + time: 39 + value: 0.012736739 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -1725,27 +1886,17 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 60 - value: 0.07360164 + time: 40 + value: 0.012736739 inSlope: 0 outSlope: 0 tangentMode: 0 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: sparsityCurve - path: - classID: 114 - script: {fileID: 11500000, guid: 37ab87ce3d4646a2acf848037c5236da, type: 3} - - curve: - serializedVersion: 2 - m_Curve: - serializedVersion: 3 - time: -1 - value: 0 + time: 41 + value: 0.012736739 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -1753,8 +1904,8 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0 - value: 0 + time: 42 + value: 0.012736739 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -1762,8 +1913,8 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1 - value: 0 + time: 43 + value: 0.012736739 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -1771,8 +1922,8 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 2 - value: 0 + time: 44 + value: 0.012736739 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -1780,8 +1931,8 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 3 - value: 0 + time: 45 + value: 0.012736739 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -1789,8 +1940,8 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 4 - value: 0 + time: 46 + value: 0.012736739 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -1798,53 +1949,53 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 5 - value: 0 - inSlope: 0.16666666 - outSlope: 0.16666666 + time: 47 + value: 0.012736739 + inSlope: 0 + outSlope: 0 tangentMode: 0 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 6 - value: 0.3333333 - inSlope: 0.16666666 - outSlope: 0.16666666 + time: 48 + value: 0.012736739 + inSlope: 0 + outSlope: 0 tangentMode: 0 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 7 - value: 0.3333333 - inSlope: -0.16666666 - outSlope: -0.16666666 + time: 49 + value: 0.012736739 + inSlope: 0 + outSlope: 0 tangentMode: 0 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 8 - value: 0 - inSlope: -0.16666666 - outSlope: -0.16666666 + time: 50 + value: 0.012736739 + inSlope: 0.001206947 + outSlope: 0.001206947 tangentMode: 0 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 9 - value: 0 - inSlope: 0 - outSlope: 0 + time: 51 + value: 0.015150633 + inSlope: 0.001206947 + outSlope: 0.001206947 tangentMode: 0 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 10 - value: 0 + time: 52 + value: 0.015150633 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -1852,8 +2003,8 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 11 - value: 0 + time: 53 + value: 0.015150633 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -1861,8 +2012,8 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 12 - value: 0 + time: 54 + value: 0.015150633 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -1870,8 +2021,8 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 13 - value: 0 + time: 55 + value: 0.015150633 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -1879,8 +2030,8 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 14 - value: 0 + time: 56 + value: 0.015150633 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -1888,8 +2039,8 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 15 - value: 0 + time: 57 + value: 0.015150633 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -1897,8 +2048,8 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 16 - value: 0 + time: 58 + value: 0.015150633 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -1906,8 +2057,8 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 17 - value: 0 + time: 59 + value: 0.015150633 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -1915,8 +2066,8 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 18 - value: 0 + time: 60 + value: 0.015150633 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -1924,8 +2075,8 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 19 - value: 0 + time: 61 + value: 0.015150633 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -1933,8 +2084,8 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 20 - value: 0 + time: 62 + value: 0.015150633 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -1942,8 +2093,8 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 21 - value: 0 + time: 63 + value: 0.015150633 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -1951,8 +2102,8 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 22 - value: 0 + time: 64 + value: 0.015150633 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -1960,8 +2111,8 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 23 - value: 0 + time: 65 + value: 0.015150633 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -1969,8 +2120,8 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 24 - value: 0 + time: 66 + value: 0.015150633 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -1978,8 +2129,8 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 25 - value: 0 + time: 67 + value: 0.015150633 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -1987,8 +2138,8 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 26 - value: 0 + time: 68 + value: 0.015150633 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -1996,8 +2147,8 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 27 - value: 0 + time: 69 + value: 0.015150633 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -2005,8 +2156,8 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 28 - value: 0 + time: 70 + value: 0.015150633 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -2014,8 +2165,8 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 29 - value: 0 + time: 71 + value: 0.015150633 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -2023,8 +2174,8 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 30 - value: 0 + time: 72 + value: 0.015150633 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -2032,8 +2183,8 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 31 - value: 0 + time: 73 + value: 0.015150633 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -2041,8 +2192,8 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 32 - value: 0 + time: 74 + value: 0.015150633 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -2050,8 +2201,8 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 33 - value: 0 + time: 75 + value: 0.015150633 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -2059,8 +2210,8 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 34 - value: 0 + time: 76 + value: 0.015150633 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -2068,8 +2219,8 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 35 - value: 0 + time: 77 + value: 0.015150633 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -2077,8 +2228,8 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 36 - value: 0 + time: 78 + value: 0.015150633 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -2086,8 +2237,8 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 37 - value: 0 + time: 79 + value: 0.015150633 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -2095,8 +2246,1126 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 38 - value: 0 + time: 80 + value: 0.015150633 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: sparsityCurve + path: + classID: 114 + script: {fileID: 11500000, guid: 37ab87ce3d4646a2acf848037c5236da, type: 3} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: -1 + value: 0 + inSlope: 0.4271211 + outSlope: 0.4271211 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0 + value: 0.4271211 + inSlope: 0.2479691 + outSlope: 0.2479691 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0.4959382 + inSlope: 0.05926478 + outSlope: 0.05926478 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 2 + value: 0.54565066 + inSlope: -0.06807341 + outSlope: -0.06807341 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 3 + value: 0.3597914 + inSlope: -0.09292963 + outSlope: -0.09292963 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 4 + value: 0.3597914 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 5 + value: 0.3597914 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 6 + value: 0.3597914 + inSlope: 0.09076241 + outSlope: 0.09076241 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 7 + value: 0.5413162 + inSlope: 0.09076241 + outSlope: 0.09076241 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 8 + value: 0.5413162 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 9 + value: 0.5413162 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 10 + value: 0.5413162 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 11 + value: 0.5413162 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 12 + value: 0.5413162 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 13 + value: 0.5413162 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 14 + value: 0.5413162 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 15 + value: 0.5413162 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 16 + value: 0.5413162 + inSlope: -0.09895326 + outSlope: -0.09895326 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 17 + value: 0.3434097 + inSlope: -0.09895326 + outSlope: -0.09895326 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 18 + value: 0.3434097 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 19 + value: 0.3434097 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 20 + value: 0.3434097 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 21 + value: 0.3434097 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 22 + value: 0.3434097 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 23 + value: 0.3434097 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 24 + value: 0.3434097 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 25 + value: 0.3434097 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 26 + value: 0.3434097 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 27 + value: 0.3434097 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 28 + value: 0.3434097 + inSlope: 0.033521682 + outSlope: 0.033521682 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 29 + value: 0.41045305 + inSlope: 0.09076975 + outSlope: 0.09076975 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 30 + value: 0.5249492 + inSlope: 0.05724807 + outSlope: 0.05724807 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 31 + value: 0.5249492 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 32 + value: 0.5249492 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 33 + value: 0.5249492 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 34 + value: 0.5249492 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 35 + value: 0.5249492 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 36 + value: 0.5249492 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 37 + value: 0.5249492 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 38 + value: 0.5249492 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 39 + value: 0.5249492 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 40 + value: 0.5249492 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 41 + value: 0.5249492 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 42 + value: 0.5249492 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 43 + value: 0.5249492 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 44 + value: 0.5249492 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 45 + value: 0.5249492 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 46 + value: 0.5249492 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 47 + value: 0.5249492 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 48 + value: 0.5249492 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 49 + value: 0.5249492 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 50 + value: 0.5249492 + inSlope: -0.11839779 + outSlope: -0.11839779 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 51 + value: 0.28815362 + inSlope: -0.11839779 + outSlope: -0.11839779 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 52 + value: 0.28815362 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 53 + value: 0.28815362 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 54 + value: 0.28815362 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 55 + value: 0.28815362 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 56 + value: 0.28815362 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 57 + value: 0.28815362 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 58 + value: 0.28815362 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 59 + value: 0.28815362 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 60 + value: 0.28815362 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 61 + value: 0.28815362 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 62 + value: 0.28815362 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 63 + value: 0.28815362 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 64 + value: 0.28815362 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 65 + value: 0.28815362 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 66 + value: 0.28815362 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 67 + value: 0.28815362 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 68 + value: 0.28815362 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 69 + value: 0.28815362 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 70 + value: 0.28815362 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 71 + value: 0.28815362 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 72 + value: 0.28815362 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 73 + value: 0.28815362 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 74 + value: 0.28815362 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 75 + value: 0.28815362 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 76 + value: 0.28815362 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 77 + value: 0.28815362 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 78 + value: 0.28815362 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 79 + value: 0.28815362 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 80 + value: 0.28815362 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: enemyStandardDeviationCurve + path: + classID: 114 + script: {fileID: 11500000, guid: 37ab87ce3d4646a2acf848037c5236da, type: 3} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: -1 + value: 0 + inSlope: 0.056819487 + outSlope: 0.056819487 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0 + value: 0.056819487 + inSlope: 0.028409744 + outSlope: 0.028409744 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0.056819487 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 2 + value: 0.056819487 + inSlope: -0.002944911 + outSlope: -0.002944911 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 3 + value: 0.050929666 + inSlope: -0.002944911 + outSlope: -0.002944911 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 4 + value: 0.050929666 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 5 + value: 0.050929666 + inSlope: -0.011086726 + outSlope: -0.011086726 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 6 + value: 0.028756214 + inSlope: -0.011086726 + outSlope: -0.011086726 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 7 + value: 0.028756214 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 8 + value: 0.028756214 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 9 + value: 0.028756214 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 10 + value: 0.028756214 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 11 + value: 0.028756214 + inSlope: -0.0048504444 + outSlope: -0.0048504444 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 12 + value: 0.019055326 + inSlope: -0.0048504444 + outSlope: -0.0048504444 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 13 + value: 0.019055326 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 14 + value: 0.019055326 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 15 + value: 0.019055326 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 16 + value: 0.019055326 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 17 + value: 0.019055326 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 18 + value: 0.019055326 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 19 + value: 0.019055326 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 20 + value: 0.019055326 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 21 + value: 0.019055326 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 22 + value: 0.019055326 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 23 + value: 0.019055326 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 24 + value: 0.019055326 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 25 + value: 0.019055326 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 26 + value: 0.019055326 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 27 + value: 0.019055326 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 28 + value: 0.019055326 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 29 + value: 0.019055326 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 30 + value: 0.019055326 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 31 + value: 0.019055326 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 32 + value: 0.019055326 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 33 + value: 0.019055326 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 34 + value: 0.019055326 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 35 + value: 0.019055326 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 36 + value: 0.019055326 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 37 + value: 0.019055326 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 38 + value: 0.019055326 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -2105,7 +3374,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 39 - value: 0 + value: 0.019055326 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -2114,7 +3383,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 40 - value: 0 + value: 0.019055326 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -2123,7 +3392,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 41 - value: 0 + value: 0.019055326 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -2132,7 +3401,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 42 - value: 0 + value: 0.019055326 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -2141,7 +3410,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 43 - value: 0 + value: 0.019055326 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -2150,16 +3419,26 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 44 - value: 0 + value: 0.019055326 inSlope: 0 outSlope: 0 tangentMode: 0 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: distanceCurve + path: + classID: 114 + script: {fileID: 11500000, guid: 37ab87ce3d4646a2acf848037c5236da, type: 3} + - curve: + serializedVersion: 2 + m_Curve: - serializedVersion: 3 time: 45 - value: 0 + value: 0.019055326 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -2168,7 +3447,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 46 - value: 0 + value: 0.019055326 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -2177,7 +3456,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 47 - value: 0 + value: 0.019055326 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -2186,16 +3465,26 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 48 - value: 0 + value: 0.019055326 inSlope: 0 outSlope: 0 tangentMode: 0 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: usageCurve + path: + classID: 114 + script: {fileID: 11500000, guid: 37ab87ce3d4646a2acf848037c5236da, type: 3} + - curve: + serializedVersion: 2 + m_Curve: - serializedVersion: 3 time: 49 - value: 0 + value: 0.019055326 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -2204,7 +3493,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 50 - value: 0 + value: 0.019055326 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -2213,7 +3502,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 51 - value: 0 + value: 0.019055326 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -2222,16 +3511,26 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 52 - value: 0 + value: 0.019055326 inSlope: 0 outSlope: 0 tangentMode: 0 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: sparsityCurve + path: + classID: 114 + script: {fileID: 11500000, guid: 37ab87ce3d4646a2acf848037c5236da, type: 3} + - curve: + serializedVersion: 2 + m_Curve: - serializedVersion: 3 time: 53 - value: 0 + value: 0.019055326 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -2240,7 +3539,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 54 - value: 0 + value: 0.019055326 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -2249,7 +3548,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 55 - value: 0 + value: 0.019055326 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -2258,16 +3557,62 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 56 - value: 0 + value: 0.019055326 inSlope: 0 outSlope: 0 tangentMode: 0 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: enemyStandardDeviationCurve + path: + classID: 114 + script: {fileID: 11500000, guid: 37ab87ce3d4646a2acf848037c5236da, type: 3} + - curve: + serializedVersion: 2 + m_Curve: - serializedVersion: 3 - time: 57 + time: -1 value: 0 + inSlope: 0.23011148 + outSlope: 0.23011148 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0 + value: 0.23011148 + inSlope: 0.04803802 + outSlope: 0.04803802 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0.096076034 + inSlope: -0.099189304 + outSlope: -0.099189304 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 2 + value: 0.03173287 + inSlope: -0.032171585 + outSlope: -0.032171585 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 3 + value: 0.03173287 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -2275,8 +3620,8 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 58 - value: 0 + time: 4 + value: 0.03173287 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -2284,8 +3629,8 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 59 - value: 0 + time: 5 + value: 0.03173287 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -2293,45 +3638,143 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 60 - value: 0 + time: 6 + value: 0.03173287 inSlope: 0 outSlope: 0 tangentMode: 0 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: enemyStandardDeviationCurve - path: - classID: 114 - script: {fileID: 11500000, guid: 37ab87ce3d4646a2acf848037c5236da, type: 3} - - curve: - serializedVersion: 2 - m_Curve: - serializedVersion: 3 - time: -1 - value: 0 - inSlope: 0.056819487 - outSlope: 0.056819487 + time: 7 + value: 0.03173287 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 8 + value: 0.03173287 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 9 + value: 0.03173287 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 10 + value: 0.03173287 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 11 + value: 0.03173287 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 12 + value: 0.03173287 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 13 + value: 0.03173287 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 14 + value: 0.03173287 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 15 + value: 0.03173287 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 16 + value: 0.03173287 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 17 + value: 0.03173287 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 18 + value: 0.03173287 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 19 + value: 0.03173287 + inSlope: 0 + outSlope: 0 tangentMode: 0 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0 - value: 0.056819487 - inSlope: 0.028409744 - outSlope: 0.028409744 + time: 20 + value: 0.03173287 + inSlope: 0 + outSlope: 0 tangentMode: 0 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1 - value: 0.056819487 + time: 21 + value: 0.03173287 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -2339,26 +3782,26 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 2 - value: 0.056819487 - inSlope: -0.002944911 - outSlope: -0.002944911 + time: 22 + value: 0.03173287 + inSlope: 0 + outSlope: 0 tangentMode: 0 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 3 - value: 0.050929666 - inSlope: -0.002944911 - outSlope: -0.002944911 + time: 23 + value: 0.03173287 + inSlope: 0 + outSlope: 0 tangentMode: 0 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 4 - value: 0.050929666 + time: 24 + value: 0.03173287 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -2366,26 +3809,26 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 5 - value: 0.050929666 - inSlope: -0.011086726 - outSlope: -0.011086726 + time: 25 + value: 0.03173287 + inSlope: 0 + outSlope: 0 tangentMode: 0 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 6 - value: 0.028756214 - inSlope: -0.011086726 - outSlope: -0.011086726 + time: 26 + value: 0.03173287 + inSlope: 0 + outSlope: 0 tangentMode: 0 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 7 - value: 0.028756214 + time: 27 + value: 0.03173287 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -2393,8 +3836,8 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 8 - value: 0.028756214 + time: 28 + value: 0.03173287 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -2402,8 +3845,8 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 9 - value: 0.028756214 + time: 29 + value: 0.03173287 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -2411,8 +3854,8 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 10 - value: 0.028756214 + time: 30 + value: 0.03173287 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -2420,26 +3863,26 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 11 - value: 0.028756214 - inSlope: -0.0048504444 - outSlope: -0.0048504444 + time: 31 + value: 0.03173287 + inSlope: 0 + outSlope: 0 tangentMode: 0 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 12 - value: 0.019055326 - inSlope: -0.0048504444 - outSlope: -0.0048504444 + time: 32 + value: 0.03173287 + inSlope: 0 + outSlope: 0 tangentMode: 0 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 13 - value: 0.019055326 + time: 33 + value: 0.03173287 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -2447,8 +3890,8 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 14 - value: 0.019055326 + time: 34 + value: 0.03173287 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -2456,8 +3899,8 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 15 - value: 0.019055326 + time: 35 + value: 0.03173287 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -2465,8 +3908,8 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 16 - value: 0.019055326 + time: 36 + value: 0.03173287 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -2474,8 +3917,8 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 17 - value: 0.019055326 + time: 37 + value: 0.03173287 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -2483,8 +3926,8 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 18 - value: 0.019055326 + time: 38 + value: 0.03173287 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -2492,8 +3935,8 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 19 - value: 0.019055326 + time: 39 + value: 0.03173287 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -2501,8 +3944,8 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 20 - value: 0.019055326 + time: 40 + value: 0.03173287 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -2510,8 +3953,8 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 21 - value: 0.019055326 + time: 41 + value: 0.03173287 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -2519,8 +3962,8 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 22 - value: 0.019055326 + time: 42 + value: 0.03173287 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -2528,8 +3971,8 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 23 - value: 0.019055326 + time: 43 + value: 0.03173287 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -2537,8 +3980,8 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 24 - value: 0.019055326 + time: 44 + value: 0.03173287 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -2546,8 +3989,8 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 25 - value: 0.019055326 + time: 45 + value: 0.03173287 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -2555,8 +3998,8 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 26 - value: 0.019055326 + time: 46 + value: 0.03173287 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -2564,8 +4007,8 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 27 - value: 0.019055326 + time: 47 + value: 0.03173287 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -2573,8 +4016,8 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 28 - value: 0.019055326 + time: 48 + value: 0.03173287 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -2582,8 +4025,8 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 29 - value: 0.019055326 + time: 49 + value: 0.03173287 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -2591,8 +4034,8 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 30 - value: 0.019055326 + time: 50 + value: 0.03173287 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -2600,8 +4043,8 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 31 - value: 0.019055326 + time: 51 + value: 0.03173287 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -2609,8 +4052,8 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 32 - value: 0.019055326 + time: 52 + value: 0.03173287 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -2618,8 +4061,8 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 33 - value: 0.019055326 + time: 53 + value: 0.03173287 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -2627,8 +4070,8 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 34 - value: 0.019055326 + time: 54 + value: 0.03173287 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -2636,8 +4079,8 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 35 - value: 0.019055326 + time: 55 + value: 0.03173287 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -2645,8 +4088,8 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 36 - value: 0.019055326 + time: 56 + value: 0.03173287 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -2654,8 +4097,8 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 37 - value: 0.019055326 + time: 57 + value: 0.03173287 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -2663,8 +4106,8 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 38 - value: 0.019055326 + time: 58 + value: 0.03173287 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -2672,8 +4115,8 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 39 - value: 0.019055326 + time: 59 + value: 0.03173287 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -2681,8 +4124,8 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 40 - value: 0.019055326 + time: 60 + value: 0.03173287 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -2690,8 +4133,8 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 41 - value: 0.019055326 + time: 61 + value: 0.03173287 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -2699,8 +4142,8 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 42 - value: 0.019055326 + time: 62 + value: 0.03173287 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -2708,8 +4151,8 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 43 - value: 0.019055326 + time: 63 + value: 0.03173287 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -2717,33 +4160,17 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 44 - value: 0.019055326 + time: 64 + value: 0.03173287 inSlope: 0 outSlope: 0 ->>>>>>> Develop tangentMode: 0 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: distanceCurve - path: - classID: 114 - script: {fileID: 11500000, guid: 37ab87ce3d4646a2acf848037c5236da, type: 3} - - curve: - serializedVersion: 2 - m_Curve: - serializedVersion: 3 -<<<<<<< HEAD - time: -1 - value: 0 -======= - time: 45 - value: 0.019055326 ->>>>>>> Develop + time: 65 + value: 0.03173287 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -2751,13 +4178,8 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 -<<<<<<< HEAD - time: 0 - value: 0 -======= - time: 46 - value: 0.019055326 ->>>>>>> Develop + time: 66 + value: 0.03173287 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -2765,13 +4187,8 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 -<<<<<<< HEAD - time: 1 - value: 0 -======= - time: 47 - value: 0.019055326 ->>>>>>> Develop + time: 67 + value: 0.03173287 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -2779,229 +4196,116 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 -<<<<<<< HEAD - time: 2 - value: 0 -======= - time: 48 - value: 0.019055326 ->>>>>>> Develop + time: 68 + value: 0.03173287 inSlope: 0 outSlope: 0 tangentMode: 0 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: usageCurve - path: - classID: 114 - script: {fileID: 11500000, guid: 37ab87ce3d4646a2acf848037c5236da, type: 3} - - curve: - serializedVersion: 2 - m_Curve: - serializedVersion: 3 -<<<<<<< HEAD - time: -1 - value: 0 - inSlope: 1.851249 - outSlope: 1.851249 -======= - time: 49 - value: 0.019055326 + time: 69 + value: 0.03173287 inSlope: 0 outSlope: 0 ->>>>>>> Develop tangentMode: 0 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 -<<<<<<< HEAD - time: 0 - value: 1.851249 - inSlope: 0.118540764 - outSlope: 0.118540764 -======= - time: 50 - value: 0.019055326 + time: 70 + value: 0.03173287 inSlope: 0 outSlope: 0 ->>>>>>> Develop tangentMode: 0 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 -<<<<<<< HEAD - time: 1 - value: 0.2370815 - inSlope: -0.8070837 - outSlope: -0.8070837 -======= - time: 51 - value: 0.019055326 + time: 71 + value: 0.03173287 inSlope: 0 outSlope: 0 ->>>>>>> Develop tangentMode: 0 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 -<<<<<<< HEAD - time: 2 - value: 0.2370815 -======= - time: 52 - value: 0.019055326 ->>>>>>> Develop + time: 72 + value: 0.03173287 inSlope: 0 outSlope: 0 tangentMode: 0 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: sparsityCurve - path: - classID: 114 - script: {fileID: 11500000, guid: 37ab87ce3d4646a2acf848037c5236da, type: 3} - - curve: - serializedVersion: 2 - m_Curve: - serializedVersion: 3 -<<<<<<< HEAD - time: -1 - value: 0 - inSlope: 0.396294 - outSlope: 0.396294 -======= - time: 53 - value: 0.019055326 + time: 73 + value: 0.03173287 inSlope: 0 outSlope: 0 ->>>>>>> Develop tangentMode: 0 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 -<<<<<<< HEAD - time: 0 - value: 0.396294 - inSlope: 0.40124807 - outSlope: 0.40124807 -======= - time: 54 - value: 0.019055326 + time: 74 + value: 0.03173287 inSlope: 0 outSlope: 0 ->>>>>>> Develop tangentMode: 0 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 -<<<<<<< HEAD - time: 1 - value: 0.80249614 - inSlope: 0.20310107 - outSlope: 0.20310107 -======= - time: 55 - value: 0.019055326 + time: 75 + value: 0.03173287 inSlope: 0 outSlope: 0 ->>>>>>> Develop tangentMode: 0 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 -<<<<<<< HEAD - time: 2 - value: 0.80249614 -======= - time: 56 - value: 0.019055326 ->>>>>>> Develop + time: 76 + value: 0.03173287 inSlope: 0 outSlope: 0 tangentMode: 0 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: enemyStandardDeviationCurve - path: - classID: 114 - script: {fileID: 11500000, guid: 37ab87ce3d4646a2acf848037c5236da, type: 3} - - curve: - serializedVersion: 2 - m_Curve: - serializedVersion: 3 -<<<<<<< HEAD - time: -1 - value: 0 - inSlope: 0.7589286 - outSlope: 0.7589286 -======= - time: 57 - value: 0.019055326 + time: 77 + value: 0.03173287 inSlope: 0 outSlope: 0 ->>>>>>> Develop tangentMode: 0 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 -<<<<<<< HEAD - time: 0 - value: 0.7589286 - inSlope: 0.039344937 - outSlope: 0.039344937 -======= - time: 58 - value: 0.019055326 + time: 78 + value: 0.03173287 inSlope: 0 outSlope: 0 ->>>>>>> Develop tangentMode: 0 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 -<<<<<<< HEAD - time: 1 - value: 0.07868984 - inSlope: -0.34011936 - outSlope: -0.34011936 -======= - time: 59 - value: 0.019055326 + time: 79 + value: 0.03173287 inSlope: 0 outSlope: 0 ->>>>>>> Develop tangentMode: 0 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 -<<<<<<< HEAD - time: 2 - value: 0.07868984 -======= - time: 60 - value: 0.019055326 ->>>>>>> Develop + time: 80 + value: 0.03173287 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -3029,11 +4333,7 @@ AnimationClip: m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 -<<<<<<< HEAD - m_StopTime: 2 -======= - m_StopTime: 60 ->>>>>>> Develop + m_StopTime: 80 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 diff --git a/Assets/Resources/ScriptableObjectsData/GeneratorSettings.asset b/Assets/Resources/ScriptableObjectsData/GeneratorSettings.asset index 78184e01e..2d75d801d 100644 --- a/Assets/Resources/ScriptableObjectsData/GeneratorSettings.asset +++ b/Assets/Resources/ScriptableObjectsData/GeneratorSettings.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 82b5a5fb4f7242858b860727e706ca44, type: 3} m_Name: GeneratorSettings m_EditorClassIdentifier: - k__BackingField: 1 + k__BackingField: 0 k__BackingField: 1 k__BackingField: {x: 28, y: 24} k__BackingField: 1 diff --git a/Assets/Scripts/Game/DataCollection/GameplayData.cs b/Assets/Scripts/Game/DataCollection/GameplayData.cs index ed15934ab..48a905b6b 100644 --- a/Assets/Scripts/Game/DataCollection/GameplayData.cs +++ b/Assets/Scripts/Game/DataCollection/GameplayData.cs @@ -1,20 +1,722 @@ -using UnityEngine; -/* -#if !UNITY_WEBGL || UNITY_EDITOR - using Firebase.Firestore; - using Firebase.Extensions; -#else - using FirebaseWebGLBridge = FirebaseWebGL.Scripts.FirebaseBridge; -#endif -*/ +using System; +using System.Collections; +using System.Collections.Generic; +using System.IO; +using System.Linq; +using System.Text; +using Game.Events; +using Game.GameManager; +using Game.LevelManager.DungeonLoader; +using Game.LevelManager.DungeonManager; +using Game.NarrativeGenerator; +using Game.DataInterfaces; +using ScriptableObjects; +using Util; +using UnityEngine; using Firebase.Firestore; using Firebase.Extensions; using FirebaseWebGLBridge = FirebaseWebGL.Scripts.FirebaseBridge; +using Game.GameManager.Player; +using Game.EnemyManager; +using Game.Dialogues; namespace Game.DataCollection { - public class GameplayData + public class CombatRoomInfo + { + public int RoomId { get; set; } + public bool HasEnemies { get; set; } + public int NEnemies { get; set; } + public EnemyByAmountDictionary EnemiesDictionary { get; set; } + public int PlayerInitHealth { get; set; } + public int PlayerFinalHealth { get; set; } + public int TimeToExit { get; set; } + } + + public class GameplayData : MonoBehaviour { + private const string Csv = ".csv"; + private const string PostDataURL = "http://damicore.icmc.usp.br/pag/data/upload.php?"; + private static int POST_QUESTIONS = 12; + private static int NUMBER_OF_ENEMIES = 210; + + public static event SendGameAndPlayerDataEvent SendGameAndPlayerDataEventHandler; + public static GameplayData instance = null; + + + [SerializeField] + private string profileString; + [SerializeField] + private string heatMapString; + [SerializeField] + private string levelProfileString; + [SerializeField] + private string detailedLevelProfileString; + + + [SerializeField] private string sessionUID; + + + [SerializeField] + private List preFormAnswers = new List(); + + + [SerializeField] + private string levelID = null; + [SerializeField] + private int elapsedTime = 0; + // 0 if the player gave up or died, 1 if the player completed the level + [SerializeField] + private bool hasFinished = false; + // 0 if the player gave up or completed the level, 1 if the player died + [SerializeField] + private bool hasDied = false; + [SerializeField] + private int totalKeys = 0; + [SerializeField] + private int collectedKeys = 0; + [SerializeField] + private int totalLocks = 0; + [SerializeField] + private int openedLocks = 0; + [SerializeField] + private int totalRooms = 0; + [SerializeField] + private int numberOfVisitedRooms = 0; + [SerializeField] + private int totalVisits = 0; + [SerializeField] + private int numberOfOverVisitedRooms = 0; + [SerializeField] + private int playerInitialHealth = 0; + [SerializeField] + private int playerFinalHealth = 0; + [SerializeField] + private int playerLostHealth = 0; + [SerializeField] + private int numberOfEnemies = 0; + [SerializeField] + private int numberOfKilledEnemies = 0; + [field: SerializeField] public int NumberOfNpCs { get; private set; } = 0; + [field: SerializeField] public int NumberOfInteractedNpCs { get; private set; } = 0; + [field: SerializeField] public int TotalTreasures { get; private set; } + [field: SerializeField] public int TreasureCollected { get; private set; } = 0; + [field: SerializeField] public int MAXCombo { get; private set; } = 0; + public List PostFormAnswers { get; private set; } = new List(); + + + [SerializeField] + private int[,] heatMap; + + + // Auxiliary variables + private List playedLevels = new List(); + private Map map; + private int attempts = 0; + private bool pretestAnswered = false; + System.Diagnostics.Stopwatch stopWatch = new System.Diagnostics.Stopwatch(); + public List visitedRooms = new List(); + public int actualCombo = 0; + + + // Player type classification + private PlayerProfile playerProfile; + private PlayerProfile givenPlayerProfile; + + + // Enemy Generator Data + protected List combatInfoList; + protected int difficultyLevel; // TODO SET IT WITH THE NARRATIVE JSON + protected List damageDoneByEnemy; + protected int timesPlayerDied; + public CombatRoomInfo actualRoomInfo = new CombatRoomInfo(); + + + void Awake() + { + //Singleton + if (instance == null) + { + instance = this; + combatInfoList = new List(); + } + else if (instance != this) + { + Destroy(gameObject); + } + DontDestroyOnLoad(gameObject); + } + + // Use this for initialization + void Start() + { + // FIXME: utilizar uma ID única corretamente + string dateTime = System.DateTime.Now.ToString(); + dateTime = dateTime.Replace("/", "-"); + dateTime = dateTime.Replace(" ", "-"); + dateTime = dateTime.Replace(":", "-"); + sessionUID = UnityEngine.Random.Range(0, 9999).ToString("00"); + sessionUID += "_"; + sessionUID += dateTime; + } + + protected void OnEnable() + { + ProjectileController.EnemyHitEventHandler += IncrementCombo; + ProjectileController.PlayerHitEventHandler += ResetCombo; + BombController.PlayerHitEventHandler += ResetCombo; + EnemyController.PlayerHitEventHandler += ResetCombo; + TreasureController.TreasureCollectEventHandler += GetTreasure; + DungeonSceneManager.NewLevelLoadedEventHandler += ResetMaxCombo; + DungeonSceneManager.NewLevelLoadedEventHandler += ResetTreasure; + GameManagerSingleton.GameStartEventHandler += OnGameStart; + RoomBhv.EnterRoomEventHandler += OnRoomEnter; + KeyBhv.KeyCollectEventHandler += OnGetKey; + HealthController.PlayerIsDamagedEventHandler += OnEnemyDoesDamage; + TriforceBhv.GotTriforceEventHandler += OnMapComplete; + PlayerController.PlayerDeathEventHandler += OnDeath; + FormBhv.PreTestFormQuestionAnsweredEventHandler += OnPreTestFormAnswered; + FormBhv.PostTestFormQuestionAnsweredEventHandler += OnPostTestFormAnswered; + DungeonPlayer.ExitRoomEventHandler += OnRoomExit; + DoorBhv.KeyUsedEventHandler += OnKeyUsed; + DungeonLoader.StartMapEventHandler += OnMapStart; + QuestGeneratorManager.ProfileSelectedEventHandler += OnProfileSelected; + ExperimentController.ProfileSelectedEventHandler += OnExperimentProfileSelected; + EnemyController.KillEnemyEventHandler += OnKillEnemy; + DialogueController.DialogueOpenEventHandler += OnInteractNPC; + } + + protected void OnDisable() + { + ProjectileController.EnemyHitEventHandler -= IncrementCombo; + ProjectileController.PlayerHitEventHandler -= ResetCombo; + BombController.PlayerHitEventHandler -= ResetCombo; + EnemyController.PlayerHitEventHandler -= ResetCombo; + TreasureController.TreasureCollectEventHandler -= GetTreasure; + DungeonSceneManager.NewLevelLoadedEventHandler -= ResetMaxCombo; + DungeonSceneManager.NewLevelLoadedEventHandler -= ResetTreasure; + GameManagerSingleton.GameStartEventHandler -= OnGameStart; + RoomBhv.EnterRoomEventHandler -= OnRoomEnter; + KeyBhv.KeyCollectEventHandler -= OnGetKey; + HealthController.PlayerIsDamagedEventHandler -= OnEnemyDoesDamage; + TriforceBhv.GotTriforceEventHandler -= OnMapComplete; + PlayerController.PlayerDeathEventHandler -= OnDeath; + FormBhv.PreTestFormQuestionAnsweredEventHandler -= OnPreTestFormAnswered; + FormBhv.PostTestFormQuestionAnsweredEventHandler -= OnPostTestFormAnswered; + DungeonPlayer.ExitRoomEventHandler -= OnRoomExit; + DoorBhv.KeyUsedEventHandler -= OnKeyUsed; + QuestGeneratorManager.ProfileSelectedEventHandler -= OnProfileSelected; + ExperimentController.ProfileSelectedEventHandler -= OnExperimentProfileSelected; + EnemyController.KillEnemyEventHandler -= OnKillEnemy; + DialogueController.DialogueOpenEventHandler -= OnInteractNPC; + } + + //From FormBHV + private void OnPreTestFormAnswered(object sender, FormAnsweredEventArgs eventArgs) + { + preFormAnswers = eventArgs.AnswerValue; + } + + private void OnPostTestFormAnswered(object sender, FormAnsweredEventArgs eventArgs) + { + PostFormAnswers = eventArgs.AnswerValue; + } + + private void OnProfileSelected(object sender, ProfileSelectedEventArgs eventArgs) + { + playerProfile = eventArgs.PlayerProfile; + } + + private void OnExperimentProfileSelected(object sender, ProfileSelectedEventArgs eventArgs) + { + givenPlayerProfile = eventArgs.PlayerProfile; + } + + private void IncrementCombo(object sender, EventArgs eventArgs) + { + actualCombo++; + } + + private void ResetCombo(object sender, EventArgs eventArgs) + { + if (actualCombo > MAXCombo) + MAXCombo = actualCombo; + actualCombo = 0; + } + + private void ResetMaxCombo(object sender, EventArgs eventArgs) + { + actualCombo = 0; + MAXCombo = 0; + } + + private void GetTreasure(object sender, TreasureCollectEventArgs eventArgs) + { + TreasureCollected += eventArgs.Amount; + } + + private void ResetTreasure(object sender, EventArgs eventArgs) + { + TreasureCollected = 0; + } + + //From KeyBHV + private void OnGetKey(object sender, KeyCollectEventArgs eventArgs) + { + //Log + collectedKeys++; + //TODO also save key Index + } + + //From DoorBHV + private void OnKeyUsed(object sender, KeyUsedEventArgs eventArgs) + { + //Log + openedLocks++; + //Mais métricas - organiza em TAD + } + + private void OnKillEnemy(object sender, EventArgs eventArgs) + { + numberOfKilledEnemies++; + } + + private void OnInteractNPC(object sender, EventArgs eventArgs) + { + NumberOfInteractedNpCs++; + } + + private void OnEnemyDoesDamage(object sender, PlayerIsDamagedEventArgs eventArgs) + { + damageDoneByEnemy[eventArgs.EnemyIndex] += eventArgs.DamageDone; + } + + //From DoorBHV + private void OnRoomEnter(object sender, EnterRoomEventArgs eventArgs) + { + //Log + //Mais métricas - organiza em TAD + visitedRooms.Add(new Vector2Int(eventArgs.RoomData.RoomCoordinates.X, eventArgs.RoomData.RoomCoordinates.Y)); + + // Collect the player health for level data + if (visitedRooms.Count == 1) + { + playerInitialHealth = eventArgs.PlayerHealthWhenEntering; + } + playerFinalHealth = eventArgs.PlayerHealthWhenEntering; + + if (eventArgs.RoomData.HasEnemies) + { + actualRoomInfo.RoomId = 10 * eventArgs.RoomData.RoomCoordinates.X + eventArgs.RoomData.RoomCoordinates.Y; + actualRoomInfo.HasEnemies = eventArgs.RoomData.HasEnemies; + actualRoomInfo.PlayerInitHealth = eventArgs.PlayerHealthWhenEntering; + actualRoomInfo.NEnemies = eventArgs.RoomData.NEnemies; + actualRoomInfo.EnemiesDictionary = eventArgs.RoomData.EnemiesByAmount; + actualRoomInfo.TimeToExit = System.Convert.ToInt32(stopWatch.ElapsedMilliseconds); + } + else + actualRoomInfo.RoomId = -1; + + // Check the room coordinates to avoid division by zero + if (eventArgs.RoomData.RoomCoordinates.X != 0 && eventArgs.RoomData.RoomCoordinates.Y != 0) { + heatMap[eventArgs.RoomData.RoomCoordinates.X / 2, eventArgs.RoomData.RoomCoordinates.Y / 2]++; + } + } + + //From DoorBHV + private void OnRoomExit(object sender, ExitRoomEventArgs eventArgs) + { + if (actualRoomInfo.RoomId != -1) + { + actualRoomInfo.PlayerFinalHealth = eventArgs.PlayerHealthWhenExiting; + actualRoomInfo.TimeToExit = Convert.ToInt32(stopWatch.ElapsedMilliseconds) - actualRoomInfo.TimeToExit; + combatInfoList.Add(actualRoomInfo); + } + } + + private void OnGameStart(object sender, EventArgs eventArgs) + { + profileString = ""; + heatMapString = ""; + levelProfileString = ""; + detailedLevelProfileString = ""; + // Enemy Generator Data + combatInfoList = new List(); + difficultyLevel = -1; + timesPlayerDied = 0; + hasFinished = false; //0 if player gave up, 1 if he completed the stage + } + + //From GameManager + private void OnMapStart(object sender, StartMapEventArgs eventArgs) + { + if (playedLevels.Contains(eventArgs.MapName)) + { + attempts++; + } + else + { + playedLevels.Add(eventArgs.MapName); + } + map = eventArgs.Map; + + // Initialize data for level data collection + levelID = eventArgs.MapName; + TotalTreasures = eventArgs.TotalTreasure; + elapsedTime = 0; + hasFinished = false; + hasDied = false; + totalKeys = map.NKeys; + collectedKeys = 0; + totalLocks = map.NLocks; + openedLocks = 0; + totalRooms = map.NRooms; + numberOfVisitedRooms = 0; + totalVisits = 0; + numberOfOverVisitedRooms = 0; + playerInitialHealth = 0; + playerFinalHealth = 0; + playerLostHealth = 0; + numberOfEnemies = map.NEnemies; + numberOfKilledEnemies = 0; + NumberOfNpCs = map.NNPCs; + NumberOfInteractedNpCs = 0; + TreasureCollected = 0; + MAXCombo = 0; + + stopWatch.Reset(); + stopWatch.Start(); + + heatMap = CreateHeatMap(map); + + combatInfoList = new List(); + damageDoneByEnemy = new int[NUMBER_OF_ENEMIES].ToList(); + } + + private void EndTheLevel() + { + stopWatch.Stop(); + elapsedTime = stopWatch.Elapsed.Seconds; + + playerLostHealth = playerInitialHealth - playerFinalHealth; + + totalVisits = visitedRooms.Count; + numberOfVisitedRooms = visitedRooms.Distinct().Count(); + numberOfOverVisitedRooms = visitedRooms + .GroupBy(x => x.ToString()) + .Count(x => x.Count() > 1); + + ResetCombo(this, EventArgs.Empty); + + //Save to remote file + SendProfileToServer(map); + + //TODO create data class to pass to ML profiler + var playerAndGameplayData = new PlayerAndGameplayData( + preFormAnswers, PostFormAnswers, hasDied, hasFinished, totalVisits, totalRooms, numberOfVisitedRooms, + collectedKeys, totalKeys, openedLocks, totalLocks, TreasureCollected, TotalTreasures, numberOfKilledEnemies, numberOfEnemies + ); + SendGameAndPlayerDataEventHandler?.Invoke( this, new SendGameAndPlayerDataArgs( playerAndGameplayData) ); + + // Reset all values + visitedRooms.Clear(); + PostFormAnswers.Clear(); + damageDoneByEnemy.Clear(); + } + + //From TriforceBHV + private void OnMapComplete(object sender, EventArgs eventArgs) + { + hasFinished = true; + EndTheLevel(); + } + + private void OnDeath(object sender, EventArgs eventArgs) + { + hasDied = true; + playerFinalHealth = 0; + timesPlayerDied++; + + if (actualRoomInfo.RoomId != -1) + { + actualRoomInfo.PlayerFinalHealth = 0; + actualRoomInfo.TimeToExit = System.Convert.ToInt32(stopWatch.ElapsedMilliseconds) - actualRoomInfo.TimeToExit; + combatInfoList.Add(actualRoomInfo); + } + + EndTheLevel(); + } + + + private int[,] CreateHeatMap(Map currentMap) + { + int[,] heatMap = new int[(currentMap.Dimensions.Width + 1) / 2, (currentMap.Dimensions.Height + 1) / 2]; + for (int i = 0; i < currentMap.Dimensions.Width / 2; ++i) + { + //string aux = ""; + for (int j = 0; j < currentMap.Dimensions.Height / 2; ++j) + { + if (currentMap.DungeonPartByCoordinates.ContainsKey(new Coordinates(i * 2, j * 2))) + { + heatMap[i, j] = 0; + } + else + { + heatMap[i, j] = -1; + } + } + //Debug.Log(aux); + } + //Debug.Log("Finished Creating HeatMap"); + return heatMap; + } + + private void WrapProfileToString() + { + profileString = ""; + profileString += "Profile,"; + profileString += "ExperimentalProfile,"; + if (preFormAnswers.Count <= 0) return; + int i = 0; + foreach (var answer in preFormAnswers) + { + profileString += "PreQuestion " + i + ","; + i++; + } + profileString += "\n"; + profileString += playerProfile.PlayerProfileEnum+","; + profileString += givenPlayerProfile.PlayerProfileEnum+","; + foreach (int answer in preFormAnswers) + { + profileString += answer + ","; + } + } + + private void WrapLevelProfileToString() + { + levelProfileString = ""; + if (attempts == 0) + { + levelProfileString += + "player_id" + "," + + "map_id" + "," + + "chosen_weapon" + "," + + "elapsed_time" + "," + + "has_finished" + "," + + "has_died" + "," + + "total_keys" + "," + + "collected_keys" + "," + + "total_locks" + "," + + "opened_locks" + "," + + "total_rooms" + "," + + "number_of_visited_rooms" + "," + + "total_visits" + "," + + "number_of_over_visited_rooms" + "," + + "player_initial_health" + "," + + "player_final_health" + "," + + "player_lost_health" + "," + + "number_of_enemies" + "," + + "number_of_killed_enemies" + "," + + "number_of_npcs" + "," + + "number_of_interacted_npcs" + "," + + "total_treasures" + "," + + "collected_treasures" + "," + + "max_combo" + ","; + // for (int i = 0; i < EnemyUtil.nBestEnemies; ++i) + // { + // levelProfileString += "Enemy" + i + "Damage,"; + // } + if (PostFormAnswers.Count > 0) + { + int i = 0; + foreach (int answer in PostFormAnswers) + { + levelProfileString += "PostQuestion " + i + ","; + i++; + } + } + else + { + for (int i = 0; i < POST_QUESTIONS; i++) + { + levelProfileString += "PostQuestion " + i + ","; + } + } + levelProfileString += "\n"; + } + + levelProfileString += + sessionUID + "," + + levelID + "," + + elapsedTime + "," + + hasFinished + "," + + hasDied + "," + + totalKeys + "," + + collectedKeys + "," + + totalLocks + "," + + openedLocks + "," + + totalRooms + "," + + numberOfVisitedRooms + "," + + totalVisits + "," + + numberOfOverVisitedRooms + "," + + playerInitialHealth + "," + + playerFinalHealth + "," + + playerLostHealth + "," + + numberOfEnemies + "," + + numberOfKilledEnemies + "," + + NumberOfNpCs + "," + + NumberOfInteractedNpCs + "," + + TotalTreasures + "," + + TreasureCollected + "," + + MAXCombo + ","; + // for (int i = 0; i < EnemyUtil.nBestEnemies; ++i) + // { + // levelProfileString += damageDoneByEnemy[i] + ","; + // } + if (PostFormAnswers.Count > 0) + { + foreach (int answer in PostFormAnswers) + { + levelProfileString += answer + ","; + } + } + else + { + for (int i = 0; i < POST_QUESTIONS; i++) + { + levelProfileString += "-1,"; + } + } + levelProfileString += "\n"; + } + + private void WrapLevelDetailedCombatProfileToString() + { + detailedLevelProfileString += "map,RoomID,playerInitialHealth,PlayerFinalHealth,HealthLost,TimeToExit,hasEnemies,nEnemies,EnemiesIds,\n"; + foreach (CombatRoomInfo info in combatInfoList) + { + detailedLevelProfileString += levelID + ","; + detailedLevelProfileString += info.RoomId + ","; + detailedLevelProfileString += info.PlayerInitHealth + ","; + detailedLevelProfileString += info.PlayerFinalHealth + ","; + detailedLevelProfileString += (info.PlayerFinalHealth - info.PlayerInitHealth) + ","; + detailedLevelProfileString += info.TimeToExit + ","; + detailedLevelProfileString += info.HasEnemies + ","; + detailedLevelProfileString += info.NEnemies + ","; + foreach (var enemy in info.EnemiesDictionary) + { + detailedLevelProfileString += "Name: " + enemy.Key.name + ","; + detailedLevelProfileString += "Amount: " + enemy.Value + ","; + } + detailedLevelProfileString += "\n"; + } + } + + private void WrapHeatMapToString(Map currentMap) + { + heatMapString = ""; + heatMapString += "map,\n"; + heatMapString += levelID + "\n"; + heatMapString += "Heatmap\n"; + for (int i = 0; i < currentMap.Dimensions.Width / 2; ++i) + { + for (int j = 0; j < currentMap.Dimensions.Height / 2; ++j) + { + heatMapString += heatMap[i, j].ToString() + ","; + } + heatMapString += "\n"; + } + //Debug.Log(heatMapString); + } + + + //File name: BatchId, MapId, SessionUID + //Player profile: N Visited Rooms, N Unique Visited Rooms, N Keys Taken, N Keys Used, Form Answer 1, Form Answer 2,Form Answer 3 + private void SendProfileToServer(Map currentMap) + { + WrapProfileToString(); + WrapHeatMapToString(currentMap); + WrapLevelProfileToString(); + WrapLevelDetailedCombatProfileToString(); + StartCoroutine(PostData("Map" + levelID, profileString, heatMapString, levelProfileString, detailedLevelProfileString)); //TODO: verificar corretamente como serão salvos os arquivos + //SaveToLocalFile("Map" + levelID, profileString, heatMapString, levelProfileString, detailedLevelProfileString); + string UploadFilePath = GameplayData.instance.sessionUID; + } + + private void SaveToLocalFile(string name, string stringData, string heatMapData, string levelData, string levelDetailedData) + { + string target = Application.streamingAssetsPath + "/PlayerData"; + if (!Directory.Exists(target)) + { + Directory.CreateDirectory(target); + } + + target += "/" + sessionUID + "-" + name; + if (!pretestAnswered) + { + using (StreamWriter writer = new StreamWriter(target + "-Player" + Csv, true, Encoding.UTF8)) + { + writer.Write(stringData); + writer.Flush(); + writer.Close(); + } + pretestAnswered = true; + } + + using (StreamWriter writer = new StreamWriter(target + "-Heatmap" + Csv, true, Encoding.UTF8)) + { + writer.Write(heatMapData); + writer.Flush(); + writer.Close(); + } + + using (StreamWriter writer = new StreamWriter(target + "-Level" + Csv, true, Encoding.UTF8)) + { + writer.Write(levelData); + writer.Flush(); + writer.Close(); + } + + using (StreamWriter writer = new StreamWriter(target + "-Detailed" + Csv, true, Encoding.UTF8)) + { + writer.Write(levelDetailedData); + writer.Flush(); + writer.Close(); + } + } + + private IEnumerator PostData(string name, string stringData, string heatMapData, string levelData, string levelDetailedData) + { + name = sessionUID + "-" + name; + byte[] data = System.Text.Encoding.UTF8.GetBytes(stringData); + byte[] heatMapBinary = System.Text.Encoding.UTF8.GetBytes(heatMapData); + byte[] levelBinary = System.Text.Encoding.UTF8.GetBytes(levelData); + byte[] levelDetailedBinary = System.Text.Encoding.UTF8.GetBytes(levelDetailedData); + //This connects to a server side php script that will write the data + //string post_url = postDataURL + "name=" + WWW.EscapeURL(name) + "&data=" + data ; + string post_url = PostDataURL; + WWWForm form = new WWWForm(); + form.AddField("name", sessionUID); + form.AddBinaryData("data", data, name + "-Player" + Csv, "text/csv"); + form.AddBinaryData("heatmap", heatMapBinary, name + "-Heatmap" + Csv, "text/csv"); + form.AddBinaryData("level", levelBinary, name + "-Level" + Csv, "text/csv"); + form.AddBinaryData("detailed", levelDetailedBinary, name + "-Detailed" + Csv, "text/csv"); + + // Post the URL to the site and create a download object to get the result. + WWW data_post = new WWW(post_url, form); + yield return data_post; // Wait until the download is done + + if (data_post.error != null) + { + print("There was an error saving data: " + data_post.error); + } + } + + private static void ProcessPlayerData () + { + // PythonRunner.RunFile($"{Application.dataPath}/ensure_naming.py"); + } + public void SendProfileToServer(PlayerData playerData) { @@ -40,4 +742,4 @@ public void SendProfileToServer(PlayerData playerData) } } -} \ No newline at end of file +} diff --git a/Assets/Scripts/Game/DataCollection/PlayerDataController.cs b/Assets/Scripts/Game/DataCollection/PlayerDataController.cs index a01d2283e..89925c8f4 100644 --- a/Assets/Scripts/Game/DataCollection/PlayerDataController.cs +++ b/Assets/Scripts/Game/DataCollection/PlayerDataController.cs @@ -74,7 +74,7 @@ private void OnDisable() private void Awake() { - _gameplayData = new GameplayData(); + _gameplayData = gameObject.AddComponent(); } private void Start() diff --git a/Assets/Scripts/Game/DataInterfaces.meta b/Assets/Scripts/Game/DataInterfaces.meta new file mode 100644 index 000000000..54eb8e7ea --- /dev/null +++ b/Assets/Scripts/Game/DataInterfaces.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 38f8a8d51fd04712a5fc2cc61bbe18c3 +timeCreated: 1645033412 \ No newline at end of file diff --git a/Assets/Scripts/Game/DataInterfaces/PlayerAndGameplayData.cs b/Assets/Scripts/Game/DataInterfaces/PlayerAndGameplayData.cs new file mode 100644 index 000000000..d4c997ebd --- /dev/null +++ b/Assets/Scripts/Game/DataInterfaces/PlayerAndGameplayData.cs @@ -0,0 +1,101 @@ +using System; +using System.Collections.Generic; + +namespace Game.DataInterfaces +{ + public class PlayerAndGameplayData + { + public PlayerAndGameplayData(List preTestAnswers, List postTestAnswers, + bool hasDied, bool hasFinished, int totalVisits, int totalRooms, + int numberOfVisitedRooms, int collectedKeys, int totalKeys, int openedLocks, + int totalLocks, int collectedTreasures, int totalTreasures, int enemiesDefeated, + int totalEnemies) + { + _hasDied = Convert.ToInt32(hasDied); + _hasFinished = Convert.ToInt32(hasFinished); + _totalVisits = totalVisits; + _totalRooms = totalRooms; + _numberOfVisitedRooms = numberOfVisitedRooms; + _collectedKeys = collectedKeys; + _totalKeys = totalKeys; + _openedLocks = openedLocks; + _totalLocks = totalLocks; + _collectedTreasures = collectedTreasures; + _totalTreasures = totalTreasures; + _enemiesDefeated = enemiesDefeated; + _totalEnemies = totalEnemies; + + PreTestAnswers.AddRange( preTestAnswers ); + PostTestAnswers.AddRange( postTestAnswers ); + } + + private int _hasDied; + private int _hasFinished; + private int _totalVisits; + private int _totalRooms; + private int _numberOfVisitedRooms; + private int _collectedKeys; + private int _totalKeys; + private int _openedLocks; + private int _totalLocks; + private int _collectedTreasures; + private int _totalTreasures; + private int _enemiesDefeated; + private int _totalEnemies; + public List PreTestAnswers { get; set; } + public List PostTestAnswers { get; set; } + + public int HasDied + { + get => _hasDied; + } + public int HasFinished + { + get => _hasFinished; + } + public int TotalVisits + { + get => _totalVisits; + } + public int TotalRooms + { + get => _totalRooms; + } + public int NumberOfVisitedRooms + { + get => _numberOfVisitedRooms; + } + public int CollectedKeys + { + get => _collectedKeys; + } + public int TotalKeys + { + get => _totalKeys; + } + public int OpenedLocks + { + get => _openedLocks; + } + public int TotalLocks + { + get => _totalLocks; + } + public int CollectedTreasures + { + get => _collectedTreasures; + } + public int TotalTreasures + { + get => _totalTreasures; + } + public int EnemiesDefeated + { + get => _enemiesDefeated; + } + public int TotalEnemies + { + get => _totalEnemies; + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/Game/DataInterfaces/PlayerAndGameplayData.cs.meta b/Assets/Scripts/Game/DataInterfaces/PlayerAndGameplayData.cs.meta new file mode 100644 index 000000000..058923578 --- /dev/null +++ b/Assets/Scripts/Game/DataInterfaces/PlayerAndGameplayData.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 895743a96dcf48e49a9ab9ec515e8653 +timeCreated: 1645033447 \ No newline at end of file diff --git a/Assets/Scripts/Game/Events/EnterRoomEvent.cs b/Assets/Scripts/Game/Events/EnterRoomEvent.cs index 4975b6e95..7c738dc32 100644 --- a/Assets/Scripts/Game/Events/EnterRoomEvent.cs +++ b/Assets/Scripts/Game/Events/EnterRoomEvent.cs @@ -4,6 +4,7 @@ using Game.LevelManager; using UnityEngine; using Util; +using Game.GameManager.Player; namespace Game.Events { @@ -12,10 +13,12 @@ public class EnterRoomEventArgs : EventArgs { public RoomData RoomData { get; set; } public Vector3 PositionInScene { get; set; } + public int PlayerHealthWhenEntering { get; set; } public EnterRoomEventArgs(Coordinates roomCoordinates, Dimensions roomDimensions, EnemyByAmountDictionary enemiesInRoom, Vector3 roomPosition) { PositionInScene = roomPosition; + PlayerHealthWhenEntering = DungeonPlayer.Instance.GetComponent().GetHealth(); var enterTime = Time.realtimeSinceStartup; RoomData = ScriptableObject.CreateInstance(); RoomData.Init(roomCoordinates, roomDimensions, enemiesInRoom, enterTime); diff --git a/Assets/Scripts/Game/Events/ProfileAnalystFinishedEvent.cs b/Assets/Scripts/Game/Events/ProfileAnalystFinishedEvent.cs new file mode 100644 index 000000000..c4697e3e1 --- /dev/null +++ b/Assets/Scripts/Game/Events/ProfileAnalystFinishedEvent.cs @@ -0,0 +1,22 @@ +using System; +using System.Collections.Generic; + +namespace Game.Events +{ + public delegate void ProfileAnalystFinishedEvent(object sender, ProfileAnalystFinishedEventArgs e); + public class ProfileAnalystFinishedEventArgs : EventArgs + { + private Dictionary answerByQuestion; + + public ProfileAnalystFinishedEventArgs(Dictionary answerByQuestion) + { + AnswerByQuestion = answerByQuestion; + } + + public Dictionary AnswerByQuestion + { + get => answerByQuestion; + set => answerByQuestion = value; + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/Game/Events/ProfileAnalystFinishedEvent.cs.meta b/Assets/Scripts/Game/Events/ProfileAnalystFinishedEvent.cs.meta new file mode 100644 index 000000000..1f6109be8 --- /dev/null +++ b/Assets/Scripts/Game/Events/ProfileAnalystFinishedEvent.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: a7a22e171b574706a6fc25af9b6af21b +timeCreated: 1644989644 \ No newline at end of file diff --git a/Assets/Scripts/Game/Events/SendGameAndPlayerDataEvent.cs b/Assets/Scripts/Game/Events/SendGameAndPlayerDataEvent.cs new file mode 100644 index 000000000..33909624c --- /dev/null +++ b/Assets/Scripts/Game/Events/SendGameAndPlayerDataEvent.cs @@ -0,0 +1,24 @@ +using System; +using Game.EnemyGenerator; +using Game.DataInterfaces; + +namespace Game.Events +{ + public delegate void SendGameAndPlayerDataEvent(object sender, SendGameAndPlayerDataArgs e); + + public class SendGameAndPlayerDataArgs : EventArgs + { + private PlayerAndGameplayData playerGameplayData; + + public SendGameAndPlayerDataArgs(PlayerAndGameplayData playerGameplayData) + { + PlayerGameplayData = playerGameplayData; + } + + public PlayerAndGameplayData PlayerGameplayData + { + get => playerGameplayData; + set => playerGameplayData = value; + } + } +} diff --git a/Assets/Scripts/Game/Events/SendGameAndPlayerDataEvent.cs.meta b/Assets/Scripts/Game/Events/SendGameAndPlayerDataEvent.cs.meta new file mode 100644 index 000000000..8c8f55e0d --- /dev/null +++ b/Assets/Scripts/Game/Events/SendGameAndPlayerDataEvent.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 6d4d83ef680bd64429283c4a10d2b6a6 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Game/Events/TreasureCollectEvent.cs b/Assets/Scripts/Game/Events/TreasureCollectEvent.cs index 70674b47e..92d8aa11c 100644 --- a/Assets/Scripts/Game/Events/TreasureCollectEvent.cs +++ b/Assets/Scripts/Game/Events/TreasureCollectEvent.cs @@ -9,6 +9,7 @@ public class TreasureCollectEventArgs : EventArgs { public int QuestId { get; set; } public ItemSo Item { get; set; } + public int Amount = 1; public TreasureCollectEventArgs(ItemSo item, int questId) { diff --git a/Assets/Scripts/Game/GameManager/ExperimentController.cs b/Assets/Scripts/Game/GameManager/ExperimentController.cs index b79593f6f..8d030d8ef 100644 --- a/Assets/Scripts/Game/GameManager/ExperimentController.cs +++ b/Assets/Scripts/Game/GameManager/ExperimentController.cs @@ -93,6 +93,7 @@ private void LoadDataForExperiment(object sender, ProfileSelectedEventArgs profi { PlayerProfile selectedProfile; + // if (UseTrueProfile()) if (sender.GetType() == typeof(RealTimeLevelSelectManager)) { selectedProfile = profileSelectedEventArgs.PlayerProfile; @@ -114,6 +115,13 @@ private void LoadDataForExperiment(object sender, ProfileSelectedEventArgs profi } ProfileSelectedEventHandler?.Invoke(null, new ProfileSelectedEventArgs(selectedProfile)); } + SetQuestLinesForProfile(selectedProfile); + ProfileSelectedEventHandler?.Invoke(null, new ProfileSelectedEventArgs(selectedProfile)); + } + + private static bool UseTrueProfile() + { + return RandomSingleton.GetInstance().Random.Next(0, 100) < 100; } } } \ No newline at end of file diff --git a/Assets/Scripts/Game/GameManager/PostFormMenuBHV.cs b/Assets/Scripts/Game/GameManager/PostFormMenuBHV.cs new file mode 100644 index 000000000..40c4004bb --- /dev/null +++ b/Assets/Scripts/Game/GameManager/PostFormMenuBHV.cs @@ -0,0 +1,55 @@ +using System; +using TMPro; +using UnityEngine; +using UnityEngine.SceneManagement; +using UnityEngine.UI; +using Game.MenuManager; + +namespace Game.GameManager +{ + public class PostFormMenuBHV : MonoBehaviour, IMenuPanel + { + [SerializeField] + GameObject nextPanel; + [SerializeField] + TextMeshProUGUI postFormText; + [SerializeField] + Button playMoreButton; + //TODO FIX THE GAMBIARRA + private const string noMoreLevelsText = "Você jogou todos os níveis.\n Incrível!\n" + + "Infelizmente não temos mais níveis para jogar\n" + + "Mas agradecemos muito a sua colaboração neste experimento\n" + + "Para sair, é só fechar a janela!"; + + private void OnEnable() + { + playMoreButton.interactable = false; + var hasMoreLevels = !GameManagerSingleton.Instance.IsLastQuestLine; + if (hasMoreLevels) return; + postFormText.text = noMoreLevelsText; + ExperimentController.ProfileSelectedEventHandler += NewProfileSelected; + } + + private void OnDisable() + { + ExperimentController.ProfileSelectedEventHandler -= NewProfileSelected; + } + + public void GoToNext() + { + gameObject.SetActive(false); + SceneManager.LoadScene("Overworld"); + } + + private void NewProfileSelected(object sender, EventArgs e) + { + playMoreButton.interactable = true; + } + + + public void GoToPrevious() + { + Debug.LogError("There is no Panel to Go Back To!"); + } + } +} diff --git a/Assets/Scripts/Game/GameManager/PostFormMenuBHV.cs.meta b/Assets/Scripts/Game/GameManager/PostFormMenuBHV.cs.meta new file mode 100644 index 000000000..05baab365 --- /dev/null +++ b/Assets/Scripts/Game/GameManager/PostFormMenuBHV.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 70bd0887dd65ca04d97a762b1ea6d766 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Game/LevelManager/DungeonManager/RoomBhv.cs b/Assets/Scripts/Game/LevelManager/DungeonManager/RoomBhv.cs index 1be24b8ca..23ed68e2f 100644 --- a/Assets/Scripts/Game/LevelManager/DungeonManager/RoomBhv.cs +++ b/Assets/Scripts/Game/LevelManager/DungeonManager/RoomBhv.cs @@ -12,6 +12,7 @@ using Util; using Game.Quests; using UnityEngine.Tilemaps; +using PlatformGame.Player; namespace Game.LevelManager.DungeonManager { diff --git a/Assets/Scripts/Game/NarrativeGenerator/QuestGeneratorManager.cs b/Assets/Scripts/Game/NarrativeGenerator/QuestGeneratorManager.cs index b48fbd351..f80b02290 100644 --- a/Assets/Scripts/Game/NarrativeGenerator/QuestGeneratorManager.cs +++ b/Assets/Scripts/Game/NarrativeGenerator/QuestGeneratorManager.cs @@ -93,10 +93,10 @@ private async void SelectPlayerProfile(object sender, ProfileTesterEventArgs e) private async void SelectPlayerProfile(object sender, EventArgs eventArgs) { - var playerProfile = ProfileCalculator.CreateProfile(CurrentPlayerDataController.CurrentPlayer, CurrentDungeonDataController.CurrentDungeon); + await CreateOrLoadNarrativeForProfile(playerProfile); - } + } private async Task CreateOrLoadNarrativeForProfile(PlayerProfile playerProfile) { @@ -110,7 +110,7 @@ private async Task CreateOrLoadNarrativeForProfile(PlayerProfile playerProfile) ProfileSelectedEventHandler?.Invoke(this, new ProfileSelectedEventArgs(playerProfile)); } } - + private void Start() { _enemyGeneratorManager = GetComponent(); diff --git a/Assets/Scripts/Game/NarrativeGenerator/Selector.cs b/Assets/Scripts/Game/NarrativeGenerator/Selector.cs index a5c4d1532..0e1cb346b 100644 --- a/Assets/Scripts/Game/NarrativeGenerator/Selector.cs +++ b/Assets/Scripts/Game/NarrativeGenerator/Selector.cs @@ -8,6 +8,7 @@ using MyBox; using UnityEngine; using Util; +using System.Net.NetworkInformation; namespace Game.NarrativeGenerator { @@ -46,8 +47,8 @@ private static void CreateQuestLineForEachNpc(QuestLineList questLineList) { CreateQuestLineForNpc(npcInCharge, questLineList); } - } - + } + private static void CreateQuestLineForNpc ( NpcSo npcInCharge, QuestLineList questLineList) { var questLine = CreateQuestLine(); @@ -86,7 +87,7 @@ private static void CreateQuestDict () { _wasQuestAdded.Add(nameof(KillQuestSo), false); } - + private static void UpdateListContents (QuestLine questLine) { foreach (var quest in questLine.Quests.Where(quest => quest != null)) diff --git a/Assets/Scripts/Game/PlatformGame/Util/CalculateSpawnPoints.cs b/Assets/Scripts/Game/PlatformGame/Util/CalculateSpawnPoints.cs index afef14a6e..50f7c3ff5 100644 --- a/Assets/Scripts/Game/PlatformGame/Util/CalculateSpawnPoints.cs +++ b/Assets/Scripts/Game/PlatformGame/Util/CalculateSpawnPoints.cs @@ -4,7 +4,7 @@ namespace PlatformGame.Util { - public class CalculateSpawnPoints : MonoBehaviour + public class CalculateSpawnPoints { private int _startPosX, _startPosY; private Vector3 _roomLossyScale;