Commit Graph

2408 Commits

Author SHA1 Message Date
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 f9d0ed6de2 add tag 2022-07-01 16:29:29 +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