PR

【5/31】本家シーズン4設定とチームミッション #2761

wada opened this at 2023-05-06T14:36:23; closed

Description

opened by wada at 2023-05-06T14:36:23; updated 2023-06-01T14:20:33

概要

https://docs.google.com/spreadsheets/d/13P64IG2HBr76pQ-Dz33_qiapTRv16vBVMfn-iNrjF8o/edit#gid=0
シーズン4とチームミッション関連のPRをマージ
シーズン1中に本番反映するので、シーズン2から表示されるよう対応

【4/14】パイレーツパス シーズン4以降のコミットを確認
シーズン3レビュー後こちらにマージ

マージPR

  • 7787【4/14】パイレーツパス シーズン4
  • 7977【今日中】冒険ページなどのチームミッションのバッジの位置対応
  • 8001【5/27】パイレーツパスの画像確認画面とチームミッションランキング画面修正

DB更新内容

【5/12】本家シーズン4設定 jolly/jrye-db#389
テーブルシート内のクエリを実行

  • master_season_pass_team_quest
  • user_season_pass_team_quest
  • log_season_pass_clear_team_quest

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

  • シーズン1

チームミッションが非表示
動作に問題がない

  • シーズン2

チームミッションの動作

Comment

#27270 by wada at 2023-05-06T14:36:35; updated 2023-05-06T14:36:35

@kouho
レビューお願いします。

wada change_title at 2023-05-08T09:42:46: 【5/8】本家シーズン4設定とチームミッション 【5/12】本家シーズン4設定とチームミッション

Comment

#27464 by kouho at 2023-05-15T14:54:06; updated 2023-05-15T14:54:06

@wada
シーズン1確認時にパイレーツパス画面で
count(): Parameter must be an array or an object that implements Countable
のエラーが出ます。

getTeamQuestsForDisplay関数で期間外はreturn にしていますが、return [] にした方がいいと思います。

wada delete_label at 2023-05-24T15:36:55: レビュー待ち
wada delete_label at 2023-05-24T15:36:56: デベロップへマージ
wada change_title at 2023-05-24T15:37:00: 【5/12】本家シーズン4設定とチームミッション 本家シーズン4設定とチームミッション
wada add_label at 2023-05-24T15:37:20: デベロップへマージ
wada add_label at 2023-05-24T15:37:22: レビュー待ち

Comment

#27732 by wada at 2023-05-24T15:37:42; updated 2023-05-24T15:37:42

@kouho
ありがとうございます。修正しました。

Comment

#27772 by wada at 2023-05-26T11:57:51; updated 2023-05-26T11:57:51

@kouho
確認お願いします。

wada change_title at 2023-05-29T13:53:23: 本家シーズン4設定とチームミッション 【5/31】本家シーズン4設定とチームミッション
kouho add_label at 2023-05-29T16:58:06: 皇甫 LGTM

Comment

#27792 by kouho at 2023-05-29T16:58:18; updated 2023-05-29T16:58:18

@wada
ありがとうございます。確認OKです。

wada merge at 2023-06-01T14:20:33: 【5/31】本家シーズン4設定とチームミッション
wada close at 2023-06-01T14:20:33: Close

Commit range

baseb53ef80fee9ff9febb914a3077e07df6203a7092
headb480b3aaf182847e7c2a94b45963ed6f77726f50
base branchjolly/jr-web:develop
head branchjolly/jr-web:pirate_pass_origin_4

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
statusfile
modifiedcpanel_html/index.php
modifiedcpanel_html/template/header.tpl
addedcpanel_html/template/m_pirates_pass_img_list.tpl
modifiedcpanel_html/template/m_season_pass_debug_default.tpl
modifiedlib/SubFunc.inc
modifiedlib/ajax/seasonPass_clearDailyQuest.inc
modifiedlib/ajax/seasonPass_clearSeasonQuest.inc
addedlib/ajax/seasonPass_clearTeamQuest.inc
modifiedlib/class/controller/JrControllerSeasonPass.class.php
modifiedlib/class/rdo/record/RdoRecord_UserSeasonPass.class.php
modifiedlib/class/season_pass/SeasonPass.class.php
modifiedlib/class/season_pass/SeasonPassQuestAction.class.php
modifiedlib/conf/class/CardPieceConfig.class.php
modifiedlib/conf/class/SeasonPassConfig.class.php
modifiedlib/conf/class/ValhallaConfig.class.php
addedlib/cpanel/m_pirates_pass_img_list.inc
modifiedlib/cpanel/m_season_pass_debug.inc
modifiedlib/public/Mission.inc
modifiedlib/public/TeamWar-Result.inc
modifiedlib/public/TeamWar.inc
modifiedlib/public/Valhalla.inc
modifiedpublic_html/ajax.php
addedpublic_html/img/common/teammission.jpg
addedpublic_html/img/season_pass/main/medal_lv1.png
addedpublic_html/img/season_pass/main/medal_lv2.png
addedpublic_html/img/season_pass/main/medal_lv3.png
addedpublic_html/img/season_pass/main/medal_lv4.png
addedpublic_html/img/season_pass/main/medal_lv5.png
addedpublic_html/img/season_pass/main/team/rank/1.png
addedpublic_html/img/season_pass/main/team/rank/10.png
addedpublic_html/img/season_pass/main/team/rank/11.png
addedpublic_html/img/season_pass/main/team/rank/12.png
addedpublic_html/img/season_pass/main/team/rank/13.png
addedpublic_html/img/season_pass/main/team/rank/14.png
addedpublic_html/img/season_pass/main/team/rank/15.png
addedpublic_html/img/season_pass/main/team/rank/16.png
addedpublic_html/img/season_pass/main/team/rank/17.png
addedpublic_html/img/season_pass/main/team/rank/18.png
addedpublic_html/img/season_pass/main/team/rank/19.png
addedpublic_html/img/season_pass/main/team/rank/2.png
addedpublic_html/img/season_pass/main/team/rank/20.png
addedpublic_html/img/season_pass/main/team/rank/3.png
addedpublic_html/img/season_pass/main/team/rank/4.png
addedpublic_html/img/season_pass/main/team/rank/5.png
addedpublic_html/img/season_pass/main/team/rank/6.png
addedpublic_html/img/season_pass/main/team/rank/7.png
addedpublic_html/img/season_pass/main/team/rank/8.png
addedpublic_html/img/season_pass/main/team/rank/9.png
addedpublic_html/img/season_pass/main/team/rank_icon/rank1.png
addedpublic_html/img/season_pass/main/team/rank_icon/rank10.png
addedpublic_html/img/season_pass/main/team/rank_icon/rank11.png
addedpublic_html/img/season_pass/main/team/rank_icon/rank12.png
addedpublic_html/img/season_pass/main/team/rank_icon/rank13.png
addedpublic_html/img/season_pass/main/team/rank_icon/rank14.png
addedpublic_html/img/season_pass/main/team/rank_icon/rank15.png
addedpublic_html/img/season_pass/main/team/rank_icon/rank16.png
addedpublic_html/img/season_pass/main/team/rank_icon/rank17.png
addedpublic_html/img/season_pass/main/team/rank_icon/rank18.png
addedpublic_html/img/season_pass/main/team/rank_icon/rank19.png
addedpublic_html/img/season_pass/main/team/rank_icon/rank2.png
addedpublic_html/img/season_pass/main/team/rank_icon/rank20.png
addedpublic_html/img/season_pass/main/team/rank_icon/rank3.png
addedpublic_html/img/season_pass/main/team/rank_icon/rank4.png
addedpublic_html/img/season_pass/main/team/rank_icon/rank5.png
addedpublic_html/img/season_pass/main/team/rank_icon/rank6.png
addedpublic_html/img/season_pass/main/team/rank_icon/rank7.png
addedpublic_html/img/season_pass/main/team/rank_icon/rank8.png
addedpublic_html/img/season_pass/main/team/rank_icon/rank9.png
addedpublic_html/img/season_pass/main/team/rankbutton.png
addedpublic_html/img/season_pass/main/team/selfframe.png
addedpublic_html/img/season_pass/main/team/wadoru_congra.png
addedpublic_html/img/season_pass/main/team1.png
addedpublic_html/img/season_pass/main/team2.png
modifiedpublic_html/js/JOLLYROGER.js
modifiedpublic_html/js/JOLLYROGER_mission.js
modifiedpublic_html/js/JOLLYROGER_valhalla.js
modifiedpublic_html/template/Mission.tpl
modifiedpublic_html/template/SeasonPass-Home.tpl
modifiedpublic_html/template/Team-Notice.tpl
modifiedpublic_html/template/TeamWar-Result.tpl
modifiedpublic_html/template/TeamWar.tpl
modifiedpublic_html/template/Valhalla.tpl
modifiedpublic_html/template/footer.tpl
Patch body is stored as a separate file to keep this page lightweight.