From 767e598beab589830cf48f17d4c56e07aef6ed16 Mon Sep 17 00:00:00 2001
From: AnimeGitB <AnimeGitB@bigblueball.in>
Date: Sun, 11 Sep 2022 21:04:36 +0930
Subject: [PATCH] Update banners (closes #1760)
---
CONTRIBUTING.md | 9 +++++++-
src/main/resources/defaults/data/Banners.json | 22 +++++++++----------
2 files changed, 19 insertions(+), 12 deletions(-)
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index fd62b1de..e6e65ba7 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -21,4 +21,11 @@ Your code should follow the standards set below:
- Dependencies that use a separate language (ex. Kotlin) that can run on a JVM are acceptable.
- Dependencies that require the use of native code (ex. JNI) are prohibited.
- Directly adding foreign code (other languages, ex. Kotlin) into the main codebase is prohibited.
-- Certain files and folders are forbidden to modify in Pull Requests and may only be changed by Write-Access members. The current list for this can be found in `.github/workflows/protect_files.yml`.
\ No newline at end of file
+- Certain files and folders are forbidden to modify in Pull Requests and may only be changed by Write-Access members. The current list for this can be found in `.github/workflows/protect_files.yml`.
+
+## Intellectual Property
+
+Please avoid adding any direct references to the following, whenever possible:
+- Game names
+- Character names
+- Notable weapon names
diff --git a/src/main/resources/defaults/data/Banners.json b/src/main/resources/defaults/data/Banners.json
index eaac49fc..a9d4972a 100644
--- a/src/main/resources/defaults/data/Banners.json
+++ b/src/main/resources/defaults/data/Banners.json
@@ -34,14 +34,14 @@
"gachaType": 301,
"scheduleId": 903,
"bannerType": "EVENT",
- "prefabPath": "GachaShowPanel_A091",
- "titlePath": "UI_GACHA_SHOW_PANEL_A045_TITLE",
+ "prefabPath": "GachaShowPanel_A094",
+ "titlePath": "UI_GACHA_SHOW_PANEL_A028_TITLE",
"costItemId": 223,
"beginTime": 0,
"endTime": 1924992000,
"sortId": 9998,
- "rateUpItems4": [1067, 1039, 1031],
- "rateUpItems5": [1069],
+ "rateUpItems4": [1025, 1043, 1068],
+ "rateUpItems5": [1037],
"weights5": [[1,80], [73,80], [90,10000]]
},
{
@@ -49,14 +49,14 @@
"gachaType": 400,
"scheduleId": 923,
"bannerType": "EVENT",
- "prefabPath": "GachaShowPanel_A092",
- "titlePath": "UI_GACHA_SHOW_PANEL_A018_TITLE",
+ "prefabPath": "GachaShowPanel_A095",
+ "titlePath": "UI_GACHA_SHOW_PANEL_A053_TITLE",
"costItemId": 223,
"beginTime": 0,
"endTime": 1924992000,
"sortId": 9998,
- "rateUpItems4": [1067, 1039, 1031],
- "rateUpItems5": [1030],
+ "rateUpItems4": [1025, 1043, 1068],
+ "rateUpItems5": [1054],
"fallbackItems5Pool2": [],
"weights5": [[1,80], [73,80], [90,10000]]
},
@@ -65,14 +65,14 @@
"gachaType": 302,
"scheduleId": 913,
"bannerType": "WEAPON",
- "prefabPath": "GachaShowPanel_A093",
+ "prefabPath": "GachaShowPanel_A096",
"titlePath": "UI_GACHA_SHOW_PANEL_A013_TITLE",
"costItemId": 223,
"beginTime": 0,
"endTime": 1924992000,
"sortId": 9997,
- "rateUpItems4":[15402, 11401, 13407, 14401, 12402],
- "rateUpItems5": [15511, 13504],
+ "rateUpItems4":[11403, 15405, 13401, 14409, 12401],
+ "rateUpItems5": [15502, 14506],
"fallbackItems5Pool1": [],
"weights4": [[1,600], [7,600], [8,6600], [10,12600]],
"weights5": [[1,100], [62,100], [73,7800], [80,10000]],
--
GitLab