PR

ソロレイド修正 #4112

kouho opened this at 2025-06-06T16:44:35; closed

Description

opened by kouho at 2025-06-06T16:44:35; updated 2025-06-10T12:30:57

概要

raid_0611ブランチとraid_sprit_merge__wadaブランチをマージ

修正対応

  • [x] バトルページでスピードブレイクボタンを押しても何も出ない
  • [x] チームレイド出現中のアイコンタップ挙動

改善対応

  • [x] チームレイド討伐画面に怨霊ソロレイド出現系の画像 → 表記として対応
  • [x] ソロレイド表記を個人レイド表記に変更(必要な場合)
  • [x] ソロレイド画面に告知 or Q&Aリンク
  • [x] チームレイド討伐後の画面にソロレイド導線
  • [x] ソロレイド出現時にチームチャット表示

画像

  • [x] アイコン画像
  • [x] 告知画像(予告1枚・概要1枚)

~~チーム対抗レイドバトル画面画像~~ 画像不要

  • [x] レイドカード画像
kouho refer at 2025-06-06T18:41:23: 4108:ソロレイド調整
kouho change_title at 2025-06-06T20:26:09: [WIP]ソロレイド修正 ソロレイド修正

Comment

#40867 by kouho at 2025-06-08T15:55:17; updated 2025-06-08T15:55:17

@wada
レビューお願いいたします

Comment

#40868 by wada at 2025-06-08T16:18:03; updated 2025-06-08T16:18:03

@kouho
確認OKです。

レイドリリース時はどのようにmasterブランチにマージしますか?
①1つのブランチに集約してmasterマージ
②イベントとソロレイド2つのブランチにそれぞれ集約して、masterマージ
③関連ブランチを1つずつmasterマージ
④その他

関連PR

【6/6】レイドモンスター1期 #4109
[WIP]ソロレイド #4090
ソロレイド修正 #4112

wada refer at 2025-06-08T16:18:03: 4112:ソロレイド修正
wada add_label at 2025-06-08T16:18:07: 和田 LGTM
wada add_label at 2025-06-08T16:18:08: コメントあり

Comment

#40874 by kouho at 2025-06-08T16:22:12; updated 2025-06-08T16:22:12

@wada
どうしましょう...①でどうでしょうか?
こちらのブランチが結果的にイベントとソロレイドと和田さんの修正プルリクもマージしたブランチですので、raid_0611とraid_spirit_merge__wadaの最新更新をマージしてmasterにマージ

> レイドリリース時はどのようにmasterブランチにマージしますか?
①1つのブランチに集約してmasterマージ
②イベントとソロレイド2つのブランチにそれぞれ集約して、masterマージ
③関連ブランチを1つずつmasterマージ
④その他

Comment

#40875 by wada at 2025-06-08T18:23:59; updated 2025-06-08T18:23:59

了解です。

wada delete_label at 2025-06-08T18:24:02: コメントあり
kouho merge at 2025-06-10T12:30:57: ソロレイド修正
kouho close at 2025-06-10T12:30:57: Close

Commit range

base35c39ff83894ccda771b85e72c1417055bd181c0
heade7316f80a5add82272caedaa44269cf370442d3b
base branchjolly/jr-web:master
head branchjolly/jr-web:raid_spirit_merge_kouho

View commits

Commit details are loaded from Git when a dynamic archive server is running, or can be embedded with --include-commits.
Files changed161 filesView patch
statusfile
modifiedlib/SkillFunc.inc
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/class/controller/JrControllerRaidEvent.class.php
modifiedlib/conf/class/RaidMonsterConfig.class.php
modifiedlib/conf/class/RaidMonsterTypeConfig.class.php
modifiedlib/conf/define_y.inc
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/banner/RaidEvent/season_common/raid_banner_29_1.jpg
addedpublic_html/img/banner/RaidEvent/season_common/raid_banner_29_2.jpg
addedpublic_html/img/banner/RaidEvent/season_common/raid_banner_29_end_1.jpg
addedpublic_html/img/banner/RaidEvent/season_common/raid_banner_29_end_2.jpg
addedpublic_html/img/card/120/1580.jpg
addedpublic_html/img/card/120/364.jpg
addedpublic_html/img/card/240/1580.jpg
addedpublic_html/img/card/240/364.jpg
addedpublic_html/img/card/26/1580.jpg
addedpublic_html/img/card/26/364.jpg
addedpublic_html/img/card/320/1580.jpg
addedpublic_html/img/card/320/364.jpg
addedpublic_html/img/card/640/1580.jpg
addedpublic_html/img/card/640/364.jpg
addedpublic_html/img/card/70/1580.jpg
addedpublic_html/img/card/70/364.jpg
addedpublic_html/img/card/70main/1580.jpg
addedpublic_html/img/card/70main/364.jpg
addedpublic_html/img/card/battle/154/1580.jpg
addedpublic_html/img/card/battle/154/364.jpg
addedpublic_html/img/card/battle/58/1580.jpg
addedpublic_html/img/card/battle/58/364.jpg
addedpublic_html/img/card/battle/raid/1009_spirit.jpg
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/card_piece/card_detail/364_1.png
addedpublic_html/img/card_piece/card_detail/364_2.png
addedpublic_html/img/card_piece/icon/141.png
addedpublic_html/img/card_piece/icon_292/141.png
addedpublic_html/img/info_event/info_event_1422_1.jpg
addedpublic_html/img/info_event/info_event_1422_2.jpg
addedpublic_html/img/info_event/info_event_1423_1.jpg
addedpublic_html/img/info_event/info_event_1423_2.jpg
addedpublic_html/img/info_jrye/RaidEventImg/season_common/29/defeat_monster.jpg
addedpublic_html/img/info_jrye/RaidEventImg/season_common/29/header_1.jpg
addedpublic_html/img/info_jrye/RaidEventImg/season_common/29/itemrank1.png
addedpublic_html/img/info_jrye/RaidEventImg/season_common/29/itemrank2.png
addedpublic_html/img/info_jrye/RaidEventImg/season_common/29/limited_card.jpg
addedpublic_html/img/info_jrye/RaidEventImg/season_common/29/new_point_overview.jpg
addedpublic_html/img/info_jrye/RaidEventImg/season_common/29/new_point_overview_2.jpg
addedpublic_html/img/info_jrye/RaidEventImg/season_common/29/new_point_reward.jpg
addedpublic_html/img/info_jrye/RaidEventImg/season_common/29/new_reward.jpg
addedpublic_html/img/info_jrye/RaidEventImg/season_common/29/notice_header_1.jpg
addedpublic_html/img/info_jrye/RaidEventImg/season_common/29/ranking_reward.jpg
addedpublic_html/img/info_jrye/RaidEventImg/season_common/29/reward/vs-reward1.jpg
addedpublic_html/img/info_jrye/RaidEventImg/season_common/29/reward/vs-reward2.jpg
addedpublic_html/img/info_jrye/RaidEventImg/season_common/29/reward/vs-reward3.jpg
addedpublic_html/img/info_jrye/RaidEventImg/season_common/29/reward/vs-reward4.jpg
addedpublic_html/img/info_jrye/RaidEventImg/season_common/29/reward/vs-reward5.jpg
addedpublic_html/img/info_jrye/RaidEventImg/season_common/29/reward/vs-reward6.jpg
addedpublic_html/img/info_jrye/RaidEventImg/season_common/29/team_battle.jpg
addedpublic_html/img/item/120/1782.jpg
addedpublic_html/img/item/120/1783.jpg
addedpublic_html/img/item/120/17937.jpg
addedpublic_html/img/item/120/17938.jpg
addedpublic_html/img/item/120/17939.jpg
addedpublic_html/img/item/120/17940.jpg
addedpublic_html/img/item/120/17941.jpg
addedpublic_html/img/item/150/1782.jpg
addedpublic_html/img/item/150/1783.jpg
addedpublic_html/img/item/150/17937.jpg
addedpublic_html/img/item/150/17938.jpg
addedpublic_html/img/item/150/17939.jpg
addedpublic_html/img/item/150/17940.jpg
addedpublic_html/img/item/150/17941.jpg
addedpublic_html/img/item/60/1782.jpg
addedpublic_html/img/item/60/1783.jpg
addedpublic_html/img/item/60/17937.jpg
addedpublic_html/img/item/60/17938.jpg
addedpublic_html/img/item/60/17939.jpg
addedpublic_html/img/item/60/17940.jpg
addedpublic_html/img/item/60/17941.jpg
addedpublic_html/img/item/70/1782.jpg
addedpublic_html/img/item/70/1783.jpg
addedpublic_html/img/item/70/17937.jpg
addedpublic_html/img/item/70/17938.jpg
addedpublic_html/img/item/70/17939.jpg
addedpublic_html/img/item/70/17940.jpg
addedpublic_html/img/item/70/17941.jpg
addedpublic_html/img/item/card_piece/120/141.jpg
addedpublic_html/img/item/card_piece/150/141.jpg
addedpublic_html/img/item/card_piece/58/141.jpg
addedpublic_html/img/item/card_piece/60/141.jpg
addedpublic_html/img/item/card_piece/70/141.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/main/event_info_window/raid/event_logo/29_1.png
addedpublic_html/img/main/event_info_window/raid/event_logo/29_2.png
addedpublic_html/img/main/event_info_window/raid/event_logo/29_3.png
addedpublic_html/img/mission/card/1580.png
addedpublic_html/img/mission/card/364.png
addedpublic_html/img/raid/point_item/100364_1.png
addedpublic_html/img/raid/point_item/100364_2.png
addedpublic_html/img/raid/point_item/14141_1.png
addedpublic_html/img/raid/point_item/14141_2.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
addedpublic_html/img/ranking/event_raid/info_raid81.jpg
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
modifiedpublic_html/template/Raid-Vs.tpl
addedpublic_html/template/Raid-VsFin.tpl
modifiedpublic_html/template/RaidEvent-InfoDetails.tpl
modifiedpublic_html/template/RaidEvent-InfoRewards.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.