diff --git a/Assets/Resources/UIPrefabs/OperationStepPanel.prefab b/Assets/Resources/UIPrefabs/OperationStepPanel.prefab index 3a11ae0..0a5f6c4 100644 --- a/Assets/Resources/UIPrefabs/OperationStepPanel.prefab +++ b/Assets/Resources/UIPrefabs/OperationStepPanel.prefab @@ -2050,7 +2050,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 5, y: 0} - m_SizeDelta: {x: -10, y: 50} + m_SizeDelta: {x: -10, y: 0} m_Pivot: {x: 0, y: 1} --- !u!222 &5184453082923954450 CanvasRenderer: @@ -4510,7 +4510,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &6909671619946731258 RectTransform: m_ObjectHideFlags: 0 @@ -4523,6 +4523,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: + - {fileID: 828161309697664316} - {fileID: 5015525212453763011} m_Father: {fileID: 1034991785916772890} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -6114,7 +6115,7 @@ RectTransform: m_Father: {fileID: 1169451575554686425} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} + m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 1} @@ -6568,6 +6569,85 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &6660603840970352026 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 828161309697664316} + - component: {fileID: 7797318633021969621} + - component: {fileID: 7136238480415974350} + m_Layer: 5 + m_Name: introduceTitle + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &828161309697664316 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6660603840970352026} + 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: 6909671619946731258} + 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: 4.5195, y: 125} + m_SizeDelta: {x: 793.99, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7797318633021969621 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6660603840970352026} + m_CullTransparentMesh: 1 +--- !u!114 &7136238480415974350 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6660603840970352026} + 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: 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_FontData: + m_Font: {fileID: 12800000, guid: 20ebdb412ee9aec4a9d3005965d9c962, type: 3} + m_FontSize: 20 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 2 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\u4ECB\u7ECD\u6587\u5B57" --- !u!1 &6677675052871592389 GameObject: m_ObjectHideFlags: 0 @@ -7983,8 +8063,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 808.8, y: -3.300003} - m_SizeDelta: {x: 3, y: 25.9326} + m_AnchoredPosition: {x: 808.8, y: 0} + m_SizeDelta: {x: 3, y: 0} m_Pivot: {x: 1, y: 1} --- !u!222 &3140508559529235679 CanvasRenderer: @@ -9695,9 +9775,9 @@ RectTransform: m_Father: {fileID: 6217422223439787322} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} + m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 20} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6350466524219599760 CanvasRenderer: diff --git a/Assets/StreamingAssets/Audios/NiuTips/N011.mp3 b/Assets/StreamingAssets/Audios/NiuTips/N011.mp3 index 18de4af..5b08338 100644 Binary files a/Assets/StreamingAssets/Audios/NiuTips/N011.mp3 and b/Assets/StreamingAssets/Audios/NiuTips/N011.mp3 differ diff --git a/Assets/StreamingAssets/Audios/NiuTips/N012.mp3 b/Assets/StreamingAssets/Audios/NiuTips/N012.mp3 index de8437c..01c5805 100644 Binary files a/Assets/StreamingAssets/Audios/NiuTips/N012.mp3 and b/Assets/StreamingAssets/Audios/NiuTips/N012.mp3 differ diff --git a/Assets/StreamingAssets/Audios/NiuTips/N013.mp3 b/Assets/StreamingAssets/Audios/NiuTips/N013.mp3 index 0dae93b..6cccfab 100644 Binary files a/Assets/StreamingAssets/Audios/NiuTips/N013.mp3 and b/Assets/StreamingAssets/Audios/NiuTips/N013.mp3 differ diff --git a/Assets/StreamingAssets/Audios/NiuTips/N014.mp3 b/Assets/StreamingAssets/Audios/NiuTips/N014.mp3 index bd93edf..228f74c 100644 Binary files a/Assets/StreamingAssets/Audios/NiuTips/N014.mp3 and b/Assets/StreamingAssets/Audios/NiuTips/N014.mp3 differ diff --git a/Assets/StreamingAssets/Audios/NiuTips/N018.mp3 b/Assets/StreamingAssets/Audios/NiuTips/N018.mp3 index 4b35f26..3b047d5 100644 Binary files a/Assets/StreamingAssets/Audios/NiuTips/N018.mp3 and b/Assets/StreamingAssets/Audios/NiuTips/N018.mp3 differ diff --git a/Assets/_Scripts/Application/UI/OperationStepPanel.cs b/Assets/_Scripts/Application/UI/OperationStepPanel.cs index cae002e..9c208fb 100644 --- a/Assets/_Scripts/Application/UI/OperationStepPanel.cs +++ b/Assets/_Scripts/Application/UI/OperationStepPanel.cs @@ -577,6 +577,7 @@ namespace ZXK.LouDiXvMuNiu UI_Manage.Instance.ClosePanel("ShowToastUIPrefab"); imgIntroduceGeo.SetActive(false); _introduceGeo.SetActive(true); + _introduceGeo.transform.Find("introduceTitle").GetComponent().text = obj.ThreeTaskName; _trainExplainTxt.text = obj.ProcessDescription; if (!string.IsNullOrEmpty(obj.SoundPath)) {