Skip to content

Commit

Permalink
Update illusion
Browse files Browse the repository at this point in the history
  • Loading branch information
@syKevinPeng
syKevinPeng committed Apr 24, 2024
1 parent 95142e0 commit 08f5d64
Show file tree
Hide file tree
Showing 7 changed files with 208 additions and 108 deletions.
126 changes: 123 additions & 3 deletions Assets/Level/Level1.asset
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,129 @@ MonoBehaviour:
_enabled: 1
_pathGenerator: {fileID: 0}
_sequenceCollection:
sequences: []
sequencePositions: []
allSequences: []
sequences:
- enabled: 1
name: Sequence
isCustom: 0
customSequence: {fileID: 0}
segments:
- nested: 0
randomPickChance: 0.37777779
_prefab: {fileID: 2347072853820848496, guid: caa679a8fd0c1e5459b3641f700898f9, type: 3}
_segmentPool: []
_pool: 0
_poolParent: {fileID: 0}
- nested: 0
randomPickChance: 0.47777778
_prefab: {fileID: 2347072853820848496, guid: 65d6ccb1d4697bd4795c7e8b39331a87, type: 3}
_segmentPool: []
_pool: 0
_poolParent: {fileID: 0}
- nested: 0
randomPickChance: 0.33333334
_prefab: {fileID: 2347072853820848496, guid: cef9a168e67e7064d9ed5cf766036816, type: 3}
_segmentPool: []
_pool: 0
_poolParent: {fileID: 0}
customPathGenerator: {fileID: 0}
spawnCount: 1
type: 1
randomizer: {fileID: 11400000, guid: fb600be43607d7e47822c78754644d57, type: 2}
customShuffle: {fileID: 0}
preventRepeat: 0
- enabled: 1
name: Sequence
isCustom: 0
customSequence: {fileID: 0}
segments:
- nested: 0
randomPickChance: 1
_prefab: {fileID: 2347072853820848496, guid: caa679a8fd0c1e5459b3641f700898f9, type: 3}
_segmentPool: []
_pool: 0
_poolParent: {fileID: 0}
- nested: 0
randomPickChance: 1
_prefab: {fileID: 2347072853820848496, guid: 65d6ccb1d4697bd4795c7e8b39331a87, type: 3}
_segmentPool: []
_pool: 0
_poolParent: {fileID: 0}
- nested: 0
randomPickChance: 1
_prefab: {fileID: 2347072853820848496, guid: cef9a168e67e7064d9ed5cf766036816, type: 3}
_segmentPool: []
_pool: 0
_poolParent: {fileID: 0}
customPathGenerator: {fileID: 0}
spawnCount: 1
type: 3
randomizer: {fileID: 11400000, guid: fb600be43607d7e47822c78754644d57, type: 2}
customShuffle: {fileID: 0}
preventRepeat: 0
sequencePositions:
- parent: -1
segmentIndex: -1
- parent: -1
segmentIndex: -1
allSequences:
- enabled: 1
name: Sequence
isCustom: 0
customSequence: {fileID: 0}
segments:
- nested: 0
randomPickChance: 0.37777779
_prefab: {fileID: 2347072853820848496, guid: caa679a8fd0c1e5459b3641f700898f9, type: 3}
_segmentPool: []
_pool: 0
_poolParent: {fileID: 0}
- nested: 0
randomPickChance: 0.47777778
_prefab: {fileID: 2347072853820848496, guid: 65d6ccb1d4697bd4795c7e8b39331a87, type: 3}
_segmentPool: []
_pool: 0
_poolParent: {fileID: 0}
- nested: 0
randomPickChance: 0.33333334
_prefab: {fileID: 2347072853820848496, guid: cef9a168e67e7064d9ed5cf766036816, type: 3}
_segmentPool: []
_pool: 0
_poolParent: {fileID: 0}
customPathGenerator: {fileID: 0}
spawnCount: 1
type: 1
randomizer: {fileID: 11400000, guid: fb600be43607d7e47822c78754644d57, type: 2}
customShuffle: {fileID: 0}
preventRepeat: 0
- enabled: 1
name: Sequence
isCustom: 0
customSequence: {fileID: 0}
segments:
- nested: 0
randomPickChance: 1
_prefab: {fileID: 2347072853820848496, guid: caa679a8fd0c1e5459b3641f700898f9, type: 3}
_segmentPool: []
_pool: 0
_poolParent: {fileID: 0}
- nested: 0
randomPickChance: 1
_prefab: {fileID: 2347072853820848496, guid: 65d6ccb1d4697bd4795c7e8b39331a87, type: 3}
_segmentPool: []
_pool: 0
_poolParent: {fileID: 0}
- nested: 0
randomPickChance: 1
_prefab: {fileID: 2347072853820848496, guid: cef9a168e67e7064d9ed5cf766036816, type: 3}
_segmentPool: []
_pool: 0
_poolParent: {fileID: 0}
customPathGenerator: {fileID: 0}
spawnCount: 1
type: 3
randomizer: {fileID: 11400000, guid: fb600be43607d7e47822c78754644d57, type: 2}
customShuffle: {fileID: 0}
preventRepeat: 0
_remoteSequence: 0
_remoteSceneName:
_loadingPriority: 1
160 changes: 70 additions & 90 deletions Assets/Scenes/ForeverTesting.unity → Assets/Scenes/IllusionInMotionScene.unity
View file
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,7 @@ GameObject:
m_Component:
- component: {fileID: 711683828}
- component: {fileID: 711683827}
- component: {fileID: 711683829}
m_Layer: 0
m_Name: Directional Light
m_TagString: Untagged
Expand All @@ -157,13 +158,13 @@ Light:
m_Type: 2
m_Shape: 0
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_Intensity: 5
m_Range: 7
m_Intensity: 3
m_Range: 20
m_SpotAngle: 40
m_InnerSpotAngle: 4
m_CookieSize: 10
m_Shadows:
m_Type: 0
m_Type: 2
m_Resolution: -1
m_CustomResolution: -1
m_Strength: 1
Expand Down Expand Up @@ -214,14 +215,70 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 711683826}
m_LocalRotation: {x: 0.1367044, y: 0.0055323746, z: 0.0007634797, w: 0.9905962}
m_LocalPosition: {x: 0, y: 1.49, z: -5}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 9.78, z: 1.469}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 15.714, y: 0.665, z: 0.18}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &711683829
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 711683826}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 3d2d491ea20618745ada741714dad7c0, type: 3}
m_Name:
m_EditorClassIdentifier:
updateMode: 0
startPercent: 0
startDistance: 0
startMode: 0
followSpeed: 1
follow: 1
isPlayer: 0
loop: 0
physicsMode: 0
_motion:
enabled: 1
offset: {x: 0, y: 0}
useSplineSizes: 1
rotationOffset: {x: 0, y: 0, z: 0}
baseScale: {x: 1, y: 1, z: 1}
sample:
position: {x: 0, y: 0, z: 0}
up: {x: 0, y: 0, z: 0}
forward: {x: 0, y: 0, z: 0}
color: {r: 0, g: 0, b: 0, a: 0}
size: 0
percent: 0
applyPositionX: 1
applyPositionY: 0
applyPositionZ: 1
applyRotationX: 1
applyRotationY: 1
applyRotationZ: 1
applyScaleX: 0
applyScaleY: 0
applyScaleZ: 0
width: 1
laneCount: 1
startLane: 1
laneSwitchSpeed: 5
useCustomPaths: 1
laneSwitchSpeedCurve:
serializedVersion: 2
m_Curve: []
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
laneVector: {x: 1, y: 0}
_lane: 2
--- !u!1 &758907210
GameObject:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -404,7 +461,7 @@ MonoBehaviour:
_useUnloadUnusedAssets: 0
_loopSegmentLogic: 0
_levelCollection:
- {fileID: 11400000, guid: 3811ee19cb15fd34493084dd3ddef416, type: 2}
- {fileID: 11400000, guid: 764217f56d3d52f4b9dbffc1e65212d5, type: 2}
_levelIteration: 4
_levelRandomizer: {fileID: 0}
_generationRandomizer: {fileID: 11400000, guid: fb600be43607d7e47822c78754644d57, type: 2}
Expand All @@ -425,7 +482,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 3
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1151951235
GameObject:
Expand Down Expand Up @@ -569,11 +626,11 @@ MonoBehaviour:
applyScaleX: 0
applyScaleY: 0
applyScaleZ: 0
width: 5
width: 1
laneCount: 1
startLane: 1
laneSwitchSpeed: 5
useCustomPaths: 0
useCustomPaths: 1
laneSwitchSpeedCurve:
serializedVersion: 2
m_Curve: []
Expand All @@ -595,7 +652,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 400004, guid: 126d619cf4daa52469682f85c1378b4a, type: 3}
propertyPath: m_RootOrder
value: 4
value: 3
objectReference: {fileID: 0}
- target: {fileID: 400004, guid: 126d619cf4daa52469682f85c1378b4a, type: 3}
propertyPath: m_LocalPosition.x
Expand All @@ -607,7 +664,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 400004, guid: 126d619cf4daa52469682f85c1378b4a, type: 3}
propertyPath: m_LocalPosition.z
value: -2.52
value: -5.62
objectReference: {fileID: 0}
- target: {fileID: 400004, guid: 126d619cf4daa52469682f85c1378b4a, type: 3}
propertyPath: m_LocalRotation.w
Expand Down Expand Up @@ -702,83 +759,6 @@ Transform:
m_Father: {fileID: 1151951236}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &2039191815
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 4421512216105442768, guid: 5701f125703064545b087fc082095763, type: 3}
propertyPath: m_LocalScale.y
value: 0.1
objectReference: {fileID: 0}
- target: {fileID: 4483990161533943508, guid: 5701f125703064545b087fc082095763, type: 3}
propertyPath: m_Name
value: Segment1
objectReference: {fileID: 0}
- target: {fileID: 5980044329459902805, guid: 5701f125703064545b087fc082095763, type: 3}
propertyPath: m_LocalScale.y
value: 0.1
objectReference: {fileID: 0}
- target: {fileID: 5980044329459902805, guid: 5701f125703064545b087fc082095763, type: 3}
propertyPath: m_LocalScale.z
value: 0.2
objectReference: {fileID: 0}
- target: {fileID: 5980044329459902805, guid: 5701f125703064545b087fc082095763, type: 3}
propertyPath: m_LocalPosition.z
value: -0.70651
objectReference: {fileID: 0}
- target: {fileID: 8466261056884983947, guid: 5701f125703064545b087fc082095763, type: 3}
propertyPath: m_LocalScale.y
value: 0.1
objectReference: {fileID: 0}
- target: {fileID: 8515163421193863295, guid: 5701f125703064545b087fc082095763, type: 3}
propertyPath: m_RootOrder
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8515163421193863295, guid: 5701f125703064545b087fc082095763, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8515163421193863295, guid: 5701f125703064545b087fc082095763, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8515163421193863295, guid: 5701f125703064545b087fc082095763, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8515163421193863295, guid: 5701f125703064545b087fc082095763, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8515163421193863295, guid: 5701f125703064545b087fc082095763, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8515163421193863295, guid: 5701f125703064545b087fc082095763, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8515163421193863295, guid: 5701f125703064545b087fc082095763, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8515163421193863295, guid: 5701f125703064545b087fc082095763, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8515163421193863295, guid: 5701f125703064545b087fc082095763, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8515163421193863295, guid: 5701f125703064545b087fc082095763, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 5701f125703064545b087fc082095763, type: 3}
--- !u!4 &2107651536 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 487254, guid: 126d619cf4daa52469682f85c1378b4a, type: 3}
Expand Down
0 Assets/Scenes/ForeverTesting.unity.meta → ...s/Scenes/IllusionInMotionScene.unity.meta
View file
File renamed without changes.
4 changes: 2 additions & 2 deletions Assets/Scenes/IllusionScene.unity
View file
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!108 &711683827
Light:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -335,7 +335,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!114 &758907211
MonoBehaviour:
m_ObjectHideFlags: 0
Expand Down
2 changes: 1 addition & 1 deletion Assets/Scenes/WelcomeScene.unity
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2351,7 +2351,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 2514675399181695721, guid: f54012181eacade4ea242c65f804720f, type: 3}
propertyPath: m_LocalPosition.y
value: 1.321
value: 1.2
objectReference: {fileID: 0}
- target: {fileID: 2514675399181695721, guid: f54012181eacade4ea242c65f804720f, type: 3}
propertyPath: m_LocalPosition.z
Expand Down
Loading

0 comments on commit 08f5d64

Please sign in to comment.