diff --git a/Assets/Art/UIPrefab/UIVideo.prefab b/Assets/Art/UIPrefab/UIVideo.prefab index ba3278a8..5c43e6a2 100644 --- a/Assets/Art/UIPrefab/UIVideo.prefab +++ b/Assets/Art/UIPrefab/UIVideo.prefab @@ -282,8 +282,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 483, y: -233} - m_SizeDelta: {x: 792, y: 458} + m_AnchoredPosition: {x: 10, y: -19.5532} + m_SizeDelta: {x: 1784.2219, y: 800.9055} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3280565993990436441 CanvasRenderer: @@ -391,7 +391,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 5.7919, y: 0} + m_AnchoredPosition: {x: 5.79187, y: 0} m_SizeDelta: {x: -1.429, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &3356970918032840058 diff --git a/Assets/Scripts/Actions/ActionHelper.cs b/Assets/Scripts/Actions/ActionHelper.cs index 49a5a135..fe7162ac 100644 --- a/Assets/Scripts/Actions/ActionHelper.cs +++ b/Assets/Scripts/Actions/ActionHelper.cs @@ -29,6 +29,7 @@ public class ActionHelper { "UITextWindow", typeof(QFramework.Example.UITextWindow) }, { "UIKnowledge", typeof(QFramework.Example.UIKnowledge) }, + }; diff --git a/Assets/Scripts/UI/UITextWindow.cs b/Assets/Scripts/UI/UITextWindow.cs index 09206e5c..36c6931f 100644 --- a/Assets/Scripts/UI/UITextWindow.cs +++ b/Assets/Scripts/UI/UITextWindow.cs @@ -16,6 +16,9 @@ namespace QFramework.Example public List btns; public float scrollSpeed = 25; public string position; + public string vidoePath; + + } public partial class UITextWindow : UIPanel { @@ -86,6 +89,18 @@ namespace QFramework.Example Content.rectTransform.pivot = new Vector2(1, 0.5f); break; } + + + if (string.IsNullOrEmpty(mData.vidoePath)){ + + + + + } + else + { + + } } protected override void OnShow() @@ -99,5 +114,8 @@ namespace QFramework.Example protected override void OnClose() { } + + + } } diff --git a/Data/DeviceIcons/耗材/T管.png b/Data/DeviceIcons/耗材/T管.png deleted file mode 100644 index 1963454f..00000000 Binary files a/Data/DeviceIcons/耗材/T管.png and /dev/null differ diff --git a/Data/DeviceIcons/耗材/冲洗管.png b/Data/DeviceIcons/耗材/冲洗管.png deleted file mode 100644 index 47eaf3e8..00000000 Binary files a/Data/DeviceIcons/耗材/冲洗管.png and /dev/null differ diff --git a/Data/DeviceIcons/耗材/钢丝.png b/Data/DeviceIcons/耗材/钢丝.png deleted file mode 100644 index fac9c808..00000000 Binary files a/Data/DeviceIcons/耗材/钢丝.png and /dev/null differ diff --git a/Data/DeviceIcons/耗材/骨蜡.png b/Data/DeviceIcons/耗材/骨蜡.png deleted file mode 100644 index 82e6da26..00000000 Binary files a/Data/DeviceIcons/耗材/骨蜡.png and /dev/null differ diff --git a/Data/DeviceIcons/耗材/骨钉.png b/Data/DeviceIcons/耗材/骨钉.png deleted file mode 100644 index ed75f15d..00000000 Binary files a/Data/DeviceIcons/耗材/骨钉.png and /dev/null differ diff --git a/Data/DeviceIcons/药品/Vetwish软骨素.png b/Data/DeviceIcons/药品/Vetwish软骨素.png deleted file mode 100644 index 8f0cac54..00000000 Binary files a/Data/DeviceIcons/药品/Vetwish软骨素.png and /dev/null differ diff --git a/Data/DeviceIcons/药品/美洛昔康.png b/Data/DeviceIcons/药品/美洛昔康.png deleted file mode 100644 index c92c7f7c..00000000 Binary files a/Data/DeviceIcons/药品/美洛昔康.png and /dev/null differ diff --git a/Data/Video/跟镜头.mp4 b/Data/Video/GenJingTou.mp4 similarity index 100% rename from Data/Video/跟镜头.mp4 rename to Data/Video/GenJingTou.mp4 diff --git a/Data/Video/升降镜头.mp4 b/Data/Video/ShengJiangJingTou.mp4 similarity index 100% rename from Data/Video/升降镜头.mp4 rename to Data/Video/ShengJiangJingTou.mp4 diff --git a/Data/Video/推拉镜头.mp4 b/Data/Video/TuiLaJingTou.mp4 similarity index 100% rename from Data/Video/推拉镜头.mp4 rename to Data/Video/TuiLaJingTou.mp4 diff --git a/Data/Video/摇镜头.mp4 b/Data/Video/YaoJingTou.mp4 similarity index 100% rename from Data/Video/摇镜头.mp4 rename to Data/Video/YaoJingTou.mp4 diff --git a/Data/Video/移镜头.mp4 b/Data/Video/YiJingTou.mp4 similarity index 100% rename from Data/Video/移镜头.mp4 rename to Data/Video/YiJingTou.mp4 diff --git a/Data/Xml/01_ShiYanLiLunRenZhi.xml b/Data/Xml/01_ShiYanLiLunRenZhi.xml index a24ae1b8..eba3e33b 100644 --- a/Data/Xml/01_ShiYanLiLunRenZhi.xml +++ b/Data/Xml/01_ShiYanLiLunRenZhi.xml @@ -290,16 +290,14 @@ - - + - - + @@ -309,6 +307,13 @@ + + + + + + + @@ -459,11 +464,78 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Data/Xml/03_ChangJingXuNiPaiShe.xml b/Data/Xml/03_ChangJingXuNiPaiShe.xml index 0d447e05..fb525a0a 100644 --- a/Data/Xml/03_ChangJingXuNiPaiShe.xml +++ b/Data/Xml/03_ChangJingXuNiPaiShe.xml @@ -876,7 +876,10 @@ - + + + +