From a10eea6e4ce647061813519d5b0ea496f29495b9 Mon Sep 17 00:00:00 2001
From: leonard Wu <364452445@qq.com>
Date: 星期四, 09 八月 2018 09:47:08 +0800
Subject: [PATCH] 同步最新svn内容
---
Assets/Editor/UIComponent/RichTextEditor.cs | 146 ++++++++++++++++++++++++------------------------
1 files changed, 73 insertions(+), 73 deletions(-)
diff --git a/Assets/Editor/UIComponent/RichTextEditor.cs b/Assets/Editor/UIComponent/RichTextEditor.cs
index 68a498d..7c10baf 100644
--- a/Assets/Editor/UIComponent/RichTextEditor.cs
+++ b/Assets/Editor/UIComponent/RichTextEditor.cs
@@ -1,73 +1,73 @@
-锘縰sing System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-using UnityEditor;
-[CustomEditor(typeof(RichText))]
-[CanEditMultipleObjects]
-public class RichTextEditor : UnityEditor.UI.TextEditor {
- private RichText m_Target;
- protected override void OnEnable()
- {
- base.OnEnable();
- if (target != null) {
- m_Target = target as RichText;
- }
- }
-
- public override void OnInspectorGUI()
- {
- base.OnInspectorGUI();
- EditorGUILayout.BeginHorizontal();
- EditorGUILayout.LabelField("璇█琛╧ey",GUILayout.Width(60));
- m_Target.language = EditorGUILayout.Toggle(m_Target.language, GUILayout.Width(30));
- m_Target.enableDisplay = EditorGUILayout.TextField(m_Target.enableDisplay, GUILayout.Width(200));
- EditorGUILayout.EndHorizontal();
- EditorGUILayout.BeginHorizontal();
- m_Target.ImgDeltay = EditorGUILayout.FloatField("Image Delta Vertical", m_Target.ImgDeltay);
- EditorGUILayout.EndHorizontal();
- EditorGUILayout.BeginHorizontal();
- m_Target.UnlineDeltay = EditorGUILayout.FloatField("Unline Delta Vertical", m_Target.UnlineDeltay);
- EditorGUILayout.EndHorizontal();
- EditorGUILayout.BeginHorizontal();
- m_Target.UnlineHeight = EditorGUILayout.FloatField("Unline Height", m_Target.UnlineHeight);
- EditorGUILayout.EndHorizontal();
- EditorGUILayout.BeginHorizontal();
- m_Target.FaceSize = EditorGUILayout.FloatField("Face Size", m_Target.FaceSize);
- EditorGUILayout.EndHorizontal();
- EditorGUILayout.BeginHorizontal();
- m_Target.Unline = EditorGUILayout.Toggle("Unline", m_Target.Unline);
- EditorGUILayout.EndHorizontal();
- EditorGUILayout.BeginHorizontal();
- m_Target.HrefClick = EditorGUILayout.Toggle("Href Click", m_Target.HrefClick);
- EditorGUILayout.EndHorizontal();
- EditorGUILayout.BeginHorizontal();
- m_Target.AutoNewLine = EditorGUILayout.Toggle("Auto New Line", m_Target.AutoNewLine);
- EditorGUILayout.EndHorizontal();
- EditorGUILayout.BeginHorizontal();
- m_Target.LockImgSize = EditorGUILayout.Toggle("Lock Img Size", m_Target.LockImgSize);
- EditorGUILayout.EndHorizontal();
- if (m_Target.LockImgSize) {
- m_Target.ModifyImgSiez = false;
- }
- EditorGUILayout.BeginHorizontal();
- m_Target.ModifyImgSiez = EditorGUILayout.Toggle("Modify Img Size", m_Target.ModifyImgSiez);
- EditorGUILayout.EndHorizontal();
- if (m_Target.ModifyImgSiez) {
- m_Target.LockImgSize = false;
- EditorGUILayout.BeginHorizontal();
- m_Target.ModifyImgWidth = EditorGUILayout.FloatField("Modify Img Width", m_Target.ModifyImgWidth);
- EditorGUILayout.EndHorizontal();
- EditorGUILayout.BeginHorizontal();
- m_Target.ModifyImgHeight = EditorGUILayout.FloatField("Modify Img Height", m_Target.ModifyImgHeight);
- EditorGUILayout.EndHorizontal();
- }
- EditorGUILayout.BeginHorizontal();
- m_Target.colorType = (RichText.ColorType)EditorGUILayout.EnumPopup("Color Type", m_Target.colorType);
- EditorGUILayout.EndHorizontal();
- EditorGUILayout.BeginHorizontal();
- if (GUILayout.Button("ResetSize")) {
- m_Target.SetFitterSize();
- }
- EditorGUILayout.EndHorizontal();
- }
-}
+锘縰sing System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEditor;
+[CustomEditor(typeof(RichText))]
+[CanEditMultipleObjects]
+public class RichTextEditor : UnityEditor.UI.TextEditor {
+ private RichText m_Target;
+ protected override void OnEnable()
+ {
+ base.OnEnable();
+ if (target != null) {
+ m_Target = target as RichText;
+ }
+ }
+
+ public override void OnInspectorGUI()
+ {
+ base.OnInspectorGUI();
+ EditorGUILayout.BeginHorizontal();
+ EditorGUILayout.LabelField("璇█琛╧ey",GUILayout.Width(60));
+ m_Target.language = EditorGUILayout.Toggle(m_Target.language, GUILayout.Width(30));
+ m_Target.enableDisplay = EditorGUILayout.TextField(m_Target.enableDisplay, GUILayout.Width(200));
+ EditorGUILayout.EndHorizontal();
+ EditorGUILayout.BeginHorizontal();
+ m_Target.ImgDeltay = EditorGUILayout.FloatField("Image Delta Vertical", m_Target.ImgDeltay);
+ EditorGUILayout.EndHorizontal();
+ EditorGUILayout.BeginHorizontal();
+ m_Target.UnlineDeltay = EditorGUILayout.FloatField("Unline Delta Vertical", m_Target.UnlineDeltay);
+ EditorGUILayout.EndHorizontal();
+ EditorGUILayout.BeginHorizontal();
+ m_Target.UnlineHeight = EditorGUILayout.FloatField("Unline Height", m_Target.UnlineHeight);
+ EditorGUILayout.EndHorizontal();
+ EditorGUILayout.BeginHorizontal();
+ m_Target.FaceSize = EditorGUILayout.FloatField("Face Size", m_Target.FaceSize);
+ EditorGUILayout.EndHorizontal();
+ EditorGUILayout.BeginHorizontal();
+ m_Target.Unline = EditorGUILayout.Toggle("Unline", m_Target.Unline);
+ EditorGUILayout.EndHorizontal();
+ EditorGUILayout.BeginHorizontal();
+ m_Target.HrefClick = EditorGUILayout.Toggle("Href Click", m_Target.HrefClick);
+ EditorGUILayout.EndHorizontal();
+ EditorGUILayout.BeginHorizontal();
+ m_Target.AutoNewLine = EditorGUILayout.Toggle("Auto New Line", m_Target.AutoNewLine);
+ EditorGUILayout.EndHorizontal();
+ EditorGUILayout.BeginHorizontal();
+ m_Target.LockImgSize = EditorGUILayout.Toggle("Lock Img Size", m_Target.LockImgSize);
+ EditorGUILayout.EndHorizontal();
+ if (m_Target.LockImgSize) {
+ m_Target.ModifyImgSiez = false;
+ }
+ EditorGUILayout.BeginHorizontal();
+ m_Target.ModifyImgSiez = EditorGUILayout.Toggle("Modify Img Size", m_Target.ModifyImgSiez);
+ EditorGUILayout.EndHorizontal();
+ if (m_Target.ModifyImgSiez) {
+ m_Target.LockImgSize = false;
+ EditorGUILayout.BeginHorizontal();
+ m_Target.ModifyImgWidth = EditorGUILayout.FloatField("Modify Img Width", m_Target.ModifyImgWidth);
+ EditorGUILayout.EndHorizontal();
+ EditorGUILayout.BeginHorizontal();
+ m_Target.ModifyImgHeight = EditorGUILayout.FloatField("Modify Img Height", m_Target.ModifyImgHeight);
+ EditorGUILayout.EndHorizontal();
+ }
+ EditorGUILayout.BeginHorizontal();
+ m_Target.colorType = (RichText.ColorType)EditorGUILayout.EnumPopup("Color Type", m_Target.colorType);
+ EditorGUILayout.EndHorizontal();
+ EditorGUILayout.BeginHorizontal();
+ if (GUILayout.Button("ResetSize")) {
+ m_Target.SetFitterSize();
+ }
+ EditorGUILayout.EndHorizontal();
+ }
+}
--
Gitblit v1.8.0