From 6bd0b920388ad057b0eb821a890e9c12d7a70f64 Mon Sep 17 00:00:00 2001 From: Chomper9981 Date: Tue, 24 Feb 2026 10:01:49 +0700 Subject: [PATCH 1/4] Fix bug task trace not working on mobile devide, make task trace update in runtime. --- .../Prefab/Task/TaskTrace/DlgTaskTrace.prefab | 1072 +++-------------- .../Task/TaskTrace/StyledTaskTraceText.cs | 97 +- .../PerfectWorld/Scripts/Task/UI/DlgTask.cs | 21 +- .../Scripts/Task/UI/DlgTaskTrace.cs | 16 +- Assets/Scripts/CECUIManager.cs | 38 + 5 files changed, 317 insertions(+), 927 deletions(-) diff --git a/Assets/PerfectWorld/Prefab/Task/TaskTrace/DlgTaskTrace.prefab b/Assets/PerfectWorld/Prefab/Task/TaskTrace/DlgTaskTrace.prefab index 2d1567cbca..014a470d94 100644 --- a/Assets/PerfectWorld/Prefab/Task/TaskTrace/DlgTaskTrace.prefab +++ b/Assets/PerfectWorld/Prefab/Task/TaskTrace/DlgTaskTrace.prefab @@ -13,6 +13,7 @@ GameObject: - component: {fileID: 4056938840944494766} - component: {fileID: 8251258103064126120} - component: {fileID: 2531022629832384091} + - component: {fileID: 8229852770963607340} m_Layer: 5 m_Name: Text (TMP) m_TagString: Untagged @@ -27,17 +28,17 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1259681648028745264} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + 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: 6132532718725710246} + m_Father: {fileID: 8222630393730529017} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_SizeDelta: {x: -10, y: 0} m_Pivot: {x: 0.5, y: 1} --- !u!222 &9154858122360570458 CanvasRenderer: @@ -165,6 +166,26 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: tmp: {fileID: 4056938840944494766} +--- !u!114 &8229852770963607340 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1259681648028745264} + 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: 370 + m_PreferredWidth: -1 + m_PreferredHeight: -1 + m_FlexibleWidth: -1 + m_FlexibleHeight: -1 + m_LayoutPriority: 1 --- !u!1 &1282604339548885369 GameObject: m_ObjectHideFlags: 0 @@ -202,10 +223,10 @@ RectTransform: - {fileID: 7756493524805061558} m_Father: {fileID: 2592907577137935010} 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: 30} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 272, y: -20} + m_SizeDelta: {x: 534, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &457716058811986814 MonoBehaviour: @@ -254,7 +275,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.19112396, g: 1, b: 0, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 0} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -271,142 +292,6 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!1 &1460972598942944139 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5334235739729266731} - - component: {fileID: 717857945709976537} - - component: {fileID: 9173893435352053864} - m_Layer: 5 - m_Name: Text (TMP) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!224 &5334235739729266731 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1460972598942944139} - 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: 8963506121256727437} - 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 &717857945709976537 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1460972598942944139} - m_CullTransparentMesh: 1 ---- !u!114 &9173893435352053864 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1460972598942944139} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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_text: X - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4281479730 - m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: -1183493901 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_fontSize: 24 - m_fontSizeBase: 24 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 - m_fontSizeMax: 72 - m_fontStyle: 0 - m_HorizontalAlignment: 2 - m_VerticalAlignment: 512 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_TextWrappingMode: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 0 - m_ActiveFontFeatures: 6e72656b - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_EmojiFallbackSupport: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 1 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_baseMaterial: {fileID: 0} - m_maskOffset: {x: 0, y: 0, z: 0, w: 0} --- !u!1 &1617990407549837025 GameObject: m_ObjectHideFlags: 0 @@ -663,8 +548,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: 272, y: -540.1764} - m_SizeDelta: {x: 544, y: 691} + m_AnchoredPosition: {x: 272, y: -540} + m_SizeDelta: {x: 544, y: 401} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4496279422760028947 CanvasRenderer: @@ -695,133 +580,9 @@ MonoBehaviour: m_TaskId: 0 m_pTxt_Desc: {fileID: 2531022629832384091} m_pChk_Collapse: {fileID: 6111965168519039965} - m_pCollapsedArea: {fileID: 7258688921676539445} - m_pBtnUnTrace: {fileID: 7959768652908452079} - m_pBtnMap: {fileID: 71853762878396798} - m_pBtnChat: {fileID: 1019052825373040898} + m_pCollapsedArea: {fileID: 6318768709065201913} m_pBtnFinishTaskByContribution: {fileID: 0} m_pBtnContributionTaskHelp: {fileID: 0} ---- !u!1 &2831723968088990169 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8963506121256727437} - - component: {fileID: 6804128504798270830} - - component: {fileID: 2019950965072580900} - - component: {fileID: 7959768652908452079} - m_Layer: 5 - m_Name: Untrace Button - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &8963506121256727437 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2831723968088990169} - 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: 5334235739729266731} - m_Father: {fileID: 3016039455618517900} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 131.66666, y: -25} - m_SizeDelta: {x: 50, y: 50} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &6804128504798270830 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2831723968088990169} - m_CullTransparentMesh: 1 ---- !u!114 &2019950965072580900 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2831723968088990169} - 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} - m_RaycastTarget: 0 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} - 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 &7959768652908452079 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2831723968088990169} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, 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: Selected - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 2019950965072580900} - m_OnClick: - m_PersistentCalls: - m_Calls: [] --- !u!1 &3069953681022711262 GameObject: m_ObjectHideFlags: 0 @@ -958,71 +719,6 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!1 &3434161516154757238 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3016039455618517900} - - component: {fileID: 8500725390327709797} - m_Layer: 5 - m_Name: GameObject - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &3016039455618517900 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3434161516154757238} - 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: 8404953050506751516} - - {fileID: 5793178729501739665} - - {fileID: 8963506121256727437} - m_Father: {fileID: 6132532718725710246} - 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: 109.48303, y: 98.33057} - m_SizeDelta: {x: 160, y: 50} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &8500725390327709797 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3434161516154757238} - 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: 1 - m_ChildForceExpandHeight: 1 - m_ChildControlWidth: 0 - m_ChildControlHeight: 0 - m_ChildScaleWidth: 0 - m_ChildScaleHeight: 0 - m_ReverseArrangement: 0 --- !u!1 &3479303862543290386 GameObject: m_ObjectHideFlags: 0 @@ -1042,7 +738,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &9079729967523171228 RectTransform: m_ObjectHideFlags: 0 @@ -1058,10 +754,10 @@ RectTransform: - {fileID: 3854714028094458106} m_Father: {fileID: 261981060290751465} 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: 30} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 383.75, y: -15} + m_SizeDelta: {x: 153.5, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &9064621489906583452 CanvasRenderer: @@ -1165,127 +861,6 @@ MonoBehaviour: m_FlexibleWidth: 0.8 m_FlexibleHeight: -1 m_LayoutPriority: 1 ---- !u!1 &3512125893465753939 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8404953050506751516} - - component: {fileID: 9058123560732067158} - - component: {fileID: 2799507749922240830} - - component: {fileID: 1019052825373040898} - m_Layer: 5 - m_Name: Notice to chat Button - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &8404953050506751516 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3512125893465753939} - 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: 2700626918252070787} - m_Father: {fileID: 3016039455618517900} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 25, y: -25} - m_SizeDelta: {x: 50, y: 50} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &9058123560732067158 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3512125893465753939} - m_CullTransparentMesh: 1 ---- !u!114 &2799507749922240830 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3512125893465753939} - 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} - m_RaycastTarget: 0 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} - 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 &1019052825373040898 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3512125893465753939} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, 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: Selected - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 2799507749922240830} - m_OnClick: - m_PersistentCalls: - m_Calls: [] --- !u!1 &3730379481426425927 GameObject: m_ObjectHideFlags: 0 @@ -1305,7 +880,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &5916681925339953764 RectTransform: m_ObjectHideFlags: 0 @@ -1321,10 +896,10 @@ RectTransform: - {fileID: 8505353848183549739} m_Father: {fileID: 261981060290751465} 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: 30} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 230.25, y: -15} + m_SizeDelta: {x: 153.5, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7804354563329982254 CanvasRenderer: @@ -1437,7 +1012,6 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 2592907577137935010} - - component: {fileID: 2726159464919517261} m_Layer: 5 m_Name: Content m_TagString: Untagged @@ -1458,7 +1032,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 261981060290751465} - - {fileID: 6132532718725710246} + - {fileID: 4411030909270113514} m_Father: {fileID: 8634059274107523544} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -1466,32 +1040,6 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &2726159464919517261 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3988313499384097302} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Padding: - m_Left: 5 - m_Right: 5 - m_Top: 5 - m_Bottom: 0 - m_ChildAlignment: 0 - m_Spacing: 0 - m_ChildForceExpandWidth: 1 - m_ChildForceExpandHeight: 0 - m_ChildControlWidth: 1 - m_ChildControlHeight: 0 - m_ChildScaleWidth: 0 - m_ChildScaleHeight: 0 - m_ReverseArrangement: 0 --- !u!1 &4825764596614857268 GameObject: m_ObjectHideFlags: 0 @@ -1567,7 +1115,7 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!1 &6326877851715554988 +--- !u!1 &5003895622590170670 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1575,134 +1123,156 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 2700626918252070787} - - component: {fileID: 2169666622589843085} - - component: {fileID: 3573710930701905735} + - component: {fileID: 8222630393730529017} + - component: {fileID: 2639351263650743997} m_Layer: 5 - m_Name: Text (TMP) + m_Name: Content m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!224 &2700626918252070787 + m_IsActive: 1 +--- !u!224 &8222630393730529017 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6326877851715554988} + m_GameObject: {fileID: 5003895622590170670} 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: 8404953050506751516} + m_Children: + - {fileID: 7727160961164029114} + m_Father: {fileID: 802158752662117418} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} 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 &2169666622589843085 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6326877851715554988} - m_CullTransparentMesh: 1 ---- !u!114 &3573710930701905735 + m_Pivot: {x: 0, y: 1} +--- !u!114 &2639351263650743997 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6326877851715554988} + m_GameObject: {fileID: 5003895622590170670} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 0 + m_VerticalFit: 1 +--- !u!1 &6318768709065201913 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4411030909270113514} + - component: {fileID: 1838645981218325918} + - component: {fileID: 5083783517430872443} + - component: {fileID: 3979225235376186376} + m_Layer: 5 + m_Name: Scroll View + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4411030909270113514 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6318768709065201913} + 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: 802158752662117418} + m_Father: {fileID: 2592907577137935010} + 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: -17.500013} + m_SizeDelta: {x: 0, y: -34.99997} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1838645981218325918 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6318768709065201913} + m_CullTransparentMesh: 1 +--- !u!114 &5083783517430872443 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6318768709065201913} + 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_Color: {r: 1, g: 1, b: 1, a: 0.011764706} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: N - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4281479730 - m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: -1183493901 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_fontSize: 24 - m_fontSizeBase: 24 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 - m_fontSizeMax: 72 - m_fontStyle: 0 - m_HorizontalAlignment: 2 - m_VerticalAlignment: 512 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_TextWrappingMode: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 0 - m_ActiveFontFeatures: 6e72656b - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_EmojiFallbackSupport: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 1 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_baseMaterial: {fileID: 0} - m_maskOffset: {x: 0, y: 0, z: 0, w: 0} + m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} + 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 &3979225235376186376 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6318768709065201913} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1aa08ab6e0800fa44ae55d278d1423e3, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Content: {fileID: 8222630393730529017} + m_Horizontal: 1 + m_Vertical: 1 + m_MovementType: 1 + m_Elasticity: 0.1 + m_Inertia: 1 + m_DecelerationRate: 0.135 + m_ScrollSensitivity: 1 + m_Viewport: {fileID: 802158752662117418} + m_HorizontalScrollbar: {fileID: 0} + m_VerticalScrollbar: {fileID: 0} + m_HorizontalScrollbarVisibility: 2 + m_VerticalScrollbarVisibility: 2 + m_HorizontalScrollbarSpacing: -3 + m_VerticalScrollbarSpacing: -3 + m_OnValueChanged: + m_PersistentCalls: + m_Calls: [] --- !u!1 &6473810361254159777 GameObject: m_ObjectHideFlags: 0 @@ -1722,7 +1292,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &3329664456688940810 RectTransform: m_ObjectHideFlags: 0 @@ -1738,10 +1308,10 @@ RectTransform: - {fileID: 9148946520930037275} m_Father: {fileID: 261981060290751465} 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: 30} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 76.75, y: -15} + m_SizeDelta: {x: 153.5, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &9170281180859117889 CanvasRenderer: @@ -1845,127 +1415,6 @@ MonoBehaviour: m_FlexibleWidth: 0.8 m_FlexibleHeight: -1 m_LayoutPriority: 1 ---- !u!1 &6495846291025499386 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5793178729501739665} - - component: {fileID: 1266149729541302388} - - component: {fileID: 96592034278499080} - - component: {fileID: 71853762878396798} - m_Layer: 5 - m_Name: Open map Button - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &5793178729501739665 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6495846291025499386} - 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: 8505317987590978995} - m_Father: {fileID: 3016039455618517900} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 78.33333, y: -25} - m_SizeDelta: {x: 50, y: 50} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &1266149729541302388 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6495846291025499386} - m_CullTransparentMesh: 1 ---- !u!114 &96592034278499080 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6495846291025499386} - 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} - m_RaycastTarget: 0 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} - 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 &71853762878396798 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6495846291025499386} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, 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: Selected - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 96592034278499080} - m_OnClick: - m_PersistentCalls: - m_Calls: [] --- !u!1 &7063514740526960886 GameObject: m_ObjectHideFlags: 0 @@ -2042,7 +1491,7 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!1 &7207162011476136193 +--- !u!1 &7218490672360566490 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -2050,53 +1499,55 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 8505317987590978995} - - component: {fileID: 5405408831913230153} - - component: {fileID: 4208075434674868373} + - component: {fileID: 802158752662117418} + - component: {fileID: 4331807536454252071} + - component: {fileID: 6965508918973133127} + - component: {fileID: 3033666440453661415} m_Layer: 5 - m_Name: Text (TMP) + m_Name: Viewport m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!224 &8505317987590978995 + m_IsActive: 1 +--- !u!224 &802158752662117418 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7207162011476136193} + m_GameObject: {fileID: 7218490672360566490} 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: 5793178729501739665} + m_Children: + - {fileID: 8222630393730529017} + m_Father: {fileID: 4411030909270113514} 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 &5405408831913230153 + m_SizeDelta: {x: 0, y: -17} + m_Pivot: {x: 0, y: 1} +--- !u!222 &4331807536454252071 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7207162011476136193} + m_GameObject: {fileID: 7218490672360566490} m_CullTransparentMesh: 1 ---- !u!114 &4208075434674868373 +--- !u!114 &6965508918973133127 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7207162011476136193} + m_GameObject: {fileID: 7218490672360566490} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} @@ -2107,146 +1558,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: M - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4281479730 - m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: -1183493901 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_fontSize: 24 - m_fontSizeBase: 24 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 - m_fontSizeMax: 72 - m_fontStyle: 0 - m_HorizontalAlignment: 2 - m_VerticalAlignment: 512 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_TextWrappingMode: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 0 - m_ActiveFontFeatures: 6e72656b - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_EmojiFallbackSupport: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 1 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_baseMaterial: {fileID: 0} - m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!1 &7258688921676539445 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 6132532718725710246} - - component: {fileID: 2700825500503621295} - - component: {fileID: 5833904485437591773} - m_Layer: 5 - m_Name: Quest View - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &6132532718725710246 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7258688921676539445} - 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: 7727160961164029114} - - {fileID: 3016039455618517900} - m_Father: {fileID: 2592907577137935010} - 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: 656} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &2700825500503621295 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7258688921676539445} - m_CullTransparentMesh: 1 ---- !u!114 &5833904485437591773 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7258688921676539445} - 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: 0.29803923} - m_RaycastTarget: 0 - 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_Sprite: {fileID: 10917, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -2255,6 +1568,19 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!114 &3033666440453661415 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7218490672360566490} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ShowMaskGraphic: 0 --- !u!1 &7754256254697926651 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/PerfectWorld/Prefab/Task/TaskTrace/StyledTaskTraceText.cs b/Assets/PerfectWorld/Prefab/Task/TaskTrace/StyledTaskTraceText.cs index 7851c26ae0..2fd8b7895b 100644 --- a/Assets/PerfectWorld/Prefab/Task/TaskTrace/StyledTaskTraceText.cs +++ b/Assets/PerfectWorld/Prefab/Task/TaskTrace/StyledTaskTraceText.cs @@ -8,13 +8,11 @@ using System.Text; using System.Text.RegularExpressions; namespace BrewMonster { - public class StyledTaskTraceText : MonoBehaviour, IPointerMoveHandler,IPointerClickHandler + public class StyledTaskTraceText : MonoBehaviour, IPointerClickHandler { public TMP_Text tmp; private List linkCommands =new List(); - int hoveredLink = -1; - private void Start() { @@ -22,18 +20,41 @@ namespace BrewMonster tmp.ForceMeshUpdate(); } - public void OnPointerMove(PointerEventData eventData) + // Helper method to find intersecting link with proper camera handling // 辅助方法，用于查找相交的链接并正确处理相机 + private int FindIntersectingLink(PointerEventData eventData) { - int linkIndex = TMP_TextUtilities.FindIntersectingLink( - tmp, - eventData.position, - eventData.pressEventCamera - ); + if (tmp == null) return -1; - if (linkIndex != hoveredLink) + tmp.ForceMeshUpdate(); + + // Get camera for link detection // 获取用于链接检测的相机 + Camera camera = null; + Canvas canvas = tmp.GetComponentInParent(); + if (canvas != null) { - hoveredLink = linkIndex; + // IMPORTANT: TMP_TextUtilities.FindIntersectingLink expects camera=null for ScreenSpaceOverlay. + // 重要：ScreenSpaceOverlay 必须传 camera=null，否则会算错导致 linkIndex = -1。 + if (canvas.renderMode == RenderMode.ScreenSpaceOverlay) + { + camera = null; + } + else + { + // ScreenSpaceCamera / WorldSpace + camera = eventData.pressEventCamera != null ? eventData.pressEventCamera : canvas.worldCamera; + } } + else + { + // No canvas found; fall back to pressEventCamera (may be null) then main + camera = eventData.pressEventCamera != null ? eventData.pressEventCamera : Camera.main; + } + + // Try with camera first, then fallback to null // 先尝试使用相机，然后回退到null + int linkIndexCam = TMP_TextUtilities.FindIntersectingLink(tmp, eventData.position, camera); + int linkIndexNull = TMP_TextUtilities.FindIntersectingLink(tmp, eventData.position, null); + + return linkIndexCam != -1 ? linkIndexCam : linkIndexNull; } public void Set(string text) { @@ -80,53 +101,49 @@ namespace BrewMonster tmp.text = ""; linkCommands.Clear(); } - void SetLinkColor(int linkIndex, Color32 color) - { - TMP_LinkInfo linkInfo = tmp.textInfo.linkInfo[linkIndex]; - - for (int i = 0; i < linkInfo.linkTextLength; i++) - { - int charIndex = linkInfo.linkTextfirstCharacterIndex + i; - var charInfo = tmp.textInfo.characterInfo[charIndex]; - - if (!charInfo.isVisible) continue; - - int meshIndex = charInfo.materialReferenceIndex; - int vertexIndex = charInfo.vertexIndex; - - var colors = tmp.textInfo.meshInfo[meshIndex].colors32; - colors[vertexIndex + 0] = color; - colors[vertexIndex + 1] = color; - colors[vertexIndex + 2] = color; - colors[vertexIndex + 3] = color; - } - - tmp.UpdateVertexData(TMP_VertexDataUpdateFlags.Colors32); - } public void OnPointerClick(PointerEventData eventData) { - TMP_LinkInfo linkInfo = tmp.textInfo.linkInfo[hoveredLink]; + if (tmp == null) return; + + // Detect link directly in click handler // 在点击处理程序中直接检测链接 + int linkIndex = FindIntersectingLink(eventData); + + // Validate link index // 验证链接索引 + if (linkIndex == -1 || linkIndex >= tmp.textInfo.linkCount || linkIndex >= linkCommands.Count) + { + return; + } + + tmp.ForceMeshUpdate(); + TMP_LinkInfo linkInfo = tmp.textInfo.linkInfo[linkIndex]; string linkText = linkInfo.GetLinkText(); string entityID = linkInfo.GetLinkID(); + switch (entityID) { case "coord": - linkCommands[hoveredLink].Execute(tmp); - //Debug.Log($"[StyledTaskTraceText] OnPointerClick: linkCommands[hoveredLink].Execute(tmp) => {linkCommands[hoveredLink].Execute(tmp)}"); + if (linkIndex < linkCommands.Count && linkCommands[linkIndex] != null) + { + linkCommands[linkIndex].Execute(tmp); + } + //Debug.Log($"[StyledTaskTraceText] OnPointerClick: linkCommands[{linkIndex}].Execute(tmp) => {linkCommands[linkIndex].Execute(tmp)}"); break; case "npc": - linkCommands[hoveredLink].Execute(tmp); + if (linkIndex < linkCommands.Count && linkCommands[linkIndex] != null) + { + linkCommands[linkIndex].Execute(tmp); + } break; case "monster": break; default: Debug.Log($"Clicked unknown link: ID={entityID} Text={linkText}"); - break; + break; } - hoveredLink = -1; } } } + diff --git a/Assets/PerfectWorld/Scripts/Task/UI/DlgTask.cs b/Assets/PerfectWorld/Scripts/Task/UI/DlgTask.cs index af0008c632..0ce9931884 100644 --- a/Assets/PerfectWorld/Scripts/Task/UI/DlgTask.cs +++ b/Assets/PerfectWorld/Scripts/Task/UI/DlgTask.cs @@ -155,6 +155,10 @@ namespace BrewMonster.Scripts.Task.UI OnShowDialog(); OnCommand_havequest(); } + private new void OnDisable() + { + OnHideDialog(); + } private new void Awake() { @@ -345,10 +349,6 @@ namespace BrewMonster.Scripts.Task.UI CECUIHelper.FollowCoord(entityID, taskID); } - private new void Update() - { - Tick(); - } #endregion @@ -713,7 +713,7 @@ namespace BrewMonster.Scripts.Task.UI return string.Empty; } // - private bool Tick() + public bool Tick() { RefreshTaskTrace(); // Time-window task refresh: while in Search view, refresh the list when server time crosses a minute boundary. @@ -1382,10 +1382,19 @@ namespace BrewMonster.Scripts.Task.UI // virtual bool OnInitDialog(); void OnShowDialog() { - OnCommand_showtrace(null,m_bShowTrace); + //OnCommand_showtrace(null,m_bShowTrace); if (m_idSelTask != 0) UpdateTask(); } + void OnHideDialog() + { + if (m_szName != "Win_Quest") return; + var pTree = m_pTv_Quest; + var pItem = pTree?.GetSelectedItem(); + if( pItem ) + m_idSelTask = (int)pTree.GetItemData(pItem); + else m_idSelTask = 0; + } // virtual void OnHideDialog(); // virtual bool OnChangeLayout(PAUIOBJECT pMine, PAUIOBJECT pTheir); // virtual void OnChangeLayoutEnd(bool bAllDone); diff --git a/Assets/PerfectWorld/Scripts/Task/UI/DlgTaskTrace.cs b/Assets/PerfectWorld/Scripts/Task/UI/DlgTaskTrace.cs index 2353ee5214..1904eada98 100644 --- a/Assets/PerfectWorld/Scripts/Task/UI/DlgTaskTrace.cs +++ b/Assets/PerfectWorld/Scripts/Task/UI/DlgTaskTrace.cs @@ -31,9 +31,9 @@ namespace BrewMonster.Scripts.Task.UI [SerializeField] protected Toggle m_pChk_Collapse; [SerializeField] protected GameObject m_pCollapsedArea; protected Dictionary m_uniqueNameCountMap = new Dictionary(); - [SerializeField] protected Button m_pBtnUnTrace; - [SerializeField] protected Button m_pBtnMap; - [SerializeField] protected Button m_pBtnChat; + // [SerializeField] protected Button m_pBtnUnTrace; + // [SerializeField] protected Button m_pBtnMap; + // [SerializeField] protected Button m_pBtnChat; [SerializeField] protected Button m_pBtnFinishTaskByContribution; [SerializeField] protected Button m_pBtnContributionTaskHelp; protected int m_nLastTracedTasks; // ����ʾ���ݶ�Ӧ��׷��������������ijЩ����������������б����л��� @@ -53,11 +53,11 @@ namespace BrewMonster.Scripts.Task.UI //AUI_ON_COMMAND("Rdo_Quest*", OnCommand_SwitchShowType) //Not sure if we need this //AUI_ON_COMMAND("Btn_UnTrace", OnCommand_UnTraceTask) - m_pBtnUnTrace.onClick.AddListener(OnCommand_UnTraceTask); - //AUI_ON_COMMAND("Btn_Map", OnCommand_Map) - m_pBtnMap.onClick.AddListener(OnCommand_Map); - //AUI_ON_COMMAND("Btn_ForChat", OnCommand_Chat) - m_pBtnChat.onClick.AddListener(UpdateContributionTask); + // m_pBtnUnTrace.onClick.AddListener(OnCommand_UnTraceTask); + // //AUI_ON_COMMAND("Btn_Map", OnCommand_Map) + // m_pBtnMap.onClick.AddListener(OnCommand_Map); + // //AUI_ON_COMMAND("Btn_ForChat", OnCommand_Chat) + // m_pBtnChat.onClick.AddListener(UpdateContributionTask); //AUI_ON_COMMAND("Btn_Finish", OnCommand_FinishTask) //m_pBtnFinishTaskByContribution.onClick.AddListener(() => OnCommand_FinishTask(null)); diff --git a/Assets/Scripts/CECUIManager.cs b/Assets/Scripts/CECUIManager.cs index 129f7648ac..c3aaf5c327 100644 --- a/Assets/Scripts/CECUIManager.cs +++ b/Assets/Scripts/CECUIManager.cs @@ -33,6 +33,10 @@ public class CECUIManager : MonoSingleton Sprite[] m_iconlistIvtr; private CDlgInfoTooltip m_pDlgSkillTooltip; + // Task update timer / 任务更新计时器 + private float _nextTaskUpdateTime = 0f; + private const float TASK_UPDATE_INTERVAL = 1f; // Update every 100ms / 每100毫秒更新一次 + protected override void Awake() { base.Awake(); @@ -58,6 +62,40 @@ public class CECUIManager : MonoSingleton // _fpsText.text = $"{Mathf.RoundToInt(1f / Time.deltaTime)}"; if (m_pDlgQuickBar1 != null) { m_pDlgQuickBar1.UpdateShortcuts(); } + + // Periodically update task UI (DlgTask and DlgTaskTrace) / 定期更新任务UI（DlgTask和DlgTaskTrace） + if (Time.unscaledTime >= _nextTaskUpdateTime) + { + _nextTaskUpdateTime = Time.unscaledTime + TASK_UPDATE_INTERVAL; + UpdateTaskUI(); + } + } + + /// + /// Update task UI from DlgTask and DlgTaskTrace / 从DlgTask和DlgTaskTrace更新任务UI + /// + private void UpdateTaskUI() + { + try + { + var inGameUIMan = GetInGameUIMan(); + if (inGameUIMan == null) return; + + var dlgTaskDialog = inGameUIMan.GetDialog("Win_Quest"); + var dlgTaskTraceDialog = inGameUIMan.GetDialog("Win_QuestMinion"); + if (dlgTaskTraceDialog != null && dlgTaskTraceDialog.IsShow()) + { + if (dlgTaskDialog != null && dlgTaskDialog is BrewMonster.Scripts.Task.UI.DlgTask dlgTaskForTrace) + { + dlgTaskForTrace.RefreshTaskTrace(); + } + } + } + catch (System.Exception) + { + // Silently handle errors to avoid spamming logs / 静默处理错误以避免日志刷屏 + // Task UI update errors are handled silently / 任务UI更新错误被静默处理 + } } private void OnDestroy() From 837fc4973b9983b31fdc15250fbc39df57aaf9fa Mon Sep 17 00:00:00 2001 From: Chomper9981 Date: Tue, 24 Feb 2026 11:22:26 +0700 Subject: [PATCH 2/4] fix bug task not update update in runtime. --- .../Prefab/Task/TaskTrace/DlgTaskTrace.prefab | 151 +++++++++++++++++- .../PerfectWorld/Scripts/Task/UI/DlgTask.cs | 2 +- Assets/Scripts/CECUIManager.cs | 8 +- 3 files changed, 150 insertions(+), 11 deletions(-) diff --git a/Assets/PerfectWorld/Prefab/Task/TaskTrace/DlgTaskTrace.prefab b/Assets/PerfectWorld/Prefab/Task/TaskTrace/DlgTaskTrace.prefab index 014a470d94..d018538122 100644 --- a/Assets/PerfectWorld/Prefab/Task/TaskTrace/DlgTaskTrace.prefab +++ b/Assets/PerfectWorld/Prefab/Task/TaskTrace/DlgTaskTrace.prefab @@ -548,8 +548,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: 272, y: -540} - m_SizeDelta: {x: 544, y: 401} + m_AnchoredPosition: {x: 272, y: -515} + m_SizeDelta: {x: 544, y: 350} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4496279422760028947 CanvasRenderer: @@ -1040,6 +1040,142 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &4027823060794337104 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7379096626487207886} + - component: {fileID: 4282835558779793253} + - component: {fileID: 598488068750681258} + m_Layer: 5 + m_Name: Text (TMP) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7379096626487207886 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4027823060794337104} + 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: 4193270519425639530} + 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: 118.647095, y: 0} + m_SizeDelta: {x: 200, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4282835558779793253 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4027823060794337104} + m_CullTransparentMesh: 1 +--- !u!114 &598488068750681258 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4027823060794337104} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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_text: Task trace + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 24 + m_fontSizeBase: 24 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 256 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_TextWrappingMode: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 0 + m_ActiveFontFeatures: 6e72656b + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_EmojiFallbackSupport: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} --- !u!1 &4825764596614857268 GameObject: m_ObjectHideFlags: 0 @@ -1226,7 +1362,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 0.011764706} + m_Color: {r: 0, g: 0, b: 0, a: 0.34901962} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -1256,9 +1392,9 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Content: {fileID: 8222630393730529017} - m_Horizontal: 1 + m_Horizontal: 0 m_Vertical: 1 - m_MovementType: 1 + m_MovementType: 2 m_Elasticity: 0.1 m_Inertia: 1 m_DecelerationRate: 0.135 @@ -1446,6 +1582,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 2459414580125558557} + - {fileID: 7379096626487207886} m_Father: {fileID: 7756493524805061558} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} @@ -1528,7 +1665,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: -17} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 1} --- !u!222 &4331807536454252071 CanvasRenderer: @@ -1551,7 +1688,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + 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 diff --git a/Assets/PerfectWorld/Scripts/Task/UI/DlgTask.cs b/Assets/PerfectWorld/Scripts/Task/UI/DlgTask.cs index 0ce9931884..f0d1f7deac 100644 --- a/Assets/PerfectWorld/Scripts/Task/UI/DlgTask.cs +++ b/Assets/PerfectWorld/Scripts/Task/UI/DlgTask.cs @@ -1382,7 +1382,7 @@ namespace BrewMonster.Scripts.Task.UI // virtual bool OnInitDialog(); void OnShowDialog() { - //OnCommand_showtrace(null,m_bShowTrace); + OnCommand_showtrace(null,m_bShowTrace); if (m_idSelTask != 0) UpdateTask(); } diff --git a/Assets/Scripts/CECUIManager.cs b/Assets/Scripts/CECUIManager.cs index 4dbfd0c90e..a8479339f5 100644 --- a/Assets/Scripts/CECUIManager.cs +++ b/Assets/Scripts/CECUIManager.cs @@ -35,7 +35,7 @@ public class CECUIManager : MonoSingleton // Task update timer / 任务更新计时器 private float _nextTaskUpdateTime = 0f; - private const float TASK_UPDATE_INTERVAL = 1f; // Update every 100ms / 每100毫秒更新一次 + private const float TASK_UPDATE_INTERVAL = .1f; protected override void Awake() { @@ -83,13 +83,15 @@ public class CECUIManager : MonoSingleton var dlgTaskDialog = inGameUIMan.GetDialog("Win_Quest"); var dlgTaskTraceDialog = inGameUIMan.GetDialog("Win_QuestMinion"); - if (dlgTaskTraceDialog != null && dlgTaskTraceDialog.IsShow()) + if (dlgTaskDialog != null && dlgTaskDialog is BrewMonster.Scripts.Task.UI.DlgTask dlgTaskForTrace) { - if (dlgTaskDialog != null && dlgTaskDialog is BrewMonster.Scripts.Task.UI.DlgTask dlgTaskForTrace) + if (dlgTaskTraceDialog != null && dlgTaskTraceDialog.IsShow()) { dlgTaskForTrace.RefreshTaskTrace(); } + dlgTaskForTrace.Tick(); } + } catch (System.Exception) { From 67a4eb648f4a3e526495d12f2391e813a0c24878 Mon Sep 17 00:00:00 2001 From: Chomper9981 Date: Tue, 24 Feb 2026 15:27:11 +0700 Subject: [PATCH 3/4] fix bug quest "Gap tien nu" not teleport player to the quest location. --- Assets/PerfectWorld/Scripts/Task/TaskTempl.Method.cs | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Assets/PerfectWorld/Scripts/Task/TaskTempl.Method.cs b/Assets/PerfectWorld/Scripts/Task/TaskTempl.Method.cs index c4d1407638..14e4ed319a 100644 --- a/Assets/PerfectWorld/Scripts/Task/TaskTempl.Method.cs +++ b/Assets/PerfectWorld/Scripts/Task/TaskTempl.Method.cs @@ -500,7 +500,6 @@ namespace BrewMonster.Scripts.Task // Follow C++ logic: valid_size checks the buffer size before deserializing // In C++, pNotify is a pointer to the structure, so valid_size can read sub_tags.sz directly // In C#, we need to read sub_tags.sz from the buffer first, then validate - // Calculate base size: task_notify_base (3) + cur_time (4) + cap_task (4) = 11 int baseSzNew = Marshal.SizeOf() + 8; if (sz <= (uint)baseSzNew) @@ -709,13 +708,16 @@ namespace BrewMonster.Scripts.Task // pTask.UpdateTaskEmotionAction(m_FixedData.m_ID); if ((m_enumMethod == (uint)TaskCompletionMethod.enumTMSimpleClientTask) && m_FixedData.m_uiEmotion > 0) + { // TODO: Pop emotion UI // PopEmotionUI(m_ID,m_uiEmotion,false); - + } + if (m_FixedData.m_bDisplayInTitleTaskUI) + { // TODO: Update title UI // UpdateTitleUI(m_ID); - + } pTask.OnCompleteTask((int)m_FixedData.m_ID); break; From 925b6c04772b0ec76fa31046d60e24eab06bd043 Mon Sep 17 00:00:00 2001 From: Chomper9981 Date: Tue, 24 Feb 2026 16:20:37 +0700 Subject: [PATCH 4/4] Load item info for flysword. --- .../Common/DataProcess/generate_item_temp.cs | 66 ++++++++++++++++++- .../Scripts/Common/DataProcess/itemdataman.cs | 3 + 2 files changed, 68 insertions(+), 1 deletion(-) diff --git a/Assets/PerfectWorld/Scripts/Common/DataProcess/generate_item_temp.cs b/Assets/PerfectWorld/Scripts/Common/DataProcess/generate_item_temp.cs index 8bbfc03e83..7d820e95c4 100644 --- a/Assets/PerfectWorld/Scripts/Common/DataProcess/generate_item_temp.cs +++ b/Assets/PerfectWorld/Scripts/Common/DataProcess/generate_item_temp.cs @@ -1349,6 +1349,7 @@ public static class generate_item_temp content_length = (int)(size - offset); WriteInt(data, ref content_length_ptr, content_length); WriteInt(data, ref item_content, offset); + WriteInt(data, ref offset, ess.food_type); //��Ʒ�Ŀ�װ����־ WriteInt(data, ref offset, ess.hornor); //��Ʒ��Ӧ�����ID guid @@ -1357,7 +1358,69 @@ public static class generate_item_temp itemdataman.set_to_classid(DATA_TYPE.DT_PET_FOOD_ESSENCE, data, -1); return 0; } - + public static int generate_flysword(uint id, ID_SPACE idspace, out byte[] data, out uint size, RAND_CLASS cls,item_tag_t tag) + { + data = new byte[0]; + size = 0; + + DATA_TYPE datatype = DATA_TYPE.DT_INVALID; + object obj = itemdataman._edm.get_data_ptr(id, idspace, ref datatype); + if(obj == null || datatype != DATA_TYPE.DT_FLYSWORD_ESSENCE) + return -1; + FLYSWORD_ESSENCE ess = (FLYSWORD_ESSENCE)obj; + size = (uint)(Marshal.SizeOf(typeof(item_data)) + Marshal.SizeOf(typeof(FLYSWORD_ESSENCE))); + data = new byte[size]; + int offset = 0; + WriteUInt(data, ref offset, id); + WriteUInt(data, ref offset, 1); + WriteUInt(data, ref offset, (uint)ess.pile_num_max); + WriteInt(data, ref offset, (int)itemdataman.ELEMENTDATAMAN_EQUIP_MASK_FLYSWORD); + WriteInt(data, ref offset, (int)ess.proc_type); + WriteInt(data, ref offset, (int)DATA_TYPE.DT_FLYSWORD_ESSENCE); + if(ess.has_guid == 1){ + int g1,g2; + itemdataman.get_item_guid(id,out g1,out g2); + WriteInt(data, ref offset, g1); + WriteInt(data, ref offset, g2); + } + else{ + WriteInt(data, ref offset, 0); + } + WriteInt(data, ref offset, ess.price); + WriteInt(data, ref offset, 0); //����ʱ�� + + int content_length = 0; + int content_length_ptr = offset; + WriteInt(data, ref offset, 0); + int item_content = offset; + WriteInt(data, ref offset, 0); + content_length = (int)(size - offset); + WriteInt(data, ref content_length_ptr, content_length); + WriteInt(data, ref item_content, offset); + + int t = element_data.RandNormal((int)ess.time_max_min, (int)ess.time_max_max, cls, LOWER.LOWER_TREND); + + // essence + WriteInt(data, ref offset, (int)(t*0.5f)); + WriteInt(data, ref offset, (int)t); + WriteShort(data, ref offset, (short)ess.require_player_level_min); + WriteByte(data, ref offset, (byte)ess.level); + WriteByte(data, ref offset, 0); + WriteInt(data, ref offset, (int)ess.character_combo_id); + WriteInt(data, ref offset, (int)ess.time_increase_per_element); + + float speed = element_data.Rand(ess.speed_increase_min, ess.speed_increase_max, cls, LOWER.LOWER_TREND); + WriteFloat(data, ref offset, speed); + speed = element_data.Rand(ess.speed_rush_increase_min, ess.speed_rush_increase_max, cls, LOWER.LOWER_TREND); + WriteFloat(data, ref offset, speed); + + //���������߱�ǩ + WriteByte(data, ref offset, tag.type); + WriteByte(data, ref offset, (byte)tag.size); + + itemdataman.set_to_classid(DATA_TYPE.DT_FLYSWORD_ESSENCE, data, -1); + return 0; + } public static int generate_townscroll(uint id, ID_SPACE idspace, out byte[] data, out uint size, RAND_CLASS cls) { DATA_TYPE datatype = DATA_TYPE.DT_INVALID; @@ -1402,6 +1465,7 @@ public static class generate_item_temp itemdataman.set_to_classid(DATA_TYPE.DT_TOWNSCROLL_ESSENCE, data, -1); return 0; } + #region Write Functions private static void WriteUInt(byte[] buf, ref int offset, uint value) { diff --git a/Assets/PerfectWorld/Scripts/Common/DataProcess/itemdataman.cs b/Assets/PerfectWorld/Scripts/Common/DataProcess/itemdataman.cs index f484a59ba7..b410939e78 100644 --- a/Assets/PerfectWorld/Scripts/Common/DataProcess/itemdataman.cs +++ b/Assets/PerfectWorld/Scripts/Common/DataProcess/itemdataman.cs @@ -491,6 +491,9 @@ namespace BrewMonster case DATA_TYPE.DT_PET_FOOD_ESSENCE: ret = generate_item_temp.generate_pet_food(id, ID_SPACE.ID_SPACE_ESSENCE, out item, out size, SPECIFIC.SPECIFIC_RAND); break; + case DATA_TYPE.DT_FLYSWORD_ESSENCE: + ret = generate_item_temp.generate_flysword(id, ID_SPACE.ID_SPACE_ESSENCE, out item, out size, SPECIFIC.SPECIFIC_RAND, tag); + break; case DATA_TYPE.DT_TOWNSCROLL_ESSENCE: ret = generate_item_temp.generate_townscroll(id, ID_SPACE.ID_SPACE_ESSENCE, out item, out size, SPECIFIC.SPECIFIC_RAND); break;