PR

【4/3 15:00】ヴァルハラリリース #2683

wada opened this at 2023-03-29T18:28:28; closed

Description

opened by wada at 2023-03-29T18:28:28; updated 2023-04-05T15:21:50

概要

【3/8】ヴァルハラ島ステージ追加 #2636
【3/9】ヴァルハラ関連スキル追加 #2641
実装シートの実装分類valhalaskillが対象

パイレーツパスリリース時の負担軽減のため先行して本番反映
圧縮jsにjr_valhalla.min.js追加

4/3マージとしているが、多少遅れても良い

DB更新内容

【4/3 15:00】ヴァルハラリリース jolly/jrye-db#352

SQL

【4/18】パイレーツパス実装 #2625

CREATE TABLE `user_valhalla` (
  `user_no` int(11) NOT NULL,
  `season_no` smallint(6) NOT NULL,
  `battle_spirit` mediumint(9) NOT NULL DEFAULT '0',
  `battle_spirit_record` mediumint(9) NOT NULL DEFAULT '0',
  `stage_type` smallint(6) NOT NULL DEFAULT '0',
  `encounter_count` tinyint(4) NOT NULL DEFAULT '0',
  `monster_limit` tinyint(4) NOT NULL DEFAULT '0',
  `stage_click` smallint(6) NOT NULL DEFAULT '0',
  `stage_record` smallint(6) NOT NULL DEFAULT '0',
  `cps_1` smallint(6) NOT NULL DEFAULT '0',
  `cps_2` smallint(6) NOT NULL DEFAULT '0',
  `card_piece_1` smallint(6) NOT NULL DEFAULT '0',
  `card_piece_2` smallint(6) NOT NULL DEFAULT '0',
  `card_piece_3` smallint(6) NOT NULL DEFAULT '0',
  `card_piece_4` smallint(6) NOT NULL DEFAULT '0',
  `card_piece_5` smallint(6) NOT NULL DEFAULT '0',
  `card_piece_6` smallint(6) NOT NULL DEFAULT '0',
  `card_piece_esc` mediumint(9) NOT NULL DEFAULT '0',
  `card_piece_esc_count` smallint(6) NOT NULL DEFAULT '0',
  `card_piece_record` int(11) NOT NULL DEFAULT '0',
  `notice_1` mediumint(9) NOT NULL DEFAULT '0',
  `notice_2` mediumint(9) NOT NULL DEFAULT '0',
  `notice_3` mediumint(9) NOT NULL DEFAULT '0',
  `notice_4` mediumint(9) NOT NULL DEFAULT '0',
  `secret_key` int(11) NOT NULL DEFAULT '0'
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;

ALTER TABLE `user_valhalla`
  ADD PRIMARY KEY (`user_no`,`season_no`),
  ADD KEY `season_no` (`season_no`);

Comment

#26612 by wada at 2023-03-29T18:30:13; updated 2023-03-29T18:30:13

@kouho
確認お願いします。

kouho add_label at 2023-04-05T09:52:30: 皇甫 LGTM

Comment

#26746 by kouho at 2023-04-05T09:53:05; updated 2023-04-05T09:53:05

@wada
確認OKです

wada merge at 2023-04-05T15:19:47: 【4/3 15:00】ヴァルハラリリース
wada close at 2023-04-05T15:19:47: Close
wada delete_branch at 2023-04-05T15:21:50: release_valhalla

Commit range

base81733eba706b4f3bc36529565aaae2a6807845b0
head41366b7a619a44b27b5215a1414c87e1990d0b6b
base branchjolly/jr-web:master
head branchjolly/jr-web:release_valhalla

View commits

Commit details are loaded from Git when a dynamic archive server is running, or can be embedded with --include-commits.
Files changed196 filesView patch
statusfile
modifiedlib/SkillFunc.inc
modifiedlib/SubFunc.inc
addedlib/SubFunc_valhalla.inc
modifiedlib/ajax/battle_player.inc
modifiedlib/ajax/item_result.inc
modifiedlib/ajax/item_select.inc
modifiedlib/ajax/mission_default.inc
addedlib/ajax/valhalla_default.inc
modifiedlib/class/const/ItemConst.class.php
modifiedlib/conf/class/CardPieceConfig.class.php
addedlib/conf/class/ValhallaConfig.class.php
modifiedlib/conf/define_y.inc
modifiedlib/public/Battle-Result.inc
modifiedlib/public/Card-AlbumDetail.inc
modifiedlib/public/Mission.inc
addedlib/public/Valhalla-Escape.inc
addedlib/public/Valhalla.inc
modifiedpublic_html/ajax.php
modifiedpublic_html/css/design.css
addedpublic_html/img/card/120/1405.jpg
addedpublic_html/img/card/120/1411.jpg
addedpublic_html/img/card/120/1412.jpg
addedpublic_html/img/card/120/1413.jpg
addedpublic_html/img/card/120/1414.jpg
addedpublic_html/img/card/240/1405.jpg
addedpublic_html/img/card/240/1411.jpg
addedpublic_html/img/card/240/1412.jpg
addedpublic_html/img/card/240/1413.jpg
addedpublic_html/img/card/240/1414.jpg
addedpublic_html/img/card/26/1405.jpg
addedpublic_html/img/card/320/1405.jpg
addedpublic_html/img/card/320/1411.jpg
addedpublic_html/img/card/320/1412.jpg
addedpublic_html/img/card/320/1413.jpg
addedpublic_html/img/card/320/1414.jpg
addedpublic_html/img/card/640/1405.jpg
addedpublic_html/img/card/640/1411.jpg
addedpublic_html/img/card/640/1412.jpg
addedpublic_html/img/card/640/1413.jpg
addedpublic_html/img/card/640/1414.jpg
addedpublic_html/img/card/70/1405.jpg
addedpublic_html/img/card/70/1411.jpg
addedpublic_html/img/card/70/1412.jpg
addedpublic_html/img/card/70/1413.jpg
addedpublic_html/img/card/70/1414.jpg
addedpublic_html/img/card/70main/1405.jpg
addedpublic_html/img/card/battle/154/1405.jpg
addedpublic_html/img/card/battle/58/1405.jpg
addedpublic_html/img/card_piece/card_detail/1405_1.png
addedpublic_html/img/card_piece/card_detail/1405_2.png
addedpublic_html/img/card_piece/icon/10.png
addedpublic_html/img/card_piece/icon/6.png
addedpublic_html/img/card_piece/icon/9.png
addedpublic_html/img/item/120/205.jpg
addedpublic_html/img/item/150/205.jpg
addedpublic_html/img/item/58/205.jpg
addedpublic_html/img/item/60/205.jpg
addedpublic_html/img/item/70/205.jpg
addedpublic_html/img/item/card_piece/120/6.jpg
addedpublic_html/img/item/card_piece/150/6.jpg
addedpublic_html/img/item/card_piece/60/6.jpg
addedpublic_html/img/item/card_piece/70/6.jpg
addedpublic_html/img/mission/card/1405.png
addedpublic_html/img/mission/dimeffect.png
addedpublic_html/img/mission/exit.png
addedpublic_html/img/mission/help2.jpg
addedpublic_html/img/valhalla/bg101_0.jpg
addedpublic_html/img/valhalla/bg102_0.jpg
addedpublic_html/img/valhalla/bg103_0.jpg
addedpublic_html/img/valhalla/effect/battle_ef1_1.png
addedpublic_html/img/valhalla/effect/battle_ef1_2.png
addedpublic_html/img/valhalla/effect/battle_ef1_3.png
addedpublic_html/img/valhalla/effect/battle_ef1_4.png
addedpublic_html/img/valhalla/effect/battle_ef1_5.png
addedpublic_html/img/valhalla/effect/battle_ef2_1.png
addedpublic_html/img/valhalla/effect/battle_ef2_2.png
addedpublic_html/img/valhalla/effect/battle_ef2_3.png
addedpublic_html/img/valhalla/effect/battle_ef2_4.png
addedpublic_html/img/valhalla/effect/battle_ef2_5.png
addedpublic_html/img/valhalla/effect/battle_ef3_1.png
addedpublic_html/img/valhalla/effect/battle_ef3_2.png
addedpublic_html/img/valhalla/effect/battle_ef3_3.png
addedpublic_html/img/valhalla/effect/battle_ef3_4.png
addedpublic_html/img/valhalla/effect/battle_ef3_5.png
addedpublic_html/img/valhalla/effect/change_ef1_2.png
addedpublic_html/img/valhalla/effect/change_ef1_3.png
addedpublic_html/img/valhalla/effect/change_ef1_4.png
addedpublic_html/img/valhalla/effect/change_ef1_5.png
addedpublic_html/img/valhalla/effect/change_ef2_2.png
addedpublic_html/img/valhalla/effect/change_ef2_3.png
addedpublic_html/img/valhalla/effect/change_ef2_4.png
addedpublic_html/img/valhalla/effect/change_ef2_5.png
addedpublic_html/img/valhalla/effect/ef1.png
addedpublic_html/img/valhalla/effect/ef101.png
addedpublic_html/img/valhalla/effect/ef102.png
addedpublic_html/img/valhalla/effect/ef2.png
addedpublic_html/img/valhalla/effect/ef3.png
addedpublic_html/img/valhalla/effect/ef3_1.png
addedpublic_html/img/valhalla/effect/ef3_2.png
addedpublic_html/img/valhalla/effect/ef4.png
addedpublic_html/img/valhalla/effect/ef5.png
addedpublic_html/img/valhalla/effect/ef6.png
addedpublic_html/img/valhalla/effect/ef7.png
addedpublic_html/img/valhalla/effect/ef8.png
addedpublic_html/img/valhalla/effect/get1.png
addedpublic_html/img/valhalla/effect/get2.png
addedpublic_html/img/valhalla/effect/get3.png
addedpublic_html/img/valhalla/effect/get4.png
addedpublic_html/img/valhalla/effect/get5.png
addedpublic_html/img/valhalla/effect/get6.png
addedpublic_html/img/valhalla/effect/icon1.png
addedpublic_html/img/valhalla/effect/icon2.png
addedpublic_html/img/valhalla/effect/icon2_frame.png
addedpublic_html/img/valhalla/effect/icon3.png
addedpublic_html/img/valhalla/effect/judgeef1.png
addedpublic_html/img/valhalla/effect/judgeef10.png
addedpublic_html/img/valhalla/effect/judgeef11.png
addedpublic_html/img/valhalla/effect/judgeef12.png
addedpublic_html/img/valhalla/effect/judgeef13.png
addedpublic_html/img/valhalla/effect/judgeef14.jpg
addedpublic_html/img/valhalla/effect/judgeef15.jpg
addedpublic_html/img/valhalla/effect/judgeef16.jpg
addedpublic_html/img/valhalla/effect/judgeef17.png
addedpublic_html/img/valhalla/effect/judgeef18.png
addedpublic_html/img/valhalla/effect/judgeef19.png
addedpublic_html/img/valhalla/effect/judgeef2.png
addedpublic_html/img/valhalla/effect/judgeef20.png
addedpublic_html/img/valhalla/effect/judgeef21.png
addedpublic_html/img/valhalla/effect/judgeef22.png
addedpublic_html/img/valhalla/effect/judgeef23.png
addedpublic_html/img/valhalla/effect/judgeef24.png
addedpublic_html/img/valhalla/effect/judgeef3.png
addedpublic_html/img/valhalla/effect/judgeef4.png
addedpublic_html/img/valhalla/effect/judgeef5.png
addedpublic_html/img/valhalla/effect/judgeef6.png
addedpublic_html/img/valhalla/effect/judgeef7.png
addedpublic_html/img/valhalla/effect/judgeef8.png
addedpublic_html/img/valhalla/effect/judgeef9.png
addedpublic_html/img/valhalla/effect/result1.png
addedpublic_html/img/valhalla/effect/result2.png
addedpublic_html/img/valhalla/effect/result3.png
addedpublic_html/img/valhalla/effect/result4.png
addedpublic_html/img/valhalla/effect/result5.png
addedpublic_html/img/valhalla/effect/result6.png
addedpublic_html/img/valhalla/effect/result_ratio.png
addedpublic_html/img/valhalla/effect/win_info_1.png
addedpublic_html/img/valhalla/effect/win_info_2.png
addedpublic_html/img/valhalla/event/101_1_1.jpg
addedpublic_html/img/valhalla/event/101_1_2.jpg
addedpublic_html/img/valhalla/event/101_1_3.jpg
addedpublic_html/img/valhalla/event/101_2_1.jpg
addedpublic_html/img/valhalla/event/101_2_2.jpg
addedpublic_html/img/valhalla/event/101_2_3.jpg
addedpublic_html/img/valhalla/event/101_2_4.jpg
addedpublic_html/img/valhalla/event/101_2_5.jpg
addedpublic_html/img/valhalla/event/101_3_1.jpg
addedpublic_html/img/valhalla/event/101_3_2.jpg
addedpublic_html/img/valhalla/event/101_3_3.jpg
addedpublic_html/img/valhalla/event/101_3_4.jpg
addedpublic_html/img/valhalla/event/101_3_5.jpg
addedpublic_html/img/valhalla/event/101_3_6.jpg
addedpublic_html/img/valhalla/event/101_3_7.jpg
addedpublic_html/img/valhalla/event/102_1_1.jpg
addedpublic_html/img/valhalla/event/102_1_2.jpg
addedpublic_html/img/valhalla/event/102_1_3.jpg
addedpublic_html/img/valhalla/event/102_2_1.jpg
addedpublic_html/img/valhalla/event/102_2_2.jpg
addedpublic_html/img/valhalla/event/102_2_3.jpg
addedpublic_html/img/valhalla/event/102_2_4.jpg
addedpublic_html/img/valhalla/event/102_2_5.jpg
addedpublic_html/img/valhalla/event/102_3_1.jpg
addedpublic_html/img/valhalla/event/102_3_2.jpg
addedpublic_html/img/valhalla/event/102_3_3.jpg
addedpublic_html/img/valhalla/event/102_3_4.jpg
addedpublic_html/img/valhalla/event/102_3_5.jpg
addedpublic_html/img/valhalla/event/102_3_6.jpg
addedpublic_html/img/valhalla/event/102_3_7.jpg
addedpublic_html/img/valhalla/stage_title/101.png
addedpublic_html/img/valhalla/stage_title/102.png
addedpublic_html/img/valhalla/stage_title/103.png
modifiedpublic_html/index.php
modifiedpublic_html/js/JOLLYROGER.js
modifiedpublic_html/js/JOLLYROGER_battle.js
modifiedpublic_html/js/JOLLYROGER_mission.js
addedpublic_html/js/JOLLYROGER_valhalla.js
modifiedpublic_html/js/autoload_js.php
modifiedpublic_html/js/jr_battle.min.js
modifiedpublic_html/js/jr_main.min.js
modifiedpublic_html/js/jr_mission.min.js
addedpublic_html/js/jr_valhalla.min.js
modifiedpublic_html/template/Item.tpl
modifiedpublic_html/template/Mission.tpl
addedpublic_html/template/Valhalla.tpl
modifiedpublic_html/template/footer.tpl
modifiedpublic_html/template/header_sp.tpl
modifiedpublic_html/template/parts_dgame_footer.tpl
Patch body is stored as a separate file to keep this page lightweight.