From cb46900bbed53a8d84aa4623bf50770e4b2b7a88 Mon Sep 17 00:00:00 2001 From: koya_15 Date: Tue, 5 Jul 2022 19:51:06 +0900 Subject: [PATCH] =?UTF-8?q?=E8=83=8C=E6=99=AF=E3=83=AC=E3=82=A4=E3=83=A4?= =?UTF-8?q?=E3=83=BC=E8=AA=BF=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- popcorn/Assets/MyGame/Scenes/Main/Main.unity | 134 ++---------------- .../Scenes/Main/Prefabs/UI/Footer.prefab | 12 +- .../Scenes/MiniGame/Prefabs/BackGround.prefab | 6 +- popcorn/Assets/Resources/I2Languages.asset | 8 +- 4 files changed, 22 insertions(+), 138 deletions(-) diff --git a/popcorn/Assets/MyGame/Scenes/Main/Main.unity b/popcorn/Assets/MyGame/Scenes/Main/Main.unity index 00db5e4c..05a467be 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Main.unity +++ b/popcorn/Assets/MyGame/Scenes/Main/Main.unity @@ -234,31 +234,6 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!114 &40763333 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 3664916832642567898, guid: caaa748dbeed576499e8cae74d33f689, - type: 3} - m_PrefabInstance: {fileID: 3664916832445709976} - 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 &42136460 -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: 1242840770} --- !u!1 &82006168 GameObject: m_ObjectHideFlags: 0 @@ -337,19 +312,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 82006168} m_CullTransparentMesh: 0 ---- !u!114 &104459529 -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: 1215422478} --- !u!1 &178476876 GameObject: m_ObjectHideFlags: 0 @@ -405,19 +367,6 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 ---- !u!114 &209906609 -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: 40763333} --- !u!114 &249665956 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 7685984615756169863, guid: caaa748dbeed576499e8cae74d33f689, @@ -555,19 +504,6 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!114 &297541640 -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: 2073229470} --- !u!1 &300225228 GameObject: m_ObjectHideFlags: 0 @@ -2924,19 +2860,6 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 1 ---- !u!114 &752689584 -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: 1012256676} --- !u!1 &757707495 GameObject: m_ObjectHideFlags: 0 @@ -5162,19 +5085,6 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!114 &1479494047 -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: 1818084248} --- !u!1 &1592053832 GameObject: m_ObjectHideFlags: 0 @@ -6146,7 +6056,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 5fd2665a31f914647be770facd5e156f, type: 3} + m_Sprite: {fileID: 21300000, guid: 716cb1fb9a2a96445950199c3a6d2961, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -7209,19 +7119,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 2bee5c60f0f643d4a47973529de9226c, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!114 &2025352216 -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: 1163046103} --- !u!1 &2028992896 GameObject: m_ObjectHideFlags: 0 @@ -7303,19 +7200,6 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!114 &2048554252 -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: 1434932932} --- !u!1 &2055584752 GameObject: m_ObjectHideFlags: 0 @@ -7742,7 +7626,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} @@ -7812,7 +7696,7 @@ PrefabInstance: - target: {fileID: 1382553612690395228, guid: caaa748dbeed576499e8cae74d33f689, type: 3} propertyPath: m_Text - value: Automatic cooking + value: "\u81EA\u52D5\u8ABF\u7406" objectReference: {fileID: 0} - target: {fileID: 1408184404978035950, guid: caaa748dbeed576499e8cae74d33f689, type: 3} @@ -7823,7 +7707,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 64781a74ed1e92947b5bbc0bc212efd5, + objectReference: {fileID: 21300000, guid: c0ee2846e2285fa46883acc98c475652, type: 3} - target: {fileID: 1909038109161790577, guid: caaa748dbeed576499e8cae74d33f689, type: 3} @@ -7899,13 +7783,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} @@ -8056,7 +7940,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} @@ -8071,7 +7955,7 @@ PrefabInstance: - target: {fileID: 3664916833050583564, guid: caaa748dbeed576499e8cae74d33f689, type: 3} propertyPath: m_Text - value: make + value: "\u4F5C\u308B" objectReference: {fileID: 0} - target: {fileID: 3664916833546693945, guid: caaa748dbeed576499e8cae74d33f689, type: 3} @@ -8107,7 +7991,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: f654f9996bad76242bf6cbd9f4aeac0a, + objectReference: {fileID: 21300000, guid: 7597f863b51829447a8afd00534fe6e4, type: 3} - target: {fileID: 3664916834121473267, guid: caaa748dbeed576499e8cae74d33f689, type: 3} diff --git a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/UI/Footer.prefab b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/UI/Footer.prefab index f5ef9673..36b131a8 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/UI/Footer.prefab +++ b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/UI/Footer.prefab @@ -5334,15 +5334,15 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: f8587bb162250fa48947d648e934781e, type: 3} ---- !u!224 &3233636912317429793 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 8136263580696535353, guid: f8587bb162250fa48947d648e934781e, - type: 3} - m_PrefabInstance: {fileID: 6632112567178762520} - m_PrefabAsset: {fileID: 0} --- !u!1 &2430043917671370164 stripped GameObject: m_CorrespondingSourceObject: {fileID: 9056949049436837036, guid: f8587bb162250fa48947d648e934781e, type: 3} m_PrefabInstance: {fileID: 6632112567178762520} m_PrefabAsset: {fileID: 0} +--- !u!224 &3233636912317429793 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 8136263580696535353, guid: f8587bb162250fa48947d648e934781e, + type: 3} + m_PrefabInstance: {fileID: 6632112567178762520} + m_PrefabAsset: {fileID: 0} diff --git a/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/BackGround.prefab b/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/BackGround.prefab index 16dedbbb..78e421e4 100644 --- a/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/BackGround.prefab +++ b/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/BackGround.prefab @@ -121,7 +121,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3087227909930956355} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: -3.46, z: 0} + m_LocalPosition: {x: 0, y: -3.408, z: 0} m_LocalScale: {x: 16.66, y: 6.6, z: 1} m_Children: [] m_Father: {fileID: 378211063441888086} @@ -165,7 +165,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 3 + m_SortingOrder: 2 m_Sprite: {fileID: 21300000, guid: bb188fd763f57c0429accb1301e0f529, type: 3} m_Color: {r: 0.6784314, g: 0.5058824, b: 0.24313726, a: 1} m_FlipX: 0 @@ -2500,7 +2500,7 @@ PrefabInstance: - target: {fileID: 3369490898853473183, guid: 7fa52d20820d0f84a9218625917a643a, type: 3} propertyPath: m_SortingOrder - value: 2 + value: 1 objectReference: {fileID: 0} - target: {fileID: 7298026551172620012, guid: 7fa52d20820d0f84a9218625917a643a, type: 3} diff --git a/popcorn/Assets/Resources/I2Languages.asset b/popcorn/Assets/Resources/I2Languages.asset index 723f62a9..eadacc05 100644 --- a/popcorn/Assets/Resources/I2Languages.asset +++ b/popcorn/Assets/Resources/I2Languages.asset @@ -1683,10 +1683,10 @@ MonoBehaviour: Description: Languages: - ui_button_icon_Footer_MaterialProcurement_logo - - - - - - - - + - Material_zh/UI/ui_button_icon_Footer_MaterialProcurement_logo_zh[ui_button_icon_Footer_MaterialProcurement_logo_zh] + - Material_zh/UI/ui_button_icon_Footer_MaterialProcurement_logo_zh[ui_button_icon_Footer_MaterialProcurement_logo_zh] + - Material_ko/UI/ui_button_icon_Footer_MaterialProcurement_logo_ko[ui_button_icon_Footer_MaterialProcurement_logo_ko] + - Material_en/UI/ui_button_icon_Footer_MaterialProcurement_logo_en[ui_button_icon_Footer_MaterialProcurement_logo_en] Flags: 0000000000 Languages_Touch: [] - Term: ui_button_icon_Footer_MaterialProcurement_logo_key