yangwu
/
popcorn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'feature/1.6.0' of bitbucket.org:usaya/popcorn into feature/1.6.0

This commit is contained in:
koya_15 2022-08-09 11:52:14 +09:00
parent c3441c827f 97c2713ee2
commit 06b302d431
2 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
popcorn/Assets/MyGame/Resources/ShopCustomize/Signboard_d.prefab
View File

@ -75,7 +75,7 @@ PrefabInstance:
- target: {fileID: 7129869699020814611, guid: 0db033495b6ff449ea623f57ea9250ef, - target: {fileID: 7129869699020814611, guid: 0db033495b6ff449ea623f57ea9250ef,
type: 3} type: 3}
propertyPath: mTerm propertyPath: mTerm
value: marketing_cart_logo_Dither value: marketing_cart_logo_Procurement_Dither
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 7129869699020814611, guid: 0db033495b6ff449ea623f57ea9250ef, - target: {fileID: 7129869699020814611, guid: 0db033495b6ff449ea623f57ea9250ef,
type: 3} type: 3}
@ -87,6 +87,16 @@ PrefabInstance:
propertyPath: mLocalizeTarget propertyPath: mLocalizeTarget
value: value:
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 7129869699020814611, guid: 0db033495b6ff449ea623f57ea9250ef,
type: 3}
propertyPath: mGUI_ShowReferences
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7129869699020814611, guid: 0db033495b6ff449ea623f57ea9250ef,
type: 3}
propertyPath: mLocalizeTargetName
value: I2.Loc.LocalizeTarget_UnityStandard_SpriteRenderer
objectReference: {fileID: 0}
- target: {fileID: 7129869699020814611, guid: 0db033495b6ff449ea623f57ea9250ef, - target: {fileID: 7129869699020814611, guid: 0db033495b6ff449ea623f57ea9250ef,
type: 3} type: 3}
propertyPath: TranslatedObjects.Array.size propertyPath: TranslatedObjects.Array.size
@ -96,7 +106,7 @@ PrefabInstance:
type: 3} type: 3}
propertyPath: TranslatedObjects.Array.data[0] propertyPath: TranslatedObjects.Array.data[0]
value: value:
objectReference: {fileID: 21300000, guid: cee29e082ddcf9743ab95cb745d03b2f, objectReference: {fileID: 21300000, guid: 838d87bf26c28434aa68f7861a70f82c,
type: 3} type: 3}
- target: {fileID: 8207034540369402946, guid: 0db033495b6ff449ea623f57ea9250ef, - target: {fileID: 8207034540369402946, guid: 0db033495b6ff449ea623f57ea9250ef,
type: 3} type: 3}
@ -109,6 +119,5 @@ PrefabInstance:
propertyPath: m_LocalPosition.y propertyPath: m_LocalPosition.y
value: 0.01 value: 0.01
objectReference: {fileID: 0} objectReference: {fileID: 0}
m_RemovedComponents: m_RemovedComponents: []
- {fileID: 7129869699020814611, guid: 0db033495b6ff449ea623f57ea9250ef, type: 3}
m_SourcePrefab: {fileID: 100100000, guid: 0db033495b6ff449ea623f57ea9250ef, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 0db033495b6ff449ea623f57ea9250ef, type: 3}

11
popcorn/Assets/Resources/I2Languages.asset
View File

@ -13544,6 +13544,17 @@ MonoBehaviour:
- Material_en/marketing/Customize/icon/ui_marketing_Customize_icon_signboard_d_en[ui_marketing_Customize_icon_signboard_d_en] - Material_en/marketing/Customize/icon/ui_marketing_Customize_icon_signboard_d_en[ui_marketing_Customize_icon_signboard_d_en]
Flags: 0000000000 Flags: 0000000000
Languages_Touch: [] Languages_Touch: []
- Term: marketing_cart_logo_Procurement_Dither
TermType: 5
Description:
Languages:
- marketing_cart_logo_Procurement_Dither
-
-
-
-
Flags: 0000000000
Languages_Touch: []
CaseInsensitiveTerms: 0 CaseInsensitiveTerms: 0
OnMissingTranslation: 3 OnMissingTranslation: 3
mTerm_AppName: mTerm_AppName: