kimura
							
						 | 
						
							
							
							
							
							
								
							
							
								74f99194e4
								
							
						 | 
						
							
							
								
								Merge branch 'develop' of https://bitbucket.org/usaya/popcorn into develop
							
							
							
							
							
							
							
							* 'develop' of https://bitbucket.org/usaya/popcorn:
  SE追加 
							
						 | 
						
							2021-10-07 09:18:28 +09:00 | 
						
					
				
					
						
							
							
								 
								kimura
							
						 | 
						
							
							
							
							
							
								
							
							
								536154849e
								
							
						 | 
						
							
							
								
								お客さんアニメーション修正
							
							
							
							
							
						 | 
						
							2021-10-07 09:11:25 +09:00 | 
						
					
				
					
						
							
							
								 
								koya_15
							
						 | 
						
							
							
							
							
							
								
							
							
								80c53dcb16
								
							
						 | 
						
							
							
								
								Merge branch 'develop' of bitbucket.org:usaya/popcorn into develop
							
							
							
							
							
						 | 
						
							2021-10-06 19:21:44 +09:00 | 
						
					
				
					
						
							
							
								 
								koya_15
							
						 | 
						
							
							
							
							
							
								
							
							
								321e178b2e
								
							
						 | 
						
							
							
								
								SE追加
							
							
							
							
							
						 | 
						
							2021-10-06 19:21:38 +09:00 | 
						
					
				
					
						
							
							
								 
								kimura
							
						 | 
						
							
							
							
							
							
								
							
							
								f6d8145b74
								
							
						 | 
						
							
							
								
								レシピ説明文追加
							
							
							
							
							
						 | 
						
							2021-10-06 17:27:29 +09:00 | 
						
					
				
					
						
							
							
								 
								kimura
							
						 | 
						
							
							
							
							
							
								
							
							
								4202f24fad
								
							
						 | 
						
							
							
								
								ノーマル時リザルト表示修正/ commit漏れ追加
							
							
							
							
							
						 | 
						
							2021-10-06 15:01:01 +09:00 | 
						
					
				
					
						
							
							
								 
								kimura
							
						 | 
						
							
							
							
							
							
								
							
							
								5a5fc3cc75
								
							
						 | 
						
							
							
								
								シーン設定追加
							
							
							
							
							
						 | 
						
							2021-10-06 14:56:20 +09:00 | 
						
					
				
					
						
							
							
								 
								kimura
							
						 | 
						
							
							
							
							
							
								
							
							
								28056a66dd
								
							
						 | 
						
							
							
								
								大量注文Prefab追加/シーン設定追加
							
							
							
							
							
						 | 
						
							2021-10-06 14:39:01 +09:00 | 
						
					
				
					
						
							
							
								 
								kimura
							
						 | 
						
							
							
							
							
							
								
							
							
								b5cef17ee5
								
							
						 | 
						
							
							
								
								大量注文ボタン処理追加
							
							
							
							
							
						 | 
						
							2021-10-06 14:25:24 +09:00 | 
						
					
				
					
						
							
							
								 
								kimura
							
						 | 
						
							
							
							
							
							
								
							
							
								60f56445f6
								
							
						 | 
						
							
							
								
								大量注文Prefab化
							
							
							
							
							
						 | 
						
							2021-10-06 13:48:22 +09:00 | 
						
					
				
					
						
							
							
								 
								kimura
							
						 | 
						
							
							
							
							
							
								
							
							
								b0b47523d8
								
							
						 | 
						
							
							
								
								Merge branch 'develop' of https://bitbucket.org/usaya/popcorn into develop
							
							
							
							
							
							
							
							* 'develop' of https://bitbucket.org/usaya/popcorn:
  SE追加 
							
						 | 
						
							2021-10-06 13:47:32 +09:00 | 
						
					
				
					
						
							
							
								 
								kimura
							
						 | 
						
							
							
							
							
							
								
							
							
								76247d4c55
								
							
						 | 
						
							
							
								
								シーン設定追加
							
							
							
							
							
						 | 
						
							2021-10-06 13:46:54 +09:00 | 
						
					
				
					
						
							
							
								 
								kimura
							
						 | 
						
							
							
							
							
							
								
							
							
								81493ddba7
								
							
						 | 
						
							
							
								
								販売弟Animatorパラメータ変更
							
							
							
							
							
						 | 
						
							2021-10-06 13:43:25 +09:00 | 
						
					
				
					
						
							
							
								 
								koya_15
							
						 | 
						
							
							
							
							
							
								
							
							
								a7f1c81b8b
								
							
						 | 
						
							
							
								
								Merge branch 'develop' of bitbucket.org:usaya/popcorn into develop
							
							
							
							
							
						 | 
						
							2021-10-06 13:39:51 +09:00 | 
						
					
				
					
						
							
							
								 
								koya_15
							
						 | 
						
							
							
							
							
							
								
							
							
								41a37053d4
								
							
						 | 
						
							
							
								
								SE追加
							
							
							
							
							
						 | 
						
							2021-10-06 13:39:45 +09:00 | 
						
					
				
					
						
							
							
								 
								kimura
							
						 | 
						
							
							
							
							
							
								
							
							
								dfb4d5f1b0
								
							
						 | 
						
							
							
								
								Merge branch 'develop' of https://bitbucket.org/usaya/popcorn into develop
							
							
							
							
							
							
							
							* 'develop' of https://bitbucket.org/usaya/popcorn:
  SE名前変更、デイリー枠プレハブ追加
  文字調整
  SE追加:Audiostock
  SE追加
  SE追加途中 
							
						 | 
						
							2021-10-06 13:32:36 +09:00 | 
						
					
				
					
						
							
							
								 
								kimura
							
						 | 
						
							
							
							
							
							
								
							
							
								f08cdbd024
								
							
						 | 
						
							
							
								
								販売レアリティ対応
							
							
							
							
							
						 | 
						
							2021-10-06 13:32:23 +09:00 | 
						
					
				
					
						
							
							
								 
								kimura
							
						 | 
						
							
							
							
							
							
								
							
							
								0df8a61f0f
								
							
						 | 
						
							
							
								
								ピンクのアニメーションバックグラウンド対応
							
							
							
							
							
						 | 
						
							2021-10-06 13:30:56 +09:00 | 
						
					
				
					
						
							
							
								 
								koya_15
							
						 | 
						
							
							
							
							
							
								
							
							
								72cabbe85f
								
							
						 | 
						
							
							
								
								SE名前変更、デイリー枠プレハブ追加
							
							
							
							
							
						 | 
						
							2021-10-06 11:58:54 +09:00 | 
						
					
				
					
						
							
							
								 
								koya_15
							
						 | 
						
							
							
							
							
							
								
							
							
								d317bc2781
								
							
						 | 
						
							
							
								
								Merge branch 'develop' of bitbucket.org:usaya/popcorn into develop
							
							
							
							
							
						 | 
						
							2021-10-06 11:41:56 +09:00 | 
						
					
				
					
						
							
							
								 
								koya_15
							
						 | 
						
							
							
							
							
							
								
							
							
								eb73d7bb3d
								
							
						 | 
						
							
							
								
								文字調整
							
							
							
							
							
						 | 
						
							2021-10-06 11:41:50 +09:00 | 
						
					
				
					
						
							
							
								 
								atusi
							
						 | 
						
							
							
							
							
							
								
							
							
								1ea4768900
								
							
						 | 
						
							
							
								
								SE追加:Audiostock
							
							
							
							
							
						 | 
						
							2021-10-06 11:31:45 +09:00 | 
						
					
				
					
						
							
							
								 
								koya_15
							
						 | 
						
							
							
							
							
							
								
							
							
								b1dbeac1b2
								
							
						 | 
						
							
							
								
								SE追加
							
							
							
							
							
						 | 
						
							2021-10-06 10:18:16 +09:00 | 
						
					
				
					
						
							
							
								 
								koya_15
							
						 | 
						
							
							
							
							
							
								
							
							
								ef40a7435f
								
							
						 | 
						
							
							
								
								Merge branch 'develop' of bitbucket.org:usaya/popcorn into develop
							
							
							
							
							
						 | 
						
							2021-10-06 10:03:32 +09:00 | 
						
					
				
					
						
							
							
								 
								koya_15
							
						 | 
						
							
							
							
							
							
								
							
							
								93a64e0cfa
								
							
						 | 
						
							
							
								
								SE追加途中
							
							
							
							
							
						 | 
						
							2021-10-06 10:03:26 +09:00 | 
						
					
				
					
						
							
							
								 
								kimura
							
						 | 
						
							
							
							
							
							
								
							
							
								f8f00336ac
								
							
						 | 
						
							
							
								
								Merge branch 'develop' of https://bitbucket.org/usaya/popcorn into develop
							
							
							
							
							
							
							
							* 'develop' of https://bitbucket.org/usaya/popcorn:
  レシピ詳細修正追加 
							
						 | 
						
							2021-10-05 19:04:25 +09:00 | 
						
					
				
					
						
							
							
								 
								kimura
							
						 | 
						
							
							
							
							
							
								
							
							
								64859b7381
								
							
						 | 
						
							
							
								
								データ更新
							
							
							
							
							
						 | 
						
							2021-10-05 19:04:10 +09:00 | 
						
					
				
					
						
							
							
								 
								kimura
							
						 | 
						
							
							
							
							
							
								
							
							
								073e263e13
								
							
						 | 
						
							
							
								
								追加スキンprefab作成
							
							
							
							
							
						 | 
						
							2021-10-05 19:03:51 +09:00 | 
						
					
				
					
						
							
							
								 
								kimura
							
						 | 
						
							
							
							
							
							
								
							
							
								1857833041
								
							
						 | 
						
							
							
								
								補充処理修正/補充アニメーション修正/キラキラ演出追加/販売シーンのポップコーンスキン対応
							
							
							
							
							
						 | 
						
							2021-10-05 19:03:28 +09:00 | 
						
					
				
					
						
							
							
								 
								koya_15
							
						 | 
						
							
							
							
							
							
								
							
							
								3b14361d0d
								
							
						 | 
						
							
							
								
								レシピ詳細修正追加
							
							
							
							
							
						 | 
						
							2021-10-05 18:29:49 +09:00 | 
						
					
				
					
						
							
							
								 
								koya_15
							
						 | 
						
							
							
							
							
							
								
							
							
								3dec0b2647
								
							
						 | 
						
							
							
								
								Merge branch 'develop' of bitbucket.org:usaya/popcorn into develop
							
							
							
							
							
						 | 
						
							2021-10-05 15:59:42 +09:00 | 
						
					
				
					
						
							
							
								 
								koya_15
							
						 | 
						
							
							
							
							
							
								
							
							
								2cfe5a2c0e
								
							
						 | 
						
							
							
								
								se仮
							
							
							
							
							
						 | 
						
							2021-10-05 15:59:35 +09:00 | 
						
					
				
					
						
							
							
								 
								kimura
							
						 | 
						
							
							
							
							
							
								
							
							
								cbb120b3a0
								
							
						 | 
						
							
							
								
								DontDestroyにMarketクラス追加
							
							
							
							
							
						 | 
						
							2021-10-05 13:43:20 +09:00 | 
						
					
				
					
						
							
							
								 
								kimura
							
						 | 
						
							
							
							
							
							
								
							
							
								b2aa90ce00
								
							
						 | 
						
							
							
								
								Market再統合
							
							
							
							
							
						 | 
						
							2021-10-05 13:42:39 +09:00 | 
						
					
				
					
						
							
							
								 
								kimura
							
						 | 
						
							
							
							
							
							
								
							
							
								3a0ab744b5
								
							
						 | 
						
							
							
								
								バックグラウンド対応のためMarketのModelView分離
							
							
							
							
							
						 | 
						
							2021-10-05 13:40:38 +09:00 | 
						
					
				
					
						
							
							
								 
								koya_15
							
						 | 
						
							
							
							
							
							
								
							
							
								eb8d5cf151
								
							
						 | 
						
							
							
								
								仕入れタブ修正
							
							
							
							
							
						 | 
						
							2021-10-05 10:04:36 +09:00 | 
						
					
				
					
						
							
							
								 
								koya_15
							
						 | 
						
							
							
							
							
							
								
							
							
								11f75de409
								
							
						 | 
						
							
							
								
								ミッションの詳細枠プレハブ更新
							
							
							
							
							
						 | 
						
							2021-10-04 19:10:40 +09:00 | 
						
					
				
					
						
							
							
								 
								koya_15
							
						 | 
						
							
							
							
							
							
								
							
							
								d3c52ce1f7
								
							
						 | 
						
							
							
								
								ミッションデイリー枠追加
							
							
							
							
							
						 | 
						
							2021-10-04 19:05:35 +09:00 | 
						
					
				
					
						
							
							
								 
								koya_15
							
						 | 
						
							
							
							
							
							
								
							
							
								12c262b560
								
							
						 | 
						
							
							
								
								宣伝ボタンOFF追加
							
							
							
							
							
						 | 
						
							2021-10-04 11:57:18 +09:00 | 
						
					
				
					
						
							
							
								 
								koya_15
							
						 | 
						
							
							
							
							
							
								
							
							
								a1426640fa
								
							
						 | 
						
							
							
								
								畑動画ON、OFF追加
							
							
							
							
							
						 | 
						
							2021-10-04 11:45:52 +09:00 | 
						
					
				
					
						
							
							
								 
								koya_15
							
						 | 
						
							
							
							
							
							
								
							
							
								f085b0c098
								
							
						 | 
						
							
							
								
								畑一秒短縮ボタンいアニメーション追加
							
							
							
							
							
						 | 
						
							2021-10-04 11:15:06 +09:00 | 
						
					
				
					
						
							
							
								 
								koya_15
							
						 | 
						
							
							
							
							
							
								
							
							
								548c958493
								
							
						 | 
						
							
							
								
								畑演出キャラ一旦非表示
							
							
							
							
							
						 | 
						
							2021-10-04 10:08:08 +09:00 | 
						
					
				
					
						
							
							
								 
								koya_15
							
						 | 
						
							
							
							
							
							
								
							
							
								04c567c260
								
							
						 | 
						
							
							
								
								畑動画演出
							
							
							
							
							
						 | 
						
							2021-10-04 10:06:49 +09:00 | 
						
					
				
					
						
							
							
								 
								koya_15
							
						 | 
						
							
							
							
							
							
								
							
							
								13ae2bdba6
								
							
						 | 
						
							
							
								
								コーンレイヤー調整
							
							
							
							
							
						 | 
						
							2021-10-01 18:58:47 +09:00 | 
						
					
				
					
						
							
							
								 
								koya_15
							
						 | 
						
							
							
							
							
							
								
							
							
								186fad4470
								
							
						 | 
						
							
							
								
								苗とメイン弟順番調整
							
							
							
							
							
						 | 
						
							2021-10-01 18:23:43 +09:00 | 
						
					
				
					
						
							
							
								 
								koya_15
							
						 | 
						
							
							
							
							
							
								
							
							
								6c326e9876
								
							
						 | 
						
							
							
								
								Merge branch 'develop' of bitbucket.org:usaya/popcorn into develop
							
							
							
							
							
						 | 
						
							2021-10-01 17:58:50 +09:00 | 
						
					
				
					
						
							
							
								 
								koya_15
							
						 | 
						
							
							
							
							
							
								
							
							
								666f7a68ff
								
							
						 | 
						
							
							
								
								苗並び順調整
							
							
							
							
							
						 | 
						
							2021-10-01 17:58:41 +09:00 | 
						
					
				
					
						
							
							
								 
								kimura
							
						 | 
						
							
							
							
							
							
								
							
							
								c59ac50899
								
							
						 | 
						
							
							
								
								Merge branch 'develop' of https://bitbucket.org/usaya/popcorn into develop
							
							
							
							
							
							
							
							* 'develop' of https://bitbucket.org/usaya/popcorn:
  畑動画演出途中 
							
						 | 
						
							2021-10-01 17:34:13 +09:00 | 
						
					
				
					
						
							
							
								 
								kimura
							
						 | 
						
							
							
							
							
							
								
							
							
								6a91b7520f
								
							
						 | 
						
							
							
								
								Missionデフォルトデイリー表示
							
							
							
							
							
						 | 
						
							2021-10-01 15:41:43 +09:00 | 
						
					
				
					
						
							
							
								 
								koya_15
							
						 | 
						
							
							
							
							
							
								
							
							
								f0f7ace2ef
								
							
						 | 
						
							
							
								
								Merge branch 'develop' of bitbucket.org:usaya/popcorn into develop
							
							
							
							
							
						 | 
						
							2021-10-01 14:48:05 +09:00 |