diff --git a/popcorn/Assets/MyGame/Resource/Material/minigame/stage/minigame_stage_background_fence_Dither.png b/popcorn/Assets/MyGame/Resource/Material/minigame/stage/minigame_stage_background_fence_Dither.png index 925e1d7f..78021e95 100644 Binary files a/popcorn/Assets/MyGame/Resource/Material/minigame/stage/minigame_stage_background_fence_Dither.png and b/popcorn/Assets/MyGame/Resource/Material/minigame/stage/minigame_stage_background_fence_Dither.png differ diff --git a/popcorn/Assets/MyGame/Resource/Material/minigame/stage/minigame_stage_item_Mala.png b/popcorn/Assets/MyGame/Resource/Material/minigame/stage/minigame_stage_item_Mala.png index ddd8305b..7bcc77a4 100644 Binary files a/popcorn/Assets/MyGame/Resource/Material/minigame/stage/minigame_stage_item_Mala.png and b/popcorn/Assets/MyGame/Resource/Material/minigame/stage/minigame_stage_item_Mala.png differ diff --git a/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/BackGround.prefab b/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/BackGround.prefab index bc952500..6f8731f5 100644 --- a/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/BackGround.prefab +++ b/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/BackGround.prefab @@ -81,52 +81,6 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!1 &6610967728638901643 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5754152980052854981} - - component: {fileID: 3646424511159473702} - m_Layer: 0 - m_Name: fence - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &5754152980052854981 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6610967728638901643} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: -5.43, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 3898132706768809190} - - {fileID: 6433203076001778202} - - {fileID: 1546679554045142346} - - {fileID: 5562565403561688067} - m_Father: {fileID: 6693468020679260201} - m_RootOrder: 4 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!210 &3646424511159473702 -SortingGroup: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6610967728638901643} - m_Enabled: 1 - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 3 --- !u!1 &6693468020679260202 GameObject: m_ObjectHideFlags: 0 @@ -159,7 +113,7 @@ Transform: - {fileID: 1723748830347897422} - {fileID: 835325393001496006} - {fileID: 4011736666950912259} - - {fileID: 5754152980052854981} + - {fileID: 3898132706768809190} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -457,173 +411,28 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!1001 &2625948555077840102 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 5754152980052854981} - m_Modifications: - - target: {fileID: 3369490898853473183, guid: 7fa52d20820d0f84a9218625917a643a, - type: 3} - propertyPath: m_SortingOrder - value: 4 - objectReference: {fileID: 0} - - target: {fileID: 7298026551172620012, guid: 7fa52d20820d0f84a9218625917a643a, - type: 3} - propertyPath: m_Name - value: fence (3) - objectReference: {fileID: 0} - - target: {fileID: 7584921105269690597, guid: 7fa52d20820d0f84a9218625917a643a, - type: 3} - propertyPath: m_RootOrder - value: 3 - objectReference: {fileID: 0} - - target: {fileID: 7584921105269690597, guid: 7fa52d20820d0f84a9218625917a643a, - type: 3} - propertyPath: m_LocalPosition.x - value: 6.6000004 - objectReference: {fileID: 0} - - target: {fileID: 7584921105269690597, guid: 7fa52d20820d0f84a9218625917a643a, - type: 3} - propertyPath: m_LocalPosition.y - value: 4.1600003 - objectReference: {fileID: 0} - - target: {fileID: 7584921105269690597, guid: 7fa52d20820d0f84a9218625917a643a, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7584921105269690597, guid: 7fa52d20820d0f84a9218625917a643a, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7584921105269690597, guid: 7fa52d20820d0f84a9218625917a643a, - type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 7584921105269690597, guid: 7fa52d20820d0f84a9218625917a643a, - type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 7584921105269690597, guid: 7fa52d20820d0f84a9218625917a643a, - type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 7584921105269690597, guid: 7fa52d20820d0f84a9218625917a643a, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7584921105269690597, guid: 7fa52d20820d0f84a9218625917a643a, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7584921105269690597, guid: 7fa52d20820d0f84a9218625917a643a, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 7fa52d20820d0f84a9218625917a643a, type: 3} ---- !u!4 &5562565403561688067 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 7584921105269690597, guid: 7fa52d20820d0f84a9218625917a643a, - type: 3} - m_PrefabInstance: {fileID: 2625948555077840102} - m_PrefabAsset: {fileID: 0} ---- !u!1001 &3459988905682524927 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 5754152980052854981} - m_Modifications: - - target: {fileID: 3369490898853473183, guid: 7fa52d20820d0f84a9218625917a643a, - type: 3} - propertyPath: m_SortingOrder - value: 3 - objectReference: {fileID: 0} - - target: {fileID: 7298026551172620012, guid: 7fa52d20820d0f84a9218625917a643a, - type: 3} - propertyPath: m_Name - value: fence (1) - objectReference: {fileID: 0} - - target: {fileID: 7584921105269690597, guid: 7fa52d20820d0f84a9218625917a643a, - type: 3} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7584921105269690597, guid: 7fa52d20820d0f84a9218625917a643a, - type: 3} - propertyPath: m_LocalPosition.x - value: -2.1900005 - objectReference: {fileID: 0} - - target: {fileID: 7584921105269690597, guid: 7fa52d20820d0f84a9218625917a643a, - type: 3} - propertyPath: m_LocalPosition.y - value: 4.1600003 - objectReference: {fileID: 0} - - target: {fileID: 7584921105269690597, guid: 7fa52d20820d0f84a9218625917a643a, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7584921105269690597, guid: 7fa52d20820d0f84a9218625917a643a, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7584921105269690597, guid: 7fa52d20820d0f84a9218625917a643a, - type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 7584921105269690597, guid: 7fa52d20820d0f84a9218625917a643a, - type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 7584921105269690597, guid: 7fa52d20820d0f84a9218625917a643a, - type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 7584921105269690597, guid: 7fa52d20820d0f84a9218625917a643a, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7584921105269690597, guid: 7fa52d20820d0f84a9218625917a643a, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7584921105269690597, guid: 7fa52d20820d0f84a9218625917a643a, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 7fa52d20820d0f84a9218625917a643a, type: 3} ---- !u!4 &6433203076001778202 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 7584921105269690597, guid: 7fa52d20820d0f84a9218625917a643a, - type: 3} - m_PrefabInstance: {fileID: 3459988905682524927} - m_PrefabAsset: {fileID: 0} --- !u!1001 &6871365500090186755 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 5754152980052854981} + m_TransformParent: {fileID: 6693468020679260201} m_Modifications: + - target: {fileID: 3369490898853473183, guid: 7fa52d20820d0f84a9218625917a643a, + type: 3} + propertyPath: m_Size.x + value: 17.46 + objectReference: {fileID: 0} + - target: {fileID: 3369490898853473183, guid: 7fa52d20820d0f84a9218625917a643a, + type: 3} + propertyPath: m_Size.y + value: 3.4 + objectReference: {fileID: 0} + - target: {fileID: 3369490898853473183, guid: 7fa52d20820d0f84a9218625917a643a, + type: 3} + propertyPath: m_DrawMode + value: 2 + objectReference: {fileID: 0} - target: {fileID: 7298026551172620012, guid: 7fa52d20820d0f84a9218625917a643a, type: 3} propertyPath: m_Name @@ -632,17 +441,27 @@ PrefabInstance: - target: {fileID: 7584921105269690597, guid: 7fa52d20820d0f84a9218625917a643a, type: 3} propertyPath: m_RootOrder - value: 0 + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 7584921105269690597, guid: 7fa52d20820d0f84a9218625917a643a, + type: 3} + propertyPath: m_LocalScale.x + value: 1.01 + objectReference: {fileID: 0} + - target: {fileID: 7584921105269690597, guid: 7fa52d20820d0f84a9218625917a643a, + type: 3} + propertyPath: m_LocalScale.y + value: 1 objectReference: {fileID: 0} - target: {fileID: 7584921105269690597, guid: 7fa52d20820d0f84a9218625917a643a, type: 3} propertyPath: m_LocalPosition.x - value: -6.5699997 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7584921105269690597, guid: 7fa52d20820d0f84a9218625917a643a, type: 3} propertyPath: m_LocalPosition.y - value: 4.1600003 + value: -1.2699995 objectReference: {fileID: 0} - target: {fileID: 7584921105269690597, guid: 7fa52d20820d0f84a9218625917a643a, type: 3} @@ -767,83 +586,3 @@ Transform: type: 3} m_PrefabInstance: {fileID: 7747817936090880844} m_PrefabAsset: {fileID: 0} ---- !u!1001 &8950311979529991599 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 5754152980052854981} - m_Modifications: - - target: {fileID: 3369490898853473183, guid: 7fa52d20820d0f84a9218625917a643a, - type: 3} - propertyPath: m_SortingOrder - value: 4 - objectReference: {fileID: 0} - - target: {fileID: 7298026551172620012, guid: 7fa52d20820d0f84a9218625917a643a, - type: 3} - propertyPath: m_Name - value: fence (2) - objectReference: {fileID: 0} - - target: {fileID: 7584921105269690597, guid: 7fa52d20820d0f84a9218625917a643a, - type: 3} - propertyPath: m_RootOrder - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 7584921105269690597, guid: 7fa52d20820d0f84a9218625917a643a, - type: 3} - propertyPath: m_LocalPosition.x - value: 2.12 - objectReference: {fileID: 0} - - target: {fileID: 7584921105269690597, guid: 7fa52d20820d0f84a9218625917a643a, - type: 3} - propertyPath: m_LocalPosition.y - value: 4.1600003 - objectReference: {fileID: 0} - - target: {fileID: 7584921105269690597, guid: 7fa52d20820d0f84a9218625917a643a, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7584921105269690597, guid: 7fa52d20820d0f84a9218625917a643a, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7584921105269690597, guid: 7fa52d20820d0f84a9218625917a643a, - type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 7584921105269690597, guid: 7fa52d20820d0f84a9218625917a643a, - type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 7584921105269690597, guid: 7fa52d20820d0f84a9218625917a643a, - type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 7584921105269690597, guid: 7fa52d20820d0f84a9218625917a643a, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7584921105269690597, guid: 7fa52d20820d0f84a9218625917a643a, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7584921105269690597, guid: 7fa52d20820d0f84a9218625917a643a, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 7fa52d20820d0f84a9218625917a643a, type: 3} ---- !u!4 &1546679554045142346 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 7584921105269690597, guid: 7fa52d20820d0f84a9218625917a643a, - type: 3} - m_PrefabInstance: {fileID: 8950311979529991599} - m_PrefabAsset: {fileID: 0}