kimu524
|
d0aef632c0
|
Revert "update meta 差分"
This reverts commit 67a25acfb1.
|
2022-07-12 12:36:56 +09:00 |
koya_15
|
25d8f5474d
|
新しいフライパン追加
|
2022-07-11 17:24:27 +09:00 |
|
koya_15
|
82a13aeb03
|
使っていない素材削除
|
2022-07-11 14:05:46 +09:00 |
|
koya_15
|
f2e88e6f8d
|
タイトル背景調整
|
2022-07-11 12:20:19 +09:00 |
|
koya_15
|
5fbc0592ed
|
販売画面使っていない背景削除
|
2022-07-11 12:15:25 +09:00 |
|
koya_15
|
af8673cbcc
|
使わない画像削除、タイル調整
|
2022-07-11 12:11:58 +09:00 |
|
kimura
|
99b901afe3
|
ハート加算変更
|
2022-07-08 14:56:37 +09:00 |
水谷圭吾
|
587aa1897e
|
スプレッドシート更新
|
2022-07-08 14:18:56 +09:00 |
|
koya_15
|
71da6ede4a
|
テキストはみだし調整
|
2022-07-08 11:25:36 +09:00 |
|
koya_15
|
20499f19db
|
背景軽量化調整
|
2022-07-08 11:08:37 +09:00 |
|
koya_15
|
7aedd34484
|
三番目の看板翻訳用対応
|
2022-07-08 10:48:59 +09:00 |
|
koya_15
|
93737ff583
|
背景軽量化調整、看板ロゴ調整
|
2022-07-07 19:59:07 +09:00 |
|
koya_15
|
aab8f5ef09
|
背景画像ばらし軽量化
|
2022-07-07 17:53:14 +09:00 |
|
koya_15
|
380857d2fa
|
背景画像ばらし軽量化
|
2022-07-07 17:19:33 +09:00 |
|
shogo kimura
|
a62f65b2db
|
Merged feature/unity_update_2022.3.3f1 into feature/v1.5.1
|
2022-07-06 06:20:11 +00:00 |
|
koya_15
|
44776cafe9
|
翻訳あてはめ
|
2022-07-06 12:52:33 +09:00 |
|
shogo kimura
|
25bcc5dbee
|
Merged feature/addMiniGame into feature/unity_update_2022.3.3f1
|
2022-07-06 03:47:16 +00:00 |
|
koya_15
|
69ea63c7c2
|
Merge branch 'feature/addMiniGame' of bitbucket.org:usaya/popcorn into feature/addMiniGame
|
2022-07-06 12:45:41 +09:00 |
|
koya_15
|
4a041625ec
|
翻訳調整、弟レイヤー変更
|
2022-07-06 12:45:26 +09:00 |
|
kimura
|
76bffc60f8
|
add 翻訳
|
2022-07-06 12:42:53 +09:00 |
|
kimura
|
df906758ba
|
EDM4U 不要ファイル削除
|
2022-07-06 12:19:05 +09:00 |
|
水谷圭吾
|
90e79554b5
|
Merge branch 'feature/addMiniGame' of https://bitbucket.org/usaya/popcorn into feature/addMiniGame
|
2022-07-06 12:02:39 +09:00 |
|
水谷圭吾
|
d3678314f7
|
スプレッドシート更新
|
2022-07-06 12:02:29 +09:00 |
|
koya_15
|
d0f72123e8
|
翻訳あてはめ
|
2022-07-06 11:58:14 +09:00 |
|
koya_15
|
1f73398176
|
Merge branch 'feature/addMiniGame' of bitbucket.org:usaya/popcorn into feature/addMiniGame
|
2022-07-06 11:03:07 +09:00 |
|
koya_15
|
c1348bd26a
|
翻訳画像あてはめ
|
2022-07-06 11:02:57 +09:00 |
|
水谷圭吾
|
77836e075c
|
スプレッドシート更新
|
2022-07-06 10:49:02 +09:00 |
|
kimura
|
8baa58a7ec
|
レシピ獲得通知修正
|
2022-07-06 10:24:00 +09:00 |
|
koya_15
|
11e1683097
|
レイヤー調整
|
2022-07-05 20:02:47 +09:00 |
|
koya_15
|
cb46900bbe
|
背景レイヤー調整
|
2022-07-05 19:51:06 +09:00 |
|
koya_15
|
995c021317
|
Merge branch 'feature/addMiniGame' of bitbucket.org:usaya/popcorn into feature/addMiniGame
|
2022-07-05 19:37:50 +09:00 |
|
koya_15
|
6de151eed3
|
背景調整
|
2022-07-05 19:37:42 +09:00 |
hirokei
|
fac9437a9d
|
Merge branch 'feature/addMiniGame' of bitbucket.org:usaya/popcorn into feature/addMiniGame
|
2022-07-05 18:19:29 +09:00 |
|
hirokei
|
8b4a18e601
|
ステージのアイテム設置位置調整
|
2022-07-05 18:19:21 +09:00 |
|
koya_15
|
16bd396c1b
|
Merge branch 'feature/addMiniGame' of bitbucket.org:usaya/popcorn into feature/addMiniGame
|
2022-07-05 18:15:23 +09:00 |
|
koya_15
|
8a83c9e163
|
地面途中
|
2022-07-05 18:15:15 +09:00 |
|
koya_15
|
a0f751c901
|
地面画像ばらし
|
2022-07-05 18:14:40 +09:00 |
atusi
|
4e6518a01b
|
Merge branch 'feature/addMiniGame' of bitbucket.org:usaya/popcorn into feature/addMiniGame
|
2022-07-05 18:10:21 +09:00 |
|
atusi
|
eba039f5fa
|
Merge branch 'develop' of bitbucket.org:usaya/popcorn into feature/addMiniGame
|
2022-07-05 18:07:10 +09:00 |
|
kimura
|
67a25acfb1
|
update meta 差分
|
2022-07-05 17:50:25 +09:00 |
|
kimura
|
b12fa8cd7f
|
change const unity version
|
2022-07-05 17:48:17 +09:00 |
|
kimura
|
b9a0ff7532
|
auto update functions
|
2022-07-05 17:47:56 +09:00 |
|
hirokei
|
53a463e8f2
|
デザイン調整
|
2022-07-05 17:43:49 +09:00 |
|
koya_15
|
94a6b1c3f5
|
Merge branch 'feature/addMiniGame' of bitbucket.org:usaya/popcorn into feature/addMiniGame
|
2022-07-05 17:07:20 +09:00 |
|
koya_15
|
e76bf418b6
|
翻訳画像追加
|
2022-07-05 17:06:50 +09:00 |
|
水谷圭吾
|
186d444d25
|
Merge branch 'feature/addMiniGame' of https://bitbucket.org/usaya/popcorn into feature/addMiniGame
|
2022-07-05 17:06:21 +09:00 |
|
水谷圭吾
|
2b82ccc316
|
ステージ調整
|
2022-07-05 17:05:58 +09:00 |
|
hirokei
|
a8ff038db0
|
不要画像削除
|
2022-07-05 16:53:20 +09:00 |
|
hirokei
|
f778bbc0e6
|
空の雲調整
|
2022-07-05 14:38:10 +09:00 |
|
kimura
|
e6e02da091
|
stage prefab削除 / デバッグエラー解消
|
2022-07-05 12:58:54 +09:00 |
|
kimura
|
2595c5421c
|
カゴ表示切り替え調整
|
2022-07-05 12:11:36 +09:00 |
|
hirokei
|
e706504871
|
上級空の色変更
|
2022-07-05 12:06:01 +09:00 |
|
水谷圭吾
|
3861f60d3a
|
スプレッドシート更新
|
2022-07-05 10:22:04 +09:00 |
|
水谷圭吾
|
90a7472e48
|
Merge branch 'feature/addMiniGame' of https://bitbucket.org/usaya/popcorn into feature/addMiniGame
|
2022-07-05 10:05:26 +09:00 |
|
水谷圭吾
|
14916013e8
|
ステージの唐辛子を2倍に変更
|
2022-07-05 10:05:10 +09:00 |
|
koya_15
|
70d39fe218
|
アイコン再調整
|
2022-07-04 17:42:11 +09:00 |
|
koya_15
|
0964b2dba3
|
レシピゲットPOP調整
|
2022-07-04 16:48:07 +09:00 |
|
hirokei
|
6a210429dd
|
ヒットエフェクト調整
|
2022-07-04 15:35:35 +09:00 |
|
koya_15
|
0fb9c65287
|
フッターボタン文字変更
|
2022-07-04 15:23:18 +09:00 |
|
koya_15
|
7f041c788e
|
リザルト調整
|
2022-07-04 15:05:45 +09:00 |
|
koya_15
|
1a73501d3b
|
リザルト画面再調整
|
2022-07-04 14:55:09 +09:00 |
|
kimura
|
ce697df51c
|
ヒットエフェクト表示位置調整
|
2022-07-04 13:54:03 +09:00 |
|
kimura
|
7b96a2babb
|
リザルト修正
|
2022-07-04 13:51:16 +09:00 |
|
kimura
|
d0e54175e5
|
ゴール時アニメーション実装
|
2022-07-04 13:15:10 +09:00 |
|
kimura
|
2d0a1f7bf3
|
ジャンプ改善
|
2022-07-04 13:15:09 +09:00 |
|
koya_15
|
4871dbbb40
|
リザルト画面調整
|
2022-07-04 12:43:18 +09:00 |
|
hirokei
|
5ea4b1d6c6
|
キャラ演出調整
|
2022-07-04 12:00:15 +09:00 |
|
hirokei
|
a81d70c36c
|
空若干調整
|
2022-07-04 11:37:14 +09:00 |
|
kimura
|
b577bb69e0
|
背景切り替え処理追加
|
2022-07-04 11:15:33 +09:00 |
|
kimura
|
25fcb7dbed
|
カメラサイズ調整
|
2022-07-04 10:56:36 +09:00 |
|
hirokei
|
3db9b5bfa3
|
ミニゲーム演出調整
|
2022-07-04 10:14:10 +09:00 |
|
hirokei
|
176b0d3601
|
カウントダウンフォントサイズ調整
|
2022-07-01 19:49:36 +09:00 |
|
hirokei
|
014191ce70
|
Merge branch 'feature/addMiniGame' of bitbucket.org:usaya/popcorn into feature/addMiniGame
|
2022-07-01 19:44:24 +09:00 |
|
hirokei
|
ea03d1f648
|
演出調整
|
2022-07-01 19:44:17 +09:00 |
|
kimura
|
6a183dc5ac
|
カウントダウン演出実装
|
2022-07-01 16:53:37 +09:00 |
|
hirokei
|
41484061cd
|
Merge branch 'feature/addMiniGame' of bitbucket.org:usaya/popcorn into feature/addMiniGame
|
2022-07-01 16:41:12 +09:00 |
|
hirokei
|
83467632f3
|
ミニゲームシーン空調整
|
2022-07-01 16:40:51 +09:00 |
|
kimura
|
0002b88c6c
|
デバッグボタン位置調整
|
2022-07-01 16:30:04 +09:00 |
|
kimura
|
27e950adae
|
翻訳追加
|
2022-07-01 16:29:17 +09:00 |
|
kimura
|
f4e882da24
|
ScrollGameガイド表示追加
|
2022-07-01 16:08:29 +09:00 |
|
kimura
|
deaa80ce64
|
アス比によるカメラsize調整対応
|
2022-07-01 16:08:29 +09:00 |
|
koya_15
|
9d21a4c446
|
背景追加
|
2022-07-01 16:01:27 +09:00 |
|
koya_15
|
eaa985933a
|
Merge branch 'feature/addMiniGame' of bitbucket.org:usaya/popcorn into feature/addMiniGame
|
2022-07-01 14:51:30 +09:00 |
|
koya_15
|
723fca39c3
|
雲、説明POP調整
|
2022-07-01 14:51:23 +09:00 |
|
hirokei
|
dfd1a832b4
|
Merge branch 'feature/addMiniGame' of bitbucket.org:usaya/popcorn into feature/addMiniGame
|
2022-07-01 14:44:45 +09:00 |
|
hirokei
|
29c24c2758
|
唐辛子アイテム調整
|
2022-07-01 14:44:38 +09:00 |
|
水谷圭吾
|
9151d3347d
|
Merge branch 'feature/addMiniGame' of https://bitbucket.org/usaya/popcorn into feature/addMiniGame
|
2022-07-01 14:35:43 +09:00 |
|
水谷圭吾
|
2ff22d0abb
|
スプレッドシート更新
|
2022-07-01 14:35:35 +09:00 |
|
kimura
|
5dc1f162ac
|
自機の当たり判定をitemとobstacleで切り分け
|
2022-07-01 14:31:00 +09:00 |
|
水谷圭吾
|
b5bfa4e20e
|
Merge branch 'feature/addMiniGame' of https://bitbucket.org/usaya/popcorn into feature/addMiniGame
|
2022-07-01 14:27:34 +09:00 |
|
hirokei
|
53fdd05e22
|
柵重なり順調整
|
2022-07-01 14:27:19 +09:00 |
|
水谷圭吾
|
67865a6222
|
累計報酬の必要スコアを10000に設定
|
2022-07-01 14:27:18 +09:00 |
|
koya_15
|
3a02d90557
|
Merge branch 'feature/addMiniGame' of bitbucket.org:usaya/popcorn into feature/addMiniGame
|
2022-07-01 14:22:47 +09:00 |
|
koya_15
|
6ab806a382
|
柵調整
|
2022-07-01 14:22:22 +09:00 |
|
hirokei
|
25e240f7ef
|
Merge branch 'feature/addMiniGame' of bitbucket.org:usaya/popcorn into feature/addMiniGame
|
2022-07-01 14:09:00 +09:00 |
|
hirokei
|
e0dc08898a
|
カウントダウン演出作成
|
2022-07-01 14:08:53 +09:00 |
|
水谷圭吾
|
8d7e42978d
|
障害物の当たり判定を調整
|
2022-07-01 13:52:10 +09:00 |
|
水谷圭吾
|
dc246127d5
|
転び方調整
|
2022-07-01 13:34:31 +09:00 |
|
hirokei
|
9bf632f95c
|
Merge branch 'feature/addMiniGame' of bitbucket.org:usaya/popcorn into feature/addMiniGame
|
2022-07-01 12:56:12 +09:00 |
|
hirokei
|
d2c8448ee5
|
ミニゲーム演出調整
|
2022-07-01 12:56:05 +09:00 |
|
koya_15
|
ff570feaa9
|
Merge branch 'feature/addMiniGame' of bitbucket.org:usaya/popcorn into feature/addMiniGame
|
2022-07-01 12:43:31 +09:00 |
|
koya_15
|
31fa1a202f
|
説明画面追加
|
2022-07-01 12:43:07 +09:00 |
|
kimura
|
d152b81aec
|
転んだときのアイテム獲得判定を無効
|
2022-07-01 12:35:52 +09:00 |
|
koya_15
|
0de81be22e
|
Merge branch 'feature/addMiniGame' of bitbucket.org:usaya/popcorn into feature/addMiniGame
|
2022-07-01 11:57:51 +09:00 |
|
koya_15
|
09ff26871e
|
トウガラシアニメーション追加
|
2022-07-01 11:57:36 +09:00 |
|
kimura
|
a1cbefc803
|
fix DebugGame.cs
|
2022-07-01 11:56:51 +09:00 |
|
kimura
|
cf85f4165d
|
obstacle prefab 構造変更
|
2022-07-01 11:49:57 +09:00 |
|
kimura
|
3b379e470a
|
minigame シーンから ProtoGame.prefab 削除
|
2022-07-01 11:41:36 +09:00 |
|
koya_15
|
4ccd8b796c
|
空プレハブ化
|
2022-07-01 11:31:46 +09:00 |
|
koya_15
|
6484275486
|
Merge branch 'feature/addMiniGame' of bitbucket.org:usaya/popcorn into feature/addMiniGame
|
2022-07-01 10:49:58 +09:00 |
|
koya_15
|
cfbbd8533e
|
トウガラシアニメーション追加途中
|
2022-07-01 10:49:46 +09:00 |
|
水谷圭吾
|
6c50ad7b06
|
Merge branch 'feature/addMiniGame' of https://bitbucket.org/usaya/popcorn into feature/addMiniGame
|
2022-07-01 10:48:51 +09:00 |
|
水谷圭吾
|
896d8dfaaa
|
木の高さを調整
|
2022-07-01 10:48:43 +09:00 |
|
kimura
|
3335373be4
|
fix DebugGame.cs
|
2022-07-01 10:40:57 +09:00 |
|
水谷圭吾
|
c1df5d0e40
|
Merge branch 'feature/addMiniGame' of https://bitbucket.org/usaya/popcorn into feature/addMiniGame
|
2022-07-01 10:24:03 +09:00 |
|
水谷圭吾
|
20c347003b
|
ステージ調整
|
2022-07-01 10:23:53 +09:00 |
|
kimura
|
3eeb1562a9
|
update こけたときの跳ね軌道を AnimationCurve方式に変更
|
2022-06-30 18:35:48 +09:00 |
|
kimura
|
8297c1e493
|
remove destroyer
|
2022-06-30 17:58:46 +09:00 |
|
kimura
|
346cde3524
|
GameObject整理
|
2022-06-30 17:49:31 +09:00 |
|
koya_15
|
8ac7e45d78
|
Merge branch 'feature/addMiniGame' of bitbucket.org:usaya/popcorn into feature/addMiniGame
|
2022-06-30 17:40:47 +09:00 |
|
koya_15
|
6d5820c4bf
|
木レイヤー調整
|
2022-06-30 17:40:19 +09:00 |
|
kimura
|
f6ff9f092f
|
remove log
|
2022-06-30 17:35:31 +09:00 |
|
koya_15
|
1a66a390e2
|
Merge branch 'feature/addMiniGame' of bitbucket.org:usaya/popcorn into feature/addMiniGame
|
2022-06-30 17:31:55 +09:00 |
|
koya_15
|
1273216e69
|
ミニゲームの木調整
|
2022-06-30 17:31:28 +09:00 |
|
kimura
|
701821293d
|
debug 軌跡頻度変更
|
2022-06-30 17:29:40 +09:00 |
|
kimura
|
8052676974
|
update ジャンプをAnimationCurve方式に変更
|
2022-06-30 17:28:49 +09:00 |
|
kimura
|
1828b4562d
|
エフェクト実装
|
2022-06-30 17:21:21 +09:00 |
|
koya_15
|
4845ab7e0d
|
Merge branch 'feature/addMiniGame' of bitbucket.org:usaya/popcorn into feature/addMiniGame
|
2022-06-30 16:55:32 +09:00 |
|
koya_15
|
894afbfddb
|
エフェクト調整
|
2022-06-30 16:55:08 +09:00 |
|
kimura
|
976f44d586
|
タイマー修正
|
2022-06-30 16:50:47 +09:00 |
|
kimura
|
5c22483472
|
update 素材翻訳
|
2022-06-30 16:50:47 +09:00 |
|
koya_15
|
1802d1c9f6
|
Merge branch 'feature/addMiniGame' of bitbucket.org:usaya/popcorn into feature/addMiniGame
|
2022-06-30 15:17:15 +09:00 |
|
koya_15
|
027acda59c
|
ミニゲーム背景調整
|
2022-06-30 15:17:07 +09:00 |
|
水谷圭吾
|
54cdc771ef
|
スプレッドシート更新
|
2022-06-30 15:04:42 +09:00 |
|
koya_15
|
137e67eb3c
|
ミニゲーム背景素材ばらし
|
2022-06-30 14:03:18 +09:00 |
|
kimura
|
f32a1c6edc
|
add result meter se
|
2022-06-30 13:06:32 +09:00 |
|
koya_15
|
cb078684d7
|
SE追加調整
|
2022-06-30 12:24:42 +09:00 |
|
koya_15
|
01ea7fa578
|
Merge branch 'feature/addMiniGame' of bitbucket.org:usaya/popcorn into feature/addMiniGame
|
2022-06-30 11:47:00 +09:00 |
|
koya_15
|
42277d1511
|
SE上書き
|
2022-06-30 11:46:53 +09:00 |
|
kimura
|
fb936a520c
|
デバッグ処理修正
|
2022-06-30 11:45:06 +09:00 |
|
kimura
|
bfbb5db400
|
BGM/SE実装
|
2022-06-30 11:44:54 +09:00 |
|
kimura
|
29b07d1f81
|
アニメ修正
|
2022-06-30 11:18:10 +09:00 |
|
kimura
|
83c29be6c2
|
rename
|
2022-06-30 11:17:43 +09:00 |
|
koya_15
|
1bd306e707
|
フッターボタン位置サイズ調整
|
2022-06-30 10:47:05 +09:00 |
|
koya_15
|
1b59d9846a
|
SE、BGM追加当てはめ
|
2022-06-29 19:55:13 +09:00 |
|
kimura
|
48993ef1d7
|
import merge from 翻訳シート
|
2022-06-29 19:02:41 +09:00 |
|
kimura
|
9b32dc3c38
|
add 翻訳 text
|
2022-06-29 18:54:23 +09:00 |
|
kimura
|
deae44ec50
|
add 翻訳 image
|
2022-06-29 18:24:11 +09:00 |
|
kimura
|
e1948b512d
|
翻訳対応
|
2022-06-29 18:24:11 +09:00 |
|
koya_15
|
c0a0aff87a
|
SE仮追加
|
2022-06-29 18:15:43 +09:00 |