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

* 'develop' of https://bitbucket.org/usaya/popcorn:
  パーティクルが表示されていないところ調整
This commit is contained in:
kimura 2021-09-16 14:58:13 +09:00
commit 7eac7c89b2
3 changed files with 466 additions and 0 deletions

View File

@ -121,6 +121,101 @@ NavMeshSettings:
debug:
m_Flags: 0
m_NavMeshData: {fileID: 0}
--- !u!1001 &1908326069
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 3856012874773314170}
m_Modifications:
- target: {fileID: 9117079084301130545, guid: 021717b65b165374faa3fcffaafedfc2,
type: 3}
propertyPath: m_RootOrder
value: 2
objectReference: {fileID: 0}
- target: {fileID: 9117079084301130545, guid: 021717b65b165374faa3fcffaafedfc2,
type: 3}
propertyPath: m_LocalScale.x
value: 1
objectReference: {fileID: 0}
- target: {fileID: 9117079084301130545, guid: 021717b65b165374faa3fcffaafedfc2,
type: 3}
propertyPath: m_LocalScale.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 9117079084301130545, guid: 021717b65b165374faa3fcffaafedfc2,
type: 3}
propertyPath: m_LocalScale.z
value: 1
objectReference: {fileID: 0}
- target: {fileID: 9117079084301130545, guid: 021717b65b165374faa3fcffaafedfc2,
type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 9117079084301130545, guid: 021717b65b165374faa3fcffaafedfc2,
type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 9117079084301130545, guid: 021717b65b165374faa3fcffaafedfc2,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 9117079084301130545, guid: 021717b65b165374faa3fcffaafedfc2,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 9117079084301130545, guid: 021717b65b165374faa3fcffaafedfc2,
type: 3}
propertyPath: m_LocalRotation.x
value: -0
objectReference: {fileID: 0}
- target: {fileID: 9117079084301130545, guid: 021717b65b165374faa3fcffaafedfc2,
type: 3}
propertyPath: m_LocalRotation.y
value: -0
objectReference: {fileID: 0}
- target: {fileID: 9117079084301130545, guid: 021717b65b165374faa3fcffaafedfc2,
type: 3}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: 9117079084301130545, guid: 021717b65b165374faa3fcffaafedfc2,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 9117079084301130545, guid: 021717b65b165374faa3fcffaafedfc2,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 9117079084301130545, guid: 021717b65b165374faa3fcffaafedfc2,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 9117079084301130547, guid: 021717b65b165374faa3fcffaafedfc2,
type: 3}
propertyPath: m_Name
value: UICamera (1)
objectReference: {fileID: 0}
- target: {fileID: 9117079084301130547, guid: 021717b65b165374faa3fcffaafedfc2,
type: 3}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 021717b65b165374faa3fcffaafedfc2, type: 3}
--- !u!20 &1908326070 stripped
Camera:
m_CorrespondingSourceObject: {fileID: 9117079084301130544, guid: 021717b65b165374faa3fcffaafedfc2,
type: 3}
m_PrefabInstance: {fileID: 1908326069}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &3856012874773314169
PrefabInstance:
m_ObjectHideFlags: 0
@ -128,6 +223,201 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 934484248314616495, guid: 6592613d31e034734bea16833d6345c1,
type: 3}
propertyPath: m_LocalScale.x
value: 1
objectReference: {fileID: 0}
- target: {fileID: 934484248314616495, guid: 6592613d31e034734bea16833d6345c1,
type: 3}
propertyPath: m_LocalScale.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 934484248314616495, guid: 6592613d31e034734bea16833d6345c1,
type: 3}
propertyPath: m_LocalScale.z
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3084478268397759140, guid: 6592613d31e034734bea16833d6345c1,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3084478268397759140, guid: 6592613d31e034734bea16833d6345c1,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3084478268397759140, guid: 6592613d31e034734bea16833d6345c1,
type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3084478268397759140, guid: 6592613d31e034734bea16833d6345c1,
type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3084478268397759140, guid: 6592613d31e034734bea16833d6345c1,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3084478268397759140, guid: 6592613d31e034734bea16833d6345c1,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3613327422686341716, guid: 6592613d31e034734bea16833d6345c1,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3613327422686341716, guid: 6592613d31e034734bea16833d6345c1,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3613327422686341716, guid: 6592613d31e034734bea16833d6345c1,
type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3613327422686341716, guid: 6592613d31e034734bea16833d6345c1,
type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3613327422686341716, guid: 6592613d31e034734bea16833d6345c1,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3613327422686341716, guid: 6592613d31e034734bea16833d6345c1,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3613327423357121430, guid: 6592613d31e034734bea16833d6345c1,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3613327423357121430, guid: 6592613d31e034734bea16833d6345c1,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3613327423357121430, guid: 6592613d31e034734bea16833d6345c1,
type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3613327423357121430, guid: 6592613d31e034734bea16833d6345c1,
type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3613327423357121430, guid: 6592613d31e034734bea16833d6345c1,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3613327423357121430, guid: 6592613d31e034734bea16833d6345c1,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3613327424009996303, guid: 6592613d31e034734bea16833d6345c1,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3613327424009996303, guid: 6592613d31e034734bea16833d6345c1,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3613327424009996303, guid: 6592613d31e034734bea16833d6345c1,
type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3613327424009996303, guid: 6592613d31e034734bea16833d6345c1,
type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3613327424009996303, guid: 6592613d31e034734bea16833d6345c1,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3613327424009996303, guid: 6592613d31e034734bea16833d6345c1,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3613327424014868448, guid: 6592613d31e034734bea16833d6345c1,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3613327424014868448, guid: 6592613d31e034734bea16833d6345c1,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3613327424014868448, guid: 6592613d31e034734bea16833d6345c1,
type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3613327424014868448, guid: 6592613d31e034734bea16833d6345c1,
type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3613327424014868448, guid: 6592613d31e034734bea16833d6345c1,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3613327424014868448, guid: 6592613d31e034734bea16833d6345c1,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3613327424185171990, guid: 6592613d31e034734bea16833d6345c1,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3613327424185171990, guid: 6592613d31e034734bea16833d6345c1,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3613327424185171990, guid: 6592613d31e034734bea16833d6345c1,
type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3613327424185171990, guid: 6592613d31e034734bea16833d6345c1,
type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3613327424185171990, guid: 6592613d31e034734bea16833d6345c1,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3613327424185171990, guid: 6592613d31e034734bea16833d6345c1,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3856012875358022744, guid: 6592613d31e034734bea16833d6345c1,
type: 3}
propertyPath: m_Name
@ -242,6 +532,17 @@ PrefabInstance:
type: 3}
propertyPath: m_Camera
value:
objectReference: {fileID: 1908326070}
- target: {fileID: 3856012875358022749, guid: 6592613d31e034734bea16833d6345c1,
type: 3}
propertyPath: m_RenderMode
value: 1
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 6592613d31e034734bea16833d6345c1, type: 3}
--- !u!224 &3856012874773314170 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 3856012875358022748, guid: 6592613d31e034734bea16833d6345c1,
type: 3}
m_PrefabInstance: {fileID: 3856012874773314169}
m_PrefabAsset: {fileID: 0}

View File

@ -460,11 +460,31 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 7867916041471339161}
m_Modifications:
- target: {fileID: 2766725442730909358, guid: db966de52df9e004b96bb4bc77c41b5e,
type: 3}
propertyPath: m_SortingOrder
value: 200
objectReference: {fileID: 0}
- target: {fileID: 3814688160085222431, guid: db966de52df9e004b96bb4bc77c41b5e,
type: 3}
propertyPath: m_RootOrder
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3814688160085222431, guid: db966de52df9e004b96bb4bc77c41b5e,
type: 3}
propertyPath: m_LocalScale.x
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3814688160085222431, guid: db966de52df9e004b96bb4bc77c41b5e,
type: 3}
propertyPath: m_LocalScale.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3814688160085222431, guid: db966de52df9e004b96bb4bc77c41b5e,
type: 3}
propertyPath: m_LocalScale.z
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3814688160085222431, guid: db966de52df9e004b96bb4bc77c41b5e,
type: 3}
propertyPath: m_LocalPosition.x
@ -520,6 +540,11 @@ PrefabInstance:
propertyPath: m_Name
value: effect_Glitter (3)
objectReference: {fileID: 0}
- target: {fileID: 6397847358890529686, guid: db966de52df9e004b96bb4bc77c41b5e,
type: 3}
propertyPath: moveWithTransform
value: 1
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: db966de52df9e004b96bb4bc77c41b5e, type: 3}
--- !u!4 &8326058818789530281 stripped

View File

@ -1167,6 +1167,11 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 1611898339}
m_Modifications:
- target: {fileID: 611297696608793145, guid: b24d8537ddbd94882ad379e4b679f044,
type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 770800092857467420, guid: b24d8537ddbd94882ad379e4b679f044,
type: 3}
propertyPath: m_AnchorMax.y
@ -1287,6 +1292,66 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2571455255326348456, guid: b24d8537ddbd94882ad379e4b679f044,
type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2571455255326348456, guid: b24d8537ddbd94882ad379e4b679f044,
type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2571455255547081788, guid: b24d8537ddbd94882ad379e4b679f044,
type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2571455255547081788, guid: b24d8537ddbd94882ad379e4b679f044,
type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2571455255789964154, guid: b24d8537ddbd94882ad379e4b679f044,
type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2571455255789964154, guid: b24d8537ddbd94882ad379e4b679f044,
type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2571455256040984344, guid: b24d8537ddbd94882ad379e4b679f044,
type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2571455256040984344, guid: b24d8537ddbd94882ad379e4b679f044,
type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2571455256283783218, guid: b24d8537ddbd94882ad379e4b679f044,
type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2571455256283783218, guid: b24d8537ddbd94882ad379e4b679f044,
type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2571455256491477443, guid: b24d8537ddbd94882ad379e4b679f044,
type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2571455256491477443, guid: b24d8537ddbd94882ad379e4b679f044,
type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2617732786704277932, guid: b24d8537ddbd94882ad379e4b679f044,
type: 3}
propertyPath: m_SizeDelta.x
@ -1427,6 +1492,36 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4023665138440674412, guid: b24d8537ddbd94882ad379e4b679f044,
type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4023665138652209962, guid: b24d8537ddbd94882ad379e4b679f044,
type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4023665138851002148, guid: b24d8537ddbd94882ad379e4b679f044,
type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4023665139049914069, guid: b24d8537ddbd94882ad379e4b679f044,
type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4023665139230136334, guid: b24d8537ddbd94882ad379e4b679f044,
type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4023665140108149694, guid: b24d8537ddbd94882ad379e4b679f044,
type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4636047868960142136, guid: b24d8537ddbd94882ad379e4b679f044,
type: 3}
propertyPath: m_AnchorMax.y
@ -1467,6 +1562,11 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5089090463695011484, guid: b24d8537ddbd94882ad379e4b679f044,
type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5829260453880118805, guid: b24d8537ddbd94882ad379e4b679f044,
type: 3}
propertyPath: m_AnchorMax.y
@ -1527,6 +1627,16 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5969906264343538058, guid: b24d8537ddbd94882ad379e4b679f044,
type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5969906264343538058, guid: b24d8537ddbd94882ad379e4b679f044,
type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6124127957076174823, guid: b24d8537ddbd94882ad379e4b679f044,
type: 3}
propertyPath: m_AnchorMax.y
@ -1687,6 +1797,36 @@ PrefabInstance:
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8722697271104966427, guid: b24d8537ddbd94882ad379e4b679f044,
type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8722697272054157936, guid: b24d8537ddbd94882ad379e4b679f044,
type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8722697272261475201, guid: b24d8537ddbd94882ad379e4b679f044,
type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8722697272503080107, guid: b24d8537ddbd94882ad379e4b679f044,
type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8722697272789225673, guid: b24d8537ddbd94882ad379e4b679f044,
type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8722697272997130127, guid: b24d8537ddbd94882ad379e4b679f044,
type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8918416344268579982, guid: b24d8537ddbd94882ad379e4b679f044,
type: 3}
propertyPath: m_AnchorMax.y