diff --git a/proto/DoGachaReq.proto b/proto/DoGachaReq.proto
index 95916ea8..fdbd053b 100644
--- a/proto/DoGachaReq.proto
+++ b/proto/DoGachaReq.proto
@@ -6,10 +6,9 @@ option java_package = "emu.grasscutter.net.proto";
 // Name: KBMLDGNEKHA
 // CmdId: 1554
 message DoGachaReq {
-    uint32 gachaScheduleId = 3;
-    uint32 gachaTimes = 6;
-    uint32 gachaRandom = 12;
-    uint32 gachaType = 5;
+    uint32 gachaRandom = 3; //PKCLGOCJPLN ++ CORRECT
+    uint32 gachaType = 6; //DGIFMDIADJF ++ CORRECT
+    uint32 gachaScheduleId = 12; //NMKGGDOKHLF
+    uint32 gachaTimes = 5; //HKJAAPBGNEI ++ CORRECT
     string gacha_tag = 14;
 }
-
diff --git a/proto/DoGachaRsp.proto b/proto/DoGachaRsp.proto
index 15fd3230..19365b93 100644
--- a/proto/DoGachaRsp.proto
+++ b/proto/DoGachaRsp.proto
@@ -7,24 +7,24 @@ import "GachaItem.proto";
 // Name: LEFDKOLFJKL
 // CmdId: 1564
 message DoGachaRsp {
-    uint32 gachaType = 4; // DNGKJJJHNEN
+    uint32 tenCostItemId = 4; // DNGKJJJHNEN
     uint32 dailyGachaTimes = 1898; //OPHLINLNOEA
-    uint32 leftGachaTimes = 13; // HKJAAPBGNEI
-    uint32 gachaTimesLimit = 2;  //NMKGGDOKHLF
+    uint32 gachaTimes = 13; // HKJAAPBGNEI
+    uint32 gachaScheduleId = 2;  //NMKGGDOKHLF
     bool HNAFDALMKFN = 312;
-    uint32 wishProgress = 1; // BCKMNIBIPHO
-    uint32 tenCostItemId = 11; // KJHBJPGBOFP
-    uint32 tenCostItemNum = 9; //DGIFMDIADJF
-    uint32 gachaScheduleId = 15; //LMLCPMOOKKA
+    uint32 costItemId = 1; // BCKMNIBIPHO
+    uint32 wishMaxProgress = 11; // KJHBJPGBOFP
+    uint32 gachaType = 9; //DGIFMDIADJF
+    uint32 tenCostItemNum = 15; //LMLCPMOOKKA
     repeated GachaItem gacha_item_list = 10;
-    uint32 wishItemId = 7; //LJJKNKCHHFM
+    uint32 wishProgress = 7; //LJJKNKCHHFM
     uint32 newGachaRandom = 5; //EAMKGBGKNMO
-    uint32 gachaTimes = 12; //AINLBCOKANA
+    uint32 wishItemId = 12; //AINLBCOKANA
     uint32 curScheduleDailyGachaTimes = 1918; //NOKMFFEIDNH
     int32 retcode = 14;
-    uint32 costItemNum = 3; //MGFKNHHNMAE
+    uint32 leftGachaTimes = 3; //MGFKNHHNMAE
     bool HCCENOGKOOG = 1938;
-    uint32 costItemId = 6; //GNIDAANOBDP
-    uint32 wishMaxProgress = 8; //FLDFHFNHNFC
+    uint32 costItemNum = 6; //GNIDAANOBDP
+    uint32 gachaTimesLimit = 8; //FLDFHFNHNFC
 }
 
diff --git a/proto/EntityFightPropChangeReasonNotify.proto b/proto/EntityFightPropChangeReasonNotify.proto
index 69453026..332f681e 100644
--- a/proto/EntityFightPropChangeReasonNotify.proto
+++ b/proto/EntityFightPropChangeReasonNotify.proto
@@ -11,8 +11,8 @@ import "PropChangeReason.proto";
 message EntityFightPropChangeReasonNotify {
     repeated uint32 param_list = 12;
     uint32 prop_type = 9;
-    ChangeHpReason changeHpReason = 14;
-    ChangeEnergyReason changeEnergyReason = 10;
+    ChangeEnergyReason changeEnergyReason = 14;
+    ChangeHpReason changeHpReason = 10;
     PropChangeReason reason = 11;
     float prop_delta = 15;
     uint32 entity_id = 6;
diff --git a/proto/GachaInfo.proto b/proto/GachaInfo.proto
index ed471a5e..6579b037 100644
--- a/proto/GachaInfo.proto
+++ b/proto/GachaInfo.proto
@@ -7,26 +7,26 @@ import "GachaUpInfo.proto";
 // Name: LIBILADMDKG
 message GachaInfo {
     bool is_new_wish = 1693;
-    uint32 gachaSortId = 4; // FLDFHFNHNFC
+    uint32 gachaTimesLimit = 4; // FLDFHFNHNFC
     repeated GachaUpInfo gacha_up_info_list = 1953;
-    uint32 gachaTimesLimit = 911; // KJHBJPGBOFP
-    uint32 curScheduleDailyGachaTimes = 10; // MGFKNHHNMAE
-    string gachaPrefabPath = 8; // ABKGLLAGAIN
-    uint32 costItemNum = 15; // DGIFMDIADJF
-    string gachaRecordUrl = 5; // JENKDDLIKBK
-    uint32 gachaType = 11; // MJPPIKFJBBF
-    uint32 leftGachaTimes = 1245; // NOKMFFEIDNH
-    uint32 tenCostItemId = 7; // GNIDAANOBDP
+    uint32 wishMaxProgress = 911; // KJHBJPGBOFP
+    uint32 leftGachaTimes = 10; // MGFKNHHNMAE
+    string gachaProbUrl = 8; // ABKGLLAGAIN
+    uint32 gachaType = 15; // DGIFMDIADJF
+    string gachaPrefabPath = 5; // JENKDDLIKBK
+    uint32 gachaSortId = 11; // MJPPIKFJBBF
+    uint32 curScheduleDailyGachaTimes = 1245; // NOKMFFEIDNH
+    uint32 costItemNum = 7; // GNIDAANOBDP
     repeated uint32 displayUp5ItemList = 1564; // GLGFIGNCBPL
-    string titleTextmap = 1128; // NBGBMJJAICB
-    string gachaProbUrl = 12; // LCHOOLMEHIN
-    uint32 schedule_id = 2; 
-    string gachaPreviewPrefabPath = 1; // CINCAKDODOD
+    string gachaProbUrlOversea = 1128; // NBGBMJJAICB
+    string gachaPreviewPrefabPath = 12; // LCHOOLMEHIN
+    uint32 schedule_id = 2;
+    string gachaRecordUrl = 1; // CINCAKDODOD
     uint32 end_time = 3;
     repeated uint32 displayUp4ItemList = 446; // IIGOCJAHJDO
     uint32 wishItemId = 9; // AINLBCOKANA
-    uint32 wishMaxProgress = 1298; // DNGKJJJHNEN
-    string gachaProbUrlOversea = 67; // ANPADHPPJNE
+    uint32 tenCostItemId = 1298; // DNGKJJJHNEN
+    string titleTextmap = 67; // ANPADHPPJNE
     uint32 costItemId = 14; // BCKMNIBIPHO
     uint32 tenCostItemNum = 13; // LMLCPMOOKKA
     uint32 begin_time = 6;
diff --git a/proto/GetGachaInfoRsp.proto b/proto/GetGachaInfoRsp.proto
index b4fdd13d..0d6fa91f 100644
--- a/proto/GetGachaInfoRsp.proto
+++ b/proto/GetGachaInfoRsp.proto
@@ -11,7 +11,7 @@ message GetGachaInfoRsp {
     int32 retcode = 13;
     bool HNAFDALMKFN = 11;
     bool HCCENOGKOOG = 1; 
-    uint32 dailyGachaTimes = 14; // PKCLGOCJPLN
-    uint32 gachaRandom  = 8; // OPHLINLNOEA
+    uint32 gachaRandom = 14; // PKCLGOCJPLN
+    uint32 dailyGachaTimes  = 8; // OPHLINLNOEA
 }
 
diff --git a/proto/InvestigationMonster.proto b/proto/InvestigationMonster.proto
index 9e232e61..2b349f8b 100644
--- a/proto/InvestigationMonster.proto
+++ b/proto/InvestigationMonster.proto
@@ -14,9 +14,9 @@ message InvestigationMonster {
     }
 
     uint32 max_boss_chest_num = 13; //HFEFHDCOMLB
-    bool is_alive = 14; // MFGIMDGKDHH
+    bool is_area_locked = 14; // MFGIMDGKDHH
     uint32 NKADJMFOMGB = 3;
-    bool is_area_locked = 11; // ABCENJAFGOF
+    bool is_alive = 11; // ABCENJAFGOF
     WeeklyBossResinDiscountInfo weekly_boss_resin_discount_info = 9;
     uint32 next_refresh_time = 8;
     uint32 group_id = 1206;