5.13早上提交
This commit is contained in:
parent
3bf9df1730
commit
10546661b6
|
@ -8,19 +8,20 @@ Material:
|
||||||
m_PrefabInstance: {fileID: 0}
|
m_PrefabInstance: {fileID: 0}
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
m_Name: MT_PM_V38_Sorghum_bicolor_Leaf_01_albedo
|
m_Name: MT_PM_V38_Sorghum_bicolor_Leaf_01_albedo
|
||||||
m_Shader: {fileID: 10511, guid: 0000000000000000f000000000000000, type: 0}
|
m_Shader: {fileID: 47, guid: 0000000000000000f000000000000000, type: 0}
|
||||||
m_ValidKeywords:
|
m_ValidKeywords:
|
||||||
|
- _ALPHATEST_ON
|
||||||
- _EMISSION
|
- _EMISSION
|
||||||
m_InvalidKeywords:
|
|
||||||
- _ALPHABLEND_ON
|
|
||||||
- _NORMALMAP
|
- _NORMALMAP
|
||||||
|
m_InvalidKeywords:
|
||||||
- _REQUIRE_UV2
|
- _REQUIRE_UV2
|
||||||
- _SMOOTHNESS_TEXTURE_ALBEDO_CHANNEL_A
|
- _SMOOTHNESS_TEXTURE_ALBEDO_CHANNEL_A
|
||||||
m_LightmapFlags: 0
|
m_LightmapFlags: 0
|
||||||
m_EnableInstancingVariants: 0
|
m_EnableInstancingVariants: 0
|
||||||
m_DoubleSidedGI: 0
|
m_DoubleSidedGI: 0
|
||||||
m_CustomRenderQueue: -1
|
m_CustomRenderQueue: 2450
|
||||||
stringTagMap: {}
|
stringTagMap:
|
||||||
|
RenderType: TransparentCutout
|
||||||
disabledShaderPasses:
|
disabledShaderPasses:
|
||||||
- GRABPASS
|
- GRABPASS
|
||||||
m_SavedProperties:
|
m_SavedProperties:
|
||||||
|
@ -134,7 +135,7 @@ Material:
|
||||||
- _DistortionEnabled: 0
|
- _DistortionEnabled: 0
|
||||||
- _DistortionStrength: 1
|
- _DistortionStrength: 1
|
||||||
- _DistortionStrengthScaled: 0
|
- _DistortionStrengthScaled: 0
|
||||||
- _DstBlend: 10
|
- _DstBlend: 0
|
||||||
- _EmissionEnabled: 0
|
- _EmissionEnabled: 0
|
||||||
- _Farm_Step1: 0
|
- _Farm_Step1: 0
|
||||||
- _FlipbookMode: 1
|
- _FlipbookMode: 1
|
||||||
|
@ -144,7 +145,7 @@ Material:
|
||||||
- _InvFade: 1
|
- _InvFade: 1
|
||||||
- _LightingEnabled: 1
|
- _LightingEnabled: 1
|
||||||
- _Metallic: 0
|
- _Metallic: 0
|
||||||
- _Mode: 2
|
- _Mode: 1
|
||||||
- _N1Int: 1
|
- _N1Int: 1
|
||||||
- _N2Int: 1
|
- _N2Int: 1
|
||||||
- _N3Int: 1
|
- _N3Int: 1
|
||||||
|
@ -161,11 +162,11 @@ Material:
|
||||||
- _SoftParticlesNearFadeDistance: 0
|
- _SoftParticlesNearFadeDistance: 0
|
||||||
- _SpecularHighlights: 1
|
- _SpecularHighlights: 1
|
||||||
- _SquashAmount: 1
|
- _SquashAmount: 1
|
||||||
- _SrcBlend: 5
|
- _SrcBlend: 1
|
||||||
- _Tex_D1pow: 1
|
- _Tex_D1pow: 1
|
||||||
- _TranslucencyViewDependency: 0.7
|
- _TranslucencyViewDependency: 0.7
|
||||||
- _UVSec: 0
|
- _UVSec: 0
|
||||||
- _ZWrite: 0
|
- _ZWrite: 1
|
||||||
- __dirty: 1
|
- __dirty: 1
|
||||||
m_Colors:
|
m_Colors:
|
||||||
- _CameraFadeParams: {r: 0, g: Infinity, b: 0, a: 0}
|
- _CameraFadeParams: {r: 0, g: Infinity, b: 0, a: 0}
|
||||||
|
|
|
@ -10,16 +10,16 @@ Material:
|
||||||
m_Name: MT_PM_V38_Sorghum_bicolor_Stem_02_albedo_01
|
m_Name: MT_PM_V38_Sorghum_bicolor_Stem_02_albedo_01
|
||||||
m_Shader: {fileID: 47, guid: 0000000000000000f000000000000000, type: 0}
|
m_Shader: {fileID: 47, guid: 0000000000000000f000000000000000, type: 0}
|
||||||
m_ValidKeywords:
|
m_ValidKeywords:
|
||||||
- _ALPHABLEND_ON
|
- _ALPHATEST_ON
|
||||||
- _EMISSION
|
- _EMISSION
|
||||||
- _NORMALMAP
|
- _NORMALMAP
|
||||||
m_InvalidKeywords: []
|
m_InvalidKeywords: []
|
||||||
m_LightmapFlags: 1
|
m_LightmapFlags: 1
|
||||||
m_EnableInstancingVariants: 0
|
m_EnableInstancingVariants: 0
|
||||||
m_DoubleSidedGI: 0
|
m_DoubleSidedGI: 0
|
||||||
m_CustomRenderQueue: 3000
|
m_CustomRenderQueue: 2450
|
||||||
stringTagMap:
|
stringTagMap:
|
||||||
RenderType: Transparent
|
RenderType: TransparentCutout
|
||||||
disabledShaderPasses: []
|
disabledShaderPasses: []
|
||||||
m_SavedProperties:
|
m_SavedProperties:
|
||||||
serializedVersion: 3
|
serializedVersion: 3
|
||||||
|
@ -69,19 +69,19 @@ Material:
|
||||||
- _BumpScale: 1
|
- _BumpScale: 1
|
||||||
- _Cutoff: 0.5
|
- _Cutoff: 0.5
|
||||||
- _DetailNormalMapScale: 1
|
- _DetailNormalMapScale: 1
|
||||||
- _DstBlend: 10
|
- _DstBlend: 0
|
||||||
- _GlossMapScale: 1
|
- _GlossMapScale: 1
|
||||||
- _Glossiness: 0.5
|
- _Glossiness: 0.5
|
||||||
- _GlossyReflections: 1
|
- _GlossyReflections: 1
|
||||||
- _Metallic: 0
|
- _Metallic: 0
|
||||||
- _Mode: 2
|
- _Mode: 1
|
||||||
- _OcclusionStrength: 1
|
- _OcclusionStrength: 1
|
||||||
- _Parallax: 0.02
|
- _Parallax: 0.02
|
||||||
- _SmoothnessTextureChannel: 0
|
- _SmoothnessTextureChannel: 0
|
||||||
- _SpecularHighlights: 1
|
- _SpecularHighlights: 1
|
||||||
- _SrcBlend: 5
|
- _SrcBlend: 1
|
||||||
- _UVSec: 0
|
- _UVSec: 0
|
||||||
- _ZWrite: 0
|
- _ZWrite: 1
|
||||||
m_Colors:
|
m_Colors:
|
||||||
- _Color: {r: 0.78764683, g: 0.9433962, b: 0.8282066, a: 1}
|
- _Color: {r: 0.78764683, g: 0.9433962, b: 0.8282066, a: 1}
|
||||||
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
|
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
|
||||||
|
|
|
@ -32,8 +32,6 @@ RectTransform:
|
||||||
m_ConstrainProportionsScale: 0
|
m_ConstrainProportionsScale: 0
|
||||||
m_Children:
|
m_Children:
|
||||||
- {fileID: 2527944883655481645}
|
- {fileID: 2527944883655481645}
|
||||||
- {fileID: 7835042658044891768}
|
|
||||||
- {fileID: 8640685201192089303}
|
|
||||||
- {fileID: 6034407815697293955}
|
- {fileID: 6034407815697293955}
|
||||||
m_Father: {fileID: 496968027908146854}
|
m_Father: {fileID: 496968027908146854}
|
||||||
m_RootOrder: 0
|
m_RootOrder: 0
|
||||||
|
@ -124,12 +122,12 @@ RectTransform:
|
||||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||||
m_ConstrainProportionsScale: 0
|
m_ConstrainProportionsScale: 0
|
||||||
m_Children: []
|
m_Children: []
|
||||||
m_Father: {fileID: 1078803496746026190}
|
m_Father: {fileID: 7835042658044891768}
|
||||||
m_RootOrder: 2
|
m_RootOrder: 0
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0, y: 1}
|
m_AnchorMin: {x: 0, y: 1}
|
||||||
m_AnchorMax: {x: 0, y: 1}
|
m_AnchorMax: {x: 0, y: 1}
|
||||||
m_AnchoredPosition: {x: 20, y: -120}
|
m_AnchoredPosition: {x: 0, y: 0}
|
||||||
m_SizeDelta: {x: 178.0773, y: 79.1229}
|
m_SizeDelta: {x: 178.0773, y: 79.1229}
|
||||||
m_Pivot: {x: 0, y: 1}
|
m_Pivot: {x: 0, y: 1}
|
||||||
--- !u!114 &235241195840539889
|
--- !u!114 &235241195840539889
|
||||||
|
@ -184,7 +182,7 @@ MonoBehaviour:
|
||||||
m_Script: {fileID: 11500000, guid: 2fafe2cfe61f6974895a912c3755e8f1, type: 3}
|
m_Script: {fileID: 11500000, guid: 2fafe2cfe61f6974895a912c3755e8f1, type: 3}
|
||||||
m_Name:
|
m_Name:
|
||||||
m_EditorClassIdentifier:
|
m_EditorClassIdentifier:
|
||||||
m_AllowSwitchOff: 1
|
m_AllowSwitchOff: 0
|
||||||
--- !u!1 &1274212127849608913
|
--- !u!1 &1274212127849608913
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
@ -215,7 +213,8 @@ RectTransform:
|
||||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||||
m_ConstrainProportionsScale: 0
|
m_ConstrainProportionsScale: 0
|
||||||
m_Children: []
|
m_Children:
|
||||||
|
- {fileID: 7835042658044891768}
|
||||||
m_Father: {fileID: 1078803496746026190}
|
m_Father: {fileID: 1078803496746026190}
|
||||||
m_RootOrder: 0
|
m_RootOrder: 0
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
|
@ -322,14 +321,15 @@ RectTransform:
|
||||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||||
m_ConstrainProportionsScale: 0
|
m_ConstrainProportionsScale: 0
|
||||||
m_Children: []
|
m_Children:
|
||||||
m_Father: {fileID: 1078803496746026190}
|
- {fileID: 8640685201192089303}
|
||||||
m_RootOrder: 1
|
m_Father: {fileID: 2527944883655481645}
|
||||||
|
m_RootOrder: 0
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0, y: 0}
|
m_AnchorMin: {x: 0, y: 0}
|
||||||
m_AnchorMax: {x: 1, y: 1}
|
m_AnchorMax: {x: 1, y: 1}
|
||||||
m_AnchoredPosition: {x: -814, y: -50}
|
m_AnchoredPosition: {x: 0, y: 0}
|
||||||
m_SizeDelta: {x: -1668, y: -140}
|
m_SizeDelta: {x: 0, y: 0}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &5615064996399791523
|
--- !u!222 &5615064996399791523
|
||||||
CanvasRenderer:
|
CanvasRenderer:
|
||||||
|
@ -473,7 +473,7 @@ RectTransform:
|
||||||
m_ConstrainProportionsScale: 0
|
m_ConstrainProportionsScale: 0
|
||||||
m_Children: []
|
m_Children: []
|
||||||
m_Father: {fileID: 1078803496746026190}
|
m_Father: {fileID: 1078803496746026190}
|
||||||
m_RootOrder: 3
|
m_RootOrder: 1
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 1, y: 1}
|
m_AnchorMin: {x: 1, y: 1}
|
||||||
m_AnchorMax: {x: 1, y: 1}
|
m_AnchorMax: {x: 1, y: 1}
|
||||||
|
|
|
@ -68,8 +68,8 @@ MonoBehaviour:
|
||||||
m_Calls: []
|
m_Calls: []
|
||||||
m_text: "\u9676\u82CF\u5947"
|
m_text: "\u9676\u82CF\u5947"
|
||||||
m_isRightToLeft: 0
|
m_isRightToLeft: 0
|
||||||
m_fontAsset: {fileID: 11400000, guid: f8ef5cb2ab4d4da4093d3fe60f978c99, type: 2}
|
m_fontAsset: {fileID: 11400000, guid: 1c4004df1d65ff944b6e23e3af757df7, type: 2}
|
||||||
m_sharedMaterial: {fileID: -4829118149068189727, guid: f8ef5cb2ab4d4da4093d3fe60f978c99, type: 2}
|
m_sharedMaterial: {fileID: 1751944718996602668, guid: 1c4004df1d65ff944b6e23e3af757df7, type: 2}
|
||||||
m_fontSharedMaterials: []
|
m_fontSharedMaterials: []
|
||||||
m_fontMaterial: {fileID: 0}
|
m_fontMaterial: {fileID: 0}
|
||||||
m_fontMaterials: []
|
m_fontMaterials: []
|
||||||
|
|
|
@ -51,7 +51,7 @@ MonoBehaviour:
|
||||||
m_Name:
|
m_Name:
|
||||||
m_EditorClassIdentifier:
|
m_EditorClassIdentifier:
|
||||||
Step_Text: {fileID: 0}
|
Step_Text: {fileID: 0}
|
||||||
Step_Btn: {fileID: 1289757197091827501}
|
Step_Tog: {fileID: 0}
|
||||||
--- !u!1001 &2089264783224982108
|
--- !u!1001 &2089264783224982108
|
||||||
PrefabInstance:
|
PrefabInstance:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
@ -147,15 +147,72 @@ PrefabInstance:
|
||||||
propertyPath: m_Name
|
propertyPath: m_Name
|
||||||
value: Toggle
|
value: Toggle
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 1306552775554788202, guid: 41e9498c7db6ded41b7066567ccd59a1, type: 3}
|
||||||
|
propertyPath: m_AnchorMax.x
|
||||||
|
value: 1
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 1306552775554788202, guid: 41e9498c7db6ded41b7066567ccd59a1, type: 3}
|
||||||
|
propertyPath: m_AnchorMax.y
|
||||||
|
value: 1
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 1306552775554788202, guid: 41e9498c7db6ded41b7066567ccd59a1, type: 3}
|
||||||
|
propertyPath: m_AnchorMin.x
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 1306552775554788202, guid: 41e9498c7db6ded41b7066567ccd59a1, type: 3}
|
||||||
|
propertyPath: m_AnchorMin.y
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 1306552775554788202, guid: 41e9498c7db6ded41b7066567ccd59a1, type: 3}
|
||||||
|
propertyPath: m_SizeDelta.x
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 1306552775554788202, guid: 41e9498c7db6ded41b7066567ccd59a1, type: 3}
|
||||||
|
propertyPath: m_SizeDelta.y
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 1306552775554788202, guid: 41e9498c7db6ded41b7066567ccd59a1, type: 3}
|
||||||
|
propertyPath: m_AnchoredPosition.x
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 4998242105333091570, guid: 41e9498c7db6ded41b7066567ccd59a1, type: 3}
|
||||||
|
propertyPath: m_AnchorMax.x
|
||||||
|
value: 1
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 4998242105333091570, guid: 41e9498c7db6ded41b7066567ccd59a1, type: 3}
|
||||||
|
propertyPath: m_AnchorMin.y
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 4998242105333091570, guid: 41e9498c7db6ded41b7066567ccd59a1, type: 3}
|
||||||
|
propertyPath: m_SizeDelta.x
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 4998242105333091570, guid: 41e9498c7db6ded41b7066567ccd59a1, type: 3}
|
||||||
|
propertyPath: m_SizeDelta.y
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 4998242105333091570, guid: 41e9498c7db6ded41b7066567ccd59a1, type: 3}
|
||||||
|
propertyPath: m_AnchoredPosition.x
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 4998242105333091570, guid: 41e9498c7db6ded41b7066567ccd59a1, type: 3}
|
||||||
|
propertyPath: m_AnchoredPosition.y
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 6182105416291993448, guid: 41e9498c7db6ded41b7066567ccd59a1, type: 3}
|
- target: {fileID: 6182105416291993448, guid: 41e9498c7db6ded41b7066567ccd59a1, type: 3}
|
||||||
propertyPath: Step_Text
|
propertyPath: Step_Text
|
||||||
value:
|
value:
|
||||||
objectReference: {fileID: 41023103306623673}
|
objectReference: {fileID: 4469221108332849687}
|
||||||
m_RemovedComponents: []
|
m_RemovedComponents: []
|
||||||
m_SourcePrefab: {fileID: 100100000, guid: 41e9498c7db6ded41b7066567ccd59a1, type: 3}
|
m_SourcePrefab: {fileID: 100100000, guid: 41e9498c7db6ded41b7066567ccd59a1, type: 3}
|
||||||
--- !u!114 &41023103306623673 stripped
|
--- !u!224 &2198809122457756518 stripped
|
||||||
|
RectTransform:
|
||||||
|
m_CorrespondingSourceObject: {fileID: 179355083306199354, guid: 41e9498c7db6ded41b7066567ccd59a1, type: 3}
|
||||||
|
m_PrefabInstance: {fileID: 2089264783224982108}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
--- !u!114 &4469221108332849687 stripped
|
||||||
MonoBehaviour:
|
MonoBehaviour:
|
||||||
m_CorrespondingSourceObject: {fileID: 2048910281777029349, guid: 41e9498c7db6ded41b7066567ccd59a1, type: 3}
|
m_CorrespondingSourceObject: {fileID: 2520700412311412811, guid: 41e9498c7db6ded41b7066567ccd59a1, type: 3}
|
||||||
m_PrefabInstance: {fileID: 2089264783224982108}
|
m_PrefabInstance: {fileID: 2089264783224982108}
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
m_GameObject: {fileID: 0}
|
m_GameObject: {fileID: 0}
|
||||||
|
@ -164,19 +221,3 @@ MonoBehaviour:
|
||||||
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
|
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
|
||||||
m_Name:
|
m_Name:
|
||||||
m_EditorClassIdentifier:
|
m_EditorClassIdentifier:
|
||||||
--- !u!114 &1289757197091827501 stripped
|
|
||||||
MonoBehaviour:
|
|
||||||
m_CorrespondingSourceObject: {fileID: 943693334150554993, guid: 41e9498c7db6ded41b7066567ccd59a1, type: 3}
|
|
||||||
m_PrefabInstance: {fileID: 2089264783224982108}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
m_GameObject: {fileID: 0}
|
|
||||||
m_Enabled: 1
|
|
||||||
m_EditorHideFlags: 0
|
|
||||||
m_Script: {fileID: 11500000, guid: 9085046f02f69544eb97fd06b6048fe2, type: 3}
|
|
||||||
m_Name:
|
|
||||||
m_EditorClassIdentifier:
|
|
||||||
--- !u!224 &2198809122457756518 stripped
|
|
||||||
RectTransform:
|
|
||||||
m_CorrespondingSourceObject: {fileID: 179355083306199354, guid: 41e9498c7db6ded41b7066567ccd59a1, type: 3}
|
|
||||||
m_PrefabInstance: {fileID: 2089264783224982108}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -16,7 +16,7 @@ public class UI_StepsPanelItem : BaseItem
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public Toggle Step_Tog;
|
public Toggle Step_Tog;
|
||||||
|
|
||||||
private ToggleGroup toggleGroup;
|
public ToggleGroup toggleGroup;
|
||||||
|
|
||||||
public void Init(string LabelDate)
|
public void Init(string LabelDate)
|
||||||
{
|
{
|
||||||
|
|
|
@ -82,10 +82,6 @@ public class UI_ContentPanel : BasePanel
|
||||||
}
|
}
|
||||||
public void fizhi()
|
public void fizhi()
|
||||||
{
|
{
|
||||||
//for (int i = 0; i < Tips.Count; i++)
|
|
||||||
//{
|
|
||||||
// ContentText.text += Tips[i];
|
|
||||||
//}
|
|
||||||
ContentText.text = Tips;
|
ContentText.text = Tips;
|
||||||
}
|
}
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
|
|
@ -44,8 +44,9 @@ public class UI_StepsPanel : BasePanel
|
||||||
var item = Instantiate(StepsItem, StepsContent);
|
var item = Instantiate(StepsItem, StepsContent);
|
||||||
item.Init(pptFile.fileName);
|
item.Init(pptFile.fileName);
|
||||||
var buttonText = item.GetComponentInChildren<TextMeshProUGUI>();
|
var buttonText = item.GetComponentInChildren<TextMeshProUGUI>();
|
||||||
Toggle button = item.GetComponentInChildren<Toggle>();
|
Toggle toggle = item.GetComponentInChildren<Toggle>();
|
||||||
button.name = pptFile.fileName;
|
toggle.name = pptFile.fileName;
|
||||||
|
toggle.isOn = false;
|
||||||
if (buttonText != null)
|
if (buttonText != null)
|
||||||
{
|
{
|
||||||
buttonText.text = $"{pptFile.fileName}";
|
buttonText.text = $"{pptFile.fileName}";
|
||||||
|
@ -58,12 +59,20 @@ public class UI_StepsPanel : BasePanel
|
||||||
public override async void ShowMe(int time = 0)
|
public override async void ShowMe(int time = 0)
|
||||||
{
|
{
|
||||||
base.ShowMe();
|
base.ShowMe();
|
||||||
|
|
||||||
await ToolManager.CanvasFadeIn(canvasGroup, 0.5f);
|
await ToolManager.CanvasFadeIn(canvasGroup, 0.5f);
|
||||||
}
|
}
|
||||||
|
|
||||||
public override async void HideMe(int time = 0)
|
public override async void HideMe(int time = 0)
|
||||||
{
|
{
|
||||||
base.HideMe();
|
base.HideMe();
|
||||||
|
Toggle[] toggles = StepsContent.GetComponentsInChildren<Toggle>();
|
||||||
|
foreach (var toggle in toggles)
|
||||||
|
{
|
||||||
|
toggle.isOn = false;
|
||||||
|
}
|
||||||
|
ToggleGroup toggleGroup = StepsContent.GetComponent<ToggleGroup>();
|
||||||
|
toggleGroup.enabled = false;
|
||||||
await ToolManager.CanvasFadeOut(canvasGroup, 0.5f);
|
await ToolManager.CanvasFadeOut(canvasGroup, 0.5f);
|
||||||
}
|
}
|
||||||
protected override async void OnClick(string btnName)
|
protected override async void OnClick(string btnName)
|
||||||
|
@ -93,7 +102,6 @@ public class UI_StepsPanel : BasePanel
|
||||||
Bootstrap.Instance.eventCenter.EventTrigger(Enum_EventType.Íϳµ, false);
|
Bootstrap.Instance.eventCenter.EventTrigger(Enum_EventType.Íϳµ, false);
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
});
|
});
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
|
|
|
@ -6,27 +6,30 @@ EditorUserSettings:
|
||||||
serializedVersion: 4
|
serializedVersion: 4
|
||||||
m_ConfigSettings:
|
m_ConfigSettings:
|
||||||
RecentlyUsedSceneGuid-0:
|
RecentlyUsedSceneGuid-0:
|
||||||
value: 5452075006075b5f540c5c77497706444f4e4d2b2d7e27677d2b4b30b5b8316d
|
|
||||||
flags: 0
|
|
||||||
RecentlyUsedSceneGuid-1:
|
|
||||||
value: 5006505e5c0c0a5e0e0b5a2746220b44174e1d292d7b74617c2b196be0b66168
|
|
||||||
flags: 0
|
|
||||||
RecentlyUsedSceneGuid-2:
|
|
||||||
value: 5754060550000c5e59580a2348270d44434e1b782a7b7633747e1e30e4b5616b
|
|
||||||
flags: 0
|
|
||||||
RecentlyUsedSceneGuid-3:
|
|
||||||
value: 0609045307065a5d5a0d0874407b5944124f1e72787b2465287e1f36b0b8316f
|
|
||||||
flags: 0
|
|
||||||
RecentlyUsedSceneGuid-4:
|
|
||||||
value: 5400065054540b095f0b5c7511255b4447151e787a2b253628794c37e7b6676e
|
|
||||||
flags: 0
|
|
||||||
RecentlyUsedSceneGuid-5:
|
|
||||||
value: 0004025352565f0d0c0d5827167b09444f4f1c282a7877677b704536b6b36c6d
|
|
||||||
flags: 0
|
|
||||||
RecentlyUsedSceneGuid-6:
|
|
||||||
value: 55085253045108025c56097646265e44124f4f7b7e7a76312c2f4960e6b1363d
|
value: 55085253045108025c56097646265e44124f4f7b7e7a76312c2f4960e6b1363d
|
||||||
flags: 0
|
flags: 0
|
||||||
|
RecentlyUsedSceneGuid-1:
|
||||||
|
value: 5400065054540b095f0b5c7511255b4447151e787a2b253628794c37e7b6676e
|
||||||
|
flags: 0
|
||||||
|
RecentlyUsedSceneGuid-2:
|
||||||
|
value: 0004025352565f0d0c0d5827167b09444f4f1c282a7877677b704536b6b36c6d
|
||||||
|
flags: 0
|
||||||
|
RecentlyUsedSceneGuid-3:
|
||||||
|
value: 5452075006075b5f540c5c77497706444f4e4d2b2d7e27677d2b4b30b5b8316d
|
||||||
|
flags: 0
|
||||||
|
RecentlyUsedSceneGuid-4:
|
||||||
|
value: 0609045307065a5d5a0d0874407b5944124f1e72787b2465287e1f36b0b8316f
|
||||||
|
flags: 0
|
||||||
|
RecentlyUsedSceneGuid-5:
|
||||||
|
value: 5006505e5c0c0a5e0e0b5a2746220b44174e1d292d7b74617c2b196be0b66168
|
||||||
|
flags: 0
|
||||||
|
RecentlyUsedSceneGuid-6:
|
||||||
|
value: 5754060550000c5e59580a2348270d44434e1b782a7b7633747e1e30e4b5616b
|
||||||
|
flags: 0
|
||||||
RecentlyUsedSceneGuid-7:
|
RecentlyUsedSceneGuid-7:
|
||||||
|
value: 5050060057055a0a55575f761576594442151e7e7c79233429784f32b2e3673b
|
||||||
|
flags: 0
|
||||||
|
RecentlyUsedSceneGuid-8:
|
||||||
value: 5a5757560101590a5d0c0e24427b5d44434e4c7a7b7a23677f2b4565b7b5353a
|
value: 5a5757560101590a5d0c0e24427b5d44434e4c7a7b7a23677f2b4565b7b5353a
|
||||||
flags: 0
|
flags: 0
|
||||||
vcSharedLogLevel:
|
vcSharedLogLevel:
|
||||||
|
|
|
@ -14,9 +14,9 @@ MonoBehaviour:
|
||||||
m_EditorClassIdentifier:
|
m_EditorClassIdentifier:
|
||||||
m_Children:
|
m_Children:
|
||||||
- {fileID: 3}
|
- {fileID: 3}
|
||||||
- {fileID: 8}
|
- {fileID: 9}
|
||||||
- {fileID: 10}
|
- {fileID: 11}
|
||||||
- {fileID: 12}
|
- {fileID: 13}
|
||||||
m_Position:
|
m_Position:
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
x: 0
|
x: 0
|
||||||
|
@ -26,7 +26,7 @@ MonoBehaviour:
|
||||||
m_MinSize: {x: 400, y: 200}
|
m_MinSize: {x: 400, y: 200}
|
||||||
m_MaxSize: {x: 32384, y: 16192}
|
m_MaxSize: {x: 32384, y: 16192}
|
||||||
vertical: 0
|
vertical: 0
|
||||||
controlID: 38455
|
controlID: 117
|
||||||
--- !u!114 &2
|
--- !u!114 &2
|
||||||
MonoBehaviour:
|
MonoBehaviour:
|
||||||
m_ObjectHideFlags: 52
|
m_ObjectHideFlags: 52
|
||||||
|
@ -48,9 +48,9 @@ MonoBehaviour:
|
||||||
m_Pos:
|
m_Pos:
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
x: 2560
|
x: 2560
|
||||||
y: 595
|
y: 787
|
||||||
width: 1085
|
width: 957
|
||||||
height: 404
|
height: 212
|
||||||
m_ViewDataDictionary: {fileID: 0}
|
m_ViewDataDictionary: {fileID: 0}
|
||||||
m_OverlayCanvas:
|
m_OverlayCanvas:
|
||||||
m_LastAppliedPresetName: Default
|
m_LastAppliedPresetName: Default
|
||||||
|
@ -98,23 +98,23 @@ MonoBehaviour:
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
x: 0
|
x: 0
|
||||||
y: 21
|
y: 21
|
||||||
width: 1085
|
width: 957
|
||||||
height: 383
|
height: 191
|
||||||
m_Scale: {x: 0.35462964, y: 0.35462964}
|
m_Scale: {x: 0.17685184, y: 0.17685185}
|
||||||
m_Translation: {x: 542.5, y: 191.5}
|
m_Translation: {x: 478.49997, y: 95.5}
|
||||||
m_MarginLeft: 0
|
m_MarginLeft: 0
|
||||||
m_MarginRight: 0
|
m_MarginRight: 0
|
||||||
m_MarginTop: 0
|
m_MarginTop: 0
|
||||||
m_MarginBottom: 0
|
m_MarginBottom: 0
|
||||||
m_LastShownAreaInsideMargins:
|
m_LastShownAreaInsideMargins:
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
x: -1529.765
|
x: -2705.6545
|
||||||
y: -540
|
y: -540
|
||||||
width: 3059.53
|
width: 5411.309
|
||||||
height: 1080
|
height: 1080
|
||||||
m_MinimalGUI: 1
|
m_MinimalGUI: 1
|
||||||
m_defaultScale: 0.35462964
|
m_defaultScale: 0.17685185
|
||||||
m_LastWindowPixelSize: {x: 1085, y: 404}
|
m_LastWindowPixelSize: {x: 957, y: 212}
|
||||||
m_ClearInEditMode: 1
|
m_ClearInEditMode: 1
|
||||||
m_NoCameraWarning: 1
|
m_NoCameraWarning: 1
|
||||||
m_LowResolutionForAspectRatios: 01000000000000000000
|
m_LowResolutionForAspectRatios: 01000000000000000000
|
||||||
|
@ -139,12 +139,12 @@ MonoBehaviour:
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
x: 0
|
x: 0
|
||||||
y: 0
|
y: 0
|
||||||
width: 1086
|
width: 958
|
||||||
height: 947
|
height: 947
|
||||||
m_MinSize: {x: 100, y: 200}
|
m_MinSize: {x: 100, y: 200}
|
||||||
m_MaxSize: {x: 8096, y: 16192}
|
m_MaxSize: {x: 8096, y: 16192}
|
||||||
vertical: 1
|
vertical: 1
|
||||||
controlID: 38456
|
controlID: 118
|
||||||
--- !u!114 &4
|
--- !u!114 &4
|
||||||
MonoBehaviour:
|
MonoBehaviour:
|
||||||
m_ObjectHideFlags: 52
|
m_ObjectHideFlags: 52
|
||||||
|
@ -162,16 +162,16 @@ MonoBehaviour:
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
x: 0
|
x: 0
|
||||||
y: 0
|
y: 0
|
||||||
width: 1086
|
width: 958
|
||||||
height: 522
|
height: 714
|
||||||
m_MinSize: {x: 201, y: 221}
|
m_MinSize: {x: 200, y: 200}
|
||||||
m_MaxSize: {x: 4001, y: 4021}
|
m_MaxSize: {x: 4000, y: 4000}
|
||||||
m_ActualView: {fileID: 5}
|
m_ActualView: {fileID: 5}
|
||||||
m_Panes:
|
m_Panes:
|
||||||
- {fileID: 5}
|
- {fileID: 5}
|
||||||
- {fileID: 6}
|
- {fileID: 6}
|
||||||
m_Selected: 0
|
m_Selected: 0
|
||||||
m_LastSelected: 1
|
m_LastSelected: 0
|
||||||
--- !u!114 &5
|
--- !u!114 &5
|
||||||
MonoBehaviour:
|
MonoBehaviour:
|
||||||
m_ObjectHideFlags: 52
|
m_ObjectHideFlags: 52
|
||||||
|
@ -194,8 +194,8 @@ MonoBehaviour:
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
x: 2560
|
x: 2560
|
||||||
y: 73
|
y: 73
|
||||||
width: 1085
|
width: 957
|
||||||
height: 501
|
height: 693
|
||||||
m_ViewDataDictionary: {fileID: 0}
|
m_ViewDataDictionary: {fileID: 0}
|
||||||
m_OverlayCanvas:
|
m_OverlayCanvas:
|
||||||
m_LastAppliedPresetName: Default
|
m_LastAppliedPresetName: Default
|
||||||
|
@ -271,7 +271,7 @@ MonoBehaviour:
|
||||||
floating: 0
|
floating: 0
|
||||||
collapsed: 0
|
collapsed: 0
|
||||||
displayed: 1
|
displayed: 1
|
||||||
snapOffset: {x: 67.5, y: 86}
|
snapOffset: {x: 67.5, y: 11}
|
||||||
snapOffsetDelta: {x: 0, y: 0}
|
snapOffsetDelta: {x: 0, y: 0}
|
||||||
snapCorner: 0
|
snapCorner: 0
|
||||||
id: Orientation
|
id: Orientation
|
||||||
|
@ -431,9 +431,9 @@ MonoBehaviour:
|
||||||
m_PlayAudio: 0
|
m_PlayAudio: 0
|
||||||
m_AudioPlay: 0
|
m_AudioPlay: 0
|
||||||
m_Position:
|
m_Position:
|
||||||
m_Target: {x: 0.413744, y: 1.5585266, z: -8.855864}
|
m_Target: {x: -80.25846, y: 1.4750866, z: 13.238115}
|
||||||
speed: 2
|
speed: 2
|
||||||
m_Value: {x: 0.413744, y: 1.5585266, z: -8.855864}
|
m_Value: {x: -80.25846, y: 1.4750866, z: 13.238115}
|
||||||
m_RenderMode: 0
|
m_RenderMode: 0
|
||||||
m_CameraMode:
|
m_CameraMode:
|
||||||
drawMode: 0
|
drawMode: 0
|
||||||
|
@ -462,9 +462,9 @@ MonoBehaviour:
|
||||||
m_Size: {x: 0, y: 0}
|
m_Size: {x: 0, y: 0}
|
||||||
yGrid:
|
yGrid:
|
||||||
m_Fade:
|
m_Fade:
|
||||||
m_Target: 1
|
m_Target: 0
|
||||||
speed: 2
|
speed: 2
|
||||||
m_Value: 1
|
m_Value: 0
|
||||||
m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4}
|
m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4}
|
||||||
m_Pivot: {x: 0, y: 0, z: 0}
|
m_Pivot: {x: 0, y: 0, z: 0}
|
||||||
m_Size: {x: 1, y: 1}
|
m_Size: {x: 1, y: 1}
|
||||||
|
@ -476,24 +476,24 @@ MonoBehaviour:
|
||||||
m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4}
|
m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4}
|
||||||
m_Pivot: {x: 0, y: 0, z: 0}
|
m_Pivot: {x: 0, y: 0, z: 0}
|
||||||
m_Size: {x: 1, y: 1}
|
m_Size: {x: 1, y: 1}
|
||||||
m_ShowGrid: 1
|
m_ShowGrid: 0
|
||||||
m_GridAxis: 1
|
m_GridAxis: 1
|
||||||
m_gridOpacity: 0.5
|
m_gridOpacity: 0.5
|
||||||
m_Rotation:
|
m_Rotation:
|
||||||
m_Target: {x: -0.043443494, y: 0.41116905, z: 0.019712692, w: 0.9103126}
|
m_Target: {x: 0.014600347, y: -0.698146, z: 0.015162865, w: 0.7156731}
|
||||||
speed: 2
|
speed: 2
|
||||||
m_Value: {x: -0.04344339, y: 0.41116807, z: 0.019712646, w: 0.91031045}
|
m_Value: {x: 0.014577303, y: -0.6992051, z: 0.015184453, w: 0.7146112}
|
||||||
m_Size:
|
m_Size:
|
||||||
m_Target: 3.21372
|
m_Target: 4.3437514
|
||||||
speed: 2
|
speed: 2
|
||||||
m_Value: 3.21372
|
m_Value: 4.548431
|
||||||
m_Ortho:
|
m_Ortho:
|
||||||
m_Target: 0
|
m_Target: 0
|
||||||
speed: 2
|
speed: 2
|
||||||
m_Value: 0
|
m_Value: 0
|
||||||
m_CameraSettings:
|
m_CameraSettings:
|
||||||
m_Speed: 1
|
m_Speed: 0.9652
|
||||||
m_SpeedNormalized: 0.5
|
m_SpeedNormalized: 0.48
|
||||||
m_SpeedMin: 0.01
|
m_SpeedMin: 0.01
|
||||||
m_SpeedMax: 2
|
m_SpeedMax: 2
|
||||||
m_EasingEnabled: 1
|
m_EasingEnabled: 1
|
||||||
|
@ -504,7 +504,7 @@ MonoBehaviour:
|
||||||
m_FarClip: 10000
|
m_FarClip: 10000
|
||||||
m_DynamicClip: 1
|
m_DynamicClip: 1
|
||||||
m_OcclusionCulling: 0
|
m_OcclusionCulling: 0
|
||||||
m_LastSceneViewRotation: {x: -0.043443494, y: 0.41116905, z: 0.019712692, w: 0.9103126}
|
m_LastSceneViewRotation: {x: 0.05496371, y: -0.9363174, z: 0.17352644, w: 0.30034402}
|
||||||
m_LastSceneViewOrtho: 0
|
m_LastSceneViewOrtho: 0
|
||||||
m_ReplacementShader: {fileID: 0}
|
m_ReplacementShader: {fileID: 0}
|
||||||
m_ReplacementString:
|
m_ReplacementString:
|
||||||
|
@ -573,17 +573,56 @@ MonoBehaviour:
|
||||||
m_Position:
|
m_Position:
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
x: 0
|
x: 0
|
||||||
y: 522
|
y: 714
|
||||||
width: 1086
|
width: 958
|
||||||
height: 425
|
height: 233
|
||||||
m_MinSize: {x: 201, y: 221}
|
m_MinSize: {x: 200, y: 200}
|
||||||
m_MaxSize: {x: 4001, y: 4021}
|
m_MaxSize: {x: 4000, y: 4000}
|
||||||
m_ActualView: {fileID: 2}
|
m_ActualView: {fileID: 2}
|
||||||
m_Panes:
|
m_Panes:
|
||||||
- {fileID: 2}
|
- {fileID: 2}
|
||||||
|
- {fileID: 8}
|
||||||
m_Selected: 0
|
m_Selected: 0
|
||||||
m_LastSelected: 0
|
m_LastSelected: 1
|
||||||
--- !u!114 &8
|
--- !u!114 &8
|
||||||
|
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: 11500000, guid: f817a38900380be47942905e17e7d39b, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
m_MinSize: {x: 100, y: 100}
|
||||||
|
m_MaxSize: {x: 4000, y: 4000}
|
||||||
|
m_TitleContent:
|
||||||
|
m_Text: Timeline
|
||||||
|
m_Image: {fileID: -9173288242387172643, guid: 0000000000000000d000000000000000, type: 0}
|
||||||
|
m_Tooltip:
|
||||||
|
m_Pos:
|
||||||
|
serializedVersion: 2
|
||||||
|
x: 2560
|
||||||
|
y: 609
|
||||||
|
width: 881
|
||||||
|
height: 390
|
||||||
|
m_ViewDataDictionary: {fileID: 0}
|
||||||
|
m_OverlayCanvas:
|
||||||
|
m_LastAppliedPresetName: Default
|
||||||
|
m_SaveData: []
|
||||||
|
m_OverlaysVisible: 1
|
||||||
|
m_Preferences:
|
||||||
|
editType: 0
|
||||||
|
timeReferenceMode: 0
|
||||||
|
m_LockTracker:
|
||||||
|
m_IsLocked: 0
|
||||||
|
m_SequenceHierarchy: {fileID: 0}
|
||||||
|
m_SequencePath:
|
||||||
|
m_SelectionRoot: 0
|
||||||
|
m_SubElements: []
|
||||||
|
--- !u!114 &9
|
||||||
MonoBehaviour:
|
MonoBehaviour:
|
||||||
m_ObjectHideFlags: 52
|
m_ObjectHideFlags: 52
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
@ -598,18 +637,18 @@ MonoBehaviour:
|
||||||
m_Children: []
|
m_Children: []
|
||||||
m_Position:
|
m_Position:
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
x: 1086
|
x: 958
|
||||||
y: 0
|
y: 0
|
||||||
width: 246
|
width: 197
|
||||||
height: 947
|
height: 947
|
||||||
m_MinSize: {x: 202, y: 221}
|
m_MinSize: {x: 200, y: 200}
|
||||||
m_MaxSize: {x: 4002, y: 4021}
|
m_MaxSize: {x: 4000, y: 4000}
|
||||||
m_ActualView: {fileID: 9}
|
m_ActualView: {fileID: 10}
|
||||||
m_Panes:
|
m_Panes:
|
||||||
- {fileID: 9}
|
- {fileID: 10}
|
||||||
m_Selected: 0
|
m_Selected: 0
|
||||||
m_LastSelected: 0
|
m_LastSelected: 0
|
||||||
--- !u!114 &9
|
--- !u!114 &10
|
||||||
MonoBehaviour:
|
MonoBehaviour:
|
||||||
m_ObjectHideFlags: 52
|
m_ObjectHideFlags: 52
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
@ -629,9 +668,9 @@ MonoBehaviour:
|
||||||
m_Tooltip:
|
m_Tooltip:
|
||||||
m_Pos:
|
m_Pos:
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
x: 3646
|
x: 3518
|
||||||
y: 73
|
y: 73
|
||||||
width: 244
|
width: 195
|
||||||
height: 926
|
height: 926
|
||||||
m_ViewDataDictionary: {fileID: 0}
|
m_ViewDataDictionary: {fileID: 0}
|
||||||
m_OverlayCanvas:
|
m_OverlayCanvas:
|
||||||
|
@ -641,9 +680,9 @@ MonoBehaviour:
|
||||||
m_SceneHierarchy:
|
m_SceneHierarchy:
|
||||||
m_TreeViewState:
|
m_TreeViewState:
|
||||||
scrollPos: {x: 0, y: 0}
|
scrollPos: {x: 0, y: 0}
|
||||||
m_SelectedIDs:
|
m_SelectedIDs: 225b0000
|
||||||
m_LastClickedID: 0
|
m_LastClickedID: 0
|
||||||
m_ExpandedIDs: d007fdff7208fdff7608fdff7e08fdff8808fdffe483fdff608efdff40abfdff72acfdff82acfdff84acfdff98c4fdff84c5fdffd4c5fdffd8c5fdffdcc5fdffe0c5fdffeac5fdff9cc6fdfff6dbfdff1c39feff2639feffe26afeffb074fefffe74feffdc8dfeff268ffeff5695feff6095feff6a95feff9295feff9895fefffa9cfefffe9cfeff0c9dfeff72a6feff7ca6feff86a6feffaea6feffb4a6feff1aaefeff1eaefeff22aefeff2caefefff4ffffff88d0000042d100002ad80000e80d0100
|
m_ExpandedIDs: 6a9effff36bdffff38bdffff1cd9ffff26d9ffff54e0ffff70edffffbcedffff0ceeffff5ceeffffc0eeffff38fbffff
|
||||||
m_RenameOverlay:
|
m_RenameOverlay:
|
||||||
m_UserAcceptedRename: 0
|
m_UserAcceptedRename: 0
|
||||||
m_Name:
|
m_Name:
|
||||||
|
@ -659,7 +698,7 @@ MonoBehaviour:
|
||||||
m_IsRenaming: 0
|
m_IsRenaming: 0
|
||||||
m_OriginalEventType: 11
|
m_OriginalEventType: 11
|
||||||
m_IsRenamingFilename: 0
|
m_IsRenamingFilename: 0
|
||||||
m_ClientGUIView: {fileID: 8}
|
m_ClientGUIView: {fileID: 9}
|
||||||
m_SearchString:
|
m_SearchString:
|
||||||
m_ExpandedScenes: []
|
m_ExpandedScenes: []
|
||||||
m_CurrenRootInstanceID: 0
|
m_CurrenRootInstanceID: 0
|
||||||
|
@ -667,7 +706,7 @@ MonoBehaviour:
|
||||||
m_IsLocked: 0
|
m_IsLocked: 0
|
||||||
m_CurrentSortingName: TransformSorting
|
m_CurrentSortingName: TransformSorting
|
||||||
m_WindowGUID: f1ab93efe301f1a4dac22a3d96f2c5b8
|
m_WindowGUID: f1ab93efe301f1a4dac22a3d96f2c5b8
|
||||||
--- !u!114 &10
|
--- !u!114 &11
|
||||||
MonoBehaviour:
|
MonoBehaviour:
|
||||||
m_ObjectHideFlags: 52
|
m_ObjectHideFlags: 52
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
@ -682,18 +721,18 @@ MonoBehaviour:
|
||||||
m_Children: []
|
m_Children: []
|
||||||
m_Position:
|
m_Position:
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
x: 1332
|
x: 1155
|
||||||
y: 0
|
y: 0
|
||||||
width: 239
|
width: 265
|
||||||
height: 947
|
height: 947
|
||||||
m_MinSize: {x: 232, y: 271}
|
m_MinSize: {x: 232, y: 271}
|
||||||
m_MaxSize: {x: 10002, y: 10021}
|
m_MaxSize: {x: 10002, y: 10021}
|
||||||
m_ActualView: {fileID: 11}
|
m_ActualView: {fileID: 12}
|
||||||
m_Panes:
|
m_Panes:
|
||||||
- {fileID: 11}
|
- {fileID: 12}
|
||||||
m_Selected: 0
|
m_Selected: 0
|
||||||
m_LastSelected: 0
|
m_LastSelected: 0
|
||||||
--- !u!114 &11
|
--- !u!114 &12
|
||||||
MonoBehaviour:
|
MonoBehaviour:
|
||||||
m_ObjectHideFlags: 52
|
m_ObjectHideFlags: 52
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
@ -713,9 +752,9 @@ MonoBehaviour:
|
||||||
m_Tooltip:
|
m_Tooltip:
|
||||||
m_Pos:
|
m_Pos:
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
x: 3892
|
x: 3715
|
||||||
y: 73
|
y: 73
|
||||||
width: 237
|
width: 263
|
||||||
height: 926
|
height: 926
|
||||||
m_ViewDataDictionary: {fileID: 0}
|
m_ViewDataDictionary: {fileID: 0}
|
||||||
m_OverlayCanvas:
|
m_OverlayCanvas:
|
||||||
|
@ -733,7 +772,7 @@ MonoBehaviour:
|
||||||
m_SkipHidden: 0
|
m_SkipHidden: 0
|
||||||
m_SearchArea: 1
|
m_SearchArea: 1
|
||||||
m_Folders:
|
m_Folders:
|
||||||
- Assets/Anim/TSQ
|
- Assets/Scenes
|
||||||
m_Globs: []
|
m_Globs: []
|
||||||
m_OriginalText:
|
m_OriginalText:
|
||||||
m_FilterByTypeIntersection: 0
|
m_FilterByTypeIntersection: 0
|
||||||
|
@ -749,7 +788,7 @@ MonoBehaviour:
|
||||||
scrollPos: {x: 0, y: 0}
|
scrollPos: {x: 0, y: 0}
|
||||||
m_SelectedIDs: be5a0000
|
m_SelectedIDs: be5a0000
|
||||||
m_LastClickedID: 23230
|
m_LastClickedID: 23230
|
||||||
m_ExpandedIDs: ffffffff00000000be5a0000c05a0000c25a0000c45a0000c65a0000c85a0000ce5a0000d45a0000d65a0000da5a0000dc5a0000de5a0000e05a0000545b0000565b0000585b00006e5b0000705b0000725b0000a45b0000b85b0000c25b0000385e0000345f0000586800002c7b0000e2d200002ee8000034e8000038e800003ae800003ee80000180a01001a0a010000ca9a3b
|
m_ExpandedIDs: 00000000665a0000685a00006a5a00006c5a00006e5a0000705a0000725a0000745a0000765a0000785a00007a5a00007c5a00007e5a0000805a0000825a0000845a0000865a0000885a00008a5a00008c5a00008e5a0000905a0000925a0000945a0000965a0000985a00009a5a00009c5a00009e5a0000
|
||||||
m_RenameOverlay:
|
m_RenameOverlay:
|
||||||
m_UserAcceptedRename: 0
|
m_UserAcceptedRename: 0
|
||||||
m_Name:
|
m_Name:
|
||||||
|
@ -774,10 +813,10 @@ MonoBehaviour:
|
||||||
m_Icon: {fileID: 0}
|
m_Icon: {fileID: 0}
|
||||||
m_ResourceFile:
|
m_ResourceFile:
|
||||||
m_AssetTreeState:
|
m_AssetTreeState:
|
||||||
scrollPos: {x: 0, y: 672}
|
scrollPos: {x: 0, y: 260}
|
||||||
m_SelectedIDs:
|
m_SelectedIDs: 225b0000
|
||||||
m_LastClickedID: 0
|
m_LastClickedID: 23330
|
||||||
m_ExpandedIDs: ffffffff00000000be5a0000c05a0000c25a0000c45a0000c65a0000c85a0000ce5a0000d45a0000d65a0000da5a0000dc5a0000de5a0000e05a0000545b0000565b0000585b00006e5b0000705b0000725b0000a45b0000b85b0000c25b0000385e0000345f0000586800002c7b0000e2d200002ee8000034e8000038e800003ae800003ee80000180a01001a0a010000ca9a3b
|
m_ExpandedIDs: ffffffff00000000665a0000685a00006a5a00006c5a00006e5a0000705a0000725a0000745a0000765a0000785a00007a5a00007c5a00007e5a0000805a0000825a0000845a0000865a0000885a00008a5a00008c5a00008e5a0000905a0000925a0000945a0000965a0000985a00009a5a00009c5a00009e5a0000
|
||||||
m_RenameOverlay:
|
m_RenameOverlay:
|
||||||
m_UserAcceptedRename: 0
|
m_UserAcceptedRename: 0
|
||||||
m_Name:
|
m_Name:
|
||||||
|
@ -793,7 +832,7 @@ MonoBehaviour:
|
||||||
m_IsRenaming: 0
|
m_IsRenaming: 0
|
||||||
m_OriginalEventType: 11
|
m_OriginalEventType: 11
|
||||||
m_IsRenamingFilename: 1
|
m_IsRenamingFilename: 1
|
||||||
m_ClientGUIView: {fileID: 10}
|
m_ClientGUIView: {fileID: 11}
|
||||||
m_SearchString:
|
m_SearchString:
|
||||||
m_CreateAssetUtility:
|
m_CreateAssetUtility:
|
||||||
m_EndAction: {fileID: 0}
|
m_EndAction: {fileID: 0}
|
||||||
|
@ -802,8 +841,8 @@ MonoBehaviour:
|
||||||
m_Icon: {fileID: 0}
|
m_Icon: {fileID: 0}
|
||||||
m_ResourceFile:
|
m_ResourceFile:
|
||||||
m_ListAreaState:
|
m_ListAreaState:
|
||||||
m_SelectedInstanceIDs:
|
m_SelectedInstanceIDs: 225b0000
|
||||||
m_LastClickedInstanceID: 0
|
m_LastClickedInstanceID: 23330
|
||||||
m_HadKeyboardFocusLastEvent: 0
|
m_HadKeyboardFocusLastEvent: 0
|
||||||
m_ExpandedInstanceIDs:
|
m_ExpandedInstanceIDs:
|
||||||
m_RenameOverlay:
|
m_RenameOverlay:
|
||||||
|
@ -821,7 +860,7 @@ MonoBehaviour:
|
||||||
m_IsRenaming: 0
|
m_IsRenaming: 0
|
||||||
m_OriginalEventType: 11
|
m_OriginalEventType: 11
|
||||||
m_IsRenamingFilename: 1
|
m_IsRenamingFilename: 1
|
||||||
m_ClientGUIView: {fileID: 0}
|
m_ClientGUIView: {fileID: 11}
|
||||||
m_CreateAssetUtility:
|
m_CreateAssetUtility:
|
||||||
m_EndAction: {fileID: 0}
|
m_EndAction: {fileID: 0}
|
||||||
m_InstanceID: 0
|
m_InstanceID: 0
|
||||||
|
@ -833,7 +872,7 @@ MonoBehaviour:
|
||||||
m_GridSize: 16
|
m_GridSize: 16
|
||||||
m_SkipHiddenPackages: 0
|
m_SkipHiddenPackages: 0
|
||||||
m_DirectoriesAreaWidth: 115
|
m_DirectoriesAreaWidth: 115
|
||||||
--- !u!114 &12
|
--- !u!114 &13
|
||||||
MonoBehaviour:
|
MonoBehaviour:
|
||||||
m_ObjectHideFlags: 52
|
m_ObjectHideFlags: 52
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
@ -848,18 +887,18 @@ MonoBehaviour:
|
||||||
m_Children: []
|
m_Children: []
|
||||||
m_Position:
|
m_Position:
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
x: 1571
|
x: 1420
|
||||||
y: 0
|
y: 0
|
||||||
width: 349
|
width: 500
|
||||||
height: 947
|
height: 947
|
||||||
m_MinSize: {x: 275, y: 50}
|
m_MinSize: {x: 275, y: 50}
|
||||||
m_MaxSize: {x: 4000, y: 4000}
|
m_MaxSize: {x: 4000, y: 4000}
|
||||||
m_ActualView: {fileID: 13}
|
m_ActualView: {fileID: 14}
|
||||||
m_Panes:
|
m_Panes:
|
||||||
- {fileID: 13}
|
- {fileID: 14}
|
||||||
m_Selected: 0
|
m_Selected: 0
|
||||||
m_LastSelected: 0
|
m_LastSelected: 0
|
||||||
--- !u!114 &13
|
--- !u!114 &14
|
||||||
MonoBehaviour:
|
MonoBehaviour:
|
||||||
m_ObjectHideFlags: 52
|
m_ObjectHideFlags: 52
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
@ -879,9 +918,9 @@ MonoBehaviour:
|
||||||
m_Tooltip:
|
m_Tooltip:
|
||||||
m_Pos:
|
m_Pos:
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
x: 4131
|
x: 3980
|
||||||
y: 73
|
y: 73
|
||||||
width: 348
|
width: 499
|
||||||
height: 926
|
height: 926
|
||||||
m_ViewDataDictionary: {fileID: 0}
|
m_ViewDataDictionary: {fileID: 0}
|
||||||
m_OverlayCanvas:
|
m_OverlayCanvas:
|
||||||
|
@ -891,7 +930,7 @@ MonoBehaviour:
|
||||||
m_ObjectsLockedBeforeSerialization: []
|
m_ObjectsLockedBeforeSerialization: []
|
||||||
m_InstanceIDsLockedBeforeSerialization:
|
m_InstanceIDsLockedBeforeSerialization:
|
||||||
m_PreviewResizer:
|
m_PreviewResizer:
|
||||||
m_CachedPref: -160
|
m_CachedPref: -300
|
||||||
m_ControlHash: -371814159
|
m_ControlHash: -371814159
|
||||||
m_PrefName: Preview_InspectorPreview
|
m_PrefName: Preview_InspectorPreview
|
||||||
m_LastInspectedObjectInstanceID: -1
|
m_LastInspectedObjectInstanceID: -1
|
||||||
|
|
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue