From 8ffdbacf0eb98a6d78f76d7dace485a6c3553ef1 Mon Sep 17 00:00:00 2001
From: Akbar Yahya <akbaryahya_ym@yahoo>
Date: Sun, 16 Apr 2023 23:36:43 +0800
Subject: [PATCH] Fix gacha by hiro

---
 proto/DoGachaRsp.proto | 35 ++++++++++++++--------------
 proto/GachaInfo.proto  | 53 +++++++++++++++++++++---------------------
 2 files changed, 43 insertions(+), 45 deletions(-)

diff --git a/proto/DoGachaRsp.proto b/proto/DoGachaRsp.proto
index ce89d8f4..1d0cfef6 100644
--- a/proto/DoGachaRsp.proto
+++ b/proto/DoGachaRsp.proto
@@ -7,24 +7,23 @@ import "GachaItem.proto";
 // CmdId: 1576
 // Name: BIMBGHFINGO
 message DoGachaRsp {
-    bool HFEKPDOKLDK = 823; // HFEKPDOKLDK
-    uint32 gachaType = 7;
-    uint32 dailyGachaTimes = 5; // KDFPKENAIOJ
-    bool PKOIBFIOLAO = 651; // PKOIBFIOLAO
-    uint32 newGachaRandom = 8; // DKCIEKFPMCG
+    bool Unk3300_HFEKPDOKLDK = 823;
+    uint32 gacha_type = 7;
+    uint32 wishProgress = 5;
+    bool Unk3300_PKOIBFIOLAO = 651;
+    uint32 tenCostItemNum = 8;
     repeated GachaItem gacha_item_list = 4;
     int32 retcode = 10;
-    uint32 gachaTimes = 9;
-    uint32 costItemId = 1; // JICLMBKMGCG
-    uint32 wishMaxProgress = 845; // PELOHDIKFAM
-    uint32 tenCostItemId = 14; // FBIDPNFLBJL
-    uint32 tenCostItemNum = 3; // EAGFIDHCDPD
-    uint32 wishProgress = 15; // BIPHOPJBNHC
-    uint32 gachaScheduleId = 2;
-    uint32 wishItemId = 12; // KKDFKKEMEBA
-    uint32 curScheduleDailyGachaTimes = 965; // PKPENDLDPKI
-    uint32 leftGachaTimes = 11; // FIHHLGMNIDM
-    uint32 costItemNum = 6; // OKKJEHDBIHK
-    uint32 gachaTimesLimit = 13; // FBILBJNNIKE
+    uint32 gacha_times = 9;
+    uint32 gachaTimesLimit = 1;
+    uint32 curScheduleDailyGachaTimes = 845;
+    uint32 costItemId = 14;
+    uint32 leftGachaTimes = 3;
+    uint32 tenCostItemId = 15;
+    uint32 gacha_schedule_id = 2;
+    uint32 wishItemId = 12;
+    uint32 newGachaRandom = 965; //PKPENDLDPKI
+    uint32 daily_gacha_times = 11; //FIHHLGMNIDM
+    uint32 costItemNum = 6;
+    uint32 wishMaxProgress = 13;
 }
-
diff --git a/proto/GachaInfo.proto b/proto/GachaInfo.proto
index 8c8c8fdc..8bbc7801 100644
--- a/proto/GachaInfo.proto
+++ b/proto/GachaInfo.proto
@@ -6,31 +6,30 @@ import "GachaUpInfo.proto";
 
 // Name: INCDGNIDDAE
 message GachaInfo {
-    uint32 tenCostItemId = 578; // FBILBJNNIKE
-    uint32 wishMaxProgress = 9; // BIPHOPJBNHC
-    uint32 leftGachaTimes = 7; // FBIDPNFLBJL
-    string gachaProbUrl = 3; // OMGFPIJPPGH
-    uint32 gachaTimesLimit = 316; // PELOHDIKFAM
-    uint32 begin_time = 1;
-    uint32 gachaSortId = 4; // DINELKJLAPI
-    uint32 end_time = 10;
-    uint32 curScheduleDailyGachaTimes = 12; // JICLMBKMGCG
-    string gachaPrefabPath = 908; // PEFGGCAMAJE
-    uint32 costItemNum = 11; // OKKJEHDBIHK
-    uint32 schedule_id = 13;
-    uint32 wishItemId = 2003; // KKDFKKEMEBA
-    string gachaProbUrlOversea = 883; // JAHGGIJLMCD
-    string gachaPreviewPrefabPath = 15; // FGLBHLDAFAM
-    repeated GachaUpInfo gacha_up_info_list = 771;
-    string gachaRecordUrl = 8; // LAMBGJLFDCN
-    string titleTextmap = 1371; // AMGOIFHFKIE
-    repeated uint32 displayUp5ItemList = 793;
-    bool is_new_wish = 1748; 
-    uint32 gachaType = 6;
-    uint32 costItemId = 5; // DKCIEKFPMCG
-    uint32 tenCostItemNum = 14; // EAGFIDHCDPD
-    uint32 wishProgress = 1986; // KDFPKENAIOJ
-    repeated uint32 displayUp4ItemList = 565; // LIBFHKDFHLG
-    string gachaRecordUrlOversea = 2;
+    uint32 wishMaxProgress = 578; //FBILBJNNIKE
+    uint32 tenCostItemId = 9; //ok
+    uint32 costItemId = 7; //ok
+    string gachaPreviewPrefabPath = 3; //ok
+    uint32 curScheduleDailyGachaTimes = 316; //ok
+    uint32 begin_time = 1; //ok
+    uint32 gachaSortId = 4; //ok
+    uint32 end_time = 10; //ok
+    uint32 gachaTimesLimit = 12; //ok
+    string titleTextmap = 908; //ok
+    uint32 costItemNum = 11; //ok
+    uint32 schedule_id = 13; //ok
+    uint32 wishItemId = 2003; //KKDFKKEMEBA
+    string gachaProbUrlOversea = 883; //ok
+    string gachaProbUrl = 15; //ok
+    repeated GachaUpInfo gacha_up_info_list = 771; //ok
+    string gachaRecordUrl = 8; //ok
+    string gachaRecordUrlOversea = 1371; //ok
+    repeated uint32 displayUp5ItemList = 793; //ok
+    bool is_new_wish = 1748; //ok
+    uint32 gachaType = 6; //ok
+    uint32 tenCostItemNum = 5; //ok
+    uint32 leftGachaTimes = 14; //ok
+    uint32 wishProgress = 1986; //ok? KDFPKENAIOJ
+    repeated uint32 displayUp4ItemList = 565; //ok
+    string gachaPrefabPath = 2; //ok
 }
-