From 9834e66b4faaa667ad8c412feee06a9d2ec5141b Mon Sep 17 00:00:00 2001 From: fatiao <515948292@qq.com> Date: Wed, 28 Jan 2026 17:26:49 +0800 Subject: [PATCH] =?UTF-8?q?UIChat=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Content/Prefabs/UI/UIChat/UIChat.prefab | 426 +----------------- Assets/Lua/Config/StoryCfgV2.lua | 2 +- Assets/Lua/Config/StroyPerformCfgV2.lua | 198 ++++++-- Assets/Lua/UI/Common/ChatContentItemCtr.lua | 6 +- Assets/Lua/UI/UIChat/UIChatCtr.lua | 4 +- Assets/Lua/UI/UIChat/UIChatView.lua | 7 + Assets/Lua/UI/UIChat/UIChatView_Generate.lua | 47 +- 7 files changed, 218 insertions(+), 472 deletions(-) diff --git a/Assets/Content/Prefabs/UI/UIChat/UIChat.prefab b/Assets/Content/Prefabs/UI/UIChat/UIChat.prefab index 063d8e08a..e9d23292a 100644 --- a/Assets/Content/Prefabs/UI/UIChat/UIChat.prefab +++ b/Assets/Content/Prefabs/UI/UIChat/UIChat.prefab @@ -349,7 +349,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &4344963106621302123 RectTransform: m_ObjectHideFlags: 0 @@ -782,7 +782,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: 995, y: -55} + m_AnchoredPosition: {x: 1000, y: -55} m_SizeDelta: {x: 110, y: 110} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8986511759971440754 @@ -1972,103 +1972,6 @@ MonoBehaviour: depObjs: - {fileID: 2135412803285224665} activeType: 0 ---- !u!1 &596457386600974094 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2053156245887210062} - - component: {fileID: 8096039699871623684} - - component: {fileID: 3524978071127515536} - - component: {fileID: 949325677979200455} - m_Layer: 5 - m_Name: Placeholder - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &2053156245887210062 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 596457386600974094} - 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: 2324144477772799280} - 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.5} - m_SizeDelta: {x: -60, y: -13} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &8096039699871623684 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 596457386600974094} - m_CullTransparentMesh: 0 ---- !u!114 &3524978071127515536 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 596457386600974094} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ee125e9b69781314f885ad4a52df54f0, type: 3} - m_Name: - m_EditorClassIdentifier: - m_key: EnterText ---- !u!114 &949325677979200455 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 596457386600974094} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: c8e73a7817e684e4f91306440275a3f3, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.33333334, g: 0.36862746, b: 0.49803922, a: 0.7058824} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_FontData: - m_Font: {fileID: 12800000, guid: 90ed5292e87d8a64aac7038df97ece85, type: 3} - m_FontSize: 36 - m_FontStyle: 2 - m_BestFit: 0 - m_MinSize: 3 - m_MaxSize: 40 - m_Alignment: 3 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 1 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: "\u70B9\u51FB\u8F93\u5165\u804A\u5929\u5185\u5BB9\u2026" - m_ElementSegment: Default - m_MinLineHeight: 10 - m_LineAlignment: 2 - m_isCheckFontY: 0 --- !u!1 &597339486264567269 GameObject: m_ObjectHideFlags: 0 @@ -6874,8 +6777,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: 15, y: -55} - m_SizeDelta: {x: 30, y: 110} + m_AnchoredPosition: {x: 17.5, y: -55} + m_SizeDelta: {x: 35, y: 110} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &963421701068553075 MonoBehaviour: @@ -6892,7 +6795,7 @@ MonoBehaviour: m_IgnoreLayout: 0 m_MinWidth: -1 m_MinHeight: -1 - m_PreferredWidth: 30 + m_PreferredWidth: 35 m_PreferredHeight: 120 m_FlexibleWidth: -1 m_FlexibleHeight: -1 @@ -11866,7 +11769,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: 475, y: -55} + m_AnchoredPosition: {x: 480, y: -55} m_SizeDelta: {x: 890, y: 110} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2663353080488158893 @@ -11964,7 +11867,7 @@ MonoBehaviour: m_HideSoftKeyboard: 0 m_CharacterValidation: 0 m_RegexValue: - m_GlobalPointSize: 14 + m_GlobalPointSize: 36 m_CharacterLimit: 0 m_OnEndEdit: m_PersistentCalls: @@ -13532,8 +13435,8 @@ RectTransform: 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.5} - m_SizeDelta: {x: -20, y: -13} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: -60, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &8099161048634604871 MonoBehaviour: @@ -14011,8 +13914,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: 540, y: -445.16562} - m_SizeDelta: {x: 1080, y: 20} + m_AnchoredPosition: {x: 542.5, y: -445.16562} + m_SizeDelta: {x: 1085, y: 20} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &6709392507181134992 MonoBehaviour: @@ -15683,7 +15586,6 @@ RectTransform: - {fileID: 5443654504421461239} - {fileID: 2887355828120739855} - {fileID: 4276492762515034074} - - {fileID: 2324144477772799280} - {fileID: 2447618702217120531} - {fileID: 7564656927612199540} - {fileID: 5133991259270881799} @@ -15691,8 +15593,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: 540, y: -325.16562} - m_SizeDelta: {x: 1080, y: 110} + m_AnchoredPosition: {x: 542.5, y: -325.16562} + m_SizeDelta: {x: 1085, y: 110} m_Pivot: {x: 0.5, y: 1} --- !u!222 &352277351311299931 CanvasRenderer: @@ -17353,85 +17255,6 @@ MonoBehaviour: m_FlexibleWidth: -1 m_FlexibleHeight: -1 m_LayoutPriority: 1 ---- !u!1 &5620008075794037727 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5203408736077227839} - - component: {fileID: 608316353303357202} - - component: {fileID: 7836129596593172782} - m_Layer: 5 - m_Name: Text - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &5203408736077227839 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5620008075794037727} - 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: 2324144477772799280} - 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: 0, y: -0.5} - m_SizeDelta: {x: 830, y: 97} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &608316353303357202 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5620008075794037727} - m_CullTransparentMesh: 0 ---- !u!114 &7836129596593172782 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5620008075794037727} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.33333334, g: 0.36862746, b: 0.49803922, a: 1} - m_RaycastTarget: 0 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_FontData: - m_Font: {fileID: 12800000, guid: 90ed5292e87d8a64aac7038df97ece85, type: 3} - m_FontSize: 36 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 3 - m_MaxSize: 40 - m_Alignment: 3 - m_AlignByGeometry: 0 - m_RichText: 0 - m_HorizontalOverflow: 1 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: --- !u!1 &5632057781707597806 GameObject: m_ObjectHideFlags: 0 @@ -18520,8 +18343,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: 540, y: -315.16562} - m_SizeDelta: {x: 1080, y: 20} + m_AnchoredPosition: {x: 542.5, y: -315.16562} + m_SizeDelta: {x: 1085, y: 20} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &8654464418192984017 MonoBehaviour: @@ -18982,8 +18805,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: 540, y: -235.16562} - m_SizeDelta: {x: 1080, y: 70} + m_AnchoredPosition: {x: 542.5, y: -235.16562} + m_SizeDelta: {x: 1085, y: 70} m_Pivot: {x: 0.5, y: 1} --- !u!222 &8979287424350439848 CanvasRenderer: @@ -20189,7 +20012,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: 930, y: -55} + m_AnchoredPosition: {x: 935, y: -55} m_SizeDelta: {x: 20, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &134855504629057223 @@ -21574,7 +21397,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 540, y: -1920} - m_SizeDelta: {x: 1080, y: 455.16562} + m_SizeDelta: {x: 1085, y: 455.16562} m_Pivot: {x: 0.5, y: 0} --- !u!222 &6558254878286729536 CanvasRenderer: @@ -22136,7 +21959,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: 1065, y: -55} + m_AnchoredPosition: {x: 1070, y: -55} m_SizeDelta: {x: 30, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &763945214182808314 @@ -23652,215 +23475,6 @@ MonoBehaviour: depObjs: - {fileID: 2135412803285224665} activeType: 0 ---- !u!1 &8725913698409786357 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2324144477772799280} - - component: {fileID: 581999405352947220} - - component: {fileID: 1102491607383320130} - - component: {fileID: 325211018641875608} - - component: {fileID: 2460693136362327534} - - component: {fileID: 6417394646420874805} - - component: {fileID: 4626367230509715208} - m_Layer: 5 - m_Name: InputField_old - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!224 &2324144477772799280 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8725913698409786357} - 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: 2053156245887210062} - - {fileID: 5203408736077227839} - m_Father: {fileID: 8595863087761500023} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 1365, y: -55} - m_SizeDelta: {x: 890, y: 110} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &581999405352947220 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8725913698409786357} - m_CullTransparentMesh: 0 ---- !u!114 &1102491607383320130 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8725913698409786357} - 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: 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: 21300000, guid: 77b7610641625dc4e97741b2b852d7f2, type: 3} - m_Type: 1 - 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 &325211018641875608 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8725913698409786357} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 8759edc0b8b4b3d4aa8ffef2482e17ee, type: 3} - m_Name: - m_EditorClassIdentifier: - UIName: - keys: - - UnityEngine.RectTransform - - UnityEngine.CanvasRenderer - - UnityEngine.UI.Image - - UINode - - UnityEngine.UI.InputField - - AdapterKeyboardLayout - - UnityEngine.UI.LayoutElement - values: 00000000010000 - depObjs: - - {fileID: 6104690864815887471} - activeType: 0 ---- !u!114 &2460693136362327534 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8725913698409786357} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d199490a83bb2b844b9695cbf13b01ef, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - m_WrapAround: 0 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 1 - m_Colors: - m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} - m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} - m_ColorMultiplier: 1 - m_FadeDuration: 0.1 - m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_SelectedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_SelectedTrigger: Highlighted - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 1102491607383320130} - m_TextComponent: {fileID: 7836129596593172782} - m_Placeholder: {fileID: 949325677979200455} - m_ContentType: 0 - m_InputType: 0 - m_AsteriskChar: 42 - m_KeyboardType: 0 - m_LineType: 0 - m_HideMobileInput: 0 - m_CharacterValidation: 0 - m_CharacterLimit: 0 - m_OnSubmit: - m_PersistentCalls: - m_Calls: [] - m_OnDidEndEdit: - m_PersistentCalls: - m_Calls: [] - m_OnValueChanged: - m_PersistentCalls: - m_Calls: [] - m_CaretColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} - m_CustomCaretColor: 0 - m_SelectionColor: {r: 0.65882355, g: 0.80784315, b: 1, a: 0.7529412} - m_Text: - m_CaretBlinkRate: 0.85 - m_CaretWidth: 1 - m_ReadOnly: 0 - m_ShouldActivateOnSelect: 1 ---- !u!114 &6417394646420874805 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8725913698409786357} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: cf96adf96a1f0b743a7887132f5c95b1, type: 3} - m_Name: - m_EditorClassIdentifier: - m_InputField: {fileID: 2460693136362327534} - anchorTransform: {fileID: 2324144477772799280} - offsetTransform: {fileID: 5572854065065851145} ---- !u!114 &4626367230509715208 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8725913698409786357} - 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: 890 - m_PreferredHeight: 120 - m_FlexibleWidth: 1 - m_FlexibleHeight: -1 - m_LayoutPriority: 1 --- !u!1 &8742758173301083165 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Lua/Config/StoryCfgV2.lua b/Assets/Lua/Config/StoryCfgV2.lua index 902a62dcb..5503886ad 100644 --- a/Assets/Lua/Config/StoryCfgV2.lua +++ b/Assets/Lua/Config/StoryCfgV2.lua @@ -130,7 +130,7 @@ local StoryCfgV2 = { ['Type']=1, ['StoryNpcId']=301, ['MapLevel']=20006, -['StoryIntro']={1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16}, +['StoryIntro']={1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24}, ['NeedBg']=false, ['HideUi']=false, ['Transition']=false, diff --git a/Assets/Lua/Config/StroyPerformCfgV2.lua b/Assets/Lua/Config/StroyPerformCfgV2.lua index a2dfa0643..29a043e04 100644 --- a/Assets/Lua/Config/StroyPerformCfgV2.lua +++ b/Assets/Lua/Config/StroyPerformCfgV2.lua @@ -629,15 +629,15 @@ local StroyPerformCfgV2 = { ['Id']=8011, ['StoryId']=80, ['Type']=11, -['LeftAct']='RoleMovein', +['LeftAct']='RoleMoveout', ['LeftActBgTime']=0, -['RightAct']='RoleMoveout', +['RightAct']='RoleMovein', ['RightActBgTime']=0, -['LeftName']='actor_yideng', ['LeftNameColour']='title02', -['LeftImg']='PlayerHeads/player_head_yideng', +['RightName']='player', ['RightNameColour']='title01', -['SpeakSite']=1, +['RightImg']='PlayerHeads/player_head_me', +['SpeakSite']=2, ['SpeakId']='ST8011', ['SpeakTime']=0, ['WordTime']=10, @@ -647,24 +647,6 @@ local StroyPerformCfgV2 = { ['Id']=8012, ['StoryId']=80, ['Type']=12, -['LeftAct']='RoleMoveout', -['LeftActBgTime']=0, -['RightAct']='RoleMovein', -['RightActBgTime']=0, -['LeftNameColour']='title02', -['RightName']='player', -['RightNameColour']='title01', -['RightImg']='PlayerHeads/player_head_me', -['SpeakSite']=2, -['SpeakId']='ST8012', -['SpeakTime']=0, -['WordTime']=10, -['OverTime']=0, -}, -[8013]={ -['Id']=8013, -['StoryId']=80, -['Type']=13, ['LeftAct']='RoleMovein', ['LeftActBgTime']=0, ['RightAct']='RoleMoveout', @@ -674,15 +656,15 @@ local StroyPerformCfgV2 = { ['LeftImg']='PlayerHeads/player_head_yideng', ['RightNameColour']='title01', ['SpeakSite']=1, -['SpeakId']='ST8013', +['SpeakId']='ST8012', ['SpeakTime']=0, ['WordTime']=10, ['OverTime']=0, }, -[8014]={ -['Id']=8014, +[8013]={ +['Id']=8013, ['StoryId']=80, -['Type']=14, +['Type']=13, ['LeftAct']='RoleMoveout', ['LeftActBgTime']=0, ['RightAct']='RoleMovein', @@ -692,6 +674,24 @@ local StroyPerformCfgV2 = { ['RightNameColour']='title01', ['RightImg']='PlayerHeads/player_head_me', ['SpeakSite']=2, +['SpeakId']='ST8013', +['SpeakTime']=0, +['WordTime']=10, +['OverTime']=0, +}, +[8014]={ +['Id']=8014, +['StoryId']=80, +['Type']=14, +['LeftAct']='RoleMovein', +['LeftActBgTime']=0, +['RightAct']='RoleMoveout', +['RightActBgTime']=0, +['LeftName']='actor_yideng', +['LeftNameColour']='title02', +['LeftImg']='PlayerHeads/player_head_yideng', +['RightNameColour']='title01', +['SpeakSite']=1, ['SpeakId']='ST8014', ['SpeakTime']=0, ['WordTime']=10, @@ -733,5 +733,149 @@ local StroyPerformCfgV2 = { ['WordTime']=10, ['OverTime']=0, }, +[8017]={ +['Id']=8017, +['StoryId']=80, +['Type']=17, +['LeftAct']='RoleMoveout', +['LeftActBgTime']=0, +['RightAct']='RoleMovein', +['RightActBgTime']=0, +['LeftNameColour']='title02', +['RightName']='player', +['RightNameColour']='title01', +['RightImg']='PlayerHeads/player_head_me', +['SpeakSite']=2, +['SpeakId']='ST8017', +['SpeakTime']=0, +['WordTime']=10, +['OverTime']=0, +}, +[8018]={ +['Id']=8018, +['StoryId']=80, +['Type']=18, +['LeftAct']='RoleMovein', +['LeftActBgTime']=0, +['RightAct']='RoleMoveout', +['RightActBgTime']=0, +['LeftName']='actor_yideng', +['LeftNameColour']='title02', +['LeftImg']='PlayerHeads/player_head_yideng', +['RightNameColour']='title01', +['SpeakSite']=1, +['SpeakId']='ST8018', +['SpeakTime']=0, +['WordTime']=10, +['OverTime']=0, +}, +[8019]={ +['Id']=8019, +['StoryId']=80, +['Type']=19, +['LeftAct']='RoleMoveout', +['LeftActBgTime']=0, +['RightAct']='RoleMovein', +['RightActBgTime']=0, +['LeftNameColour']='title02', +['RightName']='player', +['RightNameColour']='title01', +['RightImg']='PlayerHeads/player_head_me', +['SpeakSite']=2, +['SpeakId']='ST8019', +['SpeakTime']=0, +['WordTime']=10, +['OverTime']=0, +}, +[8020]={ +['Id']=8020, +['StoryId']=80, +['Type']=20, +['LeftAct']='RoleMovein', +['LeftActBgTime']=0, +['RightAct']='RoleMoveout', +['RightActBgTime']=0, +['LeftName']='actor_yideng', +['LeftNameColour']='title02', +['LeftImg']='PlayerHeads/player_head_yideng', +['RightNameColour']='title01', +['SpeakSite']=1, +['SpeakId']='ST8020', +['SpeakTime']=0, +['WordTime']=10, +['OverTime']=0, +}, +[8021]={ +['Id']=8021, +['StoryId']=80, +['Type']=21, +['LeftAct']='RoleMoveout', +['LeftActBgTime']=0, +['RightAct']='RoleMovein', +['RightActBgTime']=0, +['LeftNameColour']='title02', +['RightName']='player', +['RightNameColour']='title01', +['RightImg']='PlayerHeads/player_head_me', +['SpeakSite']=2, +['SpeakId']='ST8021', +['SpeakTime']=0, +['WordTime']=10, +['OverTime']=0, +}, +[8022]={ +['Id']=8022, +['StoryId']=80, +['Type']=22, +['LeftAct']='RoleMovein', +['LeftActBgTime']=0, +['RightAct']='RoleMoveout', +['RightActBgTime']=0, +['LeftName']='actor_yideng', +['LeftNameColour']='title02', +['LeftImg']='PlayerHeads/player_head_yideng', +['RightNameColour']='title01', +['SpeakSite']=1, +['SpeakId']='ST8022', +['SpeakTime']=0, +['WordTime']=10, +['OverTime']=0, +}, +[8023]={ +['Id']=8023, +['StoryId']=80, +['Type']=23, +['LeftAct']='RoleMoveout', +['LeftActBgTime']=0, +['RightAct']='RoleMovein', +['RightActBgTime']=0, +['LeftNameColour']='title02', +['RightName']='player', +['RightNameColour']='title01', +['RightImg']='PlayerHeads/player_head_me', +['SpeakSite']=2, +['SpeakId']='ST8023', +['SpeakTime']=0, +['WordTime']=10, +['OverTime']=0, +}, +[8024]={ +['Id']=8024, +['StoryId']=80, +['Type']=24, +['LeftAct']='RoleMovein', +['LeftActBgTime']=0, +['RightAct']='RoleMoveout', +['RightActBgTime']=0, +['LeftName']='actor_yideng', +['LeftNameColour']='title02', +['LeftImg']='PlayerHeads/player_head_yideng', +['RightNameColour']='title01', +['SpeakSite']=1, +['SpeakId']='ST8024', +['SpeakTime']=0, +['WordTime']=10, +['OverTime']=0, +}, } return StroyPerformCfgV2 \ No newline at end of file diff --git a/Assets/Lua/UI/Common/ChatContentItemCtr.lua b/Assets/Lua/UI/Common/ChatContentItemCtr.lua index 228d7d2a2..b575e449a 100644 --- a/Assets/Lua/UI/Common/ChatContentItemCtr.lua +++ b/Assets/Lua/UI/Common/ChatContentItemCtr.lua @@ -188,7 +188,11 @@ function ChatContentItemCtr:SetData(wnd, itemLua, itemData, enterType, onClickOw contentNodes["L"..itemData.message.subType]:SetActive(true) contentNodes["R"..itemData.message.subType]:SetActive(true) - local headIconPath = "PlayerHeads/player_head_"..itemData.fromData.imgId + --local headIconPath = "PlayerHeads/player_head_"..itemData.fromData.imgId + local headIconPath = itemData.fromData.imgId + if tonumber(headIconPath) then + headIconPath = "PlayerHeads/player_head_"..headIconPath + end local currHeadImage if isLeft then currHeadImage = itemLua.leftNode.headIconNode.headIcon.image diff --git a/Assets/Lua/UI/UIChat/UIChatCtr.lua b/Assets/Lua/UI/UIChat/UIChatCtr.lua index f6fd58ba4..00ae810c6 100644 --- a/Assets/Lua/UI/UIChat/UIChatCtr.lua +++ b/Assets/Lua/UI/UIChat/UIChatCtr.lua @@ -95,7 +95,7 @@ StoryCfg: ['ForceGuideGroup']=0, } ]] -local CONST_INPUT_WAIT_TIME = 1250 +local CONST_INPUT_WAIT_TIME = 1500 function UIChatCtr:StartStoryChat(storyId, newMessageNtfFunc, chatInputNtfFunc, storyPlayFinishNtfFunc, isStartStory) local storyCfg = ManagerContainer.CfgMgr:GetStoryDataById(storyId) if isStartStory then @@ -126,7 +126,7 @@ function UIChatCtr:StartStoryChat(storyId, newMessageNtfFunc, chatInputNtfFunc, for i = 1, #storyPerformCfgDatas do local storyPerformCfg = storyPerformCfgDatas[i] if storyPerformCfg.SpeakSite == 2 then - local storyInputTimer = ManagerContainer.LuaTimerMgr:AddLuaTimer(i*CONST_INPUT_WAIT_TIME, 1, function() + local storyInputTimer = ManagerContainer.LuaTimerMgr:AddLuaTimer(i*CONST_INPUT_WAIT_TIME*1.2, 1, function() self.chatInputNtfFunc({{ storyId = self.currStoryId, performStoryCfgId = storyPerformCfg.Id, diff --git a/Assets/Lua/UI/UIChat/UIChatView.lua b/Assets/Lua/UI/UIChat/UIChatView.lua index 6f1c944e9..69674ff23 100644 --- a/Assets/Lua/UI/UIChat/UIChatView.lua +++ b/Assets/Lua/UI/UIChat/UIChatView.lua @@ -352,6 +352,8 @@ function UIChatView:OnStoryClick(storyId, performStoryCfgId, optionText) self:CloseAllInputToolBarToggles() self.sendStoryId = storyId self.sendPerformStoryCfgId = performStoryCfgId + + --TODO: 如果剧情自动发送，就打开这个注释 --self:OnChatLayer2BtnSend() end @@ -1154,6 +1156,11 @@ function UIChatView:SetUIStoryMode(isStoryMode) self.chatLayer2.storyInputTip:SetActive(isStoryMode) self.chatLayer2.titleBarReturnBtn.button.interactable = canInteractable self.chatLayer2.AnyBtn.button.interactable = canInteractable + if isStoryMode then + self.chatLayer2.inputField.tMP_InputField.readOnly = true + else + self.chatLayer2.inputField.tMP_InputField.readOnly = false + end end function UIChatView:SetStoryAIMode() diff --git a/Assets/Lua/UI/UIChat/UIChatView_Generate.lua b/Assets/Lua/UI/UIChat/UIChatView_Generate.lua index 238bb4fdd..8f0d9b903 100644 --- a/Assets/Lua/UI/UIChat/UIChatView_Generate.lua +++ b/Assets/Lua/UI/UIChat/UIChatView_Generate.lua @@ -32,10 +32,6 @@ ---@field public gameObject UnityEngine.GameObject ---@field public button UnityEngine.UI.Button ----@class UIChat__Generate_chatLayer2_inputField_old ----@field public gameObject UnityEngine.GameObject ----@field public inputField UnityEngine.UI.InputField - ---@class UIChat__Generate_chatLayer2_inputField ---@field public gameObject UnityEngine.GameObject ---@field public tMP_InputField TMPro.TMP_InputField @@ -127,7 +123,6 @@ ---@field public photoToggle UIChat__Generate_chatLayer2_photoToggle ---@field public inputTextBar UnityEngine.GameObject ---@field public inputField UIChat__Generate_chatLayer2_inputField ----@field public inputField_old UIChat__Generate_chatLayer2_inputField_old ---@field public btnSend UIChat__Generate_chatLayer2_btnSend ---@field public storyInputTip UIChat__Generate_chatLayer2_storyInputTip ---@field public inputToolBar UnityEngine.GameObject @@ -473,7 +468,6 @@ function UIChatView:InitGenerate(Root, data) self:InitGenerate__100(Root,data) self:InitGenerate__101(Root,data) self:InitGenerate__102(Root,data) - self:InitGenerate__103(Root,data) end @@ -1656,20 +1650,6 @@ end ---@private function UIChatView:InitGenerate__90(Root, data) ---[[ - UIAnimator/Window/ChatLayer2/InputPanel/InputTextBar/InputField_old ---]] - local tmp = Root:Find("UIAnimator/Window/ChatLayer2/InputPanel/InputTextBar/InputField_old").gameObject - if tolua.getpeer(tmp) == nil then - tolua.setpeer(tmp, {}) - end - self.chatLayer2.inputField_old = tmp - - tmp.inputField = tmp:GetComponent(Enum.TypeInfo.InputField) -end - ----@private -function UIChatView:InitGenerate__91(Root, data) --[[ UIAnimator/Window/ChatLayer2/InputPanel/InputTextBar/BtnSend --]] @@ -1683,7 +1663,7 @@ function UIChatView:InitGenerate__91(Root, data) end ---@private -function UIChatView:InitGenerate__92(Root, data) +function UIChatView:InitGenerate__91(Root, data) --[[ UIAnimator/Window/ChatLayer2/InputPanel/StoryInputTip --]] @@ -1697,7 +1677,7 @@ function UIChatView:InitGenerate__92(Root, data) end ---@private -function UIChatView:InitGenerate__93(Root, data) +function UIChatView:InitGenerate__92(Root, data) --[[ UIAnimator/Window/ChatLayer2/InputToolBar --]] @@ -1709,7 +1689,7 @@ function UIChatView:InitGenerate__93(Root, data) end ---@private -function UIChatView:InitGenerate__94(Root, data) +function UIChatView:InitGenerate__93(Root, data) --[[ UIAnimator/Window/ChatLayer2/InputToolBar/EmojiWindow --]] @@ -1723,7 +1703,7 @@ function UIChatView:InitGenerate__94(Root, data) end ---@private -function UIChatView:InitGenerate__95(Root, data) +function UIChatView:InitGenerate__94(Root, data) --[[ UIAnimator/Window/ChatLayer2/InputToolBar/EmojiWindow/Viewport/Content --]] @@ -1735,7 +1715,7 @@ function UIChatView:InitGenerate__95(Root, data) end ---@private -function UIChatView:InitGenerate__96(Root, data) +function UIChatView:InitGenerate__95(Root, data) --[[ UIAnimator/Window/ChatLayer2/InputToolBar/GiftWindow --]] @@ -1749,7 +1729,7 @@ function UIChatView:InitGenerate__96(Root, data) end ---@private -function UIChatView:InitGenerate__97(Root, data) +function UIChatView:InitGenerate__96(Root, data) --[[ UIAnimator/Window/ChatLayer2/InputToolBar/GiftWindow/Viewport/Content --]] @@ -1761,7 +1741,7 @@ function UIChatView:InitGenerate__97(Root, data) end ---@private -function UIChatView:InitGenerate__98(Root, data) +function UIChatView:InitGenerate__97(Root, data) --[[ UIAnimator/Window/ChatLayer2/InputToolBar/StoryWindow --]] @@ -1777,7 +1757,7 @@ function UIChatView:InitGenerate__98(Root, data) end ---@private -function UIChatView:InitGenerate__99(Root, data) +function UIChatView:InitGenerate__98(Root, data) --[[ UIAnimator/Window/ChatLayer2/InputToolBar/StoryWindow/Viewport/Content --]] @@ -1789,7 +1769,7 @@ function UIChatView:InitGenerate__99(Root, data) end ---@private -function UIChatView:InitGenerate__100(Root, data) +function UIChatView:InitGenerate__99(Root, data) --[[ UIAnimator/Window/ChatLayer2/InputToolBar/DateWindow --]] @@ -1803,7 +1783,7 @@ function UIChatView:InitGenerate__100(Root, data) end ---@private -function UIChatView:InitGenerate__101(Root, data) +function UIChatView:InitGenerate__100(Root, data) --[[ UIAnimator/Window/ChatLayer2/InputToolBar/DateWindow/Viewport/Content --]] @@ -1815,7 +1795,7 @@ function UIChatView:InitGenerate__101(Root, data) end ---@private -function UIChatView:InitGenerate__102(Root, data) +function UIChatView:InitGenerate__101(Root, data) --[[ UIAnimator/Window/ChatLayer2/InputToolBar/PhotoWindow --]] @@ -1829,7 +1809,7 @@ function UIChatView:InitGenerate__102(Root, data) end ---@private -function UIChatView:InitGenerate__103(Root, data) +function UIChatView:InitGenerate__102(Root, data) --[[ UIAnimator/Window/ChatLayer2/InputToolBar/PhotoWindow/Viewport/Content --]] @@ -1881,9 +1861,6 @@ function UIChatView:GenerateDestroy() if tolua.getpeer(self.chatLayer2.btnSend) ~= nil then tolua.setpeer(self.chatLayer2.btnSend, nil) end - if tolua.getpeer(self.chatLayer2.inputField_old) ~= nil then - tolua.setpeer(self.chatLayer2.inputField_old, nil) - end if tolua.getpeer(self.chatLayer2.inputField) ~= nil then tolua.setpeer(self.chatLayer2.inputField, nil) end