From d2347100dd6941ad5669a3da32c5841553eb5ad8 Mon Sep 17 00:00:00 2001 From: koya_15 Date: Mon, 23 May 2022 14:37:02 +0900 Subject: [PATCH] =?UTF-8?q?=E3=82=AB=E3=82=B9=E3=82=BF=E3=83=9E=E3=82=A4?= =?UTF-8?q?=E3=82=BA=E7=94=BB=E5=83=8F=E3=83=AD=E3=83=BC=E3=82=AB=E3=83=A9?= =?UTF-8?q?=E3=82=A4=E3=82=BA=E3=81=82=E3=81=A6=E3=81=AF=E3=82=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ShopCustomizeIcons/Decoration2_a.prefab | 2 +- .../ShopCustomizeIcons/Signboard_a.prefab | 6 +++ .../marketing/CustomizationPurchase.unity | 25 +++++++--- popcorn/Assets/Resources/I2Languages.asset | 48 +++++++++---------- 4 files changed, 50 insertions(+), 31 deletions(-) diff --git a/popcorn/Assets/MyGame/Resources/ShopCustomizeIcons/Decoration2_a.prefab b/popcorn/Assets/MyGame/Resources/ShopCustomizeIcons/Decoration2_a.prefab index b2f96f5a..b00e784a 100644 --- a/popcorn/Assets/MyGame/Resources/ShopCustomizeIcons/Decoration2_a.prefab +++ b/popcorn/Assets/MyGame/Resources/ShopCustomizeIcons/Decoration2_a.prefab @@ -121,7 +121,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: e7f038671372a87469c8ac97c789ac37, + objectReference: {fileID: 21300000, guid: 42bb7c9b58b76fc49985e5386d09f4b1, type: 3} - target: {fileID: 7617707139880814096, guid: 80c2e1b00cc3f4287988a0f77e25a12a, type: 3} diff --git a/popcorn/Assets/MyGame/Resources/ShopCustomizeIcons/Signboard_a.prefab b/popcorn/Assets/MyGame/Resources/ShopCustomizeIcons/Signboard_a.prefab index 42261d4a..26d29568 100644 --- a/popcorn/Assets/MyGame/Resources/ShopCustomizeIcons/Signboard_a.prefab +++ b/popcorn/Assets/MyGame/Resources/ShopCustomizeIcons/Signboard_a.prefab @@ -117,6 +117,12 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 5989548524980693530, guid: 80c2e1b00cc3f4287988a0f77e25a12a, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: f432f51dd06578a488132f99f07c2c5d, + type: 3} - target: {fileID: 7617707139880814096, guid: 80c2e1b00cc3f4287988a0f77e25a12a, type: 3} propertyPath: mTerm diff --git a/popcorn/Assets/MyGame/Scenes/marketing/CustomizationPurchase.unity b/popcorn/Assets/MyGame/Scenes/marketing/CustomizationPurchase.unity index 45555157..4d1dbc51 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/CustomizationPurchase.unity +++ b/popcorn/Assets/MyGame/Scenes/marketing/CustomizationPurchase.unity @@ -623,7 +623,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: f3a0ccdabb17f2244abcb3798b5b589e, type: 3} + m_Sprite: {fileID: 21300000, guid: 25e64ef92e8a441ef8f2eaaedf36bc02, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -792,6 +792,19 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: mTarget: {fileID: 7029507893567348588} +--- !u!114 &2058577851 +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: 5691356280808893340} --- !u!222 &785352812273608722 CanvasRenderer: m_ObjectHideFlags: 0 @@ -1684,7 +1697,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 66e94660ac6f7de41a7a5c8fbe58fce6, type: 3} + m_Sprite: {fileID: 21300000, guid: b439432c614c94c5b8a8569189ca794f, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1963,7 +1976,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} + m_Font: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, type: 3} m_FontSize: 40 m_FontStyle: 0 m_BestFit: 1 @@ -2163,7 +2176,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} + m_Font: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, type: 3} m_FontSize: 30 m_FontStyle: 0 m_BestFit: 0 @@ -2398,7 +2411,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 99fb76b36ecee354fb95912e34437775, type: 3} + m_Sprite: {fileID: 21300000, guid: 784cc1290199742a58c39bcc5b1a13ba, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -2485,7 +2498,7 @@ MonoBehaviour: mGUI_ShowReferences: 0 mGUI_ShowTems: 1 mGUI_ShowCallback: 0 - mLocalizeTarget: {fileID: 0} + mLocalizeTarget: {fileID: 2058577851} mLocalizeTargetName: I2.Loc.LocalizeTarget_UnityUI_Image --- !u!1 &8336091249663688558 GameObject: diff --git a/popcorn/Assets/Resources/I2Languages.asset b/popcorn/Assets/Resources/I2Languages.asset index 68f749ac..54438b27 100644 --- a/popcorn/Assets/Resources/I2Languages.asset +++ b/popcorn/Assets/Resources/I2Languages.asset @@ -762,8 +762,8 @@ MonoBehaviour: Description: Languages: - ui_button_icon_close_logo_small - - Material_zh/shopping/ui_button_icon_close_logo_small_zh[ui_button_icon_close_logo_small_zh] - - Material_zh/shopping/ui_button_icon_close_logo_small_zh[ui_button_icon_close_logo_small_zh] + - Material/shopping/ui_button_icon_close_logo_small_zh[ui_button_icon_close_logo_small_zh] + - Material/shopping/ui_button_icon_close_logo_small_zh[ui_button_icon_close_logo_small_zh] - Material_ko/shopping/ui_button_icon_close_logo_small_ko[ui_button_icon_close_logo_small_ko] Flags: 00000000 Languages_Touch: [] @@ -892,8 +892,8 @@ MonoBehaviour: Description: Languages: - ui_button_icon_purchase_logo - - Material_zh/shopping/ui_button_icon_purchase_logo_zh[ui_button_icon_purchase_logo_zh] - - Material_zh/shopping/ui_button_icon_purchase_logo_zh[ui_button_icon_purchase_logo_zh] + - Material/shopping/ui_button_icon_purchase_logo_zh[ui_button_icon_purchase_logo_zh] + - Material/shopping/ui_button_icon_purchase_logo_zh[ui_button_icon_purchase_logo_zh] - Material_ko/shopping/ui_button_icon_purchase_logo_ko[ui_button_icon_purchase_logo_ko] Flags: 00000000 Languages_Touch: [] @@ -902,8 +902,8 @@ MonoBehaviour: Description: Languages: - ui_button_icon_purchase_logo_gray - - Material_zh/shopping/ui_button_icon_purchase_logo_gray_zh[ui_button_icon_purchase_logo_gray_zh] - - Material_zh/shopping/ui_button_icon_purchase_logo_gray_zh[ui_button_icon_purchase_logo_gray_zh] + - Material/shopping/ui_button_icon_purchase_logo_gray_zh[ui_button_icon_purchase_logo_gray_zh] + - Material/shopping/ui_button_icon_purchase_logo_gray_zh[ui_button_icon_purchase_logo_gray_zh] - Material_ko/shopping/ui_button_icon_purchase_logo_gray_ko[ui_button_icon_purchase_logo_gray_ko] Flags: 00000000 Languages_Touch: [] @@ -972,8 +972,8 @@ MonoBehaviour: Description: Languages: - ui_button_icon_stop_logo - - Material_zh/Main/recipe/ui_button_icon_stop_logo_zh[ui_button_icon_stop_logo_zh] - - Material_zh/Main/recipe/ui_button_icon_stop_logo_zh[ui_button_icon_stop_logo_zh] + - Material/Main/recipe/ui_button_icon_stop_logo_zh[ui_button_icon_stop_logo_zh] + - Material/Main/recipe/ui_button_icon_stop_logo_zh[ui_button_icon_stop_logo_zh] - Material_ko/Main/recipe/ui_button_icon_stop_logo_ko[ui_button_icon_stop_logo_ko] Flags: 00000000 Languages_Touch: [] @@ -11073,8 +11073,8 @@ MonoBehaviour: Description: Languages: - ui_marketing_Customize_icon_signboard_a - - - - + - Material/marketing/Customize/icon/ui_marketing_Customize_icon_signboard_a_zh[ui_marketing_Customize_icon_signboard_a_zh] + - Material/marketing/Customize/icon/ui_marketing_Customize_icon_signboard_a_zh[ui_marketing_Customize_icon_signboard_a_zh] - Flags: 00000000 Languages_Touch: [] @@ -11083,8 +11083,8 @@ MonoBehaviour: Description: Languages: - ui_marketing_Customize_explanation_text_Dither - - - - + - Material/marketing/Customize/ui_marketing_Customize_explanation_text_zh_Dither[ui_marketing_Customize_explanation_text_zh_Dither] + - Material/marketing/Customize/ui_marketing_Customize_explanation_text_zh_Dither[ui_marketing_Customize_explanation_text_zh_Dither] - Flags: 00000000 Languages_Touch: [] @@ -11093,8 +11093,8 @@ MonoBehaviour: Description: Languages: - ui_marketing_Customize_explanation_title - - - - + - Material/marketing/Customize/ui_marketing_Customize_explanation_title_zh[ui_marketing_Customize_explanation_title_zh] + - Material/marketing/Customize/ui_marketing_Customize_explanation_title_zh[ui_marketing_Customize_explanation_title_zh] - Flags: 00000000 Languages_Touch: [] @@ -11103,8 +11103,8 @@ MonoBehaviour: Description: Languages: - ui_marketing_Customize_icon_decoration2_a - - - - + - Material/marketing/Customize/icon/ui_marketing_Customize_icon_decoration2_a_zh[ui_marketing_Customize_icon_decoration2_a_zh] + - Material/marketing/Customize/icon/ui_marketing_Customize_icon_decoration2_a_zh[ui_marketing_Customize_icon_decoration2_a_zh] - Flags: 00000000 Languages_Touch: [] @@ -11113,8 +11113,8 @@ MonoBehaviour: Description: Languages: - ui_marketing_Customize_icon_decoration2_b - - - - + - Material/marketing/Customize/icon/ui_marketing_Customize_icon_decoration2_b_zh[ui_marketing_Customize_icon_decoration2_b_zh] + - Material/marketing/Customize/icon/ui_marketing_Customize_icon_decoration2_b_zh[ui_marketing_Customize_icon_decoration2_b_zh] - Flags: 00000000 Languages_Touch: [] @@ -11123,8 +11123,8 @@ MonoBehaviour: Description: Languages: - ui_marketing_Customize_icon_decoration2_c - - - - + - Material/marketing/Customize/icon/ui_marketing_Customize_icon_decoration2_c_zh[ui_marketing_Customize_icon_decoration2_c_zh] + - Material/marketing/Customize/icon/ui_marketing_Customize_icon_decoration2_c_zh[ui_marketing_Customize_icon_decoration2_c_zh] - Flags: 00000000 Languages_Touch: [] @@ -11133,8 +11133,8 @@ MonoBehaviour: Description: Languages: - ui_marketing_Customize_icon_signboard_b - - - - + - Material/marketing/Customize/icon/ui_marketing_Customize_icon_signboard_b_zh[ui_marketing_Customize_icon_signboard_b_zh] + - Material/marketing/Customize/icon/ui_marketing_Customize_icon_signboard_b_zh[ui_marketing_Customize_icon_signboard_b_zh] - Flags: 00000000 Languages_Touch: [] @@ -11143,8 +11143,8 @@ MonoBehaviour: Description: Languages: - ui_marketing_Customize_icon_signboard_c - - - - + - Material/marketing/Customize/icon/ui_marketing_Customize_icon_signboard_c_zh[ui_marketing_Customize_icon_signboard_c_zh] + - Material/marketing/Customize/icon/ui_marketing_Customize_icon_signboard_c_zh[ui_marketing_Customize_icon_signboard_c_zh] - Flags: 00000000 Languages_Touch: []