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

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

This commit is contained in:
koya_15 2021-11-24 18:56:41 +09:00
parent 216b5ac012 cf822e1657
commit 53e8a846a3
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Description.prefab
View File

@ -2500,6 +2500,11 @@ PrefabInstance:
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7347831002230456565, guid: 769012ad2d933ed439e798970ef29fdd,
type: 3}
propertyPath: rarity
value: 1
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 769012ad2d933ed439e798970ef29fdd, type: 3}
--- !u!224 &3084478268397759140 stripped
@ -3397,6 +3402,12 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 769012ad2d933ed439e798970ef29fdd, type: 3}
--- !u!224 &3613327422686341716 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 551217487534969408, guid: 769012ad2d933ed439e798970ef29fdd,
type: 3}
m_PrefabInstance: {fileID: 3856012876160759828}
m_PrefabAsset: {fileID: 0}
--- !u!114 &5799495140018518241 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 7347831002230456565, guid: 769012ad2d933ed439e798970ef29fdd,
@ -3409,9 +3420,3 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: b0dc9cb18f7548c6a51cf39c843c54ef, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!224 &3613327422686341716 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 551217487534969408, guid: 769012ad2d933ed439e798970ef29fdd,
type: 3}
m_PrefabInstance: {fileID: 3856012876160759828}
m_PrefabAsset: {fileID: 0}