jolly/jr-web #346 【10/20】建築イベント(島テーマ2)

Description

opened by iwamoto at 2020-10-14T12:23:13; updated 2023-04-19T14:13:42

【10/21】島テーマ #336

#7756 by iwamoto at 2020-10-14T20:25:05; updated 2020-10-14T20:25:05

SP効果付き建物の追加必要

master_object_data
master_object_data_detail
master_object_data_lv

また、今回はSP効果が

GOLD x3倍 , 住民 x3倍

iwamoto add_label at 2020-10-14T20:25:17: レビュー待ち

#7758 by iwamoto at 2020-10-15T09:54:13; updated 2020-10-15T09:54:13

@wada
お手すきの際にレビューお願いします

#7759 by wada at 2020-10-15T10:56:39; updated 2020-10-15T10:56:39

@iwamoto
確認しました。マージOKです。

iwamoto merge at 2020-10-15T11:34:14: 【10/20】建築イベント(島テーマ2)

iwamoto close at 2020-10-15T11:34:14: Close

iwamoto commit at 2020-10-16T15:25:45: 島イベント告知変更 #346 d07293dc773b5e6c839c22a35f1d048248625bcd

レビュー待ちイベントデベロップへマージ

base	jolly/jr-web:develop
head	jolly/jr-web:event_build_island_2_336
from	1ef95df23eb164e2ebbd1995efcfbb23f1ff8c00
to	105b1ba5a16f3025510d39a2837f216971231cd1

base	`1ef95df23eb164e2ebbd1995efcfbb23f1ff8c00`
head	`105b1ba5a16f3025510d39a2837f216971231cd1`
base branch	jolly/jr-web:develop
head branch	jolly/jr-web:event_build_island_2_336

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

Files changed11 filesView patch

status	file
added	`database/migrate/2020101201_master_object_data.sql`
added	`island_img/island_20001.jpg`
added	`island_img/object_20001.png`
added	`island_img/object_999997_20001.png`
added	`island_img/object_event_0_20001.png`
modified	`lib/SubFunc.inc`
modified	`lib/conf/class/BuildEventItemConfig.class.php`
modified	`lib/conf/define_y.inc`
added	`public_html/img/island/background/20001.jpg`
added	`public_html/img/island/object/object_20001.png`
modified	`public_html/template/Main.tpl`

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