Merge branch 'development' into dev-quests

src/main/java/emu/grasscutter/game/gacha/GachaBanner.java

@@ -102,6 +102,11 @@ public class GachaBanner {
 						+ lr(DISPATCH_INFO.accessAddress, DISPATCH_INFO.bindAddress) + ":"
 						+ lr(DISPATCH_INFO.accessPort, DISPATCH_INFO.bindPort)
 						+ "/gacha?s=" + sessionKey + "&gachaType=" + gachaType;
+		String details = "http" + (DISPATCH_INFO.encryption.useInRouting ? "s" : "") + "://"
+						+ lr(DISPATCH_INFO.accessAddress, DISPATCH_INFO.bindAddress) + ":"
+						+ lr(DISPATCH_INFO.accessPort, DISPATCH_INFO.bindPort)
+						+ "/gacha/details?s=" + sessionKey + "&gachaType=" + gachaType;
+
 		// Grasscutter.getLogger().info("record = " + record);
 		GachaInfo.Builder info = GachaInfo.newBuilder()
 				.setGachaType(this.getGachaType())
@@ -112,8 +117,8 @@ public class GachaBanner {
 	            .setCostItemNum(1)
 	            .setGachaPrefabPath(this.getPrefabPath())
 	            .setGachaPreviewPrefabPath(this.getPreviewPrefabPath())
-	            .setGachaProbUrl(record)
-	            .setGachaProbUrlOversea(record)
+	            .setGachaProbUrl(details)
+	            .setGachaProbUrlOversea(details)
 	            .setGachaRecordUrl(record)
 	            .setGachaRecordUrlOversea(record)
 	            .setTenCostItemId(this.getCostItem())

src/main/java/emu/grasscutter/game/gacha/GachaManager.java

@@ -65,7 +65,23 @@ public class GachaManager {
 	public Int2ObjectMap<GachaBanner> getGachaBanners() {
 		return gachaBanners;
 	}
-	
+
+	public int[] getYellowAvatars() {
+		return this.yellowAvatars;
+	}
+	public int[] getYellowWeapons() {
+		return this.yellowWeapons;
+	}
+	public int[] getPurpleAvatars() {
+		return this.purpleAvatars;
+	}
+	public int[] getPurpleWeapons() {
+		return this.purpleWeapons;
+	}
+	public int[] getBlueWeapons() {
+		return this.blueWeapons;
+	}
+
 	public int randomRange(int min, int max) {
 		return ThreadLocalRandom.current().nextInt(max - min + 1) + min;
 	}