diff --git a/popcorn/Assets/MyGame/Resource/Material/minigame/stage/minigame_stage_tree.png b/popcorn/Assets/MyGame/Resource/Material/minigame/stage/minigame_stage_tree.png index 04bda1ea..4b5165b9 100644 Binary files a/popcorn/Assets/MyGame/Resource/Material/minigame/stage/minigame_stage_tree.png and b/popcorn/Assets/MyGame/Resource/Material/minigame/stage/minigame_stage_tree.png differ diff --git a/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/ItemTree.prefab b/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/ItemTree.prefab index 8bbfe9fc..cf85aaa6 100644 --- a/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/ItemTree.prefab +++ b/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/ItemTree.prefab @@ -27,8 +27,10 @@ Transform: 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: - {fileID: 2000043922596723899} + - {fileID: 2110979880873338447} - {fileID: 9165202840736919352} - {fileID: 3329976228366573394} - {fileID: 8366474694430641870} @@ -46,10 +48,12 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 0 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -110,12 +114,13 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4881018188335882927} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0.99, y: 1.36, z: 0} + m_LocalPosition: {x: -1.12, y: 1.84, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 3769247313527994625} m_Father: {fileID: 7170547486884922313} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &4553206951139253898 SpriteRenderer: @@ -128,10 +133,12 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 0 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -192,12 +199,13 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6320076065680994612} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -1.14, y: 0.41, z: 0} + m_LocalPosition: {x: -1.17, y: -0.29, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 6296419824617624433} m_Father: {fileID: 7170547486884922313} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &6634479968594114118 SpriteRenderer: @@ -210,10 +218,12 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 0 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -274,12 +284,13 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8238342438517328414} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 1.06, y: -0.46, z: 0} + m_LocalPosition: {x: 1.26, y: -1.07, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 3743485536561059171} m_Father: {fileID: 7170547486884922313} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &7392310108678024470 SpriteRenderer: @@ -292,10 +303,12 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 0 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -331,7 +344,7 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!1 &9197360416021838947 +--- !u!1 &8589812644913610653 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -339,45 +352,48 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 2000043922596723899} - - component: {fileID: 3925572643871708749} + - component: {fileID: 2110979880873338447} + - component: {fileID: 4156859988126721438} m_Layer: 0 - m_Name: tree_top + m_Name: tree_top (1) m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &2000043922596723899 + m_IsActive: 0 +--- !u!4 &2110979880873338447 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9197360416021838947} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0.61, y: 2.37, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} + m_GameObject: {fileID: 8589812644913610653} + m_LocalRotation: {x: -0, y: -0, z: 0.07389987, w: 0.9972657} + m_LocalPosition: {x: -0.94, y: 3.82, z: 0} + m_LocalScale: {x: -1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 4826568820401640802} + - {fileID: 3799104196090626154} m_Father: {fileID: 7170547486884922313} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!212 &3925572643871708749 + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 8.476} +--- !u!212 &4156859988126721438 SpriteRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9197360416021838947} + m_GameObject: {fileID: 8589812644913610653} m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 0 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -413,6 +429,166 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &9197360416021838947 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2000043922596723899} + - component: {fileID: 3925572643871708749} + m_Layer: 0 + m_Name: tree_top + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2000043922596723899 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9197360416021838947} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0.83, y: 2.46, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 4826568820401640802} + m_Father: {fileID: 7170547486884922313} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &3925572643871708749 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9197360416021838947} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + 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: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 4 + m_Sprite: {fileID: 21300000, guid: a05338bb81b91994eba6969878cca71f, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1.48, y: 1.76} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!1001 &4272697501419815456 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 2110979880873338447} + m_Modifications: + - target: {fileID: 1149133266888835658, guid: 89e4bc6bc90624ac8a8c5f555d4c273b, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1149133266888835658, guid: 89e4bc6bc90624ac8a8c5f555d4c273b, + type: 3} + propertyPath: m_LocalPosition.x + value: 0.45000005 + objectReference: {fileID: 0} + - target: {fileID: 1149133266888835658, guid: 89e4bc6bc90624ac8a8c5f555d4c273b, + type: 3} + propertyPath: m_LocalPosition.y + value: -0.29999995 + objectReference: {fileID: 0} + - target: {fileID: 1149133266888835658, guid: 89e4bc6bc90624ac8a8c5f555d4c273b, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1149133266888835658, guid: 89e4bc6bc90624ac8a8c5f555d4c273b, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.99738145 + objectReference: {fileID: 0} + - target: {fileID: 1149133266888835658, guid: 89e4bc6bc90624ac8a8c5f555d4c273b, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1149133266888835658, guid: 89e4bc6bc90624ac8a8c5f555d4c273b, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1149133266888835658, guid: 89e4bc6bc90624ac8a8c5f555d4c273b, + type: 3} + propertyPath: m_LocalRotation.z + value: 0.072321005 + objectReference: {fileID: 0} + - target: {fileID: 1149133266888835658, guid: 89e4bc6bc90624ac8a8c5f555d4c273b, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1149133266888835658, guid: 89e4bc6bc90624ac8a8c5f555d4c273b, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1149133266888835658, guid: 89e4bc6bc90624ac8a8c5f555d4c273b, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 8.295 + objectReference: {fileID: 0} + - target: {fileID: 1149133266888835659, guid: 89e4bc6bc90624ac8a8c5f555d4c273b, + type: 3} + propertyPath: m_Name + value: Item top + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 89e4bc6bc90624ac8a8c5f555d4c273b, type: 3} +--- !u!4 &3799104196090626154 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1149133266888835658, guid: 89e4bc6bc90624ac8a8c5f555d4c273b, + type: 3} + m_PrefabInstance: {fileID: 4272697501419815456} + m_PrefabAsset: {fileID: 0} --- !u!1001 &4304742951693597515 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/StagePartsDemo 1.prefab b/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/StagePartsDemo 1.prefab index 271fd4c3..f1596eab 100644 --- a/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/StagePartsDemo 1.prefab +++ b/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/StagePartsDemo 1.prefab @@ -139,7 +139,7 @@ PrefabInstance: - target: {fileID: 7170547486884922313, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} propertyPath: m_LocalPosition.y - value: 3.33 + value: 4.5 objectReference: {fileID: 0} - target: {fileID: 7170547486884922313, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} @@ -391,7 +391,7 @@ PrefabInstance: - target: {fileID: 7170547486884922313, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} propertyPath: m_LocalPosition.y - value: 3.33 + value: 4.5 objectReference: {fileID: 0} - target: {fileID: 7170547486884922313, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} @@ -490,7 +490,7 @@ PrefabInstance: - target: {fileID: 7170547486884922313, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} propertyPath: m_LocalPosition.y - value: 3.33 + value: 4.5 objectReference: {fileID: 0} - target: {fileID: 7170547486884922313, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} @@ -589,7 +589,7 @@ PrefabInstance: - target: {fileID: 7170547486884922313, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} propertyPath: m_LocalPosition.y - value: 3.33 + value: 4.5 objectReference: {fileID: 0} - target: {fileID: 7170547486884922313, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} @@ -708,7 +708,7 @@ PrefabInstance: - target: {fileID: 7170547486884922313, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} propertyPath: m_LocalPosition.y - value: 3.33 + value: 4.5 objectReference: {fileID: 0} - target: {fileID: 7170547486884922313, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} @@ -807,7 +807,7 @@ PrefabInstance: - target: {fileID: 7170547486884922313, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} propertyPath: m_LocalPosition.y - value: 3.33 + value: 4.5 objectReference: {fileID: 0} - target: {fileID: 7170547486884922313, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} @@ -926,7 +926,7 @@ PrefabInstance: - target: {fileID: 5140115440945204540, guid: 4d9cf56629464933924296f3980217ce, type: 3} propertyPath: m_Name - value: StagePartsOriginal V 1 + value: StagePartsDemo 1 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4d9cf56629464933924296f3980217ce, type: 3} diff --git a/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/StagePartsDemo.prefab b/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/StagePartsDemo.prefab index c27b6557..3f2bf2f9 100644 --- a/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/StagePartsDemo.prefab +++ b/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/StagePartsDemo.prefab @@ -50,7 +50,7 @@ PrefabInstance: - target: {fileID: 7170547486884922313, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} propertyPath: m_LocalPosition.y - value: 3.33 + value: 4.5 objectReference: {fileID: 0} - target: {fileID: 7170547486884922313, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} @@ -198,7 +198,7 @@ PrefabInstance: - target: {fileID: 7170547486884922313, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} propertyPath: m_LocalPosition.y - value: 3.33 + value: 4.5 objectReference: {fileID: 0} - target: {fileID: 7170547486884922313, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} @@ -361,7 +361,7 @@ PrefabInstance: - target: {fileID: 7170547486884922313, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} propertyPath: m_LocalPosition.y - value: 3.33 + value: 4.5 objectReference: {fileID: 0} - target: {fileID: 7170547486884922313, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} @@ -440,7 +440,7 @@ PrefabInstance: - target: {fileID: 7170547486884922313, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} propertyPath: m_LocalPosition.y - value: 3.33 + value: 4.5 objectReference: {fileID: 0} - target: {fileID: 7170547486884922313, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} @@ -603,7 +603,7 @@ PrefabInstance: - target: {fileID: 7170547486884922313, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} propertyPath: m_LocalPosition.y - value: 3.33 + value: 4.5 objectReference: {fileID: 0} - target: {fileID: 7170547486884922313, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} @@ -766,7 +766,7 @@ PrefabInstance: - target: {fileID: 7170547486884922313, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} propertyPath: m_LocalPosition.y - value: 3.33 + value: 4.5 objectReference: {fileID: 0} - target: {fileID: 7170547486884922313, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} @@ -845,7 +845,7 @@ PrefabInstance: - target: {fileID: 7170547486884922313, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} propertyPath: m_LocalPosition.y - value: 3.33 + value: 4.5 objectReference: {fileID: 0} - target: {fileID: 7170547486884922313, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3}