diff --git a/Assets/Animations/The Chase/Ooh, The Chase~.anim b/Assets/Animations/The Chase/Ooh, The Chase~.anim index de76c1c..c8311b0 100644 --- a/Assets/Animations/The Chase/Ooh, The Chase~.anim +++ b/Assets/Animations/The Chase/Ooh, The Chase~.anim @@ -28,16 +28,16 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 0.33333334 + time: 0.75 value: {x: -2.27, y: 0.2, z: 5.42} - inSlope: {x: 2.122826, y: -0.92608696, z: -1.8508697} - outSlope: {x: 2.122826, y: -0.92608696, z: -1.8508697} + inSlope: {x: 1.6692308, y: -0.7282051, z: -1.4553846} + outSlope: {x: 1.6692308, y: -0.7282051, z: -1.4553846} tangentMode: 0 weightedMode: 0 inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 1.5333333 + time: 1.95 value: {x: -0.044, y: -0.38, z: 3.489} inSlope: {x: 4.0082116, y: 0, z: 0} outSlope: {x: 9.745956, y: 0, z: 0} @@ -46,7 +46,7 @@ AnimationClip: inWeight: {x: 0.37609997, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 1.6666666 + time: 2.0833333 value: {x: 0.645, y: -0.378, z: 3.508} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -54,18 +54,9 @@ AnimationClip: weightedMode: 0 inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - - serializedVersion: 3 - time: 1.8333334 - value: {x: 0, y: -0.38, z: 3.49} - inSlope: {x: 0, y: 0, z: 0} - outSlope: {x: 0, y: 0, z: 0} - tangentMode: 0 - weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 2.25 - value: {x: 0.247, y: -0.379, z: 3.496} + value: {x: 0, y: -0.38, z: 3.49} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -74,6 +65,15 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 2.6666667 + value: {x: 0.247, y: -0.379, z: 3.496} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 3.0833333 value: {x: 0, y: -0.38, z: 3.49} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -82,7 +82,7 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 2.9166667 + time: 3.3333333 value: {x: 0.402, y: -0.379, z: 3.501} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -91,7 +91,7 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 3.3 + time: 3.7166667 value: {x: -0.329, y: -0.381, z: 3.48} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -100,7 +100,7 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 3.4 + time: 3.8166666 value: {x: 0.284, y: -0.338, z: 3.635} inSlope: {x: 2.3713043, y: 0.1147826, z: 0.4252177} outSlope: {x: 5.432757, y: 0.38916695, z: 0.6304357} @@ -109,7 +109,7 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.1313459, y: 0.13725291, z: 0.13725291} - serializedVersion: 3 - time: 4.8333335 + time: 5.25 value: {x: 5.26, y: 3.12, z: 11.72} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -135,16 +135,16 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 0.33333334 + time: 0.75 value: {x: 0.07, y: 0.22, z: 0.22} - inSlope: {x: 0.18260871, y: 0.57391304, z: 0.57391304} - outSlope: {x: 0.18260871, y: 0.57391304, z: 0.57391304} + inSlope: {x: 0.14358974, y: 0.45128202, z: 0.45128202} + outSlope: {x: 0.14358974, y: 0.45128202, z: 0.45128202} tangentMode: 0 weightedMode: 0 inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 1.5333333 + time: 1.95 value: {x: 1, y: 1, z: 1} inSlope: {x: 1.9979328, y: 1.0125, z: 0} outSlope: {x: -14.01605, y: 1.0125, z: 0} @@ -153,7 +153,7 @@ AnimationClip: inWeight: {x: 0.10389527, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.57070005, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 1.6666666 + time: 2.0833333 value: {x: 0.43, y: 1.57, z: 1} inSlope: {x: -7.6189804, y: 0, z: 0} outSlope: {x: 3.4199984, y: 0, z: 0} @@ -162,7 +162,7 @@ AnimationClip: inWeight: {x: 0.6731532, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 1.8333334 + time: 2.25 value: {x: 1, y: 1, z: 1} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -171,7 +171,7 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 2.6666667 + time: 3.0833333 value: {x: 1, y: 1, z: 1} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -180,7 +180,7 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 2.9166667 + time: 3.3333333 value: {x: 1, y: 1, z: 1} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -189,7 +189,7 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 3.3 + time: 3.7166667 value: {x: 0.43, y: 1, z: 1} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -198,7 +198,7 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 3.4333334 + time: 3.85 value: {x: 1.18, y: 1, z: 1} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -207,7 +207,7 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 4.1666665 + time: 4.5833335 value: {x: 0.23, y: 1, z: 1} inSlope: {x: -1.0615386, y: 0, z: 0} outSlope: {x: -1.0615386, y: 0, z: 0} @@ -216,16 +216,16 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 4.3 - value: {x: 0, y: 0.89599955, z: 0.89599955} - inSlope: {x: 0, y: -1.4400017, z: -1.4400017} - outSlope: {x: 0, y: -1.4400017, z: -1.4400017} + time: 4.7166667 + value: {x: 0, y: 0.89600015, z: 0.89600015} + inSlope: {x: 0, y: -1.4399995, z: -1.4399995} + outSlope: {x: 0, y: -1.4399995, z: -1.4399995} tangentMode: 0 weightedMode: 0 inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 4.8333335 + time: 5.25 value: {x: 0, y: 0, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -252,7 +252,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.33333334 + time: 0.75 value: 100 inSlope: 0 outSlope: 0 @@ -261,7 +261,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1.5333333 + time: 1.95 value: 0 inSlope: -180.3934 outSlope: 0 @@ -270,7 +270,7 @@ AnimationClip: inWeight: 0.11665484 outWeight: 0.33333334 - serializedVersion: 3 - time: 1.6666666 + time: 2.0833333 value: 53.5 inSlope: 0 outSlope: 0 @@ -279,7 +279,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1.8333334 + time: 2.25 value: 0 inSlope: 0 outSlope: 0 @@ -288,7 +288,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 2.6666667 + time: 3.0833333 value: 0 inSlope: 0 outSlope: 0 @@ -297,7 +297,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 3.3 + time: 3.7166667 value: 0 inSlope: 0 outSlope: 0 @@ -306,7 +306,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 3.55 + time: 3.9666667 value: 60.29 inSlope: 0 outSlope: 0 @@ -336,7 +336,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.33333334 + time: 0.75 value: 0.93 inSlope: -0 outSlope: 0 @@ -345,7 +345,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1.5333333 + time: 1.95 value: 0 inSlope: -3.3436704 outSlope: -3.3436704 @@ -354,7 +354,7 @@ AnimationClip: inWeight: 0.10591729 outWeight: 0.33333334 - serializedVersion: 3 - time: 1.6666666 + time: 2.0833333 value: 1.21 inSlope: -3.3436704 outSlope: -3.3436704 @@ -363,7 +363,7 @@ AnimationClip: inWeight: 0.10591729 outWeight: 0.33333334 - serializedVersion: 3 - time: 1.8333334 + time: 2.25 value: -0.46 inSlope: 0 outSlope: 0 @@ -372,7 +372,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1.9666667 + time: 2.3833334 value: 0 inSlope: 0 outSlope: 0 @@ -380,18 +380,18 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - - serializedVersion: 3 - time: 2.25 - value: 0 - inSlope: -3.3436704 - outSlope: -3.3436704 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.10591729 - outWeight: 0.33333334 - serializedVersion: 3 time: 2.6666667 value: 0 + inSlope: -3.3436704 + outSlope: -3.3436704 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.10591729 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 3.0833333 + value: 0 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -399,7 +399,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 2.9166667 + time: 3.3333333 value: 0 inSlope: -3.3436704 outSlope: -3.3436704 @@ -408,7 +408,7 @@ AnimationClip: inWeight: 0.10591729 outWeight: 0.33333334 - serializedVersion: 3 - time: 3.3 + time: 3.7166667 value: 0 inSlope: 0 outSlope: 0 @@ -417,7 +417,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 3.55 + time: 3.9666667 value: 0.45 inSlope: 0 outSlope: 0 @@ -441,22 +441,22 @@ AnimationClip: time: 0 value: -0.45 inSlope: 0 - outSlope: -2.34 + outSlope: -1.0400001 tangentMode: 65 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.33333334 + time: 0.75 value: -1.23 - inSlope: -2.34 + inSlope: -1.0400001 outSlope: 1.6159433 tangentMode: 5 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.11623818 - serializedVersion: 3 - time: 1.5333333 + time: 1.95 value: 0 inSlope: 0.51066005 outSlope: 0 @@ -465,7 +465,7 @@ AnimationClip: inWeight: 0.22015592 outWeight: 0.33333334 - serializedVersion: 3 - time: 1.6666666 + time: 2.0833333 value: 0 inSlope: -0 outSlope: 0 @@ -473,15 +473,6 @@ AnimationClip: weightedMode: 0 inWeight: 0.083308734 outWeight: 0.33333334 - - serializedVersion: 3 - time: 1.8333334 - value: 0 - inSlope: -0 - outSlope: 0 - tangentMode: 69 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - serializedVersion: 3 time: 2.25 value: 0 @@ -489,7 +480,7 @@ AnimationClip: outSlope: 0 tangentMode: 69 weightedMode: 0 - inWeight: 0.083308734 + inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 time: 2.6666667 @@ -498,10 +489,19 @@ AnimationClip: outSlope: 0 tangentMode: 69 weightedMode: 0 + inWeight: 0.083308734 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 3.0833333 + value: 0 + inSlope: -0 + outSlope: 0 + tangentMode: 69 + weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 2.9166667 + time: 3.3333333 value: 0 inSlope: -0 outSlope: 0 @@ -510,7 +510,7 @@ AnimationClip: inWeight: 0.083308734 outWeight: 0.33333334 - serializedVersion: 3 - time: 3.3 + time: 3.7166667 value: 0 inSlope: 0 outSlope: 0 @@ -519,7 +519,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 3.55 + time: 3.9666667 value: 0.27 inSlope: 0 outSlope: 0 @@ -549,7 +549,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.33333334 + time: 0.75 value: 0 inSlope: 0 outSlope: 0 @@ -558,7 +558,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1.5333333 + time: 1.95 value: 0 inSlope: 0 outSlope: 0 @@ -567,16 +567,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1.6666666 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1.8333334 + time: 2.0833333 value: 0 inSlope: 0 outSlope: 0 @@ -603,7 +594,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 2.9166667 + time: 3.0833333 value: 0 inSlope: 0 outSlope: 0 @@ -612,7 +603,16 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 3.3 + time: 3.3333333 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 3.7166667 value: 0 inSlope: 0 outSlope: 0 @@ -642,7 +642,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.33333334 + time: 0.75 value: 0 inSlope: 0 outSlope: 0 @@ -651,7 +651,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1.5333333 + time: 1.95 value: 0 inSlope: 0 outSlope: 0 @@ -660,16 +660,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1.6666666 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1.8333334 + time: 2.0833333 value: 0 inSlope: 0 outSlope: 0 @@ -696,7 +687,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 2.9166667 + time: 3.0833333 value: 0 inSlope: 0 outSlope: 0 @@ -705,7 +696,16 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 3.3 + time: 3.3333333 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 3.7166667 value: 0 inSlope: 0 outSlope: 0 @@ -735,7 +735,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1.5333333 + time: 1.95 value: 0 inSlope: 0 outSlope: 0 @@ -744,7 +744,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1.6666666 + time: 2.0833333 value: 0 inSlope: 0 outSlope: 0 @@ -753,7 +753,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 3.55 + time: 3.9666667 value: 0 inSlope: 0 outSlope: 0 @@ -783,7 +783,7 @@ AnimationClip: inWeight: 0 outWeight: 0 - serializedVersion: 3 - time: 0.33333334 + time: 0.75 value: 1 inSlope: Infinity outSlope: Infinity @@ -792,7 +792,7 @@ AnimationClip: inWeight: 0 outWeight: 0 - serializedVersion: 3 - time: 4.8333335 + time: 5.25 value: 0 inSlope: Infinity outSlope: Infinity @@ -903,7 +903,7 @@ AnimationClip: m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 4.8333335 + m_StopTime: 5.25 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 @@ -933,16 +933,16 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.33333334 + time: 0.75 value: -2.27 - inSlope: 2.122826 - outSlope: 2.122826 + inSlope: 1.6692308 + outSlope: 1.6692308 tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1.5333333 + time: 1.95 value: -0.044 inSlope: 4.0082116 outSlope: 9.745956 @@ -951,7 +951,7 @@ AnimationClip: inWeight: 0.37609997 outWeight: 0.33333334 - serializedVersion: 3 - time: 1.6666666 + time: 2.0833333 value: 0.645 inSlope: 0 outSlope: 0 @@ -959,18 +959,9 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - - serializedVersion: 3 - time: 1.8333334 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - serializedVersion: 3 time: 2.25 - value: 0.247 + value: 0 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -979,6 +970,15 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 2.6666667 + value: 0.247 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 3.0833333 value: 0 inSlope: 0 outSlope: 0 @@ -987,7 +987,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 2.9166667 + time: 3.3333333 value: 0.402 inSlope: 0 outSlope: 0 @@ -996,7 +996,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 3.3 + time: 3.7166667 value: -0.329 inSlope: 0 outSlope: 0 @@ -1005,7 +1005,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 3.4 + time: 3.8166666 value: 0.284 inSlope: 2.3713043 outSlope: 5.432757 @@ -1014,7 +1014,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.1313459 - serializedVersion: 3 - time: 4.8333335 + time: 5.25 value: 5.26 inSlope: 0 outSlope: 0 @@ -1044,16 +1044,16 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.33333334 + time: 0.75 value: 0.2 - inSlope: -0.92608696 - outSlope: -0.92608696 + inSlope: -0.7282051 + outSlope: -0.7282051 tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1.5333333 + time: 1.95 value: -0.38 inSlope: 0 outSlope: 0 @@ -1062,7 +1062,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1.6666666 + time: 2.0833333 value: -0.378 inSlope: 0 outSlope: 0 @@ -1070,18 +1070,9 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - - serializedVersion: 3 - time: 1.8333334 - value: -0.38 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - serializedVersion: 3 time: 2.25 - value: -0.379 + value: -0.38 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -1090,15 +1081,6 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 2.6666667 - value: -0.38 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 2.9166667 value: -0.379 inSlope: 0 outSlope: 0 @@ -1107,7 +1089,25 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 3.3 + time: 3.0833333 + value: -0.38 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 3.3333333 + value: -0.379 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 3.7166667 value: -0.381 inSlope: 0 outSlope: 0 @@ -1116,7 +1116,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 3.4 + time: 3.8166666 value: -0.338 inSlope: 0.1147826 outSlope: 0.38916695 @@ -1125,7 +1125,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.13725291 - serializedVersion: 3 - time: 4.8333335 + time: 5.25 value: 3.12 inSlope: 0 outSlope: 0 @@ -1155,16 +1155,16 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.33333334 + time: 0.75 value: 5.42 - inSlope: -1.8508697 - outSlope: -1.8508697 + inSlope: -1.4553846 + outSlope: -1.4553846 tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1.5333333 + time: 1.95 value: 3.489 inSlope: 0 outSlope: 0 @@ -1173,7 +1173,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1.6666666 + time: 2.0833333 value: 3.508 inSlope: 0 outSlope: 0 @@ -1181,18 +1181,9 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - - serializedVersion: 3 - time: 1.8333334 - value: 3.49 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - serializedVersion: 3 time: 2.25 - value: 3.496 + value: 3.49 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -1201,6 +1192,15 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 2.6666667 + value: 3.496 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 3.0833333 value: 3.49 inSlope: 0 outSlope: 0 @@ -1209,7 +1209,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 2.9166667 + time: 3.3333333 value: 3.501 inSlope: 0 outSlope: 0 @@ -1218,7 +1218,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 3.3 + time: 3.7166667 value: 3.48 inSlope: 0 outSlope: 0 @@ -1227,7 +1227,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 3.4 + time: 3.8166666 value: 3.635 inSlope: 0.4252177 outSlope: 0.6304357 @@ -1236,7 +1236,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.13725291 - serializedVersion: 3 - time: 4.8333335 + time: 5.25 value: 11.72 inSlope: 0 outSlope: 0 @@ -1266,7 +1266,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.33333334 + time: 0.75 value: 100 inSlope: 0 outSlope: 0 @@ -1275,7 +1275,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1.5333333 + time: 1.95 value: 0 inSlope: -180.3934 outSlope: 0 @@ -1284,7 +1284,7 @@ AnimationClip: inWeight: 0.11665484 outWeight: 0.33333334 - serializedVersion: 3 - time: 1.6666666 + time: 2.0833333 value: 53.5 inSlope: 0 outSlope: 0 @@ -1293,7 +1293,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1.8333334 + time: 2.25 value: 0 inSlope: 0 outSlope: 0 @@ -1302,7 +1302,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 2.6666667 + time: 3.0833333 value: 0 inSlope: 0 outSlope: 0 @@ -1311,7 +1311,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 3.3 + time: 3.7166667 value: 0 inSlope: 0 outSlope: 0 @@ -1320,7 +1320,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 3.55 + time: 3.9666667 value: 60.29 inSlope: 0 outSlope: 0 @@ -1350,7 +1350,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.33333334 + time: 0.75 value: 0.93 inSlope: -0 outSlope: 0 @@ -1359,7 +1359,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1.5333333 + time: 1.95 value: 0 inSlope: -3.3436704 outSlope: -3.3436704 @@ -1368,7 +1368,7 @@ AnimationClip: inWeight: 0.10591729 outWeight: 0.33333334 - serializedVersion: 3 - time: 1.6666666 + time: 2.0833333 value: 1.21 inSlope: -3.3436704 outSlope: -3.3436704 @@ -1377,7 +1377,7 @@ AnimationClip: inWeight: 0.10591729 outWeight: 0.33333334 - serializedVersion: 3 - time: 1.8333334 + time: 2.25 value: -0.46 inSlope: 0 outSlope: 0 @@ -1386,7 +1386,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1.9666667 + time: 2.3833334 value: 0 inSlope: 0 outSlope: 0 @@ -1394,18 +1394,18 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - - serializedVersion: 3 - time: 2.25 - value: 0 - inSlope: -3.3436704 - outSlope: -3.3436704 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.10591729 - outWeight: 0.33333334 - serializedVersion: 3 time: 2.6666667 value: 0 + inSlope: -3.3436704 + outSlope: -3.3436704 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.10591729 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 3.0833333 + value: 0 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -1413,7 +1413,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 2.9166667 + time: 3.3333333 value: 0 inSlope: -3.3436704 outSlope: -3.3436704 @@ -1422,7 +1422,7 @@ AnimationClip: inWeight: 0.10591729 outWeight: 0.33333334 - serializedVersion: 3 - time: 3.3 + time: 3.7166667 value: 0 inSlope: 0 outSlope: 0 @@ -1431,7 +1431,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 3.55 + time: 3.9666667 value: 0.45 inSlope: 0 outSlope: 0 @@ -1455,22 +1455,22 @@ AnimationClip: time: 0 value: -0.45 inSlope: 0 - outSlope: -2.34 + outSlope: -1.0400001 tangentMode: 65 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.33333334 + time: 0.75 value: -1.23 - inSlope: -2.34 + inSlope: -1.0400001 outSlope: 1.6159433 tangentMode: 5 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.11623818 - serializedVersion: 3 - time: 1.5333333 + time: 1.95 value: 0 inSlope: 0.51066005 outSlope: 0 @@ -1479,7 +1479,7 @@ AnimationClip: inWeight: 0.22015592 outWeight: 0.33333334 - serializedVersion: 3 - time: 1.6666666 + time: 2.0833333 value: 0 inSlope: -0 outSlope: 0 @@ -1487,15 +1487,6 @@ AnimationClip: weightedMode: 0 inWeight: 0.083308734 outWeight: 0.33333334 - - serializedVersion: 3 - time: 1.8333334 - value: 0 - inSlope: -0 - outSlope: 0 - tangentMode: 69 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - serializedVersion: 3 time: 2.25 value: 0 @@ -1503,7 +1494,7 @@ AnimationClip: outSlope: 0 tangentMode: 69 weightedMode: 0 - inWeight: 0.083308734 + inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 time: 2.6666667 @@ -1512,10 +1503,19 @@ AnimationClip: outSlope: 0 tangentMode: 69 weightedMode: 0 + inWeight: 0.083308734 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 3.0833333 + value: 0 + inSlope: -0 + outSlope: 0 + tangentMode: 69 + weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 2.9166667 + time: 3.3333333 value: 0 inSlope: -0 outSlope: 0 @@ -1524,7 +1524,7 @@ AnimationClip: inWeight: 0.083308734 outWeight: 0.33333334 - serializedVersion: 3 - time: 3.3 + time: 3.7166667 value: 0 inSlope: 0 outSlope: 0 @@ -1533,7 +1533,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 3.55 + time: 3.9666667 value: 0.27 inSlope: 0 outSlope: 0 @@ -1563,7 +1563,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.33333334 + time: 0.75 value: 0 inSlope: 0 outSlope: 0 @@ -1572,7 +1572,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1.5333333 + time: 1.95 value: 0 inSlope: 0 outSlope: 0 @@ -1581,16 +1581,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1.6666666 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1.8333334 + time: 2.0833333 value: 0 inSlope: 0 outSlope: 0 @@ -1617,7 +1608,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 2.9166667 + time: 3.0833333 value: 0 inSlope: 0 outSlope: 0 @@ -1626,7 +1617,16 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 3.3 + time: 3.3333333 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 3.7166667 value: 0 inSlope: 0 outSlope: 0 @@ -1656,7 +1656,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.33333334 + time: 0.75 value: 0 inSlope: 0 outSlope: 0 @@ -1665,7 +1665,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1.5333333 + time: 1.95 value: 0 inSlope: 0 outSlope: 0 @@ -1674,16 +1674,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1.6666666 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1.8333334 + time: 2.0833333 value: 0 inSlope: 0 outSlope: 0 @@ -1710,7 +1701,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 2.9166667 + time: 3.0833333 value: 0 inSlope: 0 outSlope: 0 @@ -1719,7 +1710,16 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 3.3 + time: 3.3333333 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 3.7166667 value: 0 inSlope: 0 outSlope: 0 @@ -1749,16 +1749,16 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.33333334 + time: 0.75 value: 0.07 - inSlope: 0.18260871 - outSlope: 0.18260871 + inSlope: 0.14358974 + outSlope: 0.14358974 tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1.5333333 + time: 1.95 value: 1 inSlope: 1.9979328 outSlope: -14.01605 @@ -1767,7 +1767,7 @@ AnimationClip: inWeight: 0.10389527 outWeight: 0.57070005 - serializedVersion: 3 - time: 1.6666666 + time: 2.0833333 value: 0.43 inSlope: -7.6189804 outSlope: 3.4199984 @@ -1776,7 +1776,7 @@ AnimationClip: inWeight: 0.6731532 outWeight: 0.33333334 - serializedVersion: 3 - time: 1.8333334 + time: 2.25 value: 1 inSlope: 0 outSlope: 0 @@ -1785,7 +1785,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 2.6666667 + time: 3.0833333 value: 1 inSlope: 0 outSlope: 0 @@ -1794,7 +1794,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 2.9166667 + time: 3.3333333 value: 1 inSlope: 0 outSlope: 0 @@ -1803,7 +1803,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 3.3 + time: 3.7166667 value: 0.43 inSlope: 0 outSlope: 0 @@ -1812,7 +1812,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 3.4333334 + time: 3.85 value: 1.18 inSlope: 0 outSlope: 0 @@ -1821,7 +1821,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 4.1666665 + time: 4.5833335 value: 0.23 inSlope: -1.0615386 outSlope: -1.0615386 @@ -1830,7 +1830,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 4.3 + time: 4.7166667 value: 0 inSlope: 0 outSlope: 0 @@ -1839,7 +1839,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 4.8333335 + time: 5.25 value: 0 inSlope: 0 outSlope: 0 @@ -1869,16 +1869,16 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.33333334 + time: 0.75 value: 0.22 - inSlope: 0.57391304 - outSlope: 0.57391304 + inSlope: 0.45128202 + outSlope: 0.45128202 tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1.5333333 + time: 1.95 value: 1 inSlope: 1.0125 outSlope: 1.0125 @@ -1887,7 +1887,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1.6666666 + time: 2.0833333 value: 1.57 inSlope: 0 outSlope: 0 @@ -1896,7 +1896,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1.8333334 + time: 2.25 value: 1 inSlope: 0 outSlope: 0 @@ -1905,7 +1905,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 2.6666667 + time: 3.0833333 value: 1 inSlope: 0 outSlope: 0 @@ -1914,7 +1914,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 2.9166667 + time: 3.3333333 value: 1 inSlope: 0 outSlope: 0 @@ -1923,7 +1923,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 3.3 + time: 3.7166667 value: 1 inSlope: 0 outSlope: 0 @@ -1932,7 +1932,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 4.1666665 + time: 4.5833335 value: 1 inSlope: 0 outSlope: 0 @@ -1941,7 +1941,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 4.8333335 + time: 5.25 value: 0 inSlope: 0 outSlope: 0 @@ -1971,16 +1971,16 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.33333334 + time: 0.75 value: 0.22 - inSlope: 0.57391304 - outSlope: 0.57391304 + inSlope: 0.45128202 + outSlope: 0.45128202 tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1.5333333 + time: 1.95 value: 1 inSlope: 0 outSlope: 0 @@ -1989,7 +1989,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1.6666666 + time: 2.0833333 value: 1 inSlope: 0 outSlope: 0 @@ -1998,7 +1998,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1.8333334 + time: 2.25 value: 1 inSlope: 0 outSlope: 0 @@ -2007,7 +2007,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 2.6666667 + time: 3.0833333 value: 1 inSlope: 0 outSlope: 0 @@ -2016,7 +2016,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 2.9166667 + time: 3.3333333 value: 1 inSlope: 0 outSlope: 0 @@ -2025,7 +2025,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 3.3 + time: 3.7166667 value: 1 inSlope: 0 outSlope: 0 @@ -2034,7 +2034,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 4.1666665 + time: 4.5833335 value: 1 inSlope: 0 outSlope: 0 @@ -2043,7 +2043,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 4.8333335 + time: 5.25 value: 0 inSlope: 0 outSlope: 0 @@ -2073,7 +2073,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1.5333333 + time: 1.95 value: 0 inSlope: 0 outSlope: 0 @@ -2082,7 +2082,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1.6666666 + time: 2.0833333 value: 0 inSlope: 0 outSlope: 0 @@ -2091,7 +2091,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 3.55 + time: 3.9666667 value: 0 inSlope: 0 outSlope: 0 @@ -2121,7 +2121,7 @@ AnimationClip: inWeight: 0 outWeight: 0 - serializedVersion: 3 - time: 0.33333334 + time: 0.75 value: 1 inSlope: Infinity outSlope: Infinity @@ -2130,7 +2130,7 @@ AnimationClip: inWeight: 0 outWeight: 0 - serializedVersion: 3 - time: 4.8333335 + time: 5.25 value: 0 inSlope: Infinity outSlope: Infinity diff --git a/Assets/Materials/Paint/M_DarkGreenPaint_DoubleSidedGI.mat b/Assets/Materials/Paint/M_DarkGreenPaint_DoubleSidedGI.mat new file mode 100644 index 0000000..53c3a81 --- /dev/null +++ b/Assets/Materials/Paint/M_DarkGreenPaint_DoubleSidedGI.mat @@ -0,0 +1,31 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: M_DarkGreenPaint_DoubleSidedGI + m_Shader: {fileID: 4800000, guid: 0b7113dea2069fc4e8943843eff19f70, type: 3} + m_Parent: {fileID: 2100000, guid: bc5888e576e9cb34bab7b7af42d2b63f, type: 2} + m_ModifiedSerializedProperties: 8 + m_ValidKeywords: + - _ENABLE_GEOMETRIC_SPECULAR_AA + m_InvalidKeywords: + - _NORMALMAP + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 1 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: [] + m_Ints: [] + m_Floats: [] + m_Colors: [] + m_BuildTextureStacks: [] diff --git a/Assets/Materials/Paint/M_DarkGreenPaint_DoubleSidedGI.mat.meta b/Assets/Materials/Paint/M_DarkGreenPaint_DoubleSidedGI.mat.meta new file mode 100644 index 0000000..c684568 --- /dev/null +++ b/Assets/Materials/Paint/M_DarkGreenPaint_DoubleSidedGI.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 77b16945d3aad454fb793d2f16c64249 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Materials/Paper/M_IceBluePaper.mat b/Assets/Materials/Paper/M_IceBluePaper.mat new file mode 100644 index 0000000..ea849ea --- /dev/null +++ b/Assets/Materials/Paper/M_IceBluePaper.mat @@ -0,0 +1,33 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: M_IceBluePaper + m_Shader: {fileID: 4800000, guid: 0b7113dea2069fc4e8943843eff19f70, type: 3} + m_Parent: {fileID: 2100000, guid: 71ede89a28bd60e4ca2918572046ba90, type: 2} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: + - _DETAIL + - _ENABLE_GEOMETRIC_SPECULAR_AA + m_InvalidKeywords: + - _NORMALMAP + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: [] + m_Ints: [] + m_Floats: [] + m_Colors: + - _Color: {r: 0.78431374, g: 0.78431374, b: 1, a: 1} + m_BuildTextureStacks: [] diff --git a/Assets/Materials/Paper/M_IceBluePaper.mat.meta b/Assets/Materials/Paper/M_IceBluePaper.mat.meta new file mode 100644 index 0000000..9ebf924 --- /dev/null +++ b/Assets/Materials/Paper/M_IceBluePaper.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e34c8e275d095a34ca2977875ea2bfb4 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Materials/Paper/M_IceBluePaper_DoubleSidedGI.mat b/Assets/Materials/Paper/M_IceBluePaper_DoubleSidedGI.mat new file mode 100644 index 0000000..27d388a --- /dev/null +++ b/Assets/Materials/Paper/M_IceBluePaper_DoubleSidedGI.mat @@ -0,0 +1,32 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: M_IceBluePaper_DoubleSidedGI + m_Shader: {fileID: 4800000, guid: 0b7113dea2069fc4e8943843eff19f70, type: 3} + m_Parent: {fileID: 2100000, guid: e34c8e275d095a34ca2977875ea2bfb4, type: 2} + m_ModifiedSerializedProperties: 8 + m_ValidKeywords: + - _DETAIL + - _ENABLE_GEOMETRIC_SPECULAR_AA + m_InvalidKeywords: + - _NORMALMAP + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 1 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: [] + m_Ints: [] + m_Floats: [] + m_Colors: [] + m_BuildTextureStacks: [] diff --git a/Assets/Materials/Paper/M_IceBluePaper_DoubleSidedGI.mat.meta b/Assets/Materials/Paper/M_IceBluePaper_DoubleSidedGI.mat.meta new file mode 100644 index 0000000..0b8c091 --- /dev/null +++ b/Assets/Materials/Paper/M_IceBluePaper_DoubleSidedGI.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 0da83a16cbf2f704594ba64c96200537 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Models/SM_Round1WindowBlinds.fbx b/Assets/Models/SM_Round1WindowBlinds.fbx new file mode 100644 index 0000000..4fb0c3d Binary files /dev/null and b/Assets/Models/SM_Round1WindowBlinds.fbx differ diff --git a/Assets/Models/SM_Round1WindowBlinds.fbx.meta b/Assets/Models/SM_Round1WindowBlinds.fbx.meta new file mode 100644 index 0000000..563123f --- /dev/null +++ b/Assets/Models/SM_Round1WindowBlinds.fbx.meta @@ -0,0 +1,109 @@ +fileFormatVersion: 2 +guid: 97bf46633683aa74194e27bbd6131033 +ModelImporter: + serializedVersion: 22200 + internalIDToNameTable: [] + externalObjects: {} + materials: + materialImportMode: 0 + materialName: 0 + materialSearch: 1 + materialLocation: 1 + animations: + legacyGenerateAnimations: 4 + bakeSimulation: 0 + resampleCurves: 1 + optimizeGameObjects: 0 + removeConstantScaleCurves: 0 + motionNodeName: + rigImportErrors: + rigImportWarnings: + animationImportErrors: + animationImportWarnings: + animationRetargetingWarnings: + animationDoRetargetingWarnings: 0 + importAnimatedCustomProperties: 0 + importConstraints: 0 + animationCompression: 1 + animationRotationError: 0.5 + animationPositionError: 0.5 + animationScaleError: 0.5 + animationWrapMode: 0 + extraExposedTransformPaths: [] + extraUserProperties: [] + clipAnimations: [] + isReadable: 0 + meshes: + lODScreenPercentages: [] + globalScale: 1 + meshCompression: 0 + addColliders: 0 + useSRGBMaterialColor: 1 + sortHierarchyByName: 1 + importPhysicalCameras: 1 + importVisibility: 1 + importBlendShapes: 1 + importCameras: 1 + importLights: 1 + nodeNameCollisionStrategy: 1 + fileIdsGeneration: 2 + swapUVChannels: 0 + generateSecondaryUV: 0 + useFileUnits: 1 + keepQuads: 0 + weldVertices: 1 + bakeAxisConversion: 0 + preserveHierarchy: 0 + skinWeightsMode: 0 + maxBonesPerVertex: 4 + minBoneWeight: 0.001 + optimizeBones: 1 + meshOptimizationFlags: -1 + indexFormat: 0 + secondaryUVAngleDistortion: 8 + secondaryUVAreaDistortion: 15.000001 + secondaryUVHardAngle: 88 + secondaryUVMarginMethod: 1 + secondaryUVMinLightmapResolution: 40 + secondaryUVMinObjectScale: 1 + secondaryUVPackMargin: 4 + useFileScale: 1 + strictVertexDataChecks: 0 + tangentSpace: + normalSmoothAngle: 60 + normalImportMode: 0 + tangentImportMode: 3 + normalCalculationMode: 4 + legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0 + blendShapeNormalImportMode: 1 + normalSmoothingSource: 0 + referencedClips: [] + importAnimation: 0 + humanDescription: + serializedVersion: 3 + human: [] + skeleton: [] + armTwist: 0.5 + foreArmTwist: 0.5 + upperLegTwist: 0.5 + legTwist: 0.5 + armStretch: 0.05 + legStretch: 0.05 + feetSpacing: 0 + globalScale: 1 + rootMotionBoneName: + hasTranslationDoF: 0 + hasExtraRoot: 0 + skeletonHasParents: 1 + lastHumanDescriptionAvatarSource: {instanceID: 0} + autoGenerateAvatarMappingIfUnspecified: 1 + animationType: 0 + humanoidOversampling: 1 + avatarSetup: 0 + addHumanoidExtraRootOnlyWhenUsingAvatar: 1 + importBlendShapeDeformPercent: 1 + remapMaterialsIfMaterialImportModeIsNone: 0 + additionalBone: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Models/SM_Round1WindowTrim.fbx b/Assets/Models/SM_Round1WindowTrim.fbx index 5d856a2..95a3529 100644 Binary files a/Assets/Models/SM_Round1WindowTrim.fbx and b/Assets/Models/SM_Round1WindowTrim.fbx differ diff --git a/Assets/Scenes/witwics.unity b/Assets/Scenes/witwics.unity index f07a29d..3780e0c 100644 --- a/Assets/Scenes/witwics.unity +++ b/Assets/Scenes/witwics.unity @@ -493,6 +493,98 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 1499591484} m_PrefabAsset: {fileID: 0} +--- !u!1 &12138828 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 12138831} + - component: {fileID: 12138829} + - component: {fileID: 12138830} + m_Layer: 0 + m_Name: The Chase Start To Host/All Players Timed Switcher + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &12138829 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 12138828} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7c74cc2036e37f74b874180a8ad0235f, type: 3} + m_Name: + m_EditorClassIdentifier: + serializationData: + SerializedFormat: 2 + SerializedBytes: + ReferencedUnityObjects: [] + SerializedBytesString: + Prefab: {fileID: 0} + PrefabModificationsReferencedUnityObjects: [] + PrefabModifications: [] + SerializationNodes: [] + _udonSharpBackingUdonBehaviour: {fileID: 12138830} + _CameraController: {fileID: 1524477936} + _SwitchFunctions: + - + - SwitchToWideShotCamera + _TimeBetweenCuts: + - 0.5 + - 4.5 + _Loop: 0 + _LoopPoint: 0 + _FirstLoopCallbackObject: {fileID: 1524477936} + _FirstLoopCallbackFunction: ActivateHostAllPlayersCameraSwitcher +--- !u!114 &12138830 +MonoBehaviour: + m_ObjectHideFlags: 2 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 12138828} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 45115577ef41a5b4ca741ed302693907, type: 3} + m_Name: + m_EditorClassIdentifier: + interactTextPlacement: {fileID: 0} + interactText: Use + interactTextGO: {fileID: 0} + proximity: 2 + SynchronizePosition: 0 + AllowCollisionOwnershipTransfer: 0 + Reliable: 0 + _syncMethod: 3 + serializedProgramAsset: {fileID: 11400000, guid: b84f3dc1edf53b846a172badddd49737, + type: 2} + programSource: {fileID: 11400000, guid: 1fc8e4389a71e5640b656e2c7fbabeed, type: 2} + serializedPublicVariablesBytesString: Ai8AAAAAATIAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAFQAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AAAAAAAYBAAAAAAAAACcBBAAAAHQAeQBwAGUAAWgAAABTAHkAcwB0AGUAbQAuAEMAbwBsAGwAZQBjAHQAaQBvAG4AcwAuAEcAZQBuAGUAcgBpAGMALgBMAGkAcwB0AGAAMQBbAFsAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4ALgBJAG4AdABlAHIAZgBhAGMAZQBzAC4ASQBVAGQAbwBuAFYAYQByAGkAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AXQBdACwAIABtAHMAYwBvAHIAbABpAGIAAQEJAAAAVgBhAHIAaQBhAGIAbABlAHMALwEAAAABaAAAAFMAeQBzAHQAZQBtAC4AQwBvAGwAbABlAGMAdABpAG8AbgBzAC4ARwBlAG4AZQByAGkAYwAuAEwAaQBzAHQAYAAxAFsAWwBWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAEkAbgB0AGUAcgBmAGEAYwBlAHMALgBJAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlACwAIABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgBdAF0ALAAgAG0AcwBjAG8AcgBsAGkAYgABAAAABgEAAAAAAAAAAi8CAAAAAUkAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAGAAMQBbAFsAUwB5AHMAdABlAG0ALgBJAG4AdAAzADIALAAgAG0AcwBjAG8AcgBsAGkAYgBdAF0ALAAgAFYAUgBDAC4AVQBkAG8AbgAuAEMAbwBtAG0AbwBuAAIAAAAGAgAAAAAAAAAnAQQAAAB0AHkAcABlAAEXAAAAUwB5AHMAdABlAG0ALgBTAHQAcgBpAG4AZwAsACAAbQBzAGMAbwByAGwAaQBiACcBCgAAAFMAeQBtAGIAbwBsAE4AYQBtAGUAAR8AAABfAF8AXwBVAGQAbwBuAFMAaABhAHIAcABCAGUAaABhAHYAaQBvAHUAcgBWAGUAcgBzAGkAbwBuAF8AXwBfACcBBAAAAHQAeQBwAGUAARYAAABTAHkAcwB0AGUAbQAuAEkAbgB0ADMAMgAsACAAbQBzAGMAbwByAGwAaQBiABcBBQAAAFYAYQBsAHUAZQACAAAABwUHBQcF + publicVariablesUnityEngineObjects: [] + publicVariablesSerializationDataFormat: 0 +--- !u!4 &12138831 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 12138828} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1882024111} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &12163667 stripped GameObject: m_CorrespondingSourceObject: {fileID: 4090900115978567236, guid: 79ebe62246f7f464e98373cb14765f9a, @@ -799,6 +891,110 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 1499591484} m_PrefabAsset: {fileID: 0} +--- !u!1001 &25650784 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1488972620} + m_Modifications: + - target: {fileID: -8679921383154817045, guid: 97bf46633683aa74194e27bbd6131033, + type: 3} + propertyPath: m_LocalPosition.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 97bf46633683aa74194e27bbd6131033, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 97bf46633683aa74194e27bbd6131033, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 97bf46633683aa74194e27bbd6131033, + type: 3} + propertyPath: m_LocalRotation.w + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 97bf46633683aa74194e27bbd6131033, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 97bf46633683aa74194e27bbd6131033, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 97bf46633683aa74194e27bbd6131033, + type: 3} + propertyPath: m_LocalRotation.z + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 97bf46633683aa74194e27bbd6131033, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 97bf46633683aa74194e27bbd6131033, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 97bf46633683aa74194e27bbd6131033, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 180 + objectReference: {fileID: 0} + - target: {fileID: -7511558181221131132, guid: 97bf46633683aa74194e27bbd6131033, + type: 3} + propertyPath: m_ScaleInLightmap + value: 3 + objectReference: {fileID: 0} + - target: {fileID: -7511558181221131132, guid: 97bf46633683aa74194e27bbd6131033, + type: 3} + propertyPath: m_LightmapParameters + value: + objectReference: {fileID: 15203, guid: 0000000000000000f000000000000000, type: 0} + - target: {fileID: -7511558181221131132, guid: 97bf46633683aa74194e27bbd6131033, + type: 3} + propertyPath: m_StitchLightmapSeams + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -7511558181221131132, guid: 97bf46633683aa74194e27bbd6131033, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 77b16945d3aad454fb793d2f16c64249, type: 2} + - target: {fileID: -7511558181221131132, guid: 97bf46633683aa74194e27bbd6131033, + type: 3} + propertyPath: m_Materials.Array.data[1] + value: + objectReference: {fileID: 2100000, guid: 0da83a16cbf2f704594ba64c96200537, type: 2} + - target: {fileID: 919132149155446097, guid: 97bf46633683aa74194e27bbd6131033, + type: 3} + propertyPath: m_Name + value: SM_Round1WindowBlinds + objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: 97bf46633683aa74194e27bbd6131033, + type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 97bf46633683aa74194e27bbd6131033, type: 3} +--- !u!4 &25650785 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 97bf46633683aa74194e27bbd6131033, + type: 3} + m_PrefabInstance: {fileID: 25650784} + m_PrefabAsset: {fileID: 0} --- !u!1 &27886306 stripped GameObject: m_CorrespondingSourceObject: {fileID: 6551304041890578085, guid: 40955da061a841841a91c845049f1e11, @@ -18454,6 +18650,110 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 4362789101225005290} m_PrefabAsset: {fileID: 0} +--- !u!1001 &383052033 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1488972623} + m_Modifications: + - target: {fileID: -8679921383154817045, guid: 97bf46633683aa74194e27bbd6131033, + type: 3} + propertyPath: m_LocalPosition.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 97bf46633683aa74194e27bbd6131033, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 97bf46633683aa74194e27bbd6131033, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 97bf46633683aa74194e27bbd6131033, + type: 3} + propertyPath: m_LocalRotation.w + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 97bf46633683aa74194e27bbd6131033, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 97bf46633683aa74194e27bbd6131033, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 97bf46633683aa74194e27bbd6131033, + type: 3} + propertyPath: m_LocalRotation.z + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 97bf46633683aa74194e27bbd6131033, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 97bf46633683aa74194e27bbd6131033, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 97bf46633683aa74194e27bbd6131033, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 180 + objectReference: {fileID: 0} + - target: {fileID: -7511558181221131132, guid: 97bf46633683aa74194e27bbd6131033, + type: 3} + propertyPath: m_ScaleInLightmap + value: 3 + objectReference: {fileID: 0} + - target: {fileID: -7511558181221131132, guid: 97bf46633683aa74194e27bbd6131033, + type: 3} + propertyPath: m_LightmapParameters + value: + objectReference: {fileID: 15203, guid: 0000000000000000f000000000000000, type: 0} + - target: {fileID: -7511558181221131132, guid: 97bf46633683aa74194e27bbd6131033, + type: 3} + propertyPath: m_StitchLightmapSeams + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -7511558181221131132, guid: 97bf46633683aa74194e27bbd6131033, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 77b16945d3aad454fb793d2f16c64249, type: 2} + - target: {fileID: -7511558181221131132, guid: 97bf46633683aa74194e27bbd6131033, + type: 3} + propertyPath: m_Materials.Array.data[1] + value: + objectReference: {fileID: 2100000, guid: 0da83a16cbf2f704594ba64c96200537, type: 2} + - target: {fileID: 919132149155446097, guid: 97bf46633683aa74194e27bbd6131033, + type: 3} + propertyPath: m_Name + value: SM_Round1WindowBlinds + objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: 97bf46633683aa74194e27bbd6131033, + type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 97bf46633683aa74194e27bbd6131033, type: 3} +--- !u!4 &383052034 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 97bf46633683aa74194e27bbd6131033, + type: 3} + m_PrefabInstance: {fileID: 383052033} + m_PrefabAsset: {fileID: 0} --- !u!1 &386844719 stripped GameObject: m_CorrespondingSourceObject: {fileID: 1171468836346796873, guid: 79ebe62246f7f464e98373cb14765f9a, @@ -21074,7 +21374,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 0} + m_Material: {fileID: 2100000, guid: 35630e38b4e5ffb40b44ec5348b4333f, type: 2} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} @@ -27014,7 +27314,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 0} + m_Material: {fileID: 2100000, guid: 35630e38b4e5ffb40b44ec5348b4333f, type: 2} m_Color: {r: 1, g: 1, b: 1, a: 0.392} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} @@ -33615,8 +33915,8 @@ BoxCollider: m_ProvidesContacts: 0 m_Enabled: 1 serializedVersion: 3 - m_Size: {x: 5.98485, y: 4.318262, z: 9.658502} - m_Center: {x: -0.8555231, y: 1.659131, z: -0.4586978} + m_Size: {x: 4.936206, y: 4.318262, z: 9.658502} + m_Center: {x: -0.93300486, y: 1.659131, z: -0.4586978} --- !u!1 &792054283 stripped GameObject: m_CorrespondingSourceObject: {fileID: 2410518288693767928, guid: 6587765855cbbb94c8cc3eb80d5956d6, @@ -40464,7 +40764,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 0} + m_Material: {fileID: 2100000, guid: 35630e38b4e5ffb40b44ec5348b4333f, type: 2} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} @@ -40490,6 +40790,110 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1012206126} m_CullTransparentMesh: 1 +--- !u!1001 &1012354932 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1488972622} + m_Modifications: + - target: {fileID: -8679921383154817045, guid: 97bf46633683aa74194e27bbd6131033, + type: 3} + propertyPath: m_LocalPosition.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 97bf46633683aa74194e27bbd6131033, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 97bf46633683aa74194e27bbd6131033, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 97bf46633683aa74194e27bbd6131033, + type: 3} + propertyPath: m_LocalRotation.w + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 97bf46633683aa74194e27bbd6131033, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 97bf46633683aa74194e27bbd6131033, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 97bf46633683aa74194e27bbd6131033, + type: 3} + propertyPath: m_LocalRotation.z + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 97bf46633683aa74194e27bbd6131033, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 97bf46633683aa74194e27bbd6131033, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 97bf46633683aa74194e27bbd6131033, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 180 + objectReference: {fileID: 0} + - target: {fileID: -7511558181221131132, guid: 97bf46633683aa74194e27bbd6131033, + type: 3} + propertyPath: m_ScaleInLightmap + value: 3 + objectReference: {fileID: 0} + - target: {fileID: -7511558181221131132, guid: 97bf46633683aa74194e27bbd6131033, + type: 3} + propertyPath: m_LightmapParameters + value: + objectReference: {fileID: 15203, guid: 0000000000000000f000000000000000, type: 0} + - target: {fileID: -7511558181221131132, guid: 97bf46633683aa74194e27bbd6131033, + type: 3} + propertyPath: m_StitchLightmapSeams + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -7511558181221131132, guid: 97bf46633683aa74194e27bbd6131033, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 77b16945d3aad454fb793d2f16c64249, type: 2} + - target: {fileID: -7511558181221131132, guid: 97bf46633683aa74194e27bbd6131033, + type: 3} + propertyPath: m_Materials.Array.data[1] + value: + objectReference: {fileID: 2100000, guid: 0da83a16cbf2f704594ba64c96200537, type: 2} + - target: {fileID: 919132149155446097, guid: 97bf46633683aa74194e27bbd6131033, + type: 3} + propertyPath: m_Name + value: SM_Round1WindowBlinds + objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: 97bf46633683aa74194e27bbd6131033, + type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 97bf46633683aa74194e27bbd6131033, type: 3} +--- !u!4 &1012354933 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 97bf46633683aa74194e27bbd6131033, + type: 3} + m_PrefabInstance: {fileID: 1012354932} + m_PrefabAsset: {fileID: 0} --- !u!1 &1012411577 stripped GameObject: m_CorrespondingSourceObject: {fileID: 2963010254956120311, guid: 40955da061a841841a91c845049f1e11, @@ -53303,8 +53707,8 @@ BoxCollider: m_ProvidesContacts: 0 m_Enabled: 1 serializedVersion: 3 - m_Size: {x: 1.01, y: 4.318262, z: 9.658502} - m_Center: {x: -0.008156538, y: 1.659131, z: -0.4586978} + m_Size: {x: 0.8664986, y: 4.318262, z: 9.658502} + m_Center: {x: -0.07990724, y: 1.659131, z: -0.4586978} --- !u!1 &1331320732 GameObject: m_ObjectHideFlags: 0 @@ -56795,8 +57199,8 @@ BoxCollider: m_ProvidesContacts: 0 m_Enabled: 1 serializedVersion: 3 - m_Size: {x: 2.047098, y: 5, z: 0.11430121} - m_Center: {x: -1.023572, y: 2.5, z: -0.05713692} + m_Size: {x: 2.0453677, y: 5, z: 0.11430121} + m_Center: {x: -1.0227278, y: 2.5, z: -0.057121266} --- !u!65 &1427476871 BoxCollider: m_ObjectHideFlags: 0 @@ -56858,8 +57262,8 @@ BoxCollider: m_ProvidesContacts: 0 m_Enabled: 1 serializedVersion: 3 - m_Size: {x: 0.25082913, y: 5, z: 0.11430121} - m_Center: {x: -5.874636, y: 2.5, z: -0.057131473} + m_Size: {x: 0.2521557, y: 5, z: 0.11430121} + m_Center: {x: -5.8740544, y: 2.5, z: -0.05709702} --- !u!1 &1428133775 GameObject: m_ObjectHideFlags: 0 @@ -57162,7 +57566,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 0} + m_Material: {fileID: 2100000, guid: 35630e38b4e5ffb40b44ec5348b4333f, type: 2} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} @@ -59713,7 +60117,23 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] - m_AddedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 367690597435190618, guid: 09d1d9f6a31381048ad412c72c4a1620, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1012354933} + - targetCorrespondingSourceObject: {fileID: -4177109113650570227, guid: 09d1d9f6a31381048ad412c72c4a1620, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1548013198} + - targetCorrespondingSourceObject: {fileID: 8732159003580495002, guid: 09d1d9f6a31381048ad412c72c4a1620, + type: 3} + insertIndex: -1 + addedObject: {fileID: 25650785} + - targetCorrespondingSourceObject: {fileID: 6792728018524613928, guid: 09d1d9f6a31381048ad412c72c4a1620, + type: 3} + insertIndex: -1 + addedObject: {fileID: 383052034} m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 09d1d9f6a31381048ad412c72c4a1620, type: 3} --- !u!4 &1488972619 stripped @@ -59722,6 +60142,30 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1488972618} m_PrefabAsset: {fileID: 0} +--- !u!4 &1488972620 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8732159003580495002, guid: 09d1d9f6a31381048ad412c72c4a1620, + type: 3} + m_PrefabInstance: {fileID: 1488972618} + m_PrefabAsset: {fileID: 0} +--- !u!4 &1488972621 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -4177109113650570227, guid: 09d1d9f6a31381048ad412c72c4a1620, + type: 3} + m_PrefabInstance: {fileID: 1488972618} + m_PrefabAsset: {fileID: 0} +--- !u!4 &1488972622 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 367690597435190618, guid: 09d1d9f6a31381048ad412c72c4a1620, + type: 3} + m_PrefabInstance: {fileID: 1488972618} + m_PrefabAsset: {fileID: 0} +--- !u!4 &1488972623 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 6792728018524613928, guid: 09d1d9f6a31381048ad412c72c4a1620, + type: 3} + m_PrefabInstance: {fileID: 1488972618} + m_PrefabAsset: {fileID: 0} --- !u!1 &1489648462 stripped GameObject: m_CorrespondingSourceObject: {fileID: 6458581458612866833, guid: 6587765855cbbb94c8cc3eb80d5956d6, @@ -64275,6 +64719,7 @@ MonoBehaviour: AllPlayersAssignStarterPointsTimerToggle: {fileID: 59893116} MapToHostAndAllPlayersTimerToggle: {fileID: 1108468553} LightningStartToHostAndAllPlayersTimerToggle: {fileID: 1573395194} + TheChaseStartToHostAndAllPlayersTimerToggle: {fileID: 12138829} CorrectToHostAndAllPlayersTimerToggle: {fileID: 1170815126} IncorrectToHostAndAllPlayersTimerToggle: {fileID: 1574468604} ThinkAboutItTimerToggle: {fileID: 1129163084} @@ -66979,6 +67424,110 @@ Transform: m_Children: [] m_Father: {fileID: 1947493793} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &1548013197 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1488972621} + m_Modifications: + - target: {fileID: -8679921383154817045, guid: 97bf46633683aa74194e27bbd6131033, + type: 3} + propertyPath: m_LocalPosition.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 97bf46633683aa74194e27bbd6131033, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 97bf46633683aa74194e27bbd6131033, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 97bf46633683aa74194e27bbd6131033, + type: 3} + propertyPath: m_LocalRotation.w + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 97bf46633683aa74194e27bbd6131033, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 97bf46633683aa74194e27bbd6131033, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 97bf46633683aa74194e27bbd6131033, + type: 3} + propertyPath: m_LocalRotation.z + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 97bf46633683aa74194e27bbd6131033, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 97bf46633683aa74194e27bbd6131033, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 97bf46633683aa74194e27bbd6131033, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 180 + objectReference: {fileID: 0} + - target: {fileID: -7511558181221131132, guid: 97bf46633683aa74194e27bbd6131033, + type: 3} + propertyPath: m_ScaleInLightmap + value: 3 + objectReference: {fileID: 0} + - target: {fileID: -7511558181221131132, guid: 97bf46633683aa74194e27bbd6131033, + type: 3} + propertyPath: m_LightmapParameters + value: + objectReference: {fileID: 15203, guid: 0000000000000000f000000000000000, type: 0} + - target: {fileID: -7511558181221131132, guid: 97bf46633683aa74194e27bbd6131033, + type: 3} + propertyPath: m_StitchLightmapSeams + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -7511558181221131132, guid: 97bf46633683aa74194e27bbd6131033, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 77b16945d3aad454fb793d2f16c64249, type: 2} + - target: {fileID: -7511558181221131132, guid: 97bf46633683aa74194e27bbd6131033, + type: 3} + propertyPath: m_Materials.Array.data[1] + value: + objectReference: {fileID: 2100000, guid: 0da83a16cbf2f704594ba64c96200537, type: 2} + - target: {fileID: 919132149155446097, guid: 97bf46633683aa74194e27bbd6131033, + type: 3} + propertyPath: m_Name + value: SM_Round1WindowBlinds + objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: 97bf46633683aa74194e27bbd6131033, + type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 97bf46633683aa74194e27bbd6131033, type: 3} +--- !u!4 &1548013198 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 97bf46633683aa74194e27bbd6131033, + type: 3} + m_PrefabInstance: {fileID: 1548013197} + m_PrefabAsset: {fileID: 0} --- !u!1 &1551197547 stripped GameObject: m_CorrespondingSourceObject: {fileID: 7590994631439921647, guid: 79ebe62246f7f464e98373cb14765f9a, @@ -69225,8 +69774,8 @@ MonoBehaviour: - SwitchToWideShotCamera _TimeBetweenCuts: - 3 - _Loop: 1 - _LoopPoint: 1 + _Loop: 0 + _LoopPoint: 0 _FirstLoopCallbackObject: {fileID: 1524477936} _FirstLoopCallbackFunction: ActivateHostAllPlayersCameraSwitcher --- !u!114 &1573395195 @@ -79731,6 +80280,7 @@ Transform: - {fileID: 59893114} - {fileID: 1108468551} - {fileID: 1573395196} + - {fileID: 12138831} - {fileID: 1170815124} - {fileID: 1574468602} - {fileID: 1129163086} @@ -103513,6 +104063,10 @@ MonoBehaviour: ID: 1310 SerializedTypeNames: - VRC.Udon.UdonBehaviour + - gameObject: {fileID: 12138828} + ID: 1311 + SerializedTypeNames: + - VRC.Udon.UdonBehaviour portraitCameraPositionOffset: {x: 0, y: 0, z: 0} portraitCameraRotationOffset: {x: 0, y: 1, z: 0, w: -0.00000004371139} PlayerPersistence: [] diff --git a/Assets/Scenes/witwics/LightingData.asset b/Assets/Scenes/witwics/LightingData.asset index 6dd259f..cfe0e76 100644 Binary files a/Assets/Scenes/witwics/LightingData.asset and b/Assets/Scenes/witwics/LightingData.asset differ diff --git a/Assets/Scenes/witwics/Lightmap-0_comp_light.exr b/Assets/Scenes/witwics/Lightmap-0_comp_light.exr index 83218a2..aeaa912 100644 Binary files a/Assets/Scenes/witwics/Lightmap-0_comp_light.exr and b/Assets/Scenes/witwics/Lightmap-0_comp_light.exr differ diff --git a/Assets/Scenes/witwics/ReflectionProbe-0.exr b/Assets/Scenes/witwics/ReflectionProbe-0.exr index c255806..315df99 100644 Binary files a/Assets/Scenes/witwics/ReflectionProbe-0.exr and b/Assets/Scenes/witwics/ReflectionProbe-0.exr differ diff --git a/Assets/Scenes/witwics/ReflectionProbe-1.exr b/Assets/Scenes/witwics/ReflectionProbe-1.exr index e08f2e7..38bb443 100644 Binary files a/Assets/Scenes/witwics/ReflectionProbe-1.exr and b/Assets/Scenes/witwics/ReflectionProbe-1.exr differ diff --git a/Assets/Scenes/witwics/ReflectionProbe-2.exr b/Assets/Scenes/witwics/ReflectionProbe-2.exr index fb1ff48..213c6e1 100644 Binary files a/Assets/Scenes/witwics/ReflectionProbe-2.exr and b/Assets/Scenes/witwics/ReflectionProbe-2.exr differ diff --git a/Assets/Scenes/witwics/ReflectionProbe-3.exr b/Assets/Scenes/witwics/ReflectionProbe-3.exr index 8b8da5a..13c7419 100644 Binary files a/Assets/Scenes/witwics/ReflectionProbe-3.exr and b/Assets/Scenes/witwics/ReflectionProbe-3.exr differ diff --git a/Assets/Scenes/witwics/ReflectionProbe-4.exr b/Assets/Scenes/witwics/ReflectionProbe-4.exr index db83abc..b354729 100644 Binary files a/Assets/Scenes/witwics/ReflectionProbe-4.exr and b/Assets/Scenes/witwics/ReflectionProbe-4.exr differ diff --git a/Assets/Scenes/witwics/ReflectionProbe-5.exr b/Assets/Scenes/witwics/ReflectionProbe-5.exr index c7fe862..a970dc1 100644 Binary files a/Assets/Scenes/witwics/ReflectionProbe-5.exr and b/Assets/Scenes/witwics/ReflectionProbe-5.exr differ diff --git a/Assets/UdonSharp/Cameras/CameraAnchor.asset b/Assets/UdonSharp/Cameras/CameraAnchor.asset index ead0817..b44a2f3 100644 --- a/Assets/UdonSharp/Cameras/CameraAnchor.asset +++ b/Assets/UdonSharp/Cameras/CameraAnchor.asset @@ -44,7 +44,7 @@ MonoBehaviour: Data: - Name: Entry: 12 - Data: 7 + Data: 10 - Name: Entry: 7 Data: @@ -481,6 +481,162 @@ MonoBehaviour: - Name: Entry: 8 Data: + - Name: + Entry: 7 + Data: + - Name: $k + Entry: 1 + Data: _FollowedPlayerNames + - Name: $v + Entry: 7 + Data: 31|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _FollowedPlayerNames + - Name: k__BackingField + Entry: 7 + Data: 32|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: System.String[], mscorlib + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 32 + - Name: k__BackingField + Entry: 7 + Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib + - Name: + Entry: 6 + Data: + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 5 + Data: false + - Name: _fieldAttributes + Entry: 7 + Data: 33|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 0 + - Name: + Entry: 13 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: + - Name: $k + Entry: 1 + Data: _FollowedPlayerNames_Cache + - Name: $v + Entry: 7 + Data: 34|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _FollowedPlayerNames_Cache + - Name: k__BackingField + Entry: 9 + Data: 32 + - Name: k__BackingField + Entry: 9 + Data: 32 + - Name: k__BackingField + Entry: 7 + Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib + - Name: + Entry: 6 + Data: + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 5 + Data: false + - Name: _fieldAttributes + Entry: 7 + Data: 35|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 0 + - Name: + Entry: 13 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: + - Name: $k + Entry: 1 + Data: _FollowedPlayers + - Name: $v + Entry: 7 + Data: 36|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _FollowedPlayers + - Name: k__BackingField + Entry: 7 + Data: 37|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: VRC.SDKBase.VRCPlayerApi[], VRCSDKBase + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 37 + - Name: k__BackingField + Entry: 7 + Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib + - Name: + Entry: 6 + Data: + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 5 + Data: false + - Name: _fieldAttributes + Entry: 7 + Data: 38|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 0 + - Name: + Entry: 13 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: - Name: Entry: 13 Data: diff --git a/Assets/UdonSharp/Cameras/CameraAnchor.cs b/Assets/UdonSharp/Cameras/CameraAnchor.cs index 217c9a8..d1dd696 100644 --- a/Assets/UdonSharp/Cameras/CameraAnchor.cs +++ b/Assets/UdonSharp/Cameras/CameraAnchor.cs @@ -1,8 +1,10 @@  +using CameraSystem; using MMMaellon.LightSync; using UdonSharp; +using UnityEditor.Overlays; using UnityEngine; -using CameraSystem; +using VRC.SDKBase; using VRC.Udon.Common; @@ -21,6 +23,9 @@ public class CameraAnchor : UdonSharpBehaviour [UdonSynced] private int _AttachedCameraIndex = -1; private Camera _AttachedCamera = null; + private string[] _FollowedPlayerNames = new string[0]; + private string[] _FollowedPlayerNames_Cache = new string[0]; + private VRCPlayerApi[] _FollowedPlayers = new VRCPlayerApi[0]; void LateUpdate() @@ -36,11 +41,35 @@ public class CameraAnchor : UdonSharpBehaviour _AttachedCamera.fieldOfView = FOV * CameraRoot.transform.localScale.z; } } + + if (_FollowedPlayers.Length > 0) + { + Vector3 CentroidSum = Vector3.zero; + for (int i = 0; i < _FollowedPlayers.Length; i++) + { + Vector3 LeftEyePosition = _FollowedPlayers[i].GetBonePosition(HumanBodyBones.LeftEye); + Vector3 RightEyePosition = _FollowedPlayers[i].GetBonePosition(HumanBodyBones.RightEye); + Vector3 LeftFootPosition = _FollowedPlayers[i].GetBonePosition(HumanBodyBones.LeftFoot); + Vector3 RightFootPosition = _FollowedPlayers[i].GetBonePosition(HumanBodyBones.RightFoot); + + CentroidSum += new Vector3( + (LeftEyePosition.x + RightEyePosition.x + LeftFootPosition.x + RightFootPosition.x) / 4.0f, + (LeftEyePosition.y + RightEyePosition.y + LeftFootPosition.y + RightFootPosition.y) / 4.0f, + (LeftEyePosition.z + RightEyePosition.z + LeftFootPosition.z + RightFootPosition.z) / 4.0f); + } + + CameraRoot.LookAt(CentroidSum / _FollowedPlayers.Length, Vector3.up); + } + else + { + CameraRoot.transform.localRotation = Quaternion.identity; + } } public override void OnDeserialization(DeserializationResult Result) { _AttachCamera_Synced(); + _FollowPlayers_Synced(); base.OnDeserialization(Result); } @@ -67,16 +96,80 @@ public class CameraAnchor : UdonSharpBehaviour } } + public void FollowPlayers(string[] Players) + { + _FollowedPlayerNames = Players; + _FollowPlayers_Synced(); + RequestSerialization(); + } + + public void StopFollowingPlayers() + { + _FollowedPlayerNames = new string[0]; + _FollowPlayers_Synced(); + RequestSerialization(); + } + private void _AttachCamera_Synced() { - _AttachedCamera = CameraSystemManager.camerasObjects[_AttachedCameraIndex]; - _AttachedCamera.gameObject.SetActive(true); - _AttachedCamera.transform.parent = CameraRoot; - _AttachedCamera.fieldOfView = FOV; - _AttachedCamera.nearClipPlane = NearClippingPlane; - _AttachedCamera.farClipPlane = FarClippingPlane; - _AttachedCamera.GetComponent().TeleportToLocalSpace(Vector3.zero, Quaternion.identity, true); + Camera NewCamera = CameraSystemManager.camerasObjects[_AttachedCameraIndex]; + if (NewCamera != _AttachedCamera) + { + _AttachedCamera = NewCamera; + _AttachedCamera.gameObject.SetActive(true); + _AttachedCamera.transform.parent = CameraRoot; + _AttachedCamera.fieldOfView = FOV; + _AttachedCamera.nearClipPlane = NearClippingPlane; + _AttachedCamera.farClipPlane = FarClippingPlane; + _AttachedCamera.GetComponent().TeleportToLocalSpace(Vector3.zero, Quaternion.identity, true); + } + } + + private void _FollowPlayers_Synced() + { + if (_IsPlayerListDifferent()) + { + _FollowedPlayers = new VRCPlayerApi[_FollowedPlayerNames.Length]; + VRCPlayerApi[] AllPlayers = new VRCPlayerApi[VRCPlayerApi.GetPlayerCount()]; + VRCPlayerApi.GetPlayers(AllPlayers); + + int i = 0; + foreach (string PlayerName in _FollowedPlayerNames) + { + foreach (VRCPlayerApi Player in AllPlayers) + { + if (Player.displayName == PlayerName) + { + _FollowedPlayers[i] = Player; + i++; + break; + } + } + } + + Debug.Log("[CameraAnchor] Anchor " + gameObject.name + " is now following " + _FollowedPlayerNames); + + _FollowedPlayerNames_Cache = _FollowedPlayerNames; + } + } + + + private bool _IsPlayerListDifferent() + { + if (_FollowedPlayerNames.Length != _FollowedPlayerNames_Cache.Length) + { + return true; + } + + for (int i = 0; i < _FollowedPlayerNames.Length; i++) + { + if (_FollowedPlayerNames[i] != _FollowedPlayerNames_Cache[i]) + { + return true; + } + } + return false; } diff --git a/Assets/UdonSharp/Cameras/CameraControllerRound1.asset b/Assets/UdonSharp/Cameras/CameraControllerRound1.asset index b2d860d..6c36e83 100644 --- a/Assets/UdonSharp/Cameras/CameraControllerRound1.asset +++ b/Assets/UdonSharp/Cameras/CameraControllerRound1.asset @@ -44,7 +44,7 @@ MonoBehaviour: Data: - Name: Entry: 12 - Data: 34 + Data: 35 - Name: Entry: 7 Data: @@ -917,13 +917,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: CorrectToHostAndAllPlayersTimerToggle + Data: TheChaseStartToHostAndAllPlayersTimerToggle - Name: $v Entry: 7 Data: 55|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: CorrectToHostAndAllPlayersTimerToggle + Data: TheChaseStartToHostAndAllPlayersTimerToggle - Name: k__BackingField Entry: 9 Data: 12 @@ -971,13 +971,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: IncorrectToHostAndAllPlayersTimerToggle + Data: CorrectToHostAndAllPlayersTimerToggle - Name: $v Entry: 7 Data: 58|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: IncorrectToHostAndAllPlayersTimerToggle + Data: CorrectToHostAndAllPlayersTimerToggle - Name: k__BackingField Entry: 9 Data: 12 @@ -1025,13 +1025,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: ThinkAboutItTimerToggle + Data: IncorrectToHostAndAllPlayersTimerToggle - Name: $v Entry: 7 Data: 61|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: ThinkAboutItTimerToggle + Data: IncorrectToHostAndAllPlayersTimerToggle - Name: k__BackingField Entry: 9 Data: 12 @@ -1079,13 +1079,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: BuzzedInPlayerTimerToggle + Data: ThinkAboutItTimerToggle - Name: $v Entry: 7 Data: 64|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: BuzzedInPlayerTimerToggle + Data: ThinkAboutItTimerToggle - Name: k__BackingField Entry: 9 Data: 12 @@ -1133,25 +1133,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CameraAnimator + Data: BuzzedInPlayerTimerToggle - Name: $v Entry: 7 Data: 67|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CameraAnimator + Data: BuzzedInPlayerTimerToggle - Name: k__BackingField - Entry: 7 - Data: 68|System.RuntimeType, mscorlib - - Name: - Entry: 1 - Data: UnityEngine.Animator, UnityEngine.AnimationModule - - Name: - Entry: 8 - Data: + Entry: 9 + Data: 12 - Name: k__BackingField Entry: 9 - Data: 68 + Data: 4 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1166,13 +1160,73 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 69|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 68|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 69|UnityEngine.SerializeField, UnityEngine.CoreModule + - Name: + Entry: 8 + Data: + - Name: + Entry: 13 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: + - Name: $k + Entry: 1 + Data: _CameraAnimator + - Name: $v + Entry: 7 + Data: 70|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _CameraAnimator + - Name: k__BackingField + Entry: 7 + Data: 71|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: UnityEngine.Animator, UnityEngine.AnimationModule + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 71 + - Name: k__BackingField + Entry: 7 + Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib + - Name: + Entry: 6 + Data: + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 5 + Data: true + - Name: _fieldAttributes + Entry: 7 + Data: 72|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 2 - Name: Entry: 7 - Data: 70|UnityEngine.SpaceAttribute, UnityEngine.CoreModule + Data: 73|UnityEngine.SpaceAttribute, UnityEngine.CoreModule - Name: height Entry: 4 Data: 8 @@ -1181,7 +1235,7 @@ MonoBehaviour: Data: - Name: Entry: 7 - Data: 71|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 74|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -1205,13 +1259,13 @@ MonoBehaviour: Data: Player1CameraAnchor - Name: $v Entry: 7 - Data: 72|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 75|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: Player1CameraAnchor - Name: k__BackingField Entry: 7 - Data: 73|System.RuntimeType, mscorlib + Data: 76|System.RuntimeType, mscorlib - Name: Entry: 1 Data: CameraAnchor, Assembly-CSharp @@ -1235,73 +1289,19 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 74|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 77|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 2 - Name: Entry: 7 - Data: 75|UnityEngine.SpaceAttribute, UnityEngine.CoreModule + Data: 78|UnityEngine.SpaceAttribute, UnityEngine.CoreModule - Name: height Entry: 4 Data: 8 - Name: Entry: 8 Data: - - Name: - Entry: 7 - Data: 76|UnityEngine.SerializeField, UnityEngine.CoreModule - - Name: - Entry: 8 - Data: - - Name: - Entry: 13 - Data: - - Name: - Entry: 8 - Data: - - Name: - Entry: 8 - Data: - - Name: - Entry: 8 - Data: - - Name: - Entry: 7 - Data: - - Name: $k - Entry: 1 - Data: Player2CameraAnchor - - Name: $v - Entry: 7 - Data: 77|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: Player2CameraAnchor - - Name: k__BackingField - Entry: 9 - Data: 73 - - Name: k__BackingField - Entry: 9 - Data: 4 - - Name: k__BackingField - Entry: 7 - Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib - - Name: - Entry: 6 - Data: - - Name: - Entry: 8 - Data: - - Name: k__BackingField - Entry: 5 - Data: true - - Name: _fieldAttributes - Entry: 7 - Data: 78|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - - Name: - Entry: 12 - Data: 1 - Name: Entry: 7 Data: 79|UnityEngine.SerializeField, UnityEngine.CoreModule @@ -1325,16 +1325,16 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: Player3CameraAnchor + Data: Player2CameraAnchor - Name: $v Entry: 7 Data: 80|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: Player3CameraAnchor + Data: Player2CameraAnchor - Name: k__BackingField Entry: 9 - Data: 73 + Data: 76 - Name: k__BackingField Entry: 9 Data: 4 @@ -1379,16 +1379,16 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: HostCameraAnchor + Data: Player3CameraAnchor - Name: $v Entry: 7 Data: 83|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: HostCameraAnchor + Data: Player3CameraAnchor - Name: k__BackingField Entry: 9 - Data: 73 + Data: 76 - Name: k__BackingField Entry: 9 Data: 4 @@ -1433,16 +1433,16 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: DefaultWideShotCameraAnchor + Data: HostCameraAnchor - Name: $v Entry: 7 Data: 86|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: DefaultWideShotCameraAnchor + Data: HostCameraAnchor - Name: k__BackingField Entry: 9 - Data: 73 + Data: 76 - Name: k__BackingField Entry: 9 Data: 4 @@ -1487,16 +1487,16 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: VideoPlayerCameraAnchor + Data: DefaultWideShotCameraAnchor - Name: $v Entry: 7 Data: 89|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: VideoPlayerCameraAnchor + Data: DefaultWideShotCameraAnchor - Name: k__BackingField Entry: 9 - Data: 73 + Data: 76 - Name: k__BackingField Entry: 9 Data: 4 @@ -1541,16 +1541,16 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: OpeningCameraAnchor + Data: VideoPlayerCameraAnchor - Name: $v Entry: 7 Data: 92|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: OpeningCameraAnchor + Data: VideoPlayerCameraAnchor - Name: k__BackingField Entry: 9 - Data: 73 + Data: 76 - Name: k__BackingField Entry: 9 Data: 4 @@ -1571,19 +1571,10 @@ MonoBehaviour: Data: 93|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 - Data: 2 + Data: 1 - Name: Entry: 7 - Data: 94|UnityEngine.SpaceAttribute, UnityEngine.CoreModule - - Name: height - Entry: 4 - Data: 8 - - Name: - Entry: 8 - Data: - - Name: - Entry: 7 - Data: 95|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 94|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -1604,16 +1595,16 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: AllPlayersViewCameraAnchor + Data: OpeningCameraAnchor - Name: $v Entry: 7 - Data: 96|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 95|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: AllPlayersViewCameraAnchor + Data: OpeningCameraAnchor - Name: k__BackingField Entry: 9 - Data: 73 + Data: 76 - Name: k__BackingField Entry: 9 Data: 4 @@ -1631,10 +1622,19 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 97|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 96|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 - Data: 1 + Data: 2 + - Name: + Entry: 7 + Data: 97|UnityEngine.SpaceAttribute, UnityEngine.CoreModule + - Name: height + Entry: 4 + Data: 8 + - Name: + Entry: 8 + Data: - Name: Entry: 7 Data: 98|UnityEngine.SerializeField, UnityEngine.CoreModule @@ -1658,16 +1658,16 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: VideoMusicClueCameraAnchor + Data: AllPlayersViewCameraAnchor - Name: $v Entry: 7 Data: 99|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: VideoMusicClueCameraAnchor + Data: AllPlayersViewCameraAnchor - Name: k__BackingField Entry: 9 - Data: 73 + Data: 76 - Name: k__BackingField Entry: 9 Data: 4 @@ -1713,16 +1713,16 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: ACMECrimenetComputerCameraAnchor + Data: VideoMusicClueCameraAnchor - Name: $v Entry: 7 Data: 102|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: ACMECrimenetComputerCameraAnchor + Data: VideoMusicClueCameraAnchor - Name: k__BackingField Entry: 9 - Data: 73 + Data: 76 - Name: k__BackingField Entry: 9 Data: 4 @@ -1768,16 +1768,16 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: FilingCabinetCameraAnchor + Data: ACMECrimenetComputerCameraAnchor - Name: $v Entry: 7 Data: 105|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: FilingCabinetCameraAnchor + Data: ACMECrimenetComputerCameraAnchor - Name: k__BackingField Entry: 9 - Data: 73 + Data: 76 - Name: k__BackingField Entry: 9 Data: 4 @@ -1823,16 +1823,16 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: ModemCameraAnchor + Data: FilingCabinetCameraAnchor - Name: $v Entry: 7 Data: 108|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: ModemCameraAnchor + Data: FilingCabinetCameraAnchor - Name: k__BackingField Entry: 9 - Data: 73 + Data: 76 - Name: k__BackingField Entry: 9 Data: 4 @@ -1878,16 +1878,71 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _PlayOpening + Data: ModemCameraAnchor - Name: $v Entry: 7 Data: 111|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: ModemCameraAnchor + - Name: k__BackingField + Entry: 9 + Data: 76 + - Name: k__BackingField + Entry: 9 + Data: 4 + - Name: k__BackingField + Entry: 7 + Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib + - Name: + Entry: 6 + Data: + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 5 + Data: true + - Name: _fieldAttributes + Entry: 7 + Data: 112|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 113|UnityEngine.SerializeField, UnityEngine.CoreModule + - Name: + Entry: 8 + Data: + - Name: + Entry: 13 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: + - Name: $k + Entry: 1 + Data: _PlayOpening + - Name: $v + Entry: 7 + Data: 114|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _PlayOpening - Name: k__BackingField Entry: 7 - Data: 112|System.RuntimeType, mscorlib + Data: 115|System.RuntimeType, mscorlib - Name: Entry: 1 Data: System.Boolean, mscorlib @@ -1896,7 +1951,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 112 + Data: 115 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1911,20 +1966,20 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 113|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 116|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 2 - Name: Entry: 7 - Data: 114|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 117|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: - Name: Entry: 7 - Data: 115|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime + Data: 118|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -1948,16 +2003,16 @@ MonoBehaviour: Data: _PlayOpeningDoorway - Name: $v Entry: 7 - Data: 116|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 119|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _PlayOpeningDoorway - Name: k__BackingField Entry: 9 - Data: 112 + Data: 115 - Name: k__BackingField Entry: 9 - Data: 112 + Data: 115 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1972,20 +2027,20 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 117|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 120|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 2 - Name: Entry: 7 - Data: 118|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 121|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: - Name: Entry: 7 - Data: 119|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime + Data: 122|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: diff --git a/Assets/UdonSharp/Cameras/CameraControllerRound1.cs b/Assets/UdonSharp/Cameras/CameraControllerRound1.cs index 49adf07..711ff0c 100644 --- a/Assets/UdonSharp/Cameras/CameraControllerRound1.cs +++ b/Assets/UdonSharp/Cameras/CameraControllerRound1.cs @@ -2,7 +2,6 @@ using UdonSharp; using UnityEngine; using VRC.SDKBase; -using VRC.Udon; [UdonBehaviourSyncMode(BehaviourSyncMode.Manual)] @@ -24,6 +23,7 @@ public class CameraControllerRound1 : CameraControllerBase [SerializeField] public CameraTimedSwitcher AllPlayersAssignStarterPointsTimerToggle; [SerializeField] public CameraTimedSwitcher MapToHostAndAllPlayersTimerToggle; [SerializeField] public CameraTimedSwitcher LightningStartToHostAndAllPlayersTimerToggle; + [SerializeField] public CameraTimedSwitcher TheChaseStartToHostAndAllPlayersTimerToggle; [SerializeField] public CameraTimedSwitcher CorrectToHostAndAllPlayersTimerToggle; [SerializeField] public CameraTimedSwitcher IncorrectToHostAndAllPlayersTimerToggle; [SerializeField] public CameraTimedSwitcher ThinkAboutItTimerToggle; @@ -83,8 +83,10 @@ public class CameraControllerRound1 : CameraControllerBase Networking.SetOwner(Player, HostAndAllPlayersTimerToggle.gameObject); Networking.SetOwner(Player, HostAndIndividualPlayersTimerToggle.gameObject); + Networking.SetOwner(Player, AllPlayersAssignStarterPointsTimerToggle.gameObject); Networking.SetOwner(Player, MapToHostAndAllPlayersTimerToggle.gameObject); Networking.SetOwner(Player, LightningStartToHostAndAllPlayersTimerToggle.gameObject); + Networking.SetOwner(Player, TheChaseStartToHostAndAllPlayersTimerToggle.gameObject); Networking.SetOwner(Player, CorrectToHostAndAllPlayersTimerToggle.gameObject); Networking.SetOwner(Player, IncorrectToHostAndAllPlayersTimerToggle.gameObject); Networking.SetOwner(Player, ThinkAboutItTimerToggle.gameObject); @@ -234,6 +236,12 @@ public class CameraControllerRound1 : CameraControllerBase ActivateCameraSwitcher(LightningStartToHostAndAllPlayersTimerToggle); } + public void ActivateTheChaseStartToHostAllPlayersCameraSwitcher() + { + ActivateWideShotCamera(); + ActivateCameraSwitcher(TheChaseStartToHostAndAllPlayersTimerToggle); + } + public void ActivateCorrectAnswerToHostAllPlayersCameraSwitcher() { ActivateCameraSwitcher(CorrectToHostAndAllPlayersTimerToggle); diff --git a/Assets/UdonSharp/Cameras/CameraControllerRound2.cs b/Assets/UdonSharp/Cameras/CameraControllerRound2.cs index 927468b..65bfdba 100644 --- a/Assets/UdonSharp/Cameras/CameraControllerRound2.cs +++ b/Assets/UdonSharp/Cameras/CameraControllerRound2.cs @@ -2,7 +2,6 @@ using UdonSharp; using UnityEngine; using VRC.SDKBase; -using VRC.Udon; [UdonBehaviourSyncMode(BehaviourSyncMode.Manual)] diff --git a/Assets/UdonSharp/Cameras/CameraControllerRound3.cs b/Assets/UdonSharp/Cameras/CameraControllerRound3.cs index d7c8e96..65344e2 100644 --- a/Assets/UdonSharp/Cameras/CameraControllerRound3.cs +++ b/Assets/UdonSharp/Cameras/CameraControllerRound3.cs @@ -1,9 +1,7 @@  using UdonSharp; using UnityEngine; -using VRC.SDK3.UdonNetworkCalling; using VRC.SDKBase; -using VRC.Udon; [UdonBehaviourSyncMode(BehaviourSyncMode.Manual)] @@ -119,6 +117,25 @@ public class CameraControllerRound3 : CameraControllerBase } + public void OverheadCamera_FollowPlayers(string[] Players) + { + OverheadCameraAnchor.FollowPlayers(Players); + } + public void OverheadCamera_StopFollowingPlayers() + { + OverheadCameraAnchor.StopFollowingPlayers(); + } + + public void FrontCamera_FollowPlayers(string[] Players) + { + FrontCameraAnchor.FollowPlayers(Players); + } + public void FrontCamera_StopFollowingPlayers() + { + FrontCameraAnchor.StopFollowingPlayers(); + } + + private void _OnPlayfieldSwitchTriggerGroupChanged() { PlayfieldSwitchTriggerGroup.SetActive(ActivatePlayfieldSwitchTriggerGroup); diff --git a/Assets/UdonSharp/Game Managers/GameManagerRound1.cs b/Assets/UdonSharp/Game Managers/GameManagerRound1.cs index 6225e53..16a4d39 100644 --- a/Assets/UdonSharp/Game Managers/GameManagerRound1.cs +++ b/Assets/UdonSharp/Game Managers/GameManagerRound1.cs @@ -894,8 +894,12 @@ public class GameManagerRound1 : GameManagerBase private void PlayTheChaseMusic() { - _CameraControllerRound1.DisableAllSwitchers(); - _CameraControllerRound1.SwitchToWideShotCamera(); + _CameraControllerRound1.ActivateTheChaseStartToHostAllPlayersCameraSwitcher(); + + HostCardBetweenRoundsInterface Interface = + (HostCardBetweenRoundsInterface)GetHostCardInterface(RoundSegmentType.BetweenSegments); + Interface.HeaderUI.text = RoundSegmentTypeToString(RoundSegmentType.TheChase); + Interface.CommentUI.text = "All of these questions are worth 5 Acme Crimebucks. Hands on your buzzers, watch the monitor, listen carefully. Here we go."; SendCustomNetworkEvent(NetworkEventTarget.All, nameof(PlayTheChaseAnimation_Private)); } @@ -910,13 +914,6 @@ public class GameManagerRound1 : GameManagerBase { _TheChaseAnimator.SetBool("Play The Chase", false); - _CameraControllerRound1.ActivateHostAllPlayersCameraSwitcher(); - - HostCardBetweenRoundsInterface Interface = - (HostCardBetweenRoundsInterface)GetHostCardInterface(RoundSegmentType.BetweenSegments); - Interface.HeaderUI.text = RoundSegmentTypeToString(RoundSegmentType.TheChase); - Interface.CommentUI.text = "All of these questions are worth 5 Acme Crimebucks. Hands on your buzzers, watch the monitor, listen carefully. Here we go."; - EnableBuzzers(); EnableInteraction("Here We Go"); diff --git a/Assets/UdonSharp/Window/GlassShatter.cs b/Assets/UdonSharp/Window/GlassShatter.cs index 752e385..ab026a3 100644 --- a/Assets/UdonSharp/Window/GlassShatter.cs +++ b/Assets/UdonSharp/Window/GlassShatter.cs @@ -46,7 +46,7 @@ public class GlassShatter : UdonSharpBehaviour { if (Shattered) { - _AudioManager.PlaySFX(SFXEventType.GlassShatter); + _AudioManager.PlaySFXAtPitch(SFXEventType.GlassShatter, Random.Range(0.9f, 1.1f)); } }