Grasscutter
/
GC-Proto
mirror of https://gitlab.com/YuukiPS/GC-Proto.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

sync cmdid 

* Fix mail?
* remove useless proto
This commit is contained in:
Akbar Yahya 2023-02-02 02:52:36 +08:00
parent 0d16481fcb
commit 5f67d8774c
8 changed files with 24 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
PacketOpcodes.java
View File

@ -577,8 +577,8 @@ public class PacketOpcodes {
public static final int GetAllActivatedBargainDataRsp = 445; public static final int GetAllActivatedBargainDataRsp = 445;
public static final int GetAllH5ActivityInfoReq = 5695; public static final int GetAllH5ActivityInfoReq = 5695;
public static final int GetAllH5ActivityInfoRsp = 5688; public static final int GetAllH5ActivityInfoRsp = 5688;
public static final int GetAllMailReq = 188; public static final int GetAllMailReq = 1424;
public static final int GetAllMailRsp = 125; public static final int GetAllMailRsp = 1429;
public static final int GetAllSceneGalleryInfoReq = 5580; public static final int GetAllSceneGalleryInfoReq = 5580;
public static final int GetAllSceneGalleryInfoRsp = 5570; public static final int GetAllSceneGalleryInfoRsp = 5570;
public static final int GetAllUnlockNameCardReq = 4018; public static final int GetAllUnlockNameCardReq = 4018;
@ -1279,8 +1279,8 @@ public class PacketOpcodes {
public static final int SetLimitOptimizationNotify = 8763; public static final int SetLimitOptimizationNotify = 8763;
public static final int SetNameCardReq = 4025; public static final int SetNameCardReq = 4025;
public static final int SetNameCardRsp = 4058; public static final int SetNameCardRsp = 4058;
public static final int SetOpenStateReq = 1424; public static final int SetOpenStateReq = 188;
public static final int SetOpenStateRsp = 1429; public static final int SetOpenStateRsp = 125;
public static final int SetPlayerBirthdayReq = 4078; public static final int SetPlayerBirthdayReq = 4078;
public static final int SetPlayerBirthdayRsp = 4016; public static final int SetPlayerBirthdayRsp = 4016;
public static final int SetPlayerBornDataReq = 169; public static final int SetPlayerBornDataReq = 169;

12
cmdid.json
View File

@ -2891,10 +2891,6 @@
"name": "GadgetTalkChangeNotify", "name": "GadgetTalkChangeNotify",
"id": 846 "id": 846
}, },
{
"name": "GAJONMHAAEK",
"id": 6441
},
{ {
"name": "GalleryBalloonScoreNotify", "name": "GalleryBalloonScoreNotify",
"id": 5587 "id": 5587
@ -3361,7 +3357,7 @@
}, },
{ {
"name": "GetAllMailReq", "name": "GetAllMailReq",
"id": 188 "id": 1424
}, },
{ {
"name": "GetAllMailResultNotify", "name": "GetAllMailResultNotify",
@ -3369,7 +3365,7 @@
}, },
{ {
"name": "GetAllMailRsp", "name": "GetAllMailRsp",
"id": 125 "id": 1429
}, },
{ {
"name": "GetAllSceneGalleryInfoReq", "name": "GetAllSceneGalleryInfoReq",
@ -7181,11 +7177,11 @@
}, },
{ {
"name": "SetOpenStateReq", "name": "SetOpenStateReq",
"id": 1424 "id": 188
}, },
{ {
"name": "SetOpenStateRsp", "name": "SetOpenStateRsp",
"id": 1429 "id": 125
}, },
{ {
"name": "SetPlayerBirthdayReq", "name": "SetPlayerBirthdayReq",

8
cmdid_gc_update.json
View File

@ -2844,12 +2844,12 @@
}, },
{ {
"name": "GetAllMailReq", "name": "GetAllMailReq",
"id": 188, "id": 1424,
"replace": 1427 "replace": 1427
}, },
{ {
"name": "GetAllMailRsp", "name": "GetAllMailRsp",
"id": 125, "id": 1429,
"replace": 1439 "replace": 1439
}, },
{ {
@ -6343,12 +6343,12 @@
}, },
{ {
"name": "SetOpenStateReq", "name": "SetOpenStateReq",
"id": 1424, "id": 188,
"replace": 189 "replace": 189
}, },
{ {
"name": "SetOpenStateRsp", "name": "SetOpenStateRsp",
"id": 1429, "id": 125,
"replace": 144 "replace": 144
}, },
{ {

9
cmdid_ht_34.json
View File

@ -722,7 +722,6 @@
"GadgetPlayUidOpNotify": 829, "GadgetPlayUidOpNotify": 829,
"GadgetStateNotify": 887, "GadgetStateNotify": 887,
"GadgetTalkChangeNotify": 846, "GadgetTalkChangeNotify": 846,
"GAJONMHAAEK": 6441,
"GalleryBalloonScoreNotify": 5587, "GalleryBalloonScoreNotify": 5587,
"GalleryBalloonShootNotify": 5555, "GalleryBalloonShootNotify": 5555,
"GalleryBounceConjuringHitNotify": 5569, "GalleryBounceConjuringHitNotify": 5569,
@ -839,9 +838,9 @@
"GetAllH5ActivityInfoReq": 5695, "GetAllH5ActivityInfoReq": 5695,
"GetAllH5ActivityInfoRsp": 5688, "GetAllH5ActivityInfoRsp": 5688,
"GetAllMailNotify": 1416, "GetAllMailNotify": 1416,
"GetAllMailReq": 188, "GetAllMailReq": 1424,
"GetAllMailResultNotify": 1413, "GetAllMailResultNotify": 1413,
"GetAllMailRsp": 125, "GetAllMailRsp": 1429,
"GetAllSceneGalleryInfoReq": 5580, "GetAllSceneGalleryInfoReq": 5580,
"GetAllSceneGalleryInfoRsp": 5570, "GetAllSceneGalleryInfoRsp": 5570,
"GetAllUnlockNameCardReq": 4018, "GetAllUnlockNameCardReq": 4018,
@ -1794,8 +1793,8 @@
"SetLimitOptimizationNotify": 8763, "SetLimitOptimizationNotify": 8763,
"SetNameCardReq": 4025, "SetNameCardReq": 4025,
"SetNameCardRsp": 4058, "SetNameCardRsp": 4058,
"SetOpenStateReq": 1424, "SetOpenStateReq": 188,
"SetOpenStateRsp": 1429, "SetOpenStateRsp": 125,
"SetPlayerBirthdayReq": 4078, "SetPlayerBirthdayReq": 4078,
"SetPlayerBirthdayRsp": 4016, "SetPlayerBirthdayRsp": 4016,
"SetPlayerBornDataReq": 169, "SetPlayerBornDataReq": 169,

18
gc_needed2.json
View File

@ -35,12 +35,6 @@
{ {
"name": "ActivityInfo" "name": "ActivityInfo"
}, },
{
"name": "MusicGameActivityDetailInfo"
},
{
"name": "UgcMusicBriefInfo"
},
{ {
"name": "MusicBeatmapList" "name": "MusicBeatmapList"
}, },
@ -50,6 +44,9 @@
{ {
"name": "MusicBeatmap" "name": "MusicBeatmap"
}, },
{
"name": "UgcMusicBriefInfo"
},
{ {
"name": "MusicGameRecord" "name": "MusicGameRecord"
}, },
@ -389,9 +386,6 @@
{ {
"name": "OnlinePlayerInfo" "name": "OnlinePlayerInfo"
}, },
{
"name": "PlayerApplyEnterMpResultNotify"
},
{ {
"name": "PlayerLocationInfo" "name": "PlayerLocationInfo"
}, },
@ -437,9 +431,6 @@
{ {
"name": "MaterialInfo" "name": "MaterialInfo"
}, },
{
"name": "PlayerApplyEnterMpReason"
},
{ {
"name": "InvestigationMonster" "name": "InvestigationMonster"
}, },
@ -1496,6 +1487,9 @@
{ {
"name": "PlayerApplyEnterMpNotify" "name": "PlayerApplyEnterMpNotify"
}, },
{
"name": "PlayerApplyEnterMpResultNotify"
},
{ {
"name": "PlayerApplyEnterMpResultRsp" "name": "PlayerApplyEnterMpResultRsp"
}, },

4
op.js
View File

@ -740,6 +740,6 @@ function scan_gc() {
// cmdid_to_op(); // 4. update op // cmdid_to_op(); // 4. update op
// npx prettier --write PacketOpcodes.java // npx prettier --write PacketOpcodes.java
// scan_gc(); // 5. scan gc // scan_gc(); // 5. scan gc
clean_proto_gen(); // 6. clean proto // clean_proto_gen(); // 6. clean proto
//read_cmdid_ht_json(); // read_cmdid_ht_json();

12
proto/MusicGameActivityDetailInfo.proto
View File

@ -1,12 +0,0 @@
syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
import "MusicBriefInfo.proto";
import "MusicGameRecord.proto";
message MusicGameActivityDetailInfo {
repeated MusicBriefInfo Unk3300_AAGCDCOIPJM = 2;
repeated MusicBriefInfo Unk3300_OKHAACGHMAP = 6;
map<uint32, MusicGameRecord> musicGameRecordMap = 8;
}

19
proto/PlayerApplyEnterMpReason.proto
View File

@ -1,19 +0,0 @@
// Proto has been converted from Sorapointa to Grasscutter format
syntax = "proto3";
option java_package = "emu.grasscutter.net.proto";
enum PlayerApplyEnterMpReason {
PlayerJudge = 0;
SceneCannotEnter = 1;
PlayerCannotEnterMp = 2;
SystemJudge = 3;
AllowEnterPlayerFull = 4;
WorldLevelLowerThanHost = 5;
HostInMatch = 6;
PlayerInBlacklist = 7;
PsPlayerNotAcceptOthers = 8;
HostIsBlocked = 9;
OtherDataVersionNotLatest = 10;
DataVersionNotLatest = 11;
PlayerNotInPlayerWorld = 12;
}