diff --git a/SCHALE.Common/Database/dbs.cs b/SCHALE.Common/Database/dbs.cs index 2fb03d5..64390a9 100644 --- a/SCHALE.Common/Database/dbs.cs +++ b/SCHALE.Common/Database/dbs.cs @@ -4,6 +4,7 @@ using SCHALE.Common.Parcel; using System.Collections.ObjectModel; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; +using System.Runtime.CompilerServices; using System.Text.Json.Serialization; namespace SCHALE.Common.Database @@ -1212,7 +1213,7 @@ namespace SCHALE.Common.Database [JsonIgnore] public long AccountServerId { get; set; } - + public EchelonType EchelonType { get; set; } public long EchelonNumber { get; set; } public EchelonExtensionType ExtensionType { get; set; } @@ -2219,8 +2220,16 @@ namespace SCHALE.Common.Database public bool IsPermanent { get; set; } } + public class ScenarioCollectionDB + { + public long GroupId; - public class ScenarioHistoryDB + public long UniqueId; + + public DateTime ReceiveDate; + + } + public class ScenarioHistoryDB { [JsonIgnore] public virtual AccountDB Account { get; set; } diff --git a/SCHALE.Common/FlatData/AcademyFavorScheduleExcel.cs b/SCHALE.Common/FlatData/AcademyFavorScheduleExcel.cs index 1a5f768..c5c697b 100644 --- a/SCHALE.Common/FlatData/AcademyFavorScheduleExcel.cs +++ b/SCHALE.Common/FlatData/AcademyFavorScheduleExcel.cs @@ -61,31 +61,31 @@ public struct AcademyFavorScheduleExcel : IFlatbufferObject public long[] GetRewardAmountArray() { return __p.__vector_as_array(26); } public static Offset CreateAcademyFavorScheduleExcel(FlatBufferBuilder builder, - long Id = 0, - long CharacterId = 0, - long ScheduleGroupId = 0, - long OrderInGroup = 0, - StringOffset LocationOffset = default(StringOffset), - uint LocalizeScenarioId = 0, - long FavorRank = 0, - long SecretStoneAmount = 0, - long ScenarioSriptGroupId = 0, - VectorOffset RewardParcelTypeOffset = default(VectorOffset), - VectorOffset RewardParcelIdOffset = default(VectorOffset), - VectorOffset RewardAmountOffset = default(VectorOffset)) { + long id = 0, + long character_id = 0, + long schedule_group_id = 0, + long order_in_group = 0, + StringOffset locationOffset = default(StringOffset), + uint localize_scenario_id = 0, + long favor_rank = 0, + long secret_stone_amount = 0, + long scenario_sript_group_id = 0, + VectorOffset reward_parcel_typeOffset = default(VectorOffset), + VectorOffset reward_parcel_idOffset = default(VectorOffset), + VectorOffset reward_amountOffset = default(VectorOffset)) { builder.StartTable(12); - AcademyFavorScheduleExcel.AddScenarioSriptGroupId(builder, ScenarioSriptGroupId); - AcademyFavorScheduleExcel.AddSecretStoneAmount(builder, SecretStoneAmount); - AcademyFavorScheduleExcel.AddFavorRank(builder, FavorRank); - AcademyFavorScheduleExcel.AddOrderInGroup(builder, OrderInGroup); - AcademyFavorScheduleExcel.AddScheduleGroupId(builder, ScheduleGroupId); - AcademyFavorScheduleExcel.AddCharacterId(builder, CharacterId); - AcademyFavorScheduleExcel.AddId(builder, Id); - AcademyFavorScheduleExcel.AddRewardAmount(builder, RewardAmountOffset); - AcademyFavorScheduleExcel.AddRewardParcelId(builder, RewardParcelIdOffset); - AcademyFavorScheduleExcel.AddRewardParcelType(builder, RewardParcelTypeOffset); - AcademyFavorScheduleExcel.AddLocalizeScenarioId(builder, LocalizeScenarioId); - AcademyFavorScheduleExcel.AddLocation(builder, LocationOffset); + AcademyFavorScheduleExcel.AddScenarioSriptGroupId(builder, scenario_sript_group_id); + AcademyFavorScheduleExcel.AddSecretStoneAmount(builder, secret_stone_amount); + AcademyFavorScheduleExcel.AddFavorRank(builder, favor_rank); + AcademyFavorScheduleExcel.AddOrderInGroup(builder, order_in_group); + AcademyFavorScheduleExcel.AddScheduleGroupId(builder, schedule_group_id); + AcademyFavorScheduleExcel.AddCharacterId(builder, character_id); + AcademyFavorScheduleExcel.AddId(builder, id); + AcademyFavorScheduleExcel.AddRewardAmount(builder, reward_amountOffset); + AcademyFavorScheduleExcel.AddRewardParcelId(builder, reward_parcel_idOffset); + AcademyFavorScheduleExcel.AddRewardParcelType(builder, reward_parcel_typeOffset); + AcademyFavorScheduleExcel.AddLocalizeScenarioId(builder, localize_scenario_id); + AcademyFavorScheduleExcel.AddLocation(builder, locationOffset); return AcademyFavorScheduleExcel.EndAcademyFavorScheduleExcel(builder); } @@ -146,21 +146,21 @@ public struct AcademyFavorScheduleExcel : IFlatbufferObject } public static Offset Pack(FlatBufferBuilder builder, AcademyFavorScheduleExcelT _o) { if (_o == null) return default(Offset); - var _Location = _o.Location == null ? default(StringOffset) : builder.CreateString(_o.Location); - var _RewardParcelType = default(VectorOffset); + var _location = _o.Location == null ? default(StringOffset) : builder.CreateString(_o.Location); + var _reward_parcel_type = default(VectorOffset); if (_o.RewardParcelType != null) { - var __RewardParcelType = _o.RewardParcelType.ToArray(); - _RewardParcelType = CreateRewardParcelTypeVector(builder, __RewardParcelType); + var __reward_parcel_type = _o.RewardParcelType.ToArray(); + _reward_parcel_type = CreateRewardParcelTypeVector(builder, __reward_parcel_type); } - var _RewardParcelId = default(VectorOffset); + var _reward_parcel_id = default(VectorOffset); if (_o.RewardParcelId != null) { - var __RewardParcelId = _o.RewardParcelId.ToArray(); - _RewardParcelId = CreateRewardParcelIdVector(builder, __RewardParcelId); + var __reward_parcel_id = _o.RewardParcelId.ToArray(); + _reward_parcel_id = CreateRewardParcelIdVector(builder, __reward_parcel_id); } - var _RewardAmount = default(VectorOffset); + var _reward_amount = default(VectorOffset); if (_o.RewardAmount != null) { - var __RewardAmount = _o.RewardAmount.ToArray(); - _RewardAmount = CreateRewardAmountVector(builder, __RewardAmount); + var __reward_amount = _o.RewardAmount.ToArray(); + _reward_amount = CreateRewardAmountVector(builder, __reward_amount); } return CreateAcademyFavorScheduleExcel( builder, @@ -168,14 +168,14 @@ public struct AcademyFavorScheduleExcel : IFlatbufferObject _o.CharacterId, _o.ScheduleGroupId, _o.OrderInGroup, - _Location, + _location, _o.LocalizeScenarioId, _o.FavorRank, _o.SecretStoneAmount, _o.ScenarioSriptGroupId, - _RewardParcelType, - _RewardParcelId, - _RewardAmount); + _reward_parcel_type, + _reward_parcel_id, + _reward_amount); } } diff --git a/SCHALE.Common/FlatData/AcademyFavorScheduleExcelTable.cs b/SCHALE.Common/FlatData/AcademyFavorScheduleExcelTable.cs index 784b281..a05ee2c 100644 --- a/SCHALE.Common/FlatData/AcademyFavorScheduleExcelTable.cs +++ b/SCHALE.Common/FlatData/AcademyFavorScheduleExcelTable.cs @@ -24,9 +24,9 @@ public struct AcademyFavorScheduleExcelTable : IFlatbufferObject public int DataListLength { get { int o = __p.__offset(4); return o != 0 ? __p.__vector_len(o) : 0; } } public static Offset CreateAcademyFavorScheduleExcelTable(FlatBufferBuilder builder, - VectorOffset DataListOffset = default(VectorOffset)) { + VectorOffset data_listOffset = default(VectorOffset)) { builder.StartTable(1); - AcademyFavorScheduleExcelTable.AddDataList(builder, DataListOffset); + AcademyFavorScheduleExcelTable.AddDataList(builder, data_listOffset); return AcademyFavorScheduleExcelTable.EndAcademyFavorScheduleExcelTable(builder); } @@ -53,15 +53,15 @@ public struct AcademyFavorScheduleExcelTable : IFlatbufferObject } public static Offset Pack(FlatBufferBuilder builder, AcademyFavorScheduleExcelTableT _o) { if (_o == null) return default(Offset); - var _DataList = default(VectorOffset); + var _data_list = default(VectorOffset); if (_o.DataList != null) { - var __DataList = new Offset[_o.DataList.Count]; - for (var _j = 0; _j < __DataList.Length; ++_j) { __DataList[_j] = SCHALE.Common.FlatData.AcademyFavorScheduleExcel.Pack(builder, _o.DataList[_j]); } - _DataList = CreateDataListVector(builder, __DataList); + var __data_list = new Offset[_o.DataList.Count]; + for (var _j = 0; _j < __data_list.Length; ++_j) { __data_list[_j] = SCHALE.Common.FlatData.AcademyFavorScheduleExcel.Pack(builder, _o.DataList[_j]); } + _data_list = CreateDataListVector(builder, __data_list); } return CreateAcademyFavorScheduleExcelTable( builder, - _DataList); + _data_list); } } diff --git a/SCHALE.Common/FlatData/AmplifyDoTRemoveCondition.cs b/SCHALE.Common/FlatData/AmplifyDoTRemoveCondition.cs new file mode 100644 index 0000000..c8f1b75 --- /dev/null +++ b/SCHALE.Common/FlatData/AmplifyDoTRemoveCondition.cs @@ -0,0 +1,15 @@ +// +// automatically generated by the FlatBuffers compiler, do not modify +// + +namespace SCHALE.Common.FlatData +{ + +public enum AmplifyDoTRemoveCondition : int +{ + None = 0, + ApplyCount = 1, +}; + + +} diff --git a/SCHALE.Common/FlatData/ArenaNPCExcel.cs b/SCHALE.Common/FlatData/ArenaNPCExcel.cs index 718bf2b..e62eb8f 100644 --- a/SCHALE.Common/FlatData/ArenaNPCExcel.cs +++ b/SCHALE.Common/FlatData/ArenaNPCExcel.cs @@ -26,39 +26,38 @@ public struct ArenaNPCExcel : IFlatbufferObject public long NPCLevel { get { int o = __p.__offset(10); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public long NPCLevelDeviation { get { int o = __p.__offset(12); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public long NPCStarGrade { get { int o = __p.__offset(14); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } - public bool UseTSS { get { int o = __p.__offset(16); return o != 0 ? 0!=__p.bb.Get(o + __p.bb_pos) : (bool)false; } } - public SCHALE.Common.FlatData.Rarity ExceptionCharacterRarities(int j) { int o = __p.__offset(18); return o != 0 ? (SCHALE.Common.FlatData.Rarity)__p.bb.GetInt(__p.__vector(o) + j * 4) : (SCHALE.Common.FlatData.Rarity)0; } - public int ExceptionCharacterRaritiesLength { get { int o = __p.__offset(18); return o != 0 ? __p.__vector_len(o) : 0; } } + public SCHALE.Common.FlatData.Rarity ExceptionCharacterRarities(int j) { int o = __p.__offset(16); return o != 0 ? (SCHALE.Common.FlatData.Rarity)__p.bb.GetInt(__p.__vector(o) + j * 4) : (SCHALE.Common.FlatData.Rarity)0; } + public int ExceptionCharacterRaritiesLength { get { int o = __p.__offset(16); return o != 0 ? __p.__vector_len(o) : 0; } } #if ENABLE_SPAN_T - public Span GetExceptionCharacterRaritiesBytes() { return __p.__vector_as_span(18, 4); } + public Span GetExceptionCharacterRaritiesBytes() { return __p.__vector_as_span(16, 4); } #else - public ArraySegment? GetExceptionCharacterRaritiesBytes() { return __p.__vector_as_arraysegment(18); } + public ArraySegment? GetExceptionCharacterRaritiesBytes() { return __p.__vector_as_arraysegment(16); } #endif - public SCHALE.Common.FlatData.Rarity[] GetExceptionCharacterRaritiesArray() { int o = __p.__offset(18); if (o == 0) return null; int p = __p.__vector(o); int l = __p.__vector_len(o); SCHALE.Common.FlatData.Rarity[] a = new SCHALE.Common.FlatData.Rarity[l]; for (int i = 0; i < l; i++) { a[i] = (SCHALE.Common.FlatData.Rarity)__p.bb.GetInt(p + i * 4); } return a; } - public long ExceptionMainCharacterIds(int j) { int o = __p.__offset(20); return o != 0 ? __p.bb.GetLong(__p.__vector(o) + j * 8) : (long)0; } - public int ExceptionMainCharacterIdsLength { get { int o = __p.__offset(20); return o != 0 ? __p.__vector_len(o) : 0; } } + public SCHALE.Common.FlatData.Rarity[] GetExceptionCharacterRaritiesArray() { int o = __p.__offset(16); if (o == 0) return null; int p = __p.__vector(o); int l = __p.__vector_len(o); SCHALE.Common.FlatData.Rarity[] a = new SCHALE.Common.FlatData.Rarity[l]; for (int i = 0; i < l; i++) { a[i] = (SCHALE.Common.FlatData.Rarity)__p.bb.GetInt(p + i * 4); } return a; } + public long ExceptionMainCharacterIds(int j) { int o = __p.__offset(18); return o != 0 ? __p.bb.GetLong(__p.__vector(o) + j * 8) : (long)0; } + public int ExceptionMainCharacterIdsLength { get { int o = __p.__offset(18); return o != 0 ? __p.__vector_len(o) : 0; } } #if ENABLE_SPAN_T - public Span GetExceptionMainCharacterIdsBytes() { return __p.__vector_as_span(20, 8); } + public Span GetExceptionMainCharacterIdsBytes() { return __p.__vector_as_span(18, 8); } #else - public ArraySegment? GetExceptionMainCharacterIdsBytes() { return __p.__vector_as_arraysegment(20); } + public ArraySegment? GetExceptionMainCharacterIdsBytes() { return __p.__vector_as_arraysegment(18); } #endif - public long[] GetExceptionMainCharacterIdsArray() { return __p.__vector_as_array(20); } - public long ExceptionSupportCharacterIds(int j) { int o = __p.__offset(22); return o != 0 ? __p.bb.GetLong(__p.__vector(o) + j * 8) : (long)0; } - public int ExceptionSupportCharacterIdsLength { get { int o = __p.__offset(22); return o != 0 ? __p.__vector_len(o) : 0; } } + public long[] GetExceptionMainCharacterIdsArray() { return __p.__vector_as_array(18); } + public long ExceptionSupportCharacterIds(int j) { int o = __p.__offset(20); return o != 0 ? __p.bb.GetLong(__p.__vector(o) + j * 8) : (long)0; } + public int ExceptionSupportCharacterIdsLength { get { int o = __p.__offset(20); return o != 0 ? __p.__vector_len(o) : 0; } } #if ENABLE_SPAN_T - public Span GetExceptionSupportCharacterIdsBytes() { return __p.__vector_as_span(22, 8); } + public Span GetExceptionSupportCharacterIdsBytes() { return __p.__vector_as_span(20, 8); } #else - public ArraySegment? GetExceptionSupportCharacterIdsBytes() { return __p.__vector_as_arraysegment(22); } + public ArraySegment? GetExceptionSupportCharacterIdsBytes() { return __p.__vector_as_arraysegment(20); } #endif - public long[] GetExceptionSupportCharacterIdsArray() { return __p.__vector_as_array(22); } - public long ExceptionTSSIds(int j) { int o = __p.__offset(24); return o != 0 ? __p.bb.GetLong(__p.__vector(o) + j * 8) : (long)0; } - public int ExceptionTSSIdsLength { get { int o = __p.__offset(24); return o != 0 ? __p.__vector_len(o) : 0; } } + public long[] GetExceptionSupportCharacterIdsArray() { return __p.__vector_as_array(20); } + public long ExceptionTSSIds(int j) { int o = __p.__offset(22); return o != 0 ? __p.bb.GetLong(__p.__vector(o) + j * 8) : (long)0; } + public int ExceptionTSSIdsLength { get { int o = __p.__offset(22); return o != 0 ? __p.__vector_len(o) : 0; } } #if ENABLE_SPAN_T - public Span GetExceptionTSSIdsBytes() { return __p.__vector_as_span(24, 8); } + public Span GetExceptionTSSIdsBytes() { return __p.__vector_as_span(22, 8); } #else - public ArraySegment? GetExceptionTSSIdsBytes() { return __p.__vector_as_arraysegment(24); } + public ArraySegment? GetExceptionTSSIdsBytes() { return __p.__vector_as_arraysegment(22); } #endif - public long[] GetExceptionTSSIdsArray() { return __p.__vector_as_array(24); } + public long[] GetExceptionTSSIdsArray() { return __p.__vector_as_array(22); } public static Offset CreateArenaNPCExcel(FlatBufferBuilder builder, long UniqueId = 0, @@ -67,12 +66,11 @@ public struct ArenaNPCExcel : IFlatbufferObject long NPCLevel = 0, long NPCLevelDeviation = 0, long NPCStarGrade = 0, - bool UseTSS = false, VectorOffset ExceptionCharacterRaritiesOffset = default(VectorOffset), VectorOffset ExceptionMainCharacterIdsOffset = default(VectorOffset), VectorOffset ExceptionSupportCharacterIdsOffset = default(VectorOffset), VectorOffset ExceptionTSSIdsOffset = default(VectorOffset)) { - builder.StartTable(11); + builder.StartTable(10); ArenaNPCExcel.AddNPCStarGrade(builder, NPCStarGrade); ArenaNPCExcel.AddNPCLevelDeviation(builder, NPCLevelDeviation); ArenaNPCExcel.AddNPCLevel(builder, NPCLevel); @@ -83,37 +81,35 @@ public struct ArenaNPCExcel : IFlatbufferObject ArenaNPCExcel.AddExceptionSupportCharacterIds(builder, ExceptionSupportCharacterIdsOffset); ArenaNPCExcel.AddExceptionMainCharacterIds(builder, ExceptionMainCharacterIdsOffset); ArenaNPCExcel.AddExceptionCharacterRarities(builder, ExceptionCharacterRaritiesOffset); - ArenaNPCExcel.AddUseTSS(builder, UseTSS); return ArenaNPCExcel.EndArenaNPCExcel(builder); } - public static void StartArenaNPCExcel(FlatBufferBuilder builder) { builder.StartTable(11); } + public static void StartArenaNPCExcel(FlatBufferBuilder builder) { builder.StartTable(10); } public static void AddUniqueId(FlatBufferBuilder builder, long uniqueId) { builder.AddLong(0, uniqueId, 0); } public static void AddRank(FlatBufferBuilder builder, long rank) { builder.AddLong(1, rank, 0); } public static void AddNPCAccountLevel(FlatBufferBuilder builder, long nPCAccountLevel) { builder.AddLong(2, nPCAccountLevel, 0); } public static void AddNPCLevel(FlatBufferBuilder builder, long nPCLevel) { builder.AddLong(3, nPCLevel, 0); } public static void AddNPCLevelDeviation(FlatBufferBuilder builder, long nPCLevelDeviation) { builder.AddLong(4, nPCLevelDeviation, 0); } public static void AddNPCStarGrade(FlatBufferBuilder builder, long nPCStarGrade) { builder.AddLong(5, nPCStarGrade, 0); } - public static void AddUseTSS(FlatBufferBuilder builder, bool useTSS) { builder.AddBool(6, useTSS, false); } - public static void AddExceptionCharacterRarities(FlatBufferBuilder builder, VectorOffset exceptionCharacterRaritiesOffset) { builder.AddOffset(7, exceptionCharacterRaritiesOffset.Value, 0); } + public static void AddExceptionCharacterRarities(FlatBufferBuilder builder, VectorOffset exceptionCharacterRaritiesOffset) { builder.AddOffset(6, exceptionCharacterRaritiesOffset.Value, 0); } public static VectorOffset CreateExceptionCharacterRaritiesVector(FlatBufferBuilder builder, SCHALE.Common.FlatData.Rarity[] data) { builder.StartVector(4, data.Length, 4); for (int i = data.Length - 1; i >= 0; i--) builder.AddInt((int)data[i]); return builder.EndVector(); } public static VectorOffset CreateExceptionCharacterRaritiesVectorBlock(FlatBufferBuilder builder, SCHALE.Common.FlatData.Rarity[] data) { builder.StartVector(4, data.Length, 4); builder.Add(data); return builder.EndVector(); } public static VectorOffset CreateExceptionCharacterRaritiesVectorBlock(FlatBufferBuilder builder, ArraySegment data) { builder.StartVector(4, data.Count, 4); builder.Add(data); return builder.EndVector(); } public static VectorOffset CreateExceptionCharacterRaritiesVectorBlock(FlatBufferBuilder builder, IntPtr dataPtr, int sizeInBytes) { builder.StartVector(1, sizeInBytes, 1); builder.Add(dataPtr, sizeInBytes); return builder.EndVector(); } public static void StartExceptionCharacterRaritiesVector(FlatBufferBuilder builder, int numElems) { builder.StartVector(4, numElems, 4); } - public static void AddExceptionMainCharacterIds(FlatBufferBuilder builder, VectorOffset exceptionMainCharacterIdsOffset) { builder.AddOffset(8, exceptionMainCharacterIdsOffset.Value, 0); } + public static void AddExceptionMainCharacterIds(FlatBufferBuilder builder, VectorOffset exceptionMainCharacterIdsOffset) { builder.AddOffset(7, exceptionMainCharacterIdsOffset.Value, 0); } public static VectorOffset CreateExceptionMainCharacterIdsVector(FlatBufferBuilder builder, long[] data) { builder.StartVector(8, data.Length, 8); for (int i = data.Length - 1; i >= 0; i--) builder.AddLong(data[i]); return builder.EndVector(); } public static VectorOffset CreateExceptionMainCharacterIdsVectorBlock(FlatBufferBuilder builder, long[] data) { builder.StartVector(8, data.Length, 8); builder.Add(data); return builder.EndVector(); } public static VectorOffset CreateExceptionMainCharacterIdsVectorBlock(FlatBufferBuilder builder, ArraySegment data) { builder.StartVector(8, data.Count, 8); builder.Add(data); return builder.EndVector(); } public static VectorOffset CreateExceptionMainCharacterIdsVectorBlock(FlatBufferBuilder builder, IntPtr dataPtr, int sizeInBytes) { builder.StartVector(1, sizeInBytes, 1); builder.Add(dataPtr, sizeInBytes); return builder.EndVector(); } public static void StartExceptionMainCharacterIdsVector(FlatBufferBuilder builder, int numElems) { builder.StartVector(8, numElems, 8); } - public static void AddExceptionSupportCharacterIds(FlatBufferBuilder builder, VectorOffset exceptionSupportCharacterIdsOffset) { builder.AddOffset(9, exceptionSupportCharacterIdsOffset.Value, 0); } + public static void AddExceptionSupportCharacterIds(FlatBufferBuilder builder, VectorOffset exceptionSupportCharacterIdsOffset) { builder.AddOffset(8, exceptionSupportCharacterIdsOffset.Value, 0); } public static VectorOffset CreateExceptionSupportCharacterIdsVector(FlatBufferBuilder builder, long[] data) { builder.StartVector(8, data.Length, 8); for (int i = data.Length - 1; i >= 0; i--) builder.AddLong(data[i]); return builder.EndVector(); } public static VectorOffset CreateExceptionSupportCharacterIdsVectorBlock(FlatBufferBuilder builder, long[] data) { builder.StartVector(8, data.Length, 8); builder.Add(data); return builder.EndVector(); } public static VectorOffset CreateExceptionSupportCharacterIdsVectorBlock(FlatBufferBuilder builder, ArraySegment data) { builder.StartVector(8, data.Count, 8); builder.Add(data); return builder.EndVector(); } public static VectorOffset CreateExceptionSupportCharacterIdsVectorBlock(FlatBufferBuilder builder, IntPtr dataPtr, int sizeInBytes) { builder.StartVector(1, sizeInBytes, 1); builder.Add(dataPtr, sizeInBytes); return builder.EndVector(); } public static void StartExceptionSupportCharacterIdsVector(FlatBufferBuilder builder, int numElems) { builder.StartVector(8, numElems, 8); } - public static void AddExceptionTSSIds(FlatBufferBuilder builder, VectorOffset exceptionTSSIdsOffset) { builder.AddOffset(10, exceptionTSSIdsOffset.Value, 0); } + public static void AddExceptionTSSIds(FlatBufferBuilder builder, VectorOffset exceptionTSSIdsOffset) { builder.AddOffset(9, exceptionTSSIdsOffset.Value, 0); } public static VectorOffset CreateExceptionTSSIdsVector(FlatBufferBuilder builder, long[] data) { builder.StartVector(8, data.Length, 8); for (int i = data.Length - 1; i >= 0; i--) builder.AddLong(data[i]); return builder.EndVector(); } public static VectorOffset CreateExceptionTSSIdsVectorBlock(FlatBufferBuilder builder, long[] data) { builder.StartVector(8, data.Length, 8); builder.Add(data); return builder.EndVector(); } public static VectorOffset CreateExceptionTSSIdsVectorBlock(FlatBufferBuilder builder, ArraySegment data) { builder.StartVector(8, data.Count, 8); builder.Add(data); return builder.EndVector(); } @@ -136,7 +132,6 @@ public struct ArenaNPCExcel : IFlatbufferObject _o.NPCLevel = TableEncryptionService.Convert(this.NPCLevel, key); _o.NPCLevelDeviation = TableEncryptionService.Convert(this.NPCLevelDeviation, key); _o.NPCStarGrade = TableEncryptionService.Convert(this.NPCStarGrade, key); - _o.UseTSS = TableEncryptionService.Convert(this.UseTSS, key); _o.ExceptionCharacterRarities = new List(); for (var _j = 0; _j < this.ExceptionCharacterRaritiesLength; ++_j) {_o.ExceptionCharacterRarities.Add(TableEncryptionService.Convert(this.ExceptionCharacterRarities(_j), key));} _o.ExceptionMainCharacterIds = new List(); @@ -176,7 +171,6 @@ public struct ArenaNPCExcel : IFlatbufferObject _o.NPCLevel, _o.NPCLevelDeviation, _o.NPCStarGrade, - _o.UseTSS, _ExceptionCharacterRarities, _ExceptionMainCharacterIds, _ExceptionSupportCharacterIds, @@ -192,7 +186,6 @@ public class ArenaNPCExcelT public long NPCLevel { get; set; } public long NPCLevelDeviation { get; set; } public long NPCStarGrade { get; set; } - public bool UseTSS { get; set; } public List ExceptionCharacterRarities { get; set; } public List ExceptionMainCharacterIds { get; set; } public List ExceptionSupportCharacterIds { get; set; } @@ -205,7 +198,6 @@ public class ArenaNPCExcelT this.NPCLevel = 0; this.NPCLevelDeviation = 0; this.NPCStarGrade = 0; - this.UseTSS = false; this.ExceptionCharacterRarities = null; this.ExceptionMainCharacterIds = null; this.ExceptionSupportCharacterIds = null; @@ -225,11 +217,10 @@ static public class ArenaNPCExcelVerify && verifier.VerifyField(tablePos, 10 /*NPCLevel*/, 8 /*long*/, 8, false) && verifier.VerifyField(tablePos, 12 /*NPCLevelDeviation*/, 8 /*long*/, 8, false) && verifier.VerifyField(tablePos, 14 /*NPCStarGrade*/, 8 /*long*/, 8, false) - && verifier.VerifyField(tablePos, 16 /*UseTSS*/, 1 /*bool*/, 1, false) - && verifier.VerifyVectorOfData(tablePos, 18 /*ExceptionCharacterRarities*/, 4 /*SCHALE.Common.FlatData.Rarity*/, false) - && verifier.VerifyVectorOfData(tablePos, 20 /*ExceptionMainCharacterIds*/, 8 /*long*/, false) - && verifier.VerifyVectorOfData(tablePos, 22 /*ExceptionSupportCharacterIds*/, 8 /*long*/, false) - && verifier.VerifyVectorOfData(tablePos, 24 /*ExceptionTSSIds*/, 8 /*long*/, false) + && verifier.VerifyVectorOfData(tablePos, 16 /*ExceptionCharacterRarities*/, 4 /*SCHALE.Common.FlatData.Rarity*/, false) + && verifier.VerifyVectorOfData(tablePos, 18 /*ExceptionMainCharacterIds*/, 8 /*long*/, false) + && verifier.VerifyVectorOfData(tablePos, 20 /*ExceptionSupportCharacterIds*/, 8 /*long*/, false) + && verifier.VerifyVectorOfData(tablePos, 22 /*ExceptionTSSIds*/, 8 /*long*/, false) && verifier.VerifyTableEnd(tablePos); } } diff --git a/SCHALE.Common/FlatData/ArenaRewardExcel.cs b/SCHALE.Common/FlatData/ArenaRewardExcel.cs index d0571aa..ec09348 100644 --- a/SCHALE.Common/FlatData/ArenaRewardExcel.cs +++ b/SCHALE.Common/FlatData/ArenaRewardExcel.cs @@ -21,7 +21,7 @@ public struct ArenaRewardExcel : IFlatbufferObject public ArenaRewardExcel __assign(int _i, ByteBuffer _bb) { __init(_i, _bb); return this; } public long UniqueId { get { int o = __p.__offset(4); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } - public SCHALE.Common.FlatData.ArenaRewardType ArenaRewardType { get { int o = __p.__offset(6); return o != 0 ? (SCHALE.Common.FlatData.ArenaRewardType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.ArenaRewardType.None; } } + public SCHALE.Common.FlatData.ArenaRewardType ArenaRewardType_ { get { int o = __p.__offset(6); return o != 0 ? (SCHALE.Common.FlatData.ArenaRewardType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.ArenaRewardType.None; } } public long RankStart { get { int o = __p.__offset(8); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public long RankEnd { get { int o = __p.__offset(10); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public string RankIconPath { get { int o = __p.__offset(12); return o != 0 ? __p.__string(o + __p.bb_pos) : null; } } @@ -60,7 +60,7 @@ public struct ArenaRewardExcel : IFlatbufferObject public static Offset CreateArenaRewardExcel(FlatBufferBuilder builder, long UniqueId = 0, - SCHALE.Common.FlatData.ArenaRewardType ArenaRewardType = SCHALE.Common.FlatData.ArenaRewardType.None, + SCHALE.Common.FlatData.ArenaRewardType ArenaRewardType_ = SCHALE.Common.FlatData.ArenaRewardType.None, long RankStart = 0, long RankEnd = 0, StringOffset RankIconPathOffset = default(StringOffset), @@ -77,13 +77,13 @@ public struct ArenaRewardExcel : IFlatbufferObject ArenaRewardExcel.AddRewardParcelUniqueId(builder, RewardParcelUniqueIdOffset); ArenaRewardExcel.AddRewardParcelType(builder, RewardParcelTypeOffset); ArenaRewardExcel.AddRankIconPath(builder, RankIconPathOffset); - ArenaRewardExcel.AddArenaRewardType(builder, ArenaRewardType); + ArenaRewardExcel.AddArenaRewardType_(builder, ArenaRewardType_); return ArenaRewardExcel.EndArenaRewardExcel(builder); } public static void StartArenaRewardExcel(FlatBufferBuilder builder) { builder.StartTable(9); } public static void AddUniqueId(FlatBufferBuilder builder, long uniqueId) { builder.AddLong(0, uniqueId, 0); } - public static void AddArenaRewardType(FlatBufferBuilder builder, SCHALE.Common.FlatData.ArenaRewardType arenaRewardType) { builder.AddInt(1, (int)arenaRewardType, 0); } + public static void AddArenaRewardType_(FlatBufferBuilder builder, SCHALE.Common.FlatData.ArenaRewardType arenaRewardType_) { builder.AddInt(1, (int)arenaRewardType_, 0); } public static void AddRankStart(FlatBufferBuilder builder, long rankStart) { builder.AddLong(2, rankStart, 0); } public static void AddRankEnd(FlatBufferBuilder builder, long rankEnd) { builder.AddLong(3, rankEnd, 0); } public static void AddRankIconPath(FlatBufferBuilder builder, StringOffset rankIconPathOffset) { builder.AddOffset(4, rankIconPathOffset.Value, 0); } @@ -123,7 +123,7 @@ public struct ArenaRewardExcel : IFlatbufferObject public void UnPackTo(ArenaRewardExcelT _o) { byte[] key = TableEncryptionService.CreateKey("ArenaReward"); _o.UniqueId = TableEncryptionService.Convert(this.UniqueId, key); - _o.ArenaRewardType = TableEncryptionService.Convert(this.ArenaRewardType, key); + _o.ArenaRewardType_ = TableEncryptionService.Convert(this.ArenaRewardType_, key); _o.RankStart = TableEncryptionService.Convert(this.RankStart, key); _o.RankEnd = TableEncryptionService.Convert(this.RankEnd, key); _o.RankIconPath = TableEncryptionService.Convert(this.RankIconPath, key); @@ -163,7 +163,7 @@ public struct ArenaRewardExcel : IFlatbufferObject return CreateArenaRewardExcel( builder, _o.UniqueId, - _o.ArenaRewardType, + _o.ArenaRewardType_, _o.RankStart, _o.RankEnd, _RankIconPath, @@ -177,7 +177,7 @@ public struct ArenaRewardExcel : IFlatbufferObject public class ArenaRewardExcelT { public long UniqueId { get; set; } - public SCHALE.Common.FlatData.ArenaRewardType ArenaRewardType { get; set; } + public SCHALE.Common.FlatData.ArenaRewardType ArenaRewardType_ { get; set; } public long RankStart { get; set; } public long RankEnd { get; set; } public string RankIconPath { get; set; } @@ -188,7 +188,7 @@ public class ArenaRewardExcelT public ArenaRewardExcelT() { this.UniqueId = 0; - this.ArenaRewardType = SCHALE.Common.FlatData.ArenaRewardType.None; + this.ArenaRewardType_ = SCHALE.Common.FlatData.ArenaRewardType.None; this.RankStart = 0; this.RankEnd = 0; this.RankIconPath = null; @@ -206,7 +206,7 @@ static public class ArenaRewardExcelVerify { return verifier.VerifyTableStart(tablePos) && verifier.VerifyField(tablePos, 4 /*UniqueId*/, 8 /*long*/, 8, false) - && verifier.VerifyField(tablePos, 6 /*ArenaRewardType*/, 4 /*SCHALE.Common.FlatData.ArenaRewardType*/, 4, false) + && verifier.VerifyField(tablePos, 6 /*ArenaRewardType_*/, 4 /*SCHALE.Common.FlatData.ArenaRewardType*/, 4, false) && verifier.VerifyField(tablePos, 8 /*RankStart*/, 8 /*long*/, 8, false) && verifier.VerifyField(tablePos, 10 /*RankEnd*/, 8 /*long*/, 8, false) && verifier.VerifyString(tablePos, 12 /*RankIconPath*/, false) diff --git a/SCHALE.Common/FlatData/AssistEchelonTypeConvertExcel.cs b/SCHALE.Common/FlatData/AssistEchelonTypeConvertExcel.cs new file mode 100644 index 0000000..76d8694 --- /dev/null +++ b/SCHALE.Common/FlatData/AssistEchelonTypeConvertExcel.cs @@ -0,0 +1,84 @@ +// +// automatically generated by the FlatBuffers compiler, do not modify +// + +namespace SCHALE.Common.FlatData +{ + +using global::System; +using global::System.Collections.Generic; +using global::SCHALE.Common.Crypto; +using global::Google.FlatBuffers; + +public struct AssistEchelonTypeConvertExcel : IFlatbufferObject +{ + private Table __p; + public ByteBuffer ByteBuffer { get { return __p.bb; } } + public static void ValidateVersion() { FlatBufferConstants.FLATBUFFERS_24_3_25(); } + public static AssistEchelonTypeConvertExcel GetRootAsAssistEchelonTypeConvertExcel(ByteBuffer _bb) { return GetRootAsAssistEchelonTypeConvertExcel(_bb, new AssistEchelonTypeConvertExcel()); } + public static AssistEchelonTypeConvertExcel GetRootAsAssistEchelonTypeConvertExcel(ByteBuffer _bb, AssistEchelonTypeConvertExcel obj) { return (obj.__assign(_bb.GetInt(_bb.Position) + _bb.Position, _bb)); } + public void __init(int _i, ByteBuffer _bb) { __p = new Table(_i, _bb); } + public AssistEchelonTypeConvertExcel __assign(int _i, ByteBuffer _bb) { __init(_i, _bb); return this; } + + public SCHALE.Common.FlatData.EchelonType Contents { get { int o = __p.__offset(4); return o != 0 ? (SCHALE.Common.FlatData.EchelonType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.EchelonType.None; } } + public SCHALE.Common.FlatData.EchelonType ConvertTo { get { int o = __p.__offset(6); return o != 0 ? (SCHALE.Common.FlatData.EchelonType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.EchelonType.None; } } + + public static Offset CreateAssistEchelonTypeConvertExcel(FlatBufferBuilder builder, + SCHALE.Common.FlatData.EchelonType Contents = SCHALE.Common.FlatData.EchelonType.None, + SCHALE.Common.FlatData.EchelonType ConvertTo = SCHALE.Common.FlatData.EchelonType.None) { + builder.StartTable(2); + AssistEchelonTypeConvertExcel.AddConvertTo(builder, ConvertTo); + AssistEchelonTypeConvertExcel.AddContents(builder, Contents); + return AssistEchelonTypeConvertExcel.EndAssistEchelonTypeConvertExcel(builder); + } + + public static void StartAssistEchelonTypeConvertExcel(FlatBufferBuilder builder) { builder.StartTable(2); } + public static void AddContents(FlatBufferBuilder builder, SCHALE.Common.FlatData.EchelonType contents) { builder.AddInt(0, (int)contents, 0); } + public static void AddConvertTo(FlatBufferBuilder builder, SCHALE.Common.FlatData.EchelonType convertTo) { builder.AddInt(1, (int)convertTo, 0); } + public static Offset EndAssistEchelonTypeConvertExcel(FlatBufferBuilder builder) { + int o = builder.EndTable(); + return new Offset(o); + } + public AssistEchelonTypeConvertExcelT UnPack() { + var _o = new AssistEchelonTypeConvertExcelT(); + this.UnPackTo(_o); + return _o; + } + public void UnPackTo(AssistEchelonTypeConvertExcelT _o) { + byte[] key = TableEncryptionService.CreateKey("AssistEchelonTypeConvert"); + _o.Contents = TableEncryptionService.Convert(this.Contents, key); + _o.ConvertTo = TableEncryptionService.Convert(this.ConvertTo, key); + } + public static Offset Pack(FlatBufferBuilder builder, AssistEchelonTypeConvertExcelT _o) { + if (_o == null) return default(Offset); + return CreateAssistEchelonTypeConvertExcel( + builder, + _o.Contents, + _o.ConvertTo); + } +} + +public class AssistEchelonTypeConvertExcelT +{ + public SCHALE.Common.FlatData.EchelonType Contents { get; set; } + public SCHALE.Common.FlatData.EchelonType ConvertTo { get; set; } + + public AssistEchelonTypeConvertExcelT() { + this.Contents = SCHALE.Common.FlatData.EchelonType.None; + this.ConvertTo = SCHALE.Common.FlatData.EchelonType.None; + } +} + + +static public class AssistEchelonTypeConvertExcelVerify +{ + static public bool Verify(Google.FlatBuffers.Verifier verifier, uint tablePos) + { + return verifier.VerifyTableStart(tablePos) + && verifier.VerifyField(tablePos, 4 /*Contents*/, 4 /*SCHALE.Common.FlatData.EchelonType*/, 4, false) + && verifier.VerifyField(tablePos, 6 /*ConvertTo*/, 4 /*SCHALE.Common.FlatData.EchelonType*/, 4, false) + && verifier.VerifyTableEnd(tablePos); + } +} + +} diff --git a/SCHALE.Common/FlatData/EventContentSpoilerPopupExcelTable.cs b/SCHALE.Common/FlatData/AssistEchelonTypeConvertExcelTable.cs similarity index 50% rename from SCHALE.Common/FlatData/EventContentSpoilerPopupExcelTable.cs rename to SCHALE.Common/FlatData/AssistEchelonTypeConvertExcelTable.cs index 6a347ea..492ed8e 100644 --- a/SCHALE.Common/FlatData/EventContentSpoilerPopupExcelTable.cs +++ b/SCHALE.Common/FlatData/AssistEchelonTypeConvertExcelTable.cs @@ -10,77 +10,77 @@ using global::System.Collections.Generic; using global::SCHALE.Common.Crypto; using global::Google.FlatBuffers; -public struct EventContentSpoilerPopupExcelTable : IFlatbufferObject +public struct AssistEchelonTypeConvertExcelTable : IFlatbufferObject { private Table __p; public ByteBuffer ByteBuffer { get { return __p.bb; } } public static void ValidateVersion() { FlatBufferConstants.FLATBUFFERS_24_3_25(); } - public static EventContentSpoilerPopupExcelTable GetRootAsEventContentSpoilerPopupExcelTable(ByteBuffer _bb) { return GetRootAsEventContentSpoilerPopupExcelTable(_bb, new EventContentSpoilerPopupExcelTable()); } - public static EventContentSpoilerPopupExcelTable GetRootAsEventContentSpoilerPopupExcelTable(ByteBuffer _bb, EventContentSpoilerPopupExcelTable obj) { return (obj.__assign(_bb.GetInt(_bb.Position) + _bb.Position, _bb)); } + public static AssistEchelonTypeConvertExcelTable GetRootAsAssistEchelonTypeConvertExcelTable(ByteBuffer _bb) { return GetRootAsAssistEchelonTypeConvertExcelTable(_bb, new AssistEchelonTypeConvertExcelTable()); } + public static AssistEchelonTypeConvertExcelTable GetRootAsAssistEchelonTypeConvertExcelTable(ByteBuffer _bb, AssistEchelonTypeConvertExcelTable obj) { return (obj.__assign(_bb.GetInt(_bb.Position) + _bb.Position, _bb)); } public void __init(int _i, ByteBuffer _bb) { __p = new Table(_i, _bb); } - public EventContentSpoilerPopupExcelTable __assign(int _i, ByteBuffer _bb) { __init(_i, _bb); return this; } + public AssistEchelonTypeConvertExcelTable __assign(int _i, ByteBuffer _bb) { __init(_i, _bb); return this; } - public SCHALE.Common.FlatData.EventContentSpoilerPopupExcel? DataList(int j) { int o = __p.__offset(4); return o != 0 ? (SCHALE.Common.FlatData.EventContentSpoilerPopupExcel?)(new SCHALE.Common.FlatData.EventContentSpoilerPopupExcel()).__assign(__p.__indirect(__p.__vector(o) + j * 4), __p.bb) : null; } + public SCHALE.Common.FlatData.AssistEchelonTypeConvertExcel? DataList(int j) { int o = __p.__offset(4); return o != 0 ? (SCHALE.Common.FlatData.AssistEchelonTypeConvertExcel?)(new SCHALE.Common.FlatData.AssistEchelonTypeConvertExcel()).__assign(__p.__indirect(__p.__vector(o) + j * 4), __p.bb) : null; } public int DataListLength { get { int o = __p.__offset(4); return o != 0 ? __p.__vector_len(o) : 0; } } - public static Offset CreateEventContentSpoilerPopupExcelTable(FlatBufferBuilder builder, + public static Offset CreateAssistEchelonTypeConvertExcelTable(FlatBufferBuilder builder, VectorOffset DataListOffset = default(VectorOffset)) { builder.StartTable(1); - EventContentSpoilerPopupExcelTable.AddDataList(builder, DataListOffset); - return EventContentSpoilerPopupExcelTable.EndEventContentSpoilerPopupExcelTable(builder); + AssistEchelonTypeConvertExcelTable.AddDataList(builder, DataListOffset); + return AssistEchelonTypeConvertExcelTable.EndAssistEchelonTypeConvertExcelTable(builder); } - public static void StartEventContentSpoilerPopupExcelTable(FlatBufferBuilder builder) { builder.StartTable(1); } + public static void StartAssistEchelonTypeConvertExcelTable(FlatBufferBuilder builder) { builder.StartTable(1); } public static void AddDataList(FlatBufferBuilder builder, VectorOffset dataListOffset) { builder.AddOffset(0, dataListOffset.Value, 0); } - public static VectorOffset CreateDataListVector(FlatBufferBuilder builder, Offset[] data) { builder.StartVector(4, data.Length, 4); for (int i = data.Length - 1; i >= 0; i--) builder.AddOffset(data[i].Value); return builder.EndVector(); } - public static VectorOffset CreateDataListVectorBlock(FlatBufferBuilder builder, Offset[] data) { builder.StartVector(4, data.Length, 4); builder.Add(data); return builder.EndVector(); } - public static VectorOffset CreateDataListVectorBlock(FlatBufferBuilder builder, ArraySegment> data) { builder.StartVector(4, data.Count, 4); builder.Add(data); return builder.EndVector(); } - public static VectorOffset CreateDataListVectorBlock(FlatBufferBuilder builder, IntPtr dataPtr, int sizeInBytes) { builder.StartVector(1, sizeInBytes, 1); builder.Add>(dataPtr, sizeInBytes); return builder.EndVector(); } + public static VectorOffset CreateDataListVector(FlatBufferBuilder builder, Offset[] data) { builder.StartVector(4, data.Length, 4); for (int i = data.Length - 1; i >= 0; i--) builder.AddOffset(data[i].Value); return builder.EndVector(); } + public static VectorOffset CreateDataListVectorBlock(FlatBufferBuilder builder, Offset[] data) { builder.StartVector(4, data.Length, 4); builder.Add(data); return builder.EndVector(); } + public static VectorOffset CreateDataListVectorBlock(FlatBufferBuilder builder, ArraySegment> data) { builder.StartVector(4, data.Count, 4); builder.Add(data); return builder.EndVector(); } + public static VectorOffset CreateDataListVectorBlock(FlatBufferBuilder builder, IntPtr dataPtr, int sizeInBytes) { builder.StartVector(1, sizeInBytes, 1); builder.Add>(dataPtr, sizeInBytes); return builder.EndVector(); } public static void StartDataListVector(FlatBufferBuilder builder, int numElems) { builder.StartVector(4, numElems, 4); } - public static Offset EndEventContentSpoilerPopupExcelTable(FlatBufferBuilder builder) { + public static Offset EndAssistEchelonTypeConvertExcelTable(FlatBufferBuilder builder) { int o = builder.EndTable(); - return new Offset(o); + return new Offset(o); } - public EventContentSpoilerPopupExcelTableT UnPack() { - var _o = new EventContentSpoilerPopupExcelTableT(); + public AssistEchelonTypeConvertExcelTableT UnPack() { + var _o = new AssistEchelonTypeConvertExcelTableT(); this.UnPackTo(_o); return _o; } - public void UnPackTo(EventContentSpoilerPopupExcelTableT _o) { - byte[] key = TableEncryptionService.CreateKey("EventContentSpoilerPopupExcel"); - _o.DataList = new List(); + public void UnPackTo(AssistEchelonTypeConvertExcelTableT _o) { + byte[] key = TableEncryptionService.CreateKey("AssistEchelonTypeConvertExcel"); + _o.DataList = new List(); for (var _j = 0; _j < this.DataListLength; ++_j) {_o.DataList.Add(this.DataList(_j).HasValue ? this.DataList(_j).Value.UnPack() : null);} } - public static Offset Pack(FlatBufferBuilder builder, EventContentSpoilerPopupExcelTableT _o) { - if (_o == null) return default(Offset); + public static Offset Pack(FlatBufferBuilder builder, AssistEchelonTypeConvertExcelTableT _o) { + if (_o == null) return default(Offset); var _DataList = default(VectorOffset); if (_o.DataList != null) { - var __DataList = new Offset[_o.DataList.Count]; - for (var _j = 0; _j < __DataList.Length; ++_j) { __DataList[_j] = SCHALE.Common.FlatData.EventContentSpoilerPopupExcel.Pack(builder, _o.DataList[_j]); } + var __DataList = new Offset[_o.DataList.Count]; + for (var _j = 0; _j < __DataList.Length; ++_j) { __DataList[_j] = SCHALE.Common.FlatData.AssistEchelonTypeConvertExcel.Pack(builder, _o.DataList[_j]); } _DataList = CreateDataListVector(builder, __DataList); } - return CreateEventContentSpoilerPopupExcelTable( + return CreateAssistEchelonTypeConvertExcelTable( builder, _DataList); } } -public class EventContentSpoilerPopupExcelTableT +public class AssistEchelonTypeConvertExcelTableT { - public List DataList { get; set; } + public List DataList { get; set; } - public EventContentSpoilerPopupExcelTableT() { + public AssistEchelonTypeConvertExcelTableT() { this.DataList = null; } } -static public class EventContentSpoilerPopupExcelTableVerify +static public class AssistEchelonTypeConvertExcelTableVerify { static public bool Verify(Google.FlatBuffers.Verifier verifier, uint tablePos) { return verifier.VerifyTableStart(tablePos) - && verifier.VerifyVectorOfTables(tablePos, 4 /*DataList*/, SCHALE.Common.FlatData.EventContentSpoilerPopupExcelVerify.Verify, false) + && verifier.VerifyVectorOfTables(tablePos, 4 /*DataList*/, SCHALE.Common.FlatData.AssistEchelonTypeConvertExcelVerify.Verify, false) && verifier.VerifyTableEnd(tablePos); } } diff --git a/SCHALE.Common/FlatData/AttendanceExcel.cs b/SCHALE.Common/FlatData/AttendanceExcel.cs index b3c79cf..147baf8 100644 --- a/SCHALE.Common/FlatData/AttendanceExcel.cs +++ b/SCHALE.Common/FlatData/AttendanceExcel.cs @@ -71,8 +71,8 @@ public struct AttendanceExcel : IFlatbufferObject #endif public byte[] GetEndDateArray() { return __p.__vector_as_array(30); } public long ExpiryDate { get { int o = __p.__offset(32); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } - public SCHALE.Common.FlatData.MailType MailType { get { int o = __p.__offset(34); return o != 0 ? (SCHALE.Common.FlatData.MailType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.MailType.System; } } - public SCHALE.Common.FlatData.DialogCategory DialogCategory { get { int o = __p.__offset(36); return o != 0 ? (SCHALE.Common.FlatData.DialogCategory)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.DialogCategory.Cafe; } } + public SCHALE.Common.FlatData.MailType MailType_ { get { int o = __p.__offset(34); return o != 0 ? (SCHALE.Common.FlatData.MailType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.MailType.System; } } + public SCHALE.Common.FlatData.DialogCategory DialogCategory_ { get { int o = __p.__offset(36); return o != 0 ? (SCHALE.Common.FlatData.DialogCategory)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.DialogCategory.Cafe; } } public string TitleImagePath { get { int o = __p.__offset(38); return o != 0 ? __p.__string(o + __p.bb_pos) : null; } } #if ENABLE_SPAN_T public Span GetTitleImagePathBytes() { return __p.__vector_as_span(38, 1); } @@ -104,8 +104,8 @@ public struct AttendanceExcel : IFlatbufferObject StringOffset StartableEndDateOffset = default(StringOffset), StringOffset EndDateOffset = default(StringOffset), long ExpiryDate = 0, - SCHALE.Common.FlatData.MailType MailType = SCHALE.Common.FlatData.MailType.System, - SCHALE.Common.FlatData.DialogCategory DialogCategory = SCHALE.Common.FlatData.DialogCategory.Cafe, + SCHALE.Common.FlatData.MailType MailType_ = SCHALE.Common.FlatData.MailType.System, + SCHALE.Common.FlatData.DialogCategory DialogCategory_ = SCHALE.Common.FlatData.DialogCategory.Cafe, StringOffset TitleImagePathOffset = default(StringOffset), StringOffset DecorationImagePathOffset = default(StringOffset)) { builder.StartTable(19); @@ -116,8 +116,8 @@ public struct AttendanceExcel : IFlatbufferObject AttendanceExcel.AddId(builder, Id); AttendanceExcel.AddDecorationImagePath(builder, DecorationImagePathOffset); AttendanceExcel.AddTitleImagePath(builder, TitleImagePathOffset); - AttendanceExcel.AddDialogCategory(builder, DialogCategory); - AttendanceExcel.AddMailType(builder, MailType); + AttendanceExcel.AddDialogCategory_(builder, DialogCategory_); + AttendanceExcel.AddMailType_(builder, MailType_); AttendanceExcel.AddEndDate(builder, EndDateOffset); AttendanceExcel.AddStartableEndDate(builder, StartableEndDateOffset); AttendanceExcel.AddStartDate(builder, StartDateOffset); @@ -147,8 +147,8 @@ public struct AttendanceExcel : IFlatbufferObject public static void AddStartableEndDate(FlatBufferBuilder builder, StringOffset startableEndDateOffset) { builder.AddOffset(12, startableEndDateOffset.Value, 0); } public static void AddEndDate(FlatBufferBuilder builder, StringOffset endDateOffset) { builder.AddOffset(13, endDateOffset.Value, 0); } public static void AddExpiryDate(FlatBufferBuilder builder, long expiryDate) { builder.AddLong(14, expiryDate, 0); } - public static void AddMailType(FlatBufferBuilder builder, SCHALE.Common.FlatData.MailType mailType) { builder.AddInt(15, (int)mailType, 0); } - public static void AddDialogCategory(FlatBufferBuilder builder, SCHALE.Common.FlatData.DialogCategory dialogCategory) { builder.AddInt(16, (int)dialogCategory, 0); } + public static void AddMailType_(FlatBufferBuilder builder, SCHALE.Common.FlatData.MailType mailType_) { builder.AddInt(15, (int)mailType_, 0); } + public static void AddDialogCategory_(FlatBufferBuilder builder, SCHALE.Common.FlatData.DialogCategory dialogCategory_) { builder.AddInt(16, (int)dialogCategory_, 0); } public static void AddTitleImagePath(FlatBufferBuilder builder, StringOffset titleImagePathOffset) { builder.AddOffset(17, titleImagePathOffset.Value, 0); } public static void AddDecorationImagePath(FlatBufferBuilder builder, StringOffset decorationImagePathOffset) { builder.AddOffset(18, decorationImagePathOffset.Value, 0); } public static Offset EndAttendanceExcel(FlatBufferBuilder builder) { @@ -177,8 +177,8 @@ public struct AttendanceExcel : IFlatbufferObject _o.StartableEndDate = TableEncryptionService.Convert(this.StartableEndDate, key); _o.EndDate = TableEncryptionService.Convert(this.EndDate, key); _o.ExpiryDate = TableEncryptionService.Convert(this.ExpiryDate, key); - _o.MailType = TableEncryptionService.Convert(this.MailType, key); - _o.DialogCategory = TableEncryptionService.Convert(this.DialogCategory, key); + _o.MailType_ = TableEncryptionService.Convert(this.MailType_, key); + _o.DialogCategory_ = TableEncryptionService.Convert(this.DialogCategory_, key); _o.TitleImagePath = TableEncryptionService.Convert(this.TitleImagePath, key); _o.DecorationImagePath = TableEncryptionService.Convert(this.DecorationImagePath, key); } @@ -209,8 +209,8 @@ public struct AttendanceExcel : IFlatbufferObject _StartableEndDate, _EndDate, _o.ExpiryDate, - _o.MailType, - _o.DialogCategory, + _o.MailType_, + _o.DialogCategory_, _TitleImagePath, _DecorationImagePath); } @@ -233,8 +233,8 @@ public class AttendanceExcelT public string StartableEndDate { get; set; } public string EndDate { get; set; } public long ExpiryDate { get; set; } - public SCHALE.Common.FlatData.MailType MailType { get; set; } - public SCHALE.Common.FlatData.DialogCategory DialogCategory { get; set; } + public SCHALE.Common.FlatData.MailType MailType_ { get; set; } + public SCHALE.Common.FlatData.DialogCategory DialogCategory_ { get; set; } public string TitleImagePath { get; set; } public string DecorationImagePath { get; set; } @@ -254,8 +254,8 @@ public class AttendanceExcelT this.StartableEndDate = null; this.EndDate = null; this.ExpiryDate = 0; - this.MailType = SCHALE.Common.FlatData.MailType.System; - this.DialogCategory = SCHALE.Common.FlatData.DialogCategory.Cafe; + this.MailType_ = SCHALE.Common.FlatData.MailType.System; + this.DialogCategory_ = SCHALE.Common.FlatData.DialogCategory.Cafe; this.TitleImagePath = null; this.DecorationImagePath = null; } @@ -282,8 +282,8 @@ static public class AttendanceExcelVerify && verifier.VerifyString(tablePos, 28 /*StartableEndDate*/, false) && verifier.VerifyString(tablePos, 30 /*EndDate*/, false) && verifier.VerifyField(tablePos, 32 /*ExpiryDate*/, 8 /*long*/, 8, false) - && verifier.VerifyField(tablePos, 34 /*MailType*/, 4 /*SCHALE.Common.FlatData.MailType*/, 4, false) - && verifier.VerifyField(tablePos, 36 /*DialogCategory*/, 4 /*SCHALE.Common.FlatData.DialogCategory*/, 4, false) + && verifier.VerifyField(tablePos, 34 /*MailType_*/, 4 /*SCHALE.Common.FlatData.MailType*/, 4, false) + && verifier.VerifyField(tablePos, 36 /*DialogCategory_*/, 4 /*SCHALE.Common.FlatData.DialogCategory*/, 4, false) && verifier.VerifyString(tablePos, 38 /*TitleImagePath*/, false) && verifier.VerifyString(tablePos, 40 /*DecorationImagePath*/, false) && verifier.VerifyTableEnd(tablePos); diff --git a/SCHALE.Common/FlatData/BossExternalBTExcel.cs b/SCHALE.Common/FlatData/BossExternalBTExcel.cs index 938051e..aef9afb 100644 --- a/SCHALE.Common/FlatData/BossExternalBTExcel.cs +++ b/SCHALE.Common/FlatData/BossExternalBTExcel.cs @@ -22,8 +22,8 @@ public struct BossExternalBTExcel : IFlatbufferObject public long ExternalBTId { get { int o = __p.__offset(4); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public long AIPhase { get { int o = __p.__offset(6); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } - public SCHALE.Common.FlatData.ExternalBTNodeType ExternalBTNodeType { get { int o = __p.__offset(8); return o != 0 ? (SCHALE.Common.FlatData.ExternalBTNodeType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.ExternalBTNodeType.Sequence; } } - public SCHALE.Common.FlatData.ExternalBTTrigger ExternalBTTrigger { get { int o = __p.__offset(10); return o != 0 ? (SCHALE.Common.FlatData.ExternalBTTrigger)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.ExternalBTTrigger.None; } } + public SCHALE.Common.FlatData.ExternalBTNodeType ExternalBTNodeType_ { get { int o = __p.__offset(8); return o != 0 ? (SCHALE.Common.FlatData.ExternalBTNodeType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.ExternalBTNodeType.Sequence; } } + public SCHALE.Common.FlatData.ExternalBTTrigger ExternalBTTrigger_ { get { int o = __p.__offset(10); return o != 0 ? (SCHALE.Common.FlatData.ExternalBTTrigger)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.ExternalBTTrigger.None; } } public string TriggerArgument { get { int o = __p.__offset(12); return o != 0 ? __p.__string(o + __p.bb_pos) : null; } } #if ENABLE_SPAN_T public Span GetTriggerArgumentBytes() { return __p.__vector_as_span(12, 1); } @@ -32,7 +32,7 @@ public struct BossExternalBTExcel : IFlatbufferObject #endif public byte[] GetTriggerArgumentArray() { return __p.__vector_as_array(12); } public long BehaviorRate { get { int o = __p.__offset(14); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } - public SCHALE.Common.FlatData.ExternalBehavior ExternalBehavior { get { int o = __p.__offset(16); return o != 0 ? (SCHALE.Common.FlatData.ExternalBehavior)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.ExternalBehavior.UseNextExSkill; } } + public SCHALE.Common.FlatData.ExternalBehavior ExternalBehavior_ { get { int o = __p.__offset(16); return o != 0 ? (SCHALE.Common.FlatData.ExternalBehavior)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.ExternalBehavior.UseNextExSkill; } } public string BehaviorArgument { get { int o = __p.__offset(18); return o != 0 ? __p.__string(o + __p.bb_pos) : null; } } #if ENABLE_SPAN_T public Span GetBehaviorArgumentBytes() { return __p.__vector_as_span(18, 1); } @@ -44,32 +44,32 @@ public struct BossExternalBTExcel : IFlatbufferObject public static Offset CreateBossExternalBTExcel(FlatBufferBuilder builder, long ExternalBTId = 0, long AIPhase = 0, - SCHALE.Common.FlatData.ExternalBTNodeType ExternalBTNodeType = SCHALE.Common.FlatData.ExternalBTNodeType.Sequence, - SCHALE.Common.FlatData.ExternalBTTrigger ExternalBTTrigger = SCHALE.Common.FlatData.ExternalBTTrigger.None, + SCHALE.Common.FlatData.ExternalBTNodeType ExternalBTNodeType_ = SCHALE.Common.FlatData.ExternalBTNodeType.Sequence, + SCHALE.Common.FlatData.ExternalBTTrigger ExternalBTTrigger_ = SCHALE.Common.FlatData.ExternalBTTrigger.None, StringOffset TriggerArgumentOffset = default(StringOffset), long BehaviorRate = 0, - SCHALE.Common.FlatData.ExternalBehavior ExternalBehavior = SCHALE.Common.FlatData.ExternalBehavior.UseNextExSkill, + SCHALE.Common.FlatData.ExternalBehavior ExternalBehavior_ = SCHALE.Common.FlatData.ExternalBehavior.UseNextExSkill, StringOffset BehaviorArgumentOffset = default(StringOffset)) { builder.StartTable(8); BossExternalBTExcel.AddBehaviorRate(builder, BehaviorRate); BossExternalBTExcel.AddAIPhase(builder, AIPhase); BossExternalBTExcel.AddExternalBTId(builder, ExternalBTId); BossExternalBTExcel.AddBehaviorArgument(builder, BehaviorArgumentOffset); - BossExternalBTExcel.AddExternalBehavior(builder, ExternalBehavior); + BossExternalBTExcel.AddExternalBehavior_(builder, ExternalBehavior_); BossExternalBTExcel.AddTriggerArgument(builder, TriggerArgumentOffset); - BossExternalBTExcel.AddExternalBTTrigger(builder, ExternalBTTrigger); - BossExternalBTExcel.AddExternalBTNodeType(builder, ExternalBTNodeType); + BossExternalBTExcel.AddExternalBTTrigger_(builder, ExternalBTTrigger_); + BossExternalBTExcel.AddExternalBTNodeType_(builder, ExternalBTNodeType_); return BossExternalBTExcel.EndBossExternalBTExcel(builder); } public static void StartBossExternalBTExcel(FlatBufferBuilder builder) { builder.StartTable(8); } public static void AddExternalBTId(FlatBufferBuilder builder, long externalBTId) { builder.AddLong(0, externalBTId, 0); } public static void AddAIPhase(FlatBufferBuilder builder, long aIPhase) { builder.AddLong(1, aIPhase, 0); } - public static void AddExternalBTNodeType(FlatBufferBuilder builder, SCHALE.Common.FlatData.ExternalBTNodeType externalBTNodeType) { builder.AddInt(2, (int)externalBTNodeType, 0); } - public static void AddExternalBTTrigger(FlatBufferBuilder builder, SCHALE.Common.FlatData.ExternalBTTrigger externalBTTrigger) { builder.AddInt(3, (int)externalBTTrigger, 0); } + public static void AddExternalBTNodeType_(FlatBufferBuilder builder, SCHALE.Common.FlatData.ExternalBTNodeType externalBTNodeType_) { builder.AddInt(2, (int)externalBTNodeType_, 0); } + public static void AddExternalBTTrigger_(FlatBufferBuilder builder, SCHALE.Common.FlatData.ExternalBTTrigger externalBTTrigger_) { builder.AddInt(3, (int)externalBTTrigger_, 0); } public static void AddTriggerArgument(FlatBufferBuilder builder, StringOffset triggerArgumentOffset) { builder.AddOffset(4, triggerArgumentOffset.Value, 0); } public static void AddBehaviorRate(FlatBufferBuilder builder, long behaviorRate) { builder.AddLong(5, behaviorRate, 0); } - public static void AddExternalBehavior(FlatBufferBuilder builder, SCHALE.Common.FlatData.ExternalBehavior externalBehavior) { builder.AddInt(6, (int)externalBehavior, 0); } + public static void AddExternalBehavior_(FlatBufferBuilder builder, SCHALE.Common.FlatData.ExternalBehavior externalBehavior_) { builder.AddInt(6, (int)externalBehavior_, 0); } public static void AddBehaviorArgument(FlatBufferBuilder builder, StringOffset behaviorArgumentOffset) { builder.AddOffset(7, behaviorArgumentOffset.Value, 0); } public static Offset EndBossExternalBTExcel(FlatBufferBuilder builder) { int o = builder.EndTable(); @@ -84,11 +84,11 @@ public struct BossExternalBTExcel : IFlatbufferObject byte[] key = TableEncryptionService.CreateKey("BossExternalBT"); _o.ExternalBTId = TableEncryptionService.Convert(this.ExternalBTId, key); _o.AIPhase = TableEncryptionService.Convert(this.AIPhase, key); - _o.ExternalBTNodeType = TableEncryptionService.Convert(this.ExternalBTNodeType, key); - _o.ExternalBTTrigger = TableEncryptionService.Convert(this.ExternalBTTrigger, key); + _o.ExternalBTNodeType_ = TableEncryptionService.Convert(this.ExternalBTNodeType_, key); + _o.ExternalBTTrigger_ = TableEncryptionService.Convert(this.ExternalBTTrigger_, key); _o.TriggerArgument = TableEncryptionService.Convert(this.TriggerArgument, key); _o.BehaviorRate = TableEncryptionService.Convert(this.BehaviorRate, key); - _o.ExternalBehavior = TableEncryptionService.Convert(this.ExternalBehavior, key); + _o.ExternalBehavior_ = TableEncryptionService.Convert(this.ExternalBehavior_, key); _o.BehaviorArgument = TableEncryptionService.Convert(this.BehaviorArgument, key); } public static Offset Pack(FlatBufferBuilder builder, BossExternalBTExcelT _o) { @@ -99,11 +99,11 @@ public struct BossExternalBTExcel : IFlatbufferObject builder, _o.ExternalBTId, _o.AIPhase, - _o.ExternalBTNodeType, - _o.ExternalBTTrigger, + _o.ExternalBTNodeType_, + _o.ExternalBTTrigger_, _TriggerArgument, _o.BehaviorRate, - _o.ExternalBehavior, + _o.ExternalBehavior_, _BehaviorArgument); } } @@ -112,21 +112,21 @@ public class BossExternalBTExcelT { public long ExternalBTId { get; set; } public long AIPhase { get; set; } - public SCHALE.Common.FlatData.ExternalBTNodeType ExternalBTNodeType { get; set; } - public SCHALE.Common.FlatData.ExternalBTTrigger ExternalBTTrigger { get; set; } + public SCHALE.Common.FlatData.ExternalBTNodeType ExternalBTNodeType_ { get; set; } + public SCHALE.Common.FlatData.ExternalBTTrigger ExternalBTTrigger_ { get; set; } public string TriggerArgument { get; set; } public long BehaviorRate { get; set; } - public SCHALE.Common.FlatData.ExternalBehavior ExternalBehavior { get; set; } + public SCHALE.Common.FlatData.ExternalBehavior ExternalBehavior_ { get; set; } public string BehaviorArgument { get; set; } public BossExternalBTExcelT() { this.ExternalBTId = 0; this.AIPhase = 0; - this.ExternalBTNodeType = SCHALE.Common.FlatData.ExternalBTNodeType.Sequence; - this.ExternalBTTrigger = SCHALE.Common.FlatData.ExternalBTTrigger.None; + this.ExternalBTNodeType_ = SCHALE.Common.FlatData.ExternalBTNodeType.Sequence; + this.ExternalBTTrigger_ = SCHALE.Common.FlatData.ExternalBTTrigger.None; this.TriggerArgument = null; this.BehaviorRate = 0; - this.ExternalBehavior = SCHALE.Common.FlatData.ExternalBehavior.UseNextExSkill; + this.ExternalBehavior_ = SCHALE.Common.FlatData.ExternalBehavior.UseNextExSkill; this.BehaviorArgument = null; } } @@ -139,11 +139,11 @@ static public class BossExternalBTExcelVerify return verifier.VerifyTableStart(tablePos) && verifier.VerifyField(tablePos, 4 /*ExternalBTId*/, 8 /*long*/, 8, false) && verifier.VerifyField(tablePos, 6 /*AIPhase*/, 8 /*long*/, 8, false) - && verifier.VerifyField(tablePos, 8 /*ExternalBTNodeType*/, 4 /*SCHALE.Common.FlatData.ExternalBTNodeType*/, 4, false) - && verifier.VerifyField(tablePos, 10 /*ExternalBTTrigger*/, 4 /*SCHALE.Common.FlatData.ExternalBTTrigger*/, 4, false) + && verifier.VerifyField(tablePos, 8 /*ExternalBTNodeType_*/, 4 /*SCHALE.Common.FlatData.ExternalBTNodeType*/, 4, false) + && verifier.VerifyField(tablePos, 10 /*ExternalBTTrigger_*/, 4 /*SCHALE.Common.FlatData.ExternalBTTrigger*/, 4, false) && verifier.VerifyString(tablePos, 12 /*TriggerArgument*/, false) && verifier.VerifyField(tablePos, 14 /*BehaviorRate*/, 8 /*long*/, 8, false) - && verifier.VerifyField(tablePos, 16 /*ExternalBehavior*/, 4 /*SCHALE.Common.FlatData.ExternalBehavior*/, 4, false) + && verifier.VerifyField(tablePos, 16 /*ExternalBehavior_*/, 4 /*SCHALE.Common.FlatData.ExternalBehavior*/, 4, false) && verifier.VerifyString(tablePos, 18 /*BehaviorArgument*/, false) && verifier.VerifyTableEnd(tablePos); } diff --git a/SCHALE.Common/FlatData/BulletArmorDamageFactorExcel.cs b/SCHALE.Common/FlatData/BulletArmorDamageFactorExcel.cs index bee12fa..5ea455b 100644 --- a/SCHALE.Common/FlatData/BulletArmorDamageFactorExcel.cs +++ b/SCHALE.Common/FlatData/BulletArmorDamageFactorExcel.cs @@ -27,20 +27,20 @@ public struct BulletArmorDamageFactorExcel : IFlatbufferObject public ArraySegment? GetDamageFactorGroupIdBytes() { return __p.__vector_as_arraysegment(4); } #endif public byte[] GetDamageFactorGroupIdArray() { return __p.__vector_as_array(4); } - public SCHALE.Common.FlatData.BulletType BulletType { get { int o = __p.__offset(6); return o != 0 ? (SCHALE.Common.FlatData.BulletType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.BulletType.Normal; } } - public SCHALE.Common.FlatData.ArmorType ArmorType { get { int o = __p.__offset(8); return o != 0 ? (SCHALE.Common.FlatData.ArmorType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.ArmorType.LightArmor; } } + public SCHALE.Common.FlatData.BulletType BulletType_ { get { int o = __p.__offset(6); return o != 0 ? (SCHALE.Common.FlatData.BulletType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.BulletType.Normal; } } + public SCHALE.Common.FlatData.ArmorType ArmorType_ { get { int o = __p.__offset(8); return o != 0 ? (SCHALE.Common.FlatData.ArmorType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.ArmorType.LightArmor; } } public long DamageRate { get { int o = __p.__offset(10); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } - public SCHALE.Common.FlatData.DamageAttribute DamageAttribute { get { int o = __p.__offset(12); return o != 0 ? (SCHALE.Common.FlatData.DamageAttribute)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.DamageAttribute.Resist; } } + public SCHALE.Common.FlatData.DamageAttribute DamageAttribute_ { get { int o = __p.__offset(12); return o != 0 ? (SCHALE.Common.FlatData.DamageAttribute)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.DamageAttribute.Resist; } } public long MinDamageRate { get { int o = __p.__offset(14); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public long MaxDamageRate { get { int o = __p.__offset(16); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public bool ShowHighlightFloater { get { int o = __p.__offset(18); return o != 0 ? 0!=__p.bb.Get(o + __p.bb_pos) : (bool)false; } } public static Offset CreateBulletArmorDamageFactorExcel(FlatBufferBuilder builder, StringOffset DamageFactorGroupIdOffset = default(StringOffset), - SCHALE.Common.FlatData.BulletType BulletType = SCHALE.Common.FlatData.BulletType.Normal, - SCHALE.Common.FlatData.ArmorType ArmorType = SCHALE.Common.FlatData.ArmorType.LightArmor, + SCHALE.Common.FlatData.BulletType BulletType_ = SCHALE.Common.FlatData.BulletType.Normal, + SCHALE.Common.FlatData.ArmorType ArmorType_ = SCHALE.Common.FlatData.ArmorType.LightArmor, long DamageRate = 0, - SCHALE.Common.FlatData.DamageAttribute DamageAttribute = SCHALE.Common.FlatData.DamageAttribute.Resist, + SCHALE.Common.FlatData.DamageAttribute DamageAttribute_ = SCHALE.Common.FlatData.DamageAttribute.Resist, long MinDamageRate = 0, long MaxDamageRate = 0, bool ShowHighlightFloater = false) { @@ -48,9 +48,9 @@ public struct BulletArmorDamageFactorExcel : IFlatbufferObject BulletArmorDamageFactorExcel.AddMaxDamageRate(builder, MaxDamageRate); BulletArmorDamageFactorExcel.AddMinDamageRate(builder, MinDamageRate); BulletArmorDamageFactorExcel.AddDamageRate(builder, DamageRate); - BulletArmorDamageFactorExcel.AddDamageAttribute(builder, DamageAttribute); - BulletArmorDamageFactorExcel.AddArmorType(builder, ArmorType); - BulletArmorDamageFactorExcel.AddBulletType(builder, BulletType); + BulletArmorDamageFactorExcel.AddDamageAttribute_(builder, DamageAttribute_); + BulletArmorDamageFactorExcel.AddArmorType_(builder, ArmorType_); + BulletArmorDamageFactorExcel.AddBulletType_(builder, BulletType_); BulletArmorDamageFactorExcel.AddDamageFactorGroupId(builder, DamageFactorGroupIdOffset); BulletArmorDamageFactorExcel.AddShowHighlightFloater(builder, ShowHighlightFloater); return BulletArmorDamageFactorExcel.EndBulletArmorDamageFactorExcel(builder); @@ -58,10 +58,10 @@ public struct BulletArmorDamageFactorExcel : IFlatbufferObject public static void StartBulletArmorDamageFactorExcel(FlatBufferBuilder builder) { builder.StartTable(8); } public static void AddDamageFactorGroupId(FlatBufferBuilder builder, StringOffset damageFactorGroupIdOffset) { builder.AddOffset(0, damageFactorGroupIdOffset.Value, 0); } - public static void AddBulletType(FlatBufferBuilder builder, SCHALE.Common.FlatData.BulletType bulletType) { builder.AddInt(1, (int)bulletType, 0); } - public static void AddArmorType(FlatBufferBuilder builder, SCHALE.Common.FlatData.ArmorType armorType) { builder.AddInt(2, (int)armorType, 0); } + public static void AddBulletType_(FlatBufferBuilder builder, SCHALE.Common.FlatData.BulletType bulletType_) { builder.AddInt(1, (int)bulletType_, 0); } + public static void AddArmorType_(FlatBufferBuilder builder, SCHALE.Common.FlatData.ArmorType armorType_) { builder.AddInt(2, (int)armorType_, 0); } public static void AddDamageRate(FlatBufferBuilder builder, long damageRate) { builder.AddLong(3, damageRate, 0); } - public static void AddDamageAttribute(FlatBufferBuilder builder, SCHALE.Common.FlatData.DamageAttribute damageAttribute) { builder.AddInt(4, (int)damageAttribute, 0); } + public static void AddDamageAttribute_(FlatBufferBuilder builder, SCHALE.Common.FlatData.DamageAttribute damageAttribute_) { builder.AddInt(4, (int)damageAttribute_, 0); } public static void AddMinDamageRate(FlatBufferBuilder builder, long minDamageRate) { builder.AddLong(5, minDamageRate, 0); } public static void AddMaxDamageRate(FlatBufferBuilder builder, long maxDamageRate) { builder.AddLong(6, maxDamageRate, 0); } public static void AddShowHighlightFloater(FlatBufferBuilder builder, bool showHighlightFloater) { builder.AddBool(7, showHighlightFloater, false); } @@ -77,10 +77,10 @@ public struct BulletArmorDamageFactorExcel : IFlatbufferObject public void UnPackTo(BulletArmorDamageFactorExcelT _o) { byte[] key = TableEncryptionService.CreateKey("BulletArmorDamageFactor"); _o.DamageFactorGroupId = TableEncryptionService.Convert(this.DamageFactorGroupId, key); - _o.BulletType = TableEncryptionService.Convert(this.BulletType, key); - _o.ArmorType = TableEncryptionService.Convert(this.ArmorType, key); + _o.BulletType_ = TableEncryptionService.Convert(this.BulletType_, key); + _o.ArmorType_ = TableEncryptionService.Convert(this.ArmorType_, key); _o.DamageRate = TableEncryptionService.Convert(this.DamageRate, key); - _o.DamageAttribute = TableEncryptionService.Convert(this.DamageAttribute, key); + _o.DamageAttribute_ = TableEncryptionService.Convert(this.DamageAttribute_, key); _o.MinDamageRate = TableEncryptionService.Convert(this.MinDamageRate, key); _o.MaxDamageRate = TableEncryptionService.Convert(this.MaxDamageRate, key); _o.ShowHighlightFloater = TableEncryptionService.Convert(this.ShowHighlightFloater, key); @@ -91,10 +91,10 @@ public struct BulletArmorDamageFactorExcel : IFlatbufferObject return CreateBulletArmorDamageFactorExcel( builder, _DamageFactorGroupId, - _o.BulletType, - _o.ArmorType, + _o.BulletType_, + _o.ArmorType_, _o.DamageRate, - _o.DamageAttribute, + _o.DamageAttribute_, _o.MinDamageRate, _o.MaxDamageRate, _o.ShowHighlightFloater); @@ -104,20 +104,20 @@ public struct BulletArmorDamageFactorExcel : IFlatbufferObject public class BulletArmorDamageFactorExcelT { public string DamageFactorGroupId { get; set; } - public SCHALE.Common.FlatData.BulletType BulletType { get; set; } - public SCHALE.Common.FlatData.ArmorType ArmorType { get; set; } + public SCHALE.Common.FlatData.BulletType BulletType_ { get; set; } + public SCHALE.Common.FlatData.ArmorType ArmorType_ { get; set; } public long DamageRate { get; set; } - public SCHALE.Common.FlatData.DamageAttribute DamageAttribute { get; set; } + public SCHALE.Common.FlatData.DamageAttribute DamageAttribute_ { get; set; } public long MinDamageRate { get; set; } public long MaxDamageRate { get; set; } public bool ShowHighlightFloater { get; set; } public BulletArmorDamageFactorExcelT() { this.DamageFactorGroupId = null; - this.BulletType = SCHALE.Common.FlatData.BulletType.Normal; - this.ArmorType = SCHALE.Common.FlatData.ArmorType.LightArmor; + this.BulletType_ = SCHALE.Common.FlatData.BulletType.Normal; + this.ArmorType_ = SCHALE.Common.FlatData.ArmorType.LightArmor; this.DamageRate = 0; - this.DamageAttribute = SCHALE.Common.FlatData.DamageAttribute.Resist; + this.DamageAttribute_ = SCHALE.Common.FlatData.DamageAttribute.Resist; this.MinDamageRate = 0; this.MaxDamageRate = 0; this.ShowHighlightFloater = false; @@ -131,10 +131,10 @@ static public class BulletArmorDamageFactorExcelVerify { return verifier.VerifyTableStart(tablePos) && verifier.VerifyString(tablePos, 4 /*DamageFactorGroupId*/, false) - && verifier.VerifyField(tablePos, 6 /*BulletType*/, 4 /*SCHALE.Common.FlatData.BulletType*/, 4, false) - && verifier.VerifyField(tablePos, 8 /*ArmorType*/, 4 /*SCHALE.Common.FlatData.ArmorType*/, 4, false) + && verifier.VerifyField(tablePos, 6 /*BulletType_*/, 4 /*SCHALE.Common.FlatData.BulletType*/, 4, false) + && verifier.VerifyField(tablePos, 8 /*ArmorType_*/, 4 /*SCHALE.Common.FlatData.ArmorType*/, 4, false) && verifier.VerifyField(tablePos, 10 /*DamageRate*/, 8 /*long*/, 8, false) - && verifier.VerifyField(tablePos, 12 /*DamageAttribute*/, 4 /*SCHALE.Common.FlatData.DamageAttribute*/, 4, false) + && verifier.VerifyField(tablePos, 12 /*DamageAttribute_*/, 4 /*SCHALE.Common.FlatData.DamageAttribute*/, 4, false) && verifier.VerifyField(tablePos, 14 /*MinDamageRate*/, 8 /*long*/, 8, false) && verifier.VerifyField(tablePos, 16 /*MaxDamageRate*/, 8 /*long*/, 8, false) && verifier.VerifyField(tablePos, 18 /*ShowHighlightFloater*/, 1 /*bool*/, 1, false) diff --git a/SCHALE.Common/FlatData/CampaignStageExcel.cs b/SCHALE.Common/FlatData/CampaignStageExcel.cs index ab8bc42..df6e1e3 100644 --- a/SCHALE.Common/FlatData/CampaignStageExcel.cs +++ b/SCHALE.Common/FlatData/CampaignStageExcel.cs @@ -76,7 +76,7 @@ public struct CampaignStageExcel : IFlatbufferObject public byte[] GetStrategyMapBGArray() { return __p.__vector_as_array(34); } public long CampaignStageRewardId { get { int o = __p.__offset(36); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public int MaxTurn { get { int o = __p.__offset(38); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } - public SCHALE.Common.FlatData.StageTopography StageTopography { get { int o = __p.__offset(40); return o != 0 ? (SCHALE.Common.FlatData.StageTopography)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.StageTopography.Street; } } + public SCHALE.Common.FlatData.StageTopography StageTopography_ { get { int o = __p.__offset(40); return o != 0 ? (SCHALE.Common.FlatData.StageTopography)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.StageTopography.Street; } } public int RecommandLevel { get { int o = __p.__offset(42); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } public string BgmId { get { int o = __p.__offset(44); return o != 0 ? __p.__string(o + __p.bb_pos) : null; } } #if ENABLE_SPAN_T @@ -85,10 +85,10 @@ public struct CampaignStageExcel : IFlatbufferObject public ArraySegment? GetBgmIdBytes() { return __p.__vector_as_arraysegment(44); } #endif public byte[] GetBgmIdArray() { return __p.__vector_as_array(44); } - public SCHALE.Common.FlatData.StrategyEnvironment StrategyEnvironment { get { int o = __p.__offset(46); return o != 0 ? (SCHALE.Common.FlatData.StrategyEnvironment)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.StrategyEnvironment.None; } } + public SCHALE.Common.FlatData.StrategyEnvironment StrategyEnvironment_ { get { int o = __p.__offset(46); return o != 0 ? (SCHALE.Common.FlatData.StrategyEnvironment)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.StrategyEnvironment.None; } } public long GroundId { get { int o = __p.__offset(48); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public int StrategySkipGroundId { get { int o = __p.__offset(50); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } - public SCHALE.Common.FlatData.ContentType ContentType { get { int o = __p.__offset(52); return o != 0 ? (SCHALE.Common.FlatData.ContentType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.ContentType.None; } } + public SCHALE.Common.FlatData.ContentType ContentType_ { get { int o = __p.__offset(52); return o != 0 ? (SCHALE.Common.FlatData.ContentType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.ContentType.None; } } public long BGMId { get { int o = __p.__offset(54); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public string FirstClearReportEventName { get { int o = __p.__offset(56); return o != 0 ? __p.__string(o + __p.bb_pos) : null; } } #if ENABLE_SPAN_T @@ -99,7 +99,7 @@ public struct CampaignStageExcel : IFlatbufferObject public byte[] GetFirstClearReportEventNameArray() { return __p.__vector_as_array(56); } public long TacticRewardExp { get { int o = __p.__offset(58); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public long FixedEchelonId { get { int o = __p.__offset(60); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } - public SCHALE.Common.FlatData.EchelonExtensionType EchelonExtensionType { get { int o = __p.__offset(62); return o != 0 ? (SCHALE.Common.FlatData.EchelonExtensionType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.EchelonExtensionType.Base; } } + public SCHALE.Common.FlatData.EchelonExtensionType EchelonExtensionType_ { get { int o = __p.__offset(62); return o != 0 ? (SCHALE.Common.FlatData.EchelonExtensionType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.EchelonExtensionType.Base; } } public static Offset CreateCampaignStageExcel(FlatBufferBuilder builder, long Id = 0, @@ -120,18 +120,18 @@ public struct CampaignStageExcel : IFlatbufferObject StringOffset StrategyMapBGOffset = default(StringOffset), long CampaignStageRewardId = 0, int MaxTurn = 0, - SCHALE.Common.FlatData.StageTopography StageTopography = SCHALE.Common.FlatData.StageTopography.Street, + SCHALE.Common.FlatData.StageTopography StageTopography_ = SCHALE.Common.FlatData.StageTopography.Street, int RecommandLevel = 0, StringOffset BgmIdOffset = default(StringOffset), - SCHALE.Common.FlatData.StrategyEnvironment StrategyEnvironment = SCHALE.Common.FlatData.StrategyEnvironment.None, + SCHALE.Common.FlatData.StrategyEnvironment StrategyEnvironment_ = SCHALE.Common.FlatData.StrategyEnvironment.None, long GroundId = 0, int StrategySkipGroundId = 0, - SCHALE.Common.FlatData.ContentType ContentType = SCHALE.Common.FlatData.ContentType.None, + SCHALE.Common.FlatData.ContentType ContentType_ = SCHALE.Common.FlatData.ContentType.None, long BGMId = 0, StringOffset FirstClearReportEventNameOffset = default(StringOffset), long TacticRewardExp = 0, long FixedEchelonId = 0, - SCHALE.Common.FlatData.EchelonExtensionType EchelonExtensionType = SCHALE.Common.FlatData.EchelonExtensionType.Base) { + SCHALE.Common.FlatData.EchelonExtensionType EchelonExtensionType_ = SCHALE.Common.FlatData.EchelonExtensionType.Base) { builder.StartTable(30); CampaignStageExcel.AddFixedEchelonId(builder, FixedEchelonId); CampaignStageExcel.AddTacticRewardExp(builder, TacticRewardExp); @@ -144,14 +144,14 @@ public struct CampaignStageExcel : IFlatbufferObject CampaignStageExcel.AddBattleDuration(builder, BattleDuration); CampaignStageExcel.AddCleardScenarioId(builder, CleardScenarioId); CampaignStageExcel.AddId(builder, Id); - CampaignStageExcel.AddEchelonExtensionType(builder, EchelonExtensionType); + CampaignStageExcel.AddEchelonExtensionType_(builder, EchelonExtensionType_); CampaignStageExcel.AddFirstClearReportEventName(builder, FirstClearReportEventNameOffset); - CampaignStageExcel.AddContentType(builder, ContentType); + CampaignStageExcel.AddContentType_(builder, ContentType_); CampaignStageExcel.AddStrategySkipGroundId(builder, StrategySkipGroundId); - CampaignStageExcel.AddStrategyEnvironment(builder, StrategyEnvironment); + CampaignStageExcel.AddStrategyEnvironment_(builder, StrategyEnvironment_); CampaignStageExcel.AddBgmId(builder, BgmIdOffset); CampaignStageExcel.AddRecommandLevel(builder, RecommandLevel); - CampaignStageExcel.AddStageTopography(builder, StageTopography); + CampaignStageExcel.AddStageTopography_(builder, StageTopography_); CampaignStageExcel.AddMaxTurn(builder, MaxTurn); CampaignStageExcel.AddStrategyMapBG(builder, StrategyMapBGOffset); CampaignStageExcel.AddStrategyMap(builder, StrategyMapOffset); @@ -195,18 +195,18 @@ public struct CampaignStageExcel : IFlatbufferObject public static void AddStrategyMapBG(FlatBufferBuilder builder, StringOffset strategyMapBGOffset) { builder.AddOffset(15, strategyMapBGOffset.Value, 0); } public static void AddCampaignStageRewardId(FlatBufferBuilder builder, long campaignStageRewardId) { builder.AddLong(16, campaignStageRewardId, 0); } public static void AddMaxTurn(FlatBufferBuilder builder, int maxTurn) { builder.AddInt(17, maxTurn, 0); } - public static void AddStageTopography(FlatBufferBuilder builder, SCHALE.Common.FlatData.StageTopography stageTopography) { builder.AddInt(18, (int)stageTopography, 0); } + public static void AddStageTopography_(FlatBufferBuilder builder, SCHALE.Common.FlatData.StageTopography stageTopography_) { builder.AddInt(18, (int)stageTopography_, 0); } public static void AddRecommandLevel(FlatBufferBuilder builder, int recommandLevel) { builder.AddInt(19, recommandLevel, 0); } public static void AddBgmId(FlatBufferBuilder builder, StringOffset bgmIdOffset) { builder.AddOffset(20, bgmIdOffset.Value, 0); } - public static void AddStrategyEnvironment(FlatBufferBuilder builder, SCHALE.Common.FlatData.StrategyEnvironment strategyEnvironment) { builder.AddInt(21, (int)strategyEnvironment, 0); } + public static void AddStrategyEnvironment_(FlatBufferBuilder builder, SCHALE.Common.FlatData.StrategyEnvironment strategyEnvironment_) { builder.AddInt(21, (int)strategyEnvironment_, 0); } public static void AddGroundId(FlatBufferBuilder builder, long groundId) { builder.AddLong(22, groundId, 0); } public static void AddStrategySkipGroundId(FlatBufferBuilder builder, int strategySkipGroundId) { builder.AddInt(23, strategySkipGroundId, 0); } - public static void AddContentType(FlatBufferBuilder builder, SCHALE.Common.FlatData.ContentType contentType) { builder.AddInt(24, (int)contentType, 0); } + public static void AddContentType_(FlatBufferBuilder builder, SCHALE.Common.FlatData.ContentType contentType_) { builder.AddInt(24, (int)contentType_, 0); } public static void AddBGMId(FlatBufferBuilder builder, long bGMId) { builder.AddLong(25, bGMId, 0); } public static void AddFirstClearReportEventName(FlatBufferBuilder builder, StringOffset firstClearReportEventNameOffset) { builder.AddOffset(26, firstClearReportEventNameOffset.Value, 0); } public static void AddTacticRewardExp(FlatBufferBuilder builder, long tacticRewardExp) { builder.AddLong(27, tacticRewardExp, 0); } public static void AddFixedEchelonId(FlatBufferBuilder builder, long fixedEchelonId) { builder.AddLong(28, fixedEchelonId, 0); } - public static void AddEchelonExtensionType(FlatBufferBuilder builder, SCHALE.Common.FlatData.EchelonExtensionType echelonExtensionType) { builder.AddInt(29, (int)echelonExtensionType, 0); } + public static void AddEchelonExtensionType_(FlatBufferBuilder builder, SCHALE.Common.FlatData.EchelonExtensionType echelonExtensionType_) { builder.AddInt(29, (int)echelonExtensionType_, 0); } public static Offset EndCampaignStageExcel(FlatBufferBuilder builder) { int o = builder.EndTable(); return new Offset(o); @@ -238,18 +238,18 @@ public struct CampaignStageExcel : IFlatbufferObject _o.StrategyMapBG = TableEncryptionService.Convert(this.StrategyMapBG, key); _o.CampaignStageRewardId = TableEncryptionService.Convert(this.CampaignStageRewardId, key); _o.MaxTurn = TableEncryptionService.Convert(this.MaxTurn, key); - _o.StageTopography = TableEncryptionService.Convert(this.StageTopography, key); + _o.StageTopography_ = TableEncryptionService.Convert(this.StageTopography_, key); _o.RecommandLevel = TableEncryptionService.Convert(this.RecommandLevel, key); _o.BgmId = TableEncryptionService.Convert(this.BgmId, key); - _o.StrategyEnvironment = TableEncryptionService.Convert(this.StrategyEnvironment, key); + _o.StrategyEnvironment_ = TableEncryptionService.Convert(this.StrategyEnvironment_, key); _o.GroundId = TableEncryptionService.Convert(this.GroundId, key); _o.StrategySkipGroundId = TableEncryptionService.Convert(this.StrategySkipGroundId, key); - _o.ContentType = TableEncryptionService.Convert(this.ContentType, key); + _o.ContentType_ = TableEncryptionService.Convert(this.ContentType_, key); _o.BGMId = TableEncryptionService.Convert(this.BGMId, key); _o.FirstClearReportEventName = TableEncryptionService.Convert(this.FirstClearReportEventName, key); _o.TacticRewardExp = TableEncryptionService.Convert(this.TacticRewardExp, key); _o.FixedEchelonId = TableEncryptionService.Convert(this.FixedEchelonId, key); - _o.EchelonExtensionType = TableEncryptionService.Convert(this.EchelonExtensionType, key); + _o.EchelonExtensionType_ = TableEncryptionService.Convert(this.EchelonExtensionType_, key); } public static Offset Pack(FlatBufferBuilder builder, CampaignStageExcelT _o) { if (_o == null) return default(Offset); @@ -289,18 +289,18 @@ public struct CampaignStageExcel : IFlatbufferObject _StrategyMapBG, _o.CampaignStageRewardId, _o.MaxTurn, - _o.StageTopography, + _o.StageTopography_, _o.RecommandLevel, _BgmId, - _o.StrategyEnvironment, + _o.StrategyEnvironment_, _o.GroundId, _o.StrategySkipGroundId, - _o.ContentType, + _o.ContentType_, _o.BGMId, _FirstClearReportEventName, _o.TacticRewardExp, _o.FixedEchelonId, - _o.EchelonExtensionType); + _o.EchelonExtensionType_); } } @@ -324,18 +324,18 @@ public class CampaignStageExcelT public string StrategyMapBG { get; set; } public long CampaignStageRewardId { get; set; } public int MaxTurn { get; set; } - public SCHALE.Common.FlatData.StageTopography StageTopography { get; set; } + public SCHALE.Common.FlatData.StageTopography StageTopography_ { get; set; } public int RecommandLevel { get; set; } public string BgmId { get; set; } - public SCHALE.Common.FlatData.StrategyEnvironment StrategyEnvironment { get; set; } + public SCHALE.Common.FlatData.StrategyEnvironment StrategyEnvironment_ { get; set; } public long GroundId { get; set; } public int StrategySkipGroundId { get; set; } - public SCHALE.Common.FlatData.ContentType ContentType { get; set; } + public SCHALE.Common.FlatData.ContentType ContentType_ { get; set; } public long BGMId { get; set; } public string FirstClearReportEventName { get; set; } public long TacticRewardExp { get; set; } public long FixedEchelonId { get; set; } - public SCHALE.Common.FlatData.EchelonExtensionType EchelonExtensionType { get; set; } + public SCHALE.Common.FlatData.EchelonExtensionType EchelonExtensionType_ { get; set; } public CampaignStageExcelT() { this.Id = 0; @@ -356,18 +356,18 @@ public class CampaignStageExcelT this.StrategyMapBG = null; this.CampaignStageRewardId = 0; this.MaxTurn = 0; - this.StageTopography = SCHALE.Common.FlatData.StageTopography.Street; + this.StageTopography_ = SCHALE.Common.FlatData.StageTopography.Street; this.RecommandLevel = 0; this.BgmId = null; - this.StrategyEnvironment = SCHALE.Common.FlatData.StrategyEnvironment.None; + this.StrategyEnvironment_ = SCHALE.Common.FlatData.StrategyEnvironment.None; this.GroundId = 0; this.StrategySkipGroundId = 0; - this.ContentType = SCHALE.Common.FlatData.ContentType.None; + this.ContentType_ = SCHALE.Common.FlatData.ContentType.None; this.BGMId = 0; this.FirstClearReportEventName = null; this.TacticRewardExp = 0; this.FixedEchelonId = 0; - this.EchelonExtensionType = SCHALE.Common.FlatData.EchelonExtensionType.Base; + this.EchelonExtensionType_ = SCHALE.Common.FlatData.EchelonExtensionType.Base; } } @@ -395,18 +395,18 @@ static public class CampaignStageExcelVerify && verifier.VerifyString(tablePos, 34 /*StrategyMapBG*/, false) && verifier.VerifyField(tablePos, 36 /*CampaignStageRewardId*/, 8 /*long*/, 8, false) && verifier.VerifyField(tablePos, 38 /*MaxTurn*/, 4 /*int*/, 4, false) - && verifier.VerifyField(tablePos, 40 /*StageTopography*/, 4 /*SCHALE.Common.FlatData.StageTopography*/, 4, false) + && verifier.VerifyField(tablePos, 40 /*StageTopography_*/, 4 /*SCHALE.Common.FlatData.StageTopography*/, 4, false) && verifier.VerifyField(tablePos, 42 /*RecommandLevel*/, 4 /*int*/, 4, false) && verifier.VerifyString(tablePos, 44 /*BgmId*/, false) - && verifier.VerifyField(tablePos, 46 /*StrategyEnvironment*/, 4 /*SCHALE.Common.FlatData.StrategyEnvironment*/, 4, false) + && verifier.VerifyField(tablePos, 46 /*StrategyEnvironment_*/, 4 /*SCHALE.Common.FlatData.StrategyEnvironment*/, 4, false) && verifier.VerifyField(tablePos, 48 /*GroundId*/, 8 /*long*/, 8, false) && verifier.VerifyField(tablePos, 50 /*StrategySkipGroundId*/, 4 /*int*/, 4, false) - && verifier.VerifyField(tablePos, 52 /*ContentType*/, 4 /*SCHALE.Common.FlatData.ContentType*/, 4, false) + && verifier.VerifyField(tablePos, 52 /*ContentType_*/, 4 /*SCHALE.Common.FlatData.ContentType*/, 4, false) && verifier.VerifyField(tablePos, 54 /*BGMId*/, 8 /*long*/, 8, false) && verifier.VerifyString(tablePos, 56 /*FirstClearReportEventName*/, false) && verifier.VerifyField(tablePos, 58 /*TacticRewardExp*/, 8 /*long*/, 8, false) && verifier.VerifyField(tablePos, 60 /*FixedEchelonId*/, 8 /*long*/, 8, false) - && verifier.VerifyField(tablePos, 62 /*EchelonExtensionType*/, 4 /*SCHALE.Common.FlatData.EchelonExtensionType*/, 4, false) + && verifier.VerifyField(tablePos, 62 /*EchelonExtensionType_*/, 4 /*SCHALE.Common.FlatData.EchelonExtensionType*/, 4, false) && verifier.VerifyTableEnd(tablePos); } } diff --git a/SCHALE.Common/FlatData/CampaignStageRewardExcel.cs b/SCHALE.Common/FlatData/CampaignStageRewardExcel.cs index 3610b22..cb5136c 100644 --- a/SCHALE.Common/FlatData/CampaignStageRewardExcel.cs +++ b/SCHALE.Common/FlatData/CampaignStageRewardExcel.cs @@ -21,7 +21,7 @@ public struct CampaignStageRewardExcel : IFlatbufferObject public CampaignStageRewardExcel __assign(int _i, ByteBuffer _bb) { __init(_i, _bb); return this; } public long GroupId { get { int o = __p.__offset(4); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } - public SCHALE.Common.FlatData.RewardTag RewardTag { get { int o = __p.__offset(6); return o != 0 ? (SCHALE.Common.FlatData.RewardTag)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.RewardTag.Default; } } + public SCHALE.Common.FlatData.RewardTag RewardTag_ { get { int o = __p.__offset(6); return o != 0 ? (SCHALE.Common.FlatData.RewardTag)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.RewardTag.Default; } } public int StageRewardProb { get { int o = __p.__offset(8); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } public SCHALE.Common.FlatData.ParcelType StageRewardParcelType { get { int o = __p.__offset(10); return o != 0 ? (SCHALE.Common.FlatData.ParcelType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.ParcelType.None; } } public long StageRewardId { get { int o = __p.__offset(12); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } @@ -30,7 +30,7 @@ public struct CampaignStageRewardExcel : IFlatbufferObject public static Offset CreateCampaignStageRewardExcel(FlatBufferBuilder builder, long GroupId = 0, - SCHALE.Common.FlatData.RewardTag RewardTag = SCHALE.Common.FlatData.RewardTag.Default, + SCHALE.Common.FlatData.RewardTag RewardTag_ = SCHALE.Common.FlatData.RewardTag.Default, int StageRewardProb = 0, SCHALE.Common.FlatData.ParcelType StageRewardParcelType = SCHALE.Common.FlatData.ParcelType.None, long StageRewardId = 0, @@ -42,14 +42,14 @@ public struct CampaignStageRewardExcel : IFlatbufferObject CampaignStageRewardExcel.AddStageRewardAmount(builder, StageRewardAmount); CampaignStageRewardExcel.AddStageRewardParcelType(builder, StageRewardParcelType); CampaignStageRewardExcel.AddStageRewardProb(builder, StageRewardProb); - CampaignStageRewardExcel.AddRewardTag(builder, RewardTag); + CampaignStageRewardExcel.AddRewardTag_(builder, RewardTag_); CampaignStageRewardExcel.AddIsDisplayed(builder, IsDisplayed); return CampaignStageRewardExcel.EndCampaignStageRewardExcel(builder); } public static void StartCampaignStageRewardExcel(FlatBufferBuilder builder) { builder.StartTable(7); } public static void AddGroupId(FlatBufferBuilder builder, long groupId) { builder.AddLong(0, groupId, 0); } - public static void AddRewardTag(FlatBufferBuilder builder, SCHALE.Common.FlatData.RewardTag rewardTag) { builder.AddInt(1, (int)rewardTag, 0); } + public static void AddRewardTag_(FlatBufferBuilder builder, SCHALE.Common.FlatData.RewardTag rewardTag_) { builder.AddInt(1, (int)rewardTag_, 0); } public static void AddStageRewardProb(FlatBufferBuilder builder, int stageRewardProb) { builder.AddInt(2, stageRewardProb, 0); } public static void AddStageRewardParcelType(FlatBufferBuilder builder, SCHALE.Common.FlatData.ParcelType stageRewardParcelType) { builder.AddInt(3, (int)stageRewardParcelType, 0); } public static void AddStageRewardId(FlatBufferBuilder builder, long stageRewardId) { builder.AddLong(4, stageRewardId, 0); } @@ -67,7 +67,7 @@ public struct CampaignStageRewardExcel : IFlatbufferObject public void UnPackTo(CampaignStageRewardExcelT _o) { byte[] key = TableEncryptionService.CreateKey("CampaignStageReward"); _o.GroupId = TableEncryptionService.Convert(this.GroupId, key); - _o.RewardTag = TableEncryptionService.Convert(this.RewardTag, key); + _o.RewardTag_ = TableEncryptionService.Convert(this.RewardTag_, key); _o.StageRewardProb = TableEncryptionService.Convert(this.StageRewardProb, key); _o.StageRewardParcelType = TableEncryptionService.Convert(this.StageRewardParcelType, key); _o.StageRewardId = TableEncryptionService.Convert(this.StageRewardId, key); @@ -79,7 +79,7 @@ public struct CampaignStageRewardExcel : IFlatbufferObject return CreateCampaignStageRewardExcel( builder, _o.GroupId, - _o.RewardTag, + _o.RewardTag_, _o.StageRewardProb, _o.StageRewardParcelType, _o.StageRewardId, @@ -91,7 +91,7 @@ public struct CampaignStageRewardExcel : IFlatbufferObject public class CampaignStageRewardExcelT { public long GroupId { get; set; } - public SCHALE.Common.FlatData.RewardTag RewardTag { get; set; } + public SCHALE.Common.FlatData.RewardTag RewardTag_ { get; set; } public int StageRewardProb { get; set; } public SCHALE.Common.FlatData.ParcelType StageRewardParcelType { get; set; } public long StageRewardId { get; set; } @@ -100,7 +100,7 @@ public class CampaignStageRewardExcelT public CampaignStageRewardExcelT() { this.GroupId = 0; - this.RewardTag = SCHALE.Common.FlatData.RewardTag.Default; + this.RewardTag_ = SCHALE.Common.FlatData.RewardTag.Default; this.StageRewardProb = 0; this.StageRewardParcelType = SCHALE.Common.FlatData.ParcelType.None; this.StageRewardId = 0; @@ -116,7 +116,7 @@ static public class CampaignStageRewardExcelVerify { return verifier.VerifyTableStart(tablePos) && verifier.VerifyField(tablePos, 4 /*GroupId*/, 8 /*long*/, 8, false) - && verifier.VerifyField(tablePos, 6 /*RewardTag*/, 4 /*SCHALE.Common.FlatData.RewardTag*/, 4, false) + && verifier.VerifyField(tablePos, 6 /*RewardTag_*/, 4 /*SCHALE.Common.FlatData.RewardTag*/, 4, false) && verifier.VerifyField(tablePos, 8 /*StageRewardProb*/, 4 /*int*/, 4, false) && verifier.VerifyField(tablePos, 10 /*StageRewardParcelType*/, 4 /*SCHALE.Common.FlatData.ParcelType*/, 4, false) && verifier.VerifyField(tablePos, 12 /*StageRewardId*/, 8 /*long*/, 8, false) diff --git a/SCHALE.Common/FlatData/CampaignStrategyObjectExcel.cs b/SCHALE.Common/FlatData/CampaignStrategyObjectExcel.cs index 736c95e..75a7e6a 100644 --- a/SCHALE.Common/FlatData/CampaignStrategyObjectExcel.cs +++ b/SCHALE.Common/FlatData/CampaignStrategyObjectExcel.cs @@ -36,7 +36,7 @@ public struct CampaignStrategyObjectExcel : IFlatbufferObject public ArraySegment? GetPrefabNameBytes() { return __p.__vector_as_arraysegment(10); } #endif public byte[] GetPrefabNameArray() { return __p.__vector_as_array(10); } - public SCHALE.Common.FlatData.StrategyObjectType StrategyObjectType { get { int o = __p.__offset(12); return o != 0 ? (SCHALE.Common.FlatData.StrategyObjectType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.StrategyObjectType.None; } } + public SCHALE.Common.FlatData.StrategyObjectType StrategyObjectType_ { get { int o = __p.__offset(12); return o != 0 ? (SCHALE.Common.FlatData.StrategyObjectType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.StrategyObjectType.None; } } public SCHALE.Common.FlatData.ParcelType StrategyRewardParcelType { get { int o = __p.__offset(14); return o != 0 ? (SCHALE.Common.FlatData.ParcelType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.ParcelType.None; } } public long StrategyRewardID { get { int o = __p.__offset(16); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public string StrategyRewardName { get { int o = __p.__offset(18); return o != 0 ? __p.__string(o + __p.bb_pos) : null; } } @@ -59,7 +59,7 @@ public struct CampaignStrategyObjectExcel : IFlatbufferObject uint Key = 0, StringOffset NameOffset = default(StringOffset), StringOffset PrefabNameOffset = default(StringOffset), - SCHALE.Common.FlatData.StrategyObjectType StrategyObjectType = SCHALE.Common.FlatData.StrategyObjectType.None, + SCHALE.Common.FlatData.StrategyObjectType StrategyObjectType_ = SCHALE.Common.FlatData.StrategyObjectType.None, SCHALE.Common.FlatData.ParcelType StrategyRewardParcelType = SCHALE.Common.FlatData.ParcelType.None, long StrategyRewardID = 0, StringOffset StrategyRewardNameOffset = default(StringOffset), @@ -81,7 +81,7 @@ public struct CampaignStrategyObjectExcel : IFlatbufferObject CampaignStrategyObjectExcel.AddStrategyRewardAmount(builder, StrategyRewardAmount); CampaignStrategyObjectExcel.AddStrategyRewardName(builder, StrategyRewardNameOffset); CampaignStrategyObjectExcel.AddStrategyRewardParcelType(builder, StrategyRewardParcelType); - CampaignStrategyObjectExcel.AddStrategyObjectType(builder, StrategyObjectType); + CampaignStrategyObjectExcel.AddStrategyObjectType_(builder, StrategyObjectType_); CampaignStrategyObjectExcel.AddPrefabName(builder, PrefabNameOffset); CampaignStrategyObjectExcel.AddName(builder, NameOffset); CampaignStrategyObjectExcel.AddKey(builder, Key); @@ -94,7 +94,7 @@ public struct CampaignStrategyObjectExcel : IFlatbufferObject public static void AddKey(FlatBufferBuilder builder, uint key) { builder.AddUint(1, key, 0); } public static void AddName(FlatBufferBuilder builder, StringOffset nameOffset) { builder.AddOffset(2, nameOffset.Value, 0); } public static void AddPrefabName(FlatBufferBuilder builder, StringOffset prefabNameOffset) { builder.AddOffset(3, prefabNameOffset.Value, 0); } - public static void AddStrategyObjectType(FlatBufferBuilder builder, SCHALE.Common.FlatData.StrategyObjectType strategyObjectType) { builder.AddInt(4, (int)strategyObjectType, 0); } + public static void AddStrategyObjectType_(FlatBufferBuilder builder, SCHALE.Common.FlatData.StrategyObjectType strategyObjectType_) { builder.AddInt(4, (int)strategyObjectType_, 0); } public static void AddStrategyRewardParcelType(FlatBufferBuilder builder, SCHALE.Common.FlatData.ParcelType strategyRewardParcelType) { builder.AddInt(5, (int)strategyRewardParcelType, 0); } public static void AddStrategyRewardID(FlatBufferBuilder builder, long strategyRewardID) { builder.AddLong(6, strategyRewardID, 0); } public static void AddStrategyRewardName(FlatBufferBuilder builder, StringOffset strategyRewardNameOffset) { builder.AddOffset(7, strategyRewardNameOffset.Value, 0); } @@ -120,7 +120,7 @@ public struct CampaignStrategyObjectExcel : IFlatbufferObject _o.Key = TableEncryptionService.Convert(this.Key, key); _o.Name = TableEncryptionService.Convert(this.Name, key); _o.PrefabName = TableEncryptionService.Convert(this.PrefabName, key); - _o.StrategyObjectType = TableEncryptionService.Convert(this.StrategyObjectType, key); + _o.StrategyObjectType_ = TableEncryptionService.Convert(this.StrategyObjectType_, key); _o.StrategyRewardParcelType = TableEncryptionService.Convert(this.StrategyRewardParcelType, key); _o.StrategyRewardID = TableEncryptionService.Convert(this.StrategyRewardID, key); _o.StrategyRewardName = TableEncryptionService.Convert(this.StrategyRewardName, key); @@ -143,7 +143,7 @@ public struct CampaignStrategyObjectExcel : IFlatbufferObject _o.Key, _Name, _PrefabName, - _o.StrategyObjectType, + _o.StrategyObjectType_, _o.StrategyRewardParcelType, _o.StrategyRewardID, _StrategyRewardName, @@ -163,7 +163,7 @@ public class CampaignStrategyObjectExcelT public uint Key { get; set; } public string Name { get; set; } public string PrefabName { get; set; } - public SCHALE.Common.FlatData.StrategyObjectType StrategyObjectType { get; set; } + public SCHALE.Common.FlatData.StrategyObjectType StrategyObjectType_ { get; set; } public SCHALE.Common.FlatData.ParcelType StrategyRewardParcelType { get; set; } public long StrategyRewardID { get; set; } public string StrategyRewardName { get; set; } @@ -180,7 +180,7 @@ public class CampaignStrategyObjectExcelT this.Key = 0; this.Name = null; this.PrefabName = null; - this.StrategyObjectType = SCHALE.Common.FlatData.StrategyObjectType.None; + this.StrategyObjectType_ = SCHALE.Common.FlatData.StrategyObjectType.None; this.StrategyRewardParcelType = SCHALE.Common.FlatData.ParcelType.None; this.StrategyRewardID = 0; this.StrategyRewardName = null; @@ -204,7 +204,7 @@ static public class CampaignStrategyObjectExcelVerify && verifier.VerifyField(tablePos, 6 /*Key*/, 4 /*uint*/, 4, false) && verifier.VerifyString(tablePos, 8 /*Name*/, false) && verifier.VerifyString(tablePos, 10 /*PrefabName*/, false) - && verifier.VerifyField(tablePos, 12 /*StrategyObjectType*/, 4 /*SCHALE.Common.FlatData.StrategyObjectType*/, 4, false) + && verifier.VerifyField(tablePos, 12 /*StrategyObjectType_*/, 4 /*SCHALE.Common.FlatData.StrategyObjectType*/, 4, false) && verifier.VerifyField(tablePos, 14 /*StrategyRewardParcelType*/, 4 /*SCHALE.Common.FlatData.ParcelType*/, 4, false) && verifier.VerifyField(tablePos, 16 /*StrategyRewardID*/, 8 /*long*/, 8, false) && verifier.VerifyString(tablePos, 18 /*StrategyRewardName*/, false) diff --git a/SCHALE.Common/FlatData/CharacterAIExcel.cs b/SCHALE.Common/FlatData/CharacterAIExcel.cs index a04a56c..f5c7978 100644 --- a/SCHALE.Common/FlatData/CharacterAIExcel.cs +++ b/SCHALE.Common/FlatData/CharacterAIExcel.cs @@ -21,7 +21,7 @@ public struct CharacterAIExcel : IFlatbufferObject public CharacterAIExcel __assign(int _i, ByteBuffer _bb) { __init(_i, _bb); return this; } public long Id { get { int o = __p.__offset(4); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } - public SCHALE.Common.FlatData.EngageType EngageType { get { int o = __p.__offset(6); return o != 0 ? (SCHALE.Common.FlatData.EngageType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.EngageType.SearchAndMove; } } + public SCHALE.Common.FlatData.EngageType EngageType_ { get { int o = __p.__offset(6); return o != 0 ? (SCHALE.Common.FlatData.EngageType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.EngageType.SearchAndMove; } } public SCHALE.Common.FlatData.PositioningType Positioning { get { int o = __p.__offset(8); return o != 0 ? (SCHALE.Common.FlatData.PositioningType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.PositioningType.CloseToObstacle; } } public bool CheckCanUseAutoSkill { get { int o = __p.__offset(10); return o != 0 ? 0!=__p.bb.Get(o + __p.bb_pos) : (bool)false; } } public long DistanceReduceRatioObstaclePath { get { int o = __p.__offset(12); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } @@ -35,7 +35,7 @@ public struct CharacterAIExcel : IFlatbufferObject public static Offset CreateCharacterAIExcel(FlatBufferBuilder builder, long Id = 0, - SCHALE.Common.FlatData.EngageType EngageType = SCHALE.Common.FlatData.EngageType.SearchAndMove, + SCHALE.Common.FlatData.EngageType EngageType_ = SCHALE.Common.FlatData.EngageType.SearchAndMove, SCHALE.Common.FlatData.PositioningType Positioning = SCHALE.Common.FlatData.PositioningType.CloseToObstacle, bool CheckCanUseAutoSkill = false, long DistanceReduceRatioObstaclePath = 0, @@ -54,7 +54,7 @@ public struct CharacterAIExcel : IFlatbufferObject CharacterAIExcel.AddDistanceReduceRatioObstaclePath(builder, DistanceReduceRatioObstaclePath); CharacterAIExcel.AddId(builder, Id); CharacterAIExcel.AddPositioning(builder, Positioning); - CharacterAIExcel.AddEngageType(builder, EngageType); + CharacterAIExcel.AddEngageType_(builder, EngageType_); CharacterAIExcel.AddHasTargetSwitchingMotion(builder, HasTargetSwitchingMotion); CharacterAIExcel.AddCanUseObstacleOfStandMotion(builder, CanUseObstacleOfStandMotion); CharacterAIExcel.AddCanUseObstacleOfKneelMotion(builder, CanUseObstacleOfKneelMotion); @@ -64,7 +64,7 @@ public struct CharacterAIExcel : IFlatbufferObject public static void StartCharacterAIExcel(FlatBufferBuilder builder) { builder.StartTable(12); } public static void AddId(FlatBufferBuilder builder, long id) { builder.AddLong(0, id, 0); } - public static void AddEngageType(FlatBufferBuilder builder, SCHALE.Common.FlatData.EngageType engageType) { builder.AddInt(1, (int)engageType, 0); } + public static void AddEngageType_(FlatBufferBuilder builder, SCHALE.Common.FlatData.EngageType engageType_) { builder.AddInt(1, (int)engageType_, 0); } public static void AddPositioning(FlatBufferBuilder builder, SCHALE.Common.FlatData.PositioningType positioning) { builder.AddInt(2, (int)positioning, 0); } public static void AddCheckCanUseAutoSkill(FlatBufferBuilder builder, bool checkCanUseAutoSkill) { builder.AddBool(3, checkCanUseAutoSkill, false); } public static void AddDistanceReduceRatioObstaclePath(FlatBufferBuilder builder, long distanceReduceRatioObstaclePath) { builder.AddLong(4, distanceReduceRatioObstaclePath, 0); } @@ -87,7 +87,7 @@ public struct CharacterAIExcel : IFlatbufferObject public void UnPackTo(CharacterAIExcelT _o) { byte[] key = TableEncryptionService.CreateKey("CharacterAI"); _o.Id = TableEncryptionService.Convert(this.Id, key); - _o.EngageType = TableEncryptionService.Convert(this.EngageType, key); + _o.EngageType_ = TableEncryptionService.Convert(this.EngageType_, key); _o.Positioning = TableEncryptionService.Convert(this.Positioning, key); _o.CheckCanUseAutoSkill = TableEncryptionService.Convert(this.CheckCanUseAutoSkill, key); _o.DistanceReduceRatioObstaclePath = TableEncryptionService.Convert(this.DistanceReduceRatioObstaclePath, key); @@ -104,7 +104,7 @@ public struct CharacterAIExcel : IFlatbufferObject return CreateCharacterAIExcel( builder, _o.Id, - _o.EngageType, + _o.EngageType_, _o.Positioning, _o.CheckCanUseAutoSkill, _o.DistanceReduceRatioObstaclePath, @@ -121,7 +121,7 @@ public struct CharacterAIExcel : IFlatbufferObject public class CharacterAIExcelT { public long Id { get; set; } - public SCHALE.Common.FlatData.EngageType EngageType { get; set; } + public SCHALE.Common.FlatData.EngageType EngageType_ { get; set; } public SCHALE.Common.FlatData.PositioningType Positioning { get; set; } public bool CheckCanUseAutoSkill { get; set; } public long DistanceReduceRatioObstaclePath { get; set; } @@ -135,7 +135,7 @@ public class CharacterAIExcelT public CharacterAIExcelT() { this.Id = 0; - this.EngageType = SCHALE.Common.FlatData.EngageType.SearchAndMove; + this.EngageType_ = SCHALE.Common.FlatData.EngageType.SearchAndMove; this.Positioning = SCHALE.Common.FlatData.PositioningType.CloseToObstacle; this.CheckCanUseAutoSkill = false; this.DistanceReduceRatioObstaclePath = 0; @@ -156,7 +156,7 @@ static public class CharacterAIExcelVerify { return verifier.VerifyTableStart(tablePos) && verifier.VerifyField(tablePos, 4 /*Id*/, 8 /*long*/, 8, false) - && verifier.VerifyField(tablePos, 6 /*EngageType*/, 4 /*SCHALE.Common.FlatData.EngageType*/, 4, false) + && verifier.VerifyField(tablePos, 6 /*EngageType_*/, 4 /*SCHALE.Common.FlatData.EngageType*/, 4, false) && verifier.VerifyField(tablePos, 8 /*Positioning*/, 4 /*SCHALE.Common.FlatData.PositioningType*/, 4, false) && verifier.VerifyField(tablePos, 10 /*CheckCanUseAutoSkill*/, 1 /*bool*/, 1, false) && verifier.VerifyField(tablePos, 12 /*DistanceReduceRatioObstaclePath*/, 8 /*long*/, 8, false) diff --git a/SCHALE.Common/FlatData/CharacterCalculationLimitExcel.cs b/SCHALE.Common/FlatData/CharacterCalculationLimitExcel.cs index f826970..85152d1 100644 --- a/SCHALE.Common/FlatData/CharacterCalculationLimitExcel.cs +++ b/SCHALE.Common/FlatData/CharacterCalculationLimitExcel.cs @@ -21,14 +21,14 @@ public struct CharacterCalculationLimitExcel : IFlatbufferObject public CharacterCalculationLimitExcel __assign(int _i, ByteBuffer _bb) { __init(_i, _bb); return this; } public long Id { get { int o = __p.__offset(4); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } - public SCHALE.Common.FlatData.TacticEntityType TacticEntityType { get { int o = __p.__offset(6); return o != 0 ? (SCHALE.Common.FlatData.TacticEntityType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.TacticEntityType.None; } } + public SCHALE.Common.FlatData.TacticEntityType TacticEntityType_ { get { int o = __p.__offset(6); return o != 0 ? (SCHALE.Common.FlatData.TacticEntityType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.TacticEntityType.None; } } public SCHALE.Common.FlatData.BattleCalculationStat CalculationValue { get { int o = __p.__offset(8); return o != 0 ? (SCHALE.Common.FlatData.BattleCalculationStat)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.BattleCalculationStat.FinalDamage; } } public long MinValue { get { int o = __p.__offset(10); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public long MaxValue { get { int o = __p.__offset(12); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public static Offset CreateCharacterCalculationLimitExcel(FlatBufferBuilder builder, long Id = 0, - SCHALE.Common.FlatData.TacticEntityType TacticEntityType = SCHALE.Common.FlatData.TacticEntityType.None, + SCHALE.Common.FlatData.TacticEntityType TacticEntityType_ = SCHALE.Common.FlatData.TacticEntityType.None, SCHALE.Common.FlatData.BattleCalculationStat CalculationValue = SCHALE.Common.FlatData.BattleCalculationStat.FinalDamage, long MinValue = 0, long MaxValue = 0) { @@ -37,13 +37,13 @@ public struct CharacterCalculationLimitExcel : IFlatbufferObject CharacterCalculationLimitExcel.AddMinValue(builder, MinValue); CharacterCalculationLimitExcel.AddId(builder, Id); CharacterCalculationLimitExcel.AddCalculationValue(builder, CalculationValue); - CharacterCalculationLimitExcel.AddTacticEntityType(builder, TacticEntityType); + CharacterCalculationLimitExcel.AddTacticEntityType_(builder, TacticEntityType_); return CharacterCalculationLimitExcel.EndCharacterCalculationLimitExcel(builder); } public static void StartCharacterCalculationLimitExcel(FlatBufferBuilder builder) { builder.StartTable(5); } public static void AddId(FlatBufferBuilder builder, long id) { builder.AddLong(0, id, 0); } - public static void AddTacticEntityType(FlatBufferBuilder builder, SCHALE.Common.FlatData.TacticEntityType tacticEntityType) { builder.AddInt(1, (int)tacticEntityType, 0); } + public static void AddTacticEntityType_(FlatBufferBuilder builder, SCHALE.Common.FlatData.TacticEntityType tacticEntityType_) { builder.AddInt(1, (int)tacticEntityType_, 0); } public static void AddCalculationValue(FlatBufferBuilder builder, SCHALE.Common.FlatData.BattleCalculationStat calculationValue) { builder.AddInt(2, (int)calculationValue, 0); } public static void AddMinValue(FlatBufferBuilder builder, long minValue) { builder.AddLong(3, minValue, 0); } public static void AddMaxValue(FlatBufferBuilder builder, long maxValue) { builder.AddLong(4, maxValue, 0); } @@ -59,7 +59,7 @@ public struct CharacterCalculationLimitExcel : IFlatbufferObject public void UnPackTo(CharacterCalculationLimitExcelT _o) { byte[] key = TableEncryptionService.CreateKey("CharacterCalculationLimit"); _o.Id = TableEncryptionService.Convert(this.Id, key); - _o.TacticEntityType = TableEncryptionService.Convert(this.TacticEntityType, key); + _o.TacticEntityType_ = TableEncryptionService.Convert(this.TacticEntityType_, key); _o.CalculationValue = TableEncryptionService.Convert(this.CalculationValue, key); _o.MinValue = TableEncryptionService.Convert(this.MinValue, key); _o.MaxValue = TableEncryptionService.Convert(this.MaxValue, key); @@ -69,7 +69,7 @@ public struct CharacterCalculationLimitExcel : IFlatbufferObject return CreateCharacterCalculationLimitExcel( builder, _o.Id, - _o.TacticEntityType, + _o.TacticEntityType_, _o.CalculationValue, _o.MinValue, _o.MaxValue); @@ -79,14 +79,14 @@ public struct CharacterCalculationLimitExcel : IFlatbufferObject public class CharacterCalculationLimitExcelT { public long Id { get; set; } - public SCHALE.Common.FlatData.TacticEntityType TacticEntityType { get; set; } + public SCHALE.Common.FlatData.TacticEntityType TacticEntityType_ { get; set; } public SCHALE.Common.FlatData.BattleCalculationStat CalculationValue { get; set; } public long MinValue { get; set; } public long MaxValue { get; set; } public CharacterCalculationLimitExcelT() { this.Id = 0; - this.TacticEntityType = SCHALE.Common.FlatData.TacticEntityType.None; + this.TacticEntityType_ = SCHALE.Common.FlatData.TacticEntityType.None; this.CalculationValue = SCHALE.Common.FlatData.BattleCalculationStat.FinalDamage; this.MinValue = 0; this.MaxValue = 0; @@ -100,7 +100,7 @@ static public class CharacterCalculationLimitExcelVerify { return verifier.VerifyTableStart(tablePos) && verifier.VerifyField(tablePos, 4 /*Id*/, 8 /*long*/, 8, false) - && verifier.VerifyField(tablePos, 6 /*TacticEntityType*/, 4 /*SCHALE.Common.FlatData.TacticEntityType*/, 4, false) + && verifier.VerifyField(tablePos, 6 /*TacticEntityType_*/, 4 /*SCHALE.Common.FlatData.TacticEntityType*/, 4, false) && verifier.VerifyField(tablePos, 8 /*CalculationValue*/, 4 /*SCHALE.Common.FlatData.BattleCalculationStat*/, 4, false) && verifier.VerifyField(tablePos, 10 /*MinValue*/, 8 /*long*/, 8, false) && verifier.VerifyField(tablePos, 12 /*MaxValue*/, 8 /*long*/, 8, false) diff --git a/SCHALE.Common/FlatData/CharacterDialogEventExcel.cs b/SCHALE.Common/FlatData/CharacterDialogEventExcel.cs index 1ccd8a1..6850b97 100644 --- a/SCHALE.Common/FlatData/CharacterDialogEventExcel.cs +++ b/SCHALE.Common/FlatData/CharacterDialogEventExcel.cs @@ -24,13 +24,13 @@ public struct CharacterDialogEventExcel : IFlatbufferObject public long OriginalCharacterId { get { int o = __p.__offset(6); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public long DisplayOrder { get { int o = __p.__offset(8); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public long EventID { get { int o = __p.__offset(10); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } - public SCHALE.Common.FlatData.ProductionStep ProductionStep { get { int o = __p.__offset(12); return o != 0 ? (SCHALE.Common.FlatData.ProductionStep)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.ProductionStep.ToDo; } } - public SCHALE.Common.FlatData.DialogCategory DialogCategory { get { int o = __p.__offset(14); return o != 0 ? (SCHALE.Common.FlatData.DialogCategory)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.DialogCategory.Cafe; } } - public SCHALE.Common.FlatData.DialogCondition DialogCondition { get { int o = __p.__offset(16); return o != 0 ? (SCHALE.Common.FlatData.DialogCondition)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.DialogCondition.Idle; } } - public SCHALE.Common.FlatData.DialogConditionDetail DialogConditionDetail { get { int o = __p.__offset(18); return o != 0 ? (SCHALE.Common.FlatData.DialogConditionDetail)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.DialogConditionDetail.None; } } + public SCHALE.Common.FlatData.ProductionStep ProductionStep_ { get { int o = __p.__offset(12); return o != 0 ? (SCHALE.Common.FlatData.ProductionStep)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.ProductionStep.ToDo; } } + public SCHALE.Common.FlatData.DialogCategory DialogCategory_ { get { int o = __p.__offset(14); return o != 0 ? (SCHALE.Common.FlatData.DialogCategory)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.DialogCategory.Cafe; } } + public SCHALE.Common.FlatData.DialogCondition DialogCondition_ { get { int o = __p.__offset(16); return o != 0 ? (SCHALE.Common.FlatData.DialogCondition)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.DialogCondition.Idle; } } + public SCHALE.Common.FlatData.DialogConditionDetail DialogConditionDetail_ { get { int o = __p.__offset(18); return o != 0 ? (SCHALE.Common.FlatData.DialogConditionDetail)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.DialogConditionDetail.None; } } public long DialogConditionDetailValue { get { int o = __p.__offset(20); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public long GroupId { get { int o = __p.__offset(22); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } - public SCHALE.Common.FlatData.DialogType DialogType { get { int o = __p.__offset(24); return o != 0 ? (SCHALE.Common.FlatData.DialogType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.DialogType.Talk; } } + public SCHALE.Common.FlatData.DialogType DialogType_ { get { int o = __p.__offset(24); return o != 0 ? (SCHALE.Common.FlatData.DialogType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.DialogType.Talk; } } public string ActionName { get { int o = __p.__offset(26); return o != 0 ? __p.__string(o + __p.bb_pos) : null; } } #if ENABLE_SPAN_T public Span GetActionNameBytes() { return __p.__vector_as_span(26, 1); } @@ -69,7 +69,7 @@ public struct CharacterDialogEventExcel : IFlatbufferObject #endif public uint[] GetVoiceIdArray() { return __p.__vector_as_array(36); } public bool CollectionVisible { get { int o = __p.__offset(38); return o != 0 ? 0!=__p.bb.Get(o + __p.bb_pos) : (bool)false; } } - public SCHALE.Common.FlatData.CVCollectionType CVCollectionType { get { int o = __p.__offset(40); return o != 0 ? (SCHALE.Common.FlatData.CVCollectionType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.CVCollectionType.CVNormal; } } + public SCHALE.Common.FlatData.CVCollectionType CVCollectionType_ { get { int o = __p.__offset(40); return o != 0 ? (SCHALE.Common.FlatData.CVCollectionType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.CVCollectionType.CVNormal; } } public long UnlockEventSeason { get { int o = __p.__offset(42); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public long ScenarioGroupId { get { int o = __p.__offset(44); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public string LocalizeCVGroup { get { int o = __p.__offset(46); return o != 0 ? __p.__string(o + __p.bb_pos) : null; } } @@ -85,13 +85,13 @@ public struct CharacterDialogEventExcel : IFlatbufferObject long OriginalCharacterId = 0, long DisplayOrder = 0, long EventID = 0, - SCHALE.Common.FlatData.ProductionStep ProductionStep = SCHALE.Common.FlatData.ProductionStep.ToDo, - SCHALE.Common.FlatData.DialogCategory DialogCategory = SCHALE.Common.FlatData.DialogCategory.Cafe, - SCHALE.Common.FlatData.DialogCondition DialogCondition = SCHALE.Common.FlatData.DialogCondition.Idle, - SCHALE.Common.FlatData.DialogConditionDetail DialogConditionDetail = SCHALE.Common.FlatData.DialogConditionDetail.None, + SCHALE.Common.FlatData.ProductionStep ProductionStep_ = SCHALE.Common.FlatData.ProductionStep.ToDo, + SCHALE.Common.FlatData.DialogCategory DialogCategory_ = SCHALE.Common.FlatData.DialogCategory.Cafe, + SCHALE.Common.FlatData.DialogCondition DialogCondition_ = SCHALE.Common.FlatData.DialogCondition.Idle, + SCHALE.Common.FlatData.DialogConditionDetail DialogConditionDetail_ = SCHALE.Common.FlatData.DialogConditionDetail.None, long DialogConditionDetailValue = 0, long GroupId = 0, - SCHALE.Common.FlatData.DialogType DialogType = SCHALE.Common.FlatData.DialogType.Talk, + SCHALE.Common.FlatData.DialogType DialogType_ = SCHALE.Common.FlatData.DialogType.Talk, StringOffset ActionNameOffset = default(StringOffset), long Duration = 0, StringOffset AnimationNameOffset = default(StringOffset), @@ -99,7 +99,7 @@ public struct CharacterDialogEventExcel : IFlatbufferObject StringOffset LocalizeJPOffset = default(StringOffset), VectorOffset VoiceIdOffset = default(VectorOffset), bool CollectionVisible = false, - SCHALE.Common.FlatData.CVCollectionType CVCollectionType = SCHALE.Common.FlatData.CVCollectionType.CVNormal, + SCHALE.Common.FlatData.CVCollectionType CVCollectionType_ = SCHALE.Common.FlatData.CVCollectionType.CVNormal, long UnlockEventSeason = 0, long ScenarioGroupId = 0, StringOffset LocalizeCVGroupOffset = default(StringOffset)) { @@ -114,17 +114,17 @@ public struct CharacterDialogEventExcel : IFlatbufferObject CharacterDialogEventExcel.AddOriginalCharacterId(builder, OriginalCharacterId); CharacterDialogEventExcel.AddCostumeUniqueId(builder, CostumeUniqueId); CharacterDialogEventExcel.AddLocalizeCVGroup(builder, LocalizeCVGroupOffset); - CharacterDialogEventExcel.AddCVCollectionType(builder, CVCollectionType); + CharacterDialogEventExcel.AddCVCollectionType_(builder, CVCollectionType_); CharacterDialogEventExcel.AddVoiceId(builder, VoiceIdOffset); CharacterDialogEventExcel.AddLocalizeJP(builder, LocalizeJPOffset); CharacterDialogEventExcel.AddLocalizeKR(builder, LocalizeKROffset); CharacterDialogEventExcel.AddAnimationName(builder, AnimationNameOffset); CharacterDialogEventExcel.AddActionName(builder, ActionNameOffset); - CharacterDialogEventExcel.AddDialogType(builder, DialogType); - CharacterDialogEventExcel.AddDialogConditionDetail(builder, DialogConditionDetail); - CharacterDialogEventExcel.AddDialogCondition(builder, DialogCondition); - CharacterDialogEventExcel.AddDialogCategory(builder, DialogCategory); - CharacterDialogEventExcel.AddProductionStep(builder, ProductionStep); + CharacterDialogEventExcel.AddDialogType_(builder, DialogType_); + CharacterDialogEventExcel.AddDialogConditionDetail_(builder, DialogConditionDetail_); + CharacterDialogEventExcel.AddDialogCondition_(builder, DialogCondition_); + CharacterDialogEventExcel.AddDialogCategory_(builder, DialogCategory_); + CharacterDialogEventExcel.AddProductionStep_(builder, ProductionStep_); CharacterDialogEventExcel.AddCollectionVisible(builder, CollectionVisible); return CharacterDialogEventExcel.EndCharacterDialogEventExcel(builder); } @@ -134,13 +134,13 @@ public struct CharacterDialogEventExcel : IFlatbufferObject public static void AddOriginalCharacterId(FlatBufferBuilder builder, long originalCharacterId) { builder.AddLong(1, originalCharacterId, 0); } public static void AddDisplayOrder(FlatBufferBuilder builder, long displayOrder) { builder.AddLong(2, displayOrder, 0); } public static void AddEventID(FlatBufferBuilder builder, long eventID) { builder.AddLong(3, eventID, 0); } - public static void AddProductionStep(FlatBufferBuilder builder, SCHALE.Common.FlatData.ProductionStep productionStep) { builder.AddInt(4, (int)productionStep, 0); } - public static void AddDialogCategory(FlatBufferBuilder builder, SCHALE.Common.FlatData.DialogCategory dialogCategory) { builder.AddInt(5, (int)dialogCategory, 0); } - public static void AddDialogCondition(FlatBufferBuilder builder, SCHALE.Common.FlatData.DialogCondition dialogCondition) { builder.AddInt(6, (int)dialogCondition, 0); } - public static void AddDialogConditionDetail(FlatBufferBuilder builder, SCHALE.Common.FlatData.DialogConditionDetail dialogConditionDetail) { builder.AddInt(7, (int)dialogConditionDetail, 0); } + public static void AddProductionStep_(FlatBufferBuilder builder, SCHALE.Common.FlatData.ProductionStep productionStep_) { builder.AddInt(4, (int)productionStep_, 0); } + public static void AddDialogCategory_(FlatBufferBuilder builder, SCHALE.Common.FlatData.DialogCategory dialogCategory_) { builder.AddInt(5, (int)dialogCategory_, 0); } + public static void AddDialogCondition_(FlatBufferBuilder builder, SCHALE.Common.FlatData.DialogCondition dialogCondition_) { builder.AddInt(6, (int)dialogCondition_, 0); } + public static void AddDialogConditionDetail_(FlatBufferBuilder builder, SCHALE.Common.FlatData.DialogConditionDetail dialogConditionDetail_) { builder.AddInt(7, (int)dialogConditionDetail_, 0); } public static void AddDialogConditionDetailValue(FlatBufferBuilder builder, long dialogConditionDetailValue) { builder.AddLong(8, dialogConditionDetailValue, 0); } public static void AddGroupId(FlatBufferBuilder builder, long groupId) { builder.AddLong(9, groupId, 0); } - public static void AddDialogType(FlatBufferBuilder builder, SCHALE.Common.FlatData.DialogType dialogType) { builder.AddInt(10, (int)dialogType, 0); } + public static void AddDialogType_(FlatBufferBuilder builder, SCHALE.Common.FlatData.DialogType dialogType_) { builder.AddInt(10, (int)dialogType_, 0); } public static void AddActionName(FlatBufferBuilder builder, StringOffset actionNameOffset) { builder.AddOffset(11, actionNameOffset.Value, 0); } public static void AddDuration(FlatBufferBuilder builder, long duration) { builder.AddLong(12, duration, 0); } public static void AddAnimationName(FlatBufferBuilder builder, StringOffset animationNameOffset) { builder.AddOffset(13, animationNameOffset.Value, 0); } @@ -153,7 +153,7 @@ public struct CharacterDialogEventExcel : IFlatbufferObject public static VectorOffset CreateVoiceIdVectorBlock(FlatBufferBuilder builder, IntPtr dataPtr, int sizeInBytes) { builder.StartVector(1, sizeInBytes, 1); builder.Add(dataPtr, sizeInBytes); return builder.EndVector(); } public static void StartVoiceIdVector(FlatBufferBuilder builder, int numElems) { builder.StartVector(4, numElems, 4); } public static void AddCollectionVisible(FlatBufferBuilder builder, bool collectionVisible) { builder.AddBool(17, collectionVisible, false); } - public static void AddCVCollectionType(FlatBufferBuilder builder, SCHALE.Common.FlatData.CVCollectionType cVCollectionType) { builder.AddInt(18, (int)cVCollectionType, 0); } + public static void AddCVCollectionType_(FlatBufferBuilder builder, SCHALE.Common.FlatData.CVCollectionType cVCollectionType_) { builder.AddInt(18, (int)cVCollectionType_, 0); } public static void AddUnlockEventSeason(FlatBufferBuilder builder, long unlockEventSeason) { builder.AddLong(19, unlockEventSeason, 0); } public static void AddScenarioGroupId(FlatBufferBuilder builder, long scenarioGroupId) { builder.AddLong(20, scenarioGroupId, 0); } public static void AddLocalizeCVGroup(FlatBufferBuilder builder, StringOffset localizeCVGroupOffset) { builder.AddOffset(21, localizeCVGroupOffset.Value, 0); } @@ -172,13 +172,13 @@ public struct CharacterDialogEventExcel : IFlatbufferObject _o.OriginalCharacterId = TableEncryptionService.Convert(this.OriginalCharacterId, key); _o.DisplayOrder = TableEncryptionService.Convert(this.DisplayOrder, key); _o.EventID = TableEncryptionService.Convert(this.EventID, key); - _o.ProductionStep = TableEncryptionService.Convert(this.ProductionStep, key); - _o.DialogCategory = TableEncryptionService.Convert(this.DialogCategory, key); - _o.DialogCondition = TableEncryptionService.Convert(this.DialogCondition, key); - _o.DialogConditionDetail = TableEncryptionService.Convert(this.DialogConditionDetail, key); + _o.ProductionStep_ = TableEncryptionService.Convert(this.ProductionStep_, key); + _o.DialogCategory_ = TableEncryptionService.Convert(this.DialogCategory_, key); + _o.DialogCondition_ = TableEncryptionService.Convert(this.DialogCondition_, key); + _o.DialogConditionDetail_ = TableEncryptionService.Convert(this.DialogConditionDetail_, key); _o.DialogConditionDetailValue = TableEncryptionService.Convert(this.DialogConditionDetailValue, key); _o.GroupId = TableEncryptionService.Convert(this.GroupId, key); - _o.DialogType = TableEncryptionService.Convert(this.DialogType, key); + _o.DialogType_ = TableEncryptionService.Convert(this.DialogType_, key); _o.ActionName = TableEncryptionService.Convert(this.ActionName, key); _o.Duration = TableEncryptionService.Convert(this.Duration, key); _o.AnimationName = TableEncryptionService.Convert(this.AnimationName, key); @@ -187,7 +187,7 @@ public struct CharacterDialogEventExcel : IFlatbufferObject _o.VoiceId = new List(); for (var _j = 0; _j < this.VoiceIdLength; ++_j) {_o.VoiceId.Add(TableEncryptionService.Convert(this.VoiceId(_j), key));} _o.CollectionVisible = TableEncryptionService.Convert(this.CollectionVisible, key); - _o.CVCollectionType = TableEncryptionService.Convert(this.CVCollectionType, key); + _o.CVCollectionType_ = TableEncryptionService.Convert(this.CVCollectionType_, key); _o.UnlockEventSeason = TableEncryptionService.Convert(this.UnlockEventSeason, key); _o.ScenarioGroupId = TableEncryptionService.Convert(this.ScenarioGroupId, key); _o.LocalizeCVGroup = TableEncryptionService.Convert(this.LocalizeCVGroup, key); @@ -210,13 +210,13 @@ public struct CharacterDialogEventExcel : IFlatbufferObject _o.OriginalCharacterId, _o.DisplayOrder, _o.EventID, - _o.ProductionStep, - _o.DialogCategory, - _o.DialogCondition, - _o.DialogConditionDetail, + _o.ProductionStep_, + _o.DialogCategory_, + _o.DialogCondition_, + _o.DialogConditionDetail_, _o.DialogConditionDetailValue, _o.GroupId, - _o.DialogType, + _o.DialogType_, _ActionName, _o.Duration, _AnimationName, @@ -224,7 +224,7 @@ public struct CharacterDialogEventExcel : IFlatbufferObject _LocalizeJP, _VoiceId, _o.CollectionVisible, - _o.CVCollectionType, + _o.CVCollectionType_, _o.UnlockEventSeason, _o.ScenarioGroupId, _LocalizeCVGroup); @@ -237,13 +237,13 @@ public class CharacterDialogEventExcelT public long OriginalCharacterId { get; set; } public long DisplayOrder { get; set; } public long EventID { get; set; } - public SCHALE.Common.FlatData.ProductionStep ProductionStep { get; set; } - public SCHALE.Common.FlatData.DialogCategory DialogCategory { get; set; } - public SCHALE.Common.FlatData.DialogCondition DialogCondition { get; set; } - public SCHALE.Common.FlatData.DialogConditionDetail DialogConditionDetail { get; set; } + public SCHALE.Common.FlatData.ProductionStep ProductionStep_ { get; set; } + public SCHALE.Common.FlatData.DialogCategory DialogCategory_ { get; set; } + public SCHALE.Common.FlatData.DialogCondition DialogCondition_ { get; set; } + public SCHALE.Common.FlatData.DialogConditionDetail DialogConditionDetail_ { get; set; } public long DialogConditionDetailValue { get; set; } public long GroupId { get; set; } - public SCHALE.Common.FlatData.DialogType DialogType { get; set; } + public SCHALE.Common.FlatData.DialogType DialogType_ { get; set; } public string ActionName { get; set; } public long Duration { get; set; } public string AnimationName { get; set; } @@ -251,7 +251,7 @@ public class CharacterDialogEventExcelT public string LocalizeJP { get; set; } public List VoiceId { get; set; } public bool CollectionVisible { get; set; } - public SCHALE.Common.FlatData.CVCollectionType CVCollectionType { get; set; } + public SCHALE.Common.FlatData.CVCollectionType CVCollectionType_ { get; set; } public long UnlockEventSeason { get; set; } public long ScenarioGroupId { get; set; } public string LocalizeCVGroup { get; set; } @@ -261,13 +261,13 @@ public class CharacterDialogEventExcelT this.OriginalCharacterId = 0; this.DisplayOrder = 0; this.EventID = 0; - this.ProductionStep = SCHALE.Common.FlatData.ProductionStep.ToDo; - this.DialogCategory = SCHALE.Common.FlatData.DialogCategory.Cafe; - this.DialogCondition = SCHALE.Common.FlatData.DialogCondition.Idle; - this.DialogConditionDetail = SCHALE.Common.FlatData.DialogConditionDetail.None; + this.ProductionStep_ = SCHALE.Common.FlatData.ProductionStep.ToDo; + this.DialogCategory_ = SCHALE.Common.FlatData.DialogCategory.Cafe; + this.DialogCondition_ = SCHALE.Common.FlatData.DialogCondition.Idle; + this.DialogConditionDetail_ = SCHALE.Common.FlatData.DialogConditionDetail.None; this.DialogConditionDetailValue = 0; this.GroupId = 0; - this.DialogType = SCHALE.Common.FlatData.DialogType.Talk; + this.DialogType_ = SCHALE.Common.FlatData.DialogType.Talk; this.ActionName = null; this.Duration = 0; this.AnimationName = null; @@ -275,7 +275,7 @@ public class CharacterDialogEventExcelT this.LocalizeJP = null; this.VoiceId = null; this.CollectionVisible = false; - this.CVCollectionType = SCHALE.Common.FlatData.CVCollectionType.CVNormal; + this.CVCollectionType_ = SCHALE.Common.FlatData.CVCollectionType.CVNormal; this.UnlockEventSeason = 0; this.ScenarioGroupId = 0; this.LocalizeCVGroup = null; @@ -292,13 +292,13 @@ static public class CharacterDialogEventExcelVerify && verifier.VerifyField(tablePos, 6 /*OriginalCharacterId*/, 8 /*long*/, 8, false) && verifier.VerifyField(tablePos, 8 /*DisplayOrder*/, 8 /*long*/, 8, false) && verifier.VerifyField(tablePos, 10 /*EventID*/, 8 /*long*/, 8, false) - && verifier.VerifyField(tablePos, 12 /*ProductionStep*/, 4 /*SCHALE.Common.FlatData.ProductionStep*/, 4, false) - && verifier.VerifyField(tablePos, 14 /*DialogCategory*/, 4 /*SCHALE.Common.FlatData.DialogCategory*/, 4, false) - && verifier.VerifyField(tablePos, 16 /*DialogCondition*/, 4 /*SCHALE.Common.FlatData.DialogCondition*/, 4, false) - && verifier.VerifyField(tablePos, 18 /*DialogConditionDetail*/, 4 /*SCHALE.Common.FlatData.DialogConditionDetail*/, 4, false) + && verifier.VerifyField(tablePos, 12 /*ProductionStep_*/, 4 /*SCHALE.Common.FlatData.ProductionStep*/, 4, false) + && verifier.VerifyField(tablePos, 14 /*DialogCategory_*/, 4 /*SCHALE.Common.FlatData.DialogCategory*/, 4, false) + && verifier.VerifyField(tablePos, 16 /*DialogCondition_*/, 4 /*SCHALE.Common.FlatData.DialogCondition*/, 4, false) + && verifier.VerifyField(tablePos, 18 /*DialogConditionDetail_*/, 4 /*SCHALE.Common.FlatData.DialogConditionDetail*/, 4, false) && verifier.VerifyField(tablePos, 20 /*DialogConditionDetailValue*/, 8 /*long*/, 8, false) && verifier.VerifyField(tablePos, 22 /*GroupId*/, 8 /*long*/, 8, false) - && verifier.VerifyField(tablePos, 24 /*DialogType*/, 4 /*SCHALE.Common.FlatData.DialogType*/, 4, false) + && verifier.VerifyField(tablePos, 24 /*DialogType_*/, 4 /*SCHALE.Common.FlatData.DialogType*/, 4, false) && verifier.VerifyString(tablePos, 26 /*ActionName*/, false) && verifier.VerifyField(tablePos, 28 /*Duration*/, 8 /*long*/, 8, false) && verifier.VerifyString(tablePos, 30 /*AnimationName*/, false) @@ -306,7 +306,7 @@ static public class CharacterDialogEventExcelVerify && verifier.VerifyString(tablePos, 34 /*LocalizeJP*/, false) && verifier.VerifyVectorOfData(tablePos, 36 /*VoiceId*/, 4 /*uint*/, false) && verifier.VerifyField(tablePos, 38 /*CollectionVisible*/, 1 /*bool*/, 1, false) - && verifier.VerifyField(tablePos, 40 /*CVCollectionType*/, 4 /*SCHALE.Common.FlatData.CVCollectionType*/, 4, false) + && verifier.VerifyField(tablePos, 40 /*CVCollectionType_*/, 4 /*SCHALE.Common.FlatData.CVCollectionType*/, 4, false) && verifier.VerifyField(tablePos, 42 /*UnlockEventSeason*/, 8 /*long*/, 8, false) && verifier.VerifyField(tablePos, 44 /*ScenarioGroupId*/, 8 /*long*/, 8, false) && verifier.VerifyString(tablePos, 46 /*LocalizeCVGroup*/, false) diff --git a/SCHALE.Common/FlatData/CharacterDialogExcel.cs b/SCHALE.Common/FlatData/CharacterDialogExcel.cs index fc21cd0..2fab15d 100644 --- a/SCHALE.Common/FlatData/CharacterDialogExcel.cs +++ b/SCHALE.Common/FlatData/CharacterDialogExcel.cs @@ -58,20 +58,20 @@ public struct CharacterDialogExcel : IFlatbufferObject public ArraySegment? GetAnimationNameBytes() { return __p.__vector_as_arraysegment(30); } #endif public byte[] GetAnimationNameArray() { return __p.__vector_as_array(30); } - public string LocalizeKR { get { int o = __p.__offset(32); return o != 0 ? __p.__string(o + __p.bb_pos) : null; } } + public string LocalizeKr { get { int o = __p.__offset(32); return o != 0 ? __p.__string(o + __p.bb_pos) : null; } } #if ENABLE_SPAN_T - public Span GetLocalizeKRBytes() { return __p.__vector_as_span(32, 1); } + public Span GetLocalizeKrBytes() { return __p.__vector_as_span(32, 1); } #else - public ArraySegment? GetLocalizeKRBytes() { return __p.__vector_as_arraysegment(32); } + public ArraySegment? GetLocalizeKrBytes() { return __p.__vector_as_arraysegment(32); } #endif - public byte[] GetLocalizeKRArray() { return __p.__vector_as_array(32); } - public string LocalizeJP { get { int o = __p.__offset(34); return o != 0 ? __p.__string(o + __p.bb_pos) : null; } } + public byte[] GetLocalizeKrArray() { return __p.__vector_as_array(32); } + public string LocalizeJp { get { int o = __p.__offset(34); return o != 0 ? __p.__string(o + __p.bb_pos) : null; } } #if ENABLE_SPAN_T - public Span GetLocalizeJPBytes() { return __p.__vector_as_span(34, 1); } + public Span GetLocalizeJpBytes() { return __p.__vector_as_span(34, 1); } #else - public ArraySegment? GetLocalizeJPBytes() { return __p.__vector_as_arraysegment(34); } + public ArraySegment? GetLocalizeJpBytes() { return __p.__vector_as_arraysegment(34); } #endif - public byte[] GetLocalizeJPArray() { return __p.__vector_as_array(34); } + public byte[] GetLocalizeJpArray() { return __p.__vector_as_array(34); } public uint VoiceId(int j) { int o = __p.__offset(36); return o != 0 ? __p.bb.GetUint(__p.__vector(o) + j * 4) : (uint)0; } public int VoiceIdLength { get { int o = __p.__offset(36); return o != 0 ? __p.__vector_len(o) : 0; } } #if ENABLE_SPAN_T @@ -84,69 +84,69 @@ public struct CharacterDialogExcel : IFlatbufferObject public float PosX { get { int o = __p.__offset(40); return o != 0 ? __p.bb.GetFloat(o + __p.bb_pos) : (float)0.0f; } } public float PosY { get { int o = __p.__offset(42); return o != 0 ? __p.bb.GetFloat(o + __p.bb_pos) : (float)0.0f; } } public bool CollectionVisible { get { int o = __p.__offset(44); return o != 0 ? 0!=__p.bb.Get(o + __p.bb_pos) : (bool)false; } } - public SCHALE.Common.FlatData.CVCollectionType CVCollectionType { get { int o = __p.__offset(46); return o != 0 ? (SCHALE.Common.FlatData.CVCollectionType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.CVCollectionType.CVNormal; } } + public SCHALE.Common.FlatData.CVCollectionType CvCollectionType { get { int o = __p.__offset(46); return o != 0 ? (SCHALE.Common.FlatData.CVCollectionType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.CVCollectionType.CVNormal; } } public long UnlockFavorRank { get { int o = __p.__offset(48); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public bool UnlockEquipWeapon { get { int o = __p.__offset(50); return o != 0 ? 0!=__p.bb.Get(o + __p.bb_pos) : (bool)false; } } - public string LocalizeCVGroup { get { int o = __p.__offset(52); return o != 0 ? __p.__string(o + __p.bb_pos) : null; } } + public string LocalizeCvGroup { get { int o = __p.__offset(52); return o != 0 ? __p.__string(o + __p.bb_pos) : null; } } #if ENABLE_SPAN_T - public Span GetLocalizeCVGroupBytes() { return __p.__vector_as_span(52, 1); } + public Span GetLocalizeCvGroupBytes() { return __p.__vector_as_span(52, 1); } #else - public ArraySegment? GetLocalizeCVGroupBytes() { return __p.__vector_as_arraysegment(52); } + public ArraySegment? GetLocalizeCvGroupBytes() { return __p.__vector_as_arraysegment(52); } #endif - public byte[] GetLocalizeCVGroupArray() { return __p.__vector_as_array(52); } + public byte[] GetLocalizeCvGroupArray() { return __p.__vector_as_array(52); } public static Offset CreateCharacterDialogExcel(FlatBufferBuilder builder, - long CharacterId = 0, - long CostumeUniqueId = 0, - long DisplayOrder = 0, - SCHALE.Common.FlatData.ProductionStep ProductionStep = SCHALE.Common.FlatData.ProductionStep.ToDo, - SCHALE.Common.FlatData.DialogCategory DialogCategory = SCHALE.Common.FlatData.DialogCategory.Cafe, - SCHALE.Common.FlatData.DialogCondition DialogCondition = SCHALE.Common.FlatData.DialogCondition.Idle, - SCHALE.Common.FlatData.Anniversary Anniversary = SCHALE.Common.FlatData.Anniversary.None, - StringOffset StartDateOffset = default(StringOffset), - StringOffset EndDateOffset = default(StringOffset), - long GroupId = 0, - SCHALE.Common.FlatData.DialogType DialogType = SCHALE.Common.FlatData.DialogType.Talk, - StringOffset ActionNameOffset = default(StringOffset), - long Duration = 0, - StringOffset AnimationNameOffset = default(StringOffset), - StringOffset LocalizeKROffset = default(StringOffset), - StringOffset LocalizeJPOffset = default(StringOffset), - VectorOffset VoiceIdOffset = default(VectorOffset), - bool ApplyPosition = false, - float PosX = 0.0f, - float PosY = 0.0f, - bool CollectionVisible = false, - SCHALE.Common.FlatData.CVCollectionType CVCollectionType = SCHALE.Common.FlatData.CVCollectionType.CVNormal, - long UnlockFavorRank = 0, - bool UnlockEquipWeapon = false, - StringOffset LocalizeCVGroupOffset = default(StringOffset)) { + long character_id = 0, + long costume_unique_id = 0, + long display_order = 0, + SCHALE.Common.FlatData.ProductionStep production_step = SCHALE.Common.FlatData.ProductionStep.ToDo, + SCHALE.Common.FlatData.DialogCategory dialog_category = SCHALE.Common.FlatData.DialogCategory.Cafe, + SCHALE.Common.FlatData.DialogCondition dialog_condition = SCHALE.Common.FlatData.DialogCondition.Idle, + SCHALE.Common.FlatData.Anniversary anniversary = SCHALE.Common.FlatData.Anniversary.None, + StringOffset start_dateOffset = default(StringOffset), + StringOffset end_dateOffset = default(StringOffset), + long group_id = 0, + SCHALE.Common.FlatData.DialogType dialog_type = SCHALE.Common.FlatData.DialogType.Talk, + StringOffset action_nameOffset = default(StringOffset), + long duration = 0, + StringOffset animation_nameOffset = default(StringOffset), + StringOffset localize_krOffset = default(StringOffset), + StringOffset localize_jpOffset = default(StringOffset), + VectorOffset voice_idOffset = default(VectorOffset), + bool apply_position = false, + float pos_x = 0.0f, + float pos_y = 0.0f, + bool collection_visible = false, + SCHALE.Common.FlatData.CVCollectionType cv_collection_type = SCHALE.Common.FlatData.CVCollectionType.CVNormal, + long unlock_favor_rank = 0, + bool unlock_equip_weapon = false, + StringOffset localize_cv_groupOffset = default(StringOffset)) { builder.StartTable(25); - CharacterDialogExcel.AddUnlockFavorRank(builder, UnlockFavorRank); - CharacterDialogExcel.AddDuration(builder, Duration); - CharacterDialogExcel.AddGroupId(builder, GroupId); - CharacterDialogExcel.AddDisplayOrder(builder, DisplayOrder); - CharacterDialogExcel.AddCostumeUniqueId(builder, CostumeUniqueId); - CharacterDialogExcel.AddCharacterId(builder, CharacterId); - CharacterDialogExcel.AddLocalizeCVGroup(builder, LocalizeCVGroupOffset); - CharacterDialogExcel.AddCVCollectionType(builder, CVCollectionType); - CharacterDialogExcel.AddPosY(builder, PosY); - CharacterDialogExcel.AddPosX(builder, PosX); - CharacterDialogExcel.AddVoiceId(builder, VoiceIdOffset); - CharacterDialogExcel.AddLocalizeJP(builder, LocalizeJPOffset); - CharacterDialogExcel.AddLocalizeKR(builder, LocalizeKROffset); - CharacterDialogExcel.AddAnimationName(builder, AnimationNameOffset); - CharacterDialogExcel.AddActionName(builder, ActionNameOffset); - CharacterDialogExcel.AddDialogType(builder, DialogType); - CharacterDialogExcel.AddEndDate(builder, EndDateOffset); - CharacterDialogExcel.AddStartDate(builder, StartDateOffset); - CharacterDialogExcel.AddAnniversary(builder, Anniversary); - CharacterDialogExcel.AddDialogCondition(builder, DialogCondition); - CharacterDialogExcel.AddDialogCategory(builder, DialogCategory); - CharacterDialogExcel.AddProductionStep(builder, ProductionStep); - CharacterDialogExcel.AddUnlockEquipWeapon(builder, UnlockEquipWeapon); - CharacterDialogExcel.AddCollectionVisible(builder, CollectionVisible); - CharacterDialogExcel.AddApplyPosition(builder, ApplyPosition); + CharacterDialogExcel.AddUnlockFavorRank(builder, unlock_favor_rank); + CharacterDialogExcel.AddDuration(builder, duration); + CharacterDialogExcel.AddGroupId(builder, group_id); + CharacterDialogExcel.AddDisplayOrder(builder, display_order); + CharacterDialogExcel.AddCostumeUniqueId(builder, costume_unique_id); + CharacterDialogExcel.AddCharacterId(builder, character_id); + CharacterDialogExcel.AddLocalizeCvGroup(builder, localize_cv_groupOffset); + CharacterDialogExcel.AddCvCollectionType(builder, cv_collection_type); + CharacterDialogExcel.AddPosY(builder, pos_y); + CharacterDialogExcel.AddPosX(builder, pos_x); + CharacterDialogExcel.AddVoiceId(builder, voice_idOffset); + CharacterDialogExcel.AddLocalizeJp(builder, localize_jpOffset); + CharacterDialogExcel.AddLocalizeKr(builder, localize_krOffset); + CharacterDialogExcel.AddAnimationName(builder, animation_nameOffset); + CharacterDialogExcel.AddActionName(builder, action_nameOffset); + CharacterDialogExcel.AddDialogType(builder, dialog_type); + CharacterDialogExcel.AddEndDate(builder, end_dateOffset); + CharacterDialogExcel.AddStartDate(builder, start_dateOffset); + CharacterDialogExcel.AddAnniversary(builder, anniversary); + CharacterDialogExcel.AddDialogCondition(builder, dialog_condition); + CharacterDialogExcel.AddDialogCategory(builder, dialog_category); + CharacterDialogExcel.AddProductionStep(builder, production_step); + CharacterDialogExcel.AddUnlockEquipWeapon(builder, unlock_equip_weapon); + CharacterDialogExcel.AddCollectionVisible(builder, collection_visible); + CharacterDialogExcel.AddApplyPosition(builder, apply_position); return CharacterDialogExcel.EndCharacterDialogExcel(builder); } @@ -165,8 +165,8 @@ public struct CharacterDialogExcel : IFlatbufferObject public static void AddActionName(FlatBufferBuilder builder, StringOffset actionNameOffset) { builder.AddOffset(11, actionNameOffset.Value, 0); } public static void AddDuration(FlatBufferBuilder builder, long duration) { builder.AddLong(12, duration, 0); } public static void AddAnimationName(FlatBufferBuilder builder, StringOffset animationNameOffset) { builder.AddOffset(13, animationNameOffset.Value, 0); } - public static void AddLocalizeKR(FlatBufferBuilder builder, StringOffset localizeKROffset) { builder.AddOffset(14, localizeKROffset.Value, 0); } - public static void AddLocalizeJP(FlatBufferBuilder builder, StringOffset localizeJPOffset) { builder.AddOffset(15, localizeJPOffset.Value, 0); } + public static void AddLocalizeKr(FlatBufferBuilder builder, StringOffset localizeKrOffset) { builder.AddOffset(14, localizeKrOffset.Value, 0); } + public static void AddLocalizeJp(FlatBufferBuilder builder, StringOffset localizeJpOffset) { builder.AddOffset(15, localizeJpOffset.Value, 0); } public static void AddVoiceId(FlatBufferBuilder builder, VectorOffset voiceIdOffset) { builder.AddOffset(16, voiceIdOffset.Value, 0); } public static VectorOffset CreateVoiceIdVector(FlatBufferBuilder builder, uint[] data) { builder.StartVector(4, data.Length, 4); for (int i = data.Length - 1; i >= 0; i--) builder.AddUint(data[i]); return builder.EndVector(); } public static VectorOffset CreateVoiceIdVectorBlock(FlatBufferBuilder builder, uint[] data) { builder.StartVector(4, data.Length, 4); builder.Add(data); return builder.EndVector(); } @@ -177,10 +177,10 @@ public struct CharacterDialogExcel : IFlatbufferObject public static void AddPosX(FlatBufferBuilder builder, float posX) { builder.AddFloat(18, posX, 0.0f); } public static void AddPosY(FlatBufferBuilder builder, float posY) { builder.AddFloat(19, posY, 0.0f); } public static void AddCollectionVisible(FlatBufferBuilder builder, bool collectionVisible) { builder.AddBool(20, collectionVisible, false); } - public static void AddCVCollectionType(FlatBufferBuilder builder, SCHALE.Common.FlatData.CVCollectionType cVCollectionType) { builder.AddInt(21, (int)cVCollectionType, 0); } + public static void AddCvCollectionType(FlatBufferBuilder builder, SCHALE.Common.FlatData.CVCollectionType cvCollectionType) { builder.AddInt(21, (int)cvCollectionType, 0); } public static void AddUnlockFavorRank(FlatBufferBuilder builder, long unlockFavorRank) { builder.AddLong(22, unlockFavorRank, 0); } public static void AddUnlockEquipWeapon(FlatBufferBuilder builder, bool unlockEquipWeapon) { builder.AddBool(23, unlockEquipWeapon, false); } - public static void AddLocalizeCVGroup(FlatBufferBuilder builder, StringOffset localizeCVGroupOffset) { builder.AddOffset(24, localizeCVGroupOffset.Value, 0); } + public static void AddLocalizeCvGroup(FlatBufferBuilder builder, StringOffset localizeCvGroupOffset) { builder.AddOffset(24, localizeCvGroupOffset.Value, 0); } public static Offset EndCharacterDialogExcel(FlatBufferBuilder builder) { int o = builder.EndTable(); return new Offset(o); @@ -206,33 +206,33 @@ public struct CharacterDialogExcel : IFlatbufferObject _o.ActionName = TableEncryptionService.Convert(this.ActionName, key); _o.Duration = TableEncryptionService.Convert(this.Duration, key); _o.AnimationName = TableEncryptionService.Convert(this.AnimationName, key); - _o.LocalizeKR = TableEncryptionService.Convert(this.LocalizeKR, key); - _o.LocalizeJP = TableEncryptionService.Convert(this.LocalizeJP, key); + _o.LocalizeKr = TableEncryptionService.Convert(this.LocalizeKr, key); + _o.LocalizeJp = TableEncryptionService.Convert(this.LocalizeJp, key); _o.VoiceId = new List(); for (var _j = 0; _j < this.VoiceIdLength; ++_j) {_o.VoiceId.Add(TableEncryptionService.Convert(this.VoiceId(_j), key));} _o.ApplyPosition = TableEncryptionService.Convert(this.ApplyPosition, key); _o.PosX = TableEncryptionService.Convert(this.PosX, key); _o.PosY = TableEncryptionService.Convert(this.PosY, key); _o.CollectionVisible = TableEncryptionService.Convert(this.CollectionVisible, key); - _o.CVCollectionType = TableEncryptionService.Convert(this.CVCollectionType, key); + _o.CvCollectionType = TableEncryptionService.Convert(this.CvCollectionType, key); _o.UnlockFavorRank = TableEncryptionService.Convert(this.UnlockFavorRank, key); _o.UnlockEquipWeapon = TableEncryptionService.Convert(this.UnlockEquipWeapon, key); - _o.LocalizeCVGroup = TableEncryptionService.Convert(this.LocalizeCVGroup, key); + _o.LocalizeCvGroup = TableEncryptionService.Convert(this.LocalizeCvGroup, key); } public static Offset Pack(FlatBufferBuilder builder, CharacterDialogExcelT _o) { if (_o == null) return default(Offset); - var _StartDate = _o.StartDate == null ? default(StringOffset) : builder.CreateString(_o.StartDate); - var _EndDate = _o.EndDate == null ? default(StringOffset) : builder.CreateString(_o.EndDate); - var _ActionName = _o.ActionName == null ? default(StringOffset) : builder.CreateString(_o.ActionName); - var _AnimationName = _o.AnimationName == null ? default(StringOffset) : builder.CreateString(_o.AnimationName); - var _LocalizeKR = _o.LocalizeKR == null ? default(StringOffset) : builder.CreateString(_o.LocalizeKR); - var _LocalizeJP = _o.LocalizeJP == null ? default(StringOffset) : builder.CreateString(_o.LocalizeJP); - var _VoiceId = default(VectorOffset); + var _start_date = _o.StartDate == null ? default(StringOffset) : builder.CreateString(_o.StartDate); + var _end_date = _o.EndDate == null ? default(StringOffset) : builder.CreateString(_o.EndDate); + var _action_name = _o.ActionName == null ? default(StringOffset) : builder.CreateString(_o.ActionName); + var _animation_name = _o.AnimationName == null ? default(StringOffset) : builder.CreateString(_o.AnimationName); + var _localize_kr = _o.LocalizeKr == null ? default(StringOffset) : builder.CreateString(_o.LocalizeKr); + var _localize_jp = _o.LocalizeJp == null ? default(StringOffset) : builder.CreateString(_o.LocalizeJp); + var _voice_id = default(VectorOffset); if (_o.VoiceId != null) { - var __VoiceId = _o.VoiceId.ToArray(); - _VoiceId = CreateVoiceIdVector(builder, __VoiceId); + var __voice_id = _o.VoiceId.ToArray(); + _voice_id = CreateVoiceIdVector(builder, __voice_id); } - var _LocalizeCVGroup = _o.LocalizeCVGroup == null ? default(StringOffset) : builder.CreateString(_o.LocalizeCVGroup); + var _localize_cv_group = _o.LocalizeCvGroup == null ? default(StringOffset) : builder.CreateString(_o.LocalizeCvGroup); return CreateCharacterDialogExcel( builder, _o.CharacterId, @@ -242,24 +242,24 @@ public struct CharacterDialogExcel : IFlatbufferObject _o.DialogCategory, _o.DialogCondition, _o.Anniversary, - _StartDate, - _EndDate, + _start_date, + _end_date, _o.GroupId, _o.DialogType, - _ActionName, + _action_name, _o.Duration, - _AnimationName, - _LocalizeKR, - _LocalizeJP, - _VoiceId, + _animation_name, + _localize_kr, + _localize_jp, + _voice_id, _o.ApplyPosition, _o.PosX, _o.PosY, _o.CollectionVisible, - _o.CVCollectionType, + _o.CvCollectionType, _o.UnlockFavorRank, _o.UnlockEquipWeapon, - _LocalizeCVGroup); + _localize_cv_group); } } @@ -279,17 +279,17 @@ public class CharacterDialogExcelT public string ActionName { get; set; } public long Duration { get; set; } public string AnimationName { get; set; } - public string LocalizeKR { get; set; } - public string LocalizeJP { get; set; } + public string LocalizeKr { get; set; } + public string LocalizeJp { get; set; } public List VoiceId { get; set; } public bool ApplyPosition { get; set; } public float PosX { get; set; } public float PosY { get; set; } public bool CollectionVisible { get; set; } - public SCHALE.Common.FlatData.CVCollectionType CVCollectionType { get; set; } + public SCHALE.Common.FlatData.CVCollectionType CvCollectionType { get; set; } public long UnlockFavorRank { get; set; } public bool UnlockEquipWeapon { get; set; } - public string LocalizeCVGroup { get; set; } + public string LocalizeCvGroup { get; set; } public CharacterDialogExcelT() { this.CharacterId = 0; @@ -306,17 +306,17 @@ public class CharacterDialogExcelT this.ActionName = null; this.Duration = 0; this.AnimationName = null; - this.LocalizeKR = null; - this.LocalizeJP = null; + this.LocalizeKr = null; + this.LocalizeJp = null; this.VoiceId = null; this.ApplyPosition = false; this.PosX = 0.0f; this.PosY = 0.0f; this.CollectionVisible = false; - this.CVCollectionType = SCHALE.Common.FlatData.CVCollectionType.CVNormal; + this.CvCollectionType = SCHALE.Common.FlatData.CVCollectionType.CVNormal; this.UnlockFavorRank = 0; this.UnlockEquipWeapon = false; - this.LocalizeCVGroup = null; + this.LocalizeCvGroup = null; } } @@ -340,17 +340,17 @@ static public class CharacterDialogExcelVerify && verifier.VerifyString(tablePos, 26 /*ActionName*/, false) && verifier.VerifyField(tablePos, 28 /*Duration*/, 8 /*long*/, 8, false) && verifier.VerifyString(tablePos, 30 /*AnimationName*/, false) - && verifier.VerifyString(tablePos, 32 /*LocalizeKR*/, false) - && verifier.VerifyString(tablePos, 34 /*LocalizeJP*/, false) + && verifier.VerifyString(tablePos, 32 /*LocalizeKr*/, false) + && verifier.VerifyString(tablePos, 34 /*LocalizeJp*/, false) && verifier.VerifyVectorOfData(tablePos, 36 /*VoiceId*/, 4 /*uint*/, false) && verifier.VerifyField(tablePos, 38 /*ApplyPosition*/, 1 /*bool*/, 1, false) && verifier.VerifyField(tablePos, 40 /*PosX*/, 4 /*float*/, 4, false) && verifier.VerifyField(tablePos, 42 /*PosY*/, 4 /*float*/, 4, false) && verifier.VerifyField(tablePos, 44 /*CollectionVisible*/, 1 /*bool*/, 1, false) - && verifier.VerifyField(tablePos, 46 /*CVCollectionType*/, 4 /*SCHALE.Common.FlatData.CVCollectionType*/, 4, false) + && verifier.VerifyField(tablePos, 46 /*CvCollectionType*/, 4 /*SCHALE.Common.FlatData.CVCollectionType*/, 4, false) && verifier.VerifyField(tablePos, 48 /*UnlockFavorRank*/, 8 /*long*/, 8, false) && verifier.VerifyField(tablePos, 50 /*UnlockEquipWeapon*/, 1 /*bool*/, 1, false) - && verifier.VerifyString(tablePos, 52 /*LocalizeCVGroup*/, false) + && verifier.VerifyString(tablePos, 52 /*LocalizeCvGroup*/, false) && verifier.VerifyTableEnd(tablePos); } } diff --git a/SCHALE.Common/FlatData/CharacterDialogSubtitleExcel.cs b/SCHALE.Common/FlatData/CharacterDialogSubtitleExcel.cs new file mode 100644 index 0000000..85a2548 --- /dev/null +++ b/SCHALE.Common/FlatData/CharacterDialogSubtitleExcel.cs @@ -0,0 +1,141 @@ +// +// automatically generated by the FlatBuffers compiler, do not modify +// + +namespace SCHALE.Common.FlatData +{ + +using global::System; +using global::System.Collections.Generic; +using global::SCHALE.Common.Crypto; +using global::Google.FlatBuffers; + +public struct CharacterDialogSubtitleExcel : IFlatbufferObject +{ + private Table __p; + public ByteBuffer ByteBuffer { get { return __p.bb; } } + public static void ValidateVersion() { FlatBufferConstants.FLATBUFFERS_24_3_25(); } + public static CharacterDialogSubtitleExcel GetRootAsCharacterDialogSubtitleExcel(ByteBuffer _bb) { return GetRootAsCharacterDialogSubtitleExcel(_bb, new CharacterDialogSubtitleExcel()); } + public static CharacterDialogSubtitleExcel GetRootAsCharacterDialogSubtitleExcel(ByteBuffer _bb, CharacterDialogSubtitleExcel obj) { return (obj.__assign(_bb.GetInt(_bb.Position) + _bb.Position, _bb)); } + public void __init(int _i, ByteBuffer _bb) { __p = new Table(_i, _bb); } + public CharacterDialogSubtitleExcel __assign(int _i, ByteBuffer _bb) { __init(_i, _bb); return this; } + + public string LocalizeCVGroup { get { int o = __p.__offset(4); return o != 0 ? __p.__string(o + __p.bb_pos) : null; } } +#if ENABLE_SPAN_T + public Span GetLocalizeCVGroupBytes() { return __p.__vector_as_span(4, 1); } +#else + public ArraySegment? GetLocalizeCVGroupBytes() { return __p.__vector_as_arraysegment(4); } +#endif + public byte[] GetLocalizeCVGroupArray() { return __p.__vector_as_array(4); } + public long CharacterId { get { int o = __p.__offset(6); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } + public long Duration { get { int o = __p.__offset(8); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } + public bool Separate { get { int o = __p.__offset(10); return o != 0 ? 0!=__p.bb.Get(o + __p.bb_pos) : (bool)false; } } + public string LocalizeKR { get { int o = __p.__offset(12); return o != 0 ? __p.__string(o + __p.bb_pos) : null; } } +#if ENABLE_SPAN_T + public Span GetLocalizeKRBytes() { return __p.__vector_as_span(12, 1); } +#else + public ArraySegment? GetLocalizeKRBytes() { return __p.__vector_as_arraysegment(12); } +#endif + public byte[] GetLocalizeKRArray() { return __p.__vector_as_array(12); } + public string LocalizeJP { get { int o = __p.__offset(14); return o != 0 ? __p.__string(o + __p.bb_pos) : null; } } +#if ENABLE_SPAN_T + public Span GetLocalizeJPBytes() { return __p.__vector_as_span(14, 1); } +#else + public ArraySegment? GetLocalizeJPBytes() { return __p.__vector_as_arraysegment(14); } +#endif + public byte[] GetLocalizeJPArray() { return __p.__vector_as_array(14); } + + public static Offset CreateCharacterDialogSubtitleExcel(FlatBufferBuilder builder, + StringOffset LocalizeCVGroupOffset = default(StringOffset), + long CharacterId = 0, + long Duration = 0, + bool Separate = false, + StringOffset LocalizeKROffset = default(StringOffset), + StringOffset LocalizeJPOffset = default(StringOffset)) { + builder.StartTable(6); + CharacterDialogSubtitleExcel.AddDuration(builder, Duration); + CharacterDialogSubtitleExcel.AddCharacterId(builder, CharacterId); + CharacterDialogSubtitleExcel.AddLocalizeJP(builder, LocalizeJPOffset); + CharacterDialogSubtitleExcel.AddLocalizeKR(builder, LocalizeKROffset); + CharacterDialogSubtitleExcel.AddLocalizeCVGroup(builder, LocalizeCVGroupOffset); + CharacterDialogSubtitleExcel.AddSeparate(builder, Separate); + return CharacterDialogSubtitleExcel.EndCharacterDialogSubtitleExcel(builder); + } + + public static void StartCharacterDialogSubtitleExcel(FlatBufferBuilder builder) { builder.StartTable(6); } + public static void AddLocalizeCVGroup(FlatBufferBuilder builder, StringOffset localizeCVGroupOffset) { builder.AddOffset(0, localizeCVGroupOffset.Value, 0); } + public static void AddCharacterId(FlatBufferBuilder builder, long characterId) { builder.AddLong(1, characterId, 0); } + public static void AddDuration(FlatBufferBuilder builder, long duration) { builder.AddLong(2, duration, 0); } + public static void AddSeparate(FlatBufferBuilder builder, bool separate) { builder.AddBool(3, separate, false); } + public static void AddLocalizeKR(FlatBufferBuilder builder, StringOffset localizeKROffset) { builder.AddOffset(4, localizeKROffset.Value, 0); } + public static void AddLocalizeJP(FlatBufferBuilder builder, StringOffset localizeJPOffset) { builder.AddOffset(5, localizeJPOffset.Value, 0); } + public static Offset EndCharacterDialogSubtitleExcel(FlatBufferBuilder builder) { + int o = builder.EndTable(); + return new Offset(o); + } + public CharacterDialogSubtitleExcelT UnPack() { + var _o = new CharacterDialogSubtitleExcelT(); + this.UnPackTo(_o); + return _o; + } + public void UnPackTo(CharacterDialogSubtitleExcelT _o) { + byte[] key = TableEncryptionService.CreateKey("CharacterDialogSubtitle"); + _o.LocalizeCVGroup = TableEncryptionService.Convert(this.LocalizeCVGroup, key); + _o.CharacterId = TableEncryptionService.Convert(this.CharacterId, key); + _o.Duration = TableEncryptionService.Convert(this.Duration, key); + _o.Separate = TableEncryptionService.Convert(this.Separate, key); + _o.LocalizeKR = TableEncryptionService.Convert(this.LocalizeKR, key); + _o.LocalizeJP = TableEncryptionService.Convert(this.LocalizeJP, key); + } + public static Offset Pack(FlatBufferBuilder builder, CharacterDialogSubtitleExcelT _o) { + if (_o == null) return default(Offset); + var _LocalizeCVGroup = _o.LocalizeCVGroup == null ? default(StringOffset) : builder.CreateString(_o.LocalizeCVGroup); + var _LocalizeKR = _o.LocalizeKR == null ? default(StringOffset) : builder.CreateString(_o.LocalizeKR); + var _LocalizeJP = _o.LocalizeJP == null ? default(StringOffset) : builder.CreateString(_o.LocalizeJP); + return CreateCharacterDialogSubtitleExcel( + builder, + _LocalizeCVGroup, + _o.CharacterId, + _o.Duration, + _o.Separate, + _LocalizeKR, + _LocalizeJP); + } +} + +public class CharacterDialogSubtitleExcelT +{ + public string LocalizeCVGroup { get; set; } + public long CharacterId { get; set; } + public long Duration { get; set; } + public bool Separate { get; set; } + public string LocalizeKR { get; set; } + public string LocalizeJP { get; set; } + + public CharacterDialogSubtitleExcelT() { + this.LocalizeCVGroup = null; + this.CharacterId = 0; + this.Duration = 0; + this.Separate = false; + this.LocalizeKR = null; + this.LocalizeJP = null; + } +} + + +static public class CharacterDialogSubtitleExcelVerify +{ + static public bool Verify(Google.FlatBuffers.Verifier verifier, uint tablePos) + { + return verifier.VerifyTableStart(tablePos) + && verifier.VerifyString(tablePos, 4 /*LocalizeCVGroup*/, false) + && verifier.VerifyField(tablePos, 6 /*CharacterId*/, 8 /*long*/, 8, false) + && verifier.VerifyField(tablePos, 8 /*Duration*/, 8 /*long*/, 8, false) + && verifier.VerifyField(tablePos, 10 /*Separate*/, 1 /*bool*/, 1, false) + && verifier.VerifyString(tablePos, 12 /*LocalizeKR*/, false) + && verifier.VerifyString(tablePos, 14 /*LocalizeJP*/, false) + && verifier.VerifyTableEnd(tablePos); + } +} + +} diff --git a/SCHALE.Common/FlatData/CharacterExcel.cs b/SCHALE.Common/FlatData/CharacterExcel.cs index c4d5e24..5a0d453 100644 --- a/SCHALE.Common/FlatData/CharacterExcel.cs +++ b/SCHALE.Common/FlatData/CharacterExcel.cs @@ -5,691 +5,717 @@ namespace SCHALE.Common.FlatData { -using global::System; -using global::System.Collections.Generic; -using global::SCHALE.Common.Crypto; -using global::Google.FlatBuffers; + using global::System; + using global::System.Collections.Generic; + using global::SCHALE.Common.Crypto; + using global::Google.FlatBuffers; -public struct CharacterExcel : IFlatbufferObject -{ - private Table __p; - public ByteBuffer ByteBuffer { get { return __p.bb; } } - public static void ValidateVersion() { FlatBufferConstants.FLATBUFFERS_24_3_25(); } - public static CharacterExcel GetRootAsCharacterExcel(ByteBuffer _bb) { return GetRootAsCharacterExcel(_bb, new CharacterExcel()); } - public static CharacterExcel GetRootAsCharacterExcel(ByteBuffer _bb, CharacterExcel obj) { return (obj.__assign(_bb.GetInt(_bb.Position) + _bb.Position, _bb)); } - public void __init(int _i, ByteBuffer _bb) { __p = new Table(_i, _bb); } - public CharacterExcel __assign(int _i, ByteBuffer _bb) { __init(_i, _bb); return this; } + public struct CharacterExcel : IFlatbufferObject + { + private Table __p; + public ByteBuffer ByteBuffer { get { return __p.bb; } } + public static void ValidateVersion() { FlatBufferConstants.FLATBUFFERS_24_3_25(); } + public static CharacterExcel GetRootAsCharacterExcel(ByteBuffer _bb) { return GetRootAsCharacterExcel(_bb, new CharacterExcel()); } + public static CharacterExcel GetRootAsCharacterExcel(ByteBuffer _bb, CharacterExcel obj) { return (obj.__assign(_bb.GetInt(_bb.Position) + _bb.Position, _bb)); } + public void __init(int _i, ByteBuffer _bb) { __p = new Table(_i, _bb); } + public CharacterExcel __assign(int _i, ByteBuffer _bb) { __init(_i, _bb); return this; } - public long Id { get { int o = __p.__offset(4); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } - public string DevName { get { int o = __p.__offset(6); return o != 0 ? __p.__string(o + __p.bb_pos) : null; } } + public long Id { get { int o = __p.__offset(4); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } + public string DevName { get { int o = __p.__offset(6); return o != 0 ? __p.__string(o + __p.bb_pos) : null; } } #if ENABLE_SPAN_T public Span GetDevNameBytes() { return __p.__vector_as_span(6, 1); } #else - public ArraySegment? GetDevNameBytes() { return __p.__vector_as_arraysegment(6); } + public ArraySegment? GetDevNameBytes() { return __p.__vector_as_arraysegment(6); } #endif - public byte[] GetDevNameArray() { return __p.__vector_as_array(6); } - public long CostumeGroupId { get { int o = __p.__offset(8); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } - public bool IsPlayable { get { int o = __p.__offset(10); return o != 0 ? 0!=__p.bb.Get(o + __p.bb_pos) : (bool)false; } } - public SCHALE.Common.FlatData.ProductionStep ProductionStep { get { int o = __p.__offset(12); return o != 0 ? (SCHALE.Common.FlatData.ProductionStep)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.ProductionStep.ToDo; } } - public bool CollectionVisible { get { int o = __p.__offset(14); return o != 0 ? 0!=__p.bb.Get(o + __p.bb_pos) : (bool)false; } } - public string ReleaseDate { get { int o = __p.__offset(16); return o != 0 ? __p.__string(o + __p.bb_pos) : null; } } + public byte[] GetDevNameArray() { return __p.__vector_as_array(6); } + public long CostumeGroupId { get { int o = __p.__offset(8); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } + public bool IsPlayable { get { int o = __p.__offset(10); return o != 0 ? 0 != __p.bb.Get(o + __p.bb_pos) : (bool)false; } } + public SCHALE.Common.FlatData.ProductionStep ProductionStep { get { int o = __p.__offset(12); return o != 0 ? (SCHALE.Common.FlatData.ProductionStep)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.ProductionStep.ToDo; } } + public bool CollectionVisible { get { int o = __p.__offset(14); return o != 0 ? 0 != __p.bb.Get(o + __p.bb_pos) : (bool)false; } } + public string ReleaseDate { get { int o = __p.__offset(16); return o != 0 ? __p.__string(o + __p.bb_pos) : null; } } #if ENABLE_SPAN_T public Span GetReleaseDateBytes() { return __p.__vector_as_span(16, 1); } #else - public ArraySegment? GetReleaseDateBytes() { return __p.__vector_as_arraysegment(16); } + public ArraySegment? GetReleaseDateBytes() { return __p.__vector_as_arraysegment(16); } #endif - public byte[] GetReleaseDateArray() { return __p.__vector_as_array(16); } - public string CollectionVisibleStartDate { get { int o = __p.__offset(18); return o != 0 ? __p.__string(o + __p.bb_pos) : null; } } + public byte[] GetReleaseDateArray() { return __p.__vector_as_array(16); } + public string CollectionVisibleStartDate { get { int o = __p.__offset(18); return o != 0 ? __p.__string(o + __p.bb_pos) : null; } } #if ENABLE_SPAN_T public Span GetCollectionVisibleStartDateBytes() { return __p.__vector_as_span(18, 1); } #else - public ArraySegment? GetCollectionVisibleStartDateBytes() { return __p.__vector_as_arraysegment(18); } + public ArraySegment? GetCollectionVisibleStartDateBytes() { return __p.__vector_as_arraysegment(18); } #endif - public byte[] GetCollectionVisibleStartDateArray() { return __p.__vector_as_array(18); } - public string CollectionVisibleEndDate { get { int o = __p.__offset(20); return o != 0 ? __p.__string(o + __p.bb_pos) : null; } } + public byte[] GetCollectionVisibleStartDateArray() { return __p.__vector_as_array(18); } + public string CollectionVisibleEndDate { get { int o = __p.__offset(20); return o != 0 ? __p.__string(o + __p.bb_pos) : null; } } #if ENABLE_SPAN_T public Span GetCollectionVisibleEndDateBytes() { return __p.__vector_as_span(20, 1); } #else - public ArraySegment? GetCollectionVisibleEndDateBytes() { return __p.__vector_as_arraysegment(20); } + public ArraySegment? GetCollectionVisibleEndDateBytes() { return __p.__vector_as_arraysegment(20); } #endif - public byte[] GetCollectionVisibleEndDateArray() { return __p.__vector_as_array(20); } - public bool IsPlayableCharacter { get { int o = __p.__offset(22); return o != 0 ? 0!=__p.bb.Get(o + __p.bb_pos) : (bool)false; } } - public uint LocalizeEtcId { get { int o = __p.__offset(24); return o != 0 ? __p.bb.GetUint(o + __p.bb_pos) : (uint)0; } } - public SCHALE.Common.FlatData.Rarity Rarity { get { int o = __p.__offset(26); return o != 0 ? (SCHALE.Common.FlatData.Rarity)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.Rarity.N; } } - public bool IsNPC { get { int o = __p.__offset(28); return o != 0 ? 0!=__p.bb.Get(o + __p.bb_pos) : (bool)false; } } - public SCHALE.Common.FlatData.TacticEntityType TacticEntityType { get { int o = __p.__offset(30); return o != 0 ? (SCHALE.Common.FlatData.TacticEntityType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.TacticEntityType.None; } } - public bool CanSurvive { get { int o = __p.__offset(32); return o != 0 ? 0!=__p.bb.Get(o + __p.bb_pos) : (bool)false; } } - public bool IsDummy { get { int o = __p.__offset(34); return o != 0 ? 0!=__p.bb.Get(o + __p.bb_pos) : (bool)false; } } - public int SubPartsCount { get { int o = __p.__offset(36); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } - public SCHALE.Common.FlatData.TacticRole TacticRole { get { int o = __p.__offset(38); return o != 0 ? (SCHALE.Common.FlatData.TacticRole)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.TacticRole.None; } } - public SCHALE.Common.FlatData.WeaponType WeaponType { get { int o = __p.__offset(40); return o != 0 ? (SCHALE.Common.FlatData.WeaponType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.WeaponType.None; } } - public SCHALE.Common.FlatData.TacticRange TacticRange { get { int o = __p.__offset(42); return o != 0 ? (SCHALE.Common.FlatData.TacticRange)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.TacticRange.Back; } } - public SCHALE.Common.FlatData.BulletType BulletType { get { int o = __p.__offset(44); return o != 0 ? (SCHALE.Common.FlatData.BulletType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.BulletType.Normal; } } - public SCHALE.Common.FlatData.ArmorType ArmorType { get { int o = __p.__offset(46); return o != 0 ? (SCHALE.Common.FlatData.ArmorType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.ArmorType.LightArmor; } } - public SCHALE.Common.FlatData.AimIKType AimIKType { get { int o = __p.__offset(48); return o != 0 ? (SCHALE.Common.FlatData.AimIKType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.AimIKType.None; } } - public SCHALE.Common.FlatData.School School { get { int o = __p.__offset(50); return o != 0 ? (SCHALE.Common.FlatData.School)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.School.None; } } - public SCHALE.Common.FlatData.Club Club { get { int o = __p.__offset(52); return o != 0 ? (SCHALE.Common.FlatData.Club)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.Club.None; } } - public int DefaultStarGrade { get { int o = __p.__offset(54); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } - public int MaxStarGrade { get { int o = __p.__offset(56); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } - public SCHALE.Common.FlatData.StatLevelUpType StatLevelUpType { get { int o = __p.__offset(58); return o != 0 ? (SCHALE.Common.FlatData.StatLevelUpType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.StatLevelUpType.Standard; } } - public SCHALE.Common.FlatData.SquadType SquadType { get { int o = __p.__offset(60); return o != 0 ? (SCHALE.Common.FlatData.SquadType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.SquadType.None; } } - public bool Jumpable { get { int o = __p.__offset(62); return o != 0 ? 0!=__p.bb.Get(o + __p.bb_pos) : (bool)false; } } - public long PersonalityId { get { int o = __p.__offset(64); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } - public long CharacterAIId { get { int o = __p.__offset(66); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } - public long ExternalBTId { get { int o = __p.__offset(68); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } - public string ScenarioCharacter { get { int o = __p.__offset(70); return o != 0 ? __p.__string(o + __p.bb_pos) : null; } } + public byte[] GetCollectionVisibleEndDateArray() { return __p.__vector_as_array(20); } + public bool IsPlayableCharacter { get { int o = __p.__offset(22); return o != 0 ? 0 != __p.bb.Get(o + __p.bb_pos) : (bool)false; } } + public uint LocalizeEtcId { get { int o = __p.__offset(24); return o != 0 ? __p.bb.GetUint(o + __p.bb_pos) : (uint)0; } } + public SCHALE.Common.FlatData.Rarity Rarity { get { int o = __p.__offset(26); return o != 0 ? (SCHALE.Common.FlatData.Rarity)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.Rarity.N; } } + public bool IsNpc { get { int o = __p.__offset(28); return o != 0 ? 0 != __p.bb.Get(o + __p.bb_pos) : (bool)false; } } + public SCHALE.Common.FlatData.TacticEntityType TacticEntityType { get { int o = __p.__offset(30); return o != 0 ? (SCHALE.Common.FlatData.TacticEntityType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.TacticEntityType.None; } } + public bool CanSurvive { get { int o = __p.__offset(32); return o != 0 ? 0 != __p.bb.Get(o + __p.bb_pos) : (bool)false; } } + public bool IsDummy { get { int o = __p.__offset(34); return o != 0 ? 0 != __p.bb.Get(o + __p.bb_pos) : (bool)false; } } + public int SubPartsCount { get { int o = __p.__offset(36); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } + public SCHALE.Common.FlatData.TacticRole TacticRole { get { int o = __p.__offset(38); return o != 0 ? (SCHALE.Common.FlatData.TacticRole)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.TacticRole.None; } } + public SCHALE.Common.FlatData.WeaponType WeaponType { get { int o = __p.__offset(40); return o != 0 ? (SCHALE.Common.FlatData.WeaponType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.WeaponType.None; } } + public SCHALE.Common.FlatData.TacticRange TacticRange { get { int o = __p.__offset(42); return o != 0 ? (SCHALE.Common.FlatData.TacticRange)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.TacticRange.Back; } } + public SCHALE.Common.FlatData.BulletType BulletType { get { int o = __p.__offset(44); return o != 0 ? (SCHALE.Common.FlatData.BulletType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.BulletType.Normal; } } + public SCHALE.Common.FlatData.ArmorType ArmorType { get { int o = __p.__offset(46); return o != 0 ? (SCHALE.Common.FlatData.ArmorType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.ArmorType.LightArmor; } } + public SCHALE.Common.FlatData.AimIKType AimIkType { get { int o = __p.__offset(48); return o != 0 ? (SCHALE.Common.FlatData.AimIKType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.AimIKType.None; } } + public SCHALE.Common.FlatData.School School { get { int o = __p.__offset(50); return o != 0 ? (SCHALE.Common.FlatData.School)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.School.None; } } + public SCHALE.Common.FlatData.Club Club { get { int o = __p.__offset(52); return o != 0 ? (SCHALE.Common.FlatData.Club)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.Club.None; } } + public int DefaultStarGrade { get { int o = __p.__offset(54); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } + public int MaxStarGrade { get { int o = __p.__offset(56); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } + public SCHALE.Common.FlatData.StatLevelUpType StatLevelUpType { get { int o = __p.__offset(58); return o != 0 ? (SCHALE.Common.FlatData.StatLevelUpType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.StatLevelUpType.Standard; } } + public SCHALE.Common.FlatData.SquadType SquadType { get { int o = __p.__offset(60); return o != 0 ? (SCHALE.Common.FlatData.SquadType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.SquadType.None; } } + public bool Jumpable { get { int o = __p.__offset(62); return o != 0 ? 0 != __p.bb.Get(o + __p.bb_pos) : (bool)false; } } + public long PersonalityId { get { int o = __p.__offset(64); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } + public long CharacterAiId { get { int o = __p.__offset(66); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } + public long ExternalBtId { get { int o = __p.__offset(68); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } + public long MainCombatStyleId { get { int o = __p.__offset(70); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } + public int CombatStyleIndex { get { int o = __p.__offset(72); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } + public string ScenarioCharacter { get { int o = __p.__offset(74); return o != 0 ? __p.__string(o + __p.bb_pos) : null; } } #if ENABLE_SPAN_T - public Span GetScenarioCharacterBytes() { return __p.__vector_as_span(70, 1); } + public Span GetScenarioCharacterBytes() { return __p.__vector_as_span(74, 1); } #else - public ArraySegment? GetScenarioCharacterBytes() { return __p.__vector_as_arraysegment(70); } + public ArraySegment? GetScenarioCharacterBytes() { return __p.__vector_as_arraysegment(74); } #endif - public byte[] GetScenarioCharacterArray() { return __p.__vector_as_array(70); } - public uint SpawnTemplateId { get { int o = __p.__offset(72); return o != 0 ? __p.bb.GetUint(o + __p.bb_pos) : (uint)0; } } - public int FavorLevelupType { get { int o = __p.__offset(74); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } - public SCHALE.Common.FlatData.EquipmentCategory EquipmentSlot(int j) { int o = __p.__offset(76); return o != 0 ? (SCHALE.Common.FlatData.EquipmentCategory)__p.bb.GetInt(__p.__vector(o) + j * 4) : (SCHALE.Common.FlatData.EquipmentCategory)0; } - public int EquipmentSlotLength { get { int o = __p.__offset(76); return o != 0 ? __p.__vector_len(o) : 0; } } + public byte[] GetScenarioCharacterArray() { return __p.__vector_as_array(74); } + public uint SpawnTemplateId { get { int o = __p.__offset(76); return o != 0 ? __p.bb.GetUint(o + __p.bb_pos) : (uint)0; } } + public int FavorLevelupType { get { int o = __p.__offset(78); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } + public SCHALE.Common.FlatData.EquipmentCategory EquipmentSlot(int j) { int o = __p.__offset(80); return o != 0 ? (SCHALE.Common.FlatData.EquipmentCategory)__p.bb.GetInt(__p.__vector(o) + j * 4) : (SCHALE.Common.FlatData.EquipmentCategory)0; } + public int EquipmentSlotLength { get { int o = __p.__offset(80); return o != 0 ? __p.__vector_len(o) : 0; } } #if ENABLE_SPAN_T - public Span GetEquipmentSlotBytes() { return __p.__vector_as_span(76, 4); } + public Span GetEquipmentSlotBytes() { return __p.__vector_as_span(80, 4); } #else - public ArraySegment? GetEquipmentSlotBytes() { return __p.__vector_as_arraysegment(76); } + public ArraySegment? GetEquipmentSlotBytes() { return __p.__vector_as_arraysegment(80); } #endif - public SCHALE.Common.FlatData.EquipmentCategory[] GetEquipmentSlotArray() { int o = __p.__offset(76); if (o == 0) return null; int p = __p.__vector(o); int l = __p.__vector_len(o); SCHALE.Common.FlatData.EquipmentCategory[] a = new SCHALE.Common.FlatData.EquipmentCategory[l]; for (int i = 0; i < l; i++) { a[i] = (SCHALE.Common.FlatData.EquipmentCategory)__p.bb.GetInt(p + i * 4); } return a; } - public uint WeaponLocalizeId { get { int o = __p.__offset(78); return o != 0 ? __p.bb.GetUint(o + __p.bb_pos) : (uint)0; } } - public bool DisplayEnemyInfo { get { int o = __p.__offset(80); return o != 0 ? 0!=__p.bb.Get(o + __p.bb_pos) : (bool)false; } } - public long BodyRadius { get { int o = __p.__offset(82); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } - public long RandomEffectRadius { get { int o = __p.__offset(84); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } - public bool HPBarHide { get { int o = __p.__offset(86); return o != 0 ? 0!=__p.bb.Get(o + __p.bb_pos) : (bool)false; } } - public float HpBarHeight { get { int o = __p.__offset(88); return o != 0 ? __p.bb.GetFloat(o + __p.bb_pos) : (float)0.0f; } } - public float HighlightFloaterHeight { get { int o = __p.__offset(90); return o != 0 ? __p.bb.GetFloat(o + __p.bb_pos) : (float)0.0f; } } - public float EmojiOffsetX { get { int o = __p.__offset(92); return o != 0 ? __p.bb.GetFloat(o + __p.bb_pos) : (float)0.0f; } } - public float EmojiOffsetY { get { int o = __p.__offset(94); return o != 0 ? __p.bb.GetFloat(o + __p.bb_pos) : (float)0.0f; } } - public int MoveStartFrame { get { int o = __p.__offset(96); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } - public int MoveEndFrame { get { int o = __p.__offset(98); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } - public int JumpMotionFrame { get { int o = __p.__offset(100); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } - public int AppearFrame { get { int o = __p.__offset(102); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } - public bool CanMove { get { int o = __p.__offset(104); return o != 0 ? 0!=__p.bb.Get(o + __p.bb_pos) : (bool)false; } } - public bool CanFix { get { int o = __p.__offset(106); return o != 0 ? 0!=__p.bb.Get(o + __p.bb_pos) : (bool)false; } } - public bool CanCrowdControl { get { int o = __p.__offset(108); return o != 0 ? 0!=__p.bb.Get(o + __p.bb_pos) : (bool)false; } } - public bool CanBattleItemMove { get { int o = __p.__offset(110); return o != 0 ? 0!=__p.bb.Get(o + __p.bb_pos) : (bool)false; } } - public bool IsAirUnit { get { int o = __p.__offset(112); return o != 0 ? 0!=__p.bb.Get(o + __p.bb_pos) : (bool)false; } } - public long AirUnitHeight { get { int o = __p.__offset(114); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } - public SCHALE.Common.FlatData.Tag Tags(int j) { int o = __p.__offset(116); return o != 0 ? (SCHALE.Common.FlatData.Tag)__p.bb.GetInt(__p.__vector(o) + j * 4) : (SCHALE.Common.FlatData.Tag)0; } - public int TagsLength { get { int o = __p.__offset(116); return o != 0 ? __p.__vector_len(o) : 0; } } + public SCHALE.Common.FlatData.EquipmentCategory[] GetEquipmentSlotArray() { int o = __p.__offset(80); if (o == 0) return null; int p = __p.__vector(o); int l = __p.__vector_len(o); SCHALE.Common.FlatData.EquipmentCategory[] a = new SCHALE.Common.FlatData.EquipmentCategory[l]; for (int i = 0; i < l; i++) { a[i] = (SCHALE.Common.FlatData.EquipmentCategory)__p.bb.GetInt(p + i * 4); } return a; } + public uint WeaponLocalizeId { get { int o = __p.__offset(82); return o != 0 ? __p.bb.GetUint(o + __p.bb_pos) : (uint)0; } } + public bool DisplayEnemyInfo { get { int o = __p.__offset(84); return o != 0 ? 0 != __p.bb.Get(o + __p.bb_pos) : (bool)false; } } + public long BodyRadius { get { int o = __p.__offset(86); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } + public long RandomEffectRadius { get { int o = __p.__offset(88); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } + public bool HpBarHide { get { int o = __p.__offset(90); return o != 0 ? 0 != __p.bb.Get(o + __p.bb_pos) : (bool)false; } } + public float HpBarHeight { get { int o = __p.__offset(92); return o != 0 ? __p.bb.GetFloat(o + __p.bb_pos) : (float)0.0f; } } + public float HighlightFloaterHeight { get { int o = __p.__offset(94); return o != 0 ? __p.bb.GetFloat(o + __p.bb_pos) : (float)0.0f; } } + public float EmojiOffsetX { get { int o = __p.__offset(96); return o != 0 ? __p.bb.GetFloat(o + __p.bb_pos) : (float)0.0f; } } + public float EmojiOffsetY { get { int o = __p.__offset(98); return o != 0 ? __p.bb.GetFloat(o + __p.bb_pos) : (float)0.0f; } } + public int MoveStartFrame { get { int o = __p.__offset(100); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } + public int MoveEndFrame { get { int o = __p.__offset(102); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } + public int JumpMotionFrame { get { int o = __p.__offset(104); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } + public int AppearFrame { get { int o = __p.__offset(106); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } + public bool CanMove { get { int o = __p.__offset(108); return o != 0 ? 0 != __p.bb.Get(o + __p.bb_pos) : (bool)false; } } + public bool CanFix { get { int o = __p.__offset(110); return o != 0 ? 0 != __p.bb.Get(o + __p.bb_pos) : (bool)false; } } + public bool CanCrowdControl { get { int o = __p.__offset(112); return o != 0 ? 0 != __p.bb.Get(o + __p.bb_pos) : (bool)false; } } + public bool CanBattleItemMove { get { int o = __p.__offset(114); return o != 0 ? 0 != __p.bb.Get(o + __p.bb_pos) : (bool)false; } } + public bool IsAirUnit { get { int o = __p.__offset(116); return o != 0 ? 0 != __p.bb.Get(o + __p.bb_pos) : (bool)false; } } + public long AirUnitHeight { get { int o = __p.__offset(118); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } + public SCHALE.Common.FlatData.Tag Tags(int j) { int o = __p.__offset(120); return o != 0 ? (SCHALE.Common.FlatData.Tag)__p.bb.GetInt(__p.__vector(o) + j * 4) : (SCHALE.Common.FlatData.Tag)0; } + public int TagsLength { get { int o = __p.__offset(120); return o != 0 ? __p.__vector_len(o) : 0; } } #if ENABLE_SPAN_T - public Span GetTagsBytes() { return __p.__vector_as_span(116, 4); } + public Span GetTagsBytes() { return __p.__vector_as_span(120, 4); } #else - public ArraySegment? GetTagsBytes() { return __p.__vector_as_arraysegment(116); } + public ArraySegment? GetTagsBytes() { return __p.__vector_as_arraysegment(120); } #endif - public SCHALE.Common.FlatData.Tag[] GetTagsArray() { int o = __p.__offset(116); if (o == 0) return null; int p = __p.__vector(o); int l = __p.__vector_len(o); SCHALE.Common.FlatData.Tag[] a = new SCHALE.Common.FlatData.Tag[l]; for (int i = 0; i < l; i++) { a[i] = (SCHALE.Common.FlatData.Tag)__p.bb.GetInt(p + i * 4); } return a; } - public long SecretStoneItemId { get { int o = __p.__offset(118); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } - public int SecretStoneItemAmount { get { int o = __p.__offset(120); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } - public long CharacterPieceItemId { get { int o = __p.__offset(122); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } - public int CharacterPieceItemAmount { get { int o = __p.__offset(124); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } - public long CombineRecipeId { get { int o = __p.__offset(126); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } + public SCHALE.Common.FlatData.Tag[] GetTagsArray() { int o = __p.__offset(120); if (o == 0) return null; int p = __p.__vector(o); int l = __p.__vector_len(o); SCHALE.Common.FlatData.Tag[] a = new SCHALE.Common.FlatData.Tag[l]; for (int i = 0; i < l; i++) { a[i] = (SCHALE.Common.FlatData.Tag)__p.bb.GetInt(p + i * 4); } return a; } + public long SecretStoneItemId { get { int o = __p.__offset(122); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } + public int SecretStoneItemAmount { get { int o = __p.__offset(124); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } + public long CharacterPieceItemId { get { int o = __p.__offset(126); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } + public int CharacterPieceItemAmount { get { int o = __p.__offset(128); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } + public long CombineRecipeId { get { int o = __p.__offset(130); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } - public static Offset CreateCharacterExcel(FlatBufferBuilder builder, - long Id = 0, - StringOffset DevNameOffset = default(StringOffset), - long CostumeGroupId = 0, - bool IsPlayable = false, - SCHALE.Common.FlatData.ProductionStep ProductionStep = SCHALE.Common.FlatData.ProductionStep.ToDo, - bool CollectionVisible = false, - StringOffset ReleaseDateOffset = default(StringOffset), - StringOffset CollectionVisibleStartDateOffset = default(StringOffset), - StringOffset CollectionVisibleEndDateOffset = default(StringOffset), - bool IsPlayableCharacter = false, - uint LocalizeEtcId = 0, - SCHALE.Common.FlatData.Rarity Rarity = SCHALE.Common.FlatData.Rarity.N, - bool IsNPC = false, - SCHALE.Common.FlatData.TacticEntityType TacticEntityType = SCHALE.Common.FlatData.TacticEntityType.None, - bool CanSurvive = false, - bool IsDummy = false, - int SubPartsCount = 0, - SCHALE.Common.FlatData.TacticRole TacticRole = SCHALE.Common.FlatData.TacticRole.None, - SCHALE.Common.FlatData.WeaponType WeaponType = SCHALE.Common.FlatData.WeaponType.None, - SCHALE.Common.FlatData.TacticRange TacticRange = SCHALE.Common.FlatData.TacticRange.Back, - SCHALE.Common.FlatData.BulletType BulletType = SCHALE.Common.FlatData.BulletType.Normal, - SCHALE.Common.FlatData.ArmorType ArmorType = SCHALE.Common.FlatData.ArmorType.LightArmor, - SCHALE.Common.FlatData.AimIKType AimIKType = SCHALE.Common.FlatData.AimIKType.None, - SCHALE.Common.FlatData.School School = SCHALE.Common.FlatData.School.None, - SCHALE.Common.FlatData.Club Club = SCHALE.Common.FlatData.Club.None, - int DefaultStarGrade = 0, - int MaxStarGrade = 0, - SCHALE.Common.FlatData.StatLevelUpType StatLevelUpType = SCHALE.Common.FlatData.StatLevelUpType.Standard, - SCHALE.Common.FlatData.SquadType SquadType = SCHALE.Common.FlatData.SquadType.None, - bool Jumpable = false, - long PersonalityId = 0, - long CharacterAIId = 0, - long ExternalBTId = 0, - StringOffset ScenarioCharacterOffset = default(StringOffset), - uint SpawnTemplateId = 0, - int FavorLevelupType = 0, - VectorOffset EquipmentSlotOffset = default(VectorOffset), - uint WeaponLocalizeId = 0, - bool DisplayEnemyInfo = false, - long BodyRadius = 0, - long RandomEffectRadius = 0, - bool HPBarHide = false, - float HpBarHeight = 0.0f, - float HighlightFloaterHeight = 0.0f, - float EmojiOffsetX = 0.0f, - float EmojiOffsetY = 0.0f, - int MoveStartFrame = 0, - int MoveEndFrame = 0, - int JumpMotionFrame = 0, - int AppearFrame = 0, - bool CanMove = false, - bool CanFix = false, - bool CanCrowdControl = false, - bool CanBattleItemMove = false, - bool IsAirUnit = false, - long AirUnitHeight = 0, - VectorOffset TagsOffset = default(VectorOffset), - long SecretStoneItemId = 0, - int SecretStoneItemAmount = 0, - long CharacterPieceItemId = 0, - int CharacterPieceItemAmount = 0, - long CombineRecipeId = 0) { - builder.StartTable(62); - CharacterExcel.AddCombineRecipeId(builder, CombineRecipeId); - CharacterExcel.AddCharacterPieceItemId(builder, CharacterPieceItemId); - CharacterExcel.AddSecretStoneItemId(builder, SecretStoneItemId); - CharacterExcel.AddAirUnitHeight(builder, AirUnitHeight); - CharacterExcel.AddRandomEffectRadius(builder, RandomEffectRadius); - CharacterExcel.AddBodyRadius(builder, BodyRadius); - CharacterExcel.AddExternalBTId(builder, ExternalBTId); - CharacterExcel.AddCharacterAIId(builder, CharacterAIId); - CharacterExcel.AddPersonalityId(builder, PersonalityId); - CharacterExcel.AddCostumeGroupId(builder, CostumeGroupId); - CharacterExcel.AddId(builder, Id); - CharacterExcel.AddCharacterPieceItemAmount(builder, CharacterPieceItemAmount); - CharacterExcel.AddSecretStoneItemAmount(builder, SecretStoneItemAmount); - CharacterExcel.AddTags(builder, TagsOffset); - CharacterExcel.AddAppearFrame(builder, AppearFrame); - CharacterExcel.AddJumpMotionFrame(builder, JumpMotionFrame); - CharacterExcel.AddMoveEndFrame(builder, MoveEndFrame); - CharacterExcel.AddMoveStartFrame(builder, MoveStartFrame); - CharacterExcel.AddEmojiOffsetY(builder, EmojiOffsetY); - CharacterExcel.AddEmojiOffsetX(builder, EmojiOffsetX); - CharacterExcel.AddHighlightFloaterHeight(builder, HighlightFloaterHeight); - CharacterExcel.AddHpBarHeight(builder, HpBarHeight); - CharacterExcel.AddWeaponLocalizeId(builder, WeaponLocalizeId); - CharacterExcel.AddEquipmentSlot(builder, EquipmentSlotOffset); - CharacterExcel.AddFavorLevelupType(builder, FavorLevelupType); - CharacterExcel.AddSpawnTemplateId(builder, SpawnTemplateId); - CharacterExcel.AddScenarioCharacter(builder, ScenarioCharacterOffset); - CharacterExcel.AddSquadType(builder, SquadType); - CharacterExcel.AddStatLevelUpType(builder, StatLevelUpType); - CharacterExcel.AddMaxStarGrade(builder, MaxStarGrade); - CharacterExcel.AddDefaultStarGrade(builder, DefaultStarGrade); - CharacterExcel.AddClub(builder, Club); - CharacterExcel.AddSchool(builder, School); - CharacterExcel.AddAimIKType(builder, AimIKType); - CharacterExcel.AddArmorType(builder, ArmorType); - CharacterExcel.AddBulletType(builder, BulletType); - CharacterExcel.AddTacticRange(builder, TacticRange); - CharacterExcel.AddWeaponType(builder, WeaponType); - CharacterExcel.AddTacticRole(builder, TacticRole); - CharacterExcel.AddSubPartsCount(builder, SubPartsCount); - CharacterExcel.AddTacticEntityType(builder, TacticEntityType); - CharacterExcel.AddRarity(builder, Rarity); - CharacterExcel.AddLocalizeEtcId(builder, LocalizeEtcId); - CharacterExcel.AddCollectionVisibleEndDate(builder, CollectionVisibleEndDateOffset); - CharacterExcel.AddCollectionVisibleStartDate(builder, CollectionVisibleStartDateOffset); - CharacterExcel.AddReleaseDate(builder, ReleaseDateOffset); - CharacterExcel.AddProductionStep(builder, ProductionStep); - CharacterExcel.AddDevName(builder, DevNameOffset); - CharacterExcel.AddIsAirUnit(builder, IsAirUnit); - CharacterExcel.AddCanBattleItemMove(builder, CanBattleItemMove); - CharacterExcel.AddCanCrowdControl(builder, CanCrowdControl); - CharacterExcel.AddCanFix(builder, CanFix); - CharacterExcel.AddCanMove(builder, CanMove); - CharacterExcel.AddHPBarHide(builder, HPBarHide); - CharacterExcel.AddDisplayEnemyInfo(builder, DisplayEnemyInfo); - CharacterExcel.AddJumpable(builder, Jumpable); - CharacterExcel.AddIsDummy(builder, IsDummy); - CharacterExcel.AddCanSurvive(builder, CanSurvive); - CharacterExcel.AddIsNPC(builder, IsNPC); - CharacterExcel.AddIsPlayableCharacter(builder, IsPlayableCharacter); - CharacterExcel.AddCollectionVisible(builder, CollectionVisible); - CharacterExcel.AddIsPlayable(builder, IsPlayable); - return CharacterExcel.EndCharacterExcel(builder); - } + public static Offset CreateCharacterExcel(FlatBufferBuilder builder, + long id = 0, + StringOffset dev_nameOffset = default(StringOffset), + long costume_group_id = 0, + bool is_playable = false, + SCHALE.Common.FlatData.ProductionStep production_step = SCHALE.Common.FlatData.ProductionStep.ToDo, + bool collection_visible = false, + StringOffset release_dateOffset = default(StringOffset), + StringOffset collection_visible_start_dateOffset = default(StringOffset), + StringOffset collection_visible_end_dateOffset = default(StringOffset), + bool is_playable_character = false, + uint localize_etc_id = 0, + SCHALE.Common.FlatData.Rarity rarity = SCHALE.Common.FlatData.Rarity.N, + bool is_npc = false, + SCHALE.Common.FlatData.TacticEntityType tactic_entity_type = SCHALE.Common.FlatData.TacticEntityType.None, + bool can_survive = false, + bool is_dummy = false, + int sub_parts_count = 0, + SCHALE.Common.FlatData.TacticRole tactic_role = SCHALE.Common.FlatData.TacticRole.None, + SCHALE.Common.FlatData.WeaponType weapon_type = SCHALE.Common.FlatData.WeaponType.None, + SCHALE.Common.FlatData.TacticRange tactic_range = SCHALE.Common.FlatData.TacticRange.Back, + SCHALE.Common.FlatData.BulletType bullet_type = SCHALE.Common.FlatData.BulletType.Normal, + SCHALE.Common.FlatData.ArmorType armor_type = SCHALE.Common.FlatData.ArmorType.LightArmor, + SCHALE.Common.FlatData.AimIKType aim_ik_type = SCHALE.Common.FlatData.AimIKType.None, + SCHALE.Common.FlatData.School school = SCHALE.Common.FlatData.School.None, + SCHALE.Common.FlatData.Club club = SCHALE.Common.FlatData.Club.None, + int default_star_grade = 0, + int max_star_grade = 0, + SCHALE.Common.FlatData.StatLevelUpType stat_level_up_type = SCHALE.Common.FlatData.StatLevelUpType.Standard, + SCHALE.Common.FlatData.SquadType squad_type = SCHALE.Common.FlatData.SquadType.None, + bool jumpable = false, + long personality_id = 0, + long character_ai_id = 0, + long external_bt_id = 0, + long main_combat_style_id = 0, + int combat_style_index = 0, + StringOffset scenario_characterOffset = default(StringOffset), + uint spawn_template_id = 0, + int favor_levelup_type = 0, + VectorOffset equipment_slotOffset = default(VectorOffset), + uint weapon_localize_id = 0, + bool display_enemy_info = false, + long body_radius = 0, + long random_effect_radius = 0, + bool hp_bar_hide = false, + float hp_bar_height = 0.0f, + float highlight_floater_height = 0.0f, + float emoji_offset_x = 0.0f, + float emoji_offset_y = 0.0f, + int move_start_frame = 0, + int move_end_frame = 0, + int jump_motion_frame = 0, + int appear_frame = 0, + bool can_move = false, + bool can_fix = false, + bool can_crowd_control = false, + bool can_battle_item_move = false, + bool is_air_unit = false, + long air_unit_height = 0, + VectorOffset tagsOffset = default(VectorOffset), + long secret_stone_item_id = 0, + int secret_stone_item_amount = 0, + long character_piece_item_id = 0, + int character_piece_item_amount = 0, + long combine_recipe_id = 0) + { + builder.StartTable(64); + CharacterExcel.AddCombineRecipeId(builder, combine_recipe_id); + CharacterExcel.AddCharacterPieceItemId(builder, character_piece_item_id); + CharacterExcel.AddSecretStoneItemId(builder, secret_stone_item_id); + CharacterExcel.AddAirUnitHeight(builder, air_unit_height); + CharacterExcel.AddRandomEffectRadius(builder, random_effect_radius); + CharacterExcel.AddBodyRadius(builder, body_radius); + CharacterExcel.AddMainCombatStyleId(builder, main_combat_style_id); + CharacterExcel.AddExternalBtId(builder, external_bt_id); + CharacterExcel.AddCharacterAiId(builder, character_ai_id); + CharacterExcel.AddPersonalityId(builder, personality_id); + CharacterExcel.AddCostumeGroupId(builder, costume_group_id); + CharacterExcel.AddId(builder, id); + CharacterExcel.AddCharacterPieceItemAmount(builder, character_piece_item_amount); + CharacterExcel.AddSecretStoneItemAmount(builder, secret_stone_item_amount); + CharacterExcel.AddTags(builder, tagsOffset); + CharacterExcel.AddAppearFrame(builder, appear_frame); + CharacterExcel.AddJumpMotionFrame(builder, jump_motion_frame); + CharacterExcel.AddMoveEndFrame(builder, move_end_frame); + CharacterExcel.AddMoveStartFrame(builder, move_start_frame); + CharacterExcel.AddEmojiOffsetY(builder, emoji_offset_y); + CharacterExcel.AddEmojiOffsetX(builder, emoji_offset_x); + CharacterExcel.AddHighlightFloaterHeight(builder, highlight_floater_height); + CharacterExcel.AddHpBarHeight(builder, hp_bar_height); + CharacterExcel.AddWeaponLocalizeId(builder, weapon_localize_id); + CharacterExcel.AddEquipmentSlot(builder, equipment_slotOffset); + CharacterExcel.AddFavorLevelupType(builder, favor_levelup_type); + CharacterExcel.AddSpawnTemplateId(builder, spawn_template_id); + CharacterExcel.AddScenarioCharacter(builder, scenario_characterOffset); + CharacterExcel.AddCombatStyleIndex(builder, combat_style_index); + CharacterExcel.AddSquadType(builder, squad_type); + CharacterExcel.AddStatLevelUpType(builder, stat_level_up_type); + CharacterExcel.AddMaxStarGrade(builder, max_star_grade); + CharacterExcel.AddDefaultStarGrade(builder, default_star_grade); + CharacterExcel.AddClub(builder, club); + CharacterExcel.AddSchool(builder, school); + CharacterExcel.AddAimIkType(builder, aim_ik_type); + CharacterExcel.AddArmorType(builder, armor_type); + CharacterExcel.AddBulletType(builder, bullet_type); + CharacterExcel.AddTacticRange(builder, tactic_range); + CharacterExcel.AddWeaponType(builder, weapon_type); + CharacterExcel.AddTacticRole(builder, tactic_role); + CharacterExcel.AddSubPartsCount(builder, sub_parts_count); + CharacterExcel.AddTacticEntityType(builder, tactic_entity_type); + CharacterExcel.AddRarity(builder, rarity); + CharacterExcel.AddLocalizeEtcId(builder, localize_etc_id); + CharacterExcel.AddCollectionVisibleEndDate(builder, collection_visible_end_dateOffset); + CharacterExcel.AddCollectionVisibleStartDate(builder, collection_visible_start_dateOffset); + CharacterExcel.AddReleaseDate(builder, release_dateOffset); + CharacterExcel.AddProductionStep(builder, production_step); + CharacterExcel.AddDevName(builder, dev_nameOffset); + CharacterExcel.AddIsAirUnit(builder, is_air_unit); + CharacterExcel.AddCanBattleItemMove(builder, can_battle_item_move); + CharacterExcel.AddCanCrowdControl(builder, can_crowd_control); + CharacterExcel.AddCanFix(builder, can_fix); + CharacterExcel.AddCanMove(builder, can_move); + CharacterExcel.AddHpBarHide(builder, hp_bar_hide); + CharacterExcel.AddDisplayEnemyInfo(builder, display_enemy_info); + CharacterExcel.AddJumpable(builder, jumpable); + CharacterExcel.AddIsDummy(builder, is_dummy); + CharacterExcel.AddCanSurvive(builder, can_survive); + CharacterExcel.AddIsNpc(builder, is_npc); + CharacterExcel.AddIsPlayableCharacter(builder, is_playable_character); + CharacterExcel.AddCollectionVisible(builder, collection_visible); + CharacterExcel.AddIsPlayable(builder, is_playable); + return CharacterExcel.EndCharacterExcel(builder); + } - public static void StartCharacterExcel(FlatBufferBuilder builder) { builder.StartTable(62); } - public static void AddId(FlatBufferBuilder builder, long id) { builder.AddLong(0, id, 0); } - public static void AddDevName(FlatBufferBuilder builder, StringOffset devNameOffset) { builder.AddOffset(1, devNameOffset.Value, 0); } - public static void AddCostumeGroupId(FlatBufferBuilder builder, long costumeGroupId) { builder.AddLong(2, costumeGroupId, 0); } - public static void AddIsPlayable(FlatBufferBuilder builder, bool isPlayable) { builder.AddBool(3, isPlayable, false); } - public static void AddProductionStep(FlatBufferBuilder builder, SCHALE.Common.FlatData.ProductionStep productionStep) { builder.AddInt(4, (int)productionStep, 0); } - public static void AddCollectionVisible(FlatBufferBuilder builder, bool collectionVisible) { builder.AddBool(5, collectionVisible, false); } - public static void AddReleaseDate(FlatBufferBuilder builder, StringOffset releaseDateOffset) { builder.AddOffset(6, releaseDateOffset.Value, 0); } - public static void AddCollectionVisibleStartDate(FlatBufferBuilder builder, StringOffset collectionVisibleStartDateOffset) { builder.AddOffset(7, collectionVisibleStartDateOffset.Value, 0); } - public static void AddCollectionVisibleEndDate(FlatBufferBuilder builder, StringOffset collectionVisibleEndDateOffset) { builder.AddOffset(8, collectionVisibleEndDateOffset.Value, 0); } - public static void AddIsPlayableCharacter(FlatBufferBuilder builder, bool isPlayableCharacter) { builder.AddBool(9, isPlayableCharacter, false); } - public static void AddLocalizeEtcId(FlatBufferBuilder builder, uint localizeEtcId) { builder.AddUint(10, localizeEtcId, 0); } - public static void AddRarity(FlatBufferBuilder builder, SCHALE.Common.FlatData.Rarity rarity) { builder.AddInt(11, (int)rarity, 0); } - public static void AddIsNPC(FlatBufferBuilder builder, bool isNPC) { builder.AddBool(12, isNPC, false); } - public static void AddTacticEntityType(FlatBufferBuilder builder, SCHALE.Common.FlatData.TacticEntityType tacticEntityType) { builder.AddInt(13, (int)tacticEntityType, 0); } - public static void AddCanSurvive(FlatBufferBuilder builder, bool canSurvive) { builder.AddBool(14, canSurvive, false); } - public static void AddIsDummy(FlatBufferBuilder builder, bool isDummy) { builder.AddBool(15, isDummy, false); } - public static void AddSubPartsCount(FlatBufferBuilder builder, int subPartsCount) { builder.AddInt(16, subPartsCount, 0); } - public static void AddTacticRole(FlatBufferBuilder builder, SCHALE.Common.FlatData.TacticRole tacticRole) { builder.AddInt(17, (int)tacticRole, 0); } - public static void AddWeaponType(FlatBufferBuilder builder, SCHALE.Common.FlatData.WeaponType weaponType) { builder.AddInt(18, (int)weaponType, 0); } - public static void AddTacticRange(FlatBufferBuilder builder, SCHALE.Common.FlatData.TacticRange tacticRange) { builder.AddInt(19, (int)tacticRange, 0); } - public static void AddBulletType(FlatBufferBuilder builder, SCHALE.Common.FlatData.BulletType bulletType) { builder.AddInt(20, (int)bulletType, 0); } - public static void AddArmorType(FlatBufferBuilder builder, SCHALE.Common.FlatData.ArmorType armorType) { builder.AddInt(21, (int)armorType, 0); } - public static void AddAimIKType(FlatBufferBuilder builder, SCHALE.Common.FlatData.AimIKType aimIKType) { builder.AddInt(22, (int)aimIKType, 0); } - public static void AddSchool(FlatBufferBuilder builder, SCHALE.Common.FlatData.School school) { builder.AddInt(23, (int)school, 0); } - public static void AddClub(FlatBufferBuilder builder, SCHALE.Common.FlatData.Club club) { builder.AddInt(24, (int)club, 0); } - public static void AddDefaultStarGrade(FlatBufferBuilder builder, int defaultStarGrade) { builder.AddInt(25, defaultStarGrade, 0); } - public static void AddMaxStarGrade(FlatBufferBuilder builder, int maxStarGrade) { builder.AddInt(26, maxStarGrade, 0); } - public static void AddStatLevelUpType(FlatBufferBuilder builder, SCHALE.Common.FlatData.StatLevelUpType statLevelUpType) { builder.AddInt(27, (int)statLevelUpType, 0); } - public static void AddSquadType(FlatBufferBuilder builder, SCHALE.Common.FlatData.SquadType squadType) { builder.AddInt(28, (int)squadType, 0); } - public static void AddJumpable(FlatBufferBuilder builder, bool jumpable) { builder.AddBool(29, jumpable, false); } - public static void AddPersonalityId(FlatBufferBuilder builder, long personalityId) { builder.AddLong(30, personalityId, 0); } - public static void AddCharacterAIId(FlatBufferBuilder builder, long characterAIId) { builder.AddLong(31, characterAIId, 0); } - public static void AddExternalBTId(FlatBufferBuilder builder, long externalBTId) { builder.AddLong(32, externalBTId, 0); } - public static void AddScenarioCharacter(FlatBufferBuilder builder, StringOffset scenarioCharacterOffset) { builder.AddOffset(33, scenarioCharacterOffset.Value, 0); } - public static void AddSpawnTemplateId(FlatBufferBuilder builder, uint spawnTemplateId) { builder.AddUint(34, spawnTemplateId, 0); } - public static void AddFavorLevelupType(FlatBufferBuilder builder, int favorLevelupType) { builder.AddInt(35, favorLevelupType, 0); } - public static void AddEquipmentSlot(FlatBufferBuilder builder, VectorOffset equipmentSlotOffset) { builder.AddOffset(36, equipmentSlotOffset.Value, 0); } - public static VectorOffset CreateEquipmentSlotVector(FlatBufferBuilder builder, SCHALE.Common.FlatData.EquipmentCategory[] data) { builder.StartVector(4, data.Length, 4); for (int i = data.Length - 1; i >= 0; i--) builder.AddInt((int)data[i]); return builder.EndVector(); } - public static VectorOffset CreateEquipmentSlotVectorBlock(FlatBufferBuilder builder, SCHALE.Common.FlatData.EquipmentCategory[] data) { builder.StartVector(4, data.Length, 4); builder.Add(data); return builder.EndVector(); } - public static VectorOffset CreateEquipmentSlotVectorBlock(FlatBufferBuilder builder, ArraySegment data) { builder.StartVector(4, data.Count, 4); builder.Add(data); return builder.EndVector(); } - public static VectorOffset CreateEquipmentSlotVectorBlock(FlatBufferBuilder builder, IntPtr dataPtr, int sizeInBytes) { builder.StartVector(1, sizeInBytes, 1); builder.Add(dataPtr, sizeInBytes); return builder.EndVector(); } - public static void StartEquipmentSlotVector(FlatBufferBuilder builder, int numElems) { builder.StartVector(4, numElems, 4); } - public static void AddWeaponLocalizeId(FlatBufferBuilder builder, uint weaponLocalizeId) { builder.AddUint(37, weaponLocalizeId, 0); } - public static void AddDisplayEnemyInfo(FlatBufferBuilder builder, bool displayEnemyInfo) { builder.AddBool(38, displayEnemyInfo, false); } - public static void AddBodyRadius(FlatBufferBuilder builder, long bodyRadius) { builder.AddLong(39, bodyRadius, 0); } - public static void AddRandomEffectRadius(FlatBufferBuilder builder, long randomEffectRadius) { builder.AddLong(40, randomEffectRadius, 0); } - public static void AddHPBarHide(FlatBufferBuilder builder, bool hPBarHide) { builder.AddBool(41, hPBarHide, false); } - public static void AddHpBarHeight(FlatBufferBuilder builder, float hpBarHeight) { builder.AddFloat(42, hpBarHeight, 0.0f); } - public static void AddHighlightFloaterHeight(FlatBufferBuilder builder, float highlightFloaterHeight) { builder.AddFloat(43, highlightFloaterHeight, 0.0f); } - public static void AddEmojiOffsetX(FlatBufferBuilder builder, float emojiOffsetX) { builder.AddFloat(44, emojiOffsetX, 0.0f); } - public static void AddEmojiOffsetY(FlatBufferBuilder builder, float emojiOffsetY) { builder.AddFloat(45, emojiOffsetY, 0.0f); } - public static void AddMoveStartFrame(FlatBufferBuilder builder, int moveStartFrame) { builder.AddInt(46, moveStartFrame, 0); } - public static void AddMoveEndFrame(FlatBufferBuilder builder, int moveEndFrame) { builder.AddInt(47, moveEndFrame, 0); } - public static void AddJumpMotionFrame(FlatBufferBuilder builder, int jumpMotionFrame) { builder.AddInt(48, jumpMotionFrame, 0); } - public static void AddAppearFrame(FlatBufferBuilder builder, int appearFrame) { builder.AddInt(49, appearFrame, 0); } - public static void AddCanMove(FlatBufferBuilder builder, bool canMove) { builder.AddBool(50, canMove, false); } - public static void AddCanFix(FlatBufferBuilder builder, bool canFix) { builder.AddBool(51, canFix, false); } - public static void AddCanCrowdControl(FlatBufferBuilder builder, bool canCrowdControl) { builder.AddBool(52, canCrowdControl, false); } - public static void AddCanBattleItemMove(FlatBufferBuilder builder, bool canBattleItemMove) { builder.AddBool(53, canBattleItemMove, false); } - public static void AddIsAirUnit(FlatBufferBuilder builder, bool isAirUnit) { builder.AddBool(54, isAirUnit, false); } - public static void AddAirUnitHeight(FlatBufferBuilder builder, long airUnitHeight) { builder.AddLong(55, airUnitHeight, 0); } - public static void AddTags(FlatBufferBuilder builder, VectorOffset tagsOffset) { builder.AddOffset(56, tagsOffset.Value, 0); } - public static VectorOffset CreateTagsVector(FlatBufferBuilder builder, SCHALE.Common.FlatData.Tag[] data) { builder.StartVector(4, data.Length, 4); for (int i = data.Length - 1; i >= 0; i--) builder.AddInt((int)data[i]); return builder.EndVector(); } - public static VectorOffset CreateTagsVectorBlock(FlatBufferBuilder builder, SCHALE.Common.FlatData.Tag[] data) { builder.StartVector(4, data.Length, 4); builder.Add(data); return builder.EndVector(); } - public static VectorOffset CreateTagsVectorBlock(FlatBufferBuilder builder, ArraySegment data) { builder.StartVector(4, data.Count, 4); builder.Add(data); return builder.EndVector(); } - public static VectorOffset CreateTagsVectorBlock(FlatBufferBuilder builder, IntPtr dataPtr, int sizeInBytes) { builder.StartVector(1, sizeInBytes, 1); builder.Add(dataPtr, sizeInBytes); return builder.EndVector(); } - public static void StartTagsVector(FlatBufferBuilder builder, int numElems) { builder.StartVector(4, numElems, 4); } - public static void AddSecretStoneItemId(FlatBufferBuilder builder, long secretStoneItemId) { builder.AddLong(57, secretStoneItemId, 0); } - public static void AddSecretStoneItemAmount(FlatBufferBuilder builder, int secretStoneItemAmount) { builder.AddInt(58, secretStoneItemAmount, 0); } - public static void AddCharacterPieceItemId(FlatBufferBuilder builder, long characterPieceItemId) { builder.AddLong(59, characterPieceItemId, 0); } - public static void AddCharacterPieceItemAmount(FlatBufferBuilder builder, int characterPieceItemAmount) { builder.AddInt(60, characterPieceItemAmount, 0); } - public static void AddCombineRecipeId(FlatBufferBuilder builder, long combineRecipeId) { builder.AddLong(61, combineRecipeId, 0); } - public static Offset EndCharacterExcel(FlatBufferBuilder builder) { - int o = builder.EndTable(); - return new Offset(o); - } - public CharacterExcelT UnPack() { - var _o = new CharacterExcelT(); - this.UnPackTo(_o); - return _o; - } - public void UnPackTo(CharacterExcelT _o) { - byte[] key = TableEncryptionService.CreateKey("Character"); - _o.Id = TableEncryptionService.Convert(this.Id, key); - _o.DevName = TableEncryptionService.Convert(this.DevName, key); - _o.CostumeGroupId = TableEncryptionService.Convert(this.CostumeGroupId, key); - _o.IsPlayable = TableEncryptionService.Convert(this.IsPlayable, key); - _o.ProductionStep = TableEncryptionService.Convert(this.ProductionStep, key); - _o.CollectionVisible = TableEncryptionService.Convert(this.CollectionVisible, key); - _o.ReleaseDate = TableEncryptionService.Convert(this.ReleaseDate, key); - _o.CollectionVisibleStartDate = TableEncryptionService.Convert(this.CollectionVisibleStartDate, key); - _o.CollectionVisibleEndDate = TableEncryptionService.Convert(this.CollectionVisibleEndDate, key); - _o.IsPlayableCharacter = TableEncryptionService.Convert(this.IsPlayableCharacter, key); - _o.LocalizeEtcId = TableEncryptionService.Convert(this.LocalizeEtcId, key); - _o.Rarity = TableEncryptionService.Convert(this.Rarity, key); - _o.IsNPC = TableEncryptionService.Convert(this.IsNPC, key); - _o.TacticEntityType = TableEncryptionService.Convert(this.TacticEntityType, key); - _o.CanSurvive = TableEncryptionService.Convert(this.CanSurvive, key); - _o.IsDummy = TableEncryptionService.Convert(this.IsDummy, key); - _o.SubPartsCount = TableEncryptionService.Convert(this.SubPartsCount, key); - _o.TacticRole = TableEncryptionService.Convert(this.TacticRole, key); - _o.WeaponType = TableEncryptionService.Convert(this.WeaponType, key); - _o.TacticRange = TableEncryptionService.Convert(this.TacticRange, key); - _o.BulletType = TableEncryptionService.Convert(this.BulletType, key); - _o.ArmorType = TableEncryptionService.Convert(this.ArmorType, key); - _o.AimIKType = TableEncryptionService.Convert(this.AimIKType, key); - _o.School = TableEncryptionService.Convert(this.School, key); - _o.Club = TableEncryptionService.Convert(this.Club, key); - _o.DefaultStarGrade = TableEncryptionService.Convert(this.DefaultStarGrade, key); - _o.MaxStarGrade = TableEncryptionService.Convert(this.MaxStarGrade, key); - _o.StatLevelUpType = TableEncryptionService.Convert(this.StatLevelUpType, key); - _o.SquadType = TableEncryptionService.Convert(this.SquadType, key); - _o.Jumpable = TableEncryptionService.Convert(this.Jumpable, key); - _o.PersonalityId = TableEncryptionService.Convert(this.PersonalityId, key); - _o.CharacterAIId = TableEncryptionService.Convert(this.CharacterAIId, key); - _o.ExternalBTId = TableEncryptionService.Convert(this.ExternalBTId, key); - _o.ScenarioCharacter = TableEncryptionService.Convert(this.ScenarioCharacter, key); - _o.SpawnTemplateId = TableEncryptionService.Convert(this.SpawnTemplateId, key); - _o.FavorLevelupType = TableEncryptionService.Convert(this.FavorLevelupType, key); - _o.EquipmentSlot = new List(); - for (var _j = 0; _j < this.EquipmentSlotLength; ++_j) {_o.EquipmentSlot.Add(TableEncryptionService.Convert(this.EquipmentSlot(_j), key));} - _o.WeaponLocalizeId = TableEncryptionService.Convert(this.WeaponLocalizeId, key); - _o.DisplayEnemyInfo = TableEncryptionService.Convert(this.DisplayEnemyInfo, key); - _o.BodyRadius = TableEncryptionService.Convert(this.BodyRadius, key); - _o.RandomEffectRadius = TableEncryptionService.Convert(this.RandomEffectRadius, key); - _o.HPBarHide = TableEncryptionService.Convert(this.HPBarHide, key); - _o.HpBarHeight = TableEncryptionService.Convert(this.HpBarHeight, key); - _o.HighlightFloaterHeight = TableEncryptionService.Convert(this.HighlightFloaterHeight, key); - _o.EmojiOffsetX = TableEncryptionService.Convert(this.EmojiOffsetX, key); - _o.EmojiOffsetY = TableEncryptionService.Convert(this.EmojiOffsetY, key); - _o.MoveStartFrame = TableEncryptionService.Convert(this.MoveStartFrame, key); - _o.MoveEndFrame = TableEncryptionService.Convert(this.MoveEndFrame, key); - _o.JumpMotionFrame = TableEncryptionService.Convert(this.JumpMotionFrame, key); - _o.AppearFrame = TableEncryptionService.Convert(this.AppearFrame, key); - _o.CanMove = TableEncryptionService.Convert(this.CanMove, key); - _o.CanFix = TableEncryptionService.Convert(this.CanFix, key); - _o.CanCrowdControl = TableEncryptionService.Convert(this.CanCrowdControl, key); - _o.CanBattleItemMove = TableEncryptionService.Convert(this.CanBattleItemMove, key); - _o.IsAirUnit = TableEncryptionService.Convert(this.IsAirUnit, key); - _o.AirUnitHeight = TableEncryptionService.Convert(this.AirUnitHeight, key); - _o.Tags = new List(); - for (var _j = 0; _j < this.TagsLength; ++_j) {_o.Tags.Add(TableEncryptionService.Convert(this.Tags(_j), key));} - _o.SecretStoneItemId = TableEncryptionService.Convert(this.SecretStoneItemId, key); - _o.SecretStoneItemAmount = TableEncryptionService.Convert(this.SecretStoneItemAmount, key); - _o.CharacterPieceItemId = TableEncryptionService.Convert(this.CharacterPieceItemId, key); - _o.CharacterPieceItemAmount = TableEncryptionService.Convert(this.CharacterPieceItemAmount, key); - _o.CombineRecipeId = TableEncryptionService.Convert(this.CombineRecipeId, key); - } - public static Offset Pack(FlatBufferBuilder builder, CharacterExcelT _o) { - if (_o == null) return default(Offset); - var _DevName = _o.DevName == null ? default(StringOffset) : builder.CreateString(_o.DevName); - var _ReleaseDate = _o.ReleaseDate == null ? default(StringOffset) : builder.CreateString(_o.ReleaseDate); - var _CollectionVisibleStartDate = _o.CollectionVisibleStartDate == null ? default(StringOffset) : builder.CreateString(_o.CollectionVisibleStartDate); - var _CollectionVisibleEndDate = _o.CollectionVisibleEndDate == null ? default(StringOffset) : builder.CreateString(_o.CollectionVisibleEndDate); - var _ScenarioCharacter = _o.ScenarioCharacter == null ? default(StringOffset) : builder.CreateString(_o.ScenarioCharacter); - var _EquipmentSlot = default(VectorOffset); - if (_o.EquipmentSlot != null) { - var __EquipmentSlot = _o.EquipmentSlot.ToArray(); - _EquipmentSlot = CreateEquipmentSlotVector(builder, __EquipmentSlot); + public static void StartCharacterExcel(FlatBufferBuilder builder) { builder.StartTable(64); } + public static void AddId(FlatBufferBuilder builder, long id) { builder.AddLong(0, id, 0); } + public static void AddDevName(FlatBufferBuilder builder, StringOffset devNameOffset) { builder.AddOffset(1, devNameOffset.Value, 0); } + public static void AddCostumeGroupId(FlatBufferBuilder builder, long costumeGroupId) { builder.AddLong(2, costumeGroupId, 0); } + public static void AddIsPlayable(FlatBufferBuilder builder, bool isPlayable) { builder.AddBool(3, isPlayable, false); } + public static void AddProductionStep(FlatBufferBuilder builder, SCHALE.Common.FlatData.ProductionStep productionStep) { builder.AddInt(4, (int)productionStep, 0); } + public static void AddCollectionVisible(FlatBufferBuilder builder, bool collectionVisible) { builder.AddBool(5, collectionVisible, false); } + public static void AddReleaseDate(FlatBufferBuilder builder, StringOffset releaseDateOffset) { builder.AddOffset(6, releaseDateOffset.Value, 0); } + public static void AddCollectionVisibleStartDate(FlatBufferBuilder builder, StringOffset collectionVisibleStartDateOffset) { builder.AddOffset(7, collectionVisibleStartDateOffset.Value, 0); } + public static void AddCollectionVisibleEndDate(FlatBufferBuilder builder, StringOffset collectionVisibleEndDateOffset) { builder.AddOffset(8, collectionVisibleEndDateOffset.Value, 0); } + public static void AddIsPlayableCharacter(FlatBufferBuilder builder, bool isPlayableCharacter) { builder.AddBool(9, isPlayableCharacter, false); } + public static void AddLocalizeEtcId(FlatBufferBuilder builder, uint localizeEtcId) { builder.AddUint(10, localizeEtcId, 0); } + public static void AddRarity(FlatBufferBuilder builder, SCHALE.Common.FlatData.Rarity rarity) { builder.AddInt(11, (int)rarity, 0); } + public static void AddIsNpc(FlatBufferBuilder builder, bool isNpc) { builder.AddBool(12, isNpc, false); } + public static void AddTacticEntityType(FlatBufferBuilder builder, SCHALE.Common.FlatData.TacticEntityType tacticEntityType) { builder.AddInt(13, (int)tacticEntityType, 0); } + public static void AddCanSurvive(FlatBufferBuilder builder, bool canSurvive) { builder.AddBool(14, canSurvive, false); } + public static void AddIsDummy(FlatBufferBuilder builder, bool isDummy) { builder.AddBool(15, isDummy, false); } + public static void AddSubPartsCount(FlatBufferBuilder builder, int subPartsCount) { builder.AddInt(16, subPartsCount, 0); } + public static void AddTacticRole(FlatBufferBuilder builder, SCHALE.Common.FlatData.TacticRole tacticRole) { builder.AddInt(17, (int)tacticRole, 0); } + public static void AddWeaponType(FlatBufferBuilder builder, SCHALE.Common.FlatData.WeaponType weaponType) { builder.AddInt(18, (int)weaponType, 0); } + public static void AddTacticRange(FlatBufferBuilder builder, SCHALE.Common.FlatData.TacticRange tacticRange) { builder.AddInt(19, (int)tacticRange, 0); } + public static void AddBulletType(FlatBufferBuilder builder, SCHALE.Common.FlatData.BulletType bulletType) { builder.AddInt(20, (int)bulletType, 0); } + public static void AddArmorType(FlatBufferBuilder builder, SCHALE.Common.FlatData.ArmorType armorType) { builder.AddInt(21, (int)armorType, 0); } + public static void AddAimIkType(FlatBufferBuilder builder, SCHALE.Common.FlatData.AimIKType aimIkType) { builder.AddInt(22, (int)aimIkType, 0); } + public static void AddSchool(FlatBufferBuilder builder, SCHALE.Common.FlatData.School school) { builder.AddInt(23, (int)school, 0); } + public static void AddClub(FlatBufferBuilder builder, SCHALE.Common.FlatData.Club club) { builder.AddInt(24, (int)club, 0); } + public static void AddDefaultStarGrade(FlatBufferBuilder builder, int defaultStarGrade) { builder.AddInt(25, defaultStarGrade, 0); } + public static void AddMaxStarGrade(FlatBufferBuilder builder, int maxStarGrade) { builder.AddInt(26, maxStarGrade, 0); } + public static void AddStatLevelUpType(FlatBufferBuilder builder, SCHALE.Common.FlatData.StatLevelUpType statLevelUpType) { builder.AddInt(27, (int)statLevelUpType, 0); } + public static void AddSquadType(FlatBufferBuilder builder, SCHALE.Common.FlatData.SquadType squadType) { builder.AddInt(28, (int)squadType, 0); } + public static void AddJumpable(FlatBufferBuilder builder, bool jumpable) { builder.AddBool(29, jumpable, false); } + public static void AddPersonalityId(FlatBufferBuilder builder, long personalityId) { builder.AddLong(30, personalityId, 0); } + public static void AddCharacterAiId(FlatBufferBuilder builder, long characterAiId) { builder.AddLong(31, characterAiId, 0); } + public static void AddExternalBtId(FlatBufferBuilder builder, long externalBtId) { builder.AddLong(32, externalBtId, 0); } + public static void AddMainCombatStyleId(FlatBufferBuilder builder, long mainCombatStyleId) { builder.AddLong(33, mainCombatStyleId, 0); } + public static void AddCombatStyleIndex(FlatBufferBuilder builder, int combatStyleIndex) { builder.AddInt(34, combatStyleIndex, 0); } + public static void AddScenarioCharacter(FlatBufferBuilder builder, StringOffset scenarioCharacterOffset) { builder.AddOffset(35, scenarioCharacterOffset.Value, 0); } + public static void AddSpawnTemplateId(FlatBufferBuilder builder, uint spawnTemplateId) { builder.AddUint(36, spawnTemplateId, 0); } + public static void AddFavorLevelupType(FlatBufferBuilder builder, int favorLevelupType) { builder.AddInt(37, favorLevelupType, 0); } + public static void AddEquipmentSlot(FlatBufferBuilder builder, VectorOffset equipmentSlotOffset) { builder.AddOffset(38, equipmentSlotOffset.Value, 0); } + public static VectorOffset CreateEquipmentSlotVector(FlatBufferBuilder builder, SCHALE.Common.FlatData.EquipmentCategory[] data) { builder.StartVector(4, data.Length, 4); for (int i = data.Length - 1; i >= 0; i--) builder.AddInt((int)data[i]); return builder.EndVector(); } + public static VectorOffset CreateEquipmentSlotVectorBlock(FlatBufferBuilder builder, SCHALE.Common.FlatData.EquipmentCategory[] data) { builder.StartVector(4, data.Length, 4); builder.Add(data); return builder.EndVector(); } + public static VectorOffset CreateEquipmentSlotVectorBlock(FlatBufferBuilder builder, ArraySegment data) { builder.StartVector(4, data.Count, 4); builder.Add(data); return builder.EndVector(); } + public static VectorOffset CreateEquipmentSlotVectorBlock(FlatBufferBuilder builder, IntPtr dataPtr, int sizeInBytes) { builder.StartVector(1, sizeInBytes, 1); builder.Add(dataPtr, sizeInBytes); return builder.EndVector(); } + public static void StartEquipmentSlotVector(FlatBufferBuilder builder, int numElems) { builder.StartVector(4, numElems, 4); } + public static void AddWeaponLocalizeId(FlatBufferBuilder builder, uint weaponLocalizeId) { builder.AddUint(39, weaponLocalizeId, 0); } + public static void AddDisplayEnemyInfo(FlatBufferBuilder builder, bool displayEnemyInfo) { builder.AddBool(40, displayEnemyInfo, false); } + public static void AddBodyRadius(FlatBufferBuilder builder, long bodyRadius) { builder.AddLong(41, bodyRadius, 0); } + public static void AddRandomEffectRadius(FlatBufferBuilder builder, long randomEffectRadius) { builder.AddLong(42, randomEffectRadius, 0); } + public static void AddHpBarHide(FlatBufferBuilder builder, bool hpBarHide) { builder.AddBool(43, hpBarHide, false); } + public static void AddHpBarHeight(FlatBufferBuilder builder, float hpBarHeight) { builder.AddFloat(44, hpBarHeight, 0.0f); } + public static void AddHighlightFloaterHeight(FlatBufferBuilder builder, float highlightFloaterHeight) { builder.AddFloat(45, highlightFloaterHeight, 0.0f); } + public static void AddEmojiOffsetX(FlatBufferBuilder builder, float emojiOffsetX) { builder.AddFloat(46, emojiOffsetX, 0.0f); } + public static void AddEmojiOffsetY(FlatBufferBuilder builder, float emojiOffsetY) { builder.AddFloat(47, emojiOffsetY, 0.0f); } + public static void AddMoveStartFrame(FlatBufferBuilder builder, int moveStartFrame) { builder.AddInt(48, moveStartFrame, 0); } + public static void AddMoveEndFrame(FlatBufferBuilder builder, int moveEndFrame) { builder.AddInt(49, moveEndFrame, 0); } + public static void AddJumpMotionFrame(FlatBufferBuilder builder, int jumpMotionFrame) { builder.AddInt(50, jumpMotionFrame, 0); } + public static void AddAppearFrame(FlatBufferBuilder builder, int appearFrame) { builder.AddInt(51, appearFrame, 0); } + public static void AddCanMove(FlatBufferBuilder builder, bool canMove) { builder.AddBool(52, canMove, false); } + public static void AddCanFix(FlatBufferBuilder builder, bool canFix) { builder.AddBool(53, canFix, false); } + public static void AddCanCrowdControl(FlatBufferBuilder builder, bool canCrowdControl) { builder.AddBool(54, canCrowdControl, false); } + public static void AddCanBattleItemMove(FlatBufferBuilder builder, bool canBattleItemMove) { builder.AddBool(55, canBattleItemMove, false); } + public static void AddIsAirUnit(FlatBufferBuilder builder, bool isAirUnit) { builder.AddBool(56, isAirUnit, false); } + public static void AddAirUnitHeight(FlatBufferBuilder builder, long airUnitHeight) { builder.AddLong(57, airUnitHeight, 0); } + public static void AddTags(FlatBufferBuilder builder, VectorOffset tagsOffset) { builder.AddOffset(58, tagsOffset.Value, 0); } + public static VectorOffset CreateTagsVector(FlatBufferBuilder builder, SCHALE.Common.FlatData.Tag[] data) { builder.StartVector(4, data.Length, 4); for (int i = data.Length - 1; i >= 0; i--) builder.AddInt((int)data[i]); return builder.EndVector(); } + public static VectorOffset CreateTagsVectorBlock(FlatBufferBuilder builder, SCHALE.Common.FlatData.Tag[] data) { builder.StartVector(4, data.Length, 4); builder.Add(data); return builder.EndVector(); } + public static VectorOffset CreateTagsVectorBlock(FlatBufferBuilder builder, ArraySegment data) { builder.StartVector(4, data.Count, 4); builder.Add(data); return builder.EndVector(); } + public static VectorOffset CreateTagsVectorBlock(FlatBufferBuilder builder, IntPtr dataPtr, int sizeInBytes) { builder.StartVector(1, sizeInBytes, 1); builder.Add(dataPtr, sizeInBytes); return builder.EndVector(); } + public static void StartTagsVector(FlatBufferBuilder builder, int numElems) { builder.StartVector(4, numElems, 4); } + public static void AddSecretStoneItemId(FlatBufferBuilder builder, long secretStoneItemId) { builder.AddLong(59, secretStoneItemId, 0); } + public static void AddSecretStoneItemAmount(FlatBufferBuilder builder, int secretStoneItemAmount) { builder.AddInt(60, secretStoneItemAmount, 0); } + public static void AddCharacterPieceItemId(FlatBufferBuilder builder, long characterPieceItemId) { builder.AddLong(61, characterPieceItemId, 0); } + public static void AddCharacterPieceItemAmount(FlatBufferBuilder builder, int characterPieceItemAmount) { builder.AddInt(62, characterPieceItemAmount, 0); } + public static void AddCombineRecipeId(FlatBufferBuilder builder, long combineRecipeId) { builder.AddLong(63, combineRecipeId, 0); } + public static Offset EndCharacterExcel(FlatBufferBuilder builder) + { + int o = builder.EndTable(); + return new Offset(o); + } + public CharacterExcelT UnPack() + { + var _o = new CharacterExcelT(); + this.UnPackTo(_o); + return _o; + } + public void UnPackTo(CharacterExcelT _o) + { + byte[] key = TableEncryptionService.CreateKey("Character"); + _o.Id = TableEncryptionService.Convert(this.Id, key); + _o.DevName = TableEncryptionService.Convert(this.DevName, key); + _o.CostumeGroupId = TableEncryptionService.Convert(this.CostumeGroupId, key); + _o.IsPlayable = TableEncryptionService.Convert(this.IsPlayable, key); + _o.ProductionStep = TableEncryptionService.Convert(this.ProductionStep, key); + _o.CollectionVisible = TableEncryptionService.Convert(this.CollectionVisible, key); + _o.ReleaseDate = TableEncryptionService.Convert(this.ReleaseDate, key); + _o.CollectionVisibleStartDate = TableEncryptionService.Convert(this.CollectionVisibleStartDate, key); + _o.CollectionVisibleEndDate = TableEncryptionService.Convert(this.CollectionVisibleEndDate, key); + _o.IsPlayableCharacter = TableEncryptionService.Convert(this.IsPlayableCharacter, key); + _o.LocalizeEtcId = TableEncryptionService.Convert(this.LocalizeEtcId, key); + _o.Rarity = TableEncryptionService.Convert(this.Rarity, key); + _o.IsNpc = TableEncryptionService.Convert(this.IsNpc, key); + _o.TacticEntityType = TableEncryptionService.Convert(this.TacticEntityType, key); + _o.CanSurvive = TableEncryptionService.Convert(this.CanSurvive, key); + _o.IsDummy = TableEncryptionService.Convert(this.IsDummy, key); + _o.SubPartsCount = TableEncryptionService.Convert(this.SubPartsCount, key); + _o.TacticRole = TableEncryptionService.Convert(this.TacticRole, key); + _o.WeaponType = TableEncryptionService.Convert(this.WeaponType, key); + _o.TacticRange = TableEncryptionService.Convert(this.TacticRange, key); + _o.BulletType = TableEncryptionService.Convert(this.BulletType, key); + _o.ArmorType = TableEncryptionService.Convert(this.ArmorType, key); + _o.AimIkType = TableEncryptionService.Convert(this.AimIkType, key); + _o.School = TableEncryptionService.Convert(this.School, key); + _o.Club = TableEncryptionService.Convert(this.Club, key); + _o.DefaultStarGrade = TableEncryptionService.Convert(this.DefaultStarGrade, key); + _o.MaxStarGrade = TableEncryptionService.Convert(this.MaxStarGrade, key); + _o.StatLevelUpType = TableEncryptionService.Convert(this.StatLevelUpType, key); + _o.SquadType = TableEncryptionService.Convert(this.SquadType, key); + _o.Jumpable = TableEncryptionService.Convert(this.Jumpable, key); + _o.PersonalityId = TableEncryptionService.Convert(this.PersonalityId, key); + _o.CharacterAiId = TableEncryptionService.Convert(this.CharacterAiId, key); + _o.ExternalBtId = TableEncryptionService.Convert(this.ExternalBtId, key); + _o.MainCombatStyleId = TableEncryptionService.Convert(this.MainCombatStyleId, key); + _o.CombatStyleIndex = TableEncryptionService.Convert(this.CombatStyleIndex, key); + _o.ScenarioCharacter = TableEncryptionService.Convert(this.ScenarioCharacter, key); + _o.SpawnTemplateId = TableEncryptionService.Convert(this.SpawnTemplateId, key); + _o.FavorLevelupType = TableEncryptionService.Convert(this.FavorLevelupType, key); + _o.EquipmentSlot = new List(); + for (var _j = 0; _j < this.EquipmentSlotLength; ++_j) { _o.EquipmentSlot.Add(TableEncryptionService.Convert(this.EquipmentSlot(_j), key)); } + _o.WeaponLocalizeId = TableEncryptionService.Convert(this.WeaponLocalizeId, key); + _o.DisplayEnemyInfo = TableEncryptionService.Convert(this.DisplayEnemyInfo, key); + _o.BodyRadius = TableEncryptionService.Convert(this.BodyRadius, key); + _o.RandomEffectRadius = TableEncryptionService.Convert(this.RandomEffectRadius, key); + _o.HpBarHide = TableEncryptionService.Convert(this.HpBarHide, key); + _o.HpBarHeight = TableEncryptionService.Convert(this.HpBarHeight, key); + _o.HighlightFloaterHeight = TableEncryptionService.Convert(this.HighlightFloaterHeight, key); + _o.EmojiOffsetX = TableEncryptionService.Convert(this.EmojiOffsetX, key); + _o.EmojiOffsetY = TableEncryptionService.Convert(this.EmojiOffsetY, key); + _o.MoveStartFrame = TableEncryptionService.Convert(this.MoveStartFrame, key); + _o.MoveEndFrame = TableEncryptionService.Convert(this.MoveEndFrame, key); + _o.JumpMotionFrame = TableEncryptionService.Convert(this.JumpMotionFrame, key); + _o.AppearFrame = TableEncryptionService.Convert(this.AppearFrame, key); + _o.CanMove = TableEncryptionService.Convert(this.CanMove, key); + _o.CanFix = TableEncryptionService.Convert(this.CanFix, key); + _o.CanCrowdControl = TableEncryptionService.Convert(this.CanCrowdControl, key); + _o.CanBattleItemMove = TableEncryptionService.Convert(this.CanBattleItemMove, key); + _o.IsAirUnit = TableEncryptionService.Convert(this.IsAirUnit, key); + _o.AirUnitHeight = TableEncryptionService.Convert(this.AirUnitHeight, key); + _o.Tags = new List(); + for (var _j = 0; _j < this.TagsLength; ++_j) { _o.Tags.Add(TableEncryptionService.Convert(this.Tags(_j), key)); } + _o.SecretStoneItemId = TableEncryptionService.Convert(this.SecretStoneItemId, key); + _o.SecretStoneItemAmount = TableEncryptionService.Convert(this.SecretStoneItemAmount, key); + _o.CharacterPieceItemId = TableEncryptionService.Convert(this.CharacterPieceItemId, key); + _o.CharacterPieceItemAmount = TableEncryptionService.Convert(this.CharacterPieceItemAmount, key); + _o.CombineRecipeId = TableEncryptionService.Convert(this.CombineRecipeId, key); + } + public static Offset Pack(FlatBufferBuilder builder, CharacterExcelT _o) + { + if (_o == null) return default(Offset); + var _dev_name = _o.DevName == null ? default(StringOffset) : builder.CreateString(_o.DevName); + var _release_date = _o.ReleaseDate == null ? default(StringOffset) : builder.CreateString(_o.ReleaseDate); + var _collection_visible_start_date = _o.CollectionVisibleStartDate == null ? default(StringOffset) : builder.CreateString(_o.CollectionVisibleStartDate); + var _collection_visible_end_date = _o.CollectionVisibleEndDate == null ? default(StringOffset) : builder.CreateString(_o.CollectionVisibleEndDate); + var _scenario_character = _o.ScenarioCharacter == null ? default(StringOffset) : builder.CreateString(_o.ScenarioCharacter); + var _equipment_slot = default(VectorOffset); + if (_o.EquipmentSlot != null) + { + var __equipment_slot = _o.EquipmentSlot.ToArray(); + _equipment_slot = CreateEquipmentSlotVector(builder, __equipment_slot); + } + var _tags = default(VectorOffset); + if (_o.Tags != null) + { + var __tags = _o.Tags.ToArray(); + _tags = CreateTagsVector(builder, __tags); + } + return CreateCharacterExcel( + builder, + _o.Id, + _dev_name, + _o.CostumeGroupId, + _o.IsPlayable, + _o.ProductionStep, + _o.CollectionVisible, + _release_date, + _collection_visible_start_date, + _collection_visible_end_date, + _o.IsPlayableCharacter, + _o.LocalizeEtcId, + _o.Rarity, + _o.IsNpc, + _o.TacticEntityType, + _o.CanSurvive, + _o.IsDummy, + _o.SubPartsCount, + _o.TacticRole, + _o.WeaponType, + _o.TacticRange, + _o.BulletType, + _o.ArmorType, + _o.AimIkType, + _o.School, + _o.Club, + _o.DefaultStarGrade, + _o.MaxStarGrade, + _o.StatLevelUpType, + _o.SquadType, + _o.Jumpable, + _o.PersonalityId, + _o.CharacterAiId, + _o.ExternalBtId, + _o.MainCombatStyleId, + _o.CombatStyleIndex, + _scenario_character, + _o.SpawnTemplateId, + _o.FavorLevelupType, + _equipment_slot, + _o.WeaponLocalizeId, + _o.DisplayEnemyInfo, + _o.BodyRadius, + _o.RandomEffectRadius, + _o.HpBarHide, + _o.HpBarHeight, + _o.HighlightFloaterHeight, + _o.EmojiOffsetX, + _o.EmojiOffsetY, + _o.MoveStartFrame, + _o.MoveEndFrame, + _o.JumpMotionFrame, + _o.AppearFrame, + _o.CanMove, + _o.CanFix, + _o.CanCrowdControl, + _o.CanBattleItemMove, + _o.IsAirUnit, + _o.AirUnitHeight, + _tags, + _o.SecretStoneItemId, + _o.SecretStoneItemAmount, + _o.CharacterPieceItemId, + _o.CharacterPieceItemAmount, + _o.CombineRecipeId); + } } - var _Tags = default(VectorOffset); - if (_o.Tags != null) { - var __Tags = _o.Tags.ToArray(); - _Tags = CreateTagsVector(builder, __Tags); + + public class CharacterExcelT + { + public long Id { get; set; } + public string DevName { get; set; } + public long CostumeGroupId { get; set; } + public bool IsPlayable { get; set; } + public SCHALE.Common.FlatData.ProductionStep ProductionStep { get; set; } + public bool CollectionVisible { get; set; } + public string ReleaseDate { get; set; } + public string CollectionVisibleStartDate { get; set; } + public string CollectionVisibleEndDate { get; set; } + public bool IsPlayableCharacter { get; set; } + public uint LocalizeEtcId { get; set; } + public SCHALE.Common.FlatData.Rarity Rarity { get; set; } + public bool IsNpc { get; set; } + public SCHALE.Common.FlatData.TacticEntityType TacticEntityType { get; set; } + public bool CanSurvive { get; set; } + public bool IsDummy { get; set; } + public int SubPartsCount { get; set; } + public SCHALE.Common.FlatData.TacticRole TacticRole { get; set; } + public SCHALE.Common.FlatData.WeaponType WeaponType { get; set; } + public SCHALE.Common.FlatData.TacticRange TacticRange { get; set; } + public SCHALE.Common.FlatData.BulletType BulletType { get; set; } + public SCHALE.Common.FlatData.ArmorType ArmorType { get; set; } + public SCHALE.Common.FlatData.AimIKType AimIkType { get; set; } + public SCHALE.Common.FlatData.School School { get; set; } + public SCHALE.Common.FlatData.Club Club { get; set; } + public int DefaultStarGrade { get; set; } + public int MaxStarGrade { get; set; } + public SCHALE.Common.FlatData.StatLevelUpType StatLevelUpType { get; set; } + public SCHALE.Common.FlatData.SquadType SquadType { get; set; } + public bool Jumpable { get; set; } + public long PersonalityId { get; set; } + public long CharacterAiId { get; set; } + public long ExternalBtId { get; set; } + public long MainCombatStyleId { get; set; } + public int CombatStyleIndex { get; set; } + public string ScenarioCharacter { get; set; } + public uint SpawnTemplateId { get; set; } + public int FavorLevelupType { get; set; } + public List EquipmentSlot { get; set; } + public uint WeaponLocalizeId { get; set; } + public bool DisplayEnemyInfo { get; set; } + public long BodyRadius { get; set; } + public long RandomEffectRadius { get; set; } + public bool HpBarHide { get; set; } + public float HpBarHeight { get; set; } + public float HighlightFloaterHeight { get; set; } + public float EmojiOffsetX { get; set; } + public float EmojiOffsetY { get; set; } + public int MoveStartFrame { get; set; } + public int MoveEndFrame { get; set; } + public int JumpMotionFrame { get; set; } + public int AppearFrame { get; set; } + public bool CanMove { get; set; } + public bool CanFix { get; set; } + public bool CanCrowdControl { get; set; } + public bool CanBattleItemMove { get; set; } + public bool IsAirUnit { get; set; } + public long AirUnitHeight { get; set; } + public List Tags { get; set; } + public long SecretStoneItemId { get; set; } + public int SecretStoneItemAmount { get; set; } + public long CharacterPieceItemId { get; set; } + public int CharacterPieceItemAmount { get; set; } + public long CombineRecipeId { get; set; } + + public CharacterExcelT() + { + this.Id = 0; + this.DevName = null; + this.CostumeGroupId = 0; + this.IsPlayable = false; + this.ProductionStep = SCHALE.Common.FlatData.ProductionStep.ToDo; + this.CollectionVisible = false; + this.ReleaseDate = null; + this.CollectionVisibleStartDate = null; + this.CollectionVisibleEndDate = null; + this.IsPlayableCharacter = false; + this.LocalizeEtcId = 0; + this.Rarity = SCHALE.Common.FlatData.Rarity.N; + this.IsNpc = false; + this.TacticEntityType = SCHALE.Common.FlatData.TacticEntityType.None; + this.CanSurvive = false; + this.IsDummy = false; + this.SubPartsCount = 0; + this.TacticRole = SCHALE.Common.FlatData.TacticRole.None; + this.WeaponType = SCHALE.Common.FlatData.WeaponType.None; + this.TacticRange = SCHALE.Common.FlatData.TacticRange.Back; + this.BulletType = SCHALE.Common.FlatData.BulletType.Normal; + this.ArmorType = SCHALE.Common.FlatData.ArmorType.LightArmor; + this.AimIkType = SCHALE.Common.FlatData.AimIKType.None; + this.School = SCHALE.Common.FlatData.School.None; + this.Club = SCHALE.Common.FlatData.Club.None; + this.DefaultStarGrade = 0; + this.MaxStarGrade = 0; + this.StatLevelUpType = SCHALE.Common.FlatData.StatLevelUpType.Standard; + this.SquadType = SCHALE.Common.FlatData.SquadType.None; + this.Jumpable = false; + this.PersonalityId = 0; + this.CharacterAiId = 0; + this.ExternalBtId = 0; + this.MainCombatStyleId = 0; + this.CombatStyleIndex = 0; + this.ScenarioCharacter = null; + this.SpawnTemplateId = 0; + this.FavorLevelupType = 0; + this.EquipmentSlot = null; + this.WeaponLocalizeId = 0; + this.DisplayEnemyInfo = false; + this.BodyRadius = 0; + this.RandomEffectRadius = 0; + this.HpBarHide = false; + this.HpBarHeight = 0.0f; + this.HighlightFloaterHeight = 0.0f; + this.EmojiOffsetX = 0.0f; + this.EmojiOffsetY = 0.0f; + this.MoveStartFrame = 0; + this.MoveEndFrame = 0; + this.JumpMotionFrame = 0; + this.AppearFrame = 0; + this.CanMove = false; + this.CanFix = false; + this.CanCrowdControl = false; + this.CanBattleItemMove = false; + this.IsAirUnit = false; + this.AirUnitHeight = 0; + this.Tags = null; + this.SecretStoneItemId = 0; + this.SecretStoneItemAmount = 0; + this.CharacterPieceItemId = 0; + this.CharacterPieceItemAmount = 0; + this.CombineRecipeId = 0; + } } - return CreateCharacterExcel( - builder, - _o.Id, - _DevName, - _o.CostumeGroupId, - _o.IsPlayable, - _o.ProductionStep, - _o.CollectionVisible, - _ReleaseDate, - _CollectionVisibleStartDate, - _CollectionVisibleEndDate, - _o.IsPlayableCharacter, - _o.LocalizeEtcId, - _o.Rarity, - _o.IsNPC, - _o.TacticEntityType, - _o.CanSurvive, - _o.IsDummy, - _o.SubPartsCount, - _o.TacticRole, - _o.WeaponType, - _o.TacticRange, - _o.BulletType, - _o.ArmorType, - _o.AimIKType, - _o.School, - _o.Club, - _o.DefaultStarGrade, - _o.MaxStarGrade, - _o.StatLevelUpType, - _o.SquadType, - _o.Jumpable, - _o.PersonalityId, - _o.CharacterAIId, - _o.ExternalBTId, - _ScenarioCharacter, - _o.SpawnTemplateId, - _o.FavorLevelupType, - _EquipmentSlot, - _o.WeaponLocalizeId, - _o.DisplayEnemyInfo, - _o.BodyRadius, - _o.RandomEffectRadius, - _o.HPBarHide, - _o.HpBarHeight, - _o.HighlightFloaterHeight, - _o.EmojiOffsetX, - _o.EmojiOffsetY, - _o.MoveStartFrame, - _o.MoveEndFrame, - _o.JumpMotionFrame, - _o.AppearFrame, - _o.CanMove, - _o.CanFix, - _o.CanCrowdControl, - _o.CanBattleItemMove, - _o.IsAirUnit, - _o.AirUnitHeight, - _Tags, - _o.SecretStoneItemId, - _o.SecretStoneItemAmount, - _o.CharacterPieceItemId, - _o.CharacterPieceItemAmount, - _o.CombineRecipeId); - } -} - -public class CharacterExcelT -{ - public long Id { get; set; } - public string DevName { get; set; } - public long CostumeGroupId { get; set; } - public bool IsPlayable { get; set; } - public SCHALE.Common.FlatData.ProductionStep ProductionStep { get; set; } - public bool CollectionVisible { get; set; } - public string ReleaseDate { get; set; } - public string CollectionVisibleStartDate { get; set; } - public string CollectionVisibleEndDate { get; set; } - public bool IsPlayableCharacter { get; set; } - public uint LocalizeEtcId { get; set; } - public SCHALE.Common.FlatData.Rarity Rarity { get; set; } - public bool IsNPC { get; set; } - public SCHALE.Common.FlatData.TacticEntityType TacticEntityType { get; set; } - public bool CanSurvive { get; set; } - public bool IsDummy { get; set; } - public int SubPartsCount { get; set; } - public SCHALE.Common.FlatData.TacticRole TacticRole { get; set; } - public SCHALE.Common.FlatData.WeaponType WeaponType { get; set; } - public SCHALE.Common.FlatData.TacticRange TacticRange { get; set; } - public SCHALE.Common.FlatData.BulletType BulletType { get; set; } - public SCHALE.Common.FlatData.ArmorType ArmorType { get; set; } - public SCHALE.Common.FlatData.AimIKType AimIKType { get; set; } - public SCHALE.Common.FlatData.School School { get; set; } - public SCHALE.Common.FlatData.Club Club { get; set; } - public int DefaultStarGrade { get; set; } - public int MaxStarGrade { get; set; } - public SCHALE.Common.FlatData.StatLevelUpType StatLevelUpType { get; set; } - public SCHALE.Common.FlatData.SquadType SquadType { get; set; } - public bool Jumpable { get; set; } - public long PersonalityId { get; set; } - public long CharacterAIId { get; set; } - public long ExternalBTId { get; set; } - public string ScenarioCharacter { get; set; } - public uint SpawnTemplateId { get; set; } - public int FavorLevelupType { get; set; } - public List EquipmentSlot { get; set; } - public uint WeaponLocalizeId { get; set; } - public bool DisplayEnemyInfo { get; set; } - public long BodyRadius { get; set; } - public long RandomEffectRadius { get; set; } - public bool HPBarHide { get; set; } - public float HpBarHeight { get; set; } - public float HighlightFloaterHeight { get; set; } - public float EmojiOffsetX { get; set; } - public float EmojiOffsetY { get; set; } - public int MoveStartFrame { get; set; } - public int MoveEndFrame { get; set; } - public int JumpMotionFrame { get; set; } - public int AppearFrame { get; set; } - public bool CanMove { get; set; } - public bool CanFix { get; set; } - public bool CanCrowdControl { get; set; } - public bool CanBattleItemMove { get; set; } - public bool IsAirUnit { get; set; } - public long AirUnitHeight { get; set; } - public List Tags { get; set; } - public long SecretStoneItemId { get; set; } - public int SecretStoneItemAmount { get; set; } - public long CharacterPieceItemId { get; set; } - public int CharacterPieceItemAmount { get; set; } - public long CombineRecipeId { get; set; } - - public CharacterExcelT() { - this.Id = 0; - this.DevName = null; - this.CostumeGroupId = 0; - this.IsPlayable = false; - this.ProductionStep = SCHALE.Common.FlatData.ProductionStep.ToDo; - this.CollectionVisible = false; - this.ReleaseDate = null; - this.CollectionVisibleStartDate = null; - this.CollectionVisibleEndDate = null; - this.IsPlayableCharacter = false; - this.LocalizeEtcId = 0; - this.Rarity = SCHALE.Common.FlatData.Rarity.N; - this.IsNPC = false; - this.TacticEntityType = SCHALE.Common.FlatData.TacticEntityType.None; - this.CanSurvive = false; - this.IsDummy = false; - this.SubPartsCount = 0; - this.TacticRole = SCHALE.Common.FlatData.TacticRole.None; - this.WeaponType = SCHALE.Common.FlatData.WeaponType.None; - this.TacticRange = SCHALE.Common.FlatData.TacticRange.Back; - this.BulletType = SCHALE.Common.FlatData.BulletType.Normal; - this.ArmorType = SCHALE.Common.FlatData.ArmorType.LightArmor; - this.AimIKType = SCHALE.Common.FlatData.AimIKType.None; - this.School = SCHALE.Common.FlatData.School.None; - this.Club = SCHALE.Common.FlatData.Club.None; - this.DefaultStarGrade = 0; - this.MaxStarGrade = 0; - this.StatLevelUpType = SCHALE.Common.FlatData.StatLevelUpType.Standard; - this.SquadType = SCHALE.Common.FlatData.SquadType.None; - this.Jumpable = false; - this.PersonalityId = 0; - this.CharacterAIId = 0; - this.ExternalBTId = 0; - this.ScenarioCharacter = null; - this.SpawnTemplateId = 0; - this.FavorLevelupType = 0; - this.EquipmentSlot = null; - this.WeaponLocalizeId = 0; - this.DisplayEnemyInfo = false; - this.BodyRadius = 0; - this.RandomEffectRadius = 0; - this.HPBarHide = false; - this.HpBarHeight = 0.0f; - this.HighlightFloaterHeight = 0.0f; - this.EmojiOffsetX = 0.0f; - this.EmojiOffsetY = 0.0f; - this.MoveStartFrame = 0; - this.MoveEndFrame = 0; - this.JumpMotionFrame = 0; - this.AppearFrame = 0; - this.CanMove = false; - this.CanFix = false; - this.CanCrowdControl = false; - this.CanBattleItemMove = false; - this.IsAirUnit = false; - this.AirUnitHeight = 0; - this.Tags = null; - this.SecretStoneItemId = 0; - this.SecretStoneItemAmount = 0; - this.CharacterPieceItemId = 0; - this.CharacterPieceItemAmount = 0; - this.CombineRecipeId = 0; - } -} -static public class CharacterExcelVerify -{ - static public bool Verify(Google.FlatBuffers.Verifier verifier, uint tablePos) - { - return verifier.VerifyTableStart(tablePos) - && verifier.VerifyField(tablePos, 4 /*Id*/, 8 /*long*/, 8, false) - && verifier.VerifyString(tablePos, 6 /*DevName*/, false) - && verifier.VerifyField(tablePos, 8 /*CostumeGroupId*/, 8 /*long*/, 8, false) - && verifier.VerifyField(tablePos, 10 /*IsPlayable*/, 1 /*bool*/, 1, false) - && verifier.VerifyField(tablePos, 12 /*ProductionStep*/, 4 /*SCHALE.Common.FlatData.ProductionStep*/, 4, false) - && verifier.VerifyField(tablePos, 14 /*CollectionVisible*/, 1 /*bool*/, 1, false) - && verifier.VerifyString(tablePos, 16 /*ReleaseDate*/, false) - && verifier.VerifyString(tablePos, 18 /*CollectionVisibleStartDate*/, false) - && verifier.VerifyString(tablePos, 20 /*CollectionVisibleEndDate*/, false) - && verifier.VerifyField(tablePos, 22 /*IsPlayableCharacter*/, 1 /*bool*/, 1, false) - && verifier.VerifyField(tablePos, 24 /*LocalizeEtcId*/, 4 /*uint*/, 4, false) - && verifier.VerifyField(tablePos, 26 /*Rarity*/, 4 /*SCHALE.Common.FlatData.Rarity*/, 4, false) - && verifier.VerifyField(tablePos, 28 /*IsNPC*/, 1 /*bool*/, 1, false) - && verifier.VerifyField(tablePos, 30 /*TacticEntityType*/, 4 /*SCHALE.Common.FlatData.TacticEntityType*/, 4, false) - && verifier.VerifyField(tablePos, 32 /*CanSurvive*/, 1 /*bool*/, 1, false) - && verifier.VerifyField(tablePos, 34 /*IsDummy*/, 1 /*bool*/, 1, false) - && verifier.VerifyField(tablePos, 36 /*SubPartsCount*/, 4 /*int*/, 4, false) - && verifier.VerifyField(tablePos, 38 /*TacticRole*/, 4 /*SCHALE.Common.FlatData.TacticRole*/, 4, false) - && verifier.VerifyField(tablePos, 40 /*WeaponType*/, 4 /*SCHALE.Common.FlatData.WeaponType*/, 4, false) - && verifier.VerifyField(tablePos, 42 /*TacticRange*/, 4 /*SCHALE.Common.FlatData.TacticRange*/, 4, false) - && verifier.VerifyField(tablePos, 44 /*BulletType*/, 4 /*SCHALE.Common.FlatData.BulletType*/, 4, false) - && verifier.VerifyField(tablePos, 46 /*ArmorType*/, 4 /*SCHALE.Common.FlatData.ArmorType*/, 4, false) - && verifier.VerifyField(tablePos, 48 /*AimIKType*/, 4 /*SCHALE.Common.FlatData.AimIKType*/, 4, false) - && verifier.VerifyField(tablePos, 50 /*School*/, 4 /*SCHALE.Common.FlatData.School*/, 4, false) - && verifier.VerifyField(tablePos, 52 /*Club*/, 4 /*SCHALE.Common.FlatData.Club*/, 4, false) - && verifier.VerifyField(tablePos, 54 /*DefaultStarGrade*/, 4 /*int*/, 4, false) - && verifier.VerifyField(tablePos, 56 /*MaxStarGrade*/, 4 /*int*/, 4, false) - && verifier.VerifyField(tablePos, 58 /*StatLevelUpType*/, 4 /*SCHALE.Common.FlatData.StatLevelUpType*/, 4, false) - && verifier.VerifyField(tablePos, 60 /*SquadType*/, 4 /*SCHALE.Common.FlatData.SquadType*/, 4, false) - && verifier.VerifyField(tablePos, 62 /*Jumpable*/, 1 /*bool*/, 1, false) - && verifier.VerifyField(tablePos, 64 /*PersonalityId*/, 8 /*long*/, 8, false) - && verifier.VerifyField(tablePos, 66 /*CharacterAIId*/, 8 /*long*/, 8, false) - && verifier.VerifyField(tablePos, 68 /*ExternalBTId*/, 8 /*long*/, 8, false) - && verifier.VerifyString(tablePos, 70 /*ScenarioCharacter*/, false) - && verifier.VerifyField(tablePos, 72 /*SpawnTemplateId*/, 4 /*uint*/, 4, false) - && verifier.VerifyField(tablePos, 74 /*FavorLevelupType*/, 4 /*int*/, 4, false) - && verifier.VerifyVectorOfData(tablePos, 76 /*EquipmentSlot*/, 4 /*SCHALE.Common.FlatData.EquipmentCategory*/, false) - && verifier.VerifyField(tablePos, 78 /*WeaponLocalizeId*/, 4 /*uint*/, 4, false) - && verifier.VerifyField(tablePos, 80 /*DisplayEnemyInfo*/, 1 /*bool*/, 1, false) - && verifier.VerifyField(tablePos, 82 /*BodyRadius*/, 8 /*long*/, 8, false) - && verifier.VerifyField(tablePos, 84 /*RandomEffectRadius*/, 8 /*long*/, 8, false) - && verifier.VerifyField(tablePos, 86 /*HPBarHide*/, 1 /*bool*/, 1, false) - && verifier.VerifyField(tablePos, 88 /*HpBarHeight*/, 4 /*float*/, 4, false) - && verifier.VerifyField(tablePos, 90 /*HighlightFloaterHeight*/, 4 /*float*/, 4, false) - && verifier.VerifyField(tablePos, 92 /*EmojiOffsetX*/, 4 /*float*/, 4, false) - && verifier.VerifyField(tablePos, 94 /*EmojiOffsetY*/, 4 /*float*/, 4, false) - && verifier.VerifyField(tablePos, 96 /*MoveStartFrame*/, 4 /*int*/, 4, false) - && verifier.VerifyField(tablePos, 98 /*MoveEndFrame*/, 4 /*int*/, 4, false) - && verifier.VerifyField(tablePos, 100 /*JumpMotionFrame*/, 4 /*int*/, 4, false) - && verifier.VerifyField(tablePos, 102 /*AppearFrame*/, 4 /*int*/, 4, false) - && verifier.VerifyField(tablePos, 104 /*CanMove*/, 1 /*bool*/, 1, false) - && verifier.VerifyField(tablePos, 106 /*CanFix*/, 1 /*bool*/, 1, false) - && verifier.VerifyField(tablePos, 108 /*CanCrowdControl*/, 1 /*bool*/, 1, false) - && verifier.VerifyField(tablePos, 110 /*CanBattleItemMove*/, 1 /*bool*/, 1, false) - && verifier.VerifyField(tablePos, 112 /*IsAirUnit*/, 1 /*bool*/, 1, false) - && verifier.VerifyField(tablePos, 114 /*AirUnitHeight*/, 8 /*long*/, 8, false) - && verifier.VerifyVectorOfData(tablePos, 116 /*Tags*/, 4 /*SCHALE.Common.FlatData.Tag*/, false) - && verifier.VerifyField(tablePos, 118 /*SecretStoneItemId*/, 8 /*long*/, 8, false) - && verifier.VerifyField(tablePos, 120 /*SecretStoneItemAmount*/, 4 /*int*/, 4, false) - && verifier.VerifyField(tablePos, 122 /*CharacterPieceItemId*/, 8 /*long*/, 8, false) - && verifier.VerifyField(tablePos, 124 /*CharacterPieceItemAmount*/, 4 /*int*/, 4, false) - && verifier.VerifyField(tablePos, 126 /*CombineRecipeId*/, 8 /*long*/, 8, false) - && verifier.VerifyTableEnd(tablePos); - } -} + static public class CharacterExcelVerify + { + static public bool Verify(Google.FlatBuffers.Verifier verifier, uint tablePos) + { + return verifier.VerifyTableStart(tablePos) + && verifier.VerifyField(tablePos, 4 /*Id*/, 8 /*long*/, 8, false) + && verifier.VerifyString(tablePos, 6 /*DevName*/, false) + && verifier.VerifyField(tablePos, 8 /*CostumeGroupId*/, 8 /*long*/, 8, false) + && verifier.VerifyField(tablePos, 10 /*IsPlayable*/, 1 /*bool*/, 1, false) + && verifier.VerifyField(tablePos, 12 /*ProductionStep*/, 4 /*SCHALE.Common.FlatData.ProductionStep*/, 4, false) + && verifier.VerifyField(tablePos, 14 /*CollectionVisible*/, 1 /*bool*/, 1, false) + && verifier.VerifyString(tablePos, 16 /*ReleaseDate*/, false) + && verifier.VerifyString(tablePos, 18 /*CollectionVisibleStartDate*/, false) + && verifier.VerifyString(tablePos, 20 /*CollectionVisibleEndDate*/, false) + && verifier.VerifyField(tablePos, 22 /*IsPlayableCharacter*/, 1 /*bool*/, 1, false) + && verifier.VerifyField(tablePos, 24 /*LocalizeEtcId*/, 4 /*uint*/, 4, false) + && verifier.VerifyField(tablePos, 26 /*Rarity*/, 4 /*SCHALE.Common.FlatData.Rarity*/, 4, false) + && verifier.VerifyField(tablePos, 28 /*IsNpc*/, 1 /*bool*/, 1, false) + && verifier.VerifyField(tablePos, 30 /*TacticEntityType*/, 4 /*SCHALE.Common.FlatData.TacticEntityType*/, 4, false) + && verifier.VerifyField(tablePos, 32 /*CanSurvive*/, 1 /*bool*/, 1, false) + && verifier.VerifyField(tablePos, 34 /*IsDummy*/, 1 /*bool*/, 1, false) + && verifier.VerifyField(tablePos, 36 /*SubPartsCount*/, 4 /*int*/, 4, false) + && verifier.VerifyField(tablePos, 38 /*TacticRole*/, 4 /*SCHALE.Common.FlatData.TacticRole*/, 4, false) + && verifier.VerifyField(tablePos, 40 /*WeaponType*/, 4 /*SCHALE.Common.FlatData.WeaponType*/, 4, false) + && verifier.VerifyField(tablePos, 42 /*TacticRange*/, 4 /*SCHALE.Common.FlatData.TacticRange*/, 4, false) + && verifier.VerifyField(tablePos, 44 /*BulletType*/, 4 /*SCHALE.Common.FlatData.BulletType*/, 4, false) + && verifier.VerifyField(tablePos, 46 /*ArmorType*/, 4 /*SCHALE.Common.FlatData.ArmorType*/, 4, false) + && verifier.VerifyField(tablePos, 48 /*AimIkType*/, 4 /*SCHALE.Common.FlatData.AimIKType*/, 4, false) + && verifier.VerifyField(tablePos, 50 /*School*/, 4 /*SCHALE.Common.FlatData.School*/, 4, false) + && verifier.VerifyField(tablePos, 52 /*Club*/, 4 /*SCHALE.Common.FlatData.Club*/, 4, false) + && verifier.VerifyField(tablePos, 54 /*DefaultStarGrade*/, 4 /*int*/, 4, false) + && verifier.VerifyField(tablePos, 56 /*MaxStarGrade*/, 4 /*int*/, 4, false) + && verifier.VerifyField(tablePos, 58 /*StatLevelUpType*/, 4 /*SCHALE.Common.FlatData.StatLevelUpType*/, 4, false) + && verifier.VerifyField(tablePos, 60 /*SquadType*/, 4 /*SCHALE.Common.FlatData.SquadType*/, 4, false) + && verifier.VerifyField(tablePos, 62 /*Jumpable*/, 1 /*bool*/, 1, false) + && verifier.VerifyField(tablePos, 64 /*PersonalityId*/, 8 /*long*/, 8, false) + && verifier.VerifyField(tablePos, 66 /*CharacterAiId*/, 8 /*long*/, 8, false) + && verifier.VerifyField(tablePos, 68 /*ExternalBtId*/, 8 /*long*/, 8, false) + && verifier.VerifyField(tablePos, 70 /*MainCombatStyleId*/, 8 /*long*/, 8, false) + && verifier.VerifyField(tablePos, 72 /*CombatStyleIndex*/, 4 /*int*/, 4, false) + && verifier.VerifyString(tablePos, 74 /*ScenarioCharacter*/, false) + && verifier.VerifyField(tablePos, 76 /*SpawnTemplateId*/, 4 /*uint*/, 4, false) + && verifier.VerifyField(tablePos, 78 /*FavorLevelupType*/, 4 /*int*/, 4, false) + && verifier.VerifyVectorOfData(tablePos, 80 /*EquipmentSlot*/, 4 /*SCHALE.Common.FlatData.EquipmentCategory*/, false) + && verifier.VerifyField(tablePos, 82 /*WeaponLocalizeId*/, 4 /*uint*/, 4, false) + && verifier.VerifyField(tablePos, 84 /*DisplayEnemyInfo*/, 1 /*bool*/, 1, false) + && verifier.VerifyField(tablePos, 86 /*BodyRadius*/, 8 /*long*/, 8, false) + && verifier.VerifyField(tablePos, 88 /*RandomEffectRadius*/, 8 /*long*/, 8, false) + && verifier.VerifyField(tablePos, 90 /*HpBarHide*/, 1 /*bool*/, 1, false) + && verifier.VerifyField(tablePos, 92 /*HpBarHeight*/, 4 /*float*/, 4, false) + && verifier.VerifyField(tablePos, 94 /*HighlightFloaterHeight*/, 4 /*float*/, 4, false) + && verifier.VerifyField(tablePos, 96 /*EmojiOffsetX*/, 4 /*float*/, 4, false) + && verifier.VerifyField(tablePos, 98 /*EmojiOffsetY*/, 4 /*float*/, 4, false) + && verifier.VerifyField(tablePos, 100 /*MoveStartFrame*/, 4 /*int*/, 4, false) + && verifier.VerifyField(tablePos, 102 /*MoveEndFrame*/, 4 /*int*/, 4, false) + && verifier.VerifyField(tablePos, 104 /*JumpMotionFrame*/, 4 /*int*/, 4, false) + && verifier.VerifyField(tablePos, 106 /*AppearFrame*/, 4 /*int*/, 4, false) + && verifier.VerifyField(tablePos, 108 /*CanMove*/, 1 /*bool*/, 1, false) + && verifier.VerifyField(tablePos, 110 /*CanFix*/, 1 /*bool*/, 1, false) + && verifier.VerifyField(tablePos, 112 /*CanCrowdControl*/, 1 /*bool*/, 1, false) + && verifier.VerifyField(tablePos, 114 /*CanBattleItemMove*/, 1 /*bool*/, 1, false) + && verifier.VerifyField(tablePos, 116 /*IsAirUnit*/, 1 /*bool*/, 1, false) + && verifier.VerifyField(tablePos, 118 /*AirUnitHeight*/, 8 /*long*/, 8, false) + && verifier.VerifyVectorOfData(tablePos, 120 /*Tags*/, 4 /*SCHALE.Common.FlatData.Tag*/, false) + && verifier.VerifyField(tablePos, 122 /*SecretStoneItemId*/, 8 /*long*/, 8, false) + && verifier.VerifyField(tablePos, 124 /*SecretStoneItemAmount*/, 4 /*int*/, 4, false) + && verifier.VerifyField(tablePos, 126 /*CharacterPieceItemId*/, 8 /*long*/, 8, false) + && verifier.VerifyField(tablePos, 128 /*CharacterPieceItemAmount*/, 4 /*int*/, 4, false) + && verifier.VerifyField(tablePos, 130 /*CombineRecipeId*/, 8 /*long*/, 8, false) + && verifier.VerifyTableEnd(tablePos); + } + } } diff --git a/SCHALE.Common/FlatData/CharacterExcelTable.cs b/SCHALE.Common/FlatData/CharacterExcelTable.cs index 2c0213a..9e202f1 100644 --- a/SCHALE.Common/FlatData/CharacterExcelTable.cs +++ b/SCHALE.Common/FlatData/CharacterExcelTable.cs @@ -24,9 +24,9 @@ public struct CharacterExcelTable : IFlatbufferObject public int DataListLength { get { int o = __p.__offset(4); return o != 0 ? __p.__vector_len(o) : 0; } } public static Offset CreateCharacterExcelTable(FlatBufferBuilder builder, - VectorOffset DataListOffset = default(VectorOffset)) { + VectorOffset data_listOffset = default(VectorOffset)) { builder.StartTable(1); - CharacterExcelTable.AddDataList(builder, DataListOffset); + CharacterExcelTable.AddDataList(builder, data_listOffset); return CharacterExcelTable.EndCharacterExcelTable(builder); } @@ -53,15 +53,15 @@ public struct CharacterExcelTable : IFlatbufferObject } public static Offset Pack(FlatBufferBuilder builder, CharacterExcelTableT _o) { if (_o == null) return default(Offset); - var _DataList = default(VectorOffset); + var _data_list = default(VectorOffset); if (_o.DataList != null) { - var __DataList = new Offset[_o.DataList.Count]; - for (var _j = 0; _j < __DataList.Length; ++_j) { __DataList[_j] = SCHALE.Common.FlatData.CharacterExcel.Pack(builder, _o.DataList[_j]); } - _DataList = CreateDataListVector(builder, __DataList); + var __data_list = new Offset[_o.DataList.Count]; + for (var _j = 0; _j < __data_list.Length; ++_j) { __data_list[_j] = SCHALE.Common.FlatData.CharacterExcel.Pack(builder, _o.DataList[_j]); } + _data_list = CreateDataListVector(builder, __data_list); } return CreateCharacterExcelTable( builder, - _DataList); + _data_list); } } diff --git a/SCHALE.Common/FlatData/CharacterGearExcel.cs b/SCHALE.Common/FlatData/CharacterGearExcel.cs index b3b0f93..9b78578 100644 --- a/SCHALE.Common/FlatData/CharacterGearExcel.cs +++ b/SCHALE.Common/FlatData/CharacterGearExcel.cs @@ -22,7 +22,7 @@ public struct CharacterGearExcel : IFlatbufferObject public long Id { get { int o = __p.__offset(4); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public long CharacterId { get { int o = __p.__offset(6); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } - public SCHALE.Common.FlatData.StatLevelUpType StatLevelUpType { get { int o = __p.__offset(8); return o != 0 ? (SCHALE.Common.FlatData.StatLevelUpType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.StatLevelUpType.Standard; } } + public SCHALE.Common.FlatData.StatLevelUpType StatLevelUpType_ { get { int o = __p.__offset(8); return o != 0 ? (SCHALE.Common.FlatData.StatLevelUpType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.StatLevelUpType.Standard; } } public long Tier { get { int o = __p.__offset(10); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public long NextTierEquipment { get { int o = __p.__offset(12); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public long RecipeId { get { int o = __p.__offset(14); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } @@ -79,7 +79,7 @@ public struct CharacterGearExcel : IFlatbufferObject public static Offset CreateCharacterGearExcel(FlatBufferBuilder builder, long Id = 0, long CharacterId = 0, - SCHALE.Common.FlatData.StatLevelUpType StatLevelUpType = SCHALE.Common.FlatData.StatLevelUpType.Standard, + SCHALE.Common.FlatData.StatLevelUpType StatLevelUpType_ = SCHALE.Common.FlatData.StatLevelUpType.Standard, long Tier = 0, long NextTierEquipment = 0, long RecipeId = 0, @@ -107,14 +107,14 @@ public struct CharacterGearExcel : IFlatbufferObject CharacterGearExcel.AddMinStatValue(builder, MinStatValueOffset); CharacterGearExcel.AddStatType(builder, StatTypeOffset); CharacterGearExcel.AddLearnSkillSlot(builder, LearnSkillSlotOffset); - CharacterGearExcel.AddStatLevelUpType(builder, StatLevelUpType); + CharacterGearExcel.AddStatLevelUpType_(builder, StatLevelUpType_); return CharacterGearExcel.EndCharacterGearExcel(builder); } public static void StartCharacterGearExcel(FlatBufferBuilder builder) { builder.StartTable(15); } public static void AddId(FlatBufferBuilder builder, long id) { builder.AddLong(0, id, 0); } public static void AddCharacterId(FlatBufferBuilder builder, long characterId) { builder.AddLong(1, characterId, 0); } - public static void AddStatLevelUpType(FlatBufferBuilder builder, SCHALE.Common.FlatData.StatLevelUpType statLevelUpType) { builder.AddInt(2, (int)statLevelUpType, 0); } + public static void AddStatLevelUpType_(FlatBufferBuilder builder, SCHALE.Common.FlatData.StatLevelUpType statLevelUpType_) { builder.AddInt(2, (int)statLevelUpType_, 0); } public static void AddTier(FlatBufferBuilder builder, long tier) { builder.AddLong(3, tier, 0); } public static void AddNextTierEquipment(FlatBufferBuilder builder, long nextTierEquipment) { builder.AddLong(4, nextTierEquipment, 0); } public static void AddRecipeId(FlatBufferBuilder builder, long recipeId) { builder.AddLong(5, recipeId, 0); } @@ -160,7 +160,7 @@ public struct CharacterGearExcel : IFlatbufferObject byte[] key = TableEncryptionService.CreateKey("CharacterGear"); _o.Id = TableEncryptionService.Convert(this.Id, key); _o.CharacterId = TableEncryptionService.Convert(this.CharacterId, key); - _o.StatLevelUpType = TableEncryptionService.Convert(this.StatLevelUpType, key); + _o.StatLevelUpType_ = TableEncryptionService.Convert(this.StatLevelUpType_, key); _o.Tier = TableEncryptionService.Convert(this.Tier, key); _o.NextTierEquipment = TableEncryptionService.Convert(this.NextTierEquipment, key); _o.RecipeId = TableEncryptionService.Convert(this.RecipeId, key); @@ -206,7 +206,7 @@ public struct CharacterGearExcel : IFlatbufferObject builder, _o.Id, _o.CharacterId, - _o.StatLevelUpType, + _o.StatLevelUpType_, _o.Tier, _o.NextTierEquipment, _o.RecipeId, @@ -226,7 +226,7 @@ public class CharacterGearExcelT { public long Id { get; set; } public long CharacterId { get; set; } - public SCHALE.Common.FlatData.StatLevelUpType StatLevelUpType { get; set; } + public SCHALE.Common.FlatData.StatLevelUpType StatLevelUpType_ { get; set; } public long Tier { get; set; } public long NextTierEquipment { get; set; } public long RecipeId { get; set; } @@ -243,7 +243,7 @@ public class CharacterGearExcelT public CharacterGearExcelT() { this.Id = 0; this.CharacterId = 0; - this.StatLevelUpType = SCHALE.Common.FlatData.StatLevelUpType.Standard; + this.StatLevelUpType_ = SCHALE.Common.FlatData.StatLevelUpType.Standard; this.Tier = 0; this.NextTierEquipment = 0; this.RecipeId = 0; @@ -267,7 +267,7 @@ static public class CharacterGearExcelVerify return verifier.VerifyTableStart(tablePos) && verifier.VerifyField(tablePos, 4 /*Id*/, 8 /*long*/, 8, false) && verifier.VerifyField(tablePos, 6 /*CharacterId*/, 8 /*long*/, 8, false) - && verifier.VerifyField(tablePos, 8 /*StatLevelUpType*/, 4 /*SCHALE.Common.FlatData.StatLevelUpType*/, 4, false) + && verifier.VerifyField(tablePos, 8 /*StatLevelUpType_*/, 4 /*SCHALE.Common.FlatData.StatLevelUpType*/, 4, false) && verifier.VerifyField(tablePos, 10 /*Tier*/, 8 /*long*/, 8, false) && verifier.VerifyField(tablePos, 12 /*NextTierEquipment*/, 8 /*long*/, 8, false) && verifier.VerifyField(tablePos, 14 /*RecipeId*/, 8 /*long*/, 8, false) diff --git a/SCHALE.Common/FlatData/CharacterPotentialExcel.cs b/SCHALE.Common/FlatData/CharacterPotentialExcel.cs index 352a0bc..93bf00f 100644 --- a/SCHALE.Common/FlatData/CharacterPotentialExcel.cs +++ b/SCHALE.Common/FlatData/CharacterPotentialExcel.cs @@ -22,18 +22,18 @@ public struct CharacterPotentialExcel : IFlatbufferObject public long Id { get { int o = __p.__offset(4); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public long PotentialStatGroupId { get { int o = __p.__offset(6); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } - public SCHALE.Common.FlatData.PotentialStatBonusRateType PotentialStatBonusRateType { get { int o = __p.__offset(8); return o != 0 ? (SCHALE.Common.FlatData.PotentialStatBonusRateType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.PotentialStatBonusRateType.None; } } + public SCHALE.Common.FlatData.PotentialStatBonusRateType PotentialStatBonusRateType_ { get { int o = __p.__offset(8); return o != 0 ? (SCHALE.Common.FlatData.PotentialStatBonusRateType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.PotentialStatBonusRateType.None; } } public bool IsUnnecessaryStat { get { int o = __p.__offset(10); return o != 0 ? 0!=__p.bb.Get(o + __p.bb_pos) : (bool)false; } } public static Offset CreateCharacterPotentialExcel(FlatBufferBuilder builder, long Id = 0, long PotentialStatGroupId = 0, - SCHALE.Common.FlatData.PotentialStatBonusRateType PotentialStatBonusRateType = SCHALE.Common.FlatData.PotentialStatBonusRateType.None, + SCHALE.Common.FlatData.PotentialStatBonusRateType PotentialStatBonusRateType_ = SCHALE.Common.FlatData.PotentialStatBonusRateType.None, bool IsUnnecessaryStat = false) { builder.StartTable(4); CharacterPotentialExcel.AddPotentialStatGroupId(builder, PotentialStatGroupId); CharacterPotentialExcel.AddId(builder, Id); - CharacterPotentialExcel.AddPotentialStatBonusRateType(builder, PotentialStatBonusRateType); + CharacterPotentialExcel.AddPotentialStatBonusRateType_(builder, PotentialStatBonusRateType_); CharacterPotentialExcel.AddIsUnnecessaryStat(builder, IsUnnecessaryStat); return CharacterPotentialExcel.EndCharacterPotentialExcel(builder); } @@ -41,7 +41,7 @@ public struct CharacterPotentialExcel : IFlatbufferObject public static void StartCharacterPotentialExcel(FlatBufferBuilder builder) { builder.StartTable(4); } public static void AddId(FlatBufferBuilder builder, long id) { builder.AddLong(0, id, 0); } public static void AddPotentialStatGroupId(FlatBufferBuilder builder, long potentialStatGroupId) { builder.AddLong(1, potentialStatGroupId, 0); } - public static void AddPotentialStatBonusRateType(FlatBufferBuilder builder, SCHALE.Common.FlatData.PotentialStatBonusRateType potentialStatBonusRateType) { builder.AddInt(2, (int)potentialStatBonusRateType, 0); } + public static void AddPotentialStatBonusRateType_(FlatBufferBuilder builder, SCHALE.Common.FlatData.PotentialStatBonusRateType potentialStatBonusRateType_) { builder.AddInt(2, (int)potentialStatBonusRateType_, 0); } public static void AddIsUnnecessaryStat(FlatBufferBuilder builder, bool isUnnecessaryStat) { builder.AddBool(3, isUnnecessaryStat, false); } public static Offset EndCharacterPotentialExcel(FlatBufferBuilder builder) { int o = builder.EndTable(); @@ -56,7 +56,7 @@ public struct CharacterPotentialExcel : IFlatbufferObject byte[] key = TableEncryptionService.CreateKey("CharacterPotential"); _o.Id = TableEncryptionService.Convert(this.Id, key); _o.PotentialStatGroupId = TableEncryptionService.Convert(this.PotentialStatGroupId, key); - _o.PotentialStatBonusRateType = TableEncryptionService.Convert(this.PotentialStatBonusRateType, key); + _o.PotentialStatBonusRateType_ = TableEncryptionService.Convert(this.PotentialStatBonusRateType_, key); _o.IsUnnecessaryStat = TableEncryptionService.Convert(this.IsUnnecessaryStat, key); } public static Offset Pack(FlatBufferBuilder builder, CharacterPotentialExcelT _o) { @@ -65,7 +65,7 @@ public struct CharacterPotentialExcel : IFlatbufferObject builder, _o.Id, _o.PotentialStatGroupId, - _o.PotentialStatBonusRateType, + _o.PotentialStatBonusRateType_, _o.IsUnnecessaryStat); } } @@ -74,13 +74,13 @@ public class CharacterPotentialExcelT { public long Id { get; set; } public long PotentialStatGroupId { get; set; } - public SCHALE.Common.FlatData.PotentialStatBonusRateType PotentialStatBonusRateType { get; set; } + public SCHALE.Common.FlatData.PotentialStatBonusRateType PotentialStatBonusRateType_ { get; set; } public bool IsUnnecessaryStat { get; set; } public CharacterPotentialExcelT() { this.Id = 0; this.PotentialStatGroupId = 0; - this.PotentialStatBonusRateType = SCHALE.Common.FlatData.PotentialStatBonusRateType.None; + this.PotentialStatBonusRateType_ = SCHALE.Common.FlatData.PotentialStatBonusRateType.None; this.IsUnnecessaryStat = false; } } @@ -93,7 +93,7 @@ static public class CharacterPotentialExcelVerify return verifier.VerifyTableStart(tablePos) && verifier.VerifyField(tablePos, 4 /*Id*/, 8 /*long*/, 8, false) && verifier.VerifyField(tablePos, 6 /*PotentialStatGroupId*/, 8 /*long*/, 8, false) - && verifier.VerifyField(tablePos, 8 /*PotentialStatBonusRateType*/, 4 /*SCHALE.Common.FlatData.PotentialStatBonusRateType*/, 4, false) + && verifier.VerifyField(tablePos, 8 /*PotentialStatBonusRateType_*/, 4 /*SCHALE.Common.FlatData.PotentialStatBonusRateType*/, 4, false) && verifier.VerifyField(tablePos, 10 /*IsUnnecessaryStat*/, 1 /*bool*/, 1, false) && verifier.VerifyTableEnd(tablePos); } diff --git a/SCHALE.Common/FlatData/CharacterSkillListExcel.cs b/SCHALE.Common/FlatData/CharacterSkillListExcel.cs index f7b7d2f..c948bdb 100644 --- a/SCHALE.Common/FlatData/CharacterSkillListExcel.cs +++ b/SCHALE.Common/FlatData/CharacterSkillListExcel.cs @@ -26,7 +26,7 @@ public struct CharacterSkillListExcel : IFlatbufferObject public int FormIndex { get { int o = __p.__offset(10); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } public bool IsRootMotion { get { int o = __p.__offset(12); return o != 0 ? 0!=__p.bb.Get(o + __p.bb_pos) : (bool)false; } } public bool IsMoveLeftRight { get { int o = __p.__offset(14); return o != 0 ? 0!=__p.bb.Get(o + __p.bb_pos) : (bool)false; } } - public bool UseRandomAnimation { get { int o = __p.__offset(16); return o != 0 ? 0!=__p.bb.Get(o + __p.bb_pos) : (bool)false; } } + public bool UseRandomExSkillTimeline { get { int o = __p.__offset(16); return o != 0 ? 0!=__p.bb.Get(o + __p.bb_pos) : (bool)false; } } public long TSAInteractionId { get { int o = __p.__offset(18); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public string NormalSkillGroupId(int j) { int o = __p.__offset(20); return o != 0 ? __p.__string(__p.__vector(o) + j * 4) : null; } public int NormalSkillGroupIdLength { get { int o = __p.__offset(20); return o != 0 ? __p.__vector_len(o) : 0; } } @@ -40,32 +40,28 @@ public struct CharacterSkillListExcel : IFlatbufferObject public int[] GetNormalSkillTimeLineIndexArray() { return __p.__vector_as_array(22); } public string ExSkillGroupId(int j) { int o = __p.__offset(24); return o != 0 ? __p.__string(__p.__vector(o) + j * 4) : null; } public int ExSkillGroupIdLength { get { int o = __p.__offset(24); return o != 0 ? __p.__vector_len(o) : 0; } } - public int ExSkillTimeLineIndex(int j) { int o = __p.__offset(26); return o != 0 ? __p.bb.GetInt(__p.__vector(o) + j * 4) : (int)0; } - public int ExSkillTimeLineIndexLength { get { int o = __p.__offset(26); return o != 0 ? __p.__vector_len(o) : 0; } } + public string ExSkillCutInTimeLineIndex(int j) { int o = __p.__offset(26); return o != 0 ? __p.__string(__p.__vector(o) + j * 4) : null; } + public int ExSkillCutInTimeLineIndexLength { get { int o = __p.__offset(26); return o != 0 ? __p.__vector_len(o) : 0; } } + public string ExSkillLevelTimeLineIndex(int j) { int o = __p.__offset(28); return o != 0 ? __p.__string(__p.__vector(o) + j * 4) : null; } + public int ExSkillLevelTimeLineIndexLength { get { int o = __p.__offset(28); return o != 0 ? __p.__vector_len(o) : 0; } } + public string PublicSkillGroupId(int j) { int o = __p.__offset(30); return o != 0 ? __p.__string(__p.__vector(o) + j * 4) : null; } + public int PublicSkillGroupIdLength { get { int o = __p.__offset(30); return o != 0 ? __p.__vector_len(o) : 0; } } + public int PublicSkillTimeLineIndex(int j) { int o = __p.__offset(32); return o != 0 ? __p.bb.GetInt(__p.__vector(o) + j * 4) : (int)0; } + public int PublicSkillTimeLineIndexLength { get { int o = __p.__offset(32); return o != 0 ? __p.__vector_len(o) : 0; } } #if ENABLE_SPAN_T - public Span GetExSkillTimeLineIndexBytes() { return __p.__vector_as_span(26, 4); } + public Span GetPublicSkillTimeLineIndexBytes() { return __p.__vector_as_span(32, 4); } #else - public ArraySegment? GetExSkillTimeLineIndexBytes() { return __p.__vector_as_arraysegment(26); } + public ArraySegment? GetPublicSkillTimeLineIndexBytes() { return __p.__vector_as_arraysegment(32); } #endif - public int[] GetExSkillTimeLineIndexArray() { return __p.__vector_as_array(26); } - public string PublicSkillGroupId(int j) { int o = __p.__offset(28); return o != 0 ? __p.__string(__p.__vector(o) + j * 4) : null; } - public int PublicSkillGroupIdLength { get { int o = __p.__offset(28); return o != 0 ? __p.__vector_len(o) : 0; } } - public int PublicSkillTimeLineIndex(int j) { int o = __p.__offset(30); return o != 0 ? __p.bb.GetInt(__p.__vector(o) + j * 4) : (int)0; } - public int PublicSkillTimeLineIndexLength { get { int o = __p.__offset(30); return o != 0 ? __p.__vector_len(o) : 0; } } -#if ENABLE_SPAN_T - public Span GetPublicSkillTimeLineIndexBytes() { return __p.__vector_as_span(30, 4); } -#else - public ArraySegment? GetPublicSkillTimeLineIndexBytes() { return __p.__vector_as_arraysegment(30); } -#endif - public int[] GetPublicSkillTimeLineIndexArray() { return __p.__vector_as_array(30); } - public string PassiveSkillGroupId(int j) { int o = __p.__offset(32); return o != 0 ? __p.__string(__p.__vector(o) + j * 4) : null; } - public int PassiveSkillGroupIdLength { get { int o = __p.__offset(32); return o != 0 ? __p.__vector_len(o) : 0; } } - public string LeaderSkillGroupId(int j) { int o = __p.__offset(34); return o != 0 ? __p.__string(__p.__vector(o) + j * 4) : null; } - public int LeaderSkillGroupIdLength { get { int o = __p.__offset(34); return o != 0 ? __p.__vector_len(o) : 0; } } - public string ExtraPassiveSkillGroupId(int j) { int o = __p.__offset(36); return o != 0 ? __p.__string(__p.__vector(o) + j * 4) : null; } - public int ExtraPassiveSkillGroupIdLength { get { int o = __p.__offset(36); return o != 0 ? __p.__vector_len(o) : 0; } } - public string HiddenPassiveSkillGroupId(int j) { int o = __p.__offset(38); return o != 0 ? __p.__string(__p.__vector(o) + j * 4) : null; } - public int HiddenPassiveSkillGroupIdLength { get { int o = __p.__offset(38); return o != 0 ? __p.__vector_len(o) : 0; } } + public int[] GetPublicSkillTimeLineIndexArray() { return __p.__vector_as_array(32); } + public string PassiveSkillGroupId(int j) { int o = __p.__offset(34); return o != 0 ? __p.__string(__p.__vector(o) + j * 4) : null; } + public int PassiveSkillGroupIdLength { get { int o = __p.__offset(34); return o != 0 ? __p.__vector_len(o) : 0; } } + public string LeaderSkillGroupId(int j) { int o = __p.__offset(36); return o != 0 ? __p.__string(__p.__vector(o) + j * 4) : null; } + public int LeaderSkillGroupIdLength { get { int o = __p.__offset(36); return o != 0 ? __p.__vector_len(o) : 0; } } + public string ExtraPassiveSkillGroupId(int j) { int o = __p.__offset(38); return o != 0 ? __p.__string(__p.__vector(o) + j * 4) : null; } + public int ExtraPassiveSkillGroupIdLength { get { int o = __p.__offset(38); return o != 0 ? __p.__vector_len(o) : 0; } } + public string HiddenPassiveSkillGroupId(int j) { int o = __p.__offset(40); return o != 0 ? __p.__string(__p.__vector(o) + j * 4) : null; } + public int HiddenPassiveSkillGroupIdLength { get { int o = __p.__offset(40); return o != 0 ? __p.__vector_len(o) : 0; } } public static Offset CreateCharacterSkillListExcel(FlatBufferBuilder builder, long CharacterSkillListGroupId = 0, @@ -74,19 +70,20 @@ public struct CharacterSkillListExcel : IFlatbufferObject int FormIndex = 0, bool IsRootMotion = false, bool IsMoveLeftRight = false, - bool UseRandomAnimation = false, + bool UseRandomExSkillTimeline = false, long TSAInteractionId = 0, VectorOffset NormalSkillGroupIdOffset = default(VectorOffset), VectorOffset NormalSkillTimeLineIndexOffset = default(VectorOffset), VectorOffset ExSkillGroupIdOffset = default(VectorOffset), - VectorOffset ExSkillTimeLineIndexOffset = default(VectorOffset), + VectorOffset ExSkillCutInTimeLineIndexOffset = default(VectorOffset), + VectorOffset ExSkillLevelTimeLineIndexOffset = default(VectorOffset), VectorOffset PublicSkillGroupIdOffset = default(VectorOffset), VectorOffset PublicSkillTimeLineIndexOffset = default(VectorOffset), VectorOffset PassiveSkillGroupIdOffset = default(VectorOffset), VectorOffset LeaderSkillGroupIdOffset = default(VectorOffset), VectorOffset ExtraPassiveSkillGroupIdOffset = default(VectorOffset), VectorOffset HiddenPassiveSkillGroupIdOffset = default(VectorOffset)) { - builder.StartTable(18); + builder.StartTable(19); CharacterSkillListExcel.AddTSAInteractionId(builder, TSAInteractionId); CharacterSkillListExcel.AddCharacterSkillListGroupId(builder, CharacterSkillListGroupId); CharacterSkillListExcel.AddHiddenPassiveSkillGroupId(builder, HiddenPassiveSkillGroupIdOffset); @@ -95,27 +92,28 @@ public struct CharacterSkillListExcel : IFlatbufferObject CharacterSkillListExcel.AddPassiveSkillGroupId(builder, PassiveSkillGroupIdOffset); CharacterSkillListExcel.AddPublicSkillTimeLineIndex(builder, PublicSkillTimeLineIndexOffset); CharacterSkillListExcel.AddPublicSkillGroupId(builder, PublicSkillGroupIdOffset); - CharacterSkillListExcel.AddExSkillTimeLineIndex(builder, ExSkillTimeLineIndexOffset); + CharacterSkillListExcel.AddExSkillLevelTimeLineIndex(builder, ExSkillLevelTimeLineIndexOffset); + CharacterSkillListExcel.AddExSkillCutInTimeLineIndex(builder, ExSkillCutInTimeLineIndexOffset); CharacterSkillListExcel.AddExSkillGroupId(builder, ExSkillGroupIdOffset); CharacterSkillListExcel.AddNormalSkillTimeLineIndex(builder, NormalSkillTimeLineIndexOffset); CharacterSkillListExcel.AddNormalSkillGroupId(builder, NormalSkillGroupIdOffset); CharacterSkillListExcel.AddFormIndex(builder, FormIndex); CharacterSkillListExcel.AddMinimumTierCharacterGear(builder, MinimumTierCharacterGear); CharacterSkillListExcel.AddMinimumGradeCharacterWeapon(builder, MinimumGradeCharacterWeapon); - CharacterSkillListExcel.AddUseRandomAnimation(builder, UseRandomAnimation); + CharacterSkillListExcel.AddUseRandomExSkillTimeline(builder, UseRandomExSkillTimeline); CharacterSkillListExcel.AddIsMoveLeftRight(builder, IsMoveLeftRight); CharacterSkillListExcel.AddIsRootMotion(builder, IsRootMotion); return CharacterSkillListExcel.EndCharacterSkillListExcel(builder); } - public static void StartCharacterSkillListExcel(FlatBufferBuilder builder) { builder.StartTable(18); } + public static void StartCharacterSkillListExcel(FlatBufferBuilder builder) { builder.StartTable(19); } public static void AddCharacterSkillListGroupId(FlatBufferBuilder builder, long characterSkillListGroupId) { builder.AddLong(0, characterSkillListGroupId, 0); } public static void AddMinimumGradeCharacterWeapon(FlatBufferBuilder builder, int minimumGradeCharacterWeapon) { builder.AddInt(1, minimumGradeCharacterWeapon, 0); } public static void AddMinimumTierCharacterGear(FlatBufferBuilder builder, int minimumTierCharacterGear) { builder.AddInt(2, minimumTierCharacterGear, 0); } public static void AddFormIndex(FlatBufferBuilder builder, int formIndex) { builder.AddInt(3, formIndex, 0); } public static void AddIsRootMotion(FlatBufferBuilder builder, bool isRootMotion) { builder.AddBool(4, isRootMotion, false); } public static void AddIsMoveLeftRight(FlatBufferBuilder builder, bool isMoveLeftRight) { builder.AddBool(5, isMoveLeftRight, false); } - public static void AddUseRandomAnimation(FlatBufferBuilder builder, bool useRandomAnimation) { builder.AddBool(6, useRandomAnimation, false); } + public static void AddUseRandomExSkillTimeline(FlatBufferBuilder builder, bool useRandomExSkillTimeline) { builder.AddBool(6, useRandomExSkillTimeline, false); } public static void AddTSAInteractionId(FlatBufferBuilder builder, long tSAInteractionId) { builder.AddLong(7, tSAInteractionId, 0); } public static void AddNormalSkillGroupId(FlatBufferBuilder builder, VectorOffset normalSkillGroupIdOffset) { builder.AddOffset(8, normalSkillGroupIdOffset.Value, 0); } public static VectorOffset CreateNormalSkillGroupIdVector(FlatBufferBuilder builder, StringOffset[] data) { builder.StartVector(4, data.Length, 4); for (int i = data.Length - 1; i >= 0; i--) builder.AddOffset(data[i].Value); return builder.EndVector(); } @@ -135,43 +133,49 @@ public struct CharacterSkillListExcel : IFlatbufferObject public static VectorOffset CreateExSkillGroupIdVectorBlock(FlatBufferBuilder builder, ArraySegment data) { builder.StartVector(4, data.Count, 4); builder.Add(data); return builder.EndVector(); } public static VectorOffset CreateExSkillGroupIdVectorBlock(FlatBufferBuilder builder, IntPtr dataPtr, int sizeInBytes) { builder.StartVector(1, sizeInBytes, 1); builder.Add(dataPtr, sizeInBytes); return builder.EndVector(); } public static void StartExSkillGroupIdVector(FlatBufferBuilder builder, int numElems) { builder.StartVector(4, numElems, 4); } - public static void AddExSkillTimeLineIndex(FlatBufferBuilder builder, VectorOffset exSkillTimeLineIndexOffset) { builder.AddOffset(11, exSkillTimeLineIndexOffset.Value, 0); } - public static VectorOffset CreateExSkillTimeLineIndexVector(FlatBufferBuilder builder, int[] data) { builder.StartVector(4, data.Length, 4); for (int i = data.Length - 1; i >= 0; i--) builder.AddInt(data[i]); return builder.EndVector(); } - public static VectorOffset CreateExSkillTimeLineIndexVectorBlock(FlatBufferBuilder builder, int[] data) { builder.StartVector(4, data.Length, 4); builder.Add(data); return builder.EndVector(); } - public static VectorOffset CreateExSkillTimeLineIndexVectorBlock(FlatBufferBuilder builder, ArraySegment data) { builder.StartVector(4, data.Count, 4); builder.Add(data); return builder.EndVector(); } - public static VectorOffset CreateExSkillTimeLineIndexVectorBlock(FlatBufferBuilder builder, IntPtr dataPtr, int sizeInBytes) { builder.StartVector(1, sizeInBytes, 1); builder.Add(dataPtr, sizeInBytes); return builder.EndVector(); } - public static void StartExSkillTimeLineIndexVector(FlatBufferBuilder builder, int numElems) { builder.StartVector(4, numElems, 4); } - public static void AddPublicSkillGroupId(FlatBufferBuilder builder, VectorOffset publicSkillGroupIdOffset) { builder.AddOffset(12, publicSkillGroupIdOffset.Value, 0); } + public static void AddExSkillCutInTimeLineIndex(FlatBufferBuilder builder, VectorOffset exSkillCutInTimeLineIndexOffset) { builder.AddOffset(11, exSkillCutInTimeLineIndexOffset.Value, 0); } + public static VectorOffset CreateExSkillCutInTimeLineIndexVector(FlatBufferBuilder builder, StringOffset[] data) { builder.StartVector(4, data.Length, 4); for (int i = data.Length - 1; i >= 0; i--) builder.AddOffset(data[i].Value); return builder.EndVector(); } + public static VectorOffset CreateExSkillCutInTimeLineIndexVectorBlock(FlatBufferBuilder builder, StringOffset[] data) { builder.StartVector(4, data.Length, 4); builder.Add(data); return builder.EndVector(); } + public static VectorOffset CreateExSkillCutInTimeLineIndexVectorBlock(FlatBufferBuilder builder, ArraySegment data) { builder.StartVector(4, data.Count, 4); builder.Add(data); return builder.EndVector(); } + public static VectorOffset CreateExSkillCutInTimeLineIndexVectorBlock(FlatBufferBuilder builder, IntPtr dataPtr, int sizeInBytes) { builder.StartVector(1, sizeInBytes, 1); builder.Add(dataPtr, sizeInBytes); return builder.EndVector(); } + public static void StartExSkillCutInTimeLineIndexVector(FlatBufferBuilder builder, int numElems) { builder.StartVector(4, numElems, 4); } + public static void AddExSkillLevelTimeLineIndex(FlatBufferBuilder builder, VectorOffset exSkillLevelTimeLineIndexOffset) { builder.AddOffset(12, exSkillLevelTimeLineIndexOffset.Value, 0); } + public static VectorOffset CreateExSkillLevelTimeLineIndexVector(FlatBufferBuilder builder, StringOffset[] data) { builder.StartVector(4, data.Length, 4); for (int i = data.Length - 1; i >= 0; i--) builder.AddOffset(data[i].Value); return builder.EndVector(); } + public static VectorOffset CreateExSkillLevelTimeLineIndexVectorBlock(FlatBufferBuilder builder, StringOffset[] data) { builder.StartVector(4, data.Length, 4); builder.Add(data); return builder.EndVector(); } + public static VectorOffset CreateExSkillLevelTimeLineIndexVectorBlock(FlatBufferBuilder builder, ArraySegment data) { builder.StartVector(4, data.Count, 4); builder.Add(data); return builder.EndVector(); } + public static VectorOffset CreateExSkillLevelTimeLineIndexVectorBlock(FlatBufferBuilder builder, IntPtr dataPtr, int sizeInBytes) { builder.StartVector(1, sizeInBytes, 1); builder.Add(dataPtr, sizeInBytes); return builder.EndVector(); } + public static void StartExSkillLevelTimeLineIndexVector(FlatBufferBuilder builder, int numElems) { builder.StartVector(4, numElems, 4); } + public static void AddPublicSkillGroupId(FlatBufferBuilder builder, VectorOffset publicSkillGroupIdOffset) { builder.AddOffset(13, publicSkillGroupIdOffset.Value, 0); } public static VectorOffset CreatePublicSkillGroupIdVector(FlatBufferBuilder builder, StringOffset[] data) { builder.StartVector(4, data.Length, 4); for (int i = data.Length - 1; i >= 0; i--) builder.AddOffset(data[i].Value); return builder.EndVector(); } public static VectorOffset CreatePublicSkillGroupIdVectorBlock(FlatBufferBuilder builder, StringOffset[] data) { builder.StartVector(4, data.Length, 4); builder.Add(data); return builder.EndVector(); } public static VectorOffset CreatePublicSkillGroupIdVectorBlock(FlatBufferBuilder builder, ArraySegment data) { builder.StartVector(4, data.Count, 4); builder.Add(data); return builder.EndVector(); } public static VectorOffset CreatePublicSkillGroupIdVectorBlock(FlatBufferBuilder builder, IntPtr dataPtr, int sizeInBytes) { builder.StartVector(1, sizeInBytes, 1); builder.Add(dataPtr, sizeInBytes); return builder.EndVector(); } public static void StartPublicSkillGroupIdVector(FlatBufferBuilder builder, int numElems) { builder.StartVector(4, numElems, 4); } - public static void AddPublicSkillTimeLineIndex(FlatBufferBuilder builder, VectorOffset publicSkillTimeLineIndexOffset) { builder.AddOffset(13, publicSkillTimeLineIndexOffset.Value, 0); } + public static void AddPublicSkillTimeLineIndex(FlatBufferBuilder builder, VectorOffset publicSkillTimeLineIndexOffset) { builder.AddOffset(14, publicSkillTimeLineIndexOffset.Value, 0); } public static VectorOffset CreatePublicSkillTimeLineIndexVector(FlatBufferBuilder builder, int[] data) { builder.StartVector(4, data.Length, 4); for (int i = data.Length - 1; i >= 0; i--) builder.AddInt(data[i]); return builder.EndVector(); } public static VectorOffset CreatePublicSkillTimeLineIndexVectorBlock(FlatBufferBuilder builder, int[] data) { builder.StartVector(4, data.Length, 4); builder.Add(data); return builder.EndVector(); } public static VectorOffset CreatePublicSkillTimeLineIndexVectorBlock(FlatBufferBuilder builder, ArraySegment data) { builder.StartVector(4, data.Count, 4); builder.Add(data); return builder.EndVector(); } public static VectorOffset CreatePublicSkillTimeLineIndexVectorBlock(FlatBufferBuilder builder, IntPtr dataPtr, int sizeInBytes) { builder.StartVector(1, sizeInBytes, 1); builder.Add(dataPtr, sizeInBytes); return builder.EndVector(); } public static void StartPublicSkillTimeLineIndexVector(FlatBufferBuilder builder, int numElems) { builder.StartVector(4, numElems, 4); } - public static void AddPassiveSkillGroupId(FlatBufferBuilder builder, VectorOffset passiveSkillGroupIdOffset) { builder.AddOffset(14, passiveSkillGroupIdOffset.Value, 0); } + public static void AddPassiveSkillGroupId(FlatBufferBuilder builder, VectorOffset passiveSkillGroupIdOffset) { builder.AddOffset(15, passiveSkillGroupIdOffset.Value, 0); } public static VectorOffset CreatePassiveSkillGroupIdVector(FlatBufferBuilder builder, StringOffset[] data) { builder.StartVector(4, data.Length, 4); for (int i = data.Length - 1; i >= 0; i--) builder.AddOffset(data[i].Value); return builder.EndVector(); } public static VectorOffset CreatePassiveSkillGroupIdVectorBlock(FlatBufferBuilder builder, StringOffset[] data) { builder.StartVector(4, data.Length, 4); builder.Add(data); return builder.EndVector(); } public static VectorOffset CreatePassiveSkillGroupIdVectorBlock(FlatBufferBuilder builder, ArraySegment data) { builder.StartVector(4, data.Count, 4); builder.Add(data); return builder.EndVector(); } public static VectorOffset CreatePassiveSkillGroupIdVectorBlock(FlatBufferBuilder builder, IntPtr dataPtr, int sizeInBytes) { builder.StartVector(1, sizeInBytes, 1); builder.Add(dataPtr, sizeInBytes); return builder.EndVector(); } public static void StartPassiveSkillGroupIdVector(FlatBufferBuilder builder, int numElems) { builder.StartVector(4, numElems, 4); } - public static void AddLeaderSkillGroupId(FlatBufferBuilder builder, VectorOffset leaderSkillGroupIdOffset) { builder.AddOffset(15, leaderSkillGroupIdOffset.Value, 0); } + public static void AddLeaderSkillGroupId(FlatBufferBuilder builder, VectorOffset leaderSkillGroupIdOffset) { builder.AddOffset(16, leaderSkillGroupIdOffset.Value, 0); } public static VectorOffset CreateLeaderSkillGroupIdVector(FlatBufferBuilder builder, StringOffset[] data) { builder.StartVector(4, data.Length, 4); for (int i = data.Length - 1; i >= 0; i--) builder.AddOffset(data[i].Value); return builder.EndVector(); } public static VectorOffset CreateLeaderSkillGroupIdVectorBlock(FlatBufferBuilder builder, StringOffset[] data) { builder.StartVector(4, data.Length, 4); builder.Add(data); return builder.EndVector(); } public static VectorOffset CreateLeaderSkillGroupIdVectorBlock(FlatBufferBuilder builder, ArraySegment data) { builder.StartVector(4, data.Count, 4); builder.Add(data); return builder.EndVector(); } public static VectorOffset CreateLeaderSkillGroupIdVectorBlock(FlatBufferBuilder builder, IntPtr dataPtr, int sizeInBytes) { builder.StartVector(1, sizeInBytes, 1); builder.Add(dataPtr, sizeInBytes); return builder.EndVector(); } public static void StartLeaderSkillGroupIdVector(FlatBufferBuilder builder, int numElems) { builder.StartVector(4, numElems, 4); } - public static void AddExtraPassiveSkillGroupId(FlatBufferBuilder builder, VectorOffset extraPassiveSkillGroupIdOffset) { builder.AddOffset(16, extraPassiveSkillGroupIdOffset.Value, 0); } + public static void AddExtraPassiveSkillGroupId(FlatBufferBuilder builder, VectorOffset extraPassiveSkillGroupIdOffset) { builder.AddOffset(17, extraPassiveSkillGroupIdOffset.Value, 0); } public static VectorOffset CreateExtraPassiveSkillGroupIdVector(FlatBufferBuilder builder, StringOffset[] data) { builder.StartVector(4, data.Length, 4); for (int i = data.Length - 1; i >= 0; i--) builder.AddOffset(data[i].Value); return builder.EndVector(); } public static VectorOffset CreateExtraPassiveSkillGroupIdVectorBlock(FlatBufferBuilder builder, StringOffset[] data) { builder.StartVector(4, data.Length, 4); builder.Add(data); return builder.EndVector(); } public static VectorOffset CreateExtraPassiveSkillGroupIdVectorBlock(FlatBufferBuilder builder, ArraySegment data) { builder.StartVector(4, data.Count, 4); builder.Add(data); return builder.EndVector(); } public static VectorOffset CreateExtraPassiveSkillGroupIdVectorBlock(FlatBufferBuilder builder, IntPtr dataPtr, int sizeInBytes) { builder.StartVector(1, sizeInBytes, 1); builder.Add(dataPtr, sizeInBytes); return builder.EndVector(); } public static void StartExtraPassiveSkillGroupIdVector(FlatBufferBuilder builder, int numElems) { builder.StartVector(4, numElems, 4); } - public static void AddHiddenPassiveSkillGroupId(FlatBufferBuilder builder, VectorOffset hiddenPassiveSkillGroupIdOffset) { builder.AddOffset(17, hiddenPassiveSkillGroupIdOffset.Value, 0); } + public static void AddHiddenPassiveSkillGroupId(FlatBufferBuilder builder, VectorOffset hiddenPassiveSkillGroupIdOffset) { builder.AddOffset(18, hiddenPassiveSkillGroupIdOffset.Value, 0); } public static VectorOffset CreateHiddenPassiveSkillGroupIdVector(FlatBufferBuilder builder, StringOffset[] data) { builder.StartVector(4, data.Length, 4); for (int i = data.Length - 1; i >= 0; i--) builder.AddOffset(data[i].Value); return builder.EndVector(); } public static VectorOffset CreateHiddenPassiveSkillGroupIdVectorBlock(FlatBufferBuilder builder, StringOffset[] data) { builder.StartVector(4, data.Length, 4); builder.Add(data); return builder.EndVector(); } public static VectorOffset CreateHiddenPassiveSkillGroupIdVectorBlock(FlatBufferBuilder builder, ArraySegment data) { builder.StartVector(4, data.Count, 4); builder.Add(data); return builder.EndVector(); } @@ -194,7 +198,7 @@ public struct CharacterSkillListExcel : IFlatbufferObject _o.FormIndex = TableEncryptionService.Convert(this.FormIndex, key); _o.IsRootMotion = TableEncryptionService.Convert(this.IsRootMotion, key); _o.IsMoveLeftRight = TableEncryptionService.Convert(this.IsMoveLeftRight, key); - _o.UseRandomAnimation = TableEncryptionService.Convert(this.UseRandomAnimation, key); + _o.UseRandomExSkillTimeline = TableEncryptionService.Convert(this.UseRandomExSkillTimeline, key); _o.TSAInteractionId = TableEncryptionService.Convert(this.TSAInteractionId, key); _o.NormalSkillGroupId = new List(); for (var _j = 0; _j < this.NormalSkillGroupIdLength; ++_j) {_o.NormalSkillGroupId.Add(TableEncryptionService.Convert(this.NormalSkillGroupId(_j), key));} @@ -202,8 +206,10 @@ public struct CharacterSkillListExcel : IFlatbufferObject for (var _j = 0; _j < this.NormalSkillTimeLineIndexLength; ++_j) {_o.NormalSkillTimeLineIndex.Add(TableEncryptionService.Convert(this.NormalSkillTimeLineIndex(_j), key));} _o.ExSkillGroupId = new List(); for (var _j = 0; _j < this.ExSkillGroupIdLength; ++_j) {_o.ExSkillGroupId.Add(TableEncryptionService.Convert(this.ExSkillGroupId(_j), key));} - _o.ExSkillTimeLineIndex = new List(); - for (var _j = 0; _j < this.ExSkillTimeLineIndexLength; ++_j) {_o.ExSkillTimeLineIndex.Add(TableEncryptionService.Convert(this.ExSkillTimeLineIndex(_j), key));} + _o.ExSkillCutInTimeLineIndex = new List(); + for (var _j = 0; _j < this.ExSkillCutInTimeLineIndexLength; ++_j) {_o.ExSkillCutInTimeLineIndex.Add(TableEncryptionService.Convert(this.ExSkillCutInTimeLineIndex(_j), key));} + _o.ExSkillLevelTimeLineIndex = new List(); + for (var _j = 0; _j < this.ExSkillLevelTimeLineIndexLength; ++_j) {_o.ExSkillLevelTimeLineIndex.Add(TableEncryptionService.Convert(this.ExSkillLevelTimeLineIndex(_j), key));} _o.PublicSkillGroupId = new List(); for (var _j = 0; _j < this.PublicSkillGroupIdLength; ++_j) {_o.PublicSkillGroupId.Add(TableEncryptionService.Convert(this.PublicSkillGroupId(_j), key));} _o.PublicSkillTimeLineIndex = new List(); @@ -236,10 +242,17 @@ public struct CharacterSkillListExcel : IFlatbufferObject for (var _j = 0; _j < __ExSkillGroupId.Length; ++_j) { __ExSkillGroupId[_j] = builder.CreateString(_o.ExSkillGroupId[_j]); } _ExSkillGroupId = CreateExSkillGroupIdVector(builder, __ExSkillGroupId); } - var _ExSkillTimeLineIndex = default(VectorOffset); - if (_o.ExSkillTimeLineIndex != null) { - var __ExSkillTimeLineIndex = _o.ExSkillTimeLineIndex.ToArray(); - _ExSkillTimeLineIndex = CreateExSkillTimeLineIndexVector(builder, __ExSkillTimeLineIndex); + var _ExSkillCutInTimeLineIndex = default(VectorOffset); + if (_o.ExSkillCutInTimeLineIndex != null) { + var __ExSkillCutInTimeLineIndex = new StringOffset[_o.ExSkillCutInTimeLineIndex.Count]; + for (var _j = 0; _j < __ExSkillCutInTimeLineIndex.Length; ++_j) { __ExSkillCutInTimeLineIndex[_j] = builder.CreateString(_o.ExSkillCutInTimeLineIndex[_j]); } + _ExSkillCutInTimeLineIndex = CreateExSkillCutInTimeLineIndexVector(builder, __ExSkillCutInTimeLineIndex); + } + var _ExSkillLevelTimeLineIndex = default(VectorOffset); + if (_o.ExSkillLevelTimeLineIndex != null) { + var __ExSkillLevelTimeLineIndex = new StringOffset[_o.ExSkillLevelTimeLineIndex.Count]; + for (var _j = 0; _j < __ExSkillLevelTimeLineIndex.Length; ++_j) { __ExSkillLevelTimeLineIndex[_j] = builder.CreateString(_o.ExSkillLevelTimeLineIndex[_j]); } + _ExSkillLevelTimeLineIndex = CreateExSkillLevelTimeLineIndexVector(builder, __ExSkillLevelTimeLineIndex); } var _PublicSkillGroupId = default(VectorOffset); if (_o.PublicSkillGroupId != null) { @@ -284,12 +297,13 @@ public struct CharacterSkillListExcel : IFlatbufferObject _o.FormIndex, _o.IsRootMotion, _o.IsMoveLeftRight, - _o.UseRandomAnimation, + _o.UseRandomExSkillTimeline, _o.TSAInteractionId, _NormalSkillGroupId, _NormalSkillTimeLineIndex, _ExSkillGroupId, - _ExSkillTimeLineIndex, + _ExSkillCutInTimeLineIndex, + _ExSkillLevelTimeLineIndex, _PublicSkillGroupId, _PublicSkillTimeLineIndex, _PassiveSkillGroupId, @@ -307,12 +321,13 @@ public class CharacterSkillListExcelT public int FormIndex { get; set; } public bool IsRootMotion { get; set; } public bool IsMoveLeftRight { get; set; } - public bool UseRandomAnimation { get; set; } + public bool UseRandomExSkillTimeline { get; set; } public long TSAInteractionId { get; set; } public List NormalSkillGroupId { get; set; } public List NormalSkillTimeLineIndex { get; set; } public List ExSkillGroupId { get; set; } - public List ExSkillTimeLineIndex { get; set; } + public List ExSkillCutInTimeLineIndex { get; set; } + public List ExSkillLevelTimeLineIndex { get; set; } public List PublicSkillGroupId { get; set; } public List PublicSkillTimeLineIndex { get; set; } public List PassiveSkillGroupId { get; set; } @@ -327,12 +342,13 @@ public class CharacterSkillListExcelT this.FormIndex = 0; this.IsRootMotion = false; this.IsMoveLeftRight = false; - this.UseRandomAnimation = false; + this.UseRandomExSkillTimeline = false; this.TSAInteractionId = 0; this.NormalSkillGroupId = null; this.NormalSkillTimeLineIndex = null; this.ExSkillGroupId = null; - this.ExSkillTimeLineIndex = null; + this.ExSkillCutInTimeLineIndex = null; + this.ExSkillLevelTimeLineIndex = null; this.PublicSkillGroupId = null; this.PublicSkillTimeLineIndex = null; this.PassiveSkillGroupId = null; @@ -354,18 +370,19 @@ static public class CharacterSkillListExcelVerify && verifier.VerifyField(tablePos, 10 /*FormIndex*/, 4 /*int*/, 4, false) && verifier.VerifyField(tablePos, 12 /*IsRootMotion*/, 1 /*bool*/, 1, false) && verifier.VerifyField(tablePos, 14 /*IsMoveLeftRight*/, 1 /*bool*/, 1, false) - && verifier.VerifyField(tablePos, 16 /*UseRandomAnimation*/, 1 /*bool*/, 1, false) + && verifier.VerifyField(tablePos, 16 /*UseRandomExSkillTimeline*/, 1 /*bool*/, 1, false) && verifier.VerifyField(tablePos, 18 /*TSAInteractionId*/, 8 /*long*/, 8, false) && verifier.VerifyVectorOfStrings(tablePos, 20 /*NormalSkillGroupId*/, false) && verifier.VerifyVectorOfData(tablePos, 22 /*NormalSkillTimeLineIndex*/, 4 /*int*/, false) && verifier.VerifyVectorOfStrings(tablePos, 24 /*ExSkillGroupId*/, false) - && verifier.VerifyVectorOfData(tablePos, 26 /*ExSkillTimeLineIndex*/, 4 /*int*/, false) - && verifier.VerifyVectorOfStrings(tablePos, 28 /*PublicSkillGroupId*/, false) - && verifier.VerifyVectorOfData(tablePos, 30 /*PublicSkillTimeLineIndex*/, 4 /*int*/, false) - && verifier.VerifyVectorOfStrings(tablePos, 32 /*PassiveSkillGroupId*/, false) - && verifier.VerifyVectorOfStrings(tablePos, 34 /*LeaderSkillGroupId*/, false) - && verifier.VerifyVectorOfStrings(tablePos, 36 /*ExtraPassiveSkillGroupId*/, false) - && verifier.VerifyVectorOfStrings(tablePos, 38 /*HiddenPassiveSkillGroupId*/, false) + && verifier.VerifyVectorOfStrings(tablePos, 26 /*ExSkillCutInTimeLineIndex*/, false) + && verifier.VerifyVectorOfStrings(tablePos, 28 /*ExSkillLevelTimeLineIndex*/, false) + && verifier.VerifyVectorOfStrings(tablePos, 30 /*PublicSkillGroupId*/, false) + && verifier.VerifyVectorOfData(tablePos, 32 /*PublicSkillTimeLineIndex*/, 4 /*int*/, false) + && verifier.VerifyVectorOfStrings(tablePos, 34 /*PassiveSkillGroupId*/, false) + && verifier.VerifyVectorOfStrings(tablePos, 36 /*LeaderSkillGroupId*/, false) + && verifier.VerifyVectorOfStrings(tablePos, 38 /*ExtraPassiveSkillGroupId*/, false) + && verifier.VerifyVectorOfStrings(tablePos, 40 /*HiddenPassiveSkillGroupId*/, false) && verifier.VerifyTableEnd(tablePos); } } diff --git a/SCHALE.Common/FlatData/CharacterStatExcel.cs b/SCHALE.Common/FlatData/CharacterStatExcel.cs index 17bd71c..b44f19d 100644 --- a/SCHALE.Common/FlatData/CharacterStatExcel.cs +++ b/SCHALE.Common/FlatData/CharacterStatExcel.cs @@ -82,10 +82,23 @@ public struct CharacterStatExcel : IFlatbufferObject public long DamagedRatio2Decrease { get { int o = __p.__offset(122); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public long ExDamagedRatioIncrease { get { int o = __p.__offset(124); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public long ExDamagedRatioDecrease { get { int o = __p.__offset(126); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } - public SCHALE.Common.FlatData.TerrainAdaptationStat StreetBattleAdaptation { get { int o = __p.__offset(128); return o != 0 ? (SCHALE.Common.FlatData.TerrainAdaptationStat)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.TerrainAdaptationStat.D; } } - public SCHALE.Common.FlatData.TerrainAdaptationStat OutdoorBattleAdaptation { get { int o = __p.__offset(130); return o != 0 ? (SCHALE.Common.FlatData.TerrainAdaptationStat)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.TerrainAdaptationStat.D; } } - public SCHALE.Common.FlatData.TerrainAdaptationStat IndoorBattleAdaptation { get { int o = __p.__offset(132); return o != 0 ? (SCHALE.Common.FlatData.TerrainAdaptationStat)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.TerrainAdaptationStat.D; } } - public long RegenCost { get { int o = __p.__offset(134); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } + public long EnhanceExDamageRate { get { int o = __p.__offset(128); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } + public long ReduceExDamagedRate { get { int o = __p.__offset(130); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } + public long HealRate { get { int o = __p.__offset(132); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } + public long HealLightArmorRate { get { int o = __p.__offset(134); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } + public long HealHeavyArmorRate { get { int o = __p.__offset(136); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } + public long HealUnarmedRate { get { int o = __p.__offset(138); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } + public long HealElasticArmorRate { get { int o = __p.__offset(140); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } + public long HealNormalArmorRate { get { int o = __p.__offset(142); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } + public long HealedExplosionRate { get { int o = __p.__offset(144); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } + public long HealedPierceRate { get { int o = __p.__offset(146); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } + public long HealedMysticRate { get { int o = __p.__offset(148); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } + public long HealedSonicRate { get { int o = __p.__offset(150); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } + public long HealedNormalRate { get { int o = __p.__offset(152); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } + public SCHALE.Common.FlatData.TerrainAdaptationStat StreetBattleAdaptation { get { int o = __p.__offset(154); return o != 0 ? (SCHALE.Common.FlatData.TerrainAdaptationStat)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.TerrainAdaptationStat.D; } } + public SCHALE.Common.FlatData.TerrainAdaptationStat OutdoorBattleAdaptation { get { int o = __p.__offset(156); return o != 0 ? (SCHALE.Common.FlatData.TerrainAdaptationStat)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.TerrainAdaptationStat.D; } } + public SCHALE.Common.FlatData.TerrainAdaptationStat IndoorBattleAdaptation { get { int o = __p.__offset(158); return o != 0 ? (SCHALE.Common.FlatData.TerrainAdaptationStat)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.TerrainAdaptationStat.D; } } + public long RegenCost { get { int o = __p.__offset(160); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public static Offset CreateCharacterStatExcel(FlatBufferBuilder builder, long CharacterId = 0, @@ -150,12 +163,38 @@ public struct CharacterStatExcel : IFlatbufferObject long DamagedRatio2Decrease = 0, long ExDamagedRatioIncrease = 0, long ExDamagedRatioDecrease = 0, + long EnhanceExDamageRate = 0, + long ReduceExDamagedRate = 0, + long HealRate = 0, + long HealLightArmorRate = 0, + long HealHeavyArmorRate = 0, + long HealUnarmedRate = 0, + long HealElasticArmorRate = 0, + long HealNormalArmorRate = 0, + long HealedExplosionRate = 0, + long HealedPierceRate = 0, + long HealedMysticRate = 0, + long HealedSonicRate = 0, + long HealedNormalRate = 0, SCHALE.Common.FlatData.TerrainAdaptationStat StreetBattleAdaptation = SCHALE.Common.FlatData.TerrainAdaptationStat.D, SCHALE.Common.FlatData.TerrainAdaptationStat OutdoorBattleAdaptation = SCHALE.Common.FlatData.TerrainAdaptationStat.D, SCHALE.Common.FlatData.TerrainAdaptationStat IndoorBattleAdaptation = SCHALE.Common.FlatData.TerrainAdaptationStat.D, long RegenCost = 0) { - builder.StartTable(66); + builder.StartTable(79); CharacterStatExcel.AddRegenCost(builder, RegenCost); + CharacterStatExcel.AddHealedNormalRate(builder, HealedNormalRate); + CharacterStatExcel.AddHealedSonicRate(builder, HealedSonicRate); + CharacterStatExcel.AddHealedMysticRate(builder, HealedMysticRate); + CharacterStatExcel.AddHealedPierceRate(builder, HealedPierceRate); + CharacterStatExcel.AddHealedExplosionRate(builder, HealedExplosionRate); + CharacterStatExcel.AddHealNormalArmorRate(builder, HealNormalArmorRate); + CharacterStatExcel.AddHealElasticArmorRate(builder, HealElasticArmorRate); + CharacterStatExcel.AddHealUnarmedRate(builder, HealUnarmedRate); + CharacterStatExcel.AddHealHeavyArmorRate(builder, HealHeavyArmorRate); + CharacterStatExcel.AddHealLightArmorRate(builder, HealLightArmorRate); + CharacterStatExcel.AddHealRate(builder, HealRate); + CharacterStatExcel.AddReduceExDamagedRate(builder, ReduceExDamagedRate); + CharacterStatExcel.AddEnhanceExDamageRate(builder, EnhanceExDamageRate); CharacterStatExcel.AddExDamagedRatioDecrease(builder, ExDamagedRatioDecrease); CharacterStatExcel.AddExDamagedRatioIncrease(builder, ExDamagedRatioIncrease); CharacterStatExcel.AddDamagedRatio2Decrease(builder, DamagedRatio2Decrease); @@ -224,7 +263,7 @@ public struct CharacterStatExcel : IFlatbufferObject return CharacterStatExcel.EndCharacterStatExcel(builder); } - public static void StartCharacterStatExcel(FlatBufferBuilder builder) { builder.StartTable(66); } + public static void StartCharacterStatExcel(FlatBufferBuilder builder) { builder.StartTable(79); } public static void AddCharacterId(FlatBufferBuilder builder, long characterId) { builder.AddLong(0, characterId, 0); } public static void AddStabilityRate(FlatBufferBuilder builder, long stabilityRate) { builder.AddLong(1, stabilityRate, 0); } public static void AddStabilityPoint(FlatBufferBuilder builder, long stabilityPoint) { builder.AddLong(2, stabilityPoint, 0); } @@ -287,10 +326,23 @@ public struct CharacterStatExcel : IFlatbufferObject public static void AddDamagedRatio2Decrease(FlatBufferBuilder builder, long damagedRatio2Decrease) { builder.AddLong(59, damagedRatio2Decrease, 0); } public static void AddExDamagedRatioIncrease(FlatBufferBuilder builder, long exDamagedRatioIncrease) { builder.AddLong(60, exDamagedRatioIncrease, 0); } public static void AddExDamagedRatioDecrease(FlatBufferBuilder builder, long exDamagedRatioDecrease) { builder.AddLong(61, exDamagedRatioDecrease, 0); } - public static void AddStreetBattleAdaptation(FlatBufferBuilder builder, SCHALE.Common.FlatData.TerrainAdaptationStat streetBattleAdaptation) { builder.AddInt(62, (int)streetBattleAdaptation, 0); } - public static void AddOutdoorBattleAdaptation(FlatBufferBuilder builder, SCHALE.Common.FlatData.TerrainAdaptationStat outdoorBattleAdaptation) { builder.AddInt(63, (int)outdoorBattleAdaptation, 0); } - public static void AddIndoorBattleAdaptation(FlatBufferBuilder builder, SCHALE.Common.FlatData.TerrainAdaptationStat indoorBattleAdaptation) { builder.AddInt(64, (int)indoorBattleAdaptation, 0); } - public static void AddRegenCost(FlatBufferBuilder builder, long regenCost) { builder.AddLong(65, regenCost, 0); } + public static void AddEnhanceExDamageRate(FlatBufferBuilder builder, long enhanceExDamageRate) { builder.AddLong(62, enhanceExDamageRate, 0); } + public static void AddReduceExDamagedRate(FlatBufferBuilder builder, long reduceExDamagedRate) { builder.AddLong(63, reduceExDamagedRate, 0); } + public static void AddHealRate(FlatBufferBuilder builder, long healRate) { builder.AddLong(64, healRate, 0); } + public static void AddHealLightArmorRate(FlatBufferBuilder builder, long healLightArmorRate) { builder.AddLong(65, healLightArmorRate, 0); } + public static void AddHealHeavyArmorRate(FlatBufferBuilder builder, long healHeavyArmorRate) { builder.AddLong(66, healHeavyArmorRate, 0); } + public static void AddHealUnarmedRate(FlatBufferBuilder builder, long healUnarmedRate) { builder.AddLong(67, healUnarmedRate, 0); } + public static void AddHealElasticArmorRate(FlatBufferBuilder builder, long healElasticArmorRate) { builder.AddLong(68, healElasticArmorRate, 0); } + public static void AddHealNormalArmorRate(FlatBufferBuilder builder, long healNormalArmorRate) { builder.AddLong(69, healNormalArmorRate, 0); } + public static void AddHealedExplosionRate(FlatBufferBuilder builder, long healedExplosionRate) { builder.AddLong(70, healedExplosionRate, 0); } + public static void AddHealedPierceRate(FlatBufferBuilder builder, long healedPierceRate) { builder.AddLong(71, healedPierceRate, 0); } + public static void AddHealedMysticRate(FlatBufferBuilder builder, long healedMysticRate) { builder.AddLong(72, healedMysticRate, 0); } + public static void AddHealedSonicRate(FlatBufferBuilder builder, long healedSonicRate) { builder.AddLong(73, healedSonicRate, 0); } + public static void AddHealedNormalRate(FlatBufferBuilder builder, long healedNormalRate) { builder.AddLong(74, healedNormalRate, 0); } + public static void AddStreetBattleAdaptation(FlatBufferBuilder builder, SCHALE.Common.FlatData.TerrainAdaptationStat streetBattleAdaptation) { builder.AddInt(75, (int)streetBattleAdaptation, 0); } + public static void AddOutdoorBattleAdaptation(FlatBufferBuilder builder, SCHALE.Common.FlatData.TerrainAdaptationStat outdoorBattleAdaptation) { builder.AddInt(76, (int)outdoorBattleAdaptation, 0); } + public static void AddIndoorBattleAdaptation(FlatBufferBuilder builder, SCHALE.Common.FlatData.TerrainAdaptationStat indoorBattleAdaptation) { builder.AddInt(77, (int)indoorBattleAdaptation, 0); } + public static void AddRegenCost(FlatBufferBuilder builder, long regenCost) { builder.AddLong(78, regenCost, 0); } public static Offset EndCharacterStatExcel(FlatBufferBuilder builder) { int o = builder.EndTable(); return new Offset(o); @@ -364,6 +416,19 @@ public struct CharacterStatExcel : IFlatbufferObject _o.DamagedRatio2Decrease = TableEncryptionService.Convert(this.DamagedRatio2Decrease, key); _o.ExDamagedRatioIncrease = TableEncryptionService.Convert(this.ExDamagedRatioIncrease, key); _o.ExDamagedRatioDecrease = TableEncryptionService.Convert(this.ExDamagedRatioDecrease, key); + _o.EnhanceExDamageRate = TableEncryptionService.Convert(this.EnhanceExDamageRate, key); + _o.ReduceExDamagedRate = TableEncryptionService.Convert(this.ReduceExDamagedRate, key); + _o.HealRate = TableEncryptionService.Convert(this.HealRate, key); + _o.HealLightArmorRate = TableEncryptionService.Convert(this.HealLightArmorRate, key); + _o.HealHeavyArmorRate = TableEncryptionService.Convert(this.HealHeavyArmorRate, key); + _o.HealUnarmedRate = TableEncryptionService.Convert(this.HealUnarmedRate, key); + _o.HealElasticArmorRate = TableEncryptionService.Convert(this.HealElasticArmorRate, key); + _o.HealNormalArmorRate = TableEncryptionService.Convert(this.HealNormalArmorRate, key); + _o.HealedExplosionRate = TableEncryptionService.Convert(this.HealedExplosionRate, key); + _o.HealedPierceRate = TableEncryptionService.Convert(this.HealedPierceRate, key); + _o.HealedMysticRate = TableEncryptionService.Convert(this.HealedMysticRate, key); + _o.HealedSonicRate = TableEncryptionService.Convert(this.HealedSonicRate, key); + _o.HealedNormalRate = TableEncryptionService.Convert(this.HealedNormalRate, key); _o.StreetBattleAdaptation = TableEncryptionService.Convert(this.StreetBattleAdaptation, key); _o.OutdoorBattleAdaptation = TableEncryptionService.Convert(this.OutdoorBattleAdaptation, key); _o.IndoorBattleAdaptation = TableEncryptionService.Convert(this.IndoorBattleAdaptation, key); @@ -435,6 +500,19 @@ public struct CharacterStatExcel : IFlatbufferObject _o.DamagedRatio2Decrease, _o.ExDamagedRatioIncrease, _o.ExDamagedRatioDecrease, + _o.EnhanceExDamageRate, + _o.ReduceExDamagedRate, + _o.HealRate, + _o.HealLightArmorRate, + _o.HealHeavyArmorRate, + _o.HealUnarmedRate, + _o.HealElasticArmorRate, + _o.HealNormalArmorRate, + _o.HealedExplosionRate, + _o.HealedPierceRate, + _o.HealedMysticRate, + _o.HealedSonicRate, + _o.HealedNormalRate, _o.StreetBattleAdaptation, _o.OutdoorBattleAdaptation, _o.IndoorBattleAdaptation, @@ -506,6 +584,19 @@ public class CharacterStatExcelT public long DamagedRatio2Decrease { get; set; } public long ExDamagedRatioIncrease { get; set; } public long ExDamagedRatioDecrease { get; set; } + public long EnhanceExDamageRate { get; set; } + public long ReduceExDamagedRate { get; set; } + public long HealRate { get; set; } + public long HealLightArmorRate { get; set; } + public long HealHeavyArmorRate { get; set; } + public long HealUnarmedRate { get; set; } + public long HealElasticArmorRate { get; set; } + public long HealNormalArmorRate { get; set; } + public long HealedExplosionRate { get; set; } + public long HealedPierceRate { get; set; } + public long HealedMysticRate { get; set; } + public long HealedSonicRate { get; set; } + public long HealedNormalRate { get; set; } public SCHALE.Common.FlatData.TerrainAdaptationStat StreetBattleAdaptation { get; set; } public SCHALE.Common.FlatData.TerrainAdaptationStat OutdoorBattleAdaptation { get; set; } public SCHALE.Common.FlatData.TerrainAdaptationStat IndoorBattleAdaptation { get; set; } @@ -574,6 +665,19 @@ public class CharacterStatExcelT this.DamagedRatio2Decrease = 0; this.ExDamagedRatioIncrease = 0; this.ExDamagedRatioDecrease = 0; + this.EnhanceExDamageRate = 0; + this.ReduceExDamagedRate = 0; + this.HealRate = 0; + this.HealLightArmorRate = 0; + this.HealHeavyArmorRate = 0; + this.HealUnarmedRate = 0; + this.HealElasticArmorRate = 0; + this.HealNormalArmorRate = 0; + this.HealedExplosionRate = 0; + this.HealedPierceRate = 0; + this.HealedMysticRate = 0; + this.HealedSonicRate = 0; + this.HealedNormalRate = 0; this.StreetBattleAdaptation = SCHALE.Common.FlatData.TerrainAdaptationStat.D; this.OutdoorBattleAdaptation = SCHALE.Common.FlatData.TerrainAdaptationStat.D; this.IndoorBattleAdaptation = SCHALE.Common.FlatData.TerrainAdaptationStat.D; @@ -649,10 +753,23 @@ static public class CharacterStatExcelVerify && verifier.VerifyField(tablePos, 122 /*DamagedRatio2Decrease*/, 8 /*long*/, 8, false) && verifier.VerifyField(tablePos, 124 /*ExDamagedRatioIncrease*/, 8 /*long*/, 8, false) && verifier.VerifyField(tablePos, 126 /*ExDamagedRatioDecrease*/, 8 /*long*/, 8, false) - && verifier.VerifyField(tablePos, 128 /*StreetBattleAdaptation*/, 4 /*SCHALE.Common.FlatData.TerrainAdaptationStat*/, 4, false) - && verifier.VerifyField(tablePos, 130 /*OutdoorBattleAdaptation*/, 4 /*SCHALE.Common.FlatData.TerrainAdaptationStat*/, 4, false) - && verifier.VerifyField(tablePos, 132 /*IndoorBattleAdaptation*/, 4 /*SCHALE.Common.FlatData.TerrainAdaptationStat*/, 4, false) - && verifier.VerifyField(tablePos, 134 /*RegenCost*/, 8 /*long*/, 8, false) + && verifier.VerifyField(tablePos, 128 /*EnhanceExDamageRate*/, 8 /*long*/, 8, false) + && verifier.VerifyField(tablePos, 130 /*ReduceExDamagedRate*/, 8 /*long*/, 8, false) + && verifier.VerifyField(tablePos, 132 /*HealRate*/, 8 /*long*/, 8, false) + && verifier.VerifyField(tablePos, 134 /*HealLightArmorRate*/, 8 /*long*/, 8, false) + && verifier.VerifyField(tablePos, 136 /*HealHeavyArmorRate*/, 8 /*long*/, 8, false) + && verifier.VerifyField(tablePos, 138 /*HealUnarmedRate*/, 8 /*long*/, 8, false) + && verifier.VerifyField(tablePos, 140 /*HealElasticArmorRate*/, 8 /*long*/, 8, false) + && verifier.VerifyField(tablePos, 142 /*HealNormalArmorRate*/, 8 /*long*/, 8, false) + && verifier.VerifyField(tablePos, 144 /*HealedExplosionRate*/, 8 /*long*/, 8, false) + && verifier.VerifyField(tablePos, 146 /*HealedPierceRate*/, 8 /*long*/, 8, false) + && verifier.VerifyField(tablePos, 148 /*HealedMysticRate*/, 8 /*long*/, 8, false) + && verifier.VerifyField(tablePos, 150 /*HealedSonicRate*/, 8 /*long*/, 8, false) + && verifier.VerifyField(tablePos, 152 /*HealedNormalRate*/, 8 /*long*/, 8, false) + && verifier.VerifyField(tablePos, 154 /*StreetBattleAdaptation*/, 4 /*SCHALE.Common.FlatData.TerrainAdaptationStat*/, 4, false) + && verifier.VerifyField(tablePos, 156 /*OutdoorBattleAdaptation*/, 4 /*SCHALE.Common.FlatData.TerrainAdaptationStat*/, 4, false) + && verifier.VerifyField(tablePos, 158 /*IndoorBattleAdaptation*/, 4 /*SCHALE.Common.FlatData.TerrainAdaptationStat*/, 4, false) + && verifier.VerifyField(tablePos, 160 /*RegenCost*/, 8 /*long*/, 8, false) && verifier.VerifyTableEnd(tablePos); } } diff --git a/SCHALE.Common/FlatData/CharacterStatLimitExcel.cs b/SCHALE.Common/FlatData/CharacterStatLimitExcel.cs index e9b8966..52c4098 100644 --- a/SCHALE.Common/FlatData/CharacterStatLimitExcel.cs +++ b/SCHALE.Common/FlatData/CharacterStatLimitExcel.cs @@ -21,8 +21,8 @@ public struct CharacterStatLimitExcel : IFlatbufferObject public CharacterStatLimitExcel __assign(int _i, ByteBuffer _bb) { __init(_i, _bb); return this; } public long Id { get { int o = __p.__offset(4); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } - public SCHALE.Common.FlatData.TacticEntityType TacticEntityType { get { int o = __p.__offset(6); return o != 0 ? (SCHALE.Common.FlatData.TacticEntityType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.TacticEntityType.None; } } - public SCHALE.Common.FlatData.StatType StatType { get { int o = __p.__offset(8); return o != 0 ? (SCHALE.Common.FlatData.StatType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.StatType.None; } } + public SCHALE.Common.FlatData.TacticEntityType TacticEntityType_ { get { int o = __p.__offset(6); return o != 0 ? (SCHALE.Common.FlatData.TacticEntityType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.TacticEntityType.None; } } + public SCHALE.Common.FlatData.StatType StatType_ { get { int o = __p.__offset(8); return o != 0 ? (SCHALE.Common.FlatData.StatType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.StatType.None; } } public long StatMinValue { get { int o = __p.__offset(10); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public long StatMaxValue { get { int o = __p.__offset(12); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public long StatRatioMinValue { get { int o = __p.__offset(14); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } @@ -30,8 +30,8 @@ public struct CharacterStatLimitExcel : IFlatbufferObject public static Offset CreateCharacterStatLimitExcel(FlatBufferBuilder builder, long Id = 0, - SCHALE.Common.FlatData.TacticEntityType TacticEntityType = SCHALE.Common.FlatData.TacticEntityType.None, - SCHALE.Common.FlatData.StatType StatType = SCHALE.Common.FlatData.StatType.None, + SCHALE.Common.FlatData.TacticEntityType TacticEntityType_ = SCHALE.Common.FlatData.TacticEntityType.None, + SCHALE.Common.FlatData.StatType StatType_ = SCHALE.Common.FlatData.StatType.None, long StatMinValue = 0, long StatMaxValue = 0, long StatRatioMinValue = 0, @@ -42,15 +42,15 @@ public struct CharacterStatLimitExcel : IFlatbufferObject CharacterStatLimitExcel.AddStatMaxValue(builder, StatMaxValue); CharacterStatLimitExcel.AddStatMinValue(builder, StatMinValue); CharacterStatLimitExcel.AddId(builder, Id); - CharacterStatLimitExcel.AddStatType(builder, StatType); - CharacterStatLimitExcel.AddTacticEntityType(builder, TacticEntityType); + CharacterStatLimitExcel.AddStatType_(builder, StatType_); + CharacterStatLimitExcel.AddTacticEntityType_(builder, TacticEntityType_); return CharacterStatLimitExcel.EndCharacterStatLimitExcel(builder); } public static void StartCharacterStatLimitExcel(FlatBufferBuilder builder) { builder.StartTable(7); } public static void AddId(FlatBufferBuilder builder, long id) { builder.AddLong(0, id, 0); } - public static void AddTacticEntityType(FlatBufferBuilder builder, SCHALE.Common.FlatData.TacticEntityType tacticEntityType) { builder.AddInt(1, (int)tacticEntityType, 0); } - public static void AddStatType(FlatBufferBuilder builder, SCHALE.Common.FlatData.StatType statType) { builder.AddInt(2, (int)statType, 0); } + public static void AddTacticEntityType_(FlatBufferBuilder builder, SCHALE.Common.FlatData.TacticEntityType tacticEntityType_) { builder.AddInt(1, (int)tacticEntityType_, 0); } + public static void AddStatType_(FlatBufferBuilder builder, SCHALE.Common.FlatData.StatType statType_) { builder.AddInt(2, (int)statType_, 0); } public static void AddStatMinValue(FlatBufferBuilder builder, long statMinValue) { builder.AddLong(3, statMinValue, 0); } public static void AddStatMaxValue(FlatBufferBuilder builder, long statMaxValue) { builder.AddLong(4, statMaxValue, 0); } public static void AddStatRatioMinValue(FlatBufferBuilder builder, long statRatioMinValue) { builder.AddLong(5, statRatioMinValue, 0); } @@ -67,8 +67,8 @@ public struct CharacterStatLimitExcel : IFlatbufferObject public void UnPackTo(CharacterStatLimitExcelT _o) { byte[] key = TableEncryptionService.CreateKey("CharacterStatLimit"); _o.Id = TableEncryptionService.Convert(this.Id, key); - _o.TacticEntityType = TableEncryptionService.Convert(this.TacticEntityType, key); - _o.StatType = TableEncryptionService.Convert(this.StatType, key); + _o.TacticEntityType_ = TableEncryptionService.Convert(this.TacticEntityType_, key); + _o.StatType_ = TableEncryptionService.Convert(this.StatType_, key); _o.StatMinValue = TableEncryptionService.Convert(this.StatMinValue, key); _o.StatMaxValue = TableEncryptionService.Convert(this.StatMaxValue, key); _o.StatRatioMinValue = TableEncryptionService.Convert(this.StatRatioMinValue, key); @@ -79,8 +79,8 @@ public struct CharacterStatLimitExcel : IFlatbufferObject return CreateCharacterStatLimitExcel( builder, _o.Id, - _o.TacticEntityType, - _o.StatType, + _o.TacticEntityType_, + _o.StatType_, _o.StatMinValue, _o.StatMaxValue, _o.StatRatioMinValue, @@ -91,8 +91,8 @@ public struct CharacterStatLimitExcel : IFlatbufferObject public class CharacterStatLimitExcelT { public long Id { get; set; } - public SCHALE.Common.FlatData.TacticEntityType TacticEntityType { get; set; } - public SCHALE.Common.FlatData.StatType StatType { get; set; } + public SCHALE.Common.FlatData.TacticEntityType TacticEntityType_ { get; set; } + public SCHALE.Common.FlatData.StatType StatType_ { get; set; } public long StatMinValue { get; set; } public long StatMaxValue { get; set; } public long StatRatioMinValue { get; set; } @@ -100,8 +100,8 @@ public class CharacterStatLimitExcelT public CharacterStatLimitExcelT() { this.Id = 0; - this.TacticEntityType = SCHALE.Common.FlatData.TacticEntityType.None; - this.StatType = SCHALE.Common.FlatData.StatType.None; + this.TacticEntityType_ = SCHALE.Common.FlatData.TacticEntityType.None; + this.StatType_ = SCHALE.Common.FlatData.StatType.None; this.StatMinValue = 0; this.StatMaxValue = 0; this.StatRatioMinValue = 0; @@ -116,8 +116,8 @@ static public class CharacterStatLimitExcelVerify { return verifier.VerifyTableStart(tablePos) && verifier.VerifyField(tablePos, 4 /*Id*/, 8 /*long*/, 8, false) - && verifier.VerifyField(tablePos, 6 /*TacticEntityType*/, 4 /*SCHALE.Common.FlatData.TacticEntityType*/, 4, false) - && verifier.VerifyField(tablePos, 8 /*StatType*/, 4 /*SCHALE.Common.FlatData.StatType*/, 4, false) + && verifier.VerifyField(tablePos, 6 /*TacticEntityType_*/, 4 /*SCHALE.Common.FlatData.TacticEntityType*/, 4, false) + && verifier.VerifyField(tablePos, 8 /*StatType_*/, 4 /*SCHALE.Common.FlatData.StatType*/, 4, false) && verifier.VerifyField(tablePos, 10 /*StatMinValue*/, 8 /*long*/, 8, false) && verifier.VerifyField(tablePos, 12 /*StatMaxValue*/, 8 /*long*/, 8, false) && verifier.VerifyField(tablePos, 14 /*StatRatioMinValue*/, 8 /*long*/, 8, false) diff --git a/SCHALE.Common/FlatData/CharacterStatsTransExcel.cs b/SCHALE.Common/FlatData/CharacterStatsTransExcel.cs index fc9aa45..c6ba679 100644 --- a/SCHALE.Common/FlatData/CharacterStatsTransExcel.cs +++ b/SCHALE.Common/FlatData/CharacterStatsTransExcel.cs @@ -21,28 +21,28 @@ public struct CharacterStatsTransExcel : IFlatbufferObject public CharacterStatsTransExcel __assign(int _i, ByteBuffer _bb) { __init(_i, _bb); return this; } public SCHALE.Common.FlatData.StatType TransSupportStats { get { int o = __p.__offset(4); return o != 0 ? (SCHALE.Common.FlatData.StatType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.StatType.None; } } - public SCHALE.Common.FlatData.EchelonExtensionType EchelonExtensionType { get { int o = __p.__offset(6); return o != 0 ? (SCHALE.Common.FlatData.EchelonExtensionType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.EchelonExtensionType.Base; } } + public SCHALE.Common.FlatData.EchelonExtensionType EchelonExtensionType_ { get { int o = __p.__offset(6); return o != 0 ? (SCHALE.Common.FlatData.EchelonExtensionType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.EchelonExtensionType.Base; } } public int TransSupportStatsFactor { get { int o = __p.__offset(8); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } - public SCHALE.Common.FlatData.StatTransType StatTransType { get { int o = __p.__offset(10); return o != 0 ? (SCHALE.Common.FlatData.StatTransType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.StatTransType.SpecialTransStat; } } + public SCHALE.Common.FlatData.StatTransType StatTransType_ { get { int o = __p.__offset(10); return o != 0 ? (SCHALE.Common.FlatData.StatTransType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.StatTransType.SpecialTransStat; } } public static Offset CreateCharacterStatsTransExcel(FlatBufferBuilder builder, SCHALE.Common.FlatData.StatType TransSupportStats = SCHALE.Common.FlatData.StatType.None, - SCHALE.Common.FlatData.EchelonExtensionType EchelonExtensionType = SCHALE.Common.FlatData.EchelonExtensionType.Base, + SCHALE.Common.FlatData.EchelonExtensionType EchelonExtensionType_ = SCHALE.Common.FlatData.EchelonExtensionType.Base, int TransSupportStatsFactor = 0, - SCHALE.Common.FlatData.StatTransType StatTransType = SCHALE.Common.FlatData.StatTransType.SpecialTransStat) { + SCHALE.Common.FlatData.StatTransType StatTransType_ = SCHALE.Common.FlatData.StatTransType.SpecialTransStat) { builder.StartTable(4); - CharacterStatsTransExcel.AddStatTransType(builder, StatTransType); + CharacterStatsTransExcel.AddStatTransType_(builder, StatTransType_); CharacterStatsTransExcel.AddTransSupportStatsFactor(builder, TransSupportStatsFactor); - CharacterStatsTransExcel.AddEchelonExtensionType(builder, EchelonExtensionType); + CharacterStatsTransExcel.AddEchelonExtensionType_(builder, EchelonExtensionType_); CharacterStatsTransExcel.AddTransSupportStats(builder, TransSupportStats); return CharacterStatsTransExcel.EndCharacterStatsTransExcel(builder); } public static void StartCharacterStatsTransExcel(FlatBufferBuilder builder) { builder.StartTable(4); } public static void AddTransSupportStats(FlatBufferBuilder builder, SCHALE.Common.FlatData.StatType transSupportStats) { builder.AddInt(0, (int)transSupportStats, 0); } - public static void AddEchelonExtensionType(FlatBufferBuilder builder, SCHALE.Common.FlatData.EchelonExtensionType echelonExtensionType) { builder.AddInt(1, (int)echelonExtensionType, 0); } + public static void AddEchelonExtensionType_(FlatBufferBuilder builder, SCHALE.Common.FlatData.EchelonExtensionType echelonExtensionType_) { builder.AddInt(1, (int)echelonExtensionType_, 0); } public static void AddTransSupportStatsFactor(FlatBufferBuilder builder, int transSupportStatsFactor) { builder.AddInt(2, transSupportStatsFactor, 0); } - public static void AddStatTransType(FlatBufferBuilder builder, SCHALE.Common.FlatData.StatTransType statTransType) { builder.AddInt(3, (int)statTransType, 0); } + public static void AddStatTransType_(FlatBufferBuilder builder, SCHALE.Common.FlatData.StatTransType statTransType_) { builder.AddInt(3, (int)statTransType_, 0); } public static Offset EndCharacterStatsTransExcel(FlatBufferBuilder builder) { int o = builder.EndTable(); return new Offset(o); @@ -55,33 +55,33 @@ public struct CharacterStatsTransExcel : IFlatbufferObject public void UnPackTo(CharacterStatsTransExcelT _o) { byte[] key = TableEncryptionService.CreateKey("CharacterStatsTrans"); _o.TransSupportStats = TableEncryptionService.Convert(this.TransSupportStats, key); - _o.EchelonExtensionType = TableEncryptionService.Convert(this.EchelonExtensionType, key); + _o.EchelonExtensionType_ = TableEncryptionService.Convert(this.EchelonExtensionType_, key); _o.TransSupportStatsFactor = TableEncryptionService.Convert(this.TransSupportStatsFactor, key); - _o.StatTransType = TableEncryptionService.Convert(this.StatTransType, key); + _o.StatTransType_ = TableEncryptionService.Convert(this.StatTransType_, key); } public static Offset Pack(FlatBufferBuilder builder, CharacterStatsTransExcelT _o) { if (_o == null) return default(Offset); return CreateCharacterStatsTransExcel( builder, _o.TransSupportStats, - _o.EchelonExtensionType, + _o.EchelonExtensionType_, _o.TransSupportStatsFactor, - _o.StatTransType); + _o.StatTransType_); } } public class CharacterStatsTransExcelT { public SCHALE.Common.FlatData.StatType TransSupportStats { get; set; } - public SCHALE.Common.FlatData.EchelonExtensionType EchelonExtensionType { get; set; } + public SCHALE.Common.FlatData.EchelonExtensionType EchelonExtensionType_ { get; set; } public int TransSupportStatsFactor { get; set; } - public SCHALE.Common.FlatData.StatTransType StatTransType { get; set; } + public SCHALE.Common.FlatData.StatTransType StatTransType_ { get; set; } public CharacterStatsTransExcelT() { this.TransSupportStats = SCHALE.Common.FlatData.StatType.None; - this.EchelonExtensionType = SCHALE.Common.FlatData.EchelonExtensionType.Base; + this.EchelonExtensionType_ = SCHALE.Common.FlatData.EchelonExtensionType.Base; this.TransSupportStatsFactor = 0; - this.StatTransType = SCHALE.Common.FlatData.StatTransType.SpecialTransStat; + this.StatTransType_ = SCHALE.Common.FlatData.StatTransType.SpecialTransStat; } } @@ -92,9 +92,9 @@ static public class CharacterStatsTransExcelVerify { return verifier.VerifyTableStart(tablePos) && verifier.VerifyField(tablePos, 4 /*TransSupportStats*/, 4 /*SCHALE.Common.FlatData.StatType*/, 4, false) - && verifier.VerifyField(tablePos, 6 /*EchelonExtensionType*/, 4 /*SCHALE.Common.FlatData.EchelonExtensionType*/, 4, false) + && verifier.VerifyField(tablePos, 6 /*EchelonExtensionType_*/, 4 /*SCHALE.Common.FlatData.EchelonExtensionType*/, 4, false) && verifier.VerifyField(tablePos, 8 /*TransSupportStatsFactor*/, 4 /*int*/, 4, false) - && verifier.VerifyField(tablePos, 10 /*StatTransType*/, 4 /*SCHALE.Common.FlatData.StatTransType*/, 4, false) + && verifier.VerifyField(tablePos, 10 /*StatTransType_*/, 4 /*SCHALE.Common.FlatData.StatTransType*/, 4, false) && verifier.VerifyTableEnd(tablePos); } } diff --git a/SCHALE.Common/FlatData/CharacterTranscendenceExcel.cs b/SCHALE.Common/FlatData/CharacterTranscendenceExcel.cs index 7d6af4b..86372f7 100644 --- a/SCHALE.Common/FlatData/CharacterTranscendenceExcel.cs +++ b/SCHALE.Common/FlatData/CharacterTranscendenceExcel.cs @@ -65,14 +65,16 @@ public struct CharacterTranscendenceExcel : IFlatbufferObject public int SkillSlotALength { get { int o = __p.__offset(16); return o != 0 ? __p.__vector_len(o) : 0; } } public string SkillSlotB(int j) { int o = __p.__offset(18); return o != 0 ? __p.__string(__p.__vector(o) + j * 4) : null; } public int SkillSlotBLength { get { int o = __p.__offset(18); return o != 0 ? __p.__vector_len(o) : 0; } } - public int MaxlevelStar(int j) { int o = __p.__offset(20); return o != 0 ? __p.bb.GetInt(__p.__vector(o) + j * 4) : (int)0; } - public int MaxlevelStarLength { get { int o = __p.__offset(20); return o != 0 ? __p.__vector_len(o) : 0; } } + public string SkillSlotC(int j) { int o = __p.__offset(20); return o != 0 ? __p.__string(__p.__vector(o) + j * 4) : null; } + public int SkillSlotCLength { get { int o = __p.__offset(20); return o != 0 ? __p.__vector_len(o) : 0; } } + public int MaxlevelStar(int j) { int o = __p.__offset(22); return o != 0 ? __p.bb.GetInt(__p.__vector(o) + j * 4) : (int)0; } + public int MaxlevelStarLength { get { int o = __p.__offset(22); return o != 0 ? __p.__vector_len(o) : 0; } } #if ENABLE_SPAN_T - public Span GetMaxlevelStarBytes() { return __p.__vector_as_span(20, 4); } + public Span GetMaxlevelStarBytes() { return __p.__vector_as_span(22, 4); } #else - public ArraySegment? GetMaxlevelStarBytes() { return __p.__vector_as_arraysegment(20); } + public ArraySegment? GetMaxlevelStarBytes() { return __p.__vector_as_arraysegment(22); } #endif - public int[] GetMaxlevelStarArray() { return __p.__vector_as_array(20); } + public int[] GetMaxlevelStarArray() { return __p.__vector_as_array(22); } public static Offset CreateCharacterTranscendenceExcel(FlatBufferBuilder builder, long CharacterId = 0, @@ -83,10 +85,12 @@ public struct CharacterTranscendenceExcel : IFlatbufferObject VectorOffset RecipeIdOffset = default(VectorOffset), VectorOffset SkillSlotAOffset = default(VectorOffset), VectorOffset SkillSlotBOffset = default(VectorOffset), + VectorOffset SkillSlotCOffset = default(VectorOffset), VectorOffset MaxlevelStarOffset = default(VectorOffset)) { - builder.StartTable(9); + builder.StartTable(10); CharacterTranscendenceExcel.AddCharacterId(builder, CharacterId); CharacterTranscendenceExcel.AddMaxlevelStar(builder, MaxlevelStarOffset); + CharacterTranscendenceExcel.AddSkillSlotC(builder, SkillSlotCOffset); CharacterTranscendenceExcel.AddSkillSlotB(builder, SkillSlotBOffset); CharacterTranscendenceExcel.AddSkillSlotA(builder, SkillSlotAOffset); CharacterTranscendenceExcel.AddRecipeId(builder, RecipeIdOffset); @@ -97,7 +101,7 @@ public struct CharacterTranscendenceExcel : IFlatbufferObject return CharacterTranscendenceExcel.EndCharacterTranscendenceExcel(builder); } - public static void StartCharacterTranscendenceExcel(FlatBufferBuilder builder) { builder.StartTable(9); } + public static void StartCharacterTranscendenceExcel(FlatBufferBuilder builder) { builder.StartTable(10); } public static void AddCharacterId(FlatBufferBuilder builder, long characterId) { builder.AddLong(0, characterId, 0); } public static void AddMaxFavorLevel(FlatBufferBuilder builder, VectorOffset maxFavorLevelOffset) { builder.AddOffset(1, maxFavorLevelOffset.Value, 0); } public static VectorOffset CreateMaxFavorLevelVector(FlatBufferBuilder builder, int[] data) { builder.StartVector(4, data.Length, 4); for (int i = data.Length - 1; i >= 0; i--) builder.AddInt(data[i]); return builder.EndVector(); } @@ -141,7 +145,13 @@ public struct CharacterTranscendenceExcel : IFlatbufferObject public static VectorOffset CreateSkillSlotBVectorBlock(FlatBufferBuilder builder, ArraySegment data) { builder.StartVector(4, data.Count, 4); builder.Add(data); return builder.EndVector(); } public static VectorOffset CreateSkillSlotBVectorBlock(FlatBufferBuilder builder, IntPtr dataPtr, int sizeInBytes) { builder.StartVector(1, sizeInBytes, 1); builder.Add(dataPtr, sizeInBytes); return builder.EndVector(); } public static void StartSkillSlotBVector(FlatBufferBuilder builder, int numElems) { builder.StartVector(4, numElems, 4); } - public static void AddMaxlevelStar(FlatBufferBuilder builder, VectorOffset maxlevelStarOffset) { builder.AddOffset(8, maxlevelStarOffset.Value, 0); } + public static void AddSkillSlotC(FlatBufferBuilder builder, VectorOffset skillSlotCOffset) { builder.AddOffset(8, skillSlotCOffset.Value, 0); } + public static VectorOffset CreateSkillSlotCVector(FlatBufferBuilder builder, StringOffset[] data) { builder.StartVector(4, data.Length, 4); for (int i = data.Length - 1; i >= 0; i--) builder.AddOffset(data[i].Value); return builder.EndVector(); } + public static VectorOffset CreateSkillSlotCVectorBlock(FlatBufferBuilder builder, StringOffset[] data) { builder.StartVector(4, data.Length, 4); builder.Add(data); return builder.EndVector(); } + public static VectorOffset CreateSkillSlotCVectorBlock(FlatBufferBuilder builder, ArraySegment data) { builder.StartVector(4, data.Count, 4); builder.Add(data); return builder.EndVector(); } + public static VectorOffset CreateSkillSlotCVectorBlock(FlatBufferBuilder builder, IntPtr dataPtr, int sizeInBytes) { builder.StartVector(1, sizeInBytes, 1); builder.Add(dataPtr, sizeInBytes); return builder.EndVector(); } + public static void StartSkillSlotCVector(FlatBufferBuilder builder, int numElems) { builder.StartVector(4, numElems, 4); } + public static void AddMaxlevelStar(FlatBufferBuilder builder, VectorOffset maxlevelStarOffset) { builder.AddOffset(9, maxlevelStarOffset.Value, 0); } public static VectorOffset CreateMaxlevelStarVector(FlatBufferBuilder builder, int[] data) { builder.StartVector(4, data.Length, 4); for (int i = data.Length - 1; i >= 0; i--) builder.AddInt(data[i]); return builder.EndVector(); } public static VectorOffset CreateMaxlevelStarVectorBlock(FlatBufferBuilder builder, int[] data) { builder.StartVector(4, data.Length, 4); builder.Add(data); return builder.EndVector(); } public static VectorOffset CreateMaxlevelStarVectorBlock(FlatBufferBuilder builder, ArraySegment data) { builder.StartVector(4, data.Count, 4); builder.Add(data); return builder.EndVector(); } @@ -173,6 +183,8 @@ public struct CharacterTranscendenceExcel : IFlatbufferObject for (var _j = 0; _j < this.SkillSlotALength; ++_j) {_o.SkillSlotA.Add(TableEncryptionService.Convert(this.SkillSlotA(_j), key));} _o.SkillSlotB = new List(); for (var _j = 0; _j < this.SkillSlotBLength; ++_j) {_o.SkillSlotB.Add(TableEncryptionService.Convert(this.SkillSlotB(_j), key));} + _o.SkillSlotC = new List(); + for (var _j = 0; _j < this.SkillSlotCLength; ++_j) {_o.SkillSlotC.Add(TableEncryptionService.Convert(this.SkillSlotC(_j), key));} _o.MaxlevelStar = new List(); for (var _j = 0; _j < this.MaxlevelStarLength; ++_j) {_o.MaxlevelStar.Add(TableEncryptionService.Convert(this.MaxlevelStar(_j), key));} } @@ -215,6 +227,12 @@ public struct CharacterTranscendenceExcel : IFlatbufferObject for (var _j = 0; _j < __SkillSlotB.Length; ++_j) { __SkillSlotB[_j] = builder.CreateString(_o.SkillSlotB[_j]); } _SkillSlotB = CreateSkillSlotBVector(builder, __SkillSlotB); } + var _SkillSlotC = default(VectorOffset); + if (_o.SkillSlotC != null) { + var __SkillSlotC = new StringOffset[_o.SkillSlotC.Count]; + for (var _j = 0; _j < __SkillSlotC.Length; ++_j) { __SkillSlotC[_j] = builder.CreateString(_o.SkillSlotC[_j]); } + _SkillSlotC = CreateSkillSlotCVector(builder, __SkillSlotC); + } var _MaxlevelStar = default(VectorOffset); if (_o.MaxlevelStar != null) { var __MaxlevelStar = _o.MaxlevelStar.ToArray(); @@ -230,6 +248,7 @@ public struct CharacterTranscendenceExcel : IFlatbufferObject _RecipeId, _SkillSlotA, _SkillSlotB, + _SkillSlotC, _MaxlevelStar); } } @@ -244,6 +263,7 @@ public class CharacterTranscendenceExcelT public List RecipeId { get; set; } public List SkillSlotA { get; set; } public List SkillSlotB { get; set; } + public List SkillSlotC { get; set; } public List MaxlevelStar { get; set; } public CharacterTranscendenceExcelT() { @@ -255,6 +275,7 @@ public class CharacterTranscendenceExcelT this.RecipeId = null; this.SkillSlotA = null; this.SkillSlotB = null; + this.SkillSlotC = null; this.MaxlevelStar = null; } } @@ -273,7 +294,8 @@ static public class CharacterTranscendenceExcelVerify && verifier.VerifyVectorOfData(tablePos, 14 /*RecipeId*/, 8 /*long*/, false) && verifier.VerifyVectorOfStrings(tablePos, 16 /*SkillSlotA*/, false) && verifier.VerifyVectorOfStrings(tablePos, 18 /*SkillSlotB*/, false) - && verifier.VerifyVectorOfData(tablePos, 20 /*MaxlevelStar*/, 4 /*int*/, false) + && verifier.VerifyVectorOfStrings(tablePos, 20 /*SkillSlotC*/, false) + && verifier.VerifyVectorOfData(tablePos, 22 /*MaxlevelStar*/, 4 /*int*/, false) && verifier.VerifyTableEnd(tablePos); } } diff --git a/SCHALE.Common/FlatData/CharacterVictoryInteractionExcel.cs b/SCHALE.Common/FlatData/CharacterVictoryInteractionExcel.cs index f2e0905..929b3d1 100644 --- a/SCHALE.Common/FlatData/CharacterVictoryInteractionExcel.cs +++ b/SCHALE.Common/FlatData/CharacterVictoryInteractionExcel.cs @@ -37,86 +37,92 @@ public struct CharacterVictoryInteractionExcel : IFlatbufferObject public ArraySegment? GetVictoryEndAnimationPath01Bytes() { return __p.__vector_as_arraysegment(12); } #endif public byte[] GetVictoryEndAnimationPath01Array() { return __p.__vector_as_array(12); } - public long CostumeId02 { get { int o = __p.__offset(14); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } - public int PositionIndex02 { get { int o = __p.__offset(16); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } - public string VictoryStartAnimationPath02 { get { int o = __p.__offset(18); return o != 0 ? __p.__string(o + __p.bb_pos) : null; } } + public SCHALE.Common.FlatData.VoiceEvent VoiceEvent01 { get { int o = __p.__offset(14); return o != 0 ? (SCHALE.Common.FlatData.VoiceEvent)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.VoiceEvent.OnTSA; } } + public long CostumeId02 { get { int o = __p.__offset(16); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } + public int PositionIndex02 { get { int o = __p.__offset(18); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } + public string VictoryStartAnimationPath02 { get { int o = __p.__offset(20); return o != 0 ? __p.__string(o + __p.bb_pos) : null; } } #if ENABLE_SPAN_T - public Span GetVictoryStartAnimationPath02Bytes() { return __p.__vector_as_span(18, 1); } + public Span GetVictoryStartAnimationPath02Bytes() { return __p.__vector_as_span(20, 1); } #else - public ArraySegment? GetVictoryStartAnimationPath02Bytes() { return __p.__vector_as_arraysegment(18); } + public ArraySegment? GetVictoryStartAnimationPath02Bytes() { return __p.__vector_as_arraysegment(20); } #endif - public byte[] GetVictoryStartAnimationPath02Array() { return __p.__vector_as_array(18); } - public string VictoryEndAnimationPath02 { get { int o = __p.__offset(20); return o != 0 ? __p.__string(o + __p.bb_pos) : null; } } + public byte[] GetVictoryStartAnimationPath02Array() { return __p.__vector_as_array(20); } + public string VictoryEndAnimationPath02 { get { int o = __p.__offset(22); return o != 0 ? __p.__string(o + __p.bb_pos) : null; } } #if ENABLE_SPAN_T - public Span GetVictoryEndAnimationPath02Bytes() { return __p.__vector_as_span(20, 1); } + public Span GetVictoryEndAnimationPath02Bytes() { return __p.__vector_as_span(22, 1); } #else - public ArraySegment? GetVictoryEndAnimationPath02Bytes() { return __p.__vector_as_arraysegment(20); } + public ArraySegment? GetVictoryEndAnimationPath02Bytes() { return __p.__vector_as_arraysegment(22); } #endif - public byte[] GetVictoryEndAnimationPath02Array() { return __p.__vector_as_array(20); } - public long CostumeId03 { get { int o = __p.__offset(22); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } - public int PositionIndex03 { get { int o = __p.__offset(24); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } - public string VictoryStartAnimationPath03 { get { int o = __p.__offset(26); return o != 0 ? __p.__string(o + __p.bb_pos) : null; } } + public byte[] GetVictoryEndAnimationPath02Array() { return __p.__vector_as_array(22); } + public SCHALE.Common.FlatData.VoiceEvent VoiceEvent02 { get { int o = __p.__offset(24); return o != 0 ? (SCHALE.Common.FlatData.VoiceEvent)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.VoiceEvent.OnTSA; } } + public long CostumeId03 { get { int o = __p.__offset(26); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } + public int PositionIndex03 { get { int o = __p.__offset(28); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } + public string VictoryStartAnimationPath03 { get { int o = __p.__offset(30); return o != 0 ? __p.__string(o + __p.bb_pos) : null; } } #if ENABLE_SPAN_T - public Span GetVictoryStartAnimationPath03Bytes() { return __p.__vector_as_span(26, 1); } + public Span GetVictoryStartAnimationPath03Bytes() { return __p.__vector_as_span(30, 1); } #else - public ArraySegment? GetVictoryStartAnimationPath03Bytes() { return __p.__vector_as_arraysegment(26); } + public ArraySegment? GetVictoryStartAnimationPath03Bytes() { return __p.__vector_as_arraysegment(30); } #endif - public byte[] GetVictoryStartAnimationPath03Array() { return __p.__vector_as_array(26); } - public string VictoryEndAnimationPath03 { get { int o = __p.__offset(28); return o != 0 ? __p.__string(o + __p.bb_pos) : null; } } + public byte[] GetVictoryStartAnimationPath03Array() { return __p.__vector_as_array(30); } + public string VictoryEndAnimationPath03 { get { int o = __p.__offset(32); return o != 0 ? __p.__string(o + __p.bb_pos) : null; } } #if ENABLE_SPAN_T - public Span GetVictoryEndAnimationPath03Bytes() { return __p.__vector_as_span(28, 1); } + public Span GetVictoryEndAnimationPath03Bytes() { return __p.__vector_as_span(32, 1); } #else - public ArraySegment? GetVictoryEndAnimationPath03Bytes() { return __p.__vector_as_arraysegment(28); } + public ArraySegment? GetVictoryEndAnimationPath03Bytes() { return __p.__vector_as_arraysegment(32); } #endif - public byte[] GetVictoryEndAnimationPath03Array() { return __p.__vector_as_array(28); } - public long CostumeId04 { get { int o = __p.__offset(30); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } - public int PositionIndex04 { get { int o = __p.__offset(32); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } - public string VictoryStartAnimationPath04 { get { int o = __p.__offset(34); return o != 0 ? __p.__string(o + __p.bb_pos) : null; } } + public byte[] GetVictoryEndAnimationPath03Array() { return __p.__vector_as_array(32); } + public SCHALE.Common.FlatData.VoiceEvent VoiceEvent03 { get { int o = __p.__offset(34); return o != 0 ? (SCHALE.Common.FlatData.VoiceEvent)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.VoiceEvent.OnTSA; } } + public long CostumeId04 { get { int o = __p.__offset(36); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } + public int PositionIndex04 { get { int o = __p.__offset(38); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } + public string VictoryStartAnimationPath04 { get { int o = __p.__offset(40); return o != 0 ? __p.__string(o + __p.bb_pos) : null; } } #if ENABLE_SPAN_T - public Span GetVictoryStartAnimationPath04Bytes() { return __p.__vector_as_span(34, 1); } + public Span GetVictoryStartAnimationPath04Bytes() { return __p.__vector_as_span(40, 1); } #else - public ArraySegment? GetVictoryStartAnimationPath04Bytes() { return __p.__vector_as_arraysegment(34); } + public ArraySegment? GetVictoryStartAnimationPath04Bytes() { return __p.__vector_as_arraysegment(40); } #endif - public byte[] GetVictoryStartAnimationPath04Array() { return __p.__vector_as_array(34); } - public string VictoryEndAnimationPath04 { get { int o = __p.__offset(36); return o != 0 ? __p.__string(o + __p.bb_pos) : null; } } + public byte[] GetVictoryStartAnimationPath04Array() { return __p.__vector_as_array(40); } + public string VictoryEndAnimationPath04 { get { int o = __p.__offset(42); return o != 0 ? __p.__string(o + __p.bb_pos) : null; } } #if ENABLE_SPAN_T - public Span GetVictoryEndAnimationPath04Bytes() { return __p.__vector_as_span(36, 1); } + public Span GetVictoryEndAnimationPath04Bytes() { return __p.__vector_as_span(42, 1); } #else - public ArraySegment? GetVictoryEndAnimationPath04Bytes() { return __p.__vector_as_arraysegment(36); } + public ArraySegment? GetVictoryEndAnimationPath04Bytes() { return __p.__vector_as_arraysegment(42); } #endif - public byte[] GetVictoryEndAnimationPath04Array() { return __p.__vector_as_array(36); } - public long CostumeId05 { get { int o = __p.__offset(38); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } - public int PositionIndex05 { get { int o = __p.__offset(40); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } - public string VictoryStartAnimationPath05 { get { int o = __p.__offset(42); return o != 0 ? __p.__string(o + __p.bb_pos) : null; } } + public byte[] GetVictoryEndAnimationPath04Array() { return __p.__vector_as_array(42); } + public SCHALE.Common.FlatData.VoiceEvent VoiceEvent04 { get { int o = __p.__offset(44); return o != 0 ? (SCHALE.Common.FlatData.VoiceEvent)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.VoiceEvent.OnTSA; } } + public long CostumeId05 { get { int o = __p.__offset(46); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } + public int PositionIndex05 { get { int o = __p.__offset(48); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } + public string VictoryStartAnimationPath05 { get { int o = __p.__offset(50); return o != 0 ? __p.__string(o + __p.bb_pos) : null; } } #if ENABLE_SPAN_T - public Span GetVictoryStartAnimationPath05Bytes() { return __p.__vector_as_span(42, 1); } + public Span GetVictoryStartAnimationPath05Bytes() { return __p.__vector_as_span(50, 1); } #else - public ArraySegment? GetVictoryStartAnimationPath05Bytes() { return __p.__vector_as_arraysegment(42); } + public ArraySegment? GetVictoryStartAnimationPath05Bytes() { return __p.__vector_as_arraysegment(50); } #endif - public byte[] GetVictoryStartAnimationPath05Array() { return __p.__vector_as_array(42); } - public string VictoryEndAnimationPath05 { get { int o = __p.__offset(44); return o != 0 ? __p.__string(o + __p.bb_pos) : null; } } + public byte[] GetVictoryStartAnimationPath05Array() { return __p.__vector_as_array(50); } + public string VictoryEndAnimationPath05 { get { int o = __p.__offset(52); return o != 0 ? __p.__string(o + __p.bb_pos) : null; } } #if ENABLE_SPAN_T - public Span GetVictoryEndAnimationPath05Bytes() { return __p.__vector_as_span(44, 1); } + public Span GetVictoryEndAnimationPath05Bytes() { return __p.__vector_as_span(52, 1); } #else - public ArraySegment? GetVictoryEndAnimationPath05Bytes() { return __p.__vector_as_arraysegment(44); } + public ArraySegment? GetVictoryEndAnimationPath05Bytes() { return __p.__vector_as_arraysegment(52); } #endif - public byte[] GetVictoryEndAnimationPath05Array() { return __p.__vector_as_array(44); } - public long CostumeId06 { get { int o = __p.__offset(46); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } - public int PositionIndex06 { get { int o = __p.__offset(48); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } - public string VictoryStartAnimationPath06 { get { int o = __p.__offset(50); return o != 0 ? __p.__string(o + __p.bb_pos) : null; } } + public byte[] GetVictoryEndAnimationPath05Array() { return __p.__vector_as_array(52); } + public SCHALE.Common.FlatData.VoiceEvent VoiceEvent05 { get { int o = __p.__offset(54); return o != 0 ? (SCHALE.Common.FlatData.VoiceEvent)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.VoiceEvent.OnTSA; } } + public long CostumeId06 { get { int o = __p.__offset(56); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } + public int PositionIndex06 { get { int o = __p.__offset(58); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } + public string VictoryStartAnimationPath06 { get { int o = __p.__offset(60); return o != 0 ? __p.__string(o + __p.bb_pos) : null; } } #if ENABLE_SPAN_T - public Span GetVictoryStartAnimationPath06Bytes() { return __p.__vector_as_span(50, 1); } + public Span GetVictoryStartAnimationPath06Bytes() { return __p.__vector_as_span(60, 1); } #else - public ArraySegment? GetVictoryStartAnimationPath06Bytes() { return __p.__vector_as_arraysegment(50); } + public ArraySegment? GetVictoryStartAnimationPath06Bytes() { return __p.__vector_as_arraysegment(60); } #endif - public byte[] GetVictoryStartAnimationPath06Array() { return __p.__vector_as_array(50); } - public string VictoryEndAnimationPath06 { get { int o = __p.__offset(52); return o != 0 ? __p.__string(o + __p.bb_pos) : null; } } + public byte[] GetVictoryStartAnimationPath06Array() { return __p.__vector_as_array(60); } + public string VictoryEndAnimationPath06 { get { int o = __p.__offset(62); return o != 0 ? __p.__string(o + __p.bb_pos) : null; } } #if ENABLE_SPAN_T - public Span GetVictoryEndAnimationPath06Bytes() { return __p.__vector_as_span(52, 1); } + public Span GetVictoryEndAnimationPath06Bytes() { return __p.__vector_as_span(62, 1); } #else - public ArraySegment? GetVictoryEndAnimationPath06Bytes() { return __p.__vector_as_arraysegment(52); } + public ArraySegment? GetVictoryEndAnimationPath06Bytes() { return __p.__vector_as_arraysegment(62); } #endif - public byte[] GetVictoryEndAnimationPath06Array() { return __p.__vector_as_array(52); } + public byte[] GetVictoryEndAnimationPath06Array() { return __p.__vector_as_array(62); } + public SCHALE.Common.FlatData.VoiceEvent VoiceEvent06 { get { int o = __p.__offset(64); return o != 0 ? (SCHALE.Common.FlatData.VoiceEvent)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.VoiceEvent.OnTSA; } } public static Offset CreateCharacterVictoryInteractionExcel(FlatBufferBuilder builder, long InteractionId = 0, @@ -124,27 +130,33 @@ public struct CharacterVictoryInteractionExcel : IFlatbufferObject int PositionIndex01 = 0, StringOffset VictoryStartAnimationPath01Offset = default(StringOffset), StringOffset VictoryEndAnimationPath01Offset = default(StringOffset), + SCHALE.Common.FlatData.VoiceEvent VoiceEvent01 = SCHALE.Common.FlatData.VoiceEvent.OnTSA, long CostumeId02 = 0, int PositionIndex02 = 0, StringOffset VictoryStartAnimationPath02Offset = default(StringOffset), StringOffset VictoryEndAnimationPath02Offset = default(StringOffset), + SCHALE.Common.FlatData.VoiceEvent VoiceEvent02 = SCHALE.Common.FlatData.VoiceEvent.OnTSA, long CostumeId03 = 0, int PositionIndex03 = 0, StringOffset VictoryStartAnimationPath03Offset = default(StringOffset), StringOffset VictoryEndAnimationPath03Offset = default(StringOffset), + SCHALE.Common.FlatData.VoiceEvent VoiceEvent03 = SCHALE.Common.FlatData.VoiceEvent.OnTSA, long CostumeId04 = 0, int PositionIndex04 = 0, StringOffset VictoryStartAnimationPath04Offset = default(StringOffset), StringOffset VictoryEndAnimationPath04Offset = default(StringOffset), + SCHALE.Common.FlatData.VoiceEvent VoiceEvent04 = SCHALE.Common.FlatData.VoiceEvent.OnTSA, long CostumeId05 = 0, int PositionIndex05 = 0, StringOffset VictoryStartAnimationPath05Offset = default(StringOffset), StringOffset VictoryEndAnimationPath05Offset = default(StringOffset), + SCHALE.Common.FlatData.VoiceEvent VoiceEvent05 = SCHALE.Common.FlatData.VoiceEvent.OnTSA, long CostumeId06 = 0, int PositionIndex06 = 0, StringOffset VictoryStartAnimationPath06Offset = default(StringOffset), - StringOffset VictoryEndAnimationPath06Offset = default(StringOffset)) { - builder.StartTable(25); + StringOffset VictoryEndAnimationPath06Offset = default(StringOffset), + SCHALE.Common.FlatData.VoiceEvent VoiceEvent06 = SCHALE.Common.FlatData.VoiceEvent.OnTSA) { + builder.StartTable(31); CharacterVictoryInteractionExcel.AddCostumeId06(builder, CostumeId06); CharacterVictoryInteractionExcel.AddCostumeId05(builder, CostumeId05); CharacterVictoryInteractionExcel.AddCostumeId04(builder, CostumeId04); @@ -152,53 +164,65 @@ public struct CharacterVictoryInteractionExcel : IFlatbufferObject CharacterVictoryInteractionExcel.AddCostumeId02(builder, CostumeId02); CharacterVictoryInteractionExcel.AddCostumeId01(builder, CostumeId01); CharacterVictoryInteractionExcel.AddInteractionId(builder, InteractionId); + CharacterVictoryInteractionExcel.AddVoiceEvent06(builder, VoiceEvent06); CharacterVictoryInteractionExcel.AddVictoryEndAnimationPath06(builder, VictoryEndAnimationPath06Offset); CharacterVictoryInteractionExcel.AddVictoryStartAnimationPath06(builder, VictoryStartAnimationPath06Offset); CharacterVictoryInteractionExcel.AddPositionIndex06(builder, PositionIndex06); + CharacterVictoryInteractionExcel.AddVoiceEvent05(builder, VoiceEvent05); CharacterVictoryInteractionExcel.AddVictoryEndAnimationPath05(builder, VictoryEndAnimationPath05Offset); CharacterVictoryInteractionExcel.AddVictoryStartAnimationPath05(builder, VictoryStartAnimationPath05Offset); CharacterVictoryInteractionExcel.AddPositionIndex05(builder, PositionIndex05); + CharacterVictoryInteractionExcel.AddVoiceEvent04(builder, VoiceEvent04); CharacterVictoryInteractionExcel.AddVictoryEndAnimationPath04(builder, VictoryEndAnimationPath04Offset); CharacterVictoryInteractionExcel.AddVictoryStartAnimationPath04(builder, VictoryStartAnimationPath04Offset); CharacterVictoryInteractionExcel.AddPositionIndex04(builder, PositionIndex04); + CharacterVictoryInteractionExcel.AddVoiceEvent03(builder, VoiceEvent03); CharacterVictoryInteractionExcel.AddVictoryEndAnimationPath03(builder, VictoryEndAnimationPath03Offset); CharacterVictoryInteractionExcel.AddVictoryStartAnimationPath03(builder, VictoryStartAnimationPath03Offset); CharacterVictoryInteractionExcel.AddPositionIndex03(builder, PositionIndex03); + CharacterVictoryInteractionExcel.AddVoiceEvent02(builder, VoiceEvent02); CharacterVictoryInteractionExcel.AddVictoryEndAnimationPath02(builder, VictoryEndAnimationPath02Offset); CharacterVictoryInteractionExcel.AddVictoryStartAnimationPath02(builder, VictoryStartAnimationPath02Offset); CharacterVictoryInteractionExcel.AddPositionIndex02(builder, PositionIndex02); + CharacterVictoryInteractionExcel.AddVoiceEvent01(builder, VoiceEvent01); CharacterVictoryInteractionExcel.AddVictoryEndAnimationPath01(builder, VictoryEndAnimationPath01Offset); CharacterVictoryInteractionExcel.AddVictoryStartAnimationPath01(builder, VictoryStartAnimationPath01Offset); CharacterVictoryInteractionExcel.AddPositionIndex01(builder, PositionIndex01); return CharacterVictoryInteractionExcel.EndCharacterVictoryInteractionExcel(builder); } - public static void StartCharacterVictoryInteractionExcel(FlatBufferBuilder builder) { builder.StartTable(25); } + public static void StartCharacterVictoryInteractionExcel(FlatBufferBuilder builder) { builder.StartTable(31); } public static void AddInteractionId(FlatBufferBuilder builder, long interactionId) { builder.AddLong(0, interactionId, 0); } public static void AddCostumeId01(FlatBufferBuilder builder, long costumeId01) { builder.AddLong(1, costumeId01, 0); } public static void AddPositionIndex01(FlatBufferBuilder builder, int positionIndex01) { builder.AddInt(2, positionIndex01, 0); } public static void AddVictoryStartAnimationPath01(FlatBufferBuilder builder, StringOffset victoryStartAnimationPath01Offset) { builder.AddOffset(3, victoryStartAnimationPath01Offset.Value, 0); } public static void AddVictoryEndAnimationPath01(FlatBufferBuilder builder, StringOffset victoryEndAnimationPath01Offset) { builder.AddOffset(4, victoryEndAnimationPath01Offset.Value, 0); } - public static void AddCostumeId02(FlatBufferBuilder builder, long costumeId02) { builder.AddLong(5, costumeId02, 0); } - public static void AddPositionIndex02(FlatBufferBuilder builder, int positionIndex02) { builder.AddInt(6, positionIndex02, 0); } - public static void AddVictoryStartAnimationPath02(FlatBufferBuilder builder, StringOffset victoryStartAnimationPath02Offset) { builder.AddOffset(7, victoryStartAnimationPath02Offset.Value, 0); } - public static void AddVictoryEndAnimationPath02(FlatBufferBuilder builder, StringOffset victoryEndAnimationPath02Offset) { builder.AddOffset(8, victoryEndAnimationPath02Offset.Value, 0); } - public static void AddCostumeId03(FlatBufferBuilder builder, long costumeId03) { builder.AddLong(9, costumeId03, 0); } - public static void AddPositionIndex03(FlatBufferBuilder builder, int positionIndex03) { builder.AddInt(10, positionIndex03, 0); } - public static void AddVictoryStartAnimationPath03(FlatBufferBuilder builder, StringOffset victoryStartAnimationPath03Offset) { builder.AddOffset(11, victoryStartAnimationPath03Offset.Value, 0); } - public static void AddVictoryEndAnimationPath03(FlatBufferBuilder builder, StringOffset victoryEndAnimationPath03Offset) { builder.AddOffset(12, victoryEndAnimationPath03Offset.Value, 0); } - public static void AddCostumeId04(FlatBufferBuilder builder, long costumeId04) { builder.AddLong(13, costumeId04, 0); } - public static void AddPositionIndex04(FlatBufferBuilder builder, int positionIndex04) { builder.AddInt(14, positionIndex04, 0); } - public static void AddVictoryStartAnimationPath04(FlatBufferBuilder builder, StringOffset victoryStartAnimationPath04Offset) { builder.AddOffset(15, victoryStartAnimationPath04Offset.Value, 0); } - public static void AddVictoryEndAnimationPath04(FlatBufferBuilder builder, StringOffset victoryEndAnimationPath04Offset) { builder.AddOffset(16, victoryEndAnimationPath04Offset.Value, 0); } - public static void AddCostumeId05(FlatBufferBuilder builder, long costumeId05) { builder.AddLong(17, costumeId05, 0); } - public static void AddPositionIndex05(FlatBufferBuilder builder, int positionIndex05) { builder.AddInt(18, positionIndex05, 0); } - public static void AddVictoryStartAnimationPath05(FlatBufferBuilder builder, StringOffset victoryStartAnimationPath05Offset) { builder.AddOffset(19, victoryStartAnimationPath05Offset.Value, 0); } - public static void AddVictoryEndAnimationPath05(FlatBufferBuilder builder, StringOffset victoryEndAnimationPath05Offset) { builder.AddOffset(20, victoryEndAnimationPath05Offset.Value, 0); } - public static void AddCostumeId06(FlatBufferBuilder builder, long costumeId06) { builder.AddLong(21, costumeId06, 0); } - public static void AddPositionIndex06(FlatBufferBuilder builder, int positionIndex06) { builder.AddInt(22, positionIndex06, 0); } - public static void AddVictoryStartAnimationPath06(FlatBufferBuilder builder, StringOffset victoryStartAnimationPath06Offset) { builder.AddOffset(23, victoryStartAnimationPath06Offset.Value, 0); } - public static void AddVictoryEndAnimationPath06(FlatBufferBuilder builder, StringOffset victoryEndAnimationPath06Offset) { builder.AddOffset(24, victoryEndAnimationPath06Offset.Value, 0); } + public static void AddVoiceEvent01(FlatBufferBuilder builder, SCHALE.Common.FlatData.VoiceEvent voiceEvent01) { builder.AddInt(5, (int)voiceEvent01, 0); } + public static void AddCostumeId02(FlatBufferBuilder builder, long costumeId02) { builder.AddLong(6, costumeId02, 0); } + public static void AddPositionIndex02(FlatBufferBuilder builder, int positionIndex02) { builder.AddInt(7, positionIndex02, 0); } + public static void AddVictoryStartAnimationPath02(FlatBufferBuilder builder, StringOffset victoryStartAnimationPath02Offset) { builder.AddOffset(8, victoryStartAnimationPath02Offset.Value, 0); } + public static void AddVictoryEndAnimationPath02(FlatBufferBuilder builder, StringOffset victoryEndAnimationPath02Offset) { builder.AddOffset(9, victoryEndAnimationPath02Offset.Value, 0); } + public static void AddVoiceEvent02(FlatBufferBuilder builder, SCHALE.Common.FlatData.VoiceEvent voiceEvent02) { builder.AddInt(10, (int)voiceEvent02, 0); } + public static void AddCostumeId03(FlatBufferBuilder builder, long costumeId03) { builder.AddLong(11, costumeId03, 0); } + public static void AddPositionIndex03(FlatBufferBuilder builder, int positionIndex03) { builder.AddInt(12, positionIndex03, 0); } + public static void AddVictoryStartAnimationPath03(FlatBufferBuilder builder, StringOffset victoryStartAnimationPath03Offset) { builder.AddOffset(13, victoryStartAnimationPath03Offset.Value, 0); } + public static void AddVictoryEndAnimationPath03(FlatBufferBuilder builder, StringOffset victoryEndAnimationPath03Offset) { builder.AddOffset(14, victoryEndAnimationPath03Offset.Value, 0); } + public static void AddVoiceEvent03(FlatBufferBuilder builder, SCHALE.Common.FlatData.VoiceEvent voiceEvent03) { builder.AddInt(15, (int)voiceEvent03, 0); } + public static void AddCostumeId04(FlatBufferBuilder builder, long costumeId04) { builder.AddLong(16, costumeId04, 0); } + public static void AddPositionIndex04(FlatBufferBuilder builder, int positionIndex04) { builder.AddInt(17, positionIndex04, 0); } + public static void AddVictoryStartAnimationPath04(FlatBufferBuilder builder, StringOffset victoryStartAnimationPath04Offset) { builder.AddOffset(18, victoryStartAnimationPath04Offset.Value, 0); } + public static void AddVictoryEndAnimationPath04(FlatBufferBuilder builder, StringOffset victoryEndAnimationPath04Offset) { builder.AddOffset(19, victoryEndAnimationPath04Offset.Value, 0); } + public static void AddVoiceEvent04(FlatBufferBuilder builder, SCHALE.Common.FlatData.VoiceEvent voiceEvent04) { builder.AddInt(20, (int)voiceEvent04, 0); } + public static void AddCostumeId05(FlatBufferBuilder builder, long costumeId05) { builder.AddLong(21, costumeId05, 0); } + public static void AddPositionIndex05(FlatBufferBuilder builder, int positionIndex05) { builder.AddInt(22, positionIndex05, 0); } + public static void AddVictoryStartAnimationPath05(FlatBufferBuilder builder, StringOffset victoryStartAnimationPath05Offset) { builder.AddOffset(23, victoryStartAnimationPath05Offset.Value, 0); } + public static void AddVictoryEndAnimationPath05(FlatBufferBuilder builder, StringOffset victoryEndAnimationPath05Offset) { builder.AddOffset(24, victoryEndAnimationPath05Offset.Value, 0); } + public static void AddVoiceEvent05(FlatBufferBuilder builder, SCHALE.Common.FlatData.VoiceEvent voiceEvent05) { builder.AddInt(25, (int)voiceEvent05, 0); } + public static void AddCostumeId06(FlatBufferBuilder builder, long costumeId06) { builder.AddLong(26, costumeId06, 0); } + public static void AddPositionIndex06(FlatBufferBuilder builder, int positionIndex06) { builder.AddInt(27, positionIndex06, 0); } + public static void AddVictoryStartAnimationPath06(FlatBufferBuilder builder, StringOffset victoryStartAnimationPath06Offset) { builder.AddOffset(28, victoryStartAnimationPath06Offset.Value, 0); } + public static void AddVictoryEndAnimationPath06(FlatBufferBuilder builder, StringOffset victoryEndAnimationPath06Offset) { builder.AddOffset(29, victoryEndAnimationPath06Offset.Value, 0); } + public static void AddVoiceEvent06(FlatBufferBuilder builder, SCHALE.Common.FlatData.VoiceEvent voiceEvent06) { builder.AddInt(30, (int)voiceEvent06, 0); } public static Offset EndCharacterVictoryInteractionExcel(FlatBufferBuilder builder) { int o = builder.EndTable(); return new Offset(o); @@ -215,26 +239,32 @@ public struct CharacterVictoryInteractionExcel : IFlatbufferObject _o.PositionIndex01 = TableEncryptionService.Convert(this.PositionIndex01, key); _o.VictoryStartAnimationPath01 = TableEncryptionService.Convert(this.VictoryStartAnimationPath01, key); _o.VictoryEndAnimationPath01 = TableEncryptionService.Convert(this.VictoryEndAnimationPath01, key); + _o.VoiceEvent01 = TableEncryptionService.Convert(this.VoiceEvent01, key); _o.CostumeId02 = TableEncryptionService.Convert(this.CostumeId02, key); _o.PositionIndex02 = TableEncryptionService.Convert(this.PositionIndex02, key); _o.VictoryStartAnimationPath02 = TableEncryptionService.Convert(this.VictoryStartAnimationPath02, key); _o.VictoryEndAnimationPath02 = TableEncryptionService.Convert(this.VictoryEndAnimationPath02, key); + _o.VoiceEvent02 = TableEncryptionService.Convert(this.VoiceEvent02, key); _o.CostumeId03 = TableEncryptionService.Convert(this.CostumeId03, key); _o.PositionIndex03 = TableEncryptionService.Convert(this.PositionIndex03, key); _o.VictoryStartAnimationPath03 = TableEncryptionService.Convert(this.VictoryStartAnimationPath03, key); _o.VictoryEndAnimationPath03 = TableEncryptionService.Convert(this.VictoryEndAnimationPath03, key); + _o.VoiceEvent03 = TableEncryptionService.Convert(this.VoiceEvent03, key); _o.CostumeId04 = TableEncryptionService.Convert(this.CostumeId04, key); _o.PositionIndex04 = TableEncryptionService.Convert(this.PositionIndex04, key); _o.VictoryStartAnimationPath04 = TableEncryptionService.Convert(this.VictoryStartAnimationPath04, key); _o.VictoryEndAnimationPath04 = TableEncryptionService.Convert(this.VictoryEndAnimationPath04, key); + _o.VoiceEvent04 = TableEncryptionService.Convert(this.VoiceEvent04, key); _o.CostumeId05 = TableEncryptionService.Convert(this.CostumeId05, key); _o.PositionIndex05 = TableEncryptionService.Convert(this.PositionIndex05, key); _o.VictoryStartAnimationPath05 = TableEncryptionService.Convert(this.VictoryStartAnimationPath05, key); _o.VictoryEndAnimationPath05 = TableEncryptionService.Convert(this.VictoryEndAnimationPath05, key); + _o.VoiceEvent05 = TableEncryptionService.Convert(this.VoiceEvent05, key); _o.CostumeId06 = TableEncryptionService.Convert(this.CostumeId06, key); _o.PositionIndex06 = TableEncryptionService.Convert(this.PositionIndex06, key); _o.VictoryStartAnimationPath06 = TableEncryptionService.Convert(this.VictoryStartAnimationPath06, key); _o.VictoryEndAnimationPath06 = TableEncryptionService.Convert(this.VictoryEndAnimationPath06, key); + _o.VoiceEvent06 = TableEncryptionService.Convert(this.VoiceEvent06, key); } public static Offset Pack(FlatBufferBuilder builder, CharacterVictoryInteractionExcelT _o) { if (_o == null) return default(Offset); @@ -257,26 +287,32 @@ public struct CharacterVictoryInteractionExcel : IFlatbufferObject _o.PositionIndex01, _VictoryStartAnimationPath01, _VictoryEndAnimationPath01, + _o.VoiceEvent01, _o.CostumeId02, _o.PositionIndex02, _VictoryStartAnimationPath02, _VictoryEndAnimationPath02, + _o.VoiceEvent02, _o.CostumeId03, _o.PositionIndex03, _VictoryStartAnimationPath03, _VictoryEndAnimationPath03, + _o.VoiceEvent03, _o.CostumeId04, _o.PositionIndex04, _VictoryStartAnimationPath04, _VictoryEndAnimationPath04, + _o.VoiceEvent04, _o.CostumeId05, _o.PositionIndex05, _VictoryStartAnimationPath05, _VictoryEndAnimationPath05, + _o.VoiceEvent05, _o.CostumeId06, _o.PositionIndex06, _VictoryStartAnimationPath06, - _VictoryEndAnimationPath06); + _VictoryEndAnimationPath06, + _o.VoiceEvent06); } } @@ -287,26 +323,32 @@ public class CharacterVictoryInteractionExcelT public int PositionIndex01 { get; set; } public string VictoryStartAnimationPath01 { get; set; } public string VictoryEndAnimationPath01 { get; set; } + public SCHALE.Common.FlatData.VoiceEvent VoiceEvent01 { get; set; } public long CostumeId02 { get; set; } public int PositionIndex02 { get; set; } public string VictoryStartAnimationPath02 { get; set; } public string VictoryEndAnimationPath02 { get; set; } + public SCHALE.Common.FlatData.VoiceEvent VoiceEvent02 { get; set; } public long CostumeId03 { get; set; } public int PositionIndex03 { get; set; } public string VictoryStartAnimationPath03 { get; set; } public string VictoryEndAnimationPath03 { get; set; } + public SCHALE.Common.FlatData.VoiceEvent VoiceEvent03 { get; set; } public long CostumeId04 { get; set; } public int PositionIndex04 { get; set; } public string VictoryStartAnimationPath04 { get; set; } public string VictoryEndAnimationPath04 { get; set; } + public SCHALE.Common.FlatData.VoiceEvent VoiceEvent04 { get; set; } public long CostumeId05 { get; set; } public int PositionIndex05 { get; set; } public string VictoryStartAnimationPath05 { get; set; } public string VictoryEndAnimationPath05 { get; set; } + public SCHALE.Common.FlatData.VoiceEvent VoiceEvent05 { get; set; } public long CostumeId06 { get; set; } public int PositionIndex06 { get; set; } public string VictoryStartAnimationPath06 { get; set; } public string VictoryEndAnimationPath06 { get; set; } + public SCHALE.Common.FlatData.VoiceEvent VoiceEvent06 { get; set; } public CharacterVictoryInteractionExcelT() { this.InteractionId = 0; @@ -314,26 +356,32 @@ public class CharacterVictoryInteractionExcelT this.PositionIndex01 = 0; this.VictoryStartAnimationPath01 = null; this.VictoryEndAnimationPath01 = null; + this.VoiceEvent01 = SCHALE.Common.FlatData.VoiceEvent.OnTSA; this.CostumeId02 = 0; this.PositionIndex02 = 0; this.VictoryStartAnimationPath02 = null; this.VictoryEndAnimationPath02 = null; + this.VoiceEvent02 = SCHALE.Common.FlatData.VoiceEvent.OnTSA; this.CostumeId03 = 0; this.PositionIndex03 = 0; this.VictoryStartAnimationPath03 = null; this.VictoryEndAnimationPath03 = null; + this.VoiceEvent03 = SCHALE.Common.FlatData.VoiceEvent.OnTSA; this.CostumeId04 = 0; this.PositionIndex04 = 0; this.VictoryStartAnimationPath04 = null; this.VictoryEndAnimationPath04 = null; + this.VoiceEvent04 = SCHALE.Common.FlatData.VoiceEvent.OnTSA; this.CostumeId05 = 0; this.PositionIndex05 = 0; this.VictoryStartAnimationPath05 = null; this.VictoryEndAnimationPath05 = null; + this.VoiceEvent05 = SCHALE.Common.FlatData.VoiceEvent.OnTSA; this.CostumeId06 = 0; this.PositionIndex06 = 0; this.VictoryStartAnimationPath06 = null; this.VictoryEndAnimationPath06 = null; + this.VoiceEvent06 = SCHALE.Common.FlatData.VoiceEvent.OnTSA; } } @@ -348,26 +396,32 @@ static public class CharacterVictoryInteractionExcelVerify && verifier.VerifyField(tablePos, 8 /*PositionIndex01*/, 4 /*int*/, 4, false) && verifier.VerifyString(tablePos, 10 /*VictoryStartAnimationPath01*/, false) && verifier.VerifyString(tablePos, 12 /*VictoryEndAnimationPath01*/, false) - && verifier.VerifyField(tablePos, 14 /*CostumeId02*/, 8 /*long*/, 8, false) - && verifier.VerifyField(tablePos, 16 /*PositionIndex02*/, 4 /*int*/, 4, false) - && verifier.VerifyString(tablePos, 18 /*VictoryStartAnimationPath02*/, false) - && verifier.VerifyString(tablePos, 20 /*VictoryEndAnimationPath02*/, false) - && verifier.VerifyField(tablePos, 22 /*CostumeId03*/, 8 /*long*/, 8, false) - && verifier.VerifyField(tablePos, 24 /*PositionIndex03*/, 4 /*int*/, 4, false) - && verifier.VerifyString(tablePos, 26 /*VictoryStartAnimationPath03*/, false) - && verifier.VerifyString(tablePos, 28 /*VictoryEndAnimationPath03*/, false) - && verifier.VerifyField(tablePos, 30 /*CostumeId04*/, 8 /*long*/, 8, false) - && verifier.VerifyField(tablePos, 32 /*PositionIndex04*/, 4 /*int*/, 4, false) - && verifier.VerifyString(tablePos, 34 /*VictoryStartAnimationPath04*/, false) - && verifier.VerifyString(tablePos, 36 /*VictoryEndAnimationPath04*/, false) - && verifier.VerifyField(tablePos, 38 /*CostumeId05*/, 8 /*long*/, 8, false) - && verifier.VerifyField(tablePos, 40 /*PositionIndex05*/, 4 /*int*/, 4, false) - && verifier.VerifyString(tablePos, 42 /*VictoryStartAnimationPath05*/, false) - && verifier.VerifyString(tablePos, 44 /*VictoryEndAnimationPath05*/, false) - && verifier.VerifyField(tablePos, 46 /*CostumeId06*/, 8 /*long*/, 8, false) - && verifier.VerifyField(tablePos, 48 /*PositionIndex06*/, 4 /*int*/, 4, false) - && verifier.VerifyString(tablePos, 50 /*VictoryStartAnimationPath06*/, false) - && verifier.VerifyString(tablePos, 52 /*VictoryEndAnimationPath06*/, false) + && verifier.VerifyField(tablePos, 14 /*VoiceEvent01*/, 4 /*SCHALE.Common.FlatData.VoiceEvent*/, 4, false) + && verifier.VerifyField(tablePos, 16 /*CostumeId02*/, 8 /*long*/, 8, false) + && verifier.VerifyField(tablePos, 18 /*PositionIndex02*/, 4 /*int*/, 4, false) + && verifier.VerifyString(tablePos, 20 /*VictoryStartAnimationPath02*/, false) + && verifier.VerifyString(tablePos, 22 /*VictoryEndAnimationPath02*/, false) + && verifier.VerifyField(tablePos, 24 /*VoiceEvent02*/, 4 /*SCHALE.Common.FlatData.VoiceEvent*/, 4, false) + && verifier.VerifyField(tablePos, 26 /*CostumeId03*/, 8 /*long*/, 8, false) + && verifier.VerifyField(tablePos, 28 /*PositionIndex03*/, 4 /*int*/, 4, false) + && verifier.VerifyString(tablePos, 30 /*VictoryStartAnimationPath03*/, false) + && verifier.VerifyString(tablePos, 32 /*VictoryEndAnimationPath03*/, false) + && verifier.VerifyField(tablePos, 34 /*VoiceEvent03*/, 4 /*SCHALE.Common.FlatData.VoiceEvent*/, 4, false) + && verifier.VerifyField(tablePos, 36 /*CostumeId04*/, 8 /*long*/, 8, false) + && verifier.VerifyField(tablePos, 38 /*PositionIndex04*/, 4 /*int*/, 4, false) + && verifier.VerifyString(tablePos, 40 /*VictoryStartAnimationPath04*/, false) + && verifier.VerifyString(tablePos, 42 /*VictoryEndAnimationPath04*/, false) + && verifier.VerifyField(tablePos, 44 /*VoiceEvent04*/, 4 /*SCHALE.Common.FlatData.VoiceEvent*/, 4, false) + && verifier.VerifyField(tablePos, 46 /*CostumeId05*/, 8 /*long*/, 8, false) + && verifier.VerifyField(tablePos, 48 /*PositionIndex05*/, 4 /*int*/, 4, false) + && verifier.VerifyString(tablePos, 50 /*VictoryStartAnimationPath05*/, false) + && verifier.VerifyString(tablePos, 52 /*VictoryEndAnimationPath05*/, false) + && verifier.VerifyField(tablePos, 54 /*VoiceEvent05*/, 4 /*SCHALE.Common.FlatData.VoiceEvent*/, 4, false) + && verifier.VerifyField(tablePos, 56 /*CostumeId06*/, 8 /*long*/, 8, false) + && verifier.VerifyField(tablePos, 58 /*PositionIndex06*/, 4 /*int*/, 4, false) + && verifier.VerifyString(tablePos, 60 /*VictoryStartAnimationPath06*/, false) + && verifier.VerifyString(tablePos, 62 /*VictoryEndAnimationPath06*/, false) + && verifier.VerifyField(tablePos, 64 /*VoiceEvent06*/, 4 /*SCHALE.Common.FlatData.VoiceEvent*/, 4, false) && verifier.VerifyTableEnd(tablePos); } } diff --git a/SCHALE.Common/FlatData/CharacterVoiceExcel.cs b/SCHALE.Common/FlatData/CharacterVoiceExcel.cs index 7da8705..a94e7e9 100644 --- a/SCHALE.Common/FlatData/CharacterVoiceExcel.cs +++ b/SCHALE.Common/FlatData/CharacterVoiceExcel.cs @@ -27,7 +27,7 @@ public struct CharacterVoiceExcel : IFlatbufferObject public int Priority { get { int o = __p.__offset(12); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } public long DisplayOrder { get { int o = __p.__offset(14); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public bool CollectionVisible { get { int o = __p.__offset(16); return o != 0 ? 0!=__p.bb.Get(o + __p.bb_pos) : (bool)false; } } - public SCHALE.Common.FlatData.CVCollectionType CVCollectionType { get { int o = __p.__offset(18); return o != 0 ? (SCHALE.Common.FlatData.CVCollectionType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.CVCollectionType.CVNormal; } } + public SCHALE.Common.FlatData.CVCollectionType CVCollectionType_ { get { int o = __p.__offset(18); return o != 0 ? (SCHALE.Common.FlatData.CVCollectionType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.CVCollectionType.CVNormal; } } public long UnlockFavorRank { get { int o = __p.__offset(20); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public string LocalizeCVGroup { get { int o = __p.__offset(22); return o != 0 ? __p.__string(o + __p.bb_pos) : null; } } #if ENABLE_SPAN_T @@ -71,7 +71,7 @@ public struct CharacterVoiceExcel : IFlatbufferObject int Priority = 0, long DisplayOrder = 0, bool CollectionVisible = false, - SCHALE.Common.FlatData.CVCollectionType CVCollectionType = SCHALE.Common.FlatData.CVCollectionType.CVNormal, + SCHALE.Common.FlatData.CVCollectionType CVCollectionType_ = SCHALE.Common.FlatData.CVCollectionType.CVNormal, long UnlockFavorRank = 0, StringOffset LocalizeCVGroupOffset = default(StringOffset), VectorOffset Nation_Offset = default(VectorOffset), @@ -88,7 +88,7 @@ public struct CharacterVoiceExcel : IFlatbufferObject CharacterVoiceExcel.AddVolume(builder, VolumeOffset); CharacterVoiceExcel.AddNation_(builder, Nation_Offset); CharacterVoiceExcel.AddLocalizeCVGroup(builder, LocalizeCVGroupOffset); - CharacterVoiceExcel.AddCVCollectionType(builder, CVCollectionType); + CharacterVoiceExcel.AddCVCollectionType_(builder, CVCollectionType_); CharacterVoiceExcel.AddPriority(builder, Priority); CharacterVoiceExcel.AddVoiceHash(builder, VoiceHash); CharacterVoiceExcel.AddCollectionVisible(builder, CollectionVisible); @@ -104,7 +104,7 @@ public struct CharacterVoiceExcel : IFlatbufferObject public static void AddPriority(FlatBufferBuilder builder, int priority) { builder.AddInt(4, priority, 0); } public static void AddDisplayOrder(FlatBufferBuilder builder, long displayOrder) { builder.AddLong(5, displayOrder, 0); } public static void AddCollectionVisible(FlatBufferBuilder builder, bool collectionVisible) { builder.AddBool(6, collectionVisible, false); } - public static void AddCVCollectionType(FlatBufferBuilder builder, SCHALE.Common.FlatData.CVCollectionType cVCollectionType) { builder.AddInt(7, (int)cVCollectionType, 0); } + public static void AddCVCollectionType_(FlatBufferBuilder builder, SCHALE.Common.FlatData.CVCollectionType cVCollectionType_) { builder.AddInt(7, (int)cVCollectionType_, 0); } public static void AddUnlockFavorRank(FlatBufferBuilder builder, long unlockFavorRank) { builder.AddLong(8, unlockFavorRank, 0); } public static void AddLocalizeCVGroup(FlatBufferBuilder builder, StringOffset localizeCVGroupOffset) { builder.AddOffset(9, localizeCVGroupOffset.Value, 0); } public static void AddNation_(FlatBufferBuilder builder, VectorOffset nation_Offset) { builder.AddOffset(10, nation_Offset.Value, 0); } @@ -149,7 +149,7 @@ public struct CharacterVoiceExcel : IFlatbufferObject _o.Priority = TableEncryptionService.Convert(this.Priority, key); _o.DisplayOrder = TableEncryptionService.Convert(this.DisplayOrder, key); _o.CollectionVisible = TableEncryptionService.Convert(this.CollectionVisible, key); - _o.CVCollectionType = TableEncryptionService.Convert(this.CVCollectionType, key); + _o.CVCollectionType_ = TableEncryptionService.Convert(this.CVCollectionType_, key); _o.UnlockFavorRank = TableEncryptionService.Convert(this.UnlockFavorRank, key); _o.LocalizeCVGroup = TableEncryptionService.Convert(this.LocalizeCVGroup, key); _o.Nation_ = new List(); @@ -194,7 +194,7 @@ public struct CharacterVoiceExcel : IFlatbufferObject _o.Priority, _o.DisplayOrder, _o.CollectionVisible, - _o.CVCollectionType, + _o.CVCollectionType_, _o.UnlockFavorRank, _LocalizeCVGroup, _Nation_, @@ -213,7 +213,7 @@ public class CharacterVoiceExcelT public int Priority { get; set; } public long DisplayOrder { get; set; } public bool CollectionVisible { get; set; } - public SCHALE.Common.FlatData.CVCollectionType CVCollectionType { get; set; } + public SCHALE.Common.FlatData.CVCollectionType CVCollectionType_ { get; set; } public long UnlockFavorRank { get; set; } public string LocalizeCVGroup { get; set; } public List Nation_ { get; set; } @@ -229,7 +229,7 @@ public class CharacterVoiceExcelT this.Priority = 0; this.DisplayOrder = 0; this.CollectionVisible = false; - this.CVCollectionType = SCHALE.Common.FlatData.CVCollectionType.CVNormal; + this.CVCollectionType_ = SCHALE.Common.FlatData.CVCollectionType.CVNormal; this.UnlockFavorRank = 0; this.LocalizeCVGroup = null; this.Nation_ = null; @@ -252,7 +252,7 @@ static public class CharacterVoiceExcelVerify && verifier.VerifyField(tablePos, 12 /*Priority*/, 4 /*int*/, 4, false) && verifier.VerifyField(tablePos, 14 /*DisplayOrder*/, 8 /*long*/, 8, false) && verifier.VerifyField(tablePos, 16 /*CollectionVisible*/, 1 /*bool*/, 1, false) - && verifier.VerifyField(tablePos, 18 /*CVCollectionType*/, 4 /*SCHALE.Common.FlatData.CVCollectionType*/, 4, false) + && verifier.VerifyField(tablePos, 18 /*CVCollectionType_*/, 4 /*SCHALE.Common.FlatData.CVCollectionType*/, 4, false) && verifier.VerifyField(tablePos, 20 /*UnlockFavorRank*/, 8 /*long*/, 8, false) && verifier.VerifyString(tablePos, 22 /*LocalizeCVGroup*/, false) && verifier.VerifyVectorOfData(tablePos, 24 /*Nation_*/, 4 /*SCHALE.Common.FlatData.Nation*/, false) diff --git a/SCHALE.Common/FlatData/CharacterVoiceSubtitleExcel.cs b/SCHALE.Common/FlatData/CharacterVoiceSubtitleExcel.cs new file mode 100644 index 0000000..2ed5e49 --- /dev/null +++ b/SCHALE.Common/FlatData/CharacterVoiceSubtitleExcel.cs @@ -0,0 +1,141 @@ +// +// automatically generated by the FlatBuffers compiler, do not modify +// + +namespace SCHALE.Common.FlatData +{ + +using global::System; +using global::System.Collections.Generic; +using global::SCHALE.Common.Crypto; +using global::Google.FlatBuffers; + +public struct CharacterVoiceSubtitleExcel : IFlatbufferObject +{ + private Table __p; + public ByteBuffer ByteBuffer { get { return __p.bb; } } + public static void ValidateVersion() { FlatBufferConstants.FLATBUFFERS_24_3_25(); } + public static CharacterVoiceSubtitleExcel GetRootAsCharacterVoiceSubtitleExcel(ByteBuffer _bb) { return GetRootAsCharacterVoiceSubtitleExcel(_bb, new CharacterVoiceSubtitleExcel()); } + public static CharacterVoiceSubtitleExcel GetRootAsCharacterVoiceSubtitleExcel(ByteBuffer _bb, CharacterVoiceSubtitleExcel obj) { return (obj.__assign(_bb.GetInt(_bb.Position) + _bb.Position, _bb)); } + public void __init(int _i, ByteBuffer _bb) { __p = new Table(_i, _bb); } + public CharacterVoiceSubtitleExcel __assign(int _i, ByteBuffer _bb) { __init(_i, _bb); return this; } + + public string LocalizeCVGroup { get { int o = __p.__offset(4); return o != 0 ? __p.__string(o + __p.bb_pos) : null; } } +#if ENABLE_SPAN_T + public Span GetLocalizeCVGroupBytes() { return __p.__vector_as_span(4, 1); } +#else + public ArraySegment? GetLocalizeCVGroupBytes() { return __p.__vector_as_arraysegment(4); } +#endif + public byte[] GetLocalizeCVGroupArray() { return __p.__vector_as_array(4); } + public long CharacterVoiceGroupId { get { int o = __p.__offset(6); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } + public long Duration { get { int o = __p.__offset(8); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } + public bool Separate { get { int o = __p.__offset(10); return o != 0 ? 0!=__p.bb.Get(o + __p.bb_pos) : (bool)false; } } + public string LocalizeKR { get { int o = __p.__offset(12); return o != 0 ? __p.__string(o + __p.bb_pos) : null; } } +#if ENABLE_SPAN_T + public Span GetLocalizeKRBytes() { return __p.__vector_as_span(12, 1); } +#else + public ArraySegment? GetLocalizeKRBytes() { return __p.__vector_as_arraysegment(12); } +#endif + public byte[] GetLocalizeKRArray() { return __p.__vector_as_array(12); } + public string LocalizeJP { get { int o = __p.__offset(14); return o != 0 ? __p.__string(o + __p.bb_pos) : null; } } +#if ENABLE_SPAN_T + public Span GetLocalizeJPBytes() { return __p.__vector_as_span(14, 1); } +#else + public ArraySegment? GetLocalizeJPBytes() { return __p.__vector_as_arraysegment(14); } +#endif + public byte[] GetLocalizeJPArray() { return __p.__vector_as_array(14); } + + public static Offset CreateCharacterVoiceSubtitleExcel(FlatBufferBuilder builder, + StringOffset LocalizeCVGroupOffset = default(StringOffset), + long CharacterVoiceGroupId = 0, + long Duration = 0, + bool Separate = false, + StringOffset LocalizeKROffset = default(StringOffset), + StringOffset LocalizeJPOffset = default(StringOffset)) { + builder.StartTable(6); + CharacterVoiceSubtitleExcel.AddDuration(builder, Duration); + CharacterVoiceSubtitleExcel.AddCharacterVoiceGroupId(builder, CharacterVoiceGroupId); + CharacterVoiceSubtitleExcel.AddLocalizeJP(builder, LocalizeJPOffset); + CharacterVoiceSubtitleExcel.AddLocalizeKR(builder, LocalizeKROffset); + CharacterVoiceSubtitleExcel.AddLocalizeCVGroup(builder, LocalizeCVGroupOffset); + CharacterVoiceSubtitleExcel.AddSeparate(builder, Separate); + return CharacterVoiceSubtitleExcel.EndCharacterVoiceSubtitleExcel(builder); + } + + public static void StartCharacterVoiceSubtitleExcel(FlatBufferBuilder builder) { builder.StartTable(6); } + public static void AddLocalizeCVGroup(FlatBufferBuilder builder, StringOffset localizeCVGroupOffset) { builder.AddOffset(0, localizeCVGroupOffset.Value, 0); } + public static void AddCharacterVoiceGroupId(FlatBufferBuilder builder, long characterVoiceGroupId) { builder.AddLong(1, characterVoiceGroupId, 0); } + public static void AddDuration(FlatBufferBuilder builder, long duration) { builder.AddLong(2, duration, 0); } + public static void AddSeparate(FlatBufferBuilder builder, bool separate) { builder.AddBool(3, separate, false); } + public static void AddLocalizeKR(FlatBufferBuilder builder, StringOffset localizeKROffset) { builder.AddOffset(4, localizeKROffset.Value, 0); } + public static void AddLocalizeJP(FlatBufferBuilder builder, StringOffset localizeJPOffset) { builder.AddOffset(5, localizeJPOffset.Value, 0); } + public static Offset EndCharacterVoiceSubtitleExcel(FlatBufferBuilder builder) { + int o = builder.EndTable(); + return new Offset(o); + } + public CharacterVoiceSubtitleExcelT UnPack() { + var _o = new CharacterVoiceSubtitleExcelT(); + this.UnPackTo(_o); + return _o; + } + public void UnPackTo(CharacterVoiceSubtitleExcelT _o) { + byte[] key = TableEncryptionService.CreateKey("CharacterVoiceSubtitle"); + _o.LocalizeCVGroup = TableEncryptionService.Convert(this.LocalizeCVGroup, key); + _o.CharacterVoiceGroupId = TableEncryptionService.Convert(this.CharacterVoiceGroupId, key); + _o.Duration = TableEncryptionService.Convert(this.Duration, key); + _o.Separate = TableEncryptionService.Convert(this.Separate, key); + _o.LocalizeKR = TableEncryptionService.Convert(this.LocalizeKR, key); + _o.LocalizeJP = TableEncryptionService.Convert(this.LocalizeJP, key); + } + public static Offset Pack(FlatBufferBuilder builder, CharacterVoiceSubtitleExcelT _o) { + if (_o == null) return default(Offset); + var _LocalizeCVGroup = _o.LocalizeCVGroup == null ? default(StringOffset) : builder.CreateString(_o.LocalizeCVGroup); + var _LocalizeKR = _o.LocalizeKR == null ? default(StringOffset) : builder.CreateString(_o.LocalizeKR); + var _LocalizeJP = _o.LocalizeJP == null ? default(StringOffset) : builder.CreateString(_o.LocalizeJP); + return CreateCharacterVoiceSubtitleExcel( + builder, + _LocalizeCVGroup, + _o.CharacterVoiceGroupId, + _o.Duration, + _o.Separate, + _LocalizeKR, + _LocalizeJP); + } +} + +public class CharacterVoiceSubtitleExcelT +{ + public string LocalizeCVGroup { get; set; } + public long CharacterVoiceGroupId { get; set; } + public long Duration { get; set; } + public bool Separate { get; set; } + public string LocalizeKR { get; set; } + public string LocalizeJP { get; set; } + + public CharacterVoiceSubtitleExcelT() { + this.LocalizeCVGroup = null; + this.CharacterVoiceGroupId = 0; + this.Duration = 0; + this.Separate = false; + this.LocalizeKR = null; + this.LocalizeJP = null; + } +} + + +static public class CharacterVoiceSubtitleExcelVerify +{ + static public bool Verify(Google.FlatBuffers.Verifier verifier, uint tablePos) + { + return verifier.VerifyTableStart(tablePos) + && verifier.VerifyString(tablePos, 4 /*LocalizeCVGroup*/, false) + && verifier.VerifyField(tablePos, 6 /*CharacterVoiceGroupId*/, 8 /*long*/, 8, false) + && verifier.VerifyField(tablePos, 8 /*Duration*/, 8 /*long*/, 8, false) + && verifier.VerifyField(tablePos, 10 /*Separate*/, 1 /*bool*/, 1, false) + && verifier.VerifyString(tablePos, 12 /*LocalizeKR*/, false) + && verifier.VerifyString(tablePos, 14 /*LocalizeJP*/, false) + && verifier.VerifyTableEnd(tablePos); + } +} + +} diff --git a/SCHALE.Common/FlatData/CharacterWeaponExcel.cs b/SCHALE.Common/FlatData/CharacterWeaponExcel.cs index fe24884..1a818dd 100644 --- a/SCHALE.Common/FlatData/CharacterWeaponExcel.cs +++ b/SCHALE.Common/FlatData/CharacterWeaponExcel.cs @@ -29,7 +29,7 @@ public struct CharacterWeaponExcel : IFlatbufferObject #endif public byte[] GetImagePathArray() { return __p.__vector_as_array(6); } public long SetRecipe { get { int o = __p.__offset(8); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } - public SCHALE.Common.FlatData.StatLevelUpType StatLevelUpType { get { int o = __p.__offset(10); return o != 0 ? (SCHALE.Common.FlatData.StatLevelUpType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.StatLevelUpType.Standard; } } + public SCHALE.Common.FlatData.StatLevelUpType StatLevelUpType_ { get { int o = __p.__offset(10); return o != 0 ? (SCHALE.Common.FlatData.StatLevelUpType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.StatLevelUpType.Standard; } } public long AttackPower { get { int o = __p.__offset(12); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public long AttackPower100 { get { int o = __p.__offset(14); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public long MaxHP { get { int o = __p.__offset(16); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } @@ -83,7 +83,7 @@ public struct CharacterWeaponExcel : IFlatbufferObject long Id = 0, StringOffset ImagePathOffset = default(StringOffset), long SetRecipe = 0, - SCHALE.Common.FlatData.StatLevelUpType StatLevelUpType = SCHALE.Common.FlatData.StatLevelUpType.Standard, + SCHALE.Common.FlatData.StatLevelUpType StatLevelUpType_ = SCHALE.Common.FlatData.StatLevelUpType.Standard, long AttackPower = 0, long AttackPower100 = 0, long MaxHP = 0, @@ -111,7 +111,7 @@ public struct CharacterWeaponExcel : IFlatbufferObject CharacterWeaponExcel.AddMaxLevel(builder, MaxLevelOffset); CharacterWeaponExcel.AddRecipeId(builder, RecipeIdOffset); CharacterWeaponExcel.AddUnlock(builder, UnlockOffset); - CharacterWeaponExcel.AddStatLevelUpType(builder, StatLevelUpType); + CharacterWeaponExcel.AddStatLevelUpType_(builder, StatLevelUpType_); CharacterWeaponExcel.AddImagePath(builder, ImagePathOffset); return CharacterWeaponExcel.EndCharacterWeaponExcel(builder); } @@ -120,7 +120,7 @@ public struct CharacterWeaponExcel : IFlatbufferObject public static void AddId(FlatBufferBuilder builder, long id) { builder.AddLong(0, id, 0); } public static void AddImagePath(FlatBufferBuilder builder, StringOffset imagePathOffset) { builder.AddOffset(1, imagePathOffset.Value, 0); } public static void AddSetRecipe(FlatBufferBuilder builder, long setRecipe) { builder.AddLong(2, setRecipe, 0); } - public static void AddStatLevelUpType(FlatBufferBuilder builder, SCHALE.Common.FlatData.StatLevelUpType statLevelUpType) { builder.AddInt(3, (int)statLevelUpType, 0); } + public static void AddStatLevelUpType_(FlatBufferBuilder builder, SCHALE.Common.FlatData.StatLevelUpType statLevelUpType_) { builder.AddInt(3, (int)statLevelUpType_, 0); } public static void AddAttackPower(FlatBufferBuilder builder, long attackPower) { builder.AddLong(4, attackPower, 0); } public static void AddAttackPower100(FlatBufferBuilder builder, long attackPower100) { builder.AddLong(5, attackPower100, 0); } public static void AddMaxHP(FlatBufferBuilder builder, long maxHP) { builder.AddLong(6, maxHP, 0); } @@ -177,7 +177,7 @@ public struct CharacterWeaponExcel : IFlatbufferObject _o.Id = TableEncryptionService.Convert(this.Id, key); _o.ImagePath = TableEncryptionService.Convert(this.ImagePath, key); _o.SetRecipe = TableEncryptionService.Convert(this.SetRecipe, key); - _o.StatLevelUpType = TableEncryptionService.Convert(this.StatLevelUpType, key); + _o.StatLevelUpType_ = TableEncryptionService.Convert(this.StatLevelUpType_, key); _o.AttackPower = TableEncryptionService.Convert(this.AttackPower, key); _o.AttackPower100 = TableEncryptionService.Convert(this.AttackPower100, key); _o.MaxHP = TableEncryptionService.Convert(this.MaxHP, key); @@ -236,7 +236,7 @@ public struct CharacterWeaponExcel : IFlatbufferObject _o.Id, _ImagePath, _o.SetRecipe, - _o.StatLevelUpType, + _o.StatLevelUpType_, _o.AttackPower, _o.AttackPower100, _o.MaxHP, @@ -257,7 +257,7 @@ public class CharacterWeaponExcelT public long Id { get; set; } public string ImagePath { get; set; } public long SetRecipe { get; set; } - public SCHALE.Common.FlatData.StatLevelUpType StatLevelUpType { get; set; } + public SCHALE.Common.FlatData.StatLevelUpType StatLevelUpType_ { get; set; } public long AttackPower { get; set; } public long AttackPower100 { get; set; } public long MaxHP { get; set; } @@ -275,7 +275,7 @@ public class CharacterWeaponExcelT this.Id = 0; this.ImagePath = null; this.SetRecipe = 0; - this.StatLevelUpType = SCHALE.Common.FlatData.StatLevelUpType.Standard; + this.StatLevelUpType_ = SCHALE.Common.FlatData.StatLevelUpType.Standard; this.AttackPower = 0; this.AttackPower100 = 0; this.MaxHP = 0; @@ -300,7 +300,7 @@ static public class CharacterWeaponExcelVerify && verifier.VerifyField(tablePos, 4 /*Id*/, 8 /*long*/, 8, false) && verifier.VerifyString(tablePos, 6 /*ImagePath*/, false) && verifier.VerifyField(tablePos, 8 /*SetRecipe*/, 8 /*long*/, 8, false) - && verifier.VerifyField(tablePos, 10 /*StatLevelUpType*/, 4 /*SCHALE.Common.FlatData.StatLevelUpType*/, 4, false) + && verifier.VerifyField(tablePos, 10 /*StatLevelUpType_*/, 4 /*SCHALE.Common.FlatData.StatLevelUpType*/, 4, false) && verifier.VerifyField(tablePos, 12 /*AttackPower*/, 8 /*long*/, 8, false) && verifier.VerifyField(tablePos, 14 /*AttackPower100*/, 8 /*long*/, 8, false) && verifier.VerifyField(tablePos, 16 /*MaxHP*/, 8 /*long*/, 8, false) diff --git a/SCHALE.Common/FlatData/CharacterWeaponExpBonusExcel.cs b/SCHALE.Common/FlatData/CharacterWeaponExpBonusExcel.cs index cb9086e..ea8de04 100644 --- a/SCHALE.Common/FlatData/CharacterWeaponExpBonusExcel.cs +++ b/SCHALE.Common/FlatData/CharacterWeaponExpBonusExcel.cs @@ -20,14 +20,14 @@ public struct CharacterWeaponExpBonusExcel : IFlatbufferObject public void __init(int _i, ByteBuffer _bb) { __p = new Table(_i, _bb); } public CharacterWeaponExpBonusExcel __assign(int _i, ByteBuffer _bb) { __init(_i, _bb); return this; } - public SCHALE.Common.FlatData.WeaponType WeaponType { get { int o = __p.__offset(4); return o != 0 ? (SCHALE.Common.FlatData.WeaponType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.WeaponType.None; } } + public SCHALE.Common.FlatData.WeaponType WeaponType_ { get { int o = __p.__offset(4); return o != 0 ? (SCHALE.Common.FlatData.WeaponType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.WeaponType.None; } } public int WeaponExpGrowthA { get { int o = __p.__offset(6); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } public int WeaponExpGrowthB { get { int o = __p.__offset(8); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } public int WeaponExpGrowthC { get { int o = __p.__offset(10); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } public int WeaponExpGrowthZ { get { int o = __p.__offset(12); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } public static Offset CreateCharacterWeaponExpBonusExcel(FlatBufferBuilder builder, - SCHALE.Common.FlatData.WeaponType WeaponType = SCHALE.Common.FlatData.WeaponType.None, + SCHALE.Common.FlatData.WeaponType WeaponType_ = SCHALE.Common.FlatData.WeaponType.None, int WeaponExpGrowthA = 0, int WeaponExpGrowthB = 0, int WeaponExpGrowthC = 0, @@ -37,12 +37,12 @@ public struct CharacterWeaponExpBonusExcel : IFlatbufferObject CharacterWeaponExpBonusExcel.AddWeaponExpGrowthC(builder, WeaponExpGrowthC); CharacterWeaponExpBonusExcel.AddWeaponExpGrowthB(builder, WeaponExpGrowthB); CharacterWeaponExpBonusExcel.AddWeaponExpGrowthA(builder, WeaponExpGrowthA); - CharacterWeaponExpBonusExcel.AddWeaponType(builder, WeaponType); + CharacterWeaponExpBonusExcel.AddWeaponType_(builder, WeaponType_); return CharacterWeaponExpBonusExcel.EndCharacterWeaponExpBonusExcel(builder); } public static void StartCharacterWeaponExpBonusExcel(FlatBufferBuilder builder) { builder.StartTable(5); } - public static void AddWeaponType(FlatBufferBuilder builder, SCHALE.Common.FlatData.WeaponType weaponType) { builder.AddInt(0, (int)weaponType, 0); } + public static void AddWeaponType_(FlatBufferBuilder builder, SCHALE.Common.FlatData.WeaponType weaponType_) { builder.AddInt(0, (int)weaponType_, 0); } public static void AddWeaponExpGrowthA(FlatBufferBuilder builder, int weaponExpGrowthA) { builder.AddInt(1, weaponExpGrowthA, 0); } public static void AddWeaponExpGrowthB(FlatBufferBuilder builder, int weaponExpGrowthB) { builder.AddInt(2, weaponExpGrowthB, 0); } public static void AddWeaponExpGrowthC(FlatBufferBuilder builder, int weaponExpGrowthC) { builder.AddInt(3, weaponExpGrowthC, 0); } @@ -58,7 +58,7 @@ public struct CharacterWeaponExpBonusExcel : IFlatbufferObject } public void UnPackTo(CharacterWeaponExpBonusExcelT _o) { byte[] key = TableEncryptionService.CreateKey("CharacterWeaponExpBonus"); - _o.WeaponType = TableEncryptionService.Convert(this.WeaponType, key); + _o.WeaponType_ = TableEncryptionService.Convert(this.WeaponType_, key); _o.WeaponExpGrowthA = TableEncryptionService.Convert(this.WeaponExpGrowthA, key); _o.WeaponExpGrowthB = TableEncryptionService.Convert(this.WeaponExpGrowthB, key); _o.WeaponExpGrowthC = TableEncryptionService.Convert(this.WeaponExpGrowthC, key); @@ -68,7 +68,7 @@ public struct CharacterWeaponExpBonusExcel : IFlatbufferObject if (_o == null) return default(Offset); return CreateCharacterWeaponExpBonusExcel( builder, - _o.WeaponType, + _o.WeaponType_, _o.WeaponExpGrowthA, _o.WeaponExpGrowthB, _o.WeaponExpGrowthC, @@ -78,14 +78,14 @@ public struct CharacterWeaponExpBonusExcel : IFlatbufferObject public class CharacterWeaponExpBonusExcelT { - public SCHALE.Common.FlatData.WeaponType WeaponType { get; set; } + public SCHALE.Common.FlatData.WeaponType WeaponType_ { get; set; } public int WeaponExpGrowthA { get; set; } public int WeaponExpGrowthB { get; set; } public int WeaponExpGrowthC { get; set; } public int WeaponExpGrowthZ { get; set; } public CharacterWeaponExpBonusExcelT() { - this.WeaponType = SCHALE.Common.FlatData.WeaponType.None; + this.WeaponType_ = SCHALE.Common.FlatData.WeaponType.None; this.WeaponExpGrowthA = 0; this.WeaponExpGrowthB = 0; this.WeaponExpGrowthC = 0; @@ -99,7 +99,7 @@ static public class CharacterWeaponExpBonusExcelVerify static public bool Verify(Google.FlatBuffers.Verifier verifier, uint tablePos) { return verifier.VerifyTableStart(tablePos) - && verifier.VerifyField(tablePos, 4 /*WeaponType*/, 4 /*SCHALE.Common.FlatData.WeaponType*/, 4, false) + && verifier.VerifyField(tablePos, 4 /*WeaponType_*/, 4 /*SCHALE.Common.FlatData.WeaponType*/, 4, false) && verifier.VerifyField(tablePos, 6 /*WeaponExpGrowthA*/, 4 /*int*/, 4, false) && verifier.VerifyField(tablePos, 8 /*WeaponExpGrowthB*/, 4 /*int*/, 4, false) && verifier.VerifyField(tablePos, 10 /*WeaponExpGrowthC*/, 4 /*int*/, 4, false) diff --git a/SCHALE.Common/FlatData/CheatCodeListExcel.cs b/SCHALE.Common/FlatData/CheatCodeListExcel.cs new file mode 100644 index 0000000..2ef7232 --- /dev/null +++ b/SCHALE.Common/FlatData/CheatCodeListExcel.cs @@ -0,0 +1,135 @@ +// +// automatically generated by the FlatBuffers compiler, do not modify +// + +namespace SCHALE.Common.FlatData +{ + +using global::System; +using global::System.Collections.Generic; +using global::SCHALE.Common.Crypto; +using global::Google.FlatBuffers; + +public struct CheatCodeListExcel : IFlatbufferObject +{ + private Table __p; + public ByteBuffer ByteBuffer { get { return __p.bb; } } + public static void ValidateVersion() { FlatBufferConstants.FLATBUFFERS_24_3_25(); } + public static CheatCodeListExcel GetRootAsCheatCodeListExcel(ByteBuffer _bb) { return GetRootAsCheatCodeListExcel(_bb, new CheatCodeListExcel()); } + public static CheatCodeListExcel GetRootAsCheatCodeListExcel(ByteBuffer _bb, CheatCodeListExcel obj) { return (obj.__assign(_bb.GetInt(_bb.Position) + _bb.Position, _bb)); } + public void __init(int _i, ByteBuffer _bb) { __p = new Table(_i, _bb); } + public CheatCodeListExcel __assign(int _i, ByteBuffer _bb) { __init(_i, _bb); return this; } + + public long Id { get { int o = __p.__offset(4); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } + public string CheatCode(int j) { int o = __p.__offset(6); return o != 0 ? __p.__string(__p.__vector(o) + j * 4) : null; } + public int CheatCodeLength { get { int o = __p.__offset(6); return o != 0 ? __p.__vector_len(o) : 0; } } + public string InputTitle(int j) { int o = __p.__offset(8); return o != 0 ? __p.__string(__p.__vector(o) + j * 4) : null; } + public int InputTitleLength { get { int o = __p.__offset(8); return o != 0 ? __p.__vector_len(o) : 0; } } + public string Desc { get { int o = __p.__offset(10); return o != 0 ? __p.__string(o + __p.bb_pos) : null; } } +#if ENABLE_SPAN_T + public Span GetDescBytes() { return __p.__vector_as_span(10, 1); } +#else + public ArraySegment? GetDescBytes() { return __p.__vector_as_arraysegment(10); } +#endif + public byte[] GetDescArray() { return __p.__vector_as_array(10); } + + public static Offset CreateCheatCodeListExcel(FlatBufferBuilder builder, + long Id = 0, + VectorOffset CheatCodeOffset = default(VectorOffset), + VectorOffset InputTitleOffset = default(VectorOffset), + StringOffset DescOffset = default(StringOffset)) { + builder.StartTable(4); + CheatCodeListExcel.AddId(builder, Id); + CheatCodeListExcel.AddDesc(builder, DescOffset); + CheatCodeListExcel.AddInputTitle(builder, InputTitleOffset); + CheatCodeListExcel.AddCheatCode(builder, CheatCodeOffset); + return CheatCodeListExcel.EndCheatCodeListExcel(builder); + } + + public static void StartCheatCodeListExcel(FlatBufferBuilder builder) { builder.StartTable(4); } + public static void AddId(FlatBufferBuilder builder, long id) { builder.AddLong(0, id, 0); } + public static void AddCheatCode(FlatBufferBuilder builder, VectorOffset cheatCodeOffset) { builder.AddOffset(1, cheatCodeOffset.Value, 0); } + public static VectorOffset CreateCheatCodeVector(FlatBufferBuilder builder, StringOffset[] data) { builder.StartVector(4, data.Length, 4); for (int i = data.Length - 1; i >= 0; i--) builder.AddOffset(data[i].Value); return builder.EndVector(); } + public static VectorOffset CreateCheatCodeVectorBlock(FlatBufferBuilder builder, StringOffset[] data) { builder.StartVector(4, data.Length, 4); builder.Add(data); return builder.EndVector(); } + public static VectorOffset CreateCheatCodeVectorBlock(FlatBufferBuilder builder, ArraySegment data) { builder.StartVector(4, data.Count, 4); builder.Add(data); return builder.EndVector(); } + public static VectorOffset CreateCheatCodeVectorBlock(FlatBufferBuilder builder, IntPtr dataPtr, int sizeInBytes) { builder.StartVector(1, sizeInBytes, 1); builder.Add(dataPtr, sizeInBytes); return builder.EndVector(); } + public static void StartCheatCodeVector(FlatBufferBuilder builder, int numElems) { builder.StartVector(4, numElems, 4); } + public static void AddInputTitle(FlatBufferBuilder builder, VectorOffset inputTitleOffset) { builder.AddOffset(2, inputTitleOffset.Value, 0); } + public static VectorOffset CreateInputTitleVector(FlatBufferBuilder builder, StringOffset[] data) { builder.StartVector(4, data.Length, 4); for (int i = data.Length - 1; i >= 0; i--) builder.AddOffset(data[i].Value); return builder.EndVector(); } + public static VectorOffset CreateInputTitleVectorBlock(FlatBufferBuilder builder, StringOffset[] data) { builder.StartVector(4, data.Length, 4); builder.Add(data); return builder.EndVector(); } + public static VectorOffset CreateInputTitleVectorBlock(FlatBufferBuilder builder, ArraySegment data) { builder.StartVector(4, data.Count, 4); builder.Add(data); return builder.EndVector(); } + public static VectorOffset CreateInputTitleVectorBlock(FlatBufferBuilder builder, IntPtr dataPtr, int sizeInBytes) { builder.StartVector(1, sizeInBytes, 1); builder.Add(dataPtr, sizeInBytes); return builder.EndVector(); } + public static void StartInputTitleVector(FlatBufferBuilder builder, int numElems) { builder.StartVector(4, numElems, 4); } + public static void AddDesc(FlatBufferBuilder builder, StringOffset descOffset) { builder.AddOffset(3, descOffset.Value, 0); } + public static Offset EndCheatCodeListExcel(FlatBufferBuilder builder) { + int o = builder.EndTable(); + return new Offset(o); + } + public CheatCodeListExcelT UnPack() { + var _o = new CheatCodeListExcelT(); + this.UnPackTo(_o); + return _o; + } + public void UnPackTo(CheatCodeListExcelT _o) { + byte[] key = TableEncryptionService.CreateKey("CheatCodeList"); + _o.Id = TableEncryptionService.Convert(this.Id, key); + _o.CheatCode = new List(); + for (var _j = 0; _j < this.CheatCodeLength; ++_j) {_o.CheatCode.Add(TableEncryptionService.Convert(this.CheatCode(_j), key));} + _o.InputTitle = new List(); + for (var _j = 0; _j < this.InputTitleLength; ++_j) {_o.InputTitle.Add(TableEncryptionService.Convert(this.InputTitle(_j), key));} + _o.Desc = TableEncryptionService.Convert(this.Desc, key); + } + public static Offset Pack(FlatBufferBuilder builder, CheatCodeListExcelT _o) { + if (_o == null) return default(Offset); + var _CheatCode = default(VectorOffset); + if (_o.CheatCode != null) { + var __CheatCode = new StringOffset[_o.CheatCode.Count]; + for (var _j = 0; _j < __CheatCode.Length; ++_j) { __CheatCode[_j] = builder.CreateString(_o.CheatCode[_j]); } + _CheatCode = CreateCheatCodeVector(builder, __CheatCode); + } + var _InputTitle = default(VectorOffset); + if (_o.InputTitle != null) { + var __InputTitle = new StringOffset[_o.InputTitle.Count]; + for (var _j = 0; _j < __InputTitle.Length; ++_j) { __InputTitle[_j] = builder.CreateString(_o.InputTitle[_j]); } + _InputTitle = CreateInputTitleVector(builder, __InputTitle); + } + var _Desc = _o.Desc == null ? default(StringOffset) : builder.CreateString(_o.Desc); + return CreateCheatCodeListExcel( + builder, + _o.Id, + _CheatCode, + _InputTitle, + _Desc); + } +} + +public class CheatCodeListExcelT +{ + public long Id { get; set; } + public List CheatCode { get; set; } + public List InputTitle { get; set; } + public string Desc { get; set; } + + public CheatCodeListExcelT() { + this.Id = 0; + this.CheatCode = null; + this.InputTitle = null; + this.Desc = null; + } +} + + +static public class CheatCodeListExcelVerify +{ + static public bool Verify(Google.FlatBuffers.Verifier verifier, uint tablePos) + { + return verifier.VerifyTableStart(tablePos) + && verifier.VerifyField(tablePos, 4 /*Id*/, 8 /*long*/, 8, false) + && verifier.VerifyVectorOfStrings(tablePos, 6 /*CheatCode*/, false) + && verifier.VerifyVectorOfStrings(tablePos, 8 /*InputTitle*/, false) + && verifier.VerifyString(tablePos, 10 /*Desc*/, false) + && verifier.VerifyTableEnd(tablePos); + } +} + +} diff --git a/SCHALE.Common/FlatData/ClanAssistSlotExcel.cs b/SCHALE.Common/FlatData/ClanAssistSlotExcel.cs index 14b4831..83bca09 100644 --- a/SCHALE.Common/FlatData/ClanAssistSlotExcel.cs +++ b/SCHALE.Common/FlatData/ClanAssistSlotExcel.cs @@ -21,40 +21,44 @@ public struct ClanAssistSlotExcel : IFlatbufferObject public ClanAssistSlotExcel __assign(int _i, ByteBuffer _bb) { __init(_i, _bb); return this; } public long SlotId { get { int o = __p.__offset(4); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } - public SCHALE.Common.FlatData.EchelonType EchelonType { get { int o = __p.__offset(6); return o != 0 ? (SCHALE.Common.FlatData.EchelonType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.EchelonType.None; } } + public SCHALE.Common.FlatData.EchelonType EchelonType_ { get { int o = __p.__offset(6); return o != 0 ? (SCHALE.Common.FlatData.EchelonType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.EchelonType.None; } } public long SlotNumber { get { int o = __p.__offset(8); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public long AssistTermRewardPeriodFromSec { get { int o = __p.__offset(10); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public long AssistRewardLimit { get { int o = __p.__offset(12); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public long AssistRentRewardDailyMaxCount { get { int o = __p.__offset(14); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public long AssistRentalFeeAmount { get { int o = __p.__offset(16); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } + public long AssistRentalFeeAmountStranger { get { int o = __p.__offset(18); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public static Offset CreateClanAssistSlotExcel(FlatBufferBuilder builder, long SlotId = 0, - SCHALE.Common.FlatData.EchelonType EchelonType = SCHALE.Common.FlatData.EchelonType.None, + SCHALE.Common.FlatData.EchelonType EchelonType_ = SCHALE.Common.FlatData.EchelonType.None, long SlotNumber = 0, long AssistTermRewardPeriodFromSec = 0, long AssistRewardLimit = 0, long AssistRentRewardDailyMaxCount = 0, - long AssistRentalFeeAmount = 0) { - builder.StartTable(7); + long AssistRentalFeeAmount = 0, + long AssistRentalFeeAmountStranger = 0) { + builder.StartTable(8); + ClanAssistSlotExcel.AddAssistRentalFeeAmountStranger(builder, AssistRentalFeeAmountStranger); ClanAssistSlotExcel.AddAssistRentalFeeAmount(builder, AssistRentalFeeAmount); ClanAssistSlotExcel.AddAssistRentRewardDailyMaxCount(builder, AssistRentRewardDailyMaxCount); ClanAssistSlotExcel.AddAssistRewardLimit(builder, AssistRewardLimit); ClanAssistSlotExcel.AddAssistTermRewardPeriodFromSec(builder, AssistTermRewardPeriodFromSec); ClanAssistSlotExcel.AddSlotNumber(builder, SlotNumber); ClanAssistSlotExcel.AddSlotId(builder, SlotId); - ClanAssistSlotExcel.AddEchelonType(builder, EchelonType); + ClanAssistSlotExcel.AddEchelonType_(builder, EchelonType_); return ClanAssistSlotExcel.EndClanAssistSlotExcel(builder); } - public static void StartClanAssistSlotExcel(FlatBufferBuilder builder) { builder.StartTable(7); } + public static void StartClanAssistSlotExcel(FlatBufferBuilder builder) { builder.StartTable(8); } public static void AddSlotId(FlatBufferBuilder builder, long slotId) { builder.AddLong(0, slotId, 0); } - public static void AddEchelonType(FlatBufferBuilder builder, SCHALE.Common.FlatData.EchelonType echelonType) { builder.AddInt(1, (int)echelonType, 0); } + public static void AddEchelonType_(FlatBufferBuilder builder, SCHALE.Common.FlatData.EchelonType echelonType_) { builder.AddInt(1, (int)echelonType_, 0); } public static void AddSlotNumber(FlatBufferBuilder builder, long slotNumber) { builder.AddLong(2, slotNumber, 0); } public static void AddAssistTermRewardPeriodFromSec(FlatBufferBuilder builder, long assistTermRewardPeriodFromSec) { builder.AddLong(3, assistTermRewardPeriodFromSec, 0); } public static void AddAssistRewardLimit(FlatBufferBuilder builder, long assistRewardLimit) { builder.AddLong(4, assistRewardLimit, 0); } public static void AddAssistRentRewardDailyMaxCount(FlatBufferBuilder builder, long assistRentRewardDailyMaxCount) { builder.AddLong(5, assistRentRewardDailyMaxCount, 0); } public static void AddAssistRentalFeeAmount(FlatBufferBuilder builder, long assistRentalFeeAmount) { builder.AddLong(6, assistRentalFeeAmount, 0); } + public static void AddAssistRentalFeeAmountStranger(FlatBufferBuilder builder, long assistRentalFeeAmountStranger) { builder.AddLong(7, assistRentalFeeAmountStranger, 0); } public static Offset EndClanAssistSlotExcel(FlatBufferBuilder builder) { int o = builder.EndTable(); return new Offset(o); @@ -67,45 +71,49 @@ public struct ClanAssistSlotExcel : IFlatbufferObject public void UnPackTo(ClanAssistSlotExcelT _o) { byte[] key = TableEncryptionService.CreateKey("ClanAssistSlot"); _o.SlotId = TableEncryptionService.Convert(this.SlotId, key); - _o.EchelonType = TableEncryptionService.Convert(this.EchelonType, key); + _o.EchelonType_ = TableEncryptionService.Convert(this.EchelonType_, key); _o.SlotNumber = TableEncryptionService.Convert(this.SlotNumber, key); _o.AssistTermRewardPeriodFromSec = TableEncryptionService.Convert(this.AssistTermRewardPeriodFromSec, key); _o.AssistRewardLimit = TableEncryptionService.Convert(this.AssistRewardLimit, key); _o.AssistRentRewardDailyMaxCount = TableEncryptionService.Convert(this.AssistRentRewardDailyMaxCount, key); _o.AssistRentalFeeAmount = TableEncryptionService.Convert(this.AssistRentalFeeAmount, key); + _o.AssistRentalFeeAmountStranger = TableEncryptionService.Convert(this.AssistRentalFeeAmountStranger, key); } public static Offset Pack(FlatBufferBuilder builder, ClanAssistSlotExcelT _o) { if (_o == null) return default(Offset); return CreateClanAssistSlotExcel( builder, _o.SlotId, - _o.EchelonType, + _o.EchelonType_, _o.SlotNumber, _o.AssistTermRewardPeriodFromSec, _o.AssistRewardLimit, _o.AssistRentRewardDailyMaxCount, - _o.AssistRentalFeeAmount); + _o.AssistRentalFeeAmount, + _o.AssistRentalFeeAmountStranger); } } public class ClanAssistSlotExcelT { public long SlotId { get; set; } - public SCHALE.Common.FlatData.EchelonType EchelonType { get; set; } + public SCHALE.Common.FlatData.EchelonType EchelonType_ { get; set; } public long SlotNumber { get; set; } public long AssistTermRewardPeriodFromSec { get; set; } public long AssistRewardLimit { get; set; } public long AssistRentRewardDailyMaxCount { get; set; } public long AssistRentalFeeAmount { get; set; } + public long AssistRentalFeeAmountStranger { get; set; } public ClanAssistSlotExcelT() { this.SlotId = 0; - this.EchelonType = SCHALE.Common.FlatData.EchelonType.None; + this.EchelonType_ = SCHALE.Common.FlatData.EchelonType.None; this.SlotNumber = 0; this.AssistTermRewardPeriodFromSec = 0; this.AssistRewardLimit = 0; this.AssistRentRewardDailyMaxCount = 0; this.AssistRentalFeeAmount = 0; + this.AssistRentalFeeAmountStranger = 0; } } @@ -116,12 +124,13 @@ static public class ClanAssistSlotExcelVerify { return verifier.VerifyTableStart(tablePos) && verifier.VerifyField(tablePos, 4 /*SlotId*/, 8 /*long*/, 8, false) - && verifier.VerifyField(tablePos, 6 /*EchelonType*/, 4 /*SCHALE.Common.FlatData.EchelonType*/, 4, false) + && verifier.VerifyField(tablePos, 6 /*EchelonType_*/, 4 /*SCHALE.Common.FlatData.EchelonType*/, 4, false) && verifier.VerifyField(tablePos, 8 /*SlotNumber*/, 8 /*long*/, 8, false) && verifier.VerifyField(tablePos, 10 /*AssistTermRewardPeriodFromSec*/, 8 /*long*/, 8, false) && verifier.VerifyField(tablePos, 12 /*AssistRewardLimit*/, 8 /*long*/, 8, false) && verifier.VerifyField(tablePos, 14 /*AssistRentRewardDailyMaxCount*/, 8 /*long*/, 8, false) && verifier.VerifyField(tablePos, 16 /*AssistRentalFeeAmount*/, 8 /*long*/, 8, false) + && verifier.VerifyField(tablePos, 18 /*AssistRentalFeeAmountStranger*/, 8 /*long*/, 8, false) && verifier.VerifyTableEnd(tablePos); } } diff --git a/SCHALE.Common/FlatData/ClanRewardExcel.cs b/SCHALE.Common/FlatData/ClanRewardExcel.cs index 1042436..7a7b548 100644 --- a/SCHALE.Common/FlatData/ClanRewardExcel.cs +++ b/SCHALE.Common/FlatData/ClanRewardExcel.cs @@ -20,15 +20,15 @@ public struct ClanRewardExcel : IFlatbufferObject public void __init(int _i, ByteBuffer _bb) { __p = new Table(_i, _bb); } public ClanRewardExcel __assign(int _i, ByteBuffer _bb) { __init(_i, _bb); return this; } - public SCHALE.Common.FlatData.ClanRewardType ClanRewardType { get { int o = __p.__offset(4); return o != 0 ? (SCHALE.Common.FlatData.ClanRewardType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.ClanRewardType.None; } } - public SCHALE.Common.FlatData.EchelonType EchelonType { get { int o = __p.__offset(6); return o != 0 ? (SCHALE.Common.FlatData.EchelonType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.EchelonType.None; } } + public SCHALE.Common.FlatData.ClanRewardType ClanRewardType_ { get { int o = __p.__offset(4); return o != 0 ? (SCHALE.Common.FlatData.ClanRewardType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.ClanRewardType.None; } } + public SCHALE.Common.FlatData.EchelonType EchelonType_ { get { int o = __p.__offset(6); return o != 0 ? (SCHALE.Common.FlatData.EchelonType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.EchelonType.None; } } public SCHALE.Common.FlatData.ParcelType RewardParcelType { get { int o = __p.__offset(8); return o != 0 ? (SCHALE.Common.FlatData.ParcelType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.ParcelType.None; } } public long RewardParcelId { get { int o = __p.__offset(10); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public long RewardParcelAmount { get { int o = __p.__offset(12); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public static Offset CreateClanRewardExcel(FlatBufferBuilder builder, - SCHALE.Common.FlatData.ClanRewardType ClanRewardType = SCHALE.Common.FlatData.ClanRewardType.None, - SCHALE.Common.FlatData.EchelonType EchelonType = SCHALE.Common.FlatData.EchelonType.None, + SCHALE.Common.FlatData.ClanRewardType ClanRewardType_ = SCHALE.Common.FlatData.ClanRewardType.None, + SCHALE.Common.FlatData.EchelonType EchelonType_ = SCHALE.Common.FlatData.EchelonType.None, SCHALE.Common.FlatData.ParcelType RewardParcelType = SCHALE.Common.FlatData.ParcelType.None, long RewardParcelId = 0, long RewardParcelAmount = 0) { @@ -36,14 +36,14 @@ public struct ClanRewardExcel : IFlatbufferObject ClanRewardExcel.AddRewardParcelAmount(builder, RewardParcelAmount); ClanRewardExcel.AddRewardParcelId(builder, RewardParcelId); ClanRewardExcel.AddRewardParcelType(builder, RewardParcelType); - ClanRewardExcel.AddEchelonType(builder, EchelonType); - ClanRewardExcel.AddClanRewardType(builder, ClanRewardType); + ClanRewardExcel.AddEchelonType_(builder, EchelonType_); + ClanRewardExcel.AddClanRewardType_(builder, ClanRewardType_); return ClanRewardExcel.EndClanRewardExcel(builder); } public static void StartClanRewardExcel(FlatBufferBuilder builder) { builder.StartTable(5); } - public static void AddClanRewardType(FlatBufferBuilder builder, SCHALE.Common.FlatData.ClanRewardType clanRewardType) { builder.AddInt(0, (int)clanRewardType, 0); } - public static void AddEchelonType(FlatBufferBuilder builder, SCHALE.Common.FlatData.EchelonType echelonType) { builder.AddInt(1, (int)echelonType, 0); } + public static void AddClanRewardType_(FlatBufferBuilder builder, SCHALE.Common.FlatData.ClanRewardType clanRewardType_) { builder.AddInt(0, (int)clanRewardType_, 0); } + public static void AddEchelonType_(FlatBufferBuilder builder, SCHALE.Common.FlatData.EchelonType echelonType_) { builder.AddInt(1, (int)echelonType_, 0); } public static void AddRewardParcelType(FlatBufferBuilder builder, SCHALE.Common.FlatData.ParcelType rewardParcelType) { builder.AddInt(2, (int)rewardParcelType, 0); } public static void AddRewardParcelId(FlatBufferBuilder builder, long rewardParcelId) { builder.AddLong(3, rewardParcelId, 0); } public static void AddRewardParcelAmount(FlatBufferBuilder builder, long rewardParcelAmount) { builder.AddLong(4, rewardParcelAmount, 0); } @@ -58,8 +58,8 @@ public struct ClanRewardExcel : IFlatbufferObject } public void UnPackTo(ClanRewardExcelT _o) { byte[] key = TableEncryptionService.CreateKey("ClanReward"); - _o.ClanRewardType = TableEncryptionService.Convert(this.ClanRewardType, key); - _o.EchelonType = TableEncryptionService.Convert(this.EchelonType, key); + _o.ClanRewardType_ = TableEncryptionService.Convert(this.ClanRewardType_, key); + _o.EchelonType_ = TableEncryptionService.Convert(this.EchelonType_, key); _o.RewardParcelType = TableEncryptionService.Convert(this.RewardParcelType, key); _o.RewardParcelId = TableEncryptionService.Convert(this.RewardParcelId, key); _o.RewardParcelAmount = TableEncryptionService.Convert(this.RewardParcelAmount, key); @@ -68,8 +68,8 @@ public struct ClanRewardExcel : IFlatbufferObject if (_o == null) return default(Offset); return CreateClanRewardExcel( builder, - _o.ClanRewardType, - _o.EchelonType, + _o.ClanRewardType_, + _o.EchelonType_, _o.RewardParcelType, _o.RewardParcelId, _o.RewardParcelAmount); @@ -78,15 +78,15 @@ public struct ClanRewardExcel : IFlatbufferObject public class ClanRewardExcelT { - public SCHALE.Common.FlatData.ClanRewardType ClanRewardType { get; set; } - public SCHALE.Common.FlatData.EchelonType EchelonType { get; set; } + public SCHALE.Common.FlatData.ClanRewardType ClanRewardType_ { get; set; } + public SCHALE.Common.FlatData.EchelonType EchelonType_ { get; set; } public SCHALE.Common.FlatData.ParcelType RewardParcelType { get; set; } public long RewardParcelId { get; set; } public long RewardParcelAmount { get; set; } public ClanRewardExcelT() { - this.ClanRewardType = SCHALE.Common.FlatData.ClanRewardType.None; - this.EchelonType = SCHALE.Common.FlatData.EchelonType.None; + this.ClanRewardType_ = SCHALE.Common.FlatData.ClanRewardType.None; + this.EchelonType_ = SCHALE.Common.FlatData.EchelonType.None; this.RewardParcelType = SCHALE.Common.FlatData.ParcelType.None; this.RewardParcelId = 0; this.RewardParcelAmount = 0; @@ -99,8 +99,8 @@ static public class ClanRewardExcelVerify static public bool Verify(Google.FlatBuffers.Verifier verifier, uint tablePos) { return verifier.VerifyTableStart(tablePos) - && verifier.VerifyField(tablePos, 4 /*ClanRewardType*/, 4 /*SCHALE.Common.FlatData.ClanRewardType*/, 4, false) - && verifier.VerifyField(tablePos, 6 /*EchelonType*/, 4 /*SCHALE.Common.FlatData.EchelonType*/, 4, false) + && verifier.VerifyField(tablePos, 4 /*ClanRewardType_*/, 4 /*SCHALE.Common.FlatData.ClanRewardType*/, 4, false) + && verifier.VerifyField(tablePos, 6 /*EchelonType_*/, 4 /*SCHALE.Common.FlatData.EchelonType*/, 4, false) && verifier.VerifyField(tablePos, 8 /*RewardParcelType*/, 4 /*SCHALE.Common.FlatData.ParcelType*/, 4, false) && verifier.VerifyField(tablePos, 10 /*RewardParcelId*/, 8 /*long*/, 8, false) && verifier.VerifyField(tablePos, 12 /*RewardParcelAmount*/, 8 /*long*/, 8, false) diff --git a/SCHALE.Common/FlatData/ClearDeckRuleExcel.cs b/SCHALE.Common/FlatData/ClearDeckRuleExcel.cs index a55218c..4a721c5 100644 --- a/SCHALE.Common/FlatData/ClearDeckRuleExcel.cs +++ b/SCHALE.Common/FlatData/ClearDeckRuleExcel.cs @@ -20,20 +20,20 @@ public struct ClearDeckRuleExcel : IFlatbufferObject public void __init(int _i, ByteBuffer _bb) { __p = new Table(_i, _bb); } public ClearDeckRuleExcel __assign(int _i, ByteBuffer _bb) { __init(_i, _bb); return this; } - public SCHALE.Common.FlatData.ContentType ContentType { get { int o = __p.__offset(4); return o != 0 ? (SCHALE.Common.FlatData.ContentType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.ContentType.None; } } + public SCHALE.Common.FlatData.ContentType ContentType_ { get { int o = __p.__offset(4); return o != 0 ? (SCHALE.Common.FlatData.ContentType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.ContentType.None; } } public long SizeLimit { get { int o = __p.__offset(6); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public static Offset CreateClearDeckRuleExcel(FlatBufferBuilder builder, - SCHALE.Common.FlatData.ContentType ContentType = SCHALE.Common.FlatData.ContentType.None, + SCHALE.Common.FlatData.ContentType ContentType_ = SCHALE.Common.FlatData.ContentType.None, long SizeLimit = 0) { builder.StartTable(2); ClearDeckRuleExcel.AddSizeLimit(builder, SizeLimit); - ClearDeckRuleExcel.AddContentType(builder, ContentType); + ClearDeckRuleExcel.AddContentType_(builder, ContentType_); return ClearDeckRuleExcel.EndClearDeckRuleExcel(builder); } public static void StartClearDeckRuleExcel(FlatBufferBuilder builder) { builder.StartTable(2); } - public static void AddContentType(FlatBufferBuilder builder, SCHALE.Common.FlatData.ContentType contentType) { builder.AddInt(0, (int)contentType, 0); } + public static void AddContentType_(FlatBufferBuilder builder, SCHALE.Common.FlatData.ContentType contentType_) { builder.AddInt(0, (int)contentType_, 0); } public static void AddSizeLimit(FlatBufferBuilder builder, long sizeLimit) { builder.AddLong(1, sizeLimit, 0); } public static Offset EndClearDeckRuleExcel(FlatBufferBuilder builder) { int o = builder.EndTable(); @@ -46,25 +46,25 @@ public struct ClearDeckRuleExcel : IFlatbufferObject } public void UnPackTo(ClearDeckRuleExcelT _o) { byte[] key = TableEncryptionService.CreateKey("ClearDeckRule"); - _o.ContentType = TableEncryptionService.Convert(this.ContentType, key); + _o.ContentType_ = TableEncryptionService.Convert(this.ContentType_, key); _o.SizeLimit = TableEncryptionService.Convert(this.SizeLimit, key); } public static Offset Pack(FlatBufferBuilder builder, ClearDeckRuleExcelT _o) { if (_o == null) return default(Offset); return CreateClearDeckRuleExcel( builder, - _o.ContentType, + _o.ContentType_, _o.SizeLimit); } } public class ClearDeckRuleExcelT { - public SCHALE.Common.FlatData.ContentType ContentType { get; set; } + public SCHALE.Common.FlatData.ContentType ContentType_ { get; set; } public long SizeLimit { get; set; } public ClearDeckRuleExcelT() { - this.ContentType = SCHALE.Common.FlatData.ContentType.None; + this.ContentType_ = SCHALE.Common.FlatData.ContentType.None; this.SizeLimit = 0; } } @@ -75,7 +75,7 @@ static public class ClearDeckRuleExcelVerify static public bool Verify(Google.FlatBuffers.Verifier verifier, uint tablePos) { return verifier.VerifyTableStart(tablePos) - && verifier.VerifyField(tablePos, 4 /*ContentType*/, 4 /*SCHALE.Common.FlatData.ContentType*/, 4, false) + && verifier.VerifyField(tablePos, 4 /*ContentType_*/, 4 /*SCHALE.Common.FlatData.ContentType*/, 4, false) && verifier.VerifyField(tablePos, 6 /*SizeLimit*/, 8 /*long*/, 8, false) && verifier.VerifyTableEnd(tablePos); } diff --git a/SCHALE.Common/FlatData/Club.cs b/SCHALE.Common/FlatData/Club.cs index ceef848..3186a38 100644 --- a/SCHALE.Common/FlatData/Club.cs +++ b/SCHALE.Common/FlatData/Club.cs @@ -56,6 +56,7 @@ public enum Club : int KnowledgeLiberationFront = 46, Hyakkayouran = 47, ShinySparkleSociety = 48, + AbydosStudentCouncil = 49, }; diff --git a/SCHALE.Common/FlatData/EventCollectionUnlockType.cs b/SCHALE.Common/FlatData/CollectionUnlockType.cs similarity index 86% rename from SCHALE.Common/FlatData/EventCollectionUnlockType.cs rename to SCHALE.Common/FlatData/CollectionUnlockType.cs index eddb938..3bea1ac 100644 --- a/SCHALE.Common/FlatData/EventCollectionUnlockType.cs +++ b/SCHALE.Common/FlatData/CollectionUnlockType.cs @@ -5,7 +5,7 @@ namespace SCHALE.Common.FlatData { -public enum EventCollectionUnlockType : int +public enum CollectionUnlockType : int { None = 0, ClearSpecificEventStage = 1, @@ -17,6 +17,7 @@ public enum EventCollectionUnlockType : int MinigameTBGThemaClear = 7, MinigameEnter = 8, MinigameDreamMakerParameter = 9, + ClearSpecificScenario = 10, }; diff --git a/SCHALE.Common/FlatData/CombatEmojiExcel.cs b/SCHALE.Common/FlatData/CombatEmojiExcel.cs index 74bc832..d5c8c32 100644 --- a/SCHALE.Common/FlatData/CombatEmojiExcel.cs +++ b/SCHALE.Common/FlatData/CombatEmojiExcel.cs @@ -21,7 +21,7 @@ public struct CombatEmojiExcel : IFlatbufferObject public CombatEmojiExcel __assign(int _i, ByteBuffer _bb) { __init(_i, _bb); return this; } public long UniqueId { get { int o = __p.__offset(4); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } - public SCHALE.Common.FlatData.EmojiEvent EmojiEvent { get { int o = __p.__offset(6); return o != 0 ? (SCHALE.Common.FlatData.EmojiEvent)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.EmojiEvent.EnterConver; } } + public SCHALE.Common.FlatData.EmojiEvent EmojiEvent_ { get { int o = __p.__offset(6); return o != 0 ? (SCHALE.Common.FlatData.EmojiEvent)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.EmojiEvent.EnterConver; } } public int OrderOfPriority { get { int o = __p.__offset(8); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } public bool EmojiDuration { get { int o = __p.__offset(10); return o != 0 ? 0!=__p.bb.Get(o + __p.bb_pos) : (bool)false; } } public bool EmojiReversal { get { int o = __p.__offset(12); return o != 0 ? 0!=__p.bb.Get(o + __p.bb_pos) : (bool)false; } } @@ -31,7 +31,7 @@ public struct CombatEmojiExcel : IFlatbufferObject public static Offset CreateCombatEmojiExcel(FlatBufferBuilder builder, long UniqueId = 0, - SCHALE.Common.FlatData.EmojiEvent EmojiEvent = SCHALE.Common.FlatData.EmojiEvent.EnterConver, + SCHALE.Common.FlatData.EmojiEvent EmojiEvent_ = SCHALE.Common.FlatData.EmojiEvent.EnterConver, int OrderOfPriority = 0, bool EmojiDuration = false, bool EmojiReversal = false, @@ -42,7 +42,7 @@ public struct CombatEmojiExcel : IFlatbufferObject CombatEmojiExcel.AddUniqueId(builder, UniqueId); CombatEmojiExcel.AddShowEmojiDelay(builder, ShowEmojiDelay); CombatEmojiExcel.AddOrderOfPriority(builder, OrderOfPriority); - CombatEmojiExcel.AddEmojiEvent(builder, EmojiEvent); + CombatEmojiExcel.AddEmojiEvent_(builder, EmojiEvent_); CombatEmojiExcel.AddShowDefaultBG(builder, ShowDefaultBG); CombatEmojiExcel.AddEmojiTurnOn(builder, EmojiTurnOn); CombatEmojiExcel.AddEmojiReversal(builder, EmojiReversal); @@ -52,7 +52,7 @@ public struct CombatEmojiExcel : IFlatbufferObject public static void StartCombatEmojiExcel(FlatBufferBuilder builder) { builder.StartTable(8); } public static void AddUniqueId(FlatBufferBuilder builder, long uniqueId) { builder.AddLong(0, uniqueId, 0); } - public static void AddEmojiEvent(FlatBufferBuilder builder, SCHALE.Common.FlatData.EmojiEvent emojiEvent) { builder.AddInt(1, (int)emojiEvent, 0); } + public static void AddEmojiEvent_(FlatBufferBuilder builder, SCHALE.Common.FlatData.EmojiEvent emojiEvent_) { builder.AddInt(1, (int)emojiEvent_, 0); } public static void AddOrderOfPriority(FlatBufferBuilder builder, int orderOfPriority) { builder.AddInt(2, orderOfPriority, 0); } public static void AddEmojiDuration(FlatBufferBuilder builder, bool emojiDuration) { builder.AddBool(3, emojiDuration, false); } public static void AddEmojiReversal(FlatBufferBuilder builder, bool emojiReversal) { builder.AddBool(4, emojiReversal, false); } @@ -71,7 +71,7 @@ public struct CombatEmojiExcel : IFlatbufferObject public void UnPackTo(CombatEmojiExcelT _o) { byte[] key = TableEncryptionService.CreateKey("CombatEmoji"); _o.UniqueId = TableEncryptionService.Convert(this.UniqueId, key); - _o.EmojiEvent = TableEncryptionService.Convert(this.EmojiEvent, key); + _o.EmojiEvent_ = TableEncryptionService.Convert(this.EmojiEvent_, key); _o.OrderOfPriority = TableEncryptionService.Convert(this.OrderOfPriority, key); _o.EmojiDuration = TableEncryptionService.Convert(this.EmojiDuration, key); _o.EmojiReversal = TableEncryptionService.Convert(this.EmojiReversal, key); @@ -84,7 +84,7 @@ public struct CombatEmojiExcel : IFlatbufferObject return CreateCombatEmojiExcel( builder, _o.UniqueId, - _o.EmojiEvent, + _o.EmojiEvent_, _o.OrderOfPriority, _o.EmojiDuration, _o.EmojiReversal, @@ -97,7 +97,7 @@ public struct CombatEmojiExcel : IFlatbufferObject public class CombatEmojiExcelT { public long UniqueId { get; set; } - public SCHALE.Common.FlatData.EmojiEvent EmojiEvent { get; set; } + public SCHALE.Common.FlatData.EmojiEvent EmojiEvent_ { get; set; } public int OrderOfPriority { get; set; } public bool EmojiDuration { get; set; } public bool EmojiReversal { get; set; } @@ -107,7 +107,7 @@ public class CombatEmojiExcelT public CombatEmojiExcelT() { this.UniqueId = 0; - this.EmojiEvent = SCHALE.Common.FlatData.EmojiEvent.EnterConver; + this.EmojiEvent_ = SCHALE.Common.FlatData.EmojiEvent.EnterConver; this.OrderOfPriority = 0; this.EmojiDuration = false; this.EmojiReversal = false; @@ -124,7 +124,7 @@ static public class CombatEmojiExcelVerify { return verifier.VerifyTableStart(tablePos) && verifier.VerifyField(tablePos, 4 /*UniqueId*/, 8 /*long*/, 8, false) - && verifier.VerifyField(tablePos, 6 /*EmojiEvent*/, 4 /*SCHALE.Common.FlatData.EmojiEvent*/, 4, false) + && verifier.VerifyField(tablePos, 6 /*EmojiEvent_*/, 4 /*SCHALE.Common.FlatData.EmojiEvent*/, 4, false) && verifier.VerifyField(tablePos, 8 /*OrderOfPriority*/, 4 /*int*/, 4, false) && verifier.VerifyField(tablePos, 10 /*EmojiDuration*/, 1 /*bool*/, 1, false) && verifier.VerifyField(tablePos, 12 /*EmojiReversal*/, 1 /*bool*/, 1, false) diff --git a/SCHALE.Common/FlatData/ConquestEventExcel.cs b/SCHALE.Common/FlatData/ConquestEventExcel.cs index 950fb0b..f869fa2 100644 --- a/SCHALE.Common/FlatData/ConquestEventExcel.cs +++ b/SCHALE.Common/FlatData/ConquestEventExcel.cs @@ -22,7 +22,7 @@ public struct ConquestEventExcel : IFlatbufferObject public long EventContentId { get { int o = __p.__offset(4); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public long MainStoryEventContentId { get { int o = __p.__offset(6); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } - public SCHALE.Common.FlatData.ConquestEventType ConquestEventType { get { int o = __p.__offset(8); return o != 0 ? (SCHALE.Common.FlatData.ConquestEventType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.ConquestEventType.None; } } + public SCHALE.Common.FlatData.ConquestEventType ConquestEventType_ { get { int o = __p.__offset(8); return o != 0 ? (SCHALE.Common.FlatData.ConquestEventType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.ConquestEventType.None; } } public bool UseErosion { get { int o = __p.__offset(10); return o != 0 ? 0!=__p.bb.Get(o + __p.bb_pos) : (bool)false; } } public bool UseUnexpectedEvent { get { int o = __p.__offset(12); return o != 0 ? 0!=__p.bb.Get(o + __p.bb_pos) : (bool)false; } } public bool UseCalculate { get { int o = __p.__offset(14); return o != 0 ? 0!=__p.bb.Get(o + __p.bb_pos) : (bool)false; } } @@ -116,7 +116,7 @@ public struct ConquestEventExcel : IFlatbufferObject public static Offset CreateConquestEventExcel(FlatBufferBuilder builder, long EventContentId = 0, long MainStoryEventContentId = 0, - SCHALE.Common.FlatData.ConquestEventType ConquestEventType = SCHALE.Common.FlatData.ConquestEventType.None, + SCHALE.Common.FlatData.ConquestEventType ConquestEventType_ = SCHALE.Common.FlatData.ConquestEventType.None, bool UseErosion = false, bool UseUnexpectedEvent = false, bool UseCalculate = false, @@ -162,7 +162,7 @@ public struct ConquestEventExcel : IFlatbufferObject ConquestEventExcel.AddEvnetScenarioBG(builder, EvnetScenarioBGOffset); ConquestEventExcel.AddEvnetMapNameLocalize(builder, EvnetMapNameLocalizeOffset); ConquestEventExcel.AddEvnetMapGoalLocalize(builder, EvnetMapGoalLocalizeOffset); - ConquestEventExcel.AddConquestEventType(builder, ConquestEventType); + ConquestEventExcel.AddConquestEventType_(builder, ConquestEventType_); ConquestEventExcel.AddUseConquestObject(builder, UseConquestObject); ConquestEventExcel.AddUseCalculate(builder, UseCalculate); ConquestEventExcel.AddUseUnexpectedEvent(builder, UseUnexpectedEvent); @@ -173,7 +173,7 @@ public struct ConquestEventExcel : IFlatbufferObject public static void StartConquestEventExcel(FlatBufferBuilder builder) { builder.StartTable(26); } public static void AddEventContentId(FlatBufferBuilder builder, long eventContentId) { builder.AddLong(0, eventContentId, 0); } public static void AddMainStoryEventContentId(FlatBufferBuilder builder, long mainStoryEventContentId) { builder.AddLong(1, mainStoryEventContentId, 0); } - public static void AddConquestEventType(FlatBufferBuilder builder, SCHALE.Common.FlatData.ConquestEventType conquestEventType) { builder.AddInt(2, (int)conquestEventType, 0); } + public static void AddConquestEventType_(FlatBufferBuilder builder, SCHALE.Common.FlatData.ConquestEventType conquestEventType_) { builder.AddInt(2, (int)conquestEventType_, 0); } public static void AddUseErosion(FlatBufferBuilder builder, bool useErosion) { builder.AddBool(3, useErosion, false); } public static void AddUseUnexpectedEvent(FlatBufferBuilder builder, bool useUnexpectedEvent) { builder.AddBool(4, useUnexpectedEvent, false); } public static void AddUseCalculate(FlatBufferBuilder builder, bool useCalculate) { builder.AddBool(5, useCalculate, false); } @@ -210,7 +210,7 @@ public struct ConquestEventExcel : IFlatbufferObject byte[] key = TableEncryptionService.CreateKey("ConquestEvent"); _o.EventContentId = TableEncryptionService.Convert(this.EventContentId, key); _o.MainStoryEventContentId = TableEncryptionService.Convert(this.MainStoryEventContentId, key); - _o.ConquestEventType = TableEncryptionService.Convert(this.ConquestEventType, key); + _o.ConquestEventType_ = TableEncryptionService.Convert(this.ConquestEventType_, key); _o.UseErosion = TableEncryptionService.Convert(this.UseErosion, key); _o.UseUnexpectedEvent = TableEncryptionService.Convert(this.UseUnexpectedEvent, key); _o.UseCalculate = TableEncryptionService.Convert(this.UseCalculate, key); @@ -252,7 +252,7 @@ public struct ConquestEventExcel : IFlatbufferObject builder, _o.EventContentId, _o.MainStoryEventContentId, - _o.ConquestEventType, + _o.ConquestEventType_, _o.UseErosion, _o.UseUnexpectedEvent, _o.UseCalculate, @@ -283,7 +283,7 @@ public class ConquestEventExcelT { public long EventContentId { get; set; } public long MainStoryEventContentId { get; set; } - public SCHALE.Common.FlatData.ConquestEventType ConquestEventType { get; set; } + public SCHALE.Common.FlatData.ConquestEventType ConquestEventType_ { get; set; } public bool UseErosion { get; set; } public bool UseUnexpectedEvent { get; set; } public bool UseCalculate { get; set; } @@ -311,7 +311,7 @@ public class ConquestEventExcelT public ConquestEventExcelT() { this.EventContentId = 0; this.MainStoryEventContentId = 0; - this.ConquestEventType = SCHALE.Common.FlatData.ConquestEventType.None; + this.ConquestEventType_ = SCHALE.Common.FlatData.ConquestEventType.None; this.UseErosion = false; this.UseUnexpectedEvent = false; this.UseCalculate = false; @@ -346,7 +346,7 @@ static public class ConquestEventExcelVerify return verifier.VerifyTableStart(tablePos) && verifier.VerifyField(tablePos, 4 /*EventContentId*/, 8 /*long*/, 8, false) && verifier.VerifyField(tablePos, 6 /*MainStoryEventContentId*/, 8 /*long*/, 8, false) - && verifier.VerifyField(tablePos, 8 /*ConquestEventType*/, 4 /*SCHALE.Common.FlatData.ConquestEventType*/, 4, false) + && verifier.VerifyField(tablePos, 8 /*ConquestEventType_*/, 4 /*SCHALE.Common.FlatData.ConquestEventType*/, 4, false) && verifier.VerifyField(tablePos, 10 /*UseErosion*/, 1 /*bool*/, 1, false) && verifier.VerifyField(tablePos, 12 /*UseUnexpectedEvent*/, 1 /*bool*/, 1, false) && verifier.VerifyField(tablePos, 14 /*UseCalculate*/, 1 /*bool*/, 1, false) diff --git a/SCHALE.Common/FlatData/ConquestObjectExcel.cs b/SCHALE.Common/FlatData/ConquestObjectExcel.cs index cfd53a0..33587c6 100644 --- a/SCHALE.Common/FlatData/ConquestObjectExcel.cs +++ b/SCHALE.Common/FlatData/ConquestObjectExcel.cs @@ -22,7 +22,7 @@ public struct ConquestObjectExcel : IFlatbufferObject public long Id { get { int o = __p.__offset(4); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public long EventContentId { get { int o = __p.__offset(6); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } - public SCHALE.Common.FlatData.ConquestObjectType ConquestObjectType { get { int o = __p.__offset(8); return o != 0 ? (SCHALE.Common.FlatData.ConquestObjectType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.ConquestObjectType.None; } } + public SCHALE.Common.FlatData.ConquestObjectType ConquestObjectType_ { get { int o = __p.__offset(8); return o != 0 ? (SCHALE.Common.FlatData.ConquestObjectType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.ConquestObjectType.None; } } public uint Key { get { int o = __p.__offset(10); return o != 0 ? __p.bb.GetUint(o + __p.bb_pos) : (uint)0; } } public string Name { get { int o = __p.__offset(12); return o != 0 ? __p.__string(o + __p.bb_pos) : null; } } #if ENABLE_SPAN_T @@ -48,7 +48,7 @@ public struct ConquestObjectExcel : IFlatbufferObject public static Offset CreateConquestObjectExcel(FlatBufferBuilder builder, long Id = 0, long EventContentId = 0, - SCHALE.Common.FlatData.ConquestObjectType ConquestObjectType = SCHALE.Common.FlatData.ConquestObjectType.None, + SCHALE.Common.FlatData.ConquestObjectType ConquestObjectType_ = SCHALE.Common.FlatData.ConquestObjectType.None, uint Key = 0, StringOffset NameOffset = default(StringOffset), StringOffset PrefabNameOffset = default(StringOffset), @@ -69,7 +69,7 @@ public struct ConquestObjectExcel : IFlatbufferObject ConquestObjectExcel.AddPrefabName(builder, PrefabNameOffset); ConquestObjectExcel.AddName(builder, NameOffset); ConquestObjectExcel.AddKey(builder, Key); - ConquestObjectExcel.AddConquestObjectType(builder, ConquestObjectType); + ConquestObjectExcel.AddConquestObjectType_(builder, ConquestObjectType_); ConquestObjectExcel.AddDisposable(builder, Disposable); return ConquestObjectExcel.EndConquestObjectExcel(builder); } @@ -77,7 +77,7 @@ public struct ConquestObjectExcel : IFlatbufferObject public static void StartConquestObjectExcel(FlatBufferBuilder builder) { builder.StartTable(12); } public static void AddId(FlatBufferBuilder builder, long id) { builder.AddLong(0, id, 0); } public static void AddEventContentId(FlatBufferBuilder builder, long eventContentId) { builder.AddLong(1, eventContentId, 0); } - public static void AddConquestObjectType(FlatBufferBuilder builder, SCHALE.Common.FlatData.ConquestObjectType conquestObjectType) { builder.AddInt(2, (int)conquestObjectType, 0); } + public static void AddConquestObjectType_(FlatBufferBuilder builder, SCHALE.Common.FlatData.ConquestObjectType conquestObjectType_) { builder.AddInt(2, (int)conquestObjectType_, 0); } public static void AddKey(FlatBufferBuilder builder, uint key) { builder.AddUint(3, key, 0); } public static void AddName(FlatBufferBuilder builder, StringOffset nameOffset) { builder.AddOffset(4, nameOffset.Value, 0); } public static void AddPrefabName(FlatBufferBuilder builder, StringOffset prefabNameOffset) { builder.AddOffset(5, prefabNameOffset.Value, 0); } @@ -100,7 +100,7 @@ public struct ConquestObjectExcel : IFlatbufferObject byte[] key = TableEncryptionService.CreateKey("ConquestObject"); _o.Id = TableEncryptionService.Convert(this.Id, key); _o.EventContentId = TableEncryptionService.Convert(this.EventContentId, key); - _o.ConquestObjectType = TableEncryptionService.Convert(this.ConquestObjectType, key); + _o.ConquestObjectType_ = TableEncryptionService.Convert(this.ConquestObjectType_, key); _o.Key = TableEncryptionService.Convert(this.Key, key); _o.Name = TableEncryptionService.Convert(this.Name, key); _o.PrefabName = TableEncryptionService.Convert(this.PrefabName, key); @@ -119,7 +119,7 @@ public struct ConquestObjectExcel : IFlatbufferObject builder, _o.Id, _o.EventContentId, - _o.ConquestObjectType, + _o.ConquestObjectType_, _o.Key, _Name, _PrefabName, @@ -136,7 +136,7 @@ public class ConquestObjectExcelT { public long Id { get; set; } public long EventContentId { get; set; } - public SCHALE.Common.FlatData.ConquestObjectType ConquestObjectType { get; set; } + public SCHALE.Common.FlatData.ConquestObjectType ConquestObjectType_ { get; set; } public uint Key { get; set; } public string Name { get; set; } public string PrefabName { get; set; } @@ -150,7 +150,7 @@ public class ConquestObjectExcelT public ConquestObjectExcelT() { this.Id = 0; this.EventContentId = 0; - this.ConquestObjectType = SCHALE.Common.FlatData.ConquestObjectType.None; + this.ConquestObjectType_ = SCHALE.Common.FlatData.ConquestObjectType.None; this.Key = 0; this.Name = null; this.PrefabName = null; @@ -171,7 +171,7 @@ static public class ConquestObjectExcelVerify return verifier.VerifyTableStart(tablePos) && verifier.VerifyField(tablePos, 4 /*Id*/, 8 /*long*/, 8, false) && verifier.VerifyField(tablePos, 6 /*EventContentId*/, 8 /*long*/, 8, false) - && verifier.VerifyField(tablePos, 8 /*ConquestObjectType*/, 4 /*SCHALE.Common.FlatData.ConquestObjectType*/, 4, false) + && verifier.VerifyField(tablePos, 8 /*ConquestObjectType_*/, 4 /*SCHALE.Common.FlatData.ConquestObjectType*/, 4, false) && verifier.VerifyField(tablePos, 10 /*Key*/, 4 /*uint*/, 4, false) && verifier.VerifyString(tablePos, 12 /*Name*/, false) && verifier.VerifyString(tablePos, 14 /*PrefabName*/, false) diff --git a/SCHALE.Common/FlatData/ConquestRewardExcel.cs b/SCHALE.Common/FlatData/ConquestRewardExcel.cs index 9604d87..8eafd5e 100644 --- a/SCHALE.Common/FlatData/ConquestRewardExcel.cs +++ b/SCHALE.Common/FlatData/ConquestRewardExcel.cs @@ -21,7 +21,7 @@ public struct ConquestRewardExcel : IFlatbufferObject public ConquestRewardExcel __assign(int _i, ByteBuffer _bb) { __init(_i, _bb); return this; } public long GroupId { get { int o = __p.__offset(4); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } - public SCHALE.Common.FlatData.RewardTag RewardTag { get { int o = __p.__offset(6); return o != 0 ? (SCHALE.Common.FlatData.RewardTag)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.RewardTag.Default; } } + public SCHALE.Common.FlatData.RewardTag RewardTag_ { get { int o = __p.__offset(6); return o != 0 ? (SCHALE.Common.FlatData.RewardTag)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.RewardTag.Default; } } public int RewardProb { get { int o = __p.__offset(8); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } public SCHALE.Common.FlatData.ParcelType RewardParcelType { get { int o = __p.__offset(10); return o != 0 ? (SCHALE.Common.FlatData.ParcelType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.ParcelType.None; } } public long RewardId { get { int o = __p.__offset(12); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } @@ -30,7 +30,7 @@ public struct ConquestRewardExcel : IFlatbufferObject public static Offset CreateConquestRewardExcel(FlatBufferBuilder builder, long GroupId = 0, - SCHALE.Common.FlatData.RewardTag RewardTag = SCHALE.Common.FlatData.RewardTag.Default, + SCHALE.Common.FlatData.RewardTag RewardTag_ = SCHALE.Common.FlatData.RewardTag.Default, int RewardProb = 0, SCHALE.Common.FlatData.ParcelType RewardParcelType = SCHALE.Common.FlatData.ParcelType.None, long RewardId = 0, @@ -42,14 +42,14 @@ public struct ConquestRewardExcel : IFlatbufferObject ConquestRewardExcel.AddRewardAmount(builder, RewardAmount); ConquestRewardExcel.AddRewardParcelType(builder, RewardParcelType); ConquestRewardExcel.AddRewardProb(builder, RewardProb); - ConquestRewardExcel.AddRewardTag(builder, RewardTag); + ConquestRewardExcel.AddRewardTag_(builder, RewardTag_); ConquestRewardExcel.AddIsDisplayed(builder, IsDisplayed); return ConquestRewardExcel.EndConquestRewardExcel(builder); } public static void StartConquestRewardExcel(FlatBufferBuilder builder) { builder.StartTable(7); } public static void AddGroupId(FlatBufferBuilder builder, long groupId) { builder.AddLong(0, groupId, 0); } - public static void AddRewardTag(FlatBufferBuilder builder, SCHALE.Common.FlatData.RewardTag rewardTag) { builder.AddInt(1, (int)rewardTag, 0); } + public static void AddRewardTag_(FlatBufferBuilder builder, SCHALE.Common.FlatData.RewardTag rewardTag_) { builder.AddInt(1, (int)rewardTag_, 0); } public static void AddRewardProb(FlatBufferBuilder builder, int rewardProb) { builder.AddInt(2, rewardProb, 0); } public static void AddRewardParcelType(FlatBufferBuilder builder, SCHALE.Common.FlatData.ParcelType rewardParcelType) { builder.AddInt(3, (int)rewardParcelType, 0); } public static void AddRewardId(FlatBufferBuilder builder, long rewardId) { builder.AddLong(4, rewardId, 0); } @@ -67,7 +67,7 @@ public struct ConquestRewardExcel : IFlatbufferObject public void UnPackTo(ConquestRewardExcelT _o) { byte[] key = TableEncryptionService.CreateKey("ConquestReward"); _o.GroupId = TableEncryptionService.Convert(this.GroupId, key); - _o.RewardTag = TableEncryptionService.Convert(this.RewardTag, key); + _o.RewardTag_ = TableEncryptionService.Convert(this.RewardTag_, key); _o.RewardProb = TableEncryptionService.Convert(this.RewardProb, key); _o.RewardParcelType = TableEncryptionService.Convert(this.RewardParcelType, key); _o.RewardId = TableEncryptionService.Convert(this.RewardId, key); @@ -79,7 +79,7 @@ public struct ConquestRewardExcel : IFlatbufferObject return CreateConquestRewardExcel( builder, _o.GroupId, - _o.RewardTag, + _o.RewardTag_, _o.RewardProb, _o.RewardParcelType, _o.RewardId, @@ -91,7 +91,7 @@ public struct ConquestRewardExcel : IFlatbufferObject public class ConquestRewardExcelT { public long GroupId { get; set; } - public SCHALE.Common.FlatData.RewardTag RewardTag { get; set; } + public SCHALE.Common.FlatData.RewardTag RewardTag_ { get; set; } public int RewardProb { get; set; } public SCHALE.Common.FlatData.ParcelType RewardParcelType { get; set; } public long RewardId { get; set; } @@ -100,7 +100,7 @@ public class ConquestRewardExcelT public ConquestRewardExcelT() { this.GroupId = 0; - this.RewardTag = SCHALE.Common.FlatData.RewardTag.Default; + this.RewardTag_ = SCHALE.Common.FlatData.RewardTag.Default; this.RewardProb = 0; this.RewardParcelType = SCHALE.Common.FlatData.ParcelType.None; this.RewardId = 0; @@ -116,7 +116,7 @@ static public class ConquestRewardExcelVerify { return verifier.VerifyTableStart(tablePos) && verifier.VerifyField(tablePos, 4 /*GroupId*/, 8 /*long*/, 8, false) - && verifier.VerifyField(tablePos, 6 /*RewardTag*/, 4 /*SCHALE.Common.FlatData.RewardTag*/, 4, false) + && verifier.VerifyField(tablePos, 6 /*RewardTag_*/, 4 /*SCHALE.Common.FlatData.RewardTag*/, 4, false) && verifier.VerifyField(tablePos, 8 /*RewardProb*/, 4 /*int*/, 4, false) && verifier.VerifyField(tablePos, 10 /*RewardParcelType*/, 4 /*SCHALE.Common.FlatData.ParcelType*/, 4, false) && verifier.VerifyField(tablePos, 12 /*RewardId*/, 8 /*long*/, 8, false) diff --git a/SCHALE.Common/FlatData/ConquestUnitExcel.cs b/SCHALE.Common/FlatData/ConquestUnitExcel.cs index e25424a..46b5637 100644 --- a/SCHALE.Common/FlatData/ConquestUnitExcel.cs +++ b/SCHALE.Common/FlatData/ConquestUnitExcel.cs @@ -91,11 +91,11 @@ public struct ConquestUnitExcel : IFlatbufferObject public long EnterScenarioGroupId { get { int o = __p.__offset(52); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public long ClearScenarioGroupId { get { int o = __p.__offset(54); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public long ConquestRewardId { get { int o = __p.__offset(56); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } - public SCHALE.Common.FlatData.StageTopography StageTopography { get { int o = __p.__offset(58); return o != 0 ? (SCHALE.Common.FlatData.StageTopography)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.StageTopography.Street; } } + public SCHALE.Common.FlatData.StageTopography StageTopography_ { get { int o = __p.__offset(58); return o != 0 ? (SCHALE.Common.FlatData.StageTopography)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.StageTopography.Street; } } public int RecommandLevel { get { int o = __p.__offset(60); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } public long TacticRewardExp { get { int o = __p.__offset(62); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public long FixedEchelonId { get { int o = __p.__offset(64); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } - public SCHALE.Common.FlatData.EchelonExtensionType EchelonExtensionType { get { int o = __p.__offset(66); return o != 0 ? (SCHALE.Common.FlatData.EchelonExtensionType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.EchelonExtensionType.Base; } } + public SCHALE.Common.FlatData.EchelonExtensionType EchelonExtensionType_ { get { int o = __p.__offset(66); return o != 0 ? (SCHALE.Common.FlatData.EchelonExtensionType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.EchelonExtensionType.Base; } } public static Offset CreateConquestUnitExcel(FlatBufferBuilder builder, long Id = 0, @@ -125,11 +125,11 @@ public struct ConquestUnitExcel : IFlatbufferObject long EnterScenarioGroupId = 0, long ClearScenarioGroupId = 0, long ConquestRewardId = 0, - SCHALE.Common.FlatData.StageTopography StageTopography = SCHALE.Common.FlatData.StageTopography.Street, + SCHALE.Common.FlatData.StageTopography StageTopography_ = SCHALE.Common.FlatData.StageTopography.Street, int RecommandLevel = 0, long TacticRewardExp = 0, long FixedEchelonId = 0, - SCHALE.Common.FlatData.EchelonExtensionType EchelonExtensionType = SCHALE.Common.FlatData.EchelonExtensionType.Base) { + SCHALE.Common.FlatData.EchelonExtensionType EchelonExtensionType_ = SCHALE.Common.FlatData.EchelonExtensionType.Base) { builder.StartTable(32); ConquestUnitExcel.AddFixedEchelonId(builder, FixedEchelonId); ConquestUnitExcel.AddTacticRewardExp(builder, TacticRewardExp); @@ -144,9 +144,9 @@ public struct ConquestUnitExcel : IFlatbufferObject ConquestUnitExcel.AddPrevUnitGroup(builder, PrevUnitGroup); ConquestUnitExcel.AddUnitGroup(builder, UnitGroup); ConquestUnitExcel.AddId(builder, Id); - ConquestUnitExcel.AddEchelonExtensionType(builder, EchelonExtensionType); + ConquestUnitExcel.AddEchelonExtensionType_(builder, EchelonExtensionType_); ConquestUnitExcel.AddRecommandLevel(builder, RecommandLevel); - ConquestUnitExcel.AddStageTopography(builder, StageTopography); + ConquestUnitExcel.AddStageTopography_(builder, StageTopography_); ConquestUnitExcel.AddManageEchelonStageEnterCostAmount(builder, ManageEchelonStageEnterCostAmount); ConquestUnitExcel.AddManageEchelonStageEnterCostType(builder, ManageEchelonStageEnterCostType); ConquestUnitExcel.AddStageEnterCostAmount(builder, StageEnterCostAmount); @@ -204,11 +204,11 @@ public struct ConquestUnitExcel : IFlatbufferObject public static void AddEnterScenarioGroupId(FlatBufferBuilder builder, long enterScenarioGroupId) { builder.AddLong(24, enterScenarioGroupId, 0); } public static void AddClearScenarioGroupId(FlatBufferBuilder builder, long clearScenarioGroupId) { builder.AddLong(25, clearScenarioGroupId, 0); } public static void AddConquestRewardId(FlatBufferBuilder builder, long conquestRewardId) { builder.AddLong(26, conquestRewardId, 0); } - public static void AddStageTopography(FlatBufferBuilder builder, SCHALE.Common.FlatData.StageTopography stageTopography) { builder.AddInt(27, (int)stageTopography, 0); } + public static void AddStageTopography_(FlatBufferBuilder builder, SCHALE.Common.FlatData.StageTopography stageTopography_) { builder.AddInt(27, (int)stageTopography_, 0); } public static void AddRecommandLevel(FlatBufferBuilder builder, int recommandLevel) { builder.AddInt(28, recommandLevel, 0); } public static void AddTacticRewardExp(FlatBufferBuilder builder, long tacticRewardExp) { builder.AddLong(29, tacticRewardExp, 0); } public static void AddFixedEchelonId(FlatBufferBuilder builder, long fixedEchelonId) { builder.AddLong(30, fixedEchelonId, 0); } - public static void AddEchelonExtensionType(FlatBufferBuilder builder, SCHALE.Common.FlatData.EchelonExtensionType echelonExtensionType) { builder.AddInt(31, (int)echelonExtensionType, 0); } + public static void AddEchelonExtensionType_(FlatBufferBuilder builder, SCHALE.Common.FlatData.EchelonExtensionType echelonExtensionType_) { builder.AddInt(31, (int)echelonExtensionType_, 0); } public static Offset EndConquestUnitExcel(FlatBufferBuilder builder) { int o = builder.EndTable(); return new Offset(o); @@ -249,11 +249,11 @@ public struct ConquestUnitExcel : IFlatbufferObject _o.EnterScenarioGroupId = TableEncryptionService.Convert(this.EnterScenarioGroupId, key); _o.ClearScenarioGroupId = TableEncryptionService.Convert(this.ClearScenarioGroupId, key); _o.ConquestRewardId = TableEncryptionService.Convert(this.ConquestRewardId, key); - _o.StageTopography = TableEncryptionService.Convert(this.StageTopography, key); + _o.StageTopography_ = TableEncryptionService.Convert(this.StageTopography_, key); _o.RecommandLevel = TableEncryptionService.Convert(this.RecommandLevel, key); _o.TacticRewardExp = TableEncryptionService.Convert(this.TacticRewardExp, key); _o.FixedEchelonId = TableEncryptionService.Convert(this.FixedEchelonId, key); - _o.EchelonExtensionType = TableEncryptionService.Convert(this.EchelonExtensionType, key); + _o.EchelonExtensionType_ = TableEncryptionService.Convert(this.EchelonExtensionType_, key); } public static Offset Pack(FlatBufferBuilder builder, ConquestUnitExcelT _o) { if (_o == null) return default(Offset); @@ -301,11 +301,11 @@ public struct ConquestUnitExcel : IFlatbufferObject _o.EnterScenarioGroupId, _o.ClearScenarioGroupId, _o.ConquestRewardId, - _o.StageTopography, + _o.StageTopography_, _o.RecommandLevel, _o.TacticRewardExp, _o.FixedEchelonId, - _o.EchelonExtensionType); + _o.EchelonExtensionType_); } } @@ -338,11 +338,11 @@ public class ConquestUnitExcelT public long EnterScenarioGroupId { get; set; } public long ClearScenarioGroupId { get; set; } public long ConquestRewardId { get; set; } - public SCHALE.Common.FlatData.StageTopography StageTopography { get; set; } + public SCHALE.Common.FlatData.StageTopography StageTopography_ { get; set; } public int RecommandLevel { get; set; } public long TacticRewardExp { get; set; } public long FixedEchelonId { get; set; } - public SCHALE.Common.FlatData.EchelonExtensionType EchelonExtensionType { get; set; } + public SCHALE.Common.FlatData.EchelonExtensionType EchelonExtensionType_ { get; set; } public ConquestUnitExcelT() { this.Id = 0; @@ -372,11 +372,11 @@ public class ConquestUnitExcelT this.EnterScenarioGroupId = 0; this.ClearScenarioGroupId = 0; this.ConquestRewardId = 0; - this.StageTopography = SCHALE.Common.FlatData.StageTopography.Street; + this.StageTopography_ = SCHALE.Common.FlatData.StageTopography.Street; this.RecommandLevel = 0; this.TacticRewardExp = 0; this.FixedEchelonId = 0; - this.EchelonExtensionType = SCHALE.Common.FlatData.EchelonExtensionType.Base; + this.EchelonExtensionType_ = SCHALE.Common.FlatData.EchelonExtensionType.Base; } } @@ -413,11 +413,11 @@ static public class ConquestUnitExcelVerify && verifier.VerifyField(tablePos, 52 /*EnterScenarioGroupId*/, 8 /*long*/, 8, false) && verifier.VerifyField(tablePos, 54 /*ClearScenarioGroupId*/, 8 /*long*/, 8, false) && verifier.VerifyField(tablePos, 56 /*ConquestRewardId*/, 8 /*long*/, 8, false) - && verifier.VerifyField(tablePos, 58 /*StageTopography*/, 4 /*SCHALE.Common.FlatData.StageTopography*/, 4, false) + && verifier.VerifyField(tablePos, 58 /*StageTopography_*/, 4 /*SCHALE.Common.FlatData.StageTopography*/, 4, false) && verifier.VerifyField(tablePos, 60 /*RecommandLevel*/, 4 /*int*/, 4, false) && verifier.VerifyField(tablePos, 62 /*TacticRewardExp*/, 8 /*long*/, 8, false) && verifier.VerifyField(tablePos, 64 /*FixedEchelonId*/, 8 /*long*/, 8, false) - && verifier.VerifyField(tablePos, 66 /*EchelonExtensionType*/, 4 /*SCHALE.Common.FlatData.EchelonExtensionType*/, 4, false) + && verifier.VerifyField(tablePos, 66 /*EchelonExtensionType_*/, 4 /*SCHALE.Common.FlatData.EchelonExtensionType*/, 4, false) && verifier.VerifyTableEnd(tablePos); } } diff --git a/SCHALE.Common/FlatData/ConstCommonExcel.cs b/SCHALE.Common/FlatData/ConstCommonExcel.cs index 19f6d0a..54a377d 100644 --- a/SCHALE.Common/FlatData/ConstCommonExcel.cs +++ b/SCHALE.Common/FlatData/ConstCommonExcel.cs @@ -228,8 +228,11 @@ public struct ConstCommonExcel : IFlatbufferObject public int PotentialBonusStatMaxLevelAttackPower { get { int o = __p.__offset(308); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } public int PotentialBonusStatMaxLevelHealPower { get { int o = __p.__offset(310); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } public int PotentialOpenConditionCharacterLevel { get { int o = __p.__offset(312); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } + public int AssistStrangerMinLevel { get { int o = __p.__offset(314); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } + public int AssistStrangerMaxLevel { get { int o = __p.__offset(316); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } + public int MaxBlockedUserCount { get { int o = __p.__offset(318); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } - public static void StartConstCommonExcel(FlatBufferBuilder builder) { builder.StartTable(155); } + public static void StartConstCommonExcel(FlatBufferBuilder builder) { builder.StartTable(158); } public static void AddCampaignMainStageMaxRank(FlatBufferBuilder builder, int campaignMainStageMaxRank) { builder.AddInt(0, campaignMainStageMaxRank, 0); } public static void AddCampaignMainStageBestRecord(FlatBufferBuilder builder, int campaignMainStageBestRecord) { builder.AddInt(1, campaignMainStageBestRecord, 0); } public static void AddHardAdventurePlayCountRecoverDailyNumber(FlatBufferBuilder builder, int hardAdventurePlayCountRecoverDailyNumber) { builder.AddInt(2, hardAdventurePlayCountRecoverDailyNumber, 0); } @@ -410,6 +413,9 @@ public struct ConstCommonExcel : IFlatbufferObject public static void AddPotentialBonusStatMaxLevelAttackPower(FlatBufferBuilder builder, int potentialBonusStatMaxLevelAttackPower) { builder.AddInt(152, potentialBonusStatMaxLevelAttackPower, 0); } public static void AddPotentialBonusStatMaxLevelHealPower(FlatBufferBuilder builder, int potentialBonusStatMaxLevelHealPower) { builder.AddInt(153, potentialBonusStatMaxLevelHealPower, 0); } public static void AddPotentialOpenConditionCharacterLevel(FlatBufferBuilder builder, int potentialOpenConditionCharacterLevel) { builder.AddInt(154, potentialOpenConditionCharacterLevel, 0); } + public static void AddAssistStrangerMinLevel(FlatBufferBuilder builder, int assistStrangerMinLevel) { builder.AddInt(155, assistStrangerMinLevel, 0); } + public static void AddAssistStrangerMaxLevel(FlatBufferBuilder builder, int assistStrangerMaxLevel) { builder.AddInt(156, assistStrangerMaxLevel, 0); } + public static void AddMaxBlockedUserCount(FlatBufferBuilder builder, int maxBlockedUserCount) { builder.AddInt(157, maxBlockedUserCount, 0); } public static Offset EndConstCommonExcel(FlatBufferBuilder builder) { int o = builder.EndTable(); return new Offset(o); @@ -581,6 +587,9 @@ public struct ConstCommonExcel : IFlatbufferObject _o.PotentialBonusStatMaxLevelAttackPower = TableEncryptionService.Convert(this.PotentialBonusStatMaxLevelAttackPower, key); _o.PotentialBonusStatMaxLevelHealPower = TableEncryptionService.Convert(this.PotentialBonusStatMaxLevelHealPower, key); _o.PotentialOpenConditionCharacterLevel = TableEncryptionService.Convert(this.PotentialOpenConditionCharacterLevel, key); + _o.AssistStrangerMinLevel = TableEncryptionService.Convert(this.AssistStrangerMinLevel, key); + _o.AssistStrangerMaxLevel = TableEncryptionService.Convert(this.AssistStrangerMaxLevel, key); + _o.MaxBlockedUserCount = TableEncryptionService.Convert(this.MaxBlockedUserCount, key); } public static Offset Pack(FlatBufferBuilder builder, ConstCommonExcelT _o) { if (_o == null) return default(Offset); @@ -768,6 +777,9 @@ public struct ConstCommonExcel : IFlatbufferObject AddPotentialBonusStatMaxLevelAttackPower(builder, _o.PotentialBonusStatMaxLevelAttackPower); AddPotentialBonusStatMaxLevelHealPower(builder, _o.PotentialBonusStatMaxLevelHealPower); AddPotentialOpenConditionCharacterLevel(builder, _o.PotentialOpenConditionCharacterLevel); + AddAssistStrangerMinLevel(builder, _o.AssistStrangerMinLevel); + AddAssistStrangerMaxLevel(builder, _o.AssistStrangerMaxLevel); + AddMaxBlockedUserCount(builder, _o.MaxBlockedUserCount); return EndConstCommonExcel(builder); } } @@ -929,6 +941,9 @@ public class ConstCommonExcelT public int PotentialBonusStatMaxLevelAttackPower { get; set; } public int PotentialBonusStatMaxLevelHealPower { get; set; } public int PotentialOpenConditionCharacterLevel { get; set; } + public int AssistStrangerMinLevel { get; set; } + public int AssistStrangerMaxLevel { get; set; } + public int MaxBlockedUserCount { get; set; } public ConstCommonExcelT() { this.CampaignMainStageMaxRank = 0; @@ -1086,6 +1101,9 @@ public class ConstCommonExcelT this.PotentialBonusStatMaxLevelAttackPower = 0; this.PotentialBonusStatMaxLevelHealPower = 0; this.PotentialOpenConditionCharacterLevel = 0; + this.AssistStrangerMinLevel = 0; + this.AssistStrangerMaxLevel = 0; + this.MaxBlockedUserCount = 0; } } @@ -1250,6 +1268,9 @@ static public class ConstCommonExcelVerify && verifier.VerifyField(tablePos, 308 /*PotentialBonusStatMaxLevelAttackPower*/, 4 /*int*/, 4, false) && verifier.VerifyField(tablePos, 310 /*PotentialBonusStatMaxLevelHealPower*/, 4 /*int*/, 4, false) && verifier.VerifyField(tablePos, 312 /*PotentialOpenConditionCharacterLevel*/, 4 /*int*/, 4, false) + && verifier.VerifyField(tablePos, 314 /*AssistStrangerMinLevel*/, 4 /*int*/, 4, false) + && verifier.VerifyField(tablePos, 316 /*AssistStrangerMaxLevel*/, 4 /*int*/, 4, false) + && verifier.VerifyField(tablePos, 318 /*MaxBlockedUserCount*/, 4 /*int*/, 4, false) && verifier.VerifyTableEnd(tablePos); } } diff --git a/SCHALE.Common/FlatData/ConstMiniGameShootingExcel.cs b/SCHALE.Common/FlatData/ConstMiniGameShootingExcel.cs index 166f6cd..7565cc7 100644 --- a/SCHALE.Common/FlatData/ConstMiniGameShootingExcel.cs +++ b/SCHALE.Common/FlatData/ConstMiniGameShootingExcel.cs @@ -44,6 +44,7 @@ public struct ConstMiniGameShootingExcel : IFlatbufferObject #endif public byte[] GetSpawnEffectPathArray() { return __p.__vector_as_array(22); } public float WaitTimeAfterSpawn { get { int o = __p.__offset(24); return o != 0 ? __p.bb.GetFloat(o + __p.bb_pos) : (float)0.0f; } } + public int FreeGearInterval { get { int o = __p.__offset(26); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } public static Offset CreateConstMiniGameShootingExcel(FlatBufferBuilder builder, long NormalStageId = 0, @@ -56,12 +57,14 @@ public struct ConstMiniGameShootingExcel : IFlatbufferObject long HiddenPlayerCharacterId = 0, float CameraSmoothTime = 0.0f, StringOffset SpawnEffectPathOffset = default(StringOffset), - float WaitTimeAfterSpawn = 0.0f) { - builder.StartTable(11); + float WaitTimeAfterSpawn = 0.0f, + int FreeGearInterval = 0) { + builder.StartTable(12); ConstMiniGameShootingExcel.AddHiddenPlayerCharacterId(builder, HiddenPlayerCharacterId); ConstMiniGameShootingExcel.AddFreeStageId(builder, FreeStageId); ConstMiniGameShootingExcel.AddHardStageId(builder, HardStageId); ConstMiniGameShootingExcel.AddNormalStageId(builder, NormalStageId); + ConstMiniGameShootingExcel.AddFreeGearInterval(builder, FreeGearInterval); ConstMiniGameShootingExcel.AddWaitTimeAfterSpawn(builder, WaitTimeAfterSpawn); ConstMiniGameShootingExcel.AddSpawnEffectPath(builder, SpawnEffectPathOffset); ConstMiniGameShootingExcel.AddCameraSmoothTime(builder, CameraSmoothTime); @@ -72,7 +75,7 @@ public struct ConstMiniGameShootingExcel : IFlatbufferObject return ConstMiniGameShootingExcel.EndConstMiniGameShootingExcel(builder); } - public static void StartConstMiniGameShootingExcel(FlatBufferBuilder builder) { builder.StartTable(11); } + public static void StartConstMiniGameShootingExcel(FlatBufferBuilder builder) { builder.StartTable(12); } public static void AddNormalStageId(FlatBufferBuilder builder, long normalStageId) { builder.AddLong(0, normalStageId, 0); } public static void AddNormalSectionCount(FlatBufferBuilder builder, int normalSectionCount) { builder.AddInt(1, normalSectionCount, 0); } public static void AddHardStageId(FlatBufferBuilder builder, long hardStageId) { builder.AddLong(2, hardStageId, 0); } @@ -89,6 +92,7 @@ public struct ConstMiniGameShootingExcel : IFlatbufferObject public static void AddCameraSmoothTime(FlatBufferBuilder builder, float cameraSmoothTime) { builder.AddFloat(8, cameraSmoothTime, 0.0f); } public static void AddSpawnEffectPath(FlatBufferBuilder builder, StringOffset spawnEffectPathOffset) { builder.AddOffset(9, spawnEffectPathOffset.Value, 0); } public static void AddWaitTimeAfterSpawn(FlatBufferBuilder builder, float waitTimeAfterSpawn) { builder.AddFloat(10, waitTimeAfterSpawn, 0.0f); } + public static void AddFreeGearInterval(FlatBufferBuilder builder, int freeGearInterval) { builder.AddInt(11, freeGearInterval, 0); } public static Offset EndConstMiniGameShootingExcel(FlatBufferBuilder builder) { int o = builder.EndTable(); return new Offset(o); @@ -112,6 +116,7 @@ public struct ConstMiniGameShootingExcel : IFlatbufferObject _o.CameraSmoothTime = TableEncryptionService.Convert(this.CameraSmoothTime, key); _o.SpawnEffectPath = TableEncryptionService.Convert(this.SpawnEffectPath, key); _o.WaitTimeAfterSpawn = TableEncryptionService.Convert(this.WaitTimeAfterSpawn, key); + _o.FreeGearInterval = TableEncryptionService.Convert(this.FreeGearInterval, key); } public static Offset Pack(FlatBufferBuilder builder, ConstMiniGameShootingExcelT _o) { if (_o == null) return default(Offset); @@ -133,7 +138,8 @@ public struct ConstMiniGameShootingExcel : IFlatbufferObject _o.HiddenPlayerCharacterId, _o.CameraSmoothTime, _SpawnEffectPath, - _o.WaitTimeAfterSpawn); + _o.WaitTimeAfterSpawn, + _o.FreeGearInterval); } } @@ -150,6 +156,7 @@ public class ConstMiniGameShootingExcelT public float CameraSmoothTime { get; set; } public string SpawnEffectPath { get; set; } public float WaitTimeAfterSpawn { get; set; } + public int FreeGearInterval { get; set; } public ConstMiniGameShootingExcelT() { this.NormalStageId = 0; @@ -163,6 +170,7 @@ public class ConstMiniGameShootingExcelT this.CameraSmoothTime = 0.0f; this.SpawnEffectPath = null; this.WaitTimeAfterSpawn = 0.0f; + this.FreeGearInterval = 0; } } @@ -183,6 +191,7 @@ static public class ConstMiniGameShootingExcelVerify && verifier.VerifyField(tablePos, 20 /*CameraSmoothTime*/, 4 /*float*/, 4, false) && verifier.VerifyString(tablePos, 22 /*SpawnEffectPath*/, false) && verifier.VerifyField(tablePos, 24 /*WaitTimeAfterSpawn*/, 4 /*float*/, 4, false) + && verifier.VerifyField(tablePos, 26 /*FreeGearInterval*/, 4 /*int*/, 4, false) && verifier.VerifyTableEnd(tablePos); } } diff --git a/SCHALE.Common/FlatData/ConstStrategyExcel.cs b/SCHALE.Common/FlatData/ConstStrategyExcel.cs index 79824bd..1259de7 100644 --- a/SCHALE.Common/FlatData/ConstStrategyExcel.cs +++ b/SCHALE.Common/FlatData/ConstStrategyExcel.cs @@ -48,6 +48,9 @@ public struct ConstStrategyExcel : IFlatbufferObject public int StoryEchelonCount { get { int o = __p.__offset(40); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } public int MultiSweepPresetCount { get { int o = __p.__offset(42); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } public int MultiSweepPresetNameMaxLength { get { int o = __p.__offset(44); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } + public int MultiSweepPresetSelectStageMaxCount { get { int o = __p.__offset(46); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } + public int MultiSweepPresetMaxSweepCount { get { int o = __p.__offset(48); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } + public int MultiSweepPresetSelectParcelMaxCount { get { int o = __p.__offset(50); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } public static Offset CreateConstStrategyExcel(FlatBufferBuilder builder, float HexaMapBoundaryOffset = 0.0f, @@ -70,9 +73,15 @@ public struct ConstStrategyExcel : IFlatbufferObject int ConquestEchelonCount = 0, int StoryEchelonCount = 0, int MultiSweepPresetCount = 0, - int MultiSweepPresetNameMaxLength = 0) { - builder.StartTable(21); + int MultiSweepPresetNameMaxLength = 0, + int MultiSweepPresetSelectStageMaxCount = 0, + int MultiSweepPresetMaxSweepCount = 0, + int MultiSweepPresetSelectParcelMaxCount = 0) { + builder.StartTable(24); ConstStrategyExcel.AddPlayTimeLimitInSeconds(builder, PlayTimeLimitInSeconds); + ConstStrategyExcel.AddMultiSweepPresetSelectParcelMaxCount(builder, MultiSweepPresetSelectParcelMaxCount); + ConstStrategyExcel.AddMultiSweepPresetMaxSweepCount(builder, MultiSweepPresetMaxSweepCount); + ConstStrategyExcel.AddMultiSweepPresetSelectStageMaxCount(builder, MultiSweepPresetSelectStageMaxCount); ConstStrategyExcel.AddMultiSweepPresetNameMaxLength(builder, MultiSweepPresetNameMaxLength); ConstStrategyExcel.AddMultiSweepPresetCount(builder, MultiSweepPresetCount); ConstStrategyExcel.AddStoryEchelonCount(builder, StoryEchelonCount); @@ -96,7 +105,7 @@ public struct ConstStrategyExcel : IFlatbufferObject return ConstStrategyExcel.EndConstStrategyExcel(builder); } - public static void StartConstStrategyExcel(FlatBufferBuilder builder) { builder.StartTable(21); } + public static void StartConstStrategyExcel(FlatBufferBuilder builder) { builder.StartTable(24); } public static void AddHexaMapBoundaryOffset(FlatBufferBuilder builder, float hexaMapBoundaryOffset) { builder.AddFloat(0, hexaMapBoundaryOffset, 0.0f); } public static void AddHexaMapStartCameraOffset(FlatBufferBuilder builder, float hexaMapStartCameraOffset) { builder.AddFloat(1, hexaMapStartCameraOffset, 0.0f); } public static void AddCameraZoomMax(FlatBufferBuilder builder, float cameraZoomMax) { builder.AddFloat(2, cameraZoomMax, 0.0f); } @@ -123,6 +132,9 @@ public struct ConstStrategyExcel : IFlatbufferObject public static void AddStoryEchelonCount(FlatBufferBuilder builder, int storyEchelonCount) { builder.AddInt(18, storyEchelonCount, 0); } public static void AddMultiSweepPresetCount(FlatBufferBuilder builder, int multiSweepPresetCount) { builder.AddInt(19, multiSweepPresetCount, 0); } public static void AddMultiSweepPresetNameMaxLength(FlatBufferBuilder builder, int multiSweepPresetNameMaxLength) { builder.AddInt(20, multiSweepPresetNameMaxLength, 0); } + public static void AddMultiSweepPresetSelectStageMaxCount(FlatBufferBuilder builder, int multiSweepPresetSelectStageMaxCount) { builder.AddInt(21, multiSweepPresetSelectStageMaxCount, 0); } + public static void AddMultiSweepPresetMaxSweepCount(FlatBufferBuilder builder, int multiSweepPresetMaxSweepCount) { builder.AddInt(22, multiSweepPresetMaxSweepCount, 0); } + public static void AddMultiSweepPresetSelectParcelMaxCount(FlatBufferBuilder builder, int multiSweepPresetSelectParcelMaxCount) { builder.AddInt(23, multiSweepPresetSelectParcelMaxCount, 0); } public static Offset EndConstStrategyExcel(FlatBufferBuilder builder) { int o = builder.EndTable(); return new Offset(o); @@ -156,6 +168,9 @@ public struct ConstStrategyExcel : IFlatbufferObject _o.StoryEchelonCount = TableEncryptionService.Convert(this.StoryEchelonCount, key); _o.MultiSweepPresetCount = TableEncryptionService.Convert(this.MultiSweepPresetCount, key); _o.MultiSweepPresetNameMaxLength = TableEncryptionService.Convert(this.MultiSweepPresetNameMaxLength, key); + _o.MultiSweepPresetSelectStageMaxCount = TableEncryptionService.Convert(this.MultiSweepPresetSelectStageMaxCount, key); + _o.MultiSweepPresetMaxSweepCount = TableEncryptionService.Convert(this.MultiSweepPresetMaxSweepCount, key); + _o.MultiSweepPresetSelectParcelMaxCount = TableEncryptionService.Convert(this.MultiSweepPresetSelectParcelMaxCount, key); } public static Offset Pack(FlatBufferBuilder builder, ConstStrategyExcelT _o) { if (_o == null) return default(Offset); @@ -186,7 +201,10 @@ public struct ConstStrategyExcel : IFlatbufferObject _o.ConquestEchelonCount, _o.StoryEchelonCount, _o.MultiSweepPresetCount, - _o.MultiSweepPresetNameMaxLength); + _o.MultiSweepPresetNameMaxLength, + _o.MultiSweepPresetSelectStageMaxCount, + _o.MultiSweepPresetMaxSweepCount, + _o.MultiSweepPresetSelectParcelMaxCount); } } @@ -213,6 +231,9 @@ public class ConstStrategyExcelT public int StoryEchelonCount { get; set; } public int MultiSweepPresetCount { get; set; } public int MultiSweepPresetNameMaxLength { get; set; } + public int MultiSweepPresetSelectStageMaxCount { get; set; } + public int MultiSweepPresetMaxSweepCount { get; set; } + public int MultiSweepPresetSelectParcelMaxCount { get; set; } public ConstStrategyExcelT() { this.HexaMapBoundaryOffset = 0.0f; @@ -236,6 +257,9 @@ public class ConstStrategyExcelT this.StoryEchelonCount = 0; this.MultiSweepPresetCount = 0; this.MultiSweepPresetNameMaxLength = 0; + this.MultiSweepPresetSelectStageMaxCount = 0; + this.MultiSweepPresetMaxSweepCount = 0; + this.MultiSweepPresetSelectParcelMaxCount = 0; } } @@ -266,6 +290,9 @@ static public class ConstStrategyExcelVerify && verifier.VerifyField(tablePos, 40 /*StoryEchelonCount*/, 4 /*int*/, 4, false) && verifier.VerifyField(tablePos, 42 /*MultiSweepPresetCount*/, 4 /*int*/, 4, false) && verifier.VerifyField(tablePos, 44 /*MultiSweepPresetNameMaxLength*/, 4 /*int*/, 4, false) + && verifier.VerifyField(tablePos, 46 /*MultiSweepPresetSelectStageMaxCount*/, 4 /*int*/, 4, false) + && verifier.VerifyField(tablePos, 48 /*MultiSweepPresetMaxSweepCount*/, 4 /*int*/, 4, false) + && verifier.VerifyField(tablePos, 50 /*MultiSweepPresetSelectParcelMaxCount*/, 4 /*int*/, 4, false) && verifier.VerifyTableEnd(tablePos); } } diff --git a/SCHALE.Common/FlatData/ContentEnterCostReduceExcel.cs b/SCHALE.Common/FlatData/ContentEnterCostReduceExcel.cs index 5f9bbc5..5d1928f 100644 --- a/SCHALE.Common/FlatData/ContentEnterCostReduceExcel.cs +++ b/SCHALE.Common/FlatData/ContentEnterCostReduceExcel.cs @@ -21,7 +21,7 @@ public struct ContentEnterCostReduceExcel : IFlatbufferObject public ContentEnterCostReduceExcel __assign(int _i, ByteBuffer _bb) { __init(_i, _bb); return this; } public long EnterCostReduceGroupId { get { int o = __p.__offset(4); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } - public SCHALE.Common.FlatData.ContentType ContentType { get { int o = __p.__offset(6); return o != 0 ? (SCHALE.Common.FlatData.ContentType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.ContentType.None; } } + public SCHALE.Common.FlatData.ContentType ContentType_ { get { int o = __p.__offset(6); return o != 0 ? (SCHALE.Common.FlatData.ContentType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.ContentType.None; } } public long StageId { get { int o = __p.__offset(8); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public SCHALE.Common.FlatData.ParcelType ReduceEnterCostType { get { int o = __p.__offset(10); return o != 0 ? (SCHALE.Common.FlatData.ParcelType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.ParcelType.None; } } public long ReduceEnterCostId { get { int o = __p.__offset(12); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } @@ -29,7 +29,7 @@ public struct ContentEnterCostReduceExcel : IFlatbufferObject public static Offset CreateContentEnterCostReduceExcel(FlatBufferBuilder builder, long EnterCostReduceGroupId = 0, - SCHALE.Common.FlatData.ContentType ContentType = SCHALE.Common.FlatData.ContentType.None, + SCHALE.Common.FlatData.ContentType ContentType_ = SCHALE.Common.FlatData.ContentType.None, long StageId = 0, SCHALE.Common.FlatData.ParcelType ReduceEnterCostType = SCHALE.Common.FlatData.ParcelType.None, long ReduceEnterCostId = 0, @@ -40,13 +40,13 @@ public struct ContentEnterCostReduceExcel : IFlatbufferObject ContentEnterCostReduceExcel.AddStageId(builder, StageId); ContentEnterCostReduceExcel.AddEnterCostReduceGroupId(builder, EnterCostReduceGroupId); ContentEnterCostReduceExcel.AddReduceEnterCostType(builder, ReduceEnterCostType); - ContentEnterCostReduceExcel.AddContentType(builder, ContentType); + ContentEnterCostReduceExcel.AddContentType_(builder, ContentType_); return ContentEnterCostReduceExcel.EndContentEnterCostReduceExcel(builder); } public static void StartContentEnterCostReduceExcel(FlatBufferBuilder builder) { builder.StartTable(6); } public static void AddEnterCostReduceGroupId(FlatBufferBuilder builder, long enterCostReduceGroupId) { builder.AddLong(0, enterCostReduceGroupId, 0); } - public static void AddContentType(FlatBufferBuilder builder, SCHALE.Common.FlatData.ContentType contentType) { builder.AddInt(1, (int)contentType, 0); } + public static void AddContentType_(FlatBufferBuilder builder, SCHALE.Common.FlatData.ContentType contentType_) { builder.AddInt(1, (int)contentType_, 0); } public static void AddStageId(FlatBufferBuilder builder, long stageId) { builder.AddLong(2, stageId, 0); } public static void AddReduceEnterCostType(FlatBufferBuilder builder, SCHALE.Common.FlatData.ParcelType reduceEnterCostType) { builder.AddInt(3, (int)reduceEnterCostType, 0); } public static void AddReduceEnterCostId(FlatBufferBuilder builder, long reduceEnterCostId) { builder.AddLong(4, reduceEnterCostId, 0); } @@ -63,7 +63,7 @@ public struct ContentEnterCostReduceExcel : IFlatbufferObject public void UnPackTo(ContentEnterCostReduceExcelT _o) { byte[] key = TableEncryptionService.CreateKey("ContentEnterCostReduce"); _o.EnterCostReduceGroupId = TableEncryptionService.Convert(this.EnterCostReduceGroupId, key); - _o.ContentType = TableEncryptionService.Convert(this.ContentType, key); + _o.ContentType_ = TableEncryptionService.Convert(this.ContentType_, key); _o.StageId = TableEncryptionService.Convert(this.StageId, key); _o.ReduceEnterCostType = TableEncryptionService.Convert(this.ReduceEnterCostType, key); _o.ReduceEnterCostId = TableEncryptionService.Convert(this.ReduceEnterCostId, key); @@ -74,7 +74,7 @@ public struct ContentEnterCostReduceExcel : IFlatbufferObject return CreateContentEnterCostReduceExcel( builder, _o.EnterCostReduceGroupId, - _o.ContentType, + _o.ContentType_, _o.StageId, _o.ReduceEnterCostType, _o.ReduceEnterCostId, @@ -85,7 +85,7 @@ public struct ContentEnterCostReduceExcel : IFlatbufferObject public class ContentEnterCostReduceExcelT { public long EnterCostReduceGroupId { get; set; } - public SCHALE.Common.FlatData.ContentType ContentType { get; set; } + public SCHALE.Common.FlatData.ContentType ContentType_ { get; set; } public long StageId { get; set; } public SCHALE.Common.FlatData.ParcelType ReduceEnterCostType { get; set; } public long ReduceEnterCostId { get; set; } @@ -93,7 +93,7 @@ public class ContentEnterCostReduceExcelT public ContentEnterCostReduceExcelT() { this.EnterCostReduceGroupId = 0; - this.ContentType = SCHALE.Common.FlatData.ContentType.None; + this.ContentType_ = SCHALE.Common.FlatData.ContentType.None; this.StageId = 0; this.ReduceEnterCostType = SCHALE.Common.FlatData.ParcelType.None; this.ReduceEnterCostId = 0; @@ -108,7 +108,7 @@ static public class ContentEnterCostReduceExcelVerify { return verifier.VerifyTableStart(tablePos) && verifier.VerifyField(tablePos, 4 /*EnterCostReduceGroupId*/, 8 /*long*/, 8, false) - && verifier.VerifyField(tablePos, 6 /*ContentType*/, 4 /*SCHALE.Common.FlatData.ContentType*/, 4, false) + && verifier.VerifyField(tablePos, 6 /*ContentType_*/, 4 /*SCHALE.Common.FlatData.ContentType*/, 4, false) && verifier.VerifyField(tablePos, 8 /*StageId*/, 8 /*long*/, 8, false) && verifier.VerifyField(tablePos, 10 /*ReduceEnterCostType*/, 4 /*SCHALE.Common.FlatData.ParcelType*/, 4, false) && verifier.VerifyField(tablePos, 12 /*ReduceEnterCostId*/, 8 /*long*/, 8, false) diff --git a/SCHALE.Common/FlatData/ContentSpoilerPopupExcel.cs b/SCHALE.Common/FlatData/ContentSpoilerPopupExcel.cs index c981e28..8b980bf 100644 --- a/SCHALE.Common/FlatData/ContentSpoilerPopupExcel.cs +++ b/SCHALE.Common/FlatData/ContentSpoilerPopupExcel.cs @@ -20,7 +20,7 @@ public struct ContentSpoilerPopupExcel : IFlatbufferObject public void __init(int _i, ByteBuffer _bb) { __p = new Table(_i, _bb); } public ContentSpoilerPopupExcel __assign(int _i, ByteBuffer _bb) { __init(_i, _bb); return this; } - public SCHALE.Common.FlatData.ContentType ContentType { get { int o = __p.__offset(4); return o != 0 ? (SCHALE.Common.FlatData.ContentType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.ContentType.None; } } + public SCHALE.Common.FlatData.ContentType ContentType_ { get { int o = __p.__offset(4); return o != 0 ? (SCHALE.Common.FlatData.ContentType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.ContentType.None; } } public string SpoilerPopupTitle { get { int o = __p.__offset(6); return o != 0 ? __p.__string(o + __p.bb_pos) : null; } } #if ENABLE_SPAN_T public Span GetSpoilerPopupTitleBytes() { return __p.__vector_as_span(6, 1); } @@ -39,7 +39,7 @@ public struct ContentSpoilerPopupExcel : IFlatbufferObject public long ConditionScenarioModeId { get { int o = __p.__offset(12); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public static Offset CreateContentSpoilerPopupExcel(FlatBufferBuilder builder, - SCHALE.Common.FlatData.ContentType ContentType = SCHALE.Common.FlatData.ContentType.None, + SCHALE.Common.FlatData.ContentType ContentType_ = SCHALE.Common.FlatData.ContentType.None, StringOffset SpoilerPopupTitleOffset = default(StringOffset), StringOffset SpoilerPopupDescriptionOffset = default(StringOffset), bool IsWarningPopUp = false, @@ -48,13 +48,13 @@ public struct ContentSpoilerPopupExcel : IFlatbufferObject ContentSpoilerPopupExcel.AddConditionScenarioModeId(builder, ConditionScenarioModeId); ContentSpoilerPopupExcel.AddSpoilerPopupDescription(builder, SpoilerPopupDescriptionOffset); ContentSpoilerPopupExcel.AddSpoilerPopupTitle(builder, SpoilerPopupTitleOffset); - ContentSpoilerPopupExcel.AddContentType(builder, ContentType); + ContentSpoilerPopupExcel.AddContentType_(builder, ContentType_); ContentSpoilerPopupExcel.AddIsWarningPopUp(builder, IsWarningPopUp); return ContentSpoilerPopupExcel.EndContentSpoilerPopupExcel(builder); } public static void StartContentSpoilerPopupExcel(FlatBufferBuilder builder) { builder.StartTable(5); } - public static void AddContentType(FlatBufferBuilder builder, SCHALE.Common.FlatData.ContentType contentType) { builder.AddInt(0, (int)contentType, 0); } + public static void AddContentType_(FlatBufferBuilder builder, SCHALE.Common.FlatData.ContentType contentType_) { builder.AddInt(0, (int)contentType_, 0); } public static void AddSpoilerPopupTitle(FlatBufferBuilder builder, StringOffset spoilerPopupTitleOffset) { builder.AddOffset(1, spoilerPopupTitleOffset.Value, 0); } public static void AddSpoilerPopupDescription(FlatBufferBuilder builder, StringOffset spoilerPopupDescriptionOffset) { builder.AddOffset(2, spoilerPopupDescriptionOffset.Value, 0); } public static void AddIsWarningPopUp(FlatBufferBuilder builder, bool isWarningPopUp) { builder.AddBool(3, isWarningPopUp, false); } @@ -70,7 +70,7 @@ public struct ContentSpoilerPopupExcel : IFlatbufferObject } public void UnPackTo(ContentSpoilerPopupExcelT _o) { byte[] key = TableEncryptionService.CreateKey("ContentSpoilerPopup"); - _o.ContentType = TableEncryptionService.Convert(this.ContentType, key); + _o.ContentType_ = TableEncryptionService.Convert(this.ContentType_, key); _o.SpoilerPopupTitle = TableEncryptionService.Convert(this.SpoilerPopupTitle, key); _o.SpoilerPopupDescription = TableEncryptionService.Convert(this.SpoilerPopupDescription, key); _o.IsWarningPopUp = TableEncryptionService.Convert(this.IsWarningPopUp, key); @@ -82,7 +82,7 @@ public struct ContentSpoilerPopupExcel : IFlatbufferObject var _SpoilerPopupDescription = _o.SpoilerPopupDescription == null ? default(StringOffset) : builder.CreateString(_o.SpoilerPopupDescription); return CreateContentSpoilerPopupExcel( builder, - _o.ContentType, + _o.ContentType_, _SpoilerPopupTitle, _SpoilerPopupDescription, _o.IsWarningPopUp, @@ -92,14 +92,14 @@ public struct ContentSpoilerPopupExcel : IFlatbufferObject public class ContentSpoilerPopupExcelT { - public SCHALE.Common.FlatData.ContentType ContentType { get; set; } + public SCHALE.Common.FlatData.ContentType ContentType_ { get; set; } public string SpoilerPopupTitle { get; set; } public string SpoilerPopupDescription { get; set; } public bool IsWarningPopUp { get; set; } public long ConditionScenarioModeId { get; set; } public ContentSpoilerPopupExcelT() { - this.ContentType = SCHALE.Common.FlatData.ContentType.None; + this.ContentType_ = SCHALE.Common.FlatData.ContentType.None; this.SpoilerPopupTitle = null; this.SpoilerPopupDescription = null; this.IsWarningPopUp = false; @@ -113,7 +113,7 @@ static public class ContentSpoilerPopupExcelVerify static public bool Verify(Google.FlatBuffers.Verifier verifier, uint tablePos) { return verifier.VerifyTableStart(tablePos) - && verifier.VerifyField(tablePos, 4 /*ContentType*/, 4 /*SCHALE.Common.FlatData.ContentType*/, 4, false) + && verifier.VerifyField(tablePos, 4 /*ContentType_*/, 4 /*SCHALE.Common.FlatData.ContentType*/, 4, false) && verifier.VerifyString(tablePos, 6 /*SpoilerPopupTitle*/, false) && verifier.VerifyString(tablePos, 8 /*SpoilerPopupDescription*/, false) && verifier.VerifyField(tablePos, 10 /*IsWarningPopUp*/, 1 /*bool*/, 1, false) diff --git a/SCHALE.Common/FlatData/ContentSpoilerPopupExcelTable.cs b/SCHALE.Common/FlatData/ContentSpoilerPopupExcelTable.cs deleted file mode 100644 index 1e581f7..0000000 --- a/SCHALE.Common/FlatData/ContentSpoilerPopupExcelTable.cs +++ /dev/null @@ -1,88 +0,0 @@ -// -// automatically generated by the FlatBuffers compiler, do not modify -// - -namespace SCHALE.Common.FlatData -{ - -using global::System; -using global::System.Collections.Generic; -using global::SCHALE.Common.Crypto; -using global::Google.FlatBuffers; - -public struct ContentSpoilerPopupExcelTable : IFlatbufferObject -{ - private Table __p; - public ByteBuffer ByteBuffer { get { return __p.bb; } } - public static void ValidateVersion() { FlatBufferConstants.FLATBUFFERS_24_3_25(); } - public static ContentSpoilerPopupExcelTable GetRootAsContentSpoilerPopupExcelTable(ByteBuffer _bb) { return GetRootAsContentSpoilerPopupExcelTable(_bb, new ContentSpoilerPopupExcelTable()); } - public static ContentSpoilerPopupExcelTable GetRootAsContentSpoilerPopupExcelTable(ByteBuffer _bb, ContentSpoilerPopupExcelTable obj) { return (obj.__assign(_bb.GetInt(_bb.Position) + _bb.Position, _bb)); } - public void __init(int _i, ByteBuffer _bb) { __p = new Table(_i, _bb); } - public ContentSpoilerPopupExcelTable __assign(int _i, ByteBuffer _bb) { __init(_i, _bb); return this; } - - public SCHALE.Common.FlatData.ContentSpoilerPopupExcel? DataList(int j) { int o = __p.__offset(4); return o != 0 ? (SCHALE.Common.FlatData.ContentSpoilerPopupExcel?)(new SCHALE.Common.FlatData.ContentSpoilerPopupExcel()).__assign(__p.__indirect(__p.__vector(o) + j * 4), __p.bb) : null; } - public int DataListLength { get { int o = __p.__offset(4); return o != 0 ? __p.__vector_len(o) : 0; } } - - public static Offset CreateContentSpoilerPopupExcelTable(FlatBufferBuilder builder, - VectorOffset DataListOffset = default(VectorOffset)) { - builder.StartTable(1); - ContentSpoilerPopupExcelTable.AddDataList(builder, DataListOffset); - return ContentSpoilerPopupExcelTable.EndContentSpoilerPopupExcelTable(builder); - } - - public static void StartContentSpoilerPopupExcelTable(FlatBufferBuilder builder) { builder.StartTable(1); } - public static void AddDataList(FlatBufferBuilder builder, VectorOffset dataListOffset) { builder.AddOffset(0, dataListOffset.Value, 0); } - public static VectorOffset CreateDataListVector(FlatBufferBuilder builder, Offset[] data) { builder.StartVector(4, data.Length, 4); for (int i = data.Length - 1; i >= 0; i--) builder.AddOffset(data[i].Value); return builder.EndVector(); } - public static VectorOffset CreateDataListVectorBlock(FlatBufferBuilder builder, Offset[] data) { builder.StartVector(4, data.Length, 4); builder.Add(data); return builder.EndVector(); } - public static VectorOffset CreateDataListVectorBlock(FlatBufferBuilder builder, ArraySegment> data) { builder.StartVector(4, data.Count, 4); builder.Add(data); return builder.EndVector(); } - public static VectorOffset CreateDataListVectorBlock(FlatBufferBuilder builder, IntPtr dataPtr, int sizeInBytes) { builder.StartVector(1, sizeInBytes, 1); builder.Add>(dataPtr, sizeInBytes); return builder.EndVector(); } - public static void StartDataListVector(FlatBufferBuilder builder, int numElems) { builder.StartVector(4, numElems, 4); } - public static Offset EndContentSpoilerPopupExcelTable(FlatBufferBuilder builder) { - int o = builder.EndTable(); - return new Offset(o); - } - public ContentSpoilerPopupExcelTableT UnPack() { - var _o = new ContentSpoilerPopupExcelTableT(); - this.UnPackTo(_o); - return _o; - } - public void UnPackTo(ContentSpoilerPopupExcelTableT _o) { - byte[] key = TableEncryptionService.CreateKey("ContentSpoilerPopupExcel"); - _o.DataList = new List(); - for (var _j = 0; _j < this.DataListLength; ++_j) {_o.DataList.Add(this.DataList(_j).HasValue ? this.DataList(_j).Value.UnPack() : null);} - } - public static Offset Pack(FlatBufferBuilder builder, ContentSpoilerPopupExcelTableT _o) { - if (_o == null) return default(Offset); - var _DataList = default(VectorOffset); - if (_o.DataList != null) { - var __DataList = new Offset[_o.DataList.Count]; - for (var _j = 0; _j < __DataList.Length; ++_j) { __DataList[_j] = SCHALE.Common.FlatData.ContentSpoilerPopupExcel.Pack(builder, _o.DataList[_j]); } - _DataList = CreateDataListVector(builder, __DataList); - } - return CreateContentSpoilerPopupExcelTable( - builder, - _DataList); - } -} - -public class ContentSpoilerPopupExcelTableT -{ - public List DataList { get; set; } - - public ContentSpoilerPopupExcelTableT() { - this.DataList = null; - } -} - - -static public class ContentSpoilerPopupExcelTableVerify -{ - static public bool Verify(Google.FlatBuffers.Verifier verifier, uint tablePos) - { - return verifier.VerifyTableStart(tablePos) - && verifier.VerifyVectorOfTables(tablePos, 4 /*DataList*/, SCHALE.Common.FlatData.ContentSpoilerPopupExcelVerify.Verify, false) - && verifier.VerifyTableEnd(tablePos); - } -} - -} diff --git a/SCHALE.Common/FlatData/ContentType.cs b/SCHALE.Common/FlatData/ContentType.cs index b5afbac..37c7bfd 100644 --- a/SCHALE.Common/FlatData/ContentType.cs +++ b/SCHALE.Common/FlatData/ContentType.cs @@ -29,6 +29,7 @@ public enum ContentType : int Chaser = 19, FieldContentStage = 20, MultiFloorRaid = 21, + MinigameDefense = 22, }; diff --git a/SCHALE.Common/FlatData/ContentsScenarioExcel.cs b/SCHALE.Common/FlatData/ContentsScenarioExcel.cs index a89647d..4b3f902 100644 --- a/SCHALE.Common/FlatData/ContentsScenarioExcel.cs +++ b/SCHALE.Common/FlatData/ContentsScenarioExcel.cs @@ -23,7 +23,7 @@ public struct ContentsScenarioExcel : IFlatbufferObject public uint Id { get { int o = __p.__offset(4); return o != 0 ? __p.bb.GetUint(o + __p.bb_pos) : (uint)0; } } public uint LocalizeId { get { int o = __p.__offset(6); return o != 0 ? __p.bb.GetUint(o + __p.bb_pos) : (uint)0; } } public int DisplayOrder { get { int o = __p.__offset(8); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } - public SCHALE.Common.FlatData.ScenarioContentType ScenarioContentType { get { int o = __p.__offset(10); return o != 0 ? (SCHALE.Common.FlatData.ScenarioContentType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.ScenarioContentType.Prologue; } } + public SCHALE.Common.FlatData.ScenarioContentType ScenarioContentType_ { get { int o = __p.__offset(10); return o != 0 ? (SCHALE.Common.FlatData.ScenarioContentType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.ScenarioContentType.Prologue; } } public long ScenarioGroupId(int j) { int o = __p.__offset(12); return o != 0 ? __p.bb.GetLong(__p.__vector(o) + j * 8) : (long)0; } public int ScenarioGroupIdLength { get { int o = __p.__offset(12); return o != 0 ? __p.__vector_len(o) : 0; } } #if ENABLE_SPAN_T @@ -37,11 +37,11 @@ public struct ContentsScenarioExcel : IFlatbufferObject uint Id = 0, uint LocalizeId = 0, int DisplayOrder = 0, - SCHALE.Common.FlatData.ScenarioContentType ScenarioContentType = SCHALE.Common.FlatData.ScenarioContentType.Prologue, + SCHALE.Common.FlatData.ScenarioContentType ScenarioContentType_ = SCHALE.Common.FlatData.ScenarioContentType.Prologue, VectorOffset ScenarioGroupIdOffset = default(VectorOffset)) { builder.StartTable(5); ContentsScenarioExcel.AddScenarioGroupId(builder, ScenarioGroupIdOffset); - ContentsScenarioExcel.AddScenarioContentType(builder, ScenarioContentType); + ContentsScenarioExcel.AddScenarioContentType_(builder, ScenarioContentType_); ContentsScenarioExcel.AddDisplayOrder(builder, DisplayOrder); ContentsScenarioExcel.AddLocalizeId(builder, LocalizeId); ContentsScenarioExcel.AddId(builder, Id); @@ -52,7 +52,7 @@ public struct ContentsScenarioExcel : IFlatbufferObject public static void AddId(FlatBufferBuilder builder, uint id) { builder.AddUint(0, id, 0); } public static void AddLocalizeId(FlatBufferBuilder builder, uint localizeId) { builder.AddUint(1, localizeId, 0); } public static void AddDisplayOrder(FlatBufferBuilder builder, int displayOrder) { builder.AddInt(2, displayOrder, 0); } - public static void AddScenarioContentType(FlatBufferBuilder builder, SCHALE.Common.FlatData.ScenarioContentType scenarioContentType) { builder.AddInt(3, (int)scenarioContentType, 0); } + public static void AddScenarioContentType_(FlatBufferBuilder builder, SCHALE.Common.FlatData.ScenarioContentType scenarioContentType_) { builder.AddInt(3, (int)scenarioContentType_, 0); } public static void AddScenarioGroupId(FlatBufferBuilder builder, VectorOffset scenarioGroupIdOffset) { builder.AddOffset(4, scenarioGroupIdOffset.Value, 0); } public static VectorOffset CreateScenarioGroupIdVector(FlatBufferBuilder builder, long[] data) { builder.StartVector(8, data.Length, 8); for (int i = data.Length - 1; i >= 0; i--) builder.AddLong(data[i]); return builder.EndVector(); } public static VectorOffset CreateScenarioGroupIdVectorBlock(FlatBufferBuilder builder, long[] data) { builder.StartVector(8, data.Length, 8); builder.Add(data); return builder.EndVector(); } @@ -73,7 +73,7 @@ public struct ContentsScenarioExcel : IFlatbufferObject _o.Id = TableEncryptionService.Convert(this.Id, key); _o.LocalizeId = TableEncryptionService.Convert(this.LocalizeId, key); _o.DisplayOrder = TableEncryptionService.Convert(this.DisplayOrder, key); - _o.ScenarioContentType = TableEncryptionService.Convert(this.ScenarioContentType, key); + _o.ScenarioContentType_ = TableEncryptionService.Convert(this.ScenarioContentType_, key); _o.ScenarioGroupId = new List(); for (var _j = 0; _j < this.ScenarioGroupIdLength; ++_j) {_o.ScenarioGroupId.Add(TableEncryptionService.Convert(this.ScenarioGroupId(_j), key));} } @@ -89,7 +89,7 @@ public struct ContentsScenarioExcel : IFlatbufferObject _o.Id, _o.LocalizeId, _o.DisplayOrder, - _o.ScenarioContentType, + _o.ScenarioContentType_, _ScenarioGroupId); } } @@ -99,14 +99,14 @@ public class ContentsScenarioExcelT public uint Id { get; set; } public uint LocalizeId { get; set; } public int DisplayOrder { get; set; } - public SCHALE.Common.FlatData.ScenarioContentType ScenarioContentType { get; set; } + public SCHALE.Common.FlatData.ScenarioContentType ScenarioContentType_ { get; set; } public List ScenarioGroupId { get; set; } public ContentsScenarioExcelT() { this.Id = 0; this.LocalizeId = 0; this.DisplayOrder = 0; - this.ScenarioContentType = SCHALE.Common.FlatData.ScenarioContentType.Prologue; + this.ScenarioContentType_ = SCHALE.Common.FlatData.ScenarioContentType.Prologue; this.ScenarioGroupId = null; } } @@ -120,7 +120,7 @@ static public class ContentsScenarioExcelVerify && verifier.VerifyField(tablePos, 4 /*Id*/, 4 /*uint*/, 4, false) && verifier.VerifyField(tablePos, 6 /*LocalizeId*/, 4 /*uint*/, 4, false) && verifier.VerifyField(tablePos, 8 /*DisplayOrder*/, 4 /*int*/, 4, false) - && verifier.VerifyField(tablePos, 10 /*ScenarioContentType*/, 4 /*SCHALE.Common.FlatData.ScenarioContentType*/, 4, false) + && verifier.VerifyField(tablePos, 10 /*ScenarioContentType_*/, 4 /*SCHALE.Common.FlatData.ScenarioContentType*/, 4, false) && verifier.VerifyVectorOfData(tablePos, 12 /*ScenarioGroupId*/, 8 /*long*/, false) && verifier.VerifyTableEnd(tablePos); } diff --git a/SCHALE.Common/FlatData/ContentsShortcutExcel.cs b/SCHALE.Common/FlatData/ContentsShortcutExcel.cs index c25ce76..a764712 100644 --- a/SCHALE.Common/FlatData/ContentsShortcutExcel.cs +++ b/SCHALE.Common/FlatData/ContentsShortcutExcel.cs @@ -21,7 +21,7 @@ public struct ContentsShortcutExcel : IFlatbufferObject public ContentsShortcutExcel __assign(int _i, ByteBuffer _bb) { __init(_i, _bb); return this; } public long UniqueId { get { int o = __p.__offset(4); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } - public SCHALE.Common.FlatData.ContentType ContentType { get { int o = __p.__offset(6); return o != 0 ? (SCHALE.Common.FlatData.ContentType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.ContentType.None; } } + public SCHALE.Common.FlatData.ContentType ContentType_ { get { int o = __p.__offset(6); return o != 0 ? (SCHALE.Common.FlatData.ContentType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.ContentType.None; } } public long EventContentId { get { int o = __p.__offset(8); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public long ScenarioModeVolume { get { int o = __p.__offset(10); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public long ScenarioModeChapter { get { int o = __p.__offset(12); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } @@ -55,7 +55,7 @@ public struct ContentsShortcutExcel : IFlatbufferObject public static Offset CreateContentsShortcutExcel(FlatBufferBuilder builder, long UniqueId = 0, - SCHALE.Common.FlatData.ContentType ContentType = SCHALE.Common.FlatData.ContentType.None, + SCHALE.Common.FlatData.ContentType ContentType_ = SCHALE.Common.FlatData.ContentType.None, long EventContentId = 0, long ScenarioModeVolume = 0, long ScenarioModeChapter = 0, @@ -80,13 +80,13 @@ public struct ContentsShortcutExcel : IFlatbufferObject ContentsShortcutExcel.AddConquestMapDifficulty(builder, ConquestMapDifficulty); ContentsShortcutExcel.AddShortcutCloseTime(builder, ShortcutCloseTimeOffset); ContentsShortcutExcel.AddShortcutOpenTime(builder, ShortcutOpenTimeOffset); - ContentsShortcutExcel.AddContentType(builder, ContentType); + ContentsShortcutExcel.AddContentType_(builder, ContentType_); return ContentsShortcutExcel.EndContentsShortcutExcel(builder); } public static void StartContentsShortcutExcel(FlatBufferBuilder builder) { builder.StartTable(13); } public static void AddUniqueId(FlatBufferBuilder builder, long uniqueId) { builder.AddLong(0, uniqueId, 0); } - public static void AddContentType(FlatBufferBuilder builder, SCHALE.Common.FlatData.ContentType contentType) { builder.AddInt(1, (int)contentType, 0); } + public static void AddContentType_(FlatBufferBuilder builder, SCHALE.Common.FlatData.ContentType contentType_) { builder.AddInt(1, (int)contentType_, 0); } public static void AddEventContentId(FlatBufferBuilder builder, long eventContentId) { builder.AddLong(2, eventContentId, 0); } public static void AddScenarioModeVolume(FlatBufferBuilder builder, long scenarioModeVolume) { builder.AddLong(3, scenarioModeVolume, 0); } public static void AddScenarioModeChapter(FlatBufferBuilder builder, long scenarioModeChapter) { builder.AddLong(4, scenarioModeChapter, 0); } @@ -115,7 +115,7 @@ public struct ContentsShortcutExcel : IFlatbufferObject public void UnPackTo(ContentsShortcutExcelT _o) { byte[] key = TableEncryptionService.CreateKey("ContentsShortcut"); _o.UniqueId = TableEncryptionService.Convert(this.UniqueId, key); - _o.ContentType = TableEncryptionService.Convert(this.ContentType, key); + _o.ContentType_ = TableEncryptionService.Convert(this.ContentType_, key); _o.EventContentId = TableEncryptionService.Convert(this.EventContentId, key); _o.ScenarioModeVolume = TableEncryptionService.Convert(this.ScenarioModeVolume, key); _o.ScenarioModeChapter = TableEncryptionService.Convert(this.ScenarioModeChapter, key); @@ -143,7 +143,7 @@ public struct ContentsShortcutExcel : IFlatbufferObject return CreateContentsShortcutExcel( builder, _o.UniqueId, - _o.ContentType, + _o.ContentType_, _o.EventContentId, _o.ScenarioModeVolume, _o.ScenarioModeChapter, @@ -161,7 +161,7 @@ public struct ContentsShortcutExcel : IFlatbufferObject public class ContentsShortcutExcelT { public long UniqueId { get; set; } - public SCHALE.Common.FlatData.ContentType ContentType { get; set; } + public SCHALE.Common.FlatData.ContentType ContentType_ { get; set; } public long EventContentId { get; set; } public long ScenarioModeVolume { get; set; } public long ScenarioModeChapter { get; set; } @@ -176,7 +176,7 @@ public class ContentsShortcutExcelT public ContentsShortcutExcelT() { this.UniqueId = 0; - this.ContentType = SCHALE.Common.FlatData.ContentType.None; + this.ContentType_ = SCHALE.Common.FlatData.ContentType.None; this.EventContentId = 0; this.ScenarioModeVolume = 0; this.ScenarioModeChapter = 0; @@ -198,7 +198,7 @@ static public class ContentsShortcutExcelVerify { return verifier.VerifyTableStart(tablePos) && verifier.VerifyField(tablePos, 4 /*UniqueId*/, 8 /*long*/, 8, false) - && verifier.VerifyField(tablePos, 6 /*ContentType*/, 4 /*SCHALE.Common.FlatData.ContentType*/, 4, false) + && verifier.VerifyField(tablePos, 6 /*ContentType_*/, 4 /*SCHALE.Common.FlatData.ContentType*/, 4, false) && verifier.VerifyField(tablePos, 8 /*EventContentId*/, 8 /*long*/, 8, false) && verifier.VerifyField(tablePos, 10 /*ScenarioModeVolume*/, 8 /*long*/, 8, false) && verifier.VerifyField(tablePos, 12 /*ScenarioModeChapter*/, 8 /*long*/, 8, false) diff --git a/SCHALE.Common/FlatData/CostumeExcel.cs b/SCHALE.Common/FlatData/CostumeExcel.cs index 98acc6c..73cadb2 100644 --- a/SCHALE.Common/FlatData/CostumeExcel.cs +++ b/SCHALE.Common/FlatData/CostumeExcel.cs @@ -29,7 +29,7 @@ public struct CostumeExcel : IFlatbufferObject public ArraySegment? GetDevNameBytes() { return __p.__vector_as_arraysegment(8); } #endif public byte[] GetDevNameArray() { return __p.__vector_as_array(8); } - public SCHALE.Common.FlatData.ProductionStep ProductionStep { get { int o = __p.__offset(10); return o != 0 ? (SCHALE.Common.FlatData.ProductionStep)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.ProductionStep.ToDo; } } + public SCHALE.Common.FlatData.ProductionStep ProductionStep_ { get { int o = __p.__offset(10); return o != 0 ? (SCHALE.Common.FlatData.ProductionStep)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.ProductionStep.ToDo; } } public bool IsDefault { get { int o = __p.__offset(12); return o != 0 ? 0!=__p.bb.Get(o + __p.bb_pos) : (bool)false; } } public bool CollectionVisible { get { int o = __p.__offset(14); return o != 0 ? 0!=__p.bb.Get(o + __p.bb_pos) : (bool)false; } } public string ReleaseDate { get { int o = __p.__offset(16); return o != 0 ? __p.__string(o + __p.bb_pos) : null; } } @@ -53,7 +53,7 @@ public struct CostumeExcel : IFlatbufferObject public ArraySegment? GetCollectionVisibleEndDateBytes() { return __p.__vector_as_arraysegment(20); } #endif public byte[] GetCollectionVisibleEndDateArray() { return __p.__vector_as_array(20); } - public SCHALE.Common.FlatData.Rarity Rarity { get { int o = __p.__offset(22); return o != 0 ? (SCHALE.Common.FlatData.Rarity)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.Rarity.N; } } + public SCHALE.Common.FlatData.Rarity Rarity_ { get { int o = __p.__offset(22); return o != 0 ? (SCHALE.Common.FlatData.Rarity)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.Rarity.N; } } public long CharacterSkillListGroupId { get { int o = __p.__offset(24); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public string SpineResourceName { get { int o = __p.__offset(26); return o != 0 ? __p.__string(o + __p.bb_pos) : null; } } #if ENABLE_SPAN_T @@ -71,7 +71,7 @@ public struct CostumeExcel : IFlatbufferObject public byte[] GetSpineResourceNameDioramaArray() { return __p.__vector_as_array(28); } public string SpineResourceNameDioramaForFormConversion(int j) { int o = __p.__offset(30); return o != 0 ? __p.__string(__p.__vector(o) + j * 4) : null; } public int SpineResourceNameDioramaForFormConversionLength { get { int o = __p.__offset(30); return o != 0 ? __p.__vector_len(o) : 0; } } - public SCHALE.Common.FlatData.EntityMaterialType EntityMaterialType { get { int o = __p.__offset(32); return o != 0 ? (SCHALE.Common.FlatData.EntityMaterialType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.EntityMaterialType.Wood; } } + public SCHALE.Common.FlatData.EntityMaterialType EntityMaterialType_ { get { int o = __p.__offset(32); return o != 0 ? (SCHALE.Common.FlatData.EntityMaterialType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.EntityMaterialType.Wood; } } public string ModelPrefabName { get { int o = __p.__offset(34); return o != 0 ? __p.__string(o + __p.bb_pos) : null; } } #if ENABLE_SPAN_T public Span GetModelPrefabNameBytes() { return __p.__vector_as_span(34, 1); } @@ -121,56 +121,64 @@ public struct CostumeExcel : IFlatbufferObject public ArraySegment? GetCollectionBGTexturePathBytes() { return __p.__vector_as_arraysegment(46); } #endif public byte[] GetCollectionBGTexturePathArray() { return __p.__vector_as_array(46); } - public bool UseObjectHPBAR { get { int o = __p.__offset(48); return o != 0 ? 0!=__p.bb.Get(o + __p.bb_pos) : (bool)false; } } - public string TextureBoss { get { int o = __p.__offset(50); return o != 0 ? __p.__string(o + __p.bb_pos) : null; } } + public string CombatStyleTexturePath { get { int o = __p.__offset(48); return o != 0 ? __p.__string(o + __p.bb_pos) : null; } } #if ENABLE_SPAN_T - public Span GetTextureBossBytes() { return __p.__vector_as_span(50, 1); } + public Span GetCombatStyleTexturePathBytes() { return __p.__vector_as_span(48, 1); } #else - public ArraySegment? GetTextureBossBytes() { return __p.__vector_as_arraysegment(50); } + public ArraySegment? GetCombatStyleTexturePathBytes() { return __p.__vector_as_arraysegment(48); } #endif - public byte[] GetTextureBossArray() { return __p.__vector_as_array(50); } - public string TextureSkillCard(int j) { int o = __p.__offset(52); return o != 0 ? __p.__string(__p.__vector(o) + j * 4) : null; } - public int TextureSkillCardLength { get { int o = __p.__offset(52); return o != 0 ? __p.__vector_len(o) : 0; } } - public string InformationPacel { get { int o = __p.__offset(54); return o != 0 ? __p.__string(o + __p.bb_pos) : null; } } + public byte[] GetCombatStyleTexturePathArray() { return __p.__vector_as_array(48); } + public bool UseObjectHPBAR { get { int o = __p.__offset(50); return o != 0 ? 0!=__p.bb.Get(o + __p.bb_pos) : (bool)false; } } + public string TextureBoss { get { int o = __p.__offset(52); return o != 0 ? __p.__string(o + __p.bb_pos) : null; } } #if ENABLE_SPAN_T - public Span GetInformationPacelBytes() { return __p.__vector_as_span(54, 1); } + public Span GetTextureBossBytes() { return __p.__vector_as_span(52, 1); } #else - public ArraySegment? GetInformationPacelBytes() { return __p.__vector_as_arraysegment(54); } + public ArraySegment? GetTextureBossBytes() { return __p.__vector_as_arraysegment(52); } #endif - public byte[] GetInformationPacelArray() { return __p.__vector_as_array(54); } - public string AnimationSSR { get { int o = __p.__offset(56); return o != 0 ? __p.__string(o + __p.bb_pos) : null; } } + public byte[] GetTextureBossArray() { return __p.__vector_as_array(52); } + public string TextureSkillCard(int j) { int o = __p.__offset(54); return o != 0 ? __p.__string(__p.__vector(o) + j * 4) : null; } + public int TextureSkillCardLength { get { int o = __p.__offset(54); return o != 0 ? __p.__vector_len(o) : 0; } } + public string InformationPacel { get { int o = __p.__offset(56); return o != 0 ? __p.__string(o + __p.bb_pos) : null; } } #if ENABLE_SPAN_T - public Span GetAnimationSSRBytes() { return __p.__vector_as_span(56, 1); } + public Span GetInformationPacelBytes() { return __p.__vector_as_span(56, 1); } #else - public ArraySegment? GetAnimationSSRBytes() { return __p.__vector_as_arraysegment(56); } + public ArraySegment? GetInformationPacelBytes() { return __p.__vector_as_arraysegment(56); } #endif - public byte[] GetAnimationSSRArray() { return __p.__vector_as_array(56); } - public string EnterStrategyAnimationName { get { int o = __p.__offset(58); return o != 0 ? __p.__string(o + __p.bb_pos) : null; } } + public byte[] GetInformationPacelArray() { return __p.__vector_as_array(56); } + public string AnimationSSR { get { int o = __p.__offset(58); return o != 0 ? __p.__string(o + __p.bb_pos) : null; } } #if ENABLE_SPAN_T - public Span GetEnterStrategyAnimationNameBytes() { return __p.__vector_as_span(58, 1); } + public Span GetAnimationSSRBytes() { return __p.__vector_as_span(58, 1); } #else - public ArraySegment? GetEnterStrategyAnimationNameBytes() { return __p.__vector_as_arraysegment(58); } + public ArraySegment? GetAnimationSSRBytes() { return __p.__vector_as_arraysegment(58); } #endif - public byte[] GetEnterStrategyAnimationNameArray() { return __p.__vector_as_array(58); } - public bool AnimationValidator { get { int o = __p.__offset(60); return o != 0 ? 0!=__p.bb.Get(o + __p.bb_pos) : (bool)false; } } - public long CharacterVoiceGroupId { get { int o = __p.__offset(62); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } + public byte[] GetAnimationSSRArray() { return __p.__vector_as_array(58); } + public string EnterStrategyAnimationName { get { int o = __p.__offset(60); return o != 0 ? __p.__string(o + __p.bb_pos) : null; } } +#if ENABLE_SPAN_T + public Span GetEnterStrategyAnimationNameBytes() { return __p.__vector_as_span(60, 1); } +#else + public ArraySegment? GetEnterStrategyAnimationNameBytes() { return __p.__vector_as_arraysegment(60); } +#endif + public byte[] GetEnterStrategyAnimationNameArray() { return __p.__vector_as_array(60); } + public bool AnimationValidator { get { int o = __p.__offset(62); return o != 0 ? 0!=__p.bb.Get(o + __p.bb_pos) : (bool)false; } } + public long CharacterVoiceGroupId { get { int o = __p.__offset(64); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } + public bool ShowObjectHpStatus { get { int o = __p.__offset(66); return o != 0 ? 0!=__p.bb.Get(o + __p.bb_pos) : (bool)false; } } public static Offset CreateCostumeExcel(FlatBufferBuilder builder, long CostumeGroupId = 0, long CostumeUniqueId = 0, StringOffset DevNameOffset = default(StringOffset), - SCHALE.Common.FlatData.ProductionStep ProductionStep = SCHALE.Common.FlatData.ProductionStep.ToDo, + SCHALE.Common.FlatData.ProductionStep ProductionStep_ = SCHALE.Common.FlatData.ProductionStep.ToDo, bool IsDefault = false, bool CollectionVisible = false, StringOffset ReleaseDateOffset = default(StringOffset), StringOffset CollectionVisibleStartDateOffset = default(StringOffset), StringOffset CollectionVisibleEndDateOffset = default(StringOffset), - SCHALE.Common.FlatData.Rarity Rarity = SCHALE.Common.FlatData.Rarity.N, + SCHALE.Common.FlatData.Rarity Rarity_ = SCHALE.Common.FlatData.Rarity.N, long CharacterSkillListGroupId = 0, StringOffset SpineResourceNameOffset = default(StringOffset), StringOffset SpineResourceNameDioramaOffset = default(StringOffset), VectorOffset SpineResourceNameDioramaForFormConversionOffset = default(VectorOffset), - SCHALE.Common.FlatData.EntityMaterialType EntityMaterialType = SCHALE.Common.FlatData.EntityMaterialType.Wood, + SCHALE.Common.FlatData.EntityMaterialType EntityMaterialType_ = SCHALE.Common.FlatData.EntityMaterialType.Wood, StringOffset ModelPrefabNameOffset = default(StringOffset), StringOffset CafeModelPrefabNameOffset = default(StringOffset), StringOffset EchelonModelPrefabNameOffset = default(StringOffset), @@ -178,6 +186,7 @@ public struct CostumeExcel : IFlatbufferObject StringOffset TextureDirOffset = default(StringOffset), StringOffset CollectionTexturePathOffset = default(StringOffset), StringOffset CollectionBGTexturePathOffset = default(StringOffset), + StringOffset CombatStyleTexturePathOffset = default(StringOffset), bool UseObjectHPBAR = false, StringOffset TextureBossOffset = default(StringOffset), VectorOffset TextureSkillCardOffset = default(VectorOffset), @@ -185,8 +194,9 @@ public struct CostumeExcel : IFlatbufferObject StringOffset AnimationSSROffset = default(StringOffset), StringOffset EnterStrategyAnimationNameOffset = default(StringOffset), bool AnimationValidator = false, - long CharacterVoiceGroupId = 0) { - builder.StartTable(30); + long CharacterVoiceGroupId = 0, + bool ShowObjectHpStatus = false) { + builder.StartTable(32); CostumeExcel.AddCharacterVoiceGroupId(builder, CharacterVoiceGroupId); CostumeExcel.AddCharacterSkillListGroupId(builder, CharacterSkillListGroupId); CostumeExcel.AddCostumeUniqueId(builder, CostumeUniqueId); @@ -196,6 +206,7 @@ public struct CostumeExcel : IFlatbufferObject CostumeExcel.AddInformationPacel(builder, InformationPacelOffset); CostumeExcel.AddTextureSkillCard(builder, TextureSkillCardOffset); CostumeExcel.AddTextureBoss(builder, TextureBossOffset); + CostumeExcel.AddCombatStyleTexturePath(builder, CombatStyleTexturePathOffset); CostumeExcel.AddCollectionBGTexturePath(builder, CollectionBGTexturePathOffset); CostumeExcel.AddCollectionTexturePath(builder, CollectionTexturePathOffset); CostumeExcel.AddTextureDir(builder, TextureDirOffset); @@ -203,16 +214,17 @@ public struct CostumeExcel : IFlatbufferObject CostumeExcel.AddEchelonModelPrefabName(builder, EchelonModelPrefabNameOffset); CostumeExcel.AddCafeModelPrefabName(builder, CafeModelPrefabNameOffset); CostumeExcel.AddModelPrefabName(builder, ModelPrefabNameOffset); - CostumeExcel.AddEntityMaterialType(builder, EntityMaterialType); + CostumeExcel.AddEntityMaterialType_(builder, EntityMaterialType_); CostumeExcel.AddSpineResourceNameDioramaForFormConversion(builder, SpineResourceNameDioramaForFormConversionOffset); CostumeExcel.AddSpineResourceNameDiorama(builder, SpineResourceNameDioramaOffset); CostumeExcel.AddSpineResourceName(builder, SpineResourceNameOffset); - CostumeExcel.AddRarity(builder, Rarity); + CostumeExcel.AddRarity_(builder, Rarity_); CostumeExcel.AddCollectionVisibleEndDate(builder, CollectionVisibleEndDateOffset); CostumeExcel.AddCollectionVisibleStartDate(builder, CollectionVisibleStartDateOffset); CostumeExcel.AddReleaseDate(builder, ReleaseDateOffset); - CostumeExcel.AddProductionStep(builder, ProductionStep); + CostumeExcel.AddProductionStep_(builder, ProductionStep_); CostumeExcel.AddDevName(builder, DevNameOffset); + CostumeExcel.AddShowObjectHpStatus(builder, ShowObjectHpStatus); CostumeExcel.AddAnimationValidator(builder, AnimationValidator); CostumeExcel.AddUseObjectHPBAR(builder, UseObjectHPBAR); CostumeExcel.AddCollectionVisible(builder, CollectionVisible); @@ -220,17 +232,17 @@ public struct CostumeExcel : IFlatbufferObject return CostumeExcel.EndCostumeExcel(builder); } - public static void StartCostumeExcel(FlatBufferBuilder builder) { builder.StartTable(30); } + public static void StartCostumeExcel(FlatBufferBuilder builder) { builder.StartTable(32); } public static void AddCostumeGroupId(FlatBufferBuilder builder, long costumeGroupId) { builder.AddLong(0, costumeGroupId, 0); } public static void AddCostumeUniqueId(FlatBufferBuilder builder, long costumeUniqueId) { builder.AddLong(1, costumeUniqueId, 0); } public static void AddDevName(FlatBufferBuilder builder, StringOffset devNameOffset) { builder.AddOffset(2, devNameOffset.Value, 0); } - public static void AddProductionStep(FlatBufferBuilder builder, SCHALE.Common.FlatData.ProductionStep productionStep) { builder.AddInt(3, (int)productionStep, 0); } + public static void AddProductionStep_(FlatBufferBuilder builder, SCHALE.Common.FlatData.ProductionStep productionStep_) { builder.AddInt(3, (int)productionStep_, 0); } public static void AddIsDefault(FlatBufferBuilder builder, bool isDefault) { builder.AddBool(4, isDefault, false); } public static void AddCollectionVisible(FlatBufferBuilder builder, bool collectionVisible) { builder.AddBool(5, collectionVisible, false); } public static void AddReleaseDate(FlatBufferBuilder builder, StringOffset releaseDateOffset) { builder.AddOffset(6, releaseDateOffset.Value, 0); } public static void AddCollectionVisibleStartDate(FlatBufferBuilder builder, StringOffset collectionVisibleStartDateOffset) { builder.AddOffset(7, collectionVisibleStartDateOffset.Value, 0); } public static void AddCollectionVisibleEndDate(FlatBufferBuilder builder, StringOffset collectionVisibleEndDateOffset) { builder.AddOffset(8, collectionVisibleEndDateOffset.Value, 0); } - public static void AddRarity(FlatBufferBuilder builder, SCHALE.Common.FlatData.Rarity rarity) { builder.AddInt(9, (int)rarity, 0); } + public static void AddRarity_(FlatBufferBuilder builder, SCHALE.Common.FlatData.Rarity rarity_) { builder.AddInt(9, (int)rarity_, 0); } public static void AddCharacterSkillListGroupId(FlatBufferBuilder builder, long characterSkillListGroupId) { builder.AddLong(10, characterSkillListGroupId, 0); } public static void AddSpineResourceName(FlatBufferBuilder builder, StringOffset spineResourceNameOffset) { builder.AddOffset(11, spineResourceNameOffset.Value, 0); } public static void AddSpineResourceNameDiorama(FlatBufferBuilder builder, StringOffset spineResourceNameDioramaOffset) { builder.AddOffset(12, spineResourceNameDioramaOffset.Value, 0); } @@ -240,7 +252,7 @@ public struct CostumeExcel : IFlatbufferObject public static VectorOffset CreateSpineResourceNameDioramaForFormConversionVectorBlock(FlatBufferBuilder builder, ArraySegment data) { builder.StartVector(4, data.Count, 4); builder.Add(data); return builder.EndVector(); } public static VectorOffset CreateSpineResourceNameDioramaForFormConversionVectorBlock(FlatBufferBuilder builder, IntPtr dataPtr, int sizeInBytes) { builder.StartVector(1, sizeInBytes, 1); builder.Add(dataPtr, sizeInBytes); return builder.EndVector(); } public static void StartSpineResourceNameDioramaForFormConversionVector(FlatBufferBuilder builder, int numElems) { builder.StartVector(4, numElems, 4); } - public static void AddEntityMaterialType(FlatBufferBuilder builder, SCHALE.Common.FlatData.EntityMaterialType entityMaterialType) { builder.AddInt(14, (int)entityMaterialType, 0); } + public static void AddEntityMaterialType_(FlatBufferBuilder builder, SCHALE.Common.FlatData.EntityMaterialType entityMaterialType_) { builder.AddInt(14, (int)entityMaterialType_, 0); } public static void AddModelPrefabName(FlatBufferBuilder builder, StringOffset modelPrefabNameOffset) { builder.AddOffset(15, modelPrefabNameOffset.Value, 0); } public static void AddCafeModelPrefabName(FlatBufferBuilder builder, StringOffset cafeModelPrefabNameOffset) { builder.AddOffset(16, cafeModelPrefabNameOffset.Value, 0); } public static void AddEchelonModelPrefabName(FlatBufferBuilder builder, StringOffset echelonModelPrefabNameOffset) { builder.AddOffset(17, echelonModelPrefabNameOffset.Value, 0); } @@ -248,19 +260,21 @@ public struct CostumeExcel : IFlatbufferObject public static void AddTextureDir(FlatBufferBuilder builder, StringOffset textureDirOffset) { builder.AddOffset(19, textureDirOffset.Value, 0); } public static void AddCollectionTexturePath(FlatBufferBuilder builder, StringOffset collectionTexturePathOffset) { builder.AddOffset(20, collectionTexturePathOffset.Value, 0); } public static void AddCollectionBGTexturePath(FlatBufferBuilder builder, StringOffset collectionBGTexturePathOffset) { builder.AddOffset(21, collectionBGTexturePathOffset.Value, 0); } - public static void AddUseObjectHPBAR(FlatBufferBuilder builder, bool useObjectHPBAR) { builder.AddBool(22, useObjectHPBAR, false); } - public static void AddTextureBoss(FlatBufferBuilder builder, StringOffset textureBossOffset) { builder.AddOffset(23, textureBossOffset.Value, 0); } - public static void AddTextureSkillCard(FlatBufferBuilder builder, VectorOffset textureSkillCardOffset) { builder.AddOffset(24, textureSkillCardOffset.Value, 0); } + public static void AddCombatStyleTexturePath(FlatBufferBuilder builder, StringOffset combatStyleTexturePathOffset) { builder.AddOffset(22, combatStyleTexturePathOffset.Value, 0); } + public static void AddUseObjectHPBAR(FlatBufferBuilder builder, bool useObjectHPBAR) { builder.AddBool(23, useObjectHPBAR, false); } + public static void AddTextureBoss(FlatBufferBuilder builder, StringOffset textureBossOffset) { builder.AddOffset(24, textureBossOffset.Value, 0); } + public static void AddTextureSkillCard(FlatBufferBuilder builder, VectorOffset textureSkillCardOffset) { builder.AddOffset(25, textureSkillCardOffset.Value, 0); } public static VectorOffset CreateTextureSkillCardVector(FlatBufferBuilder builder, StringOffset[] data) { builder.StartVector(4, data.Length, 4); for (int i = data.Length - 1; i >= 0; i--) builder.AddOffset(data[i].Value); return builder.EndVector(); } public static VectorOffset CreateTextureSkillCardVectorBlock(FlatBufferBuilder builder, StringOffset[] data) { builder.StartVector(4, data.Length, 4); builder.Add(data); return builder.EndVector(); } public static VectorOffset CreateTextureSkillCardVectorBlock(FlatBufferBuilder builder, ArraySegment data) { builder.StartVector(4, data.Count, 4); builder.Add(data); return builder.EndVector(); } public static VectorOffset CreateTextureSkillCardVectorBlock(FlatBufferBuilder builder, IntPtr dataPtr, int sizeInBytes) { builder.StartVector(1, sizeInBytes, 1); builder.Add(dataPtr, sizeInBytes); return builder.EndVector(); } public static void StartTextureSkillCardVector(FlatBufferBuilder builder, int numElems) { builder.StartVector(4, numElems, 4); } - public static void AddInformationPacel(FlatBufferBuilder builder, StringOffset informationPacelOffset) { builder.AddOffset(25, informationPacelOffset.Value, 0); } - public static void AddAnimationSSR(FlatBufferBuilder builder, StringOffset animationSSROffset) { builder.AddOffset(26, animationSSROffset.Value, 0); } - public static void AddEnterStrategyAnimationName(FlatBufferBuilder builder, StringOffset enterStrategyAnimationNameOffset) { builder.AddOffset(27, enterStrategyAnimationNameOffset.Value, 0); } - public static void AddAnimationValidator(FlatBufferBuilder builder, bool animationValidator) { builder.AddBool(28, animationValidator, false); } - public static void AddCharacterVoiceGroupId(FlatBufferBuilder builder, long characterVoiceGroupId) { builder.AddLong(29, characterVoiceGroupId, 0); } + public static void AddInformationPacel(FlatBufferBuilder builder, StringOffset informationPacelOffset) { builder.AddOffset(26, informationPacelOffset.Value, 0); } + public static void AddAnimationSSR(FlatBufferBuilder builder, StringOffset animationSSROffset) { builder.AddOffset(27, animationSSROffset.Value, 0); } + public static void AddEnterStrategyAnimationName(FlatBufferBuilder builder, StringOffset enterStrategyAnimationNameOffset) { builder.AddOffset(28, enterStrategyAnimationNameOffset.Value, 0); } + public static void AddAnimationValidator(FlatBufferBuilder builder, bool animationValidator) { builder.AddBool(29, animationValidator, false); } + public static void AddCharacterVoiceGroupId(FlatBufferBuilder builder, long characterVoiceGroupId) { builder.AddLong(30, characterVoiceGroupId, 0); } + public static void AddShowObjectHpStatus(FlatBufferBuilder builder, bool showObjectHpStatus) { builder.AddBool(31, showObjectHpStatus, false); } public static Offset EndCostumeExcel(FlatBufferBuilder builder) { int o = builder.EndTable(); return new Offset(o); @@ -275,19 +289,19 @@ public struct CostumeExcel : IFlatbufferObject _o.CostumeGroupId = TableEncryptionService.Convert(this.CostumeGroupId, key); _o.CostumeUniqueId = TableEncryptionService.Convert(this.CostumeUniqueId, key); _o.DevName = TableEncryptionService.Convert(this.DevName, key); - _o.ProductionStep = TableEncryptionService.Convert(this.ProductionStep, key); + _o.ProductionStep_ = TableEncryptionService.Convert(this.ProductionStep_, key); _o.IsDefault = TableEncryptionService.Convert(this.IsDefault, key); _o.CollectionVisible = TableEncryptionService.Convert(this.CollectionVisible, key); _o.ReleaseDate = TableEncryptionService.Convert(this.ReleaseDate, key); _o.CollectionVisibleStartDate = TableEncryptionService.Convert(this.CollectionVisibleStartDate, key); _o.CollectionVisibleEndDate = TableEncryptionService.Convert(this.CollectionVisibleEndDate, key); - _o.Rarity = TableEncryptionService.Convert(this.Rarity, key); + _o.Rarity_ = TableEncryptionService.Convert(this.Rarity_, key); _o.CharacterSkillListGroupId = TableEncryptionService.Convert(this.CharacterSkillListGroupId, key); _o.SpineResourceName = TableEncryptionService.Convert(this.SpineResourceName, key); _o.SpineResourceNameDiorama = TableEncryptionService.Convert(this.SpineResourceNameDiorama, key); _o.SpineResourceNameDioramaForFormConversion = new List(); for (var _j = 0; _j < this.SpineResourceNameDioramaForFormConversionLength; ++_j) {_o.SpineResourceNameDioramaForFormConversion.Add(TableEncryptionService.Convert(this.SpineResourceNameDioramaForFormConversion(_j), key));} - _o.EntityMaterialType = TableEncryptionService.Convert(this.EntityMaterialType, key); + _o.EntityMaterialType_ = TableEncryptionService.Convert(this.EntityMaterialType_, key); _o.ModelPrefabName = TableEncryptionService.Convert(this.ModelPrefabName, key); _o.CafeModelPrefabName = TableEncryptionService.Convert(this.CafeModelPrefabName, key); _o.EchelonModelPrefabName = TableEncryptionService.Convert(this.EchelonModelPrefabName, key); @@ -295,6 +309,7 @@ public struct CostumeExcel : IFlatbufferObject _o.TextureDir = TableEncryptionService.Convert(this.TextureDir, key); _o.CollectionTexturePath = TableEncryptionService.Convert(this.CollectionTexturePath, key); _o.CollectionBGTexturePath = TableEncryptionService.Convert(this.CollectionBGTexturePath, key); + _o.CombatStyleTexturePath = TableEncryptionService.Convert(this.CombatStyleTexturePath, key); _o.UseObjectHPBAR = TableEncryptionService.Convert(this.UseObjectHPBAR, key); _o.TextureBoss = TableEncryptionService.Convert(this.TextureBoss, key); _o.TextureSkillCard = new List(); @@ -304,6 +319,7 @@ public struct CostumeExcel : IFlatbufferObject _o.EnterStrategyAnimationName = TableEncryptionService.Convert(this.EnterStrategyAnimationName, key); _o.AnimationValidator = TableEncryptionService.Convert(this.AnimationValidator, key); _o.CharacterVoiceGroupId = TableEncryptionService.Convert(this.CharacterVoiceGroupId, key); + _o.ShowObjectHpStatus = TableEncryptionService.Convert(this.ShowObjectHpStatus, key); } public static Offset Pack(FlatBufferBuilder builder, CostumeExcelT _o) { if (_o == null) return default(Offset); @@ -326,6 +342,7 @@ public struct CostumeExcel : IFlatbufferObject var _TextureDir = _o.TextureDir == null ? default(StringOffset) : builder.CreateString(_o.TextureDir); var _CollectionTexturePath = _o.CollectionTexturePath == null ? default(StringOffset) : builder.CreateString(_o.CollectionTexturePath); var _CollectionBGTexturePath = _o.CollectionBGTexturePath == null ? default(StringOffset) : builder.CreateString(_o.CollectionBGTexturePath); + var _CombatStyleTexturePath = _o.CombatStyleTexturePath == null ? default(StringOffset) : builder.CreateString(_o.CombatStyleTexturePath); var _TextureBoss = _o.TextureBoss == null ? default(StringOffset) : builder.CreateString(_o.TextureBoss); var _TextureSkillCard = default(VectorOffset); if (_o.TextureSkillCard != null) { @@ -341,18 +358,18 @@ public struct CostumeExcel : IFlatbufferObject _o.CostumeGroupId, _o.CostumeUniqueId, _DevName, - _o.ProductionStep, + _o.ProductionStep_, _o.IsDefault, _o.CollectionVisible, _ReleaseDate, _CollectionVisibleStartDate, _CollectionVisibleEndDate, - _o.Rarity, + _o.Rarity_, _o.CharacterSkillListGroupId, _SpineResourceName, _SpineResourceNameDiorama, _SpineResourceNameDioramaForFormConversion, - _o.EntityMaterialType, + _o.EntityMaterialType_, _ModelPrefabName, _CafeModelPrefabName, _EchelonModelPrefabName, @@ -360,6 +377,7 @@ public struct CostumeExcel : IFlatbufferObject _TextureDir, _CollectionTexturePath, _CollectionBGTexturePath, + _CombatStyleTexturePath, _o.UseObjectHPBAR, _TextureBoss, _TextureSkillCard, @@ -367,7 +385,8 @@ public struct CostumeExcel : IFlatbufferObject _AnimationSSR, _EnterStrategyAnimationName, _o.AnimationValidator, - _o.CharacterVoiceGroupId); + _o.CharacterVoiceGroupId, + _o.ShowObjectHpStatus); } } @@ -376,18 +395,18 @@ public class CostumeExcelT public long CostumeGroupId { get; set; } public long CostumeUniqueId { get; set; } public string DevName { get; set; } - public SCHALE.Common.FlatData.ProductionStep ProductionStep { get; set; } + public SCHALE.Common.FlatData.ProductionStep ProductionStep_ { get; set; } public bool IsDefault { get; set; } public bool CollectionVisible { get; set; } public string ReleaseDate { get; set; } public string CollectionVisibleStartDate { get; set; } public string CollectionVisibleEndDate { get; set; } - public SCHALE.Common.FlatData.Rarity Rarity { get; set; } + public SCHALE.Common.FlatData.Rarity Rarity_ { get; set; } public long CharacterSkillListGroupId { get; set; } public string SpineResourceName { get; set; } public string SpineResourceNameDiorama { get; set; } public List SpineResourceNameDioramaForFormConversion { get; set; } - public SCHALE.Common.FlatData.EntityMaterialType EntityMaterialType { get; set; } + public SCHALE.Common.FlatData.EntityMaterialType EntityMaterialType_ { get; set; } public string ModelPrefabName { get; set; } public string CafeModelPrefabName { get; set; } public string EchelonModelPrefabName { get; set; } @@ -395,6 +414,7 @@ public class CostumeExcelT public string TextureDir { get; set; } public string CollectionTexturePath { get; set; } public string CollectionBGTexturePath { get; set; } + public string CombatStyleTexturePath { get; set; } public bool UseObjectHPBAR { get; set; } public string TextureBoss { get; set; } public List TextureSkillCard { get; set; } @@ -403,23 +423,24 @@ public class CostumeExcelT public string EnterStrategyAnimationName { get; set; } public bool AnimationValidator { get; set; } public long CharacterVoiceGroupId { get; set; } + public bool ShowObjectHpStatus { get; set; } public CostumeExcelT() { this.CostumeGroupId = 0; this.CostumeUniqueId = 0; this.DevName = null; - this.ProductionStep = SCHALE.Common.FlatData.ProductionStep.ToDo; + this.ProductionStep_ = SCHALE.Common.FlatData.ProductionStep.ToDo; this.IsDefault = false; this.CollectionVisible = false; this.ReleaseDate = null; this.CollectionVisibleStartDate = null; this.CollectionVisibleEndDate = null; - this.Rarity = SCHALE.Common.FlatData.Rarity.N; + this.Rarity_ = SCHALE.Common.FlatData.Rarity.N; this.CharacterSkillListGroupId = 0; this.SpineResourceName = null; this.SpineResourceNameDiorama = null; this.SpineResourceNameDioramaForFormConversion = null; - this.EntityMaterialType = SCHALE.Common.FlatData.EntityMaterialType.Wood; + this.EntityMaterialType_ = SCHALE.Common.FlatData.EntityMaterialType.Wood; this.ModelPrefabName = null; this.CafeModelPrefabName = null; this.EchelonModelPrefabName = null; @@ -427,6 +448,7 @@ public class CostumeExcelT this.TextureDir = null; this.CollectionTexturePath = null; this.CollectionBGTexturePath = null; + this.CombatStyleTexturePath = null; this.UseObjectHPBAR = false; this.TextureBoss = null; this.TextureSkillCard = null; @@ -435,6 +457,7 @@ public class CostumeExcelT this.EnterStrategyAnimationName = null; this.AnimationValidator = false; this.CharacterVoiceGroupId = 0; + this.ShowObjectHpStatus = false; } } @@ -447,18 +470,18 @@ static public class CostumeExcelVerify && verifier.VerifyField(tablePos, 4 /*CostumeGroupId*/, 8 /*long*/, 8, false) && verifier.VerifyField(tablePos, 6 /*CostumeUniqueId*/, 8 /*long*/, 8, false) && verifier.VerifyString(tablePos, 8 /*DevName*/, false) - && verifier.VerifyField(tablePos, 10 /*ProductionStep*/, 4 /*SCHALE.Common.FlatData.ProductionStep*/, 4, false) + && verifier.VerifyField(tablePos, 10 /*ProductionStep_*/, 4 /*SCHALE.Common.FlatData.ProductionStep*/, 4, false) && verifier.VerifyField(tablePos, 12 /*IsDefault*/, 1 /*bool*/, 1, false) && verifier.VerifyField(tablePos, 14 /*CollectionVisible*/, 1 /*bool*/, 1, false) && verifier.VerifyString(tablePos, 16 /*ReleaseDate*/, false) && verifier.VerifyString(tablePos, 18 /*CollectionVisibleStartDate*/, false) && verifier.VerifyString(tablePos, 20 /*CollectionVisibleEndDate*/, false) - && verifier.VerifyField(tablePos, 22 /*Rarity*/, 4 /*SCHALE.Common.FlatData.Rarity*/, 4, false) + && verifier.VerifyField(tablePos, 22 /*Rarity_*/, 4 /*SCHALE.Common.FlatData.Rarity*/, 4, false) && verifier.VerifyField(tablePos, 24 /*CharacterSkillListGroupId*/, 8 /*long*/, 8, false) && verifier.VerifyString(tablePos, 26 /*SpineResourceName*/, false) && verifier.VerifyString(tablePos, 28 /*SpineResourceNameDiorama*/, false) && verifier.VerifyVectorOfStrings(tablePos, 30 /*SpineResourceNameDioramaForFormConversion*/, false) - && verifier.VerifyField(tablePos, 32 /*EntityMaterialType*/, 4 /*SCHALE.Common.FlatData.EntityMaterialType*/, 4, false) + && verifier.VerifyField(tablePos, 32 /*EntityMaterialType_*/, 4 /*SCHALE.Common.FlatData.EntityMaterialType*/, 4, false) && verifier.VerifyString(tablePos, 34 /*ModelPrefabName*/, false) && verifier.VerifyString(tablePos, 36 /*CafeModelPrefabName*/, false) && verifier.VerifyString(tablePos, 38 /*EchelonModelPrefabName*/, false) @@ -466,14 +489,16 @@ static public class CostumeExcelVerify && verifier.VerifyString(tablePos, 42 /*TextureDir*/, false) && verifier.VerifyString(tablePos, 44 /*CollectionTexturePath*/, false) && verifier.VerifyString(tablePos, 46 /*CollectionBGTexturePath*/, false) - && verifier.VerifyField(tablePos, 48 /*UseObjectHPBAR*/, 1 /*bool*/, 1, false) - && verifier.VerifyString(tablePos, 50 /*TextureBoss*/, false) - && verifier.VerifyVectorOfStrings(tablePos, 52 /*TextureSkillCard*/, false) - && verifier.VerifyString(tablePos, 54 /*InformationPacel*/, false) - && verifier.VerifyString(tablePos, 56 /*AnimationSSR*/, false) - && verifier.VerifyString(tablePos, 58 /*EnterStrategyAnimationName*/, false) - && verifier.VerifyField(tablePos, 60 /*AnimationValidator*/, 1 /*bool*/, 1, false) - && verifier.VerifyField(tablePos, 62 /*CharacterVoiceGroupId*/, 8 /*long*/, 8, false) + && verifier.VerifyString(tablePos, 48 /*CombatStyleTexturePath*/, false) + && verifier.VerifyField(tablePos, 50 /*UseObjectHPBAR*/, 1 /*bool*/, 1, false) + && verifier.VerifyString(tablePos, 52 /*TextureBoss*/, false) + && verifier.VerifyVectorOfStrings(tablePos, 54 /*TextureSkillCard*/, false) + && verifier.VerifyString(tablePos, 56 /*InformationPacel*/, false) + && verifier.VerifyString(tablePos, 58 /*AnimationSSR*/, false) + && verifier.VerifyString(tablePos, 60 /*EnterStrategyAnimationName*/, false) + && verifier.VerifyField(tablePos, 62 /*AnimationValidator*/, 1 /*bool*/, 1, false) + && verifier.VerifyField(tablePos, 64 /*CharacterVoiceGroupId*/, 8 /*long*/, 8, false) + && verifier.VerifyField(tablePos, 66 /*ShowObjectHpStatus*/, 1 /*bool*/, 1, false) && verifier.VerifyTableEnd(tablePos); } } diff --git a/SCHALE.Common/FlatData/CouponStuffExcel.cs b/SCHALE.Common/FlatData/CouponStuffExcel.cs index 70d6a5f..3630925 100644 --- a/SCHALE.Common/FlatData/CouponStuffExcel.cs +++ b/SCHALE.Common/FlatData/CouponStuffExcel.cs @@ -21,7 +21,7 @@ public struct CouponStuffExcel : IFlatbufferObject public CouponStuffExcel __assign(int _i, ByteBuffer _bb) { __init(_i, _bb); return this; } public long StuffId { get { int o = __p.__offset(4); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } - public SCHALE.Common.FlatData.ParcelType ParcelType { get { int o = __p.__offset(6); return o != 0 ? (SCHALE.Common.FlatData.ParcelType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.ParcelType.None; } } + public SCHALE.Common.FlatData.ParcelType ParcelType_ { get { int o = __p.__offset(6); return o != 0 ? (SCHALE.Common.FlatData.ParcelType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.ParcelType.None; } } public long ParcelId { get { int o = __p.__offset(8); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public int LimitAmount { get { int o = __p.__offset(10); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } public string CouponStuffNameLocalizeKey { get { int o = __p.__offset(12); return o != 0 ? __p.__string(o + __p.bb_pos) : null; } } @@ -34,7 +34,7 @@ public struct CouponStuffExcel : IFlatbufferObject public static Offset CreateCouponStuffExcel(FlatBufferBuilder builder, long StuffId = 0, - SCHALE.Common.FlatData.ParcelType ParcelType = SCHALE.Common.FlatData.ParcelType.None, + SCHALE.Common.FlatData.ParcelType ParcelType_ = SCHALE.Common.FlatData.ParcelType.None, long ParcelId = 0, int LimitAmount = 0, StringOffset CouponStuffNameLocalizeKeyOffset = default(StringOffset)) { @@ -43,13 +43,13 @@ public struct CouponStuffExcel : IFlatbufferObject CouponStuffExcel.AddStuffId(builder, StuffId); CouponStuffExcel.AddCouponStuffNameLocalizeKey(builder, CouponStuffNameLocalizeKeyOffset); CouponStuffExcel.AddLimitAmount(builder, LimitAmount); - CouponStuffExcel.AddParcelType(builder, ParcelType); + CouponStuffExcel.AddParcelType_(builder, ParcelType_); return CouponStuffExcel.EndCouponStuffExcel(builder); } public static void StartCouponStuffExcel(FlatBufferBuilder builder) { builder.StartTable(5); } public static void AddStuffId(FlatBufferBuilder builder, long stuffId) { builder.AddLong(0, stuffId, 0); } - public static void AddParcelType(FlatBufferBuilder builder, SCHALE.Common.FlatData.ParcelType parcelType) { builder.AddInt(1, (int)parcelType, 0); } + public static void AddParcelType_(FlatBufferBuilder builder, SCHALE.Common.FlatData.ParcelType parcelType_) { builder.AddInt(1, (int)parcelType_, 0); } public static void AddParcelId(FlatBufferBuilder builder, long parcelId) { builder.AddLong(2, parcelId, 0); } public static void AddLimitAmount(FlatBufferBuilder builder, int limitAmount) { builder.AddInt(3, limitAmount, 0); } public static void AddCouponStuffNameLocalizeKey(FlatBufferBuilder builder, StringOffset couponStuffNameLocalizeKeyOffset) { builder.AddOffset(4, couponStuffNameLocalizeKeyOffset.Value, 0); } @@ -65,7 +65,7 @@ public struct CouponStuffExcel : IFlatbufferObject public void UnPackTo(CouponStuffExcelT _o) { byte[] key = TableEncryptionService.CreateKey("CouponStuff"); _o.StuffId = TableEncryptionService.Convert(this.StuffId, key); - _o.ParcelType = TableEncryptionService.Convert(this.ParcelType, key); + _o.ParcelType_ = TableEncryptionService.Convert(this.ParcelType_, key); _o.ParcelId = TableEncryptionService.Convert(this.ParcelId, key); _o.LimitAmount = TableEncryptionService.Convert(this.LimitAmount, key); _o.CouponStuffNameLocalizeKey = TableEncryptionService.Convert(this.CouponStuffNameLocalizeKey, key); @@ -76,7 +76,7 @@ public struct CouponStuffExcel : IFlatbufferObject return CreateCouponStuffExcel( builder, _o.StuffId, - _o.ParcelType, + _o.ParcelType_, _o.ParcelId, _o.LimitAmount, _CouponStuffNameLocalizeKey); @@ -86,14 +86,14 @@ public struct CouponStuffExcel : IFlatbufferObject public class CouponStuffExcelT { public long StuffId { get; set; } - public SCHALE.Common.FlatData.ParcelType ParcelType { get; set; } + public SCHALE.Common.FlatData.ParcelType ParcelType_ { get; set; } public long ParcelId { get; set; } public int LimitAmount { get; set; } public string CouponStuffNameLocalizeKey { get; set; } public CouponStuffExcelT() { this.StuffId = 0; - this.ParcelType = SCHALE.Common.FlatData.ParcelType.None; + this.ParcelType_ = SCHALE.Common.FlatData.ParcelType.None; this.ParcelId = 0; this.LimitAmount = 0; this.CouponStuffNameLocalizeKey = null; @@ -107,7 +107,7 @@ static public class CouponStuffExcelVerify { return verifier.VerifyTableStart(tablePos) && verifier.VerifyField(tablePos, 4 /*StuffId*/, 8 /*long*/, 8, false) - && verifier.VerifyField(tablePos, 6 /*ParcelType*/, 4 /*SCHALE.Common.FlatData.ParcelType*/, 4, false) + && verifier.VerifyField(tablePos, 6 /*ParcelType_*/, 4 /*SCHALE.Common.FlatData.ParcelType*/, 4, false) && verifier.VerifyField(tablePos, 8 /*ParcelId*/, 8 /*long*/, 8, false) && verifier.VerifyField(tablePos, 10 /*LimitAmount*/, 4 /*int*/, 4, false) && verifier.VerifyString(tablePos, 12 /*CouponStuffNameLocalizeKey*/, false) diff --git a/SCHALE.Common/FlatData/CurrencyExcel.cs b/SCHALE.Common/FlatData/CurrencyExcel.cs index 37ddba3..fc6fa8e 100644 --- a/SCHALE.Common/FlatData/CurrencyExcel.cs +++ b/SCHALE.Common/FlatData/CurrencyExcel.cs @@ -37,11 +37,11 @@ public struct CurrencyExcel : IFlatbufferObject public ArraySegment? GetIconBytes() { return __p.__vector_as_arraysegment(12); } #endif public byte[] GetIconArray() { return __p.__vector_as_array(12); } - public SCHALE.Common.FlatData.Rarity Rarity { get { int o = __p.__offset(14); return o != 0 ? (SCHALE.Common.FlatData.Rarity)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.Rarity.N; } } + public SCHALE.Common.FlatData.Rarity Rarity_ { get { int o = __p.__offset(14); return o != 0 ? (SCHALE.Common.FlatData.Rarity)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.Rarity.N; } } public int AutoChargeMsc { get { int o = __p.__offset(16); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } public int AutoChargeAmount { get { int o = __p.__offset(18); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } - public SCHALE.Common.FlatData.CurrencyOverChargeType CurrencyOverChargeType { get { int o = __p.__offset(20); return o != 0 ? (SCHALE.Common.FlatData.CurrencyOverChargeType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.CurrencyOverChargeType.CanNotCharge; } } - public SCHALE.Common.FlatData.CurrencyAdditionalChargeType CurrencyAdditionalChargeType { get { int o = __p.__offset(22); return o != 0 ? (SCHALE.Common.FlatData.CurrencyAdditionalChargeType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.CurrencyAdditionalChargeType.EnableAutoChargeOverLimit; } } + public SCHALE.Common.FlatData.CurrencyOverChargeType CurrencyOverChargeType_ { get { int o = __p.__offset(20); return o != 0 ? (SCHALE.Common.FlatData.CurrencyOverChargeType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.CurrencyOverChargeType.CanNotCharge; } } + public SCHALE.Common.FlatData.CurrencyAdditionalChargeType CurrencyAdditionalChargeType_ { get { int o = __p.__offset(22); return o != 0 ? (SCHALE.Common.FlatData.CurrencyAdditionalChargeType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.CurrencyAdditionalChargeType.EnableAutoChargeOverLimit; } } public long ChargeLimit { get { int o = __p.__offset(24); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public long OverChargeLimit { get { int o = __p.__offset(26); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public string SpriteName { get { int o = __p.__offset(28); return o != 0 ? __p.__string(o + __p.bb_pos) : null; } } @@ -51,7 +51,7 @@ public struct CurrencyExcel : IFlatbufferObject public ArraySegment? GetSpriteNameBytes() { return __p.__vector_as_arraysegment(28); } #endif public byte[] GetSpriteNameArray() { return __p.__vector_as_array(28); } - public SCHALE.Common.FlatData.DailyRefillType DailyRefillType { get { int o = __p.__offset(30); return o != 0 ? (SCHALE.Common.FlatData.DailyRefillType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.DailyRefillType.None; } } + public SCHALE.Common.FlatData.DailyRefillType DailyRefillType_ { get { int o = __p.__offset(30); return o != 0 ? (SCHALE.Common.FlatData.DailyRefillType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.DailyRefillType.None; } } public long DailyRefillAmount { get { int o = __p.__offset(32); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public long DailyRefillTime(int j) { int o = __p.__offset(34); return o != 0 ? __p.bb.GetLong(__p.__vector(o) + j * 8) : (long)0; } public int DailyRefillTimeLength { get { int o = __p.__offset(34); return o != 0 ? __p.__vector_len(o) : 0; } } @@ -61,6 +61,17 @@ public struct CurrencyExcel : IFlatbufferObject public ArraySegment? GetDailyRefillTimeBytes() { return __p.__vector_as_arraysegment(34); } #endif public long[] GetDailyRefillTimeArray() { return __p.__vector_as_array(34); } + public string ExpirationDateTime { get { int o = __p.__offset(36); return o != 0 ? __p.__string(o + __p.bb_pos) : null; } } +#if ENABLE_SPAN_T + public Span GetExpirationDateTimeBytes() { return __p.__vector_as_span(36, 1); } +#else + public ArraySegment? GetExpirationDateTimeBytes() { return __p.__vector_as_arraysegment(36); } +#endif + public byte[] GetExpirationDateTimeArray() { return __p.__vector_as_array(36); } + public int ExpirationNotifyDateIn { get { int o = __p.__offset(38); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } + public SCHALE.Common.FlatData.ParcelType ExpiryChangeParcelType { get { int o = __p.__offset(40); return o != 0 ? (SCHALE.Common.FlatData.ParcelType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.ParcelType.None; } } + public long ExpiryChangeId { get { int o = __p.__offset(42); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } + public long ExpiryChangeAmount { get { int o = __p.__offset(44); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public static Offset CreateCurrencyExcel(FlatBufferBuilder builder, long ID = 0, @@ -68,30 +79,40 @@ public struct CurrencyExcel : IFlatbufferObject SCHALE.Common.FlatData.CurrencyTypes CurrencyType = SCHALE.Common.FlatData.CurrencyTypes.Invalid, StringOffset CurrencyNameOffset = default(StringOffset), StringOffset IconOffset = default(StringOffset), - SCHALE.Common.FlatData.Rarity Rarity = SCHALE.Common.FlatData.Rarity.N, + SCHALE.Common.FlatData.Rarity Rarity_ = SCHALE.Common.FlatData.Rarity.N, int AutoChargeMsc = 0, int AutoChargeAmount = 0, - SCHALE.Common.FlatData.CurrencyOverChargeType CurrencyOverChargeType = SCHALE.Common.FlatData.CurrencyOverChargeType.CanNotCharge, - SCHALE.Common.FlatData.CurrencyAdditionalChargeType CurrencyAdditionalChargeType = SCHALE.Common.FlatData.CurrencyAdditionalChargeType.EnableAutoChargeOverLimit, + SCHALE.Common.FlatData.CurrencyOverChargeType CurrencyOverChargeType_ = SCHALE.Common.FlatData.CurrencyOverChargeType.CanNotCharge, + SCHALE.Common.FlatData.CurrencyAdditionalChargeType CurrencyAdditionalChargeType_ = SCHALE.Common.FlatData.CurrencyAdditionalChargeType.EnableAutoChargeOverLimit, long ChargeLimit = 0, long OverChargeLimit = 0, StringOffset SpriteNameOffset = default(StringOffset), - SCHALE.Common.FlatData.DailyRefillType DailyRefillType = SCHALE.Common.FlatData.DailyRefillType.None, + SCHALE.Common.FlatData.DailyRefillType DailyRefillType_ = SCHALE.Common.FlatData.DailyRefillType.None, long DailyRefillAmount = 0, - VectorOffset DailyRefillTimeOffset = default(VectorOffset)) { - builder.StartTable(16); + VectorOffset DailyRefillTimeOffset = default(VectorOffset), + StringOffset ExpirationDateTimeOffset = default(StringOffset), + int ExpirationNotifyDateIn = 0, + SCHALE.Common.FlatData.ParcelType ExpiryChangeParcelType = SCHALE.Common.FlatData.ParcelType.None, + long ExpiryChangeId = 0, + long ExpiryChangeAmount = 0) { + builder.StartTable(21); + CurrencyExcel.AddExpiryChangeAmount(builder, ExpiryChangeAmount); + CurrencyExcel.AddExpiryChangeId(builder, ExpiryChangeId); CurrencyExcel.AddDailyRefillAmount(builder, DailyRefillAmount); CurrencyExcel.AddOverChargeLimit(builder, OverChargeLimit); CurrencyExcel.AddChargeLimit(builder, ChargeLimit); CurrencyExcel.AddID(builder, ID); + CurrencyExcel.AddExpiryChangeParcelType(builder, ExpiryChangeParcelType); + CurrencyExcel.AddExpirationNotifyDateIn(builder, ExpirationNotifyDateIn); + CurrencyExcel.AddExpirationDateTime(builder, ExpirationDateTimeOffset); CurrencyExcel.AddDailyRefillTime(builder, DailyRefillTimeOffset); - CurrencyExcel.AddDailyRefillType(builder, DailyRefillType); + CurrencyExcel.AddDailyRefillType_(builder, DailyRefillType_); CurrencyExcel.AddSpriteName(builder, SpriteNameOffset); - CurrencyExcel.AddCurrencyAdditionalChargeType(builder, CurrencyAdditionalChargeType); - CurrencyExcel.AddCurrencyOverChargeType(builder, CurrencyOverChargeType); + CurrencyExcel.AddCurrencyAdditionalChargeType_(builder, CurrencyAdditionalChargeType_); + CurrencyExcel.AddCurrencyOverChargeType_(builder, CurrencyOverChargeType_); CurrencyExcel.AddAutoChargeAmount(builder, AutoChargeAmount); CurrencyExcel.AddAutoChargeMsc(builder, AutoChargeMsc); - CurrencyExcel.AddRarity(builder, Rarity); + CurrencyExcel.AddRarity_(builder, Rarity_); CurrencyExcel.AddIcon(builder, IconOffset); CurrencyExcel.AddCurrencyName(builder, CurrencyNameOffset); CurrencyExcel.AddCurrencyType(builder, CurrencyType); @@ -99,21 +120,21 @@ public struct CurrencyExcel : IFlatbufferObject return CurrencyExcel.EndCurrencyExcel(builder); } - public static void StartCurrencyExcel(FlatBufferBuilder builder) { builder.StartTable(16); } + public static void StartCurrencyExcel(FlatBufferBuilder builder) { builder.StartTable(21); } public static void AddID(FlatBufferBuilder builder, long iD) { builder.AddLong(0, iD, 0); } public static void AddLocalizeEtcId(FlatBufferBuilder builder, uint localizeEtcId) { builder.AddUint(1, localizeEtcId, 0); } public static void AddCurrencyType(FlatBufferBuilder builder, SCHALE.Common.FlatData.CurrencyTypes currencyType) { builder.AddInt(2, (int)currencyType, 0); } public static void AddCurrencyName(FlatBufferBuilder builder, StringOffset currencyNameOffset) { builder.AddOffset(3, currencyNameOffset.Value, 0); } public static void AddIcon(FlatBufferBuilder builder, StringOffset iconOffset) { builder.AddOffset(4, iconOffset.Value, 0); } - public static void AddRarity(FlatBufferBuilder builder, SCHALE.Common.FlatData.Rarity rarity) { builder.AddInt(5, (int)rarity, 0); } + public static void AddRarity_(FlatBufferBuilder builder, SCHALE.Common.FlatData.Rarity rarity_) { builder.AddInt(5, (int)rarity_, 0); } public static void AddAutoChargeMsc(FlatBufferBuilder builder, int autoChargeMsc) { builder.AddInt(6, autoChargeMsc, 0); } public static void AddAutoChargeAmount(FlatBufferBuilder builder, int autoChargeAmount) { builder.AddInt(7, autoChargeAmount, 0); } - public static void AddCurrencyOverChargeType(FlatBufferBuilder builder, SCHALE.Common.FlatData.CurrencyOverChargeType currencyOverChargeType) { builder.AddInt(8, (int)currencyOverChargeType, 0); } - public static void AddCurrencyAdditionalChargeType(FlatBufferBuilder builder, SCHALE.Common.FlatData.CurrencyAdditionalChargeType currencyAdditionalChargeType) { builder.AddInt(9, (int)currencyAdditionalChargeType, 0); } + public static void AddCurrencyOverChargeType_(FlatBufferBuilder builder, SCHALE.Common.FlatData.CurrencyOverChargeType currencyOverChargeType_) { builder.AddInt(8, (int)currencyOverChargeType_, 0); } + public static void AddCurrencyAdditionalChargeType_(FlatBufferBuilder builder, SCHALE.Common.FlatData.CurrencyAdditionalChargeType currencyAdditionalChargeType_) { builder.AddInt(9, (int)currencyAdditionalChargeType_, 0); } public static void AddChargeLimit(FlatBufferBuilder builder, long chargeLimit) { builder.AddLong(10, chargeLimit, 0); } public static void AddOverChargeLimit(FlatBufferBuilder builder, long overChargeLimit) { builder.AddLong(11, overChargeLimit, 0); } public static void AddSpriteName(FlatBufferBuilder builder, StringOffset spriteNameOffset) { builder.AddOffset(12, spriteNameOffset.Value, 0); } - public static void AddDailyRefillType(FlatBufferBuilder builder, SCHALE.Common.FlatData.DailyRefillType dailyRefillType) { builder.AddInt(13, (int)dailyRefillType, 0); } + public static void AddDailyRefillType_(FlatBufferBuilder builder, SCHALE.Common.FlatData.DailyRefillType dailyRefillType_) { builder.AddInt(13, (int)dailyRefillType_, 0); } public static void AddDailyRefillAmount(FlatBufferBuilder builder, long dailyRefillAmount) { builder.AddLong(14, dailyRefillAmount, 0); } public static void AddDailyRefillTime(FlatBufferBuilder builder, VectorOffset dailyRefillTimeOffset) { builder.AddOffset(15, dailyRefillTimeOffset.Value, 0); } public static VectorOffset CreateDailyRefillTimeVector(FlatBufferBuilder builder, long[] data) { builder.StartVector(8, data.Length, 8); for (int i = data.Length - 1; i >= 0; i--) builder.AddLong(data[i]); return builder.EndVector(); } @@ -121,6 +142,11 @@ public struct CurrencyExcel : IFlatbufferObject public static VectorOffset CreateDailyRefillTimeVectorBlock(FlatBufferBuilder builder, ArraySegment data) { builder.StartVector(8, data.Count, 8); builder.Add(data); return builder.EndVector(); } public static VectorOffset CreateDailyRefillTimeVectorBlock(FlatBufferBuilder builder, IntPtr dataPtr, int sizeInBytes) { builder.StartVector(1, sizeInBytes, 1); builder.Add(dataPtr, sizeInBytes); return builder.EndVector(); } public static void StartDailyRefillTimeVector(FlatBufferBuilder builder, int numElems) { builder.StartVector(8, numElems, 8); } + public static void AddExpirationDateTime(FlatBufferBuilder builder, StringOffset expirationDateTimeOffset) { builder.AddOffset(16, expirationDateTimeOffset.Value, 0); } + public static void AddExpirationNotifyDateIn(FlatBufferBuilder builder, int expirationNotifyDateIn) { builder.AddInt(17, expirationNotifyDateIn, 0); } + public static void AddExpiryChangeParcelType(FlatBufferBuilder builder, SCHALE.Common.FlatData.ParcelType expiryChangeParcelType) { builder.AddInt(18, (int)expiryChangeParcelType, 0); } + public static void AddExpiryChangeId(FlatBufferBuilder builder, long expiryChangeId) { builder.AddLong(19, expiryChangeId, 0); } + public static void AddExpiryChangeAmount(FlatBufferBuilder builder, long expiryChangeAmount) { builder.AddLong(20, expiryChangeAmount, 0); } public static Offset EndCurrencyExcel(FlatBufferBuilder builder) { int o = builder.EndTable(); return new Offset(o); @@ -137,18 +163,23 @@ public struct CurrencyExcel : IFlatbufferObject _o.CurrencyType = TableEncryptionService.Convert(this.CurrencyType, key); _o.CurrencyName = TableEncryptionService.Convert(this.CurrencyName, key); _o.Icon = TableEncryptionService.Convert(this.Icon, key); - _o.Rarity = TableEncryptionService.Convert(this.Rarity, key); + _o.Rarity_ = TableEncryptionService.Convert(this.Rarity_, key); _o.AutoChargeMsc = TableEncryptionService.Convert(this.AutoChargeMsc, key); _o.AutoChargeAmount = TableEncryptionService.Convert(this.AutoChargeAmount, key); - _o.CurrencyOverChargeType = TableEncryptionService.Convert(this.CurrencyOverChargeType, key); - _o.CurrencyAdditionalChargeType = TableEncryptionService.Convert(this.CurrencyAdditionalChargeType, key); + _o.CurrencyOverChargeType_ = TableEncryptionService.Convert(this.CurrencyOverChargeType_, key); + _o.CurrencyAdditionalChargeType_ = TableEncryptionService.Convert(this.CurrencyAdditionalChargeType_, key); _o.ChargeLimit = TableEncryptionService.Convert(this.ChargeLimit, key); _o.OverChargeLimit = TableEncryptionService.Convert(this.OverChargeLimit, key); _o.SpriteName = TableEncryptionService.Convert(this.SpriteName, key); - _o.DailyRefillType = TableEncryptionService.Convert(this.DailyRefillType, key); + _o.DailyRefillType_ = TableEncryptionService.Convert(this.DailyRefillType_, key); _o.DailyRefillAmount = TableEncryptionService.Convert(this.DailyRefillAmount, key); _o.DailyRefillTime = new List(); for (var _j = 0; _j < this.DailyRefillTimeLength; ++_j) {_o.DailyRefillTime.Add(TableEncryptionService.Convert(this.DailyRefillTime(_j), key));} + _o.ExpirationDateTime = TableEncryptionService.Convert(this.ExpirationDateTime, key); + _o.ExpirationNotifyDateIn = TableEncryptionService.Convert(this.ExpirationNotifyDateIn, key); + _o.ExpiryChangeParcelType = TableEncryptionService.Convert(this.ExpiryChangeParcelType, key); + _o.ExpiryChangeId = TableEncryptionService.Convert(this.ExpiryChangeId, key); + _o.ExpiryChangeAmount = TableEncryptionService.Convert(this.ExpiryChangeAmount, key); } public static Offset Pack(FlatBufferBuilder builder, CurrencyExcelT _o) { if (_o == null) return default(Offset); @@ -160,6 +191,7 @@ public struct CurrencyExcel : IFlatbufferObject var __DailyRefillTime = _o.DailyRefillTime.ToArray(); _DailyRefillTime = CreateDailyRefillTimeVector(builder, __DailyRefillTime); } + var _ExpirationDateTime = _o.ExpirationDateTime == null ? default(StringOffset) : builder.CreateString(_o.ExpirationDateTime); return CreateCurrencyExcel( builder, _o.ID, @@ -167,17 +199,22 @@ public struct CurrencyExcel : IFlatbufferObject _o.CurrencyType, _CurrencyName, _Icon, - _o.Rarity, + _o.Rarity_, _o.AutoChargeMsc, _o.AutoChargeAmount, - _o.CurrencyOverChargeType, - _o.CurrencyAdditionalChargeType, + _o.CurrencyOverChargeType_, + _o.CurrencyAdditionalChargeType_, _o.ChargeLimit, _o.OverChargeLimit, _SpriteName, - _o.DailyRefillType, + _o.DailyRefillType_, _o.DailyRefillAmount, - _DailyRefillTime); + _DailyRefillTime, + _ExpirationDateTime, + _o.ExpirationNotifyDateIn, + _o.ExpiryChangeParcelType, + _o.ExpiryChangeId, + _o.ExpiryChangeAmount); } } @@ -188,17 +225,22 @@ public class CurrencyExcelT public SCHALE.Common.FlatData.CurrencyTypes CurrencyType { get; set; } public string CurrencyName { get; set; } public string Icon { get; set; } - public SCHALE.Common.FlatData.Rarity Rarity { get; set; } + public SCHALE.Common.FlatData.Rarity Rarity_ { get; set; } public int AutoChargeMsc { get; set; } public int AutoChargeAmount { get; set; } - public SCHALE.Common.FlatData.CurrencyOverChargeType CurrencyOverChargeType { get; set; } - public SCHALE.Common.FlatData.CurrencyAdditionalChargeType CurrencyAdditionalChargeType { get; set; } + public SCHALE.Common.FlatData.CurrencyOverChargeType CurrencyOverChargeType_ { get; set; } + public SCHALE.Common.FlatData.CurrencyAdditionalChargeType CurrencyAdditionalChargeType_ { get; set; } public long ChargeLimit { get; set; } public long OverChargeLimit { get; set; } public string SpriteName { get; set; } - public SCHALE.Common.FlatData.DailyRefillType DailyRefillType { get; set; } + public SCHALE.Common.FlatData.DailyRefillType DailyRefillType_ { get; set; } public long DailyRefillAmount { get; set; } public List DailyRefillTime { get; set; } + public string ExpirationDateTime { get; set; } + public int ExpirationNotifyDateIn { get; set; } + public SCHALE.Common.FlatData.ParcelType ExpiryChangeParcelType { get; set; } + public long ExpiryChangeId { get; set; } + public long ExpiryChangeAmount { get; set; } public CurrencyExcelT() { this.ID = 0; @@ -206,17 +248,22 @@ public class CurrencyExcelT this.CurrencyType = SCHALE.Common.FlatData.CurrencyTypes.Invalid; this.CurrencyName = null; this.Icon = null; - this.Rarity = SCHALE.Common.FlatData.Rarity.N; + this.Rarity_ = SCHALE.Common.FlatData.Rarity.N; this.AutoChargeMsc = 0; this.AutoChargeAmount = 0; - this.CurrencyOverChargeType = SCHALE.Common.FlatData.CurrencyOverChargeType.CanNotCharge; - this.CurrencyAdditionalChargeType = SCHALE.Common.FlatData.CurrencyAdditionalChargeType.EnableAutoChargeOverLimit; + this.CurrencyOverChargeType_ = SCHALE.Common.FlatData.CurrencyOverChargeType.CanNotCharge; + this.CurrencyAdditionalChargeType_ = SCHALE.Common.FlatData.CurrencyAdditionalChargeType.EnableAutoChargeOverLimit; this.ChargeLimit = 0; this.OverChargeLimit = 0; this.SpriteName = null; - this.DailyRefillType = SCHALE.Common.FlatData.DailyRefillType.None; + this.DailyRefillType_ = SCHALE.Common.FlatData.DailyRefillType.None; this.DailyRefillAmount = 0; this.DailyRefillTime = null; + this.ExpirationDateTime = null; + this.ExpirationNotifyDateIn = 0; + this.ExpiryChangeParcelType = SCHALE.Common.FlatData.ParcelType.None; + this.ExpiryChangeId = 0; + this.ExpiryChangeAmount = 0; } } @@ -231,17 +278,22 @@ static public class CurrencyExcelVerify && verifier.VerifyField(tablePos, 8 /*CurrencyType*/, 4 /*SCHALE.Common.FlatData.CurrencyTypes*/, 4, false) && verifier.VerifyString(tablePos, 10 /*CurrencyName*/, false) && verifier.VerifyString(tablePos, 12 /*Icon*/, false) - && verifier.VerifyField(tablePos, 14 /*Rarity*/, 4 /*SCHALE.Common.FlatData.Rarity*/, 4, false) + && verifier.VerifyField(tablePos, 14 /*Rarity_*/, 4 /*SCHALE.Common.FlatData.Rarity*/, 4, false) && verifier.VerifyField(tablePos, 16 /*AutoChargeMsc*/, 4 /*int*/, 4, false) && verifier.VerifyField(tablePos, 18 /*AutoChargeAmount*/, 4 /*int*/, 4, false) - && verifier.VerifyField(tablePos, 20 /*CurrencyOverChargeType*/, 4 /*SCHALE.Common.FlatData.CurrencyOverChargeType*/, 4, false) - && verifier.VerifyField(tablePos, 22 /*CurrencyAdditionalChargeType*/, 4 /*SCHALE.Common.FlatData.CurrencyAdditionalChargeType*/, 4, false) + && verifier.VerifyField(tablePos, 20 /*CurrencyOverChargeType_*/, 4 /*SCHALE.Common.FlatData.CurrencyOverChargeType*/, 4, false) + && verifier.VerifyField(tablePos, 22 /*CurrencyAdditionalChargeType_*/, 4 /*SCHALE.Common.FlatData.CurrencyAdditionalChargeType*/, 4, false) && verifier.VerifyField(tablePos, 24 /*ChargeLimit*/, 8 /*long*/, 8, false) && verifier.VerifyField(tablePos, 26 /*OverChargeLimit*/, 8 /*long*/, 8, false) && verifier.VerifyString(tablePos, 28 /*SpriteName*/, false) - && verifier.VerifyField(tablePos, 30 /*DailyRefillType*/, 4 /*SCHALE.Common.FlatData.DailyRefillType*/, 4, false) + && verifier.VerifyField(tablePos, 30 /*DailyRefillType_*/, 4 /*SCHALE.Common.FlatData.DailyRefillType*/, 4, false) && verifier.VerifyField(tablePos, 32 /*DailyRefillAmount*/, 8 /*long*/, 8, false) && verifier.VerifyVectorOfData(tablePos, 34 /*DailyRefillTime*/, 8 /*long*/, false) + && verifier.VerifyString(tablePos, 36 /*ExpirationDateTime*/, false) + && verifier.VerifyField(tablePos, 38 /*ExpirationNotifyDateIn*/, 4 /*int*/, 4, false) + && verifier.VerifyField(tablePos, 40 /*ExpiryChangeParcelType*/, 4 /*SCHALE.Common.FlatData.ParcelType*/, 4, false) + && verifier.VerifyField(tablePos, 42 /*ExpiryChangeId*/, 8 /*long*/, 8, false) + && verifier.VerifyField(tablePos, 44 /*ExpiryChangeAmount*/, 8 /*long*/, 8, false) && verifier.VerifyTableEnd(tablePos); } } diff --git a/SCHALE.Common/FlatData/DefaultMailExcel.cs b/SCHALE.Common/FlatData/DefaultMailExcel.cs index bc74f3c..635f464 100644 --- a/SCHALE.Common/FlatData/DefaultMailExcel.cs +++ b/SCHALE.Common/FlatData/DefaultMailExcel.cs @@ -22,7 +22,7 @@ public struct DefaultMailExcel : IFlatbufferObject public long Id { get { int o = __p.__offset(4); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public uint LocalizeCodeId { get { int o = __p.__offset(6); return o != 0 ? __p.bb.GetUint(o + __p.bb_pos) : (uint)0; } } - public SCHALE.Common.FlatData.MailType MailType { get { int o = __p.__offset(8); return o != 0 ? (SCHALE.Common.FlatData.MailType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.MailType.System; } } + public SCHALE.Common.FlatData.MailType MailType_ { get { int o = __p.__offset(8); return o != 0 ? (SCHALE.Common.FlatData.MailType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.MailType.System; } } public string MailSendPeriodFrom { get { int o = __p.__offset(10); return o != 0 ? __p.__string(o + __p.bb_pos) : null; } } #if ENABLE_SPAN_T public Span GetMailSendPeriodFromBytes() { return __p.__vector_as_span(10, 1); } @@ -65,7 +65,7 @@ public struct DefaultMailExcel : IFlatbufferObject public static Offset CreateDefaultMailExcel(FlatBufferBuilder builder, long Id = 0, uint LocalizeCodeId = 0, - SCHALE.Common.FlatData.MailType MailType = SCHALE.Common.FlatData.MailType.System, + SCHALE.Common.FlatData.MailType MailType_ = SCHALE.Common.FlatData.MailType.System, StringOffset MailSendPeriodFromOffset = default(StringOffset), StringOffset MailSendPeriodToOffset = default(StringOffset), VectorOffset RewardParcelTypeOffset = default(VectorOffset), @@ -78,7 +78,7 @@ public struct DefaultMailExcel : IFlatbufferObject DefaultMailExcel.AddRewardParcelType(builder, RewardParcelTypeOffset); DefaultMailExcel.AddMailSendPeriodTo(builder, MailSendPeriodToOffset); DefaultMailExcel.AddMailSendPeriodFrom(builder, MailSendPeriodFromOffset); - DefaultMailExcel.AddMailType(builder, MailType); + DefaultMailExcel.AddMailType_(builder, MailType_); DefaultMailExcel.AddLocalizeCodeId(builder, LocalizeCodeId); return DefaultMailExcel.EndDefaultMailExcel(builder); } @@ -86,7 +86,7 @@ public struct DefaultMailExcel : IFlatbufferObject public static void StartDefaultMailExcel(FlatBufferBuilder builder) { builder.StartTable(8); } public static void AddId(FlatBufferBuilder builder, long id) { builder.AddLong(0, id, 0); } public static void AddLocalizeCodeId(FlatBufferBuilder builder, uint localizeCodeId) { builder.AddUint(1, localizeCodeId, 0); } - public static void AddMailType(FlatBufferBuilder builder, SCHALE.Common.FlatData.MailType mailType) { builder.AddInt(2, (int)mailType, 0); } + public static void AddMailType_(FlatBufferBuilder builder, SCHALE.Common.FlatData.MailType mailType_) { builder.AddInt(2, (int)mailType_, 0); } public static void AddMailSendPeriodFrom(FlatBufferBuilder builder, StringOffset mailSendPeriodFromOffset) { builder.AddOffset(3, mailSendPeriodFromOffset.Value, 0); } public static void AddMailSendPeriodTo(FlatBufferBuilder builder, StringOffset mailSendPeriodToOffset) { builder.AddOffset(4, mailSendPeriodToOffset.Value, 0); } public static void AddRewardParcelType(FlatBufferBuilder builder, VectorOffset rewardParcelTypeOffset) { builder.AddOffset(5, rewardParcelTypeOffset.Value, 0); } @@ -120,7 +120,7 @@ public struct DefaultMailExcel : IFlatbufferObject byte[] key = TableEncryptionService.CreateKey("DefaultMail"); _o.Id = TableEncryptionService.Convert(this.Id, key); _o.LocalizeCodeId = TableEncryptionService.Convert(this.LocalizeCodeId, key); - _o.MailType = TableEncryptionService.Convert(this.MailType, key); + _o.MailType_ = TableEncryptionService.Convert(this.MailType_, key); _o.MailSendPeriodFrom = TableEncryptionService.Convert(this.MailSendPeriodFrom, key); _o.MailSendPeriodTo = TableEncryptionService.Convert(this.MailSendPeriodTo, key); _o.RewardParcelType = new List(); @@ -153,7 +153,7 @@ public struct DefaultMailExcel : IFlatbufferObject builder, _o.Id, _o.LocalizeCodeId, - _o.MailType, + _o.MailType_, _MailSendPeriodFrom, _MailSendPeriodTo, _RewardParcelType, @@ -166,7 +166,7 @@ public class DefaultMailExcelT { public long Id { get; set; } public uint LocalizeCodeId { get; set; } - public SCHALE.Common.FlatData.MailType MailType { get; set; } + public SCHALE.Common.FlatData.MailType MailType_ { get; set; } public string MailSendPeriodFrom { get; set; } public string MailSendPeriodTo { get; set; } public List RewardParcelType { get; set; } @@ -176,7 +176,7 @@ public class DefaultMailExcelT public DefaultMailExcelT() { this.Id = 0; this.LocalizeCodeId = 0; - this.MailType = SCHALE.Common.FlatData.MailType.System; + this.MailType_ = SCHALE.Common.FlatData.MailType.System; this.MailSendPeriodFrom = null; this.MailSendPeriodTo = null; this.RewardParcelType = null; @@ -193,7 +193,7 @@ static public class DefaultMailExcelVerify return verifier.VerifyTableStart(tablePos) && verifier.VerifyField(tablePos, 4 /*Id*/, 8 /*long*/, 8, false) && verifier.VerifyField(tablePos, 6 /*LocalizeCodeId*/, 4 /*uint*/, 4, false) - && verifier.VerifyField(tablePos, 8 /*MailType*/, 4 /*SCHALE.Common.FlatData.MailType*/, 4, false) + && verifier.VerifyField(tablePos, 8 /*MailType_*/, 4 /*SCHALE.Common.FlatData.MailType*/, 4, false) && verifier.VerifyString(tablePos, 10 /*MailSendPeriodFrom*/, false) && verifier.VerifyString(tablePos, 12 /*MailSendPeriodTo*/, false) && verifier.VerifyVectorOfData(tablePos, 14 /*RewardParcelType*/, 4 /*SCHALE.Common.FlatData.ParcelType*/, false) diff --git a/SCHALE.Common/FlatData/DefaultParcelExcel.cs b/SCHALE.Common/FlatData/DefaultParcelExcel.cs index 1a8e904..f965f45 100644 --- a/SCHALE.Common/FlatData/DefaultParcelExcel.cs +++ b/SCHALE.Common/FlatData/DefaultParcelExcel.cs @@ -20,23 +20,23 @@ public struct DefaultParcelExcel : IFlatbufferObject public void __init(int _i, ByteBuffer _bb) { __p = new Table(_i, _bb); } public DefaultParcelExcel __assign(int _i, ByteBuffer _bb) { __init(_i, _bb); return this; } - public SCHALE.Common.FlatData.ParcelType ParcelType { get { int o = __p.__offset(4); return o != 0 ? (SCHALE.Common.FlatData.ParcelType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.ParcelType.None; } } + public SCHALE.Common.FlatData.ParcelType ParcelType_ { get { int o = __p.__offset(4); return o != 0 ? (SCHALE.Common.FlatData.ParcelType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.ParcelType.None; } } public long ParcelId { get { int o = __p.__offset(6); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public long ParcelAmount { get { int o = __p.__offset(8); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public static Offset CreateDefaultParcelExcel(FlatBufferBuilder builder, - SCHALE.Common.FlatData.ParcelType ParcelType = SCHALE.Common.FlatData.ParcelType.None, + SCHALE.Common.FlatData.ParcelType ParcelType_ = SCHALE.Common.FlatData.ParcelType.None, long ParcelId = 0, long ParcelAmount = 0) { builder.StartTable(3); DefaultParcelExcel.AddParcelAmount(builder, ParcelAmount); DefaultParcelExcel.AddParcelId(builder, ParcelId); - DefaultParcelExcel.AddParcelType(builder, ParcelType); + DefaultParcelExcel.AddParcelType_(builder, ParcelType_); return DefaultParcelExcel.EndDefaultParcelExcel(builder); } public static void StartDefaultParcelExcel(FlatBufferBuilder builder) { builder.StartTable(3); } - public static void AddParcelType(FlatBufferBuilder builder, SCHALE.Common.FlatData.ParcelType parcelType) { builder.AddInt(0, (int)parcelType, 0); } + public static void AddParcelType_(FlatBufferBuilder builder, SCHALE.Common.FlatData.ParcelType parcelType_) { builder.AddInt(0, (int)parcelType_, 0); } public static void AddParcelId(FlatBufferBuilder builder, long parcelId) { builder.AddLong(1, parcelId, 0); } public static void AddParcelAmount(FlatBufferBuilder builder, long parcelAmount) { builder.AddLong(2, parcelAmount, 0); } public static Offset EndDefaultParcelExcel(FlatBufferBuilder builder) { @@ -50,7 +50,7 @@ public struct DefaultParcelExcel : IFlatbufferObject } public void UnPackTo(DefaultParcelExcelT _o) { byte[] key = TableEncryptionService.CreateKey("DefaultParcel"); - _o.ParcelType = TableEncryptionService.Convert(this.ParcelType, key); + _o.ParcelType_ = TableEncryptionService.Convert(this.ParcelType_, key); _o.ParcelId = TableEncryptionService.Convert(this.ParcelId, key); _o.ParcelAmount = TableEncryptionService.Convert(this.ParcelAmount, key); } @@ -58,7 +58,7 @@ public struct DefaultParcelExcel : IFlatbufferObject if (_o == null) return default(Offset); return CreateDefaultParcelExcel( builder, - _o.ParcelType, + _o.ParcelType_, _o.ParcelId, _o.ParcelAmount); } @@ -66,12 +66,12 @@ public struct DefaultParcelExcel : IFlatbufferObject public class DefaultParcelExcelT { - public SCHALE.Common.FlatData.ParcelType ParcelType { get; set; } + public SCHALE.Common.FlatData.ParcelType ParcelType_ { get; set; } public long ParcelId { get; set; } public long ParcelAmount { get; set; } public DefaultParcelExcelT() { - this.ParcelType = SCHALE.Common.FlatData.ParcelType.None; + this.ParcelType_ = SCHALE.Common.FlatData.ParcelType.None; this.ParcelId = 0; this.ParcelAmount = 0; } @@ -83,7 +83,7 @@ static public class DefaultParcelExcelVerify static public bool Verify(Google.FlatBuffers.Verifier verifier, uint tablePos) { return verifier.VerifyTableStart(tablePos) - && verifier.VerifyField(tablePos, 4 /*ParcelType*/, 4 /*SCHALE.Common.FlatData.ParcelType*/, 4, false) + && verifier.VerifyField(tablePos, 4 /*ParcelType_*/, 4 /*SCHALE.Common.FlatData.ParcelType*/, 4, false) && verifier.VerifyField(tablePos, 6 /*ParcelId*/, 8 /*long*/, 8, false) && verifier.VerifyField(tablePos, 8 /*ParcelAmount*/, 8 /*long*/, 8, false) && verifier.VerifyTableEnd(tablePos); diff --git a/SCHALE.Common/FlatData/DialogCategory.cs b/SCHALE.Common/FlatData/DialogCategory.cs index 37e6988..8c881b5 100644 --- a/SCHALE.Common/FlatData/DialogCategory.cs +++ b/SCHALE.Common/FlatData/DialogCategory.cs @@ -77,6 +77,7 @@ public enum DialogCategory : int UIEventTreasure = 67, UIMultiFloorRaid = 68, UIEventMiniGameDreamMaker = 69, + UIAttendanceEvent17 = 70, }; diff --git a/SCHALE.Common/FlatData/DuplicateBonusExcel.cs b/SCHALE.Common/FlatData/DuplicateBonusExcel.cs index b2a07c7..c99672e 100644 --- a/SCHALE.Common/FlatData/DuplicateBonusExcel.cs +++ b/SCHALE.Common/FlatData/DuplicateBonusExcel.cs @@ -21,7 +21,7 @@ public struct DuplicateBonusExcel : IFlatbufferObject public DuplicateBonusExcel __assign(int _i, ByteBuffer _bb) { __init(_i, _bb); return this; } public long Id { get { int o = __p.__offset(4); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } - public SCHALE.Common.FlatData.ItemCategory ItemCategory { get { int o = __p.__offset(6); return o != 0 ? (SCHALE.Common.FlatData.ItemCategory)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.ItemCategory.Coin; } } + public SCHALE.Common.FlatData.ItemCategory ItemCategory_ { get { int o = __p.__offset(6); return o != 0 ? (SCHALE.Common.FlatData.ItemCategory)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.ItemCategory.Coin; } } public long ItemId { get { int o = __p.__offset(8); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public long CharacterId { get { int o = __p.__offset(10); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public SCHALE.Common.FlatData.ParcelType RewardParcelType { get { int o = __p.__offset(12); return o != 0 ? (SCHALE.Common.FlatData.ParcelType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.ParcelType.None; } } @@ -30,7 +30,7 @@ public struct DuplicateBonusExcel : IFlatbufferObject public static Offset CreateDuplicateBonusExcel(FlatBufferBuilder builder, long Id = 0, - SCHALE.Common.FlatData.ItemCategory ItemCategory = SCHALE.Common.FlatData.ItemCategory.Coin, + SCHALE.Common.FlatData.ItemCategory ItemCategory_ = SCHALE.Common.FlatData.ItemCategory.Coin, long ItemId = 0, long CharacterId = 0, SCHALE.Common.FlatData.ParcelType RewardParcelType = SCHALE.Common.FlatData.ParcelType.None, @@ -43,13 +43,13 @@ public struct DuplicateBonusExcel : IFlatbufferObject DuplicateBonusExcel.AddItemId(builder, ItemId); DuplicateBonusExcel.AddId(builder, Id); DuplicateBonusExcel.AddRewardParcelType(builder, RewardParcelType); - DuplicateBonusExcel.AddItemCategory(builder, ItemCategory); + DuplicateBonusExcel.AddItemCategory_(builder, ItemCategory_); return DuplicateBonusExcel.EndDuplicateBonusExcel(builder); } public static void StartDuplicateBonusExcel(FlatBufferBuilder builder) { builder.StartTable(7); } public static void AddId(FlatBufferBuilder builder, long id) { builder.AddLong(0, id, 0); } - public static void AddItemCategory(FlatBufferBuilder builder, SCHALE.Common.FlatData.ItemCategory itemCategory) { builder.AddInt(1, (int)itemCategory, 0); } + public static void AddItemCategory_(FlatBufferBuilder builder, SCHALE.Common.FlatData.ItemCategory itemCategory_) { builder.AddInt(1, (int)itemCategory_, 0); } public static void AddItemId(FlatBufferBuilder builder, long itemId) { builder.AddLong(2, itemId, 0); } public static void AddCharacterId(FlatBufferBuilder builder, long characterId) { builder.AddLong(3, characterId, 0); } public static void AddRewardParcelType(FlatBufferBuilder builder, SCHALE.Common.FlatData.ParcelType rewardParcelType) { builder.AddInt(4, (int)rewardParcelType, 0); } @@ -67,7 +67,7 @@ public struct DuplicateBonusExcel : IFlatbufferObject public void UnPackTo(DuplicateBonusExcelT _o) { byte[] key = TableEncryptionService.CreateKey("DuplicateBonus"); _o.Id = TableEncryptionService.Convert(this.Id, key); - _o.ItemCategory = TableEncryptionService.Convert(this.ItemCategory, key); + _o.ItemCategory_ = TableEncryptionService.Convert(this.ItemCategory_, key); _o.ItemId = TableEncryptionService.Convert(this.ItemId, key); _o.CharacterId = TableEncryptionService.Convert(this.CharacterId, key); _o.RewardParcelType = TableEncryptionService.Convert(this.RewardParcelType, key); @@ -79,7 +79,7 @@ public struct DuplicateBonusExcel : IFlatbufferObject return CreateDuplicateBonusExcel( builder, _o.Id, - _o.ItemCategory, + _o.ItemCategory_, _o.ItemId, _o.CharacterId, _o.RewardParcelType, @@ -91,7 +91,7 @@ public struct DuplicateBonusExcel : IFlatbufferObject public class DuplicateBonusExcelT { public long Id { get; set; } - public SCHALE.Common.FlatData.ItemCategory ItemCategory { get; set; } + public SCHALE.Common.FlatData.ItemCategory ItemCategory_ { get; set; } public long ItemId { get; set; } public long CharacterId { get; set; } public SCHALE.Common.FlatData.ParcelType RewardParcelType { get; set; } @@ -100,7 +100,7 @@ public class DuplicateBonusExcelT public DuplicateBonusExcelT() { this.Id = 0; - this.ItemCategory = SCHALE.Common.FlatData.ItemCategory.Coin; + this.ItemCategory_ = SCHALE.Common.FlatData.ItemCategory.Coin; this.ItemId = 0; this.CharacterId = 0; this.RewardParcelType = SCHALE.Common.FlatData.ParcelType.None; @@ -116,7 +116,7 @@ static public class DuplicateBonusExcelVerify { return verifier.VerifyTableStart(tablePos) && verifier.VerifyField(tablePos, 4 /*Id*/, 8 /*long*/, 8, false) - && verifier.VerifyField(tablePos, 6 /*ItemCategory*/, 4 /*SCHALE.Common.FlatData.ItemCategory*/, 4, false) + && verifier.VerifyField(tablePos, 6 /*ItemCategory_*/, 4 /*SCHALE.Common.FlatData.ItemCategory*/, 4, false) && verifier.VerifyField(tablePos, 8 /*ItemId*/, 8 /*long*/, 8, false) && verifier.VerifyField(tablePos, 10 /*CharacterId*/, 8 /*long*/, 8, false) && verifier.VerifyField(tablePos, 12 /*RewardParcelType*/, 4 /*SCHALE.Common.FlatData.ParcelType*/, 4, false) diff --git a/SCHALE.Common/FlatData/EchelonConstraintExcel.cs b/SCHALE.Common/FlatData/EchelonConstraintExcel.cs index ee4433c..cb7450a 100644 --- a/SCHALE.Common/FlatData/EchelonConstraintExcel.cs +++ b/SCHALE.Common/FlatData/EchelonConstraintExcel.cs @@ -38,9 +38,9 @@ public struct EchelonConstraintExcel : IFlatbufferObject public ArraySegment? GetPersonalityIdBytes() { return __p.__vector_as_arraysegment(10); } #endif public long[] GetPersonalityIdArray() { return __p.__vector_as_array(10); } - public SCHALE.Common.FlatData.WeaponType WeaponType { get { int o = __p.__offset(12); return o != 0 ? (SCHALE.Common.FlatData.WeaponType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.WeaponType.None; } } - public SCHALE.Common.FlatData.School School { get { int o = __p.__offset(14); return o != 0 ? (SCHALE.Common.FlatData.School)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.School.None; } } - public SCHALE.Common.FlatData.Club Club { get { int o = __p.__offset(16); return o != 0 ? (SCHALE.Common.FlatData.Club)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.Club.None; } } + public SCHALE.Common.FlatData.WeaponType WeaponType_ { get { int o = __p.__offset(12); return o != 0 ? (SCHALE.Common.FlatData.WeaponType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.WeaponType.None; } } + public SCHALE.Common.FlatData.School School_ { get { int o = __p.__offset(14); return o != 0 ? (SCHALE.Common.FlatData.School)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.School.None; } } + public SCHALE.Common.FlatData.Club Club_ { get { int o = __p.__offset(16); return o != 0 ? (SCHALE.Common.FlatData.Club)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.Club.None; } } public SCHALE.Common.FlatData.TacticRole Role { get { int o = __p.__offset(18); return o != 0 ? (SCHALE.Common.FlatData.TacticRole)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.TacticRole.None; } } public static Offset CreateEchelonConstraintExcel(FlatBufferBuilder builder, @@ -48,16 +48,16 @@ public struct EchelonConstraintExcel : IFlatbufferObject bool IsWhiteList = false, VectorOffset CharacterIdOffset = default(VectorOffset), VectorOffset PersonalityIdOffset = default(VectorOffset), - SCHALE.Common.FlatData.WeaponType WeaponType = SCHALE.Common.FlatData.WeaponType.None, - SCHALE.Common.FlatData.School School = SCHALE.Common.FlatData.School.None, - SCHALE.Common.FlatData.Club Club = SCHALE.Common.FlatData.Club.None, + SCHALE.Common.FlatData.WeaponType WeaponType_ = SCHALE.Common.FlatData.WeaponType.None, + SCHALE.Common.FlatData.School School_ = SCHALE.Common.FlatData.School.None, + SCHALE.Common.FlatData.Club Club_ = SCHALE.Common.FlatData.Club.None, SCHALE.Common.FlatData.TacticRole Role = SCHALE.Common.FlatData.TacticRole.None) { builder.StartTable(8); EchelonConstraintExcel.AddGroupId(builder, GroupId); EchelonConstraintExcel.AddRole(builder, Role); - EchelonConstraintExcel.AddClub(builder, Club); - EchelonConstraintExcel.AddSchool(builder, School); - EchelonConstraintExcel.AddWeaponType(builder, WeaponType); + EchelonConstraintExcel.AddClub_(builder, Club_); + EchelonConstraintExcel.AddSchool_(builder, School_); + EchelonConstraintExcel.AddWeaponType_(builder, WeaponType_); EchelonConstraintExcel.AddPersonalityId(builder, PersonalityIdOffset); EchelonConstraintExcel.AddCharacterId(builder, CharacterIdOffset); EchelonConstraintExcel.AddIsWhiteList(builder, IsWhiteList); @@ -79,9 +79,9 @@ public struct EchelonConstraintExcel : IFlatbufferObject public static VectorOffset CreatePersonalityIdVectorBlock(FlatBufferBuilder builder, ArraySegment data) { builder.StartVector(8, data.Count, 8); builder.Add(data); return builder.EndVector(); } public static VectorOffset CreatePersonalityIdVectorBlock(FlatBufferBuilder builder, IntPtr dataPtr, int sizeInBytes) { builder.StartVector(1, sizeInBytes, 1); builder.Add(dataPtr, sizeInBytes); return builder.EndVector(); } public static void StartPersonalityIdVector(FlatBufferBuilder builder, int numElems) { builder.StartVector(8, numElems, 8); } - public static void AddWeaponType(FlatBufferBuilder builder, SCHALE.Common.FlatData.WeaponType weaponType) { builder.AddInt(4, (int)weaponType, 0); } - public static void AddSchool(FlatBufferBuilder builder, SCHALE.Common.FlatData.School school) { builder.AddInt(5, (int)school, 0); } - public static void AddClub(FlatBufferBuilder builder, SCHALE.Common.FlatData.Club club) { builder.AddInt(6, (int)club, 0); } + public static void AddWeaponType_(FlatBufferBuilder builder, SCHALE.Common.FlatData.WeaponType weaponType_) { builder.AddInt(4, (int)weaponType_, 0); } + public static void AddSchool_(FlatBufferBuilder builder, SCHALE.Common.FlatData.School school_) { builder.AddInt(5, (int)school_, 0); } + public static void AddClub_(FlatBufferBuilder builder, SCHALE.Common.FlatData.Club club_) { builder.AddInt(6, (int)club_, 0); } public static void AddRole(FlatBufferBuilder builder, SCHALE.Common.FlatData.TacticRole role) { builder.AddInt(7, (int)role, 0); } public static Offset EndEchelonConstraintExcel(FlatBufferBuilder builder) { int o = builder.EndTable(); @@ -100,9 +100,9 @@ public struct EchelonConstraintExcel : IFlatbufferObject for (var _j = 0; _j < this.CharacterIdLength; ++_j) {_o.CharacterId.Add(TableEncryptionService.Convert(this.CharacterId(_j), key));} _o.PersonalityId = new List(); for (var _j = 0; _j < this.PersonalityIdLength; ++_j) {_o.PersonalityId.Add(TableEncryptionService.Convert(this.PersonalityId(_j), key));} - _o.WeaponType = TableEncryptionService.Convert(this.WeaponType, key); - _o.School = TableEncryptionService.Convert(this.School, key); - _o.Club = TableEncryptionService.Convert(this.Club, key); + _o.WeaponType_ = TableEncryptionService.Convert(this.WeaponType_, key); + _o.School_ = TableEncryptionService.Convert(this.School_, key); + _o.Club_ = TableEncryptionService.Convert(this.Club_, key); _o.Role = TableEncryptionService.Convert(this.Role, key); } public static Offset Pack(FlatBufferBuilder builder, EchelonConstraintExcelT _o) { @@ -123,9 +123,9 @@ public struct EchelonConstraintExcel : IFlatbufferObject _o.IsWhiteList, _CharacterId, _PersonalityId, - _o.WeaponType, - _o.School, - _o.Club, + _o.WeaponType_, + _o.School_, + _o.Club_, _o.Role); } } @@ -136,9 +136,9 @@ public class EchelonConstraintExcelT public bool IsWhiteList { get; set; } public List CharacterId { get; set; } public List PersonalityId { get; set; } - public SCHALE.Common.FlatData.WeaponType WeaponType { get; set; } - public SCHALE.Common.FlatData.School School { get; set; } - public SCHALE.Common.FlatData.Club Club { get; set; } + public SCHALE.Common.FlatData.WeaponType WeaponType_ { get; set; } + public SCHALE.Common.FlatData.School School_ { get; set; } + public SCHALE.Common.FlatData.Club Club_ { get; set; } public SCHALE.Common.FlatData.TacticRole Role { get; set; } public EchelonConstraintExcelT() { @@ -146,9 +146,9 @@ public class EchelonConstraintExcelT this.IsWhiteList = false; this.CharacterId = null; this.PersonalityId = null; - this.WeaponType = SCHALE.Common.FlatData.WeaponType.None; - this.School = SCHALE.Common.FlatData.School.None; - this.Club = SCHALE.Common.FlatData.Club.None; + this.WeaponType_ = SCHALE.Common.FlatData.WeaponType.None; + this.School_ = SCHALE.Common.FlatData.School.None; + this.Club_ = SCHALE.Common.FlatData.Club.None; this.Role = SCHALE.Common.FlatData.TacticRole.None; } } @@ -163,9 +163,9 @@ static public class EchelonConstraintExcelVerify && verifier.VerifyField(tablePos, 6 /*IsWhiteList*/, 1 /*bool*/, 1, false) && verifier.VerifyVectorOfData(tablePos, 8 /*CharacterId*/, 8 /*long*/, false) && verifier.VerifyVectorOfData(tablePos, 10 /*PersonalityId*/, 8 /*long*/, false) - && verifier.VerifyField(tablePos, 12 /*WeaponType*/, 4 /*SCHALE.Common.FlatData.WeaponType*/, 4, false) - && verifier.VerifyField(tablePos, 14 /*School*/, 4 /*SCHALE.Common.FlatData.School*/, 4, false) - && verifier.VerifyField(tablePos, 16 /*Club*/, 4 /*SCHALE.Common.FlatData.Club*/, 4, false) + && verifier.VerifyField(tablePos, 12 /*WeaponType_*/, 4 /*SCHALE.Common.FlatData.WeaponType*/, 4, false) + && verifier.VerifyField(tablePos, 14 /*School_*/, 4 /*SCHALE.Common.FlatData.School*/, 4, false) + && verifier.VerifyField(tablePos, 16 /*Club_*/, 4 /*SCHALE.Common.FlatData.Club*/, 4, false) && verifier.VerifyField(tablePos, 18 /*Role*/, 4 /*SCHALE.Common.FlatData.TacticRole*/, 4, false) && verifier.VerifyTableEnd(tablePos); } diff --git a/SCHALE.Common/FlatData/EchelonType.cs b/SCHALE.Common/FlatData/EchelonType.cs index 6c21555..06ffee2 100644 --- a/SCHALE.Common/FlatData/EchelonType.cs +++ b/SCHALE.Common/FlatData/EchelonType.cs @@ -32,6 +32,7 @@ public enum EchelonType : int EliminateRaid03 = 22, Field = 23, MultiFloorRaid = 24, + MinigameDefense = 25, }; diff --git a/SCHALE.Common/FlatData/EliminateRaidStageExcel.cs b/SCHALE.Common/FlatData/EliminateRaidStageExcel.cs index 35a7c35..b5ca0ce 100644 --- a/SCHALE.Common/FlatData/EliminateRaidStageExcel.cs +++ b/SCHALE.Common/FlatData/EliminateRaidStageExcel.cs @@ -63,7 +63,7 @@ public struct EliminateRaidStageExcel : IFlatbufferObject public ArraySegment? GetBossCharacterIdBytes() { return __p.__vector_as_arraysegment(26); } #endif public long[] GetBossCharacterIdArray() { return __p.__vector_as_array(26); } - public SCHALE.Common.FlatData.Difficulty Difficulty { get { int o = __p.__offset(28); return o != 0 ? (SCHALE.Common.FlatData.Difficulty)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.Difficulty.Normal; } } + public SCHALE.Common.FlatData.Difficulty Difficulty_ { get { int o = __p.__offset(28); return o != 0 ? (SCHALE.Common.FlatData.Difficulty)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.Difficulty.Normal; } } public bool IsOpen { get { int o = __p.__offset(30); return o != 0 ? 0!=__p.bb.Get(o + __p.bb_pos) : (bool)false; } } public long MaxPlayerCount { get { int o = __p.__offset(32); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public int RaidRoomLifeTime { get { int o = __p.__offset(34); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } @@ -83,7 +83,7 @@ public struct EliminateRaidStageExcel : IFlatbufferObject public ArraySegment? GetEnterTimeLineBytes() { return __p.__vector_as_arraysegment(42); } #endif public byte[] GetEnterTimeLineArray() { return __p.__vector_as_array(42); } - public SCHALE.Common.FlatData.TacticEnvironment TacticEnvironment { get { int o = __p.__offset(44); return o != 0 ? (SCHALE.Common.FlatData.TacticEnvironment)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.TacticEnvironment.None; } } + public SCHALE.Common.FlatData.TacticEnvironment TacticEnvironment_ { get { int o = __p.__offset(44); return o != 0 ? (SCHALE.Common.FlatData.TacticEnvironment)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.TacticEnvironment.None; } } public long DefaultClearScore { get { int o = __p.__offset(46); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public long MaximumScore { get { int o = __p.__offset(48); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public long PerSecondMinusScore { get { int o = __p.__offset(50); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } @@ -128,7 +128,7 @@ public struct EliminateRaidStageExcel : IFlatbufferObject public uint ClearScenarioKey { get { int o = __p.__offset(74); return o != 0 ? __p.bb.GetUint(o + __p.bb_pos) : (uint)0; } } public bool ShowSkillCard { get { int o = __p.__offset(76); return o != 0 ? 0!=__p.bb.Get(o + __p.bb_pos) : (bool)false; } } public uint BossBGInfoKey { get { int o = __p.__offset(78); return o != 0 ? __p.bb.GetUint(o + __p.bb_pos) : (uint)0; } } - public SCHALE.Common.FlatData.EchelonExtensionType EchelonExtensionType { get { int o = __p.__offset(80); return o != 0 ? (SCHALE.Common.FlatData.EchelonExtensionType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.EchelonExtensionType.Base; } } + public SCHALE.Common.FlatData.EchelonExtensionType EchelonExtensionType_ { get { int o = __p.__offset(80); return o != 0 ? (SCHALE.Common.FlatData.EchelonExtensionType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.EchelonExtensionType.Base; } } public static Offset CreateEliminateRaidStageExcel(FlatBufferBuilder builder, long Id = 0, @@ -143,7 +143,7 @@ public struct EliminateRaidStageExcel : IFlatbufferObject StringOffset BGPathOffset = default(StringOffset), long RaidCharacterId = 0, VectorOffset BossCharacterIdOffset = default(VectorOffset), - SCHALE.Common.FlatData.Difficulty Difficulty = SCHALE.Common.FlatData.Difficulty.Normal, + SCHALE.Common.FlatData.Difficulty Difficulty_ = SCHALE.Common.FlatData.Difficulty.Normal, bool IsOpen = false, long MaxPlayerCount = 0, int RaidRoomLifeTime = 0, @@ -151,7 +151,7 @@ public struct EliminateRaidStageExcel : IFlatbufferObject long GroundId = 0, StringOffset GroundDevNameOffset = default(StringOffset), StringOffset EnterTimeLineOffset = default(StringOffset), - SCHALE.Common.FlatData.TacticEnvironment TacticEnvironment = SCHALE.Common.FlatData.TacticEnvironment.None, + SCHALE.Common.FlatData.TacticEnvironment TacticEnvironment_ = SCHALE.Common.FlatData.TacticEnvironment.None, long DefaultClearScore = 0, long MaximumScore = 0, long PerSecondMinusScore = 0, @@ -169,7 +169,7 @@ public struct EliminateRaidStageExcel : IFlatbufferObject uint ClearScenarioKey = 0, bool ShowSkillCard = false, uint BossBGInfoKey = 0, - SCHALE.Common.FlatData.EchelonExtensionType EchelonExtensionType = SCHALE.Common.FlatData.EchelonExtensionType.Base) { + SCHALE.Common.FlatData.EchelonExtensionType EchelonExtensionType_ = SCHALE.Common.FlatData.EchelonExtensionType.Base) { builder.StartTable(39); EliminateRaidStageExcel.AddTimeLinePhase(builder, TimeLinePhase); EliminateRaidStageExcel.AddRaidRewardGroupId(builder, RaidRewardGroupId); @@ -185,7 +185,7 @@ public struct EliminateRaidStageExcel : IFlatbufferObject EliminateRaidStageExcel.AddRaidCharacterId(builder, RaidCharacterId); EliminateRaidStageExcel.AddRaidEnterCostId(builder, RaidEnterCostId); EliminateRaidStageExcel.AddId(builder, Id); - EliminateRaidStageExcel.AddEchelonExtensionType(builder, EchelonExtensionType); + EliminateRaidStageExcel.AddEchelonExtensionType_(builder, EchelonExtensionType_); EliminateRaidStageExcel.AddBossBGInfoKey(builder, BossBGInfoKey); EliminateRaidStageExcel.AddClearScenarioKey(builder, ClearScenarioKey); EliminateRaidStageExcel.AddEnterScenarioKey(builder, EnterScenarioKey); @@ -194,11 +194,11 @@ public struct EliminateRaidStageExcel : IFlatbufferObject EliminateRaidStageExcel.AddBattleReadyTimelinePhaseEnd(builder, BattleReadyTimelinePhaseEndOffset); EliminateRaidStageExcel.AddBattleReadyTimelinePhaseStart(builder, BattleReadyTimelinePhaseStartOffset); EliminateRaidStageExcel.AddBattleReadyTimelinePath(builder, BattleReadyTimelinePathOffset); - EliminateRaidStageExcel.AddTacticEnvironment(builder, TacticEnvironment); + EliminateRaidStageExcel.AddTacticEnvironment_(builder, TacticEnvironment_); EliminateRaidStageExcel.AddEnterTimeLine(builder, EnterTimeLineOffset); EliminateRaidStageExcel.AddGroundDevName(builder, GroundDevNameOffset); EliminateRaidStageExcel.AddRaidRoomLifeTime(builder, RaidRoomLifeTime); - EliminateRaidStageExcel.AddDifficulty(builder, Difficulty); + EliminateRaidStageExcel.AddDifficulty_(builder, Difficulty_); EliminateRaidStageExcel.AddBossCharacterId(builder, BossCharacterIdOffset); EliminateRaidStageExcel.AddBGPath(builder, BGPathOffset); EliminateRaidStageExcel.AddPortraitPath(builder, PortraitPathOffset); @@ -231,7 +231,7 @@ public struct EliminateRaidStageExcel : IFlatbufferObject public static VectorOffset CreateBossCharacterIdVectorBlock(FlatBufferBuilder builder, ArraySegment data) { builder.StartVector(8, data.Count, 8); builder.Add(data); return builder.EndVector(); } public static VectorOffset CreateBossCharacterIdVectorBlock(FlatBufferBuilder builder, IntPtr dataPtr, int sizeInBytes) { builder.StartVector(1, sizeInBytes, 1); builder.Add(dataPtr, sizeInBytes); return builder.EndVector(); } public static void StartBossCharacterIdVector(FlatBufferBuilder builder, int numElems) { builder.StartVector(8, numElems, 8); } - public static void AddDifficulty(FlatBufferBuilder builder, SCHALE.Common.FlatData.Difficulty difficulty) { builder.AddInt(12, (int)difficulty, 0); } + public static void AddDifficulty_(FlatBufferBuilder builder, SCHALE.Common.FlatData.Difficulty difficulty_) { builder.AddInt(12, (int)difficulty_, 0); } public static void AddIsOpen(FlatBufferBuilder builder, bool isOpen) { builder.AddBool(13, isOpen, false); } public static void AddMaxPlayerCount(FlatBufferBuilder builder, long maxPlayerCount) { builder.AddLong(14, maxPlayerCount, 0); } public static void AddRaidRoomLifeTime(FlatBufferBuilder builder, int raidRoomLifeTime) { builder.AddInt(15, raidRoomLifeTime, 0); } @@ -239,7 +239,7 @@ public struct EliminateRaidStageExcel : IFlatbufferObject public static void AddGroundId(FlatBufferBuilder builder, long groundId) { builder.AddLong(17, groundId, 0); } public static void AddGroundDevName(FlatBufferBuilder builder, StringOffset groundDevNameOffset) { builder.AddOffset(18, groundDevNameOffset.Value, 0); } public static void AddEnterTimeLine(FlatBufferBuilder builder, StringOffset enterTimeLineOffset) { builder.AddOffset(19, enterTimeLineOffset.Value, 0); } - public static void AddTacticEnvironment(FlatBufferBuilder builder, SCHALE.Common.FlatData.TacticEnvironment tacticEnvironment) { builder.AddInt(20, (int)tacticEnvironment, 0); } + public static void AddTacticEnvironment_(FlatBufferBuilder builder, SCHALE.Common.FlatData.TacticEnvironment tacticEnvironment_) { builder.AddInt(20, (int)tacticEnvironment_, 0); } public static void AddDefaultClearScore(FlatBufferBuilder builder, long defaultClearScore) { builder.AddLong(21, defaultClearScore, 0); } public static void AddMaximumScore(FlatBufferBuilder builder, long maximumScore) { builder.AddLong(22, maximumScore, 0); } public static void AddPerSecondMinusScore(FlatBufferBuilder builder, long perSecondMinusScore) { builder.AddLong(23, perSecondMinusScore, 0); } @@ -272,7 +272,7 @@ public struct EliminateRaidStageExcel : IFlatbufferObject public static void AddClearScenarioKey(FlatBufferBuilder builder, uint clearScenarioKey) { builder.AddUint(35, clearScenarioKey, 0); } public static void AddShowSkillCard(FlatBufferBuilder builder, bool showSkillCard) { builder.AddBool(36, showSkillCard, false); } public static void AddBossBGInfoKey(FlatBufferBuilder builder, uint bossBGInfoKey) { builder.AddUint(37, bossBGInfoKey, 0); } - public static void AddEchelonExtensionType(FlatBufferBuilder builder, SCHALE.Common.FlatData.EchelonExtensionType echelonExtensionType) { builder.AddInt(38, (int)echelonExtensionType, 0); } + public static void AddEchelonExtensionType_(FlatBufferBuilder builder, SCHALE.Common.FlatData.EchelonExtensionType echelonExtensionType_) { builder.AddInt(38, (int)echelonExtensionType_, 0); } public static Offset EndEliminateRaidStageExcel(FlatBufferBuilder builder) { int o = builder.EndTable(); return new Offset(o); @@ -297,7 +297,7 @@ public struct EliminateRaidStageExcel : IFlatbufferObject _o.RaidCharacterId = TableEncryptionService.Convert(this.RaidCharacterId, key); _o.BossCharacterId = new List(); for (var _j = 0; _j < this.BossCharacterIdLength; ++_j) {_o.BossCharacterId.Add(TableEncryptionService.Convert(this.BossCharacterId(_j), key));} - _o.Difficulty = TableEncryptionService.Convert(this.Difficulty, key); + _o.Difficulty_ = TableEncryptionService.Convert(this.Difficulty_, key); _o.IsOpen = TableEncryptionService.Convert(this.IsOpen, key); _o.MaxPlayerCount = TableEncryptionService.Convert(this.MaxPlayerCount, key); _o.RaidRoomLifeTime = TableEncryptionService.Convert(this.RaidRoomLifeTime, key); @@ -305,7 +305,7 @@ public struct EliminateRaidStageExcel : IFlatbufferObject _o.GroundId = TableEncryptionService.Convert(this.GroundId, key); _o.GroundDevName = TableEncryptionService.Convert(this.GroundDevName, key); _o.EnterTimeLine = TableEncryptionService.Convert(this.EnterTimeLine, key); - _o.TacticEnvironment = TableEncryptionService.Convert(this.TacticEnvironment, key); + _o.TacticEnvironment_ = TableEncryptionService.Convert(this.TacticEnvironment_, key); _o.DefaultClearScore = TableEncryptionService.Convert(this.DefaultClearScore, key); _o.MaximumScore = TableEncryptionService.Convert(this.MaximumScore, key); _o.PerSecondMinusScore = TableEncryptionService.Convert(this.PerSecondMinusScore, key); @@ -326,7 +326,7 @@ public struct EliminateRaidStageExcel : IFlatbufferObject _o.ClearScenarioKey = TableEncryptionService.Convert(this.ClearScenarioKey, key); _o.ShowSkillCard = TableEncryptionService.Convert(this.ShowSkillCard, key); _o.BossBGInfoKey = TableEncryptionService.Convert(this.BossBGInfoKey, key); - _o.EchelonExtensionType = TableEncryptionService.Convert(this.EchelonExtensionType, key); + _o.EchelonExtensionType_ = TableEncryptionService.Convert(this.EchelonExtensionType_, key); } public static Offset Pack(FlatBufferBuilder builder, EliminateRaidStageExcelT _o) { if (_o == null) return default(Offset); @@ -373,7 +373,7 @@ public struct EliminateRaidStageExcel : IFlatbufferObject _BGPath, _o.RaidCharacterId, _BossCharacterId, - _o.Difficulty, + _o.Difficulty_, _o.IsOpen, _o.MaxPlayerCount, _o.RaidRoomLifeTime, @@ -381,7 +381,7 @@ public struct EliminateRaidStageExcel : IFlatbufferObject _o.GroundId, _GroundDevName, _EnterTimeLine, - _o.TacticEnvironment, + _o.TacticEnvironment_, _o.DefaultClearScore, _o.MaximumScore, _o.PerSecondMinusScore, @@ -399,7 +399,7 @@ public struct EliminateRaidStageExcel : IFlatbufferObject _o.ClearScenarioKey, _o.ShowSkillCard, _o.BossBGInfoKey, - _o.EchelonExtensionType); + _o.EchelonExtensionType_); } } @@ -417,7 +417,7 @@ public class EliminateRaidStageExcelT public string BGPath { get; set; } public long RaidCharacterId { get; set; } public List BossCharacterId { get; set; } - public SCHALE.Common.FlatData.Difficulty Difficulty { get; set; } + public SCHALE.Common.FlatData.Difficulty Difficulty_ { get; set; } public bool IsOpen { get; set; } public long MaxPlayerCount { get; set; } public int RaidRoomLifeTime { get; set; } @@ -425,7 +425,7 @@ public class EliminateRaidStageExcelT public long GroundId { get; set; } public string GroundDevName { get; set; } public string EnterTimeLine { get; set; } - public SCHALE.Common.FlatData.TacticEnvironment TacticEnvironment { get; set; } + public SCHALE.Common.FlatData.TacticEnvironment TacticEnvironment_ { get; set; } public long DefaultClearScore { get; set; } public long MaximumScore { get; set; } public long PerSecondMinusScore { get; set; } @@ -443,7 +443,7 @@ public class EliminateRaidStageExcelT public uint ClearScenarioKey { get; set; } public bool ShowSkillCard { get; set; } public uint BossBGInfoKey { get; set; } - public SCHALE.Common.FlatData.EchelonExtensionType EchelonExtensionType { get; set; } + public SCHALE.Common.FlatData.EchelonExtensionType EchelonExtensionType_ { get; set; } public EliminateRaidStageExcelT() { this.Id = 0; @@ -458,7 +458,7 @@ public class EliminateRaidStageExcelT this.BGPath = null; this.RaidCharacterId = 0; this.BossCharacterId = null; - this.Difficulty = SCHALE.Common.FlatData.Difficulty.Normal; + this.Difficulty_ = SCHALE.Common.FlatData.Difficulty.Normal; this.IsOpen = false; this.MaxPlayerCount = 0; this.RaidRoomLifeTime = 0; @@ -466,7 +466,7 @@ public class EliminateRaidStageExcelT this.GroundId = 0; this.GroundDevName = null; this.EnterTimeLine = null; - this.TacticEnvironment = SCHALE.Common.FlatData.TacticEnvironment.None; + this.TacticEnvironment_ = SCHALE.Common.FlatData.TacticEnvironment.None; this.DefaultClearScore = 0; this.MaximumScore = 0; this.PerSecondMinusScore = 0; @@ -484,7 +484,7 @@ public class EliminateRaidStageExcelT this.ClearScenarioKey = 0; this.ShowSkillCard = false; this.BossBGInfoKey = 0; - this.EchelonExtensionType = SCHALE.Common.FlatData.EchelonExtensionType.Base; + this.EchelonExtensionType_ = SCHALE.Common.FlatData.EchelonExtensionType.Base; } } @@ -506,7 +506,7 @@ static public class EliminateRaidStageExcelVerify && verifier.VerifyString(tablePos, 22 /*BGPath*/, false) && verifier.VerifyField(tablePos, 24 /*RaidCharacterId*/, 8 /*long*/, 8, false) && verifier.VerifyVectorOfData(tablePos, 26 /*BossCharacterId*/, 8 /*long*/, false) - && verifier.VerifyField(tablePos, 28 /*Difficulty*/, 4 /*SCHALE.Common.FlatData.Difficulty*/, 4, false) + && verifier.VerifyField(tablePos, 28 /*Difficulty_*/, 4 /*SCHALE.Common.FlatData.Difficulty*/, 4, false) && verifier.VerifyField(tablePos, 30 /*IsOpen*/, 1 /*bool*/, 1, false) && verifier.VerifyField(tablePos, 32 /*MaxPlayerCount*/, 8 /*long*/, 8, false) && verifier.VerifyField(tablePos, 34 /*RaidRoomLifeTime*/, 4 /*int*/, 4, false) @@ -514,7 +514,7 @@ static public class EliminateRaidStageExcelVerify && verifier.VerifyField(tablePos, 38 /*GroundId*/, 8 /*long*/, 8, false) && verifier.VerifyString(tablePos, 40 /*GroundDevName*/, false) && verifier.VerifyString(tablePos, 42 /*EnterTimeLine*/, false) - && verifier.VerifyField(tablePos, 44 /*TacticEnvironment*/, 4 /*SCHALE.Common.FlatData.TacticEnvironment*/, 4, false) + && verifier.VerifyField(tablePos, 44 /*TacticEnvironment_*/, 4 /*SCHALE.Common.FlatData.TacticEnvironment*/, 4, false) && verifier.VerifyField(tablePos, 46 /*DefaultClearScore*/, 8 /*long*/, 8, false) && verifier.VerifyField(tablePos, 48 /*MaximumScore*/, 8 /*long*/, 8, false) && verifier.VerifyField(tablePos, 50 /*PerSecondMinusScore*/, 8 /*long*/, 8, false) @@ -532,7 +532,7 @@ static public class EliminateRaidStageExcelVerify && verifier.VerifyField(tablePos, 74 /*ClearScenarioKey*/, 4 /*uint*/, 4, false) && verifier.VerifyField(tablePos, 76 /*ShowSkillCard*/, 1 /*bool*/, 1, false) && verifier.VerifyField(tablePos, 78 /*BossBGInfoKey*/, 4 /*uint*/, 4, false) - && verifier.VerifyField(tablePos, 80 /*EchelonExtensionType*/, 4 /*SCHALE.Common.FlatData.EchelonExtensionType*/, 4, false) + && verifier.VerifyField(tablePos, 80 /*EchelonExtensionType_*/, 4 /*SCHALE.Common.FlatData.EchelonExtensionType*/, 4, false) && verifier.VerifyTableEnd(tablePos); } } diff --git a/SCHALE.Common/FlatData/EmblemExcel.cs b/SCHALE.Common/FlatData/EmblemExcel.cs index 8b1e6a3..b923494 100644 --- a/SCHALE.Common/FlatData/EmblemExcel.cs +++ b/SCHALE.Common/FlatData/EmblemExcel.cs @@ -22,7 +22,7 @@ public struct EmblemExcel : IFlatbufferObject public long Id { get { int o = __p.__offset(4); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public SCHALE.Common.FlatData.EmblemCategory Category { get { int o = __p.__offset(6); return o != 0 ? (SCHALE.Common.FlatData.EmblemCategory)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.EmblemCategory.None; } } - public SCHALE.Common.FlatData.Rarity Rarity { get { int o = __p.__offset(8); return o != 0 ? (SCHALE.Common.FlatData.Rarity)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.Rarity.N; } } + public SCHALE.Common.FlatData.Rarity Rarity_ { get { int o = __p.__offset(8); return o != 0 ? (SCHALE.Common.FlatData.Rarity)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.Rarity.N; } } public long DisplayOrder { get { int o = __p.__offset(10); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public uint LocalizeEtcId { get { int o = __p.__offset(12); return o != 0 ? __p.bb.GetUint(o + __p.bb_pos) : (uint)0; } } public uint LocalizeCodeId { get { int o = __p.__offset(14); return o != 0 ? __p.bb.GetUint(o + __p.bb_pos) : (uint)0; } } @@ -87,7 +87,7 @@ public struct EmblemExcel : IFlatbufferObject public static Offset CreateEmblemExcel(FlatBufferBuilder builder, long Id = 0, SCHALE.Common.FlatData.EmblemCategory Category = SCHALE.Common.FlatData.EmblemCategory.None, - SCHALE.Common.FlatData.Rarity Rarity = SCHALE.Common.FlatData.Rarity.N, + SCHALE.Common.FlatData.Rarity Rarity_ = SCHALE.Common.FlatData.Rarity.N, long DisplayOrder = 0, uint LocalizeEtcId = 0, uint LocalizeCodeId = 0, @@ -125,7 +125,7 @@ public struct EmblemExcel : IFlatbufferObject EmblemExcel.AddIconPath(builder, IconPathOffset); EmblemExcel.AddLocalizeCodeId(builder, LocalizeCodeId); EmblemExcel.AddLocalizeEtcId(builder, LocalizeEtcId); - EmblemExcel.AddRarity(builder, Rarity); + EmblemExcel.AddRarity_(builder, Rarity_); EmblemExcel.AddCategory(builder, Category); EmblemExcel.AddEmblemTextVisible(builder, EmblemTextVisible); return EmblemExcel.EndEmblemExcel(builder); @@ -134,7 +134,7 @@ public struct EmblemExcel : IFlatbufferObject public static void StartEmblemExcel(FlatBufferBuilder builder) { builder.StartTable(21); } public static void AddId(FlatBufferBuilder builder, long id) { builder.AddLong(0, id, 0); } public static void AddCategory(FlatBufferBuilder builder, SCHALE.Common.FlatData.EmblemCategory category) { builder.AddInt(1, (int)category, 0); } - public static void AddRarity(FlatBufferBuilder builder, SCHALE.Common.FlatData.Rarity rarity) { builder.AddInt(2, (int)rarity, 0); } + public static void AddRarity_(FlatBufferBuilder builder, SCHALE.Common.FlatData.Rarity rarity_) { builder.AddInt(2, (int)rarity_, 0); } public static void AddDisplayOrder(FlatBufferBuilder builder, long displayOrder) { builder.AddLong(3, displayOrder, 0); } public static void AddLocalizeEtcId(FlatBufferBuilder builder, uint localizeEtcId) { builder.AddUint(4, localizeEtcId, 0); } public static void AddLocalizeCodeId(FlatBufferBuilder builder, uint localizeCodeId) { builder.AddUint(5, localizeCodeId, 0); } @@ -166,7 +166,7 @@ public struct EmblemExcel : IFlatbufferObject byte[] key = TableEncryptionService.CreateKey("Emblem"); _o.Id = TableEncryptionService.Convert(this.Id, key); _o.Category = TableEncryptionService.Convert(this.Category, key); - _o.Rarity = TableEncryptionService.Convert(this.Rarity, key); + _o.Rarity_ = TableEncryptionService.Convert(this.Rarity_, key); _o.DisplayOrder = TableEncryptionService.Convert(this.DisplayOrder, key); _o.LocalizeEtcId = TableEncryptionService.Convert(this.LocalizeEtcId, key); _o.LocalizeCodeId = TableEncryptionService.Convert(this.LocalizeCodeId, key); @@ -199,7 +199,7 @@ public struct EmblemExcel : IFlatbufferObject builder, _o.Id, _o.Category, - _o.Rarity, + _o.Rarity_, _o.DisplayOrder, _o.LocalizeEtcId, _o.LocalizeCodeId, @@ -225,7 +225,7 @@ public class EmblemExcelT { public long Id { get; set; } public SCHALE.Common.FlatData.EmblemCategory Category { get; set; } - public SCHALE.Common.FlatData.Rarity Rarity { get; set; } + public SCHALE.Common.FlatData.Rarity Rarity_ { get; set; } public long DisplayOrder { get; set; } public uint LocalizeEtcId { get; set; } public uint LocalizeCodeId { get; set; } @@ -248,7 +248,7 @@ public class EmblemExcelT public EmblemExcelT() { this.Id = 0; this.Category = SCHALE.Common.FlatData.EmblemCategory.None; - this.Rarity = SCHALE.Common.FlatData.Rarity.N; + this.Rarity_ = SCHALE.Common.FlatData.Rarity.N; this.DisplayOrder = 0; this.LocalizeEtcId = 0; this.LocalizeCodeId = 0; @@ -278,7 +278,7 @@ static public class EmblemExcelVerify return verifier.VerifyTableStart(tablePos) && verifier.VerifyField(tablePos, 4 /*Id*/, 8 /*long*/, 8, false) && verifier.VerifyField(tablePos, 6 /*Category*/, 4 /*SCHALE.Common.FlatData.EmblemCategory*/, 4, false) - && verifier.VerifyField(tablePos, 8 /*Rarity*/, 4 /*SCHALE.Common.FlatData.Rarity*/, 4, false) + && verifier.VerifyField(tablePos, 8 /*Rarity_*/, 4 /*SCHALE.Common.FlatData.Rarity*/, 4, false) && verifier.VerifyField(tablePos, 10 /*DisplayOrder*/, 8 /*long*/, 8, false) && verifier.VerifyField(tablePos, 12 /*LocalizeEtcId*/, 4 /*uint*/, 4, false) && verifier.VerifyField(tablePos, 14 /*LocalizeCodeId*/, 4 /*uint*/, 4, false) diff --git a/SCHALE.Common/FlatData/EquipmentExcel.cs b/SCHALE.Common/FlatData/EquipmentExcel.cs index 85d0f50..089fc0d 100644 --- a/SCHALE.Common/FlatData/EquipmentExcel.cs +++ b/SCHALE.Common/FlatData/EquipmentExcel.cs @@ -21,8 +21,8 @@ public struct EquipmentExcel : IFlatbufferObject public EquipmentExcel __assign(int _i, ByteBuffer _bb) { __init(_i, _bb); return this; } public long Id { get { int o = __p.__offset(4); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } - public SCHALE.Common.FlatData.EquipmentCategory EquipmentCategory { get { int o = __p.__offset(6); return o != 0 ? (SCHALE.Common.FlatData.EquipmentCategory)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.EquipmentCategory.Unable; } } - public SCHALE.Common.FlatData.Rarity Rarity { get { int o = __p.__offset(8); return o != 0 ? (SCHALE.Common.FlatData.Rarity)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.Rarity.N; } } + public SCHALE.Common.FlatData.EquipmentCategory EquipmentCategory_ { get { int o = __p.__offset(6); return o != 0 ? (SCHALE.Common.FlatData.EquipmentCategory)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.EquipmentCategory.Unable; } } + public SCHALE.Common.FlatData.Rarity Rarity_ { get { int o = __p.__offset(8); return o != 0 ? (SCHALE.Common.FlatData.Rarity)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.Rarity.N; } } public uint LocalizeEtcId { get { int o = __p.__offset(10); return o != 0 ? __p.bb.GetUint(o + __p.bb_pos) : (uint)0; } } public bool Wear { get { int o = __p.__offset(12); return o != 0 ? 0!=__p.bb.Get(o + __p.bb_pos) : (bool)false; } } public int MaxLevel { get { int o = __p.__offset(14); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } @@ -68,8 +68,8 @@ public struct EquipmentExcel : IFlatbufferObject public static Offset CreateEquipmentExcel(FlatBufferBuilder builder, long Id = 0, - SCHALE.Common.FlatData.EquipmentCategory EquipmentCategory = SCHALE.Common.FlatData.EquipmentCategory.Unable, - SCHALE.Common.FlatData.Rarity Rarity = SCHALE.Common.FlatData.Rarity.N, + SCHALE.Common.FlatData.EquipmentCategory EquipmentCategory_ = SCHALE.Common.FlatData.EquipmentCategory.Unable, + SCHALE.Common.FlatData.Rarity Rarity_ = SCHALE.Common.FlatData.Rarity.N, uint LocalizeEtcId = 0, bool Wear = false, int MaxLevel = 0, @@ -103,16 +103,16 @@ public struct EquipmentExcel : IFlatbufferObject EquipmentExcel.AddRecipeId(builder, RecipeId); EquipmentExcel.AddMaxLevel(builder, MaxLevel); EquipmentExcel.AddLocalizeEtcId(builder, LocalizeEtcId); - EquipmentExcel.AddRarity(builder, Rarity); - EquipmentExcel.AddEquipmentCategory(builder, EquipmentCategory); + EquipmentExcel.AddRarity_(builder, Rarity_); + EquipmentExcel.AddEquipmentCategory_(builder, EquipmentCategory_); EquipmentExcel.AddWear(builder, Wear); return EquipmentExcel.EndEquipmentExcel(builder); } public static void StartEquipmentExcel(FlatBufferBuilder builder) { builder.StartTable(19); } public static void AddId(FlatBufferBuilder builder, long id) { builder.AddLong(0, id, 0); } - public static void AddEquipmentCategory(FlatBufferBuilder builder, SCHALE.Common.FlatData.EquipmentCategory equipmentCategory) { builder.AddInt(1, (int)equipmentCategory, 0); } - public static void AddRarity(FlatBufferBuilder builder, SCHALE.Common.FlatData.Rarity rarity) { builder.AddInt(2, (int)rarity, 0); } + public static void AddEquipmentCategory_(FlatBufferBuilder builder, SCHALE.Common.FlatData.EquipmentCategory equipmentCategory_) { builder.AddInt(1, (int)equipmentCategory_, 0); } + public static void AddRarity_(FlatBufferBuilder builder, SCHALE.Common.FlatData.Rarity rarity_) { builder.AddInt(2, (int)rarity_, 0); } public static void AddLocalizeEtcId(FlatBufferBuilder builder, uint localizeEtcId) { builder.AddUint(3, localizeEtcId, 0); } public static void AddWear(FlatBufferBuilder builder, bool wear) { builder.AddBool(4, wear, false); } public static void AddMaxLevel(FlatBufferBuilder builder, int maxLevel) { builder.AddInt(5, maxLevel, 0); } @@ -151,8 +151,8 @@ public struct EquipmentExcel : IFlatbufferObject public void UnPackTo(EquipmentExcelT _o) { byte[] key = TableEncryptionService.CreateKey("Equipment"); _o.Id = TableEncryptionService.Convert(this.Id, key); - _o.EquipmentCategory = TableEncryptionService.Convert(this.EquipmentCategory, key); - _o.Rarity = TableEncryptionService.Convert(this.Rarity, key); + _o.EquipmentCategory_ = TableEncryptionService.Convert(this.EquipmentCategory_, key); + _o.Rarity_ = TableEncryptionService.Convert(this.Rarity_, key); _o.LocalizeEtcId = TableEncryptionService.Convert(this.LocalizeEtcId, key); _o.Wear = TableEncryptionService.Convert(this.Wear, key); _o.MaxLevel = TableEncryptionService.Convert(this.MaxLevel, key); @@ -189,8 +189,8 @@ public struct EquipmentExcel : IFlatbufferObject return CreateEquipmentExcel( builder, _o.Id, - _o.EquipmentCategory, - _o.Rarity, + _o.EquipmentCategory_, + _o.Rarity_, _o.LocalizeEtcId, _o.Wear, _o.MaxLevel, @@ -213,8 +213,8 @@ public struct EquipmentExcel : IFlatbufferObject public class EquipmentExcelT { public long Id { get; set; } - public SCHALE.Common.FlatData.EquipmentCategory EquipmentCategory { get; set; } - public SCHALE.Common.FlatData.Rarity Rarity { get; set; } + public SCHALE.Common.FlatData.EquipmentCategory EquipmentCategory_ { get; set; } + public SCHALE.Common.FlatData.Rarity Rarity_ { get; set; } public uint LocalizeEtcId { get; set; } public bool Wear { get; set; } public int MaxLevel { get; set; } @@ -234,8 +234,8 @@ public class EquipmentExcelT public EquipmentExcelT() { this.Id = 0; - this.EquipmentCategory = SCHALE.Common.FlatData.EquipmentCategory.Unable; - this.Rarity = SCHALE.Common.FlatData.Rarity.N; + this.EquipmentCategory_ = SCHALE.Common.FlatData.EquipmentCategory.Unable; + this.Rarity_ = SCHALE.Common.FlatData.Rarity.N; this.LocalizeEtcId = 0; this.Wear = false; this.MaxLevel = 0; @@ -262,8 +262,8 @@ static public class EquipmentExcelVerify { return verifier.VerifyTableStart(tablePos) && verifier.VerifyField(tablePos, 4 /*Id*/, 8 /*long*/, 8, false) - && verifier.VerifyField(tablePos, 6 /*EquipmentCategory*/, 4 /*SCHALE.Common.FlatData.EquipmentCategory*/, 4, false) - && verifier.VerifyField(tablePos, 8 /*Rarity*/, 4 /*SCHALE.Common.FlatData.Rarity*/, 4, false) + && verifier.VerifyField(tablePos, 6 /*EquipmentCategory_*/, 4 /*SCHALE.Common.FlatData.EquipmentCategory*/, 4, false) + && verifier.VerifyField(tablePos, 8 /*Rarity_*/, 4 /*SCHALE.Common.FlatData.Rarity*/, 4, false) && verifier.VerifyField(tablePos, 10 /*LocalizeEtcId*/, 4 /*uint*/, 4, false) && verifier.VerifyField(tablePos, 12 /*Wear*/, 1 /*bool*/, 1, false) && verifier.VerifyField(tablePos, 14 /*MaxLevel*/, 4 /*int*/, 4, false) diff --git a/SCHALE.Common/FlatData/EquipmentStatExcel.cs b/SCHALE.Common/FlatData/EquipmentStatExcel.cs index 671da4f..c903520 100644 --- a/SCHALE.Common/FlatData/EquipmentStatExcel.cs +++ b/SCHALE.Common/FlatData/EquipmentStatExcel.cs @@ -21,7 +21,7 @@ public struct EquipmentStatExcel : IFlatbufferObject public EquipmentStatExcel __assign(int _i, ByteBuffer _bb) { __init(_i, _bb); return this; } public long EquipmentId { get { int o = __p.__offset(4); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } - public SCHALE.Common.FlatData.StatLevelUpType StatLevelUpType { get { int o = __p.__offset(6); return o != 0 ? (SCHALE.Common.FlatData.StatLevelUpType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.StatLevelUpType.Standard; } } + public SCHALE.Common.FlatData.StatLevelUpType StatLevelUpType_ { get { int o = __p.__offset(6); return o != 0 ? (SCHALE.Common.FlatData.StatLevelUpType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.StatLevelUpType.Standard; } } public SCHALE.Common.FlatData.EquipmentOptionType StatType(int j) { int o = __p.__offset(8); return o != 0 ? (SCHALE.Common.FlatData.EquipmentOptionType)__p.bb.GetInt(__p.__vector(o) + j * 4) : (SCHALE.Common.FlatData.EquipmentOptionType)0; } public int StatTypeLength { get { int o = __p.__offset(8); return o != 0 ? __p.__vector_len(o) : 0; } } #if ENABLE_SPAN_T @@ -50,7 +50,7 @@ public struct EquipmentStatExcel : IFlatbufferObject public long LevelUpFeedExp { get { int o = __p.__offset(16); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public SCHALE.Common.FlatData.CurrencyTypes LevelUpFeedCostCurrency { get { int o = __p.__offset(18); return o != 0 ? (SCHALE.Common.FlatData.CurrencyTypes)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.CurrencyTypes.Invalid; } } public long LevelUpFeedCostAmount { get { int o = __p.__offset(20); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } - public SCHALE.Common.FlatData.EquipmentCategory EquipmentCategory { get { int o = __p.__offset(22); return o != 0 ? (SCHALE.Common.FlatData.EquipmentCategory)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.EquipmentCategory.Unable; } } + public SCHALE.Common.FlatData.EquipmentCategory EquipmentCategory_ { get { int o = __p.__offset(22); return o != 0 ? (SCHALE.Common.FlatData.EquipmentCategory)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.EquipmentCategory.Unable; } } public long LevelUpFeedAddExp { get { int o = __p.__offset(24); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public int DefaultMaxLevel { get { int o = __p.__offset(26); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } public int TranscendenceMax { get { int o = __p.__offset(28); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } @@ -64,7 +64,7 @@ public struct EquipmentStatExcel : IFlatbufferObject public static Offset CreateEquipmentStatExcel(FlatBufferBuilder builder, long EquipmentId = 0, - SCHALE.Common.FlatData.StatLevelUpType StatLevelUpType = SCHALE.Common.FlatData.StatLevelUpType.Standard, + SCHALE.Common.FlatData.StatLevelUpType StatLevelUpType_ = SCHALE.Common.FlatData.StatLevelUpType.Standard, VectorOffset StatTypeOffset = default(VectorOffset), VectorOffset MinStatOffset = default(VectorOffset), VectorOffset MaxStatOffset = default(VectorOffset), @@ -72,7 +72,7 @@ public struct EquipmentStatExcel : IFlatbufferObject long LevelUpFeedExp = 0, SCHALE.Common.FlatData.CurrencyTypes LevelUpFeedCostCurrency = SCHALE.Common.FlatData.CurrencyTypes.Invalid, long LevelUpFeedCostAmount = 0, - SCHALE.Common.FlatData.EquipmentCategory EquipmentCategory = SCHALE.Common.FlatData.EquipmentCategory.Unable, + SCHALE.Common.FlatData.EquipmentCategory EquipmentCategory_ = SCHALE.Common.FlatData.EquipmentCategory.Unable, long LevelUpFeedAddExp = 0, int DefaultMaxLevel = 0, int TranscendenceMax = 0, @@ -85,19 +85,19 @@ public struct EquipmentStatExcel : IFlatbufferObject EquipmentStatExcel.AddDamageFactorGroupId(builder, DamageFactorGroupIdOffset); EquipmentStatExcel.AddTranscendenceMax(builder, TranscendenceMax); EquipmentStatExcel.AddDefaultMaxLevel(builder, DefaultMaxLevel); - EquipmentStatExcel.AddEquipmentCategory(builder, EquipmentCategory); + EquipmentStatExcel.AddEquipmentCategory_(builder, EquipmentCategory_); EquipmentStatExcel.AddLevelUpFeedCostCurrency(builder, LevelUpFeedCostCurrency); EquipmentStatExcel.AddLevelUpInsertLimit(builder, LevelUpInsertLimit); EquipmentStatExcel.AddMaxStat(builder, MaxStatOffset); EquipmentStatExcel.AddMinStat(builder, MinStatOffset); EquipmentStatExcel.AddStatType(builder, StatTypeOffset); - EquipmentStatExcel.AddStatLevelUpType(builder, StatLevelUpType); + EquipmentStatExcel.AddStatLevelUpType_(builder, StatLevelUpType_); return EquipmentStatExcel.EndEquipmentStatExcel(builder); } public static void StartEquipmentStatExcel(FlatBufferBuilder builder) { builder.StartTable(14); } public static void AddEquipmentId(FlatBufferBuilder builder, long equipmentId) { builder.AddLong(0, equipmentId, 0); } - public static void AddStatLevelUpType(FlatBufferBuilder builder, SCHALE.Common.FlatData.StatLevelUpType statLevelUpType) { builder.AddInt(1, (int)statLevelUpType, 0); } + public static void AddStatLevelUpType_(FlatBufferBuilder builder, SCHALE.Common.FlatData.StatLevelUpType statLevelUpType_) { builder.AddInt(1, (int)statLevelUpType_, 0); } public static void AddStatType(FlatBufferBuilder builder, VectorOffset statTypeOffset) { builder.AddOffset(2, statTypeOffset.Value, 0); } public static VectorOffset CreateStatTypeVector(FlatBufferBuilder builder, SCHALE.Common.FlatData.EquipmentOptionType[] data) { builder.StartVector(4, data.Length, 4); for (int i = data.Length - 1; i >= 0; i--) builder.AddInt((int)data[i]); return builder.EndVector(); } public static VectorOffset CreateStatTypeVectorBlock(FlatBufferBuilder builder, SCHALE.Common.FlatData.EquipmentOptionType[] data) { builder.StartVector(4, data.Length, 4); builder.Add(data); return builder.EndVector(); } @@ -120,7 +120,7 @@ public struct EquipmentStatExcel : IFlatbufferObject public static void AddLevelUpFeedExp(FlatBufferBuilder builder, long levelUpFeedExp) { builder.AddLong(6, levelUpFeedExp, 0); } public static void AddLevelUpFeedCostCurrency(FlatBufferBuilder builder, SCHALE.Common.FlatData.CurrencyTypes levelUpFeedCostCurrency) { builder.AddInt(7, (int)levelUpFeedCostCurrency, 0); } public static void AddLevelUpFeedCostAmount(FlatBufferBuilder builder, long levelUpFeedCostAmount) { builder.AddLong(8, levelUpFeedCostAmount, 0); } - public static void AddEquipmentCategory(FlatBufferBuilder builder, SCHALE.Common.FlatData.EquipmentCategory equipmentCategory) { builder.AddInt(9, (int)equipmentCategory, 0); } + public static void AddEquipmentCategory_(FlatBufferBuilder builder, SCHALE.Common.FlatData.EquipmentCategory equipmentCategory_) { builder.AddInt(9, (int)equipmentCategory_, 0); } public static void AddLevelUpFeedAddExp(FlatBufferBuilder builder, long levelUpFeedAddExp) { builder.AddLong(10, levelUpFeedAddExp, 0); } public static void AddDefaultMaxLevel(FlatBufferBuilder builder, int defaultMaxLevel) { builder.AddInt(11, defaultMaxLevel, 0); } public static void AddTranscendenceMax(FlatBufferBuilder builder, int transcendenceMax) { builder.AddInt(12, transcendenceMax, 0); } @@ -137,7 +137,7 @@ public struct EquipmentStatExcel : IFlatbufferObject public void UnPackTo(EquipmentStatExcelT _o) { byte[] key = TableEncryptionService.CreateKey("EquipmentStat"); _o.EquipmentId = TableEncryptionService.Convert(this.EquipmentId, key); - _o.StatLevelUpType = TableEncryptionService.Convert(this.StatLevelUpType, key); + _o.StatLevelUpType_ = TableEncryptionService.Convert(this.StatLevelUpType_, key); _o.StatType = new List(); for (var _j = 0; _j < this.StatTypeLength; ++_j) {_o.StatType.Add(TableEncryptionService.Convert(this.StatType(_j), key));} _o.MinStat = new List(); @@ -148,7 +148,7 @@ public struct EquipmentStatExcel : IFlatbufferObject _o.LevelUpFeedExp = TableEncryptionService.Convert(this.LevelUpFeedExp, key); _o.LevelUpFeedCostCurrency = TableEncryptionService.Convert(this.LevelUpFeedCostCurrency, key); _o.LevelUpFeedCostAmount = TableEncryptionService.Convert(this.LevelUpFeedCostAmount, key); - _o.EquipmentCategory = TableEncryptionService.Convert(this.EquipmentCategory, key); + _o.EquipmentCategory_ = TableEncryptionService.Convert(this.EquipmentCategory_, key); _o.LevelUpFeedAddExp = TableEncryptionService.Convert(this.LevelUpFeedAddExp, key); _o.DefaultMaxLevel = TableEncryptionService.Convert(this.DefaultMaxLevel, key); _o.TranscendenceMax = TableEncryptionService.Convert(this.TranscendenceMax, key); @@ -175,7 +175,7 @@ public struct EquipmentStatExcel : IFlatbufferObject return CreateEquipmentStatExcel( builder, _o.EquipmentId, - _o.StatLevelUpType, + _o.StatLevelUpType_, _StatType, _MinStat, _MaxStat, @@ -183,7 +183,7 @@ public struct EquipmentStatExcel : IFlatbufferObject _o.LevelUpFeedExp, _o.LevelUpFeedCostCurrency, _o.LevelUpFeedCostAmount, - _o.EquipmentCategory, + _o.EquipmentCategory_, _o.LevelUpFeedAddExp, _o.DefaultMaxLevel, _o.TranscendenceMax, @@ -194,7 +194,7 @@ public struct EquipmentStatExcel : IFlatbufferObject public class EquipmentStatExcelT { public long EquipmentId { get; set; } - public SCHALE.Common.FlatData.StatLevelUpType StatLevelUpType { get; set; } + public SCHALE.Common.FlatData.StatLevelUpType StatLevelUpType_ { get; set; } public List StatType { get; set; } public List MinStat { get; set; } public List MaxStat { get; set; } @@ -202,7 +202,7 @@ public class EquipmentStatExcelT public long LevelUpFeedExp { get; set; } public SCHALE.Common.FlatData.CurrencyTypes LevelUpFeedCostCurrency { get; set; } public long LevelUpFeedCostAmount { get; set; } - public SCHALE.Common.FlatData.EquipmentCategory EquipmentCategory { get; set; } + public SCHALE.Common.FlatData.EquipmentCategory EquipmentCategory_ { get; set; } public long LevelUpFeedAddExp { get; set; } public int DefaultMaxLevel { get; set; } public int TranscendenceMax { get; set; } @@ -210,7 +210,7 @@ public class EquipmentStatExcelT public EquipmentStatExcelT() { this.EquipmentId = 0; - this.StatLevelUpType = SCHALE.Common.FlatData.StatLevelUpType.Standard; + this.StatLevelUpType_ = SCHALE.Common.FlatData.StatLevelUpType.Standard; this.StatType = null; this.MinStat = null; this.MaxStat = null; @@ -218,7 +218,7 @@ public class EquipmentStatExcelT this.LevelUpFeedExp = 0; this.LevelUpFeedCostCurrency = SCHALE.Common.FlatData.CurrencyTypes.Invalid; this.LevelUpFeedCostAmount = 0; - this.EquipmentCategory = SCHALE.Common.FlatData.EquipmentCategory.Unable; + this.EquipmentCategory_ = SCHALE.Common.FlatData.EquipmentCategory.Unable; this.LevelUpFeedAddExp = 0; this.DefaultMaxLevel = 0; this.TranscendenceMax = 0; @@ -233,7 +233,7 @@ static public class EquipmentStatExcelVerify { return verifier.VerifyTableStart(tablePos) && verifier.VerifyField(tablePos, 4 /*EquipmentId*/, 8 /*long*/, 8, false) - && verifier.VerifyField(tablePos, 6 /*StatLevelUpType*/, 4 /*SCHALE.Common.FlatData.StatLevelUpType*/, 4, false) + && verifier.VerifyField(tablePos, 6 /*StatLevelUpType_*/, 4 /*SCHALE.Common.FlatData.StatLevelUpType*/, 4, false) && verifier.VerifyVectorOfData(tablePos, 8 /*StatType*/, 4 /*SCHALE.Common.FlatData.EquipmentOptionType*/, false) && verifier.VerifyVectorOfData(tablePos, 10 /*MinStat*/, 8 /*long*/, false) && verifier.VerifyVectorOfData(tablePos, 12 /*MaxStat*/, 8 /*long*/, false) @@ -241,7 +241,7 @@ static public class EquipmentStatExcelVerify && verifier.VerifyField(tablePos, 16 /*LevelUpFeedExp*/, 8 /*long*/, 8, false) && verifier.VerifyField(tablePos, 18 /*LevelUpFeedCostCurrency*/, 4 /*SCHALE.Common.FlatData.CurrencyTypes*/, 4, false) && verifier.VerifyField(tablePos, 20 /*LevelUpFeedCostAmount*/, 8 /*long*/, 8, false) - && verifier.VerifyField(tablePos, 22 /*EquipmentCategory*/, 4 /*SCHALE.Common.FlatData.EquipmentCategory*/, 4, false) + && verifier.VerifyField(tablePos, 22 /*EquipmentCategory_*/, 4 /*SCHALE.Common.FlatData.EquipmentCategory*/, 4, false) && verifier.VerifyField(tablePos, 24 /*LevelUpFeedAddExp*/, 8 /*long*/, 8, false) && verifier.VerifyField(tablePos, 26 /*DefaultMaxLevel*/, 4 /*int*/, 4, false) && verifier.VerifyField(tablePos, 28 /*TranscendenceMax*/, 4 /*int*/, 4, false) diff --git a/SCHALE.Common/FlatData/EventContentCardShopExcel.cs b/SCHALE.Common/FlatData/EventContentCardShopExcel.cs index ca3586f..93b0f2a 100644 --- a/SCHALE.Common/FlatData/EventContentCardShopExcel.cs +++ b/SCHALE.Common/FlatData/EventContentCardShopExcel.cs @@ -22,7 +22,7 @@ public struct EventContentCardShopExcel : IFlatbufferObject public long EventContentId { get { int o = __p.__offset(4); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public long Id { get { int o = __p.__offset(6); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } - public SCHALE.Common.FlatData.Rarity Rarity { get { int o = __p.__offset(8); return o != 0 ? (SCHALE.Common.FlatData.Rarity)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.Rarity.N; } } + public SCHALE.Common.FlatData.Rarity Rarity_ { get { int o = __p.__offset(8); return o != 0 ? (SCHALE.Common.FlatData.Rarity)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.Rarity.N; } } public long CostGoodsId { get { int o = __p.__offset(10); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public int CardGroupId { get { int o = __p.__offset(12); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } public bool IsLegacy { get { int o = __p.__offset(14); return o != 0 ? 0!=__p.bb.Get(o + __p.bb_pos) : (bool)false; } } @@ -57,7 +57,7 @@ public struct EventContentCardShopExcel : IFlatbufferObject public static Offset CreateEventContentCardShopExcel(FlatBufferBuilder builder, long EventContentId = 0, long Id = 0, - SCHALE.Common.FlatData.Rarity Rarity = SCHALE.Common.FlatData.Rarity.N, + SCHALE.Common.FlatData.Rarity Rarity_ = SCHALE.Common.FlatData.Rarity.N, long CostGoodsId = 0, int CardGroupId = 0, bool IsLegacy = false, @@ -78,7 +78,7 @@ public struct EventContentCardShopExcel : IFlatbufferObject EventContentCardShopExcel.AddProb(builder, Prob); EventContentCardShopExcel.AddRefreshGroup(builder, RefreshGroup); EventContentCardShopExcel.AddCardGroupId(builder, CardGroupId); - EventContentCardShopExcel.AddRarity(builder, Rarity); + EventContentCardShopExcel.AddRarity_(builder, Rarity_); EventContentCardShopExcel.AddIsLegacy(builder, IsLegacy); return EventContentCardShopExcel.EndEventContentCardShopExcel(builder); } @@ -86,7 +86,7 @@ public struct EventContentCardShopExcel : IFlatbufferObject public static void StartEventContentCardShopExcel(FlatBufferBuilder builder) { builder.StartTable(12); } public static void AddEventContentId(FlatBufferBuilder builder, long eventContentId) { builder.AddLong(0, eventContentId, 0); } public static void AddId(FlatBufferBuilder builder, long id) { builder.AddLong(1, id, 0); } - public static void AddRarity(FlatBufferBuilder builder, SCHALE.Common.FlatData.Rarity rarity) { builder.AddInt(2, (int)rarity, 0); } + public static void AddRarity_(FlatBufferBuilder builder, SCHALE.Common.FlatData.Rarity rarity_) { builder.AddInt(2, (int)rarity_, 0); } public static void AddCostGoodsId(FlatBufferBuilder builder, long costGoodsId) { builder.AddLong(3, costGoodsId, 0); } public static void AddCardGroupId(FlatBufferBuilder builder, int cardGroupId) { builder.AddInt(4, cardGroupId, 0); } public static void AddIsLegacy(FlatBufferBuilder builder, bool isLegacy) { builder.AddBool(5, isLegacy, false); } @@ -124,7 +124,7 @@ public struct EventContentCardShopExcel : IFlatbufferObject byte[] key = TableEncryptionService.CreateKey("EventContentCardShop"); _o.EventContentId = TableEncryptionService.Convert(this.EventContentId, key); _o.Id = TableEncryptionService.Convert(this.Id, key); - _o.Rarity = TableEncryptionService.Convert(this.Rarity, key); + _o.Rarity_ = TableEncryptionService.Convert(this.Rarity_, key); _o.CostGoodsId = TableEncryptionService.Convert(this.CostGoodsId, key); _o.CardGroupId = TableEncryptionService.Convert(this.CardGroupId, key); _o.IsLegacy = TableEncryptionService.Convert(this.IsLegacy, key); @@ -159,7 +159,7 @@ public struct EventContentCardShopExcel : IFlatbufferObject builder, _o.EventContentId, _o.Id, - _o.Rarity, + _o.Rarity_, _o.CostGoodsId, _o.CardGroupId, _o.IsLegacy, @@ -176,7 +176,7 @@ public class EventContentCardShopExcelT { public long EventContentId { get; set; } public long Id { get; set; } - public SCHALE.Common.FlatData.Rarity Rarity { get; set; } + public SCHALE.Common.FlatData.Rarity Rarity_ { get; set; } public long CostGoodsId { get; set; } public int CardGroupId { get; set; } public bool IsLegacy { get; set; } @@ -190,7 +190,7 @@ public class EventContentCardShopExcelT public EventContentCardShopExcelT() { this.EventContentId = 0; this.Id = 0; - this.Rarity = SCHALE.Common.FlatData.Rarity.N; + this.Rarity_ = SCHALE.Common.FlatData.Rarity.N; this.CostGoodsId = 0; this.CardGroupId = 0; this.IsLegacy = false; @@ -211,7 +211,7 @@ static public class EventContentCardShopExcelVerify return verifier.VerifyTableStart(tablePos) && verifier.VerifyField(tablePos, 4 /*EventContentId*/, 8 /*long*/, 8, false) && verifier.VerifyField(tablePos, 6 /*Id*/, 8 /*long*/, 8, false) - && verifier.VerifyField(tablePos, 8 /*Rarity*/, 4 /*SCHALE.Common.FlatData.Rarity*/, 4, false) + && verifier.VerifyField(tablePos, 8 /*Rarity_*/, 4 /*SCHALE.Common.FlatData.Rarity*/, 4, false) && verifier.VerifyField(tablePos, 10 /*CostGoodsId*/, 8 /*long*/, 8, false) && verifier.VerifyField(tablePos, 12 /*CardGroupId*/, 4 /*int*/, 4, false) && verifier.VerifyField(tablePos, 14 /*IsLegacy*/, 1 /*bool*/, 1, false) diff --git a/SCHALE.Common/FlatData/EventContentCollectionExcel.cs b/SCHALE.Common/FlatData/EventContentCollectionExcel.cs index 1da6f83..31fd718 100644 --- a/SCHALE.Common/FlatData/EventContentCollectionExcel.cs +++ b/SCHALE.Common/FlatData/EventContentCollectionExcel.cs @@ -23,7 +23,7 @@ public struct EventContentCollectionExcel : IFlatbufferObject public long Id { get { int o = __p.__offset(4); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public long EventContentId { get { int o = __p.__offset(6); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public long GroupId { get { int o = __p.__offset(8); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } - public SCHALE.Common.FlatData.EventCollectionUnlockType UnlockConditionType { get { int o = __p.__offset(10); return o != 0 ? (SCHALE.Common.FlatData.EventCollectionUnlockType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.EventCollectionUnlockType.None; } } + public SCHALE.Common.FlatData.CollectionUnlockType UnlockConditionType { get { int o = __p.__offset(10); return o != 0 ? (SCHALE.Common.FlatData.CollectionUnlockType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.CollectionUnlockType.None; } } public long UnlockConditionParameter(int j) { int o = __p.__offset(12); return o != 0 ? __p.bb.GetLong(__p.__vector(o) + j * 8) : (long)0; } public int UnlockConditionParameterLength { get { int o = __p.__offset(12); return o != 0 ? __p.__vector_len(o) : 0; } } #if ENABLE_SPAN_T @@ -32,56 +32,58 @@ public struct EventContentCollectionExcel : IFlatbufferObject public ArraySegment? GetUnlockConditionParameterBytes() { return __p.__vector_as_arraysegment(12); } #endif public long[] GetUnlockConditionParameterArray() { return __p.__vector_as_array(12); } - public SCHALE.Common.FlatData.MultipleConditionCheckType MultipleConditionCheckType { get { int o = __p.__offset(14); return o != 0 ? (SCHALE.Common.FlatData.MultipleConditionCheckType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.MultipleConditionCheckType.And; } } + public SCHALE.Common.FlatData.MultipleConditionCheckType MultipleConditionCheckType_ { get { int o = __p.__offset(14); return o != 0 ? (SCHALE.Common.FlatData.MultipleConditionCheckType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.MultipleConditionCheckType.And; } } public long UnlockConditionCount { get { int o = __p.__offset(16); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public bool IsObject { get { int o = __p.__offset(18); return o != 0 ? 0!=__p.bb.Get(o + __p.bb_pos) : (bool)false; } } - public bool IsHorizon { get { int o = __p.__offset(20); return o != 0 ? 0!=__p.bb.Get(o + __p.bb_pos) : (bool)false; } } - public string EmblemResource { get { int o = __p.__offset(22); return o != 0 ? __p.__string(o + __p.bb_pos) : null; } } + public bool IsObjectOnFullResource { get { int o = __p.__offset(20); return o != 0 ? 0!=__p.bb.Get(o + __p.bb_pos) : (bool)false; } } + public bool IsHorizon { get { int o = __p.__offset(22); return o != 0 ? 0!=__p.bb.Get(o + __p.bb_pos) : (bool)false; } } + public string EmblemResource { get { int o = __p.__offset(24); return o != 0 ? __p.__string(o + __p.bb_pos) : null; } } #if ENABLE_SPAN_T - public Span GetEmblemResourceBytes() { return __p.__vector_as_span(22, 1); } + public Span GetEmblemResourceBytes() { return __p.__vector_as_span(24, 1); } #else - public ArraySegment? GetEmblemResourceBytes() { return __p.__vector_as_arraysegment(22); } + public ArraySegment? GetEmblemResourceBytes() { return __p.__vector_as_arraysegment(24); } #endif - public byte[] GetEmblemResourceArray() { return __p.__vector_as_array(22); } - public string ThumbResource { get { int o = __p.__offset(24); return o != 0 ? __p.__string(o + __p.bb_pos) : null; } } + public byte[] GetEmblemResourceArray() { return __p.__vector_as_array(24); } + public string ThumbResource { get { int o = __p.__offset(26); return o != 0 ? __p.__string(o + __p.bb_pos) : null; } } #if ENABLE_SPAN_T - public Span GetThumbResourceBytes() { return __p.__vector_as_span(24, 1); } + public Span GetThumbResourceBytes() { return __p.__vector_as_span(26, 1); } #else - public ArraySegment? GetThumbResourceBytes() { return __p.__vector_as_arraysegment(24); } + public ArraySegment? GetThumbResourceBytes() { return __p.__vector_as_arraysegment(26); } #endif - public byte[] GetThumbResourceArray() { return __p.__vector_as_array(24); } - public string FullResource { get { int o = __p.__offset(26); return o != 0 ? __p.__string(o + __p.bb_pos) : null; } } + public byte[] GetThumbResourceArray() { return __p.__vector_as_array(26); } + public string FullResource { get { int o = __p.__offset(28); return o != 0 ? __p.__string(o + __p.bb_pos) : null; } } #if ENABLE_SPAN_T - public Span GetFullResourceBytes() { return __p.__vector_as_span(26, 1); } + public Span GetFullResourceBytes() { return __p.__vector_as_span(28, 1); } #else - public ArraySegment? GetFullResourceBytes() { return __p.__vector_as_arraysegment(26); } + public ArraySegment? GetFullResourceBytes() { return __p.__vector_as_arraysegment(28); } #endif - public byte[] GetFullResourceArray() { return __p.__vector_as_array(26); } - public uint LocalizeEtcId { get { int o = __p.__offset(28); return o != 0 ? __p.bb.GetUint(o + __p.bb_pos) : (uint)0; } } - public string SubNameLocalizeCodeId { get { int o = __p.__offset(30); return o != 0 ? __p.__string(o + __p.bb_pos) : null; } } + public byte[] GetFullResourceArray() { return __p.__vector_as_array(28); } + public uint LocalizeEtcId { get { int o = __p.__offset(30); return o != 0 ? __p.bb.GetUint(o + __p.bb_pos) : (uint)0; } } + public string SubNameLocalizeCodeId { get { int o = __p.__offset(32); return o != 0 ? __p.__string(o + __p.bb_pos) : null; } } #if ENABLE_SPAN_T - public Span GetSubNameLocalizeCodeIdBytes() { return __p.__vector_as_span(30, 1); } + public Span GetSubNameLocalizeCodeIdBytes() { return __p.__vector_as_span(32, 1); } #else - public ArraySegment? GetSubNameLocalizeCodeIdBytes() { return __p.__vector_as_arraysegment(30); } + public ArraySegment? GetSubNameLocalizeCodeIdBytes() { return __p.__vector_as_arraysegment(32); } #endif - public byte[] GetSubNameLocalizeCodeIdArray() { return __p.__vector_as_array(30); } + public byte[] GetSubNameLocalizeCodeIdArray() { return __p.__vector_as_array(32); } public static Offset CreateEventContentCollectionExcel(FlatBufferBuilder builder, long Id = 0, long EventContentId = 0, long GroupId = 0, - SCHALE.Common.FlatData.EventCollectionUnlockType UnlockConditionType = SCHALE.Common.FlatData.EventCollectionUnlockType.None, + SCHALE.Common.FlatData.CollectionUnlockType UnlockConditionType = SCHALE.Common.FlatData.CollectionUnlockType.None, VectorOffset UnlockConditionParameterOffset = default(VectorOffset), - SCHALE.Common.FlatData.MultipleConditionCheckType MultipleConditionCheckType = SCHALE.Common.FlatData.MultipleConditionCheckType.And, + SCHALE.Common.FlatData.MultipleConditionCheckType MultipleConditionCheckType_ = SCHALE.Common.FlatData.MultipleConditionCheckType.And, long UnlockConditionCount = 0, bool IsObject = false, + bool IsObjectOnFullResource = false, bool IsHorizon = false, StringOffset EmblemResourceOffset = default(StringOffset), StringOffset ThumbResourceOffset = default(StringOffset), StringOffset FullResourceOffset = default(StringOffset), uint LocalizeEtcId = 0, StringOffset SubNameLocalizeCodeIdOffset = default(StringOffset)) { - builder.StartTable(14); + builder.StartTable(15); EventContentCollectionExcel.AddUnlockConditionCount(builder, UnlockConditionCount); EventContentCollectionExcel.AddGroupId(builder, GroupId); EventContentCollectionExcel.AddEventContentId(builder, EventContentId); @@ -91,34 +93,36 @@ public struct EventContentCollectionExcel : IFlatbufferObject EventContentCollectionExcel.AddFullResource(builder, FullResourceOffset); EventContentCollectionExcel.AddThumbResource(builder, ThumbResourceOffset); EventContentCollectionExcel.AddEmblemResource(builder, EmblemResourceOffset); - EventContentCollectionExcel.AddMultipleConditionCheckType(builder, MultipleConditionCheckType); + EventContentCollectionExcel.AddMultipleConditionCheckType_(builder, MultipleConditionCheckType_); EventContentCollectionExcel.AddUnlockConditionParameter(builder, UnlockConditionParameterOffset); EventContentCollectionExcel.AddUnlockConditionType(builder, UnlockConditionType); EventContentCollectionExcel.AddIsHorizon(builder, IsHorizon); + EventContentCollectionExcel.AddIsObjectOnFullResource(builder, IsObjectOnFullResource); EventContentCollectionExcel.AddIsObject(builder, IsObject); return EventContentCollectionExcel.EndEventContentCollectionExcel(builder); } - public static void StartEventContentCollectionExcel(FlatBufferBuilder builder) { builder.StartTable(14); } + public static void StartEventContentCollectionExcel(FlatBufferBuilder builder) { builder.StartTable(15); } public static void AddId(FlatBufferBuilder builder, long id) { builder.AddLong(0, id, 0); } public static void AddEventContentId(FlatBufferBuilder builder, long eventContentId) { builder.AddLong(1, eventContentId, 0); } public static void AddGroupId(FlatBufferBuilder builder, long groupId) { builder.AddLong(2, groupId, 0); } - public static void AddUnlockConditionType(FlatBufferBuilder builder, SCHALE.Common.FlatData.EventCollectionUnlockType unlockConditionType) { builder.AddInt(3, (int)unlockConditionType, 0); } + public static void AddUnlockConditionType(FlatBufferBuilder builder, SCHALE.Common.FlatData.CollectionUnlockType unlockConditionType) { builder.AddInt(3, (int)unlockConditionType, 0); } public static void AddUnlockConditionParameter(FlatBufferBuilder builder, VectorOffset unlockConditionParameterOffset) { builder.AddOffset(4, unlockConditionParameterOffset.Value, 0); } public static VectorOffset CreateUnlockConditionParameterVector(FlatBufferBuilder builder, long[] data) { builder.StartVector(8, data.Length, 8); for (int i = data.Length - 1; i >= 0; i--) builder.AddLong(data[i]); return builder.EndVector(); } public static VectorOffset CreateUnlockConditionParameterVectorBlock(FlatBufferBuilder builder, long[] data) { builder.StartVector(8, data.Length, 8); builder.Add(data); return builder.EndVector(); } public static VectorOffset CreateUnlockConditionParameterVectorBlock(FlatBufferBuilder builder, ArraySegment data) { builder.StartVector(8, data.Count, 8); builder.Add(data); return builder.EndVector(); } public static VectorOffset CreateUnlockConditionParameterVectorBlock(FlatBufferBuilder builder, IntPtr dataPtr, int sizeInBytes) { builder.StartVector(1, sizeInBytes, 1); builder.Add(dataPtr, sizeInBytes); return builder.EndVector(); } public static void StartUnlockConditionParameterVector(FlatBufferBuilder builder, int numElems) { builder.StartVector(8, numElems, 8); } - public static void AddMultipleConditionCheckType(FlatBufferBuilder builder, SCHALE.Common.FlatData.MultipleConditionCheckType multipleConditionCheckType) { builder.AddInt(5, (int)multipleConditionCheckType, 0); } + public static void AddMultipleConditionCheckType_(FlatBufferBuilder builder, SCHALE.Common.FlatData.MultipleConditionCheckType multipleConditionCheckType_) { builder.AddInt(5, (int)multipleConditionCheckType_, 0); } public static void AddUnlockConditionCount(FlatBufferBuilder builder, long unlockConditionCount) { builder.AddLong(6, unlockConditionCount, 0); } public static void AddIsObject(FlatBufferBuilder builder, bool isObject) { builder.AddBool(7, isObject, false); } - public static void AddIsHorizon(FlatBufferBuilder builder, bool isHorizon) { builder.AddBool(8, isHorizon, false); } - public static void AddEmblemResource(FlatBufferBuilder builder, StringOffset emblemResourceOffset) { builder.AddOffset(9, emblemResourceOffset.Value, 0); } - public static void AddThumbResource(FlatBufferBuilder builder, StringOffset thumbResourceOffset) { builder.AddOffset(10, thumbResourceOffset.Value, 0); } - public static void AddFullResource(FlatBufferBuilder builder, StringOffset fullResourceOffset) { builder.AddOffset(11, fullResourceOffset.Value, 0); } - public static void AddLocalizeEtcId(FlatBufferBuilder builder, uint localizeEtcId) { builder.AddUint(12, localizeEtcId, 0); } - public static void AddSubNameLocalizeCodeId(FlatBufferBuilder builder, StringOffset subNameLocalizeCodeIdOffset) { builder.AddOffset(13, subNameLocalizeCodeIdOffset.Value, 0); } + public static void AddIsObjectOnFullResource(FlatBufferBuilder builder, bool isObjectOnFullResource) { builder.AddBool(8, isObjectOnFullResource, false); } + public static void AddIsHorizon(FlatBufferBuilder builder, bool isHorizon) { builder.AddBool(9, isHorizon, false); } + public static void AddEmblemResource(FlatBufferBuilder builder, StringOffset emblemResourceOffset) { builder.AddOffset(10, emblemResourceOffset.Value, 0); } + public static void AddThumbResource(FlatBufferBuilder builder, StringOffset thumbResourceOffset) { builder.AddOffset(11, thumbResourceOffset.Value, 0); } + public static void AddFullResource(FlatBufferBuilder builder, StringOffset fullResourceOffset) { builder.AddOffset(12, fullResourceOffset.Value, 0); } + public static void AddLocalizeEtcId(FlatBufferBuilder builder, uint localizeEtcId) { builder.AddUint(13, localizeEtcId, 0); } + public static void AddSubNameLocalizeCodeId(FlatBufferBuilder builder, StringOffset subNameLocalizeCodeIdOffset) { builder.AddOffset(14, subNameLocalizeCodeIdOffset.Value, 0); } public static Offset EndEventContentCollectionExcel(FlatBufferBuilder builder) { int o = builder.EndTable(); return new Offset(o); @@ -136,9 +140,10 @@ public struct EventContentCollectionExcel : IFlatbufferObject _o.UnlockConditionType = TableEncryptionService.Convert(this.UnlockConditionType, key); _o.UnlockConditionParameter = new List(); for (var _j = 0; _j < this.UnlockConditionParameterLength; ++_j) {_o.UnlockConditionParameter.Add(TableEncryptionService.Convert(this.UnlockConditionParameter(_j), key));} - _o.MultipleConditionCheckType = TableEncryptionService.Convert(this.MultipleConditionCheckType, key); + _o.MultipleConditionCheckType_ = TableEncryptionService.Convert(this.MultipleConditionCheckType_, key); _o.UnlockConditionCount = TableEncryptionService.Convert(this.UnlockConditionCount, key); _o.IsObject = TableEncryptionService.Convert(this.IsObject, key); + _o.IsObjectOnFullResource = TableEncryptionService.Convert(this.IsObjectOnFullResource, key); _o.IsHorizon = TableEncryptionService.Convert(this.IsHorizon, key); _o.EmblemResource = TableEncryptionService.Convert(this.EmblemResource, key); _o.ThumbResource = TableEncryptionService.Convert(this.ThumbResource, key); @@ -164,9 +169,10 @@ public struct EventContentCollectionExcel : IFlatbufferObject _o.GroupId, _o.UnlockConditionType, _UnlockConditionParameter, - _o.MultipleConditionCheckType, + _o.MultipleConditionCheckType_, _o.UnlockConditionCount, _o.IsObject, + _o.IsObjectOnFullResource, _o.IsHorizon, _EmblemResource, _ThumbResource, @@ -181,11 +187,12 @@ public class EventContentCollectionExcelT public long Id { get; set; } public long EventContentId { get; set; } public long GroupId { get; set; } - public SCHALE.Common.FlatData.EventCollectionUnlockType UnlockConditionType { get; set; } + public SCHALE.Common.FlatData.CollectionUnlockType UnlockConditionType { get; set; } public List UnlockConditionParameter { get; set; } - public SCHALE.Common.FlatData.MultipleConditionCheckType MultipleConditionCheckType { get; set; } + public SCHALE.Common.FlatData.MultipleConditionCheckType MultipleConditionCheckType_ { get; set; } public long UnlockConditionCount { get; set; } public bool IsObject { get; set; } + public bool IsObjectOnFullResource { get; set; } public bool IsHorizon { get; set; } public string EmblemResource { get; set; } public string ThumbResource { get; set; } @@ -197,11 +204,12 @@ public class EventContentCollectionExcelT this.Id = 0; this.EventContentId = 0; this.GroupId = 0; - this.UnlockConditionType = SCHALE.Common.FlatData.EventCollectionUnlockType.None; + this.UnlockConditionType = SCHALE.Common.FlatData.CollectionUnlockType.None; this.UnlockConditionParameter = null; - this.MultipleConditionCheckType = SCHALE.Common.FlatData.MultipleConditionCheckType.And; + this.MultipleConditionCheckType_ = SCHALE.Common.FlatData.MultipleConditionCheckType.And; this.UnlockConditionCount = 0; this.IsObject = false; + this.IsObjectOnFullResource = false; this.IsHorizon = false; this.EmblemResource = null; this.ThumbResource = null; @@ -220,17 +228,18 @@ static public class EventContentCollectionExcelVerify && verifier.VerifyField(tablePos, 4 /*Id*/, 8 /*long*/, 8, false) && verifier.VerifyField(tablePos, 6 /*EventContentId*/, 8 /*long*/, 8, false) && verifier.VerifyField(tablePos, 8 /*GroupId*/, 8 /*long*/, 8, false) - && verifier.VerifyField(tablePos, 10 /*UnlockConditionType*/, 4 /*SCHALE.Common.FlatData.EventCollectionUnlockType*/, 4, false) + && verifier.VerifyField(tablePos, 10 /*UnlockConditionType*/, 4 /*SCHALE.Common.FlatData.CollectionUnlockType*/, 4, false) && verifier.VerifyVectorOfData(tablePos, 12 /*UnlockConditionParameter*/, 8 /*long*/, false) - && verifier.VerifyField(tablePos, 14 /*MultipleConditionCheckType*/, 4 /*SCHALE.Common.FlatData.MultipleConditionCheckType*/, 4, false) + && verifier.VerifyField(tablePos, 14 /*MultipleConditionCheckType_*/, 4 /*SCHALE.Common.FlatData.MultipleConditionCheckType*/, 4, false) && verifier.VerifyField(tablePos, 16 /*UnlockConditionCount*/, 8 /*long*/, 8, false) && verifier.VerifyField(tablePos, 18 /*IsObject*/, 1 /*bool*/, 1, false) - && verifier.VerifyField(tablePos, 20 /*IsHorizon*/, 1 /*bool*/, 1, false) - && verifier.VerifyString(tablePos, 22 /*EmblemResource*/, false) - && verifier.VerifyString(tablePos, 24 /*ThumbResource*/, false) - && verifier.VerifyString(tablePos, 26 /*FullResource*/, false) - && verifier.VerifyField(tablePos, 28 /*LocalizeEtcId*/, 4 /*uint*/, 4, false) - && verifier.VerifyString(tablePos, 30 /*SubNameLocalizeCodeId*/, false) + && verifier.VerifyField(tablePos, 20 /*IsObjectOnFullResource*/, 1 /*bool*/, 1, false) + && verifier.VerifyField(tablePos, 22 /*IsHorizon*/, 1 /*bool*/, 1, false) + && verifier.VerifyString(tablePos, 24 /*EmblemResource*/, false) + && verifier.VerifyString(tablePos, 26 /*ThumbResource*/, false) + && verifier.VerifyString(tablePos, 28 /*FullResource*/, false) + && verifier.VerifyField(tablePos, 30 /*LocalizeEtcId*/, 4 /*uint*/, 4, false) + && verifier.VerifyString(tablePos, 32 /*SubNameLocalizeCodeId*/, false) && verifier.VerifyTableEnd(tablePos); } } diff --git a/SCHALE.Common/FlatData/EventContentCurrencyItemExcel.cs b/SCHALE.Common/FlatData/EventContentCurrencyItemExcel.cs index fc7bf8f..b615790 100644 --- a/SCHALE.Common/FlatData/EventContentCurrencyItemExcel.cs +++ b/SCHALE.Common/FlatData/EventContentCurrencyItemExcel.cs @@ -21,23 +21,23 @@ public struct EventContentCurrencyItemExcel : IFlatbufferObject public EventContentCurrencyItemExcel __assign(int _i, ByteBuffer _bb) { __init(_i, _bb); return this; } public long EventContentId { get { int o = __p.__offset(4); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } - public SCHALE.Common.FlatData.EventContentItemType EventContentItemType { get { int o = __p.__offset(6); return o != 0 ? (SCHALE.Common.FlatData.EventContentItemType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.EventContentItemType.EventPoint; } } + public SCHALE.Common.FlatData.EventContentItemType EventContentItemType_ { get { int o = __p.__offset(6); return o != 0 ? (SCHALE.Common.FlatData.EventContentItemType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.EventContentItemType.EventPoint; } } public long ItemUniqueId { get { int o = __p.__offset(8); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public static Offset CreateEventContentCurrencyItemExcel(FlatBufferBuilder builder, long EventContentId = 0, - SCHALE.Common.FlatData.EventContentItemType EventContentItemType = SCHALE.Common.FlatData.EventContentItemType.EventPoint, + SCHALE.Common.FlatData.EventContentItemType EventContentItemType_ = SCHALE.Common.FlatData.EventContentItemType.EventPoint, long ItemUniqueId = 0) { builder.StartTable(3); EventContentCurrencyItemExcel.AddItemUniqueId(builder, ItemUniqueId); EventContentCurrencyItemExcel.AddEventContentId(builder, EventContentId); - EventContentCurrencyItemExcel.AddEventContentItemType(builder, EventContentItemType); + EventContentCurrencyItemExcel.AddEventContentItemType_(builder, EventContentItemType_); return EventContentCurrencyItemExcel.EndEventContentCurrencyItemExcel(builder); } public static void StartEventContentCurrencyItemExcel(FlatBufferBuilder builder) { builder.StartTable(3); } public static void AddEventContentId(FlatBufferBuilder builder, long eventContentId) { builder.AddLong(0, eventContentId, 0); } - public static void AddEventContentItemType(FlatBufferBuilder builder, SCHALE.Common.FlatData.EventContentItemType eventContentItemType) { builder.AddInt(1, (int)eventContentItemType, 0); } + public static void AddEventContentItemType_(FlatBufferBuilder builder, SCHALE.Common.FlatData.EventContentItemType eventContentItemType_) { builder.AddInt(1, (int)eventContentItemType_, 0); } public static void AddItemUniqueId(FlatBufferBuilder builder, long itemUniqueId) { builder.AddLong(2, itemUniqueId, 0); } public static Offset EndEventContentCurrencyItemExcel(FlatBufferBuilder builder) { int o = builder.EndTable(); @@ -51,7 +51,7 @@ public struct EventContentCurrencyItemExcel : IFlatbufferObject public void UnPackTo(EventContentCurrencyItemExcelT _o) { byte[] key = TableEncryptionService.CreateKey("EventContentCurrencyItem"); _o.EventContentId = TableEncryptionService.Convert(this.EventContentId, key); - _o.EventContentItemType = TableEncryptionService.Convert(this.EventContentItemType, key); + _o.EventContentItemType_ = TableEncryptionService.Convert(this.EventContentItemType_, key); _o.ItemUniqueId = TableEncryptionService.Convert(this.ItemUniqueId, key); } public static Offset Pack(FlatBufferBuilder builder, EventContentCurrencyItemExcelT _o) { @@ -59,7 +59,7 @@ public struct EventContentCurrencyItemExcel : IFlatbufferObject return CreateEventContentCurrencyItemExcel( builder, _o.EventContentId, - _o.EventContentItemType, + _o.EventContentItemType_, _o.ItemUniqueId); } } @@ -67,12 +67,12 @@ public struct EventContentCurrencyItemExcel : IFlatbufferObject public class EventContentCurrencyItemExcelT { public long EventContentId { get; set; } - public SCHALE.Common.FlatData.EventContentItemType EventContentItemType { get; set; } + public SCHALE.Common.FlatData.EventContentItemType EventContentItemType_ { get; set; } public long ItemUniqueId { get; set; } public EventContentCurrencyItemExcelT() { this.EventContentId = 0; - this.EventContentItemType = SCHALE.Common.FlatData.EventContentItemType.EventPoint; + this.EventContentItemType_ = SCHALE.Common.FlatData.EventContentItemType.EventPoint; this.ItemUniqueId = 0; } } @@ -84,7 +84,7 @@ static public class EventContentCurrencyItemExcelVerify { return verifier.VerifyTableStart(tablePos) && verifier.VerifyField(tablePos, 4 /*EventContentId*/, 8 /*long*/, 8, false) - && verifier.VerifyField(tablePos, 6 /*EventContentItemType*/, 4 /*SCHALE.Common.FlatData.EventContentItemType*/, 4, false) + && verifier.VerifyField(tablePos, 6 /*EventContentItemType_*/, 4 /*SCHALE.Common.FlatData.EventContentItemType*/, 4, false) && verifier.VerifyField(tablePos, 8 /*ItemUniqueId*/, 8 /*long*/, 8, false) && verifier.VerifyTableEnd(tablePos); } diff --git a/SCHALE.Common/FlatData/EventContentDebuffRewardExcel.cs b/SCHALE.Common/FlatData/EventContentDebuffRewardExcel.cs index 1d9596d..e0f7995 100644 --- a/SCHALE.Common/FlatData/EventContentDebuffRewardExcel.cs +++ b/SCHALE.Common/FlatData/EventContentDebuffRewardExcel.cs @@ -22,26 +22,26 @@ public struct EventContentDebuffRewardExcel : IFlatbufferObject public long EventContentId { get { int o = __p.__offset(4); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public long EventStageId { get { int o = __p.__offset(6); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } - public SCHALE.Common.FlatData.EventContentItemType EventContentItemType { get { int o = __p.__offset(8); return o != 0 ? (SCHALE.Common.FlatData.EventContentItemType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.EventContentItemType.EventPoint; } } + public SCHALE.Common.FlatData.EventContentItemType EventContentItemType_ { get { int o = __p.__offset(8); return o != 0 ? (SCHALE.Common.FlatData.EventContentItemType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.EventContentItemType.EventPoint; } } public long RewardPercentage { get { int o = __p.__offset(10); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public static Offset CreateEventContentDebuffRewardExcel(FlatBufferBuilder builder, long EventContentId = 0, long EventStageId = 0, - SCHALE.Common.FlatData.EventContentItemType EventContentItemType = SCHALE.Common.FlatData.EventContentItemType.EventPoint, + SCHALE.Common.FlatData.EventContentItemType EventContentItemType_ = SCHALE.Common.FlatData.EventContentItemType.EventPoint, long RewardPercentage = 0) { builder.StartTable(4); EventContentDebuffRewardExcel.AddRewardPercentage(builder, RewardPercentage); EventContentDebuffRewardExcel.AddEventStageId(builder, EventStageId); EventContentDebuffRewardExcel.AddEventContentId(builder, EventContentId); - EventContentDebuffRewardExcel.AddEventContentItemType(builder, EventContentItemType); + EventContentDebuffRewardExcel.AddEventContentItemType_(builder, EventContentItemType_); return EventContentDebuffRewardExcel.EndEventContentDebuffRewardExcel(builder); } public static void StartEventContentDebuffRewardExcel(FlatBufferBuilder builder) { builder.StartTable(4); } public static void AddEventContentId(FlatBufferBuilder builder, long eventContentId) { builder.AddLong(0, eventContentId, 0); } public static void AddEventStageId(FlatBufferBuilder builder, long eventStageId) { builder.AddLong(1, eventStageId, 0); } - public static void AddEventContentItemType(FlatBufferBuilder builder, SCHALE.Common.FlatData.EventContentItemType eventContentItemType) { builder.AddInt(2, (int)eventContentItemType, 0); } + public static void AddEventContentItemType_(FlatBufferBuilder builder, SCHALE.Common.FlatData.EventContentItemType eventContentItemType_) { builder.AddInt(2, (int)eventContentItemType_, 0); } public static void AddRewardPercentage(FlatBufferBuilder builder, long rewardPercentage) { builder.AddLong(3, rewardPercentage, 0); } public static Offset EndEventContentDebuffRewardExcel(FlatBufferBuilder builder) { int o = builder.EndTable(); @@ -56,7 +56,7 @@ public struct EventContentDebuffRewardExcel : IFlatbufferObject byte[] key = TableEncryptionService.CreateKey("EventContentDebuffReward"); _o.EventContentId = TableEncryptionService.Convert(this.EventContentId, key); _o.EventStageId = TableEncryptionService.Convert(this.EventStageId, key); - _o.EventContentItemType = TableEncryptionService.Convert(this.EventContentItemType, key); + _o.EventContentItemType_ = TableEncryptionService.Convert(this.EventContentItemType_, key); _o.RewardPercentage = TableEncryptionService.Convert(this.RewardPercentage, key); } public static Offset Pack(FlatBufferBuilder builder, EventContentDebuffRewardExcelT _o) { @@ -65,7 +65,7 @@ public struct EventContentDebuffRewardExcel : IFlatbufferObject builder, _o.EventContentId, _o.EventStageId, - _o.EventContentItemType, + _o.EventContentItemType_, _o.RewardPercentage); } } @@ -74,13 +74,13 @@ public class EventContentDebuffRewardExcelT { public long EventContentId { get; set; } public long EventStageId { get; set; } - public SCHALE.Common.FlatData.EventContentItemType EventContentItemType { get; set; } + public SCHALE.Common.FlatData.EventContentItemType EventContentItemType_ { get; set; } public long RewardPercentage { get; set; } public EventContentDebuffRewardExcelT() { this.EventContentId = 0; this.EventStageId = 0; - this.EventContentItemType = SCHALE.Common.FlatData.EventContentItemType.EventPoint; + this.EventContentItemType_ = SCHALE.Common.FlatData.EventContentItemType.EventPoint; this.RewardPercentage = 0; } } @@ -93,7 +93,7 @@ static public class EventContentDebuffRewardExcelVerify return verifier.VerifyTableStart(tablePos) && verifier.VerifyField(tablePos, 4 /*EventContentId*/, 8 /*long*/, 8, false) && verifier.VerifyField(tablePos, 6 /*EventStageId*/, 8 /*long*/, 8, false) - && verifier.VerifyField(tablePos, 8 /*EventContentItemType*/, 4 /*SCHALE.Common.FlatData.EventContentItemType*/, 4, false) + && verifier.VerifyField(tablePos, 8 /*EventContentItemType_*/, 4 /*SCHALE.Common.FlatData.EventContentItemType*/, 4, false) && verifier.VerifyField(tablePos, 10 /*RewardPercentage*/, 8 /*long*/, 8, false) && verifier.VerifyTableEnd(tablePos); } diff --git a/SCHALE.Common/FlatData/EventContentDiceRaceEffectExcel.cs b/SCHALE.Common/FlatData/EventContentDiceRaceEffectExcel.cs index ec21e3e..ae8357a 100644 --- a/SCHALE.Common/FlatData/EventContentDiceRaceEffectExcel.cs +++ b/SCHALE.Common/FlatData/EventContentDiceRaceEffectExcel.cs @@ -21,7 +21,7 @@ public struct EventContentDiceRaceEffectExcel : IFlatbufferObject public EventContentDiceRaceEffectExcel __assign(int _i, ByteBuffer _bb) { __init(_i, _bb); return this; } public long EventContentId { get { int o = __p.__offset(4); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } - public SCHALE.Common.FlatData.EventContentDiceRaceResultType EventContentDiceRaceResultType { get { int o = __p.__offset(6); return o != 0 ? (SCHALE.Common.FlatData.EventContentDiceRaceResultType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.EventContentDiceRaceResultType.DiceResult1; } } + public SCHALE.Common.FlatData.EventContentDiceRaceResultType EventContentDiceRaceResultType_ { get { int o = __p.__offset(6); return o != 0 ? (SCHALE.Common.FlatData.EventContentDiceRaceResultType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.EventContentDiceRaceResultType.DiceResult1; } } public bool IsDiceResult { get { int o = __p.__offset(8); return o != 0 ? 0!=__p.bb.Get(o + __p.bb_pos) : (bool)false; } } public string AniClip { get { int o = __p.__offset(10); return o != 0 ? __p.__string(o + __p.bb_pos) : null; } } #if ENABLE_SPAN_T @@ -41,7 +41,7 @@ public struct EventContentDiceRaceEffectExcel : IFlatbufferObject public static Offset CreateEventContentDiceRaceEffectExcel(FlatBufferBuilder builder, long EventContentId = 0, - SCHALE.Common.FlatData.EventContentDiceRaceResultType EventContentDiceRaceResultType = SCHALE.Common.FlatData.EventContentDiceRaceResultType.DiceResult1, + SCHALE.Common.FlatData.EventContentDiceRaceResultType EventContentDiceRaceResultType_ = SCHALE.Common.FlatData.EventContentDiceRaceResultType.DiceResult1, bool IsDiceResult = false, StringOffset AniClipOffset = default(StringOffset), VectorOffset VoiceIdOffset = default(VectorOffset)) { @@ -49,14 +49,14 @@ public struct EventContentDiceRaceEffectExcel : IFlatbufferObject EventContentDiceRaceEffectExcel.AddEventContentId(builder, EventContentId); EventContentDiceRaceEffectExcel.AddVoiceId(builder, VoiceIdOffset); EventContentDiceRaceEffectExcel.AddAniClip(builder, AniClipOffset); - EventContentDiceRaceEffectExcel.AddEventContentDiceRaceResultType(builder, EventContentDiceRaceResultType); + EventContentDiceRaceEffectExcel.AddEventContentDiceRaceResultType_(builder, EventContentDiceRaceResultType_); EventContentDiceRaceEffectExcel.AddIsDiceResult(builder, IsDiceResult); return EventContentDiceRaceEffectExcel.EndEventContentDiceRaceEffectExcel(builder); } public static void StartEventContentDiceRaceEffectExcel(FlatBufferBuilder builder) { builder.StartTable(5); } public static void AddEventContentId(FlatBufferBuilder builder, long eventContentId) { builder.AddLong(0, eventContentId, 0); } - public static void AddEventContentDiceRaceResultType(FlatBufferBuilder builder, SCHALE.Common.FlatData.EventContentDiceRaceResultType eventContentDiceRaceResultType) { builder.AddInt(1, (int)eventContentDiceRaceResultType, 0); } + public static void AddEventContentDiceRaceResultType_(FlatBufferBuilder builder, SCHALE.Common.FlatData.EventContentDiceRaceResultType eventContentDiceRaceResultType_) { builder.AddInt(1, (int)eventContentDiceRaceResultType_, 0); } public static void AddIsDiceResult(FlatBufferBuilder builder, bool isDiceResult) { builder.AddBool(2, isDiceResult, false); } public static void AddAniClip(FlatBufferBuilder builder, StringOffset aniClipOffset) { builder.AddOffset(3, aniClipOffset.Value, 0); } public static void AddVoiceId(FlatBufferBuilder builder, VectorOffset voiceIdOffset) { builder.AddOffset(4, voiceIdOffset.Value, 0); } @@ -77,7 +77,7 @@ public struct EventContentDiceRaceEffectExcel : IFlatbufferObject public void UnPackTo(EventContentDiceRaceEffectExcelT _o) { byte[] key = TableEncryptionService.CreateKey("EventContentDiceRaceEffect"); _o.EventContentId = TableEncryptionService.Convert(this.EventContentId, key); - _o.EventContentDiceRaceResultType = TableEncryptionService.Convert(this.EventContentDiceRaceResultType, key); + _o.EventContentDiceRaceResultType_ = TableEncryptionService.Convert(this.EventContentDiceRaceResultType_, key); _o.IsDiceResult = TableEncryptionService.Convert(this.IsDiceResult, key); _o.AniClip = TableEncryptionService.Convert(this.AniClip, key); _o.VoiceId = new List(); @@ -94,7 +94,7 @@ public struct EventContentDiceRaceEffectExcel : IFlatbufferObject return CreateEventContentDiceRaceEffectExcel( builder, _o.EventContentId, - _o.EventContentDiceRaceResultType, + _o.EventContentDiceRaceResultType_, _o.IsDiceResult, _AniClip, _VoiceId); @@ -104,14 +104,14 @@ public struct EventContentDiceRaceEffectExcel : IFlatbufferObject public class EventContentDiceRaceEffectExcelT { public long EventContentId { get; set; } - public SCHALE.Common.FlatData.EventContentDiceRaceResultType EventContentDiceRaceResultType { get; set; } + public SCHALE.Common.FlatData.EventContentDiceRaceResultType EventContentDiceRaceResultType_ { get; set; } public bool IsDiceResult { get; set; } public string AniClip { get; set; } public List VoiceId { get; set; } public EventContentDiceRaceEffectExcelT() { this.EventContentId = 0; - this.EventContentDiceRaceResultType = SCHALE.Common.FlatData.EventContentDiceRaceResultType.DiceResult1; + this.EventContentDiceRaceResultType_ = SCHALE.Common.FlatData.EventContentDiceRaceResultType.DiceResult1; this.IsDiceResult = false; this.AniClip = null; this.VoiceId = null; @@ -125,7 +125,7 @@ static public class EventContentDiceRaceEffectExcelVerify { return verifier.VerifyTableStart(tablePos) && verifier.VerifyField(tablePos, 4 /*EventContentId*/, 8 /*long*/, 8, false) - && verifier.VerifyField(tablePos, 6 /*EventContentDiceRaceResultType*/, 4 /*SCHALE.Common.FlatData.EventContentDiceRaceResultType*/, 4, false) + && verifier.VerifyField(tablePos, 6 /*EventContentDiceRaceResultType_*/, 4 /*SCHALE.Common.FlatData.EventContentDiceRaceResultType*/, 4, false) && verifier.VerifyField(tablePos, 8 /*IsDiceResult*/, 1 /*bool*/, 1, false) && verifier.VerifyString(tablePos, 10 /*AniClip*/, false) && verifier.VerifyVectorOfData(tablePos, 12 /*VoiceId*/, 4 /*uint*/, false) diff --git a/SCHALE.Common/FlatData/EventContentDiceRaceNodeExcel.cs b/SCHALE.Common/FlatData/EventContentDiceRaceNodeExcel.cs index 39a99ef..8979cf3 100644 --- a/SCHALE.Common/FlatData/EventContentDiceRaceNodeExcel.cs +++ b/SCHALE.Common/FlatData/EventContentDiceRaceNodeExcel.cs @@ -22,7 +22,7 @@ public struct EventContentDiceRaceNodeExcel : IFlatbufferObject public long EventContentId { get { int o = __p.__offset(4); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public long NodeId { get { int o = __p.__offset(6); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } - public SCHALE.Common.FlatData.EventContentDiceRaceNodeType EventContentDiceRaceNodeType { get { int o = __p.__offset(8); return o != 0 ? (SCHALE.Common.FlatData.EventContentDiceRaceNodeType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.EventContentDiceRaceNodeType.StartNode; } } + public SCHALE.Common.FlatData.EventContentDiceRaceNodeType EventContentDiceRaceNodeType_ { get { int o = __p.__offset(8); return o != 0 ? (SCHALE.Common.FlatData.EventContentDiceRaceNodeType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.EventContentDiceRaceNodeType.StartNode; } } public int MoveForwardTypeArg { get { int o = __p.__offset(10); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } public SCHALE.Common.FlatData.ParcelType RewardParcelType(int j) { int o = __p.__offset(12); return o != 0 ? (SCHALE.Common.FlatData.ParcelType)__p.bb.GetInt(__p.__vector(o) + j * 4) : (SCHALE.Common.FlatData.ParcelType)0; } public int RewardParcelTypeLength { get { int o = __p.__offset(12); return o != 0 ? __p.__vector_len(o) : 0; } } @@ -52,7 +52,7 @@ public struct EventContentDiceRaceNodeExcel : IFlatbufferObject public static Offset CreateEventContentDiceRaceNodeExcel(FlatBufferBuilder builder, long EventContentId = 0, long NodeId = 0, - SCHALE.Common.FlatData.EventContentDiceRaceNodeType EventContentDiceRaceNodeType = SCHALE.Common.FlatData.EventContentDiceRaceNodeType.StartNode, + SCHALE.Common.FlatData.EventContentDiceRaceNodeType EventContentDiceRaceNodeType_ = SCHALE.Common.FlatData.EventContentDiceRaceNodeType.StartNode, int MoveForwardTypeArg = 0, VectorOffset RewardParcelTypeOffset = default(VectorOffset), VectorOffset RewardParcelIdOffset = default(VectorOffset), @@ -64,14 +64,14 @@ public struct EventContentDiceRaceNodeExcel : IFlatbufferObject EventContentDiceRaceNodeExcel.AddRewardParcelId(builder, RewardParcelIdOffset); EventContentDiceRaceNodeExcel.AddRewardParcelType(builder, RewardParcelTypeOffset); EventContentDiceRaceNodeExcel.AddMoveForwardTypeArg(builder, MoveForwardTypeArg); - EventContentDiceRaceNodeExcel.AddEventContentDiceRaceNodeType(builder, EventContentDiceRaceNodeType); + EventContentDiceRaceNodeExcel.AddEventContentDiceRaceNodeType_(builder, EventContentDiceRaceNodeType_); return EventContentDiceRaceNodeExcel.EndEventContentDiceRaceNodeExcel(builder); } public static void StartEventContentDiceRaceNodeExcel(FlatBufferBuilder builder) { builder.StartTable(7); } public static void AddEventContentId(FlatBufferBuilder builder, long eventContentId) { builder.AddLong(0, eventContentId, 0); } public static void AddNodeId(FlatBufferBuilder builder, long nodeId) { builder.AddLong(1, nodeId, 0); } - public static void AddEventContentDiceRaceNodeType(FlatBufferBuilder builder, SCHALE.Common.FlatData.EventContentDiceRaceNodeType eventContentDiceRaceNodeType) { builder.AddInt(2, (int)eventContentDiceRaceNodeType, 0); } + public static void AddEventContentDiceRaceNodeType_(FlatBufferBuilder builder, SCHALE.Common.FlatData.EventContentDiceRaceNodeType eventContentDiceRaceNodeType_) { builder.AddInt(2, (int)eventContentDiceRaceNodeType_, 0); } public static void AddMoveForwardTypeArg(FlatBufferBuilder builder, int moveForwardTypeArg) { builder.AddInt(3, moveForwardTypeArg, 0); } public static void AddRewardParcelType(FlatBufferBuilder builder, VectorOffset rewardParcelTypeOffset) { builder.AddOffset(4, rewardParcelTypeOffset.Value, 0); } public static VectorOffset CreateRewardParcelTypeVector(FlatBufferBuilder builder, SCHALE.Common.FlatData.ParcelType[] data) { builder.StartVector(4, data.Length, 4); for (int i = data.Length - 1; i >= 0; i--) builder.AddInt((int)data[i]); return builder.EndVector(); } @@ -104,7 +104,7 @@ public struct EventContentDiceRaceNodeExcel : IFlatbufferObject byte[] key = TableEncryptionService.CreateKey("EventContentDiceRaceNode"); _o.EventContentId = TableEncryptionService.Convert(this.EventContentId, key); _o.NodeId = TableEncryptionService.Convert(this.NodeId, key); - _o.EventContentDiceRaceNodeType = TableEncryptionService.Convert(this.EventContentDiceRaceNodeType, key); + _o.EventContentDiceRaceNodeType_ = TableEncryptionService.Convert(this.EventContentDiceRaceNodeType_, key); _o.MoveForwardTypeArg = TableEncryptionService.Convert(this.MoveForwardTypeArg, key); _o.RewardParcelType = new List(); for (var _j = 0; _j < this.RewardParcelTypeLength; ++_j) {_o.RewardParcelType.Add(TableEncryptionService.Convert(this.RewardParcelType(_j), key));} @@ -134,7 +134,7 @@ public struct EventContentDiceRaceNodeExcel : IFlatbufferObject builder, _o.EventContentId, _o.NodeId, - _o.EventContentDiceRaceNodeType, + _o.EventContentDiceRaceNodeType_, _o.MoveForwardTypeArg, _RewardParcelType, _RewardParcelId, @@ -146,7 +146,7 @@ public class EventContentDiceRaceNodeExcelT { public long EventContentId { get; set; } public long NodeId { get; set; } - public SCHALE.Common.FlatData.EventContentDiceRaceNodeType EventContentDiceRaceNodeType { get; set; } + public SCHALE.Common.FlatData.EventContentDiceRaceNodeType EventContentDiceRaceNodeType_ { get; set; } public int MoveForwardTypeArg { get; set; } public List RewardParcelType { get; set; } public List RewardParcelId { get; set; } @@ -155,7 +155,7 @@ public class EventContentDiceRaceNodeExcelT public EventContentDiceRaceNodeExcelT() { this.EventContentId = 0; this.NodeId = 0; - this.EventContentDiceRaceNodeType = SCHALE.Common.FlatData.EventContentDiceRaceNodeType.StartNode; + this.EventContentDiceRaceNodeType_ = SCHALE.Common.FlatData.EventContentDiceRaceNodeType.StartNode; this.MoveForwardTypeArg = 0; this.RewardParcelType = null; this.RewardParcelId = null; @@ -171,7 +171,7 @@ static public class EventContentDiceRaceNodeExcelVerify return verifier.VerifyTableStart(tablePos) && verifier.VerifyField(tablePos, 4 /*EventContentId*/, 8 /*long*/, 8, false) && verifier.VerifyField(tablePos, 6 /*NodeId*/, 8 /*long*/, 8, false) - && verifier.VerifyField(tablePos, 8 /*EventContentDiceRaceNodeType*/, 4 /*SCHALE.Common.FlatData.EventContentDiceRaceNodeType*/, 4, false) + && verifier.VerifyField(tablePos, 8 /*EventContentDiceRaceNodeType_*/, 4 /*SCHALE.Common.FlatData.EventContentDiceRaceNodeType*/, 4, false) && verifier.VerifyField(tablePos, 10 /*MoveForwardTypeArg*/, 4 /*int*/, 4, false) && verifier.VerifyVectorOfData(tablePos, 12 /*RewardParcelType*/, 4 /*SCHALE.Common.FlatData.ParcelType*/, false) && verifier.VerifyVectorOfData(tablePos, 14 /*RewardParcelId*/, 8 /*long*/, false) diff --git a/SCHALE.Common/FlatData/EventContentDiceRaceProbExcel.cs b/SCHALE.Common/FlatData/EventContentDiceRaceProbExcel.cs index 05472ad..d35e91a 100644 --- a/SCHALE.Common/FlatData/EventContentDiceRaceProbExcel.cs +++ b/SCHALE.Common/FlatData/EventContentDiceRaceProbExcel.cs @@ -21,7 +21,7 @@ public struct EventContentDiceRaceProbExcel : IFlatbufferObject public EventContentDiceRaceProbExcel __assign(int _i, ByteBuffer _bb) { __init(_i, _bb); return this; } public long EventContentId { get { int o = __p.__offset(4); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } - public SCHALE.Common.FlatData.EventContentDiceRaceResultType EventContentDiceRaceResultType { get { int o = __p.__offset(6); return o != 0 ? (SCHALE.Common.FlatData.EventContentDiceRaceResultType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.EventContentDiceRaceResultType.DiceResult1; } } + public SCHALE.Common.FlatData.EventContentDiceRaceResultType EventContentDiceRaceResultType_ { get { int o = __p.__offset(6); return o != 0 ? (SCHALE.Common.FlatData.EventContentDiceRaceResultType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.EventContentDiceRaceResultType.DiceResult1; } } public long CostItemId { get { int o = __p.__offset(8); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public int CostItemAmount { get { int o = __p.__offset(10); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } public int DiceResult { get { int o = __p.__offset(12); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } @@ -29,7 +29,7 @@ public struct EventContentDiceRaceProbExcel : IFlatbufferObject public static Offset CreateEventContentDiceRaceProbExcel(FlatBufferBuilder builder, long EventContentId = 0, - SCHALE.Common.FlatData.EventContentDiceRaceResultType EventContentDiceRaceResultType = SCHALE.Common.FlatData.EventContentDiceRaceResultType.DiceResult1, + SCHALE.Common.FlatData.EventContentDiceRaceResultType EventContentDiceRaceResultType_ = SCHALE.Common.FlatData.EventContentDiceRaceResultType.DiceResult1, long CostItemId = 0, int CostItemAmount = 0, int DiceResult = 0, @@ -40,13 +40,13 @@ public struct EventContentDiceRaceProbExcel : IFlatbufferObject EventContentDiceRaceProbExcel.AddProb(builder, Prob); EventContentDiceRaceProbExcel.AddDiceResult(builder, DiceResult); EventContentDiceRaceProbExcel.AddCostItemAmount(builder, CostItemAmount); - EventContentDiceRaceProbExcel.AddEventContentDiceRaceResultType(builder, EventContentDiceRaceResultType); + EventContentDiceRaceProbExcel.AddEventContentDiceRaceResultType_(builder, EventContentDiceRaceResultType_); return EventContentDiceRaceProbExcel.EndEventContentDiceRaceProbExcel(builder); } public static void StartEventContentDiceRaceProbExcel(FlatBufferBuilder builder) { builder.StartTable(6); } public static void AddEventContentId(FlatBufferBuilder builder, long eventContentId) { builder.AddLong(0, eventContentId, 0); } - public static void AddEventContentDiceRaceResultType(FlatBufferBuilder builder, SCHALE.Common.FlatData.EventContentDiceRaceResultType eventContentDiceRaceResultType) { builder.AddInt(1, (int)eventContentDiceRaceResultType, 0); } + public static void AddEventContentDiceRaceResultType_(FlatBufferBuilder builder, SCHALE.Common.FlatData.EventContentDiceRaceResultType eventContentDiceRaceResultType_) { builder.AddInt(1, (int)eventContentDiceRaceResultType_, 0); } public static void AddCostItemId(FlatBufferBuilder builder, long costItemId) { builder.AddLong(2, costItemId, 0); } public static void AddCostItemAmount(FlatBufferBuilder builder, int costItemAmount) { builder.AddInt(3, costItemAmount, 0); } public static void AddDiceResult(FlatBufferBuilder builder, int diceResult) { builder.AddInt(4, diceResult, 0); } @@ -63,7 +63,7 @@ public struct EventContentDiceRaceProbExcel : IFlatbufferObject public void UnPackTo(EventContentDiceRaceProbExcelT _o) { byte[] key = TableEncryptionService.CreateKey("EventContentDiceRaceProb"); _o.EventContentId = TableEncryptionService.Convert(this.EventContentId, key); - _o.EventContentDiceRaceResultType = TableEncryptionService.Convert(this.EventContentDiceRaceResultType, key); + _o.EventContentDiceRaceResultType_ = TableEncryptionService.Convert(this.EventContentDiceRaceResultType_, key); _o.CostItemId = TableEncryptionService.Convert(this.CostItemId, key); _o.CostItemAmount = TableEncryptionService.Convert(this.CostItemAmount, key); _o.DiceResult = TableEncryptionService.Convert(this.DiceResult, key); @@ -74,7 +74,7 @@ public struct EventContentDiceRaceProbExcel : IFlatbufferObject return CreateEventContentDiceRaceProbExcel( builder, _o.EventContentId, - _o.EventContentDiceRaceResultType, + _o.EventContentDiceRaceResultType_, _o.CostItemId, _o.CostItemAmount, _o.DiceResult, @@ -85,7 +85,7 @@ public struct EventContentDiceRaceProbExcel : IFlatbufferObject public class EventContentDiceRaceProbExcelT { public long EventContentId { get; set; } - public SCHALE.Common.FlatData.EventContentDiceRaceResultType EventContentDiceRaceResultType { get; set; } + public SCHALE.Common.FlatData.EventContentDiceRaceResultType EventContentDiceRaceResultType_ { get; set; } public long CostItemId { get; set; } public int CostItemAmount { get; set; } public int DiceResult { get; set; } @@ -93,7 +93,7 @@ public class EventContentDiceRaceProbExcelT public EventContentDiceRaceProbExcelT() { this.EventContentId = 0; - this.EventContentDiceRaceResultType = SCHALE.Common.FlatData.EventContentDiceRaceResultType.DiceResult1; + this.EventContentDiceRaceResultType_ = SCHALE.Common.FlatData.EventContentDiceRaceResultType.DiceResult1; this.CostItemId = 0; this.CostItemAmount = 0; this.DiceResult = 0; @@ -108,7 +108,7 @@ static public class EventContentDiceRaceProbExcelVerify { return verifier.VerifyTableStart(tablePos) && verifier.VerifyField(tablePos, 4 /*EventContentId*/, 8 /*long*/, 8, false) - && verifier.VerifyField(tablePos, 6 /*EventContentDiceRaceResultType*/, 4 /*SCHALE.Common.FlatData.EventContentDiceRaceResultType*/, 4, false) + && verifier.VerifyField(tablePos, 6 /*EventContentDiceRaceResultType_*/, 4 /*SCHALE.Common.FlatData.EventContentDiceRaceResultType*/, 4, false) && verifier.VerifyField(tablePos, 8 /*CostItemId*/, 8 /*long*/, 8, false) && verifier.VerifyField(tablePos, 10 /*CostItemAmount*/, 4 /*int*/, 4, false) && verifier.VerifyField(tablePos, 12 /*DiceResult*/, 4 /*int*/, 4, false) diff --git a/SCHALE.Common/FlatData/EventContentItemType.cs b/SCHALE.Common/FlatData/EventContentItemType.cs index 28d935c..384e913 100644 --- a/SCHALE.Common/FlatData/EventContentItemType.cs +++ b/SCHALE.Common/FlatData/EventContentItemType.cs @@ -14,6 +14,7 @@ public enum EventContentItemType : int EventToken4 = 4, EventToken5 = 5, EventMeetUpTicket = 6, + EventEtcItem = 7, }; diff --git a/SCHALE.Common/FlatData/EventContentLobbyMenuExcel.cs b/SCHALE.Common/FlatData/EventContentLobbyMenuExcel.cs index f70fd07..9883372 100644 --- a/SCHALE.Common/FlatData/EventContentLobbyMenuExcel.cs +++ b/SCHALE.Common/FlatData/EventContentLobbyMenuExcel.cs @@ -21,7 +21,7 @@ public struct EventContentLobbyMenuExcel : IFlatbufferObject public EventContentLobbyMenuExcel __assign(int _i, ByteBuffer _bb) { __init(_i, _bb); return this; } public long EventContentId { get { int o = __p.__offset(4); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } - public SCHALE.Common.FlatData.EventContentType EventContentType { get { int o = __p.__offset(6); return o != 0 ? (SCHALE.Common.FlatData.EventContentType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.EventContentType.Stage; } } + public SCHALE.Common.FlatData.EventContentType EventContentType_ { get { int o = __p.__offset(6); return o != 0 ? (SCHALE.Common.FlatData.EventContentType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.EventContentType.Stage; } } public string IconSpriteName { get { int o = __p.__offset(8); return o != 0 ? __p.__string(o + __p.bb_pos) : null; } } #if ENABLE_SPAN_T public Span GetIconSpriteNameBytes() { return __p.__vector_as_span(8, 1); } @@ -49,7 +49,7 @@ public struct EventContentLobbyMenuExcel : IFlatbufferObject public static Offset CreateEventContentLobbyMenuExcel(FlatBufferBuilder builder, long EventContentId = 0, - SCHALE.Common.FlatData.EventContentType EventContentType = SCHALE.Common.FlatData.EventContentType.Stage, + SCHALE.Common.FlatData.EventContentType EventContentType_ = SCHALE.Common.FlatData.EventContentType.Stage, StringOffset IconSpriteNameOffset = default(StringOffset), StringOffset ButtonTextOffset = default(StringOffset), int DisplayOrder = 0, @@ -64,13 +64,13 @@ public struct EventContentLobbyMenuExcel : IFlatbufferObject EventContentLobbyMenuExcel.AddDisplayOrder(builder, DisplayOrder); EventContentLobbyMenuExcel.AddButtonText(builder, ButtonTextOffset); EventContentLobbyMenuExcel.AddIconSpriteName(builder, IconSpriteNameOffset); - EventContentLobbyMenuExcel.AddEventContentType(builder, EventContentType); + EventContentLobbyMenuExcel.AddEventContentType_(builder, EventContentType_); return EventContentLobbyMenuExcel.EndEventContentLobbyMenuExcel(builder); } public static void StartEventContentLobbyMenuExcel(FlatBufferBuilder builder) { builder.StartTable(8); } public static void AddEventContentId(FlatBufferBuilder builder, long eventContentId) { builder.AddLong(0, eventContentId, 0); } - public static void AddEventContentType(FlatBufferBuilder builder, SCHALE.Common.FlatData.EventContentType eventContentType) { builder.AddInt(1, (int)eventContentType, 0); } + public static void AddEventContentType_(FlatBufferBuilder builder, SCHALE.Common.FlatData.EventContentType eventContentType_) { builder.AddInt(1, (int)eventContentType_, 0); } public static void AddIconSpriteName(FlatBufferBuilder builder, StringOffset iconSpriteNameOffset) { builder.AddOffset(2, iconSpriteNameOffset.Value, 0); } public static void AddButtonText(FlatBufferBuilder builder, StringOffset buttonTextOffset) { builder.AddOffset(3, buttonTextOffset.Value, 0); } public static void AddDisplayOrder(FlatBufferBuilder builder, int displayOrder) { builder.AddInt(4, displayOrder, 0); } @@ -89,7 +89,7 @@ public struct EventContentLobbyMenuExcel : IFlatbufferObject public void UnPackTo(EventContentLobbyMenuExcelT _o) { byte[] key = TableEncryptionService.CreateKey("EventContentLobbyMenu"); _o.EventContentId = TableEncryptionService.Convert(this.EventContentId, key); - _o.EventContentType = TableEncryptionService.Convert(this.EventContentType, key); + _o.EventContentType_ = TableEncryptionService.Convert(this.EventContentType_, key); _o.IconSpriteName = TableEncryptionService.Convert(this.IconSpriteName, key); _o.ButtonText = TableEncryptionService.Convert(this.ButtonText, key); _o.DisplayOrder = TableEncryptionService.Convert(this.DisplayOrder, key); @@ -105,7 +105,7 @@ public struct EventContentLobbyMenuExcel : IFlatbufferObject return CreateEventContentLobbyMenuExcel( builder, _o.EventContentId, - _o.EventContentType, + _o.EventContentType_, _IconSpriteName, _ButtonText, _o.DisplayOrder, @@ -118,7 +118,7 @@ public struct EventContentLobbyMenuExcel : IFlatbufferObject public class EventContentLobbyMenuExcelT { public long EventContentId { get; set; } - public SCHALE.Common.FlatData.EventContentType EventContentType { get; set; } + public SCHALE.Common.FlatData.EventContentType EventContentType_ { get; set; } public string IconSpriteName { get; set; } public string ButtonText { get; set; } public int DisplayOrder { get; set; } @@ -128,7 +128,7 @@ public class EventContentLobbyMenuExcelT public EventContentLobbyMenuExcelT() { this.EventContentId = 0; - this.EventContentType = SCHALE.Common.FlatData.EventContentType.Stage; + this.EventContentType_ = SCHALE.Common.FlatData.EventContentType.Stage; this.IconSpriteName = null; this.ButtonText = null; this.DisplayOrder = 0; @@ -145,7 +145,7 @@ static public class EventContentLobbyMenuExcelVerify { return verifier.VerifyTableStart(tablePos) && verifier.VerifyField(tablePos, 4 /*EventContentId*/, 8 /*long*/, 8, false) - && verifier.VerifyField(tablePos, 6 /*EventContentType*/, 4 /*SCHALE.Common.FlatData.EventContentType*/, 4, false) + && verifier.VerifyField(tablePos, 6 /*EventContentType_*/, 4 /*SCHALE.Common.FlatData.EventContentType*/, 4, false) && verifier.VerifyString(tablePos, 8 /*IconSpriteName*/, false) && verifier.VerifyString(tablePos, 10 /*ButtonText*/, false) && verifier.VerifyField(tablePos, 12 /*DisplayOrder*/, 4 /*int*/, 4, false) diff --git a/SCHALE.Common/FlatData/EventContentNotifyExcel.cs b/SCHALE.Common/FlatData/EventContentNotifyExcel.cs index 0ce48dc..99ebb1f 100644 --- a/SCHALE.Common/FlatData/EventContentNotifyExcel.cs +++ b/SCHALE.Common/FlatData/EventContentNotifyExcel.cs @@ -29,8 +29,8 @@ public struct EventContentNotifyExcel : IFlatbufferObject public ArraySegment? GetIconPathBytes() { return __p.__vector_as_arraysegment(8); } #endif public byte[] GetIconPathArray() { return __p.__vector_as_array(8); } - public SCHALE.Common.FlatData.EventNotifyType EventNotifyType { get { int o = __p.__offset(10); return o != 0 ? (SCHALE.Common.FlatData.EventNotifyType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.EventNotifyType.RewardIncreaseEvent; } } - public SCHALE.Common.FlatData.EventTargetType EventTargetType { get { int o = __p.__offset(12); return o != 0 ? (SCHALE.Common.FlatData.EventTargetType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.EventTargetType.WeekDungeon; } } + public SCHALE.Common.FlatData.EventNotifyType EventNotifyType_ { get { int o = __p.__offset(10); return o != 0 ? (SCHALE.Common.FlatData.EventNotifyType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.EventNotifyType.RewardIncreaseEvent; } } + public SCHALE.Common.FlatData.EventTargetType EventTargetType_ { get { int o = __p.__offset(12); return o != 0 ? (SCHALE.Common.FlatData.EventTargetType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.EventTargetType.WeekDungeon; } } public SCHALE.Common.FlatData.EventTargetType ShortcutEventTargetType { get { int o = __p.__offset(14); return o != 0 ? (SCHALE.Common.FlatData.EventTargetType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.EventTargetType.WeekDungeon; } } public bool IsShortcutEnable { get { int o = __p.__offset(16); return o != 0 ? 0!=__p.bb.Get(o + __p.bb_pos) : (bool)false; } } @@ -38,14 +38,14 @@ public struct EventContentNotifyExcel : IFlatbufferObject int Id = 0, uint LocalizeEtcId = 0, StringOffset IconPathOffset = default(StringOffset), - SCHALE.Common.FlatData.EventNotifyType EventNotifyType = SCHALE.Common.FlatData.EventNotifyType.RewardIncreaseEvent, - SCHALE.Common.FlatData.EventTargetType EventTargetType = SCHALE.Common.FlatData.EventTargetType.WeekDungeon, + SCHALE.Common.FlatData.EventNotifyType EventNotifyType_ = SCHALE.Common.FlatData.EventNotifyType.RewardIncreaseEvent, + SCHALE.Common.FlatData.EventTargetType EventTargetType_ = SCHALE.Common.FlatData.EventTargetType.WeekDungeon, SCHALE.Common.FlatData.EventTargetType ShortcutEventTargetType = SCHALE.Common.FlatData.EventTargetType.WeekDungeon, bool IsShortcutEnable = false) { builder.StartTable(7); EventContentNotifyExcel.AddShortcutEventTargetType(builder, ShortcutEventTargetType); - EventContentNotifyExcel.AddEventTargetType(builder, EventTargetType); - EventContentNotifyExcel.AddEventNotifyType(builder, EventNotifyType); + EventContentNotifyExcel.AddEventTargetType_(builder, EventTargetType_); + EventContentNotifyExcel.AddEventNotifyType_(builder, EventNotifyType_); EventContentNotifyExcel.AddIconPath(builder, IconPathOffset); EventContentNotifyExcel.AddLocalizeEtcId(builder, LocalizeEtcId); EventContentNotifyExcel.AddId(builder, Id); @@ -57,8 +57,8 @@ public struct EventContentNotifyExcel : IFlatbufferObject public static void AddId(FlatBufferBuilder builder, int id) { builder.AddInt(0, id, 0); } public static void AddLocalizeEtcId(FlatBufferBuilder builder, uint localizeEtcId) { builder.AddUint(1, localizeEtcId, 0); } public static void AddIconPath(FlatBufferBuilder builder, StringOffset iconPathOffset) { builder.AddOffset(2, iconPathOffset.Value, 0); } - public static void AddEventNotifyType(FlatBufferBuilder builder, SCHALE.Common.FlatData.EventNotifyType eventNotifyType) { builder.AddInt(3, (int)eventNotifyType, 0); } - public static void AddEventTargetType(FlatBufferBuilder builder, SCHALE.Common.FlatData.EventTargetType eventTargetType) { builder.AddInt(4, (int)eventTargetType, 0); } + public static void AddEventNotifyType_(FlatBufferBuilder builder, SCHALE.Common.FlatData.EventNotifyType eventNotifyType_) { builder.AddInt(3, (int)eventNotifyType_, 0); } + public static void AddEventTargetType_(FlatBufferBuilder builder, SCHALE.Common.FlatData.EventTargetType eventTargetType_) { builder.AddInt(4, (int)eventTargetType_, 0); } public static void AddShortcutEventTargetType(FlatBufferBuilder builder, SCHALE.Common.FlatData.EventTargetType shortcutEventTargetType) { builder.AddInt(5, (int)shortcutEventTargetType, 0); } public static void AddIsShortcutEnable(FlatBufferBuilder builder, bool isShortcutEnable) { builder.AddBool(6, isShortcutEnable, false); } public static Offset EndEventContentNotifyExcel(FlatBufferBuilder builder) { @@ -75,8 +75,8 @@ public struct EventContentNotifyExcel : IFlatbufferObject _o.Id = TableEncryptionService.Convert(this.Id, key); _o.LocalizeEtcId = TableEncryptionService.Convert(this.LocalizeEtcId, key); _o.IconPath = TableEncryptionService.Convert(this.IconPath, key); - _o.EventNotifyType = TableEncryptionService.Convert(this.EventNotifyType, key); - _o.EventTargetType = TableEncryptionService.Convert(this.EventTargetType, key); + _o.EventNotifyType_ = TableEncryptionService.Convert(this.EventNotifyType_, key); + _o.EventTargetType_ = TableEncryptionService.Convert(this.EventTargetType_, key); _o.ShortcutEventTargetType = TableEncryptionService.Convert(this.ShortcutEventTargetType, key); _o.IsShortcutEnable = TableEncryptionService.Convert(this.IsShortcutEnable, key); } @@ -88,8 +88,8 @@ public struct EventContentNotifyExcel : IFlatbufferObject _o.Id, _o.LocalizeEtcId, _IconPath, - _o.EventNotifyType, - _o.EventTargetType, + _o.EventNotifyType_, + _o.EventTargetType_, _o.ShortcutEventTargetType, _o.IsShortcutEnable); } @@ -100,8 +100,8 @@ public class EventContentNotifyExcelT public int Id { get; set; } public uint LocalizeEtcId { get; set; } public string IconPath { get; set; } - public SCHALE.Common.FlatData.EventNotifyType EventNotifyType { get; set; } - public SCHALE.Common.FlatData.EventTargetType EventTargetType { get; set; } + public SCHALE.Common.FlatData.EventNotifyType EventNotifyType_ { get; set; } + public SCHALE.Common.FlatData.EventTargetType EventTargetType_ { get; set; } public SCHALE.Common.FlatData.EventTargetType ShortcutEventTargetType { get; set; } public bool IsShortcutEnable { get; set; } @@ -109,8 +109,8 @@ public class EventContentNotifyExcelT this.Id = 0; this.LocalizeEtcId = 0; this.IconPath = null; - this.EventNotifyType = SCHALE.Common.FlatData.EventNotifyType.RewardIncreaseEvent; - this.EventTargetType = SCHALE.Common.FlatData.EventTargetType.WeekDungeon; + this.EventNotifyType_ = SCHALE.Common.FlatData.EventNotifyType.RewardIncreaseEvent; + this.EventTargetType_ = SCHALE.Common.FlatData.EventTargetType.WeekDungeon; this.ShortcutEventTargetType = SCHALE.Common.FlatData.EventTargetType.WeekDungeon; this.IsShortcutEnable = false; } @@ -125,8 +125,8 @@ static public class EventContentNotifyExcelVerify && verifier.VerifyField(tablePos, 4 /*Id*/, 4 /*int*/, 4, false) && verifier.VerifyField(tablePos, 6 /*LocalizeEtcId*/, 4 /*uint*/, 4, false) && verifier.VerifyString(tablePos, 8 /*IconPath*/, false) - && verifier.VerifyField(tablePos, 10 /*EventNotifyType*/, 4 /*SCHALE.Common.FlatData.EventNotifyType*/, 4, false) - && verifier.VerifyField(tablePos, 12 /*EventTargetType*/, 4 /*SCHALE.Common.FlatData.EventTargetType*/, 4, false) + && verifier.VerifyField(tablePos, 10 /*EventNotifyType_*/, 4 /*SCHALE.Common.FlatData.EventNotifyType*/, 4, false) + && verifier.VerifyField(tablePos, 12 /*EventTargetType_*/, 4 /*SCHALE.Common.FlatData.EventTargetType*/, 4, false) && verifier.VerifyField(tablePos, 14 /*ShortcutEventTargetType*/, 4 /*SCHALE.Common.FlatData.EventTargetType*/, 4, false) && verifier.VerifyField(tablePos, 16 /*IsShortcutEnable*/, 1 /*bool*/, 1, false) && verifier.VerifyTableEnd(tablePos); diff --git a/SCHALE.Common/FlatData/EventContentReleaseType.cs b/SCHALE.Common/FlatData/EventContentReleaseType.cs index b4ec83f..e0d0872 100644 --- a/SCHALE.Common/FlatData/EventContentReleaseType.cs +++ b/SCHALE.Common/FlatData/EventContentReleaseType.cs @@ -11,6 +11,7 @@ public enum EventContentReleaseType : int Permanent = 1, MainStory = 2, PermanentSpecialOperate = 3, + PermanentConquest = 4, }; diff --git a/SCHALE.Common/FlatData/EventContentSeasonExcel.cs b/SCHALE.Common/FlatData/EventContentSeasonExcel.cs index d0913a4..6727cf8 100644 --- a/SCHALE.Common/FlatData/EventContentSeasonExcel.cs +++ b/SCHALE.Common/FlatData/EventContentSeasonExcel.cs @@ -30,11 +30,11 @@ public struct EventContentSeasonExcel : IFlatbufferObject public ArraySegment? GetNameBytes() { return __p.__vector_as_arraysegment(10); } #endif public byte[] GetNameArray() { return __p.__vector_as_array(10); } - public SCHALE.Common.FlatData.EventContentType EventContentType { get { int o = __p.__offset(12); return o != 0 ? (SCHALE.Common.FlatData.EventContentType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.EventContentType.Stage; } } - public SCHALE.Common.FlatData.OpenConditionContent OpenConditionContent { get { int o = __p.__offset(14); return o != 0 ? (SCHALE.Common.FlatData.OpenConditionContent)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.OpenConditionContent.Shop; } } + public SCHALE.Common.FlatData.EventContentType EventContentType_ { get { int o = __p.__offset(12); return o != 0 ? (SCHALE.Common.FlatData.EventContentType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.EventContentType.Stage; } } + public SCHALE.Common.FlatData.OpenConditionContent OpenConditionContent_ { get { int o = __p.__offset(14); return o != 0 ? (SCHALE.Common.FlatData.OpenConditionContent)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.OpenConditionContent.Shop; } } public bool EventDisplay { get { int o = __p.__offset(16); return o != 0 ? 0!=__p.bb.Get(o + __p.bb_pos) : (bool)false; } } public int IconOrder { get { int o = __p.__offset(18); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } - public SCHALE.Common.FlatData.SubEventType SubEventType { get { int o = __p.__offset(20); return o != 0 ? (SCHALE.Common.FlatData.SubEventType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.SubEventType.None; } } + public SCHALE.Common.FlatData.SubEventType SubEventType_ { get { int o = __p.__offset(20); return o != 0 ? (SCHALE.Common.FlatData.SubEventType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.SubEventType.None; } } public bool SubEvent { get { int o = __p.__offset(22); return o != 0 ? 0!=__p.bb.Get(o + __p.bb_pos) : (bool)false; } } public long EventItemId { get { int o = __p.__offset(24); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public long MainEventId { get { int o = __p.__offset(26); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } @@ -140,29 +140,37 @@ public struct EventContentSeasonExcel : IFlatbufferObject public ArraySegment? GetMinigameMissionBgPrefabNameBytes() { return __p.__vector_as_arraysegment(60); } #endif public byte[] GetMinigameMissionBgPrefabNameArray() { return __p.__vector_as_array(60); } - public string CardBgImagePath { get { int o = __p.__offset(62); return o != 0 ? __p.__string(o + __p.bb_pos) : null; } } + public string MinigameMissionBgImagePath { get { int o = __p.__offset(62); return o != 0 ? __p.__string(o + __p.bb_pos) : null; } } #if ENABLE_SPAN_T - public Span GetCardBgImagePathBytes() { return __p.__vector_as_span(62, 1); } + public Span GetMinigameMissionBgImagePathBytes() { return __p.__vector_as_span(62, 1); } #else - public ArraySegment? GetCardBgImagePathBytes() { return __p.__vector_as_arraysegment(62); } + public ArraySegment? GetMinigameMissionBgImagePathBytes() { return __p.__vector_as_arraysegment(62); } #endif - public byte[] GetCardBgImagePathArray() { return __p.__vector_as_array(62); } - public bool EventAssist { get { int o = __p.__offset(64); return o != 0 ? 0!=__p.bb.Get(o + __p.bb_pos) : (bool)false; } } - public SCHALE.Common.FlatData.EventContentReleaseType EventContentReleaseType { get { int o = __p.__offset(66); return o != 0 ? (SCHALE.Common.FlatData.EventContentReleaseType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.EventContentReleaseType.None; } } - public long EventContentStageRewardIdPermanent { get { int o = __p.__offset(68); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } - public SCHALE.Common.FlatData.RewardTag RewardTagPermanent { get { int o = __p.__offset(70); return o != 0 ? (SCHALE.Common.FlatData.RewardTag)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.RewardTag.Default; } } - public long MiniEventShortCutScenarioModeId { get { int o = __p.__offset(72); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } + public byte[] GetMinigameMissionBgImagePathArray() { return __p.__vector_as_array(62); } + public string CardBgImagePath { get { int o = __p.__offset(64); return o != 0 ? __p.__string(o + __p.bb_pos) : null; } } +#if ENABLE_SPAN_T + public Span GetCardBgImagePathBytes() { return __p.__vector_as_span(64, 1); } +#else + public ArraySegment? GetCardBgImagePathBytes() { return __p.__vector_as_arraysegment(64); } +#endif + public byte[] GetCardBgImagePathArray() { return __p.__vector_as_array(64); } + public bool EventAssist { get { int o = __p.__offset(66); return o != 0 ? 0!=__p.bb.Get(o + __p.bb_pos) : (bool)false; } } + public SCHALE.Common.FlatData.EventContentReleaseType EventContentReleaseType_ { get { int o = __p.__offset(68); return o != 0 ? (SCHALE.Common.FlatData.EventContentReleaseType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.EventContentReleaseType.None; } } + public long EventContentStageRewardIdPermanent { get { int o = __p.__offset(70); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } + public SCHALE.Common.FlatData.RewardTag RewardTagPermanent { get { int o = __p.__offset(72); return o != 0 ? (SCHALE.Common.FlatData.RewardTag)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.RewardTag.Default; } } + public long MiniEventShortCutScenarioModeId { get { int o = __p.__offset(74); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } + public long ScenarioContentCollectionGroupId { get { int o = __p.__offset(76); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public static Offset CreateEventContentSeasonExcel(FlatBufferBuilder builder, long EventContentId = 0, long OriginalEventContentId = 0, bool IsReturn = false, StringOffset NameOffset = default(StringOffset), - SCHALE.Common.FlatData.EventContentType EventContentType = SCHALE.Common.FlatData.EventContentType.Stage, - SCHALE.Common.FlatData.OpenConditionContent OpenConditionContent = SCHALE.Common.FlatData.OpenConditionContent.Shop, + SCHALE.Common.FlatData.EventContentType EventContentType_ = SCHALE.Common.FlatData.EventContentType.Stage, + SCHALE.Common.FlatData.OpenConditionContent OpenConditionContent_ = SCHALE.Common.FlatData.OpenConditionContent.Shop, bool EventDisplay = false, int IconOrder = 0, - SCHALE.Common.FlatData.SubEventType SubEventType = SCHALE.Common.FlatData.SubEventType.None, + SCHALE.Common.FlatData.SubEventType SubEventType_ = SCHALE.Common.FlatData.SubEventType.None, bool SubEvent = false, long EventItemId = 0, long MainEventId = 0, @@ -183,13 +191,16 @@ public struct EventContentSeasonExcel : IFlatbufferObject StringOffset MinigameLobbyPrefabNameOffset = default(StringOffset), StringOffset MinigameVictoryPrefabNameOffset = default(StringOffset), StringOffset MinigameMissionBgPrefabNameOffset = default(StringOffset), + StringOffset MinigameMissionBgImagePathOffset = default(StringOffset), StringOffset CardBgImagePathOffset = default(StringOffset), bool EventAssist = false, - SCHALE.Common.FlatData.EventContentReleaseType EventContentReleaseType = SCHALE.Common.FlatData.EventContentReleaseType.None, + SCHALE.Common.FlatData.EventContentReleaseType EventContentReleaseType_ = SCHALE.Common.FlatData.EventContentReleaseType.None, long EventContentStageRewardIdPermanent = 0, SCHALE.Common.FlatData.RewardTag RewardTagPermanent = SCHALE.Common.FlatData.RewardTag.Default, - long MiniEventShortCutScenarioModeId = 0) { - builder.StartTable(35); + long MiniEventShortCutScenarioModeId = 0, + long ScenarioContentCollectionGroupId = 0) { + builder.StartTable(37); + EventContentSeasonExcel.AddScenarioContentCollectionGroupId(builder, ScenarioContentCollectionGroupId); EventContentSeasonExcel.AddMiniEventShortCutScenarioModeId(builder, MiniEventShortCutScenarioModeId); EventContentSeasonExcel.AddEventContentStageRewardIdPermanent(builder, EventContentStageRewardIdPermanent); EventContentSeasonExcel.AddShiftTriggerStageId(builder, ShiftTriggerStageId); @@ -200,8 +211,9 @@ public struct EventContentSeasonExcel : IFlatbufferObject EventContentSeasonExcel.AddOriginalEventContentId(builder, OriginalEventContentId); EventContentSeasonExcel.AddEventContentId(builder, EventContentId); EventContentSeasonExcel.AddRewardTagPermanent(builder, RewardTagPermanent); - EventContentSeasonExcel.AddEventContentReleaseType(builder, EventContentReleaseType); + EventContentSeasonExcel.AddEventContentReleaseType_(builder, EventContentReleaseType_); EventContentSeasonExcel.AddCardBgImagePath(builder, CardBgImagePathOffset); + EventContentSeasonExcel.AddMinigameMissionBgImagePath(builder, MinigameMissionBgImagePathOffset); EventContentSeasonExcel.AddMinigameMissionBgPrefabName(builder, MinigameMissionBgPrefabNameOffset); EventContentSeasonExcel.AddMinigameVictoryPrefabName(builder, MinigameVictoryPrefabNameOffset); EventContentSeasonExcel.AddMinigameLobbyPrefabName(builder, MinigameLobbyPrefabNameOffset); @@ -216,10 +228,10 @@ public struct EventContentSeasonExcel : IFlatbufferObject EventContentSeasonExcel.AddEventContentCloseTime(builder, EventContentCloseTimeOffset); EventContentSeasonExcel.AddEventContentOpenTime(builder, EventContentOpenTimeOffset); EventContentSeasonExcel.AddBeforehandExposedTime(builder, BeforehandExposedTimeOffset); - EventContentSeasonExcel.AddSubEventType(builder, SubEventType); + EventContentSeasonExcel.AddSubEventType_(builder, SubEventType_); EventContentSeasonExcel.AddIconOrder(builder, IconOrder); - EventContentSeasonExcel.AddOpenConditionContent(builder, OpenConditionContent); - EventContentSeasonExcel.AddEventContentType(builder, EventContentType); + EventContentSeasonExcel.AddOpenConditionContent_(builder, OpenConditionContent_); + EventContentSeasonExcel.AddEventContentType_(builder, EventContentType_); EventContentSeasonExcel.AddName(builder, NameOffset); EventContentSeasonExcel.AddEventAssist(builder, EventAssist); EventContentSeasonExcel.AddSubEvent(builder, SubEvent); @@ -228,16 +240,16 @@ public struct EventContentSeasonExcel : IFlatbufferObject return EventContentSeasonExcel.EndEventContentSeasonExcel(builder); } - public static void StartEventContentSeasonExcel(FlatBufferBuilder builder) { builder.StartTable(35); } + public static void StartEventContentSeasonExcel(FlatBufferBuilder builder) { builder.StartTable(37); } public static void AddEventContentId(FlatBufferBuilder builder, long eventContentId) { builder.AddLong(0, eventContentId, 0); } public static void AddOriginalEventContentId(FlatBufferBuilder builder, long originalEventContentId) { builder.AddLong(1, originalEventContentId, 0); } public static void AddIsReturn(FlatBufferBuilder builder, bool isReturn) { builder.AddBool(2, isReturn, false); } public static void AddName(FlatBufferBuilder builder, StringOffset nameOffset) { builder.AddOffset(3, nameOffset.Value, 0); } - public static void AddEventContentType(FlatBufferBuilder builder, SCHALE.Common.FlatData.EventContentType eventContentType) { builder.AddInt(4, (int)eventContentType, 0); } - public static void AddOpenConditionContent(FlatBufferBuilder builder, SCHALE.Common.FlatData.OpenConditionContent openConditionContent) { builder.AddInt(5, (int)openConditionContent, 0); } + public static void AddEventContentType_(FlatBufferBuilder builder, SCHALE.Common.FlatData.EventContentType eventContentType_) { builder.AddInt(4, (int)eventContentType_, 0); } + public static void AddOpenConditionContent_(FlatBufferBuilder builder, SCHALE.Common.FlatData.OpenConditionContent openConditionContent_) { builder.AddInt(5, (int)openConditionContent_, 0); } public static void AddEventDisplay(FlatBufferBuilder builder, bool eventDisplay) { builder.AddBool(6, eventDisplay, false); } public static void AddIconOrder(FlatBufferBuilder builder, int iconOrder) { builder.AddInt(7, iconOrder, 0); } - public static void AddSubEventType(FlatBufferBuilder builder, SCHALE.Common.FlatData.SubEventType subEventType) { builder.AddInt(8, (int)subEventType, 0); } + public static void AddSubEventType_(FlatBufferBuilder builder, SCHALE.Common.FlatData.SubEventType subEventType_) { builder.AddInt(8, (int)subEventType_, 0); } public static void AddSubEvent(FlatBufferBuilder builder, bool subEvent) { builder.AddBool(9, subEvent, false); } public static void AddEventItemId(FlatBufferBuilder builder, long eventItemId) { builder.AddLong(10, eventItemId, 0); } public static void AddMainEventId(FlatBufferBuilder builder, long mainEventId) { builder.AddLong(11, mainEventId, 0); } @@ -263,12 +275,14 @@ public struct EventContentSeasonExcel : IFlatbufferObject public static void AddMinigameLobbyPrefabName(FlatBufferBuilder builder, StringOffset minigameLobbyPrefabNameOffset) { builder.AddOffset(26, minigameLobbyPrefabNameOffset.Value, 0); } public static void AddMinigameVictoryPrefabName(FlatBufferBuilder builder, StringOffset minigameVictoryPrefabNameOffset) { builder.AddOffset(27, minigameVictoryPrefabNameOffset.Value, 0); } public static void AddMinigameMissionBgPrefabName(FlatBufferBuilder builder, StringOffset minigameMissionBgPrefabNameOffset) { builder.AddOffset(28, minigameMissionBgPrefabNameOffset.Value, 0); } - public static void AddCardBgImagePath(FlatBufferBuilder builder, StringOffset cardBgImagePathOffset) { builder.AddOffset(29, cardBgImagePathOffset.Value, 0); } - public static void AddEventAssist(FlatBufferBuilder builder, bool eventAssist) { builder.AddBool(30, eventAssist, false); } - public static void AddEventContentReleaseType(FlatBufferBuilder builder, SCHALE.Common.FlatData.EventContentReleaseType eventContentReleaseType) { builder.AddInt(31, (int)eventContentReleaseType, 0); } - public static void AddEventContentStageRewardIdPermanent(FlatBufferBuilder builder, long eventContentStageRewardIdPermanent) { builder.AddLong(32, eventContentStageRewardIdPermanent, 0); } - public static void AddRewardTagPermanent(FlatBufferBuilder builder, SCHALE.Common.FlatData.RewardTag rewardTagPermanent) { builder.AddInt(33, (int)rewardTagPermanent, 0); } - public static void AddMiniEventShortCutScenarioModeId(FlatBufferBuilder builder, long miniEventShortCutScenarioModeId) { builder.AddLong(34, miniEventShortCutScenarioModeId, 0); } + public static void AddMinigameMissionBgImagePath(FlatBufferBuilder builder, StringOffset minigameMissionBgImagePathOffset) { builder.AddOffset(29, minigameMissionBgImagePathOffset.Value, 0); } + public static void AddCardBgImagePath(FlatBufferBuilder builder, StringOffset cardBgImagePathOffset) { builder.AddOffset(30, cardBgImagePathOffset.Value, 0); } + public static void AddEventAssist(FlatBufferBuilder builder, bool eventAssist) { builder.AddBool(31, eventAssist, false); } + public static void AddEventContentReleaseType_(FlatBufferBuilder builder, SCHALE.Common.FlatData.EventContentReleaseType eventContentReleaseType_) { builder.AddInt(32, (int)eventContentReleaseType_, 0); } + public static void AddEventContentStageRewardIdPermanent(FlatBufferBuilder builder, long eventContentStageRewardIdPermanent) { builder.AddLong(33, eventContentStageRewardIdPermanent, 0); } + public static void AddRewardTagPermanent(FlatBufferBuilder builder, SCHALE.Common.FlatData.RewardTag rewardTagPermanent) { builder.AddInt(34, (int)rewardTagPermanent, 0); } + public static void AddMiniEventShortCutScenarioModeId(FlatBufferBuilder builder, long miniEventShortCutScenarioModeId) { builder.AddLong(35, miniEventShortCutScenarioModeId, 0); } + public static void AddScenarioContentCollectionGroupId(FlatBufferBuilder builder, long scenarioContentCollectionGroupId) { builder.AddLong(36, scenarioContentCollectionGroupId, 0); } public static Offset EndEventContentSeasonExcel(FlatBufferBuilder builder) { int o = builder.EndTable(); return new Offset(o); @@ -284,11 +298,11 @@ public struct EventContentSeasonExcel : IFlatbufferObject _o.OriginalEventContentId = TableEncryptionService.Convert(this.OriginalEventContentId, key); _o.IsReturn = TableEncryptionService.Convert(this.IsReturn, key); _o.Name = TableEncryptionService.Convert(this.Name, key); - _o.EventContentType = TableEncryptionService.Convert(this.EventContentType, key); - _o.OpenConditionContent = TableEncryptionService.Convert(this.OpenConditionContent, key); + _o.EventContentType_ = TableEncryptionService.Convert(this.EventContentType_, key); + _o.OpenConditionContent_ = TableEncryptionService.Convert(this.OpenConditionContent_, key); _o.EventDisplay = TableEncryptionService.Convert(this.EventDisplay, key); _o.IconOrder = TableEncryptionService.Convert(this.IconOrder, key); - _o.SubEventType = TableEncryptionService.Convert(this.SubEventType, key); + _o.SubEventType_ = TableEncryptionService.Convert(this.SubEventType_, key); _o.SubEvent = TableEncryptionService.Convert(this.SubEvent, key); _o.EventItemId = TableEncryptionService.Convert(this.EventItemId, key); _o.MainEventId = TableEncryptionService.Convert(this.MainEventId, key); @@ -310,12 +324,14 @@ public struct EventContentSeasonExcel : IFlatbufferObject _o.MinigameLobbyPrefabName = TableEncryptionService.Convert(this.MinigameLobbyPrefabName, key); _o.MinigameVictoryPrefabName = TableEncryptionService.Convert(this.MinigameVictoryPrefabName, key); _o.MinigameMissionBgPrefabName = TableEncryptionService.Convert(this.MinigameMissionBgPrefabName, key); + _o.MinigameMissionBgImagePath = TableEncryptionService.Convert(this.MinigameMissionBgImagePath, key); _o.CardBgImagePath = TableEncryptionService.Convert(this.CardBgImagePath, key); _o.EventAssist = TableEncryptionService.Convert(this.EventAssist, key); - _o.EventContentReleaseType = TableEncryptionService.Convert(this.EventContentReleaseType, key); + _o.EventContentReleaseType_ = TableEncryptionService.Convert(this.EventContentReleaseType_, key); _o.EventContentStageRewardIdPermanent = TableEncryptionService.Convert(this.EventContentStageRewardIdPermanent, key); _o.RewardTagPermanent = TableEncryptionService.Convert(this.RewardTagPermanent, key); _o.MiniEventShortCutScenarioModeId = TableEncryptionService.Convert(this.MiniEventShortCutScenarioModeId, key); + _o.ScenarioContentCollectionGroupId = TableEncryptionService.Convert(this.ScenarioContentCollectionGroupId, key); } public static Offset Pack(FlatBufferBuilder builder, EventContentSeasonExcelT _o) { if (_o == null) return default(Offset); @@ -338,6 +354,7 @@ public struct EventContentSeasonExcel : IFlatbufferObject var _MinigameLobbyPrefabName = _o.MinigameLobbyPrefabName == null ? default(StringOffset) : builder.CreateString(_o.MinigameLobbyPrefabName); var _MinigameVictoryPrefabName = _o.MinigameVictoryPrefabName == null ? default(StringOffset) : builder.CreateString(_o.MinigameVictoryPrefabName); var _MinigameMissionBgPrefabName = _o.MinigameMissionBgPrefabName == null ? default(StringOffset) : builder.CreateString(_o.MinigameMissionBgPrefabName); + var _MinigameMissionBgImagePath = _o.MinigameMissionBgImagePath == null ? default(StringOffset) : builder.CreateString(_o.MinigameMissionBgImagePath); var _CardBgImagePath = _o.CardBgImagePath == null ? default(StringOffset) : builder.CreateString(_o.CardBgImagePath); return CreateEventContentSeasonExcel( builder, @@ -345,11 +362,11 @@ public struct EventContentSeasonExcel : IFlatbufferObject _o.OriginalEventContentId, _o.IsReturn, _Name, - _o.EventContentType, - _o.OpenConditionContent, + _o.EventContentType_, + _o.OpenConditionContent_, _o.EventDisplay, _o.IconOrder, - _o.SubEventType, + _o.SubEventType_, _o.SubEvent, _o.EventItemId, _o.MainEventId, @@ -370,12 +387,14 @@ public struct EventContentSeasonExcel : IFlatbufferObject _MinigameLobbyPrefabName, _MinigameVictoryPrefabName, _MinigameMissionBgPrefabName, + _MinigameMissionBgImagePath, _CardBgImagePath, _o.EventAssist, - _o.EventContentReleaseType, + _o.EventContentReleaseType_, _o.EventContentStageRewardIdPermanent, _o.RewardTagPermanent, - _o.MiniEventShortCutScenarioModeId); + _o.MiniEventShortCutScenarioModeId, + _o.ScenarioContentCollectionGroupId); } } @@ -385,11 +404,11 @@ public class EventContentSeasonExcelT public long OriginalEventContentId { get; set; } public bool IsReturn { get; set; } public string Name { get; set; } - public SCHALE.Common.FlatData.EventContentType EventContentType { get; set; } - public SCHALE.Common.FlatData.OpenConditionContent OpenConditionContent { get; set; } + public SCHALE.Common.FlatData.EventContentType EventContentType_ { get; set; } + public SCHALE.Common.FlatData.OpenConditionContent OpenConditionContent_ { get; set; } public bool EventDisplay { get; set; } public int IconOrder { get; set; } - public SCHALE.Common.FlatData.SubEventType SubEventType { get; set; } + public SCHALE.Common.FlatData.SubEventType SubEventType_ { get; set; } public bool SubEvent { get; set; } public long EventItemId { get; set; } public long MainEventId { get; set; } @@ -410,23 +429,25 @@ public class EventContentSeasonExcelT public string MinigameLobbyPrefabName { get; set; } public string MinigameVictoryPrefabName { get; set; } public string MinigameMissionBgPrefabName { get; set; } + public string MinigameMissionBgImagePath { get; set; } public string CardBgImagePath { get; set; } public bool EventAssist { get; set; } - public SCHALE.Common.FlatData.EventContentReleaseType EventContentReleaseType { get; set; } + public SCHALE.Common.FlatData.EventContentReleaseType EventContentReleaseType_ { get; set; } public long EventContentStageRewardIdPermanent { get; set; } public SCHALE.Common.FlatData.RewardTag RewardTagPermanent { get; set; } public long MiniEventShortCutScenarioModeId { get; set; } + public long ScenarioContentCollectionGroupId { get; set; } public EventContentSeasonExcelT() { this.EventContentId = 0; this.OriginalEventContentId = 0; this.IsReturn = false; this.Name = null; - this.EventContentType = SCHALE.Common.FlatData.EventContentType.Stage; - this.OpenConditionContent = SCHALE.Common.FlatData.OpenConditionContent.Shop; + this.EventContentType_ = SCHALE.Common.FlatData.EventContentType.Stage; + this.OpenConditionContent_ = SCHALE.Common.FlatData.OpenConditionContent.Shop; this.EventDisplay = false; this.IconOrder = 0; - this.SubEventType = SCHALE.Common.FlatData.SubEventType.None; + this.SubEventType_ = SCHALE.Common.FlatData.SubEventType.None; this.SubEvent = false; this.EventItemId = 0; this.MainEventId = 0; @@ -447,12 +468,14 @@ public class EventContentSeasonExcelT this.MinigameLobbyPrefabName = null; this.MinigameVictoryPrefabName = null; this.MinigameMissionBgPrefabName = null; + this.MinigameMissionBgImagePath = null; this.CardBgImagePath = null; this.EventAssist = false; - this.EventContentReleaseType = SCHALE.Common.FlatData.EventContentReleaseType.None; + this.EventContentReleaseType_ = SCHALE.Common.FlatData.EventContentReleaseType.None; this.EventContentStageRewardIdPermanent = 0; this.RewardTagPermanent = SCHALE.Common.FlatData.RewardTag.Default; this.MiniEventShortCutScenarioModeId = 0; + this.ScenarioContentCollectionGroupId = 0; } } @@ -466,11 +489,11 @@ static public class EventContentSeasonExcelVerify && verifier.VerifyField(tablePos, 6 /*OriginalEventContentId*/, 8 /*long*/, 8, false) && verifier.VerifyField(tablePos, 8 /*IsReturn*/, 1 /*bool*/, 1, false) && verifier.VerifyString(tablePos, 10 /*Name*/, false) - && verifier.VerifyField(tablePos, 12 /*EventContentType*/, 4 /*SCHALE.Common.FlatData.EventContentType*/, 4, false) - && verifier.VerifyField(tablePos, 14 /*OpenConditionContent*/, 4 /*SCHALE.Common.FlatData.OpenConditionContent*/, 4, false) + && verifier.VerifyField(tablePos, 12 /*EventContentType_*/, 4 /*SCHALE.Common.FlatData.EventContentType*/, 4, false) + && verifier.VerifyField(tablePos, 14 /*OpenConditionContent_*/, 4 /*SCHALE.Common.FlatData.OpenConditionContent*/, 4, false) && verifier.VerifyField(tablePos, 16 /*EventDisplay*/, 1 /*bool*/, 1, false) && verifier.VerifyField(tablePos, 18 /*IconOrder*/, 4 /*int*/, 4, false) - && verifier.VerifyField(tablePos, 20 /*SubEventType*/, 4 /*SCHALE.Common.FlatData.SubEventType*/, 4, false) + && verifier.VerifyField(tablePos, 20 /*SubEventType_*/, 4 /*SCHALE.Common.FlatData.SubEventType*/, 4, false) && verifier.VerifyField(tablePos, 22 /*SubEvent*/, 1 /*bool*/, 1, false) && verifier.VerifyField(tablePos, 24 /*EventItemId*/, 8 /*long*/, 8, false) && verifier.VerifyField(tablePos, 26 /*MainEventId*/, 8 /*long*/, 8, false) @@ -491,12 +514,14 @@ static public class EventContentSeasonExcelVerify && verifier.VerifyString(tablePos, 56 /*MinigameLobbyPrefabName*/, false) && verifier.VerifyString(tablePos, 58 /*MinigameVictoryPrefabName*/, false) && verifier.VerifyString(tablePos, 60 /*MinigameMissionBgPrefabName*/, false) - && verifier.VerifyString(tablePos, 62 /*CardBgImagePath*/, false) - && verifier.VerifyField(tablePos, 64 /*EventAssist*/, 1 /*bool*/, 1, false) - && verifier.VerifyField(tablePos, 66 /*EventContentReleaseType*/, 4 /*SCHALE.Common.FlatData.EventContentReleaseType*/, 4, false) - && verifier.VerifyField(tablePos, 68 /*EventContentStageRewardIdPermanent*/, 8 /*long*/, 8, false) - && verifier.VerifyField(tablePos, 70 /*RewardTagPermanent*/, 4 /*SCHALE.Common.FlatData.RewardTag*/, 4, false) - && verifier.VerifyField(tablePos, 72 /*MiniEventShortCutScenarioModeId*/, 8 /*long*/, 8, false) + && verifier.VerifyString(tablePos, 62 /*MinigameMissionBgImagePath*/, false) + && verifier.VerifyString(tablePos, 64 /*CardBgImagePath*/, false) + && verifier.VerifyField(tablePos, 66 /*EventAssist*/, 1 /*bool*/, 1, false) + && verifier.VerifyField(tablePos, 68 /*EventContentReleaseType_*/, 4 /*SCHALE.Common.FlatData.EventContentReleaseType*/, 4, false) + && verifier.VerifyField(tablePos, 70 /*EventContentStageRewardIdPermanent*/, 8 /*long*/, 8, false) + && verifier.VerifyField(tablePos, 72 /*RewardTagPermanent*/, 4 /*SCHALE.Common.FlatData.RewardTag*/, 4, false) + && verifier.VerifyField(tablePos, 74 /*MiniEventShortCutScenarioModeId*/, 8 /*long*/, 8, false) + && verifier.VerifyField(tablePos, 76 /*ScenarioContentCollectionGroupId*/, 8 /*long*/, 8, false) && verifier.VerifyTableEnd(tablePos); } } diff --git a/SCHALE.Common/FlatData/EventContentShopExcel.cs b/SCHALE.Common/FlatData/EventContentShopExcel.cs index c895405..278e587 100644 --- a/SCHALE.Common/FlatData/EventContentShopExcel.cs +++ b/SCHALE.Common/FlatData/EventContentShopExcel.cs @@ -50,7 +50,7 @@ public struct EventContentShopExcel : IFlatbufferObject public byte[] GetSalePeriodToArray() { return __p.__vector_as_array(20); } public long PurchaseCooltimeMin { get { int o = __p.__offset(22); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public long PurchaseCountLimit { get { int o = __p.__offset(24); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } - public SCHALE.Common.FlatData.PurchaseCountResetType PurchaseCountResetType { get { int o = __p.__offset(26); return o != 0 ? (SCHALE.Common.FlatData.PurchaseCountResetType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.PurchaseCountResetType.None; } } + public SCHALE.Common.FlatData.PurchaseCountResetType PurchaseCountResetType_ { get { int o = __p.__offset(26); return o != 0 ? (SCHALE.Common.FlatData.PurchaseCountResetType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.PurchaseCountResetType.None; } } public string BuyReportEventName { get { int o = __p.__offset(28); return o != 0 ? __p.__string(o + __p.bb_pos) : null; } } #if ENABLE_SPAN_T public Span GetBuyReportEventNameBytes() { return __p.__vector_as_span(28, 1); } @@ -72,7 +72,7 @@ public struct EventContentShopExcel : IFlatbufferObject StringOffset SalePeriodToOffset = default(StringOffset), long PurchaseCooltimeMin = 0, long PurchaseCountLimit = 0, - SCHALE.Common.FlatData.PurchaseCountResetType PurchaseCountResetType = SCHALE.Common.FlatData.PurchaseCountResetType.None, + SCHALE.Common.FlatData.PurchaseCountResetType PurchaseCountResetType_ = SCHALE.Common.FlatData.PurchaseCountResetType.None, StringOffset BuyReportEventNameOffset = default(StringOffset), bool RestrictBuyWhenInventoryFull = false) { builder.StartTable(14); @@ -82,7 +82,7 @@ public struct EventContentShopExcel : IFlatbufferObject EventContentShopExcel.AddId(builder, Id); EventContentShopExcel.AddEventContentId(builder, EventContentId); EventContentShopExcel.AddBuyReportEventName(builder, BuyReportEventNameOffset); - EventContentShopExcel.AddPurchaseCountResetType(builder, PurchaseCountResetType); + EventContentShopExcel.AddPurchaseCountResetType_(builder, PurchaseCountResetType_); EventContentShopExcel.AddSalePeriodTo(builder, SalePeriodToOffset); EventContentShopExcel.AddSalePeriodFrom(builder, SalePeriodFromOffset); EventContentShopExcel.AddGoodsId(builder, GoodsIdOffset); @@ -110,7 +110,7 @@ public struct EventContentShopExcel : IFlatbufferObject public static void AddSalePeriodTo(FlatBufferBuilder builder, StringOffset salePeriodToOffset) { builder.AddOffset(8, salePeriodToOffset.Value, 0); } public static void AddPurchaseCooltimeMin(FlatBufferBuilder builder, long purchaseCooltimeMin) { builder.AddLong(9, purchaseCooltimeMin, 0); } public static void AddPurchaseCountLimit(FlatBufferBuilder builder, long purchaseCountLimit) { builder.AddLong(10, purchaseCountLimit, 0); } - public static void AddPurchaseCountResetType(FlatBufferBuilder builder, SCHALE.Common.FlatData.PurchaseCountResetType purchaseCountResetType) { builder.AddInt(11, (int)purchaseCountResetType, 0); } + public static void AddPurchaseCountResetType_(FlatBufferBuilder builder, SCHALE.Common.FlatData.PurchaseCountResetType purchaseCountResetType_) { builder.AddInt(11, (int)purchaseCountResetType_, 0); } public static void AddBuyReportEventName(FlatBufferBuilder builder, StringOffset buyReportEventNameOffset) { builder.AddOffset(12, buyReportEventNameOffset.Value, 0); } public static void AddRestrictBuyWhenInventoryFull(FlatBufferBuilder builder, bool restrictBuyWhenInventoryFull) { builder.AddBool(13, restrictBuyWhenInventoryFull, false); } public static Offset EndEventContentShopExcel(FlatBufferBuilder builder) { @@ -136,7 +136,7 @@ public struct EventContentShopExcel : IFlatbufferObject _o.SalePeriodTo = TableEncryptionService.Convert(this.SalePeriodTo, key); _o.PurchaseCooltimeMin = TableEncryptionService.Convert(this.PurchaseCooltimeMin, key); _o.PurchaseCountLimit = TableEncryptionService.Convert(this.PurchaseCountLimit, key); - _o.PurchaseCountResetType = TableEncryptionService.Convert(this.PurchaseCountResetType, key); + _o.PurchaseCountResetType_ = TableEncryptionService.Convert(this.PurchaseCountResetType_, key); _o.BuyReportEventName = TableEncryptionService.Convert(this.BuyReportEventName, key); _o.RestrictBuyWhenInventoryFull = TableEncryptionService.Convert(this.RestrictBuyWhenInventoryFull, key); } @@ -163,7 +163,7 @@ public struct EventContentShopExcel : IFlatbufferObject _SalePeriodTo, _o.PurchaseCooltimeMin, _o.PurchaseCountLimit, - _o.PurchaseCountResetType, + _o.PurchaseCountResetType_, _BuyReportEventName, _o.RestrictBuyWhenInventoryFull); } @@ -182,7 +182,7 @@ public class EventContentShopExcelT public string SalePeriodTo { get; set; } public long PurchaseCooltimeMin { get; set; } public long PurchaseCountLimit { get; set; } - public SCHALE.Common.FlatData.PurchaseCountResetType PurchaseCountResetType { get; set; } + public SCHALE.Common.FlatData.PurchaseCountResetType PurchaseCountResetType_ { get; set; } public string BuyReportEventName { get; set; } public bool RestrictBuyWhenInventoryFull { get; set; } @@ -198,7 +198,7 @@ public class EventContentShopExcelT this.SalePeriodTo = null; this.PurchaseCooltimeMin = 0; this.PurchaseCountLimit = 0; - this.PurchaseCountResetType = SCHALE.Common.FlatData.PurchaseCountResetType.None; + this.PurchaseCountResetType_ = SCHALE.Common.FlatData.PurchaseCountResetType.None; this.BuyReportEventName = null; this.RestrictBuyWhenInventoryFull = false; } @@ -221,7 +221,7 @@ static public class EventContentShopExcelVerify && verifier.VerifyString(tablePos, 20 /*SalePeriodTo*/, false) && verifier.VerifyField(tablePos, 22 /*PurchaseCooltimeMin*/, 8 /*long*/, 8, false) && verifier.VerifyField(tablePos, 24 /*PurchaseCountLimit*/, 8 /*long*/, 8, false) - && verifier.VerifyField(tablePos, 26 /*PurchaseCountResetType*/, 4 /*SCHALE.Common.FlatData.PurchaseCountResetType*/, 4, false) + && verifier.VerifyField(tablePos, 26 /*PurchaseCountResetType_*/, 4 /*SCHALE.Common.FlatData.PurchaseCountResetType*/, 4, false) && verifier.VerifyString(tablePos, 28 /*BuyReportEventName*/, false) && verifier.VerifyField(tablePos, 30 /*RestrictBuyWhenInventoryFull*/, 1 /*bool*/, 1, false) && verifier.VerifyTableEnd(tablePos); diff --git a/SCHALE.Common/FlatData/EventContentSpineDialogOffsetExcel.cs b/SCHALE.Common/FlatData/EventContentSpineDialogOffsetExcel.cs index bac5953..63f8631 100644 --- a/SCHALE.Common/FlatData/EventContentSpineDialogOffsetExcel.cs +++ b/SCHALE.Common/FlatData/EventContentSpineDialogOffsetExcel.cs @@ -21,7 +21,7 @@ public struct EventContentSpineDialogOffsetExcel : IFlatbufferObject public EventContentSpineDialogOffsetExcel __assign(int _i, ByteBuffer _bb) { __init(_i, _bb); return this; } public long EventContentId { get { int o = __p.__offset(4); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } - public SCHALE.Common.FlatData.EventContentType EventContentType { get { int o = __p.__offset(6); return o != 0 ? (SCHALE.Common.FlatData.EventContentType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.EventContentType.Stage; } } + public SCHALE.Common.FlatData.EventContentType EventContentType_ { get { int o = __p.__offset(6); return o != 0 ? (SCHALE.Common.FlatData.EventContentType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.EventContentType.Stage; } } public long CostumeUniqueId { get { int o = __p.__offset(8); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public float SpineOffsetX { get { int o = __p.__offset(10); return o != 0 ? __p.bb.GetFloat(o + __p.bb_pos) : (float)0.0f; } } public float SpineOffsetY { get { int o = __p.__offset(12); return o != 0 ? __p.bb.GetFloat(o + __p.bb_pos) : (float)0.0f; } } @@ -30,7 +30,7 @@ public struct EventContentSpineDialogOffsetExcel : IFlatbufferObject public static Offset CreateEventContentSpineDialogOffsetExcel(FlatBufferBuilder builder, long EventContentId = 0, - SCHALE.Common.FlatData.EventContentType EventContentType = SCHALE.Common.FlatData.EventContentType.Stage, + SCHALE.Common.FlatData.EventContentType EventContentType_ = SCHALE.Common.FlatData.EventContentType.Stage, long CostumeUniqueId = 0, float SpineOffsetX = 0.0f, float SpineOffsetY = 0.0f, @@ -43,13 +43,13 @@ public struct EventContentSpineDialogOffsetExcel : IFlatbufferObject EventContentSpineDialogOffsetExcel.AddDialogOffsetX(builder, DialogOffsetX); EventContentSpineDialogOffsetExcel.AddSpineOffsetY(builder, SpineOffsetY); EventContentSpineDialogOffsetExcel.AddSpineOffsetX(builder, SpineOffsetX); - EventContentSpineDialogOffsetExcel.AddEventContentType(builder, EventContentType); + EventContentSpineDialogOffsetExcel.AddEventContentType_(builder, EventContentType_); return EventContentSpineDialogOffsetExcel.EndEventContentSpineDialogOffsetExcel(builder); } public static void StartEventContentSpineDialogOffsetExcel(FlatBufferBuilder builder) { builder.StartTable(7); } public static void AddEventContentId(FlatBufferBuilder builder, long eventContentId) { builder.AddLong(0, eventContentId, 0); } - public static void AddEventContentType(FlatBufferBuilder builder, SCHALE.Common.FlatData.EventContentType eventContentType) { builder.AddInt(1, (int)eventContentType, 0); } + public static void AddEventContentType_(FlatBufferBuilder builder, SCHALE.Common.FlatData.EventContentType eventContentType_) { builder.AddInt(1, (int)eventContentType_, 0); } public static void AddCostumeUniqueId(FlatBufferBuilder builder, long costumeUniqueId) { builder.AddLong(2, costumeUniqueId, 0); } public static void AddSpineOffsetX(FlatBufferBuilder builder, float spineOffsetX) { builder.AddFloat(3, spineOffsetX, 0.0f); } public static void AddSpineOffsetY(FlatBufferBuilder builder, float spineOffsetY) { builder.AddFloat(4, spineOffsetY, 0.0f); } @@ -67,7 +67,7 @@ public struct EventContentSpineDialogOffsetExcel : IFlatbufferObject public void UnPackTo(EventContentSpineDialogOffsetExcelT _o) { byte[] key = TableEncryptionService.CreateKey("EventContentSpineDialogOffset"); _o.EventContentId = TableEncryptionService.Convert(this.EventContentId, key); - _o.EventContentType = TableEncryptionService.Convert(this.EventContentType, key); + _o.EventContentType_ = TableEncryptionService.Convert(this.EventContentType_, key); _o.CostumeUniqueId = TableEncryptionService.Convert(this.CostumeUniqueId, key); _o.SpineOffsetX = TableEncryptionService.Convert(this.SpineOffsetX, key); _o.SpineOffsetY = TableEncryptionService.Convert(this.SpineOffsetY, key); @@ -79,7 +79,7 @@ public struct EventContentSpineDialogOffsetExcel : IFlatbufferObject return CreateEventContentSpineDialogOffsetExcel( builder, _o.EventContentId, - _o.EventContentType, + _o.EventContentType_, _o.CostumeUniqueId, _o.SpineOffsetX, _o.SpineOffsetY, @@ -91,7 +91,7 @@ public struct EventContentSpineDialogOffsetExcel : IFlatbufferObject public class EventContentSpineDialogOffsetExcelT { public long EventContentId { get; set; } - public SCHALE.Common.FlatData.EventContentType EventContentType { get; set; } + public SCHALE.Common.FlatData.EventContentType EventContentType_ { get; set; } public long CostumeUniqueId { get; set; } public float SpineOffsetX { get; set; } public float SpineOffsetY { get; set; } @@ -100,7 +100,7 @@ public class EventContentSpineDialogOffsetExcelT public EventContentSpineDialogOffsetExcelT() { this.EventContentId = 0; - this.EventContentType = SCHALE.Common.FlatData.EventContentType.Stage; + this.EventContentType_ = SCHALE.Common.FlatData.EventContentType.Stage; this.CostumeUniqueId = 0; this.SpineOffsetX = 0.0f; this.SpineOffsetY = 0.0f; @@ -116,7 +116,7 @@ static public class EventContentSpineDialogOffsetExcelVerify { return verifier.VerifyTableStart(tablePos) && verifier.VerifyField(tablePos, 4 /*EventContentId*/, 8 /*long*/, 8, false) - && verifier.VerifyField(tablePos, 6 /*EventContentType*/, 4 /*SCHALE.Common.FlatData.EventContentType*/, 4, false) + && verifier.VerifyField(tablePos, 6 /*EventContentType_*/, 4 /*SCHALE.Common.FlatData.EventContentType*/, 4, false) && verifier.VerifyField(tablePos, 8 /*CostumeUniqueId*/, 8 /*long*/, 8, false) && verifier.VerifyField(tablePos, 10 /*SpineOffsetX*/, 4 /*float*/, 4, false) && verifier.VerifyField(tablePos, 12 /*SpineOffsetY*/, 4 /*float*/, 4, false) diff --git a/SCHALE.Common/FlatData/EventContentStageExcel.cs b/SCHALE.Common/FlatData/EventContentStageExcel.cs index 7e27f33..b081c34 100644 --- a/SCHALE.Common/FlatData/EventContentStageExcel.cs +++ b/SCHALE.Common/FlatData/EventContentStageExcel.cs @@ -29,7 +29,7 @@ public struct EventContentStageExcel : IFlatbufferObject #endif public byte[] GetNameArray() { return __p.__vector_as_array(6); } public long EventContentId { get { int o = __p.__offset(8); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } - public SCHALE.Common.FlatData.StageDifficulty StageDifficulty { get { int o = __p.__offset(10); return o != 0 ? (SCHALE.Common.FlatData.StageDifficulty)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.StageDifficulty.None; } } + public SCHALE.Common.FlatData.StageDifficulty StageDifficulty_ { get { int o = __p.__offset(10); return o != 0 ? (SCHALE.Common.FlatData.StageDifficulty)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.StageDifficulty.None; } } public string StageNumber { get { int o = __p.__offset(12); return o != 0 ? __p.__string(o + __p.bb_pos) : null; } } #if ENABLE_SPAN_T public Span GetStageNumberBytes() { return __p.__vector_as_span(12, 1); } @@ -85,7 +85,7 @@ public struct EventContentStageExcel : IFlatbufferObject public byte[] GetStrategyMapBGArray() { return __p.__vector_as_array(52); } public long EventContentStageRewardId { get { int o = __p.__offset(54); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public int MaxTurn { get { int o = __p.__offset(56); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } - public SCHALE.Common.FlatData.StageTopography StageTopography { get { int o = __p.__offset(58); return o != 0 ? (SCHALE.Common.FlatData.StageTopography)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.StageTopography.Street; } } + public SCHALE.Common.FlatData.StageTopography StageTopography_ { get { int o = __p.__offset(58); return o != 0 ? (SCHALE.Common.FlatData.StageTopography)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.StageTopography.Street; } } public int RecommandLevel { get { int o = __p.__offset(60); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } public string BgmId { get { int o = __p.__offset(62); return o != 0 ? __p.__string(o + __p.bb_pos) : null; } } #if ENABLE_SPAN_T @@ -94,9 +94,9 @@ public struct EventContentStageExcel : IFlatbufferObject public ArraySegment? GetBgmIdBytes() { return __p.__vector_as_arraysegment(62); } #endif public byte[] GetBgmIdArray() { return __p.__vector_as_array(62); } - public SCHALE.Common.FlatData.StrategyEnvironment StrategyEnvironment { get { int o = __p.__offset(64); return o != 0 ? (SCHALE.Common.FlatData.StrategyEnvironment)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.StrategyEnvironment.None; } } + public SCHALE.Common.FlatData.StrategyEnvironment StrategyEnvironment_ { get { int o = __p.__offset(64); return o != 0 ? (SCHALE.Common.FlatData.StrategyEnvironment)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.StrategyEnvironment.None; } } public long GroundID { get { int o = __p.__offset(66); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } - public SCHALE.Common.FlatData.ContentType ContentType { get { int o = __p.__offset(68); return o != 0 ? (SCHALE.Common.FlatData.ContentType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.ContentType.None; } } + public SCHALE.Common.FlatData.ContentType ContentType_ { get { int o = __p.__offset(68); return o != 0 ? (SCHALE.Common.FlatData.ContentType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.ContentType.None; } } public long BGMId { get { int o = __p.__offset(70); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public bool InstantClear { get { int o = __p.__offset(72); return o != 0 ? 0!=__p.bb.Get(o + __p.bb_pos) : (bool)false; } } public long BuffContentId { get { int o = __p.__offset(74); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } @@ -120,13 +120,13 @@ public struct EventContentStageExcel : IFlatbufferObject public int[] GetStarGoalAmountArray() { return __p.__vector_as_array(82); } public bool IsDefeatBattle { get { int o = __p.__offset(84); return o != 0 ? 0!=__p.bb.Get(o + __p.bb_pos) : (bool)false; } } public uint StageHint { get { int o = __p.__offset(86); return o != 0 ? __p.bb.GetUint(o + __p.bb_pos) : (uint)0; } } - public SCHALE.Common.FlatData.EchelonExtensionType EchelonExtensionType { get { int o = __p.__offset(88); return o != 0 ? (SCHALE.Common.FlatData.EchelonExtensionType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.EchelonExtensionType.Base; } } + public SCHALE.Common.FlatData.EchelonExtensionType EchelonExtensionType_ { get { int o = __p.__offset(88); return o != 0 ? (SCHALE.Common.FlatData.EchelonExtensionType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.EchelonExtensionType.Base; } } public static Offset CreateEventContentStageExcel(FlatBufferBuilder builder, long Id = 0, StringOffset NameOffset = default(StringOffset), long EventContentId = 0, - SCHALE.Common.FlatData.StageDifficulty StageDifficulty = SCHALE.Common.FlatData.StageDifficulty.None, + SCHALE.Common.FlatData.StageDifficulty StageDifficulty_ = SCHALE.Common.FlatData.StageDifficulty.None, StringOffset StageNumberOffset = default(StringOffset), int StageDisplay = 0, long PrevStageId = 0, @@ -150,12 +150,12 @@ public struct EventContentStageExcel : IFlatbufferObject StringOffset StrategyMapBGOffset = default(StringOffset), long EventContentStageRewardId = 0, int MaxTurn = 0, - SCHALE.Common.FlatData.StageTopography StageTopography = SCHALE.Common.FlatData.StageTopography.Street, + SCHALE.Common.FlatData.StageTopography StageTopography_ = SCHALE.Common.FlatData.StageTopography.Street, int RecommandLevel = 0, StringOffset BgmIdOffset = default(StringOffset), - SCHALE.Common.FlatData.StrategyEnvironment StrategyEnvironment = SCHALE.Common.FlatData.StrategyEnvironment.None, + SCHALE.Common.FlatData.StrategyEnvironment StrategyEnvironment_ = SCHALE.Common.FlatData.StrategyEnvironment.None, long GroundID = 0, - SCHALE.Common.FlatData.ContentType ContentType = SCHALE.Common.FlatData.ContentType.None, + SCHALE.Common.FlatData.ContentType ContentType_ = SCHALE.Common.FlatData.ContentType.None, long BGMId = 0, bool InstantClear = false, long BuffContentId = 0, @@ -165,7 +165,7 @@ public struct EventContentStageExcel : IFlatbufferObject VectorOffset StarGoalAmountOffset = default(VectorOffset), bool IsDefeatBattle = false, uint StageHint = 0, - SCHALE.Common.FlatData.EchelonExtensionType EchelonExtensionType = SCHALE.Common.FlatData.EchelonExtensionType.Base) { + SCHALE.Common.FlatData.EchelonExtensionType EchelonExtensionType_ = SCHALE.Common.FlatData.EchelonExtensionType.Base) { builder.StartTable(43); EventContentStageExcel.AddFixedEchelonId(builder, FixedEchelonId); EventContentStageExcel.AddBuffContentId(builder, BuffContentId); @@ -185,15 +185,15 @@ public struct EventContentStageExcel : IFlatbufferObject EventContentStageExcel.AddPrevStageId(builder, PrevStageId); EventContentStageExcel.AddEventContentId(builder, EventContentId); EventContentStageExcel.AddId(builder, Id); - EventContentStageExcel.AddEchelonExtensionType(builder, EchelonExtensionType); + EventContentStageExcel.AddEchelonExtensionType_(builder, EchelonExtensionType_); EventContentStageExcel.AddStageHint(builder, StageHint); EventContentStageExcel.AddStarGoalAmount(builder, StarGoalAmountOffset); EventContentStageExcel.AddStarGoal(builder, StarGoalOffset); - EventContentStageExcel.AddContentType(builder, ContentType); - EventContentStageExcel.AddStrategyEnvironment(builder, StrategyEnvironment); + EventContentStageExcel.AddContentType_(builder, ContentType_); + EventContentStageExcel.AddStrategyEnvironment_(builder, StrategyEnvironment_); EventContentStageExcel.AddBgmId(builder, BgmIdOffset); EventContentStageExcel.AddRecommandLevel(builder, RecommandLevel); - EventContentStageExcel.AddStageTopography(builder, StageTopography); + EventContentStageExcel.AddStageTopography_(builder, StageTopography_); EventContentStageExcel.AddMaxTurn(builder, MaxTurn); EventContentStageExcel.AddStrategyMapBG(builder, StrategyMapBGOffset); EventContentStageExcel.AddStrategyMap(builder, StrategyMapOffset); @@ -205,7 +205,7 @@ public struct EventContentStageExcel : IFlatbufferObject EventContentStageExcel.AddOpenConditionContentType(builder, OpenConditionContentType); EventContentStageExcel.AddStageDisplay(builder, StageDisplay); EventContentStageExcel.AddStageNumber(builder, StageNumberOffset); - EventContentStageExcel.AddStageDifficulty(builder, StageDifficulty); + EventContentStageExcel.AddStageDifficulty_(builder, StageDifficulty_); EventContentStageExcel.AddName(builder, NameOffset); EventContentStageExcel.AddIsDefeatBattle(builder, IsDefeatBattle); EventContentStageExcel.AddChallengeDisplay(builder, ChallengeDisplay); @@ -217,7 +217,7 @@ public struct EventContentStageExcel : IFlatbufferObject public static void AddId(FlatBufferBuilder builder, long id) { builder.AddLong(0, id, 0); } public static void AddName(FlatBufferBuilder builder, StringOffset nameOffset) { builder.AddOffset(1, nameOffset.Value, 0); } public static void AddEventContentId(FlatBufferBuilder builder, long eventContentId) { builder.AddLong(2, eventContentId, 0); } - public static void AddStageDifficulty(FlatBufferBuilder builder, SCHALE.Common.FlatData.StageDifficulty stageDifficulty) { builder.AddInt(3, (int)stageDifficulty, 0); } + public static void AddStageDifficulty_(FlatBufferBuilder builder, SCHALE.Common.FlatData.StageDifficulty stageDifficulty_) { builder.AddInt(3, (int)stageDifficulty_, 0); } public static void AddStageNumber(FlatBufferBuilder builder, StringOffset stageNumberOffset) { builder.AddOffset(4, stageNumberOffset.Value, 0); } public static void AddStageDisplay(FlatBufferBuilder builder, int stageDisplay) { builder.AddInt(5, stageDisplay, 0); } public static void AddPrevStageId(FlatBufferBuilder builder, long prevStageId) { builder.AddLong(6, prevStageId, 0); } @@ -251,12 +251,12 @@ public struct EventContentStageExcel : IFlatbufferObject public static void AddStrategyMapBG(FlatBufferBuilder builder, StringOffset strategyMapBGOffset) { builder.AddOffset(24, strategyMapBGOffset.Value, 0); } public static void AddEventContentStageRewardId(FlatBufferBuilder builder, long eventContentStageRewardId) { builder.AddLong(25, eventContentStageRewardId, 0); } public static void AddMaxTurn(FlatBufferBuilder builder, int maxTurn) { builder.AddInt(26, maxTurn, 0); } - public static void AddStageTopography(FlatBufferBuilder builder, SCHALE.Common.FlatData.StageTopography stageTopography) { builder.AddInt(27, (int)stageTopography, 0); } + public static void AddStageTopography_(FlatBufferBuilder builder, SCHALE.Common.FlatData.StageTopography stageTopography_) { builder.AddInt(27, (int)stageTopography_, 0); } public static void AddRecommandLevel(FlatBufferBuilder builder, int recommandLevel) { builder.AddInt(28, recommandLevel, 0); } public static void AddBgmId(FlatBufferBuilder builder, StringOffset bgmIdOffset) { builder.AddOffset(29, bgmIdOffset.Value, 0); } - public static void AddStrategyEnvironment(FlatBufferBuilder builder, SCHALE.Common.FlatData.StrategyEnvironment strategyEnvironment) { builder.AddInt(30, (int)strategyEnvironment, 0); } + public static void AddStrategyEnvironment_(FlatBufferBuilder builder, SCHALE.Common.FlatData.StrategyEnvironment strategyEnvironment_) { builder.AddInt(30, (int)strategyEnvironment_, 0); } public static void AddGroundID(FlatBufferBuilder builder, long groundID) { builder.AddLong(31, groundID, 0); } - public static void AddContentType(FlatBufferBuilder builder, SCHALE.Common.FlatData.ContentType contentType) { builder.AddInt(32, (int)contentType, 0); } + public static void AddContentType_(FlatBufferBuilder builder, SCHALE.Common.FlatData.ContentType contentType_) { builder.AddInt(32, (int)contentType_, 0); } public static void AddBGMId(FlatBufferBuilder builder, long bGMId) { builder.AddLong(33, bGMId, 0); } public static void AddInstantClear(FlatBufferBuilder builder, bool instantClear) { builder.AddBool(34, instantClear, false); } public static void AddBuffContentId(FlatBufferBuilder builder, long buffContentId) { builder.AddLong(35, buffContentId, 0); } @@ -276,7 +276,7 @@ public struct EventContentStageExcel : IFlatbufferObject public static void StartStarGoalAmountVector(FlatBufferBuilder builder, int numElems) { builder.StartVector(4, numElems, 4); } public static void AddIsDefeatBattle(FlatBufferBuilder builder, bool isDefeatBattle) { builder.AddBool(40, isDefeatBattle, false); } public static void AddStageHint(FlatBufferBuilder builder, uint stageHint) { builder.AddUint(41, stageHint, 0); } - public static void AddEchelonExtensionType(FlatBufferBuilder builder, SCHALE.Common.FlatData.EchelonExtensionType echelonExtensionType) { builder.AddInt(42, (int)echelonExtensionType, 0); } + public static void AddEchelonExtensionType_(FlatBufferBuilder builder, SCHALE.Common.FlatData.EchelonExtensionType echelonExtensionType_) { builder.AddInt(42, (int)echelonExtensionType_, 0); } public static Offset EndEventContentStageExcel(FlatBufferBuilder builder) { int o = builder.EndTable(); return new Offset(o); @@ -291,7 +291,7 @@ public struct EventContentStageExcel : IFlatbufferObject _o.Id = TableEncryptionService.Convert(this.Id, key); _o.Name = TableEncryptionService.Convert(this.Name, key); _o.EventContentId = TableEncryptionService.Convert(this.EventContentId, key); - _o.StageDifficulty = TableEncryptionService.Convert(this.StageDifficulty, key); + _o.StageDifficulty_ = TableEncryptionService.Convert(this.StageDifficulty_, key); _o.StageNumber = TableEncryptionService.Convert(this.StageNumber, key); _o.StageDisplay = TableEncryptionService.Convert(this.StageDisplay, key); _o.PrevStageId = TableEncryptionService.Convert(this.PrevStageId, key); @@ -317,12 +317,12 @@ public struct EventContentStageExcel : IFlatbufferObject _o.StrategyMapBG = TableEncryptionService.Convert(this.StrategyMapBG, key); _o.EventContentStageRewardId = TableEncryptionService.Convert(this.EventContentStageRewardId, key); _o.MaxTurn = TableEncryptionService.Convert(this.MaxTurn, key); - _o.StageTopography = TableEncryptionService.Convert(this.StageTopography, key); + _o.StageTopography_ = TableEncryptionService.Convert(this.StageTopography_, key); _o.RecommandLevel = TableEncryptionService.Convert(this.RecommandLevel, key); _o.BgmId = TableEncryptionService.Convert(this.BgmId, key); - _o.StrategyEnvironment = TableEncryptionService.Convert(this.StrategyEnvironment, key); + _o.StrategyEnvironment_ = TableEncryptionService.Convert(this.StrategyEnvironment_, key); _o.GroundID = TableEncryptionService.Convert(this.GroundID, key); - _o.ContentType = TableEncryptionService.Convert(this.ContentType, key); + _o.ContentType_ = TableEncryptionService.Convert(this.ContentType_, key); _o.BGMId = TableEncryptionService.Convert(this.BGMId, key); _o.InstantClear = TableEncryptionService.Convert(this.InstantClear, key); _o.BuffContentId = TableEncryptionService.Convert(this.BuffContentId, key); @@ -334,7 +334,7 @@ public struct EventContentStageExcel : IFlatbufferObject for (var _j = 0; _j < this.StarGoalAmountLength; ++_j) {_o.StarGoalAmount.Add(TableEncryptionService.Convert(this.StarGoalAmount(_j), key));} _o.IsDefeatBattle = TableEncryptionService.Convert(this.IsDefeatBattle, key); _o.StageHint = TableEncryptionService.Convert(this.StageHint, key); - _o.EchelonExtensionType = TableEncryptionService.Convert(this.EchelonExtensionType, key); + _o.EchelonExtensionType_ = TableEncryptionService.Convert(this.EchelonExtensionType_, key); } public static Offset Pack(FlatBufferBuilder builder, EventContentStageExcelT _o) { if (_o == null) return default(Offset); @@ -368,7 +368,7 @@ public struct EventContentStageExcel : IFlatbufferObject _o.Id, _Name, _o.EventContentId, - _o.StageDifficulty, + _o.StageDifficulty_, _StageNumber, _o.StageDisplay, _o.PrevStageId, @@ -392,12 +392,12 @@ public struct EventContentStageExcel : IFlatbufferObject _StrategyMapBG, _o.EventContentStageRewardId, _o.MaxTurn, - _o.StageTopography, + _o.StageTopography_, _o.RecommandLevel, _BgmId, - _o.StrategyEnvironment, + _o.StrategyEnvironment_, _o.GroundID, - _o.ContentType, + _o.ContentType_, _o.BGMId, _o.InstantClear, _o.BuffContentId, @@ -407,7 +407,7 @@ public struct EventContentStageExcel : IFlatbufferObject _StarGoalAmount, _o.IsDefeatBattle, _o.StageHint, - _o.EchelonExtensionType); + _o.EchelonExtensionType_); } } @@ -416,7 +416,7 @@ public class EventContentStageExcelT public long Id { get; set; } public string Name { get; set; } public long EventContentId { get; set; } - public SCHALE.Common.FlatData.StageDifficulty StageDifficulty { get; set; } + public SCHALE.Common.FlatData.StageDifficulty StageDifficulty_ { get; set; } public string StageNumber { get; set; } public int StageDisplay { get; set; } public long PrevStageId { get; set; } @@ -440,12 +440,12 @@ public class EventContentStageExcelT public string StrategyMapBG { get; set; } public long EventContentStageRewardId { get; set; } public int MaxTurn { get; set; } - public SCHALE.Common.FlatData.StageTopography StageTopography { get; set; } + public SCHALE.Common.FlatData.StageTopography StageTopography_ { get; set; } public int RecommandLevel { get; set; } public string BgmId { get; set; } - public SCHALE.Common.FlatData.StrategyEnvironment StrategyEnvironment { get; set; } + public SCHALE.Common.FlatData.StrategyEnvironment StrategyEnvironment_ { get; set; } public long GroundID { get; set; } - public SCHALE.Common.FlatData.ContentType ContentType { get; set; } + public SCHALE.Common.FlatData.ContentType ContentType_ { get; set; } public long BGMId { get; set; } public bool InstantClear { get; set; } public long BuffContentId { get; set; } @@ -455,13 +455,13 @@ public class EventContentStageExcelT public List StarGoalAmount { get; set; } public bool IsDefeatBattle { get; set; } public uint StageHint { get; set; } - public SCHALE.Common.FlatData.EchelonExtensionType EchelonExtensionType { get; set; } + public SCHALE.Common.FlatData.EchelonExtensionType EchelonExtensionType_ { get; set; } public EventContentStageExcelT() { this.Id = 0; this.Name = null; this.EventContentId = 0; - this.StageDifficulty = SCHALE.Common.FlatData.StageDifficulty.None; + this.StageDifficulty_ = SCHALE.Common.FlatData.StageDifficulty.None; this.StageNumber = null; this.StageDisplay = 0; this.PrevStageId = 0; @@ -485,12 +485,12 @@ public class EventContentStageExcelT this.StrategyMapBG = null; this.EventContentStageRewardId = 0; this.MaxTurn = 0; - this.StageTopography = SCHALE.Common.FlatData.StageTopography.Street; + this.StageTopography_ = SCHALE.Common.FlatData.StageTopography.Street; this.RecommandLevel = 0; this.BgmId = null; - this.StrategyEnvironment = SCHALE.Common.FlatData.StrategyEnvironment.None; + this.StrategyEnvironment_ = SCHALE.Common.FlatData.StrategyEnvironment.None; this.GroundID = 0; - this.ContentType = SCHALE.Common.FlatData.ContentType.None; + this.ContentType_ = SCHALE.Common.FlatData.ContentType.None; this.BGMId = 0; this.InstantClear = false; this.BuffContentId = 0; @@ -500,7 +500,7 @@ public class EventContentStageExcelT this.StarGoalAmount = null; this.IsDefeatBattle = false; this.StageHint = 0; - this.EchelonExtensionType = SCHALE.Common.FlatData.EchelonExtensionType.Base; + this.EchelonExtensionType_ = SCHALE.Common.FlatData.EchelonExtensionType.Base; } } @@ -513,7 +513,7 @@ static public class EventContentStageExcelVerify && verifier.VerifyField(tablePos, 4 /*Id*/, 8 /*long*/, 8, false) && verifier.VerifyString(tablePos, 6 /*Name*/, false) && verifier.VerifyField(tablePos, 8 /*EventContentId*/, 8 /*long*/, 8, false) - && verifier.VerifyField(tablePos, 10 /*StageDifficulty*/, 4 /*SCHALE.Common.FlatData.StageDifficulty*/, 4, false) + && verifier.VerifyField(tablePos, 10 /*StageDifficulty_*/, 4 /*SCHALE.Common.FlatData.StageDifficulty*/, 4, false) && verifier.VerifyString(tablePos, 12 /*StageNumber*/, false) && verifier.VerifyField(tablePos, 14 /*StageDisplay*/, 4 /*int*/, 4, false) && verifier.VerifyField(tablePos, 16 /*PrevStageId*/, 8 /*long*/, 8, false) @@ -537,12 +537,12 @@ static public class EventContentStageExcelVerify && verifier.VerifyString(tablePos, 52 /*StrategyMapBG*/, false) && verifier.VerifyField(tablePos, 54 /*EventContentStageRewardId*/, 8 /*long*/, 8, false) && verifier.VerifyField(tablePos, 56 /*MaxTurn*/, 4 /*int*/, 4, false) - && verifier.VerifyField(tablePos, 58 /*StageTopography*/, 4 /*SCHALE.Common.FlatData.StageTopography*/, 4, false) + && verifier.VerifyField(tablePos, 58 /*StageTopography_*/, 4 /*SCHALE.Common.FlatData.StageTopography*/, 4, false) && verifier.VerifyField(tablePos, 60 /*RecommandLevel*/, 4 /*int*/, 4, false) && verifier.VerifyString(tablePos, 62 /*BgmId*/, false) - && verifier.VerifyField(tablePos, 64 /*StrategyEnvironment*/, 4 /*SCHALE.Common.FlatData.StrategyEnvironment*/, 4, false) + && verifier.VerifyField(tablePos, 64 /*StrategyEnvironment_*/, 4 /*SCHALE.Common.FlatData.StrategyEnvironment*/, 4, false) && verifier.VerifyField(tablePos, 66 /*GroundID*/, 8 /*long*/, 8, false) - && verifier.VerifyField(tablePos, 68 /*ContentType*/, 4 /*SCHALE.Common.FlatData.ContentType*/, 4, false) + && verifier.VerifyField(tablePos, 68 /*ContentType_*/, 4 /*SCHALE.Common.FlatData.ContentType*/, 4, false) && verifier.VerifyField(tablePos, 70 /*BGMId*/, 8 /*long*/, 8, false) && verifier.VerifyField(tablePos, 72 /*InstantClear*/, 1 /*bool*/, 1, false) && verifier.VerifyField(tablePos, 74 /*BuffContentId*/, 8 /*long*/, 8, false) @@ -552,7 +552,7 @@ static public class EventContentStageExcelVerify && verifier.VerifyVectorOfData(tablePos, 82 /*StarGoalAmount*/, 4 /*int*/, false) && verifier.VerifyField(tablePos, 84 /*IsDefeatBattle*/, 1 /*bool*/, 1, false) && verifier.VerifyField(tablePos, 86 /*StageHint*/, 4 /*uint*/, 4, false) - && verifier.VerifyField(tablePos, 88 /*EchelonExtensionType*/, 4 /*SCHALE.Common.FlatData.EchelonExtensionType*/, 4, false) + && verifier.VerifyField(tablePos, 88 /*EchelonExtensionType_*/, 4 /*SCHALE.Common.FlatData.EchelonExtensionType*/, 4, false) && verifier.VerifyTableEnd(tablePos); } } diff --git a/SCHALE.Common/FlatData/EventContentStageRewardExcel.cs b/SCHALE.Common/FlatData/EventContentStageRewardExcel.cs index ae269a1..a4fe859 100644 --- a/SCHALE.Common/FlatData/EventContentStageRewardExcel.cs +++ b/SCHALE.Common/FlatData/EventContentStageRewardExcel.cs @@ -21,7 +21,7 @@ public struct EventContentStageRewardExcel : IFlatbufferObject public EventContentStageRewardExcel __assign(int _i, ByteBuffer _bb) { __init(_i, _bb); return this; } public long GroupId { get { int o = __p.__offset(4); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } - public SCHALE.Common.FlatData.RewardTag RewardTag { get { int o = __p.__offset(6); return o != 0 ? (SCHALE.Common.FlatData.RewardTag)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.RewardTag.Default; } } + public SCHALE.Common.FlatData.RewardTag RewardTag_ { get { int o = __p.__offset(6); return o != 0 ? (SCHALE.Common.FlatData.RewardTag)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.RewardTag.Default; } } public int RewardProb { get { int o = __p.__offset(8); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } public SCHALE.Common.FlatData.ParcelType RewardParcelType { get { int o = __p.__offset(10); return o != 0 ? (SCHALE.Common.FlatData.ParcelType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.ParcelType.None; } } public long RewardId { get { int o = __p.__offset(12); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } @@ -30,7 +30,7 @@ public struct EventContentStageRewardExcel : IFlatbufferObject public static Offset CreateEventContentStageRewardExcel(FlatBufferBuilder builder, long GroupId = 0, - SCHALE.Common.FlatData.RewardTag RewardTag = SCHALE.Common.FlatData.RewardTag.Default, + SCHALE.Common.FlatData.RewardTag RewardTag_ = SCHALE.Common.FlatData.RewardTag.Default, int RewardProb = 0, SCHALE.Common.FlatData.ParcelType RewardParcelType = SCHALE.Common.FlatData.ParcelType.None, long RewardId = 0, @@ -42,14 +42,14 @@ public struct EventContentStageRewardExcel : IFlatbufferObject EventContentStageRewardExcel.AddRewardAmount(builder, RewardAmount); EventContentStageRewardExcel.AddRewardParcelType(builder, RewardParcelType); EventContentStageRewardExcel.AddRewardProb(builder, RewardProb); - EventContentStageRewardExcel.AddRewardTag(builder, RewardTag); + EventContentStageRewardExcel.AddRewardTag_(builder, RewardTag_); EventContentStageRewardExcel.AddIsDisplayed(builder, IsDisplayed); return EventContentStageRewardExcel.EndEventContentStageRewardExcel(builder); } public static void StartEventContentStageRewardExcel(FlatBufferBuilder builder) { builder.StartTable(7); } public static void AddGroupId(FlatBufferBuilder builder, long groupId) { builder.AddLong(0, groupId, 0); } - public static void AddRewardTag(FlatBufferBuilder builder, SCHALE.Common.FlatData.RewardTag rewardTag) { builder.AddInt(1, (int)rewardTag, 0); } + public static void AddRewardTag_(FlatBufferBuilder builder, SCHALE.Common.FlatData.RewardTag rewardTag_) { builder.AddInt(1, (int)rewardTag_, 0); } public static void AddRewardProb(FlatBufferBuilder builder, int rewardProb) { builder.AddInt(2, rewardProb, 0); } public static void AddRewardParcelType(FlatBufferBuilder builder, SCHALE.Common.FlatData.ParcelType rewardParcelType) { builder.AddInt(3, (int)rewardParcelType, 0); } public static void AddRewardId(FlatBufferBuilder builder, long rewardId) { builder.AddLong(4, rewardId, 0); } @@ -67,7 +67,7 @@ public struct EventContentStageRewardExcel : IFlatbufferObject public void UnPackTo(EventContentStageRewardExcelT _o) { byte[] key = TableEncryptionService.CreateKey("EventContentStageReward"); _o.GroupId = TableEncryptionService.Convert(this.GroupId, key); - _o.RewardTag = TableEncryptionService.Convert(this.RewardTag, key); + _o.RewardTag_ = TableEncryptionService.Convert(this.RewardTag_, key); _o.RewardProb = TableEncryptionService.Convert(this.RewardProb, key); _o.RewardParcelType = TableEncryptionService.Convert(this.RewardParcelType, key); _o.RewardId = TableEncryptionService.Convert(this.RewardId, key); @@ -79,7 +79,7 @@ public struct EventContentStageRewardExcel : IFlatbufferObject return CreateEventContentStageRewardExcel( builder, _o.GroupId, - _o.RewardTag, + _o.RewardTag_, _o.RewardProb, _o.RewardParcelType, _o.RewardId, @@ -91,7 +91,7 @@ public struct EventContentStageRewardExcel : IFlatbufferObject public class EventContentStageRewardExcelT { public long GroupId { get; set; } - public SCHALE.Common.FlatData.RewardTag RewardTag { get; set; } + public SCHALE.Common.FlatData.RewardTag RewardTag_ { get; set; } public int RewardProb { get; set; } public SCHALE.Common.FlatData.ParcelType RewardParcelType { get; set; } public long RewardId { get; set; } @@ -100,7 +100,7 @@ public class EventContentStageRewardExcelT public EventContentStageRewardExcelT() { this.GroupId = 0; - this.RewardTag = SCHALE.Common.FlatData.RewardTag.Default; + this.RewardTag_ = SCHALE.Common.FlatData.RewardTag.Default; this.RewardProb = 0; this.RewardParcelType = SCHALE.Common.FlatData.ParcelType.None; this.RewardId = 0; @@ -116,7 +116,7 @@ static public class EventContentStageRewardExcelVerify { return verifier.VerifyTableStart(tablePos) && verifier.VerifyField(tablePos, 4 /*GroupId*/, 8 /*long*/, 8, false) - && verifier.VerifyField(tablePos, 6 /*RewardTag*/, 4 /*SCHALE.Common.FlatData.RewardTag*/, 4, false) + && verifier.VerifyField(tablePos, 6 /*RewardTag_*/, 4 /*SCHALE.Common.FlatData.RewardTag*/, 4, false) && verifier.VerifyField(tablePos, 8 /*RewardProb*/, 4 /*int*/, 4, false) && verifier.VerifyField(tablePos, 10 /*RewardParcelType*/, 4 /*SCHALE.Common.FlatData.ParcelType*/, 4, false) && verifier.VerifyField(tablePos, 12 /*RewardId*/, 8 /*long*/, 8, false) diff --git a/SCHALE.Common/FlatData/EventContentType.cs b/SCHALE.Common/FlatData/EventContentType.cs index abf835d..9e56149 100644 --- a/SCHALE.Common/FlatData/EventContentType.cs +++ b/SCHALE.Common/FlatData/EventContentType.cs @@ -39,6 +39,11 @@ public enum EventContentType : int Field = 29, MultiFloorRaid = 30, MinigameDreamMaker = 31, + MiniGameDefense = 32, + OpenWebView = 33, + SpecialMiniEvent = 34, + ScenarioCollection = 35, + ScenarioShortcut = 36, }; diff --git a/SCHALE.Common/FlatData/EventNotifyType.cs b/SCHALE.Common/FlatData/EventNotifyType.cs index 3f48cda..e9d47b7 100644 --- a/SCHALE.Common/FlatData/EventNotifyType.cs +++ b/SCHALE.Common/FlatData/EventNotifyType.cs @@ -12,6 +12,7 @@ public enum EventNotifyType : int RaidSeasonManager = 2, TimeAttackDungeonSeasonManage = 3, EliminateRaidSeasonManage = 4, + MultiFloorRaidSeasonManage = 5, }; diff --git a/SCHALE.Common/FlatData/EventTargetType.cs b/SCHALE.Common/FlatData/EventTargetType.cs index e3a0736..59e0d9c 100644 --- a/SCHALE.Common/FlatData/EventTargetType.cs +++ b/SCHALE.Common/FlatData/EventTargetType.cs @@ -17,6 +17,7 @@ public enum EventTargetType : int AccountLevelExpIncrease = 7, Raid = 8, EliminateRaid = 9, + MultiFloorRaid = 10, }; diff --git a/SCHALE.Common/FlatData/FarmingDungeonLocationManageExcel.cs b/SCHALE.Common/FlatData/FarmingDungeonLocationManageExcel.cs index 0b2bf60..7affc03 100644 --- a/SCHALE.Common/FlatData/FarmingDungeonLocationManageExcel.cs +++ b/SCHALE.Common/FlatData/FarmingDungeonLocationManageExcel.cs @@ -21,9 +21,9 @@ public struct FarmingDungeonLocationManageExcel : IFlatbufferObject public FarmingDungeonLocationManageExcel __assign(int _i, ByteBuffer _bb) { __init(_i, _bb); return this; } public long FarmingDungeonLocationId { get { int o = __p.__offset(4); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } - public SCHALE.Common.FlatData.ContentType ContentType { get { int o = __p.__offset(6); return o != 0 ? (SCHALE.Common.FlatData.ContentType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.ContentType.None; } } - public SCHALE.Common.FlatData.WeekDungeonType WeekDungeonType { get { int o = __p.__offset(8); return o != 0 ? (SCHALE.Common.FlatData.WeekDungeonType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.WeekDungeonType.None; } } - public SCHALE.Common.FlatData.SchoolDungeonType SchoolDungeonType { get { int o = __p.__offset(10); return o != 0 ? (SCHALE.Common.FlatData.SchoolDungeonType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.SchoolDungeonType.SchoolA; } } + public SCHALE.Common.FlatData.ContentType ContentType_ { get { int o = __p.__offset(6); return o != 0 ? (SCHALE.Common.FlatData.ContentType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.ContentType.None; } } + public SCHALE.Common.FlatData.WeekDungeonType WeekDungeonType_ { get { int o = __p.__offset(8); return o != 0 ? (SCHALE.Common.FlatData.WeekDungeonType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.WeekDungeonType.None; } } + public SCHALE.Common.FlatData.SchoolDungeonType SchoolDungeonType_ { get { int o = __p.__offset(10); return o != 0 ? (SCHALE.Common.FlatData.SchoolDungeonType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.SchoolDungeonType.SchoolA; } } public long Order { get { int o = __p.__offset(12); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public string OpenStartDateTime { get { int o = __p.__offset(14); return o != 0 ? __p.__string(o + __p.bb_pos) : null; } } #if ENABLE_SPAN_T @@ -51,9 +51,9 @@ public struct FarmingDungeonLocationManageExcel : IFlatbufferObject public static Offset CreateFarmingDungeonLocationManageExcel(FlatBufferBuilder builder, long FarmingDungeonLocationId = 0, - SCHALE.Common.FlatData.ContentType ContentType = SCHALE.Common.FlatData.ContentType.None, - SCHALE.Common.FlatData.WeekDungeonType WeekDungeonType = SCHALE.Common.FlatData.WeekDungeonType.None, - SCHALE.Common.FlatData.SchoolDungeonType SchoolDungeonType = SCHALE.Common.FlatData.SchoolDungeonType.SchoolA, + SCHALE.Common.FlatData.ContentType ContentType_ = SCHALE.Common.FlatData.ContentType.None, + SCHALE.Common.FlatData.WeekDungeonType WeekDungeonType_ = SCHALE.Common.FlatData.WeekDungeonType.None, + SCHALE.Common.FlatData.SchoolDungeonType SchoolDungeonType_ = SCHALE.Common.FlatData.SchoolDungeonType.SchoolA, long Order = 0, StringOffset OpenStartDateTimeOffset = default(StringOffset), StringOffset OpenEndDateTimeOffset = default(StringOffset), @@ -68,17 +68,17 @@ public struct FarmingDungeonLocationManageExcel : IFlatbufferObject FarmingDungeonLocationManageExcel.AddLocationButtonImagePath(builder, LocationButtonImagePathOffset); FarmingDungeonLocationManageExcel.AddOpenEndDateTime(builder, OpenEndDateTimeOffset); FarmingDungeonLocationManageExcel.AddOpenStartDateTime(builder, OpenStartDateTimeOffset); - FarmingDungeonLocationManageExcel.AddSchoolDungeonType(builder, SchoolDungeonType); - FarmingDungeonLocationManageExcel.AddWeekDungeonType(builder, WeekDungeonType); - FarmingDungeonLocationManageExcel.AddContentType(builder, ContentType); + FarmingDungeonLocationManageExcel.AddSchoolDungeonType_(builder, SchoolDungeonType_); + FarmingDungeonLocationManageExcel.AddWeekDungeonType_(builder, WeekDungeonType_); + FarmingDungeonLocationManageExcel.AddContentType_(builder, ContentType_); return FarmingDungeonLocationManageExcel.EndFarmingDungeonLocationManageExcel(builder); } public static void StartFarmingDungeonLocationManageExcel(FlatBufferBuilder builder) { builder.StartTable(10); } public static void AddFarmingDungeonLocationId(FlatBufferBuilder builder, long farmingDungeonLocationId) { builder.AddLong(0, farmingDungeonLocationId, 0); } - public static void AddContentType(FlatBufferBuilder builder, SCHALE.Common.FlatData.ContentType contentType) { builder.AddInt(1, (int)contentType, 0); } - public static void AddWeekDungeonType(FlatBufferBuilder builder, SCHALE.Common.FlatData.WeekDungeonType weekDungeonType) { builder.AddInt(2, (int)weekDungeonType, 0); } - public static void AddSchoolDungeonType(FlatBufferBuilder builder, SCHALE.Common.FlatData.SchoolDungeonType schoolDungeonType) { builder.AddInt(3, (int)schoolDungeonType, 0); } + public static void AddContentType_(FlatBufferBuilder builder, SCHALE.Common.FlatData.ContentType contentType_) { builder.AddInt(1, (int)contentType_, 0); } + public static void AddWeekDungeonType_(FlatBufferBuilder builder, SCHALE.Common.FlatData.WeekDungeonType weekDungeonType_) { builder.AddInt(2, (int)weekDungeonType_, 0); } + public static void AddSchoolDungeonType_(FlatBufferBuilder builder, SCHALE.Common.FlatData.SchoolDungeonType schoolDungeonType_) { builder.AddInt(3, (int)schoolDungeonType_, 0); } public static void AddOrder(FlatBufferBuilder builder, long order) { builder.AddLong(4, order, 0); } public static void AddOpenStartDateTime(FlatBufferBuilder builder, StringOffset openStartDateTimeOffset) { builder.AddOffset(5, openStartDateTimeOffset.Value, 0); } public static void AddOpenEndDateTime(FlatBufferBuilder builder, StringOffset openEndDateTimeOffset) { builder.AddOffset(6, openEndDateTimeOffset.Value, 0); } @@ -97,9 +97,9 @@ public struct FarmingDungeonLocationManageExcel : IFlatbufferObject public void UnPackTo(FarmingDungeonLocationManageExcelT _o) { byte[] key = TableEncryptionService.CreateKey("FarmingDungeonLocationManage"); _o.FarmingDungeonLocationId = TableEncryptionService.Convert(this.FarmingDungeonLocationId, key); - _o.ContentType = TableEncryptionService.Convert(this.ContentType, key); - _o.WeekDungeonType = TableEncryptionService.Convert(this.WeekDungeonType, key); - _o.SchoolDungeonType = TableEncryptionService.Convert(this.SchoolDungeonType, key); + _o.ContentType_ = TableEncryptionService.Convert(this.ContentType_, key); + _o.WeekDungeonType_ = TableEncryptionService.Convert(this.WeekDungeonType_, key); + _o.SchoolDungeonType_ = TableEncryptionService.Convert(this.SchoolDungeonType_, key); _o.Order = TableEncryptionService.Convert(this.Order, key); _o.OpenStartDateTime = TableEncryptionService.Convert(this.OpenStartDateTime, key); _o.OpenEndDateTime = TableEncryptionService.Convert(this.OpenEndDateTime, key); @@ -115,9 +115,9 @@ public struct FarmingDungeonLocationManageExcel : IFlatbufferObject return CreateFarmingDungeonLocationManageExcel( builder, _o.FarmingDungeonLocationId, - _o.ContentType, - _o.WeekDungeonType, - _o.SchoolDungeonType, + _o.ContentType_, + _o.WeekDungeonType_, + _o.SchoolDungeonType_, _o.Order, _OpenStartDateTime, _OpenEndDateTime, @@ -130,9 +130,9 @@ public struct FarmingDungeonLocationManageExcel : IFlatbufferObject public class FarmingDungeonLocationManageExcelT { public long FarmingDungeonLocationId { get; set; } - public SCHALE.Common.FlatData.ContentType ContentType { get; set; } - public SCHALE.Common.FlatData.WeekDungeonType WeekDungeonType { get; set; } - public SCHALE.Common.FlatData.SchoolDungeonType SchoolDungeonType { get; set; } + public SCHALE.Common.FlatData.ContentType ContentType_ { get; set; } + public SCHALE.Common.FlatData.WeekDungeonType WeekDungeonType_ { get; set; } + public SCHALE.Common.FlatData.SchoolDungeonType SchoolDungeonType_ { get; set; } public long Order { get; set; } public string OpenStartDateTime { get; set; } public string OpenEndDateTime { get; set; } @@ -142,9 +142,9 @@ public class FarmingDungeonLocationManageExcelT public FarmingDungeonLocationManageExcelT() { this.FarmingDungeonLocationId = 0; - this.ContentType = SCHALE.Common.FlatData.ContentType.None; - this.WeekDungeonType = SCHALE.Common.FlatData.WeekDungeonType.None; - this.SchoolDungeonType = SCHALE.Common.FlatData.SchoolDungeonType.SchoolA; + this.ContentType_ = SCHALE.Common.FlatData.ContentType.None; + this.WeekDungeonType_ = SCHALE.Common.FlatData.WeekDungeonType.None; + this.SchoolDungeonType_ = SCHALE.Common.FlatData.SchoolDungeonType.SchoolA; this.Order = 0; this.OpenStartDateTime = null; this.OpenEndDateTime = null; @@ -161,9 +161,9 @@ static public class FarmingDungeonLocationManageExcelVerify { return verifier.VerifyTableStart(tablePos) && verifier.VerifyField(tablePos, 4 /*FarmingDungeonLocationId*/, 8 /*long*/, 8, false) - && verifier.VerifyField(tablePos, 6 /*ContentType*/, 4 /*SCHALE.Common.FlatData.ContentType*/, 4, false) - && verifier.VerifyField(tablePos, 8 /*WeekDungeonType*/, 4 /*SCHALE.Common.FlatData.WeekDungeonType*/, 4, false) - && verifier.VerifyField(tablePos, 10 /*SchoolDungeonType*/, 4 /*SCHALE.Common.FlatData.SchoolDungeonType*/, 4, false) + && verifier.VerifyField(tablePos, 6 /*ContentType_*/, 4 /*SCHALE.Common.FlatData.ContentType*/, 4, false) + && verifier.VerifyField(tablePos, 8 /*WeekDungeonType_*/, 4 /*SCHALE.Common.FlatData.WeekDungeonType*/, 4, false) + && verifier.VerifyField(tablePos, 10 /*SchoolDungeonType_*/, 4 /*SCHALE.Common.FlatData.SchoolDungeonType*/, 4, false) && verifier.VerifyField(tablePos, 12 /*Order*/, 8 /*long*/, 8, false) && verifier.VerifyString(tablePos, 14 /*OpenStartDateTime*/, false) && verifier.VerifyString(tablePos, 16 /*OpenEndDateTime*/, false) diff --git a/SCHALE.Common/FlatData/FieldContentStageExcel.cs b/SCHALE.Common/FlatData/FieldContentStageExcel.cs index 17058a9..7b0ab69 100644 --- a/SCHALE.Common/FlatData/FieldContentStageExcel.cs +++ b/SCHALE.Common/FlatData/FieldContentStageExcel.cs @@ -24,7 +24,7 @@ public struct FieldContentStageExcel : IFlatbufferObject public long SeasonId { get { int o = __p.__offset(6); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public long AreaId { get { int o = __p.__offset(8); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public long GroupId { get { int o = __p.__offset(10); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } - public SCHALE.Common.FlatData.StageDifficulty StageDifficulty { get { int o = __p.__offset(12); return o != 0 ? (SCHALE.Common.FlatData.StageDifficulty)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.StageDifficulty.None; } } + public SCHALE.Common.FlatData.StageDifficulty StageDifficulty_ { get { int o = __p.__offset(12); return o != 0 ? (SCHALE.Common.FlatData.StageDifficulty)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.StageDifficulty.None; } } public string Name { get { int o = __p.__offset(14); return o != 0 ? __p.__string(o + __p.bb_pos) : null; } } #if ENABLE_SPAN_T public Span GetNameBytes() { return __p.__vector_as_span(14, 1); } @@ -36,7 +36,7 @@ public struct FieldContentStageExcel : IFlatbufferObject public SCHALE.Common.FlatData.ParcelType StageEnterCostType { get { int o = __p.__offset(18); return o != 0 ? (SCHALE.Common.FlatData.ParcelType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.ParcelType.None; } } public long StageEnterCostId { get { int o = __p.__offset(20); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public int StageEnterCostAmount { get { int o = __p.__offset(22); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } - public SCHALE.Common.FlatData.StageTopography StageTopography { get { int o = __p.__offset(24); return o != 0 ? (SCHALE.Common.FlatData.StageTopography)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.StageTopography.Street; } } + public SCHALE.Common.FlatData.StageTopography StageTopography_ { get { int o = __p.__offset(24); return o != 0 ? (SCHALE.Common.FlatData.StageTopography)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.StageTopography.Street; } } public int RecommandLevel { get { int o = __p.__offset(26); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } public long GroundID { get { int o = __p.__offset(28); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public long BGMId { get { int o = __p.__offset(30); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } @@ -49,13 +49,13 @@ public struct FieldContentStageExcel : IFlatbufferObject long SeasonId = 0, long AreaId = 0, long GroupId = 0, - SCHALE.Common.FlatData.StageDifficulty StageDifficulty = SCHALE.Common.FlatData.StageDifficulty.None, + SCHALE.Common.FlatData.StageDifficulty StageDifficulty_ = SCHALE.Common.FlatData.StageDifficulty.None, StringOffset NameOffset = default(StringOffset), long BattleDuration = 0, SCHALE.Common.FlatData.ParcelType StageEnterCostType = SCHALE.Common.FlatData.ParcelType.None, long StageEnterCostId = 0, int StageEnterCostAmount = 0, - SCHALE.Common.FlatData.StageTopography StageTopography = SCHALE.Common.FlatData.StageTopography.Street, + SCHALE.Common.FlatData.StageTopography StageTopography_ = SCHALE.Common.FlatData.StageTopography.Street, int RecommandLevel = 0, long GroundID = 0, long BGMId = 0, @@ -73,11 +73,11 @@ public struct FieldContentStageExcel : IFlatbufferObject FieldContentStageExcel.AddSeasonId(builder, SeasonId); FieldContentStageExcel.AddId(builder, Id); FieldContentStageExcel.AddRecommandLevel(builder, RecommandLevel); - FieldContentStageExcel.AddStageTopography(builder, StageTopography); + FieldContentStageExcel.AddStageTopography_(builder, StageTopography_); FieldContentStageExcel.AddStageEnterCostAmount(builder, StageEnterCostAmount); FieldContentStageExcel.AddStageEnterCostType(builder, StageEnterCostType); FieldContentStageExcel.AddName(builder, NameOffset); - FieldContentStageExcel.AddStageDifficulty(builder, StageDifficulty); + FieldContentStageExcel.AddStageDifficulty_(builder, StageDifficulty_); FieldContentStageExcel.AddSkipFormationSettings(builder, SkipFormationSettings); FieldContentStageExcel.AddInstantClear(builder, InstantClear); return FieldContentStageExcel.EndFieldContentStageExcel(builder); @@ -88,13 +88,13 @@ public struct FieldContentStageExcel : IFlatbufferObject public static void AddSeasonId(FlatBufferBuilder builder, long seasonId) { builder.AddLong(1, seasonId, 0); } public static void AddAreaId(FlatBufferBuilder builder, long areaId) { builder.AddLong(2, areaId, 0); } public static void AddGroupId(FlatBufferBuilder builder, long groupId) { builder.AddLong(3, groupId, 0); } - public static void AddStageDifficulty(FlatBufferBuilder builder, SCHALE.Common.FlatData.StageDifficulty stageDifficulty) { builder.AddInt(4, (int)stageDifficulty, 0); } + public static void AddStageDifficulty_(FlatBufferBuilder builder, SCHALE.Common.FlatData.StageDifficulty stageDifficulty_) { builder.AddInt(4, (int)stageDifficulty_, 0); } public static void AddName(FlatBufferBuilder builder, StringOffset nameOffset) { builder.AddOffset(5, nameOffset.Value, 0); } public static void AddBattleDuration(FlatBufferBuilder builder, long battleDuration) { builder.AddLong(6, battleDuration, 0); } public static void AddStageEnterCostType(FlatBufferBuilder builder, SCHALE.Common.FlatData.ParcelType stageEnterCostType) { builder.AddInt(7, (int)stageEnterCostType, 0); } public static void AddStageEnterCostId(FlatBufferBuilder builder, long stageEnterCostId) { builder.AddLong(8, stageEnterCostId, 0); } public static void AddStageEnterCostAmount(FlatBufferBuilder builder, int stageEnterCostAmount) { builder.AddInt(9, stageEnterCostAmount, 0); } - public static void AddStageTopography(FlatBufferBuilder builder, SCHALE.Common.FlatData.StageTopography stageTopography) { builder.AddInt(10, (int)stageTopography, 0); } + public static void AddStageTopography_(FlatBufferBuilder builder, SCHALE.Common.FlatData.StageTopography stageTopography_) { builder.AddInt(10, (int)stageTopography_, 0); } public static void AddRecommandLevel(FlatBufferBuilder builder, int recommandLevel) { builder.AddInt(11, recommandLevel, 0); } public static void AddGroundID(FlatBufferBuilder builder, long groundID) { builder.AddLong(12, groundID, 0); } public static void AddBGMId(FlatBufferBuilder builder, long bGMId) { builder.AddLong(13, bGMId, 0); } @@ -116,13 +116,13 @@ public struct FieldContentStageExcel : IFlatbufferObject _o.SeasonId = TableEncryptionService.Convert(this.SeasonId, key); _o.AreaId = TableEncryptionService.Convert(this.AreaId, key); _o.GroupId = TableEncryptionService.Convert(this.GroupId, key); - _o.StageDifficulty = TableEncryptionService.Convert(this.StageDifficulty, key); + _o.StageDifficulty_ = TableEncryptionService.Convert(this.StageDifficulty_, key); _o.Name = TableEncryptionService.Convert(this.Name, key); _o.BattleDuration = TableEncryptionService.Convert(this.BattleDuration, key); _o.StageEnterCostType = TableEncryptionService.Convert(this.StageEnterCostType, key); _o.StageEnterCostId = TableEncryptionService.Convert(this.StageEnterCostId, key); _o.StageEnterCostAmount = TableEncryptionService.Convert(this.StageEnterCostAmount, key); - _o.StageTopography = TableEncryptionService.Convert(this.StageTopography, key); + _o.StageTopography_ = TableEncryptionService.Convert(this.StageTopography_, key); _o.RecommandLevel = TableEncryptionService.Convert(this.RecommandLevel, key); _o.GroundID = TableEncryptionService.Convert(this.GroundID, key); _o.BGMId = TableEncryptionService.Convert(this.BGMId, key); @@ -139,13 +139,13 @@ public struct FieldContentStageExcel : IFlatbufferObject _o.SeasonId, _o.AreaId, _o.GroupId, - _o.StageDifficulty, + _o.StageDifficulty_, _Name, _o.BattleDuration, _o.StageEnterCostType, _o.StageEnterCostId, _o.StageEnterCostAmount, - _o.StageTopography, + _o.StageTopography_, _o.RecommandLevel, _o.GroundID, _o.BGMId, @@ -161,13 +161,13 @@ public class FieldContentStageExcelT public long SeasonId { get; set; } public long AreaId { get; set; } public long GroupId { get; set; } - public SCHALE.Common.FlatData.StageDifficulty StageDifficulty { get; set; } + public SCHALE.Common.FlatData.StageDifficulty StageDifficulty_ { get; set; } public string Name { get; set; } public long BattleDuration { get; set; } public SCHALE.Common.FlatData.ParcelType StageEnterCostType { get; set; } public long StageEnterCostId { get; set; } public int StageEnterCostAmount { get; set; } - public SCHALE.Common.FlatData.StageTopography StageTopography { get; set; } + public SCHALE.Common.FlatData.StageTopography StageTopography_ { get; set; } public int RecommandLevel { get; set; } public long GroundID { get; set; } public long BGMId { get; set; } @@ -180,13 +180,13 @@ public class FieldContentStageExcelT this.SeasonId = 0; this.AreaId = 0; this.GroupId = 0; - this.StageDifficulty = SCHALE.Common.FlatData.StageDifficulty.None; + this.StageDifficulty_ = SCHALE.Common.FlatData.StageDifficulty.None; this.Name = null; this.BattleDuration = 0; this.StageEnterCostType = SCHALE.Common.FlatData.ParcelType.None; this.StageEnterCostId = 0; this.StageEnterCostAmount = 0; - this.StageTopography = SCHALE.Common.FlatData.StageTopography.Street; + this.StageTopography_ = SCHALE.Common.FlatData.StageTopography.Street; this.RecommandLevel = 0; this.GroundID = 0; this.BGMId = 0; @@ -206,13 +206,13 @@ static public class FieldContentStageExcelVerify && verifier.VerifyField(tablePos, 6 /*SeasonId*/, 8 /*long*/, 8, false) && verifier.VerifyField(tablePos, 8 /*AreaId*/, 8 /*long*/, 8, false) && verifier.VerifyField(tablePos, 10 /*GroupId*/, 8 /*long*/, 8, false) - && verifier.VerifyField(tablePos, 12 /*StageDifficulty*/, 4 /*SCHALE.Common.FlatData.StageDifficulty*/, 4, false) + && verifier.VerifyField(tablePos, 12 /*StageDifficulty_*/, 4 /*SCHALE.Common.FlatData.StageDifficulty*/, 4, false) && verifier.VerifyString(tablePos, 14 /*Name*/, false) && verifier.VerifyField(tablePos, 16 /*BattleDuration*/, 8 /*long*/, 8, false) && verifier.VerifyField(tablePos, 18 /*StageEnterCostType*/, 4 /*SCHALE.Common.FlatData.ParcelType*/, 4, false) && verifier.VerifyField(tablePos, 20 /*StageEnterCostId*/, 8 /*long*/, 8, false) && verifier.VerifyField(tablePos, 22 /*StageEnterCostAmount*/, 4 /*int*/, 4, false) - && verifier.VerifyField(tablePos, 24 /*StageTopography*/, 4 /*SCHALE.Common.FlatData.StageTopography*/, 4, false) + && verifier.VerifyField(tablePos, 24 /*StageTopography_*/, 4 /*SCHALE.Common.FlatData.StageTopography*/, 4, false) && verifier.VerifyField(tablePos, 26 /*RecommandLevel*/, 4 /*int*/, 4, false) && verifier.VerifyField(tablePos, 28 /*GroundID*/, 8 /*long*/, 8, false) && verifier.VerifyField(tablePos, 30 /*BGMId*/, 8 /*long*/, 8, false) diff --git a/SCHALE.Common/FlatData/FieldContentStageRewardExcel.cs b/SCHALE.Common/FlatData/FieldContentStageRewardExcel.cs index 0b40a61..82a3afb 100644 --- a/SCHALE.Common/FlatData/FieldContentStageRewardExcel.cs +++ b/SCHALE.Common/FlatData/FieldContentStageRewardExcel.cs @@ -21,7 +21,7 @@ public struct FieldContentStageRewardExcel : IFlatbufferObject public FieldContentStageRewardExcel __assign(int _i, ByteBuffer _bb) { __init(_i, _bb); return this; } public long GroupId { get { int o = __p.__offset(4); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } - public SCHALE.Common.FlatData.RewardTag RewardTag { get { int o = __p.__offset(6); return o != 0 ? (SCHALE.Common.FlatData.RewardTag)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.RewardTag.Default; } } + public SCHALE.Common.FlatData.RewardTag RewardTag_ { get { int o = __p.__offset(6); return o != 0 ? (SCHALE.Common.FlatData.RewardTag)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.RewardTag.Default; } } public int RewardProb { get { int o = __p.__offset(8); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } public SCHALE.Common.FlatData.ParcelType RewardParcelType { get { int o = __p.__offset(10); return o != 0 ? (SCHALE.Common.FlatData.ParcelType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.ParcelType.None; } } public long RewardId { get { int o = __p.__offset(12); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } @@ -30,7 +30,7 @@ public struct FieldContentStageRewardExcel : IFlatbufferObject public static Offset CreateFieldContentStageRewardExcel(FlatBufferBuilder builder, long GroupId = 0, - SCHALE.Common.FlatData.RewardTag RewardTag = SCHALE.Common.FlatData.RewardTag.Default, + SCHALE.Common.FlatData.RewardTag RewardTag_ = SCHALE.Common.FlatData.RewardTag.Default, int RewardProb = 0, SCHALE.Common.FlatData.ParcelType RewardParcelType = SCHALE.Common.FlatData.ParcelType.None, long RewardId = 0, @@ -42,14 +42,14 @@ public struct FieldContentStageRewardExcel : IFlatbufferObject FieldContentStageRewardExcel.AddRewardAmount(builder, RewardAmount); FieldContentStageRewardExcel.AddRewardParcelType(builder, RewardParcelType); FieldContentStageRewardExcel.AddRewardProb(builder, RewardProb); - FieldContentStageRewardExcel.AddRewardTag(builder, RewardTag); + FieldContentStageRewardExcel.AddRewardTag_(builder, RewardTag_); FieldContentStageRewardExcel.AddIsDisplayed(builder, IsDisplayed); return FieldContentStageRewardExcel.EndFieldContentStageRewardExcel(builder); } public static void StartFieldContentStageRewardExcel(FlatBufferBuilder builder) { builder.StartTable(7); } public static void AddGroupId(FlatBufferBuilder builder, long groupId) { builder.AddLong(0, groupId, 0); } - public static void AddRewardTag(FlatBufferBuilder builder, SCHALE.Common.FlatData.RewardTag rewardTag) { builder.AddInt(1, (int)rewardTag, 0); } + public static void AddRewardTag_(FlatBufferBuilder builder, SCHALE.Common.FlatData.RewardTag rewardTag_) { builder.AddInt(1, (int)rewardTag_, 0); } public static void AddRewardProb(FlatBufferBuilder builder, int rewardProb) { builder.AddInt(2, rewardProb, 0); } public static void AddRewardParcelType(FlatBufferBuilder builder, SCHALE.Common.FlatData.ParcelType rewardParcelType) { builder.AddInt(3, (int)rewardParcelType, 0); } public static void AddRewardId(FlatBufferBuilder builder, long rewardId) { builder.AddLong(4, rewardId, 0); } @@ -67,7 +67,7 @@ public struct FieldContentStageRewardExcel : IFlatbufferObject public void UnPackTo(FieldContentStageRewardExcelT _o) { byte[] key = TableEncryptionService.CreateKey("FieldContentStageReward"); _o.GroupId = TableEncryptionService.Convert(this.GroupId, key); - _o.RewardTag = TableEncryptionService.Convert(this.RewardTag, key); + _o.RewardTag_ = TableEncryptionService.Convert(this.RewardTag_, key); _o.RewardProb = TableEncryptionService.Convert(this.RewardProb, key); _o.RewardParcelType = TableEncryptionService.Convert(this.RewardParcelType, key); _o.RewardId = TableEncryptionService.Convert(this.RewardId, key); @@ -79,7 +79,7 @@ public struct FieldContentStageRewardExcel : IFlatbufferObject return CreateFieldContentStageRewardExcel( builder, _o.GroupId, - _o.RewardTag, + _o.RewardTag_, _o.RewardProb, _o.RewardParcelType, _o.RewardId, @@ -91,7 +91,7 @@ public struct FieldContentStageRewardExcel : IFlatbufferObject public class FieldContentStageRewardExcelT { public long GroupId { get; set; } - public SCHALE.Common.FlatData.RewardTag RewardTag { get; set; } + public SCHALE.Common.FlatData.RewardTag RewardTag_ { get; set; } public int RewardProb { get; set; } public SCHALE.Common.FlatData.ParcelType RewardParcelType { get; set; } public long RewardId { get; set; } @@ -100,7 +100,7 @@ public class FieldContentStageRewardExcelT public FieldContentStageRewardExcelT() { this.GroupId = 0; - this.RewardTag = SCHALE.Common.FlatData.RewardTag.Default; + this.RewardTag_ = SCHALE.Common.FlatData.RewardTag.Default; this.RewardProb = 0; this.RewardParcelType = SCHALE.Common.FlatData.ParcelType.None; this.RewardId = 0; @@ -116,7 +116,7 @@ static public class FieldContentStageRewardExcelVerify { return verifier.VerifyTableStart(tablePos) && verifier.VerifyField(tablePos, 4 /*GroupId*/, 8 /*long*/, 8, false) - && verifier.VerifyField(tablePos, 6 /*RewardTag*/, 4 /*SCHALE.Common.FlatData.RewardTag*/, 4, false) + && verifier.VerifyField(tablePos, 6 /*RewardTag_*/, 4 /*SCHALE.Common.FlatData.RewardTag*/, 4, false) && verifier.VerifyField(tablePos, 8 /*RewardProb*/, 4 /*int*/, 4, false) && verifier.VerifyField(tablePos, 10 /*RewardParcelType*/, 4 /*SCHALE.Common.FlatData.ParcelType*/, 4, false) && verifier.VerifyField(tablePos, 12 /*RewardId*/, 8 /*long*/, 8, false) diff --git a/SCHALE.Common/FlatData/FieldCurtainCallFreeModeExcel.cs b/SCHALE.Common/FlatData/FieldCurtainCallFreeModeExcel.cs new file mode 100644 index 0000000..07eb397 --- /dev/null +++ b/SCHALE.Common/FlatData/FieldCurtainCallFreeModeExcel.cs @@ -0,0 +1,102 @@ +// +// automatically generated by the FlatBuffers compiler, do not modify +// + +namespace SCHALE.Common.FlatData +{ + +using global::System; +using global::System.Collections.Generic; +using global::SCHALE.Common.Crypto; +using global::Google.FlatBuffers; + +public struct FieldCurtainCallFreeModeExcel : IFlatbufferObject +{ + private Table __p; + public ByteBuffer ByteBuffer { get { return __p.bb; } } + public static void ValidateVersion() { FlatBufferConstants.FLATBUFFERS_24_3_25(); } + public static FieldCurtainCallFreeModeExcel GetRootAsFieldCurtainCallFreeModeExcel(ByteBuffer _bb) { return GetRootAsFieldCurtainCallFreeModeExcel(_bb, new FieldCurtainCallFreeModeExcel()); } + public static FieldCurtainCallFreeModeExcel GetRootAsFieldCurtainCallFreeModeExcel(ByteBuffer _bb, FieldCurtainCallFreeModeExcel obj) { return (obj.__assign(_bb.GetInt(_bb.Position) + _bb.Position, _bb)); } + public void __init(int _i, ByteBuffer _bb) { __p = new Table(_i, _bb); } + public FieldCurtainCallFreeModeExcel __assign(int _i, ByteBuffer _bb) { __init(_i, _bb); return this; } + + public long UniqueId { get { int o = __p.__offset(4); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } + public long OpenDate { get { int o = __p.__offset(6); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } + public long SetFieldDateID { get { int o = __p.__offset(8); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } + public long SetFieldQuestOpenDate { get { int o = __p.__offset(10); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } + + public static Offset CreateFieldCurtainCallFreeModeExcel(FlatBufferBuilder builder, + long UniqueId = 0, + long OpenDate = 0, + long SetFieldDateID = 0, + long SetFieldQuestOpenDate = 0) { + builder.StartTable(4); + FieldCurtainCallFreeModeExcel.AddSetFieldQuestOpenDate(builder, SetFieldQuestOpenDate); + FieldCurtainCallFreeModeExcel.AddSetFieldDateID(builder, SetFieldDateID); + FieldCurtainCallFreeModeExcel.AddOpenDate(builder, OpenDate); + FieldCurtainCallFreeModeExcel.AddUniqueId(builder, UniqueId); + return FieldCurtainCallFreeModeExcel.EndFieldCurtainCallFreeModeExcel(builder); + } + + public static void StartFieldCurtainCallFreeModeExcel(FlatBufferBuilder builder) { builder.StartTable(4); } + public static void AddUniqueId(FlatBufferBuilder builder, long uniqueId) { builder.AddLong(0, uniqueId, 0); } + public static void AddOpenDate(FlatBufferBuilder builder, long openDate) { builder.AddLong(1, openDate, 0); } + public static void AddSetFieldDateID(FlatBufferBuilder builder, long setFieldDateID) { builder.AddLong(2, setFieldDateID, 0); } + public static void AddSetFieldQuestOpenDate(FlatBufferBuilder builder, long setFieldQuestOpenDate) { builder.AddLong(3, setFieldQuestOpenDate, 0); } + public static Offset EndFieldCurtainCallFreeModeExcel(FlatBufferBuilder builder) { + int o = builder.EndTable(); + return new Offset(o); + } + public FieldCurtainCallFreeModeExcelT UnPack() { + var _o = new FieldCurtainCallFreeModeExcelT(); + this.UnPackTo(_o); + return _o; + } + public void UnPackTo(FieldCurtainCallFreeModeExcelT _o) { + byte[] key = TableEncryptionService.CreateKey("FieldCurtainCallFreeMode"); + _o.UniqueId = TableEncryptionService.Convert(this.UniqueId, key); + _o.OpenDate = TableEncryptionService.Convert(this.OpenDate, key); + _o.SetFieldDateID = TableEncryptionService.Convert(this.SetFieldDateID, key); + _o.SetFieldQuestOpenDate = TableEncryptionService.Convert(this.SetFieldQuestOpenDate, key); + } + public static Offset Pack(FlatBufferBuilder builder, FieldCurtainCallFreeModeExcelT _o) { + if (_o == null) return default(Offset); + return CreateFieldCurtainCallFreeModeExcel( + builder, + _o.UniqueId, + _o.OpenDate, + _o.SetFieldDateID, + _o.SetFieldQuestOpenDate); + } +} + +public class FieldCurtainCallFreeModeExcelT +{ + public long UniqueId { get; set; } + public long OpenDate { get; set; } + public long SetFieldDateID { get; set; } + public long SetFieldQuestOpenDate { get; set; } + + public FieldCurtainCallFreeModeExcelT() { + this.UniqueId = 0; + this.OpenDate = 0; + this.SetFieldDateID = 0; + this.SetFieldQuestOpenDate = 0; + } +} + + +static public class FieldCurtainCallFreeModeExcelVerify +{ + static public bool Verify(Google.FlatBuffers.Verifier verifier, uint tablePos) + { + return verifier.VerifyTableStart(tablePos) + && verifier.VerifyField(tablePos, 4 /*UniqueId*/, 8 /*long*/, 8, false) + && verifier.VerifyField(tablePos, 6 /*OpenDate*/, 8 /*long*/, 8, false) + && verifier.VerifyField(tablePos, 8 /*SetFieldDateID*/, 8 /*long*/, 8, false) + && verifier.VerifyField(tablePos, 10 /*SetFieldQuestOpenDate*/, 8 /*long*/, 8, false) + && verifier.VerifyTableEnd(tablePos); + } +} + +} diff --git a/SCHALE.Common/FlatData/FieldCurtainCallFreeModeExcelTable.cs b/SCHALE.Common/FlatData/FieldCurtainCallFreeModeExcelTable.cs new file mode 100644 index 0000000..1a1187f --- /dev/null +++ b/SCHALE.Common/FlatData/FieldCurtainCallFreeModeExcelTable.cs @@ -0,0 +1,88 @@ +// +// automatically generated by the FlatBuffers compiler, do not modify +// + +namespace SCHALE.Common.FlatData +{ + +using global::System; +using global::System.Collections.Generic; +using global::SCHALE.Common.Crypto; +using global::Google.FlatBuffers; + +public struct FieldCurtainCallFreeModeExcelTable : IFlatbufferObject +{ + private Table __p; + public ByteBuffer ByteBuffer { get { return __p.bb; } } + public static void ValidateVersion() { FlatBufferConstants.FLATBUFFERS_24_3_25(); } + public static FieldCurtainCallFreeModeExcelTable GetRootAsFieldCurtainCallFreeModeExcelTable(ByteBuffer _bb) { return GetRootAsFieldCurtainCallFreeModeExcelTable(_bb, new FieldCurtainCallFreeModeExcelTable()); } + public static FieldCurtainCallFreeModeExcelTable GetRootAsFieldCurtainCallFreeModeExcelTable(ByteBuffer _bb, FieldCurtainCallFreeModeExcelTable obj) { return (obj.__assign(_bb.GetInt(_bb.Position) + _bb.Position, _bb)); } + public void __init(int _i, ByteBuffer _bb) { __p = new Table(_i, _bb); } + public FieldCurtainCallFreeModeExcelTable __assign(int _i, ByteBuffer _bb) { __init(_i, _bb); return this; } + + public SCHALE.Common.FlatData.FieldCurtainCallFreeModeExcel? DataList(int j) { int o = __p.__offset(4); return o != 0 ? (SCHALE.Common.FlatData.FieldCurtainCallFreeModeExcel?)(new SCHALE.Common.FlatData.FieldCurtainCallFreeModeExcel()).__assign(__p.__indirect(__p.__vector(o) + j * 4), __p.bb) : null; } + public int DataListLength { get { int o = __p.__offset(4); return o != 0 ? __p.__vector_len(o) : 0; } } + + public static Offset CreateFieldCurtainCallFreeModeExcelTable(FlatBufferBuilder builder, + VectorOffset DataListOffset = default(VectorOffset)) { + builder.StartTable(1); + FieldCurtainCallFreeModeExcelTable.AddDataList(builder, DataListOffset); + return FieldCurtainCallFreeModeExcelTable.EndFieldCurtainCallFreeModeExcelTable(builder); + } + + public static void StartFieldCurtainCallFreeModeExcelTable(FlatBufferBuilder builder) { builder.StartTable(1); } + public static void AddDataList(FlatBufferBuilder builder, VectorOffset dataListOffset) { builder.AddOffset(0, dataListOffset.Value, 0); } + public static VectorOffset CreateDataListVector(FlatBufferBuilder builder, Offset[] data) { builder.StartVector(4, data.Length, 4); for (int i = data.Length - 1; i >= 0; i--) builder.AddOffset(data[i].Value); return builder.EndVector(); } + public static VectorOffset CreateDataListVectorBlock(FlatBufferBuilder builder, Offset[] data) { builder.StartVector(4, data.Length, 4); builder.Add(data); return builder.EndVector(); } + public static VectorOffset CreateDataListVectorBlock(FlatBufferBuilder builder, ArraySegment> data) { builder.StartVector(4, data.Count, 4); builder.Add(data); return builder.EndVector(); } + public static VectorOffset CreateDataListVectorBlock(FlatBufferBuilder builder, IntPtr dataPtr, int sizeInBytes) { builder.StartVector(1, sizeInBytes, 1); builder.Add>(dataPtr, sizeInBytes); return builder.EndVector(); } + public static void StartDataListVector(FlatBufferBuilder builder, int numElems) { builder.StartVector(4, numElems, 4); } + public static Offset EndFieldCurtainCallFreeModeExcelTable(FlatBufferBuilder builder) { + int o = builder.EndTable(); + return new Offset(o); + } + public FieldCurtainCallFreeModeExcelTableT UnPack() { + var _o = new FieldCurtainCallFreeModeExcelTableT(); + this.UnPackTo(_o); + return _o; + } + public void UnPackTo(FieldCurtainCallFreeModeExcelTableT _o) { + byte[] key = TableEncryptionService.CreateKey("FieldCurtainCallFreeModeExcel"); + _o.DataList = new List(); + for (var _j = 0; _j < this.DataListLength; ++_j) {_o.DataList.Add(this.DataList(_j).HasValue ? this.DataList(_j).Value.UnPack() : null);} + } + public static Offset Pack(FlatBufferBuilder builder, FieldCurtainCallFreeModeExcelTableT _o) { + if (_o == null) return default(Offset); + var _DataList = default(VectorOffset); + if (_o.DataList != null) { + var __DataList = new Offset[_o.DataList.Count]; + for (var _j = 0; _j < __DataList.Length; ++_j) { __DataList[_j] = SCHALE.Common.FlatData.FieldCurtainCallFreeModeExcel.Pack(builder, _o.DataList[_j]); } + _DataList = CreateDataListVector(builder, __DataList); + } + return CreateFieldCurtainCallFreeModeExcelTable( + builder, + _DataList); + } +} + +public class FieldCurtainCallFreeModeExcelTableT +{ + public List DataList { get; set; } + + public FieldCurtainCallFreeModeExcelTableT() { + this.DataList = null; + } +} + + +static public class FieldCurtainCallFreeModeExcelTableVerify +{ + static public bool Verify(Google.FlatBuffers.Verifier verifier, uint tablePos) + { + return verifier.VerifyTableStart(tablePos) + && verifier.VerifyVectorOfTables(tablePos, 4 /*DataList*/, SCHALE.Common.FlatData.FieldCurtainCallFreeModeExcelVerify.Verify, false) + && verifier.VerifyTableEnd(tablePos); + } +} + +} diff --git a/SCHALE.Common/FlatData/FieldStoryStageExcel.cs b/SCHALE.Common/FlatData/FieldStoryStageExcel.cs index 5b4d97e..5defb7b 100644 --- a/SCHALE.Common/FlatData/FieldStoryStageExcel.cs +++ b/SCHALE.Common/FlatData/FieldStoryStageExcel.cs @@ -30,7 +30,7 @@ public struct FieldStoryStageExcel : IFlatbufferObject #endif public byte[] GetNameArray() { return __p.__vector_as_array(8); } public long BattleDuration { get { int o = __p.__offset(10); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } - public SCHALE.Common.FlatData.StageTopography StageTopography { get { int o = __p.__offset(12); return o != 0 ? (SCHALE.Common.FlatData.StageTopography)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.StageTopography.Street; } } + public SCHALE.Common.FlatData.StageTopography StageTopography_ { get { int o = __p.__offset(12); return o != 0 ? (SCHALE.Common.FlatData.StageTopography)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.StageTopography.Street; } } public int RecommandLevel { get { int o = __p.__offset(14); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } public long GroundID { get { int o = __p.__offset(16); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public long BGMId { get { int o = __p.__offset(18); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } @@ -42,7 +42,7 @@ public struct FieldStoryStageExcel : IFlatbufferObject long SeasonId = 0, StringOffset NameOffset = default(StringOffset), long BattleDuration = 0, - SCHALE.Common.FlatData.StageTopography StageTopography = SCHALE.Common.FlatData.StageTopography.Street, + SCHALE.Common.FlatData.StageTopography StageTopography_ = SCHALE.Common.FlatData.StageTopography.Street, int RecommandLevel = 0, long GroundID = 0, long BGMId = 0, @@ -56,7 +56,7 @@ public struct FieldStoryStageExcel : IFlatbufferObject FieldStoryStageExcel.AddSeasonId(builder, SeasonId); FieldStoryStageExcel.AddId(builder, Id); FieldStoryStageExcel.AddRecommandLevel(builder, RecommandLevel); - FieldStoryStageExcel.AddStageTopography(builder, StageTopography); + FieldStoryStageExcel.AddStageTopography_(builder, StageTopography_); FieldStoryStageExcel.AddName(builder, NameOffset); FieldStoryStageExcel.AddSkipFormationSettings(builder, SkipFormationSettings); return FieldStoryStageExcel.EndFieldStoryStageExcel(builder); @@ -67,7 +67,7 @@ public struct FieldStoryStageExcel : IFlatbufferObject public static void AddSeasonId(FlatBufferBuilder builder, long seasonId) { builder.AddLong(1, seasonId, 0); } public static void AddName(FlatBufferBuilder builder, StringOffset nameOffset) { builder.AddOffset(2, nameOffset.Value, 0); } public static void AddBattleDuration(FlatBufferBuilder builder, long battleDuration) { builder.AddLong(3, battleDuration, 0); } - public static void AddStageTopography(FlatBufferBuilder builder, SCHALE.Common.FlatData.StageTopography stageTopography) { builder.AddInt(4, (int)stageTopography, 0); } + public static void AddStageTopography_(FlatBufferBuilder builder, SCHALE.Common.FlatData.StageTopography stageTopography_) { builder.AddInt(4, (int)stageTopography_, 0); } public static void AddRecommandLevel(FlatBufferBuilder builder, int recommandLevel) { builder.AddInt(5, recommandLevel, 0); } public static void AddGroundID(FlatBufferBuilder builder, long groundID) { builder.AddLong(6, groundID, 0); } public static void AddBGMId(FlatBufferBuilder builder, long bGMId) { builder.AddLong(7, bGMId, 0); } @@ -88,7 +88,7 @@ public struct FieldStoryStageExcel : IFlatbufferObject _o.SeasonId = TableEncryptionService.Convert(this.SeasonId, key); _o.Name = TableEncryptionService.Convert(this.Name, key); _o.BattleDuration = TableEncryptionService.Convert(this.BattleDuration, key); - _o.StageTopography = TableEncryptionService.Convert(this.StageTopography, key); + _o.StageTopography_ = TableEncryptionService.Convert(this.StageTopography_, key); _o.RecommandLevel = TableEncryptionService.Convert(this.RecommandLevel, key); _o.GroundID = TableEncryptionService.Convert(this.GroundID, key); _o.BGMId = TableEncryptionService.Convert(this.BGMId, key); @@ -104,7 +104,7 @@ public struct FieldStoryStageExcel : IFlatbufferObject _o.SeasonId, _Name, _o.BattleDuration, - _o.StageTopography, + _o.StageTopography_, _o.RecommandLevel, _o.GroundID, _o.BGMId, @@ -119,7 +119,7 @@ public class FieldStoryStageExcelT public long SeasonId { get; set; } public string Name { get; set; } public long BattleDuration { get; set; } - public SCHALE.Common.FlatData.StageTopography StageTopography { get; set; } + public SCHALE.Common.FlatData.StageTopography StageTopography_ { get; set; } public int RecommandLevel { get; set; } public long GroundID { get; set; } public long BGMId { get; set; } @@ -131,7 +131,7 @@ public class FieldStoryStageExcelT this.SeasonId = 0; this.Name = null; this.BattleDuration = 0; - this.StageTopography = SCHALE.Common.FlatData.StageTopography.Street; + this.StageTopography_ = SCHALE.Common.FlatData.StageTopography.Street; this.RecommandLevel = 0; this.GroundID = 0; this.BGMId = 0; @@ -150,7 +150,7 @@ static public class FieldStoryStageExcelVerify && verifier.VerifyField(tablePos, 6 /*SeasonId*/, 8 /*long*/, 8, false) && verifier.VerifyString(tablePos, 8 /*Name*/, false) && verifier.VerifyField(tablePos, 10 /*BattleDuration*/, 8 /*long*/, 8, false) - && verifier.VerifyField(tablePos, 12 /*StageTopography*/, 4 /*SCHALE.Common.FlatData.StageTopography*/, 4, false) + && verifier.VerifyField(tablePos, 12 /*StageTopography_*/, 4 /*SCHALE.Common.FlatData.StageTopography*/, 4, false) && verifier.VerifyField(tablePos, 14 /*RecommandLevel*/, 4 /*int*/, 4, false) && verifier.VerifyField(tablePos, 16 /*GroundID*/, 8 /*long*/, 8, false) && verifier.VerifyField(tablePos, 18 /*BGMId*/, 8 /*long*/, 8, false) diff --git a/SCHALE.Common/FlatData/FloaterCommonExcel.cs b/SCHALE.Common/FlatData/FloaterCommonExcel.cs index 1b3db01..65114f4 100644 --- a/SCHALE.Common/FlatData/FloaterCommonExcel.cs +++ b/SCHALE.Common/FlatData/FloaterCommonExcel.cs @@ -21,7 +21,7 @@ public struct FloaterCommonExcel : IFlatbufferObject public FloaterCommonExcel __assign(int _i, ByteBuffer _bb) { __init(_i, _bb); return this; } public long Id { get { int o = __p.__offset(4); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } - public SCHALE.Common.FlatData.TacticEntityType TacticEntityType { get { int o = __p.__offset(6); return o != 0 ? (SCHALE.Common.FlatData.TacticEntityType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.TacticEntityType.None; } } + public SCHALE.Common.FlatData.TacticEntityType TacticEntityType_ { get { int o = __p.__offset(6); return o != 0 ? (SCHALE.Common.FlatData.TacticEntityType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.TacticEntityType.None; } } public int FloaterOffsetPosX { get { int o = __p.__offset(8); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } public int FloaterOffsetPosY { get { int o = __p.__offset(10); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } public int FloaterRandomPosRangeX { get { int o = __p.__offset(12); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } @@ -29,7 +29,7 @@ public struct FloaterCommonExcel : IFlatbufferObject public static Offset CreateFloaterCommonExcel(FlatBufferBuilder builder, long Id = 0, - SCHALE.Common.FlatData.TacticEntityType TacticEntityType = SCHALE.Common.FlatData.TacticEntityType.None, + SCHALE.Common.FlatData.TacticEntityType TacticEntityType_ = SCHALE.Common.FlatData.TacticEntityType.None, int FloaterOffsetPosX = 0, int FloaterOffsetPosY = 0, int FloaterRandomPosRangeX = 0, @@ -40,13 +40,13 @@ public struct FloaterCommonExcel : IFlatbufferObject FloaterCommonExcel.AddFloaterRandomPosRangeX(builder, FloaterRandomPosRangeX); FloaterCommonExcel.AddFloaterOffsetPosY(builder, FloaterOffsetPosY); FloaterCommonExcel.AddFloaterOffsetPosX(builder, FloaterOffsetPosX); - FloaterCommonExcel.AddTacticEntityType(builder, TacticEntityType); + FloaterCommonExcel.AddTacticEntityType_(builder, TacticEntityType_); return FloaterCommonExcel.EndFloaterCommonExcel(builder); } public static void StartFloaterCommonExcel(FlatBufferBuilder builder) { builder.StartTable(6); } public static void AddId(FlatBufferBuilder builder, long id) { builder.AddLong(0, id, 0); } - public static void AddTacticEntityType(FlatBufferBuilder builder, SCHALE.Common.FlatData.TacticEntityType tacticEntityType) { builder.AddInt(1, (int)tacticEntityType, 0); } + public static void AddTacticEntityType_(FlatBufferBuilder builder, SCHALE.Common.FlatData.TacticEntityType tacticEntityType_) { builder.AddInt(1, (int)tacticEntityType_, 0); } public static void AddFloaterOffsetPosX(FlatBufferBuilder builder, int floaterOffsetPosX) { builder.AddInt(2, floaterOffsetPosX, 0); } public static void AddFloaterOffsetPosY(FlatBufferBuilder builder, int floaterOffsetPosY) { builder.AddInt(3, floaterOffsetPosY, 0); } public static void AddFloaterRandomPosRangeX(FlatBufferBuilder builder, int floaterRandomPosRangeX) { builder.AddInt(4, floaterRandomPosRangeX, 0); } @@ -63,7 +63,7 @@ public struct FloaterCommonExcel : IFlatbufferObject public void UnPackTo(FloaterCommonExcelT _o) { byte[] key = TableEncryptionService.CreateKey("FloaterCommon"); _o.Id = TableEncryptionService.Convert(this.Id, key); - _o.TacticEntityType = TableEncryptionService.Convert(this.TacticEntityType, key); + _o.TacticEntityType_ = TableEncryptionService.Convert(this.TacticEntityType_, key); _o.FloaterOffsetPosX = TableEncryptionService.Convert(this.FloaterOffsetPosX, key); _o.FloaterOffsetPosY = TableEncryptionService.Convert(this.FloaterOffsetPosY, key); _o.FloaterRandomPosRangeX = TableEncryptionService.Convert(this.FloaterRandomPosRangeX, key); @@ -74,7 +74,7 @@ public struct FloaterCommonExcel : IFlatbufferObject return CreateFloaterCommonExcel( builder, _o.Id, - _o.TacticEntityType, + _o.TacticEntityType_, _o.FloaterOffsetPosX, _o.FloaterOffsetPosY, _o.FloaterRandomPosRangeX, @@ -85,7 +85,7 @@ public struct FloaterCommonExcel : IFlatbufferObject public class FloaterCommonExcelT { public long Id { get; set; } - public SCHALE.Common.FlatData.TacticEntityType TacticEntityType { get; set; } + public SCHALE.Common.FlatData.TacticEntityType TacticEntityType_ { get; set; } public int FloaterOffsetPosX { get; set; } public int FloaterOffsetPosY { get; set; } public int FloaterRandomPosRangeX { get; set; } @@ -93,7 +93,7 @@ public class FloaterCommonExcelT public FloaterCommonExcelT() { this.Id = 0; - this.TacticEntityType = SCHALE.Common.FlatData.TacticEntityType.None; + this.TacticEntityType_ = SCHALE.Common.FlatData.TacticEntityType.None; this.FloaterOffsetPosX = 0; this.FloaterOffsetPosY = 0; this.FloaterRandomPosRangeX = 0; @@ -108,7 +108,7 @@ static public class FloaterCommonExcelVerify { return verifier.VerifyTableStart(tablePos) && verifier.VerifyField(tablePos, 4 /*Id*/, 8 /*long*/, 8, false) - && verifier.VerifyField(tablePos, 6 /*TacticEntityType*/, 4 /*SCHALE.Common.FlatData.TacticEntityType*/, 4, false) + && verifier.VerifyField(tablePos, 6 /*TacticEntityType_*/, 4 /*SCHALE.Common.FlatData.TacticEntityType*/, 4, false) && verifier.VerifyField(tablePos, 8 /*FloaterOffsetPosX*/, 4 /*int*/, 4, false) && verifier.VerifyField(tablePos, 10 /*FloaterOffsetPosY*/, 4 /*int*/, 4, false) && verifier.VerifyField(tablePos, 12 /*FloaterRandomPosRangeX*/, 4 /*int*/, 4, false) diff --git a/SCHALE.Common/FlatData/Form.cs b/SCHALE.Common/FlatData/Form.cs index a6219fd..a814798 100644 --- a/SCHALE.Common/FlatData/Form.cs +++ b/SCHALE.Common/FlatData/Form.cs @@ -20,20 +20,20 @@ public struct Form : IFlatbufferObject public void __init(int _i, ByteBuffer _bb) { __p = new Table(_i, _bb); } public Form __assign(int _i, ByteBuffer _bb) { __init(_i, _bb); return this; } - public SCHALE.Common.FlatData.MoveEnd? MoveEnd { get { int o = __p.__offset(4); return o != 0 ? (SCHALE.Common.FlatData.MoveEnd?)(new SCHALE.Common.FlatData.MoveEnd()).__assign(__p.__indirect(o + __p.bb_pos), __p.bb) : null; } } + public SCHALE.Common.FlatData.MoveEnd? MoveEnd_ { get { int o = __p.__offset(4); return o != 0 ? (SCHALE.Common.FlatData.MoveEnd?)(new SCHALE.Common.FlatData.MoveEnd()).__assign(__p.__indirect(o + __p.bb_pos), __p.bb) : null; } } public SCHALE.Common.FlatData.Motion? PublicSkill { get { int o = __p.__offset(6); return o != 0 ? (SCHALE.Common.FlatData.Motion?)(new SCHALE.Common.FlatData.Motion()).__assign(__p.__indirect(o + __p.bb_pos), __p.bb) : null; } } public static Offset CreateForm(FlatBufferBuilder builder, - Offset MoveEndOffset = default(Offset), + Offset MoveEnd_Offset = default(Offset), Offset PublicSkillOffset = default(Offset)) { builder.StartTable(2); Form.AddPublicSkill(builder, PublicSkillOffset); - Form.AddMoveEnd(builder, MoveEndOffset); + Form.AddMoveEnd_(builder, MoveEnd_Offset); return Form.EndForm(builder); } public static void StartForm(FlatBufferBuilder builder) { builder.StartTable(2); } - public static void AddMoveEnd(FlatBufferBuilder builder, Offset moveEndOffset) { builder.AddOffset(0, moveEndOffset.Value, 0); } + public static void AddMoveEnd_(FlatBufferBuilder builder, Offset moveEnd_Offset) { builder.AddOffset(0, moveEnd_Offset.Value, 0); } public static void AddPublicSkill(FlatBufferBuilder builder, Offset publicSkillOffset) { builder.AddOffset(1, publicSkillOffset.Value, 0); } public static Offset EndForm(FlatBufferBuilder builder) { int o = builder.EndTable(); @@ -46,27 +46,27 @@ public struct Form : IFlatbufferObject } public void UnPackTo(FormT _o) { byte[] key = { 0 }; - _o.MoveEnd = this.MoveEnd.HasValue ? this.MoveEnd.Value.UnPack() : null; + _o.MoveEnd_ = this.MoveEnd_.HasValue ? this.MoveEnd_.Value.UnPack() : null; _o.PublicSkill = this.PublicSkill.HasValue ? this.PublicSkill.Value.UnPack() : null; } public static Offset Pack(FlatBufferBuilder builder, FormT _o) { if (_o == null) return default(Offset); - var _MoveEnd = _o.MoveEnd == null ? default(Offset) : SCHALE.Common.FlatData.MoveEnd.Pack(builder, _o.MoveEnd); + var _MoveEnd_ = _o.MoveEnd_ == null ? default(Offset) : SCHALE.Common.FlatData.MoveEnd.Pack(builder, _o.MoveEnd_); var _PublicSkill = _o.PublicSkill == null ? default(Offset) : SCHALE.Common.FlatData.Motion.Pack(builder, _o.PublicSkill); return CreateForm( builder, - _MoveEnd, + _MoveEnd_, _PublicSkill); } } public class FormT { - public SCHALE.Common.FlatData.MoveEndT MoveEnd { get; set; } + public SCHALE.Common.FlatData.MoveEndT MoveEnd_ { get; set; } public SCHALE.Common.FlatData.MotionT PublicSkill { get; set; } public FormT() { - this.MoveEnd = null; + this.MoveEnd_ = null; this.PublicSkill = null; } } @@ -77,7 +77,7 @@ static public class FormVerify static public bool Verify(Google.FlatBuffers.Verifier verifier, uint tablePos) { return verifier.VerifyTableStart(tablePos) - && verifier.VerifyTable(tablePos, 4 /*MoveEnd*/, SCHALE.Common.FlatData.MoveEndVerify.Verify, false) + && verifier.VerifyTable(tablePos, 4 /*MoveEnd_*/, SCHALE.Common.FlatData.MoveEndVerify.Verify, false) && verifier.VerifyTable(tablePos, 6 /*PublicSkill*/, SCHALE.Common.FlatData.MotionVerify.Verify, false) && verifier.VerifyTableEnd(tablePos); } diff --git a/SCHALE.Common/FlatData/FurnitureExcel.cs b/SCHALE.Common/FlatData/FurnitureExcel.cs index 74f981a..caa765b 100644 --- a/SCHALE.Common/FlatData/FurnitureExcel.cs +++ b/SCHALE.Common/FlatData/FurnitureExcel.cs @@ -21,8 +21,8 @@ public struct FurnitureExcel : IFlatbufferObject public FurnitureExcel __assign(int _i, ByteBuffer _bb) { __init(_i, _bb); return this; } public long Id { get { int o = __p.__offset(4); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } - public SCHALE.Common.FlatData.ProductionStep ProductionStep { get { int o = __p.__offset(6); return o != 0 ? (SCHALE.Common.FlatData.ProductionStep)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.ProductionStep.ToDo; } } - public SCHALE.Common.FlatData.Rarity Rarity { get { int o = __p.__offset(8); return o != 0 ? (SCHALE.Common.FlatData.Rarity)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.Rarity.N; } } + public SCHALE.Common.FlatData.ProductionStep ProductionStep_ { get { int o = __p.__offset(6); return o != 0 ? (SCHALE.Common.FlatData.ProductionStep)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.ProductionStep.ToDo; } } + public SCHALE.Common.FlatData.Rarity Rarity_ { get { int o = __p.__offset(8); return o != 0 ? (SCHALE.Common.FlatData.Rarity)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.Rarity.N; } } public SCHALE.Common.FlatData.FurnitureCategory Category { get { int o = __p.__offset(10); return o != 0 ? (SCHALE.Common.FlatData.FurnitureCategory)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.FurnitureCategory.Furnitures; } } public SCHALE.Common.FlatData.FurnitureSubCategory SubCategory { get { int o = __p.__offset(12); return o != 0 ? (SCHALE.Common.FlatData.FurnitureSubCategory)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.FurnitureSubCategory.Table; } } public uint LocalizeEtcId { get { int o = __p.__offset(14); return o != 0 ? __p.bb.GetUint(o + __p.bb_pos) : (uint)0; } } @@ -94,7 +94,7 @@ public struct FurnitureExcel : IFlatbufferObject public long CraftQualityTier1 { get { int o = __p.__offset(60); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public long CraftQualityTier2 { get { int o = __p.__offset(62); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public long ShiftingCraftQuality { get { int o = __p.__offset(64); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } - public SCHALE.Common.FlatData.FurnitureFunctionType FurnitureFunctionType { get { int o = __p.__offset(66); return o != 0 ? (SCHALE.Common.FlatData.FurnitureFunctionType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.FurnitureFunctionType.None; } } + public SCHALE.Common.FlatData.FurnitureFunctionType FurnitureFunctionType_ { get { int o = __p.__offset(66); return o != 0 ? (SCHALE.Common.FlatData.FurnitureFunctionType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.FurnitureFunctionType.None; } } public long FurnitureFunctionParameter { get { int o = __p.__offset(68); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public long VideoId { get { int o = __p.__offset(70); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public long EventCollectionId { get { int o = __p.__offset(72); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } @@ -111,8 +111,8 @@ public struct FurnitureExcel : IFlatbufferObject public static Offset CreateFurnitureExcel(FlatBufferBuilder builder, long Id = 0, - SCHALE.Common.FlatData.ProductionStep ProductionStep = SCHALE.Common.FlatData.ProductionStep.ToDo, - SCHALE.Common.FlatData.Rarity Rarity = SCHALE.Common.FlatData.Rarity.N, + SCHALE.Common.FlatData.ProductionStep ProductionStep_ = SCHALE.Common.FlatData.ProductionStep.ToDo, + SCHALE.Common.FlatData.Rarity Rarity_ = SCHALE.Common.FlatData.Rarity.N, SCHALE.Common.FlatData.FurnitureCategory Category = SCHALE.Common.FlatData.FurnitureCategory.Furnitures, SCHALE.Common.FlatData.FurnitureSubCategory SubCategory = SCHALE.Common.FlatData.FurnitureSubCategory.Table, uint LocalizeEtcId = 0, @@ -141,7 +141,7 @@ public struct FurnitureExcel : IFlatbufferObject long CraftQualityTier1 = 0, long CraftQualityTier2 = 0, long ShiftingCraftQuality = 0, - SCHALE.Common.FlatData.FurnitureFunctionType FurnitureFunctionType = SCHALE.Common.FlatData.FurnitureFunctionType.None, + SCHALE.Common.FlatData.FurnitureFunctionType FurnitureFunctionType_ = SCHALE.Common.FlatData.FurnitureFunctionType.None, long FurnitureFunctionParameter = 0, long VideoId = 0, long EventCollectionId = 0, @@ -173,7 +173,7 @@ public struct FurnitureExcel : IFlatbufferObject FurnitureExcel.AddCafeCharacterStateMake(builder, CafeCharacterStateMakeOffset); FurnitureExcel.AddCafeCharacterStateAdd(builder, CafeCharacterStateAddOffset); FurnitureExcel.AddCafeCharacterStateReq(builder, CafeCharacterStateReqOffset); - FurnitureExcel.AddFurnitureFunctionType(builder, FurnitureFunctionType); + FurnitureExcel.AddFurnitureFunctionType_(builder, FurnitureFunctionType_); FurnitureExcel.AddTags(builder, TagsOffset); FurnitureExcel.AddCornerPrefab(builder, CornerPrefabOffset); FurnitureExcel.AddSubExpandPrefab(builder, SubExpandPrefabOffset); @@ -189,8 +189,8 @@ public struct FurnitureExcel : IFlatbufferObject FurnitureExcel.AddLocalizeEtcId(builder, LocalizeEtcId); FurnitureExcel.AddSubCategory(builder, SubCategory); FurnitureExcel.AddCategory(builder, Category); - FurnitureExcel.AddRarity(builder, Rarity); - FurnitureExcel.AddProductionStep(builder, ProductionStep); + FurnitureExcel.AddRarity_(builder, Rarity_); + FurnitureExcel.AddProductionStep_(builder, ProductionStep_); FurnitureExcel.AddReverseRotation(builder, ReverseRotation); FurnitureExcel.AddEnable(builder, Enable); return FurnitureExcel.EndFurnitureExcel(builder); @@ -198,8 +198,8 @@ public struct FurnitureExcel : IFlatbufferObject public static void StartFurnitureExcel(FlatBufferBuilder builder) { builder.StartTable(41); } public static void AddId(FlatBufferBuilder builder, long id) { builder.AddLong(0, id, 0); } - public static void AddProductionStep(FlatBufferBuilder builder, SCHALE.Common.FlatData.ProductionStep productionStep) { builder.AddInt(1, (int)productionStep, 0); } - public static void AddRarity(FlatBufferBuilder builder, SCHALE.Common.FlatData.Rarity rarity) { builder.AddInt(2, (int)rarity, 0); } + public static void AddProductionStep_(FlatBufferBuilder builder, SCHALE.Common.FlatData.ProductionStep productionStep_) { builder.AddInt(1, (int)productionStep_, 0); } + public static void AddRarity_(FlatBufferBuilder builder, SCHALE.Common.FlatData.Rarity rarity_) { builder.AddInt(2, (int)rarity_, 0); } public static void AddCategory(FlatBufferBuilder builder, SCHALE.Common.FlatData.FurnitureCategory category) { builder.AddInt(3, (int)category, 0); } public static void AddSubCategory(FlatBufferBuilder builder, SCHALE.Common.FlatData.FurnitureSubCategory subCategory) { builder.AddInt(4, (int)subCategory, 0); } public static void AddLocalizeEtcId(FlatBufferBuilder builder, uint localizeEtcId) { builder.AddUint(5, localizeEtcId, 0); } @@ -233,7 +233,7 @@ public struct FurnitureExcel : IFlatbufferObject public static void AddCraftQualityTier1(FlatBufferBuilder builder, long craftQualityTier1) { builder.AddLong(28, craftQualityTier1, 0); } public static void AddCraftQualityTier2(FlatBufferBuilder builder, long craftQualityTier2) { builder.AddLong(29, craftQualityTier2, 0); } public static void AddShiftingCraftQuality(FlatBufferBuilder builder, long shiftingCraftQuality) { builder.AddLong(30, shiftingCraftQuality, 0); } - public static void AddFurnitureFunctionType(FlatBufferBuilder builder, SCHALE.Common.FlatData.FurnitureFunctionType furnitureFunctionType) { builder.AddInt(31, (int)furnitureFunctionType, 0); } + public static void AddFurnitureFunctionType_(FlatBufferBuilder builder, SCHALE.Common.FlatData.FurnitureFunctionType furnitureFunctionType_) { builder.AddInt(31, (int)furnitureFunctionType_, 0); } public static void AddFurnitureFunctionParameter(FlatBufferBuilder builder, long furnitureFunctionParameter) { builder.AddLong(32, furnitureFunctionParameter, 0); } public static void AddVideoId(FlatBufferBuilder builder, long videoId) { builder.AddLong(33, videoId, 0); } public static void AddEventCollectionId(FlatBufferBuilder builder, long eventCollectionId) { builder.AddLong(34, eventCollectionId, 0); } @@ -275,8 +275,8 @@ public struct FurnitureExcel : IFlatbufferObject public void UnPackTo(FurnitureExcelT _o) { byte[] key = TableEncryptionService.CreateKey("Furniture"); _o.Id = TableEncryptionService.Convert(this.Id, key); - _o.ProductionStep = TableEncryptionService.Convert(this.ProductionStep, key); - _o.Rarity = TableEncryptionService.Convert(this.Rarity, key); + _o.ProductionStep_ = TableEncryptionService.Convert(this.ProductionStep_, key); + _o.Rarity_ = TableEncryptionService.Convert(this.Rarity_, key); _o.Category = TableEncryptionService.Convert(this.Category, key); _o.SubCategory = TableEncryptionService.Convert(this.SubCategory, key); _o.LocalizeEtcId = TableEncryptionService.Convert(this.LocalizeEtcId, key); @@ -306,7 +306,7 @@ public struct FurnitureExcel : IFlatbufferObject _o.CraftQualityTier1 = TableEncryptionService.Convert(this.CraftQualityTier1, key); _o.CraftQualityTier2 = TableEncryptionService.Convert(this.CraftQualityTier2, key); _o.ShiftingCraftQuality = TableEncryptionService.Convert(this.ShiftingCraftQuality, key); - _o.FurnitureFunctionType = TableEncryptionService.Convert(this.FurnitureFunctionType, key); + _o.FurnitureFunctionType_ = TableEncryptionService.Convert(this.FurnitureFunctionType_, key); _o.FurnitureFunctionParameter = TableEncryptionService.Convert(this.FurnitureFunctionParameter, key); _o.VideoId = TableEncryptionService.Convert(this.VideoId, key); _o.EventCollectionId = TableEncryptionService.Convert(this.EventCollectionId, key); @@ -361,8 +361,8 @@ public struct FurnitureExcel : IFlatbufferObject return CreateFurnitureExcel( builder, _o.Id, - _o.ProductionStep, - _o.Rarity, + _o.ProductionStep_, + _o.Rarity_, _o.Category, _o.SubCategory, _o.LocalizeEtcId, @@ -391,7 +391,7 @@ public struct FurnitureExcel : IFlatbufferObject _o.CraftQualityTier1, _o.CraftQualityTier2, _o.ShiftingCraftQuality, - _o.FurnitureFunctionType, + _o.FurnitureFunctionType_, _o.FurnitureFunctionParameter, _o.VideoId, _o.EventCollectionId, @@ -407,8 +407,8 @@ public struct FurnitureExcel : IFlatbufferObject public class FurnitureExcelT { public long Id { get; set; } - public SCHALE.Common.FlatData.ProductionStep ProductionStep { get; set; } - public SCHALE.Common.FlatData.Rarity Rarity { get; set; } + public SCHALE.Common.FlatData.ProductionStep ProductionStep_ { get; set; } + public SCHALE.Common.FlatData.Rarity Rarity_ { get; set; } public SCHALE.Common.FlatData.FurnitureCategory Category { get; set; } public SCHALE.Common.FlatData.FurnitureSubCategory SubCategory { get; set; } public uint LocalizeEtcId { get; set; } @@ -437,7 +437,7 @@ public class FurnitureExcelT public long CraftQualityTier1 { get; set; } public long CraftQualityTier2 { get; set; } public long ShiftingCraftQuality { get; set; } - public SCHALE.Common.FlatData.FurnitureFunctionType FurnitureFunctionType { get; set; } + public SCHALE.Common.FlatData.FurnitureFunctionType FurnitureFunctionType_ { get; set; } public long FurnitureFunctionParameter { get; set; } public long VideoId { get; set; } public long EventCollectionId { get; set; } @@ -450,8 +450,8 @@ public class FurnitureExcelT public FurnitureExcelT() { this.Id = 0; - this.ProductionStep = SCHALE.Common.FlatData.ProductionStep.ToDo; - this.Rarity = SCHALE.Common.FlatData.Rarity.N; + this.ProductionStep_ = SCHALE.Common.FlatData.ProductionStep.ToDo; + this.Rarity_ = SCHALE.Common.FlatData.Rarity.N; this.Category = SCHALE.Common.FlatData.FurnitureCategory.Furnitures; this.SubCategory = SCHALE.Common.FlatData.FurnitureSubCategory.Table; this.LocalizeEtcId = 0; @@ -480,7 +480,7 @@ public class FurnitureExcelT this.CraftQualityTier1 = 0; this.CraftQualityTier2 = 0; this.ShiftingCraftQuality = 0; - this.FurnitureFunctionType = SCHALE.Common.FlatData.FurnitureFunctionType.None; + this.FurnitureFunctionType_ = SCHALE.Common.FlatData.FurnitureFunctionType.None; this.FurnitureFunctionParameter = 0; this.VideoId = 0; this.EventCollectionId = 0; @@ -500,8 +500,8 @@ static public class FurnitureExcelVerify { return verifier.VerifyTableStart(tablePos) && verifier.VerifyField(tablePos, 4 /*Id*/, 8 /*long*/, 8, false) - && verifier.VerifyField(tablePos, 6 /*ProductionStep*/, 4 /*SCHALE.Common.FlatData.ProductionStep*/, 4, false) - && verifier.VerifyField(tablePos, 8 /*Rarity*/, 4 /*SCHALE.Common.FlatData.Rarity*/, 4, false) + && verifier.VerifyField(tablePos, 6 /*ProductionStep_*/, 4 /*SCHALE.Common.FlatData.ProductionStep*/, 4, false) + && verifier.VerifyField(tablePos, 8 /*Rarity_*/, 4 /*SCHALE.Common.FlatData.Rarity*/, 4, false) && verifier.VerifyField(tablePos, 10 /*Category*/, 4 /*SCHALE.Common.FlatData.FurnitureCategory*/, 4, false) && verifier.VerifyField(tablePos, 12 /*SubCategory*/, 4 /*SCHALE.Common.FlatData.FurnitureSubCategory*/, 4, false) && verifier.VerifyField(tablePos, 14 /*LocalizeEtcId*/, 4 /*uint*/, 4, false) @@ -530,7 +530,7 @@ static public class FurnitureExcelVerify && verifier.VerifyField(tablePos, 60 /*CraftQualityTier1*/, 8 /*long*/, 8, false) && verifier.VerifyField(tablePos, 62 /*CraftQualityTier2*/, 8 /*long*/, 8, false) && verifier.VerifyField(tablePos, 64 /*ShiftingCraftQuality*/, 8 /*long*/, 8, false) - && verifier.VerifyField(tablePos, 66 /*FurnitureFunctionType*/, 4 /*SCHALE.Common.FlatData.FurnitureFunctionType*/, 4, false) + && verifier.VerifyField(tablePos, 66 /*FurnitureFunctionType_*/, 4 /*SCHALE.Common.FlatData.FurnitureFunctionType*/, 4, false) && verifier.VerifyField(tablePos, 68 /*FurnitureFunctionParameter*/, 8 /*long*/, 8, false) && verifier.VerifyField(tablePos, 70 /*VideoId*/, 8 /*long*/, 8, false) && verifier.VerifyField(tablePos, 72 /*EventCollectionId*/, 8 /*long*/, 8, false) diff --git a/SCHALE.Common/FlatData/GachaElementExcel.cs b/SCHALE.Common/FlatData/GachaElementExcel.cs index 5e15bec..f868ef0 100644 --- a/SCHALE.Common/FlatData/GachaElementExcel.cs +++ b/SCHALE.Common/FlatData/GachaElementExcel.cs @@ -22,9 +22,9 @@ public struct GachaElementExcel : IFlatbufferObject public long ID { get { int o = __p.__offset(4); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public long GachaGroupID { get { int o = __p.__offset(6); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } - public SCHALE.Common.FlatData.ParcelType ParcelType { get { int o = __p.__offset(8); return o != 0 ? (SCHALE.Common.FlatData.ParcelType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.ParcelType.None; } } + public SCHALE.Common.FlatData.ParcelType ParcelType_ { get { int o = __p.__offset(8); return o != 0 ? (SCHALE.Common.FlatData.ParcelType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.ParcelType.None; } } public long ParcelID { get { int o = __p.__offset(10); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } - public SCHALE.Common.FlatData.Rarity Rarity { get { int o = __p.__offset(12); return o != 0 ? (SCHALE.Common.FlatData.Rarity)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.Rarity.N; } } + public SCHALE.Common.FlatData.Rarity Rarity_ { get { int o = __p.__offset(12); return o != 0 ? (SCHALE.Common.FlatData.Rarity)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.Rarity.N; } } public int ParcelAmountMin { get { int o = __p.__offset(14); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } public int ParcelAmountMax { get { int o = __p.__offset(16); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } public int Prob { get { int o = __p.__offset(18); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } @@ -33,9 +33,9 @@ public struct GachaElementExcel : IFlatbufferObject public static Offset CreateGachaElementExcel(FlatBufferBuilder builder, long ID = 0, long GachaGroupID = 0, - SCHALE.Common.FlatData.ParcelType ParcelType = SCHALE.Common.FlatData.ParcelType.None, + SCHALE.Common.FlatData.ParcelType ParcelType_ = SCHALE.Common.FlatData.ParcelType.None, long ParcelID = 0, - SCHALE.Common.FlatData.Rarity Rarity = SCHALE.Common.FlatData.Rarity.N, + SCHALE.Common.FlatData.Rarity Rarity_ = SCHALE.Common.FlatData.Rarity.N, int ParcelAmountMin = 0, int ParcelAmountMax = 0, int Prob = 0, @@ -48,17 +48,17 @@ public struct GachaElementExcel : IFlatbufferObject GachaElementExcel.AddProb(builder, Prob); GachaElementExcel.AddParcelAmountMax(builder, ParcelAmountMax); GachaElementExcel.AddParcelAmountMin(builder, ParcelAmountMin); - GachaElementExcel.AddRarity(builder, Rarity); - GachaElementExcel.AddParcelType(builder, ParcelType); + GachaElementExcel.AddRarity_(builder, Rarity_); + GachaElementExcel.AddParcelType_(builder, ParcelType_); return GachaElementExcel.EndGachaElementExcel(builder); } public static void StartGachaElementExcel(FlatBufferBuilder builder) { builder.StartTable(9); } public static void AddID(FlatBufferBuilder builder, long iD) { builder.AddLong(0, iD, 0); } public static void AddGachaGroupID(FlatBufferBuilder builder, long gachaGroupID) { builder.AddLong(1, gachaGroupID, 0); } - public static void AddParcelType(FlatBufferBuilder builder, SCHALE.Common.FlatData.ParcelType parcelType) { builder.AddInt(2, (int)parcelType, 0); } + public static void AddParcelType_(FlatBufferBuilder builder, SCHALE.Common.FlatData.ParcelType parcelType_) { builder.AddInt(2, (int)parcelType_, 0); } public static void AddParcelID(FlatBufferBuilder builder, long parcelID) { builder.AddLong(3, parcelID, 0); } - public static void AddRarity(FlatBufferBuilder builder, SCHALE.Common.FlatData.Rarity rarity) { builder.AddInt(4, (int)rarity, 0); } + public static void AddRarity_(FlatBufferBuilder builder, SCHALE.Common.FlatData.Rarity rarity_) { builder.AddInt(4, (int)rarity_, 0); } public static void AddParcelAmountMin(FlatBufferBuilder builder, int parcelAmountMin) { builder.AddInt(5, parcelAmountMin, 0); } public static void AddParcelAmountMax(FlatBufferBuilder builder, int parcelAmountMax) { builder.AddInt(6, parcelAmountMax, 0); } public static void AddProb(FlatBufferBuilder builder, int prob) { builder.AddInt(7, prob, 0); } @@ -76,9 +76,9 @@ public struct GachaElementExcel : IFlatbufferObject byte[] key = TableEncryptionService.CreateKey("GachaElement"); _o.ID = TableEncryptionService.Convert(this.ID, key); _o.GachaGroupID = TableEncryptionService.Convert(this.GachaGroupID, key); - _o.ParcelType = TableEncryptionService.Convert(this.ParcelType, key); + _o.ParcelType_ = TableEncryptionService.Convert(this.ParcelType_, key); _o.ParcelID = TableEncryptionService.Convert(this.ParcelID, key); - _o.Rarity = TableEncryptionService.Convert(this.Rarity, key); + _o.Rarity_ = TableEncryptionService.Convert(this.Rarity_, key); _o.ParcelAmountMin = TableEncryptionService.Convert(this.ParcelAmountMin, key); _o.ParcelAmountMax = TableEncryptionService.Convert(this.ParcelAmountMax, key); _o.Prob = TableEncryptionService.Convert(this.Prob, key); @@ -90,9 +90,9 @@ public struct GachaElementExcel : IFlatbufferObject builder, _o.ID, _o.GachaGroupID, - _o.ParcelType, + _o.ParcelType_, _o.ParcelID, - _o.Rarity, + _o.Rarity_, _o.ParcelAmountMin, _o.ParcelAmountMax, _o.Prob, @@ -104,9 +104,9 @@ public class GachaElementExcelT { public long ID { get; set; } public long GachaGroupID { get; set; } - public SCHALE.Common.FlatData.ParcelType ParcelType { get; set; } + public SCHALE.Common.FlatData.ParcelType ParcelType_ { get; set; } public long ParcelID { get; set; } - public SCHALE.Common.FlatData.Rarity Rarity { get; set; } + public SCHALE.Common.FlatData.Rarity Rarity_ { get; set; } public int ParcelAmountMin { get; set; } public int ParcelAmountMax { get; set; } public int Prob { get; set; } @@ -115,9 +115,9 @@ public class GachaElementExcelT public GachaElementExcelT() { this.ID = 0; this.GachaGroupID = 0; - this.ParcelType = SCHALE.Common.FlatData.ParcelType.None; + this.ParcelType_ = SCHALE.Common.FlatData.ParcelType.None; this.ParcelID = 0; - this.Rarity = SCHALE.Common.FlatData.Rarity.N; + this.Rarity_ = SCHALE.Common.FlatData.Rarity.N; this.ParcelAmountMin = 0; this.ParcelAmountMax = 0; this.Prob = 0; @@ -133,9 +133,9 @@ static public class GachaElementExcelVerify return verifier.VerifyTableStart(tablePos) && verifier.VerifyField(tablePos, 4 /*ID*/, 8 /*long*/, 8, false) && verifier.VerifyField(tablePos, 6 /*GachaGroupID*/, 8 /*long*/, 8, false) - && verifier.VerifyField(tablePos, 8 /*ParcelType*/, 4 /*SCHALE.Common.FlatData.ParcelType*/, 4, false) + && verifier.VerifyField(tablePos, 8 /*ParcelType_*/, 4 /*SCHALE.Common.FlatData.ParcelType*/, 4, false) && verifier.VerifyField(tablePos, 10 /*ParcelID*/, 8 /*long*/, 8, false) - && verifier.VerifyField(tablePos, 12 /*Rarity*/, 4 /*SCHALE.Common.FlatData.Rarity*/, 4, false) + && verifier.VerifyField(tablePos, 12 /*Rarity_*/, 4 /*SCHALE.Common.FlatData.Rarity*/, 4, false) && verifier.VerifyField(tablePos, 14 /*ParcelAmountMin*/, 4 /*int*/, 4, false) && verifier.VerifyField(tablePos, 16 /*ParcelAmountMax*/, 4 /*int*/, 4, false) && verifier.VerifyField(tablePos, 18 /*Prob*/, 4 /*int*/, 4, false) diff --git a/SCHALE.Common/FlatData/GachaElementRecursiveExcel.cs b/SCHALE.Common/FlatData/GachaElementRecursiveExcel.cs index 8c3a46a..e51f870 100644 --- a/SCHALE.Common/FlatData/GachaElementRecursiveExcel.cs +++ b/SCHALE.Common/FlatData/GachaElementRecursiveExcel.cs @@ -22,7 +22,7 @@ public struct GachaElementRecursiveExcel : IFlatbufferObject public long ID { get { int o = __p.__offset(4); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public long GachaGroupID { get { int o = __p.__offset(6); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } - public SCHALE.Common.FlatData.ParcelType ParcelType { get { int o = __p.__offset(8); return o != 0 ? (SCHALE.Common.FlatData.ParcelType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.ParcelType.None; } } + public SCHALE.Common.FlatData.ParcelType ParcelType_ { get { int o = __p.__offset(8); return o != 0 ? (SCHALE.Common.FlatData.ParcelType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.ParcelType.None; } } public long ParcelID { get { int o = __p.__offset(10); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public int ParcelAmountMin { get { int o = __p.__offset(12); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } public int ParcelAmountMax { get { int o = __p.__offset(14); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } @@ -32,7 +32,7 @@ public struct GachaElementRecursiveExcel : IFlatbufferObject public static Offset CreateGachaElementRecursiveExcel(FlatBufferBuilder builder, long ID = 0, long GachaGroupID = 0, - SCHALE.Common.FlatData.ParcelType ParcelType = SCHALE.Common.FlatData.ParcelType.None, + SCHALE.Common.FlatData.ParcelType ParcelType_ = SCHALE.Common.FlatData.ParcelType.None, long ParcelID = 0, int ParcelAmountMin = 0, int ParcelAmountMax = 0, @@ -46,14 +46,14 @@ public struct GachaElementRecursiveExcel : IFlatbufferObject GachaElementRecursiveExcel.AddProb(builder, Prob); GachaElementRecursiveExcel.AddParcelAmountMax(builder, ParcelAmountMax); GachaElementRecursiveExcel.AddParcelAmountMin(builder, ParcelAmountMin); - GachaElementRecursiveExcel.AddParcelType(builder, ParcelType); + GachaElementRecursiveExcel.AddParcelType_(builder, ParcelType_); return GachaElementRecursiveExcel.EndGachaElementRecursiveExcel(builder); } public static void StartGachaElementRecursiveExcel(FlatBufferBuilder builder) { builder.StartTable(8); } public static void AddID(FlatBufferBuilder builder, long iD) { builder.AddLong(0, iD, 0); } public static void AddGachaGroupID(FlatBufferBuilder builder, long gachaGroupID) { builder.AddLong(1, gachaGroupID, 0); } - public static void AddParcelType(FlatBufferBuilder builder, SCHALE.Common.FlatData.ParcelType parcelType) { builder.AddInt(2, (int)parcelType, 0); } + public static void AddParcelType_(FlatBufferBuilder builder, SCHALE.Common.FlatData.ParcelType parcelType_) { builder.AddInt(2, (int)parcelType_, 0); } public static void AddParcelID(FlatBufferBuilder builder, long parcelID) { builder.AddLong(3, parcelID, 0); } public static void AddParcelAmountMin(FlatBufferBuilder builder, int parcelAmountMin) { builder.AddInt(4, parcelAmountMin, 0); } public static void AddParcelAmountMax(FlatBufferBuilder builder, int parcelAmountMax) { builder.AddInt(5, parcelAmountMax, 0); } @@ -72,7 +72,7 @@ public struct GachaElementRecursiveExcel : IFlatbufferObject byte[] key = TableEncryptionService.CreateKey("GachaElementRecursive"); _o.ID = TableEncryptionService.Convert(this.ID, key); _o.GachaGroupID = TableEncryptionService.Convert(this.GachaGroupID, key); - _o.ParcelType = TableEncryptionService.Convert(this.ParcelType, key); + _o.ParcelType_ = TableEncryptionService.Convert(this.ParcelType_, key); _o.ParcelID = TableEncryptionService.Convert(this.ParcelID, key); _o.ParcelAmountMin = TableEncryptionService.Convert(this.ParcelAmountMin, key); _o.ParcelAmountMax = TableEncryptionService.Convert(this.ParcelAmountMax, key); @@ -85,7 +85,7 @@ public struct GachaElementRecursiveExcel : IFlatbufferObject builder, _o.ID, _o.GachaGroupID, - _o.ParcelType, + _o.ParcelType_, _o.ParcelID, _o.ParcelAmountMin, _o.ParcelAmountMax, @@ -98,7 +98,7 @@ public class GachaElementRecursiveExcelT { public long ID { get; set; } public long GachaGroupID { get; set; } - public SCHALE.Common.FlatData.ParcelType ParcelType { get; set; } + public SCHALE.Common.FlatData.ParcelType ParcelType_ { get; set; } public long ParcelID { get; set; } public int ParcelAmountMin { get; set; } public int ParcelAmountMax { get; set; } @@ -108,7 +108,7 @@ public class GachaElementRecursiveExcelT public GachaElementRecursiveExcelT() { this.ID = 0; this.GachaGroupID = 0; - this.ParcelType = SCHALE.Common.FlatData.ParcelType.None; + this.ParcelType_ = SCHALE.Common.FlatData.ParcelType.None; this.ParcelID = 0; this.ParcelAmountMin = 0; this.ParcelAmountMax = 0; @@ -125,7 +125,7 @@ static public class GachaElementRecursiveExcelVerify return verifier.VerifyTableStart(tablePos) && verifier.VerifyField(tablePos, 4 /*ID*/, 8 /*long*/, 8, false) && verifier.VerifyField(tablePos, 6 /*GachaGroupID*/, 8 /*long*/, 8, false) - && verifier.VerifyField(tablePos, 8 /*ParcelType*/, 4 /*SCHALE.Common.FlatData.ParcelType*/, 4, false) + && verifier.VerifyField(tablePos, 8 /*ParcelType_*/, 4 /*SCHALE.Common.FlatData.ParcelType*/, 4, false) && verifier.VerifyField(tablePos, 10 /*ParcelID*/, 8 /*long*/, 8, false) && verifier.VerifyField(tablePos, 12 /*ParcelAmountMin*/, 4 /*int*/, 4, false) && verifier.VerifyField(tablePos, 14 /*ParcelAmountMax*/, 4 /*int*/, 4, false) diff --git a/SCHALE.Common/FlatData/Geas.cs b/SCHALE.Common/FlatData/Geas.cs index 91245b4..b59ad8a 100644 --- a/SCHALE.Common/FlatData/Geas.cs +++ b/SCHALE.Common/FlatData/Geas.cs @@ -18,6 +18,9 @@ public enum Geas : int AttackSpeed = 8, Critical = 9, Heal = 10, + MoveSpeed = 11, + LifeSteal = 12, + Evasion = 13, }; diff --git a/SCHALE.Common/FlatData/GoodsExcel.cs b/SCHALE.Common/FlatData/GoodsExcel.cs index b0a3327..d694dee 100644 --- a/SCHALE.Common/FlatData/GoodsExcel.cs +++ b/SCHALE.Common/FlatData/GoodsExcel.cs @@ -22,7 +22,7 @@ public struct GoodsExcel : IFlatbufferObject public long Id { get { int o = __p.__offset(4); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public int Type { get { int o = __p.__offset(6); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } - public SCHALE.Common.FlatData.Rarity Rarity { get { int o = __p.__offset(8); return o != 0 ? (SCHALE.Common.FlatData.Rarity)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.Rarity.N; } } + public SCHALE.Common.FlatData.Rarity Rarity_ { get { int o = __p.__offset(8); return o != 0 ? (SCHALE.Common.FlatData.Rarity)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.Rarity.N; } } public string IconPath { get { int o = __p.__offset(10); return o != 0 ? __p.__string(o + __p.bb_pos) : null; } } #if ENABLE_SPAN_T public Span GetIconPathBytes() { return __p.__vector_as_span(10, 1); } @@ -111,7 +111,7 @@ public struct GoodsExcel : IFlatbufferObject public static Offset CreateGoodsExcel(FlatBufferBuilder builder, long Id = 0, int Type = 0, - SCHALE.Common.FlatData.Rarity Rarity = SCHALE.Common.FlatData.Rarity.N, + SCHALE.Common.FlatData.Rarity Rarity_ = SCHALE.Common.FlatData.Rarity.N, StringOffset IconPathOffset = default(StringOffset), VectorOffset ConsumeParcelTypeOffset = default(VectorOffset), VectorOffset ConsumeParcelIdOffset = default(VectorOffset), @@ -144,7 +144,7 @@ public struct GoodsExcel : IFlatbufferObject GoodsExcel.AddConsumeParcelId(builder, ConsumeParcelIdOffset); GoodsExcel.AddConsumeParcelType(builder, ConsumeParcelTypeOffset); GoodsExcel.AddIconPath(builder, IconPathOffset); - GoodsExcel.AddRarity(builder, Rarity); + GoodsExcel.AddRarity_(builder, Rarity_); GoodsExcel.AddType(builder, Type); return GoodsExcel.EndGoodsExcel(builder); } @@ -152,7 +152,7 @@ public struct GoodsExcel : IFlatbufferObject public static void StartGoodsExcel(FlatBufferBuilder builder) { builder.StartTable(18); } public static void AddId(FlatBufferBuilder builder, long id) { builder.AddLong(0, id, 0); } public static void AddType(FlatBufferBuilder builder, int type) { builder.AddInt(1, type, 0); } - public static void AddRarity(FlatBufferBuilder builder, SCHALE.Common.FlatData.Rarity rarity) { builder.AddInt(2, (int)rarity, 0); } + public static void AddRarity_(FlatBufferBuilder builder, SCHALE.Common.FlatData.Rarity rarity_) { builder.AddInt(2, (int)rarity_, 0); } public static void AddIconPath(FlatBufferBuilder builder, StringOffset iconPathOffset) { builder.AddOffset(3, iconPathOffset.Value, 0); } public static void AddConsumeParcelType(FlatBufferBuilder builder, VectorOffset consumeParcelTypeOffset) { builder.AddOffset(4, consumeParcelTypeOffset.Value, 0); } public static VectorOffset CreateConsumeParcelTypeVector(FlatBufferBuilder builder, SCHALE.Common.FlatData.ParcelType[] data) { builder.StartVector(4, data.Length, 4); for (int i = data.Length - 1; i >= 0; i--) builder.AddInt((int)data[i]); return builder.EndVector(); } @@ -226,7 +226,7 @@ public struct GoodsExcel : IFlatbufferObject byte[] key = TableEncryptionService.CreateKey("Goods"); _o.Id = TableEncryptionService.Convert(this.Id, key); _o.Type = TableEncryptionService.Convert(this.Type, key); - _o.Rarity = TableEncryptionService.Convert(this.Rarity, key); + _o.Rarity_ = TableEncryptionService.Convert(this.Rarity_, key); _o.IconPath = TableEncryptionService.Convert(this.IconPath, key); _o.ConsumeParcelType = new List(); for (var _j = 0; _j < this.ConsumeParcelTypeLength; ++_j) {_o.ConsumeParcelType.Add(TableEncryptionService.Convert(this.ConsumeParcelType(_j), key));} @@ -304,7 +304,7 @@ public struct GoodsExcel : IFlatbufferObject builder, _o.Id, _o.Type, - _o.Rarity, + _o.Rarity_, _IconPath, _ConsumeParcelType, _ConsumeParcelId, @@ -327,7 +327,7 @@ public class GoodsExcelT { public long Id { get; set; } public int Type { get; set; } - public SCHALE.Common.FlatData.Rarity Rarity { get; set; } + public SCHALE.Common.FlatData.Rarity Rarity_ { get; set; } public string IconPath { get; set; } public List ConsumeParcelType { get; set; } public List ConsumeParcelId { get; set; } @@ -347,7 +347,7 @@ public class GoodsExcelT public GoodsExcelT() { this.Id = 0; this.Type = 0; - this.Rarity = SCHALE.Common.FlatData.Rarity.N; + this.Rarity_ = SCHALE.Common.FlatData.Rarity.N; this.IconPath = null; this.ConsumeParcelType = null; this.ConsumeParcelId = null; @@ -374,7 +374,7 @@ static public class GoodsExcelVerify return verifier.VerifyTableStart(tablePos) && verifier.VerifyField(tablePos, 4 /*Id*/, 8 /*long*/, 8, false) && verifier.VerifyField(tablePos, 6 /*Type*/, 4 /*int*/, 4, false) - && verifier.VerifyField(tablePos, 8 /*Rarity*/, 4 /*SCHALE.Common.FlatData.Rarity*/, 4, false) + && verifier.VerifyField(tablePos, 8 /*Rarity_*/, 4 /*SCHALE.Common.FlatData.Rarity*/, 4, false) && verifier.VerifyString(tablePos, 10 /*IconPath*/, false) && verifier.VerifyVectorOfData(tablePos, 12 /*ConsumeParcelType*/, 4 /*SCHALE.Common.FlatData.ParcelType*/, false) && verifier.VerifyVectorOfData(tablePos, 14 /*ConsumeParcelId*/, 8 /*long*/, false) diff --git a/SCHALE.Common/FlatData/GroundExcel.cs b/SCHALE.Common/FlatData/GroundExcel.cs index 42f91e6..94b1a62 100644 --- a/SCHALE.Common/FlatData/GroundExcel.cs +++ b/SCHALE.Common/FlatData/GroundExcel.cs @@ -31,7 +31,7 @@ public struct GroundExcel : IFlatbufferObject #endif public byte[] GetGroundSceneNameArray() { return __p.__vector_as_array(8); } public long FormationGroupId { get { int o = __p.__offset(10); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } - public SCHALE.Common.FlatData.StageTopography StageTopography { get { int o = __p.__offset(12); return o != 0 ? (SCHALE.Common.FlatData.StageTopography)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.StageTopography.Street; } } + public SCHALE.Common.FlatData.StageTopography StageTopography_ { get { int o = __p.__offset(12); return o != 0 ? (SCHALE.Common.FlatData.StageTopography)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.StageTopography.Street; } } public SCHALE.Common.FlatData.BulletType EnemyBulletType { get { int o = __p.__offset(14); return o != 0 ? (SCHALE.Common.FlatData.BulletType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.BulletType.Normal; } } public SCHALE.Common.FlatData.ArmorType EnemyArmorType { get { int o = __p.__offset(16); return o != 0 ? (SCHALE.Common.FlatData.ArmorType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.ArmorType.LightArmor; } } public long LevelNPC { get { int o = __p.__offset(18); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } @@ -85,37 +85,39 @@ public struct GroundExcel : IFlatbufferObject public ArraySegment? GetBeforeVictoryTimelinePathBytes() { return __p.__vector_as_arraysegment(94); } #endif public byte[] GetBeforeVictoryTimelinePathArray() { return __p.__vector_as_array(94); } - public bool HideNPCWhenBattleEnd { get { int o = __p.__offset(96); return o != 0 ? 0!=__p.bb.Get(o + __p.bb_pos) : (bool)false; } } - public float UIHpScale { get { int o = __p.__offset(98); return o != 0 ? __p.bb.GetFloat(o + __p.bb_pos) : (float)0.0f; } } - public float UIEmojiScale { get { int o = __p.__offset(100); return o != 0 ? __p.bb.GetFloat(o + __p.bb_pos) : (float)0.0f; } } - public float UISkillMainLogScale { get { int o = __p.__offset(102); return o != 0 ? __p.bb.GetFloat(o + __p.bb_pos) : (float)0.0f; } } - public string AllyPassiveSkillId(int j) { int o = __p.__offset(104); return o != 0 ? __p.__string(__p.__vector(o) + j * 4) : null; } - public int AllyPassiveSkillIdLength { get { int o = __p.__offset(104); return o != 0 ? __p.__vector_len(o) : 0; } } - public int AllyPassiveSkillLevel(int j) { int o = __p.__offset(106); return o != 0 ? __p.bb.GetInt(__p.__vector(o) + j * 4) : (int)0; } - public int AllyPassiveSkillLevelLength { get { int o = __p.__offset(106); return o != 0 ? __p.__vector_len(o) : 0; } } + public bool SkipBattleEnd { get { int o = __p.__offset(96); return o != 0 ? 0!=__p.bb.Get(o + __p.bb_pos) : (bool)false; } } + public bool HideNPCWhenBattleEnd { get { int o = __p.__offset(98); return o != 0 ? 0!=__p.bb.Get(o + __p.bb_pos) : (bool)false; } } + public bool CoverPointOff { get { int o = __p.__offset(100); return o != 0 ? 0!=__p.bb.Get(o + __p.bb_pos) : (bool)false; } } + public float UIHpScale { get { int o = __p.__offset(102); return o != 0 ? __p.bb.GetFloat(o + __p.bb_pos) : (float)0.0f; } } + public float UIEmojiScale { get { int o = __p.__offset(104); return o != 0 ? __p.bb.GetFloat(o + __p.bb_pos) : (float)0.0f; } } + public float UISkillMainLogScale { get { int o = __p.__offset(106); return o != 0 ? __p.bb.GetFloat(o + __p.bb_pos) : (float)0.0f; } } + public string AllyPassiveSkillId(int j) { int o = __p.__offset(108); return o != 0 ? __p.__string(__p.__vector(o) + j * 4) : null; } + public int AllyPassiveSkillIdLength { get { int o = __p.__offset(108); return o != 0 ? __p.__vector_len(o) : 0; } } + public int AllyPassiveSkillLevel(int j) { int o = __p.__offset(110); return o != 0 ? __p.bb.GetInt(__p.__vector(o) + j * 4) : (int)0; } + public int AllyPassiveSkillLevelLength { get { int o = __p.__offset(110); return o != 0 ? __p.__vector_len(o) : 0; } } #if ENABLE_SPAN_T - public Span GetAllyPassiveSkillLevelBytes() { return __p.__vector_as_span(106, 4); } + public Span GetAllyPassiveSkillLevelBytes() { return __p.__vector_as_span(110, 4); } #else - public ArraySegment? GetAllyPassiveSkillLevelBytes() { return __p.__vector_as_arraysegment(106); } + public ArraySegment? GetAllyPassiveSkillLevelBytes() { return __p.__vector_as_arraysegment(110); } #endif - public int[] GetAllyPassiveSkillLevelArray() { return __p.__vector_as_array(106); } - public string EnemyPassiveSkillId(int j) { int o = __p.__offset(108); return o != 0 ? __p.__string(__p.__vector(o) + j * 4) : null; } - public int EnemyPassiveSkillIdLength { get { int o = __p.__offset(108); return o != 0 ? __p.__vector_len(o) : 0; } } - public int EnemyPassiveSkillLevel(int j) { int o = __p.__offset(110); return o != 0 ? __p.bb.GetInt(__p.__vector(o) + j * 4) : (int)0; } - public int EnemyPassiveSkillLevelLength { get { int o = __p.__offset(110); return o != 0 ? __p.__vector_len(o) : 0; } } + public int[] GetAllyPassiveSkillLevelArray() { return __p.__vector_as_array(110); } + public string EnemyPassiveSkillId(int j) { int o = __p.__offset(112); return o != 0 ? __p.__string(__p.__vector(o) + j * 4) : null; } + public int EnemyPassiveSkillIdLength { get { int o = __p.__offset(112); return o != 0 ? __p.__vector_len(o) : 0; } } + public int EnemyPassiveSkillLevel(int j) { int o = __p.__offset(114); return o != 0 ? __p.bb.GetInt(__p.__vector(o) + j * 4) : (int)0; } + public int EnemyPassiveSkillLevelLength { get { int o = __p.__offset(114); return o != 0 ? __p.__vector_len(o) : 0; } } #if ENABLE_SPAN_T - public Span GetEnemyPassiveSkillLevelBytes() { return __p.__vector_as_span(110, 4); } + public Span GetEnemyPassiveSkillLevelBytes() { return __p.__vector_as_span(114, 4); } #else - public ArraySegment? GetEnemyPassiveSkillLevelBytes() { return __p.__vector_as_arraysegment(110); } + public ArraySegment? GetEnemyPassiveSkillLevelBytes() { return __p.__vector_as_arraysegment(114); } #endif - public int[] GetEnemyPassiveSkillLevelArray() { return __p.__vector_as_array(110); } + public int[] GetEnemyPassiveSkillLevelArray() { return __p.__vector_as_array(114); } public static Offset CreateGroundExcel(FlatBufferBuilder builder, long Id = 0, VectorOffset StageFileNameOffset = default(VectorOffset), StringOffset GroundSceneNameOffset = default(StringOffset), long FormationGroupId = 0, - SCHALE.Common.FlatData.StageTopography StageTopography = SCHALE.Common.FlatData.StageTopography.Street, + SCHALE.Common.FlatData.StageTopography StageTopography_ = SCHALE.Common.FlatData.StageTopography.Street, SCHALE.Common.FlatData.BulletType EnemyBulletType = SCHALE.Common.FlatData.BulletType.Normal, SCHALE.Common.FlatData.ArmorType EnemyArmorType = SCHALE.Common.FlatData.ArmorType.LightArmor, long LevelNPC = 0, @@ -157,7 +159,9 @@ public struct GroundExcel : IFlatbufferObject bool UIBattleHideFromScratch = false, StringOffset BattleReadyTimelinePathOffset = default(StringOffset), StringOffset BeforeVictoryTimelinePathOffset = default(StringOffset), + bool SkipBattleEnd = false, bool HideNPCWhenBattleEnd = false, + bool CoverPointOff = false, float UIHpScale = 0.0f, float UIEmojiScale = 0.0f, float UISkillMainLogScale = 0.0f, @@ -165,7 +169,7 @@ public struct GroundExcel : IFlatbufferObject VectorOffset AllyPassiveSkillLevelOffset = default(VectorOffset), VectorOffset EnemyPassiveSkillIdOffset = default(VectorOffset), VectorOffset EnemyPassiveSkillLevelOffset = default(VectorOffset)) { - builder.StartTable(54); + builder.StartTable(56); GroundExcel.AddBGMId(builder, BGMId); GroundExcel.AddTSSAirUnitHeight(builder, TSSAirUnitHeight); GroundExcel.AddEnemyMinimumPositionGapRate(builder, EnemyMinimumPositionGapRate); @@ -209,10 +213,12 @@ public struct GroundExcel : IFlatbufferObject GroundExcel.AddForcedTacticSpeed(builder, ForcedTacticSpeed); GroundExcel.AddEnemyArmorType(builder, EnemyArmorType); GroundExcel.AddEnemyBulletType(builder, EnemyBulletType); - GroundExcel.AddStageTopography(builder, StageTopography); + GroundExcel.AddStageTopography_(builder, StageTopography_); GroundExcel.AddGroundSceneName(builder, GroundSceneNameOffset); GroundExcel.AddStageFileName(builder, StageFileNameOffset); + GroundExcel.AddCoverPointOff(builder, CoverPointOff); GroundExcel.AddHideNPCWhenBattleEnd(builder, HideNPCWhenBattleEnd); + GroundExcel.AddSkipBattleEnd(builder, SkipBattleEnd); GroundExcel.AddUIBattleHideFromScratch(builder, UIBattleHideFromScratch); GroundExcel.AddImmuneHitBeforeTimeOutEnd(builder, ImmuneHitBeforeTimeOutEnd); GroundExcel.AddTSSHatchOpen(builder, TSSHatchOpen); @@ -223,7 +229,7 @@ public struct GroundExcel : IFlatbufferObject return GroundExcel.EndGroundExcel(builder); } - public static void StartGroundExcel(FlatBufferBuilder builder) { builder.StartTable(54); } + public static void StartGroundExcel(FlatBufferBuilder builder) { builder.StartTable(56); } public static void AddId(FlatBufferBuilder builder, long id) { builder.AddLong(0, id, 0); } public static void AddStageFileName(FlatBufferBuilder builder, VectorOffset stageFileNameOffset) { builder.AddOffset(1, stageFileNameOffset.Value, 0); } public static VectorOffset CreateStageFileNameVector(FlatBufferBuilder builder, StringOffset[] data) { builder.StartVector(4, data.Length, 4); for (int i = data.Length - 1; i >= 0; i--) builder.AddOffset(data[i].Value); return builder.EndVector(); } @@ -233,7 +239,7 @@ public struct GroundExcel : IFlatbufferObject public static void StartStageFileNameVector(FlatBufferBuilder builder, int numElems) { builder.StartVector(4, numElems, 4); } public static void AddGroundSceneName(FlatBufferBuilder builder, StringOffset groundSceneNameOffset) { builder.AddOffset(2, groundSceneNameOffset.Value, 0); } public static void AddFormationGroupId(FlatBufferBuilder builder, long formationGroupId) { builder.AddLong(3, formationGroupId, 0); } - public static void AddStageTopography(FlatBufferBuilder builder, SCHALE.Common.FlatData.StageTopography stageTopography) { builder.AddInt(4, (int)stageTopography, 0); } + public static void AddStageTopography_(FlatBufferBuilder builder, SCHALE.Common.FlatData.StageTopography stageTopography_) { builder.AddInt(4, (int)stageTopography_, 0); } public static void AddEnemyBulletType(FlatBufferBuilder builder, SCHALE.Common.FlatData.BulletType enemyBulletType) { builder.AddInt(5, (int)enemyBulletType, 0); } public static void AddEnemyArmorType(FlatBufferBuilder builder, SCHALE.Common.FlatData.ArmorType enemyArmorType) { builder.AddInt(6, (int)enemyArmorType, 0); } public static void AddLevelNPC(FlatBufferBuilder builder, long levelNPC) { builder.AddLong(7, levelNPC, 0); } @@ -275,29 +281,31 @@ public struct GroundExcel : IFlatbufferObject public static void AddUIBattleHideFromScratch(FlatBufferBuilder builder, bool uIBattleHideFromScratch) { builder.AddBool(43, uIBattleHideFromScratch, false); } public static void AddBattleReadyTimelinePath(FlatBufferBuilder builder, StringOffset battleReadyTimelinePathOffset) { builder.AddOffset(44, battleReadyTimelinePathOffset.Value, 0); } public static void AddBeforeVictoryTimelinePath(FlatBufferBuilder builder, StringOffset beforeVictoryTimelinePathOffset) { builder.AddOffset(45, beforeVictoryTimelinePathOffset.Value, 0); } - public static void AddHideNPCWhenBattleEnd(FlatBufferBuilder builder, bool hideNPCWhenBattleEnd) { builder.AddBool(46, hideNPCWhenBattleEnd, false); } - public static void AddUIHpScale(FlatBufferBuilder builder, float uIHpScale) { builder.AddFloat(47, uIHpScale, 0.0f); } - public static void AddUIEmojiScale(FlatBufferBuilder builder, float uIEmojiScale) { builder.AddFloat(48, uIEmojiScale, 0.0f); } - public static void AddUISkillMainLogScale(FlatBufferBuilder builder, float uISkillMainLogScale) { builder.AddFloat(49, uISkillMainLogScale, 0.0f); } - public static void AddAllyPassiveSkillId(FlatBufferBuilder builder, VectorOffset allyPassiveSkillIdOffset) { builder.AddOffset(50, allyPassiveSkillIdOffset.Value, 0); } + public static void AddSkipBattleEnd(FlatBufferBuilder builder, bool skipBattleEnd) { builder.AddBool(46, skipBattleEnd, false); } + public static void AddHideNPCWhenBattleEnd(FlatBufferBuilder builder, bool hideNPCWhenBattleEnd) { builder.AddBool(47, hideNPCWhenBattleEnd, false); } + public static void AddCoverPointOff(FlatBufferBuilder builder, bool coverPointOff) { builder.AddBool(48, coverPointOff, false); } + public static void AddUIHpScale(FlatBufferBuilder builder, float uIHpScale) { builder.AddFloat(49, uIHpScale, 0.0f); } + public static void AddUIEmojiScale(FlatBufferBuilder builder, float uIEmojiScale) { builder.AddFloat(50, uIEmojiScale, 0.0f); } + public static void AddUISkillMainLogScale(FlatBufferBuilder builder, float uISkillMainLogScale) { builder.AddFloat(51, uISkillMainLogScale, 0.0f); } + public static void AddAllyPassiveSkillId(FlatBufferBuilder builder, VectorOffset allyPassiveSkillIdOffset) { builder.AddOffset(52, allyPassiveSkillIdOffset.Value, 0); } public static VectorOffset CreateAllyPassiveSkillIdVector(FlatBufferBuilder builder, StringOffset[] data) { builder.StartVector(4, data.Length, 4); for (int i = data.Length - 1; i >= 0; i--) builder.AddOffset(data[i].Value); return builder.EndVector(); } public static VectorOffset CreateAllyPassiveSkillIdVectorBlock(FlatBufferBuilder builder, StringOffset[] data) { builder.StartVector(4, data.Length, 4); builder.Add(data); return builder.EndVector(); } public static VectorOffset CreateAllyPassiveSkillIdVectorBlock(FlatBufferBuilder builder, ArraySegment data) { builder.StartVector(4, data.Count, 4); builder.Add(data); return builder.EndVector(); } public static VectorOffset CreateAllyPassiveSkillIdVectorBlock(FlatBufferBuilder builder, IntPtr dataPtr, int sizeInBytes) { builder.StartVector(1, sizeInBytes, 1); builder.Add(dataPtr, sizeInBytes); return builder.EndVector(); } public static void StartAllyPassiveSkillIdVector(FlatBufferBuilder builder, int numElems) { builder.StartVector(4, numElems, 4); } - public static void AddAllyPassiveSkillLevel(FlatBufferBuilder builder, VectorOffset allyPassiveSkillLevelOffset) { builder.AddOffset(51, allyPassiveSkillLevelOffset.Value, 0); } + public static void AddAllyPassiveSkillLevel(FlatBufferBuilder builder, VectorOffset allyPassiveSkillLevelOffset) { builder.AddOffset(53, allyPassiveSkillLevelOffset.Value, 0); } public static VectorOffset CreateAllyPassiveSkillLevelVector(FlatBufferBuilder builder, int[] data) { builder.StartVector(4, data.Length, 4); for (int i = data.Length - 1; i >= 0; i--) builder.AddInt(data[i]); return builder.EndVector(); } public static VectorOffset CreateAllyPassiveSkillLevelVectorBlock(FlatBufferBuilder builder, int[] data) { builder.StartVector(4, data.Length, 4); builder.Add(data); return builder.EndVector(); } public static VectorOffset CreateAllyPassiveSkillLevelVectorBlock(FlatBufferBuilder builder, ArraySegment data) { builder.StartVector(4, data.Count, 4); builder.Add(data); return builder.EndVector(); } public static VectorOffset CreateAllyPassiveSkillLevelVectorBlock(FlatBufferBuilder builder, IntPtr dataPtr, int sizeInBytes) { builder.StartVector(1, sizeInBytes, 1); builder.Add(dataPtr, sizeInBytes); return builder.EndVector(); } public static void StartAllyPassiveSkillLevelVector(FlatBufferBuilder builder, int numElems) { builder.StartVector(4, numElems, 4); } - public static void AddEnemyPassiveSkillId(FlatBufferBuilder builder, VectorOffset enemyPassiveSkillIdOffset) { builder.AddOffset(52, enemyPassiveSkillIdOffset.Value, 0); } + public static void AddEnemyPassiveSkillId(FlatBufferBuilder builder, VectorOffset enemyPassiveSkillIdOffset) { builder.AddOffset(54, enemyPassiveSkillIdOffset.Value, 0); } public static VectorOffset CreateEnemyPassiveSkillIdVector(FlatBufferBuilder builder, StringOffset[] data) { builder.StartVector(4, data.Length, 4); for (int i = data.Length - 1; i >= 0; i--) builder.AddOffset(data[i].Value); return builder.EndVector(); } public static VectorOffset CreateEnemyPassiveSkillIdVectorBlock(FlatBufferBuilder builder, StringOffset[] data) { builder.StartVector(4, data.Length, 4); builder.Add(data); return builder.EndVector(); } public static VectorOffset CreateEnemyPassiveSkillIdVectorBlock(FlatBufferBuilder builder, ArraySegment data) { builder.StartVector(4, data.Count, 4); builder.Add(data); return builder.EndVector(); } public static VectorOffset CreateEnemyPassiveSkillIdVectorBlock(FlatBufferBuilder builder, IntPtr dataPtr, int sizeInBytes) { builder.StartVector(1, sizeInBytes, 1); builder.Add(dataPtr, sizeInBytes); return builder.EndVector(); } public static void StartEnemyPassiveSkillIdVector(FlatBufferBuilder builder, int numElems) { builder.StartVector(4, numElems, 4); } - public static void AddEnemyPassiveSkillLevel(FlatBufferBuilder builder, VectorOffset enemyPassiveSkillLevelOffset) { builder.AddOffset(53, enemyPassiveSkillLevelOffset.Value, 0); } + public static void AddEnemyPassiveSkillLevel(FlatBufferBuilder builder, VectorOffset enemyPassiveSkillLevelOffset) { builder.AddOffset(55, enemyPassiveSkillLevelOffset.Value, 0); } public static VectorOffset CreateEnemyPassiveSkillLevelVector(FlatBufferBuilder builder, int[] data) { builder.StartVector(4, data.Length, 4); for (int i = data.Length - 1; i >= 0; i--) builder.AddInt(data[i]); return builder.EndVector(); } public static VectorOffset CreateEnemyPassiveSkillLevelVectorBlock(FlatBufferBuilder builder, int[] data) { builder.StartVector(4, data.Length, 4); builder.Add(data); return builder.EndVector(); } public static VectorOffset CreateEnemyPassiveSkillLevelVectorBlock(FlatBufferBuilder builder, ArraySegment data) { builder.StartVector(4, data.Count, 4); builder.Add(data); return builder.EndVector(); } @@ -319,7 +327,7 @@ public struct GroundExcel : IFlatbufferObject for (var _j = 0; _j < this.StageFileNameLength; ++_j) {_o.StageFileName.Add(TableEncryptionService.Convert(this.StageFileName(_j), key));} _o.GroundSceneName = TableEncryptionService.Convert(this.GroundSceneName, key); _o.FormationGroupId = TableEncryptionService.Convert(this.FormationGroupId, key); - _o.StageTopography = TableEncryptionService.Convert(this.StageTopography, key); + _o.StageTopography_ = TableEncryptionService.Convert(this.StageTopography_, key); _o.EnemyBulletType = TableEncryptionService.Convert(this.EnemyBulletType, key); _o.EnemyArmorType = TableEncryptionService.Convert(this.EnemyArmorType, key); _o.LevelNPC = TableEncryptionService.Convert(this.LevelNPC, key); @@ -361,7 +369,9 @@ public struct GroundExcel : IFlatbufferObject _o.UIBattleHideFromScratch = TableEncryptionService.Convert(this.UIBattleHideFromScratch, key); _o.BattleReadyTimelinePath = TableEncryptionService.Convert(this.BattleReadyTimelinePath, key); _o.BeforeVictoryTimelinePath = TableEncryptionService.Convert(this.BeforeVictoryTimelinePath, key); + _o.SkipBattleEnd = TableEncryptionService.Convert(this.SkipBattleEnd, key); _o.HideNPCWhenBattleEnd = TableEncryptionService.Convert(this.HideNPCWhenBattleEnd, key); + _o.CoverPointOff = TableEncryptionService.Convert(this.CoverPointOff, key); _o.UIHpScale = TableEncryptionService.Convert(this.UIHpScale, key); _o.UIEmojiScale = TableEncryptionService.Convert(this.UIEmojiScale, key); _o.UISkillMainLogScale = TableEncryptionService.Convert(this.UISkillMainLogScale, key); @@ -413,7 +423,7 @@ public struct GroundExcel : IFlatbufferObject _StageFileName, _GroundSceneName, _o.FormationGroupId, - _o.StageTopography, + _o.StageTopography_, _o.EnemyBulletType, _o.EnemyArmorType, _o.LevelNPC, @@ -455,7 +465,9 @@ public struct GroundExcel : IFlatbufferObject _o.UIBattleHideFromScratch, _BattleReadyTimelinePath, _BeforeVictoryTimelinePath, + _o.SkipBattleEnd, _o.HideNPCWhenBattleEnd, + _o.CoverPointOff, _o.UIHpScale, _o.UIEmojiScale, _o.UISkillMainLogScale, @@ -472,7 +484,7 @@ public class GroundExcelT public List StageFileName { get; set; } public string GroundSceneName { get; set; } public long FormationGroupId { get; set; } - public SCHALE.Common.FlatData.StageTopography StageTopography { get; set; } + public SCHALE.Common.FlatData.StageTopography StageTopography_ { get; set; } public SCHALE.Common.FlatData.BulletType EnemyBulletType { get; set; } public SCHALE.Common.FlatData.ArmorType EnemyArmorType { get; set; } public long LevelNPC { get; set; } @@ -514,7 +526,9 @@ public class GroundExcelT public bool UIBattleHideFromScratch { get; set; } public string BattleReadyTimelinePath { get; set; } public string BeforeVictoryTimelinePath { get; set; } + public bool SkipBattleEnd { get; set; } public bool HideNPCWhenBattleEnd { get; set; } + public bool CoverPointOff { get; set; } public float UIHpScale { get; set; } public float UIEmojiScale { get; set; } public float UISkillMainLogScale { get; set; } @@ -528,7 +542,7 @@ public class GroundExcelT this.StageFileName = null; this.GroundSceneName = null; this.FormationGroupId = 0; - this.StageTopography = SCHALE.Common.FlatData.StageTopography.Street; + this.StageTopography_ = SCHALE.Common.FlatData.StageTopography.Street; this.EnemyBulletType = SCHALE.Common.FlatData.BulletType.Normal; this.EnemyArmorType = SCHALE.Common.FlatData.ArmorType.LightArmor; this.LevelNPC = 0; @@ -570,7 +584,9 @@ public class GroundExcelT this.UIBattleHideFromScratch = false; this.BattleReadyTimelinePath = null; this.BeforeVictoryTimelinePath = null; + this.SkipBattleEnd = false; this.HideNPCWhenBattleEnd = false; + this.CoverPointOff = false; this.UIHpScale = 0.0f; this.UIEmojiScale = 0.0f; this.UISkillMainLogScale = 0.0f; @@ -591,7 +607,7 @@ static public class GroundExcelVerify && verifier.VerifyVectorOfStrings(tablePos, 6 /*StageFileName*/, false) && verifier.VerifyString(tablePos, 8 /*GroundSceneName*/, false) && verifier.VerifyField(tablePos, 10 /*FormationGroupId*/, 8 /*long*/, 8, false) - && verifier.VerifyField(tablePos, 12 /*StageTopography*/, 4 /*SCHALE.Common.FlatData.StageTopography*/, 4, false) + && verifier.VerifyField(tablePos, 12 /*StageTopography_*/, 4 /*SCHALE.Common.FlatData.StageTopography*/, 4, false) && verifier.VerifyField(tablePos, 14 /*EnemyBulletType*/, 4 /*SCHALE.Common.FlatData.BulletType*/, 4, false) && verifier.VerifyField(tablePos, 16 /*EnemyArmorType*/, 4 /*SCHALE.Common.FlatData.ArmorType*/, 4, false) && verifier.VerifyField(tablePos, 18 /*LevelNPC*/, 8 /*long*/, 8, false) @@ -633,14 +649,16 @@ static public class GroundExcelVerify && verifier.VerifyField(tablePos, 90 /*UIBattleHideFromScratch*/, 1 /*bool*/, 1, false) && verifier.VerifyString(tablePos, 92 /*BattleReadyTimelinePath*/, false) && verifier.VerifyString(tablePos, 94 /*BeforeVictoryTimelinePath*/, false) - && verifier.VerifyField(tablePos, 96 /*HideNPCWhenBattleEnd*/, 1 /*bool*/, 1, false) - && verifier.VerifyField(tablePos, 98 /*UIHpScale*/, 4 /*float*/, 4, false) - && verifier.VerifyField(tablePos, 100 /*UIEmojiScale*/, 4 /*float*/, 4, false) - && verifier.VerifyField(tablePos, 102 /*UISkillMainLogScale*/, 4 /*float*/, 4, false) - && verifier.VerifyVectorOfStrings(tablePos, 104 /*AllyPassiveSkillId*/, false) - && verifier.VerifyVectorOfData(tablePos, 106 /*AllyPassiveSkillLevel*/, 4 /*int*/, false) - && verifier.VerifyVectorOfStrings(tablePos, 108 /*EnemyPassiveSkillId*/, false) - && verifier.VerifyVectorOfData(tablePos, 110 /*EnemyPassiveSkillLevel*/, 4 /*int*/, false) + && verifier.VerifyField(tablePos, 96 /*SkipBattleEnd*/, 1 /*bool*/, 1, false) + && verifier.VerifyField(tablePos, 98 /*HideNPCWhenBattleEnd*/, 1 /*bool*/, 1, false) + && verifier.VerifyField(tablePos, 100 /*CoverPointOff*/, 1 /*bool*/, 1, false) + && verifier.VerifyField(tablePos, 102 /*UIHpScale*/, 4 /*float*/, 4, false) + && verifier.VerifyField(tablePos, 104 /*UIEmojiScale*/, 4 /*float*/, 4, false) + && verifier.VerifyField(tablePos, 106 /*UISkillMainLogScale*/, 4 /*float*/, 4, false) + && verifier.VerifyVectorOfStrings(tablePos, 108 /*AllyPassiveSkillId*/, false) + && verifier.VerifyVectorOfData(tablePos, 110 /*AllyPassiveSkillLevel*/, 4 /*int*/, false) + && verifier.VerifyVectorOfStrings(tablePos, 112 /*EnemyPassiveSkillId*/, false) + && verifier.VerifyVectorOfData(tablePos, 114 /*EnemyPassiveSkillLevel*/, 4 /*int*/, false) && verifier.VerifyTableEnd(tablePos); } } diff --git a/SCHALE.Common/FlatData/IdCardBackgroundExcel.cs b/SCHALE.Common/FlatData/IdCardBackgroundExcel.cs index ffb101d..f27eabd 100644 --- a/SCHALE.Common/FlatData/IdCardBackgroundExcel.cs +++ b/SCHALE.Common/FlatData/IdCardBackgroundExcel.cs @@ -21,7 +21,7 @@ public struct IdCardBackgroundExcel : IFlatbufferObject public IdCardBackgroundExcel __assign(int _i, ByteBuffer _bb) { __init(_i, _bb); return this; } public long Id { get { int o = __p.__offset(4); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } - public SCHALE.Common.FlatData.Rarity Rarity { get { int o = __p.__offset(6); return o != 0 ? (SCHALE.Common.FlatData.Rarity)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.Rarity.N; } } + public SCHALE.Common.FlatData.Rarity Rarity_ { get { int o = __p.__offset(6); return o != 0 ? (SCHALE.Common.FlatData.Rarity)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.Rarity.N; } } public long DisplayOrder { get { int o = __p.__offset(8); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public bool CollectionVisible { get { int o = __p.__offset(10); return o != 0 ? 0!=__p.bb.Get(o + __p.bb_pos) : (bool)false; } } public bool IsDefault { get { int o = __p.__offset(12); return o != 0 ? 0!=__p.bb.Get(o + __p.bb_pos) : (bool)false; } } @@ -43,7 +43,7 @@ public struct IdCardBackgroundExcel : IFlatbufferObject public static Offset CreateIdCardBackgroundExcel(FlatBufferBuilder builder, long Id = 0, - SCHALE.Common.FlatData.Rarity Rarity = SCHALE.Common.FlatData.Rarity.N, + SCHALE.Common.FlatData.Rarity Rarity_ = SCHALE.Common.FlatData.Rarity.N, long DisplayOrder = 0, bool CollectionVisible = false, bool IsDefault = false, @@ -56,7 +56,7 @@ public struct IdCardBackgroundExcel : IFlatbufferObject IdCardBackgroundExcel.AddIcon(builder, IconOffset); IdCardBackgroundExcel.AddLocalizeEtcId(builder, LocalizeEtcId); IdCardBackgroundExcel.AddBgPath(builder, BgPathOffset); - IdCardBackgroundExcel.AddRarity(builder, Rarity); + IdCardBackgroundExcel.AddRarity_(builder, Rarity_); IdCardBackgroundExcel.AddIsDefault(builder, IsDefault); IdCardBackgroundExcel.AddCollectionVisible(builder, CollectionVisible); return IdCardBackgroundExcel.EndIdCardBackgroundExcel(builder); @@ -64,7 +64,7 @@ public struct IdCardBackgroundExcel : IFlatbufferObject public static void StartIdCardBackgroundExcel(FlatBufferBuilder builder) { builder.StartTable(8); } public static void AddId(FlatBufferBuilder builder, long id) { builder.AddLong(0, id, 0); } - public static void AddRarity(FlatBufferBuilder builder, SCHALE.Common.FlatData.Rarity rarity) { builder.AddInt(1, (int)rarity, 0); } + public static void AddRarity_(FlatBufferBuilder builder, SCHALE.Common.FlatData.Rarity rarity_) { builder.AddInt(1, (int)rarity_, 0); } public static void AddDisplayOrder(FlatBufferBuilder builder, long displayOrder) { builder.AddLong(2, displayOrder, 0); } public static void AddCollectionVisible(FlatBufferBuilder builder, bool collectionVisible) { builder.AddBool(3, collectionVisible, false); } public static void AddIsDefault(FlatBufferBuilder builder, bool isDefault) { builder.AddBool(4, isDefault, false); } @@ -83,7 +83,7 @@ public struct IdCardBackgroundExcel : IFlatbufferObject public void UnPackTo(IdCardBackgroundExcelT _o) { byte[] key = TableEncryptionService.CreateKey("IdCardBackground"); _o.Id = TableEncryptionService.Convert(this.Id, key); - _o.Rarity = TableEncryptionService.Convert(this.Rarity, key); + _o.Rarity_ = TableEncryptionService.Convert(this.Rarity_, key); _o.DisplayOrder = TableEncryptionService.Convert(this.DisplayOrder, key); _o.CollectionVisible = TableEncryptionService.Convert(this.CollectionVisible, key); _o.IsDefault = TableEncryptionService.Convert(this.IsDefault, key); @@ -98,7 +98,7 @@ public struct IdCardBackgroundExcel : IFlatbufferObject return CreateIdCardBackgroundExcel( builder, _o.Id, - _o.Rarity, + _o.Rarity_, _o.DisplayOrder, _o.CollectionVisible, _o.IsDefault, @@ -111,7 +111,7 @@ public struct IdCardBackgroundExcel : IFlatbufferObject public class IdCardBackgroundExcelT { public long Id { get; set; } - public SCHALE.Common.FlatData.Rarity Rarity { get; set; } + public SCHALE.Common.FlatData.Rarity Rarity_ { get; set; } public long DisplayOrder { get; set; } public bool CollectionVisible { get; set; } public bool IsDefault { get; set; } @@ -121,7 +121,7 @@ public class IdCardBackgroundExcelT public IdCardBackgroundExcelT() { this.Id = 0; - this.Rarity = SCHALE.Common.FlatData.Rarity.N; + this.Rarity_ = SCHALE.Common.FlatData.Rarity.N; this.DisplayOrder = 0; this.CollectionVisible = false; this.IsDefault = false; @@ -138,7 +138,7 @@ static public class IdCardBackgroundExcelVerify { return verifier.VerifyTableStart(tablePos) && verifier.VerifyField(tablePos, 4 /*Id*/, 8 /*long*/, 8, false) - && verifier.VerifyField(tablePos, 6 /*Rarity*/, 4 /*SCHALE.Common.FlatData.Rarity*/, 4, false) + && verifier.VerifyField(tablePos, 6 /*Rarity_*/, 4 /*SCHALE.Common.FlatData.Rarity*/, 4, false) && verifier.VerifyField(tablePos, 8 /*DisplayOrder*/, 8 /*long*/, 8, false) && verifier.VerifyField(tablePos, 10 /*CollectionVisible*/, 1 /*bool*/, 1, false) && verifier.VerifyField(tablePos, 12 /*IsDefault*/, 1 /*bool*/, 1, false) diff --git a/SCHALE.Common/FlatData/IdCardBackgroundExcelTable.cs b/SCHALE.Common/FlatData/IdCardBackgroundExcelTable.cs deleted file mode 100644 index e3b4ae6..0000000 --- a/SCHALE.Common/FlatData/IdCardBackgroundExcelTable.cs +++ /dev/null @@ -1,88 +0,0 @@ -// -// automatically generated by the FlatBuffers compiler, do not modify -// - -namespace SCHALE.Common.FlatData -{ - -using global::System; -using global::System.Collections.Generic; -using global::SCHALE.Common.Crypto; -using global::Google.FlatBuffers; - -public struct IdCardBackgroundExcelTable : IFlatbufferObject -{ - private Table __p; - public ByteBuffer ByteBuffer { get { return __p.bb; } } - public static void ValidateVersion() { FlatBufferConstants.FLATBUFFERS_24_3_25(); } - public static IdCardBackgroundExcelTable GetRootAsIdCardBackgroundExcelTable(ByteBuffer _bb) { return GetRootAsIdCardBackgroundExcelTable(_bb, new IdCardBackgroundExcelTable()); } - public static IdCardBackgroundExcelTable GetRootAsIdCardBackgroundExcelTable(ByteBuffer _bb, IdCardBackgroundExcelTable obj) { return (obj.__assign(_bb.GetInt(_bb.Position) + _bb.Position, _bb)); } - public void __init(int _i, ByteBuffer _bb) { __p = new Table(_i, _bb); } - public IdCardBackgroundExcelTable __assign(int _i, ByteBuffer _bb) { __init(_i, _bb); return this; } - - public SCHALE.Common.FlatData.IdCardBackgroundExcel? DataList(int j) { int o = __p.__offset(4); return o != 0 ? (SCHALE.Common.FlatData.IdCardBackgroundExcel?)(new SCHALE.Common.FlatData.IdCardBackgroundExcel()).__assign(__p.__indirect(__p.__vector(o) + j * 4), __p.bb) : null; } - public int DataListLength { get { int o = __p.__offset(4); return o != 0 ? __p.__vector_len(o) : 0; } } - - public static Offset CreateIdCardBackgroundExcelTable(FlatBufferBuilder builder, - VectorOffset DataListOffset = default(VectorOffset)) { - builder.StartTable(1); - IdCardBackgroundExcelTable.AddDataList(builder, DataListOffset); - return IdCardBackgroundExcelTable.EndIdCardBackgroundExcelTable(builder); - } - - public static void StartIdCardBackgroundExcelTable(FlatBufferBuilder builder) { builder.StartTable(1); } - public static void AddDataList(FlatBufferBuilder builder, VectorOffset dataListOffset) { builder.AddOffset(0, dataListOffset.Value, 0); } - public static VectorOffset CreateDataListVector(FlatBufferBuilder builder, Offset[] data) { builder.StartVector(4, data.Length, 4); for (int i = data.Length - 1; i >= 0; i--) builder.AddOffset(data[i].Value); return builder.EndVector(); } - public static VectorOffset CreateDataListVectorBlock(FlatBufferBuilder builder, Offset[] data) { builder.StartVector(4, data.Length, 4); builder.Add(data); return builder.EndVector(); } - public static VectorOffset CreateDataListVectorBlock(FlatBufferBuilder builder, ArraySegment> data) { builder.StartVector(4, data.Count, 4); builder.Add(data); return builder.EndVector(); } - public static VectorOffset CreateDataListVectorBlock(FlatBufferBuilder builder, IntPtr dataPtr, int sizeInBytes) { builder.StartVector(1, sizeInBytes, 1); builder.Add>(dataPtr, sizeInBytes); return builder.EndVector(); } - public static void StartDataListVector(FlatBufferBuilder builder, int numElems) { builder.StartVector(4, numElems, 4); } - public static Offset EndIdCardBackgroundExcelTable(FlatBufferBuilder builder) { - int o = builder.EndTable(); - return new Offset(o); - } - public IdCardBackgroundExcelTableT UnPack() { - var _o = new IdCardBackgroundExcelTableT(); - this.UnPackTo(_o); - return _o; - } - public void UnPackTo(IdCardBackgroundExcelTableT _o) { - byte[] key = TableEncryptionService.CreateKey("IdCardBackgroundExcel"); - _o.DataList = new List(); - for (var _j = 0; _j < this.DataListLength; ++_j) {_o.DataList.Add(this.DataList(_j).HasValue ? this.DataList(_j).Value.UnPack() : null);} - } - public static Offset Pack(FlatBufferBuilder builder, IdCardBackgroundExcelTableT _o) { - if (_o == null) return default(Offset); - var _DataList = default(VectorOffset); - if (_o.DataList != null) { - var __DataList = new Offset[_o.DataList.Count]; - for (var _j = 0; _j < __DataList.Length; ++_j) { __DataList[_j] = SCHALE.Common.FlatData.IdCardBackgroundExcel.Pack(builder, _o.DataList[_j]); } - _DataList = CreateDataListVector(builder, __DataList); - } - return CreateIdCardBackgroundExcelTable( - builder, - _DataList); - } -} - -public class IdCardBackgroundExcelTableT -{ - public List DataList { get; set; } - - public IdCardBackgroundExcelTableT() { - this.DataList = null; - } -} - - -static public class IdCardBackgroundExcelTableVerify -{ - static public bool Verify(Google.FlatBuffers.Verifier verifier, uint tablePos) - { - return verifier.VerifyTableStart(tablePos) - && verifier.VerifyVectorOfTables(tablePos, 4 /*DataList*/, SCHALE.Common.FlatData.IdCardBackgroundExcelVerify.Verify, false) - && verifier.VerifyTableEnd(tablePos); - } -} - -} diff --git a/SCHALE.Common/FlatData/ItemExcel.cs b/SCHALE.Common/FlatData/ItemExcel.cs index f9da83e..5625b9b 100644 --- a/SCHALE.Common/FlatData/ItemExcel.cs +++ b/SCHALE.Common/FlatData/ItemExcel.cs @@ -22,10 +22,10 @@ public struct ItemExcel : IFlatbufferObject public long Id { get { int o = __p.__offset(4); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public long GroupId { get { int o = __p.__offset(6); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } - public SCHALE.Common.FlatData.Rarity Rarity { get { int o = __p.__offset(8); return o != 0 ? (SCHALE.Common.FlatData.Rarity)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.Rarity.N; } } - public SCHALE.Common.FlatData.ProductionStep ProductionStep { get { int o = __p.__offset(10); return o != 0 ? (SCHALE.Common.FlatData.ProductionStep)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.ProductionStep.ToDo; } } + public SCHALE.Common.FlatData.Rarity Rarity_ { get { int o = __p.__offset(8); return o != 0 ? (SCHALE.Common.FlatData.Rarity)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.Rarity.N; } } + public SCHALE.Common.FlatData.ProductionStep ProductionStep_ { get { int o = __p.__offset(10); return o != 0 ? (SCHALE.Common.FlatData.ProductionStep)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.ProductionStep.ToDo; } } public uint LocalizeEtcId { get { int o = __p.__offset(12); return o != 0 ? __p.bb.GetUint(o + __p.bb_pos) : (uint)0; } } - public SCHALE.Common.FlatData.ItemCategory ItemCategory { get { int o = __p.__offset(14); return o != 0 ? (SCHALE.Common.FlatData.ItemCategory)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.ItemCategory.Coin; } } + public SCHALE.Common.FlatData.ItemCategory ItemCategory_ { get { int o = __p.__offset(14); return o != 0 ? (SCHALE.Common.FlatData.ItemCategory)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.ItemCategory.Coin; } } public long Quality { get { int o = __p.__offset(16); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public string Icon { get { int o = __p.__offset(18); return o != 0 ? __p.__string(o + __p.bb_pos) : null; } } #if ENABLE_SPAN_T @@ -47,7 +47,7 @@ public struct ItemExcel : IFlatbufferObject public SCHALE.Common.FlatData.ParcelType UsingResultParcelType { get { int o = __p.__offset(28); return o != 0 ? (SCHALE.Common.FlatData.ParcelType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.ParcelType.None; } } public long UsingResultId { get { int o = __p.__offset(30); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public long UsingResultAmount { get { int o = __p.__offset(32); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } - public SCHALE.Common.FlatData.MailType MailType { get { int o = __p.__offset(34); return o != 0 ? (SCHALE.Common.FlatData.MailType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.MailType.System; } } + public SCHALE.Common.FlatData.MailType MailType_ { get { int o = __p.__offset(34); return o != 0 ? (SCHALE.Common.FlatData.MailType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.MailType.System; } } public SCHALE.Common.FlatData.ParcelType ExpiryChangeParcelType { get { int o = __p.__offset(36); return o != 0 ? (SCHALE.Common.FlatData.ParcelType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.ParcelType.None; } } public long ExpiryChangeId { get { int o = __p.__offset(38); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public long ExpiryChangeAmount { get { int o = __p.__offset(40); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } @@ -88,10 +88,10 @@ public struct ItemExcel : IFlatbufferObject public static Offset CreateItemExcel(FlatBufferBuilder builder, long Id = 0, long GroupId = 0, - SCHALE.Common.FlatData.Rarity Rarity = SCHALE.Common.FlatData.Rarity.N, - SCHALE.Common.FlatData.ProductionStep ProductionStep = SCHALE.Common.FlatData.ProductionStep.ToDo, + SCHALE.Common.FlatData.Rarity Rarity_ = SCHALE.Common.FlatData.Rarity.N, + SCHALE.Common.FlatData.ProductionStep ProductionStep_ = SCHALE.Common.FlatData.ProductionStep.ToDo, uint LocalizeEtcId = 0, - SCHALE.Common.FlatData.ItemCategory ItemCategory = SCHALE.Common.FlatData.ItemCategory.Coin, + SCHALE.Common.FlatData.ItemCategory ItemCategory_ = SCHALE.Common.FlatData.ItemCategory.Coin, long Quality = 0, StringOffset IconOffset = default(StringOffset), StringOffset SpriteNameOffset = default(StringOffset), @@ -101,7 +101,7 @@ public struct ItemExcel : IFlatbufferObject SCHALE.Common.FlatData.ParcelType UsingResultParcelType = SCHALE.Common.FlatData.ParcelType.None, long UsingResultId = 0, long UsingResultAmount = 0, - SCHALE.Common.FlatData.MailType MailType = SCHALE.Common.FlatData.MailType.System, + SCHALE.Common.FlatData.MailType MailType_ = SCHALE.Common.FlatData.MailType.System, SCHALE.Common.FlatData.ParcelType ExpiryChangeParcelType = SCHALE.Common.FlatData.ParcelType.None, long ExpiryChangeId = 0, long ExpiryChangeAmount = 0, @@ -139,16 +139,16 @@ public struct ItemExcel : IFlatbufferObject ItemExcel.AddMaxGiftTags(builder, MaxGiftTags); ItemExcel.AddTags(builder, TagsOffset); ItemExcel.AddExpiryChangeParcelType(builder, ExpiryChangeParcelType); - ItemExcel.AddMailType(builder, MailType); + ItemExcel.AddMailType_(builder, MailType_); ItemExcel.AddUsingResultParcelType(builder, UsingResultParcelType); ItemExcel.AddStackableFunction(builder, StackableFunction); ItemExcel.AddStackableMax(builder, StackableMax); ItemExcel.AddSpriteName(builder, SpriteNameOffset); ItemExcel.AddIcon(builder, IconOffset); - ItemExcel.AddItemCategory(builder, ItemCategory); + ItemExcel.AddItemCategory_(builder, ItemCategory_); ItemExcel.AddLocalizeEtcId(builder, LocalizeEtcId); - ItemExcel.AddProductionStep(builder, ProductionStep); - ItemExcel.AddRarity(builder, Rarity); + ItemExcel.AddProductionStep_(builder, ProductionStep_); + ItemExcel.AddRarity_(builder, Rarity_); ItemExcel.AddCanTierUpgrade(builder, CanTierUpgrade); ItemExcel.AddImmediateUse(builder, ImmediateUse); return ItemExcel.EndItemExcel(builder); @@ -157,10 +157,10 @@ public struct ItemExcel : IFlatbufferObject public static void StartItemExcel(FlatBufferBuilder builder) { builder.StartTable(32); } public static void AddId(FlatBufferBuilder builder, long id) { builder.AddLong(0, id, 0); } public static void AddGroupId(FlatBufferBuilder builder, long groupId) { builder.AddLong(1, groupId, 0); } - public static void AddRarity(FlatBufferBuilder builder, SCHALE.Common.FlatData.Rarity rarity) { builder.AddInt(2, (int)rarity, 0); } - public static void AddProductionStep(FlatBufferBuilder builder, SCHALE.Common.FlatData.ProductionStep productionStep) { builder.AddInt(3, (int)productionStep, 0); } + public static void AddRarity_(FlatBufferBuilder builder, SCHALE.Common.FlatData.Rarity rarity_) { builder.AddInt(2, (int)rarity_, 0); } + public static void AddProductionStep_(FlatBufferBuilder builder, SCHALE.Common.FlatData.ProductionStep productionStep_) { builder.AddInt(3, (int)productionStep_, 0); } public static void AddLocalizeEtcId(FlatBufferBuilder builder, uint localizeEtcId) { builder.AddUint(4, localizeEtcId, 0); } - public static void AddItemCategory(FlatBufferBuilder builder, SCHALE.Common.FlatData.ItemCategory itemCategory) { builder.AddInt(5, (int)itemCategory, 0); } + public static void AddItemCategory_(FlatBufferBuilder builder, SCHALE.Common.FlatData.ItemCategory itemCategory_) { builder.AddInt(5, (int)itemCategory_, 0); } public static void AddQuality(FlatBufferBuilder builder, long quality) { builder.AddLong(6, quality, 0); } public static void AddIcon(FlatBufferBuilder builder, StringOffset iconOffset) { builder.AddOffset(7, iconOffset.Value, 0); } public static void AddSpriteName(FlatBufferBuilder builder, StringOffset spriteNameOffset) { builder.AddOffset(8, spriteNameOffset.Value, 0); } @@ -170,7 +170,7 @@ public struct ItemExcel : IFlatbufferObject public static void AddUsingResultParcelType(FlatBufferBuilder builder, SCHALE.Common.FlatData.ParcelType usingResultParcelType) { builder.AddInt(12, (int)usingResultParcelType, 0); } public static void AddUsingResultId(FlatBufferBuilder builder, long usingResultId) { builder.AddLong(13, usingResultId, 0); } public static void AddUsingResultAmount(FlatBufferBuilder builder, long usingResultAmount) { builder.AddLong(14, usingResultAmount, 0); } - public static void AddMailType(FlatBufferBuilder builder, SCHALE.Common.FlatData.MailType mailType) { builder.AddInt(15, (int)mailType, 0); } + public static void AddMailType_(FlatBufferBuilder builder, SCHALE.Common.FlatData.MailType mailType_) { builder.AddInt(15, (int)mailType_, 0); } public static void AddExpiryChangeParcelType(FlatBufferBuilder builder, SCHALE.Common.FlatData.ParcelType expiryChangeParcelType) { builder.AddInt(16, (int)expiryChangeParcelType, 0); } public static void AddExpiryChangeId(FlatBufferBuilder builder, long expiryChangeId) { builder.AddLong(17, expiryChangeId, 0); } public static void AddExpiryChangeAmount(FlatBufferBuilder builder, long expiryChangeAmount) { builder.AddLong(18, expiryChangeAmount, 0); } @@ -210,10 +210,10 @@ public struct ItemExcel : IFlatbufferObject byte[] key = TableEncryptionService.CreateKey("Item"); _o.Id = TableEncryptionService.Convert(this.Id, key); _o.GroupId = TableEncryptionService.Convert(this.GroupId, key); - _o.Rarity = TableEncryptionService.Convert(this.Rarity, key); - _o.ProductionStep = TableEncryptionService.Convert(this.ProductionStep, key); + _o.Rarity_ = TableEncryptionService.Convert(this.Rarity_, key); + _o.ProductionStep_ = TableEncryptionService.Convert(this.ProductionStep_, key); _o.LocalizeEtcId = TableEncryptionService.Convert(this.LocalizeEtcId, key); - _o.ItemCategory = TableEncryptionService.Convert(this.ItemCategory, key); + _o.ItemCategory_ = TableEncryptionService.Convert(this.ItemCategory_, key); _o.Quality = TableEncryptionService.Convert(this.Quality, key); _o.Icon = TableEncryptionService.Convert(this.Icon, key); _o.SpriteName = TableEncryptionService.Convert(this.SpriteName, key); @@ -223,7 +223,7 @@ public struct ItemExcel : IFlatbufferObject _o.UsingResultParcelType = TableEncryptionService.Convert(this.UsingResultParcelType, key); _o.UsingResultId = TableEncryptionService.Convert(this.UsingResultId, key); _o.UsingResultAmount = TableEncryptionService.Convert(this.UsingResultAmount, key); - _o.MailType = TableEncryptionService.Convert(this.MailType, key); + _o.MailType_ = TableEncryptionService.Convert(this.MailType_, key); _o.ExpiryChangeParcelType = TableEncryptionService.Convert(this.ExpiryChangeParcelType, key); _o.ExpiryChangeId = TableEncryptionService.Convert(this.ExpiryChangeId, key); _o.ExpiryChangeAmount = TableEncryptionService.Convert(this.ExpiryChangeAmount, key); @@ -262,10 +262,10 @@ public struct ItemExcel : IFlatbufferObject builder, _o.Id, _o.GroupId, - _o.Rarity, - _o.ProductionStep, + _o.Rarity_, + _o.ProductionStep_, _o.LocalizeEtcId, - _o.ItemCategory, + _o.ItemCategory_, _o.Quality, _Icon, _SpriteName, @@ -275,7 +275,7 @@ public struct ItemExcel : IFlatbufferObject _o.UsingResultParcelType, _o.UsingResultId, _o.UsingResultAmount, - _o.MailType, + _o.MailType_, _o.ExpiryChangeParcelType, _o.ExpiryChangeId, _o.ExpiryChangeAmount, @@ -299,10 +299,10 @@ public class ItemExcelT { public long Id { get; set; } public long GroupId { get; set; } - public SCHALE.Common.FlatData.Rarity Rarity { get; set; } - public SCHALE.Common.FlatData.ProductionStep ProductionStep { get; set; } + public SCHALE.Common.FlatData.Rarity Rarity_ { get; set; } + public SCHALE.Common.FlatData.ProductionStep ProductionStep_ { get; set; } public uint LocalizeEtcId { get; set; } - public SCHALE.Common.FlatData.ItemCategory ItemCategory { get; set; } + public SCHALE.Common.FlatData.ItemCategory ItemCategory_ { get; set; } public long Quality { get; set; } public string Icon { get; set; } public string SpriteName { get; set; } @@ -312,7 +312,7 @@ public class ItemExcelT public SCHALE.Common.FlatData.ParcelType UsingResultParcelType { get; set; } public long UsingResultId { get; set; } public long UsingResultAmount { get; set; } - public SCHALE.Common.FlatData.MailType MailType { get; set; } + public SCHALE.Common.FlatData.MailType MailType_ { get; set; } public SCHALE.Common.FlatData.ParcelType ExpiryChangeParcelType { get; set; } public long ExpiryChangeId { get; set; } public long ExpiryChangeAmount { get; set; } @@ -333,10 +333,10 @@ public class ItemExcelT public ItemExcelT() { this.Id = 0; this.GroupId = 0; - this.Rarity = SCHALE.Common.FlatData.Rarity.N; - this.ProductionStep = SCHALE.Common.FlatData.ProductionStep.ToDo; + this.Rarity_ = SCHALE.Common.FlatData.Rarity.N; + this.ProductionStep_ = SCHALE.Common.FlatData.ProductionStep.ToDo; this.LocalizeEtcId = 0; - this.ItemCategory = SCHALE.Common.FlatData.ItemCategory.Coin; + this.ItemCategory_ = SCHALE.Common.FlatData.ItemCategory.Coin; this.Quality = 0; this.Icon = null; this.SpriteName = null; @@ -346,7 +346,7 @@ public class ItemExcelT this.UsingResultParcelType = SCHALE.Common.FlatData.ParcelType.None; this.UsingResultId = 0; this.UsingResultAmount = 0; - this.MailType = SCHALE.Common.FlatData.MailType.System; + this.MailType_ = SCHALE.Common.FlatData.MailType.System; this.ExpiryChangeParcelType = SCHALE.Common.FlatData.ParcelType.None; this.ExpiryChangeId = 0; this.ExpiryChangeAmount = 0; @@ -374,10 +374,10 @@ static public class ItemExcelVerify return verifier.VerifyTableStart(tablePos) && verifier.VerifyField(tablePos, 4 /*Id*/, 8 /*long*/, 8, false) && verifier.VerifyField(tablePos, 6 /*GroupId*/, 8 /*long*/, 8, false) - && verifier.VerifyField(tablePos, 8 /*Rarity*/, 4 /*SCHALE.Common.FlatData.Rarity*/, 4, false) - && verifier.VerifyField(tablePos, 10 /*ProductionStep*/, 4 /*SCHALE.Common.FlatData.ProductionStep*/, 4, false) + && verifier.VerifyField(tablePos, 8 /*Rarity_*/, 4 /*SCHALE.Common.FlatData.Rarity*/, 4, false) + && verifier.VerifyField(tablePos, 10 /*ProductionStep_*/, 4 /*SCHALE.Common.FlatData.ProductionStep*/, 4, false) && verifier.VerifyField(tablePos, 12 /*LocalizeEtcId*/, 4 /*uint*/, 4, false) - && verifier.VerifyField(tablePos, 14 /*ItemCategory*/, 4 /*SCHALE.Common.FlatData.ItemCategory*/, 4, false) + && verifier.VerifyField(tablePos, 14 /*ItemCategory_*/, 4 /*SCHALE.Common.FlatData.ItemCategory*/, 4, false) && verifier.VerifyField(tablePos, 16 /*Quality*/, 8 /*long*/, 8, false) && verifier.VerifyString(tablePos, 18 /*Icon*/, false) && verifier.VerifyString(tablePos, 20 /*SpriteName*/, false) @@ -387,7 +387,7 @@ static public class ItemExcelVerify && verifier.VerifyField(tablePos, 28 /*UsingResultParcelType*/, 4 /*SCHALE.Common.FlatData.ParcelType*/, 4, false) && verifier.VerifyField(tablePos, 30 /*UsingResultId*/, 8 /*long*/, 8, false) && verifier.VerifyField(tablePos, 32 /*UsingResultAmount*/, 8 /*long*/, 8, false) - && verifier.VerifyField(tablePos, 34 /*MailType*/, 4 /*SCHALE.Common.FlatData.MailType*/, 4, false) + && verifier.VerifyField(tablePos, 34 /*MailType_*/, 4 /*SCHALE.Common.FlatData.MailType*/, 4, false) && verifier.VerifyField(tablePos, 36 /*ExpiryChangeParcelType*/, 4 /*SCHALE.Common.FlatData.ParcelType*/, 4, false) && verifier.VerifyField(tablePos, 38 /*ExpiryChangeId*/, 8 /*long*/, 8, false) && verifier.VerifyField(tablePos, 40 /*ExpiryChangeAmount*/, 8 /*long*/, 8, false) diff --git a/SCHALE.Common/FlatData/LimitedStageExcel.cs b/SCHALE.Common/FlatData/LimitedStageExcel.cs index fd5a698..6be0696 100644 --- a/SCHALE.Common/FlatData/LimitedStageExcel.cs +++ b/SCHALE.Common/FlatData/LimitedStageExcel.cs @@ -29,7 +29,7 @@ public struct LimitedStageExcel : IFlatbufferObject #endif public byte[] GetNameArray() { return __p.__vector_as_array(6); } public long SeasonId { get { int o = __p.__offset(8); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } - public SCHALE.Common.FlatData.StageDifficulty StageDifficulty { get { int o = __p.__offset(10); return o != 0 ? (SCHALE.Common.FlatData.StageDifficulty)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.StageDifficulty.None; } } + public SCHALE.Common.FlatData.StageDifficulty StageDifficulty_ { get { int o = __p.__offset(10); return o != 0 ? (SCHALE.Common.FlatData.StageDifficulty)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.StageDifficulty.None; } } public string StageNumber { get { int o = __p.__offset(12); return o != 0 ? __p.__string(o + __p.bb_pos) : null; } } #if ENABLE_SPAN_T public Span GetStageNumberBytes() { return __p.__vector_as_span(12, 1); } @@ -80,7 +80,7 @@ public struct LimitedStageExcel : IFlatbufferObject public byte[] GetStrategyMapBGArray() { return __p.__vector_as_array(42); } public long StageRewardId { get { int o = __p.__offset(44); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public int MaxTurn { get { int o = __p.__offset(46); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } - public SCHALE.Common.FlatData.StageTopography StageTopography { get { int o = __p.__offset(48); return o != 0 ? (SCHALE.Common.FlatData.StageTopography)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.StageTopography.Street; } } + public SCHALE.Common.FlatData.StageTopography StageTopography_ { get { int o = __p.__offset(48); return o != 0 ? (SCHALE.Common.FlatData.StageTopography)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.StageTopography.Street; } } public int RecommandLevel { get { int o = __p.__offset(50); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } public string BgmId { get { int o = __p.__offset(52); return o != 0 ? __p.__string(o + __p.bb_pos) : null; } } #if ENABLE_SPAN_T @@ -89,9 +89,9 @@ public struct LimitedStageExcel : IFlatbufferObject public ArraySegment? GetBgmIdBytes() { return __p.__vector_as_arraysegment(52); } #endif public byte[] GetBgmIdArray() { return __p.__vector_as_array(52); } - public SCHALE.Common.FlatData.StrategyEnvironment StrategyEnvironment { get { int o = __p.__offset(54); return o != 0 ? (SCHALE.Common.FlatData.StrategyEnvironment)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.StrategyEnvironment.None; } } + public SCHALE.Common.FlatData.StrategyEnvironment StrategyEnvironment_ { get { int o = __p.__offset(54); return o != 0 ? (SCHALE.Common.FlatData.StrategyEnvironment)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.StrategyEnvironment.None; } } public long GroundID { get { int o = __p.__offset(56); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } - public SCHALE.Common.FlatData.ContentType ContentType { get { int o = __p.__offset(58); return o != 0 ? (SCHALE.Common.FlatData.ContentType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.ContentType.None; } } + public SCHALE.Common.FlatData.ContentType ContentType_ { get { int o = __p.__offset(58); return o != 0 ? (SCHALE.Common.FlatData.ContentType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.ContentType.None; } } public long BGMId { get { int o = __p.__offset(60); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public bool InstantClear { get { int o = __p.__offset(62); return o != 0 ? 0!=__p.bb.Get(o + __p.bb_pos) : (bool)false; } } public long BuffContentId { get { int o = __p.__offset(64); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } @@ -101,7 +101,7 @@ public struct LimitedStageExcel : IFlatbufferObject long Id = 0, StringOffset NameOffset = default(StringOffset), long SeasonId = 0, - SCHALE.Common.FlatData.StageDifficulty StageDifficulty = SCHALE.Common.FlatData.StageDifficulty.None, + SCHALE.Common.FlatData.StageDifficulty StageDifficulty_ = SCHALE.Common.FlatData.StageDifficulty.None, StringOffset StageNumberOffset = default(StringOffset), int StageDisplay = 0, long PrevStageId = 0, @@ -120,12 +120,12 @@ public struct LimitedStageExcel : IFlatbufferObject StringOffset StrategyMapBGOffset = default(StringOffset), long StageRewardId = 0, int MaxTurn = 0, - SCHALE.Common.FlatData.StageTopography StageTopography = SCHALE.Common.FlatData.StageTopography.Street, + SCHALE.Common.FlatData.StageTopography StageTopography_ = SCHALE.Common.FlatData.StageTopography.Street, int RecommandLevel = 0, StringOffset BgmIdOffset = default(StringOffset), - SCHALE.Common.FlatData.StrategyEnvironment StrategyEnvironment = SCHALE.Common.FlatData.StrategyEnvironment.None, + SCHALE.Common.FlatData.StrategyEnvironment StrategyEnvironment_ = SCHALE.Common.FlatData.StrategyEnvironment.None, long GroundID = 0, - SCHALE.Common.FlatData.ContentType ContentType = SCHALE.Common.FlatData.ContentType.None, + SCHALE.Common.FlatData.ContentType ContentType_ = SCHALE.Common.FlatData.ContentType.None, long BGMId = 0, bool InstantClear = false, long BuffContentId = 0, @@ -144,11 +144,11 @@ public struct LimitedStageExcel : IFlatbufferObject LimitedStageExcel.AddPrevStageId(builder, PrevStageId); LimitedStageExcel.AddSeasonId(builder, SeasonId); LimitedStageExcel.AddId(builder, Id); - LimitedStageExcel.AddContentType(builder, ContentType); - LimitedStageExcel.AddStrategyEnvironment(builder, StrategyEnvironment); + LimitedStageExcel.AddContentType_(builder, ContentType_); + LimitedStageExcel.AddStrategyEnvironment_(builder, StrategyEnvironment_); LimitedStageExcel.AddBgmId(builder, BgmIdOffset); LimitedStageExcel.AddRecommandLevel(builder, RecommandLevel); - LimitedStageExcel.AddStageTopography(builder, StageTopography); + LimitedStageExcel.AddStageTopography_(builder, StageTopography_); LimitedStageExcel.AddMaxTurn(builder, MaxTurn); LimitedStageExcel.AddStrategyMapBG(builder, StrategyMapBGOffset); LimitedStageExcel.AddStrategyMap(builder, StrategyMapOffset); @@ -159,7 +159,7 @@ public struct LimitedStageExcel : IFlatbufferObject LimitedStageExcel.AddStageEnterCostType(builder, StageEnterCostType); LimitedStageExcel.AddStageDisplay(builder, StageDisplay); LimitedStageExcel.AddStageNumber(builder, StageNumberOffset); - LimitedStageExcel.AddStageDifficulty(builder, StageDifficulty); + LimitedStageExcel.AddStageDifficulty_(builder, StageDifficulty_); LimitedStageExcel.AddName(builder, NameOffset); LimitedStageExcel.AddChallengeDisplay(builder, ChallengeDisplay); LimitedStageExcel.AddInstantClear(builder, InstantClear); @@ -170,7 +170,7 @@ public struct LimitedStageExcel : IFlatbufferObject public static void AddId(FlatBufferBuilder builder, long id) { builder.AddLong(0, id, 0); } public static void AddName(FlatBufferBuilder builder, StringOffset nameOffset) { builder.AddOffset(1, nameOffset.Value, 0); } public static void AddSeasonId(FlatBufferBuilder builder, long seasonId) { builder.AddLong(2, seasonId, 0); } - public static void AddStageDifficulty(FlatBufferBuilder builder, SCHALE.Common.FlatData.StageDifficulty stageDifficulty) { builder.AddInt(3, (int)stageDifficulty, 0); } + public static void AddStageDifficulty_(FlatBufferBuilder builder, SCHALE.Common.FlatData.StageDifficulty stageDifficulty_) { builder.AddInt(3, (int)stageDifficulty_, 0); } public static void AddStageNumber(FlatBufferBuilder builder, StringOffset stageNumberOffset) { builder.AddOffset(4, stageNumberOffset.Value, 0); } public static void AddStageDisplay(FlatBufferBuilder builder, int stageDisplay) { builder.AddInt(5, stageDisplay, 0); } public static void AddPrevStageId(FlatBufferBuilder builder, long prevStageId) { builder.AddLong(6, prevStageId, 0); } @@ -199,12 +199,12 @@ public struct LimitedStageExcel : IFlatbufferObject public static void AddStrategyMapBG(FlatBufferBuilder builder, StringOffset strategyMapBGOffset) { builder.AddOffset(19, strategyMapBGOffset.Value, 0); } public static void AddStageRewardId(FlatBufferBuilder builder, long stageRewardId) { builder.AddLong(20, stageRewardId, 0); } public static void AddMaxTurn(FlatBufferBuilder builder, int maxTurn) { builder.AddInt(21, maxTurn, 0); } - public static void AddStageTopography(FlatBufferBuilder builder, SCHALE.Common.FlatData.StageTopography stageTopography) { builder.AddInt(22, (int)stageTopography, 0); } + public static void AddStageTopography_(FlatBufferBuilder builder, SCHALE.Common.FlatData.StageTopography stageTopography_) { builder.AddInt(22, (int)stageTopography_, 0); } public static void AddRecommandLevel(FlatBufferBuilder builder, int recommandLevel) { builder.AddInt(23, recommandLevel, 0); } public static void AddBgmId(FlatBufferBuilder builder, StringOffset bgmIdOffset) { builder.AddOffset(24, bgmIdOffset.Value, 0); } - public static void AddStrategyEnvironment(FlatBufferBuilder builder, SCHALE.Common.FlatData.StrategyEnvironment strategyEnvironment) { builder.AddInt(25, (int)strategyEnvironment, 0); } + public static void AddStrategyEnvironment_(FlatBufferBuilder builder, SCHALE.Common.FlatData.StrategyEnvironment strategyEnvironment_) { builder.AddInt(25, (int)strategyEnvironment_, 0); } public static void AddGroundID(FlatBufferBuilder builder, long groundID) { builder.AddLong(26, groundID, 0); } - public static void AddContentType(FlatBufferBuilder builder, SCHALE.Common.FlatData.ContentType contentType) { builder.AddInt(27, (int)contentType, 0); } + public static void AddContentType_(FlatBufferBuilder builder, SCHALE.Common.FlatData.ContentType contentType_) { builder.AddInt(27, (int)contentType_, 0); } public static void AddBGMId(FlatBufferBuilder builder, long bGMId) { builder.AddLong(28, bGMId, 0); } public static void AddInstantClear(FlatBufferBuilder builder, bool instantClear) { builder.AddBool(29, instantClear, false); } public static void AddBuffContentId(FlatBufferBuilder builder, long buffContentId) { builder.AddLong(30, buffContentId, 0); } @@ -223,7 +223,7 @@ public struct LimitedStageExcel : IFlatbufferObject _o.Id = TableEncryptionService.Convert(this.Id, key); _o.Name = TableEncryptionService.Convert(this.Name, key); _o.SeasonId = TableEncryptionService.Convert(this.SeasonId, key); - _o.StageDifficulty = TableEncryptionService.Convert(this.StageDifficulty, key); + _o.StageDifficulty_ = TableEncryptionService.Convert(this.StageDifficulty_, key); _o.StageNumber = TableEncryptionService.Convert(this.StageNumber, key); _o.StageDisplay = TableEncryptionService.Convert(this.StageDisplay, key); _o.PrevStageId = TableEncryptionService.Convert(this.PrevStageId, key); @@ -244,12 +244,12 @@ public struct LimitedStageExcel : IFlatbufferObject _o.StrategyMapBG = TableEncryptionService.Convert(this.StrategyMapBG, key); _o.StageRewardId = TableEncryptionService.Convert(this.StageRewardId, key); _o.MaxTurn = TableEncryptionService.Convert(this.MaxTurn, key); - _o.StageTopography = TableEncryptionService.Convert(this.StageTopography, key); + _o.StageTopography_ = TableEncryptionService.Convert(this.StageTopography_, key); _o.RecommandLevel = TableEncryptionService.Convert(this.RecommandLevel, key); _o.BgmId = TableEncryptionService.Convert(this.BgmId, key); - _o.StrategyEnvironment = TableEncryptionService.Convert(this.StrategyEnvironment, key); + _o.StrategyEnvironment_ = TableEncryptionService.Convert(this.StrategyEnvironment_, key); _o.GroundID = TableEncryptionService.Convert(this.GroundID, key); - _o.ContentType = TableEncryptionService.Convert(this.ContentType, key); + _o.ContentType_ = TableEncryptionService.Convert(this.ContentType_, key); _o.BGMId = TableEncryptionService.Convert(this.BGMId, key); _o.InstantClear = TableEncryptionService.Convert(this.InstantClear, key); _o.BuffContentId = TableEncryptionService.Convert(this.BuffContentId, key); @@ -277,7 +277,7 @@ public struct LimitedStageExcel : IFlatbufferObject _o.Id, _Name, _o.SeasonId, - _o.StageDifficulty, + _o.StageDifficulty_, _StageNumber, _o.StageDisplay, _o.PrevStageId, @@ -296,12 +296,12 @@ public struct LimitedStageExcel : IFlatbufferObject _StrategyMapBG, _o.StageRewardId, _o.MaxTurn, - _o.StageTopography, + _o.StageTopography_, _o.RecommandLevel, _BgmId, - _o.StrategyEnvironment, + _o.StrategyEnvironment_, _o.GroundID, - _o.ContentType, + _o.ContentType_, _o.BGMId, _o.InstantClear, _o.BuffContentId, @@ -314,7 +314,7 @@ public class LimitedStageExcelT public long Id { get; set; } public string Name { get; set; } public long SeasonId { get; set; } - public SCHALE.Common.FlatData.StageDifficulty StageDifficulty { get; set; } + public SCHALE.Common.FlatData.StageDifficulty StageDifficulty_ { get; set; } public string StageNumber { get; set; } public int StageDisplay { get; set; } public long PrevStageId { get; set; } @@ -333,12 +333,12 @@ public class LimitedStageExcelT public string StrategyMapBG { get; set; } public long StageRewardId { get; set; } public int MaxTurn { get; set; } - public SCHALE.Common.FlatData.StageTopography StageTopography { get; set; } + public SCHALE.Common.FlatData.StageTopography StageTopography_ { get; set; } public int RecommandLevel { get; set; } public string BgmId { get; set; } - public SCHALE.Common.FlatData.StrategyEnvironment StrategyEnvironment { get; set; } + public SCHALE.Common.FlatData.StrategyEnvironment StrategyEnvironment_ { get; set; } public long GroundID { get; set; } - public SCHALE.Common.FlatData.ContentType ContentType { get; set; } + public SCHALE.Common.FlatData.ContentType ContentType_ { get; set; } public long BGMId { get; set; } public bool InstantClear { get; set; } public long BuffContentId { get; set; } @@ -348,7 +348,7 @@ public class LimitedStageExcelT this.Id = 0; this.Name = null; this.SeasonId = 0; - this.StageDifficulty = SCHALE.Common.FlatData.StageDifficulty.None; + this.StageDifficulty_ = SCHALE.Common.FlatData.StageDifficulty.None; this.StageNumber = null; this.StageDisplay = 0; this.PrevStageId = 0; @@ -367,12 +367,12 @@ public class LimitedStageExcelT this.StrategyMapBG = null; this.StageRewardId = 0; this.MaxTurn = 0; - this.StageTopography = SCHALE.Common.FlatData.StageTopography.Street; + this.StageTopography_ = SCHALE.Common.FlatData.StageTopography.Street; this.RecommandLevel = 0; this.BgmId = null; - this.StrategyEnvironment = SCHALE.Common.FlatData.StrategyEnvironment.None; + this.StrategyEnvironment_ = SCHALE.Common.FlatData.StrategyEnvironment.None; this.GroundID = 0; - this.ContentType = SCHALE.Common.FlatData.ContentType.None; + this.ContentType_ = SCHALE.Common.FlatData.ContentType.None; this.BGMId = 0; this.InstantClear = false; this.BuffContentId = 0; @@ -389,7 +389,7 @@ static public class LimitedStageExcelVerify && verifier.VerifyField(tablePos, 4 /*Id*/, 8 /*long*/, 8, false) && verifier.VerifyString(tablePos, 6 /*Name*/, false) && verifier.VerifyField(tablePos, 8 /*SeasonId*/, 8 /*long*/, 8, false) - && verifier.VerifyField(tablePos, 10 /*StageDifficulty*/, 4 /*SCHALE.Common.FlatData.StageDifficulty*/, 4, false) + && verifier.VerifyField(tablePos, 10 /*StageDifficulty_*/, 4 /*SCHALE.Common.FlatData.StageDifficulty*/, 4, false) && verifier.VerifyString(tablePos, 12 /*StageNumber*/, false) && verifier.VerifyField(tablePos, 14 /*StageDisplay*/, 4 /*int*/, 4, false) && verifier.VerifyField(tablePos, 16 /*PrevStageId*/, 8 /*long*/, 8, false) @@ -408,12 +408,12 @@ static public class LimitedStageExcelVerify && verifier.VerifyString(tablePos, 42 /*StrategyMapBG*/, false) && verifier.VerifyField(tablePos, 44 /*StageRewardId*/, 8 /*long*/, 8, false) && verifier.VerifyField(tablePos, 46 /*MaxTurn*/, 4 /*int*/, 4, false) - && verifier.VerifyField(tablePos, 48 /*StageTopography*/, 4 /*SCHALE.Common.FlatData.StageTopography*/, 4, false) + && verifier.VerifyField(tablePos, 48 /*StageTopography_*/, 4 /*SCHALE.Common.FlatData.StageTopography*/, 4, false) && verifier.VerifyField(tablePos, 50 /*RecommandLevel*/, 4 /*int*/, 4, false) && verifier.VerifyString(tablePos, 52 /*BgmId*/, false) - && verifier.VerifyField(tablePos, 54 /*StrategyEnvironment*/, 4 /*SCHALE.Common.FlatData.StrategyEnvironment*/, 4, false) + && verifier.VerifyField(tablePos, 54 /*StrategyEnvironment_*/, 4 /*SCHALE.Common.FlatData.StrategyEnvironment*/, 4, false) && verifier.VerifyField(tablePos, 56 /*GroundID*/, 8 /*long*/, 8, false) - && verifier.VerifyField(tablePos, 58 /*ContentType*/, 4 /*SCHALE.Common.FlatData.ContentType*/, 4, false) + && verifier.VerifyField(tablePos, 58 /*ContentType_*/, 4 /*SCHALE.Common.FlatData.ContentType*/, 4, false) && verifier.VerifyField(tablePos, 60 /*BGMId*/, 8 /*long*/, 8, false) && verifier.VerifyField(tablePos, 62 /*InstantClear*/, 1 /*bool*/, 1, false) && verifier.VerifyField(tablePos, 64 /*BuffContentId*/, 8 /*long*/, 8, false) diff --git a/SCHALE.Common/FlatData/LimitedStageRewardExcel.cs b/SCHALE.Common/FlatData/LimitedStageRewardExcel.cs index a879c5f..5910bb3 100644 --- a/SCHALE.Common/FlatData/LimitedStageRewardExcel.cs +++ b/SCHALE.Common/FlatData/LimitedStageRewardExcel.cs @@ -21,7 +21,7 @@ public struct LimitedStageRewardExcel : IFlatbufferObject public LimitedStageRewardExcel __assign(int _i, ByteBuffer _bb) { __init(_i, _bb); return this; } public long GroupId { get { int o = __p.__offset(4); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } - public SCHALE.Common.FlatData.RewardTag RewardTag { get { int o = __p.__offset(6); return o != 0 ? (SCHALE.Common.FlatData.RewardTag)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.RewardTag.Default; } } + public SCHALE.Common.FlatData.RewardTag RewardTag_ { get { int o = __p.__offset(6); return o != 0 ? (SCHALE.Common.FlatData.RewardTag)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.RewardTag.Default; } } public int RewardProb { get { int o = __p.__offset(8); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } public SCHALE.Common.FlatData.ParcelType RewardParcelType { get { int o = __p.__offset(10); return o != 0 ? (SCHALE.Common.FlatData.ParcelType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.ParcelType.None; } } public long RewardId { get { int o = __p.__offset(12); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } @@ -30,7 +30,7 @@ public struct LimitedStageRewardExcel : IFlatbufferObject public static Offset CreateLimitedStageRewardExcel(FlatBufferBuilder builder, long GroupId = 0, - SCHALE.Common.FlatData.RewardTag RewardTag = SCHALE.Common.FlatData.RewardTag.Default, + SCHALE.Common.FlatData.RewardTag RewardTag_ = SCHALE.Common.FlatData.RewardTag.Default, int RewardProb = 0, SCHALE.Common.FlatData.ParcelType RewardParcelType = SCHALE.Common.FlatData.ParcelType.None, long RewardId = 0, @@ -42,14 +42,14 @@ public struct LimitedStageRewardExcel : IFlatbufferObject LimitedStageRewardExcel.AddRewardAmount(builder, RewardAmount); LimitedStageRewardExcel.AddRewardParcelType(builder, RewardParcelType); LimitedStageRewardExcel.AddRewardProb(builder, RewardProb); - LimitedStageRewardExcel.AddRewardTag(builder, RewardTag); + LimitedStageRewardExcel.AddRewardTag_(builder, RewardTag_); LimitedStageRewardExcel.AddIsDisplayed(builder, IsDisplayed); return LimitedStageRewardExcel.EndLimitedStageRewardExcel(builder); } public static void StartLimitedStageRewardExcel(FlatBufferBuilder builder) { builder.StartTable(7); } public static void AddGroupId(FlatBufferBuilder builder, long groupId) { builder.AddLong(0, groupId, 0); } - public static void AddRewardTag(FlatBufferBuilder builder, SCHALE.Common.FlatData.RewardTag rewardTag) { builder.AddInt(1, (int)rewardTag, 0); } + public static void AddRewardTag_(FlatBufferBuilder builder, SCHALE.Common.FlatData.RewardTag rewardTag_) { builder.AddInt(1, (int)rewardTag_, 0); } public static void AddRewardProb(FlatBufferBuilder builder, int rewardProb) { builder.AddInt(2, rewardProb, 0); } public static void AddRewardParcelType(FlatBufferBuilder builder, SCHALE.Common.FlatData.ParcelType rewardParcelType) { builder.AddInt(3, (int)rewardParcelType, 0); } public static void AddRewardId(FlatBufferBuilder builder, long rewardId) { builder.AddLong(4, rewardId, 0); } @@ -67,7 +67,7 @@ public struct LimitedStageRewardExcel : IFlatbufferObject public void UnPackTo(LimitedStageRewardExcelT _o) { byte[] key = TableEncryptionService.CreateKey("LimitedStageReward"); _o.GroupId = TableEncryptionService.Convert(this.GroupId, key); - _o.RewardTag = TableEncryptionService.Convert(this.RewardTag, key); + _o.RewardTag_ = TableEncryptionService.Convert(this.RewardTag_, key); _o.RewardProb = TableEncryptionService.Convert(this.RewardProb, key); _o.RewardParcelType = TableEncryptionService.Convert(this.RewardParcelType, key); _o.RewardId = TableEncryptionService.Convert(this.RewardId, key); @@ -79,7 +79,7 @@ public struct LimitedStageRewardExcel : IFlatbufferObject return CreateLimitedStageRewardExcel( builder, _o.GroupId, - _o.RewardTag, + _o.RewardTag_, _o.RewardProb, _o.RewardParcelType, _o.RewardId, @@ -91,7 +91,7 @@ public struct LimitedStageRewardExcel : IFlatbufferObject public class LimitedStageRewardExcelT { public long GroupId { get; set; } - public SCHALE.Common.FlatData.RewardTag RewardTag { get; set; } + public SCHALE.Common.FlatData.RewardTag RewardTag_ { get; set; } public int RewardProb { get; set; } public SCHALE.Common.FlatData.ParcelType RewardParcelType { get; set; } public long RewardId { get; set; } @@ -100,7 +100,7 @@ public class LimitedStageRewardExcelT public LimitedStageRewardExcelT() { this.GroupId = 0; - this.RewardTag = SCHALE.Common.FlatData.RewardTag.Default; + this.RewardTag_ = SCHALE.Common.FlatData.RewardTag.Default; this.RewardProb = 0; this.RewardParcelType = SCHALE.Common.FlatData.ParcelType.None; this.RewardId = 0; @@ -116,7 +116,7 @@ static public class LimitedStageRewardExcelVerify { return verifier.VerifyTableStart(tablePos) && verifier.VerifyField(tablePos, 4 /*GroupId*/, 8 /*long*/, 8, false) - && verifier.VerifyField(tablePos, 6 /*RewardTag*/, 4 /*SCHALE.Common.FlatData.RewardTag*/, 4, false) + && verifier.VerifyField(tablePos, 6 /*RewardTag_*/, 4 /*SCHALE.Common.FlatData.RewardTag*/, 4, false) && verifier.VerifyField(tablePos, 8 /*RewardProb*/, 4 /*int*/, 4, false) && verifier.VerifyField(tablePos, 10 /*RewardParcelType*/, 4 /*SCHALE.Common.FlatData.ParcelType*/, 4, false) && verifier.VerifyField(tablePos, 12 /*RewardId*/, 8 /*long*/, 8, false) diff --git a/SCHALE.Common/FlatData/LocalizeCharProfileChangeExcel.cs b/SCHALE.Common/FlatData/LocalizeCharProfileChangeExcel.cs new file mode 100644 index 0000000..3cfe362 --- /dev/null +++ b/SCHALE.Common/FlatData/LocalizeCharProfileChangeExcel.cs @@ -0,0 +1,93 @@ +// +// automatically generated by the FlatBuffers compiler, do not modify +// + +namespace SCHALE.Common.FlatData +{ + +using global::System; +using global::System.Collections.Generic; +using global::SCHALE.Common.Crypto; +using global::Google.FlatBuffers; + +public struct LocalizeCharProfileChangeExcel : IFlatbufferObject +{ + private Table __p; + public ByteBuffer ByteBuffer { get { return __p.bb; } } + public static void ValidateVersion() { FlatBufferConstants.FLATBUFFERS_24_3_25(); } + public static LocalizeCharProfileChangeExcel GetRootAsLocalizeCharProfileChangeExcel(ByteBuffer _bb) { return GetRootAsLocalizeCharProfileChangeExcel(_bb, new LocalizeCharProfileChangeExcel()); } + public static LocalizeCharProfileChangeExcel GetRootAsLocalizeCharProfileChangeExcel(ByteBuffer _bb, LocalizeCharProfileChangeExcel obj) { return (obj.__assign(_bb.GetInt(_bb.Position) + _bb.Position, _bb)); } + public void __init(int _i, ByteBuffer _bb) { __p = new Table(_i, _bb); } + public LocalizeCharProfileChangeExcel __assign(int _i, ByteBuffer _bb) { __init(_i, _bb); return this; } + + public long CharacterId { get { int o = __p.__offset(4); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } + public long ScenarioModeId { get { int o = __p.__offset(6); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } + public long ChangeCharacterID { get { int o = __p.__offset(8); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } + + public static Offset CreateLocalizeCharProfileChangeExcel(FlatBufferBuilder builder, + long CharacterId = 0, + long ScenarioModeId = 0, + long ChangeCharacterID = 0) { + builder.StartTable(3); + LocalizeCharProfileChangeExcel.AddChangeCharacterID(builder, ChangeCharacterID); + LocalizeCharProfileChangeExcel.AddScenarioModeId(builder, ScenarioModeId); + LocalizeCharProfileChangeExcel.AddCharacterId(builder, CharacterId); + return LocalizeCharProfileChangeExcel.EndLocalizeCharProfileChangeExcel(builder); + } + + public static void StartLocalizeCharProfileChangeExcel(FlatBufferBuilder builder) { builder.StartTable(3); } + public static void AddCharacterId(FlatBufferBuilder builder, long characterId) { builder.AddLong(0, characterId, 0); } + public static void AddScenarioModeId(FlatBufferBuilder builder, long scenarioModeId) { builder.AddLong(1, scenarioModeId, 0); } + public static void AddChangeCharacterID(FlatBufferBuilder builder, long changeCharacterID) { builder.AddLong(2, changeCharacterID, 0); } + public static Offset EndLocalizeCharProfileChangeExcel(FlatBufferBuilder builder) { + int o = builder.EndTable(); + return new Offset(o); + } + public LocalizeCharProfileChangeExcelT UnPack() { + var _o = new LocalizeCharProfileChangeExcelT(); + this.UnPackTo(_o); + return _o; + } + public void UnPackTo(LocalizeCharProfileChangeExcelT _o) { + byte[] key = TableEncryptionService.CreateKey("LocalizeCharProfileChange"); + _o.CharacterId = TableEncryptionService.Convert(this.CharacterId, key); + _o.ScenarioModeId = TableEncryptionService.Convert(this.ScenarioModeId, key); + _o.ChangeCharacterID = TableEncryptionService.Convert(this.ChangeCharacterID, key); + } + public static Offset Pack(FlatBufferBuilder builder, LocalizeCharProfileChangeExcelT _o) { + if (_o == null) return default(Offset); + return CreateLocalizeCharProfileChangeExcel( + builder, + _o.CharacterId, + _o.ScenarioModeId, + _o.ChangeCharacterID); + } +} + +public class LocalizeCharProfileChangeExcelT +{ + public long CharacterId { get; set; } + public long ScenarioModeId { get; set; } + public long ChangeCharacterID { get; set; } + + public LocalizeCharProfileChangeExcelT() { + this.CharacterId = 0; + this.ScenarioModeId = 0; + this.ChangeCharacterID = 0; + } +} + + +static public class LocalizeCharProfileChangeExcelVerify +{ + static public bool Verify(Google.FlatBuffers.Verifier verifier, uint tablePos) + { + return verifier.VerifyTableStart(tablePos) + && verifier.VerifyField(tablePos, 4 /*CharacterId*/, 8 /*long*/, 8, false) + && verifier.VerifyField(tablePos, 6 /*ScenarioModeId*/, 8 /*long*/, 8, false) + && verifier.VerifyField(tablePos, 8 /*ChangeCharacterID*/, 8 /*long*/, 8, false) + && verifier.VerifyTableEnd(tablePos); + } +} + +} diff --git a/SCHALE.Common/FlatData/LocalizeCharProfileExcel.cs b/SCHALE.Common/FlatData/LocalizeCharProfileExcel.cs index e148b1f..fe3a937 100644 --- a/SCHALE.Common/FlatData/LocalizeCharProfileExcel.cs +++ b/SCHALE.Common/FlatData/LocalizeCharProfileExcel.cs @@ -266,99 +266,99 @@ public struct LocalizeCharProfileExcel : IFlatbufferObject public ArraySegment? GetProfileIntroductionJpBytes() { return __p.__vector_as_arraysegment(74); } #endif public byte[] GetProfileIntroductionJpArray() { return __p.__vector_as_array(74); } - public string CharacterSSRNewKr { get { int o = __p.__offset(76); return o != 0 ? __p.__string(o + __p.bb_pos) : null; } } + public string CharacterSsrNewKr { get { int o = __p.__offset(76); return o != 0 ? __p.__string(o + __p.bb_pos) : null; } } #if ENABLE_SPAN_T - public Span GetCharacterSSRNewKrBytes() { return __p.__vector_as_span(76, 1); } + public Span GetCharacterSsrNewKrBytes() { return __p.__vector_as_span(76, 1); } #else - public ArraySegment? GetCharacterSSRNewKrBytes() { return __p.__vector_as_arraysegment(76); } + public ArraySegment? GetCharacterSsrNewKrBytes() { return __p.__vector_as_arraysegment(76); } #endif - public byte[] GetCharacterSSRNewKrArray() { return __p.__vector_as_array(76); } - public string CharacterSSRNewJp { get { int o = __p.__offset(78); return o != 0 ? __p.__string(o + __p.bb_pos) : null; } } + public byte[] GetCharacterSsrNewKrArray() { return __p.__vector_as_array(76); } + public string CharacterSsrNewJp { get { int o = __p.__offset(78); return o != 0 ? __p.__string(o + __p.bb_pos) : null; } } #if ENABLE_SPAN_T - public Span GetCharacterSSRNewJpBytes() { return __p.__vector_as_span(78, 1); } + public Span GetCharacterSsrNewJpBytes() { return __p.__vector_as_span(78, 1); } #else - public ArraySegment? GetCharacterSSRNewJpBytes() { return __p.__vector_as_arraysegment(78); } + public ArraySegment? GetCharacterSsrNewJpBytes() { return __p.__vector_as_arraysegment(78); } #endif - public byte[] GetCharacterSSRNewJpArray() { return __p.__vector_as_array(78); } + public byte[] GetCharacterSsrNewJpArray() { return __p.__vector_as_array(78); } public static Offset CreateLocalizeCharProfileExcel(FlatBufferBuilder builder, - long CharacterId = 0, - StringOffset StatusMessageKrOffset = default(StringOffset), - StringOffset StatusMessageJpOffset = default(StringOffset), - StringOffset FullNameKrOffset = default(StringOffset), - StringOffset FullNameJpOffset = default(StringOffset), - StringOffset FamilyNameKrOffset = default(StringOffset), - StringOffset FamilyNameRubyKrOffset = default(StringOffset), - StringOffset PersonalNameKrOffset = default(StringOffset), - StringOffset PersonalNameRubyKrOffset = default(StringOffset), - StringOffset FamilyNameJpOffset = default(StringOffset), - StringOffset FamilyNameRubyJpOffset = default(StringOffset), - StringOffset PersonalNameJpOffset = default(StringOffset), - StringOffset PersonalNameRubyJpOffset = default(StringOffset), - StringOffset SchoolYearKrOffset = default(StringOffset), - StringOffset SchoolYearJpOffset = default(StringOffset), - StringOffset CharacterAgeKrOffset = default(StringOffset), - StringOffset CharacterAgeJpOffset = default(StringOffset), - StringOffset BirthDayOffset = default(StringOffset), - StringOffset BirthdayKrOffset = default(StringOffset), - StringOffset BirthdayJpOffset = default(StringOffset), - StringOffset CharHeightKrOffset = default(StringOffset), - StringOffset CharHeightJpOffset = default(StringOffset), - StringOffset DesignerNameKrOffset = default(StringOffset), - StringOffset DesignerNameJpOffset = default(StringOffset), - StringOffset IllustratorNameKrOffset = default(StringOffset), - StringOffset IllustratorNameJpOffset = default(StringOffset), - StringOffset CharacterVoiceKrOffset = default(StringOffset), - StringOffset CharacterVoiceJpOffset = default(StringOffset), - StringOffset HobbyKrOffset = default(StringOffset), - StringOffset HobbyJpOffset = default(StringOffset), - StringOffset WeaponNameKrOffset = default(StringOffset), - StringOffset WeaponDescKrOffset = default(StringOffset), - StringOffset WeaponNameJpOffset = default(StringOffset), - StringOffset WeaponDescJpOffset = default(StringOffset), - StringOffset ProfileIntroductionKrOffset = default(StringOffset), - StringOffset ProfileIntroductionJpOffset = default(StringOffset), - StringOffset CharacterSSRNewKrOffset = default(StringOffset), - StringOffset CharacterSSRNewJpOffset = default(StringOffset)) { + long character_id = 0, + StringOffset status_message_krOffset = default(StringOffset), + StringOffset status_message_jpOffset = default(StringOffset), + StringOffset full_name_krOffset = default(StringOffset), + StringOffset full_name_jpOffset = default(StringOffset), + StringOffset family_name_krOffset = default(StringOffset), + StringOffset family_name_ruby_krOffset = default(StringOffset), + StringOffset personal_name_krOffset = default(StringOffset), + StringOffset personal_name_ruby_krOffset = default(StringOffset), + StringOffset family_name_jpOffset = default(StringOffset), + StringOffset family_name_ruby_jpOffset = default(StringOffset), + StringOffset personal_name_jpOffset = default(StringOffset), + StringOffset personal_name_ruby_jpOffset = default(StringOffset), + StringOffset school_year_krOffset = default(StringOffset), + StringOffset school_year_jpOffset = default(StringOffset), + StringOffset character_age_krOffset = default(StringOffset), + StringOffset character_age_jpOffset = default(StringOffset), + StringOffset birth_dayOffset = default(StringOffset), + StringOffset birthday_krOffset = default(StringOffset), + StringOffset birthday_jpOffset = default(StringOffset), + StringOffset char_height_krOffset = default(StringOffset), + StringOffset char_height_jpOffset = default(StringOffset), + StringOffset designer_name_krOffset = default(StringOffset), + StringOffset designer_name_jpOffset = default(StringOffset), + StringOffset illustrator_name_krOffset = default(StringOffset), + StringOffset illustrator_name_jpOffset = default(StringOffset), + StringOffset character_voice_krOffset = default(StringOffset), + StringOffset character_voice_jpOffset = default(StringOffset), + StringOffset hobby_krOffset = default(StringOffset), + StringOffset hobby_jpOffset = default(StringOffset), + StringOffset weapon_name_krOffset = default(StringOffset), + StringOffset weapon_desc_krOffset = default(StringOffset), + StringOffset weapon_name_jpOffset = default(StringOffset), + StringOffset weapon_desc_jpOffset = default(StringOffset), + StringOffset profile_introduction_krOffset = default(StringOffset), + StringOffset profile_introduction_jpOffset = default(StringOffset), + StringOffset character_ssr_new_krOffset = default(StringOffset), + StringOffset character_ssr_new_jpOffset = default(StringOffset)) { builder.StartTable(38); - LocalizeCharProfileExcel.AddCharacterId(builder, CharacterId); - LocalizeCharProfileExcel.AddCharacterSSRNewJp(builder, CharacterSSRNewJpOffset); - LocalizeCharProfileExcel.AddCharacterSSRNewKr(builder, CharacterSSRNewKrOffset); - LocalizeCharProfileExcel.AddProfileIntroductionJp(builder, ProfileIntroductionJpOffset); - LocalizeCharProfileExcel.AddProfileIntroductionKr(builder, ProfileIntroductionKrOffset); - LocalizeCharProfileExcel.AddWeaponDescJp(builder, WeaponDescJpOffset); - LocalizeCharProfileExcel.AddWeaponNameJp(builder, WeaponNameJpOffset); - LocalizeCharProfileExcel.AddWeaponDescKr(builder, WeaponDescKrOffset); - LocalizeCharProfileExcel.AddWeaponNameKr(builder, WeaponNameKrOffset); - LocalizeCharProfileExcel.AddHobbyJp(builder, HobbyJpOffset); - LocalizeCharProfileExcel.AddHobbyKr(builder, HobbyKrOffset); - LocalizeCharProfileExcel.AddCharacterVoiceJp(builder, CharacterVoiceJpOffset); - LocalizeCharProfileExcel.AddCharacterVoiceKr(builder, CharacterVoiceKrOffset); - LocalizeCharProfileExcel.AddIllustratorNameJp(builder, IllustratorNameJpOffset); - LocalizeCharProfileExcel.AddIllustratorNameKr(builder, IllustratorNameKrOffset); - LocalizeCharProfileExcel.AddDesignerNameJp(builder, DesignerNameJpOffset); - LocalizeCharProfileExcel.AddDesignerNameKr(builder, DesignerNameKrOffset); - LocalizeCharProfileExcel.AddCharHeightJp(builder, CharHeightJpOffset); - LocalizeCharProfileExcel.AddCharHeightKr(builder, CharHeightKrOffset); - LocalizeCharProfileExcel.AddBirthdayJp(builder, BirthdayJpOffset); - LocalizeCharProfileExcel.AddBirthdayKr(builder, BirthdayKrOffset); - LocalizeCharProfileExcel.AddBirthDay(builder, BirthDayOffset); - LocalizeCharProfileExcel.AddCharacterAgeJp(builder, CharacterAgeJpOffset); - LocalizeCharProfileExcel.AddCharacterAgeKr(builder, CharacterAgeKrOffset); - LocalizeCharProfileExcel.AddSchoolYearJp(builder, SchoolYearJpOffset); - LocalizeCharProfileExcel.AddSchoolYearKr(builder, SchoolYearKrOffset); - LocalizeCharProfileExcel.AddPersonalNameRubyJp(builder, PersonalNameRubyJpOffset); - LocalizeCharProfileExcel.AddPersonalNameJp(builder, PersonalNameJpOffset); - LocalizeCharProfileExcel.AddFamilyNameRubyJp(builder, FamilyNameRubyJpOffset); - LocalizeCharProfileExcel.AddFamilyNameJp(builder, FamilyNameJpOffset); - LocalizeCharProfileExcel.AddPersonalNameRubyKr(builder, PersonalNameRubyKrOffset); - LocalizeCharProfileExcel.AddPersonalNameKr(builder, PersonalNameKrOffset); - LocalizeCharProfileExcel.AddFamilyNameRubyKr(builder, FamilyNameRubyKrOffset); - LocalizeCharProfileExcel.AddFamilyNameKr(builder, FamilyNameKrOffset); - LocalizeCharProfileExcel.AddFullNameJp(builder, FullNameJpOffset); - LocalizeCharProfileExcel.AddFullNameKr(builder, FullNameKrOffset); - LocalizeCharProfileExcel.AddStatusMessageJp(builder, StatusMessageJpOffset); - LocalizeCharProfileExcel.AddStatusMessageKr(builder, StatusMessageKrOffset); + LocalizeCharProfileExcel.AddCharacterId(builder, character_id); + LocalizeCharProfileExcel.AddCharacterSsrNewJp(builder, character_ssr_new_jpOffset); + LocalizeCharProfileExcel.AddCharacterSsrNewKr(builder, character_ssr_new_krOffset); + LocalizeCharProfileExcel.AddProfileIntroductionJp(builder, profile_introduction_jpOffset); + LocalizeCharProfileExcel.AddProfileIntroductionKr(builder, profile_introduction_krOffset); + LocalizeCharProfileExcel.AddWeaponDescJp(builder, weapon_desc_jpOffset); + LocalizeCharProfileExcel.AddWeaponNameJp(builder, weapon_name_jpOffset); + LocalizeCharProfileExcel.AddWeaponDescKr(builder, weapon_desc_krOffset); + LocalizeCharProfileExcel.AddWeaponNameKr(builder, weapon_name_krOffset); + LocalizeCharProfileExcel.AddHobbyJp(builder, hobby_jpOffset); + LocalizeCharProfileExcel.AddHobbyKr(builder, hobby_krOffset); + LocalizeCharProfileExcel.AddCharacterVoiceJp(builder, character_voice_jpOffset); + LocalizeCharProfileExcel.AddCharacterVoiceKr(builder, character_voice_krOffset); + LocalizeCharProfileExcel.AddIllustratorNameJp(builder, illustrator_name_jpOffset); + LocalizeCharProfileExcel.AddIllustratorNameKr(builder, illustrator_name_krOffset); + LocalizeCharProfileExcel.AddDesignerNameJp(builder, designer_name_jpOffset); + LocalizeCharProfileExcel.AddDesignerNameKr(builder, designer_name_krOffset); + LocalizeCharProfileExcel.AddCharHeightJp(builder, char_height_jpOffset); + LocalizeCharProfileExcel.AddCharHeightKr(builder, char_height_krOffset); + LocalizeCharProfileExcel.AddBirthdayJp(builder, birthday_jpOffset); + LocalizeCharProfileExcel.AddBirthdayKr(builder, birthday_krOffset); + LocalizeCharProfileExcel.AddBirthDay(builder, birth_dayOffset); + LocalizeCharProfileExcel.AddCharacterAgeJp(builder, character_age_jpOffset); + LocalizeCharProfileExcel.AddCharacterAgeKr(builder, character_age_krOffset); + LocalizeCharProfileExcel.AddSchoolYearJp(builder, school_year_jpOffset); + LocalizeCharProfileExcel.AddSchoolYearKr(builder, school_year_krOffset); + LocalizeCharProfileExcel.AddPersonalNameRubyJp(builder, personal_name_ruby_jpOffset); + LocalizeCharProfileExcel.AddPersonalNameJp(builder, personal_name_jpOffset); + LocalizeCharProfileExcel.AddFamilyNameRubyJp(builder, family_name_ruby_jpOffset); + LocalizeCharProfileExcel.AddFamilyNameJp(builder, family_name_jpOffset); + LocalizeCharProfileExcel.AddPersonalNameRubyKr(builder, personal_name_ruby_krOffset); + LocalizeCharProfileExcel.AddPersonalNameKr(builder, personal_name_krOffset); + LocalizeCharProfileExcel.AddFamilyNameRubyKr(builder, family_name_ruby_krOffset); + LocalizeCharProfileExcel.AddFamilyNameKr(builder, family_name_krOffset); + LocalizeCharProfileExcel.AddFullNameJp(builder, full_name_jpOffset); + LocalizeCharProfileExcel.AddFullNameKr(builder, full_name_krOffset); + LocalizeCharProfileExcel.AddStatusMessageJp(builder, status_message_jpOffset); + LocalizeCharProfileExcel.AddStatusMessageKr(builder, status_message_krOffset); return LocalizeCharProfileExcel.EndLocalizeCharProfileExcel(builder); } @@ -399,8 +399,8 @@ public struct LocalizeCharProfileExcel : IFlatbufferObject public static void AddWeaponDescJp(FlatBufferBuilder builder, StringOffset weaponDescJpOffset) { builder.AddOffset(33, weaponDescJpOffset.Value, 0); } public static void AddProfileIntroductionKr(FlatBufferBuilder builder, StringOffset profileIntroductionKrOffset) { builder.AddOffset(34, profileIntroductionKrOffset.Value, 0); } public static void AddProfileIntroductionJp(FlatBufferBuilder builder, StringOffset profileIntroductionJpOffset) { builder.AddOffset(35, profileIntroductionJpOffset.Value, 0); } - public static void AddCharacterSSRNewKr(FlatBufferBuilder builder, StringOffset characterSSRNewKrOffset) { builder.AddOffset(36, characterSSRNewKrOffset.Value, 0); } - public static void AddCharacterSSRNewJp(FlatBufferBuilder builder, StringOffset characterSSRNewJpOffset) { builder.AddOffset(37, characterSSRNewJpOffset.Value, 0); } + public static void AddCharacterSsrNewKr(FlatBufferBuilder builder, StringOffset characterSsrNewKrOffset) { builder.AddOffset(36, characterSsrNewKrOffset.Value, 0); } + public static void AddCharacterSsrNewJp(FlatBufferBuilder builder, StringOffset characterSsrNewJpOffset) { builder.AddOffset(37, characterSsrNewJpOffset.Value, 0); } public static Offset EndLocalizeCharProfileExcel(FlatBufferBuilder builder) { int o = builder.EndTable(); return new Offset(o); @@ -448,88 +448,88 @@ public struct LocalizeCharProfileExcel : IFlatbufferObject _o.WeaponDescJp = TableEncryptionService.Convert(this.WeaponDescJp, key); _o.ProfileIntroductionKr = TableEncryptionService.Convert(this.ProfileIntroductionKr, key); _o.ProfileIntroductionJp = TableEncryptionService.Convert(this.ProfileIntroductionJp, key); - _o.CharacterSSRNewKr = TableEncryptionService.Convert(this.CharacterSSRNewKr, key); - _o.CharacterSSRNewJp = TableEncryptionService.Convert(this.CharacterSSRNewJp, key); + _o.CharacterSsrNewKr = TableEncryptionService.Convert(this.CharacterSsrNewKr, key); + _o.CharacterSsrNewJp = TableEncryptionService.Convert(this.CharacterSsrNewJp, key); } public static Offset Pack(FlatBufferBuilder builder, LocalizeCharProfileExcelT _o) { if (_o == null) return default(Offset); - var _StatusMessageKr = _o.StatusMessageKr == null ? default(StringOffset) : builder.CreateString(_o.StatusMessageKr); - var _StatusMessageJp = _o.StatusMessageJp == null ? default(StringOffset) : builder.CreateString(_o.StatusMessageJp); - var _FullNameKr = _o.FullNameKr == null ? default(StringOffset) : builder.CreateString(_o.FullNameKr); - var _FullNameJp = _o.FullNameJp == null ? default(StringOffset) : builder.CreateString(_o.FullNameJp); - var _FamilyNameKr = _o.FamilyNameKr == null ? default(StringOffset) : builder.CreateString(_o.FamilyNameKr); - var _FamilyNameRubyKr = _o.FamilyNameRubyKr == null ? default(StringOffset) : builder.CreateString(_o.FamilyNameRubyKr); - var _PersonalNameKr = _o.PersonalNameKr == null ? default(StringOffset) : builder.CreateString(_o.PersonalNameKr); - var _PersonalNameRubyKr = _o.PersonalNameRubyKr == null ? default(StringOffset) : builder.CreateString(_o.PersonalNameRubyKr); - var _FamilyNameJp = _o.FamilyNameJp == null ? default(StringOffset) : builder.CreateString(_o.FamilyNameJp); - var _FamilyNameRubyJp = _o.FamilyNameRubyJp == null ? default(StringOffset) : builder.CreateString(_o.FamilyNameRubyJp); - var _PersonalNameJp = _o.PersonalNameJp == null ? default(StringOffset) : builder.CreateString(_o.PersonalNameJp); - var _PersonalNameRubyJp = _o.PersonalNameRubyJp == null ? default(StringOffset) : builder.CreateString(_o.PersonalNameRubyJp); - var _SchoolYearKr = _o.SchoolYearKr == null ? default(StringOffset) : builder.CreateString(_o.SchoolYearKr); - var _SchoolYearJp = _o.SchoolYearJp == null ? default(StringOffset) : builder.CreateString(_o.SchoolYearJp); - var _CharacterAgeKr = _o.CharacterAgeKr == null ? default(StringOffset) : builder.CreateString(_o.CharacterAgeKr); - var _CharacterAgeJp = _o.CharacterAgeJp == null ? default(StringOffset) : builder.CreateString(_o.CharacterAgeJp); - var _BirthDay = _o.BirthDay == null ? default(StringOffset) : builder.CreateString(_o.BirthDay); - var _BirthdayKr = _o.BirthdayKr == null ? default(StringOffset) : builder.CreateString(_o.BirthdayKr); - var _BirthdayJp = _o.BirthdayJp == null ? default(StringOffset) : builder.CreateString(_o.BirthdayJp); - var _CharHeightKr = _o.CharHeightKr == null ? default(StringOffset) : builder.CreateString(_o.CharHeightKr); - var _CharHeightJp = _o.CharHeightJp == null ? default(StringOffset) : builder.CreateString(_o.CharHeightJp); - var _DesignerNameKr = _o.DesignerNameKr == null ? default(StringOffset) : builder.CreateString(_o.DesignerNameKr); - var _DesignerNameJp = _o.DesignerNameJp == null ? default(StringOffset) : builder.CreateString(_o.DesignerNameJp); - var _IllustratorNameKr = _o.IllustratorNameKr == null ? default(StringOffset) : builder.CreateString(_o.IllustratorNameKr); - var _IllustratorNameJp = _o.IllustratorNameJp == null ? default(StringOffset) : builder.CreateString(_o.IllustratorNameJp); - var _CharacterVoiceKr = _o.CharacterVoiceKr == null ? default(StringOffset) : builder.CreateString(_o.CharacterVoiceKr); - var _CharacterVoiceJp = _o.CharacterVoiceJp == null ? default(StringOffset) : builder.CreateString(_o.CharacterVoiceJp); - var _HobbyKr = _o.HobbyKr == null ? default(StringOffset) : builder.CreateString(_o.HobbyKr); - var _HobbyJp = _o.HobbyJp == null ? default(StringOffset) : builder.CreateString(_o.HobbyJp); - var _WeaponNameKr = _o.WeaponNameKr == null ? default(StringOffset) : builder.CreateString(_o.WeaponNameKr); - var _WeaponDescKr = _o.WeaponDescKr == null ? default(StringOffset) : builder.CreateString(_o.WeaponDescKr); - var _WeaponNameJp = _o.WeaponNameJp == null ? default(StringOffset) : builder.CreateString(_o.WeaponNameJp); - var _WeaponDescJp = _o.WeaponDescJp == null ? default(StringOffset) : builder.CreateString(_o.WeaponDescJp); - var _ProfileIntroductionKr = _o.ProfileIntroductionKr == null ? default(StringOffset) : builder.CreateString(_o.ProfileIntroductionKr); - var _ProfileIntroductionJp = _o.ProfileIntroductionJp == null ? default(StringOffset) : builder.CreateString(_o.ProfileIntroductionJp); - var _CharacterSSRNewKr = _o.CharacterSSRNewKr == null ? default(StringOffset) : builder.CreateString(_o.CharacterSSRNewKr); - var _CharacterSSRNewJp = _o.CharacterSSRNewJp == null ? default(StringOffset) : builder.CreateString(_o.CharacterSSRNewJp); + var _status_message_kr = _o.StatusMessageKr == null ? default(StringOffset) : builder.CreateString(_o.StatusMessageKr); + var _status_message_jp = _o.StatusMessageJp == null ? default(StringOffset) : builder.CreateString(_o.StatusMessageJp); + var _full_name_kr = _o.FullNameKr == null ? default(StringOffset) : builder.CreateString(_o.FullNameKr); + var _full_name_jp = _o.FullNameJp == null ? default(StringOffset) : builder.CreateString(_o.FullNameJp); + var _family_name_kr = _o.FamilyNameKr == null ? default(StringOffset) : builder.CreateString(_o.FamilyNameKr); + var _family_name_ruby_kr = _o.FamilyNameRubyKr == null ? default(StringOffset) : builder.CreateString(_o.FamilyNameRubyKr); + var _personal_name_kr = _o.PersonalNameKr == null ? default(StringOffset) : builder.CreateString(_o.PersonalNameKr); + var _personal_name_ruby_kr = _o.PersonalNameRubyKr == null ? default(StringOffset) : builder.CreateString(_o.PersonalNameRubyKr); + var _family_name_jp = _o.FamilyNameJp == null ? default(StringOffset) : builder.CreateString(_o.FamilyNameJp); + var _family_name_ruby_jp = _o.FamilyNameRubyJp == null ? default(StringOffset) : builder.CreateString(_o.FamilyNameRubyJp); + var _personal_name_jp = _o.PersonalNameJp == null ? default(StringOffset) : builder.CreateString(_o.PersonalNameJp); + var _personal_name_ruby_jp = _o.PersonalNameRubyJp == null ? default(StringOffset) : builder.CreateString(_o.PersonalNameRubyJp); + var _school_year_kr = _o.SchoolYearKr == null ? default(StringOffset) : builder.CreateString(_o.SchoolYearKr); + var _school_year_jp = _o.SchoolYearJp == null ? default(StringOffset) : builder.CreateString(_o.SchoolYearJp); + var _character_age_kr = _o.CharacterAgeKr == null ? default(StringOffset) : builder.CreateString(_o.CharacterAgeKr); + var _character_age_jp = _o.CharacterAgeJp == null ? default(StringOffset) : builder.CreateString(_o.CharacterAgeJp); + var _birth_day = _o.BirthDay == null ? default(StringOffset) : builder.CreateString(_o.BirthDay); + var _birthday_kr = _o.BirthdayKr == null ? default(StringOffset) : builder.CreateString(_o.BirthdayKr); + var _birthday_jp = _o.BirthdayJp == null ? default(StringOffset) : builder.CreateString(_o.BirthdayJp); + var _char_height_kr = _o.CharHeightKr == null ? default(StringOffset) : builder.CreateString(_o.CharHeightKr); + var _char_height_jp = _o.CharHeightJp == null ? default(StringOffset) : builder.CreateString(_o.CharHeightJp); + var _designer_name_kr = _o.DesignerNameKr == null ? default(StringOffset) : builder.CreateString(_o.DesignerNameKr); + var _designer_name_jp = _o.DesignerNameJp == null ? default(StringOffset) : builder.CreateString(_o.DesignerNameJp); + var _illustrator_name_kr = _o.IllustratorNameKr == null ? default(StringOffset) : builder.CreateString(_o.IllustratorNameKr); + var _illustrator_name_jp = _o.IllustratorNameJp == null ? default(StringOffset) : builder.CreateString(_o.IllustratorNameJp); + var _character_voice_kr = _o.CharacterVoiceKr == null ? default(StringOffset) : builder.CreateString(_o.CharacterVoiceKr); + var _character_voice_jp = _o.CharacterVoiceJp == null ? default(StringOffset) : builder.CreateString(_o.CharacterVoiceJp); + var _hobby_kr = _o.HobbyKr == null ? default(StringOffset) : builder.CreateString(_o.HobbyKr); + var _hobby_jp = _o.HobbyJp == null ? default(StringOffset) : builder.CreateString(_o.HobbyJp); + var _weapon_name_kr = _o.WeaponNameKr == null ? default(StringOffset) : builder.CreateString(_o.WeaponNameKr); + var _weapon_desc_kr = _o.WeaponDescKr == null ? default(StringOffset) : builder.CreateString(_o.WeaponDescKr); + var _weapon_name_jp = _o.WeaponNameJp == null ? default(StringOffset) : builder.CreateString(_o.WeaponNameJp); + var _weapon_desc_jp = _o.WeaponDescJp == null ? default(StringOffset) : builder.CreateString(_o.WeaponDescJp); + var _profile_introduction_kr = _o.ProfileIntroductionKr == null ? default(StringOffset) : builder.CreateString(_o.ProfileIntroductionKr); + var _profile_introduction_jp = _o.ProfileIntroductionJp == null ? default(StringOffset) : builder.CreateString(_o.ProfileIntroductionJp); + var _character_ssr_new_kr = _o.CharacterSsrNewKr == null ? default(StringOffset) : builder.CreateString(_o.CharacterSsrNewKr); + var _character_ssr_new_jp = _o.CharacterSsrNewJp == null ? default(StringOffset) : builder.CreateString(_o.CharacterSsrNewJp); return CreateLocalizeCharProfileExcel( builder, _o.CharacterId, - _StatusMessageKr, - _StatusMessageJp, - _FullNameKr, - _FullNameJp, - _FamilyNameKr, - _FamilyNameRubyKr, - _PersonalNameKr, - _PersonalNameRubyKr, - _FamilyNameJp, - _FamilyNameRubyJp, - _PersonalNameJp, - _PersonalNameRubyJp, - _SchoolYearKr, - _SchoolYearJp, - _CharacterAgeKr, - _CharacterAgeJp, - _BirthDay, - _BirthdayKr, - _BirthdayJp, - _CharHeightKr, - _CharHeightJp, - _DesignerNameKr, - _DesignerNameJp, - _IllustratorNameKr, - _IllustratorNameJp, - _CharacterVoiceKr, - _CharacterVoiceJp, - _HobbyKr, - _HobbyJp, - _WeaponNameKr, - _WeaponDescKr, - _WeaponNameJp, - _WeaponDescJp, - _ProfileIntroductionKr, - _ProfileIntroductionJp, - _CharacterSSRNewKr, - _CharacterSSRNewJp); + _status_message_kr, + _status_message_jp, + _full_name_kr, + _full_name_jp, + _family_name_kr, + _family_name_ruby_kr, + _personal_name_kr, + _personal_name_ruby_kr, + _family_name_jp, + _family_name_ruby_jp, + _personal_name_jp, + _personal_name_ruby_jp, + _school_year_kr, + _school_year_jp, + _character_age_kr, + _character_age_jp, + _birth_day, + _birthday_kr, + _birthday_jp, + _char_height_kr, + _char_height_jp, + _designer_name_kr, + _designer_name_jp, + _illustrator_name_kr, + _illustrator_name_jp, + _character_voice_kr, + _character_voice_jp, + _hobby_kr, + _hobby_jp, + _weapon_name_kr, + _weapon_desc_kr, + _weapon_name_jp, + _weapon_desc_jp, + _profile_introduction_kr, + _profile_introduction_jp, + _character_ssr_new_kr, + _character_ssr_new_jp); } } @@ -571,8 +571,8 @@ public class LocalizeCharProfileExcelT public string WeaponDescJp { get; set; } public string ProfileIntroductionKr { get; set; } public string ProfileIntroductionJp { get; set; } - public string CharacterSSRNewKr { get; set; } - public string CharacterSSRNewJp { get; set; } + public string CharacterSsrNewKr { get; set; } + public string CharacterSsrNewJp { get; set; } public LocalizeCharProfileExcelT() { this.CharacterId = 0; @@ -611,8 +611,8 @@ public class LocalizeCharProfileExcelT this.WeaponDescJp = null; this.ProfileIntroductionKr = null; this.ProfileIntroductionJp = null; - this.CharacterSSRNewKr = null; - this.CharacterSSRNewJp = null; + this.CharacterSsrNewKr = null; + this.CharacterSsrNewJp = null; } } @@ -658,8 +658,8 @@ static public class LocalizeCharProfileExcelVerify && verifier.VerifyString(tablePos, 70 /*WeaponDescJp*/, false) && verifier.VerifyString(tablePos, 72 /*ProfileIntroductionKr*/, false) && verifier.VerifyString(tablePos, 74 /*ProfileIntroductionJp*/, false) - && verifier.VerifyString(tablePos, 76 /*CharacterSSRNewKr*/, false) - && verifier.VerifyString(tablePos, 78 /*CharacterSSRNewJp*/, false) + && verifier.VerifyString(tablePos, 76 /*CharacterSsrNewKr*/, false) + && verifier.VerifyString(tablePos, 78 /*CharacterSsrNewJp*/, false) && verifier.VerifyTableEnd(tablePos); } } diff --git a/SCHALE.Common/FlatData/LocalizeCharProfileExcelTable.cs b/SCHALE.Common/FlatData/LocalizeCharProfileExcelTable.cs index bb86732..889e95f 100644 --- a/SCHALE.Common/FlatData/LocalizeCharProfileExcelTable.cs +++ b/SCHALE.Common/FlatData/LocalizeCharProfileExcelTable.cs @@ -24,9 +24,9 @@ public struct LocalizeCharProfileExcelTable : IFlatbufferObject public int DataListLength { get { int o = __p.__offset(4); return o != 0 ? __p.__vector_len(o) : 0; } } public static Offset CreateLocalizeCharProfileExcelTable(FlatBufferBuilder builder, - VectorOffset DataListOffset = default(VectorOffset)) { + VectorOffset data_listOffset = default(VectorOffset)) { builder.StartTable(1); - LocalizeCharProfileExcelTable.AddDataList(builder, DataListOffset); + LocalizeCharProfileExcelTable.AddDataList(builder, data_listOffset); return LocalizeCharProfileExcelTable.EndLocalizeCharProfileExcelTable(builder); } @@ -53,15 +53,15 @@ public struct LocalizeCharProfileExcelTable : IFlatbufferObject } public static Offset Pack(FlatBufferBuilder builder, LocalizeCharProfileExcelTableT _o) { if (_o == null) return default(Offset); - var _DataList = default(VectorOffset); + var _data_list = default(VectorOffset); if (_o.DataList != null) { - var __DataList = new Offset[_o.DataList.Count]; - for (var _j = 0; _j < __DataList.Length; ++_j) { __DataList[_j] = SCHALE.Common.FlatData.LocalizeCharProfileExcel.Pack(builder, _o.DataList[_j]); } - _DataList = CreateDataListVector(builder, __DataList); + var __data_list = new Offset[_o.DataList.Count]; + for (var _j = 0; _j < __data_list.Length; ++_j) { __data_list[_j] = SCHALE.Common.FlatData.LocalizeCharProfileExcel.Pack(builder, _o.DataList[_j]); } + _data_list = CreateDataListVector(builder, __data_list); } return CreateLocalizeCharProfileExcelTable( builder, - _DataList); + _data_list); } } diff --git a/SCHALE.Common/FlatData/LocalizeCodeInBuildExcelTable.cs b/SCHALE.Common/FlatData/LocalizeCodeInBuildExcelTable.cs deleted file mode 100644 index 08a0e74..0000000 --- a/SCHALE.Common/FlatData/LocalizeCodeInBuildExcelTable.cs +++ /dev/null @@ -1,88 +0,0 @@ -// -// automatically generated by the FlatBuffers compiler, do not modify -// - -namespace SCHALE.Common.FlatData -{ - -using global::System; -using global::System.Collections.Generic; -using global::SCHALE.Common.Crypto; -using global::Google.FlatBuffers; - -public struct LocalizeCodeInBuildExcelTable : IFlatbufferObject -{ - private Table __p; - public ByteBuffer ByteBuffer { get { return __p.bb; } } - public static void ValidateVersion() { FlatBufferConstants.FLATBUFFERS_24_3_25(); } - public static LocalizeCodeInBuildExcelTable GetRootAsLocalizeCodeInBuildExcelTable(ByteBuffer _bb) { return GetRootAsLocalizeCodeInBuildExcelTable(_bb, new LocalizeCodeInBuildExcelTable()); } - public static LocalizeCodeInBuildExcelTable GetRootAsLocalizeCodeInBuildExcelTable(ByteBuffer _bb, LocalizeCodeInBuildExcelTable obj) { return (obj.__assign(_bb.GetInt(_bb.Position) + _bb.Position, _bb)); } - public void __init(int _i, ByteBuffer _bb) { __p = new Table(_i, _bb); } - public LocalizeCodeInBuildExcelTable __assign(int _i, ByteBuffer _bb) { __init(_i, _bb); return this; } - - public SCHALE.Common.FlatData.LocalizeCodeInBuildExcel? DataList(int j) { int o = __p.__offset(4); return o != 0 ? (SCHALE.Common.FlatData.LocalizeCodeInBuildExcel?)(new SCHALE.Common.FlatData.LocalizeCodeInBuildExcel()).__assign(__p.__indirect(__p.__vector(o) + j * 4), __p.bb) : null; } - public int DataListLength { get { int o = __p.__offset(4); return o != 0 ? __p.__vector_len(o) : 0; } } - - public static Offset CreateLocalizeCodeInBuildExcelTable(FlatBufferBuilder builder, - VectorOffset DataListOffset = default(VectorOffset)) { - builder.StartTable(1); - LocalizeCodeInBuildExcelTable.AddDataList(builder, DataListOffset); - return LocalizeCodeInBuildExcelTable.EndLocalizeCodeInBuildExcelTable(builder); - } - - public static void StartLocalizeCodeInBuildExcelTable(FlatBufferBuilder builder) { builder.StartTable(1); } - public static void AddDataList(FlatBufferBuilder builder, VectorOffset dataListOffset) { builder.AddOffset(0, dataListOffset.Value, 0); } - public static VectorOffset CreateDataListVector(FlatBufferBuilder builder, Offset[] data) { builder.StartVector(4, data.Length, 4); for (int i = data.Length - 1; i >= 0; i--) builder.AddOffset(data[i].Value); return builder.EndVector(); } - public static VectorOffset CreateDataListVectorBlock(FlatBufferBuilder builder, Offset[] data) { builder.StartVector(4, data.Length, 4); builder.Add(data); return builder.EndVector(); } - public static VectorOffset CreateDataListVectorBlock(FlatBufferBuilder builder, ArraySegment> data) { builder.StartVector(4, data.Count, 4); builder.Add(data); return builder.EndVector(); } - public static VectorOffset CreateDataListVectorBlock(FlatBufferBuilder builder, IntPtr dataPtr, int sizeInBytes) { builder.StartVector(1, sizeInBytes, 1); builder.Add>(dataPtr, sizeInBytes); return builder.EndVector(); } - public static void StartDataListVector(FlatBufferBuilder builder, int numElems) { builder.StartVector(4, numElems, 4); } - public static Offset EndLocalizeCodeInBuildExcelTable(FlatBufferBuilder builder) { - int o = builder.EndTable(); - return new Offset(o); - } - public LocalizeCodeInBuildExcelTableT UnPack() { - var _o = new LocalizeCodeInBuildExcelTableT(); - this.UnPackTo(_o); - return _o; - } - public void UnPackTo(LocalizeCodeInBuildExcelTableT _o) { - byte[] key = TableEncryptionService.CreateKey("LocalizeCodeInBuildExcel"); - _o.DataList = new List(); - for (var _j = 0; _j < this.DataListLength; ++_j) {_o.DataList.Add(this.DataList(_j).HasValue ? this.DataList(_j).Value.UnPack() : null);} - } - public static Offset Pack(FlatBufferBuilder builder, LocalizeCodeInBuildExcelTableT _o) { - if (_o == null) return default(Offset); - var _DataList = default(VectorOffset); - if (_o.DataList != null) { - var __DataList = new Offset[_o.DataList.Count]; - for (var _j = 0; _j < __DataList.Length; ++_j) { __DataList[_j] = SCHALE.Common.FlatData.LocalizeCodeInBuildExcel.Pack(builder, _o.DataList[_j]); } - _DataList = CreateDataListVector(builder, __DataList); - } - return CreateLocalizeCodeInBuildExcelTable( - builder, - _DataList); - } -} - -public class LocalizeCodeInBuildExcelTableT -{ - public List DataList { get; set; } - - public LocalizeCodeInBuildExcelTableT() { - this.DataList = null; - } -} - - -static public class LocalizeCodeInBuildExcelTableVerify -{ - static public bool Verify(Google.FlatBuffers.Verifier verifier, uint tablePos) - { - return verifier.VerifyTableStart(tablePos) - && verifier.VerifyVectorOfTables(tablePos, 4 /*DataList*/, SCHALE.Common.FlatData.LocalizeCodeInBuildExcelVerify.Verify, false) - && verifier.VerifyTableEnd(tablePos); - } -} - -} diff --git a/SCHALE.Common/FlatData/LocalizeEtcExcelTable.cs b/SCHALE.Common/FlatData/LocalizeEtcExcelTable.cs deleted file mode 100644 index 0628b04..0000000 --- a/SCHALE.Common/FlatData/LocalizeEtcExcelTable.cs +++ /dev/null @@ -1,88 +0,0 @@ -// -// automatically generated by the FlatBuffers compiler, do not modify -// - -namespace SCHALE.Common.FlatData -{ - -using global::System; -using global::System.Collections.Generic; -using global::SCHALE.Common.Crypto; -using global::Google.FlatBuffers; - -public struct LocalizeEtcExcelTable : IFlatbufferObject -{ - private Table __p; - public ByteBuffer ByteBuffer { get { return __p.bb; } } - public static void ValidateVersion() { FlatBufferConstants.FLATBUFFERS_24_3_25(); } - public static LocalizeEtcExcelTable GetRootAsLocalizeEtcExcelTable(ByteBuffer _bb) { return GetRootAsLocalizeEtcExcelTable(_bb, new LocalizeEtcExcelTable()); } - public static LocalizeEtcExcelTable GetRootAsLocalizeEtcExcelTable(ByteBuffer _bb, LocalizeEtcExcelTable obj) { return (obj.__assign(_bb.GetInt(_bb.Position) + _bb.Position, _bb)); } - public void __init(int _i, ByteBuffer _bb) { __p = new Table(_i, _bb); } - public LocalizeEtcExcelTable __assign(int _i, ByteBuffer _bb) { __init(_i, _bb); return this; } - - public SCHALE.Common.FlatData.LocalizeEtcExcel? DataList(int j) { int o = __p.__offset(4); return o != 0 ? (SCHALE.Common.FlatData.LocalizeEtcExcel?)(new SCHALE.Common.FlatData.LocalizeEtcExcel()).__assign(__p.__indirect(__p.__vector(o) + j * 4), __p.bb) : null; } - public int DataListLength { get { int o = __p.__offset(4); return o != 0 ? __p.__vector_len(o) : 0; } } - - public static Offset CreateLocalizeEtcExcelTable(FlatBufferBuilder builder, - VectorOffset DataListOffset = default(VectorOffset)) { - builder.StartTable(1); - LocalizeEtcExcelTable.AddDataList(builder, DataListOffset); - return LocalizeEtcExcelTable.EndLocalizeEtcExcelTable(builder); - } - - public static void StartLocalizeEtcExcelTable(FlatBufferBuilder builder) { builder.StartTable(1); } - public static void AddDataList(FlatBufferBuilder builder, VectorOffset dataListOffset) { builder.AddOffset(0, dataListOffset.Value, 0); } - public static VectorOffset CreateDataListVector(FlatBufferBuilder builder, Offset[] data) { builder.StartVector(4, data.Length, 4); for (int i = data.Length - 1; i >= 0; i--) builder.AddOffset(data[i].Value); return builder.EndVector(); } - public static VectorOffset CreateDataListVectorBlock(FlatBufferBuilder builder, Offset[] data) { builder.StartVector(4, data.Length, 4); builder.Add(data); return builder.EndVector(); } - public static VectorOffset CreateDataListVectorBlock(FlatBufferBuilder builder, ArraySegment> data) { builder.StartVector(4, data.Count, 4); builder.Add(data); return builder.EndVector(); } - public static VectorOffset CreateDataListVectorBlock(FlatBufferBuilder builder, IntPtr dataPtr, int sizeInBytes) { builder.StartVector(1, sizeInBytes, 1); builder.Add>(dataPtr, sizeInBytes); return builder.EndVector(); } - public static void StartDataListVector(FlatBufferBuilder builder, int numElems) { builder.StartVector(4, numElems, 4); } - public static Offset EndLocalizeEtcExcelTable(FlatBufferBuilder builder) { - int o = builder.EndTable(); - return new Offset(o); - } - public LocalizeEtcExcelTableT UnPack() { - var _o = new LocalizeEtcExcelTableT(); - this.UnPackTo(_o); - return _o; - } - public void UnPackTo(LocalizeEtcExcelTableT _o) { - byte[] key = TableEncryptionService.CreateKey("LocalizeEtcExcel"); - _o.DataList = new List(); - for (var _j = 0; _j < this.DataListLength; ++_j) {_o.DataList.Add(this.DataList(_j).HasValue ? this.DataList(_j).Value.UnPack() : null);} - } - public static Offset Pack(FlatBufferBuilder builder, LocalizeEtcExcelTableT _o) { - if (_o == null) return default(Offset); - var _DataList = default(VectorOffset); - if (_o.DataList != null) { - var __DataList = new Offset[_o.DataList.Count]; - for (var _j = 0; _j < __DataList.Length; ++_j) { __DataList[_j] = SCHALE.Common.FlatData.LocalizeEtcExcel.Pack(builder, _o.DataList[_j]); } - _DataList = CreateDataListVector(builder, __DataList); - } - return CreateLocalizeEtcExcelTable( - builder, - _DataList); - } -} - -public class LocalizeEtcExcelTableT -{ - public List DataList { get; set; } - - public LocalizeEtcExcelTableT() { - this.DataList = null; - } -} - - -static public class LocalizeEtcExcelTableVerify -{ - static public bool Verify(Google.FlatBuffers.Verifier verifier, uint tablePos) - { - return verifier.VerifyTableStart(tablePos) - && verifier.VerifyVectorOfTables(tablePos, 4 /*DataList*/, SCHALE.Common.FlatData.LocalizeEtcExcelVerify.Verify, false) - && verifier.VerifyTableEnd(tablePos); - } -} - -} diff --git a/SCHALE.Common/FlatData/MailType.cs b/SCHALE.Common/FlatData/MailType.cs index 2427aed..39a5eb8 100644 --- a/SCHALE.Common/FlatData/MailType.cs +++ b/SCHALE.Common/FlatData/MailType.cs @@ -30,6 +30,8 @@ public enum MailType : int Temp_3 = 20, CouponCompleteReward = 21, BirthdayMail = 22, + FromCS = 23, + ExpiryChangeCurrency = 24, }; diff --git a/SCHALE.Common/FlatData/MemoryLobbyExcel.cs b/SCHALE.Common/FlatData/MemoryLobbyExcel.cs index 9fd4a27..4a7661b 100644 --- a/SCHALE.Common/FlatData/MemoryLobbyExcel.cs +++ b/SCHALE.Common/FlatData/MemoryLobbyExcel.cs @@ -21,86 +21,86 @@ public struct MemoryLobbyExcel : IFlatbufferObject public MemoryLobbyExcel __assign(int _i, ByteBuffer _bb) { __init(_i, _bb); return this; } public long Id { get { int o = __p.__offset(4); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } - public SCHALE.Common.FlatData.ProductionStep ProductionStep { get { int o = __p.__offset(6); return o != 0 ? (SCHALE.Common.FlatData.ProductionStep)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.ProductionStep.ToDo; } } - public uint LocalizeEtcId { get { int o = __p.__offset(8); return o != 0 ? __p.bb.GetUint(o + __p.bb_pos) : (uint)0; } } - public long CharacterId { get { int o = __p.__offset(10); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } - public string PrefabName { get { int o = __p.__offset(12); return o != 0 ? __p.__string(o + __p.bb_pos) : null; } } + public SCHALE.Common.FlatData.ProductionStep Productionstep { get { int o = __p.__offset(6); return o != 0 ? (SCHALE.Common.FlatData.ProductionStep)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.ProductionStep.ToDo; } } + public uint Localizeetcid { get { int o = __p.__offset(8); return o != 0 ? __p.bb.GetUint(o + __p.bb_pos) : (uint)0; } } + public long Characterid { get { int o = __p.__offset(10); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } + public string Prefabname { get { int o = __p.__offset(12); return o != 0 ? __p.__string(o + __p.bb_pos) : null; } } #if ENABLE_SPAN_T - public Span GetPrefabNameBytes() { return __p.__vector_as_span(12, 1); } + public Span GetPrefabnameBytes() { return __p.__vector_as_span(12, 1); } #else - public ArraySegment? GetPrefabNameBytes() { return __p.__vector_as_arraysegment(12); } + public ArraySegment? GetPrefabnameBytes() { return __p.__vector_as_arraysegment(12); } #endif - public byte[] GetPrefabNameArray() { return __p.__vector_as_array(12); } - public SCHALE.Common.FlatData.MemoryLobbyCategory MemoryLobbyCategory { get { int o = __p.__offset(14); return o != 0 ? (SCHALE.Common.FlatData.MemoryLobbyCategory)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.MemoryLobbyCategory.None; } } - public string SlotTextureName { get { int o = __p.__offset(16); return o != 0 ? __p.__string(o + __p.bb_pos) : null; } } + public byte[] GetPrefabnameArray() { return __p.__vector_as_array(12); } + public SCHALE.Common.FlatData.MemoryLobbyCategory Memorylobbycategory { get { int o = __p.__offset(14); return o != 0 ? (SCHALE.Common.FlatData.MemoryLobbyCategory)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.MemoryLobbyCategory.None; } } + public string SlottextureName { get { int o = __p.__offset(16); return o != 0 ? __p.__string(o + __p.bb_pos) : null; } } #if ENABLE_SPAN_T - public Span GetSlotTextureNameBytes() { return __p.__vector_as_span(16, 1); } + public Span GetSlottextureNameBytes() { return __p.__vector_as_span(16, 1); } #else - public ArraySegment? GetSlotTextureNameBytes() { return __p.__vector_as_arraysegment(16); } + public ArraySegment? GetSlottextureNameBytes() { return __p.__vector_as_arraysegment(16); } #endif - public byte[] GetSlotTextureNameArray() { return __p.__vector_as_array(16); } - public string RewardTextureName { get { int o = __p.__offset(18); return o != 0 ? __p.__string(o + __p.bb_pos) : null; } } + public byte[] GetSlottextureNameArray() { return __p.__vector_as_array(16); } + public string Rewardtexturename { get { int o = __p.__offset(18); return o != 0 ? __p.__string(o + __p.bb_pos) : null; } } #if ENABLE_SPAN_T - public Span GetRewardTextureNameBytes() { return __p.__vector_as_span(18, 1); } + public Span GetRewardtexturenameBytes() { return __p.__vector_as_span(18, 1); } #else - public ArraySegment? GetRewardTextureNameBytes() { return __p.__vector_as_arraysegment(18); } + public ArraySegment? GetRewardtexturenameBytes() { return __p.__vector_as_arraysegment(18); } #endif - public byte[] GetRewardTextureNameArray() { return __p.__vector_as_array(18); } - public long BGMId { get { int o = __p.__offset(20); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } - public string AudioClipJp { get { int o = __p.__offset(22); return o != 0 ? __p.__string(o + __p.bb_pos) : null; } } + public byte[] GetRewardtexturenameArray() { return __p.__vector_as_array(18); } + public long Bgmid { get { int o = __p.__offset(20); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } + public string Audioclipjp { get { int o = __p.__offset(22); return o != 0 ? __p.__string(o + __p.bb_pos) : null; } } #if ENABLE_SPAN_T - public Span GetAudioClipJpBytes() { return __p.__vector_as_span(22, 1); } + public Span GetAudioclipjpBytes() { return __p.__vector_as_span(22, 1); } #else - public ArraySegment? GetAudioClipJpBytes() { return __p.__vector_as_arraysegment(22); } + public ArraySegment? GetAudioclipjpBytes() { return __p.__vector_as_arraysegment(22); } #endif - public byte[] GetAudioClipJpArray() { return __p.__vector_as_array(22); } - public string AudioClipKr { get { int o = __p.__offset(24); return o != 0 ? __p.__string(o + __p.bb_pos) : null; } } + public byte[] GetAudioclipjpArray() { return __p.__vector_as_array(22); } + public string Audioclipkr { get { int o = __p.__offset(24); return o != 0 ? __p.__string(o + __p.bb_pos) : null; } } #if ENABLE_SPAN_T - public Span GetAudioClipKrBytes() { return __p.__vector_as_span(24, 1); } + public Span GetAudioclipkrBytes() { return __p.__vector_as_span(24, 1); } #else - public ArraySegment? GetAudioClipKrBytes() { return __p.__vector_as_arraysegment(24); } + public ArraySegment? GetAudioclipkrBytes() { return __p.__vector_as_arraysegment(24); } #endif - public byte[] GetAudioClipKrArray() { return __p.__vector_as_array(24); } + public byte[] GetAudioclipkrArray() { return __p.__vector_as_array(24); } public static Offset CreateMemoryLobbyExcel(FlatBufferBuilder builder, - long Id = 0, - SCHALE.Common.FlatData.ProductionStep ProductionStep = SCHALE.Common.FlatData.ProductionStep.ToDo, - uint LocalizeEtcId = 0, - long CharacterId = 0, - StringOffset PrefabNameOffset = default(StringOffset), - SCHALE.Common.FlatData.MemoryLobbyCategory MemoryLobbyCategory = SCHALE.Common.FlatData.MemoryLobbyCategory.None, - StringOffset SlotTextureNameOffset = default(StringOffset), - StringOffset RewardTextureNameOffset = default(StringOffset), - long BGMId = 0, - StringOffset AudioClipJpOffset = default(StringOffset), - StringOffset AudioClipKrOffset = default(StringOffset)) { + long id = 0, + SCHALE.Common.FlatData.ProductionStep productionstep = SCHALE.Common.FlatData.ProductionStep.ToDo, + uint localizeetcid = 0, + long characterid = 0, + StringOffset prefabnameOffset = default(StringOffset), + SCHALE.Common.FlatData.MemoryLobbyCategory memorylobbycategory = SCHALE.Common.FlatData.MemoryLobbyCategory.None, + StringOffset slottexture_nameOffset = default(StringOffset), + StringOffset rewardtexturenameOffset = default(StringOffset), + long bgmid = 0, + StringOffset audioclipjpOffset = default(StringOffset), + StringOffset audioclipkrOffset = default(StringOffset)) { builder.StartTable(11); - MemoryLobbyExcel.AddBGMId(builder, BGMId); - MemoryLobbyExcel.AddCharacterId(builder, CharacterId); - MemoryLobbyExcel.AddId(builder, Id); - MemoryLobbyExcel.AddAudioClipKr(builder, AudioClipKrOffset); - MemoryLobbyExcel.AddAudioClipJp(builder, AudioClipJpOffset); - MemoryLobbyExcel.AddRewardTextureName(builder, RewardTextureNameOffset); - MemoryLobbyExcel.AddSlotTextureName(builder, SlotTextureNameOffset); - MemoryLobbyExcel.AddMemoryLobbyCategory(builder, MemoryLobbyCategory); - MemoryLobbyExcel.AddPrefabName(builder, PrefabNameOffset); - MemoryLobbyExcel.AddLocalizeEtcId(builder, LocalizeEtcId); - MemoryLobbyExcel.AddProductionStep(builder, ProductionStep); + MemoryLobbyExcel.AddBgmid(builder, bgmid); + MemoryLobbyExcel.AddCharacterid(builder, characterid); + MemoryLobbyExcel.AddId(builder, id); + MemoryLobbyExcel.AddAudioclipkr(builder, audioclipkrOffset); + MemoryLobbyExcel.AddAudioclipjp(builder, audioclipjpOffset); + MemoryLobbyExcel.AddRewardtexturename(builder, rewardtexturenameOffset); + MemoryLobbyExcel.AddSlottextureName(builder, slottexture_nameOffset); + MemoryLobbyExcel.AddMemorylobbycategory(builder, memorylobbycategory); + MemoryLobbyExcel.AddPrefabname(builder, prefabnameOffset); + MemoryLobbyExcel.AddLocalizeetcid(builder, localizeetcid); + MemoryLobbyExcel.AddProductionstep(builder, productionstep); return MemoryLobbyExcel.EndMemoryLobbyExcel(builder); } public static void StartMemoryLobbyExcel(FlatBufferBuilder builder) { builder.StartTable(11); } public static void AddId(FlatBufferBuilder builder, long id) { builder.AddLong(0, id, 0); } - public static void AddProductionStep(FlatBufferBuilder builder, SCHALE.Common.FlatData.ProductionStep productionStep) { builder.AddInt(1, (int)productionStep, 0); } - public static void AddLocalizeEtcId(FlatBufferBuilder builder, uint localizeEtcId) { builder.AddUint(2, localizeEtcId, 0); } - public static void AddCharacterId(FlatBufferBuilder builder, long characterId) { builder.AddLong(3, characterId, 0); } - public static void AddPrefabName(FlatBufferBuilder builder, StringOffset prefabNameOffset) { builder.AddOffset(4, prefabNameOffset.Value, 0); } - public static void AddMemoryLobbyCategory(FlatBufferBuilder builder, SCHALE.Common.FlatData.MemoryLobbyCategory memoryLobbyCategory) { builder.AddInt(5, (int)memoryLobbyCategory, 0); } - public static void AddSlotTextureName(FlatBufferBuilder builder, StringOffset slotTextureNameOffset) { builder.AddOffset(6, slotTextureNameOffset.Value, 0); } - public static void AddRewardTextureName(FlatBufferBuilder builder, StringOffset rewardTextureNameOffset) { builder.AddOffset(7, rewardTextureNameOffset.Value, 0); } - public static void AddBGMId(FlatBufferBuilder builder, long bGMId) { builder.AddLong(8, bGMId, 0); } - public static void AddAudioClipJp(FlatBufferBuilder builder, StringOffset audioClipJpOffset) { builder.AddOffset(9, audioClipJpOffset.Value, 0); } - public static void AddAudioClipKr(FlatBufferBuilder builder, StringOffset audioClipKrOffset) { builder.AddOffset(10, audioClipKrOffset.Value, 0); } + public static void AddProductionstep(FlatBufferBuilder builder, SCHALE.Common.FlatData.ProductionStep productionstep) { builder.AddInt(1, (int)productionstep, 0); } + public static void AddLocalizeetcid(FlatBufferBuilder builder, uint localizeetcid) { builder.AddUint(2, localizeetcid, 0); } + public static void AddCharacterid(FlatBufferBuilder builder, long characterid) { builder.AddLong(3, characterid, 0); } + public static void AddPrefabname(FlatBufferBuilder builder, StringOffset prefabnameOffset) { builder.AddOffset(4, prefabnameOffset.Value, 0); } + public static void AddMemorylobbycategory(FlatBufferBuilder builder, SCHALE.Common.FlatData.MemoryLobbyCategory memorylobbycategory) { builder.AddInt(5, (int)memorylobbycategory, 0); } + public static void AddSlottextureName(FlatBufferBuilder builder, StringOffset slottextureNameOffset) { builder.AddOffset(6, slottextureNameOffset.Value, 0); } + public static void AddRewardtexturename(FlatBufferBuilder builder, StringOffset rewardtexturenameOffset) { builder.AddOffset(7, rewardtexturenameOffset.Value, 0); } + public static void AddBgmid(FlatBufferBuilder builder, long bgmid) { builder.AddLong(8, bgmid, 0); } + public static void AddAudioclipjp(FlatBufferBuilder builder, StringOffset audioclipjpOffset) { builder.AddOffset(9, audioclipjpOffset.Value, 0); } + public static void AddAudioclipkr(FlatBufferBuilder builder, StringOffset audioclipkrOffset) { builder.AddOffset(10, audioclipkrOffset.Value, 0); } public static Offset EndMemoryLobbyExcel(FlatBufferBuilder builder) { int o = builder.EndTable(); return new Offset(o); @@ -113,66 +113,66 @@ public struct MemoryLobbyExcel : IFlatbufferObject public void UnPackTo(MemoryLobbyExcelT _o) { byte[] key = TableEncryptionService.CreateKey("MemoryLobby"); _o.Id = TableEncryptionService.Convert(this.Id, key); - _o.ProductionStep = TableEncryptionService.Convert(this.ProductionStep, key); - _o.LocalizeEtcId = TableEncryptionService.Convert(this.LocalizeEtcId, key); - _o.CharacterId = TableEncryptionService.Convert(this.CharacterId, key); - _o.PrefabName = TableEncryptionService.Convert(this.PrefabName, key); - _o.MemoryLobbyCategory = TableEncryptionService.Convert(this.MemoryLobbyCategory, key); - _o.SlotTextureName = TableEncryptionService.Convert(this.SlotTextureName, key); - _o.RewardTextureName = TableEncryptionService.Convert(this.RewardTextureName, key); - _o.BGMId = TableEncryptionService.Convert(this.BGMId, key); - _o.AudioClipJp = TableEncryptionService.Convert(this.AudioClipJp, key); - _o.AudioClipKr = TableEncryptionService.Convert(this.AudioClipKr, key); + _o.Productionstep = TableEncryptionService.Convert(this.Productionstep, key); + _o.Localizeetcid = TableEncryptionService.Convert(this.Localizeetcid, key); + _o.Characterid = TableEncryptionService.Convert(this.Characterid, key); + _o.Prefabname = TableEncryptionService.Convert(this.Prefabname, key); + _o.Memorylobbycategory = TableEncryptionService.Convert(this.Memorylobbycategory, key); + _o.SlottextureName = TableEncryptionService.Convert(this.SlottextureName, key); + _o.Rewardtexturename = TableEncryptionService.Convert(this.Rewardtexturename, key); + _o.Bgmid = TableEncryptionService.Convert(this.Bgmid, key); + _o.Audioclipjp = TableEncryptionService.Convert(this.Audioclipjp, key); + _o.Audioclipkr = TableEncryptionService.Convert(this.Audioclipkr, key); } public static Offset Pack(FlatBufferBuilder builder, MemoryLobbyExcelT _o) { if (_o == null) return default(Offset); - var _PrefabName = _o.PrefabName == null ? default(StringOffset) : builder.CreateString(_o.PrefabName); - var _SlotTextureName = _o.SlotTextureName == null ? default(StringOffset) : builder.CreateString(_o.SlotTextureName); - var _RewardTextureName = _o.RewardTextureName == null ? default(StringOffset) : builder.CreateString(_o.RewardTextureName); - var _AudioClipJp = _o.AudioClipJp == null ? default(StringOffset) : builder.CreateString(_o.AudioClipJp); - var _AudioClipKr = _o.AudioClipKr == null ? default(StringOffset) : builder.CreateString(_o.AudioClipKr); + var _prefabname = _o.Prefabname == null ? default(StringOffset) : builder.CreateString(_o.Prefabname); + var _slottexture_name = _o.SlottextureName == null ? default(StringOffset) : builder.CreateString(_o.SlottextureName); + var _rewardtexturename = _o.Rewardtexturename == null ? default(StringOffset) : builder.CreateString(_o.Rewardtexturename); + var _audioclipjp = _o.Audioclipjp == null ? default(StringOffset) : builder.CreateString(_o.Audioclipjp); + var _audioclipkr = _o.Audioclipkr == null ? default(StringOffset) : builder.CreateString(_o.Audioclipkr); return CreateMemoryLobbyExcel( builder, _o.Id, - _o.ProductionStep, - _o.LocalizeEtcId, - _o.CharacterId, - _PrefabName, - _o.MemoryLobbyCategory, - _SlotTextureName, - _RewardTextureName, - _o.BGMId, - _AudioClipJp, - _AudioClipKr); + _o.Productionstep, + _o.Localizeetcid, + _o.Characterid, + _prefabname, + _o.Memorylobbycategory, + _slottexture_name, + _rewardtexturename, + _o.Bgmid, + _audioclipjp, + _audioclipkr); } } public class MemoryLobbyExcelT { public long Id { get; set; } - public SCHALE.Common.FlatData.ProductionStep ProductionStep { get; set; } - public uint LocalizeEtcId { get; set; } - public long CharacterId { get; set; } - public string PrefabName { get; set; } - public SCHALE.Common.FlatData.MemoryLobbyCategory MemoryLobbyCategory { get; set; } - public string SlotTextureName { get; set; } - public string RewardTextureName { get; set; } - public long BGMId { get; set; } - public string AudioClipJp { get; set; } - public string AudioClipKr { get; set; } + public SCHALE.Common.FlatData.ProductionStep Productionstep { get; set; } + public uint Localizeetcid { get; set; } + public long Characterid { get; set; } + public string Prefabname { get; set; } + public SCHALE.Common.FlatData.MemoryLobbyCategory Memorylobbycategory { get; set; } + public string SlottextureName { get; set; } + public string Rewardtexturename { get; set; } + public long Bgmid { get; set; } + public string Audioclipjp { get; set; } + public string Audioclipkr { get; set; } public MemoryLobbyExcelT() { this.Id = 0; - this.ProductionStep = SCHALE.Common.FlatData.ProductionStep.ToDo; - this.LocalizeEtcId = 0; - this.CharacterId = 0; - this.PrefabName = null; - this.MemoryLobbyCategory = SCHALE.Common.FlatData.MemoryLobbyCategory.None; - this.SlotTextureName = null; - this.RewardTextureName = null; - this.BGMId = 0; - this.AudioClipJp = null; - this.AudioClipKr = null; + this.Productionstep = SCHALE.Common.FlatData.ProductionStep.ToDo; + this.Localizeetcid = 0; + this.Characterid = 0; + this.Prefabname = null; + this.Memorylobbycategory = SCHALE.Common.FlatData.MemoryLobbyCategory.None; + this.SlottextureName = null; + this.Rewardtexturename = null; + this.Bgmid = 0; + this.Audioclipjp = null; + this.Audioclipkr = null; } } @@ -183,16 +183,16 @@ static public class MemoryLobbyExcelVerify { return verifier.VerifyTableStart(tablePos) && verifier.VerifyField(tablePos, 4 /*Id*/, 8 /*long*/, 8, false) - && verifier.VerifyField(tablePos, 6 /*ProductionStep*/, 4 /*SCHALE.Common.FlatData.ProductionStep*/, 4, false) - && verifier.VerifyField(tablePos, 8 /*LocalizeEtcId*/, 4 /*uint*/, 4, false) - && verifier.VerifyField(tablePos, 10 /*CharacterId*/, 8 /*long*/, 8, false) - && verifier.VerifyString(tablePos, 12 /*PrefabName*/, false) - && verifier.VerifyField(tablePos, 14 /*MemoryLobbyCategory*/, 4 /*SCHALE.Common.FlatData.MemoryLobbyCategory*/, 4, false) - && verifier.VerifyString(tablePos, 16 /*SlotTextureName*/, false) - && verifier.VerifyString(tablePos, 18 /*RewardTextureName*/, false) - && verifier.VerifyField(tablePos, 20 /*BGMId*/, 8 /*long*/, 8, false) - && verifier.VerifyString(tablePos, 22 /*AudioClipJp*/, false) - && verifier.VerifyString(tablePos, 24 /*AudioClipKr*/, false) + && verifier.VerifyField(tablePos, 6 /*Productionstep*/, 4 /*SCHALE.Common.FlatData.ProductionStep*/, 4, false) + && verifier.VerifyField(tablePos, 8 /*Localizeetcid*/, 4 /*uint*/, 4, false) + && verifier.VerifyField(tablePos, 10 /*Characterid*/, 8 /*long*/, 8, false) + && verifier.VerifyString(tablePos, 12 /*Prefabname*/, false) + && verifier.VerifyField(tablePos, 14 /*Memorylobbycategory*/, 4 /*SCHALE.Common.FlatData.MemoryLobbyCategory*/, 4, false) + && verifier.VerifyString(tablePos, 16 /*SlottextureName*/, false) + && verifier.VerifyString(tablePos, 18 /*Rewardtexturename*/, false) + && verifier.VerifyField(tablePos, 20 /*Bgmid*/, 8 /*long*/, 8, false) + && verifier.VerifyString(tablePos, 22 /*Audioclipjp*/, false) + && verifier.VerifyString(tablePos, 24 /*Audioclipkr*/, false) && verifier.VerifyTableEnd(tablePos); } } diff --git a/SCHALE.Common/FlatData/MemoryLobbyExcelTable.cs b/SCHALE.Common/FlatData/MemoryLobbyExcelTable.cs index d555fd9..524bf24 100644 --- a/SCHALE.Common/FlatData/MemoryLobbyExcelTable.cs +++ b/SCHALE.Common/FlatData/MemoryLobbyExcelTable.cs @@ -24,9 +24,9 @@ public struct MemoryLobbyExcelTable : IFlatbufferObject public int DataListLength { get { int o = __p.__offset(4); return o != 0 ? __p.__vector_len(o) : 0; } } public static Offset CreateMemoryLobbyExcelTable(FlatBufferBuilder builder, - VectorOffset DataListOffset = default(VectorOffset)) { + VectorOffset data_listOffset = default(VectorOffset)) { builder.StartTable(1); - MemoryLobbyExcelTable.AddDataList(builder, DataListOffset); + MemoryLobbyExcelTable.AddDataList(builder, data_listOffset); return MemoryLobbyExcelTable.EndMemoryLobbyExcelTable(builder); } @@ -53,15 +53,15 @@ public struct MemoryLobbyExcelTable : IFlatbufferObject } public static Offset Pack(FlatBufferBuilder builder, MemoryLobbyExcelTableT _o) { if (_o == null) return default(Offset); - var _DataList = default(VectorOffset); + var _data_list = default(VectorOffset); if (_o.DataList != null) { - var __DataList = new Offset[_o.DataList.Count]; - for (var _j = 0; _j < __DataList.Length; ++_j) { __DataList[_j] = SCHALE.Common.FlatData.MemoryLobbyExcel.Pack(builder, _o.DataList[_j]); } - _DataList = CreateDataListVector(builder, __DataList); + var __data_list = new Offset[_o.DataList.Count]; + for (var _j = 0; _j < __data_list.Length; ++_j) { __data_list[_j] = SCHALE.Common.FlatData.MemoryLobbyExcel.Pack(builder, _o.DataList[_j]); } + _data_list = CreateDataListVector(builder, __data_list); } return CreateMemoryLobbyExcelTable( builder, - _DataList); + _data_list); } } diff --git a/SCHALE.Common/FlatData/MessagePopupExcel.cs b/SCHALE.Common/FlatData/MessagePopupExcel.cs index fb36c98..01dffd1 100644 --- a/SCHALE.Common/FlatData/MessagePopupExcel.cs +++ b/SCHALE.Common/FlatData/MessagePopupExcel.cs @@ -21,7 +21,7 @@ public struct MessagePopupExcel : IFlatbufferObject public MessagePopupExcel __assign(int _i, ByteBuffer _bb) { __init(_i, _bb); return this; } public uint StringId { get { int o = __p.__offset(4); return o != 0 ? __p.bb.GetUint(o + __p.bb_pos) : (uint)0; } } - public SCHALE.Common.FlatData.MessagePopupLayout MessagePopupLayout { get { int o = __p.__offset(6); return o != 0 ? (SCHALE.Common.FlatData.MessagePopupLayout)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.MessagePopupLayout.TextOnly; } } + public SCHALE.Common.FlatData.MessagePopupLayout MessagePopupLayout_ { get { int o = __p.__offset(6); return o != 0 ? (SCHALE.Common.FlatData.MessagePopupLayout)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.MessagePopupLayout.TextOnly; } } public SCHALE.Common.FlatData.MessagePopupImagePositionType OrderType { get { int o = __p.__offset(8); return o != 0 ? (SCHALE.Common.FlatData.MessagePopupImagePositionType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.MessagePopupImagePositionType.ImageFirst; } } public string Image { get { int o = __p.__offset(10); return o != 0 ? __p.__string(o + __p.bb_pos) : null; } } #if ENABLE_SPAN_T @@ -65,7 +65,7 @@ public struct MessagePopupExcel : IFlatbufferObject public static Offset CreateMessagePopupExcel(FlatBufferBuilder builder, uint StringId = 0, - SCHALE.Common.FlatData.MessagePopupLayout MessagePopupLayout = SCHALE.Common.FlatData.MessagePopupLayout.TextOnly, + SCHALE.Common.FlatData.MessagePopupLayout MessagePopupLayout_ = SCHALE.Common.FlatData.MessagePopupLayout.TextOnly, SCHALE.Common.FlatData.MessagePopupImagePositionType OrderType = SCHALE.Common.FlatData.MessagePopupImagePositionType.ImageFirst, StringOffset ImageOffset = default(StringOffset), uint TitleText = 0, @@ -88,7 +88,7 @@ public struct MessagePopupExcel : IFlatbufferObject MessagePopupExcel.AddTitleText(builder, TitleText); MessagePopupExcel.AddImage(builder, ImageOffset); MessagePopupExcel.AddOrderType(builder, OrderType); - MessagePopupExcel.AddMessagePopupLayout(builder, MessagePopupLayout); + MessagePopupExcel.AddMessagePopupLayout_(builder, MessagePopupLayout_); MessagePopupExcel.AddStringId(builder, StringId); MessagePopupExcel.AddDisplayXButton(builder, DisplayXButton); return MessagePopupExcel.EndMessagePopupExcel(builder); @@ -96,7 +96,7 @@ public struct MessagePopupExcel : IFlatbufferObject public static void StartMessagePopupExcel(FlatBufferBuilder builder) { builder.StartTable(13); } public static void AddStringId(FlatBufferBuilder builder, uint stringId) { builder.AddUint(0, stringId, 0); } - public static void AddMessagePopupLayout(FlatBufferBuilder builder, SCHALE.Common.FlatData.MessagePopupLayout messagePopupLayout) { builder.AddInt(1, (int)messagePopupLayout, 0); } + public static void AddMessagePopupLayout_(FlatBufferBuilder builder, SCHALE.Common.FlatData.MessagePopupLayout messagePopupLayout_) { builder.AddInt(1, (int)messagePopupLayout_, 0); } public static void AddOrderType(FlatBufferBuilder builder, SCHALE.Common.FlatData.MessagePopupImagePositionType orderType) { builder.AddInt(2, (int)orderType, 0); } public static void AddImage(FlatBufferBuilder builder, StringOffset imageOffset) { builder.AddOffset(3, imageOffset.Value, 0); } public static void AddTitleText(FlatBufferBuilder builder, uint titleText) { builder.AddUint(4, titleText, 0); } @@ -145,7 +145,7 @@ public struct MessagePopupExcel : IFlatbufferObject public void UnPackTo(MessagePopupExcelT _o) { byte[] key = TableEncryptionService.CreateKey("MessagePopup"); _o.StringId = TableEncryptionService.Convert(this.StringId, key); - _o.MessagePopupLayout = TableEncryptionService.Convert(this.MessagePopupLayout, key); + _o.MessagePopupLayout_ = TableEncryptionService.Convert(this.MessagePopupLayout_, key); _o.OrderType = TableEncryptionService.Convert(this.OrderType, key); _o.Image = TableEncryptionService.Convert(this.Image, key); _o.TitleText = TableEncryptionService.Convert(this.TitleText, key); @@ -196,7 +196,7 @@ public struct MessagePopupExcel : IFlatbufferObject return CreateMessagePopupExcel( builder, _o.StringId, - _o.MessagePopupLayout, + _o.MessagePopupLayout_, _o.OrderType, _Image, _o.TitleText, @@ -214,7 +214,7 @@ public struct MessagePopupExcel : IFlatbufferObject public class MessagePopupExcelT { public uint StringId { get; set; } - public SCHALE.Common.FlatData.MessagePopupLayout MessagePopupLayout { get; set; } + public SCHALE.Common.FlatData.MessagePopupLayout MessagePopupLayout_ { get; set; } public SCHALE.Common.FlatData.MessagePopupImagePositionType OrderType { get; set; } public string Image { get; set; } public uint TitleText { get; set; } @@ -229,7 +229,7 @@ public class MessagePopupExcelT public MessagePopupExcelT() { this.StringId = 0; - this.MessagePopupLayout = SCHALE.Common.FlatData.MessagePopupLayout.TextOnly; + this.MessagePopupLayout_ = SCHALE.Common.FlatData.MessagePopupLayout.TextOnly; this.OrderType = SCHALE.Common.FlatData.MessagePopupImagePositionType.ImageFirst; this.Image = null; this.TitleText = 0; @@ -251,7 +251,7 @@ static public class MessagePopupExcelVerify { return verifier.VerifyTableStart(tablePos) && verifier.VerifyField(tablePos, 4 /*StringId*/, 4 /*uint*/, 4, false) - && verifier.VerifyField(tablePos, 6 /*MessagePopupLayout*/, 4 /*SCHALE.Common.FlatData.MessagePopupLayout*/, 4, false) + && verifier.VerifyField(tablePos, 6 /*MessagePopupLayout_*/, 4 /*SCHALE.Common.FlatData.MessagePopupLayout*/, 4, false) && verifier.VerifyField(tablePos, 8 /*OrderType*/, 4 /*SCHALE.Common.FlatData.MessagePopupImagePositionType*/, 4, false) && verifier.VerifyString(tablePos, 10 /*Image*/, false) && verifier.VerifyField(tablePos, 12 /*TitleText*/, 4 /*uint*/, 4, false) diff --git a/SCHALE.Common/FlatData/MiniGameDefenseCharacterBanExcel.cs b/SCHALE.Common/FlatData/MiniGameDefenseCharacterBanExcel.cs new file mode 100644 index 0000000..2d68267 --- /dev/null +++ b/SCHALE.Common/FlatData/MiniGameDefenseCharacterBanExcel.cs @@ -0,0 +1,84 @@ +// +// automatically generated by the FlatBuffers compiler, do not modify +// + +namespace SCHALE.Common.FlatData +{ + +using global::System; +using global::System.Collections.Generic; +using global::SCHALE.Common.Crypto; +using global::Google.FlatBuffers; + +public struct MiniGameDefenseCharacterBanExcel : IFlatbufferObject +{ + private Table __p; + public ByteBuffer ByteBuffer { get { return __p.bb; } } + public static void ValidateVersion() { FlatBufferConstants.FLATBUFFERS_24_3_25(); } + public static MiniGameDefenseCharacterBanExcel GetRootAsMiniGameDefenseCharacterBanExcel(ByteBuffer _bb) { return GetRootAsMiniGameDefenseCharacterBanExcel(_bb, new MiniGameDefenseCharacterBanExcel()); } + public static MiniGameDefenseCharacterBanExcel GetRootAsMiniGameDefenseCharacterBanExcel(ByteBuffer _bb, MiniGameDefenseCharacterBanExcel obj) { return (obj.__assign(_bb.GetInt(_bb.Position) + _bb.Position, _bb)); } + public void __init(int _i, ByteBuffer _bb) { __p = new Table(_i, _bb); } + public MiniGameDefenseCharacterBanExcel __assign(int _i, ByteBuffer _bb) { __init(_i, _bb); return this; } + + public long EventContentId { get { int o = __p.__offset(4); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } + public long CharacterId { get { int o = __p.__offset(6); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } + + public static Offset CreateMiniGameDefenseCharacterBanExcel(FlatBufferBuilder builder, + long EventContentId = 0, + long CharacterId = 0) { + builder.StartTable(2); + MiniGameDefenseCharacterBanExcel.AddCharacterId(builder, CharacterId); + MiniGameDefenseCharacterBanExcel.AddEventContentId(builder, EventContentId); + return MiniGameDefenseCharacterBanExcel.EndMiniGameDefenseCharacterBanExcel(builder); + } + + public static void StartMiniGameDefenseCharacterBanExcel(FlatBufferBuilder builder) { builder.StartTable(2); } + public static void AddEventContentId(FlatBufferBuilder builder, long eventContentId) { builder.AddLong(0, eventContentId, 0); } + public static void AddCharacterId(FlatBufferBuilder builder, long characterId) { builder.AddLong(1, characterId, 0); } + public static Offset EndMiniGameDefenseCharacterBanExcel(FlatBufferBuilder builder) { + int o = builder.EndTable(); + return new Offset(o); + } + public MiniGameDefenseCharacterBanExcelT UnPack() { + var _o = new MiniGameDefenseCharacterBanExcelT(); + this.UnPackTo(_o); + return _o; + } + public void UnPackTo(MiniGameDefenseCharacterBanExcelT _o) { + byte[] key = TableEncryptionService.CreateKey("MiniGameDefenseCharacterBan"); + _o.EventContentId = TableEncryptionService.Convert(this.EventContentId, key); + _o.CharacterId = TableEncryptionService.Convert(this.CharacterId, key); + } + public static Offset Pack(FlatBufferBuilder builder, MiniGameDefenseCharacterBanExcelT _o) { + if (_o == null) return default(Offset); + return CreateMiniGameDefenseCharacterBanExcel( + builder, + _o.EventContentId, + _o.CharacterId); + } +} + +public class MiniGameDefenseCharacterBanExcelT +{ + public long EventContentId { get; set; } + public long CharacterId { get; set; } + + public MiniGameDefenseCharacterBanExcelT() { + this.EventContentId = 0; + this.CharacterId = 0; + } +} + + +static public class MiniGameDefenseCharacterBanExcelVerify +{ + static public bool Verify(Google.FlatBuffers.Verifier verifier, uint tablePos) + { + return verifier.VerifyTableStart(tablePos) + && verifier.VerifyField(tablePos, 4 /*EventContentId*/, 8 /*long*/, 8, false) + && verifier.VerifyField(tablePos, 6 /*CharacterId*/, 8 /*long*/, 8, false) + && verifier.VerifyTableEnd(tablePos); + } +} + +} diff --git a/SCHALE.Common/FlatData/MiniGameDefenseFixedStatExcel.cs b/SCHALE.Common/FlatData/MiniGameDefenseFixedStatExcel.cs new file mode 100644 index 0000000..88b3c6a --- /dev/null +++ b/SCHALE.Common/FlatData/MiniGameDefenseFixedStatExcel.cs @@ -0,0 +1,201 @@ +// +// automatically generated by the FlatBuffers compiler, do not modify +// + +namespace SCHALE.Common.FlatData +{ + +using global::System; +using global::System.Collections.Generic; +using global::SCHALE.Common.Crypto; +using global::Google.FlatBuffers; + +public struct MiniGameDefenseFixedStatExcel : IFlatbufferObject +{ + private Table __p; + public ByteBuffer ByteBuffer { get { return __p.bb; } } + public static void ValidateVersion() { FlatBufferConstants.FLATBUFFERS_24_3_25(); } + public static MiniGameDefenseFixedStatExcel GetRootAsMiniGameDefenseFixedStatExcel(ByteBuffer _bb) { return GetRootAsMiniGameDefenseFixedStatExcel(_bb, new MiniGameDefenseFixedStatExcel()); } + public static MiniGameDefenseFixedStatExcel GetRootAsMiniGameDefenseFixedStatExcel(ByteBuffer _bb, MiniGameDefenseFixedStatExcel obj) { return (obj.__assign(_bb.GetInt(_bb.Position) + _bb.Position, _bb)); } + public void __init(int _i, ByteBuffer _bb) { __p = new Table(_i, _bb); } + public MiniGameDefenseFixedStatExcel __assign(int _i, ByteBuffer _bb) { __init(_i, _bb); return this; } + + public long MinigameDefenseFixedStatId { get { int o = __p.__offset(4); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } + public int Level { get { int o = __p.__offset(6); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } + public int Grade { get { int o = __p.__offset(8); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } + public int ExSkillLevel { get { int o = __p.__offset(10); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } + public int NoneExSkillLevel { get { int o = __p.__offset(12); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } + public int Equipment1Tier { get { int o = __p.__offset(14); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } + public int Equipment1Level { get { int o = __p.__offset(16); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } + public int Equipment2Tier { get { int o = __p.__offset(18); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } + public int Equipment2Level { get { int o = __p.__offset(20); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } + public int Equipment3Tier { get { int o = __p.__offset(22); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } + public int Equipment3Level { get { int o = __p.__offset(24); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } + public int CharacterWeaponGrade { get { int o = __p.__offset(26); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } + public int CharacterWeaponLevel { get { int o = __p.__offset(28); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } + public int CharacterGearTier { get { int o = __p.__offset(30); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } + public int CharacterGearLevel { get { int o = __p.__offset(32); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } + + public static Offset CreateMiniGameDefenseFixedStatExcel(FlatBufferBuilder builder, + long MinigameDefenseFixedStatId = 0, + int Level = 0, + int Grade = 0, + int ExSkillLevel = 0, + int NoneExSkillLevel = 0, + int Equipment1Tier = 0, + int Equipment1Level = 0, + int Equipment2Tier = 0, + int Equipment2Level = 0, + int Equipment3Tier = 0, + int Equipment3Level = 0, + int CharacterWeaponGrade = 0, + int CharacterWeaponLevel = 0, + int CharacterGearTier = 0, + int CharacterGearLevel = 0) { + builder.StartTable(15); + MiniGameDefenseFixedStatExcel.AddMinigameDefenseFixedStatId(builder, MinigameDefenseFixedStatId); + MiniGameDefenseFixedStatExcel.AddCharacterGearLevel(builder, CharacterGearLevel); + MiniGameDefenseFixedStatExcel.AddCharacterGearTier(builder, CharacterGearTier); + MiniGameDefenseFixedStatExcel.AddCharacterWeaponLevel(builder, CharacterWeaponLevel); + MiniGameDefenseFixedStatExcel.AddCharacterWeaponGrade(builder, CharacterWeaponGrade); + MiniGameDefenseFixedStatExcel.AddEquipment3Level(builder, Equipment3Level); + MiniGameDefenseFixedStatExcel.AddEquipment3Tier(builder, Equipment3Tier); + MiniGameDefenseFixedStatExcel.AddEquipment2Level(builder, Equipment2Level); + MiniGameDefenseFixedStatExcel.AddEquipment2Tier(builder, Equipment2Tier); + MiniGameDefenseFixedStatExcel.AddEquipment1Level(builder, Equipment1Level); + MiniGameDefenseFixedStatExcel.AddEquipment1Tier(builder, Equipment1Tier); + MiniGameDefenseFixedStatExcel.AddNoneExSkillLevel(builder, NoneExSkillLevel); + MiniGameDefenseFixedStatExcel.AddExSkillLevel(builder, ExSkillLevel); + MiniGameDefenseFixedStatExcel.AddGrade(builder, Grade); + MiniGameDefenseFixedStatExcel.AddLevel(builder, Level); + return MiniGameDefenseFixedStatExcel.EndMiniGameDefenseFixedStatExcel(builder); + } + + public static void StartMiniGameDefenseFixedStatExcel(FlatBufferBuilder builder) { builder.StartTable(15); } + public static void AddMinigameDefenseFixedStatId(FlatBufferBuilder builder, long minigameDefenseFixedStatId) { builder.AddLong(0, minigameDefenseFixedStatId, 0); } + public static void AddLevel(FlatBufferBuilder builder, int level) { builder.AddInt(1, level, 0); } + public static void AddGrade(FlatBufferBuilder builder, int grade) { builder.AddInt(2, grade, 0); } + public static void AddExSkillLevel(FlatBufferBuilder builder, int exSkillLevel) { builder.AddInt(3, exSkillLevel, 0); } + public static void AddNoneExSkillLevel(FlatBufferBuilder builder, int noneExSkillLevel) { builder.AddInt(4, noneExSkillLevel, 0); } + public static void AddEquipment1Tier(FlatBufferBuilder builder, int equipment1Tier) { builder.AddInt(5, equipment1Tier, 0); } + public static void AddEquipment1Level(FlatBufferBuilder builder, int equipment1Level) { builder.AddInt(6, equipment1Level, 0); } + public static void AddEquipment2Tier(FlatBufferBuilder builder, int equipment2Tier) { builder.AddInt(7, equipment2Tier, 0); } + public static void AddEquipment2Level(FlatBufferBuilder builder, int equipment2Level) { builder.AddInt(8, equipment2Level, 0); } + public static void AddEquipment3Tier(FlatBufferBuilder builder, int equipment3Tier) { builder.AddInt(9, equipment3Tier, 0); } + public static void AddEquipment3Level(FlatBufferBuilder builder, int equipment3Level) { builder.AddInt(10, equipment3Level, 0); } + public static void AddCharacterWeaponGrade(FlatBufferBuilder builder, int characterWeaponGrade) { builder.AddInt(11, characterWeaponGrade, 0); } + public static void AddCharacterWeaponLevel(FlatBufferBuilder builder, int characterWeaponLevel) { builder.AddInt(12, characterWeaponLevel, 0); } + public static void AddCharacterGearTier(FlatBufferBuilder builder, int characterGearTier) { builder.AddInt(13, characterGearTier, 0); } + public static void AddCharacterGearLevel(FlatBufferBuilder builder, int characterGearLevel) { builder.AddInt(14, characterGearLevel, 0); } + public static Offset EndMiniGameDefenseFixedStatExcel(FlatBufferBuilder builder) { + int o = builder.EndTable(); + return new Offset(o); + } + public MiniGameDefenseFixedStatExcelT UnPack() { + var _o = new MiniGameDefenseFixedStatExcelT(); + this.UnPackTo(_o); + return _o; + } + public void UnPackTo(MiniGameDefenseFixedStatExcelT _o) { + byte[] key = TableEncryptionService.CreateKey("MiniGameDefenseFixedStat"); + _o.MinigameDefenseFixedStatId = TableEncryptionService.Convert(this.MinigameDefenseFixedStatId, key); + _o.Level = TableEncryptionService.Convert(this.Level, key); + _o.Grade = TableEncryptionService.Convert(this.Grade, key); + _o.ExSkillLevel = TableEncryptionService.Convert(this.ExSkillLevel, key); + _o.NoneExSkillLevel = TableEncryptionService.Convert(this.NoneExSkillLevel, key); + _o.Equipment1Tier = TableEncryptionService.Convert(this.Equipment1Tier, key); + _o.Equipment1Level = TableEncryptionService.Convert(this.Equipment1Level, key); + _o.Equipment2Tier = TableEncryptionService.Convert(this.Equipment2Tier, key); + _o.Equipment2Level = TableEncryptionService.Convert(this.Equipment2Level, key); + _o.Equipment3Tier = TableEncryptionService.Convert(this.Equipment3Tier, key); + _o.Equipment3Level = TableEncryptionService.Convert(this.Equipment3Level, key); + _o.CharacterWeaponGrade = TableEncryptionService.Convert(this.CharacterWeaponGrade, key); + _o.CharacterWeaponLevel = TableEncryptionService.Convert(this.CharacterWeaponLevel, key); + _o.CharacterGearTier = TableEncryptionService.Convert(this.CharacterGearTier, key); + _o.CharacterGearLevel = TableEncryptionService.Convert(this.CharacterGearLevel, key); + } + public static Offset Pack(FlatBufferBuilder builder, MiniGameDefenseFixedStatExcelT _o) { + if (_o == null) return default(Offset); + return CreateMiniGameDefenseFixedStatExcel( + builder, + _o.MinigameDefenseFixedStatId, + _o.Level, + _o.Grade, + _o.ExSkillLevel, + _o.NoneExSkillLevel, + _o.Equipment1Tier, + _o.Equipment1Level, + _o.Equipment2Tier, + _o.Equipment2Level, + _o.Equipment3Tier, + _o.Equipment3Level, + _o.CharacterWeaponGrade, + _o.CharacterWeaponLevel, + _o.CharacterGearTier, + _o.CharacterGearLevel); + } +} + +public class MiniGameDefenseFixedStatExcelT +{ + public long MinigameDefenseFixedStatId { get; set; } + public int Level { get; set; } + public int Grade { get; set; } + public int ExSkillLevel { get; set; } + public int NoneExSkillLevel { get; set; } + public int Equipment1Tier { get; set; } + public int Equipment1Level { get; set; } + public int Equipment2Tier { get; set; } + public int Equipment2Level { get; set; } + public int Equipment3Tier { get; set; } + public int Equipment3Level { get; set; } + public int CharacterWeaponGrade { get; set; } + public int CharacterWeaponLevel { get; set; } + public int CharacterGearTier { get; set; } + public int CharacterGearLevel { get; set; } + + public MiniGameDefenseFixedStatExcelT() { + this.MinigameDefenseFixedStatId = 0; + this.Level = 0; + this.Grade = 0; + this.ExSkillLevel = 0; + this.NoneExSkillLevel = 0; + this.Equipment1Tier = 0; + this.Equipment1Level = 0; + this.Equipment2Tier = 0; + this.Equipment2Level = 0; + this.Equipment3Tier = 0; + this.Equipment3Level = 0; + this.CharacterWeaponGrade = 0; + this.CharacterWeaponLevel = 0; + this.CharacterGearTier = 0; + this.CharacterGearLevel = 0; + } +} + + +static public class MiniGameDefenseFixedStatExcelVerify +{ + static public bool Verify(Google.FlatBuffers.Verifier verifier, uint tablePos) + { + return verifier.VerifyTableStart(tablePos) + && verifier.VerifyField(tablePos, 4 /*MinigameDefenseFixedStatId*/, 8 /*long*/, 8, false) + && verifier.VerifyField(tablePos, 6 /*Level*/, 4 /*int*/, 4, false) + && verifier.VerifyField(tablePos, 8 /*Grade*/, 4 /*int*/, 4, false) + && verifier.VerifyField(tablePos, 10 /*ExSkillLevel*/, 4 /*int*/, 4, false) + && verifier.VerifyField(tablePos, 12 /*NoneExSkillLevel*/, 4 /*int*/, 4, false) + && verifier.VerifyField(tablePos, 14 /*Equipment1Tier*/, 4 /*int*/, 4, false) + && verifier.VerifyField(tablePos, 16 /*Equipment1Level*/, 4 /*int*/, 4, false) + && verifier.VerifyField(tablePos, 18 /*Equipment2Tier*/, 4 /*int*/, 4, false) + && verifier.VerifyField(tablePos, 20 /*Equipment2Level*/, 4 /*int*/, 4, false) + && verifier.VerifyField(tablePos, 22 /*Equipment3Tier*/, 4 /*int*/, 4, false) + && verifier.VerifyField(tablePos, 24 /*Equipment3Level*/, 4 /*int*/, 4, false) + && verifier.VerifyField(tablePos, 26 /*CharacterWeaponGrade*/, 4 /*int*/, 4, false) + && verifier.VerifyField(tablePos, 28 /*CharacterWeaponLevel*/, 4 /*int*/, 4, false) + && verifier.VerifyField(tablePos, 30 /*CharacterGearTier*/, 4 /*int*/, 4, false) + && verifier.VerifyField(tablePos, 32 /*CharacterGearLevel*/, 4 /*int*/, 4, false) + && verifier.VerifyTableEnd(tablePos); + } +} + +} diff --git a/SCHALE.Common/FlatData/MiniGameDefenseInfoExcel.cs b/SCHALE.Common/FlatData/MiniGameDefenseInfoExcel.cs new file mode 100644 index 0000000..6120eed --- /dev/null +++ b/SCHALE.Common/FlatData/MiniGameDefenseInfoExcel.cs @@ -0,0 +1,111 @@ +// +// automatically generated by the FlatBuffers compiler, do not modify +// + +namespace SCHALE.Common.FlatData +{ + +using global::System; +using global::System.Collections.Generic; +using global::SCHALE.Common.Crypto; +using global::Google.FlatBuffers; + +public struct MiniGameDefenseInfoExcel : IFlatbufferObject +{ + private Table __p; + public ByteBuffer ByteBuffer { get { return __p.bb; } } + public static void ValidateVersion() { FlatBufferConstants.FLATBUFFERS_24_3_25(); } + public static MiniGameDefenseInfoExcel GetRootAsMiniGameDefenseInfoExcel(ByteBuffer _bb) { return GetRootAsMiniGameDefenseInfoExcel(_bb, new MiniGameDefenseInfoExcel()); } + public static MiniGameDefenseInfoExcel GetRootAsMiniGameDefenseInfoExcel(ByteBuffer _bb, MiniGameDefenseInfoExcel obj) { return (obj.__assign(_bb.GetInt(_bb.Position) + _bb.Position, _bb)); } + public void __init(int _i, ByteBuffer _bb) { __p = new Table(_i, _bb); } + public MiniGameDefenseInfoExcel __assign(int _i, ByteBuffer _bb) { __init(_i, _bb); return this; } + + public long EventContentId { get { int o = __p.__offset(4); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } + public SCHALE.Common.FlatData.ParcelType DefenseBattleParcelType { get { int o = __p.__offset(6); return o != 0 ? (SCHALE.Common.FlatData.ParcelType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.ParcelType.None; } } + public long DefenseBattleParcelId { get { int o = __p.__offset(8); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } + public long DefenseBattleMultiplierMax { get { int o = __p.__offset(10); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } + public bool DisableRootMotion { get { int o = __p.__offset(12); return o != 0 ? 0!=__p.bb.Get(o + __p.bb_pos) : (bool)false; } } + + public static Offset CreateMiniGameDefenseInfoExcel(FlatBufferBuilder builder, + long EventContentId = 0, + SCHALE.Common.FlatData.ParcelType DefenseBattleParcelType = SCHALE.Common.FlatData.ParcelType.None, + long DefenseBattleParcelId = 0, + long DefenseBattleMultiplierMax = 0, + bool DisableRootMotion = false) { + builder.StartTable(5); + MiniGameDefenseInfoExcel.AddDefenseBattleMultiplierMax(builder, DefenseBattleMultiplierMax); + MiniGameDefenseInfoExcel.AddDefenseBattleParcelId(builder, DefenseBattleParcelId); + MiniGameDefenseInfoExcel.AddEventContentId(builder, EventContentId); + MiniGameDefenseInfoExcel.AddDefenseBattleParcelType(builder, DefenseBattleParcelType); + MiniGameDefenseInfoExcel.AddDisableRootMotion(builder, DisableRootMotion); + return MiniGameDefenseInfoExcel.EndMiniGameDefenseInfoExcel(builder); + } + + public static void StartMiniGameDefenseInfoExcel(FlatBufferBuilder builder) { builder.StartTable(5); } + public static void AddEventContentId(FlatBufferBuilder builder, long eventContentId) { builder.AddLong(0, eventContentId, 0); } + public static void AddDefenseBattleParcelType(FlatBufferBuilder builder, SCHALE.Common.FlatData.ParcelType defenseBattleParcelType) { builder.AddInt(1, (int)defenseBattleParcelType, 0); } + public static void AddDefenseBattleParcelId(FlatBufferBuilder builder, long defenseBattleParcelId) { builder.AddLong(2, defenseBattleParcelId, 0); } + public static void AddDefenseBattleMultiplierMax(FlatBufferBuilder builder, long defenseBattleMultiplierMax) { builder.AddLong(3, defenseBattleMultiplierMax, 0); } + public static void AddDisableRootMotion(FlatBufferBuilder builder, bool disableRootMotion) { builder.AddBool(4, disableRootMotion, false); } + public static Offset EndMiniGameDefenseInfoExcel(FlatBufferBuilder builder) { + int o = builder.EndTable(); + return new Offset(o); + } + public MiniGameDefenseInfoExcelT UnPack() { + var _o = new MiniGameDefenseInfoExcelT(); + this.UnPackTo(_o); + return _o; + } + public void UnPackTo(MiniGameDefenseInfoExcelT _o) { + byte[] key = TableEncryptionService.CreateKey("MiniGameDefenseInfo"); + _o.EventContentId = TableEncryptionService.Convert(this.EventContentId, key); + _o.DefenseBattleParcelType = TableEncryptionService.Convert(this.DefenseBattleParcelType, key); + _o.DefenseBattleParcelId = TableEncryptionService.Convert(this.DefenseBattleParcelId, key); + _o.DefenseBattleMultiplierMax = TableEncryptionService.Convert(this.DefenseBattleMultiplierMax, key); + _o.DisableRootMotion = TableEncryptionService.Convert(this.DisableRootMotion, key); + } + public static Offset Pack(FlatBufferBuilder builder, MiniGameDefenseInfoExcelT _o) { + if (_o == null) return default(Offset); + return CreateMiniGameDefenseInfoExcel( + builder, + _o.EventContentId, + _o.DefenseBattleParcelType, + _o.DefenseBattleParcelId, + _o.DefenseBattleMultiplierMax, + _o.DisableRootMotion); + } +} + +public class MiniGameDefenseInfoExcelT +{ + public long EventContentId { get; set; } + public SCHALE.Common.FlatData.ParcelType DefenseBattleParcelType { get; set; } + public long DefenseBattleParcelId { get; set; } + public long DefenseBattleMultiplierMax { get; set; } + public bool DisableRootMotion { get; set; } + + public MiniGameDefenseInfoExcelT() { + this.EventContentId = 0; + this.DefenseBattleParcelType = SCHALE.Common.FlatData.ParcelType.None; + this.DefenseBattleParcelId = 0; + this.DefenseBattleMultiplierMax = 0; + this.DisableRootMotion = false; + } +} + + +static public class MiniGameDefenseInfoExcelVerify +{ + static public bool Verify(Google.FlatBuffers.Verifier verifier, uint tablePos) + { + return verifier.VerifyTableStart(tablePos) + && verifier.VerifyField(tablePos, 4 /*EventContentId*/, 8 /*long*/, 8, false) + && verifier.VerifyField(tablePos, 6 /*DefenseBattleParcelType*/, 4 /*SCHALE.Common.FlatData.ParcelType*/, 4, false) + && verifier.VerifyField(tablePos, 8 /*DefenseBattleParcelId*/, 8 /*long*/, 8, false) + && verifier.VerifyField(tablePos, 10 /*DefenseBattleMultiplierMax*/, 8 /*long*/, 8, false) + && verifier.VerifyField(tablePos, 12 /*DisableRootMotion*/, 1 /*bool*/, 1, false) + && verifier.VerifyTableEnd(tablePos); + } +} + +} diff --git a/SCHALE.Common/FlatData/MiniGameDefenseStageExcel.cs b/SCHALE.Common/FlatData/MiniGameDefenseStageExcel.cs new file mode 100644 index 0000000..a7172d9 --- /dev/null +++ b/SCHALE.Common/FlatData/MiniGameDefenseStageExcel.cs @@ -0,0 +1,395 @@ +// +// automatically generated by the FlatBuffers compiler, do not modify +// + +namespace SCHALE.Common.FlatData +{ + +using global::System; +using global::System.Collections.Generic; +using global::SCHALE.Common.Crypto; +using global::Google.FlatBuffers; + +public struct MiniGameDefenseStageExcel : IFlatbufferObject +{ + private Table __p; + public ByteBuffer ByteBuffer { get { return __p.bb; } } + public static void ValidateVersion() { FlatBufferConstants.FLATBUFFERS_24_3_25(); } + public static MiniGameDefenseStageExcel GetRootAsMiniGameDefenseStageExcel(ByteBuffer _bb) { return GetRootAsMiniGameDefenseStageExcel(_bb, new MiniGameDefenseStageExcel()); } + public static MiniGameDefenseStageExcel GetRootAsMiniGameDefenseStageExcel(ByteBuffer _bb, MiniGameDefenseStageExcel obj) { return (obj.__assign(_bb.GetInt(_bb.Position) + _bb.Position, _bb)); } + public void __init(int _i, ByteBuffer _bb) { __p = new Table(_i, _bb); } + public MiniGameDefenseStageExcel __assign(int _i, ByteBuffer _bb) { __init(_i, _bb); return this; } + + public long Id { get { int o = __p.__offset(4); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } + public string Name { get { int o = __p.__offset(6); return o != 0 ? __p.__string(o + __p.bb_pos) : null; } } +#if ENABLE_SPAN_T + public Span GetNameBytes() { return __p.__vector_as_span(6, 1); } +#else + public ArraySegment? GetNameBytes() { return __p.__vector_as_arraysegment(6); } +#endif + public byte[] GetNameArray() { return __p.__vector_as_array(6); } + public long EventContentId { get { int o = __p.__offset(8); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } + public SCHALE.Common.FlatData.StageDifficulty StageDifficulty_ { get { int o = __p.__offset(10); return o != 0 ? (SCHALE.Common.FlatData.StageDifficulty)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.StageDifficulty.None; } } + public uint StageDifficultyLocalize { get { int o = __p.__offset(12); return o != 0 ? __p.bb.GetUint(o + __p.bb_pos) : (uint)0; } } + public int StageNumber { get { int o = __p.__offset(14); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } + public int StageDisplay { get { int o = __p.__offset(16); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } + public long PrevStageId { get { int o = __p.__offset(18); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } + public SCHALE.Common.FlatData.EchelonExtensionType EchelonExtensionType_ { get { int o = __p.__offset(20); return o != 0 ? (SCHALE.Common.FlatData.EchelonExtensionType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.EchelonExtensionType.Base; } } + public long BattleDuration { get { int o = __p.__offset(22); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } + public SCHALE.Common.FlatData.ParcelType StageEnterCostType { get { int o = __p.__offset(24); return o != 0 ? (SCHALE.Common.FlatData.ParcelType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.ParcelType.None; } } + public long StageEnterCostId { get { int o = __p.__offset(26); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } + public int StageEnterCostAmount { get { int o = __p.__offset(28); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } + public long EventContentStageRewardId { get { int o = __p.__offset(30); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } + public long EnterScenarioGroupId(int j) { int o = __p.__offset(32); return o != 0 ? __p.bb.GetLong(__p.__vector(o) + j * 8) : (long)0; } + public int EnterScenarioGroupIdLength { get { int o = __p.__offset(32); return o != 0 ? __p.__vector_len(o) : 0; } } +#if ENABLE_SPAN_T + public Span GetEnterScenarioGroupIdBytes() { return __p.__vector_as_span(32, 8); } +#else + public ArraySegment? GetEnterScenarioGroupIdBytes() { return __p.__vector_as_arraysegment(32); } +#endif + public long[] GetEnterScenarioGroupIdArray() { return __p.__vector_as_array(32); } + public long ClearScenarioGroupId(int j) { int o = __p.__offset(34); return o != 0 ? __p.bb.GetLong(__p.__vector(o) + j * 8) : (long)0; } + public int ClearScenarioGroupIdLength { get { int o = __p.__offset(34); return o != 0 ? __p.__vector_len(o) : 0; } } +#if ENABLE_SPAN_T + public Span GetClearScenarioGroupIdBytes() { return __p.__vector_as_span(34, 8); } +#else + public ArraySegment? GetClearScenarioGroupIdBytes() { return __p.__vector_as_arraysegment(34); } +#endif + public long[] GetClearScenarioGroupIdArray() { return __p.__vector_as_array(34); } + public SCHALE.Common.FlatData.StageTopography StageTopography_ { get { int o = __p.__offset(36); return o != 0 ? (SCHALE.Common.FlatData.StageTopography)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.StageTopography.Street; } } + public int RecommandLevel { get { int o = __p.__offset(38); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } + public long GroundID { get { int o = __p.__offset(40); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } + public SCHALE.Common.FlatData.ContentType ContentType_ { get { int o = __p.__offset(42); return o != 0 ? (SCHALE.Common.FlatData.ContentType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.ContentType.None; } } + public SCHALE.Common.FlatData.StarGoalType StarGoal(int j) { int o = __p.__offset(44); return o != 0 ? (SCHALE.Common.FlatData.StarGoalType)__p.bb.GetInt(__p.__vector(o) + j * 4) : (SCHALE.Common.FlatData.StarGoalType)0; } + public int StarGoalLength { get { int o = __p.__offset(44); return o != 0 ? __p.__vector_len(o) : 0; } } +#if ENABLE_SPAN_T + public Span GetStarGoalBytes() { return __p.__vector_as_span(44, 4); } +#else + public ArraySegment? GetStarGoalBytes() { return __p.__vector_as_arraysegment(44); } +#endif + public SCHALE.Common.FlatData.StarGoalType[] GetStarGoalArray() { int o = __p.__offset(44); if (o == 0) return null; int p = __p.__vector(o); int l = __p.__vector_len(o); SCHALE.Common.FlatData.StarGoalType[] a = new SCHALE.Common.FlatData.StarGoalType[l]; for (int i = 0; i < l; i++) { a[i] = (SCHALE.Common.FlatData.StarGoalType)__p.bb.GetInt(p + i * 4); } return a; } + public int StarGoalAmount(int j) { int o = __p.__offset(46); return o != 0 ? __p.bb.GetInt(__p.__vector(o) + j * 4) : (int)0; } + public int StarGoalAmountLength { get { int o = __p.__offset(46); return o != 0 ? __p.__vector_len(o) : 0; } } +#if ENABLE_SPAN_T + public Span GetStarGoalAmountBytes() { return __p.__vector_as_span(46, 4); } +#else + public ArraySegment? GetStarGoalAmountBytes() { return __p.__vector_as_arraysegment(46); } +#endif + public int[] GetStarGoalAmountArray() { return __p.__vector_as_array(46); } + public string DefenseFormationBGPrefab { get { int o = __p.__offset(48); return o != 0 ? __p.__string(o + __p.bb_pos) : null; } } +#if ENABLE_SPAN_T + public Span GetDefenseFormationBGPrefabBytes() { return __p.__vector_as_span(48, 1); } +#else + public ArraySegment? GetDefenseFormationBGPrefabBytes() { return __p.__vector_as_arraysegment(48); } +#endif + public byte[] GetDefenseFormationBGPrefabArray() { return __p.__vector_as_array(48); } + public float DefenseFormationBGPrefabScale { get { int o = __p.__offset(50); return o != 0 ? __p.bb.GetFloat(o + __p.bb_pos) : (float)0.0f; } } + public long FixedEchelon { get { int o = __p.__offset(52); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } + public long MininageDefenseFixedStatId { get { int o = __p.__offset(54); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } + public uint StageHint { get { int o = __p.__offset(56); return o != 0 ? __p.bb.GetUint(o + __p.bb_pos) : (uint)0; } } + + public static Offset CreateMiniGameDefenseStageExcel(FlatBufferBuilder builder, + long Id = 0, + StringOffset NameOffset = default(StringOffset), + long EventContentId = 0, + SCHALE.Common.FlatData.StageDifficulty StageDifficulty_ = SCHALE.Common.FlatData.StageDifficulty.None, + uint StageDifficultyLocalize = 0, + int StageNumber = 0, + int StageDisplay = 0, + long PrevStageId = 0, + SCHALE.Common.FlatData.EchelonExtensionType EchelonExtensionType_ = SCHALE.Common.FlatData.EchelonExtensionType.Base, + long BattleDuration = 0, + SCHALE.Common.FlatData.ParcelType StageEnterCostType = SCHALE.Common.FlatData.ParcelType.None, + long StageEnterCostId = 0, + int StageEnterCostAmount = 0, + long EventContentStageRewardId = 0, + VectorOffset EnterScenarioGroupIdOffset = default(VectorOffset), + VectorOffset ClearScenarioGroupIdOffset = default(VectorOffset), + SCHALE.Common.FlatData.StageTopography StageTopography_ = SCHALE.Common.FlatData.StageTopography.Street, + int RecommandLevel = 0, + long GroundID = 0, + SCHALE.Common.FlatData.ContentType ContentType_ = SCHALE.Common.FlatData.ContentType.None, + VectorOffset StarGoalOffset = default(VectorOffset), + VectorOffset StarGoalAmountOffset = default(VectorOffset), + StringOffset DefenseFormationBGPrefabOffset = default(StringOffset), + float DefenseFormationBGPrefabScale = 0.0f, + long FixedEchelon = 0, + long MininageDefenseFixedStatId = 0, + uint StageHint = 0) { + builder.StartTable(27); + MiniGameDefenseStageExcel.AddMininageDefenseFixedStatId(builder, MininageDefenseFixedStatId); + MiniGameDefenseStageExcel.AddFixedEchelon(builder, FixedEchelon); + MiniGameDefenseStageExcel.AddGroundID(builder, GroundID); + MiniGameDefenseStageExcel.AddEventContentStageRewardId(builder, EventContentStageRewardId); + MiniGameDefenseStageExcel.AddStageEnterCostId(builder, StageEnterCostId); + MiniGameDefenseStageExcel.AddBattleDuration(builder, BattleDuration); + MiniGameDefenseStageExcel.AddPrevStageId(builder, PrevStageId); + MiniGameDefenseStageExcel.AddEventContentId(builder, EventContentId); + MiniGameDefenseStageExcel.AddId(builder, Id); + MiniGameDefenseStageExcel.AddStageHint(builder, StageHint); + MiniGameDefenseStageExcel.AddDefenseFormationBGPrefabScale(builder, DefenseFormationBGPrefabScale); + MiniGameDefenseStageExcel.AddDefenseFormationBGPrefab(builder, DefenseFormationBGPrefabOffset); + MiniGameDefenseStageExcel.AddStarGoalAmount(builder, StarGoalAmountOffset); + MiniGameDefenseStageExcel.AddStarGoal(builder, StarGoalOffset); + MiniGameDefenseStageExcel.AddContentType_(builder, ContentType_); + MiniGameDefenseStageExcel.AddRecommandLevel(builder, RecommandLevel); + MiniGameDefenseStageExcel.AddStageTopography_(builder, StageTopography_); + MiniGameDefenseStageExcel.AddClearScenarioGroupId(builder, ClearScenarioGroupIdOffset); + MiniGameDefenseStageExcel.AddEnterScenarioGroupId(builder, EnterScenarioGroupIdOffset); + MiniGameDefenseStageExcel.AddStageEnterCostAmount(builder, StageEnterCostAmount); + MiniGameDefenseStageExcel.AddStageEnterCostType(builder, StageEnterCostType); + MiniGameDefenseStageExcel.AddEchelonExtensionType_(builder, EchelonExtensionType_); + MiniGameDefenseStageExcel.AddStageDisplay(builder, StageDisplay); + MiniGameDefenseStageExcel.AddStageNumber(builder, StageNumber); + MiniGameDefenseStageExcel.AddStageDifficultyLocalize(builder, StageDifficultyLocalize); + MiniGameDefenseStageExcel.AddStageDifficulty_(builder, StageDifficulty_); + MiniGameDefenseStageExcel.AddName(builder, NameOffset); + return MiniGameDefenseStageExcel.EndMiniGameDefenseStageExcel(builder); + } + + public static void StartMiniGameDefenseStageExcel(FlatBufferBuilder builder) { builder.StartTable(27); } + public static void AddId(FlatBufferBuilder builder, long id) { builder.AddLong(0, id, 0); } + public static void AddName(FlatBufferBuilder builder, StringOffset nameOffset) { builder.AddOffset(1, nameOffset.Value, 0); } + public static void AddEventContentId(FlatBufferBuilder builder, long eventContentId) { builder.AddLong(2, eventContentId, 0); } + public static void AddStageDifficulty_(FlatBufferBuilder builder, SCHALE.Common.FlatData.StageDifficulty stageDifficulty_) { builder.AddInt(3, (int)stageDifficulty_, 0); } + public static void AddStageDifficultyLocalize(FlatBufferBuilder builder, uint stageDifficultyLocalize) { builder.AddUint(4, stageDifficultyLocalize, 0); } + public static void AddStageNumber(FlatBufferBuilder builder, int stageNumber) { builder.AddInt(5, stageNumber, 0); } + public static void AddStageDisplay(FlatBufferBuilder builder, int stageDisplay) { builder.AddInt(6, stageDisplay, 0); } + public static void AddPrevStageId(FlatBufferBuilder builder, long prevStageId) { builder.AddLong(7, prevStageId, 0); } + public static void AddEchelonExtensionType_(FlatBufferBuilder builder, SCHALE.Common.FlatData.EchelonExtensionType echelonExtensionType_) { builder.AddInt(8, (int)echelonExtensionType_, 0); } + public static void AddBattleDuration(FlatBufferBuilder builder, long battleDuration) { builder.AddLong(9, battleDuration, 0); } + public static void AddStageEnterCostType(FlatBufferBuilder builder, SCHALE.Common.FlatData.ParcelType stageEnterCostType) { builder.AddInt(10, (int)stageEnterCostType, 0); } + public static void AddStageEnterCostId(FlatBufferBuilder builder, long stageEnterCostId) { builder.AddLong(11, stageEnterCostId, 0); } + public static void AddStageEnterCostAmount(FlatBufferBuilder builder, int stageEnterCostAmount) { builder.AddInt(12, stageEnterCostAmount, 0); } + public static void AddEventContentStageRewardId(FlatBufferBuilder builder, long eventContentStageRewardId) { builder.AddLong(13, eventContentStageRewardId, 0); } + public static void AddEnterScenarioGroupId(FlatBufferBuilder builder, VectorOffset enterScenarioGroupIdOffset) { builder.AddOffset(14, enterScenarioGroupIdOffset.Value, 0); } + public static VectorOffset CreateEnterScenarioGroupIdVector(FlatBufferBuilder builder, long[] data) { builder.StartVector(8, data.Length, 8); for (int i = data.Length - 1; i >= 0; i--) builder.AddLong(data[i]); return builder.EndVector(); } + public static VectorOffset CreateEnterScenarioGroupIdVectorBlock(FlatBufferBuilder builder, long[] data) { builder.StartVector(8, data.Length, 8); builder.Add(data); return builder.EndVector(); } + public static VectorOffset CreateEnterScenarioGroupIdVectorBlock(FlatBufferBuilder builder, ArraySegment data) { builder.StartVector(8, data.Count, 8); builder.Add(data); return builder.EndVector(); } + public static VectorOffset CreateEnterScenarioGroupIdVectorBlock(FlatBufferBuilder builder, IntPtr dataPtr, int sizeInBytes) { builder.StartVector(1, sizeInBytes, 1); builder.Add(dataPtr, sizeInBytes); return builder.EndVector(); } + public static void StartEnterScenarioGroupIdVector(FlatBufferBuilder builder, int numElems) { builder.StartVector(8, numElems, 8); } + public static void AddClearScenarioGroupId(FlatBufferBuilder builder, VectorOffset clearScenarioGroupIdOffset) { builder.AddOffset(15, clearScenarioGroupIdOffset.Value, 0); } + public static VectorOffset CreateClearScenarioGroupIdVector(FlatBufferBuilder builder, long[] data) { builder.StartVector(8, data.Length, 8); for (int i = data.Length - 1; i >= 0; i--) builder.AddLong(data[i]); return builder.EndVector(); } + public static VectorOffset CreateClearScenarioGroupIdVectorBlock(FlatBufferBuilder builder, long[] data) { builder.StartVector(8, data.Length, 8); builder.Add(data); return builder.EndVector(); } + public static VectorOffset CreateClearScenarioGroupIdVectorBlock(FlatBufferBuilder builder, ArraySegment data) { builder.StartVector(8, data.Count, 8); builder.Add(data); return builder.EndVector(); } + public static VectorOffset CreateClearScenarioGroupIdVectorBlock(FlatBufferBuilder builder, IntPtr dataPtr, int sizeInBytes) { builder.StartVector(1, sizeInBytes, 1); builder.Add(dataPtr, sizeInBytes); return builder.EndVector(); } + public static void StartClearScenarioGroupIdVector(FlatBufferBuilder builder, int numElems) { builder.StartVector(8, numElems, 8); } + public static void AddStageTopography_(FlatBufferBuilder builder, SCHALE.Common.FlatData.StageTopography stageTopography_) { builder.AddInt(16, (int)stageTopography_, 0); } + public static void AddRecommandLevel(FlatBufferBuilder builder, int recommandLevel) { builder.AddInt(17, recommandLevel, 0); } + public static void AddGroundID(FlatBufferBuilder builder, long groundID) { builder.AddLong(18, groundID, 0); } + public static void AddContentType_(FlatBufferBuilder builder, SCHALE.Common.FlatData.ContentType contentType_) { builder.AddInt(19, (int)contentType_, 0); } + public static void AddStarGoal(FlatBufferBuilder builder, VectorOffset starGoalOffset) { builder.AddOffset(20, starGoalOffset.Value, 0); } + public static VectorOffset CreateStarGoalVector(FlatBufferBuilder builder, SCHALE.Common.FlatData.StarGoalType[] data) { builder.StartVector(4, data.Length, 4); for (int i = data.Length - 1; i >= 0; i--) builder.AddInt((int)data[i]); return builder.EndVector(); } + public static VectorOffset CreateStarGoalVectorBlock(FlatBufferBuilder builder, SCHALE.Common.FlatData.StarGoalType[] data) { builder.StartVector(4, data.Length, 4); builder.Add(data); return builder.EndVector(); } + public static VectorOffset CreateStarGoalVectorBlock(FlatBufferBuilder builder, ArraySegment data) { builder.StartVector(4, data.Count, 4); builder.Add(data); return builder.EndVector(); } + public static VectorOffset CreateStarGoalVectorBlock(FlatBufferBuilder builder, IntPtr dataPtr, int sizeInBytes) { builder.StartVector(1, sizeInBytes, 1); builder.Add(dataPtr, sizeInBytes); return builder.EndVector(); } + public static void StartStarGoalVector(FlatBufferBuilder builder, int numElems) { builder.StartVector(4, numElems, 4); } + public static void AddStarGoalAmount(FlatBufferBuilder builder, VectorOffset starGoalAmountOffset) { builder.AddOffset(21, starGoalAmountOffset.Value, 0); } + public static VectorOffset CreateStarGoalAmountVector(FlatBufferBuilder builder, int[] data) { builder.StartVector(4, data.Length, 4); for (int i = data.Length - 1; i >= 0; i--) builder.AddInt(data[i]); return builder.EndVector(); } + public static VectorOffset CreateStarGoalAmountVectorBlock(FlatBufferBuilder builder, int[] data) { builder.StartVector(4, data.Length, 4); builder.Add(data); return builder.EndVector(); } + public static VectorOffset CreateStarGoalAmountVectorBlock(FlatBufferBuilder builder, ArraySegment data) { builder.StartVector(4, data.Count, 4); builder.Add(data); return builder.EndVector(); } + public static VectorOffset CreateStarGoalAmountVectorBlock(FlatBufferBuilder builder, IntPtr dataPtr, int sizeInBytes) { builder.StartVector(1, sizeInBytes, 1); builder.Add(dataPtr, sizeInBytes); return builder.EndVector(); } + public static void StartStarGoalAmountVector(FlatBufferBuilder builder, int numElems) { builder.StartVector(4, numElems, 4); } + public static void AddDefenseFormationBGPrefab(FlatBufferBuilder builder, StringOffset defenseFormationBGPrefabOffset) { builder.AddOffset(22, defenseFormationBGPrefabOffset.Value, 0); } + public static void AddDefenseFormationBGPrefabScale(FlatBufferBuilder builder, float defenseFormationBGPrefabScale) { builder.AddFloat(23, defenseFormationBGPrefabScale, 0.0f); } + public static void AddFixedEchelon(FlatBufferBuilder builder, long fixedEchelon) { builder.AddLong(24, fixedEchelon, 0); } + public static void AddMininageDefenseFixedStatId(FlatBufferBuilder builder, long mininageDefenseFixedStatId) { builder.AddLong(25, mininageDefenseFixedStatId, 0); } + public static void AddStageHint(FlatBufferBuilder builder, uint stageHint) { builder.AddUint(26, stageHint, 0); } + public static Offset EndMiniGameDefenseStageExcel(FlatBufferBuilder builder) { + int o = builder.EndTable(); + return new Offset(o); + } + public MiniGameDefenseStageExcelT UnPack() { + var _o = new MiniGameDefenseStageExcelT(); + this.UnPackTo(_o); + return _o; + } + public void UnPackTo(MiniGameDefenseStageExcelT _o) { + byte[] key = TableEncryptionService.CreateKey("MiniGameDefenseStage"); + _o.Id = TableEncryptionService.Convert(this.Id, key); + _o.Name = TableEncryptionService.Convert(this.Name, key); + _o.EventContentId = TableEncryptionService.Convert(this.EventContentId, key); + _o.StageDifficulty_ = TableEncryptionService.Convert(this.StageDifficulty_, key); + _o.StageDifficultyLocalize = TableEncryptionService.Convert(this.StageDifficultyLocalize, key); + _o.StageNumber = TableEncryptionService.Convert(this.StageNumber, key); + _o.StageDisplay = TableEncryptionService.Convert(this.StageDisplay, key); + _o.PrevStageId = TableEncryptionService.Convert(this.PrevStageId, key); + _o.EchelonExtensionType_ = TableEncryptionService.Convert(this.EchelonExtensionType_, key); + _o.BattleDuration = TableEncryptionService.Convert(this.BattleDuration, key); + _o.StageEnterCostType = TableEncryptionService.Convert(this.StageEnterCostType, key); + _o.StageEnterCostId = TableEncryptionService.Convert(this.StageEnterCostId, key); + _o.StageEnterCostAmount = TableEncryptionService.Convert(this.StageEnterCostAmount, key); + _o.EventContentStageRewardId = TableEncryptionService.Convert(this.EventContentStageRewardId, key); + _o.EnterScenarioGroupId = new List(); + for (var _j = 0; _j < this.EnterScenarioGroupIdLength; ++_j) {_o.EnterScenarioGroupId.Add(TableEncryptionService.Convert(this.EnterScenarioGroupId(_j), key));} + _o.ClearScenarioGroupId = new List(); + for (var _j = 0; _j < this.ClearScenarioGroupIdLength; ++_j) {_o.ClearScenarioGroupId.Add(TableEncryptionService.Convert(this.ClearScenarioGroupId(_j), key));} + _o.StageTopography_ = TableEncryptionService.Convert(this.StageTopography_, key); + _o.RecommandLevel = TableEncryptionService.Convert(this.RecommandLevel, key); + _o.GroundID = TableEncryptionService.Convert(this.GroundID, key); + _o.ContentType_ = TableEncryptionService.Convert(this.ContentType_, key); + _o.StarGoal = new List(); + for (var _j = 0; _j < this.StarGoalLength; ++_j) {_o.StarGoal.Add(TableEncryptionService.Convert(this.StarGoal(_j), key));} + _o.StarGoalAmount = new List(); + for (var _j = 0; _j < this.StarGoalAmountLength; ++_j) {_o.StarGoalAmount.Add(TableEncryptionService.Convert(this.StarGoalAmount(_j), key));} + _o.DefenseFormationBGPrefab = TableEncryptionService.Convert(this.DefenseFormationBGPrefab, key); + _o.DefenseFormationBGPrefabScale = TableEncryptionService.Convert(this.DefenseFormationBGPrefabScale, key); + _o.FixedEchelon = TableEncryptionService.Convert(this.FixedEchelon, key); + _o.MininageDefenseFixedStatId = TableEncryptionService.Convert(this.MininageDefenseFixedStatId, key); + _o.StageHint = TableEncryptionService.Convert(this.StageHint, key); + } + public static Offset Pack(FlatBufferBuilder builder, MiniGameDefenseStageExcelT _o) { + if (_o == null) return default(Offset); + var _Name = _o.Name == null ? default(StringOffset) : builder.CreateString(_o.Name); + var _EnterScenarioGroupId = default(VectorOffset); + if (_o.EnterScenarioGroupId != null) { + var __EnterScenarioGroupId = _o.EnterScenarioGroupId.ToArray(); + _EnterScenarioGroupId = CreateEnterScenarioGroupIdVector(builder, __EnterScenarioGroupId); + } + var _ClearScenarioGroupId = default(VectorOffset); + if (_o.ClearScenarioGroupId != null) { + var __ClearScenarioGroupId = _o.ClearScenarioGroupId.ToArray(); + _ClearScenarioGroupId = CreateClearScenarioGroupIdVector(builder, __ClearScenarioGroupId); + } + var _StarGoal = default(VectorOffset); + if (_o.StarGoal != null) { + var __StarGoal = _o.StarGoal.ToArray(); + _StarGoal = CreateStarGoalVector(builder, __StarGoal); + } + var _StarGoalAmount = default(VectorOffset); + if (_o.StarGoalAmount != null) { + var __StarGoalAmount = _o.StarGoalAmount.ToArray(); + _StarGoalAmount = CreateStarGoalAmountVector(builder, __StarGoalAmount); + } + var _DefenseFormationBGPrefab = _o.DefenseFormationBGPrefab == null ? default(StringOffset) : builder.CreateString(_o.DefenseFormationBGPrefab); + return CreateMiniGameDefenseStageExcel( + builder, + _o.Id, + _Name, + _o.EventContentId, + _o.StageDifficulty_, + _o.StageDifficultyLocalize, + _o.StageNumber, + _o.StageDisplay, + _o.PrevStageId, + _o.EchelonExtensionType_, + _o.BattleDuration, + _o.StageEnterCostType, + _o.StageEnterCostId, + _o.StageEnterCostAmount, + _o.EventContentStageRewardId, + _EnterScenarioGroupId, + _ClearScenarioGroupId, + _o.StageTopography_, + _o.RecommandLevel, + _o.GroundID, + _o.ContentType_, + _StarGoal, + _StarGoalAmount, + _DefenseFormationBGPrefab, + _o.DefenseFormationBGPrefabScale, + _o.FixedEchelon, + _o.MininageDefenseFixedStatId, + _o.StageHint); + } +} + +public class MiniGameDefenseStageExcelT +{ + public long Id { get; set; } + public string Name { get; set; } + public long EventContentId { get; set; } + public SCHALE.Common.FlatData.StageDifficulty StageDifficulty_ { get; set; } + public uint StageDifficultyLocalize { get; set; } + public int StageNumber { get; set; } + public int StageDisplay { get; set; } + public long PrevStageId { get; set; } + public SCHALE.Common.FlatData.EchelonExtensionType EchelonExtensionType_ { get; set; } + public long BattleDuration { get; set; } + public SCHALE.Common.FlatData.ParcelType StageEnterCostType { get; set; } + public long StageEnterCostId { get; set; } + public int StageEnterCostAmount { get; set; } + public long EventContentStageRewardId { get; set; } + public List EnterScenarioGroupId { get; set; } + public List ClearScenarioGroupId { get; set; } + public SCHALE.Common.FlatData.StageTopography StageTopography_ { get; set; } + public int RecommandLevel { get; set; } + public long GroundID { get; set; } + public SCHALE.Common.FlatData.ContentType ContentType_ { get; set; } + public List StarGoal { get; set; } + public List StarGoalAmount { get; set; } + public string DefenseFormationBGPrefab { get; set; } + public float DefenseFormationBGPrefabScale { get; set; } + public long FixedEchelon { get; set; } + public long MininageDefenseFixedStatId { get; set; } + public uint StageHint { get; set; } + + public MiniGameDefenseStageExcelT() { + this.Id = 0; + this.Name = null; + this.EventContentId = 0; + this.StageDifficulty_ = SCHALE.Common.FlatData.StageDifficulty.None; + this.StageDifficultyLocalize = 0; + this.StageNumber = 0; + this.StageDisplay = 0; + this.PrevStageId = 0; + this.EchelonExtensionType_ = SCHALE.Common.FlatData.EchelonExtensionType.Base; + this.BattleDuration = 0; + this.StageEnterCostType = SCHALE.Common.FlatData.ParcelType.None; + this.StageEnterCostId = 0; + this.StageEnterCostAmount = 0; + this.EventContentStageRewardId = 0; + this.EnterScenarioGroupId = null; + this.ClearScenarioGroupId = null; + this.StageTopography_ = SCHALE.Common.FlatData.StageTopography.Street; + this.RecommandLevel = 0; + this.GroundID = 0; + this.ContentType_ = SCHALE.Common.FlatData.ContentType.None; + this.StarGoal = null; + this.StarGoalAmount = null; + this.DefenseFormationBGPrefab = null; + this.DefenseFormationBGPrefabScale = 0.0f; + this.FixedEchelon = 0; + this.MininageDefenseFixedStatId = 0; + this.StageHint = 0; + } +} + + +static public class MiniGameDefenseStageExcelVerify +{ + static public bool Verify(Google.FlatBuffers.Verifier verifier, uint tablePos) + { + return verifier.VerifyTableStart(tablePos) + && verifier.VerifyField(tablePos, 4 /*Id*/, 8 /*long*/, 8, false) + && verifier.VerifyString(tablePos, 6 /*Name*/, false) + && verifier.VerifyField(tablePos, 8 /*EventContentId*/, 8 /*long*/, 8, false) + && verifier.VerifyField(tablePos, 10 /*StageDifficulty_*/, 4 /*SCHALE.Common.FlatData.StageDifficulty*/, 4, false) + && verifier.VerifyField(tablePos, 12 /*StageDifficultyLocalize*/, 4 /*uint*/, 4, false) + && verifier.VerifyField(tablePos, 14 /*StageNumber*/, 4 /*int*/, 4, false) + && verifier.VerifyField(tablePos, 16 /*StageDisplay*/, 4 /*int*/, 4, false) + && verifier.VerifyField(tablePos, 18 /*PrevStageId*/, 8 /*long*/, 8, false) + && verifier.VerifyField(tablePos, 20 /*EchelonExtensionType_*/, 4 /*SCHALE.Common.FlatData.EchelonExtensionType*/, 4, false) + && verifier.VerifyField(tablePos, 22 /*BattleDuration*/, 8 /*long*/, 8, false) + && verifier.VerifyField(tablePos, 24 /*StageEnterCostType*/, 4 /*SCHALE.Common.FlatData.ParcelType*/, 4, false) + && verifier.VerifyField(tablePos, 26 /*StageEnterCostId*/, 8 /*long*/, 8, false) + && verifier.VerifyField(tablePos, 28 /*StageEnterCostAmount*/, 4 /*int*/, 4, false) + && verifier.VerifyField(tablePos, 30 /*EventContentStageRewardId*/, 8 /*long*/, 8, false) + && verifier.VerifyVectorOfData(tablePos, 32 /*EnterScenarioGroupId*/, 8 /*long*/, false) + && verifier.VerifyVectorOfData(tablePos, 34 /*ClearScenarioGroupId*/, 8 /*long*/, false) + && verifier.VerifyField(tablePos, 36 /*StageTopography_*/, 4 /*SCHALE.Common.FlatData.StageTopography*/, 4, false) + && verifier.VerifyField(tablePos, 38 /*RecommandLevel*/, 4 /*int*/, 4, false) + && verifier.VerifyField(tablePos, 40 /*GroundID*/, 8 /*long*/, 8, false) + && verifier.VerifyField(tablePos, 42 /*ContentType_*/, 4 /*SCHALE.Common.FlatData.ContentType*/, 4, false) + && verifier.VerifyVectorOfData(tablePos, 44 /*StarGoal*/, 4 /*SCHALE.Common.FlatData.StarGoalType*/, false) + && verifier.VerifyVectorOfData(tablePos, 46 /*StarGoalAmount*/, 4 /*int*/, false) + && verifier.VerifyString(tablePos, 48 /*DefenseFormationBGPrefab*/, false) + && verifier.VerifyField(tablePos, 50 /*DefenseFormationBGPrefabScale*/, 4 /*float*/, 4, false) + && verifier.VerifyField(tablePos, 52 /*FixedEchelon*/, 8 /*long*/, 8, false) + && verifier.VerifyField(tablePos, 54 /*MininageDefenseFixedStatId*/, 8 /*long*/, 8, false) + && verifier.VerifyField(tablePos, 56 /*StageHint*/, 4 /*uint*/, 4, false) + && verifier.VerifyTableEnd(tablePos); + } +} + +} diff --git a/SCHALE.Common/FlatData/MiniGameDreamEndingExcel.cs b/SCHALE.Common/FlatData/MiniGameDreamEndingExcel.cs index 17c2a92..d453dd7 100644 --- a/SCHALE.Common/FlatData/MiniGameDreamEndingExcel.cs +++ b/SCHALE.Common/FlatData/MiniGameDreamEndingExcel.cs @@ -22,7 +22,7 @@ public struct MiniGameDreamEndingExcel : IFlatbufferObject public long EventContentId { get { int o = __p.__offset(4); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public long EndingId { get { int o = __p.__offset(6); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } - public SCHALE.Common.FlatData.DreamMakerEndingType DreamMakerEndingType { get { int o = __p.__offset(8); return o != 0 ? (SCHALE.Common.FlatData.DreamMakerEndingType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.DreamMakerEndingType.None; } } + public SCHALE.Common.FlatData.DreamMakerEndingType DreamMakerEndingType_ { get { int o = __p.__offset(8); return o != 0 ? (SCHALE.Common.FlatData.DreamMakerEndingType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.DreamMakerEndingType.None; } } public int Order { get { int o = __p.__offset(10); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } public long ScenarioGroupId { get { int o = __p.__offset(12); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public SCHALE.Common.FlatData.DreamMakerEndingCondition EndingCondition(int j) { int o = __p.__offset(14); return o != 0 ? (SCHALE.Common.FlatData.DreamMakerEndingCondition)__p.bb.GetInt(__p.__vector(o) + j * 4) : (SCHALE.Common.FlatData.DreamMakerEndingCondition)0; } @@ -45,7 +45,7 @@ public struct MiniGameDreamEndingExcel : IFlatbufferObject public static Offset CreateMiniGameDreamEndingExcel(FlatBufferBuilder builder, long EventContentId = 0, long EndingId = 0, - SCHALE.Common.FlatData.DreamMakerEndingType DreamMakerEndingType = SCHALE.Common.FlatData.DreamMakerEndingType.None, + SCHALE.Common.FlatData.DreamMakerEndingType DreamMakerEndingType_ = SCHALE.Common.FlatData.DreamMakerEndingType.None, int Order = 0, long ScenarioGroupId = 0, VectorOffset EndingConditionOffset = default(VectorOffset), @@ -57,14 +57,14 @@ public struct MiniGameDreamEndingExcel : IFlatbufferObject MiniGameDreamEndingExcel.AddEndingConditionValue(builder, EndingConditionValueOffset); MiniGameDreamEndingExcel.AddEndingCondition(builder, EndingConditionOffset); MiniGameDreamEndingExcel.AddOrder(builder, Order); - MiniGameDreamEndingExcel.AddDreamMakerEndingType(builder, DreamMakerEndingType); + MiniGameDreamEndingExcel.AddDreamMakerEndingType_(builder, DreamMakerEndingType_); return MiniGameDreamEndingExcel.EndMiniGameDreamEndingExcel(builder); } public static void StartMiniGameDreamEndingExcel(FlatBufferBuilder builder) { builder.StartTable(7); } public static void AddEventContentId(FlatBufferBuilder builder, long eventContentId) { builder.AddLong(0, eventContentId, 0); } public static void AddEndingId(FlatBufferBuilder builder, long endingId) { builder.AddLong(1, endingId, 0); } - public static void AddDreamMakerEndingType(FlatBufferBuilder builder, SCHALE.Common.FlatData.DreamMakerEndingType dreamMakerEndingType) { builder.AddInt(2, (int)dreamMakerEndingType, 0); } + public static void AddDreamMakerEndingType_(FlatBufferBuilder builder, SCHALE.Common.FlatData.DreamMakerEndingType dreamMakerEndingType_) { builder.AddInt(2, (int)dreamMakerEndingType_, 0); } public static void AddOrder(FlatBufferBuilder builder, int order) { builder.AddInt(3, order, 0); } public static void AddScenarioGroupId(FlatBufferBuilder builder, long scenarioGroupId) { builder.AddLong(4, scenarioGroupId, 0); } public static void AddEndingCondition(FlatBufferBuilder builder, VectorOffset endingConditionOffset) { builder.AddOffset(5, endingConditionOffset.Value, 0); } @@ -92,7 +92,7 @@ public struct MiniGameDreamEndingExcel : IFlatbufferObject byte[] key = TableEncryptionService.CreateKey("MiniGameDreamEnding"); _o.EventContentId = TableEncryptionService.Convert(this.EventContentId, key); _o.EndingId = TableEncryptionService.Convert(this.EndingId, key); - _o.DreamMakerEndingType = TableEncryptionService.Convert(this.DreamMakerEndingType, key); + _o.DreamMakerEndingType_ = TableEncryptionService.Convert(this.DreamMakerEndingType_, key); _o.Order = TableEncryptionService.Convert(this.Order, key); _o.ScenarioGroupId = TableEncryptionService.Convert(this.ScenarioGroupId, key); _o.EndingCondition = new List(); @@ -116,7 +116,7 @@ public struct MiniGameDreamEndingExcel : IFlatbufferObject builder, _o.EventContentId, _o.EndingId, - _o.DreamMakerEndingType, + _o.DreamMakerEndingType_, _o.Order, _o.ScenarioGroupId, _EndingCondition, @@ -128,7 +128,7 @@ public class MiniGameDreamEndingExcelT { public long EventContentId { get; set; } public long EndingId { get; set; } - public SCHALE.Common.FlatData.DreamMakerEndingType DreamMakerEndingType { get; set; } + public SCHALE.Common.FlatData.DreamMakerEndingType DreamMakerEndingType_ { get; set; } public int Order { get; set; } public long ScenarioGroupId { get; set; } public List EndingCondition { get; set; } @@ -137,7 +137,7 @@ public class MiniGameDreamEndingExcelT public MiniGameDreamEndingExcelT() { this.EventContentId = 0; this.EndingId = 0; - this.DreamMakerEndingType = SCHALE.Common.FlatData.DreamMakerEndingType.None; + this.DreamMakerEndingType_ = SCHALE.Common.FlatData.DreamMakerEndingType.None; this.Order = 0; this.ScenarioGroupId = 0; this.EndingCondition = null; @@ -153,7 +153,7 @@ static public class MiniGameDreamEndingExcelVerify return verifier.VerifyTableStart(tablePos) && verifier.VerifyField(tablePos, 4 /*EventContentId*/, 8 /*long*/, 8, false) && verifier.VerifyField(tablePos, 6 /*EndingId*/, 8 /*long*/, 8, false) - && verifier.VerifyField(tablePos, 8 /*DreamMakerEndingType*/, 4 /*SCHALE.Common.FlatData.DreamMakerEndingType*/, 4, false) + && verifier.VerifyField(tablePos, 8 /*DreamMakerEndingType_*/, 4 /*SCHALE.Common.FlatData.DreamMakerEndingType*/, 4, false) && verifier.VerifyField(tablePos, 10 /*Order*/, 4 /*int*/, 4, false) && verifier.VerifyField(tablePos, 12 /*ScenarioGroupId*/, 8 /*long*/, 8, false) && verifier.VerifyVectorOfData(tablePos, 14 /*EndingCondition*/, 4 /*SCHALE.Common.FlatData.DreamMakerEndingCondition*/, false) diff --git a/SCHALE.Common/FlatData/MiniGameDreamEndingRewardExcel.cs b/SCHALE.Common/FlatData/MiniGameDreamEndingRewardExcel.cs index ba9937a..2dcf43e 100644 --- a/SCHALE.Common/FlatData/MiniGameDreamEndingRewardExcel.cs +++ b/SCHALE.Common/FlatData/MiniGameDreamEndingRewardExcel.cs @@ -23,8 +23,8 @@ public struct MiniGameDreamEndingRewardExcel : IFlatbufferObject public long EventContentId { get { int o = __p.__offset(4); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public long EndingId { get { int o = __p.__offset(6); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public uint LocalizeEtcId { get { int o = __p.__offset(8); return o != 0 ? __p.bb.GetUint(o + __p.bb_pos) : (uint)0; } } - public SCHALE.Common.FlatData.DreamMakerEndingRewardType DreamMakerEndingRewardType { get { int o = __p.__offset(10); return o != 0 ? (SCHALE.Common.FlatData.DreamMakerEndingRewardType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.DreamMakerEndingRewardType.None; } } - public SCHALE.Common.FlatData.DreamMakerEndingType DreamMakerEndingType { get { int o = __p.__offset(12); return o != 0 ? (SCHALE.Common.FlatData.DreamMakerEndingType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.DreamMakerEndingType.None; } } + public SCHALE.Common.FlatData.DreamMakerEndingRewardType DreamMakerEndingRewardType_ { get { int o = __p.__offset(10); return o != 0 ? (SCHALE.Common.FlatData.DreamMakerEndingRewardType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.DreamMakerEndingRewardType.None; } } + public SCHALE.Common.FlatData.DreamMakerEndingType DreamMakerEndingType_ { get { int o = __p.__offset(12); return o != 0 ? (SCHALE.Common.FlatData.DreamMakerEndingType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.DreamMakerEndingType.None; } } public SCHALE.Common.FlatData.ParcelType RewardParcelType(int j) { int o = __p.__offset(14); return o != 0 ? (SCHALE.Common.FlatData.ParcelType)__p.bb.GetInt(__p.__vector(o) + j * 4) : (SCHALE.Common.FlatData.ParcelType)0; } public int RewardParcelTypeLength { get { int o = __p.__offset(14); return o != 0 ? __p.__vector_len(o) : 0; } } #if ENABLE_SPAN_T @@ -54,8 +54,8 @@ public struct MiniGameDreamEndingRewardExcel : IFlatbufferObject long EventContentId = 0, long EndingId = 0, uint LocalizeEtcId = 0, - SCHALE.Common.FlatData.DreamMakerEndingRewardType DreamMakerEndingRewardType = SCHALE.Common.FlatData.DreamMakerEndingRewardType.None, - SCHALE.Common.FlatData.DreamMakerEndingType DreamMakerEndingType = SCHALE.Common.FlatData.DreamMakerEndingType.None, + SCHALE.Common.FlatData.DreamMakerEndingRewardType DreamMakerEndingRewardType_ = SCHALE.Common.FlatData.DreamMakerEndingRewardType.None, + SCHALE.Common.FlatData.DreamMakerEndingType DreamMakerEndingType_ = SCHALE.Common.FlatData.DreamMakerEndingType.None, VectorOffset RewardParcelTypeOffset = default(VectorOffset), VectorOffset RewardParcelIdOffset = default(VectorOffset), VectorOffset RewardParcelAmountOffset = default(VectorOffset)) { @@ -65,8 +65,8 @@ public struct MiniGameDreamEndingRewardExcel : IFlatbufferObject MiniGameDreamEndingRewardExcel.AddRewardParcelAmount(builder, RewardParcelAmountOffset); MiniGameDreamEndingRewardExcel.AddRewardParcelId(builder, RewardParcelIdOffset); MiniGameDreamEndingRewardExcel.AddRewardParcelType(builder, RewardParcelTypeOffset); - MiniGameDreamEndingRewardExcel.AddDreamMakerEndingType(builder, DreamMakerEndingType); - MiniGameDreamEndingRewardExcel.AddDreamMakerEndingRewardType(builder, DreamMakerEndingRewardType); + MiniGameDreamEndingRewardExcel.AddDreamMakerEndingType_(builder, DreamMakerEndingType_); + MiniGameDreamEndingRewardExcel.AddDreamMakerEndingRewardType_(builder, DreamMakerEndingRewardType_); MiniGameDreamEndingRewardExcel.AddLocalizeEtcId(builder, LocalizeEtcId); return MiniGameDreamEndingRewardExcel.EndMiniGameDreamEndingRewardExcel(builder); } @@ -75,8 +75,8 @@ public struct MiniGameDreamEndingRewardExcel : IFlatbufferObject public static void AddEventContentId(FlatBufferBuilder builder, long eventContentId) { builder.AddLong(0, eventContentId, 0); } public static void AddEndingId(FlatBufferBuilder builder, long endingId) { builder.AddLong(1, endingId, 0); } public static void AddLocalizeEtcId(FlatBufferBuilder builder, uint localizeEtcId) { builder.AddUint(2, localizeEtcId, 0); } - public static void AddDreamMakerEndingRewardType(FlatBufferBuilder builder, SCHALE.Common.FlatData.DreamMakerEndingRewardType dreamMakerEndingRewardType) { builder.AddInt(3, (int)dreamMakerEndingRewardType, 0); } - public static void AddDreamMakerEndingType(FlatBufferBuilder builder, SCHALE.Common.FlatData.DreamMakerEndingType dreamMakerEndingType) { builder.AddInt(4, (int)dreamMakerEndingType, 0); } + public static void AddDreamMakerEndingRewardType_(FlatBufferBuilder builder, SCHALE.Common.FlatData.DreamMakerEndingRewardType dreamMakerEndingRewardType_) { builder.AddInt(3, (int)dreamMakerEndingRewardType_, 0); } + public static void AddDreamMakerEndingType_(FlatBufferBuilder builder, SCHALE.Common.FlatData.DreamMakerEndingType dreamMakerEndingType_) { builder.AddInt(4, (int)dreamMakerEndingType_, 0); } public static void AddRewardParcelType(FlatBufferBuilder builder, VectorOffset rewardParcelTypeOffset) { builder.AddOffset(5, rewardParcelTypeOffset.Value, 0); } public static VectorOffset CreateRewardParcelTypeVector(FlatBufferBuilder builder, SCHALE.Common.FlatData.ParcelType[] data) { builder.StartVector(4, data.Length, 4); for (int i = data.Length - 1; i >= 0; i--) builder.AddInt((int)data[i]); return builder.EndVector(); } public static VectorOffset CreateRewardParcelTypeVectorBlock(FlatBufferBuilder builder, SCHALE.Common.FlatData.ParcelType[] data) { builder.StartVector(4, data.Length, 4); builder.Add(data); return builder.EndVector(); } @@ -109,8 +109,8 @@ public struct MiniGameDreamEndingRewardExcel : IFlatbufferObject _o.EventContentId = TableEncryptionService.Convert(this.EventContentId, key); _o.EndingId = TableEncryptionService.Convert(this.EndingId, key); _o.LocalizeEtcId = TableEncryptionService.Convert(this.LocalizeEtcId, key); - _o.DreamMakerEndingRewardType = TableEncryptionService.Convert(this.DreamMakerEndingRewardType, key); - _o.DreamMakerEndingType = TableEncryptionService.Convert(this.DreamMakerEndingType, key); + _o.DreamMakerEndingRewardType_ = TableEncryptionService.Convert(this.DreamMakerEndingRewardType_, key); + _o.DreamMakerEndingType_ = TableEncryptionService.Convert(this.DreamMakerEndingType_, key); _o.RewardParcelType = new List(); for (var _j = 0; _j < this.RewardParcelTypeLength; ++_j) {_o.RewardParcelType.Add(TableEncryptionService.Convert(this.RewardParcelType(_j), key));} _o.RewardParcelId = new List(); @@ -140,8 +140,8 @@ public struct MiniGameDreamEndingRewardExcel : IFlatbufferObject _o.EventContentId, _o.EndingId, _o.LocalizeEtcId, - _o.DreamMakerEndingRewardType, - _o.DreamMakerEndingType, + _o.DreamMakerEndingRewardType_, + _o.DreamMakerEndingType_, _RewardParcelType, _RewardParcelId, _RewardParcelAmount); @@ -153,8 +153,8 @@ public class MiniGameDreamEndingRewardExcelT public long EventContentId { get; set; } public long EndingId { get; set; } public uint LocalizeEtcId { get; set; } - public SCHALE.Common.FlatData.DreamMakerEndingRewardType DreamMakerEndingRewardType { get; set; } - public SCHALE.Common.FlatData.DreamMakerEndingType DreamMakerEndingType { get; set; } + public SCHALE.Common.FlatData.DreamMakerEndingRewardType DreamMakerEndingRewardType_ { get; set; } + public SCHALE.Common.FlatData.DreamMakerEndingType DreamMakerEndingType_ { get; set; } public List RewardParcelType { get; set; } public List RewardParcelId { get; set; } public List RewardParcelAmount { get; set; } @@ -163,8 +163,8 @@ public class MiniGameDreamEndingRewardExcelT this.EventContentId = 0; this.EndingId = 0; this.LocalizeEtcId = 0; - this.DreamMakerEndingRewardType = SCHALE.Common.FlatData.DreamMakerEndingRewardType.None; - this.DreamMakerEndingType = SCHALE.Common.FlatData.DreamMakerEndingType.None; + this.DreamMakerEndingRewardType_ = SCHALE.Common.FlatData.DreamMakerEndingRewardType.None; + this.DreamMakerEndingType_ = SCHALE.Common.FlatData.DreamMakerEndingType.None; this.RewardParcelType = null; this.RewardParcelId = null; this.RewardParcelAmount = null; @@ -180,8 +180,8 @@ static public class MiniGameDreamEndingRewardExcelVerify && verifier.VerifyField(tablePos, 4 /*EventContentId*/, 8 /*long*/, 8, false) && verifier.VerifyField(tablePos, 6 /*EndingId*/, 8 /*long*/, 8, false) && verifier.VerifyField(tablePos, 8 /*LocalizeEtcId*/, 4 /*uint*/, 4, false) - && verifier.VerifyField(tablePos, 10 /*DreamMakerEndingRewardType*/, 4 /*SCHALE.Common.FlatData.DreamMakerEndingRewardType*/, 4, false) - && verifier.VerifyField(tablePos, 12 /*DreamMakerEndingType*/, 4 /*SCHALE.Common.FlatData.DreamMakerEndingType*/, 4, false) + && verifier.VerifyField(tablePos, 10 /*DreamMakerEndingRewardType_*/, 4 /*SCHALE.Common.FlatData.DreamMakerEndingRewardType*/, 4, false) + && verifier.VerifyField(tablePos, 12 /*DreamMakerEndingType_*/, 4 /*SCHALE.Common.FlatData.DreamMakerEndingType*/, 4, false) && verifier.VerifyVectorOfData(tablePos, 14 /*RewardParcelType*/, 4 /*SCHALE.Common.FlatData.ParcelType*/, false) && verifier.VerifyVectorOfData(tablePos, 16 /*RewardParcelId*/, 8 /*long*/, false) && verifier.VerifyVectorOfData(tablePos, 18 /*RewardParcelAmount*/, 8 /*long*/, false) diff --git a/SCHALE.Common/FlatData/MiniGameDreamInfoExcel.cs b/SCHALE.Common/FlatData/MiniGameDreamInfoExcel.cs index 3cfd105..64196d4 100644 --- a/SCHALE.Common/FlatData/MiniGameDreamInfoExcel.cs +++ b/SCHALE.Common/FlatData/MiniGameDreamInfoExcel.cs @@ -21,7 +21,7 @@ public struct MiniGameDreamInfoExcel : IFlatbufferObject public MiniGameDreamInfoExcel __assign(int _i, ByteBuffer _bb) { __init(_i, _bb); return this; } public long EventContentId { get { int o = __p.__offset(4); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } - public SCHALE.Common.FlatData.DreamMakerMultiplierCondition DreamMakerMultiplierCondition { get { int o = __p.__offset(6); return o != 0 ? (SCHALE.Common.FlatData.DreamMakerMultiplierCondition)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.DreamMakerMultiplierCondition.None; } } + public SCHALE.Common.FlatData.DreamMakerMultiplierCondition DreamMakerMultiplierCondition_ { get { int o = __p.__offset(6); return o != 0 ? (SCHALE.Common.FlatData.DreamMakerMultiplierCondition)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.DreamMakerMultiplierCondition.None; } } public long DreamMakerMultiplierConditionValue { get { int o = __p.__offset(8); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public long DreamMakerMultiplierMax { get { int o = __p.__offset(10); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public long DreamMakerDays { get { int o = __p.__offset(12); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } @@ -36,7 +36,7 @@ public struct MiniGameDreamInfoExcel : IFlatbufferObject public static Offset CreateMiniGameDreamInfoExcel(FlatBufferBuilder builder, long EventContentId = 0, - SCHALE.Common.FlatData.DreamMakerMultiplierCondition DreamMakerMultiplierCondition = SCHALE.Common.FlatData.DreamMakerMultiplierCondition.None, + SCHALE.Common.FlatData.DreamMakerMultiplierCondition DreamMakerMultiplierCondition_ = SCHALE.Common.FlatData.DreamMakerMultiplierCondition.None, long DreamMakerMultiplierConditionValue = 0, long DreamMakerMultiplierMax = 0, long DreamMakerDays = 0, @@ -61,13 +61,13 @@ public struct MiniGameDreamInfoExcel : IFlatbufferObject MiniGameDreamInfoExcel.AddEventContentId(builder, EventContentId); MiniGameDreamInfoExcel.AddDreamMakerDailyPointParcelType(builder, DreamMakerDailyPointParcelType); MiniGameDreamInfoExcel.AddDreamMakerParcelType(builder, DreamMakerParcelType); - MiniGameDreamInfoExcel.AddDreamMakerMultiplierCondition(builder, DreamMakerMultiplierCondition); + MiniGameDreamInfoExcel.AddDreamMakerMultiplierCondition_(builder, DreamMakerMultiplierCondition_); return MiniGameDreamInfoExcel.EndMiniGameDreamInfoExcel(builder); } public static void StartMiniGameDreamInfoExcel(FlatBufferBuilder builder) { builder.StartTable(13); } public static void AddEventContentId(FlatBufferBuilder builder, long eventContentId) { builder.AddLong(0, eventContentId, 0); } - public static void AddDreamMakerMultiplierCondition(FlatBufferBuilder builder, SCHALE.Common.FlatData.DreamMakerMultiplierCondition dreamMakerMultiplierCondition) { builder.AddInt(1, (int)dreamMakerMultiplierCondition, 0); } + public static void AddDreamMakerMultiplierCondition_(FlatBufferBuilder builder, SCHALE.Common.FlatData.DreamMakerMultiplierCondition dreamMakerMultiplierCondition_) { builder.AddInt(1, (int)dreamMakerMultiplierCondition_, 0); } public static void AddDreamMakerMultiplierConditionValue(FlatBufferBuilder builder, long dreamMakerMultiplierConditionValue) { builder.AddLong(2, dreamMakerMultiplierConditionValue, 0); } public static void AddDreamMakerMultiplierMax(FlatBufferBuilder builder, long dreamMakerMultiplierMax) { builder.AddLong(3, dreamMakerMultiplierMax, 0); } public static void AddDreamMakerDays(FlatBufferBuilder builder, long dreamMakerDays) { builder.AddLong(4, dreamMakerDays, 0); } @@ -91,7 +91,7 @@ public struct MiniGameDreamInfoExcel : IFlatbufferObject public void UnPackTo(MiniGameDreamInfoExcelT _o) { byte[] key = TableEncryptionService.CreateKey("MiniGameDreamInfo"); _o.EventContentId = TableEncryptionService.Convert(this.EventContentId, key); - _o.DreamMakerMultiplierCondition = TableEncryptionService.Convert(this.DreamMakerMultiplierCondition, key); + _o.DreamMakerMultiplierCondition_ = TableEncryptionService.Convert(this.DreamMakerMultiplierCondition_, key); _o.DreamMakerMultiplierConditionValue = TableEncryptionService.Convert(this.DreamMakerMultiplierConditionValue, key); _o.DreamMakerMultiplierMax = TableEncryptionService.Convert(this.DreamMakerMultiplierMax, key); _o.DreamMakerDays = TableEncryptionService.Convert(this.DreamMakerDays, key); @@ -109,7 +109,7 @@ public struct MiniGameDreamInfoExcel : IFlatbufferObject return CreateMiniGameDreamInfoExcel( builder, _o.EventContentId, - _o.DreamMakerMultiplierCondition, + _o.DreamMakerMultiplierCondition_, _o.DreamMakerMultiplierConditionValue, _o.DreamMakerMultiplierMax, _o.DreamMakerDays, @@ -127,7 +127,7 @@ public struct MiniGameDreamInfoExcel : IFlatbufferObject public class MiniGameDreamInfoExcelT { public long EventContentId { get; set; } - public SCHALE.Common.FlatData.DreamMakerMultiplierCondition DreamMakerMultiplierCondition { get; set; } + public SCHALE.Common.FlatData.DreamMakerMultiplierCondition DreamMakerMultiplierCondition_ { get; set; } public long DreamMakerMultiplierConditionValue { get; set; } public long DreamMakerMultiplierMax { get; set; } public long DreamMakerDays { get; set; } @@ -142,7 +142,7 @@ public class MiniGameDreamInfoExcelT public MiniGameDreamInfoExcelT() { this.EventContentId = 0; - this.DreamMakerMultiplierCondition = SCHALE.Common.FlatData.DreamMakerMultiplierCondition.None; + this.DreamMakerMultiplierCondition_ = SCHALE.Common.FlatData.DreamMakerMultiplierCondition.None; this.DreamMakerMultiplierConditionValue = 0; this.DreamMakerMultiplierMax = 0; this.DreamMakerDays = 0; @@ -164,7 +164,7 @@ static public class MiniGameDreamInfoExcelVerify { return verifier.VerifyTableStart(tablePos) && verifier.VerifyField(tablePos, 4 /*EventContentId*/, 8 /*long*/, 8, false) - && verifier.VerifyField(tablePos, 6 /*DreamMakerMultiplierCondition*/, 4 /*SCHALE.Common.FlatData.DreamMakerMultiplierCondition*/, 4, false) + && verifier.VerifyField(tablePos, 6 /*DreamMakerMultiplierCondition_*/, 4 /*SCHALE.Common.FlatData.DreamMakerMultiplierCondition*/, 4, false) && verifier.VerifyField(tablePos, 8 /*DreamMakerMultiplierConditionValue*/, 8 /*long*/, 8, false) && verifier.VerifyField(tablePos, 10 /*DreamMakerMultiplierMax*/, 8 /*long*/, 8, false) && verifier.VerifyField(tablePos, 12 /*DreamMakerDays*/, 8 /*long*/, 8, false) diff --git a/SCHALE.Common/FlatData/MiniGameDreamScheduleResultExcel.cs b/SCHALE.Common/FlatData/MiniGameDreamScheduleResultExcel.cs index cb79a09..aeac49a 100644 --- a/SCHALE.Common/FlatData/MiniGameDreamScheduleResultExcel.cs +++ b/SCHALE.Common/FlatData/MiniGameDreamScheduleResultExcel.cs @@ -22,7 +22,7 @@ public struct MiniGameDreamScheduleResultExcel : IFlatbufferObject public long Id { get { int o = __p.__offset(4); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public long EventContentId { get { int o = __p.__offset(6); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } - public SCHALE.Common.FlatData.DreamMakerResult DreamMakerResult { get { int o = __p.__offset(8); return o != 0 ? (SCHALE.Common.FlatData.DreamMakerResult)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.DreamMakerResult.None; } } + public SCHALE.Common.FlatData.DreamMakerResult DreamMakerResult_ { get { int o = __p.__offset(8); return o != 0 ? (SCHALE.Common.FlatData.DreamMakerResult)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.DreamMakerResult.None; } } public long DreamMakerScheduleGroup { get { int o = __p.__offset(10); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public int Prob { get { int o = __p.__offset(12); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } public SCHALE.Common.FlatData.DreamMakerParameterType RewardParameter(int j) { int o = __p.__offset(14); return o != 0 ? (SCHALE.Common.FlatData.DreamMakerParameterType)__p.bb.GetInt(__p.__vector(o) + j * 4) : (SCHALE.Common.FlatData.DreamMakerParameterType)0; } @@ -56,7 +56,7 @@ public struct MiniGameDreamScheduleResultExcel : IFlatbufferObject public static Offset CreateMiniGameDreamScheduleResultExcel(FlatBufferBuilder builder, long Id = 0, long EventContentId = 0, - SCHALE.Common.FlatData.DreamMakerResult DreamMakerResult = SCHALE.Common.FlatData.DreamMakerResult.None, + SCHALE.Common.FlatData.DreamMakerResult DreamMakerResult_ = SCHALE.Common.FlatData.DreamMakerResult.None, long DreamMakerScheduleGroup = 0, int Prob = 0, VectorOffset RewardParameterOffset = default(VectorOffset), @@ -76,14 +76,14 @@ public struct MiniGameDreamScheduleResultExcel : IFlatbufferObject MiniGameDreamScheduleResultExcel.AddRewardParameterOperationType(builder, RewardParameterOperationTypeOffset); MiniGameDreamScheduleResultExcel.AddRewardParameter(builder, RewardParameterOffset); MiniGameDreamScheduleResultExcel.AddProb(builder, Prob); - MiniGameDreamScheduleResultExcel.AddDreamMakerResult(builder, DreamMakerResult); + MiniGameDreamScheduleResultExcel.AddDreamMakerResult_(builder, DreamMakerResult_); return MiniGameDreamScheduleResultExcel.EndMiniGameDreamScheduleResultExcel(builder); } public static void StartMiniGameDreamScheduleResultExcel(FlatBufferBuilder builder) { builder.StartTable(11); } public static void AddId(FlatBufferBuilder builder, long id) { builder.AddLong(0, id, 0); } public static void AddEventContentId(FlatBufferBuilder builder, long eventContentId) { builder.AddLong(1, eventContentId, 0); } - public static void AddDreamMakerResult(FlatBufferBuilder builder, SCHALE.Common.FlatData.DreamMakerResult dreamMakerResult) { builder.AddInt(2, (int)dreamMakerResult, 0); } + public static void AddDreamMakerResult_(FlatBufferBuilder builder, SCHALE.Common.FlatData.DreamMakerResult dreamMakerResult_) { builder.AddInt(2, (int)dreamMakerResult_, 0); } public static void AddDreamMakerScheduleGroup(FlatBufferBuilder builder, long dreamMakerScheduleGroup) { builder.AddLong(3, dreamMakerScheduleGroup, 0); } public static void AddProb(FlatBufferBuilder builder, int prob) { builder.AddInt(4, prob, 0); } public static void AddRewardParameter(FlatBufferBuilder builder, VectorOffset rewardParameterOffset) { builder.AddOffset(5, rewardParameterOffset.Value, 0); } @@ -120,7 +120,7 @@ public struct MiniGameDreamScheduleResultExcel : IFlatbufferObject byte[] key = TableEncryptionService.CreateKey("MiniGameDreamScheduleResult"); _o.Id = TableEncryptionService.Convert(this.Id, key); _o.EventContentId = TableEncryptionService.Convert(this.EventContentId, key); - _o.DreamMakerResult = TableEncryptionService.Convert(this.DreamMakerResult, key); + _o.DreamMakerResult_ = TableEncryptionService.Convert(this.DreamMakerResult_, key); _o.DreamMakerScheduleGroup = TableEncryptionService.Convert(this.DreamMakerScheduleGroup, key); _o.Prob = TableEncryptionService.Convert(this.Prob, key); _o.RewardParameter = new List(); @@ -154,7 +154,7 @@ public struct MiniGameDreamScheduleResultExcel : IFlatbufferObject builder, _o.Id, _o.EventContentId, - _o.DreamMakerResult, + _o.DreamMakerResult_, _o.DreamMakerScheduleGroup, _o.Prob, _RewardParameter, @@ -170,7 +170,7 @@ public class MiniGameDreamScheduleResultExcelT { public long Id { get; set; } public long EventContentId { get; set; } - public SCHALE.Common.FlatData.DreamMakerResult DreamMakerResult { get; set; } + public SCHALE.Common.FlatData.DreamMakerResult DreamMakerResult_ { get; set; } public long DreamMakerScheduleGroup { get; set; } public int Prob { get; set; } public List RewardParameter { get; set; } @@ -183,7 +183,7 @@ public class MiniGameDreamScheduleResultExcelT public MiniGameDreamScheduleResultExcelT() { this.Id = 0; this.EventContentId = 0; - this.DreamMakerResult = SCHALE.Common.FlatData.DreamMakerResult.None; + this.DreamMakerResult_ = SCHALE.Common.FlatData.DreamMakerResult.None; this.DreamMakerScheduleGroup = 0; this.Prob = 0; this.RewardParameter = null; @@ -203,7 +203,7 @@ static public class MiniGameDreamScheduleResultExcelVerify return verifier.VerifyTableStart(tablePos) && verifier.VerifyField(tablePos, 4 /*Id*/, 8 /*long*/, 8, false) && verifier.VerifyField(tablePos, 6 /*EventContentId*/, 8 /*long*/, 8, false) - && verifier.VerifyField(tablePos, 8 /*DreamMakerResult*/, 4 /*SCHALE.Common.FlatData.DreamMakerResult*/, 4, false) + && verifier.VerifyField(tablePos, 8 /*DreamMakerResult_*/, 4 /*SCHALE.Common.FlatData.DreamMakerResult*/, 4, false) && verifier.VerifyField(tablePos, 10 /*DreamMakerScheduleGroup*/, 8 /*long*/, 8, false) && verifier.VerifyField(tablePos, 12 /*Prob*/, 4 /*int*/, 4, false) && verifier.VerifyVectorOfData(tablePos, 14 /*RewardParameter*/, 4 /*SCHALE.Common.FlatData.DreamMakerParameterType*/, false) diff --git a/SCHALE.Common/FlatData/MiniGameShootingStageExcel.cs b/SCHALE.Common/FlatData/MiniGameShootingStageExcel.cs index 4439ef2..c246375 100644 --- a/SCHALE.Common/FlatData/MiniGameShootingStageExcel.cs +++ b/SCHALE.Common/FlatData/MiniGameShootingStageExcel.cs @@ -21,9 +21,16 @@ public struct MiniGameShootingStageExcel : IFlatbufferObject public MiniGameShootingStageExcel __assign(int _i, ByteBuffer _bb) { __init(_i, _bb); return this; } public long UniqueId { get { int o = __p.__offset(4); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } - public long BgmId { get { int o = __p.__offset(6); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } + public long BgmId(int j) { int o = __p.__offset(6); return o != 0 ? __p.bb.GetLong(__p.__vector(o) + j * 8) : (long)0; } + public int BgmIdLength { get { int o = __p.__offset(6); return o != 0 ? __p.__vector_len(o) : 0; } } +#if ENABLE_SPAN_T + public Span GetBgmIdBytes() { return __p.__vector_as_span(6, 8); } +#else + public ArraySegment? GetBgmIdBytes() { return __p.__vector_as_arraysegment(6); } +#endif + public long[] GetBgmIdArray() { return __p.__vector_as_array(6); } public long CostGoodsId { get { int o = __p.__offset(8); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } - public SCHALE.Common.FlatData.Difficulty Difficulty { get { int o = __p.__offset(10); return o != 0 ? (SCHALE.Common.FlatData.Difficulty)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.Difficulty.Normal; } } + public SCHALE.Common.FlatData.Difficulty Difficulty_ { get { int o = __p.__offset(10); return o != 0 ? (SCHALE.Common.FlatData.Difficulty)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.Difficulty.Normal; } } public string DesignLevel { get { int o = __p.__offset(12); return o != 0 ? __p.__string(o + __p.bb_pos) : null; } } #if ENABLE_SPAN_T public Span GetDesignLevelBytes() { return __p.__vector_as_span(12, 1); } @@ -52,9 +59,9 @@ public struct MiniGameShootingStageExcel : IFlatbufferObject public static Offset CreateMiniGameShootingStageExcel(FlatBufferBuilder builder, long UniqueId = 0, - long BgmId = 0, + VectorOffset BgmIdOffset = default(VectorOffset), long CostGoodsId = 0, - SCHALE.Common.FlatData.Difficulty Difficulty = SCHALE.Common.FlatData.Difficulty.Normal, + SCHALE.Common.FlatData.Difficulty Difficulty_ = SCHALE.Common.FlatData.Difficulty.Normal, StringOffset DesignLevelOffset = default(StringOffset), StringOffset ArtLevelOffset = default(StringOffset), long StartBattleDuration = 0, @@ -67,21 +74,26 @@ public struct MiniGameShootingStageExcel : IFlatbufferObject MiniGameShootingStageExcel.AddDefaultBattleDuration(builder, DefaultBattleDuration); MiniGameShootingStageExcel.AddStartBattleDuration(builder, StartBattleDuration); MiniGameShootingStageExcel.AddCostGoodsId(builder, CostGoodsId); - MiniGameShootingStageExcel.AddBgmId(builder, BgmId); MiniGameShootingStageExcel.AddUniqueId(builder, UniqueId); MiniGameShootingStageExcel.AddCameraSizeRate(builder, CameraSizeRate); MiniGameShootingStageExcel.AddDefaultLogicEffect(builder, DefaultLogicEffectOffset); MiniGameShootingStageExcel.AddArtLevel(builder, ArtLevelOffset); MiniGameShootingStageExcel.AddDesignLevel(builder, DesignLevelOffset); - MiniGameShootingStageExcel.AddDifficulty(builder, Difficulty); + MiniGameShootingStageExcel.AddDifficulty_(builder, Difficulty_); + MiniGameShootingStageExcel.AddBgmId(builder, BgmIdOffset); return MiniGameShootingStageExcel.EndMiniGameShootingStageExcel(builder); } public static void StartMiniGameShootingStageExcel(FlatBufferBuilder builder) { builder.StartTable(11); } public static void AddUniqueId(FlatBufferBuilder builder, long uniqueId) { builder.AddLong(0, uniqueId, 0); } - public static void AddBgmId(FlatBufferBuilder builder, long bgmId) { builder.AddLong(1, bgmId, 0); } + public static void AddBgmId(FlatBufferBuilder builder, VectorOffset bgmIdOffset) { builder.AddOffset(1, bgmIdOffset.Value, 0); } + public static VectorOffset CreateBgmIdVector(FlatBufferBuilder builder, long[] data) { builder.StartVector(8, data.Length, 8); for (int i = data.Length - 1; i >= 0; i--) builder.AddLong(data[i]); return builder.EndVector(); } + public static VectorOffset CreateBgmIdVectorBlock(FlatBufferBuilder builder, long[] data) { builder.StartVector(8, data.Length, 8); builder.Add(data); return builder.EndVector(); } + public static VectorOffset CreateBgmIdVectorBlock(FlatBufferBuilder builder, ArraySegment data) { builder.StartVector(8, data.Count, 8); builder.Add(data); return builder.EndVector(); } + public static VectorOffset CreateBgmIdVectorBlock(FlatBufferBuilder builder, IntPtr dataPtr, int sizeInBytes) { builder.StartVector(1, sizeInBytes, 1); builder.Add(dataPtr, sizeInBytes); return builder.EndVector(); } + public static void StartBgmIdVector(FlatBufferBuilder builder, int numElems) { builder.StartVector(8, numElems, 8); } public static void AddCostGoodsId(FlatBufferBuilder builder, long costGoodsId) { builder.AddLong(2, costGoodsId, 0); } - public static void AddDifficulty(FlatBufferBuilder builder, SCHALE.Common.FlatData.Difficulty difficulty) { builder.AddInt(3, (int)difficulty, 0); } + public static void AddDifficulty_(FlatBufferBuilder builder, SCHALE.Common.FlatData.Difficulty difficulty_) { builder.AddInt(3, (int)difficulty_, 0); } public static void AddDesignLevel(FlatBufferBuilder builder, StringOffset designLevelOffset) { builder.AddOffset(4, designLevelOffset.Value, 0); } public static void AddArtLevel(FlatBufferBuilder builder, StringOffset artLevelOffset) { builder.AddOffset(5, artLevelOffset.Value, 0); } public static void AddStartBattleDuration(FlatBufferBuilder builder, long startBattleDuration) { builder.AddLong(6, startBattleDuration, 0); } @@ -101,9 +113,10 @@ public struct MiniGameShootingStageExcel : IFlatbufferObject public void UnPackTo(MiniGameShootingStageExcelT _o) { byte[] key = TableEncryptionService.CreateKey("MiniGameShootingStage"); _o.UniqueId = TableEncryptionService.Convert(this.UniqueId, key); - _o.BgmId = TableEncryptionService.Convert(this.BgmId, key); + _o.BgmId = new List(); + for (var _j = 0; _j < this.BgmIdLength; ++_j) {_o.BgmId.Add(TableEncryptionService.Convert(this.BgmId(_j), key));} _o.CostGoodsId = TableEncryptionService.Convert(this.CostGoodsId, key); - _o.Difficulty = TableEncryptionService.Convert(this.Difficulty, key); + _o.Difficulty_ = TableEncryptionService.Convert(this.Difficulty_, key); _o.DesignLevel = TableEncryptionService.Convert(this.DesignLevel, key); _o.ArtLevel = TableEncryptionService.Convert(this.ArtLevel, key); _o.StartBattleDuration = TableEncryptionService.Convert(this.StartBattleDuration, key); @@ -114,15 +127,20 @@ public struct MiniGameShootingStageExcel : IFlatbufferObject } public static Offset Pack(FlatBufferBuilder builder, MiniGameShootingStageExcelT _o) { if (_o == null) return default(Offset); + var _BgmId = default(VectorOffset); + if (_o.BgmId != null) { + var __BgmId = _o.BgmId.ToArray(); + _BgmId = CreateBgmIdVector(builder, __BgmId); + } var _DesignLevel = _o.DesignLevel == null ? default(StringOffset) : builder.CreateString(_o.DesignLevel); var _ArtLevel = _o.ArtLevel == null ? default(StringOffset) : builder.CreateString(_o.ArtLevel); var _DefaultLogicEffect = _o.DefaultLogicEffect == null ? default(StringOffset) : builder.CreateString(_o.DefaultLogicEffect); return CreateMiniGameShootingStageExcel( builder, _o.UniqueId, - _o.BgmId, + _BgmId, _o.CostGoodsId, - _o.Difficulty, + _o.Difficulty_, _DesignLevel, _ArtLevel, _o.StartBattleDuration, @@ -136,9 +154,9 @@ public struct MiniGameShootingStageExcel : IFlatbufferObject public class MiniGameShootingStageExcelT { public long UniqueId { get; set; } - public long BgmId { get; set; } + public List BgmId { get; set; } public long CostGoodsId { get; set; } - public SCHALE.Common.FlatData.Difficulty Difficulty { get; set; } + public SCHALE.Common.FlatData.Difficulty Difficulty_ { get; set; } public string DesignLevel { get; set; } public string ArtLevel { get; set; } public long StartBattleDuration { get; set; } @@ -149,9 +167,9 @@ public class MiniGameShootingStageExcelT public MiniGameShootingStageExcelT() { this.UniqueId = 0; - this.BgmId = 0; + this.BgmId = null; this.CostGoodsId = 0; - this.Difficulty = SCHALE.Common.FlatData.Difficulty.Normal; + this.Difficulty_ = SCHALE.Common.FlatData.Difficulty.Normal; this.DesignLevel = null; this.ArtLevel = null; this.StartBattleDuration = 0; @@ -169,9 +187,9 @@ static public class MiniGameShootingStageExcelVerify { return verifier.VerifyTableStart(tablePos) && verifier.VerifyField(tablePos, 4 /*UniqueId*/, 8 /*long*/, 8, false) - && verifier.VerifyField(tablePos, 6 /*BgmId*/, 8 /*long*/, 8, false) + && verifier.VerifyVectorOfData(tablePos, 6 /*BgmId*/, 8 /*long*/, false) && verifier.VerifyField(tablePos, 8 /*CostGoodsId*/, 8 /*long*/, 8, false) - && verifier.VerifyField(tablePos, 10 /*Difficulty*/, 4 /*SCHALE.Common.FlatData.Difficulty*/, 4, false) + && verifier.VerifyField(tablePos, 10 /*Difficulty_*/, 4 /*SCHALE.Common.FlatData.Difficulty*/, 4, false) && verifier.VerifyString(tablePos, 12 /*DesignLevel*/, false) && verifier.VerifyString(tablePos, 14 /*ArtLevel*/, false) && verifier.VerifyField(tablePos, 16 /*StartBattleDuration*/, 8 /*long*/, 8, false) diff --git a/SCHALE.Common/FlatData/MiniGameTBGThemaRewardExcel.cs b/SCHALE.Common/FlatData/MiniGameTBGThemaRewardExcel.cs index fc43c86..075ba32 100644 --- a/SCHALE.Common/FlatData/MiniGameTBGThemaRewardExcel.cs +++ b/SCHALE.Common/FlatData/MiniGameTBGThemaRewardExcel.cs @@ -24,7 +24,7 @@ public struct MiniGameTBGThemaRewardExcel : IFlatbufferObject public int ThemaRound { get { int o = __p.__offset(6); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } public int ThemaUniqueId { get { int o = __p.__offset(8); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } public bool IsLoop { get { int o = __p.__offset(10); return o != 0 ? 0!=__p.bb.Get(o + __p.bb_pos) : (bool)false; } } - public SCHALE.Common.FlatData.MiniGameTBGThemaRewardType MiniGameTBGThemaRewardType { get { int o = __p.__offset(12); return o != 0 ? (SCHALE.Common.FlatData.MiniGameTBGThemaRewardType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.MiniGameTBGThemaRewardType.TreasureReward; } } + public SCHALE.Common.FlatData.MiniGameTBGThemaRewardType MiniGameTBGThemaRewardType_ { get { int o = __p.__offset(12); return o != 0 ? (SCHALE.Common.FlatData.MiniGameTBGThemaRewardType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.MiniGameTBGThemaRewardType.TreasureReward; } } public SCHALE.Common.FlatData.ParcelType RewardParcelType(int j) { int o = __p.__offset(14); return o != 0 ? (SCHALE.Common.FlatData.ParcelType)__p.bb.GetInt(__p.__vector(o) + j * 4) : (SCHALE.Common.FlatData.ParcelType)0; } public int RewardParcelTypeLength { get { int o = __p.__offset(14); return o != 0 ? __p.__vector_len(o) : 0; } } #if ENABLE_SPAN_T @@ -55,7 +55,7 @@ public struct MiniGameTBGThemaRewardExcel : IFlatbufferObject int ThemaRound = 0, int ThemaUniqueId = 0, bool IsLoop = false, - SCHALE.Common.FlatData.MiniGameTBGThemaRewardType MiniGameTBGThemaRewardType = SCHALE.Common.FlatData.MiniGameTBGThemaRewardType.TreasureReward, + SCHALE.Common.FlatData.MiniGameTBGThemaRewardType MiniGameTBGThemaRewardType_ = SCHALE.Common.FlatData.MiniGameTBGThemaRewardType.TreasureReward, VectorOffset RewardParcelTypeOffset = default(VectorOffset), VectorOffset RewardParcelIdOffset = default(VectorOffset), VectorOffset RewardParcelAmountOffset = default(VectorOffset)) { @@ -64,7 +64,7 @@ public struct MiniGameTBGThemaRewardExcel : IFlatbufferObject MiniGameTBGThemaRewardExcel.AddRewardParcelAmount(builder, RewardParcelAmountOffset); MiniGameTBGThemaRewardExcel.AddRewardParcelId(builder, RewardParcelIdOffset); MiniGameTBGThemaRewardExcel.AddRewardParcelType(builder, RewardParcelTypeOffset); - MiniGameTBGThemaRewardExcel.AddMiniGameTBGThemaRewardType(builder, MiniGameTBGThemaRewardType); + MiniGameTBGThemaRewardExcel.AddMiniGameTBGThemaRewardType_(builder, MiniGameTBGThemaRewardType_); MiniGameTBGThemaRewardExcel.AddThemaUniqueId(builder, ThemaUniqueId); MiniGameTBGThemaRewardExcel.AddThemaRound(builder, ThemaRound); MiniGameTBGThemaRewardExcel.AddIsLoop(builder, IsLoop); @@ -76,7 +76,7 @@ public struct MiniGameTBGThemaRewardExcel : IFlatbufferObject public static void AddThemaRound(FlatBufferBuilder builder, int themaRound) { builder.AddInt(1, themaRound, 0); } public static void AddThemaUniqueId(FlatBufferBuilder builder, int themaUniqueId) { builder.AddInt(2, themaUniqueId, 0); } public static void AddIsLoop(FlatBufferBuilder builder, bool isLoop) { builder.AddBool(3, isLoop, false); } - public static void AddMiniGameTBGThemaRewardType(FlatBufferBuilder builder, SCHALE.Common.FlatData.MiniGameTBGThemaRewardType miniGameTBGThemaRewardType) { builder.AddInt(4, (int)miniGameTBGThemaRewardType, 0); } + public static void AddMiniGameTBGThemaRewardType_(FlatBufferBuilder builder, SCHALE.Common.FlatData.MiniGameTBGThemaRewardType miniGameTBGThemaRewardType_) { builder.AddInt(4, (int)miniGameTBGThemaRewardType_, 0); } public static void AddRewardParcelType(FlatBufferBuilder builder, VectorOffset rewardParcelTypeOffset) { builder.AddOffset(5, rewardParcelTypeOffset.Value, 0); } public static VectorOffset CreateRewardParcelTypeVector(FlatBufferBuilder builder, SCHALE.Common.FlatData.ParcelType[] data) { builder.StartVector(4, data.Length, 4); for (int i = data.Length - 1; i >= 0; i--) builder.AddInt((int)data[i]); return builder.EndVector(); } public static VectorOffset CreateRewardParcelTypeVectorBlock(FlatBufferBuilder builder, SCHALE.Common.FlatData.ParcelType[] data) { builder.StartVector(4, data.Length, 4); builder.Add(data); return builder.EndVector(); } @@ -110,7 +110,7 @@ public struct MiniGameTBGThemaRewardExcel : IFlatbufferObject _o.ThemaRound = TableEncryptionService.Convert(this.ThemaRound, key); _o.ThemaUniqueId = TableEncryptionService.Convert(this.ThemaUniqueId, key); _o.IsLoop = TableEncryptionService.Convert(this.IsLoop, key); - _o.MiniGameTBGThemaRewardType = TableEncryptionService.Convert(this.MiniGameTBGThemaRewardType, key); + _o.MiniGameTBGThemaRewardType_ = TableEncryptionService.Convert(this.MiniGameTBGThemaRewardType_, key); _o.RewardParcelType = new List(); for (var _j = 0; _j < this.RewardParcelTypeLength; ++_j) {_o.RewardParcelType.Add(TableEncryptionService.Convert(this.RewardParcelType(_j), key));} _o.RewardParcelId = new List(); @@ -141,7 +141,7 @@ public struct MiniGameTBGThemaRewardExcel : IFlatbufferObject _o.ThemaRound, _o.ThemaUniqueId, _o.IsLoop, - _o.MiniGameTBGThemaRewardType, + _o.MiniGameTBGThemaRewardType_, _RewardParcelType, _RewardParcelId, _RewardParcelAmount); @@ -154,7 +154,7 @@ public class MiniGameTBGThemaRewardExcelT public int ThemaRound { get; set; } public int ThemaUniqueId { get; set; } public bool IsLoop { get; set; } - public SCHALE.Common.FlatData.MiniGameTBGThemaRewardType MiniGameTBGThemaRewardType { get; set; } + public SCHALE.Common.FlatData.MiniGameTBGThemaRewardType MiniGameTBGThemaRewardType_ { get; set; } public List RewardParcelType { get; set; } public List RewardParcelId { get; set; } public List RewardParcelAmount { get; set; } @@ -164,7 +164,7 @@ public class MiniGameTBGThemaRewardExcelT this.ThemaRound = 0; this.ThemaUniqueId = 0; this.IsLoop = false; - this.MiniGameTBGThemaRewardType = SCHALE.Common.FlatData.MiniGameTBGThemaRewardType.TreasureReward; + this.MiniGameTBGThemaRewardType_ = SCHALE.Common.FlatData.MiniGameTBGThemaRewardType.TreasureReward; this.RewardParcelType = null; this.RewardParcelId = null; this.RewardParcelAmount = null; @@ -181,7 +181,7 @@ static public class MiniGameTBGThemaRewardExcelVerify && verifier.VerifyField(tablePos, 6 /*ThemaRound*/, 4 /*int*/, 4, false) && verifier.VerifyField(tablePos, 8 /*ThemaUniqueId*/, 4 /*int*/, 4, false) && verifier.VerifyField(tablePos, 10 /*IsLoop*/, 1 /*bool*/, 1, false) - && verifier.VerifyField(tablePos, 12 /*MiniGameTBGThemaRewardType*/, 4 /*SCHALE.Common.FlatData.MiniGameTBGThemaRewardType*/, 4, false) + && verifier.VerifyField(tablePos, 12 /*MiniGameTBGThemaRewardType_*/, 4 /*SCHALE.Common.FlatData.MiniGameTBGThemaRewardType*/, 4, false) && verifier.VerifyVectorOfData(tablePos, 14 /*RewardParcelType*/, 4 /*SCHALE.Common.FlatData.ParcelType*/, false) && verifier.VerifyVectorOfData(tablePos, 16 /*RewardParcelId*/, 8 /*long*/, false) && verifier.VerifyVectorOfData(tablePos, 18 /*RewardParcelAmount*/, 4 /*int*/, false) diff --git a/SCHALE.Common/FlatData/MinigameTBGEncounterRewardExcel.cs b/SCHALE.Common/FlatData/MinigameTBGEncounterRewardExcel.cs index 4979cd8..481536d 100644 --- a/SCHALE.Common/FlatData/MinigameTBGEncounterRewardExcel.cs +++ b/SCHALE.Common/FlatData/MinigameTBGEncounterRewardExcel.cs @@ -22,9 +22,9 @@ public struct MinigameTBGEncounterRewardExcel : IFlatbufferObject public long GroupId { get { int o = __p.__offset(4); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public long UniqueId { get { int o = __p.__offset(6); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } - public SCHALE.Common.FlatData.TBGOptionSuccessType TBGOptionSuccessType { get { int o = __p.__offset(8); return o != 0 ? (SCHALE.Common.FlatData.TBGOptionSuccessType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.TBGOptionSuccessType.None; } } + public SCHALE.Common.FlatData.TBGOptionSuccessType TBGOptionSuccessType_ { get { int o = __p.__offset(8); return o != 0 ? (SCHALE.Common.FlatData.TBGOptionSuccessType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.TBGOptionSuccessType.None; } } public long Paremeter { get { int o = __p.__offset(10); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } - public SCHALE.Common.FlatData.ParcelType ParcelType { get { int o = __p.__offset(12); return o != 0 ? (SCHALE.Common.FlatData.ParcelType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.ParcelType.None; } } + public SCHALE.Common.FlatData.ParcelType ParcelType_ { get { int o = __p.__offset(12); return o != 0 ? (SCHALE.Common.FlatData.ParcelType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.ParcelType.None; } } public long ParcelId { get { int o = __p.__offset(14); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public long Amount { get { int o = __p.__offset(16); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public int Prob { get { int o = __p.__offset(18); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } @@ -32,9 +32,9 @@ public struct MinigameTBGEncounterRewardExcel : IFlatbufferObject public static Offset CreateMinigameTBGEncounterRewardExcel(FlatBufferBuilder builder, long GroupId = 0, long UniqueId = 0, - SCHALE.Common.FlatData.TBGOptionSuccessType TBGOptionSuccessType = SCHALE.Common.FlatData.TBGOptionSuccessType.None, + SCHALE.Common.FlatData.TBGOptionSuccessType TBGOptionSuccessType_ = SCHALE.Common.FlatData.TBGOptionSuccessType.None, long Paremeter = 0, - SCHALE.Common.FlatData.ParcelType ParcelType = SCHALE.Common.FlatData.ParcelType.None, + SCHALE.Common.FlatData.ParcelType ParcelType_ = SCHALE.Common.FlatData.ParcelType.None, long ParcelId = 0, long Amount = 0, int Prob = 0) { @@ -45,17 +45,17 @@ public struct MinigameTBGEncounterRewardExcel : IFlatbufferObject MinigameTBGEncounterRewardExcel.AddUniqueId(builder, UniqueId); MinigameTBGEncounterRewardExcel.AddGroupId(builder, GroupId); MinigameTBGEncounterRewardExcel.AddProb(builder, Prob); - MinigameTBGEncounterRewardExcel.AddParcelType(builder, ParcelType); - MinigameTBGEncounterRewardExcel.AddTBGOptionSuccessType(builder, TBGOptionSuccessType); + MinigameTBGEncounterRewardExcel.AddParcelType_(builder, ParcelType_); + MinigameTBGEncounterRewardExcel.AddTBGOptionSuccessType_(builder, TBGOptionSuccessType_); return MinigameTBGEncounterRewardExcel.EndMinigameTBGEncounterRewardExcel(builder); } public static void StartMinigameTBGEncounterRewardExcel(FlatBufferBuilder builder) { builder.StartTable(8); } public static void AddGroupId(FlatBufferBuilder builder, long groupId) { builder.AddLong(0, groupId, 0); } public static void AddUniqueId(FlatBufferBuilder builder, long uniqueId) { builder.AddLong(1, uniqueId, 0); } - public static void AddTBGOptionSuccessType(FlatBufferBuilder builder, SCHALE.Common.FlatData.TBGOptionSuccessType tBGOptionSuccessType) { builder.AddInt(2, (int)tBGOptionSuccessType, 0); } + public static void AddTBGOptionSuccessType_(FlatBufferBuilder builder, SCHALE.Common.FlatData.TBGOptionSuccessType tBGOptionSuccessType_) { builder.AddInt(2, (int)tBGOptionSuccessType_, 0); } public static void AddParemeter(FlatBufferBuilder builder, long paremeter) { builder.AddLong(3, paremeter, 0); } - public static void AddParcelType(FlatBufferBuilder builder, SCHALE.Common.FlatData.ParcelType parcelType) { builder.AddInt(4, (int)parcelType, 0); } + public static void AddParcelType_(FlatBufferBuilder builder, SCHALE.Common.FlatData.ParcelType parcelType_) { builder.AddInt(4, (int)parcelType_, 0); } public static void AddParcelId(FlatBufferBuilder builder, long parcelId) { builder.AddLong(5, parcelId, 0); } public static void AddAmount(FlatBufferBuilder builder, long amount) { builder.AddLong(6, amount, 0); } public static void AddProb(FlatBufferBuilder builder, int prob) { builder.AddInt(7, prob, 0); } @@ -72,9 +72,9 @@ public struct MinigameTBGEncounterRewardExcel : IFlatbufferObject byte[] key = TableEncryptionService.CreateKey("MinigameTBGEncounterReward"); _o.GroupId = TableEncryptionService.Convert(this.GroupId, key); _o.UniqueId = TableEncryptionService.Convert(this.UniqueId, key); - _o.TBGOptionSuccessType = TableEncryptionService.Convert(this.TBGOptionSuccessType, key); + _o.TBGOptionSuccessType_ = TableEncryptionService.Convert(this.TBGOptionSuccessType_, key); _o.Paremeter = TableEncryptionService.Convert(this.Paremeter, key); - _o.ParcelType = TableEncryptionService.Convert(this.ParcelType, key); + _o.ParcelType_ = TableEncryptionService.Convert(this.ParcelType_, key); _o.ParcelId = TableEncryptionService.Convert(this.ParcelId, key); _o.Amount = TableEncryptionService.Convert(this.Amount, key); _o.Prob = TableEncryptionService.Convert(this.Prob, key); @@ -85,9 +85,9 @@ public struct MinigameTBGEncounterRewardExcel : IFlatbufferObject builder, _o.GroupId, _o.UniqueId, - _o.TBGOptionSuccessType, + _o.TBGOptionSuccessType_, _o.Paremeter, - _o.ParcelType, + _o.ParcelType_, _o.ParcelId, _o.Amount, _o.Prob); @@ -98,9 +98,9 @@ public class MinigameTBGEncounterRewardExcelT { public long GroupId { get; set; } public long UniqueId { get; set; } - public SCHALE.Common.FlatData.TBGOptionSuccessType TBGOptionSuccessType { get; set; } + public SCHALE.Common.FlatData.TBGOptionSuccessType TBGOptionSuccessType_ { get; set; } public long Paremeter { get; set; } - public SCHALE.Common.FlatData.ParcelType ParcelType { get; set; } + public SCHALE.Common.FlatData.ParcelType ParcelType_ { get; set; } public long ParcelId { get; set; } public long Amount { get; set; } public int Prob { get; set; } @@ -108,9 +108,9 @@ public class MinigameTBGEncounterRewardExcelT public MinigameTBGEncounterRewardExcelT() { this.GroupId = 0; this.UniqueId = 0; - this.TBGOptionSuccessType = SCHALE.Common.FlatData.TBGOptionSuccessType.None; + this.TBGOptionSuccessType_ = SCHALE.Common.FlatData.TBGOptionSuccessType.None; this.Paremeter = 0; - this.ParcelType = SCHALE.Common.FlatData.ParcelType.None; + this.ParcelType_ = SCHALE.Common.FlatData.ParcelType.None; this.ParcelId = 0; this.Amount = 0; this.Prob = 0; @@ -125,9 +125,9 @@ static public class MinigameTBGEncounterRewardExcelVerify return verifier.VerifyTableStart(tablePos) && verifier.VerifyField(tablePos, 4 /*GroupId*/, 8 /*long*/, 8, false) && verifier.VerifyField(tablePos, 6 /*UniqueId*/, 8 /*long*/, 8, false) - && verifier.VerifyField(tablePos, 8 /*TBGOptionSuccessType*/, 4 /*SCHALE.Common.FlatData.TBGOptionSuccessType*/, 4, false) + && verifier.VerifyField(tablePos, 8 /*TBGOptionSuccessType_*/, 4 /*SCHALE.Common.FlatData.TBGOptionSuccessType*/, 4, false) && verifier.VerifyField(tablePos, 10 /*Paremeter*/, 8 /*long*/, 8, false) - && verifier.VerifyField(tablePos, 12 /*ParcelType*/, 4 /*SCHALE.Common.FlatData.ParcelType*/, 4, false) + && verifier.VerifyField(tablePos, 12 /*ParcelType_*/, 4 /*SCHALE.Common.FlatData.ParcelType*/, 4, false) && verifier.VerifyField(tablePos, 14 /*ParcelId*/, 8 /*long*/, 8, false) && verifier.VerifyField(tablePos, 16 /*Amount*/, 8 /*long*/, 8, false) && verifier.VerifyField(tablePos, 18 /*Prob*/, 4 /*int*/, 4, false) diff --git a/SCHALE.Common/FlatData/MinigameTBGItemExcel.cs b/SCHALE.Common/FlatData/MinigameTBGItemExcel.cs index 963db67..e0bdbf7 100644 --- a/SCHALE.Common/FlatData/MinigameTBGItemExcel.cs +++ b/SCHALE.Common/FlatData/MinigameTBGItemExcel.cs @@ -22,7 +22,7 @@ public struct MinigameTBGItemExcel : IFlatbufferObject public long UniqueId { get { int o = __p.__offset(4); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public SCHALE.Common.FlatData.TBGItemType ItemType { get { int o = __p.__offset(6); return o != 0 ? (SCHALE.Common.FlatData.TBGItemType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.TBGItemType.None; } } - public SCHALE.Common.FlatData.TBGItemEffectType TBGItemEffectType { get { int o = __p.__offset(8); return o != 0 ? (SCHALE.Common.FlatData.TBGItemEffectType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.TBGItemEffectType.None; } } + public SCHALE.Common.FlatData.TBGItemEffectType TBGItemEffectType_ { get { int o = __p.__offset(8); return o != 0 ? (SCHALE.Common.FlatData.TBGItemEffectType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.TBGItemEffectType.None; } } public int ItemParameter { get { int o = __p.__offset(10); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } public string LocalizeETCId { get { int o = __p.__offset(12); return o != 0 ? __p.__string(o + __p.bb_pos) : null; } } #if ENABLE_SPAN_T @@ -53,18 +53,20 @@ public struct MinigameTBGItemExcel : IFlatbufferObject public ArraySegment? GetDiceEffectAniClipBytes() { return __p.__vector_as_arraysegment(20); } #endif public byte[] GetDiceEffectAniClipArray() { return __p.__vector_as_array(20); } + public bool BuffIconHUDVisible { get { int o = __p.__offset(22); return o != 0 ? 0!=__p.bb.Get(o + __p.bb_pos) : (bool)false; } } public static Offset CreateMinigameTBGItemExcel(FlatBufferBuilder builder, long UniqueId = 0, SCHALE.Common.FlatData.TBGItemType ItemType = SCHALE.Common.FlatData.TBGItemType.None, - SCHALE.Common.FlatData.TBGItemEffectType TBGItemEffectType = SCHALE.Common.FlatData.TBGItemEffectType.None, + SCHALE.Common.FlatData.TBGItemEffectType TBGItemEffectType_ = SCHALE.Common.FlatData.TBGItemEffectType.None, int ItemParameter = 0, StringOffset LocalizeETCIdOffset = default(StringOffset), StringOffset IconOffset = default(StringOffset), StringOffset BuffIconOffset = default(StringOffset), int EncounterCount = 0, - StringOffset DiceEffectAniClipOffset = default(StringOffset)) { - builder.StartTable(9); + StringOffset DiceEffectAniClipOffset = default(StringOffset), + bool BuffIconHUDVisible = false) { + builder.StartTable(10); MinigameTBGItemExcel.AddUniqueId(builder, UniqueId); MinigameTBGItemExcel.AddDiceEffectAniClip(builder, DiceEffectAniClipOffset); MinigameTBGItemExcel.AddEncounterCount(builder, EncounterCount); @@ -72,21 +74,23 @@ public struct MinigameTBGItemExcel : IFlatbufferObject MinigameTBGItemExcel.AddIcon(builder, IconOffset); MinigameTBGItemExcel.AddLocalizeETCId(builder, LocalizeETCIdOffset); MinigameTBGItemExcel.AddItemParameter(builder, ItemParameter); - MinigameTBGItemExcel.AddTBGItemEffectType(builder, TBGItemEffectType); + MinigameTBGItemExcel.AddTBGItemEffectType_(builder, TBGItemEffectType_); MinigameTBGItemExcel.AddItemType(builder, ItemType); + MinigameTBGItemExcel.AddBuffIconHUDVisible(builder, BuffIconHUDVisible); return MinigameTBGItemExcel.EndMinigameTBGItemExcel(builder); } - public static void StartMinigameTBGItemExcel(FlatBufferBuilder builder) { builder.StartTable(9); } + public static void StartMinigameTBGItemExcel(FlatBufferBuilder builder) { builder.StartTable(10); } public static void AddUniqueId(FlatBufferBuilder builder, long uniqueId) { builder.AddLong(0, uniqueId, 0); } public static void AddItemType(FlatBufferBuilder builder, SCHALE.Common.FlatData.TBGItemType itemType) { builder.AddInt(1, (int)itemType, 0); } - public static void AddTBGItemEffectType(FlatBufferBuilder builder, SCHALE.Common.FlatData.TBGItemEffectType tBGItemEffectType) { builder.AddInt(2, (int)tBGItemEffectType, 0); } + public static void AddTBGItemEffectType_(FlatBufferBuilder builder, SCHALE.Common.FlatData.TBGItemEffectType tBGItemEffectType_) { builder.AddInt(2, (int)tBGItemEffectType_, 0); } public static void AddItemParameter(FlatBufferBuilder builder, int itemParameter) { builder.AddInt(3, itemParameter, 0); } public static void AddLocalizeETCId(FlatBufferBuilder builder, StringOffset localizeETCIdOffset) { builder.AddOffset(4, localizeETCIdOffset.Value, 0); } public static void AddIcon(FlatBufferBuilder builder, StringOffset iconOffset) { builder.AddOffset(5, iconOffset.Value, 0); } public static void AddBuffIcon(FlatBufferBuilder builder, StringOffset buffIconOffset) { builder.AddOffset(6, buffIconOffset.Value, 0); } public static void AddEncounterCount(FlatBufferBuilder builder, int encounterCount) { builder.AddInt(7, encounterCount, 0); } public static void AddDiceEffectAniClip(FlatBufferBuilder builder, StringOffset diceEffectAniClipOffset) { builder.AddOffset(8, diceEffectAniClipOffset.Value, 0); } + public static void AddBuffIconHUDVisible(FlatBufferBuilder builder, bool buffIconHUDVisible) { builder.AddBool(9, buffIconHUDVisible, false); } public static Offset EndMinigameTBGItemExcel(FlatBufferBuilder builder) { int o = builder.EndTable(); return new Offset(o); @@ -100,13 +104,14 @@ public struct MinigameTBGItemExcel : IFlatbufferObject byte[] key = TableEncryptionService.CreateKey("MinigameTBGItem"); _o.UniqueId = TableEncryptionService.Convert(this.UniqueId, key); _o.ItemType = TableEncryptionService.Convert(this.ItemType, key); - _o.TBGItemEffectType = TableEncryptionService.Convert(this.TBGItemEffectType, key); + _o.TBGItemEffectType_ = TableEncryptionService.Convert(this.TBGItemEffectType_, key); _o.ItemParameter = TableEncryptionService.Convert(this.ItemParameter, key); _o.LocalizeETCId = TableEncryptionService.Convert(this.LocalizeETCId, key); _o.Icon = TableEncryptionService.Convert(this.Icon, key); _o.BuffIcon = TableEncryptionService.Convert(this.BuffIcon, key); _o.EncounterCount = TableEncryptionService.Convert(this.EncounterCount, key); _o.DiceEffectAniClip = TableEncryptionService.Convert(this.DiceEffectAniClip, key); + _o.BuffIconHUDVisible = TableEncryptionService.Convert(this.BuffIconHUDVisible, key); } public static Offset Pack(FlatBufferBuilder builder, MinigameTBGItemExcelT _o) { if (_o == null) return default(Offset); @@ -118,13 +123,14 @@ public struct MinigameTBGItemExcel : IFlatbufferObject builder, _o.UniqueId, _o.ItemType, - _o.TBGItemEffectType, + _o.TBGItemEffectType_, _o.ItemParameter, _LocalizeETCId, _Icon, _BuffIcon, _o.EncounterCount, - _DiceEffectAniClip); + _DiceEffectAniClip, + _o.BuffIconHUDVisible); } } @@ -132,24 +138,26 @@ public class MinigameTBGItemExcelT { public long UniqueId { get; set; } public SCHALE.Common.FlatData.TBGItemType ItemType { get; set; } - public SCHALE.Common.FlatData.TBGItemEffectType TBGItemEffectType { get; set; } + public SCHALE.Common.FlatData.TBGItemEffectType TBGItemEffectType_ { get; set; } public int ItemParameter { get; set; } public string LocalizeETCId { get; set; } public string Icon { get; set; } public string BuffIcon { get; set; } public int EncounterCount { get; set; } public string DiceEffectAniClip { get; set; } + public bool BuffIconHUDVisible { get; set; } public MinigameTBGItemExcelT() { this.UniqueId = 0; this.ItemType = SCHALE.Common.FlatData.TBGItemType.None; - this.TBGItemEffectType = SCHALE.Common.FlatData.TBGItemEffectType.None; + this.TBGItemEffectType_ = SCHALE.Common.FlatData.TBGItemEffectType.None; this.ItemParameter = 0; this.LocalizeETCId = null; this.Icon = null; this.BuffIcon = null; this.EncounterCount = 0; this.DiceEffectAniClip = null; + this.BuffIconHUDVisible = false; } } @@ -161,13 +169,14 @@ static public class MinigameTBGItemExcelVerify return verifier.VerifyTableStart(tablePos) && verifier.VerifyField(tablePos, 4 /*UniqueId*/, 8 /*long*/, 8, false) && verifier.VerifyField(tablePos, 6 /*ItemType*/, 4 /*SCHALE.Common.FlatData.TBGItemType*/, 4, false) - && verifier.VerifyField(tablePos, 8 /*TBGItemEffectType*/, 4 /*SCHALE.Common.FlatData.TBGItemEffectType*/, 4, false) + && verifier.VerifyField(tablePos, 8 /*TBGItemEffectType_*/, 4 /*SCHALE.Common.FlatData.TBGItemEffectType*/, 4, false) && verifier.VerifyField(tablePos, 10 /*ItemParameter*/, 4 /*int*/, 4, false) && verifier.VerifyString(tablePos, 12 /*LocalizeETCId*/, false) && verifier.VerifyString(tablePos, 14 /*Icon*/, false) && verifier.VerifyString(tablePos, 16 /*BuffIcon*/, false) && verifier.VerifyField(tablePos, 18 /*EncounterCount*/, 4 /*int*/, 4, false) && verifier.VerifyString(tablePos, 20 /*DiceEffectAniClip*/, false) + && verifier.VerifyField(tablePos, 22 /*BuffIconHUDVisible*/, 1 /*bool*/, 1, false) && verifier.VerifyTableEnd(tablePos); } } diff --git a/SCHALE.Common/FlatData/MinigameTBGSeasonExcel.cs b/SCHALE.Common/FlatData/MinigameTBGSeasonExcel.cs index ec61053..dd55676 100644 --- a/SCHALE.Common/FlatData/MinigameTBGSeasonExcel.cs +++ b/SCHALE.Common/FlatData/MinigameTBGSeasonExcel.cs @@ -82,6 +82,9 @@ public struct MinigameTBGSeasonExcel : IFlatbufferObject public ArraySegment? GetMapNameLocalizeBytes() { return __p.__vector_as_arraysegment(54); } #endif public byte[] GetMapNameLocalizeArray() { return __p.__vector_as_array(54); } + public int StartThemaIndex { get { int o = __p.__offset(56); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } + public int LoopThemaIndex { get { int o = __p.__offset(58); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } + public int MaxDicePlus { get { int o = __p.__offset(60); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } public static Offset CreateMinigameTBGSeasonExcel(FlatBufferBuilder builder, long EventContentId = 0, @@ -109,8 +112,11 @@ public struct MinigameTBGSeasonExcel : IFlatbufferObject int InstantClearRound = 0, int MaxHp = 0, StringOffset MapImagePathOffset = default(StringOffset), - StringOffset MapNameLocalizeOffset = default(StringOffset)) { - builder.StartTable(26); + StringOffset MapNameLocalizeOffset = default(StringOffset), + int StartThemaIndex = 0, + int LoopThemaIndex = 0, + int MaxDicePlus = 0) { + builder.StartTable(29); MinigameTBGSeasonExcel.AddEchelonRevivalCostId(builder, EchelonRevivalCostId); MinigameTBGSeasonExcel.AddEventUseCostId(builder, EventUseCostId); MinigameTBGSeasonExcel.AddEchelonSlot4CharacterId(builder, EchelonSlot4CharacterId); @@ -119,6 +125,9 @@ public struct MinigameTBGSeasonExcel : IFlatbufferObject MinigameTBGSeasonExcel.AddEchelonSlot1CharacterId(builder, EchelonSlot1CharacterId); MinigameTBGSeasonExcel.AddDefaultItemDiceId(builder, DefaultItemDiceId); MinigameTBGSeasonExcel.AddEventContentId(builder, EventContentId); + MinigameTBGSeasonExcel.AddMaxDicePlus(builder, MaxDicePlus); + MinigameTBGSeasonExcel.AddLoopThemaIndex(builder, LoopThemaIndex); + MinigameTBGSeasonExcel.AddStartThemaIndex(builder, StartThemaIndex); MinigameTBGSeasonExcel.AddMapNameLocalize(builder, MapNameLocalizeOffset); MinigameTBGSeasonExcel.AddMapImagePath(builder, MapImagePathOffset); MinigameTBGSeasonExcel.AddMaxHp(builder, MaxHp); @@ -140,7 +149,7 @@ public struct MinigameTBGSeasonExcel : IFlatbufferObject return MinigameTBGSeasonExcel.EndMinigameTBGSeasonExcel(builder); } - public static void StartMinigameTBGSeasonExcel(FlatBufferBuilder builder) { builder.StartTable(26); } + public static void StartMinigameTBGSeasonExcel(FlatBufferBuilder builder) { builder.StartTable(29); } public static void AddEventContentId(FlatBufferBuilder builder, long eventContentId) { builder.AddLong(0, eventContentId, 0); } public static void AddItemSlot(FlatBufferBuilder builder, int itemSlot) { builder.AddInt(1, itemSlot, 0); } public static void AddDefaultEchelonHp(FlatBufferBuilder builder, int defaultEchelonHp) { builder.AddInt(2, defaultEchelonHp, 0); } @@ -167,6 +176,9 @@ public struct MinigameTBGSeasonExcel : IFlatbufferObject public static void AddMaxHp(FlatBufferBuilder builder, int maxHp) { builder.AddInt(23, maxHp, 0); } public static void AddMapImagePath(FlatBufferBuilder builder, StringOffset mapImagePathOffset) { builder.AddOffset(24, mapImagePathOffset.Value, 0); } public static void AddMapNameLocalize(FlatBufferBuilder builder, StringOffset mapNameLocalizeOffset) { builder.AddOffset(25, mapNameLocalizeOffset.Value, 0); } + public static void AddStartThemaIndex(FlatBufferBuilder builder, int startThemaIndex) { builder.AddInt(26, startThemaIndex, 0); } + public static void AddLoopThemaIndex(FlatBufferBuilder builder, int loopThemaIndex) { builder.AddInt(27, loopThemaIndex, 0); } + public static void AddMaxDicePlus(FlatBufferBuilder builder, int maxDicePlus) { builder.AddInt(28, maxDicePlus, 0); } public static Offset EndMinigameTBGSeasonExcel(FlatBufferBuilder builder) { int o = builder.EndTable(); return new Offset(o); @@ -204,6 +216,9 @@ public struct MinigameTBGSeasonExcel : IFlatbufferObject _o.MaxHp = TableEncryptionService.Convert(this.MaxHp, key); _o.MapImagePath = TableEncryptionService.Convert(this.MapImagePath, key); _o.MapNameLocalize = TableEncryptionService.Convert(this.MapNameLocalize, key); + _o.StartThemaIndex = TableEncryptionService.Convert(this.StartThemaIndex, key); + _o.LoopThemaIndex = TableEncryptionService.Convert(this.LoopThemaIndex, key); + _o.MaxDicePlus = TableEncryptionService.Convert(this.MaxDicePlus, key); } public static Offset Pack(FlatBufferBuilder builder, MinigameTBGSeasonExcelT _o) { if (_o == null) return default(Offset); @@ -240,7 +255,10 @@ public struct MinigameTBGSeasonExcel : IFlatbufferObject _o.InstantClearRound, _o.MaxHp, _MapImagePath, - _MapNameLocalize); + _MapNameLocalize, + _o.StartThemaIndex, + _o.LoopThemaIndex, + _o.MaxDicePlus); } } @@ -272,6 +290,9 @@ public class MinigameTBGSeasonExcelT public int MaxHp { get; set; } public string MapImagePath { get; set; } public string MapNameLocalize { get; set; } + public int StartThemaIndex { get; set; } + public int LoopThemaIndex { get; set; } + public int MaxDicePlus { get; set; } public MinigameTBGSeasonExcelT() { this.EventContentId = 0; @@ -300,6 +321,9 @@ public class MinigameTBGSeasonExcelT this.MaxHp = 0; this.MapImagePath = null; this.MapNameLocalize = null; + this.StartThemaIndex = 0; + this.LoopThemaIndex = 0; + this.MaxDicePlus = 0; } } @@ -335,6 +359,9 @@ static public class MinigameTBGSeasonExcelVerify && verifier.VerifyField(tablePos, 50 /*MaxHp*/, 4 /*int*/, 4, false) && verifier.VerifyString(tablePos, 52 /*MapImagePath*/, false) && verifier.VerifyString(tablePos, 54 /*MapNameLocalize*/, false) + && verifier.VerifyField(tablePos, 56 /*StartThemaIndex*/, 4 /*int*/, 4, false) + && verifier.VerifyField(tablePos, 58 /*LoopThemaIndex*/, 4 /*int*/, 4, false) + && verifier.VerifyField(tablePos, 60 /*MaxDicePlus*/, 4 /*int*/, 4, false) && verifier.VerifyTableEnd(tablePos); } } diff --git a/SCHALE.Common/FlatData/MinigameTBGThemaExcel.cs b/SCHALE.Common/FlatData/MinigameTBGThemaExcel.cs index 67a9cab..5ef0ab9 100644 --- a/SCHALE.Common/FlatData/MinigameTBGThemaExcel.cs +++ b/SCHALE.Common/FlatData/MinigameTBGThemaExcel.cs @@ -78,6 +78,7 @@ public struct MinigameTBGThemaExcel : IFlatbufferObject #endif public byte[] GetThemaGoalLocalizeArray() { return __p.__vector_as_array(28); } public long InstantClearCostAmount { get { int o = __p.__offset(30); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } + public bool IsTutorial { get { int o = __p.__offset(32); return o != 0 ? 0!=__p.bb.Get(o + __p.bb_pos) : (bool)false; } } public static Offset CreateMinigameTBGThemaExcel(FlatBufferBuilder builder, long EventContentId = 0, @@ -93,8 +94,9 @@ public struct MinigameTBGThemaExcel : IFlatbufferObject StringOffset ThemaPlayerPrefabOffset = default(StringOffset), long ThemaLeaderId = 0, StringOffset ThemaGoalLocalizeOffset = default(StringOffset), - long InstantClearCostAmount = 0) { - builder.StartTable(14); + long InstantClearCostAmount = 0, + bool IsTutorial = false) { + builder.StartTable(15); MinigameTBGThemaExcel.AddInstantClearCostAmount(builder, InstantClearCostAmount); MinigameTBGThemaExcel.AddThemaLeaderId(builder, ThemaLeaderId); MinigameTBGThemaExcel.AddUniqueId(builder, UniqueId); @@ -109,10 +111,11 @@ public struct MinigameTBGThemaExcel : IFlatbufferObject MinigameTBGThemaExcel.AddThemaMap(builder, ThemaMapOffset); MinigameTBGThemaExcel.AddThemaType(builder, ThemaType); MinigameTBGThemaExcel.AddThemaIndex(builder, ThemaIndex); + MinigameTBGThemaExcel.AddIsTutorial(builder, IsTutorial); return MinigameTBGThemaExcel.EndMinigameTBGThemaExcel(builder); } - public static void StartMinigameTBGThemaExcel(FlatBufferBuilder builder) { builder.StartTable(14); } + public static void StartMinigameTBGThemaExcel(FlatBufferBuilder builder) { builder.StartTable(15); } public static void AddEventContentId(FlatBufferBuilder builder, long eventContentId) { builder.AddLong(0, eventContentId, 0); } public static void AddUniqueId(FlatBufferBuilder builder, long uniqueId) { builder.AddLong(1, uniqueId, 0); } public static void AddThemaIndex(FlatBufferBuilder builder, int themaIndex) { builder.AddInt(2, themaIndex, 0); } @@ -137,6 +140,7 @@ public struct MinigameTBGThemaExcel : IFlatbufferObject public static void AddThemaLeaderId(FlatBufferBuilder builder, long themaLeaderId) { builder.AddLong(11, themaLeaderId, 0); } public static void AddThemaGoalLocalize(FlatBufferBuilder builder, StringOffset themaGoalLocalizeOffset) { builder.AddOffset(12, themaGoalLocalizeOffset.Value, 0); } public static void AddInstantClearCostAmount(FlatBufferBuilder builder, long instantClearCostAmount) { builder.AddLong(13, instantClearCostAmount, 0); } + public static void AddIsTutorial(FlatBufferBuilder builder, bool isTutorial) { builder.AddBool(14, isTutorial, false); } public static Offset EndMinigameTBGThemaExcel(FlatBufferBuilder builder) { int o = builder.EndTable(); return new Offset(o); @@ -164,6 +168,7 @@ public struct MinigameTBGThemaExcel : IFlatbufferObject _o.ThemaLeaderId = TableEncryptionService.Convert(this.ThemaLeaderId, key); _o.ThemaGoalLocalize = TableEncryptionService.Convert(this.ThemaGoalLocalize, key); _o.InstantClearCostAmount = TableEncryptionService.Convert(this.InstantClearCostAmount, key); + _o.IsTutorial = TableEncryptionService.Convert(this.IsTutorial, key); } public static Offset Pack(FlatBufferBuilder builder, MinigameTBGThemaExcelT _o) { if (_o == null) return default(Offset); @@ -199,7 +204,8 @@ public struct MinigameTBGThemaExcel : IFlatbufferObject _ThemaPlayerPrefab, _o.ThemaLeaderId, _ThemaGoalLocalize, - _o.InstantClearCostAmount); + _o.InstantClearCostAmount, + _o.IsTutorial); } } @@ -219,6 +225,7 @@ public class MinigameTBGThemaExcelT public long ThemaLeaderId { get; set; } public string ThemaGoalLocalize { get; set; } public long InstantClearCostAmount { get; set; } + public bool IsTutorial { get; set; } public MinigameTBGThemaExcelT() { this.EventContentId = 0; @@ -235,6 +242,7 @@ public class MinigameTBGThemaExcelT this.ThemaLeaderId = 0; this.ThemaGoalLocalize = null; this.InstantClearCostAmount = 0; + this.IsTutorial = false; } } @@ -258,6 +266,7 @@ static public class MinigameTBGThemaExcelVerify && verifier.VerifyField(tablePos, 26 /*ThemaLeaderId*/, 8 /*long*/, 8, false) && verifier.VerifyString(tablePos, 28 /*ThemaGoalLocalize*/, false) && verifier.VerifyField(tablePos, 30 /*InstantClearCostAmount*/, 8 /*long*/, 8, false) + && verifier.VerifyField(tablePos, 32 /*IsTutorial*/, 1 /*bool*/, 1, false) && verifier.VerifyTableEnd(tablePos); } } diff --git a/SCHALE.Common/FlatData/MissionCompleteConditionType.cs b/SCHALE.Common/FlatData/MissionCompleteConditionType.cs index cbb96ea..866a592 100644 --- a/SCHALE.Common/FlatData/MissionCompleteConditionType.cs +++ b/SCHALE.Common/FlatData/MissionCompleteConditionType.cs @@ -172,6 +172,11 @@ public enum MissionCompleteConditionType : int Reset_DreamGetEndingCount = 162, Reset_DreamGetSpecificEndingCount = 163, Reset_DreamGetCollectionScenarioCount = 164, + Reset_ClearCountDefense = 165, + Reset_ClearSpecificDefenseStage = 166, + Reset_ClearCharacterLimitDefense = 167, + Reset_ClearTimeLimitDefenseFromSecond = 168, + Reset_JoinMultiFloorRaidCount = 169, }; diff --git a/SCHALE.Common/FlatData/MultiFloorRaidSeasonManageExcel.cs b/SCHALE.Common/FlatData/MultiFloorRaidSeasonManageExcel.cs index d208076..811b130 100644 --- a/SCHALE.Common/FlatData/MultiFloorRaidSeasonManageExcel.cs +++ b/SCHALE.Common/FlatData/MultiFloorRaidSeasonManageExcel.cs @@ -66,6 +66,13 @@ public struct MultiFloorRaidSeasonManageExcel : IFlatbufferObject public ArraySegment? GetLevelImgPathBytes() { return __p.__vector_as_arraysegment(22); } #endif public byte[] GetLevelImgPathArray() { return __p.__vector_as_array(22); } + public string PlayTip { get { int o = __p.__offset(24); return o != 0 ? __p.__string(o + __p.bb_pos) : null; } } +#if ENABLE_SPAN_T + public Span GetPlayTipBytes() { return __p.__vector_as_span(24, 1); } +#else + public ArraySegment? GetPlayTipBytes() { return __p.__vector_as_arraysegment(24); } +#endif + public byte[] GetPlayTipArray() { return __p.__vector_as_array(24); } public static Offset CreateMultiFloorRaidSeasonManageExcel(FlatBufferBuilder builder, long SeasonId = 0, @@ -77,9 +84,11 @@ public struct MultiFloorRaidSeasonManageExcel : IFlatbufferObject StringOffset OpenRaidBossGroupIdOffset = default(StringOffset), uint EnterScenarioKey = 0, StringOffset LobbyImgPathOffset = default(StringOffset), - StringOffset LevelImgPathOffset = default(StringOffset)) { - builder.StartTable(10); + StringOffset LevelImgPathOffset = default(StringOffset), + StringOffset PlayTipOffset = default(StringOffset)) { + builder.StartTable(11); MultiFloorRaidSeasonManageExcel.AddSeasonId(builder, SeasonId); + MultiFloorRaidSeasonManageExcel.AddPlayTip(builder, PlayTipOffset); MultiFloorRaidSeasonManageExcel.AddLevelImgPath(builder, LevelImgPathOffset); MultiFloorRaidSeasonManageExcel.AddLobbyImgPath(builder, LobbyImgPathOffset); MultiFloorRaidSeasonManageExcel.AddEnterScenarioKey(builder, EnterScenarioKey); @@ -92,7 +101,7 @@ public struct MultiFloorRaidSeasonManageExcel : IFlatbufferObject return MultiFloorRaidSeasonManageExcel.EndMultiFloorRaidSeasonManageExcel(builder); } - public static void StartMultiFloorRaidSeasonManageExcel(FlatBufferBuilder builder) { builder.StartTable(10); } + public static void StartMultiFloorRaidSeasonManageExcel(FlatBufferBuilder builder) { builder.StartTable(11); } public static void AddSeasonId(FlatBufferBuilder builder, long seasonId) { builder.AddLong(0, seasonId, 0); } public static void AddLobbyEnterScenario(FlatBufferBuilder builder, uint lobbyEnterScenario) { builder.AddUint(1, lobbyEnterScenario, 0); } public static void AddShowLobbyBanner(FlatBufferBuilder builder, bool showLobbyBanner) { builder.AddBool(2, showLobbyBanner, false); } @@ -103,6 +112,7 @@ public struct MultiFloorRaidSeasonManageExcel : IFlatbufferObject public static void AddEnterScenarioKey(FlatBufferBuilder builder, uint enterScenarioKey) { builder.AddUint(7, enterScenarioKey, 0); } public static void AddLobbyImgPath(FlatBufferBuilder builder, StringOffset lobbyImgPathOffset) { builder.AddOffset(8, lobbyImgPathOffset.Value, 0); } public static void AddLevelImgPath(FlatBufferBuilder builder, StringOffset levelImgPathOffset) { builder.AddOffset(9, levelImgPathOffset.Value, 0); } + public static void AddPlayTip(FlatBufferBuilder builder, StringOffset playTipOffset) { builder.AddOffset(10, playTipOffset.Value, 0); } public static Offset EndMultiFloorRaidSeasonManageExcel(FlatBufferBuilder builder) { int o = builder.EndTable(); return new Offset(o); @@ -124,6 +134,7 @@ public struct MultiFloorRaidSeasonManageExcel : IFlatbufferObject _o.EnterScenarioKey = TableEncryptionService.Convert(this.EnterScenarioKey, key); _o.LobbyImgPath = TableEncryptionService.Convert(this.LobbyImgPath, key); _o.LevelImgPath = TableEncryptionService.Convert(this.LevelImgPath, key); + _o.PlayTip = TableEncryptionService.Convert(this.PlayTip, key); } public static Offset Pack(FlatBufferBuilder builder, MultiFloorRaidSeasonManageExcelT _o) { if (_o == null) return default(Offset); @@ -133,6 +144,7 @@ public struct MultiFloorRaidSeasonManageExcel : IFlatbufferObject var _OpenRaidBossGroupId = _o.OpenRaidBossGroupId == null ? default(StringOffset) : builder.CreateString(_o.OpenRaidBossGroupId); var _LobbyImgPath = _o.LobbyImgPath == null ? default(StringOffset) : builder.CreateString(_o.LobbyImgPath); var _LevelImgPath = _o.LevelImgPath == null ? default(StringOffset) : builder.CreateString(_o.LevelImgPath); + var _PlayTip = _o.PlayTip == null ? default(StringOffset) : builder.CreateString(_o.PlayTip); return CreateMultiFloorRaidSeasonManageExcel( builder, _o.SeasonId, @@ -144,7 +156,8 @@ public struct MultiFloorRaidSeasonManageExcel : IFlatbufferObject _OpenRaidBossGroupId, _o.EnterScenarioKey, _LobbyImgPath, - _LevelImgPath); + _LevelImgPath, + _PlayTip); } } @@ -160,6 +173,7 @@ public class MultiFloorRaidSeasonManageExcelT public uint EnterScenarioKey { get; set; } public string LobbyImgPath { get; set; } public string LevelImgPath { get; set; } + public string PlayTip { get; set; } public MultiFloorRaidSeasonManageExcelT() { this.SeasonId = 0; @@ -172,6 +186,7 @@ public class MultiFloorRaidSeasonManageExcelT this.EnterScenarioKey = 0; this.LobbyImgPath = null; this.LevelImgPath = null; + this.PlayTip = null; } } @@ -191,6 +206,7 @@ static public class MultiFloorRaidSeasonManageExcelVerify && verifier.VerifyField(tablePos, 18 /*EnterScenarioKey*/, 4 /*uint*/, 4, false) && verifier.VerifyString(tablePos, 20 /*LobbyImgPath*/, false) && verifier.VerifyString(tablePos, 22 /*LevelImgPath*/, false) + && verifier.VerifyString(tablePos, 24 /*PlayTip*/, false) && verifier.VerifyTableEnd(tablePos); } } diff --git a/SCHALE.Common/FlatData/MultiFloorRaidStageExcel.cs b/SCHALE.Common/FlatData/MultiFloorRaidStageExcel.cs index 0b50187..ac8a005 100644 --- a/SCHALE.Common/FlatData/MultiFloorRaidStageExcel.cs +++ b/SCHALE.Common/FlatData/MultiFloorRaidStageExcel.cs @@ -21,7 +21,7 @@ public struct MultiFloorRaidStageExcel : IFlatbufferObject public MultiFloorRaidStageExcel __assign(int _i, ByteBuffer _bb) { __init(_i, _bb); return this; } public long Id { get { int o = __p.__offset(4); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } - public SCHALE.Common.FlatData.EchelonExtensionType EchelonExtensionType { get { int o = __p.__offset(6); return o != 0 ? (SCHALE.Common.FlatData.EchelonExtensionType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.EchelonExtensionType.Base; } } + public SCHALE.Common.FlatData.EchelonExtensionType EchelonExtensionType_ { get { int o = __p.__offset(6); return o != 0 ? (SCHALE.Common.FlatData.EchelonExtensionType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.EchelonExtensionType.Base; } } public string BossGroupId { get { int o = __p.__offset(8); return o != 0 ? __p.__string(o + __p.bb_pos) : null; } } #if ENABLE_SPAN_T public Span GetBossGroupIdBytes() { return __p.__vector_as_span(8, 1); } @@ -101,7 +101,7 @@ public struct MultiFloorRaidStageExcel : IFlatbufferObject public static Offset CreateMultiFloorRaidStageExcel(FlatBufferBuilder builder, long Id = 0, - SCHALE.Common.FlatData.EchelonExtensionType EchelonExtensionType = SCHALE.Common.FlatData.EchelonExtensionType.Base, + SCHALE.Common.FlatData.EchelonExtensionType EchelonExtensionType_ = SCHALE.Common.FlatData.EchelonExtensionType.Base, StringOffset BossGroupIdOffset = default(StringOffset), int AssistSlot = 0, long StageOpenCondition = 0, @@ -146,7 +146,7 @@ public struct MultiFloorRaidStageExcel : IFlatbufferObject MultiFloorRaidStageExcel.AddFloorListSectionLabel(builder, FloorListSectionLabel); MultiFloorRaidStageExcel.AddAssistSlot(builder, AssistSlot); MultiFloorRaidStageExcel.AddBossGroupId(builder, BossGroupIdOffset); - MultiFloorRaidStageExcel.AddEchelonExtensionType(builder, EchelonExtensionType); + MultiFloorRaidStageExcel.AddEchelonExtensionType_(builder, EchelonExtensionType_); MultiFloorRaidStageExcel.AddShowSkillCard(builder, ShowSkillCard); MultiFloorRaidStageExcel.AddUseBossAIPhaseSync(builder, UseBossAIPhaseSync); MultiFloorRaidStageExcel.AddUseBossIndex(builder, UseBossIndex); @@ -156,7 +156,7 @@ public struct MultiFloorRaidStageExcel : IFlatbufferObject public static void StartMultiFloorRaidStageExcel(FlatBufferBuilder builder) { builder.StartTable(25); } public static void AddId(FlatBufferBuilder builder, long id) { builder.AddLong(0, id, 0); } - public static void AddEchelonExtensionType(FlatBufferBuilder builder, SCHALE.Common.FlatData.EchelonExtensionType echelonExtensionType) { builder.AddInt(1, (int)echelonExtensionType, 0); } + public static void AddEchelonExtensionType_(FlatBufferBuilder builder, SCHALE.Common.FlatData.EchelonExtensionType echelonExtensionType_) { builder.AddInt(1, (int)echelonExtensionType_, 0); } public static void AddBossGroupId(FlatBufferBuilder builder, StringOffset bossGroupIdOffset) { builder.AddOffset(2, bossGroupIdOffset.Value, 0); } public static void AddAssistSlot(FlatBufferBuilder builder, int assistSlot) { builder.AddInt(3, assistSlot, 0); } public static void AddStageOpenCondition(FlatBufferBuilder builder, long stageOpenCondition) { builder.AddLong(4, stageOpenCondition, 0); } @@ -217,7 +217,7 @@ public struct MultiFloorRaidStageExcel : IFlatbufferObject public void UnPackTo(MultiFloorRaidStageExcelT _o) { byte[] key = TableEncryptionService.CreateKey("MultiFloorRaidStage"); _o.Id = TableEncryptionService.Convert(this.Id, key); - _o.EchelonExtensionType = TableEncryptionService.Convert(this.EchelonExtensionType, key); + _o.EchelonExtensionType_ = TableEncryptionService.Convert(this.EchelonExtensionType_, key); _o.BossGroupId = TableEncryptionService.Convert(this.BossGroupId, key); _o.AssistSlot = TableEncryptionService.Convert(this.AssistSlot, key); _o.StageOpenCondition = TableEncryptionService.Convert(this.StageOpenCondition, key); @@ -282,7 +282,7 @@ public struct MultiFloorRaidStageExcel : IFlatbufferObject return CreateMultiFloorRaidStageExcel( builder, _o.Id, - _o.EchelonExtensionType, + _o.EchelonExtensionType_, _BossGroupId, _o.AssistSlot, _o.StageOpenCondition, @@ -312,7 +312,7 @@ public struct MultiFloorRaidStageExcel : IFlatbufferObject public class MultiFloorRaidStageExcelT { public long Id { get; set; } - public SCHALE.Common.FlatData.EchelonExtensionType EchelonExtensionType { get; set; } + public SCHALE.Common.FlatData.EchelonExtensionType EchelonExtensionType_ { get; set; } public string BossGroupId { get; set; } public int AssistSlot { get; set; } public long StageOpenCondition { get; set; } @@ -339,7 +339,7 @@ public class MultiFloorRaidStageExcelT public MultiFloorRaidStageExcelT() { this.Id = 0; - this.EchelonExtensionType = SCHALE.Common.FlatData.EchelonExtensionType.Base; + this.EchelonExtensionType_ = SCHALE.Common.FlatData.EchelonExtensionType.Base; this.BossGroupId = null; this.AssistSlot = 0; this.StageOpenCondition = 0; @@ -373,7 +373,7 @@ static public class MultiFloorRaidStageExcelVerify { return verifier.VerifyTableStart(tablePos) && verifier.VerifyField(tablePos, 4 /*Id*/, 8 /*long*/, 8, false) - && verifier.VerifyField(tablePos, 6 /*EchelonExtensionType*/, 4 /*SCHALE.Common.FlatData.EchelonExtensionType*/, 4, false) + && verifier.VerifyField(tablePos, 6 /*EchelonExtensionType_*/, 4 /*SCHALE.Common.FlatData.EchelonExtensionType*/, 4, false) && verifier.VerifyString(tablePos, 8 /*BossGroupId*/, false) && verifier.VerifyField(tablePos, 10 /*AssistSlot*/, 4 /*int*/, 4, false) && verifier.VerifyField(tablePos, 12 /*StageOpenCondition*/, 8 /*long*/, 8, false) diff --git a/SCHALE.Common/FlatData/ObstacleStatExcel.cs b/SCHALE.Common/FlatData/ObstacleStatExcel.cs index 62278bf..4da827d 100644 --- a/SCHALE.Common/FlatData/ObstacleStatExcel.cs +++ b/SCHALE.Common/FlatData/ObstacleStatExcel.cs @@ -34,6 +34,13 @@ public struct ObstacleStatExcel : IFlatbufferObject public long Dodge { get { int o = __p.__offset(14); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public long CanNotStandRange { get { int o = __p.__offset(16); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public float HighlightFloaterHeight { get { int o = __p.__offset(18); return o != 0 ? __p.bb.GetFloat(o + __p.bb_pos) : (float)0.0f; } } + public long EnhanceLightArmorRate { get { int o = __p.__offset(20); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } + public long EnhanceHeavyArmorRate { get { int o = __p.__offset(22); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } + public long EnhanceUnarmedRate { get { int o = __p.__offset(24); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } + public long EnhanceElasticArmorRate { get { int o = __p.__offset(26); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } + public long EnhanceStructureRate { get { int o = __p.__offset(28); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } + public long EnhanceNormalArmorRate { get { int o = __p.__offset(30); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } + public long ReduceExDamagedRate { get { int o = __p.__offset(32); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public static Offset CreateObstacleStatExcel(FlatBufferBuilder builder, uint StringID = 0, @@ -43,8 +50,22 @@ public struct ObstacleStatExcel : IFlatbufferObject long BlockRate = 0, long Dodge = 0, long CanNotStandRange = 0, - float HighlightFloaterHeight = 0.0f) { - builder.StartTable(8); + float HighlightFloaterHeight = 0.0f, + long EnhanceLightArmorRate = 0, + long EnhanceHeavyArmorRate = 0, + long EnhanceUnarmedRate = 0, + long EnhanceElasticArmorRate = 0, + long EnhanceStructureRate = 0, + long EnhanceNormalArmorRate = 0, + long ReduceExDamagedRate = 0) { + builder.StartTable(15); + ObstacleStatExcel.AddReduceExDamagedRate(builder, ReduceExDamagedRate); + ObstacleStatExcel.AddEnhanceNormalArmorRate(builder, EnhanceNormalArmorRate); + ObstacleStatExcel.AddEnhanceStructureRate(builder, EnhanceStructureRate); + ObstacleStatExcel.AddEnhanceElasticArmorRate(builder, EnhanceElasticArmorRate); + ObstacleStatExcel.AddEnhanceUnarmedRate(builder, EnhanceUnarmedRate); + ObstacleStatExcel.AddEnhanceHeavyArmorRate(builder, EnhanceHeavyArmorRate); + ObstacleStatExcel.AddEnhanceLightArmorRate(builder, EnhanceLightArmorRate); ObstacleStatExcel.AddCanNotStandRange(builder, CanNotStandRange); ObstacleStatExcel.AddDodge(builder, Dodge); ObstacleStatExcel.AddBlockRate(builder, BlockRate); @@ -56,7 +77,7 @@ public struct ObstacleStatExcel : IFlatbufferObject return ObstacleStatExcel.EndObstacleStatExcel(builder); } - public static void StartObstacleStatExcel(FlatBufferBuilder builder) { builder.StartTable(8); } + public static void StartObstacleStatExcel(FlatBufferBuilder builder) { builder.StartTable(15); } public static void AddStringID(FlatBufferBuilder builder, uint stringID) { builder.AddUint(0, stringID, 0); } public static void AddName(FlatBufferBuilder builder, StringOffset nameOffset) { builder.AddOffset(1, nameOffset.Value, 0); } public static void AddMaxHP1(FlatBufferBuilder builder, long maxHP1) { builder.AddLong(2, maxHP1, 0); } @@ -65,6 +86,13 @@ public struct ObstacleStatExcel : IFlatbufferObject public static void AddDodge(FlatBufferBuilder builder, long dodge) { builder.AddLong(5, dodge, 0); } public static void AddCanNotStandRange(FlatBufferBuilder builder, long canNotStandRange) { builder.AddLong(6, canNotStandRange, 0); } public static void AddHighlightFloaterHeight(FlatBufferBuilder builder, float highlightFloaterHeight) { builder.AddFloat(7, highlightFloaterHeight, 0.0f); } + public static void AddEnhanceLightArmorRate(FlatBufferBuilder builder, long enhanceLightArmorRate) { builder.AddLong(8, enhanceLightArmorRate, 0); } + public static void AddEnhanceHeavyArmorRate(FlatBufferBuilder builder, long enhanceHeavyArmorRate) { builder.AddLong(9, enhanceHeavyArmorRate, 0); } + public static void AddEnhanceUnarmedRate(FlatBufferBuilder builder, long enhanceUnarmedRate) { builder.AddLong(10, enhanceUnarmedRate, 0); } + public static void AddEnhanceElasticArmorRate(FlatBufferBuilder builder, long enhanceElasticArmorRate) { builder.AddLong(11, enhanceElasticArmorRate, 0); } + public static void AddEnhanceStructureRate(FlatBufferBuilder builder, long enhanceStructureRate) { builder.AddLong(12, enhanceStructureRate, 0); } + public static void AddEnhanceNormalArmorRate(FlatBufferBuilder builder, long enhanceNormalArmorRate) { builder.AddLong(13, enhanceNormalArmorRate, 0); } + public static void AddReduceExDamagedRate(FlatBufferBuilder builder, long reduceExDamagedRate) { builder.AddLong(14, reduceExDamagedRate, 0); } public static Offset EndObstacleStatExcel(FlatBufferBuilder builder) { int o = builder.EndTable(); return new Offset(o); @@ -84,6 +112,13 @@ public struct ObstacleStatExcel : IFlatbufferObject _o.Dodge = TableEncryptionService.Convert(this.Dodge, key); _o.CanNotStandRange = TableEncryptionService.Convert(this.CanNotStandRange, key); _o.HighlightFloaterHeight = TableEncryptionService.Convert(this.HighlightFloaterHeight, key); + _o.EnhanceLightArmorRate = TableEncryptionService.Convert(this.EnhanceLightArmorRate, key); + _o.EnhanceHeavyArmorRate = TableEncryptionService.Convert(this.EnhanceHeavyArmorRate, key); + _o.EnhanceUnarmedRate = TableEncryptionService.Convert(this.EnhanceUnarmedRate, key); + _o.EnhanceElasticArmorRate = TableEncryptionService.Convert(this.EnhanceElasticArmorRate, key); + _o.EnhanceStructureRate = TableEncryptionService.Convert(this.EnhanceStructureRate, key); + _o.EnhanceNormalArmorRate = TableEncryptionService.Convert(this.EnhanceNormalArmorRate, key); + _o.ReduceExDamagedRate = TableEncryptionService.Convert(this.ReduceExDamagedRate, key); } public static Offset Pack(FlatBufferBuilder builder, ObstacleStatExcelT _o) { if (_o == null) return default(Offset); @@ -97,7 +132,14 @@ public struct ObstacleStatExcel : IFlatbufferObject _o.BlockRate, _o.Dodge, _o.CanNotStandRange, - _o.HighlightFloaterHeight); + _o.HighlightFloaterHeight, + _o.EnhanceLightArmorRate, + _o.EnhanceHeavyArmorRate, + _o.EnhanceUnarmedRate, + _o.EnhanceElasticArmorRate, + _o.EnhanceStructureRate, + _o.EnhanceNormalArmorRate, + _o.ReduceExDamagedRate); } } @@ -111,6 +153,13 @@ public class ObstacleStatExcelT public long Dodge { get; set; } public long CanNotStandRange { get; set; } public float HighlightFloaterHeight { get; set; } + public long EnhanceLightArmorRate { get; set; } + public long EnhanceHeavyArmorRate { get; set; } + public long EnhanceUnarmedRate { get; set; } + public long EnhanceElasticArmorRate { get; set; } + public long EnhanceStructureRate { get; set; } + public long EnhanceNormalArmorRate { get; set; } + public long ReduceExDamagedRate { get; set; } public ObstacleStatExcelT() { this.StringID = 0; @@ -121,6 +170,13 @@ public class ObstacleStatExcelT this.Dodge = 0; this.CanNotStandRange = 0; this.HighlightFloaterHeight = 0.0f; + this.EnhanceLightArmorRate = 0; + this.EnhanceHeavyArmorRate = 0; + this.EnhanceUnarmedRate = 0; + this.EnhanceElasticArmorRate = 0; + this.EnhanceStructureRate = 0; + this.EnhanceNormalArmorRate = 0; + this.ReduceExDamagedRate = 0; } } @@ -138,6 +194,13 @@ static public class ObstacleStatExcelVerify && verifier.VerifyField(tablePos, 14 /*Dodge*/, 8 /*long*/, 8, false) && verifier.VerifyField(tablePos, 16 /*CanNotStandRange*/, 8 /*long*/, 8, false) && verifier.VerifyField(tablePos, 18 /*HighlightFloaterHeight*/, 4 /*float*/, 4, false) + && verifier.VerifyField(tablePos, 20 /*EnhanceLightArmorRate*/, 8 /*long*/, 8, false) + && verifier.VerifyField(tablePos, 22 /*EnhanceHeavyArmorRate*/, 8 /*long*/, 8, false) + && verifier.VerifyField(tablePos, 24 /*EnhanceUnarmedRate*/, 8 /*long*/, 8, false) + && verifier.VerifyField(tablePos, 26 /*EnhanceElasticArmorRate*/, 8 /*long*/, 8, false) + && verifier.VerifyField(tablePos, 28 /*EnhanceStructureRate*/, 8 /*long*/, 8, false) + && verifier.VerifyField(tablePos, 30 /*EnhanceNormalArmorRate*/, 8 /*long*/, 8, false) + && verifier.VerifyField(tablePos, 32 /*ReduceExDamagedRate*/, 8 /*long*/, 8, false) && verifier.VerifyTableEnd(tablePos); } } diff --git a/SCHALE.Common/FlatData/OpenConditionContent.cs b/SCHALE.Common/FlatData/OpenConditionContent.cs index 494e3bf..1be7fef 100644 --- a/SCHALE.Common/FlatData/OpenConditionContent.cs +++ b/SCHALE.Common/FlatData/OpenConditionContent.cs @@ -63,6 +63,7 @@ public enum OpenConditionContent : int MultiFloorRaid = 53, StrategySkip = 54, MinigameDreamMaker = 55, + MiniGameDefense = 56, }; diff --git a/SCHALE.Common/FlatData/OpenConditionExcel.cs b/SCHALE.Common/FlatData/OpenConditionExcel.cs index bb23215..d0b23d0 100644 --- a/SCHALE.Common/FlatData/OpenConditionExcel.cs +++ b/SCHALE.Common/FlatData/OpenConditionExcel.cs @@ -38,7 +38,7 @@ public struct OpenConditionExcel : IFlatbufferObject public long AccountLevel { get { int o = __p.__offset(18); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public long ScenarioModeId { get { int o = __p.__offset(20); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public long CampaignStageId { get { int o = __p.__offset(22); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } - public SCHALE.Common.FlatData.MultipleConditionCheckType MultipleConditionCheckType { get { int o = __p.__offset(24); return o != 0 ? (SCHALE.Common.FlatData.MultipleConditionCheckType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.MultipleConditionCheckType.And; } } + public SCHALE.Common.FlatData.MultipleConditionCheckType MultipleConditionCheckType_ { get { int o = __p.__offset(24); return o != 0 ? (SCHALE.Common.FlatData.MultipleConditionCheckType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.MultipleConditionCheckType.And; } } public SCHALE.Common.FlatData.WeekDay OpenDayOfWeek { get { int o = __p.__offset(26); return o != 0 ? (SCHALE.Common.FlatData.WeekDay)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.WeekDay.Sunday; } } public long OpenHour { get { int o = __p.__offset(28); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public SCHALE.Common.FlatData.WeekDay CloseDayOfWeek { get { int o = __p.__offset(30); return o != 0 ? (SCHALE.Common.FlatData.WeekDay)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.WeekDay.Sunday; } } @@ -66,7 +66,7 @@ public struct OpenConditionExcel : IFlatbufferObject long AccountLevel = 0, long ScenarioModeId = 0, long CampaignStageId = 0, - SCHALE.Common.FlatData.MultipleConditionCheckType MultipleConditionCheckType = SCHALE.Common.FlatData.MultipleConditionCheckType.And, + SCHALE.Common.FlatData.MultipleConditionCheckType MultipleConditionCheckType_ = SCHALE.Common.FlatData.MultipleConditionCheckType.And, SCHALE.Common.FlatData.WeekDay OpenDayOfWeek = SCHALE.Common.FlatData.WeekDay.Sunday, long OpenHour = 0, SCHALE.Common.FlatData.WeekDay CloseDayOfWeek = SCHALE.Common.FlatData.WeekDay.Sunday, @@ -89,7 +89,7 @@ public struct OpenConditionExcel : IFlatbufferObject OpenConditionExcel.AddContentsOpenShortcutUI(builder, ContentsOpenShortcutUIOffset); OpenConditionExcel.AddCloseDayOfWeek(builder, CloseDayOfWeek); OpenConditionExcel.AddOpenDayOfWeek(builder, OpenDayOfWeek); - OpenConditionExcel.AddMultipleConditionCheckType(builder, MultipleConditionCheckType); + OpenConditionExcel.AddMultipleConditionCheckType_(builder, MultipleConditionCheckType_); OpenConditionExcel.AddScene(builder, SceneOffset); OpenConditionExcel.AddShortcutParam(builder, ShortcutParam); OpenConditionExcel.AddShortcutUIName(builder, ShortcutUINameOffset); @@ -121,7 +121,7 @@ public struct OpenConditionExcel : IFlatbufferObject public static void AddAccountLevel(FlatBufferBuilder builder, long accountLevel) { builder.AddLong(7, accountLevel, 0); } public static void AddScenarioModeId(FlatBufferBuilder builder, long scenarioModeId) { builder.AddLong(8, scenarioModeId, 0); } public static void AddCampaignStageId(FlatBufferBuilder builder, long campaignStageId) { builder.AddLong(9, campaignStageId, 0); } - public static void AddMultipleConditionCheckType(FlatBufferBuilder builder, SCHALE.Common.FlatData.MultipleConditionCheckType multipleConditionCheckType) { builder.AddInt(10, (int)multipleConditionCheckType, 0); } + public static void AddMultipleConditionCheckType_(FlatBufferBuilder builder, SCHALE.Common.FlatData.MultipleConditionCheckType multipleConditionCheckType_) { builder.AddInt(10, (int)multipleConditionCheckType_, 0); } public static void AddOpenDayOfWeek(FlatBufferBuilder builder, SCHALE.Common.FlatData.WeekDay openDayOfWeek) { builder.AddInt(11, (int)openDayOfWeek, 0); } public static void AddOpenHour(FlatBufferBuilder builder, long openHour) { builder.AddLong(12, openHour, 0); } public static void AddCloseDayOfWeek(FlatBufferBuilder builder, SCHALE.Common.FlatData.WeekDay closeDayOfWeek) { builder.AddInt(13, (int)closeDayOfWeek, 0); } @@ -154,7 +154,7 @@ public struct OpenConditionExcel : IFlatbufferObject _o.AccountLevel = TableEncryptionService.Convert(this.AccountLevel, key); _o.ScenarioModeId = TableEncryptionService.Convert(this.ScenarioModeId, key); _o.CampaignStageId = TableEncryptionService.Convert(this.CampaignStageId, key); - _o.MultipleConditionCheckType = TableEncryptionService.Convert(this.MultipleConditionCheckType, key); + _o.MultipleConditionCheckType_ = TableEncryptionService.Convert(this.MultipleConditionCheckType_, key); _o.OpenDayOfWeek = TableEncryptionService.Convert(this.OpenDayOfWeek, key); _o.OpenHour = TableEncryptionService.Convert(this.OpenHour, key); _o.CloseDayOfWeek = TableEncryptionService.Convert(this.CloseDayOfWeek, key); @@ -193,7 +193,7 @@ public struct OpenConditionExcel : IFlatbufferObject _o.AccountLevel, _o.ScenarioModeId, _o.CampaignStageId, - _o.MultipleConditionCheckType, + _o.MultipleConditionCheckType_, _o.OpenDayOfWeek, _o.OpenHour, _o.CloseDayOfWeek, @@ -218,7 +218,7 @@ public class OpenConditionExcelT public long AccountLevel { get; set; } public long ScenarioModeId { get; set; } public long CampaignStageId { get; set; } - public SCHALE.Common.FlatData.MultipleConditionCheckType MultipleConditionCheckType { get; set; } + public SCHALE.Common.FlatData.MultipleConditionCheckType MultipleConditionCheckType_ { get; set; } public SCHALE.Common.FlatData.WeekDay OpenDayOfWeek { get; set; } public long OpenHour { get; set; } public SCHALE.Common.FlatData.WeekDay CloseDayOfWeek { get; set; } @@ -240,7 +240,7 @@ public class OpenConditionExcelT this.AccountLevel = 0; this.ScenarioModeId = 0; this.CampaignStageId = 0; - this.MultipleConditionCheckType = SCHALE.Common.FlatData.MultipleConditionCheckType.And; + this.MultipleConditionCheckType_ = SCHALE.Common.FlatData.MultipleConditionCheckType.And; this.OpenDayOfWeek = SCHALE.Common.FlatData.WeekDay.Sunday; this.OpenHour = 0; this.CloseDayOfWeek = SCHALE.Common.FlatData.WeekDay.Sunday; @@ -269,7 +269,7 @@ static public class OpenConditionExcelVerify && verifier.VerifyField(tablePos, 18 /*AccountLevel*/, 8 /*long*/, 8, false) && verifier.VerifyField(tablePos, 20 /*ScenarioModeId*/, 8 /*long*/, 8, false) && verifier.VerifyField(tablePos, 22 /*CampaignStageId*/, 8 /*long*/, 8, false) - && verifier.VerifyField(tablePos, 24 /*MultipleConditionCheckType*/, 4 /*SCHALE.Common.FlatData.MultipleConditionCheckType*/, 4, false) + && verifier.VerifyField(tablePos, 24 /*MultipleConditionCheckType_*/, 4 /*SCHALE.Common.FlatData.MultipleConditionCheckType*/, 4, false) && verifier.VerifyField(tablePos, 26 /*OpenDayOfWeek*/, 4 /*SCHALE.Common.FlatData.WeekDay*/, 4, false) && verifier.VerifyField(tablePos, 28 /*OpenHour*/, 8 /*long*/, 8, false) && verifier.VerifyField(tablePos, 30 /*CloseDayOfWeek*/, 4 /*SCHALE.Common.FlatData.WeekDay*/, 4, false) diff --git a/SCHALE.Common/FlatData/OperatorExcel.cs b/SCHALE.Common/FlatData/OperatorExcel.cs index 8d954d0..9425a37 100644 --- a/SCHALE.Common/FlatData/OperatorExcel.cs +++ b/SCHALE.Common/FlatData/OperatorExcel.cs @@ -28,7 +28,7 @@ public struct OperatorExcel : IFlatbufferObject public ArraySegment? GetGroupIdBytes() { return __p.__vector_as_arraysegment(6); } #endif public byte[] GetGroupIdArray() { return __p.__vector_as_array(6); } - public SCHALE.Common.FlatData.OperatorCondition OperatorCondition { get { int o = __p.__offset(8); return o != 0 ? (SCHALE.Common.FlatData.OperatorCondition)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.OperatorCondition.None; } } + public SCHALE.Common.FlatData.OperatorCondition OperatorCondition_ { get { int o = __p.__offset(8); return o != 0 ? (SCHALE.Common.FlatData.OperatorCondition)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.OperatorCondition.None; } } public int OutputSequence { get { int o = __p.__offset(10); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } public int RandomWeight { get { int o = __p.__offset(12); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } public int OutputDelay { get { int o = __p.__offset(14); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } @@ -61,7 +61,7 @@ public struct OperatorExcel : IFlatbufferObject public static Offset CreateOperatorExcel(FlatBufferBuilder builder, long UniqueId = 0, StringOffset GroupIdOffset = default(StringOffset), - SCHALE.Common.FlatData.OperatorCondition OperatorCondition = SCHALE.Common.FlatData.OperatorCondition.None, + SCHALE.Common.FlatData.OperatorCondition OperatorCondition_ = SCHALE.Common.FlatData.OperatorCondition.None, int OutputSequence = 0, int RandomWeight = 0, int OutputDelay = 0, @@ -81,7 +81,7 @@ public struct OperatorExcel : IFlatbufferObject OperatorExcel.AddOutputDelay(builder, OutputDelay); OperatorExcel.AddRandomWeight(builder, RandomWeight); OperatorExcel.AddOutputSequence(builder, OutputSequence); - OperatorExcel.AddOperatorCondition(builder, OperatorCondition); + OperatorExcel.AddOperatorCondition_(builder, OperatorCondition_); OperatorExcel.AddGroupId(builder, GroupIdOffset); OperatorExcel.AddOperatorWaitQueue(builder, OperatorWaitQueue); return OperatorExcel.EndOperatorExcel(builder); @@ -90,7 +90,7 @@ public struct OperatorExcel : IFlatbufferObject public static void StartOperatorExcel(FlatBufferBuilder builder) { builder.StartTable(12); } public static void AddUniqueId(FlatBufferBuilder builder, long uniqueId) { builder.AddLong(0, uniqueId, 0); } public static void AddGroupId(FlatBufferBuilder builder, StringOffset groupIdOffset) { builder.AddOffset(1, groupIdOffset.Value, 0); } - public static void AddOperatorCondition(FlatBufferBuilder builder, SCHALE.Common.FlatData.OperatorCondition operatorCondition) { builder.AddInt(2, (int)operatorCondition, 0); } + public static void AddOperatorCondition_(FlatBufferBuilder builder, SCHALE.Common.FlatData.OperatorCondition operatorCondition_) { builder.AddInt(2, (int)operatorCondition_, 0); } public static void AddOutputSequence(FlatBufferBuilder builder, int outputSequence) { builder.AddInt(3, outputSequence, 0); } public static void AddRandomWeight(FlatBufferBuilder builder, int randomWeight) { builder.AddInt(4, randomWeight, 0); } public static void AddOutputDelay(FlatBufferBuilder builder, int outputDelay) { builder.AddInt(5, outputDelay, 0); } @@ -118,7 +118,7 @@ public struct OperatorExcel : IFlatbufferObject byte[] key = TableEncryptionService.CreateKey("Operator"); _o.UniqueId = TableEncryptionService.Convert(this.UniqueId, key); _o.GroupId = TableEncryptionService.Convert(this.GroupId, key); - _o.OperatorCondition = TableEncryptionService.Convert(this.OperatorCondition, key); + _o.OperatorCondition_ = TableEncryptionService.Convert(this.OperatorCondition_, key); _o.OutputSequence = TableEncryptionService.Convert(this.OutputSequence, key); _o.RandomWeight = TableEncryptionService.Convert(this.RandomWeight, key); _o.OutputDelay = TableEncryptionService.Convert(this.OutputDelay, key); @@ -144,7 +144,7 @@ public struct OperatorExcel : IFlatbufferObject builder, _o.UniqueId, _GroupId, - _o.OperatorCondition, + _o.OperatorCondition_, _o.OutputSequence, _o.RandomWeight, _o.OutputDelay, @@ -161,7 +161,7 @@ public class OperatorExcelT { public long UniqueId { get; set; } public string GroupId { get; set; } - public SCHALE.Common.FlatData.OperatorCondition OperatorCondition { get; set; } + public SCHALE.Common.FlatData.OperatorCondition OperatorCondition_ { get; set; } public int OutputSequence { get; set; } public int RandomWeight { get; set; } public int OutputDelay { get; set; } @@ -175,7 +175,7 @@ public class OperatorExcelT public OperatorExcelT() { this.UniqueId = 0; this.GroupId = null; - this.OperatorCondition = SCHALE.Common.FlatData.OperatorCondition.None; + this.OperatorCondition_ = SCHALE.Common.FlatData.OperatorCondition.None; this.OutputSequence = 0; this.RandomWeight = 0; this.OutputDelay = 0; @@ -196,7 +196,7 @@ static public class OperatorExcelVerify return verifier.VerifyTableStart(tablePos) && verifier.VerifyField(tablePos, 4 /*UniqueId*/, 8 /*long*/, 8, false) && verifier.VerifyString(tablePos, 6 /*GroupId*/, false) - && verifier.VerifyField(tablePos, 8 /*OperatorCondition*/, 4 /*SCHALE.Common.FlatData.OperatorCondition*/, 4, false) + && verifier.VerifyField(tablePos, 8 /*OperatorCondition_*/, 4 /*SCHALE.Common.FlatData.OperatorCondition*/, 4, false) && verifier.VerifyField(tablePos, 10 /*OutputSequence*/, 4 /*int*/, 4, false) && verifier.VerifyField(tablePos, 12 /*RandomWeight*/, 4 /*int*/, 4, false) && verifier.VerifyField(tablePos, 14 /*OutputDelay*/, 4 /*int*/, 4, false) diff --git a/SCHALE.Common/FlatData/ParcelChangeReason.cs b/SCHALE.Common/FlatData/ParcelChangeReason.cs index bfd157d..e4a88b9 100644 --- a/SCHALE.Common/FlatData/ParcelChangeReason.cs +++ b/SCHALE.Common/FlatData/ParcelChangeReason.cs @@ -183,6 +183,13 @@ public enum ParcelChangeReason : int MiniGame_DreamSchedule = 173, MiniGame_DreamDailyClosing = 174, MiniGame_DreamEnding = 175, + Item_ExpireChange = 176, + MiniGame_DefenseBattleResult = 177, + Raid_FailCompensateReward = 178, + EliminateRaid_FailCompensateReward = 179, + Currency_ExpireChange = 180, + Conquest_ErosionBattleResult = 181, + Conquest_EnterErosionBattle = 182, }; diff --git a/SCHALE.Common/FlatData/PickupDuplicateBonusExcel.cs b/SCHALE.Common/FlatData/PickupDuplicateBonusExcel.cs index 3ff9ff3..24f0686 100644 --- a/SCHALE.Common/FlatData/PickupDuplicateBonusExcel.cs +++ b/SCHALE.Common/FlatData/PickupDuplicateBonusExcel.cs @@ -21,7 +21,7 @@ public struct PickupDuplicateBonusExcel : IFlatbufferObject public PickupDuplicateBonusExcel __assign(int _i, ByteBuffer _bb) { __init(_i, _bb); return this; } public long Id { get { int o = __p.__offset(4); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } - public SCHALE.Common.FlatData.ShopCategoryType ShopCategoryType { get { int o = __p.__offset(6); return o != 0 ? (SCHALE.Common.FlatData.ShopCategoryType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.ShopCategoryType.General; } } + public SCHALE.Common.FlatData.ShopCategoryType ShopCategoryType_ { get { int o = __p.__offset(6); return o != 0 ? (SCHALE.Common.FlatData.ShopCategoryType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.ShopCategoryType.General; } } public long ShopId { get { int o = __p.__offset(8); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public long PickupCharacterId { get { int o = __p.__offset(10); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public SCHALE.Common.FlatData.ParcelType RewardParcelType { get { int o = __p.__offset(12); return o != 0 ? (SCHALE.Common.FlatData.ParcelType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.ParcelType.None; } } @@ -30,7 +30,7 @@ public struct PickupDuplicateBonusExcel : IFlatbufferObject public static Offset CreatePickupDuplicateBonusExcel(FlatBufferBuilder builder, long Id = 0, - SCHALE.Common.FlatData.ShopCategoryType ShopCategoryType = SCHALE.Common.FlatData.ShopCategoryType.General, + SCHALE.Common.FlatData.ShopCategoryType ShopCategoryType_ = SCHALE.Common.FlatData.ShopCategoryType.General, long ShopId = 0, long PickupCharacterId = 0, SCHALE.Common.FlatData.ParcelType RewardParcelType = SCHALE.Common.FlatData.ParcelType.None, @@ -43,13 +43,13 @@ public struct PickupDuplicateBonusExcel : IFlatbufferObject PickupDuplicateBonusExcel.AddShopId(builder, ShopId); PickupDuplicateBonusExcel.AddId(builder, Id); PickupDuplicateBonusExcel.AddRewardParcelType(builder, RewardParcelType); - PickupDuplicateBonusExcel.AddShopCategoryType(builder, ShopCategoryType); + PickupDuplicateBonusExcel.AddShopCategoryType_(builder, ShopCategoryType_); return PickupDuplicateBonusExcel.EndPickupDuplicateBonusExcel(builder); } public static void StartPickupDuplicateBonusExcel(FlatBufferBuilder builder) { builder.StartTable(7); } public static void AddId(FlatBufferBuilder builder, long id) { builder.AddLong(0, id, 0); } - public static void AddShopCategoryType(FlatBufferBuilder builder, SCHALE.Common.FlatData.ShopCategoryType shopCategoryType) { builder.AddInt(1, (int)shopCategoryType, 0); } + public static void AddShopCategoryType_(FlatBufferBuilder builder, SCHALE.Common.FlatData.ShopCategoryType shopCategoryType_) { builder.AddInt(1, (int)shopCategoryType_, 0); } public static void AddShopId(FlatBufferBuilder builder, long shopId) { builder.AddLong(2, shopId, 0); } public static void AddPickupCharacterId(FlatBufferBuilder builder, long pickupCharacterId) { builder.AddLong(3, pickupCharacterId, 0); } public static void AddRewardParcelType(FlatBufferBuilder builder, SCHALE.Common.FlatData.ParcelType rewardParcelType) { builder.AddInt(4, (int)rewardParcelType, 0); } @@ -67,7 +67,7 @@ public struct PickupDuplicateBonusExcel : IFlatbufferObject public void UnPackTo(PickupDuplicateBonusExcelT _o) { byte[] key = TableEncryptionService.CreateKey("PickupDuplicateBonus"); _o.Id = TableEncryptionService.Convert(this.Id, key); - _o.ShopCategoryType = TableEncryptionService.Convert(this.ShopCategoryType, key); + _o.ShopCategoryType_ = TableEncryptionService.Convert(this.ShopCategoryType_, key); _o.ShopId = TableEncryptionService.Convert(this.ShopId, key); _o.PickupCharacterId = TableEncryptionService.Convert(this.PickupCharacterId, key); _o.RewardParcelType = TableEncryptionService.Convert(this.RewardParcelType, key); @@ -79,7 +79,7 @@ public struct PickupDuplicateBonusExcel : IFlatbufferObject return CreatePickupDuplicateBonusExcel( builder, _o.Id, - _o.ShopCategoryType, + _o.ShopCategoryType_, _o.ShopId, _o.PickupCharacterId, _o.RewardParcelType, @@ -91,7 +91,7 @@ public struct PickupDuplicateBonusExcel : IFlatbufferObject public class PickupDuplicateBonusExcelT { public long Id { get; set; } - public SCHALE.Common.FlatData.ShopCategoryType ShopCategoryType { get; set; } + public SCHALE.Common.FlatData.ShopCategoryType ShopCategoryType_ { get; set; } public long ShopId { get; set; } public long PickupCharacterId { get; set; } public SCHALE.Common.FlatData.ParcelType RewardParcelType { get; set; } @@ -100,7 +100,7 @@ public class PickupDuplicateBonusExcelT public PickupDuplicateBonusExcelT() { this.Id = 0; - this.ShopCategoryType = SCHALE.Common.FlatData.ShopCategoryType.General; + this.ShopCategoryType_ = SCHALE.Common.FlatData.ShopCategoryType.General; this.ShopId = 0; this.PickupCharacterId = 0; this.RewardParcelType = SCHALE.Common.FlatData.ParcelType.None; @@ -116,7 +116,7 @@ static public class PickupDuplicateBonusExcelVerify { return verifier.VerifyTableStart(tablePos) && verifier.VerifyField(tablePos, 4 /*Id*/, 8 /*long*/, 8, false) - && verifier.VerifyField(tablePos, 6 /*ShopCategoryType*/, 4 /*SCHALE.Common.FlatData.ShopCategoryType*/, 4, false) + && verifier.VerifyField(tablePos, 6 /*ShopCategoryType_*/, 4 /*SCHALE.Common.FlatData.ShopCategoryType*/, 4, false) && verifier.VerifyField(tablePos, 8 /*ShopId*/, 8 /*long*/, 8, false) && verifier.VerifyField(tablePos, 10 /*PickupCharacterId*/, 8 /*long*/, 8, false) && verifier.VerifyField(tablePos, 12 /*RewardParcelType*/, 4 /*SCHALE.Common.FlatData.ParcelType*/, 4, false) diff --git a/SCHALE.Common/FlatData/PresetParcelsExcel.cs b/SCHALE.Common/FlatData/PresetParcelsExcel.cs index c74b1c4..2ebb1c7 100644 --- a/SCHALE.Common/FlatData/PresetParcelsExcel.cs +++ b/SCHALE.Common/FlatData/PresetParcelsExcel.cs @@ -20,13 +20,13 @@ public struct PresetParcelsExcel : IFlatbufferObject public void __init(int _i, ByteBuffer _bb) { __p = new Table(_i, _bb); } public PresetParcelsExcel __assign(int _i, ByteBuffer _bb) { __init(_i, _bb); return this; } - public SCHALE.Common.FlatData.ParcelType ParcelType { get { int o = __p.__offset(4); return o != 0 ? (SCHALE.Common.FlatData.ParcelType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.ParcelType.None; } } + public SCHALE.Common.FlatData.ParcelType ParcelType_ { get { int o = __p.__offset(4); return o != 0 ? (SCHALE.Common.FlatData.ParcelType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.ParcelType.None; } } public long ParcelId { get { int o = __p.__offset(6); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public long PresetGroupId { get { int o = __p.__offset(8); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public long ParcelAmount { get { int o = __p.__offset(10); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public static Offset CreatePresetParcelsExcel(FlatBufferBuilder builder, - SCHALE.Common.FlatData.ParcelType ParcelType = SCHALE.Common.FlatData.ParcelType.None, + SCHALE.Common.FlatData.ParcelType ParcelType_ = SCHALE.Common.FlatData.ParcelType.None, long ParcelId = 0, long PresetGroupId = 0, long ParcelAmount = 0) { @@ -34,12 +34,12 @@ public struct PresetParcelsExcel : IFlatbufferObject PresetParcelsExcel.AddParcelAmount(builder, ParcelAmount); PresetParcelsExcel.AddPresetGroupId(builder, PresetGroupId); PresetParcelsExcel.AddParcelId(builder, ParcelId); - PresetParcelsExcel.AddParcelType(builder, ParcelType); + PresetParcelsExcel.AddParcelType_(builder, ParcelType_); return PresetParcelsExcel.EndPresetParcelsExcel(builder); } public static void StartPresetParcelsExcel(FlatBufferBuilder builder) { builder.StartTable(4); } - public static void AddParcelType(FlatBufferBuilder builder, SCHALE.Common.FlatData.ParcelType parcelType) { builder.AddInt(0, (int)parcelType, 0); } + public static void AddParcelType_(FlatBufferBuilder builder, SCHALE.Common.FlatData.ParcelType parcelType_) { builder.AddInt(0, (int)parcelType_, 0); } public static void AddParcelId(FlatBufferBuilder builder, long parcelId) { builder.AddLong(1, parcelId, 0); } public static void AddPresetGroupId(FlatBufferBuilder builder, long presetGroupId) { builder.AddLong(2, presetGroupId, 0); } public static void AddParcelAmount(FlatBufferBuilder builder, long parcelAmount) { builder.AddLong(3, parcelAmount, 0); } @@ -54,7 +54,7 @@ public struct PresetParcelsExcel : IFlatbufferObject } public void UnPackTo(PresetParcelsExcelT _o) { byte[] key = TableEncryptionService.CreateKey("PresetParcels"); - _o.ParcelType = TableEncryptionService.Convert(this.ParcelType, key); + _o.ParcelType_ = TableEncryptionService.Convert(this.ParcelType_, key); _o.ParcelId = TableEncryptionService.Convert(this.ParcelId, key); _o.PresetGroupId = TableEncryptionService.Convert(this.PresetGroupId, key); _o.ParcelAmount = TableEncryptionService.Convert(this.ParcelAmount, key); @@ -63,7 +63,7 @@ public struct PresetParcelsExcel : IFlatbufferObject if (_o == null) return default(Offset); return CreatePresetParcelsExcel( builder, - _o.ParcelType, + _o.ParcelType_, _o.ParcelId, _o.PresetGroupId, _o.ParcelAmount); @@ -72,13 +72,13 @@ public struct PresetParcelsExcel : IFlatbufferObject public class PresetParcelsExcelT { - public SCHALE.Common.FlatData.ParcelType ParcelType { get; set; } + public SCHALE.Common.FlatData.ParcelType ParcelType_ { get; set; } public long ParcelId { get; set; } public long PresetGroupId { get; set; } public long ParcelAmount { get; set; } public PresetParcelsExcelT() { - this.ParcelType = SCHALE.Common.FlatData.ParcelType.None; + this.ParcelType_ = SCHALE.Common.FlatData.ParcelType.None; this.ParcelId = 0; this.PresetGroupId = 0; this.ParcelAmount = 0; @@ -91,7 +91,7 @@ static public class PresetParcelsExcelVerify static public bool Verify(Google.FlatBuffers.Verifier verifier, uint tablePos) { return verifier.VerifyTableStart(tablePos) - && verifier.VerifyField(tablePos, 4 /*ParcelType*/, 4 /*SCHALE.Common.FlatData.ParcelType*/, 4, false) + && verifier.VerifyField(tablePos, 4 /*ParcelType_*/, 4 /*SCHALE.Common.FlatData.ParcelType*/, 4, false) && verifier.VerifyField(tablePos, 6 /*ParcelId*/, 8 /*long*/, 8, false) && verifier.VerifyField(tablePos, 8 /*PresetGroupId*/, 8 /*long*/, 8, false) && verifier.VerifyField(tablePos, 10 /*ParcelAmount*/, 8 /*long*/, 8, false) diff --git a/SCHALE.Common/FlatData/ProductDisplayTag.cs b/SCHALE.Common/FlatData/ProductDisplayTag.cs index a0b5bde..87ce808 100644 --- a/SCHALE.Common/FlatData/ProductDisplayTag.cs +++ b/SCHALE.Common/FlatData/ProductDisplayTag.cs @@ -11,6 +11,7 @@ public enum ProductDisplayTag : int New = 1, Hot = 2, Sale = 3, + Limited = 4, }; diff --git a/SCHALE.Common/FlatData/ProductExcel.cs b/SCHALE.Common/FlatData/ProductExcel.cs index 6427366..e2dccb9 100644 --- a/SCHALE.Common/FlatData/ProductExcel.cs +++ b/SCHALE.Common/FlatData/ProductExcel.cs @@ -28,7 +28,7 @@ public struct ProductExcel : IFlatbufferObject public ArraySegment? GetProductIdBytes() { return __p.__vector_as_arraysegment(6); } #endif public byte[] GetProductIdArray() { return __p.__vector_as_array(6); } - public SCHALE.Common.FlatData.StoreType StoreType { get { int o = __p.__offset(8); return o != 0 ? (SCHALE.Common.FlatData.StoreType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.StoreType.None; } } + public SCHALE.Common.FlatData.StoreType StoreType_ { get { int o = __p.__offset(8); return o != 0 ? (SCHALE.Common.FlatData.StoreType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.StoreType.None; } } public long Price { get { int o = __p.__offset(10); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public string PriceReference { get { int o = __p.__offset(12); return o != 0 ? __p.__string(o + __p.bb_pos) : null; } } #if ENABLE_SPAN_T @@ -37,7 +37,7 @@ public struct ProductExcel : IFlatbufferObject public ArraySegment? GetPriceReferenceBytes() { return __p.__vector_as_arraysegment(12); } #endif public byte[] GetPriceReferenceArray() { return __p.__vector_as_array(12); } - public SCHALE.Common.FlatData.PurchasePeriodType PurchasePeriodType { get { int o = __p.__offset(14); return o != 0 ? (SCHALE.Common.FlatData.PurchasePeriodType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.PurchasePeriodType.None; } } + public SCHALE.Common.FlatData.PurchasePeriodType PurchasePeriodType_ { get { int o = __p.__offset(14); return o != 0 ? (SCHALE.Common.FlatData.PurchasePeriodType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.PurchasePeriodType.None; } } public long PurchasePeriodLimit { get { int o = __p.__offset(16); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public SCHALE.Common.FlatData.ParcelType ParcelType_(int j) { int o = __p.__offset(18); return o != 0 ? (SCHALE.Common.FlatData.ParcelType)__p.bb.GetInt(__p.__vector(o) + j * 4) : (SCHALE.Common.FlatData.ParcelType)0; } public int ParcelType_Length { get { int o = __p.__offset(18); return o != 0 ? __p.__vector_len(o) : 0; } } @@ -67,10 +67,10 @@ public struct ProductExcel : IFlatbufferObject public static Offset CreateProductExcel(FlatBufferBuilder builder, long Id = 0, StringOffset ProductIdOffset = default(StringOffset), - SCHALE.Common.FlatData.StoreType StoreType = SCHALE.Common.FlatData.StoreType.None, + SCHALE.Common.FlatData.StoreType StoreType_ = SCHALE.Common.FlatData.StoreType.None, long Price = 0, StringOffset PriceReferenceOffset = default(StringOffset), - SCHALE.Common.FlatData.PurchasePeriodType PurchasePeriodType = SCHALE.Common.FlatData.PurchasePeriodType.None, + SCHALE.Common.FlatData.PurchasePeriodType PurchasePeriodType_ = SCHALE.Common.FlatData.PurchasePeriodType.None, long PurchasePeriodLimit = 0, VectorOffset ParcelType_Offset = default(VectorOffset), VectorOffset ParcelIdOffset = default(VectorOffset), @@ -82,9 +82,9 @@ public struct ProductExcel : IFlatbufferObject ProductExcel.AddParcelAmount(builder, ParcelAmountOffset); ProductExcel.AddParcelId(builder, ParcelIdOffset); ProductExcel.AddParcelType_(builder, ParcelType_Offset); - ProductExcel.AddPurchasePeriodType(builder, PurchasePeriodType); + ProductExcel.AddPurchasePeriodType_(builder, PurchasePeriodType_); ProductExcel.AddPriceReference(builder, PriceReferenceOffset); - ProductExcel.AddStoreType(builder, StoreType); + ProductExcel.AddStoreType_(builder, StoreType_); ProductExcel.AddProductId(builder, ProductIdOffset); return ProductExcel.EndProductExcel(builder); } @@ -92,10 +92,10 @@ public struct ProductExcel : IFlatbufferObject public static void StartProductExcel(FlatBufferBuilder builder) { builder.StartTable(10); } public static void AddId(FlatBufferBuilder builder, long id) { builder.AddLong(0, id, 0); } public static void AddProductId(FlatBufferBuilder builder, StringOffset productIdOffset) { builder.AddOffset(1, productIdOffset.Value, 0); } - public static void AddStoreType(FlatBufferBuilder builder, SCHALE.Common.FlatData.StoreType storeType) { builder.AddInt(2, (int)storeType, 0); } + public static void AddStoreType_(FlatBufferBuilder builder, SCHALE.Common.FlatData.StoreType storeType_) { builder.AddInt(2, (int)storeType_, 0); } public static void AddPrice(FlatBufferBuilder builder, long price) { builder.AddLong(3, price, 0); } public static void AddPriceReference(FlatBufferBuilder builder, StringOffset priceReferenceOffset) { builder.AddOffset(4, priceReferenceOffset.Value, 0); } - public static void AddPurchasePeriodType(FlatBufferBuilder builder, SCHALE.Common.FlatData.PurchasePeriodType purchasePeriodType) { builder.AddInt(5, (int)purchasePeriodType, 0); } + public static void AddPurchasePeriodType_(FlatBufferBuilder builder, SCHALE.Common.FlatData.PurchasePeriodType purchasePeriodType_) { builder.AddInt(5, (int)purchasePeriodType_, 0); } public static void AddPurchasePeriodLimit(FlatBufferBuilder builder, long purchasePeriodLimit) { builder.AddLong(6, purchasePeriodLimit, 0); } public static void AddParcelType_(FlatBufferBuilder builder, VectorOffset parcelType_Offset) { builder.AddOffset(7, parcelType_Offset.Value, 0); } public static VectorOffset CreateParcelType_Vector(FlatBufferBuilder builder, SCHALE.Common.FlatData.ParcelType[] data) { builder.StartVector(4, data.Length, 4); for (int i = data.Length - 1; i >= 0; i--) builder.AddInt((int)data[i]); return builder.EndVector(); } @@ -128,10 +128,10 @@ public struct ProductExcel : IFlatbufferObject byte[] key = TableEncryptionService.CreateKey("Product"); _o.Id = TableEncryptionService.Convert(this.Id, key); _o.ProductId = TableEncryptionService.Convert(this.ProductId, key); - _o.StoreType = TableEncryptionService.Convert(this.StoreType, key); + _o.StoreType_ = TableEncryptionService.Convert(this.StoreType_, key); _o.Price = TableEncryptionService.Convert(this.Price, key); _o.PriceReference = TableEncryptionService.Convert(this.PriceReference, key); - _o.PurchasePeriodType = TableEncryptionService.Convert(this.PurchasePeriodType, key); + _o.PurchasePeriodType_ = TableEncryptionService.Convert(this.PurchasePeriodType_, key); _o.PurchasePeriodLimit = TableEncryptionService.Convert(this.PurchasePeriodLimit, key); _o.ParcelType_ = new List(); for (var _j = 0; _j < this.ParcelType_Length; ++_j) {_o.ParcelType_.Add(TableEncryptionService.Convert(this.ParcelType_(_j), key));} @@ -163,10 +163,10 @@ public struct ProductExcel : IFlatbufferObject builder, _o.Id, _ProductId, - _o.StoreType, + _o.StoreType_, _o.Price, _PriceReference, - _o.PurchasePeriodType, + _o.PurchasePeriodType_, _o.PurchasePeriodLimit, _ParcelType_, _ParcelId, @@ -178,10 +178,10 @@ public class ProductExcelT { public long Id { get; set; } public string ProductId { get; set; } - public SCHALE.Common.FlatData.StoreType StoreType { get; set; } + public SCHALE.Common.FlatData.StoreType StoreType_ { get; set; } public long Price { get; set; } public string PriceReference { get; set; } - public SCHALE.Common.FlatData.PurchasePeriodType PurchasePeriodType { get; set; } + public SCHALE.Common.FlatData.PurchasePeriodType PurchasePeriodType_ { get; set; } public long PurchasePeriodLimit { get; set; } public List ParcelType_ { get; set; } public List ParcelId { get; set; } @@ -190,10 +190,10 @@ public class ProductExcelT public ProductExcelT() { this.Id = 0; this.ProductId = null; - this.StoreType = SCHALE.Common.FlatData.StoreType.None; + this.StoreType_ = SCHALE.Common.FlatData.StoreType.None; this.Price = 0; this.PriceReference = null; - this.PurchasePeriodType = SCHALE.Common.FlatData.PurchasePeriodType.None; + this.PurchasePeriodType_ = SCHALE.Common.FlatData.PurchasePeriodType.None; this.PurchasePeriodLimit = 0; this.ParcelType_ = null; this.ParcelId = null; @@ -209,10 +209,10 @@ static public class ProductExcelVerify return verifier.VerifyTableStart(tablePos) && verifier.VerifyField(tablePos, 4 /*Id*/, 8 /*long*/, 8, false) && verifier.VerifyString(tablePos, 6 /*ProductId*/, false) - && verifier.VerifyField(tablePos, 8 /*StoreType*/, 4 /*SCHALE.Common.FlatData.StoreType*/, 4, false) + && verifier.VerifyField(tablePos, 8 /*StoreType_*/, 4 /*SCHALE.Common.FlatData.StoreType*/, 4, false) && verifier.VerifyField(tablePos, 10 /*Price*/, 8 /*long*/, 8, false) && verifier.VerifyString(tablePos, 12 /*PriceReference*/, false) - && verifier.VerifyField(tablePos, 14 /*PurchasePeriodType*/, 4 /*SCHALE.Common.FlatData.PurchasePeriodType*/, 4, false) + && verifier.VerifyField(tablePos, 14 /*PurchasePeriodType_*/, 4 /*SCHALE.Common.FlatData.PurchasePeriodType*/, 4, false) && verifier.VerifyField(tablePos, 16 /*PurchasePeriodLimit*/, 8 /*long*/, 8, false) && verifier.VerifyVectorOfData(tablePos, 18 /*ParcelType_*/, 4 /*SCHALE.Common.FlatData.ParcelType*/, false) && verifier.VerifyVectorOfData(tablePos, 20 /*ParcelId*/, 8 /*long*/, false) diff --git a/SCHALE.Common/FlatData/ProductMonthlyExcel.cs b/SCHALE.Common/FlatData/ProductMonthlyExcel.cs index 2aa7bca..c2a5372 100644 --- a/SCHALE.Common/FlatData/ProductMonthlyExcel.cs +++ b/SCHALE.Common/FlatData/ProductMonthlyExcel.cs @@ -28,7 +28,7 @@ public struct ProductMonthlyExcel : IFlatbufferObject public ArraySegment? GetProductIdBytes() { return __p.__vector_as_arraysegment(6); } #endif public byte[] GetProductIdArray() { return __p.__vector_as_array(6); } - public SCHALE.Common.FlatData.StoreType StoreType { get { int o = __p.__offset(8); return o != 0 ? (SCHALE.Common.FlatData.StoreType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.StoreType.None; } } + public SCHALE.Common.FlatData.StoreType StoreType_ { get { int o = __p.__offset(8); return o != 0 ? (SCHALE.Common.FlatData.StoreType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.StoreType.None; } } public long Price { get { int o = __p.__offset(10); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public string PriceReference { get { int o = __p.__offset(12); return o != 0 ? __p.__string(o + __p.bb_pos) : null; } } #if ENABLE_SPAN_T @@ -37,66 +37,68 @@ public struct ProductMonthlyExcel : IFlatbufferObject public ArraySegment? GetPriceReferenceBytes() { return __p.__vector_as_arraysegment(12); } #endif public byte[] GetPriceReferenceArray() { return __p.__vector_as_array(12); } - public SCHALE.Common.FlatData.ProductTagType ProductTagType { get { int o = __p.__offset(14); return o != 0 ? (SCHALE.Common.FlatData.ProductTagType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.ProductTagType.Monthly; } } + public SCHALE.Common.FlatData.ProductTagType ProductTagType_ { get { int o = __p.__offset(14); return o != 0 ? (SCHALE.Common.FlatData.ProductTagType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.ProductTagType.Monthly; } } public long MonthlyDays { get { int o = __p.__offset(16); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } - public SCHALE.Common.FlatData.ParcelType ParcelType_(int j) { int o = __p.__offset(18); return o != 0 ? (SCHALE.Common.FlatData.ParcelType)__p.bb.GetInt(__p.__vector(o) + j * 4) : (SCHALE.Common.FlatData.ParcelType)0; } - public int ParcelType_Length { get { int o = __p.__offset(18); return o != 0 ? __p.__vector_len(o) : 0; } } + public bool UseMonthlyProductCheck { get { int o = __p.__offset(18); return o != 0 ? 0!=__p.bb.Get(o + __p.bb_pos) : (bool)false; } } + public SCHALE.Common.FlatData.ParcelType ParcelType_(int j) { int o = __p.__offset(20); return o != 0 ? (SCHALE.Common.FlatData.ParcelType)__p.bb.GetInt(__p.__vector(o) + j * 4) : (SCHALE.Common.FlatData.ParcelType)0; } + public int ParcelType_Length { get { int o = __p.__offset(20); return o != 0 ? __p.__vector_len(o) : 0; } } #if ENABLE_SPAN_T - public Span GetParcelType_Bytes() { return __p.__vector_as_span(18, 4); } + public Span GetParcelType_Bytes() { return __p.__vector_as_span(20, 4); } #else - public ArraySegment? GetParcelType_Bytes() { return __p.__vector_as_arraysegment(18); } + public ArraySegment? GetParcelType_Bytes() { return __p.__vector_as_arraysegment(20); } #endif - public SCHALE.Common.FlatData.ParcelType[] GetParcelType_Array() { int o = __p.__offset(18); if (o == 0) return null; int p = __p.__vector(o); int l = __p.__vector_len(o); SCHALE.Common.FlatData.ParcelType[] a = new SCHALE.Common.FlatData.ParcelType[l]; for (int i = 0; i < l; i++) { a[i] = (SCHALE.Common.FlatData.ParcelType)__p.bb.GetInt(p + i * 4); } return a; } - public long ParcelId(int j) { int o = __p.__offset(20); return o != 0 ? __p.bb.GetLong(__p.__vector(o) + j * 8) : (long)0; } - public int ParcelIdLength { get { int o = __p.__offset(20); return o != 0 ? __p.__vector_len(o) : 0; } } + public SCHALE.Common.FlatData.ParcelType[] GetParcelType_Array() { int o = __p.__offset(20); if (o == 0) return null; int p = __p.__vector(o); int l = __p.__vector_len(o); SCHALE.Common.FlatData.ParcelType[] a = new SCHALE.Common.FlatData.ParcelType[l]; for (int i = 0; i < l; i++) { a[i] = (SCHALE.Common.FlatData.ParcelType)__p.bb.GetInt(p + i * 4); } return a; } + public long ParcelId(int j) { int o = __p.__offset(22); return o != 0 ? __p.bb.GetLong(__p.__vector(o) + j * 8) : (long)0; } + public int ParcelIdLength { get { int o = __p.__offset(22); return o != 0 ? __p.__vector_len(o) : 0; } } #if ENABLE_SPAN_T - public Span GetParcelIdBytes() { return __p.__vector_as_span(20, 8); } + public Span GetParcelIdBytes() { return __p.__vector_as_span(22, 8); } #else - public ArraySegment? GetParcelIdBytes() { return __p.__vector_as_arraysegment(20); } + public ArraySegment? GetParcelIdBytes() { return __p.__vector_as_arraysegment(22); } #endif - public long[] GetParcelIdArray() { return __p.__vector_as_array(20); } - public long ParcelAmount(int j) { int o = __p.__offset(22); return o != 0 ? __p.bb.GetLong(__p.__vector(o) + j * 8) : (long)0; } - public int ParcelAmountLength { get { int o = __p.__offset(22); return o != 0 ? __p.__vector_len(o) : 0; } } + public long[] GetParcelIdArray() { return __p.__vector_as_array(22); } + public long ParcelAmount(int j) { int o = __p.__offset(24); return o != 0 ? __p.bb.GetLong(__p.__vector(o) + j * 8) : (long)0; } + public int ParcelAmountLength { get { int o = __p.__offset(24); return o != 0 ? __p.__vector_len(o) : 0; } } #if ENABLE_SPAN_T - public Span GetParcelAmountBytes() { return __p.__vector_as_span(22, 8); } + public Span GetParcelAmountBytes() { return __p.__vector_as_span(24, 8); } #else - public ArraySegment? GetParcelAmountBytes() { return __p.__vector_as_arraysegment(22); } + public ArraySegment? GetParcelAmountBytes() { return __p.__vector_as_arraysegment(24); } #endif - public long[] GetParcelAmountArray() { return __p.__vector_as_array(22); } - public long EnterCostReduceGroupId { get { int o = __p.__offset(24); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } - public SCHALE.Common.FlatData.ParcelType DailyParcelType(int j) { int o = __p.__offset(26); return o != 0 ? (SCHALE.Common.FlatData.ParcelType)__p.bb.GetInt(__p.__vector(o) + j * 4) : (SCHALE.Common.FlatData.ParcelType)0; } - public int DailyParcelTypeLength { get { int o = __p.__offset(26); return o != 0 ? __p.__vector_len(o) : 0; } } + public long[] GetParcelAmountArray() { return __p.__vector_as_array(24); } + public long EnterCostReduceGroupId { get { int o = __p.__offset(26); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } + public SCHALE.Common.FlatData.ParcelType DailyParcelType(int j) { int o = __p.__offset(28); return o != 0 ? (SCHALE.Common.FlatData.ParcelType)__p.bb.GetInt(__p.__vector(o) + j * 4) : (SCHALE.Common.FlatData.ParcelType)0; } + public int DailyParcelTypeLength { get { int o = __p.__offset(28); return o != 0 ? __p.__vector_len(o) : 0; } } #if ENABLE_SPAN_T - public Span GetDailyParcelTypeBytes() { return __p.__vector_as_span(26, 4); } + public Span GetDailyParcelTypeBytes() { return __p.__vector_as_span(28, 4); } #else - public ArraySegment? GetDailyParcelTypeBytes() { return __p.__vector_as_arraysegment(26); } + public ArraySegment? GetDailyParcelTypeBytes() { return __p.__vector_as_arraysegment(28); } #endif - public SCHALE.Common.FlatData.ParcelType[] GetDailyParcelTypeArray() { int o = __p.__offset(26); if (o == 0) return null; int p = __p.__vector(o); int l = __p.__vector_len(o); SCHALE.Common.FlatData.ParcelType[] a = new SCHALE.Common.FlatData.ParcelType[l]; for (int i = 0; i < l; i++) { a[i] = (SCHALE.Common.FlatData.ParcelType)__p.bb.GetInt(p + i * 4); } return a; } - public long DailyParcelId(int j) { int o = __p.__offset(28); return o != 0 ? __p.bb.GetLong(__p.__vector(o) + j * 8) : (long)0; } - public int DailyParcelIdLength { get { int o = __p.__offset(28); return o != 0 ? __p.__vector_len(o) : 0; } } + public SCHALE.Common.FlatData.ParcelType[] GetDailyParcelTypeArray() { int o = __p.__offset(28); if (o == 0) return null; int p = __p.__vector(o); int l = __p.__vector_len(o); SCHALE.Common.FlatData.ParcelType[] a = new SCHALE.Common.FlatData.ParcelType[l]; for (int i = 0; i < l; i++) { a[i] = (SCHALE.Common.FlatData.ParcelType)__p.bb.GetInt(p + i * 4); } return a; } + public long DailyParcelId(int j) { int o = __p.__offset(30); return o != 0 ? __p.bb.GetLong(__p.__vector(o) + j * 8) : (long)0; } + public int DailyParcelIdLength { get { int o = __p.__offset(30); return o != 0 ? __p.__vector_len(o) : 0; } } #if ENABLE_SPAN_T - public Span GetDailyParcelIdBytes() { return __p.__vector_as_span(28, 8); } + public Span GetDailyParcelIdBytes() { return __p.__vector_as_span(30, 8); } #else - public ArraySegment? GetDailyParcelIdBytes() { return __p.__vector_as_arraysegment(28); } + public ArraySegment? GetDailyParcelIdBytes() { return __p.__vector_as_arraysegment(30); } #endif - public long[] GetDailyParcelIdArray() { return __p.__vector_as_array(28); } - public long DailyParcelAmount(int j) { int o = __p.__offset(30); return o != 0 ? __p.bb.GetLong(__p.__vector(o) + j * 8) : (long)0; } - public int DailyParcelAmountLength { get { int o = __p.__offset(30); return o != 0 ? __p.__vector_len(o) : 0; } } + public long[] GetDailyParcelIdArray() { return __p.__vector_as_array(30); } + public long DailyParcelAmount(int j) { int o = __p.__offset(32); return o != 0 ? __p.bb.GetLong(__p.__vector(o) + j * 8) : (long)0; } + public int DailyParcelAmountLength { get { int o = __p.__offset(32); return o != 0 ? __p.__vector_len(o) : 0; } } #if ENABLE_SPAN_T - public Span GetDailyParcelAmountBytes() { return __p.__vector_as_span(30, 8); } + public Span GetDailyParcelAmountBytes() { return __p.__vector_as_span(32, 8); } #else - public ArraySegment? GetDailyParcelAmountBytes() { return __p.__vector_as_arraysegment(30); } + public ArraySegment? GetDailyParcelAmountBytes() { return __p.__vector_as_arraysegment(32); } #endif - public long[] GetDailyParcelAmountArray() { return __p.__vector_as_array(30); } + public long[] GetDailyParcelAmountArray() { return __p.__vector_as_array(32); } public static Offset CreateProductMonthlyExcel(FlatBufferBuilder builder, long Id = 0, StringOffset ProductIdOffset = default(StringOffset), - SCHALE.Common.FlatData.StoreType StoreType = SCHALE.Common.FlatData.StoreType.None, + SCHALE.Common.FlatData.StoreType StoreType_ = SCHALE.Common.FlatData.StoreType.None, long Price = 0, StringOffset PriceReferenceOffset = default(StringOffset), - SCHALE.Common.FlatData.ProductTagType ProductTagType = SCHALE.Common.FlatData.ProductTagType.Monthly, + SCHALE.Common.FlatData.ProductTagType ProductTagType_ = SCHALE.Common.FlatData.ProductTagType.Monthly, long MonthlyDays = 0, + bool UseMonthlyProductCheck = false, VectorOffset ParcelType_Offset = default(VectorOffset), VectorOffset ParcelIdOffset = default(VectorOffset), VectorOffset ParcelAmountOffset = default(VectorOffset), @@ -104,7 +106,7 @@ public struct ProductMonthlyExcel : IFlatbufferObject VectorOffset DailyParcelTypeOffset = default(VectorOffset), VectorOffset DailyParcelIdOffset = default(VectorOffset), VectorOffset DailyParcelAmountOffset = default(VectorOffset)) { - builder.StartTable(14); + builder.StartTable(15); ProductMonthlyExcel.AddEnterCostReduceGroupId(builder, EnterCostReduceGroupId); ProductMonthlyExcel.AddMonthlyDays(builder, MonthlyDays); ProductMonthlyExcel.AddPrice(builder, Price); @@ -115,53 +117,55 @@ public struct ProductMonthlyExcel : IFlatbufferObject ProductMonthlyExcel.AddParcelAmount(builder, ParcelAmountOffset); ProductMonthlyExcel.AddParcelId(builder, ParcelIdOffset); ProductMonthlyExcel.AddParcelType_(builder, ParcelType_Offset); - ProductMonthlyExcel.AddProductTagType(builder, ProductTagType); + ProductMonthlyExcel.AddProductTagType_(builder, ProductTagType_); ProductMonthlyExcel.AddPriceReference(builder, PriceReferenceOffset); - ProductMonthlyExcel.AddStoreType(builder, StoreType); + ProductMonthlyExcel.AddStoreType_(builder, StoreType_); ProductMonthlyExcel.AddProductId(builder, ProductIdOffset); + ProductMonthlyExcel.AddUseMonthlyProductCheck(builder, UseMonthlyProductCheck); return ProductMonthlyExcel.EndProductMonthlyExcel(builder); } - public static void StartProductMonthlyExcel(FlatBufferBuilder builder) { builder.StartTable(14); } + public static void StartProductMonthlyExcel(FlatBufferBuilder builder) { builder.StartTable(15); } public static void AddId(FlatBufferBuilder builder, long id) { builder.AddLong(0, id, 0); } public static void AddProductId(FlatBufferBuilder builder, StringOffset productIdOffset) { builder.AddOffset(1, productIdOffset.Value, 0); } - public static void AddStoreType(FlatBufferBuilder builder, SCHALE.Common.FlatData.StoreType storeType) { builder.AddInt(2, (int)storeType, 0); } + public static void AddStoreType_(FlatBufferBuilder builder, SCHALE.Common.FlatData.StoreType storeType_) { builder.AddInt(2, (int)storeType_, 0); } public static void AddPrice(FlatBufferBuilder builder, long price) { builder.AddLong(3, price, 0); } public static void AddPriceReference(FlatBufferBuilder builder, StringOffset priceReferenceOffset) { builder.AddOffset(4, priceReferenceOffset.Value, 0); } - public static void AddProductTagType(FlatBufferBuilder builder, SCHALE.Common.FlatData.ProductTagType productTagType) { builder.AddInt(5, (int)productTagType, 0); } + public static void AddProductTagType_(FlatBufferBuilder builder, SCHALE.Common.FlatData.ProductTagType productTagType_) { builder.AddInt(5, (int)productTagType_, 0); } public static void AddMonthlyDays(FlatBufferBuilder builder, long monthlyDays) { builder.AddLong(6, monthlyDays, 0); } - public static void AddParcelType_(FlatBufferBuilder builder, VectorOffset parcelType_Offset) { builder.AddOffset(7, parcelType_Offset.Value, 0); } + public static void AddUseMonthlyProductCheck(FlatBufferBuilder builder, bool useMonthlyProductCheck) { builder.AddBool(7, useMonthlyProductCheck, false); } + public static void AddParcelType_(FlatBufferBuilder builder, VectorOffset parcelType_Offset) { builder.AddOffset(8, parcelType_Offset.Value, 0); } public static VectorOffset CreateParcelType_Vector(FlatBufferBuilder builder, SCHALE.Common.FlatData.ParcelType[] data) { builder.StartVector(4, data.Length, 4); for (int i = data.Length - 1; i >= 0; i--) builder.AddInt((int)data[i]); return builder.EndVector(); } public static VectorOffset CreateParcelType_VectorBlock(FlatBufferBuilder builder, SCHALE.Common.FlatData.ParcelType[] data) { builder.StartVector(4, data.Length, 4); builder.Add(data); return builder.EndVector(); } public static VectorOffset CreateParcelType_VectorBlock(FlatBufferBuilder builder, ArraySegment data) { builder.StartVector(4, data.Count, 4); builder.Add(data); return builder.EndVector(); } public static VectorOffset CreateParcelType_VectorBlock(FlatBufferBuilder builder, IntPtr dataPtr, int sizeInBytes) { builder.StartVector(1, sizeInBytes, 1); builder.Add(dataPtr, sizeInBytes); return builder.EndVector(); } public static void StartParcelType_Vector(FlatBufferBuilder builder, int numElems) { builder.StartVector(4, numElems, 4); } - public static void AddParcelId(FlatBufferBuilder builder, VectorOffset parcelIdOffset) { builder.AddOffset(8, parcelIdOffset.Value, 0); } + public static void AddParcelId(FlatBufferBuilder builder, VectorOffset parcelIdOffset) { builder.AddOffset(9, parcelIdOffset.Value, 0); } public static VectorOffset CreateParcelIdVector(FlatBufferBuilder builder, long[] data) { builder.StartVector(8, data.Length, 8); for (int i = data.Length - 1; i >= 0; i--) builder.AddLong(data[i]); return builder.EndVector(); } public static VectorOffset CreateParcelIdVectorBlock(FlatBufferBuilder builder, long[] data) { builder.StartVector(8, data.Length, 8); builder.Add(data); return builder.EndVector(); } public static VectorOffset CreateParcelIdVectorBlock(FlatBufferBuilder builder, ArraySegment data) { builder.StartVector(8, data.Count, 8); builder.Add(data); return builder.EndVector(); } public static VectorOffset CreateParcelIdVectorBlock(FlatBufferBuilder builder, IntPtr dataPtr, int sizeInBytes) { builder.StartVector(1, sizeInBytes, 1); builder.Add(dataPtr, sizeInBytes); return builder.EndVector(); } public static void StartParcelIdVector(FlatBufferBuilder builder, int numElems) { builder.StartVector(8, numElems, 8); } - public static void AddParcelAmount(FlatBufferBuilder builder, VectorOffset parcelAmountOffset) { builder.AddOffset(9, parcelAmountOffset.Value, 0); } + public static void AddParcelAmount(FlatBufferBuilder builder, VectorOffset parcelAmountOffset) { builder.AddOffset(10, parcelAmountOffset.Value, 0); } public static VectorOffset CreateParcelAmountVector(FlatBufferBuilder builder, long[] data) { builder.StartVector(8, data.Length, 8); for (int i = data.Length - 1; i >= 0; i--) builder.AddLong(data[i]); return builder.EndVector(); } public static VectorOffset CreateParcelAmountVectorBlock(FlatBufferBuilder builder, long[] data) { builder.StartVector(8, data.Length, 8); builder.Add(data); return builder.EndVector(); } public static VectorOffset CreateParcelAmountVectorBlock(FlatBufferBuilder builder, ArraySegment data) { builder.StartVector(8, data.Count, 8); builder.Add(data); return builder.EndVector(); } public static VectorOffset CreateParcelAmountVectorBlock(FlatBufferBuilder builder, IntPtr dataPtr, int sizeInBytes) { builder.StartVector(1, sizeInBytes, 1); builder.Add(dataPtr, sizeInBytes); return builder.EndVector(); } public static void StartParcelAmountVector(FlatBufferBuilder builder, int numElems) { builder.StartVector(8, numElems, 8); } - public static void AddEnterCostReduceGroupId(FlatBufferBuilder builder, long enterCostReduceGroupId) { builder.AddLong(10, enterCostReduceGroupId, 0); } - public static void AddDailyParcelType(FlatBufferBuilder builder, VectorOffset dailyParcelTypeOffset) { builder.AddOffset(11, dailyParcelTypeOffset.Value, 0); } + public static void AddEnterCostReduceGroupId(FlatBufferBuilder builder, long enterCostReduceGroupId) { builder.AddLong(11, enterCostReduceGroupId, 0); } + public static void AddDailyParcelType(FlatBufferBuilder builder, VectorOffset dailyParcelTypeOffset) { builder.AddOffset(12, dailyParcelTypeOffset.Value, 0); } public static VectorOffset CreateDailyParcelTypeVector(FlatBufferBuilder builder, SCHALE.Common.FlatData.ParcelType[] data) { builder.StartVector(4, data.Length, 4); for (int i = data.Length - 1; i >= 0; i--) builder.AddInt((int)data[i]); return builder.EndVector(); } public static VectorOffset CreateDailyParcelTypeVectorBlock(FlatBufferBuilder builder, SCHALE.Common.FlatData.ParcelType[] data) { builder.StartVector(4, data.Length, 4); builder.Add(data); return builder.EndVector(); } public static VectorOffset CreateDailyParcelTypeVectorBlock(FlatBufferBuilder builder, ArraySegment data) { builder.StartVector(4, data.Count, 4); builder.Add(data); return builder.EndVector(); } public static VectorOffset CreateDailyParcelTypeVectorBlock(FlatBufferBuilder builder, IntPtr dataPtr, int sizeInBytes) { builder.StartVector(1, sizeInBytes, 1); builder.Add(dataPtr, sizeInBytes); return builder.EndVector(); } public static void StartDailyParcelTypeVector(FlatBufferBuilder builder, int numElems) { builder.StartVector(4, numElems, 4); } - public static void AddDailyParcelId(FlatBufferBuilder builder, VectorOffset dailyParcelIdOffset) { builder.AddOffset(12, dailyParcelIdOffset.Value, 0); } + public static void AddDailyParcelId(FlatBufferBuilder builder, VectorOffset dailyParcelIdOffset) { builder.AddOffset(13, dailyParcelIdOffset.Value, 0); } public static VectorOffset CreateDailyParcelIdVector(FlatBufferBuilder builder, long[] data) { builder.StartVector(8, data.Length, 8); for (int i = data.Length - 1; i >= 0; i--) builder.AddLong(data[i]); return builder.EndVector(); } public static VectorOffset CreateDailyParcelIdVectorBlock(FlatBufferBuilder builder, long[] data) { builder.StartVector(8, data.Length, 8); builder.Add(data); return builder.EndVector(); } public static VectorOffset CreateDailyParcelIdVectorBlock(FlatBufferBuilder builder, ArraySegment data) { builder.StartVector(8, data.Count, 8); builder.Add(data); return builder.EndVector(); } public static VectorOffset CreateDailyParcelIdVectorBlock(FlatBufferBuilder builder, IntPtr dataPtr, int sizeInBytes) { builder.StartVector(1, sizeInBytes, 1); builder.Add(dataPtr, sizeInBytes); return builder.EndVector(); } public static void StartDailyParcelIdVector(FlatBufferBuilder builder, int numElems) { builder.StartVector(8, numElems, 8); } - public static void AddDailyParcelAmount(FlatBufferBuilder builder, VectorOffset dailyParcelAmountOffset) { builder.AddOffset(13, dailyParcelAmountOffset.Value, 0); } + public static void AddDailyParcelAmount(FlatBufferBuilder builder, VectorOffset dailyParcelAmountOffset) { builder.AddOffset(14, dailyParcelAmountOffset.Value, 0); } public static VectorOffset CreateDailyParcelAmountVector(FlatBufferBuilder builder, long[] data) { builder.StartVector(8, data.Length, 8); for (int i = data.Length - 1; i >= 0; i--) builder.AddLong(data[i]); return builder.EndVector(); } public static VectorOffset CreateDailyParcelAmountVectorBlock(FlatBufferBuilder builder, long[] data) { builder.StartVector(8, data.Length, 8); builder.Add(data); return builder.EndVector(); } public static VectorOffset CreateDailyParcelAmountVectorBlock(FlatBufferBuilder builder, ArraySegment data) { builder.StartVector(8, data.Count, 8); builder.Add(data); return builder.EndVector(); } @@ -180,11 +184,12 @@ public struct ProductMonthlyExcel : IFlatbufferObject byte[] key = TableEncryptionService.CreateKey("ProductMonthly"); _o.Id = TableEncryptionService.Convert(this.Id, key); _o.ProductId = TableEncryptionService.Convert(this.ProductId, key); - _o.StoreType = TableEncryptionService.Convert(this.StoreType, key); + _o.StoreType_ = TableEncryptionService.Convert(this.StoreType_, key); _o.Price = TableEncryptionService.Convert(this.Price, key); _o.PriceReference = TableEncryptionService.Convert(this.PriceReference, key); - _o.ProductTagType = TableEncryptionService.Convert(this.ProductTagType, key); + _o.ProductTagType_ = TableEncryptionService.Convert(this.ProductTagType_, key); _o.MonthlyDays = TableEncryptionService.Convert(this.MonthlyDays, key); + _o.UseMonthlyProductCheck = TableEncryptionService.Convert(this.UseMonthlyProductCheck, key); _o.ParcelType_ = new List(); for (var _j = 0; _j < this.ParcelType_Length; ++_j) {_o.ParcelType_.Add(TableEncryptionService.Convert(this.ParcelType_(_j), key));} _o.ParcelId = new List(); @@ -237,11 +242,12 @@ public struct ProductMonthlyExcel : IFlatbufferObject builder, _o.Id, _ProductId, - _o.StoreType, + _o.StoreType_, _o.Price, _PriceReference, - _o.ProductTagType, + _o.ProductTagType_, _o.MonthlyDays, + _o.UseMonthlyProductCheck, _ParcelType_, _ParcelId, _ParcelAmount, @@ -256,11 +262,12 @@ public class ProductMonthlyExcelT { public long Id { get; set; } public string ProductId { get; set; } - public SCHALE.Common.FlatData.StoreType StoreType { get; set; } + public SCHALE.Common.FlatData.StoreType StoreType_ { get; set; } public long Price { get; set; } public string PriceReference { get; set; } - public SCHALE.Common.FlatData.ProductTagType ProductTagType { get; set; } + public SCHALE.Common.FlatData.ProductTagType ProductTagType_ { get; set; } public long MonthlyDays { get; set; } + public bool UseMonthlyProductCheck { get; set; } public List ParcelType_ { get; set; } public List ParcelId { get; set; } public List ParcelAmount { get; set; } @@ -272,11 +279,12 @@ public class ProductMonthlyExcelT public ProductMonthlyExcelT() { this.Id = 0; this.ProductId = null; - this.StoreType = SCHALE.Common.FlatData.StoreType.None; + this.StoreType_ = SCHALE.Common.FlatData.StoreType.None; this.Price = 0; this.PriceReference = null; - this.ProductTagType = SCHALE.Common.FlatData.ProductTagType.Monthly; + this.ProductTagType_ = SCHALE.Common.FlatData.ProductTagType.Monthly; this.MonthlyDays = 0; + this.UseMonthlyProductCheck = false; this.ParcelType_ = null; this.ParcelId = null; this.ParcelAmount = null; @@ -295,18 +303,19 @@ static public class ProductMonthlyExcelVerify return verifier.VerifyTableStart(tablePos) && verifier.VerifyField(tablePos, 4 /*Id*/, 8 /*long*/, 8, false) && verifier.VerifyString(tablePos, 6 /*ProductId*/, false) - && verifier.VerifyField(tablePos, 8 /*StoreType*/, 4 /*SCHALE.Common.FlatData.StoreType*/, 4, false) + && verifier.VerifyField(tablePos, 8 /*StoreType_*/, 4 /*SCHALE.Common.FlatData.StoreType*/, 4, false) && verifier.VerifyField(tablePos, 10 /*Price*/, 8 /*long*/, 8, false) && verifier.VerifyString(tablePos, 12 /*PriceReference*/, false) - && verifier.VerifyField(tablePos, 14 /*ProductTagType*/, 4 /*SCHALE.Common.FlatData.ProductTagType*/, 4, false) + && verifier.VerifyField(tablePos, 14 /*ProductTagType_*/, 4 /*SCHALE.Common.FlatData.ProductTagType*/, 4, false) && verifier.VerifyField(tablePos, 16 /*MonthlyDays*/, 8 /*long*/, 8, false) - && verifier.VerifyVectorOfData(tablePos, 18 /*ParcelType_*/, 4 /*SCHALE.Common.FlatData.ParcelType*/, false) - && verifier.VerifyVectorOfData(tablePos, 20 /*ParcelId*/, 8 /*long*/, false) - && verifier.VerifyVectorOfData(tablePos, 22 /*ParcelAmount*/, 8 /*long*/, false) - && verifier.VerifyField(tablePos, 24 /*EnterCostReduceGroupId*/, 8 /*long*/, 8, false) - && verifier.VerifyVectorOfData(tablePos, 26 /*DailyParcelType*/, 4 /*SCHALE.Common.FlatData.ParcelType*/, false) - && verifier.VerifyVectorOfData(tablePos, 28 /*DailyParcelId*/, 8 /*long*/, false) - && verifier.VerifyVectorOfData(tablePos, 30 /*DailyParcelAmount*/, 8 /*long*/, false) + && verifier.VerifyField(tablePos, 18 /*UseMonthlyProductCheck*/, 1 /*bool*/, 1, false) + && verifier.VerifyVectorOfData(tablePos, 20 /*ParcelType_*/, 4 /*SCHALE.Common.FlatData.ParcelType*/, false) + && verifier.VerifyVectorOfData(tablePos, 22 /*ParcelId*/, 8 /*long*/, false) + && verifier.VerifyVectorOfData(tablePos, 24 /*ParcelAmount*/, 8 /*long*/, false) + && verifier.VerifyField(tablePos, 26 /*EnterCostReduceGroupId*/, 8 /*long*/, 8, false) + && verifier.VerifyVectorOfData(tablePos, 28 /*DailyParcelType*/, 4 /*SCHALE.Common.FlatData.ParcelType*/, false) + && verifier.VerifyVectorOfData(tablePos, 30 /*DailyParcelId*/, 8 /*long*/, false) + && verifier.VerifyVectorOfData(tablePos, 32 /*DailyParcelAmount*/, 8 /*long*/, false) && verifier.VerifyTableEnd(tablePos); } } diff --git a/SCHALE.Common/FlatData/ProtocolSettingExcel.cs b/SCHALE.Common/FlatData/ProtocolSettingExcel.cs index 99c89bd..0f6e915 100644 --- a/SCHALE.Common/FlatData/ProtocolSettingExcel.cs +++ b/SCHALE.Common/FlatData/ProtocolSettingExcel.cs @@ -27,19 +27,19 @@ public struct ProtocolSettingExcel : IFlatbufferObject public ArraySegment? GetProtocolBytes() { return __p.__vector_as_arraysegment(4); } #endif public byte[] GetProtocolArray() { return __p.__vector_as_array(4); } - public SCHALE.Common.FlatData.OpenConditionContent OpenConditionContent { get { int o = __p.__offset(6); return o != 0 ? (SCHALE.Common.FlatData.OpenConditionContent)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.OpenConditionContent.Shop; } } + public SCHALE.Common.FlatData.OpenConditionContent OpenConditionContent_ { get { int o = __p.__offset(6); return o != 0 ? (SCHALE.Common.FlatData.OpenConditionContent)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.OpenConditionContent.Shop; } } public bool Currency { get { int o = __p.__offset(8); return o != 0 ? 0!=__p.bb.Get(o + __p.bb_pos) : (bool)false; } } public bool Inventory { get { int o = __p.__offset(10); return o != 0 ? 0!=__p.bb.Get(o + __p.bb_pos) : (bool)false; } } public bool Mail { get { int o = __p.__offset(12); return o != 0 ? 0!=__p.bb.Get(o + __p.bb_pos) : (bool)false; } } public static Offset CreateProtocolSettingExcel(FlatBufferBuilder builder, StringOffset ProtocolOffset = default(StringOffset), - SCHALE.Common.FlatData.OpenConditionContent OpenConditionContent = SCHALE.Common.FlatData.OpenConditionContent.Shop, + SCHALE.Common.FlatData.OpenConditionContent OpenConditionContent_ = SCHALE.Common.FlatData.OpenConditionContent.Shop, bool Currency = false, bool Inventory = false, bool Mail = false) { builder.StartTable(5); - ProtocolSettingExcel.AddOpenConditionContent(builder, OpenConditionContent); + ProtocolSettingExcel.AddOpenConditionContent_(builder, OpenConditionContent_); ProtocolSettingExcel.AddProtocol(builder, ProtocolOffset); ProtocolSettingExcel.AddMail(builder, Mail); ProtocolSettingExcel.AddInventory(builder, Inventory); @@ -49,7 +49,7 @@ public struct ProtocolSettingExcel : IFlatbufferObject public static void StartProtocolSettingExcel(FlatBufferBuilder builder) { builder.StartTable(5); } public static void AddProtocol(FlatBufferBuilder builder, StringOffset protocolOffset) { builder.AddOffset(0, protocolOffset.Value, 0); } - public static void AddOpenConditionContent(FlatBufferBuilder builder, SCHALE.Common.FlatData.OpenConditionContent openConditionContent) { builder.AddInt(1, (int)openConditionContent, 0); } + public static void AddOpenConditionContent_(FlatBufferBuilder builder, SCHALE.Common.FlatData.OpenConditionContent openConditionContent_) { builder.AddInt(1, (int)openConditionContent_, 0); } public static void AddCurrency(FlatBufferBuilder builder, bool currency) { builder.AddBool(2, currency, false); } public static void AddInventory(FlatBufferBuilder builder, bool inventory) { builder.AddBool(3, inventory, false); } public static void AddMail(FlatBufferBuilder builder, bool mail) { builder.AddBool(4, mail, false); } @@ -65,7 +65,7 @@ public struct ProtocolSettingExcel : IFlatbufferObject public void UnPackTo(ProtocolSettingExcelT _o) { byte[] key = TableEncryptionService.CreateKey("ProtocolSetting"); _o.Protocol = TableEncryptionService.Convert(this.Protocol, key); - _o.OpenConditionContent = TableEncryptionService.Convert(this.OpenConditionContent, key); + _o.OpenConditionContent_ = TableEncryptionService.Convert(this.OpenConditionContent_, key); _o.Currency = TableEncryptionService.Convert(this.Currency, key); _o.Inventory = TableEncryptionService.Convert(this.Inventory, key); _o.Mail = TableEncryptionService.Convert(this.Mail, key); @@ -76,7 +76,7 @@ public struct ProtocolSettingExcel : IFlatbufferObject return CreateProtocolSettingExcel( builder, _Protocol, - _o.OpenConditionContent, + _o.OpenConditionContent_, _o.Currency, _o.Inventory, _o.Mail); @@ -86,14 +86,14 @@ public struct ProtocolSettingExcel : IFlatbufferObject public class ProtocolSettingExcelT { public string Protocol { get; set; } - public SCHALE.Common.FlatData.OpenConditionContent OpenConditionContent { get; set; } + public SCHALE.Common.FlatData.OpenConditionContent OpenConditionContent_ { get; set; } public bool Currency { get; set; } public bool Inventory { get; set; } public bool Mail { get; set; } public ProtocolSettingExcelT() { this.Protocol = null; - this.OpenConditionContent = SCHALE.Common.FlatData.OpenConditionContent.Shop; + this.OpenConditionContent_ = SCHALE.Common.FlatData.OpenConditionContent.Shop; this.Currency = false; this.Inventory = false; this.Mail = false; @@ -107,7 +107,7 @@ static public class ProtocolSettingExcelVerify { return verifier.VerifyTableStart(tablePos) && verifier.VerifyString(tablePos, 4 /*Protocol*/, false) - && verifier.VerifyField(tablePos, 6 /*OpenConditionContent*/, 4 /*SCHALE.Common.FlatData.OpenConditionContent*/, 4, false) + && verifier.VerifyField(tablePos, 6 /*OpenConditionContent_*/, 4 /*SCHALE.Common.FlatData.OpenConditionContent*/, 4, false) && verifier.VerifyField(tablePos, 8 /*Currency*/, 1 /*bool*/, 1, false) && verifier.VerifyField(tablePos, 10 /*Inventory*/, 1 /*bool*/, 1, false) && verifier.VerifyField(tablePos, 12 /*Mail*/, 1 /*bool*/, 1, false) diff --git a/SCHALE.Common/FlatData/RaidStageExcel.cs b/SCHALE.Common/FlatData/RaidStageExcel.cs index 6946e9c..97865a8 100644 --- a/SCHALE.Common/FlatData/RaidStageExcel.cs +++ b/SCHALE.Common/FlatData/RaidStageExcel.cs @@ -53,7 +53,7 @@ public struct RaidStageExcel : IFlatbufferObject public ArraySegment? GetBossCharacterIdBytes() { return __p.__vector_as_arraysegment(18); } #endif public long[] GetBossCharacterIdArray() { return __p.__vector_as_array(18); } - public SCHALE.Common.FlatData.Difficulty Difficulty { get { int o = __p.__offset(20); return o != 0 ? (SCHALE.Common.FlatData.Difficulty)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.Difficulty.Normal; } } + public SCHALE.Common.FlatData.Difficulty Difficulty_ { get { int o = __p.__offset(20); return o != 0 ? (SCHALE.Common.FlatData.Difficulty)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.Difficulty.Normal; } } public bool DifficultyOpenCondition { get { int o = __p.__offset(22); return o != 0 ? 0!=__p.bb.Get(o + __p.bb_pos) : (bool)false; } } public long MaxPlayerCount { get { int o = __p.__offset(24); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public int RaidRoomLifeTime { get { int o = __p.__offset(26); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } @@ -73,7 +73,7 @@ public struct RaidStageExcel : IFlatbufferObject public ArraySegment? GetEnterTimeLineBytes() { return __p.__vector_as_arraysegment(34); } #endif public byte[] GetEnterTimeLineArray() { return __p.__vector_as_array(34); } - public SCHALE.Common.FlatData.TacticEnvironment TacticEnvironment { get { int o = __p.__offset(36); return o != 0 ? (SCHALE.Common.FlatData.TacticEnvironment)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.TacticEnvironment.None; } } + public SCHALE.Common.FlatData.TacticEnvironment TacticEnvironment_ { get { int o = __p.__offset(36); return o != 0 ? (SCHALE.Common.FlatData.TacticEnvironment)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.TacticEnvironment.None; } } public long DefaultClearScore { get { int o = __p.__offset(38); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public long MaximumScore { get { int o = __p.__offset(40); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public long PerSecondMinusScore { get { int o = __p.__offset(42); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } @@ -118,7 +118,7 @@ public struct RaidStageExcel : IFlatbufferObject public uint ClearScenarioKey { get { int o = __p.__offset(66); return o != 0 ? __p.bb.GetUint(o + __p.bb_pos) : (uint)0; } } public bool ShowSkillCard { get { int o = __p.__offset(68); return o != 0 ? 0!=__p.bb.Get(o + __p.bb_pos) : (bool)false; } } public uint BossBGInfoKey { get { int o = __p.__offset(70); return o != 0 ? __p.bb.GetUint(o + __p.bb_pos) : (uint)0; } } - public SCHALE.Common.FlatData.EchelonExtensionType EchelonExtensionType { get { int o = __p.__offset(72); return o != 0 ? (SCHALE.Common.FlatData.EchelonExtensionType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.EchelonExtensionType.Base; } } + public SCHALE.Common.FlatData.EchelonExtensionType EchelonExtensionType_ { get { int o = __p.__offset(72); return o != 0 ? (SCHALE.Common.FlatData.EchelonExtensionType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.EchelonExtensionType.Base; } } public static Offset CreateRaidStageExcel(FlatBufferBuilder builder, long Id = 0, @@ -129,7 +129,7 @@ public struct RaidStageExcel : IFlatbufferObject StringOffset BGPathOffset = default(StringOffset), long RaidCharacterId = 0, VectorOffset BossCharacterIdOffset = default(VectorOffset), - SCHALE.Common.FlatData.Difficulty Difficulty = SCHALE.Common.FlatData.Difficulty.Normal, + SCHALE.Common.FlatData.Difficulty Difficulty_ = SCHALE.Common.FlatData.Difficulty.Normal, bool DifficultyOpenCondition = false, long MaxPlayerCount = 0, int RaidRoomLifeTime = 0, @@ -137,7 +137,7 @@ public struct RaidStageExcel : IFlatbufferObject long GroundId = 0, StringOffset GroundDevNameOffset = default(StringOffset), StringOffset EnterTimeLineOffset = default(StringOffset), - SCHALE.Common.FlatData.TacticEnvironment TacticEnvironment = SCHALE.Common.FlatData.TacticEnvironment.None, + SCHALE.Common.FlatData.TacticEnvironment TacticEnvironment_ = SCHALE.Common.FlatData.TacticEnvironment.None, long DefaultClearScore = 0, long MaximumScore = 0, long PerSecondMinusScore = 0, @@ -155,7 +155,7 @@ public struct RaidStageExcel : IFlatbufferObject uint ClearScenarioKey = 0, bool ShowSkillCard = false, uint BossBGInfoKey = 0, - SCHALE.Common.FlatData.EchelonExtensionType EchelonExtensionType = SCHALE.Common.FlatData.EchelonExtensionType.Base) { + SCHALE.Common.FlatData.EchelonExtensionType EchelonExtensionType_ = SCHALE.Common.FlatData.EchelonExtensionType.Base) { builder.StartTable(35); RaidStageExcel.AddTimeLinePhase(builder, TimeLinePhase); RaidStageExcel.AddRaidRewardGroupId(builder, RaidRewardGroupId); @@ -170,7 +170,7 @@ public struct RaidStageExcel : IFlatbufferObject RaidStageExcel.AddMaxPlayerCount(builder, MaxPlayerCount); RaidStageExcel.AddRaidCharacterId(builder, RaidCharacterId); RaidStageExcel.AddId(builder, Id); - RaidStageExcel.AddEchelonExtensionType(builder, EchelonExtensionType); + RaidStageExcel.AddEchelonExtensionType_(builder, EchelonExtensionType_); RaidStageExcel.AddBossBGInfoKey(builder, BossBGInfoKey); RaidStageExcel.AddClearScenarioKey(builder, ClearScenarioKey); RaidStageExcel.AddEnterScenarioKey(builder, EnterScenarioKey); @@ -179,11 +179,11 @@ public struct RaidStageExcel : IFlatbufferObject RaidStageExcel.AddBattleReadyTimelinePhaseEnd(builder, BattleReadyTimelinePhaseEndOffset); RaidStageExcel.AddBattleReadyTimelinePhaseStart(builder, BattleReadyTimelinePhaseStartOffset); RaidStageExcel.AddBattleReadyTimelinePath(builder, BattleReadyTimelinePathOffset); - RaidStageExcel.AddTacticEnvironment(builder, TacticEnvironment); + RaidStageExcel.AddTacticEnvironment_(builder, TacticEnvironment_); RaidStageExcel.AddEnterTimeLine(builder, EnterTimeLineOffset); RaidStageExcel.AddGroundDevName(builder, GroundDevNameOffset); RaidStageExcel.AddRaidRoomLifeTime(builder, RaidRoomLifeTime); - RaidStageExcel.AddDifficulty(builder, Difficulty); + RaidStageExcel.AddDifficulty_(builder, Difficulty_); RaidStageExcel.AddBossCharacterId(builder, BossCharacterIdOffset); RaidStageExcel.AddBGPath(builder, BGPathOffset); RaidStageExcel.AddPortraitPath(builder, PortraitPathOffset); @@ -209,7 +209,7 @@ public struct RaidStageExcel : IFlatbufferObject public static VectorOffset CreateBossCharacterIdVectorBlock(FlatBufferBuilder builder, ArraySegment data) { builder.StartVector(8, data.Count, 8); builder.Add(data); return builder.EndVector(); } public static VectorOffset CreateBossCharacterIdVectorBlock(FlatBufferBuilder builder, IntPtr dataPtr, int sizeInBytes) { builder.StartVector(1, sizeInBytes, 1); builder.Add(dataPtr, sizeInBytes); return builder.EndVector(); } public static void StartBossCharacterIdVector(FlatBufferBuilder builder, int numElems) { builder.StartVector(8, numElems, 8); } - public static void AddDifficulty(FlatBufferBuilder builder, SCHALE.Common.FlatData.Difficulty difficulty) { builder.AddInt(8, (int)difficulty, 0); } + public static void AddDifficulty_(FlatBufferBuilder builder, SCHALE.Common.FlatData.Difficulty difficulty_) { builder.AddInt(8, (int)difficulty_, 0); } public static void AddDifficultyOpenCondition(FlatBufferBuilder builder, bool difficultyOpenCondition) { builder.AddBool(9, difficultyOpenCondition, false); } public static void AddMaxPlayerCount(FlatBufferBuilder builder, long maxPlayerCount) { builder.AddLong(10, maxPlayerCount, 0); } public static void AddRaidRoomLifeTime(FlatBufferBuilder builder, int raidRoomLifeTime) { builder.AddInt(11, raidRoomLifeTime, 0); } @@ -217,7 +217,7 @@ public struct RaidStageExcel : IFlatbufferObject public static void AddGroundId(FlatBufferBuilder builder, long groundId) { builder.AddLong(13, groundId, 0); } public static void AddGroundDevName(FlatBufferBuilder builder, StringOffset groundDevNameOffset) { builder.AddOffset(14, groundDevNameOffset.Value, 0); } public static void AddEnterTimeLine(FlatBufferBuilder builder, StringOffset enterTimeLineOffset) { builder.AddOffset(15, enterTimeLineOffset.Value, 0); } - public static void AddTacticEnvironment(FlatBufferBuilder builder, SCHALE.Common.FlatData.TacticEnvironment tacticEnvironment) { builder.AddInt(16, (int)tacticEnvironment, 0); } + public static void AddTacticEnvironment_(FlatBufferBuilder builder, SCHALE.Common.FlatData.TacticEnvironment tacticEnvironment_) { builder.AddInt(16, (int)tacticEnvironment_, 0); } public static void AddDefaultClearScore(FlatBufferBuilder builder, long defaultClearScore) { builder.AddLong(17, defaultClearScore, 0); } public static void AddMaximumScore(FlatBufferBuilder builder, long maximumScore) { builder.AddLong(18, maximumScore, 0); } public static void AddPerSecondMinusScore(FlatBufferBuilder builder, long perSecondMinusScore) { builder.AddLong(19, perSecondMinusScore, 0); } @@ -250,7 +250,7 @@ public struct RaidStageExcel : IFlatbufferObject public static void AddClearScenarioKey(FlatBufferBuilder builder, uint clearScenarioKey) { builder.AddUint(31, clearScenarioKey, 0); } public static void AddShowSkillCard(FlatBufferBuilder builder, bool showSkillCard) { builder.AddBool(32, showSkillCard, false); } public static void AddBossBGInfoKey(FlatBufferBuilder builder, uint bossBGInfoKey) { builder.AddUint(33, bossBGInfoKey, 0); } - public static void AddEchelonExtensionType(FlatBufferBuilder builder, SCHALE.Common.FlatData.EchelonExtensionType echelonExtensionType) { builder.AddInt(34, (int)echelonExtensionType, 0); } + public static void AddEchelonExtensionType_(FlatBufferBuilder builder, SCHALE.Common.FlatData.EchelonExtensionType echelonExtensionType_) { builder.AddInt(34, (int)echelonExtensionType_, 0); } public static Offset EndRaidStageExcel(FlatBufferBuilder builder) { int o = builder.EndTable(); return new Offset(o); @@ -271,7 +271,7 @@ public struct RaidStageExcel : IFlatbufferObject _o.RaidCharacterId = TableEncryptionService.Convert(this.RaidCharacterId, key); _o.BossCharacterId = new List(); for (var _j = 0; _j < this.BossCharacterIdLength; ++_j) {_o.BossCharacterId.Add(TableEncryptionService.Convert(this.BossCharacterId(_j), key));} - _o.Difficulty = TableEncryptionService.Convert(this.Difficulty, key); + _o.Difficulty_ = TableEncryptionService.Convert(this.Difficulty_, key); _o.DifficultyOpenCondition = TableEncryptionService.Convert(this.DifficultyOpenCondition, key); _o.MaxPlayerCount = TableEncryptionService.Convert(this.MaxPlayerCount, key); _o.RaidRoomLifeTime = TableEncryptionService.Convert(this.RaidRoomLifeTime, key); @@ -279,7 +279,7 @@ public struct RaidStageExcel : IFlatbufferObject _o.GroundId = TableEncryptionService.Convert(this.GroundId, key); _o.GroundDevName = TableEncryptionService.Convert(this.GroundDevName, key); _o.EnterTimeLine = TableEncryptionService.Convert(this.EnterTimeLine, key); - _o.TacticEnvironment = TableEncryptionService.Convert(this.TacticEnvironment, key); + _o.TacticEnvironment_ = TableEncryptionService.Convert(this.TacticEnvironment_, key); _o.DefaultClearScore = TableEncryptionService.Convert(this.DefaultClearScore, key); _o.MaximumScore = TableEncryptionService.Convert(this.MaximumScore, key); _o.PerSecondMinusScore = TableEncryptionService.Convert(this.PerSecondMinusScore, key); @@ -300,7 +300,7 @@ public struct RaidStageExcel : IFlatbufferObject _o.ClearScenarioKey = TableEncryptionService.Convert(this.ClearScenarioKey, key); _o.ShowSkillCard = TableEncryptionService.Convert(this.ShowSkillCard, key); _o.BossBGInfoKey = TableEncryptionService.Convert(this.BossBGInfoKey, key); - _o.EchelonExtensionType = TableEncryptionService.Convert(this.EchelonExtensionType, key); + _o.EchelonExtensionType_ = TableEncryptionService.Convert(this.EchelonExtensionType_, key); } public static Offset Pack(FlatBufferBuilder builder, RaidStageExcelT _o) { if (_o == null) return default(Offset); @@ -342,7 +342,7 @@ public struct RaidStageExcel : IFlatbufferObject _BGPath, _o.RaidCharacterId, _BossCharacterId, - _o.Difficulty, + _o.Difficulty_, _o.DifficultyOpenCondition, _o.MaxPlayerCount, _o.RaidRoomLifeTime, @@ -350,7 +350,7 @@ public struct RaidStageExcel : IFlatbufferObject _o.GroundId, _GroundDevName, _EnterTimeLine, - _o.TacticEnvironment, + _o.TacticEnvironment_, _o.DefaultClearScore, _o.MaximumScore, _o.PerSecondMinusScore, @@ -368,7 +368,7 @@ public struct RaidStageExcel : IFlatbufferObject _o.ClearScenarioKey, _o.ShowSkillCard, _o.BossBGInfoKey, - _o.EchelonExtensionType); + _o.EchelonExtensionType_); } } @@ -382,7 +382,7 @@ public class RaidStageExcelT public string BGPath { get; set; } public long RaidCharacterId { get; set; } public List BossCharacterId { get; set; } - public SCHALE.Common.FlatData.Difficulty Difficulty { get; set; } + public SCHALE.Common.FlatData.Difficulty Difficulty_ { get; set; } public bool DifficultyOpenCondition { get; set; } public long MaxPlayerCount { get; set; } public int RaidRoomLifeTime { get; set; } @@ -390,7 +390,7 @@ public class RaidStageExcelT public long GroundId { get; set; } public string GroundDevName { get; set; } public string EnterTimeLine { get; set; } - public SCHALE.Common.FlatData.TacticEnvironment TacticEnvironment { get; set; } + public SCHALE.Common.FlatData.TacticEnvironment TacticEnvironment_ { get; set; } public long DefaultClearScore { get; set; } public long MaximumScore { get; set; } public long PerSecondMinusScore { get; set; } @@ -408,7 +408,7 @@ public class RaidStageExcelT public uint ClearScenarioKey { get; set; } public bool ShowSkillCard { get; set; } public uint BossBGInfoKey { get; set; } - public SCHALE.Common.FlatData.EchelonExtensionType EchelonExtensionType { get; set; } + public SCHALE.Common.FlatData.EchelonExtensionType EchelonExtensionType_ { get; set; } public RaidStageExcelT() { this.Id = 0; @@ -419,7 +419,7 @@ public class RaidStageExcelT this.BGPath = null; this.RaidCharacterId = 0; this.BossCharacterId = null; - this.Difficulty = SCHALE.Common.FlatData.Difficulty.Normal; + this.Difficulty_ = SCHALE.Common.FlatData.Difficulty.Normal; this.DifficultyOpenCondition = false; this.MaxPlayerCount = 0; this.RaidRoomLifeTime = 0; @@ -427,7 +427,7 @@ public class RaidStageExcelT this.GroundId = 0; this.GroundDevName = null; this.EnterTimeLine = null; - this.TacticEnvironment = SCHALE.Common.FlatData.TacticEnvironment.None; + this.TacticEnvironment_ = SCHALE.Common.FlatData.TacticEnvironment.None; this.DefaultClearScore = 0; this.MaximumScore = 0; this.PerSecondMinusScore = 0; @@ -445,7 +445,7 @@ public class RaidStageExcelT this.ClearScenarioKey = 0; this.ShowSkillCard = false; this.BossBGInfoKey = 0; - this.EchelonExtensionType = SCHALE.Common.FlatData.EchelonExtensionType.Base; + this.EchelonExtensionType_ = SCHALE.Common.FlatData.EchelonExtensionType.Base; } } @@ -463,7 +463,7 @@ static public class RaidStageExcelVerify && verifier.VerifyString(tablePos, 14 /*BGPath*/, false) && verifier.VerifyField(tablePos, 16 /*RaidCharacterId*/, 8 /*long*/, 8, false) && verifier.VerifyVectorOfData(tablePos, 18 /*BossCharacterId*/, 8 /*long*/, false) - && verifier.VerifyField(tablePos, 20 /*Difficulty*/, 4 /*SCHALE.Common.FlatData.Difficulty*/, 4, false) + && verifier.VerifyField(tablePos, 20 /*Difficulty_*/, 4 /*SCHALE.Common.FlatData.Difficulty*/, 4, false) && verifier.VerifyField(tablePos, 22 /*DifficultyOpenCondition*/, 1 /*bool*/, 1, false) && verifier.VerifyField(tablePos, 24 /*MaxPlayerCount*/, 8 /*long*/, 8, false) && verifier.VerifyField(tablePos, 26 /*RaidRoomLifeTime*/, 4 /*int*/, 4, false) @@ -471,7 +471,7 @@ static public class RaidStageExcelVerify && verifier.VerifyField(tablePos, 30 /*GroundId*/, 8 /*long*/, 8, false) && verifier.VerifyString(tablePos, 32 /*GroundDevName*/, false) && verifier.VerifyString(tablePos, 34 /*EnterTimeLine*/, false) - && verifier.VerifyField(tablePos, 36 /*TacticEnvironment*/, 4 /*SCHALE.Common.FlatData.TacticEnvironment*/, 4, false) + && verifier.VerifyField(tablePos, 36 /*TacticEnvironment_*/, 4 /*SCHALE.Common.FlatData.TacticEnvironment*/, 4, false) && verifier.VerifyField(tablePos, 38 /*DefaultClearScore*/, 8 /*long*/, 8, false) && verifier.VerifyField(tablePos, 40 /*MaximumScore*/, 8 /*long*/, 8, false) && verifier.VerifyField(tablePos, 42 /*PerSecondMinusScore*/, 8 /*long*/, 8, false) @@ -489,7 +489,7 @@ static public class RaidStageExcelVerify && verifier.VerifyField(tablePos, 66 /*ClearScenarioKey*/, 4 /*uint*/, 4, false) && verifier.VerifyField(tablePos, 68 /*ShowSkillCard*/, 1 /*bool*/, 1, false) && verifier.VerifyField(tablePos, 70 /*BossBGInfoKey*/, 4 /*uint*/, 4, false) - && verifier.VerifyField(tablePos, 72 /*EchelonExtensionType*/, 4 /*SCHALE.Common.FlatData.EchelonExtensionType*/, 4, false) + && verifier.VerifyField(tablePos, 72 /*EchelonExtensionType_*/, 4 /*SCHALE.Common.FlatData.EchelonExtensionType*/, 4, false) && verifier.VerifyTableEnd(tablePos); } } diff --git a/SCHALE.Common/FlatData/RecipeCraftExcel.cs b/SCHALE.Common/FlatData/RecipeCraftExcel.cs index f137960..178486a 100644 --- a/SCHALE.Common/FlatData/RecipeCraftExcel.cs +++ b/SCHALE.Common/FlatData/RecipeCraftExcel.cs @@ -28,7 +28,7 @@ public struct RecipeCraftExcel : IFlatbufferObject public ArraySegment? GetDevNameBytes() { return __p.__vector_as_arraysegment(6); } #endif public byte[] GetDevNameArray() { return __p.__vector_as_array(6); } - public SCHALE.Common.FlatData.RecipeType RecipeType { get { int o = __p.__offset(8); return o != 0 ? (SCHALE.Common.FlatData.RecipeType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.RecipeType.None; } } + public SCHALE.Common.FlatData.RecipeType RecipeType_ { get { int o = __p.__offset(8); return o != 0 ? (SCHALE.Common.FlatData.RecipeType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.RecipeType.None; } } public long RecipeIngredientId { get { int o = __p.__offset(10); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public string RecipeIngredientDevName { get { int o = __p.__offset(12); return o != 0 ? __p.__string(o + __p.bb_pos) : null; } } #if ENABLE_SPAN_T @@ -75,7 +75,7 @@ public struct RecipeCraftExcel : IFlatbufferObject public static Offset CreateRecipeCraftExcel(FlatBufferBuilder builder, long Id = 0, StringOffset DevNameOffset = default(StringOffset), - SCHALE.Common.FlatData.RecipeType RecipeType = SCHALE.Common.FlatData.RecipeType.None, + SCHALE.Common.FlatData.RecipeType RecipeType_ = SCHALE.Common.FlatData.RecipeType.None, long RecipeIngredientId = 0, StringOffset RecipeIngredientDevNameOffset = default(StringOffset), VectorOffset ParcelType_Offset = default(VectorOffset), @@ -92,7 +92,7 @@ public struct RecipeCraftExcel : IFlatbufferObject RecipeCraftExcel.AddParcelId(builder, ParcelIdOffset); RecipeCraftExcel.AddParcelType_(builder, ParcelType_Offset); RecipeCraftExcel.AddRecipeIngredientDevName(builder, RecipeIngredientDevNameOffset); - RecipeCraftExcel.AddRecipeType(builder, RecipeType); + RecipeCraftExcel.AddRecipeType_(builder, RecipeType_); RecipeCraftExcel.AddDevName(builder, DevNameOffset); return RecipeCraftExcel.EndRecipeCraftExcel(builder); } @@ -100,7 +100,7 @@ public struct RecipeCraftExcel : IFlatbufferObject public static void StartRecipeCraftExcel(FlatBufferBuilder builder) { builder.StartTable(10); } public static void AddId(FlatBufferBuilder builder, long id) { builder.AddLong(0, id, 0); } public static void AddDevName(FlatBufferBuilder builder, StringOffset devNameOffset) { builder.AddOffset(1, devNameOffset.Value, 0); } - public static void AddRecipeType(FlatBufferBuilder builder, SCHALE.Common.FlatData.RecipeType recipeType) { builder.AddInt(2, (int)recipeType, 0); } + public static void AddRecipeType_(FlatBufferBuilder builder, SCHALE.Common.FlatData.RecipeType recipeType_) { builder.AddInt(2, (int)recipeType_, 0); } public static void AddRecipeIngredientId(FlatBufferBuilder builder, long recipeIngredientId) { builder.AddLong(3, recipeIngredientId, 0); } public static void AddRecipeIngredientDevName(FlatBufferBuilder builder, StringOffset recipeIngredientDevNameOffset) { builder.AddOffset(4, recipeIngredientDevNameOffset.Value, 0); } public static void AddParcelType_(FlatBufferBuilder builder, VectorOffset parcelType_Offset) { builder.AddOffset(5, parcelType_Offset.Value, 0); } @@ -146,7 +146,7 @@ public struct RecipeCraftExcel : IFlatbufferObject byte[] key = TableEncryptionService.CreateKey("RecipeCraft"); _o.Id = TableEncryptionService.Convert(this.Id, key); _o.DevName = TableEncryptionService.Convert(this.DevName, key); - _o.RecipeType = TableEncryptionService.Convert(this.RecipeType, key); + _o.RecipeType_ = TableEncryptionService.Convert(this.RecipeType_, key); _o.RecipeIngredientId = TableEncryptionService.Convert(this.RecipeIngredientId, key); _o.RecipeIngredientDevName = TableEncryptionService.Convert(this.RecipeIngredientDevName, key); _o.ParcelType_ = new List(); @@ -194,7 +194,7 @@ public struct RecipeCraftExcel : IFlatbufferObject builder, _o.Id, _DevName, - _o.RecipeType, + _o.RecipeType_, _o.RecipeIngredientId, _RecipeIngredientDevName, _ParcelType_, @@ -209,7 +209,7 @@ public class RecipeCraftExcelT { public long Id { get; set; } public string DevName { get; set; } - public SCHALE.Common.FlatData.RecipeType RecipeType { get; set; } + public SCHALE.Common.FlatData.RecipeType RecipeType_ { get; set; } public long RecipeIngredientId { get; set; } public string RecipeIngredientDevName { get; set; } public List ParcelType_ { get; set; } @@ -221,7 +221,7 @@ public class RecipeCraftExcelT public RecipeCraftExcelT() { this.Id = 0; this.DevName = null; - this.RecipeType = SCHALE.Common.FlatData.RecipeType.None; + this.RecipeType_ = SCHALE.Common.FlatData.RecipeType.None; this.RecipeIngredientId = 0; this.RecipeIngredientDevName = null; this.ParcelType_ = null; @@ -240,7 +240,7 @@ static public class RecipeCraftExcelVerify return verifier.VerifyTableStart(tablePos) && verifier.VerifyField(tablePos, 4 /*Id*/, 8 /*long*/, 8, false) && verifier.VerifyString(tablePos, 6 /*DevName*/, false) - && verifier.VerifyField(tablePos, 8 /*RecipeType*/, 4 /*SCHALE.Common.FlatData.RecipeType*/, 4, false) + && verifier.VerifyField(tablePos, 8 /*RecipeType_*/, 4 /*SCHALE.Common.FlatData.RecipeType*/, 4, false) && verifier.VerifyField(tablePos, 10 /*RecipeIngredientId*/, 8 /*long*/, 8, false) && verifier.VerifyString(tablePos, 12 /*RecipeIngredientDevName*/, false) && verifier.VerifyVectorOfData(tablePos, 14 /*ParcelType_*/, 4 /*SCHALE.Common.FlatData.ParcelType*/, false) diff --git a/SCHALE.Common/FlatData/RecipeExcel.cs b/SCHALE.Common/FlatData/RecipeExcel.cs index 6c52299..6b618a2 100644 --- a/SCHALE.Common/FlatData/RecipeExcel.cs +++ b/SCHALE.Common/FlatData/RecipeExcel.cs @@ -21,7 +21,7 @@ public struct RecipeExcel : IFlatbufferObject public RecipeExcel __assign(int _i, ByteBuffer _bb) { __init(_i, _bb); return this; } public long Id { get { int o = __p.__offset(4); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } - public SCHALE.Common.FlatData.RecipeType RecipeType { get { int o = __p.__offset(6); return o != 0 ? (SCHALE.Common.FlatData.RecipeType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.RecipeType.None; } } + public SCHALE.Common.FlatData.RecipeType RecipeType_ { get { int o = __p.__offset(6); return o != 0 ? (SCHALE.Common.FlatData.RecipeType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.RecipeType.None; } } public long RecipeIngredientId { get { int o = __p.__offset(8); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public long RecipeSelectionGroupId { get { int o = __p.__offset(10); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public SCHALE.Common.FlatData.ParcelType ParcelType_(int j) { int o = __p.__offset(12); return o != 0 ? (SCHALE.Common.FlatData.ParcelType)__p.bb.GetInt(__p.__vector(o) + j * 4) : (SCHALE.Common.FlatData.ParcelType)0; } @@ -59,7 +59,7 @@ public struct RecipeExcel : IFlatbufferObject public static Offset CreateRecipeExcel(FlatBufferBuilder builder, long Id = 0, - SCHALE.Common.FlatData.RecipeType RecipeType = SCHALE.Common.FlatData.RecipeType.None, + SCHALE.Common.FlatData.RecipeType RecipeType_ = SCHALE.Common.FlatData.RecipeType.None, long RecipeIngredientId = 0, long RecipeSelectionGroupId = 0, VectorOffset ParcelType_Offset = default(VectorOffset), @@ -74,13 +74,13 @@ public struct RecipeExcel : IFlatbufferObject RecipeExcel.AddResultAmountMin(builder, ResultAmountMinOffset); RecipeExcel.AddParcelId(builder, ParcelIdOffset); RecipeExcel.AddParcelType_(builder, ParcelType_Offset); - RecipeExcel.AddRecipeType(builder, RecipeType); + RecipeExcel.AddRecipeType_(builder, RecipeType_); return RecipeExcel.EndRecipeExcel(builder); } public static void StartRecipeExcel(FlatBufferBuilder builder) { builder.StartTable(8); } public static void AddId(FlatBufferBuilder builder, long id) { builder.AddLong(0, id, 0); } - public static void AddRecipeType(FlatBufferBuilder builder, SCHALE.Common.FlatData.RecipeType recipeType) { builder.AddInt(1, (int)recipeType, 0); } + public static void AddRecipeType_(FlatBufferBuilder builder, SCHALE.Common.FlatData.RecipeType recipeType_) { builder.AddInt(1, (int)recipeType_, 0); } public static void AddRecipeIngredientId(FlatBufferBuilder builder, long recipeIngredientId) { builder.AddLong(2, recipeIngredientId, 0); } public static void AddRecipeSelectionGroupId(FlatBufferBuilder builder, long recipeSelectionGroupId) { builder.AddLong(3, recipeSelectionGroupId, 0); } public static void AddParcelType_(FlatBufferBuilder builder, VectorOffset parcelType_Offset) { builder.AddOffset(4, parcelType_Offset.Value, 0); } @@ -119,7 +119,7 @@ public struct RecipeExcel : IFlatbufferObject public void UnPackTo(RecipeExcelT _o) { byte[] key = TableEncryptionService.CreateKey("Recipe"); _o.Id = TableEncryptionService.Convert(this.Id, key); - _o.RecipeType = TableEncryptionService.Convert(this.RecipeType, key); + _o.RecipeType_ = TableEncryptionService.Convert(this.RecipeType_, key); _o.RecipeIngredientId = TableEncryptionService.Convert(this.RecipeIngredientId, key); _o.RecipeSelectionGroupId = TableEncryptionService.Convert(this.RecipeSelectionGroupId, key); _o.ParcelType_ = new List(); @@ -156,7 +156,7 @@ public struct RecipeExcel : IFlatbufferObject return CreateRecipeExcel( builder, _o.Id, - _o.RecipeType, + _o.RecipeType_, _o.RecipeIngredientId, _o.RecipeSelectionGroupId, _ParcelType_, @@ -169,7 +169,7 @@ public struct RecipeExcel : IFlatbufferObject public class RecipeExcelT { public long Id { get; set; } - public SCHALE.Common.FlatData.RecipeType RecipeType { get; set; } + public SCHALE.Common.FlatData.RecipeType RecipeType_ { get; set; } public long RecipeIngredientId { get; set; } public long RecipeSelectionGroupId { get; set; } public List ParcelType_ { get; set; } @@ -179,7 +179,7 @@ public class RecipeExcelT public RecipeExcelT() { this.Id = 0; - this.RecipeType = SCHALE.Common.FlatData.RecipeType.None; + this.RecipeType_ = SCHALE.Common.FlatData.RecipeType.None; this.RecipeIngredientId = 0; this.RecipeSelectionGroupId = 0; this.ParcelType_ = null; @@ -196,7 +196,7 @@ static public class RecipeExcelVerify { return verifier.VerifyTableStart(tablePos) && verifier.VerifyField(tablePos, 4 /*Id*/, 8 /*long*/, 8, false) - && verifier.VerifyField(tablePos, 6 /*RecipeType*/, 4 /*SCHALE.Common.FlatData.RecipeType*/, 4, false) + && verifier.VerifyField(tablePos, 6 /*RecipeType_*/, 4 /*SCHALE.Common.FlatData.RecipeType*/, 4, false) && verifier.VerifyField(tablePos, 8 /*RecipeIngredientId*/, 8 /*long*/, 8, false) && verifier.VerifyField(tablePos, 10 /*RecipeSelectionGroupId*/, 8 /*long*/, 8, false) && verifier.VerifyVectorOfData(tablePos, 12 /*ParcelType_*/, 4 /*SCHALE.Common.FlatData.ParcelType*/, false) diff --git a/SCHALE.Common/FlatData/RecipeIngredientExcel.cs b/SCHALE.Common/FlatData/RecipeIngredientExcel.cs index 8d02d30..a4b574d 100644 --- a/SCHALE.Common/FlatData/RecipeIngredientExcel.cs +++ b/SCHALE.Common/FlatData/RecipeIngredientExcel.cs @@ -21,7 +21,7 @@ public struct RecipeIngredientExcel : IFlatbufferObject public RecipeIngredientExcel __assign(int _i, ByteBuffer _bb) { __init(_i, _bb); return this; } public long Id { get { int o = __p.__offset(4); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } - public SCHALE.Common.FlatData.RecipeType RecipeType { get { int o = __p.__offset(6); return o != 0 ? (SCHALE.Common.FlatData.RecipeType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.RecipeType.None; } } + public SCHALE.Common.FlatData.RecipeType RecipeType_ { get { int o = __p.__offset(6); return o != 0 ? (SCHALE.Common.FlatData.RecipeType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.RecipeType.None; } } public SCHALE.Common.FlatData.ParcelType CostParcelType(int j) { int o = __p.__offset(8); return o != 0 ? (SCHALE.Common.FlatData.ParcelType)__p.bb.GetInt(__p.__vector(o) + j * 4) : (SCHALE.Common.FlatData.ParcelType)0; } public int CostParcelTypeLength { get { int o = __p.__offset(8); return o != 0 ? __p.__vector_len(o) : 0; } } #if ENABLE_SPAN_T @@ -74,7 +74,7 @@ public struct RecipeIngredientExcel : IFlatbufferObject public static Offset CreateRecipeIngredientExcel(FlatBufferBuilder builder, long Id = 0, - SCHALE.Common.FlatData.RecipeType RecipeType = SCHALE.Common.FlatData.RecipeType.None, + SCHALE.Common.FlatData.RecipeType RecipeType_ = SCHALE.Common.FlatData.RecipeType.None, VectorOffset CostParcelTypeOffset = default(VectorOffset), VectorOffset CostIdOffset = default(VectorOffset), VectorOffset CostAmountOffset = default(VectorOffset), @@ -91,13 +91,13 @@ public struct RecipeIngredientExcel : IFlatbufferObject RecipeIngredientExcel.AddCostAmount(builder, CostAmountOffset); RecipeIngredientExcel.AddCostId(builder, CostIdOffset); RecipeIngredientExcel.AddCostParcelType(builder, CostParcelTypeOffset); - RecipeIngredientExcel.AddRecipeType(builder, RecipeType); + RecipeIngredientExcel.AddRecipeType_(builder, RecipeType_); return RecipeIngredientExcel.EndRecipeIngredientExcel(builder); } public static void StartRecipeIngredientExcel(FlatBufferBuilder builder) { builder.StartTable(9); } public static void AddId(FlatBufferBuilder builder, long id) { builder.AddLong(0, id, 0); } - public static void AddRecipeType(FlatBufferBuilder builder, SCHALE.Common.FlatData.RecipeType recipeType) { builder.AddInt(1, (int)recipeType, 0); } + public static void AddRecipeType_(FlatBufferBuilder builder, SCHALE.Common.FlatData.RecipeType recipeType_) { builder.AddInt(1, (int)recipeType_, 0); } public static void AddCostParcelType(FlatBufferBuilder builder, VectorOffset costParcelTypeOffset) { builder.AddOffset(2, costParcelTypeOffset.Value, 0); } public static VectorOffset CreateCostParcelTypeVector(FlatBufferBuilder builder, SCHALE.Common.FlatData.ParcelType[] data) { builder.StartVector(4, data.Length, 4); for (int i = data.Length - 1; i >= 0; i--) builder.AddInt((int)data[i]); return builder.EndVector(); } public static VectorOffset CreateCostParcelTypeVectorBlock(FlatBufferBuilder builder, SCHALE.Common.FlatData.ParcelType[] data) { builder.StartVector(4, data.Length, 4); builder.Add(data); return builder.EndVector(); } @@ -147,7 +147,7 @@ public struct RecipeIngredientExcel : IFlatbufferObject public void UnPackTo(RecipeIngredientExcelT _o) { byte[] key = TableEncryptionService.CreateKey("RecipeIngredient"); _o.Id = TableEncryptionService.Convert(this.Id, key); - _o.RecipeType = TableEncryptionService.Convert(this.RecipeType, key); + _o.RecipeType_ = TableEncryptionService.Convert(this.RecipeType_, key); _o.CostParcelType = new List(); for (var _j = 0; _j < this.CostParcelTypeLength; ++_j) {_o.CostParcelType.Add(TableEncryptionService.Convert(this.CostParcelType(_j), key));} _o.CostId = new List(); @@ -197,7 +197,7 @@ public struct RecipeIngredientExcel : IFlatbufferObject return CreateRecipeIngredientExcel( builder, _o.Id, - _o.RecipeType, + _o.RecipeType_, _CostParcelType, _CostId, _CostAmount, @@ -211,7 +211,7 @@ public struct RecipeIngredientExcel : IFlatbufferObject public class RecipeIngredientExcelT { public long Id { get; set; } - public SCHALE.Common.FlatData.RecipeType RecipeType { get; set; } + public SCHALE.Common.FlatData.RecipeType RecipeType_ { get; set; } public List CostParcelType { get; set; } public List CostId { get; set; } public List CostAmount { get; set; } @@ -222,7 +222,7 @@ public class RecipeIngredientExcelT public RecipeIngredientExcelT() { this.Id = 0; - this.RecipeType = SCHALE.Common.FlatData.RecipeType.None; + this.RecipeType_ = SCHALE.Common.FlatData.RecipeType.None; this.CostParcelType = null; this.CostId = null; this.CostAmount = null; @@ -240,7 +240,7 @@ static public class RecipeIngredientExcelVerify { return verifier.VerifyTableStart(tablePos) && verifier.VerifyField(tablePos, 4 /*Id*/, 8 /*long*/, 8, false) - && verifier.VerifyField(tablePos, 6 /*RecipeType*/, 4 /*SCHALE.Common.FlatData.RecipeType*/, 4, false) + && verifier.VerifyField(tablePos, 6 /*RecipeType_*/, 4 /*SCHALE.Common.FlatData.RecipeType*/, 4, false) && verifier.VerifyVectorOfData(tablePos, 8 /*CostParcelType*/, 4 /*SCHALE.Common.FlatData.ParcelType*/, false) && verifier.VerifyVectorOfData(tablePos, 10 /*CostId*/, 8 /*long*/, false) && verifier.VerifyVectorOfData(tablePos, 12 /*CostAmount*/, 8 /*long*/, false) diff --git a/SCHALE.Common/FlatData/RecipeSelectionAutoUseExcel.cs b/SCHALE.Common/FlatData/RecipeSelectionAutoUseExcel.cs index d0235fa..1e14b4e 100644 --- a/SCHALE.Common/FlatData/RecipeSelectionAutoUseExcel.cs +++ b/SCHALE.Common/FlatData/RecipeSelectionAutoUseExcel.cs @@ -21,7 +21,7 @@ public struct RecipeSelectionAutoUseExcel : IFlatbufferObject public RecipeSelectionAutoUseExcel __assign(int _i, ByteBuffer _bb) { __init(_i, _bb); return this; } public long Id { get { int o = __p.__offset(4); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } - public SCHALE.Common.FlatData.ParcelType ParcelType { get { int o = __p.__offset(6); return o != 0 ? (SCHALE.Common.FlatData.ParcelType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.ParcelType.None; } } + public SCHALE.Common.FlatData.ParcelType ParcelType_ { get { int o = __p.__offset(6); return o != 0 ? (SCHALE.Common.FlatData.ParcelType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.ParcelType.None; } } public long TargetItemId { get { int o = __p.__offset(8); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public long Priority(int j) { int o = __p.__offset(10); return o != 0 ? __p.bb.GetLong(__p.__vector(o) + j * 8) : (long)0; } public int PriorityLength { get { int o = __p.__offset(10); return o != 0 ? __p.__vector_len(o) : 0; } } @@ -34,20 +34,20 @@ public struct RecipeSelectionAutoUseExcel : IFlatbufferObject public static Offset CreateRecipeSelectionAutoUseExcel(FlatBufferBuilder builder, long Id = 0, - SCHALE.Common.FlatData.ParcelType ParcelType = SCHALE.Common.FlatData.ParcelType.None, + SCHALE.Common.FlatData.ParcelType ParcelType_ = SCHALE.Common.FlatData.ParcelType.None, long TargetItemId = 0, VectorOffset PriorityOffset = default(VectorOffset)) { builder.StartTable(4); RecipeSelectionAutoUseExcel.AddTargetItemId(builder, TargetItemId); RecipeSelectionAutoUseExcel.AddId(builder, Id); RecipeSelectionAutoUseExcel.AddPriority(builder, PriorityOffset); - RecipeSelectionAutoUseExcel.AddParcelType(builder, ParcelType); + RecipeSelectionAutoUseExcel.AddParcelType_(builder, ParcelType_); return RecipeSelectionAutoUseExcel.EndRecipeSelectionAutoUseExcel(builder); } public static void StartRecipeSelectionAutoUseExcel(FlatBufferBuilder builder) { builder.StartTable(4); } public static void AddId(FlatBufferBuilder builder, long id) { builder.AddLong(0, id, 0); } - public static void AddParcelType(FlatBufferBuilder builder, SCHALE.Common.FlatData.ParcelType parcelType) { builder.AddInt(1, (int)parcelType, 0); } + public static void AddParcelType_(FlatBufferBuilder builder, SCHALE.Common.FlatData.ParcelType parcelType_) { builder.AddInt(1, (int)parcelType_, 0); } public static void AddTargetItemId(FlatBufferBuilder builder, long targetItemId) { builder.AddLong(2, targetItemId, 0); } public static void AddPriority(FlatBufferBuilder builder, VectorOffset priorityOffset) { builder.AddOffset(3, priorityOffset.Value, 0); } public static VectorOffset CreatePriorityVector(FlatBufferBuilder builder, long[] data) { builder.StartVector(8, data.Length, 8); for (int i = data.Length - 1; i >= 0; i--) builder.AddLong(data[i]); return builder.EndVector(); } @@ -67,7 +67,7 @@ public struct RecipeSelectionAutoUseExcel : IFlatbufferObject public void UnPackTo(RecipeSelectionAutoUseExcelT _o) { byte[] key = TableEncryptionService.CreateKey("RecipeSelectionAutoUse"); _o.Id = TableEncryptionService.Convert(this.Id, key); - _o.ParcelType = TableEncryptionService.Convert(this.ParcelType, key); + _o.ParcelType_ = TableEncryptionService.Convert(this.ParcelType_, key); _o.TargetItemId = TableEncryptionService.Convert(this.TargetItemId, key); _o.Priority = new List(); for (var _j = 0; _j < this.PriorityLength; ++_j) {_o.Priority.Add(TableEncryptionService.Convert(this.Priority(_j), key));} @@ -82,7 +82,7 @@ public struct RecipeSelectionAutoUseExcel : IFlatbufferObject return CreateRecipeSelectionAutoUseExcel( builder, _o.Id, - _o.ParcelType, + _o.ParcelType_, _o.TargetItemId, _Priority); } @@ -91,13 +91,13 @@ public struct RecipeSelectionAutoUseExcel : IFlatbufferObject public class RecipeSelectionAutoUseExcelT { public long Id { get; set; } - public SCHALE.Common.FlatData.ParcelType ParcelType { get; set; } + public SCHALE.Common.FlatData.ParcelType ParcelType_ { get; set; } public long TargetItemId { get; set; } public List Priority { get; set; } public RecipeSelectionAutoUseExcelT() { this.Id = 0; - this.ParcelType = SCHALE.Common.FlatData.ParcelType.None; + this.ParcelType_ = SCHALE.Common.FlatData.ParcelType.None; this.TargetItemId = 0; this.Priority = null; } @@ -110,7 +110,7 @@ static public class RecipeSelectionAutoUseExcelVerify { return verifier.VerifyTableStart(tablePos) && verifier.VerifyField(tablePos, 4 /*Id*/, 8 /*long*/, 8, false) - && verifier.VerifyField(tablePos, 6 /*ParcelType*/, 4 /*SCHALE.Common.FlatData.ParcelType*/, 4, false) + && verifier.VerifyField(tablePos, 6 /*ParcelType_*/, 4 /*SCHALE.Common.FlatData.ParcelType*/, 4, false) && verifier.VerifyField(tablePos, 8 /*TargetItemId*/, 8 /*long*/, 8, false) && verifier.VerifyVectorOfData(tablePos, 10 /*Priority*/, 8 /*long*/, false) && verifier.VerifyTableEnd(tablePos); diff --git a/SCHALE.Common/FlatData/RecipeSelectionGroupExcel.cs b/SCHALE.Common/FlatData/RecipeSelectionGroupExcel.cs index 7742857..6a354fd 100644 --- a/SCHALE.Common/FlatData/RecipeSelectionGroupExcel.cs +++ b/SCHALE.Common/FlatData/RecipeSelectionGroupExcel.cs @@ -22,7 +22,7 @@ public struct RecipeSelectionGroupExcel : IFlatbufferObject public long RecipeSelectionGroupId { get { int o = __p.__offset(4); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public long RecipeSelectionGroupComponentId { get { int o = __p.__offset(6); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } - public SCHALE.Common.FlatData.ParcelType ParcelType { get { int o = __p.__offset(8); return o != 0 ? (SCHALE.Common.FlatData.ParcelType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.ParcelType.None; } } + public SCHALE.Common.FlatData.ParcelType ParcelType_ { get { int o = __p.__offset(8); return o != 0 ? (SCHALE.Common.FlatData.ParcelType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.ParcelType.None; } } public long ParcelId { get { int o = __p.__offset(10); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public long ResultAmountMin { get { int o = __p.__offset(12); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public long ResultAmountMax { get { int o = __p.__offset(14); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } @@ -30,7 +30,7 @@ public struct RecipeSelectionGroupExcel : IFlatbufferObject public static Offset CreateRecipeSelectionGroupExcel(FlatBufferBuilder builder, long RecipeSelectionGroupId = 0, long RecipeSelectionGroupComponentId = 0, - SCHALE.Common.FlatData.ParcelType ParcelType = SCHALE.Common.FlatData.ParcelType.None, + SCHALE.Common.FlatData.ParcelType ParcelType_ = SCHALE.Common.FlatData.ParcelType.None, long ParcelId = 0, long ResultAmountMin = 0, long ResultAmountMax = 0) { @@ -40,14 +40,14 @@ public struct RecipeSelectionGroupExcel : IFlatbufferObject RecipeSelectionGroupExcel.AddParcelId(builder, ParcelId); RecipeSelectionGroupExcel.AddRecipeSelectionGroupComponentId(builder, RecipeSelectionGroupComponentId); RecipeSelectionGroupExcel.AddRecipeSelectionGroupId(builder, RecipeSelectionGroupId); - RecipeSelectionGroupExcel.AddParcelType(builder, ParcelType); + RecipeSelectionGroupExcel.AddParcelType_(builder, ParcelType_); return RecipeSelectionGroupExcel.EndRecipeSelectionGroupExcel(builder); } public static void StartRecipeSelectionGroupExcel(FlatBufferBuilder builder) { builder.StartTable(6); } public static void AddRecipeSelectionGroupId(FlatBufferBuilder builder, long recipeSelectionGroupId) { builder.AddLong(0, recipeSelectionGroupId, 0); } public static void AddRecipeSelectionGroupComponentId(FlatBufferBuilder builder, long recipeSelectionGroupComponentId) { builder.AddLong(1, recipeSelectionGroupComponentId, 0); } - public static void AddParcelType(FlatBufferBuilder builder, SCHALE.Common.FlatData.ParcelType parcelType) { builder.AddInt(2, (int)parcelType, 0); } + public static void AddParcelType_(FlatBufferBuilder builder, SCHALE.Common.FlatData.ParcelType parcelType_) { builder.AddInt(2, (int)parcelType_, 0); } public static void AddParcelId(FlatBufferBuilder builder, long parcelId) { builder.AddLong(3, parcelId, 0); } public static void AddResultAmountMin(FlatBufferBuilder builder, long resultAmountMin) { builder.AddLong(4, resultAmountMin, 0); } public static void AddResultAmountMax(FlatBufferBuilder builder, long resultAmountMax) { builder.AddLong(5, resultAmountMax, 0); } @@ -64,7 +64,7 @@ public struct RecipeSelectionGroupExcel : IFlatbufferObject byte[] key = TableEncryptionService.CreateKey("RecipeSelectionGroup"); _o.RecipeSelectionGroupId = TableEncryptionService.Convert(this.RecipeSelectionGroupId, key); _o.RecipeSelectionGroupComponentId = TableEncryptionService.Convert(this.RecipeSelectionGroupComponentId, key); - _o.ParcelType = TableEncryptionService.Convert(this.ParcelType, key); + _o.ParcelType_ = TableEncryptionService.Convert(this.ParcelType_, key); _o.ParcelId = TableEncryptionService.Convert(this.ParcelId, key); _o.ResultAmountMin = TableEncryptionService.Convert(this.ResultAmountMin, key); _o.ResultAmountMax = TableEncryptionService.Convert(this.ResultAmountMax, key); @@ -75,7 +75,7 @@ public struct RecipeSelectionGroupExcel : IFlatbufferObject builder, _o.RecipeSelectionGroupId, _o.RecipeSelectionGroupComponentId, - _o.ParcelType, + _o.ParcelType_, _o.ParcelId, _o.ResultAmountMin, _o.ResultAmountMax); @@ -86,7 +86,7 @@ public class RecipeSelectionGroupExcelT { public long RecipeSelectionGroupId { get; set; } public long RecipeSelectionGroupComponentId { get; set; } - public SCHALE.Common.FlatData.ParcelType ParcelType { get; set; } + public SCHALE.Common.FlatData.ParcelType ParcelType_ { get; set; } public long ParcelId { get; set; } public long ResultAmountMin { get; set; } public long ResultAmountMax { get; set; } @@ -94,7 +94,7 @@ public class RecipeSelectionGroupExcelT public RecipeSelectionGroupExcelT() { this.RecipeSelectionGroupId = 0; this.RecipeSelectionGroupComponentId = 0; - this.ParcelType = SCHALE.Common.FlatData.ParcelType.None; + this.ParcelType_ = SCHALE.Common.FlatData.ParcelType.None; this.ParcelId = 0; this.ResultAmountMin = 0; this.ResultAmountMax = 0; @@ -109,7 +109,7 @@ static public class RecipeSelectionGroupExcelVerify return verifier.VerifyTableStart(tablePos) && verifier.VerifyField(tablePos, 4 /*RecipeSelectionGroupId*/, 8 /*long*/, 8, false) && verifier.VerifyField(tablePos, 6 /*RecipeSelectionGroupComponentId*/, 8 /*long*/, 8, false) - && verifier.VerifyField(tablePos, 8 /*ParcelType*/, 4 /*SCHALE.Common.FlatData.ParcelType*/, 4, false) + && verifier.VerifyField(tablePos, 8 /*ParcelType_*/, 4 /*SCHALE.Common.FlatData.ParcelType*/, 4, false) && verifier.VerifyField(tablePos, 10 /*ParcelId*/, 8 /*long*/, 8, false) && verifier.VerifyField(tablePos, 12 /*ResultAmountMin*/, 8 /*long*/, 8, false) && verifier.VerifyField(tablePos, 14 /*ResultAmountMax*/, 8 /*long*/, 8, false) diff --git a/SCHALE.Common/FlatData/RewardTag.cs b/SCHALE.Common/FlatData/RewardTag.cs index f687a5a..f9f40bd 100644 --- a/SCHALE.Common/FlatData/RewardTag.cs +++ b/SCHALE.Common/FlatData/RewardTag.cs @@ -29,6 +29,7 @@ public enum RewardTag : int ConquestErosionPenalty = 19, GemBonus = 20, GemPaid = 21, + ConquestTileConquer = 22, }; diff --git a/SCHALE.Common/FlatData/ScenarioBGEffectExcel.cs b/SCHALE.Common/FlatData/ScenarioBGEffectExcel.cs index be0a4eb..015ef8c 100644 --- a/SCHALE.Common/FlatData/ScenarioBGEffectExcel.cs +++ b/SCHALE.Common/FlatData/ScenarioBGEffectExcel.cs @@ -28,35 +28,45 @@ public struct ScenarioBGEffectExcel : IFlatbufferObject public ArraySegment? GetEffectBytes() { return __p.__vector_as_arraysegment(6); } #endif public byte[] GetEffectArray() { return __p.__vector_as_array(6); } - public SCHALE.Common.FlatData.ScenarioBGScroll Scroll { get { int o = __p.__offset(8); return o != 0 ? (SCHALE.Common.FlatData.ScenarioBGScroll)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.ScenarioBGScroll.None; } } - public long ScrollTime { get { int o = __p.__offset(10); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } - public long ScrollFrom { get { int o = __p.__offset(12); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } - public long ScrollTo { get { int o = __p.__offset(14); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } + public string Effect2 { get { int o = __p.__offset(8); return o != 0 ? __p.__string(o + __p.bb_pos) : null; } } +#if ENABLE_SPAN_T + public Span GetEffect2Bytes() { return __p.__vector_as_span(8, 1); } +#else + public ArraySegment? GetEffect2Bytes() { return __p.__vector_as_arraysegment(8); } +#endif + public byte[] GetEffect2Array() { return __p.__vector_as_array(8); } + public SCHALE.Common.FlatData.ScenarioBGScroll Scroll { get { int o = __p.__offset(10); return o != 0 ? (SCHALE.Common.FlatData.ScenarioBGScroll)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.ScenarioBGScroll.None; } } + public long ScrollTime { get { int o = __p.__offset(12); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } + public long ScrollFrom { get { int o = __p.__offset(14); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } + public long ScrollTo { get { int o = __p.__offset(16); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public static Offset CreateScenarioBGEffectExcel(FlatBufferBuilder builder, uint Name = 0, StringOffset EffectOffset = default(StringOffset), + StringOffset Effect2Offset = default(StringOffset), SCHALE.Common.FlatData.ScenarioBGScroll Scroll = SCHALE.Common.FlatData.ScenarioBGScroll.None, long ScrollTime = 0, long ScrollFrom = 0, long ScrollTo = 0) { - builder.StartTable(6); + builder.StartTable(7); ScenarioBGEffectExcel.AddScrollTo(builder, ScrollTo); ScenarioBGEffectExcel.AddScrollFrom(builder, ScrollFrom); ScenarioBGEffectExcel.AddScrollTime(builder, ScrollTime); ScenarioBGEffectExcel.AddScroll(builder, Scroll); + ScenarioBGEffectExcel.AddEffect2(builder, Effect2Offset); ScenarioBGEffectExcel.AddEffect(builder, EffectOffset); ScenarioBGEffectExcel.AddName(builder, Name); return ScenarioBGEffectExcel.EndScenarioBGEffectExcel(builder); } - public static void StartScenarioBGEffectExcel(FlatBufferBuilder builder) { builder.StartTable(6); } + public static void StartScenarioBGEffectExcel(FlatBufferBuilder builder) { builder.StartTable(7); } public static void AddName(FlatBufferBuilder builder, uint name) { builder.AddUint(0, name, 0); } public static void AddEffect(FlatBufferBuilder builder, StringOffset effectOffset) { builder.AddOffset(1, effectOffset.Value, 0); } - public static void AddScroll(FlatBufferBuilder builder, SCHALE.Common.FlatData.ScenarioBGScroll scroll) { builder.AddInt(2, (int)scroll, 0); } - public static void AddScrollTime(FlatBufferBuilder builder, long scrollTime) { builder.AddLong(3, scrollTime, 0); } - public static void AddScrollFrom(FlatBufferBuilder builder, long scrollFrom) { builder.AddLong(4, scrollFrom, 0); } - public static void AddScrollTo(FlatBufferBuilder builder, long scrollTo) { builder.AddLong(5, scrollTo, 0); } + public static void AddEffect2(FlatBufferBuilder builder, StringOffset effect2Offset) { builder.AddOffset(2, effect2Offset.Value, 0); } + public static void AddScroll(FlatBufferBuilder builder, SCHALE.Common.FlatData.ScenarioBGScroll scroll) { builder.AddInt(3, (int)scroll, 0); } + public static void AddScrollTime(FlatBufferBuilder builder, long scrollTime) { builder.AddLong(4, scrollTime, 0); } + public static void AddScrollFrom(FlatBufferBuilder builder, long scrollFrom) { builder.AddLong(5, scrollFrom, 0); } + public static void AddScrollTo(FlatBufferBuilder builder, long scrollTo) { builder.AddLong(6, scrollTo, 0); } public static Offset EndScenarioBGEffectExcel(FlatBufferBuilder builder) { int o = builder.EndTable(); return new Offset(o); @@ -70,6 +80,7 @@ public struct ScenarioBGEffectExcel : IFlatbufferObject byte[] key = TableEncryptionService.CreateKey("ScenarioBGEffect"); _o.Name = TableEncryptionService.Convert(this.Name, key); _o.Effect = TableEncryptionService.Convert(this.Effect, key); + _o.Effect2 = TableEncryptionService.Convert(this.Effect2, key); _o.Scroll = TableEncryptionService.Convert(this.Scroll, key); _o.ScrollTime = TableEncryptionService.Convert(this.ScrollTime, key); _o.ScrollFrom = TableEncryptionService.Convert(this.ScrollFrom, key); @@ -78,10 +89,12 @@ public struct ScenarioBGEffectExcel : IFlatbufferObject public static Offset Pack(FlatBufferBuilder builder, ScenarioBGEffectExcelT _o) { if (_o == null) return default(Offset); var _Effect = _o.Effect == null ? default(StringOffset) : builder.CreateString(_o.Effect); + var _Effect2 = _o.Effect2 == null ? default(StringOffset) : builder.CreateString(_o.Effect2); return CreateScenarioBGEffectExcel( builder, _o.Name, _Effect, + _Effect2, _o.Scroll, _o.ScrollTime, _o.ScrollFrom, @@ -93,6 +106,7 @@ public class ScenarioBGEffectExcelT { public uint Name { get; set; } public string Effect { get; set; } + public string Effect2 { get; set; } public SCHALE.Common.FlatData.ScenarioBGScroll Scroll { get; set; } public long ScrollTime { get; set; } public long ScrollFrom { get; set; } @@ -101,6 +115,7 @@ public class ScenarioBGEffectExcelT public ScenarioBGEffectExcelT() { this.Name = 0; this.Effect = null; + this.Effect2 = null; this.Scroll = SCHALE.Common.FlatData.ScenarioBGScroll.None; this.ScrollTime = 0; this.ScrollFrom = 0; @@ -116,10 +131,11 @@ static public class ScenarioBGEffectExcelVerify return verifier.VerifyTableStart(tablePos) && verifier.VerifyField(tablePos, 4 /*Name*/, 4 /*uint*/, 4, false) && verifier.VerifyString(tablePos, 6 /*Effect*/, false) - && verifier.VerifyField(tablePos, 8 /*Scroll*/, 4 /*SCHALE.Common.FlatData.ScenarioBGScroll*/, 4, false) - && verifier.VerifyField(tablePos, 10 /*ScrollTime*/, 8 /*long*/, 8, false) - && verifier.VerifyField(tablePos, 12 /*ScrollFrom*/, 8 /*long*/, 8, false) - && verifier.VerifyField(tablePos, 14 /*ScrollTo*/, 8 /*long*/, 8, false) + && verifier.VerifyString(tablePos, 8 /*Effect2*/, false) + && verifier.VerifyField(tablePos, 10 /*Scroll*/, 4 /*SCHALE.Common.FlatData.ScenarioBGScroll*/, 4, false) + && verifier.VerifyField(tablePos, 12 /*ScrollTime*/, 8 /*long*/, 8, false) + && verifier.VerifyField(tablePos, 14 /*ScrollFrom*/, 8 /*long*/, 8, false) + && verifier.VerifyField(tablePos, 16 /*ScrollTo*/, 8 /*long*/, 8, false) && verifier.VerifyTableEnd(tablePos); } } diff --git a/SCHALE.Common/FlatData/ScenarioBGNameExcel.cs b/SCHALE.Common/FlatData/ScenarioBGNameExcel.cs index c0d8c85..0a5b5a1 100644 --- a/SCHALE.Common/FlatData/ScenarioBGNameExcel.cs +++ b/SCHALE.Common/FlatData/ScenarioBGNameExcel.cs @@ -21,7 +21,7 @@ public struct ScenarioBGNameExcel : IFlatbufferObject public ScenarioBGNameExcel __assign(int _i, ByteBuffer _bb) { __init(_i, _bb); return this; } public uint Name { get { int o = __p.__offset(4); return o != 0 ? __p.bb.GetUint(o + __p.bb_pos) : (uint)0; } } - public SCHALE.Common.FlatData.ProductionStep ProductionStep { get { int o = __p.__offset(6); return o != 0 ? (SCHALE.Common.FlatData.ProductionStep)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.ProductionStep.ToDo; } } + public SCHALE.Common.FlatData.ProductionStep ProductionStep_ { get { int o = __p.__offset(6); return o != 0 ? (SCHALE.Common.FlatData.ProductionStep)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.ProductionStep.ToDo; } } public string BGFileName { get { int o = __p.__offset(8); return o != 0 ? __p.__string(o + __p.bb_pos) : null; } } #if ENABLE_SPAN_T public Span GetBGFileNameBytes() { return __p.__vector_as_span(8, 1); } @@ -50,7 +50,7 @@ public struct ScenarioBGNameExcel : IFlatbufferObject public static Offset CreateScenarioBGNameExcel(FlatBufferBuilder builder, uint Name = 0, - SCHALE.Common.FlatData.ProductionStep ProductionStep = SCHALE.Common.FlatData.ProductionStep.ToDo, + SCHALE.Common.FlatData.ProductionStep ProductionStep_ = SCHALE.Common.FlatData.ProductionStep.ToDo, StringOffset BGFileNameOffset = default(StringOffset), SCHALE.Common.FlatData.ScenarioBGType BGType = SCHALE.Common.FlatData.ScenarioBGType.None, StringOffset AnimationRootOffset = default(StringOffset), @@ -66,14 +66,14 @@ public struct ScenarioBGNameExcel : IFlatbufferObject ScenarioBGNameExcel.AddAnimationRoot(builder, AnimationRootOffset); ScenarioBGNameExcel.AddBGType(builder, BGType); ScenarioBGNameExcel.AddBGFileName(builder, BGFileNameOffset); - ScenarioBGNameExcel.AddProductionStep(builder, ProductionStep); + ScenarioBGNameExcel.AddProductionStep_(builder, ProductionStep_); ScenarioBGNameExcel.AddName(builder, Name); return ScenarioBGNameExcel.EndScenarioBGNameExcel(builder); } public static void StartScenarioBGNameExcel(FlatBufferBuilder builder) { builder.StartTable(9); } public static void AddName(FlatBufferBuilder builder, uint name) { builder.AddUint(0, name, 0); } - public static void AddProductionStep(FlatBufferBuilder builder, SCHALE.Common.FlatData.ProductionStep productionStep) { builder.AddInt(1, (int)productionStep, 0); } + public static void AddProductionStep_(FlatBufferBuilder builder, SCHALE.Common.FlatData.ProductionStep productionStep_) { builder.AddInt(1, (int)productionStep_, 0); } public static void AddBGFileName(FlatBufferBuilder builder, StringOffset bGFileNameOffset) { builder.AddOffset(2, bGFileNameOffset.Value, 0); } public static void AddBGType(FlatBufferBuilder builder, SCHALE.Common.FlatData.ScenarioBGType bGType) { builder.AddInt(3, (int)bGType, 0); } public static void AddAnimationRoot(FlatBufferBuilder builder, StringOffset animationRootOffset) { builder.AddOffset(4, animationRootOffset.Value, 0); } @@ -93,7 +93,7 @@ public struct ScenarioBGNameExcel : IFlatbufferObject public void UnPackTo(ScenarioBGNameExcelT _o) { byte[] key = TableEncryptionService.CreateKey("ScenarioBGName"); _o.Name = TableEncryptionService.Convert(this.Name, key); - _o.ProductionStep = TableEncryptionService.Convert(this.ProductionStep, key); + _o.ProductionStep_ = TableEncryptionService.Convert(this.ProductionStep_, key); _o.BGFileName = TableEncryptionService.Convert(this.BGFileName, key); _o.BGType = TableEncryptionService.Convert(this.BGType, key); _o.AnimationRoot = TableEncryptionService.Convert(this.AnimationRoot, key); @@ -110,7 +110,7 @@ public struct ScenarioBGNameExcel : IFlatbufferObject return CreateScenarioBGNameExcel( builder, _o.Name, - _o.ProductionStep, + _o.ProductionStep_, _BGFileName, _o.BGType, _AnimationRoot, @@ -124,7 +124,7 @@ public struct ScenarioBGNameExcel : IFlatbufferObject public class ScenarioBGNameExcelT { public uint Name { get; set; } - public SCHALE.Common.FlatData.ProductionStep ProductionStep { get; set; } + public SCHALE.Common.FlatData.ProductionStep ProductionStep_ { get; set; } public string BGFileName { get; set; } public SCHALE.Common.FlatData.ScenarioBGType BGType { get; set; } public string AnimationRoot { get; set; } @@ -135,7 +135,7 @@ public class ScenarioBGNameExcelT public ScenarioBGNameExcelT() { this.Name = 0; - this.ProductionStep = SCHALE.Common.FlatData.ProductionStep.ToDo; + this.ProductionStep_ = SCHALE.Common.FlatData.ProductionStep.ToDo; this.BGFileName = null; this.BGType = SCHALE.Common.FlatData.ScenarioBGType.None; this.AnimationRoot = null; @@ -153,7 +153,7 @@ static public class ScenarioBGNameExcelVerify { return verifier.VerifyTableStart(tablePos) && verifier.VerifyField(tablePos, 4 /*Name*/, 4 /*uint*/, 4, false) - && verifier.VerifyField(tablePos, 6 /*ProductionStep*/, 4 /*SCHALE.Common.FlatData.ProductionStep*/, 4, false) + && verifier.VerifyField(tablePos, 6 /*ProductionStep_*/, 4 /*SCHALE.Common.FlatData.ProductionStep*/, 4, false) && verifier.VerifyString(tablePos, 8 /*BGFileName*/, false) && verifier.VerifyField(tablePos, 10 /*BGType*/, 4 /*SCHALE.Common.FlatData.ScenarioBGType*/, 4, false) && verifier.VerifyString(tablePos, 12 /*AnimationRoot*/, false) diff --git a/SCHALE.Common/FlatData/ScenarioCharacterNameExcel.cs b/SCHALE.Common/FlatData/ScenarioCharacterNameExcel.cs index 2fdd8aa..04edd8a 100644 --- a/SCHALE.Common/FlatData/ScenarioCharacterNameExcel.cs +++ b/SCHALE.Common/FlatData/ScenarioCharacterNameExcel.cs @@ -21,7 +21,7 @@ public struct ScenarioCharacterNameExcel : IFlatbufferObject public ScenarioCharacterNameExcel __assign(int _i, ByteBuffer _bb) { __init(_i, _bb); return this; } public uint CharacterName { get { int o = __p.__offset(4); return o != 0 ? __p.bb.GetUint(o + __p.bb_pos) : (uint)0; } } - public SCHALE.Common.FlatData.ProductionStep ProductionStep { get { int o = __p.__offset(6); return o != 0 ? (SCHALE.Common.FlatData.ProductionStep)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.ProductionStep.ToDo; } } + public SCHALE.Common.FlatData.ProductionStep ProductionStep_ { get { int o = __p.__offset(6); return o != 0 ? (SCHALE.Common.FlatData.ProductionStep)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.ProductionStep.ToDo; } } public string NameKR { get { int o = __p.__offset(8); return o != 0 ? __p.__string(o + __p.bb_pos) : null; } } #if ENABLE_SPAN_T public Span GetNameKRBytes() { return __p.__vector_as_span(8, 1); } @@ -68,7 +68,7 @@ public struct ScenarioCharacterNameExcel : IFlatbufferObject public static Offset CreateScenarioCharacterNameExcel(FlatBufferBuilder builder, uint CharacterName = 0, - SCHALE.Common.FlatData.ProductionStep ProductionStep = SCHALE.Common.FlatData.ProductionStep.ToDo, + SCHALE.Common.FlatData.ProductionStep ProductionStep_ = SCHALE.Common.FlatData.ProductionStep.ToDo, StringOffset NameKROffset = default(StringOffset), StringOffset NicknameKROffset = default(StringOffset), StringOffset NameJPOffset = default(StringOffset), @@ -84,14 +84,14 @@ public struct ScenarioCharacterNameExcel : IFlatbufferObject ScenarioCharacterNameExcel.AddNameJP(builder, NameJPOffset); ScenarioCharacterNameExcel.AddNicknameKR(builder, NicknameKROffset); ScenarioCharacterNameExcel.AddNameKR(builder, NameKROffset); - ScenarioCharacterNameExcel.AddProductionStep(builder, ProductionStep); + ScenarioCharacterNameExcel.AddProductionStep_(builder, ProductionStep_); ScenarioCharacterNameExcel.AddCharacterName(builder, CharacterName); return ScenarioCharacterNameExcel.EndScenarioCharacterNameExcel(builder); } public static void StartScenarioCharacterNameExcel(FlatBufferBuilder builder) { builder.StartTable(9); } public static void AddCharacterName(FlatBufferBuilder builder, uint characterName) { builder.AddUint(0, characterName, 0); } - public static void AddProductionStep(FlatBufferBuilder builder, SCHALE.Common.FlatData.ProductionStep productionStep) { builder.AddInt(1, (int)productionStep, 0); } + public static void AddProductionStep_(FlatBufferBuilder builder, SCHALE.Common.FlatData.ProductionStep productionStep_) { builder.AddInt(1, (int)productionStep_, 0); } public static void AddNameKR(FlatBufferBuilder builder, StringOffset nameKROffset) { builder.AddOffset(2, nameKROffset.Value, 0); } public static void AddNicknameKR(FlatBufferBuilder builder, StringOffset nicknameKROffset) { builder.AddOffset(3, nicknameKROffset.Value, 0); } public static void AddNameJP(FlatBufferBuilder builder, StringOffset nameJPOffset) { builder.AddOffset(4, nameJPOffset.Value, 0); } @@ -111,7 +111,7 @@ public struct ScenarioCharacterNameExcel : IFlatbufferObject public void UnPackTo(ScenarioCharacterNameExcelT _o) { byte[] key = TableEncryptionService.CreateKey("ScenarioCharacterName"); _o.CharacterName = TableEncryptionService.Convert(this.CharacterName, key); - _o.ProductionStep = TableEncryptionService.Convert(this.ProductionStep, key); + _o.ProductionStep_ = TableEncryptionService.Convert(this.ProductionStep_, key); _o.NameKR = TableEncryptionService.Convert(this.NameKR, key); _o.NicknameKR = TableEncryptionService.Convert(this.NicknameKR, key); _o.NameJP = TableEncryptionService.Convert(this.NameJP, key); @@ -131,7 +131,7 @@ public struct ScenarioCharacterNameExcel : IFlatbufferObject return CreateScenarioCharacterNameExcel( builder, _o.CharacterName, - _o.ProductionStep, + _o.ProductionStep_, _NameKR, _NicknameKR, _NameJP, @@ -145,7 +145,7 @@ public struct ScenarioCharacterNameExcel : IFlatbufferObject public class ScenarioCharacterNameExcelT { public uint CharacterName { get; set; } - public SCHALE.Common.FlatData.ProductionStep ProductionStep { get; set; } + public SCHALE.Common.FlatData.ProductionStep ProductionStep_ { get; set; } public string NameKR { get; set; } public string NicknameKR { get; set; } public string NameJP { get; set; } @@ -156,7 +156,7 @@ public class ScenarioCharacterNameExcelT public ScenarioCharacterNameExcelT() { this.CharacterName = 0; - this.ProductionStep = SCHALE.Common.FlatData.ProductionStep.ToDo; + this.ProductionStep_ = SCHALE.Common.FlatData.ProductionStep.ToDo; this.NameKR = null; this.NicknameKR = null; this.NameJP = null; @@ -174,7 +174,7 @@ static public class ScenarioCharacterNameExcelVerify { return verifier.VerifyTableStart(tablePos) && verifier.VerifyField(tablePos, 4 /*CharacterName*/, 4 /*uint*/, 4, false) - && verifier.VerifyField(tablePos, 6 /*ProductionStep*/, 4 /*SCHALE.Common.FlatData.ProductionStep*/, 4, false) + && verifier.VerifyField(tablePos, 6 /*ProductionStep_*/, 4 /*SCHALE.Common.FlatData.ProductionStep*/, 4, false) && verifier.VerifyString(tablePos, 8 /*NameKR*/, false) && verifier.VerifyString(tablePos, 10 /*NicknameKR*/, false) && verifier.VerifyString(tablePos, 12 /*NameJP*/, false) diff --git a/SCHALE.Common/FlatData/ScenarioContentCollectionExcel.cs b/SCHALE.Common/FlatData/ScenarioContentCollectionExcel.cs new file mode 100644 index 0000000..41025d0 --- /dev/null +++ b/SCHALE.Common/FlatData/ScenarioContentCollectionExcel.cs @@ -0,0 +1,229 @@ +// +// automatically generated by the FlatBuffers compiler, do not modify +// + +namespace SCHALE.Common.FlatData +{ + +using global::System; +using global::System.Collections.Generic; +using global::SCHALE.Common.Crypto; +using global::Google.FlatBuffers; + +public struct ScenarioContentCollectionExcel : IFlatbufferObject +{ + private Table __p; + public ByteBuffer ByteBuffer { get { return __p.bb; } } + public static void ValidateVersion() { FlatBufferConstants.FLATBUFFERS_24_3_25(); } + public static ScenarioContentCollectionExcel GetRootAsScenarioContentCollectionExcel(ByteBuffer _bb) { return GetRootAsScenarioContentCollectionExcel(_bb, new ScenarioContentCollectionExcel()); } + public static ScenarioContentCollectionExcel GetRootAsScenarioContentCollectionExcel(ByteBuffer _bb, ScenarioContentCollectionExcel obj) { return (obj.__assign(_bb.GetInt(_bb.Position) + _bb.Position, _bb)); } + public void __init(int _i, ByteBuffer _bb) { __p = new Table(_i, _bb); } + public ScenarioContentCollectionExcel __assign(int _i, ByteBuffer _bb) { __init(_i, _bb); return this; } + + public long Id { get { int o = __p.__offset(4); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } + public long GroupId { get { int o = __p.__offset(6); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } + public SCHALE.Common.FlatData.CollectionUnlockType UnlockConditionType { get { int o = __p.__offset(8); return o != 0 ? (SCHALE.Common.FlatData.CollectionUnlockType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.CollectionUnlockType.None; } } + public long UnlockConditionParameter(int j) { int o = __p.__offset(10); return o != 0 ? __p.bb.GetLong(__p.__vector(o) + j * 8) : (long)0; } + public int UnlockConditionParameterLength { get { int o = __p.__offset(10); return o != 0 ? __p.__vector_len(o) : 0; } } +#if ENABLE_SPAN_T + public Span GetUnlockConditionParameterBytes() { return __p.__vector_as_span(10, 8); } +#else + public ArraySegment? GetUnlockConditionParameterBytes() { return __p.__vector_as_arraysegment(10); } +#endif + public long[] GetUnlockConditionParameterArray() { return __p.__vector_as_array(10); } + public SCHALE.Common.FlatData.MultipleConditionCheckType MultipleConditionCheckType_ { get { int o = __p.__offset(12); return o != 0 ? (SCHALE.Common.FlatData.MultipleConditionCheckType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.MultipleConditionCheckType.And; } } + public long UnlockConditionCount { get { int o = __p.__offset(14); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } + public bool IsObject { get { int o = __p.__offset(16); return o != 0 ? 0!=__p.bb.Get(o + __p.bb_pos) : (bool)false; } } + public bool IsHorizon { get { int o = __p.__offset(18); return o != 0 ? 0!=__p.bb.Get(o + __p.bb_pos) : (bool)false; } } + public string EmblemResource { get { int o = __p.__offset(20); return o != 0 ? __p.__string(o + __p.bb_pos) : null; } } +#if ENABLE_SPAN_T + public Span GetEmblemResourceBytes() { return __p.__vector_as_span(20, 1); } +#else + public ArraySegment? GetEmblemResourceBytes() { return __p.__vector_as_arraysegment(20); } +#endif + public byte[] GetEmblemResourceArray() { return __p.__vector_as_array(20); } + public string ThumbResource { get { int o = __p.__offset(22); return o != 0 ? __p.__string(o + __p.bb_pos) : null; } } +#if ENABLE_SPAN_T + public Span GetThumbResourceBytes() { return __p.__vector_as_span(22, 1); } +#else + public ArraySegment? GetThumbResourceBytes() { return __p.__vector_as_arraysegment(22); } +#endif + public byte[] GetThumbResourceArray() { return __p.__vector_as_array(22); } + public string FullResource { get { int o = __p.__offset(24); return o != 0 ? __p.__string(o + __p.bb_pos) : null; } } +#if ENABLE_SPAN_T + public Span GetFullResourceBytes() { return __p.__vector_as_span(24, 1); } +#else + public ArraySegment? GetFullResourceBytes() { return __p.__vector_as_arraysegment(24); } +#endif + public byte[] GetFullResourceArray() { return __p.__vector_as_array(24); } + public uint LocalizeEtcId { get { int o = __p.__offset(26); return o != 0 ? __p.bb.GetUint(o + __p.bb_pos) : (uint)0; } } + public string SubNameLocalizeCodeId { get { int o = __p.__offset(28); return o != 0 ? __p.__string(o + __p.bb_pos) : null; } } +#if ENABLE_SPAN_T + public Span GetSubNameLocalizeCodeIdBytes() { return __p.__vector_as_span(28, 1); } +#else + public ArraySegment? GetSubNameLocalizeCodeIdBytes() { return __p.__vector_as_arraysegment(28); } +#endif + public byte[] GetSubNameLocalizeCodeIdArray() { return __p.__vector_as_array(28); } + + public static Offset CreateScenarioContentCollectionExcel(FlatBufferBuilder builder, + long Id = 0, + long GroupId = 0, + SCHALE.Common.FlatData.CollectionUnlockType UnlockConditionType = SCHALE.Common.FlatData.CollectionUnlockType.None, + VectorOffset UnlockConditionParameterOffset = default(VectorOffset), + SCHALE.Common.FlatData.MultipleConditionCheckType MultipleConditionCheckType_ = SCHALE.Common.FlatData.MultipleConditionCheckType.And, + long UnlockConditionCount = 0, + bool IsObject = false, + bool IsHorizon = false, + StringOffset EmblemResourceOffset = default(StringOffset), + StringOffset ThumbResourceOffset = default(StringOffset), + StringOffset FullResourceOffset = default(StringOffset), + uint LocalizeEtcId = 0, + StringOffset SubNameLocalizeCodeIdOffset = default(StringOffset)) { + builder.StartTable(13); + ScenarioContentCollectionExcel.AddUnlockConditionCount(builder, UnlockConditionCount); + ScenarioContentCollectionExcel.AddGroupId(builder, GroupId); + ScenarioContentCollectionExcel.AddId(builder, Id); + ScenarioContentCollectionExcel.AddSubNameLocalizeCodeId(builder, SubNameLocalizeCodeIdOffset); + ScenarioContentCollectionExcel.AddLocalizeEtcId(builder, LocalizeEtcId); + ScenarioContentCollectionExcel.AddFullResource(builder, FullResourceOffset); + ScenarioContentCollectionExcel.AddThumbResource(builder, ThumbResourceOffset); + ScenarioContentCollectionExcel.AddEmblemResource(builder, EmblemResourceOffset); + ScenarioContentCollectionExcel.AddMultipleConditionCheckType_(builder, MultipleConditionCheckType_); + ScenarioContentCollectionExcel.AddUnlockConditionParameter(builder, UnlockConditionParameterOffset); + ScenarioContentCollectionExcel.AddUnlockConditionType(builder, UnlockConditionType); + ScenarioContentCollectionExcel.AddIsHorizon(builder, IsHorizon); + ScenarioContentCollectionExcel.AddIsObject(builder, IsObject); + return ScenarioContentCollectionExcel.EndScenarioContentCollectionExcel(builder); + } + + public static void StartScenarioContentCollectionExcel(FlatBufferBuilder builder) { builder.StartTable(13); } + public static void AddId(FlatBufferBuilder builder, long id) { builder.AddLong(0, id, 0); } + public static void AddGroupId(FlatBufferBuilder builder, long groupId) { builder.AddLong(1, groupId, 0); } + public static void AddUnlockConditionType(FlatBufferBuilder builder, SCHALE.Common.FlatData.CollectionUnlockType unlockConditionType) { builder.AddInt(2, (int)unlockConditionType, 0); } + public static void AddUnlockConditionParameter(FlatBufferBuilder builder, VectorOffset unlockConditionParameterOffset) { builder.AddOffset(3, unlockConditionParameterOffset.Value, 0); } + public static VectorOffset CreateUnlockConditionParameterVector(FlatBufferBuilder builder, long[] data) { builder.StartVector(8, data.Length, 8); for (int i = data.Length - 1; i >= 0; i--) builder.AddLong(data[i]); return builder.EndVector(); } + public static VectorOffset CreateUnlockConditionParameterVectorBlock(FlatBufferBuilder builder, long[] data) { builder.StartVector(8, data.Length, 8); builder.Add(data); return builder.EndVector(); } + public static VectorOffset CreateUnlockConditionParameterVectorBlock(FlatBufferBuilder builder, ArraySegment data) { builder.StartVector(8, data.Count, 8); builder.Add(data); return builder.EndVector(); } + public static VectorOffset CreateUnlockConditionParameterVectorBlock(FlatBufferBuilder builder, IntPtr dataPtr, int sizeInBytes) { builder.StartVector(1, sizeInBytes, 1); builder.Add(dataPtr, sizeInBytes); return builder.EndVector(); } + public static void StartUnlockConditionParameterVector(FlatBufferBuilder builder, int numElems) { builder.StartVector(8, numElems, 8); } + public static void AddMultipleConditionCheckType_(FlatBufferBuilder builder, SCHALE.Common.FlatData.MultipleConditionCheckType multipleConditionCheckType_) { builder.AddInt(4, (int)multipleConditionCheckType_, 0); } + public static void AddUnlockConditionCount(FlatBufferBuilder builder, long unlockConditionCount) { builder.AddLong(5, unlockConditionCount, 0); } + public static void AddIsObject(FlatBufferBuilder builder, bool isObject) { builder.AddBool(6, isObject, false); } + public static void AddIsHorizon(FlatBufferBuilder builder, bool isHorizon) { builder.AddBool(7, isHorizon, false); } + public static void AddEmblemResource(FlatBufferBuilder builder, StringOffset emblemResourceOffset) { builder.AddOffset(8, emblemResourceOffset.Value, 0); } + public static void AddThumbResource(FlatBufferBuilder builder, StringOffset thumbResourceOffset) { builder.AddOffset(9, thumbResourceOffset.Value, 0); } + public static void AddFullResource(FlatBufferBuilder builder, StringOffset fullResourceOffset) { builder.AddOffset(10, fullResourceOffset.Value, 0); } + public static void AddLocalizeEtcId(FlatBufferBuilder builder, uint localizeEtcId) { builder.AddUint(11, localizeEtcId, 0); } + public static void AddSubNameLocalizeCodeId(FlatBufferBuilder builder, StringOffset subNameLocalizeCodeIdOffset) { builder.AddOffset(12, subNameLocalizeCodeIdOffset.Value, 0); } + public static Offset EndScenarioContentCollectionExcel(FlatBufferBuilder builder) { + int o = builder.EndTable(); + return new Offset(o); + } + public ScenarioContentCollectionExcelT UnPack() { + var _o = new ScenarioContentCollectionExcelT(); + this.UnPackTo(_o); + return _o; + } + public void UnPackTo(ScenarioContentCollectionExcelT _o) { + byte[] key = TableEncryptionService.CreateKey("ScenarioContentCollection"); + _o.Id = TableEncryptionService.Convert(this.Id, key); + _o.GroupId = TableEncryptionService.Convert(this.GroupId, key); + _o.UnlockConditionType = TableEncryptionService.Convert(this.UnlockConditionType, key); + _o.UnlockConditionParameter = new List(); + for (var _j = 0; _j < this.UnlockConditionParameterLength; ++_j) {_o.UnlockConditionParameter.Add(TableEncryptionService.Convert(this.UnlockConditionParameter(_j), key));} + _o.MultipleConditionCheckType_ = TableEncryptionService.Convert(this.MultipleConditionCheckType_, key); + _o.UnlockConditionCount = TableEncryptionService.Convert(this.UnlockConditionCount, key); + _o.IsObject = TableEncryptionService.Convert(this.IsObject, key); + _o.IsHorizon = TableEncryptionService.Convert(this.IsHorizon, key); + _o.EmblemResource = TableEncryptionService.Convert(this.EmblemResource, key); + _o.ThumbResource = TableEncryptionService.Convert(this.ThumbResource, key); + _o.FullResource = TableEncryptionService.Convert(this.FullResource, key); + _o.LocalizeEtcId = TableEncryptionService.Convert(this.LocalizeEtcId, key); + _o.SubNameLocalizeCodeId = TableEncryptionService.Convert(this.SubNameLocalizeCodeId, key); + } + public static Offset Pack(FlatBufferBuilder builder, ScenarioContentCollectionExcelT _o) { + if (_o == null) return default(Offset); + var _UnlockConditionParameter = default(VectorOffset); + if (_o.UnlockConditionParameter != null) { + var __UnlockConditionParameter = _o.UnlockConditionParameter.ToArray(); + _UnlockConditionParameter = CreateUnlockConditionParameterVector(builder, __UnlockConditionParameter); + } + var _EmblemResource = _o.EmblemResource == null ? default(StringOffset) : builder.CreateString(_o.EmblemResource); + var _ThumbResource = _o.ThumbResource == null ? default(StringOffset) : builder.CreateString(_o.ThumbResource); + var _FullResource = _o.FullResource == null ? default(StringOffset) : builder.CreateString(_o.FullResource); + var _SubNameLocalizeCodeId = _o.SubNameLocalizeCodeId == null ? default(StringOffset) : builder.CreateString(_o.SubNameLocalizeCodeId); + return CreateScenarioContentCollectionExcel( + builder, + _o.Id, + _o.GroupId, + _o.UnlockConditionType, + _UnlockConditionParameter, + _o.MultipleConditionCheckType_, + _o.UnlockConditionCount, + _o.IsObject, + _o.IsHorizon, + _EmblemResource, + _ThumbResource, + _FullResource, + _o.LocalizeEtcId, + _SubNameLocalizeCodeId); + } +} + +public class ScenarioContentCollectionExcelT +{ + public long Id { get; set; } + public long GroupId { get; set; } + public SCHALE.Common.FlatData.CollectionUnlockType UnlockConditionType { get; set; } + public List UnlockConditionParameter { get; set; } + public SCHALE.Common.FlatData.MultipleConditionCheckType MultipleConditionCheckType_ { get; set; } + public long UnlockConditionCount { get; set; } + public bool IsObject { get; set; } + public bool IsHorizon { get; set; } + public string EmblemResource { get; set; } + public string ThumbResource { get; set; } + public string FullResource { get; set; } + public uint LocalizeEtcId { get; set; } + public string SubNameLocalizeCodeId { get; set; } + + public ScenarioContentCollectionExcelT() { + this.Id = 0; + this.GroupId = 0; + this.UnlockConditionType = SCHALE.Common.FlatData.CollectionUnlockType.None; + this.UnlockConditionParameter = null; + this.MultipleConditionCheckType_ = SCHALE.Common.FlatData.MultipleConditionCheckType.And; + this.UnlockConditionCount = 0; + this.IsObject = false; + this.IsHorizon = false; + this.EmblemResource = null; + this.ThumbResource = null; + this.FullResource = null; + this.LocalizeEtcId = 0; + this.SubNameLocalizeCodeId = null; + } +} + + +static public class ScenarioContentCollectionExcelVerify +{ + static public bool Verify(Google.FlatBuffers.Verifier verifier, uint tablePos) + { + return verifier.VerifyTableStart(tablePos) + && verifier.VerifyField(tablePos, 4 /*Id*/, 8 /*long*/, 8, false) + && verifier.VerifyField(tablePos, 6 /*GroupId*/, 8 /*long*/, 8, false) + && verifier.VerifyField(tablePos, 8 /*UnlockConditionType*/, 4 /*SCHALE.Common.FlatData.CollectionUnlockType*/, 4, false) + && verifier.VerifyVectorOfData(tablePos, 10 /*UnlockConditionParameter*/, 8 /*long*/, false) + && verifier.VerifyField(tablePos, 12 /*MultipleConditionCheckType_*/, 4 /*SCHALE.Common.FlatData.MultipleConditionCheckType*/, 4, false) + && verifier.VerifyField(tablePos, 14 /*UnlockConditionCount*/, 8 /*long*/, 8, false) + && verifier.VerifyField(tablePos, 16 /*IsObject*/, 1 /*bool*/, 1, false) + && verifier.VerifyField(tablePos, 18 /*IsHorizon*/, 1 /*bool*/, 1, false) + && verifier.VerifyString(tablePos, 20 /*EmblemResource*/, false) + && verifier.VerifyString(tablePos, 22 /*ThumbResource*/, false) + && verifier.VerifyString(tablePos, 24 /*FullResource*/, false) + && verifier.VerifyField(tablePos, 26 /*LocalizeEtcId*/, 4 /*uint*/, 4, false) + && verifier.VerifyString(tablePos, 28 /*SubNameLocalizeCodeId*/, false) + && verifier.VerifyTableEnd(tablePos); + } +} + +} diff --git a/SCHALE.Common/FlatData/ScenarioContentType.cs b/SCHALE.Common/FlatData/ScenarioContentType.cs index e787569..a05c053 100644 --- a/SCHALE.Common/FlatData/ScenarioContentType.cs +++ b/SCHALE.Common/FlatData/ScenarioContentType.cs @@ -24,6 +24,7 @@ public enum ScenarioContentType : int MiniEvent = 14, EliminateRaid = 15, MultiFloorRaid = 16, + EventContentPermanent = 17, }; diff --git a/SCHALE.Common/FlatData/ScenarioModeExcel.cs b/SCHALE.Common/FlatData/ScenarioModeExcel.cs index ce8ac8b..985d11f 100644 --- a/SCHALE.Common/FlatData/ScenarioModeExcel.cs +++ b/SCHALE.Common/FlatData/ScenarioModeExcel.cs @@ -26,47 +26,53 @@ public struct ScenarioModeExcel : IFlatbufferObject public long VolumeId { get { int o = __p.__offset(10); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public long ChapterId { get { int o = __p.__offset(12); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public long EpisodeId { get { int o = __p.__offset(14); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } - public bool Hide { get { int o = __p.__offset(16); return o != 0 ? 0!=__p.bb.Get(o + __p.bb_pos) : (bool)false; } } - public bool Open { get { int o = __p.__offset(18); return o != 0 ? 0!=__p.bb.Get(o + __p.bb_pos) : (bool)false; } } - public bool IsContinue { get { int o = __p.__offset(20); return o != 0 ? 0!=__p.bb.Get(o + __p.bb_pos) : (bool)false; } } - public long EpisodeContinueModeId { get { int o = __p.__offset(22); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } - public long FrontScenarioGroupId(int j) { int o = __p.__offset(24); return o != 0 ? __p.bb.GetLong(__p.__vector(o) + j * 8) : (long)0; } - public int FrontScenarioGroupIdLength { get { int o = __p.__offset(24); return o != 0 ? __p.__vector_len(o) : 0; } } + public string ExposedTime { get { int o = __p.__offset(16); return o != 0 ? __p.__string(o + __p.bb_pos) : null; } } #if ENABLE_SPAN_T - public Span GetFrontScenarioGroupIdBytes() { return __p.__vector_as_span(24, 8); } + public Span GetExposedTimeBytes() { return __p.__vector_as_span(16, 1); } #else - public ArraySegment? GetFrontScenarioGroupIdBytes() { return __p.__vector_as_arraysegment(24); } + public ArraySegment? GetExposedTimeBytes() { return __p.__vector_as_arraysegment(16); } #endif - public long[] GetFrontScenarioGroupIdArray() { return __p.__vector_as_array(24); } - public long StrategyId { get { int o = __p.__offset(26); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } - public long GroundId { get { int o = __p.__offset(28); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } - public bool IsDefeatBattle { get { int o = __p.__offset(30); return o != 0 ? 0!=__p.bb.Get(o + __p.bb_pos) : (bool)false; } } - public long BattleDuration { get { int o = __p.__offset(32); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } - public long BackScenarioGroupId(int j) { int o = __p.__offset(34); return o != 0 ? __p.bb.GetLong(__p.__vector(o) + j * 8) : (long)0; } - public int BackScenarioGroupIdLength { get { int o = __p.__offset(34); return o != 0 ? __p.__vector_len(o) : 0; } } + public byte[] GetExposedTimeArray() { return __p.__vector_as_array(16); } + public bool Hide { get { int o = __p.__offset(18); return o != 0 ? 0!=__p.bb.Get(o + __p.bb_pos) : (bool)false; } } + public bool Open { get { int o = __p.__offset(20); return o != 0 ? 0!=__p.bb.Get(o + __p.bb_pos) : (bool)false; } } + public bool IsContinue { get { int o = __p.__offset(22); return o != 0 ? 0!=__p.bb.Get(o + __p.bb_pos) : (bool)false; } } + public long EpisodeContinueModeId { get { int o = __p.__offset(24); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } + public long FrontScenarioGroupId(int j) { int o = __p.__offset(26); return o != 0 ? __p.bb.GetLong(__p.__vector(o) + j * 8) : (long)0; } + public int FrontScenarioGroupIdLength { get { int o = __p.__offset(26); return o != 0 ? __p.__vector_len(o) : 0; } } #if ENABLE_SPAN_T - public Span GetBackScenarioGroupIdBytes() { return __p.__vector_as_span(34, 8); } + public Span GetFrontScenarioGroupIdBytes() { return __p.__vector_as_span(26, 8); } #else - public ArraySegment? GetBackScenarioGroupIdBytes() { return __p.__vector_as_arraysegment(34); } + public ArraySegment? GetFrontScenarioGroupIdBytes() { return __p.__vector_as_arraysegment(26); } #endif - public long[] GetBackScenarioGroupIdArray() { return __p.__vector_as_array(34); } - public long ClearedModeId(int j) { int o = __p.__offset(36); return o != 0 ? __p.bb.GetLong(__p.__vector(o) + j * 8) : (long)0; } - public int ClearedModeIdLength { get { int o = __p.__offset(36); return o != 0 ? __p.__vector_len(o) : 0; } } + public long[] GetFrontScenarioGroupIdArray() { return __p.__vector_as_array(26); } + public long StrategyId { get { int o = __p.__offset(28); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } + public long GroundId { get { int o = __p.__offset(30); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } + public bool IsDefeatBattle { get { int o = __p.__offset(32); return o != 0 ? 0!=__p.bb.Get(o + __p.bb_pos) : (bool)false; } } + public long BattleDuration { get { int o = __p.__offset(34); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } + public long BackScenarioGroupId(int j) { int o = __p.__offset(36); return o != 0 ? __p.bb.GetLong(__p.__vector(o) + j * 8) : (long)0; } + public int BackScenarioGroupIdLength { get { int o = __p.__offset(36); return o != 0 ? __p.__vector_len(o) : 0; } } #if ENABLE_SPAN_T - public Span GetClearedModeIdBytes() { return __p.__vector_as_span(36, 8); } + public Span GetBackScenarioGroupIdBytes() { return __p.__vector_as_span(36, 8); } #else - public ArraySegment? GetClearedModeIdBytes() { return __p.__vector_as_arraysegment(36); } + public ArraySegment? GetBackScenarioGroupIdBytes() { return __p.__vector_as_arraysegment(36); } #endif - public long[] GetClearedModeIdArray() { return __p.__vector_as_array(36); } - public long ScenarioModeRewardId { get { int o = __p.__offset(38); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } - public bool IsScenarioSpecialReward { get { int o = __p.__offset(40); return o != 0 ? 0!=__p.bb.Get(o + __p.bb_pos) : (bool)false; } } - public long AccountLevelLimit { get { int o = __p.__offset(42); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } - public long ClearedStageId { get { int o = __p.__offset(44); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } - public SCHALE.Common.FlatData.Club NeedClub { get { int o = __p.__offset(46); return o != 0 ? (SCHALE.Common.FlatData.Club)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.Club.None; } } - public int NeedClubStudentCount { get { int o = __p.__offset(48); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } - public long NeedTSS { get { int o = __p.__offset(50); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } + public long[] GetBackScenarioGroupIdArray() { return __p.__vector_as_array(36); } + public long ClearedModeId(int j) { int o = __p.__offset(38); return o != 0 ? __p.bb.GetLong(__p.__vector(o) + j * 8) : (long)0; } + public int ClearedModeIdLength { get { int o = __p.__offset(38); return o != 0 ? __p.__vector_len(o) : 0; } } +#if ENABLE_SPAN_T + public Span GetClearedModeIdBytes() { return __p.__vector_as_span(38, 8); } +#else + public ArraySegment? GetClearedModeIdBytes() { return __p.__vector_as_arraysegment(38); } +#endif + public long[] GetClearedModeIdArray() { return __p.__vector_as_array(38); } + public long ScenarioModeRewardId { get { int o = __p.__offset(40); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } + public bool IsScenarioSpecialReward { get { int o = __p.__offset(42); return o != 0 ? 0!=__p.bb.Get(o + __p.bb_pos) : (bool)false; } } + public long AccountLevelLimit { get { int o = __p.__offset(44); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } + public long ClearedStageId { get { int o = __p.__offset(46); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } + public SCHALE.Common.FlatData.Club NeedClub { get { int o = __p.__offset(48); return o != 0 ? (SCHALE.Common.FlatData.Club)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.Club.None; } } + public int NeedClubStudentCount { get { int o = __p.__offset(50); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } public long EventContentId { get { int o = __p.__offset(52); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } - public SCHALE.Common.FlatData.EventContentType EventContentType { get { int o = __p.__offset(54); return o != 0 ? (SCHALE.Common.FlatData.EventContentType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.EventContentType.Stage; } } + public SCHALE.Common.FlatData.EventContentType EventContentType_ { get { int o = __p.__offset(54); return o != 0 ? (SCHALE.Common.FlatData.EventContentType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.EventContentType.Stage; } } public long EventContentCondition { get { int o = __p.__offset(56); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public long EventContentConditionGroup { get { int o = __p.__offset(58); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public SCHALE.Common.FlatData.StageDifficulty MapDifficulty { get { int o = __p.__offset(60); return o != 0 ? (SCHALE.Common.FlatData.StageDifficulty)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.StageDifficulty.None; } } @@ -79,17 +85,19 @@ public struct ScenarioModeExcel : IFlatbufferObject public ArraySegment? GetEventIconParcelPathBytes() { return __p.__vector_as_arraysegment(66); } #endif public byte[] GetEventIconParcelPathArray() { return __p.__vector_as_array(66); } - public bool Lof { get { int o = __p.__offset(68); return o != 0 ? 0!=__p.bb.Get(o + __p.bb_pos) : (bool)false; } } - public SCHALE.Common.FlatData.StageTopography StageTopography { get { int o = __p.__offset(70); return o != 0 ? (SCHALE.Common.FlatData.StageTopography)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.StageTopography.Street; } } - public long FixedEchelonId { get { int o = __p.__offset(72); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } - public string CompleteReportEventName { get { int o = __p.__offset(74); return o != 0 ? __p.__string(o + __p.bb_pos) : null; } } + public uint EventBannerTitle { get { int o = __p.__offset(68); return o != 0 ? __p.bb.GetUint(o + __p.bb_pos) : (uint)0; } } + public bool Lof { get { int o = __p.__offset(70); return o != 0 ? 0!=__p.bb.Get(o + __p.bb_pos) : (bool)false; } } + public SCHALE.Common.FlatData.StageTopography StageTopography_ { get { int o = __p.__offset(72); return o != 0 ? (SCHALE.Common.FlatData.StageTopography)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.StageTopography.Street; } } + public long FixedEchelonId { get { int o = __p.__offset(74); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } + public string CompleteReportEventName { get { int o = __p.__offset(76); return o != 0 ? __p.__string(o + __p.bb_pos) : null; } } #if ENABLE_SPAN_T - public Span GetCompleteReportEventNameBytes() { return __p.__vector_as_span(74, 1); } + public Span GetCompleteReportEventNameBytes() { return __p.__vector_as_span(76, 1); } #else - public ArraySegment? GetCompleteReportEventNameBytes() { return __p.__vector_as_arraysegment(74); } + public ArraySegment? GetCompleteReportEventNameBytes() { return __p.__vector_as_arraysegment(76); } #endif - public byte[] GetCompleteReportEventNameArray() { return __p.__vector_as_array(74); } - public SCHALE.Common.FlatData.EchelonExtensionType EchelonExtensionType { get { int o = __p.__offset(76); return o != 0 ? (SCHALE.Common.FlatData.EchelonExtensionType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.EchelonExtensionType.Base; } } + public byte[] GetCompleteReportEventNameArray() { return __p.__vector_as_array(76); } + public SCHALE.Common.FlatData.EchelonExtensionType EchelonExtensionType_ { get { int o = __p.__offset(78); return o != 0 ? (SCHALE.Common.FlatData.EchelonExtensionType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.EchelonExtensionType.Base; } } + public long CollectionGroupId { get { int o = __p.__offset(80); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public static Offset CreateScenarioModeExcel(FlatBufferBuilder builder, long ModeId = 0, @@ -98,6 +106,7 @@ public struct ScenarioModeExcel : IFlatbufferObject long VolumeId = 0, long ChapterId = 0, long EpisodeId = 0, + StringOffset ExposedTimeOffset = default(StringOffset), bool Hide = false, bool Open = false, bool IsContinue = false, @@ -115,26 +124,27 @@ public struct ScenarioModeExcel : IFlatbufferObject long ClearedStageId = 0, SCHALE.Common.FlatData.Club NeedClub = SCHALE.Common.FlatData.Club.None, int NeedClubStudentCount = 0, - long NeedTSS = 0, long EventContentId = 0, - SCHALE.Common.FlatData.EventContentType EventContentType = SCHALE.Common.FlatData.EventContentType.Stage, + SCHALE.Common.FlatData.EventContentType EventContentType_ = SCHALE.Common.FlatData.EventContentType.Stage, long EventContentCondition = 0, long EventContentConditionGroup = 0, SCHALE.Common.FlatData.StageDifficulty MapDifficulty = SCHALE.Common.FlatData.StageDifficulty.None, int StepIndex = 0, int RecommendLevel = 0, StringOffset EventIconParcelPathOffset = default(StringOffset), + uint EventBannerTitle = 0, bool Lof = false, - SCHALE.Common.FlatData.StageTopography StageTopography = SCHALE.Common.FlatData.StageTopography.Street, + SCHALE.Common.FlatData.StageTopography StageTopography_ = SCHALE.Common.FlatData.StageTopography.Street, long FixedEchelonId = 0, StringOffset CompleteReportEventNameOffset = default(StringOffset), - SCHALE.Common.FlatData.EchelonExtensionType EchelonExtensionType = SCHALE.Common.FlatData.EchelonExtensionType.Base) { - builder.StartTable(37); + SCHALE.Common.FlatData.EchelonExtensionType EchelonExtensionType_ = SCHALE.Common.FlatData.EchelonExtensionType.Base, + long CollectionGroupId = 0) { + builder.StartTable(39); + ScenarioModeExcel.AddCollectionGroupId(builder, CollectionGroupId); ScenarioModeExcel.AddFixedEchelonId(builder, FixedEchelonId); ScenarioModeExcel.AddEventContentConditionGroup(builder, EventContentConditionGroup); ScenarioModeExcel.AddEventContentCondition(builder, EventContentCondition); ScenarioModeExcel.AddEventContentId(builder, EventContentId); - ScenarioModeExcel.AddNeedTSS(builder, NeedTSS); ScenarioModeExcel.AddClearedStageId(builder, ClearedStageId); ScenarioModeExcel.AddAccountLevelLimit(builder, AccountLevelLimit); ScenarioModeExcel.AddScenarioModeRewardId(builder, ScenarioModeRewardId); @@ -146,19 +156,21 @@ public struct ScenarioModeExcel : IFlatbufferObject ScenarioModeExcel.AddChapterId(builder, ChapterId); ScenarioModeExcel.AddVolumeId(builder, VolumeId); ScenarioModeExcel.AddModeId(builder, ModeId); - ScenarioModeExcel.AddEchelonExtensionType(builder, EchelonExtensionType); + ScenarioModeExcel.AddEchelonExtensionType_(builder, EchelonExtensionType_); ScenarioModeExcel.AddCompleteReportEventName(builder, CompleteReportEventNameOffset); - ScenarioModeExcel.AddStageTopography(builder, StageTopography); + ScenarioModeExcel.AddStageTopography_(builder, StageTopography_); + ScenarioModeExcel.AddEventBannerTitle(builder, EventBannerTitle); ScenarioModeExcel.AddEventIconParcelPath(builder, EventIconParcelPathOffset); ScenarioModeExcel.AddRecommendLevel(builder, RecommendLevel); ScenarioModeExcel.AddStepIndex(builder, StepIndex); ScenarioModeExcel.AddMapDifficulty(builder, MapDifficulty); - ScenarioModeExcel.AddEventContentType(builder, EventContentType); + ScenarioModeExcel.AddEventContentType_(builder, EventContentType_); ScenarioModeExcel.AddNeedClubStudentCount(builder, NeedClubStudentCount); ScenarioModeExcel.AddNeedClub(builder, NeedClub); ScenarioModeExcel.AddClearedModeId(builder, ClearedModeIdOffset); ScenarioModeExcel.AddBackScenarioGroupId(builder, BackScenarioGroupIdOffset); ScenarioModeExcel.AddFrontScenarioGroupId(builder, FrontScenarioGroupIdOffset); + ScenarioModeExcel.AddExposedTime(builder, ExposedTimeOffset); ScenarioModeExcel.AddSubType(builder, SubType); ScenarioModeExcel.AddModeType(builder, ModeType); ScenarioModeExcel.AddLof(builder, Lof); @@ -170,59 +182,61 @@ public struct ScenarioModeExcel : IFlatbufferObject return ScenarioModeExcel.EndScenarioModeExcel(builder); } - public static void StartScenarioModeExcel(FlatBufferBuilder builder) { builder.StartTable(37); } + public static void StartScenarioModeExcel(FlatBufferBuilder builder) { builder.StartTable(39); } public static void AddModeId(FlatBufferBuilder builder, long modeId) { builder.AddLong(0, modeId, 0); } public static void AddModeType(FlatBufferBuilder builder, SCHALE.Common.FlatData.ScenarioModeTypes modeType) { builder.AddInt(1, (int)modeType, 0); } public static void AddSubType(FlatBufferBuilder builder, SCHALE.Common.FlatData.ScenarioModeSubTypes subType) { builder.AddInt(2, (int)subType, 0); } public static void AddVolumeId(FlatBufferBuilder builder, long volumeId) { builder.AddLong(3, volumeId, 0); } public static void AddChapterId(FlatBufferBuilder builder, long chapterId) { builder.AddLong(4, chapterId, 0); } public static void AddEpisodeId(FlatBufferBuilder builder, long episodeId) { builder.AddLong(5, episodeId, 0); } - public static void AddHide(FlatBufferBuilder builder, bool hide) { builder.AddBool(6, hide, false); } - public static void AddOpen(FlatBufferBuilder builder, bool open) { builder.AddBool(7, open, false); } - public static void AddIsContinue(FlatBufferBuilder builder, bool isContinue) { builder.AddBool(8, isContinue, false); } - public static void AddEpisodeContinueModeId(FlatBufferBuilder builder, long episodeContinueModeId) { builder.AddLong(9, episodeContinueModeId, 0); } - public static void AddFrontScenarioGroupId(FlatBufferBuilder builder, VectorOffset frontScenarioGroupIdOffset) { builder.AddOffset(10, frontScenarioGroupIdOffset.Value, 0); } + public static void AddExposedTime(FlatBufferBuilder builder, StringOffset exposedTimeOffset) { builder.AddOffset(6, exposedTimeOffset.Value, 0); } + public static void AddHide(FlatBufferBuilder builder, bool hide) { builder.AddBool(7, hide, false); } + public static void AddOpen(FlatBufferBuilder builder, bool open) { builder.AddBool(8, open, false); } + public static void AddIsContinue(FlatBufferBuilder builder, bool isContinue) { builder.AddBool(9, isContinue, false); } + public static void AddEpisodeContinueModeId(FlatBufferBuilder builder, long episodeContinueModeId) { builder.AddLong(10, episodeContinueModeId, 0); } + public static void AddFrontScenarioGroupId(FlatBufferBuilder builder, VectorOffset frontScenarioGroupIdOffset) { builder.AddOffset(11, frontScenarioGroupIdOffset.Value, 0); } public static VectorOffset CreateFrontScenarioGroupIdVector(FlatBufferBuilder builder, long[] data) { builder.StartVector(8, data.Length, 8); for (int i = data.Length - 1; i >= 0; i--) builder.AddLong(data[i]); return builder.EndVector(); } public static VectorOffset CreateFrontScenarioGroupIdVectorBlock(FlatBufferBuilder builder, long[] data) { builder.StartVector(8, data.Length, 8); builder.Add(data); return builder.EndVector(); } public static VectorOffset CreateFrontScenarioGroupIdVectorBlock(FlatBufferBuilder builder, ArraySegment data) { builder.StartVector(8, data.Count, 8); builder.Add(data); return builder.EndVector(); } public static VectorOffset CreateFrontScenarioGroupIdVectorBlock(FlatBufferBuilder builder, IntPtr dataPtr, int sizeInBytes) { builder.StartVector(1, sizeInBytes, 1); builder.Add(dataPtr, sizeInBytes); return builder.EndVector(); } public static void StartFrontScenarioGroupIdVector(FlatBufferBuilder builder, int numElems) { builder.StartVector(8, numElems, 8); } - public static void AddStrategyId(FlatBufferBuilder builder, long strategyId) { builder.AddLong(11, strategyId, 0); } - public static void AddGroundId(FlatBufferBuilder builder, long groundId) { builder.AddLong(12, groundId, 0); } - public static void AddIsDefeatBattle(FlatBufferBuilder builder, bool isDefeatBattle) { builder.AddBool(13, isDefeatBattle, false); } - public static void AddBattleDuration(FlatBufferBuilder builder, long battleDuration) { builder.AddLong(14, battleDuration, 0); } - public static void AddBackScenarioGroupId(FlatBufferBuilder builder, VectorOffset backScenarioGroupIdOffset) { builder.AddOffset(15, backScenarioGroupIdOffset.Value, 0); } + public static void AddStrategyId(FlatBufferBuilder builder, long strategyId) { builder.AddLong(12, strategyId, 0); } + public static void AddGroundId(FlatBufferBuilder builder, long groundId) { builder.AddLong(13, groundId, 0); } + public static void AddIsDefeatBattle(FlatBufferBuilder builder, bool isDefeatBattle) { builder.AddBool(14, isDefeatBattle, false); } + public static void AddBattleDuration(FlatBufferBuilder builder, long battleDuration) { builder.AddLong(15, battleDuration, 0); } + public static void AddBackScenarioGroupId(FlatBufferBuilder builder, VectorOffset backScenarioGroupIdOffset) { builder.AddOffset(16, backScenarioGroupIdOffset.Value, 0); } public static VectorOffset CreateBackScenarioGroupIdVector(FlatBufferBuilder builder, long[] data) { builder.StartVector(8, data.Length, 8); for (int i = data.Length - 1; i >= 0; i--) builder.AddLong(data[i]); return builder.EndVector(); } public static VectorOffset CreateBackScenarioGroupIdVectorBlock(FlatBufferBuilder builder, long[] data) { builder.StartVector(8, data.Length, 8); builder.Add(data); return builder.EndVector(); } public static VectorOffset CreateBackScenarioGroupIdVectorBlock(FlatBufferBuilder builder, ArraySegment data) { builder.StartVector(8, data.Count, 8); builder.Add(data); return builder.EndVector(); } public static VectorOffset CreateBackScenarioGroupIdVectorBlock(FlatBufferBuilder builder, IntPtr dataPtr, int sizeInBytes) { builder.StartVector(1, sizeInBytes, 1); builder.Add(dataPtr, sizeInBytes); return builder.EndVector(); } public static void StartBackScenarioGroupIdVector(FlatBufferBuilder builder, int numElems) { builder.StartVector(8, numElems, 8); } - public static void AddClearedModeId(FlatBufferBuilder builder, VectorOffset clearedModeIdOffset) { builder.AddOffset(16, clearedModeIdOffset.Value, 0); } + public static void AddClearedModeId(FlatBufferBuilder builder, VectorOffset clearedModeIdOffset) { builder.AddOffset(17, clearedModeIdOffset.Value, 0); } public static VectorOffset CreateClearedModeIdVector(FlatBufferBuilder builder, long[] data) { builder.StartVector(8, data.Length, 8); for (int i = data.Length - 1; i >= 0; i--) builder.AddLong(data[i]); return builder.EndVector(); } public static VectorOffset CreateClearedModeIdVectorBlock(FlatBufferBuilder builder, long[] data) { builder.StartVector(8, data.Length, 8); builder.Add(data); return builder.EndVector(); } public static VectorOffset CreateClearedModeIdVectorBlock(FlatBufferBuilder builder, ArraySegment data) { builder.StartVector(8, data.Count, 8); builder.Add(data); return builder.EndVector(); } public static VectorOffset CreateClearedModeIdVectorBlock(FlatBufferBuilder builder, IntPtr dataPtr, int sizeInBytes) { builder.StartVector(1, sizeInBytes, 1); builder.Add(dataPtr, sizeInBytes); return builder.EndVector(); } public static void StartClearedModeIdVector(FlatBufferBuilder builder, int numElems) { builder.StartVector(8, numElems, 8); } - public static void AddScenarioModeRewardId(FlatBufferBuilder builder, long scenarioModeRewardId) { builder.AddLong(17, scenarioModeRewardId, 0); } - public static void AddIsScenarioSpecialReward(FlatBufferBuilder builder, bool isScenarioSpecialReward) { builder.AddBool(18, isScenarioSpecialReward, false); } - public static void AddAccountLevelLimit(FlatBufferBuilder builder, long accountLevelLimit) { builder.AddLong(19, accountLevelLimit, 0); } - public static void AddClearedStageId(FlatBufferBuilder builder, long clearedStageId) { builder.AddLong(20, clearedStageId, 0); } - public static void AddNeedClub(FlatBufferBuilder builder, SCHALE.Common.FlatData.Club needClub) { builder.AddInt(21, (int)needClub, 0); } - public static void AddNeedClubStudentCount(FlatBufferBuilder builder, int needClubStudentCount) { builder.AddInt(22, needClubStudentCount, 0); } - public static void AddNeedTSS(FlatBufferBuilder builder, long needTSS) { builder.AddLong(23, needTSS, 0); } + public static void AddScenarioModeRewardId(FlatBufferBuilder builder, long scenarioModeRewardId) { builder.AddLong(18, scenarioModeRewardId, 0); } + public static void AddIsScenarioSpecialReward(FlatBufferBuilder builder, bool isScenarioSpecialReward) { builder.AddBool(19, isScenarioSpecialReward, false); } + public static void AddAccountLevelLimit(FlatBufferBuilder builder, long accountLevelLimit) { builder.AddLong(20, accountLevelLimit, 0); } + public static void AddClearedStageId(FlatBufferBuilder builder, long clearedStageId) { builder.AddLong(21, clearedStageId, 0); } + public static void AddNeedClub(FlatBufferBuilder builder, SCHALE.Common.FlatData.Club needClub) { builder.AddInt(22, (int)needClub, 0); } + public static void AddNeedClubStudentCount(FlatBufferBuilder builder, int needClubStudentCount) { builder.AddInt(23, needClubStudentCount, 0); } public static void AddEventContentId(FlatBufferBuilder builder, long eventContentId) { builder.AddLong(24, eventContentId, 0); } - public static void AddEventContentType(FlatBufferBuilder builder, SCHALE.Common.FlatData.EventContentType eventContentType) { builder.AddInt(25, (int)eventContentType, 0); } + public static void AddEventContentType_(FlatBufferBuilder builder, SCHALE.Common.FlatData.EventContentType eventContentType_) { builder.AddInt(25, (int)eventContentType_, 0); } public static void AddEventContentCondition(FlatBufferBuilder builder, long eventContentCondition) { builder.AddLong(26, eventContentCondition, 0); } public static void AddEventContentConditionGroup(FlatBufferBuilder builder, long eventContentConditionGroup) { builder.AddLong(27, eventContentConditionGroup, 0); } public static void AddMapDifficulty(FlatBufferBuilder builder, SCHALE.Common.FlatData.StageDifficulty mapDifficulty) { builder.AddInt(28, (int)mapDifficulty, 0); } public static void AddStepIndex(FlatBufferBuilder builder, int stepIndex) { builder.AddInt(29, stepIndex, 0); } public static void AddRecommendLevel(FlatBufferBuilder builder, int recommendLevel) { builder.AddInt(30, recommendLevel, 0); } public static void AddEventIconParcelPath(FlatBufferBuilder builder, StringOffset eventIconParcelPathOffset) { builder.AddOffset(31, eventIconParcelPathOffset.Value, 0); } - public static void AddLof(FlatBufferBuilder builder, bool lof) { builder.AddBool(32, lof, false); } - public static void AddStageTopography(FlatBufferBuilder builder, SCHALE.Common.FlatData.StageTopography stageTopography) { builder.AddInt(33, (int)stageTopography, 0); } - public static void AddFixedEchelonId(FlatBufferBuilder builder, long fixedEchelonId) { builder.AddLong(34, fixedEchelonId, 0); } - public static void AddCompleteReportEventName(FlatBufferBuilder builder, StringOffset completeReportEventNameOffset) { builder.AddOffset(35, completeReportEventNameOffset.Value, 0); } - public static void AddEchelonExtensionType(FlatBufferBuilder builder, SCHALE.Common.FlatData.EchelonExtensionType echelonExtensionType) { builder.AddInt(36, (int)echelonExtensionType, 0); } + public static void AddEventBannerTitle(FlatBufferBuilder builder, uint eventBannerTitle) { builder.AddUint(32, eventBannerTitle, 0); } + public static void AddLof(FlatBufferBuilder builder, bool lof) { builder.AddBool(33, lof, false); } + public static void AddStageTopography_(FlatBufferBuilder builder, SCHALE.Common.FlatData.StageTopography stageTopography_) { builder.AddInt(34, (int)stageTopography_, 0); } + public static void AddFixedEchelonId(FlatBufferBuilder builder, long fixedEchelonId) { builder.AddLong(35, fixedEchelonId, 0); } + public static void AddCompleteReportEventName(FlatBufferBuilder builder, StringOffset completeReportEventNameOffset) { builder.AddOffset(36, completeReportEventNameOffset.Value, 0); } + public static void AddEchelonExtensionType_(FlatBufferBuilder builder, SCHALE.Common.FlatData.EchelonExtensionType echelonExtensionType_) { builder.AddInt(37, (int)echelonExtensionType_, 0); } + public static void AddCollectionGroupId(FlatBufferBuilder builder, long collectionGroupId) { builder.AddLong(38, collectionGroupId, 0); } public static Offset EndScenarioModeExcel(FlatBufferBuilder builder) { int o = builder.EndTable(); return new Offset(o); @@ -240,6 +254,7 @@ public struct ScenarioModeExcel : IFlatbufferObject _o.VolumeId = TableEncryptionService.Convert(this.VolumeId, key); _o.ChapterId = TableEncryptionService.Convert(this.ChapterId, key); _o.EpisodeId = TableEncryptionService.Convert(this.EpisodeId, key); + _o.ExposedTime = TableEncryptionService.Convert(this.ExposedTime, key); _o.Hide = TableEncryptionService.Convert(this.Hide, key); _o.Open = TableEncryptionService.Convert(this.Open, key); _o.IsContinue = TableEncryptionService.Convert(this.IsContinue, key); @@ -260,23 +275,25 @@ public struct ScenarioModeExcel : IFlatbufferObject _o.ClearedStageId = TableEncryptionService.Convert(this.ClearedStageId, key); _o.NeedClub = TableEncryptionService.Convert(this.NeedClub, key); _o.NeedClubStudentCount = TableEncryptionService.Convert(this.NeedClubStudentCount, key); - _o.NeedTSS = TableEncryptionService.Convert(this.NeedTSS, key); _o.EventContentId = TableEncryptionService.Convert(this.EventContentId, key); - _o.EventContentType = TableEncryptionService.Convert(this.EventContentType, key); + _o.EventContentType_ = TableEncryptionService.Convert(this.EventContentType_, key); _o.EventContentCondition = TableEncryptionService.Convert(this.EventContentCondition, key); _o.EventContentConditionGroup = TableEncryptionService.Convert(this.EventContentConditionGroup, key); _o.MapDifficulty = TableEncryptionService.Convert(this.MapDifficulty, key); _o.StepIndex = TableEncryptionService.Convert(this.StepIndex, key); _o.RecommendLevel = TableEncryptionService.Convert(this.RecommendLevel, key); _o.EventIconParcelPath = TableEncryptionService.Convert(this.EventIconParcelPath, key); + _o.EventBannerTitle = TableEncryptionService.Convert(this.EventBannerTitle, key); _o.Lof = TableEncryptionService.Convert(this.Lof, key); - _o.StageTopography = TableEncryptionService.Convert(this.StageTopography, key); + _o.StageTopography_ = TableEncryptionService.Convert(this.StageTopography_, key); _o.FixedEchelonId = TableEncryptionService.Convert(this.FixedEchelonId, key); _o.CompleteReportEventName = TableEncryptionService.Convert(this.CompleteReportEventName, key); - _o.EchelonExtensionType = TableEncryptionService.Convert(this.EchelonExtensionType, key); + _o.EchelonExtensionType_ = TableEncryptionService.Convert(this.EchelonExtensionType_, key); + _o.CollectionGroupId = TableEncryptionService.Convert(this.CollectionGroupId, key); } public static Offset Pack(FlatBufferBuilder builder, ScenarioModeExcelT _o) { if (_o == null) return default(Offset); + var _ExposedTime = _o.ExposedTime == null ? default(StringOffset) : builder.CreateString(_o.ExposedTime); var _FrontScenarioGroupId = default(VectorOffset); if (_o.FrontScenarioGroupId != null) { var __FrontScenarioGroupId = _o.FrontScenarioGroupId.ToArray(); @@ -302,6 +319,7 @@ public struct ScenarioModeExcel : IFlatbufferObject _o.VolumeId, _o.ChapterId, _o.EpisodeId, + _ExposedTime, _o.Hide, _o.Open, _o.IsContinue, @@ -319,20 +337,21 @@ public struct ScenarioModeExcel : IFlatbufferObject _o.ClearedStageId, _o.NeedClub, _o.NeedClubStudentCount, - _o.NeedTSS, _o.EventContentId, - _o.EventContentType, + _o.EventContentType_, _o.EventContentCondition, _o.EventContentConditionGroup, _o.MapDifficulty, _o.StepIndex, _o.RecommendLevel, _EventIconParcelPath, + _o.EventBannerTitle, _o.Lof, - _o.StageTopography, + _o.StageTopography_, _o.FixedEchelonId, _CompleteReportEventName, - _o.EchelonExtensionType); + _o.EchelonExtensionType_, + _o.CollectionGroupId); } } @@ -344,6 +363,7 @@ public class ScenarioModeExcelT public long VolumeId { get; set; } public long ChapterId { get; set; } public long EpisodeId { get; set; } + public string ExposedTime { get; set; } public bool Hide { get; set; } public bool Open { get; set; } public bool IsContinue { get; set; } @@ -361,20 +381,21 @@ public class ScenarioModeExcelT public long ClearedStageId { get; set; } public SCHALE.Common.FlatData.Club NeedClub { get; set; } public int NeedClubStudentCount { get; set; } - public long NeedTSS { get; set; } public long EventContentId { get; set; } - public SCHALE.Common.FlatData.EventContentType EventContentType { get; set; } + public SCHALE.Common.FlatData.EventContentType EventContentType_ { get; set; } public long EventContentCondition { get; set; } public long EventContentConditionGroup { get; set; } public SCHALE.Common.FlatData.StageDifficulty MapDifficulty { get; set; } public int StepIndex { get; set; } public int RecommendLevel { get; set; } public string EventIconParcelPath { get; set; } + public uint EventBannerTitle { get; set; } public bool Lof { get; set; } - public SCHALE.Common.FlatData.StageTopography StageTopography { get; set; } + public SCHALE.Common.FlatData.StageTopography StageTopography_ { get; set; } public long FixedEchelonId { get; set; } public string CompleteReportEventName { get; set; } - public SCHALE.Common.FlatData.EchelonExtensionType EchelonExtensionType { get; set; } + public SCHALE.Common.FlatData.EchelonExtensionType EchelonExtensionType_ { get; set; } + public long CollectionGroupId { get; set; } public ScenarioModeExcelT() { this.ModeId = 0; @@ -383,6 +404,7 @@ public class ScenarioModeExcelT this.VolumeId = 0; this.ChapterId = 0; this.EpisodeId = 0; + this.ExposedTime = null; this.Hide = false; this.Open = false; this.IsContinue = false; @@ -400,20 +422,21 @@ public class ScenarioModeExcelT this.ClearedStageId = 0; this.NeedClub = SCHALE.Common.FlatData.Club.None; this.NeedClubStudentCount = 0; - this.NeedTSS = 0; this.EventContentId = 0; - this.EventContentType = SCHALE.Common.FlatData.EventContentType.Stage; + this.EventContentType_ = SCHALE.Common.FlatData.EventContentType.Stage; this.EventContentCondition = 0; this.EventContentConditionGroup = 0; this.MapDifficulty = SCHALE.Common.FlatData.StageDifficulty.None; this.StepIndex = 0; this.RecommendLevel = 0; this.EventIconParcelPath = null; + this.EventBannerTitle = 0; this.Lof = false; - this.StageTopography = SCHALE.Common.FlatData.StageTopography.Street; + this.StageTopography_ = SCHALE.Common.FlatData.StageTopography.Street; this.FixedEchelonId = 0; this.CompleteReportEventName = null; - this.EchelonExtensionType = SCHALE.Common.FlatData.EchelonExtensionType.Base; + this.EchelonExtensionType_ = SCHALE.Common.FlatData.EchelonExtensionType.Base; + this.CollectionGroupId = 0; } } @@ -429,37 +452,39 @@ static public class ScenarioModeExcelVerify && verifier.VerifyField(tablePos, 10 /*VolumeId*/, 8 /*long*/, 8, false) && verifier.VerifyField(tablePos, 12 /*ChapterId*/, 8 /*long*/, 8, false) && verifier.VerifyField(tablePos, 14 /*EpisodeId*/, 8 /*long*/, 8, false) - && verifier.VerifyField(tablePos, 16 /*Hide*/, 1 /*bool*/, 1, false) - && verifier.VerifyField(tablePos, 18 /*Open*/, 1 /*bool*/, 1, false) - && verifier.VerifyField(tablePos, 20 /*IsContinue*/, 1 /*bool*/, 1, false) - && verifier.VerifyField(tablePos, 22 /*EpisodeContinueModeId*/, 8 /*long*/, 8, false) - && verifier.VerifyVectorOfData(tablePos, 24 /*FrontScenarioGroupId*/, 8 /*long*/, false) - && verifier.VerifyField(tablePos, 26 /*StrategyId*/, 8 /*long*/, 8, false) - && verifier.VerifyField(tablePos, 28 /*GroundId*/, 8 /*long*/, 8, false) - && verifier.VerifyField(tablePos, 30 /*IsDefeatBattle*/, 1 /*bool*/, 1, false) - && verifier.VerifyField(tablePos, 32 /*BattleDuration*/, 8 /*long*/, 8, false) - && verifier.VerifyVectorOfData(tablePos, 34 /*BackScenarioGroupId*/, 8 /*long*/, false) - && verifier.VerifyVectorOfData(tablePos, 36 /*ClearedModeId*/, 8 /*long*/, false) - && verifier.VerifyField(tablePos, 38 /*ScenarioModeRewardId*/, 8 /*long*/, 8, false) - && verifier.VerifyField(tablePos, 40 /*IsScenarioSpecialReward*/, 1 /*bool*/, 1, false) - && verifier.VerifyField(tablePos, 42 /*AccountLevelLimit*/, 8 /*long*/, 8, false) - && verifier.VerifyField(tablePos, 44 /*ClearedStageId*/, 8 /*long*/, 8, false) - && verifier.VerifyField(tablePos, 46 /*NeedClub*/, 4 /*SCHALE.Common.FlatData.Club*/, 4, false) - && verifier.VerifyField(tablePos, 48 /*NeedClubStudentCount*/, 4 /*int*/, 4, false) - && verifier.VerifyField(tablePos, 50 /*NeedTSS*/, 8 /*long*/, 8, false) + && verifier.VerifyString(tablePos, 16 /*ExposedTime*/, false) + && verifier.VerifyField(tablePos, 18 /*Hide*/, 1 /*bool*/, 1, false) + && verifier.VerifyField(tablePos, 20 /*Open*/, 1 /*bool*/, 1, false) + && verifier.VerifyField(tablePos, 22 /*IsContinue*/, 1 /*bool*/, 1, false) + && verifier.VerifyField(tablePos, 24 /*EpisodeContinueModeId*/, 8 /*long*/, 8, false) + && verifier.VerifyVectorOfData(tablePos, 26 /*FrontScenarioGroupId*/, 8 /*long*/, false) + && verifier.VerifyField(tablePos, 28 /*StrategyId*/, 8 /*long*/, 8, false) + && verifier.VerifyField(tablePos, 30 /*GroundId*/, 8 /*long*/, 8, false) + && verifier.VerifyField(tablePos, 32 /*IsDefeatBattle*/, 1 /*bool*/, 1, false) + && verifier.VerifyField(tablePos, 34 /*BattleDuration*/, 8 /*long*/, 8, false) + && verifier.VerifyVectorOfData(tablePos, 36 /*BackScenarioGroupId*/, 8 /*long*/, false) + && verifier.VerifyVectorOfData(tablePos, 38 /*ClearedModeId*/, 8 /*long*/, false) + && verifier.VerifyField(tablePos, 40 /*ScenarioModeRewardId*/, 8 /*long*/, 8, false) + && verifier.VerifyField(tablePos, 42 /*IsScenarioSpecialReward*/, 1 /*bool*/, 1, false) + && verifier.VerifyField(tablePos, 44 /*AccountLevelLimit*/, 8 /*long*/, 8, false) + && verifier.VerifyField(tablePos, 46 /*ClearedStageId*/, 8 /*long*/, 8, false) + && verifier.VerifyField(tablePos, 48 /*NeedClub*/, 4 /*SCHALE.Common.FlatData.Club*/, 4, false) + && verifier.VerifyField(tablePos, 50 /*NeedClubStudentCount*/, 4 /*int*/, 4, false) && verifier.VerifyField(tablePos, 52 /*EventContentId*/, 8 /*long*/, 8, false) - && verifier.VerifyField(tablePos, 54 /*EventContentType*/, 4 /*SCHALE.Common.FlatData.EventContentType*/, 4, false) + && verifier.VerifyField(tablePos, 54 /*EventContentType_*/, 4 /*SCHALE.Common.FlatData.EventContentType*/, 4, false) && verifier.VerifyField(tablePos, 56 /*EventContentCondition*/, 8 /*long*/, 8, false) && verifier.VerifyField(tablePos, 58 /*EventContentConditionGroup*/, 8 /*long*/, 8, false) && verifier.VerifyField(tablePos, 60 /*MapDifficulty*/, 4 /*SCHALE.Common.FlatData.StageDifficulty*/, 4, false) && verifier.VerifyField(tablePos, 62 /*StepIndex*/, 4 /*int*/, 4, false) && verifier.VerifyField(tablePos, 64 /*RecommendLevel*/, 4 /*int*/, 4, false) && verifier.VerifyString(tablePos, 66 /*EventIconParcelPath*/, false) - && verifier.VerifyField(tablePos, 68 /*Lof*/, 1 /*bool*/, 1, false) - && verifier.VerifyField(tablePos, 70 /*StageTopography*/, 4 /*SCHALE.Common.FlatData.StageTopography*/, 4, false) - && verifier.VerifyField(tablePos, 72 /*FixedEchelonId*/, 8 /*long*/, 8, false) - && verifier.VerifyString(tablePos, 74 /*CompleteReportEventName*/, false) - && verifier.VerifyField(tablePos, 76 /*EchelonExtensionType*/, 4 /*SCHALE.Common.FlatData.EchelonExtensionType*/, 4, false) + && verifier.VerifyField(tablePos, 68 /*EventBannerTitle*/, 4 /*uint*/, 4, false) + && verifier.VerifyField(tablePos, 70 /*Lof*/, 1 /*bool*/, 1, false) + && verifier.VerifyField(tablePos, 72 /*StageTopography_*/, 4 /*SCHALE.Common.FlatData.StageTopography*/, 4, false) + && verifier.VerifyField(tablePos, 74 /*FixedEchelonId*/, 8 /*long*/, 8, false) + && verifier.VerifyString(tablePos, 76 /*CompleteReportEventName*/, false) + && verifier.VerifyField(tablePos, 78 /*EchelonExtensionType_*/, 4 /*SCHALE.Common.FlatData.EchelonExtensionType*/, 4, false) + && verifier.VerifyField(tablePos, 80 /*CollectionGroupId*/, 8 /*long*/, 8, false) && verifier.VerifyTableEnd(tablePos); } } diff --git a/SCHALE.Common/FlatData/ScenarioModeRewardExcel.cs b/SCHALE.Common/FlatData/ScenarioModeRewardExcel.cs index 56410b1..42ae17f 100644 --- a/SCHALE.Common/FlatData/ScenarioModeRewardExcel.cs +++ b/SCHALE.Common/FlatData/ScenarioModeRewardExcel.cs @@ -21,7 +21,7 @@ public struct ScenarioModeRewardExcel : IFlatbufferObject public ScenarioModeRewardExcel __assign(int _i, ByteBuffer _bb) { __init(_i, _bb); return this; } public long ScenarioModeRewardId { get { int o = __p.__offset(4); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } - public SCHALE.Common.FlatData.RewardTag RewardTag { get { int o = __p.__offset(6); return o != 0 ? (SCHALE.Common.FlatData.RewardTag)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.RewardTag.Default; } } + public SCHALE.Common.FlatData.RewardTag RewardTag_ { get { int o = __p.__offset(6); return o != 0 ? (SCHALE.Common.FlatData.RewardTag)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.RewardTag.Default; } } public int RewardProb { get { int o = __p.__offset(8); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } public SCHALE.Common.FlatData.ParcelType RewardParcelType { get { int o = __p.__offset(10); return o != 0 ? (SCHALE.Common.FlatData.ParcelType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.ParcelType.None; } } public long RewardParcelId { get { int o = __p.__offset(12); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } @@ -30,7 +30,7 @@ public struct ScenarioModeRewardExcel : IFlatbufferObject public static Offset CreateScenarioModeRewardExcel(FlatBufferBuilder builder, long ScenarioModeRewardId = 0, - SCHALE.Common.FlatData.RewardTag RewardTag = SCHALE.Common.FlatData.RewardTag.Default, + SCHALE.Common.FlatData.RewardTag RewardTag_ = SCHALE.Common.FlatData.RewardTag.Default, int RewardProb = 0, SCHALE.Common.FlatData.ParcelType RewardParcelType = SCHALE.Common.FlatData.ParcelType.None, long RewardParcelId = 0, @@ -42,14 +42,14 @@ public struct ScenarioModeRewardExcel : IFlatbufferObject ScenarioModeRewardExcel.AddRewardParcelAmount(builder, RewardParcelAmount); ScenarioModeRewardExcel.AddRewardParcelType(builder, RewardParcelType); ScenarioModeRewardExcel.AddRewardProb(builder, RewardProb); - ScenarioModeRewardExcel.AddRewardTag(builder, RewardTag); + ScenarioModeRewardExcel.AddRewardTag_(builder, RewardTag_); ScenarioModeRewardExcel.AddIsDisplayed(builder, IsDisplayed); return ScenarioModeRewardExcel.EndScenarioModeRewardExcel(builder); } public static void StartScenarioModeRewardExcel(FlatBufferBuilder builder) { builder.StartTable(7); } public static void AddScenarioModeRewardId(FlatBufferBuilder builder, long scenarioModeRewardId) { builder.AddLong(0, scenarioModeRewardId, 0); } - public static void AddRewardTag(FlatBufferBuilder builder, SCHALE.Common.FlatData.RewardTag rewardTag) { builder.AddInt(1, (int)rewardTag, 0); } + public static void AddRewardTag_(FlatBufferBuilder builder, SCHALE.Common.FlatData.RewardTag rewardTag_) { builder.AddInt(1, (int)rewardTag_, 0); } public static void AddRewardProb(FlatBufferBuilder builder, int rewardProb) { builder.AddInt(2, rewardProb, 0); } public static void AddRewardParcelType(FlatBufferBuilder builder, SCHALE.Common.FlatData.ParcelType rewardParcelType) { builder.AddInt(3, (int)rewardParcelType, 0); } public static void AddRewardParcelId(FlatBufferBuilder builder, long rewardParcelId) { builder.AddLong(4, rewardParcelId, 0); } @@ -67,7 +67,7 @@ public struct ScenarioModeRewardExcel : IFlatbufferObject public void UnPackTo(ScenarioModeRewardExcelT _o) { byte[] key = TableEncryptionService.CreateKey("ScenarioModeReward"); _o.ScenarioModeRewardId = TableEncryptionService.Convert(this.ScenarioModeRewardId, key); - _o.RewardTag = TableEncryptionService.Convert(this.RewardTag, key); + _o.RewardTag_ = TableEncryptionService.Convert(this.RewardTag_, key); _o.RewardProb = TableEncryptionService.Convert(this.RewardProb, key); _o.RewardParcelType = TableEncryptionService.Convert(this.RewardParcelType, key); _o.RewardParcelId = TableEncryptionService.Convert(this.RewardParcelId, key); @@ -79,7 +79,7 @@ public struct ScenarioModeRewardExcel : IFlatbufferObject return CreateScenarioModeRewardExcel( builder, _o.ScenarioModeRewardId, - _o.RewardTag, + _o.RewardTag_, _o.RewardProb, _o.RewardParcelType, _o.RewardParcelId, @@ -91,7 +91,7 @@ public struct ScenarioModeRewardExcel : IFlatbufferObject public class ScenarioModeRewardExcelT { public long ScenarioModeRewardId { get; set; } - public SCHALE.Common.FlatData.RewardTag RewardTag { get; set; } + public SCHALE.Common.FlatData.RewardTag RewardTag_ { get; set; } public int RewardProb { get; set; } public SCHALE.Common.FlatData.ParcelType RewardParcelType { get; set; } public long RewardParcelId { get; set; } @@ -100,7 +100,7 @@ public class ScenarioModeRewardExcelT public ScenarioModeRewardExcelT() { this.ScenarioModeRewardId = 0; - this.RewardTag = SCHALE.Common.FlatData.RewardTag.Default; + this.RewardTag_ = SCHALE.Common.FlatData.RewardTag.Default; this.RewardProb = 0; this.RewardParcelType = SCHALE.Common.FlatData.ParcelType.None; this.RewardParcelId = 0; @@ -116,7 +116,7 @@ static public class ScenarioModeRewardExcelVerify { return verifier.VerifyTableStart(tablePos) && verifier.VerifyField(tablePos, 4 /*ScenarioModeRewardId*/, 8 /*long*/, 8, false) - && verifier.VerifyField(tablePos, 6 /*RewardTag*/, 4 /*SCHALE.Common.FlatData.RewardTag*/, 4, false) + && verifier.VerifyField(tablePos, 6 /*RewardTag_*/, 4 /*SCHALE.Common.FlatData.RewardTag*/, 4, false) && verifier.VerifyField(tablePos, 8 /*RewardProb*/, 4 /*int*/, 4, false) && verifier.VerifyField(tablePos, 10 /*RewardParcelType*/, 4 /*SCHALE.Common.FlatData.ParcelType*/, 4, false) && verifier.VerifyField(tablePos, 12 /*RewardParcelId*/, 8 /*long*/, 8, false) diff --git a/SCHALE.Common/FlatData/ScenarioModeRewardExcelTable.cs b/SCHALE.Common/FlatData/ScenarioModeRewardExcelTable.cs deleted file mode 100644 index 1a79b40..0000000 --- a/SCHALE.Common/FlatData/ScenarioModeRewardExcelTable.cs +++ /dev/null @@ -1,88 +0,0 @@ -// -// automatically generated by the FlatBuffers compiler, do not modify -// - -namespace SCHALE.Common.FlatData -{ - -using global::System; -using global::System.Collections.Generic; -using global::SCHALE.Common.Crypto; -using global::Google.FlatBuffers; - -public struct ScenarioModeRewardExcelTable : IFlatbufferObject -{ - private Table __p; - public ByteBuffer ByteBuffer { get { return __p.bb; } } - public static void ValidateVersion() { FlatBufferConstants.FLATBUFFERS_24_3_25(); } - public static ScenarioModeRewardExcelTable GetRootAsScenarioModeRewardExcelTable(ByteBuffer _bb) { return GetRootAsScenarioModeRewardExcelTable(_bb, new ScenarioModeRewardExcelTable()); } - public static ScenarioModeRewardExcelTable GetRootAsScenarioModeRewardExcelTable(ByteBuffer _bb, ScenarioModeRewardExcelTable obj) { return (obj.__assign(_bb.GetInt(_bb.Position) + _bb.Position, _bb)); } - public void __init(int _i, ByteBuffer _bb) { __p = new Table(_i, _bb); } - public ScenarioModeRewardExcelTable __assign(int _i, ByteBuffer _bb) { __init(_i, _bb); return this; } - - public SCHALE.Common.FlatData.ScenarioModeRewardExcel? DataList(int j) { int o = __p.__offset(4); return o != 0 ? (SCHALE.Common.FlatData.ScenarioModeRewardExcel?)(new SCHALE.Common.FlatData.ScenarioModeRewardExcel()).__assign(__p.__indirect(__p.__vector(o) + j * 4), __p.bb) : null; } - public int DataListLength { get { int o = __p.__offset(4); return o != 0 ? __p.__vector_len(o) : 0; } } - - public static Offset CreateScenarioModeRewardExcelTable(FlatBufferBuilder builder, - VectorOffset DataListOffset = default(VectorOffset)) { - builder.StartTable(1); - ScenarioModeRewardExcelTable.AddDataList(builder, DataListOffset); - return ScenarioModeRewardExcelTable.EndScenarioModeRewardExcelTable(builder); - } - - public static void StartScenarioModeRewardExcelTable(FlatBufferBuilder builder) { builder.StartTable(1); } - public static void AddDataList(FlatBufferBuilder builder, VectorOffset dataListOffset) { builder.AddOffset(0, dataListOffset.Value, 0); } - public static VectorOffset CreateDataListVector(FlatBufferBuilder builder, Offset[] data) { builder.StartVector(4, data.Length, 4); for (int i = data.Length - 1; i >= 0; i--) builder.AddOffset(data[i].Value); return builder.EndVector(); } - public static VectorOffset CreateDataListVectorBlock(FlatBufferBuilder builder, Offset[] data) { builder.StartVector(4, data.Length, 4); builder.Add(data); return builder.EndVector(); } - public static VectorOffset CreateDataListVectorBlock(FlatBufferBuilder builder, ArraySegment> data) { builder.StartVector(4, data.Count, 4); builder.Add(data); return builder.EndVector(); } - public static VectorOffset CreateDataListVectorBlock(FlatBufferBuilder builder, IntPtr dataPtr, int sizeInBytes) { builder.StartVector(1, sizeInBytes, 1); builder.Add>(dataPtr, sizeInBytes); return builder.EndVector(); } - public static void StartDataListVector(FlatBufferBuilder builder, int numElems) { builder.StartVector(4, numElems, 4); } - public static Offset EndScenarioModeRewardExcelTable(FlatBufferBuilder builder) { - int o = builder.EndTable(); - return new Offset(o); - } - public ScenarioModeRewardExcelTableT UnPack() { - var _o = new ScenarioModeRewardExcelTableT(); - this.UnPackTo(_o); - return _o; - } - public void UnPackTo(ScenarioModeRewardExcelTableT _o) { - byte[] key = TableEncryptionService.CreateKey("ScenarioModeRewardExcel"); - _o.DataList = new List(); - for (var _j = 0; _j < this.DataListLength; ++_j) {_o.DataList.Add(this.DataList(_j).HasValue ? this.DataList(_j).Value.UnPack() : null);} - } - public static Offset Pack(FlatBufferBuilder builder, ScenarioModeRewardExcelTableT _o) { - if (_o == null) return default(Offset); - var _DataList = default(VectorOffset); - if (_o.DataList != null) { - var __DataList = new Offset[_o.DataList.Count]; - for (var _j = 0; _j < __DataList.Length; ++_j) { __DataList[_j] = SCHALE.Common.FlatData.ScenarioModeRewardExcel.Pack(builder, _o.DataList[_j]); } - _DataList = CreateDataListVector(builder, __DataList); - } - return CreateScenarioModeRewardExcelTable( - builder, - _DataList); - } -} - -public class ScenarioModeRewardExcelTableT -{ - public List DataList { get; set; } - - public ScenarioModeRewardExcelTableT() { - this.DataList = null; - } -} - - -static public class ScenarioModeRewardExcelTableVerify -{ - static public bool Verify(Google.FlatBuffers.Verifier verifier, uint tablePos) - { - return verifier.VerifyTableStart(tablePos) - && verifier.VerifyVectorOfTables(tablePos, 4 /*DataList*/, SCHALE.Common.FlatData.ScenarioModeRewardExcelVerify.Verify, false) - && verifier.VerifyTableEnd(tablePos); - } -} - -} diff --git a/SCHALE.Common/FlatData/ScenarioModeSubTypes.cs b/SCHALE.Common/FlatData/ScenarioModeSubTypes.cs index 7641b7b..1f27cfa 100644 --- a/SCHALE.Common/FlatData/ScenarioModeSubTypes.cs +++ b/SCHALE.Common/FlatData/ScenarioModeSubTypes.cs @@ -9,7 +9,6 @@ public enum ScenarioModeSubTypes : int { None = 0, Club = 1, - TSS = 2, }; diff --git a/SCHALE.Common/FlatData/ScenarioModeTypes.cs b/SCHALE.Common/FlatData/ScenarioModeTypes.cs index c16f768..994be87 100644 --- a/SCHALE.Common/FlatData/ScenarioModeTypes.cs +++ b/SCHALE.Common/FlatData/ScenarioModeTypes.cs @@ -12,6 +12,8 @@ public enum ScenarioModeTypes : int Sub = 2, Replay = 3, Mini = 4, + SpecialOperation = 5, + Prologue = 6, }; diff --git a/SCHALE.Common/FlatData/SchoolDungeonRewardExcel.cs b/SCHALE.Common/FlatData/SchoolDungeonRewardExcel.cs index 38498ca..4fc5c6c 100644 --- a/SCHALE.Common/FlatData/SchoolDungeonRewardExcel.cs +++ b/SCHALE.Common/FlatData/SchoolDungeonRewardExcel.cs @@ -22,7 +22,7 @@ public struct SchoolDungeonRewardExcel : IFlatbufferObject public long GroupId { get { int o = __p.__offset(4); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public SCHALE.Common.FlatData.SchoolDungeonType DungeonType { get { int o = __p.__offset(6); return o != 0 ? (SCHALE.Common.FlatData.SchoolDungeonType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.SchoolDungeonType.SchoolA; } } - public SCHALE.Common.FlatData.RewardTag RewardTag { get { int o = __p.__offset(8); return o != 0 ? (SCHALE.Common.FlatData.RewardTag)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.RewardTag.Default; } } + public SCHALE.Common.FlatData.RewardTag RewardTag_ { get { int o = __p.__offset(8); return o != 0 ? (SCHALE.Common.FlatData.RewardTag)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.RewardTag.Default; } } public SCHALE.Common.FlatData.ParcelType RewardParcelType { get { int o = __p.__offset(10); return o != 0 ? (SCHALE.Common.FlatData.ParcelType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.ParcelType.None; } } public long RewardParcelId { get { int o = __p.__offset(12); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public long RewardParcelAmount { get { int o = __p.__offset(14); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } @@ -32,7 +32,7 @@ public struct SchoolDungeonRewardExcel : IFlatbufferObject public static Offset CreateSchoolDungeonRewardExcel(FlatBufferBuilder builder, long GroupId = 0, SCHALE.Common.FlatData.SchoolDungeonType DungeonType = SCHALE.Common.FlatData.SchoolDungeonType.SchoolA, - SCHALE.Common.FlatData.RewardTag RewardTag = SCHALE.Common.FlatData.RewardTag.Default, + SCHALE.Common.FlatData.RewardTag RewardTag_ = SCHALE.Common.FlatData.RewardTag.Default, SCHALE.Common.FlatData.ParcelType RewardParcelType = SCHALE.Common.FlatData.ParcelType.None, long RewardParcelId = 0, long RewardParcelAmount = 0, @@ -44,7 +44,7 @@ public struct SchoolDungeonRewardExcel : IFlatbufferObject SchoolDungeonRewardExcel.AddRewardParcelId(builder, RewardParcelId); SchoolDungeonRewardExcel.AddGroupId(builder, GroupId); SchoolDungeonRewardExcel.AddRewardParcelType(builder, RewardParcelType); - SchoolDungeonRewardExcel.AddRewardTag(builder, RewardTag); + SchoolDungeonRewardExcel.AddRewardTag_(builder, RewardTag_); SchoolDungeonRewardExcel.AddDungeonType(builder, DungeonType); SchoolDungeonRewardExcel.AddIsDisplayed(builder, IsDisplayed); return SchoolDungeonRewardExcel.EndSchoolDungeonRewardExcel(builder); @@ -53,7 +53,7 @@ public struct SchoolDungeonRewardExcel : IFlatbufferObject public static void StartSchoolDungeonRewardExcel(FlatBufferBuilder builder) { builder.StartTable(8); } public static void AddGroupId(FlatBufferBuilder builder, long groupId) { builder.AddLong(0, groupId, 0); } public static void AddDungeonType(FlatBufferBuilder builder, SCHALE.Common.FlatData.SchoolDungeonType dungeonType) { builder.AddInt(1, (int)dungeonType, 0); } - public static void AddRewardTag(FlatBufferBuilder builder, SCHALE.Common.FlatData.RewardTag rewardTag) { builder.AddInt(2, (int)rewardTag, 0); } + public static void AddRewardTag_(FlatBufferBuilder builder, SCHALE.Common.FlatData.RewardTag rewardTag_) { builder.AddInt(2, (int)rewardTag_, 0); } public static void AddRewardParcelType(FlatBufferBuilder builder, SCHALE.Common.FlatData.ParcelType rewardParcelType) { builder.AddInt(3, (int)rewardParcelType, 0); } public static void AddRewardParcelId(FlatBufferBuilder builder, long rewardParcelId) { builder.AddLong(4, rewardParcelId, 0); } public static void AddRewardParcelAmount(FlatBufferBuilder builder, long rewardParcelAmount) { builder.AddLong(5, rewardParcelAmount, 0); } @@ -72,7 +72,7 @@ public struct SchoolDungeonRewardExcel : IFlatbufferObject byte[] key = TableEncryptionService.CreateKey("SchoolDungeonReward"); _o.GroupId = TableEncryptionService.Convert(this.GroupId, key); _o.DungeonType = TableEncryptionService.Convert(this.DungeonType, key); - _o.RewardTag = TableEncryptionService.Convert(this.RewardTag, key); + _o.RewardTag_ = TableEncryptionService.Convert(this.RewardTag_, key); _o.RewardParcelType = TableEncryptionService.Convert(this.RewardParcelType, key); _o.RewardParcelId = TableEncryptionService.Convert(this.RewardParcelId, key); _o.RewardParcelAmount = TableEncryptionService.Convert(this.RewardParcelAmount, key); @@ -85,7 +85,7 @@ public struct SchoolDungeonRewardExcel : IFlatbufferObject builder, _o.GroupId, _o.DungeonType, - _o.RewardTag, + _o.RewardTag_, _o.RewardParcelType, _o.RewardParcelId, _o.RewardParcelAmount, @@ -98,7 +98,7 @@ public class SchoolDungeonRewardExcelT { public long GroupId { get; set; } public SCHALE.Common.FlatData.SchoolDungeonType DungeonType { get; set; } - public SCHALE.Common.FlatData.RewardTag RewardTag { get; set; } + public SCHALE.Common.FlatData.RewardTag RewardTag_ { get; set; } public SCHALE.Common.FlatData.ParcelType RewardParcelType { get; set; } public long RewardParcelId { get; set; } public long RewardParcelAmount { get; set; } @@ -108,7 +108,7 @@ public class SchoolDungeonRewardExcelT public SchoolDungeonRewardExcelT() { this.GroupId = 0; this.DungeonType = SCHALE.Common.FlatData.SchoolDungeonType.SchoolA; - this.RewardTag = SCHALE.Common.FlatData.RewardTag.Default; + this.RewardTag_ = SCHALE.Common.FlatData.RewardTag.Default; this.RewardParcelType = SCHALE.Common.FlatData.ParcelType.None; this.RewardParcelId = 0; this.RewardParcelAmount = 0; @@ -125,7 +125,7 @@ static public class SchoolDungeonRewardExcelVerify return verifier.VerifyTableStart(tablePos) && verifier.VerifyField(tablePos, 4 /*GroupId*/, 8 /*long*/, 8, false) && verifier.VerifyField(tablePos, 6 /*DungeonType*/, 4 /*SCHALE.Common.FlatData.SchoolDungeonType*/, 4, false) - && verifier.VerifyField(tablePos, 8 /*RewardTag*/, 4 /*SCHALE.Common.FlatData.RewardTag*/, 4, false) + && verifier.VerifyField(tablePos, 8 /*RewardTag_*/, 4 /*SCHALE.Common.FlatData.RewardTag*/, 4, false) && verifier.VerifyField(tablePos, 10 /*RewardParcelType*/, 4 /*SCHALE.Common.FlatData.ParcelType*/, 4, false) && verifier.VerifyField(tablePos, 12 /*RewardParcelId*/, 8 /*long*/, 8, false) && verifier.VerifyField(tablePos, 14 /*RewardParcelAmount*/, 8 /*long*/, 8, false) diff --git a/SCHALE.Common/FlatData/SchoolDungeonStageExcel.cs b/SCHALE.Common/FlatData/SchoolDungeonStageExcel.cs index 132c4a1..d38ceec 100644 --- a/SCHALE.Common/FlatData/SchoolDungeonStageExcel.cs +++ b/SCHALE.Common/FlatData/SchoolDungeonStageExcel.cs @@ -74,11 +74,11 @@ public struct SchoolDungeonStageExcel : IFlatbufferObject public ArraySegment? GetStarGoalAmountBytes() { return __p.__vector_as_arraysegment(26); } #endif public int[] GetStarGoalAmountArray() { return __p.__vector_as_array(26); } - public SCHALE.Common.FlatData.StageTopography StageTopography { get { int o = __p.__offset(28); return o != 0 ? (SCHALE.Common.FlatData.StageTopography)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.StageTopography.Street; } } + public SCHALE.Common.FlatData.StageTopography StageTopography_ { get { int o = __p.__offset(28); return o != 0 ? (SCHALE.Common.FlatData.StageTopography)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.StageTopography.Street; } } public long RecommandLevel { get { int o = __p.__offset(30); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public long StageRewardId { get { int o = __p.__offset(32); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public long PlayTimeLimitInSeconds { get { int o = __p.__offset(34); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } - public SCHALE.Common.FlatData.EchelonExtensionType EchelonExtensionType { get { int o = __p.__offset(36); return o != 0 ? (SCHALE.Common.FlatData.EchelonExtensionType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.EchelonExtensionType.Base; } } + public SCHALE.Common.FlatData.EchelonExtensionType EchelonExtensionType_ { get { int o = __p.__offset(36); return o != 0 ? (SCHALE.Common.FlatData.EchelonExtensionType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.EchelonExtensionType.Base; } } public static Offset CreateSchoolDungeonStageExcel(FlatBufferBuilder builder, long StageId = 0, @@ -93,11 +93,11 @@ public struct SchoolDungeonStageExcel : IFlatbufferObject int GroundId = 0, VectorOffset StarGoalOffset = default(VectorOffset), VectorOffset StarGoalAmountOffset = default(VectorOffset), - SCHALE.Common.FlatData.StageTopography StageTopography = SCHALE.Common.FlatData.StageTopography.Street, + SCHALE.Common.FlatData.StageTopography StageTopography_ = SCHALE.Common.FlatData.StageTopography.Street, long RecommandLevel = 0, long StageRewardId = 0, long PlayTimeLimitInSeconds = 0, - SCHALE.Common.FlatData.EchelonExtensionType EchelonExtensionType = SCHALE.Common.FlatData.EchelonExtensionType.Base) { + SCHALE.Common.FlatData.EchelonExtensionType EchelonExtensionType_ = SCHALE.Common.FlatData.EchelonExtensionType.Base) { builder.StartTable(17); SchoolDungeonStageExcel.AddPlayTimeLimitInSeconds(builder, PlayTimeLimitInSeconds); SchoolDungeonStageExcel.AddStageRewardId(builder, StageRewardId); @@ -105,8 +105,8 @@ public struct SchoolDungeonStageExcel : IFlatbufferObject SchoolDungeonStageExcel.AddPrevStageId(builder, PrevStageId); SchoolDungeonStageExcel.AddBattleDuration(builder, BattleDuration); SchoolDungeonStageExcel.AddStageId(builder, StageId); - SchoolDungeonStageExcel.AddEchelonExtensionType(builder, EchelonExtensionType); - SchoolDungeonStageExcel.AddStageTopography(builder, StageTopography); + SchoolDungeonStageExcel.AddEchelonExtensionType_(builder, EchelonExtensionType_); + SchoolDungeonStageExcel.AddStageTopography_(builder, StageTopography_); SchoolDungeonStageExcel.AddStarGoalAmount(builder, StarGoalAmountOffset); SchoolDungeonStageExcel.AddStarGoal(builder, StarGoalOffset); SchoolDungeonStageExcel.AddGroundId(builder, GroundId); @@ -162,11 +162,11 @@ public struct SchoolDungeonStageExcel : IFlatbufferObject public static VectorOffset CreateStarGoalAmountVectorBlock(FlatBufferBuilder builder, ArraySegment data) { builder.StartVector(4, data.Count, 4); builder.Add(data); return builder.EndVector(); } public static VectorOffset CreateStarGoalAmountVectorBlock(FlatBufferBuilder builder, IntPtr dataPtr, int sizeInBytes) { builder.StartVector(1, sizeInBytes, 1); builder.Add(dataPtr, sizeInBytes); return builder.EndVector(); } public static void StartStarGoalAmountVector(FlatBufferBuilder builder, int numElems) { builder.StartVector(4, numElems, 4); } - public static void AddStageTopography(FlatBufferBuilder builder, SCHALE.Common.FlatData.StageTopography stageTopography) { builder.AddInt(12, (int)stageTopography, 0); } + public static void AddStageTopography_(FlatBufferBuilder builder, SCHALE.Common.FlatData.StageTopography stageTopography_) { builder.AddInt(12, (int)stageTopography_, 0); } public static void AddRecommandLevel(FlatBufferBuilder builder, long recommandLevel) { builder.AddLong(13, recommandLevel, 0); } public static void AddStageRewardId(FlatBufferBuilder builder, long stageRewardId) { builder.AddLong(14, stageRewardId, 0); } public static void AddPlayTimeLimitInSeconds(FlatBufferBuilder builder, long playTimeLimitInSeconds) { builder.AddLong(15, playTimeLimitInSeconds, 0); } - public static void AddEchelonExtensionType(FlatBufferBuilder builder, SCHALE.Common.FlatData.EchelonExtensionType echelonExtensionType) { builder.AddInt(16, (int)echelonExtensionType, 0); } + public static void AddEchelonExtensionType_(FlatBufferBuilder builder, SCHALE.Common.FlatData.EchelonExtensionType echelonExtensionType_) { builder.AddInt(16, (int)echelonExtensionType_, 0); } public static Offset EndSchoolDungeonStageExcel(FlatBufferBuilder builder) { int o = builder.EndTable(); return new Offset(o); @@ -196,11 +196,11 @@ public struct SchoolDungeonStageExcel : IFlatbufferObject for (var _j = 0; _j < this.StarGoalLength; ++_j) {_o.StarGoal.Add(TableEncryptionService.Convert(this.StarGoal(_j), key));} _o.StarGoalAmount = new List(); for (var _j = 0; _j < this.StarGoalAmountLength; ++_j) {_o.StarGoalAmount.Add(TableEncryptionService.Convert(this.StarGoalAmount(_j), key));} - _o.StageTopography = TableEncryptionService.Convert(this.StageTopography, key); + _o.StageTopography_ = TableEncryptionService.Convert(this.StageTopography_, key); _o.RecommandLevel = TableEncryptionService.Convert(this.RecommandLevel, key); _o.StageRewardId = TableEncryptionService.Convert(this.StageRewardId, key); _o.PlayTimeLimitInSeconds = TableEncryptionService.Convert(this.PlayTimeLimitInSeconds, key); - _o.EchelonExtensionType = TableEncryptionService.Convert(this.EchelonExtensionType, key); + _o.EchelonExtensionType_ = TableEncryptionService.Convert(this.EchelonExtensionType_, key); } public static Offset Pack(FlatBufferBuilder builder, SchoolDungeonStageExcelT _o) { if (_o == null) return default(Offset); @@ -248,11 +248,11 @@ public struct SchoolDungeonStageExcel : IFlatbufferObject _o.GroundId, _StarGoal, _StarGoalAmount, - _o.StageTopography, + _o.StageTopography_, _o.RecommandLevel, _o.StageRewardId, _o.PlayTimeLimitInSeconds, - _o.EchelonExtensionType); + _o.EchelonExtensionType_); } } @@ -270,11 +270,11 @@ public class SchoolDungeonStageExcelT public int GroundId { get; set; } public List StarGoal { get; set; } public List StarGoalAmount { get; set; } - public SCHALE.Common.FlatData.StageTopography StageTopography { get; set; } + public SCHALE.Common.FlatData.StageTopography StageTopography_ { get; set; } public long RecommandLevel { get; set; } public long StageRewardId { get; set; } public long PlayTimeLimitInSeconds { get; set; } - public SCHALE.Common.FlatData.EchelonExtensionType EchelonExtensionType { get; set; } + public SCHALE.Common.FlatData.EchelonExtensionType EchelonExtensionType_ { get; set; } public SchoolDungeonStageExcelT() { this.StageId = 0; @@ -289,11 +289,11 @@ public class SchoolDungeonStageExcelT this.GroundId = 0; this.StarGoal = null; this.StarGoalAmount = null; - this.StageTopography = SCHALE.Common.FlatData.StageTopography.Street; + this.StageTopography_ = SCHALE.Common.FlatData.StageTopography.Street; this.RecommandLevel = 0; this.StageRewardId = 0; this.PlayTimeLimitInSeconds = 0; - this.EchelonExtensionType = SCHALE.Common.FlatData.EchelonExtensionType.Base; + this.EchelonExtensionType_ = SCHALE.Common.FlatData.EchelonExtensionType.Base; } } @@ -315,11 +315,11 @@ static public class SchoolDungeonStageExcelVerify && verifier.VerifyField(tablePos, 22 /*GroundId*/, 4 /*int*/, 4, false) && verifier.VerifyVectorOfData(tablePos, 24 /*StarGoal*/, 4 /*SCHALE.Common.FlatData.StarGoalType*/, false) && verifier.VerifyVectorOfData(tablePos, 26 /*StarGoalAmount*/, 4 /*int*/, false) - && verifier.VerifyField(tablePos, 28 /*StageTopography*/, 4 /*SCHALE.Common.FlatData.StageTopography*/, 4, false) + && verifier.VerifyField(tablePos, 28 /*StageTopography_*/, 4 /*SCHALE.Common.FlatData.StageTopography*/, 4, false) && verifier.VerifyField(tablePos, 30 /*RecommandLevel*/, 8 /*long*/, 8, false) && verifier.VerifyField(tablePos, 32 /*StageRewardId*/, 8 /*long*/, 8, false) && verifier.VerifyField(tablePos, 34 /*PlayTimeLimitInSeconds*/, 8 /*long*/, 8, false) - && verifier.VerifyField(tablePos, 36 /*EchelonExtensionType*/, 4 /*SCHALE.Common.FlatData.EchelonExtensionType*/, 4, false) + && verifier.VerifyField(tablePos, 36 /*EchelonExtensionType_*/, 4 /*SCHALE.Common.FlatData.EchelonExtensionType*/, 4, false) && verifier.VerifyTableEnd(tablePos); } } diff --git a/SCHALE.Common/FlatData/ServiceActionExcel.cs b/SCHALE.Common/FlatData/ServiceActionExcel.cs index d6a4735..084bd2a 100644 --- a/SCHALE.Common/FlatData/ServiceActionExcel.cs +++ b/SCHALE.Common/FlatData/ServiceActionExcel.cs @@ -20,23 +20,23 @@ public struct ServiceActionExcel : IFlatbufferObject public void __init(int _i, ByteBuffer _bb) { __p = new Table(_i, _bb); } public ServiceActionExcel __assign(int _i, ByteBuffer _bb) { __init(_i, _bb); return this; } - public SCHALE.Common.FlatData.ServiceActionType ServiceActionType { get { int o = __p.__offset(4); return o != 0 ? (SCHALE.Common.FlatData.ServiceActionType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.ServiceActionType.ClanCreate; } } + public SCHALE.Common.FlatData.ServiceActionType ServiceActionType_ { get { int o = __p.__offset(4); return o != 0 ? (SCHALE.Common.FlatData.ServiceActionType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.ServiceActionType.ClanCreate; } } public bool IsLegacy { get { int o = __p.__offset(6); return o != 0 ? 0!=__p.bb.Get(o + __p.bb_pos) : (bool)false; } } public long GoodsId { get { int o = __p.__offset(8); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public static Offset CreateServiceActionExcel(FlatBufferBuilder builder, - SCHALE.Common.FlatData.ServiceActionType ServiceActionType = SCHALE.Common.FlatData.ServiceActionType.ClanCreate, + SCHALE.Common.FlatData.ServiceActionType ServiceActionType_ = SCHALE.Common.FlatData.ServiceActionType.ClanCreate, bool IsLegacy = false, long GoodsId = 0) { builder.StartTable(3); ServiceActionExcel.AddGoodsId(builder, GoodsId); - ServiceActionExcel.AddServiceActionType(builder, ServiceActionType); + ServiceActionExcel.AddServiceActionType_(builder, ServiceActionType_); ServiceActionExcel.AddIsLegacy(builder, IsLegacy); return ServiceActionExcel.EndServiceActionExcel(builder); } public static void StartServiceActionExcel(FlatBufferBuilder builder) { builder.StartTable(3); } - public static void AddServiceActionType(FlatBufferBuilder builder, SCHALE.Common.FlatData.ServiceActionType serviceActionType) { builder.AddInt(0, (int)serviceActionType, 0); } + public static void AddServiceActionType_(FlatBufferBuilder builder, SCHALE.Common.FlatData.ServiceActionType serviceActionType_) { builder.AddInt(0, (int)serviceActionType_, 0); } public static void AddIsLegacy(FlatBufferBuilder builder, bool isLegacy) { builder.AddBool(1, isLegacy, false); } public static void AddGoodsId(FlatBufferBuilder builder, long goodsId) { builder.AddLong(2, goodsId, 0); } public static Offset EndServiceActionExcel(FlatBufferBuilder builder) { @@ -50,7 +50,7 @@ public struct ServiceActionExcel : IFlatbufferObject } public void UnPackTo(ServiceActionExcelT _o) { byte[] key = TableEncryptionService.CreateKey("ServiceAction"); - _o.ServiceActionType = TableEncryptionService.Convert(this.ServiceActionType, key); + _o.ServiceActionType_ = TableEncryptionService.Convert(this.ServiceActionType_, key); _o.IsLegacy = TableEncryptionService.Convert(this.IsLegacy, key); _o.GoodsId = TableEncryptionService.Convert(this.GoodsId, key); } @@ -58,7 +58,7 @@ public struct ServiceActionExcel : IFlatbufferObject if (_o == null) return default(Offset); return CreateServiceActionExcel( builder, - _o.ServiceActionType, + _o.ServiceActionType_, _o.IsLegacy, _o.GoodsId); } @@ -66,12 +66,12 @@ public struct ServiceActionExcel : IFlatbufferObject public class ServiceActionExcelT { - public SCHALE.Common.FlatData.ServiceActionType ServiceActionType { get; set; } + public SCHALE.Common.FlatData.ServiceActionType ServiceActionType_ { get; set; } public bool IsLegacy { get; set; } public long GoodsId { get; set; } public ServiceActionExcelT() { - this.ServiceActionType = SCHALE.Common.FlatData.ServiceActionType.ClanCreate; + this.ServiceActionType_ = SCHALE.Common.FlatData.ServiceActionType.ClanCreate; this.IsLegacy = false; this.GoodsId = 0; } @@ -83,7 +83,7 @@ static public class ServiceActionExcelVerify static public bool Verify(Google.FlatBuffers.Verifier verifier, uint tablePos) { return verifier.VerifyTableStart(tablePos) - && verifier.VerifyField(tablePos, 4 /*ServiceActionType*/, 4 /*SCHALE.Common.FlatData.ServiceActionType*/, 4, false) + && verifier.VerifyField(tablePos, 4 /*ServiceActionType_*/, 4 /*SCHALE.Common.FlatData.ServiceActionType*/, 4, false) && verifier.VerifyField(tablePos, 6 /*IsLegacy*/, 1 /*bool*/, 1, false) && verifier.VerifyField(tablePos, 8 /*GoodsId*/, 8 /*long*/, 8, false) && verifier.VerifyTableEnd(tablePos); diff --git a/SCHALE.Common/FlatData/ServiceActionExcelTable.cs b/SCHALE.Common/FlatData/ServiceActionExcelTable.cs deleted file mode 100644 index 0450bdd..0000000 --- a/SCHALE.Common/FlatData/ServiceActionExcelTable.cs +++ /dev/null @@ -1,88 +0,0 @@ -// -// automatically generated by the FlatBuffers compiler, do not modify -// - -namespace SCHALE.Common.FlatData -{ - -using global::System; -using global::System.Collections.Generic; -using global::SCHALE.Common.Crypto; -using global::Google.FlatBuffers; - -public struct ServiceActionExcelTable : IFlatbufferObject -{ - private Table __p; - public ByteBuffer ByteBuffer { get { return __p.bb; } } - public static void ValidateVersion() { FlatBufferConstants.FLATBUFFERS_24_3_25(); } - public static ServiceActionExcelTable GetRootAsServiceActionExcelTable(ByteBuffer _bb) { return GetRootAsServiceActionExcelTable(_bb, new ServiceActionExcelTable()); } - public static ServiceActionExcelTable GetRootAsServiceActionExcelTable(ByteBuffer _bb, ServiceActionExcelTable obj) { return (obj.__assign(_bb.GetInt(_bb.Position) + _bb.Position, _bb)); } - public void __init(int _i, ByteBuffer _bb) { __p = new Table(_i, _bb); } - public ServiceActionExcelTable __assign(int _i, ByteBuffer _bb) { __init(_i, _bb); return this; } - - public SCHALE.Common.FlatData.ServiceActionExcel? DataList(int j) { int o = __p.__offset(4); return o != 0 ? (SCHALE.Common.FlatData.ServiceActionExcel?)(new SCHALE.Common.FlatData.ServiceActionExcel()).__assign(__p.__indirect(__p.__vector(o) + j * 4), __p.bb) : null; } - public int DataListLength { get { int o = __p.__offset(4); return o != 0 ? __p.__vector_len(o) : 0; } } - - public static Offset CreateServiceActionExcelTable(FlatBufferBuilder builder, - VectorOffset DataListOffset = default(VectorOffset)) { - builder.StartTable(1); - ServiceActionExcelTable.AddDataList(builder, DataListOffset); - return ServiceActionExcelTable.EndServiceActionExcelTable(builder); - } - - public static void StartServiceActionExcelTable(FlatBufferBuilder builder) { builder.StartTable(1); } - public static void AddDataList(FlatBufferBuilder builder, VectorOffset dataListOffset) { builder.AddOffset(0, dataListOffset.Value, 0); } - public static VectorOffset CreateDataListVector(FlatBufferBuilder builder, Offset[] data) { builder.StartVector(4, data.Length, 4); for (int i = data.Length - 1; i >= 0; i--) builder.AddOffset(data[i].Value); return builder.EndVector(); } - public static VectorOffset CreateDataListVectorBlock(FlatBufferBuilder builder, Offset[] data) { builder.StartVector(4, data.Length, 4); builder.Add(data); return builder.EndVector(); } - public static VectorOffset CreateDataListVectorBlock(FlatBufferBuilder builder, ArraySegment> data) { builder.StartVector(4, data.Count, 4); builder.Add(data); return builder.EndVector(); } - public static VectorOffset CreateDataListVectorBlock(FlatBufferBuilder builder, IntPtr dataPtr, int sizeInBytes) { builder.StartVector(1, sizeInBytes, 1); builder.Add>(dataPtr, sizeInBytes); return builder.EndVector(); } - public static void StartDataListVector(FlatBufferBuilder builder, int numElems) { builder.StartVector(4, numElems, 4); } - public static Offset EndServiceActionExcelTable(FlatBufferBuilder builder) { - int o = builder.EndTable(); - return new Offset(o); - } - public ServiceActionExcelTableT UnPack() { - var _o = new ServiceActionExcelTableT(); - this.UnPackTo(_o); - return _o; - } - public void UnPackTo(ServiceActionExcelTableT _o) { - byte[] key = TableEncryptionService.CreateKey("ServiceActionExcel"); - _o.DataList = new List(); - for (var _j = 0; _j < this.DataListLength; ++_j) {_o.DataList.Add(this.DataList(_j).HasValue ? this.DataList(_j).Value.UnPack() : null);} - } - public static Offset Pack(FlatBufferBuilder builder, ServiceActionExcelTableT _o) { - if (_o == null) return default(Offset); - var _DataList = default(VectorOffset); - if (_o.DataList != null) { - var __DataList = new Offset[_o.DataList.Count]; - for (var _j = 0; _j < __DataList.Length; ++_j) { __DataList[_j] = SCHALE.Common.FlatData.ServiceActionExcel.Pack(builder, _o.DataList[_j]); } - _DataList = CreateDataListVector(builder, __DataList); - } - return CreateServiceActionExcelTable( - builder, - _DataList); - } -} - -public class ServiceActionExcelTableT -{ - public List DataList { get; set; } - - public ServiceActionExcelTableT() { - this.DataList = null; - } -} - - -static public class ServiceActionExcelTableVerify -{ - static public bool Verify(Google.FlatBuffers.Verifier verifier, uint tablePos) - { - return verifier.VerifyTableStart(tablePos) - && verifier.VerifyVectorOfTables(tablePos, 4 /*DataList*/, SCHALE.Common.FlatData.ServiceActionExcelVerify.Verify, false) - && verifier.VerifyTableEnd(tablePos); - } -} - -} diff --git a/SCHALE.Common/FlatData/ShopExcel.cs b/SCHALE.Common/FlatData/ShopExcel.cs index b99abc7..8fe58bc 100644 --- a/SCHALE.Common/FlatData/ShopExcel.cs +++ b/SCHALE.Common/FlatData/ShopExcel.cs @@ -49,7 +49,7 @@ public struct ShopExcel : IFlatbufferObject public byte[] GetSalePeriodToArray() { return __p.__vector_as_array(18); } public long PurchaseCooltimeMin { get { int o = __p.__offset(20); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public long PurchaseCountLimit { get { int o = __p.__offset(22); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } - public SCHALE.Common.FlatData.PurchaseCountResetType PurchaseCountResetType { get { int o = __p.__offset(24); return o != 0 ? (SCHALE.Common.FlatData.PurchaseCountResetType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.PurchaseCountResetType.None; } } + public SCHALE.Common.FlatData.PurchaseCountResetType PurchaseCountResetType_ { get { int o = __p.__offset(24); return o != 0 ? (SCHALE.Common.FlatData.PurchaseCountResetType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.PurchaseCountResetType.None; } } public string BuyReportEventName { get { int o = __p.__offset(26); return o != 0 ? __p.__string(o + __p.bb_pos) : null; } } #if ENABLE_SPAN_T public Span GetBuyReportEventNameBytes() { return __p.__vector_as_span(26, 1); } @@ -72,7 +72,7 @@ public struct ShopExcel : IFlatbufferObject StringOffset SalePeriodToOffset = default(StringOffset), long PurchaseCooltimeMin = 0, long PurchaseCountLimit = 0, - SCHALE.Common.FlatData.PurchaseCountResetType PurchaseCountResetType = SCHALE.Common.FlatData.PurchaseCountResetType.None, + SCHALE.Common.FlatData.PurchaseCountResetType PurchaseCountResetType_ = SCHALE.Common.FlatData.PurchaseCountResetType.None, StringOffset BuyReportEventNameOffset = default(StringOffset), bool RestrictBuyWhenInventoryFull = false, SCHALE.Common.FlatData.ProductDisplayTag DisplayTag = SCHALE.Common.FlatData.ProductDisplayTag.None, @@ -85,7 +85,7 @@ public struct ShopExcel : IFlatbufferObject ShopExcel.AddShopUpdateGroupId(builder, ShopUpdateGroupId); ShopExcel.AddDisplayTag(builder, DisplayTag); ShopExcel.AddBuyReportEventName(builder, BuyReportEventNameOffset); - ShopExcel.AddPurchaseCountResetType(builder, PurchaseCountResetType); + ShopExcel.AddPurchaseCountResetType_(builder, PurchaseCountResetType_); ShopExcel.AddSalePeriodTo(builder, SalePeriodToOffset); ShopExcel.AddSalePeriodFrom(builder, SalePeriodFromOffset); ShopExcel.AddGoodsId(builder, GoodsIdOffset); @@ -112,7 +112,7 @@ public struct ShopExcel : IFlatbufferObject public static void AddSalePeriodTo(FlatBufferBuilder builder, StringOffset salePeriodToOffset) { builder.AddOffset(7, salePeriodToOffset.Value, 0); } public static void AddPurchaseCooltimeMin(FlatBufferBuilder builder, long purchaseCooltimeMin) { builder.AddLong(8, purchaseCooltimeMin, 0); } public static void AddPurchaseCountLimit(FlatBufferBuilder builder, long purchaseCountLimit) { builder.AddLong(9, purchaseCountLimit, 0); } - public static void AddPurchaseCountResetType(FlatBufferBuilder builder, SCHALE.Common.FlatData.PurchaseCountResetType purchaseCountResetType) { builder.AddInt(10, (int)purchaseCountResetType, 0); } + public static void AddPurchaseCountResetType_(FlatBufferBuilder builder, SCHALE.Common.FlatData.PurchaseCountResetType purchaseCountResetType_) { builder.AddInt(10, (int)purchaseCountResetType_, 0); } public static void AddBuyReportEventName(FlatBufferBuilder builder, StringOffset buyReportEventNameOffset) { builder.AddOffset(11, buyReportEventNameOffset.Value, 0); } public static void AddRestrictBuyWhenInventoryFull(FlatBufferBuilder builder, bool restrictBuyWhenInventoryFull) { builder.AddBool(12, restrictBuyWhenInventoryFull, false); } public static void AddDisplayTag(FlatBufferBuilder builder, SCHALE.Common.FlatData.ProductDisplayTag displayTag) { builder.AddInt(13, (int)displayTag, 0); } @@ -139,7 +139,7 @@ public struct ShopExcel : IFlatbufferObject _o.SalePeriodTo = TableEncryptionService.Convert(this.SalePeriodTo, key); _o.PurchaseCooltimeMin = TableEncryptionService.Convert(this.PurchaseCooltimeMin, key); _o.PurchaseCountLimit = TableEncryptionService.Convert(this.PurchaseCountLimit, key); - _o.PurchaseCountResetType = TableEncryptionService.Convert(this.PurchaseCountResetType, key); + _o.PurchaseCountResetType_ = TableEncryptionService.Convert(this.PurchaseCountResetType_, key); _o.BuyReportEventName = TableEncryptionService.Convert(this.BuyReportEventName, key); _o.RestrictBuyWhenInventoryFull = TableEncryptionService.Convert(this.RestrictBuyWhenInventoryFull, key); _o.DisplayTag = TableEncryptionService.Convert(this.DisplayTag, key); @@ -167,7 +167,7 @@ public struct ShopExcel : IFlatbufferObject _SalePeriodTo, _o.PurchaseCooltimeMin, _o.PurchaseCountLimit, - _o.PurchaseCountResetType, + _o.PurchaseCountResetType_, _BuyReportEventName, _o.RestrictBuyWhenInventoryFull, _o.DisplayTag, @@ -187,7 +187,7 @@ public class ShopExcelT public string SalePeriodTo { get; set; } public long PurchaseCooltimeMin { get; set; } public long PurchaseCountLimit { get; set; } - public SCHALE.Common.FlatData.PurchaseCountResetType PurchaseCountResetType { get; set; } + public SCHALE.Common.FlatData.PurchaseCountResetType PurchaseCountResetType_ { get; set; } public string BuyReportEventName { get; set; } public bool RestrictBuyWhenInventoryFull { get; set; } public SCHALE.Common.FlatData.ProductDisplayTag DisplayTag { get; set; } @@ -204,7 +204,7 @@ public class ShopExcelT this.SalePeriodTo = null; this.PurchaseCooltimeMin = 0; this.PurchaseCountLimit = 0; - this.PurchaseCountResetType = SCHALE.Common.FlatData.PurchaseCountResetType.None; + this.PurchaseCountResetType_ = SCHALE.Common.FlatData.PurchaseCountResetType.None; this.BuyReportEventName = null; this.RestrictBuyWhenInventoryFull = false; this.DisplayTag = SCHALE.Common.FlatData.ProductDisplayTag.None; @@ -228,7 +228,7 @@ static public class ShopExcelVerify && verifier.VerifyString(tablePos, 18 /*SalePeriodTo*/, false) && verifier.VerifyField(tablePos, 20 /*PurchaseCooltimeMin*/, 8 /*long*/, 8, false) && verifier.VerifyField(tablePos, 22 /*PurchaseCountLimit*/, 8 /*long*/, 8, false) - && verifier.VerifyField(tablePos, 24 /*PurchaseCountResetType*/, 4 /*SCHALE.Common.FlatData.PurchaseCountResetType*/, 4, false) + && verifier.VerifyField(tablePos, 24 /*PurchaseCountResetType_*/, 4 /*SCHALE.Common.FlatData.PurchaseCountResetType*/, 4, false) && verifier.VerifyString(tablePos, 26 /*BuyReportEventName*/, false) && verifier.VerifyField(tablePos, 28 /*RestrictBuyWhenInventoryFull*/, 1 /*bool*/, 1, false) && verifier.VerifyField(tablePos, 30 /*DisplayTag*/, 4 /*SCHALE.Common.FlatData.ProductDisplayTag*/, 4, false) diff --git a/SCHALE.Common/FlatData/ShopFilterClassifiedExcel.cs b/SCHALE.Common/FlatData/ShopFilterClassifiedExcel.cs index 6274853..1f9cc53 100644 --- a/SCHALE.Common/FlatData/ShopFilterClassifiedExcel.cs +++ b/SCHALE.Common/FlatData/ShopFilterClassifiedExcel.cs @@ -24,7 +24,7 @@ public struct ShopFilterClassifiedExcel : IFlatbufferObject public SCHALE.Common.FlatData.ShopCategoryType CategoryType { get { int o = __p.__offset(6); return o != 0 ? (SCHALE.Common.FlatData.ShopCategoryType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.ShopCategoryType.General; } } public SCHALE.Common.FlatData.ParcelType ConsumeParcelType { get { int o = __p.__offset(8); return o != 0 ? (SCHALE.Common.FlatData.ParcelType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.ParcelType.None; } } public long ConsumeParcelId { get { int o = __p.__offset(10); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } - public SCHALE.Common.FlatData.ShopFilterType ShopFilterType { get { int o = __p.__offset(12); return o != 0 ? (SCHALE.Common.FlatData.ShopFilterType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.ShopFilterType.GachaTicket; } } + public SCHALE.Common.FlatData.ShopFilterType ShopFilterType_ { get { int o = __p.__offset(12); return o != 0 ? (SCHALE.Common.FlatData.ShopFilterType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.ShopFilterType.GachaTicket; } } public long GoodsId { get { int o = __p.__offset(14); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public static Offset CreateShopFilterClassifiedExcel(FlatBufferBuilder builder, @@ -32,13 +32,13 @@ public struct ShopFilterClassifiedExcel : IFlatbufferObject SCHALE.Common.FlatData.ShopCategoryType CategoryType = SCHALE.Common.FlatData.ShopCategoryType.General, SCHALE.Common.FlatData.ParcelType ConsumeParcelType = SCHALE.Common.FlatData.ParcelType.None, long ConsumeParcelId = 0, - SCHALE.Common.FlatData.ShopFilterType ShopFilterType = SCHALE.Common.FlatData.ShopFilterType.GachaTicket, + SCHALE.Common.FlatData.ShopFilterType ShopFilterType_ = SCHALE.Common.FlatData.ShopFilterType.GachaTicket, long GoodsId = 0) { builder.StartTable(6); ShopFilterClassifiedExcel.AddGoodsId(builder, GoodsId); ShopFilterClassifiedExcel.AddConsumeParcelId(builder, ConsumeParcelId); ShopFilterClassifiedExcel.AddId(builder, Id); - ShopFilterClassifiedExcel.AddShopFilterType(builder, ShopFilterType); + ShopFilterClassifiedExcel.AddShopFilterType_(builder, ShopFilterType_); ShopFilterClassifiedExcel.AddConsumeParcelType(builder, ConsumeParcelType); ShopFilterClassifiedExcel.AddCategoryType(builder, CategoryType); return ShopFilterClassifiedExcel.EndShopFilterClassifiedExcel(builder); @@ -49,7 +49,7 @@ public struct ShopFilterClassifiedExcel : IFlatbufferObject public static void AddCategoryType(FlatBufferBuilder builder, SCHALE.Common.FlatData.ShopCategoryType categoryType) { builder.AddInt(1, (int)categoryType, 0); } public static void AddConsumeParcelType(FlatBufferBuilder builder, SCHALE.Common.FlatData.ParcelType consumeParcelType) { builder.AddInt(2, (int)consumeParcelType, 0); } public static void AddConsumeParcelId(FlatBufferBuilder builder, long consumeParcelId) { builder.AddLong(3, consumeParcelId, 0); } - public static void AddShopFilterType(FlatBufferBuilder builder, SCHALE.Common.FlatData.ShopFilterType shopFilterType) { builder.AddInt(4, (int)shopFilterType, 0); } + public static void AddShopFilterType_(FlatBufferBuilder builder, SCHALE.Common.FlatData.ShopFilterType shopFilterType_) { builder.AddInt(4, (int)shopFilterType_, 0); } public static void AddGoodsId(FlatBufferBuilder builder, long goodsId) { builder.AddLong(5, goodsId, 0); } public static Offset EndShopFilterClassifiedExcel(FlatBufferBuilder builder) { int o = builder.EndTable(); @@ -66,7 +66,7 @@ public struct ShopFilterClassifiedExcel : IFlatbufferObject _o.CategoryType = TableEncryptionService.Convert(this.CategoryType, key); _o.ConsumeParcelType = TableEncryptionService.Convert(this.ConsumeParcelType, key); _o.ConsumeParcelId = TableEncryptionService.Convert(this.ConsumeParcelId, key); - _o.ShopFilterType = TableEncryptionService.Convert(this.ShopFilterType, key); + _o.ShopFilterType_ = TableEncryptionService.Convert(this.ShopFilterType_, key); _o.GoodsId = TableEncryptionService.Convert(this.GoodsId, key); } public static Offset Pack(FlatBufferBuilder builder, ShopFilterClassifiedExcelT _o) { @@ -77,7 +77,7 @@ public struct ShopFilterClassifiedExcel : IFlatbufferObject _o.CategoryType, _o.ConsumeParcelType, _o.ConsumeParcelId, - _o.ShopFilterType, + _o.ShopFilterType_, _o.GoodsId); } } @@ -88,7 +88,7 @@ public class ShopFilterClassifiedExcelT public SCHALE.Common.FlatData.ShopCategoryType CategoryType { get; set; } public SCHALE.Common.FlatData.ParcelType ConsumeParcelType { get; set; } public long ConsumeParcelId { get; set; } - public SCHALE.Common.FlatData.ShopFilterType ShopFilterType { get; set; } + public SCHALE.Common.FlatData.ShopFilterType ShopFilterType_ { get; set; } public long GoodsId { get; set; } public ShopFilterClassifiedExcelT() { @@ -96,7 +96,7 @@ public class ShopFilterClassifiedExcelT this.CategoryType = SCHALE.Common.FlatData.ShopCategoryType.General; this.ConsumeParcelType = SCHALE.Common.FlatData.ParcelType.None; this.ConsumeParcelId = 0; - this.ShopFilterType = SCHALE.Common.FlatData.ShopFilterType.GachaTicket; + this.ShopFilterType_ = SCHALE.Common.FlatData.ShopFilterType.GachaTicket; this.GoodsId = 0; } } @@ -111,7 +111,7 @@ static public class ShopFilterClassifiedExcelVerify && verifier.VerifyField(tablePos, 6 /*CategoryType*/, 4 /*SCHALE.Common.FlatData.ShopCategoryType*/, 4, false) && verifier.VerifyField(tablePos, 8 /*ConsumeParcelType*/, 4 /*SCHALE.Common.FlatData.ParcelType*/, 4, false) && verifier.VerifyField(tablePos, 10 /*ConsumeParcelId*/, 8 /*long*/, 8, false) - && verifier.VerifyField(tablePos, 12 /*ShopFilterType*/, 4 /*SCHALE.Common.FlatData.ShopFilterType*/, 4, false) + && verifier.VerifyField(tablePos, 12 /*ShopFilterType_*/, 4 /*SCHALE.Common.FlatData.ShopFilterType*/, 4, false) && verifier.VerifyField(tablePos, 14 /*GoodsId*/, 8 /*long*/, 8, false) && verifier.VerifyTableEnd(tablePos); } diff --git a/SCHALE.Common/FlatData/ShopRecruitExcel.cs b/SCHALE.Common/FlatData/ShopRecruitExcel.cs index 5e60e39..9261e52 100644 --- a/SCHALE.Common/FlatData/ShopRecruitExcel.cs +++ b/SCHALE.Common/FlatData/ShopRecruitExcel.cs @@ -76,7 +76,7 @@ public struct ShopRecruitExcel : IFlatbufferObject public long RecruitSellectionShopId { get { int o = __p.__offset(34); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public long PurchaseCooltimeMin { get { int o = __p.__offset(36); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public long PurchaseCountLimit { get { int o = __p.__offset(38); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } - public SCHALE.Common.FlatData.PurchaseCountResetType PurchaseCountResetType { get { int o = __p.__offset(40); return o != 0 ? (SCHALE.Common.FlatData.PurchaseCountResetType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.PurchaseCountResetType.None; } } + public SCHALE.Common.FlatData.PurchaseCountResetType PurchaseCountResetType_ { get { int o = __p.__offset(40); return o != 0 ? (SCHALE.Common.FlatData.PurchaseCountResetType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.PurchaseCountResetType.None; } } public bool IsNewbie { get { int o = __p.__offset(42); return o != 0 ? 0!=__p.bb.Get(o + __p.bb_pos) : (bool)false; } } public bool IsSelectRecruit { get { int o = __p.__offset(44); return o != 0 ? 0!=__p.bb.Get(o + __p.bb_pos) : (bool)false; } } public long DirectPayInvisibleTokenId { get { int o = __p.__offset(46); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } @@ -102,7 +102,7 @@ public struct ShopRecruitExcel : IFlatbufferObject long RecruitSellectionShopId = 0, long PurchaseCooltimeMin = 0, long PurchaseCountLimit = 0, - SCHALE.Common.FlatData.PurchaseCountResetType PurchaseCountResetType = SCHALE.Common.FlatData.PurchaseCountResetType.None, + SCHALE.Common.FlatData.PurchaseCountResetType PurchaseCountResetType_ = SCHALE.Common.FlatData.PurchaseCountResetType.None, bool IsNewbie = false, bool IsSelectRecruit = false, long DirectPayInvisibleTokenId = 0, @@ -121,7 +121,7 @@ public struct ShopRecruitExcel : IFlatbufferObject ShopRecruitExcel.AddTenGachaGoodsId(builder, TenGachaGoodsId); ShopRecruitExcel.AddOneGachaGoodsId(builder, OneGachaGoodsId); ShopRecruitExcel.AddId(builder, Id); - ShopRecruitExcel.AddPurchaseCountResetType(builder, PurchaseCountResetType); + ShopRecruitExcel.AddPurchaseCountResetType_(builder, PurchaseCountResetType_); ShopRecruitExcel.AddSalePeriodTo(builder, SalePeriodToOffset); ShopRecruitExcel.AddSalePeriodFrom(builder, SalePeriodFromOffset); ShopRecruitExcel.AddInfoCharacterId(builder, InfoCharacterIdOffset); @@ -165,7 +165,7 @@ public struct ShopRecruitExcel : IFlatbufferObject public static void AddRecruitSellectionShopId(FlatBufferBuilder builder, long recruitSellectionShopId) { builder.AddLong(15, recruitSellectionShopId, 0); } public static void AddPurchaseCooltimeMin(FlatBufferBuilder builder, long purchaseCooltimeMin) { builder.AddLong(16, purchaseCooltimeMin, 0); } public static void AddPurchaseCountLimit(FlatBufferBuilder builder, long purchaseCountLimit) { builder.AddLong(17, purchaseCountLimit, 0); } - public static void AddPurchaseCountResetType(FlatBufferBuilder builder, SCHALE.Common.FlatData.PurchaseCountResetType purchaseCountResetType) { builder.AddInt(18, (int)purchaseCountResetType, 0); } + public static void AddPurchaseCountResetType_(FlatBufferBuilder builder, SCHALE.Common.FlatData.PurchaseCountResetType purchaseCountResetType_) { builder.AddInt(18, (int)purchaseCountResetType_, 0); } public static void AddIsNewbie(FlatBufferBuilder builder, bool isNewbie) { builder.AddBool(19, isNewbie, false); } public static void AddIsSelectRecruit(FlatBufferBuilder builder, bool isSelectRecruit) { builder.AddBool(20, isSelectRecruit, false); } public static void AddDirectPayInvisibleTokenId(FlatBufferBuilder builder, long directPayInvisibleTokenId) { builder.AddLong(21, directPayInvisibleTokenId, 0); } @@ -202,7 +202,7 @@ public struct ShopRecruitExcel : IFlatbufferObject _o.RecruitSellectionShopId = TableEncryptionService.Convert(this.RecruitSellectionShopId, key); _o.PurchaseCooltimeMin = TableEncryptionService.Convert(this.PurchaseCooltimeMin, key); _o.PurchaseCountLimit = TableEncryptionService.Convert(this.PurchaseCountLimit, key); - _o.PurchaseCountResetType = TableEncryptionService.Convert(this.PurchaseCountResetType, key); + _o.PurchaseCountResetType_ = TableEncryptionService.Convert(this.PurchaseCountResetType_, key); _o.IsNewbie = TableEncryptionService.Convert(this.IsNewbie, key); _o.IsSelectRecruit = TableEncryptionService.Convert(this.IsSelectRecruit, key); _o.DirectPayInvisibleTokenId = TableEncryptionService.Convert(this.DirectPayInvisibleTokenId, key); @@ -245,7 +245,7 @@ public struct ShopRecruitExcel : IFlatbufferObject _o.RecruitSellectionShopId, _o.PurchaseCooltimeMin, _o.PurchaseCountLimit, - _o.PurchaseCountResetType, + _o.PurchaseCountResetType_, _o.IsNewbie, _o.IsSelectRecruit, _o.DirectPayInvisibleTokenId, @@ -274,7 +274,7 @@ public class ShopRecruitExcelT public long RecruitSellectionShopId { get; set; } public long PurchaseCooltimeMin { get; set; } public long PurchaseCountLimit { get; set; } - public SCHALE.Common.FlatData.PurchaseCountResetType PurchaseCountResetType { get; set; } + public SCHALE.Common.FlatData.PurchaseCountResetType PurchaseCountResetType_ { get; set; } public bool IsNewbie { get; set; } public bool IsSelectRecruit { get; set; } public long DirectPayInvisibleTokenId { get; set; } @@ -300,7 +300,7 @@ public class ShopRecruitExcelT this.RecruitSellectionShopId = 0; this.PurchaseCooltimeMin = 0; this.PurchaseCountLimit = 0; - this.PurchaseCountResetType = SCHALE.Common.FlatData.PurchaseCountResetType.None; + this.PurchaseCountResetType_ = SCHALE.Common.FlatData.PurchaseCountResetType.None; this.IsNewbie = false; this.IsSelectRecruit = false; this.DirectPayInvisibleTokenId = 0; @@ -333,7 +333,7 @@ static public class ShopRecruitExcelVerify && verifier.VerifyField(tablePos, 34 /*RecruitSellectionShopId*/, 8 /*long*/, 8, false) && verifier.VerifyField(tablePos, 36 /*PurchaseCooltimeMin*/, 8 /*long*/, 8, false) && verifier.VerifyField(tablePos, 38 /*PurchaseCountLimit*/, 8 /*long*/, 8, false) - && verifier.VerifyField(tablePos, 40 /*PurchaseCountResetType*/, 4 /*SCHALE.Common.FlatData.PurchaseCountResetType*/, 4, false) + && verifier.VerifyField(tablePos, 40 /*PurchaseCountResetType_*/, 4 /*SCHALE.Common.FlatData.PurchaseCountResetType*/, 4, false) && verifier.VerifyField(tablePos, 42 /*IsNewbie*/, 1 /*bool*/, 1, false) && verifier.VerifyField(tablePos, 44 /*IsSelectRecruit*/, 1 /*bool*/, 1, false) && verifier.VerifyField(tablePos, 46 /*DirectPayInvisibleTokenId*/, 8 /*long*/, 8, false) diff --git a/SCHALE.Common/FlatData/ShopRefreshExcel.cs b/SCHALE.Common/FlatData/ShopRefreshExcel.cs index abdfd2e..547fb04 100644 --- a/SCHALE.Common/FlatData/ShopRefreshExcel.cs +++ b/SCHALE.Common/FlatData/ShopRefreshExcel.cs @@ -24,34 +24,37 @@ public struct ShopRefreshExcel : IFlatbufferObject public uint LocalizeEtcId { get { int o = __p.__offset(6); return o != 0 ? __p.bb.GetUint(o + __p.bb_pos) : (uint)0; } } public bool IsLegacy { get { int o = __p.__offset(8); return o != 0 ? 0!=__p.bb.Get(o + __p.bb_pos) : (bool)false; } } public long GoodsId { get { int o = __p.__offset(10); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } - public int GoodsType { get { int o = __p.__offset(12); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } - public long DisplayOrder { get { int o = __p.__offset(14); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } - public SCHALE.Common.FlatData.ShopCategoryType CategoryType { get { int o = __p.__offset(16); return o != 0 ? (SCHALE.Common.FlatData.ShopCategoryType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.ShopCategoryType.General; } } - public int RefreshGroup { get { int o = __p.__offset(18); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } - public int Prob { get { int o = __p.__offset(20); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } - public string BuyReportEventName { get { int o = __p.__offset(22); return o != 0 ? __p.__string(o + __p.bb_pos) : null; } } + public bool IsBundle { get { int o = __p.__offset(12); return o != 0 ? 0!=__p.bb.Get(o + __p.bb_pos) : (bool)false; } } + public long VisibleAmount { get { int o = __p.__offset(14); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } + public long DisplayOrder { get { int o = __p.__offset(16); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } + public SCHALE.Common.FlatData.ShopCategoryType CategoryType { get { int o = __p.__offset(18); return o != 0 ? (SCHALE.Common.FlatData.ShopCategoryType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.ShopCategoryType.General; } } + public int RefreshGroup { get { int o = __p.__offset(20); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } + public int Prob { get { int o = __p.__offset(22); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } + public string BuyReportEventName { get { int o = __p.__offset(24); return o != 0 ? __p.__string(o + __p.bb_pos) : null; } } #if ENABLE_SPAN_T - public Span GetBuyReportEventNameBytes() { return __p.__vector_as_span(22, 1); } + public Span GetBuyReportEventNameBytes() { return __p.__vector_as_span(24, 1); } #else - public ArraySegment? GetBuyReportEventNameBytes() { return __p.__vector_as_arraysegment(22); } + public ArraySegment? GetBuyReportEventNameBytes() { return __p.__vector_as_arraysegment(24); } #endif - public byte[] GetBuyReportEventNameArray() { return __p.__vector_as_array(22); } - public SCHALE.Common.FlatData.ProductDisplayTag DisplayTag { get { int o = __p.__offset(24); return o != 0 ? (SCHALE.Common.FlatData.ProductDisplayTag)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.ProductDisplayTag.None; } } + public byte[] GetBuyReportEventNameArray() { return __p.__vector_as_array(24); } + public SCHALE.Common.FlatData.ProductDisplayTag DisplayTag { get { int o = __p.__offset(26); return o != 0 ? (SCHALE.Common.FlatData.ProductDisplayTag)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.ProductDisplayTag.None; } } public static Offset CreateShopRefreshExcel(FlatBufferBuilder builder, long Id = 0, uint LocalizeEtcId = 0, bool IsLegacy = false, long GoodsId = 0, - int GoodsType = 0, + bool IsBundle = false, + long VisibleAmount = 0, long DisplayOrder = 0, SCHALE.Common.FlatData.ShopCategoryType CategoryType = SCHALE.Common.FlatData.ShopCategoryType.General, int RefreshGroup = 0, int Prob = 0, StringOffset BuyReportEventNameOffset = default(StringOffset), SCHALE.Common.FlatData.ProductDisplayTag DisplayTag = SCHALE.Common.FlatData.ProductDisplayTag.None) { - builder.StartTable(11); + builder.StartTable(12); ShopRefreshExcel.AddDisplayOrder(builder, DisplayOrder); + ShopRefreshExcel.AddVisibleAmount(builder, VisibleAmount); ShopRefreshExcel.AddGoodsId(builder, GoodsId); ShopRefreshExcel.AddId(builder, Id); ShopRefreshExcel.AddDisplayTag(builder, DisplayTag); @@ -59,24 +62,25 @@ public struct ShopRefreshExcel : IFlatbufferObject ShopRefreshExcel.AddProb(builder, Prob); ShopRefreshExcel.AddRefreshGroup(builder, RefreshGroup); ShopRefreshExcel.AddCategoryType(builder, CategoryType); - ShopRefreshExcel.AddGoodsType(builder, GoodsType); ShopRefreshExcel.AddLocalizeEtcId(builder, LocalizeEtcId); + ShopRefreshExcel.AddIsBundle(builder, IsBundle); ShopRefreshExcel.AddIsLegacy(builder, IsLegacy); return ShopRefreshExcel.EndShopRefreshExcel(builder); } - public static void StartShopRefreshExcel(FlatBufferBuilder builder) { builder.StartTable(11); } + public static void StartShopRefreshExcel(FlatBufferBuilder builder) { builder.StartTable(12); } public static void AddId(FlatBufferBuilder builder, long id) { builder.AddLong(0, id, 0); } public static void AddLocalizeEtcId(FlatBufferBuilder builder, uint localizeEtcId) { builder.AddUint(1, localizeEtcId, 0); } public static void AddIsLegacy(FlatBufferBuilder builder, bool isLegacy) { builder.AddBool(2, isLegacy, false); } public static void AddGoodsId(FlatBufferBuilder builder, long goodsId) { builder.AddLong(3, goodsId, 0); } - public static void AddGoodsType(FlatBufferBuilder builder, int goodsType) { builder.AddInt(4, goodsType, 0); } - public static void AddDisplayOrder(FlatBufferBuilder builder, long displayOrder) { builder.AddLong(5, displayOrder, 0); } - public static void AddCategoryType(FlatBufferBuilder builder, SCHALE.Common.FlatData.ShopCategoryType categoryType) { builder.AddInt(6, (int)categoryType, 0); } - public static void AddRefreshGroup(FlatBufferBuilder builder, int refreshGroup) { builder.AddInt(7, refreshGroup, 0); } - public static void AddProb(FlatBufferBuilder builder, int prob) { builder.AddInt(8, prob, 0); } - public static void AddBuyReportEventName(FlatBufferBuilder builder, StringOffset buyReportEventNameOffset) { builder.AddOffset(9, buyReportEventNameOffset.Value, 0); } - public static void AddDisplayTag(FlatBufferBuilder builder, SCHALE.Common.FlatData.ProductDisplayTag displayTag) { builder.AddInt(10, (int)displayTag, 0); } + public static void AddIsBundle(FlatBufferBuilder builder, bool isBundle) { builder.AddBool(4, isBundle, false); } + public static void AddVisibleAmount(FlatBufferBuilder builder, long visibleAmount) { builder.AddLong(5, visibleAmount, 0); } + public static void AddDisplayOrder(FlatBufferBuilder builder, long displayOrder) { builder.AddLong(6, displayOrder, 0); } + public static void AddCategoryType(FlatBufferBuilder builder, SCHALE.Common.FlatData.ShopCategoryType categoryType) { builder.AddInt(7, (int)categoryType, 0); } + public static void AddRefreshGroup(FlatBufferBuilder builder, int refreshGroup) { builder.AddInt(8, refreshGroup, 0); } + public static void AddProb(FlatBufferBuilder builder, int prob) { builder.AddInt(9, prob, 0); } + public static void AddBuyReportEventName(FlatBufferBuilder builder, StringOffset buyReportEventNameOffset) { builder.AddOffset(10, buyReportEventNameOffset.Value, 0); } + public static void AddDisplayTag(FlatBufferBuilder builder, SCHALE.Common.FlatData.ProductDisplayTag displayTag) { builder.AddInt(11, (int)displayTag, 0); } public static Offset EndShopRefreshExcel(FlatBufferBuilder builder) { int o = builder.EndTable(); return new Offset(o); @@ -92,7 +96,8 @@ public struct ShopRefreshExcel : IFlatbufferObject _o.LocalizeEtcId = TableEncryptionService.Convert(this.LocalizeEtcId, key); _o.IsLegacy = TableEncryptionService.Convert(this.IsLegacy, key); _o.GoodsId = TableEncryptionService.Convert(this.GoodsId, key); - _o.GoodsType = TableEncryptionService.Convert(this.GoodsType, key); + _o.IsBundle = TableEncryptionService.Convert(this.IsBundle, key); + _o.VisibleAmount = TableEncryptionService.Convert(this.VisibleAmount, key); _o.DisplayOrder = TableEncryptionService.Convert(this.DisplayOrder, key); _o.CategoryType = TableEncryptionService.Convert(this.CategoryType, key); _o.RefreshGroup = TableEncryptionService.Convert(this.RefreshGroup, key); @@ -109,7 +114,8 @@ public struct ShopRefreshExcel : IFlatbufferObject _o.LocalizeEtcId, _o.IsLegacy, _o.GoodsId, - _o.GoodsType, + _o.IsBundle, + _o.VisibleAmount, _o.DisplayOrder, _o.CategoryType, _o.RefreshGroup, @@ -125,7 +131,8 @@ public class ShopRefreshExcelT public uint LocalizeEtcId { get; set; } public bool IsLegacy { get; set; } public long GoodsId { get; set; } - public int GoodsType { get; set; } + public bool IsBundle { get; set; } + public long VisibleAmount { get; set; } public long DisplayOrder { get; set; } public SCHALE.Common.FlatData.ShopCategoryType CategoryType { get; set; } public int RefreshGroup { get; set; } @@ -138,7 +145,8 @@ public class ShopRefreshExcelT this.LocalizeEtcId = 0; this.IsLegacy = false; this.GoodsId = 0; - this.GoodsType = 0; + this.IsBundle = false; + this.VisibleAmount = 0; this.DisplayOrder = 0; this.CategoryType = SCHALE.Common.FlatData.ShopCategoryType.General; this.RefreshGroup = 0; @@ -158,13 +166,14 @@ static public class ShopRefreshExcelVerify && verifier.VerifyField(tablePos, 6 /*LocalizeEtcId*/, 4 /*uint*/, 4, false) && verifier.VerifyField(tablePos, 8 /*IsLegacy*/, 1 /*bool*/, 1, false) && verifier.VerifyField(tablePos, 10 /*GoodsId*/, 8 /*long*/, 8, false) - && verifier.VerifyField(tablePos, 12 /*GoodsType*/, 4 /*int*/, 4, false) - && verifier.VerifyField(tablePos, 14 /*DisplayOrder*/, 8 /*long*/, 8, false) - && verifier.VerifyField(tablePos, 16 /*CategoryType*/, 4 /*SCHALE.Common.FlatData.ShopCategoryType*/, 4, false) - && verifier.VerifyField(tablePos, 18 /*RefreshGroup*/, 4 /*int*/, 4, false) - && verifier.VerifyField(tablePos, 20 /*Prob*/, 4 /*int*/, 4, false) - && verifier.VerifyString(tablePos, 22 /*BuyReportEventName*/, false) - && verifier.VerifyField(tablePos, 24 /*DisplayTag*/, 4 /*SCHALE.Common.FlatData.ProductDisplayTag*/, 4, false) + && verifier.VerifyField(tablePos, 12 /*IsBundle*/, 1 /*bool*/, 1, false) + && verifier.VerifyField(tablePos, 14 /*VisibleAmount*/, 8 /*long*/, 8, false) + && verifier.VerifyField(tablePos, 16 /*DisplayOrder*/, 8 /*long*/, 8, false) + && verifier.VerifyField(tablePos, 18 /*CategoryType*/, 4 /*SCHALE.Common.FlatData.ShopCategoryType*/, 4, false) + && verifier.VerifyField(tablePos, 20 /*RefreshGroup*/, 4 /*int*/, 4, false) + && verifier.VerifyField(tablePos, 22 /*Prob*/, 4 /*int*/, 4, false) + && verifier.VerifyString(tablePos, 24 /*BuyReportEventName*/, false) + && verifier.VerifyField(tablePos, 26 /*DisplayTag*/, 4 /*SCHALE.Common.FlatData.ProductDisplayTag*/, 4, false) && verifier.VerifyTableEnd(tablePos); } } diff --git a/SCHALE.Common/FlatData/SkillExcel.cs b/SCHALE.Common/FlatData/SkillExcel.cs index 0a0218c..ffd1f5e 100644 --- a/SCHALE.Common/FlatData/SkillExcel.cs +++ b/SCHALE.Common/FlatData/SkillExcel.cs @@ -50,7 +50,7 @@ public struct SkillExcel : IFlatbufferObject public int ExtraEnemySkillCost { get { int o = __p.__offset(22); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } public int NPCSkillCost { get { int o = __p.__offset(24); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } public int ExtraNPCSkillCost { get { int o = __p.__offset(26); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } - public SCHALE.Common.FlatData.BulletType BulletType { get { int o = __p.__offset(28); return o != 0 ? (SCHALE.Common.FlatData.BulletType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.BulletType.Normal; } } + public SCHALE.Common.FlatData.BulletType BulletType_ { get { int o = __p.__offset(28); return o != 0 ? (SCHALE.Common.FlatData.BulletType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.BulletType.Normal; } } public int StartCoolTime { get { int o = __p.__offset(30); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } public int CoolTime { get { int o = __p.__offset(32); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } public int EnemyStartCoolTime { get { int o = __p.__offset(34); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } @@ -99,7 +99,7 @@ public struct SkillExcel : IFlatbufferObject int ExtraEnemySkillCost = 0, int NPCSkillCost = 0, int ExtraNPCSkillCost = 0, - SCHALE.Common.FlatData.BulletType BulletType = SCHALE.Common.FlatData.BulletType.Normal, + SCHALE.Common.FlatData.BulletType BulletType_ = SCHALE.Common.FlatData.BulletType.Normal, int StartCoolTime = 0, int CoolTime = 0, int EnemyStartCoolTime = 0, @@ -132,7 +132,7 @@ public struct SkillExcel : IFlatbufferObject SkillExcel.AddEnemyStartCoolTime(builder, EnemyStartCoolTime); SkillExcel.AddCoolTime(builder, CoolTime); SkillExcel.AddStartCoolTime(builder, StartCoolTime); - SkillExcel.AddBulletType(builder, BulletType); + SkillExcel.AddBulletType_(builder, BulletType_); SkillExcel.AddExtraNPCSkillCost(builder, ExtraNPCSkillCost); SkillExcel.AddNPCSkillCost(builder, NPCSkillCost); SkillExcel.AddExtraEnemySkillCost(builder, ExtraEnemySkillCost); @@ -162,7 +162,7 @@ public struct SkillExcel : IFlatbufferObject public static void AddExtraEnemySkillCost(FlatBufferBuilder builder, int extraEnemySkillCost) { builder.AddInt(9, extraEnemySkillCost, 0); } public static void AddNPCSkillCost(FlatBufferBuilder builder, int nPCSkillCost) { builder.AddInt(10, nPCSkillCost, 0); } public static void AddExtraNPCSkillCost(FlatBufferBuilder builder, int extraNPCSkillCost) { builder.AddInt(11, extraNPCSkillCost, 0); } - public static void AddBulletType(FlatBufferBuilder builder, SCHALE.Common.FlatData.BulletType bulletType) { builder.AddInt(12, (int)bulletType, 0); } + public static void AddBulletType_(FlatBufferBuilder builder, SCHALE.Common.FlatData.BulletType bulletType_) { builder.AddInt(12, (int)bulletType_, 0); } public static void AddStartCoolTime(FlatBufferBuilder builder, int startCoolTime) { builder.AddInt(13, startCoolTime, 0); } public static void AddCoolTime(FlatBufferBuilder builder, int coolTime) { builder.AddInt(14, coolTime, 0); } public static void AddEnemyStartCoolTime(FlatBufferBuilder builder, int enemyStartCoolTime) { builder.AddInt(15, enemyStartCoolTime, 0); } @@ -202,7 +202,7 @@ public struct SkillExcel : IFlatbufferObject _o.ExtraEnemySkillCost = TableEncryptionService.Convert(this.ExtraEnemySkillCost, key); _o.NPCSkillCost = TableEncryptionService.Convert(this.NPCSkillCost, key); _o.ExtraNPCSkillCost = TableEncryptionService.Convert(this.ExtraNPCSkillCost, key); - _o.BulletType = TableEncryptionService.Convert(this.BulletType, key); + _o.BulletType_ = TableEncryptionService.Convert(this.BulletType_, key); _o.StartCoolTime = TableEncryptionService.Convert(this.StartCoolTime, key); _o.CoolTime = TableEncryptionService.Convert(this.CoolTime, key); _o.EnemyStartCoolTime = TableEncryptionService.Convert(this.EnemyStartCoolTime, key); @@ -242,7 +242,7 @@ public struct SkillExcel : IFlatbufferObject _o.ExtraEnemySkillCost, _o.NPCSkillCost, _o.ExtraNPCSkillCost, - _o.BulletType, + _o.BulletType_, _o.StartCoolTime, _o.CoolTime, _o.EnemyStartCoolTime, @@ -276,7 +276,7 @@ public class SkillExcelT public int ExtraEnemySkillCost { get; set; } public int NPCSkillCost { get; set; } public int ExtraNPCSkillCost { get; set; } - public SCHALE.Common.FlatData.BulletType BulletType { get; set; } + public SCHALE.Common.FlatData.BulletType BulletType_ { get; set; } public int StartCoolTime { get; set; } public int CoolTime { get; set; } public int EnemyStartCoolTime { get; set; } @@ -307,7 +307,7 @@ public class SkillExcelT this.ExtraEnemySkillCost = 0; this.NPCSkillCost = 0; this.ExtraNPCSkillCost = 0; - this.BulletType = SCHALE.Common.FlatData.BulletType.Normal; + this.BulletType_ = SCHALE.Common.FlatData.BulletType.Normal; this.StartCoolTime = 0; this.CoolTime = 0; this.EnemyStartCoolTime = 0; @@ -345,7 +345,7 @@ static public class SkillExcelVerify && verifier.VerifyField(tablePos, 22 /*ExtraEnemySkillCost*/, 4 /*int*/, 4, false) && verifier.VerifyField(tablePos, 24 /*NPCSkillCost*/, 4 /*int*/, 4, false) && verifier.VerifyField(tablePos, 26 /*ExtraNPCSkillCost*/, 4 /*int*/, 4, false) - && verifier.VerifyField(tablePos, 28 /*BulletType*/, 4 /*SCHALE.Common.FlatData.BulletType*/, 4, false) + && verifier.VerifyField(tablePos, 28 /*BulletType_*/, 4 /*SCHALE.Common.FlatData.BulletType*/, 4, false) && verifier.VerifyField(tablePos, 30 /*StartCoolTime*/, 4 /*int*/, 4, false) && verifier.VerifyField(tablePos, 32 /*CoolTime*/, 4 /*int*/, 4, false) && verifier.VerifyField(tablePos, 34 /*EnemyStartCoolTime*/, 4 /*int*/, 4, false) diff --git a/SCHALE.Common/FlatData/StarGoalType.cs b/SCHALE.Common/FlatData/StarGoalType.cs index b3a2654..a82c8da 100644 --- a/SCHALE.Common/FlatData/StarGoalType.cs +++ b/SCHALE.Common/FlatData/StarGoalType.cs @@ -12,6 +12,7 @@ public enum StarGoalType : int Clear = 2, GetBoxes = 3, ClearTimeInSec = 4, + AllyBaseDamage = 5, }; diff --git a/SCHALE.Common/FlatData/StatType.cs b/SCHALE.Common/FlatData/StatType.cs index 8634d6e..41c6a2d 100644 --- a/SCHALE.Common/FlatData/StatType.cs +++ b/SCHALE.Common/FlatData/StatType.cs @@ -74,7 +74,20 @@ public enum StatType : int EnhanceElasticArmorRate = 64, ExDamagedRatioIncrease = 65, ExDamagedRatioDecrease = 66, - Max = 67, + EnhanceExDamageRate = 67, + ReduceExDamagedRate = 68, + HealRate = 69, + HealLightArmorRate = 70, + HealHeavyArmorRate = 71, + HealUnarmedRate = 72, + HealElasticArmorRate = 73, + HealNormalArmorRate = 74, + HealedExplosionRate = 75, + HealedPierceRate = 76, + HealedMysticRate = 77, + HealedSonicRate = 78, + HealedNormalRate = 79, + Max = 80, }; diff --git a/SCHALE.Common/FlatData/StickerPageContentExcel.cs b/SCHALE.Common/FlatData/StickerPageContentExcel.cs index d869732..77a7abb 100644 --- a/SCHALE.Common/FlatData/StickerPageContentExcel.cs +++ b/SCHALE.Common/FlatData/StickerPageContentExcel.cs @@ -24,9 +24,9 @@ public struct StickerPageContentExcel : IFlatbufferObject public long StickerGroupId { get { int o = __p.__offset(6); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public long StickerPageId { get { int o = __p.__offset(8); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public long StickerSlot { get { int o = __p.__offset(10); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } - public SCHALE.Common.FlatData.StickerGetConditionType StickerGetConditionType { get { int o = __p.__offset(12); return o != 0 ? (SCHALE.Common.FlatData.StickerGetConditionType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.StickerGetConditionType.None; } } - public SCHALE.Common.FlatData.StickerCheckPassType StickerCheckPassType { get { int o = __p.__offset(14); return o != 0 ? (SCHALE.Common.FlatData.StickerCheckPassType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.StickerCheckPassType.None; } } - public SCHALE.Common.FlatData.GetStickerConditionType GetStickerConditionType { get { int o = __p.__offset(16); return o != 0 ? (SCHALE.Common.FlatData.GetStickerConditionType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.GetStickerConditionType.None; } } + public SCHALE.Common.FlatData.StickerGetConditionType StickerGetConditionType_ { get { int o = __p.__offset(12); return o != 0 ? (SCHALE.Common.FlatData.StickerGetConditionType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.StickerGetConditionType.None; } } + public SCHALE.Common.FlatData.StickerCheckPassType StickerCheckPassType_ { get { int o = __p.__offset(14); return o != 0 ? (SCHALE.Common.FlatData.StickerCheckPassType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.StickerCheckPassType.None; } } + public SCHALE.Common.FlatData.GetStickerConditionType GetStickerConditionType_ { get { int o = __p.__offset(16); return o != 0 ? (SCHALE.Common.FlatData.GetStickerConditionType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.GetStickerConditionType.None; } } public long StickerGetConditionCount { get { int o = __p.__offset(18); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public long StickerGetConditionParameter(int j) { int o = __p.__offset(20); return o != 0 ? __p.bb.GetLong(__p.__vector(o) + j * 8) : (long)0; } public int StickerGetConditionParameterLength { get { int o = __p.__offset(20); return o != 0 ? __p.__vector_len(o) : 0; } } @@ -72,9 +72,9 @@ public struct StickerPageContentExcel : IFlatbufferObject long StickerGroupId = 0, long StickerPageId = 0, long StickerSlot = 0, - SCHALE.Common.FlatData.StickerGetConditionType StickerGetConditionType = SCHALE.Common.FlatData.StickerGetConditionType.None, - SCHALE.Common.FlatData.StickerCheckPassType StickerCheckPassType = SCHALE.Common.FlatData.StickerCheckPassType.None, - SCHALE.Common.FlatData.GetStickerConditionType GetStickerConditionType = SCHALE.Common.FlatData.GetStickerConditionType.None, + SCHALE.Common.FlatData.StickerGetConditionType StickerGetConditionType_ = SCHALE.Common.FlatData.StickerGetConditionType.None, + SCHALE.Common.FlatData.StickerCheckPassType StickerCheckPassType_ = SCHALE.Common.FlatData.StickerCheckPassType.None, + SCHALE.Common.FlatData.GetStickerConditionType GetStickerConditionType_ = SCHALE.Common.FlatData.GetStickerConditionType.None, long StickerGetConditionCount = 0, VectorOffset StickerGetConditionParameterOffset = default(VectorOffset), VectorOffset StickerGetConditionParameterTagOffset = default(VectorOffset), @@ -94,9 +94,9 @@ public struct StickerPageContentExcel : IFlatbufferObject StickerPageContentExcel.AddPackedStickerIconLocalizeEtcId(builder, PackedStickerIconLocalizeEtcId); StickerPageContentExcel.AddStickerGetConditionParameterTag(builder, StickerGetConditionParameterTagOffset); StickerPageContentExcel.AddStickerGetConditionParameter(builder, StickerGetConditionParameterOffset); - StickerPageContentExcel.AddGetStickerConditionType(builder, GetStickerConditionType); - StickerPageContentExcel.AddStickerCheckPassType(builder, StickerCheckPassType); - StickerPageContentExcel.AddStickerGetConditionType(builder, StickerGetConditionType); + StickerPageContentExcel.AddGetStickerConditionType_(builder, GetStickerConditionType_); + StickerPageContentExcel.AddStickerCheckPassType_(builder, StickerCheckPassType_); + StickerPageContentExcel.AddStickerGetConditionType_(builder, StickerGetConditionType_); return StickerPageContentExcel.EndStickerPageContentExcel(builder); } @@ -105,9 +105,9 @@ public struct StickerPageContentExcel : IFlatbufferObject public static void AddStickerGroupId(FlatBufferBuilder builder, long stickerGroupId) { builder.AddLong(1, stickerGroupId, 0); } public static void AddStickerPageId(FlatBufferBuilder builder, long stickerPageId) { builder.AddLong(2, stickerPageId, 0); } public static void AddStickerSlot(FlatBufferBuilder builder, long stickerSlot) { builder.AddLong(3, stickerSlot, 0); } - public static void AddStickerGetConditionType(FlatBufferBuilder builder, SCHALE.Common.FlatData.StickerGetConditionType stickerGetConditionType) { builder.AddInt(4, (int)stickerGetConditionType, 0); } - public static void AddStickerCheckPassType(FlatBufferBuilder builder, SCHALE.Common.FlatData.StickerCheckPassType stickerCheckPassType) { builder.AddInt(5, (int)stickerCheckPassType, 0); } - public static void AddGetStickerConditionType(FlatBufferBuilder builder, SCHALE.Common.FlatData.GetStickerConditionType getStickerConditionType) { builder.AddInt(6, (int)getStickerConditionType, 0); } + public static void AddStickerGetConditionType_(FlatBufferBuilder builder, SCHALE.Common.FlatData.StickerGetConditionType stickerGetConditionType_) { builder.AddInt(4, (int)stickerGetConditionType_, 0); } + public static void AddStickerCheckPassType_(FlatBufferBuilder builder, SCHALE.Common.FlatData.StickerCheckPassType stickerCheckPassType_) { builder.AddInt(5, (int)stickerCheckPassType_, 0); } + public static void AddGetStickerConditionType_(FlatBufferBuilder builder, SCHALE.Common.FlatData.GetStickerConditionType getStickerConditionType_) { builder.AddInt(6, (int)getStickerConditionType_, 0); } public static void AddStickerGetConditionCount(FlatBufferBuilder builder, long stickerGetConditionCount) { builder.AddLong(7, stickerGetConditionCount, 0); } public static void AddStickerGetConditionParameter(FlatBufferBuilder builder, VectorOffset stickerGetConditionParameterOffset) { builder.AddOffset(8, stickerGetConditionParameterOffset.Value, 0); } public static VectorOffset CreateStickerGetConditionParameterVector(FlatBufferBuilder builder, long[] data) { builder.StartVector(8, data.Length, 8); for (int i = data.Length - 1; i >= 0; i--) builder.AddLong(data[i]); return builder.EndVector(); } @@ -140,9 +140,9 @@ public struct StickerPageContentExcel : IFlatbufferObject _o.StickerGroupId = TableEncryptionService.Convert(this.StickerGroupId, key); _o.StickerPageId = TableEncryptionService.Convert(this.StickerPageId, key); _o.StickerSlot = TableEncryptionService.Convert(this.StickerSlot, key); - _o.StickerGetConditionType = TableEncryptionService.Convert(this.StickerGetConditionType, key); - _o.StickerCheckPassType = TableEncryptionService.Convert(this.StickerCheckPassType, key); - _o.GetStickerConditionType = TableEncryptionService.Convert(this.GetStickerConditionType, key); + _o.StickerGetConditionType_ = TableEncryptionService.Convert(this.StickerGetConditionType_, key); + _o.StickerCheckPassType_ = TableEncryptionService.Convert(this.StickerCheckPassType_, key); + _o.GetStickerConditionType_ = TableEncryptionService.Convert(this.GetStickerConditionType_, key); _o.StickerGetConditionCount = TableEncryptionService.Convert(this.StickerGetConditionCount, key); _o.StickerGetConditionParameter = new List(); for (var _j = 0; _j < this.StickerGetConditionParameterLength; ++_j) {_o.StickerGetConditionParameter.Add(TableEncryptionService.Convert(this.StickerGetConditionParameter(_j), key));} @@ -174,9 +174,9 @@ public struct StickerPageContentExcel : IFlatbufferObject _o.StickerGroupId, _o.StickerPageId, _o.StickerSlot, - _o.StickerGetConditionType, - _o.StickerCheckPassType, - _o.GetStickerConditionType, + _o.StickerGetConditionType_, + _o.StickerCheckPassType_, + _o.GetStickerConditionType_, _o.StickerGetConditionCount, _StickerGetConditionParameter, _StickerGetConditionParameterTag, @@ -193,9 +193,9 @@ public class StickerPageContentExcelT public long StickerGroupId { get; set; } public long StickerPageId { get; set; } public long StickerSlot { get; set; } - public SCHALE.Common.FlatData.StickerGetConditionType StickerGetConditionType { get; set; } - public SCHALE.Common.FlatData.StickerCheckPassType StickerCheckPassType { get; set; } - public SCHALE.Common.FlatData.GetStickerConditionType GetStickerConditionType { get; set; } + public SCHALE.Common.FlatData.StickerGetConditionType StickerGetConditionType_ { get; set; } + public SCHALE.Common.FlatData.StickerCheckPassType StickerCheckPassType_ { get; set; } + public SCHALE.Common.FlatData.GetStickerConditionType GetStickerConditionType_ { get; set; } public long StickerGetConditionCount { get; set; } public List StickerGetConditionParameter { get; set; } public List StickerGetConditionParameterTag { get; set; } @@ -209,9 +209,9 @@ public class StickerPageContentExcelT this.StickerGroupId = 0; this.StickerPageId = 0; this.StickerSlot = 0; - this.StickerGetConditionType = SCHALE.Common.FlatData.StickerGetConditionType.None; - this.StickerCheckPassType = SCHALE.Common.FlatData.StickerCheckPassType.None; - this.GetStickerConditionType = SCHALE.Common.FlatData.GetStickerConditionType.None; + this.StickerGetConditionType_ = SCHALE.Common.FlatData.StickerGetConditionType.None; + this.StickerCheckPassType_ = SCHALE.Common.FlatData.StickerCheckPassType.None; + this.GetStickerConditionType_ = SCHALE.Common.FlatData.GetStickerConditionType.None; this.StickerGetConditionCount = 0; this.StickerGetConditionParameter = null; this.StickerGetConditionParameterTag = null; @@ -232,9 +232,9 @@ static public class StickerPageContentExcelVerify && verifier.VerifyField(tablePos, 6 /*StickerGroupId*/, 8 /*long*/, 8, false) && verifier.VerifyField(tablePos, 8 /*StickerPageId*/, 8 /*long*/, 8, false) && verifier.VerifyField(tablePos, 10 /*StickerSlot*/, 8 /*long*/, 8, false) - && verifier.VerifyField(tablePos, 12 /*StickerGetConditionType*/, 4 /*SCHALE.Common.FlatData.StickerGetConditionType*/, 4, false) - && verifier.VerifyField(tablePos, 14 /*StickerCheckPassType*/, 4 /*SCHALE.Common.FlatData.StickerCheckPassType*/, 4, false) - && verifier.VerifyField(tablePos, 16 /*GetStickerConditionType*/, 4 /*SCHALE.Common.FlatData.GetStickerConditionType*/, 4, false) + && verifier.VerifyField(tablePos, 12 /*StickerGetConditionType_*/, 4 /*SCHALE.Common.FlatData.StickerGetConditionType*/, 4, false) + && verifier.VerifyField(tablePos, 14 /*StickerCheckPassType_*/, 4 /*SCHALE.Common.FlatData.StickerCheckPassType*/, 4, false) + && verifier.VerifyField(tablePos, 16 /*GetStickerConditionType_*/, 4 /*SCHALE.Common.FlatData.GetStickerConditionType*/, 4, false) && verifier.VerifyField(tablePos, 18 /*StickerGetConditionCount*/, 8 /*long*/, 8, false) && verifier.VerifyVectorOfData(tablePos, 20 /*StickerGetConditionParameter*/, 8 /*long*/, false) && verifier.VerifyVectorOfData(tablePos, 22 /*StickerGetConditionParameterTag*/, 4 /*SCHALE.Common.FlatData.Tag*/, false) diff --git a/SCHALE.Common/FlatData/StoryStrategyExcel.cs b/SCHALE.Common/FlatData/StoryStrategyExcel.cs index cfff36d..8e0654a 100644 --- a/SCHALE.Common/FlatData/StoryStrategyExcel.cs +++ b/SCHALE.Common/FlatData/StoryStrategyExcel.cs @@ -53,9 +53,9 @@ public struct StoryStrategyExcel : IFlatbufferObject #endif public byte[] GetStrategyMapBGArray() { return __p.__vector_as_array(18); } public int MaxTurn { get { int o = __p.__offset(20); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } - public SCHALE.Common.FlatData.StageTopography StageTopography { get { int o = __p.__offset(22); return o != 0 ? (SCHALE.Common.FlatData.StageTopography)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.StageTopography.Street; } } - public SCHALE.Common.FlatData.StrategyEnvironment StrategyEnvironment { get { int o = __p.__offset(24); return o != 0 ? (SCHALE.Common.FlatData.StrategyEnvironment)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.StrategyEnvironment.None; } } - public SCHALE.Common.FlatData.ContentType ContentType { get { int o = __p.__offset(26); return o != 0 ? (SCHALE.Common.FlatData.ContentType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.ContentType.None; } } + public SCHALE.Common.FlatData.StageTopography StageTopography_ { get { int o = __p.__offset(22); return o != 0 ? (SCHALE.Common.FlatData.StageTopography)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.StageTopography.Street; } } + public SCHALE.Common.FlatData.StrategyEnvironment StrategyEnvironment_ { get { int o = __p.__offset(24); return o != 0 ? (SCHALE.Common.FlatData.StrategyEnvironment)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.StrategyEnvironment.None; } } + public SCHALE.Common.FlatData.ContentType ContentType_ { get { int o = __p.__offset(26); return o != 0 ? (SCHALE.Common.FlatData.ContentType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.ContentType.None; } } public long BGMId { get { int o = __p.__offset(28); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public string FirstClearReportEventName { get { int o = __p.__offset(30); return o != 0 ? __p.__string(o + __p.bb_pos) : null; } } #if ENABLE_SPAN_T @@ -75,9 +75,9 @@ public struct StoryStrategyExcel : IFlatbufferObject StringOffset StrategyMapOffset = default(StringOffset), StringOffset StrategyMapBGOffset = default(StringOffset), int MaxTurn = 0, - SCHALE.Common.FlatData.StageTopography StageTopography = SCHALE.Common.FlatData.StageTopography.Street, - SCHALE.Common.FlatData.StrategyEnvironment StrategyEnvironment = SCHALE.Common.FlatData.StrategyEnvironment.None, - SCHALE.Common.FlatData.ContentType ContentType = SCHALE.Common.FlatData.ContentType.None, + SCHALE.Common.FlatData.StageTopography StageTopography_ = SCHALE.Common.FlatData.StageTopography.Street, + SCHALE.Common.FlatData.StrategyEnvironment StrategyEnvironment_ = SCHALE.Common.FlatData.StrategyEnvironment.None, + SCHALE.Common.FlatData.ContentType ContentType_ = SCHALE.Common.FlatData.ContentType.None, long BGMId = 0, StringOffset FirstClearReportEventNameOffset = default(StringOffset)) { builder.StartTable(14); @@ -86,9 +86,9 @@ public struct StoryStrategyExcel : IFlatbufferObject StoryStrategyExcel.AddBattleDuration(builder, BattleDuration); StoryStrategyExcel.AddId(builder, Id); StoryStrategyExcel.AddFirstClearReportEventName(builder, FirstClearReportEventNameOffset); - StoryStrategyExcel.AddContentType(builder, ContentType); - StoryStrategyExcel.AddStrategyEnvironment(builder, StrategyEnvironment); - StoryStrategyExcel.AddStageTopography(builder, StageTopography); + StoryStrategyExcel.AddContentType_(builder, ContentType_); + StoryStrategyExcel.AddStrategyEnvironment_(builder, StrategyEnvironment_); + StoryStrategyExcel.AddStageTopography_(builder, StageTopography_); StoryStrategyExcel.AddMaxTurn(builder, MaxTurn); StoryStrategyExcel.AddStrategyMapBG(builder, StrategyMapBGOffset); StoryStrategyExcel.AddStrategyMap(builder, StrategyMapOffset); @@ -108,9 +108,9 @@ public struct StoryStrategyExcel : IFlatbufferObject public static void AddStrategyMap(FlatBufferBuilder builder, StringOffset strategyMapOffset) { builder.AddOffset(6, strategyMapOffset.Value, 0); } public static void AddStrategyMapBG(FlatBufferBuilder builder, StringOffset strategyMapBGOffset) { builder.AddOffset(7, strategyMapBGOffset.Value, 0); } public static void AddMaxTurn(FlatBufferBuilder builder, int maxTurn) { builder.AddInt(8, maxTurn, 0); } - public static void AddStageTopography(FlatBufferBuilder builder, SCHALE.Common.FlatData.StageTopography stageTopography) { builder.AddInt(9, (int)stageTopography, 0); } - public static void AddStrategyEnvironment(FlatBufferBuilder builder, SCHALE.Common.FlatData.StrategyEnvironment strategyEnvironment) { builder.AddInt(10, (int)strategyEnvironment, 0); } - public static void AddContentType(FlatBufferBuilder builder, SCHALE.Common.FlatData.ContentType contentType) { builder.AddInt(11, (int)contentType, 0); } + public static void AddStageTopography_(FlatBufferBuilder builder, SCHALE.Common.FlatData.StageTopography stageTopography_) { builder.AddInt(9, (int)stageTopography_, 0); } + public static void AddStrategyEnvironment_(FlatBufferBuilder builder, SCHALE.Common.FlatData.StrategyEnvironment strategyEnvironment_) { builder.AddInt(10, (int)strategyEnvironment_, 0); } + public static void AddContentType_(FlatBufferBuilder builder, SCHALE.Common.FlatData.ContentType contentType_) { builder.AddInt(11, (int)contentType_, 0); } public static void AddBGMId(FlatBufferBuilder builder, long bGMId) { builder.AddLong(12, bGMId, 0); } public static void AddFirstClearReportEventName(FlatBufferBuilder builder, StringOffset firstClearReportEventNameOffset) { builder.AddOffset(13, firstClearReportEventNameOffset.Value, 0); } public static Offset EndStoryStrategyExcel(FlatBufferBuilder builder) { @@ -133,9 +133,9 @@ public struct StoryStrategyExcel : IFlatbufferObject _o.StrategyMap = TableEncryptionService.Convert(this.StrategyMap, key); _o.StrategyMapBG = TableEncryptionService.Convert(this.StrategyMapBG, key); _o.MaxTurn = TableEncryptionService.Convert(this.MaxTurn, key); - _o.StageTopography = TableEncryptionService.Convert(this.StageTopography, key); - _o.StrategyEnvironment = TableEncryptionService.Convert(this.StrategyEnvironment, key); - _o.ContentType = TableEncryptionService.Convert(this.ContentType, key); + _o.StageTopography_ = TableEncryptionService.Convert(this.StageTopography_, key); + _o.StrategyEnvironment_ = TableEncryptionService.Convert(this.StrategyEnvironment_, key); + _o.ContentType_ = TableEncryptionService.Convert(this.ContentType_, key); _o.BGMId = TableEncryptionService.Convert(this.BGMId, key); _o.FirstClearReportEventName = TableEncryptionService.Convert(this.FirstClearReportEventName, key); } @@ -157,9 +157,9 @@ public struct StoryStrategyExcel : IFlatbufferObject _StrategyMap, _StrategyMapBG, _o.MaxTurn, - _o.StageTopography, - _o.StrategyEnvironment, - _o.ContentType, + _o.StageTopography_, + _o.StrategyEnvironment_, + _o.ContentType_, _o.BGMId, _FirstClearReportEventName); } @@ -176,9 +176,9 @@ public class StoryStrategyExcelT public string StrategyMap { get; set; } public string StrategyMapBG { get; set; } public int MaxTurn { get; set; } - public SCHALE.Common.FlatData.StageTopography StageTopography { get; set; } - public SCHALE.Common.FlatData.StrategyEnvironment StrategyEnvironment { get; set; } - public SCHALE.Common.FlatData.ContentType ContentType { get; set; } + public SCHALE.Common.FlatData.StageTopography StageTopography_ { get; set; } + public SCHALE.Common.FlatData.StrategyEnvironment StrategyEnvironment_ { get; set; } + public SCHALE.Common.FlatData.ContentType ContentType_ { get; set; } public long BGMId { get; set; } public string FirstClearReportEventName { get; set; } @@ -192,9 +192,9 @@ public class StoryStrategyExcelT this.StrategyMap = null; this.StrategyMapBG = null; this.MaxTurn = 0; - this.StageTopography = SCHALE.Common.FlatData.StageTopography.Street; - this.StrategyEnvironment = SCHALE.Common.FlatData.StrategyEnvironment.None; - this.ContentType = SCHALE.Common.FlatData.ContentType.None; + this.StageTopography_ = SCHALE.Common.FlatData.StageTopography.Street; + this.StrategyEnvironment_ = SCHALE.Common.FlatData.StrategyEnvironment.None; + this.ContentType_ = SCHALE.Common.FlatData.ContentType.None; this.BGMId = 0; this.FirstClearReportEventName = null; } @@ -215,9 +215,9 @@ static public class StoryStrategyExcelVerify && verifier.VerifyString(tablePos, 16 /*StrategyMap*/, false) && verifier.VerifyString(tablePos, 18 /*StrategyMapBG*/, false) && verifier.VerifyField(tablePos, 20 /*MaxTurn*/, 4 /*int*/, 4, false) - && verifier.VerifyField(tablePos, 22 /*StageTopography*/, 4 /*SCHALE.Common.FlatData.StageTopography*/, 4, false) - && verifier.VerifyField(tablePos, 24 /*StrategyEnvironment*/, 4 /*SCHALE.Common.FlatData.StrategyEnvironment*/, 4, false) - && verifier.VerifyField(tablePos, 26 /*ContentType*/, 4 /*SCHALE.Common.FlatData.ContentType*/, 4, false) + && verifier.VerifyField(tablePos, 22 /*StageTopography_*/, 4 /*SCHALE.Common.FlatData.StageTopography*/, 4, false) + && verifier.VerifyField(tablePos, 24 /*StrategyEnvironment_*/, 4 /*SCHALE.Common.FlatData.StrategyEnvironment*/, 4, false) + && verifier.VerifyField(tablePos, 26 /*ContentType_*/, 4 /*SCHALE.Common.FlatData.ContentType*/, 4, false) && verifier.VerifyField(tablePos, 28 /*BGMId*/, 8 /*long*/, 8, false) && verifier.VerifyString(tablePos, 30 /*FirstClearReportEventName*/, false) && verifier.VerifyTableEnd(tablePos); diff --git a/SCHALE.Common/FlatData/StoryStrategyExcelTable.cs b/SCHALE.Common/FlatData/StoryStrategyExcelTable.cs deleted file mode 100644 index 06ceec9..0000000 --- a/SCHALE.Common/FlatData/StoryStrategyExcelTable.cs +++ /dev/null @@ -1,88 +0,0 @@ -// -// automatically generated by the FlatBuffers compiler, do not modify -// - -namespace SCHALE.Common.FlatData -{ - -using global::System; -using global::System.Collections.Generic; -using global::SCHALE.Common.Crypto; -using global::Google.FlatBuffers; - -public struct StoryStrategyExcelTable : IFlatbufferObject -{ - private Table __p; - public ByteBuffer ByteBuffer { get { return __p.bb; } } - public static void ValidateVersion() { FlatBufferConstants.FLATBUFFERS_24_3_25(); } - public static StoryStrategyExcelTable GetRootAsStoryStrategyExcelTable(ByteBuffer _bb) { return GetRootAsStoryStrategyExcelTable(_bb, new StoryStrategyExcelTable()); } - public static StoryStrategyExcelTable GetRootAsStoryStrategyExcelTable(ByteBuffer _bb, StoryStrategyExcelTable obj) { return (obj.__assign(_bb.GetInt(_bb.Position) + _bb.Position, _bb)); } - public void __init(int _i, ByteBuffer _bb) { __p = new Table(_i, _bb); } - public StoryStrategyExcelTable __assign(int _i, ByteBuffer _bb) { __init(_i, _bb); return this; } - - public SCHALE.Common.FlatData.StoryStrategyExcel? DataList(int j) { int o = __p.__offset(4); return o != 0 ? (SCHALE.Common.FlatData.StoryStrategyExcel?)(new SCHALE.Common.FlatData.StoryStrategyExcel()).__assign(__p.__indirect(__p.__vector(o) + j * 4), __p.bb) : null; } - public int DataListLength { get { int o = __p.__offset(4); return o != 0 ? __p.__vector_len(o) : 0; } } - - public static Offset CreateStoryStrategyExcelTable(FlatBufferBuilder builder, - VectorOffset DataListOffset = default(VectorOffset)) { - builder.StartTable(1); - StoryStrategyExcelTable.AddDataList(builder, DataListOffset); - return StoryStrategyExcelTable.EndStoryStrategyExcelTable(builder); - } - - public static void StartStoryStrategyExcelTable(FlatBufferBuilder builder) { builder.StartTable(1); } - public static void AddDataList(FlatBufferBuilder builder, VectorOffset dataListOffset) { builder.AddOffset(0, dataListOffset.Value, 0); } - public static VectorOffset CreateDataListVector(FlatBufferBuilder builder, Offset[] data) { builder.StartVector(4, data.Length, 4); for (int i = data.Length - 1; i >= 0; i--) builder.AddOffset(data[i].Value); return builder.EndVector(); } - public static VectorOffset CreateDataListVectorBlock(FlatBufferBuilder builder, Offset[] data) { builder.StartVector(4, data.Length, 4); builder.Add(data); return builder.EndVector(); } - public static VectorOffset CreateDataListVectorBlock(FlatBufferBuilder builder, ArraySegment> data) { builder.StartVector(4, data.Count, 4); builder.Add(data); return builder.EndVector(); } - public static VectorOffset CreateDataListVectorBlock(FlatBufferBuilder builder, IntPtr dataPtr, int sizeInBytes) { builder.StartVector(1, sizeInBytes, 1); builder.Add>(dataPtr, sizeInBytes); return builder.EndVector(); } - public static void StartDataListVector(FlatBufferBuilder builder, int numElems) { builder.StartVector(4, numElems, 4); } - public static Offset EndStoryStrategyExcelTable(FlatBufferBuilder builder) { - int o = builder.EndTable(); - return new Offset(o); - } - public StoryStrategyExcelTableT UnPack() { - var _o = new StoryStrategyExcelTableT(); - this.UnPackTo(_o); - return _o; - } - public void UnPackTo(StoryStrategyExcelTableT _o) { - byte[] key = TableEncryptionService.CreateKey("StoryStrategyExcel"); - _o.DataList = new List(); - for (var _j = 0; _j < this.DataListLength; ++_j) {_o.DataList.Add(this.DataList(_j).HasValue ? this.DataList(_j).Value.UnPack() : null);} - } - public static Offset Pack(FlatBufferBuilder builder, StoryStrategyExcelTableT _o) { - if (_o == null) return default(Offset); - var _DataList = default(VectorOffset); - if (_o.DataList != null) { - var __DataList = new Offset[_o.DataList.Count]; - for (var _j = 0; _j < __DataList.Length; ++_j) { __DataList[_j] = SCHALE.Common.FlatData.StoryStrategyExcel.Pack(builder, _o.DataList[_j]); } - _DataList = CreateDataListVector(builder, __DataList); - } - return CreateStoryStrategyExcelTable( - builder, - _DataList); - } -} - -public class StoryStrategyExcelTableT -{ - public List DataList { get; set; } - - public StoryStrategyExcelTableT() { - this.DataList = null; - } -} - - -static public class StoryStrategyExcelTableVerify -{ - static public bool Verify(Google.FlatBuffers.Verifier verifier, uint tablePos) - { - return verifier.VerifyTableStart(tablePos) - && verifier.VerifyVectorOfTables(tablePos, 4 /*DataList*/, SCHALE.Common.FlatData.StoryStrategyExcelVerify.Verify, false) - && verifier.VerifyTableEnd(tablePos); - } -} - -} diff --git a/SCHALE.Common/FlatData/SystemMailExcel.cs b/SCHALE.Common/FlatData/SystemMailExcel.cs index 4dda60a..1450b17 100644 --- a/SCHALE.Common/FlatData/SystemMailExcel.cs +++ b/SCHALE.Common/FlatData/SystemMailExcel.cs @@ -20,7 +20,7 @@ public struct SystemMailExcel : IFlatbufferObject public void __init(int _i, ByteBuffer _bb) { __p = new Table(_i, _bb); } public SystemMailExcel __assign(int _i, ByteBuffer _bb) { __init(_i, _bb); return this; } - public SCHALE.Common.FlatData.MailType MailType { get { int o = __p.__offset(4); return o != 0 ? (SCHALE.Common.FlatData.MailType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.MailType.System; } } + public SCHALE.Common.FlatData.MailType MailType_ { get { int o = __p.__offset(4); return o != 0 ? (SCHALE.Common.FlatData.MailType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.MailType.System; } } public long ExpiredDay { get { int o = __p.__offset(6); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public string Sender { get { int o = __p.__offset(8); return o != 0 ? __p.__string(o + __p.bb_pos) : null; } } #if ENABLE_SPAN_T @@ -38,7 +38,7 @@ public struct SystemMailExcel : IFlatbufferObject public byte[] GetCommentArray() { return __p.__vector_as_array(10); } public static Offset CreateSystemMailExcel(FlatBufferBuilder builder, - SCHALE.Common.FlatData.MailType MailType = SCHALE.Common.FlatData.MailType.System, + SCHALE.Common.FlatData.MailType MailType_ = SCHALE.Common.FlatData.MailType.System, long ExpiredDay = 0, StringOffset SenderOffset = default(StringOffset), StringOffset CommentOffset = default(StringOffset)) { @@ -46,12 +46,12 @@ public struct SystemMailExcel : IFlatbufferObject SystemMailExcel.AddExpiredDay(builder, ExpiredDay); SystemMailExcel.AddComment(builder, CommentOffset); SystemMailExcel.AddSender(builder, SenderOffset); - SystemMailExcel.AddMailType(builder, MailType); + SystemMailExcel.AddMailType_(builder, MailType_); return SystemMailExcel.EndSystemMailExcel(builder); } public static void StartSystemMailExcel(FlatBufferBuilder builder) { builder.StartTable(4); } - public static void AddMailType(FlatBufferBuilder builder, SCHALE.Common.FlatData.MailType mailType) { builder.AddInt(0, (int)mailType, 0); } + public static void AddMailType_(FlatBufferBuilder builder, SCHALE.Common.FlatData.MailType mailType_) { builder.AddInt(0, (int)mailType_, 0); } public static void AddExpiredDay(FlatBufferBuilder builder, long expiredDay) { builder.AddLong(1, expiredDay, 0); } public static void AddSender(FlatBufferBuilder builder, StringOffset senderOffset) { builder.AddOffset(2, senderOffset.Value, 0); } public static void AddComment(FlatBufferBuilder builder, StringOffset commentOffset) { builder.AddOffset(3, commentOffset.Value, 0); } @@ -66,7 +66,7 @@ public struct SystemMailExcel : IFlatbufferObject } public void UnPackTo(SystemMailExcelT _o) { byte[] key = TableEncryptionService.CreateKey("SystemMail"); - _o.MailType = TableEncryptionService.Convert(this.MailType, key); + _o.MailType_ = TableEncryptionService.Convert(this.MailType_, key); _o.ExpiredDay = TableEncryptionService.Convert(this.ExpiredDay, key); _o.Sender = TableEncryptionService.Convert(this.Sender, key); _o.Comment = TableEncryptionService.Convert(this.Comment, key); @@ -77,7 +77,7 @@ public struct SystemMailExcel : IFlatbufferObject var _Comment = _o.Comment == null ? default(StringOffset) : builder.CreateString(_o.Comment); return CreateSystemMailExcel( builder, - _o.MailType, + _o.MailType_, _o.ExpiredDay, _Sender, _Comment); @@ -86,13 +86,13 @@ public struct SystemMailExcel : IFlatbufferObject public class SystemMailExcelT { - public SCHALE.Common.FlatData.MailType MailType { get; set; } + public SCHALE.Common.FlatData.MailType MailType_ { get; set; } public long ExpiredDay { get; set; } public string Sender { get; set; } public string Comment { get; set; } public SystemMailExcelT() { - this.MailType = SCHALE.Common.FlatData.MailType.System; + this.MailType_ = SCHALE.Common.FlatData.MailType.System; this.ExpiredDay = 0; this.Sender = null; this.Comment = null; @@ -105,7 +105,7 @@ static public class SystemMailExcelVerify static public bool Verify(Google.FlatBuffers.Verifier verifier, uint tablePos) { return verifier.VerifyTableStart(tablePos) - && verifier.VerifyField(tablePos, 4 /*MailType*/, 4 /*SCHALE.Common.FlatData.MailType*/, 4, false) + && verifier.VerifyField(tablePos, 4 /*MailType_*/, 4 /*SCHALE.Common.FlatData.MailType*/, 4, false) && verifier.VerifyField(tablePos, 6 /*ExpiredDay*/, 8 /*long*/, 8, false) && verifier.VerifyString(tablePos, 8 /*Sender*/, false) && verifier.VerifyString(tablePos, 10 /*Comment*/, false) diff --git a/SCHALE.Common/FlatData/TacticDamageSimulatorSettingExcel.cs b/SCHALE.Common/FlatData/TacticDamageSimulatorSettingExcel.cs index ed947e8..4e54172 100644 --- a/SCHALE.Common/FlatData/TacticDamageSimulatorSettingExcel.cs +++ b/SCHALE.Common/FlatData/TacticDamageSimulatorSettingExcel.cs @@ -33,15 +33,17 @@ public struct TacticDamageSimulatorSettingExcel : IFlatbufferObject public SCHALE.Common.FlatData.TerrainAdaptationStat OverrideOutdoorAdaptation { get { int o = __p.__offset(24); return o != 0 ? (SCHALE.Common.FlatData.TerrainAdaptationStat)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.TerrainAdaptationStat.D; } } public SCHALE.Common.FlatData.TerrainAdaptationStat OverrideIndoorAdaptation { get { int o = __p.__offset(26); return o != 0 ? (SCHALE.Common.FlatData.TerrainAdaptationStat)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.TerrainAdaptationStat.D; } } public bool ApplyOverrideAdaptation { get { int o = __p.__offset(28); return o != 0 ? 0!=__p.bb.Get(o + __p.bb_pos) : (bool)false; } } - public long GroundId { get { int o = __p.__offset(30); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } - public long FixedCharacter(int j) { int o = __p.__offset(32); return o != 0 ? __p.bb.GetLong(__p.__vector(o) + j * 8) : (long)0; } - public int FixedCharacterLength { get { int o = __p.__offset(32); return o != 0 ? __p.__vector_len(o) : 0; } } + public int OverrideFavorLevel { get { int o = __p.__offset(30); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } + public bool ApplyOverrideFavorLevel { get { int o = __p.__offset(32); return o != 0 ? 0!=__p.bb.Get(o + __p.bb_pos) : (bool)false; } } + public long GroundId { get { int o = __p.__offset(34); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } + public long FixedCharacter(int j) { int o = __p.__offset(36); return o != 0 ? __p.bb.GetLong(__p.__vector(o) + j * 8) : (long)0; } + public int FixedCharacterLength { get { int o = __p.__offset(36); return o != 0 ? __p.__vector_len(o) : 0; } } #if ENABLE_SPAN_T - public Span GetFixedCharacterBytes() { return __p.__vector_as_span(32, 8); } + public Span GetFixedCharacterBytes() { return __p.__vector_as_span(36, 8); } #else - public ArraySegment? GetFixedCharacterBytes() { return __p.__vector_as_arraysegment(32); } + public ArraySegment? GetFixedCharacterBytes() { return __p.__vector_as_arraysegment(36); } #endif - public long[] GetFixedCharacterArray() { return __p.__vector_as_array(32); } + public long[] GetFixedCharacterArray() { return __p.__vector_as_array(36); } public static Offset CreateTacticDamageSimulatorSettingExcel(FlatBufferBuilder builder, int Order = 0, @@ -57,28 +59,32 @@ public struct TacticDamageSimulatorSettingExcel : IFlatbufferObject SCHALE.Common.FlatData.TerrainAdaptationStat OverrideOutdoorAdaptation = SCHALE.Common.FlatData.TerrainAdaptationStat.D, SCHALE.Common.FlatData.TerrainAdaptationStat OverrideIndoorAdaptation = SCHALE.Common.FlatData.TerrainAdaptationStat.D, bool ApplyOverrideAdaptation = false, + int OverrideFavorLevel = 0, + bool ApplyOverrideFavorLevel = false, long GroundId = 0, VectorOffset FixedCharacterOffset = default(VectorOffset)) { - builder.StartTable(15); + builder.StartTable(17); TacticDamageSimulatorSettingExcel.AddGroundId(builder, GroundId); TacticDamageSimulatorSettingExcel.AddSpecialSquard(builder, SpecialSquard); TacticDamageSimulatorSettingExcel.AddStrikerSquard(builder, StrikerSquard); TacticDamageSimulatorSettingExcel.AddTestBattleTime(builder, TestBattleTime); TacticDamageSimulatorSettingExcel.AddTestPreset(builder, TestPreset); TacticDamageSimulatorSettingExcel.AddFixedCharacter(builder, FixedCharacterOffset); + TacticDamageSimulatorSettingExcel.AddOverrideFavorLevel(builder, OverrideFavorLevel); TacticDamageSimulatorSettingExcel.AddOverrideIndoorAdaptation(builder, OverrideIndoorAdaptation); TacticDamageSimulatorSettingExcel.AddOverrideOutdoorAdaptation(builder, OverrideOutdoorAdaptation); TacticDamageSimulatorSettingExcel.AddOverrideStreetAdaptation(builder, OverrideStreetAdaptation); TacticDamageSimulatorSettingExcel.AddReplaceCostRegenValue(builder, ReplaceCostRegenValue); TacticDamageSimulatorSettingExcel.AddRepeat(builder, Repeat); TacticDamageSimulatorSettingExcel.AddOrder(builder, Order); + TacticDamageSimulatorSettingExcel.AddApplyOverrideFavorLevel(builder, ApplyOverrideFavorLevel); TacticDamageSimulatorSettingExcel.AddApplyOverrideAdaptation(builder, ApplyOverrideAdaptation); TacticDamageSimulatorSettingExcel.AddUseAutoSkill(builder, UseAutoSkill); TacticDamageSimulatorSettingExcel.AddReplaceCharacterCostRegen(builder, ReplaceCharacterCostRegen); return TacticDamageSimulatorSettingExcel.EndTacticDamageSimulatorSettingExcel(builder); } - public static void StartTacticDamageSimulatorSettingExcel(FlatBufferBuilder builder) { builder.StartTable(15); } + public static void StartTacticDamageSimulatorSettingExcel(FlatBufferBuilder builder) { builder.StartTable(17); } public static void AddOrder(FlatBufferBuilder builder, int order) { builder.AddInt(0, order, 0); } public static void AddRepeat(FlatBufferBuilder builder, int repeat) { builder.AddInt(1, repeat, 0); } public static void AddTestPreset(FlatBufferBuilder builder, long testPreset) { builder.AddLong(2, testPreset, 0); } @@ -92,8 +98,10 @@ public struct TacticDamageSimulatorSettingExcel : IFlatbufferObject public static void AddOverrideOutdoorAdaptation(FlatBufferBuilder builder, SCHALE.Common.FlatData.TerrainAdaptationStat overrideOutdoorAdaptation) { builder.AddInt(10, (int)overrideOutdoorAdaptation, 0); } public static void AddOverrideIndoorAdaptation(FlatBufferBuilder builder, SCHALE.Common.FlatData.TerrainAdaptationStat overrideIndoorAdaptation) { builder.AddInt(11, (int)overrideIndoorAdaptation, 0); } public static void AddApplyOverrideAdaptation(FlatBufferBuilder builder, bool applyOverrideAdaptation) { builder.AddBool(12, applyOverrideAdaptation, false); } - public static void AddGroundId(FlatBufferBuilder builder, long groundId) { builder.AddLong(13, groundId, 0); } - public static void AddFixedCharacter(FlatBufferBuilder builder, VectorOffset fixedCharacterOffset) { builder.AddOffset(14, fixedCharacterOffset.Value, 0); } + public static void AddOverrideFavorLevel(FlatBufferBuilder builder, int overrideFavorLevel) { builder.AddInt(13, overrideFavorLevel, 0); } + public static void AddApplyOverrideFavorLevel(FlatBufferBuilder builder, bool applyOverrideFavorLevel) { builder.AddBool(14, applyOverrideFavorLevel, false); } + public static void AddGroundId(FlatBufferBuilder builder, long groundId) { builder.AddLong(15, groundId, 0); } + public static void AddFixedCharacter(FlatBufferBuilder builder, VectorOffset fixedCharacterOffset) { builder.AddOffset(16, fixedCharacterOffset.Value, 0); } public static VectorOffset CreateFixedCharacterVector(FlatBufferBuilder builder, long[] data) { builder.StartVector(8, data.Length, 8); for (int i = data.Length - 1; i >= 0; i--) builder.AddLong(data[i]); return builder.EndVector(); } public static VectorOffset CreateFixedCharacterVectorBlock(FlatBufferBuilder builder, long[] data) { builder.StartVector(8, data.Length, 8); builder.Add(data); return builder.EndVector(); } public static VectorOffset CreateFixedCharacterVectorBlock(FlatBufferBuilder builder, ArraySegment data) { builder.StartVector(8, data.Count, 8); builder.Add(data); return builder.EndVector(); } @@ -123,6 +131,8 @@ public struct TacticDamageSimulatorSettingExcel : IFlatbufferObject _o.OverrideOutdoorAdaptation = TableEncryptionService.Convert(this.OverrideOutdoorAdaptation, key); _o.OverrideIndoorAdaptation = TableEncryptionService.Convert(this.OverrideIndoorAdaptation, key); _o.ApplyOverrideAdaptation = TableEncryptionService.Convert(this.ApplyOverrideAdaptation, key); + _o.OverrideFavorLevel = TableEncryptionService.Convert(this.OverrideFavorLevel, key); + _o.ApplyOverrideFavorLevel = TableEncryptionService.Convert(this.ApplyOverrideFavorLevel, key); _o.GroundId = TableEncryptionService.Convert(this.GroundId, key); _o.FixedCharacter = new List(); for (var _j = 0; _j < this.FixedCharacterLength; ++_j) {_o.FixedCharacter.Add(TableEncryptionService.Convert(this.FixedCharacter(_j), key));} @@ -149,6 +159,8 @@ public struct TacticDamageSimulatorSettingExcel : IFlatbufferObject _o.OverrideOutdoorAdaptation, _o.OverrideIndoorAdaptation, _o.ApplyOverrideAdaptation, + _o.OverrideFavorLevel, + _o.ApplyOverrideFavorLevel, _o.GroundId, _FixedCharacter); } @@ -169,6 +181,8 @@ public class TacticDamageSimulatorSettingExcelT public SCHALE.Common.FlatData.TerrainAdaptationStat OverrideOutdoorAdaptation { get; set; } public SCHALE.Common.FlatData.TerrainAdaptationStat OverrideIndoorAdaptation { get; set; } public bool ApplyOverrideAdaptation { get; set; } + public int OverrideFavorLevel { get; set; } + public bool ApplyOverrideFavorLevel { get; set; } public long GroundId { get; set; } public List FixedCharacter { get; set; } @@ -186,6 +200,8 @@ public class TacticDamageSimulatorSettingExcelT this.OverrideOutdoorAdaptation = SCHALE.Common.FlatData.TerrainAdaptationStat.D; this.OverrideIndoorAdaptation = SCHALE.Common.FlatData.TerrainAdaptationStat.D; this.ApplyOverrideAdaptation = false; + this.OverrideFavorLevel = 0; + this.ApplyOverrideFavorLevel = false; this.GroundId = 0; this.FixedCharacter = null; } @@ -210,8 +226,10 @@ static public class TacticDamageSimulatorSettingExcelVerify && verifier.VerifyField(tablePos, 24 /*OverrideOutdoorAdaptation*/, 4 /*SCHALE.Common.FlatData.TerrainAdaptationStat*/, 4, false) && verifier.VerifyField(tablePos, 26 /*OverrideIndoorAdaptation*/, 4 /*SCHALE.Common.FlatData.TerrainAdaptationStat*/, 4, false) && verifier.VerifyField(tablePos, 28 /*ApplyOverrideAdaptation*/, 1 /*bool*/, 1, false) - && verifier.VerifyField(tablePos, 30 /*GroundId*/, 8 /*long*/, 8, false) - && verifier.VerifyVectorOfData(tablePos, 32 /*FixedCharacter*/, 8 /*long*/, false) + && verifier.VerifyField(tablePos, 30 /*OverrideFavorLevel*/, 4 /*int*/, 4, false) + && verifier.VerifyField(tablePos, 32 /*ApplyOverrideFavorLevel*/, 1 /*bool*/, 1, false) + && verifier.VerifyField(tablePos, 34 /*GroundId*/, 8 /*long*/, 8, false) + && verifier.VerifyVectorOfData(tablePos, 36 /*FixedCharacter*/, 8 /*long*/, false) && verifier.VerifyTableEnd(tablePos); } } diff --git a/SCHALE.Common/FlatData/TagExcel.cs b/SCHALE.Common/FlatData/TagExcel.cs new file mode 100644 index 0000000..b7245df --- /dev/null +++ b/SCHALE.Common/FlatData/TagExcel.cs @@ -0,0 +1,84 @@ +// +// automatically generated by the FlatBuffers compiler, do not modify +// + +namespace SCHALE.Common.FlatData +{ + +using global::System; +using global::System.Collections.Generic; +using global::SCHALE.Common.Crypto; +using global::Google.FlatBuffers; + +public struct TagExcel : IFlatbufferObject +{ + private Table __p; + public ByteBuffer ByteBuffer { get { return __p.bb; } } + public static void ValidateVersion() { FlatBufferConstants.FLATBUFFERS_24_3_25(); } + public static TagExcel GetRootAsTagExcel(ByteBuffer _bb) { return GetRootAsTagExcel(_bb, new TagExcel()); } + public static TagExcel GetRootAsTagExcel(ByteBuffer _bb, TagExcel obj) { return (obj.__assign(_bb.GetInt(_bb.Position) + _bb.Position, _bb)); } + public void __init(int _i, ByteBuffer _bb) { __p = new Table(_i, _bb); } + public TagExcel __assign(int _i, ByteBuffer _bb) { __init(_i, _bb); return this; } + + public SCHALE.Common.FlatData.Tag Furniture { get { int o = __p.__offset(4); return o != 0 ? (SCHALE.Common.FlatData.Tag)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.Tag.A; } } + public SCHALE.Common.FlatData.Club None { get { int o = __p.__offset(6); return o != 0 ? (SCHALE.Common.FlatData.Club)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.Club.None; } } + + public static Offset CreateTagExcel(FlatBufferBuilder builder, + SCHALE.Common.FlatData.Tag Furniture = SCHALE.Common.FlatData.Tag.A, + SCHALE.Common.FlatData.Club None = SCHALE.Common.FlatData.Club.None) { + builder.StartTable(2); + TagExcel.AddNone(builder, None); + TagExcel.AddFurniture(builder, Furniture); + return TagExcel.EndTagExcel(builder); + } + + public static void StartTagExcel(FlatBufferBuilder builder) { builder.StartTable(2); } + public static void AddFurniture(FlatBufferBuilder builder, SCHALE.Common.FlatData.Tag furniture) { builder.AddInt(0, (int)furniture, 0); } + public static void AddNone(FlatBufferBuilder builder, SCHALE.Common.FlatData.Club none) { builder.AddInt(1, (int)none, 0); } + public static Offset EndTagExcel(FlatBufferBuilder builder) { + int o = builder.EndTable(); + return new Offset(o); + } + public TagExcelT UnPack() { + var _o = new TagExcelT(); + this.UnPackTo(_o); + return _o; + } + public void UnPackTo(TagExcelT _o) { + byte[] key = TableEncryptionService.CreateKey("Tag"); + _o.Furniture = TableEncryptionService.Convert(this.Furniture, key); + _o.None = TableEncryptionService.Convert(this.None, key); + } + public static Offset Pack(FlatBufferBuilder builder, TagExcelT _o) { + if (_o == null) return default(Offset); + return CreateTagExcel( + builder, + _o.Furniture, + _o.None); + } +} + +public class TagExcelT +{ + public SCHALE.Common.FlatData.Tag Furniture { get; set; } + public SCHALE.Common.FlatData.Club None { get; set; } + + public TagExcelT() { + this.Furniture = SCHALE.Common.FlatData.Tag.A; + this.None = SCHALE.Common.FlatData.Club.None; + } +} + + +static public class TagExcelVerify +{ + static public bool Verify(Google.FlatBuffers.Verifier verifier, uint tablePos) + { + return verifier.VerifyTableStart(tablePos) + && verifier.VerifyField(tablePos, 4 /*Furniture*/, 4 /*SCHALE.Common.FlatData.Tag*/, 4, false) + && verifier.VerifyField(tablePos, 6 /*None*/, 4 /*SCHALE.Common.FlatData.Club*/, 4, false) + && verifier.VerifyTableEnd(tablePos); + } +} + +} diff --git a/SCHALE.Common/FlatData/TagExcelTable.cs b/SCHALE.Common/FlatData/TagExcelTable.cs new file mode 100644 index 0000000..b47771d --- /dev/null +++ b/SCHALE.Common/FlatData/TagExcelTable.cs @@ -0,0 +1,88 @@ +// +// automatically generated by the FlatBuffers compiler, do not modify +// + +namespace SCHALE.Common.FlatData +{ + +using global::System; +using global::System.Collections.Generic; +using global::SCHALE.Common.Crypto; +using global::Google.FlatBuffers; + +public struct TagExcelTable : IFlatbufferObject +{ + private Table __p; + public ByteBuffer ByteBuffer { get { return __p.bb; } } + public static void ValidateVersion() { FlatBufferConstants.FLATBUFFERS_24_3_25(); } + public static TagExcelTable GetRootAsTagExcelTable(ByteBuffer _bb) { return GetRootAsTagExcelTable(_bb, new TagExcelTable()); } + public static TagExcelTable GetRootAsTagExcelTable(ByteBuffer _bb, TagExcelTable obj) { return (obj.__assign(_bb.GetInt(_bb.Position) + _bb.Position, _bb)); } + public void __init(int _i, ByteBuffer _bb) { __p = new Table(_i, _bb); } + public TagExcelTable __assign(int _i, ByteBuffer _bb) { __init(_i, _bb); return this; } + + public SCHALE.Common.FlatData.TagExcel? DataList(int j) { int o = __p.__offset(4); return o != 0 ? (SCHALE.Common.FlatData.TagExcel?)(new SCHALE.Common.FlatData.TagExcel()).__assign(__p.__indirect(__p.__vector(o) + j * 4), __p.bb) : null; } + public int DataListLength { get { int o = __p.__offset(4); return o != 0 ? __p.__vector_len(o) : 0; } } + + public static Offset CreateTagExcelTable(FlatBufferBuilder builder, + VectorOffset DataListOffset = default(VectorOffset)) { + builder.StartTable(1); + TagExcelTable.AddDataList(builder, DataListOffset); + return TagExcelTable.EndTagExcelTable(builder); + } + + public static void StartTagExcelTable(FlatBufferBuilder builder) { builder.StartTable(1); } + public static void AddDataList(FlatBufferBuilder builder, VectorOffset dataListOffset) { builder.AddOffset(0, dataListOffset.Value, 0); } + public static VectorOffset CreateDataListVector(FlatBufferBuilder builder, Offset[] data) { builder.StartVector(4, data.Length, 4); for (int i = data.Length - 1; i >= 0; i--) builder.AddOffset(data[i].Value); return builder.EndVector(); } + public static VectorOffset CreateDataListVectorBlock(FlatBufferBuilder builder, Offset[] data) { builder.StartVector(4, data.Length, 4); builder.Add(data); return builder.EndVector(); } + public static VectorOffset CreateDataListVectorBlock(FlatBufferBuilder builder, ArraySegment> data) { builder.StartVector(4, data.Count, 4); builder.Add(data); return builder.EndVector(); } + public static VectorOffset CreateDataListVectorBlock(FlatBufferBuilder builder, IntPtr dataPtr, int sizeInBytes) { builder.StartVector(1, sizeInBytes, 1); builder.Add>(dataPtr, sizeInBytes); return builder.EndVector(); } + public static void StartDataListVector(FlatBufferBuilder builder, int numElems) { builder.StartVector(4, numElems, 4); } + public static Offset EndTagExcelTable(FlatBufferBuilder builder) { + int o = builder.EndTable(); + return new Offset(o); + } + public TagExcelTableT UnPack() { + var _o = new TagExcelTableT(); + this.UnPackTo(_o); + return _o; + } + public void UnPackTo(TagExcelTableT _o) { + byte[] key = TableEncryptionService.CreateKey("TagExcel"); + _o.DataList = new List(); + for (var _j = 0; _j < this.DataListLength; ++_j) {_o.DataList.Add(this.DataList(_j).HasValue ? this.DataList(_j).Value.UnPack() : null);} + } + public static Offset Pack(FlatBufferBuilder builder, TagExcelTableT _o) { + if (_o == null) return default(Offset); + var _DataList = default(VectorOffset); + if (_o.DataList != null) { + var __DataList = new Offset[_o.DataList.Count]; + for (var _j = 0; _j < __DataList.Length; ++_j) { __DataList[_j] = SCHALE.Common.FlatData.TagExcel.Pack(builder, _o.DataList[_j]); } + _DataList = CreateDataListVector(builder, __DataList); + } + return CreateTagExcelTable( + builder, + _DataList); + } +} + +public class TagExcelTableT +{ + public List DataList { get; set; } + + public TagExcelTableT() { + this.DataList = null; + } +} + + +static public class TagExcelTableVerify +{ + static public bool Verify(Google.FlatBuffers.Verifier verifier, uint tablePos) + { + return verifier.VerifyTableStart(tablePos) + && verifier.VerifyVectorOfTables(tablePos, 4 /*DataList*/, SCHALE.Common.FlatData.TagExcelVerify.Verify, false) + && verifier.VerifyTableEnd(tablePos); + } +} + +} diff --git a/SCHALE.Common/FlatData/TerrainAdaptationFactorExcel.cs b/SCHALE.Common/FlatData/TerrainAdaptationFactorExcel.cs index 614ae3e..469282f 100644 --- a/SCHALE.Common/FlatData/TerrainAdaptationFactorExcel.cs +++ b/SCHALE.Common/FlatData/TerrainAdaptationFactorExcel.cs @@ -21,7 +21,7 @@ public struct TerrainAdaptationFactorExcel : IFlatbufferObject public TerrainAdaptationFactorExcel __assign(int _i, ByteBuffer _bb) { __init(_i, _bb); return this; } public SCHALE.Common.FlatData.StageTopography TerrainAdaptation { get { int o = __p.__offset(4); return o != 0 ? (SCHALE.Common.FlatData.StageTopography)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.StageTopography.Street; } } - public SCHALE.Common.FlatData.TerrainAdaptationStat TerrainAdaptationStat { get { int o = __p.__offset(6); return o != 0 ? (SCHALE.Common.FlatData.TerrainAdaptationStat)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.TerrainAdaptationStat.D; } } + public SCHALE.Common.FlatData.TerrainAdaptationStat TerrainAdaptationStat_ { get { int o = __p.__offset(6); return o != 0 ? (SCHALE.Common.FlatData.TerrainAdaptationStat)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.TerrainAdaptationStat.D; } } public long ShotFactor { get { int o = __p.__offset(8); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public long BlockFactor { get { int o = __p.__offset(10); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public long AccuracyFactor { get { int o = __p.__offset(12); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } @@ -30,7 +30,7 @@ public struct TerrainAdaptationFactorExcel : IFlatbufferObject public static Offset CreateTerrainAdaptationFactorExcel(FlatBufferBuilder builder, SCHALE.Common.FlatData.StageTopography TerrainAdaptation = SCHALE.Common.FlatData.StageTopography.Street, - SCHALE.Common.FlatData.TerrainAdaptationStat TerrainAdaptationStat = SCHALE.Common.FlatData.TerrainAdaptationStat.D, + SCHALE.Common.FlatData.TerrainAdaptationStat TerrainAdaptationStat_ = SCHALE.Common.FlatData.TerrainAdaptationStat.D, long ShotFactor = 0, long BlockFactor = 0, long AccuracyFactor = 0, @@ -42,14 +42,14 @@ public struct TerrainAdaptationFactorExcel : IFlatbufferObject TerrainAdaptationFactorExcel.AddAccuracyFactor(builder, AccuracyFactor); TerrainAdaptationFactorExcel.AddBlockFactor(builder, BlockFactor); TerrainAdaptationFactorExcel.AddShotFactor(builder, ShotFactor); - TerrainAdaptationFactorExcel.AddTerrainAdaptationStat(builder, TerrainAdaptationStat); + TerrainAdaptationFactorExcel.AddTerrainAdaptationStat_(builder, TerrainAdaptationStat_); TerrainAdaptationFactorExcel.AddTerrainAdaptation(builder, TerrainAdaptation); return TerrainAdaptationFactorExcel.EndTerrainAdaptationFactorExcel(builder); } public static void StartTerrainAdaptationFactorExcel(FlatBufferBuilder builder) { builder.StartTable(7); } public static void AddTerrainAdaptation(FlatBufferBuilder builder, SCHALE.Common.FlatData.StageTopography terrainAdaptation) { builder.AddInt(0, (int)terrainAdaptation, 0); } - public static void AddTerrainAdaptationStat(FlatBufferBuilder builder, SCHALE.Common.FlatData.TerrainAdaptationStat terrainAdaptationStat) { builder.AddInt(1, (int)terrainAdaptationStat, 0); } + public static void AddTerrainAdaptationStat_(FlatBufferBuilder builder, SCHALE.Common.FlatData.TerrainAdaptationStat terrainAdaptationStat_) { builder.AddInt(1, (int)terrainAdaptationStat_, 0); } public static void AddShotFactor(FlatBufferBuilder builder, long shotFactor) { builder.AddLong(2, shotFactor, 0); } public static void AddBlockFactor(FlatBufferBuilder builder, long blockFactor) { builder.AddLong(3, blockFactor, 0); } public static void AddAccuracyFactor(FlatBufferBuilder builder, long accuracyFactor) { builder.AddLong(4, accuracyFactor, 0); } @@ -67,7 +67,7 @@ public struct TerrainAdaptationFactorExcel : IFlatbufferObject public void UnPackTo(TerrainAdaptationFactorExcelT _o) { byte[] key = TableEncryptionService.CreateKey("TerrainAdaptationFactor"); _o.TerrainAdaptation = TableEncryptionService.Convert(this.TerrainAdaptation, key); - _o.TerrainAdaptationStat = TableEncryptionService.Convert(this.TerrainAdaptationStat, key); + _o.TerrainAdaptationStat_ = TableEncryptionService.Convert(this.TerrainAdaptationStat_, key); _o.ShotFactor = TableEncryptionService.Convert(this.ShotFactor, key); _o.BlockFactor = TableEncryptionService.Convert(this.BlockFactor, key); _o.AccuracyFactor = TableEncryptionService.Convert(this.AccuracyFactor, key); @@ -79,7 +79,7 @@ public struct TerrainAdaptationFactorExcel : IFlatbufferObject return CreateTerrainAdaptationFactorExcel( builder, _o.TerrainAdaptation, - _o.TerrainAdaptationStat, + _o.TerrainAdaptationStat_, _o.ShotFactor, _o.BlockFactor, _o.AccuracyFactor, @@ -91,7 +91,7 @@ public struct TerrainAdaptationFactorExcel : IFlatbufferObject public class TerrainAdaptationFactorExcelT { public SCHALE.Common.FlatData.StageTopography TerrainAdaptation { get; set; } - public SCHALE.Common.FlatData.TerrainAdaptationStat TerrainAdaptationStat { get; set; } + public SCHALE.Common.FlatData.TerrainAdaptationStat TerrainAdaptationStat_ { get; set; } public long ShotFactor { get; set; } public long BlockFactor { get; set; } public long AccuracyFactor { get; set; } @@ -100,7 +100,7 @@ public class TerrainAdaptationFactorExcelT public TerrainAdaptationFactorExcelT() { this.TerrainAdaptation = SCHALE.Common.FlatData.StageTopography.Street; - this.TerrainAdaptationStat = SCHALE.Common.FlatData.TerrainAdaptationStat.D; + this.TerrainAdaptationStat_ = SCHALE.Common.FlatData.TerrainAdaptationStat.D; this.ShotFactor = 0; this.BlockFactor = 0; this.AccuracyFactor = 0; @@ -116,7 +116,7 @@ static public class TerrainAdaptationFactorExcelVerify { return verifier.VerifyTableStart(tablePos) && verifier.VerifyField(tablePos, 4 /*TerrainAdaptation*/, 4 /*SCHALE.Common.FlatData.StageTopography*/, 4, false) - && verifier.VerifyField(tablePos, 6 /*TerrainAdaptationStat*/, 4 /*SCHALE.Common.FlatData.TerrainAdaptationStat*/, 4, false) + && verifier.VerifyField(tablePos, 6 /*TerrainAdaptationStat_*/, 4 /*SCHALE.Common.FlatData.TerrainAdaptationStat*/, 4, false) && verifier.VerifyField(tablePos, 8 /*ShotFactor*/, 8 /*long*/, 8, false) && verifier.VerifyField(tablePos, 10 /*BlockFactor*/, 8 /*long*/, 8, false) && verifier.VerifyField(tablePos, 12 /*AccuracyFactor*/, 8 /*long*/, 8, false) diff --git a/SCHALE.Common/FlatData/TimeAttackDungeonExcel.cs b/SCHALE.Common/FlatData/TimeAttackDungeonExcel.cs index 9a3b212..64b27fc 100644 --- a/SCHALE.Common/FlatData/TimeAttackDungeonExcel.cs +++ b/SCHALE.Common/FlatData/TimeAttackDungeonExcel.cs @@ -21,7 +21,7 @@ public struct TimeAttackDungeonExcel : IFlatbufferObject public TimeAttackDungeonExcel __assign(int _i, ByteBuffer _bb) { __init(_i, _bb); return this; } public long Id { get { int o = __p.__offset(4); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } - public SCHALE.Common.FlatData.TimeAttackDungeonType TimeAttackDungeonType { get { int o = __p.__offset(6); return o != 0 ? (SCHALE.Common.FlatData.TimeAttackDungeonType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.TimeAttackDungeonType.None; } } + public SCHALE.Common.FlatData.TimeAttackDungeonType TimeAttackDungeonType_ { get { int o = __p.__offset(6); return o != 0 ? (SCHALE.Common.FlatData.TimeAttackDungeonType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.TimeAttackDungeonType.None; } } public uint LocalizeEtcKey { get { int o = __p.__offset(8); return o != 0 ? __p.bb.GetUint(o + __p.bb_pos) : (uint)0; } } public string IconPath { get { int o = __p.__offset(10); return o != 0 ? __p.__string(o + __p.bb_pos) : null; } } #if ENABLE_SPAN_T @@ -34,7 +34,7 @@ public struct TimeAttackDungeonExcel : IFlatbufferObject public static Offset CreateTimeAttackDungeonExcel(FlatBufferBuilder builder, long Id = 0, - SCHALE.Common.FlatData.TimeAttackDungeonType TimeAttackDungeonType = SCHALE.Common.FlatData.TimeAttackDungeonType.None, + SCHALE.Common.FlatData.TimeAttackDungeonType TimeAttackDungeonType_ = SCHALE.Common.FlatData.TimeAttackDungeonType.None, uint LocalizeEtcKey = 0, StringOffset IconPathOffset = default(StringOffset), long InformationGroupID = 0) { @@ -43,13 +43,13 @@ public struct TimeAttackDungeonExcel : IFlatbufferObject TimeAttackDungeonExcel.AddId(builder, Id); TimeAttackDungeonExcel.AddIconPath(builder, IconPathOffset); TimeAttackDungeonExcel.AddLocalizeEtcKey(builder, LocalizeEtcKey); - TimeAttackDungeonExcel.AddTimeAttackDungeonType(builder, TimeAttackDungeonType); + TimeAttackDungeonExcel.AddTimeAttackDungeonType_(builder, TimeAttackDungeonType_); return TimeAttackDungeonExcel.EndTimeAttackDungeonExcel(builder); } public static void StartTimeAttackDungeonExcel(FlatBufferBuilder builder) { builder.StartTable(5); } public static void AddId(FlatBufferBuilder builder, long id) { builder.AddLong(0, id, 0); } - public static void AddTimeAttackDungeonType(FlatBufferBuilder builder, SCHALE.Common.FlatData.TimeAttackDungeonType timeAttackDungeonType) { builder.AddInt(1, (int)timeAttackDungeonType, 0); } + public static void AddTimeAttackDungeonType_(FlatBufferBuilder builder, SCHALE.Common.FlatData.TimeAttackDungeonType timeAttackDungeonType_) { builder.AddInt(1, (int)timeAttackDungeonType_, 0); } public static void AddLocalizeEtcKey(FlatBufferBuilder builder, uint localizeEtcKey) { builder.AddUint(2, localizeEtcKey, 0); } public static void AddIconPath(FlatBufferBuilder builder, StringOffset iconPathOffset) { builder.AddOffset(3, iconPathOffset.Value, 0); } public static void AddInformationGroupID(FlatBufferBuilder builder, long informationGroupID) { builder.AddLong(4, informationGroupID, 0); } @@ -65,7 +65,7 @@ public struct TimeAttackDungeonExcel : IFlatbufferObject public void UnPackTo(TimeAttackDungeonExcelT _o) { byte[] key = TableEncryptionService.CreateKey("TimeAttackDungeon"); _o.Id = TableEncryptionService.Convert(this.Id, key); - _o.TimeAttackDungeonType = TableEncryptionService.Convert(this.TimeAttackDungeonType, key); + _o.TimeAttackDungeonType_ = TableEncryptionService.Convert(this.TimeAttackDungeonType_, key); _o.LocalizeEtcKey = TableEncryptionService.Convert(this.LocalizeEtcKey, key); _o.IconPath = TableEncryptionService.Convert(this.IconPath, key); _o.InformationGroupID = TableEncryptionService.Convert(this.InformationGroupID, key); @@ -76,7 +76,7 @@ public struct TimeAttackDungeonExcel : IFlatbufferObject return CreateTimeAttackDungeonExcel( builder, _o.Id, - _o.TimeAttackDungeonType, + _o.TimeAttackDungeonType_, _o.LocalizeEtcKey, _IconPath, _o.InformationGroupID); @@ -86,14 +86,14 @@ public struct TimeAttackDungeonExcel : IFlatbufferObject public class TimeAttackDungeonExcelT { public long Id { get; set; } - public SCHALE.Common.FlatData.TimeAttackDungeonType TimeAttackDungeonType { get; set; } + public SCHALE.Common.FlatData.TimeAttackDungeonType TimeAttackDungeonType_ { get; set; } public uint LocalizeEtcKey { get; set; } public string IconPath { get; set; } public long InformationGroupID { get; set; } public TimeAttackDungeonExcelT() { this.Id = 0; - this.TimeAttackDungeonType = SCHALE.Common.FlatData.TimeAttackDungeonType.None; + this.TimeAttackDungeonType_ = SCHALE.Common.FlatData.TimeAttackDungeonType.None; this.LocalizeEtcKey = 0; this.IconPath = null; this.InformationGroupID = 0; @@ -107,7 +107,7 @@ static public class TimeAttackDungeonExcelVerify { return verifier.VerifyTableStart(tablePos) && verifier.VerifyField(tablePos, 4 /*Id*/, 8 /*long*/, 8, false) - && verifier.VerifyField(tablePos, 6 /*TimeAttackDungeonType*/, 4 /*SCHALE.Common.FlatData.TimeAttackDungeonType*/, 4, false) + && verifier.VerifyField(tablePos, 6 /*TimeAttackDungeonType_*/, 4 /*SCHALE.Common.FlatData.TimeAttackDungeonType*/, 4, false) && verifier.VerifyField(tablePos, 8 /*LocalizeEtcKey*/, 4 /*uint*/, 4, false) && verifier.VerifyString(tablePos, 10 /*IconPath*/, false) && verifier.VerifyField(tablePos, 12 /*InformationGroupID*/, 8 /*long*/, 8, false) diff --git a/SCHALE.Common/FlatData/TimeAttackDungeonGeasExcel.cs b/SCHALE.Common/FlatData/TimeAttackDungeonGeasExcel.cs index 6bac3fe..77541ce 100644 --- a/SCHALE.Common/FlatData/TimeAttackDungeonGeasExcel.cs +++ b/SCHALE.Common/FlatData/TimeAttackDungeonGeasExcel.cs @@ -21,7 +21,7 @@ public struct TimeAttackDungeonGeasExcel : IFlatbufferObject public TimeAttackDungeonGeasExcel __assign(int _i, ByteBuffer _bb) { __init(_i, _bb); return this; } public long Id { get { int o = __p.__offset(4); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } - public SCHALE.Common.FlatData.TimeAttackDungeonType TimeAttackDungeonType { get { int o = __p.__offset(6); return o != 0 ? (SCHALE.Common.FlatData.TimeAttackDungeonType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.TimeAttackDungeonType.None; } } + public SCHALE.Common.FlatData.TimeAttackDungeonType TimeAttackDungeonType_ { get { int o = __p.__offset(6); return o != 0 ? (SCHALE.Common.FlatData.TimeAttackDungeonType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.TimeAttackDungeonType.None; } } public uint LocalizeEtcKey { get { int o = __p.__offset(8); return o != 0 ? __p.bb.GetUint(o + __p.bb_pos) : (uint)0; } } public long BattleDuration { get { int o = __p.__offset(10); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public long ClearDefaultPoint { get { int o = __p.__offset(12); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } @@ -63,7 +63,7 @@ public struct TimeAttackDungeonGeasExcel : IFlatbufferObject public static Offset CreateTimeAttackDungeonGeasExcel(FlatBufferBuilder builder, long Id = 0, - SCHALE.Common.FlatData.TimeAttackDungeonType TimeAttackDungeonType = SCHALE.Common.FlatData.TimeAttackDungeonType.None, + SCHALE.Common.FlatData.TimeAttackDungeonType TimeAttackDungeonType_ = SCHALE.Common.FlatData.TimeAttackDungeonType.None, uint LocalizeEtcKey = 0, long BattleDuration = 0, long ClearDefaultPoint = 0, @@ -94,13 +94,13 @@ public struct TimeAttackDungeonGeasExcel : IFlatbufferObject TimeAttackDungeonGeasExcel.AddRecommandLevel(builder, RecommandLevel); TimeAttackDungeonGeasExcel.AddDifficulty(builder, Difficulty); TimeAttackDungeonGeasExcel.AddLocalizeEtcKey(builder, LocalizeEtcKey); - TimeAttackDungeonGeasExcel.AddTimeAttackDungeonType(builder, TimeAttackDungeonType); + TimeAttackDungeonGeasExcel.AddTimeAttackDungeonType_(builder, TimeAttackDungeonType_); return TimeAttackDungeonGeasExcel.EndTimeAttackDungeonGeasExcel(builder); } public static void StartTimeAttackDungeonGeasExcel(FlatBufferBuilder builder) { builder.StartTable(16); } public static void AddId(FlatBufferBuilder builder, long id) { builder.AddLong(0, id, 0); } - public static void AddTimeAttackDungeonType(FlatBufferBuilder builder, SCHALE.Common.FlatData.TimeAttackDungeonType timeAttackDungeonType) { builder.AddInt(1, (int)timeAttackDungeonType, 0); } + public static void AddTimeAttackDungeonType_(FlatBufferBuilder builder, SCHALE.Common.FlatData.TimeAttackDungeonType timeAttackDungeonType_) { builder.AddInt(1, (int)timeAttackDungeonType_, 0); } public static void AddLocalizeEtcKey(FlatBufferBuilder builder, uint localizeEtcKey) { builder.AddUint(2, localizeEtcKey, 0); } public static void AddBattleDuration(FlatBufferBuilder builder, long battleDuration) { builder.AddLong(3, battleDuration, 0); } public static void AddClearDefaultPoint(FlatBufferBuilder builder, long clearDefaultPoint) { builder.AddLong(4, clearDefaultPoint, 0); } @@ -157,7 +157,7 @@ public struct TimeAttackDungeonGeasExcel : IFlatbufferObject public void UnPackTo(TimeAttackDungeonGeasExcelT _o) { byte[] key = TableEncryptionService.CreateKey("TimeAttackDungeonGeas"); _o.Id = TableEncryptionService.Convert(this.Id, key); - _o.TimeAttackDungeonType = TableEncryptionService.Convert(this.TimeAttackDungeonType, key); + _o.TimeAttackDungeonType_ = TableEncryptionService.Convert(this.TimeAttackDungeonType_, key); _o.LocalizeEtcKey = TableEncryptionService.Convert(this.LocalizeEtcKey, key); _o.BattleDuration = TableEncryptionService.Convert(this.BattleDuration, key); _o.ClearDefaultPoint = TableEncryptionService.Convert(this.ClearDefaultPoint, key); @@ -217,7 +217,7 @@ public struct TimeAttackDungeonGeasExcel : IFlatbufferObject return CreateTimeAttackDungeonGeasExcel( builder, _o.Id, - _o.TimeAttackDungeonType, + _o.TimeAttackDungeonType_, _o.LocalizeEtcKey, _o.BattleDuration, _o.ClearDefaultPoint, @@ -238,7 +238,7 @@ public struct TimeAttackDungeonGeasExcel : IFlatbufferObject public class TimeAttackDungeonGeasExcelT { public long Id { get; set; } - public SCHALE.Common.FlatData.TimeAttackDungeonType TimeAttackDungeonType { get; set; } + public SCHALE.Common.FlatData.TimeAttackDungeonType TimeAttackDungeonType_ { get; set; } public uint LocalizeEtcKey { get; set; } public long BattleDuration { get; set; } public long ClearDefaultPoint { get; set; } @@ -256,7 +256,7 @@ public class TimeAttackDungeonGeasExcelT public TimeAttackDungeonGeasExcelT() { this.Id = 0; - this.TimeAttackDungeonType = SCHALE.Common.FlatData.TimeAttackDungeonType.None; + this.TimeAttackDungeonType_ = SCHALE.Common.FlatData.TimeAttackDungeonType.None; this.LocalizeEtcKey = 0; this.BattleDuration = 0; this.ClearDefaultPoint = 0; @@ -281,7 +281,7 @@ static public class TimeAttackDungeonGeasExcelVerify { return verifier.VerifyTableStart(tablePos) && verifier.VerifyField(tablePos, 4 /*Id*/, 8 /*long*/, 8, false) - && verifier.VerifyField(tablePos, 6 /*TimeAttackDungeonType*/, 4 /*SCHALE.Common.FlatData.TimeAttackDungeonType*/, 4, false) + && verifier.VerifyField(tablePos, 6 /*TimeAttackDungeonType_*/, 4 /*SCHALE.Common.FlatData.TimeAttackDungeonType*/, 4, false) && verifier.VerifyField(tablePos, 8 /*LocalizeEtcKey*/, 4 /*uint*/, 4, false) && verifier.VerifyField(tablePos, 10 /*BattleDuration*/, 8 /*long*/, 8, false) && verifier.VerifyField(tablePos, 12 /*ClearDefaultPoint*/, 8 /*long*/, 8, false) diff --git a/SCHALE.Common/FlatData/ToastExcel.cs b/SCHALE.Common/FlatData/ToastExcel.cs index dc340cc..7a6945b 100644 --- a/SCHALE.Common/FlatData/ToastExcel.cs +++ b/SCHALE.Common/FlatData/ToastExcel.cs @@ -21,14 +21,14 @@ public struct ToastExcel : IFlatbufferObject public ToastExcel __assign(int _i, ByteBuffer _bb) { __init(_i, _bb); return this; } public uint Id { get { int o = __p.__offset(4); return o != 0 ? __p.bb.GetUint(o + __p.bb_pos) : (uint)0; } } - public SCHALE.Common.FlatData.ToastType ToastType { get { int o = __p.__offset(6); return o != 0 ? (SCHALE.Common.FlatData.ToastType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.ToastType.None; } } + public SCHALE.Common.FlatData.ToastType ToastType_ { get { int o = __p.__offset(6); return o != 0 ? (SCHALE.Common.FlatData.ToastType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.ToastType.None; } } public uint MissionId { get { int o = __p.__offset(8); return o != 0 ? __p.bb.GetUint(o + __p.bb_pos) : (uint)0; } } public uint TextId { get { int o = __p.__offset(10); return o != 0 ? __p.bb.GetUint(o + __p.bb_pos) : (uint)0; } } public long LifeTime { get { int o = __p.__offset(12); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public static Offset CreateToastExcel(FlatBufferBuilder builder, uint Id = 0, - SCHALE.Common.FlatData.ToastType ToastType = SCHALE.Common.FlatData.ToastType.None, + SCHALE.Common.FlatData.ToastType ToastType_ = SCHALE.Common.FlatData.ToastType.None, uint MissionId = 0, uint TextId = 0, long LifeTime = 0) { @@ -36,14 +36,14 @@ public struct ToastExcel : IFlatbufferObject ToastExcel.AddLifeTime(builder, LifeTime); ToastExcel.AddTextId(builder, TextId); ToastExcel.AddMissionId(builder, MissionId); - ToastExcel.AddToastType(builder, ToastType); + ToastExcel.AddToastType_(builder, ToastType_); ToastExcel.AddId(builder, Id); return ToastExcel.EndToastExcel(builder); } public static void StartToastExcel(FlatBufferBuilder builder) { builder.StartTable(5); } public static void AddId(FlatBufferBuilder builder, uint id) { builder.AddUint(0, id, 0); } - public static void AddToastType(FlatBufferBuilder builder, SCHALE.Common.FlatData.ToastType toastType) { builder.AddInt(1, (int)toastType, 0); } + public static void AddToastType_(FlatBufferBuilder builder, SCHALE.Common.FlatData.ToastType toastType_) { builder.AddInt(1, (int)toastType_, 0); } public static void AddMissionId(FlatBufferBuilder builder, uint missionId) { builder.AddUint(2, missionId, 0); } public static void AddTextId(FlatBufferBuilder builder, uint textId) { builder.AddUint(3, textId, 0); } public static void AddLifeTime(FlatBufferBuilder builder, long lifeTime) { builder.AddLong(4, lifeTime, 0); } @@ -59,7 +59,7 @@ public struct ToastExcel : IFlatbufferObject public void UnPackTo(ToastExcelT _o) { byte[] key = TableEncryptionService.CreateKey("Toast"); _o.Id = TableEncryptionService.Convert(this.Id, key); - _o.ToastType = TableEncryptionService.Convert(this.ToastType, key); + _o.ToastType_ = TableEncryptionService.Convert(this.ToastType_, key); _o.MissionId = TableEncryptionService.Convert(this.MissionId, key); _o.TextId = TableEncryptionService.Convert(this.TextId, key); _o.LifeTime = TableEncryptionService.Convert(this.LifeTime, key); @@ -69,7 +69,7 @@ public struct ToastExcel : IFlatbufferObject return CreateToastExcel( builder, _o.Id, - _o.ToastType, + _o.ToastType_, _o.MissionId, _o.TextId, _o.LifeTime); @@ -79,14 +79,14 @@ public struct ToastExcel : IFlatbufferObject public class ToastExcelT { public uint Id { get; set; } - public SCHALE.Common.FlatData.ToastType ToastType { get; set; } + public SCHALE.Common.FlatData.ToastType ToastType_ { get; set; } public uint MissionId { get; set; } public uint TextId { get; set; } public long LifeTime { get; set; } public ToastExcelT() { this.Id = 0; - this.ToastType = SCHALE.Common.FlatData.ToastType.None; + this.ToastType_ = SCHALE.Common.FlatData.ToastType.None; this.MissionId = 0; this.TextId = 0; this.LifeTime = 0; @@ -100,7 +100,7 @@ static public class ToastExcelVerify { return verifier.VerifyTableStart(tablePos) && verifier.VerifyField(tablePos, 4 /*Id*/, 4 /*uint*/, 4, false) - && verifier.VerifyField(tablePos, 6 /*ToastType*/, 4 /*SCHALE.Common.FlatData.ToastType*/, 4, false) + && verifier.VerifyField(tablePos, 6 /*ToastType_*/, 4 /*SCHALE.Common.FlatData.ToastType*/, 4, false) && verifier.VerifyField(tablePos, 8 /*MissionId*/, 4 /*uint*/, 4, false) && verifier.VerifyField(tablePos, 10 /*TextId*/, 4 /*uint*/, 4, false) && verifier.VerifyField(tablePos, 12 /*LifeTime*/, 8 /*long*/, 8, false) diff --git a/SCHALE.Common/FlatData/VoiceCommonExcel.cs b/SCHALE.Common/FlatData/VoiceCommonExcel.cs index 8410434..2b8be52 100644 --- a/SCHALE.Common/FlatData/VoiceCommonExcel.cs +++ b/SCHALE.Common/FlatData/VoiceCommonExcel.cs @@ -20,7 +20,7 @@ public struct VoiceCommonExcel : IFlatbufferObject public void __init(int _i, ByteBuffer _bb) { __p = new Table(_i, _bb); } public VoiceCommonExcel __assign(int _i, ByteBuffer _bb) { __init(_i, _bb); return this; } - public SCHALE.Common.FlatData.VoiceEvent VoiceEvent { get { int o = __p.__offset(4); return o != 0 ? (SCHALE.Common.FlatData.VoiceEvent)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.VoiceEvent.OnTSA; } } + public SCHALE.Common.FlatData.VoiceEvent VoiceEvent_ { get { int o = __p.__offset(4); return o != 0 ? (SCHALE.Common.FlatData.VoiceEvent)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.VoiceEvent.OnTSA; } } public long Rate { get { int o = __p.__offset(6); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public uint VoiceHash(int j) { int o = __p.__offset(8); return o != 0 ? __p.bb.GetUint(__p.__vector(o) + j * 4) : (uint)0; } public int VoiceHashLength { get { int o = __p.__offset(8); return o != 0 ? __p.__vector_len(o) : 0; } } @@ -32,18 +32,18 @@ public struct VoiceCommonExcel : IFlatbufferObject public uint[] GetVoiceHashArray() { return __p.__vector_as_array(8); } public static Offset CreateVoiceCommonExcel(FlatBufferBuilder builder, - SCHALE.Common.FlatData.VoiceEvent VoiceEvent = SCHALE.Common.FlatData.VoiceEvent.OnTSA, + SCHALE.Common.FlatData.VoiceEvent VoiceEvent_ = SCHALE.Common.FlatData.VoiceEvent.OnTSA, long Rate = 0, VectorOffset VoiceHashOffset = default(VectorOffset)) { builder.StartTable(3); VoiceCommonExcel.AddRate(builder, Rate); VoiceCommonExcel.AddVoiceHash(builder, VoiceHashOffset); - VoiceCommonExcel.AddVoiceEvent(builder, VoiceEvent); + VoiceCommonExcel.AddVoiceEvent_(builder, VoiceEvent_); return VoiceCommonExcel.EndVoiceCommonExcel(builder); } public static void StartVoiceCommonExcel(FlatBufferBuilder builder) { builder.StartTable(3); } - public static void AddVoiceEvent(FlatBufferBuilder builder, SCHALE.Common.FlatData.VoiceEvent voiceEvent) { builder.AddInt(0, (int)voiceEvent, 0); } + public static void AddVoiceEvent_(FlatBufferBuilder builder, SCHALE.Common.FlatData.VoiceEvent voiceEvent_) { builder.AddInt(0, (int)voiceEvent_, 0); } public static void AddRate(FlatBufferBuilder builder, long rate) { builder.AddLong(1, rate, 0); } public static void AddVoiceHash(FlatBufferBuilder builder, VectorOffset voiceHashOffset) { builder.AddOffset(2, voiceHashOffset.Value, 0); } public static VectorOffset CreateVoiceHashVector(FlatBufferBuilder builder, uint[] data) { builder.StartVector(4, data.Length, 4); for (int i = data.Length - 1; i >= 0; i--) builder.AddUint(data[i]); return builder.EndVector(); } @@ -62,7 +62,7 @@ public struct VoiceCommonExcel : IFlatbufferObject } public void UnPackTo(VoiceCommonExcelT _o) { byte[] key = TableEncryptionService.CreateKey("VoiceCommon"); - _o.VoiceEvent = TableEncryptionService.Convert(this.VoiceEvent, key); + _o.VoiceEvent_ = TableEncryptionService.Convert(this.VoiceEvent_, key); _o.Rate = TableEncryptionService.Convert(this.Rate, key); _o.VoiceHash = new List(); for (var _j = 0; _j < this.VoiceHashLength; ++_j) {_o.VoiceHash.Add(TableEncryptionService.Convert(this.VoiceHash(_j), key));} @@ -76,7 +76,7 @@ public struct VoiceCommonExcel : IFlatbufferObject } return CreateVoiceCommonExcel( builder, - _o.VoiceEvent, + _o.VoiceEvent_, _o.Rate, _VoiceHash); } @@ -84,12 +84,12 @@ public struct VoiceCommonExcel : IFlatbufferObject public class VoiceCommonExcelT { - public SCHALE.Common.FlatData.VoiceEvent VoiceEvent { get; set; } + public SCHALE.Common.FlatData.VoiceEvent VoiceEvent_ { get; set; } public long Rate { get; set; } public List VoiceHash { get; set; } public VoiceCommonExcelT() { - this.VoiceEvent = SCHALE.Common.FlatData.VoiceEvent.OnTSA; + this.VoiceEvent_ = SCHALE.Common.FlatData.VoiceEvent.OnTSA; this.Rate = 0; this.VoiceHash = null; } @@ -101,7 +101,7 @@ static public class VoiceCommonExcelVerify static public bool Verify(Google.FlatBuffers.Verifier verifier, uint tablePos) { return verifier.VerifyTableStart(tablePos) - && verifier.VerifyField(tablePos, 4 /*VoiceEvent*/, 4 /*SCHALE.Common.FlatData.VoiceEvent*/, 4, false) + && verifier.VerifyField(tablePos, 4 /*VoiceEvent_*/, 4 /*SCHALE.Common.FlatData.VoiceEvent*/, 4, false) && verifier.VerifyField(tablePos, 6 /*Rate*/, 8 /*long*/, 8, false) && verifier.VerifyVectorOfData(tablePos, 8 /*VoiceHash*/, 4 /*uint*/, false) && verifier.VerifyTableEnd(tablePos); diff --git a/SCHALE.Common/FlatData/VoiceEvent.cs b/SCHALE.Common/FlatData/VoiceEvent.cs index 0d76b43..b963ed7 100644 --- a/SCHALE.Common/FlatData/VoiceEvent.cs +++ b/SCHALE.Common/FlatData/VoiceEvent.cs @@ -40,6 +40,8 @@ public enum VoiceEvent : int PublicSkill02 = 30, InteractionPublicSkill01 = 31, InteractionPublicSkill02 = 32, + FormationStyleChange = 33, + BattleInteractionVictoryTimeline = 34, }; diff --git a/SCHALE.Common/FlatData/VoiceTimelineExcel.cs b/SCHALE.Common/FlatData/VoiceTimelineExcel.cs new file mode 100644 index 0000000..4e29c49 --- /dev/null +++ b/SCHALE.Common/FlatData/VoiceTimelineExcel.cs @@ -0,0 +1,160 @@ +// +// automatically generated by the FlatBuffers compiler, do not modify +// + +namespace SCHALE.Common.FlatData +{ + +using global::System; +using global::System.Collections.Generic; +using global::SCHALE.Common.Crypto; +using global::Google.FlatBuffers; + +public struct VoiceTimelineExcel : IFlatbufferObject +{ + private Table __p; + public ByteBuffer ByteBuffer { get { return __p.bb; } } + public static void ValidateVersion() { FlatBufferConstants.FLATBUFFERS_24_3_25(); } + public static VoiceTimelineExcel GetRootAsVoiceTimelineExcel(ByteBuffer _bb) { return GetRootAsVoiceTimelineExcel(_bb, new VoiceTimelineExcel()); } + public static VoiceTimelineExcel GetRootAsVoiceTimelineExcel(ByteBuffer _bb, VoiceTimelineExcel obj) { return (obj.__assign(_bb.GetInt(_bb.Position) + _bb.Position, _bb)); } + public void __init(int _i, ByteBuffer _bb) { __p = new Table(_i, _bb); } + public VoiceTimelineExcel __assign(int _i, ByteBuffer _bb) { __init(_i, _bb); return this; } + + public long UniqueId { get { int o = __p.__offset(4); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } + public uint Id { get { int o = __p.__offset(6); return o != 0 ? __p.bb.GetUint(o + __p.bb_pos) : (uint)0; } } + public SCHALE.Common.FlatData.Nation Nation_(int j) { int o = __p.__offset(8); return o != 0 ? (SCHALE.Common.FlatData.Nation)__p.bb.GetInt(__p.__vector(o) + j * 4) : (SCHALE.Common.FlatData.Nation)0; } + public int Nation_Length { get { int o = __p.__offset(8); return o != 0 ? __p.__vector_len(o) : 0; } } +#if ENABLE_SPAN_T + public Span GetNation_Bytes() { return __p.__vector_as_span(8, 4); } +#else + public ArraySegment? GetNation_Bytes() { return __p.__vector_as_arraysegment(8); } +#endif + public SCHALE.Common.FlatData.Nation[] GetNation_Array() { int o = __p.__offset(8); if (o == 0) return null; int p = __p.__vector(o); int l = __p.__vector_len(o); SCHALE.Common.FlatData.Nation[] a = new SCHALE.Common.FlatData.Nation[l]; for (int i = 0; i < l; i++) { a[i] = (SCHALE.Common.FlatData.Nation)__p.bb.GetInt(p + i * 4); } return a; } + public string Path(int j) { int o = __p.__offset(10); return o != 0 ? __p.__string(__p.__vector(o) + j * 4) : null; } + public int PathLength { get { int o = __p.__offset(10); return o != 0 ? __p.__vector_len(o) : 0; } } + public float SoundVolume(int j) { int o = __p.__offset(12); return o != 0 ? __p.bb.GetFloat(__p.__vector(o) + j * 4) : (float)0; } + public int SoundVolumeLength { get { int o = __p.__offset(12); return o != 0 ? __p.__vector_len(o) : 0; } } +#if ENABLE_SPAN_T + public Span GetSoundVolumeBytes() { return __p.__vector_as_span(12, 4); } +#else + public ArraySegment? GetSoundVolumeBytes() { return __p.__vector_as_arraysegment(12); } +#endif + public float[] GetSoundVolumeArray() { return __p.__vector_as_array(12); } + + public static Offset CreateVoiceTimelineExcel(FlatBufferBuilder builder, + long UniqueId = 0, + uint Id = 0, + VectorOffset Nation_Offset = default(VectorOffset), + VectorOffset PathOffset = default(VectorOffset), + VectorOffset SoundVolumeOffset = default(VectorOffset)) { + builder.StartTable(5); + VoiceTimelineExcel.AddUniqueId(builder, UniqueId); + VoiceTimelineExcel.AddSoundVolume(builder, SoundVolumeOffset); + VoiceTimelineExcel.AddPath(builder, PathOffset); + VoiceTimelineExcel.AddNation_(builder, Nation_Offset); + VoiceTimelineExcel.AddId(builder, Id); + return VoiceTimelineExcel.EndVoiceTimelineExcel(builder); + } + + public static void StartVoiceTimelineExcel(FlatBufferBuilder builder) { builder.StartTable(5); } + public static void AddUniqueId(FlatBufferBuilder builder, long uniqueId) { builder.AddLong(0, uniqueId, 0); } + public static void AddId(FlatBufferBuilder builder, uint id) { builder.AddUint(1, id, 0); } + public static void AddNation_(FlatBufferBuilder builder, VectorOffset nation_Offset) { builder.AddOffset(2, nation_Offset.Value, 0); } + public static VectorOffset CreateNation_Vector(FlatBufferBuilder builder, SCHALE.Common.FlatData.Nation[] data) { builder.StartVector(4, data.Length, 4); for (int i = data.Length - 1; i >= 0; i--) builder.AddInt((int)data[i]); return builder.EndVector(); } + public static VectorOffset CreateNation_VectorBlock(FlatBufferBuilder builder, SCHALE.Common.FlatData.Nation[] data) { builder.StartVector(4, data.Length, 4); builder.Add(data); return builder.EndVector(); } + public static VectorOffset CreateNation_VectorBlock(FlatBufferBuilder builder, ArraySegment data) { builder.StartVector(4, data.Count, 4); builder.Add(data); return builder.EndVector(); } + public static VectorOffset CreateNation_VectorBlock(FlatBufferBuilder builder, IntPtr dataPtr, int sizeInBytes) { builder.StartVector(1, sizeInBytes, 1); builder.Add(dataPtr, sizeInBytes); return builder.EndVector(); } + public static void StartNation_Vector(FlatBufferBuilder builder, int numElems) { builder.StartVector(4, numElems, 4); } + public static void AddPath(FlatBufferBuilder builder, VectorOffset pathOffset) { builder.AddOffset(3, pathOffset.Value, 0); } + public static VectorOffset CreatePathVector(FlatBufferBuilder builder, StringOffset[] data) { builder.StartVector(4, data.Length, 4); for (int i = data.Length - 1; i >= 0; i--) builder.AddOffset(data[i].Value); return builder.EndVector(); } + public static VectorOffset CreatePathVectorBlock(FlatBufferBuilder builder, StringOffset[] data) { builder.StartVector(4, data.Length, 4); builder.Add(data); return builder.EndVector(); } + public static VectorOffset CreatePathVectorBlock(FlatBufferBuilder builder, ArraySegment data) { builder.StartVector(4, data.Count, 4); builder.Add(data); return builder.EndVector(); } + public static VectorOffset CreatePathVectorBlock(FlatBufferBuilder builder, IntPtr dataPtr, int sizeInBytes) { builder.StartVector(1, sizeInBytes, 1); builder.Add(dataPtr, sizeInBytes); return builder.EndVector(); } + public static void StartPathVector(FlatBufferBuilder builder, int numElems) { builder.StartVector(4, numElems, 4); } + public static void AddSoundVolume(FlatBufferBuilder builder, VectorOffset soundVolumeOffset) { builder.AddOffset(4, soundVolumeOffset.Value, 0); } + public static VectorOffset CreateSoundVolumeVector(FlatBufferBuilder builder, float[] data) { builder.StartVector(4, data.Length, 4); for (int i = data.Length - 1; i >= 0; i--) builder.AddFloat(data[i]); return builder.EndVector(); } + public static VectorOffset CreateSoundVolumeVectorBlock(FlatBufferBuilder builder, float[] data) { builder.StartVector(4, data.Length, 4); builder.Add(data); return builder.EndVector(); } + public static VectorOffset CreateSoundVolumeVectorBlock(FlatBufferBuilder builder, ArraySegment data) { builder.StartVector(4, data.Count, 4); builder.Add(data); return builder.EndVector(); } + public static VectorOffset CreateSoundVolumeVectorBlock(FlatBufferBuilder builder, IntPtr dataPtr, int sizeInBytes) { builder.StartVector(1, sizeInBytes, 1); builder.Add(dataPtr, sizeInBytes); return builder.EndVector(); } + public static void StartSoundVolumeVector(FlatBufferBuilder builder, int numElems) { builder.StartVector(4, numElems, 4); } + public static Offset EndVoiceTimelineExcel(FlatBufferBuilder builder) { + int o = builder.EndTable(); + return new Offset(o); + } + public VoiceTimelineExcelT UnPack() { + var _o = new VoiceTimelineExcelT(); + this.UnPackTo(_o); + return _o; + } + public void UnPackTo(VoiceTimelineExcelT _o) { + byte[] key = TableEncryptionService.CreateKey("VoiceTimeline"); + _o.UniqueId = TableEncryptionService.Convert(this.UniqueId, key); + _o.Id = TableEncryptionService.Convert(this.Id, key); + _o.Nation_ = new List(); + for (var _j = 0; _j < this.Nation_Length; ++_j) {_o.Nation_.Add(TableEncryptionService.Convert(this.Nation_(_j), key));} + _o.Path = new List(); + for (var _j = 0; _j < this.PathLength; ++_j) {_o.Path.Add(TableEncryptionService.Convert(this.Path(_j), key));} + _o.SoundVolume = new List(); + for (var _j = 0; _j < this.SoundVolumeLength; ++_j) {_o.SoundVolume.Add(TableEncryptionService.Convert(this.SoundVolume(_j), key));} + } + public static Offset Pack(FlatBufferBuilder builder, VoiceTimelineExcelT _o) { + if (_o == null) return default(Offset); + var _Nation_ = default(VectorOffset); + if (_o.Nation_ != null) { + var __Nation_ = _o.Nation_.ToArray(); + _Nation_ = CreateNation_Vector(builder, __Nation_); + } + var _Path = default(VectorOffset); + if (_o.Path != null) { + var __Path = new StringOffset[_o.Path.Count]; + for (var _j = 0; _j < __Path.Length; ++_j) { __Path[_j] = builder.CreateString(_o.Path[_j]); } + _Path = CreatePathVector(builder, __Path); + } + var _SoundVolume = default(VectorOffset); + if (_o.SoundVolume != null) { + var __SoundVolume = _o.SoundVolume.ToArray(); + _SoundVolume = CreateSoundVolumeVector(builder, __SoundVolume); + } + return CreateVoiceTimelineExcel( + builder, + _o.UniqueId, + _o.Id, + _Nation_, + _Path, + _SoundVolume); + } +} + +public class VoiceTimelineExcelT +{ + public long UniqueId { get; set; } + public uint Id { get; set; } + public List Nation_ { get; set; } + public List Path { get; set; } + public List SoundVolume { get; set; } + + public VoiceTimelineExcelT() { + this.UniqueId = 0; + this.Id = 0; + this.Nation_ = null; + this.Path = null; + this.SoundVolume = null; + } +} + + +static public class VoiceTimelineExcelVerify +{ + static public bool Verify(Google.FlatBuffers.Verifier verifier, uint tablePos) + { + return verifier.VerifyTableStart(tablePos) + && verifier.VerifyField(tablePos, 4 /*UniqueId*/, 8 /*long*/, 8, false) + && verifier.VerifyField(tablePos, 6 /*Id*/, 4 /*uint*/, 4, false) + && verifier.VerifyVectorOfData(tablePos, 8 /*Nation_*/, 4 /*SCHALE.Common.FlatData.Nation*/, false) + && verifier.VerifyVectorOfStrings(tablePos, 10 /*Path*/, false) + && verifier.VerifyVectorOfData(tablePos, 12 /*SoundVolume*/, 4 /*float*/, false) + && verifier.VerifyTableEnd(tablePos); + } +} + +} diff --git a/SCHALE.Common/FlatData/WeaponType.cs b/SCHALE.Common/FlatData/WeaponType.cs index b3892ad..6ad0d27 100644 --- a/SCHALE.Common/FlatData/WeaponType.cs +++ b/SCHALE.Common/FlatData/WeaponType.cs @@ -27,6 +27,7 @@ public enum WeaponType : int MT = 17, Relic = 18, FT = 19, + Akemi = 20, }; diff --git a/SCHALE.Common/FlatData/WeekDungeonExcel.cs b/SCHALE.Common/FlatData/WeekDungeonExcel.cs index 9199900..2951b93 100644 --- a/SCHALE.Common/FlatData/WeekDungeonExcel.cs +++ b/SCHALE.Common/FlatData/WeekDungeonExcel.cs @@ -21,7 +21,7 @@ public struct WeekDungeonExcel : IFlatbufferObject public WeekDungeonExcel __assign(int _i, ByteBuffer _bb) { __init(_i, _bb); return this; } public long StageId { get { int o = __p.__offset(4); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } - public SCHALE.Common.FlatData.WeekDungeonType WeekDungeonType { get { int o = __p.__offset(6); return o != 0 ? (SCHALE.Common.FlatData.WeekDungeonType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.WeekDungeonType.None; } } + public SCHALE.Common.FlatData.WeekDungeonType WeekDungeonType_ { get { int o = __p.__offset(6); return o != 0 ? (SCHALE.Common.FlatData.WeekDungeonType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.WeekDungeonType.None; } } public int Difficulty { get { int o = __p.__offset(8); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } public long BattleDuration { get { int o = __p.__offset(10); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public long PrevStageId { get { int o = __p.__offset(12); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } @@ -66,7 +66,7 @@ public struct WeekDungeonExcel : IFlatbufferObject public ArraySegment? GetStarGoalAmountBytes() { return __p.__vector_as_arraysegment(24); } #endif public int[] GetStarGoalAmountArray() { return __p.__vector_as_array(24); } - public SCHALE.Common.FlatData.StageTopography StageTopography { get { int o = __p.__offset(26); return o != 0 ? (SCHALE.Common.FlatData.StageTopography)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.StageTopography.Street; } } + public SCHALE.Common.FlatData.StageTopography StageTopography_ { get { int o = __p.__offset(26); return o != 0 ? (SCHALE.Common.FlatData.StageTopography)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.StageTopography.Street; } } public long RecommandLevel { get { int o = __p.__offset(28); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public long StageRewardId { get { int o = __p.__offset(30); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public long PlayTimeLimitInSeconds { get { int o = __p.__offset(32); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } @@ -80,11 +80,11 @@ public struct WeekDungeonExcel : IFlatbufferObject public ArraySegment? GetGroupBuffIDBytes() { return __p.__vector_as_arraysegment(38); } #endif public long[] GetGroupBuffIDArray() { return __p.__vector_as_array(38); } - public SCHALE.Common.FlatData.EchelonExtensionType EchelonExtensionType { get { int o = __p.__offset(40); return o != 0 ? (SCHALE.Common.FlatData.EchelonExtensionType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.EchelonExtensionType.Base; } } + public SCHALE.Common.FlatData.EchelonExtensionType EchelonExtensionType_ { get { int o = __p.__offset(40); return o != 0 ? (SCHALE.Common.FlatData.EchelonExtensionType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.EchelonExtensionType.Base; } } public static Offset CreateWeekDungeonExcel(FlatBufferBuilder builder, long StageId = 0, - SCHALE.Common.FlatData.WeekDungeonType WeekDungeonType = SCHALE.Common.FlatData.WeekDungeonType.None, + SCHALE.Common.FlatData.WeekDungeonType WeekDungeonType_ = SCHALE.Common.FlatData.WeekDungeonType.None, int Difficulty = 0, long BattleDuration = 0, long PrevStageId = 0, @@ -94,14 +94,14 @@ public struct WeekDungeonExcel : IFlatbufferObject int GroundId = 0, VectorOffset StarGoalOffset = default(VectorOffset), VectorOffset StarGoalAmountOffset = default(VectorOffset), - SCHALE.Common.FlatData.StageTopography StageTopography = SCHALE.Common.FlatData.StageTopography.Street, + SCHALE.Common.FlatData.StageTopography StageTopography_ = SCHALE.Common.FlatData.StageTopography.Street, long RecommandLevel = 0, long StageRewardId = 0, long PlayTimeLimitInSeconds = 0, long BattleRewardExp = 0, long BattleRewardPlayerExp = 0, VectorOffset GroupBuffIDOffset = default(VectorOffset), - SCHALE.Common.FlatData.EchelonExtensionType EchelonExtensionType = SCHALE.Common.FlatData.EchelonExtensionType.Base) { + SCHALE.Common.FlatData.EchelonExtensionType EchelonExtensionType_ = SCHALE.Common.FlatData.EchelonExtensionType.Base) { builder.StartTable(19); WeekDungeonExcel.AddBattleRewardPlayerExp(builder, BattleRewardPlayerExp); WeekDungeonExcel.AddBattleRewardExp(builder, BattleRewardExp); @@ -111,9 +111,9 @@ public struct WeekDungeonExcel : IFlatbufferObject WeekDungeonExcel.AddPrevStageId(builder, PrevStageId); WeekDungeonExcel.AddBattleDuration(builder, BattleDuration); WeekDungeonExcel.AddStageId(builder, StageId); - WeekDungeonExcel.AddEchelonExtensionType(builder, EchelonExtensionType); + WeekDungeonExcel.AddEchelonExtensionType_(builder, EchelonExtensionType_); WeekDungeonExcel.AddGroupBuffID(builder, GroupBuffIDOffset); - WeekDungeonExcel.AddStageTopography(builder, StageTopography); + WeekDungeonExcel.AddStageTopography_(builder, StageTopography_); WeekDungeonExcel.AddStarGoalAmount(builder, StarGoalAmountOffset); WeekDungeonExcel.AddStarGoal(builder, StarGoalOffset); WeekDungeonExcel.AddGroundId(builder, GroundId); @@ -121,13 +121,13 @@ public struct WeekDungeonExcel : IFlatbufferObject WeekDungeonExcel.AddStageEnterCostId(builder, StageEnterCostIdOffset); WeekDungeonExcel.AddStageEnterCostType(builder, StageEnterCostTypeOffset); WeekDungeonExcel.AddDifficulty(builder, Difficulty); - WeekDungeonExcel.AddWeekDungeonType(builder, WeekDungeonType); + WeekDungeonExcel.AddWeekDungeonType_(builder, WeekDungeonType_); return WeekDungeonExcel.EndWeekDungeonExcel(builder); } public static void StartWeekDungeonExcel(FlatBufferBuilder builder) { builder.StartTable(19); } public static void AddStageId(FlatBufferBuilder builder, long stageId) { builder.AddLong(0, stageId, 0); } - public static void AddWeekDungeonType(FlatBufferBuilder builder, SCHALE.Common.FlatData.WeekDungeonType weekDungeonType) { builder.AddInt(1, (int)weekDungeonType, 0); } + public static void AddWeekDungeonType_(FlatBufferBuilder builder, SCHALE.Common.FlatData.WeekDungeonType weekDungeonType_) { builder.AddInt(1, (int)weekDungeonType_, 0); } public static void AddDifficulty(FlatBufferBuilder builder, int difficulty) { builder.AddInt(2, difficulty, 0); } public static void AddBattleDuration(FlatBufferBuilder builder, long battleDuration) { builder.AddLong(3, battleDuration, 0); } public static void AddPrevStageId(FlatBufferBuilder builder, long prevStageId) { builder.AddLong(4, prevStageId, 0); } @@ -162,7 +162,7 @@ public struct WeekDungeonExcel : IFlatbufferObject public static VectorOffset CreateStarGoalAmountVectorBlock(FlatBufferBuilder builder, ArraySegment data) { builder.StartVector(4, data.Count, 4); builder.Add(data); return builder.EndVector(); } public static VectorOffset CreateStarGoalAmountVectorBlock(FlatBufferBuilder builder, IntPtr dataPtr, int sizeInBytes) { builder.StartVector(1, sizeInBytes, 1); builder.Add(dataPtr, sizeInBytes); return builder.EndVector(); } public static void StartStarGoalAmountVector(FlatBufferBuilder builder, int numElems) { builder.StartVector(4, numElems, 4); } - public static void AddStageTopography(FlatBufferBuilder builder, SCHALE.Common.FlatData.StageTopography stageTopography) { builder.AddInt(11, (int)stageTopography, 0); } + public static void AddStageTopography_(FlatBufferBuilder builder, SCHALE.Common.FlatData.StageTopography stageTopography_) { builder.AddInt(11, (int)stageTopography_, 0); } public static void AddRecommandLevel(FlatBufferBuilder builder, long recommandLevel) { builder.AddLong(12, recommandLevel, 0); } public static void AddStageRewardId(FlatBufferBuilder builder, long stageRewardId) { builder.AddLong(13, stageRewardId, 0); } public static void AddPlayTimeLimitInSeconds(FlatBufferBuilder builder, long playTimeLimitInSeconds) { builder.AddLong(14, playTimeLimitInSeconds, 0); } @@ -174,7 +174,7 @@ public struct WeekDungeonExcel : IFlatbufferObject public static VectorOffset CreateGroupBuffIDVectorBlock(FlatBufferBuilder builder, ArraySegment data) { builder.StartVector(8, data.Count, 8); builder.Add(data); return builder.EndVector(); } public static VectorOffset CreateGroupBuffIDVectorBlock(FlatBufferBuilder builder, IntPtr dataPtr, int sizeInBytes) { builder.StartVector(1, sizeInBytes, 1); builder.Add(dataPtr, sizeInBytes); return builder.EndVector(); } public static void StartGroupBuffIDVector(FlatBufferBuilder builder, int numElems) { builder.StartVector(8, numElems, 8); } - public static void AddEchelonExtensionType(FlatBufferBuilder builder, SCHALE.Common.FlatData.EchelonExtensionType echelonExtensionType) { builder.AddInt(18, (int)echelonExtensionType, 0); } + public static void AddEchelonExtensionType_(FlatBufferBuilder builder, SCHALE.Common.FlatData.EchelonExtensionType echelonExtensionType_) { builder.AddInt(18, (int)echelonExtensionType_, 0); } public static Offset EndWeekDungeonExcel(FlatBufferBuilder builder) { int o = builder.EndTable(); return new Offset(o); @@ -187,7 +187,7 @@ public struct WeekDungeonExcel : IFlatbufferObject public void UnPackTo(WeekDungeonExcelT _o) { byte[] key = TableEncryptionService.CreateKey("WeekDungeon"); _o.StageId = TableEncryptionService.Convert(this.StageId, key); - _o.WeekDungeonType = TableEncryptionService.Convert(this.WeekDungeonType, key); + _o.WeekDungeonType_ = TableEncryptionService.Convert(this.WeekDungeonType_, key); _o.Difficulty = TableEncryptionService.Convert(this.Difficulty, key); _o.BattleDuration = TableEncryptionService.Convert(this.BattleDuration, key); _o.PrevStageId = TableEncryptionService.Convert(this.PrevStageId, key); @@ -202,7 +202,7 @@ public struct WeekDungeonExcel : IFlatbufferObject for (var _j = 0; _j < this.StarGoalLength; ++_j) {_o.StarGoal.Add(TableEncryptionService.Convert(this.StarGoal(_j), key));} _o.StarGoalAmount = new List(); for (var _j = 0; _j < this.StarGoalAmountLength; ++_j) {_o.StarGoalAmount.Add(TableEncryptionService.Convert(this.StarGoalAmount(_j), key));} - _o.StageTopography = TableEncryptionService.Convert(this.StageTopography, key); + _o.StageTopography_ = TableEncryptionService.Convert(this.StageTopography_, key); _o.RecommandLevel = TableEncryptionService.Convert(this.RecommandLevel, key); _o.StageRewardId = TableEncryptionService.Convert(this.StageRewardId, key); _o.PlayTimeLimitInSeconds = TableEncryptionService.Convert(this.PlayTimeLimitInSeconds, key); @@ -210,7 +210,7 @@ public struct WeekDungeonExcel : IFlatbufferObject _o.BattleRewardPlayerExp = TableEncryptionService.Convert(this.BattleRewardPlayerExp, key); _o.GroupBuffID = new List(); for (var _j = 0; _j < this.GroupBuffIDLength; ++_j) {_o.GroupBuffID.Add(TableEncryptionService.Convert(this.GroupBuffID(_j), key));} - _o.EchelonExtensionType = TableEncryptionService.Convert(this.EchelonExtensionType, key); + _o.EchelonExtensionType_ = TableEncryptionService.Convert(this.EchelonExtensionType_, key); } public static Offset Pack(FlatBufferBuilder builder, WeekDungeonExcelT _o) { if (_o == null) return default(Offset); @@ -247,7 +247,7 @@ public struct WeekDungeonExcel : IFlatbufferObject return CreateWeekDungeonExcel( builder, _o.StageId, - _o.WeekDungeonType, + _o.WeekDungeonType_, _o.Difficulty, _o.BattleDuration, _o.PrevStageId, @@ -257,21 +257,21 @@ public struct WeekDungeonExcel : IFlatbufferObject _o.GroundId, _StarGoal, _StarGoalAmount, - _o.StageTopography, + _o.StageTopography_, _o.RecommandLevel, _o.StageRewardId, _o.PlayTimeLimitInSeconds, _o.BattleRewardExp, _o.BattleRewardPlayerExp, _GroupBuffID, - _o.EchelonExtensionType); + _o.EchelonExtensionType_); } } public class WeekDungeonExcelT { public long StageId { get; set; } - public SCHALE.Common.FlatData.WeekDungeonType WeekDungeonType { get; set; } + public SCHALE.Common.FlatData.WeekDungeonType WeekDungeonType_ { get; set; } public int Difficulty { get; set; } public long BattleDuration { get; set; } public long PrevStageId { get; set; } @@ -281,18 +281,18 @@ public class WeekDungeonExcelT public int GroundId { get; set; } public List StarGoal { get; set; } public List StarGoalAmount { get; set; } - public SCHALE.Common.FlatData.StageTopography StageTopography { get; set; } + public SCHALE.Common.FlatData.StageTopography StageTopography_ { get; set; } public long RecommandLevel { get; set; } public long StageRewardId { get; set; } public long PlayTimeLimitInSeconds { get; set; } public long BattleRewardExp { get; set; } public long BattleRewardPlayerExp { get; set; } public List GroupBuffID { get; set; } - public SCHALE.Common.FlatData.EchelonExtensionType EchelonExtensionType { get; set; } + public SCHALE.Common.FlatData.EchelonExtensionType EchelonExtensionType_ { get; set; } public WeekDungeonExcelT() { this.StageId = 0; - this.WeekDungeonType = SCHALE.Common.FlatData.WeekDungeonType.None; + this.WeekDungeonType_ = SCHALE.Common.FlatData.WeekDungeonType.None; this.Difficulty = 0; this.BattleDuration = 0; this.PrevStageId = 0; @@ -302,14 +302,14 @@ public class WeekDungeonExcelT this.GroundId = 0; this.StarGoal = null; this.StarGoalAmount = null; - this.StageTopography = SCHALE.Common.FlatData.StageTopography.Street; + this.StageTopography_ = SCHALE.Common.FlatData.StageTopography.Street; this.RecommandLevel = 0; this.StageRewardId = 0; this.PlayTimeLimitInSeconds = 0; this.BattleRewardExp = 0; this.BattleRewardPlayerExp = 0; this.GroupBuffID = null; - this.EchelonExtensionType = SCHALE.Common.FlatData.EchelonExtensionType.Base; + this.EchelonExtensionType_ = SCHALE.Common.FlatData.EchelonExtensionType.Base; } } @@ -320,7 +320,7 @@ static public class WeekDungeonExcelVerify { return verifier.VerifyTableStart(tablePos) && verifier.VerifyField(tablePos, 4 /*StageId*/, 8 /*long*/, 8, false) - && verifier.VerifyField(tablePos, 6 /*WeekDungeonType*/, 4 /*SCHALE.Common.FlatData.WeekDungeonType*/, 4, false) + && verifier.VerifyField(tablePos, 6 /*WeekDungeonType_*/, 4 /*SCHALE.Common.FlatData.WeekDungeonType*/, 4, false) && verifier.VerifyField(tablePos, 8 /*Difficulty*/, 4 /*int*/, 4, false) && verifier.VerifyField(tablePos, 10 /*BattleDuration*/, 8 /*long*/, 8, false) && verifier.VerifyField(tablePos, 12 /*PrevStageId*/, 8 /*long*/, 8, false) @@ -330,14 +330,14 @@ static public class WeekDungeonExcelVerify && verifier.VerifyField(tablePos, 20 /*GroundId*/, 4 /*int*/, 4, false) && verifier.VerifyVectorOfData(tablePos, 22 /*StarGoal*/, 4 /*SCHALE.Common.FlatData.StarGoalType*/, false) && verifier.VerifyVectorOfData(tablePos, 24 /*StarGoalAmount*/, 4 /*int*/, false) - && verifier.VerifyField(tablePos, 26 /*StageTopography*/, 4 /*SCHALE.Common.FlatData.StageTopography*/, 4, false) + && verifier.VerifyField(tablePos, 26 /*StageTopography_*/, 4 /*SCHALE.Common.FlatData.StageTopography*/, 4, false) && verifier.VerifyField(tablePos, 28 /*RecommandLevel*/, 8 /*long*/, 8, false) && verifier.VerifyField(tablePos, 30 /*StageRewardId*/, 8 /*long*/, 8, false) && verifier.VerifyField(tablePos, 32 /*PlayTimeLimitInSeconds*/, 8 /*long*/, 8, false) && verifier.VerifyField(tablePos, 34 /*BattleRewardExp*/, 8 /*long*/, 8, false) && verifier.VerifyField(tablePos, 36 /*BattleRewardPlayerExp*/, 8 /*long*/, 8, false) && verifier.VerifyVectorOfData(tablePos, 38 /*GroupBuffID*/, 8 /*long*/, false) - && verifier.VerifyField(tablePos, 40 /*EchelonExtensionType*/, 4 /*SCHALE.Common.FlatData.EchelonExtensionType*/, 4, false) + && verifier.VerifyField(tablePos, 40 /*EchelonExtensionType_*/, 4 /*SCHALE.Common.FlatData.EchelonExtensionType*/, 4, false) && verifier.VerifyTableEnd(tablePos); } } diff --git a/SCHALE.Common/FlatData/WeekDungeonGroupBuffExcel.cs b/SCHALE.Common/FlatData/WeekDungeonGroupBuffExcel.cs index 22b5642..8d9fc64 100644 --- a/SCHALE.Common/FlatData/WeekDungeonGroupBuffExcel.cs +++ b/SCHALE.Common/FlatData/WeekDungeonGroupBuffExcel.cs @@ -21,7 +21,7 @@ public struct WeekDungeonGroupBuffExcel : IFlatbufferObject public WeekDungeonGroupBuffExcel __assign(int _i, ByteBuffer _bb) { __init(_i, _bb); return this; } public long WeekDungeonBuffId { get { int o = __p.__offset(4); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } - public SCHALE.Common.FlatData.School School { get { int o = __p.__offset(6); return o != 0 ? (SCHALE.Common.FlatData.School)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.School.None; } } + public SCHALE.Common.FlatData.School School_ { get { int o = __p.__offset(6); return o != 0 ? (SCHALE.Common.FlatData.School)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.School.None; } } public uint RecommandLocalizeEtcId { get { int o = __p.__offset(8); return o != 0 ? __p.bb.GetUint(o + __p.bb_pos) : (uint)0; } } public uint FormationLocalizeEtcId { get { int o = __p.__offset(10); return o != 0 ? __p.bb.GetUint(o + __p.bb_pos) : (uint)0; } } public string SkillGroupId { get { int o = __p.__offset(12); return o != 0 ? __p.__string(o + __p.bb_pos) : null; } } @@ -34,7 +34,7 @@ public struct WeekDungeonGroupBuffExcel : IFlatbufferObject public static Offset CreateWeekDungeonGroupBuffExcel(FlatBufferBuilder builder, long WeekDungeonBuffId = 0, - SCHALE.Common.FlatData.School School = SCHALE.Common.FlatData.School.None, + SCHALE.Common.FlatData.School School_ = SCHALE.Common.FlatData.School.None, uint RecommandLocalizeEtcId = 0, uint FormationLocalizeEtcId = 0, StringOffset SkillGroupIdOffset = default(StringOffset)) { @@ -43,13 +43,13 @@ public struct WeekDungeonGroupBuffExcel : IFlatbufferObject WeekDungeonGroupBuffExcel.AddSkillGroupId(builder, SkillGroupIdOffset); WeekDungeonGroupBuffExcel.AddFormationLocalizeEtcId(builder, FormationLocalizeEtcId); WeekDungeonGroupBuffExcel.AddRecommandLocalizeEtcId(builder, RecommandLocalizeEtcId); - WeekDungeonGroupBuffExcel.AddSchool(builder, School); + WeekDungeonGroupBuffExcel.AddSchool_(builder, School_); return WeekDungeonGroupBuffExcel.EndWeekDungeonGroupBuffExcel(builder); } public static void StartWeekDungeonGroupBuffExcel(FlatBufferBuilder builder) { builder.StartTable(5); } public static void AddWeekDungeonBuffId(FlatBufferBuilder builder, long weekDungeonBuffId) { builder.AddLong(0, weekDungeonBuffId, 0); } - public static void AddSchool(FlatBufferBuilder builder, SCHALE.Common.FlatData.School school) { builder.AddInt(1, (int)school, 0); } + public static void AddSchool_(FlatBufferBuilder builder, SCHALE.Common.FlatData.School school_) { builder.AddInt(1, (int)school_, 0); } public static void AddRecommandLocalizeEtcId(FlatBufferBuilder builder, uint recommandLocalizeEtcId) { builder.AddUint(2, recommandLocalizeEtcId, 0); } public static void AddFormationLocalizeEtcId(FlatBufferBuilder builder, uint formationLocalizeEtcId) { builder.AddUint(3, formationLocalizeEtcId, 0); } public static void AddSkillGroupId(FlatBufferBuilder builder, StringOffset skillGroupIdOffset) { builder.AddOffset(4, skillGroupIdOffset.Value, 0); } @@ -65,7 +65,7 @@ public struct WeekDungeonGroupBuffExcel : IFlatbufferObject public void UnPackTo(WeekDungeonGroupBuffExcelT _o) { byte[] key = TableEncryptionService.CreateKey("WeekDungeonGroupBuff"); _o.WeekDungeonBuffId = TableEncryptionService.Convert(this.WeekDungeonBuffId, key); - _o.School = TableEncryptionService.Convert(this.School, key); + _o.School_ = TableEncryptionService.Convert(this.School_, key); _o.RecommandLocalizeEtcId = TableEncryptionService.Convert(this.RecommandLocalizeEtcId, key); _o.FormationLocalizeEtcId = TableEncryptionService.Convert(this.FormationLocalizeEtcId, key); _o.SkillGroupId = TableEncryptionService.Convert(this.SkillGroupId, key); @@ -76,7 +76,7 @@ public struct WeekDungeonGroupBuffExcel : IFlatbufferObject return CreateWeekDungeonGroupBuffExcel( builder, _o.WeekDungeonBuffId, - _o.School, + _o.School_, _o.RecommandLocalizeEtcId, _o.FormationLocalizeEtcId, _SkillGroupId); @@ -86,14 +86,14 @@ public struct WeekDungeonGroupBuffExcel : IFlatbufferObject public class WeekDungeonGroupBuffExcelT { public long WeekDungeonBuffId { get; set; } - public SCHALE.Common.FlatData.School School { get; set; } + public SCHALE.Common.FlatData.School School_ { get; set; } public uint RecommandLocalizeEtcId { get; set; } public uint FormationLocalizeEtcId { get; set; } public string SkillGroupId { get; set; } public WeekDungeonGroupBuffExcelT() { this.WeekDungeonBuffId = 0; - this.School = SCHALE.Common.FlatData.School.None; + this.School_ = SCHALE.Common.FlatData.School.None; this.RecommandLocalizeEtcId = 0; this.FormationLocalizeEtcId = 0; this.SkillGroupId = null; @@ -107,7 +107,7 @@ static public class WeekDungeonGroupBuffExcelVerify { return verifier.VerifyTableStart(tablePos) && verifier.VerifyField(tablePos, 4 /*WeekDungeonBuffId*/, 8 /*long*/, 8, false) - && verifier.VerifyField(tablePos, 6 /*School*/, 4 /*SCHALE.Common.FlatData.School*/, 4, false) + && verifier.VerifyField(tablePos, 6 /*School_*/, 4 /*SCHALE.Common.FlatData.School*/, 4, false) && verifier.VerifyField(tablePos, 8 /*RecommandLocalizeEtcId*/, 4 /*uint*/, 4, false) && verifier.VerifyField(tablePos, 10 /*FormationLocalizeEtcId*/, 4 /*uint*/, 4, false) && verifier.VerifyString(tablePos, 12 /*SkillGroupId*/, false) diff --git a/SCHALE.Common/FlatData/WeekDungeonOpenScheduleExcel.cs b/SCHALE.Common/FlatData/WeekDungeonOpenScheduleExcel.cs index 0e23141..7944e2c 100644 --- a/SCHALE.Common/FlatData/WeekDungeonOpenScheduleExcel.cs +++ b/SCHALE.Common/FlatData/WeekDungeonOpenScheduleExcel.cs @@ -20,7 +20,7 @@ public struct WeekDungeonOpenScheduleExcel : IFlatbufferObject public void __init(int _i, ByteBuffer _bb) { __p = new Table(_i, _bb); } public WeekDungeonOpenScheduleExcel __assign(int _i, ByteBuffer _bb) { __init(_i, _bb); return this; } - public SCHALE.Common.FlatData.WeekDay WeekDay { get { int o = __p.__offset(4); return o != 0 ? (SCHALE.Common.FlatData.WeekDay)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.WeekDay.Sunday; } } + public SCHALE.Common.FlatData.WeekDay WeekDay_ { get { int o = __p.__offset(4); return o != 0 ? (SCHALE.Common.FlatData.WeekDay)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.WeekDay.Sunday; } } public SCHALE.Common.FlatData.WeekDungeonType Open(int j) { int o = __p.__offset(6); return o != 0 ? (SCHALE.Common.FlatData.WeekDungeonType)__p.bb.GetInt(__p.__vector(o) + j * 4) : (SCHALE.Common.FlatData.WeekDungeonType)0; } public int OpenLength { get { int o = __p.__offset(6); return o != 0 ? __p.__vector_len(o) : 0; } } #if ENABLE_SPAN_T @@ -31,16 +31,16 @@ public struct WeekDungeonOpenScheduleExcel : IFlatbufferObject public SCHALE.Common.FlatData.WeekDungeonType[] GetOpenArray() { int o = __p.__offset(6); if (o == 0) return null; int p = __p.__vector(o); int l = __p.__vector_len(o); SCHALE.Common.FlatData.WeekDungeonType[] a = new SCHALE.Common.FlatData.WeekDungeonType[l]; for (int i = 0; i < l; i++) { a[i] = (SCHALE.Common.FlatData.WeekDungeonType)__p.bb.GetInt(p + i * 4); } return a; } public static Offset CreateWeekDungeonOpenScheduleExcel(FlatBufferBuilder builder, - SCHALE.Common.FlatData.WeekDay WeekDay = SCHALE.Common.FlatData.WeekDay.Sunday, + SCHALE.Common.FlatData.WeekDay WeekDay_ = SCHALE.Common.FlatData.WeekDay.Sunday, VectorOffset OpenOffset = default(VectorOffset)) { builder.StartTable(2); WeekDungeonOpenScheduleExcel.AddOpen(builder, OpenOffset); - WeekDungeonOpenScheduleExcel.AddWeekDay(builder, WeekDay); + WeekDungeonOpenScheduleExcel.AddWeekDay_(builder, WeekDay_); return WeekDungeonOpenScheduleExcel.EndWeekDungeonOpenScheduleExcel(builder); } public static void StartWeekDungeonOpenScheduleExcel(FlatBufferBuilder builder) { builder.StartTable(2); } - public static void AddWeekDay(FlatBufferBuilder builder, SCHALE.Common.FlatData.WeekDay weekDay) { builder.AddInt(0, (int)weekDay, 0); } + public static void AddWeekDay_(FlatBufferBuilder builder, SCHALE.Common.FlatData.WeekDay weekDay_) { builder.AddInt(0, (int)weekDay_, 0); } public static void AddOpen(FlatBufferBuilder builder, VectorOffset openOffset) { builder.AddOffset(1, openOffset.Value, 0); } public static VectorOffset CreateOpenVector(FlatBufferBuilder builder, SCHALE.Common.FlatData.WeekDungeonType[] data) { builder.StartVector(4, data.Length, 4); for (int i = data.Length - 1; i >= 0; i--) builder.AddInt((int)data[i]); return builder.EndVector(); } public static VectorOffset CreateOpenVectorBlock(FlatBufferBuilder builder, SCHALE.Common.FlatData.WeekDungeonType[] data) { builder.StartVector(4, data.Length, 4); builder.Add(data); return builder.EndVector(); } @@ -58,7 +58,7 @@ public struct WeekDungeonOpenScheduleExcel : IFlatbufferObject } public void UnPackTo(WeekDungeonOpenScheduleExcelT _o) { byte[] key = TableEncryptionService.CreateKey("WeekDungeonOpenSchedule"); - _o.WeekDay = TableEncryptionService.Convert(this.WeekDay, key); + _o.WeekDay_ = TableEncryptionService.Convert(this.WeekDay_, key); _o.Open = new List(); for (var _j = 0; _j < this.OpenLength; ++_j) {_o.Open.Add(TableEncryptionService.Convert(this.Open(_j), key));} } @@ -71,18 +71,18 @@ public struct WeekDungeonOpenScheduleExcel : IFlatbufferObject } return CreateWeekDungeonOpenScheduleExcel( builder, - _o.WeekDay, + _o.WeekDay_, _Open); } } public class WeekDungeonOpenScheduleExcelT { - public SCHALE.Common.FlatData.WeekDay WeekDay { get; set; } + public SCHALE.Common.FlatData.WeekDay WeekDay_ { get; set; } public List Open { get; set; } public WeekDungeonOpenScheduleExcelT() { - this.WeekDay = SCHALE.Common.FlatData.WeekDay.Sunday; + this.WeekDay_ = SCHALE.Common.FlatData.WeekDay.Sunday; this.Open = null; } } @@ -93,7 +93,7 @@ static public class WeekDungeonOpenScheduleExcelVerify static public bool Verify(Google.FlatBuffers.Verifier verifier, uint tablePos) { return verifier.VerifyTableStart(tablePos) - && verifier.VerifyField(tablePos, 4 /*WeekDay*/, 4 /*SCHALE.Common.FlatData.WeekDay*/, 4, false) + && verifier.VerifyField(tablePos, 4 /*WeekDay_*/, 4 /*SCHALE.Common.FlatData.WeekDay*/, 4, false) && verifier.VerifyVectorOfData(tablePos, 6 /*Open*/, 4 /*SCHALE.Common.FlatData.WeekDungeonType*/, false) && verifier.VerifyTableEnd(tablePos); } diff --git a/SCHALE.Common/FlatData/WorldRaidConditionExcel.cs b/SCHALE.Common/FlatData/WorldRaidConditionExcel.cs index add9a5c..9733160 100644 --- a/SCHALE.Common/FlatData/WorldRaidConditionExcel.cs +++ b/SCHALE.Common/FlatData/WorldRaidConditionExcel.cs @@ -41,7 +41,7 @@ public struct WorldRaidConditionExcel : IFlatbufferObject public ArraySegment? GetCampaignStageIDBytes() { return __p.__vector_as_arraysegment(14); } #endif public long[] GetCampaignStageIDArray() { return __p.__vector_as_array(14); } - public SCHALE.Common.FlatData.MultipleConditionCheckType MultipleConditionCheckType { get { int o = __p.__offset(16); return o != 0 ? (SCHALE.Common.FlatData.MultipleConditionCheckType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.MultipleConditionCheckType.And; } } + public SCHALE.Common.FlatData.MultipleConditionCheckType MultipleConditionCheckType_ { get { int o = __p.__offset(16); return o != 0 ? (SCHALE.Common.FlatData.MultipleConditionCheckType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.MultipleConditionCheckType.And; } } public string AfterWhenDate { get { int o = __p.__offset(18); return o != 0 ? __p.__string(o + __p.bb_pos) : null; } } #if ENABLE_SPAN_T public Span GetAfterWhenDateBytes() { return __p.__vector_as_span(18, 1); } @@ -65,7 +65,7 @@ public struct WorldRaidConditionExcel : IFlatbufferObject long AccountLevel = 0, VectorOffset ScenarioModeIdOffset = default(VectorOffset), VectorOffset CampaignStageIDOffset = default(VectorOffset), - SCHALE.Common.FlatData.MultipleConditionCheckType MultipleConditionCheckType = SCHALE.Common.FlatData.MultipleConditionCheckType.And, + SCHALE.Common.FlatData.MultipleConditionCheckType MultipleConditionCheckType_ = SCHALE.Common.FlatData.MultipleConditionCheckType.And, StringOffset AfterWhenDateOffset = default(StringOffset), VectorOffset WorldRaidBossKillOffset = default(VectorOffset)) { builder.StartTable(9); @@ -73,7 +73,7 @@ public struct WorldRaidConditionExcel : IFlatbufferObject WorldRaidConditionExcel.AddId(builder, Id); WorldRaidConditionExcel.AddWorldRaidBossKill(builder, WorldRaidBossKillOffset); WorldRaidConditionExcel.AddAfterWhenDate(builder, AfterWhenDateOffset); - WorldRaidConditionExcel.AddMultipleConditionCheckType(builder, MultipleConditionCheckType); + WorldRaidConditionExcel.AddMultipleConditionCheckType_(builder, MultipleConditionCheckType_); WorldRaidConditionExcel.AddCampaignStageID(builder, CampaignStageIDOffset); WorldRaidConditionExcel.AddScenarioModeId(builder, ScenarioModeIdOffset); WorldRaidConditionExcel.AddLockUI(builder, LockUIOffset); @@ -103,7 +103,7 @@ public struct WorldRaidConditionExcel : IFlatbufferObject public static VectorOffset CreateCampaignStageIDVectorBlock(FlatBufferBuilder builder, ArraySegment data) { builder.StartVector(8, data.Count, 8); builder.Add(data); return builder.EndVector(); } public static VectorOffset CreateCampaignStageIDVectorBlock(FlatBufferBuilder builder, IntPtr dataPtr, int sizeInBytes) { builder.StartVector(1, sizeInBytes, 1); builder.Add(dataPtr, sizeInBytes); return builder.EndVector(); } public static void StartCampaignStageIDVector(FlatBufferBuilder builder, int numElems) { builder.StartVector(8, numElems, 8); } - public static void AddMultipleConditionCheckType(FlatBufferBuilder builder, SCHALE.Common.FlatData.MultipleConditionCheckType multipleConditionCheckType) { builder.AddInt(6, (int)multipleConditionCheckType, 0); } + public static void AddMultipleConditionCheckType_(FlatBufferBuilder builder, SCHALE.Common.FlatData.MultipleConditionCheckType multipleConditionCheckType_) { builder.AddInt(6, (int)multipleConditionCheckType_, 0); } public static void AddAfterWhenDate(FlatBufferBuilder builder, StringOffset afterWhenDateOffset) { builder.AddOffset(7, afterWhenDateOffset.Value, 0); } public static void AddWorldRaidBossKill(FlatBufferBuilder builder, VectorOffset worldRaidBossKillOffset) { builder.AddOffset(8, worldRaidBossKillOffset.Value, 0); } public static VectorOffset CreateWorldRaidBossKillVector(FlatBufferBuilder builder, long[] data) { builder.StartVector(8, data.Length, 8); for (int i = data.Length - 1; i >= 0; i--) builder.AddLong(data[i]); return builder.EndVector(); } @@ -131,7 +131,7 @@ public struct WorldRaidConditionExcel : IFlatbufferObject for (var _j = 0; _j < this.ScenarioModeIdLength; ++_j) {_o.ScenarioModeId.Add(TableEncryptionService.Convert(this.ScenarioModeId(_j), key));} _o.CampaignStageID = new List(); for (var _j = 0; _j < this.CampaignStageIDLength; ++_j) {_o.CampaignStageID.Add(TableEncryptionService.Convert(this.CampaignStageID(_j), key));} - _o.MultipleConditionCheckType = TableEncryptionService.Convert(this.MultipleConditionCheckType, key); + _o.MultipleConditionCheckType_ = TableEncryptionService.Convert(this.MultipleConditionCheckType_, key); _o.AfterWhenDate = TableEncryptionService.Convert(this.AfterWhenDate, key); _o.WorldRaidBossKill = new List(); for (var _j = 0; _j < this.WorldRaidBossKillLength; ++_j) {_o.WorldRaidBossKill.Add(TableEncryptionService.Convert(this.WorldRaidBossKill(_j), key));} @@ -168,7 +168,7 @@ public struct WorldRaidConditionExcel : IFlatbufferObject _o.AccountLevel, _ScenarioModeId, _CampaignStageID, - _o.MultipleConditionCheckType, + _o.MultipleConditionCheckType_, _AfterWhenDate, _WorldRaidBossKill); } @@ -182,7 +182,7 @@ public class WorldRaidConditionExcelT public long AccountLevel { get; set; } public List ScenarioModeId { get; set; } public List CampaignStageID { get; set; } - public SCHALE.Common.FlatData.MultipleConditionCheckType MultipleConditionCheckType { get; set; } + public SCHALE.Common.FlatData.MultipleConditionCheckType MultipleConditionCheckType_ { get; set; } public string AfterWhenDate { get; set; } public List WorldRaidBossKill { get; set; } @@ -193,7 +193,7 @@ public class WorldRaidConditionExcelT this.AccountLevel = 0; this.ScenarioModeId = null; this.CampaignStageID = null; - this.MultipleConditionCheckType = SCHALE.Common.FlatData.MultipleConditionCheckType.And; + this.MultipleConditionCheckType_ = SCHALE.Common.FlatData.MultipleConditionCheckType.And; this.AfterWhenDate = null; this.WorldRaidBossKill = null; } @@ -211,7 +211,7 @@ static public class WorldRaidConditionExcelVerify && verifier.VerifyField(tablePos, 10 /*AccountLevel*/, 8 /*long*/, 8, false) && verifier.VerifyVectorOfData(tablePos, 12 /*ScenarioModeId*/, 8 /*long*/, false) && verifier.VerifyVectorOfData(tablePos, 14 /*CampaignStageID*/, 8 /*long*/, false) - && verifier.VerifyField(tablePos, 16 /*MultipleConditionCheckType*/, 4 /*SCHALE.Common.FlatData.MultipleConditionCheckType*/, 4, false) + && verifier.VerifyField(tablePos, 16 /*MultipleConditionCheckType_*/, 4 /*SCHALE.Common.FlatData.MultipleConditionCheckType*/, 4, false) && verifier.VerifyString(tablePos, 18 /*AfterWhenDate*/, false) && verifier.VerifyVectorOfData(tablePos, 20 /*WorldRaidBossKill*/, 8 /*long*/, false) && verifier.VerifyTableEnd(tablePos); diff --git a/SCHALE.Common/FlatData/WorldRaidSeasonManageExcel.cs b/SCHALE.Common/FlatData/WorldRaidSeasonManageExcel.cs index 3c50cd2..79ee66b 100644 --- a/SCHALE.Common/FlatData/WorldRaidSeasonManageExcel.cs +++ b/SCHALE.Common/FlatData/WorldRaidSeasonManageExcel.cs @@ -58,43 +58,44 @@ public struct WorldRaidSeasonManageExcel : IFlatbufferObject public byte[] GetWorldRaidUniqueThemeNameArray() { return __p.__vector_as_array(26); } public bool CanWorldRaidGemEnter { get { int o = __p.__offset(28); return o != 0 ? 0!=__p.bb.Get(o + __p.bb_pos) : (bool)false; } } public bool HideWorldRaidTicketUI { get { int o = __p.__offset(30); return o != 0 ? 0!=__p.bb.Get(o + __p.bb_pos) : (bool)false; } } - public bool UseWorldRaidCommonToast { get { int o = __p.__offset(32); return o != 0 ? 0!=__p.bb.Get(o + __p.bb_pos) : (bool)false; } } - public long OpenRaidBossGroupId(int j) { int o = __p.__offset(34); return o != 0 ? __p.bb.GetLong(__p.__vector(o) + j * 8) : (long)0; } - public int OpenRaidBossGroupIdLength { get { int o = __p.__offset(34); return o != 0 ? __p.__vector_len(o) : 0; } } + public bool HideWorldRaidBossCompleteRewardUI { get { int o = __p.__offset(32); return o != 0 ? 0!=__p.bb.Get(o + __p.bb_pos) : (bool)false; } } + public bool UseWorldRaidCommonToast { get { int o = __p.__offset(34); return o != 0 ? 0!=__p.bb.Get(o + __p.bb_pos) : (bool)false; } } + public long OpenRaidBossGroupId(int j) { int o = __p.__offset(36); return o != 0 ? __p.bb.GetLong(__p.__vector(o) + j * 8) : (long)0; } + public int OpenRaidBossGroupIdLength { get { int o = __p.__offset(36); return o != 0 ? __p.__vector_len(o) : 0; } } #if ENABLE_SPAN_T - public Span GetOpenRaidBossGroupIdBytes() { return __p.__vector_as_span(34, 8); } + public Span GetOpenRaidBossGroupIdBytes() { return __p.__vector_as_span(36, 8); } #else - public ArraySegment? GetOpenRaidBossGroupIdBytes() { return __p.__vector_as_arraysegment(34); } + public ArraySegment? GetOpenRaidBossGroupIdBytes() { return __p.__vector_as_arraysegment(36); } #endif - public long[] GetOpenRaidBossGroupIdArray() { return __p.__vector_as_array(34); } - public string BossSpawnTime(int j) { int o = __p.__offset(36); return o != 0 ? __p.__string(__p.__vector(o) + j * 4) : null; } - public int BossSpawnTimeLength { get { int o = __p.__offset(36); return o != 0 ? __p.__vector_len(o) : 0; } } - public string EliminateTime(int j) { int o = __p.__offset(38); return o != 0 ? __p.__string(__p.__vector(o) + j * 4) : null; } - public int EliminateTimeLength { get { int o = __p.__offset(38); return o != 0 ? __p.__vector_len(o) : 0; } } - public long ScenarioOutputConditionId(int j) { int o = __p.__offset(40); return o != 0 ? __p.bb.GetLong(__p.__vector(o) + j * 8) : (long)0; } - public int ScenarioOutputConditionIdLength { get { int o = __p.__offset(40); return o != 0 ? __p.__vector_len(o) : 0; } } + public long[] GetOpenRaidBossGroupIdArray() { return __p.__vector_as_array(36); } + public string BossSpawnTime(int j) { int o = __p.__offset(38); return o != 0 ? __p.__string(__p.__vector(o) + j * 4) : null; } + public int BossSpawnTimeLength { get { int o = __p.__offset(38); return o != 0 ? __p.__vector_len(o) : 0; } } + public string EliminateTime(int j) { int o = __p.__offset(40); return o != 0 ? __p.__string(__p.__vector(o) + j * 4) : null; } + public int EliminateTimeLength { get { int o = __p.__offset(40); return o != 0 ? __p.__vector_len(o) : 0; } } + public long ScenarioOutputConditionId(int j) { int o = __p.__offset(42); return o != 0 ? __p.bb.GetLong(__p.__vector(o) + j * 8) : (long)0; } + public int ScenarioOutputConditionIdLength { get { int o = __p.__offset(42); return o != 0 ? __p.__vector_len(o) : 0; } } #if ENABLE_SPAN_T - public Span GetScenarioOutputConditionIdBytes() { return __p.__vector_as_span(40, 8); } + public Span GetScenarioOutputConditionIdBytes() { return __p.__vector_as_span(42, 8); } #else - public ArraySegment? GetScenarioOutputConditionIdBytes() { return __p.__vector_as_arraysegment(40); } + public ArraySegment? GetScenarioOutputConditionIdBytes() { return __p.__vector_as_arraysegment(42); } #endif - public long[] GetScenarioOutputConditionIdArray() { return __p.__vector_as_array(40); } - public long ConditionScenarioGroupid(int j) { int o = __p.__offset(42); return o != 0 ? __p.bb.GetLong(__p.__vector(o) + j * 8) : (long)0; } - public int ConditionScenarioGroupidLength { get { int o = __p.__offset(42); return o != 0 ? __p.__vector_len(o) : 0; } } + public long[] GetScenarioOutputConditionIdArray() { return __p.__vector_as_array(42); } + public long ConditionScenarioGroupid(int j) { int o = __p.__offset(44); return o != 0 ? __p.bb.GetLong(__p.__vector(o) + j * 8) : (long)0; } + public int ConditionScenarioGroupidLength { get { int o = __p.__offset(44); return o != 0 ? __p.__vector_len(o) : 0; } } #if ENABLE_SPAN_T - public Span GetConditionScenarioGroupidBytes() { return __p.__vector_as_span(42, 8); } + public Span GetConditionScenarioGroupidBytes() { return __p.__vector_as_span(44, 8); } #else - public ArraySegment? GetConditionScenarioGroupidBytes() { return __p.__vector_as_arraysegment(42); } + public ArraySegment? GetConditionScenarioGroupidBytes() { return __p.__vector_as_arraysegment(44); } #endif - public long[] GetConditionScenarioGroupidArray() { return __p.__vector_as_array(42); } - public string WorldRaidMapEnterOperator { get { int o = __p.__offset(44); return o != 0 ? __p.__string(o + __p.bb_pos) : null; } } + public long[] GetConditionScenarioGroupidArray() { return __p.__vector_as_array(44); } + public string WorldRaidMapEnterOperator { get { int o = __p.__offset(46); return o != 0 ? __p.__string(o + __p.bb_pos) : null; } } #if ENABLE_SPAN_T - public Span GetWorldRaidMapEnterOperatorBytes() { return __p.__vector_as_span(44, 1); } + public Span GetWorldRaidMapEnterOperatorBytes() { return __p.__vector_as_span(46, 1); } #else - public ArraySegment? GetWorldRaidMapEnterOperatorBytes() { return __p.__vector_as_arraysegment(44); } + public ArraySegment? GetWorldRaidMapEnterOperatorBytes() { return __p.__vector_as_arraysegment(46); } #endif - public byte[] GetWorldRaidMapEnterOperatorArray() { return __p.__vector_as_array(44); } - public bool UseFavorRankBuff { get { int o = __p.__offset(46); return o != 0 ? 0!=__p.bb.Get(o + __p.bb_pos) : (bool)false; } } + public byte[] GetWorldRaidMapEnterOperatorArray() { return __p.__vector_as_array(46); } + public bool UseFavorRankBuff { get { int o = __p.__offset(48); return o != 0 ? 0!=__p.bb.Get(o + __p.bb_pos) : (bool)false; } } public static Offset CreateWorldRaidSeasonManageExcel(FlatBufferBuilder builder, long SeasonId = 0, @@ -111,6 +112,7 @@ public struct WorldRaidSeasonManageExcel : IFlatbufferObject StringOffset WorldRaidUniqueThemeNameOffset = default(StringOffset), bool CanWorldRaidGemEnter = false, bool HideWorldRaidTicketUI = false, + bool HideWorldRaidBossCompleteRewardUI = false, bool UseWorldRaidCommonToast = false, VectorOffset OpenRaidBossGroupIdOffset = default(VectorOffset), VectorOffset BossSpawnTimeOffset = default(VectorOffset), @@ -119,7 +121,7 @@ public struct WorldRaidSeasonManageExcel : IFlatbufferObject VectorOffset ConditionScenarioGroupidOffset = default(VectorOffset), StringOffset WorldRaidMapEnterOperatorOffset = default(StringOffset), bool UseFavorRankBuff = false) { - builder.StartTable(22); + builder.StartTable(23); WorldRaidSeasonManageExcel.AddWorldRaidLobbyEnterScenario(builder, WorldRaidLobbyEnterScenario); WorldRaidSeasonManageExcel.AddSeasonOpenCondition(builder, SeasonOpenCondition); WorldRaidSeasonManageExcel.AddEventContentId(builder, EventContentId); @@ -137,6 +139,7 @@ public struct WorldRaidSeasonManageExcel : IFlatbufferObject WorldRaidSeasonManageExcel.AddEnterTicket(builder, EnterTicket); WorldRaidSeasonManageExcel.AddUseFavorRankBuff(builder, UseFavorRankBuff); WorldRaidSeasonManageExcel.AddUseWorldRaidCommonToast(builder, UseWorldRaidCommonToast); + WorldRaidSeasonManageExcel.AddHideWorldRaidBossCompleteRewardUI(builder, HideWorldRaidBossCompleteRewardUI); WorldRaidSeasonManageExcel.AddHideWorldRaidTicketUI(builder, HideWorldRaidTicketUI); WorldRaidSeasonManageExcel.AddCanWorldRaidGemEnter(builder, CanWorldRaidGemEnter); WorldRaidSeasonManageExcel.AddWorldRaidUniqueThemeLobbyUI(builder, WorldRaidUniqueThemeLobbyUI); @@ -145,7 +148,7 @@ public struct WorldRaidSeasonManageExcel : IFlatbufferObject return WorldRaidSeasonManageExcel.EndWorldRaidSeasonManageExcel(builder); } - public static void StartWorldRaidSeasonManageExcel(FlatBufferBuilder builder) { builder.StartTable(22); } + public static void StartWorldRaidSeasonManageExcel(FlatBufferBuilder builder) { builder.StartTable(23); } public static void AddSeasonId(FlatBufferBuilder builder, long seasonId) { builder.AddLong(0, seasonId, 0); } public static void AddEventContentId(FlatBufferBuilder builder, long eventContentId) { builder.AddLong(1, eventContentId, 0); } public static void AddEnterTicket(FlatBufferBuilder builder, SCHALE.Common.FlatData.CurrencyTypes enterTicket) { builder.AddInt(2, (int)enterTicket, 0); } @@ -160,39 +163,40 @@ public struct WorldRaidSeasonManageExcel : IFlatbufferObject public static void AddWorldRaidUniqueThemeName(FlatBufferBuilder builder, StringOffset worldRaidUniqueThemeNameOffset) { builder.AddOffset(11, worldRaidUniqueThemeNameOffset.Value, 0); } public static void AddCanWorldRaidGemEnter(FlatBufferBuilder builder, bool canWorldRaidGemEnter) { builder.AddBool(12, canWorldRaidGemEnter, false); } public static void AddHideWorldRaidTicketUI(FlatBufferBuilder builder, bool hideWorldRaidTicketUI) { builder.AddBool(13, hideWorldRaidTicketUI, false); } - public static void AddUseWorldRaidCommonToast(FlatBufferBuilder builder, bool useWorldRaidCommonToast) { builder.AddBool(14, useWorldRaidCommonToast, false); } - public static void AddOpenRaidBossGroupId(FlatBufferBuilder builder, VectorOffset openRaidBossGroupIdOffset) { builder.AddOffset(15, openRaidBossGroupIdOffset.Value, 0); } + public static void AddHideWorldRaidBossCompleteRewardUI(FlatBufferBuilder builder, bool hideWorldRaidBossCompleteRewardUI) { builder.AddBool(14, hideWorldRaidBossCompleteRewardUI, false); } + public static void AddUseWorldRaidCommonToast(FlatBufferBuilder builder, bool useWorldRaidCommonToast) { builder.AddBool(15, useWorldRaidCommonToast, false); } + public static void AddOpenRaidBossGroupId(FlatBufferBuilder builder, VectorOffset openRaidBossGroupIdOffset) { builder.AddOffset(16, openRaidBossGroupIdOffset.Value, 0); } public static VectorOffset CreateOpenRaidBossGroupIdVector(FlatBufferBuilder builder, long[] data) { builder.StartVector(8, data.Length, 8); for (int i = data.Length - 1; i >= 0; i--) builder.AddLong(data[i]); return builder.EndVector(); } public static VectorOffset CreateOpenRaidBossGroupIdVectorBlock(FlatBufferBuilder builder, long[] data) { builder.StartVector(8, data.Length, 8); builder.Add(data); return builder.EndVector(); } public static VectorOffset CreateOpenRaidBossGroupIdVectorBlock(FlatBufferBuilder builder, ArraySegment data) { builder.StartVector(8, data.Count, 8); builder.Add(data); return builder.EndVector(); } public static VectorOffset CreateOpenRaidBossGroupIdVectorBlock(FlatBufferBuilder builder, IntPtr dataPtr, int sizeInBytes) { builder.StartVector(1, sizeInBytes, 1); builder.Add(dataPtr, sizeInBytes); return builder.EndVector(); } public static void StartOpenRaidBossGroupIdVector(FlatBufferBuilder builder, int numElems) { builder.StartVector(8, numElems, 8); } - public static void AddBossSpawnTime(FlatBufferBuilder builder, VectorOffset bossSpawnTimeOffset) { builder.AddOffset(16, bossSpawnTimeOffset.Value, 0); } + public static void AddBossSpawnTime(FlatBufferBuilder builder, VectorOffset bossSpawnTimeOffset) { builder.AddOffset(17, bossSpawnTimeOffset.Value, 0); } public static VectorOffset CreateBossSpawnTimeVector(FlatBufferBuilder builder, StringOffset[] data) { builder.StartVector(4, data.Length, 4); for (int i = data.Length - 1; i >= 0; i--) builder.AddOffset(data[i].Value); return builder.EndVector(); } public static VectorOffset CreateBossSpawnTimeVectorBlock(FlatBufferBuilder builder, StringOffset[] data) { builder.StartVector(4, data.Length, 4); builder.Add(data); return builder.EndVector(); } public static VectorOffset CreateBossSpawnTimeVectorBlock(FlatBufferBuilder builder, ArraySegment data) { builder.StartVector(4, data.Count, 4); builder.Add(data); return builder.EndVector(); } public static VectorOffset CreateBossSpawnTimeVectorBlock(FlatBufferBuilder builder, IntPtr dataPtr, int sizeInBytes) { builder.StartVector(1, sizeInBytes, 1); builder.Add(dataPtr, sizeInBytes); return builder.EndVector(); } public static void StartBossSpawnTimeVector(FlatBufferBuilder builder, int numElems) { builder.StartVector(4, numElems, 4); } - public static void AddEliminateTime(FlatBufferBuilder builder, VectorOffset eliminateTimeOffset) { builder.AddOffset(17, eliminateTimeOffset.Value, 0); } + public static void AddEliminateTime(FlatBufferBuilder builder, VectorOffset eliminateTimeOffset) { builder.AddOffset(18, eliminateTimeOffset.Value, 0); } public static VectorOffset CreateEliminateTimeVector(FlatBufferBuilder builder, StringOffset[] data) { builder.StartVector(4, data.Length, 4); for (int i = data.Length - 1; i >= 0; i--) builder.AddOffset(data[i].Value); return builder.EndVector(); } public static VectorOffset CreateEliminateTimeVectorBlock(FlatBufferBuilder builder, StringOffset[] data) { builder.StartVector(4, data.Length, 4); builder.Add(data); return builder.EndVector(); } public static VectorOffset CreateEliminateTimeVectorBlock(FlatBufferBuilder builder, ArraySegment data) { builder.StartVector(4, data.Count, 4); builder.Add(data); return builder.EndVector(); } public static VectorOffset CreateEliminateTimeVectorBlock(FlatBufferBuilder builder, IntPtr dataPtr, int sizeInBytes) { builder.StartVector(1, sizeInBytes, 1); builder.Add(dataPtr, sizeInBytes); return builder.EndVector(); } public static void StartEliminateTimeVector(FlatBufferBuilder builder, int numElems) { builder.StartVector(4, numElems, 4); } - public static void AddScenarioOutputConditionId(FlatBufferBuilder builder, VectorOffset scenarioOutputConditionIdOffset) { builder.AddOffset(18, scenarioOutputConditionIdOffset.Value, 0); } + public static void AddScenarioOutputConditionId(FlatBufferBuilder builder, VectorOffset scenarioOutputConditionIdOffset) { builder.AddOffset(19, scenarioOutputConditionIdOffset.Value, 0); } public static VectorOffset CreateScenarioOutputConditionIdVector(FlatBufferBuilder builder, long[] data) { builder.StartVector(8, data.Length, 8); for (int i = data.Length - 1; i >= 0; i--) builder.AddLong(data[i]); return builder.EndVector(); } public static VectorOffset CreateScenarioOutputConditionIdVectorBlock(FlatBufferBuilder builder, long[] data) { builder.StartVector(8, data.Length, 8); builder.Add(data); return builder.EndVector(); } public static VectorOffset CreateScenarioOutputConditionIdVectorBlock(FlatBufferBuilder builder, ArraySegment data) { builder.StartVector(8, data.Count, 8); builder.Add(data); return builder.EndVector(); } public static VectorOffset CreateScenarioOutputConditionIdVectorBlock(FlatBufferBuilder builder, IntPtr dataPtr, int sizeInBytes) { builder.StartVector(1, sizeInBytes, 1); builder.Add(dataPtr, sizeInBytes); return builder.EndVector(); } public static void StartScenarioOutputConditionIdVector(FlatBufferBuilder builder, int numElems) { builder.StartVector(8, numElems, 8); } - public static void AddConditionScenarioGroupid(FlatBufferBuilder builder, VectorOffset conditionScenarioGroupidOffset) { builder.AddOffset(19, conditionScenarioGroupidOffset.Value, 0); } + public static void AddConditionScenarioGroupid(FlatBufferBuilder builder, VectorOffset conditionScenarioGroupidOffset) { builder.AddOffset(20, conditionScenarioGroupidOffset.Value, 0); } public static VectorOffset CreateConditionScenarioGroupidVector(FlatBufferBuilder builder, long[] data) { builder.StartVector(8, data.Length, 8); for (int i = data.Length - 1; i >= 0; i--) builder.AddLong(data[i]); return builder.EndVector(); } public static VectorOffset CreateConditionScenarioGroupidVectorBlock(FlatBufferBuilder builder, long[] data) { builder.StartVector(8, data.Length, 8); builder.Add(data); return builder.EndVector(); } public static VectorOffset CreateConditionScenarioGroupidVectorBlock(FlatBufferBuilder builder, ArraySegment data) { builder.StartVector(8, data.Count, 8); builder.Add(data); return builder.EndVector(); } public static VectorOffset CreateConditionScenarioGroupidVectorBlock(FlatBufferBuilder builder, IntPtr dataPtr, int sizeInBytes) { builder.StartVector(1, sizeInBytes, 1); builder.Add(dataPtr, sizeInBytes); return builder.EndVector(); } public static void StartConditionScenarioGroupidVector(FlatBufferBuilder builder, int numElems) { builder.StartVector(8, numElems, 8); } - public static void AddWorldRaidMapEnterOperator(FlatBufferBuilder builder, StringOffset worldRaidMapEnterOperatorOffset) { builder.AddOffset(20, worldRaidMapEnterOperatorOffset.Value, 0); } - public static void AddUseFavorRankBuff(FlatBufferBuilder builder, bool useFavorRankBuff) { builder.AddBool(21, useFavorRankBuff, false); } + public static void AddWorldRaidMapEnterOperator(FlatBufferBuilder builder, StringOffset worldRaidMapEnterOperatorOffset) { builder.AddOffset(21, worldRaidMapEnterOperatorOffset.Value, 0); } + public static void AddUseFavorRankBuff(FlatBufferBuilder builder, bool useFavorRankBuff) { builder.AddBool(22, useFavorRankBuff, false); } public static Offset EndWorldRaidSeasonManageExcel(FlatBufferBuilder builder) { int o = builder.EndTable(); return new Offset(o); @@ -218,6 +222,7 @@ public struct WorldRaidSeasonManageExcel : IFlatbufferObject _o.WorldRaidUniqueThemeName = TableEncryptionService.Convert(this.WorldRaidUniqueThemeName, key); _o.CanWorldRaidGemEnter = TableEncryptionService.Convert(this.CanWorldRaidGemEnter, key); _o.HideWorldRaidTicketUI = TableEncryptionService.Convert(this.HideWorldRaidTicketUI, key); + _o.HideWorldRaidBossCompleteRewardUI = TableEncryptionService.Convert(this.HideWorldRaidBossCompleteRewardUI, key); _o.UseWorldRaidCommonToast = TableEncryptionService.Convert(this.UseWorldRaidCommonToast, key); _o.OpenRaidBossGroupId = new List(); for (var _j = 0; _j < this.OpenRaidBossGroupIdLength; ++_j) {_o.OpenRaidBossGroupId.Add(TableEncryptionService.Convert(this.OpenRaidBossGroupId(_j), key));} @@ -282,6 +287,7 @@ public struct WorldRaidSeasonManageExcel : IFlatbufferObject _WorldRaidUniqueThemeName, _o.CanWorldRaidGemEnter, _o.HideWorldRaidTicketUI, + _o.HideWorldRaidBossCompleteRewardUI, _o.UseWorldRaidCommonToast, _OpenRaidBossGroupId, _BossSpawnTime, @@ -309,6 +315,7 @@ public class WorldRaidSeasonManageExcelT public string WorldRaidUniqueThemeName { get; set; } public bool CanWorldRaidGemEnter { get; set; } public bool HideWorldRaidTicketUI { get; set; } + public bool HideWorldRaidBossCompleteRewardUI { get; set; } public bool UseWorldRaidCommonToast { get; set; } public List OpenRaidBossGroupId { get; set; } public List BossSpawnTime { get; set; } @@ -333,6 +340,7 @@ public class WorldRaidSeasonManageExcelT this.WorldRaidUniqueThemeName = null; this.CanWorldRaidGemEnter = false; this.HideWorldRaidTicketUI = false; + this.HideWorldRaidBossCompleteRewardUI = false; this.UseWorldRaidCommonToast = false; this.OpenRaidBossGroupId = null; this.BossSpawnTime = null; @@ -364,14 +372,15 @@ static public class WorldRaidSeasonManageExcelVerify && verifier.VerifyString(tablePos, 26 /*WorldRaidUniqueThemeName*/, false) && verifier.VerifyField(tablePos, 28 /*CanWorldRaidGemEnter*/, 1 /*bool*/, 1, false) && verifier.VerifyField(tablePos, 30 /*HideWorldRaidTicketUI*/, 1 /*bool*/, 1, false) - && verifier.VerifyField(tablePos, 32 /*UseWorldRaidCommonToast*/, 1 /*bool*/, 1, false) - && verifier.VerifyVectorOfData(tablePos, 34 /*OpenRaidBossGroupId*/, 8 /*long*/, false) - && verifier.VerifyVectorOfStrings(tablePos, 36 /*BossSpawnTime*/, false) - && verifier.VerifyVectorOfStrings(tablePos, 38 /*EliminateTime*/, false) - && verifier.VerifyVectorOfData(tablePos, 40 /*ScenarioOutputConditionId*/, 8 /*long*/, false) - && verifier.VerifyVectorOfData(tablePos, 42 /*ConditionScenarioGroupid*/, 8 /*long*/, false) - && verifier.VerifyString(tablePos, 44 /*WorldRaidMapEnterOperator*/, false) - && verifier.VerifyField(tablePos, 46 /*UseFavorRankBuff*/, 1 /*bool*/, 1, false) + && verifier.VerifyField(tablePos, 32 /*HideWorldRaidBossCompleteRewardUI*/, 1 /*bool*/, 1, false) + && verifier.VerifyField(tablePos, 34 /*UseWorldRaidCommonToast*/, 1 /*bool*/, 1, false) + && verifier.VerifyVectorOfData(tablePos, 36 /*OpenRaidBossGroupId*/, 8 /*long*/, false) + && verifier.VerifyVectorOfStrings(tablePos, 38 /*BossSpawnTime*/, false) + && verifier.VerifyVectorOfStrings(tablePos, 40 /*EliminateTime*/, false) + && verifier.VerifyVectorOfData(tablePos, 42 /*ScenarioOutputConditionId*/, 8 /*long*/, false) + && verifier.VerifyVectorOfData(tablePos, 44 /*ConditionScenarioGroupid*/, 8 /*long*/, false) + && verifier.VerifyString(tablePos, 46 /*WorldRaidMapEnterOperator*/, false) + && verifier.VerifyField(tablePos, 48 /*UseFavorRankBuff*/, 1 /*bool*/, 1, false) && verifier.VerifyTableEnd(tablePos); } } diff --git a/SCHALE.Common/FlatData/WorldRaidStageExcel.cs b/SCHALE.Common/FlatData/WorldRaidStageExcel.cs index 49bcbe9..fc54daa 100644 --- a/SCHALE.Common/FlatData/WorldRaidStageExcel.cs +++ b/SCHALE.Common/FlatData/WorldRaidStageExcel.cs @@ -48,7 +48,7 @@ public struct WorldRaidStageExcel : IFlatbufferObject #endif public long[] GetBossCharacterIdArray() { return __p.__vector_as_array(18); } public long AssistCharacterLimitCount { get { int o = __p.__offset(20); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } - public SCHALE.Common.FlatData.WorldRaidDifficulty WorldRaidDifficulty { get { int o = __p.__offset(22); return o != 0 ? (SCHALE.Common.FlatData.WorldRaidDifficulty)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.WorldRaidDifficulty.None; } } + public SCHALE.Common.FlatData.WorldRaidDifficulty WorldRaidDifficulty_ { get { int o = __p.__offset(22); return o != 0 ? (SCHALE.Common.FlatData.WorldRaidDifficulty)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.WorldRaidDifficulty.None; } } public bool DifficultyOpenCondition { get { int o = __p.__offset(24); return o != 0 ? 0!=__p.bb.Get(o + __p.bb_pos) : (bool)false; } } public long RaidEnterAmount { get { int o = __p.__offset(26); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public long ReEnterAmount { get { int o = __p.__offset(28); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } @@ -108,7 +108,7 @@ public struct WorldRaidStageExcel : IFlatbufferObject #endif public int[] GetAllyPassiveSkillLevelArray() { return __p.__vector_as_array(68); } public bool SaveCurrentLocalBossHP { get { int o = __p.__offset(70); return o != 0 ? 0!=__p.bb.Get(o + __p.bb_pos) : (bool)false; } } - public SCHALE.Common.FlatData.EchelonExtensionType EchelonExtensionType { get { int o = __p.__offset(72); return o != 0 ? (SCHALE.Common.FlatData.EchelonExtensionType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.EchelonExtensionType.Base; } } + public SCHALE.Common.FlatData.EchelonExtensionType EchelonExtensionType_ { get { int o = __p.__offset(72); return o != 0 ? (SCHALE.Common.FlatData.EchelonExtensionType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.EchelonExtensionType.Base; } } public static Offset CreateWorldRaidStageExcel(FlatBufferBuilder builder, long Id = 0, @@ -120,7 +120,7 @@ public struct WorldRaidStageExcel : IFlatbufferObject long RaidCharacterId = 0, VectorOffset BossCharacterIdOffset = default(VectorOffset), long AssistCharacterLimitCount = 0, - SCHALE.Common.FlatData.WorldRaidDifficulty WorldRaidDifficulty = SCHALE.Common.FlatData.WorldRaidDifficulty.None, + SCHALE.Common.FlatData.WorldRaidDifficulty WorldRaidDifficulty_ = SCHALE.Common.FlatData.WorldRaidDifficulty.None, bool DifficultyOpenCondition = false, long RaidEnterAmount = 0, long ReEnterAmount = 0, @@ -145,7 +145,7 @@ public struct WorldRaidStageExcel : IFlatbufferObject VectorOffset AllyPassiveSkillOffset = default(VectorOffset), VectorOffset AllyPassiveSkillLevelOffset = default(VectorOffset), bool SaveCurrentLocalBossHP = false, - SCHALE.Common.FlatData.EchelonExtensionType EchelonExtensionType = SCHALE.Common.FlatData.EchelonExtensionType.Base) { + SCHALE.Common.FlatData.EchelonExtensionType EchelonExtensionType_ = SCHALE.Common.FlatData.EchelonExtensionType.Base) { builder.StartTable(35); WorldRaidStageExcel.AddDamageToWorldBoss(builder, DamageToWorldBoss); WorldRaidStageExcel.AddFixedEchelonId(builder, FixedEchelonId); @@ -162,7 +162,7 @@ public struct WorldRaidStageExcel : IFlatbufferObject WorldRaidStageExcel.AddRaidCharacterId(builder, RaidCharacterId); WorldRaidStageExcel.AddWorldRaidBossGroupId(builder, WorldRaidBossGroupId); WorldRaidStageExcel.AddId(builder, Id); - WorldRaidStageExcel.AddEchelonExtensionType(builder, EchelonExtensionType); + WorldRaidStageExcel.AddEchelonExtensionType_(builder, EchelonExtensionType_); WorldRaidStageExcel.AddAllyPassiveSkillLevel(builder, AllyPassiveSkillLevelOffset); WorldRaidStageExcel.AddAllyPassiveSkill(builder, AllyPassiveSkillOffset); WorldRaidStageExcel.AddBossBGInfoKey(builder, BossBGInfoKey); @@ -171,7 +171,7 @@ public struct WorldRaidStageExcel : IFlatbufferObject WorldRaidStageExcel.AddBattleReadyTimelinePhaseEnd(builder, BattleReadyTimelinePhaseEndOffset); WorldRaidStageExcel.AddBattleReadyTimelinePhaseStart(builder, BattleReadyTimelinePhaseStartOffset); WorldRaidStageExcel.AddBattleReadyTimelinePath(builder, BattleReadyTimelinePathOffset); - WorldRaidStageExcel.AddWorldRaidDifficulty(builder, WorldRaidDifficulty); + WorldRaidStageExcel.AddWorldRaidDifficulty_(builder, WorldRaidDifficulty_); WorldRaidStageExcel.AddBossCharacterId(builder, BossCharacterIdOffset); WorldRaidStageExcel.AddBGPath(builder, BGPathOffset); WorldRaidStageExcel.AddPortraitPath(builder, PortraitPathOffset); @@ -200,7 +200,7 @@ public struct WorldRaidStageExcel : IFlatbufferObject public static VectorOffset CreateBossCharacterIdVectorBlock(FlatBufferBuilder builder, IntPtr dataPtr, int sizeInBytes) { builder.StartVector(1, sizeInBytes, 1); builder.Add(dataPtr, sizeInBytes); return builder.EndVector(); } public static void StartBossCharacterIdVector(FlatBufferBuilder builder, int numElems) { builder.StartVector(8, numElems, 8); } public static void AddAssistCharacterLimitCount(FlatBufferBuilder builder, long assistCharacterLimitCount) { builder.AddLong(8, assistCharacterLimitCount, 0); } - public static void AddWorldRaidDifficulty(FlatBufferBuilder builder, SCHALE.Common.FlatData.WorldRaidDifficulty worldRaidDifficulty) { builder.AddInt(9, (int)worldRaidDifficulty, 0); } + public static void AddWorldRaidDifficulty_(FlatBufferBuilder builder, SCHALE.Common.FlatData.WorldRaidDifficulty worldRaidDifficulty_) { builder.AddInt(9, (int)worldRaidDifficulty_, 0); } public static void AddDifficultyOpenCondition(FlatBufferBuilder builder, bool difficultyOpenCondition) { builder.AddBool(10, difficultyOpenCondition, false); } public static void AddRaidEnterAmount(FlatBufferBuilder builder, long raidEnterAmount) { builder.AddLong(11, raidEnterAmount, 0); } public static void AddReEnterAmount(FlatBufferBuilder builder, long reEnterAmount) { builder.AddLong(12, reEnterAmount, 0); } @@ -250,7 +250,7 @@ public struct WorldRaidStageExcel : IFlatbufferObject public static VectorOffset CreateAllyPassiveSkillLevelVectorBlock(FlatBufferBuilder builder, IntPtr dataPtr, int sizeInBytes) { builder.StartVector(1, sizeInBytes, 1); builder.Add(dataPtr, sizeInBytes); return builder.EndVector(); } public static void StartAllyPassiveSkillLevelVector(FlatBufferBuilder builder, int numElems) { builder.StartVector(4, numElems, 4); } public static void AddSaveCurrentLocalBossHP(FlatBufferBuilder builder, bool saveCurrentLocalBossHP) { builder.AddBool(33, saveCurrentLocalBossHP, false); } - public static void AddEchelonExtensionType(FlatBufferBuilder builder, SCHALE.Common.FlatData.EchelonExtensionType echelonExtensionType) { builder.AddInt(34, (int)echelonExtensionType, 0); } + public static void AddEchelonExtensionType_(FlatBufferBuilder builder, SCHALE.Common.FlatData.EchelonExtensionType echelonExtensionType_) { builder.AddInt(34, (int)echelonExtensionType_, 0); } public static Offset EndWorldRaidStageExcel(FlatBufferBuilder builder) { int o = builder.EndTable(); return new Offset(o); @@ -272,7 +272,7 @@ public struct WorldRaidStageExcel : IFlatbufferObject _o.BossCharacterId = new List(); for (var _j = 0; _j < this.BossCharacterIdLength; ++_j) {_o.BossCharacterId.Add(TableEncryptionService.Convert(this.BossCharacterId(_j), key));} _o.AssistCharacterLimitCount = TableEncryptionService.Convert(this.AssistCharacterLimitCount, key); - _o.WorldRaidDifficulty = TableEncryptionService.Convert(this.WorldRaidDifficulty, key); + _o.WorldRaidDifficulty_ = TableEncryptionService.Convert(this.WorldRaidDifficulty_, key); _o.DifficultyOpenCondition = TableEncryptionService.Convert(this.DifficultyOpenCondition, key); _o.RaidEnterAmount = TableEncryptionService.Convert(this.RaidEnterAmount, key); _o.ReEnterAmount = TableEncryptionService.Convert(this.ReEnterAmount, key); @@ -302,7 +302,7 @@ public struct WorldRaidStageExcel : IFlatbufferObject _o.AllyPassiveSkillLevel = new List(); for (var _j = 0; _j < this.AllyPassiveSkillLevelLength; ++_j) {_o.AllyPassiveSkillLevel.Add(TableEncryptionService.Convert(this.AllyPassiveSkillLevel(_j), key));} _o.SaveCurrentLocalBossHP = TableEncryptionService.Convert(this.SaveCurrentLocalBossHP, key); - _o.EchelonExtensionType = TableEncryptionService.Convert(this.EchelonExtensionType, key); + _o.EchelonExtensionType_ = TableEncryptionService.Convert(this.EchelonExtensionType_, key); } public static Offset Pack(FlatBufferBuilder builder, WorldRaidStageExcelT _o) { if (_o == null) return default(Offset); @@ -353,7 +353,7 @@ public struct WorldRaidStageExcel : IFlatbufferObject _o.RaidCharacterId, _BossCharacterId, _o.AssistCharacterLimitCount, - _o.WorldRaidDifficulty, + _o.WorldRaidDifficulty_, _o.DifficultyOpenCondition, _o.RaidEnterAmount, _o.ReEnterAmount, @@ -378,7 +378,7 @@ public struct WorldRaidStageExcel : IFlatbufferObject _AllyPassiveSkill, _AllyPassiveSkillLevel, _o.SaveCurrentLocalBossHP, - _o.EchelonExtensionType); + _o.EchelonExtensionType_); } } @@ -393,7 +393,7 @@ public class WorldRaidStageExcelT public long RaidCharacterId { get; set; } public List BossCharacterId { get; set; } public long AssistCharacterLimitCount { get; set; } - public SCHALE.Common.FlatData.WorldRaidDifficulty WorldRaidDifficulty { get; set; } + public SCHALE.Common.FlatData.WorldRaidDifficulty WorldRaidDifficulty_ { get; set; } public bool DifficultyOpenCondition { get; set; } public long RaidEnterAmount { get; set; } public long ReEnterAmount { get; set; } @@ -418,7 +418,7 @@ public class WorldRaidStageExcelT public List AllyPassiveSkill { get; set; } public List AllyPassiveSkillLevel { get; set; } public bool SaveCurrentLocalBossHP { get; set; } - public SCHALE.Common.FlatData.EchelonExtensionType EchelonExtensionType { get; set; } + public SCHALE.Common.FlatData.EchelonExtensionType EchelonExtensionType_ { get; set; } public WorldRaidStageExcelT() { this.Id = 0; @@ -430,7 +430,7 @@ public class WorldRaidStageExcelT this.RaidCharacterId = 0; this.BossCharacterId = null; this.AssistCharacterLimitCount = 0; - this.WorldRaidDifficulty = SCHALE.Common.FlatData.WorldRaidDifficulty.None; + this.WorldRaidDifficulty_ = SCHALE.Common.FlatData.WorldRaidDifficulty.None; this.DifficultyOpenCondition = false; this.RaidEnterAmount = 0; this.ReEnterAmount = 0; @@ -455,7 +455,7 @@ public class WorldRaidStageExcelT this.AllyPassiveSkill = null; this.AllyPassiveSkillLevel = null; this.SaveCurrentLocalBossHP = false; - this.EchelonExtensionType = SCHALE.Common.FlatData.EchelonExtensionType.Base; + this.EchelonExtensionType_ = SCHALE.Common.FlatData.EchelonExtensionType.Base; } } @@ -474,7 +474,7 @@ static public class WorldRaidStageExcelVerify && verifier.VerifyField(tablePos, 16 /*RaidCharacterId*/, 8 /*long*/, 8, false) && verifier.VerifyVectorOfData(tablePos, 18 /*BossCharacterId*/, 8 /*long*/, false) && verifier.VerifyField(tablePos, 20 /*AssistCharacterLimitCount*/, 8 /*long*/, 8, false) - && verifier.VerifyField(tablePos, 22 /*WorldRaidDifficulty*/, 4 /*SCHALE.Common.FlatData.WorldRaidDifficulty*/, 4, false) + && verifier.VerifyField(tablePos, 22 /*WorldRaidDifficulty_*/, 4 /*SCHALE.Common.FlatData.WorldRaidDifficulty*/, 4, false) && verifier.VerifyField(tablePos, 24 /*DifficultyOpenCondition*/, 1 /*bool*/, 1, false) && verifier.VerifyField(tablePos, 26 /*RaidEnterAmount*/, 8 /*long*/, 8, false) && verifier.VerifyField(tablePos, 28 /*ReEnterAmount*/, 8 /*long*/, 8, false) @@ -499,7 +499,7 @@ static public class WorldRaidStageExcelVerify && verifier.VerifyVectorOfStrings(tablePos, 66 /*AllyPassiveSkill*/, false) && verifier.VerifyVectorOfData(tablePos, 68 /*AllyPassiveSkillLevel*/, 4 /*int*/, false) && verifier.VerifyField(tablePos, 70 /*SaveCurrentLocalBossHP*/, 1 /*bool*/, 1, false) - && verifier.VerifyField(tablePos, 72 /*EchelonExtensionType*/, 4 /*SCHALE.Common.FlatData.EchelonExtensionType*/, 4, false) + && verifier.VerifyField(tablePos, 72 /*EchelonExtensionType_*/, 4 /*SCHALE.Common.FlatData.EchelonExtensionType*/, 4, false) && verifier.VerifyTableEnd(tablePos); } } diff --git a/SCHALE.Common/NetworkProtocol/protos.cs b/SCHALE.Common/NetworkProtocol/protos.cs index a2979ac..d0a1924 100644 --- a/SCHALE.Common/NetworkProtocol/protos.cs +++ b/SCHALE.Common/NetworkProtocol/protos.cs @@ -8862,6 +8862,8 @@ namespace SCHALE.Common.NetworkProtocol return NetworkProtocol.Protocol.None; } } + + public List ScenarioCollectionDBs; public List ScenarioHistoryDBs { get; set; } public List ScenarioGroupHistoryDBs { get; set; } } diff --git a/SCHALE.GameServer/Controllers/Api/ProtocolHandlers/Account.cs b/SCHALE.GameServer/Controllers/Api/ProtocolHandlers/Account.cs index c981da9..d642aec 100644 --- a/SCHALE.GameServer/Controllers/Api/ProtocolHandlers/Account.cs +++ b/SCHALE.GameServer/Controllers/Api/ProtocolHandlers/Account.cs @@ -3,6 +3,7 @@ using SCHALE.Common.Database.ModelExtensions; using SCHALE.Common.FlatData; using SCHALE.Common.NetworkProtocol; using SCHALE.GameServer.Services; +using static Microsoft.EntityFrameworkCore.DbLoggerCategory.Database; namespace SCHALE.GameServer.Controllers.Api.ProtocolHandlers { @@ -58,8 +59,7 @@ namespace SCHALE.GameServer.Controllers.Api.ProtocolHandlers if (req.SessionKey is null || req.SessionKey.AccountServerId == 0) { return new ErrorPacket() { ErrorCode = WebAPIErrorCode.AccountAuthNotCreated }; - } - else + } else { var account = sessionKeyService.GetAccount(req.SessionKey); @@ -229,6 +229,7 @@ namespace SCHALE.GameServer.Controllers.Api.ProtocolHandlers context.SaveChanges(); var favCharacter = defaultCharacters.Find(x => x.FavoriteCharacter); + if (favCharacter is not null) { account.RepresentCharacterServerId = (int) @@ -248,7 +249,7 @@ namespace SCHALE.GameServer.Controllers.Api.ProtocolHandlers .Select(x => x.ServerId) .Append(0) .ToList(), - SupportSlotServerIds = [0, 0] + SupportSlotServerIds = [0, 0], } ); } @@ -279,6 +280,66 @@ namespace SCHALE.GameServer.Controllers.Api.ProtocolHandlers return new AccountLoginSyncResponse() { + CafeGetInfoResponse = new CafeGetInfoResponse() + { + CafeDBs = [ + new CafeDB() { + CafeDBId = 3091193, + CafeId = 1, + AccountId = 1, + CafeRank = 1, + LastUpdate = DateTime.Parse("2024-04-21T07: 29: 57"), + LastSummonDate = DateTime.Parse("0001-01-01T00: 00: 00"), + IsNew = true, + CafeVisitCharacterDBs = new Dictionary() + { + { 26008, new CafeCharacterDB() { UniqueId = 26008 } }, + { 10005, new CafeCharacterDB() { UniqueId = 10005 } }, + { 13004, new CafeCharacterDB() { UniqueId = 13004 } }, + { 10058, new CafeCharacterDB() { UniqueId = 10058 } }, + }, + + FurnitureDBs = [ + new() { Location = Common.FlatData.FurnitureLocation.Floor, CafeDBId = 3091193, ItemDeploySequence = 368862451, ServerId = 368862451, UniqueId = 1, StackCount = 1}, + new() { Location = Common.FlatData.FurnitureLocation.WallRight, CafeDBId = 3091193, ItemDeploySequence = 368862452, ServerId = 368862452, UniqueId = 2, StackCount = 1}, + new() { Location = Common.FlatData.FurnitureLocation.WallLeft, CafeDBId = 3091193, ItemDeploySequence = 368862453, ServerId = 368862453, UniqueId = 3, StackCount = 1}, + new() { Location = Common.FlatData.FurnitureLocation.WallRight, CafeDBId = 3091193, PositionX = 8.5f, PositionY = 3.0f, ItemDeploySequence = 368862454, ServerId = 368862454, UniqueId = 4, StackCount = 1}, + new() { Location = Common.FlatData.FurnitureLocation.Floor, CafeDBId = 3091193, PositionX = 3.0f, PositionY = 1.5f, Rotation = 270.0f, ItemDeploySequence = 368862455, ServerId = 368862455, UniqueId = 5, StackCount = 1}, + new() { Location = Common.FlatData.FurnitureLocation.Floor, CafeDBId = 3091193, PositionX = 7.5f, PositionY = 8.5f, ItemDeploySequence = 368862456, ServerId = 368862456, UniqueId = 6, StackCount = 1}, + new() { Location = Common.FlatData.FurnitureLocation.Floor, CafeDBId = 3091193, PositionX = 7.5f, PositionY = 6.5f, ItemDeploySequence = 368862457, ServerId = 368862457, UniqueId = 7, StackCount = 1}, + new() { Location = Common.FlatData.FurnitureLocation.Floor, CafeDBId = 3091193, PositionX = 9.5f, PositionY = 8.5f, ItemDeploySequence = 368862458, ServerId = 368862458, UniqueId = 8, StackCount = 1}, + new() { Location = Common.FlatData.FurnitureLocation.Floor, CafeDBId = 3091193, PositionX = 4.5f, PositionY = 0.5f, ItemDeploySequence = 368862459, ServerId = 368862459, UniqueId = 9, StackCount = 1}, + new() { Location = Common.FlatData.FurnitureLocation.Floor, CafeDBId = 3091193, PositionX = 7.5f, PositionY = 8.5f, ItemDeploySequence = 368862460, ServerId = 368862460, UniqueId = 10, StackCount = 1}, + new() { Location = Common.FlatData.FurnitureLocation.WallLeft, CafeDBId = 3091193, PositionX = 7.5f, PositionY = 3.0f, ItemDeploySequence = 368862461, ServerId = 368862461, UniqueId = 11, StackCount = 1} + ], + + ProductionAppliedTime = DateTime.Parse("2024-04-21T07: 29: 50"), + + ProductionDB = new () { + CafeDBId = 3091193, + AppliedDate = DateTime.Parse("2024-04-21T07: 29: 50"), + ProductionParcelInfos = [ + new() { Key = { Type = ParcelType.Currency, Id = 1 } }, + new() { Key = { Type = ParcelType.Currency, Id = 5 } } + ], + } + }, + ], + + FurnitureDBs = [ + new() { Location = FurnitureLocation.Floor, CafeDBId = 3091193, ItemDeploySequence = 368862451, ServerId = 368862451, UniqueId = 1, StackCount = 1}, + new() { Location = FurnitureLocation.WallRight, CafeDBId = 3091193, ItemDeploySequence = 368862452, ServerId = 368862452, UniqueId = 2, StackCount = 1}, + new() { Location = FurnitureLocation.WallLeft, CafeDBId = 3091193, ItemDeploySequence = 368862453, ServerId = 368862453, UniqueId = 3, StackCount = 1}, + new() { Location = FurnitureLocation.WallRight, CafeDBId = 3091193, PositionX = 8.5f, PositionY = 3.0f, ItemDeploySequence = 368862454, ServerId = 368862454, UniqueId = 4, StackCount = 1}, + new() { Location = FurnitureLocation.Floor, CafeDBId = 3091193, PositionX = 3.0f, PositionY = 1.5f, Rotation = 270.0f, ItemDeploySequence = 368862455, ServerId = 368862455, UniqueId = 5, StackCount = 1}, + new() { Location = FurnitureLocation.Floor, CafeDBId = 3091193, PositionX = 7.5f, PositionY = 8.5f, ItemDeploySequence = 368862456, ServerId = 368862456, UniqueId = 6, StackCount = 1}, + new() { Location = FurnitureLocation.Floor, CafeDBId = 3091193, PositionX = 7.5f, PositionY = 6.5f, ItemDeploySequence = 368862457, ServerId = 368862457, UniqueId = 7, StackCount = 1}, + new() { Location = FurnitureLocation.Floor, CafeDBId = 3091193, PositionX = 9.5f, PositionY = 8.5f, ItemDeploySequence = 368862458, ServerId = 368862458, UniqueId = 8, StackCount = 1}, + new() { Location = FurnitureLocation.Floor, CafeDBId = 3091193, PositionX = 4.5f, PositionY = 0.5f, ItemDeploySequence = 368862459, ServerId = 368862459, UniqueId = 9, StackCount = 1}, + new() { Location = FurnitureLocation.Floor, CafeDBId = 3091193, PositionX = 7.5f, PositionY = 8.5f, ItemDeploySequence = 368862460, ServerId = 368862460, UniqueId = 10, StackCount = 1}, + new() { Location = FurnitureLocation.WallLeft, CafeDBId = 3091193, PositionX = 7.5f, PositionY = 3.0f, ItemDeploySequence = 368862461, ServerId = 368862461, UniqueId = 11, StackCount = 1}], + + }, AccountCurrencySyncResponse = new AccountCurrencySyncResponse() { AccountCurrencyDB = new AccountCurrencyDB @@ -443,7 +504,7 @@ namespace SCHALE.GameServer.Controllers.Api.ProtocolHandlers ScenarioListResponse = new ScenarioListResponse() { - ScenarioHistoryDBs = [.. account.Scenarios] + //ScenarioHistoryDBs = [.. account.Scenarios] }, EliminateRaidLoginResponse = new EliminateRaidLoginResponse() @@ -468,10 +529,11 @@ namespace SCHALE.GameServer.Controllers.Api.ProtocolHandlers x.AccountServerId == sessionKeyService.GetAccount(req.SessionKey).ServerId ) ?.TutorialIds; - return new AccountGetTutorialResponse() { - TutorialIds = tutorialIds ?? Enumerable.Range(1, 27).Select(i => (long)i).ToList() + //TutorialIds = tutorialIds ?? Enumerable.Range(1, 27).Select(i => (long)i).ToList() + TutorialIds = [1, 2, 3, 4, 5, 6, 7, 22, 8, 12, 13, 14, 15, 10, 23] + //TutorialIds = [] }; } @@ -490,8 +552,7 @@ namespace SCHALE.GameServer.Controllers.Api.ProtocolHandlers TutorialIds = req.TutorialIds }; context.AccountTutorials.Add(tutorial); - } - else + } else { tutorial.TutorialIds = req.TutorialIds; } @@ -619,6 +680,111 @@ namespace SCHALE.GameServer.Controllers.Api.ProtocolHandlers return new FriendGetIdCardResponse(); } - + [ProtocolHandler(Protocol.Cafe_Get)] + public ResponsePacket Cafe_Get(CafeGetInfoRequest req) + { + + List cafeDBs = [ + new CafeDB() { + CafeDBId = 3091193, + CafeId = 1, + AccountId = 1, + CafeRank = 1, + LastUpdate = DateTime.Parse("2024-04-21T07: 29: 57"), + LastSummonDate = DateTime.Parse("0001-01-01T00: 00: 00"), + IsNew = true, + CafeVisitCharacterDBs = new Dictionary() + { + { 26008, new CafeCharacterDB() { UniqueId = 26008 } }, + { 10005, new CafeCharacterDB() { UniqueId = 10005 } }, + { 13004, new CafeCharacterDB() { UniqueId = 13004 } }, + { 10058, new CafeCharacterDB() { UniqueId = 10058 } }, + }, + + FurnitureDBs = [ + new() { Location = Common.FlatData.FurnitureLocation.Floor, CafeDBId = 3091193, ItemDeploySequence = 368862451, ServerId = 368862451, UniqueId = 1, StackCount = 1}, + new() { Location = Common.FlatData.FurnitureLocation.WallRight, CafeDBId = 3091193, ItemDeploySequence = 368862452, ServerId = 368862452, UniqueId = 2, StackCount = 1}, + new() { Location = Common.FlatData.FurnitureLocation.WallLeft, CafeDBId = 3091193, ItemDeploySequence = 368862453, ServerId = 368862453, UniqueId = 3, StackCount = 1}, + new() { Location = Common.FlatData.FurnitureLocation.WallRight, CafeDBId = 3091193, PositionX = 8.5f, PositionY = 3.0f, ItemDeploySequence = 368862454, ServerId = 368862454, UniqueId = 4, StackCount = 1}, + new() { Location = Common.FlatData.FurnitureLocation.Floor, CafeDBId = 3091193, PositionX = 3.0f, PositionY = 1.5f, Rotation = 270.0f, ItemDeploySequence = 368862455, ServerId = 368862455, UniqueId = 5, StackCount = 1}, + new() { Location = Common.FlatData.FurnitureLocation.Floor, CafeDBId = 3091193, PositionX = 7.5f, PositionY = 8.5f, ItemDeploySequence = 368862456, ServerId = 368862456, UniqueId = 6, StackCount = 1}, + new() { Location = Common.FlatData.FurnitureLocation.Floor, CafeDBId = 3091193, PositionX = 7.5f, PositionY = 6.5f, ItemDeploySequence = 368862457, ServerId = 368862457, UniqueId = 7, StackCount = 1}, + new() { Location = Common.FlatData.FurnitureLocation.Floor, CafeDBId = 3091193, PositionX = 9.5f, PositionY = 8.5f, ItemDeploySequence = 368862458, ServerId = 368862458, UniqueId = 8, StackCount = 1}, + new() { Location = Common.FlatData.FurnitureLocation.Floor, CafeDBId = 3091193, PositionX = 4.5f, PositionY = 0.5f, ItemDeploySequence = 368862459, ServerId = 368862459, UniqueId = 9, StackCount = 1}, + new() { Location = Common.FlatData.FurnitureLocation.Floor, CafeDBId = 3091193, PositionX = 7.5f, PositionY = 8.5f, ItemDeploySequence = 368862460, ServerId = 368862460, UniqueId = 10, StackCount = 1}, + new() { Location = Common.FlatData.FurnitureLocation.WallLeft, CafeDBId = 3091193, PositionX = 7.5f, PositionY = 3.0f, ItemDeploySequence = 368862461, ServerId = 368862461, UniqueId = 11, StackCount = 1} + ], + + ProductionAppliedTime = DateTime.Parse("2024-04-21T07: 29: 50"), + + ProductionDB = new () { + CafeDBId = 3091193, + AppliedDate = DateTime.Parse("2024-04-21T07: 29: 50"), + ProductionParcelInfos = [ + new() { Key = { Type = ParcelType.Currency, Id = 1 } }, + new() { Key = { Type = ParcelType.Currency, Id = 5 } } + ], + } + }, + ]; + + var characterExcel = excelTableService.GetTable().UnPack().DataList; + + var allCharacters = characterExcel.Where(x => + x is + { + IsPlayable: true, + IsPlayableCharacter: true, + IsNpc: false, + ProductionStep: ProductionStep.Release, + } + ).Select(x => x.Id).ToList(); + + + + var cafeVisitCharacterDBs = allCharacters.Take(10).ToDictionary(id => id, id => new CafeCharacterDB { UniqueId = id }); + + //cafeVisitCharacterDBs.Add(1, new CafeCharacterDB()); + + cafeDBs[0].CafeVisitCharacterDBs = cafeVisitCharacterDBs; + + return new CafeGetInfoResponse() + { + CafeDBs = cafeDBs, + + FurnitureDBs = [ + new() { Location = FurnitureLocation.Floor, CafeDBId = 3091193, ItemDeploySequence = 368862451, ServerId = 368862451, UniqueId = 1, StackCount = 1}, + new() { Location = FurnitureLocation.WallRight, CafeDBId = 3091193, ItemDeploySequence = 368862452, ServerId = 368862452, UniqueId = 2, StackCount = 1}, + new() { Location = FurnitureLocation.WallLeft, CafeDBId = 3091193, ItemDeploySequence = 368862453, ServerId = 368862453, UniqueId = 3, StackCount = 1}, + new() { Location = FurnitureLocation.WallRight, CafeDBId = 3091193, PositionX = 8.5f, PositionY = 3.0f, ItemDeploySequence = 368862454, ServerId = 368862454, UniqueId = 4, StackCount = 1}, + new() { Location = FurnitureLocation.Floor, CafeDBId = 3091193, PositionX = 3.0f, PositionY = 1.5f, Rotation = 270.0f, ItemDeploySequence = 368862455, ServerId = 368862455, UniqueId = 5, StackCount = 1}, + new() { Location = FurnitureLocation.Floor, CafeDBId = 3091193, PositionX = 7.5f, PositionY = 8.5f, ItemDeploySequence = 368862456, ServerId = 368862456, UniqueId = 6, StackCount = 1}, + new() { Location = FurnitureLocation.Floor, CafeDBId = 3091193, PositionX = 7.5f, PositionY = 6.5f, ItemDeploySequence = 368862457, ServerId = 368862457, UniqueId = 7, StackCount = 1}, + new() { Location = FurnitureLocation.Floor, CafeDBId = 3091193, PositionX = 9.5f, PositionY = 8.5f, ItemDeploySequence = 368862458, ServerId = 368862458, UniqueId = 8, StackCount = 1}, + new() { Location = FurnitureLocation.Floor, CafeDBId = 3091193, PositionX = 4.5f, PositionY = 0.5f, ItemDeploySequence = 368862459, ServerId = 368862459, UniqueId = 9, StackCount = 1}, + new() { Location = FurnitureLocation.Floor, CafeDBId = 3091193, PositionX = 7.5f, PositionY = 8.5f, ItemDeploySequence = 368862460, ServerId = 368862460, UniqueId = 10, StackCount = 1}, + new() { Location = FurnitureLocation.WallLeft, CafeDBId = 3091193, PositionX = 7.5f, PositionY = 3.0f, ItemDeploySequence = 368862461, ServerId = 368862461, UniqueId = 11, StackCount = 1}], + }; + } + + [ProtocolHandler(Protocol.Cafe_Ack)] + public ResponsePacket Cafe_Ack(CafeAckRequest req) + { + return new CafeAckResponse(); + } + + [ProtocolHandler(Protocol.Cafe_Open)] + public ResponsePacket Cafe_Open(CafeOpenRequest req) + { + return new CafeOpenResponse(); + } + + [ProtocolHandler(Protocol.Cafe_Interact)] + public ResponsePacket Cafe_Interact(CafeInteractWithCharacterRequest req) + { + return new CafeInteractWithCharacterResponse(); + } + + } } diff --git a/SCHALE.GameServer/Services/ExcelTableService.cs b/SCHALE.GameServer/Services/ExcelTableService.cs index cbf0ad5..a403700 100644 --- a/SCHALE.GameServer/Services/ExcelTableService.cs +++ b/SCHALE.GameServer/Services/ExcelTableService.cs @@ -42,6 +42,9 @@ namespace SCHALE.GameServer.Services using (var zip = ZipFile.Read(excelZipPath)) { zip.Password = Convert.ToBase64String(TableService.CreatePassword(Path.GetFileName(excelZipPath))); + + //Log.Information("password: " + Convert.ToBase64String(TableService.CreatePassword(Path.GetFileName(excelZipPath)))); + zip.ExtractAll(excelDir, ExtractExistingFileAction.OverwriteSilently); } diff --git a/SCHALE.GameServer/Services/SharedDataCacheService.cs b/SCHALE.GameServer/Services/SharedDataCacheService.cs index 6d03aab..a27da61 100644 --- a/SCHALE.GameServer/Services/SharedDataCacheService.cs +++ b/SCHALE.GameServer/Services/SharedDataCacheService.cs @@ -41,7 +41,7 @@ namespace SCHALE.GameServer.Services IsPlayable: true, IsPlayableCharacter: true, IsDummy: false, - IsNPC: false, + IsNpc: false, ProductionStep: ProductionStep.Release, }) .ToList(); diff --git a/SCHALE.GameServer/Utils/Config.cs b/SCHALE.GameServer/Utils/Config.cs index 6b9a4f9..86703fe 100644 --- a/SCHALE.GameServer/Utils/Config.cs +++ b/SCHALE.GameServer/Utils/Config.cs @@ -14,7 +14,7 @@ namespace SCHALE.GameServer.Utils public string IRCAddress { get; set; } = "127.0.0.1"; public int IRCPort { get; set; } = 6667; - public string VersionId { get; set; } = "r67_utfwo6vcvx7rhl017phc"; + public string VersionId { get; set; } = "r73_6chhs5tfm4odqqb24x75"; public static void Load() { diff --git a/SCHALE.GameServer/Utils/InventoryUtils.cs b/SCHALE.GameServer/Utils/InventoryUtils.cs index 065dca4..3fa5235 100644 --- a/SCHALE.GameServer/Utils/InventoryUtils.cs +++ b/SCHALE.GameServer/Utils/InventoryUtils.cs @@ -22,7 +22,7 @@ namespace SCHALE.Common.Utils { IsPlayable: true, IsPlayableCharacter: true, - IsNPC: false, + IsNpc: false, ProductionStep: ProductionStep.Release, } ).Select(x => CreateMaxCharacterFromId(x.Id)).ToList(); @@ -123,14 +123,24 @@ namespace SCHALE.Common.Utils var account = connection.Account; var context = connection.Context; - var memoryLobbyExcel = connection.ExcelTableService.GetTable().UnPack().DataList; - var allMemoryLobbies = memoryLobbyExcel.Select(x => - { - return new MemoryLobbyDB() + var characterExcel = connection.ExcelTableService.GetTable().UnPack().DataList; + var allCharacters = characterExcel.Where(x => + x is { - MemoryLobbyUniqueId = x.Id, - }; - }).ToList(); + IsPlayable: true, + IsPlayableCharacter: true, + IsNpc: false, + ProductionStep: ProductionStep.Release, + } + ).Select(x => x.Id).ToList(); + + var allMemoryLobbies = allCharacters.Select(x => + { + return new MemoryLobbyDB() + { + MemoryLobbyUniqueId = x, + }; + }).ToList(); account.AddMemoryLobbies(context, [.. allMemoryLobbies]); context.SaveChanges(); @@ -143,16 +153,16 @@ namespace SCHALE.Common.Utils var account = connection.Account; var context = connection.Context; - var scenarioModeExcel = connection.ExcelTableService.GetTable().UnPack().DataList; - var allScenarios = scenarioModeExcel.Select(x => - { - return new ScenarioHistoryDB() - { - ScenarioUniqueId = x.ModeId, - }; - }).ToList(); + //var scenarioModeExcel = connection.ExcelTableService.GetTable().UnPack().DataList; + //var allScenarios = scenarioModeExcel.Select(x => + //{ + // return new ScenarioHistoryDB() + // { + // ScenarioUniqueId = x.ModeId, + // }; + //}).ToList(); - account.AddScenarios(context, [.. allScenarios]); + //account.AddScenarios(context, [.. allScenarios]); context.SaveChanges(); connection.SendChatMessage("Added all Scenarios!"); diff --git a/SCHALE.GameServer/appsettings.json b/SCHALE.GameServer/appsettings.json index 28bd5bf..813dd50 100644 --- a/SCHALE.GameServer/appsettings.json +++ b/SCHALE.GameServer/appsettings.json @@ -18,7 +18,6 @@ "SQL Provider": "SQLServer", "ConnectionStrings": { "SQLite3": "Data Source=schale.sqlite3", - "SQLServer": "data source=localhost\\SQLEXPRESS;initial catalog=schale;trusted_connection=true;TrustServerCertificate=True" + "SQLServer": "data source=localhost\\SQLEXPRESS01;initial catalog=schale;trusted_connection=true;TrustServerCertificate=True" }, - "AllowedHosts": "*" -} + "AllowedHosts": "*"}