mod: 第二模块修改完成
parent
7ec764ceef
commit
0eb3bdd1e4
|
@ -14,8 +14,8 @@ RenderTexture:
|
||||||
m_DownscaleFallback: 0
|
m_DownscaleFallback: 0
|
||||||
m_IsAlphaChannelOptional: 0
|
m_IsAlphaChannelOptional: 0
|
||||||
serializedVersion: 5
|
serializedVersion: 5
|
||||||
m_Width: 1920
|
m_Width: 512
|
||||||
m_Height: 1080
|
m_Height: 512
|
||||||
m_AntiAliasing: 1
|
m_AntiAliasing: 1
|
||||||
m_MipCount: -1
|
m_MipCount: -1
|
||||||
m_DepthStencilFormat: 94
|
m_DepthStencilFormat: 94
|
||||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -11,6 +11,7 @@ namespace UnityTest.ZXL
|
||||||
public class DialogueUI : UI
|
public class DialogueUI : UI
|
||||||
{
|
{
|
||||||
public DialogueStr left;
|
public DialogueStr left;
|
||||||
|
public DialogueStr left1;
|
||||||
public DialogueStr right;
|
public DialogueStr right;
|
||||||
public Button btnNext;
|
public Button btnNext;
|
||||||
private ETTask task;
|
private ETTask task;
|
||||||
|
@ -22,6 +23,8 @@ namespace UnityTest.ZXL
|
||||||
btnNext.gameObject.SetActive(false);
|
btnNext.gameObject.SetActive(false);
|
||||||
left.content.text = "";
|
left.content.text = "";
|
||||||
left.role.text = "";
|
left.role.text = "";
|
||||||
|
left1.content.text = "";
|
||||||
|
left1.role.text = "";
|
||||||
right.content.text = "";
|
right.content.text = "";
|
||||||
right.role.text = "";
|
right.role.text = "";
|
||||||
}
|
}
|
||||||
|
@ -40,11 +43,31 @@ namespace UnityTest.ZXL
|
||||||
var rightData = data.right;
|
var rightData = data.right;
|
||||||
var list = DialogueRoleManager.Instance().ShowRole(leftData.dialogueType, rightData.dialogueType);
|
var list = DialogueRoleManager.Instance().ShowRole(leftData.dialogueType, rightData.dialogueType);
|
||||||
|
|
||||||
|
var leftParent = left.role.transform.parent;
|
||||||
|
var left1Parent = left1.role.transform.parent.parent;
|
||||||
|
|
||||||
|
if (data.index != 2)
|
||||||
|
{
|
||||||
|
// left0
|
||||||
list[0].enabled = true;
|
list[0].enabled = true;
|
||||||
list[1].enabled = false;
|
list[1].enabled = false;
|
||||||
|
leftParent.gameObject.SetActive(true);
|
||||||
|
left1Parent.gameObject.SetActive(false);
|
||||||
left.role.text = leftData.dialogueType.ToString();
|
left.role.text = leftData.dialogueType.ToString();
|
||||||
right.role.text = rightData.dialogueType.ToString();
|
right.role.text = rightData.dialogueType.ToString();
|
||||||
await left.content.WaitDoTMPText(leftData.content, data.left.clipName);
|
await left.content.WaitDoTMPText(leftData.content, data.left.clipName);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
// left1
|
||||||
|
list[0].enabled = true;
|
||||||
|
list[1].enabled = false;
|
||||||
|
leftParent.gameObject.SetActive(false);
|
||||||
|
left1Parent.gameObject.SetActive(true);
|
||||||
|
left1.role.text = leftData.dialogueType.ToString();
|
||||||
|
right.role.text = rightData.dialogueType.ToString();
|
||||||
|
await left1.content.WaitDoTMPText(leftData.content, data.left.clipName);
|
||||||
|
}
|
||||||
|
|
||||||
list[0].enabled = false;
|
list[0].enabled = false;
|
||||||
list[1].enabled = true;
|
list[1].enabled = true;
|
||||||
|
|
|
@ -66,5 +66,6 @@ namespace UnityTest.ZXL
|
||||||
老师J,
|
老师J,
|
||||||
老师L,
|
老师L,
|
||||||
消防员,
|
消防员,
|
||||||
|
老师F,
|
||||||
}
|
}
|
||||||
}
|
}
|
Loading…
Reference in New Issue