jolly/jr-web #571 【1/20】建築イベントリリース(島)

Description

opened by iwamoto at 2021-01-20T09:48:33; updated 2023-10-20T13:21:18

【1/20】リリース手順書(島テーマ) #570
【1/20】島テーマ #550

iwamoto merge at 2021-01-20T10:06:32: 【1/20】建築イベントリリース(島)

iwamoto close at 2021-01-20T10:06:32: Close

Metadata

type	Pull Request
state	closed
opened by	iwamoto
assigned	iwamoto
registered	2021-01-20T09:48:33
updated	2023-10-20T13:21:18
milestone	release_20210120

Labels

イベントマスタへマージ

Pull Request

base	jolly/jr-web:master
head	jolly/jr-web:develop
from	909a52c1911a14962681b916eff043e083be815c
to	bfec5bab0721d6f80fe2a5896bcb2280bdd011ef

Commit range

base	`909a52c1911a14962681b916eff043e083be815c`
head	`bfec5bab0721d6f80fe2a5896bcb2280bdd011ef`
base branch	jolly/jr-web:master
head branch	jolly/jr-web:develop

View commits

Commit details are loaded from Git when a dynamic archive server is running, or can be embedded with --include-commits.

Files changed122 filesView patch

status	file
modified	`lib/SubFunc.inc`
modified	`lib/class/const/PresentNameConst.class.php`
modified	`lib/conf/class/BattleEventConfig.class.php`
modified	`lib/conf/class/BuildEventItemConfig.class.php`
modified	`lib/conf/class/DailyEventConfig.class.php`
modified	`lib/conf/class/JackpotWarConfig.class.php`
modified	`lib/conf/class/RaidMonsterConfig.class.php`
modified	`lib/conf/class/ReprintGachaConfig.class.php`
modified	`lib/conf/define_y.inc`
modified	`lib/exec/del_log_bell_change.inc`
modified	`lib/exec/del_log_card.inc`
modified	`lib/exec/del_log_commerce.inc`
modified	`lib/exec/del_log_commerce_friend.inc`
modified	`lib/exec/del_log_del_present_box.inc`
modified	`lib/exec/del_log_gold_change.inc`
modified	`lib/exec/del_log_gold_collect.inc`
modified	`lib/exec/del_log_item.inc`
modified	`lib/exec/del_log_material_request.inc`
modified	`lib/exec/del_log_stage_change.inc`
modified	`lib/exec/del_log_team_raid_monster_per_damage.inc`
modified	`lib/exec/del_log_user_activity.inc`
modified	`lib/exec/del_log_user_area_item.inc`
modified	`lib/exec/del_log_user_blue_ball.inc`
modified	`lib/exec/del_log_user_build.inc`
modified	`lib/exec/del_log_user_event.inc`
modified	`lib/exec/del_log_user_material_item.inc`
added	`lib/exec/fix_weekday_limited_item_20210106.php`
added	`lib/exec/fix_yamada_daily_quest_20210106.php`
modified	`lib/models/Raid_battle_model.php`
modified	`lib/models/Yamada_point_quest.php`
modified	`lib/public/Quest-Clear.inc`
modified	`lib/public/Raid-Default.inc`
modified	`lib/public/Raid-GetMedal.inc`
modified	`lib/public/Raid-GetMedalVs.inc`
modified	`lib/public/Raid-Log.inc`
modified	`lib/public/Raid-LogVs.inc`
modified	`lib/public/Raid-Vs.inc`
modified	`lib/public/Setting-Area.inc`
added	`public_html/img/assortment/10157/head.jpg`
added	`public_html/img/assortment/10157/spgacha_item_1.jpg`
added	`public_html/img/assortment/10157/spgacha_item_2.jpg`
added	`public_html/img/assortment/10157/spgacha_item_3.jpg`
added	`public_html/img/banner/Campaign/banner_shipharf_1.jpg`
added	`public_html/img/banner/Campaign/banner_shipharf_2.jpg`
modified	`public_html/img/gacha/114/banner_gacha114.jpg`
modified	`public_html/img/gacha/114/banner_gacha114_2.jpg`
modified	`public_html/img/gacha/114/gacha114.jpg`
modified	`public_html/img/gacha/114/gacha114_2.jpg`
modified	`public_html/img/gacha/114/gacha114_card_info131.jpg`
modified	`public_html/img/gacha/114/gacha114_card_info143.jpg`
modified	`public_html/img/gacha/114/gacha114_card_info168.jpg`
modified	`public_html/img/gacha/114/gacha114_card_info176.jpg`
modified	`public_html/img/gacha/114/gacha114_info.jpg`
added	`public_html/img/gacha/114/gacha114_info2.jpg`
added	`public_html/img/gacha/114/gacha114_info3.jpg`
added	`public_html/img/gacha/114/gacha114_info4.jpg`
modified	`public_html/img/gacha/114/gacha114_title.jpg`
added	`public_html/img/gacha/114/gacha114_title2.jpg`
added	`public_html/img/gacha/145/banner_gacha145.jpg`
added	`public_html/img/gacha/145/banner_gacha145_2.jpg`
modified	`public_html/img/gacha/145/gacha145.jpg`
modified	`public_html/img/gacha/145/gacha145_2.jpg`
modified	`public_html/img/gacha/145/gacha145_card_info25.jpg`
modified	`public_html/img/gacha/145/gacha145_card_info50.jpg`
modified	`public_html/img/gacha/145/gacha145_card_info66.jpg`
modified	`public_html/img/gacha/145/gacha145_card_info80.jpg`
modified	`public_html/img/gacha/145/gacha145_info.jpg`
modified	`public_html/img/gacha/145/gacha145_info2.jpg`
modified	`public_html/img/gacha/145/gacha145_info3.jpg`
added	`public_html/img/gacha/145/gacha145_info4.jpg`
modified	`public_html/img/gacha/145/gacha145_title.jpg`
added	`public_html/img/gacha/145/gacha145_title2.jpg`
modified	`public_html/img/gacha/gacha_resetbtn.jpg`
modified	`public_html/img/gacha/gacha_resetbtn_2.jpg`
added	`public_html/img/gacha/stepboxinfo/145/info1.jpg`
added	`public_html/img/gacha/stepboxinfo/145/info2.jpg`
added	`public_html/img/gacha/stepboxinfo/145/info3.jpg`
added	`public_html/img/gacha/stepboxinfo/145/info4.jpg`
added	`public_html/img/gacha/stepboxinfo/145/info5.jpg`
added	`public_html/img/gacha/stepboxinfo/145/info6.jpg`
modified	`public_html/img/info_event/info_event_111_1.jpg`
modified	`public_html/img/info_jrye/462/info5.jpg`
added	`public_html/img/info_jrye/SkillBallInfo/467/info1.jpg`
added	`public_html/img/info_jrye/SkillBallInfo/467/info3-1.jpg`
added	`public_html/img/info_jrye/SkillBallInfo/467/info3-2.jpg`
added	`public_html/img/info_jrye/SkillBallInfo/467/info3-3.jpg`
added	`public_html/img/info_jrye/SkillBallInfo/467/info3.jpg`
added	`public_html/img/info_jrye/SkillBallInfo/467/info4-1.jpg`
added	`public_html/img/info_jrye/SkillBallInfo/467/info4-2.jpg`
added	`public_html/img/info_jrye/SkillBallInfo/467/info4-3.jpg`
added	`public_html/img/info_jrye/campaign_yamada/451/info1.jpg`
added	`public_html/img/invite/1/btn_line.png`
added	`public_html/img/invite/1/flow2.jpg`
added	`public_html/img/item/120/10157.jpg`
added	`public_html/img/item/150/10157.jpg`
added	`public_html/img/item/60/10157.jpg`
added	`public_html/img/item/70/10157.jpg`
added	`public_html/img/login/loginbonus/beginner/beginner_login_176.jpg`
added	`public_html/img/login/loginbonus/beginner/beginner_login_present_7_176.jpg`
added	`public_html/img/ranking/event_battle/info6.jpg`
added	`public_html/img/ranking/event_raid/info_raid11.jpg`
added	`public_html/img/shop/banner/57_end_1.jpg`
added	`public_html/img/shop/banner/57_end_2.jpg`
added	`public_html/img/shop/banner/57_start_1.jpg`
added	`public_html/img/shop/banner/57_start_2.jpg`
added	`public_html/img/toppic/campaign/yamada_toppic_main9_1.jpg`
added	`public_html/img/toppic/campaign/yamada_toppic_main9_1_end.jpg`
added	`public_html/img/toppic/campaign/yamada_toppic_main9_2.jpg`
added	`public_html/img/toppic/campaign/yamada_toppic_main9_2_end.jpg`
modified	`public_html/template/Bar-Gacha_old.tpl`
modified	`public_html/template/Default.tpl`
modified	`public_html/template/Invite.tpl`
modified	`public_html/template/Main.tpl`
modified	`public_html/template/Raid-Vs.tpl`
modified	`public_html/template/Ranking-Event.tpl`
modified	`public_html/template/Shop.tpl`
added	`tool/event/battle_event_html.txt`
added	`tool/event/test_battle_event.php`
added	`tool/event/test_build_event.php`
added	`tool/event/test_gacha.php`
added	`tool/event/test_raid_event.php`
added	`tool/ship/ship_data_insert.php`

Patch body is stored as a separate file to keep this page lightweight.