last sync

This commit is contained in:
Akbar Yahya 2023-04-09 15:56:27 +08:00
parent 947c8e5a7b
commit 54c575d7d7
47 changed files with 2484 additions and 3856 deletions

View File

@ -577,8 +577,6 @@ public class PacketOpcodes {
public static final int GetAllActivatedBargainDataRsp = 457;
public static final int GetAllH5ActivityInfoReq = 5693;
public static final int GetAllH5ActivityInfoRsp = 5698;
public static final int GetAllMailReq = 1459;
public static final int GetAllMailRsp = 1407;
public static final int GetAllSceneGalleryInfoReq = 5572;
public static final int GetAllSceneGalleryInfoRsp = 5582;
public static final int GetAllUnlockNameCardReq = 4046;

4792
cmdid.json

File diff suppressed because it is too large Load Diff

View File

@ -2283,14 +2283,6 @@
"name": "GetAllH5ActivityInfoRsp",
"id": 5698
},
{
"name": "GetAllMailReq",
"id": 1459
},
{
"name": "GetAllMailRsp",
"id": 1407
},
{
"name": "GetAllSceneGalleryInfoReq",
"id": 5572

View File

@ -2283,14 +2283,6 @@
"name": "GetAllH5ActivityInfoRsp",
"id": 5698
},
{
"name": "GetAllMailReq",
"id": 1459
},
{
"name": "GetAllMailRsp",
"id": 1407
},
{
"name": "GetAllSceneGalleryInfoReq",
"id": 5572

File diff suppressed because it is too large Load Diff

View File

@ -182,6 +182,9 @@
{
"name": "GadgetInteractReq"
},
{
"name": "PlatformInfo"
},
{
"name": "GadgetBornType"
},
@ -221,6 +224,12 @@
{
"name": "WorktopInfo"
},
{
"name": "MathQuaternion"
},
{
"name": "MovingPlatformType"
},
{
"name": "FightPropPair"
},
@ -305,6 +314,15 @@
{
"name": "Weapon"
},
{
"name": "EquipParam"
},
{
"name": "MailCollectState"
},
{
"name": "MailTextContent"
},
{
"name": "BlossomBriefInfo"
},
@ -627,7 +645,7 @@
"name": "GetActivityShopSheetInfoReq"
},
{
"name": "GetAllMailReq"
"name": "GetAllMailNotify"
},
{
"name": "GetDailyDungeonEntryInfoReq"
@ -980,6 +998,9 @@
{
"name": "WidgetSlotTag"
},
{
"name": "AntiAddictNotify"
},
{
"name": "AskAddFriendNotify"
},
@ -1344,19 +1365,7 @@
"name": "GetActivityShopSheetInfoRsp"
},
{
"name": "EquipParam"
},
{
"name": "GetAllMailRsp"
},
{
"name": "MailData"
},
{
"name": "MailItem"
},
{
"name": "MailTextContent"
"name": "GetAllMailResultNotify"
},
{
"name": "GetAllUnlockNameCardRsp"
@ -1517,6 +1526,12 @@
{
"name": "MailChangeNotify"
},
{
"name": "MailData"
},
{
"name": "MailItem"
},
{
"name": "MarkNewNotify"
},
@ -1562,6 +1577,9 @@
{
"name": "PingRsp"
},
{
"name": "PlatformChangeRouteNotify"
},
{
"name": "PlatformStartRouteNotify"
},
@ -1677,10 +1695,10 @@
"name": "QueryCodexMonsterBeKilledNumRsp"
},
{
"name": "QueryPathRsp"
"name": "PathStatusType"
},
{
"name": "PathStatusType"
"name": "QueryPathRsp"
},
{
"name": "QuestCreateEntityRsp"

2
op.js
View File

@ -981,7 +981,7 @@ function cmdid_json_to_csv() {
console.log("CSV file written successfully");
}
cmdid_json_to_csv();
//cmdid_json_to_csv();
// Update GC Proto
// get_cmdid_gc(); // 1. get cmd old gc
// read_cmdid_ht_json(); // 2 or

View File

@ -14,12 +14,12 @@ import "WidgetSlotData.proto";
// Name: OMFAFJLJDPM
// CmdId: 4300
message AllWidgetDataNotify {
repeated WidgetCoolDownData coolDownGroupDataList = 7;
repeated WidgetCoolDownData coolDownGroupDataList = 7; // LCFJGCFMBPH
LunchBoxData lunch_box_data = 10;
repeated OneoffGatherPointDetectorData oneoff_gather_point_detector_data_list = 9;
repeated ClientCollectorData client_collector_data_list = 12;
WeatherWizardData weather_wizard_data = 15;
repeated WidgetCoolDownData normalCoolDownDataList = 13;
repeated WidgetCoolDownData normalCoolDownDataList = 13; // PNKCMCMHCPL
repeated WidgetSlotData slot_list = 4;
uint32 next_anchor_point_usable_time = 8;
SkyCrystalDetectorData sky_crystal_detector_data = 3;

View File

@ -4,10 +4,10 @@ option java_package = "emu.grasscutter.net.proto";
// Name: KPDGACKMNJA
message AttackHitEffectResult {
uint32 Unk3300_KLNGDAMMFIF = 10; // NCIHLNFLAAF
float airStrength = 6;
uint32 Unk3300_LCKECJCKKJK = 3; // LDDDDFHEMBA
float hitHaltTime = 15;
float retreatStrength = 4;
float hitHaltTimeScale = 7;
float hitHaltTime = 14; //OGEJIAIJMDB
float airStrength = 7; //AKLACKOIKOE
uint32 NCIHLNFLAAF = 10;
float retreatStrength = 4; //PFNLKOMLOIO
float hitHaltTimeScale = 2; //JLEGJBGOHHP
uint32 LDDDDFHEMBA = 3;
}

View File

@ -3,8 +3,8 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
import "AbilityIdentifier.proto";
import "AttackHitEffectResult.proto";
import "HitCollision.proto";
import "AttackHitEffectResult.proto";
import "Vector.proto";
// Name: PKHKLDLFMBJ
@ -22,7 +22,7 @@ message AttackResult {
float GCKKIKJLCKG = 1030;
uint32 GFAODFMIIIB = 278;
float AEIPHPGEFAN = 474;
AttackHitEffectResult hit_eff_result = 7; // Correct
AttackHitEffectResult hit_eff_result = 10;
uint32 IPPPOLACNMI = 13;
bool ANNLKCIDPEC = 1534;
uint32 attacker_id = 2;
@ -30,7 +30,7 @@ message AttackResult {
bool JKJBOKBIIBI = 196;
string anim_event_id = 5;
Vector resolved_dir = 15;
HitCollision hit_collision = 10; //???
HitCollision hit_collision = 7;
uint32 BIHIHLDIPOK = 6;
uint32 element_type = 4;
uint32 OOLJHPBLPDL = 352;

View File

@ -7,7 +7,7 @@ option java_package = "emu.grasscutter.net.proto";
// CmdId: 4146
message CardProductRewardNotify {
uint32 hcoin = 2;
uint32 remainDays = 6;
uint32 remain_days = 6;
string product_id = 15;
}

View File

@ -2,10 +2,8 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
// Name: CPBMIAMDLPE
enum ChangeEnergyReason {
CHANGE_ENERGY_REASON_NONE = 0;
CHANGE_ENERGY_REASON_SKILL_START = 1;
}

View File

@ -36,3 +36,4 @@ enum ChangeHpReason {
CHANGE_HP_REASON_ADD_TRIAL_AVATAR_ACTIVITY = 108;
CHANGE_HP_REASON_ADD_ROGUELIKE_SPRING = 109;
}

View File

@ -10,17 +10,17 @@ message ChapterStateNotify {
// Name: POAIPEHKEHE > NeedPlayerLevel
message NeedPlayerLevel {
bool is_limit = 12;
uint32 configNeedPlayerLevel = 11;
uint32 configNeedPlayerLevel = 11; //PJDJCBIINIC
}
// Name: OKNHDJOIJFI > NeedBeginTime
message NeedBeginTime {
bool is_limit = 10;
uint32 configNeedBeginTime = 3;
uint32 configNeedBeginTime = 3; //LENAHOJKKFP
}
NeedBeginTime needBeginTime = 14;
NeedBeginTime need_begin_time = 14; //JFOHACAIDHE
uint32 chapter_id = 7;
ChapterState chapter_state = 10;
NeedPlayerLevel needPlayerLevel = 8;
NeedPlayerLevel need_player_level = 8; //HIJBMEKPPKJ
}

View File

@ -2,9 +2,11 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
// Name: DDGEINCPPIK
message ChildQuest {
uint32 state = 1;
uint32 quest_config_id = 14;
uint32 quest_id = 8;
}

View File

@ -7,11 +7,11 @@ import "ItemParam.proto";
// Name: BKPBJLHMEIG
// CmdId: 637
message CombineRsp {
repeated ItemParam totalReturnItemList = 9;
repeated ItemParam totalExtraItemList = 13;
repeated ItemParam result_item_list = 9; //NOBMIMNDGLA
repeated ItemParam totalRandomItemList = 13; // AKCCLGFBJMD
uint64 avatar_guid = 10;
repeated ItemParam totalRandomItemList = 6;
repeated ItemParam resultItemList = 14;
repeated ItemParam total_return_item_list = 6; //LOCKHJBEGDL
repeated ItemParam totalExtraItemList = 14; // INKENHANDMB
repeated ItemParam cost_item_list = 5;
uint32 combine_count = 1;
int32 retcode = 7;

View File

@ -5,9 +5,9 @@ option java_package = "emu.grasscutter.net.proto";
// Name: HKALLDBLCCJ
message CompoundQueueData {
uint32 outputTime = 15;
uint32 waitCount = 5;
uint32 outputCount = 11;
uint32 outputTime = 15; // OKEOKOHAJBL
uint32 waitCount = 5; // OBDIHDNMJJI
uint32 outputCount = 11; // EMJEOIBIOIG
uint32 compound_id = 14;
}

View File

@ -12,10 +12,10 @@ import "StrengthenPointData.proto";
// Name: CHPLAGEPIEC
// CmdId: 956
message DungeonChallengeFinishNotify {
uint32 challengeRecordType = 1;
uint32 challengeRecordType = 1; // GIDCANHMHNG
uint32 challenge_index = 11;
ChallengeFinishType finish_type = 10;
uint32 currentValue = 15;
uint32 currentValue = 15; // LLGLNCOOMPM
bool is_success = 4;
map<uint32, StrengthenPointData> strengthen_point_data_map = 6;
uint32 time_cost = 3;

View File

@ -0,0 +1,13 @@
syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
import "ExhibitionDisplayInfo.proto";
import "OnlinePlayerInfo.proto";
// Name: DPACDAIBBIL
message DungeonSettleExhibitionInfo {
repeated ExhibitionDisplayInfo card_list = 13;
OnlinePlayerInfo player_info = 4;
}

View File

@ -6,6 +6,7 @@ import "ParamList.proto";
import "StrengthenPointData.proto";
import "TowerLevelEndNotify.proto";
import "TrialAvatarFirstPassDungeonNotify.proto";
import "DungeonSettleExhibitionInfo.proto";
// Name: FFCKLBMMNOC
// CmdId: 950
@ -13,12 +14,13 @@ message DungeonSettleNotify {
uint32 dungeon_id = 4;
uint32 use_time = 7;
uint32 close_time = 11;
uint32 createPlayerUid = 10;
uint32 result = 10; //CFMPHBBHMBL
repeated uint32 fail_cond_list = 3;
map<uint32, ParamList> settleShow = 14;
repeated DungeonSettleExhibitionInfo exhibition_info_list = 14; //DPACDAIBBIL
map<uint32, ParamList> settleShow = 6; //map<uint32, MBLNIKHFGKN> NLEILHLODMF
map<uint32, StrengthenPointData> strengthen_point_data_map = 9;
bool is_success = 15;
uint32 result = 12;
uint32 create_player_uid = 12; //IHBGNOACKJJ
oneof detail {
// Type Event
TowerLevelEndNotify tower_level_end_notify = 771;

View File

@ -2,8 +2,8 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
import "ChangeHpReason.proto";
import "ChangeEnergyReason.proto";
import "ChangeHpReason.proto";
import "PropChangeReason.proto";
// Name: CGLFHNCCBKJ

View File

@ -8,7 +8,7 @@ option java_package = "emu.grasscutter.net.proto";
message EvtAvatarStandUpNotify {
uint64 chair_id = 5;
uint32 entity_id = 4;
int32 performId = 7;
int32 direction = 1;
int32 performId = 7; // HKCNKFCDGIP
int32 direction = 1; // DBKDLMNLNKM
}

View File

@ -9,7 +9,7 @@ import "Vector.proto";
// CmdId: 314
message EvtCreateGadgetNotify {
bool FGMFGIKBNPJ = 7;
bool isPeerIdFromPlayer = 14;
bool ILAPAEOJDPE = 14;
uint64 guid = 15;
Vector InitPos = 5; // FFLCDJCOGIM
ForwardType forward_type = 3;
@ -17,7 +17,7 @@ message EvtCreateGadgetNotify {
uint32 entity_id = 6;
uint32 JKHNMNELMJL = 9;
uint32 owner_entity_id = 10;
bool is_async_load = 1128;
bool is_async_load = 1128; // KEDBNJGFGOI
uint32 room_id = 11;
uint32 camp_id = 8;
uint32 config_id = 2;
@ -25,7 +25,7 @@ message EvtCreateGadgetNotify {
repeated uint32 target_lock_point_index_list = 582;
repeated uint32 target_entity_id_list = 1945;
uint32 target_entity_id = 12;
bool Unk3300_EJNBIGLGMII = 1628;
bool is_peer_id_from_player = 1628;
Vector InitEulerAngles = 13; // GPKIAACNNCF
}

View File

@ -0,0 +1,12 @@
syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
// Name: ABMCDDFMBOC
message ExhibitionDisplayInfo {
uint32 id = 1;
uint32 param = 2;
uint32 detail_param = 3;
}

View File

@ -5,12 +5,12 @@ option java_package = "emu.grasscutter.net.proto";
// Name: DBDNABMNFAO
message ForgeQueueData {
uint32 queueId = 11;
uint32 finish_count = 11; //NEGHCLJNONO
uint32 avatar_id = 13;
uint32 forge_id = 3;
uint32 unfinishCount = 6;
uint32 finishCount = 5;
uint32 nextFinishTimestamp = 2;
uint32 totalFinishTimestamp = 10;
uint32 queue_id = 6; //IJIGJHCPBIO
uint32 next_finish_timestamp = 5; //DPLHKMGEIKA
uint32 unfinish_count = 2; //GFMEEGMBJKI
uint32 total_finish_timestamp = 10; //KOLFAOPJMFA
}

View File

@ -9,9 +9,9 @@ import "ItemParam.proto";
// CmdId: 688
message ForgeQueueManipulateRsp {
int32 retcode = 4;
repeated ItemParam extraOutputItemList = 13;
repeated ItemParam extra_output_item_list = 13; //LJGHMOMAFGD
ForgeQueueManipulateType manipulate_type = 8;
repeated ItemParam returnItemList = 3;
repeated ItemParam outputItemList = 11;
repeated ItemParam output_item_list = 3; //PODPGGGOFGP
repeated ItemParam return_item_list = 11; //CBLILOJFLPO
}

View File

@ -7,8 +7,8 @@ option java_package = "emu.grasscutter.net.proto";
message FurnitureMakeData {
uint32 avatar_id = 5;
uint32 begin_time = 3;
uint32 durTime = 15;
uint32 accelerateTime = 6;
uint32 durTime = 15; // LIECEPODMCI
uint32 accelerateTime = 6; // KHGHPIBGLNO
uint32 index = 12;
uint32 make_id = 4;
}

View File

@ -12,6 +12,6 @@ message GetAllMailResultNotify {
repeated MailData mail_list = 10;
string transaction = 5;
bool is_collected = 8;
uint32 packet_num = 13;
uint32 packet_num = 13; //GKAOFKGNGGO
}

View File

@ -2,15 +2,14 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
import "Vector.proto";
import "HitColliderType.proto";
import "Vector.proto";
// Name: CPAKHCFDGLO
message HitCollision {
float attackeeHitForceAngle = 7;
float attackeeHitForceAngle = 7; // FCBNNPNJOHM
Vector hit_point = 5;
float attackeeHitEntityAngle = 9;
float attackeeHitEntityAngle = 9; // LFNEGKFGIIE
int32 hit_box_index = 2;
Vector hit_dir = 4;
HitColliderType hit_collider_type = 8;

View File

@ -6,11 +6,11 @@ import "ItemParam.proto";
// Name: KACCHOBDCLB
message HomeLimitedShopGoods {
uint32 KCHMFBKCLKO = 5;
uint32 LLJPJOEMPFE = 12;
uint32 FGACANHEBMH = 11;
uint32 bought_num = 5; //KCHMFBKCLKO
uint32 disable_type = 12; //LLJPJOEMPFE
uint32 buy_limit = 11; //FGACANHEBMH
ItemParam goods_item = 2;
repeated ItemParam cost_item_list = 6;
uint32 GOMAIIJPDKD = 14;
uint32 goods_id = 14; //GOMAIIJPDKD
}

View File

@ -6,10 +6,10 @@ import "Vector.proto";
// Name: ILEIPGLHFAP
message HomeLimitedShopInfo {
uint32 nextGuestOpenTime = 12;
uint32 nextOpenTime = 11;
uint32 nextGuestOpenTime = 12; // CLCPIJBAOEA
uint32 nextOpenTime = 11; // PGENOLMDFEM
Vector djinn_pos = 1; //CKJKPEEKOGG
uint32 nextCloseTime = 6;
uint32 nextCloseTime = 6; // NIDABDPMHHF
uint32 uid = 14;
Vector djinn_rot = 9; //GMPJFCODOLK
}

View File

@ -6,7 +6,7 @@ option java_package = "emu.grasscutter.net.proto";
// Name: LIOGDEJCPAJ
// CmdId: 643
message McoinExchangeHcoinReq {
uint32 mcoinCost = 8;
uint32 mcoin_cost = 8;
uint32 hcoin = 6;
}

View File

@ -6,8 +6,8 @@ option java_package = "emu.grasscutter.net.proto";
// Name: NBMNMAAOFAN
// CmdId: 636
message McoinExchangeHcoinRsp {
uint32 MIBMBPJHBBM = 2;
uint32 hcoin = 2; // MIBMBPJHBBM
int32 retcode = 15;
uint32 CALAJIHCLCF = 4;
uint32 mcoin_cost = 4; // CALAJIHCLCF
}

View File

@ -3,8 +3,8 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
// Name: MBLNIKHFGKN
message ParamList {
repeated uint32 paramList = 1;
repeated uint32 param_list = 1;
}

View File

@ -8,7 +8,7 @@ import "FriendEnterHomeOption.proto";
message PlayerHomeCompInfo {
FriendEnterHomeOption friend_enter_home_option = 9;
repeated uint32 seen_module_id_list = 5;
repeated uint32 levelupRewardGotLevelList = 15;
repeated uint32 unlockedModuleIdList = 11;
repeated uint32 unlocked_module_id_list = 15; //GDJHCPPGIIM
repeated uint32 levelup_reward_got_level_list = 11; //LHOLJFDKFHM
}

View File

@ -14,7 +14,7 @@ message PlayerLoginRsp {
bool is_sc_open = 1683;
repeated FeatureBlockInfo feature_block_info_list = 983;
bool KMOMLBCPPBA = 35;
bytes playerData = 1712;
bytes playerData = 1712; // HGDJOGDJFDJ
bool is_data_need_relogin = 1013;
ResVersionConfig next_res_version_config = 109;
string client_md5 = 451;
@ -40,7 +40,7 @@ message PlayerLoginRsp {
bool is_transfer = 67;
ResVersionConfig res_version_config = 196;
map<uint32, BlockInfo> block_info_map = 336;
bytes scInfo = 3;
bytes scInfo = 3; //JDGOBICDINB
int32 ability_hash_code = 15;
bool FBCLODGFABC = 9;
string client_version_suffix = 165;

View File

@ -7,7 +7,7 @@ option java_package = "emu.grasscutter.net.proto";
// CmdId: 649
message ResinChangeNotify {
uint32 cur_value = 14;
uint32 curBuyCount = 13;
uint32 nextAddTimestamp = 12;
uint32 curBuyCount = 13; // KDJDKFKHOEN
uint32 nextAddTimestamp = 12; // NJLHPIKCNOP
}

View File

@ -36,17 +36,17 @@ message SceneGadgetInfo {
uint32 owner_entity_id = 4;
GadgetBornType born_type = 5;
uint32 gadget_state = 6;
uint32 gadget_type = 7;
uint32 gadget_type = 7; // EIHJCEDOKKE
bool is_show_cutscene = 8;
uint32 authority_peer_id = 9;
bool is_enable_interact = 10;
uint32 interact_id = 11;
uint32 interact_id = 11; // IJJBMNMNKKB
uint32 mark_flag = 21;
uint32 prop_owner_entity_id = 22; //LMDHNJFCOOI
PlatformInfo platform = 23;
repeated uint32 interact_uid_list = 24;
uint32 draft_id = 25;
uint32 gadget_talk_state = 26;
uint32 gadget_talk_state = 26; // HIOJEFHGLJI
GadgetPlayInfo play_info = 100;
oneof content {
Item trifle_item = 12;

View File

@ -1,19 +0,0 @@
syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
import "SeaLampSectionInfo.proto";
// Name: FPJLKJADJAC
message SeaLampActivityInfo {
repeated SeaLampSectionInfo section_info_list = 8;
uint32 sea_lamp_coin = 9;
uint32 mechanicus_id = 11;
bool IAIGGMMDBIH = 7;
uint32 day_index = 6;
bool is_content_closed = 15;
uint32 popularity = 13;
bool KHJFGGCODAG = 14;
uint32 first_day_start_time = 4;
}

View File

@ -1,10 +0,0 @@
syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
// Name: KKEHCHJODDD
message SeaLampSectionInfo {
uint32 section_id = 14;
}

View File

@ -7,13 +7,13 @@ import "ItemParam.proto";
// Name: EFLDHGLFIDD
message ShopGoods {
uint32 min_level = 7; //OCIGJMBPIMN
uint32 JAFFFHILNCD = 1817;
uint32 secondary_sheet_id = 1817; //JAFFFHILNCD
ItemParam goods_item = 8;
uint32 end_time = 12; //ok
uint32 scoin = 14; //JPCBEPKDBGA
repeated uint32 pre_goods_id_list = 3; //ok
uint32 secondarySheetId = 570; // ALOPKNFLFBE ???
uint32 boughtNum = 4; //KCHMFBKCLKO ???
uint32 JAFFFHILNCD = 570; // ALOPKNFLFBE ???
uint32 bought_num = 4; //KCHMFBKCLKO
uint32 goods_id = 9; //GOMAIIJPDKD
uint32 max_level = 11; //HBAEGHNDCKB
uint32 disableType = 505;

View File

@ -14,10 +14,10 @@ message TowerLevelEndNotify {
CONTINUE_STATE_TYPE_CAN_ENTER_NEXT_FLOOR = 2;
}
uint32 nextFloorId = 11;
uint32 next_floor_id = 11;
repeated uint32 finished_star_cond_list = 13;
repeated ItemParam reward_item_list = 9;
uint32 continueState = 8;
uint32 continue_state = 8;
bool is_success = 7;
}

View File

@ -6,8 +6,8 @@ option java_package = "emu.grasscutter.net.proto";
// Name: KMPDADDDNCP
message TowerLevelStarCondData {
bool EOJOAHGECCE = 13;
uint32 NLNHJFLCGHB = 4;
uint32 KOPBLHONCEF = 7;
uint32 star_cond_index = 4; //NLNHJFLCGHB
uint32 cond_value = 7; //KOPBLHONCEF
bool MFPMLIGPNIJ = 2;
}

View File

@ -9,6 +9,6 @@ message TryEnterHomeReq {
uint32 target_point = 15;
bool MPAJHMEOAPK = 1;
uint32 target_uid = 8;
bool NBNNPNAGOEA = 7;
bool is_transfer_to_safe_point = 7; //NBNNPNAGOEA
}