WangWeiZhi
/
YanCheng_Metrology
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' of http://5a4e4c01.r5.cpolar.top/WangWeiZhi/YanCheng_Metrology

This commit is contained in:
YangHua 2024-09-02 19:28:41 +08:00
parent bbf7dc948b 17edf664b7
commit 842dcdbbd4
4 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Assets/Scenes/05_LiveScene.unity
View File

@ -3070,8 +3070,8 @@ Transform:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 950850337} m_GameObject: {fileID: 950850337}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0.14606, y: -0.15198, z: 0.40478} m_LocalPosition: {x: 0.14606, y: -0.15198, z: 0.40884}
m_LocalScale: {x: 0.10437811, y: 0.029909056, z: 0.0563622} m_LocalScale: {x: 0.10437811, y: 0.029909056, z: 0.04823308}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: [] m_Children: []
m_Father: {fileID: 543450652271447145} m_Father: {fileID: 543450652271447145}

14
Assets/Scripts/CXX/StepState/1002/StepState_1002.cs
View File

@ -139,18 +139,28 @@ public class StepState_1002 : StepState
SiteManager.instance.measuringCabinet.Init(); SiteManager.instance.measuringCabinet.Init();
//还原npc对话 //还原npc对话
GameObject.FindObjectsOfType<NPCController>().ToList().ForEach(a => { a.speackIndex = 0; }); GameObject.FindObjectsOfType<NPCController>().ToList().ForEach(a =>
{
a.speackIndex = 0;
a.spriteRenderer.gameObject.SetActive(true);
});
} }
else if (num == 8) else if (num == 8)
{ {
//班前会 //班前会
GameObject.FindObjectsOfType<NPCController>().ToList().Find(a => a.triggerName == "NPC¿Í»§").spriteRenderer.gameObject.SetActive(false);
} }
else if (num == 9) else if (num == 9)
{ {
//接线检查 //接线检查
//还原npc负责人 //还原npc负责人
GameObject.FindObjectsOfType<NPCController>().ToList().Find(a => a.triggerName == "NPC负责人").speackIndex = 1; GameObject.FindObjectsOfType<NPCController>().ToList().ForEach(a =>
{
if(a.triggerName == "NPC¸ºÔðÈË")
a.speackIndex = 1;
a.spriteRenderer.gameObject.SetActive(false);
});
} }
else if(num == 10) else if(num == 10)
{ {

1
Assets/Scripts/CXX/Tools/Tool_TestPen.cs
View File

@ -76,6 +76,7 @@ public class Tool_TestPen : Tool_Base
if (!isMoving) if (!isMoving)
{ {
isFlicker = false; isFlicker = false;
screem.materials[0].color = Color.white;
base.ReBackHead(); base.ReBackHead();
} }
} }

1
Assets/Scripts/Project/UI/UI_Panel/UI_CustomSessionPanel.cs
View File

@ -18,6 +18,7 @@ public class UI_CustomSessionPanel : BasePanel
{ {
this.triggerID = triggerID; this.triggerID = triggerID;
callBack += _callBack; callBack += _callBack;
GetControl<TextMeshProUGUI>("ClientText_DialogBox").DOKill();
GetControl<TextMeshProUGUI>("ClientText_DialogBox").text = ""; GetControl<TextMeshProUGUI>("ClientText_DialogBox").text = "";
//UItext = GetControl<TextMeshProUGUI>("ClientText_DialogBox"); //UItext = GetControl<TextMeshProUGUI>("ClientText_DialogBox");
StartTypewriterEffect(clientTalk); StartTypewriterEffect(clientTalk);