jolly/jr-web #2444 【12/2】本家スキルマージ

Description

opened by wada at 2022-12-01T11:58:02; updated 2022-12-02T15:20:49

【11/24】本家スキルマージ #2386

【12/2】本家スキルマージ jolly/jrye-db#242

#24131 by wada at 2022-12-01T11:58:12; updated 2022-12-01T11:58:12

@kouho
確認お願いします。

#24173 by kouho at 2022-12-02T10:23:03; updated 2022-12-02T10:23:03

@wada
確認OKです

kouho add_label at 2022-12-02T10:23:16: 皇甫 LGTM

#24180 by kouho at 2022-12-02T10:57:24; updated 2022-12-02T10:57:24

@wada
バトルリザルト詳細確認可能に #2375
のPRもマージしました。

wada merge at 2022-12-02T15:14:56: 【12/2】本家スキルマージ

wada close at 2022-12-02T15:14:56: Close

wada delete_branch at 2022-12-02T15:20:46: release_skill_merge

レビュー待ちマスタへマージ皇甫 LGTM

base	jolly/jr-web:master
head	jolly/jr-web:release_skill_merge
from	2d672936bb6f5c6c91944cdd1ad6464eda0c2280
to	05dae9c6467c5bfa4946d2a34b133c0bb07fac31

base	`2d672936bb6f5c6c91944cdd1ad6464eda0c2280`
head	`05dae9c6467c5bfa4946d2a34b133c0bb07fac31`
base branch	jolly/jr-web:master
head branch	jolly/jr-web:release_skill_merge

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

Files changed8 filesView patch

status	file
modified	`lib/SkillFunc.inc`
modified	`lib/SubFunc.inc`
modified	`lib/conf/define.inc`
modified	`lib/public/Battle-Result.inc`
modified	`public_html/js/JOLLYROGER_battle.js`
modified	`public_html/js/jr_battle.min.js`
modified	`public_html/template/Battle-Result.tpl`
modified	`public_html/template/header_sp.tpl`

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