From 7ac832f74bc95bfc5da26364e138d3e1ea76ab55 Mon Sep 17 00:00:00 2001 From: SepComet <202308010230@stu.csust.edu.cn> Date: Mon, 9 Feb 2026 13:53:04 +0800 Subject: [PATCH] =?UTF-8?q?-=20=E8=B0=83=E6=95=B4=E4=BA=86=E5=AF=B9?= =?UTF-8?q?=E8=AF=9D=20UI=20=E7=B1=BB=E5=9E=8B=E7=9A=84=E5=91=BD=E5=90=8D?= =?UTF-8?q?=EF=BC=8C=E4=BD=BF=E5=85=B6=E6=9B=B4=E5=85=B7=E8=BE=A8=E8=AF=86?= =?UTF-8?q?=E5=BA=A6=20-=20=E6=98=BE=E5=BC=8F=E6=A0=87=E8=AE=B0=E8=BF=98?= =?UTF-8?q?=E6=9C=AA=E5=AE=9E=E7=8E=B0=E7=9A=84=20BubbleDialogForm?= =?UTF-8?q?=EF=BC=8C=E9=81=BF=E5=85=8D=E8=AF=AF=E7=94=A8=E7=9A=84=E6=83=85?= =?UTF-8?q?=E5=86=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/GameMain/DataTables/Dialog.txt | 2 +- Assets/GameMain/DataTables/DialogLine.txt | 2 +- Assets/GameMain/DataTables/UIForm.txt | 2 +- .../Scripts/Definition/Enum/DialogFormMode.cs | 2 +- .../Scripts/Definition/Enum/UIFormId.cs | 2 +- .../Scripts/Procedure/ProcedureCombine.cs | 4 ++-- .../Dialog/Controller/DialogFormController.cs | 7 ++++--- ...Form.prefab => BottomBoxDialogForm.prefab} | 2 +- ...b.meta => BottomBoxDialogForm.prefab.meta} | 0 数据表/Dialog.txt | 2 +- 数据表/Dialog.xlsx | Bin 10774 -> 10772 bytes 数据表/UIForm.txt | 2 +- 数据表/UIForm.xlsx | Bin 10322 -> 10331 bytes 13 files changed, 14 insertions(+), 13 deletions(-) rename Assets/GameMain/UI/UIForms/{BottomDialogForm.prefab => BottomBoxDialogForm.prefab} (99%) rename Assets/GameMain/UI/UIForms/{BottomDialogForm.prefab.meta => BottomBoxDialogForm.prefab.meta} (100%) 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 6643c3718d1bc3b84d8167e840c0ee51786f541d..7ad1427ab86ac0c716b15b131fdd985f16495001 100644 GIT binary patch delta 1619 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 b2^y2QDJlZv3X>5D6_fcX6$Wi300000zdiAD 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 33a879a8eba683dd1f9fbab55ce967962e43a86c..ba5c5196d0c46c7d2dd661d56d738826ff61d1d6 100644 GIT binary patch delta 2085 zcmV+=2-^43P}@+jlK}NhLs?sD#ua5Sy{DZA9!?wxR9L#49oI zGAz6WPSTcCATj#>|GxY0zER(sukpD z0~U>n@lbt0Rvmpbp0R^ku zpq?O;)&wJejhAhYqbeANzn|p%2jlnkrPFDrleU{3Yr7}eO*ZHCGgaD}QE`RVnSZ|z zprXKd8k4GU@$lSmLuLK>t;n4lu4zWfjT?G_>)!JAjO@m z>EnfSBfla`YC_40c?l_enVP9`<*!CMi^K?I8LR@;uh;4m1g=2bG0QXdF64FzVW#3V zP2)9x74?#`&0;V>;nK$}x>81p9b(AcuEh-esQv9a&0rMy)H^jkZQL*6^C6tMP$7_i zGu+U@v%}EwFP!6q;S{{$I@|+CLS8xe2NVT7xBz%al(6iEBb?_OHx5_eqo1M|{tR9C zeILW;uD`wT&5zni@d;gX7LokFEM=FC`{XTuXM^j(?T|l7^A%_33xnL|u0yUY&r19a z-*67CH|~P>nvfj2fM2J`xZz!=KyOmaN8u@Z&%ya&+gvuBwGH9k$cAC)%^%hE$k$EV z&`HGbw*tn2Ab*ho+`B+x$=%TuM2eDha#(o-E%STDEZRVS zaPKp^Glyl{6z*Nqg%>`l3r2csKz%v0!c^Sn+jUJE2lfD%Vp<`-Lxs;vFlfRHzwlB~ z2X3KIdfNtT{{~J>TH?hd!k+LUcHaR{%#zbrq^D(hEiN`T< zFo{J^jD&(kEkb$ev`~{+_8mx}Ch;_XCgT4k_9n3!$2d$8BcZUMEJAtdv`~`>HCIIz zMA=FXh6T}#5nB+=8G8$&S>s?qls85L!q>lH@fTjo2ZXO4O+?hyIsN(ym8+yq3!?cV zwji1@_Cw@oOXV;{j8wv|Wl_mXdzFDcpIz-hr)ImIiOjSpv5ADb&LJXoYC#TvCZQ%} zq!YGSi%wpubgHIevZAh5>6~fE&VuN^H4#JS5V7kt36;r6C;uNcUCT?APA$Wzs~zan zR@TmfXe%o=5kuz?vFkL64|MWRD^n*gRXQ~hQCBZ=D*wS8uPXJfPl7+V-a?1-_eokYfRtzRxLVfSGow%tIRwWzNi z$klfw3-h4uCb5Mv<#ws?zCMsUg^cC$?-0|*a2^@@SaV?1S1Y*>YMDqQ+Zb)##}>wv z+ohu9YF+Wulgw5jYG9>YdG3*)s1-Wn@2Ea!C3SLqf>8{-CH!C2@)#p1Ul^&lyPYFp zaE23)7dS^__>2uafKP<5?gdUbvTiR5`7x_MsBeD(kRG!$2|xx3+|(av>;V7(IFo!2 zEPn{0BvZF(C>KRY&9T65B8?hnj5?bgPhBp|T-uOyi$ukt(3;#-655vbVrp z?wpiMf8Y5X`FzJVmNo)kdx1jg5p0563nic-TqCZB>n5l^UAuW7Xp}+hLZ4t{f>(%w zCF}Y%gHonR7E=>67;8Szby{nn0MZ50L^xPF>m&>ylgF^G(`JaEOB)EWz}Ih=O84{t zdKhRm!Z9 zIsqG#Fef$vLX&4FKmm!9s3$xDnUm!wAsegPpq?NE008X|000;O0000000031AOHXW P#gic@D+WF!00000Cq~ky delta 2099 zcmV-32+a4}P|{GalK};grN}2wlb8W4f2#_tB$WVlq7qVrKy1dowh^&o*@m<`6R*U; z%dqekI7u5?fyC(h|NHL0lhf%&R>2DxTh=N=aYRr6ir1o4s|?*1v+xWB)-femRV&EQ z7A%_Prza`bl-CAsOs&DV5^Uf}%2KW~w02HYj4fY-WH#~+<;7)fBy;|0R#-Fsf5cXR z6GA3ff@6X?hFf5$2O`=b1s{<5*;E}sa10elP|o5wit&%vfsyvlhE6$f%F=DM-)R^3 zkS%yG4(^RD2V>JTQ8Vgd`1~=xpI*vQ?ihnB}LD!}4nIHn6hxY0B%H8Pls+gfXA;}~pahQ;TBs88- zLLS<|NBwQSz94tw|0O0NIWNeVjz=^;B<=xum;3lnJ* zq zJv=w}_#nq)p5ln4ml9V@I%#l`Fo>U?^O|>jR{RML)zA{f6 zLdlW2DJeY}nyGT-twuV_)No{(tTJg{FZCyIT!XknUgYdu$n65cO!;Zs)_-kl>Za8# ziopa0OAoW~LK!Kege7RZ7Ax?*@wV$MhgsxH?=<+hL0^LBeK14NAdr7@+|t3b!;-_F zxWFmH8RQCbcn%y0dF9}5VDhT*pOfCfrN%3!GC#O=mmNWl=m_^#b_@b{{-~};UN^UnPAaDVCSdFc z;untK-Z>H_cSlzcDZ0YF>$>`1F+i-s5!{udftLBbViq??aKAa4L4R;}&BOB674BWv zg&RDnizm>;gnDviMN;uR->w_dIo+`0fYbftdqv>+}F7G3y5qK}II=FeYM?n2(8_Nj#2;y-6&3Vk8t&)FPBy zr-hotvL8SSHHoJ&5r6+Du``L)*vEc~7zyP$Ypy7_P75`OK+CGof~d5TlVL%$#E313 zmKi$>qNT>(f~edWO$e`lV?tiIl}`w-9!*5pwK;u#1uCngP79*tMQlN|#MljygDsT( z6fsf>yOu>IxArQ1eLcI@fle*$A`_WuUSbmobe%&)>eQUO74Ry6Pd_1MyvbS!kBW0UrJK0HWWWS$*Qx> zh?FbOJ@ON^PEPpuq&ejkbqaihS@hi{{9iTl7$aX8sU*36=Rg>o;l$$^&e0e?V|^Fk zBO$DNffJ5w+X*8-X7va4?N5*%vpESs1_@t3aR})F001?Uf)6ZzXqu8tWz$eDijbfW z;51%qk=P}6_;WebY?Gi{h13d_4QXQ<|3r&a0bMutG*CCCJ?5CbdL^=k%WT$3zeCTMWp zT-J3~Yak!81=>V^L^>NZ@FADSpsurKfS}772yx%jZFWwH^H5|Knn?e z7NXTmSX=~_!LVg;>xQ9o%g|?sOh~$KFAt6`qjvIlkREn4F&@ZdRn?)?Q?+c$L z{^YzLJ+bpn9B;>?-1zCQRy^s5PCNPhGsj&emz=eV?fCsrbWTLHnGVL{xIZ0#%Pt`X zAEy^@)Mi-%M8cvz>EJ>>7Pa~@;#_W{2oTX|I@wi$vO_~&R4yY;KSjyz*Lc*e z+A6k6eFqa%1Xdt>Du$=&@F0)Py!p}Gr<_xN9-F!Up+m><&|Lb;EuwY#?X!mw;SvFz zlW8PC0S1$*Br^djlinng1(2o4Cr^`hB~$_f1Ct>G6_dj!9FzSe4gq$P3??uEQjv02BZK000000096X0001G zle{KD0g{vcCOQEXlQ}0g0X&m%CqMy!ld&f}0hg2RCm|fx1ONc-4*&od00000 d0000103ZMW0K){6;RG6!MJNykH6#E4000Qk&+z~N