diff --git a/popcorn/Assets/MyGame/Resource/UI/ui_frame_coin.png b/popcorn/Assets/MyGame/Resource/UI/ui_frame_coin.png index 149f8ded..71f9b82d 100644 Binary files a/popcorn/Assets/MyGame/Resource/UI/ui_frame_coin.png and b/popcorn/Assets/MyGame/Resource/UI/ui_frame_coin.png differ diff --git a/popcorn/Assets/MyGame/Resource/UI/ui_frame_coin.png.meta b/popcorn/Assets/MyGame/Resource/UI/ui_frame_coin.png.meta index 8b7b9bab..118ddbc7 100644 --- a/popcorn/Assets/MyGame/Resource/UI/ui_frame_coin.png.meta +++ b/popcorn/Assets/MyGame/Resource/UI/ui_frame_coin.png.meta @@ -46,7 +46,7 @@ TextureImporter: alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 - spriteBorder: {x: 44, y: 36, z: 44, w: 36} + spriteBorder: {x: 44, y: 36, z: 79, w: 36} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 1 diff --git a/popcorn/Assets/MyGame/Resources/Material/Main/Movie/addVideo.png b/popcorn/Assets/MyGame/Resources/Material/Main/Movie/addVideo.png new file mode 100644 index 00000000..5670e1ef Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Material/Main/Movie/addVideo.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material/Main/Movie/addVideo.png.meta b/popcorn/Assets/MyGame/Resources/Material/Main/Movie/addVideo.png.meta new file mode 100644 index 00000000..fefb700c --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material/Main/Movie/addVideo.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: 6f5660cc8632945278eae4aefb8f4e8c +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/Main/Prefabs/UI/Footer.prefab b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/UI/Footer.prefab index c2106e75..1b34c560 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/UI/Footer.prefab +++ b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/UI/Footer.prefab @@ -1104,6 +1104,7 @@ MonoBehaviour: saleButton: {fileID: 3508757909112374925} productManagementButton: {fileID: 4134779366559125937} stockNotifyIcon: {fileID: 2430043917671370164} + fieldCornIcon: {fileID: 7619099800950328167} --- !u!1 &3310671341662576997 GameObject: m_ObjectHideFlags: 0 @@ -2981,6 +2982,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 3310671340910471030} + - {fileID: 4217198752425507311} m_Father: {fileID: 3310671341662576994} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -3514,6 +3516,80 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &7619099800950328167 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4217198752425507311} + - component: {fileID: 8893420086032172427} + - component: {fileID: 7148837752418999815} + m_Layer: 5 + m_Name: icon_corn (4) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &4217198752425507311 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7619099800950328167} + 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: 3688281471387897800} + 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: 60, y: 60} + m_SizeDelta: {x: 60, y: 60} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8893420086032172427 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7619099800950328167} + m_CullTransparentMesh: 0 +--- !u!114 &7148837752418999815 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7619099800950328167} + 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: 525bf9156f0d44f56893f2706836c446, 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 &7741943589922204610 GameObject: m_ObjectHideFlags: 0 diff --git a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/UI/Header.prefab b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/UI/Header.prefab index d6fed700..d91ef4eb 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/UI/Header.prefab +++ b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/UI/Header.prefab @@ -1574,6 +1574,11 @@ PrefabInstance: propertyPath: m_Name value: Icon_Coin objectReference: {fileID: 0} + - target: {fileID: 4337906542777032002, guid: a768b64223c5940c2b597bf37dd8fa92, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: a768b64223c5940c2b597bf37dd8fa92, type: 3} --- !u!95 &4683425562393467656 stripped diff --git a/popcorn/Assets/MyGame/Scenes/Main/WatchMovieCoin.unity b/popcorn/Assets/MyGame/Scenes/Main/WatchMovieCoin.unity index d458942f..c28df3d5 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/WatchMovieCoin.unity +++ b/popcorn/Assets/MyGame/Scenes/Main/WatchMovieCoin.unity @@ -432,6 +432,131 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 0} +--- !u!1001 &92498536 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1312259285} + m_Modifications: + - target: {fileID: 4393690446791901182, guid: 4e737f375c4f0481abc6ffd9284a7366, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4393690446791901182, guid: 4e737f375c4f0481abc6ffd9284a7366, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4393690446791901182, guid: 4e737f375c4f0481abc6ffd9284a7366, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4393690446791901182, guid: 4e737f375c4f0481abc6ffd9284a7366, + type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4393690446791901182, guid: 4e737f375c4f0481abc6ffd9284a7366, + type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4393690446791901182, guid: 4e737f375c4f0481abc6ffd9284a7366, + type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4393690446791901182, guid: 4e737f375c4f0481abc6ffd9284a7366, + type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4393690446791901182, guid: 4e737f375c4f0481abc6ffd9284a7366, + type: 3} + propertyPath: m_SizeDelta.x + value: 150 + objectReference: {fileID: 0} + - target: {fileID: 4393690446791901182, guid: 4e737f375c4f0481abc6ffd9284a7366, + type: 3} + propertyPath: m_SizeDelta.y + value: 150 + objectReference: {fileID: 0} + - target: {fileID: 4393690446791901182, guid: 4e737f375c4f0481abc6ffd9284a7366, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4393690446791901182, guid: 4e737f375c4f0481abc6ffd9284a7366, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4393690446791901182, guid: 4e737f375c4f0481abc6ffd9284a7366, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4393690446791901182, guid: 4e737f375c4f0481abc6ffd9284a7366, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.9848078 + objectReference: {fileID: 0} + - target: {fileID: 4393690446791901182, guid: 4e737f375c4f0481abc6ffd9284a7366, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4393690446791901182, guid: 4e737f375c4f0481abc6ffd9284a7366, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4393690446791901182, guid: 4e737f375c4f0481abc6ffd9284a7366, + type: 3} + propertyPath: m_LocalRotation.z + value: 0.17364816 + objectReference: {fileID: 0} + - target: {fileID: 4393690446791901182, guid: 4e737f375c4f0481abc6ffd9284a7366, + type: 3} + propertyPath: m_AnchoredPosition.x + value: -100 + objectReference: {fileID: 0} + - target: {fileID: 4393690446791901182, guid: 4e737f375c4f0481abc6ffd9284a7366, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -50 + objectReference: {fileID: 0} + - target: {fileID: 4393690446791901182, guid: 4e737f375c4f0481abc6ffd9284a7366, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4393690446791901182, guid: 4e737f375c4f0481abc6ffd9284a7366, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4393690446791901182, guid: 4e737f375c4f0481abc6ffd9284a7366, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 20 + objectReference: {fileID: 0} + - target: {fileID: 6590057962321929320, guid: 4e737f375c4f0481abc6ffd9284a7366, + type: 3} + propertyPath: m_Name + value: recipe_salt_butter + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 4e737f375c4f0481abc6ffd9284a7366, type: 3} +--- !u!224 &92498537 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 4393690446791901182, guid: 4e737f375c4f0481abc6ffd9284a7366, + type: 3} + m_PrefabInstance: {fileID: 92498536} + m_PrefabAsset: {fileID: 0} --- !u!1 &164370256 GameObject: m_ObjectHideFlags: 0 @@ -672,7 +797,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 504822411} - m_RootOrder: 3 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} @@ -746,7 +871,7 @@ RectTransform: - {fileID: 12608555} - {fileID: 2084682756} m_Father: {fileID: 504822411} - m_RootOrder: 2 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -1133,6 +1258,8 @@ RectTransform: m_Children: - {fileID: 471677968} - {fileID: 1081810293} + - {fileID: 1312259285} + - {fileID: 1991056619} - {fileID: 262919495} - {fileID: 251547153} - {fileID: 1793920306} @@ -1319,6 +1446,181 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 781660107} m_CullTransparentMesh: 0 +--- !u!1001 &1034160774 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1991056619} + m_Modifications: + - target: {fileID: 1159039341669490839, guid: 4e737f375c4f0481abc6ffd9284a7366, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1245112232885156824, guid: 4e737f375c4f0481abc6ffd9284a7366, + type: 3} + propertyPath: m_LocalRotation.w + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1245112232885156824, guid: 4e737f375c4f0481abc6ffd9284a7366, + type: 3} + propertyPath: m_LocalRotation.x + value: 0.17364825 + objectReference: {fileID: 0} + - target: {fileID: 1245112232885156824, guid: 4e737f375c4f0481abc6ffd9284a7366, + type: 3} + propertyPath: m_LocalRotation.y + value: -0.9848078 + objectReference: {fileID: 0} + - target: {fileID: 1245112232885156824, guid: 4e737f375c4f0481abc6ffd9284a7366, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1245112232885156824, guid: 4e737f375c4f0481abc6ffd9284a7366, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 50 + objectReference: {fileID: 0} + - target: {fileID: 1245112232885156824, guid: 4e737f375c4f0481abc6ffd9284a7366, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -180 + objectReference: {fileID: 0} + - target: {fileID: 1245112232885156824, guid: 4e737f375c4f0481abc6ffd9284a7366, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: -20 + objectReference: {fileID: 0} + - target: {fileID: 1542064967939521180, guid: 4e737f375c4f0481abc6ffd9284a7366, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4393690446791901182, guid: 4e737f375c4f0481abc6ffd9284a7366, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4393690446791901182, guid: 4e737f375c4f0481abc6ffd9284a7366, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4393690446791901182, guid: 4e737f375c4f0481abc6ffd9284a7366, + type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4393690446791901182, guid: 4e737f375c4f0481abc6ffd9284a7366, + type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4393690446791901182, guid: 4e737f375c4f0481abc6ffd9284a7366, + type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4393690446791901182, guid: 4e737f375c4f0481abc6ffd9284a7366, + type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4393690446791901182, guid: 4e737f375c4f0481abc6ffd9284a7366, + type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4393690446791901182, guid: 4e737f375c4f0481abc6ffd9284a7366, + type: 3} + propertyPath: m_SizeDelta.x + value: 150 + objectReference: {fileID: 0} + - target: {fileID: 4393690446791901182, guid: 4e737f375c4f0481abc6ffd9284a7366, + type: 3} + propertyPath: m_SizeDelta.y + value: 150 + objectReference: {fileID: 0} + - target: {fileID: 4393690446791901182, guid: 4e737f375c4f0481abc6ffd9284a7366, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4393690446791901182, guid: 4e737f375c4f0481abc6ffd9284a7366, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4393690446791901182, guid: 4e737f375c4f0481abc6ffd9284a7366, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4393690446791901182, guid: 4e737f375c4f0481abc6ffd9284a7366, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.9848078 + objectReference: {fileID: 0} + - target: {fileID: 4393690446791901182, guid: 4e737f375c4f0481abc6ffd9284a7366, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4393690446791901182, guid: 4e737f375c4f0481abc6ffd9284a7366, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4393690446791901182, guid: 4e737f375c4f0481abc6ffd9284a7366, + type: 3} + propertyPath: m_LocalRotation.z + value: -0.17364825 + objectReference: {fileID: 0} + - target: {fileID: 4393690446791901182, guid: 4e737f375c4f0481abc6ffd9284a7366, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 80 + objectReference: {fileID: 0} + - target: {fileID: 4393690446791901182, guid: 4e737f375c4f0481abc6ffd9284a7366, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -50 + objectReference: {fileID: 0} + - target: {fileID: 4393690446791901182, guid: 4e737f375c4f0481abc6ffd9284a7366, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4393690446791901182, guid: 4e737f375c4f0481abc6ffd9284a7366, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4393690446791901182, guid: 4e737f375c4f0481abc6ffd9284a7366, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: -20 + objectReference: {fileID: 0} + - target: {fileID: 6590057962321929320, guid: 4e737f375c4f0481abc6ffd9284a7366, + type: 3} + propertyPath: m_Name + value: recipe_StrawberryMilk_butter (1) + objectReference: {fileID: 0} + - target: {fileID: 6590057962321929320, guid: 4e737f375c4f0481abc6ffd9284a7366, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 4e737f375c4f0481abc6ffd9284a7366, type: 3} +--- !u!224 &1034160775 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 4393690446791901182, guid: 4e737f375c4f0481abc6ffd9284a7366, + type: 3} + m_PrefabInstance: {fileID: 1034160774} + m_PrefabAsset: {fileID: 0} --- !u!114 &1063352196 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1537,6 +1839,43 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1298517017} m_CullTransparentMesh: 0 +--- !u!1 &1312259284 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1312259285} + m_Layer: 5 + m_Name: salt + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &1312259285 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1312259284} + 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: 92498537} + - {fileID: 2029273978} + m_Father: {fileID: 504822411} + 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: 0, y: 0} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1336838851 GameObject: m_ObjectHideFlags: 0 @@ -1601,6 +1940,8 @@ MonoBehaviour: fertilizerObject: {fileID: 471677967} publicityObject: {fileID: 262919494} vipObject: {fileID: 1793920305} + butterObject: {fileID: 1312259284} + strawBerryObject: {fileID: 1991056618} --- !u!1 &1450516236 GameObject: m_ObjectHideFlags: 0 @@ -2034,6 +2375,141 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1718841268} m_CullTransparentMesh: 0 +--- !u!1001 &1749895939 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1991056619} + m_Modifications: + - target: {fileID: 1159039341669490839, guid: 4e737f375c4f0481abc6ffd9284a7366, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1542064967939521180, guid: 4e737f375c4f0481abc6ffd9284a7366, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4393690446791901182, guid: 4e737f375c4f0481abc6ffd9284a7366, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4393690446791901182, guid: 4e737f375c4f0481abc6ffd9284a7366, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4393690446791901182, guid: 4e737f375c4f0481abc6ffd9284a7366, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4393690446791901182, guid: 4e737f375c4f0481abc6ffd9284a7366, + type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4393690446791901182, guid: 4e737f375c4f0481abc6ffd9284a7366, + type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4393690446791901182, guid: 4e737f375c4f0481abc6ffd9284a7366, + type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4393690446791901182, guid: 4e737f375c4f0481abc6ffd9284a7366, + type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4393690446791901182, guid: 4e737f375c4f0481abc6ffd9284a7366, + type: 3} + propertyPath: m_SizeDelta.x + value: 150 + objectReference: {fileID: 0} + - target: {fileID: 4393690446791901182, guid: 4e737f375c4f0481abc6ffd9284a7366, + type: 3} + propertyPath: m_SizeDelta.y + value: 150 + objectReference: {fileID: 0} + - target: {fileID: 4393690446791901182, guid: 4e737f375c4f0481abc6ffd9284a7366, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4393690446791901182, guid: 4e737f375c4f0481abc6ffd9284a7366, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4393690446791901182, guid: 4e737f375c4f0481abc6ffd9284a7366, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4393690446791901182, guid: 4e737f375c4f0481abc6ffd9284a7366, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.9848078 + objectReference: {fileID: 0} + - target: {fileID: 4393690446791901182, guid: 4e737f375c4f0481abc6ffd9284a7366, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4393690446791901182, guid: 4e737f375c4f0481abc6ffd9284a7366, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4393690446791901182, guid: 4e737f375c4f0481abc6ffd9284a7366, + type: 3} + propertyPath: m_LocalRotation.z + value: 0.17364816 + objectReference: {fileID: 0} + - target: {fileID: 4393690446791901182, guid: 4e737f375c4f0481abc6ffd9284a7366, + type: 3} + propertyPath: m_AnchoredPosition.x + value: -100 + objectReference: {fileID: 0} + - target: {fileID: 4393690446791901182, guid: 4e737f375c4f0481abc6ffd9284a7366, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -50 + objectReference: {fileID: 0} + - target: {fileID: 4393690446791901182, guid: 4e737f375c4f0481abc6ffd9284a7366, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4393690446791901182, guid: 4e737f375c4f0481abc6ffd9284a7366, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4393690446791901182, guid: 4e737f375c4f0481abc6ffd9284a7366, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 20 + objectReference: {fileID: 0} + - target: {fileID: 6590057962321929320, guid: 4e737f375c4f0481abc6ffd9284a7366, + type: 3} + propertyPath: m_Name + value: recipe_StrawberryMilk_butter + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 4e737f375c4f0481abc6ffd9284a7366, type: 3} +--- !u!224 &1749895940 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 4393690446791901182, guid: 4e737f375c4f0481abc6ffd9284a7366, + type: 3} + m_PrefabInstance: {fileID: 1749895939} + m_PrefabAsset: {fileID: 0} --- !u!1 &1793920305 GameObject: m_ObjectHideFlags: 0 @@ -2064,7 +2540,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 504822411} - m_RootOrder: 4 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} @@ -2699,6 +3175,203 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1986250436} m_CullTransparentMesh: 0 +--- !u!1 &1991056618 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1991056619} + m_Layer: 5 + m_Name: berry + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &1991056619 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1991056618} + 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: 1749895940} + - {fileID: 1034160775} + m_Father: {fileID: 504822411} + m_RootOrder: 3 + 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: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!1001 &2029273977 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1312259285} + m_Modifications: + - target: {fileID: 1245112232885156824, guid: 4e737f375c4f0481abc6ffd9284a7366, + type: 3} + propertyPath: m_LocalRotation.w + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1245112232885156824, guid: 4e737f375c4f0481abc6ffd9284a7366, + type: 3} + propertyPath: m_LocalRotation.x + value: 0.17364825 + objectReference: {fileID: 0} + - target: {fileID: 1245112232885156824, guid: 4e737f375c4f0481abc6ffd9284a7366, + type: 3} + propertyPath: m_LocalRotation.y + value: -0.9848078 + objectReference: {fileID: 0} + - target: {fileID: 1245112232885156824, guid: 4e737f375c4f0481abc6ffd9284a7366, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1245112232885156824, guid: 4e737f375c4f0481abc6ffd9284a7366, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 50 + objectReference: {fileID: 0} + - target: {fileID: 1245112232885156824, guid: 4e737f375c4f0481abc6ffd9284a7366, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -180 + objectReference: {fileID: 0} + - target: {fileID: 1245112232885156824, guid: 4e737f375c4f0481abc6ffd9284a7366, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: -20 + objectReference: {fileID: 0} + - target: {fileID: 4393690446791901182, guid: 4e737f375c4f0481abc6ffd9284a7366, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4393690446791901182, guid: 4e737f375c4f0481abc6ffd9284a7366, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4393690446791901182, guid: 4e737f375c4f0481abc6ffd9284a7366, + type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4393690446791901182, guid: 4e737f375c4f0481abc6ffd9284a7366, + type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4393690446791901182, guid: 4e737f375c4f0481abc6ffd9284a7366, + type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4393690446791901182, guid: 4e737f375c4f0481abc6ffd9284a7366, + type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4393690446791901182, guid: 4e737f375c4f0481abc6ffd9284a7366, + type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4393690446791901182, guid: 4e737f375c4f0481abc6ffd9284a7366, + type: 3} + propertyPath: m_SizeDelta.x + value: 150 + objectReference: {fileID: 0} + - target: {fileID: 4393690446791901182, guid: 4e737f375c4f0481abc6ffd9284a7366, + type: 3} + propertyPath: m_SizeDelta.y + value: 150 + objectReference: {fileID: 0} + - target: {fileID: 4393690446791901182, guid: 4e737f375c4f0481abc6ffd9284a7366, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4393690446791901182, guid: 4e737f375c4f0481abc6ffd9284a7366, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4393690446791901182, guid: 4e737f375c4f0481abc6ffd9284a7366, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4393690446791901182, guid: 4e737f375c4f0481abc6ffd9284a7366, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.9848078 + objectReference: {fileID: 0} + - target: {fileID: 4393690446791901182, guid: 4e737f375c4f0481abc6ffd9284a7366, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4393690446791901182, guid: 4e737f375c4f0481abc6ffd9284a7366, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4393690446791901182, guid: 4e737f375c4f0481abc6ffd9284a7366, + type: 3} + propertyPath: m_LocalRotation.z + value: -0.17364825 + objectReference: {fileID: 0} + - target: {fileID: 4393690446791901182, guid: 4e737f375c4f0481abc6ffd9284a7366, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 80 + objectReference: {fileID: 0} + - target: {fileID: 4393690446791901182, guid: 4e737f375c4f0481abc6ffd9284a7366, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -50 + objectReference: {fileID: 0} + - target: {fileID: 4393690446791901182, guid: 4e737f375c4f0481abc6ffd9284a7366, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4393690446791901182, guid: 4e737f375c4f0481abc6ffd9284a7366, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4393690446791901182, guid: 4e737f375c4f0481abc6ffd9284a7366, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: -20 + objectReference: {fileID: 0} + - target: {fileID: 6590057962321929320, guid: 4e737f375c4f0481abc6ffd9284a7366, + type: 3} + propertyPath: m_Name + value: recipe_salt_butter (1) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 4e737f375c4f0481abc6ffd9284a7366, type: 3} +--- !u!224 &2029273978 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 4393690446791901182, guid: 4e737f375c4f0481abc6ffd9284a7366, + type: 3} + m_PrefabInstance: {fileID: 2029273977} + m_PrefabAsset: {fileID: 0} --- !u!1 &2084682755 GameObject: m_ObjectHideFlags: 0 diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Scripts/ProductManagement.cs b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/ProductManagement.cs index e00700c0..b67c9b64 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/Scripts/ProductManagement.cs +++ b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/ProductManagement.cs @@ -104,13 +104,22 @@ public class ProductManagement : MonoBehaviour .TakeWhile(_ => tankView.State.Value == TankState.Lock || tankView.State.Value == TankState.Unavailable) .Subscribe(_ => { - Action purchaseAction = amount => + Action purchaseAction = (amount, amount2) => { + // タンク追加 gameData.StorageTanks.Add(new StorageTank() {Capacity = Const.TankCapacity}); tankView.SetData(gameData.StorageTanks[tankView.TankNumber - 1]); tankView.SetState(TankState.Unlock); - CoinManager.Instance.SubCoin(shopData.price); + if (amount2 != -1) + { + CoinManager.Instance.SubCoin(amount2); + } + else + { + CoinManager.Instance.SubCoin(shopData.price); + + } gameData.Coin = CoinManager.Instance.OwnCoin; GameDataManager.SaveGameData(); // 次に大きいタンクの購入ボタンを表示 diff --git a/popcorn/Assets/MyGame/Scenes/recipe/Scripts/RecipeDetailView.cs b/popcorn/Assets/MyGame/Scenes/recipe/Scripts/RecipeDetailView.cs index 65e7cfbb..d29f5769 100644 --- a/popcorn/Assets/MyGame/Scenes/recipe/Scripts/RecipeDetailView.cs +++ b/popcorn/Assets/MyGame/Scenes/recipe/Scripts/RecipeDetailView.cs @@ -114,7 +114,7 @@ public class RecipeDetailView : MonoBehaviour } if (!checkResult.material3) { - TransitionManager.Instance.JumpId = productData.MaterialList[1].id; + TransitionManager.Instance.JumpId = productData.MaterialList[2].id; TransitionManager.Instance.LoadScene(GameScenes.shopping); } diff --git a/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/Frame.prefab b/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/Frame.prefab index f96de1b2..8c6d3065 100644 --- a/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/Frame.prefab +++ b/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/Frame.prefab @@ -115,6 +115,142 @@ MonoBehaviour: mGUI_ShowCallback: 0 mLocalizeTarget: {fileID: 0} mLocalizeTargetName: I2.Loc.LocalizeTarget_UnityUI_Image +--- !u!1 &803468714074288058 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5152618534615063273} + - component: {fileID: 5961045225800098462} + - component: {fileID: 875966259393350037} + - component: {fileID: 7161414800444630193} + - component: {fileID: 4119423649121158570} + m_Layer: 5 + m_Name: Button_on + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &5152618534615063273 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 803468714074288058} + 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: 107542929962011817} + m_Father: {fileID: 5071070277622494836} + 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: 186, y: 104} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5961045225800098462 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 803468714074288058} + m_CullTransparentMesh: 0 +--- !u!114 &875966259393350037 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 803468714074288058} + 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: ee73db39cff93334a92789ac47e0e509, 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!114 &7161414800444630193 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 803468714074288058} + 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: 875966259393350037} + m_OnClick: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &4119423649121158570 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 803468714074288058} + 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 &810142680267297900 GameObject: m_ObjectHideFlags: 0 @@ -776,6 +912,42 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &3667781120771027234 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5071070277622494836} + m_Layer: 5 + m_Name: Button_video + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5071070277622494836 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3667781120771027234} + 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: 5152618534615063273} + m_Father: {fileID: 1756374223786370457} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: 298, y: -23} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &4401845661551908464 GameObject: m_ObjectHideFlags: 0 @@ -887,6 +1059,80 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &5008542789218779276 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 107542929962011817} + - component: {fileID: 5796031723857162245} + - component: {fileID: 1649591290260244536} + m_Layer: 5 + m_Name: Text_purchase + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &107542929962011817 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5008542789218779276} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1.1, y: 1.1, z: 1.1} + m_Children: [] + m_Father: {fileID: 5152618534615063273} + 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: 2, y: 3} + m_SizeDelta: {x: 146, y: 38} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5796031723857162245 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5008542789218779276} + m_CullTransparentMesh: 0 +--- !u!114 &1649591290260244536 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5008542789218779276} + 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: ba037169854dc4c1db3853c4700f027c, 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 &5433729606380246405 GameObject: m_ObjectHideFlags: 0 @@ -1759,6 +2005,7 @@ RectTransform: - {fileID: 8536603423194818438} - {fileID: 4489693243212894136} - {fileID: 6047291568959271693} + - {fileID: 1756374223786370457} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1830,6 +2077,7 @@ MonoBehaviour: offObject: {fileID: 1852637203793855555} soldOutObject: {fileID: 6377311622786111752} exchangeButton: {fileID: 1139534594415698666} + videoButton: {fileID: 7161414800444630193} --- !u!1 &8536603423534268947 GameObject: m_ObjectHideFlags: 0 @@ -2215,7 +2463,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 66e94660ac6f7de41a7a5c8fbe58fce6, type: 3} + m_Sprite: {fileID: 21300000, guid: b439432c614c94c5b8a8569189ca794f, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -2331,7 +2579,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} + m_Font: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, type: 3} m_FontSize: 35 m_FontStyle: 1 m_BestFit: 1 @@ -2866,7 +3114,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 1ed7a6eade5a3af4c962706dec098104, type: 3} + m_Sprite: {fileID: 21300000, guid: e83b46ee25b4b41669e0e18c63b3059e, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -3089,6 +3337,42 @@ RectTransform: m_AnchoredPosition: {x: 122, y: -4} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &8852299091402220000 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1756374223786370457} + m_Layer: 5 + m_Name: video + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1756374223786370457 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8852299091402220000} + 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: 5071070277622494836} + m_Father: {fileID: 8536603423520130721} + m_RootOrder: 5 + 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: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1001 &6057890873457507751 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/popcorn/Assets/MyGame/Scenes/shopping/Scripts/ShopHeaderTabView.cs b/popcorn/Assets/MyGame/Scenes/shopping/Scripts/ShopHeaderTabView.cs index fdaa4880..0db9a793 100644 --- a/popcorn/Assets/MyGame/Scenes/shopping/Scripts/ShopHeaderTabView.cs +++ b/popcorn/Assets/MyGame/Scenes/shopping/Scripts/ShopHeaderTabView.cs @@ -1,4 +1,7 @@ using System; +using System.Collections; +using System.Collections.Generic; +using MyGame.Scripts; using UniRx; using UnityEngine; using UnityEngine.UI; @@ -9,10 +12,85 @@ public class ShopHeaderTabView : MonoBehaviour [SerializeField] private GameObject onObject; [SerializeField] private GameObject offObject; + [SerializeField] private Text timetextObject; + [SerializeField] private Button m_videobutton; public IObservable ClickObservable => button.OnClickAsObservable().TakeUntilDestroy(this); + + + public Action freshSale = null; + // public IObservable Clickm_videobuttonObservable => m_videobutton.OnClickAsObservable().TakeUntilDestroy(this); + + public void SetToggle(bool active) { onObject.SetActive(active); offObject.SetActive(!active); } + + private void OnEnable() + { + if (null== timetextObject) + { + return; + } + m_videobutton.onClick.AddListener(SaleVideo); + StartCoroutine(SaleTime()); + } + + void SaleVideo() + { + GetRewardDialog.ShowSaleVideoDialog(() => + { + if (null!= freshSale) + { + GameDataManager.sale = GameDataManager.GetTimeStamp(dateTime) +10; + freshSale(true); + + } + }); + } + + DateTime dateTime = DateTime.Now; + public IEnumerator SaleTime() + { + dateTime = DateTime.Now; + if (dateTime.Hour==12|| dateTime.Hour == 19) + { + m_videobutton.gameObject.SetActive(false); + // timetextObject.SetActive(true); + + timetextObject.text = string.Format("8折促销中 {0:D2}:{1:D2}", 60 - dateTime.Minute, 60 - dateTime.Second); + if (null != freshSale) + { + freshSale(true); + + } + } + else + { + m_videobutton.gameObject.SetActive(onObject.activeSelf); + timetextObject.text = ""; + long dateNowTime = GameDataManager.GetTimeStamp(dateTime); + + if (null != freshSale && GameDataManager.sale < dateNowTime) + { + freshSale(false); + + } + else if(GameDataManager.sale >= dateNowTime) + { + long videotime = GameDataManager.sale - GameDataManager.GetTimeStamp(dateTime); + timetextObject.text = string.Format("8折促销中 {0:D2}:{1:D2}", videotime/60, videotime%60); + } + + } + + timetextObject.gameObject.SetActive(onObject.activeSelf); + yield return new WaitForSeconds(1); + yield return SaleTime(); + + + + } + } diff --git a/popcorn/Assets/MyGame/Scenes/shopping/Scripts/ShopHeaderView.cs b/popcorn/Assets/MyGame/Scenes/shopping/Scripts/ShopHeaderView.cs index 68b67b5d..676725c9 100644 --- a/popcorn/Assets/MyGame/Scenes/shopping/Scripts/ShopHeaderView.cs +++ b/popcorn/Assets/MyGame/Scenes/shopping/Scripts/ShopHeaderView.cs @@ -1,4 +1,5 @@ using System; +using MyGame.Scripts; using UniRx; using UnityEngine; @@ -9,6 +10,8 @@ public class ShopHeaderView : MonoBehaviour public IReadOnlyReactiveProperty Tab => tab; private readonly ReactiveProperty tab = new ReactiveProperty(); + + public Action tabviewfreshSale = null; private void Start() { tab.AddTo(this); @@ -24,6 +27,8 @@ public class ShopHeaderView : MonoBehaviour { tab.Value = tabName; }).AddTo(this); + + materialTab.freshSale = tabviewfreshSale; } public void SetTab(ItemCategory category) diff --git a/popcorn/Assets/MyGame/Scenes/shopping/Scripts/ShopItemPurchaseView.cs b/popcorn/Assets/MyGame/Scenes/shopping/Scripts/ShopItemPurchaseView.cs index 8acb67be..1a534015 100644 --- a/popcorn/Assets/MyGame/Scenes/shopping/Scripts/ShopItemPurchaseView.cs +++ b/popcorn/Assets/MyGame/Scenes/shopping/Scripts/ShopItemPurchaseView.cs @@ -35,6 +35,7 @@ public class ShopItemPurchaseView : MonoBehaviour private Color redColor; private Color defaultColor; private readonly IntReactiveProperty currentCount = new IntReactiveProperty(); + int nowprice = -1; private void Start() { currentCount.AddTo(this); @@ -42,6 +43,8 @@ public class ShopItemPurchaseView : MonoBehaviour ColorUtility.TryParseHtmlString(Const.RedColorString, out redColor); // 表示データを受け取る var data = LocalCacheManager.Load<(ShopData shopData, int stockCount)>(ItemPurchaseTag); + + LocalCacheManager.Remove(ItemPurchaseTag); SetData(data.shopData, data.stockCount); closeButton.OnClickAsObservable().Take(1).Subscribe(_ => @@ -57,7 +60,7 @@ public class ShopItemPurchaseView : MonoBehaviour purchaseOnButton.OnClickAsObservable().Take(1).Subscribe(_ => { purchaseOnButton.interactable = false; - LocalCacheManager.Load>(PurchaseCallbackTag, null)?.Invoke(currentCount.Value); + LocalCacheManager.Load>(PurchaseCallbackTag, null)?.Invoke(currentCount.Value, nowprice); transform.SetLocalScale(0); backgroundAnimator.SetTrigger(CloseTrigger); this.CallWaitForSeconds(.25f, () => @@ -109,6 +112,7 @@ public class ShopItemPurchaseView : MonoBehaviour private void SetData(ShopData shopData, int count) { + nowprice = shopData.price; name.text = shopData.Name; price.text = $"{shopData.price}"; stockCount.text = $"{ScriptLocalization.UI.RecipeChoiceMyStockPrefix}{count}"; @@ -123,7 +127,7 @@ public class ShopItemPurchaseView : MonoBehaviour purchaseOffButton.SetActive(!active); } - public static void ShowDialog((ShopData shopData, int stockCount) data, Action onPurchase, Action onClose = null) + public static void ShowDialog((ShopData shopData, int stockCount) data, Action onPurchase, Action onClose = null) { LocalCacheManager.Save(ItemPurchaseTag, data); LocalCacheManager.Save(PurchaseCallbackTag, onPurchase); diff --git a/popcorn/Assets/MyGame/Scenes/shopping/Scripts/ShopItemView.cs b/popcorn/Assets/MyGame/Scenes/shopping/Scripts/ShopItemView.cs index 3ad1c0b8..a4484b42 100644 --- a/popcorn/Assets/MyGame/Scenes/shopping/Scripts/ShopItemView.cs +++ b/popcorn/Assets/MyGame/Scenes/shopping/Scripts/ShopItemView.cs @@ -25,14 +25,57 @@ public class ShopItemView : MonoBehaviour [SerializeField] private GameObject soldOutObject; [SerializeField] private Button exchangeButton; + [SerializeField] private Button videoButton; + public Action jumpPurchase; public IObservable DetailButtonObservable => detailButton.OnClickAsObservable().TakeUntilDestroy(this); public IObservable PurchaseButtonObservable => purchaseButton.ClickObservable; public IObservable ExchangeButtonObservable => exchangeButton.OnClickAsObservable().TakeUntilDestroy(this); - public void SetData(ShopData shopData) + public IObservable VideoButtonObservable => videoButton.OnClickAsObservable().TakeUntilDestroy(this); + + + ShopData m_shopData=null; + + int nomalPrice = -1; + public void SetData(ShopData shopData,bool sale=false) { + m_shopData = shopData; + long dateNowTime = GameDataManager.GetTimeStamp(DateTime.Now); + if (GameDataManager.sale >= dateNowTime&&(ShopItemType)shopData.consumeType== ShopItemType.Consumable) + { + nomalPrice = shopData.price>nomalPrice?shopData.price:nomalPrice; + shopData.price = (int)(nomalPrice * 0.8f); + } + else if(nomalPrice!=-1&&GameDataManager.sale<= dateNowTime) + { + shopData.price = nomalPrice; + } + if (shopData.id == 14 ) + { + shopData.price = 1; + + videoButton.gameObject.SetActive(CryptoPrefs.GetInt("ShowButterDialog", 0) == 0); + + } + if (shopData.id == 15) + { + shopData.price = 1; + + videoButton.gameObject.SetActive(CryptoPrefs.GetInt("ShowStrawBerryDialog", 0) == 0); + + } + if (shopData.id == 13) + { + shopData.price = 20; + + } + if (shopData.id == 16) + { + shopData.price = 40; + + } itemName.text = shopData.Name; price.text = $"{shopData.price}"; if (shopData.ConsumeType == ShopItemType.NonConsumable) @@ -51,10 +94,31 @@ public class ShopItemView : MonoBehaviour exchangeObject.SetActive(shopData.Category == ItemCategory.Recipe); progressBar.value = Mathf.InverseLerp(0, shopData.price, GameDataManager.GameData.adCount); progressText.text = string.Format(ProgressFormat, GameDataManager.GameData.adCount, shopData.price); + + + onObject.SetActive(shopData.price <= GameDataManager.GameData.adCount); offObject.SetActive(!onObject.activeSelf); + if (shopData.id == 14) + { + progressText.text = string.Format(ProgressFormat, CryptoPrefs.GetInt("ShowButterDialog", 0), "1"); + + progressBar.value = Mathf.InverseLerp(0, shopData.price, CryptoPrefs.GetInt("ShowButterDialog", 0)); + onObject.SetActive(false); + offObject.SetActive(false); + soldOutObject.SetActive(true); + } + if (shopData.id == 15) + { + progressText.text = string.Format(ProgressFormat, CryptoPrefs.GetInt("ShowStrawBerryDialog", 0), "1"); + progressBar.value = Mathf.InverseLerp(0, shopData.price, CryptoPrefs.GetInt("ShowStrawBerryDialog", 0)); + onObject.SetActive(false); + offObject.SetActive(false); + soldOutObject.SetActive(true); + } + SetItemActive(shopData.price <= CoinManager.Instance.OwnCoin); var gameData = GameDataManager.GameData; if (shopData.price <= gameData.Coin&& TransitionManager.Instance.JumpId!=-1) { @@ -66,7 +130,27 @@ public class ShopItemView : MonoBehaviour } } + private void OnDestroy() + { + if (nomalPrice>-1) + { + m_shopData.price = nomalPrice; + } + } + public void RefashItem(ShopData shopData= null, bool sale=false) + { + if (null== shopData) + { + SetData(m_shopData,sale); + + } + else + { + SetData(shopData, sale); + } + + } public void SetStockCount(int stock) @@ -79,6 +163,8 @@ public class ShopItemView : MonoBehaviour onObject.SetActive(false); offObject.SetActive(false); } + + } public void SetItemActive(bool active) diff --git a/popcorn/Assets/MyGame/Scenes/shopping/Scripts/ShopListView.cs b/popcorn/Assets/MyGame/Scenes/shopping/Scripts/ShopListView.cs index bc2be981..d8d6fc9a 100644 --- a/popcorn/Assets/MyGame/Scenes/shopping/Scripts/ShopListView.cs +++ b/popcorn/Assets/MyGame/Scenes/shopping/Scripts/ShopListView.cs @@ -12,6 +12,10 @@ public class ShopListView : MonoBehaviour private readonly List<(ItemCategory category, RectTransform content)> tabs = new List<(ItemCategory, RectTransform)>(); public ScrollRect ScrollRect => scrollRect; + public List m_itemViews = new List(); + + public List m_itemDatas = new List(); + private void Awake() { while (scrollRect.content.childCount > 0) @@ -19,6 +23,8 @@ public class ShopListView : MonoBehaviour DestroyImmediate(scrollRect.content.GetChild(0).gameObject); } tabs.Add((ItemCategory.Recipe, scrollRect.content)); + + headerView.tabviewfreshSale = RefreshItemviews; } private void Start() @@ -36,6 +42,8 @@ public class ShopListView : MonoBehaviour } }); }).AddTo(this); + + } public void SetTab(ItemCategory category) @@ -52,7 +60,26 @@ public class ShopListView : MonoBehaviour index = tabs.Count; tabs.Add((tabCategory, Instantiate(scrollRect.content, scrollRect.content.parent))); } - return Instantiate(itemViewPrefab, tabs[index].content); + ShopItemView tempItemview = Instantiate(itemViewPrefab, tabs[index].content); + m_itemViews.Add(tempItemview); + m_itemDatas.Add(shopData); + return tempItemview; + } + + public void RefreshItemviews(bool sale=false) + { + for (int i = 0; i < m_itemViews.Count; i++) + { + if (sale) + { + m_itemViews[i].RefashItem(m_itemDatas[i], sale); + + } + else + { + m_itemViews[i].RefashItem(); + } + } } private ItemCategory GetTabCategory(ItemCategory category) diff --git a/popcorn/Assets/MyGame/Scenes/shopping/Scripts/Shopping.cs b/popcorn/Assets/MyGame/Scenes/shopping/Scripts/Shopping.cs index 3d92dbdd..691f1014 100644 --- a/popcorn/Assets/MyGame/Scenes/shopping/Scripts/Shopping.cs +++ b/popcorn/Assets/MyGame/Scenes/shopping/Scripts/Shopping.cs @@ -66,12 +66,22 @@ public class Shopping : MonoBehaviour { return; } - ShopItemPurchaseView.ShowDialog((shopData, GetItemAmount(shopData)), amount => + ShopItemPurchaseView.ShowDialog((shopData, GetItemAmount(shopData)), (amount,amount1) => { // アイテムを増やす AddItem(shopData, amount); itemView.SetStockCount(GetItemAmount(shopData)); - CoinManager.Instance.SubCoin(shopData.price * amount); + if (amount1 != -1) + { + CoinManager.Instance.SubCoin(amount1 * amount); + } + else + { + CoinManager.Instance.SubCoin(shopData.price * amount); + + } + + gameData.Coin = CoinManager.Instance.OwnCoin; changeCoinSubject.OnNext(gameData.Coin); GameDataManager.SaveGameData(); @@ -101,12 +111,20 @@ public class Shopping : MonoBehaviour .Where(_ => shopData.price <= CoinManager.Instance.OwnCoin) .Subscribe(_ => { - ShopItemPurchaseView.ShowDialog((shopData, GetItemAmount(shopData)), amount => + ShopItemPurchaseView.ShowDialog((shopData, GetItemAmount(shopData)), (amount,amount1) => { // アイテムを増やす AddItem(shopData, amount); itemView.SetStockCount(GetItemAmount(shopData)); - CoinManager.Instance.SubCoin(shopData.price * amount); + if (amount1 != -1) + { + CoinManager.Instance.SubCoin(amount1 * amount); + } + else + { + CoinManager.Instance.SubCoin(shopData.price * amount); + + } gameData.Coin = CoinManager.Instance.OwnCoin; changeCoinSubject.OnNext(gameData.Coin); GameDataManager.SaveGameData(); @@ -140,7 +158,51 @@ public class Shopping : MonoBehaviour recipeNotifyIcon.SetActive(CheckEarnedRecipe()); }); }).AddTo(itemView); - + + + + + + itemView.VideoButtonObservable + .ThrottleFirst(TimeSpan.FromSeconds(.3f)) + .Subscribe(_ => + { + if (shopData.id==14) + { + GetRewardDialog.ShowButterDialog(() => + { + ShopItemExchangeView.ShowDialog(shopData, () => + { + CryptoPrefs.SetInt("ShowButterDialog", 1); + // アイテムを増やす + AddItem(shopData, 1); + itemView.SetStockCount(GetItemAmount(shopData)); + GameDataManager.SaveGameData(); + recipeNotifyIcon.SetActive(CheckEarnedRecipe()); + listView.RefreshItemviews(); + }); + }); + } + else + { + GetRewardDialog.ShowStrawBerryDialog(() => + { + ShopItemExchangeView.ShowDialog(shopData, () => + { + CryptoPrefs.SetInt("ShowStrawBerryDialog", 1); + // アイテムを増やす + AddItem(shopData, 1); + itemView.SetStockCount(GetItemAmount(shopData)); + GameDataManager.SaveGameData(); + recipeNotifyIcon.SetActive(CheckEarnedRecipe()); + listView.RefreshItemviews(); + }); + }); + + } + }).AddTo(itemView); + + // show detail view itemView.DetailButtonObservable.ThrottleFirst(TimeSpan.FromSeconds(.3f)).Subscribe(_ => { @@ -148,6 +210,7 @@ public class Shopping : MonoBehaviour TransitionManager.Instance.LoadSceneAdditive(GameScenes.ShoppingExplanation); }).AddTo(itemView); } + listView.SetTab(ItemCategory.Material); changeCoinSubject.OnNext(CoinManager.Instance.OwnCoin); diff --git a/popcorn/Assets/MyGame/Scenes/shopping/shopping.unity b/popcorn/Assets/MyGame/Scenes/shopping/shopping.unity index b5d77074..f50889f9 100644 --- a/popcorn/Assets/MyGame/Scenes/shopping/shopping.unity +++ b/popcorn/Assets/MyGame/Scenes/shopping/shopping.unity @@ -121,7 +121,7 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} ---- !u!114 &12755528 +--- !u!114 &8609172 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -133,20 +133,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} m_Name: m_EditorClassIdentifier: - mTarget: {fileID: 3078490422721459392} ---- !u!114 &16915014 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} - m_Name: - m_EditorClassIdentifier: - mTarget: {fileID: 3078490422721459399} + mTarget: {fileID: 3078490422721459369} --- !u!1 &75933247 GameObject: m_ObjectHideFlags: 0 @@ -213,7 +200,7 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &84516109 +--- !u!114 &230673110 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -225,8 +212,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} m_Name: m_EditorClassIdentifier: - mTarget: {fileID: 3078490422721459372} ---- !u!114 &170689147 + mTarget: {fileID: 1098091311} +--- !u!114 &241745242 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -238,8 +225,21 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} m_Name: m_EditorClassIdentifier: - mTarget: {fileID: 3078490422721459403} ---- !u!114 &185100907 + mTarget: {fileID: 1098091312} +--- !u!114 &431594404 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 332e36893e7cf4a49b3c1f72f76cd5e1, type: 3} + m_Name: + m_EditorClassIdentifier: + mTarget: {fileID: 3078490422721459385} +--- !u!114 &431746235 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -251,8 +251,44 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} m_Name: m_EditorClassIdentifier: - mTarget: {fileID: 3078490422721459394} ---- !u!114 &291891838 + mTarget: {fileID: 3078490422721459398} +--- !u!1 &446700667 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 446700668} + m_Layer: 5 + m_Name: Button_video + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &446700668 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 446700667} + 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: 1834501174} + m_Father: {fileID: 3078490422721459404} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 104, y: -1087} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &468426499 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -264,8 +300,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} m_Name: m_EditorClassIdentifier: - mTarget: {fileID: 3078490422721459370} ---- !u!114 &298507793 + mTarget: {fileID: 1098091309} +--- !u!114 &474279335 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -277,21 +313,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} m_Name: m_EditorClassIdentifier: - mTarget: {fileID: 3078490422721459384} ---- !u!114 &306200943 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} - m_Name: - m_EditorClassIdentifier: - mTarget: {fileID: 3078490422721459382} ---- !u!114 &343366135 + mTarget: {fileID: 3078490422721459401} +--- !u!114 &497669887 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -304,7 +327,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: mTarget: {fileID: 3078490422721459402} ---- !u!114 &374412842 +--- !u!114 &498858224 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -316,8 +339,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} m_Name: m_EditorClassIdentifier: - mTarget: {fileID: 3078490422721459389} ---- !u!114 &375615198 + mTarget: {fileID: 3078490422721459403} +--- !u!114 &505708616 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -326,11 +349,24 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 332e36893e7cf4a49b3c1f72f76cd5e1, type: 3} + m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} m_Name: m_EditorClassIdentifier: - mTarget: {fileID: 3078490422721459395} ---- !u!114 &469220049 + mTarget: {fileID: 3078490422721459396} +--- !u!114 &525088883 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} + m_Name: + m_EditorClassIdentifier: + mTarget: {fileID: 3078490422721459372} +--- !u!114 &533743144 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -343,19 +379,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: mTarget: {fileID: 3078490422721459397} ---- !u!114 &548598925 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} - m_Name: - m_EditorClassIdentifier: - mTarget: {fileID: 3078490422721459374} --- !u!1 &553363513 GameObject: m_ObjectHideFlags: 0 @@ -439,7 +462,7 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &613040796 +--- !u!114 &558125177 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -451,8 +474,82 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} m_Name: m_EditorClassIdentifier: - mTarget: {fileID: 1098091312} ---- !u!114 &714147736 + mTarget: {fileID: 1098091308} +--- !u!1 &590774210 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 590774211} + - component: {fileID: 590774213} + - component: {fileID: 590774212} + m_Layer: 5 + m_Name: icon_material + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &590774211 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 590774210} + 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: 1834501174} + 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: 146, y: 38} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &590774212 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 590774210} + 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: ba037169854dc4c1db3853c4700f027c, 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!222 &590774213 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 590774210} + m_CullTransparentMesh: 0 +--- !u!114 &693048080 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -464,7 +561,33 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} m_Name: m_EditorClassIdentifier: - mTarget: {fileID: 3078490422721459396} + mTarget: {fileID: 3078490422721459373} +--- !u!114 &698368229 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} + m_Name: + m_EditorClassIdentifier: + mTarget: {fileID: 1098091310} +--- !u!114 &709708947 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 332e36893e7cf4a49b3c1f72f76cd5e1, type: 3} + m_Name: + m_EditorClassIdentifier: + mTarget: {fileID: 3078490422721459375} --- !u!114 &715888784 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 4826861628800619564, guid: 667a93fb2929943078b944050cddd464, @@ -477,7 +600,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4f77652346b24cc9b0d5da516979f736, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!114 &742032413 +--- !u!114 &789960028 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -486,42 +609,55 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} + m_Script: {fileID: 11500000, guid: 332e36893e7cf4a49b3c1f72f76cd5e1, type: 3} m_Name: m_EditorClassIdentifier: - mTarget: {fileID: 1098091311} ---- !u!114 &798047727 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} - m_Name: - m_EditorClassIdentifier: - mTarget: {fileID: 3078490422721459386} ---- !u!114 &798706289 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} - m_Name: - m_EditorClassIdentifier: - mTarget: {fileID: 3078490422721459391} + mTarget: {fileID: 3078490422721459380} --- !u!1 &856397973 stripped GameObject: m_CorrespondingSourceObject: {fileID: 373226152936786244, guid: 667a93fb2929943078b944050cddd464, type: 3} m_PrefabInstance: {fileID: 3078490422721459368} m_PrefabAsset: {fileID: 0} +--- !u!114 &858445004 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} + m_Name: + m_EditorClassIdentifier: + mTarget: {fileID: 3078490422721459378} +--- !u!114 &925729074 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 332e36893e7cf4a49b3c1f72f76cd5e1, type: 3} + m_Name: + m_EditorClassIdentifier: + mTarget: {fileID: 3078490422721459395} +--- !u!114 &936492410 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} + m_Name: + m_EditorClassIdentifier: + mTarget: {fileID: 3078490422721459389} --- !u!1 &980038342 GameObject: m_ObjectHideFlags: 0 @@ -567,6 +703,58 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &999027817 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} + m_Name: + m_EditorClassIdentifier: + mTarget: {fileID: 3078490422721459399} +--- !u!114 &1020832015 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} + m_Name: + m_EditorClassIdentifier: + mTarget: {fileID: 3078490422721459379} +--- !u!114 &1043133986 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} + m_Name: + m_EditorClassIdentifier: + mTarget: {fileID: 3078490422721459377} +--- !u!114 &1069852515 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} + m_Name: + m_EditorClassIdentifier: + mTarget: {fileID: 3078490422721459384} --- !u!1001 &1098091307 PrefabInstance: m_ObjectHideFlags: 0 @@ -586,7 +774,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 88b678672e5bca548bedbae7386e4346, + objectReference: {fileID: 21300000, guid: e644184ee7cac4454a2ebc1fc479ecb4, type: 3} - target: {fileID: 566248750470715636, guid: caaa748dbeed576499e8cae74d33f689, type: 3} @@ -717,13 +905,13 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 401e6b14583a46443be3b7124b78ac09, + objectReference: {fileID: 21300000, guid: 3e8106fd24f7946e2a20ebd081ebb0b9, type: 3} - target: {fileID: 3664916832434116137, guid: caaa748dbeed576499e8cae74d33f689, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: e8fb21ace44c3e748959b969f895dd23, + objectReference: {fileID: 21300000, guid: dab0cd6adf1694bd6b96c224ad8c38e6, type: 3} - target: {fileID: 3664916832512110618, guid: caaa748dbeed576499e8cae74d33f689, type: 3} @@ -874,7 +1062,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 0a13c07b1bd21434d801188fb9b7546d, + objectReference: {fileID: 21300000, guid: 0469694e83769479fa737c3a3b9f6b06, type: 3} - target: {fileID: 3664916832909534300, guid: caaa748dbeed576499e8cae74d33f689, type: 3} @@ -895,7 +1083,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 7597f863b51829447a8afd00534fe6e4, + objectReference: {fileID: 21300000, guid: afb06cd566c9b4c0eba30dd082477478, type: 3} - target: {fileID: 4348639590627783772, guid: caaa748dbeed576499e8cae74d33f689, type: 3} @@ -994,7 +1182,33 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!114 &1116789867 +--- !u!114 &1227951312 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} + m_Name: + m_EditorClassIdentifier: + mTarget: {fileID: 3078490422721459371} +--- !u!114 &1252299302 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} + m_Name: + m_EditorClassIdentifier: + mTarget: {fileID: 3078490422721459383} +--- !u!114 &1329837948 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1006,8 +1220,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 332e36893e7cf4a49b3c1f72f76cd5e1, type: 3} m_Name: m_EditorClassIdentifier: - mTarget: {fileID: 3078490422721459380} ---- !u!114 &1117930592 + mTarget: {fileID: 3078490422721459390} +--- !u!114 &1354714142 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1019,8 +1233,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} m_Name: m_EditorClassIdentifier: - mTarget: {fileID: 3078490422721459387} ---- !u!114 &1187843646 + mTarget: {fileID: 3078490422721459393} +--- !u!114 &1435530505 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1032,8 +1246,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} m_Name: m_EditorClassIdentifier: - mTarget: {fileID: 3078490422721459401} ---- !u!114 &1218388569 + mTarget: {fileID: 3078490422721459381} +--- !u!114 &1438194988 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1045,46 +1259,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} m_Name: m_EditorClassIdentifier: - mTarget: {fileID: 3078490422721459398} ---- !u!114 &1235020394 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} - m_Name: - m_EditorClassIdentifier: - mTarget: {fileID: 1098091310} ---- !u!114 &1295248540 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} - m_Name: - m_EditorClassIdentifier: - mTarget: {fileID: 3078490422721459379} ---- !u!114 &1427708186 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} - m_Name: - m_EditorClassIdentifier: - mTarget: {fileID: 1098091309} + mTarget: {fileID: 3078490422721459370} --- !u!1001 &1450416387 PrefabInstance: m_ObjectHideFlags: 0 @@ -1160,20 +1335,7 @@ Camera: type: 3} m_PrefabInstance: {fileID: 1450416387} m_PrefabAsset: {fileID: 0} ---- !u!114 &1483521886 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 332e36893e7cf4a49b3c1f72f76cd5e1, type: 3} - m_Name: - m_EditorClassIdentifier: - mTarget: {fileID: 3078490422721459400} ---- !u!114 &1549246046 +--- !u!114 &1473320104 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1185,8 +1347,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} m_Name: m_EditorClassIdentifier: - mTarget: {fileID: 3078490422721459378} ---- !u!114 &1555100098 + mTarget: {fileID: 3078490422721459394} +--- !u!114 &1550650125 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1198,151 +1360,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} m_Name: m_EditorClassIdentifier: - mTarget: {fileID: 3078490422721459381} ---- !u!114 &1604168018 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} - m_Name: - m_EditorClassIdentifier: - mTarget: {fileID: 3078490422721459373} ---- !u!114 &1687336534 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 332e36893e7cf4a49b3c1f72f76cd5e1, type: 3} - m_Name: - m_EditorClassIdentifier: - mTarget: {fileID: 3078490422721459385} ---- !u!114 &1687668104 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} - m_Name: - m_EditorClassIdentifier: - mTarget: {fileID: 3078490422721459371} ---- !u!114 &1741718431 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} - m_Name: - m_EditorClassIdentifier: - mTarget: {fileID: 3078490422721459377} ---- !u!114 &1770380650 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} - m_Name: - m_EditorClassIdentifier: - mTarget: {fileID: 1098091308} ---- !u!114 &1794107562 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} - m_Name: - m_EditorClassIdentifier: - mTarget: {fileID: 3078490422721459383} ---- !u!114 &1809186285 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} - m_Name: - m_EditorClassIdentifier: - mTarget: {fileID: 3078490422721459393} ---- !u!114 &1825403440 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} - m_Name: - m_EditorClassIdentifier: - mTarget: {fileID: 3078490422721459369} ---- !u!114 &1861813211 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} - m_Name: - m_EditorClassIdentifier: - mTarget: {fileID: 3078490422721459388} ---- !u!114 &1903890811 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 332e36893e7cf4a49b3c1f72f76cd5e1, type: 3} - m_Name: - m_EditorClassIdentifier: - mTarget: {fileID: 3078490422721459390} ---- !u!114 &1945489957 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 332e36893e7cf4a49b3c1f72f76cd5e1, type: 3} - m_Name: - m_EditorClassIdentifier: - mTarget: {fileID: 3078490422721459375} ---- !u!114 &2056938214 + mTarget: {fileID: 3078490422721459387} +--- !u!114 &1570156601 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1355,6 +1374,311 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: mTarget: {fileID: 3078490422721459376} +--- !u!114 &1570640608 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} + m_Name: + m_EditorClassIdentifier: + mTarget: {fileID: 3078490422721459374} +--- !u!114 &1717436142 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 332e36893e7cf4a49b3c1f72f76cd5e1, type: 3} + m_Name: + m_EditorClassIdentifier: + mTarget: {fileID: 3078490422721459400} +--- !u!114 &1752470684 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} + m_Name: + m_EditorClassIdentifier: + mTarget: {fileID: 3078490422721459392} +--- !u!114 &1816829635 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} + m_Name: + m_EditorClassIdentifier: + mTarget: {fileID: 3078490422721459388} +--- !u!1 &1834501169 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1834501174} + - component: {fileID: 1834501173} + - component: {fileID: 1834501171} + - component: {fileID: 1834501170} + - component: {fileID: 1834501172} + m_Layer: 5 + m_Name: Button_off + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1834501170 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1834501169} + 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: 1834501171} + m_OnClick: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &1834501171 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1834501169} + 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: 089ca9e468fdfd14ebd66370e335159c, 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 &1834501172 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1834501169} + 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!222 &1834501173 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1834501169} + m_CullTransparentMesh: 0 +--- !u!224 &1834501174 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1834501169} + 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: 590774211} + m_Father: {fileID: 446700668} + 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: -9} + m_SizeDelta: {x: 166, y: 138} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1859079886 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} + m_Name: + m_EditorClassIdentifier: + mTarget: {fileID: 3078490422721459386} +--- !u!1 &1878251494 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1878251497} + - component: {fileID: 1878251496} + - component: {fileID: 1878251495} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1878251495 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1878251494} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 0.06132078, b: 0.06132078, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 45 + m_FontStyle: 3 + m_BestFit: 0 + m_MinSize: 2 + m_MaxSize: 45 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "8\u6298\u4FC3\u9500\u4E2D" +--- !u!222 &1878251496 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1878251494} + m_CullTransparentMesh: 0 +--- !u!224 &1878251497 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1878251494} + 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: 3078490422721459404} + m_RootOrder: 3 + 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: 539} + m_SizeDelta: {x: 500, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1909252255 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} + m_Name: + m_EditorClassIdentifier: + mTarget: {fileID: 3078490422721459391} +--- !u!114 &2044463369 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} + m_Name: + m_EditorClassIdentifier: + mTarget: {fileID: 3078490422721459382} --- !u!1001 &3078490422721459368 PrefabInstance: m_ObjectHideFlags: 0 @@ -1422,6 +1746,16 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 203041985587704423, guid: 667a93fb2929943078b944050cddd464, + type: 3} + propertyPath: m_videobutton + value: + objectReference: {fileID: 1834501170} + - target: {fileID: 203041985587704423, guid: 667a93fb2929943078b944050cddd464, + type: 3} + propertyPath: timetextObject + value: + objectReference: {fileID: 1878251495} - target: {fileID: 203041985727542568, guid: 667a93fb2929943078b944050cddd464, type: 3} propertyPath: m_AnchorMax.y @@ -1456,7 +1790,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 66e94660ac6f7de41a7a5c8fbe58fce6, + objectReference: {fileID: 21300000, guid: b439432c614c94c5b8a8569189ca794f, type: 3} - target: {fileID: 788033435718677201, guid: 667a93fb2929943078b944050cddd464, type: 3} @@ -1522,37 +1856,37 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: c7c9afad32a9e6a4d935b3469ba30dd9, + objectReference: {fileID: 21300000, guid: 6346e6c1153c5404bb15d16a26bd0ef3, type: 3} - target: {fileID: 1386000354375716278, guid: 667a93fb2929943078b944050cddd464, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: c7c9afad32a9e6a4d935b3469ba30dd9, + objectReference: {fileID: 21300000, guid: 6346e6c1153c5404bb15d16a26bd0ef3, type: 3} - target: {fileID: 1386000354625644315, guid: 667a93fb2929943078b944050cddd464, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: c7c9afad32a9e6a4d935b3469ba30dd9, + objectReference: {fileID: 21300000, guid: 6346e6c1153c5404bb15d16a26bd0ef3, type: 3} - target: {fileID: 1386000355740936666, guid: 667a93fb2929943078b944050cddd464, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: c7c9afad32a9e6a4d935b3469ba30dd9, + objectReference: {fileID: 21300000, guid: 6346e6c1153c5404bb15d16a26bd0ef3, type: 3} - target: {fileID: 1386000355848848321, guid: 667a93fb2929943078b944050cddd464, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: c7c9afad32a9e6a4d935b3469ba30dd9, + objectReference: {fileID: 21300000, guid: 6346e6c1153c5404bb15d16a26bd0ef3, type: 3} - target: {fileID: 1386000355901493505, guid: 667a93fb2929943078b944050cddd464, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: c7c9afad32a9e6a4d935b3469ba30dd9, + objectReference: {fileID: 21300000, guid: 6346e6c1153c5404bb15d16a26bd0ef3, type: 3} - target: {fileID: 1757697754891812348, guid: 667a93fb2929943078b944050cddd464, type: 3} @@ -1738,7 +2072,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: cb53b5ccd2d52784a86e49652e65aee7, + objectReference: {fileID: 21300000, guid: e3b6a72f824094cea83f59c2919c9b1f, type: 3} - target: {fileID: 3971030752033893388, guid: 667a93fb2929943078b944050cddd464, type: 3} @@ -1749,7 +2083,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 298367eae1e6abe40ad4a92148482dd8, + objectReference: {fileID: 21300000, guid: deeef3dcf68f1400cadb20c48776d6a8, type: 3} - target: {fileID: 4432729544473559518, guid: 667a93fb2929943078b944050cddd464, type: 3} @@ -1805,7 +2139,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 84efab5b8d1b5274cb7510ddcb5b2187, + objectReference: {fileID: 21300000, guid: 964751ea8e6aa443382d8f62cf8285c5, type: 3} - target: {fileID: 7296979764273611571, guid: 667a93fb2929943078b944050cddd464, type: 3} @@ -1816,29 +2150,31 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 0} + objectReference: {fileID: 21300000, guid: 5eb75316d66e5405fa8567c3d3ea3228, + type: 3} - target: {fileID: 8406322788165944276, guid: 667a93fb2929943078b944050cddd464, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 1ed7a6eade5a3af4c962706dec098104, + objectReference: {fileID: 21300000, guid: e83b46ee25b4b41669e0e18c63b3059e, type: 3} - target: {fileID: 8406322788187973465, guid: 667a93fb2929943078b944050cddd464, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 0} + objectReference: {fileID: 21300000, guid: 5eb75316d66e5405fa8567c3d3ea3228, + type: 3} - target: {fileID: 8406322788219638036, guid: 667a93fb2929943078b944050cddd464, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 1ed7a6eade5a3af4c962706dec098104, + objectReference: {fileID: 21300000, guid: e83b46ee25b4b41669e0e18c63b3059e, type: 3} - target: {fileID: 8406322788326259471, guid: 667a93fb2929943078b944050cddd464, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 1ed7a6eade5a3af4c962706dec098104, + objectReference: {fileID: 21300000, guid: e83b46ee25b4b41669e0e18c63b3059e, type: 3} - target: {fileID: 8406322788473649226, guid: 667a93fb2929943078b944050cddd464, type: 3} @@ -1864,18 +2200,19 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 0} + objectReference: {fileID: 21300000, guid: 5eb75316d66e5405fa8567c3d3ea3228, + type: 3} - target: {fileID: 8406322788681368102, guid: 667a93fb2929943078b944050cddd464, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 66e94660ac6f7de41a7a5c8fbe58fce6, + objectReference: {fileID: 21300000, guid: b439432c614c94c5b8a8569189ca794f, type: 3} - target: {fileID: 8406322788744466662, guid: 667a93fb2929943078b944050cddd464, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 66e94660ac6f7de41a7a5c8fbe58fce6, + objectReference: {fileID: 21300000, guid: b439432c614c94c5b8a8569189ca794f, type: 3} - target: {fileID: 8406322788756460263, guid: 667a93fb2929943078b944050cddd464, type: 3} @@ -1901,7 +2238,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 66e94660ac6f7de41a7a5c8fbe58fce6, + objectReference: {fileID: 21300000, guid: b439432c614c94c5b8a8569189ca794f, type: 3} - target: {fileID: 8406322789033660934, guid: 667a93fb2929943078b944050cddd464, type: 3} @@ -1947,7 +2284,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 66e94660ac6f7de41a7a5c8fbe58fce6, + objectReference: {fileID: 21300000, guid: b439432c614c94c5b8a8569189ca794f, type: 3} - target: {fileID: 8406322789344742992, guid: 667a93fb2929943078b944050cddd464, type: 3} @@ -1973,13 +2310,13 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 66e94660ac6f7de41a7a5c8fbe58fce6, + objectReference: {fileID: 21300000, guid: b439432c614c94c5b8a8569189ca794f, type: 3} - target: {fileID: 8406322789441811918, guid: 667a93fb2929943078b944050cddd464, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 1ed7a6eade5a3af4c962706dec098104, + objectReference: {fileID: 21300000, guid: e83b46ee25b4b41669e0e18c63b3059e, type: 3} - target: {fileID: 8406322789521831563, guid: 667a93fb2929943078b944050cddd464, type: 3} @@ -2005,35 +2342,38 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 0} + objectReference: {fileID: 21300000, guid: 5eb75316d66e5405fa8567c3d3ea3228, + type: 3} - target: {fileID: 8406322789691465571, guid: 667a93fb2929943078b944050cddd464, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 1ed7a6eade5a3af4c962706dec098104, + objectReference: {fileID: 21300000, guid: e83b46ee25b4b41669e0e18c63b3059e, type: 3} - target: {fileID: 8406322789845613550, guid: 667a93fb2929943078b944050cddd464, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 0} + objectReference: {fileID: 21300000, guid: 5eb75316d66e5405fa8567c3d3ea3228, + type: 3} - target: {fileID: 8406322789951364994, guid: 667a93fb2929943078b944050cddd464, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 1ed7a6eade5a3af4c962706dec098104, + objectReference: {fileID: 21300000, guid: e83b46ee25b4b41669e0e18c63b3059e, type: 3} - target: {fileID: 8406322789955138620, guid: 667a93fb2929943078b944050cddd464, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 66e94660ac6f7de41a7a5c8fbe58fce6, + objectReference: {fileID: 21300000, guid: b439432c614c94c5b8a8569189ca794f, type: 3} - target: {fileID: 8406322790122289935, guid: 667a93fb2929943078b944050cddd464, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 0} + objectReference: {fileID: 21300000, guid: 5eb75316d66e5405fa8567c3d3ea3228, + type: 3} - target: {fileID: 8977841923261503225, guid: 667a93fb2929943078b944050cddd464, type: 3} propertyPath: m_AnchorMax.x @@ -2467,3 +2807,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!224 &3078490422721459404 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 203041986298604490, guid: 667a93fb2929943078b944050cddd464, + type: 3} + m_PrefabInstance: {fileID: 3078490422721459368} + m_PrefabAsset: {fileID: 0} diff --git a/popcorn/Assets/MyGame/Scripts/CoinManager.cs b/popcorn/Assets/MyGame/Scripts/CoinManager.cs index 26d4c5f1..d617f474 100644 --- a/popcorn/Assets/MyGame/Scripts/CoinManager.cs +++ b/popcorn/Assets/MyGame/Scripts/CoinManager.cs @@ -25,7 +25,7 @@ public class CoinManager : SingletonMonoBehaviour [SerializeField] private RectTransform rootTransform; private int ownCoin; public int OwnCoin => ownCoin; - private string coinTextFormat = "{0}"; + private string coinTextFormat = "{0} "; void Awake(){ if(CheckInstance()) return ; diff --git a/popcorn/Assets/MyGame/Scripts/FooterManager.cs b/popcorn/Assets/MyGame/Scripts/FooterManager.cs index 6fea2ffc..6b3483b0 100644 --- a/popcorn/Assets/MyGame/Scripts/FooterManager.cs +++ b/popcorn/Assets/MyGame/Scripts/FooterManager.cs @@ -1,4 +1,6 @@ using System; +using System.Collections; +using System.Collections.Generic; using MyGame.Scripts; using UniRx; using UnityEngine; @@ -13,7 +15,9 @@ public class FooterManager : MonoBehaviour [SerializeField] private FooterButton saleButton; [SerializeField] private FooterButton productManagementButton; [SerializeField] private GameObject stockNotifyIcon; - + + [SerializeField] private GameObject fieldCornIcon; + private void Start() { if (!Enum.TryParse(SceneManager.GetActiveScene().name, out var currentSceneName)) @@ -47,6 +51,45 @@ public class FooterManager : MonoBehaviour JoypacAdManager.Instance.startSwitchPageTime(); } + // StartCoroutine(CornFull()); + + } + + float falshCorn = 0; + + private void Update() + { + falshCorn += Time.deltaTime; + if (falshCorn>=1) + { + falshCorn = 0; + CornFull(); + + } + } + + public void CornFull() + { + // example + var isFulled = true; + var gameData = GameDataManager.GameData; + foreach (var seedlingProgressData in gameData.SeedlingDataList) + { + foreach (var seedlingData in seedlingProgressData.Seedlings) + { + if (1f > DateTime.Now.Subtract(seedlingData.FirstTime).TotalSeconds / seedlingData.Period) + { + isFulled = false; + break; + } + } + } + + fieldCornIcon.SetActive(isFulled); + + // Debug.Log(isFulled); + + } } \ No newline at end of file diff --git a/popcorn/Assets/MyGame/Scripts/GameDataManager.cs b/popcorn/Assets/MyGame/Scripts/GameDataManager.cs index 466b430d..496a348a 100644 --- a/popcorn/Assets/MyGame/Scripts/GameDataManager.cs +++ b/popcorn/Assets/MyGame/Scripts/GameDataManager.cs @@ -438,8 +438,20 @@ public static class GameDataManager { Succeeded, } -// private static readonly int DiskFullTextId = 201; -// private static readonly int UnauthorizedAccessExceptionTextId = 202; + + public static long sale = -1; + // private static readonly int DiskFullTextId = 201; + // private static readonly int UnauthorizedAccessExceptionTextId = 202; + + public static long GetTimeStamp(DateTime dateTime) + { + DateTime _dtStart = new DateTime(1970, 1, 1, 8, 0, 0); + //10位的时间戳 + long timeStamp = Convert.ToInt32(dateTime.Subtract(_dtStart).TotalSeconds); + //13位的时间戳 + //long timeStamp = Convert.ToInt64(dateTime.Subtract(_dtStart).TotalMilliseconds); + return timeStamp; + } private static GameData dataCache = null; public static GameData GameData { diff --git a/popcorn/Assets/MyGame/Scripts/GetRewardDialog.cs b/popcorn/Assets/MyGame/Scripts/GetRewardDialog.cs index 5d642af8..5eb11858 100644 --- a/popcorn/Assets/MyGame/Scripts/GetRewardDialog.cs +++ b/popcorn/Assets/MyGame/Scripts/GetRewardDialog.cs @@ -15,7 +15,11 @@ namespace MyGame.Scripts CornField, IncreaseCustomer, PerfectPopcorn, - VipCustomer + VipCustomer, + Butter, + StrawBerry, + Sale + } private static readonly string OkCallbackTag = "GetRewardDialogOkCallbackTag"; private static readonly string CloseCallbackTag = "GetRewardDialogCloseCallbackTag"; @@ -39,6 +43,9 @@ namespace MyGame.Scripts [SerializeField] private GameObject fertilizerObject; [SerializeField] private GameObject publicityObject; [SerializeField] private GameObject vipObject; + + [SerializeField] private GameObject butterObject; + [SerializeField] private GameObject strawBerryObject; string position; private void Start() { @@ -94,6 +101,34 @@ namespace MyGame.Scripts JoypacAnalyticsManager.DesignEvent(StaticStringsEvent.Ad, StaticStringsEvent.Impression, position); SetButtonAction(closeButton, okButton, StaticStringsEvent.VIP);// AdManager.AD_PLACEMENT_VIP); break; + case RewardType.Butter: + normalWindow.SetActive(true); + movieObject.SetActive(true); + butterObject.SetActive(true); + messageText.text = "是否观看广告获得配方"; + //position = StaticStringsEvent.VIP; + //JoypacAnalyticsManager.DesignEvent(StaticStringsEvent.Ad, StaticStringsEvent.Impression, position); + SetButtonAction(closeButton, okButton, StaticStringsEvent.VIP);// AdManager.AD_PLACEMENT_VIP); + break; + case RewardType.StrawBerry: + normalWindow.SetActive(true); + movieObject.SetActive(true); + strawBerryObject.SetActive(true); + messageText.text = "是否观看广告获得配方"; + //position = StaticStringsEvent.VIP; + //JoypacAnalyticsManager.DesignEvent(StaticStringsEvent.Ad, StaticStringsEvent.Impression, position); + SetButtonAction(closeButton, okButton, StaticStringsEvent.VIP);// AdManager.AD_PLACEMENT_VIP); + break; + case RewardType.Sale: + normalWindow.SetActive(true); + movieObject.SetActive(true); + + messageText.text = "市集内每日12-13,18-19点会有8折促销，是否观看广告直接获取促销？"; + //position = StaticStringsEvent.VIP; + //JoypacAnalyticsManager.DesignEvent(StaticStringsEvent.Ad, StaticStringsEvent.Impression, position); + SetButtonAction(closeButton, okButton, StaticStringsEvent.VIP);// AdManager.AD_PLACEMENT_VIP); + break; + default: throw new ArgumentOutOfRangeException(); } @@ -172,5 +207,21 @@ namespace MyGame.Scripts { ShowDialog(RewardType.VipCustomer, okCallback, closeCallback); } + + public static void ShowButterDialog(Action okCallback = null, Action closeCallback = null) + { + ShowDialog(RewardType.Butter, okCallback, closeCallback); + } + + public static void ShowStrawBerryDialog(Action okCallback = null, Action closeCallback = null) + { + ShowDialog(RewardType.StrawBerry, okCallback, closeCallback); + } + + + public static void ShowSaleVideoDialog(Action okCallback = null, Action closeCallback = null) + { + ShowDialog(RewardType.Sale, okCallback, closeCallback); + } } } \ No newline at end of file