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 | 
						
					
				
					
						
							
							
								 
								すとう
							
						 | 
						
							
							
							
							
							
								
							
							
								cc4cf3bbe5
								
							
						 | 
						
							
							
								
								マージ先 feature/lang_ver1.3 (プルリクエスト #4)
							
							
							
							
							
							
							
							Feature/lang ver1.3 
							
						 | 
						
							2022-05-25 08:28:34 +00:00 | 
						
					
				
					
						
							
							
								 
								atusi
							
						 | 
						
							
							
							
							
							
								
							
							
								d6e958de3b
								
							
						 | 
						
							
							
								
								Merge branch 'feature/lang_ver1.3' of bitbucket.org:usaya/popcorn into feature/lang_ver1.3
							
							
							
							
							
						 | 
						
							2022-05-25 17:28:14 +09:00 | 
						
					
				
					
						
							
							
								 
								atusi
							
						 | 
						
							
							
							
							
							
								
							
							
								a92740a6f6
								
							
						 | 
						
							
							
								
								icon パス修正
							
							
							
							
							
						 | 
						
							2022-05-25 17:22:19 +09:00 | 
						
					
				
					
						
							
							
								 
								kimura
							
						 | 
						
							
							
							
							
							
								
							
							
								55df1f9d17
								
							
						 | 
						
							
							
								
								ミッションの並び順条件追加, 金の羽入手ミッションを上位に表示
							
							
							
							
							
						 | 
						
							2022-05-25 14:07:39 +09:00 | 
						
					
				
					
						
							
							
								 
								kimura
							
						 | 
						
							
							
							
							
							
								
							
							
								1752153ad6
								
							
						 | 
						
							
							
								
								Vip宣伝発生の条件を変更
							
							
							
							
							
						 | 
						
							2022-05-24 15:51:10 +09:00 | 
						
					
				
					
						
							
							
								 
								koya_15
							
						 | 
						
							
							
							
							
							
								
							
							
								45484c04a8
								
							
						 | 
						
							
							
								
								ローカライズあてはめ
							
							
							
							
							
						 | 
						
							2022-05-24 15:36:59 +09:00 | 
						
					
				
					
						
							
							
								 
								koya_15
							
						 | 
						
							
							
							
							
							
								
							
							
								0a1f568f6f
								
							
						 | 
						
							
							
								
								韓国語素材追加
							
							
							
							
							
						 | 
						
							2022-05-24 15:08:42 +09:00 | 
						
					
				
					
						
							
							
								 
								koya_15
							
						 | 
						
							
							
							
							
							
								
							
							
								bb936ae4a3
								
							
						 | 
						
							
							
								
								追加ポップコーン画像追加
							
							
							
							
							
						 | 
						
							2022-05-24 14:59:03 +09:00 | 
						
					
				
					
						
							
							
								 
								atusi
							
						 | 
						
							
							
							
							
							
								
							
							
								b6910a9974
								
							
						 | 
						
							
							
								
								Merge branch 'feature/1.3.0' of bitbucket.org:usaya/popcorn into develop
							
							
							
							
							
						 | 
						
							2022-05-24 11:43:30 +09:00 | 
						
					
				
					
						
							
							
								 
								atusi
							
						 | 
						
							
							
							
							
							
								
							
							
								b3c0f257fa
								
							
						 | 
						
							
							
								
								スプレッドシート:Default更新
							
							
							
							
							
						 | 
						
							2022-05-23 18:17:27 +09:00 | 
						
					
				
					
						
							
							
								 
								koya_15
							
						 | 
						
							
							
							
							
							
								
							
							
								d5096913ac
								
							
						 | 
						
							
							
								
								ローカライズあてはめ
							
							
							
							
							
						 | 
						
							2022-05-23 17:26:36 +09:00 | 
						
					
				
					
						
							
							
								 
								koya_15
							
						 | 
						
							
							
							
							
							
								
							
							
								e93d6a6236
								
							
						 | 
						
							
							
								
								ローカライズ画像あてはめ
							
							
							
							
							
						 | 
						
							2022-05-23 16:49:10 +09:00 | 
						
					
				
					
						
							
							
								 
								koya_15
							
						 | 
						
							
							
							
							
							
								
							
							
								e2e33f5599
								
							
						 | 
						
							
							
								
								完了素材名前変更
							
							
							
							
							
						 | 
						
							2022-05-23 16:21:50 +09:00 | 
						
					
				
					
						
							
							
								 
								kimura
							
						 | 
						
							
							
							
							
							
								
							
							
								a9dacd823d
								
							
						 | 
						
							
							
								
								Merge branch 'feature/1.3.0' into feature/lang_ver1.3
							
							
							
							
							
							
							
							# Conflicts:
#	popcorn/Assets/MyGame/Scenes/marketing/Customize.unity 
							
						 | 
						
							2022-05-23 16:14:51 +09:00 | 
						
					
				
					
						
							
							
								 
								kimura
							
						 | 
						
							
							
							
							
							
								
							
							
								5c0e227215
								
							
						 | 
						
							
							
								
								localize対応 key追加
							
							
							
							
							
						 | 
						
							2022-05-23 16:14:22 +09:00 | 
						
					
				
					
						
							
							
								 
								koya_15
							
						 | 
						
							
							
							
							
							
								
							
							
								964e56b5af
								
							
						 | 
						
							
							
								
								ローカライズあてはめ途中
							
							
							
							
							
						 | 
						
							2022-05-23 16:06:13 +09:00 | 
						
					
				
					
						
							
							
								 
								koya_15
							
						 | 
						
							
							
							
							
							
								
							
							
								b98a04f47a
								
							
						 | 
						
							
							
								
								追加中国語素材移動
							
							
							
							
							
						 | 
						
							2022-05-23 15:43:04 +09:00 | 
						
					
				
					
						
							
							
								 
								atusi
							
						 | 
						
							
							
							
							
							
								
							
							
								7cfd686f53
								
							
						 | 
						
							
							
								
								deleted Material/UI
							
							
							
							
							
						 | 
						
							2022-05-23 15:37:03 +09:00 | 
						
					
				
					
						
							
							
								 
								atusi
							
						 | 
						
							
							
							
							
							
								
							
							
								22479ace80
								
							
						 | 
						
							
							
								
								Merge branch 'feature/1.3.0' of bitbucket.org:usaya/popcorn into feature/lang_korea
							
							
							
							
							
						 | 
						
							2022-05-23 15:15:34 +09:00 | 
						
					
				
					
						
							
							
								 
								atusi
							
						 | 
						
							
							
							
							
							
								
							
							
								5beefca79d
								
							
						 | 
						
							
							
								
								Merge branch 'develop' of bitbucket.org:usaya/popcorn into feature/lang_korea
							
							
							
							
							
						 | 
						
							2022-05-23 15:11:45 +09:00 | 
						
					
				
					
						
							
							
								 
								koya_15
							
						 | 
						
							
							
							
							
							
								
							
							
								d2347100dd
								
							
						 | 
						
							
							
								
								カスタマイズ画像ローカライズあてはめ
							
							
							
							
							
						 | 
						
							2022-05-23 14:37:02 +09:00 | 
						
					
				
					
						
							
							
								 
								koya_15
							
						 | 
						
							
							
							
							
							
								
							
							
								dc26de5ba0
								
							
						 | 
						
							
							
								
								ローカライズ画像あてはめ
							
							
							
							
							
						 | 
						
							2022-05-23 14:09:18 +09:00 | 
						
					
				
					
						
							
							
								 
								kimura
							
						 | 
						
							
							
							
							
							
								
							
							
								2acecfdb5d
								
							
						 | 
						
							
							
								
								Localize対応
							
							
							
							
							
						 | 
						
							2022-05-23 13:49:09 +09:00 | 
						
					
				
					
						
							
							
								 
								koya_15
							
						 | 
						
							
							
							
							
							
								
							
							
								0d483b7d76
								
							
						 | 
						
							
							
								
								ローカライズ画像あてはめ途中
							
							
							
							
							
						 | 
						
							2022-05-23 12:16:30 +09:00 | 
						
					
				
					
						
							
							
								 
								koya_15
							
						 | 
						
							
							
							
							
							
								
							
							
								7bde93d29b
								
							
						 | 
						
							
							
								
								中国語素材追加
							
							
							
							
							
						 | 
						
							2022-05-23 11:40:51 +09:00 | 
						
					
				
					
						
							
							
								 
								すとう
							
						 | 
						
							
							
							
							
							
								
							
							
								d0fb07a28b
								
							
						 | 
						
							
							
								
								マージ先 feature/1.3.0 (プルリクエスト #2)
							
							
							
							
							
							
							
							Feature/1.3.0 
							
						 | 
						
							2022-05-20 10:11:04 +00:00 |