From e74573102c6f76202feaf8562b08c1871fae196b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=99=AF=E5=A4=A7=E4=BE=A0?= Date: Thu, 25 Aug 2022 04:16:28 +0800 Subject: [PATCH] Update to 2022.8.24 (#414) * Updated types for new version * ignore gitparams.h * Prevent cropping of text in VersionShower --- AmongUsMenu.vcxproj | 3 +- AmongUsMenu.vcxproj.filters | 1 - appdata/il2cpp-functions.h | 2 + appdata/il2cpp-types.h | 464 ++++++++++++++++++++++++------------ gitparams.h | 2 - gui/tabs/host_tab.cpp | 2 + hooks/HudManager.cpp | 11 +- used_types.txt | 1 - 8 files changed, 323 insertions(+), 163 deletions(-) delete mode 100644 gitparams.h diff --git a/AmongUsMenu.vcxproj b/AmongUsMenu.vcxproj index fc050c20..678d71f5 100644 --- a/AmongUsMenu.vcxproj +++ b/AmongUsMenu.vcxproj @@ -1,4 +1,4 @@ - + @@ -325,7 +325,6 @@ - diff --git a/AmongUsMenu.vcxproj.filters b/AmongUsMenu.vcxproj.filters index 0e9e3f0a..17d49a36 100644 --- a/AmongUsMenu.vcxproj.filters +++ b/AmongUsMenu.vcxproj.filters @@ -465,7 +465,6 @@ user - gui diff --git a/appdata/il2cpp-functions.h b/appdata/il2cpp-functions.h index 381de2b4..7939f712 100644 --- a/appdata/il2cpp-functions.h +++ b/appdata/il2cpp-functions.h @@ -189,6 +189,8 @@ DO_APP_FUNC(void, EOSManager_UpdatePermissionKeys, (EOSManager* __this, void* ca DO_APP_FUNC(void, TextMeshPro_SetFaceColor, (TextMeshPro* __this, Color32 color, MethodInfo* method), "Unity.TextMeshPro, System.Void TMPro.TextMeshPro::SetFaceColor(UnityEngine.Color32)"); DO_APP_FUNC(void, TextMeshPro_SetOutlineColor, (TextMeshPro* __this, Color32 color, MethodInfo* method), "Unity.TextMeshPro, System.Void TMPro.TextMeshPro::SetOutlineColor(UnityEngine.Color32)"); +DO_APP_FUNC(void, TMP_Text_set_alignment, (TMP_Text* __this, TextAlignmentOptions__Enum value, MethodInfo* method), "Unity.TextMeshPro, System.Void TMPro.TMP_Text::set_alignment(TMPro.TextAlignmentOptions)"); +DO_APP_FUNC(String*, TMP_Text_get_text, (TMP_Text* __this, MethodInfo* method), "Unity.TextMeshPro, System.String TMPro.TMP_Text::get_text()"); DO_APP_FUNC(void, TMP_Text_set_text, (TMP_Text* __this, String* value, MethodInfo* method), "Unity.TextMeshPro, System.Void TMPro.TMP_Text::set_text(System.String)"); DO_APP_FUNC(Color32, Color32_op_Implicit, (Color c, MethodInfo* method), "UnityEngine.CoreModule, UnityEngine.Color32 UnityEngine.Color32::op_Implicit(UnityEngine.Color)"); diff --git a/appdata/il2cpp-types.h b/appdata/il2cpp-types.h index c577fa41..4776d556 100644 --- a/appdata/il2cpp-types.h +++ b/appdata/il2cpp-types.h @@ -3631,7 +3631,6 @@ namespace app int32_t wordCount; int32_t fontStyle; int32_t italicAngle; - float fontScale; float fontScaleMultiplier; float currentFontSize; float baselineOffset; @@ -3690,11 +3689,99 @@ namespace app int32_t materialIndex; }; + struct TMP_Text_TextBackingContainer { + void* m_Array; + int32_t m_Count; + }; + +#if defined(_CPLUSPLUS_) + enum class TextAlignmentOptions__Enum : int32_t { + TopLeft = 0x00000101, + Top = 0x00000102, + TopRight = 0x00000104, + TopJustified = 0x00000108, + TopFlush = 0x00000110, + TopGeoAligned = 0x00000120, + Left = 0x00000201, + Center = 0x00000202, + Right = 0x00000204, + Justified = 0x00000208, + Flush = 0x00000210, + CenterGeoAligned = 0x00000220, + BottomLeft = 0x00000401, + Bottom = 0x00000402, + BottomRight = 0x00000404, + BottomJustified = 0x00000408, + BottomFlush = 0x00000410, + BottomGeoAligned = 0x00000420, + BaselineLeft = 0x00000801, + Baseline = 0x00000802, + BaselineRight = 0x00000804, + BaselineJustified = 0x00000808, + BaselineFlush = 0x00000810, + BaselineGeoAligned = 0x00000820, + MidlineLeft = 0x00001001, + Midline = 0x00001002, + MidlineRight = 0x00001004, + MidlineJustified = 0x00001008, + MidlineFlush = 0x00001010, + MidlineGeoAligned = 0x00001020, + CaplineLeft = 0x00002001, + Capline = 0x00002002, + CaplineRight = 0x00002004, + CaplineJustified = 0x00002008, + CaplineFlush = 0x00002010, + CaplineGeoAligned = 0x00002020, + Converted = 0x0000ffff, + }; + +#else + enum TextAlignmentOptions__Enum { + TextAlignmentOptions__Enum_TopLeft = 0x00000101, + TextAlignmentOptions__Enum_Top = 0x00000102, + TextAlignmentOptions__Enum_TopRight = 0x00000104, + TextAlignmentOptions__Enum_TopJustified = 0x00000108, + TextAlignmentOptions__Enum_TopFlush = 0x00000110, + TextAlignmentOptions__Enum_TopGeoAligned = 0x00000120, + TextAlignmentOptions__Enum_Left = 0x00000201, + TextAlignmentOptions__Enum_Center = 0x00000202, + TextAlignmentOptions__Enum_Right = 0x00000204, + TextAlignmentOptions__Enum_Justified = 0x00000208, + TextAlignmentOptions__Enum_Flush = 0x00000210, + TextAlignmentOptions__Enum_CenterGeoAligned = 0x00000220, + TextAlignmentOptions__Enum_BottomLeft = 0x00000401, + TextAlignmentOptions__Enum_Bottom = 0x00000402, + TextAlignmentOptions__Enum_BottomRight = 0x00000404, + TextAlignmentOptions__Enum_BottomJustified = 0x00000408, + TextAlignmentOptions__Enum_BottomFlush = 0x00000410, + TextAlignmentOptions__Enum_BottomGeoAligned = 0x00000420, + TextAlignmentOptions__Enum_BaselineLeft = 0x00000801, + TextAlignmentOptions__Enum_Baseline = 0x00000802, + TextAlignmentOptions__Enum_BaselineRight = 0x00000804, + TextAlignmentOptions__Enum_BaselineJustified = 0x00000808, + TextAlignmentOptions__Enum_BaselineFlush = 0x00000810, + TextAlignmentOptions__Enum_BaselineGeoAligned = 0x00000820, + TextAlignmentOptions__Enum_MidlineLeft = 0x00001001, + TextAlignmentOptions__Enum_Midline = 0x00001002, + TextAlignmentOptions__Enum_MidlineRight = 0x00001004, + TextAlignmentOptions__Enum_MidlineJustified = 0x00001008, + TextAlignmentOptions__Enum_MidlineFlush = 0x00001010, + TextAlignmentOptions__Enum_MidlineGeoAligned = 0x00001020, + TextAlignmentOptions__Enum_CaplineLeft = 0x00002001, + TextAlignmentOptions__Enum_Capline = 0x00002002, + TextAlignmentOptions__Enum_CaplineRight = 0x00002004, + TextAlignmentOptions__Enum_CaplineJustified = 0x00002008, + TextAlignmentOptions__Enum_CaplineFlush = 0x00002010, + TextAlignmentOptions__Enum_CaplineGeoAligned = 0x00002020, + TextAlignmentOptions__Enum_Converted = 0x0000ffff, + }; + +#endif #pragma region TMP_Text - struct TMP_Text__Fields - { + struct TMP_Text__Fields { struct MaskableGraphic__Fields _; struct String* m_text; + bool m_IsTextBackingStringDirty; void* m_TextPreprocessor; bool m_isRightToLeft; void* m_fontAsset; @@ -3702,9 +3789,6 @@ namespace app bool m_isSDFShader; void* m_sharedMaterial; void* m_currentMaterial; - void* m_materialReferences; - void* m_materialReferenceIndexLookup; - struct TMP_TextProcessingStack_1_MaterialReference_ m_materialReferenceStack; int32_t m_currentMaterialIndex; void* m_fontSharedMaterials; void* m_fontMaterial; @@ -3750,7 +3834,11 @@ namespace app bool m_isUsingBold; int32_t m_HorizontalAlignment; int32_t m_VerticalAlignment; +#if defined(_CPLUSPLUS_) + TextAlignmentOptions__Enum m_textAlignment; +#else int32_t m_textAlignment; +#endif int32_t m_lineJustification; struct TMP_TextProcessingStack_1_HorizontalAlignmentOptions_ m_lineJustificationStack; void* m_textContainerLocalCorners; @@ -3773,8 +3861,8 @@ namespace app float m_wordWrappingRatios; int32_t m_overflowMode; int32_t m_firstOverflowCharacterIndex; - void* m_linkedTextComponent; - void* parentLinkedComponent; + struct TMP_Text* m_linkedTextComponent; + struct TMP_Text* parentLinkedComponent; bool m_isTextTruncated; bool m_enableKerning; float m_GlyphHorizontalAdvanceAdjustment; @@ -3839,13 +3927,8 @@ namespace app bool m_isLayoutDirty; bool m_isAwake; bool m_isWaitingOnResourceLoad; - bool m_isInputParsingRequired; int32_t m_inputSource; - float m_fontScale; float m_fontScaleMultiplier; - void* m_htmlTag; - void* m_xmlAttribute; - void* m_attributeParameterValues; float tag_LineIndent; float tag_Indent; struct TMP_TextProcessingStack_1_System_Single_ m_indentStack; @@ -3853,18 +3936,10 @@ namespace app bool m_isParsingText; struct Matrix4x4 m_FXMatrix; bool m_isFXMatrixSet; - void* m_InternalParsingBuffer; - int32_t m_InternalParsingBufferSize; + void* m_TextProcessingArray; + int32_t m_InternalTextProcessingArraySize; void* m_internalCharacterInfo; - void* m_input_CharArray; - int32_t m_charArray_Length; int32_t m_totalCharacterCount; - struct WordWrapState m_SavedWordWrapState; - struct WordWrapState m_SavedLineState; - struct WordWrapState m_SavedEllipsisState; - struct WordWrapState m_SavedLastValidState; - struct WordWrapState m_SavedSoftLineBreakState; - struct TMP_TextProcessingStack_1_WordWrapState_ m_EllipsisInsertionCandidateStack; int32_t m_characterCount; int32_t m_firstCharacterOfLine; int32_t m_firstVisibleCharacterOfLine; @@ -3913,6 +3988,7 @@ namespace app int32_t m_spriteIndex; int32_t m_spriteAnimationID; bool m_ignoreActiveState; + struct TMP_Text_TextBackingContainer m_TextBackingArray; void* k_Power; }; @@ -3923,8 +3999,7 @@ namespace app struct TMP_Text__Fields fields; }; - struct TMP_Text__VTable - { + struct TMP_Text__VTable { VirtualInvokeData Equals; VirtualInvokeData Finalize; VirtualInvokeData GetHashCode; @@ -4040,7 +4115,6 @@ namespace app VirtualInvokeData InternalCrossFadeColor; VirtualInvokeData InternalCrossFadeAlpha; VirtualInvokeData SetArraySizes; - VirtualInvokeData GenerateTextMesh; VirtualInvokeData CalculatePreferredValues; VirtualInvokeData GetCompoundBounds; VirtualInvokeData GetCanvasSpaceClippingRect; @@ -4063,15 +4137,7 @@ namespace app struct TMP_Text__StaticFields { - struct Color32 s_colorWhite; - void* OnFontAssetRequest; - void* OnSpriteAssetRequest; - struct Vector2 k_LargePositiveVector2; - struct Vector2 k_LargeNegativeVector2; - float k_LargePositiveFloat; - float k_LargeNegativeFloat; - int32_t k_LargePositiveInt; - int32_t k_LargeNegativeInt; + }; struct TMP_Text__Class @@ -4101,6 +4167,7 @@ namespace app struct Matrix4x4 m_EnvMapMatrix; void* m_RectTransformCorners; bool m_isRegisteredForEvents; + int32_t _SortingLayer; int32_t _SortingLayerID; int32_t _SortingOrder; void* OnPreRenderText; @@ -4114,8 +4181,7 @@ namespace app struct TextMeshPro__Fields fields; }; - struct TextMeshPro__VTable - { + struct TextMeshPro__VTable { VirtualInvokeData Equals; VirtualInvokeData Finalize; VirtualInvokeData GetHashCode; @@ -4231,7 +4297,6 @@ namespace app VirtualInvokeData InternalCrossFadeColor; VirtualInvokeData InternalCrossFadeAlpha; VirtualInvokeData SetArraySizes; - VirtualInvokeData GenerateTextMesh; VirtualInvokeData CalculatePreferredValues; VirtualInvokeData GetCompoundBounds; VirtualInvokeData GetCanvasSpaceClippingRect; @@ -4259,6 +4324,7 @@ namespace app VirtualInvokeData get_preferredHeight_1; VirtualInvokeData get_flexibleHeight_1; VirtualInvokeData get_layoutPriority_1; + VirtualInvokeData GenerateTextMesh; }; struct TextMeshPro__StaticFields @@ -4399,6 +4465,8 @@ namespace app struct String* freeChatKey; struct String* customNameKey; struct String* friendsListKey; + struct String* accountLinkKey; + void* logger; int32_t ageOfConsent; struct String* kwsUserId; bool isKWSMinor; @@ -4926,6 +4994,7 @@ namespace app bool _ShouldCheckForGameEnd_k__BackingField; float _HideCountdown_k__BackingField; void* _CosmeticsCache_k__BackingField; + void* logger; int32_t numScans; }; @@ -5473,6 +5542,7 @@ namespace app ErrorTooManyGames = 0x000002d5, ErrorDuplicateConnection = 0x000002d6, ErrorTooManyRequests = 0x000002d7, + ErrorSanction = 0x000002d8, VentDirection = 0x000003e8, VentMove = 0x000003e9, MenuNavigate = 0x000003ea, @@ -5521,7 +5591,34 @@ namespace app StatsScientistChargesGained = 0x00000604, StatsGuardianAngelCrewmatesProtected = 0x00000605, StatsShapeshifterShiftedKills = 0x00000606, + SanctionDuration = 0x000006a4, + SanctionPermanent = 0x000006a5, + SanctionConduct = 0x000006a6, + SanctionImpersonationCeleb = 0x000006a7, + SanctionSpamming = 0x000006a8, + SanctionInappropriateNameUnsportsmanlike = 0x000006a9, + SanctionUnsportsmanlikeConduct = 0x000006aa, + SanctionImpersonationDevelopers = 0x000006ab, + SanctionInappropriateChatPersonalInfo = 0x000006ac, + SanctionInappropriateNameDerogatory = 0x000006ad, + SanctionInappropriateNameNsfw = 0x000006ae, + SanctionBullying = 0x000006af, + SanctionCheatingHacking = 0x000006b0, + SanctionInappropriateChatDating = 0x000006b1, + SanctionWeaponizingRules = 0x000006b2, + SanctionRepeatOffender3 = 0x000006b3, + SanctionSexualMisconduct = 0x000006b4, + SanctionDoxing = 0x000006b5, + SanctionIllegalActivity = 0x000006b6, + SanctionHarassment = 0x000006b7, + SanctionSelfHarmPromotion = 0x000006b8, + SanctionRepeatOffender10 = 0x000006b9, + SanctionUnknown = 0x000006ba, ScreenShakeOption = 0x0000076c, + FeaturedItems = 0x0000076d, + FeaturedBundles = 0x0000076e, + FeaturedCubes = 0x0000076f, + BugReportPopUpAttachScreenshotDesc = 0x00000770, QCLocationLaptop = 0x000007d0, QCLocationSkeld = 0x000007d1, QCLocationMira = 0x000007d2, @@ -5846,6 +5943,10 @@ namespace app ErrorCrossPlat = 0x00000911, SettingsStreamerMode = 0x00000912, RoomCodeInfo = 0x00000913, + AbbreviatedDay = 0x00000914, + AbbreviatedHour = 0x00000915, + AbbreviatedMinute = 0x00000916, + AbbreviatedSecond = 0x00000917, MaxVentUses = 0x00000a8c, MaxTimeInVent = 0x00000a8d, MinCrewmatesForVitals = 0x00000a8e, @@ -5911,6 +6012,10 @@ namespace app ParentPortalButton = 0x00000b1e, FriendsListEmailSent = 0x00000b1f, AndroidAssetBundleWarning = 0x00000b20, + FreeChatLinkWarning = 0x00000b21, + FriendListUnavailable = 0x00000b22, + SignInIssueTitle = 0x00000b23, + SignInIssueText = 0x00000b24, QCAccIsRole = 0x00000bb8, QCAccIsRoleNeg = 0x00000bb9, QCAccShapeshited = 0x00000bba, @@ -5945,7 +6050,30 @@ namespace app ErrorCommunications = 0x00000bd7, ManageAccountTitle = 0x00000bd8, ManageAccountText = 0x00000bd9, + Email = 0x00000bda, + BugReportPopUpSubmittedText = 0x00000bdb, + BugReportPopUpCategoryLabel = 0x00000bdc, + BugReportPopUpDescriptionLabel = 0x00000bdd, + BugReportPopUpTitle = 0x00000bde, + BugReportCategoryServerIssues = 0x00000bdf, + BugReportCategoryGameplayIssue = 0x00000be0, + BugReportCategoryAccountManagement = 0x00000be1, + BugReportCategoryBilling = 0x00000be2, + BugReportCategoryGeneral = 0x00000be3, + BugReportIssueButton = 0x00000be4, + BugReportPopUpSubmissionFailedText = 0x00000be5, + BugReportPopUpAttachScreenshotLabel = 0x00000be6, SettingsColorblind = 0x00000c80, + SettingsHelp = 0x00000c81, + SecLogEntryColorblind = 0x00000c82, + DeleteAccount = 0x00000c83, + DoNotDeleteAccount = 0x00000c84, + AccountDeleteHelp = 0x00000c85, + AccountUnDeleteHelp = 0x00000c86, + ConfirmDelete = 0x00000c87, + ConfirmDeleteAccounts = 0x00000c88, + ConfirmDeleteAccountsEmpty = 0x00000c89, + AccountRequestDelete = 0x00000c8a, }; #else @@ -6446,6 +6574,7 @@ namespace app StringNames__Enum_ErrorTooManyGames = 0x000002d5, StringNames__Enum_ErrorDuplicateConnection = 0x000002d6, StringNames__Enum_ErrorTooManyRequests = 0x000002d7, + StringNames__Enum_ErrorSanction = 0x000002d8, StringNames__Enum_VentDirection = 0x000003e8, StringNames__Enum_VentMove = 0x000003e9, StringNames__Enum_MenuNavigate = 0x000003ea, @@ -6494,7 +6623,34 @@ namespace app StringNames__Enum_StatsScientistChargesGained = 0x00000604, StringNames__Enum_StatsGuardianAngelCrewmatesProtected = 0x00000605, StringNames__Enum_StatsShapeshifterShiftedKills = 0x00000606, + StringNames__Enum_SanctionDuration = 0x000006a4, + StringNames__Enum_SanctionPermanent = 0x000006a5, + StringNames__Enum_SanctionConduct = 0x000006a6, + StringNames__Enum_SanctionImpersonationCeleb = 0x000006a7, + StringNames__Enum_SanctionSpamming = 0x000006a8, + StringNames__Enum_SanctionInappropriateNameUnsportsmanlike = 0x000006a9, + StringNames__Enum_SanctionUnsportsmanlikeConduct = 0x000006aa, + StringNames__Enum_SanctionImpersonationDevelopers = 0x000006ab, + StringNames__Enum_SanctionInappropriateChatPersonalInfo = 0x000006ac, + StringNames__Enum_SanctionInappropriateNameDerogatory = 0x000006ad, + StringNames__Enum_SanctionInappropriateNameNsfw = 0x000006ae, + StringNames__Enum_SanctionBullying = 0x000006af, + StringNames__Enum_SanctionCheatingHacking = 0x000006b0, + StringNames__Enum_SanctionInappropriateChatDating = 0x000006b1, + StringNames__Enum_SanctionWeaponizingRules = 0x000006b2, + StringNames__Enum_SanctionRepeatOffender3 = 0x000006b3, + StringNames__Enum_SanctionSexualMisconduct = 0x000006b4, + StringNames__Enum_SanctionDoxing = 0x000006b5, + StringNames__Enum_SanctionIllegalActivity = 0x000006b6, + StringNames__Enum_SanctionHarassment = 0x000006b7, + StringNames__Enum_SanctionSelfHarmPromotion = 0x000006b8, + StringNames__Enum_SanctionRepeatOffender10 = 0x000006b9, + StringNames__Enum_SanctionUnknown = 0x000006ba, StringNames__Enum_ScreenShakeOption = 0x0000076c, + StringNames__Enum_FeaturedItems = 0x0000076d, + StringNames__Enum_FeaturedBundles = 0x0000076e, + StringNames__Enum_FeaturedCubes = 0x0000076f, + StringNames__Enum_BugReportPopUpAttachScreenshotDesc = 0x00000770, StringNames__Enum_QCLocationLaptop = 0x000007d0, StringNames__Enum_QCLocationSkeld = 0x000007d1, StringNames__Enum_QCLocationMira = 0x000007d2, @@ -6819,6 +6975,10 @@ namespace app StringNames__Enum_ErrorCrossPlat = 0x00000911, StringNames__Enum_SettingsStreamerMode = 0x00000912, StringNames__Enum_RoomCodeInfo = 0x00000913, + StringNames__Enum_AbbreviatedDay = 0x00000914, + StringNames__Enum_AbbreviatedHour = 0x00000915, + StringNames__Enum_AbbreviatedMinute = 0x00000916, + StringNames__Enum_AbbreviatedSecond = 0x00000917, StringNames__Enum_MaxVentUses = 0x00000a8c, StringNames__Enum_MaxTimeInVent = 0x00000a8d, StringNames__Enum_MinCrewmatesForVitals = 0x00000a8e, @@ -6884,6 +7044,10 @@ namespace app StringNames__Enum_ParentPortalButton = 0x00000b1e, StringNames__Enum_FriendsListEmailSent = 0x00000b1f, StringNames__Enum_AndroidAssetBundleWarning = 0x00000b20, + StringNames__Enum_FreeChatLinkWarning = 0x00000b21, + StringNames__Enum_FriendListUnavailable = 0x00000b22, + StringNames__Enum_SignInIssueTitle = 0x00000b23, + StringNames__Enum_SignInIssueText = 0x00000b24, StringNames__Enum_QCAccIsRole = 0x00000bb8, StringNames__Enum_QCAccIsRoleNeg = 0x00000bb9, StringNames__Enum_QCAccShapeshited = 0x00000bba, @@ -6918,7 +7082,30 @@ namespace app StringNames__Enum_ErrorCommunications = 0x00000bd7, StringNames__Enum_ManageAccountTitle = 0x00000bd8, StringNames__Enum_ManageAccountText = 0x00000bd9, + StringNames__Enum_Email = 0x00000bda, + StringNames__Enum_BugReportPopUpSubmittedText = 0x00000bdb, + StringNames__Enum_BugReportPopUpCategoryLabel = 0x00000bdc, + StringNames__Enum_BugReportPopUpDescriptionLabel = 0x00000bdd, + StringNames__Enum_BugReportPopUpTitle = 0x00000bde, + StringNames__Enum_BugReportCategoryServerIssues = 0x00000bdf, + StringNames__Enum_BugReportCategoryGameplayIssue = 0x00000be0, + StringNames__Enum_BugReportCategoryAccountManagement = 0x00000be1, + StringNames__Enum_BugReportCategoryBilling = 0x00000be2, + StringNames__Enum_BugReportCategoryGeneral = 0x00000be3, + StringNames__Enum_BugReportIssueButton = 0x00000be4, + StringNames__Enum_BugReportPopUpSubmissionFailedText = 0x00000be5, + StringNames__Enum_BugReportPopUpAttachScreenshotLabel = 0x00000be6, StringNames__Enum_SettingsColorblind = 0x00000c80, + StringNames__Enum_SettingsHelp = 0x00000c81, + StringNames__Enum_SecLogEntryColorblind = 0x00000c82, + StringNames__Enum_DeleteAccount = 0x00000c83, + StringNames__Enum_DoNotDeleteAccount = 0x00000c84, + StringNames__Enum_AccountDeleteHelp = 0x00000c85, + StringNames__Enum_AccountUnDeleteHelp = 0x00000c86, + StringNames__Enum_ConfirmDelete = 0x00000c87, + StringNames__Enum_ConfirmDeleteAccounts = 0x00000c88, + StringNames__Enum_ConfirmDeleteAccountsEmpty = 0x00000c89, + StringNames__Enum_AccountRequestDelete = 0x00000c8a, }; #endif @@ -7203,6 +7390,7 @@ namespace app VirtualInvokeData get_Count_1; VirtualInvokeData System_Collections_ICollection_get_SyncRoot; VirtualInvokeData System_Collections_ICollection_get_IsSynchronized; + VirtualInvokeData ContainsKey_1; VirtualInvokeData TryGetValue_1; VirtualInvokeData System_Collections_Generic_IReadOnlyDictionary_TKey_TValue__get_Keys; VirtualInvokeData System_Collections_Generic_IReadOnlyDictionary_TKey_TValue__get_Values; @@ -7504,6 +7692,7 @@ namespace app VirtualInvokeData get_Count_1; VirtualInvokeData System_Collections_ICollection_get_SyncRoot; VirtualInvokeData System_Collections_ICollection_get_IsSynchronized; + VirtualInvokeData ContainsKey_1; VirtualInvokeData TryGetValue_1; VirtualInvokeData System_Collections_Generic_IReadOnlyDictionary_TKey_TValue__get_Keys; VirtualInvokeData System_Collections_Generic_IReadOnlyDictionary_TKey_TValue__get_Values; @@ -7839,6 +8028,7 @@ namespace app void* OpenSound; void* CloseSound; void* inputHandler; + void* logger; }; struct Minigame @@ -8530,6 +8720,7 @@ struct RoleEffectAnimation__Array { void* AspectPosition; float TimeSinceLastMessage; void* MessageSound; + void* WarningSound; bool animating; void* notificationRoutine; void* BanButton; @@ -8541,6 +8732,7 @@ struct RoleEffectAnimation__Array { void* DefaultButtonSelected; void* ControllerSelectable; void* specialInputHandler; + void* logger; }; struct ChatController @@ -8619,6 +8811,7 @@ struct RoleEffectAnimation__Array { float GhostSpeed; void* body; struct PlayerControl* myPlayer; + void* logger; void* GlowAnimator; void* ImpostorDiscoveredSound; void* inputHandler; @@ -8667,6 +8860,7 @@ struct RoleEffectAnimation__Array { SimpleUI = 0x00000001, ComplexUI = 0x00000002, Exile = 0x00000003, + ScrollingUI = 0x00000004, }; #else @@ -8675,6 +8869,7 @@ struct RoleEffectAnimation__Array { PlayerMaterial_MaskType__Enum_SimpleUI = 0x00000001, PlayerMaterial_MaskType__Enum_ComplexUI = 0x00000002, PlayerMaterial_MaskType__Enum_Exile = 0x00000003, + PlayerMaterial_MaskType__Enum_ScrollingUI = 0x00000004, }; #endif @@ -8693,22 +8888,22 @@ struct RoleEffectAnimation__Array { #pragma region CosmeticsLayer struct CosmeticsLayer__Fields { struct MonoBehaviour__Fields _; + bool alwaysDrawNormalPlayer; + void* bodySprites; + struct TextMeshPro* colorBlindText; void* hat; - void* visor; - struct SkinLayer* skin; struct TextMeshPro* nameText; - void* bodySprites; struct Transform* petParent; - struct TextMeshPro* colorBlindText; - bool alwaysDrawNormalPlayer; + bool showColorBlindText; + struct SkinLayer* skin; bool uiPet; + void* visor; float zIndexSpacing; - bool showColorBlindText; + struct PlayerMaterial_Properties bodyMatProperties; void* currentBodySprite; - void* normalBodySprite; struct PetBehaviour* currentPet; - struct PlayerMaterial_Properties bodyMatProperties; bool initialized; + void* normalBodySprite; }; struct CosmeticsLayer__VTable { @@ -8772,16 +8967,17 @@ struct RoleEffectAnimation__Array { struct CustomNetworkTransform* NetTransform; void* myAnim; void* horseAnim; - void* hitBuffer; struct List_1_PlayerTask_* myTasks; struct Vector3 defaultPlayerScale; void* ScannerAnims; struct SpriteRenderer__Array* ScannersImages; struct List_1_RoleEffectAnimation_* currentRoleAnimations; - void* closest; - bool isNew; bool isDummy; bool notRealPlayer; + void* hitBuffer; + void* closest; + bool isNew; + void* logger; void* cache; void* itemsInRange; void* newItemsInRange; @@ -9289,6 +9485,7 @@ struct RoleEffectAnimation__Array { bool amDead; float resultsStartedAt; int32_t lastSecond; + void* logger; void* DefaultButtonSelected; void* ProceedButtonUi; void* ControllerSelectable; @@ -9625,6 +9822,7 @@ struct RoleEffectAnimation__Array { #endif struct String* LastCustomDisconnect; uint8_t LastServerChatMode; + void* LastMatchmakerError; void* PreSpawnDispatcher; void* Dispatcher; bool _IsGamePublic_k__BackingField; @@ -9742,6 +9940,7 @@ struct RoleEffectAnimation__Array { int32_t CrossplayPrivilegeError; #endif int32_t MAX_CLIENT_WAIT_TIME; + void* logger; }; struct AmongUsClient { @@ -10380,7 +10579,11 @@ struct RoleEffectAnimation__Array { int32_t starCost; bool paidOnMobile; struct LimitedTimeStartEnd limitedTime; + void* Variations; int32_t displayOrder; + bool NotInStore; + bool Free; + struct String* DateCreated; }; struct CosmeticData { @@ -10427,8 +10630,6 @@ struct RoleEffectAnimation__Array { bool InFront; bool NoBounce; bool BlocksVisors; - bool NotInStore; - bool Free; struct String* StoreName; struct SkinData* RelatedSkin; void* hatViewData; @@ -10587,6 +10788,9 @@ struct RoleEffectAnimation__Array { void* AllVisors; void* AllNamePlates; void* AllBundles; + void* allFeaturedItems; + void* allFeaturedBundles; + void* allFeaturedCubes; }; struct HatManager @@ -10621,61 +10825,10 @@ struct RoleEffectAnimation__Array { }; #pragma endregion -#pragma region HatManager_c - - struct HatManager_c - { - struct HatManager_c__Class* klass; - void* monitor; - }; - - struct HatManager_c__VTable - { - VirtualInvokeData Equals; - VirtualInvokeData Finalize; - VirtualInvokeData GetHashCode; - VirtualInvokeData ToString; - }; - - struct HatManager_c__StaticFields - { - struct HatManager_c* __9; - /* these are all a bunch of func ptrs. worth checking out in cpp scaffolding to see their actual types. */ - void* __9__26_1; - void* __9__27_0; - void* __9__27_1; - void* __9__28_1; - void* __9__29_0; - void* __9__29_1; - void* __9__30_0; - void* __9__30_1; - void* __9__31_1; - void* __9__32_0; - void* __9__32_1; - void* __9__33_1; - void* __9__34_0; - void* __9__34_1; - void* __9__35_1; - }; - - struct HatManager_c__Class - { - Il2CppClass_0 _0; - Il2CppRuntimeInterfaceOffsetPair* interfaceOffsets; - struct HatManager_c__StaticFields* static_fields; - const Il2CppRGCTXData* rgctx_data; - Il2CppClass_1 _1; - struct HatManager_c__VTable vtable; - }; - -#pragma endregion - #pragma region NamePlateData struct NamePlateData__Fields { struct CosmeticData__Fields _; void* ViewDataRef; - bool Free; - bool NotInStore; void* viewData; }; @@ -10690,8 +10843,6 @@ struct RoleEffectAnimation__Array { struct VisorData__Fields { struct CosmeticData__Fields _; void* ViewDataRef; - bool Free; - bool NotInStore; void* viewData; }; @@ -10727,8 +10878,6 @@ struct RoleEffectAnimation__Array { struct PetData__Fields { struct CosmeticData__Fields _; - bool Free; - bool NotInStore; #if defined(_CPLUSPLUS_) StringNames__Enum StoreName; #else @@ -10770,8 +10919,6 @@ struct RoleEffectAnimation__Array { { struct CosmeticData__Fields _; void* ViewDataRef; - bool NotInStore; - bool Free; struct String* StoreName; void* viewData; }; @@ -11397,6 +11544,7 @@ struct RoleEffectAnimation__Array { VirtualInvokeData get_Count_1; VirtualInvokeData System_Collections_ICollection_get_SyncRoot; VirtualInvokeData System_Collections_ICollection_get_IsSynchronized; + VirtualInvokeData ContainsKey_1; VirtualInvokeData TryGetValue_1; VirtualInvokeData System_Collections_Generic_IReadOnlyDictionary_TKey_TValue__get_Keys; VirtualInvokeData System_Collections_Generic_IReadOnlyDictionary_TKey_TValue__get_Values; @@ -11863,6 +12011,7 @@ struct RoleEffectAnimation__Array { { struct StatsManager_Stats* stats; bool loadedStats; + void* logger; }; struct StatsManager @@ -12097,74 +12246,74 @@ struct RoleEffectAnimation__Array { }; struct SaveManager__StaticFields { + int32_t lastSchemaVersion; bool loaded; bool loadedStats; bool loadedAnnounce; bool loadedQCFavorites; bool loadedStoreTabViewDates; bool loadedCachedPurchases; + void* OnColorBlindChanged; + void* OnStreamerModeChanged; struct String* lastPlayerName; - uint8_t sfxVolume; - uint8_t musicVolume; - bool showMinPlayerWarning; + uint32_t colorConfig; + struct String* lastPet; + struct String* lastHat; + struct String* lastSkin; + struct String* lastVisor; + struct String* lastNamePlate; bool showOnlineHelp; - uint8_t showAdsScreen; + bool warnedAboutGuestModeProgression; int32_t privacyPolicyVersion; + bool askRedeemDLC; + bool showMinPlayerWarning; + void* purchases; + struct String* lastCosmicube; + struct String* storeBundlesViewDate; + struct String* storeHatsViewDate; + struct String* storeOutfitsViewDate; + struct String* storeVisorsViewDate; + struct String* storePetsViewDate; + struct String* storeNameplatesViewDate; + struct String* storeCosmicubeViewDate; + int32_t accountLoginStatus; + bool hasLoggedIn; + bool isGuest; + struct String* guardianEmail; + struct String* epicAccountId; + bool deleteDeviceIDFailed; + struct String* dobInfo; + struct String* birthDateSetDate; int32_t birthDateDay; int32_t birthDateMonth; int32_t birthDateYear; - struct String* birthDateSetDate; - struct String* epicAccountId; - bool vsync; + uint32_t playerLevel; + uint32_t playerXp; + uint32_t playerXpRequiredForNextLevel; + struct Announcement lastAnnounce; + void* quickChatFavorites; + int32_t chatModeType; + struct GameOptionsData* hostOptionsData; + struct GameOptionsData* searchOptionsData; + uint8_t showAdsScreen; bool screenshake; bool censorChat; + bool enableFriendsListInvites; + bool crossplayAllPlatforms; bool streamerMode; - int32_t chatModeType; - bool isGuest; - bool hasLoggedIn; - struct String* guardianEmail; - int32_t accountLoginStatus; - bool askRedeemDLC; - bool warnedAboutGuestModeProgression; bool colorblindMode; + uint8_t sfxVolume; + uint8_t musicVolume; + bool vsync; + uint32_t lastLanguage; #if defined(_CPLUSPLUS_) ControlTypes__Enum touchConfig; #else int32_t touchConfig; #endif - float joyStickSize; - uint32_t colorConfig; - struct String* lastPet; - struct String* lastHat; - struct String* lastSkin; - struct String* lastVisor; - struct String* lastNamePlate; - struct String* lastCosmicube; - uint32_t lastLanguage; - struct GameOptionsData* hostOptionsData; - struct GameOptionsData* searchOptionsData; - int32_t lastSchemaVersion; - uint32_t playerLevel; - uint32_t playerXp; - uint32_t playerXpRequiredForNextLevel; - bool crossplayAllPlatforms; bool enableMouseMovement; - bool enableFriendsListInvites; - bool deleteDeviceIDFailed; - void* OnColorBlindChanged; - void* OnStreamerModeChanged; - struct Announcement lastAnnounce; - void* quickChatFavorites; + float joyStickSize; void* purchaseFile; - void* purchases; - struct String* dobInfo; - struct String* storeBundlesViewDate; - struct String* storeHatsViewDate; - struct String* storeOutfitsViewDate; - struct String* storeVisorsViewDate; - struct String* storePetsViewDate; - struct String* storeNameplatesViewDate; - struct String* storeCosmicubeViewDate; }; struct SaveManager__Class { @@ -12336,6 +12485,7 @@ struct RoleEffectAnimation__Array { Offline = 0x00000000, LoggedIn = 0x00000001, WaitingForParent = 0x00000002, + TempAccount = 0x00000003, }; #else @@ -12343,6 +12493,7 @@ struct RoleEffectAnimation__Array { EOSManager_AccountLoginStatus__Enum_Offline = 0x00000000, EOSManager_AccountLoginStatus__Enum_LoggedIn = 0x00000001, EOSManager_AccountLoginStatus__Enum_WaitingForParent = 0x00000002, + EOSManager_AccountLoginStatus__Enum_TempAccount = 0x00000003, }; #endif @@ -12380,6 +12531,11 @@ struct RoleEffectAnimation__Array { KWSPermissionStatus__Enum friendsListAllowed; #else int32_t friendsListAllowed; +#endif +#if defined(_CPLUSPLUS_) + KWSPermissionStatus__Enum accountLinkingAllowed; +#else + int32_t accountLinkingAllowed; #endif void* OnLoggedInStatusChange; #if defined(_CPLUSPLUS_) @@ -12387,6 +12543,8 @@ struct RoleEffectAnimation__Array { #else int32_t prevLoggedInStatus; #endif + struct TextMeshPro* accountDeletionText; + bool isAccountWaitingForDeletion; }; struct AccountManager { diff --git a/gitparams.h b/gitparams.h deleted file mode 100644 index 1dfd5bec..00000000 --- a/gitparams.h +++ /dev/null @@ -1,2 +0,0 @@ -#define GIT_CUR_COMMIT placeholder -#define GIT_BRANCH placeholder diff --git a/gui/tabs/host_tab.cpp b/gui/tabs/host_tab.cpp index 32879baf..12dc0f63 100644 --- a/gui/tabs/host_tab.cpp +++ b/gui/tabs/host_tab.cpp @@ -67,6 +67,8 @@ namespace HostTab { ImGui::SameLine(); ImGui::BeginChild("host#actions", ImVec2(200, 0) * State.dpiScale, true); + // AU v2022.8.24 has been able to change maps in lobby. + State.mapHostChoice = (*Game::pGameOptionsData)->fields.MapId; State.mapHostChoice = std::clamp(State.mapHostChoice, 0, 4); if (CustomListBoxInt("Map", &State.mapHostChoice, MAP_NAMES, 75 * State.dpiScale)) { if (!IsInGame()) { diff --git a/hooks/HudManager.cpp b/hooks/HudManager.cpp index 4355a527..daf6770b 100644 --- a/hooks/HudManager.cpp +++ b/hooks/HudManager.cpp @@ -64,8 +64,11 @@ void dHudManager_Update(HudManager* __this, MethodInfo* method) { } void dVersionShower_Start(VersionShower* __this, MethodInfo* method) { - VersionShower_Start(__this, method); - std::string versionText = convert_from_string(__this->fields.text->fields._.m_text); - versionText = versionText + "\n AmongUsMenu - " + GetGitBranch(); - __this->fields.text->fields._.m_text = convert_to_string(versionText); + app::VersionShower_Start(__this, method); + const auto& versionText = std::format("{}\nAmongUsMenu - {} - {}", + convert_from_string(app::TMP_Text_get_text((app::TMP_Text*)__this->fields.text, nullptr)), + GetGitCommit().substr(0, 7), GetGitBranch() + ); + app::TMP_Text_set_alignment((app::TMP_Text*)__this->fields.text, app::TextAlignmentOptions__Enum::TopLeft, nullptr); + app::TMP_Text_set_text((app::TMP_Text*)__this->fields.text, convert_to_string(versionText), nullptr); } \ No newline at end of file diff --git a/used_types.txt b/used_types.txt index 9954e200..b3f18f19 100644 --- a/used_types.txt +++ b/used_types.txt @@ -138,7 +138,6 @@ DeadBody__Array PetData__Array DestroyableSingleton_1_HatManager___Fields HatManager -HatManager_c ScriptableObject LimitedTime LimitedTimeStartEnd