diff --git a/Assets/勍/场景/0813中期提交.unity b/Assets/勍/场景/0813中期提交.unity index 33d05cd..577983e 100644 --- a/Assets/勍/场景/0813中期提交.unity +++ b/Assets/勍/场景/0813中期提交.unity @@ -6498,6 +6498,10 @@ PrefabInstance: propertyPath: m_Name value: "\u592A\u9633" objectReference: {fileID: 0} + - target: {fileID: 8916953043681894184, guid: 780558eb47117aa4cb2066e837036ea8, type: 3} + propertyPath: speed + value: 0.1215 + objectReference: {fileID: 0} - target: {fileID: 8916953043681894185, guid: 780558eb47117aa4cb2066e837036ea8, type: 3} propertyPath: m_RootOrder value: 7 @@ -10217,7 +10221,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3612603803220387676, guid: 21810ff268daa70418623f7edd1ca3bc, type: 3} propertyPath: m_LocalPosition.y - value: 24.6 + value: 42.2 objectReference: {fileID: 0} - target: {fileID: 3612603803220387676, guid: 21810ff268daa70418623f7edd1ca3bc, type: 3} propertyPath: m_LocalPosition.z @@ -10251,10 +10255,22 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 3612603803220387679, guid: 21810ff268daa70418623f7edd1ca3bc, type: 3} + propertyPath: prewarm + value: 1 + objectReference: {fileID: 0} - target: {fileID: 3612603803220387679, guid: 21810ff268daa70418623f7edd1ca3bc, type: 3} propertyPath: ShapeModule.m_Scale.x value: 137.08 objectReference: {fileID: 0} + - target: {fileID: 3612603803220387679, guid: 21810ff268daa70418623f7edd1ca3bc, type: 3} + propertyPath: InitialModule.startSpeed.scalar + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3612603803220387679, guid: 21810ff268daa70418623f7edd1ca3bc, type: 3} + propertyPath: InitialModule.startLifetime.scalar + value: 8.6 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 21810ff268daa70418623f7edd1ca3bc, type: 3} --- !u!4 &1940329024 stripped diff --git a/Assets/勍/场景/教程场景试做.unity b/Assets/勍/场景/教程场景试做.unity index 466c2cc..035d667 100644 --- a/Assets/勍/场景/教程场景试做.unity +++ b/Assets/勍/场景/教程场景试做.unity @@ -521,7 +521,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 169862783192910048, guid: 84ef038ddc168544eb42b297f7acd3a5, type: 3} propertyPath: m_IsActive - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 169862783192910050, guid: 84ef038ddc168544eb42b297f7acd3a5, type: 3} propertyPath: m_SortingLayer @@ -549,7 +549,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 169862783192910051, guid: 84ef038ddc168544eb42b297f7acd3a5, type: 3} propertyPath: m_LocalPosition.x - value: 175.9 + value: 162.5 objectReference: {fileID: 0} - target: {fileID: 169862783192910051, guid: 84ef038ddc168544eb42b297f7acd3a5, type: 3} propertyPath: m_LocalPosition.y @@ -607,6 +607,10 @@ PrefabInstance: propertyPath: ShapeModule.m_Scale.z value: 0.35 objectReference: {fileID: 0} + - target: {fileID: 169862783192910053, guid: 84ef038ddc168544eb42b297f7acd3a5, type: 3} + propertyPath: VelocityModule.y.scalar + value: 1 + objectReference: {fileID: 0} - target: {fileID: 169862783192910053, guid: 84ef038ddc168544eb42b297f7acd3a5, type: 3} propertyPath: ShapeModule.placementMode value: 2 @@ -621,7 +625,43 @@ PrefabInstance: objectReference: {fileID: 1757123325} - target: {fileID: 169862783192910053, guid: 84ef038ddc168544eb42b297f7acd3a5, type: 3} propertyPath: InitialModule.startSize.scalar - value: 1.46 + value: 3.11 + objectReference: {fileID: 0} + - target: {fileID: 169862783192910053, guid: 84ef038ddc168544eb42b297f7acd3a5, type: 3} + propertyPath: EmissionModule.rateOverTime.scalar + value: 400 + objectReference: {fileID: 0} + - target: {fileID: 169862783192910053, guid: 84ef038ddc168544eb42b297f7acd3a5, type: 3} + propertyPath: InitialModule.startLifetime.scalar + value: 3.95 + objectReference: {fileID: 0} + - target: {fileID: 169862783192910053, guid: 84ef038ddc168544eb42b297f7acd3a5, type: 3} + propertyPath: InitialModule.startColor.maxColor.b + value: 0.743147 + objectReference: {fileID: 0} + - target: {fileID: 169862783192910053, guid: 84ef038ddc168544eb42b297f7acd3a5, type: 3} + propertyPath: InitialModule.startColor.maxColor.g + value: 0.79226476 + objectReference: {fileID: 0} + - target: {fileID: 169862783192910053, guid: 84ef038ddc168544eb42b297f7acd3a5, type: 3} + propertyPath: InitialModule.startColor.maxColor.r + value: 0.9433962 + objectReference: {fileID: 0} + - target: {fileID: 169862783192910053, guid: 84ef038ddc168544eb42b297f7acd3a5, type: 3} + propertyPath: ColorModule.gradient.maxGradient.atime1 + value: 29105 + objectReference: {fileID: 0} + - target: {fileID: 169862783192910053, guid: 84ef038ddc168544eb42b297f7acd3a5, type: 3} + propertyPath: SizeModule.curve.maxCurve.m_Curve.Array.data[1].inSlope + value: -1.3969382 + objectReference: {fileID: 0} + - target: {fileID: 169862783192910053, guid: 84ef038ddc168544eb42b297f7acd3a5, type: 3} + propertyPath: SizeModule.curve.maxCurve.m_Curve.Array.data[1].inWeight + value: 0.11608398 + objectReference: {fileID: 0} + - target: {fileID: 169862783192910053, guid: 84ef038ddc168544eb42b297f7acd3a5, type: 3} + propertyPath: SizeModule.curve.maxCurve.m_Curve.Array.data[1].outSlope + value: -1.3969382 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 84ef038ddc168544eb42b297f7acd3a5, type: 3} @@ -744,7 +784,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 13 + m_RootOrder: 14 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &271053341 MonoBehaviour: @@ -1295,7 +1335,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &386691383 GameObject: @@ -1441,7 +1481,7 @@ Transform: - {fileID: 866825154} - {fileID: 1946916716} m_Father: {fileID: 0} - m_RootOrder: 6 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &431479079 GameObject: @@ -1488,7 +1528,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 12 + m_RootOrder: 13 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!82 &431479082 AudioSource: @@ -1860,6 +1900,95 @@ Transform: m_Father: {fileID: 280017082} m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &447443571 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 3612603803220387649, guid: 21810ff268daa70418623f7edd1ca3bc, type: 3} + propertyPath: m_Name + value: "\u6811\u53F6\u98D8\u843D" + objectReference: {fileID: 0} + - target: {fileID: 3612603803220387676, guid: 21810ff268daa70418623f7edd1ca3bc, type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3612603803220387676, guid: 21810ff268daa70418623f7edd1ca3bc, type: 3} + propertyPath: m_LocalPosition.x + value: 178.9 + objectReference: {fileID: 0} + - target: {fileID: 3612603803220387676, guid: 21810ff268daa70418623f7edd1ca3bc, type: 3} + propertyPath: m_LocalPosition.y + value: 32.5 + objectReference: {fileID: 0} + - target: {fileID: 3612603803220387676, guid: 21810ff268daa70418623f7edd1ca3bc, type: 3} + propertyPath: m_LocalPosition.z + value: -0.1 + objectReference: {fileID: 0} + - target: {fileID: 3612603803220387676, guid: 21810ff268daa70418623f7edd1ca3bc, type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 3612603803220387676, guid: 21810ff268daa70418623f7edd1ca3bc, type: 3} + propertyPath: m_LocalRotation.x + value: -0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 3612603803220387676, guid: 21810ff268daa70418623f7edd1ca3bc, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3612603803220387676, guid: 21810ff268daa70418623f7edd1ca3bc, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3612603803220387676, guid: 21810ff268daa70418623f7edd1ca3bc, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: -90 + objectReference: {fileID: 0} + - target: {fileID: 3612603803220387676, guid: 21810ff268daa70418623f7edd1ca3bc, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3612603803220387676, guid: 21810ff268daa70418623f7edd1ca3bc, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3612603803220387678, guid: 21810ff268daa70418623f7edd1ca3bc, type: 3} + propertyPath: m_Flip.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3612603803220387678, guid: 21810ff268daa70418623f7edd1ca3bc, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 53e3a4926c91bea45a026c4682041751, type: 2} + - target: {fileID: 3612603803220387679, guid: 21810ff268daa70418623f7edd1ca3bc, type: 3} + propertyPath: prewarm + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3612603803220387679, guid: 21810ff268daa70418623f7edd1ca3bc, type: 3} + propertyPath: RotationModule.enabled + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3612603803220387679, guid: 21810ff268daa70418623f7edd1ca3bc, type: 3} + propertyPath: RotationModule.curve.scalar + value: 0.10698868 + objectReference: {fileID: 0} + - target: {fileID: 3612603803220387679, guid: 21810ff268daa70418623f7edd1ca3bc, type: 3} + propertyPath: InitialModule.startSize.scalar + value: 3.62 + objectReference: {fileID: 0} + - target: {fileID: 3612603803220387679, guid: 21810ff268daa70418623f7edd1ca3bc, type: 3} + propertyPath: InitialModule.startSpeed.scalar + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3612603803220387679, guid: 21810ff268daa70418623f7edd1ca3bc, type: 3} + propertyPath: InitialModule.startLifetime.scalar + value: 11.2 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 21810ff268daa70418623f7edd1ca3bc, type: 3} --- !u!1 &466690099 GameObject: m_ObjectHideFlags: 0 @@ -2144,7 +2273,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 15 + m_RootOrder: 16 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &557113238 GameObject: @@ -2181,7 +2310,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 168.7, y: 24.8} + m_AnchoredPosition: {x: 155.4, y: 24.8} m_SizeDelta: {x: 29.31, y: 5} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &557113240 @@ -2445,7 +2574,7 @@ Transform: m_Children: - {fileID: 294477024} m_Father: {fileID: 0} - m_RootOrder: 10 + m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &597051845 GameObject: @@ -2624,7 +2753,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 8394613398838939698, guid: 75b1c8a243bb035469aff9f38d0a6fe1, type: 3} propertyPath: m_RootOrder - value: 4 + value: 5 objectReference: {fileID: 0} - target: {fileID: 8394613398838939698, guid: 75b1c8a243bb035469aff9f38d0a6fe1, type: 3} propertyPath: m_LocalPosition.x @@ -3545,7 +3674,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 763935222} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: -13.4, y: 0, z: 0} m_LocalScale: {x: 3.5, y: 3.5, z: 3.5} m_ConstrainProportionsScale: 1 m_Children: [] @@ -4177,12 +4306,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 857035971} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 169.4, y: 12.3, z: -0.3839283} + m_LocalPosition: {x: 156, y: 12.3, z: -0.3839283} m_LocalScale: {x: 3, y: 3, z: 3} m_ConstrainProportionsScale: 1 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 11 + m_RootOrder: 12 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &866086217 GameObject: @@ -6342,13 +6471,13 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1303729640} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 196.1, y: -5.5, z: -0.130028} + m_LocalPosition: {x: 182.70001, y: -5.5, z: -0.130028} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 129567466} m_Father: {fileID: 0} - m_RootOrder: 9 + m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!61 &1303729642 BoxCollider2D: @@ -6686,7 +6815,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4733579343245745149, guid: 5105e5f9d6ad7704aa9b441190288f9e, type: 3} propertyPath: m_RootOrder - value: 2 + value: 3 objectReference: {fileID: 0} - target: {fileID: 4733579343245745149, guid: 5105e5f9d6ad7704aa9b441190288f9e, type: 3} propertyPath: m_LocalPosition.x @@ -7502,7 +7631,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 14 + m_RootOrder: 15 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1589174768 MonoBehaviour: @@ -7525,7 +7654,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 4441868543418798961, guid: ffee4636d6bae044eb2fc767d986f12e, type: 3} propertyPath: m_RootOrder - value: 1 + value: 2 objectReference: {fileID: 0} - target: {fileID: 4441868543418798961, guid: ffee4636d6bae044eb2fc767d986f12e, type: 3} propertyPath: m_LocalPosition.x @@ -8068,7 +8197,7 @@ Transform: - {fileID: 836462014} - {fileID: 1991281943} m_Father: {fileID: 0} - m_RootOrder: 8 + m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1668032895 MonoBehaviour: @@ -8382,7 +8511,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 7 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!61 &1748517347 BoxCollider2D: @@ -8435,7 +8564,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1757123323} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 184.11, y: 2.71, z: 0} + m_LocalPosition: {x: 170.71, y: 2.71, z: 0} m_LocalScale: {x: 0.35, y: 0.35, z: 0.35} m_ConstrainProportionsScale: 1 m_Children: [] @@ -9567,7 +9696,7 @@ Transform: - {fileID: 1295985387} - {fileID: 280017082} m_Father: {fileID: 0} - m_RootOrder: 5 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2039059883 GameObject: @@ -10079,6 +10208,38 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 1303729641} m_Modifications: + - target: {fileID: 5214579217688814666, guid: 06fb56bd3e892b34386734f5054ce992, type: 3} + propertyPath: prewarm + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5214579217688814666, guid: 06fb56bd3e892b34386734f5054ce992, type: 3} + propertyPath: ShapeModule.m_Scale.x + value: 20 + objectReference: {fileID: 0} + - target: {fileID: 5214579217688814666, guid: 06fb56bd3e892b34386734f5054ce992, type: 3} + propertyPath: InitialModule.startSize.scalar + value: 1.89 + objectReference: {fileID: 0} + - target: {fileID: 5214579217688814666, guid: 06fb56bd3e892b34386734f5054ce992, type: 3} + propertyPath: EmissionModule.rateOverTime.scalar + value: 7.79 + objectReference: {fileID: 0} + - target: {fileID: 5214579217688814666, guid: 06fb56bd3e892b34386734f5054ce992, type: 3} + propertyPath: InitialModule.startLifetime.scalar + value: 25 + objectReference: {fileID: 0} + - target: {fileID: 5214579217688814666, guid: 06fb56bd3e892b34386734f5054ce992, type: 3} + propertyPath: InitialModule.startColor.maxColor.b + value: 0.07450979 + objectReference: {fileID: 0} + - target: {fileID: 5214579217688814666, guid: 06fb56bd3e892b34386734f5054ce992, type: 3} + propertyPath: InitialModule.startColor.maxColor.g + value: 0.5796929 + objectReference: {fileID: 0} + - target: {fileID: 5214579217688814666, guid: 06fb56bd3e892b34386734f5054ce992, type: 3} + propertyPath: InitialModule.startColor.maxColor.r + value: 0.90588236 + objectReference: {fileID: 0} - target: {fileID: 5214579217688814668, guid: 06fb56bd3e892b34386734f5054ce992, type: 3} propertyPath: m_RootOrder value: 0 @@ -10089,7 +10250,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5214579217688814668, guid: 06fb56bd3e892b34386734f5054ce992, type: 3} propertyPath: m_LocalPosition.y - value: 16.9 + value: 13.5 objectReference: {fileID: 0} - target: {fileID: 5214579217688814668, guid: 06fb56bd3e892b34386734f5054ce992, type: 3} propertyPath: m_LocalPosition.z @@ -10125,11 +10286,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5214579217688814669, guid: 06fb56bd3e892b34386734f5054ce992, type: 3} propertyPath: m_SortingOrder - value: -25 + value: -1 objectReference: {fileID: 0} - target: {fileID: 5214579217688814671, guid: 06fb56bd3e892b34386734f5054ce992, type: 3} propertyPath: m_Name value: "\u5723\u706B\u7C92\u5B50" objectReference: {fileID: 0} + - target: {fileID: 5214579217688814671, guid: 06fb56bd3e892b34386734f5054ce992, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 06fb56bd3e892b34386734f5054ce992, type: 3} diff --git a/Assets/勍/脚本/FireController.cs b/Assets/勍/脚本/FireController.cs index 9d4f29e..8aa4a36 100644 --- a/Assets/勍/脚本/FireController.cs +++ b/Assets/勍/脚本/FireController.cs @@ -34,6 +34,7 @@ public class FireController : MonoBehaviour fireLine.GetComponent().Play(); //播放音效 GetComponent().Play(); + GameObject.Find("点").SetActive(false); //等待一段时间 yield return new WaitForSeconds(1.5f); @@ -46,7 +47,7 @@ public class FireController : MonoBehaviour transform.Find("圣火粒子").GetComponent().Play(); //此时圣火已点燃,标题已显示 //等待一秒后,开始转场 - yield return new WaitForSeconds(1); + yield return new WaitForSeconds(2.5f); //呼出黑块从右向左的动画 BlackController.Instance.Trans(); //直到黑幕全黑 diff --git a/Assets/霄/Shader/树叶飘落/Shader Graphs_tree liu.mat b/Assets/霄/Shader/树叶飘落/Shader Graphs_tree liu.mat new file mode 100644 index 0000000..519206d --- /dev/null +++ b/Assets/霄/Shader/树叶飘落/Shader Graphs_tree liu.mat @@ -0,0 +1,44 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Shader Graphs_tree liu + m_Shader: {fileID: -6465566751694194690, guid: 39a82e87889eab841b3c04366be2875c, type: 3} + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _MainTex: + m_Texture: {fileID: 2800000, guid: 0321d7267a02ff24bae026bc4ce471f7, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - Vector1_1124929359104cdab19d273f42e1cb7e: 0.1 + - Vector1_2d89981c066d4b71a45102c5060147ff: 0.64 + m_Colors: [] + m_BuildTextureStacks: [] diff --git a/Assets/霄/Shader/树叶飘落/Shader Graphs_tree liu.mat.meta b/Assets/霄/Shader/树叶飘落/Shader Graphs_tree liu.mat.meta new file mode 100644 index 0000000..60528e3 --- /dev/null +++ b/Assets/霄/Shader/树叶飘落/Shader Graphs_tree liu.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 53e3a4926c91bea45a026c4682041751 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/霄/Shader/树叶飘落/liushu副本.png b/Assets/霄/Shader/树叶飘落/liushu副本.png new file mode 100644 index 0000000..d7d156a Binary files /dev/null and b/Assets/霄/Shader/树叶飘落/liushu副本.png differ diff --git a/Assets/霄/Shader/树叶飘落/liushu副本.png.meta b/Assets/霄/Shader/树叶飘落/liushu副本.png.meta new file mode 100644 index 0000000..6c4b789 --- /dev/null +++ b/Assets/霄/Shader/树叶飘落/liushu副本.png.meta @@ -0,0 +1,98 @@ +fileFormatVersion: 2 +guid: 0321d7267a02ff24bae026bc4ce471f7 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/霄/Shader/火焰/Shader Graphs_Boom.mat b/Assets/霄/Shader/火焰/Shader Graphs_Boom.mat index 66690d6..6ea7c00 100644 --- a/Assets/霄/Shader/火焰/Shader Graphs_Boom.mat +++ b/Assets/霄/Shader/火焰/Shader Graphs_Boom.mat @@ -39,5 +39,5 @@ Material: m_Ints: [] m_Floats: [] m_Colors: - - Color_908b3c6234a24c4d84f3b53efd566029: {r: 29.508846, g: 22.865494, b: 0, a: 0} + - Color_908b3c6234a24c4d84f3b53efd566029: {r: 40.98551, g: 23.491968, b: 2.5132635, a: 0} m_BuildTextureStacks: [] diff --git a/Assets/霄/Shader/破碎闪光/light.anim b/Assets/霄/Shader/破碎闪光/light.anim index c7e8056..ace2c22 100644 --- a/Assets/霄/Shader/破碎闪光/light.anim +++ b/Assets/霄/Shader/破碎闪光/light.anim @@ -30,7 +30,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1.0666667 + time: 2.1333334 value: 1 inSlope: 0 outSlope: 0 @@ -39,7 +39,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 9.433333 + time: 18.85 value: 1 inSlope: 0 outSlope: 0 @@ -48,7 +48,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 13.1 + time: 26.166666 value: 0.57254905 inSlope: 0 outSlope: 0 @@ -57,7 +57,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 20.233334 + time: 40.416668 value: 0.57254905 inSlope: 0 outSlope: 0 @@ -66,7 +66,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 22.183332 + time: 44.316666 value: 1 inSlope: 0 outSlope: 0 @@ -75,7 +75,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 28.833334 + time: 57.6 value: 1 inSlope: 0 outSlope: 0 @@ -84,7 +84,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 30.033333 + time: 60 value: 1 inSlope: 0 outSlope: 0 @@ -112,7 +112,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1.0666667 + time: 2.1333334 value: 1 inSlope: 0 outSlope: 0 @@ -121,7 +121,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 9.433333 + time: 18.85 value: 0.7058824 inSlope: 0 outSlope: 0 @@ -130,7 +130,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 13.1 + time: 26.166666 value: 0.93333334 inSlope: 0 outSlope: 0 @@ -139,7 +139,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 20.233334 + time: 40.416668 value: 0.93333334 inSlope: 0 outSlope: 0 @@ -148,7 +148,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 22.183332 + time: 44.316666 value: 0.7058824 inSlope: 0 outSlope: 0 @@ -157,7 +157,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 28.833334 + time: 57.6 value: 1 inSlope: 0 outSlope: 0 @@ -166,7 +166,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 30.033333 + time: 60 value: 1 inSlope: 0 outSlope: 0 @@ -194,7 +194,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1.0666667 + time: 2.1333334 value: 1 inSlope: 0 outSlope: 0 @@ -203,16 +203,16 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 9.433333 + time: 18.85 value: 0.7176471 - inSlope: -0.034870453 - outSlope: -0.034870453 + inSlope: -0.017459411 + outSlope: -0.017459411 tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 13.1 + time: 26.166666 value: 0.5803922 inSlope: 0 outSlope: 0 @@ -221,7 +221,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 20.233334 + time: 40.416668 value: 0.5803922 inSlope: 0 outSlope: 0 @@ -230,16 +230,16 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 22.183332 + time: 44.316666 value: 0.7176471 - inSlope: 0.048791606 - outSlope: 0.048791606 + inSlope: 0.02441947 + outSlope: 0.02441947 tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 28.833334 + time: 57.6 value: 1 inSlope: 0 outSlope: 0 @@ -248,7 +248,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 30.033333 + time: 60 value: 1 inSlope: 0 outSlope: 0 @@ -298,7 +298,7 @@ AnimationClip: m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 30.033333 + m_StopTime: 60 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 @@ -327,7 +327,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1.0666667 + time: 2.1333334 value: 1 inSlope: 0 outSlope: 0 @@ -336,7 +336,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 9.433333 + time: 18.85 value: 1 inSlope: 0 outSlope: 0 @@ -345,7 +345,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 13.1 + time: 26.166666 value: 0.57254905 inSlope: 0 outSlope: 0 @@ -354,7 +354,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 20.233334 + time: 40.416668 value: 0.57254905 inSlope: 0 outSlope: 0 @@ -363,7 +363,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 22.183332 + time: 44.316666 value: 1 inSlope: 0 outSlope: 0 @@ -372,7 +372,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 28.833334 + time: 57.6 value: 1 inSlope: 0 outSlope: 0 @@ -381,7 +381,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 30.033333 + time: 60 value: 1 inSlope: 0 outSlope: 0 @@ -409,7 +409,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1.0666667 + time: 2.1333334 value: 1 inSlope: 0 outSlope: 0 @@ -418,7 +418,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 9.433333 + time: 18.85 value: 0.7058824 inSlope: 0 outSlope: 0 @@ -427,7 +427,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 13.1 + time: 26.166666 value: 0.93333334 inSlope: 0 outSlope: 0 @@ -436,7 +436,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 20.233334 + time: 40.416668 value: 0.93333334 inSlope: 0 outSlope: 0 @@ -445,7 +445,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 22.183332 + time: 44.316666 value: 0.7058824 inSlope: 0 outSlope: 0 @@ -454,7 +454,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 28.833334 + time: 57.6 value: 1 inSlope: 0 outSlope: 0 @@ -463,7 +463,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 30.033333 + time: 60 value: 1 inSlope: 0 outSlope: 0 @@ -491,7 +491,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1.0666667 + time: 2.1333334 value: 1 inSlope: 0 outSlope: 0 @@ -500,16 +500,16 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 9.433333 + time: 18.85 value: 0.7176471 - inSlope: -0.034870453 - outSlope: -0.034870453 + inSlope: -0.017459411 + outSlope: -0.017459411 tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 13.1 + time: 26.166666 value: 0.5803922 inSlope: 0 outSlope: 0 @@ -518,7 +518,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 20.233334 + time: 40.416668 value: 0.5803922 inSlope: 0 outSlope: 0 @@ -527,16 +527,16 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 22.183332 + time: 44.316666 value: 0.7176471 - inSlope: 0.048791606 - outSlope: 0.048791606 + inSlope: 0.02441947 + outSlope: 0.02441947 tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 28.833334 + time: 57.6 value: 1 inSlope: 0 outSlope: 0 @@ -545,7 +545,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 30.033333 + time: 60 value: 1 inSlope: 0 outSlope: 0 diff --git a/Assets/霄/场景/0813中期提交x/Global Volume Profile.asset b/Assets/霄/场景/0813中期提交x/Global Volume Profile.asset index c01009e..ed79278 100644 --- a/Assets/霄/场景/0813中期提交x/Global Volume Profile.asset +++ b/Assets/霄/场景/0813中期提交x/Global Volume Profile.asset @@ -29,10 +29,10 @@ MonoBehaviour: active: 1 threshold: m_OverrideState: 1 - m_Value: 1.19 + m_Value: 1.14 intensity: m_OverrideState: 1 - m_Value: 3.75 + m_Value: 10 scatter: m_OverrideState: 0 m_Value: 0.7 diff --git a/ProjectSettings/QualitySettings.asset b/ProjectSettings/QualitySettings.asset index 38a45f3..69c1505 100644 --- a/ProjectSettings/QualitySettings.asset +++ b/ProjectSettings/QualitySettings.asset @@ -227,6 +227,7 @@ QualitySettings: Lumin: 5 Nintendo Switch: 5 PS4: 5 + Server: 0 Stadia: 5 Standalone: 5 WebGL: 3 diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset index e54a475..e583632 100644 --- a/UserSettings/EditorUserSettings.asset +++ b/UserSettings/EditorUserSettings.asset @@ -30,10 +30,10 @@ EditorUserSettings: value: 05080302550c580e080c092712740644154f19737e7872697d284a64b4e2663e flags: 0 RecentlyUsedSceneGuid-8: - value: 070903515507510b0f0c5e7b14755e4417164c7b7c2922352b2a4e6bb7e5676f + value: 5603015e5556080c0b585e27167308444f4e1c2e7c7f7132797e1f31b4b76c3c flags: 0 RecentlyUsedSceneGuid-9: - value: 5603015e5556080c0b585e27167308444f4e1c2e7c7f7132797e1f31b4b76c3c + value: 070903515507510b0f0c5e7b14755e4417164c7b7c2922352b2a4e6bb7e5676f flags: 0 vcSharedLogLevel: value: 0d5e400f0650 diff --git a/UserSettings/Layouts/default-2021.dwlt b/UserSettings/Layouts/default-2021.dwlt index 73b5bac..66cecb2 100644 --- a/UserSettings/Layouts/default-2021.dwlt +++ b/UserSettings/Layouts/default-2021.dwlt @@ -19,7 +19,7 @@ MonoBehaviour: width: 1792 height: 889 m_ShowMode: 4 - m_Title: Inspector + m_Title: Console m_RootView: {fileID: 6} m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} @@ -48,7 +48,7 @@ MonoBehaviour: m_MinSize: {x: 300, y: 200} m_MaxSize: {x: 24288, y: 16192} vertical: 0 - controlID: 338 + controlID: 65 --- !u!114 &3 MonoBehaviour: m_ObjectHideFlags: 52 @@ -70,9 +70,9 @@ MonoBehaviour: height: 839 m_MinSize: {x: 276, y: 71} m_MaxSize: {x: 4001, y: 4021} - m_ActualView: {fileID: 13} + m_ActualView: {fileID: 14} m_Panes: - - {fileID: 13} + - {fileID: 14} m_Selected: 0 m_LastSelected: 0 --- !u!114 &4 @@ -93,12 +93,12 @@ MonoBehaviour: x: 0 y: 0 width: 339 - height: 497 + height: 467 m_MinSize: {x: 201, y: 221} m_MaxSize: {x: 4001, y: 4021} - m_ActualView: {fileID: 14} + m_ActualView: {fileID: 15} m_Panes: - - {fileID: 14} + - {fileID: 15} m_Selected: 0 m_LastSelected: 0 --- !u!114 &5 @@ -111,23 +111,23 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: ProjectBrowser + m_Name: ConsoleWindow m_EditorClassIdentifier: m_Children: [] m_Position: serializedVersion: 2 x: 0 - y: 497 + y: 467 width: 1368.5 - height: 342 - m_MinSize: {x: 231, y: 271} - m_MaxSize: {x: 10001, y: 10021} - m_ActualView: {fileID: 12} + height: 372 + m_MinSize: {x: 101, y: 121} + m_MaxSize: {x: 4001, y: 4021} + m_ActualView: {fileID: 18} m_Panes: - - {fileID: 12} - - {fileID: 17} - m_Selected: 0 - m_LastSelected: 1 + - {fileID: 13} + - {fileID: 18} + m_Selected: 1 + m_LastSelected: 0 --- !u!114 &6 MonoBehaviour: m_ObjectHideFlags: 52 @@ -177,7 +177,7 @@ MonoBehaviour: height: 30 m_MinSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0} - m_LastLoadedLayoutName: Default + m_LastLoadedLayoutName: --- !u!114 &8 MonoBehaviour: m_ObjectHideFlags: 52 @@ -223,7 +223,7 @@ MonoBehaviour: m_MinSize: {x: 200, y: 200} m_MaxSize: {x: 16192, y: 16192} vertical: 1 - controlID: 339 + controlID: 66 --- !u!114 &10 MonoBehaviour: m_ObjectHideFlags: 52 @@ -244,11 +244,11 @@ MonoBehaviour: x: 0 y: 0 width: 1368.5 - height: 497 + height: 467 m_MinSize: {x: 200, y: 100} m_MaxSize: {x: 16192, y: 8096} vertical: 0 - controlID: 340 + controlID: 67 --- !u!114 &11 MonoBehaviour: m_ObjectHideFlags: 52 @@ -259,7 +259,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: + m_Name: SceneView m_EditorClassIdentifier: m_Children: [] m_Position: @@ -267,16 +267,81 @@ MonoBehaviour: x: 339 y: 0 width: 1029.5 - height: 497 + height: 467 m_MinSize: {x: 202, y: 221} m_MaxSize: {x: 4002, y: 4021} - m_ActualView: {fileID: 15} + m_ActualView: {fileID: 16} m_Panes: - - {fileID: 15} - {fileID: 16} + - {fileID: 17} + - {fileID: 12} m_Selected: 0 m_LastSelected: 1 --- !u!114 &12 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 12914, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 100, y: 100} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: Animator + m_Image: {fileID: 1711060831702674872, guid: 0000000000000000d000000000000000, type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 339 + y: 72 + width: 1027.5 + height: 446 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_ViewTransforms: + m_KeySerializationHelper: + - {fileID: 6475115023232895398, guid: 49672ecc31107f343a81a19718b7e723, type: 2} + m_ValueSerializationHelper: + - e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + m_PreviewAnimator: {fileID: 0} + m_AnimatorController: {fileID: 9100000, guid: 49672ecc31107f343a81a19718b7e723, type: 2} + m_BreadCrumbs: + - m_Target: {fileID: 6475115023232895398, guid: 49672ecc31107f343a81a19718b7e723, type: 2} + m_ScrollPosition: {x: 0, y: 0} + stateMachineGraph: {fileID: 0} + stateMachineGraphGUI: {fileID: 0} + blendTreeGraph: {fileID: 0} + blendTreeGraphGUI: {fileID: 0} + m_AutoLiveLink: 1 + m_MiniTool: 0 + m_LockTracker: + m_IsLocked: 0 + m_CurrentEditor: 0 + m_LayerEditor: + m_SelectedLayerIndex: 0 +--- !u!114 &13 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -297,9 +362,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 569 + y: 539 width: 1367.5 - height: 321 + height: 351 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -330,9 +395,9 @@ MonoBehaviour: m_IsLocked: 0 m_FolderTreeState: scrollPos: {x: 0, y: 79} - m_SelectedIDs: 62820000 - m_LastClickedID: 33378 - m_ExpandedIDs: 00000000108100003e8100004281000062820000708200002495000000ca9a3bffffff7f + m_SelectedIDs: 28f00000 + m_LastClickedID: 61480 + m_ExpandedIDs: 00000000beef0000d0ef0000d4ef00000ef0000000ca9a3bffffff7f m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -360,7 +425,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 000000001081000000ca9a3bffffff7f + m_ExpandedIDs: m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -388,7 +453,7 @@ MonoBehaviour: m_SelectedInstanceIDs: m_LastClickedInstanceID: 0 m_HadKeyboardFocusLastEvent: 1 - m_ExpandedInstanceIDs: c6230000 + m_ExpandedInstanceIDs: c62300003a880000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -404,7 +469,7 @@ MonoBehaviour: m_IsRenaming: 0 m_OriginalEventType: 11 m_IsRenamingFilename: 1 - m_ClientGUIView: {fileID: 0} + m_ClientGUIView: {fileID: 5} m_CreateAssetUtility: m_EndAction: {fileID: 0} m_InstanceID: 0 @@ -416,7 +481,7 @@ MonoBehaviour: m_GridSize: 64 m_SkipHiddenPackages: 0 m_DirectoriesAreaWidth: 207 ---- !u!114 &13 +--- !u!114 &14 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -457,7 +522,7 @@ MonoBehaviour: m_LockTracker: m_IsLocked: 0 m_PreviewWindow: {fileID: 0} ---- !u!114 &14 +--- !u!114 &15 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -480,7 +545,7 @@ MonoBehaviour: x: 0 y: 72 width: 338 - height: 476 + height: 446 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -488,9 +553,9 @@ MonoBehaviour: m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: 68a60000 - m_LastClickedID: 42600 - m_ExpandedIDs: c47dffff48a2ffff16d0ffffbcd0ffffc8d1ffffaad3ffff9cebffff54edffff40eeffff80f0ffff42fbffff228d0000cc910000e0910000089200001c930000c6930000ca930000e6930000f29300001e9e000088a00000fca30000bea50000daa50000 + m_SelectedIDs: + m_LastClickedID: 0 + m_ExpandedIDs: 942dffff3c2effff0c2fffff1630ffff124fffffb64fffff8650ffff9051ffff4e61fffff261ffff3663ffff4064ffff766fffff1a70ffffd273ffffdc74ffff9686ffff3a87fffff68affff048cffff9c8fffff5c91ffff2693ffff1a94ffffc697ffff6a4c0100c64d0100b4630100c06501000a670100 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -514,7 +579,7 @@ MonoBehaviour: m_IsLocked: 0 m_CurrentSortingName: TransformSorting m_WindowGUID: 4c969a2b90040154d917609493e03593 ---- !u!114 &15 +--- !u!114 &16 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -537,7 +602,7 @@ MonoBehaviour: x: 339 y: 72 width: 1027.5 - height: 476 + height: 446 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -745,9 +810,9 @@ MonoBehaviour: floating: 0 collapsed: 0 displayed: 0 - snapOffset: {x: 0, y: 0} + snapOffset: {x: -231, y: -197} snapOffsetDelta: {x: 0, y: 0} - snapCorner: 0 + snapCorner: 3 id: Scene View/Particles index: 10 layout: 4 @@ -761,9 +826,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: 46.7025, y: 3.188878, z: -0.74072504} + m_Target: {x: 161.27757, y: 20.13712, z: 1.1608918} speed: 2 - m_Value: {x: 46.7025, y: 3.188878, z: -0.74072504} + m_Value: {x: 160.53252, y: 18.551168, z: 1.1974907} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -794,7 +859,7 @@ MonoBehaviour: m_Fade: m_Target: 0 speed: 2 - m_Value: 1 + m_Value: 0 m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4} m_Pivot: {x: 0, y: 0, z: 0} m_Size: {x: 1, y: 1} @@ -814,9 +879,9 @@ MonoBehaviour: speed: 2 m_Value: {x: 0, y: 0, z: 0, w: 1} m_Size: - m_Target: 68.260284 + m_Target: 23.9926 speed: 2 - m_Value: 68.260284 + m_Value: 20.332712 m_Ortho: m_Target: 1 speed: 2 @@ -841,7 +906,7 @@ MonoBehaviour: m_SceneVisActive: 1 m_LastLockedObject: {fileID: 0} m_ViewIsLockedToObject: 0 ---- !u!114 &16 +--- !u!114 &17 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -861,10 +926,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 507 - y: 94 - width: 1532 - height: 790 + x: 339 + y: 72 + width: 1027.5 + height: 446 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -875,10 +940,10 @@ MonoBehaviour: m_ShowGizmos: 0 m_TargetDisplay: 0 m_ClearColor: {r: 0, g: 0, b: 0, a: 0} - m_TargetSize: {x: 1532, y: 769} + m_TargetSize: {x: 1027.5, y: 425} m_TextureFilterMode: 0 m_TextureHideFlags: 61 - m_RenderIMGUI: 0 + m_RenderIMGUI: 1 m_EnterPlayModeBehavior: 0 m_UseMipMap: 0 m_VSyncEnabled: 0 @@ -890,10 +955,10 @@ MonoBehaviour: m_VRangeLocked: 0 hZoomLockedByDefault: 0 vZoomLockedByDefault: 0 - m_HBaseRangeMin: -383 - m_HBaseRangeMax: 383 - m_VBaseRangeMin: -197.5 - m_VBaseRangeMax: 197.5 + m_HBaseRangeMin: -256.875 + m_HBaseRangeMax: 256.875 + m_VBaseRangeMin: -106.25 + m_VBaseRangeMax: 106.25 m_HAllowExceedBaseRangeMin: 1 m_HAllowExceedBaseRangeMax: 1 m_VAllowExceedBaseRangeMin: 1 @@ -902,7 +967,7 @@ MonoBehaviour: m_HSlider: 0 m_VSlider: 0 m_IgnoreScrollWheelUntilClicked: 0 - m_EnableMouseInput: 1 + m_EnableMouseInput: 0 m_EnableSliderZoomHorizontal: 0 m_EnableSliderZoomVertical: 0 m_UniformScale: 1 @@ -910,30 +975,30 @@ MonoBehaviour: m_DrawArea: serializedVersion: 2 x: 0 - y: 0 - width: 1532 - height: 790 + y: 21 + width: 1027.5 + height: 425 m_Scale: {x: 2, y: 2} - m_Translation: {x: 766, y: 395} + m_Translation: {x: 513.75, y: 212.5} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 m_MarginBottom: 0 m_LastShownAreaInsideMargins: serializedVersion: 2 - x: -383 - y: -197.5 - width: 766 - height: 395 + x: -256.875 + y: -106.25 + width: 513.75 + height: 212.5 m_MinimalGUI: 1 m_defaultScale: 2 - m_LastWindowPixelSize: {x: 3064, y: 1580} + m_LastWindowPixelSize: {x: 2055, y: 892} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 01000000000000000000 m_XRRenderMode: 0 m_RenderTexture: {fileID: 0} ---- !u!114 &17 +--- !u!114 &18 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -953,10 +1018,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 2249 - y: 726.5 - width: 920 - height: 250 + x: 0 + y: 539 + width: 1367.5 + height: 351 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default