|  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 | 
				
					
						|  koya_15 | 200b9fbef7 | 調味料演出途中 | 2022-05-31 15:49:09 +09:00 | 
				
					
						|  atusi | 36cce39460 | update english text | 2022-05-31 15:29:00 +09:00 | 
				
					
						|  atusi | eee0a0e679 | Merge branch 'feature/ver1.3_eng' into feature/1.4.0 | 2022-05-31 15:19:11 +09:00 | 
				
					
						|  atusi | 71ad3da9a6 | I2 - english項目追加 | 2022-05-31 15:18:20 +09:00 | 
				
					
						|  koya_15 | 2f2e25a202 | 演出非表示 | 2022-05-31 10:25:54 +09:00 | 
				
					
						|  koya_15 | 44b531ce00 | 調味料演出途中 | 2022-05-31 10:24:17 +09:00 | 
				
					
						|  koya_15 | 1e9ca603f4 | Merge branch 'feature/1.4.0' of bitbucket.org:usaya/popcorn into feature/1.4.0 | 2022-05-27 19:08:45 +09:00 | 
				
					
						|  koya_15 | 0ea41c81b2 | 調味料演出途中 | 2022-05-27 19:08:34 +09:00 | 
				
					
						|  kimura | fcbe53f5d6 | 大量注文達成時にポップコーン販売数加算を追加 | 2022-05-27 15:36:56 +09:00 | 
				
					
						|  koya_15 | c9306618af | Merge branch 'feature/1.4.0' of bitbucket.org:usaya/popcorn into feature/1.4.0 | 2022-05-27 14:05:12 +09:00 | 
				
					
						|  koya_15 | 9352f32858 | 調味料演出途中 | 2022-05-27 14:05:01 +09:00 | 
				
					
						|  kimura | fcde9c018d | maxlevel変更 | 2022-05-27 13:38:21 +09:00 | 
				
					
						|  kimura | 90620864c0 | add 抹茶ミルクprefab | 2022-05-27 13:36:35 +09:00 | 
				
					
						|  koya_15 | 42fc35fde7 | 味ごとにポップコーン粒追加 | 2022-05-26 12:58:12 +09:00 | 
				
					
						|  atusi | 146e2c7e2a | シート修正 | 2022-05-25 18:44:16 +09:00 | 
				
					
						|  atusi | e61cf96a3b | Merge branch 'develop' of bitbucket.org:usaya/popcorn into feature/1.4.0 | 2022-05-25 17:44:14 +09:00 | 
				
					
						|  atusi | e3b550ac85 | Merge branch 'develop' of bitbucket.org:usaya/popcorn into develop | 2022-05-25 17:40:39 +09:00 |