diff --git a/proto/GachaInfo.proto b/proto/GachaInfo.proto
index b44dbc8d..1c832312 100644
--- a/proto/GachaInfo.proto
+++ b/proto/GachaInfo.proto
@@ -32,17 +32,17 @@ message GachaInfo {
 	uint32 tenCostItemId = 6;
 	uint32 gachaSortId = 11;
 	repeated uint32 displayUp4ItemList = 1285;
-	string gachaRecordUrlOversea = 1181;
-	string gachaProbUrlOversea = 1221;
+	string gachaRecordUrlOversea = 1221;
+	string gachaRecordUrl = 4;
+	string gachaProbUrlOversea = 1181;
+	string gachaProbUrl = 9;
 	uint32 begin_time = 3;
 	uint32 wishItemId = 870;
 	uint32 end_time = 7;
 	string gachaPreviewPrefabPath = 12;
 	string titleTextmap = 847;
 	repeated uint32 displayUp5ItemList = 1831;
-	uint32 gachaTimesLimit = 14;
-	string gachaRecordUrl = 9;
+	uint32 gachaTimesLimit = 14;	
 	repeated GachaUpInfo gacha_up_info_list = 1514;
-	uint32 costItemNum = 2;
-	string gachaProbUrl = 4;
+	uint32 costItemNum = 2;	
 }
diff --git a/proto/ShopGoods.proto b/proto/ShopGoods.proto
index cc73c075..e0bbdf67 100644
--- a/proto/ShopGoods.proto
+++ b/proto/ShopGoods.proto
@@ -17,30 +17,29 @@
 syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
 import "ItemParam.proto";
+
 // Obf: OBABFCEJLGK
 message ShopGoods {
-	uint32 scoin = 4; //Stardust // paimon
-	uint32 mcoin = 11; // FEMEEIEHBBL
-	uint32 goods_id = 8; // benar
-	repeated ItemParam cost_item_list = 3;
-	uint32 min_level = 1690;
-	uint32 bought_num = 14;
-	uint32 DIHOGOJNKHB = 923;
+	uint32 hcoin = 15; // primogem
+	uint32 scoin = 7; // mora
+    uint32 mcoin = 11; // crystals
+    uint32 goods_id = 8;
+    repeated ItemParam cost_item_list = 3;
+	uint32 buy_limit = 4;
+    uint32 max_level = 1690;
+	uint32 min_level = 1946;
+    uint32 bought_num = 14;    
+    uint32 secondary_sheet_id = 1950;
+    repeated uint32 preGoodsIdList = 5;	    
+    ItemParam goods_item = 1;    
+    uint32 single_limit = 2;
+	uint32 discount_id = 10;
+	uint32 discount_end_time = 923;
+    uint32 discount_begin_time = 898;
+
 	uint32 begin_time = 13;
-	uint32 BNEKKILPEKF = 1950;
-	repeated uint32 preGoodsIdList = 5;
-	uint32 buy_limit = 10;
-	ItemParam goods_item = 1;
-	uint32 hcoin = 12;
-	uint32 EKGBDJFIDJO = 2;
-	uint32 KKKOCADJCHM = 898;
-	uint32 OENMLOAFHMJ = 1946;
-	uint32 max_level = 7;
-	uint32 end_time = 6;
-	uint32 uk15 = 15;
-	uint32 next_refresh_time = 9;
-	// mcoin = Crystals
-	// scoin = Stardust
-	// hcoin = Starglitter
+    
+    uint32 end_time = 6;    
+    uint32 next_refresh_time = 9;
 	
 }