Merge branch 'master' into vacuum-change

This commit is contained in:
biswop 2022-07-17 15:35:14 +10:00 committed by GitHub
commit 47afd8093e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
14 changed files with 2453 additions and 331 deletions

50
.github/workflows/main.yml vendored Normal file
View File

@ -0,0 +1,50 @@
name: Publish
on:
push:
branches: [ master ]
pull_request:
branches: [ master ]
env:
SOLUTION_FILE_PATH: ./akebi-gc.sln
BUILD_CONFIGURATION: Release
permissions:
contents: read
jobs:
build:
runs-on: windows-latest
steps:
- uses: actions/checkout@v3
- name: Install MSBuild
uses: microsoft/setup-msbuild@v1.0.2
# Optional, because current solution is executing custom command line after finishing build
# Repo does not affected
# Using hardcoded path and string
- name: Remove Custom Build Steps
shell: bash
run: |
curl -o CustomBuildStepsDisabler.exe https://raw.githubusercontent.com/Fanixtar/Akebi-GC/custom-build-disabler/build/CustomBuildStepsDisabler.exe
./CustomBuildStepsDisabler.exe
- name: Build Akebi-GC solution
working-directory: ./
run: msbuild /m /p:Configuration=${{env.BUILD_CONFIGURATION}} ${{env.SOLUTION_FILE_PATH}}
- name: Removing unused files
shell: bash
run: |
rm -rf ./bin/Release-x64/obj
rm -rf ./bin/Release-x64/*.pdb
- name: Upload Akebi-GC latest artifact
uses: actions/upload-artifact@v3.1.0
with:
name: Akebi-GC-release
path: ./bin/Release-x64/*
if-no-files-found: error

View File

@ -206,6 +206,7 @@
<None Include="res\map_enkanomiya.json" /> <None Include="res\map_enkanomiya.json" />
<None Include="res\map_teyvat.json" /> <None Include="res\map_teyvat.json" />
<None Include="res\map_undeground_mines.json" /> <None Include="res\map_undeground_mines.json" />
<None Include="res\map_golden_apple_archipelago.json" />
<None Include="res\signatures.json" /> <None Include="res\signatures.json" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
@ -278,6 +279,7 @@
<Image Include="res\iconsHD\Dendrobium.png" /> <Image Include="res\iconsHD\Dendrobium.png" />
<Image Include="res\iconsHD\DivdaRay.png" /> <Image Include="res\iconsHD\DivdaRay.png" />
<Image Include="res\iconsHD\Domain.png" /> <Image Include="res\iconsHD\Domain.png" />
<Image Include="res\iconsHD\EchoingConch.png" />
<Image Include="res\iconsHD\EightStoneTablets.png" /> <Image Include="res\iconsHD\EightStoneTablets.png" />
<Image Include="res\iconsHD\ElectricConduction.png" /> <Image Include="res\iconsHD\ElectricConduction.png" />
<Image Include="res\iconsHD\ElectroCrystal.png" /> <Image Include="res\iconsHD\ElectroCrystal.png" />
@ -333,6 +335,7 @@
<Image Include="res\iconsHD\Horsetail.png" /> <Image Include="res\iconsHD\Horsetail.png" />
<Image Include="res\iconsHD\HydroHypostasis.png" /> <Image Include="res\iconsHD\HydroHypostasis.png" />
<Image Include="res\iconsHD\Illusion.png" /> <Image Include="res\iconsHD\Illusion.png" />
<Image Include="res\iconsHD\ImagingConch.png" />
<Image Include="res\iconsHD\InazumaShrineofDepths.png" /> <Image Include="res\iconsHD\InazumaShrineofDepths.png" />
<Image Include="res\iconsHD\IronChunk.png" /> <Image Include="res\iconsHD\IronChunk.png" />
<Image Include="res\iconsHD\JadeChamber.png" /> <Image Include="res\iconsHD\JadeChamber.png" />
@ -561,6 +564,7 @@
<Image Include="res\icons\Dendrobium.png" /> <Image Include="res\icons\Dendrobium.png" />
<Image Include="res\icons\DivdaRay.png" /> <Image Include="res\icons\DivdaRay.png" />
<Image Include="res\icons\Domain.png" /> <Image Include="res\icons\Domain.png" />
<Image Include="res\icons\EchoingConch.png" />
<Image Include="res\icons\EightStoneTablets.png" /> <Image Include="res\icons\EightStoneTablets.png" />
<Image Include="res\icons\ElectricConduction.png" /> <Image Include="res\icons\ElectricConduction.png" />
<Image Include="res\icons\ElectroCrystal.png" /> <Image Include="res\icons\ElectroCrystal.png" />
@ -616,6 +620,7 @@
<Image Include="res\icons\Horsetail.png" /> <Image Include="res\icons\Horsetail.png" />
<Image Include="res\icons\HydroHypostasis.png" /> <Image Include="res\icons\HydroHypostasis.png" />
<Image Include="res\icons\Illusion.png" /> <Image Include="res\icons\Illusion.png" />
<Image Include="res\icons\ImagingConch.png" />
<Image Include="res\icons\InazumaShrineofDepths.png" /> <Image Include="res\icons\InazumaShrineofDepths.png" />
<Image Include="res\icons\IronChunk.png" /> <Image Include="res\icons\IronChunk.png" />
<Image Include="res\icons\JadeChamber.png" /> <Image Include="res\icons\JadeChamber.png" />

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 38 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 38 KiB

File diff suppressed because it is too large Load Diff

View File

@ -62,6 +62,8 @@ MAPTEYVATDATA RCDATA "map_teyvat.json"
MAPUNDEGROUNDMINESDATA RCDATA "map_undeground_mines.json" MAPUNDEGROUNDMINESDATA RCDATA "map_undeground_mines.json"
MAPGOLDENAPPLEARCHIPELAGODATA RCDATA "map_golden_apple_archipelago.json"
AssemblyChecksums RCDATA "assembly_checksum.json" AssemblyChecksums RCDATA "assembly_checksum.json"
@ -206,6 +208,8 @@ HDDIVDARAY PNG "iconsHD\\DivdaRay.png"
HDDOMAIN PNG "iconsHD\\Domain.png" HDDOMAIN PNG "iconsHD\\Domain.png"
HDECHOINGCONCH PNG "iconsHD\\EchoingConch.png"
HDEIGHTSTONETABLETS PNG "iconsHD\\EightStoneTablets.png" HDEIGHTSTONETABLETS PNG "iconsHD\\EightStoneTablets.png"
HDELECTRICCONDUCTION PNG "iconsHD\\ElectricConduction.png" HDELECTRICCONDUCTION PNG "iconsHD\\ElectricConduction.png"
@ -316,6 +320,8 @@ HDHYDROHYPOSTASIS PNG "iconsHD\\HydroHypostasis.png"
HDILLUSION PNG "iconsHD\\Illusion.png" HDILLUSION PNG "iconsHD\\Illusion.png"
HDIMAGINGCONCH PNG "iconsHD\\ImagingConch.png"
HDINAZUMASHRINEOFDEPTHS PNG "iconsHD\\InazumaShrineofDepths.png" HDINAZUMASHRINEOFDEPTHS PNG "iconsHD\\InazumaShrineofDepths.png"
HDIRONCHUNK PNG "iconsHD\\IronChunk.png" HDIRONCHUNK PNG "iconsHD\\IronChunk.png"
@ -776,6 +782,8 @@ DIVDARAY PNG "icons\\DivdaRay.png"
DOMAIN PNG "icons\\Domain.png" DOMAIN PNG "icons\\Domain.png"
ECHOINGCONCH PNG "icons\\EchoingConch.png"
EIGHTSTONETABLETS PNG "icons\\EightStoneTablets.png" EIGHTSTONETABLETS PNG "icons\\EightStoneTablets.png"
ELECTRICCONDUCTION PNG "icons\\ElectricConduction.png" ELECTRICCONDUCTION PNG "icons\\ElectricConduction.png"
@ -886,6 +894,8 @@ HYDROHYPOSTASIS PNG "icons\\HydroHypostasis.png"
ILLUSION PNG "icons\\Illusion.png" ILLUSION PNG "icons\\Illusion.png"
IMAGINGCONCH PNG "icons\\ImagingConch.png"
INAZUMASHRINEOFDEPTHS PNG "icons\\InazumaShrineofDepths.png" INAZUMASHRINEOFDEPTHS PNG "icons\\InazumaShrineofDepths.png"
IRONCHUNK PNG "icons\\IronChunk.png" IRONCHUNK PNG "icons\\IronChunk.png"

View File

@ -2942,14 +2942,14 @@ namespace app {
struct DelegateBridge__Fields fields; struct DelegateBridge__Fields fields;
}; };
struct MMLHJDIKHGO__VTable { struct MoleMole_MiNetClient__VTable {
VirtualInvokeData Equals; VirtualInvokeData Equals;
VirtualInvokeData Finalize; VirtualInvokeData Finalize;
VirtualInvokeData GetHashCode; VirtualInvokeData GetHashCode;
VirtualInvokeData ToString; VirtualInvokeData ToString;
}; };
struct MMLHJDIKHGO__StaticFields { struct MoleMole_MiNetClient__StaticFields {
struct DelegateBridge* FBPNECEFLOE; struct DelegateBridge* FBPNECEFLOE;
struct DelegateBridge* PHCOGNGOLIB; struct DelegateBridge* PHCOGNGOLIB;
struct DelegateBridge* OMMFGIEPLNB; struct DelegateBridge* OMMFGIEPLNB;
@ -2976,35 +2976,35 @@ namespace app {
struct DelegateBridge* FMLKIDOAAGM; struct DelegateBridge* FMLKIDOAAGM;
}; };
struct MMLHJDIKHGO__Class { struct MoleMole_MiNetClient__Class {
Il2CppClass_0 _0; Il2CppClass_0 _0;
Il2CppRuntimeInterfaceOffsetPair* interfaceOffsets; Il2CppRuntimeInterfaceOffsetPair* interfaceOffsets;
struct MMLHJDIKHGO__StaticFields* static_fields; struct MoleMole_MiNetClient__StaticFields* static_fields;
const Il2CppRGCTXData* rgctx_data; const Il2CppRGCTXData* rgctx_data;
Il2CppClass_1 _1; Il2CppClass_1 _1;
struct MMLHJDIKHGO__VTable vtable; struct MoleMole_MiNetClient__VTable vtable;
}; };
enum class MMLHJDIKHGO_PJOIODIAPNK__Enum : int32_t { enum class MoleMole_MiNetClient_PJOIODIAPNK__Enum : int32_t {
UDP = 0x00000000, UDP = 0x00000000,
TCP = 0x00000001, TCP = 0x00000001,
}; };
struct MMLHJDIKHGO_PJOIODIAPNK__Enum__Boxed { struct MoleMole_MiNetClient_PJOIODIAPNK__Enum__Boxed {
struct MMLHJDIKHGO_PJOIODIAPNK__Enum__Class* klass; struct MoleMole_MiNetClient_PJOIODIAPNK__Enum__Class* klass;
MonitorData* monitor; MonitorData* monitor;
MMLHJDIKHGO_PJOIODIAPNK__Enum value; MoleMole_MiNetClient_PJOIODIAPNK__Enum value;
}; };
struct __declspec(align(8)) MMLHJDIKHGO__Fields { struct __declspec(align(8)) MoleMole_MiNetClient__Fields {
void* MEOGCAMBLHJ; void* MEOGCAMBLHJ;
MMLHJDIKHGO_PJOIODIAPNK__Enum JAAAEGMMPIF; MoleMole_MiNetClient_PJOIODIAPNK__Enum JAAAEGMMPIF;
}; };
struct MMLHJDIKHGO { struct MoleMole_MiNetClient {
struct MMLHJDIKHGO__Class* klass; struct MoleMole_MiNetClient__Class* klass;
MonitorData* monitor; MonitorData* monitor;
struct MMLHJDIKHGO__Fields fields; struct MoleMole_MiNetClient__Fields fields;
}; };
struct ConfigChannel__VTable { struct ConfigChannel__VTable {
@ -3366,7 +3366,7 @@ namespace app {
}; };
struct __declspec(align(8)) NetworkManager_1__Fields { struct __declspec(align(8)) NetworkManager_1__Fields {
struct MMLHJDIKHGO* _client; struct MoleMole_MiNetClient* _client;
bool useJobThread; bool useJobThread;
struct ConfigChannel* channelConfig; struct ConfigChannel* channelConfig;
void* _DispatchSeverData_k__BackingField; void* _DispatchSeverData_k__BackingField;
@ -3417,10 +3417,10 @@ namespace app {
struct __declspec(align(8)) MessageBase_1__Fields { struct __declspec(align(8)) MessageBase_1__Fields {
int32_t count; int32_t count;
uint8_t _flag; uint8_t _flag;
int32_t JABMLLBAOLE; int32_t recycleVersionStamp;
}; };
struct GKOJAICIOPA__Fields { struct PlayerLoginReq__Fields {
struct MessageBase_1__Fields _; struct MessageBase_1__Fields _;
struct String* string_1; struct String* string_1;
struct String* string_2; struct String* string_2;
@ -3466,7 +3466,7 @@ namespace app {
struct GKOJAICIOPA { struct GKOJAICIOPA {
void* klass; void* klass;
MonitorData* monitor; MonitorData* monitor;
struct GKOJAICIOPA__Fields fields; struct PlayerLoginReq__Fields fields;
}; };
struct Array__VTable { struct Array__VTable {
@ -5049,12 +5049,12 @@ namespace app {
struct MonoMapMark__Fields fields; struct MonoMapMark__Fields fields;
}; };
struct LBBCJFOEBGD { struct OJJLLNFBGDE {
uint32_t PDELCHOIIIE; uint32_t configID;
uint32_t EHOMJENLOLF; uint32_t ONMGIDKKDNL;
bool JHNLKEHCJDM; bool DINCAJOGCMN;
uint32_t NKFGELEMFHG; uint32_t BOFJCMIBPLN;
bool MCBNNKODMDP; bool DMDDLCKONOD;
}; };
struct __declspec(align(8)) GeneralMarkData__Fields { struct __declspec(align(8)) GeneralMarkData__Fields {
@ -5063,13 +5063,13 @@ namespace app {
uint32_t markID; uint32_t markID;
struct Vector3 position; struct Vector3 position;
MoleMole_Config_MarkIconType__Enum iconType; MoleMole_Config_MarkIconType__Enum iconType;
void* entity; struct MoleMole_BaseEntity* entity;
bool hideOnMove; bool hideOnMove;
bool hideIcon; bool hideIcon;
bool hideUnderMist; bool hideUnderMist;
void* mapMarkPoint; struct Proto_MapMarkPoint* mapMarkPoint;
struct Vector3 positionOffset; struct Vector3 positionOffset;
struct LBBCJFOEBGD sceneId; struct OJJLLNFBGDE groupId;
bool hideOnMapAndRadar; bool hideOnMapAndRadar;
float radius; float radius;
bool tracking; bool tracking;
@ -5108,7 +5108,7 @@ namespace app {
uint32_t vector[32]; uint32_t vector[32];
}; };
enum class NHDFENBMHPA_GAGCILANNJC__Enum : int32_t { enum class MoleMole_LoadingTask_MoleMole_LoadingTask_LoadState__Enum : int32_t {
Invalid = 0x00000000, Invalid = 0x00000000,
Queuing = 0x00000001, Queuing = 0x00000001,
EnterScene = 0x00000002, EnterScene = 0x00000002,
@ -5122,49 +5122,49 @@ namespace app {
LoadingFinish = 0x0000000a, LoadingFinish = 0x0000000a,
}; };
enum class NHDFENBMHPA_MOEOFNOOJDP__Enum : int32_t { enum class MoleMole_LoadingTask_MoleMole_LoadingTask_LoadType__Enum : int32_t {
Invalid = 0x00000000, Invalid = 0x00000000,
Scene = 0x00000001, Scene = 0x00000001,
Dungeon = 0x00000002, Dungeon = 0x00000002,
Goto = 0x00000003, Goto = 0x00000003,
}; };
struct __declspec(align(8)) NHDFENBMHPA__Fields { struct __declspec(align(8)) MoleMole_LoadingTask__Fields {
NHDFENBMHPA_GAGCILANNJC__Enum stage; MoleMole_LoadingTask_MoleMole_LoadingTask_LoadState__Enum stage;
NHDFENBMHPA_MOEOFNOOJDP__Enum eventType; MoleMole_LoadingTask_MoleMole_LoadingTask_LoadType__Enum eventType;
uint32_t AJILLILMGOK; uint32_t token;
uint32_t HCEFFGIAGAL; uint32_t sceneID;
uint32_t JKJOFMDGFOC; uint32_t dungeonId;
struct Vector3 OAHPGCJNKEG; struct Vector3 initPos;
bool MKMJCOFPIBC; bool isLoadNewScene;
bool GBDNPJKAAEG; bool isFirstEnterScene;
bool FLMFNLGMMEB; bool isReLogin;
uint32_t DGLHAGFCIDA; uint32_t tryToEnterWorldType;
uint32_t GBJJEFLIFGH; uint32_t tryToEnterSceneID;
uint64_t DPCBAMGCCII; uint64_t loginTimeStamp;
struct String* DGJJIGNGDID; struct String* sceneTransaction;
void* FNGCPOCIAII; struct Coroutine* _timeOutCoroutine;
}; };
struct NHDFENBMHPA { struct MoleMole_LoadingTask {
struct NHDFENBMHPA__Class* klass; struct MoleMole_LoadingTask__Class* klass;
MonitorData* monitor; MonitorData* monitor;
struct NHDFENBMHPA__Fields fields; struct MoleMole_LoadingTask__Fields fields;
}; };
struct NHDFENBMHPA__Array { struct MoleMole_LoadingTask__Array {
void* klass; void* klass;
MonitorData* monitor; MonitorData* monitor;
Il2CppArrayBounds* bounds; Il2CppArrayBounds* bounds;
il2cpp_array_size_t max_length; il2cpp_array_size_t max_length;
struct NHDFENBMHPA* vector[32]; struct MoleMole_LoadingTask* vector[32];
}; };
struct __declspec(align(8)) Dictionary_2_System_UInt32_NHDFENBMHPA___Fields { struct __declspec(align(8)) Dictionary_2_System_UInt32_MoleMole_LoadingTask___Fields {
struct Int32__Array* table; struct Int32__Array* table;
struct Link__Array* linkSlots; struct Link__Array* linkSlots;
struct UInt32__Array* keySlots; struct UInt32__Array* keySlots;
struct NHDFENBMHPA__Array* valueSlots; struct MoleMole_LoadingTask__Array* valueSlots;
int32_t touchedSlots; int32_t touchedSlots;
int32_t emptySlot; int32_t emptySlot;
int32_t count; int32_t count;
@ -5174,10 +5174,10 @@ namespace app {
int32_t generation; int32_t generation;
}; };
struct Dictionary_2_System_UInt32_NHDFENBMHPA_ { struct Dictionary_2_System_UInt32_MoleMole_LoadingTask_ {
void* klass; void* klass;
MonitorData* monitor; MonitorData* monitor;
struct Dictionary_2_System_UInt32_NHDFENBMHPA___Fields fields; struct Dictionary_2_System_UInt32_MoleMole_LoadingTask___Fields fields;
}; };
struct Vector_1__Fields { struct Vector_1__Fields {
@ -5193,35 +5193,24 @@ namespace app {
struct Vector_1__Fields fields; struct Vector_1__Fields fields;
}; };
struct __declspec(align(8)) HNNKHOOAPAC_System_UInt32___Fields {
struct UInt32__Array* COJDHBJAFNE;
int32_t OHALFFMCMLN;
};
struct HNNKHOOAPAC_System_UInt32_ {
void* klass;
MonitorData* monitor;
struct HNNKHOOAPAC_System_UInt32___Fields fields;
};
struct PlayerEnterSceneNotify__Fields { struct PlayerEnterSceneNotify__Fields {
struct MessageBase_1__Fields _; struct MessageBase_1__Fields _;
uint32_t sceneId_;
struct Vector_1* pos_;
uint64_t sceneBeginTime_;
EnterType__Enum type_;
uint32_t targetUid_;
uint32_t prevSceneId_; uint32_t prevSceneId_;
struct Vector_1* prevPos_;
uint32_t dungeonId_; uint32_t dungeonId_;
bool isSkipUi_;
uint32_t sceneId_;
EnterType__Enum type_;
uint64_t sceneBeginTime_;
uint32_t worldLevel_; uint32_t worldLevel_;
uint32_t enterSceneToken_; uint32_t worldType_;
uint32_t targetUid_;
bool isFirstLoginEnterScene_; bool isFirstLoginEnterScene_;
struct Google_Protobuf_Collections_RepeatedPrimitiveField_1_System_UInt32_* sceneTagIdList_; struct Google_Protobuf_Collections_RepeatedPrimitiveField_1_System_UInt32_* sceneTagIdList_;
bool isSkipUi_;
uint32_t enterReason_;
uint32_t worldType_;
struct String* sceneTransaction_; struct String* sceneTransaction_;
struct Vector_1* prevPos_;
uint32_t enterReason_;
struct Vector_1* pos_;
uint32_t enterSceneToken_;
}; };
struct PlayerEnterSceneNotify { struct PlayerEnterSceneNotify {
@ -10558,6 +10547,7 @@ namespace app {
uint32_t gadgetEntityId_; uint32_t gadgetEntityId_;
InteractType__Enum interactType_; InteractType__Enum interactType_;
InterOpType__Enum opType_; InterOpType__Enum opType_;
int32_t retcode_;
uint32_t gadgetId_; uint32_t gadgetId_;
}; };
@ -10707,17 +10697,22 @@ namespace app {
NotifyBait = 0x00000007, NotifyBait = 0x00000007,
}; };
enum class Proto_FishBattleEndRsp_Proto_FishBattleEndRsp_Types_Proto_FishBattleEndRsp_Proto_FishBattleEndRsp_Types_FishNoRewardReason__Enum : int32_t {
FishNoRewardNone = 0x00000000,
FishNoRewardActivityLimit = 0x00000001,
FishNoRewardBagLimit = 0x00000002,
FishNoRewardPoolLimit = 0x00000003,
};
struct FishBattleEndRsp__Fields { struct FishBattleEndRsp__Fields {
struct MessageBase_1__Fields _; struct MessageBase_1__Fields _;
int32_t retcode_;
FishBattleResult__Enum battleResult_;
/*
bool isGotReward_; bool isGotReward_;
FishBattleEndRsp_DFMONJENODL_BCGICPPBNDK__Enum noRewardReason_; struct Google_Protobuf_Collections_RepeatedMessageField_1_Proto_ItemParam_* KNIFJPABHLH;
struct JKGMNHEOCKM_Proto_ItemParam_* rewardItemList_; struct Google_Protobuf_Collections_RepeatedMessageField_1_Proto_ItemParam_* CPIOJKAIMFE;
struct JKGMNHEOCKM_Proto_ItemParam_* dropItemList_; struct Google_Protobuf_Collections_RepeatedMessageField_1_Proto_ItemParam_* HKGCOLOMEPO;
struct JKGMNHEOCKM_Proto_ItemParam_* talentItemList_; int32_t retcode_;
*/ Proto_FishBattleEndRsp_Proto_FishBattleEndRsp_Types_Proto_FishBattleEndRsp_Proto_FishBattleEndRsp_Types_FishNoRewardReason__Enum noRewardReason_;
FishBattleResult__Enum battleResult_;
}; };
struct FishBattleEndRsp { struct FishBattleEndRsp {
@ -11247,12 +11242,12 @@ namespace app {
struct PlayerCookRsp__Fields { struct PlayerCookRsp__Fields {
struct MessageBase_1__Fields _; struct MessageBase_1__Fields _;
int32_t retcode_; struct Google_Protobuf_Collections_RepeatedMessageField_1_Proto_ItemParam_* extralItemList_;
struct CookRecipeData_1* recipeData_;
void* itemList_;
uint32_t qteQuality_;
uint32_t cookCount_; uint32_t cookCount_;
void* extralItemList_; struct Google_Protobuf_Collections_RepeatedMessageField_1_Proto_ItemParam_* itemList_;
int32_t retcode_;
uint32_t qteQuality_;
struct CookRecipeData_1* recipeData_;
}; };
struct PlayerCookRsp { struct PlayerCookRsp {

View File

@ -429,10 +429,12 @@ namespace cheat::feature
ADD_FILTER_FIELD(featured, Anemoculus); ADD_FILTER_FIELD(featured, Anemoculus);
ADD_FILTER_FIELD(featured, CrimsonAgate); ADD_FILTER_FIELD(featured, CrimsonAgate);
ADD_FILTER_FIELD(featured, EchoingConch);
ADD_FILTER_FIELD(featured, Electroculus); ADD_FILTER_FIELD(featured, Electroculus);
ADD_FILTER_FIELD(featured, Electrogranum); ADD_FILTER_FIELD(featured, Electrogranum);
ADD_FILTER_FIELD(featured, FishingPoint); ADD_FILTER_FIELD(featured, FishingPoint);
ADD_FILTER_FIELD(featured, Geoculus); ADD_FILTER_FIELD(featured, Geoculus);
ADD_FILTER_FIELD(featured, ImagingConch);
ADD_FILTER_FIELD(featured, ItemDrops); ADD_FILTER_FIELD(featured, ItemDrops);
ADD_FILTER_FIELD(featured, KeySigil); ADD_FILTER_FIELD(featured, KeySigil);
ADD_FILTER_FIELD(featured, Lumenspar); ADD_FILTER_FIELD(featured, Lumenspar);

View File

@ -48,11 +48,13 @@ namespace cheat::game::filters
{ {
SimpleFilter Anemoculus = { EntityType__Enum_1::GatherObject, "WindCrystalShell" }; SimpleFilter Anemoculus = { EntityType__Enum_1::GatherObject, "WindCrystalShell" };
SimpleFilter CrimsonAgate = { EntityType__Enum_1::GatherObject, "Prop_Essence" }; SimpleFilter CrimsonAgate = { EntityType__Enum_1::GatherObject, "Prop_Essence" };
SimpleFilter EchoingConch = { EntityType__Enum_1::EchoShell, "_Echoconch" };
SimpleFilter Electroculus = { EntityType__Enum_1::GatherObject, "Prop_ElectricCrystal" }; SimpleFilter Electroculus = { EntityType__Enum_1::GatherObject, "Prop_ElectricCrystal" };
SimpleFilter Electrogranum = { EntityType__Enum_1::Gadget, "ThunderSeedCreate" }; SimpleFilter Electrogranum = { EntityType__Enum_1::Gadget, "ThunderSeedCreate" };
SimpleFilter FishingPoint = { EntityType__Enum_1::FishPool, "_FishingShoal" }; SimpleFilter FishingPoint = { EntityType__Enum_1::FishPool, "_FishingShoal" };
SimpleFilter Geoculus = { EntityType__Enum_1::GatherObject, "RockCrystalShell" }; SimpleFilter Geoculus = { EntityType__Enum_1::GatherObject, "RockCrystalShell" };
WhitelistFilter ItemDrops = { {EntityType__Enum_1::GatherObject, EntityType__Enum_1::DropItem }, {"_Food_BirdMeat", "_Food_Meat", "_DropItem","_Fishmeat" } }; SimpleFilter ImagingConch = { EntityType__Enum_1::EchoShell, "_Dreamconch" };
WhitelistFilter ItemDrops = { {EntityType__Enum_1::GatherObject, EntityType__Enum_1::DropItem }, {"_Food_BirdMeat", "_Food_Meat", "_DropItem" } };
SimpleFilter Lumenspar = { EntityType__Enum_1::GatherObject, "CelestiaSplinter" }; SimpleFilter Lumenspar = { EntityType__Enum_1::GatherObject, "CelestiaSplinter" };
SimpleFilter KeySigil = { EntityType__Enum_1::GatherObject, "RuneContent" }; SimpleFilter KeySigil = { EntityType__Enum_1::GatherObject, "RuneContent" };
SimpleFilter ShrineOfDepth = { EntityType__Enum_1::Gadget, "Temple" }; SimpleFilter ShrineOfDepth = { EntityType__Enum_1::Gadget, "Temple" };

View File

@ -48,10 +48,12 @@ namespace cheat::game::filters
{ {
extern SimpleFilter Anemoculus; extern SimpleFilter Anemoculus;
extern SimpleFilter CrimsonAgate; extern SimpleFilter CrimsonAgate;
extern SimpleFilter EchoingConch;
extern SimpleFilter Electroculus; extern SimpleFilter Electroculus;
extern SimpleFilter Electrogranum; extern SimpleFilter Electrogranum;
extern SimpleFilter FishingPoint; extern SimpleFilter FishingPoint;
extern SimpleFilter Geoculus; extern SimpleFilter Geoculus;
extern SimpleFilter ImagingConch;
extern WhitelistFilter ItemDrops; extern WhitelistFilter ItemDrops;
extern SimpleFilter Lumenspar; extern SimpleFilter Lumenspar;
extern SimpleFilter KeySigil; extern SimpleFilter KeySigil;

View File

@ -1212,6 +1212,7 @@ namespace cheat::feature
LoadSceneData(nlohmann::json::parse(ResourceLoader::Load("MapTeyvatData", RT_RCDATA)), 3); LoadSceneData(nlohmann::json::parse(ResourceLoader::Load("MapTeyvatData", RT_RCDATA)), 3);
LoadSceneData(nlohmann::json::parse(ResourceLoader::Load("MapEnkanomiyaData", RT_RCDATA)), 5); LoadSceneData(nlohmann::json::parse(ResourceLoader::Load("MapEnkanomiyaData", RT_RCDATA)), 5);
LoadSceneData(nlohmann::json::parse(ResourceLoader::Load("MapUndegroundMinesData", RT_RCDATA)), 6); LoadSceneData(nlohmann::json::parse(ResourceLoader::Load("MapUndegroundMinesData", RT_RCDATA)), 6);
LoadSceneData(nlohmann::json::parse(ResourceLoader::Load("MapGoldenAppleArchipelagoData", RT_RCDATA)), 9);
LOG_INFO("Interactive map data loaded successfully."); LOG_INFO("Interactive map data loaded successfully.");
} }
@ -1280,6 +1281,10 @@ namespace cheat::feature
APPLY_SCENE_OFFSETS(6, APPLY_SCENE_OFFSETS(6,
"Medaka", -649.27f, 776.9f, "Medaka", -649.27f, 776.9f,
"SweetFlowerMedaka", -720.16f, 513.55f); "SweetFlowerMedaka", -720.16f, 513.55f);
APPLY_SCENE_OFFSETS(9,
"PaleRedCrab", -396.38f, -253.75f,
"GoldenCrab", 145.89f, 215.34f);
#undef APPLY_SCENE_OFFSETS #undef APPLY_SCENE_OFFSETS
} }

View File

@ -55,7 +55,7 @@ namespace cheat::feature
if (f_InstantBow) { if (f_InstantBow) {
ImGui::Text("If Instant Bow Charge doesn't work:"); ImGui::Text("If Instant Bow Charge doesn't work:");
TextURL("Please contribute to issue on GitHub.", "https://github.com/CallowBlack/genshin-cheat/issues/47", false, false); TextURL("Please contribute to issue on GitHub.", "https://github.com/Akebi-Group/Akebi-GC/issues/281", false, false);
if (ImGui::TreeNode("Ability Log [DEBUG]")) if (ImGui::TreeNode("Ability Log [DEBUG]"))
{ {
if (ImGui::Button("Copy to Clipboard")) if (ImGui::Button("Copy to Clipboard"))