jolly/jr-web #478 【12/11】リリース

Description

opened by wada at 2020-12-09T13:52:29; updated 2023-07-27T13:34:14

【12/11】復刻ジークガチャ #467

wada merge at 2020-12-11T10:49:44: 【12/11】リリース

wada close at 2020-12-11T10:49:44: Close

Metadata

type	Pull Request
state	closed
opened by	wada
assigned
registered	2020-12-09T13:52:29
updated	2023-07-27T13:34:14

Labels

マスタへマージ

Pull Request

base	jolly/jr-web:master
head	jolly/jr-web:release_20201211
from	ae7a534398050f3cf41d0afd218e2603c86c68a7
to	80edb9064372dce06332e2bfa83233b01aeca72f

Commit range

base	`ae7a534398050f3cf41d0afd218e2603c86c68a7`
head	`80edb9064372dce06332e2bfa83233b01aeca72f`
base branch	jolly/jr-web:master
head branch	jolly/jr-web:release_20201211

View commits

Commit details are loaded from Git when a dynamic archive server is running, or can be embedded with --include-commits.

Files changed102 filesView patch

status	file
modified	`database/jrye.sql`
modified	`lib/SubFunc.inc`
modified	`lib/ajax/battle_player.inc`
modified	`lib/ajax/main_build.inc`
modified	`lib/ajax/main_default.inc`
modified	`lib/class/battle/BattleArchiveManager.class.php`
modified	`lib/class/const/PresentNameConst.class.php`
modified	`lib/class/present_box/PresentBoxContent.class.php`
modified	`lib/conf/class/BuildEventItemConfig.class.php`
modified	`lib/conf/class/RaidMonsterConfig.class.php`
modified	`lib/conf/class/RaidMonsterTypeConfig.class.php`
added	`lib/conf/class/ReprintGachaConfig.class.php`
modified	`lib/conf/define_y.inc`
modified	`lib/exec/team_battle.php`
modified	`lib/models/Yamada_point.php`
added	`lib/models/Yamada_point_quest.php`
added	`lib/models/dao/team_war_battle_archive.php`
modified	`lib/models/gacha/Reprint_step.php`
modified	`lib/models/raid/Attack_bonus.php`
modified	`lib/public/Bar-Gacha.inc`
modified	`lib/public/Bar-GachaInfo.inc`
modified	`lib/public/Bar-GachaReset.inc`
modified	`lib/public/Bar-GachaResetResult.inc`
modified	`lib/public/Bar-GachaResult.inc`
modified	`lib/public/Battle-Result.inc`
modified	`lib/public/Quest-Daily.inc`
modified	`lib/public/Quest-DailyClear.inc`
modified	`lib/public/Raid-Default.inc`
added	`public_html/img/banner/RaidEvent/raid_banner_10_1.jpg`
added	`public_html/img/banner/RaidEvent/raid_banner_10_2.jpg`
added	`public_html/img/banner/RaidEvent/raid_banner_9_1.jpg`
added	`public_html/img/banner/RaidEvent/raid_banner_9_2.jpg`
modified	`public_html/img/gacha/113/banner_gacha113.jpg`
modified	`public_html/img/gacha/113/banner_gacha113_2.jpg`
modified	`public_html/img/gacha/113/gacha113.jpg`
modified	`public_html/img/gacha/113/gacha113_2.jpg`
modified	`public_html/img/gacha/113/gacha113_card_info132.jpg`
modified	`public_html/img/gacha/113/gacha113_card_info145.jpg`
modified	`public_html/img/gacha/113/gacha113_card_info147.jpg`
modified	`public_html/img/gacha/113/gacha113_card_info44.jpg`
modified	`public_html/img/gacha/113/gacha113_info.jpg`
added	`public_html/img/gacha/113/gacha113_info2.jpg`
added	`public_html/img/gacha/113/gacha113_info3.jpg`
added	`public_html/img/gacha/113/gacha113_info4.jpg`
modified	`public_html/img/gacha/113/gacha113_title.jpg`
added	`public_html/img/gacha/113/gacha113_title2.jpg`
modified	`public_html/img/gacha/121/banner_gacha121.jpg`
modified	`public_html/img/gacha/121/banner_gacha121_2.jpg`
modified	`public_html/img/gacha/121/gacha121.jpg`
modified	`public_html/img/gacha/121/gacha121_2.jpg`
modified	`public_html/img/gacha/121/gacha121_card_info117.jpg`
modified	`public_html/img/gacha/121/gacha121_card_info32.jpg`
modified	`public_html/img/gacha/121/gacha121_card_info72.jpg`
modified	`public_html/img/gacha/121/gacha121_card_info73.jpg`
modified	`public_html/img/gacha/121/gacha121_info.jpg`
modified	`public_html/img/gacha/121/gacha121_info2.jpg`
modified	`public_html/img/gacha/121/gacha121_info3.jpg`
added	`public_html/img/gacha/121/gacha121_info4.jpg`
modified	`public_html/img/gacha/121/gacha121_title.jpg`
added	`public_html/img/gacha/121/gacha121_title2.jpg`
added	`public_html/img/item/120/yamada_point.jpg`
added	`public_html/img/login/loginbonus/beginner/beginner_login_145.jpg`
added	`public_html/img/login/loginbonus/beginner/beginner_login_present_7_145.jpg`
added	`public_html/img/ranking/event_raid/info_raid9.jpg`
added	`public_html/img/toppic/campaign/yamada_toppic_main4_1_end.jpg`
added	`public_html/img/toppic/campaign/yamada_toppic_main4_2_end.jpg`
added	`public_html/img/toppic/campaign/yamada_toppic_main5_1_end.jpg`
added	`public_html/img/toppic/campaign/yamada_toppic_main5_2_end.jpg`
added	`public_html/img/toppic/campaign/yamada_toppic_main5_3_end.jpg`
added	`public_html/img/toppic/campaign/yamada_toppic_main5_4_end.jpg`
added	`public_html/img/toppic/campaign/yamada_toppic_main6_1_end.jpg`
added	`public_html/img/toppic/campaign/yamada_toppic_main6_2_end.jpg`
added	`public_html/img/toppic/campaign/yamada_toppic_main6_3_end.jpg`
added	`public_html/img/toppic/campaign/yamada_toppic_main6_4_end.jpg`
added	`public_html/img/toppic/campaign/yamada_toppic_main6_5_end.jpg`
added	`public_html/img/toppic/campaign/yamada_toppic_main6_6_end.jpg`
added	`public_html/img/toppic/campaign/yamada_toppic_main7_1.jpg`
added	`public_html/img/toppic/campaign/yamada_toppic_main7_1_end.jpg`
added	`public_html/img/toppic/campaign/yamada_toppic_main7_2.jpg`
added	`public_html/img/toppic/campaign/yamada_toppic_main7_2_end.jpg`
added	`public_html/img/toppic/campaign/yamada_toppic_main7_4.jpg`
added	`public_html/img/toppic/campaign/yamada_toppic_main7_4_end.jpg`
added	`public_html/img/toppic/campaign/yamada_toppic_main7_5.jpg`
added	`public_html/img/toppic/campaign/yamada_toppic_main7_5_end.jpg`
added	`public_html/img/toppic/campaign/yamada_toppic_main7_6.jpg`
added	`public_html/img/toppic/campaign/yamada_toppic_main7_6_end.jpg`
added	`public_html/img/toppic/campaign/yamada_toppic_main7_7.jpg`
added	`public_html/img/toppic/campaign/yamada_toppic_main7_7_end.jpg`
added	`public_html/img/toppic/campaign/yamada_toppic_main7_8.jpg`
added	`public_html/img/toppic/campaign/yamada_toppic_main7_8_end.jpg`
modified	`public_html/js/JOLLYROGER.js`
modified	`public_html/js/jr_main.js`
modified	`public_html/template/Bar-GachaInfo.tpl`
modified	`public_html/template/Bar-GachaReprint2.tpl`
modified	`public_html/template/Bar-GachaResetResult.tpl`
modified	`public_html/template/Bar-GachaResultReprint2.tpl`
modified	`public_html/template/Build-CancelCheck.tpl`
modified	`public_html/template/Build-ClockInput.tpl`
modified	`public_html/template/Main.tpl`
modified	`public_html/template/Quest-Daily.tpl`
modified	`public_html/template/Quest-TeamWarDetail.tpl`
modified	`public_html/template/header_sp.tpl`

Patch body is stored as a separate file to keep this page lightweight.