diff --git a/Assets/000_assets/Anim/HitPoint_Show01.anim b/Assets/000_assets/Anim/HitPoint_Show01.anim index f1af7e24..963de028 100644 --- a/Assets/000_assets/Anim/HitPoint_Show01.anim +++ b/Assets/000_assets/Anim/HitPoint_Show01.anim @@ -24,15 +24,15 @@ AnimationClip: - serializedVersion: 3 time: 0 value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 + inSlope: 0.69187474 + outSlope: 0.69187474 + tangentMode: 0 weightedMode: 0 inWeight: 0.33333334 - outWeight: 0.33333334 + outWeight: 0.07240412 - serializedVersion: 3 time: 0.33333334 - value: 0.033 + value: 0.1 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -42,7 +42,7 @@ AnimationClip: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - attribute: material._cube_radius + attribute: material._point_width path: Particle System classID: 199 script: {fileID: 0} @@ -61,8 +61,26 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.33333334 - value: 0.05 + time: 0.083333336 + value: 0 + inSlope: 0 + outSlope: 4.1705184 + tangentMode: 1 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.22459848 + - serializedVersion: 3 + time: 0.15 + value: 0.1710682 + inSlope: 1.214533 + outSlope: 0.7204915 + tangentMode: 1 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.07618854 + - serializedVersion: 3 + time: 0.41666666 + value: 0.25 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -72,7 +90,7 @@ AnimationClip: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - attribute: material._cube_width + attribute: material._point2_width path: Particle System classID: 199 script: {fileID: 0} @@ -84,15 +102,24 @@ AnimationClip: - serializedVersion: 3 time: 0 value: 0 - inSlope: 0 - outSlope: 0 + inSlope: 2.918644 + outSlope: 2.918644 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.10358159 + - serializedVersion: 3 + time: 0.16666667 + value: 0.33520973 + inSlope: 1.1 + outSlope: 1.1 tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 time: 0.5 - value: 0.5 + value: 0.55 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -112,7 +139,7 @@ AnimationClip: serializedVersion: 2 m_Curve: - serializedVersion: 3 - time: 0.16666667 + time: 0 value: 0 inSlope: 0 outSlope: 0 @@ -120,18 +147,9 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.28333333 - value: 0.11 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - serializedVersion: 3 time: 0.5 - value: 0.01 + value: 0.115 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -152,7 +170,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0.9 + value: 0 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -161,26 +179,17 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.5 - value: 0.9 + value: 0.02 inSlope: 0 - outSlope: -0.43721995 - tangentMode: 1 + outSlope: 0 + tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 - outWeight: 0.09370208 - - serializedVersion: 3 - time: 1 - value: 0.5 - inSlope: -0.03507681 - outSlope: -0.03507681 - tangentMode: 0 - weightedMode: 1 - inWeight: 0.8706604 outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - attribute: material._gapsize + attribute: material._Ring_Opacity path: Particle System classID: 199 script: {fileID: 0} @@ -195,7 +204,7 @@ AnimationClip: genericBindings: - serializedVersion: 2 path: 922205677 - attribute: 2312236205 + attribute: 2173859650 script: {fileID: 0} typeID: 199 customType: 22 @@ -204,7 +213,7 @@ AnimationClip: isSerializeReferenceCurve: 0 - serializedVersion: 2 path: 922205677 - attribute: 2357554547 + attribute: 2411532609 script: {fileID: 0} typeID: 199 customType: 22 @@ -231,7 +240,7 @@ AnimationClip: isSerializeReferenceCurve: 0 - serializedVersion: 2 path: 922205677 - attribute: 2345372462 + attribute: 2152823464 script: {fileID: 0} typeID: 199 customType: 22 @@ -244,7 +253,7 @@ AnimationClip: m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 1 + m_StopTime: 0.5 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 @@ -267,15 +276,15 @@ AnimationClip: - serializedVersion: 3 time: 0 value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 + inSlope: 0.69187474 + outSlope: 0.69187474 + tangentMode: 0 weightedMode: 0 inWeight: 0.33333334 - outWeight: 0.33333334 + outWeight: 0.07240412 - serializedVersion: 3 time: 0.33333334 - value: 0.033 + value: 0.1 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -285,7 +294,7 @@ AnimationClip: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - attribute: material._cube_radius + attribute: material._point_width path: Particle System classID: 199 script: {fileID: 0} @@ -304,8 +313,26 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.33333334 - value: 0.05 + time: 0.083333336 + value: 0 + inSlope: 0 + outSlope: 4.1705184 + tangentMode: 1 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.22459848 + - serializedVersion: 3 + time: 0.15 + value: 0.1710682 + inSlope: 1.214533 + outSlope: 0.7204915 + tangentMode: 1 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.07618854 + - serializedVersion: 3 + time: 0.41666666 + value: 0.25 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -315,7 +342,7 @@ AnimationClip: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - attribute: material._cube_width + attribute: material._point2_width path: Particle System classID: 199 script: {fileID: 0} @@ -327,15 +354,24 @@ AnimationClip: - serializedVersion: 3 time: 0 value: 0 - inSlope: 0 - outSlope: 0 + inSlope: 2.918644 + outSlope: 2.918644 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.10358159 + - serializedVersion: 3 + time: 0.16666667 + value: 0.33520973 + inSlope: 1.1 + outSlope: 1.1 tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 time: 0.5 - value: 0.5 + value: 0.55 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -355,7 +391,7 @@ AnimationClip: serializedVersion: 2 m_Curve: - serializedVersion: 3 - time: 0.16666667 + time: 0 value: 0 inSlope: 0 outSlope: 0 @@ -363,18 +399,9 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.28333333 - value: 0.11 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - serializedVersion: 3 time: 0.5 - value: 0.01 + value: 0.115 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -395,7 +422,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0.9 + value: 0 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -404,26 +431,17 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.5 - value: 0.9 + value: 0.02 inSlope: 0 - outSlope: -0.43721995 - tangentMode: 1 + outSlope: 0 + tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 - outWeight: 0.09370208 - - serializedVersion: 3 - time: 1 - value: 0.5 - inSlope: -0.03507681 - outSlope: -0.03507681 - tangentMode: 0 - weightedMode: 1 - inWeight: 0.8706604 outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - attribute: material._gapsize + attribute: material._Ring_Opacity path: Particle System classID: 199 script: {fileID: 0} diff --git a/Assets/ThemeBundles/DepartureToMultiverse/Materials/Track/M_Head_New_01.mat b/Assets/ThemeBundles/DepartureToMultiverse/Materials/Track/M_Head_New_01.mat index 20e9402a..bcfb0c8d 100644 --- a/Assets/ThemeBundles/DepartureToMultiverse/Materials/Track/M_Head_New_01.mat +++ b/Assets/ThemeBundles/DepartureToMultiverse/Materials/Track/M_Head_New_01.mat @@ -43,28 +43,28 @@ Material: - _QueueControl: 0 - _QueueOffset: 0 - _ReceiveShadows: 1 - - _Ring_Opacity: 0.103 + - _Ring_Opacity: 0.02 - _XRMotionVectorsPass: 1 - - _count: 3 + - _count: 4 - _cube_radius: 0.088 - _cube_softness: 0 - _cube_width: 0.032 - - _gap_softness: 0.44 - - _gapsize: 0.454 - - _point2_Opacity: 0.037 - - _point2_radius: 0.063 - - _point2_softness: 0.241 - - _point2_width: 0.068 - - _point_radius: 0.018 + - _gap_softness: 0 + - _gapsize: 0.96 + - _point2_Opacity: 0.015 + - _point2_radius: 0 + - _point2_softness: 0 + - _point2_width: 0.25 + - _point_radius: 0 - _point_softness: 0 - - _point_width: 0.095 - - _ring_radius: 0.669 - - _ring_rotation: 0 + - _point_width: 0.1 + - _ring_radius: 0.55 + - _ring_rotation: 0.6 - _ring_rotation_angle: 0 - _ring_softness: 0 - - _ring_width: 0.033 + - _ring_width: 0.115 m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 5.656854, g: 5.656854, b: 5.656854, a: 1} - _EmissionColor: {r: 1, g: 1, b: 1, a: 1} - _ImageColor: {r: 0.7490196, g: 0.7490196, b: 0.7490196, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/ThemeBundles/DepartureToMultiverse/Prefabs/DTM_Trail.prefab b/Assets/ThemeBundles/DepartureToMultiverse/Prefabs/DTM_Trail.prefab index b1e7040a..06bc6836 100644 --- a/Assets/ThemeBundles/DepartureToMultiverse/Prefabs/DTM_Trail.prefab +++ b/Assets/ThemeBundles/DepartureToMultiverse/Prefabs/DTM_Trail.prefab @@ -17,7 +17,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!4 &448133524246398677 Transform: m_ObjectHideFlags: 0 @@ -604,7 +604,7 @@ ParticleSystem: m_RotationOrder: 4 randomizeRotationDirection: 0 gravitySource: 0 - maxNumParticles: 1000 + maxNumParticles: 1 customEmitterVelocity: {x: 0, y: 0, z: 0} size3D: 0 rotation3D: 0 @@ -10031,7 +10031,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &4577072593820393137 Transform: m_ObjectHideFlags: 0 @@ -19789,7 +19789,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &4577072594143320191 Transform: m_ObjectHideFlags: 0 @@ -24695,7 +24695,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &4577072594657777397 Transform: m_ObjectHideFlags: 0