jolly/jr-web #296 ヤマダpt配布

Description

opened by wada at 2020-09-28T20:12:57; updated 2023-02-09T10:08:48

issue #293

10/1~11/1：ログイン（1pt）
10/1~10/11：戦争参加（9pt）

キャンペーンが複数走るのでそれの対応
運動会の処理も調整（同じクラスを継承しているため）
ログイン時のpt配布ダイアログを配布タイプに応じて変更

マスタ更新

php bin/csv2mysql.php jrye csv/master_yamada_point.csv
php bin/csv2mysql.php jrye csv/master_yamada_campaign.csv

wada change_title at 2020-09-28T20:23:16: [WIP]ヤマダpt配布ヤマダpt配布

wada add_label at 2020-09-28T20:23:19: レビュー待ち

#7407 by wada at 2020-09-28T20:24:21; updated 2020-09-28T20:24:21

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

#7410 by iwamoto at 2020-09-29T10:37:22; updated 2020-09-29T10:37:22

@wada
こちらレビュー行いました、問題ないと思います。

wada merge at 2020-09-29T10:48:39: ヤマダpt配布

wada close at 2020-09-29T10:48:39: Close

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

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

Files changed17 filesView patch

status	file
modified	`lib/SubFunc.inc`
modified	`lib/conf/define_y.inc`
modified	`lib/exec/del_log_teamWar_userpoint.inc`
modified	`lib/models/Yamada_athletic.php`
modified	`lib/models/Yamada_campaign.php`
modified	`lib/models/Yamada_point.php`
modified	`lib/models/dao/Base_model.php`
modified	`lib/models/dao/log_yamada_athletic.php`
added	`lib/models/dao/log_yamada_point.php`
modified	`lib/models/dao/master_yamada_athletic.php`
added	`lib/models/dao/master_yamada_campaign.php`
modified	`lib/models/dao/master_yamada_point.php`
modified	`public_html/img/info_jrye/224/info2.jpg`
modified	`public_html/img/info_jrye/225/info4.jpg`
modified	`public_html/img/info_jrye/226/info3.jpg`
modified	`public_html/js/JOLLYROGER.js`
modified	`public_html/template/Main.tpl`

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