Cal
/
LaboratoryProtection
forked from zxl/LaboratoryProtection
1
0
Fork 0
Code Pull Requests Activity

完成第二模块对话内容

master
zc 2023-09-19 09:50:35 +08:00
parent 514edc820b
commit a5f41b0bd2
13 changed files with 2079 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
Assets/Artworks/MeiGongZiYuan/Animations/ShiYanShi2-DH/2-6.FBX.meta
View File

@ -31,7 +31,36 @@ ModelImporter:
animationWrapMode: 0 animationWrapMode: 0
extraExposedTransformPaths: [] extraExposedTransformPaths: []
extraUserProperties: [] extraUserProperties: []
clipAnimations: [] clipAnimations:
- serializedVersion: 16
name: Take 001
takeName: Take 001
internalID: 1827226128182048838
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: 0 isReadable: 0
meshes: meshes:
lODScreenPercentages: [] lODScreenPercentages: []

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

@ -970,7 +970,36 @@ ModelImporter:
animationWrapMode: 0 animationWrapMode: 0
extraExposedTransformPaths: [] extraExposedTransformPaths: []
extraUserProperties: [] extraUserProperties: []
clipAnimations: [] clipAnimations:
- serializedVersion: 16
name: Take 001
takeName: Take 001
internalID: 7400000
firstFrame: 520
lastFrame: 560
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 isReadable: 1
meshes: meshes:
lODScreenPercentages: [] lODScreenPercentages: []

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

@ -757,7 +757,36 @@ ModelImporter:
animationWrapMode: 0 animationWrapMode: 0
extraExposedTransformPaths: [] extraExposedTransformPaths: []
extraUserProperties: [] 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 isReadable: 1
meshes: meshes:
lODScreenPercentages: [] lODScreenPercentages: []

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

@ -727,7 +727,36 @@ ModelImporter:
animationWrapMode: 0 animationWrapMode: 0
extraExposedTransformPaths: [] extraExposedTransformPaths: []
extraUserProperties: [] 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 isReadable: 1
meshes: meshes:
lODScreenPercentages: [] lODScreenPercentages: []

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

@ -799,7 +799,36 @@ ModelImporter:
animationWrapMode: 0 animationWrapMode: 0
extraExposedTransformPaths: [] extraExposedTransformPaths: []
extraUserProperties: [] 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 isReadable: 1
meshes: meshes:
lODScreenPercentages: [] lODScreenPercentages: []

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

@ -818,7 +818,36 @@ ModelImporter:
animationWrapMode: 0 animationWrapMode: 0
extraExposedTransformPaths: [] extraExposedTransformPaths: []
extraUserProperties: [] 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 isReadable: 1
meshes: meshes:
lODScreenPercentages: [] lODScreenPercentages: []

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

File diff suppressed because it is too large Load Diff

3
Assets/UnityTest/ZXL/Scripts/DialogueRoleManager.cs
View File

@ -36,8 +36,11 @@ namespace UnityTest.ZXL
rightPoint.gameObject.SetActive(true); rightPoint.gameObject.SetActive(true);
rightGo.SetActive(true); rightGo.SetActive(true);
rightGo.transform.position = rightPoint.position; rightGo.transform.position = rightPoint.position;
rightGo.transform.rotation = rightPoint.rotation; rightGo.transform.rotation = rightPoint.rotation;
if (right == DialogueType.火警119)
rightGo.transform.position += new Vector3(0.030f, 0.342f, 0.2544f);
List<Animator> list = new List<Animator>(); List<Animator> list = new List<Animator>();
var leftAni = leftGo.GetComponent<Animator>(); var leftAni = leftGo.GetComponent<Animator>();

2
Assets/UnityTest/ZXL/Scripts/Process/ProcessManager.cs
View File

@ -29,7 +29,6 @@ namespace UnityTest.ZXL
// processIndex = 0; // processIndex = 0;
SetProcess(startProcessType); SetProcess(startProcessType);
processIndex = (int)startProcessType;
} }
private void OnDestroy() private void OnDestroy()
@ -89,6 +88,7 @@ namespace UnityTest.ZXL
void SetProcess(ProcessType processType) void SetProcess(ProcessType processType)
{ {
Debug.Log($"{processType}"); Debug.Log($"{processType}");
processIndex = (int)startProcessType;
_token = new ETCancellationToken(); _token = new ETCancellationToken();
processGos.TryGetValue(processType, out ProcessBase processBase); processGos.TryGetValue(processType, out ProcessBase processBase);

1
Assets/UnityTest/ZXL/Scripts/Process/SecondProcess.cs
View File

@ -56,6 +56,7 @@ namespace UnityTest.ZXL
await dialogueUI.StartAnDialogueAsync(dialogueData[i]); await dialogueUI.StartAnDialogueAsync(dialogueData[i]);
} }
EventManager.Instance.FireNow(this, new ProcessOverEventArgs(processType));
UIManager.Instance().HideUI(UIType.Dialogue); UIManager.Instance().HideUI(UIType.Dialogue);
} }

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

@ -43,12 +43,13 @@ namespace UnityTest.ZXL
list[0].enabled = true; list[0].enabled = true;
list[1].enabled = false; list[1].enabled = false;
left.role.text = leftData.dialogueType.ToString(); left.role.text = leftData.dialogueType.ToString();
right.role.text = rightData.dialogueType.ToString();
await left.content.WaitDoTMPText(leftData.content, ""); await left.content.WaitDoTMPText(leftData.content, "");
list[0].enabled = false; list[0].enabled = false;
list[1].enabled = true; list[1].enabled = true;
right.role.text = rightData.dialogueType.ToString();
await right.content.WaitDoTMPText(rightData.content, ""); await right.content.WaitDoTMPText(rightData.content, "");
list[1].enabled = false;
btnNext.gameObject.SetActive(true); btnNext.gameObject.SetActive(true);
await task; await task;

26
Assets/UnityTest/ZXL/Scripts/UI/RefreshLayout.cs Normal file
View File

@ -0,0 +1,26 @@
using System;
using UnityEngine;
using UnityEngine.UI;
namespace UnityTest.ZXL
{
public class RefreshLayout : MonoBehaviour
{
private RectTransform rect;
private void Awake()
{
rect = GetComponent<RectTransform>();
}
private void Update()
{
Refresh();
}
private void Refresh()
{
LayoutRebuilder.ForceRebuildLayoutImmediate(rect);
}
}
}

3
Assets/UnityTest/ZXL/Scripts/UI/RefreshLayout.cs.meta Normal file
View File

@ -0,0 +1,3 @@
fileFormatVersion: 2
guid: 4daab7ef1c9642f2afeb417d87c11ee3
timeCreated: 1695086962