diff --git a/Assets/MyPostProcess/Effects/Wave/Attack_Wave/AWM0.mat b/Assets/MyPostProcess/Effects/Wave/Attack_Wave/AWM0.mat index 281743a..6092c19 100644 --- a/Assets/MyPostProcess/Effects/Wave/Attack_Wave/AWM0.mat +++ b/Assets/MyPostProcess/Effects/Wave/Attack_Wave/AWM0.mat @@ -44,6 +44,6 @@ Material: - WaveIntensity_2: 1 - WaveSpread_Value: 0 m_Colors: - - Center: {r: 0.4420366, g: 0.36893135, b: 0, a: 0} + - Center: {r: 0.44940573, g: 0.3697862, b: 0, a: 0} - Vector2_d2d098295fc146f08b921b231b2e5199: {r: 1.6, g: 0.9, b: 0, a: 0} m_BuildTextureStacks: [] diff --git a/Assets/Scenes/第一关.unity b/Assets/Scenes/第一关.unity index 75ea9cd..9856865 100644 --- a/Assets/Scenes/第一关.unity +++ b/Assets/Scenes/第一关.unity @@ -21612,7 +21612,7 @@ Camera: far clip plane: 1000 field of view: 60 orthographic: 1 - orthographic size: 6.57 + orthographic size: 7.5 m_Depth: -1 m_CullingMask: serializedVersion: 2 @@ -23641,7 +23641,7 @@ MonoBehaviour: m_Follow: {fileID: 1737112887496214201} m_Lens: FieldOfView: 60 - OrthographicSize: 6.57 + OrthographicSize: 7.5 NearClipPlane: 0.3 FarClipPlane: 1000 Dutch: 0 diff --git a/Assets/Scenes/第二关.unity b/Assets/Scenes/第二关.unity index 7a57063..4d904ae 100644 --- a/Assets/Scenes/第二关.unity +++ b/Assets/Scenes/第二关.unity @@ -10268,7 +10268,7 @@ MonoBehaviour: m_Follow: {fileID: 27089236} m_Lens: FieldOfView: 60 - OrthographicSize: 7.08 + OrthographicSize: 7.5 NearClipPlane: 0.3 FarClipPlane: 1000 Dutch: 0 @@ -11623,6 +11623,7 @@ MonoBehaviour: missile: {fileID: 4018427281142380165, guid: 628f0c1ef857ddd4687c94b8ba9b1aa6, type: 3} throwOffset: {fileID: 1297787209} machineAudio: {fileID: 375452312} + runFootsDust: {fileID: 0} --- !u!114 &1720952668 MonoBehaviour: m_ObjectHideFlags: 0 @@ -12666,7 +12667,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1791259307} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -29.611664, y: -3.5926762, z: -10} + m_LocalPosition: {x: -28.862568, y: -3.1726923, z: -10} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1031032740} @@ -12773,7 +12774,7 @@ Camera: far clip plane: 1000 field of view: 60 orthographic: 1 - orthographic size: 7.08 + orthographic size: 7.5 m_Depth: -1 m_CullingMask: serializedVersion: 2 diff --git a/Assets/图/他爸.psb.meta b/Assets/图/他爸.psb.meta index b02ed6c..2257857 100644 --- a/Assets/图/他爸.psb.meta +++ b/Assets/图/他爸.psb.meta @@ -91,7 +91,7 @@ ScriptedImporter: uvTransform: {x: 0, y: 0} mosaicSpriteImportData: [] rigSpriteImportData: - - name: "\u56FE\u5C42 57" + - name: "\u5934" originalName: pivot: {x: 0.5, y: 0.5} alignment: 0 @@ -534,7 +534,7 @@ ScriptedImporter: tessellationDetail: 0 parentGroupIndex: -1 uvTransform: {x: -235, y: -317} - - name: "\u56FE\u5C42 47" + - name: "\u524D\u5C0F\u81C2" originalName: pivot: {x: 0.5, y: 0.5} alignment: 0 @@ -986,7 +986,7 @@ ScriptedImporter: tessellationDetail: 0 parentGroupIndex: -1 uvTransform: {x: 431, y: -205} - - name: "\u56FE\u5C42 46" + - name: "\u524D\u5927\u81C2" originalName: pivot: {x: 0.5, y: 0.5} alignment: 0 @@ -1480,7 +1480,7 @@ ScriptedImporter: tessellationDetail: 0 parentGroupIndex: -1 uvTransform: {x: 384, y: -555} - - name: "\u56FE\u5C42 45" + - name: "\u524D\u624B\u63E1\u7D27" originalName: pivot: {x: 0.5, y: 0.5} alignment: 0 @@ -1857,7 +1857,7 @@ ScriptedImporter: tessellationDetail: 0 parentGroupIndex: -1 uvTransform: {x: 175, y: 103} - - name: "\u56FE\u5C42 44" + - name: "\u524D\u624B\u653E\u5F00" originalName: pivot: {x: 0.5, y: 0.5} alignment: 0 @@ -2430,7 +2430,7 @@ ScriptedImporter: tessellationDetail: 0 parentGroupIndex: -1 uvTransform: {x: 458, y: 95} - - name: "\u56FE\u5C42 41" + - name: "\u8EAB\u4F53" originalName: pivot: {x: 0.5, y: 0.5} alignment: 0 @@ -3049,7 +3049,7 @@ ScriptedImporter: tessellationDetail: 0 parentGroupIndex: -1 uvTransform: {x: -134, y: -391} - - name: "\u56FE\u5C42 51" + - name: "\u524D\u5927\u817F" originalName: pivot: {x: 0.5, y: 0.5} alignment: 0 @@ -3575,7 +3575,7 @@ ScriptedImporter: tessellationDetail: 0 parentGroupIndex: -1 uvTransform: {x: 174, y: -215} - - name: "\u56FE\u5C42 49" + - name: "\u524D\u5C0F\u817F" originalName: pivot: {x: 0.5, y: 0.5} alignment: 0 @@ -4087,7 +4087,7 @@ ScriptedImporter: tessellationDetail: 0 parentGroupIndex: -1 uvTransform: {x: 186, y: 481} - - name: "\u56FE\u5C42 34" + - name: "\u524D\u811A" originalName: pivot: {x: 0.5, y: 0.5} alignment: 0 @@ -4486,7 +4486,7 @@ ScriptedImporter: tessellationDetail: 0 parentGroupIndex: -1 uvTransform: {x: 335, y: 729} - - name: "\u56FE\u5C42 55" + - name: "\u540E\u5927\u817F" originalName: pivot: {x: 0.5, y: 0.5} alignment: 0 @@ -5075,14 +5075,14 @@ ScriptedImporter: tessellationDetail: 0 parentGroupIndex: -1 uvTransform: {x: -272, y: 518} - - name: "\u56FE\u5C42 53" + - name: "\u540E\u5C0F\u817F" originalName: pivot: {x: 0.5, y: 0.5} alignment: 0 border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 177 + x: 175 y: 735 width: 134 height: 222 @@ -5549,7 +5549,7 @@ ScriptedImporter: tessellationDetail: 0 parentGroupIndex: -1 uvTransform: {x: -153, y: 689} - - name: "\u56FE\u5C42 31" + - name: "\u540E\u811A" originalName: pivot: {x: 0.5, y: 0.5} alignment: 0 @@ -5948,7 +5948,7 @@ ScriptedImporter: tessellationDetail: 0 parentGroupIndex: -1 uvTransform: {x: 125, y: 820} - - name: "\u56FE\u5C42 40" + - name: "\u540E\u5927\u81C2" originalName: pivot: {x: 0.5, y: 0.5} alignment: 0 @@ -6438,7 +6438,7 @@ ScriptedImporter: tessellationDetail: 0 parentGroupIndex: -1 uvTransform: {x: -22, y: -243} - - name: "\u56FE\u5C42 39" + - name: "\u540E\u5C0F\u81C2" originalName: pivot: {x: 0.5, y: 0.5} alignment: 0 @@ -6857,7 +6857,7 @@ ScriptedImporter: tessellationDetail: 0 parentGroupIndex: -1 uvTransform: {x: -89, y: 309} - - name: "\u56FE\u5C42 38" + - name: "\u540E\u624B\u63E1\u7D27" originalName: pivot: {x: 0.5, y: 0.5} alignment: 0 @@ -7305,7 +7305,7 @@ ScriptedImporter: tessellationDetail: 0 parentGroupIndex: -1 uvTransform: {x: -251, y: 204} - - name: "\u56FE\u5C42 37" + - name: "\u540E\u624B\u653E\u5F00" originalName: pivot: {x: 0.5, y: 0.5} alignment: 0 diff --git a/Assets/游戏内动画资源/AC/小孩(序章).controller b/Assets/游戏内动画资源/AC/小孩(序章).controller index 411361c..2472a49 100644 --- a/Assets/游戏内动画资源/AC/小孩(序章).controller +++ b/Assets/游戏内动画资源/AC/小孩(序章).controller @@ -68,7 +68,7 @@ AnimatorController: m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000} m_AnimatorLayers: - serializedVersion: 5 m_Name: Base Layer @@ -121,7 +121,7 @@ AnimatorStateMachine: m_Position: {x: 340, y: 110, z: 0} - serializedVersion: 1 m_State: {fileID: -9181802701414636654} - m_Position: {x: 465.57388, y: -24.151016, z: 0} + m_Position: {x: 460, y: -20, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: [] m_EntryTransitions: [] diff --git a/Assets/游戏内动画资源/AM/次骨骼/修电报线中.anim b/Assets/游戏内动画资源/AM/次骨骼/修电报线中.anim index 9971f94..0dd74ae 100644 --- a/Assets/游戏内动画资源/AM/次骨骼/修电报线中.anim +++ b/Assets/游戏内动画资源/AM/次骨骼/修电报线中.anim @@ -788,6 +788,22 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 path: bone_1 + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 3.93, y: 6.54, z: 0} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0, y: 0.33333334, z: 0.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: "\u56FE\u5C42 40" m_ScaleCurves: - curve: serializedVersion: 2 @@ -1381,6 +1397,13 @@ AnimationClip: typeID: 4 customType: 0 isPPtrCurve: 0 + - serializedVersion: 2 + path: 499653838 + attribute: 1 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 - serializedVersion: 2 path: 538380062 attribute: 4 @@ -5359,6 +5382,63 @@ AnimationClip: path: "\u540E\u624B\u653E\u5F00" classID: 212 script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 3.93 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.x + path: "\u56FE\u5C42 40" + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 6.54 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.y + path: "\u56FE\u5C42 40" + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.z + path: "\u56FE\u5C42 40" + classID: 4 + script: {fileID: 0} m_EulerEditorCurves: - curve: serializedVersion: 2 diff --git a/Assets/游戏内动画资源/AM/次骨骼/行走.anim b/Assets/游戏内动画资源/AM/次骨骼/行走.anim index c0e9040..17e5b0e 100644 --- a/Assets/游戏内动画资源/AM/次骨骼/行走.anim +++ b/Assets/游戏内动画资源/AM/次骨骼/行走.anim @@ -1585,9 +1585,18 @@ AnimationClip: weightedMode: 0 inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.5 + value: {x: 2.24, y: -6.6626387, z: 6.3364797} + inSlope: {x: 6.281438, y: 0, z: 0} + outSlope: {x: 6.281438, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 1 - value: {x: 4.81, y: -6.6626387, z: 6.3364797} + value: {x: 5.86, y: -6.6626387, z: 6.3364797} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -9239,9 +9248,18 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.5 + value: 2.24 + inSlope: 6.281438 + outSlope: 6.281438 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 - serializedVersion: 3 time: 1 - value: 4.81 + value: 5.86 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -9267,6 +9285,15 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.5 + value: -6.6626387 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 - serializedVersion: 3 time: 1 value: -6.6626387 @@ -9295,6 +9322,15 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.5 + value: 6.3364797 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 - serializedVersion: 3 time: 1 value: 6.3364797 diff --git a/Assets/游戏内动画资源/AM/次骨骼/跑.anim b/Assets/游戏内动画资源/AM/次骨骼/跑.anim index 33e24f3..b16fe6f 100644 --- a/Assets/游戏内动画资源/AM/次骨骼/跑.anim +++ b/Assets/游戏内动画资源/AM/次骨骼/跑.anim @@ -640,31 +640,6 @@ AnimationClip: m_RotationOrder: 4 path: bone_1 m_PositionCurves: - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: {x: -0.42143795, y: -6.6626387, z: 6.3364797} - inSlope: {x: 0, y: 0, z: 0} - outSlope: {x: 0, y: 0, z: 0} - tangentMode: 0 - weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - - serializedVersion: 3 - time: 1 - value: {x: 16.32, y: -6.6626387, z: 6.3364797} - inSlope: {x: 0, y: 0, z: 0} - outSlope: {x: 0, y: 0, z: 0} - tangentMode: 0 - weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - path: - curve: serializedVersion: 2 m_Curve: @@ -1047,7 +1022,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: 0.18599817, y: 4.588449, z: 0} + value: {x: 0.18599817, y: 5, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -1065,7 +1040,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.46666667 - value: {x: 0.14994165, y: 4.588448, z: 0} + value: {x: 0.14994165, y: 5, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -1083,7 +1058,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 1 - value: {x: 0.18599817, y: 4.588449, z: 0} + value: {x: 0.18599817, y: 5, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -1094,6 +1069,76 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 path: bone_1 + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 10.000001, y: -6.6626387, z: 6.3364797} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.16666667 + value: {x: 11.66, y: -6.6626387, z: 6.3364797} + inSlope: {x: 9.959996, y: 0, z: 0} + outSlope: {x: 9.959996, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.33333334 + value: {x: 13.32, y: -6.6626387, z: 6.3364797} + inSlope: {x: 10.020001, y: 0, z: 0} + outSlope: {x: 10.020001, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.5 + value: {x: 15, y: -6.6626387, z: 6.3364797} + inSlope: {x: 10.02, y: 0, z: 0} + outSlope: {x: 10.02, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.6666667 + value: {x: 16.66, y: -6.6626387, z: 6.3364797} + inSlope: {x: 9.96, y: 0, z: 0} + outSlope: {x: 9.96, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.8333333 + value: {x: 18.32, y: -6.6626387, z: 6.3364797} + inSlope: {x: 10.020001, y: 0, z: 0} + outSlope: {x: 10.020001, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 1 + value: {x: 20, y: -6.6626387, z: 6.3364797} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: m_ScaleCurves: - curve: serializedVersion: 2 @@ -1811,13 +1856,6 @@ AnimationClip: m_Extent: {x: 0, y: 0, z: 0} m_ClipBindingConstant: genericBindings: - - serializedVersion: 2 - path: 0 - attribute: 1 - script: {fileID: 0} - typeID: 4 - customType: 0 - isPPtrCurve: 0 - serializedVersion: 2 path: 1820176679 attribute: 1 @@ -1839,6 +1877,13 @@ AnimationClip: typeID: 4 customType: 0 isPPtrCurve: 0 + - serializedVersion: 2 + path: 0 + attribute: 1 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 - serializedVersion: 2 path: 898452142 attribute: 4 @@ -2239,90 +2284,6 @@ AnimationClip: m_HeightFromFeet: 0 m_Mirror: 0 m_EditorCurves: - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: -0.42143795 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1 - value: 16.32 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalPosition.x - path: - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: -6.6626387 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1 - value: -6.6626387 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalPosition.y - path: - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 6.3364797 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1 - value: 6.3364797 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalPosition.z - path: - classID: 4 - script: {fileID: 0} - curve: serializedVersion: 2 m_Curve: @@ -3808,7 +3769,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 4.588449 + value: 5 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -3826,7 +3787,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.46666667 - value: 4.588448 + value: 5 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -3844,7 +3805,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 1 - value: 4.588449 + value: 5 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -7433,6 +7394,135 @@ AnimationClip: path: "\u524D\u624B\u63E1\u706B\u628A" classID: 1 script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 10.000001 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.16666667 + value: 11.66 + inSlope: 9.959996 + outSlope: 9.959996 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.33333334 + value: 13.32 + inSlope: 10.020001 + outSlope: 10.020001 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.5 + value: 15 + inSlope: 10.02 + outSlope: 10.02 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.6666667 + value: 16.66 + inSlope: 9.96 + outSlope: 9.96 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.8333333 + value: 18.32 + inSlope: 10.020001 + outSlope: 10.020001 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 20 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.x + path: + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: -6.6626387 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: -6.6626387 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.y + path: + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 6.3364797 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 6.3364797 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.z + path: + classID: 4 + script: {fileID: 0} m_EulerEditorCurves: - curve: serializedVersion: 2 diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset index 6282b70..079ad29 100644 --- a/UserSettings/EditorUserSettings.asset +++ b/UserSettings/EditorUserSettings.asset @@ -18,22 +18,22 @@ EditorUserSettings: value: 22424703114646680e0b0227036cdae0f290dfc7abfbfdb7f6d69be60968fbcd663fd8601ed2bad4ce4cfa320d2a18 flags: 0 RecentlyUsedScenePath-4: - value: 22424703114646680e0b0227036cdacaf990d3ea61ade8e6a9f1d07df7ee3d2cfb + value: 22424703114646680e0b0227036cd8dcda93c0caa9cdf57e38271427fb flags: 0 RecentlyUsedScenePath-5: - value: 22424703114646680e0b0227036cdacaf990d3ea61ade8e6a9f1d07df7ee3d2cfb - flags: 0 - RecentlyUsedScenePath-6: - value: 22424703114646680e0b0227036cdacaf990d3ea61ade8e6a9f1d07df7ee3d2cfb - flags: 0 - RecentlyUsedScenePath-7: value: 22424703114646680e0b0227036cd8dcda93c2c6a9cdf57e38271427fb flags: 0 - RecentlyUsedScenePath-8: + RecentlyUsedScenePath-6: value: 22424703114646680e0b0227036cdacaf990d3ea61aecec8a8d5c77df7ee3d2cfb flags: 0 + RecentlyUsedScenePath-7: + value: 22424703114646680e0b0227036cdacaf990d3ea61ade8e6a9f1d07df7ee3d2cfb + flags: 0 + RecentlyUsedScenePath-8: + value: 22424703114646680e0b0227036cdacaf990d3ea61ade8e6a9f1d07df7ee3d2cfb + flags: 0 RecentlyUsedScenePath-9: - value: 22424703114646680e0b0227036cd8dcda93c0caa9cdf57e38271427fb + value: 22424703114646680e0b0227036cdacaf990d3ea61aecec8a8d5c77df7ee3d2cfb flags: 0 UnityEditor.ShaderGraph.Blackboard: value: 18135939215a0a5004000b0e15254b524c030a3f2964643d120d1230e9e93a3fd6e826abbd2e2d293c4ead313b08042de6030a0afa240c0d020be94c4ba95e435d8715fa32c70d15d11612dacc11fee5d3c5d1fe9ab1b1968e93e2ffcbc3e7e2f0b3ffe0e8b0be9af8ffaeffff8e85dd8390e3949c8899daa7