jolly/jr-web #1017 【8/2 15:00】バトル画面改修リリース #1012

Description

opened by wada at 2021-08-02T14:51:22; updated 2025-03-06T15:06:28

概要

【7/30】バトルプロセスデザイン + 3倍速追加 #979
【即日】8月ヤマダptキャンペーン画像 #1014
アスラGK期間修正

wada change_title at 2021-08-02T14:51:29: Release 080215 【8/2 15:00】バトル画面改修リリース #1012

wada add_label at 2021-08-02T14:51:33: マスタへマージ

wada merge at 2021-08-02T14:54:22: 【8/2 15:00】バトル画面改修リリース #1012

wada close at 2021-08-02T14:54:22: Close

Metadata

type	Pull Request
state	closed
opened by	wada
assigned
registered	2021-08-02T14:51:22
updated	2025-03-06T15:06:28

Labels

マスタへマージ

Pull Request

base	jolly/jr-web:master
head	jolly/jr-web:release_080215
from	f2f7cec62e8e2e8752024f7ff3400582898f8653
to	e53c9f4c227fff3b0374c0795ed9b90422396dc2

Commit range

base	`f2f7cec62e8e2e8752024f7ff3400582898f8653`
head	`e53c9f4c227fff3b0374c0795ed9b90422396dc2`
base branch	jolly/jr-web:master
head branch	jolly/jr-web:release_080215

View commits

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

Files changed32 filesView patch

status	file
modified	`cpanel_html/template/m_battle_demo_battle.tpl`
modified	`cpanel_html/template/m_battle_demo_battle_2.tpl`
modified	`cpanel_html/template/m_battle_simulator_result_fp.tpl`
modified	`cpanel_html/template/m_ocean_area_battle_replay_play.tpl`
modified	`lib/ajax/battle_save_speed.inc`
modified	`lib/conf/define_y.inc`
modified	`public_html/img/battle/control/bar_1.png`
modified	`public_html/img/battle/control/bar_2.png`
modified	`public_html/img/battle/control/bar_3.png`
modified	`public_html/img/battle/control/bar_4.png`
added	`public_html/img/battle/control/bar_5.png`
added	`public_html/img/battle/control/hpframe.png`
added	`public_html/img/battle/control/no_chain_frame.png`
added	`public_html/img/info_jrye/campaign_yamada/875/info1.jpg`
added	`public_html/img/info_jrye/campaign_yamada/876/info1.jpg`
added	`public_html/img/info_jrye/campaign_yamada/878/info1.jpg`
added	`public_html/img/toppic/campaign/yamada_toppic_main_202108_1.jpg`
added	`public_html/img/toppic/campaign/yamada_toppic_main_202108_1_end.jpg`
added	`public_html/img/toppic/campaign/yamada_toppic_main_202108_2.jpg`
added	`public_html/img/toppic/campaign/yamada_toppic_main_202108_2_end.jpg`
added	`public_html/img/toppic/campaign/yamada_toppic_main_202108_3.jpg`
added	`public_html/img/toppic/campaign/yamada_toppic_main_202108_3_end.jpg`
added	`public_html/img/toppic/campaign/yamada_toppic_main_202108_4.jpg`
added	`public_html/img/toppic/campaign/yamada_toppic_main_202108_4_end.jpg`
added	`public_html/img/toppic/campaign/yamada_toppic_main_202108_5.jpg`
added	`public_html/img/toppic/campaign/yamada_toppic_main_202108_5_end.jpg`
added	`public_html/img/toppic/campaign/yamada_toppic_main_202108_6.jpg`
added	`public_html/img/toppic/campaign/yamada_toppic_main_202108_6_end.jpg`
modified	`public_html/js/JOLLYROGER_battle.js`
modified	`public_html/js/jr_battle.min.js`
modified	`public_html/template/Battle.tpl`
modified	`public_html/template/header_sp.tpl`

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