PR

商会改修マージ #3761

wada opened this at 2024-11-05T14:18:57; closed

Description

opened by wada at 2024-11-05T14:18:57; updated 2024-12-12T14:55:45

概要

商会改修系の本家PRマージ

マージPR

  • 8048【5/24】仲介所の期限表示位置調整
  • 8118【即日】仲介所のフッターせり上がり問題
  • 8119【即日】topの取り方ミスった
  • 8438【10/4】ルシエ商会の結果モーダル位置調整
  • 8975【3/10】ルシエ商会のページ送り準備
  • 9292【6/15】ルシエ商会のモーダルに情報を追加
  • 11898【4/25 16時UP予定】ルシエ商会デザイン調整
  • 11988【はやめ】ルシエ商会販売所モーダルにカードアルバムへのリンク追加
  • 12250【7/16中にUP】パイパスない期間用のルシエ商会の入手場所の表示修正

マージ以外の対応箇所

ItemConstに技玉タイプ(1000)追加
ItemConstに各アイテム種判定メソッド追加
PIECE_TRADE_TYPEをCardPieceConfigにも追加
・lib/models/Card_pieceの方はおいおい削除
CardPieceConfigに出現予定のカードNo設定
LegendCardInfoConfigににヴァルハラカード追加

ヤマダ版で必要な処理

  • 仲介所モーダルの入手箇所のイベント対応

本家ではパイレーツパスのみ

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

TODO

  • [x] 勝利の証入手箇所画像(レイド、新大陸)
  • [x] 勝利の証292サイズ画像
  • [x] 販売アイテムソート対応
wada delete_label at 2024-11-05T14:19:16: レビュー待ち
wada change_title at 2024-11-05T14:19:19: 商会改修マージ [WIP]商会改修マージ
wada change_title at 2024-11-07T10:01:34: [WIP]商会改修マージ 商会改修マージ
wada add_label at 2024-11-07T10:01:36: レビュー待ち

Comment

#37335 by wada at 2024-11-07T10:02:06; updated 2024-11-07T10:02:06

@kouho
レビューお願いします。
画像は完成次第更新します。

Comment

#37503 by kouho at 2024-11-19T16:13:32; updated 2024-11-19T16:13:32

@wada
実装と動作は問題ないと思いますが、以下要望です。

  • 【要望】パイレーツパスカード魅力紹介について

魅力商会リンクを見て思ったのですが、ID2573の魅力紹介が【追記あり】と書かれたお知らせで、追記の内容が古いのでタイトルの追記ありと内容の追記を削除してしまってよいのではと思いました。

kouho add_label at 2024-11-19T16:13:48: コメントあり
kouho add_label at 2024-11-27T11:25:39: 皇甫 LGTM
wada merge at 2024-12-12T14:55:39: 商会改修マージ
wada close at 2024-12-12T14:55:39: Close
wada delete_branch at 2024-12-12T14:55:45: merge_pirate_store

Commit range

base22070eb6e30d25913960029547de0ae7f96258c2
heade627f3a297f2fcae6950b347684cb159446e2097
base branchjolly/jr-web:master
head branchjolly/jr-web:merge_pirate_store

View commits

Commit details are loaded from Git when a dynamic archive server is running, or can be embedded with --include-commits.
Files changed73 filesView patch
statusfile
modifiedlib/class/const/ItemConst.class.php
modifiedlib/class/controller/JrControllerSeasonPass.class.php
modifiedlib/conf/class/CardPieceConfig.class.php
modifiedlib/conf/class/LegendCardInfoConfig.class.php
modifiedlib/conf/class/SkillFriendConfig.class.php
modifiedlib/models/Pirate_store.php
modifiedlib/public/Card-Album.inc
modifiedlib/public/CardPieceShop-Default.inc
addedpublic_html/img/card_piece/icon_292/1.png
addedpublic_html/img/card_piece/icon_292/11.png
addedpublic_html/img/card_piece/icon_292/12.png
addedpublic_html/img/card_piece/icon_292/13.png
addedpublic_html/img/card_piece/icon_292/135.png
addedpublic_html/img/card_piece/icon_292/136.png
addedpublic_html/img/card_piece/icon_292/14.png
addedpublic_html/img/card_piece/icon_292/15.png
addedpublic_html/img/card_piece/icon_292/16.png
addedpublic_html/img/card_piece/icon_292/17.png
addedpublic_html/img/card_piece/icon_292/18.png
addedpublic_html/img/card_piece/icon_292/19.png
addedpublic_html/img/card_piece/icon_292/2.png
addedpublic_html/img/card_piece/icon_292/20.png
addedpublic_html/img/card_piece/icon_292/21.png
addedpublic_html/img/card_piece/icon_292/22.png
addedpublic_html/img/card_piece/icon_292/23.png
addedpublic_html/img/card_piece/icon_292/24.png
addedpublic_html/img/card_piece/icon_292/25.png
addedpublic_html/img/card_piece/icon_292/3.png
addedpublic_html/img/card_piece/icon_292/5.png
addedpublic_html/img/card_piece/icon_292/6.png
addedpublic_html/img/card_piece/series/btn_Valkyrie.png
addedpublic_html/img/card_piece/series/btn_Viking.png
addedpublic_html/img/card_piece/shop/bg_btn_akashi.jpg
addedpublic_html/img/card_piece/shop/bg_btn_akashi_typhon.jpg
addedpublic_html/img/card_piece/shop/bg_btn_ship.jpg
addedpublic_html/img/card_piece/shop/bg_category.png
addedpublic_html/img/card_piece/shop/bg_name.jpg
addedpublic_html/img/card_piece/shop/btn_battle.png
addedpublic_html/img/card_piece/shop/btn_battle_off.png
addedpublic_html/img/card_piece/shop/btn_chara_item.png
addedpublic_html/img/card_piece/shop/btn_kaitei.png
addedpublic_html/img/card_piece/shop/btn_kaitei_off.png
addedpublic_html/img/card_piece/shop/btn_land.png
addedpublic_html/img/card_piece/shop/btn_land_off.png
addedpublic_html/img/card_piece/shop/btn_new_island.png
addedpublic_html/img/card_piece/shop/btn_new_island_off.png
addedpublic_html/img/card_piece/shop/btn_pass.png
addedpublic_html/img/card_piece/shop/btn_pass_off.png
addedpublic_html/img/card_piece/shop/btn_raid.png
addedpublic_html/img/card_piece/shop/btn_raid_off.png
addedpublic_html/img/card_piece/shop/btn_shiten.png
addedpublic_html/img/card_piece/shop/deadline.png
addedpublic_html/img/card_piece/shop/paper_chara.png
addedpublic_html/img/card_piece/shop/paper_store_selll_small.png
addedpublic_html/img/card_piece/shop/tab_all_active.png
addedpublic_html/img/card_piece/shop/tab_all_off.png
addedpublic_html/img/card_piece/shop/tab_charactor_active.png
addedpublic_html/img/card_piece/shop/tab_charactor_off.png
addedpublic_html/img/card_piece/shop/tab_data_active.png
addedpublic_html/img/card_piece/shop/tab_data_off.png
addedpublic_html/img/card_piece/shop/ttl.png
addedpublic_html/img/info_jrye/3997/info1.jpg
addedpublic_html/img/info_jrye/3997/info2.jpg
addedpublic_html/img/info_jrye/3997/info3.jpg
addedpublic_html/img/info_jrye/3997/info4.jpg
modifiedpublic_html/js/JOLLYROGER.js
modifiedpublic_html/js/jr_main.min.js
modifiedpublic_html/template/CardPieceShop-Default.tpl
modifiedpublic_html/template/header_sp.tpl
addedpublic_html/template/page_link_card_piece.tpl
modifiedpublic_html/template/parts/parts_card_info_modal.tpl
modifiedpublic_html/template/parts_cardpiece_info_modal.tpl
modifiedpublic_html/template/parts_pirate_store_item_info_modal.tpl
Patch body is stored as a separate file to keep this page lightweight.