PR

【9/16】船の配布 #4257

wada opened this at 2025-09-11T13:49:19; closed

Description

opened by wada at 2025-09-11T13:49:19; updated 2025-09-17T15:31:37

概要

仕様書

本家とは港ページのレイアウトが違うため、【8/29:8/30実装】パネルミッション:イエローサブマリンを無料にする を参考に実装

ShipCustomConfigクラスを追加、配布船の情報追加
メインページお知らせにリンク追加

追加テーブル

CREATE TABLE `user_free_ship_build_step` (
  `user_no` int(11) unsigned NOT NULL,
  `step` tinyint(3) unsigned NOT NULL DEFAULT '1',
  `reg_date` datetime DEFAULT NULL,
  PRIMARY KEY (`user_no`,`step`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;

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

メインページお知らせのリンク
港の造船リスト表示
配布船2種の造船

Comment

#42318 by wada at 2025-09-11T13:49:28; updated 2025-09-11T13:49:28

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

kouho add_label at 2025-09-16T16:20:37: 皇甫 LGTM

Comment

#42395 by kouho at 2025-09-16T16:20:44; updated 2025-09-16T16:20:44

@wada
確認OKです

wada merge at 2025-09-17T15:31:00: 【9/16】船の配布
wada close at 2025-09-17T15:31:00: Close
wada delete_branch at 2025-09-17T15:31:37: ship_build_free

Commit range

base5acb306b0409ad4d811799762e1ec4bfa8e30d73
heade65a69858bf1b8db892c4f2fb0db88a1867abb79
base branchjolly/jr-web:master
head branchjolly/jr-web:ship_build_free

View commits

Commit details are loaded from Git when a dynamic archive server is running, or can be embedded with --include-commits.
Files changed14 filesView patch
statusfile
modifiedlib/ajax/main_default.inc
addedlib/conf/class/ShipCustomConfig.class.php
addedlib/models/dao/user_free_ship_build_step.php
modifiedlib/public/Ship-Default.inc
modifiedlib/public/Ship-MakeComposite.inc
modifiedlib/public/Ship-SelectDetail.inc
addedpublic_html/img/commerce/free_midashi1.png
addedpublic_html/img/commerce/free_midashi2.png
modifiedpublic_html/js/JOLLYROGER.js
modifiedpublic_html/js/jr_main.min.js
modifiedpublic_html/template/Main.tpl
modifiedpublic_html/template/Ship-Default.tpl
modifiedpublic_html/template/Ship-SelectDetail.tpl
modifiedpublic_html/template/header_sp.tpl
Patch body is stored as a separate file to keep this page lightweight.