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

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

This commit is contained in:
hirokei 2022-07-01 14:09:00 +09:00
parent e0dc08898a 8d7e42978d
commit 25e240f7ef
4 changed files with 193 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
popcorn/Assets/MyGame/Scenes/MiniGame/MiniGame.unity
View File

@ -2010,6 +2010,11 @@ PrefabInstance:
propertyPath: m_Name
value: Brother_pink
objectReference: {fileID: 0}
- target: {fileID: 2607884839347368726, guid: acd6e6365b5fe4863aedc684a50b8028,
type: 3}
propertyPath: hitTime
value: 1.4
objectReference: {fileID: 0}
- target: {fileID: 4931350312200274921, guid: acd6e6365b5fe4863aedc684a50b8028,
type: 3}
propertyPath: m_RootOrder

62
popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/Obstacle 1x2.prefab
View File

@ -1,5 +1,31 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!61 &3040155341059695987
BoxCollider2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9169376164413968082}
m_Enabled: 1
m_Density: 1
m_Material: {fileID: 0}
m_IsTrigger: 0
m_UsedByEffector: 0
m_UsedByComposite: 0
m_Offset: {x: 0, y: 0}
m_SpriteTilingProperty:
border: {x: 0, y: 0, z: 0, w: 0}
pivot: {x: 0, y: 0}
oldSize: {x: 0, y: 0}
newSize: {x: 0, y: 0}
adaptiveTilingThreshold: 0
drawMode: 0
adaptiveTiling: 0
m_AutoTiling: 0
serializedVersion: 2
m_Size: {x: 0.85, y: 3}
m_EdgeRadius: 0
--- !u!1001 &4696369714068265835
PrefabInstance:
m_ObjectHideFlags: 0
@ -22,6 +48,31 @@ PrefabInstance:
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4498234376221693368, guid: b82d5b841abe54f95aee9a8a5a023f6a,
type: 3}
propertyPath: m_LocalRotation.w
value: 0.9961947
objectReference: {fileID: 0}
- target: {fileID: 4498234376221693368, guid: b82d5b841abe54f95aee9a8a5a023f6a,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4498234376221693368, guid: b82d5b841abe54f95aee9a8a5a023f6a,
type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4498234376221693368, guid: b82d5b841abe54f95aee9a8a5a023f6a,
type: 3}
propertyPath: m_LocalRotation.z
value: -0.08715578
objectReference: {fileID: 0}
- target: {fileID: 4498234376221693368, guid: b82d5b841abe54f95aee9a8a5a023f6a,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: -10
objectReference: {fileID: 0}
- target: {fileID: 4498234376221693374, guid: b82d5b841abe54f95aee9a8a5a023f6a,
type: 3}
propertyPath: m_Size.x
@ -32,6 +83,11 @@ PrefabInstance:
propertyPath: m_Size.y
value: 3
objectReference: {fileID: 0}
- target: {fileID: 4498234376221693374, guid: b82d5b841abe54f95aee9a8a5a023f6a,
type: 3}
propertyPath: m_Enabled
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4888696605717816911, guid: b82d5b841abe54f95aee9a8a5a023f6a,
type: 3}
propertyPath: m_LocalScale.y
@ -110,3 +166,9 @@ PrefabInstance:
type: 3}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: b82d5b841abe54f95aee9a8a5a023f6a, type: 3}
--- !u!1 &9169376164413968082 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 4498234376221693369, guid: b82d5b841abe54f95aee9a8a5a023f6a,
type: 3}
m_PrefabInstance: {fileID: 4696369714068265835}
m_PrefabAsset: {fileID: 0}

63
popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/Obstacle 2x1.prefab
View File

@ -1,5 +1,57 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!61 &3938458385303514398
BoxCollider2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6549437761032350281}
m_Enabled: 1
m_Density: 1
m_Material: {fileID: 0}
m_IsTrigger: 0
m_UsedByEffector: 0
m_UsedByComposite: 0
m_Offset: {x: 0, y: -0.36}
m_SpriteTilingProperty:
border: {x: 0, y: 0, z: 0, w: 0}
pivot: {x: 0, y: 0}
oldSize: {x: 0, y: 0}
newSize: {x: 0, y: 0}
adaptiveTilingThreshold: 0
drawMode: 0
adaptiveTiling: 0
m_AutoTiling: 0
serializedVersion: 2
m_Size: {x: 3, y: 0.64}
m_EdgeRadius: 0
--- !u!61 &1727054272757401755
BoxCollider2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6549437761032350281}
m_Enabled: 1
m_Density: 1
m_Material: {fileID: 0}
m_IsTrigger: 0
m_UsedByEffector: 0
m_UsedByComposite: 0
m_Offset: {x: 0, y: 0.34}
m_SpriteTilingProperty:
border: {x: 0, y: 0, z: 0, w: 0}
pivot: {x: 0, y: 0}
oldSize: {x: 0, y: 0}
newSize: {x: 0, y: 0}
adaptiveTilingThreshold: 0
drawMode: 0
adaptiveTiling: 0
m_AutoTiling: 0
serializedVersion: 2
m_Size: {x: 2.24, y: 0.71}
m_EdgeRadius: 0
--- !u!1001 &7244240817860771824
PrefabInstance:
m_ObjectHideFlags: 0
@ -22,6 +74,11 @@ PrefabInstance:
propertyPath: m_Size.y
value: 1.5
objectReference: {fileID: 0}
- target: {fileID: 4498234376221693374, guid: b82d5b841abe54f95aee9a8a5a023f6a,
type: 3}
propertyPath: m_Enabled
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4888696605717816911, guid: b82d5b841abe54f95aee9a8a5a023f6a,
type: 3}
propertyPath: m_LocalScale.x
@ -100,3 +157,9 @@ PrefabInstance:
type: 3}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: b82d5b841abe54f95aee9a8a5a023f6a, type: 3}
--- !u!1 &6549437761032350281 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 4498234376221693369, guid: b82d5b841abe54f95aee9a8a5a023f6a,
type: 3}
m_PrefabInstance: {fileID: 7244240817860771824}
m_PrefabAsset: {fileID: 0}

63
popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/Obstacle 2x2.prefab
View File

@ -1,5 +1,57 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!61 &5895574189566282252
BoxCollider2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9052172984657770404}
m_Enabled: 1
m_Density: 1
m_Material: {fileID: 0}
m_IsTrigger: 0
m_UsedByEffector: 0
m_UsedByComposite: 0
m_Offset: {x: -0.03, y: -0.67}
m_SpriteTilingProperty:
border: {x: 0, y: 0, z: 0, w: 0}
pivot: {x: 0, y: 0}
oldSize: {x: 0, y: 0}
newSize: {x: 0, y: 0}
adaptiveTilingThreshold: 0
drawMode: 0
adaptiveTiling: 0
m_AutoTiling: 0
serializedVersion: 2
m_Size: {x: 3, y: 1.66}
m_EdgeRadius: 0
--- !u!61 &8766766892135053376
BoxCollider2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9052172984657770404}
m_Enabled: 1
m_Density: 1
m_Material: {fileID: 0}
m_IsTrigger: 0
m_UsedByEffector: 0
m_UsedByComposite: 0
m_Offset: {x: -0.04, y: 0.83}
m_SpriteTilingProperty:
border: {x: 0, y: 0, z: 0, w: 0}
pivot: {x: 0, y: 0}
oldSize: {x: 0, y: 0}
newSize: {x: 0, y: 0}
adaptiveTilingThreshold: 0
drawMode: 0
adaptiveTiling: 0
m_AutoTiling: 0
serializedVersion: 2
m_Size: {x: 2.12, y: 1.31}
m_EdgeRadius: 0
--- !u!1001 &4896317741957177885
PrefabInstance:
m_ObjectHideFlags: 0
@ -27,6 +79,11 @@ PrefabInstance:
propertyPath: m_Size.y
value: 3
objectReference: {fileID: 0}
- target: {fileID: 4498234376221693374, guid: b82d5b841abe54f95aee9a8a5a023f6a,
type: 3}
propertyPath: m_Enabled
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4888696605717816911, guid: b82d5b841abe54f95aee9a8a5a023f6a,
type: 3}
propertyPath: m_LocalScale.x
@ -110,3 +167,9 @@ PrefabInstance:
type: 3}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: b82d5b841abe54f95aee9a8a5a023f6a, type: 3}
--- !u!1 &9052172984657770404 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 4498234376221693369, guid: b82d5b841abe54f95aee9a8a5a023f6a,
type: 3}
m_PrefabInstance: {fileID: 4896317741957177885}
m_PrefabAsset: {fileID: 0}