|  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 | 
				
					
						|  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 | 
				
					
						|  atusi | 146e2c7e2a | シート修正 | 2022-05-25 18:44:16 +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 | 
				
					
						|  koya_15 | 45484c04a8 | ローカライズあてはめ | 2022-05-24 15:36:59 +09:00 | 
				
					
						|  koya_15 | 0a1f568f6f | 韓国語素材追加 | 2022-05-24 15:08:42 +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 | 
				
					
						|  koya_15 | 1453b5a183 | カスタマイズ画面虹の羽枠調整 | 2022-05-20 18:55:27 +09:00 | 
				
					
						|  kimura | b52662e341 | localize対応 | 2022-05-20 18:16:29 +09:00 | 
				
					
						|  kimura | 49dd03d694 | localize対応 | 2022-05-20 18:11:57 +09:00 |