Merge branch 'feature/1.5.1' of bitbucket.org:usaya/popcorn into feature/1.5.1
This commit is contained in:
koya_15
commit
0a11e434fb
|
|
@ -412,86 +412,6 @@ RectTransform:
|
|||
type: 3}
|
||||
m_PrefabInstance: {fileID: 7328251774669809636}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1001 &480107651
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
m_TransformParent: {fileID: 1471947211}
|
||||
m_Modifications:
|
||||
- target: {fileID: 6693468020679260201, guid: 10a5596421a45564397efb765bcabb55,
|
||||
type: 3}
|
||||
propertyPath: m_RootOrder
|
||||
value: 6
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6693468020679260201, guid: 10a5596421a45564397efb765bcabb55,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 89.28
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6693468020679260201, guid: 10a5596421a45564397efb765bcabb55,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 11.06614
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6693468020679260201, guid: 10a5596421a45564397efb765bcabb55,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: 43.01684
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6693468020679260201, guid: 10a5596421a45564397efb765bcabb55,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6693468020679260201, guid: 10a5596421a45564397efb765bcabb55,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: -0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6693468020679260201, guid: 10a5596421a45564397efb765bcabb55,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: -0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6693468020679260201, guid: 10a5596421a45564397efb765bcabb55,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: -0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6693468020679260201, guid: 10a5596421a45564397efb765bcabb55,
|
||||
type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6693468020679260201, guid: 10a5596421a45564397efb765bcabb55,
|
||||
type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6693468020679260201, guid: 10a5596421a45564397efb765bcabb55,
|
||||
type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6693468020679260202, guid: 10a5596421a45564397efb765bcabb55,
|
||||
type: 3}
|
||||
propertyPath: m_Name
|
||||
value: BackGround (6)
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6693468020679260202, guid: 10a5596421a45564397efb765bcabb55,
|
||||
type: 3}
|
||||
propertyPath: m_IsActive
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 10a5596421a45564397efb765bcabb55, type: 3}
|
||||
--- !u!4 &480107652 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 6693468020679260201, guid: 10a5596421a45564397efb765bcabb55,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 480107651}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1 &515787033
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -827,246 +747,6 @@ MonoBehaviour:
|
|||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
mTarget: {fileID: 4559813503860727171}
|
||||
--- !u!1001 &930800255
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
m_TransformParent: {fileID: 1471947211}
|
||||
m_Modifications:
|
||||
- target: {fileID: 6693468020679260201, guid: 10a5596421a45564397efb765bcabb55,
|
||||
type: 3}
|
||||
propertyPath: m_RootOrder
|
||||
value: 9
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6693468020679260201, guid: 10a5596421a45564397efb765bcabb55,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 142.17
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6693468020679260201, guid: 10a5596421a45564397efb765bcabb55,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 11.06614
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6693468020679260201, guid: 10a5596421a45564397efb765bcabb55,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: 43.01684
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6693468020679260201, guid: 10a5596421a45564397efb765bcabb55,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6693468020679260201, guid: 10a5596421a45564397efb765bcabb55,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: -0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6693468020679260201, guid: 10a5596421a45564397efb765bcabb55,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: -0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6693468020679260201, guid: 10a5596421a45564397efb765bcabb55,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: -0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6693468020679260201, guid: 10a5596421a45564397efb765bcabb55,
|
||||
type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6693468020679260201, guid: 10a5596421a45564397efb765bcabb55,
|
||||
type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6693468020679260201, guid: 10a5596421a45564397efb765bcabb55,
|
||||
type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6693468020679260202, guid: 10a5596421a45564397efb765bcabb55,
|
||||
type: 3}
|
||||
propertyPath: m_Name
|
||||
value: BackGround (9)
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6693468020679260202, guid: 10a5596421a45564397efb765bcabb55,
|
||||
type: 3}
|
||||
propertyPath: m_IsActive
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 10a5596421a45564397efb765bcabb55, type: 3}
|
||||
--- !u!4 &930800256 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 6693468020679260201, guid: 10a5596421a45564397efb765bcabb55,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 930800255}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1001 &931896956
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
m_TransformParent: {fileID: 1471947211}
|
||||
m_Modifications:
|
||||
- target: {fileID: 6693468020679260201, guid: 10a5596421a45564397efb765bcabb55,
|
||||
type: 3}
|
||||
propertyPath: m_RootOrder
|
||||
value: 5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6693468020679260201, guid: 10a5596421a45564397efb765bcabb55,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 71.65
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6693468020679260201, guid: 10a5596421a45564397efb765bcabb55,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 11.06614
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6693468020679260201, guid: 10a5596421a45564397efb765bcabb55,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: 43.01684
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6693468020679260201, guid: 10a5596421a45564397efb765bcabb55,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6693468020679260201, guid: 10a5596421a45564397efb765bcabb55,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: -0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6693468020679260201, guid: 10a5596421a45564397efb765bcabb55,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: -0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6693468020679260201, guid: 10a5596421a45564397efb765bcabb55,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: -0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6693468020679260201, guid: 10a5596421a45564397efb765bcabb55,
|
||||
type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6693468020679260201, guid: 10a5596421a45564397efb765bcabb55,
|
||||
type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6693468020679260201, guid: 10a5596421a45564397efb765bcabb55,
|
||||
type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6693468020679260202, guid: 10a5596421a45564397efb765bcabb55,
|
||||
type: 3}
|
||||
propertyPath: m_Name
|
||||
value: BackGround (5)
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6693468020679260202, guid: 10a5596421a45564397efb765bcabb55,
|
||||
type: 3}
|
||||
propertyPath: m_IsActive
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 10a5596421a45564397efb765bcabb55, type: 3}
|
||||
--- !u!4 &931896957 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 6693468020679260201, guid: 10a5596421a45564397efb765bcabb55,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 931896956}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1001 &962275290
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
m_TransformParent: {fileID: 1471947211}
|
||||
m_Modifications:
|
||||
- target: {fileID: 6693468020679260201, guid: 10a5596421a45564397efb765bcabb55,
|
||||
type: 3}
|
||||
propertyPath: m_RootOrder
|
||||
value: 4
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6693468020679260201, guid: 10a5596421a45564397efb765bcabb55,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 54.02
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6693468020679260201, guid: 10a5596421a45564397efb765bcabb55,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 11.06614
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6693468020679260201, guid: 10a5596421a45564397efb765bcabb55,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: 43.01684
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6693468020679260201, guid: 10a5596421a45564397efb765bcabb55,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6693468020679260201, guid: 10a5596421a45564397efb765bcabb55,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: -0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6693468020679260201, guid: 10a5596421a45564397efb765bcabb55,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: -0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6693468020679260201, guid: 10a5596421a45564397efb765bcabb55,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: -0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6693468020679260201, guid: 10a5596421a45564397efb765bcabb55,
|
||||
type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6693468020679260201, guid: 10a5596421a45564397efb765bcabb55,
|
||||
type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6693468020679260201, guid: 10a5596421a45564397efb765bcabb55,
|
||||
type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6693468020679260202, guid: 10a5596421a45564397efb765bcabb55,
|
||||
type: 3}
|
||||
propertyPath: m_Name
|
||||
value: BackGround (4)
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6693468020679260202, guid: 10a5596421a45564397efb765bcabb55,
|
||||
type: 3}
|
||||
propertyPath: m_IsActive
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 10a5596421a45564397efb765bcabb55, type: 3}
|
||||
--- !u!4 &962275291 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 6693468020679260201, guid: 10a5596421a45564397efb765bcabb55,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 962275290}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!114 &963314161
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -1643,86 +1323,6 @@ MonoBehaviour:
|
|||
m_Spacing: {x: 10, y: 10}
|
||||
m_Constraint: 1
|
||||
m_ConstraintCount: 2
|
||||
--- !u!1001 &1328382762
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
m_TransformParent: {fileID: 1471947211}
|
||||
m_Modifications:
|
||||
- target: {fileID: 6693468020679260201, guid: 10a5596421a45564397efb765bcabb55,
|
||||
type: 3}
|
||||
propertyPath: m_RootOrder
|
||||
value: 7
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6693468020679260201, guid: 10a5596421a45564397efb765bcabb55,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 106.91
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6693468020679260201, guid: 10a5596421a45564397efb765bcabb55,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 11.06614
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6693468020679260201, guid: 10a5596421a45564397efb765bcabb55,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: 43.01684
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6693468020679260201, guid: 10a5596421a45564397efb765bcabb55,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6693468020679260201, guid: 10a5596421a45564397efb765bcabb55,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: -0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6693468020679260201, guid: 10a5596421a45564397efb765bcabb55,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: -0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6693468020679260201, guid: 10a5596421a45564397efb765bcabb55,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: -0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6693468020679260201, guid: 10a5596421a45564397efb765bcabb55,
|
||||
type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6693468020679260201, guid: 10a5596421a45564397efb765bcabb55,
|
||||
type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6693468020679260201, guid: 10a5596421a45564397efb765bcabb55,
|
||||
type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6693468020679260202, guid: 10a5596421a45564397efb765bcabb55,
|
||||
type: 3}
|
||||
propertyPath: m_Name
|
||||
value: BackGround (7)
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6693468020679260202, guid: 10a5596421a45564397efb765bcabb55,
|
||||
type: 3}
|
||||
propertyPath: m_IsActive
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 10a5596421a45564397efb765bcabb55, type: 3}
|
||||
--- !u!4 &1328382763 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 6693468020679260201, guid: 10a5596421a45564397efb765bcabb55,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 1328382762}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!114 &1340402662
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -1736,86 +1336,6 @@ MonoBehaviour:
|
|||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
mTarget: {fileID: 5034752974072861416}
|
||||
--- !u!1001 &1363981460
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
m_TransformParent: {fileID: 1471947211}
|
||||
m_Modifications:
|
||||
- target: {fileID: 6693468020679260201, guid: 10a5596421a45564397efb765bcabb55,
|
||||
type: 3}
|
||||
propertyPath: m_RootOrder
|
||||
value: 10
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6693468020679260201, guid: 10a5596421a45564397efb765bcabb55,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 159.8
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6693468020679260201, guid: 10a5596421a45564397efb765bcabb55,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 11.06614
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6693468020679260201, guid: 10a5596421a45564397efb765bcabb55,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: 43.01684
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6693468020679260201, guid: 10a5596421a45564397efb765bcabb55,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6693468020679260201, guid: 10a5596421a45564397efb765bcabb55,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: -0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6693468020679260201, guid: 10a5596421a45564397efb765bcabb55,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: -0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6693468020679260201, guid: 10a5596421a45564397efb765bcabb55,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: -0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6693468020679260201, guid: 10a5596421a45564397efb765bcabb55,
|
||||
type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6693468020679260201, guid: 10a5596421a45564397efb765bcabb55,
|
||||
type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6693468020679260201, guid: 10a5596421a45564397efb765bcabb55,
|
||||
type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6693468020679260202, guid: 10a5596421a45564397efb765bcabb55,
|
||||
type: 3}
|
||||
propertyPath: m_Name
|
||||
value: BackGround (10)
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6693468020679260202, guid: 10a5596421a45564397efb765bcabb55,
|
||||
type: 3}
|
||||
propertyPath: m_IsActive
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 10a5596421a45564397efb765bcabb55, type: 3}
|
||||
--- !u!4 &1363981461 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 6693468020679260201, guid: 10a5596421a45564397efb765bcabb55,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 1363981460}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!114 &1426747593
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -1894,13 +1414,6 @@ Transform:
|
|||
- {fileID: 2044773546}
|
||||
- {fileID: 184442867}
|
||||
- {fileID: 628830308}
|
||||
- {fileID: 962275291}
|
||||
- {fileID: 931896957}
|
||||
- {fileID: 480107652}
|
||||
- {fileID: 1328382763}
|
||||
- {fileID: 1862591112}
|
||||
- {fileID: 930800256}
|
||||
- {fileID: 1363981461}
|
||||
m_Father: {fileID: 1871342}
|
||||
m_RootOrder: 1
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
|
|
@ -2200,86 +1713,6 @@ MonoBehaviour:
|
|||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
mTarget: {fileID: 0}
|
||||
--- !u!1001 &1862591111
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
m_TransformParent: {fileID: 1471947211}
|
||||
m_Modifications:
|
||||
- target: {fileID: 6693468020679260201, guid: 10a5596421a45564397efb765bcabb55,
|
||||
type: 3}
|
||||
propertyPath: m_RootOrder
|
||||
value: 8
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6693468020679260201, guid: 10a5596421a45564397efb765bcabb55,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 124.54
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6693468020679260201, guid: 10a5596421a45564397efb765bcabb55,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 11.06614
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6693468020679260201, guid: 10a5596421a45564397efb765bcabb55,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: 43.01684
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6693468020679260201, guid: 10a5596421a45564397efb765bcabb55,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6693468020679260201, guid: 10a5596421a45564397efb765bcabb55,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: -0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6693468020679260201, guid: 10a5596421a45564397efb765bcabb55,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: -0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6693468020679260201, guid: 10a5596421a45564397efb765bcabb55,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: -0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6693468020679260201, guid: 10a5596421a45564397efb765bcabb55,
|
||||
type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6693468020679260201, guid: 10a5596421a45564397efb765bcabb55,
|
||||
type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6693468020679260201, guid: 10a5596421a45564397efb765bcabb55,
|
||||
type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6693468020679260202, guid: 10a5596421a45564397efb765bcabb55,
|
||||
type: 3}
|
||||
propertyPath: m_Name
|
||||
value: BackGround (8)
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6693468020679260202, guid: 10a5596421a45564397efb765bcabb55,
|
||||
type: 3}
|
||||
propertyPath: m_IsActive
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 10a5596421a45564397efb765bcabb55, type: 3}
|
||||
--- !u!4 &1862591112 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 6693468020679260201, guid: 10a5596421a45564397efb765bcabb55,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 1862591111}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1 &1870432532
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -2370,7 +1803,7 @@ MonoBehaviour:
|
|||
normalTime: 2
|
||||
hardTime: 4
|
||||
extraTime: 6
|
||||
stageGenerateDistance: 10
|
||||
stageGenerateDistance: 15
|
||||
generateStageCount: 1
|
||||
beginStageOffset: 0.5
|
||||
partsToPartsOffset: 3
|
||||
|
|
|
|||
|
|
@ -158,7 +158,7 @@ namespace MyGame.Scenes.MiniGame.Scripts
|
|||
}
|
||||
else
|
||||
{
|
||||
Stay();
|
||||
animator.Play("Brother_pink_Glideing_Cancel");
|
||||
currentFallSpeed -= fallAcceleration * Time.deltaTime;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue