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-10-27 12:28:32 +09:00
parent 15f9d0cf37 ce0472abed
commit 976e7e4dcd
1 changed files with 43 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
popcorn/Assets/MyGame/Prefabs/TutorialObjectMask.prefab
View File

@ -13,7 +13,9 @@ GameObject:
- component: {fileID: 4293843006989820482} - component: {fileID: 4293843006989820482}
- component: {fileID: 4293843006989820481} - component: {fileID: 4293843006989820481}
- component: {fileID: 5131953687285211373} - component: {fileID: 5131953687285211373}
m_Layer: 0 - component: {fileID: 1057350325820014940}
- component: {fileID: 635585246087733349}
m_Layer: 5
m_Name: TutorialObjectMask m_Name: TutorialObjectMask
m_TagString: Untagged m_TagString: Untagged
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
@ -106,6 +108,44 @@ MonoBehaviour:
m_EditorClassIdentifier: m_EditorClassIdentifier:
unmask: {fileID: 4293843007976718248} unmask: {fileID: 4293843007976718248}
unMaskImage: {fileID: 4293843007976718250} unMaskImage: {fileID: 4293843007976718250}
--- !u!223 &1057350325820014940
Canvas:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4293843006989820543}
m_Enabled: 1
serializedVersion: 3
m_RenderMode: 2
m_Camera: {fileID: 0}
m_PlaneDistance: 100
m_PixelPerfect: 0
m_ReceivesEvents: 1
m_OverrideSorting: 1
m_OverridePixelPerfect: 0
m_SortingBucketNormalizedSize: 0
m_AdditionalShaderChannelsFlag: 0
m_SortingLayerID: 0
m_SortingOrder: 500
m_TargetDisplay: 0
--- !u!114 &635585246087733349
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4293843006989820543}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3}
m_Name:
m_EditorClassIdentifier:
m_IgnoreReversedGraphics: 1
m_BlockingObjects: 0
m_BlockingMask:
serializedVersion: 2
m_Bits: 4294967295
--- !u!1 &4293843007207798141 --- !u!1 &4293843007207798141
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -118,7 +158,7 @@ GameObject:
- component: {fileID: 4293843007207798081} - component: {fileID: 4293843007207798081}
- component: {fileID: 4293843007207798080} - component: {fileID: 4293843007207798080}
- component: {fileID: 4293843007207798143} - component: {fileID: 4293843007207798143}
m_Layer: 0 m_Layer: 5
m_Name: Bg m_Name: Bg
m_TagString: Untagged m_TagString: Untagged
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
@ -206,7 +246,7 @@ GameObject:
- component: {fileID: 4293843007976718251} - component: {fileID: 4293843007976718251}
- component: {fileID: 4293843007976718250} - component: {fileID: 4293843007976718250}
- component: {fileID: 4293843007976718248} - component: {fileID: 4293843007976718248}
m_Layer: 0 m_Layer: 5
m_Name: Target m_Name: Target
m_TagString: Untagged m_TagString: Untagged
m_Icon: {fileID: 0} m_Icon: {fileID: 0}