diff --git a/popcorn/Assets/MyGame/Resource/Animation/Brother/Brother_ef_Question.anim b/popcorn/Assets/MyGame/Resource/Animation/Brother/Brother_ef_Question.anim index 4669d3c7..034571fe 100644 --- a/popcorn/Assets/MyGame/Resource/Animation/Brother/Brother_ef_Question.anim +++ b/popcorn/Assets/MyGame/Resource/Animation/Brother/Brother_ef_Question.anim @@ -384,4 +384,11 @@ AnimationClip: script: {fileID: 0} m_HasGenericRootTransform: 1 m_HasMotionFloatCurves: 0 - m_Events: [] + m_Events: + - time: 0 + functionName: OnPlaySE + data: se_conversation_question + objectReferenceParameter: {fileID: 0} + floatParameter: 0 + intParameter: 0 + messageOptions: 0 diff --git a/popcorn/Assets/MyGame/Resource/Animation/Brother/Brother_ef_Sweat.anim b/popcorn/Assets/MyGame/Resource/Animation/Brother/Brother_ef_Sweat.anim index 86927b9b..721502dd 100644 --- a/popcorn/Assets/MyGame/Resource/Animation/Brother/Brother_ef_Sweat.anim +++ b/popcorn/Assets/MyGame/Resource/Animation/Brother/Brother_ef_Sweat.anim @@ -265,4 +265,11 @@ AnimationClip: m_EulerEditorCurves: [] m_HasGenericRootTransform: 1 m_HasMotionFloatCurves: 0 - m_Events: [] + m_Events: + - time: 0.016666668 + functionName: OnPlaySE + data: se_conversation_Sweat + objectReferenceParameter: {fileID: 0} + floatParameter: 0 + intParameter: 0 + messageOptions: 0 diff --git a/popcorn/Assets/MyGame/Resource/Animation/Brother/Brother_ef_astonishment.anim b/popcorn/Assets/MyGame/Resource/Animation/Brother/Brother_ef_astonishment.anim index d40b402e..6cccecd9 100644 --- a/popcorn/Assets/MyGame/Resource/Animation/Brother/Brother_ef_astonishment.anim +++ b/popcorn/Assets/MyGame/Resource/Animation/Brother/Brother_ef_astonishment.anim @@ -581,4 +581,11 @@ AnimationClip: script: {fileID: 0} m_HasGenericRootTransform: 1 m_HasMotionFloatCurves: 0 - m_Events: [] + m_Events: + - time: 0.25 + functionName: OnPlaySE + data: se_conversation_astonishment + objectReferenceParameter: {fileID: 0} + floatParameter: 0 + intParameter: 0 + messageOptions: 0 diff --git a/popcorn/Assets/MyGame/Resource/Material/CornField/ui_CornField_corn_text_grain_addition.png b/popcorn/Assets/MyGame/Resource/Material/CornField/ui_CornField_corn_text_grain_addition.png new file mode 100644 index 00000000..fb6941c7 Binary files /dev/null and b/popcorn/Assets/MyGame/Resource/Material/CornField/ui_CornField_corn_text_grain_addition.png differ diff --git a/popcorn/Assets/MyGame/Resource/Material/CornField/ui_CornField_corn_text_grain_addition.png.meta b/popcorn/Assets/MyGame/Resource/Material/CornField/ui_CornField_corn_text_grain_addition.png.meta new file mode 100644 index 00000000..1963467b --- /dev/null +++ b/popcorn/Assets/MyGame/Resource/Material/CornField/ui_CornField_corn_text_grain_addition.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: a64b1cc6e08eb5849a45654b25ba55bf +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: 55, y: 0, z: 64, 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/Resources/Sounds/SE/se_conversation_Sweat.wav b/popcorn/Assets/MyGame/Resources/Sounds/SE/se_conversation_Sweat.wav new file mode 100644 index 00000000..9504f481 Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Sounds/SE/se_conversation_Sweat.wav differ diff --git a/popcorn/Assets/MyGame/Resources/Sounds/SE/se_conversation_Sweat.wav.meta b/popcorn/Assets/MyGame/Resources/Sounds/SE/se_conversation_Sweat.wav.meta new file mode 100644 index 00000000..86b4e8da --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Sounds/SE/se_conversation_Sweat.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: e95a20686fc2e0642a987d29063db9ff +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/popcorn/Assets/MyGame/Resources/Sounds/SE/se_conversation_astonishment.wav b/popcorn/Assets/MyGame/Resources/Sounds/SE/se_conversation_astonishment.wav new file mode 100644 index 00000000..43189e1f Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Sounds/SE/se_conversation_astonishment.wav differ diff --git a/popcorn/Assets/MyGame/Resources/Sounds/SE/se_conversation_astonishment.wav.meta b/popcorn/Assets/MyGame/Resources/Sounds/SE/se_conversation_astonishment.wav.meta new file mode 100644 index 00000000..c13aa90e --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Sounds/SE/se_conversation_astonishment.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: a15ca8d7478efdf45a51213888e42c5c +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/popcorn/Assets/MyGame/Resources/Sounds/SE/se_conversation_question.wav b/popcorn/Assets/MyGame/Resources/Sounds/SE/se_conversation_question.wav new file mode 100644 index 00000000..14da81b1 Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Sounds/SE/se_conversation_question.wav differ diff --git a/popcorn/Assets/MyGame/Resources/Sounds/SE/se_conversation_question.wav.meta b/popcorn/Assets/MyGame/Resources/Sounds/SE/se_conversation_question.wav.meta new file mode 100644 index 00000000..f511f005 --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Sounds/SE/se_conversation_question.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 4151d54049e7079438ced323ce8b6c28 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/popcorn/Assets/MyGame/Scenes/CornField/CornField.unity b/popcorn/Assets/MyGame/Scenes/CornField/CornField.unity index b0cac91d..6bba4785 100644 --- a/popcorn/Assets/MyGame/Scenes/CornField/CornField.unity +++ b/popcorn/Assets/MyGame/Scenes/CornField/CornField.unity @@ -661,6 +661,84 @@ MonoBehaviour: randomPlaySEFilenames: [] randomPlayVoiceFilenames: [] vibrationType: 0 +--- !u!1 &323920545 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 323920546} + - component: {fileID: 323920548} + - component: {fileID: 323920547} + m_Layer: 5 + m_Name: Text_StockCoin + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &323920546 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 323920545} + 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: 457045028} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 104.30357, y: -50} + m_SizeDelta: {x: 130.60715, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &323920547 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 323920545} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 351b4ffae35e149bf81549887561d561, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.3372549, g: 0.21960784, b: 0.14117648, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} + m_FontSize: 45 + m_FontStyle: 0 + m_BestFit: 1 + m_MinSize: 45 + m_MaxSize: 45 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\uFF0B100" +--- !u!222 &323920548 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 323920545} + m_CullTransparentMesh: 0 --- !u!1 &355725951 GameObject: m_ObjectHideFlags: 0 @@ -1104,6 +1182,11 @@ PrefabInstance: propertyPath: onClickPlaySEFilename value: se_ButtonTap objectReference: {fileID: 0} + - target: {fileID: 6205448659049427752, guid: caaa748dbeed576499e8cae74d33f689, + type: 3} + propertyPath: m_RootOrder + value: 8 + objectReference: {fileID: 0} - target: {fileID: 6396292362141172708, guid: caaa748dbeed576499e8cae74d33f689, type: 3} propertyPath: m_IsActive @@ -1117,7 +1200,7 @@ PrefabInstance: - target: {fileID: 8103176713869808018, guid: caaa748dbeed576499e8cae74d33f689, type: 3} propertyPath: m_RootOrder - value: 10 + value: 9 objectReference: {fileID: 0} - target: {fileID: 8136363072906095234, guid: caaa748dbeed576499e8cae74d33f689, type: 3} @@ -1231,6 +1314,122 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 443195450} m_CullTransparentMesh: 0 +--- !u!1 &457045027 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 457045028} + - component: {fileID: 457045032} + - component: {fileID: 457045031} + - component: {fileID: 457045030} + - component: {fileID: 457045029} + m_Layer: 5 + m_Name: StockCorn_addition + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &457045028 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 457045027} + 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: 323920546} + m_Father: {fileID: 387414334} + m_RootOrder: 11 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 282, y: -137} + m_SizeDelta: {x: 227.60715, y: 88} + m_Pivot: {x: 0, y: 1} +--- !u!114 &457045029 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 457045027} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 39 + m_Right: 58 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 0 + m_Spacing: 0 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 1 + m_ChildControlWidth: 1 + m_ChildControlHeight: 0 + m_ChildScaleWidth: 0 + m_ChildScaleHeight: 0 +--- !u!114 &457045030 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 457045027} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 2 + m_VerticalFit: 0 +--- !u!114 &457045031 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 457045027} + 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: 0 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: a64b1cc6e08eb5849a45654b25ba55bf, type: 3} + m_Type: 1 + 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!222 &457045032 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 457045027} + m_CullTransparentMesh: 0 --- !u!1 &492106929 stripped GameObject: m_CorrespondingSourceObject: {fileID: 1507187602806663288, guid: 21599f8e6d1104a07b0b14b49f8c1429, @@ -1455,7 +1654,7 @@ RectTransform: - {fileID: 313196411} - {fileID: 1538747619} m_Father: {fileID: 387414334} - m_RootOrder: 9 + m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Conversation/Canvas.prefab b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Conversation/Canvas.prefab index f862c4af..8b00dc95 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Conversation/Canvas.prefab +++ b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Conversation/Canvas.prefab @@ -623,6 +623,7 @@ GameObject: - component: {fileID: 8326132140883042585} - component: {fileID: 8326132140883042586} - component: {fileID: 8326132140883042587} + - component: {fileID: 3094961694111828232} m_Layer: 5 m_Name: Question m_TagString: Untagged @@ -713,6 +714,32 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!114 &3094961694111828232 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8326132140883042584} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ebef95945fe4946b8ae75d2ea42c4e67, type: 3} + m_Name: + m_EditorClassIdentifier: + randomIntMin: 0 + randomIntMax: 0 + randomPlaySEFilenames: [] + randomPlayVoiceFilenames: [] + onEvent1: + m_PersistentCalls: + m_Calls: [] + onEvent2: + m_PersistentCalls: + m_Calls: [] + onEvent3: + m_PersistentCalls: + m_Calls: [] + eventArray: [] --- !u!1 &8326132140921411081 GameObject: m_ObjectHideFlags: 0 @@ -1430,6 +1457,7 @@ GameObject: - component: {fileID: 8326132141302094844} - component: {fileID: 8326132141302094845} - component: {fileID: 8326132141302094846} + - component: {fileID: 5851726405219579597} m_Layer: 5 m_Name: astonishment m_TagString: Untagged @@ -1520,6 +1548,32 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!114 &5851726405219579597 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8326132141302094835} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ebef95945fe4946b8ae75d2ea42c4e67, type: 3} + m_Name: + m_EditorClassIdentifier: + randomIntMin: 0 + randomIntMax: 0 + randomPlaySEFilenames: [] + randomPlayVoiceFilenames: [] + onEvent1: + m_PersistentCalls: + m_Calls: [] + onEvent2: + m_PersistentCalls: + m_Calls: [] + onEvent3: + m_PersistentCalls: + m_Calls: [] + eventArray: [] --- !u!1 &8326132141332391092 GameObject: m_ObjectHideFlags: 0 @@ -2381,6 +2435,7 @@ GameObject: - component: {fileID: 8326132141608364540} - component: {fileID: 8326132141608364541} - component: {fileID: 8326132141608364542} + - component: {fileID: 8111289022594492393} m_Layer: 5 m_Name: Sweat m_TagString: Untagged @@ -2471,6 +2526,32 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!114 &8111289022594492393 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8326132141608364531} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ebef95945fe4946b8ae75d2ea42c4e67, type: 3} + m_Name: + m_EditorClassIdentifier: + randomIntMin: 0 + randomIntMax: 0 + randomPlaySEFilenames: [] + randomPlayVoiceFilenames: [] + onEvent1: + m_PersistentCalls: + m_Calls: [] + onEvent2: + m_PersistentCalls: + m_Calls: [] + onEvent3: + m_PersistentCalls: + m_Calls: [] + eventArray: [] --- !u!1 &8326132141641515376 GameObject: m_ObjectHideFlags: 0 @@ -3340,6 +3421,7 @@ GameObject: - component: {fileID: 8326132141892762133} - component: {fileID: 8326132141892762134} - component: {fileID: 8326132141892762135} + - component: {fileID: 4105248273629038113} m_Layer: 5 m_Name: Sweat m_TagString: Untagged @@ -3430,6 +3512,32 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!114 &4105248273629038113 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8326132141892762132} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ebef95945fe4946b8ae75d2ea42c4e67, type: 3} + m_Name: + m_EditorClassIdentifier: + randomIntMin: 0 + randomIntMax: 0 + randomPlaySEFilenames: [] + randomPlayVoiceFilenames: [] + onEvent1: + m_PersistentCalls: + m_Calls: [] + onEvent2: + m_PersistentCalls: + m_Calls: [] + onEvent3: + m_PersistentCalls: + m_Calls: [] + eventArray: [] --- !u!1 &8326132141911565868 GameObject: m_ObjectHideFlags: 0 @@ -4031,6 +4139,7 @@ GameObject: - component: {fileID: 8326132142047786581} - component: {fileID: 8326132142047786582} - component: {fileID: 8326132142047786583} + - component: {fileID: 1243163698786121904} m_Layer: 5 m_Name: astonishment m_TagString: Untagged @@ -4121,6 +4230,32 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!114 &1243163698786121904 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8326132142047786580} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ebef95945fe4946b8ae75d2ea42c4e67, type: 3} + m_Name: + m_EditorClassIdentifier: + randomIntMin: 0 + randomIntMax: 0 + randomPlaySEFilenames: [] + randomPlayVoiceFilenames: [] + onEvent1: + m_PersistentCalls: + m_Calls: [] + onEvent2: + m_PersistentCalls: + m_Calls: [] + onEvent3: + m_PersistentCalls: + m_Calls: [] + eventArray: [] --- !u!1 &8326132142065893231 GameObject: m_ObjectHideFlags: 0 @@ -5033,6 +5168,7 @@ GameObject: - component: {fileID: 8326132142376114442} - component: {fileID: 8326132142376114443} - component: {fileID: 8326132142376114484} + - component: {fileID: 4987520635343006334} m_Layer: 5 m_Name: Question m_TagString: Untagged @@ -5123,6 +5259,32 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!114 &4987520635343006334 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8326132142376114441} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ebef95945fe4946b8ae75d2ea42c4e67, type: 3} + m_Name: + m_EditorClassIdentifier: + randomIntMin: 0 + randomIntMax: 0 + randomPlaySEFilenames: [] + randomPlayVoiceFilenames: [] + onEvent1: + m_PersistentCalls: + m_Calls: [] + onEvent2: + m_PersistentCalls: + m_Calls: [] + onEvent3: + m_PersistentCalls: + m_Calls: [] + eventArray: [] --- !u!1 &8326132142418878642 GameObject: m_ObjectHideFlags: 0 @@ -5886,7 +6048,7 @@ MonoBehaviour: m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} m_FontSize: 35 m_FontStyle: 0 - m_BestFit: 1 + m_BestFit: 0 m_MinSize: 30 m_MaxSize: 35 m_Alignment: 0 diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/ShopLevel/Canvas.prefab b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/ShopLevel/Canvas.prefab index 04f3e4b1..4f288b37 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/ShopLevel/Canvas.prefab +++ b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/ShopLevel/Canvas.prefab @@ -10781,7 +10781,7 @@ RectTransform: 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: -13} + m_AnchoredPosition: {x: 0, y: -19} m_SizeDelta: {x: 180, y: 180} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8660695105455363540