Commit 4bffc45c authored by xujr's avatar xujr

修正

parent 5176a6a9
...@@ -40,13 +40,13 @@ ParticleSystem: ...@@ -40,13 +40,13 @@ ParticleSystem:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7151777890846202786} m_GameObject: {fileID: 7151777890846202786}
serializedVersion: 6 serializedVersion: 6
lengthInSec: 0.6 lengthInSec: 1
simulationSpeed: 1.6 simulationSpeed: 1.6
stopAction: 0 stopAction: 0
cullingMode: 1 cullingMode: 1
ringBufferMode: 0 ringBufferMode: 0
ringBufferLoopRange: {x: 0, y: 1} ringBufferLoopRange: {x: 0, y: 1}
looping: 0 looping: 1
prewarm: 0 prewarm: 0
playOnAwake: 1 playOnAwake: 1
useUnscaledTime: 0 useUnscaledTime: 0
...@@ -115,8 +115,8 @@ ParticleSystem: ...@@ -115,8 +115,8 @@ ParticleSystem:
startLifetime: startLifetime:
serializedVersion: 2 serializedVersion: 2
minMaxState: 3 minMaxState: 3
scalar: 0.5 scalar: 0.54
minScalar: 0.2 minScalar: 0.4
maxCurve: maxCurve:
serializedVersion: 2 serializedVersion: 2
m_Curve: m_Curve:
...@@ -150,8 +150,8 @@ ParticleSystem: ...@@ -150,8 +150,8 @@ ParticleSystem:
startSpeed: startSpeed:
serializedVersion: 2 serializedVersion: 2
minMaxState: 3 minMaxState: 3
scalar: 0.7 scalar: 0.8
minScalar: 0 minScalar: 0.2
maxCurve: maxCurve:
serializedVersion: 2 serializedVersion: 2
m_Curve: m_Curve:
...@@ -692,7 +692,7 @@ ParticleSystem: ...@@ -692,7 +692,7 @@ ParticleSystem:
sphericalDirectionAmount: 0 sphericalDirectionAmount: 0
randomPositionAmount: 0 randomPositionAmount: 0
radius: radius:
value: 0.28 value: 0.2
mode: 0 mode: 0
spread: 0 spread: 0
speed: speed:
...@@ -811,7 +811,7 @@ ParticleSystem: ...@@ -811,7 +811,7 @@ ParticleSystem:
rateOverTime: rateOverTime:
serializedVersion: 2 serializedVersion: 2
minMaxState: 0 minMaxState: 0
scalar: 500 scalar: 400
minScalar: 10 minScalar: 10
maxCurve: maxCurve:
serializedVersion: 2 serializedVersion: 2
...@@ -914,66 +914,8 @@ ParticleSystem: ...@@ -914,66 +914,8 @@ ParticleSystem:
m_PreInfinity: 2 m_PreInfinity: 2
m_PostInfinity: 2 m_PostInfinity: 2
m_RotationOrder: 4 m_RotationOrder: 4
m_BurstCount: 1 m_BurstCount: 0
m_Bursts: m_Bursts: []
- serializedVersion: 2
time: 0
countCurve:
serializedVersion: 2
minMaxState: 0
scalar: 1
minScalar: 30
maxCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 1
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
minCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 1
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
cycleCount: 1
repeatInterval: 0.01
probability: 1
SizeModule: SizeModule:
enabled: 1 enabled: 1
curve: curve:
......
...@@ -40,13 +40,13 @@ ParticleSystem: ...@@ -40,13 +40,13 @@ ParticleSystem:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6645013630165712003} m_GameObject: {fileID: 6645013630165712003}
serializedVersion: 6 serializedVersion: 6
lengthInSec: 0.6 lengthInSec: 1
simulationSpeed: 1.6 simulationSpeed: 1.6
stopAction: 0 stopAction: 0
cullingMode: 1 cullingMode: 1
ringBufferMode: 0 ringBufferMode: 0
ringBufferLoopRange: {x: 0, y: 1} ringBufferLoopRange: {x: 0, y: 1}
looping: 0 looping: 1
prewarm: 0 prewarm: 0
playOnAwake: 1 playOnAwake: 1
useUnscaledTime: 0 useUnscaledTime: 0
...@@ -115,8 +115,8 @@ ParticleSystem: ...@@ -115,8 +115,8 @@ ParticleSystem:
startLifetime: startLifetime:
serializedVersion: 2 serializedVersion: 2
minMaxState: 3 minMaxState: 3
scalar: 0.5 scalar: 0.54
minScalar: 0.2 minScalar: 0.4
maxCurve: maxCurve:
serializedVersion: 2 serializedVersion: 2
m_Curve: m_Curve:
...@@ -150,8 +150,8 @@ ParticleSystem: ...@@ -150,8 +150,8 @@ ParticleSystem:
startSpeed: startSpeed:
serializedVersion: 2 serializedVersion: 2
minMaxState: 3 minMaxState: 3
scalar: 0.7 scalar: 0.8
minScalar: 0 minScalar: 0.2
maxCurve: maxCurve:
serializedVersion: 2 serializedVersion: 2
m_Curve: m_Curve:
...@@ -692,7 +692,7 @@ ParticleSystem: ...@@ -692,7 +692,7 @@ ParticleSystem:
sphericalDirectionAmount: 0 sphericalDirectionAmount: 0
randomPositionAmount: 0 randomPositionAmount: 0
radius: radius:
value: 0.28 value: 0.2
mode: 0 mode: 0
spread: 0 spread: 0
speed: speed:
...@@ -811,7 +811,7 @@ ParticleSystem: ...@@ -811,7 +811,7 @@ ParticleSystem:
rateOverTime: rateOverTime:
serializedVersion: 2 serializedVersion: 2
minMaxState: 0 minMaxState: 0
scalar: 500 scalar: 400
minScalar: 10 minScalar: 10
maxCurve: maxCurve:
serializedVersion: 2 serializedVersion: 2
...@@ -914,66 +914,8 @@ ParticleSystem: ...@@ -914,66 +914,8 @@ ParticleSystem:
m_PreInfinity: 2 m_PreInfinity: 2
m_PostInfinity: 2 m_PostInfinity: 2
m_RotationOrder: 4 m_RotationOrder: 4
m_BurstCount: 1 m_BurstCount: 0
m_Bursts: m_Bursts: []
- serializedVersion: 2
time: 0
countCurve:
serializedVersion: 2
minMaxState: 0
scalar: 1
minScalar: 30
maxCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 1
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
minCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 1
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
cycleCount: 1
repeatInterval: 0.01
probability: 1
SizeModule: SizeModule:
enabled: 1 enabled: 1
curve: curve:
......
...@@ -40,13 +40,13 @@ ParticleSystem: ...@@ -40,13 +40,13 @@ ParticleSystem:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2363628013669500346} m_GameObject: {fileID: 2363628013669500346}
serializedVersion: 6 serializedVersion: 6
lengthInSec: 0.6 lengthInSec: 1
simulationSpeed: 1.6 simulationSpeed: 1.6
stopAction: 0 stopAction: 0
cullingMode: 1 cullingMode: 1
ringBufferMode: 0 ringBufferMode: 0
ringBufferLoopRange: {x: 0, y: 1} ringBufferLoopRange: {x: 0, y: 1}
looping: 0 looping: 1
prewarm: 0 prewarm: 0
playOnAwake: 1 playOnAwake: 1
useUnscaledTime: 0 useUnscaledTime: 0
...@@ -115,8 +115,8 @@ ParticleSystem: ...@@ -115,8 +115,8 @@ ParticleSystem:
startLifetime: startLifetime:
serializedVersion: 2 serializedVersion: 2
minMaxState: 3 minMaxState: 3
scalar: 0.5 scalar: 0.54
minScalar: 0.2 minScalar: 0.4
maxCurve: maxCurve:
serializedVersion: 2 serializedVersion: 2
m_Curve: m_Curve:
...@@ -150,8 +150,8 @@ ParticleSystem: ...@@ -150,8 +150,8 @@ ParticleSystem:
startSpeed: startSpeed:
serializedVersion: 2 serializedVersion: 2
minMaxState: 3 minMaxState: 3
scalar: 0.7 scalar: 0.8
minScalar: 0 minScalar: 0.2
maxCurve: maxCurve:
serializedVersion: 2 serializedVersion: 2
m_Curve: m_Curve:
...@@ -692,7 +692,7 @@ ParticleSystem: ...@@ -692,7 +692,7 @@ ParticleSystem:
sphericalDirectionAmount: 0 sphericalDirectionAmount: 0
randomPositionAmount: 0 randomPositionAmount: 0
radius: radius:
value: 0.28 value: 0.2
mode: 0 mode: 0
spread: 0 spread: 0
speed: speed:
...@@ -811,7 +811,7 @@ ParticleSystem: ...@@ -811,7 +811,7 @@ ParticleSystem:
rateOverTime: rateOverTime:
serializedVersion: 2 serializedVersion: 2
minMaxState: 0 minMaxState: 0
scalar: 500 scalar: 400
minScalar: 10 minScalar: 10
maxCurve: maxCurve:
serializedVersion: 2 serializedVersion: 2
...@@ -914,66 +914,8 @@ ParticleSystem: ...@@ -914,66 +914,8 @@ ParticleSystem:
m_PreInfinity: 2 m_PreInfinity: 2
m_PostInfinity: 2 m_PostInfinity: 2
m_RotationOrder: 4 m_RotationOrder: 4
m_BurstCount: 1 m_BurstCount: 0
m_Bursts: m_Bursts: []
- serializedVersion: 2
time: 0
countCurve:
serializedVersion: 2
minMaxState: 0
scalar: 1
minScalar: 30
maxCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 1
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
minCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 1
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
cycleCount: 1
repeatInterval: 0.01
probability: 1
SizeModule: SizeModule:
enabled: 1 enabled: 1
curve: curve:
......
...@@ -3510,7 +3510,7 @@ Transform: ...@@ -3510,7 +3510,7 @@ Transform:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2584816471147107842} m_GameObject: {fileID: 2584816471147107842}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0.6} m_LocalPosition: {x: 0, y: 0, z: 0.5}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: m_Children:
- {fileID: 5196553825902111244} - {fileID: 5196553825902111244}
......
...@@ -1922,7 +1922,7 @@ Transform: ...@@ -1922,7 +1922,7 @@ Transform:
- {fileID: 125640775644677704} - {fileID: 125640775644677704}
- {fileID: 7107382931667300733} - {fileID: 7107382931667300733}
- {fileID: 5486372871660707275} - {fileID: 5486372871660707275}
- {fileID: 7919628057508581497} - {fileID: 1030453852567010291}
m_Father: {fileID: 2419814894692253840} m_Father: {fileID: 2419814894692253840}
m_RootOrder: 1 m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
...@@ -4106,39 +4106,6 @@ MeshCollider: ...@@ -4106,39 +4106,6 @@ MeshCollider:
m_Convex: 0 m_Convex: 0
m_CookingOptions: 30 m_CookingOptions: 30
m_Mesh: {fileID: -4119317738140548247, guid: 13948debcb4aa0146939d84a4c31e265, type: 3} m_Mesh: {fileID: -4119317738140548247, guid: 13948debcb4aa0146939d84a4c31e265, type: 3}
--- !u!1 &4159787522625250576
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 7919628057508581497}
m_Layer: 0
m_Name: Water
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &7919628057508581497
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4159787522625250576}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0.6}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 4967184143953401301}
- {fileID: 8859794570363654180}
- {fileID: 3049808095234395731}
m_Father: {fileID: 2419814893835863036}
m_RootOrder: 7
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &4356473073626483239 --- !u!1 &4356473073626483239
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -4261,6 +4228,39 @@ MonoBehaviour: ...@@ -4261,6 +4228,39 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: d6f65fb23ad160c459d2598442688217, type: 3} m_Script: {fileID: 11500000, guid: d6f65fb23ad160c459d2598442688217, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
--- !u!1 &5420238048315589162
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1030453852567010291}
m_Layer: 0
m_Name: Water
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &1030453852567010291
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5420238048315589162}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0.5}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 66757600074182719}
- {fileID: 6102409906051588795}
- {fileID: 4753557187747313639}
m_Father: {fileID: 2419814893835863036}
m_RootOrder: 7
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &5959676026308108801 --- !u!1 &5959676026308108801
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -5508,6 +5508,86 @@ BoxCollider: ...@@ -5508,6 +5508,86 @@ BoxCollider:
serializedVersion: 2 serializedVersion: 2
m_Size: {x: 1, y: 1, z: 1} m_Size: {x: 1, y: 1, z: 1}
m_Center: {x: 0, y: 0, z: 0} m_Center: {x: 0, y: 0, z: 0}
--- !u!1001 &752657613374910244
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 1030453852567010291}
m_Modifications:
- target: {fileID: 2363628013669500346, guid: abe407a9cdb26a641b636d096683e52b,
type: 3}
propertyPath: m_Name
value: StrawberryWater
objectReference: {fileID: 0}
- target: {fileID: 2363628013669500346, guid: abe407a9cdb26a641b636d096683e52b,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5443159866486724803, guid: abe407a9cdb26a641b636d096683e52b,
type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5443159866486724803, guid: abe407a9cdb26a641b636d096683e52b,
type: 3}
propertyPath: m_LocalPosition.y
value: -0.85
objectReference: {fileID: 0}
- target: {fileID: 5443159866486724803, guid: abe407a9cdb26a641b636d096683e52b,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5443159866486724803, guid: abe407a9cdb26a641b636d096683e52b,
type: 3}
propertyPath: m_LocalRotation.x
value: 0.7071068
objectReference: {fileID: 0}
- target: {fileID: 5443159866486724803, guid: abe407a9cdb26a641b636d096683e52b,
type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5443159866486724803, guid: abe407a9cdb26a641b636d096683e52b,
type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5443159866486724803, guid: abe407a9cdb26a641b636d096683e52b,
type: 3}
propertyPath: m_LocalRotation.w
value: 0.7071068
objectReference: {fileID: 0}
- target: {fileID: 5443159866486724803, guid: abe407a9cdb26a641b636d096683e52b,
type: 3}
propertyPath: m_RootOrder
value: 2
objectReference: {fileID: 0}
- target: {fileID: 5443159866486724803, guid: abe407a9cdb26a641b636d096683e52b,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 90
objectReference: {fileID: 0}
- target: {fileID: 5443159866486724803, guid: abe407a9cdb26a641b636d096683e52b,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5443159866486724803, guid: abe407a9cdb26a641b636d096683e52b,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: abe407a9cdb26a641b636d096683e52b, type: 3}
--- !u!4 &4753557187747313639 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 5443159866486724803, guid: abe407a9cdb26a641b636d096683e52b,
type: 3}
m_PrefabInstance: {fileID: 752657613374910244}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &853374032285843243 --- !u!1001 &853374032285843243
PrefabInstance: PrefabInstance:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -5608,86 +5688,6 @@ Transform: ...@@ -5608,86 +5688,6 @@ Transform:
type: 3} type: 3}
m_PrefabInstance: {fileID: 853374032285843243} m_PrefabInstance: {fileID: 853374032285843243}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
--- !u!1001 &2141769885021123789
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 7919628057508581497}
m_Modifications:
- target: {fileID: 6645013630165712003, guid: c00a7ba877649b24f9ad76e6c1e1591a,
type: 3}
propertyPath: m_Name
value: OrangeWater
objectReference: {fileID: 0}
- target: {fileID: 6645013630165712003, guid: c00a7ba877649b24f9ad76e6c1e1591a,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7443685355966293225, guid: c00a7ba877649b24f9ad76e6c1e1591a,
type: 3}
propertyPath: m_LocalPosition.x
value: -0
objectReference: {fileID: 0}
- target: {fileID: 7443685355966293225, guid: c00a7ba877649b24f9ad76e6c1e1591a,
type: 3}
propertyPath: m_LocalPosition.y
value: -0.85
objectReference: {fileID: 0}
- target: {fileID: 7443685355966293225, guid: c00a7ba877649b24f9ad76e6c1e1591a,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7443685355966293225, guid: c00a7ba877649b24f9ad76e6c1e1591a,
type: 3}
propertyPath: m_LocalRotation.x
value: 0.7071068
objectReference: {fileID: 0}
- target: {fileID: 7443685355966293225, guid: c00a7ba877649b24f9ad76e6c1e1591a,
type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7443685355966293225, guid: c00a7ba877649b24f9ad76e6c1e1591a,
type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7443685355966293225, guid: c00a7ba877649b24f9ad76e6c1e1591a,
type: 3}
propertyPath: m_LocalRotation.w
value: 0.7071068
objectReference: {fileID: 0}
- target: {fileID: 7443685355966293225, guid: c00a7ba877649b24f9ad76e6c1e1591a,
type: 3}
propertyPath: m_RootOrder
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7443685355966293225, guid: c00a7ba877649b24f9ad76e6c1e1591a,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 90
objectReference: {fileID: 0}
- target: {fileID: 7443685355966293225, guid: c00a7ba877649b24f9ad76e6c1e1591a,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7443685355966293225, guid: c00a7ba877649b24f9ad76e6c1e1591a,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: c00a7ba877649b24f9ad76e6c1e1591a, type: 3}
--- !u!4 &8859794570363654180 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 7443685355966293225, guid: c00a7ba877649b24f9ad76e6c1e1591a,
type: 3}
m_PrefabInstance: {fileID: 2141769885021123789}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &2419814894761420575 --- !u!1001 &2419814894761420575
PrefabInstance: PrefabInstance:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -5793,85 +5793,85 @@ Transform: ...@@ -5793,85 +5793,85 @@ Transform:
type: 3} type: 3}
m_PrefabInstance: {fileID: 2419814894761420575} m_PrefabInstance: {fileID: 2419814894761420575}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
--- !u!1001 &2928823686807225541 --- !u!1001 &3746244055904962130
PrefabInstance: PrefabInstance:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
serializedVersion: 2 serializedVersion: 2
m_Modification: m_Modification:
m_TransformParent: {fileID: 7919628057508581497} m_TransformParent: {fileID: 1030453852567010291}
m_Modifications: m_Modifications:
- target: {fileID: 7151777890846202786, guid: 1d9d9a2622ee5ff419d0b38234f4ca24, - target: {fileID: 6645013630165712003, guid: c00a7ba877649b24f9ad76e6c1e1591a,
type: 3} type: 3}
propertyPath: m_Name propertyPath: m_Name
value: LemonWater value: OrangeWater
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 7151777890846202786, guid: 1d9d9a2622ee5ff419d0b38234f4ca24, - target: {fileID: 6645013630165712003, guid: c00a7ba877649b24f9ad76e6c1e1591a,
type: 3} type: 3}
propertyPath: m_IsActive propertyPath: m_IsActive
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 7803539726416122128, guid: 1d9d9a2622ee5ff419d0b38234f4ca24, - target: {fileID: 7443685355966293225, guid: c00a7ba877649b24f9ad76e6c1e1591a,
type: 3} type: 3}
propertyPath: m_LocalPosition.x propertyPath: m_LocalPosition.x
value: 0 value: -0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 7803539726416122128, guid: 1d9d9a2622ee5ff419d0b38234f4ca24, - target: {fileID: 7443685355966293225, guid: c00a7ba877649b24f9ad76e6c1e1591a,
type: 3} type: 3}
propertyPath: m_LocalPosition.y propertyPath: m_LocalPosition.y
value: -0.85 value: -0.85
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 7803539726416122128, guid: 1d9d9a2622ee5ff419d0b38234f4ca24, - target: {fileID: 7443685355966293225, guid: c00a7ba877649b24f9ad76e6c1e1591a,
type: 3} type: 3}
propertyPath: m_LocalPosition.z propertyPath: m_LocalPosition.z
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 7803539726416122128, guid: 1d9d9a2622ee5ff419d0b38234f4ca24, - target: {fileID: 7443685355966293225, guid: c00a7ba877649b24f9ad76e6c1e1591a,
type: 3} type: 3}
propertyPath: m_LocalRotation.x propertyPath: m_LocalRotation.x
value: 0.7071068 value: 0.7071068
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 7803539726416122128, guid: 1d9d9a2622ee5ff419d0b38234f4ca24, - target: {fileID: 7443685355966293225, guid: c00a7ba877649b24f9ad76e6c1e1591a,
type: 3} type: 3}
propertyPath: m_LocalRotation.y propertyPath: m_LocalRotation.y
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 7803539726416122128, guid: 1d9d9a2622ee5ff419d0b38234f4ca24, - target: {fileID: 7443685355966293225, guid: c00a7ba877649b24f9ad76e6c1e1591a,
type: 3} type: 3}
propertyPath: m_LocalRotation.z propertyPath: m_LocalRotation.z
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 7803539726416122128, guid: 1d9d9a2622ee5ff419d0b38234f4ca24, - target: {fileID: 7443685355966293225, guid: c00a7ba877649b24f9ad76e6c1e1591a,
type: 3} type: 3}
propertyPath: m_LocalRotation.w propertyPath: m_LocalRotation.w
value: 0.7071068 value: 0.7071068
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 7803539726416122128, guid: 1d9d9a2622ee5ff419d0b38234f4ca24, - target: {fileID: 7443685355966293225, guid: c00a7ba877649b24f9ad76e6c1e1591a,
type: 3} type: 3}
propertyPath: m_RootOrder propertyPath: m_RootOrder
value: 0 value: 1
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 7803539726416122128, guid: 1d9d9a2622ee5ff419d0b38234f4ca24, - target: {fileID: 7443685355966293225, guid: c00a7ba877649b24f9ad76e6c1e1591a,
type: 3} type: 3}
propertyPath: m_LocalEulerAnglesHint.x propertyPath: m_LocalEulerAnglesHint.x
value: 90 value: 90
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 7803539726416122128, guid: 1d9d9a2622ee5ff419d0b38234f4ca24, - target: {fileID: 7443685355966293225, guid: c00a7ba877649b24f9ad76e6c1e1591a,
type: 3} type: 3}
propertyPath: m_LocalEulerAnglesHint.y propertyPath: m_LocalEulerAnglesHint.y
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 7803539726416122128, guid: 1d9d9a2622ee5ff419d0b38234f4ca24, - target: {fileID: 7443685355966293225, guid: c00a7ba877649b24f9ad76e6c1e1591a,
type: 3} type: 3}
propertyPath: m_LocalEulerAnglesHint.z propertyPath: m_LocalEulerAnglesHint.z
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
m_RemovedComponents: [] m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 1d9d9a2622ee5ff419d0b38234f4ca24, type: 3} m_SourcePrefab: {fileID: 100100000, guid: c00a7ba877649b24f9ad76e6c1e1591a, type: 3}
--- !u!4 &4967184143953401301 stripped --- !u!4 &6102409906051588795 stripped
Transform: Transform:
m_CorrespondingSourceObject: {fileID: 7803539726416122128, guid: 1d9d9a2622ee5ff419d0b38234f4ca24, m_CorrespondingSourceObject: {fileID: 7443685355966293225, guid: c00a7ba877649b24f9ad76e6c1e1591a,
type: 3} type: 3}
m_PrefabInstance: {fileID: 2928823686807225541} m_PrefabInstance: {fileID: 3746244055904962130}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
--- !u!1001 &3851776366882441990 --- !u!1001 &3851776366882441990
PrefabInstance: PrefabInstance:
...@@ -5969,83 +5969,83 @@ Transform: ...@@ -5969,83 +5969,83 @@ Transform:
type: 3} type: 3}
m_PrefabInstance: {fileID: 3851776366882441990} m_PrefabInstance: {fileID: 3851776366882441990}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
--- !u!1001 &7051200242193274512 --- !u!1001 &7829109549839950127
PrefabInstance: PrefabInstance:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
serializedVersion: 2 serializedVersion: 2
m_Modification: m_Modification:
m_TransformParent: {fileID: 7919628057508581497} m_TransformParent: {fileID: 1030453852567010291}
m_Modifications: m_Modifications:
- target: {fileID: 2363628013669500346, guid: abe407a9cdb26a641b636d096683e52b, - target: {fileID: 7151777890846202786, guid: 1d9d9a2622ee5ff419d0b38234f4ca24,
type: 3} type: 3}
propertyPath: m_Name propertyPath: m_Name
value: StrawberryWater value: LemonWater
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 2363628013669500346, guid: abe407a9cdb26a641b636d096683e52b, - target: {fileID: 7151777890846202786, guid: 1d9d9a2622ee5ff419d0b38234f4ca24,
type: 3} type: 3}
propertyPath: m_IsActive propertyPath: m_IsActive
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 5443159866486724803, guid: abe407a9cdb26a641b636d096683e52b, - target: {fileID: 7803539726416122128, guid: 1d9d9a2622ee5ff419d0b38234f4ca24,
type: 3} type: 3}
propertyPath: m_LocalPosition.x propertyPath: m_LocalPosition.x
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 5443159866486724803, guid: abe407a9cdb26a641b636d096683e52b, - target: {fileID: 7803539726416122128, guid: 1d9d9a2622ee5ff419d0b38234f4ca24,
type: 3} type: 3}
propertyPath: m_LocalPosition.y propertyPath: m_LocalPosition.y
value: -0.85 value: -0.85
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 5443159866486724803, guid: abe407a9cdb26a641b636d096683e52b, - target: {fileID: 7803539726416122128, guid: 1d9d9a2622ee5ff419d0b38234f4ca24,
type: 3} type: 3}
propertyPath: m_LocalPosition.z propertyPath: m_LocalPosition.z
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 5443159866486724803, guid: abe407a9cdb26a641b636d096683e52b, - target: {fileID: 7803539726416122128, guid: 1d9d9a2622ee5ff419d0b38234f4ca24,
type: 3} type: 3}
propertyPath: m_LocalRotation.x propertyPath: m_LocalRotation.x
value: 0.7071068 value: 0.7071068
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 5443159866486724803, guid: abe407a9cdb26a641b636d096683e52b, - target: {fileID: 7803539726416122128, guid: 1d9d9a2622ee5ff419d0b38234f4ca24,
type: 3} type: 3}
propertyPath: m_LocalRotation.y propertyPath: m_LocalRotation.y
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 5443159866486724803, guid: abe407a9cdb26a641b636d096683e52b, - target: {fileID: 7803539726416122128, guid: 1d9d9a2622ee5ff419d0b38234f4ca24,
type: 3} type: 3}
propertyPath: m_LocalRotation.z propertyPath: m_LocalRotation.z
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 5443159866486724803, guid: abe407a9cdb26a641b636d096683e52b, - target: {fileID: 7803539726416122128, guid: 1d9d9a2622ee5ff419d0b38234f4ca24,
type: 3} type: 3}
propertyPath: m_LocalRotation.w propertyPath: m_LocalRotation.w
value: 0.7071068 value: 0.7071068
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 5443159866486724803, guid: abe407a9cdb26a641b636d096683e52b, - target: {fileID: 7803539726416122128, guid: 1d9d9a2622ee5ff419d0b38234f4ca24,
type: 3} type: 3}
propertyPath: m_RootOrder propertyPath: m_RootOrder
value: 2 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 5443159866486724803, guid: abe407a9cdb26a641b636d096683e52b, - target: {fileID: 7803539726416122128, guid: 1d9d9a2622ee5ff419d0b38234f4ca24,
type: 3} type: 3}
propertyPath: m_LocalEulerAnglesHint.x propertyPath: m_LocalEulerAnglesHint.x
value: 90 value: 90
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 5443159866486724803, guid: abe407a9cdb26a641b636d096683e52b, - target: {fileID: 7803539726416122128, guid: 1d9d9a2622ee5ff419d0b38234f4ca24,
type: 3} type: 3}
propertyPath: m_LocalEulerAnglesHint.y propertyPath: m_LocalEulerAnglesHint.y
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 5443159866486724803, guid: abe407a9cdb26a641b636d096683e52b, - target: {fileID: 7803539726416122128, guid: 1d9d9a2622ee5ff419d0b38234f4ca24,
type: 3} type: 3}
propertyPath: m_LocalEulerAnglesHint.z propertyPath: m_LocalEulerAnglesHint.z
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
m_RemovedComponents: [] m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: abe407a9cdb26a641b636d096683e52b, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 1d9d9a2622ee5ff419d0b38234f4ca24, type: 3}
--- !u!4 &3049808095234395731 stripped --- !u!4 &66757600074182719 stripped
Transform: Transform:
m_CorrespondingSourceObject: {fileID: 5443159866486724803, guid: abe407a9cdb26a641b636d096683e52b, m_CorrespondingSourceObject: {fileID: 7803539726416122128, guid: 1d9d9a2622ee5ff419d0b38234f4ca24,
type: 3} type: 3}
m_PrefabInstance: {fileID: 7051200242193274512} m_PrefabInstance: {fileID: 7829109549839950127}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
...@@ -430,7 +430,7 @@ ParticleSystem: ...@@ -430,7 +430,7 @@ ParticleSystem:
cullingMode: 1 cullingMode: 1
ringBufferMode: 0 ringBufferMode: 0
ringBufferLoopRange: {x: 0, y: 1} ringBufferLoopRange: {x: 0, y: 1}
looping: 0 looping: 1
prewarm: 0 prewarm: 0
playOnAwake: 1 playOnAwake: 1
useUnscaledTime: 0 useUnscaledTime: 0
...@@ -499,7 +499,7 @@ ParticleSystem: ...@@ -499,7 +499,7 @@ ParticleSystem:
startLifetime: startLifetime:
serializedVersion: 2 serializedVersion: 2
minMaxState: 3 minMaxState: 3
scalar: 0.5 scalar: 0.52
minScalar: 0.2 minScalar: 0.2
maxCurve: maxCurve:
serializedVersion: 2 serializedVersion: 2
...@@ -8817,7 +8817,7 @@ ParticleSystem: ...@@ -8817,7 +8817,7 @@ ParticleSystem:
cullingMode: 1 cullingMode: 1
ringBufferMode: 0 ringBufferMode: 0
ringBufferLoopRange: {x: 0, y: 1} ringBufferLoopRange: {x: 0, y: 1}
looping: 0 looping: 1
prewarm: 0 prewarm: 0
playOnAwake: 1 playOnAwake: 1
useUnscaledTime: 0 useUnscaledTime: 0
...@@ -8886,7 +8886,7 @@ ParticleSystem: ...@@ -8886,7 +8886,7 @@ ParticleSystem:
startLifetime: startLifetime:
serializedVersion: 2 serializedVersion: 2
minMaxState: 3 minMaxState: 3
scalar: 0.5 scalar: 0.52
minScalar: 0.2 minScalar: 0.2
maxCurve: maxCurve:
serializedVersion: 2 serializedVersion: 2
...@@ -15088,7 +15088,7 @@ ParticleSystem: ...@@ -15088,7 +15088,7 @@ ParticleSystem:
cullingMode: 1 cullingMode: 1
ringBufferMode: 0 ringBufferMode: 0
ringBufferLoopRange: {x: 0, y: 1} ringBufferLoopRange: {x: 0, y: 1}
looping: 0 looping: 1
prewarm: 0 prewarm: 0
playOnAwake: 1 playOnAwake: 1
useUnscaledTime: 0 useUnscaledTime: 0
...@@ -15157,7 +15157,7 @@ ParticleSystem: ...@@ -15157,7 +15157,7 @@ ParticleSystem:
startLifetime: startLifetime:
serializedVersion: 2 serializedVersion: 2
minMaxState: 3 minMaxState: 3
scalar: 0.5 scalar: 0.52
minScalar: 0.2 minScalar: 0.2
maxCurve: maxCurve:
serializedVersion: 2 serializedVersion: 2
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment