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 | 
						
					
				
					
						
							
							
								 
								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 | 
						
					
				
					
						
							
							
								 
								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 | 
						
					
				
					
						
							
							
								 
								kimura
							
						 | 
						
							
							
							
							
							
								
							
							
								d92b322ab2
								
							
						 | 
						
							
							
								
								仮Game部分 Prefab化
							
							
							
							
							
						 | 
						
							2022-06-14 16:21:02 +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 |