* sync proto hiro part2

* tmp fix visual shop
This commit is contained in:
Akbar Yahya 2023-04-18 13:49:25 +08:00
parent 11b655bdbf
commit ac0b8a0d8f
36 changed files with 9913 additions and 11617 deletions

View File

@ -1903,6 +1903,9 @@ public class PacketOpcodes {
public static final int WidgetSlotChangeNotify = 4257;
public static final int WidgetUseAttachAbilityGroupChangeNotify = 4252;
public static final int WindSeedClientNotify = 1163;
public static final int WindSeedType1Notify = 23435;
public static final int WindSeedType2Notify = 24656;
public static final int WindSeedType3Notify = 22438;
public static final int WorktopOptionNotify = 876;
public static final int WorldAllRoutineTypeNotify = 3516;
public static final int WorldDataNotify = 3017;
@ -1918,6 +1921,6 @@ public class PacketOpcodes {
public static final int WorldRoutineChangeNotify = 3549;
public static final int WorldRoutineTypeCloseNotify = 3515;
public static final int WorldRoutineTypeRefreshNotify = 3517;
public static final int SkipPlayerGameTimeReq = 163;
public static final int SkipPlayerGameTimeRsp = 196;
public static final int SkipPlayerGameTimeReq = 123;
public static final int SkipPlayerGameTimeRsp = 130;
}

View File

@ -180,7 +180,7 @@
"id": 122
},
{
"name": "GHMNCNNHLAI",
"name": "SkipPlayerGameTimeReq",
"id": 123
},
{
@ -208,7 +208,7 @@
"id": 129
},
{
"name": "DFPBHODHPKM",
"name": "SkipPlayerGameTimeRsp",
"id": 130
},
{

File diff suppressed because it is too large Load Diff

View File

@ -154,13 +154,5 @@
{
"name": "Unk2700_NGPMINKIOPK",
"id": 8956
},
{
"name": "SkipPlayerGameTimeReq",
"id": 163
},
{
"name": "SkipPlayerGameTimeRsp",
"id": 196
}
]

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -80,7 +80,7 @@ import "WinterCampActivityDetailInfo.proto";
// Name: PHKAPAALGGC
message ActivityInfo {
repeated uint32 expire_cond_list = 13; // IMFFKIMJDJH
repeated uint32 IMFFKIMJDJH = 13;
uint32 OIBEDADECFB = 238;
uint32 end_time = 10;
uint32 activity_id = 1;
@ -91,7 +91,7 @@ message ActivityInfo {
bool DNKBDEJAOMC = 6;
bool MPCDIKMJOAC = 2041;
uint32 cur_score = 882;
uint32 activity_type = 11; // OIPEAKGOPDE
uint32 activity_type = 11;
bool GODELKHIPDE = 3;
bool DLNNGPNHBFB = 1789;
uint32 first_day_start_time = 617;

View File

@ -5,8 +5,8 @@ option java_package = "emu.grasscutter.net.proto";
// Name: EJAIGOIJOFM
message AvatarTeamResonanceInfo {
repeated uint32 CHDOILLJEEN = 7;
repeated uint32 PLLHPHJJOKM = 12;
repeated uint32 add_team_resonance_id_list = 7;
repeated uint32 del_team_resonance_id_list = 12;
uint64 avatar_guid = 5;
uint32 entity_id = 11;
}

View File

@ -15,9 +15,9 @@ message BattlePassMission {
uint32 mission_id = 11;
MissionStatus mission_status = 14;
uint32 reward_battle_pass_point = 13; // GJNMCPGNCMA
uint32 mission_type = 13;
uint32 cur_progress = 15;
uint32 total_progress = 10;
uint32 mission_type = 3; // OCEJMMCLNKC
uint32 reward_battle_pass_point = 3;
}

View File

@ -5,8 +5,8 @@ option java_package = "emu.grasscutter.net.proto";
// Name: ENLKHNPEPCL
message BattlePassProduct {
string LCLGNDMDBPG = 13;
string DEFBKEGPICP = 10;
string GLEBBINJLCC = 7;
string normalProductId = 13;
string extraProductId = 10;
string upgradeProductId = 7;
}

View File

@ -9,16 +9,16 @@ import "BattlePassUnlockStatus.proto";
// Name: IGIIEHFMKKN
message BattlePassSchedule {
bool is_extra_paid_reward_taken = 2; // NJCGHBKBKDO
bool isViewed = 2;
uint32 level = 4;
bool is_viewed = 13; // LCPFDLLEDNM
bool isExtraPaidRewardTaken = 13;
repeated BattlePassRewardTag reward_taken_list = 9;
BattlePassProduct product_info = 10;
uint32 end_time = 15;
uint32 cur_cycle_points = 12; // FOENJPJJGBA
uint32 point = 12;
BattlePassUnlockStatus unlock_status = 6;
uint32 point = 7; // PHECELJJFCK
uint32 paid_platform_flags = 14; // GAMMCGFEAIH
uint32 paidPlatformFlags = 7;
uint32 curCyclePoints = 14;
BattlePassCycle cur_cycle = 3;
uint32 schedule_id = 8;
uint32 begin_time = 5;

View File

@ -7,9 +7,9 @@ import "CodexTypeData.proto";
// CmdId: 4202
// Name: DEOFNLAMNKE
message CodexDataFullNotify {
uint32 IAELPGINMBN = 15;
uint32 last_read_pushtips_type_id = 15;
repeated CodexTypeData type_data_list = 13;
repeated uint32 recent_viewed_pushtips_list = 14;
uint32 PDEMHIKAFGI = 7;
uint32 last_read_pushtips_codex_id = 7;
}

11
proto/CoopCg.proto Normal file
View File

@ -0,0 +1,11 @@
syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
// Name: ELGBEHJIAIA
message CoopCg {
uint32 id = 1;
bool is_unlock = 7;
}

30
proto/CoopChapter.proto Normal file
View File

@ -0,0 +1,30 @@
syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
import "CoopCg.proto";
import "CoopPoint.proto";
import "CoopReward.proto";
// Name: GODAKDKKBEM
message CoopChapter {
// Name: PCFKFLMMDHE
enum State {
STATE_CLOSE = 0;
STATE_COND_NOT_MEET = 1;
STATE_COND_MEET = 2;
STATE_ACCEPT = 3;
}
uint32 finished_end_count = 4;
repeated uint32 KAKALNAGLGJ = 7;
map<uint32, uint32> seen_ending_map = 14;
repeated CoopReward coop_reward_list = 5;
repeated CoopPoint coop_point_list = 8;
repeated uint32 LNOCPBNPHIE = 12;
uint32 id = 1;
uint32 total_end_count = 6;
State state = 2;
repeated CoopCg coop_cg_list = 10;
}

19
proto/CoopPoint.proto Normal file
View File

@ -0,0 +1,19 @@
syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
// Name: GINFLDADAOO
message CoopPoint {
// Name: CLMHLFCKFLK
enum State {
STATE_UNSTARTED = 0;
STATE_STARTED = 1;
STATE_FINISHED = 2;
}
uint32 id = 15;
State state = 4;
uint32 self_confidence = 8;
}

18
proto/CoopReward.proto Normal file
View File

@ -0,0 +1,18 @@
syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
// Name: AGGLMJABOKH
message CoopReward {
// Name: BCDLKPCNHJH
enum State {
STATE_UNLOCK = 0;
STATE_LOCK = 1;
STATE_TAKEN = 2;
}
uint32 id = 9;
State state = 14;
}

View File

@ -0,0 +1,20 @@
syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
// CmdId: 4480
// Name: HGKMIEPCCCJ
message GetHomeExchangeWoodInfoRsp {
// Name: FOLINBPAHGO
message HomeExchangeWoodInfo {
uint32 exchangedCount = 14;
uint32 wood_id = 8;
uint32 exchangeLimit = 9;
fixed32 next_refresh_time = 1;
}
int32 retcode = 4;
repeated HomeExchangeWoodInfo wood_info_list = 3;
}

View File

@ -9,10 +9,10 @@ message HomeBasicInfo {
HomeLimitedShopInfo limited_shop_info = 2;
uint64 exp = 11;
string owner_nick_name = 9;
uint32 home_owner_uid = 5; // OCBCKIIJNFD
uint32 cur_module_id = 3; // KJEBPOOEKJG
uint32 cur_room_scene_id = 5;
uint32 home_owner_uid = 3;
uint32 level = 15;
bool is_in_edit_mode = 12;
uint32 cur_room_scene_id = 1; // DHJNNKOAPEA
uint32 cur_module_id = 1;
}

View File

@ -7,9 +7,9 @@ import "Vector.proto";
// Name: KDHIILONFMA
message HomeMarkPointSceneData {
Vector safe_point_pos = 6; // PEIAJDDGMIG
Vector teapot_spirit_pos = 6;
uint32 module_id = 5;
Vector teapot_spirit_pos = 3; // IPPBNCILPHJ
Vector safe_point_pos = 3;
repeated HomeMarkPointFurnitureData furniture_list = 2;
uint32 scene_id = 8;
}

View File

@ -6,7 +6,7 @@ option java_package = "emu.grasscutter.net.proto";
// Name: LDMGBIGBOLN
message HomeResource {
fixed32 next_refresh_time = 9;
uint32 store_limit = 13; // GBBFEOLGIPA
uint32 store_value = 10; // ELNCBCIJMJJ
uint32 store_limit = 13;
uint32 store_value = 10;
}

View File

@ -7,21 +7,21 @@ import "WeeklyBossResinDiscountInfo.proto";
// Name: GLMNKJIOKFF
message InvestigationMonster {
// Name: ENEAGILHBCC > LockState
// Name: ENEAGILHBCC
enum LockState {
LOCK_STATE_NONE = 0;
LOCK_STATE_QUEST = 1;
LOCK_NONE = 0;
LOCK_QUEST = 1;
}
bool is_area_locked = 8;
uint32 city_id = 5;
uint32 CBBFLPAGFOI = 10; // CBBFLPAGFOI
uint32 refresh_interval = 10; // CBBFLPAGFOI
uint32 next_refresh_time = 1;
WeeklyBossResinDiscountInfo weekly_boss_resin_discount_info = 12;
bool is_alive = 14;
uint32 level = 13;
uint32 max_boss_chest_num = 9; // MGMCKOOBFBJ
uint32 refresh_interval = 11; // DHMMIBILNEE
uint32 boss_chest_num = 9; // MGMCKOOBFBJ
uint32 DHMMIBILNEE = 11;
Vector pos = 2;
uint32 group_id = 1212;
uint32 id = 7;
@ -29,6 +29,6 @@ message InvestigationMonster {
uint32 resin = 3;
uint32 monster_id = 518;
LockState lock_state = 4;
uint32 boss_chest_num = 15; // HKBNEBOAMDI
uint32 max_boss_chest_num = 15;
}

View File

@ -15,8 +15,8 @@ message ParentQuest {
ParentQuestRandomInfo random_info = 14;
map<uint32, uint32> time_var_map = 5;
repeated InferencePageInfo inference_page_list = 13;
uint32 parent_quest_state = 9; // PGAAFEALHLK
uint32 quest_var_seq = 12; // NJNBCLGFCIN
uint32 quest_var_seq = 9;
uint32 parent_quest_state = 12;
repeated int32 quest_var = 8;
bool is_finished = 11;
uint32 parent_quest_id = 7;

View File

@ -7,8 +7,8 @@ import "FriendEnterHomeOption.proto";
// Name: MBGAMHAPMHK
message PlayerHomeCompInfo {
repeated uint32 seen_module_id_list = 4;
repeated uint32 unlocked_module_id_list = 5; // BPAOEFJJFPI
repeated uint32 levelup_reward_got_level_list = 2; // CKMGNKPLJPI
repeated uint32 unlocked_module_id_list = 5;
repeated uint32 levelup_reward_got_level_list = 2;
FriendEnterHomeOption friend_enter_home_option = 11;
}

View File

@ -15,7 +15,7 @@ message PlayerLoginRsp {
string country_code = 286; // AAEIDEMEKFF
repeated ShortAbilityHashPair short_ability_hash_map = 401;
string client_version_suffix = 309;
string client_silence_md5 = 1149; // CLDKNBOLOEN
string clientSilenceMd5 = 1149;
bool is_data_need_relogin = 1063;
bool is_use_ability_hash = 2; // HKINPODGHHH
ResVersionConfig res_version_config = 1241;
@ -29,7 +29,7 @@ message PlayerLoginRsp {
string client_silence_version_suffix = 889;
ResVersionConfig next_res_version_config = 670;
bool FCJHOMPHEON = 741;
string register_cps = 1152; // EHDGCMPILDC
string register_cps = 1152;
int32 retcode = 5;
string game_biz = 3;
bool BMLPDBNDAIJ = 15;
@ -37,7 +37,7 @@ message PlayerLoginRsp {
uint64 login_rand = 1;
string birthday = 1129;
bool is_audit = 461;
string client_md5 = 625; // KJJAIPPKFCI
string clientMd5 = 625;
bool BJLCFHHIGJD = 8;
uint32 client_silence_data_version = 9;
uint32 FMOKLFNAOOK = 892;

View File

@ -6,8 +6,8 @@ option java_package = "emu.grasscutter.net.proto";
// CmdId: 688
// Name: LFGMKMAGMCE
message ResinChangeNotify {
uint32 curBuyCount = 4; // MBEMEOGMKNM
uint32 nextAddTimestamp = 8; // LADLACBKFMK
uint32 next_add_timestamp = 4;
uint32 cur_buy_count = 8;
uint32 cur_value = 6;
}

View File

@ -10,7 +10,7 @@ message RogueStageInfo {
uint32 EIMBKPHMPEH = 3;
uint32 IPDPBFFPPBG = 1489;
uint32 NFAGHAIMDKI = 15;
bool AJFBLDPHGDD = 12;
bool isExplored = 12;
uint32 NILFBNCBADF = 658;
bool NHKJHKLOPDP = 14;
uint32 cur_level = 10;

View File

@ -16,7 +16,7 @@ message SceneTeamAvatar {
bool is_on_scene = 10;
uint64 weapon_guid = 1;
repeated ServerBuff server_buff_list = 7;
bool FMFEBGBJAMB = 11;
bool is_reconnect = 11;
uint32 entity_id = 13;
AbilitySyncStateInfo weapon_ability_info = 3;
AbilityControlBlock ability_control_block = 9;

View File

@ -6,7 +6,7 @@ option java_package = "emu.grasscutter.net.proto";
// CmdId: 470
// Name: MMPFLFGLFFC
message ServerCondMeetQuestListUpdateNotify {
repeated uint32 del_quest_id_list = 9; // GNFJHCIHOBE
repeated uint32 add_quest_id_list = 5; // EOMIKDEBBGN
repeated uint32 add_quest_id_list = 9; //GNFJHCIHOBE
repeated uint32 del_quest_id_list = 5; //EOMIKDEBBGN
}

View File

@ -4,27 +4,27 @@ option java_package = "emu.grasscutter.net.proto";
import "ItemParam.proto";
// Name: EFLDHGLFIDD (3.5, help)
// Name: NMLPHHIHIOK
message ShopGoods {
uint32 min_level = 7; //OCIGJMBPIMN
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 JAFFFHILNCD = 570; // ALOPKNFLFBE ???
uint32 bought_num = 4; //KCHMFBKCLKO
uint32 goods_id = 9; //GOMAIIJPDKD
uint32 max_level = 11; //HBAEGHNDCKB
uint32 disableType = 505;
uint32 buy_limit = 6; //FGACANHEBMH
uint32 begin_time = 5; //ok
uint32 next_refresh_time = 10; //ok
repeated ItemParam cost_item_list = 1; //ok
uint32 LMOPLEOOIJM = 1467;
uint32 LLJPJOEMPFE = 15;
uint32 hcoin = 2; //MIBMBPJHBBM
uint32 LLCOFLCEKDB = 1344;
uint32 mcoin = 13; //CABPCJFGBLJ
uint32 goodsId = 1; //ok
uint32 EOMGIGFFCLI = 736; // EOMGIGFFCLI not work
ItemParam goodsItem = 7; //ok
uint32 maxLevel = 9; //ok
uint32 buyLimit = 1201; // JGCLNJKOALJ maybe for boughtNum
uint32 scoin = 11; //LAKDFDKCMKC
uint32 secondary_sheet_id = 1493; // ONDHAANEFIK ???
uint32 beginTime = 14; //ok
repeated uint32 preGoodsIdList = 6; //ok
uint32 IAKCJHEJHOG = 15;
uint32 mcoin = 2; //ok
uint32 boughtNum = 3; //ok
uint32 GNENHCFPFCP = 688;
uint32 BKONLAFGBFC = 10; //ok? was BKONLAFGBFC // broke
uint32 endTime = 4; //ok
uint32 hcoin = 12; //ok
repeated ItemParam costItemList = 13; //ok
uint32 disableType = 617; // HLDEGIEBMBI
uint32 minLevel = 8; //ok
uint32 nextRefreshTime = 5; //ok
}

View File

@ -3,11 +3,11 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
// Name: MJMGAGMFAOO
// CmdId: 196
// CmdId: 123
// Name: GHMNCNNHLAI
message SkipPlayerGameTimeReq {
uint32 game_time = 14;
uint32 client_game_time = 7;
bool is_force_set = 11;
bool is_force_set = 6;
uint32 game_time = 5;
uint32 client_game_time = 14;
}

View File

@ -3,11 +3,11 @@ syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
// Name: BHNBOAEFEGL
// CmdId: 163
// CmdId: 130
// Name: DFPBHODHPKM
message SkipPlayerGameTimeRsp {
uint32 client_game_time = 9;
uint32 game_time = 2;
int32 retcode = 7;
uint32 game_time = 9;
uint32 client_game_time = 1;
int32 retcode = 12;
}

View File

@ -9,22 +9,22 @@ import "TowerMonthlyBrief.proto";
// CmdId: 2492
// Name: MPFPLNBLIKB
message TowerAllDataRsp {
uint32 DPKOCIDIHEI = 10;
uint32 tower_schedule_id = 10;
bool is_finished_entrance_floor = 4;
map<uint32, uint32> OAFKGDGFFEO = 1; // OAFKGDGFFEO
uint32 AJKNPOGBLDG = 6;
map<uint32, uint32> floor_open_time_map = 1;
uint32 AJKNPOGBLDG = 6; // not used
bool is_first_interact = 11;
uint32 EDGJPPKNHJE = 5;
int32 retcode = 13;
uint32 next_schedule_change_time = 8; // PHCNCLHJFBM
uint32 KPJMJMPPPGK = 12;
uint32 tower_schedule_id = 15; //NKMMGNAGOOA
uint32 next_schedule_change_time = 5;
int32 retcode = 13;
uint32 PHCNCLHJFBM = 8; // not used
uint32 KPJMJMPPPGK = 12; // not used
uint32 valid_tower_record_num = 15; //NKMMGNAGOOA
TowerMonthlyBrief last_schedule_monthly_brief = 1890;
repeated TowerFloorRecord tower_floor_record_list = 2;
TowerMonthlyBrief monthly_brief = 7;
map<uint32, uint32> floor_open_time_map = 3; // OJGBCIONMOL
uint32 GMMJNDFMHAM = 9;
uint32 schedule_start_time = 1783; // MDANKJCGMIN
map<uint32, uint32> skip_floor_granted_reward_item_map = 3;
uint32 GMMJNDFMHAM = 9; // GMMJNDFMHAM
uint32 schedule_start_time = 1783;
TowerCurLevelRecord cur_level_record = 14;
}

View File

@ -0,0 +1,17 @@
syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
// CmdId: 2490
// Name: DOOOMKLOHOB
message TowerBriefDataNotify {
uint32 schedule_start_time = 4;
uint32 total_star_num = 14;
uint32 tower_schedule_id = 1;
uint32 next_schedule_change_time = 8;
bool is_finished_entrance_floor = 11;
uint32 last_floor_index = 6;
uint32 last_level_index = 5;
}

View File

@ -5,9 +5,9 @@ option java_package = "emu.grasscutter.net.proto";
// Name: PFEKDHGCBPP
message TowerMonthlyBrief {
uint32 DPKOCIDIHEI = 12;
uint32 PLMIFICPLGM = 2;
uint32 HNOGBBLDHMH = 9;
uint32 IJHGFNOICOH = 1;
uint32 towerScheduleId = 12;
uint32 bestLevelIndex = 2;
uint32 bestFloorIndex = 9;
uint32 totalStarCount = 1;
}

View File

@ -12,7 +12,7 @@ message VehicleLocationInfo {
Vector pos = 13;
Vector rot = 14;
uint32 owner_uid = 1;
float KCCDNGMKBOB = 11;
float MILGENBLEAK = 7;
float cur_hp = 11; //KCCDNGMKBOB
float max_hp = 7; //MILGENBLEAK
}