diff --git a/Assets/Resources/UIPrefabs/OperationStepPanel.prefab b/Assets/Resources/UIPrefabs/OperationStepPanel.prefab index e39feea..7edc1b2 100644 --- a/Assets/Resources/UIPrefabs/OperationStepPanel.prefab +++ b/Assets/Resources/UIPrefabs/OperationStepPanel.prefab @@ -1223,7 +1223,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &8052589572268344594 RectTransform: m_ObjectHideFlags: 0 @@ -6983,7 +6983,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &1507436169004188609 RectTransform: m_ObjectHideFlags: 0 diff --git a/Assets/TimeLine/PeoplePlanTimeLineCtrl.playable b/Assets/TimeLine/PeoplePlanTimeLineCtrl.playable index 9f0cbfe..db51c14 100644 --- a/Assets/TimeLine/PeoplePlanTimeLineCtrl.playable +++ b/Assets/TimeLine/PeoplePlanTimeLineCtrl.playable @@ -140,7 +140,7 @@ MonoBehaviour: m_Start: 59.750000000000114 m_ClipIn: 0 m_Asset: {fileID: 2205132455560521697} - m_Duration: 7.916666666666664 + m_Duration: 7.833333333333215 m_TimeScale: 1 m_ParentTrack: {fileID: -6988098670963421634} m_EaseInDuration: 0 @@ -278,6 +278,99 @@ MonoBehaviour: m_OpenClipOffsetRotation: {x: 0, y: 0, z: 0, w: 1} m_Rotation: {x: 0, y: 0, z: 0, w: 1} m_ApplyOffsets: 0 +--- !u!114 &-5901785381034491332 +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 (9) + 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: 82.66666666666667 + m_ClipIn: 0 + m_Asset: {fileID: 4592437665291171685} + m_Duration: 3.0166666666666657 + m_TimeScale: 1 + m_ParentTrack: {fileID: -5901785381034491332} + 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 &-4815227724271581360 MonoBehaviour: m_ObjectHideFlags: 1 @@ -370,6 +463,99 @@ MonoBehaviour: m_Loop: 0 m_Version: 1 m_Rotation: {x: 0, y: 0, z: 0, w: 1} +--- !u!114 &-751426601646032181 +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 (6) + 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.91666666666667 + m_ClipIn: 0 + m_Asset: {fileID: 4990783223489157496} + m_Duration: 5.766666666666666 + m_TimeScale: 1 + m_ParentTrack: {fileID: -751426601646032181} + 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 &-281783416287899117 MonoBehaviour: m_ObjectHideFlags: 1 @@ -483,6 +669,8 @@ MonoBehaviour: - {fileID: 1335408350978119772} - {fileID: -281783416287899117} - {fileID: 6795418547028423147} + - {fileID: -751426601646032181} + - {fileID: -5901785381034491332} - {fileID: 4472817217720704968} - {fileID: 1370216817427414353} - {fileID: 6444902196778153584} @@ -1211,7 +1399,7 @@ MonoBehaviour: m_Start: 78.58333333333333 m_ClipIn: 0 m_Asset: {fileID: 5488082695528013132} - m_Duration: 7.041666666666667 + m_Duration: 7.1000000000000085 m_TimeScale: 1 m_ParentTrack: {fileID: 4472817217720704968} m_EaseInDuration: 0 @@ -1278,7 +1466,31 @@ MonoBehaviour: m_OpenClipOffsetRotation: {x: 0, y: 0, z: 0, w: 1} m_Rotation: {x: 0, y: 0, z: 0, w: 1} m_ApplyOffsets: 0 +--- !u!114 &4592437665291171685 +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 &4633432226228273864 +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 &4990783223489157496 MonoBehaviour: m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} @@ -1315,7 +1527,7 @@ MonoBehaviour: m_Start: 59.750000000000114 m_ClipIn: 0 m_Asset: {fileID: -3080677517079988584} - m_Duration: 7.916666666666664 + m_Duration: 7.249999999999886 m_TimeScale: 1 m_ParentTrack: {fileID: 5124619395960295976} m_EaseInDuration: 0 diff --git a/Assets/TimeLine/TQFQCLTimeLineCtrl.playable b/Assets/TimeLine/TQFQCLTimeLineCtrl.playable index 025f187..148d20c 100644 --- a/Assets/TimeLine/TQFQCLTimeLineCtrl.playable +++ b/Assets/TimeLine/TQFQCLTimeLineCtrl.playable @@ -3344,6 +3344,7 @@ MonoBehaviour: - {fileID: 3667639247722720473} - {fileID: -2447881800995931264} - {fileID: -2810723624050719994} + - {fileID: 495828188281154727} - {fileID: 4379024542995768142} - {fileID: -435635638166925103} - {fileID: -3084943085193096367} @@ -7706,25 +7707,7 @@ MonoBehaviour: 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_Curve: [] m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -8406,6 +8389,168 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fde0d25a170598d46a0b9dc16b4527a5, type: 3} m_Name: ActivationPlayableAsset m_EditorClassIdentifier: +--- !u!114 &495828188281154727 +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 (6) + m_EditorClassIdentifier: + m_Version: 3 + m_AnimClip: {fileID: 0} + m_Locked: 0 + m_Muted: 0 + m_CustomPlayableFullTypename: + m_Curves: {fileID: 0} + m_Parent: {fileID: -3756254556280674478} + m_Children: [] + m_Clips: + - m_Version: 1 + m_Start: 0 + m_ClipIn: 0 + m_Asset: {fileID: 7406824415058853868} + m_Duration: 103.96666666666667 + m_TimeScale: 1 + m_ParentTrack: {fileID: 495828188281154727} + 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_Version: 1 + m_Start: 104.03333333333333 + m_ClipIn: 0 + m_Asset: {fileID: 6279178425496650042} + m_Duration: 30.21666666666667 + m_TimeScale: 1 + m_ParentTrack: {fileID: 495828188281154727} + 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 &522516297653570237 MonoBehaviour: m_ObjectHideFlags: 1 @@ -10953,6 +11098,18 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fde0d25a170598d46a0b9dc16b4527a5, type: 3} m_Name: ActivationPlayableAsset(Clone)(Clone) m_EditorClassIdentifier: +--- !u!114 &6279178425496650042 +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 &6329819052227599024 MonoBehaviour: m_ObjectHideFlags: 1 @@ -11520,6 +11677,18 @@ MonoBehaviour: m_Markers: m_Objects: [] m_PostPlaybackState: 3 +--- !u!114 &7406824415058853868 +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 &7471013282825098422 MonoBehaviour: m_ObjectHideFlags: 1 diff --git a/Assets/_Scenes/TrainExam.unity b/Assets/_Scenes/TrainExam.unity index e3d27dd..d724392 100644 --- a/Assets/_Scenes/TrainExam.unity +++ b/Assets/_Scenes/TrainExam.unity @@ -605,6 +605,11 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: -8641190047559099242, guid: 2de7256753d09ed4e90226e09652cca0, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 919132149155446097, guid: 2de7256753d09ed4e90226e09652cca0, type: 3} propertyPath: m_Name @@ -6780,6 +6785,11 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} + - target: {fileID: 2867148827673596927, guid: 9c9048e7ada2c054989940b74e478b4f, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 3235517840709521881, guid: 9c9048e7ada2c054989940b74e478b4f, type: 3} propertyPath: m_IsActive @@ -15189,6 +15199,12 @@ PlayableDirector: value: {fileID: 1344588676} - key: {fileID: 1370216817427414353, guid: 650596eb2f54a364eaf5458ae2439d75, type: 2} value: {fileID: 1344588674} + - key: {fileID: -751426601646032181, guid: 650596eb2f54a364eaf5458ae2439d75, type: 2} + value: {fileID: 1908036638} + - key: {fileID: -5901785381034491332, guid: 650596eb2f54a364eaf5458ae2439d75, type: 2} + value: {fileID: 1908036637} + - key: {fileID: 495828188281154727, guid: 27f4ae919ccd2174296e5a3a322566bd, type: 2} + value: {fileID: 1752369249} m_ExposedReferences: m_References: - 335a0b1c4f8ab3e4a9c25efaa7f82a49: {fileID: 567124863} @@ -15441,6 +15457,11 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: -3890471063164508258, guid: 6d0303911f413ab4391ab98ee2c2f263, + type: 3} + propertyPath: m_TagString + value: nohide + objectReference: {fileID: 0} - target: {fileID: -3248293724437313512, guid: 6d0303911f413ab4391ab98ee2c2f263, type: 3} propertyPath: m_LocalRotation.w @@ -15471,6 +15492,16 @@ PrefabInstance: propertyPath: m_Name value: room_xishou objectReference: {fileID: 0} + - target: {fileID: 5431312701416729119, guid: 6d0303911f413ab4391ab98ee2c2f263, + type: 3} + propertyPath: m_TagString + value: nohide + objectReference: {fileID: 0} + - target: {fileID: 6674030959502053119, guid: 6d0303911f413ab4391ab98ee2c2f263, + type: 3} + propertyPath: m_TagString + value: nohide + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -25549,6 +25580,18 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1903215257} m_CullTransparentMesh: 1 +--- !u!1 &1908036637 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 2416629192506875842, guid: 6ac5fabf090f64648ab7b23a4324d32a, + type: 3} + m_PrefabInstance: {fileID: 2092152074} + m_PrefabAsset: {fileID: 0} +--- !u!1 &1908036638 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 7330925885719530435, guid: 6ac5fabf090f64648ab7b23a4324d32a, + type: 3} + m_PrefabInstance: {fileID: 2092152074} + m_PrefabAsset: {fileID: 0} --- !u!1 &1915360561 GameObject: m_ObjectHideFlags: 0 @@ -26816,6 +26859,11 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: -3900988103554265802, guid: 93f44dac41ec84c45a2f370d264a6340, + type: 3} + propertyPath: m_Name + value: yifu1 + objectReference: {fileID: 0} - target: {fileID: 919132149155446097, guid: 93f44dac41ec84c45a2f370d264a6340, type: 3} propertyPath: m_Name @@ -27504,22 +27552,22 @@ PrefabInstance: - target: {fileID: 3191990409535342862, guid: 6ac5fabf090f64648ab7b23a4324d32a, type: 3} propertyPath: m_IsActive - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3640351943889371770, guid: 6ac5fabf090f64648ab7b23a4324d32a, type: 3} propertyPath: m_LocalScale.x - value: -0.02399991 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3640351943889371770, guid: 6ac5fabf090f64648ab7b23a4324d32a, type: 3} propertyPath: m_LocalScale.y - value: -0.02399991 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3640351943889371770, guid: 6ac5fabf090f64648ab7b23a4324d32a, type: 3} propertyPath: m_LocalScale.z - value: -0.02399991 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3640351943889371770, guid: 6ac5fabf090f64648ab7b23a4324d32a, type: 3} @@ -27556,15 +27604,20 @@ PrefabInstance: propertyPath: m_LocalRotation.z value: -0.18920948 objectReference: {fileID: 0} + - target: {fileID: 3640351943889371770, guid: 6ac5fabf090f64648ab7b23a4324d32a, + type: 3} + propertyPath: m_ConstrainProportionsScale + value: 1 + objectReference: {fileID: 0} - target: {fileID: 4841400786969488830, guid: 6ac5fabf090f64648ab7b23a4324d32a, type: 3} propertyPath: m_IsActive - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 5276143773239932829, guid: 6ac5fabf090f64648ab7b23a4324d32a, type: 3} propertyPath: m_IsActive - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 6018609178188948952, guid: 6ac5fabf090f64648ab7b23a4324d32a, type: 3} @@ -27644,13 +27697,23 @@ PrefabInstance: - target: {fileID: 6398970225201250146, guid: 6ac5fabf090f64648ab7b23a4324d32a, type: 3} propertyPath: m_IsActive - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 6473937040360209323, guid: 6ac5fabf090f64648ab7b23a4324d32a, type: 3} propertyPath: m_Name value: Yisheng_A3 objectReference: {fileID: 0} + - target: {fileID: 7330925885719530435, guid: 6ac5fabf090f64648ab7b23a4324d32a, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 9092880443738815747, guid: 6ac5fabf090f64648ab7b23a4324d32a, + type: 3} + propertyPath: m_TagString + value: nohide + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] diff --git a/Assets/_Scripts/Application/SceneCtrls/NiuSceneMng.cs b/Assets/_Scripts/Application/SceneCtrls/NiuSceneMng.cs index f190578..6845560 100644 --- a/Assets/_Scripts/Application/SceneCtrls/NiuSceneMng.cs +++ b/Assets/_Scripts/Application/SceneCtrls/NiuSceneMng.cs @@ -212,6 +212,22 @@ namespace ZXK.LouDiXvMuNiu { t.gameObject.SetActive(false); } + if (curObj == null) return; + List curSteps = GameManager.Instance._DataNiuHandler.NiuStepTypeDic[GameManager.Instance._CurModelType]; + + if (curObj.ThreeTaskName == ConstCtrl.ThreeTaskName_PeoplePlan) + { + //需要点击的物体重新全部显示 + for (int i = 0; i < curSteps.Count; i++) + { + if(curSteps[i].ThreeTaskName == ConstCtrl.ThreeTaskName_PeoplePlan) + { + string toolStr = curSteps[i].ModelBT; + GameObject toolGeo = UtilitiesMng.GetGeoByName(new Transform[1] { transform }, toolStr, true); + toolGeo.SetActive(true); + } + } + } if (GameManager.Instance._CurModelType.Equals(ConstCtrl.ModuleName_TQFAQCL)) { @@ -431,7 +447,8 @@ namespace ZXK.LouDiXvMuNiu { triGeo.GetComponent().enabled = false; } - else + + if (triGeo.tag != ConstCtrl.SceneTool_Tag) { triGeo.SetActive(false); } @@ -484,7 +501,7 @@ namespace ZXK.LouDiXvMuNiu { triGeo.GetComponent().enabled = false; } - else + if (triGeo.tag != ConstCtrl.SceneTool_Tag) { triGeo.SetActive(false); } diff --git a/Assets/_Scripts/Application/UI/OperationStepPanel.cs b/Assets/_Scripts/Application/UI/OperationStepPanel.cs index 1a22727..6319063 100644 --- a/Assets/_Scripts/Application/UI/OperationStepPanel.cs +++ b/Assets/_Scripts/Application/UI/OperationStepPanel.cs @@ -98,21 +98,21 @@ namespace ZXK.LouDiXvMuNiu GameManager.Instance._DataNiuHandler.CurNiuHandler.OnValueChanged += OnValueChanged; } - //private void Update() - //{ - // if(Input.GetKey(KeyCode.Z)) - // { - // KinematicCharacterMotor kinematic = Camera.main.GetComponent()._CameraCtrl.transform.GetComponent(); - // ExampleCharacterCamera characterCamera = Camera.main.GetComponent(); + private void Update() + { + if (Input.GetKey(KeyCode.Z)) + { + KinematicCharacterMotor kinematic = Camera.main.GetComponent()._CameraCtrl.transform.GetComponent(); + ExampleCharacterCamera characterCamera = Camera.main.GetComponent(); - // Vector3 pos = kinematic.transform.position; - // float rotY = kinematic.transform.rotation.eulerAngles.y; - // Vector3 rot = new Vector3(characterCamera.transform.rotation.eulerAngles.x, rotY, 0); - // int index = GameManager.Instance._DataNiuHandler.CurNiuHandler.Value.id; - // string cameraTRInfo = string.Format("{0}_{1}_{2}|{3}_{4}_{5}", pos.x, pos.y, pos.z, rot.x, rot.y, rot.z); - // GetWedage("TempReadCameraPos_N").GetComponent().text = cameraTRInfo; - // } - //} + Vector3 pos = kinematic.transform.position; + float rotY = kinematic.transform.rotation.eulerAngles.y; + Vector3 rot = new Vector3(characterCamera.transform.rotation.eulerAngles.x, rotY, 0); + int index = GameManager.Instance._DataNiuHandler.CurNiuHandler.Value.id; + string cameraTRInfo = string.Format("{0}_{1}_{2}|{3}_{4}_{5}", pos.x, pos.y, pos.z, rot.x, rot.y, rot.z); + GetWedage("TempReadCameraPos_N").GetComponent().text = cameraTRInfo; + } + } protected override void OnDestroy() { @@ -229,11 +229,11 @@ namespace ZXK.LouDiXvMuNiu { NiuSceneMng._Instance.UseToolsActive(false); } - NiuSceneMng._Instance.InitPlayAnmState(obj, GameManager.Instance._DataNiuHandler.CurNiuHandler.PreviousValue); } if(obj.ThreeTaskName != GameManager.Instance._DataNiuHandler.CurNiuHandler.PreviousValue.ThreeTaskName) {//前后三级人物名字不同 + NiuSceneMng._Instance.InitPlayAnmState(obj, GameManager.Instance._DataNiuHandler.CurNiuHandler.PreviousValue); //默认工具全不显示 if (GameManager.Instance._StateContext.GetState().Name.Equals("TrainState")) {//如果训练模式下，物品展示时显示物品 @@ -293,12 +293,15 @@ namespace ZXK.LouDiXvMuNiu Transform seleTran = null; for (int i = 0; i < _stepChildrens.Count; i++) { - _stepChildrens[i].GetComponent().isOn = false; - _stepChildrens[i].transform.Find("TextContent").GetComponent().color = Color.white; if (_stepChildrens[i].name.Equals(objLight.id.ToString())) { seleTran = _stepChildrens[i].transform; } + if (GameManager.Instance._StateContext.GetState().Name.Equals("TrainState")) + { + _stepChildrens[i].GetComponent().isOn = false; + _stepChildrens[i].transform.Find("TextContent").GetComponent().color = Color.white; + } } Text nameTxt = seleTran.Find("TextContent").GetComponent(); nameTxt.color = new Color(25 / 255.0f, 224 / 255.0f, 224 / 255.0f); @@ -306,6 +309,7 @@ namespace ZXK.LouDiXvMuNiu //根据子选项Transform找到大步骤选项变化 for (int i = 0; i < _stepBigs.Count; i++) { + if (GameManager.Instance._StateContext.GetState().Name.Equals("ExamState")) break; _stepBigs[i].transform.Find("IsSelectBG/TextDetail").GetComponent().color = Color.white; _stepBigs[i].transform.Find("IsSelectBG/TextDetail").GetComponent().effectColor = new Color(Color.white.r, Color.white.g, Color.white.b, 0.2f); _stepBigs[i].transform.Find("IsNoSelectLogo/IsSelectLogoLINE").gameObject.SetActive(false); diff --git a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt index 3068b95..5243b54 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: 34123 + controlID: 4694 --- !u!114 &2 MonoBehaviour: m_ObjectHideFlags: 52 @@ -49,9 +49,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 360 - width: 1062 - height: 631 + y: 562 + width: 1073 + height: 429 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -104,23 +104,23 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 21 - width: 1062 - height: 610 - m_Scale: {x: 0.553125, y: 0.553125} - m_Translation: {x: 530.99994, y: 305} + width: 1073 + height: 408 + m_Scale: {x: 0.3777778, y: 0.37777779} + m_Translation: {x: 536.5, y: 204} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 m_MarginBottom: 0 m_LastShownAreaInsideMargins: serializedVersion: 2 - x: -959.9999 - y: -551.4124 - width: 1919.9999 - height: 1102.8248 + x: -1420.147 + y: -540 + width: 2840.294 + height: 1080 m_MinimalGUI: 1 - m_defaultScale: 0.553125 - m_LastWindowPixelSize: {x: 1062, y: 631} + m_defaultScale: 0.37777779 + m_LastWindowPixelSize: {x: 1073, y: 429} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 01000000000000000000 @@ -145,12 +145,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1063 + width: 1074 height: 939 m_MinSize: {x: 100, y: 100} m_MaxSize: {x: 8096, y: 16192} vertical: 1 - controlID: 34124 + controlID: 4695 --- !u!114 &4 MonoBehaviour: m_ObjectHideFlags: 52 @@ -168,10 +168,10 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1063 - height: 287 - m_MinSize: {x: 201, y: 221} - m_MaxSize: {x: 4001, y: 4021} + width: 1074 + height: 489 + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 5} m_Panes: - {fileID: 5} @@ -201,8 +201,8 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 73 - width: 1062 - height: 266 + width: 1073 + height: 468 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -295,9 +295,9 @@ MonoBehaviour: floating: 0 collapsed: 0 displayed: 1 - snapOffset: {x: 67.5, y: -123} + snapOffset: {x: -111, y: -221} snapOffsetDelta: {x: 0, y: 0} - snapCorner: 2 + snapCorner: 3 id: Orientation index: 0 layout: 4 @@ -639,9 +639,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: 1.829537, y: -2.5970767, z: 1.9930847} + m_Target: {x: 11.731326, y: -3.7168741, z: 40.11016} speed: 2 - m_Value: {x: 1.829537, y: -2.5970767, z: 1.9930847} + m_Value: {x: 11.731326, y: -3.7168741, z: 40.11016} 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.02411054, y: 0.9084734, z: -0.41389966, w: -0.05293978} + m_Target: {x: 0.31297213, y: 0.46152452, z: -0.17815846, w: 0.8107633} speed: 2 - m_Value: {x: -0.024110291, y: 0.90846395, z: -0.41389537, w: -0.052939232} + m_Value: {x: 0.31296682, y: 0.4615167, z: -0.17815545, w: 0.8107496} m_Size: - m_Target: 0.57290393 + m_Target: 1.28598 speed: 2 - m_Value: 0.57290393 + m_Value: 1.28598 m_Ortho: m_Target: 0 speed: 2 @@ -711,7 +711,7 @@ MonoBehaviour: m_FarClip: 10000 m_DynamicClip: 1 m_OcclusionCulling: 0 - m_LastSceneViewRotation: {x: -0.31238225, y: -0.057808004, z: 0.019048069, w: -0.94800794} + m_LastSceneViewRotation: {x: 0.23127604, y: -0.00875613, z: 0.002081416, w: 0.9728486} m_LastSceneViewOrtho: 0 m_ReplacementShader: {fileID: 0} m_ReplacementString: @@ -807,9 +807,9 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 287 - width: 1063 - height: 652 + y: 489 + width: 1074 + height: 450 m_MinSize: {x: 201, y: 221} m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 2} @@ -840,9 +840,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 508 - width: 1062 - height: 483 + y: 562 + width: 1073 + height: 429 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -877,9 +877,9 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 1063 + x: 1074 y: 0 - width: 371 + width: 322 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: 1063 + x: 1074 y: 73 - width: 369 + width: 320 height: 918 m_SerializedDataModeController: m_DataMode: 0 @@ -926,9 +926,9 @@ MonoBehaviour: m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: 96cd0000 + m_SelectedIDs: 7e770000 m_LastClickedID: 0 - m_ExpandedIDs: 3e1df3ff8e2bf3ff4e66f3ff3e7af4ff209bf4ffb0ecf4ffe030f5ffe430f5fff431f5ff0038f5ff7841f5ff2411f6ff3e15f6ff4e1af6ff205df6ff0098f6ffb0a0f6ffb4a0f6ff70a1f6fffea2f6ff72c4f6ff3e94f7ff2a79f8ffaad6f8ff66d7f8ff9cedf8ffa2f4f8ffb62ef9ff4a4cfaff6c5bfaff765bfaff805bfaff8c5bfaff3699faff629efafffce9faff462cfbffe698fcff6ca3fcff44e9fcff0e2ffdffa477fdff62bafdffd6bafdff86c0fdff2412feff6417feffd454feff8a9efeff9cfbfeff247fffff02dffffffef7ffff2efbfffff4ffffff527b00002e7c00007c7f0000d87f00009a8100006e8300000286000046880000c03101004035010016730100ba7801001e7d0100be7d01003886010058890100d88c01003c8d0100989f01007ca30100b4b50100d4b8010098b9010052cb010072ce0100d2ce010036cf010054f7010074fa010038fb01005c010200787a02001c800200808402006ab602008ab60200fabb02008abe02009ec1020002c60200c83e0300f63e03001e40030000440300c2450300c64a0300f6160400b4180400c0190400721b0400541f0400162104007a250400da5a0400ee5b0400b05d0400986104005a630400be6704005e6804003a9d040010a004001eaa040038dc040050dc0400da500500c2540500 + m_ExpandedIDs: a035fcff0477fcff308cfcff348cfcffacc1fcff500dfdff7c2bfdff802bfdff8056fdffa8cdfdffd0ebfdffc0f8fdffaa57feffae57feffc48efeff98b3ffff2efbffff3a28010032290100f62c0100026d0100fa6d0100689a0100609b0100289f0100e4de0100dcdf0100a4e30100 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -967,9 +967,9 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 1434 + x: 1396 y: 0 - width: 224 + width: 255 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: 1434 + x: 1396 y: 73 - width: 222 + width: 253 height: 918 m_SerializedDataModeController: m_DataMode: 0 @@ -1024,7 +1024,7 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets/StreamingAssets/Excel + - Assets/_Scenes m_Globs: [] m_OriginalText: m_ImportLogFlags: 0 @@ -1040,7 +1040,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: be940b00 m_LastClickedID: 758974 - m_ExpandedIDs: ffffffff0000000066740000687400006a7400006c7400006e74000070740000727400007474000076740000787400007a7400007c7400007e74000080740000827400008474000086740000887400008a7400008c7400008e7400009074000092740000987400009a740000327700003477000040770000467700001a510300 + m_ExpandedIDs: ffffffff00000000ae740000b0740000b2740000b4740000b6740000b8740000ba740000bc740000be740000c0740000c2740000c4740000c6740000c8740000ca740000cc740000ce740000d0740000d2740000d4740000d6740000d8740000da740000dc740000de740000e0740000e2740000e4740000e6740000e8740000ea740000ec740000827700008e770000b67700000080000002800000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1066,23 +1066,23 @@ MonoBehaviour: m_ResourceFile: m_AssetTreeState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: 96cd0000 - m_LastClickedID: 52630 - m_ExpandedIDs: ffffffff0000000066740000687400006a7400006c7400006e7400007274000076740000787400007a7400007c7400007e74000080740000827400008474000086740000887400008a7400008c7400008e7400009074000092740000967400004677000092f802001a510300 + m_SelectedIDs: 7e770000 + m_LastClickedID: 30590 + m_ExpandedIDs: ffffffff00000000ae740000b0740000b2740000b4740000b6740000b8740000ba740000bc740000be740000c0740000c2740000c4740000c6740000c8740000ca740000cc740000ce740000d0740000d2740000d4740000d6740000d8740000da740000dc740000de740000e0740000e2740000e4740000e6740000e8740000ea740000ec740000827700008e770000b67700000080000002800000 m_RenameOverlay: m_UserAcceptedRename: 0 - m_Name: TrainExam - m_OriginalName: TrainExam + m_Name: + m_OriginalName: m_EditFieldRect: serializedVersion: 2 x: 0 y: 0 width: 0 height: 0 - m_UserData: 30512 + m_UserData: 0 m_IsWaitingForDelay: 0 m_IsRenaming: 0 - m_OriginalEventType: 0 + m_OriginalEventType: 11 m_IsRenamingFilename: 1 m_ClientGUIView: {fileID: 11} m_SearchString: @@ -1093,8 +1093,8 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_ListAreaState: - m_SelectedInstanceIDs: 96cd0000 - m_LastClickedInstanceID: 52630 + m_SelectedInstanceIDs: 7e770000 + m_LastClickedInstanceID: 30590 m_HadKeyboardFocusLastEvent: 0 m_ExpandedInstanceIDs: m_RenameOverlay: @@ -1139,12 +1139,12 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 1658 + x: 1651 y: 0 - width: 262 + width: 269 height: 939 - m_MinSize: {x: 276, y: 71} - m_MaxSize: {x: 4001, y: 4021} + m_MinSize: {x: 275, y: 50} + m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 14} m_Panes: - {fileID: 14} @@ -1171,9 +1171,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 1658 + x: 1651 y: 73 - width: 261 + width: 268 height: 918 m_SerializedDataModeController: m_DataMode: 0 diff --git a/UserSettings/Layouts/default-2022.dwlt b/UserSettings/Layouts/default-2022.dwlt index 3a3fb35..242f640 100644 --- a/UserSettings/Layouts/default-2022.dwlt +++ b/UserSettings/Layouts/default-2022.dwlt @@ -19,7 +19,7 @@ MonoBehaviour: width: 1920 height: 989 m_ShowMode: 4 - m_Title: Project + m_Title: Game m_RootView: {fileID: 2} m_MinSize: {x: 875, y: 492} m_MaxSize: {x: 10000, y: 10000} @@ -121,7 +121,7 @@ MonoBehaviour: m_MinSize: {x: 400, y: 100} m_MaxSize: {x: 32384, y: 16192} vertical: 0 - controlID: 72 + controlID: 51 --- !u!114 &6 MonoBehaviour: m_ObjectHideFlags: 52 @@ -146,7 +146,7 @@ MonoBehaviour: m_MinSize: {x: 100, y: 100} m_MaxSize: {x: 8096, y: 16192} vertical: 1 - controlID: 28 + controlID: 20 --- !u!114 &7 MonoBehaviour: m_ObjectHideFlags: 52 @@ -166,8 +166,8 @@ MonoBehaviour: y: 0 width: 1063 height: 521 - m_MinSize: {x: 200, y: 200} - m_MaxSize: {x: 4000, y: 4000} + m_MinSize: {x: 201, y: 221} + m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 13} m_Panes: - {fileID: 13} @@ -193,8 +193,8 @@ MonoBehaviour: y: 521 width: 1063 height: 418 - m_MinSize: {x: 200, y: 200} - m_MaxSize: {x: 4000, y: 4000} + m_MinSize: {x: 201, y: 221} + m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 12} m_Panes: - {fileID: 12} @@ -272,8 +272,8 @@ MonoBehaviour: y: 0 width: 269 height: 939 - m_MinSize: {x: 275, y: 50} - m_MaxSize: {x: 4000, y: 4000} + m_MinSize: {x: 276, y: 71} + m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 18} m_Panes: - {fileID: 18} @@ -879,7 +879,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} @@ -889,11 +889,11 @@ MonoBehaviour: m_Rotation: m_Target: {x: 0.23127604, y: -0.00875613, z: 0.002081416, w: 0.9728486} speed: 2 - m_Value: {x: 0.23128079, y: -0.0058375373, z: 0.0013875768, w: 0.9728686} + m_Value: {x: 0.23127559, y: -0.008756113, z: 0.0020814121, w: 0.97284675} m_Size: m_Target: 4.4686475 speed: 2 - m_Value: 4.679212 + m_Value: 4.4686475 m_Ortho: m_Target: 0 speed: 2 @@ -1073,9 +1073,9 @@ MonoBehaviour: m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: 3e770000 + m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 929feeff9aabeeff6aaceeff46eaeeff60eaeeffc0ffeeff0c43efff00f4f0ff386ef1ff3c6ef1ff3c82f1ff948ef1ff80c9f1fff0ecf1ff04edf1ff08edf1ff40f7f1ff2c18f2ff8c37f2ff345df2ff847ff2ffdac7f2ff18ecf2ff9817f3ffc85ff3ffa09bf3ffa6def3ff58e3f3ff9020f4ffc263f4ffdc68f4ff3ea6f4ff22a7f4ffe055f5ff546ef5ff76b1f5ff884cf6ff6493f6fff895f6fffa13f7ff1606f8ff4622f8ff4822f8ff4a22f8ff4e22f8ff5222f8ff5422f8ff5622f8ff08d8f8ff0adff8ffd029f9ffd829f9ffe029f9ffe429f9ffe829f9ffc836f9ffa275f9ffda45fbff788cfbffd6e2fbff8eaefdff82e8fdff64e9fdfff021feffd20dfffffc66ffff0267ffff0867ffff7e6affff58a2ffff2efbfffff4ffffff1474000034740000d2d80000b8db0000cadb000002e00000e4060100d00701004c0801004e0c0100180e01005e0f01007c1201001c1301002a580200f65d02005a620200fa620200a66e020072740200d678020076790200c4170300901d0300f421030094220300c83f030030440300024a0300264e0300744e0300dabb0300d2bc030080c00300b46e0400be730400b67404004aa1040042a20400cece0400c6cf040080d3040040e5040038e60400c8120500c0130500b21405007a170500362905002e2a0500266d05001e6e050060b1050058b205001cb60500d0c70500c8c805008ccc05003cde050034df0500f00b0600e80c0600da0d0600d8c90600d6cf060048d40600ead40600 + m_ExpandedIDs: bcbdffff2efbffff m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1161,7 +1161,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: be940b00 m_LastClickedID: 758974 - m_ExpandedIDs: 0000000076740000787400007a7400007c7400007e74000080740000827400008474000086740000887400008a7400008c7400008e74000090740000927400009474000096740000987400009a7400009c7400009e740000a0740000a2740000a4740000a6740000a8740000aa740000 + m_ExpandedIDs: 00000000c4cd0000c6cd0000c8cd0000cacd0000cccd0000cecd0000d0cd0000d2cd0000d4cd0000d6cd0000d8cd0000dacd0000dccd0000decd0000e0cd0000e2cd0000e4cd0000e6cd0000e8cd0000eacd0000eccd0000eecd0000f0cd0000f2cd0000f4cd0000f6cd0000f8cd0000facd0000fccd0000fecd000000ce000002ce0000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1189,21 +1189,21 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: ffffffff0000000076740000787400007a7400007c7400007e74000080740000827400008474000086740000887400008a7400008c7400008e74000090740000927400009474000096740000987400009a740000a4740000a6740000a8740000aa740000407700005a7700008cec000026060300780c03007c0c0300160e0300141203005e990300 + m_ExpandedIDs: ffffffff00000000c4cd0000c6cd0000c8cd0000cacd0000cccd0000cecd0000d0cd0000d2cd0000d4cd0000d6cd0000d8cd0000dacd0000dccd0000decd0000e0cd0000e2cd0000e4cd0000e6cd0000e8cd0000eacd0000eccd0000eecd0000f0cd0000f2cd0000f4cd0000f6cd0000f8cd0000facd0000fccd0000fecd000000ce000002ce0000 m_RenameOverlay: m_UserAcceptedRename: 0 - m_Name: OperationStepPanel - m_OriginalName: OperationStepPanel + m_Name: + m_OriginalName: m_EditFieldRect: serializedVersion: 2 x: 0 y: 0 width: 0 height: 0 - m_UserData: 30160 + m_UserData: 0 m_IsWaitingForDelay: 0 m_IsRenaming: 0 - m_OriginalEventType: 0 + m_OriginalEventType: 11 m_IsRenamingFilename: 1 m_ClientGUIView: {fileID: 10} m_SearchString: