diff --git a/popcorn/Assets/MyGame/Resource/Material/minigame/minigame_explanation_Dither.png b/popcorn/Assets/MyGame/Resource/Material/minigame/minigame_explanation_Dither.png new file mode 100644 index 00000000..1e01e09d Binary files /dev/null and b/popcorn/Assets/MyGame/Resource/Material/minigame/minigame_explanation_Dither.png differ diff --git a/popcorn/Assets/MyGame/Resource/Material/minigame/minigame_explanation_Dither.png.meta b/popcorn/Assets/MyGame/Resource/Material/minigame/minigame_explanation_Dither.png.meta new file mode 100644 index 00000000..ee9a07be --- /dev/null +++ b/popcorn/Assets/MyGame/Resource/Material/minigame/minigame_explanation_Dither.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: bb1878e46a670344fa520eae62241a54 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/popcorn/Assets/MyGame/Scenes/MiniGame/MiniGame.unity b/popcorn/Assets/MyGame/Scenes/MiniGame/MiniGame.unity index 35a6b1be..61de8616 100644 --- a/popcorn/Assets/MyGame/Scenes/MiniGame/MiniGame.unity +++ b/popcorn/Assets/MyGame/Scenes/MiniGame/MiniGame.unity @@ -679,6 +679,7 @@ RectTransform: m_Children: - {fileID: 582710106} - {fileID: 475061233} + - {fileID: 1121429579} - {fileID: 1275129623} - {fileID: 1725870972} - {fileID: 2085388515} @@ -1896,6 +1897,12 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!224 &1121429579 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 7325523897134744364, guid: 71a303670f159a94dbe4c0cebc1f6a83, + type: 3} + m_PrefabInstance: {fileID: 7325523898178317159} + m_PrefabAsset: {fileID: 0} --- !u!114 &1213307027 MonoBehaviour: m_ObjectHideFlags: 0 @@ -2399,7 +2406,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1471947210} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 16.517555, y: -11.06614, z: -46.71647} + m_LocalPosition: {x: 15.8, y: -11.06614, z: -46.71647} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 894575454} @@ -2689,7 +2696,7 @@ RectTransform: m_Children: - {fileID: 579812655} m_Father: {fileID: 434624159} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} @@ -2808,7 +2815,7 @@ RectTransform: m_Children: - {fileID: 275350937} m_Father: {fileID: 434624159} - m_RootOrder: 5 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} @@ -3664,7 +3671,7 @@ RectTransform: m_Children: - {fileID: 1266828205} m_Father: {fileID: 434624159} - m_RootOrder: 4 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} @@ -3938,6 +3945,11 @@ PrefabInstance: propertyPath: m_Name value: Selection objectReference: {fileID: 0} + - target: {fileID: 4559813504355184344, guid: 041c0f3d96c90d64094cc76c5c87c26f, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 4559813504355184347, guid: 041c0f3d96c90d64094cc76c5c87c26f, type: 3} propertyPath: m_Pivot.x @@ -4220,7 +4232,7 @@ PrefabInstance: - target: {fileID: 5034752975213739508, guid: 199214813202e5f478789161b538685b, type: 3} propertyPath: m_RootOrder - value: 2 + value: 3 objectReference: {fileID: 0} - target: {fileID: 5034752975213739508, guid: 199214813202e5f478789161b538685b, type: 3} @@ -4399,6 +4411,130 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 1fc24dbddd0945f88b3f12d9fa309fa7, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1001 &7325523898178317159 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 434624159} + m_Modifications: + - target: {fileID: 7325523897134744364, guid: 71a303670f159a94dbe4c0cebc1f6a83, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7325523897134744364, guid: 71a303670f159a94dbe4c0cebc1f6a83, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7325523897134744364, guid: 71a303670f159a94dbe4c0cebc1f6a83, + type: 3} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 7325523897134744364, guid: 71a303670f159a94dbe4c0cebc1f6a83, + type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7325523897134744364, guid: 71a303670f159a94dbe4c0cebc1f6a83, + type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7325523897134744364, guid: 71a303670f159a94dbe4c0cebc1f6a83, + type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7325523897134744364, guid: 71a303670f159a94dbe4c0cebc1f6a83, + type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7325523897134744364, guid: 71a303670f159a94dbe4c0cebc1f6a83, + type: 3} + propertyPath: m_SizeDelta.x + value: 1020 + objectReference: {fileID: 0} + - target: {fileID: 7325523897134744364, guid: 71a303670f159a94dbe4c0cebc1f6a83, + type: 3} + propertyPath: m_SizeDelta.y + value: 2208 + objectReference: {fileID: 0} + - target: {fileID: 7325523897134744364, guid: 71a303670f159a94dbe4c0cebc1f6a83, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7325523897134744364, guid: 71a303670f159a94dbe4c0cebc1f6a83, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7325523897134744364, guid: 71a303670f159a94dbe4c0cebc1f6a83, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7325523897134744364, guid: 71a303670f159a94dbe4c0cebc1f6a83, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7325523897134744364, guid: 71a303670f159a94dbe4c0cebc1f6a83, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7325523897134744364, guid: 71a303670f159a94dbe4c0cebc1f6a83, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7325523897134744364, guid: 71a303670f159a94dbe4c0cebc1f6a83, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7325523897134744364, guid: 71a303670f159a94dbe4c0cebc1f6a83, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7325523897134744364, guid: 71a303670f159a94dbe4c0cebc1f6a83, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7325523897134744364, guid: 71a303670f159a94dbe4c0cebc1f6a83, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7325523897134744364, guid: 71a303670f159a94dbe4c0cebc1f6a83, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7325523897134744364, guid: 71a303670f159a94dbe4c0cebc1f6a83, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7325523897134744365, guid: 71a303670f159a94dbe4c0cebc1f6a83, + type: 3} + propertyPath: m_Name + value: pop_explanation + objectReference: {fileID: 0} + - target: {fileID: 7325523897134744365, guid: 71a303670f159a94dbe4c0cebc1f6a83, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 71a303670f159a94dbe4c0cebc1f6a83, type: 3} --- !u!1001 &7328251774669809636 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/BackGround.prefab b/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/BackGround.prefab index 2d7271e3..bc952500 100644 --- a/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/BackGround.prefab +++ b/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/BackGround.prefab @@ -25,8 +25,8 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5848867441450559626} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: -3.2600002, z: 0} - m_LocalScale: {x: 16.66, y: 4.5, z: 1} + m_LocalPosition: {x: 0, y: -6.817, z: 0} + m_LocalScale: {x: 16.66, y: 11.474738, z: 1} m_Children: [] m_Father: {fileID: 4011736666950912259} m_RootOrder: 0 diff --git a/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/Header.prefab b/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/Header.prefab index 7ffcedd8..55d4fe51 100644 --- a/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/Header.prefab +++ b/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/Header.prefab @@ -722,7 +722,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 446} - m_SizeDelta: {x: 1800, y: 180} + m_SizeDelta: {x: 2500, y: 180} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7328251776013493871 CanvasRenderer: diff --git a/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/Result.prefab b/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/Result.prefab index a4b7dbf6..071ad2b9 100644 --- a/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/Result.prefab +++ b/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/Result.prefab @@ -1229,7 +1229,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: -260} - m_SizeDelta: {x: 1300, y: 228} + m_SizeDelta: {x: 2100, y: 228} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5034752975247083719 CanvasRenderer: diff --git a/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/Selection.prefab b/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/Selection.prefab index 6474e514..d11c9bae 100644 --- a/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/Selection.prefab +++ b/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/Selection.prefab @@ -1706,9 +1706,9 @@ RectTransform: m_Father: {fileID: 4559813504355184347} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 1} - m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: -319} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 789} m_SizeDelta: {x: 414, y: 116} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4559813505623332493 diff --git a/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/pop_explanation.prefab b/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/pop_explanation.prefab new file mode 100644 index 00000000..03576b65 --- /dev/null +++ b/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/pop_explanation.prefab @@ -0,0 +1,343 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &7325523896894854280 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7325523896894854295} + - component: {fileID: 7325523896894854291} + - component: {fileID: 7325523896894854292} + - component: {fileID: 7325523896894854293} + - component: {fileID: 7325523896894854294} + m_Layer: 5 + m_Name: Button_close + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7325523896894854295 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7325523896894854280} + 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_Children: [] + m_Father: {fileID: 7325523897134744364} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 516, y: 805} + m_SizeDelta: {x: 120, y: 126} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7325523896894854291 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7325523896894854280} + m_CullTransparentMesh: 0 +--- !u!114 &7325523896894854292 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7325523896894854280} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 136d9a1588fb1a6439f5f91b7709a6eb, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &7325523896894854293 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7325523896894854280} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 7325523896894854292} + m_OnClick: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &7325523896894854294 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7325523896894854280} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5e732834936f04d48be0ff3fa358563d, type: 3} + m_Name: + m_EditorClassIdentifier: + onClickPlaySEFilename: se_ButtonTap + randomPlaySEFilenames: [] + randomPlayVoiceFilenames: [] + vibrationType: 0 +--- !u!1 &7325523897134744365 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7325523897134744364} + m_Layer: 5 + m_Name: pop_explanation + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7325523897134744364 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7325523897134744365} + 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_Children: + - {fileID: 1354587068333915812} + - {fileID: 7325523897257327758} + - {fileID: 7325523896894854295} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 1020, y: 2208} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &7325523897257327759 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7325523897257327758} + - component: {fileID: 7325523897257327756} + - component: {fileID: 7325523897257327757} + m_Layer: 5 + m_Name: Explanation + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7325523897257327758 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7325523897257327759} + 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_Children: [] + m_Father: {fileID: 7325523897134744364} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 1064, y: 1626} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7325523897257327756 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7325523897257327759} + m_CullTransparentMesh: 0 +--- !u!114 &7325523897257327757 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7325523897257327759} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: bb1878e46a670344fa520eae62241a54, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &8808128476912745402 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1354587068333915812} + - component: {fileID: 2148464498821981759} + - component: {fileID: 5855081438015110489} + - component: {fileID: 4691976169041255157} + m_Layer: 5 + m_Name: background + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1354587068333915812 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8808128476912745402} + 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_Children: [] + m_Father: {fileID: 7325523897134744364} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 2048, y: 2732} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2148464498821981759 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8808128476912745402} + m_CullTransparentMesh: 0 +--- !u!114 &5855081438015110489 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8808128476912745402} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 0.9372549, a: 0.19607843} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!95 &4691976169041255157 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8808128476912745402} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 09ef68c9f0336934a928483fe08ec427, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 diff --git a/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/pop_explanation.prefab.meta b/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/pop_explanation.prefab.meta new file mode 100644 index 00000000..62684da9 --- /dev/null +++ b/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/pop_explanation.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 71a303670f159a94dbe4c0cebc1f6a83 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/sky_a.prefab b/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/sky_a.prefab index cb7d8c4c..3d0df48a 100644 --- a/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/sky_a.prefab +++ b/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/sky_a.prefab @@ -25,7 +25,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 313127818790564977} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0.18999958, z: 0} + m_LocalPosition: {x: 0, y: 6.23, z: 0} m_LocalScale: {x: 16.66, y: 26.94375, z: 1} m_Children: [] m_Father: {fileID: 3935214977879978440} @@ -542,7 +542,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6860540293637237350} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -1.0799999, y: -4.51, z: 0} + m_LocalPosition: {x: -1.0799999, y: -3.96, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 6420613933086344021}