jolly/jr-web #1118 [CLOSE]本家20年6月更新分の取り込み

Description

opened by wada at 2021-09-08T18:33:10; updated 2025-06-19T10:51:05

概要

更新内容 jolly/jr-rzst#34

テスト方法、確認した内容

テストした内容や、確認した内容を記載。

TODO

このPull Requestに対して、後続で発生する積み残し作業などがある場合は記載。

wada delete_label at 2021-09-09T15:28:59: デベロップへマージ

wada change_title at 2021-09-09T15:29:22: [WIP]本家20年6月更新分の取り込み本家20年6月更新分の取り込み

wada close_comment at 2021-09-09T15:29:48: 一部更新を除外するためクローズ

wada change_title at 2021-09-09T15:30:24: 本家20年6月更新分の取り込み [CLOSE]本家20年6月更新分の取り込み

Metadata

type	Pull Request
state	closed
opened by	wada
assigned	wada
registered	2021-09-08T18:33:10
updated	2025-06-19T10:51:05

Pull Request

base	jolly/jr-web:develop
head	jolly/jr-web:rzst_2006
from	647257e2a4ffe156533a22178018d580ed820cb4
to	df2f6c1343bca76ed4280496f217da164ac964ac

Commit range

base	`647257e2a4ffe156533a22178018d580ed820cb4`
head	`df2f6c1343bca76ed4280496f217da164ac964ac`
base branch	jolly/jr-web:develop
head branch	jolly/jr-web:rzst_2006

View commits

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

Files changed72 filesView patch

status	file
modified	`lib/SkillFunc.inc`
modified	`lib/SubFunc.inc`
modified	`lib/conf/define.inc`
modified	`lib/public/Mission.inc`
modified	`lib/public/Quest-TeamWarDetail.inc`
added	`public_html/img/limit_break/card_effect/card_property_monster/animation_img_1.png`
added	`public_html/img/limit_break/card_effect/card_property_monster/animation_img_10.png`
added	`public_html/img/limit_break/card_effect/card_property_monster/animation_img_11.png`
added	`public_html/img/limit_break/card_effect/card_property_monster/animation_img_12.png`
added	`public_html/img/limit_break/card_effect/card_property_monster/animation_img_13.png`
added	`public_html/img/limit_break/card_effect/card_property_monster/animation_img_14.png`
added	`public_html/img/limit_break/card_effect/card_property_monster/animation_img_15.png`
added	`public_html/img/limit_break/card_effect/card_property_monster/animation_img_16.png`
added	`public_html/img/limit_break/card_effect/card_property_monster/animation_img_17.png`
added	`public_html/img/limit_break/card_effect/card_property_monster/animation_img_18.png`
added	`public_html/img/limit_break/card_effect/card_property_monster/animation_img_19.png`
added	`public_html/img/limit_break/card_effect/card_property_monster/animation_img_2.png`
added	`public_html/img/limit_break/card_effect/card_property_monster/animation_img_20.png`
added	`public_html/img/limit_break/card_effect/card_property_monster/animation_img_3.png`
added	`public_html/img/limit_break/card_effect/card_property_monster/animation_img_4.png`
added	`public_html/img/limit_break/card_effect/card_property_monster/animation_img_5.png`
added	`public_html/img/limit_break/card_effect/card_property_monster/animation_img_6.png`
added	`public_html/img/limit_break/card_effect/card_property_monster/animation_img_7.png`
added	`public_html/img/limit_break/card_effect/card_property_monster/animation_img_8.png`
added	`public_html/img/limit_break/card_effect/card_property_monster/animation_img_9.png`
added	`public_html/img/limit_break/card_effect/card_property_ocean_dark/animation_img_1.png`
added	`public_html/img/limit_break/card_effect/card_property_ocean_dark/animation_img_10.png`
added	`public_html/img/limit_break/card_effect/card_property_ocean_dark/animation_img_11.png`
added	`public_html/img/limit_break/card_effect/card_property_ocean_dark/animation_img_12.png`
added	`public_html/img/limit_break/card_effect/card_property_ocean_dark/animation_img_13.png`
added	`public_html/img/limit_break/card_effect/card_property_ocean_dark/animation_img_14.png`
added	`public_html/img/limit_break/card_effect/card_property_ocean_dark/animation_img_15.png`
added	`public_html/img/limit_break/card_effect/card_property_ocean_dark/animation_img_16.png`
added	`public_html/img/limit_break/card_effect/card_property_ocean_dark/animation_img_17.png`
added	`public_html/img/limit_break/card_effect/card_property_ocean_dark/animation_img_18.png`
added	`public_html/img/limit_break/card_effect/card_property_ocean_dark/animation_img_19.png`
added	`public_html/img/limit_break/card_effect/card_property_ocean_dark/animation_img_2.png`
added	`public_html/img/limit_break/card_effect/card_property_ocean_dark/animation_img_20.png`
added	`public_html/img/limit_break/card_effect/card_property_ocean_dark/animation_img_3.png`
added	`public_html/img/limit_break/card_effect/card_property_ocean_dark/animation_img_4.png`
added	`public_html/img/limit_break/card_effect/card_property_ocean_dark/animation_img_5.png`
added	`public_html/img/limit_break/card_effect/card_property_ocean_dark/animation_img_6.png`
added	`public_html/img/limit_break/card_effect/card_property_ocean_dark/animation_img_7.png`
added	`public_html/img/limit_break/card_effect/card_property_ocean_dark/animation_img_8.png`
added	`public_html/img/limit_break/card_effect/card_property_ocean_dark/animation_img_9.png`
added	`public_html/img/limit_break/card_effect/card_property_ocean_light/animation_img_1.png`
added	`public_html/img/limit_break/card_effect/card_property_ocean_light/animation_img_10.png`
added	`public_html/img/limit_break/card_effect/card_property_ocean_light/animation_img_11.png`
added	`public_html/img/limit_break/card_effect/card_property_ocean_light/animation_img_12.png`
added	`public_html/img/limit_break/card_effect/card_property_ocean_light/animation_img_13.png`
added	`public_html/img/limit_break/card_effect/card_property_ocean_light/animation_img_14.png`
added	`public_html/img/limit_break/card_effect/card_property_ocean_light/animation_img_15.png`
added	`public_html/img/limit_break/card_effect/card_property_ocean_light/animation_img_16.png`
added	`public_html/img/limit_break/card_effect/card_property_ocean_light/animation_img_17.png`
added	`public_html/img/limit_break/card_effect/card_property_ocean_light/animation_img_18.png`
added	`public_html/img/limit_break/card_effect/card_property_ocean_light/animation_img_19.png`
added	`public_html/img/limit_break/card_effect/card_property_ocean_light/animation_img_2.png`
added	`public_html/img/limit_break/card_effect/card_property_ocean_light/animation_img_20.png`
added	`public_html/img/limit_break/card_effect/card_property_ocean_light/animation_img_3.png`
added	`public_html/img/limit_break/card_effect/card_property_ocean_light/animation_img_4.png`
added	`public_html/img/limit_break/card_effect/card_property_ocean_light/animation_img_5.png`
added	`public_html/img/limit_break/card_effect/card_property_ocean_light/animation_img_6.png`
added	`public_html/img/limit_break/card_effect/card_property_ocean_light/animation_img_7.png`
added	`public_html/img/limit_break/card_effect/card_property_ocean_light/animation_img_8.png`
added	`public_html/img/limit_break/card_effect/card_property_ocean_light/animation_img_9.png`
modified	`public_html/js/JOLLYROGER.js`
modified	`public_html/js/JOLLYROGER_battle.js`
modified	`public_html/template/Mission.tpl`
modified	`public_html/template/OceanArea-Default.tpl`
modified	`public_html/template/OceanArea-ShipDetail.tpl`
modified	`public_html/template/Quest-LoginBonus.tpl`
modified	`public_html/template/Quest-TeamWarDetail.tpl`

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