jolly/jr-web #1122 【9/13】本家20年6月更新分の取り込み

Description

opened by wada at 2021-09-09T16:26:46; updated 2025-07-01T11:02:49

概要

2020/6更新分 jolly/jr-rzst#34

web: rzst_2006
db: rzst_2006

主な更新内容

スキルの追加
覇戦リワードページのランキング変動値表示期間を延長
覇戦リワードの表示制御方法調整（鼓舞の非表示）
海域イベントの演出追加
ログインボーナスタブのバッジ表示

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

戦闘時にエラー発生しないか
覇戦リワードページの表示内容がおかしくなっていないか

TODO

管理画面の更新は別対応

Comment

#13552 by wada at 2021-09-09T16:27:44; updated 2021-09-09T16:27:44

@iwamoto @kouho
レビューお願いします。
目に見える更新はほとんど無いですが、エラーが発生しないか確認お願いします。

wada change_title at 2021-09-09T16:28:18: 本家20年6月更新分の取り込み【9/13】本家20年6月更新分の取り込み

wada assign at 2021-09-10T10:47:25: Not assigned:wada

Comment

#13633 by wada at 2021-09-13T14:10:45; updated 2021-09-13T14:10:45

他の更新多いので、2,3日遅れても大丈夫です。

Comment

#13663 by iwamoto at 2021-09-14T12:18:01; updated 2021-09-14T12:18:01

@wada
確認しました。
問題ないと思います。

iwamoto add_label at 2021-09-14T12:18:06: 岩本 LGTM

Comment

#13726 by kouho at 2021-09-15T18:31:45; updated 2021-09-15T18:31:45

@wada
確認しました。問題ないと思います。

kouho add_label at 2021-09-15T18:31:49: 皇甫 LGTM

wada merge at 2021-09-21T10:19:27: 【9/13】本家20年6月更新分の取り込み

wada close at 2021-09-21T10:19:27: Close

wada refer at 2021-09-21T16:09:48: 1169:【9/22】リリース

wada refer at 2021-09-22T09:53:50: 1173:【9/22】リリース

Metadata

type	Pull Request
state	closed
opened by	wada
assigned	wada
registered	2021-09-09T16:26:46
updated	2025-07-01T11:02:49

Labels

レビュー待ちデベロップへマージ皇甫 LGTM

Pull Request

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

Commit range

base	`647257e2a4ffe156533a22178018d580ed820cb4`
head	`67a4bb9f7e6e74511d8c323c58b3acb642b6ac64`
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 changed74 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/js/jr_battle.min.js`
modified	`public_html/js/jr_main.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`

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