jolly/jr-web #1169 [CLOSE]リリース

Description

opened by wada at 2021-09-21T16:09:48; updated 2025-08-26T13:21:51

概要

【9/17】ヤマダapiについてログをとる #1145
【9/17】ajaxで特定のエラーが発生した際にTOPへ遷移させる #1135
【9/13】本家20年6月更新分の取り込み #1122

Comment

#13831 by kouho at 2021-09-21T17:37:12; updated 2021-09-21T17:37:12

@wada
差分を見たところ大丈夫そうですが、プルリクがdevelopに対してのマージでなくmasterに対してのマージに見えますのでご確認ください。

Comment

#13849 by iwamoto at 2021-09-21T19:05:05; updated 2021-09-21T19:05:05

@wada
レビューしました。内容は問題ないと思います。

wada delete_label at 2021-09-22T09:48:45: マスタへマージ

wada change_title at 2021-09-22T09:48:54: 【9/22】リリース [CLOSE]リリース

wada close_comment at 2021-09-22T09:50:19: 向き先変更のためクローズ

Metadata

type	Pull Request
state	closed
opened by	wada
assigned
registered	2021-09-21T16:09:48
updated	2025-08-26T13:21:51

Pull Request

base	jolly/jr-web:develop
head	jolly/jr-web:release_0922
from	2943dbc0e69b5054f88c32b47003402dbbb00f7b
to	0fc55a01db90c908525d46bdba27608034afcd7d

Commit range

base	`2943dbc0e69b5054f88c32b47003402dbbb00f7b`
head	`0fc55a01db90c908525d46bdba27608034afcd7d`
base branch	jolly/jr-web:develop
head branch	jolly/jr-web:release_0922

View commits

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

Files changed83 filesView patch

status	file
modified	`lib/SkillFunc.inc`
modified	`lib/SubFunc.inc`
modified	`lib/SubFunc/SubFunc_yamada.inc`
modified	`lib/ajax/mission_default.inc`
added	`lib/class/const/ErrorCode.class.php`
modified	`lib/class/platform/yamada/YamadaAPI.class.php`
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/js/JOLLYROGER_func.js`
modified	`public_html/js/JOLLYROGER_mission.js`
modified	`public_html/js/jr_battle.min.js`
modified	`public_html/js/jr_func.min.js`
modified	`public_html/js/jr_main.min.js`
modified	`public_html/js/jr_mission.min.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`
modified	`public_html/template/header_sp.tpl`

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