kimura 75662b991a Merge branch 'feature/1.6.0' into feature/1.7.0 ... # Conflicts: # popcorn/Assets/MyGame/Resources/Data/BulkOrderData.txt # popcorn/Assets/MyGame/Resources/Data/BulkOrderTextData.txt # popcorn/Assets/MyGame/Resources/Data/DownloadDate.txt # popcorn/Assets/MyGame/Resources/Data/ProductData.txt # popcorn/Assets/MyGame/Resources/Data/ScriptData.txt # popcorn/Assets/MyGame/Resources/Data/ScrollGamePlaceData.txt # popcorn/Assets/MyGame/Resources/Data/ShopCustomizeData.txt # popcorn/Assets/MyGame/Resources/Data/ShopLevelData.txt # popcorn/Assets/MyGame/Scenes/MiniGame/Scripts/ResultManager.cs		2022-10-20 14:03:46 +09:00
popcorn	Merge branch 'feature/1.6.0' into feature/1.7.0	2022-10-20 14:03:46 +09:00
.gitignore	add .gitignore	2022-07-05 17:46:17 +09:00