jolly/jr-web #711 【4/5】リリース

Description

opened by iwamoto at 2021-04-05T09:54:06; updated 2024-04-15T16:10:31

【4/5】イヴガチャ #681

web:``relase_0405``
db:``gacha_0405``

iwamoto merge at 2021-04-05T10:40:45: 【4/5】リリース

iwamoto close at 2021-04-05T10:40:45: Close

Metadata

type	Pull Request
state	closed
opened by	iwamoto
assigned	iwamoto
registered	2021-04-05T09:54:06
updated	2024-04-15T16:10:31

Labels

レビュー待ちマスタへマージ

Pull Request

base	jolly/jr-web:master
head	jolly/jr-web:release_0405
from	07d86eaec0e99672550e01d20376317a28356a86
to	2e56d5ac55575b80e40a449f96f6e024915a3946

Commit range

base	`07d86eaec0e99672550e01d20376317a28356a86`
head	`2e56d5ac55575b80e40a449f96f6e024915a3946`
base branch	jolly/jr-web:master
head branch	jolly/jr-web:release_0405

View commits

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

Files changed132 filesView patch

status	file
modified	`lib/SubFunc.inc`
modified	`lib/SubFunc_mission.inc`
modified	`lib/ajax/areaItem_result.inc`
modified	`lib/conf/class/BattleEventConfig.class.php`
modified	`lib/conf/class/GachaConfig.class.php`
modified	`lib/conf/class/ReprintGachaConfig.class.php`
modified	`lib/conf/define_y.inc`
modified	`lib/exec/tool_event_battle_present.inc`
modified	`lib/models/Gacha_payment.php`
modified	`lib/models/Yamada_athletic.php`
modified	`lib/public/AreaItem.inc`
modified	`lib/public/Bar-Gacha.inc`
modified	`lib/public/Bar-GachaResult.inc`
modified	`lib/public/Ranking-Event.inc`
added	`public_html/img/banner/RaidEvent/banner_7_1_1.jpg`
added	`public_html/img/banner/RaidEvent/banner_7_1_2.jpg`
added	`public_html/img/banner/RaidEvent/banner_7_1_end_1.jpg`
added	`public_html/img/banner/RaidEvent/banner_7_1_end_2.jpg`
modified	`public_html/img/gacha/128/banner_gacha128.jpg`
modified	`public_html/img/gacha/128/banner_gacha128_2.jpg`
added	`public_html/img/gacha/128/composition_bonus.jpg`
modified	`public_html/img/gacha/128/gacha128.jpg`
modified	`public_html/img/gacha/128/gacha128_2.jpg`
modified	`public_html/img/gacha/128/gacha128_card_info221.jpg`
modified	`public_html/img/gacha/128/gacha128_card_info241.jpg`
modified	`public_html/img/gacha/128/gacha128_card_info278.jpg`
modified	`public_html/img/gacha/128/gacha128_card_info97.jpg`
modified	`public_html/img/gacha/128/gacha128_info.jpg`
modified	`public_html/img/gacha/128/gacha128_info2.jpg`
added	`public_html/img/gacha/128/gacha128_info3.jpg`
added	`public_html/img/gacha/128/gacha128_info4.jpg`
modified	`public_html/img/gacha/128/gacha128_title.jpg`
added	`public_html/img/gacha/128/gacha128_title2.jpg`
added	`public_html/img/gacha/153/banner_gacha153.jpg`
added	`public_html/img/gacha/153/banner_gacha153_2.jpg`
modified	`public_html/img/gacha/153/gacha153.jpg`
modified	`public_html/img/gacha/153/gacha153_2.jpg`
modified	`public_html/img/gacha/153/gacha153_card_info31.jpg`
modified	`public_html/img/gacha/153/gacha153_card_info39.jpg`
modified	`public_html/img/gacha/153/gacha153_card_info40.jpg`
modified	`public_html/img/gacha/153/gacha153_card_info63.jpg`
modified	`public_html/img/gacha/153/gacha153_info.jpg`
modified	`public_html/img/gacha/153/gacha153_info2.jpg`
modified	`public_html/img/gacha/153/gacha153_info3.jpg`
added	`public_html/img/gacha/153/gacha153_info4.jpg`
modified	`public_html/img/gacha/153/gacha153_title.jpg`
added	`public_html/img/gacha/153/gacha153_title2.jpg`
added	`public_html/img/gacha/stepboxinfo/153/info1.jpg`
added	`public_html/img/gacha/stepboxinfo/153/info2.jpg`
added	`public_html/img/gacha/stepboxinfo/153/info3.jpg`
added	`public_html/img/gacha/stepboxinfo/153/info4.jpg`
added	`public_html/img/gacha/stepboxinfo/153/info5.jpg`
added	`public_html/img/gacha/stepboxinfo/153/info6.jpg`
added	`public_html/img/info_event/info_event_155_1.jpg`
added	`public_html/img/info_event/info_event_155_2.jpg`
added	`public_html/img/info_event/info_event_156_1.jpg`
added	`public_html/img/info_event/info_event_156_2.jpg`
added	`public_html/img/info_event/info_event_157_1.jpg`
added	`public_html/img/info_event/info_event_157_2.jpg`
added	`public_html/img/info_event/info_event_158_1.jpg`
added	`public_html/img/info_event/info_event_158_2.jpg`
added	`public_html/img/info_event/info_event_159_1.jpg`
added	`public_html/img/info_event/info_event_159_2.jpg`
added	`public_html/img/info_jrye/612/info1.jpg`
added	`public_html/img/info_jrye/612/info2.jpg`
added	`public_html/img/info_jrye/612/info3-1.jpg`
added	`public_html/img/info_jrye/612/info3.jpg`
added	`public_html/img/info_jrye/612/info4-1.jpg`
added	`public_html/img/info_jrye/612/info4-2.jpg`
added	`public_html/img/info_jrye/612/info4-3.jpg`
added	`public_html/img/info_jrye/612/info4-4.jpg`
added	`public_html/img/info_jrye/613/event_logo.png`
added	`public_html/img/info_jrye/613/info1.jpg`
added	`public_html/img/info_jrye/613/info2.jpg`
added	`public_html/img/info_jrye/613/info5_2.jpg`
added	`public_html/img/info_jrye/613/info6_5.jpg`
added	`public_html/img/info_jrye/613/info7_2.jpg`
added	`public_html/img/info_jrye/613/itemrank1.png`
added	`public_html/img/info_jrye/613/itemrank2.png`
added	`public_html/img/info_jrye/613/itemrank3.png`
added	`public_html/img/info_jrye/614/info3-1.jpg`
added	`public_html/img/info_jrye/614/info4.jpg`
added	`public_html/img/info_jrye/614/vs-reward1.jpg`
added	`public_html/img/info_jrye/614/vs-reward2.jpg`
added	`public_html/img/info_jrye/614/vs-reward3.jpg`
added	`public_html/img/info_jrye/614/vs-reward4.jpg`
added	`public_html/img/info_jrye/616/info1.jpg`
added	`public_html/img/info_jrye/616/info2.jpg`
added	`public_html/img/info_jrye/616/info3.jpg`
added	`public_html/img/info_jrye/616/info4.jpg`
added	`public_html/img/info_jrye/616/info5.jpg`
added	`public_html/img/info_jrye/616/info6.jpg`
added	`public_html/img/info_jrye/616/info7.jpg`
added	`public_html/img/info_jrye/617/info1.jpg`
added	`public_html/img/info_jrye/617/info2.jpg`
added	`public_html/img/info_jrye/617/info3.jpg`
added	`public_html/img/info_jrye/617/info4.jpg`
added	`public_html/img/info_jrye/617/info4_1.jpg`
added	`public_html/img/info_jrye/618/info2_1.jpg`
added	`public_html/img/info_jrye/618/info2_2.jpg`
added	`public_html/img/info_jrye/618/info2_3.jpg`
added	`public_html/img/info_jrye/618/info4.jpg`
added	`public_html/img/info_jrye/618/info5.jpg`
added	`public_html/img/info_jrye/618/info6.jpg`
added	`public_html/img/info_jrye/618/info6_1.jpg`
added	`public_html/img/info_jrye/618/info7.jpg`
added	`public_html/img/info_jrye/CharmInfo/128/info2-2.jpg`
added	`public_html/img/info_jrye/CharmInfo/128/info2.jpg`
added	`public_html/img/info_jrye/CharmInfo/128/info3-2.jpg`
added	`public_html/img/info_jrye/CharmInfo/128/info3.jpg`
added	`public_html/img/info_jrye/CharmInfo/128/info4-2.jpg`
added	`public_html/img/info_jrye/CharmInfo/128/info4.jpg`
added	`public_html/img/info_jrye/CharmInfo/128/info5-2.jpg`
added	`public_html/img/info_jrye/CharmInfo/128/info5.jpg`
added	`public_html/img/info_jrye/campaign_yamada/622/info1.jpg`
added	`public_html/img/info_jrye/campaign_yamada/622/info2.jpg`
added	`public_html/img/info_jrye/campaign_yamada/623/info1.jpg`
added	`public_html/img/login/loginbonus/beginner/beginner_login_97.jpg`
added	`public_html/img/login/loginbonus/beginner/beginner_login_present_7_97.jpg`
added	`public_html/img/pf/yamada/banner_athletic_3.jpg`
added	`public_html/img/ranking/event_battle/info8.jpg`
added	`public_html/img/toppic/campaign/yamada_toppic_main_202104_1.jpg`
added	`public_html/img/toppic/campaign/yamada_toppic_main_202104_2.jpg`
modified	`public_html/template/AreaItem.tpl`
modified	`public_html/template/Bar-Default.tpl`
modified	`public_html/template/Bar-GachaReprint2.tpl`
modified	`public_html/template/Bar-GachaResult.tpl`
modified	`public_html/template/Bar-Gacha_old.tpl`
modified	`public_html/template/Mission.tpl`
modified	`public_html/template/Ranking-Event.tpl`
modified	`tool/event/battle_event_html.txt`
modified	`tool/event/test_battle_event.php`

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