PR

【8/4】レイド9回・第1期 #1025

kouho opened this at 2021-08-04T12:51:31; closed

Description

opened by kouho at 2021-08-04T12:51:31; updated 2025-03-14T15:14:48

概要

レイドイベントの実装用PR
【8/10】レイド9回・第1期 #950

webブランチ:raid_0810
dbブランチ:raid_0810
告知画像ブランチ:info_image_950_1

db更新

master_card.csv
master_card_skill.csv
master_raid_monster_data.csv
master_raid_monster_data_skill.csv
master_raid_monster_data_skill_set.csv
今回チーム対抗レイドの仕様に変更があります。
なくなった仕様
- ダメージに応じたゴールドボーナス
追加仕様
- チーム内のダメージランキング1位の人にアクセサリーを配布

テスト方法、確認した内容

info_image_950とraid_0810ブランチをテスト用のブランチを作成してマージして確認してください。

  • db初期化
UPDATE `user_mission` SET `raid_point`=0,`raid_point2`=0,`total_raid_point`=0,`m_event_limit`=0;

UPDATE `team_data` SET `raid_stamina`=0,`raid_monster`=0,`raid_monster_vs`=0,`raid_lv`=0,`raid_count`=0,`total_raid_count`=0,`event_raid_count`=0,`war_bonus_time`=0,`event_prize`=0,`raid_vs_end_time`=0;
  • テストスクリプト実行での設定確認
dockerから実行
$ cd /home/web/jr-web/tool/event/
$ ENVIRONMENT=develop PF=yamada HTTP_HOST=127.0.0.1 IS_DOCKER=true php test_raid_event.php

TODO

・チーム内ダメージランキング1位報酬配布時の表示修正が必要

Comment

#12716 by kouho at 2021-08-04T12:54:12; updated 2021-08-04T12:54:12

@wada @iwamoto
確認お願いいたします。

Comment

#12720 by wada at 2021-08-04T14:21:23; updated 2021-08-04T14:21:23

@kouho
アクセの表示は、SubFunc.inc内の報酬取得関数でindexを-1しているからだと思います。

#SubFunc.inc#L36177-36180
+                               $get_list[$i]['type'] = $sql_type[$temp_i-1];
+                               $get_list[$i]['id'] = $sql_id[$temp_i-1];
+                               $get_list[$i]['count'] = $sql_count[$temp_i-1];
+                               $get_list[$i]['status'] = 3; // ダメージランキング報酬

Comment

#12721 by wada at 2021-08-04T14:22:22; updated 2021-08-04T14:22:22

@kouho
アイテム獲得時のテキストは、全角でも問題ないので全角でお願いします。
<img src="https://git.dev.d-es.co.jp/gitbucket/jolly/jr-web/_attached/1628054492370ljskfkSBTP" width="400">

Comment

#12723 by kouho at 2021-08-04T14:48:19; updated 2021-08-04T14:48:19

@wada
ありがとうございます。指摘いただいた箇所を修正しました。

Comment

#12728 by iwamoto at 2021-08-04T17:12:11; updated 2021-08-04T17:12:11

@kouho
DBに報酬カード「ギガス」の設定がありませんでした。

Comment

#12733 by kouho at 2021-08-04T17:22:22; updated 2021-08-04T17:22:22

@iwamoto
確認ありがとうございます。
指摘箇所を確認しましたが分かりませんでした。
ギガスはスキルを公開して、カードを公開にされていると思うのですが他に何か必要でしょうか?

Comment

#12734 by wada at 2021-08-04T17:29:39; updated 2021-08-04T17:29:39

@kouho
master_card.csvの更新内容がオヴェリアだけなんですが、もしかしてpushできてませんか?

--- a/csv/master_card.csv
+++ b/csv/master_card.csv
@@ -342,8 +342,8 @@
 "DATA","362","カトブレパス","1","4","3","0","10","100","-1","-1","-1","-1","1496","1496","1496","1","1","2","0"
 "DATA","363","フレースヴェルグ","3","1","1","0","20","130","-1","-1","-1","-1","0","0","0","1","1","6","0"
 "DATA","366","幻麗の女帝ギョクリン","7","2","2","0","40","160","607","10601","214","0","2451","2613","2782","0","1","2","0"
-"DATA","367","誓剣のオヴェリア","6","1","2","0","35","150","701","109","602","209","2152","2472","2335","1","1","3","0"
-"DATA","368","覇剣のオヴェリア","6","1","2","0","35","150","702","141","602","212","2152","2472","2335","1","1","6","0"
+"DATA","367","誓剣のオヴェリア","6","1","2","0","35","150","701","109","602","209","2152","2472","2335","0","1","3","0"
+"DATA","368","覇剣のオヴェリア","6","1","2","0","35","150","702","141","602","212","2152","2472","2335","0","1","6","0"
 "DATA","369","策士の軍師ナツキ","6","3","2","0","35","150","644","429","758","0","2439","2349","2465","0","1","3","0"
 "DATA","370","海の修理屋ガークス","6","3","1","0","35","150","127","415","201","-1","2565","2444","2345","0","0","1","0"
 "DATA","371","大弓のテディ","4","3","1","0","25","130","2165","0","-1","-1","1844","1959","1914","1","1","1","0"

Comment

#12736 by iwamoto at 2021-08-04T17:37:32; updated 2021-08-04T17:37:32

@kouho
db側 raid_0810の``7b1d558``には オヴェリア 2種のカード公開は確認できましたが、ギガスは確認できませんでした。
ギガスのスキルは確認できています。

また、与えたダメージポイントに応じて
次の報酬又は達成した報酬が画像表示されますがギガスの画像が「キャプテンキッド」になってます

!raid-default

Comment

#12742 by kouho at 2021-08-04T18:15:29; updated 2021-08-04T18:15:29

@iwamoto @wada
すみません確かにコミットできていませんでした。ギガスリリースコミットしました。

Comment

#12743 by kouho at 2021-08-04T18:19:24; updated 2021-08-04T18:19:24

@iwamoto
達成報酬のギガスの表示について
17:12の 834b0da95a3a0a091dab59b0bf12c17ee5af2e3b
のコミットで修正していますのでpullしてみていただけないでしょうか?

!スクリーンショット 2021-08-04 18

Comment

#12746 by wada at 2021-08-04T18:38:06; updated 2021-08-04T18:38:06

@kouho
確認しました。OKです

wada add_label at 2021-08-04T18:38:09: 和田 LGTM

Comment

#12755 by iwamoto at 2021-08-04T19:32:24; updated 2021-08-04T19:32:24

@kouho
確認しました。こちらで大丈夫かと思います。

iwamoto add_label at 2021-08-04T19:32:36: 岩本 LGTM
kouho merge at 2021-08-05T10:15:09: 【8/4】レイド9回・第1期
kouho close at 2021-08-05T10:15:09: Close
kouho refer at 2021-08-20T10:35:22: 1071:WIKi用 issueまとめ
kouho commit at 2021-08-23T14:26:23: レイドイベント更新 #1025 4f46cb3e848912d2f8bd1b712d78f981ce7a702a
kouho refer at 2021-08-23T16:39:27: 1075:レイドイベント更新 #1025
kouho commit at 2021-08-30T11:24:36: レイドイベント更新 #1025 e875489eb236448d4d5dd5ad5dcaf95a08feaf2c

Commit range

basef682de1e72956d73b6aad3f0bcc8f8ac2764d4ad
head834b0da95a3a0a091dab59b0bf12c17ee5af2e3b
base branchjolly/jr-web:develop
head branchjolly/jr-web:raid_0810

View commits

Commit details are loaded from Git when a dynamic archive server is running, or can be embedded with --include-commits.
Files changed13 filesView patch
statusfile
modifiedlib/SubFunc.inc
modifiedlib/conf/class/RaidMonsterConfig.class.php
modifiedlib/conf/class/RaidMonsterTypeConfig.class.php
modifiedlib/conf/define_y.inc
addedpublic_html/img/main/event_icon/raid/589.png
addedpublic_html/img/main/event_icon/raid/589_rare.png
addedpublic_html/img/main/event_icon/raid/589_team.png
addedpublic_html/img/raid/point_item/114_1.png
addedpublic_html/img/raid/point_item/114_2.png
addedpublic_html/img/ranking/event_raid/info_raid21.jpg
modifiedpublic_html/template/Raid-GetMedalVs.tpl
modifiedpublic_html/template/Raid-Ranking.tpl
modifiedtool/event/test_raid_event.php
Patch body is stored as a separate file to keep this page lightweight.