すとう
|
03f33ccd88
|
マージ先 feature/ver1.3_eng (プルリクエスト #6)
Feature/ver1.3 eng
|
2022-07-05 08:56:24 +00:00 |
|
すとう
|
f354b6372c
|
マージ先 feature/1.4.0 (プルリクエスト #5)
Feature/1.4.0
|
2022-06-28 11:14:24 +00:00 |
|
atusi
|
f7a05fc6f2
|
Merge branch 'feature/1.4.0' of bitbucket.org:usaya/popcorn into feature/ver1.3_eng
|
2022-06-28 18:52:11 +09:00 |
|
atusi
|
4013289d70
|
fix English UI text size
|
2022-06-14 13:54:34 +09:00 |
|
atusi
|
f3df255f28
|
fix English UI text size
|
2022-06-14 13:11:29 +09:00 |
koya_15
|
db71e1ee42
|
あてはめ調整
|
2022-06-13 14:41:35 +09:00 |
|
koya_15
|
1f786bdb32
|
あてはめ確認
|
2022-06-13 14:32:42 +09:00 |
|
koya_15
|
ae6efe14bc
|
英語翻訳画像あてはめ
|
2022-06-13 10:00:43 +09:00 |
|
koya_15
|
8cb2d7b035
|
英語翻訳画像取り込み、あてはめ途中
|
2022-06-10 15:56:45 +09:00 |
kimura
|
79aa7e94d1
|
add 販売処理エラー制御＆ログ出力
|
2022-06-10 15:47:20 +09:00 |
|
kimura
|
6bc95c32d8
|
revert レシピ全開放
|
2022-06-07 12:24:16 +09:00 |
hirokei
|
80117fab62
|
調理演出調整
|
2022-06-07 12:06:33 +09:00 |
|
kimura
|
f32bc324e1
|
演出開始トリガー修正
|
2022-06-07 11:21:50 +09:00 |
|
kimura
|
c4e04e5956
|
デバッグに購入レシピ開放ボタン追加
|
2022-06-07 11:13:24 +09:00 |
|
hirokei
|
f4eee0aefa
|
調理演出調整
|
2022-06-07 10:25:43 +09:00 |
|
hirokei
|
ec979aa21d
|
調理演出調整
|
2022-06-07 09:58:57 +09:00 |
|
koya_15
|
56e55ad1d2
|
材料デザイン調整
|
2022-06-06 19:20:17 +09:00 |
|
koya_15
|
5bc9a0ffcc
|
アニメーション調整
|
2022-06-06 18:52:42 +09:00 |
|
koya_15
|
f1f8610f23
|
材料演出調整
|
2022-06-06 17:53:16 +09:00 |
|
hirokei
|
aa312d7fe5
|
汎用アニメ調整
|
2022-06-06 15:26:27 +09:00 |
|
hirokei
|
a0ae05df40
|
いちご調整演出調整
|
2022-06-06 14:39:16 +09:00 |
|
hirokei
|
88157ab0cd
|
Merge branch 'feature/1.4.0' of bitbucket.org:usaya/popcorn into feature/1.4.0
|
2022-06-06 14:30:55 +09:00 |
|
hirokei
|
b8a6c01637
|
調理の汎用アニメ調整
|
2022-06-06 14:30:48 +09:00 |
|
koya_15
|
71898e3e8a
|
Merge branch 'feature/1.4.0' of bitbucket.org:usaya/popcorn into feature/1.4.0
# Conflicts:
# popcorn/Assets/MyGame/Resource/Animation/MaterialDirecting_AdvanceForward.anim
# popcorn/Assets/MyGame/Resource/Animation/MaterialDirecting_Return.anim
# popcorn/Assets/MyGame/Resource/Animation/material_StrawberryPowder.anim
|
2022-06-06 14:23:26 +09:00 |
|
koya_15
|
5ba2143fc8
|
ポップコーン粒画像調整、材料演出調整
|
2022-06-06 14:22:43 +09:00 |
|
hirokei
|
f35e986fac
|
いちご調理演出調整
|
2022-06-06 13:57:51 +09:00 |
|
koya_15
|
39ba9d706f
|
演出調整
|
2022-06-03 20:22:53 +09:00 |
|
koya_15
|
0199bb7ebd
|
Merge branch 'feature/1.4.0' of bitbucket.org:usaya/popcorn into feature/1.4.0
|
2022-06-03 20:01:59 +09:00 |
|
kimura
|
3818458d9a
|
一時的にレシピ全開放
|
2022-06-03 20:00:31 +09:00 |
|
koya_15
|
63fcfb1eeb
|
演出調整
|
2022-06-03 19:59:29 +09:00 |
|
kimura
|
2b29cf4e55
|
トッピング修正
|
2022-06-03 19:53:12 +09:00 |
|
koya_15
|
09f078acf1
|
Merge branch 'feature/1.4.0' of bitbucket.org:usaya/popcorn into feature/1.4.0
|
2022-06-03 19:22:48 +09:00 |
|
koya_15
|
e25e0c3efc
|
調理演出調整
|
2022-06-03 19:22:41 +09:00 |
|
kimura
|
f1876407ca
|
トッピング修正
|
2022-06-03 19:21:10 +09:00 |
|
kimura
|
14344c8c21
|
トッピング抜け追加
|
2022-06-03 18:53:56 +09:00 |
|
kimura
|
527f0993d6
|
アニメーション調整
|
2022-06-03 18:23:03 +09:00 |
|
kimura
|
a3921fcbd7
|
トッピング演出調整 各種演出データ作成
|
2022-06-03 18:22:47 +09:00 |
|
kimura
|
a7b7ac3c2c
|
自動調理の思い出追加
|
2022-06-03 11:36:46 +09:00 |
|
koya_15
|
6cff6f8234
|
調味料演出位置調整
|
2022-06-02 20:09:40 +09:00 |
|
koya_15
|
2fad0864b7
|
カスタマイズアイコン販売画面以外非表示
|
2022-06-02 19:48:26 +09:00 |
|
kimura
|
a628b190b4
|
トッピング時間調整
|
2022-06-02 19:35:50 +09:00 |
|
kimura
|
4c3b12746d
|
アニメーション調整
|
2022-06-02 19:30:08 +09:00 |
|
kimura
|
22c7f48170
|
トッピング演出実装
|
2022-06-02 19:30:08 +09:00 |
|
koya_15
|
7eabfad5d1
|
カスタマイズアイコンデザイン調整
|
2022-06-02 15:53:12 +09:00 |
|
koya_15
|
3f183e8315
|
調味料演出追加
|
2022-06-01 16:28:57 +09:00 |
水谷圭吾
|
be7e3d0d08
|
スプレッドシート更新
|
2022-06-01 12:19:06 +09:00 |
|
koya_15
|
0e860b6ade
|
Merge branch 'feature/1.4.0' of bitbucket.org:usaya/popcorn into feature/1.4.0
|
2022-06-01 11:46:38 +09:00 |
|
koya_15
|
69dc93c73b
|
調味料演出途中
|
2022-06-01 11:46:31 +09:00 |
|
kimura
|
cb4c95de79
|
revert 販売数加算
|
2022-06-01 10:28:05 +09:00 |
|
koya_15
|
9aa0bd20db
|
Merge branch 'feature/1.4.0' of bitbucket.org:usaya/popcorn into feature/1.4.0
|
2022-05-31 15:49:17 +09:00 |