diff --git a/Assets/3rd/D2D_Scripts/Gameplay/Health/Health.cs b/Assets/3rd/D2D_Scripts/Gameplay/Health/Health.cs index a349e80e..de4f46c5 100644 --- a/Assets/3rd/D2D_Scripts/Gameplay/Health/Health.cs +++ b/Assets/3rd/D2D_Scripts/Gameplay/Health/Health.cs @@ -95,11 +95,11 @@ namespace D2D.Gameplay CurrentPoints -= damagePoints; LastAttacker = attacker; + Spawn(_hitEffect); - + Debug.Log("current point" + CurrentPoints); if (CurrentPoints > 0) { - Spawn(_hitEffect); if (_meshRenderer != null) { @@ -113,7 +113,6 @@ namespace D2D.Gameplay else { Died?.Invoke(); - if (_isGrayFadeout) { GrayFadeoutDeath(); diff --git a/Assets/CharactersScript.cs b/Assets/CharactersScript.cs index 68e6dfd0..6d3430a8 100644 --- a/Assets/CharactersScript.cs +++ b/Assets/CharactersScript.cs @@ -105,6 +105,6 @@ public class CharactersScript : MonoBehaviour } public void playGame() { - SceneManager.LoadScene(SceneManager.GetActiveScene().buildIndex + 1); + SceneManager.LoadScene("Level_1"); } } diff --git a/Assets/Prefabs/NewEnemies/Normal-Enemy.fbx.meta b/Assets/Prefabs/NewEnemies/Normal-Enemy.fbx.meta index ef19fc62..238f0de8 100644 --- a/Assets/Prefabs/NewEnemies/Normal-Enemy.fbx.meta +++ b/Assets/Prefabs/NewEnemies/Normal-Enemy.fbx.meta @@ -31,36 +31,7 @@ ModelImporter: animationWrapMode: 0 extraExposedTransformPaths: [] extraUserProperties: [] - clipAnimations: - - serializedVersion: 16 - name: Scene - takeName: Scene - internalID: -623603649343465320 - firstFrame: 1 - lastFrame: 62 - wrapMode: 0 - orientationOffsetY: 0 - level: 0 - cycleOffset: 0 - loop: 0 - hasAdditiveReferencePose: 0 - loopTime: 1 - loopBlend: 0 - loopBlendOrientation: 0 - loopBlendPositionY: 0 - loopBlendPositionXZ: 0 - keepOriginalOrientation: 0 - keepOriginalPositionY: 1 - keepOriginalPositionXZ: 0 - heightFromFeet: 0 - mirror: 0 - bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000 - curves: [] - events: [] - transformMask: [] - maskType: 3 - maskSource: {instanceID: 0} - additiveReferencePoseFrame: 0.96 + clipAnimations: [] isReadable: 0 meshes: lODScreenPercentages: [] diff --git a/Assets/Prefabs/Wizard_Redo_withRig@Hip Hop Dancing.fbx.meta b/Assets/Prefabs/Wizard_Redo_withRig@Hip Hop Dancing.fbx.meta index 906e6028..0f0375ae 100644 --- a/Assets/Prefabs/Wizard_Redo_withRig@Hip Hop Dancing.fbx.meta +++ b/Assets/Prefabs/Wizard_Redo_withRig@Hip Hop Dancing.fbx.meta @@ -24,14 +24,43 @@ ModelImporter: animationDoRetargetingWarnings: 0 importAnimatedCustomProperties: 0 importConstraints: 0 - animationCompression: 1 + animationCompression: 3 animationRotationError: 0.5 animationPositionError: 0.5 animationScaleError: 0.5 animationWrapMode: 0 extraExposedTransformPaths: [] extraUserProperties: [] - clipAnimations: [] + clipAnimations: + - serializedVersion: 16 + name: Hip Hop Dancing + takeName: mixamo.com + internalID: -203655887218126122 + firstFrame: 0 + lastFrame: 413 + wrapMode: 0 + orientationOffsetY: 0 + level: 0 + cycleOffset: 0 + loop: 0 + hasAdditiveReferencePose: 0 + loopTime: 1 + loopBlend: 0 + loopBlendOrientation: 0 + loopBlendPositionY: 0 + loopBlendPositionXZ: 0 + keepOriginalOrientation: 0 + keepOriginalPositionY: 1 + keepOriginalPositionXZ: 0 + heightFromFeet: 0 + mirror: 0 + bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000 + curves: [] + events: [] + transformMask: [] + maskType: 3 + maskSource: {instanceID: 0} + additiveReferencePoseFrame: 0 isReadable: 0 meshes: lODScreenPercentages: [] @@ -81,8 +110,324 @@ ModelImporter: importAnimation: 1 humanDescription: serializedVersion: 3 - human: [] - skeleton: [] + human: + - boneName: mixamorig:Hips + humanName: Hips + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: mixamorig:LeftUpLeg + humanName: LeftUpperLeg + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: mixamorig:RightUpLeg + humanName: RightUpperLeg + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: mixamorig:LeftLeg + humanName: LeftLowerLeg + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: mixamorig:RightLeg + humanName: RightLowerLeg + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: mixamorig:LeftFoot + humanName: LeftFoot + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: mixamorig:RightFoot + humanName: RightFoot + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: mixamorig:Spine + humanName: Spine + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: mixamorig:Spine1 + humanName: Chest + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: mixamorig:Neck + humanName: Neck + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: mixamorig:Head + humanName: Head + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: mixamorig:LeftShoulder + humanName: LeftShoulder + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: mixamorig:RightShoulder + humanName: RightShoulder + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: mixamorig:LeftArm + humanName: LeftUpperArm + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: mixamorig:RightArm + humanName: RightUpperArm + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: mixamorig:LeftForeArm + humanName: LeftLowerArm + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: mixamorig:RightForeArm + humanName: RightLowerArm + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: mixamorig:LeftHand + humanName: LeftHand + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: mixamorig:RightHand + humanName: RightHand + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: mixamorig:LeftToeBase + humanName: LeftToes + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: mixamorig:RightToeBase + humanName: RightToes + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: mixamorig:Spine2 + humanName: UpperChest + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + skeleton: + - name: Wizard_Redo_withRig@Hip Hop Dancing(Clone) + parentName: + position: {x: 0, y: 0, z: 0} + rotation: {x: 0, y: 0, z: 0, w: 1} + scale: {x: 1, y: 1, z: 1} + - name: Wizard + parentName: Wizard_Redo_withRig@Hip Hop Dancing(Clone) + position: {x: -0, y: 0, z: 0} + rotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071067} + scale: {x: 22.358072, y: 22.358072, z: 22.358072} + - name: Armature + parentName: Wizard_Redo_withRig@Hip Hop Dancing(Clone) + position: {x: -0, y: 0, z: 0} + rotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071068} + scale: {x: 100, y: 100, z: 100} + - name: mixamorig:Hips + parentName: Armature + position: {x: -4.6566126e-11, y: 0.00014446586, z: 0.0035628171} + rotation: {x: 0.70710677, y: 0.0000000028764109, z: 0.0000000017258464, w: 0.7071069} + scale: {x: 1, y: 0.99999994, z: 0.9999998} + - name: mixamorig:Spine + parentName: mixamorig:Hips + position: {x: -0, y: 0.000687606, z: 0.0000125661545} + rotation: {x: 0.009136318, y: -0.0000000016066348, z: 0.0000000022520952, w: 0.9999583} + scale: {x: 0.9999999, y: 0.9999999, z: 1} + - name: mixamorig:Spine1 + parentName: mixamorig:Spine + position: {x: -0, y: 0.00080233975, z: -1.0011717e-10} + rotation: {x: -0, y: -8.654649e-10, z: -0.0000000028321607, w: 1} + scale: {x: 1.0000001, y: 1.0000001, z: 1} + - name: mixamorig:Spine2 + parentName: mixamorig:Spine1 + position: {x: -0, y: 0.00091696135, z: -4.6566128e-12} + rotation: {x: 8.687426e-18, y: -0.0000000015358212, z: 0.0000000050120272, w: 1} + scale: {x: 1, y: 0.9999999, z: 1} + - name: mixamorig:Neck + parentName: mixamorig:Spine2 + position: {x: -0, y: 0.0010315785, z: -1.2107193e-10} + rotation: {x: -0.009136318, y: 8.0331747e-10, z: -0.0000000011260485, w: 0.9999583} + scale: {x: 1, y: 1.0000002, z: 1} + - name: mixamorig:Head + parentName: mixamorig:Neck + position: {x: -0, y: 0.0007643753, z: -0.00023774458} + rotation: {x: 0.000000119209275, y: 0.0000000032542866, z: -0.000000005695002, w: 1} + scale: {x: 1, y: 1, z: 1.0000001} + - name: mixamorig:HeadTop_End + parentName: mixamorig:Head + position: {x: -0, y: 0.0043788604, z: -0.0013619636} + rotation: {x: -0, y: -0, z: 5.614801e-17, w: 1} + scale: {x: 1, y: 1, z: 0.99999994} + - name: mixamorig:LeftShoulder + parentName: mixamorig:Spine2 + position: {x: -0.00043921868, y: 0.0008826716, z: 0.0000013715029} + rotation: {x: 0.57550013, y: -0.41146207, z: 0.57370967, w: 0.41274184} + scale: {x: 1, y: 1, z: 1} + - name: mixamorig:LeftArm + parentName: mixamorig:LeftShoulder + position: {x: -4.3510226e-10, y: 0.0009264184, z: -0.0000000029314104} + rotation: {x: -0.13155343, y: -0.006815297, z: 0.0259447, w: 0.9909461} + scale: {x: 1.0000001, y: 1.0000001, z: 1} + - name: mixamorig:LeftForeArm + parentName: mixamorig:LeftArm + position: {x: 5.750917e-10, y: 0.000851285, z: 0.0000000025344342} + rotation: {x: -0.07102725, y: 0.0031653733, z: -0.03707467, w: 0.99678016} + scale: {x: 0.9999999, y: 1.0000001, z: 1.0000005} + - name: mixamorig:LeftHand + parentName: mixamorig:LeftForeArm + position: {x: 9.0221875e-12, y: 0.0016940662, z: -2.1069353e-10} + rotation: {x: 0.055163108, y: 0.0059796856, z: 0.0014736162, w: 0.9984583} + scale: {x: 0.9999999, y: 0.9999996, z: 0.99999964} + - name: mixamorig:RightShoulder + parentName: mixamorig:Spine2 + position: {x: 0.00043921496, y: 0.0008826126, z: -0.0000019886438} + rotation: {x: 0.57332385, y: 0.41300702, z: -0.57593215, w: 0.41112918} + scale: {x: 0.99999994, y: 1, z: 1.0000002} + - name: mixamorig:RightArm + parentName: mixamorig:RightShoulder + position: {x: 1.9208527e-11, y: 0.0009264665, z: 0.0000000057782015} + rotation: {x: 0.12382819, y: -0.0023923656, z: 0.013976897, w: -0.99220234} + scale: {x: 1.0000001, y: 1.0000001, z: 0.9999999} + - name: mixamorig:RightForeArm + parentName: mixamorig:RightArm + position: {x: 1.268927e-10, y: 0.00084945594, z: -3.6940037e-10} + rotation: {x: 0.0783268, y: 0.0014323943, z: -0.0182396, w: -0.9967599} + scale: {x: 1, y: 1.0000006, z: 1.0000004} + - name: mixamorig:RightHand + parentName: mixamorig:RightForeArm + position: {x: -9.984433e-11, y: 0.0015588365, z: -0.0000000015721161} + rotation: {x: 0.054873023, y: -0.007834096, z: 0.00910144, w: 0.99842113} + scale: {x: 0.9999999, y: 1.0000001, z: 1.0000004} + - name: mixamorig:LeftUpLeg + parentName: mixamorig:Hips + position: {x: -0.0010205382, y: -0.00038235186, z: 0.000015514524} + rotation: {x: -0.00023846651, y: 0.021823881, z: 0.9997024, w: 0.010899296} + scale: {x: 1.0000005, y: 1.0000002, z: 1.0000012} + - name: mixamorig:LeftLeg + parentName: mixamorig:LeftUpLeg + position: {x: -2.217348e-10, y: 0.0013013834, z: 5.1572946e-10} + rotation: {x: -0.12150412, y: -0.0073919287, z: 0.060276285, w: 0.99073154} + scale: {x: 1.0000007, y: 1.000001, z: 0.99999976} + - name: mixamorig:LeftFoot + parentName: mixamorig:LeftLeg + position: {x: 6.511982e-11, y: 0.0010961046, z: 2.5145708e-10} + rotation: {x: 0.48592016, y: 0.04219211, z: -0.023493629, w: 0.8726681} + scale: {x: 1.0000002, y: 1.0000001, z: 1} + - name: mixamorig:LeftToeBase + parentName: mixamorig:LeftFoot + position: {x: -9.8953025e-12, y: 0.0010434551, z: -1.839362e-10} + rotation: {x: 0.378947, y: -0.05021617, z: 0.020599203, w: 0.9238253} + scale: {x: 1.0000004, y: 1.0000001, z: 1.0000004} + - name: mixamorig:LeftToe_End + parentName: mixamorig:LeftToeBase + position: {x: -6.4774214e-11, y: 0.0004491552, z: -1.6007107e-12} + rotation: {x: 0.000000059604623, y: -0.0000011920924, z: 0.000000018626444, w: 1} + scale: {x: 1, y: 1, z: 1.0000001} + - name: mixamorig:RightUpLeg + parentName: mixamorig:Hips + position: {x: 0.0010205383, y: -0.00038235128, z: 0.00000055082774} + rotation: {x: 0.00025587715, y: 0.023467716, z: 0.99966526, w: -0.0108972415} + scale: {x: 1.0000005, y: 1.0000001, z: 1.0000013} + - name: mixamorig:RightLeg + parentName: mixamorig:RightUpLeg + position: {x: 6.6555456e-10, y: 0.0013015771, z: 4.4952086e-10} + rotation: {x: -0.11251375, y: 0.0068454314, z: -0.06032829, w: 0.99179345} + scale: {x: 0.99999994, y: 1, z: 0.9999998} + - name: mixamorig:RightFoot + parentName: mixamorig:RightLeg + position: {x: -5.653419e-11, y: 0.0010916048, z: -6.984919e-12} + rotation: {x: 0.47108966, y: -0.044161156, z: 0.023622762, w: 0.8806624} + scale: {x: 1.0000004, y: 1.0000005, z: 0.9999999} + - name: mixamorig:RightToeBase + parentName: mixamorig:RightFoot + position: {x: 2.0634615e-10, y: 0.0010299658, z: -1.816079e-10} + rotation: {x: 0.3847082, y: 0.051783238, z: -0.02162276, w: 0.92133087} + scale: {x: 1.0000007, y: 0.9999998, z: 1.0000007} + - name: mixamorig:RightToe_End + parentName: mixamorig:RightToeBase + position: {x: -2.7616806e-11, y: 0.00044806866, z: 1.4551915e-13} + rotation: {x: 0.000000029802319, y: 0.00000045448536, z: -0.000000020489095, w: 1} + scale: {x: 0.9999999, y: 0.9999999, z: 1.0000001} armTwist: 0.5 foreArmTwist: 0.5 upperLegTwist: 0.5 @@ -93,13 +438,13 @@ ModelImporter: globalScale: 1 rootMotionBoneName: hasTranslationDoF: 0 - hasExtraRoot: 0 + hasExtraRoot: 1 skeletonHasParents: 1 lastHumanDescriptionAvatarSource: {instanceID: 0} autoGenerateAvatarMappingIfUnspecified: 1 - animationType: 2 + animationType: 3 humanoidOversampling: 1 - avatarSetup: 0 + avatarSetup: 1 addHumanoidExtraRootOnlyWhenUsingAvatar: 1 importBlendShapeDeformPercent: 1 remapMaterialsIfMaterialImportModeIsNone: 0 diff --git a/Assets/Prefabs/mysto_withRig@Bboy Hip Hop Move.fbx.meta b/Assets/Prefabs/mysto_withRig@Bboy Hip Hop Move.fbx.meta index 0edc4b7e..e5647768 100644 --- a/Assets/Prefabs/mysto_withRig@Bboy Hip Hop Move.fbx.meta +++ b/Assets/Prefabs/mysto_withRig@Bboy Hip Hop Move.fbx.meta @@ -24,14 +24,43 @@ ModelImporter: animationDoRetargetingWarnings: 0 importAnimatedCustomProperties: 0 importConstraints: 0 - animationCompression: 1 + animationCompression: 3 animationRotationError: 0.5 animationPositionError: 0.5 animationScaleError: 0.5 animationWrapMode: 0 extraExposedTransformPaths: [] extraUserProperties: [] - clipAnimations: [] + clipAnimations: + - serializedVersion: 16 + name: Bboy Hip Hop Move + takeName: mixamo.com + internalID: -203655887218126122 + firstFrame: 0 + lastFrame: 66 + wrapMode: 0 + orientationOffsetY: 0 + level: 0 + cycleOffset: 0 + loop: 0 + hasAdditiveReferencePose: 0 + loopTime: 1 + loopBlend: 0 + loopBlendOrientation: 0 + loopBlendPositionY: 0 + loopBlendPositionXZ: 0 + keepOriginalOrientation: 0 + keepOriginalPositionY: 1 + keepOriginalPositionXZ: 0 + heightFromFeet: 0 + mirror: 0 + bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000 + curves: [] + events: [] + transformMask: [] + maskType: 3 + maskSource: {instanceID: 0} + additiveReferencePoseFrame: 0 isReadable: 0 meshes: lODScreenPercentages: [] @@ -81,8 +110,324 @@ ModelImporter: importAnimation: 1 humanDescription: serializedVersion: 3 - human: [] - skeleton: [] + human: + - boneName: mixamorig:Hips + humanName: Hips + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: mixamorig:LeftUpLeg + humanName: LeftUpperLeg + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: mixamorig:RightUpLeg + humanName: RightUpperLeg + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: mixamorig:LeftLeg + humanName: LeftLowerLeg + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: mixamorig:RightLeg + humanName: RightLowerLeg + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: mixamorig:LeftFoot + humanName: LeftFoot + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: mixamorig:RightFoot + humanName: RightFoot + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: mixamorig:Spine + humanName: Spine + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: mixamorig:Spine1 + humanName: Chest + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: mixamorig:Neck + humanName: Neck + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: mixamorig:Head + humanName: Head + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: mixamorig:LeftShoulder + humanName: LeftShoulder + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: mixamorig:RightShoulder + humanName: RightShoulder + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: mixamorig:LeftArm + humanName: LeftUpperArm + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: mixamorig:RightArm + humanName: RightUpperArm + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: mixamorig:LeftForeArm + humanName: LeftLowerArm + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: mixamorig:RightForeArm + humanName: RightLowerArm + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: mixamorig:LeftHand + humanName: LeftHand + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: mixamorig:RightHand + humanName: RightHand + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: mixamorig:LeftToeBase + humanName: LeftToes + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: mixamorig:RightToeBase + humanName: RightToes + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: mixamorig:Spine2 + humanName: UpperChest + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + skeleton: + - name: mysto_withRig@Bboy Hip Hop Move(Clone) + parentName: + position: {x: 0, y: 0, z: 0} + rotation: {x: 0, y: 0, z: 0, w: 1} + scale: {x: 1, y: 1, z: 1} + - name: Armature + parentName: mysto_withRig@Bboy Hip Hop Move(Clone) + position: {x: -0, y: 0, z: 0} + rotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071068} + scale: {x: 100, y: 100, z: 100} + - name: mixamorig:Hips + parentName: Armature + position: {x: -7.4505804e-11, y: -0.00035926938, z: 0.0035628171} + rotation: {x: 0.70710677, y: -2.5724406e-10, z: -7.7173207e-10, w: 0.7071069} + scale: {x: 0.9999999, y: 0.9999998, z: 0.9999998} + - name: mixamorig:Spine + parentName: mixamorig:Hips + position: {x: -0, y: 0.000687606, z: 0.0000125661545} + rotation: {x: 0.009136318, y: -0.0000000021793727, z: 3.8372544e-10, w: 0.9999583} + scale: {x: 1.0000001, y: 1.0000001, z: 1.0000001} + - name: mixamorig:Spine1 + parentName: mixamorig:Spine + position: {x: -0, y: 0.00080233975, z: -1.0011717e-10} + rotation: {x: -0, y: 0.000000005872973, z: 0.000000002803541, w: 1} + scale: {x: 0.9999999, y: 0.99999994, z: 0.99999994} + - name: mixamorig:Spine2 + parentName: mixamorig:Spine1 + position: {x: -0, y: 0.00091696135, z: -4.6566128e-12} + rotation: {x: 1.6940664e-17, y: -5.3177455e-11, z: -0.0000000029098972, w: 1} + scale: {x: 1.0000001, y: 0.99999994, z: 0.99999994} + - name: mixamorig:Neck + parentName: mixamorig:Spine2 + position: {x: -0, y: 0.0010315785, z: -1.2107193e-10} + rotation: {x: -0.009136318, y: 1.329435e-11, z: 0.0000000014551309, w: 0.9999583} + scale: {x: 1, y: 1.0000002, z: 1} + - name: mixamorig:Head + parentName: mixamorig:Neck + position: {x: -0, y: 0.0007643753, z: -0.00023774458} + rotation: {x: -0, y: -0.0000000014551919, z: -0.0000000036379788, w: 1} + scale: {x: 0.9999999, y: 1, z: 1} + - name: mixamorig:HeadTop_End + parentName: mixamorig:Head + position: {x: -0, y: 0.0043788604, z: -0.0013619636} + rotation: {x: 4.1359026e-25, y: -0, z: -0, w: 1} + scale: {x: 1, y: 1, z: 1} + - name: mixamorig:LeftShoulder + parentName: mixamorig:Spine2 + position: {x: -0.00043921868, y: 0.0008826716, z: 0.0000013715029} + rotation: {x: 0.5755002, y: -0.41146207, z: 0.57370967, w: 0.4127418} + scale: {x: 1.0000001, y: 1.0000002, z: 1.0000004} + - name: mixamorig:LeftArm + parentName: mixamorig:LeftShoulder + position: {x: -4.3510226e-10, y: 0.0009264184, z: -0.0000000029314104} + rotation: {x: -0.13155274, y: -0.006815312, z: 0.025945058, w: 0.9909462} + scale: {x: 1.0000001, y: 1, z: 0.9999998} + - name: mixamorig:LeftForeArm + parentName: mixamorig:LeftArm + position: {x: 5.844049e-10, y: 0.00085128506, z: 0.0000000025527698} + rotation: {x: -0.07045289, y: 0.0029740254, z: -0.03913022, w: 0.9967429} + scale: {x: 1.0000001, y: 1.0000004, z: 1.0000001} + - name: mixamorig:LeftHand + parentName: mixamorig:LeftForeArm + position: {x: 1.04773785e-11, y: 0.0018484738, z: 5.2004906e-10} + rotation: {x: 0.058529317, y: 0.005849191, z: 0.007929075, w: 0.99823713} + scale: {x: 1.0000001, y: 1.0000006, z: 1.0000006} + - name: mixamorig:RightShoulder + parentName: mixamorig:Spine2 + position: {x: 0.00043921496, y: 0.0008826126, z: -0.0000019886438} + rotation: {x: 0.57332355, y: 0.41300732, z: -0.5759319, w: 0.41112956} + scale: {x: 1.0000001, y: 1.0000002, z: 1.0000005} + - name: mixamorig:RightArm + parentName: mixamorig:RightShoulder + position: {x: 2.4447217e-11, y: 0.00092646637, z: 0.000000006380214} + rotation: {x: 0.12382732, y: -0.002392306, z: 0.013977046, w: -0.9922025} + scale: {x: 0.9999999, y: 1.0000004, z: 1.0000001} + - name: mixamorig:RightForeArm + parentName: mixamorig:RightArm + position: {x: 1.466833e-10, y: 0.00084945624, z: -4.807225e-10} + rotation: {x: 0.07349707, y: 0.0013443939, z: -0.018240612, w: -0.9971277} + scale: {x: 1.0000002, y: 0.9999999, z: 0.99999994} + - name: mixamorig:RightHand + parentName: mixamorig:RightForeArm + position: {x: -1.1741576e-10, y: 0.0018483752, z: -6.0463207e-10} + rotation: {x: 0.059526093, y: -0.007884321, z: 0.01285567, w: 0.9981128} + scale: {x: 0.99999994, y: 1.0000006, z: 1.0000004} + - name: mixamorig:LeftUpLeg + parentName: mixamorig:Hips + position: {x: -0.0010205382, y: -0.00038235186, z: 0.000015514524} + rotation: {x: -0.0002382267, y: 0.021823881, z: 0.9997024, w: 0.010899304} + scale: {x: 1.0000006, y: 1.0000005, z: 1.0000014} + - name: mixamorig:LeftLeg + parentName: mixamorig:LeftUpLeg + position: {x: -3.144123e-10, y: 0.0013013835, z: 5.075295e-10} + rotation: {x: -0.121504106, y: -0.007391933, z: 0.06027634, w: 0.99073154} + scale: {x: 1.0000004, y: 1.0000013, z: 0.99999917} + - name: mixamorig:LeftFoot + parentName: mixamorig:LeftLeg + position: {x: 1.2732926e-11, y: 0.0010961044, z: 2.2584572e-10} + rotation: {x: 0.4859202, y: 0.042192135, z: -0.023493852, w: 0.8726681} + scale: {x: 1.0000001, y: 1.0000002, z: 0.9999999} + - name: mixamorig:LeftToeBase + parentName: mixamorig:LeftFoot + position: {x: -1.6938428e-10, y: 0.0010434551, z: -1.6530975e-10} + rotation: {x: 0.3789469, y: -0.05021711, z: 0.020598665, w: 0.92382526} + scale: {x: 1.0000008, y: 1.0000011, z: 0.99999976} + - name: mixamorig:LeftToe_End + parentName: mixamorig:LeftToeBase + position: {x: -5.270522e-12, y: 0.00044915525, z: 2.6921044e-12} + rotation: {x: -0, y: 0.000000022351735, z: -0, w: 1} + scale: {x: 1.0000004, y: 0.99999976, z: 1.0000001} + - name: mixamorig:RightUpLeg + parentName: mixamorig:Hips + position: {x: 0.0010205383, y: -0.00038235128, z: 0.00000055082774} + rotation: {x: 0.00025553536, y: 0.023467716, z: 0.99966526, w: -0.010897244} + scale: {x: 0.99999994, y: 0.9999998, z: 1.0000014} + - name: mixamorig:RightLeg + parentName: mixamorig:RightUpLeg + position: {x: 6.422442e-10, y: 0.0013015771, z: 4.301264e-10} + rotation: {x: -0.11251361, y: 0.0068454742, z: -0.06032841, w: 0.9917935} + scale: {x: 1.0000001, y: 1.0000011, z: 0.99999875} + - name: mixamorig:RightFoot + parentName: mixamorig:RightLeg + position: {x: -9.822543e-12, y: 0.0010916049, z: 1.16415315e-11} + rotation: {x: 0.47108954, y: -0.044161316, z: 0.02362309, w: 0.8806625} + scale: {x: 1.0000001, y: 0.9999998, z: 1} + - name: mixamorig:RightToeBase + parentName: mixamorig:RightFoot + position: {x: 1.9586878e-10, y: 0.0010299657, z: -7.683411e-11} + rotation: {x: 0.38470834, y: 0.051783513, z: -0.021622514, w: 0.9213308} + scale: {x: 1.0000005, y: 1.0000008, z: 0.9999998} + - name: mixamorig:RightToe_End + parentName: mixamorig:RightToeBase + position: {x: -8.314146e-11, y: 0.00044806875, z: 2.0372681e-12} + rotation: {x: 0.000000089406946, y: -0.000000026077027, z: 0.000000013038513, w: 1} + scale: {x: 1.0000002, y: 1, z: 0.99999994} + - name: Mysto.001 + parentName: mysto_withRig@Bboy Hip Hop Move(Clone) + position: {x: -0, y: 0, z: 0} + rotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071067} + scale: {x: 100, y: 100, z: 100} armTwist: 0.5 foreArmTwist: 0.5 upperLegTwist: 0.5 @@ -93,13 +438,13 @@ ModelImporter: globalScale: 1 rootMotionBoneName: hasTranslationDoF: 0 - hasExtraRoot: 0 + hasExtraRoot: 1 skeletonHasParents: 1 lastHumanDescriptionAvatarSource: {instanceID: 0} autoGenerateAvatarMappingIfUnspecified: 1 - animationType: 2 + animationType: 3 humanoidOversampling: 1 - avatarSetup: 0 + avatarSetup: 1 addHumanoidExtraRootOnlyWhenUsingAvatar: 1 importBlendShapeDeformPercent: 1 remapMaterialsIfMaterialImportModeIsNone: 0 diff --git a/Assets/Scenes/CharacterSelection.unity b/Assets/Scenes/CharactersSelection.unity similarity index 97% rename from Assets/Scenes/CharacterSelection.unity rename to Assets/Scenes/CharactersSelection.unity index 52886675..7c4b4b6e 100644 --- a/Assets/Scenes/CharacterSelection.unity +++ b/Assets/Scenes/CharactersSelection.unity @@ -1047,7 +1047,10 @@ PrefabInstance: m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: eba8dcb9cac7c994fa0ed36ac000e0b5, type: 3} + insertIndex: -1 + addedObject: {fileID: 719666188} m_SourcePrefab: {fileID: 100100000, guid: eba8dcb9cac7c994fa0ed36ac000e0b5, type: 3} --- !u!4 &719666186 stripped Transform: @@ -1059,6 +1062,27 @@ GameObject: m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: eba8dcb9cac7c994fa0ed36ac000e0b5, type: 3} m_PrefabInstance: {fileID: 719666185} m_PrefabAsset: {fileID: 0} +--- !u!95 &719666188 +Animator: + serializedVersion: 5 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 719666187} + m_Enabled: 1 + m_Avatar: {fileID: 9000000, guid: eba8dcb9cac7c994fa0ed36ac000e0b5, type: 3} + m_Controller: {fileID: 9100000, guid: 0e09cad5f1d8dd44e85551cf78cbcbd7, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 --- !u!1001 &767180482 PrefabInstance: m_ObjectHideFlags: 0 @@ -1127,6 +1151,14 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} + - target: {fileID: 5866666021909216657, guid: 6123d4aa15b9b6e459f972fa5d0aca61, type: 3} + propertyPath: m_Controller + value: + objectReference: {fileID: 9100000, guid: 0e09cad5f1d8dd44e85551cf78cbcbd7, type: 2} + - target: {fileID: 5866666021909216657, guid: 6123d4aa15b9b6e459f972fa5d0aca61, type: 3} + propertyPath: m_ApplyRootMotion + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] diff --git a/Assets/Scenes/CharacterSelection.unity.meta b/Assets/Scenes/CharactersSelection.unity.meta similarity index 100% rename from Assets/Scenes/CharacterSelection.unity.meta rename to Assets/Scenes/CharactersSelection.unity.meta diff --git a/Assets/Scenes/Level_1 New Enemies.unity b/Assets/Scenes/Level_1 New Enemies.unity index 06bfe65f..59c778f0 100644 --- a/Assets/Scenes/Level_1 New Enemies.unity +++ b/Assets/Scenes/Level_1 New Enemies.unity @@ -1292,6 +1292,37 @@ Transform: m_CorrespondingSourceObject: {fileID: 1223152763054453368, guid: ae0e4b0cd182c7744af576086464afc7, type: 3} m_PrefabInstance: {fileID: 1223152762924738093} m_PrefabAsset: {fileID: 0} +--- !u!1 &276341056 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 276341057} + m_Layer: 0 + m_Name: shootpoint + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &276341057 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 276341056} + 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: 2412161368009617008} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &325374327 GameObject: m_ObjectHideFlags: 0 @@ -2478,6 +2509,118 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 22094cc6dd603d942832401b762230e8, type: 3} +--- !u!1001 &591554021 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1101215467} + m_Modifications: + - target: {fileID: -8679921383154817045, guid: f70150fa7987b9b4fb0a6e4c0e906100, type: 3} + propertyPath: m_LocalScale.x + value: 0.95238096 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: f70150fa7987b9b4fb0a6e4c0e906100, type: 3} + propertyPath: m_LocalScale.y + value: 0.95238096 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: f70150fa7987b9b4fb0a6e4c0e906100, type: 3} + propertyPath: m_LocalScale.z + value: 0.95238096 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: f70150fa7987b9b4fb0a6e4c0e906100, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: f70150fa7987b9b4fb0a6e4c0e906100, type: 3} + propertyPath: m_LocalPosition.y + value: -0.95 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: f70150fa7987b9b4fb0a6e4c0e906100, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: f70150fa7987b9b4fb0a6e4c0e906100, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: f70150fa7987b9b4fb0a6e4c0e906100, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: f70150fa7987b9b4fb0a6e4c0e906100, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: f70150fa7987b9b4fb0a6e4c0e906100, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: f70150fa7987b9b4fb0a6e4c0e906100, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: f70150fa7987b9b4fb0a6e4c0e906100, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: f70150fa7987b9b4fb0a6e4c0e906100, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: f70150fa7987b9b4fb0a6e4c0e906100, type: 3} + propertyPath: m_Name + value: mysto_withRig + objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: f70150fa7987b9b4fb0a6e4c0e906100, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5866666021909216657, guid: f70150fa7987b9b4fb0a6e4c0e906100, type: 3} + propertyPath: m_ApplyRootMotion + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 2412161367050800168, guid: f70150fa7987b9b4fb0a6e4c0e906100, type: 3} + insertIndex: -1 + addedObject: {fileID: 1041660982} + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: f70150fa7987b9b4fb0a6e4c0e906100, type: 3} + insertIndex: -1 + addedObject: {fileID: 591554025} + m_SourcePrefab: {fileID: 100100000, guid: f70150fa7987b9b4fb0a6e4c0e906100, type: 3} +--- !u!4 &591554022 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: f70150fa7987b9b4fb0a6e4c0e906100, type: 3} + m_PrefabInstance: {fileID: 591554021} + m_PrefabAsset: {fileID: 0} +--- !u!1 &591554023 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: f70150fa7987b9b4fb0a6e4c0e906100, type: 3} + m_PrefabInstance: {fileID: 591554021} + m_PrefabAsset: {fileID: 0} +--- !u!95 &591554024 stripped +Animator: + m_CorrespondingSourceObject: {fileID: 5866666021909216657, guid: f70150fa7987b9b4fb0a6e4c0e906100, type: 3} + m_PrefabInstance: {fileID: 591554021} + m_PrefabAsset: {fileID: 0} +--- !u!114 &591554025 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 591554023} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0ad50f81b1d25c441943c37a89ba23f6, type: 3} + m_Name: + m_EditorClassIdentifier: + _Animator: {fileID: 591554024} + _ActionOnDisable: 0 --- !u!1 &596113691 GameObject: m_ObjectHideFlags: 0 @@ -4400,6 +4543,37 @@ Transform: m_CorrespondingSourceObject: {fileID: 489956, guid: b812b96d8cdb67b48b7e6da077dbcab2, type: 3} m_PrefabInstance: {fileID: 1633426890} m_PrefabAsset: {fileID: 0} +--- !u!1 &1041660981 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1041660982} + m_Layer: 0 + m_Name: shootPoint + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1041660982 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1041660981} + 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: 1637403093} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1071911105 PrefabInstance: m_ObjectHideFlags: 0 @@ -4862,6 +5036,11 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1098717341} m_CullTransparentMesh: 1 +--- !u!4 &1101215467 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 6707071687464432219, guid: a0a15effcaf7f2f4bbfd493b6593fdcb, type: 3} + m_PrefabInstance: {fileID: 8583770408142850956} + m_PrefabAsset: {fileID: 0} --- !u!1 &1110153445 GameObject: m_ObjectHideFlags: 0 @@ -7685,6 +7864,11 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: b812b96d8cdb67b48b7e6da077dbcab2, type: 3} +--- !u!4 &1637403093 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 2412161367050800168, guid: f70150fa7987b9b4fb0a6e4c0e906100, type: 3} + m_PrefabInstance: {fileID: 591554021} + m_PrefabAsset: {fileID: 0} --- !u!4 &1656361897 stripped Transform: m_CorrespondingSourceObject: {fileID: 4878888675716472736, guid: 29d627945ae6d7e408810c3c015fa616, type: 3} @@ -9837,6 +10021,246 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2135665786} m_CullTransparentMesh: 1 +--- !u!1 &253954463481334169 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7829577705628160156} + m_Layer: 0 + m_Name: mixamorig:Spine1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &338387117498870073 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6499889928242243810} + serializedVersion: 2 + m_LocalRotation: {x: -0.07679326, y: 0.003257775, z: -0.03876714, w: 0.99628776} + m_LocalPosition: {x: 5.750917e-10, y: 0.000851285, z: 0.0000000025344342} + m_LocalScale: {x: 1, y: 0.99999994, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 6734931531282794465} + m_Father: {fileID: 1194642282940434347} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &523584588360113120 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3551461745102327183} + m_Layer: 0 + m_Name: mixamorig:Hips + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!137 &537709264460177818 +SkinnedMeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3142543472999261068} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 3 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 7599c15503df8f4419979b20c3e3678d, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + serializedVersion: 2 + m_Quality: 0 + m_UpdateWhenOffscreen: 0 + m_SkinnedMotionVectors: 1 + m_Mesh: {fileID: 6449654466282237968, guid: 663e6cc08119b6749b63d3540014d258, type: 3} + m_Bones: + - {fileID: 3551461745102327183} + - {fileID: 1154339343522333719} + - {fileID: 7829577705628160156} + - {fileID: 2341981267675357841} + - {fileID: 9140253384091273041} + - {fileID: 7208261742768875411} + - {fileID: 6039136597295335756} + - {fileID: 3684620279300759936} + - {fileID: 1194642282940434347} + - {fileID: 338387117498870073} + - {fileID: 6734931531282794465} + - {fileID: 5920399810480472271} + - {fileID: 4582277380622922831} + - {fileID: 2838391201704154829} + - {fileID: 2412161368009617008} + - {fileID: 6629684410577387813} + - {fileID: 3160017882091556465} + - {fileID: 8738397992779701312} + - {fileID: 6110471694636310884} + - {fileID: 3209660628839323211} + - {fileID: 3485272648944208628} + - {fileID: 6250409094331388953} + - {fileID: 4330094615169695038} + - {fileID: 3466819893658382369} + - {fileID: 899914986358583656} + m_BlendShapeWeights: [] + m_RootBone: {fileID: 3551461745102327183} + m_AABB: + m_Center: {x: 0.00005165278, y: 0.0027740686, z: -0.0006716808} + m_Extent: {x: 0.005309607, y: 0.00795057, z: 0.0032341871} + m_DirtyAABB: 0 +--- !u!4 &543450652519728563 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 919132148061232905} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: -0.95, z: 0} + m_LocalScale: {x: 0.95238096, y: 0.95238096, z: 0.95238096} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 8879528567903311149} + - {fileID: 6939811092115345231} + m_Father: {fileID: 1101215467} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!4 &899914986358583656 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1166754176793571449} + serializedVersion: 2 + m_LocalRotation: {x: -0.000000022537964, y: 0.00000045096388, z: -0.000000005091807, w: 1} + m_LocalPosition: {x: -2.7616806e-11, y: 0.00044806866, z: 1.4551915e-13} + m_LocalScale: {x: 0.99999994, y: 0.9999998, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 3466819893658382369} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &919132148061232905 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 543450652519728563} + - component: {fileID: 5866666020858060745} + - component: {fileID: 5866666020858060746} + m_Layer: 0 + m_Name: Wizard_Redo_withRig + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!1 &1083518947270277363 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2838391201704154829} + m_Layer: 0 + m_Name: mixamorig:RightForeArm + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1154339343522333719 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6769821327434803476} + serializedVersion: 2 + m_LocalRotation: {x: 0.009136386, y: 0, z: -0, w: 0.9999583} + m_LocalPosition: {x: -0, y: 0.000687606, z: 0.0000125661545} + m_LocalScale: {x: 1, y: 0.99999994, z: 0.99999994} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 7829577705628160156} + m_Father: {fileID: 3551461745102327183} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1166754176793571449 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 899914986358583656} + m_Layer: 0 + m_Name: mixamorig:RightToe_End + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1194642282940434347 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9088872757804732680} + serializedVersion: 2 + m_LocalRotation: {x: -0.11478856, y: -0.004577396, z: 0.039581515, w: 0.99259055} + m_LocalPosition: {x: -4.3510226e-10, y: 0.0009264184, z: -0.0000000029314104} + m_LocalScale: {x: 0.9999999, y: 1, z: 0.99999994} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 338387117498870073} + m_Father: {fileID: 3684620279300759936} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1223152762924738093 PrefabInstance: m_ObjectHideFlags: 0 @@ -9898,22 +10322,54 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: ae0e4b0cd182c7744af576086464afc7, type: 3} ---- !u!1001 &1912088910611789087 -PrefabInstance: +--- !u!1 &1448751520297606172 +GameObject: m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 255779379, guid: 2afb0c0b1e9834310869cb2f0c994844, type: 3} - propertyPath: m_AnchoredPosition.y - value: 380 - objectReference: {fileID: 0} - - target: {fileID: 191765603611759466, guid: 2afb0c0b1e9834310869cb2f0c994844, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6629684410577387813} + m_Layer: 0 + m_Name: mixamorig:LeftUpLeg + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!1 &1617399744785955620 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6250409094331388953} + m_Layer: 0 + m_Name: mixamorig:RightLeg + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!1001 &1912088910611789087 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 255779379, guid: 2afb0c0b1e9834310869cb2f0c994844, type: 3} + propertyPath: m_AnchoredPosition.y + value: 380 + objectReference: {fileID: 0} + - target: {fileID: 191765603611759466, guid: 2afb0c0b1e9834310869cb2f0c994844, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 191765603611759466, guid: 2afb0c0b1e9834310869cb2f0c994844, type: 3} propertyPath: m_AnchorMin.y value: 0 @@ -10462,6 +10918,136 @@ RectTransform: m_CorrespondingSourceObject: {fileID: 8926135060756488905, guid: 2afb0c0b1e9834310869cb2f0c994844, type: 3} m_PrefabInstance: {fileID: 1912088910611789087} m_PrefabAsset: {fileID: 0} +--- !u!4 &2341981267675357841 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7891850267627683139} + serializedVersion: 2 + m_LocalRotation: {x: 0.000000009313226, y: 0, z: -0, w: 1} + m_LocalPosition: {x: -0, y: 0.00091696135, z: -4.6566128e-12} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 3684620279300759936} + - {fileID: 9140253384091273041} + - {fileID: 5920399810480472271} + m_Father: {fileID: 7829577705628160156} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!4 &2412161368009617008 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7529825542752988619} + serializedVersion: 2 + m_LocalRotation: {x: 0.054871578, y: -0.007834081, z: 0.009101538, w: 0.99842125} + m_LocalPosition: {x: -9.984433e-11, y: 0.0015588365, z: -0.0000000015721161} + m_LocalScale: {x: 1, y: 0.9999998, z: 0.9999998} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 276341057} + m_Father: {fileID: 2838391201704154829} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &2464098629844054073 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6039136597295335756} + m_Layer: 0 + m_Name: mixamorig:HeadTop_End + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!1 &2657195003403628269 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3209660628839323211} + m_Layer: 0 + m_Name: mixamorig:LeftToe_End + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2838391201704154829 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1083518947270277363} + serializedVersion: 2 + m_LocalRotation: {x: -0.07832556, y: -0.0014323846, z: 0.018239614, w: 0.99675995} + m_LocalPosition: {x: 1.268927e-10, y: 0.00084945594, z: -3.6940037e-10} + m_LocalScale: {x: 0.99999994, y: 1, z: 0.99999994} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 2412161368009617008} + m_Father: {fileID: 4582277380622922831} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &3142543472999261068 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6939811092115345231} + - component: {fileID: 537709264460177818} + m_Layer: 0 + m_Name: Wizard + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3160017882091556465 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4108234675395258900} + serializedVersion: 2 + m_LocalRotation: {x: -0.121504135, y: -0.0073919413, z: 0.060276292, w: 0.99073154} + m_LocalPosition: {x: -2.217348e-10, y: 0.0013013834, z: 5.1572946e-10} + m_LocalScale: {x: 1.0000001, y: 1.0000001, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 8738397992779701312} + m_Father: {fileID: 6629684410577387813} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!4 &3209660628839323211 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2657195003403628269} + serializedVersion: 2 + m_LocalRotation: {x: -0.000000011728389, y: -0.0000011983284, z: 0.0000000043837645, w: 1} + m_LocalPosition: {x: -6.4774214e-11, y: 0.0004491552, z: -1.6007107e-12} + m_LocalScale: {x: 1, y: 0.99999994, z: 1.0000001} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 6110471694636310884} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &3250460048032814617 PrefabInstance: m_ObjectHideFlags: 0 @@ -10547,6 +11133,184 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 22094cc6dd603d942832401b762230e8, type: 3} +--- !u!4 &3466819893658382369 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4722170226810652700} + serializedVersion: 2 + m_LocalRotation: {x: 0.38470837, y: 0.051783282, z: -0.021622736, w: 0.9213308} + m_LocalPosition: {x: 2.0634615e-10, y: 0.0010299658, z: -1.816079e-10} + m_LocalScale: {x: 0.99999994, y: 1, z: 0.99999994} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 899914986358583656} + m_Father: {fileID: 4330094615169695038} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!4 &3485272648944208628 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6386480452273711366} + serializedVersion: 2 + m_LocalRotation: {x: 0.00025552994, y: 0.02346769, z: 0.9996652, w: -0.010897194} + m_LocalPosition: {x: 0.0010205383, y: -0.00038235128, z: 0.00000055082774} + m_LocalScale: {x: 1.0000002, y: 0.99999976, z: 1.0000013} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 6250409094331388953} + m_Father: {fileID: 3551461745102327183} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!4 &3551461745102327183 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 523584588360113120} + serializedVersion: 2 + m_LocalRotation: {x: 0.7071068, y: 0, z: -0, w: 0.7071067} + m_LocalPosition: {x: -0, y: 0.0000029492046, z: 0.0035069874} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 6629684410577387813} + - {fileID: 3485272648944208628} + - {fileID: 1154339343522333719} + m_Father: {fileID: 8879528567903311149} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!4 &3684620279300759936 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8189512501653584067} + serializedVersion: 2 + m_LocalRotation: {x: 0.5755107, y: -0.4114472, z: 0.5737205, w: 0.41272685} + m_LocalPosition: {x: -0.00043921868, y: 0.0008826716, z: 0.0000013715029} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1194642282940434347} + m_Father: {fileID: 2341981267675357841} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &3799158331864519220 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6734931531282794465} + m_Layer: 0 + m_Name: mixamorig:LeftHand + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!1 &3897462236328751651 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7208261742768875411} + m_Layer: 0 + m_Name: mixamorig:Head + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!1 &4108234675395258900 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3160017882091556465} + m_Layer: 0 + m_Name: mixamorig:LeftLeg + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!1 &4311629581117637050 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8738397992779701312} + m_Layer: 0 + m_Name: mixamorig:LeftFoot + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4330094615169695038 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8352526779256124431} + serializedVersion: 2 + m_LocalRotation: {x: 0.47108948, y: -0.044161145, z: 0.023622744, w: 0.88066256} + m_LocalPosition: {x: -5.653419e-11, y: 0.0010916048, z: -6.984919e-12} + m_LocalScale: {x: 0.99999994, y: 1, z: 0.99999994} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 3466819893658382369} + m_Father: {fileID: 6250409094331388953} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!4 &4582277380622922831 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5585178515010857962} + serializedVersion: 2 + m_LocalRotation: {x: -0.1155701, y: 0.0019409173, z: -0.01667949, w: 0.9931574} + m_LocalPosition: {x: 1.9208527e-11, y: 0.0009264665, z: 0.0000000057782015} + m_LocalScale: {x: 0.9999999, y: 0.9999999, z: 0.9999999} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 2838391201704154829} + m_Father: {fileID: 5920399810480472271} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &4722170226810652700 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3466819893658382369} + m_Layer: 0 + m_Name: mixamorig:RightToeBase + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 --- !u!1001 &4878888676215196681 PrefabInstance: m_ObjectHideFlags: 0 @@ -10616,16 +11380,146 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 29d627945ae6d7e408810c3c015fa616, type: 3} ---- !u!1001 &6396116562424865082 -PrefabInstance: +--- !u!1 &5585178515010857962 +GameObject: m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 1664184677} - m_Modifications: - - target: {fileID: 401775756344623513, guid: 440c8c5663b5db14e860dc4cebf5a096, type: 3} - propertyPath: obstaclePrefabs.Array.size + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4582277380622922831} + m_Layer: 0 + m_Name: mixamorig:RightArm + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!95 &5866666020858060745 +Animator: + serializedVersion: 5 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 919132148061232905} + m_Enabled: 1 + m_Avatar: {fileID: 9000000, guid: 663e6cc08119b6749b63d3540014d258, type: 3} + m_Controller: {fileID: 0} + m_CullingMode: 1 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 +--- !u!114 &5866666020858060746 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 919132148061232905} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0ad50f81b1d25c441943c37a89ba23f6, type: 3} + m_Name: + m_EditorClassIdentifier: + _Animator: {fileID: 5866666020858060745} + _ActionOnDisable: 0 +--- !u!4 &5920399810480472271 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8916979046527813641} + serializedVersion: 2 + m_LocalRotation: {x: -0.5733196, y: -0.4130128, z: 0.57592803, w: -0.41113496} + m_LocalPosition: {x: 0.00043921496, y: 0.0008826126, z: -0.0000019886438} + m_LocalScale: {x: 1, y: 1.0000001, z: 1.0000001} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 4582277380622922831} + m_Father: {fileID: 2341981267675357841} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!4 &6039136597295335756 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2464098629844054073} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -0, y: 0.0043788604, z: -0.0013619636} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 7208261742768875411} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!4 &6110471694636310884 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7292793709572629075} + serializedVersion: 2 + m_LocalRotation: {x: 0.3789471, y: -0.050216142, z: 0.020599179, w: 0.9238253} + m_LocalPosition: {x: -9.8953025e-12, y: 0.0010434551, z: -1.839362e-10} + m_LocalScale: {x: 0.9999999, y: 0.99999994, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 3209660628839323211} + m_Father: {fileID: 8738397992779701312} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!4 &6250409094331388953 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1617399744785955620} + serializedVersion: 2 + m_LocalRotation: {x: -0.11251359, y: 0.006845423, z: -0.06032832, w: 0.9917935} + m_LocalPosition: {x: 6.6555456e-10, y: 0.0013015771, z: 4.4952086e-10} + m_LocalScale: {x: 0.99999994, y: 0.9999999, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 4330094615169695038} + m_Father: {fileID: 3485272648944208628} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &6386480452273711366 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3485272648944208628} + m_Layer: 0 + m_Name: mixamorig:RightUpLeg + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!1001 &6396116562424865082 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1664184677} + m_Modifications: + - target: {fileID: 401775756344623513, guid: 440c8c5663b5db14e860dc4cebf5a096, type: 3} + propertyPath: obstaclePrefabs.Array.size value: 4 objectReference: {fileID: 0} - target: {fileID: 6396116563213356328, guid: 440c8c5663b5db14e860dc4cebf5a096, type: 3} @@ -10681,6 +11575,228 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 440c8c5663b5db14e860dc4cebf5a096, type: 3} +--- !u!1 &6499889928242243810 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 338387117498870073} + m_Layer: 0 + m_Name: mixamorig:LeftForeArm + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6629684410577387813 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1448751520297606172} + serializedVersion: 2 + m_LocalRotation: {x: -0.00023817591, y: 0.021823922, z: 0.9997024, w: 0.010899327} + m_LocalPosition: {x: -0.0010205382, y: -0.00038235186, z: 0.000015514524} + m_LocalScale: {x: 1.0000002, y: 1.0000001, z: 1.0000012} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 3160017882091556465} + m_Father: {fileID: 3551461745102327183} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!4 &6734931531282794465 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3799158331864519220} + serializedVersion: 2 + m_LocalRotation: {x: 0.05516309, y: 0.005979653, z: 0.0014736857, w: 0.9984584} + m_LocalPosition: {x: 9.0221875e-12, y: 0.0016940662, z: -2.1069353e-10} + m_LocalScale: {x: 0.9999999, y: 0.9999999, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 338387117498870073} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &6769821327434803476 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1154339343522333719} + m_Layer: 0 + m_Name: mixamorig:Spine + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6939811092115345231 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3142543472999261068} + serializedVersion: 2 + m_LocalRotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071067} + m_LocalPosition: {x: -0, y: 0, z: 0} + m_LocalScale: {x: 22.358072, y: 22.358072, z: 22.358072} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 543450652519728563} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &7036213050645946215 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8879528567903311149} + m_Layer: 0 + m_Name: Armature + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7208261742768875411 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3897462236328751651} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -0, y: 0.0007643753, z: -0.00023774458} + m_LocalScale: {x: 1, y: 0.99999994, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 6039136597295335756} + m_Father: {fileID: 9140253384091273041} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &7292793709572629075 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6110471694636310884} + m_Layer: 0 + m_Name: mixamorig:LeftToeBase + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!1 &7492347806615965907 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 9140253384091273041} + m_Layer: 0 + m_Name: mixamorig:Neck + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!1 &7529825542752988619 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2412161368009617008} + m_Layer: 0 + m_Name: mixamorig:RightHand + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7829577705628160156 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 253954463481334169} + serializedVersion: 2 + m_LocalRotation: {x: -0.000000007450581, y: 0, z: -0, w: 1} + m_LocalPosition: {x: -0, y: 0.00080233975, z: -1.0011717e-10} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 2341981267675357841} + m_Father: {fileID: 1154339343522333719} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &7891850267627683139 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2341981267675357841} + m_Layer: 0 + m_Name: mixamorig:Spine2 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!1 &8189512501653584067 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3684620279300759936} + m_Layer: 0 + m_Name: mixamorig:LeftShoulder + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!1 &8352526779256124431 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4330094615169695038} + m_Layer: 0 + m_Name: mixamorig:RightFoot + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 --- !u!1001 &8583770408142850956 PrefabInstance: m_ObjectHideFlags: 0 @@ -10701,6 +11817,42 @@ PrefabInstance: propertyPath: m_RootOrder value: 2 objectReference: {fileID: 0} + - target: {fileID: 6707071687464432216, guid: a0a15effcaf7f2f4bbfd493b6593fdcb, type: 3} + propertyPath: animancer + value: + objectReference: {fileID: 0} + - target: {fileID: 6707071687464432216, guid: a0a15effcaf7f2f4bbfd493b6593fdcb, type: 3} + propertyPath: shootPoint + value: + objectReference: {fileID: 0} + - target: {fileID: 6707071687464432216, guid: a0a15effcaf7f2f4bbfd493b6593fdcb, type: 3} + propertyPath: characterAvatar.Array.size + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 6707071687464432216, guid: a0a15effcaf7f2f4bbfd493b6593fdcb, type: 3} + propertyPath: charactersArray.Array.size + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 6707071687464432216, guid: a0a15effcaf7f2f4bbfd493b6593fdcb, type: 3} + propertyPath: characterAvatar.Array.data[0] + value: + objectReference: {fileID: 9000000, guid: f70150fa7987b9b4fb0a6e4c0e906100, type: 3} + - target: {fileID: 6707071687464432216, guid: a0a15effcaf7f2f4bbfd493b6593fdcb, type: 3} + propertyPath: characterAvatar.Array.data[1] + value: + objectReference: {fileID: 9000000, guid: 663e6cc08119b6749b63d3540014d258, type: 3} + - target: {fileID: 6707071687464432216, guid: a0a15effcaf7f2f4bbfd493b6593fdcb, type: 3} + propertyPath: charactersArray.Array.data[0] + value: + objectReference: {fileID: 591554023} + - target: {fileID: 6707071687464432216, guid: a0a15effcaf7f2f4bbfd493b6593fdcb, type: 3} + propertyPath: charactersArray.Array.data[1] + value: + objectReference: {fileID: 919132148061232905} + - target: {fileID: 7474785857762680814, guid: a0a15effcaf7f2f4bbfd493b6593fdcb, type: 3} + propertyPath: _meshRenderer + value: + objectReference: {fileID: 537709264460177818} - target: {fileID: 7646601055626174293, guid: a0a15effcaf7f2f4bbfd493b6593fdcb, type: 3} propertyPath: m_RootOrder value: 1 @@ -10758,10 +11910,33 @@ PrefabInstance: value: objectReference: {fileID: 859659600} m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] + m_RemovedGameObjects: + - {fileID: 2687947951094505636, guid: a0a15effcaf7f2f4bbfd493b6593fdcb, type: 3} + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 6707071687464432219, guid: a0a15effcaf7f2f4bbfd493b6593fdcb, type: 3} + insertIndex: 1 + addedObject: {fileID: 591554022} + - targetCorrespondingSourceObject: {fileID: 6707071687464432219, guid: a0a15effcaf7f2f4bbfd493b6593fdcb, type: 3} + insertIndex: 2 + addedObject: {fileID: 543450652519728563} m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: a0a15effcaf7f2f4bbfd493b6593fdcb, type: 3} +--- !u!4 &8738397992779701312 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4311629581117637050} + serializedVersion: 2 + m_LocalRotation: {x: 0.48592007, y: 0.042192083, z: -0.023493642, w: 0.8726681} + m_LocalPosition: {x: 6.511982e-11, y: 0.0010961046, z: 2.5145708e-10} + m_LocalScale: {x: 0.99999994, y: 0.99999994, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 6110471694636310884} + m_Father: {fileID: 3160017882091556465} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &8828233118980391471 PrefabInstance: m_ObjectHideFlags: 0 @@ -10823,6 +11998,70 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: bfaeed965dc69d74dbd0b97fe9ea7476, type: 3} +--- !u!4 &8879528567903311149 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7036213050645946215} + serializedVersion: 2 + m_LocalRotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071067} + m_LocalPosition: {x: -0, y: 0, z: 0} + m_LocalScale: {x: 100, y: 100, z: 100} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 3551461745102327183} + m_Father: {fileID: 543450652519728563} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &8916979046527813641 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5920399810480472271} + m_Layer: 0 + m_Name: mixamorig:RightShoulder + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!1 &9088872757804732680 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1194642282940434347} + m_Layer: 0 + m_Name: mixamorig:LeftArm + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &9140253384091273041 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7492347806615965907} + serializedVersion: 2 + m_LocalRotation: {x: -0.009136388, y: 0, z: -0, w: 0.9999583} + m_LocalPosition: {x: -0, y: 0.0010315785, z: -1.2107193e-10} + m_LocalScale: {x: 1, y: 1.0000001, z: 0.99999994} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 7208261742768875411} + m_Father: {fileID: 2341981267675357841} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1660057539 &9223372036854775807 SceneRoots: m_ObjectHideFlags: 0 diff --git a/Assets/Source/Prefabs/Enemies/Big Enemy 1.prefab b/Assets/Source/Prefabs/Enemies/Big Enemy 1.prefab index 6d55e370..366b73b1 100644 --- a/Assets/Source/Prefabs/Enemies/Big Enemy 1.prefab +++ b/Assets/Source/Prefabs/Enemies/Big Enemy 1.prefab @@ -14,7 +14,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: beca9f74d86230c40a397c54eeeb85f2, type: 3} propertyPath: m_LocalPosition.y - value: 0 + value: -1 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: beca9f74d86230c40a397c54eeeb85f2, type: 3} propertyPath: m_LocalPosition.z @@ -56,6 +56,14 @@ PrefabInstance: propertyPath: m_ApplyRootMotion value: 0 objectReference: {fileID: 0} + - target: {fileID: 8632055958874330854, guid: beca9f74d86230c40a397c54eeeb85f2, type: 3} + propertyPath: m_LocalPosition.x + value: 0.221 + objectReference: {fileID: 0} + - target: {fileID: 8879528566716807029, guid: beca9f74d86230c40a397c54eeeb85f2, type: 3} + propertyPath: m_LocalPosition.y + value: -0.528 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -106,6 +114,10 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 222793509611741078, guid: a83601dfcee9a0a4bb6bb284cf6cb348, type: 3} + propertyPath: m_Height + value: 1 + objectReference: {fileID: 0} - target: {fileID: 222793509611741078, guid: a83601dfcee9a0a4bb6bb284cf6cb348, type: 3} propertyPath: m_Radius value: 0.25 @@ -142,6 +154,10 @@ PrefabInstance: propertyPath: m_Radius value: 0.25 objectReference: {fileID: 0} + - target: {fileID: 4237591272215210788, guid: a83601dfcee9a0a4bb6bb284cf6cb348, type: 3} + propertyPath: m_Center.y + value: -0.72 + objectReference: {fileID: 0} - target: {fileID: 4237591272215210791, guid: a83601dfcee9a0a4bb6bb284cf6cb348, type: 3} propertyPath: _maxPoints value: 35 diff --git a/Assets/Source/Prefabs/Enemies/Shield Enemy.prefab b/Assets/Source/Prefabs/Enemies/Shield Enemy.prefab index f209478d..e771adea 100644 --- a/Assets/Source/Prefabs/Enemies/Shield Enemy.prefab +++ b/Assets/Source/Prefabs/Enemies/Shield Enemy.prefab @@ -8,6 +8,14 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 222793509611741078, guid: a83601dfcee9a0a4bb6bb284cf6cb348, type: 3} + propertyPath: m_Height + value: 1.2 + objectReference: {fileID: 0} + - target: {fileID: 222793509611741078, guid: a83601dfcee9a0a4bb6bb284cf6cb348, type: 3} + propertyPath: m_BaseOffset + value: 0.52 + objectReference: {fileID: 0} - target: {fileID: 222793509611741078, guid: a83601dfcee9a0a4bb6bb284cf6cb348, type: 3} propertyPath: m_AngularSpeed value: 65 @@ -24,6 +32,10 @@ PrefabInstance: propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 4237591272215210788, guid: a83601dfcee9a0a4bb6bb284cf6cb348, type: 3} + propertyPath: m_Height + value: 1.55 + objectReference: {fileID: 0} - target: {fileID: 4237591272215210791, guid: a83601dfcee9a0a4bb6bb284cf6cb348, type: 3} propertyPath: _maxPoints value: 2 diff --git a/Assets/Source/Prefabs/Enemies/ghost.prefab b/Assets/Source/Prefabs/Enemies/ghost.prefab index 57941d74..06168abe 100644 --- a/Assets/Source/Prefabs/Enemies/ghost.prefab +++ b/Assets/Source/Prefabs/Enemies/ghost.prefab @@ -189,7 +189,7 @@ Transform: m_GameObject: {fileID: 2508792494327918216} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: -0.39, z: 0} + m_LocalPosition: {x: 0, y: -0.791, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -594,9 +594,9 @@ CapsuleCollider: m_Enabled: 1 serializedVersion: 2 m_Radius: 0.5000001 - m_Height: 2 + m_Height: 2.19 m_Direction: 1 - m_Center: {x: 0.000000059604645, y: 0, z: -0.00000008940697} + m_Center: {x: 0.000000059604645, y: 0.17, z: -0.00000008940697} --- !u!114 &4237591272215210811 MonoBehaviour: m_ObjectHideFlags: 0 @@ -712,8 +712,8 @@ NavMeshAgent: m_AutoTraverseOffMeshLink: 1 m_AutoBraking: 0 m_AutoRepath: 1 - m_Height: 2 - m_BaseOffset: 1 + m_Height: 1.44 + m_BaseOffset: 0.13 m_WalkableMask: 4294967295 m_ObstacleAvoidanceType: 1 --- !u!1 &4342937666539257247 diff --git a/Assets/Source/Scripts/SO/Animations/Standart Animations.asset b/Assets/Source/Scripts/SO/Animations/Standart Animations.asset index c2bcc07d..42e5d25d 100644 --- a/Assets/Source/Scripts/SO/Animations/Standart Animations.asset +++ b/Assets/Source/Scripts/SO/Animations/Standart Animations.asset @@ -15,7 +15,7 @@ MonoBehaviour: Idle: {fileID: -203655887218126122, guid: b7486a34921d59c4a97cc6b29e193e91, type: 3} FallingIdle: {fileID: -203655887218126122, guid: 20415c1fd986f0e45968a137a349218e, type: 3} Death: {fileID: -203655887218126122, guid: 2ce8e4e48c5274d42970a5a9c032d4fd, type: 3} - UnarmedRun: {fileID: -623603649343465320, guid: b010554f0c57d7040b12e9576984c6fb, type: 3} + UnarmedRun: {fileID: -623603649343465320, guid: 49a70bb8fa37987479e33b4ae2eb9a87, type: 3} RunWithRifle: {fileID: -203655887218126122, guid: bab5d3c2ad9e3624c8ccf44fd467d9a2, type: 3} RunWithDouble: {fileID: -8412343837380535855, guid: 4f3a699adcd5eea4495f7311f29070f9, type: 3} RunForward: {fileID: -203655887218126122, guid: e09b58c2d3eeeb64989111771640415d, type: 3} diff --git a/Assets/Source/Scripts/SO/Soldiers/PistolMember.cs b/Assets/Source/Scripts/SO/Soldiers/PistolMember.cs index a663799b..3de9ffea 100644 --- a/Assets/Source/Scripts/SO/Soldiers/PistolMember.cs +++ b/Assets/Source/Scripts/SO/Soldiers/PistolMember.cs @@ -1,5 +1,7 @@ +using Animancer; using D2D; using D2D.Utilities; +using NUnit.Framework; using UnityEngine; using static D2D.Utilities.CommonGameplayFacade; @@ -7,7 +9,9 @@ using static D2D.Utilities.CommonGameplayFacade; public class PistolMember : SquadMember { [SerializeField] private float projectileForce = 10f; - + string character; + public GameObject[] charactersArray; + public Avatar[] characterAvatar; public override void Shoot(Transform target) { if (reloadTime > Time.time) @@ -61,7 +65,30 @@ public class PistolMember : SquadMember reloadTime = Time.time + memberClass.ReloadDuration; } + private void Start() + { + //particleController = GetComponent(); + character = PlayerPrefs.GetString("selectedCharacterKey"); + if (character.Contains("mysto")) + { + //FindObjectOfType().enableParticle(0); + //particleController.enableParticle(0); + charactersArray[0].SetActive(true); + charactersArray[0].GetComponent().Animator.avatar = characterAvatar[0]; + + } + else + { + + //if (particleController != null) + //{ + // particleController.enableParticle(1); + //} + charactersArray[1].SetActive(true); + charactersArray[1].GetComponent().Animator.avatar = characterAvatar[1]; + } + } private void HitEnemy(Transform other, Transform @object) { if (other.CompareTag(_gameData.hittableTag)) diff --git a/Assets/characters.controller b/Assets/characters.controller new file mode 100644 index 00000000..5df8a382 --- /dev/null +++ b/Assets/characters.controller @@ -0,0 +1,116 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1107 &-9055811386643036808 +AnimatorStateMachine: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Base Layer + m_ChildStates: + - serializedVersion: 1 + m_State: {fileID: 832873174607403605} + m_Position: {x: 562.4015, y: 24.87201, z: 0} + - serializedVersion: 1 + m_State: {fileID: 2651760264367576034} + m_Position: {x: 530, y: 210, z: 0} + m_ChildStateMachines: [] + m_AnyStateTransitions: [] + m_EntryTransitions: + - {fileID: 523123511987044599} + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: 50, y: 20, z: 0} + m_EntryPosition: {x: 210, y: 110, z: 0} + m_ExitPosition: {x: 800, y: 120, z: 0} + m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} + m_DefaultState: {fileID: 832873174607403605} +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: characters + serializedVersion: 5 + m_AnimatorParameters: [] + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: -9055811386643036808} + m_Mask: {fileID: 0} + m_Motions: [] + m_Behaviours: [] + m_BlendingMode: 0 + m_SyncedLayerIndex: -1 + m_DefaultWeight: 0 + m_IKPass: 0 + m_SyncedLayerAffectsTiming: 0 + m_Controller: {fileID: 9100000} +--- !u!1109 &523123511987044599 +AnimatorTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: [] + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 2651760264367576034} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 1 +--- !u!1102 &832873174607403605 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: New State + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: -203655887218126122, guid: 6123d4aa15b9b6e459f972fa5d0aca61, type: 3} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1102 &2651760264367576034 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: New State 0 + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: -203655887218126122, guid: eba8dcb9cac7c994fa0ed36ac000e0b5, type: 3} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: diff --git a/Assets/characters.controller.meta b/Assets/characters.controller.meta new file mode 100644 index 00000000..58b900b1 --- /dev/null +++ b/Assets/characters.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 0e09cad5f1d8dd44e85551cf78cbcbd7 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: