From e6e7514c37a337a70030ef572c49fd72bcc00783 Mon Sep 17 00:00:00 2001 From: raphaeIl Date: Mon, 30 Dec 2024 17:20:43 -0500 Subject: [PATCH] Update to the REAL Latest FlatData, previous one was incorrectly generated --- .../FlatData/AcademyLocationExcel.cs | 6 +- .../FlatData/AcademyMessageConditions.cs | 2 +- SCHALE.Common/FlatData/AcademyMessageTypes.cs | 2 +- .../FlatData/AcademyMessanger1Excel.cs | 12 +- .../FlatData/AcademyMessanger2Excel.cs | 12 +- .../FlatData/AcademyMessanger3Excel.cs | 12 +- .../FlatData/AcademyMessangerExcel.cs | 12 +- SCHALE.Common/FlatData/AimIKType.cs | 2 +- .../FlatData/AmplifyDoTRemoveCondition.cs | 2 +- SCHALE.Common/FlatData/Anniversary.cs | 2 +- SCHALE.Common/FlatData/ArenaRewardExcel.cs | 18 +- SCHALE.Common/FlatData/ArenaRewardType.cs | 2 +- .../FlatData/AssistEchelonTypeConvertExcel.cs | 12 +- SCHALE.Common/FlatData/AttendanceExcel.cs | 36 +-- .../FlatData/BillingTransactionEndType.cs | 2 +- SCHALE.Common/FlatData/BossExternalBTExcel.cs | 54 ++-- SCHALE.Common/FlatData/BuffIconType.cs | 2 +- SCHALE.Common/FlatData/BuffType.cs | 2 +- .../FlatData/BulletArmorDamageFactorExcel.cs | 54 ++-- SCHALE.Common/FlatData/BulletType.cs | 2 +- SCHALE.Common/FlatData/CafeCharacterState.cs | 2 +- .../FlatData/CafeInteractionExcel.cs | 6 +- SCHALE.Common/FlatData/CafeProductionExcel.cs | 6 +- SCHALE.Common/FlatData/CampaignStageExcel.cs | 78 +++--- .../FlatData/CampaignStageRewardExcel.cs | 24 +- .../FlatData/CampaignStrategyObjectExcel.cs | 24 +- SCHALE.Common/FlatData/CampaignUnitExcel.cs | 12 +- SCHALE.Common/FlatData/CharacterAIExcel.cs | 18 +- .../CharacterCalculationLimitExcel.cs | 18 +- .../FlatData/CharacterDialogEventExcel.cs | 108 ++++---- .../FlatData/CharacterDialogExcel.cs | 108 ++++---- .../FlatData/CharacterDialogFieldExcel.cs | 6 +- SCHALE.Common/FlatData/CharacterExcel.cs | 234 +++++++++--------- SCHALE.Common/FlatData/CharacterGearExcel.cs | 18 +- .../FlatData/CharacterPotentialExcel.cs | 18 +- .../FlatData/CharacterPotentialRewardExcel.cs | 6 +- .../FlatData/CharacterStatLimitExcel.cs | 36 +-- .../FlatData/CharacterStatsTransExcel.cs | 42 ++-- SCHALE.Common/FlatData/CharacterVoiceExcel.cs | 18 +- .../FlatData/CharacterWeaponExcel.cs | 18 +- .../FlatData/CharacterWeaponExpBonusExcel.cs | 18 +- SCHALE.Common/FlatData/ClanAssistSlotExcel.cs | 18 +- SCHALE.Common/FlatData/ClanRewardExcel.cs | 42 ++-- SCHALE.Common/FlatData/ClanRewardType.cs | 2 +- SCHALE.Common/FlatData/ClanSocialGrade.cs | 2 +- SCHALE.Common/FlatData/ClearCheck.cs | 2 +- SCHALE.Common/FlatData/ClearDeckRuleExcel.cs | 18 +- SCHALE.Common/FlatData/Club.cs | 2 +- .../FlatData/CollectionUnlockType.cs | 2 +- SCHALE.Common/FlatData/CombatEmojiExcel.cs | 18 +- .../FlatData/ConquestCalculateExcel.cs | 6 +- .../FlatData/ConquestConditionType.cs | 2 +- SCHALE.Common/FlatData/ConquestEnemyType.cs | 2 +- .../FlatData/ConquestErosionExcel.cs | 12 +- SCHALE.Common/FlatData/ConquestErosionType.cs | 2 +- SCHALE.Common/FlatData/ConquestEventExcel.cs | 18 +- SCHALE.Common/FlatData/ConquestEventType.cs | 2 +- SCHALE.Common/FlatData/ConquestItemType.cs | 2 +- SCHALE.Common/FlatData/ConquestMapExcel.cs | 6 +- SCHALE.Common/FlatData/ConquestObjectExcel.cs | 24 +- SCHALE.Common/FlatData/ConquestObjectType.cs | 2 +- .../FlatData/ConquestProgressResourceExcel.cs | 6 +- .../FlatData/ConquestProgressType.cs | 2 +- SCHALE.Common/FlatData/ConquestRewardExcel.cs | 24 +- SCHALE.Common/FlatData/ConquestStepExcel.cs | 12 +- SCHALE.Common/FlatData/ConquestTeamType.cs | 2 +- SCHALE.Common/FlatData/ConquestTileExcel.cs | 30 +-- SCHALE.Common/FlatData/ConquestTileType.cs | 2 +- .../FlatData/ConquestUnexpectedEventExcel.cs | 6 +- SCHALE.Common/FlatData/ConquestUnitExcel.cs | 60 ++--- SCHALE.Common/FlatData/ConstArenaExcel.cs | 6 +- SCHALE.Common/FlatData/ConstCommonExcel.cs | 16 +- .../FlatData/ContentEnterCostReduceExcel.cs | 24 +- SCHALE.Common/FlatData/ContentLockType.cs | 2 +- .../FlatData/ContentSpoilerPopupExcel.cs | 18 +- SCHALE.Common/FlatData/ContentType.cs | 2 +- SCHALE.Common/FlatData/ContentsChangeType.cs | 2 +- .../FlatData/ContentsScenarioExcel.cs | 18 +- .../FlatData/ContentsShortcutExcel.cs | 24 +- SCHALE.Common/FlatData/CostumeExcel.cs | 54 ++-- SCHALE.Common/FlatData/CouponStuffExcel.cs | 18 +- SCHALE.Common/FlatData/CurrencyExcel.cs | 78 +++--- SCHALE.Common/FlatData/DailyRefillType.cs | 2 +- .../FlatData/DefaultFurnitureExcel.cs | 6 +- SCHALE.Common/FlatData/DefaultMailExcel.cs | 18 +- SCHALE.Common/FlatData/DefaultParcelExcel.cs | 18 +- .../FlatData/DialogConditionDetail.cs | 2 +- .../FlatData/DreamMakerEndingCondition.cs | 2 +- .../FlatData/DreamMakerEndingRewardType.cs | 2 +- .../FlatData/DreamMakerEndingType.cs | 2 +- .../FlatData/DreamMakerMultiplierCondition.cs | 2 +- .../FlatData/DreamMakerParamOperationType.cs | 2 +- .../FlatData/DreamMakerParameterType.cs | 2 +- SCHALE.Common/FlatData/DreamMakerResult.cs | 2 +- .../FlatData/DreamMakerVoiceCondition.cs | 2 +- SCHALE.Common/FlatData/DuplicateBonusExcel.cs | 24 +- .../FlatData/EchelonConstraintExcel.cs | 60 ++--- SCHALE.Common/FlatData/EchelonType.cs | 2 +- SCHALE.Common/FlatData/EffectBone.cs | 2 +- .../FlatData/EliminateRaidStageExcel.cs | 60 ++--- .../FlatData/EliminateRaidStageRewardExcel.cs | 6 +- SCHALE.Common/FlatData/EmblemCategory.cs | 2 +- SCHALE.Common/FlatData/EmblemCheckPassType.cs | 2 +- SCHALE.Common/FlatData/EmblemExcel.cs | 30 +-- SCHALE.Common/FlatData/EndCondition.cs | 2 +- SCHALE.Common/FlatData/EquipmentExcel.cs | 36 +-- SCHALE.Common/FlatData/EquipmentOptionType.cs | 2 +- SCHALE.Common/FlatData/EquipmentStatExcel.cs | 36 +-- SCHALE.Common/FlatData/EtcSchool.cs | 2 +- .../FlatData/EventContentBuffExcel.cs | 6 +- .../FlatData/EventContentBuffFindRule.cs | 2 +- .../FlatData/EventContentCardShopExcel.cs | 18 +- .../FlatData/EventContentChangeExcel.cs | 12 +- .../FlatData/EventContentCollectionExcel.cs | 24 +- .../FlatData/EventContentCurrencyItemExcel.cs | 18 +- .../FlatData/EventContentDebuffRewardExcel.cs | 18 +- .../EventContentDiceRaceEffectExcel.cs | 18 +- .../FlatData/EventContentDiceRaceNodeExcel.cs | 18 +- .../FlatData/EventContentDiceRaceProbExcel.cs | 18 +- .../FlatData/EventContentLobbyMenuExcel.cs | 18 +- .../FlatData/EventContentLocationExcel.cs | 12 +- .../FlatData/EventContentMeetupExcel.cs | 12 +- .../FlatData/EventContentMissionExcel.cs | 12 +- .../FlatData/EventContentNotifyExcel.cs | 36 +-- .../FlatData/EventContentReleaseType.cs | 2 +- .../EventContentScenarioConditionType.cs | 2 +- .../FlatData/EventContentScenarioExcel.cs | 12 +- .../FlatData/EventContentSeasonExcel.cs | 72 +++--- .../FlatData/EventContentShopExcel.cs | 18 +- .../EventContentSpineDialogOffsetExcel.cs | 18 +- .../FlatData/EventContentStageExcel.cs | 96 +++---- .../FlatData/EventContentStageRewardExcel.cs | 24 +- SCHALE.Common/FlatData/ExternalBTTrigger.cs | 2 +- .../FarmingDungeonLocationManageExcel.cs | 54 ++-- .../FlatData/FieldContentStageExcel.cs | 42 ++-- .../FlatData/FieldContentStageRewardExcel.cs | 24 +- SCHALE.Common/FlatData/FieldDialogType.cs | 2 +- .../FlatData/FieldInteractionType.cs | 2 +- SCHALE.Common/FlatData/FieldMasteryExcel.cs | 6 +- SCHALE.Common/FlatData/FieldRewardExcel.cs | 6 +- .../FlatData/FieldStoryStageExcel.cs | 18 +- SCHALE.Common/FlatData/FieldTutorialType.cs | 2 +- SCHALE.Common/FlatData/FloaterCommonExcel.cs | 18 +- SCHALE.Common/FlatData/FontType.cs | 2 +- SCHALE.Common/FlatData/Form.cs | 20 +- SCHALE.Common/FlatData/FurnitureExcel.cs | 54 ++-- .../FlatData/FurnitureFunctionType.cs | 2 +- SCHALE.Common/FlatData/FurnitureLocation.cs | 2 +- .../FlatData/FurnitureTemplateElementExcel.cs | 6 +- SCHALE.Common/FlatData/GachaDisplayTag.cs | 2 +- SCHALE.Common/FlatData/GachaElementExcel.cs | 36 +-- .../FlatData/GachaElementRecursiveExcel.cs | 18 +- SCHALE.Common/FlatData/GachaGroupExcel.cs | 6 +- SCHALE.Common/FlatData/GachaGroupType.cs | 2 +- SCHALE.Common/FlatData/GachaRewardType.cs | 2 +- SCHALE.Common/FlatData/GachaTicketType.cs | 2 +- .../FlatData/GetStickerConditionType.cs | 2 +- SCHALE.Common/FlatData/GoodsExcel.cs | 24 +- SCHALE.Common/FlatData/GroundExcel.cs | 36 +-- .../FlatData/GroundModuleRewardExcel.cs | 6 +- SCHALE.Common/FlatData/GroundNodeFlat.cs | 12 +- SCHALE.Common/FlatData/GroundNodeType.cs | 2 +- SCHALE.Common/FlatData/GrowthCategory.cs | 2 +- SCHALE.Common/FlatData/GuideMissionExcel.cs | 6 +- .../FlatData/GuideMissionSeasonExcel.cs | 12 +- SCHALE.Common/FlatData/GuideMissionTabType.cs | 2 +- .../FlatData/IdCardBackgroundExcel.cs | 18 +- SCHALE.Common/FlatData/ItemExcel.cs | 90 +++---- SCHALE.Common/FlatData/JudgeGrade.cs | 2 +- SCHALE.Common/FlatData/LimitedStageExcel.cs | 78 +++--- .../FlatData/LimitedStageRewardExcel.cs | 24 +- SCHALE.Common/FlatData/LocalizeErrorExcel.cs | 6 +- SCHALE.Common/FlatData/LogicEffectCategory.cs | 2 +- .../FlatData/LogicEffectCommonVisualExcel.cs | 30 +-- SCHALE.Common/FlatData/LogicEffectSound.cs | 2 +- .../FlatData/MeetupConditionPrintType.cs | 2 +- SCHALE.Common/FlatData/MeetupConditionType.cs | 2 +- SCHALE.Common/FlatData/MemoryLobbyCategory.cs | 2 +- SCHALE.Common/FlatData/MemoryLobbyExcel.cs | 36 +-- SCHALE.Common/FlatData/MessagePopupExcel.cs | 18 +- .../FlatData/MiniGameDefenseInfoExcel.cs | 6 +- .../FlatData/MiniGameDefenseStageExcel.cs | 78 +++--- .../FlatData/MiniGameDreamEndingExcel.cs | 18 +- .../MiniGameDreamEndingRewardExcel.cs | 36 +-- .../FlatData/MiniGameDreamInfoExcel.cs | 30 +-- .../FlatData/MiniGameDreamParameterExcel.cs | 6 +- .../MiniGameDreamScheduleResultExcel.cs | 24 +- .../FlatData/MiniGameMissionExcel.cs | 12 +- .../FlatData/MiniGameShootingStageExcel.cs | 18 +- .../FlatData/MiniGameTBGThemaRewardExcel.cs | 18 +- .../FlatData/MinigameDreamVoiceExcel.cs | 6 +- .../FlatData/MinigameTBGEncounterExcel.cs | 12 +- .../MinigameTBGEncounterRewardExcel.cs | 36 +-- .../FlatData/MinigameTBGItemExcel.cs | 24 +- .../FlatData/MinigameTBGObjectExcel.cs | 12 +- .../FlatData/MinigameTBGSeasonExcel.cs | 12 +- .../FlatData/MinigameTBGThemaExcel.cs | 6 +- .../FlatData/MinigameTBGVoiceExcel.cs | 6 +- .../FlatData/MissionCompleteConditionType.cs | 2 +- SCHALE.Common/FlatData/MissionExcel.cs | 18 +- SCHALE.Common/FlatData/MissionResetType.cs | 2 +- .../FlatData/MultiFloorRaidRewardExcel.cs | 6 +- .../FlatData/MultiFloorRaidStageExcel.cs | 18 +- SCHALE.Common/FlatData/Nation.cs | 2 +- SCHALE.Common/FlatData/NoticeType.cs | 2 +- SCHALE.Common/FlatData/ObstacleCoverType.cs | 2 +- .../FlatData/OpenConditionContent.cs | 2 +- SCHALE.Common/FlatData/OpenConditionExcel.cs | 18 +- SCHALE.Common/FlatData/OperatorCondition.cs | 2 +- SCHALE.Common/FlatData/OperatorExcel.cs | 18 +- .../FlatData/ParcelAutoSynthExcel.cs | 12 +- SCHALE.Common/FlatData/ParcelChangeReason.cs | 2 +- SCHALE.Common/FlatData/ParcelType.cs | 2 +- .../FlatData/PickupDuplicateBonusExcel.cs | 24 +- .../FlatData/PotentialStatBonusRateType.cs | 2 +- .../FlatData/PresetCharacterGroupExcel.cs | 18 +- SCHALE.Common/FlatData/PresetParcelsExcel.cs | 18 +- SCHALE.Common/FlatData/ProductCategory.cs | 2 +- SCHALE.Common/FlatData/ProductDisplayTag.cs | 2 +- SCHALE.Common/FlatData/ProductExcel.cs | 36 +-- SCHALE.Common/FlatData/ProductMonthlyExcel.cs | 36 +-- SCHALE.Common/FlatData/ProjectileAction.cs | 2 +- .../FlatData/ProtocolSettingExcel.cs | 18 +- .../FlatData/PurchaseCountResetType.cs | 2 +- SCHALE.Common/FlatData/PurchasePeriodType.cs | 2 +- SCHALE.Common/FlatData/PurchaseSourceType.cs | 2 +- SCHALE.Common/FlatData/PurchaseStatusCode.cs | 2 +- SCHALE.Common/FlatData/RaidSeasonType.cs | 2 +- SCHALE.Common/FlatData/RaidStageExcel.cs | 54 ++-- .../FlatData/RaidStageRewardExcel.cs | 6 +- SCHALE.Common/FlatData/RaidStatus.cs | 2 +- SCHALE.Common/FlatData/RankingSearchType.cs | 2 +- SCHALE.Common/FlatData/RecipeCraftExcel.cs | 18 +- SCHALE.Common/FlatData/RecipeExcel.cs | 18 +- .../FlatData/RecipeIngredientExcel.cs | 18 +- .../FlatData/RecipeSelectionAutoUseExcel.cs | 18 +- .../FlatData/RecipeSelectionGroupExcel.cs | 18 +- SCHALE.Common/FlatData/RecipeType.cs | 2 +- SCHALE.Common/FlatData/ResetContentType.cs | 2 +- .../FlatData/ScenarioBGEffectExcel.cs | 6 +- SCHALE.Common/FlatData/ScenarioBGNameExcel.cs | 24 +- SCHALE.Common/FlatData/ScenarioBGScroll.cs | 2 +- SCHALE.Common/FlatData/ScenarioBGType.cs | 2 +- .../FlatData/ScenarioCharacterBehaviors.cs | 2 +- .../FlatData/ScenarioCharacterNameExcel.cs | 24 +- .../FlatData/ScenarioCharacterShapes.cs | 2 +- .../ScenarioContentCollectionExcel.cs | 24 +- SCHALE.Common/FlatData/ScenarioEffectDepth.cs | 2 +- SCHALE.Common/FlatData/ScenarioExcel.cs | 46 ++-- SCHALE.Common/FlatData/ScenarioModeExcel.cs | 78 +++--- .../FlatData/ScenarioModeReplayTypes.cs | 2 +- .../FlatData/ScenarioModeRewardExcel.cs | 24 +- .../FlatData/ScenarioModeSubTypes.cs | 2 +- SCHALE.Common/FlatData/ScenarioModeTypes.cs | 2 +- SCHALE.Common/FlatData/ScenarioReplayExcel.cs | 6 +- SCHALE.Common/FlatData/ScenarioType.cs | 2 +- SCHALE.Common/FlatData/ScenarioTypes.cs | 2 +- SCHALE.Common/FlatData/School.cs | 2 +- .../FlatData/SchoolDungeonRewardExcel.cs | 24 +- .../FlatData/SchoolDungeonStageExcel.cs | 36 +-- SCHALE.Common/FlatData/SchoolDungeonType.cs | 2 +- SCHALE.Common/FlatData/ServiceActionExcel.cs | 18 +- .../FlatData/ShiftingCraftRecipeExcel.cs | 6 +- SCHALE.Common/FlatData/ShopCashExcel.cs | 18 +- SCHALE.Common/FlatData/ShopExcel.cs | 24 +- .../FlatData/ShopFilterClassifiedExcel.cs | 24 +- .../FlatData/ShopFreeRecruitExcel.cs | 6 +- SCHALE.Common/FlatData/ShopFreeRecruitType.cs | 2 +- SCHALE.Common/FlatData/ShopInfoExcel.cs | 6 +- SCHALE.Common/FlatData/ShopRecruitExcel.cs | 24 +- SCHALE.Common/FlatData/ShopRefreshExcel.cs | 6 +- SCHALE.Common/FlatData/ShortcutContentType.cs | 2 +- SCHALE.Common/FlatData/ShowSkillCutIn.cs | 2 +- SCHALE.Common/FlatData/SkillCategory.cs | 2 +- SCHALE.Common/FlatData/SkillExcel.cs | 18 +- .../FlatData/SkillPriorityCheckCondition.cs | 2 +- SCHALE.Common/FlatData/SortingTarget.cs | 2 +- SCHALE.Common/FlatData/SquadType.cs | 2 +- SCHALE.Common/FlatData/StageDifficulty.cs | 2 +- SCHALE.Common/FlatData/StarGoalType.cs | 2 +- SCHALE.Common/FlatData/StatType.cs | 2 +- .../FlatData/StickerCheckPassType.cs | 2 +- .../FlatData/StickerGetConditionType.cs | 2 +- SCHALE.Common/FlatData/StickerGroupExcel.cs | 6 +- .../FlatData/StickerPageContentExcel.cs | 54 ++-- SCHALE.Common/FlatData/StoreType.cs | 2 +- SCHALE.Common/FlatData/StoryStrategyExcel.cs | 54 ++-- SCHALE.Common/FlatData/StrategyAIType.cs | 2 +- SCHALE.Common/FlatData/StrategyEnvironment.cs | 2 +- SCHALE.Common/FlatData/StrategyObjectType.cs | 2 +- SCHALE.Common/FlatData/SubEventType.cs | 2 +- SCHALE.Common/FlatData/SystemMailExcel.cs | 18 +- SCHALE.Common/FlatData/TBGItemEffectType.cs | 2 +- SCHALE.Common/FlatData/TBGItemType.cs | 2 +- SCHALE.Common/FlatData/TBGObjectType.cs | 2 +- .../FlatData/TBGOptionSuccessType.cs | 2 +- SCHALE.Common/FlatData/TBGPortalCondition.cs | 2 +- .../FlatData/TBGProbModifyCondition.cs | 2 +- SCHALE.Common/FlatData/TBGThemaType.cs | 2 +- SCHALE.Common/FlatData/TBGTileType.cs | 2 +- SCHALE.Common/FlatData/TBGVoiceCondition.cs | 2 +- SCHALE.Common/FlatData/TacticEntityType.cs | 2 +- SCHALE.Common/FlatData/TacticEnvironment.cs | 2 +- SCHALE.Common/FlatData/TacticRole.cs | 2 +- SCHALE.Common/FlatData/TacticSkillUse.cs | 2 +- SCHALE.Common/FlatData/TacticSpeed.cs | 2 +- SCHALE.Common/FlatData/Tag.cs | 10 +- SCHALE.Common/FlatData/TagExcel.cs | 18 +- SCHALE.Common/FlatData/TargetingCellType.cs | 2 +- SCHALE.Common/FlatData/TargetingUnitType.cs | 2 +- .../FlatData/TerrainAdaptationFactorExcel.cs | 18 +- SCHALE.Common/FlatData/TileState.cs | 2 +- .../FlatData/TimeAttackDungeonExcel.cs | 18 +- .../FlatData/TimeAttackDungeonGeasExcel.cs | 18 +- .../FlatData/TimeAttackDungeonType.cs | 2 +- SCHALE.Common/FlatData/ToastExcel.cs | 18 +- SCHALE.Common/FlatData/ToastType.cs | 2 +- .../FlatData/TutorialFailureContentType.cs | 2 +- .../FlatData/TutorialFailureImageExcel.cs | 6 +- SCHALE.Common/FlatData/UnitType.cs | 2 +- SCHALE.Common/FlatData/VoiceCommonExcel.cs | 18 +- SCHALE.Common/FlatData/WeaponType.cs | 2 +- SCHALE.Common/FlatData/WebAPIErrorLevel.cs | 2 +- SCHALE.Common/FlatData/WeekDungeonExcel.cs | 54 ++-- .../FlatData/WeekDungeonGroupBuffExcel.cs | 18 +- .../FlatData/WeekDungeonOpenScheduleExcel.cs | 18 +- .../FlatData/WeekDungeonRewardExcel.cs | 12 +- SCHALE.Common/FlatData/WeekDungeonType.cs | 2 +- .../FlatData/WorldRaidConditionExcel.cs | 18 +- SCHALE.Common/FlatData/WorldRaidDifficulty.cs | 2 +- SCHALE.Common/FlatData/WorldRaidStageExcel.cs | 36 +-- .../FlatData/WorldRaidStageRewardExcel.cs | 6 +- SCHALE.GameServer/Commands/CafeCommand.cs | 2 +- .../Api/ProtocolHandlers/Account.cs | 6 +- .../Api/ProtocolHandlers/Character.cs | 12 +- .../Services/SharedDataCacheService.cs | 8 +- .../Services/WeekDungeonService.cs | 2 +- SCHALE.GameServer/Utils/InventoryUtils.cs | 2 +- 338 files changed, 2505 insertions(+), 2505 deletions(-) diff --git a/SCHALE.Common/FlatData/AcademyLocationExcel.cs b/SCHALE.Common/FlatData/AcademyLocationExcel.cs index ecccf2e..cb327cc 100644 --- a/SCHALE.Common/FlatData/AcademyLocationExcel.cs +++ b/SCHALE.Common/FlatData/AcademyLocationExcel.cs @@ -52,7 +52,7 @@ public struct AcademyLocationExcel : IFlatbufferObject public ArraySegment? GetOpenConditionCountBytes() { return __p.__vector_as_arraysegment(14); } #endif public long[] GetOpenConditionCountArray() { return __p.__vector_as_array(14); } - public SCHALE.Common.FlatData.ParcelType RewardParcelType { get { int o = __p.__offset(16); return o != 0 ? (SCHALE.Common.FlatData.ParcelType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.ParcelType.None_; } } + public SCHALE.Common.FlatData.ParcelType RewardParcelType { get { int o = __p.__offset(16); 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(18); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public long OpenTeacherRank { get { int o = __p.__offset(20); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } @@ -63,7 +63,7 @@ public struct AcademyLocationExcel : IFlatbufferObject StringOffset IconImagePathOffset = default(StringOffset), VectorOffset OpenConditionOffset = default(VectorOffset), VectorOffset OpenConditionCountOffset = default(VectorOffset), - SCHALE.Common.FlatData.ParcelType RewardParcelType = SCHALE.Common.FlatData.ParcelType.None_, + SCHALE.Common.FlatData.ParcelType RewardParcelType = SCHALE.Common.FlatData.ParcelType.None, long RewardParcelId = 0, long OpenTeacherRank = 0) { builder.StartTable(9); @@ -169,7 +169,7 @@ public class AcademyLocationExcelT this.IconImagePath = null; this.OpenCondition = null; this.OpenConditionCount = null; - this.RewardParcelType = SCHALE.Common.FlatData.ParcelType.None_; + this.RewardParcelType = SCHALE.Common.FlatData.ParcelType.None; this.RewardParcelId = 0; this.OpenTeacherRank = 0; } diff --git a/SCHALE.Common/FlatData/AcademyMessageConditions.cs b/SCHALE.Common/FlatData/AcademyMessageConditions.cs index 3c6db1f..2da20bc 100644 --- a/SCHALE.Common/FlatData/AcademyMessageConditions.cs +++ b/SCHALE.Common/FlatData/AcademyMessageConditions.cs @@ -7,7 +7,7 @@ namespace SCHALE.Common.FlatData public enum AcademyMessageConditions : int { - None_ = 0, + None = 0, FavorRankUp = 1, AcademySchedule = 2, Answer = 3, diff --git a/SCHALE.Common/FlatData/AcademyMessageTypes.cs b/SCHALE.Common/FlatData/AcademyMessageTypes.cs index 130fe24..df511c9 100644 --- a/SCHALE.Common/FlatData/AcademyMessageTypes.cs +++ b/SCHALE.Common/FlatData/AcademyMessageTypes.cs @@ -7,7 +7,7 @@ namespace SCHALE.Common.FlatData public enum AcademyMessageTypes : int { - None_ = 0, + None = 0, Text = 1, Image = 2, }; diff --git a/SCHALE.Common/FlatData/AcademyMessanger1Excel.cs b/SCHALE.Common/FlatData/AcademyMessanger1Excel.cs index 3fa3791..f05ee9f 100644 --- a/SCHALE.Common/FlatData/AcademyMessanger1Excel.cs +++ b/SCHALE.Common/FlatData/AcademyMessanger1Excel.cs @@ -23,14 +23,14 @@ public struct AcademyMessanger1Excel : IFlatbufferObject public long MessageGroupId { 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 long CharacterId { get { int o = __p.__offset(8); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } - public SCHALE.Common.FlatData.AcademyMessageConditions MessageCondition { get { int o = __p.__offset(10); return o != 0 ? (SCHALE.Common.FlatData.AcademyMessageConditions)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.AcademyMessageConditions.None_; } } + public SCHALE.Common.FlatData.AcademyMessageConditions MessageCondition { get { int o = __p.__offset(10); return o != 0 ? (SCHALE.Common.FlatData.AcademyMessageConditions)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.AcademyMessageConditions.None; } } public long ConditionValue { get { int o = __p.__offset(12); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public long PreConditionGroupId { get { int o = __p.__offset(14); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public long PreConditionFavorScheduleId { get { int o = __p.__offset(16); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public long FavorScheduleId { get { int o = __p.__offset(18); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public long NextGroupId { get { int o = __p.__offset(20); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public long FeedbackTimeMillisec { get { int o = __p.__offset(22); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } - public SCHALE.Common.FlatData.AcademyMessageTypes MessageType { get { int o = __p.__offset(24); return o != 0 ? (SCHALE.Common.FlatData.AcademyMessageTypes)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.AcademyMessageTypes.None_; } } + public SCHALE.Common.FlatData.AcademyMessageTypes MessageType { get { int o = __p.__offset(24); return o != 0 ? (SCHALE.Common.FlatData.AcademyMessageTypes)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.AcademyMessageTypes.None; } } public string ImagePath { get { int o = __p.__offset(26); return o != 0 ? __p.__string(o + __p.bb_pos) : null; } } #if ENABLE_SPAN_T public Span GetImagePathBytes() { return __p.__vector_as_span(26, 1); } @@ -57,14 +57,14 @@ public struct AcademyMessanger1Excel : IFlatbufferObject long MessageGroupId = 0, long Id = 0, long CharacterId = 0, - SCHALE.Common.FlatData.AcademyMessageConditions MessageCondition = SCHALE.Common.FlatData.AcademyMessageConditions.None_, + SCHALE.Common.FlatData.AcademyMessageConditions MessageCondition = SCHALE.Common.FlatData.AcademyMessageConditions.None, long ConditionValue = 0, long PreConditionGroupId = 0, long PreConditionFavorScheduleId = 0, long FavorScheduleId = 0, long NextGroupId = 0, long FeedbackTimeMillisec = 0, - SCHALE.Common.FlatData.AcademyMessageTypes MessageType = SCHALE.Common.FlatData.AcademyMessageTypes.None_, + SCHALE.Common.FlatData.AcademyMessageTypes MessageType = SCHALE.Common.FlatData.AcademyMessageTypes.None, StringOffset ImagePathOffset = default(StringOffset), StringOffset MessageKROffset = default(StringOffset), StringOffset MessageJPOffset = default(StringOffset)) { @@ -172,14 +172,14 @@ public class AcademyMessanger1ExcelT this.MessageGroupId = 0; this.Id = 0; this.CharacterId = 0; - this.MessageCondition = SCHALE.Common.FlatData.AcademyMessageConditions.None_; + this.MessageCondition = SCHALE.Common.FlatData.AcademyMessageConditions.None; this.ConditionValue = 0; this.PreConditionGroupId = 0; this.PreConditionFavorScheduleId = 0; this.FavorScheduleId = 0; this.NextGroupId = 0; this.FeedbackTimeMillisec = 0; - this.MessageType = SCHALE.Common.FlatData.AcademyMessageTypes.None_; + this.MessageType = SCHALE.Common.FlatData.AcademyMessageTypes.None; this.ImagePath = null; this.MessageKR = null; this.MessageJP = null; diff --git a/SCHALE.Common/FlatData/AcademyMessanger2Excel.cs b/SCHALE.Common/FlatData/AcademyMessanger2Excel.cs index 6b2483b..54432c1 100644 --- a/SCHALE.Common/FlatData/AcademyMessanger2Excel.cs +++ b/SCHALE.Common/FlatData/AcademyMessanger2Excel.cs @@ -23,14 +23,14 @@ public struct AcademyMessanger2Excel : IFlatbufferObject public long MessageGroupId { 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 long CharacterId { get { int o = __p.__offset(8); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } - public SCHALE.Common.FlatData.AcademyMessageConditions MessageCondition { get { int o = __p.__offset(10); return o != 0 ? (SCHALE.Common.FlatData.AcademyMessageConditions)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.AcademyMessageConditions.None_; } } + public SCHALE.Common.FlatData.AcademyMessageConditions MessageCondition { get { int o = __p.__offset(10); return o != 0 ? (SCHALE.Common.FlatData.AcademyMessageConditions)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.AcademyMessageConditions.None; } } public long ConditionValue { get { int o = __p.__offset(12); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public long PreConditionGroupId { get { int o = __p.__offset(14); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public long PreConditionFavorScheduleId { get { int o = __p.__offset(16); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public long FavorScheduleId { get { int o = __p.__offset(18); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public long NextGroupId { get { int o = __p.__offset(20); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public long FeedbackTimeMillisec { get { int o = __p.__offset(22); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } - public SCHALE.Common.FlatData.AcademyMessageTypes MessageType { get { int o = __p.__offset(24); return o != 0 ? (SCHALE.Common.FlatData.AcademyMessageTypes)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.AcademyMessageTypes.None_; } } + public SCHALE.Common.FlatData.AcademyMessageTypes MessageType { get { int o = __p.__offset(24); return o != 0 ? (SCHALE.Common.FlatData.AcademyMessageTypes)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.AcademyMessageTypes.None; } } public string ImagePath { get { int o = __p.__offset(26); return o != 0 ? __p.__string(o + __p.bb_pos) : null; } } #if ENABLE_SPAN_T public Span GetImagePathBytes() { return __p.__vector_as_span(26, 1); } @@ -57,14 +57,14 @@ public struct AcademyMessanger2Excel : IFlatbufferObject long MessageGroupId = 0, long Id = 0, long CharacterId = 0, - SCHALE.Common.FlatData.AcademyMessageConditions MessageCondition = SCHALE.Common.FlatData.AcademyMessageConditions.None_, + SCHALE.Common.FlatData.AcademyMessageConditions MessageCondition = SCHALE.Common.FlatData.AcademyMessageConditions.None, long ConditionValue = 0, long PreConditionGroupId = 0, long PreConditionFavorScheduleId = 0, long FavorScheduleId = 0, long NextGroupId = 0, long FeedbackTimeMillisec = 0, - SCHALE.Common.FlatData.AcademyMessageTypes MessageType = SCHALE.Common.FlatData.AcademyMessageTypes.None_, + SCHALE.Common.FlatData.AcademyMessageTypes MessageType = SCHALE.Common.FlatData.AcademyMessageTypes.None, StringOffset ImagePathOffset = default(StringOffset), StringOffset MessageKROffset = default(StringOffset), StringOffset MessageJPOffset = default(StringOffset)) { @@ -172,14 +172,14 @@ public class AcademyMessanger2ExcelT this.MessageGroupId = 0; this.Id = 0; this.CharacterId = 0; - this.MessageCondition = SCHALE.Common.FlatData.AcademyMessageConditions.None_; + this.MessageCondition = SCHALE.Common.FlatData.AcademyMessageConditions.None; this.ConditionValue = 0; this.PreConditionGroupId = 0; this.PreConditionFavorScheduleId = 0; this.FavorScheduleId = 0; this.NextGroupId = 0; this.FeedbackTimeMillisec = 0; - this.MessageType = SCHALE.Common.FlatData.AcademyMessageTypes.None_; + this.MessageType = SCHALE.Common.FlatData.AcademyMessageTypes.None; this.ImagePath = null; this.MessageKR = null; this.MessageJP = null; diff --git a/SCHALE.Common/FlatData/AcademyMessanger3Excel.cs b/SCHALE.Common/FlatData/AcademyMessanger3Excel.cs index 2a679c5..98a3f7c 100644 --- a/SCHALE.Common/FlatData/AcademyMessanger3Excel.cs +++ b/SCHALE.Common/FlatData/AcademyMessanger3Excel.cs @@ -23,14 +23,14 @@ public struct AcademyMessanger3Excel : IFlatbufferObject public long MessageGroupId { 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 long CharacterId { get { int o = __p.__offset(8); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } - public SCHALE.Common.FlatData.AcademyMessageConditions MessageCondition { get { int o = __p.__offset(10); return o != 0 ? (SCHALE.Common.FlatData.AcademyMessageConditions)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.AcademyMessageConditions.None_; } } + public SCHALE.Common.FlatData.AcademyMessageConditions MessageCondition { get { int o = __p.__offset(10); return o != 0 ? (SCHALE.Common.FlatData.AcademyMessageConditions)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.AcademyMessageConditions.None; } } public long ConditionValue { get { int o = __p.__offset(12); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public long PreConditionGroupId { get { int o = __p.__offset(14); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public long PreConditionFavorScheduleId { get { int o = __p.__offset(16); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public long FavorScheduleId { get { int o = __p.__offset(18); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public long NextGroupId { get { int o = __p.__offset(20); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public long FeedbackTimeMillisec { get { int o = __p.__offset(22); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } - public SCHALE.Common.FlatData.AcademyMessageTypes MessageType { get { int o = __p.__offset(24); return o != 0 ? (SCHALE.Common.FlatData.AcademyMessageTypes)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.AcademyMessageTypes.None_; } } + public SCHALE.Common.FlatData.AcademyMessageTypes MessageType { get { int o = __p.__offset(24); return o != 0 ? (SCHALE.Common.FlatData.AcademyMessageTypes)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.AcademyMessageTypes.None; } } public string ImagePath { get { int o = __p.__offset(26); return o != 0 ? __p.__string(o + __p.bb_pos) : null; } } #if ENABLE_SPAN_T public Span GetImagePathBytes() { return __p.__vector_as_span(26, 1); } @@ -57,14 +57,14 @@ public struct AcademyMessanger3Excel : IFlatbufferObject long MessageGroupId = 0, long Id = 0, long CharacterId = 0, - SCHALE.Common.FlatData.AcademyMessageConditions MessageCondition = SCHALE.Common.FlatData.AcademyMessageConditions.None_, + SCHALE.Common.FlatData.AcademyMessageConditions MessageCondition = SCHALE.Common.FlatData.AcademyMessageConditions.None, long ConditionValue = 0, long PreConditionGroupId = 0, long PreConditionFavorScheduleId = 0, long FavorScheduleId = 0, long NextGroupId = 0, long FeedbackTimeMillisec = 0, - SCHALE.Common.FlatData.AcademyMessageTypes MessageType = SCHALE.Common.FlatData.AcademyMessageTypes.None_, + SCHALE.Common.FlatData.AcademyMessageTypes MessageType = SCHALE.Common.FlatData.AcademyMessageTypes.None, StringOffset ImagePathOffset = default(StringOffset), StringOffset MessageKROffset = default(StringOffset), StringOffset MessageJPOffset = default(StringOffset)) { @@ -172,14 +172,14 @@ public class AcademyMessanger3ExcelT this.MessageGroupId = 0; this.Id = 0; this.CharacterId = 0; - this.MessageCondition = SCHALE.Common.FlatData.AcademyMessageConditions.None_; + this.MessageCondition = SCHALE.Common.FlatData.AcademyMessageConditions.None; this.ConditionValue = 0; this.PreConditionGroupId = 0; this.PreConditionFavorScheduleId = 0; this.FavorScheduleId = 0; this.NextGroupId = 0; this.FeedbackTimeMillisec = 0; - this.MessageType = SCHALE.Common.FlatData.AcademyMessageTypes.None_; + this.MessageType = SCHALE.Common.FlatData.AcademyMessageTypes.None; this.ImagePath = null; this.MessageKR = null; this.MessageJP = null; diff --git a/SCHALE.Common/FlatData/AcademyMessangerExcel.cs b/SCHALE.Common/FlatData/AcademyMessangerExcel.cs index 0a23258..71b5636 100644 --- a/SCHALE.Common/FlatData/AcademyMessangerExcel.cs +++ b/SCHALE.Common/FlatData/AcademyMessangerExcel.cs @@ -23,14 +23,14 @@ public struct AcademyMessangerExcel : IFlatbufferObject public long MessageGroupId { 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 long CharacterId { get { int o = __p.__offset(8); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } - public SCHALE.Common.FlatData.AcademyMessageConditions MessageCondition { get { int o = __p.__offset(10); return o != 0 ? (SCHALE.Common.FlatData.AcademyMessageConditions)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.AcademyMessageConditions.None_; } } + public SCHALE.Common.FlatData.AcademyMessageConditions MessageCondition { get { int o = __p.__offset(10); return o != 0 ? (SCHALE.Common.FlatData.AcademyMessageConditions)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.AcademyMessageConditions.None; } } public long ConditionValue { get { int o = __p.__offset(12); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public long PreConditionGroupId { get { int o = __p.__offset(14); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public long PreConditionFavorScheduleId { get { int o = __p.__offset(16); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public long FavorScheduleId { get { int o = __p.__offset(18); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public long NextGroupId { get { int o = __p.__offset(20); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public long FeedbackTimeMillisec { get { int o = __p.__offset(22); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } - public SCHALE.Common.FlatData.AcademyMessageTypes MessageType { get { int o = __p.__offset(24); return o != 0 ? (SCHALE.Common.FlatData.AcademyMessageTypes)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.AcademyMessageTypes.None_; } } + public SCHALE.Common.FlatData.AcademyMessageTypes MessageType { get { int o = __p.__offset(24); return o != 0 ? (SCHALE.Common.FlatData.AcademyMessageTypes)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.AcademyMessageTypes.None; } } public string ImagePath { get { int o = __p.__offset(26); return o != 0 ? __p.__string(o + __p.bb_pos) : null; } } #if ENABLE_SPAN_T public Span GetImagePathBytes() { return __p.__vector_as_span(26, 1); } @@ -57,14 +57,14 @@ public struct AcademyMessangerExcel : IFlatbufferObject long MessageGroupId = 0, long Id = 0, long CharacterId = 0, - SCHALE.Common.FlatData.AcademyMessageConditions MessageCondition = SCHALE.Common.FlatData.AcademyMessageConditions.None_, + SCHALE.Common.FlatData.AcademyMessageConditions MessageCondition = SCHALE.Common.FlatData.AcademyMessageConditions.None, long ConditionValue = 0, long PreConditionGroupId = 0, long PreConditionFavorScheduleId = 0, long FavorScheduleId = 0, long NextGroupId = 0, long FeedbackTimeMillisec = 0, - SCHALE.Common.FlatData.AcademyMessageTypes MessageType = SCHALE.Common.FlatData.AcademyMessageTypes.None_, + SCHALE.Common.FlatData.AcademyMessageTypes MessageType = SCHALE.Common.FlatData.AcademyMessageTypes.None, StringOffset ImagePathOffset = default(StringOffset), StringOffset MessageKROffset = default(StringOffset), StringOffset MessageJPOffset = default(StringOffset)) { @@ -172,14 +172,14 @@ public class AcademyMessangerExcelT this.MessageGroupId = 0; this.Id = 0; this.CharacterId = 0; - this.MessageCondition = SCHALE.Common.FlatData.AcademyMessageConditions.None_; + this.MessageCondition = SCHALE.Common.FlatData.AcademyMessageConditions.None; this.ConditionValue = 0; this.PreConditionGroupId = 0; this.PreConditionFavorScheduleId = 0; this.FavorScheduleId = 0; this.NextGroupId = 0; this.FeedbackTimeMillisec = 0; - this.MessageType = SCHALE.Common.FlatData.AcademyMessageTypes.None_; + this.MessageType = SCHALE.Common.FlatData.AcademyMessageTypes.None; this.ImagePath = null; this.MessageKR = null; this.MessageJP = null; diff --git a/SCHALE.Common/FlatData/AimIKType.cs b/SCHALE.Common/FlatData/AimIKType.cs index c512b03..db0009d 100644 --- a/SCHALE.Common/FlatData/AimIKType.cs +++ b/SCHALE.Common/FlatData/AimIKType.cs @@ -7,7 +7,7 @@ namespace SCHALE.Common.FlatData public enum AimIKType : int { - None_ = 0, + None = 0, OneHandRight = 1, OneHandLeft = 2, TwoHandRight = 3, diff --git a/SCHALE.Common/FlatData/AmplifyDoTRemoveCondition.cs b/SCHALE.Common/FlatData/AmplifyDoTRemoveCondition.cs index 6188f2e..c8f1b75 100644 --- a/SCHALE.Common/FlatData/AmplifyDoTRemoveCondition.cs +++ b/SCHALE.Common/FlatData/AmplifyDoTRemoveCondition.cs @@ -7,7 +7,7 @@ namespace SCHALE.Common.FlatData public enum AmplifyDoTRemoveCondition : int { - None_ = 0, + None = 0, ApplyCount = 1, }; diff --git a/SCHALE.Common/FlatData/Anniversary.cs b/SCHALE.Common/FlatData/Anniversary.cs index f3448ed..4a51663 100644 --- a/SCHALE.Common/FlatData/Anniversary.cs +++ b/SCHALE.Common/FlatData/Anniversary.cs @@ -7,7 +7,7 @@ namespace SCHALE.Common.FlatData public enum Anniversary : int { - None_ = 0, + None = 0, UserBDay = 1, StudentBDay = 2, }; diff --git a/SCHALE.Common/FlatData/ArenaRewardExcel.cs b/SCHALE.Common/FlatData/ArenaRewardExcel.cs index bc9d01d..d0571aa 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/ArenaRewardType.cs b/SCHALE.Common/FlatData/ArenaRewardType.cs index ec3b16b..c1cef4d 100644 --- a/SCHALE.Common/FlatData/ArenaRewardType.cs +++ b/SCHALE.Common/FlatData/ArenaRewardType.cs @@ -7,7 +7,7 @@ namespace SCHALE.Common.FlatData public enum ArenaRewardType : int { - None_ = 0, + None = 0, Time = 1, Daily = 2, SeasonRecord = 3, diff --git a/SCHALE.Common/FlatData/AssistEchelonTypeConvertExcel.cs b/SCHALE.Common/FlatData/AssistEchelonTypeConvertExcel.cs index 4b55a72..76d8694 100644 --- a/SCHALE.Common/FlatData/AssistEchelonTypeConvertExcel.cs +++ b/SCHALE.Common/FlatData/AssistEchelonTypeConvertExcel.cs @@ -20,12 +20,12 @@ public struct AssistEchelonTypeConvertExcel : IFlatbufferObject 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 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_) { + 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); @@ -64,8 +64,8 @@ public class AssistEchelonTypeConvertExcelT public SCHALE.Common.FlatData.EchelonType ConvertTo { get; set; } public AssistEchelonTypeConvertExcelT() { - this.Contents = SCHALE.Common.FlatData.EchelonType.None_; - this.ConvertTo = SCHALE.Common.FlatData.EchelonType.None_; + this.Contents = SCHALE.Common.FlatData.EchelonType.None; + this.ConvertTo = SCHALE.Common.FlatData.EchelonType.None; } } diff --git a/SCHALE.Common/FlatData/AttendanceExcel.cs b/SCHALE.Common/FlatData/AttendanceExcel.cs index 147baf8..b3c79cf 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/BillingTransactionEndType.cs b/SCHALE.Common/FlatData/BillingTransactionEndType.cs index 6fd55b1..0ff8eaf 100644 --- a/SCHALE.Common/FlatData/BillingTransactionEndType.cs +++ b/SCHALE.Common/FlatData/BillingTransactionEndType.cs @@ -7,7 +7,7 @@ namespace SCHALE.Common.FlatData public enum BillingTransactionEndType : int { - None_ = 0, + None = 0, Success = 1, Cancel = 2, }; diff --git a/SCHALE.Common/FlatData/BossExternalBTExcel.cs b/SCHALE.Common/FlatData/BossExternalBTExcel.cs index ad90e8a..938051e 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/BuffIconType.cs b/SCHALE.Common/FlatData/BuffIconType.cs index 50d0111..23e6d42 100644 --- a/SCHALE.Common/FlatData/BuffIconType.cs +++ b/SCHALE.Common/FlatData/BuffIconType.cs @@ -7,7 +7,7 @@ namespace SCHALE.Common.FlatData public enum BuffIconType : int { - None_ = 0, + None = 0, Debuff_DyingPenalty = 1, CC_MindControl = 2, CC_Inoperative = 3, diff --git a/SCHALE.Common/FlatData/BuffType.cs b/SCHALE.Common/FlatData/BuffType.cs index 7c6c262..28eabd1 100644 --- a/SCHALE.Common/FlatData/BuffType.cs +++ b/SCHALE.Common/FlatData/BuffType.cs @@ -7,7 +7,7 @@ namespace SCHALE.Common.FlatData public enum BuffType : int { - None_ = 0, + None = 0, Buff_AttackPower = 1, Buff_CriticalChance = 2, Buff_CriticalDamage = 3, diff --git a/SCHALE.Common/FlatData/BulletArmorDamageFactorExcel.cs b/SCHALE.Common/FlatData/BulletArmorDamageFactorExcel.cs index 5ea455b..bee12fa 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/BulletType.cs b/SCHALE.Common/FlatData/BulletType.cs index 6b49af7..b2e2a82 100644 --- a/SCHALE.Common/FlatData/BulletType.cs +++ b/SCHALE.Common/FlatData/BulletType.cs @@ -12,7 +12,7 @@ public enum BulletType : int Explosion = 2, Siege = 3, Mystic = 4, - None_ = 5, + None = 5, Sonic = 6, }; diff --git a/SCHALE.Common/FlatData/CafeCharacterState.cs b/SCHALE.Common/FlatData/CafeCharacterState.cs index 1ae7d72..26cd5de 100644 --- a/SCHALE.Common/FlatData/CafeCharacterState.cs +++ b/SCHALE.Common/FlatData/CafeCharacterState.cs @@ -7,7 +7,7 @@ namespace SCHALE.Common.FlatData public enum CafeCharacterState : int { - None_ = 0, + None = 0, Idle = 1, Walk = 2, Reaction = 3, diff --git a/SCHALE.Common/FlatData/CafeInteractionExcel.cs b/SCHALE.Common/FlatData/CafeInteractionExcel.cs index 288e90b..a6dd01f 100644 --- a/SCHALE.Common/FlatData/CafeInteractionExcel.cs +++ b/SCHALE.Common/FlatData/CafeInteractionExcel.cs @@ -52,7 +52,7 @@ public struct CafeInteractionExcel : IFlatbufferObject public ArraySegment? GetBubbleDurationBytes() { return __p.__vector_as_arraysegment(14); } #endif public long[] GetBubbleDurationArray() { return __p.__vector_as_array(14); } - public SCHALE.Common.FlatData.ParcelType FavorEmoticonRewardParcelType { get { int o = __p.__offset(16); return o != 0 ? (SCHALE.Common.FlatData.ParcelType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.ParcelType.None_; } } + public SCHALE.Common.FlatData.ParcelType FavorEmoticonRewardParcelType { get { int o = __p.__offset(16); return o != 0 ? (SCHALE.Common.FlatData.ParcelType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.ParcelType.None; } } public long FavorEmoticonRewardId { get { int o = __p.__offset(18); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public long FavorEmoticonRewardAmount { get { int o = __p.__offset(20); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public string CafeCharacterState(int j) { int o = __p.__offset(22); return o != 0 ? __p.__string(__p.__vector(o) + j * 4) : null; } @@ -65,7 +65,7 @@ public struct CafeInteractionExcel : IFlatbufferObject StringOffset IgnoreIfUnobtainedEndDateOffset = default(StringOffset), VectorOffset BubbleType_Offset = default(VectorOffset), VectorOffset BubbleDurationOffset = default(VectorOffset), - SCHALE.Common.FlatData.ParcelType FavorEmoticonRewardParcelType = SCHALE.Common.FlatData.ParcelType.None_, + SCHALE.Common.FlatData.ParcelType FavorEmoticonRewardParcelType = SCHALE.Common.FlatData.ParcelType.None, long FavorEmoticonRewardId = 0, long FavorEmoticonRewardAmount = 0, VectorOffset CafeCharacterStateOffset = default(VectorOffset)) { @@ -189,7 +189,7 @@ public class CafeInteractionExcelT this.IgnoreIfUnobtainedEndDate = null; this.BubbleType_ = null; this.BubbleDuration = null; - this.FavorEmoticonRewardParcelType = SCHALE.Common.FlatData.ParcelType.None_; + this.FavorEmoticonRewardParcelType = SCHALE.Common.FlatData.ParcelType.None; this.FavorEmoticonRewardId = 0; this.FavorEmoticonRewardAmount = 0; this.CafeCharacterState = null; diff --git a/SCHALE.Common/FlatData/CafeProductionExcel.cs b/SCHALE.Common/FlatData/CafeProductionExcel.cs index a6a2215..4746861 100644 --- a/SCHALE.Common/FlatData/CafeProductionExcel.cs +++ b/SCHALE.Common/FlatData/CafeProductionExcel.cs @@ -22,7 +22,7 @@ public struct CafeProductionExcel : IFlatbufferObject public long CafeId { get { int o = __p.__offset(4); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public long Rank { get { int o = __p.__offset(6); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } - public SCHALE.Common.FlatData.ParcelType CafeProductionParcelType { 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 CafeProductionParcelType { 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 CafeProductionParcelId { get { int o = __p.__offset(10); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public long ParcelProductionCoefficient { get { int o = __p.__offset(12); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public long ParcelProductionCorrectionValue { get { int o = __p.__offset(14); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } @@ -31,7 +31,7 @@ public struct CafeProductionExcel : IFlatbufferObject public static Offset CreateCafeProductionExcel(FlatBufferBuilder builder, long CafeId = 0, long Rank = 0, - SCHALE.Common.FlatData.ParcelType CafeProductionParcelType = SCHALE.Common.FlatData.ParcelType.None_, + SCHALE.Common.FlatData.ParcelType CafeProductionParcelType = SCHALE.Common.FlatData.ParcelType.None, long CafeProductionParcelId = 0, long ParcelProductionCoefficient = 0, long ParcelProductionCorrectionValue = 0, @@ -101,7 +101,7 @@ public class CafeProductionExcelT public CafeProductionExcelT() { this.CafeId = 0; this.Rank = 0; - this.CafeProductionParcelType = SCHALE.Common.FlatData.ParcelType.None_; + this.CafeProductionParcelType = SCHALE.Common.FlatData.ParcelType.None; this.CafeProductionParcelId = 0; this.ParcelProductionCoefficient = 0; this.ParcelProductionCorrectionValue = 0; diff --git a/SCHALE.Common/FlatData/CampaignStageExcel.cs b/SCHALE.Common/FlatData/CampaignStageExcel.cs index 2081cc3..ab8bc42 100644 --- a/SCHALE.Common/FlatData/CampaignStageExcel.cs +++ b/SCHALE.Common/FlatData/CampaignStageExcel.cs @@ -38,7 +38,7 @@ public struct CampaignStageExcel : IFlatbufferObject public byte[] GetStageNumberArray() { return __p.__vector_as_array(10); } public long CleardScenarioId { get { int o = __p.__offset(12); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public long BattleDuration { get { int o = __p.__offset(14); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } - public SCHALE.Common.FlatData.ParcelType StageEnterCostType { get { int o = __p.__offset(16); return o != 0 ? (SCHALE.Common.FlatData.ParcelType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.ParcelType.None_; } } + public SCHALE.Common.FlatData.ParcelType StageEnterCostType { get { int o = __p.__offset(16); 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(18); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public int StageEnterCostAmount { get { int o = __p.__offset(20); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } public int StageEnterEchelonCount { get { int o = __p.__offset(22); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } @@ -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, @@ -108,7 +108,7 @@ public struct CampaignStageExcel : IFlatbufferObject StringOffset StageNumberOffset = default(StringOffset), long CleardScenarioId = 0, long BattleDuration = 0, - SCHALE.Common.FlatData.ParcelType StageEnterCostType = SCHALE.Common.FlatData.ParcelType.None_, + SCHALE.Common.FlatData.ParcelType StageEnterCostType = SCHALE.Common.FlatData.ParcelType.None, long StageEnterCostId = 0, int StageEnterCostAmount = 0, int StageEnterEchelonCount = 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; @@ -344,7 +344,7 @@ public class CampaignStageExcelT this.StageNumber = null; this.CleardScenarioId = 0; this.BattleDuration = 0; - this.StageEnterCostType = SCHALE.Common.FlatData.ParcelType.None_; + this.StageEnterCostType = SCHALE.Common.FlatData.ParcelType.None; this.StageEnterCostId = 0; this.StageEnterCostAmount = 0; this.StageEnterEchelonCount = 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 1e80040..3610b22 100644 --- a/SCHALE.Common/FlatData/CampaignStageRewardExcel.cs +++ b/SCHALE.Common/FlatData/CampaignStageRewardExcel.cs @@ -21,18 +21,18 @@ 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 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; } } public int StageRewardAmount { get { int o = __p.__offset(14); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } public bool IsDisplayed { get { int o = __p.__offset(16); return o != 0 ? 0!=__p.bb.Get(o + __p.bb_pos) : (bool)false; } } 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_, + SCHALE.Common.FlatData.ParcelType StageRewardParcelType = SCHALE.Common.FlatData.ParcelType.None, long StageRewardId = 0, int StageRewardAmount = 0, bool IsDisplayed = false) { @@ -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,9 +100,9 @@ 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.StageRewardParcelType = SCHALE.Common.FlatData.ParcelType.None; this.StageRewardId = 0; this.StageRewardAmount = 0; this.IsDisplayed = false; @@ -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 2464fb1..736c95e 100644 --- a/SCHALE.Common/FlatData/CampaignStrategyObjectExcel.cs +++ b/SCHALE.Common/FlatData/CampaignStrategyObjectExcel.cs @@ -36,8 +36,8 @@ 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.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 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; } } #if ENABLE_SPAN_T @@ -59,8 +59,8 @@ 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.ParcelType StrategyRewardParcelType = SCHALE.Common.FlatData.ParcelType.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), int StrategyRewardAmount = 0, @@ -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,8 +180,8 @@ public class CampaignStrategyObjectExcelT this.Key = 0; this.Name = null; this.PrefabName = null; - this.StrategyObjectType_ = SCHALE.Common.FlatData.StrategyObjectType.None_; - this.StrategyRewardParcelType = SCHALE.Common.FlatData.ParcelType.None_; + this.StrategyObjectType = SCHALE.Common.FlatData.StrategyObjectType.None; + this.StrategyRewardParcelType = SCHALE.Common.FlatData.ParcelType.None; this.StrategyRewardID = 0; this.StrategyRewardName = null; this.StrategyRewardAmount = 0; @@ -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/CampaignUnitExcel.cs b/SCHALE.Common/FlatData/CampaignUnitExcel.cs index 8d4baaa..f325d8d 100644 --- a/SCHALE.Common/FlatData/CampaignUnitExcel.cs +++ b/SCHALE.Common/FlatData/CampaignUnitExcel.cs @@ -61,9 +61,9 @@ public struct CampaignUnitExcel : IFlatbufferObject public long[] GetClearScenarioGroupIdArray() { return __p.__vector_as_array(16); } public long GroundId { get { int o = __p.__offset(18); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public int MoveRange { get { int o = __p.__offset(20); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } - public SCHALE.Common.FlatData.StrategyAIType AIMoveType { get { int o = __p.__offset(22); return o != 0 ? (SCHALE.Common.FlatData.StrategyAIType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.StrategyAIType.None_; } } + public SCHALE.Common.FlatData.StrategyAIType AIMoveType { get { int o = __p.__offset(22); return o != 0 ? (SCHALE.Common.FlatData.StrategyAIType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.StrategyAIType.None; } } public SCHALE.Common.FlatData.HexaUnitGrade Grade { get { int o = __p.__offset(24); return o != 0 ? (SCHALE.Common.FlatData.HexaUnitGrade)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.HexaUnitGrade.Grade1; } } - public SCHALE.Common.FlatData.TacticEnvironment EnvironmentType { get { int o = __p.__offset(26); return o != 0 ? (SCHALE.Common.FlatData.TacticEnvironment)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.TacticEnvironment.None_; } } + public SCHALE.Common.FlatData.TacticEnvironment EnvironmentType { get { int o = __p.__offset(26); return o != 0 ? (SCHALE.Common.FlatData.TacticEnvironment)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.TacticEnvironment.None; } } public float Scale { get { int o = __p.__offset(28); return o != 0 ? __p.bb.GetFloat(o + __p.bb_pos) : (float)0.0f; } } public bool IsTacticSkip { get { int o = __p.__offset(30); return o != 0 ? 0!=__p.bb.Get(o + __p.bb_pos) : (bool)false; } } @@ -77,9 +77,9 @@ public struct CampaignUnitExcel : IFlatbufferObject VectorOffset ClearScenarioGroupIdOffset = default(VectorOffset), long GroundId = 0, int MoveRange = 0, - SCHALE.Common.FlatData.StrategyAIType AIMoveType = SCHALE.Common.FlatData.StrategyAIType.None_, + SCHALE.Common.FlatData.StrategyAIType AIMoveType = SCHALE.Common.FlatData.StrategyAIType.None, SCHALE.Common.FlatData.HexaUnitGrade Grade = SCHALE.Common.FlatData.HexaUnitGrade.Grade1, - SCHALE.Common.FlatData.TacticEnvironment EnvironmentType = SCHALE.Common.FlatData.TacticEnvironment.None_, + SCHALE.Common.FlatData.TacticEnvironment EnvironmentType = SCHALE.Common.FlatData.TacticEnvironment.None, float Scale = 0.0f, bool IsTacticSkip = false) { builder.StartTable(14); @@ -214,9 +214,9 @@ public class CampaignUnitExcelT this.ClearScenarioGroupId = null; this.GroundId = 0; this.MoveRange = 0; - this.AIMoveType = SCHALE.Common.FlatData.StrategyAIType.None_; + this.AIMoveType = SCHALE.Common.FlatData.StrategyAIType.None; this.Grade = SCHALE.Common.FlatData.HexaUnitGrade.Grade1; - this.EnvironmentType = SCHALE.Common.FlatData.TacticEnvironment.None_; + this.EnvironmentType = SCHALE.Common.FlatData.TacticEnvironment.None; this.Scale = 0.0f; this.IsTacticSkip = false; } diff --git a/SCHALE.Common/FlatData/CharacterAIExcel.cs b/SCHALE.Common/FlatData/CharacterAIExcel.cs index f5c7978..a04a56c 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 4e33206..24db18d 100644 --- a/SCHALE.Common/FlatData/CharacterCalculationLimitExcel.cs +++ b/SCHALE.Common/FlatData/CharacterCalculationLimitExcel.cs @@ -21,7 +21,7 @@ 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; } } @@ -44,7 +44,7 @@ public struct CharacterCalculationLimitExcel : IFlatbufferObject 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, @@ -57,13 +57,13 @@ public struct CharacterCalculationLimitExcel : IFlatbufferObject CharacterCalculationLimitExcel.AddDecreaseRate(builder, DecreaseRateOffset); CharacterCalculationLimitExcel.AddLimitStartValue(builder, LimitStartValueOffset); CharacterCalculationLimitExcel.AddCalculationValue(builder, CalculationValue); - CharacterCalculationLimitExcel.AddTacticEntityType_(builder, TacticEntityType_); + CharacterCalculationLimitExcel.AddTacticEntityType(builder, TacticEntityType); return CharacterCalculationLimitExcel.EndCharacterCalculationLimitExcel(builder); } public static void StartCharacterCalculationLimitExcel(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 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); } @@ -91,7 +91,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); @@ -115,7 +115,7 @@ public struct CharacterCalculationLimitExcel : IFlatbufferObject return CreateCharacterCalculationLimitExcel( builder, _o.Id, - _o.TacticEntityType_, + _o.TacticEntityType, _o.CalculationValue, _o.MinValue, _o.MaxValue, @@ -127,7 +127,7 @@ 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; } @@ -136,7 +136,7 @@ public class CharacterCalculationLimitExcelT 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; @@ -152,7 +152,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 2a8fc0f..1ccd8a1 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 be09d76..fc21cd0 100644 --- a/SCHALE.Common/FlatData/CharacterDialogExcel.cs +++ b/SCHALE.Common/FlatData/CharacterDialogExcel.cs @@ -23,10 +23,10 @@ public struct CharacterDialogExcel : IFlatbufferObject public long CharacterId { get { int o = __p.__offset(4); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public long CostumeUniqueId { 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 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.DialogCategory DialogCategory_ { get { int o = __p.__offset(12); 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(14); return o != 0 ? (SCHALE.Common.FlatData.DialogCondition)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.DialogCondition.Idle; } } - public SCHALE.Common.FlatData.Anniversary Anniversary_ { get { int o = __p.__offset(16); return o != 0 ? (SCHALE.Common.FlatData.Anniversary)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.Anniversary.None_; } } + 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.DialogCategory DialogCategory { get { int o = __p.__offset(12); 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(14); return o != 0 ? (SCHALE.Common.FlatData.DialogCondition)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.DialogCondition.Idle; } } + public SCHALE.Common.FlatData.Anniversary Anniversary { get { int o = __p.__offset(16); return o != 0 ? (SCHALE.Common.FlatData.Anniversary)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.Anniversary.None; } } public string StartDate { get { int o = __p.__offset(18); return o != 0 ? __p.__string(o + __p.bb_pos) : null; } } #if ENABLE_SPAN_T public Span GetStartDateBytes() { return __p.__vector_as_span(18, 1); } @@ -42,7 +42,7 @@ public struct CharacterDialogExcel : IFlatbufferObject #endif public byte[] GetEndDateArray() { return __p.__vector_as_array(20); } 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); } @@ -84,7 +84,7 @@ 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; } } @@ -99,14 +99,14 @@ public struct CharacterDialogExcel : IFlatbufferObject 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_, + 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, + SCHALE.Common.FlatData.DialogType DialogType = SCHALE.Common.FlatData.DialogType.Talk, StringOffset ActionNameOffset = default(StringOffset), long Duration = 0, StringOffset AnimationNameOffset = default(StringOffset), @@ -117,7 +117,7 @@ public struct CharacterDialogExcel : IFlatbufferObject float PosX = 0.0f, float PosY = 0.0f, 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, bool UnlockEquipWeapon = false, StringOffset LocalizeCVGroupOffset = default(StringOffset)) { @@ -129,7 +129,7 @@ public struct CharacterDialogExcel : IFlatbufferObject CharacterDialogExcel.AddCostumeUniqueId(builder, CostumeUniqueId); CharacterDialogExcel.AddCharacterId(builder, CharacterId); CharacterDialogExcel.AddLocalizeCVGroup(builder, LocalizeCVGroupOffset); - CharacterDialogExcel.AddCVCollectionType_(builder, CVCollectionType_); + CharacterDialogExcel.AddCVCollectionType(builder, CVCollectionType); CharacterDialogExcel.AddPosY(builder, PosY); CharacterDialogExcel.AddPosX(builder, PosX); CharacterDialogExcel.AddVoiceId(builder, VoiceIdOffset); @@ -137,13 +137,13 @@ public struct CharacterDialogExcel : IFlatbufferObject CharacterDialogExcel.AddLocalizeKR(builder, LocalizeKROffset); CharacterDialogExcel.AddAnimationName(builder, AnimationNameOffset); CharacterDialogExcel.AddActionName(builder, ActionNameOffset); - CharacterDialogExcel.AddDialogType_(builder, DialogType_); + 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.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); @@ -154,14 +154,14 @@ public struct CharacterDialogExcel : IFlatbufferObject public static void AddCharacterId(FlatBufferBuilder builder, long characterId) { builder.AddLong(0, characterId, 0); } public static void AddCostumeUniqueId(FlatBufferBuilder builder, long costumeUniqueId) { builder.AddLong(1, costumeUniqueId, 0); } public static void AddDisplayOrder(FlatBufferBuilder builder, long displayOrder) { builder.AddLong(2, displayOrder, 0); } - public static void AddProductionStep_(FlatBufferBuilder builder, SCHALE.Common.FlatData.ProductionStep productionStep_) { builder.AddInt(3, (int)productionStep_, 0); } - public static void AddDialogCategory_(FlatBufferBuilder builder, SCHALE.Common.FlatData.DialogCategory dialogCategory_) { builder.AddInt(4, (int)dialogCategory_, 0); } - public static void AddDialogCondition_(FlatBufferBuilder builder, SCHALE.Common.FlatData.DialogCondition dialogCondition_) { builder.AddInt(5, (int)dialogCondition_, 0); } - public static void AddAnniversary_(FlatBufferBuilder builder, SCHALE.Common.FlatData.Anniversary anniversary_) { builder.AddInt(6, (int)anniversary_, 0); } + public static void AddProductionStep(FlatBufferBuilder builder, SCHALE.Common.FlatData.ProductionStep productionStep) { builder.AddInt(3, (int)productionStep, 0); } + public static void AddDialogCategory(FlatBufferBuilder builder, SCHALE.Common.FlatData.DialogCategory dialogCategory) { builder.AddInt(4, (int)dialogCategory, 0); } + public static void AddDialogCondition(FlatBufferBuilder builder, SCHALE.Common.FlatData.DialogCondition dialogCondition) { builder.AddInt(5, (int)dialogCondition, 0); } + public static void AddAnniversary(FlatBufferBuilder builder, SCHALE.Common.FlatData.Anniversary anniversary) { builder.AddInt(6, (int)anniversary, 0); } public static void AddStartDate(FlatBufferBuilder builder, StringOffset startDateOffset) { builder.AddOffset(7, startDateOffset.Value, 0); } public static void AddEndDate(FlatBufferBuilder builder, StringOffset endDateOffset) { builder.AddOffset(8, endDateOffset.Value, 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); } @@ -177,7 +177,7 @@ 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); } @@ -195,14 +195,14 @@ public struct CharacterDialogExcel : IFlatbufferObject _o.CharacterId = TableEncryptionService.Convert(this.CharacterId, key); _o.CostumeUniqueId = TableEncryptionService.Convert(this.CostumeUniqueId, key); _o.DisplayOrder = TableEncryptionService.Convert(this.DisplayOrder, key); - _o.ProductionStep_ = TableEncryptionService.Convert(this.ProductionStep_, key); - _o.DialogCategory_ = TableEncryptionService.Convert(this.DialogCategory_, key); - _o.DialogCondition_ = TableEncryptionService.Convert(this.DialogCondition_, key); - _o.Anniversary_ = TableEncryptionService.Convert(this.Anniversary_, key); + _o.ProductionStep = TableEncryptionService.Convert(this.ProductionStep, key); + _o.DialogCategory = TableEncryptionService.Convert(this.DialogCategory, key); + _o.DialogCondition = TableEncryptionService.Convert(this.DialogCondition, key); + _o.Anniversary = TableEncryptionService.Convert(this.Anniversary, key); _o.StartDate = TableEncryptionService.Convert(this.StartDate, key); _o.EndDate = TableEncryptionService.Convert(this.EndDate, 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); @@ -214,7 +214,7 @@ public struct CharacterDialogExcel : IFlatbufferObject _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); @@ -238,14 +238,14 @@ public struct CharacterDialogExcel : IFlatbufferObject _o.CharacterId, _o.CostumeUniqueId, _o.DisplayOrder, - _o.ProductionStep_, - _o.DialogCategory_, - _o.DialogCondition_, - _o.Anniversary_, + _o.ProductionStep, + _o.DialogCategory, + _o.DialogCondition, + _o.Anniversary, _StartDate, _EndDate, _o.GroupId, - _o.DialogType_, + _o.DialogType, _ActionName, _o.Duration, _AnimationName, @@ -256,7 +256,7 @@ public struct CharacterDialogExcel : IFlatbufferObject _o.PosX, _o.PosY, _o.CollectionVisible, - _o.CVCollectionType_, + _o.CVCollectionType, _o.UnlockFavorRank, _o.UnlockEquipWeapon, _LocalizeCVGroup); @@ -268,14 +268,14 @@ public class CharacterDialogExcelT public long CharacterId { get; set; } public long CostumeUniqueId { get; set; } public long DisplayOrder { 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.Anniversary Anniversary_ { 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.Anniversary Anniversary { get; set; } public string StartDate { get; set; } public string EndDate { 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; } @@ -286,7 +286,7 @@ public class CharacterDialogExcelT 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; } @@ -295,14 +295,14 @@ public class CharacterDialogExcelT this.CharacterId = 0; this.CostumeUniqueId = 0; this.DisplayOrder = 0; - this.ProductionStep_ = SCHALE.Common.FlatData.ProductionStep.ToDo; - this.DialogCategory_ = SCHALE.Common.FlatData.DialogCategory.Cafe; - this.DialogCondition_ = SCHALE.Common.FlatData.DialogCondition.Idle; - this.Anniversary_ = SCHALE.Common.FlatData.Anniversary.None_; + this.ProductionStep = SCHALE.Common.FlatData.ProductionStep.ToDo; + this.DialogCategory = SCHALE.Common.FlatData.DialogCategory.Cafe; + this.DialogCondition = SCHALE.Common.FlatData.DialogCondition.Idle; + this.Anniversary = SCHALE.Common.FlatData.Anniversary.None; this.StartDate = null; this.EndDate = null; 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; @@ -313,7 +313,7 @@ public class CharacterDialogExcelT 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; @@ -329,14 +329,14 @@ static public class CharacterDialogExcelVerify && verifier.VerifyField(tablePos, 4 /*CharacterId*/, 8 /*long*/, 8, false) && verifier.VerifyField(tablePos, 6 /*CostumeUniqueId*/, 8 /*long*/, 8, false) && verifier.VerifyField(tablePos, 8 /*DisplayOrder*/, 8 /*long*/, 8, false) - && verifier.VerifyField(tablePos, 10 /*ProductionStep_*/, 4 /*SCHALE.Common.FlatData.ProductionStep*/, 4, false) - && verifier.VerifyField(tablePos, 12 /*DialogCategory_*/, 4 /*SCHALE.Common.FlatData.DialogCategory*/, 4, false) - && verifier.VerifyField(tablePos, 14 /*DialogCondition_*/, 4 /*SCHALE.Common.FlatData.DialogCondition*/, 4, false) - && verifier.VerifyField(tablePos, 16 /*Anniversary_*/, 4 /*SCHALE.Common.FlatData.Anniversary*/, 4, false) + && verifier.VerifyField(tablePos, 10 /*ProductionStep*/, 4 /*SCHALE.Common.FlatData.ProductionStep*/, 4, false) + && verifier.VerifyField(tablePos, 12 /*DialogCategory*/, 4 /*SCHALE.Common.FlatData.DialogCategory*/, 4, false) + && verifier.VerifyField(tablePos, 14 /*DialogCondition*/, 4 /*SCHALE.Common.FlatData.DialogCondition*/, 4, false) + && verifier.VerifyField(tablePos, 16 /*Anniversary*/, 4 /*SCHALE.Common.FlatData.Anniversary*/, 4, false) && verifier.VerifyString(tablePos, 18 /*StartDate*/, false) && verifier.VerifyString(tablePos, 20 /*EndDate*/, 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) @@ -347,7 +347,7 @@ static public class CharacterDialogExcelVerify && 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) diff --git a/SCHALE.Common/FlatData/CharacterDialogFieldExcel.cs b/SCHALE.Common/FlatData/CharacterDialogFieldExcel.cs index 3e62e17..e2e87f7 100644 --- a/SCHALE.Common/FlatData/CharacterDialogFieldExcel.cs +++ b/SCHALE.Common/FlatData/CharacterDialogFieldExcel.cs @@ -23,7 +23,7 @@ public struct CharacterDialogFieldExcel : IFlatbufferObject public long GroupId { get { int o = __p.__offset(4); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public int Phase { get { int o = __p.__offset(6); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } public int TargetIndex { get { int o = __p.__offset(8); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } - public SCHALE.Common.FlatData.FieldDialogType DialogType { get { int o = __p.__offset(10); return o != 0 ? (SCHALE.Common.FlatData.FieldDialogType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.FieldDialogType.None_; } } + public SCHALE.Common.FlatData.FieldDialogType DialogType { get { int o = __p.__offset(10); return o != 0 ? (SCHALE.Common.FlatData.FieldDialogType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.FieldDialogType.None; } } public long Duration { get { int o = __p.__offset(12); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public string MotionName { get { int o = __p.__offset(14); return o != 0 ? __p.__string(o + __p.bb_pos) : null; } } #if ENABLE_SPAN_T @@ -53,7 +53,7 @@ public struct CharacterDialogFieldExcel : IFlatbufferObject long GroupId = 0, int Phase = 0, int TargetIndex = 0, - SCHALE.Common.FlatData.FieldDialogType DialogType = SCHALE.Common.FlatData.FieldDialogType.None_, + SCHALE.Common.FlatData.FieldDialogType DialogType = SCHALE.Common.FlatData.FieldDialogType.None, long Duration = 0, StringOffset MotionNameOffset = default(StringOffset), bool IsInteractionDialog = false, @@ -144,7 +144,7 @@ public class CharacterDialogFieldExcelT this.GroupId = 0; this.Phase = 0; this.TargetIndex = 0; - this.DialogType = SCHALE.Common.FlatData.FieldDialogType.None_; + this.DialogType = SCHALE.Common.FlatData.FieldDialogType.None; this.Duration = 0; this.MotionName = null; this.IsInteractionDialog = false; diff --git a/SCHALE.Common/FlatData/CharacterExcel.cs b/SCHALE.Common/FlatData/CharacterExcel.cs index 14c8c8f..25dbdd5 100644 --- a/SCHALE.Common/FlatData/CharacterExcel.cs +++ b/SCHALE.Common/FlatData/CharacterExcel.cs @@ -30,7 +30,7 @@ public struct CharacterExcel : IFlatbufferObject 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 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 @@ -55,24 +55,24 @@ public struct CharacterExcel : IFlatbufferObject 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 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 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 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 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; } } @@ -134,31 +134,31 @@ public struct CharacterExcel : IFlatbufferObject StringOffset DevNameOffset = default(StringOffset), long CostumeGroupId = 0, bool IsPlayable = false, - SCHALE.Common.FlatData.ProductionStep ProductionStep_ = SCHALE.Common.FlatData.ProductionStep.ToDo, + 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, + SCHALE.Common.FlatData.Rarity Rarity = SCHALE.Common.FlatData.Rarity.N, bool IsNPC = false, - SCHALE.Common.FlatData.TacticEntityType TacticEntityType_ = SCHALE.Common.FlatData.TacticEntityType.None_, + 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_, + 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_, + 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, @@ -224,26 +224,26 @@ public struct CharacterExcel : IFlatbufferObject CharacterExcel.AddSpawnTemplateId(builder, SpawnTemplateId); CharacterExcel.AddScenarioCharacter(builder, ScenarioCharacterOffset); CharacterExcel.AddCombatStyleIndex(builder, CombatStyleIndex); - CharacterExcel.AddSquadType_(builder, SquadType_); - CharacterExcel.AddStatLevelUpType_(builder, StatLevelUpType_); + 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.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.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.AddProductionStep(builder, ProductionStep); CharacterExcel.AddDevName(builder, DevNameOffset); CharacterExcel.AddIsAirUnit(builder, IsAirUnit); CharacterExcel.AddCanBattleItemMove(builder, CanBattleItemMove); @@ -267,31 +267,31 @@ public struct CharacterExcel : IFlatbufferObject 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 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 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 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 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 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); } @@ -352,31 +352,31 @@ public struct CharacterExcel : IFlatbufferObject _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.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.Rarity = TableEncryptionService.Convert(this.Rarity, key); _o.IsNPC = TableEncryptionService.Convert(this.IsNPC, key); - _o.TacticEntityType_ = TableEncryptionService.Convert(this.TacticEntityType_, 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.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.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); @@ -438,31 +438,31 @@ public struct CharacterExcel : IFlatbufferObject _DevName, _o.CostumeGroupId, _o.IsPlayable, - _o.ProductionStep_, + _o.ProductionStep, _o.CollectionVisible, _ReleaseDate, _CollectionVisibleStartDate, _CollectionVisibleEndDate, _o.IsPlayableCharacter, _o.LocalizeEtcId, - _o.Rarity_, + _o.Rarity, _o.IsNPC, - _o.TacticEntityType_, + _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.TacticRole, + _o.WeaponType, + _o.TacticRange, + _o.BulletType, + _o.ArmorType, + _o.AimIKType, + _o.School, + _o.Club, _o.DefaultStarGrade, _o.MaxStarGrade, - _o.StatLevelUpType_, - _o.SquadType_, + _o.StatLevelUpType, + _o.SquadType, _o.Jumpable, _o.PersonalityId, _o.CharacterAIId, @@ -507,31 +507,31 @@ public class CharacterExcelT public string DevName { get; set; } public long CostumeGroupId { get; set; } public bool IsPlayable { get; set; } - public SCHALE.Common.FlatData.ProductionStep ProductionStep_ { 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 SCHALE.Common.FlatData.Rarity Rarity { get; set; } public bool IsNPC { get; set; } - public SCHALE.Common.FlatData.TacticEntityType TacticEntityType_ { 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 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 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; } @@ -573,31 +573,31 @@ public class CharacterExcelT this.DevName = null; this.CostumeGroupId = 0; this.IsPlayable = false; - this.ProductionStep_ = SCHALE.Common.FlatData.ProductionStep.ToDo; + 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.Rarity = SCHALE.Common.FlatData.Rarity.N; this.IsNPC = false; - this.TacticEntityType_ = SCHALE.Common.FlatData.TacticEntityType.None_; + 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.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.StatLevelUpType = SCHALE.Common.FlatData.StatLevelUpType.Standard; + this.SquadType = SCHALE.Common.FlatData.SquadType.None; this.Jumpable = false; this.PersonalityId = 0; this.CharacterAIId = 0; @@ -646,31 +646,31 @@ static public class CharacterExcelVerify && 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, 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, 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, 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, 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, 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) diff --git a/SCHALE.Common/FlatData/CharacterGearExcel.cs b/SCHALE.Common/FlatData/CharacterGearExcel.cs index 9b78578..b3b0f93 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 c19f219..352a0bc 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/CharacterPotentialRewardExcel.cs b/SCHALE.Common/FlatData/CharacterPotentialRewardExcel.cs index a0723f6..d741efb 100644 --- a/SCHALE.Common/FlatData/CharacterPotentialRewardExcel.cs +++ b/SCHALE.Common/FlatData/CharacterPotentialRewardExcel.cs @@ -37,7 +37,7 @@ public struct CharacterPotentialRewardExcel : IFlatbufferObject public ArraySegment? GetRequirePotentialStatLevelBytes() { return __p.__vector_as_arraysegment(8); } #endif public long[] GetRequirePotentialStatLevelArray() { return __p.__vector_as_array(8); } - 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 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; } } public int RewardAmount { get { int o = __p.__offset(14); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } @@ -45,7 +45,7 @@ public struct CharacterPotentialRewardExcel : IFlatbufferObject long Id = 0, VectorOffset RequirePotentialStatTypeOffset = default(VectorOffset), VectorOffset RequirePotentialStatLevelOffset = default(VectorOffset), - SCHALE.Common.FlatData.ParcelType RewardParcelType = SCHALE.Common.FlatData.ParcelType.None_, + SCHALE.Common.FlatData.ParcelType RewardParcelType = SCHALE.Common.FlatData.ParcelType.None, long RewardId = 0, int RewardAmount = 0) { builder.StartTable(6); @@ -131,7 +131,7 @@ public class CharacterPotentialRewardExcelT this.Id = 0; this.RequirePotentialStatType = null; this.RequirePotentialStatLevel = null; - this.RewardParcelType = SCHALE.Common.FlatData.ParcelType.None_; + this.RewardParcelType = SCHALE.Common.FlatData.ParcelType.None; this.RewardId = 0; this.RewardAmount = 0; } diff --git a/SCHALE.Common/FlatData/CharacterStatLimitExcel.cs b/SCHALE.Common/FlatData/CharacterStatLimitExcel.cs index d027946..e9b8966 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 83fb510..fc9aa45 100644 --- a/SCHALE.Common/FlatData/CharacterStatsTransExcel.cs +++ b/SCHALE.Common/FlatData/CharacterStatsTransExcel.cs @@ -20,29 +20,29 @@ public struct CharacterStatsTransExcel : IFlatbufferObject public void __init(int _i, ByteBuffer _bb) { __p = new Table(_i, _bb); } 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.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 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.StatType TransSupportStats = SCHALE.Common.FlatData.StatType.None, + 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.TransSupportStats = SCHALE.Common.FlatData.StatType.None; + 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/CharacterVoiceExcel.cs b/SCHALE.Common/FlatData/CharacterVoiceExcel.cs index a94e7e9..7da8705 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/CharacterWeaponExcel.cs b/SCHALE.Common/FlatData/CharacterWeaponExcel.cs index 1a818dd..fe24884 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 471a8d2..cb9086e 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/ClanAssistSlotExcel.cs b/SCHALE.Common/FlatData/ClanAssistSlotExcel.cs index bff836c..d458198 100644 --- a/SCHALE.Common/FlatData/ClanAssistSlotExcel.cs +++ b/SCHALE.Common/FlatData/ClanAssistSlotExcel.cs @@ -21,7 +21,7 @@ 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; } } @@ -31,7 +31,7 @@ public struct ClanAssistSlotExcel : IFlatbufferObject 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, @@ -46,13 +46,13 @@ public struct ClanAssistSlotExcel : IFlatbufferObject 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(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); } @@ -71,7 +71,7 @@ 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); @@ -84,7 +84,7 @@ public struct ClanAssistSlotExcel : IFlatbufferObject return CreateClanAssistSlotExcel( builder, _o.SlotId, - _o.EchelonType_, + _o.EchelonType, _o.SlotNumber, _o.AssistTermRewardPeriodFromSec, _o.AssistRewardLimit, @@ -97,7 +97,7 @@ public struct ClanAssistSlotExcel : IFlatbufferObject 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; } @@ -107,7 +107,7 @@ public class ClanAssistSlotExcelT 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; @@ -124,7 +124,7 @@ 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) diff --git a/SCHALE.Common/FlatData/ClanRewardExcel.cs b/SCHALE.Common/FlatData/ClanRewardExcel.cs index 0549050..1042436 100644 --- a/SCHALE.Common/FlatData/ClanRewardExcel.cs +++ b/SCHALE.Common/FlatData/ClanRewardExcel.cs @@ -20,30 +20,30 @@ 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.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 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.ParcelType RewardParcelType = SCHALE.Common.FlatData.ParcelType.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) { builder.StartTable(5); 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,16 +78,16 @@ 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.RewardParcelType = SCHALE.Common.FlatData.ParcelType.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/ClanRewardType.cs b/SCHALE.Common/FlatData/ClanRewardType.cs index 45b16c6..9b2939f 100644 --- a/SCHALE.Common/FlatData/ClanRewardType.cs +++ b/SCHALE.Common/FlatData/ClanRewardType.cs @@ -7,7 +7,7 @@ namespace SCHALE.Common.FlatData public enum ClanRewardType : int { - None_ = 0, + None = 0, AssistTerm = 1, AssistRent = 2, Attendance = 3, diff --git a/SCHALE.Common/FlatData/ClanSocialGrade.cs b/SCHALE.Common/FlatData/ClanSocialGrade.cs index fc8f5a4..d72c154 100644 --- a/SCHALE.Common/FlatData/ClanSocialGrade.cs +++ b/SCHALE.Common/FlatData/ClanSocialGrade.cs @@ -7,7 +7,7 @@ namespace SCHALE.Common.FlatData public enum ClanSocialGrade : int { - None_ = 0, + None = 0, President = 1, Manager = 2, Member = 3, diff --git a/SCHALE.Common/FlatData/ClearCheck.cs b/SCHALE.Common/FlatData/ClearCheck.cs index 99f83b3..70cd8a4 100644 --- a/SCHALE.Common/FlatData/ClearCheck.cs +++ b/SCHALE.Common/FlatData/ClearCheck.cs @@ -7,7 +7,7 @@ namespace SCHALE.Common.FlatData public enum ClearCheck : int { - None_ = 0, + None = 0, Success_Play = 1, Success_Sweep = 2, Fail_Timeout = 3, diff --git a/SCHALE.Common/FlatData/ClearDeckRuleExcel.cs b/SCHALE.Common/FlatData/ClearDeckRuleExcel.cs index f2cff9e..a55218c 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 dc6b272..3186a38 100644 --- a/SCHALE.Common/FlatData/Club.cs +++ b/SCHALE.Common/FlatData/Club.cs @@ -7,7 +7,7 @@ namespace SCHALE.Common.FlatData public enum Club : int { - None_ = 0, + None = 0, Engineer = 1, CleanNClearing = 2, KnightsHospitaller = 3, diff --git a/SCHALE.Common/FlatData/CollectionUnlockType.cs b/SCHALE.Common/FlatData/CollectionUnlockType.cs index 8553edd..3bea1ac 100644 --- a/SCHALE.Common/FlatData/CollectionUnlockType.cs +++ b/SCHALE.Common/FlatData/CollectionUnlockType.cs @@ -7,7 +7,7 @@ namespace SCHALE.Common.FlatData public enum CollectionUnlockType : int { - None_ = 0, + None = 0, ClearSpecificEventStage = 1, ClearSpecificEventScenario = 2, ClearSpecificEventMission = 3, diff --git a/SCHALE.Common/FlatData/CombatEmojiExcel.cs b/SCHALE.Common/FlatData/CombatEmojiExcel.cs index d5c8c32..74bc832 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/ConquestCalculateExcel.cs b/SCHALE.Common/FlatData/ConquestCalculateExcel.cs index 56e9b57..8a7a1a2 100644 --- a/SCHALE.Common/FlatData/ConquestCalculateExcel.cs +++ b/SCHALE.Common/FlatData/ConquestCalculateExcel.cs @@ -21,13 +21,13 @@ public struct ConquestCalculateExcel : IFlatbufferObject public ConquestCalculateExcel __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 CalculateConditionParcelType { 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 CalculateConditionParcelType { 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 CalculateConditionParcelUniqueId { get { int o = __p.__offset(8); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public long CalculateConditionParcelAmount { get { int o = __p.__offset(10); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public static Offset CreateConquestCalculateExcel(FlatBufferBuilder builder, long EventContentId = 0, - SCHALE.Common.FlatData.ParcelType CalculateConditionParcelType = SCHALE.Common.FlatData.ParcelType.None_, + SCHALE.Common.FlatData.ParcelType CalculateConditionParcelType = SCHALE.Common.FlatData.ParcelType.None, long CalculateConditionParcelUniqueId = 0, long CalculateConditionParcelAmount = 0) { builder.StartTable(4); @@ -79,7 +79,7 @@ public class ConquestCalculateExcelT public ConquestCalculateExcelT() { this.EventContentId = 0; - this.CalculateConditionParcelType = SCHALE.Common.FlatData.ParcelType.None_; + this.CalculateConditionParcelType = SCHALE.Common.FlatData.ParcelType.None; this.CalculateConditionParcelUniqueId = 0; this.CalculateConditionParcelAmount = 0; } diff --git a/SCHALE.Common/FlatData/ConquestConditionType.cs b/SCHALE.Common/FlatData/ConquestConditionType.cs index 3223ae5..4c21524 100644 --- a/SCHALE.Common/FlatData/ConquestConditionType.cs +++ b/SCHALE.Common/FlatData/ConquestConditionType.cs @@ -7,7 +7,7 @@ namespace SCHALE.Common.FlatData public enum ConquestConditionType : int { - None_ = 0, + None = 0, OpenDateOffset = 1, ItemAcquire = 2, ParcelUse = 3, diff --git a/SCHALE.Common/FlatData/ConquestEnemyType.cs b/SCHALE.Common/FlatData/ConquestEnemyType.cs index a30e8c4..5434a25 100644 --- a/SCHALE.Common/FlatData/ConquestEnemyType.cs +++ b/SCHALE.Common/FlatData/ConquestEnemyType.cs @@ -7,7 +7,7 @@ namespace SCHALE.Common.FlatData public enum ConquestEnemyType : int { - None_ = 0, + None = 0, Normal = 1, MiddleBoss = 2, Boss = 3, diff --git a/SCHALE.Common/FlatData/ConquestErosionExcel.cs b/SCHALE.Common/FlatData/ConquestErosionExcel.cs index 2e30ccd..6d3f705 100644 --- a/SCHALE.Common/FlatData/ConquestErosionExcel.cs +++ b/SCHALE.Common/FlatData/ConquestErosionExcel.cs @@ -22,7 +22,7 @@ public struct ConquestErosionExcel : 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.ConquestErosionType ErosionType { get { int o = __p.__offset(8); return o != 0 ? (SCHALE.Common.FlatData.ConquestErosionType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.ConquestErosionType.None_; } } + public SCHALE.Common.FlatData.ConquestErosionType ErosionType { get { int o = __p.__offset(8); return o != 0 ? (SCHALE.Common.FlatData.ConquestErosionType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.ConquestErosionType.None; } } public int Phase { get { int o = __p.__offset(10); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } public bool PhaseAlarm { get { int o = __p.__offset(12); return o != 0 ? 0!=__p.bb.Get(o + __p.bb_pos) : (bool)false; } } public int StepIndex { get { int o = __p.__offset(14); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } @@ -46,7 +46,7 @@ public struct ConquestErosionExcel : IFlatbufferObject public SCHALE.Common.FlatData.ConquestConditionType[] GetPhaseBeforeExposeConditionTypeArray() { int o = __p.__offset(20); if (o == 0) return null; int p = __p.__vector(o); int l = __p.__vector_len(o); SCHALE.Common.FlatData.ConquestConditionType[] a = new SCHALE.Common.FlatData.ConquestConditionType[l]; for (int i = 0; i < l; i++) { a[i] = (SCHALE.Common.FlatData.ConquestConditionType)__p.bb.GetInt(p + i * 4); } return a; } public string PhaseBeforeExposeConditionParameter(int j) { int o = __p.__offset(22); return o != 0 ? __p.__string(__p.__vector(o) + j * 4) : null; } public int PhaseBeforeExposeConditionParameterLength { get { int o = __p.__offset(22); return o != 0 ? __p.__vector_len(o) : 0; } } - public SCHALE.Common.FlatData.ParcelType ErosionBattleConditionParcelType { 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 SCHALE.Common.FlatData.ParcelType ErosionBattleConditionParcelType { 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 ErosionBattleConditionParcelUniqueId { get { int o = __p.__offset(26); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public long ErosionBattleConditionParcelAmount { get { int o = __p.__offset(28); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public long ConquestRewardId { get { int o = __p.__offset(30); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } @@ -54,7 +54,7 @@ public struct ConquestErosionExcel : IFlatbufferObject public static Offset CreateConquestErosionExcel(FlatBufferBuilder builder, long EventContentId = 0, long Id = 0, - SCHALE.Common.FlatData.ConquestErosionType ErosionType = SCHALE.Common.FlatData.ConquestErosionType.None_, + SCHALE.Common.FlatData.ConquestErosionType ErosionType = SCHALE.Common.FlatData.ConquestErosionType.None, int Phase = 0, bool PhaseAlarm = false, int StepIndex = 0, @@ -62,7 +62,7 @@ public struct ConquestErosionExcel : IFlatbufferObject VectorOffset PhaseStartConditionParameterOffset = default(VectorOffset), VectorOffset PhaseBeforeExposeConditionTypeOffset = default(VectorOffset), VectorOffset PhaseBeforeExposeConditionParameterOffset = default(VectorOffset), - SCHALE.Common.FlatData.ParcelType ErosionBattleConditionParcelType = SCHALE.Common.FlatData.ParcelType.None_, + SCHALE.Common.FlatData.ParcelType ErosionBattleConditionParcelType = SCHALE.Common.FlatData.ParcelType.None, long ErosionBattleConditionParcelUniqueId = 0, long ErosionBattleConditionParcelAmount = 0, long ConquestRewardId = 0) { @@ -212,7 +212,7 @@ public class ConquestErosionExcelT public ConquestErosionExcelT() { this.EventContentId = 0; this.Id = 0; - this.ErosionType = SCHALE.Common.FlatData.ConquestErosionType.None_; + this.ErosionType = SCHALE.Common.FlatData.ConquestErosionType.None; this.Phase = 0; this.PhaseAlarm = false; this.StepIndex = 0; @@ -220,7 +220,7 @@ public class ConquestErosionExcelT this.PhaseStartConditionParameter = null; this.PhaseBeforeExposeConditionType = null; this.PhaseBeforeExposeConditionParameter = null; - this.ErosionBattleConditionParcelType = SCHALE.Common.FlatData.ParcelType.None_; + this.ErosionBattleConditionParcelType = SCHALE.Common.FlatData.ParcelType.None; this.ErosionBattleConditionParcelUniqueId = 0; this.ErosionBattleConditionParcelAmount = 0; this.ConquestRewardId = 0; diff --git a/SCHALE.Common/FlatData/ConquestErosionType.cs b/SCHALE.Common/FlatData/ConquestErosionType.cs index 01c8940..54c7807 100644 --- a/SCHALE.Common/FlatData/ConquestErosionType.cs +++ b/SCHALE.Common/FlatData/ConquestErosionType.cs @@ -7,7 +7,7 @@ namespace SCHALE.Common.FlatData public enum ConquestErosionType : int { - None_ = 0, + None = 0, IndividualErosion = 1, MassErosion = 2, }; diff --git a/SCHALE.Common/FlatData/ConquestEventExcel.cs b/SCHALE.Common/FlatData/ConquestEventExcel.cs index 9d313ec..950fb0b 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/ConquestEventType.cs b/SCHALE.Common/FlatData/ConquestEventType.cs index b08443b..69f64c2 100644 --- a/SCHALE.Common/FlatData/ConquestEventType.cs +++ b/SCHALE.Common/FlatData/ConquestEventType.cs @@ -7,7 +7,7 @@ namespace SCHALE.Common.FlatData public enum ConquestEventType : int { - None_ = 0, + None = 0, Event01 = 1, Event02 = 2, }; diff --git a/SCHALE.Common/FlatData/ConquestItemType.cs b/SCHALE.Common/FlatData/ConquestItemType.cs index 1f96e92..30c2ce5 100644 --- a/SCHALE.Common/FlatData/ConquestItemType.cs +++ b/SCHALE.Common/FlatData/ConquestItemType.cs @@ -7,7 +7,7 @@ namespace SCHALE.Common.FlatData public enum ConquestItemType : int { - None_ = 0, + None = 0, EventPoint = 1, EventToken1 = 2, EventToken2 = 3, diff --git a/SCHALE.Common/FlatData/ConquestMapExcel.cs b/SCHALE.Common/FlatData/ConquestMapExcel.cs index 503f217..0fe10f8 100644 --- a/SCHALE.Common/FlatData/ConquestMapExcel.cs +++ b/SCHALE.Common/FlatData/ConquestMapExcel.cs @@ -28,7 +28,7 @@ public struct ConquestMapExcel : IFlatbufferObject public ArraySegment? GetDevNameBytes() { return __p.__vector_as_arraysegment(6); } #endif public byte[] GetDevNameArray() { return __p.__vector_as_array(6); } - public SCHALE.Common.FlatData.StageDifficulty MapDifficulty { get { int o = __p.__offset(8); return o != 0 ? (SCHALE.Common.FlatData.StageDifficulty)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.StageDifficulty.None_; } } + public SCHALE.Common.FlatData.StageDifficulty MapDifficulty { get { int o = __p.__offset(8); return o != 0 ? (SCHALE.Common.FlatData.StageDifficulty)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.StageDifficulty.None; } } public int StepIndex { get { int o = __p.__offset(10); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } public string ConquestMap { get { int o = __p.__offset(12); return o != 0 ? __p.__string(o + __p.bb_pos) : null; } } #if ENABLE_SPAN_T @@ -81,7 +81,7 @@ public struct ConquestMapExcel : IFlatbufferObject public static Offset CreateConquestMapExcel(FlatBufferBuilder builder, long EventContentId = 0, StringOffset DevNameOffset = default(StringOffset), - SCHALE.Common.FlatData.StageDifficulty MapDifficulty = SCHALE.Common.FlatData.StageDifficulty.None_, + SCHALE.Common.FlatData.StageDifficulty MapDifficulty = SCHALE.Common.FlatData.StageDifficulty.None, int StepIndex = 0, StringOffset ConquestMapOffset = default(StringOffset), long StepEnterScenarioGroupId = 0, @@ -216,7 +216,7 @@ public class ConquestMapExcelT public ConquestMapExcelT() { this.EventContentId = 0; this.DevName = null; - this.MapDifficulty = SCHALE.Common.FlatData.StageDifficulty.None_; + this.MapDifficulty = SCHALE.Common.FlatData.StageDifficulty.None; this.StepIndex = 0; this.ConquestMap = null; this.StepEnterScenarioGroupId = 0; diff --git a/SCHALE.Common/FlatData/ConquestObjectExcel.cs b/SCHALE.Common/FlatData/ConquestObjectExcel.cs index 17714a0..cfd53a0 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 @@ -38,7 +38,7 @@ public struct ConquestObjectExcel : IFlatbufferObject public ArraySegment? GetPrefabNameBytes() { return __p.__vector_as_arraysegment(14); } #endif public byte[] GetPrefabNameArray() { return __p.__vector_as_array(14); } - public SCHALE.Common.FlatData.ParcelType ConquestRewardParcelType { get { int o = __p.__offset(16); return o != 0 ? (SCHALE.Common.FlatData.ParcelType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.ParcelType.None_; } } + public SCHALE.Common.FlatData.ParcelType ConquestRewardParcelType { get { int o = __p.__offset(16); return o != 0 ? (SCHALE.Common.FlatData.ParcelType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.ParcelType.None; } } public long ConquestRewardID { get { int o = __p.__offset(18); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public int ConquestRewardAmount { get { int o = __p.__offset(20); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } public bool Disposable { get { int o = __p.__offset(22); return o != 0 ? 0!=__p.bb.Get(o + __p.bb_pos) : (bool)false; } } @@ -48,11 +48,11 @@ 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), - SCHALE.Common.FlatData.ParcelType ConquestRewardParcelType = SCHALE.Common.FlatData.ParcelType.None_, + SCHALE.Common.FlatData.ParcelType ConquestRewardParcelType = SCHALE.Common.FlatData.ParcelType.None, long ConquestRewardID = 0, int ConquestRewardAmount = 0, bool Disposable = false, @@ -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,11 +150,11 @@ 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; - this.ConquestRewardParcelType = SCHALE.Common.FlatData.ParcelType.None_; + this.ConquestRewardParcelType = SCHALE.Common.FlatData.ParcelType.None; this.ConquestRewardID = 0; this.ConquestRewardAmount = 0; this.Disposable = false; @@ -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/ConquestObjectType.cs b/SCHALE.Common/FlatData/ConquestObjectType.cs index 0f879dd..1882c62 100644 --- a/SCHALE.Common/FlatData/ConquestObjectType.cs +++ b/SCHALE.Common/FlatData/ConquestObjectType.cs @@ -7,7 +7,7 @@ namespace SCHALE.Common.FlatData public enum ConquestObjectType : int { - None_ = 0, + None = 0, ParcelOneTimePerAccount = 1, }; diff --git a/SCHALE.Common/FlatData/ConquestProgressResourceExcel.cs b/SCHALE.Common/FlatData/ConquestProgressResourceExcel.cs index b636516..a126e60 100644 --- a/SCHALE.Common/FlatData/ConquestProgressResourceExcel.cs +++ b/SCHALE.Common/FlatData/ConquestProgressResourceExcel.cs @@ -22,7 +22,7 @@ public struct ConquestProgressResourceExcel : 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.ConquestProgressType Group { get { int o = __p.__offset(8); return o != 0 ? (SCHALE.Common.FlatData.ConquestProgressType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.ConquestProgressType.None_; } } + public SCHALE.Common.FlatData.ConquestProgressType Group { get { int o = __p.__offset(8); return o != 0 ? (SCHALE.Common.FlatData.ConquestProgressType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.ConquestProgressType.None; } } public string ProgressResource { get { int o = __p.__offset(10); return o != 0 ? __p.__string(o + __p.bb_pos) : null; } } #if ENABLE_SPAN_T public Span GetProgressResourceBytes() { return __p.__vector_as_span(10, 1); } @@ -49,7 +49,7 @@ public struct ConquestProgressResourceExcel : IFlatbufferObject public static Offset CreateConquestProgressResourceExcel(FlatBufferBuilder builder, long Id = 0, long EventContentId = 0, - SCHALE.Common.FlatData.ConquestProgressType Group = SCHALE.Common.FlatData.ConquestProgressType.None_, + SCHALE.Common.FlatData.ConquestProgressType Group = SCHALE.Common.FlatData.ConquestProgressType.None, StringOffset ProgressResourceOffset = default(StringOffset), VectorOffset VoiceIdOffset = default(VectorOffset), StringOffset ProgressLocalizeCodeOffset = default(StringOffset)) { @@ -126,7 +126,7 @@ public class ConquestProgressResourceExcelT public ConquestProgressResourceExcelT() { this.Id = 0; this.EventContentId = 0; - this.Group = SCHALE.Common.FlatData.ConquestProgressType.None_; + this.Group = SCHALE.Common.FlatData.ConquestProgressType.None; this.ProgressResource = null; this.VoiceId = null; this.ProgressLocalizeCode = null; diff --git a/SCHALE.Common/FlatData/ConquestProgressType.cs b/SCHALE.Common/FlatData/ConquestProgressType.cs index 3cd344a..a65de6d 100644 --- a/SCHALE.Common/FlatData/ConquestProgressType.cs +++ b/SCHALE.Common/FlatData/ConquestProgressType.cs @@ -7,7 +7,7 @@ namespace SCHALE.Common.FlatData public enum ConquestProgressType : int { - None_ = 0, + None = 0, Upgrade = 1, Manage = 2, }; diff --git a/SCHALE.Common/FlatData/ConquestRewardExcel.cs b/SCHALE.Common/FlatData/ConquestRewardExcel.cs index 52be119..9604d87 100644 --- a/SCHALE.Common/FlatData/ConquestRewardExcel.cs +++ b/SCHALE.Common/FlatData/ConquestRewardExcel.cs @@ -21,18 +21,18 @@ 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 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; } } public int RewardAmount { get { int o = __p.__offset(14); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } public bool IsDisplayed { get { int o = __p.__offset(16); return o != 0 ? 0!=__p.bb.Get(o + __p.bb_pos) : (bool)false; } } 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_, + SCHALE.Common.FlatData.ParcelType RewardParcelType = SCHALE.Common.FlatData.ParcelType.None, long RewardId = 0, int RewardAmount = 0, bool IsDisplayed = false) { @@ -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,9 +100,9 @@ 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.RewardParcelType = SCHALE.Common.FlatData.ParcelType.None; this.RewardId = 0; this.RewardAmount = 0; this.IsDisplayed = false; @@ -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/ConquestStepExcel.cs b/SCHALE.Common/FlatData/ConquestStepExcel.cs index 41e54c2..3b03c5e 100644 --- a/SCHALE.Common/FlatData/ConquestStepExcel.cs +++ b/SCHALE.Common/FlatData/ConquestStepExcel.cs @@ -21,7 +21,7 @@ public struct ConquestStepExcel : IFlatbufferObject public ConquestStepExcel __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.StageDifficulty MapDifficulty { get { int o = __p.__offset(6); return o != 0 ? (SCHALE.Common.FlatData.StageDifficulty)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.StageDifficulty.None_; } } + public SCHALE.Common.FlatData.StageDifficulty MapDifficulty { get { int o = __p.__offset(6); return o != 0 ? (SCHALE.Common.FlatData.StageDifficulty)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.StageDifficulty.None; } } public int Step { get { int o = __p.__offset(8); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } public string StepGoalLocalize { get { int o = __p.__offset(10); return o != 0 ? __p.__string(o + __p.bb_pos) : null; } } #if ENABLE_SPAN_T @@ -31,7 +31,7 @@ public struct ConquestStepExcel : IFlatbufferObject #endif public byte[] GetStepGoalLocalizeArray() { return __p.__vector_as_array(10); } public long StepEnterScenarioGroupId { get { int o = __p.__offset(12); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } - public SCHALE.Common.FlatData.ParcelType StepEnterItemType { 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 SCHALE.Common.FlatData.ParcelType StepEnterItemType { 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 StepEnterItemUniqueId { get { int o = __p.__offset(16); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public long StepEnterItemAmount { get { int o = __p.__offset(18); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public long UnexpectedEventUnitId(int j) { int o = __p.__offset(20); return o != 0 ? __p.bb.GetLong(__p.__vector(o) + j * 8) : (long)0; } @@ -54,11 +54,11 @@ public struct ConquestStepExcel : IFlatbufferObject public static Offset CreateConquestStepExcel(FlatBufferBuilder builder, long EventContentId = 0, - SCHALE.Common.FlatData.StageDifficulty MapDifficulty = SCHALE.Common.FlatData.StageDifficulty.None_, + SCHALE.Common.FlatData.StageDifficulty MapDifficulty = SCHALE.Common.FlatData.StageDifficulty.None, int Step = 0, StringOffset StepGoalLocalizeOffset = default(StringOffset), long StepEnterScenarioGroupId = 0, - SCHALE.Common.FlatData.ParcelType StepEnterItemType = SCHALE.Common.FlatData.ParcelType.None_, + SCHALE.Common.FlatData.ParcelType StepEnterItemType = SCHALE.Common.FlatData.ParcelType.None, long StepEnterItemUniqueId = 0, long StepEnterItemAmount = 0, VectorOffset UnexpectedEventUnitIdOffset = default(VectorOffset), @@ -167,11 +167,11 @@ public class ConquestStepExcelT public ConquestStepExcelT() { this.EventContentId = 0; - this.MapDifficulty = SCHALE.Common.FlatData.StageDifficulty.None_; + this.MapDifficulty = SCHALE.Common.FlatData.StageDifficulty.None; this.Step = 0; this.StepGoalLocalize = null; this.StepEnterScenarioGroupId = 0; - this.StepEnterItemType = SCHALE.Common.FlatData.ParcelType.None_; + this.StepEnterItemType = SCHALE.Common.FlatData.ParcelType.None; this.StepEnterItemUniqueId = 0; this.StepEnterItemAmount = 0; this.UnexpectedEventUnitId = null; diff --git a/SCHALE.Common/FlatData/ConquestTeamType.cs b/SCHALE.Common/FlatData/ConquestTeamType.cs index d73563d..741dfd8 100644 --- a/SCHALE.Common/FlatData/ConquestTeamType.cs +++ b/SCHALE.Common/FlatData/ConquestTeamType.cs @@ -7,7 +7,7 @@ namespace SCHALE.Common.FlatData public enum ConquestTeamType : int { - None_ = 0, + None = 0, Team1 = 1, Team2 = 2, Team3 = 3, diff --git a/SCHALE.Common/FlatData/ConquestTileExcel.cs b/SCHALE.Common/FlatData/ConquestTileExcel.cs index 4241d58..70d10e2 100644 --- a/SCHALE.Common/FlatData/ConquestTileExcel.cs +++ b/SCHALE.Common/FlatData/ConquestTileExcel.cs @@ -52,21 +52,21 @@ public struct ConquestTileExcel : IFlatbufferObject #endif public byte[] GetTileImageNameArray() { return __p.__vector_as_array(16); } public bool Playable { get { int o = __p.__offset(18); return o != 0 ? 0!=__p.bb.Get(o + __p.bb_pos) : (bool)false; } } - public SCHALE.Common.FlatData.ConquestTileType TileType { get { int o = __p.__offset(20); return o != 0 ? (SCHALE.Common.FlatData.ConquestTileType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.ConquestTileType.None_; } } + public SCHALE.Common.FlatData.ConquestTileType TileType { get { int o = __p.__offset(20); return o != 0 ? (SCHALE.Common.FlatData.ConquestTileType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.ConquestTileType.None; } } public bool NotMapFog { get { int o = __p.__offset(22); return o != 0 ? 0!=__p.bb.Get(o + __p.bb_pos) : (bool)false; } } public long GroupBonusId { get { int o = __p.__offset(24); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } - public SCHALE.Common.FlatData.ParcelType ConquestCostType { get { int o = __p.__offset(26); return o != 0 ? (SCHALE.Common.FlatData.ParcelType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.ParcelType.None_; } } + public SCHALE.Common.FlatData.ParcelType ConquestCostType { get { int o = __p.__offset(26); return o != 0 ? (SCHALE.Common.FlatData.ParcelType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.ParcelType.None; } } public long ConquestCostId { get { int o = __p.__offset(28); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public int ConquestCostAmount { get { int o = __p.__offset(30); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } - public SCHALE.Common.FlatData.ParcelType ManageCostType { get { int o = __p.__offset(32); return o != 0 ? (SCHALE.Common.FlatData.ParcelType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.ParcelType.None_; } } + public SCHALE.Common.FlatData.ParcelType ManageCostType { get { int o = __p.__offset(32); return o != 0 ? (SCHALE.Common.FlatData.ParcelType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.ParcelType.None; } } public long ManageCostId { get { int o = __p.__offset(34); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public int ManageCostAmount { get { int o = __p.__offset(36); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } public long ConquestRewardId { get { int o = __p.__offset(38); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public long MassErosionId { get { int o = __p.__offset(40); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } - public SCHALE.Common.FlatData.ParcelType Upgrade2CostType { get { int o = __p.__offset(42); return o != 0 ? (SCHALE.Common.FlatData.ParcelType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.ParcelType.None_; } } + public SCHALE.Common.FlatData.ParcelType Upgrade2CostType { get { int o = __p.__offset(42); return o != 0 ? (SCHALE.Common.FlatData.ParcelType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.ParcelType.None; } } public long Upgrade2CostId { get { int o = __p.__offset(44); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public int Upgrade2CostAmount { get { int o = __p.__offset(46); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } - public SCHALE.Common.FlatData.ParcelType Upgrade3CostType { get { int o = __p.__offset(48); return o != 0 ? (SCHALE.Common.FlatData.ParcelType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.ParcelType.None_; } } + public SCHALE.Common.FlatData.ParcelType Upgrade3CostType { get { int o = __p.__offset(48); return o != 0 ? (SCHALE.Common.FlatData.ParcelType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.ParcelType.None; } } public long Upgrade3CostId { get { int o = __p.__offset(50); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public int Upgrade3CostAmount { get { int o = __p.__offset(52); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } @@ -79,21 +79,21 @@ public struct ConquestTileExcel : IFlatbufferObject StringOffset TileNameLocalizeOffset = default(StringOffset), StringOffset TileImageNameOffset = default(StringOffset), bool Playable = false, - SCHALE.Common.FlatData.ConquestTileType TileType = SCHALE.Common.FlatData.ConquestTileType.None_, + SCHALE.Common.FlatData.ConquestTileType TileType = SCHALE.Common.FlatData.ConquestTileType.None, bool NotMapFog = false, long GroupBonusId = 0, - SCHALE.Common.FlatData.ParcelType ConquestCostType = SCHALE.Common.FlatData.ParcelType.None_, + SCHALE.Common.FlatData.ParcelType ConquestCostType = SCHALE.Common.FlatData.ParcelType.None, long ConquestCostId = 0, int ConquestCostAmount = 0, - SCHALE.Common.FlatData.ParcelType ManageCostType = SCHALE.Common.FlatData.ParcelType.None_, + SCHALE.Common.FlatData.ParcelType ManageCostType = SCHALE.Common.FlatData.ParcelType.None, long ManageCostId = 0, int ManageCostAmount = 0, long ConquestRewardId = 0, long MassErosionId = 0, - SCHALE.Common.FlatData.ParcelType Upgrade2CostType = SCHALE.Common.FlatData.ParcelType.None_, + SCHALE.Common.FlatData.ParcelType Upgrade2CostType = SCHALE.Common.FlatData.ParcelType.None, long Upgrade2CostId = 0, int Upgrade2CostAmount = 0, - SCHALE.Common.FlatData.ParcelType Upgrade3CostType = SCHALE.Common.FlatData.ParcelType.None_, + SCHALE.Common.FlatData.ParcelType Upgrade3CostType = SCHALE.Common.FlatData.ParcelType.None, long Upgrade3CostId = 0, int Upgrade3CostAmount = 0) { builder.StartTable(25); @@ -261,21 +261,21 @@ public class ConquestTileExcelT this.TileNameLocalize = null; this.TileImageName = null; this.Playable = false; - this.TileType = SCHALE.Common.FlatData.ConquestTileType.None_; + this.TileType = SCHALE.Common.FlatData.ConquestTileType.None; this.NotMapFog = false; this.GroupBonusId = 0; - this.ConquestCostType = SCHALE.Common.FlatData.ParcelType.None_; + this.ConquestCostType = SCHALE.Common.FlatData.ParcelType.None; this.ConquestCostId = 0; this.ConquestCostAmount = 0; - this.ManageCostType = SCHALE.Common.FlatData.ParcelType.None_; + this.ManageCostType = SCHALE.Common.FlatData.ParcelType.None; this.ManageCostId = 0; this.ManageCostAmount = 0; this.ConquestRewardId = 0; this.MassErosionId = 0; - this.Upgrade2CostType = SCHALE.Common.FlatData.ParcelType.None_; + this.Upgrade2CostType = SCHALE.Common.FlatData.ParcelType.None; this.Upgrade2CostId = 0; this.Upgrade2CostAmount = 0; - this.Upgrade3CostType = SCHALE.Common.FlatData.ParcelType.None_; + this.Upgrade3CostType = SCHALE.Common.FlatData.ParcelType.None; this.Upgrade3CostId = 0; this.Upgrade3CostAmount = 0; } diff --git a/SCHALE.Common/FlatData/ConquestTileType.cs b/SCHALE.Common/FlatData/ConquestTileType.cs index 8ad31fb..d6285cf 100644 --- a/SCHALE.Common/FlatData/ConquestTileType.cs +++ b/SCHALE.Common/FlatData/ConquestTileType.cs @@ -7,7 +7,7 @@ namespace SCHALE.Common.FlatData public enum ConquestTileType : int { - None_ = 0, + None = 0, Start = 1, Normal = 2, Battle = 3, diff --git a/SCHALE.Common/FlatData/ConquestUnexpectedEventExcel.cs b/SCHALE.Common/FlatData/ConquestUnexpectedEventExcel.cs index 20d0e2c..d7af86c 100644 --- a/SCHALE.Common/FlatData/ConquestUnexpectedEventExcel.cs +++ b/SCHALE.Common/FlatData/ConquestUnexpectedEventExcel.cs @@ -21,7 +21,7 @@ public struct ConquestUnexpectedEventExcel : IFlatbufferObject public ConquestUnexpectedEventExcel __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 UnexpectedEventConditionType { 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 UnexpectedEventConditionType { 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 UnexpectedEventConditionUniqueId { get { int o = __p.__offset(8); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public long UnexpectedEventConditionAmount { get { int o = __p.__offset(10); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public int UnexpectedEventOccurDailyLimitCount { get { int o = __p.__offset(12); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } @@ -39,7 +39,7 @@ public struct ConquestUnexpectedEventExcel : IFlatbufferObject public static Offset CreateConquestUnexpectedEventExcel(FlatBufferBuilder builder, long EventContentId = 0, - SCHALE.Common.FlatData.ParcelType UnexpectedEventConditionType = SCHALE.Common.FlatData.ParcelType.None_, + SCHALE.Common.FlatData.ParcelType UnexpectedEventConditionType = SCHALE.Common.FlatData.ParcelType.None, long UnexpectedEventConditionUniqueId = 0, long UnexpectedEventConditionAmount = 0, int UnexpectedEventOccurDailyLimitCount = 0, @@ -138,7 +138,7 @@ public class ConquestUnexpectedEventExcelT public ConquestUnexpectedEventExcelT() { this.EventContentId = 0; - this.UnexpectedEventConditionType = SCHALE.Common.FlatData.ParcelType.None_; + this.UnexpectedEventConditionType = SCHALE.Common.FlatData.ParcelType.None; this.UnexpectedEventConditionUniqueId = 0; this.UnexpectedEventConditionAmount = 0; this.UnexpectedEventOccurDailyLimitCount = 0; diff --git a/SCHALE.Common/FlatData/ConquestUnitExcel.cs b/SCHALE.Common/FlatData/ConquestUnitExcel.cs index dd1f955..e25424a 100644 --- a/SCHALE.Common/FlatData/ConquestUnitExcel.cs +++ b/SCHALE.Common/FlatData/ConquestUnitExcel.cs @@ -59,8 +59,8 @@ public struct ConquestUnitExcel : IFlatbufferObject public ArraySegment? GetPointAnimationBytes() { return __p.__vector_as_arraysegment(20); } #endif public byte[] GetPointAnimationArray() { return __p.__vector_as_array(20); } - public SCHALE.Common.FlatData.ConquestEnemyType EnemyType { get { int o = __p.__offset(22); return o != 0 ? (SCHALE.Common.FlatData.ConquestEnemyType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.ConquestEnemyType.None_; } } - public SCHALE.Common.FlatData.ConquestTeamType Team { get { int o = __p.__offset(24); return o != 0 ? (SCHALE.Common.FlatData.ConquestTeamType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.ConquestTeamType.None_; } } + public SCHALE.Common.FlatData.ConquestEnemyType EnemyType { get { int o = __p.__offset(22); return o != 0 ? (SCHALE.Common.FlatData.ConquestEnemyType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.ConquestEnemyType.None; } } + public SCHALE.Common.FlatData.ConquestTeamType Team { get { int o = __p.__offset(24); return o != 0 ? (SCHALE.Common.FlatData.ConquestTeamType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.ConquestTeamType.None; } } public long UnitGroup { get { int o = __p.__offset(26); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public long PrevUnitGroup { get { int o = __p.__offset(28); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public long BattleDuration { get { int o = __p.__offset(30); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } @@ -82,20 +82,20 @@ public struct ConquestUnitExcel : IFlatbufferObject #endif public int[] GetStarGoalAmountArray() { return __p.__vector_as_array(36); } public long GroupBuffId { get { int o = __p.__offset(38); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } - public SCHALE.Common.FlatData.ParcelType StageEnterCostType { 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 SCHALE.Common.FlatData.ParcelType StageEnterCostType { 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 StageEnterCostId { get { int o = __p.__offset(42); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public int StageEnterCostAmount { get { int o = __p.__offset(44); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } - public SCHALE.Common.FlatData.ParcelType ManageEchelonStageEnterCostType { get { int o = __p.__offset(46); return o != 0 ? (SCHALE.Common.FlatData.ParcelType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.ParcelType.None_; } } + public SCHALE.Common.FlatData.ParcelType ManageEchelonStageEnterCostType { get { int o = __p.__offset(46); return o != 0 ? (SCHALE.Common.FlatData.ParcelType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.ParcelType.None; } } public long ManageEchelonStageEnterCostId { get { int o = __p.__offset(48); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public int ManageEchelonStageEnterCostAmount { get { int o = __p.__offset(50); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } 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, @@ -107,8 +107,8 @@ public struct ConquestUnitExcel : IFlatbufferObject float ShieldEffectScale = 0.0f, StringOffset UnitFxPrefabNameOffset = default(StringOffset), StringOffset PointAnimationOffset = default(StringOffset), - SCHALE.Common.FlatData.ConquestEnemyType EnemyType = SCHALE.Common.FlatData.ConquestEnemyType.None_, - SCHALE.Common.FlatData.ConquestTeamType Team = SCHALE.Common.FlatData.ConquestTeamType.None_, + SCHALE.Common.FlatData.ConquestEnemyType EnemyType = SCHALE.Common.FlatData.ConquestEnemyType.None, + SCHALE.Common.FlatData.ConquestTeamType Team = SCHALE.Common.FlatData.ConquestTeamType.None, long UnitGroup = 0, long PrevUnitGroup = 0, long BattleDuration = 0, @@ -116,20 +116,20 @@ public struct ConquestUnitExcel : IFlatbufferObject VectorOffset StarGoalOffset = default(VectorOffset), VectorOffset StarGoalAmountOffset = default(VectorOffset), long GroupBuffId = 0, - SCHALE.Common.FlatData.ParcelType StageEnterCostType = SCHALE.Common.FlatData.ParcelType.None_, + SCHALE.Common.FlatData.ParcelType StageEnterCostType = SCHALE.Common.FlatData.ParcelType.None, long StageEnterCostId = 0, int StageEnterCostAmount = 0, - SCHALE.Common.FlatData.ParcelType ManageEchelonStageEnterCostType = SCHALE.Common.FlatData.ParcelType.None_, + SCHALE.Common.FlatData.ParcelType ManageEchelonStageEnterCostType = SCHALE.Common.FlatData.ParcelType.None, long ManageEchelonStageEnterCostId = 0, int ManageEchelonStageEnterCostAmount = 0, 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; @@ -354,8 +354,8 @@ public class ConquestUnitExcelT this.ShieldEffectScale = 0.0f; this.UnitFxPrefabName = null; this.PointAnimation = null; - this.EnemyType = SCHALE.Common.FlatData.ConquestEnemyType.None_; - this.Team = SCHALE.Common.FlatData.ConquestTeamType.None_; + this.EnemyType = SCHALE.Common.FlatData.ConquestEnemyType.None; + this.Team = SCHALE.Common.FlatData.ConquestTeamType.None; this.UnitGroup = 0; this.PrevUnitGroup = 0; this.BattleDuration = 0; @@ -363,20 +363,20 @@ public class ConquestUnitExcelT this.StarGoal = null; this.StarGoalAmount = null; this.GroupBuffId = 0; - this.StageEnterCostType = SCHALE.Common.FlatData.ParcelType.None_; + this.StageEnterCostType = SCHALE.Common.FlatData.ParcelType.None; this.StageEnterCostId = 0; this.StageEnterCostAmount = 0; - this.ManageEchelonStageEnterCostType = SCHALE.Common.FlatData.ParcelType.None_; + this.ManageEchelonStageEnterCostType = SCHALE.Common.FlatData.ParcelType.None; this.ManageEchelonStageEnterCostId = 0; this.ManageEchelonStageEnterCostAmount = 0; 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/ConstArenaExcel.cs b/SCHALE.Common/FlatData/ConstArenaExcel.cs index 1f6111e..e0750f1 100644 --- a/SCHALE.Common/FlatData/ConstArenaExcel.cs +++ b/SCHALE.Common/FlatData/ConstArenaExcel.cs @@ -26,7 +26,7 @@ public struct ConstArenaExcel : IFlatbufferObject public long TSSStartCoolTime { get { int o = __p.__offset(10); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public long EndAlarm { get { int o = __p.__offset(12); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public long TimeRewardMaxAmount { get { int o = __p.__offset(14); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } - public SCHALE.Common.FlatData.ParcelType EnterCostType { get { int o = __p.__offset(16); return o != 0 ? (SCHALE.Common.FlatData.ParcelType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.ParcelType.None_; } } + public SCHALE.Common.FlatData.ParcelType EnterCostType { get { int o = __p.__offset(16); return o != 0 ? (SCHALE.Common.FlatData.ParcelType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.ParcelType.None; } } public long EnterCostId { get { int o = __p.__offset(18); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public long TicketCost { get { int o = __p.__offset(20); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public string DailyRewardResetTime { get { int o = __p.__offset(22); return o != 0 ? __p.__string(o + __p.bb_pos) : null; } } @@ -134,7 +134,7 @@ public struct ConstArenaExcel : IFlatbufferObject long TSSStartCoolTime = 0, long EndAlarm = 0, long TimeRewardMaxAmount = 0, - SCHALE.Common.FlatData.ParcelType EnterCostType = SCHALE.Common.FlatData.ParcelType.None_, + SCHALE.Common.FlatData.ParcelType EnterCostType = SCHALE.Common.FlatData.ParcelType.None, long EnterCostId = 0, long TicketCost = 0, StringOffset DailyRewardResetTimeOffset = default(StringOffset), @@ -443,7 +443,7 @@ public class ConstArenaExcelT this.TSSStartCoolTime = 0; this.EndAlarm = 0; this.TimeRewardMaxAmount = 0; - this.EnterCostType = SCHALE.Common.FlatData.ParcelType.None_; + this.EnterCostType = SCHALE.Common.FlatData.ParcelType.None; this.EnterCostId = 0; this.TicketCost = 0; this.DailyRewardResetTime = null; diff --git a/SCHALE.Common/FlatData/ConstCommonExcel.cs b/SCHALE.Common/FlatData/ConstCommonExcel.cs index 0239fc8..e673dc1 100644 --- a/SCHALE.Common/FlatData/ConstCommonExcel.cs +++ b/SCHALE.Common/FlatData/ConstCommonExcel.cs @@ -74,7 +74,7 @@ public struct ConstCommonExcel : IFlatbufferObject public int ShiftingCraftSlotMaxCapacity { get { int o = __p.__offset(78); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } public int CraftTicketItemUniqueId { get { int o = __p.__offset(80); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } public int CraftTicketConsumeAmount { get { int o = __p.__offset(82); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } - public SCHALE.Common.FlatData.ParcelType AcademyEnterCostType { get { int o = __p.__offset(84); return o != 0 ? (SCHALE.Common.FlatData.ParcelType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.ParcelType.None_; } } + public SCHALE.Common.FlatData.ParcelType AcademyEnterCostType { get { int o = __p.__offset(84); return o != 0 ? (SCHALE.Common.FlatData.ParcelType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.ParcelType.None; } } public long AcademyEnterCostId { get { int o = __p.__offset(86); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public int AcademyTicketCost { get { int o = __p.__offset(88); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } public int MassangerMessageExpireDay { get { int o = __p.__offset(90); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } @@ -156,7 +156,7 @@ public struct ConstCommonExcel : IFlatbufferObject public int WeaponLvUpCoefficient { get { int o = __p.__offset(202); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } public int ShowRaidMyListCount { get { int o = __p.__offset(204); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } public int MaxLevelExpMasterCoinRatio { get { int o = __p.__offset(206); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } - public SCHALE.Common.FlatData.ParcelType RaidEnterCostType { get { int o = __p.__offset(208); return o != 0 ? (SCHALE.Common.FlatData.ParcelType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.ParcelType.None_; } } + public SCHALE.Common.FlatData.ParcelType RaidEnterCostType { get { int o = __p.__offset(208); return o != 0 ? (SCHALE.Common.FlatData.ParcelType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.ParcelType.None; } } public long RaidEnterCostId { get { int o = __p.__offset(210); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public long RaidTicketCost { get { int o = __p.__offset(212); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public string TimeAttackDungeonScenarioId { get { int o = __p.__offset(214); return o != 0 ? __p.__string(o + __p.bb_pos) : null; } } @@ -167,7 +167,7 @@ public struct ConstCommonExcel : IFlatbufferObject #endif public byte[] GetTimeAttackDungeonScenarioIdArray() { return __p.__vector_as_array(214); } public int TimeAttackDungoenPlayCountPerTicket { get { int o = __p.__offset(216); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } - public SCHALE.Common.FlatData.ParcelType TimeAttackDungeonEnterCostType { get { int o = __p.__offset(218); return o != 0 ? (SCHALE.Common.FlatData.ParcelType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.ParcelType.None_; } } + public SCHALE.Common.FlatData.ParcelType TimeAttackDungeonEnterCostType { get { int o = __p.__offset(218); return o != 0 ? (SCHALE.Common.FlatData.ParcelType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.ParcelType.None; } } public long TimeAttackDungeonEnterCostId { get { int o = __p.__offset(220); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public long TimeAttackDungeonEnterCost { get { int o = __p.__offset(222); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public long ClanLeaderTransferLastLoginLimit { get { int o = __p.__offset(224); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } @@ -219,7 +219,7 @@ public struct ConstCommonExcel : IFlatbufferObject #endif public byte[] GetBirthdayMailStartDateArray() { return __p.__vector_as_array(292); } public int BirthdayMailRemainDate { get { int o = __p.__offset(294); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } - public SCHALE.Common.FlatData.ParcelType BirthdayMailParcelType { get { int o = __p.__offset(296); return o != 0 ? (SCHALE.Common.FlatData.ParcelType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.ParcelType.None_; } } + public SCHALE.Common.FlatData.ParcelType BirthdayMailParcelType { get { int o = __p.__offset(296); return o != 0 ? (SCHALE.Common.FlatData.ParcelType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.ParcelType.None; } } public long BirthdayMailParcelId { get { int o = __p.__offset(298); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public int BirthdayMailParcelAmount { get { int o = __p.__offset(300); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } public int ClearDeckAverageDeckCount { get { int o = __p.__offset(302); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } @@ -1006,7 +1006,7 @@ public class ConstCommonExcelT this.ShiftingCraftSlotMaxCapacity = 0; this.CraftTicketItemUniqueId = 0; this.CraftTicketConsumeAmount = 0; - this.AcademyEnterCostType = SCHALE.Common.FlatData.ParcelType.None_; + this.AcademyEnterCostType = SCHALE.Common.FlatData.ParcelType.None; this.AcademyEnterCostId = 0; this.AcademyTicketCost = 0; this.MassangerMessageExpireDay = 0; @@ -1068,12 +1068,12 @@ public class ConstCommonExcelT this.WeaponLvUpCoefficient = 0; this.ShowRaidMyListCount = 0; this.MaxLevelExpMasterCoinRatio = 0; - this.RaidEnterCostType = SCHALE.Common.FlatData.ParcelType.None_; + this.RaidEnterCostType = SCHALE.Common.FlatData.ParcelType.None; this.RaidEnterCostId = 0; this.RaidTicketCost = 0; this.TimeAttackDungeonScenarioId = null; this.TimeAttackDungoenPlayCountPerTicket = 0; - this.TimeAttackDungeonEnterCostType = SCHALE.Common.FlatData.ParcelType.None_; + this.TimeAttackDungeonEnterCostType = SCHALE.Common.FlatData.ParcelType.None; this.TimeAttackDungeonEnterCostId = 0; this.TimeAttackDungeonEnterCost = 0; this.ClanLeaderTransferLastLoginLimit = 0; @@ -1112,7 +1112,7 @@ public class ConstCommonExcelT this.EmblemDefaultId = 0; this.BirthdayMailStartDate = null; this.BirthdayMailRemainDate = 0; - this.BirthdayMailParcelType = SCHALE.Common.FlatData.ParcelType.None_; + this.BirthdayMailParcelType = SCHALE.Common.FlatData.ParcelType.None; this.BirthdayMailParcelId = 0; this.BirthdayMailParcelAmount = 0; this.ClearDeckAverageDeckCount = 0; diff --git a/SCHALE.Common/FlatData/ContentEnterCostReduceExcel.cs b/SCHALE.Common/FlatData/ContentEnterCostReduceExcel.cs index 5e7513e..5f9bbc5 100644 --- a/SCHALE.Common/FlatData/ContentEnterCostReduceExcel.cs +++ b/SCHALE.Common/FlatData/ContentEnterCostReduceExcel.cs @@ -21,17 +21,17 @@ 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 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; } } public long ReduceAmount { get { int o = __p.__offset(14); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } 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_, + SCHALE.Common.FlatData.ParcelType ReduceEnterCostType = SCHALE.Common.FlatData.ParcelType.None, long ReduceEnterCostId = 0, long ReduceAmount = 0) { builder.StartTable(6); @@ -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,9 +93,9 @@ 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.ReduceEnterCostType = SCHALE.Common.FlatData.ParcelType.None; this.ReduceEnterCostId = 0; this.ReduceAmount = 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/ContentLockType.cs b/SCHALE.Common/FlatData/ContentLockType.cs index 3f0dedb..50a2a28 100644 --- a/SCHALE.Common/FlatData/ContentLockType.cs +++ b/SCHALE.Common/FlatData/ContentLockType.cs @@ -7,7 +7,7 @@ namespace SCHALE.Common.FlatData public enum ContentLockType : int { - None_ = 0, + None = 0, NotUseControlledByOtherSetting = 1, Academy = 2, MultiFloorRaid = 3, diff --git a/SCHALE.Common/FlatData/ContentSpoilerPopupExcel.cs b/SCHALE.Common/FlatData/ContentSpoilerPopupExcel.cs index 5e84945..c981e28 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/ContentType.cs b/SCHALE.Common/FlatData/ContentType.cs index ca64be2..37c7bfd 100644 --- a/SCHALE.Common/FlatData/ContentType.cs +++ b/SCHALE.Common/FlatData/ContentType.cs @@ -7,7 +7,7 @@ namespace SCHALE.Common.FlatData public enum ContentType : int { - None_ = 0, + None = 0, CampaignMainStage = 1, CampaignSubStage = 2, WeekDungeon = 3, diff --git a/SCHALE.Common/FlatData/ContentsChangeType.cs b/SCHALE.Common/FlatData/ContentsChangeType.cs index 6d4be50..81d2bbe 100644 --- a/SCHALE.Common/FlatData/ContentsChangeType.cs +++ b/SCHALE.Common/FlatData/ContentsChangeType.cs @@ -7,7 +7,7 @@ namespace SCHALE.Common.FlatData public enum ContentsChangeType : int { - None_ = 0, + None = 0, WorldRaidBossDamageRatio = 1, WorldRaidBossGroupDate = 2, }; diff --git a/SCHALE.Common/FlatData/ContentsScenarioExcel.cs b/SCHALE.Common/FlatData/ContentsScenarioExcel.cs index 4b3f902..a89647d 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 b8145f2..c25ce76 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; } } @@ -40,7 +40,7 @@ public struct ContentsShortcutExcel : IFlatbufferObject #endif public byte[] GetShortcutCloseTimeArray() { return __p.__vector_as_array(16); } public long ConditionContentId { get { int o = __p.__offset(18); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } - public SCHALE.Common.FlatData.StageDifficulty ConquestMapDifficulty { get { int o = __p.__offset(20); return o != 0 ? (SCHALE.Common.FlatData.StageDifficulty)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.StageDifficulty.None_; } } + public SCHALE.Common.FlatData.StageDifficulty ConquestMapDifficulty { get { int o = __p.__offset(20); return o != 0 ? (SCHALE.Common.FlatData.StageDifficulty)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.StageDifficulty.None; } } public int ConquestStepIndex { get { int o = __p.__offset(22); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } public long ShortcutContentId { get { int o = __p.__offset(24); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public string ShortcutUIName(int j) { int o = __p.__offset(26); return o != 0 ? __p.__string(__p.__vector(o) + j * 4) : null; } @@ -55,14 +55,14 @@ 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, StringOffset ShortcutOpenTimeOffset = default(StringOffset), StringOffset ShortcutCloseTimeOffset = default(StringOffset), long ConditionContentId = 0, - SCHALE.Common.FlatData.StageDifficulty ConquestMapDifficulty = SCHALE.Common.FlatData.StageDifficulty.None_, + SCHALE.Common.FlatData.StageDifficulty ConquestMapDifficulty = SCHALE.Common.FlatData.StageDifficulty.None, int ConquestStepIndex = 0, long ShortcutContentId = 0, VectorOffset ShortcutUINameOffset = default(VectorOffset), @@ -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,14 +176,14 @@ 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; this.ShortcutOpenTime = null; this.ShortcutCloseTime = null; this.ConditionContentId = 0; - this.ConquestMapDifficulty = SCHALE.Common.FlatData.StageDifficulty.None_; + this.ConquestMapDifficulty = SCHALE.Common.FlatData.StageDifficulty.None; this.ConquestStepIndex = 0; this.ShortcutContentId = 0; this.ShortcutUIName = null; @@ -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 73cadb2..7b51906 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); } @@ -167,18 +167,18 @@ public struct CostumeExcel : IFlatbufferObject 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), @@ -214,15 +214,15 @@ 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); @@ -236,13 +236,13 @@ public struct CostumeExcel : IFlatbufferObject 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); } @@ -252,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); } @@ -289,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); @@ -358,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, @@ -395,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; } @@ -429,18 +429,18 @@ public class 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; @@ -470,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) diff --git a/SCHALE.Common/FlatData/CouponStuffExcel.cs b/SCHALE.Common/FlatData/CouponStuffExcel.cs index a589b02..70d6a5f 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 69c1d91..cb7d998 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; } } @@ -69,7 +69,7 @@ public struct CurrencyExcel : IFlatbufferObject #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 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; } } @@ -79,20 +79,20 @@ 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), StringOffset ExpirationDateTimeOffset = default(StringOffset), int ExpirationNotifyDateIn = 0, - SCHALE.Common.FlatData.ParcelType ExpiryChangeParcelType = SCHALE.Common.FlatData.ParcelType.None_, + SCHALE.Common.FlatData.ParcelType ExpiryChangeParcelType = SCHALE.Common.FlatData.ParcelType.None, long ExpiryChangeId = 0, long ExpiryChangeAmount = 0) { builder.StartTable(21); @@ -106,13 +106,13 @@ public struct CurrencyExcel : IFlatbufferObject 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); @@ -126,15 +126,15 @@ public struct CurrencyExcel : IFlatbufferObject 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(); } @@ -163,15 +163,15 @@ 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));} @@ -199,15 +199,15 @@ 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, _ExpirationDateTime, @@ -225,15 +225,15 @@ 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; } @@ -248,20 +248,20 @@ 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.ExpiryChangeParcelType = SCHALE.Common.FlatData.ParcelType.None; this.ExpiryChangeId = 0; this.ExpiryChangeAmount = 0; } @@ -278,15 +278,15 @@ 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) diff --git a/SCHALE.Common/FlatData/DailyRefillType.cs b/SCHALE.Common/FlatData/DailyRefillType.cs index f89575f..aa2fd36 100644 --- a/SCHALE.Common/FlatData/DailyRefillType.cs +++ b/SCHALE.Common/FlatData/DailyRefillType.cs @@ -7,7 +7,7 @@ namespace SCHALE.Common.FlatData public enum DailyRefillType : int { - None_ = 0, + None = 0, Default = 1, Login = 2, }; diff --git a/SCHALE.Common/FlatData/DefaultFurnitureExcel.cs b/SCHALE.Common/FlatData/DefaultFurnitureExcel.cs index 3b8a608..04f4160 100644 --- a/SCHALE.Common/FlatData/DefaultFurnitureExcel.cs +++ b/SCHALE.Common/FlatData/DefaultFurnitureExcel.cs @@ -21,14 +21,14 @@ public struct DefaultFurnitureExcel : IFlatbufferObject public DefaultFurnitureExcel __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.FurnitureLocation Location { get { int o = __p.__offset(6); return o != 0 ? (SCHALE.Common.FlatData.FurnitureLocation)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.FurnitureLocation.None_; } } + public SCHALE.Common.FlatData.FurnitureLocation Location { get { int o = __p.__offset(6); return o != 0 ? (SCHALE.Common.FlatData.FurnitureLocation)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.FurnitureLocation.None; } } public float PositionX { get { int o = __p.__offset(8); return o != 0 ? __p.bb.GetFloat(o + __p.bb_pos) : (float)0.0f; } } public float PositionY { get { int o = __p.__offset(10); return o != 0 ? __p.bb.GetFloat(o + __p.bb_pos) : (float)0.0f; } } public float Rotation { get { int o = __p.__offset(12); return o != 0 ? __p.bb.GetFloat(o + __p.bb_pos) : (float)0.0f; } } public static Offset CreateDefaultFurnitureExcel(FlatBufferBuilder builder, long Id = 0, - SCHALE.Common.FlatData.FurnitureLocation Location = SCHALE.Common.FlatData.FurnitureLocation.None_, + SCHALE.Common.FlatData.FurnitureLocation Location = SCHALE.Common.FlatData.FurnitureLocation.None, float PositionX = 0.0f, float PositionY = 0.0f, float Rotation = 0.0f) { @@ -86,7 +86,7 @@ public class DefaultFurnitureExcelT public DefaultFurnitureExcelT() { this.Id = 0; - this.Location = SCHALE.Common.FlatData.FurnitureLocation.None_; + this.Location = SCHALE.Common.FlatData.FurnitureLocation.None; this.PositionX = 0.0f; this.PositionY = 0.0f; this.Rotation = 0.0f; diff --git a/SCHALE.Common/FlatData/DefaultMailExcel.cs b/SCHALE.Common/FlatData/DefaultMailExcel.cs index 635f464..bc74f3c 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 bec8237..1a8e904 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/DialogConditionDetail.cs b/SCHALE.Common/FlatData/DialogConditionDetail.cs index 6f6d9c6..8111858 100644 --- a/SCHALE.Common/FlatData/DialogConditionDetail.cs +++ b/SCHALE.Common/FlatData/DialogConditionDetail.cs @@ -7,7 +7,7 @@ namespace SCHALE.Common.FlatData public enum DialogConditionDetail : int { - None_ = 0, + None = 0, Day = 1, Close = 2, MiniGameDreamMakerDay = 3, diff --git a/SCHALE.Common/FlatData/DreamMakerEndingCondition.cs b/SCHALE.Common/FlatData/DreamMakerEndingCondition.cs index 4be3f64..128091e 100644 --- a/SCHALE.Common/FlatData/DreamMakerEndingCondition.cs +++ b/SCHALE.Common/FlatData/DreamMakerEndingCondition.cs @@ -7,7 +7,7 @@ namespace SCHALE.Common.FlatData public enum DreamMakerEndingCondition : int { - None_ = 0, + None = 0, Param01 = 1, Param02 = 2, Param03 = 3, diff --git a/SCHALE.Common/FlatData/DreamMakerEndingRewardType.cs b/SCHALE.Common/FlatData/DreamMakerEndingRewardType.cs index abc27b2..63ce231 100644 --- a/SCHALE.Common/FlatData/DreamMakerEndingRewardType.cs +++ b/SCHALE.Common/FlatData/DreamMakerEndingRewardType.cs @@ -7,7 +7,7 @@ namespace SCHALE.Common.FlatData public enum DreamMakerEndingRewardType : int { - None_ = 0, + None = 0, FirstEndingReward = 1, LoopEndingReward = 2, }; diff --git a/SCHALE.Common/FlatData/DreamMakerEndingType.cs b/SCHALE.Common/FlatData/DreamMakerEndingType.cs index 85aed77..99a8c18 100644 --- a/SCHALE.Common/FlatData/DreamMakerEndingType.cs +++ b/SCHALE.Common/FlatData/DreamMakerEndingType.cs @@ -7,7 +7,7 @@ namespace SCHALE.Common.FlatData public enum DreamMakerEndingType : int { - None_ = 0, + None = 0, Normal = 1, Special = 2, }; diff --git a/SCHALE.Common/FlatData/DreamMakerMultiplierCondition.cs b/SCHALE.Common/FlatData/DreamMakerMultiplierCondition.cs index 6a46d51..7d0fbb2 100644 --- a/SCHALE.Common/FlatData/DreamMakerMultiplierCondition.cs +++ b/SCHALE.Common/FlatData/DreamMakerMultiplierCondition.cs @@ -7,7 +7,7 @@ namespace SCHALE.Common.FlatData public enum DreamMakerMultiplierCondition : int { - None_ = 0, + None = 0, Round = 1, CollectionCount = 2, EndingCount = 3, diff --git a/SCHALE.Common/FlatData/DreamMakerParamOperationType.cs b/SCHALE.Common/FlatData/DreamMakerParamOperationType.cs index f87f044..96f5897 100644 --- a/SCHALE.Common/FlatData/DreamMakerParamOperationType.cs +++ b/SCHALE.Common/FlatData/DreamMakerParamOperationType.cs @@ -7,7 +7,7 @@ namespace SCHALE.Common.FlatData public enum DreamMakerParamOperationType : int { - None_ = 0, + None = 0, GrowUpHigh = 1, GrowUp = 2, GrowDownHigh = 3, diff --git a/SCHALE.Common/FlatData/DreamMakerParameterType.cs b/SCHALE.Common/FlatData/DreamMakerParameterType.cs index a21a19a..d423b71 100644 --- a/SCHALE.Common/FlatData/DreamMakerParameterType.cs +++ b/SCHALE.Common/FlatData/DreamMakerParameterType.cs @@ -7,7 +7,7 @@ namespace SCHALE.Common.FlatData public enum DreamMakerParameterType : int { - None_ = 0, + None = 0, Param01 = 1, Param02 = 2, Param03 = 3, diff --git a/SCHALE.Common/FlatData/DreamMakerResult.cs b/SCHALE.Common/FlatData/DreamMakerResult.cs index 1c7a2d8..0ea0aa7 100644 --- a/SCHALE.Common/FlatData/DreamMakerResult.cs +++ b/SCHALE.Common/FlatData/DreamMakerResult.cs @@ -7,7 +7,7 @@ namespace SCHALE.Common.FlatData public enum DreamMakerResult : int { - None_ = 0, + None = 0, Fail = 1, Success = 2, Perfect = 3, diff --git a/SCHALE.Common/FlatData/DreamMakerVoiceCondition.cs b/SCHALE.Common/FlatData/DreamMakerVoiceCondition.cs index 09089a8..2f1f692 100644 --- a/SCHALE.Common/FlatData/DreamMakerVoiceCondition.cs +++ b/SCHALE.Common/FlatData/DreamMakerVoiceCondition.cs @@ -7,7 +7,7 @@ namespace SCHALE.Common.FlatData public enum DreamMakerVoiceCondition : int { - None_ = 0, + None = 0, Fail = 1, Success = 2, Perfect = 3, diff --git a/SCHALE.Common/FlatData/DuplicateBonusExcel.cs b/SCHALE.Common/FlatData/DuplicateBonusExcel.cs index a851a02..b2a07c7 100644 --- a/SCHALE.Common/FlatData/DuplicateBonusExcel.cs +++ b/SCHALE.Common/FlatData/DuplicateBonusExcel.cs @@ -21,19 +21,19 @@ 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_; } } + 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; } } public long RewardParcelId { get { int o = __p.__offset(14); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public long RewardParcelAmount { get { int o = __p.__offset(16); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } 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_, + SCHALE.Common.FlatData.ParcelType RewardParcelType = SCHALE.Common.FlatData.ParcelType.None, long RewardParcelId = 0, long RewardParcelAmount = 0) { builder.StartTable(7); @@ -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,10 +100,10 @@ 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_; + this.RewardParcelType = SCHALE.Common.FlatData.ParcelType.None; this.RewardParcelId = 0; this.RewardParcelAmount = 0; } @@ -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 7a495de..ee4433c 100644 --- a/SCHALE.Common/FlatData/EchelonConstraintExcel.cs +++ b/SCHALE.Common/FlatData/EchelonConstraintExcel.cs @@ -38,26 +38,26 @@ 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.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 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, long GroupId = 0, 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.TacticRole Role = SCHALE.Common.FlatData.TacticRole.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,10 +146,10 @@ 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.Role = SCHALE.Common.FlatData.TacticRole.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 893632f..06ffee2 100644 --- a/SCHALE.Common/FlatData/EchelonType.cs +++ b/SCHALE.Common/FlatData/EchelonType.cs @@ -7,7 +7,7 @@ namespace SCHALE.Common.FlatData public enum EchelonType : int { - None_ = 0, + None = 0, Adventure = 1, Raid = 2, ArenaAttack = 3, diff --git a/SCHALE.Common/FlatData/EffectBone.cs b/SCHALE.Common/FlatData/EffectBone.cs index daf8fd5..1e25623 100644 --- a/SCHALE.Common/FlatData/EffectBone.cs +++ b/SCHALE.Common/FlatData/EffectBone.cs @@ -7,7 +7,7 @@ namespace SCHALE.Common.FlatData public enum EffectBone : int { - None_ = 0, + None = 0, Shot = 1, Head = 2, Body = 3, diff --git a/SCHALE.Common/FlatData/EliminateRaidStageExcel.cs b/SCHALE.Common/FlatData/EliminateRaidStageExcel.cs index 3955ad2..35a7c35 100644 --- a/SCHALE.Common/FlatData/EliminateRaidStageExcel.cs +++ b/SCHALE.Common/FlatData/EliminateRaidStageExcel.cs @@ -30,7 +30,7 @@ public struct EliminateRaidStageExcel : IFlatbufferObject public ArraySegment? GetRaidBossGroupBytes() { return __p.__vector_as_arraysegment(10); } #endif public byte[] GetRaidBossGroupArray() { return __p.__vector_as_array(10); } - public SCHALE.Common.FlatData.ParcelType RaidEnterCostType { 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 RaidEnterCostType { 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 RaidEnterCostId { get { int o = __p.__offset(14); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public int RaidEnterCostAmount { get { int o = __p.__offset(16); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } public string BossSpinePath { get { int o = __p.__offset(18); return o != 0 ? __p.__string(o + __p.bb_pos) : null; } } @@ -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,14 +128,14 @@ 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, bool UseBossIndex = false, bool UseBossAIPhaseSync = false, StringOffset RaidBossGroupOffset = default(StringOffset), - SCHALE.Common.FlatData.ParcelType RaidEnterCostType = SCHALE.Common.FlatData.ParcelType.None_, + SCHALE.Common.FlatData.ParcelType RaidEnterCostType = SCHALE.Common.FlatData.ParcelType.None, long RaidEnterCostId = 0, int RaidEnterCostAmount = 0, StringOffset BossSpinePathOffset = default(StringOffset), @@ -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,14 +443,14 @@ 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; this.UseBossIndex = false; this.UseBossAIPhaseSync = false; this.RaidBossGroup = null; - this.RaidEnterCostType = SCHALE.Common.FlatData.ParcelType.None_; + this.RaidEnterCostType = SCHALE.Common.FlatData.ParcelType.None; this.RaidEnterCostId = 0; this.RaidEnterCostAmount = 0; this.BossSpinePath = null; @@ -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/EliminateRaidStageRewardExcel.cs b/SCHALE.Common/FlatData/EliminateRaidStageRewardExcel.cs index 23885b1..73a8c92 100644 --- a/SCHALE.Common/FlatData/EliminateRaidStageRewardExcel.cs +++ b/SCHALE.Common/FlatData/EliminateRaidStageRewardExcel.cs @@ -23,7 +23,7 @@ public struct EliminateRaidStageRewardExcel : IFlatbufferObject public long GroupId { get { int o = __p.__offset(4); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public bool IsClearStageRewardHideInfo { get { int o = __p.__offset(6); return o != 0 ? 0!=__p.bb.Get(o + __p.bb_pos) : (bool)false; } } public long ClearStageRewardProb { get { int o = __p.__offset(8); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } - public SCHALE.Common.FlatData.ParcelType ClearStageRewardParcelType { 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 SCHALE.Common.FlatData.ParcelType ClearStageRewardParcelType { 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 ClearStageRewardParcelUniqueID { get { int o = __p.__offset(12); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public string ClearStageRewardParcelUniqueName { get { int o = __p.__offset(14); return o != 0 ? __p.__string(o + __p.bb_pos) : null; } } #if ENABLE_SPAN_T @@ -38,7 +38,7 @@ public struct EliminateRaidStageRewardExcel : IFlatbufferObject long GroupId = 0, bool IsClearStageRewardHideInfo = false, long ClearStageRewardProb = 0, - SCHALE.Common.FlatData.ParcelType ClearStageRewardParcelType = SCHALE.Common.FlatData.ParcelType.None_, + SCHALE.Common.FlatData.ParcelType ClearStageRewardParcelType = SCHALE.Common.FlatData.ParcelType.None, long ClearStageRewardParcelUniqueID = 0, StringOffset ClearStageRewardParcelUniqueNameOffset = default(StringOffset), long ClearStageRewardAmount = 0) { @@ -109,7 +109,7 @@ public class EliminateRaidStageRewardExcelT this.GroupId = 0; this.IsClearStageRewardHideInfo = false; this.ClearStageRewardProb = 0; - this.ClearStageRewardParcelType = SCHALE.Common.FlatData.ParcelType.None_; + this.ClearStageRewardParcelType = SCHALE.Common.FlatData.ParcelType.None; this.ClearStageRewardParcelUniqueID = 0; this.ClearStageRewardParcelUniqueName = null; this.ClearStageRewardAmount = 0; diff --git a/SCHALE.Common/FlatData/EmblemCategory.cs b/SCHALE.Common/FlatData/EmblemCategory.cs index 7ba5219..1621d8e 100644 --- a/SCHALE.Common/FlatData/EmblemCategory.cs +++ b/SCHALE.Common/FlatData/EmblemCategory.cs @@ -7,7 +7,7 @@ namespace SCHALE.Common.FlatData public enum EmblemCategory : int { - None_ = 0, + None = 0, Default = 1, Mission = 2, GroupStory = 3, diff --git a/SCHALE.Common/FlatData/EmblemCheckPassType.cs b/SCHALE.Common/FlatData/EmblemCheckPassType.cs index d99e892..79241c7 100644 --- a/SCHALE.Common/FlatData/EmblemCheckPassType.cs +++ b/SCHALE.Common/FlatData/EmblemCheckPassType.cs @@ -7,7 +7,7 @@ namespace SCHALE.Common.FlatData public enum EmblemCheckPassType : int { - None_ = 0, + None = 0, Default = 1, Favor = 2, Story = 3, diff --git a/SCHALE.Common/FlatData/EmblemExcel.cs b/SCHALE.Common/FlatData/EmblemExcel.cs index 68d3259..8b1e6a3 100644 --- a/SCHALE.Common/FlatData/EmblemExcel.cs +++ b/SCHALE.Common/FlatData/EmblemExcel.cs @@ -21,8 +21,8 @@ public struct EmblemExcel : IFlatbufferObject public EmblemExcel __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.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.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 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; } } @@ -80,14 +80,14 @@ public struct EmblemExcel : IFlatbufferObject #endif public byte[] GetDisplayEndDateArray() { return __p.__vector_as_array(36); } public int DislpayFavorLevel { get { int o = __p.__offset(38); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } - public SCHALE.Common.FlatData.EmblemCheckPassType CheckPassType { get { int o = __p.__offset(40); return o != 0 ? (SCHALE.Common.FlatData.EmblemCheckPassType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.EmblemCheckPassType.None_; } } + public SCHALE.Common.FlatData.EmblemCheckPassType CheckPassType { get { int o = __p.__offset(40); return o != 0 ? (SCHALE.Common.FlatData.EmblemCheckPassType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.EmblemCheckPassType.None; } } public long EmblemParameter { get { int o = __p.__offset(42); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public long CheckPassCount { get { int o = __p.__offset(44); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } 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.EmblemCategory Category = SCHALE.Common.FlatData.EmblemCategory.None, + SCHALE.Common.FlatData.Rarity Rarity = SCHALE.Common.FlatData.Rarity.N, long DisplayOrder = 0, uint LocalizeEtcId = 0, uint LocalizeCodeId = 0, @@ -103,7 +103,7 @@ public struct EmblemExcel : IFlatbufferObject StringOffset DisplayStartDateOffset = default(StringOffset), StringOffset DisplayEndDateOffset = default(StringOffset), int DislpayFavorLevel = 0, - SCHALE.Common.FlatData.EmblemCheckPassType CheckPassType = SCHALE.Common.FlatData.EmblemCheckPassType.None_, + SCHALE.Common.FlatData.EmblemCheckPassType CheckPassType = SCHALE.Common.FlatData.EmblemCheckPassType.None, long EmblemParameter = 0, long CheckPassCount = 0) { builder.StartTable(21); @@ -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; } @@ -247,8 +247,8 @@ public class EmblemExcelT public EmblemExcelT() { this.Id = 0; - this.Category = SCHALE.Common.FlatData.EmblemCategory.None_; - this.Rarity_ = SCHALE.Common.FlatData.Rarity.N; + this.Category = SCHALE.Common.FlatData.EmblemCategory.None; + this.Rarity = SCHALE.Common.FlatData.Rarity.N; this.DisplayOrder = 0; this.LocalizeEtcId = 0; this.LocalizeCodeId = 0; @@ -264,7 +264,7 @@ public class EmblemExcelT this.DisplayStartDate = null; this.DisplayEndDate = null; this.DislpayFavorLevel = 0; - this.CheckPassType = SCHALE.Common.FlatData.EmblemCheckPassType.None_; + this.CheckPassType = SCHALE.Common.FlatData.EmblemCheckPassType.None; this.EmblemParameter = 0; this.CheckPassCount = 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/EndCondition.cs b/SCHALE.Common/FlatData/EndCondition.cs index 53cb959..65f5abd 100644 --- a/SCHALE.Common/FlatData/EndCondition.cs +++ b/SCHALE.Common/FlatData/EndCondition.cs @@ -12,7 +12,7 @@ public enum EndCondition : int AmmoCount = 2, AmmoHit = 3, HitCount = 4, - None_ = 5, + None = 5, UseExSkillCount = 6, }; diff --git a/SCHALE.Common/FlatData/EquipmentExcel.cs b/SCHALE.Common/FlatData/EquipmentExcel.cs index 089fc0d..85d0f50 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/EquipmentOptionType.cs b/SCHALE.Common/FlatData/EquipmentOptionType.cs index 24dbe3a..7d7aa14 100644 --- a/SCHALE.Common/FlatData/EquipmentOptionType.cs +++ b/SCHALE.Common/FlatData/EquipmentOptionType.cs @@ -7,7 +7,7 @@ namespace SCHALE.Common.FlatData public enum EquipmentOptionType : int { - None_ = 0, + None = 0, MaxHP_Base = 1, MaxHP_Coefficient = 2, AttackPower_Base = 3, diff --git a/SCHALE.Common/FlatData/EquipmentStatExcel.cs b/SCHALE.Common/FlatData/EquipmentStatExcel.cs index c903520..671da4f 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/EtcSchool.cs b/SCHALE.Common/FlatData/EtcSchool.cs index 19045ea..2f6a247 100644 --- a/SCHALE.Common/FlatData/EtcSchool.cs +++ b/SCHALE.Common/FlatData/EtcSchool.cs @@ -7,7 +7,7 @@ namespace SCHALE.Common.FlatData public enum EtcSchool : int { - None_ = 0, + None = 0, ETC = 1, Tokiwadai = 2, Sakugawa = 3, diff --git a/SCHALE.Common/FlatData/EventContentBuffExcel.cs b/SCHALE.Common/FlatData/EventContentBuffExcel.cs index 461ca8d..f9422fa 100644 --- a/SCHALE.Common/FlatData/EventContentBuffExcel.cs +++ b/SCHALE.Common/FlatData/EventContentBuffExcel.cs @@ -23,7 +23,7 @@ public struct EventContentBuffExcel : IFlatbufferObject public long EventContentBuffId { get { int o = __p.__offset(4); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public bool IsBuff { get { int o = __p.__offset(6); return o != 0 ? 0!=__p.bb.Get(o + __p.bb_pos) : (bool)false; } } public SCHALE.Common.FlatData.Tag CharacterTag { get { int o = __p.__offset(8); return o != 0 ? (SCHALE.Common.FlatData.Tag)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.Tag.A; } } - public SCHALE.Common.FlatData.EventContentBuffFindRule EnumType { get { int o = __p.__offset(10); return o != 0 ? (SCHALE.Common.FlatData.EventContentBuffFindRule)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.EventContentBuffFindRule.None_; } } + public SCHALE.Common.FlatData.EventContentBuffFindRule EnumType { get { int o = __p.__offset(10); return o != 0 ? (SCHALE.Common.FlatData.EventContentBuffFindRule)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.EventContentBuffFindRule.None; } } public string EnumTypeValue(int j) { int o = __p.__offset(12); return o != 0 ? __p.__string(__p.__vector(o) + j * 4) : null; } public int EnumTypeValueLength { get { int o = __p.__offset(12); return o != 0 ? __p.__vector_len(o) : 0; } } public string SkillGroupId { get { int o = __p.__offset(14); return o != 0 ? __p.__string(o + __p.bb_pos) : null; } } @@ -59,7 +59,7 @@ public struct EventContentBuffExcel : IFlatbufferObject long EventContentBuffId = 0, bool IsBuff = false, SCHALE.Common.FlatData.Tag CharacterTag = SCHALE.Common.FlatData.Tag.A, - SCHALE.Common.FlatData.EventContentBuffFindRule EnumType = SCHALE.Common.FlatData.EventContentBuffFindRule.None_, + SCHALE.Common.FlatData.EventContentBuffFindRule EnumType = SCHALE.Common.FlatData.EventContentBuffFindRule.None, VectorOffset EnumTypeValueOffset = default(VectorOffset), StringOffset SkillGroupIdOffset = default(StringOffset), StringOffset IconPathOffset = default(StringOffset), @@ -157,7 +157,7 @@ public class EventContentBuffExcelT this.EventContentBuffId = 0; this.IsBuff = false; this.CharacterTag = SCHALE.Common.FlatData.Tag.A; - this.EnumType = SCHALE.Common.FlatData.EventContentBuffFindRule.None_; + this.EnumType = SCHALE.Common.FlatData.EventContentBuffFindRule.None; this.EnumTypeValue = null; this.SkillGroupId = null; this.IconPath = null; diff --git a/SCHALE.Common/FlatData/EventContentBuffFindRule.cs b/SCHALE.Common/FlatData/EventContentBuffFindRule.cs index 0c57d45..6332cff 100644 --- a/SCHALE.Common/FlatData/EventContentBuffFindRule.cs +++ b/SCHALE.Common/FlatData/EventContentBuffFindRule.cs @@ -7,7 +7,7 @@ namespace SCHALE.Common.FlatData public enum EventContentBuffFindRule : int { - None_ = 0, + None = 0, WeaponType = 1, SquadType = 2, StreetBattleAdaptation = 3, diff --git a/SCHALE.Common/FlatData/EventContentCardShopExcel.cs b/SCHALE.Common/FlatData/EventContentCardShopExcel.cs index 93b0f2a..ca3586f 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/EventContentChangeExcel.cs b/SCHALE.Common/FlatData/EventContentChangeExcel.cs index 9b266ce..68e72c6 100644 --- a/SCHALE.Common/FlatData/EventContentChangeExcel.cs +++ b/SCHALE.Common/FlatData/EventContentChangeExcel.cs @@ -23,10 +23,10 @@ public struct EventContentChangeExcel : IFlatbufferObject public long EventContentId { get { int o = __p.__offset(4); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public long ChangeCount { get { int o = __p.__offset(6); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public bool IsLast { get { int o = __p.__offset(8); return o != 0 ? 0!=__p.bb.Get(o + __p.bb_pos) : (bool)false; } } - 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 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; } } public int RewardAmount { get { int o = __p.__offset(14); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } - public SCHALE.Common.FlatData.ParcelType ChangeCostType { get { int o = __p.__offset(16); return o != 0 ? (SCHALE.Common.FlatData.ParcelType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.ParcelType.None_; } } + public SCHALE.Common.FlatData.ParcelType ChangeCostType { get { int o = __p.__offset(16); return o != 0 ? (SCHALE.Common.FlatData.ParcelType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.ParcelType.None; } } public long ChangeCostId { get { int o = __p.__offset(18); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public int ChangeCostAmount { get { int o = __p.__offset(20); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } @@ -34,10 +34,10 @@ public struct EventContentChangeExcel : IFlatbufferObject long EventContentId = 0, long ChangeCount = 0, bool IsLast = false, - SCHALE.Common.FlatData.ParcelType RewardParcelType = SCHALE.Common.FlatData.ParcelType.None_, + SCHALE.Common.FlatData.ParcelType RewardParcelType = SCHALE.Common.FlatData.ParcelType.None, long RewardId = 0, int RewardAmount = 0, - SCHALE.Common.FlatData.ParcelType ChangeCostType = SCHALE.Common.FlatData.ParcelType.None_, + SCHALE.Common.FlatData.ParcelType ChangeCostType = SCHALE.Common.FlatData.ParcelType.None, long ChangeCostId = 0, int ChangeCostAmount = 0) { builder.StartTable(9); @@ -116,10 +116,10 @@ public class EventContentChangeExcelT this.EventContentId = 0; this.ChangeCount = 0; this.IsLast = false; - this.RewardParcelType = SCHALE.Common.FlatData.ParcelType.None_; + this.RewardParcelType = SCHALE.Common.FlatData.ParcelType.None; this.RewardId = 0; this.RewardAmount = 0; - this.ChangeCostType = SCHALE.Common.FlatData.ParcelType.None_; + this.ChangeCostType = SCHALE.Common.FlatData.ParcelType.None; this.ChangeCostId = 0; this.ChangeCostAmount = 0; } diff --git a/SCHALE.Common/FlatData/EventContentCollectionExcel.cs b/SCHALE.Common/FlatData/EventContentCollectionExcel.cs index f9e987a..7ac4631 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.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 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,7 +32,7 @@ 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 IsObjectOnFullResource { get { int o = __p.__offset(20); return o != 0 ? 0!=__p.bb.Get(o + __p.bb_pos) : (bool)false; } } @@ -71,9 +71,9 @@ public struct EventContentCollectionExcel : IFlatbufferObject long Id = 0, long EventContentId = 0, long GroupId = 0, - SCHALE.Common.FlatData.CollectionUnlockType UnlockConditionType = SCHALE.Common.FlatData.CollectionUnlockType.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, @@ -93,7 +93,7 @@ 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); @@ -113,7 +113,7 @@ public struct EventContentCollectionExcel : IFlatbufferObject 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 AddIsObjectOnFullResource(FlatBufferBuilder builder, bool isObjectOnFullResource) { builder.AddBool(8, isObjectOnFullResource, false); } @@ -140,7 +140,7 @@ 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); @@ -169,7 +169,7 @@ public struct EventContentCollectionExcel : IFlatbufferObject _o.GroupId, _o.UnlockConditionType, _UnlockConditionParameter, - _o.MultipleConditionCheckType_, + _o.MultipleConditionCheckType, _o.UnlockConditionCount, _o.IsObject, _o.IsObjectOnFullResource, @@ -189,7 +189,7 @@ public class EventContentCollectionExcelT 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 SCHALE.Common.FlatData.MultipleConditionCheckType MultipleConditionCheckType { get; set; } public long UnlockConditionCount { get; set; } public bool IsObject { get; set; } public bool IsObjectOnFullResource { get; set; } @@ -204,9 +204,9 @@ public class EventContentCollectionExcelT this.Id = 0; this.EventContentId = 0; this.GroupId = 0; - this.UnlockConditionType = SCHALE.Common.FlatData.CollectionUnlockType.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; @@ -230,7 +230,7 @@ static public class EventContentCollectionExcelVerify && verifier.VerifyField(tablePos, 8 /*GroupId*/, 8 /*long*/, 8, 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 /*IsObjectOnFullResource*/, 1 /*bool*/, 1, false) diff --git a/SCHALE.Common/FlatData/EventContentCurrencyItemExcel.cs b/SCHALE.Common/FlatData/EventContentCurrencyItemExcel.cs index b615790..fc7bf8f 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 e0f7995..1d9596d 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 ae8357a..ec21e3e 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 8979cf3..39a99ef 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 d35e91a..05472ad 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/EventContentLobbyMenuExcel.cs b/SCHALE.Common/FlatData/EventContentLobbyMenuExcel.cs index 9883372..f70fd07 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/EventContentLocationExcel.cs b/SCHALE.Common/FlatData/EventContentLocationExcel.cs index d325851..e44624c 100644 --- a/SCHALE.Common/FlatData/EventContentLocationExcel.cs +++ b/SCHALE.Common/FlatData/EventContentLocationExcel.cs @@ -31,10 +31,10 @@ public struct EventContentLocationExcel : IFlatbufferObject #endif public byte[] GetPrefabPathArray() { return __p.__vector_as_array(10); } public int LocationResetScheduleCount { get { int o = __p.__offset(12); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } - public SCHALE.Common.FlatData.ParcelType ScheduleEventPointCostParcelType { 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 SCHALE.Common.FlatData.ParcelType ScheduleEventPointCostParcelType { 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 ScheduleEventPointCostParcelId { get { int o = __p.__offset(16); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public long ScheduleEventPointCostParcelAmount { get { int o = __p.__offset(18); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } - public SCHALE.Common.FlatData.ParcelType RewardParcelType { get { int o = __p.__offset(20); return o != 0 ? (SCHALE.Common.FlatData.ParcelType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.ParcelType.None_; } } + public SCHALE.Common.FlatData.ParcelType RewardParcelType { get { int o = __p.__offset(20); 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(22); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public long InformationGroupId { get { int o = __p.__offset(24); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } @@ -44,10 +44,10 @@ public struct EventContentLocationExcel : IFlatbufferObject uint LocalizeEtcId = 0, StringOffset PrefabPathOffset = default(StringOffset), int LocationResetScheduleCount = 0, - SCHALE.Common.FlatData.ParcelType ScheduleEventPointCostParcelType = SCHALE.Common.FlatData.ParcelType.None_, + SCHALE.Common.FlatData.ParcelType ScheduleEventPointCostParcelType = SCHALE.Common.FlatData.ParcelType.None, long ScheduleEventPointCostParcelId = 0, long ScheduleEventPointCostParcelAmount = 0, - SCHALE.Common.FlatData.ParcelType RewardParcelType = SCHALE.Common.FlatData.ParcelType.None_, + SCHALE.Common.FlatData.ParcelType RewardParcelType = SCHALE.Common.FlatData.ParcelType.None, long RewardParcelId = 0, long InformationGroupId = 0) { builder.StartTable(11); @@ -139,10 +139,10 @@ public class EventContentLocationExcelT this.LocalizeEtcId = 0; this.PrefabPath = null; this.LocationResetScheduleCount = 0; - this.ScheduleEventPointCostParcelType = SCHALE.Common.FlatData.ParcelType.None_; + this.ScheduleEventPointCostParcelType = SCHALE.Common.FlatData.ParcelType.None; this.ScheduleEventPointCostParcelId = 0; this.ScheduleEventPointCostParcelAmount = 0; - this.RewardParcelType = SCHALE.Common.FlatData.ParcelType.None_; + this.RewardParcelType = SCHALE.Common.FlatData.ParcelType.None; this.RewardParcelId = 0; this.InformationGroupId = 0; } diff --git a/SCHALE.Common/FlatData/EventContentMeetupExcel.cs b/SCHALE.Common/FlatData/EventContentMeetupExcel.cs index 59e7ab2..940c139 100644 --- a/SCHALE.Common/FlatData/EventContentMeetupExcel.cs +++ b/SCHALE.Common/FlatData/EventContentMeetupExcel.cs @@ -24,7 +24,7 @@ public struct EventContentMeetupExcel : IFlatbufferObject public long EventContentId { get { int o = __p.__offset(6); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public long CharacterId { get { int o = __p.__offset(8); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public long ConditionScenarioGroupId { get { int o = __p.__offset(10); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } - public SCHALE.Common.FlatData.MeetupConditionType ConditionType { get { int o = __p.__offset(12); return o != 0 ? (SCHALE.Common.FlatData.MeetupConditionType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.MeetupConditionType.None_; } } + public SCHALE.Common.FlatData.MeetupConditionType ConditionType { get { int o = __p.__offset(12); return o != 0 ? (SCHALE.Common.FlatData.MeetupConditionType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.MeetupConditionType.None; } } public long ConditionParameter(int j) { int o = __p.__offset(14); return o != 0 ? __p.bb.GetLong(__p.__vector(o) + j * 8) : (long)0; } public int ConditionParameterLength { get { int o = __p.__offset(14); return o != 0 ? __p.__vector_len(o) : 0; } } #if ENABLE_SPAN_T @@ -33,16 +33,16 @@ public struct EventContentMeetupExcel : IFlatbufferObject public ArraySegment? GetConditionParameterBytes() { return __p.__vector_as_arraysegment(14); } #endif public long[] GetConditionParameterArray() { return __p.__vector_as_array(14); } - public SCHALE.Common.FlatData.MeetupConditionPrintType ConditionPrintType { get { int o = __p.__offset(16); return o != 0 ? (SCHALE.Common.FlatData.MeetupConditionPrintType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.MeetupConditionPrintType.None_; } } + public SCHALE.Common.FlatData.MeetupConditionPrintType ConditionPrintType { get { int o = __p.__offset(16); return o != 0 ? (SCHALE.Common.FlatData.MeetupConditionPrintType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.MeetupConditionPrintType.None; } } public static Offset CreateEventContentMeetupExcel(FlatBufferBuilder builder, long Id = 0, long EventContentId = 0, long CharacterId = 0, long ConditionScenarioGroupId = 0, - SCHALE.Common.FlatData.MeetupConditionType ConditionType = SCHALE.Common.FlatData.MeetupConditionType.None_, + SCHALE.Common.FlatData.MeetupConditionType ConditionType = SCHALE.Common.FlatData.MeetupConditionType.None, VectorOffset ConditionParameterOffset = default(VectorOffset), - SCHALE.Common.FlatData.MeetupConditionPrintType ConditionPrintType = SCHALE.Common.FlatData.MeetupConditionPrintType.None_) { + SCHALE.Common.FlatData.MeetupConditionPrintType ConditionPrintType = SCHALE.Common.FlatData.MeetupConditionPrintType.None) { builder.StartTable(7); EventContentMeetupExcel.AddConditionScenarioGroupId(builder, ConditionScenarioGroupId); EventContentMeetupExcel.AddCharacterId(builder, CharacterId); @@ -121,9 +121,9 @@ public class EventContentMeetupExcelT this.EventContentId = 0; this.CharacterId = 0; this.ConditionScenarioGroupId = 0; - this.ConditionType = SCHALE.Common.FlatData.MeetupConditionType.None_; + this.ConditionType = SCHALE.Common.FlatData.MeetupConditionType.None; this.ConditionParameter = null; - this.ConditionPrintType = SCHALE.Common.FlatData.MeetupConditionPrintType.None_; + this.ConditionPrintType = SCHALE.Common.FlatData.MeetupConditionPrintType.None; } } diff --git a/SCHALE.Common/FlatData/EventContentMissionExcel.cs b/SCHALE.Common/FlatData/EventContentMissionExcel.cs index dc7de61..b9daaa3 100644 --- a/SCHALE.Common/FlatData/EventContentMissionExcel.cs +++ b/SCHALE.Common/FlatData/EventContentMissionExcel.cs @@ -32,7 +32,7 @@ public struct EventContentMissionExcel : IFlatbufferObject public byte[] GetGroupNameArray() { return __p.__vector_as_array(10); } public SCHALE.Common.FlatData.MissionCategory Category { get { int o = __p.__offset(12); return o != 0 ? (SCHALE.Common.FlatData.MissionCategory)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.MissionCategory.Challenge; } } public uint Description { get { int o = __p.__offset(14); return o != 0 ? __p.bb.GetUint(o + __p.bb_pos) : (uint)0; } } - public SCHALE.Common.FlatData.MissionResetType ResetType { get { int o = __p.__offset(16); return o != 0 ? (SCHALE.Common.FlatData.MissionResetType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.MissionResetType.None_; } } + public SCHALE.Common.FlatData.MissionResetType ResetType { get { int o = __p.__offset(16); return o != 0 ? (SCHALE.Common.FlatData.MissionResetType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.MissionResetType.None; } } public SCHALE.Common.FlatData.MissionToastDisplayConditionType ToastDisplayType { get { int o = __p.__offset(18); return o != 0 ? (SCHALE.Common.FlatData.MissionToastDisplayConditionType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.MissionToastDisplayConditionType.Always; } } public string ToastImagePath { get { int o = __p.__offset(20); return o != 0 ? __p.__string(o + __p.bb_pos) : null; } } #if ENABLE_SPAN_T @@ -56,7 +56,7 @@ public struct EventContentMissionExcel : IFlatbufferObject public string ShortcutUI(int j) { int o = __p.__offset(32); return o != 0 ? __p.__string(__p.__vector(o) + j * 4) : null; } public int ShortcutUILength { get { int o = __p.__offset(32); return o != 0 ? __p.__vector_len(o) : 0; } } public long ChallengeStageShortcut { get { int o = __p.__offset(34); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } - public SCHALE.Common.FlatData.MissionCompleteConditionType CompleteConditionType { get { int o = __p.__offset(36); return o != 0 ? (SCHALE.Common.FlatData.MissionCompleteConditionType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.MissionCompleteConditionType.None_; } } + public SCHALE.Common.FlatData.MissionCompleteConditionType CompleteConditionType { get { int o = __p.__offset(36); return o != 0 ? (SCHALE.Common.FlatData.MissionCompleteConditionType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.MissionCompleteConditionType.None; } } public bool IsCompleteExtensionTime { get { int o = __p.__offset(38); return o != 0 ? 0!=__p.bb.Get(o + __p.bb_pos) : (bool)false; } } public long CompleteConditionCount { get { int o = __p.__offset(40); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public long CompleteConditionParameter(int j) { int o = __p.__offset(42); return o != 0 ? __p.bb.GetLong(__p.__vector(o) + j * 8) : (long)0; } @@ -147,7 +147,7 @@ public struct EventContentMissionExcel : IFlatbufferObject StringOffset GroupNameOffset = default(StringOffset), SCHALE.Common.FlatData.MissionCategory Category = SCHALE.Common.FlatData.MissionCategory.Challenge, uint Description = 0, - SCHALE.Common.FlatData.MissionResetType ResetType = SCHALE.Common.FlatData.MissionResetType.None_, + SCHALE.Common.FlatData.MissionResetType ResetType = SCHALE.Common.FlatData.MissionResetType.None, SCHALE.Common.FlatData.MissionToastDisplayConditionType ToastDisplayType = SCHALE.Common.FlatData.MissionToastDisplayConditionType.Always, StringOffset ToastImagePathOffset = default(StringOffset), bool ViewFlag = false, @@ -157,7 +157,7 @@ public struct EventContentMissionExcel : IFlatbufferObject long AccountLevel = 0, VectorOffset ShortcutUIOffset = default(VectorOffset), long ChallengeStageShortcut = 0, - SCHALE.Common.FlatData.MissionCompleteConditionType CompleteConditionType = SCHALE.Common.FlatData.MissionCompleteConditionType.None_, + SCHALE.Common.FlatData.MissionCompleteConditionType CompleteConditionType = SCHALE.Common.FlatData.MissionCompleteConditionType.None, bool IsCompleteExtensionTime = false, long CompleteConditionCount = 0, VectorOffset CompleteConditionParameterOffset = default(VectorOffset), @@ -480,7 +480,7 @@ public class EventContentMissionExcelT this.GroupName = null; this.Category = SCHALE.Common.FlatData.MissionCategory.Challenge; this.Description = 0; - this.ResetType = SCHALE.Common.FlatData.MissionResetType.None_; + this.ResetType = SCHALE.Common.FlatData.MissionResetType.None; this.ToastDisplayType = SCHALE.Common.FlatData.MissionToastDisplayConditionType.Always; this.ToastImagePath = null; this.ViewFlag = false; @@ -490,7 +490,7 @@ public class EventContentMissionExcelT this.AccountLevel = 0; this.ShortcutUI = null; this.ChallengeStageShortcut = 0; - this.CompleteConditionType = SCHALE.Common.FlatData.MissionCompleteConditionType.None_; + this.CompleteConditionType = SCHALE.Common.FlatData.MissionCompleteConditionType.None; this.IsCompleteExtensionTime = false; this.CompleteConditionCount = 0; this.CompleteConditionParameter = null; diff --git a/SCHALE.Common/FlatData/EventContentNotifyExcel.cs b/SCHALE.Common/FlatData/EventContentNotifyExcel.cs index 99ebb1f..0ce48dc 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 33d7962..e0d0872 100644 --- a/SCHALE.Common/FlatData/EventContentReleaseType.cs +++ b/SCHALE.Common/FlatData/EventContentReleaseType.cs @@ -7,7 +7,7 @@ namespace SCHALE.Common.FlatData public enum EventContentReleaseType : int { - None_ = 0, + None = 0, Permanent = 1, MainStory = 2, PermanentSpecialOperate = 3, diff --git a/SCHALE.Common/FlatData/EventContentScenarioConditionType.cs b/SCHALE.Common/FlatData/EventContentScenarioConditionType.cs index d32c0fc..741a5e8 100644 --- a/SCHALE.Common/FlatData/EventContentScenarioConditionType.cs +++ b/SCHALE.Common/FlatData/EventContentScenarioConditionType.cs @@ -7,7 +7,7 @@ namespace SCHALE.Common.FlatData public enum EventContentScenarioConditionType : int { - None_ = 0, + None = 0, DayAfter = 1, EventPoint = 2, }; diff --git a/SCHALE.Common/FlatData/EventContentScenarioExcel.cs b/SCHALE.Common/FlatData/EventContentScenarioExcel.cs index 9eda4c8..4f547b9 100644 --- a/SCHALE.Common/FlatData/EventContentScenarioExcel.cs +++ b/SCHALE.Common/FlatData/EventContentScenarioExcel.cs @@ -36,7 +36,7 @@ public struct EventContentScenarioExcel : IFlatbufferObject public ArraySegment? GetScenarioGroupIdBytes() { return __p.__vector_as_arraysegment(20); } #endif public long[] GetScenarioGroupIdArray() { return __p.__vector_as_array(20); } - public SCHALE.Common.FlatData.EventContentScenarioConditionType ScenarioConditionType { get { int o = __p.__offset(22); return o != 0 ? (SCHALE.Common.FlatData.EventContentScenarioConditionType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.EventContentScenarioConditionType.None_; } } + public SCHALE.Common.FlatData.EventContentScenarioConditionType ScenarioConditionType { get { int o = __p.__offset(22); return o != 0 ? (SCHALE.Common.FlatData.EventContentScenarioConditionType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.EventContentScenarioConditionType.None; } } public long ConditionAmount { get { int o = __p.__offset(24); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public long ConditionEventContentId { get { int o = __p.__offset(26); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public long ClearedScenarioGroupId { get { int o = __p.__offset(28); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } @@ -49,7 +49,7 @@ public struct EventContentScenarioExcel : IFlatbufferObject #endif public byte[] GetRecollectionResourceArray() { return __p.__vector_as_array(32); } public bool IsRecollectionHorizon { get { int o = __p.__offset(34); return o != 0 ? 0!=__p.bb.Get(o + __p.bb_pos) : (bool)false; } } - public SCHALE.Common.FlatData.ParcelType CostParcelType { 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 SCHALE.Common.FlatData.ParcelType CostParcelType { 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 CostId { get { int o = __p.__offset(38); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public int CostAmount { get { int o = __p.__offset(40); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } public SCHALE.Common.FlatData.ParcelType RewardParcelType(int j) { int o = __p.__offset(42); return o != 0 ? (SCHALE.Common.FlatData.ParcelType)__p.bb.GetInt(__p.__vector(o) + j * 4) : (SCHALE.Common.FlatData.ParcelType)0; } @@ -87,14 +87,14 @@ public struct EventContentScenarioExcel : IFlatbufferObject bool IsMeetup = false, bool IsOmnibus = false, VectorOffset ScenarioGroupIdOffset = default(VectorOffset), - SCHALE.Common.FlatData.EventContentScenarioConditionType ScenarioConditionType = SCHALE.Common.FlatData.EventContentScenarioConditionType.None_, + SCHALE.Common.FlatData.EventContentScenarioConditionType ScenarioConditionType = SCHALE.Common.FlatData.EventContentScenarioConditionType.None, long ConditionAmount = 0, long ConditionEventContentId = 0, long ClearedScenarioGroupId = 0, uint RecollectionSummaryLocalizeScenarioId = 0, StringOffset RecollectionResourceOffset = default(StringOffset), bool IsRecollectionHorizon = false, - SCHALE.Common.FlatData.ParcelType CostParcelType = SCHALE.Common.FlatData.ParcelType.None_, + SCHALE.Common.FlatData.ParcelType CostParcelType = SCHALE.Common.FlatData.ParcelType.None, long CostId = 0, int CostAmount = 0, VectorOffset RewardParcelTypeOffset = default(VectorOffset), @@ -292,14 +292,14 @@ public class EventContentScenarioExcelT this.IsMeetup = false; this.IsOmnibus = false; this.ScenarioGroupId = null; - this.ScenarioConditionType = SCHALE.Common.FlatData.EventContentScenarioConditionType.None_; + this.ScenarioConditionType = SCHALE.Common.FlatData.EventContentScenarioConditionType.None; this.ConditionAmount = 0; this.ConditionEventContentId = 0; this.ClearedScenarioGroupId = 0; this.RecollectionSummaryLocalizeScenarioId = 0; this.RecollectionResource = null; this.IsRecollectionHorizon = false; - this.CostParcelType = SCHALE.Common.FlatData.ParcelType.None_; + this.CostParcelType = SCHALE.Common.FlatData.ParcelType.None; this.CostId = 0; this.CostAmount = 0; this.RewardParcelType = null; diff --git a/SCHALE.Common/FlatData/EventContentSeasonExcel.cs b/SCHALE.Common/FlatData/EventContentSeasonExcel.cs index 3cd9c3d..bfa0b2e 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; } } @@ -155,7 +155,7 @@ public struct EventContentSeasonExcel : IFlatbufferObject #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 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; } } @@ -166,11 +166,11 @@ public struct EventContentSeasonExcel : IFlatbufferObject 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, @@ -194,7 +194,7 @@ public struct EventContentSeasonExcel : IFlatbufferObject 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, @@ -211,7 +211,7 @@ 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); @@ -228,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); @@ -245,11 +245,11 @@ public struct EventContentSeasonExcel : IFlatbufferObject 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); } @@ -278,7 +278,7 @@ public struct EventContentSeasonExcel : IFlatbufferObject 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 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); } @@ -298,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); @@ -327,7 +327,7 @@ public struct EventContentSeasonExcel : IFlatbufferObject _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); @@ -362,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, @@ -390,7 +390,7 @@ public struct EventContentSeasonExcel : IFlatbufferObject _MinigameMissionBgImagePath, _CardBgImagePath, _o.EventAssist, - _o.EventContentReleaseType_, + _o.EventContentReleaseType, _o.EventContentStageRewardIdPermanent, _o.RewardTagPermanent, _o.MiniEventShortCutScenarioModeId, @@ -404,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; } @@ -432,7 +432,7 @@ public class EventContentSeasonExcelT 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; } @@ -443,11 +443,11 @@ public class EventContentSeasonExcelT 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; @@ -471,7 +471,7 @@ public class EventContentSeasonExcelT 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; @@ -489,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) @@ -517,7 +517,7 @@ static public class EventContentSeasonExcelVerify && 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, 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) diff --git a/SCHALE.Common/FlatData/EventContentShopExcel.cs b/SCHALE.Common/FlatData/EventContentShopExcel.cs index 1a9c711..c895405 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 63f8631..bac5953 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 5ec18c2..7e27f33 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); } @@ -47,7 +47,7 @@ public struct EventContentStageExcel : IFlatbufferObject public SCHALE.Common.FlatData.EventContentType OpenConditionContentType { get { int o = __p.__offset(28); return o != 0 ? (SCHALE.Common.FlatData.EventContentType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.EventContentType.Stage; } } public long OpenConditionContentId { get { int o = __p.__offset(30); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public long BattleDuration { get { int o = __p.__offset(32); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } - public SCHALE.Common.FlatData.ParcelType StageEnterCostType { get { int o = __p.__offset(34); return o != 0 ? (SCHALE.Common.FlatData.ParcelType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.ParcelType.None_; } } + public SCHALE.Common.FlatData.ParcelType StageEnterCostType { get { int o = __p.__offset(34); 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(36); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public int StageEnterCostAmount { get { int o = __p.__offset(38); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } public int StageEnterEchelonCount { get { int o = __p.__offset(40); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } @@ -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, @@ -138,7 +138,7 @@ public struct EventContentStageExcel : IFlatbufferObject SCHALE.Common.FlatData.EventContentType OpenConditionContentType = SCHALE.Common.FlatData.EventContentType.Stage, long OpenConditionContentId = 0, long BattleDuration = 0, - SCHALE.Common.FlatData.ParcelType StageEnterCostType = SCHALE.Common.FlatData.ParcelType.None_, + SCHALE.Common.FlatData.ParcelType StageEnterCostType = SCHALE.Common.FlatData.ParcelType.None, long StageEnterCostId = 0, int StageEnterCostAmount = 0, int StageEnterEchelonCount = 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; @@ -473,7 +473,7 @@ public class EventContentStageExcelT this.OpenConditionContentType = SCHALE.Common.FlatData.EventContentType.Stage; this.OpenConditionContentId = 0; this.BattleDuration = 0; - this.StageEnterCostType = SCHALE.Common.FlatData.ParcelType.None_; + this.StageEnterCostType = SCHALE.Common.FlatData.ParcelType.None; this.StageEnterCostId = 0; this.StageEnterCostAmount = 0; this.StageEnterEchelonCount = 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 67dbf79..ae269a1 100644 --- a/SCHALE.Common/FlatData/EventContentStageRewardExcel.cs +++ b/SCHALE.Common/FlatData/EventContentStageRewardExcel.cs @@ -21,18 +21,18 @@ 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 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; } } public int RewardAmount { get { int o = __p.__offset(14); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } public bool IsDisplayed { get { int o = __p.__offset(16); return o != 0 ? 0!=__p.bb.Get(o + __p.bb_pos) : (bool)false; } } 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_, + SCHALE.Common.FlatData.ParcelType RewardParcelType = SCHALE.Common.FlatData.ParcelType.None, long RewardId = 0, int RewardAmount = 0, bool IsDisplayed = false) { @@ -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,9 +100,9 @@ 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.RewardParcelType = SCHALE.Common.FlatData.ParcelType.None; this.RewardId = 0; this.RewardAmount = 0; this.IsDisplayed = false; @@ -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/ExternalBTTrigger.cs b/SCHALE.Common/FlatData/ExternalBTTrigger.cs index ca688ec..ed0b5d3 100644 --- a/SCHALE.Common/FlatData/ExternalBTTrigger.cs +++ b/SCHALE.Common/FlatData/ExternalBTTrigger.cs @@ -7,7 +7,7 @@ namespace SCHALE.Common.FlatData public enum ExternalBTTrigger : int { - None_ = 0, + None = 0, HPUnder = 1, ApplySkillEffectCategory = 2, HaveNextExSkillActiveGauge = 3, diff --git a/SCHALE.Common/FlatData/FarmingDungeonLocationManageExcel.cs b/SCHALE.Common/FlatData/FarmingDungeonLocationManageExcel.cs index 0e98495..0b2bf60 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 f858fb4..17058a9 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); } @@ -33,10 +33,10 @@ public struct FieldContentStageExcel : IFlatbufferObject #endif public byte[] GetNameArray() { return __p.__vector_as_array(14); } public long BattleDuration { get { int o = __p.__offset(16); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } - 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 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_, + 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.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 616f9e1..0b40a61 100644 --- a/SCHALE.Common/FlatData/FieldContentStageRewardExcel.cs +++ b/SCHALE.Common/FlatData/FieldContentStageRewardExcel.cs @@ -21,18 +21,18 @@ 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 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; } } public int RewardAmount { get { int o = __p.__offset(14); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } public bool IsDisplayed { get { int o = __p.__offset(16); return o != 0 ? 0!=__p.bb.Get(o + __p.bb_pos) : (bool)false; } } 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_, + SCHALE.Common.FlatData.ParcelType RewardParcelType = SCHALE.Common.FlatData.ParcelType.None, long RewardId = 0, int RewardAmount = 0, bool IsDisplayed = false) { @@ -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,9 +100,9 @@ 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.RewardParcelType = SCHALE.Common.FlatData.ParcelType.None; this.RewardId = 0; this.RewardAmount = 0; this.IsDisplayed = false; @@ -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/FieldDialogType.cs b/SCHALE.Common/FlatData/FieldDialogType.cs index 0a7c7dc..11e87d1 100644 --- a/SCHALE.Common/FlatData/FieldDialogType.cs +++ b/SCHALE.Common/FlatData/FieldDialogType.cs @@ -7,7 +7,7 @@ namespace SCHALE.Common.FlatData public enum FieldDialogType : int { - None_ = 0, + None = 0, Talk = 1, Think = 2, Exclaim = 3, diff --git a/SCHALE.Common/FlatData/FieldInteractionType.cs b/SCHALE.Common/FlatData/FieldInteractionType.cs index bd959fa..29fa51f 100644 --- a/SCHALE.Common/FlatData/FieldInteractionType.cs +++ b/SCHALE.Common/FlatData/FieldInteractionType.cs @@ -7,7 +7,7 @@ namespace SCHALE.Common.FlatData public enum FieldInteractionType : int { - None_ = 0, + None = 0, Scenario = 1, Reward = 2, Dialog = 3, diff --git a/SCHALE.Common/FlatData/FieldMasteryExcel.cs b/SCHALE.Common/FlatData/FieldMasteryExcel.cs index d039e96..be349b3 100644 --- a/SCHALE.Common/FlatData/FieldMasteryExcel.cs +++ b/SCHALE.Common/FlatData/FieldMasteryExcel.cs @@ -24,7 +24,7 @@ public struct FieldMasteryExcel : IFlatbufferObject public long SeasonId { get { int o = __p.__offset(6); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public int Order { get { int o = __p.__offset(8); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } public long ExpAmount { get { int o = __p.__offset(10); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } - public SCHALE.Common.FlatData.ParcelType TokenType { 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 TokenType { 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 TokenId { get { int o = __p.__offset(14); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public long TokenRequirement { get { int o = __p.__offset(16); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public SCHALE.Common.FlatData.FieldConditionType AccomplishmentConditionType { get { int o = __p.__offset(18); return o != 0 ? (SCHALE.Common.FlatData.FieldConditionType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.FieldConditionType.Invalid; } } @@ -35,7 +35,7 @@ public struct FieldMasteryExcel : IFlatbufferObject long SeasonId = 0, int Order = 0, long ExpAmount = 0, - SCHALE.Common.FlatData.ParcelType TokenType = SCHALE.Common.FlatData.ParcelType.None_, + SCHALE.Common.FlatData.ParcelType TokenType = SCHALE.Common.FlatData.ParcelType.None, long TokenId = 0, long TokenRequirement = 0, SCHALE.Common.FlatData.FieldConditionType AccomplishmentConditionType = SCHALE.Common.FlatData.FieldConditionType.Invalid, @@ -117,7 +117,7 @@ public class FieldMasteryExcelT this.SeasonId = 0; this.Order = 0; this.ExpAmount = 0; - this.TokenType = SCHALE.Common.FlatData.ParcelType.None_; + this.TokenType = SCHALE.Common.FlatData.ParcelType.None; this.TokenId = 0; this.TokenRequirement = 0; this.AccomplishmentConditionType = SCHALE.Common.FlatData.FieldConditionType.Invalid; diff --git a/SCHALE.Common/FlatData/FieldRewardExcel.cs b/SCHALE.Common/FlatData/FieldRewardExcel.cs index 25252c4..46a2d56 100644 --- a/SCHALE.Common/FlatData/FieldRewardExcel.cs +++ b/SCHALE.Common/FlatData/FieldRewardExcel.cs @@ -22,14 +22,14 @@ public struct FieldRewardExcel : IFlatbufferObject public long GroupId { get { int o = __p.__offset(4); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public int RewardProb { get { int o = __p.__offset(6); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } - 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 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 RewardId { get { int o = __p.__offset(10); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public int RewardAmount { get { int o = __p.__offset(12); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } public static Offset CreateFieldRewardExcel(FlatBufferBuilder builder, long GroupId = 0, int RewardProb = 0, - SCHALE.Common.FlatData.ParcelType RewardParcelType = SCHALE.Common.FlatData.ParcelType.None_, + SCHALE.Common.FlatData.ParcelType RewardParcelType = SCHALE.Common.FlatData.ParcelType.None, long RewardId = 0, int RewardAmount = 0) { builder.StartTable(5); @@ -87,7 +87,7 @@ public class FieldRewardExcelT public FieldRewardExcelT() { this.GroupId = 0; this.RewardProb = 0; - this.RewardParcelType = SCHALE.Common.FlatData.ParcelType.None_; + this.RewardParcelType = SCHALE.Common.FlatData.ParcelType.None; this.RewardId = 0; this.RewardAmount = 0; } diff --git a/SCHALE.Common/FlatData/FieldStoryStageExcel.cs b/SCHALE.Common/FlatData/FieldStoryStageExcel.cs index 5defb7b..5b4d97e 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/FieldTutorialType.cs b/SCHALE.Common/FlatData/FieldTutorialType.cs index 82f3b51..77ba593 100644 --- a/SCHALE.Common/FlatData/FieldTutorialType.cs +++ b/SCHALE.Common/FlatData/FieldTutorialType.cs @@ -7,7 +7,7 @@ namespace SCHALE.Common.FlatData public enum FieldTutorialType : int { - None_ = 0, + None = 0, MasteryHUD = 1, QuestHUD = 2, WorldMapHUD = 3, diff --git a/SCHALE.Common/FlatData/FloaterCommonExcel.cs b/SCHALE.Common/FlatData/FloaterCommonExcel.cs index 051d48f..1b3db01 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/FontType.cs b/SCHALE.Common/FlatData/FontType.cs index 997bf23..53d36f7 100644 --- a/SCHALE.Common/FlatData/FontType.cs +++ b/SCHALE.Common/FlatData/FontType.cs @@ -7,7 +7,7 @@ namespace SCHALE.Common.FlatData public enum FontType : int { - None_ = 0, + None = 0, Damage = 1, Block = 2, Heal = 3, diff --git a/SCHALE.Common/FlatData/Form.cs b/SCHALE.Common/FlatData/Form.cs index a814798..9d5ea75 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 MoveEnd_Offset = default(Offset), + Offset moveEndOffset = default(Offset), Offset PublicSkillOffset = default(Offset)) { builder.StartTable(2); Form.AddPublicSkill(builder, PublicSkillOffset); - Form.AddMoveEnd_(builder, MoveEnd_Offset); + Form.AddMoveEnd(builder, moveEndOffset); return Form.EndForm(builder); } public static void StartForm(FlatBufferBuilder builder) { builder.StartTable(2); } - public static void AddMoveEnd_(FlatBufferBuilder builder, Offset moveEnd_Offset) { builder.AddOffset(0, moveEnd_Offset.Value, 0); } + public static void AddMoveEnd(FlatBufferBuilder builder, Offset moveEndOffset) { builder.AddOffset(0, moveEndOffset.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 faeb695..8c4a718 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(int j) { int o = __p.__offset(68); return o != 0 ? __p.bb.GetLong(__p.__vector(o) + j * 8) : (long)0; } public int FurnitureFunctionParameterLength { get { int o = __p.__offset(68); return o != 0 ? __p.__vector_len(o) : 0; } } #if ENABLE_SPAN_T @@ -118,8 +118,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, @@ -148,7 +148,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, VectorOffset FurnitureFunctionParameterOffset = default(VectorOffset), long VideoId = 0, long EventCollectionId = 0, @@ -180,7 +180,7 @@ public struct FurnitureExcel : IFlatbufferObject FurnitureExcel.AddCafeCharacterStateAdd(builder, CafeCharacterStateAddOffset); FurnitureExcel.AddCafeCharacterStateReq(builder, CafeCharacterStateReqOffset); FurnitureExcel.AddFurnitureFunctionParameter(builder, FurnitureFunctionParameterOffset); - FurnitureExcel.AddFurnitureFunctionType_(builder, FurnitureFunctionType_); + FurnitureExcel.AddFurnitureFunctionType(builder, FurnitureFunctionType); FurnitureExcel.AddTags(builder, TagsOffset); FurnitureExcel.AddCornerPrefab(builder, CornerPrefabOffset); FurnitureExcel.AddSubExpandPrefab(builder, SubExpandPrefabOffset); @@ -196,8 +196,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); @@ -205,8 +205,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); } @@ -240,7 +240,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, VectorOffset furnitureFunctionParameterOffset) { builder.AddOffset(32, furnitureFunctionParameterOffset.Value, 0); } public static VectorOffset CreateFurnitureFunctionParameterVector(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 CreateFurnitureFunctionParameterVectorBlock(FlatBufferBuilder builder, long[] data) { builder.StartVector(8, data.Length, 8); builder.Add(data); return builder.EndVector(); } @@ -287,8 +287,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); @@ -318,7 +318,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 = new List(); for (var _j = 0; _j < this.FurnitureFunctionParameterLength; ++_j) {_o.FurnitureFunctionParameter.Add(TableEncryptionService.Convert(this.FurnitureFunctionParameter(_j), key));} _o.VideoId = TableEncryptionService.Convert(this.VideoId, key); @@ -379,8 +379,8 @@ public struct FurnitureExcel : IFlatbufferObject return CreateFurnitureExcel( builder, _o.Id, - _o.ProductionStep_, - _o.Rarity_, + _o.ProductionStep, + _o.Rarity, _o.Category, _o.SubCategory, _o.LocalizeEtcId, @@ -409,7 +409,7 @@ public struct FurnitureExcel : IFlatbufferObject _o.CraftQualityTier1, _o.CraftQualityTier2, _o.ShiftingCraftQuality, - _o.FurnitureFunctionType_, + _o.FurnitureFunctionType, _FurnitureFunctionParameter, _o.VideoId, _o.EventCollectionId, @@ -425,8 +425,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; } @@ -455,7 +455,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 List FurnitureFunctionParameter { get; set; } public long VideoId { get; set; } public long EventCollectionId { get; set; } @@ -468,8 +468,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; @@ -498,7 +498,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 = null; this.VideoId = 0; this.EventCollectionId = 0; @@ -518,8 +518,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) @@ -548,7 +548,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.VerifyVectorOfData(tablePos, 68 /*FurnitureFunctionParameter*/, 8 /*long*/, 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/FurnitureFunctionType.cs b/SCHALE.Common/FlatData/FurnitureFunctionType.cs index cbd3ad0..5380adf 100644 --- a/SCHALE.Common/FlatData/FurnitureFunctionType.cs +++ b/SCHALE.Common/FlatData/FurnitureFunctionType.cs @@ -7,7 +7,7 @@ namespace SCHALE.Common.FlatData public enum FurnitureFunctionType : int { - None_ = 0, + None = 0, EventCollection = 1, VideoPlay = 2, TrophyCollection = 3, diff --git a/SCHALE.Common/FlatData/FurnitureLocation.cs b/SCHALE.Common/FlatData/FurnitureLocation.cs index e00822c..8676705 100644 --- a/SCHALE.Common/FlatData/FurnitureLocation.cs +++ b/SCHALE.Common/FlatData/FurnitureLocation.cs @@ -7,7 +7,7 @@ namespace SCHALE.Common.FlatData public enum FurnitureLocation : int { - None_ = 0, + None = 0, Inventory = 1, Floor = 2, WallLeft = 3, diff --git a/SCHALE.Common/FlatData/FurnitureTemplateElementExcel.cs b/SCHALE.Common/FlatData/FurnitureTemplateElementExcel.cs index 2b32235..08f9a45 100644 --- a/SCHALE.Common/FlatData/FurnitureTemplateElementExcel.cs +++ b/SCHALE.Common/FlatData/FurnitureTemplateElementExcel.cs @@ -22,7 +22,7 @@ public struct FurnitureTemplateElementExcel : IFlatbufferObject public long FurnitureTemplateId { get { int o = __p.__offset(4); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public long FurnitureId { get { int o = __p.__offset(6); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } - public SCHALE.Common.FlatData.FurnitureLocation Location { get { int o = __p.__offset(8); return o != 0 ? (SCHALE.Common.FlatData.FurnitureLocation)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.FurnitureLocation.None_; } } + public SCHALE.Common.FlatData.FurnitureLocation Location { get { int o = __p.__offset(8); return o != 0 ? (SCHALE.Common.FlatData.FurnitureLocation)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.FurnitureLocation.None; } } public float PositionX { get { int o = __p.__offset(10); return o != 0 ? __p.bb.GetFloat(o + __p.bb_pos) : (float)0.0f; } } public float PositionY { get { int o = __p.__offset(12); return o != 0 ? __p.bb.GetFloat(o + __p.bb_pos) : (float)0.0f; } } public float Rotation { get { int o = __p.__offset(14); return o != 0 ? __p.bb.GetFloat(o + __p.bb_pos) : (float)0.0f; } } @@ -31,7 +31,7 @@ public struct FurnitureTemplateElementExcel : IFlatbufferObject public static Offset CreateFurnitureTemplateElementExcel(FlatBufferBuilder builder, long FurnitureTemplateId = 0, long FurnitureId = 0, - SCHALE.Common.FlatData.FurnitureLocation Location = SCHALE.Common.FlatData.FurnitureLocation.None_, + SCHALE.Common.FlatData.FurnitureLocation Location = SCHALE.Common.FlatData.FurnitureLocation.None, float PositionX = 0.0f, float PositionY = 0.0f, float Rotation = 0.0f, @@ -101,7 +101,7 @@ public class FurnitureTemplateElementExcelT public FurnitureTemplateElementExcelT() { this.FurnitureTemplateId = 0; this.FurnitureId = 0; - this.Location = SCHALE.Common.FlatData.FurnitureLocation.None_; + this.Location = SCHALE.Common.FlatData.FurnitureLocation.None; this.PositionX = 0.0f; this.PositionY = 0.0f; this.Rotation = 0.0f; diff --git a/SCHALE.Common/FlatData/GachaDisplayTag.cs b/SCHALE.Common/FlatData/GachaDisplayTag.cs index 39072ab..e89566d 100644 --- a/SCHALE.Common/FlatData/GachaDisplayTag.cs +++ b/SCHALE.Common/FlatData/GachaDisplayTag.cs @@ -7,7 +7,7 @@ namespace SCHALE.Common.FlatData public enum GachaDisplayTag : int { - None_ = 0, + None = 0, Limited = 1, TwoStar = 2, ThreeStar = 3, diff --git a/SCHALE.Common/FlatData/GachaElementExcel.cs b/SCHALE.Common/FlatData/GachaElementExcel.cs index d02147d..5e15bec 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 98e6b4d..8c3a46a 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/GachaGroupExcel.cs b/SCHALE.Common/FlatData/GachaGroupExcel.cs index 5748c3e..a51e7b2 100644 --- a/SCHALE.Common/FlatData/GachaGroupExcel.cs +++ b/SCHALE.Common/FlatData/GachaGroupExcel.cs @@ -29,13 +29,13 @@ public struct GachaGroupExcel : IFlatbufferObject #endif public byte[] GetNameKrArray() { return __p.__vector_as_array(6); } public bool IsRecursive { get { int o = __p.__offset(8); return o != 0 ? 0!=__p.bb.Get(o + __p.bb_pos) : (bool)false; } } - public SCHALE.Common.FlatData.GachaGroupType GroupType { get { int o = __p.__offset(10); return o != 0 ? (SCHALE.Common.FlatData.GachaGroupType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.GachaGroupType.None_; } } + public SCHALE.Common.FlatData.GachaGroupType GroupType { get { int o = __p.__offset(10); return o != 0 ? (SCHALE.Common.FlatData.GachaGroupType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.GachaGroupType.None; } } public static Offset CreateGachaGroupExcel(FlatBufferBuilder builder, long ID = 0, StringOffset NameKrOffset = default(StringOffset), bool IsRecursive = false, - SCHALE.Common.FlatData.GachaGroupType GroupType = SCHALE.Common.FlatData.GachaGroupType.None_) { + SCHALE.Common.FlatData.GachaGroupType GroupType = SCHALE.Common.FlatData.GachaGroupType.None) { builder.StartTable(4); GachaGroupExcel.AddID(builder, ID); GachaGroupExcel.AddGroupType(builder, GroupType); @@ -88,7 +88,7 @@ public class GachaGroupExcelT this.ID = 0; this.NameKr = null; this.IsRecursive = false; - this.GroupType = SCHALE.Common.FlatData.GachaGroupType.None_; + this.GroupType = SCHALE.Common.FlatData.GachaGroupType.None; } } diff --git a/SCHALE.Common/FlatData/GachaGroupType.cs b/SCHALE.Common/FlatData/GachaGroupType.cs index 0f9bf58..c88beef 100644 --- a/SCHALE.Common/FlatData/GachaGroupType.cs +++ b/SCHALE.Common/FlatData/GachaGroupType.cs @@ -7,7 +7,7 @@ namespace SCHALE.Common.FlatData public enum GachaGroupType : int { - None_ = 0, + None = 0, Reward_General = 1, System_Craft = 2, Reward_Pack = 3, diff --git a/SCHALE.Common/FlatData/GachaRewardType.cs b/SCHALE.Common/FlatData/GachaRewardType.cs index 2977762..2896198 100644 --- a/SCHALE.Common/FlatData/GachaRewardType.cs +++ b/SCHALE.Common/FlatData/GachaRewardType.cs @@ -7,7 +7,7 @@ namespace SCHALE.Common.FlatData public enum GachaRewardType : int { - None_ = 0, + None = 0, Eligma = 1, Eleph = 2, }; diff --git a/SCHALE.Common/FlatData/GachaTicketType.cs b/SCHALE.Common/FlatData/GachaTicketType.cs index 64de7b6..6c2dabf 100644 --- a/SCHALE.Common/FlatData/GachaTicketType.cs +++ b/SCHALE.Common/FlatData/GachaTicketType.cs @@ -7,7 +7,7 @@ namespace SCHALE.Common.FlatData public enum GachaTicketType : int { - None_ = 0, + None = 0, PackageThreeStar = 1, ThreeStar = 2, TwoStar = 3, diff --git a/SCHALE.Common/FlatData/GetStickerConditionType.cs b/SCHALE.Common/FlatData/GetStickerConditionType.cs index 11654f4..b0e20cd 100644 --- a/SCHALE.Common/FlatData/GetStickerConditionType.cs +++ b/SCHALE.Common/FlatData/GetStickerConditionType.cs @@ -7,7 +7,7 @@ namespace SCHALE.Common.FlatData public enum GetStickerConditionType : int { - None_ = 0, + None = 0, Reset_StikcerGetCondition_AccountLevel = 1, Reset_StickerGetCondition_ScenarioModeId = 2, Reset_StickerGetCondition_EnemyKillCount = 3, diff --git a/SCHALE.Common/FlatData/GoodsExcel.cs b/SCHALE.Common/FlatData/GoodsExcel.cs index 6a00618..b0a3327 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); } @@ -62,7 +62,7 @@ public struct GoodsExcel : IFlatbufferObject public ArraySegment? GetConsumeCondition_Bytes() { return __p.__vector_as_arraysegment(18); } #endif public SCHALE.Common.FlatData.ConsumeCondition[] GetConsumeCondition_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.ConsumeCondition[] a = new SCHALE.Common.FlatData.ConsumeCondition[l]; for (int i = 0; i < l; i++) { a[i] = (SCHALE.Common.FlatData.ConsumeCondition)__p.bb.GetInt(p + i * 4); } return a; } - public SCHALE.Common.FlatData.GachaTicketType ConsumeGachaTicketType { get { int o = __p.__offset(20); return o != 0 ? (SCHALE.Common.FlatData.GachaTicketType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.GachaTicketType.None_; } } + public SCHALE.Common.FlatData.GachaTicketType ConsumeGachaTicketType { get { int o = __p.__offset(20); return o != 0 ? (SCHALE.Common.FlatData.GachaTicketType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.GachaTicketType.None; } } public long ConsumeGachaTicketTypeAmount { get { int o = __p.__offset(22); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public long ProductIdAOS { get { int o = __p.__offset(24); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public long ProductIdiOS { get { int o = __p.__offset(26); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } @@ -111,13 +111,13 @@ 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), VectorOffset ConsumeParcelAmountOffset = default(VectorOffset), VectorOffset ConsumeCondition_Offset = default(VectorOffset), - SCHALE.Common.FlatData.GachaTicketType ConsumeGachaTicketType = SCHALE.Common.FlatData.GachaTicketType.None_, + SCHALE.Common.FlatData.GachaTicketType ConsumeGachaTicketType = SCHALE.Common.FlatData.GachaTicketType.None, long ConsumeGachaTicketTypeAmount = 0, long ProductIdAOS = 0, long ProductIdiOS = 0, @@ -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,13 +347,13 @@ 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; this.ConsumeParcelAmount = null; this.ConsumeCondition_ = null; - this.ConsumeGachaTicketType = SCHALE.Common.FlatData.GachaTicketType.None_; + this.ConsumeGachaTicketType = SCHALE.Common.FlatData.GachaTicketType.None; this.ConsumeGachaTicketTypeAmount = 0; this.ProductIdAOS = 0; this.ProductIdiOS = 0; @@ -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 fd619d6..aa613c0 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; } } @@ -66,9 +66,9 @@ public struct GroundExcel : IFlatbufferObject public long BGMId { get { int o = __p.__offset(76); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public bool WarningUI { get { int o = __p.__offset(78); return o != 0 ? 0!=__p.bb.Get(o + __p.bb_pos) : (bool)false; } } public bool TSSHatchOpen { get { int o = __p.__offset(80); return o != 0 ? 0!=__p.bb.Get(o + __p.bb_pos) : (bool)false; } } - public SCHALE.Common.FlatData.TacticSpeed ForcedTacticSpeed { get { int o = __p.__offset(82); return o != 0 ? (SCHALE.Common.FlatData.TacticSpeed)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.TacticSpeed.None_; } } - public SCHALE.Common.FlatData.TacticSkillUse ForcedSkillUse { get { int o = __p.__offset(84); return o != 0 ? (SCHALE.Common.FlatData.TacticSkillUse)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.TacticSkillUse.None_; } } - public SCHALE.Common.FlatData.ShowSkillCutIn ShowNPCSkillCutIn { get { int o = __p.__offset(86); return o != 0 ? (SCHALE.Common.FlatData.ShowSkillCutIn)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.ShowSkillCutIn.None_; } } + public SCHALE.Common.FlatData.TacticSpeed ForcedTacticSpeed { get { int o = __p.__offset(82); return o != 0 ? (SCHALE.Common.FlatData.TacticSpeed)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.TacticSpeed.None; } } + public SCHALE.Common.FlatData.TacticSkillUse ForcedSkillUse { get { int o = __p.__offset(84); return o != 0 ? (SCHALE.Common.FlatData.TacticSkillUse)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.TacticSkillUse.None; } } + public SCHALE.Common.FlatData.ShowSkillCutIn ShowNPCSkillCutIn { get { int o = __p.__offset(86); return o != 0 ? (SCHALE.Common.FlatData.ShowSkillCutIn)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.ShowSkillCutIn.None; } } public bool ImmuneHitBeforeTimeOutEnd { get { int o = __p.__offset(88); return o != 0 ? 0!=__p.bb.Get(o + __p.bb_pos) : (bool)false; } } public bool UIBattleHideFromScratch { get { int o = __p.__offset(90); return o != 0 ? 0!=__p.bb.Get(o + __p.bb_pos) : (bool)false; } } public string BattleReadyTimelinePath { get { int o = __p.__offset(92); return o != 0 ? __p.__string(o + __p.bb_pos) : null; } } @@ -117,7 +117,7 @@ public struct GroundExcel : IFlatbufferObject 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, @@ -152,9 +152,9 @@ public struct GroundExcel : IFlatbufferObject long BGMId = 0, bool WarningUI = false, bool TSSHatchOpen = false, - SCHALE.Common.FlatData.TacticSpeed ForcedTacticSpeed = SCHALE.Common.FlatData.TacticSpeed.None_, - SCHALE.Common.FlatData.TacticSkillUse ForcedSkillUse = SCHALE.Common.FlatData.TacticSkillUse.None_, - SCHALE.Common.FlatData.ShowSkillCutIn ShowNPCSkillCutIn = SCHALE.Common.FlatData.ShowSkillCutIn.None_, + SCHALE.Common.FlatData.TacticSpeed ForcedTacticSpeed = SCHALE.Common.FlatData.TacticSpeed.None, + SCHALE.Common.FlatData.TacticSkillUse ForcedSkillUse = SCHALE.Common.FlatData.TacticSkillUse.None, + SCHALE.Common.FlatData.ShowSkillCutIn ShowNPCSkillCutIn = SCHALE.Common.FlatData.ShowSkillCutIn.None, bool ImmuneHitBeforeTimeOutEnd = false, bool UIBattleHideFromScratch = false, StringOffset BattleReadyTimelinePathOffset = default(StringOffset), @@ -213,7 +213,7 @@ 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); @@ -239,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); } @@ -327,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); @@ -423,7 +423,7 @@ public struct GroundExcel : IFlatbufferObject _StageFileName, _GroundSceneName, _o.FormationGroupId, - _o.StageTopography_, + _o.StageTopography, _o.EnemyBulletType, _o.EnemyArmorType, _o.LevelNPC, @@ -484,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; } @@ -542,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; @@ -577,9 +577,9 @@ public class GroundExcelT this.BGMId = 0; this.WarningUI = false; this.TSSHatchOpen = false; - this.ForcedTacticSpeed = SCHALE.Common.FlatData.TacticSpeed.None_; - this.ForcedSkillUse = SCHALE.Common.FlatData.TacticSkillUse.None_; - this.ShowNPCSkillCutIn = SCHALE.Common.FlatData.ShowSkillCutIn.None_; + this.ForcedTacticSpeed = SCHALE.Common.FlatData.TacticSpeed.None; + this.ForcedSkillUse = SCHALE.Common.FlatData.TacticSkillUse.None; + this.ShowNPCSkillCutIn = SCHALE.Common.FlatData.ShowSkillCutIn.None; this.ImmuneHitBeforeTimeOutEnd = false; this.UIBattleHideFromScratch = false; this.BattleReadyTimelinePath = null; @@ -607,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) diff --git a/SCHALE.Common/FlatData/GroundModuleRewardExcel.cs b/SCHALE.Common/FlatData/GroundModuleRewardExcel.cs index 9b9652b..0a6d4d6 100644 --- a/SCHALE.Common/FlatData/GroundModuleRewardExcel.cs +++ b/SCHALE.Common/FlatData/GroundModuleRewardExcel.cs @@ -21,7 +21,7 @@ public struct GroundModuleRewardExcel : IFlatbufferObject public GroundModuleRewardExcel __assign(int _i, ByteBuffer _bb) { __init(_i, _bb); return this; } public uint GroupId { get { int o = __p.__offset(4); return o != 0 ? __p.bb.GetUint(o + __p.bb_pos) : (uint)0; } } - public SCHALE.Common.FlatData.ParcelType RewardParcelType { 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 RewardParcelType { 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 RewardParcelId { get { int o = __p.__offset(8); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public long RewardParcelAmount { get { int o = __p.__offset(10); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public long RewardParcelProbability { get { int o = __p.__offset(12); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } @@ -36,7 +36,7 @@ public struct GroundModuleRewardExcel : IFlatbufferObject public static Offset CreateGroundModuleRewardExcel(FlatBufferBuilder builder, uint GroupId = 0, - SCHALE.Common.FlatData.ParcelType RewardParcelType = SCHALE.Common.FlatData.ParcelType.None_, + SCHALE.Common.FlatData.ParcelType RewardParcelType = SCHALE.Common.FlatData.ParcelType.None, long RewardParcelId = 0, long RewardParcelAmount = 0, long RewardParcelProbability = 0, @@ -107,7 +107,7 @@ public class GroundModuleRewardExcelT public GroundModuleRewardExcelT() { this.GroupId = 0; - this.RewardParcelType = SCHALE.Common.FlatData.ParcelType.None_; + this.RewardParcelType = SCHALE.Common.FlatData.ParcelType.None; this.RewardParcelId = 0; this.RewardParcelAmount = 0; this.RewardParcelProbability = 0; diff --git a/SCHALE.Common/FlatData/GroundNodeFlat.cs b/SCHALE.Common/FlatData/GroundNodeFlat.cs index c1dbdb5..120f243 100644 --- a/SCHALE.Common/FlatData/GroundNodeFlat.cs +++ b/SCHALE.Common/FlatData/GroundNodeFlat.cs @@ -24,16 +24,16 @@ public struct GroundNodeFlat : IFlatbufferObject public int Y { get { int o = __p.__offset(6); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } public bool IsCanNotUseSkill { get { int o = __p.__offset(8); return o != 0 ? 0!=__p.bb.Get(o + __p.bb_pos) : (bool)false; } } public SCHALE.Common.FlatData.GroundVector3? Position { get { int o = __p.__offset(10); return o != 0 ? (SCHALE.Common.FlatData.GroundVector3?)(new SCHALE.Common.FlatData.GroundVector3()).__assign(__p.__indirect(o + __p.bb_pos), __p.bb) : null; } } - public SCHALE.Common.FlatData.GroundNodeType NodeType { get { int o = __p.__offset(12); return o != 0 ? (SCHALE.Common.FlatData.GroundNodeType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.GroundNodeType.None_; } } - public SCHALE.Common.FlatData.GroundNodeType OriginalNodeType { get { int o = __p.__offset(14); return o != 0 ? (SCHALE.Common.FlatData.GroundNodeType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.GroundNodeType.None_; } } + public SCHALE.Common.FlatData.GroundNodeType NodeType { get { int o = __p.__offset(12); return o != 0 ? (SCHALE.Common.FlatData.GroundNodeType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.GroundNodeType.None; } } + public SCHALE.Common.FlatData.GroundNodeType OriginalNodeType { get { int o = __p.__offset(14); return o != 0 ? (SCHALE.Common.FlatData.GroundNodeType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.GroundNodeType.None; } } public static Offset CreateGroundNodeFlat(FlatBufferBuilder builder, int X = 0, int Y = 0, bool IsCanNotUseSkill = false, Offset PositionOffset = default(Offset), - SCHALE.Common.FlatData.GroundNodeType NodeType = SCHALE.Common.FlatData.GroundNodeType.None_, - SCHALE.Common.FlatData.GroundNodeType OriginalNodeType = SCHALE.Common.FlatData.GroundNodeType.None_) { + SCHALE.Common.FlatData.GroundNodeType NodeType = SCHALE.Common.FlatData.GroundNodeType.None, + SCHALE.Common.FlatData.GroundNodeType OriginalNodeType = SCHALE.Common.FlatData.GroundNodeType.None) { builder.StartTable(6); GroundNodeFlat.AddOriginalNodeType(builder, OriginalNodeType); GroundNodeFlat.AddNodeType(builder, NodeType); @@ -97,8 +97,8 @@ public class GroundNodeFlatT this.Y = 0; this.IsCanNotUseSkill = false; this.Position = null; - this.NodeType = SCHALE.Common.FlatData.GroundNodeType.None_; - this.OriginalNodeType = SCHALE.Common.FlatData.GroundNodeType.None_; + this.NodeType = SCHALE.Common.FlatData.GroundNodeType.None; + this.OriginalNodeType = SCHALE.Common.FlatData.GroundNodeType.None; } } diff --git a/SCHALE.Common/FlatData/GroundNodeType.cs b/SCHALE.Common/FlatData/GroundNodeType.cs index fa9b97b..8621847 100644 --- a/SCHALE.Common/FlatData/GroundNodeType.cs +++ b/SCHALE.Common/FlatData/GroundNodeType.cs @@ -7,7 +7,7 @@ namespace SCHALE.Common.FlatData public enum GroundNodeType : int { - None_ = 0, + None = 0, WalkAble = 1, JumpAble = 2, TSSOnly = 3, diff --git a/SCHALE.Common/FlatData/GrowthCategory.cs b/SCHALE.Common/FlatData/GrowthCategory.cs index 7c57175..ae59f55 100644 --- a/SCHALE.Common/FlatData/GrowthCategory.cs +++ b/SCHALE.Common/FlatData/GrowthCategory.cs @@ -7,7 +7,7 @@ namespace SCHALE.Common.FlatData public enum GrowthCategory : int { - None_ = 0, + None = 0, LevelUp = 1, Transcend = 2, SkillLevelUp = 3, diff --git a/SCHALE.Common/FlatData/GuideMissionExcel.cs b/SCHALE.Common/FlatData/GuideMissionExcel.cs index d28895f..d8d5083 100644 --- a/SCHALE.Common/FlatData/GuideMissionExcel.cs +++ b/SCHALE.Common/FlatData/GuideMissionExcel.cs @@ -44,7 +44,7 @@ public struct GuideMissionExcel : IFlatbufferObject public byte[] GetToastImagePathArray() { return __p.__vector_as_array(20); } public string ShortcutUI(int j) { int o = __p.__offset(22); return o != 0 ? __p.__string(__p.__vector(o) + j * 4) : null; } public int ShortcutUILength { get { int o = __p.__offset(22); return o != 0 ? __p.__vector_len(o) : 0; } } - public SCHALE.Common.FlatData.MissionCompleteConditionType CompleteConditionType { get { int o = __p.__offset(24); return o != 0 ? (SCHALE.Common.FlatData.MissionCompleteConditionType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.MissionCompleteConditionType.None_; } } + public SCHALE.Common.FlatData.MissionCompleteConditionType CompleteConditionType { get { int o = __p.__offset(24); return o != 0 ? (SCHALE.Common.FlatData.MissionCompleteConditionType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.MissionCompleteConditionType.None; } } public long CompleteConditionCount { get { int o = __p.__offset(26); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public long CompleteConditionParameter(int j) { int o = __p.__offset(28); return o != 0 ? __p.bb.GetLong(__p.__vector(o) + j * 8) : (long)0; } public int CompleteConditionParameterLength { get { int o = __p.__offset(28); return o != 0 ? __p.__vector_len(o) : 0; } } @@ -99,7 +99,7 @@ public struct GuideMissionExcel : IFlatbufferObject SCHALE.Common.FlatData.MissionToastDisplayConditionType ToastDisplayType = SCHALE.Common.FlatData.MissionToastDisplayConditionType.Always, StringOffset ToastImagePathOffset = default(StringOffset), VectorOffset ShortcutUIOffset = default(VectorOffset), - SCHALE.Common.FlatData.MissionCompleteConditionType CompleteConditionType = SCHALE.Common.FlatData.MissionCompleteConditionType.None_, + SCHALE.Common.FlatData.MissionCompleteConditionType CompleteConditionType = SCHALE.Common.FlatData.MissionCompleteConditionType.None, long CompleteConditionCount = 0, VectorOffset CompleteConditionParameterOffset = default(VectorOffset), VectorOffset CompleteConditionParameterTagOffset = default(VectorOffset), @@ -314,7 +314,7 @@ public class GuideMissionExcelT this.ToastDisplayType = SCHALE.Common.FlatData.MissionToastDisplayConditionType.Always; this.ToastImagePath = null; this.ShortcutUI = null; - this.CompleteConditionType = SCHALE.Common.FlatData.MissionCompleteConditionType.None_; + this.CompleteConditionType = SCHALE.Common.FlatData.MissionCompleteConditionType.None; this.CompleteConditionCount = 0; this.CompleteConditionParameter = null; this.CompleteConditionParameterTag = null; diff --git a/SCHALE.Common/FlatData/GuideMissionSeasonExcel.cs b/SCHALE.Common/FlatData/GuideMissionSeasonExcel.cs index a2565f7..7b92a5d 100644 --- a/SCHALE.Common/FlatData/GuideMissionSeasonExcel.cs +++ b/SCHALE.Common/FlatData/GuideMissionSeasonExcel.cs @@ -111,10 +111,10 @@ public struct GuideMissionSeasonExcel : IFlatbufferObject public ArraySegment? GetTitleImageBytes() { return __p.__vector_as_arraysegment(40); } #endif public byte[] GetTitleImageArray() { return __p.__vector_as_array(40); } - public SCHALE.Common.FlatData.ParcelType RequirementParcelType { get { int o = __p.__offset(42); return o != 0 ? (SCHALE.Common.FlatData.ParcelType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.ParcelType.None_; } } + public SCHALE.Common.FlatData.ParcelType RequirementParcelType { get { int o = __p.__offset(42); return o != 0 ? (SCHALE.Common.FlatData.ParcelType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.ParcelType.None; } } public long RequirementParcelId { get { int o = __p.__offset(44); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public int RequirementParcelAmount { get { int o = __p.__offset(46); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } - public SCHALE.Common.FlatData.GuideMissionTabType TabType { get { int o = __p.__offset(48); return o != 0 ? (SCHALE.Common.FlatData.GuideMissionTabType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.GuideMissionTabType.None_; } } + public SCHALE.Common.FlatData.GuideMissionTabType TabType { get { int o = __p.__offset(48); return o != 0 ? (SCHALE.Common.FlatData.GuideMissionTabType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.GuideMissionTabType.None; } } public bool IsPermanent { get { int o = __p.__offset(50); return o != 0 ? 0!=__p.bb.Get(o + __p.bb_pos) : (bool)false; } } public long PreSeasonId { get { int o = __p.__offset(52); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } @@ -138,10 +138,10 @@ public struct GuideMissionSeasonExcel : IFlatbufferObject StringOffset LobbyBannerImageOffset = default(StringOffset), StringOffset BackgroundImageOffset = default(StringOffset), StringOffset TitleImageOffset = default(StringOffset), - SCHALE.Common.FlatData.ParcelType RequirementParcelType = SCHALE.Common.FlatData.ParcelType.None_, + SCHALE.Common.FlatData.ParcelType RequirementParcelType = SCHALE.Common.FlatData.ParcelType.None, long RequirementParcelId = 0, int RequirementParcelAmount = 0, - SCHALE.Common.FlatData.GuideMissionTabType TabType = SCHALE.Common.FlatData.GuideMissionTabType.None_, + SCHALE.Common.FlatData.GuideMissionTabType TabType = SCHALE.Common.FlatData.GuideMissionTabType.None, bool IsPermanent = false, long PreSeasonId = 0) { builder.StartTable(25); @@ -328,10 +328,10 @@ public class GuideMissionSeasonExcelT this.LobbyBannerImage = null; this.BackgroundImage = null; this.TitleImage = null; - this.RequirementParcelType = SCHALE.Common.FlatData.ParcelType.None_; + this.RequirementParcelType = SCHALE.Common.FlatData.ParcelType.None; this.RequirementParcelId = 0; this.RequirementParcelAmount = 0; - this.TabType = SCHALE.Common.FlatData.GuideMissionTabType.None_; + this.TabType = SCHALE.Common.FlatData.GuideMissionTabType.None; this.IsPermanent = false; this.PreSeasonId = 0; } diff --git a/SCHALE.Common/FlatData/GuideMissionTabType.cs b/SCHALE.Common/FlatData/GuideMissionTabType.cs index 0ef7f91..bcfa8ce 100644 --- a/SCHALE.Common/FlatData/GuideMissionTabType.cs +++ b/SCHALE.Common/FlatData/GuideMissionTabType.cs @@ -7,7 +7,7 @@ namespace SCHALE.Common.FlatData public enum GuideMissionTabType : int { - None_ = 0, + None = 0, Daily = 1, StageClear = 2, }; diff --git a/SCHALE.Common/FlatData/IdCardBackgroundExcel.cs b/SCHALE.Common/FlatData/IdCardBackgroundExcel.cs index f27eabd..ffb101d 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/ItemExcel.cs b/SCHALE.Common/FlatData/ItemExcel.cs index 0e7ebd0..f9da83e 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 @@ -44,11 +44,11 @@ public struct ItemExcel : IFlatbufferObject public int StackableMax { get { int o = __p.__offset(22); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } public int StackableFunction { get { int o = __p.__offset(24); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } public bool ImmediateUse { get { int o = __p.__offset(26); return o != 0 ? 0!=__p.bb.Get(o + __p.bb_pos) : (bool)false; } } - 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 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.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 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; } } public bool CanTierUpgrade { get { int o = __p.__offset(42); return o != 0 ? 0!=__p.bb.Get(o + __p.bb_pos) : (bool)false; } } @@ -83,26 +83,26 @@ public struct ItemExcel : IFlatbufferObject public byte[] GetExpirationDateTimeArray() { return __p.__vector_as_array(60); } public int ExpirationNotifyDateIn { get { int o = __p.__offset(62); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } public long ShortcutTypeId { get { int o = __p.__offset(64); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } - public SCHALE.Common.FlatData.GachaTicketType GachaTicket { get { int o = __p.__offset(66); return o != 0 ? (SCHALE.Common.FlatData.GachaTicketType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.GachaTicketType.None_; } } + public SCHALE.Common.FlatData.GachaTicketType GachaTicket { get { int o = __p.__offset(66); return o != 0 ? (SCHALE.Common.FlatData.GachaTicketType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.GachaTicketType.None; } } 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), int StackableMax = 0, int StackableFunction = 0, bool ImmediateUse = false, - SCHALE.Common.FlatData.ParcelType UsingResultParcelType = SCHALE.Common.FlatData.ParcelType.None_, + 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.ParcelType ExpiryChangeParcelType = SCHALE.Common.FlatData.ParcelType.None_, + 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, bool CanTierUpgrade = false, @@ -117,7 +117,7 @@ public struct ItemExcel : IFlatbufferObject StringOffset ExpirationDateTimeOffset = default(StringOffset), int ExpirationNotifyDateIn = 0, long ShortcutTypeId = 0, - SCHALE.Common.FlatData.GachaTicketType GachaTicket = SCHALE.Common.FlatData.GachaTicketType.None_) { + SCHALE.Common.FlatData.GachaTicketType GachaTicket = SCHALE.Common.FlatData.GachaTicketType.None) { builder.StartTable(32); ItemExcel.AddShortcutTypeId(builder, ShortcutTypeId); ItemExcel.AddShiftingCraftQuality(builder, ShiftingCraftQuality); @@ -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,21 +333,21 @@ 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; this.StackableMax = 0; this.StackableFunction = 0; this.ImmediateUse = false; - this.UsingResultParcelType = SCHALE.Common.FlatData.ParcelType.None_; + this.UsingResultParcelType = SCHALE.Common.FlatData.ParcelType.None; this.UsingResultId = 0; this.UsingResultAmount = 0; - this.MailType_ = SCHALE.Common.FlatData.MailType.System; - this.ExpiryChangeParcelType = SCHALE.Common.FlatData.ParcelType.None_; + this.MailType = SCHALE.Common.FlatData.MailType.System; + this.ExpiryChangeParcelType = SCHALE.Common.FlatData.ParcelType.None; this.ExpiryChangeId = 0; this.ExpiryChangeAmount = 0; this.CanTierUpgrade = false; @@ -362,7 +362,7 @@ public class ItemExcelT this.ExpirationDateTime = null; this.ExpirationNotifyDateIn = 0; this.ShortcutTypeId = 0; - this.GachaTicket = SCHALE.Common.FlatData.GachaTicketType.None_; + this.GachaTicket = SCHALE.Common.FlatData.GachaTicketType.None; } } @@ -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/JudgeGrade.cs b/SCHALE.Common/FlatData/JudgeGrade.cs index 8395c70..971886f 100644 --- a/SCHALE.Common/FlatData/JudgeGrade.cs +++ b/SCHALE.Common/FlatData/JudgeGrade.cs @@ -7,7 +7,7 @@ namespace SCHALE.Common.FlatData public enum JudgeGrade : int { - None_ = 0, + None = 0, Miss = 1, Attack = 2, Critical = 3, diff --git a/SCHALE.Common/FlatData/LimitedStageExcel.cs b/SCHALE.Common/FlatData/LimitedStageExcel.cs index 2b07c8b..fd5a698 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); } @@ -42,7 +42,7 @@ public struct LimitedStageExcel : IFlatbufferObject public long OpenDate { get { int o = __p.__offset(18); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public long OpenEventPoint { get { int o = __p.__offset(20); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } 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 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 int StageEnterEchelonCount { get { int o = __p.__offset(30); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } @@ -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,14 +101,14 @@ 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, long OpenDate = 0, long OpenEventPoint = 0, long BattleDuration = 0, - SCHALE.Common.FlatData.ParcelType StageEnterCostType = SCHALE.Common.FlatData.ParcelType.None_, + SCHALE.Common.FlatData.ParcelType StageEnterCostType = SCHALE.Common.FlatData.ParcelType.None, long StageEnterCostId = 0, int StageEnterCostAmount = 0, int StageEnterEchelonCount = 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,14 +348,14 @@ 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; this.OpenDate = 0; this.OpenEventPoint = 0; this.BattleDuration = 0; - this.StageEnterCostType = SCHALE.Common.FlatData.ParcelType.None_; + this.StageEnterCostType = SCHALE.Common.FlatData.ParcelType.None; this.StageEnterCostId = 0; this.StageEnterCostAmount = 0; this.StageEnterEchelonCount = 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 0338555..a879c5f 100644 --- a/SCHALE.Common/FlatData/LimitedStageRewardExcel.cs +++ b/SCHALE.Common/FlatData/LimitedStageRewardExcel.cs @@ -21,18 +21,18 @@ 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 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; } } public int RewardAmount { get { int o = __p.__offset(14); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } public bool IsDisplayed { get { int o = __p.__offset(16); return o != 0 ? 0!=__p.bb.Get(o + __p.bb_pos) : (bool)false; } } 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_, + SCHALE.Common.FlatData.ParcelType RewardParcelType = SCHALE.Common.FlatData.ParcelType.None, long RewardId = 0, int RewardAmount = 0, bool IsDisplayed = false) { @@ -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,9 +100,9 @@ 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.RewardParcelType = SCHALE.Common.FlatData.ParcelType.None; this.RewardId = 0; this.RewardAmount = 0; this.IsDisplayed = false; @@ -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/LocalizeErrorExcel.cs b/SCHALE.Common/FlatData/LocalizeErrorExcel.cs index 5bcdd09..2de46bb 100644 --- a/SCHALE.Common/FlatData/LocalizeErrorExcel.cs +++ b/SCHALE.Common/FlatData/LocalizeErrorExcel.cs @@ -21,7 +21,7 @@ public struct LocalizeErrorExcel : IFlatbufferObject public LocalizeErrorExcel __assign(int _i, ByteBuffer _bb) { __init(_i, _bb); return this; } public uint Key { get { int o = __p.__offset(4); return o != 0 ? __p.bb.GetUint(o + __p.bb_pos) : (uint)0; } } - public SCHALE.Common.FlatData.WebAPIErrorLevel ErrorLevel { get { int o = __p.__offset(6); return o != 0 ? (SCHALE.Common.FlatData.WebAPIErrorLevel)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.WebAPIErrorLevel.None_; } } + public SCHALE.Common.FlatData.WebAPIErrorLevel ErrorLevel { get { int o = __p.__offset(6); return o != 0 ? (SCHALE.Common.FlatData.WebAPIErrorLevel)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.WebAPIErrorLevel.None; } } public string Kr { get { int o = __p.__offset(8); return o != 0 ? __p.__string(o + __p.bb_pos) : null; } } #if ENABLE_SPAN_T public Span GetKrBytes() { return __p.__vector_as_span(8, 1); } @@ -39,7 +39,7 @@ public struct LocalizeErrorExcel : IFlatbufferObject public static Offset CreateLocalizeErrorExcel(FlatBufferBuilder builder, uint Key = 0, - SCHALE.Common.FlatData.WebAPIErrorLevel ErrorLevel = SCHALE.Common.FlatData.WebAPIErrorLevel.None_, + SCHALE.Common.FlatData.WebAPIErrorLevel ErrorLevel = SCHALE.Common.FlatData.WebAPIErrorLevel.None, StringOffset KrOffset = default(StringOffset), StringOffset JpOffset = default(StringOffset)) { builder.StartTable(4); @@ -93,7 +93,7 @@ public class LocalizeErrorExcelT public LocalizeErrorExcelT() { this.Key = 0; - this.ErrorLevel = SCHALE.Common.FlatData.WebAPIErrorLevel.None_; + this.ErrorLevel = SCHALE.Common.FlatData.WebAPIErrorLevel.None; this.Kr = null; this.Jp = null; } diff --git a/SCHALE.Common/FlatData/LogicEffectCategory.cs b/SCHALE.Common/FlatData/LogicEffectCategory.cs index 70934b7..3f3900f 100644 --- a/SCHALE.Common/FlatData/LogicEffectCategory.cs +++ b/SCHALE.Common/FlatData/LogicEffectCategory.cs @@ -7,7 +7,7 @@ namespace SCHALE.Common.FlatData public enum LogicEffectCategory : int { - None_ = 0, + None = 0, Attack = 1, Heal = 2, Buff = 3, diff --git a/SCHALE.Common/FlatData/LogicEffectCommonVisualExcel.cs b/SCHALE.Common/FlatData/LogicEffectCommonVisualExcel.cs index 88d353e..34f6d27 100644 --- a/SCHALE.Common/FlatData/LogicEffectCommonVisualExcel.cs +++ b/SCHALE.Common/FlatData/LogicEffectCommonVisualExcel.cs @@ -43,7 +43,7 @@ public struct LogicEffectCommonVisualExcel : IFlatbufferObject public ArraySegment? GetParticleEnterPathBytes() { return __p.__vector_as_arraysegment(10); } #endif public byte[] GetParticleEnterPathArray() { return __p.__vector_as_array(10); } - public SCHALE.Common.FlatData.EffectBone ParticleEnterSocket { get { int o = __p.__offset(12); return o != 0 ? (SCHALE.Common.FlatData.EffectBone)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.EffectBone.None_; } } + public SCHALE.Common.FlatData.EffectBone ParticleEnterSocket { get { int o = __p.__offset(12); return o != 0 ? (SCHALE.Common.FlatData.EffectBone)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.EffectBone.None; } } public string ParticleLoopPath { get { int o = __p.__offset(14); return o != 0 ? __p.__string(o + __p.bb_pos) : null; } } #if ENABLE_SPAN_T public Span GetParticleLoopPathBytes() { return __p.__vector_as_span(14, 1); } @@ -51,7 +51,7 @@ public struct LogicEffectCommonVisualExcel : IFlatbufferObject public ArraySegment? GetParticleLoopPathBytes() { return __p.__vector_as_arraysegment(14); } #endif public byte[] GetParticleLoopPathArray() { return __p.__vector_as_array(14); } - public SCHALE.Common.FlatData.EffectBone ParticleLoopSocket { get { int o = __p.__offset(16); return o != 0 ? (SCHALE.Common.FlatData.EffectBone)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.EffectBone.None_; } } + public SCHALE.Common.FlatData.EffectBone ParticleLoopSocket { get { int o = __p.__offset(16); return o != 0 ? (SCHALE.Common.FlatData.EffectBone)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.EffectBone.None; } } public string ParticleEndPath { get { int o = __p.__offset(18); return o != 0 ? __p.__string(o + __p.bb_pos) : null; } } #if ENABLE_SPAN_T public Span GetParticleEndPathBytes() { return __p.__vector_as_span(18, 1); } @@ -59,7 +59,7 @@ public struct LogicEffectCommonVisualExcel : IFlatbufferObject public ArraySegment? GetParticleEndPathBytes() { return __p.__vector_as_arraysegment(18); } #endif public byte[] GetParticleEndPathArray() { return __p.__vector_as_array(18); } - public SCHALE.Common.FlatData.EffectBone ParticleEndSocket { get { int o = __p.__offset(20); return o != 0 ? (SCHALE.Common.FlatData.EffectBone)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.EffectBone.None_; } } + public SCHALE.Common.FlatData.EffectBone ParticleEndSocket { get { int o = __p.__offset(20); return o != 0 ? (SCHALE.Common.FlatData.EffectBone)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.EffectBone.None; } } public string ParticleApplyPath { get { int o = __p.__offset(22); return o != 0 ? __p.__string(o + __p.bb_pos) : null; } } #if ENABLE_SPAN_T public Span GetParticleApplyPathBytes() { return __p.__vector_as_span(22, 1); } @@ -67,7 +67,7 @@ public struct LogicEffectCommonVisualExcel : IFlatbufferObject public ArraySegment? GetParticleApplyPathBytes() { return __p.__vector_as_arraysegment(22); } #endif public byte[] GetParticleApplyPathArray() { return __p.__vector_as_array(22); } - public SCHALE.Common.FlatData.EffectBone ParticleApplySocket { get { int o = __p.__offset(24); return o != 0 ? (SCHALE.Common.FlatData.EffectBone)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.EffectBone.None_; } } + public SCHALE.Common.FlatData.EffectBone ParticleApplySocket { get { int o = __p.__offset(24); return o != 0 ? (SCHALE.Common.FlatData.EffectBone)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.EffectBone.None; } } public string ParticleRemovedPath { get { int o = __p.__offset(26); return o != 0 ? __p.__string(o + __p.bb_pos) : null; } } #if ENABLE_SPAN_T public Span GetParticleRemovedPathBytes() { return __p.__vector_as_span(26, 1); } @@ -75,22 +75,22 @@ public struct LogicEffectCommonVisualExcel : IFlatbufferObject public ArraySegment? GetParticleRemovedPathBytes() { return __p.__vector_as_arraysegment(26); } #endif public byte[] GetParticleRemovedPathArray() { return __p.__vector_as_array(26); } - public SCHALE.Common.FlatData.EffectBone ParticleRemovedSocket { get { int o = __p.__offset(28); return o != 0 ? (SCHALE.Common.FlatData.EffectBone)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.EffectBone.None_; } } + public SCHALE.Common.FlatData.EffectBone ParticleRemovedSocket { get { int o = __p.__offset(28); return o != 0 ? (SCHALE.Common.FlatData.EffectBone)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.EffectBone.None; } } public static Offset CreateLogicEffectCommonVisualExcel(FlatBufferBuilder builder, uint StringID = 0, StringOffset IconSpriteNameOffset = default(StringOffset), VectorOffset IconDispelColorOffset = default(VectorOffset), StringOffset ParticleEnterPathOffset = default(StringOffset), - SCHALE.Common.FlatData.EffectBone ParticleEnterSocket = SCHALE.Common.FlatData.EffectBone.None_, + SCHALE.Common.FlatData.EffectBone ParticleEnterSocket = SCHALE.Common.FlatData.EffectBone.None, StringOffset ParticleLoopPathOffset = default(StringOffset), - SCHALE.Common.FlatData.EffectBone ParticleLoopSocket = SCHALE.Common.FlatData.EffectBone.None_, + SCHALE.Common.FlatData.EffectBone ParticleLoopSocket = SCHALE.Common.FlatData.EffectBone.None, StringOffset ParticleEndPathOffset = default(StringOffset), - SCHALE.Common.FlatData.EffectBone ParticleEndSocket = SCHALE.Common.FlatData.EffectBone.None_, + SCHALE.Common.FlatData.EffectBone ParticleEndSocket = SCHALE.Common.FlatData.EffectBone.None, StringOffset ParticleApplyPathOffset = default(StringOffset), - SCHALE.Common.FlatData.EffectBone ParticleApplySocket = SCHALE.Common.FlatData.EffectBone.None_, + SCHALE.Common.FlatData.EffectBone ParticleApplySocket = SCHALE.Common.FlatData.EffectBone.None, StringOffset ParticleRemovedPathOffset = default(StringOffset), - SCHALE.Common.FlatData.EffectBone ParticleRemovedSocket = SCHALE.Common.FlatData.EffectBone.None_) { + SCHALE.Common.FlatData.EffectBone ParticleRemovedSocket = SCHALE.Common.FlatData.EffectBone.None) { builder.StartTable(13); LogicEffectCommonVisualExcel.AddParticleRemovedSocket(builder, ParticleRemovedSocket); LogicEffectCommonVisualExcel.AddParticleRemovedPath(builder, ParticleRemovedPathOffset); @@ -205,15 +205,15 @@ public class LogicEffectCommonVisualExcelT this.IconSpriteName = null; this.IconDispelColor = null; this.ParticleEnterPath = null; - this.ParticleEnterSocket = SCHALE.Common.FlatData.EffectBone.None_; + this.ParticleEnterSocket = SCHALE.Common.FlatData.EffectBone.None; this.ParticleLoopPath = null; - this.ParticleLoopSocket = SCHALE.Common.FlatData.EffectBone.None_; + this.ParticleLoopSocket = SCHALE.Common.FlatData.EffectBone.None; this.ParticleEndPath = null; - this.ParticleEndSocket = SCHALE.Common.FlatData.EffectBone.None_; + this.ParticleEndSocket = SCHALE.Common.FlatData.EffectBone.None; this.ParticleApplyPath = null; - this.ParticleApplySocket = SCHALE.Common.FlatData.EffectBone.None_; + this.ParticleApplySocket = SCHALE.Common.FlatData.EffectBone.None; this.ParticleRemovedPath = null; - this.ParticleRemovedSocket = SCHALE.Common.FlatData.EffectBone.None_; + this.ParticleRemovedSocket = SCHALE.Common.FlatData.EffectBone.None; } } diff --git a/SCHALE.Common/FlatData/LogicEffectSound.cs b/SCHALE.Common/FlatData/LogicEffectSound.cs index 07c229d..eb6fd7f 100644 --- a/SCHALE.Common/FlatData/LogicEffectSound.cs +++ b/SCHALE.Common/FlatData/LogicEffectSound.cs @@ -7,7 +7,7 @@ namespace SCHALE.Common.FlatData public enum LogicEffectSound : int { - None_ = 0, + None = 0, Damage = 1, Heal = 2, Knockback = 3, diff --git a/SCHALE.Common/FlatData/MeetupConditionPrintType.cs b/SCHALE.Common/FlatData/MeetupConditionPrintType.cs index ae2dee0..a156fde 100644 --- a/SCHALE.Common/FlatData/MeetupConditionPrintType.cs +++ b/SCHALE.Common/FlatData/MeetupConditionPrintType.cs @@ -7,7 +7,7 @@ namespace SCHALE.Common.FlatData public enum MeetupConditionPrintType : int { - None_ = 0, + None = 0, Lock = 1, Hide = 2, }; diff --git a/SCHALE.Common/FlatData/MeetupConditionType.cs b/SCHALE.Common/FlatData/MeetupConditionType.cs index d47f766..0394e1e 100644 --- a/SCHALE.Common/FlatData/MeetupConditionType.cs +++ b/SCHALE.Common/FlatData/MeetupConditionType.cs @@ -7,7 +7,7 @@ namespace SCHALE.Common.FlatData public enum MeetupConditionType : int { - None_ = 0, + None = 0, EventContentStageClear = 1, ScenarioClear = 2, }; diff --git a/SCHALE.Common/FlatData/MemoryLobbyCategory.cs b/SCHALE.Common/FlatData/MemoryLobbyCategory.cs index 2e45caf..0661a28 100644 --- a/SCHALE.Common/FlatData/MemoryLobbyCategory.cs +++ b/SCHALE.Common/FlatData/MemoryLobbyCategory.cs @@ -7,7 +7,7 @@ namespace SCHALE.Common.FlatData public enum MemoryLobbyCategory : int { - None_ = 0, + None = 0, UILobbySpecial = 1, UILobbySpecial2 = 2, }; diff --git a/SCHALE.Common/FlatData/MemoryLobbyExcel.cs b/SCHALE.Common/FlatData/MemoryLobbyExcel.cs index 8527ba5..9fd4a27 100644 --- a/SCHALE.Common/FlatData/MemoryLobbyExcel.cs +++ b/SCHALE.Common/FlatData/MemoryLobbyExcel.cs @@ -21,7 +21,7 @@ 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 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; } } @@ -31,7 +31,7 @@ public struct MemoryLobbyExcel : IFlatbufferObject 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 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); } @@ -64,11 +64,11 @@ public struct MemoryLobbyExcel : IFlatbufferObject public static Offset CreateMemoryLobbyExcel(FlatBufferBuilder builder, long Id = 0, - SCHALE.Common.FlatData.ProductionStep ProductionStep_ = SCHALE.Common.FlatData.ProductionStep.ToDo, + 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_, + SCHALE.Common.FlatData.MemoryLobbyCategory MemoryLobbyCategory = SCHALE.Common.FlatData.MemoryLobbyCategory.None, StringOffset SlotTextureNameOffset = default(StringOffset), StringOffset RewardTextureNameOffset = default(StringOffset), long BGMId = 0, @@ -82,20 +82,20 @@ public struct MemoryLobbyExcel : IFlatbufferObject MemoryLobbyExcel.AddAudioClipJp(builder, AudioClipJpOffset); MemoryLobbyExcel.AddRewardTextureName(builder, RewardTextureNameOffset); MemoryLobbyExcel.AddSlotTextureName(builder, SlotTextureNameOffset); - MemoryLobbyExcel.AddMemoryLobbyCategory_(builder, MemoryLobbyCategory_); + MemoryLobbyExcel.AddMemoryLobbyCategory(builder, MemoryLobbyCategory); MemoryLobbyExcel.AddPrefabName(builder, PrefabNameOffset); MemoryLobbyExcel.AddLocalizeEtcId(builder, LocalizeEtcId); - MemoryLobbyExcel.AddProductionStep_(builder, ProductionStep_); + 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 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 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); } @@ -113,11 +113,11 @@ 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.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.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); @@ -134,11 +134,11 @@ public struct MemoryLobbyExcel : IFlatbufferObject return CreateMemoryLobbyExcel( builder, _o.Id, - _o.ProductionStep_, + _o.ProductionStep, _o.LocalizeEtcId, _o.CharacterId, _PrefabName, - _o.MemoryLobbyCategory_, + _o.MemoryLobbyCategory, _SlotTextureName, _RewardTextureName, _o.BGMId, @@ -150,11 +150,11 @@ public struct MemoryLobbyExcel : IFlatbufferObject public class MemoryLobbyExcelT { public long Id { get; set; } - public SCHALE.Common.FlatData.ProductionStep ProductionStep_ { 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 SCHALE.Common.FlatData.MemoryLobbyCategory MemoryLobbyCategory { get; set; } public string SlotTextureName { get; set; } public string RewardTextureName { get; set; } public long BGMId { get; set; } @@ -163,11 +163,11 @@ public class MemoryLobbyExcelT public MemoryLobbyExcelT() { this.Id = 0; - this.ProductionStep_ = SCHALE.Common.FlatData.ProductionStep.ToDo; + this.ProductionStep = SCHALE.Common.FlatData.ProductionStep.ToDo; this.LocalizeEtcId = 0; this.CharacterId = 0; this.PrefabName = null; - this.MemoryLobbyCategory_ = SCHALE.Common.FlatData.MemoryLobbyCategory.None_; + this.MemoryLobbyCategory = SCHALE.Common.FlatData.MemoryLobbyCategory.None; this.SlotTextureName = null; this.RewardTextureName = null; this.BGMId = 0; @@ -183,11 +183,11 @@ 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, 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.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) diff --git a/SCHALE.Common/FlatData/MessagePopupExcel.cs b/SCHALE.Common/FlatData/MessagePopupExcel.cs index 01dffd1..fb36c98 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/MiniGameDefenseInfoExcel.cs b/SCHALE.Common/FlatData/MiniGameDefenseInfoExcel.cs index f870e5f..6120eed 100644 --- a/SCHALE.Common/FlatData/MiniGameDefenseInfoExcel.cs +++ b/SCHALE.Common/FlatData/MiniGameDefenseInfoExcel.cs @@ -21,14 +21,14 @@ public struct MiniGameDefenseInfoExcel : IFlatbufferObject 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 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_, + SCHALE.Common.FlatData.ParcelType DefenseBattleParcelType = SCHALE.Common.FlatData.ParcelType.None, long DefenseBattleParcelId = 0, long DefenseBattleMultiplierMax = 0, bool DisableRootMotion = false) { @@ -86,7 +86,7 @@ public class MiniGameDefenseInfoExcelT public MiniGameDefenseInfoExcelT() { this.EventContentId = 0; - this.DefenseBattleParcelType = SCHALE.Common.FlatData.ParcelType.None_; + this.DefenseBattleParcelType = SCHALE.Common.FlatData.ParcelType.None; this.DefenseBattleParcelId = 0; this.DefenseBattleMultiplierMax = 0; this.DisableRootMotion = false; diff --git a/SCHALE.Common/FlatData/MiniGameDefenseStageExcel.cs b/SCHALE.Common/FlatData/MiniGameDefenseStageExcel.cs index 0afc4f1..e5db022 100644 --- a/SCHALE.Common/FlatData/MiniGameDefenseStageExcel.cs +++ b/SCHALE.Common/FlatData/MiniGameDefenseStageExcel.cs @@ -29,14 +29,14 @@ public struct MiniGameDefenseStageExcel : 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 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 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 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; } } @@ -56,10 +56,10 @@ public struct MiniGameDefenseStageExcel : IFlatbufferObject 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 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.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 @@ -92,23 +92,23 @@ public struct MiniGameDefenseStageExcel : IFlatbufferObject 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, uint StageDifficultyLocalize = 0, int StageNumber = 0, int StageDisplay = 0, long PrevStageId = 0, - SCHALE.Common.FlatData.EchelonExtensionType EchelonExtensionType_ = SCHALE.Common.FlatData.EchelonExtensionType.Base, + SCHALE.Common.FlatData.EchelonExtensionType EchelonExtensionType = SCHALE.Common.FlatData.EchelonExtensionType.Base, long BattleDuration = 0, - SCHALE.Common.FlatData.ParcelType StageEnterCostType = SCHALE.Common.FlatData.ParcelType.None_, + 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, + 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_, + SCHALE.Common.FlatData.ContentType ContentType = SCHALE.Common.FlatData.ContentType.None, VectorOffset StarGoalOffset = default(VectorOffset), VectorOffset StarGoalAmountOffset = default(VectorOffset), StringOffset DefenseFormationBGPrefabOffset = default(StringOffset), @@ -131,18 +131,18 @@ public struct MiniGameDefenseStageExcel : IFlatbufferObject MiniGameDefenseStageExcel.AddDefenseFormationBGPrefab(builder, DefenseFormationBGPrefabOffset); MiniGameDefenseStageExcel.AddStarGoalAmount(builder, StarGoalAmountOffset); MiniGameDefenseStageExcel.AddStarGoal(builder, StarGoalOffset); - MiniGameDefenseStageExcel.AddContentType_(builder, ContentType_); + MiniGameDefenseStageExcel.AddContentType(builder, ContentType); MiniGameDefenseStageExcel.AddRecommandLevel(builder, RecommandLevel); - MiniGameDefenseStageExcel.AddStageTopography_(builder, StageTopography_); + 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.AddEchelonExtensionType(builder, EchelonExtensionType); MiniGameDefenseStageExcel.AddStageDisplay(builder, StageDisplay); MiniGameDefenseStageExcel.AddStageNumber(builder, StageNumber); MiniGameDefenseStageExcel.AddStageDifficultyLocalize(builder, StageDifficultyLocalize); - MiniGameDefenseStageExcel.AddStageDifficulty_(builder, StageDifficulty_); + MiniGameDefenseStageExcel.AddStageDifficulty(builder, StageDifficulty); MiniGameDefenseStageExcel.AddName(builder, NameOffset); return MiniGameDefenseStageExcel.EndMiniGameDefenseStageExcel(builder); } @@ -151,12 +151,12 @@ public struct MiniGameDefenseStageExcel : 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 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 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); } @@ -174,10 +174,10 @@ public struct MiniGameDefenseStageExcel : IFlatbufferObject 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 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 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(); } @@ -209,12 +209,12 @@ public struct MiniGameDefenseStageExcel : 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.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.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); @@ -224,10 +224,10 @@ public struct MiniGameDefenseStageExcel : IFlatbufferObject 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.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.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(); @@ -267,12 +267,12 @@ public struct MiniGameDefenseStageExcel : IFlatbufferObject _o.Id, _Name, _o.EventContentId, - _o.StageDifficulty_, + _o.StageDifficulty, _o.StageDifficultyLocalize, _o.StageNumber, _o.StageDisplay, _o.PrevStageId, - _o.EchelonExtensionType_, + _o.EchelonExtensionType, _o.BattleDuration, _o.StageEnterCostType, _o.StageEnterCostId, @@ -280,10 +280,10 @@ public struct MiniGameDefenseStageExcel : IFlatbufferObject _o.EventContentStageRewardId, _EnterScenarioGroupId, _ClearScenarioGroupId, - _o.StageTopography_, + _o.StageTopography, _o.RecommandLevel, _o.GroundID, - _o.ContentType_, + _o.ContentType, _StarGoal, _StarGoalAmount, _DefenseFormationBGPrefab, @@ -299,12 +299,12 @@ 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 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 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; } @@ -312,10 +312,10 @@ public class MiniGameDefenseStageExcelT public long EventContentStageRewardId { get; set; } public List EnterScenarioGroupId { get; set; } public List ClearScenarioGroupId { 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 SCHALE.Common.FlatData.ContentType ContentType_ { 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; } @@ -328,23 +328,23 @@ public class MiniGameDefenseStageExcelT this.Id = 0; this.Name = null; this.EventContentId = 0; - this.StageDifficulty_ = SCHALE.Common.FlatData.StageDifficulty.None_; + 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.EchelonExtensionType = SCHALE.Common.FlatData.EchelonExtensionType.Base; this.BattleDuration = 0; - this.StageEnterCostType = SCHALE.Common.FlatData.ParcelType.None_; + 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.StageTopography = SCHALE.Common.FlatData.StageTopography.Street; this.RecommandLevel = 0; this.GroundID = 0; - this.ContentType_ = SCHALE.Common.FlatData.ContentType.None_; + this.ContentType = SCHALE.Common.FlatData.ContentType.None; this.StarGoal = null; this.StarGoalAmount = null; this.DefenseFormationBGPrefab = null; @@ -364,12 +364,12 @@ static public class MiniGameDefenseStageExcelVerify && 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.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, 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) @@ -377,10 +377,10 @@ static public class MiniGameDefenseStageExcelVerify && 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, 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.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) diff --git a/SCHALE.Common/FlatData/MiniGameDreamEndingExcel.cs b/SCHALE.Common/FlatData/MiniGameDreamEndingExcel.cs index 5a91d49..17c2a92 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 66b16ba..ba9937a 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 eeee349..3cfd105 100644 --- a/SCHALE.Common/FlatData/MiniGameDreamInfoExcel.cs +++ b/SCHALE.Common/FlatData/MiniGameDreamInfoExcel.cs @@ -21,14 +21,14 @@ 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; } } public long DreamMakerActionPoint { get { int o = __p.__offset(14); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } - public SCHALE.Common.FlatData.ParcelType DreamMakerParcelType { get { int o = __p.__offset(16); return o != 0 ? (SCHALE.Common.FlatData.ParcelType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.ParcelType.None_; } } + public SCHALE.Common.FlatData.ParcelType DreamMakerParcelType { get { int o = __p.__offset(16); return o != 0 ? (SCHALE.Common.FlatData.ParcelType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.ParcelType.None; } } public long DreamMakerParcelId { get { int o = __p.__offset(18); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } - public SCHALE.Common.FlatData.ParcelType DreamMakerDailyPointParcelType { get { int o = __p.__offset(20); return o != 0 ? (SCHALE.Common.FlatData.ParcelType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.ParcelType.None_; } } + public SCHALE.Common.FlatData.ParcelType DreamMakerDailyPointParcelType { get { int o = __p.__offset(20); return o != 0 ? (SCHALE.Common.FlatData.ParcelType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.ParcelType.None; } } public long DreamMakerDailyPointId { get { int o = __p.__offset(22); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public long DreamMakerParameterTransfer { get { int o = __p.__offset(24); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public long ScheduleCostGoodsId { get { int o = __p.__offset(26); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } @@ -36,14 +36,14 @@ 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, long DreamMakerActionPoint = 0, - SCHALE.Common.FlatData.ParcelType DreamMakerParcelType = SCHALE.Common.FlatData.ParcelType.None_, + SCHALE.Common.FlatData.ParcelType DreamMakerParcelType = SCHALE.Common.FlatData.ParcelType.None, long DreamMakerParcelId = 0, - SCHALE.Common.FlatData.ParcelType DreamMakerDailyPointParcelType = SCHALE.Common.FlatData.ParcelType.None_, + SCHALE.Common.FlatData.ParcelType DreamMakerDailyPointParcelType = SCHALE.Common.FlatData.ParcelType.None, long DreamMakerDailyPointId = 0, long DreamMakerParameterTransfer = 0, long ScheduleCostGoodsId = 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,14 +142,14 @@ 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; this.DreamMakerActionPoint = 0; - this.DreamMakerParcelType = SCHALE.Common.FlatData.ParcelType.None_; + this.DreamMakerParcelType = SCHALE.Common.FlatData.ParcelType.None; this.DreamMakerParcelId = 0; - this.DreamMakerDailyPointParcelType = SCHALE.Common.FlatData.ParcelType.None_; + this.DreamMakerDailyPointParcelType = SCHALE.Common.FlatData.ParcelType.None; this.DreamMakerDailyPointId = 0; this.DreamMakerParameterTransfer = 0; this.ScheduleCostGoodsId = 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/MiniGameDreamParameterExcel.cs b/SCHALE.Common/FlatData/MiniGameDreamParameterExcel.cs index bfcc3f3..2e6d898 100644 --- a/SCHALE.Common/FlatData/MiniGameDreamParameterExcel.cs +++ b/SCHALE.Common/FlatData/MiniGameDreamParameterExcel.cs @@ -22,7 +22,7 @@ public struct MiniGameDreamParameterExcel : 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.DreamMakerParameterType ParameterType { get { int o = __p.__offset(8); return o != 0 ? (SCHALE.Common.FlatData.DreamMakerParameterType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.DreamMakerParameterType.None_; } } + public SCHALE.Common.FlatData.DreamMakerParameterType ParameterType { get { int o = __p.__offset(8); return o != 0 ? (SCHALE.Common.FlatData.DreamMakerParameterType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.DreamMakerParameterType.None; } } public uint LocalizeEtcId { get { int o = __p.__offset(10); return o != 0 ? __p.bb.GetUint(o + __p.bb_pos) : (uint)0; } } public string IconPath { get { int o = __p.__offset(12); return o != 0 ? __p.__string(o + __p.bb_pos) : null; } } #if ENABLE_SPAN_T @@ -39,7 +39,7 @@ public struct MiniGameDreamParameterExcel : IFlatbufferObject public static Offset CreateMiniGameDreamParameterExcel(FlatBufferBuilder builder, long Id = 0, long EventContentId = 0, - SCHALE.Common.FlatData.DreamMakerParameterType ParameterType = SCHALE.Common.FlatData.DreamMakerParameterType.None_, + SCHALE.Common.FlatData.DreamMakerParameterType ParameterType = SCHALE.Common.FlatData.DreamMakerParameterType.None, uint LocalizeEtcId = 0, StringOffset IconPathOffset = default(StringOffset), long ParameterBase = 0, @@ -122,7 +122,7 @@ public class MiniGameDreamParameterExcelT public MiniGameDreamParameterExcelT() { this.Id = 0; this.EventContentId = 0; - this.ParameterType = SCHALE.Common.FlatData.DreamMakerParameterType.None_; + this.ParameterType = SCHALE.Common.FlatData.DreamMakerParameterType.None; this.LocalizeEtcId = 0; this.IconPath = null; this.ParameterBase = 0; diff --git a/SCHALE.Common/FlatData/MiniGameDreamScheduleResultExcel.cs b/SCHALE.Common/FlatData/MiniGameDreamScheduleResultExcel.cs index 71e2f04..cb79a09 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; } @@ -49,20 +49,20 @@ public struct MiniGameDreamScheduleResultExcel : IFlatbufferObject public ArraySegment? GetRewardParameterAmountBytes() { return __p.__vector_as_arraysegment(18); } #endif public long[] GetRewardParameterAmountArray() { return __p.__vector_as_array(18); } - public SCHALE.Common.FlatData.ParcelType RewardParcelType { get { int o = __p.__offset(20); return o != 0 ? (SCHALE.Common.FlatData.ParcelType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.ParcelType.None_; } } + public SCHALE.Common.FlatData.ParcelType RewardParcelType { get { int o = __p.__offset(20); 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(22); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public long RewardParcelAmount { get { int o = __p.__offset(24); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } 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), VectorOffset RewardParameterOperationTypeOffset = default(VectorOffset), VectorOffset RewardParameterAmountOffset = default(VectorOffset), - SCHALE.Common.FlatData.ParcelType RewardParcelType = SCHALE.Common.FlatData.ParcelType.None_, + SCHALE.Common.FlatData.ParcelType RewardParcelType = SCHALE.Common.FlatData.ParcelType.None, long RewardParcelId = 0, long RewardParcelAmount = 0) { builder.StartTable(11); @@ -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,13 +183,13 @@ 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; this.RewardParameterOperationType = null; this.RewardParameterAmount = null; - this.RewardParcelType = SCHALE.Common.FlatData.ParcelType.None_; + this.RewardParcelType = SCHALE.Common.FlatData.ParcelType.None; this.RewardParcelId = 0; this.RewardParcelAmount = 0; } @@ -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/MiniGameMissionExcel.cs b/SCHALE.Common/FlatData/MiniGameMissionExcel.cs index eca223f..96b6430 100644 --- a/SCHALE.Common/FlatData/MiniGameMissionExcel.cs +++ b/SCHALE.Common/FlatData/MiniGameMissionExcel.cs @@ -32,7 +32,7 @@ public struct MiniGameMissionExcel : IFlatbufferObject public byte[] GetGroupNameArray() { return __p.__vector_as_array(10); } public SCHALE.Common.FlatData.MissionCategory Category { get { int o = __p.__offset(12); return o != 0 ? (SCHALE.Common.FlatData.MissionCategory)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.MissionCategory.Challenge; } } public uint Description { get { int o = __p.__offset(14); return o != 0 ? __p.bb.GetUint(o + __p.bb_pos) : (uint)0; } } - public SCHALE.Common.FlatData.MissionResetType ResetType { get { int o = __p.__offset(16); return o != 0 ? (SCHALE.Common.FlatData.MissionResetType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.MissionResetType.None_; } } + public SCHALE.Common.FlatData.MissionResetType ResetType { get { int o = __p.__offset(16); return o != 0 ? (SCHALE.Common.FlatData.MissionResetType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.MissionResetType.None; } } public SCHALE.Common.FlatData.MissionToastDisplayConditionType ToastDisplayType { get { int o = __p.__offset(18); return o != 0 ? (SCHALE.Common.FlatData.MissionToastDisplayConditionType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.MissionToastDisplayConditionType.Always; } } public string ToastImagePath { get { int o = __p.__offset(20); return o != 0 ? __p.__string(o + __p.bb_pos) : null; } } #if ENABLE_SPAN_T @@ -55,7 +55,7 @@ public struct MiniGameMissionExcel : IFlatbufferObject public long AccountLevel { get { int o = __p.__offset(30); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public string ShortcutUI(int j) { int o = __p.__offset(32); return o != 0 ? __p.__string(__p.__vector(o) + j * 4) : null; } public int ShortcutUILength { get { int o = __p.__offset(32); return o != 0 ? __p.__vector_len(o) : 0; } } - public SCHALE.Common.FlatData.MissionCompleteConditionType CompleteConditionType { get { int o = __p.__offset(34); return o != 0 ? (SCHALE.Common.FlatData.MissionCompleteConditionType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.MissionCompleteConditionType.None_; } } + public SCHALE.Common.FlatData.MissionCompleteConditionType CompleteConditionType { get { int o = __p.__offset(34); return o != 0 ? (SCHALE.Common.FlatData.MissionCompleteConditionType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.MissionCompleteConditionType.None; } } public bool IsCompleteExtensionTime { get { int o = __p.__offset(36); return o != 0 ? 0!=__p.bb.Get(o + __p.bb_pos) : (bool)false; } } public long CompleteConditionCount { get { int o = __p.__offset(38); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public long CompleteConditionParameter(int j) { int o = __p.__offset(40); return o != 0 ? __p.bb.GetLong(__p.__vector(o) + j * 8) : (long)0; } @@ -113,7 +113,7 @@ public struct MiniGameMissionExcel : IFlatbufferObject StringOffset GroupNameOffset = default(StringOffset), SCHALE.Common.FlatData.MissionCategory Category = SCHALE.Common.FlatData.MissionCategory.Challenge, uint Description = 0, - SCHALE.Common.FlatData.MissionResetType ResetType = SCHALE.Common.FlatData.MissionResetType.None_, + SCHALE.Common.FlatData.MissionResetType ResetType = SCHALE.Common.FlatData.MissionResetType.None, SCHALE.Common.FlatData.MissionToastDisplayConditionType ToastDisplayType = SCHALE.Common.FlatData.MissionToastDisplayConditionType.Always, StringOffset ToastImagePathOffset = default(StringOffset), bool ViewFlag = false, @@ -122,7 +122,7 @@ public struct MiniGameMissionExcel : IFlatbufferObject SCHALE.Common.FlatData.AccountState AccountType = SCHALE.Common.FlatData.AccountState.WaitingSignIn, long AccountLevel = 0, VectorOffset ShortcutUIOffset = default(VectorOffset), - SCHALE.Common.FlatData.MissionCompleteConditionType CompleteConditionType = SCHALE.Common.FlatData.MissionCompleteConditionType.None_, + SCHALE.Common.FlatData.MissionCompleteConditionType CompleteConditionType = SCHALE.Common.FlatData.MissionCompleteConditionType.None, bool IsCompleteExtensionTime = false, long CompleteConditionCount = 0, VectorOffset CompleteConditionParameterOffset = default(VectorOffset), @@ -366,7 +366,7 @@ public class MiniGameMissionExcelT this.GroupName = null; this.Category = SCHALE.Common.FlatData.MissionCategory.Challenge; this.Description = 0; - this.ResetType = SCHALE.Common.FlatData.MissionResetType.None_; + this.ResetType = SCHALE.Common.FlatData.MissionResetType.None; this.ToastDisplayType = SCHALE.Common.FlatData.MissionToastDisplayConditionType.Always; this.ToastImagePath = null; this.ViewFlag = false; @@ -375,7 +375,7 @@ public class MiniGameMissionExcelT this.AccountType = SCHALE.Common.FlatData.AccountState.WaitingSignIn; this.AccountLevel = 0; this.ShortcutUI = null; - this.CompleteConditionType = SCHALE.Common.FlatData.MissionCompleteConditionType.None_; + this.CompleteConditionType = SCHALE.Common.FlatData.MissionCompleteConditionType.None; this.IsCompleteExtensionTime = false; this.CompleteConditionCount = 0; this.CompleteConditionParameter = null; diff --git a/SCHALE.Common/FlatData/MiniGameShootingStageExcel.cs b/SCHALE.Common/FlatData/MiniGameShootingStageExcel.cs index c246375..e41defc 100644 --- a/SCHALE.Common/FlatData/MiniGameShootingStageExcel.cs +++ b/SCHALE.Common/FlatData/MiniGameShootingStageExcel.cs @@ -30,7 +30,7 @@ public struct MiniGameShootingStageExcel : IFlatbufferObject #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); } @@ -61,7 +61,7 @@ public struct MiniGameShootingStageExcel : IFlatbufferObject long UniqueId = 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, @@ -79,7 +79,7 @@ public struct MiniGameShootingStageExcel : IFlatbufferObject 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); } @@ -93,7 +93,7 @@ public struct MiniGameShootingStageExcel : IFlatbufferObject 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); } @@ -116,7 +116,7 @@ public struct MiniGameShootingStageExcel : IFlatbufferObject _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); @@ -140,7 +140,7 @@ public struct MiniGameShootingStageExcel : IFlatbufferObject _o.UniqueId, _BgmId, _o.CostGoodsId, - _o.Difficulty_, + _o.Difficulty, _DesignLevel, _ArtLevel, _o.StartBattleDuration, @@ -156,7 +156,7 @@ public class MiniGameShootingStageExcelT public long UniqueId { 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; } @@ -169,7 +169,7 @@ public class MiniGameShootingStageExcelT this.UniqueId = 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; @@ -189,7 +189,7 @@ static public class MiniGameShootingStageExcelVerify && verifier.VerifyField(tablePos, 4 /*UniqueId*/, 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 075ba32..fc43c86 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/MinigameDreamVoiceExcel.cs b/SCHALE.Common/FlatData/MinigameDreamVoiceExcel.cs index 9978016..ffe9356 100644 --- a/SCHALE.Common/FlatData/MinigameDreamVoiceExcel.cs +++ b/SCHALE.Common/FlatData/MinigameDreamVoiceExcel.cs @@ -22,13 +22,13 @@ public struct MinigameDreamVoiceExcel : IFlatbufferObject public long EventContentId { 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.DreamMakerVoiceCondition VoiceCondition { get { int o = __p.__offset(8); return o != 0 ? (SCHALE.Common.FlatData.DreamMakerVoiceCondition)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.DreamMakerVoiceCondition.None_; } } + public SCHALE.Common.FlatData.DreamMakerVoiceCondition VoiceCondition { get { int o = __p.__offset(8); return o != 0 ? (SCHALE.Common.FlatData.DreamMakerVoiceCondition)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.DreamMakerVoiceCondition.None; } } public uint VoiceClip { get { int o = __p.__offset(10); return o != 0 ? __p.bb.GetUint(o + __p.bb_pos) : (uint)0; } } public static Offset CreateMinigameDreamVoiceExcel(FlatBufferBuilder builder, long EventContentId = 0, long UniqueId = 0, - SCHALE.Common.FlatData.DreamMakerVoiceCondition VoiceCondition = SCHALE.Common.FlatData.DreamMakerVoiceCondition.None_, + SCHALE.Common.FlatData.DreamMakerVoiceCondition VoiceCondition = SCHALE.Common.FlatData.DreamMakerVoiceCondition.None, uint VoiceClip = 0) { builder.StartTable(4); MinigameDreamVoiceExcel.AddUniqueId(builder, UniqueId); @@ -80,7 +80,7 @@ public class MinigameDreamVoiceExcelT public MinigameDreamVoiceExcelT() { this.EventContentId = 0; this.UniqueId = 0; - this.VoiceCondition = SCHALE.Common.FlatData.DreamMakerVoiceCondition.None_; + this.VoiceCondition = SCHALE.Common.FlatData.DreamMakerVoiceCondition.None; this.VoiceClip = 0; } } diff --git a/SCHALE.Common/FlatData/MinigameTBGEncounterExcel.cs b/SCHALE.Common/FlatData/MinigameTBGEncounterExcel.cs index 71498e3..5c8d8f3 100644 --- a/SCHALE.Common/FlatData/MinigameTBGEncounterExcel.cs +++ b/SCHALE.Common/FlatData/MinigameTBGEncounterExcel.cs @@ -24,8 +24,8 @@ public struct MinigameTBGEncounterExcel : IFlatbufferObject public long UniqueId { get { int o = __p.__offset(6); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public bool AllThema { get { int o = __p.__offset(8); return o != 0 ? 0!=__p.bb.Get(o + __p.bb_pos) : (bool)false; } } public int ThemaIndex { get { int o = __p.__offset(10); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } - public SCHALE.Common.FlatData.TBGThemaType ThemaType { get { int o = __p.__offset(12); return o != 0 ? (SCHALE.Common.FlatData.TBGThemaType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.TBGThemaType.None_; } } - public SCHALE.Common.FlatData.TBGObjectType ObjectType { get { int o = __p.__offset(14); return o != 0 ? (SCHALE.Common.FlatData.TBGObjectType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.TBGObjectType.None_; } } + public SCHALE.Common.FlatData.TBGThemaType ThemaType { get { int o = __p.__offset(12); return o != 0 ? (SCHALE.Common.FlatData.TBGThemaType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.TBGThemaType.None; } } + public SCHALE.Common.FlatData.TBGObjectType ObjectType { get { int o = __p.__offset(14); return o != 0 ? (SCHALE.Common.FlatData.TBGObjectType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.TBGObjectType.None; } } public string EnemyImagePath { get { int o = __p.__offset(16); return o != 0 ? __p.__string(o + __p.bb_pos) : null; } } #if ENABLE_SPAN_T public Span GetEnemyImagePathBytes() { return __p.__vector_as_span(16, 1); } @@ -139,8 +139,8 @@ public struct MinigameTBGEncounterExcel : IFlatbufferObject long UniqueId = 0, bool AllThema = false, int ThemaIndex = 0, - SCHALE.Common.FlatData.TBGThemaType ThemaType = SCHALE.Common.FlatData.TBGThemaType.None_, - SCHALE.Common.FlatData.TBGObjectType ObjectType = SCHALE.Common.FlatData.TBGObjectType.None_, + SCHALE.Common.FlatData.TBGThemaType ThemaType = SCHALE.Common.FlatData.TBGThemaType.None, + SCHALE.Common.FlatData.TBGObjectType ObjectType = SCHALE.Common.FlatData.TBGObjectType.None, StringOffset EnemyImagePathOffset = default(StringOffset), StringOffset EnemyPrefabNameOffset = default(StringOffset), StringOffset EnemyNameLocalizeOffset = default(StringOffset), @@ -320,8 +320,8 @@ public class MinigameTBGEncounterExcelT this.UniqueId = 0; this.AllThema = false; this.ThemaIndex = 0; - this.ThemaType = SCHALE.Common.FlatData.TBGThemaType.None_; - this.ObjectType = SCHALE.Common.FlatData.TBGObjectType.None_; + this.ThemaType = SCHALE.Common.FlatData.TBGThemaType.None; + this.ObjectType = SCHALE.Common.FlatData.TBGObjectType.None; this.EnemyImagePath = null; this.EnemyPrefabName = null; this.EnemyNameLocalize = null; diff --git a/SCHALE.Common/FlatData/MinigameTBGEncounterRewardExcel.cs b/SCHALE.Common/FlatData/MinigameTBGEncounterRewardExcel.cs index 1985d8e..4979cd8 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 2d90e49..16fcfcb 100644 --- a/SCHALE.Common/FlatData/MinigameTBGItemExcel.cs +++ b/SCHALE.Common/FlatData/MinigameTBGItemExcel.cs @@ -21,8 +21,8 @@ public struct MinigameTBGItemExcel : IFlatbufferObject public MinigameTBGItemExcel __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.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.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 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 @@ -57,8 +57,8 @@ public struct MinigameTBGItemExcel : IFlatbufferObject 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.TBGItemType ItemType = SCHALE.Common.FlatData.TBGItemType.None, + SCHALE.Common.FlatData.TBGItemEffectType TBGItemEffectType = SCHALE.Common.FlatData.TBGItemEffectType.None, int ItemParameter = 0, StringOffset LocalizeETCIdOffset = default(StringOffset), StringOffset IconOffset = default(StringOffset), @@ -74,7 +74,7 @@ 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); @@ -83,7 +83,7 @@ public struct MinigameTBGItemExcel : IFlatbufferObject 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); } @@ -104,7 +104,7 @@ 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); @@ -123,7 +123,7 @@ public struct MinigameTBGItemExcel : IFlatbufferObject builder, _o.UniqueId, _o.ItemType, - _o.TBGItemEffectType_, + _o.TBGItemEffectType, _o.ItemParameter, _LocalizeETCId, _Icon, @@ -138,7 +138,7 @@ 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; } @@ -149,8 +149,8 @@ public class MinigameTBGItemExcelT public MinigameTBGItemExcelT() { this.UniqueId = 0; - this.ItemType = SCHALE.Common.FlatData.TBGItemType.None_; - this.TBGItemEffectType_ = SCHALE.Common.FlatData.TBGItemEffectType.None_; + this.ItemType = SCHALE.Common.FlatData.TBGItemType.None; + this.TBGItemEffectType = SCHALE.Common.FlatData.TBGItemEffectType.None; this.ItemParameter = 0; this.LocalizeETCId = null; this.Icon = null; @@ -169,7 +169,7 @@ 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) diff --git a/SCHALE.Common/FlatData/MinigameTBGObjectExcel.cs b/SCHALE.Common/FlatData/MinigameTBGObjectExcel.cs index ad12719..7c20cce 100644 --- a/SCHALE.Common/FlatData/MinigameTBGObjectExcel.cs +++ b/SCHALE.Common/FlatData/MinigameTBGObjectExcel.cs @@ -35,8 +35,8 @@ public struct MinigameTBGObjectExcel : IFlatbufferObject public ArraySegment? GetPrefabNameBytes() { return __p.__vector_as_arraysegment(8); } #endif public byte[] GetPrefabNameArray() { return __p.__vector_as_array(8); } - public SCHALE.Common.FlatData.TBGObjectType ObjectType { get { int o = __p.__offset(10); return o != 0 ? (SCHALE.Common.FlatData.TBGObjectType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.TBGObjectType.None_; } } - public SCHALE.Common.FlatData.ParcelType ObjectCostType { 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.TBGObjectType ObjectType { get { int o = __p.__offset(10); return o != 0 ? (SCHALE.Common.FlatData.TBGObjectType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.TBGObjectType.None; } } + public SCHALE.Common.FlatData.ParcelType ObjectCostType { 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 ObjectCostId { get { int o = __p.__offset(14); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public int ObjectCostAmount { get { int o = __p.__offset(16); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } public bool Disposable { get { int o = __p.__offset(18); return o != 0 ? 0!=__p.bb.Get(o + __p.bb_pos) : (bool)false; } } @@ -46,8 +46,8 @@ public struct MinigameTBGObjectExcel : IFlatbufferObject long UniqueId = 0, StringOffset KeyOffset = default(StringOffset), StringOffset PrefabNameOffset = default(StringOffset), - SCHALE.Common.FlatData.TBGObjectType ObjectType = SCHALE.Common.FlatData.TBGObjectType.None_, - SCHALE.Common.FlatData.ParcelType ObjectCostType = SCHALE.Common.FlatData.ParcelType.None_, + SCHALE.Common.FlatData.TBGObjectType ObjectType = SCHALE.Common.FlatData.TBGObjectType.None, + SCHALE.Common.FlatData.ParcelType ObjectCostType = SCHALE.Common.FlatData.ParcelType.None, long ObjectCostId = 0, int ObjectCostAmount = 0, bool Disposable = false, @@ -130,8 +130,8 @@ public class MinigameTBGObjectExcelT this.UniqueId = 0; this.Key = null; this.PrefabName = null; - this.ObjectType = SCHALE.Common.FlatData.TBGObjectType.None_; - this.ObjectCostType = SCHALE.Common.FlatData.ParcelType.None_; + this.ObjectType = SCHALE.Common.FlatData.TBGObjectType.None; + this.ObjectCostType = SCHALE.Common.FlatData.ParcelType.None; this.ObjectCostId = 0; this.ObjectCostAmount = 0; this.Disposable = false; diff --git a/SCHALE.Common/FlatData/MinigameTBGSeasonExcel.cs b/SCHALE.Common/FlatData/MinigameTBGSeasonExcel.cs index debf1d5..dd55676 100644 --- a/SCHALE.Common/FlatData/MinigameTBGSeasonExcel.cs +++ b/SCHALE.Common/FlatData/MinigameTBGSeasonExcel.cs @@ -56,9 +56,9 @@ public struct MinigameTBGSeasonExcel : IFlatbufferObject public ArraySegment? GetEchelonSlot4PortraitBytes() { return __p.__vector_as_arraysegment(26); } #endif public byte[] GetEchelonSlot4PortraitArray() { return __p.__vector_as_array(26); } - public SCHALE.Common.FlatData.ParcelType EventUseCostType { 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 SCHALE.Common.FlatData.ParcelType EventUseCostType { 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 EventUseCostId { get { int o = __p.__offset(30); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } - public SCHALE.Common.FlatData.ParcelType EchelonRevivalCostType { get { int o = __p.__offset(32); return o != 0 ? (SCHALE.Common.FlatData.ParcelType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.ParcelType.None_; } } + public SCHALE.Common.FlatData.ParcelType EchelonRevivalCostType { get { int o = __p.__offset(32); return o != 0 ? (SCHALE.Common.FlatData.ParcelType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.ParcelType.None; } } public long EchelonRevivalCostId { get { int o = __p.__offset(34); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public int EchelonRevivalCostAmount { get { int o = __p.__offset(36); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } public int EnemyBossHP { get { int o = __p.__offset(38); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } @@ -99,9 +99,9 @@ public struct MinigameTBGSeasonExcel : IFlatbufferObject StringOffset EchelonSlot2PortraitOffset = default(StringOffset), StringOffset EchelonSlot3PortraitOffset = default(StringOffset), StringOffset EchelonSlot4PortraitOffset = default(StringOffset), - SCHALE.Common.FlatData.ParcelType EventUseCostType = SCHALE.Common.FlatData.ParcelType.None_, + SCHALE.Common.FlatData.ParcelType EventUseCostType = SCHALE.Common.FlatData.ParcelType.None, long EventUseCostId = 0, - SCHALE.Common.FlatData.ParcelType EchelonRevivalCostType = SCHALE.Common.FlatData.ParcelType.None_, + SCHALE.Common.FlatData.ParcelType EchelonRevivalCostType = SCHALE.Common.FlatData.ParcelType.None, long EchelonRevivalCostId = 0, int EchelonRevivalCostAmount = 0, int EnemyBossHP = 0, @@ -307,9 +307,9 @@ public class MinigameTBGSeasonExcelT this.EchelonSlot2Portrait = null; this.EchelonSlot3Portrait = null; this.EchelonSlot4Portrait = null; - this.EventUseCostType = SCHALE.Common.FlatData.ParcelType.None_; + this.EventUseCostType = SCHALE.Common.FlatData.ParcelType.None; this.EventUseCostId = 0; - this.EchelonRevivalCostType = SCHALE.Common.FlatData.ParcelType.None_; + this.EchelonRevivalCostType = SCHALE.Common.FlatData.ParcelType.None; this.EchelonRevivalCostId = 0; this.EchelonRevivalCostAmount = 0; this.EnemyBossHP = 0; diff --git a/SCHALE.Common/FlatData/MinigameTBGThemaExcel.cs b/SCHALE.Common/FlatData/MinigameTBGThemaExcel.cs index c7842bb..5ef0ab9 100644 --- a/SCHALE.Common/FlatData/MinigameTBGThemaExcel.cs +++ b/SCHALE.Common/FlatData/MinigameTBGThemaExcel.cs @@ -23,7 +23,7 @@ public struct MinigameTBGThemaExcel : IFlatbufferObject public long EventContentId { 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 int ThemaIndex { get { int o = __p.__offset(8); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } - public SCHALE.Common.FlatData.TBGThemaType ThemaType { get { int o = __p.__offset(10); return o != 0 ? (SCHALE.Common.FlatData.TBGThemaType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.TBGThemaType.None_; } } + public SCHALE.Common.FlatData.TBGThemaType ThemaType { get { int o = __p.__offset(10); return o != 0 ? (SCHALE.Common.FlatData.TBGThemaType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.TBGThemaType.None; } } public string ThemaMap { get { int o = __p.__offset(12); return o != 0 ? __p.__string(o + __p.bb_pos) : null; } } #if ENABLE_SPAN_T public Span GetThemaMapBytes() { return __p.__vector_as_span(12, 1); } @@ -84,7 +84,7 @@ public struct MinigameTBGThemaExcel : IFlatbufferObject long EventContentId = 0, long UniqueId = 0, int ThemaIndex = 0, - SCHALE.Common.FlatData.TBGThemaType ThemaType = SCHALE.Common.FlatData.TBGThemaType.None_, + SCHALE.Common.FlatData.TBGThemaType ThemaType = SCHALE.Common.FlatData.TBGThemaType.None, StringOffset ThemaMapOffset = default(StringOffset), StringOffset ThemaMapBGOffset = default(StringOffset), VectorOffset PortalConditionOffset = default(VectorOffset), @@ -231,7 +231,7 @@ public class MinigameTBGThemaExcelT this.EventContentId = 0; this.UniqueId = 0; this.ThemaIndex = 0; - this.ThemaType = SCHALE.Common.FlatData.TBGThemaType.None_; + this.ThemaType = SCHALE.Common.FlatData.TBGThemaType.None; this.ThemaMap = null; this.ThemaMapBG = null; this.PortalCondition = null; diff --git a/SCHALE.Common/FlatData/MinigameTBGVoiceExcel.cs b/SCHALE.Common/FlatData/MinigameTBGVoiceExcel.cs index 3cd1418..590d467 100644 --- a/SCHALE.Common/FlatData/MinigameTBGVoiceExcel.cs +++ b/SCHALE.Common/FlatData/MinigameTBGVoiceExcel.cs @@ -22,13 +22,13 @@ public struct MinigameTBGVoiceExcel : IFlatbufferObject public long EventContentId { 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.TBGVoiceCondition VoiceCondition { get { int o = __p.__offset(8); return o != 0 ? (SCHALE.Common.FlatData.TBGVoiceCondition)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.TBGVoiceCondition.None_; } } + public SCHALE.Common.FlatData.TBGVoiceCondition VoiceCondition { get { int o = __p.__offset(8); return o != 0 ? (SCHALE.Common.FlatData.TBGVoiceCondition)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.TBGVoiceCondition.None; } } public uint VoiceId { get { int o = __p.__offset(10); return o != 0 ? __p.bb.GetUint(o + __p.bb_pos) : (uint)0; } } public static Offset CreateMinigameTBGVoiceExcel(FlatBufferBuilder builder, long EventContentId = 0, long UniqueId = 0, - SCHALE.Common.FlatData.TBGVoiceCondition VoiceCondition = SCHALE.Common.FlatData.TBGVoiceCondition.None_, + SCHALE.Common.FlatData.TBGVoiceCondition VoiceCondition = SCHALE.Common.FlatData.TBGVoiceCondition.None, uint VoiceId = 0) { builder.StartTable(4); MinigameTBGVoiceExcel.AddUniqueId(builder, UniqueId); @@ -80,7 +80,7 @@ public class MinigameTBGVoiceExcelT public MinigameTBGVoiceExcelT() { this.EventContentId = 0; this.UniqueId = 0; - this.VoiceCondition = SCHALE.Common.FlatData.TBGVoiceCondition.None_; + this.VoiceCondition = SCHALE.Common.FlatData.TBGVoiceCondition.None; this.VoiceId = 0; } } diff --git a/SCHALE.Common/FlatData/MissionCompleteConditionType.cs b/SCHALE.Common/FlatData/MissionCompleteConditionType.cs index 9a2aabd..f78d3aa 100644 --- a/SCHALE.Common/FlatData/MissionCompleteConditionType.cs +++ b/SCHALE.Common/FlatData/MissionCompleteConditionType.cs @@ -7,7 +7,7 @@ namespace SCHALE.Common.FlatData public enum MissionCompleteConditionType : int { - None_ = 0, + None = 0, Reset_DailyLogin = 1, Reset_DailyLoginCount = 2, Reset_CompleteMission = 3, diff --git a/SCHALE.Common/FlatData/MissionExcel.cs b/SCHALE.Common/FlatData/MissionExcel.cs index 0c27a95..e3de8e1 100644 --- a/SCHALE.Common/FlatData/MissionExcel.cs +++ b/SCHALE.Common/FlatData/MissionExcel.cs @@ -23,7 +23,7 @@ public struct MissionExcel : 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.MissionCategory Category { get { int o = __p.__offset(6); return o != 0 ? (SCHALE.Common.FlatData.MissionCategory)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.MissionCategory.Challenge; } } public uint Description { get { int o = __p.__offset(8); return o != 0 ? __p.bb.GetUint(o + __p.bb_pos) : (uint)0; } } - public SCHALE.Common.FlatData.MissionResetType ResetType { get { int o = __p.__offset(10); return o != 0 ? (SCHALE.Common.FlatData.MissionResetType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.MissionResetType.None_; } } + public SCHALE.Common.FlatData.MissionResetType ResetType { get { int o = __p.__offset(10); return o != 0 ? (SCHALE.Common.FlatData.MissionResetType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.MissionResetType.None; } } public SCHALE.Common.FlatData.MissionToastDisplayConditionType ToastDisplayType { get { int o = __p.__offset(12); return o != 0 ? (SCHALE.Common.FlatData.MissionToastDisplayConditionType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.MissionToastDisplayConditionType.Always; } } public string ToastImagePath { get { int o = __p.__offset(14); return o != 0 ? __p.__string(o + __p.bb_pos) : null; } } #if ENABLE_SPAN_T @@ -56,7 +56,7 @@ public struct MissionExcel : IFlatbufferObject public ArraySegment? GetStartableEndDateBytes() { return __p.__vector_as_arraysegment(26); } #endif public byte[] GetStartableEndDateArray() { return __p.__vector_as_array(26); } - public SCHALE.Common.FlatData.ContentType DateAutoRefer { get { int o = __p.__offset(28); return o != 0 ? (SCHALE.Common.FlatData.ContentType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.ContentType.None_; } } + public SCHALE.Common.FlatData.ContentType DateAutoRefer { get { int o = __p.__offset(28); return o != 0 ? (SCHALE.Common.FlatData.ContentType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.ContentType.None; } } public long DisplayOrder { get { int o = __p.__offset(30); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public long PreMissionId(int j) { int o = __p.__offset(32); return o != 0 ? __p.bb.GetLong(__p.__vector(o) + j * 8) : (long)0; } public int PreMissionIdLength { get { int o = __p.__offset(32); return o != 0 ? __p.__vector_len(o) : 0; } } @@ -79,7 +79,7 @@ public struct MissionExcel : IFlatbufferObject public string ShortcutUI(int j) { int o = __p.__offset(40); return o != 0 ? __p.__string(__p.__vector(o) + j * 4) : null; } public int ShortcutUILength { get { int o = __p.__offset(40); return o != 0 ? __p.__vector_len(o) : 0; } } public long ChallengeStageShortcut { get { int o = __p.__offset(42); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } - public SCHALE.Common.FlatData.MissionCompleteConditionType CompleteConditionType { get { int o = __p.__offset(44); return o != 0 ? (SCHALE.Common.FlatData.MissionCompleteConditionType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.MissionCompleteConditionType.None_; } } + public SCHALE.Common.FlatData.MissionCompleteConditionType CompleteConditionType { get { int o = __p.__offset(44); return o != 0 ? (SCHALE.Common.FlatData.MissionCompleteConditionType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.MissionCompleteConditionType.None; } } public long CompleteConditionCount { get { int o = __p.__offset(46); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public long CompleteConditionParameter(int j) { int o = __p.__offset(48); return o != 0 ? __p.bb.GetLong(__p.__vector(o) + j * 8) : (long)0; } public int CompleteConditionParameterLength { get { int o = __p.__offset(48); return o != 0 ? __p.__vector_len(o) : 0; } } @@ -133,7 +133,7 @@ public struct MissionExcel : IFlatbufferObject long Id = 0, SCHALE.Common.FlatData.MissionCategory Category = SCHALE.Common.FlatData.MissionCategory.Challenge, uint Description = 0, - SCHALE.Common.FlatData.MissionResetType ResetType = SCHALE.Common.FlatData.MissionResetType.None_, + SCHALE.Common.FlatData.MissionResetType ResetType = SCHALE.Common.FlatData.MissionResetType.None, SCHALE.Common.FlatData.MissionToastDisplayConditionType ToastDisplayType = SCHALE.Common.FlatData.MissionToastDisplayConditionType.Always, StringOffset ToastImagePathOffset = default(StringOffset), bool ViewFlag = false, @@ -142,7 +142,7 @@ public struct MissionExcel : IFlatbufferObject StringOffset EndDateOffset = default(StringOffset), long EndDay = 0, StringOffset StartableEndDateOffset = default(StringOffset), - SCHALE.Common.FlatData.ContentType DateAutoRefer = SCHALE.Common.FlatData.ContentType.None_, + SCHALE.Common.FlatData.ContentType DateAutoRefer = SCHALE.Common.FlatData.ContentType.None, long DisplayOrder = 0, VectorOffset PreMissionIdOffset = default(VectorOffset), SCHALE.Common.FlatData.AccountState AccountType = SCHALE.Common.FlatData.AccountState.WaitingSignIn, @@ -150,7 +150,7 @@ public struct MissionExcel : IFlatbufferObject VectorOffset ContentTagsOffset = default(VectorOffset), VectorOffset ShortcutUIOffset = default(VectorOffset), long ChallengeStageShortcut = 0, - SCHALE.Common.FlatData.MissionCompleteConditionType CompleteConditionType = SCHALE.Common.FlatData.MissionCompleteConditionType.None_, + SCHALE.Common.FlatData.MissionCompleteConditionType CompleteConditionType = SCHALE.Common.FlatData.MissionCompleteConditionType.None, long CompleteConditionCount = 0, VectorOffset CompleteConditionParameterOffset = default(VectorOffset), VectorOffset CompleteConditionParameterTagOffset = default(VectorOffset), @@ -423,7 +423,7 @@ public class MissionExcelT this.Id = 0; this.Category = SCHALE.Common.FlatData.MissionCategory.Challenge; this.Description = 0; - this.ResetType = SCHALE.Common.FlatData.MissionResetType.None_; + this.ResetType = SCHALE.Common.FlatData.MissionResetType.None; this.ToastDisplayType = SCHALE.Common.FlatData.MissionToastDisplayConditionType.Always; this.ToastImagePath = null; this.ViewFlag = false; @@ -432,7 +432,7 @@ public class MissionExcelT this.EndDate = null; this.EndDay = 0; this.StartableEndDate = null; - this.DateAutoRefer = SCHALE.Common.FlatData.ContentType.None_; + this.DateAutoRefer = SCHALE.Common.FlatData.ContentType.None; this.DisplayOrder = 0; this.PreMissionId = null; this.AccountType = SCHALE.Common.FlatData.AccountState.WaitingSignIn; @@ -440,7 +440,7 @@ public class MissionExcelT this.ContentTags = null; this.ShortcutUI = null; this.ChallengeStageShortcut = 0; - this.CompleteConditionType = SCHALE.Common.FlatData.MissionCompleteConditionType.None_; + this.CompleteConditionType = SCHALE.Common.FlatData.MissionCompleteConditionType.None; this.CompleteConditionCount = 0; this.CompleteConditionParameter = null; this.CompleteConditionParameterTag = null; diff --git a/SCHALE.Common/FlatData/MissionResetType.cs b/SCHALE.Common/FlatData/MissionResetType.cs index e389dee..4be47bc 100644 --- a/SCHALE.Common/FlatData/MissionResetType.cs +++ b/SCHALE.Common/FlatData/MissionResetType.cs @@ -7,7 +7,7 @@ namespace SCHALE.Common.FlatData public enum MissionResetType : int { - None_ = 0, + None = 0, Daily = 1, Weekly = 2, Limit = 3, diff --git a/SCHALE.Common/FlatData/MultiFloorRaidRewardExcel.cs b/SCHALE.Common/FlatData/MultiFloorRaidRewardExcel.cs index c1d4c3c..cfd614c 100644 --- a/SCHALE.Common/FlatData/MultiFloorRaidRewardExcel.cs +++ b/SCHALE.Common/FlatData/MultiFloorRaidRewardExcel.cs @@ -22,14 +22,14 @@ public struct MultiFloorRaidRewardExcel : IFlatbufferObject public long RewardGroupId { get { int o = __p.__offset(4); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public long ClearStageRewardProb { get { int o = __p.__offset(6); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } - public SCHALE.Common.FlatData.ParcelType ClearStageRewardParcelType { 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 ClearStageRewardParcelType { 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 ClearStageRewardParcelUniqueID { get { int o = __p.__offset(10); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public long ClearStageRewardAmount { get { int o = __p.__offset(12); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public static Offset CreateMultiFloorRaidRewardExcel(FlatBufferBuilder builder, long RewardGroupId = 0, long ClearStageRewardProb = 0, - SCHALE.Common.FlatData.ParcelType ClearStageRewardParcelType = SCHALE.Common.FlatData.ParcelType.None_, + SCHALE.Common.FlatData.ParcelType ClearStageRewardParcelType = SCHALE.Common.FlatData.ParcelType.None, long ClearStageRewardParcelUniqueID = 0, long ClearStageRewardAmount = 0) { builder.StartTable(5); @@ -87,7 +87,7 @@ public class MultiFloorRaidRewardExcelT public MultiFloorRaidRewardExcelT() { this.RewardGroupId = 0; this.ClearStageRewardProb = 0; - this.ClearStageRewardParcelType = SCHALE.Common.FlatData.ParcelType.None_; + this.ClearStageRewardParcelType = SCHALE.Common.FlatData.ParcelType.None; this.ClearStageRewardParcelUniqueID = 0; this.ClearStageRewardAmount = 0; } diff --git a/SCHALE.Common/FlatData/MultiFloorRaidStageExcel.cs b/SCHALE.Common/FlatData/MultiFloorRaidStageExcel.cs index ac8a005..0b50187 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/Nation.cs b/SCHALE.Common/FlatData/Nation.cs index 762fff9..7308189 100644 --- a/SCHALE.Common/FlatData/Nation.cs +++ b/SCHALE.Common/FlatData/Nation.cs @@ -7,7 +7,7 @@ namespace SCHALE.Common.FlatData public enum Nation : int { - None_ = 0, + None = 0, All = 1, JP = 2, GL = 3, diff --git a/SCHALE.Common/FlatData/NoticeType.cs b/SCHALE.Common/FlatData/NoticeType.cs index 802b6f3..49d6003 100644 --- a/SCHALE.Common/FlatData/NoticeType.cs +++ b/SCHALE.Common/FlatData/NoticeType.cs @@ -7,7 +7,7 @@ namespace SCHALE.Common.FlatData public enum NoticeType : int { - None_ = 0, + None = 0, Notice = 1, Event = 2, }; diff --git a/SCHALE.Common/FlatData/ObstacleCoverType.cs b/SCHALE.Common/FlatData/ObstacleCoverType.cs index 1a659b3..ce23d88 100644 --- a/SCHALE.Common/FlatData/ObstacleCoverType.cs +++ b/SCHALE.Common/FlatData/ObstacleCoverType.cs @@ -7,7 +7,7 @@ namespace SCHALE.Common.FlatData public enum ObstacleCoverType : int { - None_ = 0, + None = 0, Cover = 1, Shelter = 2, }; diff --git a/SCHALE.Common/FlatData/OpenConditionContent.cs b/SCHALE.Common/FlatData/OpenConditionContent.cs index d8005d2..1be7fef 100644 --- a/SCHALE.Common/FlatData/OpenConditionContent.cs +++ b/SCHALE.Common/FlatData/OpenConditionContent.cs @@ -28,7 +28,7 @@ public enum OpenConditionContent : int Story_Sub = 18, Story_Replay = 19, WeekDungeon = 20, - None_ = 21, + None = 21, Shop_Gem = 22, Craft = 23, Student = 24, diff --git a/SCHALE.Common/FlatData/OpenConditionExcel.cs b/SCHALE.Common/FlatData/OpenConditionExcel.cs index d0b23d0..bb23215 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/OperatorCondition.cs b/SCHALE.Common/FlatData/OperatorCondition.cs index b7f0d78..06b069f 100644 --- a/SCHALE.Common/FlatData/OperatorCondition.cs +++ b/SCHALE.Common/FlatData/OperatorCondition.cs @@ -7,7 +7,7 @@ namespace SCHALE.Common.FlatData public enum OperatorCondition : int { - None_ = 0, + None = 0, StrategyStart = 1, StrategyVictory = 2, StrategyDefeat = 3, diff --git a/SCHALE.Common/FlatData/OperatorExcel.cs b/SCHALE.Common/FlatData/OperatorExcel.cs index 51615be..8d954d0 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/ParcelAutoSynthExcel.cs b/SCHALE.Common/FlatData/ParcelAutoSynthExcel.cs index 9ff5623..c26b2f8 100644 --- a/SCHALE.Common/FlatData/ParcelAutoSynthExcel.cs +++ b/SCHALE.Common/FlatData/ParcelAutoSynthExcel.cs @@ -20,24 +20,24 @@ public struct ParcelAutoSynthExcel : IFlatbufferObject public void __init(int _i, ByteBuffer _bb) { __p = new Table(_i, _bb); } public ParcelAutoSynthExcel __assign(int _i, ByteBuffer _bb) { __init(_i, _bb); return this; } - public SCHALE.Common.FlatData.ParcelType RequireParcelType { 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 RequireParcelType { 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 RequireParcelId { get { int o = __p.__offset(6); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public long RequireParcelAmount { get { int o = __p.__offset(8); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public long SynthStartAmount { get { int o = __p.__offset(10); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public long SynthEndAmount { get { int o = __p.__offset(12); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public bool SynthMaxItem { get { int o = __p.__offset(14); return o != 0 ? 0!=__p.bb.Get(o + __p.bb_pos) : (bool)false; } } - public SCHALE.Common.FlatData.ParcelType ResultParcelType { get { int o = __p.__offset(16); return o != 0 ? (SCHALE.Common.FlatData.ParcelType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.ParcelType.None_; } } + public SCHALE.Common.FlatData.ParcelType ResultParcelType { get { int o = __p.__offset(16); return o != 0 ? (SCHALE.Common.FlatData.ParcelType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.ParcelType.None; } } public long ResultParcelId { get { int o = __p.__offset(18); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public long ResultParcelAmount { get { int o = __p.__offset(20); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public static Offset CreateParcelAutoSynthExcel(FlatBufferBuilder builder, - SCHALE.Common.FlatData.ParcelType RequireParcelType = SCHALE.Common.FlatData.ParcelType.None_, + SCHALE.Common.FlatData.ParcelType RequireParcelType = SCHALE.Common.FlatData.ParcelType.None, long RequireParcelId = 0, long RequireParcelAmount = 0, long SynthStartAmount = 0, long SynthEndAmount = 0, bool SynthMaxItem = false, - SCHALE.Common.FlatData.ParcelType ResultParcelType = SCHALE.Common.FlatData.ParcelType.None_, + SCHALE.Common.FlatData.ParcelType ResultParcelType = SCHALE.Common.FlatData.ParcelType.None, long ResultParcelId = 0, long ResultParcelAmount = 0) { builder.StartTable(9); @@ -113,13 +113,13 @@ public class ParcelAutoSynthExcelT public long ResultParcelAmount { get; set; } public ParcelAutoSynthExcelT() { - this.RequireParcelType = SCHALE.Common.FlatData.ParcelType.None_; + this.RequireParcelType = SCHALE.Common.FlatData.ParcelType.None; this.RequireParcelId = 0; this.RequireParcelAmount = 0; this.SynthStartAmount = 0; this.SynthEndAmount = 0; this.SynthMaxItem = false; - this.ResultParcelType = SCHALE.Common.FlatData.ParcelType.None_; + this.ResultParcelType = SCHALE.Common.FlatData.ParcelType.None; this.ResultParcelId = 0; this.ResultParcelAmount = 0; } diff --git a/SCHALE.Common/FlatData/ParcelChangeReason.cs b/SCHALE.Common/FlatData/ParcelChangeReason.cs index a036ad6..e4a88b9 100644 --- a/SCHALE.Common/FlatData/ParcelChangeReason.cs +++ b/SCHALE.Common/FlatData/ParcelChangeReason.cs @@ -7,7 +7,7 @@ namespace SCHALE.Common.FlatData public enum ParcelChangeReason : int { - None_ = 0, + None = 0, Acquire_NewAccount = 1, Acquire_PlayReward = 2, Acquire_ChapterReward = 3, diff --git a/SCHALE.Common/FlatData/ParcelType.cs b/SCHALE.Common/FlatData/ParcelType.cs index d11811e..5abce02 100644 --- a/SCHALE.Common/FlatData/ParcelType.cs +++ b/SCHALE.Common/FlatData/ParcelType.cs @@ -7,7 +7,7 @@ namespace SCHALE.Common.FlatData public enum ParcelType : int { - None_ = 0, + None = 0, Character = 1, Currency = 2, Equipment = 3, diff --git a/SCHALE.Common/FlatData/PickupDuplicateBonusExcel.cs b/SCHALE.Common/FlatData/PickupDuplicateBonusExcel.cs index c21053e..3ff9ff3 100644 --- a/SCHALE.Common/FlatData/PickupDuplicateBonusExcel.cs +++ b/SCHALE.Common/FlatData/PickupDuplicateBonusExcel.cs @@ -21,19 +21,19 @@ 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_; } } + 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; } } public long RewardParcelId { get { int o = __p.__offset(14); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public long RewardParcelAmount { get { int o = __p.__offset(16); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } 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_, + SCHALE.Common.FlatData.ParcelType RewardParcelType = SCHALE.Common.FlatData.ParcelType.None, long RewardParcelId = 0, long RewardParcelAmount = 0) { builder.StartTable(7); @@ -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,10 +100,10 @@ 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_; + this.RewardParcelType = SCHALE.Common.FlatData.ParcelType.None; this.RewardParcelId = 0; this.RewardParcelAmount = 0; } @@ -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/PotentialStatBonusRateType.cs b/SCHALE.Common/FlatData/PotentialStatBonusRateType.cs index c667de9..e75bd9d 100644 --- a/SCHALE.Common/FlatData/PotentialStatBonusRateType.cs +++ b/SCHALE.Common/FlatData/PotentialStatBonusRateType.cs @@ -7,7 +7,7 @@ namespace SCHALE.Common.FlatData public enum PotentialStatBonusRateType : int { - None_ = 0, + None = 0, MaxHP = 1, AttackPower = 2, HealPower = 3, diff --git a/SCHALE.Common/FlatData/PresetCharacterGroupExcel.cs b/SCHALE.Common/FlatData/PresetCharacterGroupExcel.cs index 8342306..4154a50 100644 --- a/SCHALE.Common/FlatData/PresetCharacterGroupExcel.cs +++ b/SCHALE.Common/FlatData/PresetCharacterGroupExcel.cs @@ -53,11 +53,11 @@ public struct PresetCharacterGroupExcel : IFlatbufferObject public bool EquipCharacterGear { get { int o = __p.__offset(52); return o != 0 ? 0!=__p.bb.Get(o + __p.bb_pos) : (bool)false; } } public int EquipCharacterGearTier { get { int o = __p.__offset(54); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } public int EquipCharacterGearLevel { get { int o = __p.__offset(56); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } - public SCHALE.Common.FlatData.PotentialStatBonusRateType PotentialType01 { get { int o = __p.__offset(58); return o != 0 ? (SCHALE.Common.FlatData.PotentialStatBonusRateType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.PotentialStatBonusRateType.None_; } } + public SCHALE.Common.FlatData.PotentialStatBonusRateType PotentialType01 { get { int o = __p.__offset(58); return o != 0 ? (SCHALE.Common.FlatData.PotentialStatBonusRateType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.PotentialStatBonusRateType.None; } } public int PotentialLevel01 { get { int o = __p.__offset(60); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } - public SCHALE.Common.FlatData.PotentialStatBonusRateType PotentialType02 { get { int o = __p.__offset(62); return o != 0 ? (SCHALE.Common.FlatData.PotentialStatBonusRateType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.PotentialStatBonusRateType.None_; } } + public SCHALE.Common.FlatData.PotentialStatBonusRateType PotentialType02 { get { int o = __p.__offset(62); return o != 0 ? (SCHALE.Common.FlatData.PotentialStatBonusRateType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.PotentialStatBonusRateType.None; } } public int PotentialLevel02 { get { int o = __p.__offset(64); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } - public SCHALE.Common.FlatData.PotentialStatBonusRateType PotentialType03 { get { int o = __p.__offset(66); return o != 0 ? (SCHALE.Common.FlatData.PotentialStatBonusRateType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.PotentialStatBonusRateType.None_; } } + public SCHALE.Common.FlatData.PotentialStatBonusRateType PotentialType03 { get { int o = __p.__offset(66); return o != 0 ? (SCHALE.Common.FlatData.PotentialStatBonusRateType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.PotentialStatBonusRateType.None; } } public int PotentialLevel03 { get { int o = __p.__offset(68); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } public static Offset CreatePresetCharacterGroupExcel(FlatBufferBuilder builder, @@ -88,11 +88,11 @@ public struct PresetCharacterGroupExcel : IFlatbufferObject bool EquipCharacterGear = false, int EquipCharacterGearTier = 0, int EquipCharacterGearLevel = 0, - SCHALE.Common.FlatData.PotentialStatBonusRateType PotentialType01 = SCHALE.Common.FlatData.PotentialStatBonusRateType.None_, + SCHALE.Common.FlatData.PotentialStatBonusRateType PotentialType01 = SCHALE.Common.FlatData.PotentialStatBonusRateType.None, int PotentialLevel01 = 0, - SCHALE.Common.FlatData.PotentialStatBonusRateType PotentialType02 = SCHALE.Common.FlatData.PotentialStatBonusRateType.None_, + SCHALE.Common.FlatData.PotentialStatBonusRateType PotentialType02 = SCHALE.Common.FlatData.PotentialStatBonusRateType.None, int PotentialLevel02 = 0, - SCHALE.Common.FlatData.PotentialStatBonusRateType PotentialType03 = SCHALE.Common.FlatData.PotentialStatBonusRateType.None_, + SCHALE.Common.FlatData.PotentialStatBonusRateType PotentialType03 = SCHALE.Common.FlatData.PotentialStatBonusRateType.None, int PotentialLevel03 = 0) { builder.StartTable(33); PresetCharacterGroupExcel.AddPresetCharacterGroupId(builder, PresetCharacterGroupId); @@ -315,11 +315,11 @@ public class PresetCharacterGroupExcelT this.EquipCharacterGear = false; this.EquipCharacterGearTier = 0; this.EquipCharacterGearLevel = 0; - this.PotentialType01 = SCHALE.Common.FlatData.PotentialStatBonusRateType.None_; + this.PotentialType01 = SCHALE.Common.FlatData.PotentialStatBonusRateType.None; this.PotentialLevel01 = 0; - this.PotentialType02 = SCHALE.Common.FlatData.PotentialStatBonusRateType.None_; + this.PotentialType02 = SCHALE.Common.FlatData.PotentialStatBonusRateType.None; this.PotentialLevel02 = 0; - this.PotentialType03 = SCHALE.Common.FlatData.PotentialStatBonusRateType.None_; + this.PotentialType03 = SCHALE.Common.FlatData.PotentialStatBonusRateType.None; this.PotentialLevel03 = 0; } } diff --git a/SCHALE.Common/FlatData/PresetParcelsExcel.cs b/SCHALE.Common/FlatData/PresetParcelsExcel.cs index 526f7f2..c74b1c4 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/ProductCategory.cs b/SCHALE.Common/FlatData/ProductCategory.cs index e610712..d7c69fb 100644 --- a/SCHALE.Common/FlatData/ProductCategory.cs +++ b/SCHALE.Common/FlatData/ProductCategory.cs @@ -7,7 +7,7 @@ namespace SCHALE.Common.FlatData public enum ProductCategory : int { - None_ = 0, + None = 0, Gem = 1, Monthly = 2, Package = 3, diff --git a/SCHALE.Common/FlatData/ProductDisplayTag.cs b/SCHALE.Common/FlatData/ProductDisplayTag.cs index a240c82..87ce808 100644 --- a/SCHALE.Common/FlatData/ProductDisplayTag.cs +++ b/SCHALE.Common/FlatData/ProductDisplayTag.cs @@ -7,7 +7,7 @@ namespace SCHALE.Common.FlatData public enum ProductDisplayTag : int { - None_ = 0, + None = 0, New = 1, Hot = 2, Sale = 3, diff --git a/SCHALE.Common/FlatData/ProductExcel.cs b/SCHALE.Common/FlatData/ProductExcel.cs index 059ffaa..6427366 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 3347d14..fad292f 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,7 +37,7 @@ 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 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; } @@ -93,10 +93,10 @@ public struct ProductMonthlyExcel : IFlatbufferObject 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), @@ -117,9 +117,9 @@ 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); @@ -128,10 +128,10 @@ public struct ProductMonthlyExcel : IFlatbufferObject 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 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); } @@ -184,10 +184,10 @@ 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(); @@ -242,10 +242,10 @@ public struct ProductMonthlyExcel : IFlatbufferObject builder, _o.Id, _ProductId, - _o.StoreType_, + _o.StoreType, _o.Price, _PriceReference, - _o.ProductTagType_, + _o.ProductTagType, _o.MonthlyDays, _o.UseMonthlyProductCheck, _ParcelType_, @@ -262,10 +262,10 @@ 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; } @@ -279,10 +279,10 @@ 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; @@ -303,10 +303,10 @@ 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.VerifyField(tablePos, 18 /*UseMonthlyProductCheck*/, 1 /*bool*/, 1, false) && verifier.VerifyVectorOfData(tablePos, 20 /*ParcelType_*/, 4 /*SCHALE.Common.FlatData.ParcelType*/, false) diff --git a/SCHALE.Common/FlatData/ProjectileAction.cs b/SCHALE.Common/FlatData/ProjectileAction.cs index 4e2eab1..40c6d4e 100644 --- a/SCHALE.Common/FlatData/ProjectileAction.cs +++ b/SCHALE.Common/FlatData/ProjectileAction.cs @@ -7,7 +7,7 @@ namespace SCHALE.Common.FlatData public enum ProjectileAction : int { - None_ = 0, + None = 0, Damage = 1, Heal = 2, }; diff --git a/SCHALE.Common/FlatData/ProtocolSettingExcel.cs b/SCHALE.Common/FlatData/ProtocolSettingExcel.cs index 0f6e915..99c89bd 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/PurchaseCountResetType.cs b/SCHALE.Common/FlatData/PurchaseCountResetType.cs index 60f1ce6..bf7fed6 100644 --- a/SCHALE.Common/FlatData/PurchaseCountResetType.cs +++ b/SCHALE.Common/FlatData/PurchaseCountResetType.cs @@ -7,7 +7,7 @@ namespace SCHALE.Common.FlatData public enum PurchaseCountResetType : int { - None_ = 0, + None = 0, Day = 1, Week = 2, Month = 3, diff --git a/SCHALE.Common/FlatData/PurchasePeriodType.cs b/SCHALE.Common/FlatData/PurchasePeriodType.cs index 1e46bb1..740a7e7 100644 --- a/SCHALE.Common/FlatData/PurchasePeriodType.cs +++ b/SCHALE.Common/FlatData/PurchasePeriodType.cs @@ -7,7 +7,7 @@ namespace SCHALE.Common.FlatData public enum PurchasePeriodType : int { - None_ = 0, + None = 0, Day = 1, Week = 2, Month = 3, diff --git a/SCHALE.Common/FlatData/PurchaseSourceType.cs b/SCHALE.Common/FlatData/PurchaseSourceType.cs index 6563524..55c70e9 100644 --- a/SCHALE.Common/FlatData/PurchaseSourceType.cs +++ b/SCHALE.Common/FlatData/PurchaseSourceType.cs @@ -7,7 +7,7 @@ namespace SCHALE.Common.FlatData public enum PurchaseSourceType : int { - None_ = 0, + None = 0, Product = 1, ProductMonthly = 2, }; diff --git a/SCHALE.Common/FlatData/PurchaseStatusCode.cs b/SCHALE.Common/FlatData/PurchaseStatusCode.cs index 8e8a433..a4c5ac2 100644 --- a/SCHALE.Common/FlatData/PurchaseStatusCode.cs +++ b/SCHALE.Common/FlatData/PurchaseStatusCode.cs @@ -7,7 +7,7 @@ namespace SCHALE.Common.FlatData public enum PurchaseStatusCode : int { - None_ = 0, + None = 0, Start = 1, PublishSuccess = 2, End = 3, diff --git a/SCHALE.Common/FlatData/RaidSeasonType.cs b/SCHALE.Common/FlatData/RaidSeasonType.cs index 94df58b..dbe2d49 100644 --- a/SCHALE.Common/FlatData/RaidSeasonType.cs +++ b/SCHALE.Common/FlatData/RaidSeasonType.cs @@ -7,7 +7,7 @@ namespace SCHALE.Common.FlatData public enum RaidSeasonType : int { - None_ = 0, + None = 0, Open = 1, Close = 2, Settlement = 3, diff --git a/SCHALE.Common/FlatData/RaidStageExcel.cs b/SCHALE.Common/FlatData/RaidStageExcel.cs index f07b3ed..6946e9c 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/RaidStageRewardExcel.cs b/SCHALE.Common/FlatData/RaidStageRewardExcel.cs index 73f023c..9dc9b32 100644 --- a/SCHALE.Common/FlatData/RaidStageRewardExcel.cs +++ b/SCHALE.Common/FlatData/RaidStageRewardExcel.cs @@ -23,7 +23,7 @@ public struct RaidStageRewardExcel : IFlatbufferObject public long GroupId { get { int o = __p.__offset(4); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public bool IsClearStageRewardHideInfo { get { int o = __p.__offset(6); return o != 0 ? 0!=__p.bb.Get(o + __p.bb_pos) : (bool)false; } } public long ClearStageRewardProb { get { int o = __p.__offset(8); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } - public SCHALE.Common.FlatData.ParcelType ClearStageRewardParcelType { 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 SCHALE.Common.FlatData.ParcelType ClearStageRewardParcelType { 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 ClearStageRewardParcelUniqueID { get { int o = __p.__offset(12); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public string ClearStageRewardParcelUniqueName { get { int o = __p.__offset(14); return o != 0 ? __p.__string(o + __p.bb_pos) : null; } } #if ENABLE_SPAN_T @@ -38,7 +38,7 @@ public struct RaidStageRewardExcel : IFlatbufferObject long GroupId = 0, bool IsClearStageRewardHideInfo = false, long ClearStageRewardProb = 0, - SCHALE.Common.FlatData.ParcelType ClearStageRewardParcelType = SCHALE.Common.FlatData.ParcelType.None_, + SCHALE.Common.FlatData.ParcelType ClearStageRewardParcelType = SCHALE.Common.FlatData.ParcelType.None, long ClearStageRewardParcelUniqueID = 0, StringOffset ClearStageRewardParcelUniqueNameOffset = default(StringOffset), long ClearStageRewardAmount = 0) { @@ -109,7 +109,7 @@ public class RaidStageRewardExcelT this.GroupId = 0; this.IsClearStageRewardHideInfo = false; this.ClearStageRewardProb = 0; - this.ClearStageRewardParcelType = SCHALE.Common.FlatData.ParcelType.None_; + this.ClearStageRewardParcelType = SCHALE.Common.FlatData.ParcelType.None; this.ClearStageRewardParcelUniqueID = 0; this.ClearStageRewardParcelUniqueName = null; this.ClearStageRewardAmount = 0; diff --git a/SCHALE.Common/FlatData/RaidStatus.cs b/SCHALE.Common/FlatData/RaidStatus.cs index a12cf03..18bd2d9 100644 --- a/SCHALE.Common/FlatData/RaidStatus.cs +++ b/SCHALE.Common/FlatData/RaidStatus.cs @@ -7,7 +7,7 @@ namespace SCHALE.Common.FlatData public enum RaidStatus : int { - None_ = 0, + None = 0, Playing = 1, Clear = 2, Close = 3, diff --git a/SCHALE.Common/FlatData/RankingSearchType.cs b/SCHALE.Common/FlatData/RankingSearchType.cs index efd9c3d..b8023bc 100644 --- a/SCHALE.Common/FlatData/RankingSearchType.cs +++ b/SCHALE.Common/FlatData/RankingSearchType.cs @@ -7,7 +7,7 @@ namespace SCHALE.Common.FlatData public enum RankingSearchType : int { - None_ = 0, + None = 0, Rank = 1, Score = 2, }; diff --git a/SCHALE.Common/FlatData/RecipeCraftExcel.cs b/SCHALE.Common/FlatData/RecipeCraftExcel.cs index f211ffb..f137960 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 0121861..6c52299 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 ae119c6..8d02d30 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 b542b29..d0235fa 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 56edd60..7742857 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/RecipeType.cs b/SCHALE.Common/FlatData/RecipeType.cs index a6d0722..995eaf5 100644 --- a/SCHALE.Common/FlatData/RecipeType.cs +++ b/SCHALE.Common/FlatData/RecipeType.cs @@ -7,7 +7,7 @@ namespace SCHALE.Common.FlatData public enum RecipeType : int { - None_ = 0, + None = 0, Craft = 1, SkillLevelUp = 2, CharacterTranscendence = 3, diff --git a/SCHALE.Common/FlatData/ResetContentType.cs b/SCHALE.Common/FlatData/ResetContentType.cs index dc5fcdb..3171214 100644 --- a/SCHALE.Common/FlatData/ResetContentType.cs +++ b/SCHALE.Common/FlatData/ResetContentType.cs @@ -7,7 +7,7 @@ namespace SCHALE.Common.FlatData public enum ResetContentType : int { - None_ = 0, + None = 0, HardStagePlay = 1, StarategyMapHeal = 2, ShopRefresh = 3, diff --git a/SCHALE.Common/FlatData/ScenarioBGEffectExcel.cs b/SCHALE.Common/FlatData/ScenarioBGEffectExcel.cs index 6b2f4fb..015ef8c 100644 --- a/SCHALE.Common/FlatData/ScenarioBGEffectExcel.cs +++ b/SCHALE.Common/FlatData/ScenarioBGEffectExcel.cs @@ -35,7 +35,7 @@ public struct ScenarioBGEffectExcel : IFlatbufferObject 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 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; } } @@ -44,7 +44,7 @@ public struct ScenarioBGEffectExcel : IFlatbufferObject uint Name = 0, StringOffset EffectOffset = default(StringOffset), StringOffset Effect2Offset = default(StringOffset), - SCHALE.Common.FlatData.ScenarioBGScroll Scroll = SCHALE.Common.FlatData.ScenarioBGScroll.None_, + SCHALE.Common.FlatData.ScenarioBGScroll Scroll = SCHALE.Common.FlatData.ScenarioBGScroll.None, long ScrollTime = 0, long ScrollFrom = 0, long ScrollTo = 0) { @@ -116,7 +116,7 @@ public class ScenarioBGEffectExcelT this.Name = 0; this.Effect = null; this.Effect2 = null; - this.Scroll = SCHALE.Common.FlatData.ScenarioBGScroll.None_; + this.Scroll = SCHALE.Common.FlatData.ScenarioBGScroll.None; this.ScrollTime = 0; this.ScrollFrom = 0; this.ScrollTo = 0; diff --git a/SCHALE.Common/FlatData/ScenarioBGNameExcel.cs b/SCHALE.Common/FlatData/ScenarioBGNameExcel.cs index 59996fe..c0d8c85 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); } @@ -29,7 +29,7 @@ public struct ScenarioBGNameExcel : IFlatbufferObject public ArraySegment? GetBGFileNameBytes() { return __p.__vector_as_arraysegment(8); } #endif public byte[] GetBGFileNameArray() { return __p.__vector_as_array(8); } - public SCHALE.Common.FlatData.ScenarioBGType BGType { get { int o = __p.__offset(10); return o != 0 ? (SCHALE.Common.FlatData.ScenarioBGType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.ScenarioBGType.None_; } } + public SCHALE.Common.FlatData.ScenarioBGType BGType { get { int o = __p.__offset(10); return o != 0 ? (SCHALE.Common.FlatData.ScenarioBGType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.ScenarioBGType.None; } } public string AnimationRoot { get { int o = __p.__offset(12); return o != 0 ? __p.__string(o + __p.bb_pos) : null; } } #if ENABLE_SPAN_T public Span GetAnimationRootBytes() { return __p.__vector_as_span(12, 1); } @@ -50,9 +50,9 @@ 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_, + SCHALE.Common.FlatData.ScenarioBGType BGType = SCHALE.Common.FlatData.ScenarioBGType.None, StringOffset AnimationRootOffset = default(StringOffset), StringOffset AnimationNameOffset = default(StringOffset), float SpineScale = 0.0f, @@ -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,9 +135,9 @@ 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.BGType = SCHALE.Common.FlatData.ScenarioBGType.None; this.AnimationRoot = null; this.AnimationName = null; this.SpineScale = 0.0f; @@ -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/ScenarioBGScroll.cs b/SCHALE.Common/FlatData/ScenarioBGScroll.cs index 0436b89..36ecf24 100644 --- a/SCHALE.Common/FlatData/ScenarioBGScroll.cs +++ b/SCHALE.Common/FlatData/ScenarioBGScroll.cs @@ -7,7 +7,7 @@ namespace SCHALE.Common.FlatData public enum ScenarioBGScroll : int { - None_ = 0, + None = 0, Vertical = 1, Horizontal = 2, }; diff --git a/SCHALE.Common/FlatData/ScenarioBGType.cs b/SCHALE.Common/FlatData/ScenarioBGType.cs index 7d7360f..9a00c21 100644 --- a/SCHALE.Common/FlatData/ScenarioBGType.cs +++ b/SCHALE.Common/FlatData/ScenarioBGType.cs @@ -7,7 +7,7 @@ namespace SCHALE.Common.FlatData public enum ScenarioBGType : int { - None_ = 0, + None = 0, Image = 1, BlurRT = 2, Spine = 3, diff --git a/SCHALE.Common/FlatData/ScenarioCharacterBehaviors.cs b/SCHALE.Common/FlatData/ScenarioCharacterBehaviors.cs index 8b1fbab..9e1d4b2 100644 --- a/SCHALE.Common/FlatData/ScenarioCharacterBehaviors.cs +++ b/SCHALE.Common/FlatData/ScenarioCharacterBehaviors.cs @@ -7,7 +7,7 @@ namespace SCHALE.Common.FlatData public enum ScenarioCharacterBehaviors : int { - None_ = 0, + None = 0, Appear = 1, Disappear = 2, AppearToLeft = 3, diff --git a/SCHALE.Common/FlatData/ScenarioCharacterNameExcel.cs b/SCHALE.Common/FlatData/ScenarioCharacterNameExcel.cs index 2d1c3bc..2fdd8aa 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); } @@ -50,7 +50,7 @@ public struct ScenarioCharacterNameExcel : IFlatbufferObject public ArraySegment? GetNicknameJPBytes() { return __p.__vector_as_arraysegment(14); } #endif public byte[] GetNicknameJPArray() { return __p.__vector_as_array(14); } - public SCHALE.Common.FlatData.ScenarioCharacterShapes Shape { get { int o = __p.__offset(16); return o != 0 ? (SCHALE.Common.FlatData.ScenarioCharacterShapes)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.ScenarioCharacterShapes.None_; } } + public SCHALE.Common.FlatData.ScenarioCharacterShapes Shape { get { int o = __p.__offset(16); return o != 0 ? (SCHALE.Common.FlatData.ScenarioCharacterShapes)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.ScenarioCharacterShapes.None; } } public string SpinePrefabName { get { int o = __p.__offset(18); return o != 0 ? __p.__string(o + __p.bb_pos) : null; } } #if ENABLE_SPAN_T public Span GetSpinePrefabNameBytes() { return __p.__vector_as_span(18, 1); } @@ -68,12 +68,12 @@ 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), StringOffset NicknameJPOffset = default(StringOffset), - SCHALE.Common.FlatData.ScenarioCharacterShapes Shape = SCHALE.Common.FlatData.ScenarioCharacterShapes.None_, + SCHALE.Common.FlatData.ScenarioCharacterShapes Shape = SCHALE.Common.FlatData.ScenarioCharacterShapes.None, StringOffset SpinePrefabNameOffset = default(StringOffset), StringOffset SmallPortraitOffset = default(StringOffset)) { builder.StartTable(9); @@ -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,12 +156,12 @@ 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; this.NicknameJP = null; - this.Shape = SCHALE.Common.FlatData.ScenarioCharacterShapes.None_; + this.Shape = SCHALE.Common.FlatData.ScenarioCharacterShapes.None; this.SpinePrefabName = null; this.SmallPortrait = 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/ScenarioCharacterShapes.cs b/SCHALE.Common/FlatData/ScenarioCharacterShapes.cs index d0638a5..2dc7138 100644 --- a/SCHALE.Common/FlatData/ScenarioCharacterShapes.cs +++ b/SCHALE.Common/FlatData/ScenarioCharacterShapes.cs @@ -7,7 +7,7 @@ namespace SCHALE.Common.FlatData public enum ScenarioCharacterShapes : int { - None_ = 0, + None = 0, Signal = 1, BlackSilhouette = 2, Closeup = 4, diff --git a/SCHALE.Common/FlatData/ScenarioContentCollectionExcel.cs b/SCHALE.Common/FlatData/ScenarioContentCollectionExcel.cs index f07d629..00d8cc5 100644 --- a/SCHALE.Common/FlatData/ScenarioContentCollectionExcel.cs +++ b/SCHALE.Common/FlatData/ScenarioContentCollectionExcel.cs @@ -22,7 +22,7 @@ public struct ScenarioContentCollectionExcel : 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.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 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 @@ -31,7 +31,7 @@ public struct ScenarioContentCollectionExcel : IFlatbufferObject 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 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; } } @@ -68,9 +68,9 @@ public struct ScenarioContentCollectionExcel : IFlatbufferObject public static Offset CreateScenarioContentCollectionExcel(FlatBufferBuilder builder, long Id = 0, long GroupId = 0, - SCHALE.Common.FlatData.CollectionUnlockType UnlockConditionType = SCHALE.Common.FlatData.CollectionUnlockType.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 IsHorizon = false, @@ -88,7 +88,7 @@ public struct ScenarioContentCollectionExcel : IFlatbufferObject ScenarioContentCollectionExcel.AddFullResource(builder, FullResourceOffset); ScenarioContentCollectionExcel.AddThumbResource(builder, ThumbResourceOffset); ScenarioContentCollectionExcel.AddEmblemResource(builder, EmblemResourceOffset); - ScenarioContentCollectionExcel.AddMultipleConditionCheckType_(builder, MultipleConditionCheckType_); + ScenarioContentCollectionExcel.AddMultipleConditionCheckType(builder, MultipleConditionCheckType); ScenarioContentCollectionExcel.AddUnlockConditionParameter(builder, UnlockConditionParameterOffset); ScenarioContentCollectionExcel.AddUnlockConditionType(builder, UnlockConditionType); ScenarioContentCollectionExcel.AddIsHorizon(builder, IsHorizon); @@ -106,7 +106,7 @@ public struct ScenarioContentCollectionExcel : IFlatbufferObject 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 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); } @@ -131,7 +131,7 @@ public struct ScenarioContentCollectionExcel : 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.IsHorizon = TableEncryptionService.Convert(this.IsHorizon, key); @@ -158,7 +158,7 @@ public struct ScenarioContentCollectionExcel : IFlatbufferObject _o.GroupId, _o.UnlockConditionType, _UnlockConditionParameter, - _o.MultipleConditionCheckType_, + _o.MultipleConditionCheckType, _o.UnlockConditionCount, _o.IsObject, _o.IsHorizon, @@ -176,7 +176,7 @@ public class ScenarioContentCollectionExcelT 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 SCHALE.Common.FlatData.MultipleConditionCheckType MultipleConditionCheckType { get; set; } public long UnlockConditionCount { get; set; } public bool IsObject { get; set; } public bool IsHorizon { get; set; } @@ -189,9 +189,9 @@ public class ScenarioContentCollectionExcelT public ScenarioContentCollectionExcelT() { this.Id = 0; this.GroupId = 0; - this.UnlockConditionType = SCHALE.Common.FlatData.CollectionUnlockType.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.IsHorizon = false; @@ -213,7 +213,7 @@ static public class ScenarioContentCollectionExcelVerify && 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, 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) diff --git a/SCHALE.Common/FlatData/ScenarioEffectDepth.cs b/SCHALE.Common/FlatData/ScenarioEffectDepth.cs index d8af849..6a9a93e 100644 --- a/SCHALE.Common/FlatData/ScenarioEffectDepth.cs +++ b/SCHALE.Common/FlatData/ScenarioEffectDepth.cs @@ -7,7 +7,7 @@ namespace SCHALE.Common.FlatData public enum ScenarioEffectDepth : int { - None_ = 0, + None = 0, AboveBg = 1, AboveCharacter = 2, AboveAll = 3, diff --git a/SCHALE.Common/FlatData/ScenarioExcel.cs b/SCHALE.Common/FlatData/ScenarioExcel.cs index 9a7630f..0f1ffea 100644 --- a/SCHALE.Common/FlatData/ScenarioExcel.cs +++ b/SCHALE.Common/FlatData/ScenarioExcel.cs @@ -20,14 +20,14 @@ public struct ScenarioExcel : IFlatbufferObject public void __init(int _i, ByteBuffer _bb) { __p = new Table(_i, _bb); } public ScenarioExcel __assign(int _i, ByteBuffer _bb) { __init(_i, _bb); return this; } - public SCHALE.Common.FlatData.ScenarioBGType None_(int j) { int o = __p.__offset(4); return o != 0 ? (SCHALE.Common.FlatData.ScenarioBGType)__p.bb.GetInt(__p.__vector(o) + j * 4) : (SCHALE.Common.FlatData.ScenarioBGType)0; } - public int None_Length { get { int o = __p.__offset(4); return o != 0 ? __p.__vector_len(o) : 0; } } + public SCHALE.Common.FlatData.ScenarioBGType None(int j) { int o = __p.__offset(4); return o != 0 ? (SCHALE.Common.FlatData.ScenarioBGType)__p.bb.GetInt(__p.__vector(o) + j * 4) : (SCHALE.Common.FlatData.ScenarioBGType)0; } + public int NoneLength { get { int o = __p.__offset(4); return o != 0 ? __p.__vector_len(o) : 0; } } #if ENABLE_SPAN_T - public Span GetNone_Bytes() { return __p.__vector_as_span(4, 4); } + public Span GetNoneBytes() { return __p.__vector_as_span(4, 4); } #else - public ArraySegment? GetNone_Bytes() { return __p.__vector_as_arraysegment(4); } + public ArraySegment? GetNoneBytes() { return __p.__vector_as_arraysegment(4); } #endif - public SCHALE.Common.FlatData.ScenarioBGType[] GetNone_Array() { int o = __p.__offset(4); if (o == 0) return null; int p = __p.__vector(o); int l = __p.__vector_len(o); SCHALE.Common.FlatData.ScenarioBGType[] a = new SCHALE.Common.FlatData.ScenarioBGType[l]; for (int i = 0; i < l; i++) { a[i] = (SCHALE.Common.FlatData.ScenarioBGType)__p.bb.GetInt(p + i * 4); } return a; } + public SCHALE.Common.FlatData.ScenarioBGType[] GetNoneArray() { int o = __p.__offset(4); if (o == 0) return null; int p = __p.__vector(o); int l = __p.__vector_len(o); SCHALE.Common.FlatData.ScenarioBGType[] a = new SCHALE.Common.FlatData.ScenarioBGType[l]; for (int i = 0; i < l; i++) { a[i] = (SCHALE.Common.FlatData.ScenarioBGType)__p.bb.GetInt(p + i * 4); } return a; } public SCHALE.Common.FlatData.ScenarioCharacterAction Idle(int j) { int o = __p.__offset(6); return o != 0 ? (SCHALE.Common.FlatData.ScenarioCharacterAction)__p.bb.GetInt(__p.__vector(o) + j * 4) : (SCHALE.Common.FlatData.ScenarioCharacterAction)0; } public int IdleLength { get { int o = __p.__offset(6); return o != 0 ? __p.__vector_len(o) : 0; } } #if ENABLE_SPAN_T @@ -45,7 +45,7 @@ public struct ScenarioExcel : IFlatbufferObject public SCHALE.Common.FlatData.ScenarioContentType Prologue { get { int o = __p.__offset(20); return o != 0 ? (SCHALE.Common.FlatData.ScenarioContentType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.ScenarioContentType.Prologue; } } public static Offset CreateScenarioExcel(FlatBufferBuilder builder, - VectorOffset None_Offset = default(VectorOffset), + VectorOffset NoneOffset = default(VectorOffset), VectorOffset IdleOffset = default(VectorOffset), SCHALE.Common.FlatData.DialogCategory Cafe = SCHALE.Common.FlatData.DialogCategory.Cafe, SCHALE.Common.FlatData.DialogType Talk = SCHALE.Common.FlatData.DialogType.Talk, @@ -63,17 +63,17 @@ public struct ScenarioExcel : IFlatbufferObject ScenarioExcel.AddTalk(builder, Talk); ScenarioExcel.AddCafe(builder, Cafe); ScenarioExcel.AddIdle(builder, IdleOffset); - ScenarioExcel.AddNone_(builder, None_Offset); + ScenarioExcel.AddNone(builder, NoneOffset); return ScenarioExcel.EndScenarioExcel(builder); } public static void StartScenarioExcel(FlatBufferBuilder builder) { builder.StartTable(9); } - public static void AddNone_(FlatBufferBuilder builder, VectorOffset none_Offset) { builder.AddOffset(0, none_Offset.Value, 0); } - public static VectorOffset CreateNone_Vector(FlatBufferBuilder builder, SCHALE.Common.FlatData.ScenarioBGType[] 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 CreateNone_VectorBlock(FlatBufferBuilder builder, SCHALE.Common.FlatData.ScenarioBGType[] data) { builder.StartVector(4, data.Length, 4); builder.Add(data); return builder.EndVector(); } - public static VectorOffset CreateNone_VectorBlock(FlatBufferBuilder builder, ArraySegment data) { builder.StartVector(4, data.Count, 4); builder.Add(data); return builder.EndVector(); } - public static VectorOffset CreateNone_VectorBlock(FlatBufferBuilder builder, IntPtr dataPtr, int sizeInBytes) { builder.StartVector(1, sizeInBytes, 1); builder.Add(dataPtr, sizeInBytes); return builder.EndVector(); } - public static void StartNone_Vector(FlatBufferBuilder builder, int numElems) { builder.StartVector(4, numElems, 4); } + public static void AddNone(FlatBufferBuilder builder, VectorOffset noneOffset) { builder.AddOffset(0, noneOffset.Value, 0); } + public static VectorOffset CreateNoneVector(FlatBufferBuilder builder, SCHALE.Common.FlatData.ScenarioBGType[] 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 CreateNoneVectorBlock(FlatBufferBuilder builder, SCHALE.Common.FlatData.ScenarioBGType[] data) { builder.StartVector(4, data.Length, 4); builder.Add(data); return builder.EndVector(); } + public static VectorOffset CreateNoneVectorBlock(FlatBufferBuilder builder, ArraySegment data) { builder.StartVector(4, data.Count, 4); builder.Add(data); return builder.EndVector(); } + public static VectorOffset CreateNoneVectorBlock(FlatBufferBuilder builder, IntPtr dataPtr, int sizeInBytes) { builder.StartVector(1, sizeInBytes, 1); builder.Add(dataPtr, sizeInBytes); return builder.EndVector(); } + public static void StartNoneVector(FlatBufferBuilder builder, int numElems) { builder.StartVector(4, numElems, 4); } public static void AddIdle(FlatBufferBuilder builder, VectorOffset idleOffset) { builder.AddOffset(1, idleOffset.Value, 0); } public static VectorOffset CreateIdleVector(FlatBufferBuilder builder, SCHALE.Common.FlatData.ScenarioCharacterAction[] 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 CreateIdleVectorBlock(FlatBufferBuilder builder, SCHALE.Common.FlatData.ScenarioCharacterAction[] data) { builder.StartVector(4, data.Length, 4); builder.Add(data); return builder.EndVector(); } @@ -98,8 +98,8 @@ public struct ScenarioExcel : IFlatbufferObject } public void UnPackTo(ScenarioExcelT _o) { byte[] key = TableEncryptionService.CreateKey("Scenario"); - _o.None_ = new List(); - for (var _j = 0; _j < this.None_Length; ++_j) {_o.None_.Add(TableEncryptionService.Convert(this.None_(_j), key));} + _o.None = new List(); + for (var _j = 0; _j < this.NoneLength; ++_j) {_o.None.Add(TableEncryptionService.Convert(this.None(_j), key));} _o.Idle = new List(); for (var _j = 0; _j < this.IdleLength; ++_j) {_o.Idle.Add(TableEncryptionService.Convert(this.Idle(_j), key));} _o.Cafe = TableEncryptionService.Convert(this.Cafe, key); @@ -112,10 +112,10 @@ public struct ScenarioExcel : IFlatbufferObject } public static Offset Pack(FlatBufferBuilder builder, ScenarioExcelT _o) { if (_o == null) return default(Offset); - var _None_ = default(VectorOffset); - if (_o.None_ != null) { - var __None_ = _o.None_.ToArray(); - _None_ = CreateNone_Vector(builder, __None_); + var _None = default(VectorOffset); + if (_o.None != null) { + var __None = _o.None.ToArray(); + _None = CreateNoneVector(builder, __None); } var _Idle = default(VectorOffset); if (_o.Idle != null) { @@ -124,7 +124,7 @@ public struct ScenarioExcel : IFlatbufferObject } return CreateScenarioExcel( builder, - _None_, + _None, _Idle, _o.Cafe, _o.Talk, @@ -138,7 +138,7 @@ public struct ScenarioExcel : IFlatbufferObject public class ScenarioExcelT { - public List None_ { get; set; } + public List None { get; set; } public List Idle { get; set; } public SCHALE.Common.FlatData.DialogCategory Cafe { get; set; } public SCHALE.Common.FlatData.DialogType Talk { get; set; } @@ -149,7 +149,7 @@ public class ScenarioExcelT public SCHALE.Common.FlatData.ScenarioContentType Prologue { get; set; } public ScenarioExcelT() { - this.None_ = null; + this.None = null; this.Idle = null; this.Cafe = SCHALE.Common.FlatData.DialogCategory.Cafe; this.Talk = SCHALE.Common.FlatData.DialogType.Talk; @@ -167,7 +167,7 @@ static public class ScenarioExcelVerify static public bool Verify(Google.FlatBuffers.Verifier verifier, uint tablePos) { return verifier.VerifyTableStart(tablePos) - && verifier.VerifyVectorOfData(tablePos, 4 /*None_*/, 4 /*SCHALE.Common.FlatData.ScenarioBGType*/, false) + && verifier.VerifyVectorOfData(tablePos, 4 /*None*/, 4 /*SCHALE.Common.FlatData.ScenarioBGType*/, false) && verifier.VerifyVectorOfData(tablePos, 6 /*Idle*/, 4 /*SCHALE.Common.FlatData.ScenarioCharacterAction*/, false) && verifier.VerifyField(tablePos, 8 /*Cafe*/, 4 /*SCHALE.Common.FlatData.DialogCategory*/, 4, false) && verifier.VerifyField(tablePos, 10 /*Talk*/, 4 /*SCHALE.Common.FlatData.DialogType*/, 4, false) diff --git a/SCHALE.Common/FlatData/ScenarioModeExcel.cs b/SCHALE.Common/FlatData/ScenarioModeExcel.cs index db62488..7a62225 100644 --- a/SCHALE.Common/FlatData/ScenarioModeExcel.cs +++ b/SCHALE.Common/FlatData/ScenarioModeExcel.cs @@ -21,8 +21,8 @@ public struct ScenarioModeExcel : IFlatbufferObject public ScenarioModeExcel __assign(int _i, ByteBuffer _bb) { __init(_i, _bb); return this; } public long ModeId { get { int o = __p.__offset(4); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } - public SCHALE.Common.FlatData.ScenarioModeTypes ModeType { get { int o = __p.__offset(6); return o != 0 ? (SCHALE.Common.FlatData.ScenarioModeTypes)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.ScenarioModeTypes.None_; } } - public SCHALE.Common.FlatData.ScenarioModeSubTypes SubType { get { int o = __p.__offset(8); return o != 0 ? (SCHALE.Common.FlatData.ScenarioModeSubTypes)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.ScenarioModeSubTypes.None_; } } + public SCHALE.Common.FlatData.ScenarioModeTypes ModeType { get { int o = __p.__offset(6); return o != 0 ? (SCHALE.Common.FlatData.ScenarioModeTypes)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.ScenarioModeTypes.None; } } + public SCHALE.Common.FlatData.ScenarioModeSubTypes SubType { get { int o = __p.__offset(8); return o != 0 ? (SCHALE.Common.FlatData.ScenarioModeSubTypes)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.ScenarioModeSubTypes.None; } } 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; } } @@ -69,13 +69,13 @@ public struct ScenarioModeExcel : IFlatbufferObject 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 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_; } } + 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; } } public int StepIndex { get { int o = __p.__offset(62); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } public int RecommendLevel { get { int o = __p.__offset(64); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } public string EventIconParcelPath { get { int o = __p.__offset(66); return o != 0 ? __p.__string(o + __p.bb_pos) : null; } } @@ -87,7 +87,7 @@ public struct ScenarioModeExcel : IFlatbufferObject public byte[] GetEventIconParcelPathArray() { return __p.__vector_as_array(66); } 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 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 @@ -96,13 +96,13 @@ public struct ScenarioModeExcel : IFlatbufferObject public ArraySegment? GetCompleteReportEventNameBytes() { return __p.__vector_as_arraysegment(76); } #endif 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 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, - SCHALE.Common.FlatData.ScenarioModeTypes ModeType = SCHALE.Common.FlatData.ScenarioModeTypes.None_, - SCHALE.Common.FlatData.ScenarioModeSubTypes SubType = SCHALE.Common.FlatData.ScenarioModeSubTypes.None_, + SCHALE.Common.FlatData.ScenarioModeTypes ModeType = SCHALE.Common.FlatData.ScenarioModeTypes.None, + SCHALE.Common.FlatData.ScenarioModeSubTypes SubType = SCHALE.Common.FlatData.ScenarioModeSubTypes.None, long VolumeId = 0, long ChapterId = 0, long EpisodeId = 0, @@ -122,22 +122,22 @@ public struct ScenarioModeExcel : IFlatbufferObject bool IsScenarioSpecialReward = false, long AccountLevelLimit = 0, long ClearedStageId = 0, - SCHALE.Common.FlatData.Club NeedClub = SCHALE.Common.FlatData.Club.None_, + SCHALE.Common.FlatData.Club NeedClub = SCHALE.Common.FlatData.Club.None, int NeedClubStudentCount = 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_, + 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, + SCHALE.Common.FlatData.EchelonExtensionType EchelonExtensionType = SCHALE.Common.FlatData.EchelonExtensionType.Base, long CollectionGroupId = 0) { builder.StartTable(39); ScenarioModeExcel.AddCollectionGroupId(builder, CollectionGroupId); @@ -156,15 +156,15 @@ 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); @@ -223,7 +223,7 @@ public struct ScenarioModeExcel : IFlatbufferObject 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); } @@ -232,10 +232,10 @@ public struct ScenarioModeExcel : IFlatbufferObject public static void AddEventIconParcelPath(FlatBufferBuilder builder, StringOffset eventIconParcelPathOffset) { builder.AddOffset(31, eventIconParcelPathOffset.Value, 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 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 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(); @@ -276,7 +276,7 @@ public struct ScenarioModeExcel : IFlatbufferObject _o.NeedClub = TableEncryptionService.Convert(this.NeedClub, key); _o.NeedClubStudentCount = TableEncryptionService.Convert(this.NeedClubStudentCount, 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); @@ -285,10 +285,10 @@ public struct ScenarioModeExcel : IFlatbufferObject _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) { @@ -338,7 +338,7 @@ public struct ScenarioModeExcel : IFlatbufferObject _o.NeedClub, _o.NeedClubStudentCount, _o.EventContentId, - _o.EventContentType_, + _o.EventContentType, _o.EventContentCondition, _o.EventContentConditionGroup, _o.MapDifficulty, @@ -347,10 +347,10 @@ public struct ScenarioModeExcel : IFlatbufferObject _EventIconParcelPath, _o.EventBannerTitle, _o.Lof, - _o.StageTopography_, + _o.StageTopography, _o.FixedEchelonId, _CompleteReportEventName, - _o.EchelonExtensionType_, + _o.EchelonExtensionType, _o.CollectionGroupId); } } @@ -382,7 +382,7 @@ public class ScenarioModeExcelT public SCHALE.Common.FlatData.Club NeedClub { get; set; } public int NeedClubStudentCount { 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; } @@ -391,16 +391,16 @@ public class ScenarioModeExcelT 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; - this.ModeType = SCHALE.Common.FlatData.ScenarioModeTypes.None_; - this.SubType = SCHALE.Common.FlatData.ScenarioModeSubTypes.None_; + this.ModeType = SCHALE.Common.FlatData.ScenarioModeTypes.None; + this.SubType = SCHALE.Common.FlatData.ScenarioModeSubTypes.None; this.VolumeId = 0; this.ChapterId = 0; this.EpisodeId = 0; @@ -420,22 +420,22 @@ public class ScenarioModeExcelT this.IsScenarioSpecialReward = false; this.AccountLevelLimit = 0; this.ClearedStageId = 0; - this.NeedClub = SCHALE.Common.FlatData.Club.None_; + this.NeedClub = SCHALE.Common.FlatData.Club.None; this.NeedClubStudentCount = 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.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; } } @@ -471,7 +471,7 @@ static public class ScenarioModeExcelVerify && 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) @@ -480,10 +480,10 @@ static public class ScenarioModeExcelVerify && verifier.VerifyString(tablePos, 66 /*EventIconParcelPath*/, 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, 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, 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/ScenarioModeReplayTypes.cs b/SCHALE.Common/FlatData/ScenarioModeReplayTypes.cs index 08ef6d5..a9baf71 100644 --- a/SCHALE.Common/FlatData/ScenarioModeReplayTypes.cs +++ b/SCHALE.Common/FlatData/ScenarioModeReplayTypes.cs @@ -7,7 +7,7 @@ namespace SCHALE.Common.FlatData public enum ScenarioModeReplayTypes : int { - None_ = 0, + None = 0, Event = 1, Favor = 2, Work = 3, diff --git a/SCHALE.Common/FlatData/ScenarioModeRewardExcel.cs b/SCHALE.Common/FlatData/ScenarioModeRewardExcel.cs index c1d052a..56410b1 100644 --- a/SCHALE.Common/FlatData/ScenarioModeRewardExcel.cs +++ b/SCHALE.Common/FlatData/ScenarioModeRewardExcel.cs @@ -21,18 +21,18 @@ 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 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 int RewardParcelAmount { get { int o = __p.__offset(14); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } public bool IsDisplayed { get { int o = __p.__offset(16); return o != 0 ? 0!=__p.bb.Get(o + __p.bb_pos) : (bool)false; } } 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_, + SCHALE.Common.FlatData.ParcelType RewardParcelType = SCHALE.Common.FlatData.ParcelType.None, long RewardParcelId = 0, int RewardParcelAmount = 0, bool IsDisplayed = false) { @@ -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,9 +100,9 @@ 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.RewardParcelType = SCHALE.Common.FlatData.ParcelType.None; this.RewardParcelId = 0; this.RewardParcelAmount = 0; this.IsDisplayed = false; @@ -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/ScenarioModeSubTypes.cs b/SCHALE.Common/FlatData/ScenarioModeSubTypes.cs index 7d2ad1b..1f27cfa 100644 --- a/SCHALE.Common/FlatData/ScenarioModeSubTypes.cs +++ b/SCHALE.Common/FlatData/ScenarioModeSubTypes.cs @@ -7,7 +7,7 @@ namespace SCHALE.Common.FlatData public enum ScenarioModeSubTypes : int { - None_ = 0, + None = 0, Club = 1, }; diff --git a/SCHALE.Common/FlatData/ScenarioModeTypes.cs b/SCHALE.Common/FlatData/ScenarioModeTypes.cs index a6171a2..994be87 100644 --- a/SCHALE.Common/FlatData/ScenarioModeTypes.cs +++ b/SCHALE.Common/FlatData/ScenarioModeTypes.cs @@ -7,7 +7,7 @@ namespace SCHALE.Common.FlatData public enum ScenarioModeTypes : int { - None_ = 0, + None = 0, Main = 1, Sub = 2, Replay = 3, diff --git a/SCHALE.Common/FlatData/ScenarioReplayExcel.cs b/SCHALE.Common/FlatData/ScenarioReplayExcel.cs index 00b1e1b..8bdd7d0 100644 --- a/SCHALE.Common/FlatData/ScenarioReplayExcel.cs +++ b/SCHALE.Common/FlatData/ScenarioReplayExcel.cs @@ -22,7 +22,7 @@ public struct ScenarioReplayExcel : IFlatbufferObject public long ModeId { get { int o = __p.__offset(4); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public long VolumeId { get { int o = __p.__offset(6); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } - public SCHALE.Common.FlatData.ScenarioModeReplayTypes ReplayType { get { int o = __p.__offset(8); return o != 0 ? (SCHALE.Common.FlatData.ScenarioModeReplayTypes)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.ScenarioModeReplayTypes.None_; } } + public SCHALE.Common.FlatData.ScenarioModeReplayTypes ReplayType { get { int o = __p.__offset(8); return o != 0 ? (SCHALE.Common.FlatData.ScenarioModeReplayTypes)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.ScenarioModeReplayTypes.None; } } public long ChapterId { get { int o = __p.__offset(10); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public long EpisodeId { get { int o = __p.__offset(12); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public long FrontScenarioGroupId(int j) { int o = __p.__offset(14); return o != 0 ? __p.bb.GetLong(__p.__vector(o) + j * 8) : (long)0; } @@ -47,7 +47,7 @@ public struct ScenarioReplayExcel : IFlatbufferObject public static Offset CreateScenarioReplayExcel(FlatBufferBuilder builder, long ModeId = 0, long VolumeId = 0, - SCHALE.Common.FlatData.ScenarioModeReplayTypes ReplayType = SCHALE.Common.FlatData.ScenarioModeReplayTypes.None_, + SCHALE.Common.FlatData.ScenarioModeReplayTypes ReplayType = SCHALE.Common.FlatData.ScenarioModeReplayTypes.None, long ChapterId = 0, long EpisodeId = 0, VectorOffset FrontScenarioGroupIdOffset = default(VectorOffset), @@ -151,7 +151,7 @@ public class ScenarioReplayExcelT public ScenarioReplayExcelT() { this.ModeId = 0; this.VolumeId = 0; - this.ReplayType = SCHALE.Common.FlatData.ScenarioModeReplayTypes.None_; + this.ReplayType = SCHALE.Common.FlatData.ScenarioModeReplayTypes.None; this.ChapterId = 0; this.EpisodeId = 0; this.FrontScenarioGroupId = null; diff --git a/SCHALE.Common/FlatData/ScenarioType.cs b/SCHALE.Common/FlatData/ScenarioType.cs index eb2b402..f520d6d 100644 --- a/SCHALE.Common/FlatData/ScenarioType.cs +++ b/SCHALE.Common/FlatData/ScenarioType.cs @@ -7,7 +7,7 @@ namespace SCHALE.Common.FlatData public enum ScenarioType : int { - None_ = 0, + None = 0, Title = 1, Place = 2, }; diff --git a/SCHALE.Common/FlatData/ScenarioTypes.cs b/SCHALE.Common/FlatData/ScenarioTypes.cs index 630d12e..3c9aedf 100644 --- a/SCHALE.Common/FlatData/ScenarioTypes.cs +++ b/SCHALE.Common/FlatData/ScenarioTypes.cs @@ -7,7 +7,7 @@ namespace SCHALE.Common.FlatData public enum ScenarioTypes : int { - None_ = 0, + None = 0, Title = 1, Place = 2, }; diff --git a/SCHALE.Common/FlatData/School.cs b/SCHALE.Common/FlatData/School.cs index 802f6e7..7b92ce4 100644 --- a/SCHALE.Common/FlatData/School.cs +++ b/SCHALE.Common/FlatData/School.cs @@ -7,7 +7,7 @@ namespace SCHALE.Common.FlatData public enum School : int { - None_ = 0, + None = 0, Hyakkiyako = 1, RedWinter = 2, Trinity = 3, diff --git a/SCHALE.Common/FlatData/SchoolDungeonRewardExcel.cs b/SCHALE.Common/FlatData/SchoolDungeonRewardExcel.cs index 1474b24..38498ca 100644 --- a/SCHALE.Common/FlatData/SchoolDungeonRewardExcel.cs +++ b/SCHALE.Common/FlatData/SchoolDungeonRewardExcel.cs @@ -22,8 +22,8 @@ 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.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 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; } } public long RewardParcelProbability { get { int o = __p.__offset(16); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } @@ -32,8 +32,8 @@ 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.ParcelType RewardParcelType = SCHALE.Common.FlatData.ParcelType.None_, + 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, long RewardParcelProbability = 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,8 +108,8 @@ public class SchoolDungeonRewardExcelT public SchoolDungeonRewardExcelT() { this.GroupId = 0; this.DungeonType = SCHALE.Common.FlatData.SchoolDungeonType.SchoolA; - this.RewardTag_ = SCHALE.Common.FlatData.RewardTag.Default; - this.RewardParcelType = SCHALE.Common.FlatData.ParcelType.None_; + this.RewardTag = SCHALE.Common.FlatData.RewardTag.Default; + this.RewardParcelType = SCHALE.Common.FlatData.ParcelType.None; this.RewardParcelId = 0; this.RewardParcelAmount = 0; this.RewardParcelProbability = 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 d38ceec..132c4a1 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/SchoolDungeonType.cs b/SCHALE.Common/FlatData/SchoolDungeonType.cs index dbd82ae..6e959fd 100644 --- a/SCHALE.Common/FlatData/SchoolDungeonType.cs +++ b/SCHALE.Common/FlatData/SchoolDungeonType.cs @@ -10,7 +10,7 @@ public enum SchoolDungeonType : int SchoolA = 0, SchoolB = 1, SchoolC = 2, - None_ = 3, + None = 3, }; diff --git a/SCHALE.Common/FlatData/ServiceActionExcel.cs b/SCHALE.Common/FlatData/ServiceActionExcel.cs index 084bd2a..d6a4735 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/ShiftingCraftRecipeExcel.cs b/SCHALE.Common/FlatData/ShiftingCraftRecipeExcel.cs index c5e2151..7961239 100644 --- a/SCHALE.Common/FlatData/ShiftingCraftRecipeExcel.cs +++ b/SCHALE.Common/FlatData/ShiftingCraftRecipeExcel.cs @@ -23,7 +23,7 @@ public struct ShiftingCraftRecipeExcel : IFlatbufferObject public long Id { get { int o = __p.__offset(4); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public long DisplayOrder { get { int o = __p.__offset(6); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public int NotificationId { get { int o = __p.__offset(8); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } - public SCHALE.Common.FlatData.ParcelType ResultParcel { 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 SCHALE.Common.FlatData.ParcelType ResultParcel { 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 ResultId { get { int o = __p.__offset(12); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public long ResultAmount { get { int o = __p.__offset(14); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public long RequireItemId { get { int o = __p.__offset(16); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } @@ -43,7 +43,7 @@ public struct ShiftingCraftRecipeExcel : IFlatbufferObject long Id = 0, long DisplayOrder = 0, int NotificationId = 0, - SCHALE.Common.FlatData.ParcelType ResultParcel = SCHALE.Common.FlatData.ParcelType.None_, + SCHALE.Common.FlatData.ParcelType ResultParcel = SCHALE.Common.FlatData.ParcelType.None, long ResultId = 0, long ResultAmount = 0, long RequireItemId = 0, @@ -148,7 +148,7 @@ public class ShiftingCraftRecipeExcelT this.Id = 0; this.DisplayOrder = 0; this.NotificationId = 0; - this.ResultParcel = SCHALE.Common.FlatData.ParcelType.None_; + this.ResultParcel = SCHALE.Common.FlatData.ParcelType.None; this.ResultId = 0; this.ResultAmount = 0; this.RequireItemId = 0; diff --git a/SCHALE.Common/FlatData/ShopCashExcel.cs b/SCHALE.Common/FlatData/ShopCashExcel.cs index d9eb339..56f75cd 100644 --- a/SCHALE.Common/FlatData/ShopCashExcel.cs +++ b/SCHALE.Common/FlatData/ShopCashExcel.cs @@ -22,7 +22,7 @@ public struct ShopCashExcel : IFlatbufferObject public long Id { get { int o = __p.__offset(4); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public long CashProductId { get { int o = __p.__offset(6); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } - public SCHALE.Common.FlatData.PurchaseSourceType PackageType { get { int o = __p.__offset(8); return o != 0 ? (SCHALE.Common.FlatData.PurchaseSourceType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.PurchaseSourceType.None_; } } + public SCHALE.Common.FlatData.PurchaseSourceType PackageType { get { int o = __p.__offset(8); return o != 0 ? (SCHALE.Common.FlatData.PurchaseSourceType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.PurchaseSourceType.None; } } public uint LocalizeEtcId { get { int o = __p.__offset(10); return o != 0 ? __p.bb.GetUint(o + __p.bb_pos) : (uint)0; } } public string IconPath { get { int o = __p.__offset(12); return o != 0 ? __p.__string(o + __p.bb_pos) : null; } } #if ENABLE_SPAN_T @@ -33,8 +33,8 @@ public struct ShopCashExcel : IFlatbufferObject public byte[] GetIconPathArray() { return __p.__vector_as_array(12); } public long DisplayOrder { get { int o = __p.__offset(14); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public long RenewalDisplayOrder { get { int o = __p.__offset(16); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } - public SCHALE.Common.FlatData.ProductCategory CategoryType { get { int o = __p.__offset(18); return o != 0 ? (SCHALE.Common.FlatData.ProductCategory)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.ProductCategory.None_; } } - public SCHALE.Common.FlatData.ProductDisplayTag DisplayTag { get { int o = __p.__offset(20); return o != 0 ? (SCHALE.Common.FlatData.ProductDisplayTag)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.ProductDisplayTag.None_; } } + public SCHALE.Common.FlatData.ProductCategory CategoryType { get { int o = __p.__offset(18); return o != 0 ? (SCHALE.Common.FlatData.ProductCategory)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.ProductCategory.None; } } + public SCHALE.Common.FlatData.ProductDisplayTag DisplayTag { get { int o = __p.__offset(20); return o != 0 ? (SCHALE.Common.FlatData.ProductDisplayTag)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.ProductDisplayTag.None; } } public string SalePeriodFrom { get { int o = __p.__offset(22); return o != 0 ? __p.__string(o + __p.bb_pos) : null; } } #if ENABLE_SPAN_T public Span GetSalePeriodFromBytes() { return __p.__vector_as_span(22, 1); } @@ -65,13 +65,13 @@ public struct ShopCashExcel : IFlatbufferObject public static Offset CreateShopCashExcel(FlatBufferBuilder builder, long Id = 0, long CashProductId = 0, - SCHALE.Common.FlatData.PurchaseSourceType PackageType = SCHALE.Common.FlatData.PurchaseSourceType.None_, + SCHALE.Common.FlatData.PurchaseSourceType PackageType = SCHALE.Common.FlatData.PurchaseSourceType.None, uint LocalizeEtcId = 0, StringOffset IconPathOffset = default(StringOffset), long DisplayOrder = 0, long RenewalDisplayOrder = 0, - SCHALE.Common.FlatData.ProductCategory CategoryType = SCHALE.Common.FlatData.ProductCategory.None_, - SCHALE.Common.FlatData.ProductDisplayTag DisplayTag = SCHALE.Common.FlatData.ProductDisplayTag.None_, + SCHALE.Common.FlatData.ProductCategory CategoryType = SCHALE.Common.FlatData.ProductCategory.None, + SCHALE.Common.FlatData.ProductDisplayTag DisplayTag = SCHALE.Common.FlatData.ProductDisplayTag.None, StringOffset SalePeriodFromOffset = default(StringOffset), StringOffset SalePeriodToOffset = default(StringOffset), bool PeriodTag = false, @@ -199,13 +199,13 @@ public class ShopCashExcelT public ShopCashExcelT() { this.Id = 0; this.CashProductId = 0; - this.PackageType = SCHALE.Common.FlatData.PurchaseSourceType.None_; + this.PackageType = SCHALE.Common.FlatData.PurchaseSourceType.None; this.LocalizeEtcId = 0; this.IconPath = null; this.DisplayOrder = 0; this.RenewalDisplayOrder = 0; - this.CategoryType = SCHALE.Common.FlatData.ProductCategory.None_; - this.DisplayTag = SCHALE.Common.FlatData.ProductDisplayTag.None_; + this.CategoryType = SCHALE.Common.FlatData.ProductCategory.None; + this.DisplayTag = SCHALE.Common.FlatData.ProductDisplayTag.None; this.SalePeriodFrom = null; this.SalePeriodTo = null; this.PeriodTag = false; diff --git a/SCHALE.Common/FlatData/ShopExcel.cs b/SCHALE.Common/FlatData/ShopExcel.cs index 368222a..b99abc7 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); } @@ -58,7 +58,7 @@ public struct ShopExcel : IFlatbufferObject #endif public byte[] GetBuyReportEventNameArray() { return __p.__vector_as_array(26); } public bool RestrictBuyWhenInventoryFull { get { int o = __p.__offset(28); return o != 0 ? 0!=__p.bb.Get(o + __p.bb_pos) : (bool)false; } } - public SCHALE.Common.FlatData.ProductDisplayTag DisplayTag { get { int o = __p.__offset(30); return o != 0 ? (SCHALE.Common.FlatData.ProductDisplayTag)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.ProductDisplayTag.None_; } } + public SCHALE.Common.FlatData.ProductDisplayTag DisplayTag { get { int o = __p.__offset(30); return o != 0 ? (SCHALE.Common.FlatData.ProductDisplayTag)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.ProductDisplayTag.None; } } public int ShopUpdateGroupId { get { int o = __p.__offset(32); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } public static Offset CreateShopExcel(FlatBufferBuilder builder, @@ -72,10 +72,10 @@ 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_, + SCHALE.Common.FlatData.ProductDisplayTag DisplayTag = SCHALE.Common.FlatData.ProductDisplayTag.None, int ShopUpdateGroupId = 0) { builder.StartTable(15); ShopExcel.AddPurchaseCountLimit(builder, PurchaseCountLimit); @@ -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,10 +204,10 @@ 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_; + this.DisplayTag = SCHALE.Common.FlatData.ProductDisplayTag.None; this.ShopUpdateGroupId = 0; } } @@ -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 d6ee725..6274853 100644 --- a/SCHALE.Common/FlatData/ShopFilterClassifiedExcel.cs +++ b/SCHALE.Common/FlatData/ShopFilterClassifiedExcel.cs @@ -22,23 +22,23 @@ public struct ShopFilterClassifiedExcel : 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.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 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, long Id = 0, SCHALE.Common.FlatData.ShopCategoryType CategoryType = SCHALE.Common.FlatData.ShopCategoryType.General, - SCHALE.Common.FlatData.ParcelType ConsumeParcelType = SCHALE.Common.FlatData.ParcelType.None_, + 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,15 +88,15 @@ 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() { this.Id = 0; this.CategoryType = SCHALE.Common.FlatData.ShopCategoryType.General; - this.ConsumeParcelType = SCHALE.Common.FlatData.ParcelType.None_; + 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/ShopFreeRecruitExcel.cs b/SCHALE.Common/FlatData/ShopFreeRecruitExcel.cs index 74128f1..7ac49aa 100644 --- a/SCHALE.Common/FlatData/ShopFreeRecruitExcel.cs +++ b/SCHALE.Common/FlatData/ShopFreeRecruitExcel.cs @@ -35,7 +35,7 @@ public struct ShopFreeRecruitExcel : IFlatbufferObject public ArraySegment? GetFreeRecruitPeriodToBytes() { return __p.__vector_as_arraysegment(8); } #endif public byte[] GetFreeRecruitPeriodToArray() { return __p.__vector_as_array(8); } - public SCHALE.Common.FlatData.ShopFreeRecruitType FreeRecruitType { get { int o = __p.__offset(10); return o != 0 ? (SCHALE.Common.FlatData.ShopFreeRecruitType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.ShopFreeRecruitType.None_; } } + public SCHALE.Common.FlatData.ShopFreeRecruitType FreeRecruitType { get { int o = __p.__offset(10); return o != 0 ? (SCHALE.Common.FlatData.ShopFreeRecruitType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.ShopFreeRecruitType.None; } } public string FreeRecruitDecorationImagePath { get { int o = __p.__offset(12); return o != 0 ? __p.__string(o + __p.bb_pos) : null; } } #if ENABLE_SPAN_T public Span GetFreeRecruitDecorationImagePathBytes() { return __p.__vector_as_span(12, 1); } @@ -56,7 +56,7 @@ public struct ShopFreeRecruitExcel : IFlatbufferObject long Id = 0, StringOffset FreeRecruitPeriodFromOffset = default(StringOffset), StringOffset FreeRecruitPeriodToOffset = default(StringOffset), - SCHALE.Common.FlatData.ShopFreeRecruitType FreeRecruitType = SCHALE.Common.FlatData.ShopFreeRecruitType.None_, + SCHALE.Common.FlatData.ShopFreeRecruitType FreeRecruitType = SCHALE.Common.FlatData.ShopFreeRecruitType.None, StringOffset FreeRecruitDecorationImagePathOffset = default(StringOffset), VectorOffset ShopRecruitIdOffset = default(VectorOffset)) { builder.StartTable(6); @@ -134,7 +134,7 @@ public class ShopFreeRecruitExcelT this.Id = 0; this.FreeRecruitPeriodFrom = null; this.FreeRecruitPeriodTo = null; - this.FreeRecruitType = SCHALE.Common.FlatData.ShopFreeRecruitType.None_; + this.FreeRecruitType = SCHALE.Common.FlatData.ShopFreeRecruitType.None; this.FreeRecruitDecorationImagePath = null; this.ShopRecruitId = null; } diff --git a/SCHALE.Common/FlatData/ShopFreeRecruitType.cs b/SCHALE.Common/FlatData/ShopFreeRecruitType.cs index 4ebce7d..cf017e6 100644 --- a/SCHALE.Common/FlatData/ShopFreeRecruitType.cs +++ b/SCHALE.Common/FlatData/ShopFreeRecruitType.cs @@ -7,7 +7,7 @@ namespace SCHALE.Common.FlatData public enum ShopFreeRecruitType : int { - None_ = 0, + None = 0, Accumulation = 1, Reset = 2, }; diff --git a/SCHALE.Common/FlatData/ShopInfoExcel.cs b/SCHALE.Common/FlatData/ShopInfoExcel.cs index f03b2fc..296c051 100644 --- a/SCHALE.Common/FlatData/ShopInfoExcel.cs +++ b/SCHALE.Common/FlatData/ShopInfoExcel.cs @@ -70,7 +70,7 @@ public struct ShopInfoExcel : IFlatbufferObject public ArraySegment? GetShopProductUpdateTimeBytes() { return __p.__vector_as_arraysegment(24); } #endif public byte[] GetShopProductUpdateTimeArray() { return __p.__vector_as_array(24); } - public SCHALE.Common.FlatData.ParcelType DisplayParcelType { get { int o = __p.__offset(26); return o != 0 ? (SCHALE.Common.FlatData.ParcelType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.ParcelType.None_; } } + public SCHALE.Common.FlatData.ParcelType DisplayParcelType { get { int o = __p.__offset(26); return o != 0 ? (SCHALE.Common.FlatData.ParcelType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.ParcelType.None; } } public long DisplayParcelId { get { int o = __p.__offset(28); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public bool IsShopVisible { get { int o = __p.__offset(30); return o != 0 ? 0!=__p.bb.Get(o + __p.bb_pos) : (bool)false; } } public int DisplayOrder { get { int o = __p.__offset(32); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } @@ -100,7 +100,7 @@ public struct ShopInfoExcel : IFlatbufferObject StringOffset OpenPeriodFromOffset = default(StringOffset), StringOffset OpenPeriodToOffset = default(StringOffset), StringOffset ShopProductUpdateTimeOffset = default(StringOffset), - SCHALE.Common.FlatData.ParcelType DisplayParcelType = SCHALE.Common.FlatData.ParcelType.None_, + SCHALE.Common.FlatData.ParcelType DisplayParcelType = SCHALE.Common.FlatData.ParcelType.None, long DisplayParcelId = 0, bool IsShopVisible = false, int DisplayOrder = 0, @@ -332,7 +332,7 @@ public class ShopInfoExcelT this.OpenPeriodFrom = null; this.OpenPeriodTo = null; this.ShopProductUpdateTime = null; - this.DisplayParcelType = SCHALE.Common.FlatData.ParcelType.None_; + this.DisplayParcelType = SCHALE.Common.FlatData.ParcelType.None; this.DisplayParcelId = 0; this.IsShopVisible = false; this.DisplayOrder = 0; diff --git a/SCHALE.Common/FlatData/ShopRecruitExcel.cs b/SCHALE.Common/FlatData/ShopRecruitExcel.cs index 68c8b61..5e60e39 100644 --- a/SCHALE.Common/FlatData/ShopRecruitExcel.cs +++ b/SCHALE.Common/FlatData/ShopRecruitExcel.cs @@ -32,7 +32,7 @@ public struct ShopRecruitExcel : IFlatbufferObject public ArraySegment? GetGoodsDevNameBytes() { return __p.__vector_as_arraysegment(14); } #endif public byte[] GetGoodsDevNameArray() { return __p.__vector_as_array(14); } - public SCHALE.Common.FlatData.GachaDisplayTag DisplayTag { get { int o = __p.__offset(16); return o != 0 ? (SCHALE.Common.FlatData.GachaDisplayTag)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.GachaDisplayTag.None_; } } + public SCHALE.Common.FlatData.GachaDisplayTag DisplayTag { get { int o = __p.__offset(16); return o != 0 ? (SCHALE.Common.FlatData.GachaDisplayTag)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.GachaDisplayTag.None; } } public long DisplayOrder { get { int o = __p.__offset(18); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public string GachaBannerPath { get { int o = __p.__offset(20); return o != 0 ? __p.__string(o + __p.bb_pos) : null; } } #if ENABLE_SPAN_T @@ -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; } } @@ -90,7 +90,7 @@ public struct ShopRecruitExcel : IFlatbufferObject long OneGachaGoodsId = 0, long TenGachaGoodsId = 0, StringOffset GoodsDevNameOffset = default(StringOffset), - SCHALE.Common.FlatData.GachaDisplayTag DisplayTag = SCHALE.Common.FlatData.GachaDisplayTag.None_, + SCHALE.Common.FlatData.GachaDisplayTag DisplayTag = SCHALE.Common.FlatData.GachaDisplayTag.None, long DisplayOrder = 0, StringOffset GachaBannerPathOffset = default(StringOffset), VectorOffset VideoIdOffset = default(VectorOffset), @@ -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; } @@ -288,7 +288,7 @@ public class ShopRecruitExcelT this.OneGachaGoodsId = 0; this.TenGachaGoodsId = 0; this.GoodsDevName = null; - this.DisplayTag = SCHALE.Common.FlatData.GachaDisplayTag.None_; + this.DisplayTag = SCHALE.Common.FlatData.GachaDisplayTag.None; this.DisplayOrder = 0; this.GachaBannerPath = null; this.VideoId = null; @@ -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 a5e2670..547fb04 100644 --- a/SCHALE.Common/FlatData/ShopRefreshExcel.cs +++ b/SCHALE.Common/FlatData/ShopRefreshExcel.cs @@ -37,7 +37,7 @@ public struct ShopRefreshExcel : IFlatbufferObject public ArraySegment? GetBuyReportEventNameBytes() { return __p.__vector_as_arraysegment(24); } #endif 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 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, @@ -51,7 +51,7 @@ public struct ShopRefreshExcel : IFlatbufferObject int RefreshGroup = 0, int Prob = 0, StringOffset BuyReportEventNameOffset = default(StringOffset), - SCHALE.Common.FlatData.ProductDisplayTag DisplayTag = SCHALE.Common.FlatData.ProductDisplayTag.None_) { + SCHALE.Common.FlatData.ProductDisplayTag DisplayTag = SCHALE.Common.FlatData.ProductDisplayTag.None) { builder.StartTable(12); ShopRefreshExcel.AddDisplayOrder(builder, DisplayOrder); ShopRefreshExcel.AddVisibleAmount(builder, VisibleAmount); @@ -152,7 +152,7 @@ public class ShopRefreshExcelT this.RefreshGroup = 0; this.Prob = 0; this.BuyReportEventName = null; - this.DisplayTag = SCHALE.Common.FlatData.ProductDisplayTag.None_; + this.DisplayTag = SCHALE.Common.FlatData.ProductDisplayTag.None; } } diff --git a/SCHALE.Common/FlatData/ShortcutContentType.cs b/SCHALE.Common/FlatData/ShortcutContentType.cs index 49d8029..4a9894d 100644 --- a/SCHALE.Common/FlatData/ShortcutContentType.cs +++ b/SCHALE.Common/FlatData/ShortcutContentType.cs @@ -7,7 +7,7 @@ namespace SCHALE.Common.FlatData public enum ShortcutContentType : int { - None_ = 0, + None = 0, CampaignStage = 1, EventStage = 2, Blood = 3, diff --git a/SCHALE.Common/FlatData/ShowSkillCutIn.cs b/SCHALE.Common/FlatData/ShowSkillCutIn.cs index 54fe8a6..8cf36cc 100644 --- a/SCHALE.Common/FlatData/ShowSkillCutIn.cs +++ b/SCHALE.Common/FlatData/ShowSkillCutIn.cs @@ -7,7 +7,7 @@ namespace SCHALE.Common.FlatData public enum ShowSkillCutIn : int { - None_ = 0, + None = 0, Once = 1, Always = 2, }; diff --git a/SCHALE.Common/FlatData/SkillCategory.cs b/SCHALE.Common/FlatData/SkillCategory.cs index 5106e4e..56549eb 100644 --- a/SCHALE.Common/FlatData/SkillCategory.cs +++ b/SCHALE.Common/FlatData/SkillCategory.cs @@ -7,7 +7,7 @@ namespace SCHALE.Common.FlatData public enum SkillCategory : int { - None_ = 0, + None = 0, }; diff --git a/SCHALE.Common/FlatData/SkillExcel.cs b/SCHALE.Common/FlatData/SkillExcel.cs index ffd1f5e..0a0218c 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/SkillPriorityCheckCondition.cs b/SCHALE.Common/FlatData/SkillPriorityCheckCondition.cs index 244c514..065b6d2 100644 --- a/SCHALE.Common/FlatData/SkillPriorityCheckCondition.cs +++ b/SCHALE.Common/FlatData/SkillPriorityCheckCondition.cs @@ -7,7 +7,7 @@ namespace SCHALE.Common.FlatData public enum SkillPriorityCheckCondition : int { - None_ = 0, + None = 0, HPRateUnder = 1, DebuffCountOver = 2, BuffCountOver = 3, diff --git a/SCHALE.Common/FlatData/SortingTarget.cs b/SCHALE.Common/FlatData/SortingTarget.cs index 4fa8245..e434986 100644 --- a/SCHALE.Common/FlatData/SortingTarget.cs +++ b/SCHALE.Common/FlatData/SortingTarget.cs @@ -7,7 +7,7 @@ namespace SCHALE.Common.FlatData public enum SortingTarget : int { - None_ = 0, + None = 0, Rarity = 1, Level = 2, StarGrade = 3, diff --git a/SCHALE.Common/FlatData/SquadType.cs b/SCHALE.Common/FlatData/SquadType.cs index 3e1543e..4daaf4c 100644 --- a/SCHALE.Common/FlatData/SquadType.cs +++ b/SCHALE.Common/FlatData/SquadType.cs @@ -7,7 +7,7 @@ namespace SCHALE.Common.FlatData public enum SquadType : int { - None_ = 0, + None = 0, Main = 1, Support = 2, TSS = 3, diff --git a/SCHALE.Common/FlatData/StageDifficulty.cs b/SCHALE.Common/FlatData/StageDifficulty.cs index 2088cdb..5aa0c37 100644 --- a/SCHALE.Common/FlatData/StageDifficulty.cs +++ b/SCHALE.Common/FlatData/StageDifficulty.cs @@ -7,7 +7,7 @@ namespace SCHALE.Common.FlatData public enum StageDifficulty : int { - None_ = 0, + None = 0, Normal = 1, Hard = 2, VeryHard = 3, diff --git a/SCHALE.Common/FlatData/StarGoalType.cs b/SCHALE.Common/FlatData/StarGoalType.cs index a3c3b88..a82c8da 100644 --- a/SCHALE.Common/FlatData/StarGoalType.cs +++ b/SCHALE.Common/FlatData/StarGoalType.cs @@ -7,7 +7,7 @@ namespace SCHALE.Common.FlatData public enum StarGoalType : int { - None_ = 0, + None = 0, AllAlive = 1, Clear = 2, GetBoxes = 3, diff --git a/SCHALE.Common/FlatData/StatType.cs b/SCHALE.Common/FlatData/StatType.cs index fb9bbfe..41c6a2d 100644 --- a/SCHALE.Common/FlatData/StatType.cs +++ b/SCHALE.Common/FlatData/StatType.cs @@ -7,7 +7,7 @@ namespace SCHALE.Common.FlatData public enum StatType : int { - None_ = 0, + None = 0, MaxHP = 1, AttackPower = 2, DefensePower = 3, diff --git a/SCHALE.Common/FlatData/StickerCheckPassType.cs b/SCHALE.Common/FlatData/StickerCheckPassType.cs index d3a4235..b544a09 100644 --- a/SCHALE.Common/FlatData/StickerCheckPassType.cs +++ b/SCHALE.Common/FlatData/StickerCheckPassType.cs @@ -7,7 +7,7 @@ namespace SCHALE.Common.FlatData public enum StickerCheckPassType : int { - None_ = 0, + None = 0, ClearScenarioModeId = 1, ClearCampaignStageId = 2, }; diff --git a/SCHALE.Common/FlatData/StickerGetConditionType.cs b/SCHALE.Common/FlatData/StickerGetConditionType.cs index a1dee87..fb21d8f 100644 --- a/SCHALE.Common/FlatData/StickerGetConditionType.cs +++ b/SCHALE.Common/FlatData/StickerGetConditionType.cs @@ -7,7 +7,7 @@ namespace SCHALE.Common.FlatData public enum StickerGetConditionType : int { - None_ = 0, + None = 0, StickerCheckPass = 1, GetStickerCondition = 2, }; diff --git a/SCHALE.Common/FlatData/StickerGroupExcel.cs b/SCHALE.Common/FlatData/StickerGroupExcel.cs index 9621ee2..0537a5d 100644 --- a/SCHALE.Common/FlatData/StickerGroupExcel.cs +++ b/SCHALE.Common/FlatData/StickerGroupExcel.cs @@ -43,7 +43,7 @@ public struct StickerGroupExcel : IFlatbufferObject #endif public byte[] GetStickerGroupIconpathArray() { return __p.__vector_as_array(10); } public long PageCompleteSlot { get { int o = __p.__offset(12); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } - public SCHALE.Common.FlatData.ParcelType PageCompleteRewardParcelType { 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 SCHALE.Common.FlatData.ParcelType PageCompleteRewardParcelType { 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 PageCompleteRewardParcelId { get { int o = __p.__offset(16); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public int PageCompleteRewardAmount { get { int o = __p.__offset(18); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } public uint LocalizeTitle { get { int o = __p.__offset(20); return o != 0 ? __p.bb.GetUint(o + __p.bb_pos) : (uint)0; } } @@ -62,7 +62,7 @@ public struct StickerGroupExcel : IFlatbufferObject StringOffset UniqueLayoutPathOffset = default(StringOffset), StringOffset StickerGroupIconpathOffset = default(StringOffset), long PageCompleteSlot = 0, - SCHALE.Common.FlatData.ParcelType PageCompleteRewardParcelType = SCHALE.Common.FlatData.ParcelType.None_, + SCHALE.Common.FlatData.ParcelType PageCompleteRewardParcelType = SCHALE.Common.FlatData.ParcelType.None, long PageCompleteRewardParcelId = 0, int PageCompleteRewardAmount = 0, uint LocalizeTitle = 0, @@ -160,7 +160,7 @@ public class StickerGroupExcelT this.UniqueLayoutPath = null; this.StickerGroupIconpath = null; this.PageCompleteSlot = 0; - this.PageCompleteRewardParcelType = SCHALE.Common.FlatData.ParcelType.None_; + this.PageCompleteRewardParcelType = SCHALE.Common.FlatData.ParcelType.None; this.PageCompleteRewardParcelId = 0; this.PageCompleteRewardAmount = 0; this.LocalizeTitle = 0; diff --git a/SCHALE.Common/FlatData/StickerPageContentExcel.cs b/SCHALE.Common/FlatData/StickerPageContentExcel.cs index 68494a0..d869732 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/StoreType.cs b/SCHALE.Common/FlatData/StoreType.cs index 23c23d8..81ef88b 100644 --- a/SCHALE.Common/FlatData/StoreType.cs +++ b/SCHALE.Common/FlatData/StoreType.cs @@ -7,7 +7,7 @@ namespace SCHALE.Common.FlatData public enum StoreType : int { - None_ = 0, + None = 0, GooglePlay = 1, AppStore = 2, OneStore = 3, diff --git a/SCHALE.Common/FlatData/StoryStrategyExcel.cs b/SCHALE.Common/FlatData/StoryStrategyExcel.cs index 34ff265..cfff36d 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/StrategyAIType.cs b/SCHALE.Common/FlatData/StrategyAIType.cs index c645da2..54dd976 100644 --- a/SCHALE.Common/FlatData/StrategyAIType.cs +++ b/SCHALE.Common/FlatData/StrategyAIType.cs @@ -7,7 +7,7 @@ namespace SCHALE.Common.FlatData public enum StrategyAIType : int { - None_ = 0, + None = 0, Guard = 1, Pursuit = 2, }; diff --git a/SCHALE.Common/FlatData/StrategyEnvironment.cs b/SCHALE.Common/FlatData/StrategyEnvironment.cs index 3f32515..b7688e1 100644 --- a/SCHALE.Common/FlatData/StrategyEnvironment.cs +++ b/SCHALE.Common/FlatData/StrategyEnvironment.cs @@ -7,7 +7,7 @@ namespace SCHALE.Common.FlatData public enum StrategyEnvironment : int { - None_ = 0, + None = 0, MapFog = 1, }; diff --git a/SCHALE.Common/FlatData/StrategyObjectType.cs b/SCHALE.Common/FlatData/StrategyObjectType.cs index 78ce493..74a09cb 100644 --- a/SCHALE.Common/FlatData/StrategyObjectType.cs +++ b/SCHALE.Common/FlatData/StrategyObjectType.cs @@ -7,7 +7,7 @@ namespace SCHALE.Common.FlatData public enum StrategyObjectType : int { - None_ = 0, + None = 0, Start = 1, Heal = 2, Skill = 3, diff --git a/SCHALE.Common/FlatData/SubEventType.cs b/SCHALE.Common/FlatData/SubEventType.cs index 4a2d944..519e57c 100644 --- a/SCHALE.Common/FlatData/SubEventType.cs +++ b/SCHALE.Common/FlatData/SubEventType.cs @@ -7,7 +7,7 @@ namespace SCHALE.Common.FlatData public enum SubEventType : int { - None_ = 0, + None = 0, SubEvent = 1, SubEventPermanent = 2, }; diff --git a/SCHALE.Common/FlatData/SystemMailExcel.cs b/SCHALE.Common/FlatData/SystemMailExcel.cs index 1450b17..4dda60a 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/TBGItemEffectType.cs b/SCHALE.Common/FlatData/TBGItemEffectType.cs index 569aead..179f25a 100644 --- a/SCHALE.Common/FlatData/TBGItemEffectType.cs +++ b/SCHALE.Common/FlatData/TBGItemEffectType.cs @@ -7,7 +7,7 @@ namespace SCHALE.Common.FlatData public enum TBGItemEffectType : int { - None_ = 0, + None = 0, PermanentContinuity = 1, TemporaryContinuation = 2, Immediately = 3, diff --git a/SCHALE.Common/FlatData/TBGItemType.cs b/SCHALE.Common/FlatData/TBGItemType.cs index ada11d3..286c3d8 100644 --- a/SCHALE.Common/FlatData/TBGItemType.cs +++ b/SCHALE.Common/FlatData/TBGItemType.cs @@ -7,7 +7,7 @@ namespace SCHALE.Common.FlatData public enum TBGItemType : int { - None_ = 0, + None = 0, Dice = 1, Heal = 2, HealExpansion = 3, diff --git a/SCHALE.Common/FlatData/TBGObjectType.cs b/SCHALE.Common/FlatData/TBGObjectType.cs index f4dddab..51da459 100644 --- a/SCHALE.Common/FlatData/TBGObjectType.cs +++ b/SCHALE.Common/FlatData/TBGObjectType.cs @@ -7,7 +7,7 @@ namespace SCHALE.Common.FlatData public enum TBGObjectType : int { - None_ = 0, + None = 0, EnemyBoss = 1, EnemyMinion = 2, Random = 3, diff --git a/SCHALE.Common/FlatData/TBGOptionSuccessType.cs b/SCHALE.Common/FlatData/TBGOptionSuccessType.cs index 7f34963..38ed854 100644 --- a/SCHALE.Common/FlatData/TBGOptionSuccessType.cs +++ b/SCHALE.Common/FlatData/TBGOptionSuccessType.cs @@ -7,7 +7,7 @@ namespace SCHALE.Common.FlatData public enum TBGOptionSuccessType : int { - None_ = 0, + None = 0, TBGItemAcquire = 1, ItemAcquire = 2, TBGDiceAcquire = 3, diff --git a/SCHALE.Common/FlatData/TBGPortalCondition.cs b/SCHALE.Common/FlatData/TBGPortalCondition.cs index 4448bf4..0200853 100644 --- a/SCHALE.Common/FlatData/TBGPortalCondition.cs +++ b/SCHALE.Common/FlatData/TBGPortalCondition.cs @@ -7,7 +7,7 @@ namespace SCHALE.Common.FlatData public enum TBGPortalCondition : int { - None_ = 0, + None = 0, ObjectAllEncounter = 1, Round = 2, }; diff --git a/SCHALE.Common/FlatData/TBGProbModifyCondition.cs b/SCHALE.Common/FlatData/TBGProbModifyCondition.cs index c081ecc..fbeb4d9 100644 --- a/SCHALE.Common/FlatData/TBGProbModifyCondition.cs +++ b/SCHALE.Common/FlatData/TBGProbModifyCondition.cs @@ -7,7 +7,7 @@ namespace SCHALE.Common.FlatData public enum TBGProbModifyCondition : int { - None_ = 0, + None = 0, AllyRevive = 1, DicePlayFail = 2, }; diff --git a/SCHALE.Common/FlatData/TBGThemaType.cs b/SCHALE.Common/FlatData/TBGThemaType.cs index f1b27e2..70331b7 100644 --- a/SCHALE.Common/FlatData/TBGThemaType.cs +++ b/SCHALE.Common/FlatData/TBGThemaType.cs @@ -7,7 +7,7 @@ namespace SCHALE.Common.FlatData public enum TBGThemaType : int { - None_ = 0, + None = 0, Normal = 1, Hidden = 2, }; diff --git a/SCHALE.Common/FlatData/TBGTileType.cs b/SCHALE.Common/FlatData/TBGTileType.cs index 363f36f..3dcf5cb 100644 --- a/SCHALE.Common/FlatData/TBGTileType.cs +++ b/SCHALE.Common/FlatData/TBGTileType.cs @@ -7,7 +7,7 @@ namespace SCHALE.Common.FlatData public enum TBGTileType : int { - None_ = 0, + None = 0, Start = 1, Movable = 2, UnMovable = 3, diff --git a/SCHALE.Common/FlatData/TBGVoiceCondition.cs b/SCHALE.Common/FlatData/TBGVoiceCondition.cs index c1e15a6..d8d63a4 100644 --- a/SCHALE.Common/FlatData/TBGVoiceCondition.cs +++ b/SCHALE.Common/FlatData/TBGVoiceCondition.cs @@ -7,7 +7,7 @@ namespace SCHALE.Common.FlatData public enum TBGVoiceCondition : int { - None_ = 0, + None = 0, DiceResultSuccess = 1, DiceResultFailBattle = 2, DiceResultFailRandom = 3, diff --git a/SCHALE.Common/FlatData/TacticEntityType.cs b/SCHALE.Common/FlatData/TacticEntityType.cs index 4e02a06..0e00b1a 100644 --- a/SCHALE.Common/FlatData/TacticEntityType.cs +++ b/SCHALE.Common/FlatData/TacticEntityType.cs @@ -7,7 +7,7 @@ namespace SCHALE.Common.FlatData public enum TacticEntityType : int { - None_ = 0, + None = 0, Student = 1, Minion = 2, Elite = 4, diff --git a/SCHALE.Common/FlatData/TacticEnvironment.cs b/SCHALE.Common/FlatData/TacticEnvironment.cs index cda0eff..ba7a249 100644 --- a/SCHALE.Common/FlatData/TacticEnvironment.cs +++ b/SCHALE.Common/FlatData/TacticEnvironment.cs @@ -7,7 +7,7 @@ namespace SCHALE.Common.FlatData public enum TacticEnvironment : int { - None_ = 0, + None = 0, WarFog = 1, }; diff --git a/SCHALE.Common/FlatData/TacticRole.cs b/SCHALE.Common/FlatData/TacticRole.cs index 99afea8..ff40d5d 100644 --- a/SCHALE.Common/FlatData/TacticRole.cs +++ b/SCHALE.Common/FlatData/TacticRole.cs @@ -7,7 +7,7 @@ namespace SCHALE.Common.FlatData public enum TacticRole : int { - None_ = 0, + None = 0, DamageDealer = 1, Tanker = 2, Supporter = 3, diff --git a/SCHALE.Common/FlatData/TacticSkillUse.cs b/SCHALE.Common/FlatData/TacticSkillUse.cs index bb1186a..7c6388f 100644 --- a/SCHALE.Common/FlatData/TacticSkillUse.cs +++ b/SCHALE.Common/FlatData/TacticSkillUse.cs @@ -7,7 +7,7 @@ namespace SCHALE.Common.FlatData public enum TacticSkillUse : int { - None_ = 0, + None = 0, Auto = 1, Manual = 2, }; diff --git a/SCHALE.Common/FlatData/TacticSpeed.cs b/SCHALE.Common/FlatData/TacticSpeed.cs index 35a2211..c493bba 100644 --- a/SCHALE.Common/FlatData/TacticSpeed.cs +++ b/SCHALE.Common/FlatData/TacticSpeed.cs @@ -7,7 +7,7 @@ namespace SCHALE.Common.FlatData public enum TacticSpeed : int { - None_ = 0, + None = 0, Slow = 1, Normal = 2, Fast = 3, diff --git a/SCHALE.Common/FlatData/Tag.cs b/SCHALE.Common/FlatData/Tag.cs index 3040ecc..5c55409 100644 --- a/SCHALE.Common/FlatData/Tag.cs +++ b/SCHALE.Common/FlatData/Tag.cs @@ -96,7 +96,7 @@ public enum Tag : int aR = 86, ar = 87, aS = 88, - as_ = 89, + @as = 89, aT = 90, at = 91, aU = 92, @@ -902,7 +902,7 @@ public enum Tag : int iE = 892, ie = 893, iF = 894, - if_ = 895, + @if = 895, iG = 896, ig = 897, iH = 898, @@ -918,7 +918,7 @@ public enum Tag : int iM = 908, im = 909, iN = 910, - in_ = 911, + @in = 911, iO = 912, io = 913, iP = 914, @@ -928,7 +928,7 @@ public enum Tag : int iR = 918, ir = 919, iS = 920, - is_ = 921, + @is = 921, iT = 922, it = 923, iU = 924, @@ -1550,7 +1550,7 @@ public enum Tag : int oQ = 1540, oq = 1541, oR = 1542, - or_ = 1543, + or = 1543, oS = 1544, os = 1545, oT = 1546, diff --git a/SCHALE.Common/FlatData/TagExcel.cs b/SCHALE.Common/FlatData/TagExcel.cs index b10fa5b..b7245df 100644 --- a/SCHALE.Common/FlatData/TagExcel.cs +++ b/SCHALE.Common/FlatData/TagExcel.cs @@ -21,20 +21,20 @@ public struct TagExcel : IFlatbufferObject 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 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_) { + SCHALE.Common.FlatData.Club None = SCHALE.Common.FlatData.Club.None) { builder.StartTable(2); - TagExcel.AddNone_(builder, None_); + 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 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); @@ -47,25 +47,25 @@ public struct TagExcel : IFlatbufferObject public void UnPackTo(TagExcelT _o) { byte[] key = TableEncryptionService.CreateKey("Tag"); _o.Furniture = TableEncryptionService.Convert(this.Furniture, key); - _o.None_ = TableEncryptionService.Convert(this.None_, 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_); + _o.None); } } public class TagExcelT { public SCHALE.Common.FlatData.Tag Furniture { get; set; } - public SCHALE.Common.FlatData.Club None_ { 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_; + this.None = SCHALE.Common.FlatData.Club.None; } } @@ -76,7 +76,7 @@ static public class TagExcelVerify { 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.VerifyField(tablePos, 6 /*None*/, 4 /*SCHALE.Common.FlatData.Club*/, 4, false) && verifier.VerifyTableEnd(tablePos); } } diff --git a/SCHALE.Common/FlatData/TargetingCellType.cs b/SCHALE.Common/FlatData/TargetingCellType.cs index 360bf4d..b55fbb0 100644 --- a/SCHALE.Common/FlatData/TargetingCellType.cs +++ b/SCHALE.Common/FlatData/TargetingCellType.cs @@ -7,7 +7,7 @@ namespace SCHALE.Common.FlatData public enum TargetingCellType : int { - None_ = 0, + None = 0, Near = 1, Far = 2, }; diff --git a/SCHALE.Common/FlatData/TargetingUnitType.cs b/SCHALE.Common/FlatData/TargetingUnitType.cs index 2da451b..8a0328a 100644 --- a/SCHALE.Common/FlatData/TargetingUnitType.cs +++ b/SCHALE.Common/FlatData/TargetingUnitType.cs @@ -7,7 +7,7 @@ namespace SCHALE.Common.FlatData public enum TargetingUnitType : int { - None_ = 0, + None = 0, Near = 1, Far = 2, MinHp = 3, diff --git a/SCHALE.Common/FlatData/TerrainAdaptationFactorExcel.cs b/SCHALE.Common/FlatData/TerrainAdaptationFactorExcel.cs index 469282f..614ae3e 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/TileState.cs b/SCHALE.Common/FlatData/TileState.cs index 65b82ba..0a9d631 100644 --- a/SCHALE.Common/FlatData/TileState.cs +++ b/SCHALE.Common/FlatData/TileState.cs @@ -7,7 +7,7 @@ namespace SCHALE.Common.FlatData public enum TileState : int { - None_ = 0, + None = 0, PartiallyConquested = 1, FullyConquested = 2, }; diff --git a/SCHALE.Common/FlatData/TimeAttackDungeonExcel.cs b/SCHALE.Common/FlatData/TimeAttackDungeonExcel.cs index 67bd849..9a3b212 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 4eaeb9c..6bac3fe 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/TimeAttackDungeonType.cs b/SCHALE.Common/FlatData/TimeAttackDungeonType.cs index 08ab95c..b868a11 100644 --- a/SCHALE.Common/FlatData/TimeAttackDungeonType.cs +++ b/SCHALE.Common/FlatData/TimeAttackDungeonType.cs @@ -7,7 +7,7 @@ namespace SCHALE.Common.FlatData public enum TimeAttackDungeonType : int { - None_ = 0, + None = 0, Defense = 1, Shooting = 2, Destruction = 3, diff --git a/SCHALE.Common/FlatData/ToastExcel.cs b/SCHALE.Common/FlatData/ToastExcel.cs index 8f73191..dc340cc 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/ToastType.cs b/SCHALE.Common/FlatData/ToastType.cs index 8eff532..ae4c7b0 100644 --- a/SCHALE.Common/FlatData/ToastType.cs +++ b/SCHALE.Common/FlatData/ToastType.cs @@ -7,7 +7,7 @@ namespace SCHALE.Common.FlatData public enum ToastType : int { - None_ = 0, + None = 0, Tactic_Left = 1, Tactic_Right = 2, Social_Center = 3, diff --git a/SCHALE.Common/FlatData/TutorialFailureContentType.cs b/SCHALE.Common/FlatData/TutorialFailureContentType.cs index 54006a4..5cf9d74 100644 --- a/SCHALE.Common/FlatData/TutorialFailureContentType.cs +++ b/SCHALE.Common/FlatData/TutorialFailureContentType.cs @@ -7,7 +7,7 @@ namespace SCHALE.Common.FlatData public enum TutorialFailureContentType : int { - None_ = 0, + None = 0, Campaign = 1, WeekDungeon = 2, Raid = 3, diff --git a/SCHALE.Common/FlatData/TutorialFailureImageExcel.cs b/SCHALE.Common/FlatData/TutorialFailureImageExcel.cs index 23b1b6a..c2e88ee 100644 --- a/SCHALE.Common/FlatData/TutorialFailureImageExcel.cs +++ b/SCHALE.Common/FlatData/TutorialFailureImageExcel.cs @@ -21,7 +21,7 @@ public struct TutorialFailureImageExcel : IFlatbufferObject public TutorialFailureImageExcel __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.TutorialFailureContentType Contents { get { int o = __p.__offset(6); return o != 0 ? (SCHALE.Common.FlatData.TutorialFailureContentType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.TutorialFailureContentType.None_; } } + public SCHALE.Common.FlatData.TutorialFailureContentType Contents { get { int o = __p.__offset(6); return o != 0 ? (SCHALE.Common.FlatData.TutorialFailureContentType)__p.bb.GetInt(o + __p.bb_pos) : SCHALE.Common.FlatData.TutorialFailureContentType.None; } } public string Type { get { int o = __p.__offset(8); return o != 0 ? __p.__string(o + __p.bb_pos) : null; } } #if ENABLE_SPAN_T public Span GetTypeBytes() { return __p.__vector_as_span(8, 1); } @@ -46,7 +46,7 @@ public struct TutorialFailureImageExcel : IFlatbufferObject public static Offset CreateTutorialFailureImageExcel(FlatBufferBuilder builder, long Id = 0, - SCHALE.Common.FlatData.TutorialFailureContentType Contents = SCHALE.Common.FlatData.TutorialFailureContentType.None_, + SCHALE.Common.FlatData.TutorialFailureContentType Contents = SCHALE.Common.FlatData.TutorialFailureContentType.None, StringOffset TypeOffset = default(StringOffset), StringOffset ImagePathKrOffset = default(StringOffset), StringOffset ImagePathJpOffset = default(StringOffset)) { @@ -107,7 +107,7 @@ public class TutorialFailureImageExcelT public TutorialFailureImageExcelT() { this.Id = 0; - this.Contents = SCHALE.Common.FlatData.TutorialFailureContentType.None_; + this.Contents = SCHALE.Common.FlatData.TutorialFailureContentType.None; this.Type = null; this.ImagePathKr = null; this.ImagePathJp = null; diff --git a/SCHALE.Common/FlatData/UnitType.cs b/SCHALE.Common/FlatData/UnitType.cs index 9975fb6..fc422e2 100644 --- a/SCHALE.Common/FlatData/UnitType.cs +++ b/SCHALE.Common/FlatData/UnitType.cs @@ -7,7 +7,7 @@ namespace SCHALE.Common.FlatData public enum UnitType : int { - None_ = 0, + None = 0, AR = 1, RF = 2, HG = 3, diff --git a/SCHALE.Common/FlatData/VoiceCommonExcel.cs b/SCHALE.Common/FlatData/VoiceCommonExcel.cs index 2b8be52..8410434 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/WeaponType.cs b/SCHALE.Common/FlatData/WeaponType.cs index 0034794..6ad0d27 100644 --- a/SCHALE.Common/FlatData/WeaponType.cs +++ b/SCHALE.Common/FlatData/WeaponType.cs @@ -7,7 +7,7 @@ namespace SCHALE.Common.FlatData public enum WeaponType : int { - None_ = 0, + None = 0, SG = 1, SMG = 2, AR = 3, diff --git a/SCHALE.Common/FlatData/WebAPIErrorLevel.cs b/SCHALE.Common/FlatData/WebAPIErrorLevel.cs index 0e617ae..062ac27 100644 --- a/SCHALE.Common/FlatData/WebAPIErrorLevel.cs +++ b/SCHALE.Common/FlatData/WebAPIErrorLevel.cs @@ -7,7 +7,7 @@ namespace SCHALE.Common.FlatData public enum WebAPIErrorLevel : int { - None_ = 0, + None = 0, Warning = 1, Error = 2, }; diff --git a/SCHALE.Common/FlatData/WeekDungeonExcel.cs b/SCHALE.Common/FlatData/WeekDungeonExcel.cs index a5a5a06..9199900 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 52b8927..22b5642 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 7944e2c..0e23141 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/WeekDungeonRewardExcel.cs b/SCHALE.Common/FlatData/WeekDungeonRewardExcel.cs index 2d4a2dd..f0da8ef 100644 --- a/SCHALE.Common/FlatData/WeekDungeonRewardExcel.cs +++ b/SCHALE.Common/FlatData/WeekDungeonRewardExcel.cs @@ -21,8 +21,8 @@ public struct WeekDungeonRewardExcel : IFlatbufferObject public WeekDungeonRewardExcel __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.WeekDungeonType DungeonType { 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.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 SCHALE.Common.FlatData.WeekDungeonType DungeonType { 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.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 long RewardParcelProbability { get { int o = __p.__offset(14); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } @@ -37,8 +37,8 @@ public struct WeekDungeonRewardExcel : IFlatbufferObject public static Offset CreateWeekDungeonRewardExcel(FlatBufferBuilder builder, long GroupId = 0, - SCHALE.Common.FlatData.WeekDungeonType DungeonType = SCHALE.Common.FlatData.WeekDungeonType.None_, - SCHALE.Common.FlatData.ParcelType RewardParcelType = SCHALE.Common.FlatData.ParcelType.None_, + SCHALE.Common.FlatData.WeekDungeonType DungeonType = SCHALE.Common.FlatData.WeekDungeonType.None, + SCHALE.Common.FlatData.ParcelType RewardParcelType = SCHALE.Common.FlatData.ParcelType.None, long RewardParcelId = 0, long RewardParcelAmount = 0, long RewardParcelProbability = 0, @@ -114,8 +114,8 @@ public class WeekDungeonRewardExcelT public WeekDungeonRewardExcelT() { this.GroupId = 0; - this.DungeonType = SCHALE.Common.FlatData.WeekDungeonType.None_; - this.RewardParcelType = SCHALE.Common.FlatData.ParcelType.None_; + this.DungeonType = SCHALE.Common.FlatData.WeekDungeonType.None; + this.RewardParcelType = SCHALE.Common.FlatData.ParcelType.None; this.RewardParcelId = 0; this.RewardParcelAmount = 0; this.RewardParcelProbability = 0; diff --git a/SCHALE.Common/FlatData/WeekDungeonType.cs b/SCHALE.Common/FlatData/WeekDungeonType.cs index aa5a0fc..3d04cf2 100644 --- a/SCHALE.Common/FlatData/WeekDungeonType.cs +++ b/SCHALE.Common/FlatData/WeekDungeonType.cs @@ -7,7 +7,7 @@ namespace SCHALE.Common.FlatData public enum WeekDungeonType : int { - None_ = 0, + None = 0, ChaserA = 1, ChaserB = 2, ChaserC = 3, diff --git a/SCHALE.Common/FlatData/WorldRaidConditionExcel.cs b/SCHALE.Common/FlatData/WorldRaidConditionExcel.cs index 9733160..add9a5c 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/WorldRaidDifficulty.cs b/SCHALE.Common/FlatData/WorldRaidDifficulty.cs index 6859c8c..7f964ad 100644 --- a/SCHALE.Common/FlatData/WorldRaidDifficulty.cs +++ b/SCHALE.Common/FlatData/WorldRaidDifficulty.cs @@ -7,7 +7,7 @@ namespace SCHALE.Common.FlatData public enum WorldRaidDifficulty : int { - None_ = 0, + None = 0, A = 1, B = 2, C = 3, diff --git a/SCHALE.Common/FlatData/WorldRaidStageExcel.cs b/SCHALE.Common/FlatData/WorldRaidStageExcel.cs index f43782c..49bcbe9 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/FlatData/WorldRaidStageRewardExcel.cs b/SCHALE.Common/FlatData/WorldRaidStageRewardExcel.cs index da153ad..f2820f1 100644 --- a/SCHALE.Common/FlatData/WorldRaidStageRewardExcel.cs +++ b/SCHALE.Common/FlatData/WorldRaidStageRewardExcel.cs @@ -23,7 +23,7 @@ public struct WorldRaidStageRewardExcel : IFlatbufferObject public long GroupId { get { int o = __p.__offset(4); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public bool IsClearStageRewardHideInfo { get { int o = __p.__offset(6); return o != 0 ? 0!=__p.bb.Get(o + __p.bb_pos) : (bool)false; } } public long ClearStageRewardProb { get { int o = __p.__offset(8); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } - public SCHALE.Common.FlatData.ParcelType ClearStageRewardParcelType { 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 SCHALE.Common.FlatData.ParcelType ClearStageRewardParcelType { 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 ClearStageRewardParcelUniqueID { get { int o = __p.__offset(12); return o != 0 ? __p.bb.GetLong(o + __p.bb_pos) : (long)0; } } public string ClearStageRewardParcelUniqueName { get { int o = __p.__offset(14); return o != 0 ? __p.__string(o + __p.bb_pos) : null; } } #if ENABLE_SPAN_T @@ -38,7 +38,7 @@ public struct WorldRaidStageRewardExcel : IFlatbufferObject long GroupId = 0, bool IsClearStageRewardHideInfo = false, long ClearStageRewardProb = 0, - SCHALE.Common.FlatData.ParcelType ClearStageRewardParcelType = SCHALE.Common.FlatData.ParcelType.None_, + SCHALE.Common.FlatData.ParcelType ClearStageRewardParcelType = SCHALE.Common.FlatData.ParcelType.None, long ClearStageRewardParcelUniqueID = 0, StringOffset ClearStageRewardParcelUniqueNameOffset = default(StringOffset), long ClearStageRewardAmount = 0) { @@ -109,7 +109,7 @@ public class WorldRaidStageRewardExcelT this.GroupId = 0; this.IsClearStageRewardHideInfo = false; this.ClearStageRewardProb = 0; - this.ClearStageRewardParcelType = SCHALE.Common.FlatData.ParcelType.None_; + this.ClearStageRewardParcelType = SCHALE.Common.FlatData.ParcelType.None; this.ClearStageRewardParcelUniqueID = 0; this.ClearStageRewardParcelUniqueName = null; this.ClearStageRewardAmount = 0; diff --git a/SCHALE.GameServer/Commands/CafeCommand.cs b/SCHALE.GameServer/Commands/CafeCommand.cs index d565bb2..7e5df05 100644 --- a/SCHALE.GameServer/Commands/CafeCommand.cs +++ b/SCHALE.GameServer/Commands/CafeCommand.cs @@ -78,7 +78,7 @@ namespace SCHALE.GameServer.Commands IsPlayable: true, IsPlayableCharacter: true, IsNPC: false, - ProductionStep_: ProductionStep.Release, + ProductionStep: ProductionStep.Release, } ).Select(x => x.Id).ToList(); diff --git a/SCHALE.GameServer/Controllers/Api/ProtocolHandlers/Account.cs b/SCHALE.GameServer/Controllers/Api/ProtocolHandlers/Account.cs index 7dc7595..8a7ff48 100644 --- a/SCHALE.GameServer/Controllers/Api/ProtocolHandlers/Account.cs +++ b/SCHALE.GameServer/Controllers/Api/ProtocolHandlers/Account.cs @@ -104,7 +104,7 @@ namespace SCHALE.GameServer.Controllers.Api.ProtocolHandlers }, { OpenConditionContent.Story_Sub, OpenConditionLockReason.None }, { OpenConditionContent.Story_Replay, OpenConditionLockReason.None }, - { OpenConditionContent.None_, OpenConditionLockReason.None }, + { OpenConditionContent.None, OpenConditionLockReason.None }, { OpenConditionContent.Shop_Gem, OpenConditionLockReason.None }, { OpenConditionContent.Craft, OpenConditionLockReason.StageClear }, { OpenConditionContent.Student, OpenConditionLockReason.None }, @@ -193,7 +193,7 @@ namespace SCHALE.GameServer.Controllers.Api.ProtocolHandlers .GetTable() .UnPack() .DataList - .Where(x => x.ParcelType_ == ParcelType.Currency) + .Where(x => x.ParcelType == ParcelType.Currency) .ToList(); AccountCurrencyDB accountCurrency = new() @@ -1825,7 +1825,7 @@ namespace SCHALE.GameServer.Controllers.Api.ProtocolHandlers IsPlayable: true, IsPlayableCharacter: true, IsNPC: false, - ProductionStep_: ProductionStep.Release, + ProductionStep: ProductionStep.Release, }).Select(x => x.Id).ToList(); while (randomCharacters.Count < amount) diff --git a/SCHALE.GameServer/Controllers/Api/ProtocolHandlers/Character.cs b/SCHALE.GameServer/Controllers/Api/ProtocolHandlers/Character.cs index ce73b38..3dac06b 100644 --- a/SCHALE.GameServer/Controllers/Api/ProtocolHandlers/Character.cs +++ b/SCHALE.GameServer/Controllers/Api/ProtocolHandlers/Character.cs @@ -248,7 +248,7 @@ namespace SCHALE.GameServer.Controllers.Api.ProtocolHandlers long addExp = 0; long previousExp = 0; long exp = weapon.Exp; - var charWeaponType = characterTable.Find(x => x.Id == targetCharacter.UniqueId).WeaponType_; + var charWeaponType = characterTable.Find(x => x.Id == targetCharacter.UniqueId).WeaponType; var accountCurrency = account.Currencies.First(); Dictionary equipmentData = []; @@ -257,22 +257,22 @@ namespace SCHALE.GameServer.Controllers.Api.ProtocolHandlers { 10, (2700, 10, 15, [WeaponType.SMG, WeaponType.SG, WeaponType.HG, WeaponType.FT]) }, { 20, (2700, 10, 15, [WeaponType.AR, WeaponType.GL, WeaponType.RL]) }, { 30, (2700, 10, 15, [WeaponType.MG, WeaponType.SR, WeaponType.RG, WeaponType.MT]) }, - { 40, (2700, 10, 15, [WeaponType.None_]) }, + { 40, (2700, 10, 15, [WeaponType.None]) }, { 11, (13500, 50, 75, [WeaponType.SMG, WeaponType.SG, WeaponType.HG, WeaponType.FT]) }, { 21, (13500, 50, 75, [WeaponType.AR, WeaponType.GL, WeaponType.RL]) }, { 31, (13500, 50, 75, [WeaponType.MG, WeaponType.SR, WeaponType.RG, WeaponType.MT]) }, - { 41, (13500, 50, 75, [WeaponType.None_]) }, + { 41, (13500, 50, 75, [WeaponType.None]) }, { 12, (36000, 200, 300, [WeaponType.SMG, WeaponType.SG, WeaponType.HG, WeaponType.FT]) }, { 22, (36000, 200, 300, [WeaponType.AR, WeaponType.GL, WeaponType.RL]) }, { 32, (36000, 200, 300, [WeaponType.MG, WeaponType.SR, WeaponType.RG, WeaponType.MT]) }, - { 42, (36000, 200, 300, [WeaponType.None_]) }, + { 42, (36000, 200, 300, [WeaponType.None]) }, { 13, (270000, 1000, 1500, [WeaponType.SMG, WeaponType.SG, WeaponType.HG, WeaponType.FT]) }, { 23, (270000, 1000, 1500, [WeaponType.AR, WeaponType.GL, WeaponType.RL]) }, { 33, (270000, 1000, 1500, [WeaponType.MG, WeaponType.SR, WeaponType.RG, WeaponType.MT]) }, - { 43, (270000, 1000, 1500, [WeaponType.None_]) } + { 43, (270000, 1000, 1500, [WeaponType.None]) } }; for (int i = 0; i < req.ConsumeUniqueIdAndCounts.Count; i++) @@ -280,7 +280,7 @@ namespace SCHALE.GameServer.Controllers.Api.ProtocolHandlers var eq = account.Equipment.FirstOrDefault(x => x.UniqueId == req.ConsumeUniqueIdAndCounts.ElementAt(i).Key); if (eqData.TryGetValue(eq.UniqueId, out var data)) { - if (data.weaponType.Contains(charWeaponType) || data.weaponType.Contains(WeaponType.None_)) addExp += req.ConsumeUniqueIdAndCounts.ElementAt(i).Value * data.expBonus; + if (data.weaponType.Contains(charWeaponType) || data.weaponType.Contains(WeaponType.None)) addExp += req.ConsumeUniqueIdAndCounts.ElementAt(i).Value * data.expBonus; else addExp += req.ConsumeUniqueIdAndCounts.ElementAt(i).Value * data.exp; accountCurrency.CurrencyDict[CurrencyTypes.Gold] -= req.ConsumeUniqueIdAndCounts.ElementAt(i).Value * data.gold; accountCurrency.UpdateTimeDict[CurrencyTypes.Gold] = DateTime.Now; diff --git a/SCHALE.GameServer/Services/SharedDataCacheService.cs b/SCHALE.GameServer/Services/SharedDataCacheService.cs index 3313ae2..6d03aab 100644 --- a/SCHALE.GameServer/Services/SharedDataCacheService.cs +++ b/SCHALE.GameServer/Services/SharedDataCacheService.cs @@ -42,12 +42,12 @@ namespace SCHALE.GameServer.Services IsPlayableCharacter: true, IsDummy: false, IsNPC: false, - ProductionStep_: ProductionStep.Release, + ProductionStep: ProductionStep.Release, }) .ToList(); - _charaListR = _charaList.Where(x => x.Rarity_ == Rarity.R).ToList(); - _charaListSR = _charaList.Where(x => x.Rarity_ == Rarity.SR).ToList(); - _charaListSSR = _charaList.Where(x => x.Rarity_ == Rarity.SSR).ToList(); + _charaListR = _charaList.Where(x => x.Rarity == Rarity.R).ToList(); + _charaListSR = _charaList.Where(x => x.Rarity == Rarity.SR).ToList(); + _charaListSSR = _charaList.Where(x => x.Rarity == Rarity.SSR).ToList(); _charaListRNormal = _charaListR.Where(x => x.GetStudentType() == StudentType.Normal).ToList(); _charaListSRNormal = _charaListSR.Where(x => x.GetStudentType() == StudentType.Normal).ToList(); _charaListSSRNormal = _charaListSSR.Where(x => x.GetStudentType() == StudentType.Normal).ToList(); diff --git a/SCHALE.GameServer/Services/WeekDungeonService.cs b/SCHALE.GameServer/Services/WeekDungeonService.cs index 3420c60..74a3fb3 100644 --- a/SCHALE.GameServer/Services/WeekDungeonService.cs +++ b/SCHALE.GameServer/Services/WeekDungeonService.cs @@ -11,7 +11,7 @@ public class WeekDungeonService { for (int i = 0; i < excel.StarGoal.Count; i++) { - stageHistory.StarGoalRecord.Add(excel.StarGoal[i], WeekDungeonService.CalcStarGoal(excel.WeekDungeonType_, + stageHistory.StarGoalRecord.Add(excel.StarGoal[i], WeekDungeonService.CalcStarGoal(excel.WeekDungeonType, excel.StarGoal[i], excel.StarGoalAmount[i], battleSummary, clearStage)); } } diff --git a/SCHALE.GameServer/Utils/InventoryUtils.cs b/SCHALE.GameServer/Utils/InventoryUtils.cs index ccb1f77..584a626 100644 --- a/SCHALE.GameServer/Utils/InventoryUtils.cs +++ b/SCHALE.GameServer/Utils/InventoryUtils.cs @@ -28,7 +28,7 @@ namespace SCHALE.Common.Utils IsPlayable: true, IsPlayableCharacter: true, IsNPC: false, - ProductionStep_: ProductionStep.Release, + ProductionStep: ProductionStep.Release, } ) .Where(x => !account.Characters.Any(y => y.UniqueId == x.Id))