diff --git a/popcorn/Assets/MyGame/Resources/Material/Main/Settings/ui_Settings_button_icon_explanation_logo_zh.png b/popcorn/Assets/MyGame/Resources/Material/Main/Settings/ui_Settings_button_icon_explanation_logo_zh.png new file mode 100644 index 00000000..50326d69 Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Material/Main/Settings/ui_Settings_button_icon_explanation_logo_zh.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material/Main/Settings/ui_Settings_button_icon_explanation_logo_zh.png.meta b/popcorn/Assets/MyGame/Resources/Material/Main/Settings/ui_Settings_button_icon_explanation_logo_zh.png.meta new file mode 100644 index 00000000..42e24a31 --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material/Main/Settings/ui_Settings_button_icon_explanation_logo_zh.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: fd0d691e900debc4fa12c1a39bc60098 +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/Resources/Material/Main/Settings/ui_Settings_explanation_HowToPlay_zh_Dither.png b/popcorn/Assets/MyGame/Resources/Material/Main/Settings/ui_Settings_explanation_HowToPlay_zh_Dither.png new file mode 100644 index 00000000..a724524e Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Material/Main/Settings/ui_Settings_explanation_HowToPlay_zh_Dither.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material/Main/Settings/ui_Settings_explanation_HowToPlay_zh_Dither.png.meta b/popcorn/Assets/MyGame/Resources/Material/Main/Settings/ui_Settings_explanation_HowToPlay_zh_Dither.png.meta new file mode 100644 index 00000000..be7055d0 --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material/Main/Settings/ui_Settings_explanation_HowToPlay_zh_Dither.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: dccb11677f958d1429131d3a9e07b06f +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/Resources/Material/Main/Settings/ui_Settings_explanation_popcorn_zh_Dither.png b/popcorn/Assets/MyGame/Resources/Material/Main/Settings/ui_Settings_explanation_popcorn_zh_Dither.png new file mode 100644 index 00000000..44e3ef8d Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Material/Main/Settings/ui_Settings_explanation_popcorn_zh_Dither.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material/Main/Settings/ui_Settings_explanation_popcorn_zh_Dither.png.meta b/popcorn/Assets/MyGame/Resources/Material/Main/Settings/ui_Settings_explanation_popcorn_zh_Dither.png.meta new file mode 100644 index 00000000..b605e441 --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material/Main/Settings/ui_Settings_explanation_popcorn_zh_Dither.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: 9a2a6c20c9c271945a0dd638fc319aba +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/Resources/Material/Main/Settings/ui_Settings_explanation_stock_zh_Dither.png b/popcorn/Assets/MyGame/Resources/Material/Main/Settings/ui_Settings_explanation_stock_zh_Dither.png new file mode 100644 index 00000000..1e35e1ae Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Material/Main/Settings/ui_Settings_explanation_stock_zh_Dither.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material/Main/Settings/ui_Settings_explanation_stock_zh_Dither.png.meta b/popcorn/Assets/MyGame/Resources/Material/Main/Settings/ui_Settings_explanation_stock_zh_Dither.png.meta new file mode 100644 index 00000000..41725235 --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material/Main/Settings/ui_Settings_explanation_stock_zh_Dither.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: df69c279b326c604bbc025b575d26a9d +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/Resources/Material/marketing/ui_button_icon_Footer_publicityVip_logo_zh.png b/popcorn/Assets/MyGame/Resources/Material/marketing/ui_button_icon_Footer_publicityVip_logo_zh.png new file mode 100644 index 00000000..b8675532 Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Material/marketing/ui_button_icon_Footer_publicityVip_logo_zh.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material/marketing/ui_button_icon_Footer_publicityVip_logo_zh.png.meta b/popcorn/Assets/MyGame/Resources/Material/marketing/ui_button_icon_Footer_publicityVip_logo_zh.png.meta new file mode 100644 index 00000000..bff62ef0 --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material/marketing/ui_button_icon_Footer_publicityVip_logo_zh.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: 44bc300b74c808f4ca57cd189c7c5310 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Canvas.prefab b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Canvas.prefab index 24111b13..d025f968 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Canvas.prefab +++ b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Canvas.prefab @@ -3247,6 +3247,7 @@ GameObject: - component: {fileID: 2459226624512455357} - component: {fileID: 5756465118540328855} - component: {fileID: 2120334880664306397} + - component: {fileID: 4290223053080632699} m_Layer: 5 m_Name: Image_text m_TagString: Untagged @@ -3302,7 +3303,7 @@ MonoBehaviour: m_Calls: [] m_Sprite: {fileID: 21300000, guid: 7790c7ac777220c43b20f746837042ba, type: 3} m_Type: 0 - m_PreserveAspect: 0 + m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 @@ -3310,6 +3311,46 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!114 &4290223053080632699 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8920108257775527304} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 344445a89b4f74a0e9a0a766903df87e, type: 3} + m_Name: + m_EditorClassIdentifier: + mTerm: ui_button_icon_Footer_publicityVip_logo + mTermSecondary: + PrimaryTermModifier: 0 + SecondaryTermModifier: 0 + TermPrefix: + TermSuffix: + LocalizeOnAwake: 1 + IgnoreRTL: 0 + MaxCharactersInRTL: 0 + IgnoreNumbersInRTL: 1 + CorrectAlignmentForRTL: 1 + AddSpacesToJoinedLanguages: 0 + AllowLocalizedParameters: 1 + AllowParameters: 1 + TranslatedObjects: + - {fileID: 21300000, guid: 7790c7ac777220c43b20f746837042ba, type: 3} + LocalizeEvent: + m_PersistentCalls: + m_Calls: [] + AlwaysForceLocalize: 0 + LocalizeCallBack: + Target: {fileID: 0} + MethodName: + mGUI_ShowReferences: 0 + mGUI_ShowTems: 1 + mGUI_ShowCallback: 0 + mLocalizeTarget: {fileID: 0} + mLocalizeTargetName: I2.Loc.LocalizeTarget_UnityUI_Image --- !u!1001 &2246654624185019878 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/popcorn/Assets/MyGame/Scenes/Settings/HowToPlay.unity b/popcorn/Assets/MyGame/Scenes/Settings/HowToPlay.unity index 9df1dfbe..837ff6a3 100644 --- a/popcorn/Assets/MyGame/Scenes/Settings/HowToPlay.unity +++ b/popcorn/Assets/MyGame/Scenes/Settings/HowToPlay.unity @@ -349,6 +349,19 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 0} +--- !u!114 &469389305 +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: 1517093069} --- !u!1 &567241585 GameObject: m_ObjectHideFlags: 0 @@ -492,6 +505,7 @@ GameObject: - component: {fileID: 996499145} - component: {fileID: 996499148} - component: {fileID: 996499147} + - component: {fileID: 996499146} m_Layer: 5 m_Name: HowToPlay m_TagString: Untagged @@ -518,6 +532,46 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 77.99997} m_SizeDelta: {x: 1056, y: 1404} m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &996499146 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 996499144} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 344445a89b4f74a0e9a0a766903df87e, type: 3} + m_Name: + m_EditorClassIdentifier: + mTerm: ui_Settings_explanation_HowToPlay_Dither + mTermSecondary: + PrimaryTermModifier: 0 + SecondaryTermModifier: 0 + TermPrefix: + TermSuffix: + LocalizeOnAwake: 1 + IgnoreRTL: 0 + MaxCharactersInRTL: 0 + IgnoreNumbersInRTL: 1 + CorrectAlignmentForRTL: 1 + AddSpacesToJoinedLanguages: 0 + AllowLocalizedParameters: 1 + AllowParameters: 1 + TranslatedObjects: + - {fileID: 21300000, guid: 004fade0ce34e974fb146a0502a917cf, type: 3} + LocalizeEvent: + m_PersistentCalls: + m_Calls: [] + AlwaysForceLocalize: 0 + LocalizeCallBack: + Target: {fileID: 0} + MethodName: + mGUI_ShowReferences: 0 + mGUI_ShowTems: 1 + mGUI_ShowCallback: 0 + mLocalizeTarget: {fileID: 1828636187} + mLocalizeTargetName: I2.Loc.LocalizeTarget_UnityUI_Image --- !u!114 &996499147 MonoBehaviour: m_ObjectHideFlags: 0 @@ -868,6 +922,7 @@ GameObject: - component: {fileID: 1517093068} - component: {fileID: 1517093070} - component: {fileID: 1517093069} + - component: {fileID: 1517093071} m_Layer: 5 m_Name: stock m_TagString: Untagged @@ -931,6 +986,59 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1517093067} m_CullTransparentMesh: 0 +--- !u!114 &1517093071 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1517093067} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 344445a89b4f74a0e9a0a766903df87e, type: 3} + m_Name: + m_EditorClassIdentifier: + mTerm: ui_Settings_explanation_stock_Dither + mTermSecondary: + PrimaryTermModifier: 0 + SecondaryTermModifier: 0 + TermPrefix: + TermSuffix: + LocalizeOnAwake: 1 + IgnoreRTL: 0 + MaxCharactersInRTL: 0 + IgnoreNumbersInRTL: 1 + CorrectAlignmentForRTL: 1 + AddSpacesToJoinedLanguages: 0 + AllowLocalizedParameters: 1 + AllowParameters: 1 + TranslatedObjects: + - {fileID: 21300000, guid: b9e09ac9e9faab64887df9fe0b51c833, type: 3} + LocalizeEvent: + m_PersistentCalls: + m_Calls: [] + AlwaysForceLocalize: 0 + LocalizeCallBack: + Target: {fileID: 0} + MethodName: + mGUI_ShowReferences: 0 + mGUI_ShowTems: 1 + mGUI_ShowCallback: 0 + mLocalizeTarget: {fileID: 469389305} + mLocalizeTargetName: I2.Loc.LocalizeTarget_UnityUI_Image +--- !u!114 &1621774272 +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: 2062565275} --- !u!1 &1647364801 GameObject: m_ObjectHideFlags: 0 @@ -1185,6 +1293,19 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1828080666} m_CullTransparentMesh: 0 +--- !u!114 &1828636187 +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: 996499147} --- !u!1 &2062565273 GameObject: m_ObjectHideFlags: 0 @@ -1196,6 +1317,7 @@ GameObject: - component: {fileID: 2062565274} - component: {fileID: 2062565276} - component: {fileID: 2062565275} + - component: {fileID: 2062565277} m_Layer: 5 m_Name: popcorn m_TagString: Untagged @@ -1259,3 +1381,43 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2062565273} m_CullTransparentMesh: 0 +--- !u!114 &2062565277 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2062565273} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 344445a89b4f74a0e9a0a766903df87e, type: 3} + m_Name: + m_EditorClassIdentifier: + mTerm: ui_Settings_explanation_popcorn_Dither + mTermSecondary: + PrimaryTermModifier: 0 + SecondaryTermModifier: 0 + TermPrefix: + TermSuffix: + LocalizeOnAwake: 1 + IgnoreRTL: 0 + MaxCharactersInRTL: 0 + IgnoreNumbersInRTL: 1 + CorrectAlignmentForRTL: 1 + AddSpacesToJoinedLanguages: 0 + AllowLocalizedParameters: 1 + AllowParameters: 1 + TranslatedObjects: + - {fileID: 21300000, guid: 964305483ca17b74b9ea433c844492da, type: 3} + LocalizeEvent: + m_PersistentCalls: + m_Calls: [] + AlwaysForceLocalize: 0 + LocalizeCallBack: + Target: {fileID: 0} + MethodName: + mGUI_ShowReferences: 0 + mGUI_ShowTems: 1 + mGUI_ShowCallback: 0 + mLocalizeTarget: {fileID: 1621774272} + mLocalizeTargetName: I2.Loc.LocalizeTarget_UnityUI_Image diff --git a/popcorn/Assets/MyGame/Scenes/Settings/SettingsDialog.unity b/popcorn/Assets/MyGame/Scenes/Settings/SettingsDialog.unity index 4b141c8a..1102f80c 100644 --- a/popcorn/Assets/MyGame/Scenes/Settings/SettingsDialog.unity +++ b/popcorn/Assets/MyGame/Scenes/Settings/SettingsDialog.unity @@ -678,7 +678,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 3acd48f1b6c81e443a46bc4ab8d73cc9, type: 3} + m_Sprite: {fileID: 21300000, guid: 48a19685ae3cb4a35a515ce2008d356f, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -2001,7 +2001,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 44ace36fbac0cf04ab64b7662510f857, type: 3} + m_Sprite: {fileID: 21300000, guid: f015130537791494d8863270c6ad48a2, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -2096,6 +2096,19 @@ RectTransform: m_AnchoredPosition: {x: -171, y: -65.999954} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1282817042 +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: 1794914336} --- !u!1 &1283939611 GameObject: m_ObjectHideFlags: 0 @@ -2227,7 +2240,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 98a9ddfc9714daf4e8adb9bc86f701c8, type: 3} + m_Sprite: {fileID: 21300000, guid: 688f8e948445445d88cc957d0ac66719, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -3221,6 +3234,7 @@ GameObject: - component: {fileID: 1794914334} - component: {fileID: 1794914337} - component: {fileID: 1794914336} + - component: {fileID: 1794914335} m_Layer: 5 m_Name: Image_text m_TagString: Untagged @@ -3245,8 +3259,48 @@ 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: 96, y: 40} + m_SizeDelta: {x: 122, y: 40} m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1794914335 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1794914333} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 344445a89b4f74a0e9a0a766903df87e, type: 3} + m_Name: + m_EditorClassIdentifier: + mTerm: ui_Settings_button_icon_explanation_logo + mTermSecondary: + PrimaryTermModifier: 0 + SecondaryTermModifier: 0 + TermPrefix: + TermSuffix: + LocalizeOnAwake: 1 + IgnoreRTL: 0 + MaxCharactersInRTL: 0 + IgnoreNumbersInRTL: 1 + CorrectAlignmentForRTL: 1 + AddSpacesToJoinedLanguages: 0 + AllowLocalizedParameters: 1 + AllowParameters: 1 + TranslatedObjects: + - {fileID: 21300000, guid: 5af21af3758285443984ca29acf06c80, type: 3} + LocalizeEvent: + m_PersistentCalls: + m_Calls: [] + AlwaysForceLocalize: 0 + LocalizeCallBack: + Target: {fileID: 0} + MethodName: + mGUI_ShowReferences: 0 + mGUI_ShowTems: 1 + mGUI_ShowCallback: 0 + mLocalizeTarget: {fileID: 1282817042} + mLocalizeTargetName: I2.Loc.LocalizeTarget_UnityUI_Image --- !u!114 &1794914336 MonoBehaviour: m_ObjectHideFlags: 0 @@ -3266,9 +3320,9 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 5af21af3758285443984ca29acf06c80, type: 3} + m_Sprite: {fileID: 21300000, guid: fd0d691e900debc4fa12c1a39bc60098, type: 3} m_Type: 0 - m_PreserveAspect: 0 + m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 @@ -3490,7 +3544,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 diff --git a/popcorn/Assets/MyGame/Scenes/marketing/marketing.unity b/popcorn/Assets/MyGame/Scenes/marketing/marketing.unity index 4552c37c..daf9a8e6 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/marketing.unity +++ b/popcorn/Assets/MyGame/Scenes/marketing/marketing.unity @@ -539,19 +539,6 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 ---- !u!114 &123321434 -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: 714437473} --- !u!1 &151001427 GameObject: m_ObjectHideFlags: 0 @@ -1343,19 +1330,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4a8efaaa187d4865a1b4cabfa40ab6e9, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!114 &250933038 -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: 714437475} --- !u!1 &286834611 GameObject: m_ObjectHideFlags: 0 @@ -2348,32 +2322,6 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!114 &520255033 -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: 714437467} ---- !u!114 &569342099 -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: 714437468} --- !u!1 &573372296 GameObject: m_ObjectHideFlags: 0 @@ -2956,19 +2904,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c11194ed6fd84a1f812fa2cfae75f873, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!114 &663901785 -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: 714437470} --- !u!1 &668553842 GameObject: m_ObjectHideFlags: 0 @@ -4112,138 +4047,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 817f9d5cab724bb8a22de5e9dbd2f967, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!114 &714437467 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 3664916832330421304, guid: caaa748dbeed576499e8cae74d33f689, - type: 3} - m_PrefabInstance: {fileID: 714437464} - 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 &714437468 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 390120330251131619, guid: caaa748dbeed576499e8cae74d33f689, - type: 3} - m_PrefabInstance: {fileID: 714437464} - 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 &714437469 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 3664916832434116137, guid: caaa748dbeed576499e8cae74d33f689, - type: 3} - m_PrefabInstance: {fileID: 714437464} - 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 &714437470 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 3664916832642567898, guid: caaa748dbeed576499e8cae74d33f689, - type: 3} - m_PrefabInstance: {fileID: 714437464} - 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 &714437471 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 3664916834061038029, guid: caaa748dbeed576499e8cae74d33f689, - type: 3} - m_PrefabInstance: {fileID: 714437464} - 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 &714437472 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 8117515348220274205, guid: caaa748dbeed576499e8cae74d33f689, - type: 3} - m_PrefabInstance: {fileID: 714437464} - 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 &714437473 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 521511634720853184, guid: caaa748dbeed576499e8cae74d33f689, - type: 3} - m_PrefabInstance: {fileID: 714437464} - 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 &714437474 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 4466880344787820340, guid: caaa748dbeed576499e8cae74d33f689, - type: 3} - m_PrefabInstance: {fileID: 714437464} - 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 &714437475 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 1750965193008879782, guid: caaa748dbeed576499e8cae74d33f689, - type: 3} - m_PrefabInstance: {fileID: 714437464} - 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 &714437476 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 1464061990, guid: caaa748dbeed576499e8cae74d33f689, - type: 3} - m_PrefabInstance: {fileID: 714437464} - 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 &714437477 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 1339603270, guid: caaa748dbeed576499e8cae74d33f689, - type: 3} - m_PrefabInstance: {fileID: 714437464} - 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!1 &716489324 GameObject: m_ObjectHideFlags: 0 @@ -4865,19 +4668,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: mTarget: {fileID: 668553844} ---- !u!114 &796998238 -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: 714437474} --- !u!114 &820175261 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 4251265789366133276, guid: caaa748dbeed576499e8cae74d33f689, @@ -5149,19 +4939,6 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!114 &927508815 -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: 714437472} --- !u!1 &944070333 GameObject: m_ObjectHideFlags: 0 @@ -6264,19 +6041,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1075915152} m_PrefabAsset: {fileID: 0} ---- !u!114 &1084142944 -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: 714437477} --- !u!1 &1102296789 GameObject: m_ObjectHideFlags: 0 @@ -6990,19 +6754,6 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!114 &1241849007 -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: 714437476} --- !u!1 &1258737857 GameObject: m_ObjectHideFlags: 0 @@ -7493,19 +7244,6 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!114 &1406819211 -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: 714437471} --- !u!1 &1423968761 GameObject: m_ObjectHideFlags: 0 @@ -13843,19 +13581,6 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!114 &1664312366 -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: 714437469} --- !u!1 &1673653407 GameObject: m_ObjectHideFlags: 0 diff --git a/popcorn/Assets/Resources/I2Languages.asset b/popcorn/Assets/Resources/I2Languages.asset index e4c98910..30e8690e 100644 --- a/popcorn/Assets/Resources/I2Languages.asset +++ b/popcorn/Assets/Resources/I2Languages.asset @@ -1594,9 +1594,9 @@ MonoBehaviour: Description: Languages: - "VIP\u306A\u304A\u5BA2\u306B\u304A\u9858\u3044\u3059\u308B\u3068\nVIP\u306A\u304A\u53CB\u9054\u3092\u9023\u308C\u3066\u304D\u3066\u304F\u308C\u308B\u3088\uFF01\n\u52D5\u753B\u3092\u898B\u3066\u304A\u9858\u3044\u3057\u307E\u3059\u304B\uFF1F" - - - - - - + - "\u662F\u5426\u89C2\u770B\u89C6\u9891\uFF0C\u8BA9\u4F60\u7684VIP\u987E\u5BA2\u5E26\u4ED6\u4EEC\u7684\u670B\u53CB\u8FC7\u6765\u5462\uFF1F" + - "\u662F\u5426\u89C0\u770B\u8996\u983B\uFF0C\u8B93\u4F60\u7684VIP\u9867\u5BA2\u5E36\u4ED6\u5011\u7684\u670B\u53CB\u904E\u4F86\u5462\uFF1F" + - VipCustomerMessage Flags: 00000000 Languages_Touch: [] - Term: Mission/MissionText0001 @@ -1605,8 +1605,8 @@ MonoBehaviour: Languages: - "\u30DD\u30C3\u30D7\u30B3\u30FC\u30F3\u306E\u7C92\u3092\u53CE\u7A6B\u3057\u3088\u3046 Lv.1" - - "\u6536\u83B7\u7389\u7C73\u7C92\u5427\uFF01" - - "\u6536\u7372\u7389\u7C73\u7C92\u5427\uFF01" + - "\u6536\u83B7\u7389\u7C73\u7C92\u5427\uFF01Lv.1" + - "\u6536\u7372\u7389\u7C73\u7C92\u5427\uFF01Lv.1" - MissionText0001 Flags: 00000000 Languages_Touch: [] @@ -1616,8 +1616,8 @@ MonoBehaviour: Languages: - "\u30DD\u30C3\u30D7\u30B3\u30FC\u30F3\u306E\u7C92\u3092\u53CE\u7A6B\u3057\u3088\u3046 Lv.2" - - "\u6536\u83B7\u7389\u7C73\u7C92\u5427\uFF01" - - "\u6536\u7372\u7389\u7C73\u7C92\u5427\uFF01" + - "\u6536\u83B7\u7389\u7C73\u7C92\u5427\uFF01Lv.2" + - "\u6536\u7372\u7389\u7C73\u7C92\u5427\uFF01Lv.2" - MissionText0002 Flags: 00000000 Languages_Touch: [] @@ -1627,8 +1627,8 @@ MonoBehaviour: Languages: - "\u30DD\u30C3\u30D7\u30B3\u30FC\u30F3\u306E\u7C92\u3092\u53CE\u7A6B\u3057\u3088\u3046 Lv.3" - - "\u6536\u83B7\u7389\u7C73\u7C92\u5427\uFF01" - - "\u6536\u7372\u7389\u7C73\u7C92\u5427\uFF01" + - "\u6536\u83B7\u7389\u7C73\u7C92\u5427\uFF01Lv.3" + - "\u6536\u7372\u7389\u7C73\u7C92\u5427\uFF01Lv.3" - MissionText0003 Flags: 00000000 Languages_Touch: [] @@ -1638,8 +1638,8 @@ MonoBehaviour: Languages: - "\u30DD\u30C3\u30D7\u30B3\u30FC\u30F3\u306E\u7C92\u3092\u53CE\u7A6B\u3057\u3088\u3046 Lv.4" - - "\u6536\u83B7\u7389\u7C73\u7C92\u5427\uFF01" - - "\u6536\u7372\u7389\u7C73\u7C92\u5427\uFF01" + - "\u6536\u83B7\u7389\u7C73\u7C92\u5427\uFF01Lv.4" + - "\u6536\u7372\u7389\u7C73\u7C92\u5427\uFF01Lv.4" - MissionText0004 Flags: 00000000 Languages_Touch: [] @@ -1649,8 +1649,8 @@ MonoBehaviour: Languages: - "\u30DD\u30C3\u30D7\u30B3\u30FC\u30F3\u306E\u7C92\u3092\u53CE\u7A6B\u3057\u3088\u3046 Lv.5" - - "\u6536\u83B7\u7389\u7C73\u7C92\u5427\uFF01" - - "\u6536\u7372\u7389\u7C73\u7C92\u5427\uFF01" + - "\u6536\u83B7\u7389\u7C73\u7C92\u5427\uFF01Lv.5" + - "\u6536\u7372\u7389\u7C73\u7C92\u5427\uFF01Lv.5" - MissionText0005 Flags: 00000000 Languages_Touch: [] @@ -1660,8 +1660,8 @@ MonoBehaviour: Languages: - "\u30DD\u30C3\u30D7\u30B3\u30FC\u30F3\u306E\u7C92\u3092\u53CE\u7A6B\u3057\u3088\u3046 Lv.6" - - "\u6536\u83B7\u7389\u7C73\u7C92\u5427\uFF01" - - "\u6536\u7372\u7389\u7C73\u7C92\u5427\uFF01" + - "\u6536\u83B7\u7389\u7C73\u7C92\u5427\uFF01Lv.6" + - "\u6536\u7372\u7389\u7C73\u7C92\u5427\uFF01Lv.6" - MissionText0006 Flags: 00000000 Languages_Touch: [] @@ -1671,8 +1671,8 @@ MonoBehaviour: Languages: - "\u30DD\u30C3\u30D7\u30B3\u30FC\u30F3\u306E\u7C92\u3092\u53CE\u7A6B\u3057\u3088\u3046 Lv.7" - - "\u6536\u83B7\u7389\u7C73\u7C92\u5427\uFF01" - - "\u6536\u7372\u7389\u7C73\u7C92\u5427\uFF01" + - "\u6536\u83B7\u7389\u7C73\u7C92\u5427\uFF01Lv.7" + - "\u6536\u7372\u7389\u7C73\u7C92\u5427\uFF01Lv.7" - MissionText0007 Flags: 00000000 Languages_Touch: [] @@ -1682,8 +1682,8 @@ MonoBehaviour: Languages: - "\u30DD\u30C3\u30D7\u30B3\u30FC\u30F3\u306E\u7C92\u3092\u53CE\u7A6B\u3057\u3088\u3046 Lv.8" - - "\u6536\u83B7\u7389\u7C73\u7C92\u5427\uFF01" - - "\u6536\u7372\u7389\u7C73\u7C92\u5427\uFF01" + - "\u6536\u83B7\u7389\u7C73\u7C92\u5427\uFF01Lv.8" + - "\u6536\u7372\u7389\u7C73\u7C92\u5427\uFF01Lv.8" - MissionText0008 Flags: 00000000 Languages_Touch: [] @@ -1693,8 +1693,8 @@ MonoBehaviour: Languages: - "\u30DD\u30C3\u30D7\u30B3\u30FC\u30F3\u306E\u7C92\u3092\u53CE\u7A6B\u3057\u3088\u3046 Lv.9" - - "\u6536\u83B7\u7389\u7C73\u7C92\u5427\uFF01" - - "\u6536\u7372\u7389\u7C73\u7C92\u5427\uFF01" + - "\u6536\u83B7\u7389\u7C73\u7C92\u5427\uFF01Lv.9" + - "\u6536\u7372\u7389\u7C73\u7C92\u5427\uFF01Lv.9" - MissionText0009 Flags: 00000000 Languages_Touch: [] @@ -1704,8 +1704,8 @@ MonoBehaviour: Languages: - "\u30DD\u30C3\u30D7\u30B3\u30FC\u30F3\u306E\u7C92\u3092\u53CE\u7A6B\u3057\u3088\u3046 Lv.10" - - "\u6536\u83B7\u7389\u7C73\u7C92\u5427\uFF01" - - "\u6536\u7372\u7389\u7C73\u7C92\u5427\uFF01" + - "\u6536\u83B7\u7389\u7C73\u7C92\u5427\uFF01Lv.10" + - "\u6536\u7372\u7389\u7C73\u7C92\u5427\uFF01Lv.10" - MissionText0010 Flags: 00000000 Languages_Touch: [] @@ -6094,8 +6094,8 @@ MonoBehaviour: Description: Languages: - "\u3055\u3063\u304D\u306E\u304A\u5BA2\u3055\u3093\u3001\u98DB\u884C\u6A5F\u30672\u6642\u9593\u3082\u304B\u3051\u3066\n\u50D5\u305F\u3061\u306E\u304A\u5E97\u307E\u3067\u8CB7\u3044\u306B\u6765\u3066\u304F\u308C\u305F\u3093\u3060\u3063\u3066\uFF01" - - - - + - "\u636E\u8BF4\u521A\u521A\u7684\u5BA2\u4EBA\u53EF\u662F\u4E13\u7A0B\u82B1\u4E86\u4E24\u4E2A\u5C0F\u65F6\u5750\u98DE\u673A\u6765\u6211\u4EEC\u5E97\u91CC\u7684\u5462\uFF01" + - "\u64DA\u8AAA\u525B\u525B\u7684\u5BA2\u4EBA\u53EF\u662F\u5C08\u7A0B\u82B1\u4E86\u5169\u500B\u5C0F\u6642\u5750\u98DB\u6A5F\u4F86\u6211\u5011\u5E97\u88CF\u7684\u5462\uFF01" - BrotherScript10084 Flags: 00000000 Languages_Touch: [] @@ -6104,8 +6104,8 @@ MonoBehaviour: Description: Languages: - "\u3068\u3044\u3046\u3053\u3068\u306F\u5F80\u5FA9\u3067\u4EA4\u901A\u8CBB\u304C\u2026" - - - - + - "\u8FD9\u3002\u3002\u3002\u5F80\u8FD4\u4EA4\u901A\u8D39\u8981\u3002\u3002\u3002\u3002" + - "\u9019\u3002\u3002\u3002\u5F80\u8FD4\u4EA4\u901A\u8CBB\u8981\u3002\u3002\u3002\u3002" - BrotherScript10085 Flags: 00000000 Languages_Touch: [] @@ -6114,8 +6114,8 @@ MonoBehaviour: Description: Languages: - "\u2026\u2026" - - - - + - "\u2026\u2026" + - "\u2026\u2026" - BrotherScript10086 Flags: 00000000 Languages_Touch: [] @@ -6124,8 +6124,8 @@ MonoBehaviour: Description: Languages: - "\u3053\u308C\u304B\u3089\u3082\u9811\u5F35\u3063\u3066\u7F8E\u5473\u3057\u3044\n\u30DD\u30C3\u30D7\u30B3\u30FC\u30F3\u3092\u4F5C\u3089\u306A\u304D\u3083\u3060\u306D\u2026\uFF01\uFF01" - - - - + - "\u770B\u6765\u6211\u4EEC\u4EE5\u540E\u8981\u505A\u51FA\u66F4\u52A0\u597D\u5403\u7684\u7206\u7C73\u82B1\u624D\u53EF\u4EE5\u5462\uFF01" + - "\u770B\u4F86\u6211\u5011\u4EE5\u5F8C\u8981\u505A\u51FA\u66F4\u52A0\u597D\u5403\u7684\u7206\u7C73\u82B1\u624D\u53EF\u4EE5\u5462\uFF01" - BrotherScript10087 Flags: 00000000 Languages_Touch: [] @@ -6344,8 +6344,8 @@ MonoBehaviour: Description: Languages: - "\u301C\u8ABF\u7406\u4E2D\u301C" - - - - + - "\u301C\u5236\u4F5C\u4E2D\u301C" + - "\u301C\u8ABF\u7406\u4E2D\u301C" - Flags: 00000000 Languages_Touch: [] @@ -6354,8 +6354,8 @@ MonoBehaviour: Description: Languages: - "\u301C\u9673\u5217\u4E2D\u301C" - - - - + - "\u301C\u9648\u5217\u4E2D\u301C" + - "\u301C\u9673\u5217\u4E2D\u301C" - Flags: 00000000 Languages_Touch: [] @@ -6364,8 +6364,8 @@ MonoBehaviour: Description: Languages: - "\u301C\u53CE\u7A6B\u4E2D\u301C" - - - - + - "\u301C\u6536\u83B7\u4E2D\u301C" + - "\u301C\u53CE\u7A6B\u4E2D\u301C" - Flags: 00000000 Languages_Touch: [] @@ -6374,8 +6374,8 @@ MonoBehaviour: Description: Languages: - "\u301C\u8CFC\u5165\u4E2D\u301C" - - - - + - "\u301C\u8D2D\u5165\u4E2D\u301C" + - "\u301C\u8CFC\u5165\u4E2D\u301C" - Flags: 00000000 Languages_Touch: [] @@ -9034,8 +9034,8 @@ MonoBehaviour: Description: Languages: - "\u5168\u56FD\u5C48\u6307\u306E\u304A\u83D3\u5B50\u5E97" - - - - + - "\u5168\u56FD\u5C48\u6307\u53EF\u6570\u7684\u540D\u5E97" + - "\u5168\u570B\u5C48\u6307\u53EF\u6578\u7684\u540D\u5E97" - ShopLevelText0016 Flags: 00000000 Languages_Touch: [] @@ -9069,16 +9069,6 @@ MonoBehaviour: - Flags: 00000000 Languages_Touch: [] - - Term: UnityWhite - TermType: 5 - Description: - Languages: - - ui_button_icon_Learned_logo - - Material/Main/recipe/ui_button_icon_close_logo_zh[ui_button_icon_close_logo_zh] - - - - - Flags: 00000000 - Languages_Touch: [] CaseInsensitiveTerms: 0 OnMissingTranslation: 3 mTerm_AppName: @@ -9100,7 +9090,7 @@ MonoBehaviour: Google_WebServiceURL: https://script.google.com/a/macros/usaya.jp/s/AKfycbzSBhEFwZVCfg1dkGwVNsYBgv460KeK1X-gKOxsu89c8EkzjZmPR3kOWC_EVVyii6Xt4w/exec Google_SpreadsheetKey: 1jfQDKhWF5LDrIA_xkhvBOVczqi-7YMQFd-wlN2BIqI8 Google_SpreadsheetName: I2Loc popcorn Localization - Google_LastUpdatedVersion: 1644478360263 + Google_LastUpdatedVersion: 1645608914960 Google_Password: change_this GoogleUpdateFrequency: 1 GoogleInEditorCheckFrequency: 1