PR

ヤマダpt配布 #182

wada opened this at 2020-08-27T19:40:54; closed

Description

opened by wada at 2020-08-27T19:40:54; updated 2022-11-01T10:51:58

issue #160

ログインで1pt
戦争参加で9pt

戦争参加は、戦争終了後に結果ページ遷移でポイント付与
12時開催:21時まで受け取り可能
21時開催:24時まで受け取り可能

teamWar_user_point.attack/defenseのどちらかが1以上なら参加

# テーブルの構造が変わったので作り直し
DROP TABLE IF EXISTS `log_yamada_point`;

CREATE TABLE `log_yamada_point` (
  `id` int(11) unsigned NOT NULL AUTO_INCREMENT,
  `user_no` int(11) NOT NULL,
  `campaign_id` int(11) unsigned NOT NULL,
  `mission_type` tinyint(4) unsigned NOT NULL,
  `mission_id` int(11) unsigned NOT NULL DEFAULT '0',
  `send_api` tinyint(4) unsigned NOT NULL DEFAULT '0',
  `request_no` varchar(50) NOT NULL DEFAULT '',
  `reg_date` datetime NOT NULL,
  PRIMARY KEY (`id`),
  KEY `user_mission` (`user_no`,`campaign_id`,`mission_type`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;

Comment

#6654 by wada at 2020-08-27T19:41:17; updated 2020-08-27T19:41:17

@iwamoto
レビューお願いします。
マスタデータは後ほどUPします。

Comment

#6655 by wada at 2020-08-27T19:57:46; updated 2020-08-27T19:57:46

マスタUPしました

  • master_yamada_campaign
  • master_yamada_point

Comment

#6656 by iwamoto at 2020-08-27T20:23:53; updated 2020-08-27T20:23:53

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

iwamoto delete_label at 2020-08-27T20:24:37: レビュー待ち
wada merge at 2020-08-28T10:02:50: ヤマダpt配布
wada close at 2020-08-28T10:02:50: Close

Commit range

base3be5cee4ec59a4774ce09d983be1a30b3aa53e29
headd4319316dc316e6ad2737ebf734570e9dd6420e7
base branchjolly/jr-web:develop
head branchjolly/jr-web:yamada_pt_160

View commits

Commit details are loaded from Git when a dynamic archive server is running, or can be embedded with --include-commits.
Files changed10 filesView patch
statusfile
modifieddatabase/yamada_campaign.sql
modifiedlib/models/Yamada_point.php
addedlib/models/Yamada_point_war.php
modifiedlib/public/TeamScout-Bord.inc
modifiedlib/public/TeamWar-Result.inc
modifiedpublic_html/js/JOLLYROGER.js
modifiedpublic_html/js/jr_main.js
modifiedpublic_html/template/Main.tpl
modifiedpublic_html/template/TeamWar-Result.tpl
modifiedpublic_html/template/header_sp.tpl
Patch body is stored as a separate file to keep this page lightweight.