From e03feb5415053fbc3c38454f107bdd1d4b46dad2 Mon Sep 17 00:00:00 2001 From: "WIN-IEQ8U88PPRB\\Administrator" <289563215@qq.com> Date: Mon, 8 Jun 2026 21:09:46 +0800 Subject: [PATCH] =?UTF-8?q?drdialog=E9=87=8D=E6=96=B0=E7=94=9F=E6=88=90?= =?UTF-8?q?=EF=BC=8C=E6=95=B0=E6=8D=AE=E8=A1=A8=E9=87=8D=E5=AF=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ConfigData/AllConfigs.bytes | Bin 1403450 -> 1402490 bytes Scripts/DR_Generated/DRDialogData.cs | 29 ++- .../Byway/Thrift/Data/DialogDataItem.cs | 217 +++++++++++------- 3 files changed, 157 insertions(+), 89 deletions(-) diff --git a/ConfigData/AllConfigs.bytes b/ConfigData/AllConfigs.bytes index 85e390171607928129fb2101735899f9b47cb283..69787e6b4b5340ddbeb907805c3c4ec865d1d56e 100644 GIT binary patch delta 5070 zcmY+HdvH|s703B)Ht`TbHijHnL&UrjmLz0%?`}3R#1LK)c?2Z9j4VO|Szbv)jFNF| z)D#%SH|?)uZG{%KqtuoT(>RPTT5GGN+K0omOlvK56s>iz7Ta+u({q03ETr(ge`LR( z`@8pd&bjB@d*bcRFHUuijG9s3XvV02G;=g-^orwfRS0kb{r92Ie%ci%%LpgKc5VpP z=LRQC@S|T%zcVL>laXNNKx%8RJy{P$_QMd&VJ-`^l*>wUQRP<@@t{YeozCAe0nbCI>MjcO@wx{ zq!zAcGY|9Bl-*=Rk`a5d7TVd&$9y$q3uH$5%yPS~4oaCQzyc-o<|9c@h+oyo_NL-g zCG_Sa$(Svf4V`>?5QA#!%}0`PIsLWSu$YNLEL0*_wiih@*yegz#byx}shO8H6ZVCA z*vRG#oS|lZ+HAD#VOYmzF%~;BOJid5)&>0b%`kZEmSU;88k8snr7i-?*eu6#H8m(v z3d)=)%(B0aKnoLeK@Af% zSfhl-BTDi3br`DbKRn21q7Lhn(4a(<2|FtWv)HW1dNnmD(PX3j_AQjrr(#geLw&EC9D=1cklTl)4Hb8{^1SZrkWWU<> z$6>a8z5%AQ+k{Qdg>;#ERHlDzf>K+OfZ0qmW3v*P7LU?G7q7QR6B3;kY*9jU<56xL z;Wf&$)QYW2NN&JOdO`n=o-H;UgXz;@>CT-y>*!x_0{@@ThHZ*#wmiz#ElVM2AG{9o z?ZhSs^PSDd`HE@YJj$E9_x(*!%fv!lsD$Rtqr4H(#%4RVtEnmTC}s2vC)r$#i`CSW zd6crdIw&O>%}~a~5?rE$OIewpB3I83NtqpLhH^%h;W9;B)*KR+y7{D8veSVbin#1K zBqA3Ynj;BVi7ORx2`tN|3#EJ7@B)}_Kbs>(vI;X01aM%<{DOHPGpuzzlaZniezCbe8@Don!eoGZoFjooUw#8j9@c~sBO zm6UJ6E$T~JGGbKFBOMU3yW60d7w^Sho-uCD96KB+u^ZnAWJ;vIXp_p?hT9bJTZeSa zgG?@*DfW|22-rRIB;q@8hjLk$I6uXXZnlK0dSGDSa#iobT?)fE*t1v9mmKtCzxvtZ z{1}hGDfa%YkZT{BFF_r^0VQ*U?7umXWzROzv(dkhZg1KGDXu{rR4#YiiVgPG1=8k+ zaEN@GP*gCq%}WK7y%4H6Qn%yn>bo#-!MGUEMcf!0#$ol{_PJ{4W=m|=BB}p7@DBCe zjw_7EEwRMjwg@Kk`gh`;>bo6t@jSeZ9UIn7#)mp8jMsS zwRZSMsNk#q*dR$59gT4sjjj^@eWTRkaf2jbbV9~yLSF8I`&L1m7yF4pl7Kob<1{V* zzDknxyg`!K1@_84F46Aws=pJiKr!Ug5k!l3@9QHID1;f7>k8^G|~$!SvO)fnR;^+74xfnaj8L>`CwIUj|7`=A~O` zf?BA|_-?8A&kd4<(H5GZ7J6-uBi{=N8_;`n92A2g+Y?|+CCH1KIyZu z+}3P?8O;3GAW0Z$nvh7w02etBR(Vvqn$HB zoip99-39OVAxRkRoC)fj)Lr!pCZktc%BT-X0&3?>q(2QG?3FpW*M}rwG~5)#dV8i9 z8hLm7eMk~tKQqV=^ZR>=-JFuA;9eh+1dZp zeb;P*1|}ZxAxQ{76IJ$+Z89kz@*zpAEO+vyCj4$26x!H!$-^T)Bnby{5gNDKp_kV` z=tGj2*i}AHfIMkzhoZUHyoNcHXO?S`NeQ{=dSLaf!%|Beci#F_xC^i!4pq@ zc-N!vo!A?kxM0^{&#vxNcVBSQyuO|N1MZJo#ZLU2>)6+ zcH!%Rkl%kig~#p5gY@?`-wLeu+qa$w?DfBz!dGqhN&4~gLxIR0@ZOOxdQcGVuemmpYz}^0HDLm&E-ZyeIKt~=OSJIJB$CR;=qXj2k{2yuil!yQT delta 4690 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 Lb)QIj|NMUe#+K06 diff --git a/Scripts/DR_Generated/DRDialogData.cs b/Scripts/DR_Generated/DRDialogData.cs index 55f3ec4..5a45ace 100644 --- a/Scripts/DR_Generated/DRDialogData.cs +++ b/Scripts/DR_Generated/DRDialogData.cs @@ -28,35 +28,35 @@ namespace CrazyMaple } /// - /// PlotNode + /// Area /// - public string PlotNode + public int Area { get { - return _configData?.PlotNode ?? ""; + return _configData?.Area ?? 0; } } /// - /// SceneId + /// Building /// - public int SceneId + public int Building { get { - return _configData?.SceneId ?? 0; + return _configData?.Building ?? 0; } } /// - /// Group + /// BuildLv /// - public string Group + public int BuildLv { get { - return _configData?.Group ?? ""; + return _configData?.BuildLv ?? 0; } } @@ -71,6 +71,17 @@ namespace CrazyMaple } } + /// + /// Group + /// + public string Group + { + get + { + return _configData?.Group ?? ""; + } + } + /// /// Direct /// diff --git a/Scripts/thrift/gen-netstd/Byway/Thrift/Data/DialogDataItem.cs b/Scripts/thrift/gen-netstd/Byway/Thrift/Data/DialogDataItem.cs index d4ea3be..b0fbabf 100644 --- a/Scripts/thrift/gen-netstd/Byway/Thrift/Data/DialogDataItem.cs +++ b/Scripts/thrift/gen-netstd/Byway/Thrift/Data/DialogDataItem.cs @@ -41,10 +41,11 @@ namespace Byway.Thrift.Data public partial class DialogDataItem : TBase { private int _Id; - private string _PlotNode; - private int _SceneId; - private string _Group; + private int _Area; + private int _Building; + private int _BuildLv; private int _SortId; + private string _Group; private string _Direct; private string _Icon; private string _Title; @@ -68,44 +69,44 @@ namespace Byway.Thrift.Data } [DataMember(Order = 0)] - public string PlotNode + public int Area { get { - return _PlotNode; + return _Area; } set { - __isset.PlotNode = true; - this._PlotNode = value; + __isset.Area = true; + this._Area = value; } } [DataMember(Order = 0)] - public int SceneId + public int Building { get { - return _SceneId; + return _Building; } set { - __isset.SceneId = true; - this._SceneId = value; + __isset.Building = true; + this._Building = value; } } [DataMember(Order = 0)] - public string Group + public int BuildLv { get { - return _Group; + return _BuildLv; } set { - __isset.@Group = true; - this._Group = value; + __isset.BuildLv = true; + this._BuildLv = value; } } @@ -123,6 +124,20 @@ namespace Byway.Thrift.Data } } + [DataMember(Order = 0)] + public string Group + { + get + { + return _Group; + } + set + { + __isset.@Group = true; + this._Group = value; + } + } + [DataMember(Order = 0)] public string Direct { @@ -230,14 +245,16 @@ namespace Byway.Thrift.Data [DataMember] public bool Id; [DataMember] - public bool PlotNode; + public bool Area; [DataMember] - public bool SceneId; + public bool Building; [DataMember] - public bool @Group; + public bool BuildLv; [DataMember] public bool SortId; [DataMember] + public bool @Group; + [DataMember] public bool Direct; [DataMember] public bool Icon; @@ -260,19 +277,19 @@ namespace Byway.Thrift.Data return __isset.Id; } - public bool ShouldSerializePlotNode() + public bool ShouldSerializeArea() { - return __isset.PlotNode; + return __isset.Area; } - public bool ShouldSerializeSceneId() + public bool ShouldSerializeBuilding() { - return __isset.SceneId; + return __isset.Building; } - public bool ShouldSerializeGroup() + public bool ShouldSerializeBuildLv() { - return __isset.@Group; + return __isset.BuildLv; } public bool ShouldSerializeSortId() @@ -280,6 +297,11 @@ namespace Byway.Thrift.Data return __isset.SortId; } + public bool ShouldSerializeGroup() + { + return __isset.@Group; + } + public bool ShouldSerializeDirect() { return __isset.Direct; @@ -329,26 +351,31 @@ namespace Byway.Thrift.Data tmp0.Id = this.Id; } tmp0.__isset.Id = this.__isset.Id; - if((PlotNode != null) && __isset.PlotNode) + if(__isset.Area) { - tmp0.PlotNode = this.PlotNode; + tmp0.Area = this.Area; } - tmp0.__isset.PlotNode = this.__isset.PlotNode; - if(__isset.SceneId) + tmp0.__isset.Area = this.__isset.Area; + if(__isset.Building) { - tmp0.SceneId = this.SceneId; + tmp0.Building = this.Building; } - tmp0.__isset.SceneId = this.__isset.SceneId; - if((Group != null) && __isset.@Group) + tmp0.__isset.Building = this.__isset.Building; + if(__isset.BuildLv) { - tmp0.Group = this.Group; + tmp0.BuildLv = this.BuildLv; } - tmp0.__isset.@Group = this.__isset.@Group; + tmp0.__isset.BuildLv = this.__isset.BuildLv; if(__isset.SortId) { tmp0.SortId = this.SortId; } tmp0.__isset.SortId = this.__isset.SortId; + if((Group != null) && __isset.@Group) + { + tmp0.Group = this.Group; + } + tmp0.__isset.@Group = this.__isset.@Group; if((Direct != null) && __isset.Direct) { tmp0.Direct = this.Direct; @@ -415,9 +442,9 @@ namespace Byway.Thrift.Data } break; case 2: - if (field.Type == TType.String) + if (field.Type == TType.I32) { - PlotNode = await iprot.ReadStringAsync(cancellationToken); + Area = await iprot.ReadI32Async(cancellationToken); } else { @@ -427,7 +454,7 @@ namespace Byway.Thrift.Data case 3: if (field.Type == TType.I32) { - SceneId = await iprot.ReadI32Async(cancellationToken); + Building = await iprot.ReadI32Async(cancellationToken); } else { @@ -435,9 +462,9 @@ namespace Byway.Thrift.Data } break; case 4: - if (field.Type == TType.String) + if (field.Type == TType.I32) { - Group = await iprot.ReadStringAsync(cancellationToken); + BuildLv = await iprot.ReadI32Async(cancellationToken); } else { @@ -457,7 +484,7 @@ namespace Byway.Thrift.Data case 6: if (field.Type == TType.String) { - Direct = await iprot.ReadStringAsync(cancellationToken); + Group = await iprot.ReadStringAsync(cancellationToken); } else { @@ -467,7 +494,7 @@ namespace Byway.Thrift.Data case 7: if (field.Type == TType.String) { - Icon = await iprot.ReadStringAsync(cancellationToken); + Direct = await iprot.ReadStringAsync(cancellationToken); } else { @@ -477,7 +504,7 @@ namespace Byway.Thrift.Data case 8: if (field.Type == TType.String) { - Title = await iprot.ReadStringAsync(cancellationToken); + Icon = await iprot.ReadStringAsync(cancellationToken); } else { @@ -487,7 +514,7 @@ namespace Byway.Thrift.Data case 9: if (field.Type == TType.String) { - Content = await iprot.ReadStringAsync(cancellationToken); + Title = await iprot.ReadStringAsync(cancellationToken); } else { @@ -497,7 +524,7 @@ namespace Byway.Thrift.Data case 10: if (field.Type == TType.String) { - BubbleType = await iprot.ReadStringAsync(cancellationToken); + Content = await iprot.ReadStringAsync(cancellationToken); } else { @@ -507,7 +534,7 @@ namespace Byway.Thrift.Data case 11: if (field.Type == TType.String) { - Phone = await iprot.ReadStringAsync(cancellationToken); + BubbleType = await iprot.ReadStringAsync(cancellationToken); } else { @@ -515,6 +542,16 @@ namespace Byway.Thrift.Data } break; case 12: + if (field.Type == TType.String) + { + Phone = await iprot.ReadStringAsync(cancellationToken); + } + else + { + await TProtocolUtil.SkipAsync(iprot, field.Type, cancellationToken); + } + break; + case 13: if (field.Type == TType.String) { Status = await iprot.ReadStringAsync(cancellationToken); @@ -557,31 +594,31 @@ namespace Byway.Thrift.Data await oprot.WriteI32Async(Id, cancellationToken); await oprot.WriteFieldEndAsync(cancellationToken); } - if((PlotNode != null) && __isset.PlotNode) + if(__isset.Area) { - tmp2.Name = "PlotNode"; - tmp2.Type = TType.String; + tmp2.Name = "Area"; + tmp2.Type = TType.I32; tmp2.ID = 2; await oprot.WriteFieldBeginAsync(tmp2, cancellationToken); - await oprot.WriteStringAsync(PlotNode, cancellationToken); + await oprot.WriteI32Async(Area, cancellationToken); await oprot.WriteFieldEndAsync(cancellationToken); } - if(__isset.SceneId) + if(__isset.Building) { - tmp2.Name = "SceneId"; + tmp2.Name = "Building"; tmp2.Type = TType.I32; tmp2.ID = 3; await oprot.WriteFieldBeginAsync(tmp2, cancellationToken); - await oprot.WriteI32Async(SceneId, cancellationToken); + await oprot.WriteI32Async(Building, cancellationToken); await oprot.WriteFieldEndAsync(cancellationToken); } - if((Group != null) && __isset.@Group) + if(__isset.BuildLv) { - tmp2.Name = "Group"; - tmp2.Type = TType.String; + tmp2.Name = "BuildLv"; + tmp2.Type = TType.I32; tmp2.ID = 4; await oprot.WriteFieldBeginAsync(tmp2, cancellationToken); - await oprot.WriteStringAsync(Group, cancellationToken); + await oprot.WriteI32Async(BuildLv, cancellationToken); await oprot.WriteFieldEndAsync(cancellationToken); } if(__isset.SortId) @@ -593,11 +630,20 @@ namespace Byway.Thrift.Data await oprot.WriteI32Async(SortId, cancellationToken); await oprot.WriteFieldEndAsync(cancellationToken); } + if((Group != null) && __isset.@Group) + { + tmp2.Name = "Group"; + tmp2.Type = TType.String; + tmp2.ID = 6; + await oprot.WriteFieldBeginAsync(tmp2, cancellationToken); + await oprot.WriteStringAsync(Group, cancellationToken); + await oprot.WriteFieldEndAsync(cancellationToken); + } if((Direct != null) && __isset.Direct) { tmp2.Name = "Direct"; tmp2.Type = TType.String; - tmp2.ID = 6; + tmp2.ID = 7; await oprot.WriteFieldBeginAsync(tmp2, cancellationToken); await oprot.WriteStringAsync(Direct, cancellationToken); await oprot.WriteFieldEndAsync(cancellationToken); @@ -606,7 +652,7 @@ namespace Byway.Thrift.Data { tmp2.Name = "Icon"; tmp2.Type = TType.String; - tmp2.ID = 7; + tmp2.ID = 8; await oprot.WriteFieldBeginAsync(tmp2, cancellationToken); await oprot.WriteStringAsync(Icon, cancellationToken); await oprot.WriteFieldEndAsync(cancellationToken); @@ -615,7 +661,7 @@ namespace Byway.Thrift.Data { tmp2.Name = "Title"; tmp2.Type = TType.String; - tmp2.ID = 8; + tmp2.ID = 9; await oprot.WriteFieldBeginAsync(tmp2, cancellationToken); await oprot.WriteStringAsync(Title, cancellationToken); await oprot.WriteFieldEndAsync(cancellationToken); @@ -624,7 +670,7 @@ namespace Byway.Thrift.Data { tmp2.Name = "Content"; tmp2.Type = TType.String; - tmp2.ID = 9; + tmp2.ID = 10; await oprot.WriteFieldBeginAsync(tmp2, cancellationToken); await oprot.WriteStringAsync(Content, cancellationToken); await oprot.WriteFieldEndAsync(cancellationToken); @@ -633,7 +679,7 @@ namespace Byway.Thrift.Data { tmp2.Name = "BubbleType"; tmp2.Type = TType.String; - tmp2.ID = 10; + tmp2.ID = 11; await oprot.WriteFieldBeginAsync(tmp2, cancellationToken); await oprot.WriteStringAsync(BubbleType, cancellationToken); await oprot.WriteFieldEndAsync(cancellationToken); @@ -642,7 +688,7 @@ namespace Byway.Thrift.Data { tmp2.Name = "Phone"; tmp2.Type = TType.String; - tmp2.ID = 11; + tmp2.ID = 12; await oprot.WriteFieldBeginAsync(tmp2, cancellationToken); await oprot.WriteStringAsync(Phone, cancellationToken); await oprot.WriteFieldEndAsync(cancellationToken); @@ -651,7 +697,7 @@ namespace Byway.Thrift.Data { tmp2.Name = "Status"; tmp2.Type = TType.String; - tmp2.ID = 12; + tmp2.ID = 13; await oprot.WriteFieldBeginAsync(tmp2, cancellationToken); await oprot.WriteStringAsync(Status, cancellationToken); await oprot.WriteFieldEndAsync(cancellationToken); @@ -670,10 +716,11 @@ namespace Byway.Thrift.Data if (!(that is DialogDataItem other)) return false; if (ReferenceEquals(this, other)) return true; return ((__isset.Id == other.__isset.Id) && ((!__isset.Id) || (global::System.Object.Equals(Id, other.Id)))) - && ((__isset.PlotNode == other.__isset.PlotNode) && ((!__isset.PlotNode) || (global::System.Object.Equals(PlotNode, other.PlotNode)))) - && ((__isset.SceneId == other.__isset.SceneId) && ((!__isset.SceneId) || (global::System.Object.Equals(SceneId, other.SceneId)))) - && ((__isset.@Group == other.__isset.@Group) && ((!__isset.@Group) || (global::System.Object.Equals(Group, other.Group)))) + && ((__isset.Area == other.__isset.Area) && ((!__isset.Area) || (global::System.Object.Equals(Area, other.Area)))) + && ((__isset.Building == other.__isset.Building) && ((!__isset.Building) || (global::System.Object.Equals(Building, other.Building)))) + && ((__isset.BuildLv == other.__isset.BuildLv) && ((!__isset.BuildLv) || (global::System.Object.Equals(BuildLv, other.BuildLv)))) && ((__isset.SortId == other.__isset.SortId) && ((!__isset.SortId) || (global::System.Object.Equals(SortId, other.SortId)))) + && ((__isset.@Group == other.__isset.@Group) && ((!__isset.@Group) || (global::System.Object.Equals(Group, other.Group)))) && ((__isset.Direct == other.__isset.Direct) && ((!__isset.Direct) || (global::System.Object.Equals(Direct, other.Direct)))) && ((__isset.Icon == other.__isset.Icon) && ((!__isset.Icon) || (global::System.Object.Equals(Icon, other.Icon)))) && ((__isset.Title == other.__isset.Title) && ((!__isset.Title) || (global::System.Object.Equals(Title, other.Title)))) @@ -690,22 +737,26 @@ namespace Byway.Thrift.Data { hashcode = (hashcode * 397) + Id.GetHashCode(); } - if((PlotNode != null) && __isset.PlotNode) + if(__isset.Area) { - hashcode = (hashcode * 397) + PlotNode.GetHashCode(); + hashcode = (hashcode * 397) + Area.GetHashCode(); } - if(__isset.SceneId) + if(__isset.Building) { - hashcode = (hashcode * 397) + SceneId.GetHashCode(); + hashcode = (hashcode * 397) + Building.GetHashCode(); } - if((Group != null) && __isset.@Group) + if(__isset.BuildLv) { - hashcode = (hashcode * 397) + Group.GetHashCode(); + hashcode = (hashcode * 397) + BuildLv.GetHashCode(); } if(__isset.SortId) { hashcode = (hashcode * 397) + SortId.GetHashCode(); } + if((Group != null) && __isset.@Group) + { + hashcode = (hashcode * 397) + Group.GetHashCode(); + } if((Direct != null) && __isset.Direct) { hashcode = (hashcode * 397) + Direct.GetHashCode(); @@ -748,23 +799,23 @@ namespace Byway.Thrift.Data tmp3.Append("Id: "); Id.ToString(tmp3); } - if((PlotNode != null) && __isset.PlotNode) + if(__isset.Area) { if(0 < tmp4++) { tmp3.Append(", "); } - tmp3.Append("PlotNode: "); - PlotNode.ToString(tmp3); + tmp3.Append("Area: "); + Area.ToString(tmp3); } - if(__isset.SceneId) + if(__isset.Building) { if(0 < tmp4++) { tmp3.Append(", "); } - tmp3.Append("SceneId: "); - SceneId.ToString(tmp3); + tmp3.Append("Building: "); + Building.ToString(tmp3); } - if((Group != null) && __isset.@Group) + if(__isset.BuildLv) { if(0 < tmp4++) { tmp3.Append(", "); } - tmp3.Append("Group: "); - Group.ToString(tmp3); + tmp3.Append("BuildLv: "); + BuildLv.ToString(tmp3); } if(__isset.SortId) { @@ -772,6 +823,12 @@ namespace Byway.Thrift.Data tmp3.Append("SortId: "); SortId.ToString(tmp3); } + if((Group != null) && __isset.@Group) + { + if(0 < tmp4++) { tmp3.Append(", "); } + tmp3.Append("Group: "); + Group.ToString(tmp3); + } if((Direct != null) && __isset.Direct) { if(0 < tmp4++) { tmp3.Append(", "); }