PR

覇戦の宝箱システム #268

wada opened this at 2020-09-22T11:00:57; closed

Description

opened by wada at 2020-09-22T11:00:57; updated 2023-01-23T10:05:23

issue #199

  • [x] テーブル作成sql

Comment

#7268 by wada at 2020-09-23T16:56:00; updated 2020-09-23T16:56:00

テーブルの作成

  • user_war_win_reward
  • log_war_win_reward
  • log_teamwar_reward_gold
  • teamWar_userDetail
  • teamWar_combat

Comment

#7269 by wada at 2020-09-23T17:10:43; updated 2020-09-23T17:10:43
CREATE TABLE `log_teamwar_reward_gold` (
  `user_no` bigint(20) NOT NULL,
  `year_mon_day` int(11) NOT NULL,
  `result_type` int(11) NOT NULL,
  `team_no` int(11) NOT NULL,
  `reg_date` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
  PRIMARY KEY (`user_no`,`year_mon_day`,`result_type`),
  KEY `year_mon_day` (`year_mon_day`,`team_no`) USING BTREE
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
CREATE TABLE `log_war_win_reward` (
  `id` int(11) NOT NULL AUTO_INCREMENT,
  `user_no` bigint(20) NOT NULL,
  `type` tinyint(4) NOT NULL COMMENT '11:宝箱取得、21:星ストック取得、22:星ストック消費',
  `count` tinyint(4) NOT NULL,
  `after_count` int(11) NOT NULL,
  `reg_date` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
  PRIMARY KEY (`id`) USING BTREE,
  KEY `type` (`type`,`reg_date`),
  KEY `user_no` (`user_no`,`reg_date`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
CREATE TABLE `user_war_win_reward` (
  `user_no` bigint(20) NOT NULL,
  `reward_type` tinyint(4) NOT NULL COMMENT '宝箱の種類',
  `star_need` tinyint(4) NOT NULL,
  `star_stock` tinyint(4) NOT NULL,
  `star_total` int(11) NOT NULL,
  PRIMARY KEY (`user_no`) USING BTREE
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
CREATE TABLE `teamWar_combat` (
  `year_mon_day` int(11) NOT NULL,
  `team_no1` int(11) NOT NULL,
  `team_no2` int(11) NOT NULL,
  `combat_no` int(11) NOT NULL,
  `user_no1` bigint(20) NOT NULL,
  `card_no1_1` int(11) NOT NULL,
  `card_no1_2` int(11) NOT NULL,
  `card_no1_3` int(11) NOT NULL,
  `user_no2` bigint(20) NOT NULL,
  `card_no2_1` int(11) NOT NULL,
  `card_no2_2` int(11) NOT NULL,
  `card_no2_3` int(11) NOT NULL,
  `key` char(255) COLLATE utf8_unicode_ci NOT NULL,
  PRIMARY KEY (`year_mon_day`,`team_no1`,`team_no2`,`combat_no`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
CREATE TABLE `teamWar_userDetail` (
  `user_no` bigint(20) NOT NULL,
  `team_no` int(11) NOT NULL,
  `year_mon_day` int(11) NOT NULL,
  `user_pt` int(11) NOT NULL DEFAULT '0',
  `pt_time` int(11) NOT NULL DEFAULT '0',
  `sink_ship` int(11) NOT NULL DEFAULT '0',
  `sink_time` int(11) NOT NULL DEFAULT '0',
  `win` int(11) NOT NULL DEFAULT '0',
  `max_win` int(11) NOT NULL DEFAULT '0',
  `attack` int(11) NOT NULL DEFAULT '0',
  `attack_time` int(11) NOT NULL DEFAULT '0',
  `defense` int(11) NOT NULL DEFAULT '0',
  `defense_time` int(11) NOT NULL DEFAULT '0',
  `inspire` int(11) NOT NULL DEFAULT '0',
  `inspire_time` int(11) NOT NULL DEFAULT '0',
  `goal_flag` int(11) NOT NULL DEFAULT '0',
  PRIMARY KEY (`user_no`,`team_no`,`year_mon_day`),
  KEY `team_no` (`team_no`,`year_mon_day`,`user_pt`,`pt_time`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
wada add_label at 2020-09-23T19:27:27: レビュー待ち

Comment

#7297 by wada at 2020-09-23T19:31:05; updated 2020-09-23T19:31:05

@iwamoto
レビューお願いします。
結構大きいので一通り動かして、エラーや画像が不足してないか確認お願いします。
マージ後にチームでデバッグできればと思います。

実装内容

  • 覇戦結果ページのUI更新
  • クエストに覇戦タブ追加(当日の結果表示)
wada change_title at 2020-09-23T19:31:13: [WIP]覇戦の宝箱システム 覇戦の宝箱システム

Comment

#7371 by iwamoto at 2020-09-25T17:22:57; updated 2020-09-25T17:22:57

@wada
こちら問題ないと思いますー

wada delete_label at 2020-09-25T17:43:35: レビュー待ち
wada merge at 2020-09-25T17:47:10: 覇戦の宝箱システム
wada close at 2020-09-25T17:47:10: Close

Commit range

base542ea30908f0928cb5ae010d9ce173778af7b163
headddc77a2ab871282d62f9ddcd424c1e9b25694d39
base branchjolly/jr-web:develop
head branchjolly/jr-web:war_box_199

View commits

Commit details are loaded from Git when a dynamic archive server is running, or can be embedded with --include-commits.
Files changed176 filesView patch
statusfile
modifieddatabase/jrye.sql
modifieddatabase/jrye_teamWar.sql
modifiedlib/SubFunc.inc
modifiedlib/SubFunc_mission.inc
modifiedlib/ajax/battle_player.inc
addedlib/ajax/quest_teamwarDetailExec.inc
addedlib/ajax/teamWar_resultStockStarExec.inc
addedlib/ajax/teamWar_resultWinRewardExec.inc
modifiedlib/class/const/ItemConst.class.php
modifiedlib/class/const/PresentNameConst.class.php
modifiedlib/conf/class/JackpotWarConfig.class.php
addedlib/conf/class/TeamWarWinReward.class.php
modifiedlib/conf/define.inc
modifiedlib/exec/matching_team_battle.php
modifiedlib/exec/team_battle.php
modifiedlib/mobile/TeamWar__Result.inc
addedlib/mobile/TeamWar__ResultWinRewardExec.inc
modifiedlib/public/Battle-Result.inc
modifiedlib/public/Battle.inc
modifiedlib/public/Quest-Daily.inc
modifiedlib/public/Quest-Default.inc
modifiedlib/public/Quest-LoginBonus.inc
modifiedlib/public/Quest-MonthlyPass.inc
addedlib/public/Quest-TeamWarDetail.inc
modifiedlib/public/Team.inc
modifiedlib/public/TeamWar-Result.inc
modifiedmobile_html/index.php
modifiedmobile_html/template/TeamWar__Result.tpl
modifiedpublic_html/ajax.php
addedpublic_html/img/team/active_person.png
addedpublic_html/img/team/arrow_2.png
addedpublic_html/img/team/buildship.png
addedpublic_html/img/team/close.png
addedpublic_html/img/team/close_small.png
addedpublic_html/img/team/enemy_bg.png
addedpublic_html/img/team/enemy_info.png
addedpublic_html/img/team/enemy_none_bg.png
addedpublic_html/img/team/frame.png
addedpublic_html/img/team/get_frame1.png
addedpublic_html/img/team/get_frame2.png
addedpublic_html/img/team/go_item.png
addedpublic_html/img/team/go_present.png
addedpublic_html/img/team/guide.png
addedpublic_html/img/team/history_bar.png
addedpublic_html/img/team/history_drawn.png
addedpublic_html/img/team/history_lose.png
addedpublic_html/img/team/history_win.png
addedpublic_html/img/team/last_result_drawn.png
addedpublic_html/img/team/last_result_lose.png
addedpublic_html/img/team/last_result_win.png
addedpublic_html/img/team/league_a.png
addedpublic_html/img/team/league_b.png
addedpublic_html/img/team/league_c.png
addedpublic_html/img/team/league_d.png
addedpublic_html/img/team/league_text_a.png
addedpublic_html/img/team/league_text_b.png
addedpublic_html/img/team/league_text_c.png
addedpublic_html/img/team/league_text_d.png
addedpublic_html/img/team/league_x.png
addedpublic_html/img/team/member_info.png
addedpublic_html/img/team/next_enemy_bar.png
addedpublic_html/img/team/num_list.png
addedpublic_html/img/team/ranking.png
addedpublic_html/img/team/reward_info.png
addedpublic_html/img/team/reward_info_bg_1.png
addedpublic_html/img/team/reward_info_bg_2.png
addedpublic_html/img/team/rule_info.png
addedpublic_html/img/team/schedule1.png
addedpublic_html/img/team/schedule2.png
addedpublic_html/img/team/schedule3.png
addedpublic_html/img/team/schedule_bar.png
addedpublic_html/img/team/strategy_info.png
addedpublic_html/img/team/tape.png
addedpublic_html/img/team/team_bg.png
addedpublic_html/img/team/team_bg1.png
addedpublic_html/img/team/team_bg2.png
addedpublic_html/img/team/twoship.png
addedpublic_html/img/team/war_result_bg.png
addedpublic_html/img/team/whiteline.png
addedpublic_html/img/team/win_reward/achievement_stamp.png
addedpublic_html/img/team/win_reward/fade_star_1.png
addedpublic_html/img/team/win_reward/fade_star_10.png
addedpublic_html/img/team/win_reward/fade_star_2.png
addedpublic_html/img/team/win_reward/fade_star_3.png
addedpublic_html/img/team/win_reward/fade_star_4.png
addedpublic_html/img/team/win_reward/fade_star_5.png
addedpublic_html/img/team/win_reward/fade_star_6.png
addedpublic_html/img/team/win_reward/fade_star_7.png
addedpublic_html/img/team/win_reward/fade_star_8.png
addedpublic_html/img/team/win_reward/fade_star_9.png
addedpublic_html/img/team/win_reward/need_star_0.png
addedpublic_html/img/team/win_reward/need_star_1.png
addedpublic_html/img/team/win_reward/need_star_2.png
addedpublic_html/img/team/win_reward/need_star_3.png
addedpublic_html/img/team/win_reward/need_star_4.png
addedpublic_html/img/team/win_reward/need_star_5.png
addedpublic_html/img/team/win_reward/need_star_6.png
addedpublic_html/img/team/win_reward/push_star.png
addedpublic_html/img/team/win_reward/reward1_1.jpg
addedpublic_html/img/team/win_reward/reward1_2.jpg
addedpublic_html/img/team/win_reward/reward2_1.jpg
addedpublic_html/img/team/win_reward/reward2_2.jpg
addedpublic_html/img/team/win_reward/stock_star_0.png
addedpublic_html/img/team/win_reward/stock_star_1.png
addedpublic_html/img/team/win_reward/stock_star_10.png
addedpublic_html/img/team/win_reward/stock_star_11.png
addedpublic_html/img/team/win_reward/stock_star_2.png
addedpublic_html/img/team/win_reward/stock_star_3.png
addedpublic_html/img/team/win_reward/stock_star_4.png
addedpublic_html/img/team/win_reward/stock_star_5.png
addedpublic_html/img/team/win_reward/stock_star_6.png
addedpublic_html/img/team/win_reward/stock_star_7.png
addedpublic_html/img/team/win_reward/stock_star_8.png
addedpublic_html/img/team/win_reward/stock_star_9.png
addedpublic_html/img/team/win_reward/tap_text.png
addedpublic_html/img/team/win_reward/war_star1_0.png
addedpublic_html/img/team/win_reward/war_star1_1.png
addedpublic_html/img/team/win_reward/war_star1_2.png
addedpublic_html/img/team/win_reward/war_star1_3.png
addedpublic_html/img/team/win_reward/war_star2_0.png
addedpublic_html/img/team/win_reward/war_star2_1.png
addedpublic_html/img/team/win_reward/war_star2_2.png
addedpublic_html/img/team/win_reward/war_star2_3.png
addedpublic_html/img/team/win_reward/win_reward_board.png
addedpublic_html/img/team/win_reward/win_reward_chest_1.png
addedpublic_html/img/team/win_reward/win_reward_chest_2.png
addedpublic_html/img/team/win_reward/win_reward_light.png
addedpublic_html/img/teamwar_reward/animation/btn_ikki.png
addedpublic_html/img/teamwar_reward/animation/ef_spark.png
addedpublic_html/img/teamwar_reward/animation/ef_thunder01.png
addedpublic_html/img/teamwar_reward/animation/ef_thunder02.png
addedpublic_html/img/teamwar_reward/animation/obj_cutlass_left.png
addedpublic_html/img/teamwar_reward/animation/obj_cutlass_right.png
addedpublic_html/img/teamwar_reward/bg_ikki_1.png
addedpublic_html/img/teamwar_reward/bg_ikki_2.png
addedpublic_html/img/teamwar_reward/bg_ikki_3.png
addedpublic_html/img/teamwar_reward/bg_personal.png
addedpublic_html/img/teamwar_reward/bg_result.png
addedpublic_html/img/teamwar_reward/btn_bubble.png
addedpublic_html/img/teamwar_reward/btn_teamwar_result.png
addedpublic_html/img/teamwar_reward/error_bg.png
addedpublic_html/img/teamwar_reward/obg_gauge.png
addedpublic_html/img/teamwar_reward/obg_gauge_blue.png
addedpublic_html/img/teamwar_reward/obg_gauge_red.png
addedpublic_html/img/teamwar_reward/obj_bg_date.png
addedpublic_html/img/teamwar_reward/obj_bg_mvp.png
addedpublic_html/img/teamwar_reward/obj_league_1.png
addedpublic_html/img/teamwar_reward/obj_league_2.png
addedpublic_html/img/teamwar_reward/obj_league_3.png
addedpublic_html/img/teamwar_reward/obj_league_4.png
addedpublic_html/img/teamwar_reward/obj_title_fortitude.png
addedpublic_html/img/teamwar_reward/obj_title_guardian.png
addedpublic_html/img/teamwar_reward/obj_title_inspire.png
addedpublic_html/img/teamwar_reward/obj_title_invincible.png
addedpublic_html/img/teamwar_reward/obj_title_mvp.png
addedpublic_html/img/teamwar_reward/obj_title_sinker.png
addedpublic_html/img/teamwar_reward/result_draw.png
addedpublic_html/img/teamwar_reward/result_invalid.png
addedpublic_html/img/teamwar_reward/result_lose.png
addedpublic_html/img/teamwar_reward/result_win.png
addedpublic_html/img/teamwar_reward/title_combat.png
addedpublic_html/img/teamwar_reward/title_mvp.png
addedpublic_html/img/teamwar_reward/top_bg.png
addedpublic_html/img/teamwar_reward/trade_opendbox.png
addedpublic_html/img/teamwar_reward/treaturebox.png
modifiedpublic_html/index.php
modifiedpublic_html/js/JOLLYROGER.js
modifiedpublic_html/js/JOLLYROGER_collect_ef.js
modifiedpublic_html/js/JOLLYROGER_func.js
modifiedpublic_html/template/Quest-Daily.tpl
modifiedpublic_html/template/Quest-Default.tpl
modifiedpublic_html/template/Quest-LoginBonus.tpl
modifiedpublic_html/template/Quest-MonthlyPass.tpl
addedpublic_html/template/Quest-TeamWarDetail.tpl
modifiedpublic_html/template/Team.tpl
modifiedpublic_html/template/TeamWar-Result.tpl
Patch body is stored as a separate file to keep this page lightweight.