diff --git a/ProjectNLD/Assets/Code/Scripts/GenCode/Luban/DataTable/ActorCfg/DataActivityLevel.cs b/ProjectNLD/Assets/Code/Scripts/GenCode/Luban/DataTable/ActorCfg/DataActivityLevel.cs index 9c7fb1dde8c..9c156668193 100644 --- a/ProjectNLD/Assets/Code/Scripts/GenCode/Luban/DataTable/ActorCfg/DataActivityLevel.cs +++ b/ProjectNLD/Assets/Code/Scripts/GenCode/Luban/DataTable/ActorCfg/DataActivityLevel.cs @@ -23,13 +23,15 @@ public sealed partial class DataActivityLevel : Luban.BeanBase { if(!_buf["Id"].IsNumber) { throw new SerializationException(); } Id = _buf["Id"]; } { var __json0 = _buf["ListChapterID"]; if(!__json0.IsArray) { throw new SerializationException(); } int _n0 = __json0.Count; ListChapterID = new int[_n0]; int __index0=0; foreach(JSONNode __e0 in __json0.Children) { int __v0; { if(!__e0.IsNumber) { throw new SerializationException(); } __v0 = __e0; } ListChapterID[__index0++] = __v0; } } { var __json0 = _buf["ListLevelID"]; if(!__json0.IsArray) { throw new SerializationException(); } int _n0 = __json0.Count; ListLevelID = new int[_n0]; int __index0=0; foreach(JSONNode __e0 in __json0.Children) { int __v0; { if(!__e0.IsNumber) { throw new SerializationException(); } __v0 = __e0; } ListLevelID[__index0++] = __v0; } } + { var __json0 = _buf["JumpGachaID"]; if(!__json0.IsArray) { throw new SerializationException(); } int _n0 = __json0.Count; JumpGachaID = new int[_n0]; int __index0=0; foreach(JSONNode __e0 in __json0.Children) { int __v0; { if(!__e0.IsNumber) { throw new SerializationException(); } __v0 = __e0; } JumpGachaID[__index0++] = __v0; } } } - public DataActivityLevel(int Id, int[] ListChapterID, int[] ListLevelID ) + public DataActivityLevel(int Id, int[] ListChapterID, int[] ListLevelID, int[] JumpGachaID ) { this.Id = Id; this.ListChapterID = ListChapterID; this.ListLevelID = ListLevelID; + this.JumpGachaID = JumpGachaID; } @@ -50,6 +52,10 @@ public sealed partial class DataActivityLevel : Luban.BeanBase /// 关卡ID列表 /// public int[] ListLevelID { get; private set; } + /// + /// 跳转用卡池ID + /// + public int[] JumpGachaID { get; private set; } public const int __ID__ = -1517626324; public override int GetTypeId() => __ID__; @@ -64,6 +70,7 @@ public sealed partial class DataActivityLevel : Luban.BeanBase + "Id:" + Id + "," + "ListChapterID:" + Luban.StringUtil.CollectionToString(ListChapterID) + "," + "ListLevelID:" + Luban.StringUtil.CollectionToString(ListLevelID) + "," + + "JumpGachaID:" + Luban.StringUtil.CollectionToString(JumpGachaID) + "," + "}"; } } diff --git a/ProjectNLD/Assets/Code/Scripts/GenCode/Luban/DataTable/ActorCfg/DataGacha.cs b/ProjectNLD/Assets/Code/Scripts/GenCode/Luban/DataTable/ActorCfg/DataGacha.cs index 378bbf60ce5..b633f57a4f1 100644 --- a/ProjectNLD/Assets/Code/Scripts/GenCode/Luban/DataTable/ActorCfg/DataGacha.cs +++ b/ProjectNLD/Assets/Code/Scripts/GenCode/Luban/DataTable/ActorCfg/DataGacha.cs @@ -41,13 +41,14 @@ public sealed partial class DataGacha : Luban.BeanBase { if(!_buf["GachaType"].IsString) { throw new SerializationException(); } GachaType = _buf["GachaType"]; } { if(!_buf["NameKey"].IsString) { throw new SerializationException(); } NameKey = _buf["NameKey"]; } { if(!_buf["ActivityID"].IsNumber) { throw new SerializationException(); } ActivityID = _buf["ActivityID"]; } + { if(!_buf["JumpActivityID"].IsNumber) { throw new SerializationException(); } JumpActivityID = _buf["JumpActivityID"]; } { var __json0 = _buf["PriceId"]; if(!__json0.IsArray) { throw new SerializationException(); } PriceId = new System.Collections.Generic.List(__json0.Count); foreach(JSONNode __e0 in __json0.Children) { int __v0; { if(!__e0.IsNumber) { throw new SerializationException(); } __v0 = __e0; } PriceId.Add(__v0); } } { if(!_buf["bannerPicPath"].IsString) { throw new SerializationException(); } BannerPicPath = _buf["bannerPicPath"]; } { if(!_buf["PicPath"].IsString) { throw new SerializationException(); } PicPath = _buf["PicPath"]; } { if(!_buf["TicketIconPath"].IsString) { throw new SerializationException(); } TicketIconPath = _buf["TicketIconPath"]; } } - public DataGacha(int Id, int PoolId, item.ItemCounts SingleCost, item.ItemCounts LimitSingleCost, int DailyFreeCount, int LimitOneCount, int[] BtnDisplay, int MaxCount, int LimitTenCount, int TicketItemID, int TenTicketItemID, int PoolEndConvertPatioCoin, int PatioCoin, int PatioPrice, int[] PatioItemList, int[] RoleTest, vector3[] Magnifiers, int SortID, string GachaType, string NameKey, int ActivityID, System.Collections.Generic.List PriceId, string bannerPicPath, string PicPath, string TicketIconPath ) + public DataGacha(int Id, int PoolId, item.ItemCounts SingleCost, item.ItemCounts LimitSingleCost, int DailyFreeCount, int LimitOneCount, int[] BtnDisplay, int MaxCount, int LimitTenCount, int TicketItemID, int TenTicketItemID, int PoolEndConvertPatioCoin, int PatioCoin, int PatioPrice, int[] PatioItemList, int[] RoleTest, vector3[] Magnifiers, int SortID, string GachaType, string NameKey, int ActivityID, int JumpActivityID, System.Collections.Generic.List PriceId, string bannerPicPath, string PicPath, string TicketIconPath ) { this.Id = Id; this.PoolId = PoolId; @@ -70,6 +71,7 @@ public sealed partial class DataGacha : Luban.BeanBase this.GachaType = GachaType; this.NameKey = NameKey; this.ActivityID = ActivityID; + this.JumpActivityID = JumpActivityID; this.PriceId = PriceId; this.BannerPicPath = bannerPicPath; this.PicPath = PicPath; @@ -167,6 +169,10 @@ public sealed partial class DataGacha : Luban.BeanBase /// public int ActivityID { get; private set; } /// + /// 跳转用活动ID + /// + public int JumpActivityID { get; private set; } + /// /// 货币栏ID /// public System.Collections.Generic.List PriceId { get; private set; } @@ -216,6 +222,7 @@ public sealed partial class DataGacha : Luban.BeanBase + "GachaType:" + GachaType + "," + "NameKey:" + NameKey + "," + "ActivityID:" + ActivityID + "," + + "JumpActivityID:" + JumpActivityID + "," + "PriceId:" + Luban.StringUtil.CollectionToString(PriceId) + "," + "bannerPicPath:" + BannerPicPath + "," + "PicPath:" + PicPath + "," diff --git a/ProjectNLD/Assets/Config/Data/actorcfg_activitylevel.json b/ProjectNLD/Assets/Config/Data/actorcfg_activitylevel.json index 4bda4c53d09..8903415e233 100644 --- a/ProjectNLD/Assets/Config/Data/actorcfg_activitylevel.json +++ b/ProjectNLD/Assets/Config/Data/actorcfg_activitylevel.json @@ -8,7 +8,8 @@ 604, 610 ], - "ListLevelID": [] + "ListLevelID": [], + "JumpGachaID": [] }, { "Id": 34010, @@ -16,6 +17,10 @@ "ListLevelID": [ 340025, 340010 + ], + "JumpGachaID": [ + 41025, + 51010 ] }, { @@ -24,6 +29,10 @@ "ListLevelID": [ 340094, 340093 + ], + "JumpGachaID": [ + 43094, + 55093 ] }, { @@ -32,6 +41,10 @@ "ListLevelID": [ 340095, 340054 + ], + "JumpGachaID": [ + 42095, + 52054 ] }, { @@ -40,6 +53,10 @@ "ListLevelID": [ 340096, 340047 + ], + "JumpGachaID": [ + 44096, + 54047 ] }, { @@ -47,6 +64,7 @@ "ListChapterID": [ 701 ], - "ListLevelID": [] + "ListLevelID": [], + "JumpGachaID": [] } ] \ No newline at end of file diff --git a/ProjectNLD/Assets/Config/Data/actorcfg_gacha.json b/ProjectNLD/Assets/Config/Data/actorcfg_gacha.json index 654cfce8719..d09733a3814 100644 --- a/ProjectNLD/Assets/Config/Data/actorcfg_gacha.json +++ b/ProjectNLD/Assets/Config/Data/actorcfg_gacha.json @@ -51,6 +51,7 @@ "GachaType": "Gacha_Type_01", "NameKey": "Gacha_Name_320001", "ActivityID": 0, + "JumpActivityID": 0, "PriceId": [ 1110001, 2, @@ -120,6 +121,7 @@ "GachaType": "Gacha_Type_04", "NameKey": "Gacha_Name_41025", "ActivityID": 0, + "JumpActivityID": 34010, "PriceId": [ 1110001, 2, @@ -189,6 +191,7 @@ "GachaType": "Gacha_Type_04", "NameKey": "Gacha_Name_43094", "ActivityID": 0, + "JumpActivityID": 34020, "PriceId": [ 1110001, 2, @@ -258,6 +261,7 @@ "GachaType": "Gacha_Type_04", "NameKey": "Gacha_Name_42095", "ActivityID": 0, + "JumpActivityID": 34030, "PriceId": [ 1110001, 2, @@ -328,6 +332,7 @@ "GachaType": "Gacha_Type_04", "NameKey": "Gacha_Name_44096", "ActivityID": 0, + "JumpActivityID": 34040, "PriceId": [ 1110001, 2, @@ -397,6 +402,7 @@ "GachaType": "Gacha_Type_05", "NameKey": "Gacha_Name_51010", "ActivityID": 0, + "JumpActivityID": 34010, "PriceId": [ 1110001, 2, @@ -466,6 +472,7 @@ "GachaType": "Gacha_Type_05", "NameKey": "Gacha_Name_55093", "ActivityID": 0, + "JumpActivityID": 34020, "PriceId": [ 1110001, 2, @@ -535,6 +542,7 @@ "GachaType": "Gacha_Type_05", "NameKey": "Gacha_Name_52054", "ActivityID": 0, + "JumpActivityID": 34030, "PriceId": [ 1110001, 2, @@ -605,6 +613,7 @@ "GachaType": "Gacha_Type_05", "NameKey": "Gacha_Name_54047", "ActivityID": 0, + "JumpActivityID": 34040, "PriceId": [ 1110001, 2,