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

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

This commit is contained in:
koya_15 2022-06-03 19:22:48 +09:00
parent e25e0c3efc f1876407ca
commit 09f078acf1
2 changed files with 2 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
popcorn/Assets/MyGame/Resources/PopcornToppings/package_caramel.prefab
View File

@ -131,7 +131,7 @@ PrefabInstance:
- target: {fileID: 1559048620065409971, guid: f31a3e171094b4738b8e06a7991ee004, - target: {fileID: 1559048620065409971, guid: f31a3e171094b4738b8e06a7991ee004,
type: 3} type: 3}
propertyPath: m_RootOrder propertyPath: m_RootOrder
value: 2 value: 1
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 1559048620065409971, guid: f31a3e171094b4738b8e06a7991ee004, - target: {fileID: 1559048620065409971, guid: f31a3e171094b4738b8e06a7991ee004,
type: 3} type: 3}
@ -191,77 +191,3 @@ Animator:
type: 3} type: 3}
m_PrefabInstance: {fileID: 6466389131351865348} m_PrefabInstance: {fileID: 6466389131351865348}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
--- !u!1001 &6466389131411106236
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 1963738094410292613}
m_Modifications:
- target: {fileID: 5594740564505762482, guid: d07b1548d58ee4188baca6c2315fd194,
type: 3}
propertyPath: m_RootOrder
value: 1
objectReference: {fileID: 0}
- target: {fileID: 5594740564505762482, guid: d07b1548d58ee4188baca6c2315fd194,
type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5594740564505762482, guid: d07b1548d58ee4188baca6c2315fd194,
type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5594740564505762482, guid: d07b1548d58ee4188baca6c2315fd194,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5594740564505762482, guid: d07b1548d58ee4188baca6c2315fd194,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 5594740564505762482, guid: d07b1548d58ee4188baca6c2315fd194,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5594740564505762482, guid: d07b1548d58ee4188baca6c2315fd194,
type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5594740564505762482, guid: d07b1548d58ee4188baca6c2315fd194,
type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5594740564505762482, guid: d07b1548d58ee4188baca6c2315fd194,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5594740564505762482, guid: d07b1548d58ee4188baca6c2315fd194,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5594740564505762482, guid: d07b1548d58ee4188baca6c2315fd194,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5594740564505762483, guid: d07b1548d58ee4188baca6c2315fd194,
type: 3}
propertyPath: m_Name
value: material_GratedCheese
objectReference: {fileID: 0}
- target: {fileID: 5594740564505762483, guid: d07b1548d58ee4188baca6c2315fd194,
type: 3}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: d07b1548d58ee4188baca6c2315fd194, type: 3}

2
popcorn/Assets/MyGame/Resources/PopcornToppings/package_soysource.prefab
View File

@ -171,7 +171,7 @@ PrefabInstance:
- target: {fileID: 2990417425342172831, guid: 328bd0a0e24fb40119f24fb2007b941e, - target: {fileID: 2990417425342172831, guid: 328bd0a0e24fb40119f24fb2007b941e,
type: 3} type: 3}
propertyPath: m_IsActive propertyPath: m_IsActive
value: 1 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
m_RemovedComponents: [] m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 328bd0a0e24fb40119f24fb2007b941e, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 328bd0a0e24fb40119f24fb2007b941e, type: 3}