diff --git a/Assets/GameMain/DataTables/Dialog.txt b/Assets/GameMain/DataTables/Dialog.txt
index a3e4690..bb0b92c 100644
--- a/Assets/GameMain/DataTables/Dialog.txt
+++ b/Assets/GameMain/DataTables/Dialog.txt
@@ -4,4 +4,4 @@
# 对话编号 策划备注 对话标识 对话形式 章节编号
1001 第一章介绍 Chapter1_Intro Mask 1.001
1002 第一章主流程 Chapter1_Main BottomBox 1.002
- 1003 第一章玩法开始前闲聊 Chapter1_SmallTalk1 BubbleBox 1.003
+ 1003 第一章玩法开始前闲聊 Chapter1_SmallTalk1 Bubble 1.003
diff --git a/Assets/GameMain/DataTables/DialogLine.txt b/Assets/GameMain/DataTables/DialogLine.txt
index 901aa3f..567ba54 100644
--- a/Assets/GameMain/DataTables/DialogLine.txt
+++ b/Assets/GameMain/DataTables/DialogLine.txt
@@ -2,7 +2,7 @@
# Id SpeakerId Expression SpeakerName Direction Text Emphasis ChapterId DialogId
# int string ExpressionType string int string EmphasisType int int
# 对话行编号 策划备注 说话人Id 表情 显示人名 说话朝向 说话内容 演出效果 章节Id 对话Id
- 100100001 Id规则为 Null None Null 0 相传。相传。相传。相传。相传。相传。相传。相传。相传。相传。相传。相传。相传。相传。相传。相传。相传。相传。相传。相传。相传。相传。相传。相传。相传。相传。相传。相传。相传。相传。相传。相传。相传。相传。 None 1.00100001 1001.00001
+ 100100001 Id规则为 Null None Null 0 相传。 None 1.00100001 1001.00001
100100002 第1位数为章节Id Null None Null 0 Mask。 None 1.00100002 1001.00002
100100003 第2-4位数为对话Id Null None Null 0 很好。 None 1.00100003 1001.00003
100200001 第5-9位数为对话行Id Xu Normal 徐晟壹 0 你好，王。 None 1.00200001 1002.00001
diff --git a/Assets/GameMain/DataTables/UIForm.txt b/Assets/GameMain/DataTables/UIForm.txt
index 53ec801..eccc80b 100644
--- a/Assets/GameMain/DataTables/UIForm.txt
+++ b/Assets/GameMain/DataTables/UIForm.txt
@@ -8,5 +8,5 @@
102 关于 AboutForm Default False True
103 组装玩法UI CombineForm Default False False
104 Mask对话UI MaskDialogForm Default False False
- 105 Bottom对话UI BottomDialogForm Default False False
+ 105 Bottom对话UI BottomBoxDialogForm Default False False
106 Bubble对话UI BubbleDialogForm Default True False
diff --git a/Assets/GameMain/Scripts/Definition/Enum/DialogFormMode.cs b/Assets/GameMain/Scripts/Definition/Enum/DialogFormMode.cs
index 91c1a70..07c32ee 100644
--- a/Assets/GameMain/Scripts/Definition/Enum/DialogFormMode.cs
+++ b/Assets/GameMain/Scripts/Definition/Enum/DialogFormMode.cs
@@ -17,6 +17,6 @@ namespace Definition.Enum
///
/// 对话气泡
///
- BubbleBox = 3
+ Bubble = 3
}
}
\ No newline at end of file
diff --git a/Assets/GameMain/Scripts/Definition/Enum/UIFormId.cs b/Assets/GameMain/Scripts/Definition/Enum/UIFormId.cs
index c55f37f..f3ca7c5 100644
--- a/Assets/GameMain/Scripts/Definition/Enum/UIFormId.cs
+++ b/Assets/GameMain/Scripts/Definition/Enum/UIFormId.cs
@@ -47,7 +47,7 @@ namespace UI
///
/// 底部剧情对话界面。
///
- BottomDialogForm = 105,
+ BottomBoxDialogForm = 105,
///
/// 气泡剧情对话界面。
diff --git a/Assets/GameMain/Scripts/Procedure/ProcedureCombine.cs b/Assets/GameMain/Scripts/Procedure/ProcedureCombine.cs
index 76a2302..08ad6fd 100644
--- a/Assets/GameMain/Scripts/Procedure/ProcedureCombine.cs
+++ b/Assets/GameMain/Scripts/Procedure/ProcedureCombine.cs
@@ -90,8 +90,8 @@ namespace Procedure
//InitializeProcedureState();
GameEntry.Dialog.Init(1);
- GameEntry.Dialog.StartDialog(1001);
- //GameEntry.Dialog.StartDialog(1002);
+ //GameEntry.Dialog.StartDialog(1001);
+ GameEntry.Dialog.StartDialog(1002);
}
///
diff --git a/Assets/GameMain/Scripts/UI/Dialog/Controller/DialogFormController.cs b/Assets/GameMain/Scripts/UI/Dialog/Controller/DialogFormController.cs
index 592f803..5a3014b 100644
--- a/Assets/GameMain/Scripts/UI/Dialog/Controller/DialogFormController.cs
+++ b/Assets/GameMain/Scripts/UI/Dialog/Controller/DialogFormController.cs
@@ -1,3 +1,4 @@
+using System;
using Definition.Enum;
using GameFramework.Event;
using UnityGameFramework.Runtime;
@@ -109,9 +110,9 @@ namespace UI
case DialogFormMode.Mask:
return UIFormId.MaskDialogForm;
case DialogFormMode.BottomBox:
- return UIFormId.BottomDialogForm;
- case DialogFormMode.BubbleBox:
- return UIFormId.BottomDialogForm;
+ return UIFormId.BottomBoxDialogForm;
+ case DialogFormMode.Bubble:
+ throw new NotImplementedException("BubbleBox 对话框尚未实现");
default:
return UIFormId.Undefined;
}
diff --git a/Assets/GameMain/UI/UIForms/BottomDialogForm.prefab b/Assets/GameMain/UI/UIForms/BottomBoxDialogForm.prefab
similarity index 99%
rename from Assets/GameMain/UI/UIForms/BottomDialogForm.prefab
rename to Assets/GameMain/UI/UIForms/BottomBoxDialogForm.prefab
index 021bc84..19efbf2 100644
--- a/Assets/GameMain/UI/UIForms/BottomDialogForm.prefab
+++ b/Assets/GameMain/UI/UIForms/BottomBoxDialogForm.prefab
@@ -615,7 +615,7 @@ GameObject:
- component: {fileID: 4643264964412212504}
- component: {fileID: 2327325990879817607}
m_Layer: 5
- m_Name: BottomDialogForm
+ m_Name: BottomBoxDialogForm
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
diff --git a/Assets/GameMain/UI/UIForms/BottomDialogForm.prefab.meta b/Assets/GameMain/UI/UIForms/BottomBoxDialogForm.prefab.meta
similarity index 100%
rename from Assets/GameMain/UI/UIForms/BottomDialogForm.prefab.meta
rename to Assets/GameMain/UI/UIForms/BottomBoxDialogForm.prefab.meta
diff --git a/数据表/Dialog.txt b/数据表/Dialog.txt
index a3e4690..bb0b92c 100644
--- a/数据表/Dialog.txt
+++ b/数据表/Dialog.txt
@@ -4,4 +4,4 @@
# 对话编号 策划备注 对话标识 对话形式 章节编号
1001 第一章介绍 Chapter1_Intro Mask 1.001
1002 第一章主流程 Chapter1_Main BottomBox 1.002
- 1003 第一章玩法开始前闲聊 Chapter1_SmallTalk1 BubbleBox 1.003
+ 1003 第一章玩法开始前闲聊 Chapter1_SmallTalk1 Bubble 1.003
diff --git a/数据表/Dialog.xlsx b/数据表/Dialog.xlsx
index 6643c37..7ad1427 100644
Binary files a/数据表/Dialog.xlsx and b/数据表/Dialog.xlsx differ
diff --git a/数据表/UIForm.txt b/数据表/UIForm.txt
index 53ec801..eccc80b 100644
--- a/数据表/UIForm.txt
+++ b/数据表/UIForm.txt
@@ -8,5 +8,5 @@
102 关于 AboutForm Default False True
103 组装玩法UI CombineForm Default False False
104 Mask对话UI MaskDialogForm Default False False
- 105 Bottom对话UI BottomDialogForm Default False False
+ 105 Bottom对话UI BottomBoxDialogForm Default False False
106 Bubble对话UI BubbleDialogForm Default True False
diff --git a/数据表/UIForm.xlsx b/数据表/UIForm.xlsx
index 33a879a..ba5c519 100644
Binary files a/数据表/UIForm.xlsx and b/数据表/UIForm.xlsx differ