diff --git a/popcorn/Assets/MyGame/Resources/Material_en/title/title_logo_en.png b/popcorn/Assets/MyGame/Resources/Material_en/title/title_logo_en.png new file mode 100644 index 00000000..b46c874f Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Material_en/title/title_logo_en.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_en/title/title_logo_en.png.meta b/popcorn/Assets/MyGame/Resources/Material_en/title/title_logo_en.png.meta new file mode 100644 index 00000000..c9127b5e --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_en/title/title_logo_en.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: 0d3eeb8df334169418402320dedce3f7 +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/AutomaticCookingComplete.unity b/popcorn/Assets/MyGame/Scenes/Main/AutomaticCookingComplete.unity index c5ba9ae5..afc8f406 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/AutomaticCookingComplete.unity +++ b/popcorn/Assets/MyGame/Scenes/Main/AutomaticCookingComplete.unity @@ -661,7 +661,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: eca7336de7c3f644599b5015fe89f168, type: 3} + m_Sprite: {fileID: 21300000, guid: b8ad8d53e7a334143ae4fc6b507549b4, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -776,7 +776,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 8aea6767956ae9342abeb93a801218c5, type: 3} + m_Sprite: {fileID: 21300000, guid: 7b9f4b6377671b5479597672719d19bc, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -873,7 +873,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} m_AnchoredPosition: {x: 148, y: -373} - m_SizeDelta: {x: 240, y: 110} + m_SizeDelta: {x: 240, y: 130} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &406579701 MonoBehaviour: @@ -1159,7 +1159,7 @@ RectTransform: m_GameObject: {fileID: 677856731} 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_LocalScale: {x: 1.3, y: 1.3, z: 1.3} m_Children: [] m_Father: {fileID: 406579700} m_RootOrder: 0 @@ -1167,7 +1167,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 1, y: 4} - m_SizeDelta: {x: 108, y: 40} + m_SizeDelta: {x: 122, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &677856733 MonoBehaviour: @@ -1188,7 +1188,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 859db30fafea43a49b6f7440affcf4ca, type: 3} + m_Sprite: {fileID: 21300000, guid: a4ae18b6aed1eb94dbbc5664789c4c8a, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -2323,7 +2323,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} m_AnchoredPosition: {x: -147, y: -373} - m_SizeDelta: {x: 240, y: 110} + m_SizeDelta: {x: 240, y: 130} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1530405765 MonoBehaviour: @@ -3696,7 +3696,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 131c154b52b5f4043aaecbcd66473abe, type: 3} + m_Sprite: {fileID: 21300000, guid: 8bf552a8c07aeb947ba7ea13f68e9e63, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 diff --git a/popcorn/Assets/MyGame/Scenes/Main/AutomaticCookingMovie.unity b/popcorn/Assets/MyGame/Scenes/Main/AutomaticCookingMovie.unity index e7c0edd0..bee46592 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/AutomaticCookingMovie.unity +++ b/popcorn/Assets/MyGame/Scenes/Main/AutomaticCookingMovie.unity @@ -342,8 +342,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 104.99996, y: -41} - m_SizeDelta: {x: 140, y: 50} + m_AnchoredPosition: {x: 137.99997, y: -38} + m_SizeDelta: {x: 160, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &252133241 MonoBehaviour: @@ -460,7 +460,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 297.00003, y: 1} - m_SizeDelta: {x: 200, y: 74} + m_SizeDelta: {x: 240, y: 74} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &369996024 MonoBehaviour: @@ -534,7 +534,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -83, y: -0.00007247925} + m_AnchoredPosition: {x: -111, y: -0.00007247925} m_SizeDelta: {x: 600, y: 67.5} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &445717700 @@ -654,7 +654,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 297, y: 1} - m_SizeDelta: {x: 200, y: 74} + m_SizeDelta: {x: 240, y: 74} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &497376572 MonoBehaviour: @@ -1016,8 +1016,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -89, y: -30.000103} - m_SizeDelta: {x: 600, y: 6} + m_AnchoredPosition: {x: -99, y: -30.000103} + m_SizeDelta: {x: 630, y: 6} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &617186344 MonoBehaviour: @@ -1264,8 +1264,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 104.99996, y: -41} - m_SizeDelta: {x: 140, y: 50} + m_AnchoredPosition: {x: 137.99997, y: -38} + m_SizeDelta: {x: 160, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &739094530 MonoBehaviour: @@ -1380,8 +1380,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -89, y: -30.000103} - m_SizeDelta: {x: 600, y: 6} + m_AnchoredPosition: {x: -99, y: -30.000103} + m_SizeDelta: {x: 630, y: 6} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1059000513 MonoBehaviour: @@ -1455,7 +1455,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -83, y: -0.00007247925} + m_AnchoredPosition: {x: -111, y: -0.00007247925} m_SizeDelta: {x: 600, y: 67.5} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1165270082 @@ -1576,8 +1576,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: -159, y: 114.00003} - m_SizeDelta: {x: 206, y: 130} + m_AnchoredPosition: {x: -186, y: 114.00003} + m_SizeDelta: {x: 250, y: 130} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1177471512 MonoBehaviour: @@ -1827,7 +1827,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: -59} - m_SizeDelta: {x: 820, y: 400} + m_SizeDelta: {x: 860, y: 400} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1228675119 MonoBehaviour: @@ -1994,8 +1994,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -89, y: -30.000103} - m_SizeDelta: {x: 600, y: 6} + m_AnchoredPosition: {x: -99, y: -30.000103} + m_SizeDelta: {x: 630, y: 6} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1330781664 MonoBehaviour: @@ -2068,8 +2068,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 109.000015, y: -40} - m_SizeDelta: {x: 140, y: 50} + m_AnchoredPosition: {x: 142.00002, y: -37} + m_SizeDelta: {x: 160, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1355556012 MonoBehaviour: @@ -2222,8 +2222,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 105, y: -41} - m_SizeDelta: {x: 140, y: 50} + m_AnchoredPosition: {x: 138, y: -38} + m_SizeDelta: {x: 160, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1393575076 MonoBehaviour: @@ -2510,7 +2510,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 297, y: 1} - m_SizeDelta: {x: 200, y: 74} + m_SizeDelta: {x: 240, y: 74} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1643570443 MonoBehaviour: @@ -2658,7 +2658,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -83, y: -0.00007247925} + m_AnchoredPosition: {x: -111, y: -0.00007247925} m_SizeDelta: {x: 600, y: 67.5} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1667839400 @@ -2778,7 +2778,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 297, y: 1} - m_SizeDelta: {x: 200, y: 74} + m_SizeDelta: {x: 240, y: 74} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1676166303 MonoBehaviour: @@ -2969,7 +2969,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 140, y: 114} + m_AnchoredPosition: {x: 174, y: 114} m_SizeDelta: {x: 250, y: 130} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1725004923 @@ -3103,7 +3103,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -83, y: -0.00007247925} + m_AnchoredPosition: {x: -111, y: -0.00007247925} m_SizeDelta: {x: 600, y: 67.5} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1771385232 @@ -3221,7 +3221,7 @@ RectTransform: 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: 870, y: 900} + m_SizeDelta: {x: 910, y: 900} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1828954259 MonoBehaviour: @@ -3715,8 +3715,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -89, y: -30.000103} - m_SizeDelta: {x: 600, y: 6} + m_AnchoredPosition: {x: -99, y: -30.000103} + m_SizeDelta: {x: 630, y: 6} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2100577140 MonoBehaviour: diff --git a/popcorn/Assets/MyGame/Scenes/Main/Information.unity b/popcorn/Assets/MyGame/Scenes/Main/Information.unity index 72294d0d..29af70f4 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Information.unity +++ b/popcorn/Assets/MyGame/Scenes/Main/Information.unity @@ -416,12 +416,12 @@ PrefabInstance: - target: {fileID: 41559837514718277, guid: b9106333bdbe2421486d8af844a9b8cb, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 41559837514718277, guid: b9106333bdbe2421486d8af844a9b8cb, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 41559837514718277, guid: b9106333bdbe2421486d8af844a9b8cb, type: 3} @@ -436,12 +436,12 @@ PrefabInstance: - target: {fileID: 41559837514718277, guid: b9106333bdbe2421486d8af844a9b8cb, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -153 objectReference: {fileID: 0} - target: {fileID: 1398728378518018609, guid: b9106333bdbe2421486d8af844a9b8cb, type: 3} propertyPath: m_Text - value: Until the next level up + value: "\u6B21\u306E\u30EC\u30D9\u30EB\u30A2\u30C3\u30D7\u307E\u3067" objectReference: {fileID: 0} - target: {fileID: 1398728378518018609, guid: b9106333bdbe2421486d8af844a9b8cb, type: 3} @@ -467,12 +467,12 @@ PrefabInstance: - target: {fileID: 2283608498504545933, guid: b9106333bdbe2421486d8af844a9b8cb, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2283608498504545933, guid: b9106333bdbe2421486d8af844a9b8cb, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2283608498504545933, guid: b9106333bdbe2421486d8af844a9b8cb, type: 3} @@ -487,17 +487,17 @@ PrefabInstance: - target: {fileID: 2283608498504545933, guid: b9106333bdbe2421486d8af844a9b8cb, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -153 objectReference: {fileID: 0} - target: {fileID: 2306676429090080402, guid: b9106333bdbe2421486d8af844a9b8cb, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2306676429090080402, guid: b9106333bdbe2421486d8af844a9b8cb, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2306676429090080402, guid: b9106333bdbe2421486d8af844a9b8cb, type: 3} @@ -512,7 +512,7 @@ PrefabInstance: - target: {fileID: 2306676429090080402, guid: b9106333bdbe2421486d8af844a9b8cb, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -63.6 objectReference: {fileID: 0} - target: {fileID: 2523338578469946763, guid: b9106333bdbe2421486d8af844a9b8cb, type: 3} @@ -572,7 +572,7 @@ PrefabInstance: - target: {fileID: 3337121566302665231, guid: b9106333bdbe2421486d8af844a9b8cb, type: 3} propertyPath: m_Text - value: Appearance level + value: "\u5916\u89B3\u30EC\u30D9\u30EB" objectReference: {fileID: 0} - target: {fileID: 3337121566302665231, guid: b9106333bdbe2421486d8af844a9b8cb, type: 3} @@ -603,7 +603,7 @@ PrefabInstance: - target: {fileID: 4667112470385182661, guid: b9106333bdbe2421486d8af844a9b8cb, type: 3} propertyPath: m_Text - value: Until the next level up + value: "\u6B21\u306E\u30EC\u30D9\u30EB\u30A2\u30C3\u30D7\u307E\u3067" objectReference: {fileID: 0} - target: {fileID: 4667112470385182661, guid: b9106333bdbe2421486d8af844a9b8cb, type: 3} @@ -685,7 +685,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 642d7890c10bfa0478e326098a66b501, + objectReference: {fileID: 21300000, guid: e767ec50f908d8e479795778a522ffd4, type: 3} - target: {fileID: 6859128400999920012, guid: b9106333bdbe2421486d8af844a9b8cb, type: 3} @@ -772,7 +772,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: d80ae6dbbc9b0654f8da51babec80fd4, + objectReference: {fileID: 21300000, guid: 8c5b93ebfbed4964780f2d5137acb342, type: 3} - target: {fileID: 6859128401135470825, guid: b9106333bdbe2421486d8af844a9b8cb, type: 3} @@ -887,7 +887,7 @@ PrefabInstance: - target: {fileID: 6859128401308582515, guid: b9106333bdbe2421486d8af844a9b8cb, type: 3} propertyPath: m_SizeDelta.x - value: 895 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6859128401308582515, guid: b9106333bdbe2421486d8af844a9b8cb, type: 3} @@ -897,7 +897,7 @@ PrefabInstance: - target: {fileID: 6859128401308582515, guid: b9106333bdbe2421486d8af844a9b8cb, type: 3} propertyPath: m_AnchoredPosition.x - value: 447.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6859128401308582515, guid: b9106333bdbe2421486d8af844a9b8cb, type: 3} @@ -928,7 +928,7 @@ PrefabInstance: - target: {fileID: 6859128401342021930, guid: b9106333bdbe2421486d8af844a9b8cb, type: 3} propertyPath: m_SizeDelta.x - value: 895 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6859128401342021930, guid: b9106333bdbe2421486d8af844a9b8cb, type: 3} @@ -938,7 +938,7 @@ PrefabInstance: - target: {fileID: 6859128401342021930, guid: b9106333bdbe2421486d8af844a9b8cb, type: 3} propertyPath: m_AnchoredPosition.x - value: 447.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6859128401342021930, guid: b9106333bdbe2421486d8af844a9b8cb, type: 3} @@ -1015,7 +1015,7 @@ PrefabInstance: - target: {fileID: 6859128401682711732, guid: b9106333bdbe2421486d8af844a9b8cb, type: 3} propertyPath: m_Text - value: level + value: "\u30EC\u30D9\u30EB" objectReference: {fileID: 0} - target: {fileID: 6859128401682711732, guid: b9106333bdbe2421486d8af844a9b8cb, type: 3} @@ -1091,7 +1091,7 @@ PrefabInstance: - target: {fileID: 6859128401939500947, guid: b9106333bdbe2421486d8af844a9b8cb, type: 3} propertyPath: m_Text - value: Until the next level up + value: "\u6B21\u306E\u30EC\u30D9\u30EB\u30A2\u30C3\u30D7\u307E\u3067" objectReference: {fileID: 0} - target: {fileID: 6859128401939500947, guid: b9106333bdbe2421486d8af844a9b8cb, type: 3} @@ -1122,7 +1122,7 @@ PrefabInstance: - target: {fileID: 6859128401988334834, guid: b9106333bdbe2421486d8af844a9b8cb, type: 3} propertyPath: m_Text - value: Product inventory + value: "\u5546\u54C1\u5728\u5EAB" objectReference: {fileID: 0} - target: {fileID: 6859128401988334834, guid: b9106333bdbe2421486d8af844a9b8cb, type: 3} @@ -1171,10 +1171,16 @@ PrefabInstance: value: objectReference: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} + - target: {fileID: 6859128402129278095, guid: b9106333bdbe2421486d8af844a9b8cb, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 228e97c36df207b479c719c18e978e62, + type: 3} - target: {fileID: 6859128402130815625, guid: b9106333bdbe2421486d8af844a9b8cb, type: 3} propertyPath: m_Text - value: title + value: "\u79F0\u53F7" objectReference: {fileID: 0} - target: {fileID: 6859128402130815625, guid: b9106333bdbe2421486d8af844a9b8cb, type: 3} @@ -1195,7 +1201,7 @@ PrefabInstance: - target: {fileID: 6859128402165333294, guid: b9106333bdbe2421486d8af844a9b8cb, type: 3} propertyPath: m_SizeDelta.x - value: 895 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6859128402165333294, guid: b9106333bdbe2421486d8af844a9b8cb, type: 3} @@ -1205,7 +1211,7 @@ PrefabInstance: - target: {fileID: 6859128402165333294, guid: b9106333bdbe2421486d8af844a9b8cb, type: 3} propertyPath: m_AnchoredPosition.x - value: 447.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6859128402165333294, guid: b9106333bdbe2421486d8af844a9b8cb, type: 3} @@ -1216,7 +1222,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: eca7336de7c3f644599b5015fe89f168, + objectReference: {fileID: 21300000, guid: b8ad8d53e7a334143ae4fc6b507549b4, type: 3} - target: {fileID: 6859128402297305239, guid: b9106333bdbe2421486d8af844a9b8cb, type: 3} @@ -1236,7 +1242,7 @@ PrefabInstance: - target: {fileID: 6859128402301004802, guid: b9106333bdbe2421486d8af844a9b8cb, type: 3} propertyPath: m_Text - value: Material inventory + value: "\u6750\u6599\u5728\u5EAB" objectReference: {fileID: 0} - target: {fileID: 6859128402301004802, guid: b9106333bdbe2421486d8af844a9b8cb, type: 3} @@ -1248,7 +1254,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 092db4cbbfd9f4541bef11fc1880ff8f, + objectReference: {fileID: 21300000, guid: 228e97c36df207b479c719c18e978e62, type: 3} - target: {fileID: 6859128402360749161, guid: b9106333bdbe2421486d8af844a9b8cb, type: 3} @@ -1378,7 +1384,7 @@ PrefabInstance: - target: {fileID: 6859128402411520440, guid: b9106333bdbe2421486d8af844a9b8cb, type: 3} propertyPath: m_Text - value: Store level + value: "\u5E97\u8217\u30EC\u30D9\u30EB" objectReference: {fileID: 0} - target: {fileID: 6859128402411520440, guid: b9106333bdbe2421486d8af844a9b8cb, type: 3} @@ -1455,7 +1461,7 @@ PrefabInstance: - target: {fileID: 7037845673517582736, guid: b9106333bdbe2421486d8af844a9b8cb, type: 3} propertyPath: m_Text - value: Automatic cooking level + value: "\u81EA\u52D5\u8ABF\u7406\u30EC\u30D9\u30EB" objectReference: {fileID: 0} - target: {fileID: 8427328856812647918, guid: b9106333bdbe2421486d8af844a9b8cb, type: 3} diff --git a/popcorn/Assets/MyGame/Scenes/Main/Mission.unity b/popcorn/Assets/MyGame/Scenes/Main/Mission.unity index 7f520942..d4be990a 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Mission.unity +++ b/popcorn/Assets/MyGame/Scenes/Main/Mission.unity @@ -214,7 +214,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: ff32278fa02ebbe4aab807a618d780f1, + objectReference: {fileID: 21300000, guid: a9e961473b18e3248b466d48987ac4b2, type: 3} - target: {fileID: 1742302645900268983, guid: 66c0408cd45e7422cb6d59d2bdf4e998, type: 3} @@ -353,11 +353,16 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 2660639678406526124, guid: 66c0408cd45e7422cb6d59d2bdf4e998, + type: 3} + propertyPath: m_SizeDelta.x + value: 166 + objectReference: {fileID: 0} - target: {fileID: 2660639678406526125, guid: 66c0408cd45e7422cb6d59d2bdf4e998, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 8313e9dcb68d05b48a314fcb0ed387fd, + objectReference: {fileID: 21300000, guid: ef9da11b0701dad4da6424299fc9aa92, type: 3} - target: {fileID: 2660639678456833894, guid: 66c0408cd45e7422cb6d59d2bdf4e998, type: 3} @@ -394,13 +399,13 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: eca7336de7c3f644599b5015fe89f168, + objectReference: {fileID: 21300000, guid: b8ad8d53e7a334143ae4fc6b507549b4, type: 3} - target: {fileID: 2660639678752994312, guid: 66c0408cd45e7422cb6d59d2bdf4e998, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 8313e9dcb68d05b48a314fcb0ed387fd, + objectReference: {fileID: 21300000, guid: ef9da11b0701dad4da6424299fc9aa92, type: 3} - target: {fileID: 2660639679000795571, guid: 66c0408cd45e7422cb6d59d2bdf4e998, type: 3} @@ -426,7 +431,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 49fd28526ab9a8c428a93e66a2bf760d, + objectReference: {fileID: 21300000, guid: 3637e2158d7e58745b60a579180459cf, type: 3} - target: {fileID: 2660639679025358539, guid: 66c0408cd45e7422cb6d59d2bdf4e998, type: 3} @@ -562,13 +567,13 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: ff32278fa02ebbe4aab807a618d780f1, + objectReference: {fileID: 21300000, guid: a9e961473b18e3248b466d48987ac4b2, type: 3} - target: {fileID: 3338528259637188169, guid: 66c0408cd45e7422cb6d59d2bdf4e998, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: ff32278fa02ebbe4aab807a618d780f1, + objectReference: {fileID: 21300000, guid: a9e961473b18e3248b466d48987ac4b2, type: 3} - target: {fileID: 3338528259869159787, guid: 66c0408cd45e7422cb6d59d2bdf4e998, type: 3} @@ -634,7 +639,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: ff32278fa02ebbe4aab807a618d780f1, + objectReference: {fileID: 21300000, guid: a9e961473b18e3248b466d48987ac4b2, type: 3} - target: {fileID: 4606433577286798635, guid: 66c0408cd45e7422cb6d59d2bdf4e998, type: 3} @@ -762,6 +767,31 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 66c0408cd45e7422cb6d59d2bdf4e998, type: 3} +--- !u!114 &55686910 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 2660639678406526125, guid: 66c0408cd45e7422cb6d59d2bdf4e998, + type: 3} + m_PrefabInstance: {fileID: 55686909} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &434476094 +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: 55686910} --- !u!114 &535073476 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/Information/Canvas.prefab b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/Information/Canvas.prefab index 539e6667..e919c8ed 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/Information/Canvas.prefab +++ b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/Information/Canvas.prefab @@ -968,7 +968,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: Appearance level + m_Text: "\u5916\u89B3\u30EC\u30D9\u30EB" --- !u!114 &5449134050274049995 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1236,7 +1236,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: Until the next level up + m_Text: "\u6B21\u306E\u30EC\u30D9\u30EB\u30A2\u30C3\u30D7\u307E\u3067" --- !u!114 &2879166960840634929 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1354,7 +1354,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: Until the next level up + m_Text: "\u6B21\u306E\u30EC\u30D9\u30EB\u30A2\u30C3\u30D7\u307E\u3067" --- !u!114 &5992511198008917351 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1459,7 +1459,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 642d7890c10bfa0478e326098a66b501, type: 3} + m_Sprite: {fileID: 21300000, guid: e767ec50f908d8e479795778a522ffd4, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -2425,7 +2425,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: d80ae6dbbc9b0654f8da51babec80fd4, type: 3} + m_Sprite: {fileID: 21300000, guid: 8c5b93ebfbed4964780f2d5137acb342, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -4248,7 +4248,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: level + m_Text: "\u30EC\u30D9\u30EB" --- !u!114 &1329620037901453848 MonoBehaviour: m_ObjectHideFlags: 0 @@ -4599,7 +4599,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: Until the next level up + m_Text: "\u6B21\u306E\u30EC\u30D9\u30EB\u30A2\u30C3\u30D7\u307E\u3067" --- !u!114 &6089248131259734773 MonoBehaviour: m_ObjectHideFlags: 0 @@ -4792,7 +4792,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: Product inventory + m_Text: "\u5546\u54C1\u5728\u5EAB" --- !u!114 &7038237413740392644 MonoBehaviour: m_ObjectHideFlags: 0 @@ -5244,7 +5244,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 092db4cbbfd9f4541bef11fc1880ff8f, type: 3} + m_Sprite: {fileID: 21300000, guid: 228e97c36df207b479c719c18e978e62, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -5372,7 +5372,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: title + m_Text: "\u79F0\u53F7" --- !u!114 &862529373831645307 MonoBehaviour: m_ObjectHideFlags: 0 @@ -5673,7 +5673,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: eca7336de7c3f644599b5015fe89f168, type: 3} + m_Sprite: {fileID: 21300000, guid: b8ad8d53e7a334143ae4fc6b507549b4, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -6039,7 +6039,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: Material inventory + m_Text: "\u6750\u6599\u5728\u5EAB" --- !u!114 &2317717004034477971 MonoBehaviour: m_ObjectHideFlags: 0 @@ -6144,7 +6144,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 092db4cbbfd9f4541bef11fc1880ff8f, type: 3} + m_Sprite: {fileID: 21300000, guid: 228e97c36df207b479c719c18e978e62, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -6586,7 +6586,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: Store level + m_Text: "\u5E97\u8217\u30EC\u30D9\u30EB" --- !u!114 &1113115768491845702 MonoBehaviour: m_ObjectHideFlags: 0 @@ -8121,7 +8121,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: Automatic cooking level + m_Text: "\u81EA\u52D5\u8ABF\u7406\u30EC\u30D9\u30EB" --- !u!114 &7515969663285405202 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Canvas.prefab b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Canvas.prefab index 018fd3b9..e5c8505e 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Canvas.prefab +++ b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Canvas.prefab @@ -1648,7 +1648,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 43, y: 473} + m_AnchoredPosition: {x: 53, y: 473} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &4251265789366133276 @@ -2241,7 +2241,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 13} m_SizeDelta: {x: 300, y: 202} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4400287271111670875 @@ -2507,7 +2507,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 43, y: 684} + m_AnchoredPosition: {x: 53, y: 684} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &512143980313251866 diff --git a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Mission/MissionCanvas.prefab b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Mission/MissionCanvas.prefab index 14929408..12f17e01 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Mission/MissionCanvas.prefab +++ b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Mission/MissionCanvas.prefab @@ -1224,7 +1224,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: -7.1} - m_SizeDelta: {x: 88, y: 44} + m_SizeDelta: {x: 166, y: 44} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2660639678406526114 CanvasRenderer: @@ -1253,7 +1253,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 8313e9dcb68d05b48a314fcb0ed387fd, type: 3} + m_Sprite: {fileID: 21300000, guid: ef9da11b0701dad4da6424299fc9aa92, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -1613,7 +1613,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: eca7336de7c3f644599b5015fe89f168, type: 3} + m_Sprite: {fileID: 21300000, guid: b8ad8d53e7a334143ae4fc6b507549b4, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -1699,7 +1699,7 @@ RectTransform: 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: 88, y: 44} + m_SizeDelta: {x: 166, y: 44} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2660639678752994313 CanvasRenderer: @@ -1728,7 +1728,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 8313e9dcb68d05b48a314fcb0ed387fd, type: 3} + m_Sprite: {fileID: 21300000, guid: ef9da11b0701dad4da6424299fc9aa92, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -2190,7 +2190,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 49fd28526ab9a8c428a93e66a2bf760d, type: 3} + m_Sprite: {fileID: 21300000, guid: 3637e2158d7e58745b60a579180459cf, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -2769,7 +2769,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: ff32278fa02ebbe4aab807a618d780f1, + objectReference: {fileID: 21300000, guid: a9e961473b18e3248b466d48987ac4b2, type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 1559aa4b9e5d85c46ae00275092f8d28, type: 3} @@ -3041,7 +3041,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: ff32278fa02ebbe4aab807a618d780f1, + objectReference: {fileID: 21300000, guid: a9e961473b18e3248b466d48987ac4b2, type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 1559aa4b9e5d85c46ae00275092f8d28, type: 3} @@ -3182,7 +3182,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: ff32278fa02ebbe4aab807a618d780f1, + objectReference: {fileID: 21300000, guid: a9e961473b18e3248b466d48987ac4b2, type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 1559aa4b9e5d85c46ae00275092f8d28, type: 3} @@ -3339,7 +3339,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: ff32278fa02ebbe4aab807a618d780f1, + objectReference: {fileID: 21300000, guid: a9e961473b18e3248b466d48987ac4b2, type: 3} - target: {fileID: 8610769905762339287, guid: 5efec1563da076e43b72d4631cb86748, type: 3} diff --git a/popcorn/Assets/MyGame/Scenes/marketing/CustomizeExplanation.unity b/popcorn/Assets/MyGame/Scenes/marketing/CustomizeExplanation.unity index 62d8a7aa..f9d1d3f2 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/CustomizeExplanation.unity +++ b/popcorn/Assets/MyGame/Scenes/marketing/CustomizeExplanation.unity @@ -178,7 +178,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: a55e3686a65a4f041806756c0ac1802f, type: 3} + m_Sprite: {fileID: 21300000, guid: c6689bcf32023ee4e8eccc786b0d615b, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -608,7 +608,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 4} - m_SizeDelta: {x: 104, y: 36} + m_SizeDelta: {x: 88, y: 36} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1054852494 MonoBehaviour: @@ -669,7 +669,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: b38a4686c052f1248bc3219f1b45d074, type: 3} + m_Sprite: {fileID: 21300000, guid: f3a0ccdabb17f2244abcb3798b5b589e, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -925,7 +925,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 3473d177df7162c4c970c5695334adee, type: 3} + m_Sprite: {fileID: 21300000, guid: 5e43fecf5be6a604baf871877445d4a4, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 diff --git a/popcorn/Assets/MyGame/Scenes/marketing/PopcornDescription.unity b/popcorn/Assets/MyGame/Scenes/marketing/PopcornDescription.unity index 7f27a1c7..0b3e975c 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/PopcornDescription.unity +++ b/popcorn/Assets/MyGame/Scenes/marketing/PopcornDescription.unity @@ -282,7 +282,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: c800e5dc66b627440baae66a99b1b7af, + objectReference: {fileID: 21300000, guid: 409c5760e22df3a4b9dab699899fb95c, type: 3} - target: {fileID: 3856012875358022744, guid: 6592613d31e034734bea16833d6345c1, type: 3} @@ -398,7 +398,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: b38a4686c052f1248bc3219f1b45d074, + objectReference: {fileID: 21300000, guid: f3a0ccdabb17f2244abcb3798b5b589e, type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 6592613d31e034734bea16833d6345c1, type: 3} diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Description.prefab b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Description.prefab index 79784660..00561634 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Description.prefab +++ b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Description.prefab @@ -813,7 +813,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: c800e5dc66b627440baae66a99b1b7af, type: 3} + m_Sprite: {fileID: 21300000, guid: 409c5760e22df3a4b9dab699899fb95c, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -1519,7 +1519,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: b38a4686c052f1248bc3219f1b45d074, type: 3} + m_Sprite: {fileID: 21300000, guid: f3a0ccdabb17f2244abcb3798b5b589e, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/MainCanvas.prefab b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/MainCanvas.prefab index 17d8142a..10487972 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/MainCanvas.prefab +++ b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/MainCanvas.prefab @@ -153,7 +153,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1.25 - m_Text: 'Buy for a while the number of customers will increase a little. ' + m_Text: "\u3057\u3070\u3089\u304F\u306E\u9593\u8CFC\u5165\u3059\u308B\n\u304A\u5BA2\u3055\u3093\u304C\u5C11\u3057\u5897\u3048\u308B\u3088" --- !u!114 &1424299160027476878 MonoBehaviour: m_ObjectHideFlags: 0 @@ -563,7 +563,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 6} - m_SizeDelta: {x: 94, y: 60} + m_SizeDelta: {x: 208, y: 52} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7492023257525246333 CanvasRenderer: @@ -592,7 +592,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: f77db180669d8d8498c46fd384ec7eb5, type: 3} + m_Sprite: {fileID: 21300000, guid: aac62235e8d499d4f8c23e2f10a05471, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -678,7 +678,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 89} - m_SizeDelta: {x: 616, y: 62} + m_SizeDelta: {x: 850, y: 54} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4788906835824280238 CanvasRenderer: @@ -707,7 +707,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 1c7e8cdb0de6a264f97b8293ae966aaa, type: 3} + m_Sprite: {fileID: 21300000, guid: ed8b1627a2d343c43a520c5c0496cf82, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -1580,7 +1580,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 24a163350f08e6d4882db9553b6b61be, type: 3} + m_Sprite: {fileID: 21300000, guid: eca622205a7dc214384aad3d918584bd, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -1740,7 +1740,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 6} - m_SizeDelta: {x: 94, y: 60} + m_SizeDelta: {x: 208, y: 52} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1104163593313499312 CanvasRenderer: @@ -1769,7 +1769,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 6061bfd9050f0cb45ae2048806344bc9, type: 3} + m_Sprite: {fileID: 21300000, guid: 25e87dbf8c9dca34884b8267401b0a2a, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -2578,13 +2578,13 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 9a303fa5c88e7514899e198b7ab9f3c7, + objectReference: {fileID: 21300000, guid: 5669304b3d9643b489cc2f08d1699160, type: 3} - target: {fileID: 6124127957932188848, guid: b24d8537ddbd94882ad379e4b679f044, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 453f23d8b60e90c49ba4ee8dce2ed6a4, + objectReference: {fileID: 21300000, guid: df514f23fcba2fa4d98da9b371c8b77f, type: 3} - target: {fileID: 6124127957932188863, guid: b24d8537ddbd94882ad379e4b679f044, type: 3} @@ -2605,7 +2605,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: ce6b0855c1bd2444b978789370886494, + objectReference: {fileID: 21300000, guid: 39d00b01cf9866c449ee01e331f4a52b, type: 3} - target: {fileID: 6124127958415964740, guid: b24d8537ddbd94882ad379e4b679f044, type: 3} diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/TankList.prefab b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/TankList.prefab index 3e22861f..cb04216a 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/TankList.prefab +++ b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/TankList.prefab @@ -625,7 +625,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 9a303fa5c88e7514899e198b7ab9f3c7, type: 3} + m_Sprite: {fileID: 21300000, guid: 5669304b3d9643b489cc2f08d1699160, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -711,7 +711,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 440} - m_SizeDelta: {x: 564, y: 62} + m_SizeDelta: {x: 740, y: 58} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6124127957932188849 CanvasRenderer: @@ -740,7 +740,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 453f23d8b60e90c49ba4ee8dce2ed6a4, type: 3} + m_Sprite: {fileID: 21300000, guid: df514f23fcba2fa4d98da9b371c8b77f, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -855,7 +855,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: ce6b0855c1bd2444b978789370886494, type: 3} + m_Sprite: {fileID: 21300000, guid: 39d00b01cf9866c449ee01e331f4a52b, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/TastingWindow.prefab b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/TastingWindow.prefab index c92a2200..fd640ccd 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/TastingWindow.prefab +++ b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/TastingWindow.prefab @@ -204,7 +204,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1.3 - m_Text: You can quickly empty the popcorn in the tank. You won't get coins or hearts + m_Text: "\u30BF\u30F3\u30AF\u5185\u306E\u30DD\u30C3\u30D7\u30B3\u30FC\u30F3\u3092\u3059\u3050\u306B\u7A7A\u306B\u3067\u304D\u308B\u3088\n\u30B3\u30A4\u30F3\u3084\u30CF\u30FC\u30C8\u306F\u3082\u3089\u3048\u306A\u3044\u3088" --- !u!114 &7887033067418340973 MonoBehaviour: m_ObjectHideFlags: 0 @@ -593,7 +593,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: b076997e576de06458f8b751a3e0de4b, type: 3} + m_Sprite: {fileID: 21300000, guid: c48bf96df0daa8840893d8b46010f597, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -1265,7 +1265,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: eca7336de7c3f644599b5015fe89f168, type: 3} + m_Sprite: {fileID: 21300000, guid: b8ad8d53e7a334143ae4fc6b507549b4, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -1911,7 +1911,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 7} - m_SizeDelta: {x: 94, y: 60} + m_SizeDelta: {x: 208, y: 52} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5089467468128331484 CanvasRenderer: @@ -1940,7 +1940,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: f77db180669d8d8498c46fd384ec7eb5, type: 3} + m_Sprite: {fileID: 21300000, guid: aac62235e8d499d4f8c23e2f10a05471, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 diff --git a/popcorn/Assets/MyGame/Scenes/marketing/ProductManagement.unity b/popcorn/Assets/MyGame/Scenes/marketing/ProductManagement.unity index d5f2139d..d67b58b1 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/ProductManagement.unity +++ b/popcorn/Assets/MyGame/Scenes/marketing/ProductManagement.unity @@ -121,19 +121,6 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} ---- !u!114 &43443522 -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: 1760930532} --- !u!1 &189791791 GameObject: m_ObjectHideFlags: 0 @@ -208,19 +195,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 189791791} m_CullTransparentMesh: 0 ---- !u!114 &204071331 -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: 1139655502} --- !u!1001 &219610911 PrefabInstance: m_ObjectHideFlags: 0 @@ -245,7 +219,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 343e01e697ec23142a0a67e3fe7a64fb, + objectReference: {fileID: 21300000, guid: 88b678672e5bca548bedbae7386e4346, type: 3} - target: {fileID: 566248750470715636, guid: caaa748dbeed576499e8cae74d33f689, type: 3} @@ -386,13 +360,13 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 8d057aeccdaf2954fa93317e0161aa35, + objectReference: {fileID: 21300000, guid: 401e6b14583a46443be3b7124b78ac09, type: 3} - target: {fileID: 3664916832434116137, guid: caaa748dbeed576499e8cae74d33f689, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 55825402a9256f144ab0de2dec192dd1, + objectReference: {fileID: 21300000, guid: e8fb21ace44c3e748959b969f895dd23, type: 3} - target: {fileID: 3664916832512110618, guid: caaa748dbeed576499e8cae74d33f689, type: 3} @@ -543,7 +517,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: e766bd96310300745ba8882e4162303b, + objectReference: {fileID: 21300000, guid: 0a13c07b1bd21434d801188fb9b7546d, type: 3} - target: {fileID: 3664916832825273574, guid: caaa748dbeed576499e8cae74d33f689, type: 3} @@ -589,7 +563,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: f654f9996bad76242bf6cbd9f4aeac0a, + objectReference: {fileID: 21300000, guid: 7597f863b51829447a8afd00534fe6e4, type: 3} - target: {fileID: 3664916834267713207, guid: caaa748dbeed576499e8cae74d33f689, type: 3} @@ -694,6 +668,32 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!114 &313910592 +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: 429638430} +--- !u!114 &357254126 +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: 1446845735} --- !u!114 &429638430 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 3664916834061038029, guid: caaa748dbeed576499e8cae74d33f689, @@ -1076,19 +1076,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 639508187} m_CullTransparentMesh: 0 ---- !u!114 &651540414 -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: 1446845735} --- !u!1 &748884348 GameObject: m_ObjectHideFlags: 0 @@ -1237,6 +1224,19 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 935850165} m_CullTransparentMesh: 0 +--- !u!114 &1005979436 +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: 1760930532} --- !u!114 &1139655502 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 3664916832330421304, guid: caaa748dbeed576499e8cae74d33f689, @@ -1249,19 +1249,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!114 &1152622774 -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: 429638430} --- !u!1 &1322368921 GameObject: m_ObjectHideFlags: 0 @@ -1422,19 +1409,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!114 &1513025054 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 390120330251131619, guid: caaa748dbeed576499e8cae74d33f689, - type: 3} - m_PrefabInstance: {fileID: 219610911} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &1682202293 +--- !u!114 &1495750392 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1447,6 +1422,31 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: mTarget: {fileID: 1513025054} +--- !u!114 &1513025054 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 390120330251131619, guid: caaa748dbeed576499e8cae74d33f689, + type: 3} + m_PrefabInstance: {fileID: 219610911} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &1539992273 +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: 1139655502} --- !u!114 &1760930532 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 3664916832434116137, guid: caaa748dbeed576499e8cae74d33f689, diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Tasting.unity b/popcorn/Assets/MyGame/Scenes/marketing/Tasting.unity index 182f197f..42f05333 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/Tasting.unity +++ b/popcorn/Assets/MyGame/Scenes/marketing/Tasting.unity @@ -236,8 +236,7 @@ PrefabInstance: - target: {fileID: 5089467466247093045, guid: 0da1dd32f93cb4fe4881d732047679ec, type: 3} propertyPath: m_Text - value: You can quickly empty the popcorn in the tank. You won't get coins or - hearts + value: "\u30BF\u30F3\u30AF\u5185\u306E\u30DD\u30C3\u30D7\u30B3\u30FC\u30F3\u3092\u3059\u3050\u306B\u7A7A\u306B\u3067\u304D\u308B\u3088\n\u30B3\u30A4\u30F3\u3084\u30CF\u30FC\u30C8\u306F\u3082\u3089\u3048\u306A\u3044\u3088" objectReference: {fileID: 0} - target: {fileID: 5089467466247093045, guid: 0da1dd32f93cb4fe4881d732047679ec, type: 3} @@ -269,7 +268,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: b076997e576de06458f8b751a3e0de4b, + objectReference: {fileID: 21300000, guid: c48bf96df0daa8840893d8b46010f597, type: 3} - target: {fileID: 5089467466543878408, guid: 0da1dd32f93cb4fe4881d732047679ec, type: 3} @@ -385,7 +384,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: eca7336de7c3f644599b5015fe89f168, + objectReference: {fileID: 21300000, guid: b8ad8d53e7a334143ae4fc6b507549b4, type: 3} - target: {fileID: 5089467467567286955, guid: 0da1dd32f93cb4fe4881d732047679ec, type: 3} @@ -416,7 +415,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: f77db180669d8d8498c46fd384ec7eb5, + objectReference: {fileID: 21300000, guid: aac62235e8d499d4f8c23e2f10a05471, type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 0da1dd32f93cb4fe4881d732047679ec, type: 3} diff --git a/popcorn/Assets/MyGame/Scenes/marketing/marketing.unity b/popcorn/Assets/MyGame/Scenes/marketing/marketing.unity index 8efccec4..67e6a8ac 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/marketing.unity +++ b/popcorn/Assets/MyGame/Scenes/marketing/marketing.unity @@ -3185,7 +3185,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 343e01e697ec23142a0a67e3fe7a64fb, + objectReference: {fileID: 21300000, guid: 88b678672e5bca548bedbae7386e4346, type: 3} - target: {fileID: 512143980313251866, guid: caaa748dbeed576499e8cae74d33f689, type: 3} @@ -3326,7 +3326,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 503e1dac51f0f89449adfda161422448, + objectReference: {fileID: 21300000, guid: 7790c7ac777220c43b20f746837042ba, type: 3} - target: {fileID: 3664916832310506794, guid: caaa748dbeed576499e8cae74d33f689, type: 3} @@ -3352,13 +3352,13 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 8d057aeccdaf2954fa93317e0161aa35, + objectReference: {fileID: 21300000, guid: 401e6b14583a46443be3b7124b78ac09, type: 3} - target: {fileID: 3664916832434116137, guid: caaa748dbeed576499e8cae74d33f689, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 55825402a9256f144ab0de2dec192dd1, + objectReference: {fileID: 21300000, guid: e8fb21ace44c3e748959b969f895dd23, type: 3} - target: {fileID: 3664916832512110618, guid: caaa748dbeed576499e8cae74d33f689, type: 3} @@ -3509,7 +3509,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: e766bd96310300745ba8882e4162303b, + objectReference: {fileID: 21300000, guid: 0a13c07b1bd21434d801188fb9b7546d, type: 3} - target: {fileID: 3664916832825273575, guid: caaa748dbeed576499e8cae74d33f689, type: 3} @@ -3550,7 +3550,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: f654f9996bad76242bf6cbd9f4aeac0a, + objectReference: {fileID: 21300000, guid: 7597f863b51829447a8afd00534fe6e4, type: 3} - target: {fileID: 3664916834267713207, guid: caaa748dbeed576499e8cae74d33f689, type: 3} @@ -3631,7 +3631,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: d093b97838f7bee4589f5b9dac23ddb4, + objectReference: {fileID: 21300000, guid: 3be9a3bcc8d7c864a97b5be41e33418f, type: 3} - target: {fileID: 8591874021033984247, guid: caaa748dbeed576499e8cae74d33f689, type: 3} @@ -4165,19 +4165,6 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!114 &759764437 -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: 3b29d7ab09a96634a9f704e6a1f21193, type: 3} - m_Name: - m_EditorClassIdentifier: - mTarget: {fileID: 1685069511} --- !u!1 &760797060 GameObject: m_ObjectHideFlags: 0 @@ -12533,7 +12520,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: d34a42fae8361314fbe36511c05a1b18, + objectReference: {fileID: 21300000, guid: d2e4ae50bfa33574dbf61988d91f2634, type: 3} - target: {fileID: 3201651210435991723, guid: 343971e948dfe44ddab5ab4f736c3f06, type: 3} @@ -13344,6 +13331,19 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!114 &1852761908 +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: 3b29d7ab09a96634a9f704e6a1f21193, type: 3} + m_Name: + m_EditorClassIdentifier: + mTarget: {fileID: 1685069511} --- !u!1 &1853804041 GameObject: m_ObjectHideFlags: 0 diff --git a/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/Frame.prefab b/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/Frame.prefab index 5b8e49e2..96831c99 100644 --- a/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/Frame.prefab +++ b/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/Frame.prefab @@ -65,7 +65,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: ff32278fa02ebbe4aab807a618d780f1, type: 3} + m_Sprite: {fileID: 21300000, guid: a9e961473b18e3248b466d48987ac4b2, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -540,7 +540,7 @@ RectTransform: m_GameObject: {fileID: 1735230268650569057} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1.2, y: 1.2, z: 1.2} + m_LocalScale: {x: 1.1, y: 1.1, z: 1.1} m_Children: [] m_Father: {fileID: 8536603424566114135} m_RootOrder: 1 @@ -577,7 +577,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: a52460eae9e20e84e98151f6e5807b2d, type: 3} + m_Sprite: {fileID: 21300000, guid: c7c9afad32a9e6a4d935b3469ba30dd9, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -663,7 +663,7 @@ RectTransform: 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_SizeDelta: {x: 200, y: 104} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7532558663698524988 CanvasRenderer: @@ -961,7 +961,7 @@ RectTransform: 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: 198, y: 104} + m_SizeDelta: {x: 216, y: 104} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6007316325440438180 CanvasRenderer: @@ -1065,7 +1065,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: f2baab95ad6d0a641a40e6d234e1c422, type: 3} + m_Sprite: {fileID: 21300000, guid: 03f64e60d74a2a944a184d8401fb6d61, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -1339,7 +1339,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: Recipes exchange by watching videos + m_Text: "\u52D5\u753B\u8996\u8074\u3067\u30EC\u30B7\u30D4\u4EA4\u63DB" --- !u!114 &1285946725444220175 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1417,7 +1417,7 @@ RectTransform: 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_SizeDelta: {x: 200, y: 104} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8536603422629144345 CanvasRenderer: @@ -2215,7 +2215,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: b6d6cdc5498743040bcdf23b3780fa0d, type: 3} + m_Sprite: {fileID: 21300000, guid: 66e94660ac6f7de41a7a5c8fbe58fce6, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -2419,7 +2419,7 @@ RectTransform: 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_SizeDelta: {x: 200, y: 104} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8536603424418812067 CanvasRenderer: @@ -2601,7 +2601,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 4e524d6b9475e7c4b92a8e55779dd2bd, type: 3} + m_Sprite: {fileID: 21300000, guid: f352ec180ef482346b67e9dc363e8d00, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -2688,7 +2688,7 @@ RectTransform: 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: 198, y: 104} + m_SizeDelta: {x: 216, y: 104} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8536603424566114133 CanvasRenderer: @@ -2866,7 +2866,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: dec0e364be2c3634a94960daef0717f4, type: 3} + m_Sprite: {fileID: 21300000, guid: 1ed7a6eade5a3af4c962706dec098104, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -2954,7 +2954,7 @@ RectTransform: 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_SizeDelta: {x: 200, y: 104} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7606945559751820238 CanvasRenderer: diff --git a/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/PurchaseView.prefab b/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/PurchaseView.prefab index 76c04a7a..fa5fbc4a 100644 --- a/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/PurchaseView.prefab +++ b/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/PurchaseView.prefab @@ -618,7 +618,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: Total + m_Text: "\u5408\u8A08" --- !u!114 &4965073318475407547 MonoBehaviour: m_ObjectHideFlags: 0 @@ -760,7 +760,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: b6d6cdc5498743040bcdf23b3780fa0d, type: 3} + m_Sprite: {fileID: 21300000, guid: 66e94660ac6f7de41a7a5c8fbe58fce6, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -2112,7 +2112,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 5b791b29becec62468fa706ff3a6749a, type: 3} + m_Sprite: {fileID: 21300000, guid: 99fb76b36ecee354fb95912e34437775, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 diff --git a/popcorn/Assets/MyGame/Scenes/shopping/shopping.unity b/popcorn/Assets/MyGame/Scenes/shopping/shopping.unity index 3c679f5b..b2d9ec1a 100644 --- a/popcorn/Assets/MyGame/Scenes/shopping/shopping.unity +++ b/popcorn/Assets/MyGame/Scenes/shopping/shopping.unity @@ -187,32 +187,6 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &222249497 -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} ---- !u!114 &368917507 -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: 1098091311} --- !u!1 &553363513 GameObject: m_ObjectHideFlags: 0 @@ -296,45 +270,6 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &637449301 -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: 1098091312} ---- !u!114 &656196728 -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 &692373008 -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 &715888784 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 4826861628800619564, guid: 667a93fb2929943078b944050cddd464, @@ -417,7 +352,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 343e01e697ec23142a0a67e3fe7a64fb, + objectReference: {fileID: 21300000, guid: 88b678672e5bca548bedbae7386e4346, type: 3} - target: {fileID: 566248750470715636, guid: caaa748dbeed576499e8cae74d33f689, type: 3} @@ -548,13 +483,13 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 8d057aeccdaf2954fa93317e0161aa35, + objectReference: {fileID: 21300000, guid: 401e6b14583a46443be3b7124b78ac09, type: 3} - target: {fileID: 3664916832434116137, guid: caaa748dbeed576499e8cae74d33f689, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 55825402a9256f144ab0de2dec192dd1, + objectReference: {fileID: 21300000, guid: e8fb21ace44c3e748959b969f895dd23, type: 3} - target: {fileID: 3664916832512110618, guid: caaa748dbeed576499e8cae74d33f689, type: 3} @@ -705,7 +640,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: e766bd96310300745ba8882e4162303b, + objectReference: {fileID: 21300000, guid: 0a13c07b1bd21434d801188fb9b7546d, type: 3} - target: {fileID: 3664916832909534300, guid: caaa748dbeed576499e8cae74d33f689, type: 3} @@ -726,7 +661,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: f654f9996bad76242bf6cbd9f4aeac0a, + objectReference: {fileID: 21300000, guid: 7597f863b51829447a8afd00534fe6e4, type: 3} - target: {fileID: 4348639590627783772, guid: caaa748dbeed576499e8cae74d33f689, type: 3} @@ -765,66 +700,6 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: caaa748dbeed576499e8cae74d33f689, type: 3} ---- !u!114 &1098091308 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 3664916832330421304, guid: caaa748dbeed576499e8cae74d33f689, - type: 3} - m_PrefabInstance: {fileID: 1098091307} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &1098091309 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 390120330251131619, guid: caaa748dbeed576499e8cae74d33f689, - type: 3} - m_PrefabInstance: {fileID: 1098091307} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &1098091310 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 3664916832434116137, guid: caaa748dbeed576499e8cae74d33f689, - type: 3} - m_PrefabInstance: {fileID: 1098091307} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &1098091311 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 3664916832642567898, guid: caaa748dbeed576499e8cae74d33f689, - type: 3} - m_PrefabInstance: {fileID: 1098091307} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &1098091312 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 3664916834061038029, guid: caaa748dbeed576499e8cae74d33f689, - type: 3} - m_PrefabInstance: {fileID: 1098091307} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1001 &1450416387 PrefabInstance: m_ObjectHideFlags: 0 @@ -996,13 +871,13 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 4e524d6b9475e7c4b92a8e55779dd2bd, + objectReference: {fileID: 21300000, guid: f352ec180ef482346b67e9dc363e8d00, type: 3} - target: {fileID: 203041986372112404, guid: 667a93fb2929943078b944050cddd464, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: b6d6cdc5498743040bcdf23b3780fa0d, + objectReference: {fileID: 21300000, guid: 66e94660ac6f7de41a7a5c8fbe58fce6, type: 3} - target: {fileID: 788033435718677201, guid: 667a93fb2929943078b944050cddd464, type: 3} @@ -1067,7 +942,7 @@ PrefabInstance: - target: {fileID: 1146852917836568778, guid: 667a93fb2929943078b944050cddd464, type: 3} propertyPath: m_Text - value: Recipes exchange by watching videos + value: "\u52D5\u753B\u8996\u8074\u3067\u30EC\u30B7\u30D4\u4EA4\u63DB" objectReference: {fileID: 0} - target: {fileID: 1146852917836568778, guid: 667a93fb2929943078b944050cddd464, type: 3} @@ -1078,7 +953,7 @@ PrefabInstance: - target: {fileID: 1146852918367203974, guid: 667a93fb2929943078b944050cddd464, type: 3} propertyPath: m_Text - value: Recipes exchange by watching videos + value: "\u52D5\u753B\u8996\u8074\u3067\u30EC\u30B7\u30D4\u4EA4\u63DB" objectReference: {fileID: 0} - target: {fileID: 1146852918367203974, guid: 667a93fb2929943078b944050cddd464, type: 3} @@ -1089,7 +964,7 @@ PrefabInstance: - target: {fileID: 1146852918627103335, guid: 667a93fb2929943078b944050cddd464, type: 3} propertyPath: m_Text - value: Recipes exchange by watching videos + value: "\u52D5\u753B\u8996\u8074\u3067\u30EC\u30B7\u30D4\u4EA4\u63DB" objectReference: {fileID: 0} - target: {fileID: 1146852918627103335, guid: 667a93fb2929943078b944050cddd464, type: 3} @@ -1100,7 +975,7 @@ PrefabInstance: - target: {fileID: 1146852918952121867, guid: 667a93fb2929943078b944050cddd464, type: 3} propertyPath: m_Text - value: Recipes exchange by watching videos + value: "\u52D5\u753B\u8996\u8074\u3067\u30EC\u30B7\u30D4\u4EA4\u63DB" objectReference: {fileID: 0} - target: {fileID: 1146852918952121867, guid: 667a93fb2929943078b944050cddd464, type: 3} @@ -1111,7 +986,7 @@ PrefabInstance: - target: {fileID: 1146852919051402256, guid: 667a93fb2929943078b944050cddd464, type: 3} propertyPath: m_Text - value: Recipes exchange by watching videos + value: "\u52D5\u753B\u8996\u8074\u3067\u30EC\u30B7\u30D4\u4EA4\u63DB" objectReference: {fileID: 0} - target: {fileID: 1146852919051402256, guid: 667a93fb2929943078b944050cddd464, type: 3} @@ -1122,7 +997,7 @@ PrefabInstance: - target: {fileID: 1146852919246646992, guid: 667a93fb2929943078b944050cddd464, type: 3} propertyPath: m_Text - value: Recipes exchange by watching videos + value: "\u52D5\u753B\u8996\u8074\u3067\u30EC\u30B7\u30D4\u4EA4\u63DB" objectReference: {fileID: 0} - target: {fileID: 1146852919246646992, guid: 667a93fb2929943078b944050cddd464, type: 3} @@ -1134,37 +1009,37 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: a52460eae9e20e84e98151f6e5807b2d, + objectReference: {fileID: 21300000, guid: c7c9afad32a9e6a4d935b3469ba30dd9, type: 3} - target: {fileID: 1386000354375716278, guid: 667a93fb2929943078b944050cddd464, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: a52460eae9e20e84e98151f6e5807b2d, + objectReference: {fileID: 21300000, guid: c7c9afad32a9e6a4d935b3469ba30dd9, type: 3} - target: {fileID: 1386000354625644315, guid: 667a93fb2929943078b944050cddd464, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: a52460eae9e20e84e98151f6e5807b2d, + objectReference: {fileID: 21300000, guid: c7c9afad32a9e6a4d935b3469ba30dd9, type: 3} - target: {fileID: 1386000355740936666, guid: 667a93fb2929943078b944050cddd464, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: a52460eae9e20e84e98151f6e5807b2d, + objectReference: {fileID: 21300000, guid: c7c9afad32a9e6a4d935b3469ba30dd9, type: 3} - target: {fileID: 1386000355848848321, guid: 667a93fb2929943078b944050cddd464, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: a52460eae9e20e84e98151f6e5807b2d, + objectReference: {fileID: 21300000, guid: c7c9afad32a9e6a4d935b3469ba30dd9, type: 3} - target: {fileID: 1386000355901493505, guid: 667a93fb2929943078b944050cddd464, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: a52460eae9e20e84e98151f6e5807b2d, + objectReference: {fileID: 21300000, guid: c7c9afad32a9e6a4d935b3469ba30dd9, type: 3} - target: {fileID: 1757697754891812348, guid: 667a93fb2929943078b944050cddd464, type: 3} @@ -1350,7 +1225,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: b40ce4fb7f271894ebdfdd639524cded, + objectReference: {fileID: 21300000, guid: cb53b5ccd2d52784a86e49652e65aee7, type: 3} - target: {fileID: 2365797324462302900, guid: 667a93fb2929943078b944050cddd464, type: 3} @@ -1366,55 +1241,55 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: ff32278fa02ebbe4aab807a618d780f1, + objectReference: {fileID: 21300000, guid: a9e961473b18e3248b466d48987ac4b2, type: 3} - target: {fileID: 3971030752033893388, guid: 667a93fb2929943078b944050cddd464, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: f2baab95ad6d0a641a40e6d234e1c422, + objectReference: {fileID: 21300000, guid: 03f64e60d74a2a944a184d8401fb6d61, type: 3} - target: {fileID: 4137968107648010471, guid: 667a93fb2929943078b944050cddd464, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 75e62f81b433ce541866b37242f0317c, + objectReference: {fileID: 21300000, guid: 298367eae1e6abe40ad4a92148482dd8, type: 3} - target: {fileID: 4265797366405192145, guid: 667a93fb2929943078b944050cddd464, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: a2db71d8798ad034f9594a39d6e19cc8, + objectReference: {fileID: 21300000, guid: 4e524d6b9475e7c4b92a8e55779dd2bd, type: 3} - target: {fileID: 4265797366965187485, guid: 667a93fb2929943078b944050cddd464, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: a2db71d8798ad034f9594a39d6e19cc8, + objectReference: {fileID: 21300000, guid: 4e524d6b9475e7c4b92a8e55779dd2bd, type: 3} - target: {fileID: 4265797367225611132, guid: 667a93fb2929943078b944050cddd464, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: a2db71d8798ad034f9594a39d6e19cc8, + objectReference: {fileID: 21300000, guid: 4e524d6b9475e7c4b92a8e55779dd2bd, type: 3} - target: {fileID: 4265797367521269520, guid: 667a93fb2929943078b944050cddd464, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: a2db71d8798ad034f9594a39d6e19cc8, + objectReference: {fileID: 21300000, guid: 4e524d6b9475e7c4b92a8e55779dd2bd, type: 3} - target: {fileID: 4265797367681576907, guid: 667a93fb2929943078b944050cddd464, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: a2db71d8798ad034f9594a39d6e19cc8, + objectReference: {fileID: 21300000, guid: 4e524d6b9475e7c4b92a8e55779dd2bd, type: 3} - target: {fileID: 4265797367884266763, guid: 667a93fb2929943078b944050cddd464, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: a2db71d8798ad034f9594a39d6e19cc8, + objectReference: {fileID: 21300000, guid: 4e524d6b9475e7c4b92a8e55779dd2bd, type: 3} - target: {fileID: 4432729544473559518, guid: 667a93fb2929943078b944050cddd464, type: 3} @@ -1435,37 +1310,37 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: f2baab95ad6d0a641a40e6d234e1c422, + objectReference: {fileID: 21300000, guid: 03f64e60d74a2a944a184d8401fb6d61, type: 3} - target: {fileID: 4711878981980077630, guid: 667a93fb2929943078b944050cddd464, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: f2baab95ad6d0a641a40e6d234e1c422, + objectReference: {fileID: 21300000, guid: 03f64e60d74a2a944a184d8401fb6d61, type: 3} - target: {fileID: 4711878982179515646, guid: 667a93fb2929943078b944050cddd464, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: f2baab95ad6d0a641a40e6d234e1c422, + objectReference: {fileID: 21300000, guid: 03f64e60d74a2a944a184d8401fb6d61, type: 3} - target: {fileID: 4711878982293283432, guid: 667a93fb2929943078b944050cddd464, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: f2baab95ad6d0a641a40e6d234e1c422, + objectReference: {fileID: 21300000, guid: 03f64e60d74a2a944a184d8401fb6d61, type: 3} - target: {fileID: 4711878982570517129, guid: 667a93fb2929943078b944050cddd464, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: f2baab95ad6d0a641a40e6d234e1c422, + objectReference: {fileID: 21300000, guid: 03f64e60d74a2a944a184d8401fb6d61, type: 3} - target: {fileID: 4711878982853265444, guid: 667a93fb2929943078b944050cddd464, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: f2baab95ad6d0a641a40e6d234e1c422, + objectReference: {fileID: 21300000, guid: 03f64e60d74a2a944a184d8401fb6d61, type: 3} - target: {fileID: 5255014595623885689, guid: 667a93fb2929943078b944050cddd464, type: 3} @@ -1476,61 +1351,61 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: a2db71d8798ad034f9594a39d6e19cc8, + objectReference: {fileID: 21300000, guid: 4e524d6b9475e7c4b92a8e55779dd2bd, type: 3} - target: {fileID: 5709465544360413450, guid: 667a93fb2929943078b944050cddd464, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 3052cb7c475b29f40aed46c23712956a, + objectReference: {fileID: 21300000, guid: 84efab5b8d1b5274cb7510ddcb5b2187, type: 3} - target: {fileID: 6758377365589220451, guid: 667a93fb2929943078b944050cddd464, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: ff32278fa02ebbe4aab807a618d780f1, + objectReference: {fileID: 21300000, guid: a9e961473b18e3248b466d48987ac4b2, type: 3} - target: {fileID: 6758377365838755534, guid: 667a93fb2929943078b944050cddd464, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: ff32278fa02ebbe4aab807a618d780f1, + objectReference: {fileID: 21300000, guid: a9e961473b18e3248b466d48987ac4b2, type: 3} - target: {fileID: 6758377366098884143, guid: 667a93fb2929943078b944050cddd464, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: ff32278fa02ebbe4aab807a618d780f1, + objectReference: {fileID: 21300000, guid: a9e961473b18e3248b466d48987ac4b2, type: 3} - target: {fileID: 6758377366326110841, guid: 667a93fb2929943078b944050cddd464, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: ff32278fa02ebbe4aab807a618d780f1, + objectReference: {fileID: 21300000, guid: a9e961473b18e3248b466d48987ac4b2, type: 3} - target: {fileID: 6758377366513596601, guid: 667a93fb2929943078b944050cddd464, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: ff32278fa02ebbe4aab807a618d780f1, + objectReference: {fileID: 21300000, guid: a9e961473b18e3248b466d48987ac4b2, type: 3} - target: {fileID: 6758377366687994530, guid: 667a93fb2929943078b944050cddd464, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: ff32278fa02ebbe4aab807a618d780f1, + objectReference: {fileID: 21300000, guid: a9e961473b18e3248b466d48987ac4b2, type: 3} - target: {fileID: 7296979764273611571, guid: 667a93fb2929943078b944050cddd464, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: a52460eae9e20e84e98151f6e5807b2d, + objectReference: {fileID: 21300000, guid: c7c9afad32a9e6a4d935b3469ba30dd9, type: 3} - target: {fileID: 8406322788130518425, guid: 667a93fb2929943078b944050cddd464, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 4e524d6b9475e7c4b92a8e55779dd2bd, + objectReference: {fileID: 21300000, guid: f352ec180ef482346b67e9dc363e8d00, type: 3} - target: {fileID: 8406322788165944276, guid: 667a93fb2929943078b944050cddd464, type: 3} @@ -1542,7 +1417,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 4e524d6b9475e7c4b92a8e55779dd2bd, + objectReference: {fileID: 21300000, guid: f352ec180ef482346b67e9dc363e8d00, type: 3} - target: {fileID: 8406322788219638036, guid: 667a93fb2929943078b944050cddd464, type: 3} @@ -1580,19 +1455,19 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 4e524d6b9475e7c4b92a8e55779dd2bd, + objectReference: {fileID: 21300000, guid: f352ec180ef482346b67e9dc363e8d00, type: 3} - target: {fileID: 8406322788681368102, guid: 667a93fb2929943078b944050cddd464, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: b6d6cdc5498743040bcdf23b3780fa0d, + objectReference: {fileID: 21300000, guid: 66e94660ac6f7de41a7a5c8fbe58fce6, type: 3} - target: {fileID: 8406322788744466662, guid: 667a93fb2929943078b944050cddd464, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: b6d6cdc5498743040bcdf23b3780fa0d, + objectReference: {fileID: 21300000, guid: 66e94660ac6f7de41a7a5c8fbe58fce6, type: 3} - target: {fileID: 8406322788756460263, guid: 667a93fb2929943078b944050cddd464, type: 3} @@ -1618,7 +1493,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: b6d6cdc5498743040bcdf23b3780fa0d, + objectReference: {fileID: 21300000, guid: 66e94660ac6f7de41a7a5c8fbe58fce6, type: 3} - target: {fileID: 8406322789033660934, guid: 667a93fb2929943078b944050cddd464, type: 3} @@ -1664,7 +1539,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: b6d6cdc5498743040bcdf23b3780fa0d, + objectReference: {fileID: 21300000, guid: 66e94660ac6f7de41a7a5c8fbe58fce6, type: 3} - target: {fileID: 8406322789344742992, guid: 667a93fb2929943078b944050cddd464, type: 3} @@ -1690,7 +1565,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: b6d6cdc5498743040bcdf23b3780fa0d, + objectReference: {fileID: 21300000, guid: 66e94660ac6f7de41a7a5c8fbe58fce6, type: 3} - target: {fileID: 8406322789441811918, guid: 667a93fb2929943078b944050cddd464, type: 3} @@ -1722,7 +1597,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 4e524d6b9475e7c4b92a8e55779dd2bd, + objectReference: {fileID: 21300000, guid: f352ec180ef482346b67e9dc363e8d00, type: 3} - target: {fileID: 8406322789691465571, guid: 667a93fb2929943078b944050cddd464, type: 3} @@ -1734,7 +1609,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 4e524d6b9475e7c4b92a8e55779dd2bd, + objectReference: {fileID: 21300000, guid: f352ec180ef482346b67e9dc363e8d00, type: 3} - target: {fileID: 8406322789951364994, guid: 667a93fb2929943078b944050cddd464, type: 3} @@ -1746,18 +1621,18 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: b6d6cdc5498743040bcdf23b3780fa0d, + objectReference: {fileID: 21300000, guid: 66e94660ac6f7de41a7a5c8fbe58fce6, type: 3} - target: {fileID: 8406322790122289935, guid: 667a93fb2929943078b944050cddd464, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 4e524d6b9475e7c4b92a8e55779dd2bd, + objectReference: {fileID: 21300000, guid: f352ec180ef482346b67e9dc363e8d00, type: 3} - target: {fileID: 8760182090298572002, guid: 667a93fb2929943078b944050cddd464, type: 3} propertyPath: m_Text - value: Recipes exchange by watching videos + value: "\u52D5\u753B\u8996\u8074\u3067\u30EC\u30B7\u30D4\u4EA4\u63DB" objectReference: {fileID: 0} - target: {fileID: 8760182090298572002, guid: 667a93fb2929943078b944050cddd464, type: 3} diff --git a/popcorn/Assets/Resources/I2Languages.asset b/popcorn/Assets/Resources/I2Languages.asset index 22e8b57f..e1e3eaf2 100644 --- a/popcorn/Assets/Resources/I2Languages.asset +++ b/popcorn/Assets/Resources/I2Languages.asset @@ -157,7 +157,7 @@ MonoBehaviour: - Material_zh/title/title_logo_zh[title_logo_zh] - Material_zh/title/title_logo_zh[title_logo_zh] - Material_ko/title/title_logo_ko[title_logo_ko] - - + - Material_en/title/title_logo_en[title_logo_en] Flags: 0000000000 Languages_Touch: [] - Term: title_tapToStart