diff --git a/Assets/UnityTest/ZXL/Scene/Main.unity b/Assets/UnityTest/ZXL/Scene/Main.unity index ac60c89..aa26dd1 100644 --- a/Assets/UnityTest/ZXL/Scene/Main.unity +++ b/Assets/UnityTest/ZXL/Scene/Main.unity @@ -9633,38 +9633,6 @@ Transform: m_Father: {fileID: 1970706605} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &107144404 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 107144405} - m_Layer: 0 - m_Name: "\u706B\u8B66119" - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!4 &107144405 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 107144404} - m_LocalRotation: {x: -0, y: -0.25881907, z: -0, w: 0.9659259} - m_LocalPosition: {x: 5.4420004, y: 0.02, z: -3.2899995} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 1991092200} - m_Father: {fileID: 2073942485} - m_RootOrder: 5 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &108279550 PrefabInstance: m_ObjectHideFlags: 0 @@ -14827,6 +14795,8 @@ MonoBehaviour: - Name: Entry: 8 Data: + hhh: '**************************************' + startProcessType: 1 --- !u!1 &151432333 GameObject: m_ObjectHideFlags: 0 @@ -51621,7 +51591,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &549788525 Transform: m_ObjectHideFlags: 0 @@ -54064,7 +54034,7 @@ Animator: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 576227666} - m_Enabled: 1 + m_Enabled: 0 m_Avatar: {fileID: 9000000, guid: a18ca5af4434c8447862f0ed4146c165, type: 3} m_Controller: {fileID: 9100000, guid: 6f77cdb1fab9c254eace03a0ec19f121, type: 2} m_CullingMode: 1 @@ -54559,7 +54529,7 @@ Animator: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 584023977} - m_Enabled: 1 + m_Enabled: 0 m_Avatar: {fileID: 9000000, guid: 6dca3ab4fc47e1c449a756002e252c6c, type: 3} m_Controller: {fileID: 9100000, guid: 6a20b1949eddd3f45a54fb67e86cd729, type: 2} m_CullingMode: 1 @@ -64306,7 +64276,7 @@ Animator: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 667283109} - m_Enabled: 1 + m_Enabled: 0 m_Avatar: {fileID: 9000000, guid: 6287aca099a481e4a8ab35fd3f47fd96, type: 3} m_Controller: {fileID: 9100000, guid: b16ac30d00e52f844a4e789ed7fa629b, type: 2} m_CullingMode: 1 @@ -71823,7 +71793,7 @@ MonoBehaviour: - {fileID: 667283109} - {fileID: 1940187050} - {fileID: 576227666} - - {fileID: 107144404} + - {fileID: 0} - {fileID: 584023977} SerializedBytesString: Prefab: {fileID: 0} @@ -83220,6 +83190,7 @@ MonoBehaviour: role: {fileID: 1311684589} content: {fileID: 1927171468} dialogueType: {fileID: 687106201} + btnNext: {fileID: 1406468652} --- !u!1 &835338783 GameObject: m_ObjectHideFlags: 0 @@ -87618,7 +87589,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!4 &889403234 Transform: m_ObjectHideFlags: 0 @@ -91050,6 +91021,64 @@ MonoBehaviour: - Name: Entry: 8 Data: + datas: [] + dialogueData: + - index: 0 + left: + dialogueType: 5 + content: "\u73AF\u5DE5\u697C411\u5B9E\u9A8C\u5BA4\u53D1\u751F\u4E59\u7094\u6C14\u74F6\u6CC4\u6F0F\u8D77\u706B\u3001\u8FDB\u800C\u5F15\u53D1\u539F\u5B50\u5438\u6536\u5206\u5149\u5149\u5EA6\u8BA1\u53D1\u751F\u7206\u70B8\u3002" + right: + dialogueType: 4 + content: "\u597D\u7684\uFF0C\u6211\u77E5\u9053\u4E86\uFF0C\u73B0\u573A\u60C5\u51B5\u5982\u4F55\uFF1F" + - index: 1 + left: + dialogueType: 5 + content: "\u73B0\u573A3\u4EBA\u5458\u8F7B\u4F24\uFF0C\u5DF2\u8F6C\u79FB\u5B89\u5168\u5730\u5E26\uFF0C\u73B0\u573A\u6C14\u74F6\u7AD9\u7ACB\uFF0C\u51FA\u6C14\u53E3\u706B\u7130\u5411\u5916\u55B7\u5C04\u71C3\u70E7\uFF0C\u540C\u5B66E\u6309\u7167\u5E94\u6025\u7A0B\u5E8F\uFF0C\u5C1D\u8BD5\u5173\u7D27\u51FA\u6C14\u53E3\u9600\u95E8\uFF0C\u4F46\u65E0\u6CD5\u5173\u95ED\uFF0C\u706B\u7130\u4F9D\u7136\u71C3\u70E7\uFF0C\u5468\u56F4\u672A\u6709\u65B0\u7684\u5F15\u71C3\u7269\u3002" + right: + dialogueType: 4 + content: "\u597D\u7684\uFF0C\u6211\u9A6C\u4E0A\u8D76\u5230\u73B0\u573A\uFF01" + - index: 2 + left: + dialogueType: 5 + content: "\u4ECA\u5929\u4E0A\u534810\u70B9\u5DE6\u53F3\u3001\u5927\u8FDE\u6D77\u4E8B\u5927\u5B66\u73AF\u5DE5\u697C411\u5B9E\u9A8C\u5BA4\u53D1\u751F\u4E59\u7094\u6C14\u74F6\u6CC4\u6F0F\u8D77\u706B\u3001\u8FDB\u800C\u5F15\u53D1\u539F\u5B50\u5438\u6536\u5206\u5149\u5149\u5EA6\u8BA1\u53D1\u751F\u7206\u70B8\uFF0C\u73B0\u573A3\u4EBA\u5458\u8F7B\u4F24\uFF0C\u5DF2\u8F6C\u79FB\u5B89\u5168\u5730\u5E26\u3002\u73B0\u573A\u6C14\u74F6\u7AD9\u7ACB\uFF0C\u51FA\u6C14\u53E3\u706B\u7130\u5411\u5916\u55B7\u5C04\u71C3\u70E7\uFF0C\u5C1D\u8BD5\u5173\u95ED\u51FA\u6C14\u53E3\u9600\u95E8\u5931\u8D25\uFF0C\u76EE\u524D\u5468\u56F4\u672A\u6709\u65B0\u7684\u5F15\u71C3\uFF0C\u6709\u7206\u70B8\u5371\u9669\uFF0C\u8BF7\u6C42\u6551\u63F4\u3002" + right: + dialogueType: 3 + content: "\u597D\u7684\uFF0C\u9700\u8981\u7559\u4E0B\u60A8\u7684\u59D3\u540D\u548C\u8054\u7CFB\u7535\u8BDD\uFF0C\u4EE5\u5907\u63A5\u5E94\uFF1B" + - index: 3 + left: + dialogueType: 5 + content: "\u59D3\u540DG\uFF0C\u7535\u8BDD123456789" + right: + dialogueType: 3 + content: "\u597D\u7684\uFF1B" + - index: 4 + left: + dialogueType: 4 + content: "\u9886\u5BFC\uFF0C\u73AF\u5DE5\u697C411\u5B9E\u9A8C\u5BA4\u53D1\u751F\u4E59\u7094\u6C14\u74F6\u8D77\u706B\u3001\u539F\u5B50\u5438\u6536\u5206\u5149\u5149\u5EA6\u8BA1\u53D1\u751F\u7206\u70B8\u3002" + right: + dialogueType: 1 + content: "\u597D\u7684\uFF0C\u6211\u77E5\u9053\u4E86\uFF0C\u6B64\u4E8B\u6BD4\u8F83\u4E25\u91CD\uFF0C\u73B0\u573A\u60C5\u51B5\u5982\u4F55\uFF1F" + - index: 5 + left: + dialogueType: 4 + content: "\u73B0\u573A3\u4EBA\u8F7B\u4F24\uFF0C\u53D7\u4F24\u540C\u5B66\u5DF2\u8F6C\u79FB\u81F3\u5B89\u5168\u4F4D\u7F6E\uFF0C\u5C1D\u8BD5\u5173\u95ED\u6C14\u74F6\u51FA\u6C14\u53E3\u9600\u95E8\u5931\u8D25\uFF0C\u51FA\u6C14\u53E3\u706B\u7130\u5411\u5916\u55B7\u5C04\u71C3\u70E7\uFF0C\u6709\u7206\u70B8\u5371\u9669\uFF0C\u73B0\u5DF2\u62E8\u6253\u201C119\u201D\u706B\u707E\u62A5\u8B66\uFF0C\u8BF7\u60A8\u5C3D\u5FEB\u5B89\u6392\u5904\u7406\u3002" + right: + dialogueType: 1 + content: "\u597D\u7684\uFF0C\u6211\u5C3D\u5FEB\u534F\u8C03\u5904\u7F6E\uFF01" + - index: 6 + left: + dialogueType: 1 + content: "J\u8001\u5E08\uFF0C\u6211\u9662\u73AF\u5DE5\u697C411\u5B9E\u9A8C\u5BA4\u53D1\u751F\u4E59\u7094\u6C14\u74F6\u8D77\u706B\u3001\u539F\u5B50\u5438\u6536\u5206\u5149\u5149\u5EA6\u8BA1\u53D1\u751F\u7206\u70B8\uFF0C\u73B0\u573A\u5DF23\u4EBA\u5458\u8F7B\u4F24\uFF0C\u6C14\u74F6\u51FA\u6C14\u53E3\u9600\u95E8\u65E0\u6CD5\u5173\u95ED\uFF0C\u706B\u7130\u65E0\u6CD5\u7184\u706D\uFF0C\u6709\u7206\u70B8\u5371\u9669\uFF0C\u8BF7\u4F60\u5C3D\u5FEB\u7EC4\u7EC7\u542F\u52A8\u73B0\u573A\u5E94\u6025\u5904\u7F6E\uFF01" + right: + dialogueType: 2 + content: "\u597D\u7684\uFF0C\u6211\u9A6C\u4E0A\u8D76\u6765\u3002" + - index: 7 + left: + dialogueType: 1 + content: "\u7BA1\u7406\u5904\u8001\u5E08\uFF0C\u6211\u9662\u73AF\u5DE5\u697C411\u5B9E\u9A8C\u5BA4\u53D1\u751F\u4E59\u7094\u6C14\u74F6\u8D77\u706B\u3001\u539F\u5B50\u5438\u6536\u5206\u5149\u5149\u5EA6\u8BA1\u53D1\u751F\u7206\u70B8\uFF0C\u73B0\u573A\u5DF23\u4EBA\u5458\u8F7B\u4F24\uFF0C\u6C14\u74F6\u51FA\u6C14\u53E3\u9600\u95E8\u65E0\u6CD5\u5173\u95ED\uFF0C\u706B\u7130\u65E0\u6CD5\u7184\u706D\uFF0C\u6709\u7206\u70B8\u5371\u9669\uFF0C\u8BF7\u6C42\u6D3E\u51FA\u4EBA\u5458\u8FDB\u884C\u73B0\u573A\u6551\u52A9\u5904\u7F6E\uFF01" + right: + dialogueType: 0 + content: "\u597D\u7684\uFF0C\u6211\u77E5\u9053\u4E86\uFF0C\u6211\u9A6C\u4E0A\u62A5\u544A\u9886\u5BFC\uFF0C\u8054\u7CFB\u76F8\u5173\u4EBA\u5458\u8D76\u5F80\u73B0\u573A\u534F\u52A9\u5904\u7F6E\uFF01" --- !u!1 &926611194 GameObject: m_ObjectHideFlags: 0 @@ -123645,7 +123674,7 @@ MonoBehaviour: m_Calls: [] m_text: ............ m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 014e502fc4660764d976404e57d9f903, type: 2} + m_fontAsset: {fileID: 11400000, guid: 058a47f4447d10d46a478459368e10f8, type: 2} m_sharedMaterial: {fileID: 2929829565043403201, guid: 014e502fc4660764d976404e57d9f903, type: 2} m_fontSharedMaterials: [] @@ -123710,7 +123739,7 @@ MonoBehaviour: m_margin: {x: 0, y: 0, z: 0, w: 0} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 + m_hasFontAssetChanged: 1 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} --- !u!222 &1272850034 @@ -125261,6 +125290,7 @@ RectTransform: - {fileID: 1638192197} - {fileID: 1892087787} - {fileID: 1286769439} + - {fileID: 1406468651} m_Father: {fileID: 834112893} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -135541,7 +135571,7 @@ Animator: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1389886113} - m_Enabled: 1 + m_Enabled: 0 m_Avatar: {fileID: 9000000, guid: a08fd24e19220ac4181676840d003e9a, type: 3} m_Controller: {fileID: 9100000, guid: d0e965aeb2459f640a36d6df240f139d, type: 2} m_CullingMode: 1 @@ -136731,6 +136761,128 @@ Transform: m_Father: {fileID: 1443669025} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1406468650 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1406468651} + - component: {fileID: 1406468654} + - component: {fileID: 1406468653} + - component: {fileID: 1406468652} + m_Layer: 5 + m_Name: btnNext + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1406468651 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1406468650} + 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: 1291583396} + m_RootOrder: 3 + 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: 848, y: -435} + m_SizeDelta: {x: 56, y: 73} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1406468652 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1406468650} + 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: 2 + 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: 21300000, guid: 3e21de7260285064a8ac552257368e7e, + type: 3} + 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: 1406468653} + m_OnClick: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &1406468653 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1406468650} + 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: 8d9a374c168218f4691ff9a6d5328c40, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &1406468654 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1406468650} + m_CullTransparentMesh: 1 --- !u!1 &1406660483 GameObject: m_ObjectHideFlags: 0 @@ -155983,7 +156135,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!4 &1597312253 Transform: m_ObjectHideFlags: 0 @@ -167171,7 +167323,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &1699223966 Transform: m_ObjectHideFlags: 0 @@ -179262,7 +179414,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &1818771315 Transform: m_ObjectHideFlags: 0 @@ -189264,7 +189416,7 @@ MonoBehaviour: m_Calls: [] m_text: ............ m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 014e502fc4660764d976404e57d9f903, type: 2} + m_fontAsset: {fileID: 11400000, guid: 058a47f4447d10d46a478459368e10f8, type: 2} m_sharedMaterial: {fileID: 2929829565043403201, guid: 014e502fc4660764d976404e57d9f903, type: 2} m_fontSharedMaterials: [] @@ -189329,7 +189481,7 @@ MonoBehaviour: m_margin: {x: 0, y: 0, z: 0, w: 0} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 + m_hasFontAssetChanged: 1 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} --- !u!222 &1927171469 @@ -190475,7 +190627,7 @@ Animator: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1940187050} - m_Enabled: 1 + m_Enabled: 0 m_Avatar: {fileID: 9000000, guid: 187dfc34ccda891499ae3ce9eb166d62, type: 3} m_Controller: {fileID: 9100000, guid: cb3fad2040d83d14eb586bfad800e8a1, type: 2} m_CullingMode: 1 @@ -197077,7 +197229,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 107144405} + m_TransformParent: {fileID: 2073942485} m_Modifications: - target: {fileID: -9211537405175205359, guid: 14baee7ce621c8a4b95e44745b2ef5cf, type: 3} @@ -197157,42 +197309,42 @@ PrefabInstance: - target: {fileID: -8679921383154817045, guid: 14baee7ce621c8a4b95e44745b2ef5cf, type: 3} propertyPath: m_RootOrder - value: 0 + value: 5 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 14baee7ce621c8a4b95e44745b2ef5cf, type: 3} propertyPath: m_LocalPosition.x - value: 0.037 + value: 5.3525434 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 14baee7ce621c8a4b95e44745b2ef5cf, type: 3} propertyPath: m_LocalPosition.y - value: 0.298 + value: 0.31800002 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 14baee7ce621c8a4b95e44745b2ef5cf, type: 3} propertyPath: m_LocalPosition.z - value: 0.243 + value: -3.0610554 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 14baee7ce621c8a4b95e44745b2ef5cf, type: 3} propertyPath: m_LocalRotation.w - value: 1 + value: 0.9659259 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 14baee7ce621c8a4b95e44745b2ef5cf, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 14baee7ce621c8a4b95e44745b2ef5cf, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0.25881907 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 14baee7ce621c8a4b95e44745b2ef5cf, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 14baee7ce621c8a4b95e44745b2ef5cf, type: 3} @@ -198109,6 +198261,11 @@ PrefabInstance: propertyPath: m_Layer value: 14 objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: 14baee7ce621c8a4b95e44745b2ef5cf, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 955304932828074948, guid: 14baee7ce621c8a4b95e44745b2ef5cf, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -198986,7 +199143,7 @@ Animator: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1991092201} - m_Enabled: 1 + m_Enabled: 0 m_Avatar: {fileID: 0} m_Controller: {fileID: 9100000, guid: feeaa79c2f9401f4f9c9ee1ebf88f36b, type: 2} m_CullingMode: 0 @@ -204744,7 +204901,7 @@ Transform: - {fileID: 1940187051} - {fileID: 667283110} - {fileID: 576227667} - - {fileID: 107144405} + - {fileID: 1991092200} m_Father: {fileID: 1468147296} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Assets/UnityTest/ZXL/Scripts/DialogueData.cs b/Assets/UnityTest/ZXL/Scripts/DialogueData.cs index 1b34ef1..f309543 100644 --- a/Assets/UnityTest/ZXL/Scripts/DialogueData.cs +++ b/Assets/UnityTest/ZXL/Scripts/DialogueData.cs @@ -10,6 +10,21 @@ namespace UnityTest.ZXL public string content; } + [System.Serializable] + public struct DialogueContentData + { + public DialogueType dialogueType; + public string content; + } + + [System.Serializable] + public struct DialogueData2 + { + public int index; + public DialogueContentData left; + public DialogueContentData right; + } + public enum DialogueType { 学校实验室管理处负责老师K, diff --git a/Assets/UnityTest/ZXL/Scripts/DialogueRoleManager.cs b/Assets/UnityTest/ZXL/Scripts/DialogueRoleManager.cs index d0d2d82..8633955 100644 --- a/Assets/UnityTest/ZXL/Scripts/DialogueRoleManager.cs +++ b/Assets/UnityTest/ZXL/Scripts/DialogueRoleManager.cs @@ -20,22 +20,31 @@ namespace UnityTest.ZXL #if UNITY_EDITOR [Button] #endif - public void ShowRole(DialogueType left, DialogueType right) + public List ShowRole(DialogueType left, DialogueType right) { HideAllRole(); - if (dictionary.TryGetValue(left, out GameObject leftGo)) - { - leftGo.SetActive(true); - leftGo.transform.position = leftPoint.position; - leftGo.transform.rotation = leftPoint.rotation; - } + if (!dictionary.TryGetValue(left, out GameObject leftGo)) + return null; - if (dictionary.TryGetValue(right, out GameObject rightGo)) - { - rightGo.SetActive(true); - rightGo.transform.position = rightPoint.position; - rightGo.transform.rotation = rightPoint.rotation; - } + leftPoint.gameObject.SetActive(true); + leftGo.SetActive(true); + leftGo.transform.position = leftPoint.position; + leftGo.transform.rotation = leftPoint.rotation; + + if (!dictionary.TryGetValue(right, out GameObject rightGo)) + return null; + + rightPoint.gameObject.SetActive(true); + rightGo.SetActive(true); + rightGo.transform.position = rightPoint.position; + rightGo.transform.rotation = rightPoint.rotation; + + List list = new List(); + var leftAni = leftGo.GetComponent(); + list.Add(leftAni); + var rightAni = rightGo.GetComponent(); + list.Add(rightAni); + return list; } public void HideAllRole() @@ -43,7 +52,11 @@ namespace UnityTest.ZXL foreach (var value in dictionary.Values) { value.SetActive(false); + value.GetComponent().enabled = false; } + + leftPoint.gameObject.SetActive(true); + rightPoint.gameObject.SetActive(true); } public GameObject Get(DialogueType dialogueType) diff --git a/Assets/UnityTest/ZXL/Scripts/ETTaskHelper.cs b/Assets/UnityTest/ZXL/Scripts/ETTaskHelper.cs index 5e1787f..5932990 100644 --- a/Assets/UnityTest/ZXL/Scripts/ETTaskHelper.cs +++ b/Assets/UnityTest/ZXL/Scripts/ETTaskHelper.cs @@ -1,6 +1,8 @@ using System; using Cysharp.Threading.Tasks; +using DG.Tweening; using DragonSoul.Shared; +using TMPro; namespace UnityTest.ZXL { @@ -57,5 +59,21 @@ namespace UnityTest.ZXL { await UniTask.Delay(TimeSpan.FromSeconds(time)); } + + public static async ETTask WaitDoTMPText(this TextMeshProUGUI text, string content, string audioName, ETCancellationToken token = null) + { + bool isEnd = false; + + var t = 0.1f * content.Length; + DOTween.KillAll(); + + if (audioName != "") + { + t = Script.AudioManager.Instance.PlayOtherSound(false, $"6-4/{audioName}") + 0.1f; + } + + await DOTween.To(() => string.Empty, value => text.text = value, content, t) + .SetEase(Ease.Linear).AwaitForComplete().SuppressCancellationThrow(); + } } } \ No newline at end of file diff --git a/Assets/UnityTest/ZXL/Scripts/Process/ProcessBase.cs b/Assets/UnityTest/ZXL/Scripts/Process/ProcessBase.cs index a82d1fb..30ecf80 100644 --- a/Assets/UnityTest/ZXL/Scripts/Process/ProcessBase.cs +++ b/Assets/UnityTest/ZXL/Scripts/Process/ProcessBase.cs @@ -190,7 +190,7 @@ namespace UnityTest.ZXL public enum ProcessType { - 一_爆炸发生场景, + 一_爆炸发生场景 = 0, 二_汇报程序, 三_准备场景, 四_现场处置场景, diff --git a/Assets/UnityTest/ZXL/Scripts/Process/ProcessManager.cs b/Assets/UnityTest/ZXL/Scripts/Process/ProcessManager.cs index 531ce26..5df1129 100644 --- a/Assets/UnityTest/ZXL/Scripts/Process/ProcessManager.cs +++ b/Assets/UnityTest/ZXL/Scripts/Process/ProcessManager.cs @@ -18,15 +18,18 @@ namespace UnityTest.ZXL private int processIndex; + [ReadOnly] public string hhh = "**************************************"; + [LabelText("初始启动流程")] public ProcessType startProcessType; + private void Awake() { EventManager.Instance.Subscribe(ProcessOverEventArgs.EventId, PlayableStoppedEvent); - SetProcess(ProcessType.一_爆炸发生场景); - processIndex = 0; - - // SetProcess(ProcessType.三_准备场景); - // processIndex = 2; + // SetProcess(ProcessType.一_爆炸发生场景); + // processIndex = 0; + + SetProcess(startProcessType); + processIndex = (int)startProcessType; } private void OnDestroy() diff --git a/Assets/UnityTest/ZXL/Scripts/Process/SecondProcess.cs b/Assets/UnityTest/ZXL/Scripts/Process/SecondProcess.cs index 60910b4..482b823 100644 --- a/Assets/UnityTest/ZXL/Scripts/Process/SecondProcess.cs +++ b/Assets/UnityTest/ZXL/Scripts/Process/SecondProcess.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using Cysharp.Threading.Tasks; using DragonSoul.Shared; using Mono.Event; +using Sirenix.OdinInspector; using UnityEngine; using UnityEngine.Playables; @@ -12,6 +13,9 @@ namespace UnityTest.ZXL { public override ProcessType processType => ProcessType.二_汇报程序; + public List datas; + public List dialogueData; + protected override void OnInit() { base.OnInit(); @@ -35,8 +39,31 @@ namespace UnityTest.ZXL await chapterUI.Transit(1); UIManager.Instance().HideUI(UIType.Chapter); + + DialogueAsync().Coroutine(); } + private async ETTask DialogueAsync() // + { + // DialogueRoleManager.Instance().ShowRole(); + var showUI = UIManager.Instance().ShowUI(UIType.Dialogue); + var dialogueUI = showUI as DialogueUI; + // dialogueUI.StartLeftDialogueAsync(); + // int dialogueIndex = 0; + + for (var i = 0; i < dialogueData.Count; i++) + { + await dialogueUI.StartAnDialogueAsync(dialogueData[i]); + } + + UIManager.Instance().HideUI(UIType.Dialogue); + } + + [Button] + void Add(DialogueAsset dialogueAsset) + { + datas = dialogueAsset.datas; + } // 2-1 // 实验组安全负责人同学G向实验负责老师F报告事故发生：“环工楼411实验室发生乙炔气瓶泄漏起火、进而引发原子吸收分光光度计发生爆炸。 // 实验负责老师F回答：“好的，我知道了，现场情况如何？” diff --git a/Assets/UnityTest/ZXL/Scripts/UI/DialogueUI.cs b/Assets/UnityTest/ZXL/Scripts/UI/DialogueUI.cs index 52c5bc3..f0cd46c 100644 --- a/Assets/UnityTest/ZXL/Scripts/UI/DialogueUI.cs +++ b/Assets/UnityTest/ZXL/Scripts/UI/DialogueUI.cs @@ -1,4 +1,6 @@ using System; +using DG.Tweening; +using DragonSoul.Shared; using TMPro; using UnityEngine; using UnityEngine.Serialization; @@ -10,20 +12,76 @@ namespace UnityTest.ZXL { public DialogueStr left; public DialogueStr right; + public Button btnNext; + private ETTask task; - public void StartAnDialogue(DialogueData leftData, DialogueData rightData) + public override void OnInit() + { + base.OnInit(); + btnNext.onClick.AddListener(ClickNext); + btnNext.gameObject.SetActive(false); + left.content.text = ""; + left.role.text = ""; + right.content.text = ""; + right.role.text = ""; + } + + private void ClickNext() + { + task.SetResult(); + } + + public async ETTask StartAnDialogueAsync(DialogueData2 data) { DialogueRoleManager.Instance().HideAllRole(); // 隐藏所有 + task = ETTask.Create(); + var leftData = data.left; + var rightData = data.right; + var list = DialogueRoleManager.Instance().ShowRole(leftData.dialogueType, rightData.dialogueType); + + list[0].enabled = true; + list[1].enabled = false; left.role.text = leftData.dialogueType.ToString(); - left.content.text = leftData.content; + await left.content.WaitDoTMPText(leftData.content, ""); + list[0].enabled = false; + list[1].enabled = true; right.role.text = rightData.dialogueType.ToString(); - right.content.text = rightData.content; + await right.content.WaitDoTMPText(rightData.content, ""); - DialogueRoleManager.Instance().ShowRole(leftData.dialogueType, rightData.dialogueType); + btnNext.gameObject.SetActive(true); + await task; + + // ResetAll + left.content.text = ""; + left.role.text = ""; + right.content.text = ""; + right.role.text = ""; + btnNext.gameObject.SetActive(false); + DialogueRoleManager.Instance().HideAllRole(); // 隐藏所有 } + // public async ETTask StartLeftDialogueAsync(DialogueContentData leftData) + // { + // DialogueRoleManager.Instance().HideAllRole(); // 隐藏所有 + // left.role.text = leftData.dialogueType.ToString(); + // left.content.text = ""; + // + // DialogueRoleManager.Instance().ShowRole(leftData.dialogueType, leftData.dialogueType); + // await left.content.WaitDoTMPText(leftData.content, ""); + // } + // + // public async ETTask StartRightDialogueAsync(DialogueContentData rightData) + // { + // DialogueRoleManager.Instance().HideAllRole(); // 隐藏所有 + // right.role.text = rightData.dialogueType.ToString(); + // right.content.text = ""; + // + // DialogueRoleManager.Instance().ShowRole(rightData.dialogueType, rightData.dialogueType); + // await right.content.WaitDoTMPText(rightData.content, ""); + // } + private void OnDisable() { DialogueRoleManager.Instance().HideAllRole();