zxl
/
LaboratoryProtection
1
0
Fork 1
Code Issues 4 Pull Requests Packages Projects Releases Wiki Activity

fix：第二模块完成修改

hebing
zc 2023-10-08 18:04:13 +08:00
parent df75e59868
commit 518c6f3a61
12 changed files with 244 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
Assets/OtherProject/Artworks/MeiGongZiYuan/Animations/6_donghua11.FBX.meta
View File

@ -757,7 +757,36 @@ ModelImporter:
animationWrapMode: 0
extraExposedTransformPaths: []
extraUserProperties: []
clipAnimations: []
clipAnimations:
- serializedVersion: 16
name: Take 001
takeName: Take 001
internalID: 7400000
firstFrame: 0
lastFrame: 40
wrapMode: 0
orientationOffsetY: 0
level: 0
cycleOffset: 0
loop: 0
hasAdditiveReferencePose: 0
loopTime: 1
loopBlend: 0
loopBlendOrientation: 0
loopBlendPositionY: 0
loopBlendPositionXZ: 0
keepOriginalOrientation: 0
keepOriginalPositionY: 1
keepOriginalPositionXZ: 0
heightFromFeet: 0
mirror: 0
bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000
curves: []
events: []
transformMask: []
maskType: 3
maskSource: {instanceID: 0}
additiveReferencePoseFrame: 0
isReadable: 1
meshes:
lODScreenPercentages: []

6
Assets/OtherProject/Artworks/MeiGongZiYuan/Animations/6_donghua11.controller
View File

@ -24,7 +24,7 @@ AnimatorController:
m_Controller: {fileID: 9100000}
--- !u!1102 &1102058249334772852
AnimatorState:
serializedVersion: 5
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
@ -50,7 +50,7 @@ AnimatorState:
m_TimeParameter:
--- !u!1107 &1107587592169429690
AnimatorStateMachine:
serializedVersion: 5
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
@ -59,7 +59,7 @@ AnimatorStateMachine:
m_ChildStates:
- serializedVersion: 1
m_State: {fileID: 1102058249334772852}
m_Position: {x: 200, y: 0, z: 0}
m_Position: {x: 260, y: 80, z: 0}
m_ChildStateMachines: []
m_AnyStateTransitions: []
m_EntryTransitions: []

31
Assets/OtherProject/Artworks/MeiGongZiYuan/Animations/6_donghua12.FBX.meta
View File

@ -727,7 +727,36 @@ ModelImporter:
animationWrapMode: 0
extraExposedTransformPaths: []
extraUserProperties: []
clipAnimations: []
clipAnimations:
- serializedVersion: 16
name: Take 001
takeName: Take 001
internalID: 7400000
firstFrame: 0
lastFrame: 40
wrapMode: 0
orientationOffsetY: 0
level: 0
cycleOffset: 0
loop: 0
hasAdditiveReferencePose: 0
loopTime: 1
loopBlend: 0
loopBlendOrientation: 0
loopBlendPositionY: 0
loopBlendPositionXZ: 0
keepOriginalOrientation: 0
keepOriginalPositionY: 1
keepOriginalPositionXZ: 0
heightFromFeet: 0
mirror: 0
bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000
curves: []
events: []
transformMask: []
maskType: 3
maskSource: {instanceID: 0}
additiveReferencePoseFrame: 0
isReadable: 1
meshes:
lODScreenPercentages: []

6
Assets/OtherProject/Artworks/MeiGongZiYuan/Animations/6_donghua12.controller
View File

@ -24,7 +24,7 @@ AnimatorController:
m_Controller: {fileID: 9100000}
--- !u!1102 &1102081989163057782
AnimatorState:
serializedVersion: 5
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
@ -50,7 +50,7 @@ AnimatorState:
m_TimeParameter:
--- !u!1107 &1107376692476745542
AnimatorStateMachine:
serializedVersion: 5
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
@ -59,7 +59,7 @@ AnimatorStateMachine:
m_ChildStates:
- serializedVersion: 1
m_State: {fileID: 1102081989163057782}
m_Position: {x: 200, y: 0, z: 0}
m_Position: {x: 270, y: 70, z: 0}
m_ChildStateMachines: []
m_AnyStateTransitions: []
m_EntryTransitions: []

31
Assets/OtherProject/Artworks/MeiGongZiYuan/Animations/6_donghua14.FBX.meta
View File

@ -818,7 +818,36 @@ ModelImporter:
animationWrapMode: 0
extraExposedTransformPaths: []
extraUserProperties: []
clipAnimations: []
clipAnimations:
- serializedVersion: 16
name: Take 001
takeName: Take 001
internalID: 7400000
firstFrame: 0
lastFrame: 40
wrapMode: 0
orientationOffsetY: 0
level: 0
cycleOffset: 0
loop: 0
hasAdditiveReferencePose: 0
loopTime: 1
loopBlend: 0
loopBlendOrientation: 0
loopBlendPositionY: 0
loopBlendPositionXZ: 0
keepOriginalOrientation: 0
keepOriginalPositionY: 1
keepOriginalPositionXZ: 0
heightFromFeet: 0
mirror: 0
bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000
curves: []
events: []
transformMask: []
maskType: 3
maskSource: {instanceID: 0}
additiveReferencePoseFrame: 0
isReadable: 1
meshes:
lODScreenPercentages: []

60
Assets/OtherProject/Artworks/MeiGongZiYuan/Animations/6_donghua14.controller
View File

@ -1,5 +1,31 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1102 &-3332356390442679086
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Take 001
m_Speed: 1
m_CycleOffset: 0
m_Transitions: []
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
m_WriteDefaultValues: 1
m_Mirror: 0
m_SpeedParameterActive: 0
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 7400000, guid: 6287aca099a481e4a8ab35fd3f47fd96, type: 3}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!91 &9100000
AnimatorController:
m_ObjectHideFlags: 0
@ -22,35 +48,9 @@ AnimatorController:
m_IKPass: 0
m_SyncedLayerAffectsTiming: 0
m_Controller: {fileID: 9100000}
--- !u!1102 &4273390959800893067
AnimatorState:
serializedVersion: 5
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Take 001
m_Speed: 1
m_CycleOffset: 0
m_Transitions: []
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
m_WriteDefaultValues: 1
m_Mirror: 0
m_SpeedParameterActive: 0
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 7400000, guid: a18ca5af4434c8447862f0ed4146c165, type: 3}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1107 &8686461728752825179
AnimatorStateMachine:
serializedVersion: 5
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
@ -58,8 +58,8 @@ AnimatorStateMachine:
m_Name: Base Layer
m_ChildStates:
- serializedVersion: 1
m_State: {fileID: 4273390959800893067}
m_Position: {x: 200, y: 0, z: 0}
m_State: {fileID: -3332356390442679086}
m_Position: {x: 290, y: 90, z: 0}
m_ChildStateMachines: []
m_AnyStateTransitions: []
m_EntryTransitions: []
@ -69,4 +69,4 @@ AnimatorStateMachine:
m_EntryPosition: {x: 50, y: 120, z: 0}
m_ExitPosition: {x: 800, y: 120, z: 0}
m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
m_DefaultState: {fileID: 4273390959800893067}
m_DefaultState: {fileID: -3332356390442679086}

17
Assets/OtherProject/Artworks/MeiGongZiYuan/Animations/Materials/T_Player_Heather_Hair_Test.mat
View File

@ -2,22 +2,19 @@
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 8
serializedVersion: 6
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: T_Player_Heather_Hair_Test
m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
m_ValidKeywords:
- _ALPHAPREMULTIPLY_ON
m_InvalidKeywords: []
m_Shader: {fileID: 4800000, guid: cfb5ebf40cdb346a196a05d67091370b, type: 3}
m_ShaderKeywords: _ALPHAPREMULTIPLY_ON
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: 3000
stringTagMap:
RenderType: Transparent
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
@ -66,7 +63,6 @@ Material:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _BumpScale: 1
- _Cull: 0
@ -92,6 +88,5 @@ Material:
- _UVSec: 0
- _ZWrite: 0
m_Colors:
- _Color: {r: 0, g: 0, b: 0, a: 1}
- _Color: {r: 0.764151, g: 0.764151, b: 0.764151, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
m_BuildTextureStacks: []

BIN
Assets/Resources/Sounds/6-4/2-4-4.mp3
View File

Binary file not shown.

2
Assets/Resources/Sounds/6-4/2-4-4.mp3.meta
View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 64d9d63c5dae6bc4e9112338ab92d87c
guid: 35c0251bc6f27e2459e8c7804303108f
AudioImporter:
externalObjects: {}
serializedVersion: 6

108
Assets/UnityTest/ZXL/Scene/Main.unity
View File

@ -19056,6 +19056,82 @@ Animator:
m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorStateOnDisable: 0
m_WriteDefaultValuesOnDisable: 0
--- !u!1 &257686362
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 257686363}
- component: {fileID: 257686365}
- component: {fileID: 257686364}
m_Layer: 5
m_Name: Image
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &257686363
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 257686362}
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: 1638192197}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -0.00012207031, y: 0}
m_SizeDelta: {x: 1920, y: 1080}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &257686364
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 257686362}
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: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 0
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: dbb24750bd71b894fa9dd3ff9440d04b, 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 &257686365
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 257686362}
m_CullTransparentMesh: 1
--- !u!1 &260787464
GameObject:
m_ObjectHideFlags: 0
@ -47539,7 +47615,7 @@ RectTransform:
m_Children:
- {fileID: 402332233}
m_Father: {fileID: 1638192197}
m_RootOrder: 0
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@ -79188,73 +79264,89 @@ MonoBehaviour:
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"
clipName: 2-1-1
animator: {fileID: 0}
right:
dialogueType: 4
content: "\u597D\u7684\uFF0C\u6211\u77E5\u9053\u4E86\uFF0C\u73B0\u573A\u60C5\u51B5\u5982\u4F55\uFF1F"
clipName: 2-1-2
animator: {fileID: 0}
- 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"
clipName: 2-1-3
animator: {fileID: 0}
right:
dialogueType: 4
content: "\u597D\u7684\uFF0C\u6211\u9A6C\u4E0A\u8D76\u5230\u73B0\u573A\uFF01"
clipName: 2-1-4
animator: {fileID: 0}
- index: 2
left:
dialogueType: 5
content: "\u4ECA\u5929\u4E0A\u534810\u70B9\u5DE6\u53F3\uFF0C\u73AF\u5DE5\u697C411\u5B9E\u9A8C\u5BA4\u53D1\u751F\u4E59\u7094\u6C14\u74F6\u6CC4\u6F0F\u8D77\u706B,\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"
clipName: 2-2-1
animator: {fileID: 0}
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\u3002"
clipName: 2-2-2
animator: {fileID: 0}
- index: 3
left:
dialogueType: 5
content: "\u59D3\u540DG\uFF0C\u7535\u8BDD123456789\u3002"
clipName: 2-2-3
animator: {fileID: 0}
right:
dialogueType: 3
content: "\u597D\u7684\u3002"
clipName: 2-2-4
animator: {fileID: 0}
- 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"
clipName: 2-3-1
animator: {fileID: 0}
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"
clipName: 2-3-2
animator: {fileID: 0}
- 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"
clipName: 2-3-3
animator: {fileID: 0}
right:
dialogueType: 1
content: "\u597D\u7684\uFF0C\u6211\u5C3D\u5FEB\u534F\u8C03\u5904\u7F6E\uFF01"
clipName: 2-3-4
animator: {fileID: 0}
- 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"
clipName: 2-4-1
animator: {fileID: 0}
right:
dialogueType: 2
content: "\u597D\u7684\uFF0C\u6211\u9A6C\u4E0A\u8D76\u6765\u3002"
clipName: 2-4-2
animator: {fileID: 0}
- 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"
clipName: 2-4-3
animator: {fileID: 0}
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"
clipName: 2-4-4
animator: {fileID: 0}
--- !u!1 &927477539
GameObject:
m_ObjectHideFlags: 0
@ -82712,6 +82804,11 @@ PrefabInstance:
propertyPath: m_Layer
value: 14
objectReference: {fileID: 0}
- target: {fileID: -2299314219330630608, guid: a08fd24e19220ac4181676840d003e9a,
type: 3}
propertyPath: m_Enabled
value: 0
objectReference: {fileID: 0}
- target: {fileID: 100000, guid: a08fd24e19220ac4181676840d003e9a, type: 3}
propertyPath: m_Name
value: "\u5B9E\u9A8C\u7EC4\u5B89\u5168\u8D1F\u8D23\u4EBA\u540C\u5B66G"
@ -89224,7 +89321,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 400000, guid: 187dfc34ccda891499ae3ce9eb166d62, type: 3}
propertyPath: m_RootOrder
value: 2
value: 1
objectReference: {fileID: 0}
- target: {fileID: 400000, guid: 187dfc34ccda891499ae3ce9eb166d62, type: 3}
propertyPath: m_LocalPosition.x
@ -94526,7 +94623,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 400000, guid: 6287aca099a481e4a8ab35fd3f47fd96, type: 3}
propertyPath: m_RootOrder
value: 6
value: 3
objectReference: {fileID: 0}
- target: {fileID: 400000, guid: 6287aca099a481e4a8ab35fd3f47fd96, type: 3}
propertyPath: m_LocalScale.x
@ -133751,7 +133848,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 400000, guid: a18ca5af4434c8447862f0ed4146c165, type: 3}
propertyPath: m_RootOrder
value: 8
value: 4
objectReference: {fileID: 0}
- target: {fileID: 400000, guid: a18ca5af4434c8447862f0ed4146c165, type: 3}
propertyPath: m_LocalPosition.x
@ -140851,6 +140948,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 257686363}
- {fileID: 602368911}
m_Father: {fileID: 1291583396}
m_RootOrder: 0
@ -168376,7 +168474,7 @@ PrefabInstance:
- target: {fileID: -8679921383154817045, guid: 14baee7ce621c8a4b95e44745b2ef5cf,
type: 3}
propertyPath: m_RootOrder
value: 10
value: 5
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 14baee7ce621c8a4b95e44745b2ef5cf,
type: 3}

2
Assets/UnityTest/ZXL/Scripts/DialogueData.cs
View File

@ -1,4 +1,5 @@
using Sirenix.OdinInspector;
using UnityEngine;
namespace UnityTest.ZXL
{
@ -16,6 +17,7 @@ namespace UnityTest.ZXL
public DialogueType dialogueType;
public string content;
public string clipName;
public Animator animator;
}
[System.Serializable]

6
Assets/UnityTest/ZXL/Scripts/UI/DialogueUI.cs
View File

@ -71,8 +71,14 @@ namespace UnityTest.ZXL
list[0].enabled = false;
list[1].enabled = true;
list[0].Play("Take 001", -1, 0f);
list[0].Update(0f);
await right.content.WaitDoTMPText(rightData.content, data.right.clipName);
list[1].enabled = false;
list[1].Play("Take 001", -1, 0f);
list[1].Update(0f);
btnNext.gameObject.SetActive(true);
await task;