koya_15
|
4bc89a9f6a
|
Merge branch 'develop' of bitbucket.org:usaya/popcorn into develop
|
2021-07-07 16:37:42 +09:00 |
|
koya_15
|
6f40a90715
|
畑素材取り込み配置途中
|
2021-07-07 16:37:36 +09:00 |
kimura
|
7a797f1c07
|
ゲーム状態でフライパンを止める処理を追加/ポジションリセット追加
|
2021-07-07 16:34:41 +09:00 |
|
kimura
|
fda7226d6c
|
リファクタ
|
2021-07-07 16:33:31 +09:00 |
|
kimura
|
77f85b3a6a
|
ゲーム終了表示を追加
|
2021-07-07 16:30:49 +09:00 |
|
kimura
|
34169603fa
|
失敗アニメーションのループ解除
|
2021-07-07 16:29:27 +09:00 |
|
kimura
|
f7c7dacdd6
|
クリア後コーン処理を追加
|
2021-07-07 15:08:39 +09:00 |
|
kimura
|
c866583f4a
|
クリア判定処理を追加
|
2021-07-07 14:51:46 +09:00 |
|
kimura
|
40643b711a
|
Merge branch 'develop' of https://bitbucket.org/usaya/popcorn into develop
* 'develop' of https://bitbucket.org/usaya/popcorn:
畑一部配置
|
2021-07-06 18:41:14 +09:00 |
|
kimura
|
bcc1f6b7e7
|
仮スタート画面表示/ニワトリくんアニメーション対応
|
2021-07-06 18:40:54 +09:00 |
|
koya_15
|
4c41e7bc25
|
Merge branch 'develop' of bitbucket.org:usaya/popcorn into develop
|
2021-07-06 17:50:05 +09:00 |
|
koya_15
|
c35f05b938
|
畑一部配置
|
2021-07-06 17:49:56 +09:00 |
|
kimura
|
4218ffb09a
|
Merge branch 'develop' of https://bitbucket.org/usaya/popcorn into develop
* 'develop' of https://bitbucket.org/usaya/popcorn:
畑一部配置
|
2021-07-06 17:47:30 +09:00 |
|
kimura
|
c68d8b6fe1
|
デバッグログ削除
|
2021-07-06 17:42:01 +09:00 |
|
koya_15
|
583bc7c817
|
畑一部配置
|
2021-07-06 17:42:00 +09:00 |
|
kimura
|
8aec021aed
|
コーンアニメーション対応
|
2021-07-06 17:41:45 +09:00 |
|
kimura
|
018d9f51d8
|
Merge branch 'develop' of https://bitbucket.org/usaya/popcorn into develop
* 'develop' of https://bitbucket.org/usaya/popcorn:
畑素材取り込み
|
2021-07-06 17:40:03 +09:00 |
|
koya_15
|
d688994475
|
Merge branch 'develop' of bitbucket.org:usaya/popcorn into develop
|
2021-07-06 17:05:28 +09:00 |
|
koya_15
|
aec66466d8
|
畑素材取り込み
|
2021-07-06 17:04:49 +09:00 |
|
kimura
|
a031b7e00b
|
リファクタリング
|
2021-07-06 16:58:41 +09:00 |
|
kimura
|
17029e1dc3
|
Merge branch 'develop' of https://bitbucket.org/usaya/popcorn into develop
* 'develop' of https://bitbucket.org/usaya/popcorn:
エモート調整
エモート追加
|
2021-07-06 16:57:01 +09:00 |
|
kimura
|
7caa6c1729
|
コーン挙動調整
|
2021-07-06 16:56:27 +09:00 |
|
koya_15
|
d3f6b66188
|
エモート調整
|
2021-07-06 12:22:05 +09:00 |
|
koya_15
|
79bd741aa1
|
Merge branch 'develop' of bitbucket.org:usaya/popcorn into develop
|
2021-07-05 14:34:49 +09:00 |
|
koya_15
|
de71218844
|
エモート追加
|
2021-07-05 14:34:42 +09:00 |
|
kimura
|
aa58935fec
|
namespace削除
|
2021-07-05 14:23:46 +09:00 |
|
kimura
|
d439bbd8fb
|
Merge branch 'develop' of https://bitbucket.org/usaya/popcorn into develop
* 'develop' of https://bitbucket.org/usaya/popcorn:
大成功演出追加
演出位置等調整
|
2021-07-05 14:21:11 +09:00 |
|
kimura
|
97fcc28eac
|
初期化メソッド追加/温度変化をなめらかにした
|
2021-07-05 14:20:53 +09:00 |
|
koya_15
|
82c9c8f769
|
大成功演出追加
|
2021-07-05 13:08:29 +09:00 |
|
koya_15
|
80bd40158a
|
演出位置等調整
|
2021-07-05 11:58:41 +09:00 |
|
koya_15
|
2309c6d7be
|
演出調整
|
2021-07-05 11:28:12 +09:00 |
|
koya_15
|
f6e4a26b83
|
エモート焦る追加
|
2021-07-05 10:16:11 +09:00 |
|
koya_15
|
3845904929
|
失敗演出追加
|
2021-07-02 19:11:51 +09:00 |
|
koya_15
|
b010c63075
|
演出調整
|
2021-07-02 19:11:27 +09:00 |
|
koya_15
|
36c36079c6
|
Merge branch 'develop' of bitbucket.org:usaya/popcorn into develop
# Conflicts:
# popcorn/Assets/MyGame/Scenes/Cooking/Cooking.unity
|
2021-07-02 18:48:28 +09:00 |
|
koya_15
|
e8901f804c
|
演出追加
|
2021-07-02 18:46:57 +09:00 |
|
kimura
|
f03f772f55
|
シーンのマネージャ紐付け
|
2021-07-02 18:23:25 +09:00 |
|
kimura
|
179f2cef0d
|
GameManager修正/温度状態通知にRx使用/コーン周り修正
|
2021-07-02 18:22:06 +09:00 |
|
koya_15
|
2d5faae54b
|
ファイル名変更素材追加
|
2021-07-02 16:24:48 +09:00 |
|
kimura
|
afe00bdef7
|
hot時の温度上昇を追加
|
2021-07-02 13:20:15 +09:00 |
|
kimura
|
b95920754c
|
不要オブジェクト削除
|
2021-07-02 13:19:10 +09:00 |
|
kimura
|
c3dd01a1b6
|
メーター幅設定を追加
|
2021-07-02 12:49:06 +09:00 |
|
kimura
|
6831bc55ee
|
フライパン周り調整
|
2021-07-02 11:07:47 +09:00 |
|
kimura
|
4f95d79aae
|
Merge branch 'develop' of https://bitbucket.org/usaya/popcorn into develop
* 'develop' of https://bitbucket.org/usaya/popcorn:
焦げエフェクト調整
焦げエフェクト途中
火エフェクト追加
|
2021-07-02 11:02:09 +09:00 |
|
koya_15
|
439b278405
|
焦げエフェクト調整
|
2021-07-01 19:32:07 +09:00 |
|
koya_15
|
69106eb07c
|
焦げエフェクト途中
|
2021-07-01 19:18:07 +09:00 |
|
kimura
|
8c1b82287a
|
コーンマネージャ追加
|
2021-07-01 18:35:05 +09:00 |
|
koya_15
|
416ee9f382
|
Merge branch 'develop' of bitbucket.org:usaya/popcorn into develop
|
2021-07-01 18:20:22 +09:00 |
|
koya_15
|
d0d13d475a
|
火エフェクト追加
|
2021-07-01 18:20:15 +09:00 |
|
kimura
|
3868a71d79
|
Merge branch 'develop' of https://bitbucket.org/usaya/popcorn into develop
* 'develop' of https://bitbucket.org/usaya/popcorn:
火エフェクト途中
|
2021-07-01 18:07:17 +09:00 |