From 65142bc7d950f191569c2eb15af23eca8070d2b5 Mon Sep 17 00:00:00 2001 From: shenjianxing <”315615051@qq.com“> Date: Tue, 15 Apr 2025 11:00:04 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=B8=83=E5=B1=80=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Art/UIPrefab/UIBody3DInfo.prefab | 308 ++++++++++++++---- Assets/Art/UIPrefab/UIBody3DMenuTree.prefab | 265 ++++++++++----- Assets/Scripts/Controller/Body3DController.cs | 6 +- .../{Body3DOjbItem.cs => Body3DObjItem.cs} | 2 +- ...DOjbItem.cs.meta => Body3DObjItem.cs.meta} | 2 +- Assets/Scripts/Item/ObjectColorToggle.cs | 1 + Assets/Scripts/UI/UIBody3D.cs | 6 +- Assets/Scripts/UI/UIBody3DMenuTree.cs | 10 +- Assets/Scripts/UI/UIBody3DMouse.cs | 4 +- 9 files changed, 440 insertions(+), 164 deletions(-) rename Assets/Scripts/Item/{Body3DOjbItem.cs => Body3DObjItem.cs} (99%) rename Assets/Scripts/Item/{Body3DOjbItem.cs.meta => Body3DObjItem.cs.meta} (83%) diff --git a/Assets/Art/UIPrefab/UIBody3DInfo.prefab b/Assets/Art/UIPrefab/UIBody3DInfo.prefab index 3f99631f..9c8ce25f 100644 --- a/Assets/Art/UIPrefab/UIBody3DInfo.prefab +++ b/Assets/Art/UIPrefab/UIBody3DInfo.prefab @@ -400,6 +400,90 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &565962927355976499 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2488875995222938941} + - component: {fileID: 7265739179438804156} + - component: {fileID: 3843235397591578456} + m_Layer: 0 + m_Name: English + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2488875995222938941 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 565962927355976499} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 7981879368615679320} + m_Father: {fileID: 759228678538889935} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 285.7143, y: 0} + m_Pivot: {x: -0.00000013131648, y: 1.0000001} +--- !u!114 &7265739179438804156 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 565962927355976499} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreLayout: 0 + m_MinWidth: -1 + m_MinHeight: 25 + m_PreferredWidth: -1 + m_PreferredHeight: -1 + m_FlexibleWidth: -1 + m_FlexibleHeight: -1 + m_LayoutPriority: 1 +--- !u!114 &3843235397591578456 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 565962927355976499} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 0 + m_Spacing: 0 + m_ChildForceExpandWidth: 0 + m_ChildForceExpandHeight: 0 + m_ChildControlWidth: 1 + m_ChildControlHeight: 1 + m_ChildScaleWidth: 0 + m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 --- !u!1 &828211735444283824 GameObject: m_ObjectHideFlags: 0 @@ -674,9 +758,9 @@ RectTransform: m_Children: [] m_Father: {fileID: 8391117649223823481} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 45.3925, y: -12} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 23.595, y: 24} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5083076010271047650 @@ -885,10 +969,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 683708360215293002} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -10} - m_SizeDelta: {x: 0, y: 20} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &5301118011458687740 MonoBehaviour: @@ -945,8 +1029,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_IgnoreLayout: 0 - m_MinWidth: 10 - m_MinHeight: 20 + m_MinWidth: -1 + m_MinHeight: -1 m_PreferredWidth: -1 m_PreferredHeight: -1 m_FlexibleWidth: -1 @@ -1195,9 +1279,9 @@ RectTransform: m_Children: [] m_Father: {fileID: 8391117649223823481} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 11.7975, y: -12} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 23.595, y: 24} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1150501305223535458 @@ -2549,7 +2633,6 @@ GameObject: - component: {fileID: 4656773611662164356} - component: {fileID: 2175111693853719431} - component: {fileID: 8314907644925150971} - - component: {fileID: 96869165449857169} m_Layer: 0 m_Name: EnglishName m_TagString: Untagged @@ -2569,13 +2652,13 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 155804131736493909} + m_Father: {fileID: 2488875995222938941} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -45.9545} - m_SizeDelta: {x: 0, y: 22.327} - m_Pivot: {x: 0, y: 0.5} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0, y: 1.0000014} --- !u!222 &4656773611662164356 CanvasRenderer: m_ObjectHideFlags: 0 @@ -2604,7 +2687,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: adbcdfsdfds + m_text: m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 97936a7b3a86809479ac89371e95b079, type: 2} m_sharedMaterial: {fileID: 168401102475399263, guid: 97936a7b3a86809479ac89371e95b079, type: 2} @@ -2638,8 +2721,8 @@ MonoBehaviour: m_fontSizeMin: 18 m_fontSizeMax: 72 m_fontStyle: 0 - m_HorizontalAlignment: 2 - m_VerticalAlignment: 8192 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 256 m_textAlignment: 65535 m_characterSpacing: 0 m_wordSpacing: 0 @@ -2647,7 +2730,7 @@ MonoBehaviour: m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 0 + m_enableWordWrapping: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} @@ -2689,20 +2772,6 @@ MonoBehaviour: CustomComponentName: PartName CustomComment: mComponentName: TMPro.TextMeshProUGUI ---- !u!114 &96869165449857169 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5372680377939926057} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} - m_Name: - m_EditorClassIdentifier: - m_HorizontalFit: 2 - m_VerticalFit: 0 --- !u!1 &5616377736087547949 GameObject: m_ObjectHideFlags: 0 @@ -2856,6 +2925,7 @@ GameObject: - component: {fileID: 4459085572747613946} - component: {fileID: 4894733014413346296} - component: {fileID: 521060644256314275} + - component: {fileID: 8894686537104306955} m_Layer: 0 m_Name: ShowTip m_TagString: Untagged @@ -2876,12 +2946,12 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 6527817913563806369} - m_Father: {fileID: 155804131736493909} + m_Father: {fileID: 759228678538889935} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 1} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -30.8, y: -46.8} - m_SizeDelta: {x: 44.740295, y: 25.4561} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 44.740295, y: 0} m_Pivot: {x: 0.0000000037252903, y: 0.5} --- !u!114 &4894733014413346296 MonoBehaviour: @@ -2947,6 +3017,26 @@ MonoBehaviour: CustomComponentName: ShowTip CustomComment: mComponentName: UnityEngine.UI.Toggle +--- !u!114 &8894686537104306955 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6062610140246671523} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreLayout: 0 + m_MinWidth: -1 + m_MinHeight: 25 + m_PreferredWidth: -1 + m_PreferredHeight: -1 + m_FlexibleWidth: -1 + m_FlexibleHeight: -1 + m_LayoutPriority: 1 --- !u!1 &6219518439359118372 GameObject: m_ObjectHideFlags: 0 @@ -3115,10 +3205,10 @@ RectTransform: - {fileID: 1956754451667365408} m_Father: {fileID: 8633842398434044872} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 164.5, y: -22} - m_SizeDelta: {x: 309, y: 24} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2974486455411436671 MonoBehaviour: @@ -3279,8 +3369,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 32.504997, y: 112.60986} - m_SizeDelta: {x: 35.01, y: 20} + m_AnchoredPosition: {x: 32.504997, y: 107.39996} + m_SizeDelta: {x: 35.01, y: 19.61} m_Pivot: {x: 0.5, y: 1} --- !u!222 &8371822126990485976 CanvasRenderer: @@ -3514,10 +3604,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 8633842398434044872} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 9.999884, y: -5} - m_SizeDelta: {x: 309, y: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: -0.00000035762787, y: 0.9999998} --- !u!222 &7517546175823580742 CanvasRenderer: @@ -3667,10 +3757,10 @@ RectTransform: - {fileID: 8391117649223823481} m_Father: {fileID: 683708360215293002} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 159.5, y: -39.5} - m_SizeDelta: {x: 319, y: 39} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2694407354443588154 MonoBehaviour: @@ -3927,7 +4017,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &683708360215293002 RectTransform: m_ObjectHideFlags: 0 @@ -3944,10 +4034,10 @@ RectTransform: - {fileID: 8633842398434044872} m_Father: {fileID: 7693151069151688728} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 15, y: -60} - m_SizeDelta: {x: 319, y: 66} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 1} --- !u!114 &504216954137080686 MonoBehaviour: @@ -4029,9 +4119,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 9173910592677138117} - - {fileID: 7981879368615679320} - {fileID: 8408157997413573154} - - {fileID: 4459085572747613946} m_Father: {fileID: 7693151069151688728} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -4053,12 +4141,97 @@ MonoBehaviour: m_EditorClassIdentifier: m_IgnoreLayout: 0 m_MinWidth: -1 - m_MinHeight: 60 + m_MinHeight: 30 m_PreferredWidth: -1 m_PreferredHeight: -1 m_FlexibleWidth: -1 m_FlexibleHeight: -1 m_LayoutPriority: 1 +--- !u!1 &8039806695866159098 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 759228678538889935} + - component: {fileID: 1584537668168248385} + - component: {fileID: 6160535183075925944} + m_Layer: 0 + m_Name: Content1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &759228678538889935 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8039806695866159098} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 2488875995222938941} + - {fileID: 4459085572747613946} + m_Father: {fileID: 7693151069151688728} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0, y: 1.0000002} +--- !u!114 &1584537668168248385 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8039806695866159098} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreLayout: 0 + m_MinWidth: -1 + m_MinHeight: 25 + m_PreferredWidth: -1 + m_PreferredHeight: -1 + m_FlexibleWidth: -1 + m_FlexibleHeight: -1 + m_LayoutPriority: 1 +--- !u!114 &6160535183075925944 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8039806695866159098} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 0 + m_Spacing: 0 + m_ChildForceExpandWidth: 0 + m_ChildForceExpandHeight: 0 + m_ChildControlWidth: 0 + m_ChildControlHeight: 1 + m_ChildScaleWidth: 0 + m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 --- !u!1 &8138444107200053018 GameObject: m_ObjectHideFlags: 0 @@ -4093,8 +4266,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 17.505, y: -10} - m_SizeDelta: {x: 35.01, y: 19.58} + m_AnchoredPosition: {x: 17.505, y: -9.805} + m_SizeDelta: {x: 35.01, y: 19.61} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1941232802810836953 CanvasRenderer: @@ -4987,6 +5160,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 155804131736493909} + - {fileID: 759228678538889935} - {fileID: 683708360215293002} - {fileID: 6745244414475164830} m_Father: {fileID: 6827284989092321893} @@ -5068,7 +5242,7 @@ MonoBehaviour: m_Top: 0 m_Bottom: 0 m_ChildAlignment: 0 - m_Spacing: 0 + m_Spacing: 5 m_ChildForceExpandWidth: 1 m_ChildForceExpandHeight: 1 m_ChildControlWidth: 1 diff --git a/Assets/Art/UIPrefab/UIBody3DMenuTree.prefab b/Assets/Art/UIPrefab/UIBody3DMenuTree.prefab index 4f9b6b7e..dc0de950 100644 --- a/Assets/Art/UIPrefab/UIBody3DMenuTree.prefab +++ b/Assets/Art/UIPrefab/UIBody3DMenuTree.prefab @@ -167,7 +167,6 @@ GameObject: - component: {fileID: 7782795181188344123} - component: {fileID: 5862467672821994261} - component: {fileID: 6155718123906083107} - - component: {fileID: 1595973955772534620} m_Layer: 0 m_Name: Obj m_TagString: Untagged @@ -189,13 +188,13 @@ RectTransform: m_Children: - {fileID: 5503371958645181754} - {fileID: 297402643342089262} - m_Father: {fileID: 8210640918603572963} + m_Father: {fileID: 869141664238722769} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 8, y: -20.5} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -8, y: 8} m_SizeDelta: {x: 16, y: 16} - m_Pivot: {x: 0.5, y: 0} + m_Pivot: {x: 0, y: 1} --- !u!222 &7782795181188344123 CanvasRenderer: m_ObjectHideFlags: 0 @@ -278,26 +277,6 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: [] ---- !u!114 &1595973955772534620 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 949679463227284732} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3} - m_Name: - m_EditorClassIdentifier: - m_IgnoreLayout: 0 - m_MinWidth: -1 - m_MinHeight: -1 - m_PreferredWidth: -1 - m_PreferredHeight: -1 - m_FlexibleWidth: -1 - m_FlexibleHeight: -1 - m_LayoutPriority: 1 --- !u!1 &2722814839769229341 GameObject: m_ObjectHideFlags: 0 @@ -373,6 +352,69 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &3229148716638904954 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6161269781192160508} + - component: {fileID: 8739180356652880207} + m_Layer: 0 + m_Name: Content + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6161269781192160508 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3229148716638904954} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 5340268679892522978} + m_Father: {fileID: 8210640918603572963} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 19.000092, y: -0.00008773804} + m_SizeDelta: {x: 214.8368, y: 44.81} + m_Pivot: {x: 0.00000042654574, y: 0.99999803} +--- !u!114 &8739180356652880207 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3229148716638904954} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 0 + m_Spacing: 0 + m_ChildForceExpandWidth: 0 + m_ChildForceExpandHeight: 0 + m_ChildControlWidth: 1 + m_ChildControlHeight: 1 + m_ChildScaleWidth: 0 + m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 --- !u!1 &3696962679846350525 GameObject: m_ObjectHideFlags: 0 @@ -852,13 +894,13 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 8210640918603572963} + m_Father: {fileID: 6161269781192160508} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.5} - m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: -3.605301, y: -0.5} - m_SizeDelta: {x: -28.1053, y: 25} - m_Pivot: {x: 1, y: 0.5} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: -0.00012198532, y: -0.0000019073486} + m_SizeDelta: {x: 214.8368, y: 44.81} + m_Pivot: {x: -0.00000039022416, y: 1.0000007} --- !u!222 &2434280737762913979 CanvasRenderer: m_ObjectHideFlags: 0 @@ -887,7 +929,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: "\u76AE\u80A4111111111111111111111111111111111111111111111111111111111111111111" + m_text: 123123123123123123123123123213123123123123123 m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 97936a7b3a86809479ac89371e95b079, type: 2} m_sharedMaterial: {fileID: 168401102475399263, guid: 97936a7b3a86809479ac89371e95b079, type: 2} @@ -922,7 +964,7 @@ MonoBehaviour: m_fontSizeMax: 72 m_fontStyle: 0 m_HorizontalAlignment: 1 - m_VerticalAlignment: 8192 + m_VerticalAlignment: 256 m_textAlignment: 65535 m_characterSpacing: 0 m_wordSpacing: 0 @@ -1041,6 +1083,7 @@ GameObject: m_Component: - component: {fileID: 3302820038101660824} - component: {fileID: 7785875655137380336} + - component: {fileID: 5638211048947461519} m_Layer: 0 m_Name: UI m_TagString: Untagged @@ -1067,7 +1110,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 253.8368, y: -12.500002} + m_AnchoredPosition: {x: 248.8368, y: -12.500002} m_SizeDelta: {x: 30, y: 25} m_Pivot: {x: 0.5, y: 0.49999994} --- !u!114 &7785875655137380336 @@ -1118,6 +1161,26 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_IsOn: 0 +--- !u!114 &5638211048947461519 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5354740506987416701} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreLayout: 0 + m_MinWidth: -1 + m_MinHeight: 25 + m_PreferredWidth: -1 + m_PreferredHeight: -1 + m_FlexibleWidth: -1 + m_FlexibleHeight: -1 + m_LayoutPriority: 1 --- !u!1 &5527031013352946919 GameObject: m_ObjectHideFlags: 0 @@ -1127,7 +1190,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 8210640918603572963} - - component: {fileID: 5010247039725686606} + - component: {fileID: 7724077135976009204} m_Layer: 0 m_Name: Toggle m_TagString: Untagged @@ -1147,16 +1210,16 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 2319620796387874098} - - {fileID: 5340268679892522978} + - {fileID: 869141664238722769} + - {fileID: 6161269781192160508} m_Father: {fileID: 5541132694514040108} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 238.83678, y: -12.5} - m_SizeDelta: {x: 233.8368, y: 25} + m_AnchoredPosition: {x: 233.83678, y: -22.405} + m_SizeDelta: {x: 233.8368, y: 44.81} m_Pivot: {x: 0.9999999, y: 0.5} ---- !u!114 &5010247039725686606 +--- !u!114 &7724077135976009204 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1165,17 +1228,23 @@ MonoBehaviour: m_GameObject: {fileID: 5527031013352946919} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3} + m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3} m_Name: m_EditorClassIdentifier: - m_IgnoreLayout: 0 - m_MinWidth: -1 - m_MinHeight: 25 - m_PreferredWidth: -1 - m_PreferredHeight: -1 - m_FlexibleWidth: -1 - m_FlexibleHeight: -1 - m_LayoutPriority: 1 + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 0 + m_Spacing: 3 + m_ChildForceExpandWidth: 0 + m_ChildForceExpandHeight: 0 + m_ChildControlWidth: 1 + m_ChildControlHeight: 1 + m_ChildScaleWidth: 0 + m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 --- !u!1 &5622793159502486285 GameObject: m_ObjectHideFlags: 0 @@ -1478,7 +1547,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 150, y: -25} + m_AnchoredPosition: {x: 150, y: -44.81} m_SizeDelta: {x: 270, y: 0} m_Pivot: {x: 0.5, y: 0.9999995} --- !u!114 &3637385189413055796 @@ -1542,8 +1611,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 248.83678, y: -12.5} - m_SizeDelta: {x: 233.8368, y: 25} + m_AnchoredPosition: {x: 248.83678, y: -22.405} + m_SizeDelta: {x: 233.8368, y: 44.81} m_Pivot: {x: 0.9999999, y: 0.5} --- !u!114 &1686771592827446806 MonoBehaviour: @@ -1558,16 +1627,16 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Padding: - m_Left: 5 + m_Left: 0 m_Right: 0 m_Top: 0 m_Bottom: 0 - m_ChildAlignment: 3 + m_ChildAlignment: 0 m_Spacing: 0 m_ChildForceExpandWidth: 0 m_ChildForceExpandHeight: 0 m_ChildControlWidth: 0 - m_ChildControlHeight: 0 + m_ChildControlHeight: 1 m_ChildScaleWidth: 0 m_ChildScaleHeight: 0 m_ReverseArrangement: 0 @@ -2363,7 +2432,6 @@ GameObject: m_Component: - component: {fileID: 5301813403424701298} - component: {fileID: 73924022181984927} - - component: {fileID: 4349214342391091145} - component: {fileID: 7625664175940521788} m_Layer: 0 m_Name: Item @@ -2390,8 +2458,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 840.2999, y: 257.20715} - m_SizeDelta: {x: 290, y: 25} + m_AnchoredPosition: {x: 840.2999, y: 247.30215} + m_SizeDelta: {x: 290, y: 44.81} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &73924022181984927 MonoBehaviour: @@ -2409,26 +2477,6 @@ MonoBehaviour: CustomComponentName: Item CustomComment: mComponentName: RectTransform ---- !u!114 &4349214342391091145 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8135230732746195150} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3} - m_Name: - m_EditorClassIdentifier: - m_IgnoreLayout: 0 - m_MinWidth: -1 - m_MinHeight: -1 - m_PreferredWidth: -1 - m_PreferredHeight: 25 - m_FlexibleWidth: -1 - m_FlexibleHeight: -1 - m_LayoutPriority: 1 --- !u!114 &7625664175940521788 MonoBehaviour: m_ObjectHideFlags: 0 @@ -2642,7 +2690,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: MarkType: 0 - CustomComponentName: + CustomComponentName: RootContent CustomComment: mComponentName: RectTransform --- !u!1 &8280112074671649668 @@ -2708,6 +2756,63 @@ MonoBehaviour: m_ChildScaleWidth: 0 m_ChildScaleHeight: 0 m_ReverseArrangement: 0 +--- !u!1 &8315079446778039139 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 869141664238722769} + - component: {fileID: 7272137753141780079} + m_Layer: 0 + m_Name: ObjContent + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &869141664238722769 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8315079446778039139} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 2319620796387874098} + m_Father: {fileID: 8210640918603572963} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 9.091797, y: -0.000011444092} + m_SizeDelta: {x: 16, y: 25} + m_Pivot: {x: 0.5682373, y: 0.9999995} +--- !u!114 &7272137753141780079 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8315079446778039139} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreLayout: 0 + m_MinWidth: 16 + m_MinHeight: 25 + m_PreferredWidth: -1 + m_PreferredHeight: -1 + m_FlexibleWidth: -1 + m_FlexibleHeight: -1 + m_LayoutPriority: 1 --- !u!1 &8631974697840578735 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/Controller/Body3DController.cs b/Assets/Scripts/Controller/Body3DController.cs index e45fba1e..a9838d2d 100644 --- a/Assets/Scripts/Controller/Body3DController.cs +++ b/Assets/Scripts/Controller/Body3DController.cs @@ -19,7 +19,7 @@ public class Body3DController : MonoSingleton Body3DController() { } - Dictionary objs = new Dictionary(); + Dictionary objs = new Dictionary(); bool selectIsGroup = false; @@ -59,7 +59,7 @@ public class Body3DController : MonoSingleton isOnList.Add(selected.obj); UIBody3DInfoData data = new UIBody3DInfoData(); - data.body = selected.obj.GetComponent().body; + data.body = selected.obj.GetComponent().body; UIKit.OpenPanelAsync(UILevel.PopUI, data).ToAction().Start(this); } } @@ -217,7 +217,7 @@ public class Body3DController : MonoSingleton else { GameObject obj = Utility.FindObj(body.Path); - var bodyObjItem = obj.GetOrAddComponent(); + var bodyObjItem = obj.GetOrAddComponent(); bodyObjItem.Init(body); objs.Add(obj, bodyObjItem); } diff --git a/Assets/Scripts/Item/Body3DOjbItem.cs b/Assets/Scripts/Item/Body3DObjItem.cs similarity index 99% rename from Assets/Scripts/Item/Body3DOjbItem.cs rename to Assets/Scripts/Item/Body3DObjItem.cs index 9cde6fe1..65bcd8dc 100644 --- a/Assets/Scripts/Item/Body3DOjbItem.cs +++ b/Assets/Scripts/Item/Body3DObjItem.cs @@ -8,7 +8,7 @@ using UnityEditor; using UnityEngine; using XMLTool; -public class Body3DOjbItem : MonoBehaviour +public class Body3DObjItem : MonoBehaviour { public Body3D.Body body; diff --git a/Assets/Scripts/Item/Body3DOjbItem.cs.meta b/Assets/Scripts/Item/Body3DObjItem.cs.meta similarity index 83% rename from Assets/Scripts/Item/Body3DOjbItem.cs.meta rename to Assets/Scripts/Item/Body3DObjItem.cs.meta index 1f9fd3f8..fce2118c 100644 --- a/Assets/Scripts/Item/Body3DOjbItem.cs.meta +++ b/Assets/Scripts/Item/Body3DObjItem.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 297f30dc51736414695fa9fd6ad43dd6 +guid: b976f9a5699908b4895a6e33849930f3 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Scripts/Item/ObjectColorToggle.cs b/Assets/Scripts/Item/ObjectColorToggle.cs index 350f0501..3afb9571 100644 --- a/Assets/Scripts/Item/ObjectColorToggle.cs +++ b/Assets/Scripts/Item/ObjectColorToggle.cs @@ -18,6 +18,7 @@ public class ObjectColorToggle : MonoBehaviour private void Awake() { mesh = gameObject.GetComponent(); + isOffColor = mesh.material.color; } public void SetColor(State state) diff --git a/Assets/Scripts/UI/UIBody3D.cs b/Assets/Scripts/UI/UIBody3D.cs index e84377a5..c316c4d0 100644 --- a/Assets/Scripts/UI/UIBody3D.cs +++ b/Assets/Scripts/UI/UIBody3D.cs @@ -442,11 +442,7 @@ namespace QFramework.Example foreach (var list in bodyList) { var body = list.Value; - //var add = GameObject.Instantiate(BodyBtn.gameObject, BodyList); - //var sub = GameObject.Instantiate(BodyBtn.gameObject, BodyList); - //add.transform.Find("Label").GetComponent().text = body.Name + "+"; - //sub.transform.Find("Label").GetComponent().text = body.Name + "-"; - //sub.name = add.name = body.Name; + Utility.FindObj(body.Path)?.SetActive(true); bodyListIndex.Add(body.Name, new BodyListItem() { index = 0, root = body }); bodyListIndex[body.Name].bodys.Clear(); foreach (var subList in body.subBody) diff --git a/Assets/Scripts/UI/UIBody3DMenuTree.cs b/Assets/Scripts/UI/UIBody3DMenuTree.cs index 48ecc22b..7c56fe43 100644 --- a/Assets/Scripts/UI/UIBody3DMenuTree.cs +++ b/Assets/Scripts/UI/UIBody3DMenuTree.cs @@ -258,8 +258,8 @@ namespace QFramework.Example toggleObj.name = body.Name; Toggle uiToggle = toggleObj.transform.Find("Content/UI").GetComponent(); - Button objBtn = toggleObj.transform.Find("Content/Toggle/Obj").GetComponent