diff --git a/Assets/Art/Models/LouDi/A_NiuChangJing/Animation/SM_Niu_CaShi_an01/Materials/Yisheng_ok_Default_Std_Nails_Default.mat b/Assets/Art/Models/LouDi/A_NiuChangJing/Animation/SM_Niu_CaShi_an01/Materials/Yisheng_ok_Default_Std_Nails_Default.mat index f56d6ea..b35a5c6 100644 --- a/Assets/Art/Models/LouDi/A_NiuChangJing/Animation/SM_Niu_CaShi_an01/Materials/Yisheng_ok_Default_Std_Nails_Default.mat +++ b/Assets/Art/Models/LouDi/A_NiuChangJing/Animation/SM_Niu_CaShi_an01/Materials/Yisheng_ok_Default_Std_Nails_Default.mat @@ -127,7 +127,7 @@ Material: - _ZWrite: 1 m_Colors: - _BaseColor: {r: 0.6395826, g: 0.6509434, b: 0.53733534, a: 1} - - _Color: {r: 0.6395826, g: 0.6509434, b: 0.53733534, a: 1} + - _Color: {r: 0.6395826, g: 0.6509434, b: 0.5373353, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/Art/Models/LouDi/A_NiuChangJing/Animation/SM_Niu_CaShi_an01/Materials/Yisheng_ok_pasted__Mat3d66-10160585-7-41726 Slot #5.mat b/Assets/Art/Models/LouDi/A_NiuChangJing/Animation/SM_Niu_CaShi_an01/Materials/Yisheng_ok_pasted__Mat3d66-10160585-7-41726 Slot #5.mat index be72df8..a98bd14 100644 --- a/Assets/Art/Models/LouDi/A_NiuChangJing/Animation/SM_Niu_CaShi_an01/Materials/Yisheng_ok_pasted__Mat3d66-10160585-7-41726 Slot #5.mat +++ b/Assets/Art/Models/LouDi/A_NiuChangJing/Animation/SM_Niu_CaShi_an01/Materials/Yisheng_ok_pasted__Mat3d66-10160585-7-41726 Slot #5.mat @@ -114,7 +114,7 @@ Material: - _ZWrite: 1 m_Colors: - _BaseColor: {r: 0.028469002, g: 0.15428142, b: 0.343, a: 1} - - _Color: {r: 0.028469002, g: 0.15428142, b: 0.343, a: 1} + - _Color: {r: 0.028469002, g: 0.15428138, b: 0.34299996, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/Art/Models/LouDi/A_NiuChangJing/Animation/SM_Niu_ChongPei01/Materials/SM_Niu_NiuChongPei01_Yisheng_ok_pasted__Mat3d66-10160585-7-41726 Slot #5.mat b/Assets/Art/Models/LouDi/A_NiuChangJing/Animation/SM_Niu_ChongPei01/Materials/SM_Niu_NiuChongPei01_Yisheng_ok_pasted__Mat3d66-10160585-7-41726 Slot #5.mat index 42c9754..06532b2 100644 --- a/Assets/Art/Models/LouDi/A_NiuChangJing/Animation/SM_Niu_ChongPei01/Materials/SM_Niu_NiuChongPei01_Yisheng_ok_pasted__Mat3d66-10160585-7-41726 Slot #5.mat +++ b/Assets/Art/Models/LouDi/A_NiuChangJing/Animation/SM_Niu_ChongPei01/Materials/SM_Niu_NiuChongPei01_Yisheng_ok_pasted__Mat3d66-10160585-7-41726 Slot #5.mat @@ -116,7 +116,7 @@ Material: - _ZWrite: 1 m_Colors: - _BaseColor: {r: 0.18446434, g: 0.42922786, b: 0.6204994, a: 1} - - _Color: {r: 0.18446434, g: 0.42922786, b: 0.6204994, a: 1} + - _Color: {r: 0.1844643, g: 0.42922783, b: 0.6204993, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/Art/Models/LouDi/A_NiuChangJing/Animation/SM_Niu_ChongPei01/Materials/pasted__pasted__M_ChongPeiGuan03.mat b/Assets/Art/Models/LouDi/A_NiuChangJing/Animation/SM_Niu_ChongPei01/Materials/pasted__pasted__M_ChongPeiGuan03.mat index edf35bc..7ebb0ce 100644 --- a/Assets/Art/Models/LouDi/A_NiuChangJing/Animation/SM_Niu_ChongPei01/Materials/pasted__pasted__M_ChongPeiGuan03.mat +++ b/Assets/Art/Models/LouDi/A_NiuChangJing/Animation/SM_Niu_ChongPei01/Materials/pasted__pasted__M_ChongPeiGuan03.mat @@ -116,7 +116,7 @@ Material: - _ZWrite: 1 m_Colors: - _BaseColor: {r: 0.89644307, g: 0.66518503, b: 0.19435313, a: 1} - - _Color: {r: 0.89644307, g: 0.66518503, b: 0.19435313, a: 1} + - _Color: {r: 0.89644307, g: 0.66518503, b: 0.1943531, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/Art/Models/LouDi/A_NiuChangJing/Animation/SM_chuandaishoutao 1/Materials/pasted__Mat3d66-10160585-7-41726 Slot #5.mat b/Assets/Art/Models/LouDi/A_NiuChangJing/Animation/SM_chuandaishoutao 1/Materials/pasted__Mat3d66-10160585-7-41726 Slot #5.mat index de6a4b4..e0b2481 100644 --- a/Assets/Art/Models/LouDi/A_NiuChangJing/Animation/SM_chuandaishoutao 1/Materials/pasted__Mat3d66-10160585-7-41726 Slot #5.mat +++ b/Assets/Art/Models/LouDi/A_NiuChangJing/Animation/SM_chuandaishoutao 1/Materials/pasted__Mat3d66-10160585-7-41726 Slot #5.mat @@ -129,7 +129,7 @@ Material: - _ZWrite: 1 m_Colors: - _BaseColor: {r: 0.18446434, g: 0.42922786, b: 0.6204994, a: 1} - - _Color: {r: 0.18446434, g: 0.42922786, b: 0.6204994, a: 1} + - _Color: {r: 0.1844643, g: 0.42922783, b: 0.6204993, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/Art/Models/LouDi/SM_Niu_GongJu/Materials/Material #2128568674.mat b/Assets/Art/Models/LouDi/SM_Niu_GongJu/Materials/Material #2128568674.mat index 5a26e66..959fc56 100644 --- a/Assets/Art/Models/LouDi/SM_Niu_GongJu/Materials/Material #2128568674.mat +++ b/Assets/Art/Models/LouDi/SM_Niu_GongJu/Materials/Material #2128568674.mat @@ -114,7 +114,7 @@ Material: - _ZWrite: 1 m_Colors: - _BaseColor: {r: 0.10196079, g: 0.10196079, b: 0.10196079, a: 1} - - _Color: {r: 0.10196079, g: 0.10196079, b: 0.10196079, a: 1} + - _Color: {r: 0.101960756, g: 0.101960756, b: 0.101960756, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/Art/Models/LouDi/SM_gongjv01/Materials/M_Line.mat b/Assets/Art/Models/LouDi/SM_gongjv01/Materials/M_Line.mat index 3b680bc..b3e2a0b 100644 --- a/Assets/Art/Models/LouDi/SM_gongjv01/Materials/M_Line.mat +++ b/Assets/Art/Models/LouDi/SM_gongjv01/Materials/M_Line.mat @@ -129,7 +129,7 @@ Material: - _ZWrite: 1 m_Colors: - _BaseColor: {r: 0.5137255, g: 0.50980395, b: 0.31764707, a: 1} - - _Color: {r: 0.5137255, g: 0.50980395, b: 0.31764707, a: 1} + - _Color: {r: 0.5137254, g: 0.5098039, b: 0.31764704, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/TimeLine/RGSJTimeLineCtrl.playable b/Assets/TimeLine/RGSJTimeLineCtrl.playable index 6d401e0..96bd5f4 100644 --- a/Assets/TimeLine/RGSJTimeLineCtrl.playable +++ b/Assets/TimeLine/RGSJTimeLineCtrl.playable @@ -7049,7 +7049,7 @@ MonoBehaviour: m_Start: 79 m_ClipIn: 0 m_Asset: {fileID: -1612666765110596103} - m_Duration: 55.19999999999996 + m_Duration: 55.35000000000002 m_TimeScale: 1 m_ParentTrack: {fileID: -5066760319323457537} m_EaseInDuration: 0 @@ -7857,6 +7857,99 @@ AnimationClip: m_HasGenericRootTransform: 0 m_HasMotionFloatCurves: 0 m_Events: [] +--- !u!114 &-4727239800052929499 +MonoBehaviour: + m_ObjectHideFlags: 1 + 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: 11500000, guid: 21bf7f712d84d26478ebe6a299f21738, type: 3} + m_Name: Activation Track (1) + m_EditorClassIdentifier: + m_Version: 3 + m_AnimClip: {fileID: 0} + m_Locked: 0 + m_Muted: 0 + m_CustomPlayableFullTypename: + m_Curves: {fileID: 0} + m_Parent: {fileID: 6475262898485729245} + m_Children: [] + m_Clips: + - m_Version: 1 + m_Start: 50.25 + m_ClipIn: 0 + m_Asset: {fileID: 331114526593267100} + m_Duration: 7.549999999999997 + m_TimeScale: 1 + m_ParentTrack: {fileID: -4727239800052929499} + m_EaseInDuration: 0 + m_EaseOutDuration: 0 + m_BlendInDuration: 0 + m_BlendOutDuration: 0 + m_MixInCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + 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 + m_MixOutCurve: + 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: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + m_BlendInCurveMode: 0 + m_BlendOutCurveMode: 0 + m_ExposedParameterNames: [] + m_AnimationCurves: {fileID: 0} + m_Recordable: 0 + m_PostExtrapolationMode: 0 + m_PreExtrapolationMode: 0 + m_PostExtrapolationTime: 0 + m_PreExtrapolationTime: 0 + m_DisplayName: Active + m_Markers: + m_Objects: [] + m_PostPlaybackState: 3 --- !u!114 &-4692641691352498685 MonoBehaviour: m_ObjectHideFlags: 1 @@ -7869,6 +7962,99 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fde0d25a170598d46a0b9dc16b4527a5, type: 3} m_Name: ActivationPlayableAsset m_EditorClassIdentifier: +--- !u!114 &-4485336092508578592 +MonoBehaviour: + m_ObjectHideFlags: 1 + 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: 11500000, guid: 21bf7f712d84d26478ebe6a299f21738, type: 3} + m_Name: Activation Track (5) + m_EditorClassIdentifier: + m_Version: 3 + m_AnimClip: {fileID: 0} + m_Locked: 0 + m_Muted: 0 + m_CustomPlayableFullTypename: + m_Curves: {fileID: 0} + m_Parent: {fileID: 11400000} + m_Children: [] + m_Clips: + - m_Version: 1 + m_Start: 79.15 + m_ClipIn: 0 + m_Asset: {fileID: -126796830136513857} + m_Duration: 55.20000000000002 + m_TimeScale: 1 + m_ParentTrack: {fileID: -4485336092508578592} + m_EaseInDuration: 0 + m_EaseOutDuration: 0 + m_BlendInDuration: 0 + m_BlendOutDuration: 0 + m_MixInCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + 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 + m_MixOutCurve: + 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: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + m_BlendInCurveMode: 0 + m_BlendOutCurveMode: 0 + m_ExposedParameterNames: [] + m_AnimationCurves: {fileID: 0} + m_Recordable: 0 + m_PostExtrapolationMode: 0 + m_PreExtrapolationMode: 0 + m_PostExtrapolationTime: 0 + m_PreExtrapolationTime: 0 + m_DisplayName: Active + m_Markers: + m_Objects: [] + m_PostPlaybackState: 3 --- !u!114 &-4284116773030544205 MonoBehaviour: m_ObjectHideFlags: 1 @@ -9388,7 +9574,7 @@ MonoBehaviour: m_Start: 90.5 m_ClipIn: 0 m_Asset: {fileID: -898090931187187082} - m_Duration: 43.849999999999994 + m_Duration: 43.83333333333334 m_TimeScale: 1 m_ParentTrack: {fileID: -1561294903667677725} m_EaseInDuration: 0 @@ -9622,6 +9808,18 @@ MonoBehaviour: m_Name: ActivationPlayableAsset m_EditorClassIdentifier: --- !u!114 &-365848177040551681 +MonoBehaviour: + m_ObjectHideFlags: 1 + 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: 11500000, guid: fde0d25a170598d46a0b9dc16b4527a5, type: 3} + m_Name: ActivationPlayableAsset + m_EditorClassIdentifier: +--- !u!114 &-126796830136513857 MonoBehaviour: m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} @@ -9663,6 +9861,7 @@ MonoBehaviour: - {fileID: -6998762545261394115} - {fileID: 6788346416310555944} - {fileID: -3550206377612606099} + - {fileID: -4485336092508578592} - {fileID: -2329842798145828766} - {fileID: 6475262898485729245} - {fileID: 1678541076527753187} @@ -10083,6 +10282,18 @@ AnimationClip: m_HasGenericRootTransform: 1 m_HasMotionFloatCurves: 0 m_Events: [] +--- !u!114 &331114526593267100 +MonoBehaviour: + m_ObjectHideFlags: 1 + 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: 11500000, guid: fde0d25a170598d46a0b9dc16b4527a5, type: 3} + m_Name: ActivationPlayableAsset + m_EditorClassIdentifier: --- !u!114 &363010772322447038 MonoBehaviour: m_ObjectHideFlags: 1 @@ -13120,99 +13331,6 @@ AnimationClip: m_HasGenericRootTransform: 1 m_HasMotionFloatCurves: 0 m_Events: [] ---- !u!114 &2027552665699176848 -MonoBehaviour: - m_ObjectHideFlags: 1 - 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: 11500000, guid: 21bf7f712d84d26478ebe6a299f21738, type: 3} - m_Name: Activation Track - m_EditorClassIdentifier: - m_Version: 3 - m_AnimClip: {fileID: 0} - m_Locked: 0 - m_Muted: 0 - m_CustomPlayableFullTypename: - m_Curves: {fileID: 0} - m_Parent: {fileID: 6475262898485729245} - m_Children: [] - m_Clips: - - m_Version: 1 - m_Start: 50.25 - m_ClipIn: 0 - m_Asset: {fileID: 7460317645374339726} - m_Duration: 7.549999999999997 - m_TimeScale: 1 - m_ParentTrack: {fileID: 2027552665699176848} - m_EaseInDuration: 0 - m_EaseOutDuration: 0 - m_BlendInDuration: 0 - m_BlendOutDuration: 0 - m_MixInCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - 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 - m_MixOutCurve: - 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: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - m_BlendInCurveMode: 0 - m_BlendOutCurveMode: 0 - m_ExposedParameterNames: [] - m_AnimationCurves: {fileID: 0} - m_Recordable: 0 - m_PostExtrapolationMode: 0 - m_PreExtrapolationMode: 0 - m_PostExtrapolationTime: 0 - m_PreExtrapolationTime: 0 - m_DisplayName: Active - m_Markers: - m_Objects: [] - m_PostPlaybackState: 3 --- !u!114 &2188198209436308519 MonoBehaviour: m_ObjectHideFlags: 1 @@ -14378,7 +14496,7 @@ MonoBehaviour: - {fileID: 3551852819189877070} - {fileID: -3965264049800307433} - {fileID: 3178043020885428009} - - {fileID: 2027552665699176848} + - {fileID: -4727239800052929499} m_Clips: [] m_Markers: m_Objects: [] @@ -15758,18 +15876,6 @@ MonoBehaviour: m_Clips: [] m_Markers: m_Objects: [] ---- !u!114 &7460317645374339726 -MonoBehaviour: - m_ObjectHideFlags: 1 - 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: 11500000, guid: fde0d25a170598d46a0b9dc16b4527a5, type: 3} - m_Name: ActivationPlayableAsset - m_EditorClassIdentifier: --- !u!114 &7480896680586728497 MonoBehaviour: m_ObjectHideFlags: 1 diff --git a/Assets/_Scenes/TrainExam.unity b/Assets/_Scenes/TrainExam.unity index 8bac75e..3f557e8 100644 --- a/Assets/_Scenes/TrainExam.unity +++ b/Assets/_Scenes/TrainExam.unity @@ -13727,6 +13727,11 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: -5627268941011510287, guid: 46b5b7b8f95cd3347bb66010d3a428f8, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: -5627268941011510287, guid: 46b5b7b8f95cd3347bb66010d3a428f8, type: 3} propertyPath: m_TagString @@ -13737,6 +13742,11 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: -4752482060777522461, guid: 46b5b7b8f95cd3347bb66010d3a428f8, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: -4649654264093766027, guid: 46b5b7b8f95cd3347bb66010d3a428f8, type: 3} propertyPath: m_IsActive @@ -13752,11 +13762,31 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} + - target: {fileID: -1846963360440233997, guid: 46b5b7b8f95cd3347bb66010d3a428f8, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: -1014534024024196242, guid: 46b5b7b8f95cd3347bb66010d3a428f8, type: 3} propertyPath: m_TagString value: nohide objectReference: {fileID: 0} + - target: {fileID: 253701391510514209, guid: 46b5b7b8f95cd3347bb66010d3a428f8, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 387385222688405280, guid: 46b5b7b8f95cd3347bb66010d3a428f8, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 458959223855615396, guid: 46b5b7b8f95cd3347bb66010d3a428f8, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 919132149155446097, guid: 46b5b7b8f95cd3347bb66010d3a428f8, type: 3} propertyPath: m_Name @@ -13832,6 +13862,11 @@ PrefabInstance: propertyPath: m_AABB.m_Extent.z value: 0.00009791463 objectReference: {fileID: 0} + - target: {fileID: 8320800501687555978, guid: 46b5b7b8f95cd3347bb66010d3a428f8, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: @@ -13901,12 +13936,6 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 611169560} m_PrefabAsset: {fileID: 0} ---- !u!1 &611169569 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: -4752482060777522461, guid: 46b5b7b8f95cd3347bb66010d3a428f8, - type: 3} - m_PrefabInstance: {fileID: 611169560} - m_PrefabAsset: {fileID: 0} --- !u!65 &611169570 BoxCollider: m_ObjectHideFlags: 0 @@ -20377,10 +20406,8 @@ PlayableDirector: value: {fileID: 919132147497032759} - key: {fileID: -3550206377612606099, guid: 2134e73ea8d9bad4fb4b8cd512a92976, type: 2} value: {fileID: 355691345} - - key: {fileID: 2027552665699176848, guid: 2134e73ea8d9bad4fb4b8cd512a92976, type: 2} - value: {fileID: 611169569} - key: {fileID: 5577077278635698268, guid: 2134e73ea8d9bad4fb4b8cd512a92976, type: 2} - value: {fileID: 953637087} + value: {fileID: 2112376630} - key: {fileID: -1561294903667677725, guid: 2134e73ea8d9bad4fb4b8cd512a92976, type: 2} value: {fileID: 611169568} - key: {fileID: 3551852819189877070, guid: 2134e73ea8d9bad4fb4b8cd512a92976, type: 2} @@ -20871,6 +20898,10 @@ PlayableDirector: value: {fileID: 1928139234} - key: {fileID: 6788346416310555944, guid: 2134e73ea8d9bad4fb4b8cd512a92976, type: 2} value: {fileID: 1928139236} + - key: {fileID: -4727239800052929499, guid: 2134e73ea8d9bad4fb4b8cd512a92976, type: 2} + value: {fileID: 2112376629} + - key: {fileID: -4485336092508578592, guid: 2134e73ea8d9bad4fb4b8cd512a92976, type: 2} + value: {fileID: 1937030614} m_ExposedReferences: m_References: - 335a0b1c4f8ab3e4a9c25efaa7f82a49: {fileID: 567124863} @@ -22246,12 +22277,6 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 953637079} m_PrefabAsset: {fileID: 0} ---- !u!1 &953637087 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: -1846963360440233997, guid: f46377f89a587c14d9bc2efe17dabc52, - type: 3} - m_PrefabInstance: {fileID: 953637079} - m_PrefabAsset: {fileID: 0} --- !u!65 &953637089 BoxCollider: m_ObjectHideFlags: 0 @@ -41831,6 +41856,12 @@ Animator: m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorStateOnDisable: 0 m_WriteDefaultValuesOnDisable: 0 +--- !u!1 &1937030614 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 3402845730414460182, guid: 46b5b7b8f95cd3347bb66010d3a428f8, + type: 3} + m_PrefabInstance: {fileID: 611169560} + m_PrefabAsset: {fileID: 0} --- !u!1 &1938133023 GameObject: m_ObjectHideFlags: 0 @@ -44873,6 +44904,18 @@ Transform: m_Children: [] m_Father: {fileID: 639665828} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &2112376629 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 458959223855615396, guid: 46b5b7b8f95cd3347bb66010d3a428f8, + type: 3} + m_PrefabInstance: {fileID: 611169560} + m_PrefabAsset: {fileID: 0} +--- !u!1 &2112376630 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: -1846963360440233997, guid: 46b5b7b8f95cd3347bb66010d3a428f8, + type: 3} + m_PrefabInstance: {fileID: 611169560} + m_PrefabAsset: {fileID: 0} --- !u!1 &2116581524 GameObject: m_ObjectHideFlags: 0 diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset index 88810e6..4c3649b 100644 --- a/UserSettings/EditorUserSettings.asset +++ b/UserSettings/EditorUserSettings.asset @@ -24,10 +24,10 @@ EditorUserSettings: value: 5b0051575d545a0a5a5c547716720f44434f4a28282b24697d2b4b60b3b5666f flags: 0 RecentlyUsedSceneGuid-6: - value: 51005757520559085f080f7b45750f444e4f1a297f2c24657f7d1b60e7b2326a + value: 5a08575f5207595a0f5d59741173094444164f7d7d2a23317c7a4465bbe1646d flags: 0 RecentlyUsedSceneGuid-7: - value: 5a08575f5207595a0f5d59741173094444164f7d7d2a23317c7a4465bbe1646d + value: 51005757520559085f080f7b45750f444e4f1a297f2c24657f7d1b60e7b2326a flags: 0 UnityEditor.ShaderGraph.Blackboard: value: 18135939215a0a5004000b0e15254b524c030a3f2964643d120d1230e9e93a3fd6e826abbd3c3e302a07a37e0901373ae01e0008f707250d171df81a53a5405d41895ac825e0100ec20313c0d91cddccd3d0c7efcca9bd80908fecb0f9cfddf1eff4e7a1b1eae482f0fdaee1e1928b86d888ed909c968797a7cf diff --git a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt index 4d6bf3b..34c2ff6 100644 --- a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt +++ b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt @@ -26,7 +26,7 @@ MonoBehaviour: m_MinSize: {x: 400, y: 100} m_MaxSize: {x: 32384, y: 16192} vertical: 0 - controlID: 14807 + controlID: 23994 --- !u!114 &2 MonoBehaviour: m_ObjectHideFlags: 52 @@ -49,9 +49,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 527 - width: 813 - height: 464 + y: 609 + width: 1077 + height: 382 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -104,23 +104,23 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 21 - width: 813 - height: 443 - m_Scale: {x: 0.4101852, y: 0.4101852} - m_Translation: {x: 406.5, y: 221.5} + width: 1077 + height: 361 + m_Scale: {x: 0.33425927, y: 0.33425927} + m_Translation: {x: 538.5, y: 180.5} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 m_MarginBottom: 0 m_LastShownAreaInsideMargins: serializedVersion: 2 - x: -991.0158 + x: -1611.0249 y: -540 - width: 1982.0316 + width: 3222.0498 height: 1080 m_MinimalGUI: 1 - m_defaultScale: 0.4101852 - m_LastWindowPixelSize: {x: 813, y: 464} + m_defaultScale: 0.33425927 + m_LastWindowPixelSize: {x: 1077, y: 382} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 01000000000000000000 @@ -145,12 +145,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 814 + width: 1078 height: 939 m_MinSize: {x: 100, y: 100} m_MaxSize: {x: 8096, y: 16192} vertical: 1 - controlID: 14808 + controlID: 23995 --- !u!114 &4 MonoBehaviour: m_ObjectHideFlags: 52 @@ -168,8 +168,8 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 814 - height: 454 + width: 1078 + height: 536 m_MinSize: {x: 201, y: 221} m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 5} @@ -201,8 +201,8 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 73 - width: 813 - height: 433 + width: 1077 + height: 515 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -639,9 +639,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: 0.51283664, y: -2.841483, z: 40.10926} + m_Target: {x: 0.83290696, y: -2.5891905, z: 2.5428076} speed: 2 - m_Value: {x: 0.51283664, y: -2.841483, z: 40.10926} + m_Value: {x: 0.83290696, y: -2.5891905, z: 2.5428076} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -687,13 +687,13 @@ MonoBehaviour: m_GridAxis: 1 m_gridOpacity: 0.5 m_Rotation: - m_Target: {x: -0.3685084, y: -0.051006943, z: 0.02025302, w: -0.9280097} + m_Target: {x: 0.25000045, y: -0.2766831, z: 0.07479004, w: 0.92486775} speed: 2 - m_Value: {x: -0.36850843, y: -0.051006943, z: 0.02025302, w: -0.9280097} + m_Value: {x: -0.25000045, y: 0.2766831, z: -0.07479004, w: -0.92486775} m_Size: - m_Target: 0.6424788 + m_Target: 0.76217854 speed: 2 - m_Value: 0.6424788 + m_Value: 0.7980927 m_Ortho: m_Target: 0 speed: 2 @@ -807,9 +807,9 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 454 - width: 814 - height: 485 + y: 536 + width: 1078 + height: 403 m_MinSize: {x: 201, y: 221} m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 2} @@ -841,7 +841,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 527 - width: 813 + width: 1077 height: 464 m_SerializedDataModeController: m_DataMode: 0 @@ -877,9 +877,9 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 814 + x: 1078 y: 0 - width: 307 + width: 448 height: 939 m_MinSize: {x: 202, y: 221} m_MaxSize: {x: 4002, y: 4021} @@ -909,9 +909,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 814 + x: 1078 y: 73 - width: 305 + width: 446 height: 918 m_SerializedDataModeController: m_DataMode: 0 @@ -926,9 +926,9 @@ MonoBehaviour: m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: 2cfcf7ff - m_LastClickedID: -525268 - m_ExpandedIDs: 98fff7ffd076f8ffa4def8ff2c50f9ff70bcf9ff7c32faff8c37faffde4afaff4ea0faff620dfbffe61dfbfff422fbff5288fbff5688fbff6689fbffb68cfbffba8cfbffca8dfbffdee8fbffdc6afcff44d1fcff9240fdff5845fdff2ebbfdff362afeff5c33feff38b8fefffae1fefffee1feff320dffff6896ffff6c96ffff2efbfffff4ffffffc47c0000307d0000de7e0000cc850000cccc01009ed001008ad401008cd4010094d70100b0ec010082f001006ef4010078f7010066f901008afd010022fe0100ec290200d0320200f43602008c3702007839020014440200f84c02001c510200b4510200a0530200e8930200ba970200b09e0200d0c90200b0cc020092d50200b0d9020046da02007ae402005ae702003cf002005af40200f0f40200280203000a0b0300280f0300be0f0300d61c0300b8250300e6260300d62903006c2a0300ea360300cc3f0300ea43030080440300947e0300b47e0300 + m_SelectedIDs: 04b10500 + m_LastClickedID: 372996 + m_ExpandedIDs: ce1ff1fff820f1ff0a73f1ff3e78f1ffb4e0f1ff8639f2ffce54f2ff1468f3ffacc9f3ff7edcf3ff06f2f3ff7cf5f3ff984cf4ff5e51f4fff2b4f4ff7aedf4ff8eedf4ffd61ef5ffca8ef5ff9c00f7ff8666f7ff54e4f7ff98fff7ffd076f8ffa4def8ff2c50f9ff70bcf9ff7c32faff8c37faffde4afaff4ea0faff620dfbffe61dfbfff422fbff5288fbff5688fbff6689fbffb68cfbffba8cfbffca8dfbffdee8fbffdc6afcff44d1fcff9240fdff5845fdff2ebbfdff362afeff5c33feff38b8fefffae1fefffee1feff320dffff6896ffff6c96ffff2efbfffff4ffffffc47c0000307d0000de7e0000cc850000cccc01009ed001008ad401008cd4010094d70100b0ec010082f001006ef4010078f7010066f901008afd010022fe0100ec290200d0320200f43602008c3702007839020014440200f84c02001c510200b4510200a0530200e8930200ba970200b09e0200d0c90200b0cc020092d50200b0d9020046da02007ae402005ae702003cf002005af40200f0f40200280203000a0b0300280f0300be0f0300d61c0300b8250300e6260300d62903006c2a0300ea360300cc3f0300ea43030080440300947e0300b47e03006ab9030018bb03008cbe03000ec20300fac3030018c80300aec80300e6720400f07204005a73040008750400067c0400468d0400ba8d0400688f04006696040050c204005ac20400c4c2040072c4040070cb0400e4cd040098d004007ad1040010d20400b8dc0400c2dc04002cdd0400dade040048df0400d8e50400b061050022620500d06305003e640500cc6a0500ea7b05005c7c05000a7e050006850500feb0050070b105001eb305001aba0500 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -967,9 +967,9 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 1121 + x: 1526 y: 0 - width: 349 + width: 107 height: 939 m_MinSize: {x: 232, y: 271} m_MaxSize: {x: 10002, y: 10021} @@ -999,9 +999,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 1121 + x: 1526 y: 73 - width: 347 + width: 105 height: 918 m_SerializedDataModeController: m_DataMode: 0 @@ -1041,7 +1041,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: 5e780000 m_LastClickedID: 30814 - m_ExpandedIDs: ffffffff00000000829400002a970000689700000afe00000cfe00000efe000010fe000012fe000016fe000018fe00001afe00001cfe00001efe000020fe000022fe000024fe000026fe000028fe00002afe00002cfe00002efe000030fe000032fe000034fe000036fe000038fe00003afe00003cfe00003efe000042fe000044fe000046fe000048fe00004afe00004cfe00004efe000052fe000054fe000088020100da030200000402000204020004c50200 + m_ExpandedIDs: ffffffff00000000829400002a970000689700000afe00000cfe00000efe000010fe000012fe000016fe000018fe00001afe00001cfe00001efe000020fe000022fe000024fe000026fe000028fe00002afe00002cfe00002efe000030fe000032fe000034fe000036fe000038fe00003afe00003cfe00003efe000042fe000044fe000046fe000048fe00004afe00004cfe00004efe000052fe000054fe0000da030200000402000204020004c50200 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1067,9 +1067,9 @@ MonoBehaviour: m_ResourceFile: m_AssetTreeState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: 2cfcf7ff + m_SelectedIDs: 04b10500 m_LastClickedID: 0 - m_ExpandedIDs: ffffffff00000000829400002a970000689700000afe00000cfe00000efe000010fe000012fe000016fe000018fe00001afe00001cfe00001efe000020fe000022fe000024fe000026fe000028fe00002afe00002cfe00002efe000030fe000032fe000034fe000036fe000038fe00003afe00003cfe00003efe000042fe000044fe000046fe000048fe00004afe00004cfe00004efe000052fe000054fe000088020100da030200000402000204020004c50200 + m_ExpandedIDs: ffffffff00000000829400002a970000689700000afe00000cfe00000efe000010fe000012fe000016fe000018fe00001afe00001cfe00001efe000020fe000022fe000024fe000026fe000028fe00002afe00002cfe00002efe000030fe000032fe000034fe000036fe000038fe00003afe00003cfe00003efe000042fe000044fe000046fe000048fe00004afe00004cfe00004efe000052fe000054fe0000da030200000402000204020004c50200 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1094,8 +1094,8 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_ListAreaState: - m_SelectedInstanceIDs: 2cfcf7ff - m_LastClickedInstanceID: -525268 + m_SelectedInstanceIDs: 04b10500 + m_LastClickedInstanceID: 372996 m_HadKeyboardFocusLastEvent: 0 m_ExpandedInstanceIDs: m_RenameOverlay: @@ -1140,9 +1140,9 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 1470 + x: 1633 y: 0 - width: 450 + width: 287 height: 939 m_MinSize: {x: 276, y: 71} m_MaxSize: {x: 4001, y: 4021} @@ -1172,9 +1172,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 1470 + x: 1633 y: 73 - width: 449 + width: 286 height: 918 m_SerializedDataModeController: m_DataMode: 0