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

Merge branch 'feature/1.3.0' into feature/lang_ver1.3 

# Conflicts:
#	popcorn/Assets/MyGame/Scenes/marketing/Customize.unity
This commit is contained in:
kimura 2022-05-23 16:14:51 +09:00
parent 964e56b5af 5c0e227215
commit a9dacd823d
2 changed files with 177 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

169
popcorn/Assets/MyGame/Scenes/marketing/Customize.unity
View File

@ -467,6 +467,18 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 693515230}
m_Modifications:
- target: {fileID: 2754114606576373327, guid: 6ae614796715fc949a96921656b66a62,
type: 3}
propertyPath: m_Sprite
value:
objectReference: {fileID: 21300000, guid: 80cdf08b5a00c7c4db3e3048590cbb59,
type: 3}
- target: {fileID: 8475355993796972592, guid: 6ae614796715fc949a96921656b66a62,
type: 3}
propertyPath: m_Sprite
value:
objectReference: {fileID: 21300000, guid: 2ddfe1a3b7a7a8744a9ea89ab29f33da,
type: 3}
- target: {fileID: 2754114606576373327, guid: 6ae614796715fc949a96921656b66a62,
type: 3}
propertyPath: m_Sprite
@ -867,6 +879,18 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 693515230}
m_Modifications:
- target: {fileID: 2754114606576373327, guid: 6ae614796715fc949a96921656b66a62,
type: 3}
propertyPath: m_Sprite
value:
objectReference: {fileID: 21300000, guid: 80cdf08b5a00c7c4db3e3048590cbb59,
type: 3}
- target: {fileID: 8475355993796972592, guid: 6ae614796715fc949a96921656b66a62,
type: 3}
propertyPath: m_Sprite
value:
objectReference: {fileID: 21300000, guid: 2ddfe1a3b7a7a8744a9ea89ab29f33da,
type: 3}
- target: {fileID: 2754114606576373327, guid: 6ae614796715fc949a96921656b66a62,
type: 3}
propertyPath: m_Sprite
@ -1454,6 +1478,32 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 429811576}
m_CullTransparentMesh: 0
--- !u!114 &483465779
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: 6725113439449511084}
--- !u!114 &489700872
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: 1428988153}
--- !u!114 &501846075
MonoBehaviour:
m_ObjectHideFlags: 0
@ -2403,7 +2453,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 344445a89b4f74a0e9a0a766903df87e, type: 3}
m_Name:
m_EditorClassIdentifier:
mTerm: ui_button_icon_completion_logo
mTerm: ui_button_icon_Customize_completion_logo
mTermSecondary:
PrimaryTermModifier: 0
SecondaryTermModifier: 0
@ -2426,11 +2476,24 @@ MonoBehaviour:
LocalizeCallBack:
Target: {fileID: 0}
MethodName:
mGUI_ShowReferences: 0
mGUI_ShowReferences: 1
mGUI_ShowTems: 1
mGUI_ShowCallback: 0
mLocalizeTarget: {fileID: 1680478608}
mLocalizeTargetName: I2.Loc.LocalizeTarget_UnityUI_Image
--- !u!114 &765913230
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: 336991183}
--- !u!114 &776291670
MonoBehaviour:
m_ObjectHideFlags: 0
@ -2451,6 +2514,18 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 693515230}
m_Modifications:
- target: {fileID: 2754114606576373327, guid: 6ae614796715fc949a96921656b66a62,
type: 3}
propertyPath: m_Sprite
value:
objectReference: {fileID: 21300000, guid: 80cdf08b5a00c7c4db3e3048590cbb59,
type: 3}
- target: {fileID: 8475355993796972592, guid: 6ae614796715fc949a96921656b66a62,
type: 3}
propertyPath: m_Sprite
value:
objectReference: {fileID: 21300000, guid: 2ddfe1a3b7a7a8744a9ea89ab29f33da,
type: 3}
- target: {fileID: 2754114606576373327, guid: 6ae614796715fc949a96921656b66a62,
type: 3}
propertyPath: m_Sprite
@ -2991,6 +3066,19 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 915074762}
m_CullTransparentMesh: 0
--- !u!114 &920475811
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: 811473977}
--- !u!1 &930271088
GameObject:
m_ObjectHideFlags: 0
@ -4011,6 +4099,32 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: c11194ed6fd84a1f812fa2cfae75f873, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!114 &1387507841
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: 1428988152}
--- !u!114 &1421069203
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: 336991182}
--- !u!114 &1388747217
MonoBehaviour:
m_ObjectHideFlags: 0
@ -4031,6 +4145,18 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 693515230}
m_Modifications:
- target: {fileID: 2754114606576373327, guid: 6ae614796715fc949a96921656b66a62,
type: 3}
propertyPath: m_Sprite
value:
objectReference: {fileID: 21300000, guid: 80cdf08b5a00c7c4db3e3048590cbb59,
type: 3}
- target: {fileID: 8475355993796972592, guid: 6ae614796715fc949a96921656b66a62,
type: 3}
propertyPath: m_Sprite
value:
objectReference: {fileID: 21300000, guid: 2ddfe1a3b7a7a8744a9ea89ab29f33da,
type: 3}
- target: {fileID: 2754114606576373327, guid: 6ae614796715fc949a96921656b66a62,
type: 3}
propertyPath: m_Sprite
@ -4337,6 +4463,19 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1592747031}
m_CullTransparentMesh: 0
--- !u!114 &1595212496
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: 227427383}
--- !u!114 &1617702316
MonoBehaviour:
m_ObjectHideFlags: 0
@ -4583,6 +4722,19 @@ MonoBehaviour:
button: {fileID: 904390283}
onObject: {fileID: 2064821506}
offObject: {fileID: 904390280}
--- !u!114 &1673729061
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: 227427382}
--- !u!114 &1680478608
MonoBehaviour:
m_ObjectHideFlags: 0
@ -4776,6 +4928,19 @@ Transform:
type: 3}
m_PrefabInstance: {fileID: 6725113439449511083}
m_PrefabAsset: {fileID: 0}
--- !u!114 &1829026907
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: 811473978}
--- !u!114 &1826487375
MonoBehaviour:
m_ObjectHideFlags: 0

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

@ -11178,6 +11178,16 @@ MonoBehaviour:
-
Flags: 00000000
Languages_Touch: []
- Term: ui_button_icon_Customize_completion_logo
TermType: 5
Description:
Languages:
- ui_button_icon_completion_logo
-
-
-
Flags: 00000000
Languages_Touch: []
CaseInsensitiveTerms: 0
OnMissingTranslation: 3
mTerm_AppName: