diff --git a/FlufflParty/.idea/.idea.FlufflParty/.idea/workspace.xml b/FlufflParty/.idea/.idea.FlufflParty/.idea/workspace.xml index 06ff194..b423be1 100644 --- a/FlufflParty/.idea/.idea.FlufflParty/.idea/workspace.xml +++ b/FlufflParty/.idea/.idea.FlufflParty/.idea/workspace.xml @@ -129,7 +129,7 @@ - + diff --git a/FlufflParty/Assets/BlenderFiles/Animation/StarAnimator.controller b/FlufflParty/Assets/BlenderFiles/Animation/StarAnimator.controller new file mode 100644 index 0000000..a5775f5 --- /dev/null +++ b/FlufflParty/Assets/BlenderFiles/Animation/StarAnimator.controller @@ -0,0 +1,72 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1102 &-3372469480658454400 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Scene + 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: -623603649343465320, guid: 8bd12e37e6ede804d94344c5bcaaea41, type: 3} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: StarAnimator + serializedVersion: 5 + m_AnimatorParameters: [] + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: 7066694291420368678} + 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!1107 &7066694291420368678 +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: -3372469480658454400} + m_Position: {x: 340, y: 130, z: 0} + m_ChildStateMachines: [] + m_AnyStateTransitions: [] + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: 50, y: 20, z: 0} + m_EntryPosition: {x: 50, y: 120, z: 0} + m_ExitPosition: {x: 800, y: 120, z: 0} + m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} + m_DefaultState: {fileID: -3372469480658454400} diff --git a/FlufflParty/Assets/BlenderFiles/Animation/StarAnimator.controller.meta b/FlufflParty/Assets/BlenderFiles/Animation/StarAnimator.controller.meta new file mode 100644 index 0000000..e7f3f8e --- /dev/null +++ b/FlufflParty/Assets/BlenderFiles/Animation/StarAnimator.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 815797d8f652ff44b8dab25ff9a0cde3 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/FlufflParty/Assets/BlenderFiles/Animation/StarAnimatorFlat.controller b/FlufflParty/Assets/BlenderFiles/Animation/StarAnimatorFlat.controller new file mode 100644 index 0000000..b7c90c0 --- /dev/null +++ b/FlufflParty/Assets/BlenderFiles/Animation/StarAnimatorFlat.controller @@ -0,0 +1,72 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1102 &-1403658244078824728 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Scene + 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: -623603649343465320, guid: d46844925a8eb8247be3b640d1a034ad, type: 3} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: StarAnimatorFlat + serializedVersion: 5 + m_AnimatorParameters: [] + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: 4626693171902715256} + 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!1107 &4626693171902715256 +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: -1403658244078824728} + m_Position: {x: 315.21423, y: 140.60565, z: 0} + m_ChildStateMachines: [] + m_AnyStateTransitions: [] + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: 50, y: 20, z: 0} + m_EntryPosition: {x: 50, y: 120, z: 0} + m_ExitPosition: {x: 800, y: 120, z: 0} + m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} + m_DefaultState: {fileID: -1403658244078824728} diff --git a/FlufflParty/Assets/BlenderFiles/Animation/StarAnimatorFlat.controller.meta b/FlufflParty/Assets/BlenderFiles/Animation/StarAnimatorFlat.controller.meta new file mode 100644 index 0000000..9057044 --- /dev/null +++ b/FlufflParty/Assets/BlenderFiles/Animation/StarAnimatorFlat.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 62b28fe48d7491a4db5f941cb066e3ec +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/FlufflParty/Assets/BlenderFiles/Star.blend b/FlufflParty/Assets/BlenderFiles/Star.blend index 4fcadb5..f1f883a 100644 Binary files a/FlufflParty/Assets/BlenderFiles/Star.blend and b/FlufflParty/Assets/BlenderFiles/Star.blend differ diff --git a/FlufflParty/Assets/BlenderFiles/Star.blend.meta b/FlufflParty/Assets/BlenderFiles/Star.blend.meta index 3e69998..5535ad9 100644 --- a/FlufflParty/Assets/BlenderFiles/Star.blend.meta +++ b/FlufflParty/Assets/BlenderFiles/Star.blend.meta @@ -31,7 +31,36 @@ ModelImporter: animationWrapMode: 0 extraExposedTransformPaths: [] extraUserProperties: [] - clipAnimations: [] + clipAnimations: + - serializedVersion: 16 + name: Scene + takeName: Scene + internalID: -623603649343465320 + firstFrame: 1 + lastFrame: 40 + 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: 1 isReadable: 0 meshes: lODScreenPercentages: [] diff --git a/FlufflParty/Assets/BlenderFiles/Star.blend1 b/FlufflParty/Assets/BlenderFiles/Star.blend1 index cc941f1..531d74b 100644 Binary files a/FlufflParty/Assets/BlenderFiles/Star.blend1 and b/FlufflParty/Assets/BlenderFiles/Star.blend1 differ diff --git a/FlufflParty/Assets/BlenderFiles/StarAnimatedFlat.blend b/FlufflParty/Assets/BlenderFiles/StarAnimatedFlat.blend new file mode 100644 index 0000000..086cd9c Binary files /dev/null and b/FlufflParty/Assets/BlenderFiles/StarAnimatedFlat.blend differ diff --git a/FlufflParty/Assets/BlenderFiles/StarAnimatedFlat.blend.meta b/FlufflParty/Assets/BlenderFiles/StarAnimatedFlat.blend.meta new file mode 100644 index 0000000..68b78fa --- /dev/null +++ b/FlufflParty/Assets/BlenderFiles/StarAnimatedFlat.blend.meta @@ -0,0 +1,135 @@ +fileFormatVersion: 2 +guid: d46844925a8eb8247be3b640d1a034ad +ModelImporter: + serializedVersion: 21300 + internalIDToNameTable: [] + externalObjects: {} + materials: + materialImportMode: 2 + materialName: 0 + materialSearch: 1 + materialLocation: 1 + animations: + legacyGenerateAnimations: 4 + bakeSimulation: 0 + resampleCurves: 1 + optimizeGameObjects: 0 + removeConstantScaleCurves: 1 + 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: + - serializedVersion: 16 + name: Scene + takeName: Scene + internalID: -623603649343465320 + firstFrame: 1 + lastFrame: 40 + 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: 1 + isReadable: 0 + meshes: + lODScreenPercentages: [] + globalScale: 1 + meshCompression: 0 + addColliders: 0 + useSRGBMaterialColor: 1 + sortHierarchyByName: 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 + tangentSpace: + normalSmoothAngle: 60 + normalImportMode: 0 + tangentImportMode: 3 + normalCalculationMode: 4 + legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0 + blendShapeNormalImportMode: 1 + normalSmoothingSource: 0 + referencedClips: [] + importAnimation: 1 + 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: 2 + humanoidOversampling: 1 + avatarSetup: 0 + addHumanoidExtraRootOnlyWhenUsingAvatar: 1 + remapMaterialsIfMaterialImportModeIsNone: 0 + additionalBone: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/FlufflParty/Assets/BlenderFiles/StarAnimatedFlat.blend1 b/FlufflParty/Assets/BlenderFiles/StarAnimatedFlat.blend1 new file mode 100644 index 0000000..34acafe Binary files /dev/null and b/FlufflParty/Assets/BlenderFiles/StarAnimatedFlat.blend1 differ diff --git a/FlufflParty/Assets/BlenderFiles/StarAnimatedFlat.blend1.meta b/FlufflParty/Assets/BlenderFiles/StarAnimatedFlat.blend1.meta new file mode 100644 index 0000000..2a750c0 --- /dev/null +++ b/FlufflParty/Assets/BlenderFiles/StarAnimatedFlat.blend1.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 41fcf1142e62b1c479fb2e084b426dac +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/FlufflParty/Assets/Prefabs/Star.prefab b/FlufflParty/Assets/Prefabs/Star.prefab index a13d41e..240f823 100644 --- a/FlufflParty/Assets/Prefabs/Star.prefab +++ b/FlufflParty/Assets/Prefabs/Star.prefab @@ -11,6 +11,7 @@ GameObject: - component: {fileID: 3795951766237299313} - component: {fileID: 216794625817988564} - component: {fileID: 2659026870209132830} + - component: {fileID: -7200918598296841118} m_Layer: 0 m_Name: Star m_TagString: Untagged @@ -83,3 +84,23 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} +--- !u!95 &-7200918598296841118 +Animator: + serializedVersion: 5 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4604436567181170891} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 815797d8f652ff44b8dab25ff9a0cde3, 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 diff --git a/FlufflParty/Assets/Scenes/WesternMap.unity b/FlufflParty/Assets/Scenes/WesternMap.unity index 4f83b07..7000674 100644 --- a/FlufflParty/Assets/Scenes/WesternMap.unity +++ b/FlufflParty/Assets/Scenes/WesternMap.unity @@ -750,6 +750,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: starObject: {fileID: 1434234014} + starObject2: {fileID: 1152204771} --- !u!1 &82182830 GameObject: m_ObjectHideFlags: 0 @@ -3647,8 +3648,12 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 1434234013} + m_TransformParent: {fileID: 2106570837} m_Modifications: + - target: {fileID: -7200918598296841118, guid: b6b8a9ada8b7cdf42bab93e4c755ca35, type: 3} + propertyPath: m_Controller + value: + objectReference: {fileID: 9100000, guid: 62b28fe48d7491a4db5f941cb066e3ec, type: 2} - target: {fileID: 2659026870209132830, guid: b6b8a9ada8b7cdf42bab93e4c755ca35, type: 3} propertyPath: m_CastShadows value: 0 @@ -3663,7 +3668,7 @@ PrefabInstance: objectReference: {fileID: 2100000, guid: 138f97e596025164ebb9170ee78f0428, type: 2} - target: {fileID: 3795951766237299313, guid: b6b8a9ada8b7cdf42bab93e4c755ca35, type: 3} propertyPath: m_RootOrder - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3795951766237299313, guid: b6b8a9ada8b7cdf42bab93e4c755ca35, type: 3} propertyPath: m_LocalScale.x @@ -3679,31 +3684,31 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3795951766237299313, guid: b6b8a9ada8b7cdf42bab93e4c755ca35, type: 3} propertyPath: m_LocalPosition.x - value: -0.20311908 + value: 0.39888 objectReference: {fileID: 0} - target: {fileID: 3795951766237299313, guid: b6b8a9ada8b7cdf42bab93e4c755ca35, type: 3} propertyPath: m_LocalPosition.y - value: 17.017591 + value: 19.017591 objectReference: {fileID: 0} - target: {fileID: 3795951766237299313, guid: b6b8a9ada8b7cdf42bab93e4c755ca35, type: 3} propertyPath: m_LocalPosition.z - value: -0.32096884 + value: -0.574646 objectReference: {fileID: 0} - target: {fileID: 3795951766237299313, guid: b6b8a9ada8b7cdf42bab93e4c755ca35, type: 3} propertyPath: m_LocalRotation.w - value: 0.6160908 + value: 0.6981075 objectReference: {fileID: 0} - target: {fileID: 3795951766237299313, guid: b6b8a9ada8b7cdf42bab93e4c755ca35, type: 3} propertyPath: m_LocalRotation.x - value: 0.61609036 + value: 0.698107 objectReference: {fileID: 0} - target: {fileID: 3795951766237299313, guid: b6b8a9ada8b7cdf42bab93e4c755ca35, type: 3} propertyPath: m_LocalRotation.y - value: 0.34703392 + value: 0.11245601 objectReference: {fileID: 0} - target: {fileID: 3795951766237299313, guid: b6b8a9ada8b7cdf42bab93e4c755ca35, type: 3} propertyPath: m_LocalRotation.z - value: -0.34703377 + value: -0.112455964 objectReference: {fileID: 0} - target: {fileID: 3795951766237299313, guid: b6b8a9ada8b7cdf42bab93e4c755ca35, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -3727,6 +3732,11 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: b6b8a9ada8b7cdf42bab93e4c755ca35, type: 3} +--- !u!4 &619344561 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 3795951766237299313, guid: b6b8a9ada8b7cdf42bab93e4c755ca35, type: 3} + m_PrefabInstance: {fileID: 619344560} + m_PrefabAsset: {fileID: 0} --- !u!1001 &629549776 PrefabInstance: m_ObjectHideFlags: 0 @@ -4151,6 +4161,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 894633278} + - {fileID: 881461551} - {fileID: 543450651710162215} m_Father: {fileID: 675727854} m_RootOrder: 0 @@ -4160,8 +4171,12 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 543450651710162215} + m_TransformParent: {fileID: 679814014} m_Modifications: + - target: {fileID: -7200918598296841118, guid: b6b8a9ada8b7cdf42bab93e4c755ca35, type: 3} + propertyPath: m_Controller + value: + objectReference: {fileID: 9100000, guid: 62b28fe48d7491a4db5f941cb066e3ec, type: 2} - target: {fileID: 2659026870209132830, guid: b6b8a9ada8b7cdf42bab93e4c755ca35, type: 3} propertyPath: m_CastShadows value: 0 @@ -4176,7 +4191,7 @@ PrefabInstance: objectReference: {fileID: 2100000, guid: 138f97e596025164ebb9170ee78f0428, type: 2} - target: {fileID: 3795951766237299313, guid: b6b8a9ada8b7cdf42bab93e4c755ca35, type: 3} propertyPath: m_RootOrder - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3795951766237299313, guid: b6b8a9ada8b7cdf42bab93e4c755ca35, type: 3} propertyPath: m_LocalScale.x @@ -4192,31 +4207,31 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3795951766237299313, guid: b6b8a9ada8b7cdf42bab93e4c755ca35, type: 3} propertyPath: m_LocalPosition.x - value: 0.39198533 + value: 0.026611328 objectReference: {fileID: 0} - target: {fileID: 3795951766237299313, guid: b6b8a9ada8b7cdf42bab93e4c755ca35, type: 3} propertyPath: m_LocalPosition.y - value: 16.931944 + value: 18.79248 objectReference: {fileID: 0} - target: {fileID: 3795951766237299313, guid: b6b8a9ada8b7cdf42bab93e4c755ca35, type: 3} propertyPath: m_LocalPosition.z - value: -0.08958998 + value: -0.22608185 objectReference: {fileID: 0} - target: {fileID: 3795951766237299313, guid: b6b8a9ada8b7cdf42bab93e4c755ca35, type: 3} propertyPath: m_LocalRotation.w - value: 0.5512909 + value: 0.6994948 objectReference: {fileID: 0} - target: {fileID: 3795951766237299313, guid: b6b8a9ada8b7cdf42bab93e4c755ca35, type: 3} propertyPath: m_LocalRotation.x - value: -0.5512909 + value: -0.6994948 objectReference: {fileID: 0} - target: {fileID: 3795951766237299313, guid: b6b8a9ada8b7cdf42bab93e4c755ca35, type: 3} propertyPath: m_LocalRotation.y - value: -0.4428073 + value: -0.103474975 objectReference: {fileID: 0} - target: {fileID: 3795951766237299313, guid: b6b8a9ada8b7cdf42bab93e4c755ca35, type: 3} propertyPath: m_LocalRotation.z - value: -0.4428073 + value: -0.103474975 objectReference: {fileID: 0} - target: {fileID: 3795951766237299313, guid: b6b8a9ada8b7cdf42bab93e4c755ca35, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -4343,7 +4358,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 3795951766237299313, guid: b6b8a9ada8b7cdf42bab93e4c755ca35, type: 3} propertyPath: m_RootOrder - value: 1 + value: 2 objectReference: {fileID: 0} - target: {fileID: 3795951766237299313, guid: b6b8a9ada8b7cdf42bab93e4c755ca35, type: 3} propertyPath: m_LocalScale.x @@ -5181,6 +5196,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: starObject: {fileID: 715033102} + starObject2: {fileID: 1829830591} --- !u!1 &865170534 GameObject: m_ObjectHideFlags: 0 @@ -5316,6 +5332,16 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 865170534} m_CullTransparentMesh: 1 +--- !u!1 &881461550 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 4604436567181170891, guid: b6b8a9ada8b7cdf42bab93e4c755ca35, type: 3} + m_PrefabInstance: {fileID: 689839206} + m_PrefabAsset: {fileID: 0} +--- !u!4 &881461551 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 3795951766237299313, guid: b6b8a9ada8b7cdf42bab93e4c755ca35, type: 3} + m_PrefabInstance: {fileID: 689839206} + m_PrefabAsset: {fileID: 0} --- !u!1 &894633277 GameObject: m_ObjectHideFlags: 0 @@ -5375,6 +5401,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: starObject: {fileID: 3686010993121740631} + starObject2: {fileID: 881461550} --- !u!1 &895359046 GameObject: m_ObjectHideFlags: 0 @@ -6246,6 +6273,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 857407153} + - {fileID: 1829830592} - {fileID: 715033101} m_Father: {fileID: 675727854} m_RootOrder: 1 @@ -7569,6 +7597,11 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 3283c2131aad7954fac11b8f7a76af0e, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &1152204771 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 4604436567181170891, guid: b6b8a9ada8b7cdf42bab93e4c755ca35, type: 3} + m_PrefabInstance: {fileID: 619344560} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1170260332 PrefabInstance: m_ObjectHideFlags: 0 @@ -8469,8 +8502,12 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 715033101} + m_TransformParent: {fileID: 1017709783} m_Modifications: + - target: {fileID: -7200918598296841118, guid: b6b8a9ada8b7cdf42bab93e4c755ca35, type: 3} + propertyPath: m_Controller + value: + objectReference: {fileID: 9100000, guid: 62b28fe48d7491a4db5f941cb066e3ec, type: 2} - target: {fileID: 2659026870209132830, guid: b6b8a9ada8b7cdf42bab93e4c755ca35, type: 3} propertyPath: m_CastShadows value: 0 @@ -8485,7 +8522,7 @@ PrefabInstance: objectReference: {fileID: 2100000, guid: 138f97e596025164ebb9170ee78f0428, type: 2} - target: {fileID: 3795951766237299313, guid: b6b8a9ada8b7cdf42bab93e4c755ca35, type: 3} propertyPath: m_RootOrder - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3795951766237299313, guid: b6b8a9ada8b7cdf42bab93e4c755ca35, type: 3} propertyPath: m_LocalScale.x @@ -8501,31 +8538,31 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3795951766237299313, guid: b6b8a9ada8b7cdf42bab93e4c755ca35, type: 3} propertyPath: m_LocalPosition.x - value: 0.04652229 + value: 0.55052185 objectReference: {fileID: 0} - target: {fileID: 3795951766237299313, guid: b6b8a9ada8b7cdf42bab93e4c755ca35, type: 3} propertyPath: m_LocalPosition.y - value: 17.001484 + value: 19.001484 objectReference: {fileID: 0} - target: {fileID: 3795951766237299313, guid: b6b8a9ada8b7cdf42bab93e4c755ca35, type: 3} propertyPath: m_LocalPosition.z - value: -0.60545707 + value: -0.36086273 objectReference: {fileID: 0} - target: {fileID: 3795951766237299313, guid: b6b8a9ada8b7cdf42bab93e4c755ca35, type: 3} propertyPath: m_LocalRotation.w - value: 0.6064473 + value: 0.69797814 objectReference: {fileID: 0} - target: {fileID: 3795951766237299313, guid: b6b8a9ada8b7cdf42bab93e4c755ca35, type: 3} propertyPath: m_LocalRotation.x - value: 0.6064473 + value: 0.69797814 objectReference: {fileID: 0} - target: {fileID: 3795951766237299313, guid: b6b8a9ada8b7cdf42bab93e4c755ca35, type: 3} propertyPath: m_LocalRotation.y - value: 0.36362308 + value: 0.11325446 objectReference: {fileID: 0} - target: {fileID: 3795951766237299313, guid: b6b8a9ada8b7cdf42bab93e4c755ca35, type: 3} propertyPath: m_LocalRotation.z - value: -0.36362308 + value: -0.11325446 objectReference: {fileID: 0} - target: {fileID: 3795951766237299313, guid: b6b8a9ada8b7cdf42bab93e4c755ca35, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -9149,7 +9186,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 3795951766237299313, guid: b6b8a9ada8b7cdf42bab93e4c755ca35, type: 3} propertyPath: m_RootOrder - value: 1 + value: 2 objectReference: {fileID: 0} - target: {fileID: 3795951766237299313, guid: b6b8a9ada8b7cdf42bab93e4c755ca35, type: 3} propertyPath: m_LocalScale.x @@ -12753,6 +12790,16 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1805722634} m_CullTransparentMesh: 1 +--- !u!1 &1829830591 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 4604436567181170891, guid: b6b8a9ada8b7cdf42bab93e4c755ca35, type: 3} + m_PrefabInstance: {fileID: 1309058663} + m_PrefabAsset: {fileID: 0} +--- !u!4 &1829830592 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 3795951766237299313, guid: b6b8a9ada8b7cdf42bab93e4c755ca35, type: 3} + m_PrefabInstance: {fileID: 1309058663} + m_PrefabAsset: {fileID: 0} --- !u!1 &1856161156 GameObject: m_ObjectHideFlags: 0 @@ -13944,6 +13991,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 72730586} + - {fileID: 619344561} - {fileID: 1434234013} m_Father: {fileID: 675727854} m_RootOrder: 2 @@ -14183,7 +14231,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 3795951766237299313, guid: b6b8a9ada8b7cdf42bab93e4c755ca35, type: 3} propertyPath: m_RootOrder - value: 1 + value: 2 objectReference: {fileID: 0} - target: {fileID: 3795951766237299313, guid: b6b8a9ada8b7cdf42bab93e4c755ca35, type: 3} propertyPath: m_LocalScale.x @@ -14211,19 +14259,19 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3795951766237299313, guid: b6b8a9ada8b7cdf42bab93e4c755ca35, type: 3} propertyPath: m_LocalRotation.w - value: 0.86288923 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3795951766237299313, guid: b6b8a9ada8b7cdf42bab93e4c755ca35, type: 3} propertyPath: m_LocalRotation.x - value: -0 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3795951766237299313, guid: b6b8a9ada8b7cdf42bab93e4c755ca35, type: 3} propertyPath: m_LocalRotation.y - value: 0.50539315 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3795951766237299313, guid: b6b8a9ada8b7cdf42bab93e4c755ca35, type: 3} propertyPath: m_LocalRotation.z - value: -0 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3795951766237299313, guid: b6b8a9ada8b7cdf42bab93e4c755ca35, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -14231,7 +14279,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3795951766237299313, guid: b6b8a9ada8b7cdf42bab93e4c755ca35, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: 60.715 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3795951766237299313, guid: b6b8a9ada8b7cdf42bab93e4c755ca35, type: 3} propertyPath: m_LocalEulerAnglesHint.z diff --git a/FlufflParty/Assets/Scripts/Stars/Star.cs b/FlufflParty/Assets/Scripts/Stars/Star.cs index 969ab05..61bf828 100644 --- a/FlufflParty/Assets/Scripts/Stars/Star.cs +++ b/FlufflParty/Assets/Scripts/Stars/Star.cs @@ -9,7 +9,7 @@ public class Star : MonoBehaviour private StarController starController; private int cost = 20; - [SerializeField] private GameObject starObject; + [SerializeField] private GameObject starObject, starObject2; public int Cost { @@ -29,6 +29,7 @@ public class Star : MonoBehaviour { isActive = value; starObject.SetActive(value); + starObject2.SetActive(value); } } diff --git a/FlufflParty/ProjectSettings/ProjectSettings.asset b/FlufflParty/ProjectSettings/ProjectSettings.asset index fcbf6d0..b33a346 100644 --- a/FlufflParty/ProjectSettings/ProjectSettings.asset +++ b/FlufflParty/ProjectSettings/ProjectSettings.asset @@ -137,9 +137,7 @@ PlayerSettings: 16:9: 1 Others: 1 bundleVersion: 0.1 - preloadedAssets: - - {fileID: -6230802382160794249, guid: 90cd1b71078984c4980fcd1aa03eaaa3, type: 2} - - {fileID: 11400000, guid: 48bf7376b3770c44cbfe3f40e77359ab, type: 2} + preloadedAssets: [] metroInputSource: 0 wsaTransparentSwapchain: 0 m_HolographicPauseOnTrackingLoss: 1