PR

[WIP]ソロレイド #4090

kouho opened this at 2025-05-29T10:26:59; closed

Description

opened by kouho at 2025-05-29T10:26:59; updated 2025-06-10T14:26:45

概要

本家:怨霊ソロレイドの移植
https://docs.google.com/spreadsheets/d/1MRkiehimyKxfozeU5cRV3WITRbq6ogdwfUI5OdaN354/edit?gid=2031422864#gid=2031422864

本家マージ管理用シート

https://docs.google.com/spreadsheets/d/1ATR_1vn2P9cO7kqZRuymnURMRE6ceJv90YEdqegrlqo/edit?gid=0#gid=0

TODO

必須対応

  • [ ] ソロレイドバトル処理のクラス化(現状本家処理) 対応中
  • [x] ソロレイド報酬表示周り対応
  • [x] ソロレイド支援デッキボタン
  • [x] ソロレイド支援デッキバトル処理
  • [ ] ソロレイド出現時にメインページレイドボタンに蒼玉交換も追加
ソロレイド画像
  • [ ] アイコン画像
  • [ ] 告知画像(予告1枚・概要1枚)
  • [ ] チーム対抗レイドバトル画面画像
  • [ ] レイドカード画像

必須リリース後可対応

  • [ ] レイド画面のUI統一
  • [ ] ソロレイド 管理画面

改善対応

ユーザーにわかりやすくする

  • [ ] チームレイド討伐画面に怨霊ソロレイド出現系の画像
  • [ ] ソロレイド表記を個人レイド表記に変更(必要な場合)
  • [ ] メインページでソロレイド出現中のことがわかりやすく(アイコンに工夫)
  • [ ] 新着お知らせにソロレイド出現中の旨の表示
  • [ ] ソロレイド画面に告知 or Q&Aリンク

備考

ソロレイドのバトル処理をajaxではなく、こちらに合わせています。

SQL

CREATE TABLE `log_team_raid_monster_damage_spirit` (
  `id` int NOT NULL COMMENT 'レイドモンスターID',
  `event_no` int NOT NULL,
  `user_no` bigint NOT NULL,
  `team_no` int NOT NULL COMMENT 'どのチームとして殴ったか',
  `total_damage` bigint NOT NULL DEFAULT '0' COMMENT '合計ダメージ',
  `total_count` int NOT NULL DEFAULT '0' COMMENT '殴った回数',
  `type_1` int NOT NULL DEFAULT '0',
  `id_1` int NOT NULL DEFAULT '0',
  `count_1` int NOT NULL DEFAULT '0',
  `type_2` int NOT NULL DEFAULT '0',
  `id_2` int NOT NULL DEFAULT '0',
  `count_2` int NOT NULL DEFAULT '0',
  `type_3` int NOT NULL DEFAULT '0',
  `id_3` int NOT NULL DEFAULT '0',
  `count_3` int NOT NULL DEFAULT '0',
  `type_4` int NOT NULL DEFAULT '0',
  `id_4` int NOT NULL DEFAULT '0',
  `count_4` int NOT NULL DEFAULT '0',
  `type_5` int NOT NULL,
  `id_5` int NOT NULL,
  `count_5` int NOT NULL,
  `type_6` int NOT NULL,
  `id_6` int NOT NULL,
  `count_6` int NOT NULL,
  `type_7` int NOT NULL,
  `id_7` int NOT NULL,
  `count_7` int NOT NULL,
  `type_8` int NOT NULL DEFAULT '0',
  `id_8` int NOT NULL DEFAULT '0',
  `count_8` int NOT NULL DEFAULT '0',
  `type_9` int NOT NULL DEFAULT '0',
  `id_9` int NOT NULL DEFAULT '0',
  `count_9` int NOT NULL DEFAULT '0',
  `type_10` int NOT NULL DEFAULT '0',
  `id_10` int NOT NULL DEFAULT '0',
  `count_10` int NOT NULL DEFAULT '0',
  PRIMARY KEY (`id`,`user_no`),
  KEY `user_no` (`user_no`,`total_damage`,`type_1`),
  KEY `event_no` (`event_no`,`user_no`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
CREATE TABLE `user_team_raid_monster_spirit` (
  `id` int NOT NULL COMMENT 'レイドID',
  `user_no` bigint NOT NULL,
  `team_no` int NOT NULL,
  `event_no` int NOT NULL DEFAULT '0',
  `raid_monster_no` int NOT NULL,
  `lv` int NOT NULL DEFAULT '1' COMMENT 'レベル',
  `hp` bigint NOT NULL,
  `max_hp` bigint NOT NULL,
  `start_time` int NOT NULL,
  `limit_time` int NOT NULL,
  PRIMARY KEY (`id`,`user_no`) USING BTREE,
  KEY `user_no` (`user_no`) USING BTREE
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci COMMENT='怨霊';
kouho change_title at 2025-05-30T14:40:27: [WIP]ソロレイド 【6/3】ソロレイド
kouho change_title at 2025-05-30T14:40:44: 【6/3】ソロレイド [WIP]ソロレイド
wada refer at 2025-06-05T16:24:48: 4108:ソロレイド調整
wada refer at 2025-06-08T16:18:03: 4112:ソロレイド修正
kouho close at 2025-06-10T14:26:45: Close

Commit range

basebe9f7a5e6a59c89a04b5f76cc928907dcced203a
headcbe66b6ca01d930c32a15fdac14fcd0b1c6daf0f
base branchjolly/jr-web:master
head branchjolly/jr-web:raid_spirit_merge

View commits

Commit details are loaded from Git when a dynamic archive server is running, or can be embedded with --include-commits.
Files changed62 filesView patch
statusfile
modifiedlib/SubFunc.inc
modifiedlib/SubFunc/SubFunc_yamada.inc
modifiedlib/ajax/battle_player.inc
modifiedlib/ajax/item_result.inc
modifiedlib/ajax/main_default.inc
addedlib/ajax/raid_battleSpirit.inc
modifiedlib/class/controller/JrControllerDeck.class.php
modifiedlib/conf/class/RaidMonsterConfig.class.php
modifiedlib/models/dao/team_raid_monster_vs.php
modifiedlib/models/raid_vs/Team_raid_monster_vs.php
modifiedlib/public/Battle-ResultRaid.inc
modifiedlib/public/Main.inc
modifiedlib/public/Raid-AttackEnd.inc
addedlib/public/Raid-BattleSpirit.inc
addedlib/public/Raid-GetMedalSpirit.inc
addedlib/public/Raid-LogSpirit.inc
addedlib/public/Raid-Spirit.inc
modifiedlib/public/Raid-Vs.inc
modifiedpublic_html/ajax.php
addedpublic_html/img/card/battle/raid/797_spirit.jpg
addedpublic_html/img/card/battle/raid/798_spirit.jpg
addedpublic_html/img/card/battle/raid/799_spirit.jpg
addedpublic_html/img/card/battle/raid/800_spirit.jpg
addedpublic_html/img/card/battle/raid/801_spirit.jpg
addedpublic_html/img/main/event_icon/raid/1150_spirit.png
addedpublic_html/img/main/event_icon/raid/359_spirit.png
addedpublic_html/img/main/event_icon/raid/387_spirit.png
addedpublic_html/img/main/event_icon/raid/438_solo.png
addedpublic_html/img/main/event_icon/raid/438_spirit.png
addedpublic_html/img/main/event_icon/raid/515_spirit.png
addedpublic_html/img/main/event_icon/raid/582_spirit.png
addedpublic_html/img/main/event_icon/raid/725_spirit.png
addedpublic_html/img/raid/spirit_filter.png
addedpublic_html/img/raid/spirit_filter_result.png
addedpublic_html/img/raid/tab_raid_off.png
addedpublic_html/img/raid/tab_raid_on.png
addedpublic_html/img/raid/tab_spirit_off.png
addedpublic_html/img/raid/tab_spirit_on.png
addedpublic_html/img/raid/tab_vs_off.png
addedpublic_html/img/raid/tab_vs_on.png
modifiedpublic_html/index.php
modifiedpublic_html/js/JOLLYROGER.js
modifiedpublic_html/js/JOLLYROGER_battle.js
modifiedpublic_html/js/jr_battle.min.js
modifiedpublic_html/js/jr_main.min.js
modifiedpublic_html/template/Battle-ResultRaid.tpl
modifiedpublic_html/template/Deck-Home.tpl
modifiedpublic_html/template/Item.tpl
modifiedpublic_html/template/Main.tpl
modifiedpublic_html/template/Raid-AttackEnd.tpl
addedpublic_html/template/Raid-GetMedalSpirit.tpl
modifiedpublic_html/template/Raid-GetMedalVs.tpl
modifiedpublic_html/template/Raid-Log.tpl
addedpublic_html/template/Raid-LogSpirit.tpl
modifiedpublic_html/template/Raid-LogVs.tpl
addedpublic_html/template/Raid-Spirit.tpl
addedpublic_html/template/Raid-SpiritFin.tpl
addedpublic_html/template/Raid-VsFin.tpl
modifiedpublic_html/template/header_sp.tpl
addedpublic_html/template/page_raid_spirit_footer.tpl
modifiedpublic_html/template/parts/parts_rental_modal.tpl
modifiedpublic_html/template/parts_raid_default.tpl
Patch body is stored as a separate file to keep this page lightweight.