水谷圭吾
|
003bcf3b0f
|
ジャンプ調整
|
2022-07-25 16:41:34 +09:00 |
koya_15
|
b7dd1a50c6
|
Merge branch 'feature/1.5.1' of bitbucket.org:usaya/popcorn into feature/1.5.1
|
2022-07-25 16:09:35 +09:00 |
|
koya_15
|
00ec056825
|
カメラサイズ調整
|
2022-07-25 16:09:22 +09:00 |
kimura
|
27b65ad2f7
|
倍速時のめり込み対応
|
2022-07-25 16:05:00 +09:00 |
hirokei
|
654f2963e5
|
Merge branch 'feature/1.5.1' of bitbucket.org:usaya/popcorn into feature/1.5.1
|
2022-07-25 15:47:13 +09:00 |
|
hirokei
|
9e4145bf64
|
効果線非表示
|
2022-07-25 15:47:06 +09:00 |
|
水谷圭吾
|
8baf98a20c
|
速度上昇を15秒ごとで仮設定
|
2022-07-25 15:42:12 +09:00 |
|
hirokei
|
3ed89e312a
|
Merge branch 'feature/1.5.1' of bitbucket.org:usaya/popcorn into feature/1.5.1
|
2022-07-25 15:41:11 +09:00 |
|
hirokei
|
bb76d0cbab
|
弟アニメ調整
|
2022-07-25 15:41:05 +09:00 |
|
kimura
|
b3d544647b
|
判定調整
|
2022-07-25 15:32:24 +09:00 |
|
koya_15
|
c1e255c6df
|
Merge branch 'feature/1.5.1' of bitbucket.org:usaya/popcorn into feature/1.5.1
|
2022-07-25 15:13:20 +09:00 |
|
koya_15
|
773b632536
|
スコア調整、背景修正
|
2022-07-25 15:13:12 +09:00 |
|
水谷圭吾
|
4875f94892
|
Merge branch 'feature/1.5.1' of https://bitbucket.org/usaya/popcorn into feature/1.5.1
|
2022-07-25 15:06:16 +09:00 |
|
水谷圭吾
|
f3f9988581
|
ジャンプ調整
|
2022-07-25 15:06:09 +09:00 |
|
koya_15
|
2b4f81f863
|
Merge branch 'feature/1.5.1' of bitbucket.org:usaya/popcorn into feature/1.5.1
|
2022-07-25 14:56:12 +09:00 |
|
koya_15
|
4309afc4f8
|
背景修正途中
|
2022-07-25 14:56:04 +09:00 |
|
kimura
|
e9218e1a53
|
ヘッダースコア対応
|
2022-07-25 14:54:10 +09:00 |
|
kimura
|
0e4891a2d9
|
スピードアップ対応
|
2022-07-25 14:35:29 +09:00 |
|
kimura
|
77b443f8e8
|
使用済みステージ破棄修正
|
2022-07-25 12:09:55 +09:00 |
|
koya_15
|
ef730d9e2b
|
Merge branch 'feature/1.5.1' of bitbucket.org:usaya/popcorn into feature/1.5.1
|
2022-07-25 12:06:24 +09:00 |
|
koya_15
|
3021e99221
|
弟アニメーション滑空調整
|
2022-07-25 12:06:07 +09:00 |
|
kimura
|
f84dab6674
|
背景アニメーション有効
|
2022-07-25 11:56:38 +09:00 |
|
koya_15
|
0a11e434fb
|
Merge branch 'feature/1.5.1' of bitbucket.org:usaya/popcorn into feature/1.5.1
|
2022-07-25 11:46:14 +09:00 |
|
koya_15
|
2d5cf5fe14
|
ボタンSE追加
|
2022-07-25 11:46:06 +09:00 |
|
kimura
|
287d1edf04
|
滑空キャンセルアニメーション対応
|
2022-07-25 11:42:56 +09:00 |
|
kimura
|
80de819d9b
|
不要オブジェクト削除
|
2022-07-25 11:39:35 +09:00 |
|
koya_15
|
e3281b90ea
|
Merge branch 'feature/1.5.1' of bitbucket.org:usaya/popcorn into feature/1.5.1
|
2022-07-25 11:37:08 +09:00 |
|
koya_15
|
54518e7122
|
滑空キャンセルアニメーション追加
|
2022-07-25 11:36:55 +09:00 |
|
kimura
|
6848e03e9e
|
ヘッダーprefabから旧スコア表示とカウントダウンを削除
|
2022-07-25 11:36:10 +09:00 |
|
kimura
|
a2ba6a7a68
|
テストコース調整
|
2022-07-25 11:20:50 +09:00 |
|
kimura
|
5af2dc0e7a
|
背景のテストオブジェクト非表示
|
2022-07-25 11:20:38 +09:00 |
|
kimura
|
87efed3b93
|
穴の当たり判定調整
|
2022-07-25 11:20:17 +09:00 |
|
kimura
|
40ca643170
|
GameManager修正, MiniGameシーン設定追加
|
2022-07-25 11:00:36 +09:00 |
|
kimura
|
3c03aa99e9
|
ステージ自動生成対応
|
2022-07-25 11:00:36 +09:00 |
|
kimura
|
f1f0df1a95
|
マネージャでの背景設定に対応
|
2022-07-25 11:00:36 +09:00 |
|
kimura
|
70e551150a
|
リファクタ
|
2022-07-25 11:00:36 +09:00 |
|
kimura
|
fce9a5668f
|
プレイヤー挙動改善
|
2022-07-25 11:00:36 +09:00 |
|
kimura
|
fb843dc20d
|
難易度に異次元追加, 背景追加
|
2022-07-25 11:00:36 +09:00 |
|
hirokei
|
d232dd03d6
|
こけるモーション短く
|
2022-07-25 10:50:31 +09:00 |
|
kimura
|
aeb4b762fc
|
リトライ対応
|
2022-07-22 18:29:47 +09:00 |
|
kimura
|
07123bc7c6
|
穴ギミック部分のフェンス対応
|
2022-07-22 18:18:47 +09:00 |
|
koya_15
|
527940b917
|
弟滑空アニメーション修正
|
2022-07-22 17:45:07 +09:00 |
|
koya_15
|
3eebbfce64
|
弟ジャンプ修正
|
2022-07-22 16:33:34 +09:00 |
|
koya_15
|
0469103363
|
弟アニメーション滑空修正
|
2022-07-22 16:05:59 +09:00 |
|
koya_15
|
5713eac0c1
|
弟アニメーション修正
|
2022-07-22 15:48:17 +09:00 |
|
koya_15
|
564f5def06
|
Merge branch 'feature/1.5.1' of bitbucket.org:usaya/popcorn into feature/1.5.1
|
2022-07-22 14:09:04 +09:00 |
|
koya_15
|
4c177c0baa
|
背景アニメーションループなし、弟アニメーション修正途中
|
2022-07-22 14:08:56 +09:00 |
|
kimura
|
001b0f6ca0
|
空切り替えアニメのループ解除
|
2022-07-22 13:50:58 +09:00 |
xiaohui.wang
|
86a8a4e4c0
|
补充isReadyBanner
|
2022-07-22 12:01:01 +08:00 |
|
kimura
|
3abe56ab3f
|
背景ループ対応
|
2022-07-22 13:00:18 +09:00 |
|
koya_15
|
eb2d4b9db4
|
滑空アニメーション修正
|
2022-07-22 12:24:12 +09:00 |
|
koya_15
|
6edeefe638
|
背景アニメーション追加
|
2022-07-22 10:57:28 +09:00 |
|
kimura
|
6049d3bccf
|
Prefab再設定
|
2022-07-21 19:13:48 +09:00 |
|
koya_15
|
e077c41981
|
Merge branch 'feature/1.5.1' of bitbucket.org:usaya/popcorn into feature/1.5.1
|
2022-07-21 19:00:49 +09:00 |
|
koya_15
|
df53822f9c
|
ハチアニメーション修正、弟アニメーション追加途中
|
2022-07-21 19:00:41 +09:00 |
|
kimura
|
21d3910cd8
|
ステージ生成用のPrefabとDemo追加
|
2022-07-21 18:46:56 +09:00 |
|
kimura
|
acee2c33bb
|
落とし穴判定調整
|
2022-07-21 18:46:19 +09:00 |
|
koya_15
|
d4699c5bcf
|
Merge branch 'feature/1.5.1' of bitbucket.org:usaya/popcorn into feature/1.5.1
|
2022-07-21 18:07:16 +09:00 |
|
koya_15
|
dfc41119dd
|
背景レイヤー調整
|
2022-07-21 18:07:08 +09:00 |
|
kimura
|
6d81e277e3
|
滑空アニメ切り替え追加
|
2022-07-21 18:05:21 +09:00 |
|
kimura
|
6ce63f59f3
|
落下調整
|
2022-07-21 17:56:53 +09:00 |
|
koya_15
|
d519bc9d74
|
Merge branch 'feature/1.5.1' of bitbucket.org:usaya/popcorn into feature/1.5.1
|
2022-07-21 17:54:48 +09:00 |
|
koya_15
|
94e0315b42
|
背景切り替え演出追加
|
2022-07-21 17:54:29 +09:00 |
|
kimura
|
08f7532145
|
落下アクション対応
|
2022-07-21 17:47:20 +09:00 |
|
kimura
|
e7960e1c1e
|
Rx対応
|
2022-07-21 17:47:20 +09:00 |
|
kimura
|
02fa1b8161
|
穴の判定追加
|
2022-07-21 17:45:22 +09:00 |
|
koya_15
|
04abc13fa4
|
Merge branch 'feature/1.5.1' of bitbucket.org:usaya/popcorn into feature/1.5.1
|
2022-07-21 15:46:46 +09:00 |
|
koya_15
|
4eded0929c
|
背景調整追加
|
2022-07-21 15:46:38 +09:00 |
|
kimura
|
104c789a1c
|
ステージ更新
|
2022-07-21 15:26:22 +09:00 |
|
kimura
|
203e9766c8
|
シート更新（ステージ1aのみ指定）
|
2022-07-21 15:25:58 +09:00 |
|
kimura
|
d2f09d6243
|
ヒット時アニメ調整（60フレームまでのY軸の変化削除）
|
2022-07-21 15:21:04 +09:00 |
|
kimura
|
bfda466583
|
ヒット動作修正
|
2022-07-21 15:21:04 +09:00 |
|
kimura
|
ed0586a6c2
|
ギミック座標調整
|
2022-07-21 15:21:04 +09:00 |
|
koya_15
|
fb6870f7c5
|
スコア修正
|
2022-07-21 14:11:01 +09:00 |
|
koya_15
|
19cf17d3be
|
滑空アニメーション追加
|
2022-07-21 12:44:31 +09:00 |
|
koya_15
|
0bdd8cc967
|
選択画面ボタン位置調整
|
2022-07-20 18:31:57 +09:00 |
|
kimura
|
1853263785
|
ステージ選択修正対応
|
2022-07-20 18:25:48 +09:00 |
|
koya_15
|
841e4040ee
|
リザルト枠微調整
|
2022-07-20 17:32:53 +09:00 |
|
kimura
|
1087dc51c2
|
リザルト表示対応
|
2022-07-20 16:41:54 +09:00 |
|
kimura
|
0e965dc4c2
|
シート更新
|
2022-07-20 16:40:53 +09:00 |
|
kimura
|
1e8e4afe1f
|
データ構造変更
|
2022-07-20 16:40:44 +09:00 |
|
koya_15
|
33e508d403
|
選択画面再調整
|
2022-07-20 12:01:32 +09:00 |
|
水谷圭吾
|
27b56dbc5a
|
パラメータ調整
|
2022-07-20 10:04:42 +09:00 |
|
koya_15
|
8c2f16890d
|
選択画面UI修正
|
2022-07-19 19:10:58 +09:00 |
|
koya_15
|
3aaef69d19
|
ギミック追加
|
2022-07-19 16:05:03 +09:00 |
|
kimura
|
c58a795a6f
|
滑空キャンセル修正
|
2022-07-19 13:50:30 +09:00 |
|
kimura
|
2612f82f53
|
落下を加速度で指定するように変更
|
2022-07-19 13:50:30 +09:00 |
|
koya_15
|
1b7dd861c1
|
ミニゲームのリザルト修正、素材追加
|
2022-07-19 13:02:00 +09:00 |
|
kimura
|
855714754c
|
滑空追加
|
2022-07-15 14:07:52 +09:00 |
|
xiaohui.wang
|
5593cccfd5
|
补充adjust上报
|
2022-07-14 15:03:04 +08:00 |
|
xiaohui.wang
|
f6ef1d7241
|
开发者debugbug
|
2022-07-12 16:22:09 +08:00 |
|
koya_15
|
ed11bc82a3
|
フライパン名前変更
|
2022-07-12 17:17:59 +09:00 |
|
kimu524
|
3b8afe3655
|
苗の表示問題を修正
|
2022-07-12 14:13:22 +09:00 |
|
kimu524
|
6a02a80a40
|
Revert "update meta 差分"
This reverts commit 67a25acfb1.
|
2022-07-12 14:13:22 +09:00 |
|
kimura
|
747e3e9a0e
|
Merge remote-tracking branch 'origin/feature/unity_update_2022.3.3f1' into feature/1.5.1
|
2022-07-12 14:11:28 +09:00 |
|
koya_15
|
24f2160f12
|
新しいフライパン追加
|
2022-07-12 14:10:18 +09:00 |
|
kimu524
|
dc2c36208a
|
苗の表示問題を修正
|
2022-07-12 13:29:52 +09:00 |
|
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 |
|
xiaohui.wang
|
f03f183260
|
防止未过新手引起卡死
|
2022-07-11 15:22:27 +08: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 |
|
xiaohui.wang
|
5f2bde6601
|
Merge commit '44776cafe9ebb62a791d6b058c31a12f3015cc6b' into release_joypac_os
# Conflicts:
# popcorn/Assets/MyGame/Scenes/Main/Prefabs/UI/Footer.prefab
# popcorn/Assets/MyGame/Scripts/AdManager.cs
# popcorn/Assets/MyGame/Scripts/FooterManager.cs
# popcorn/Assets/Resources/I2Languages.asset
|
2022-07-08 18:08:23 +08: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 |
|
xiaohui.wang
|
c2b21b85c5
|
gp宏
|
2022-07-07 20:32:16 +08: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 |
|
xiaohui.wang
|
6f218cb8fe
|
增加iOS banner
|
2022-07-06 19:06:08 +08:00 |
atusi
|
8fe90b1ced
|
Merge branch 'develop' of bitbucket.org:usaya/popcorn into release
|
2022-07-06 19:19:58 +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 |
|
xiaohui.wang
|
07df8803bd
|
gp参数 banner show click打点
|
2022-07-05 19:06:56 +08: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 |
|
kimura
|
5ca401cddc
|
update ProjectSettings
|
2022-07-05 17:46:17 +09:00 |
|
kimura
|
c7996d70af
|
update upm
|
2022-07-05 17:46:17 +09:00 |
|
kimura
|
9ac1ee8249
|
add .gitignore
|
2022-07-05 17:46:17 +09:00 |
|
kimura
|
1ac99ba871
|
UnityVersionUpdate 2021.3.3f1
|
2022-07-05 17:46:17 +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 |
|
xiaohui.wang
|
bf206f083a
|
改用sdk上报finder
|
2022-07-05 14:43:56 +08: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 |
闫婷婷
|
6bde57b019
|
setting
|
2022-07-04 18:19:34 +08: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
|
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 |
|
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 |
|
koya_15
|
bf7a25ec6f
|
弟アニメーション調整
|
2022-06-29 18:08:04 +09:00 |
|
kimura
|
55aadc63a0
|
fix player stage reset
|
2022-06-29 17:10:21 +09:00 |
|
kimura
|
f14edfe535
|
add debug ステージ開放
|
2022-06-29 16:45:26 +09:00 |
|
kimura
|
ca4bc0e86b
|
ステージ選択対応
|
2022-06-29 16:43:48 +09:00 |
|
kimura
|
70ed5a22f3
|
かご変化対応
|
2022-06-29 16:43:47 +09:00 |
|
koya_15
|
c663ea59f7
|
Merge branch 'feature/addMiniGame' of bitbucket.org:usaya/popcorn into feature/addMiniGame
|
2022-06-29 15:31:29 +09:00 |
|
koya_15
|
596b13f7cd
|
フッターボタンずれを修正
|
2022-06-29 15:31:12 +09:00 |
|
kimura
|
744d9c3aec
|
prefab 位置調整
|
2022-06-29 15:29:30 +09:00 |
|
kimura
|
c53e7ae2bb
|
データ更新
|
2022-06-29 15:29:20 +09:00 |
|
kimura
|
4703a78c42
|
位置調整
|
2022-06-29 15:29:04 +09:00 |
|
kimura
|
ea98b90b97
|
ステージResource化
|
2022-06-29 14:54:12 +09:00 |
|
kimura
|
b3dbdaf454
|
ステージ prefab調整
|
2022-06-29 14:51:10 +09:00 |
|
kimura
|
266e6f7c9a
|
ゲーム終了時stay
|
2022-06-29 14:50:42 +09:00 |
|
kimura
|
6ac8b330e6
|
fix ステージリセット
|
2022-06-29 14:50:42 +09:00 |
|
koya_15
|
3568d5e3da
|
弟アニメーション調整
|
2022-06-29 13:03:52 +09:00 |
|
koya_15
|
41ee27fc9b
|
ジャンプアニメーション調整
|
2022-06-29 12:52:03 +09:00 |
|
kimura
|
810a6c9b7d
|
自機アニメーション設定
|
2022-06-29 12:43:24 +09:00 |
|
kimura
|
0d33ab049c
|
add 自機prefab / コース apply
|
2022-06-29 12:10:26 +09:00 |
|
koya_15
|
0cfd8c1d50
|
ミニゲーム弟アニメーション追加
|
2022-06-29 10:08:59 +09:00 |
|
atusi
|
b2bca26286
|
fix display app name
|
2022-06-28 19:40:44 +09: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 |
|
水谷圭吾
|
6881cd3864
|
Merge branch 'feature/addMiniGame' of https://bitbucket.org/usaya/popcorn into feature/addMiniGame
|
2022-06-28 17:42:50 +09:00 |
|
水谷圭吾
|
82d14c31e0
|
ステージ1〜3（各パターンab）を追加
|
2022-06-28 17:42:20 +09:00 |
|
koya_15
|
5424f4b814
|
レイヤー調整
|
2022-06-28 17:14:30 +09:00 |
|
kimura
|
5a5f7b11c7
|
位置修正
|
2022-06-28 16:32:03 +09:00 |
|
koya_15
|
bafc36f037
|
ギミック画像サイズ変更
|
2022-06-28 16:12:10 +09:00 |
|
koya_15
|
5d00cbac52
|
レイヤー調整
|
2022-06-28 16:03:59 +09:00 |
|
kimura
|
6761dbf6ec
|
リザルト素材アイコン表示対応
|
2022-06-28 15:59:58 +09:00 |
|
kimura
|
407bfa7198
|
シート更新
|
2022-06-28 15:49:40 +09:00 |
|
kimura
|
5ab128cc7d
|
デバッグデータ削除
|
2022-06-28 15:49:40 +09:00 |
|
kimura
|
4f6a9c6392
|
追加素材/レシピprefab作成
|
2022-06-28 15:49:40 +09:00 |
|
koya_15
|
b4f0d34b7a
|
ミニゲーム背景置き換え
|
2022-06-28 15:41:34 +09:00 |
|
koya_15
|
77ff693410
|
Merge branch 'feature/addMiniGame' of bitbucket.org:usaya/popcorn into feature/addMiniGame
|
2022-06-28 15:02:33 +09:00 |
|
koya_15
|
a1941fe221
|
ミニゲーム素材置き換え調整
|
2022-06-28 15:02:25 +09:00 |
|
kimura
|
c89df57cc3
|
fix player hit
|
2022-06-28 14:54:19 +09:00 |
|
kimura
|
1ece653773
|
fix result
|
2022-06-28 14:50:49 +09:00 |
|
koya_15
|
930234b0d1
|
鍵枠文字調整
|
2022-06-27 18:03:37 +09:00 |
|
kimura
|
e952bb19e2
|
fix 改行
|
2022-06-27 17:33:29 +09:00 |
|
kimura
|
ca8423dbc3
|
ScrollGame開放バッジ対応
|
2022-06-27 17:06:33 +09:00 |
|
闫婷婷
|
83feeb7a1d
|
fix adjust finder bug
|
2022-06-27 15:43:57 +08:00 |
|
koya_15
|
e72a808d4d
|
鍵テキスト位置調整
|
2022-06-27 15:44:25 +09:00 |
|
koya_15
|
4458f30224
|
Merge branch 'feature/addMiniGame' of bitbucket.org:usaya/popcorn into feature/addMiniGame
|
2022-06-27 15:23:56 +09:00 |
|
koya_15
|
334dad01db
|
材料演出追加
|
2022-06-27 15:23:48 +09:00 |
|
kimura
|
a4c4fe407b
|
ロック表示対応/ 達成報酬UI対応
|
2022-06-27 15:16:52 +09:00 |
|
kimura
|
7bb0ffb1c7
|
プレイカウント デバッグ追加
|
2022-06-27 15:16:52 +09:00 |
|
kimura
|
38c02e8877
|
リザルトUI調整
|
2022-06-27 15:16:52 +09:00 |
|
kimura
|
c70b27b4cb
|
難易度パラメータ追加
|
2022-06-27 15:16:52 +09:00 |
|
kimura
|
806376709d
|
非表示フラグ対応
|
2022-06-27 15:16:52 +09:00 |
|
kimura
|
f3eee3fb8f
|
シート更新 shopdataに非表示フラグ追加
|
2022-06-27 15:16:52 +09:00 |
|
koya_15
|
66778cdb99
|
フッターボタンアニメーション調整
|
2022-06-27 15:14:55 +09:00 |
|
kimura
|
49062bda5d
|
add scrollgame dialog
|
2022-06-27 13:46:44 +09:00 |
|
koya_15
|
4113d441ac
|
Merge branch 'feature/addMiniGame' of bitbucket.org:usaya/popcorn into feature/addMiniGame
|
2022-06-27 13:14:13 +09:00 |
|
koya_15
|
b59679291e
|
素材追加
|
2022-06-27 13:14:04 +09:00 |
|
atusi
|
db0f187203
|
Merge branch 'feature/1.4.0' into feature/addMiniGame
|
2022-06-27 13:08:55 +09:00 |
|
atusi
|
1117769269
|
Merge branch 'feature/1.4.0' into feature/addMiniGame
|
2022-06-27 12:20:31 +09:00 |
|
koya_15
|
40a3047273
|
新材料、ポップコーン追加
|
2022-06-27 11:11:05 +09:00 |
|
kimura
|
00828de1dd
|
fix footer ボタンアクション追加
|
2022-06-27 10:23:08 +09:00 |
|
koya_15
|
cc1f016f0d
|
選択画面線調整
|
2022-06-24 17:11:33 +09:00 |
|
kimura
|
74f495f46f
|
add debug param
|
2022-06-24 14:45:20 +09:00 |
|
kimura
|
2d1e8cdc4f
|
add debug param
|
2022-06-24 14:25:18 +09:00 |
|
kimura
|
ffc6d9c5d8
|
add debug param
|
2022-06-24 14:22:28 +09:00 |
|
kimura
|
9246a93aec
|
fix stageitem
|
2022-06-24 14:16:22 +09:00 |
|
kimura
|
b5e74d3135
|
fix gamemanager
|
2022-06-24 14:16:22 +09:00 |
|
kimura
|
37f64b2c11
|
add reset score [debug]
|
2022-06-24 14:16:22 +09:00 |
|
kimura
|
272623dd7e
|
fix video dialog
|
2022-06-24 14:16:22 +09:00 |
|
kimura
|
5e9637fe58
|
update sheet data
|
2022-06-24 14:13:16 +09:00 |
|
kimura
|
9be79ac24a
|
add sheet data
|
2022-06-24 14:12:34 +09:00 |
|
kimura
|
d2b861774f
|
fix prefab
|
2022-06-24 14:11:33 +09:00 |
|
kimura
|
4f5b4461d4
|
fix scroll game view
|
2022-06-24 14:11:19 +09:00 |
|
kimura
|
71efba8db6
|
fix ScrollGameWatchVideoDialog
|
2022-06-24 14:08:15 +09:00 |
|
kimura
|
d75e696864
|
fix result
|
2022-06-24 14:07:42 +09:00 |
|
kimura
|
61b6f17673
|
constその他追加
|
2022-06-24 14:07:10 +09:00 |
|
kimura
|
a8a3609612
|
fix resultmanager
|
2022-06-23 17:06:24 +09:00 |
|
kimura
|
9dd55d38f7
|
add dialog
|
2022-06-23 16:44:19 +09:00 |
|
kimura
|
6efd668189
|
add scroll game param
|
2022-06-23 16:44:19 +09:00 |
|
kimura
|
cb15b3a7b4
|
fix game reload
|
2022-06-23 14:57:18 +09:00 |
|
koya_15
|
b070a3e81f
|
素材修正
|
2022-06-23 14:49:02 +09:00 |
|
koya_15
|
8d25cd0479
|
選択画面調整
|
2022-06-22 16:45:45 +09:00 |
|
koya_15
|
03e73b5d33
|
選択画面調整、フッターボタン追加
|
2022-06-22 15:28:58 +09:00 |
|
koya_15
|
5c3baf16d1
|
ミニゲーム用UIプレハブ化
|
2022-06-22 12:56:45 +09:00 |
|
koya_15
|
8d4b898db7
|
動画POP追加
|
2022-06-22 12:52:20 +09:00 |
|
koya_15
|
8034d332d3
|
リザルトアニメーション追加
|
2022-06-22 12:22:01 +09:00 |
|
koya_15
|
e2f586058b
|
リザルト画面追加
|
2022-06-22 09:31:26 +09:00 |
|
koya_15
|
402bc21a76
|
説明アニメーション
|
2022-06-21 20:26:59 +09:00 |
|
koya_15
|
b3c52e8a1e
|
ゲーム中ヘッダーUI
|
2022-06-21 20:08:41 +09:00 |
|
koya_15
|
e8e2c2dfca
|
ミニゲーム選択画面途中
|
2022-06-21 18:54:26 +09:00 |
|
koya_15
|
4d18cafb86
|
Merge branch 'feature/addMiniGame' of bitbucket.org:usaya/popcorn into feature/addMiniGame
|
2022-06-21 16:38:39 +09:00 |
|
koya_15
|
f68a0031dd
|
ミニゲーム未解放時POP追加
|
2022-06-21 16:38:33 +09:00 |
|
闫婷婷
|
c168fddfa1
|
-
|
2022-06-21 15:36:57 +08:00 |
|
闫婷婷
|
c3abe47d90
|
更改为float类型，double不支持
|
2022-06-21 15:34:56 +08:00 |
|
闫婷婷
|
d9b667d28e
|
翻译遗漏
|
2022-06-21 14:50:14 +08:00 |
|
kimura
|
aaefe0ce02
|
add stage test
|
2022-06-21 15:14:21 +09:00 |
|
kimura
|
89df731e01
|
add point 15
|
2022-06-21 15:03:09 +09:00 |
|
kimura
|
a51093553f
|
fix debug
|
2022-06-21 14:57:12 +09:00 |
|
koya_15
|
996af05dd6
|
ミニゲームボタンのアニメーションループ切る
|
2022-06-21 14:55:32 +09:00 |
|
koya_15
|
1b0ab7b687
|
Merge branch 'feature/addMiniGame' of bitbucket.org:usaya/popcorn into feature/addMiniGame
|
2022-06-21 14:52:09 +09:00 |
|
koya_15
|
0b02b934e6
|
フッターにミニゲームボタン追加
|
2022-06-21 14:52:00 +09:00 |
|
kimura
|
786465ef76
|
障害物アクション仮追加/デバッグ機能追加
|
2022-06-21 14:43:40 +09:00 |
|
kimura
|
564cad3c86
|
add result
|
2022-06-21 14:43:40 +09:00 |
|
kimura
|
89bfe98352
|
add stagemanager
|
2022-06-21 14:43:40 +09:00 |
|
kimura
|
03e5780b1f
|
add prefab
|
2022-06-21 14:43:40 +09:00 |
|
koya_15
|
a89a4c7781
|
ミニゲームUI設置途中
|
2022-06-21 14:33:41 +09:00 |
|
koya_15
|
192bc7f124
|
ミニゲーム素材追加
|
2022-06-21 14:20:41 +09:00 |
|
闫婷婷
|
4bda25b3b8
|
大小写玄学
|
2022-06-21 11:07:54 +08:00 |
|
闫婷婷
|
c11c10b34f
|
-
|
2022-06-21 11:07:30 +08:00 |
|
闫婷婷
|
334e805e3a
|
名字 bundle id
|
2022-06-21 11:03:55 +08:00 |
|
闫婷婷
|
c52810fb9b
|
推送翻译
|
2022-06-21 11:03:42 +08:00 |
|
闫婷婷
|
7b275fea70
|
去掉海外finder重复内容
|
2022-06-21 11:03:23 +08:00 |
|
闫婷婷
|
31d8777cc6
|
bundle
|
2022-06-21 11:03:03 +08:00 |
|
闫婷婷
|
0c8f95d873
|
adjust 补充
|
2022-06-21 11:02:53 +08:00 |
|
闫婷婷
|
daff8a7804
|
海外
|
2022-06-21 11:02:43 +08:00 |
|
闫婷婷
|
12d8507c14
|
.meta
|
2022-06-21 11:02:06 +08:00 |
|
kimura
|
87f562552f
|
add シーンリロード（デバッグ） fixポイント追加処理
|
2022-06-20 18:30:25 +09:00 |
|
kimura
|
aa08a62cdc
|
add 障害物prefab
|
2022-06-20 18:29:11 +09:00 |
|
kimura
|
4699751029
|
add 障害物
|
2022-06-20 18:28:21 +09:00 |
|
闫婷婷
|
1e4edef887
|
jpsdk 1.1.36
|
2022-06-20 16:16:15 +08:00 |
|
闫婷婷
|
2f6d43fd29
|
pangle海外
|
2022-06-20 16:14:16 +08:00 |
|
闫婷婷
|
5096cfb596
|
翻译
|
2022-06-20 16:13:58 +08:00 |
|
闫婷婷
|
3ddb119348
|
finder 海外
|
2022-06-20 16:13:35 +08:00 |
|
kimura
|
0ab01fa7a3
|
change protoPrefab
|
2022-06-20 15:28:21 +09:00 |
|
kimura
|
b3e34343cc
|
add debug
|
2022-06-20 15:27:40 +09:00 |
|
kimura
|
d83a12f741
|
change gamemanager
|
2022-06-20 15:27:07 +09:00 |
|
kimura
|
9fcb809215
|
add scrollGameData class
|
2022-06-20 15:25:58 +09:00 |
|
kimura
|
743ed91ab1
|
add view class
|
2022-06-20 15:24:11 +09:00 |
|
闫婷婷
|
5dfc6c5692
|
add trans i2
|
2022-06-17 16:42:55 +08:00 |
|
闫婷婷
|
9dac7889c3
|
替换 i2
|
2022-06-17 16:41:35 +08:00 |
|
闫婷婷
|
037e43aa75
|
宏
|
2022-06-17 10:57:21 +08:00 |
|
闫婷婷
|
e420a76c9e
|
去掉特殊符号
|
2022-06-17 10:52:51 +08:00 |
|
闫婷婷
|
5d59acd808
|
切换为海外ios
|
2022-06-17 10:50:59 +08:00 |
|
闫婷婷
|
fddf7d53ff
|
remove 隐私协议
|
2022-06-17 10:15:10 +08:00 |
|
闫婷婷
|
451168576b
|
-
|
2022-06-17 09:57:04 +08:00 |
|
闫婷婷
|
07431d3cf8
|
.meta
|
2022-06-17 09:56:42 +08:00 |
|
闫婷婷
|
138727184f
|
path
|
2022-06-17 09:56:18 +08:00 |
|
闫婷婷
|
d240dd7333
|
reset to ”隐私协议“ 1ed73
|
2022-06-16 16:11:48 +08:00 |
|
闫婷婷
|
8efe3be870
|
reset to "修改显示bug“ 088684d7
|
2022-06-16 16:09:31 +08:00 |
|
闫婷婷
|
3ec8ba598a
|
# popcorn/Assets/MyGame/Scenes/CornField/CornField.unity 金币推送
# popcorn/Assets/MyGame/Scenes/Main/Prefabs/Mission/detail_Mission.prefab 开发者版本
# popcorn/Assets/MyGame/Scenes/Settings/SettingsDialog.unity 开发者版本，需要增加隐私协议，国内
# popcorn/Assets/MyGame/Scenes/marketing/Customize.unity 开发者版本
# popcorn/Assets/MyGame/Scenes/marketing/ProductManagement.unity 开发者版本
# popcorn/Assets/MyGame/Scenes/shopping/shopping.unity 开发者版本，其中有个晓辉改的修改显示bug不知道是什么
# popcorn/Assets/Resources/I2Languages.asset 开发者版本
|
2022-06-16 14:46:57 +08:00 |
|
闫婷婷
|
d543a98c6d
|
Merge commit '4013289d7095cb8fe9b19ea8113083ae5ce3ae37' into release_joypac
# Conflicts:
# popcorn/Assets/MyGame/Scenes/CornField/CornField.unity
# popcorn/Assets/MyGame/Scenes/Main/Prefabs/Mission/detail_Mission.prefab
# popcorn/Assets/MyGame/Scenes/Settings/SettingsDialog.unity
# popcorn/Assets/MyGame/Scenes/marketing/Customize.unity
# popcorn/Assets/MyGame/Scenes/marketing/ProductManagement.unity
# popcorn/Assets/MyGame/Scenes/shopping/shopping.unity
# popcorn/Assets/Resources/I2Languages.asset
|
2022-06-16 14:20:44 +08:00 |
|
kimura
|
d92b322ab2
|
仮Game部分 Prefab化
|
2022-06-14 16:21:02 +09:00 |
|
atusi
|
a95fc580ae
|
update version code
|
2022-06-14 14:13:41 +09:00 |
|
atusi
|
08ecf53b93
|
Merge branch 'develop' of bitbucket.org:usaya/popcorn into release
|
2022-06-14 13:56:08 +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 |
|
kimura
|
f77c60b67c
|
add timer
|
2022-06-14 10:26:09 +09:00 |
|
kimura
|
e14bf163c5
|
fix 紐付け
|
2022-06-14 09:58:46 +09:00 |
|
kimura
|
9c171e2db1
|
add miniGame
|
2022-06-14 09:52:00 +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 |