diff --git a/Assets/ArtRes/Excel/~$Config.xlsx.meta b/Assets/ArtRes/Excel/~$Config.xlsx.meta new file mode 100644 index 0000000..2eba619 --- /dev/null +++ b/Assets/ArtRes/Excel/~$Config.xlsx.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 584b3757d051d4944a9e1cb83beffc51 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/UI/UI_Panel/UI_SessionPanel.prefab b/Assets/Resources/UI/UI_Panel/UI_SessionPanel.prefab index ba025c3..58ed825 100644 --- a/Assets/Resources/UI/UI_Panel/UI_SessionPanel.prefab +++ b/Assets/Resources/UI/UI_Panel/UI_SessionPanel.prefab @@ -170,7 +170,7 @@ RectTransform: - {fileID: 5453439193897663608} - {fileID: 5001890668944408070} m_Father: {fileID: 2593408648689179035} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -670,6 +670,82 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &3789559043981016361 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5758481962013069149} + - component: {fileID: 2516523338400694245} + - component: {fileID: 4091787923074163020} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5758481962013069149 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3789559043981016361} + 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: [] + m_Father: {fileID: 2593408648689179035} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2516523338400694245 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3789559043981016361} + m_CullTransparentMesh: 1 +--- !u!114 &4091787923074163020 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3789559043981016361} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.3962264, g: 0.3962264, b: 0.3962264, a: 0.5372549} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!1 &4834804066783441266 GameObject: m_ObjectHideFlags: 0 @@ -1027,7 +1103,6 @@ GameObject: m_Component: - component: {fileID: 2593408648689179035} - component: {fileID: 4346064899636416077} - - component: {fileID: 4555239088814597165} - component: {fileID: 3836442360969627084} m_Layer: 5 m_Name: UI_SessionPanel @@ -1048,6 +1123,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: + - {fileID: 5758481962013069149} - {fileID: 5208013374104822997} - {fileID: 4665363756228182215} m_Father: {fileID: 0} @@ -1066,36 +1142,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6120619673790644657} m_CullTransparentMesh: 1 ---- !u!114 &4555239088814597165 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6120619673790644657} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 0.078431375} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 0} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 --- !u!114 &3836442360969627084 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1144,7 +1190,7 @@ RectTransform: - {fileID: 6053511819222047008} - {fileID: 8520013810554510674} m_Father: {fileID: 2593408648689179035} - m_RootOrder: 0 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} diff --git a/Assets/Resources/UI/UI_Panel/UI_ToolAndMaterialPanel.prefab b/Assets/Resources/UI/UI_Panel/UI_ToolAndMaterialPanel.prefab index 11d3d74..929a20f 100644 --- a/Assets/Resources/UI/UI_Panel/UI_ToolAndMaterialPanel.prefab +++ b/Assets/Resources/UI/UI_Panel/UI_ToolAndMaterialPanel.prefab @@ -1173,7 +1173,7 @@ RectTransform: - {fileID: 32001130} - {fileID: 645505820} m_Father: {fileID: 781378853607839230} - m_RootOrder: 0 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -1479,6 +1479,82 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &3582520780236771057 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3531298254047100302} + - component: {fileID: 6920107775206716397} + - component: {fileID: 5199455979539720812} + m_Layer: 5 + m_Name: BG + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3531298254047100302 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3582520780236771057} + 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: [] + m_Father: {fileID: 781378853607839230} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6920107775206716397 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3582520780236771057} + m_CullTransparentMesh: 1 +--- !u!114 &5199455979539720812 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3582520780236771057} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0, g: 0, b: 0, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!1 &4698313659037069781 GameObject: m_ObjectHideFlags: 0 @@ -1600,6 +1676,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: + - {fileID: 3531298254047100302} - {fileID: 1154338905} m_Father: {fileID: 0} m_RootOrder: 0 diff --git a/Assets/Scripts/Project/UI/UI_Panel/UI_SessionPanel.cs b/Assets/Scripts/Project/UI/UI_Panel/UI_SessionPanel.cs index 9fc8f03..8e46b88 100644 --- a/Assets/Scripts/Project/UI/UI_Panel/UI_SessionPanel.cs +++ b/Assets/Scripts/Project/UI/UI_Panel/UI_SessionPanel.cs @@ -29,6 +29,12 @@ public class UI_SessionPanel : BasePanel { } + + /// + /// 打字机 + /// + /// 需要显示文字 + /// IEnumerator Typing(string content) { GetControl(content).text = string.Empty; @@ -60,7 +66,6 @@ public class UI_SessionPanel : BasePanel if (GameManager.ProcessMgr.IsRightSubProcessStepsTriggerID(triggerID, true) == 0) { GameManager.UIMgr.HidePanel(); - //this.gameObject.SetActive(false); } break; //case "CloseBtn":