闫婷婷 d543a98c6d Merge commit '4013289d7095cb8fe9b19ea8113083ae5ce3ae37' into release_joypac ... # Conflicts: # popcorn/Assets/MyGame/Scenes/CornField/CornField.unity # popcorn/Assets/MyGame/Scenes/Main/Prefabs/Mission/detail_Mission.prefab # popcorn/Assets/MyGame/Scenes/Settings/SettingsDialog.unity # popcorn/Assets/MyGame/Scenes/marketing/Customize.unity # popcorn/Assets/MyGame/Scenes/marketing/ProductManagement.unity # popcorn/Assets/MyGame/Scenes/shopping/shopping.unity # popcorn/Assets/Resources/I2Languages.asset		2022-06-16 14:20:44 +08:00
popcorn	Merge commit '4013289d7095cb8fe9b19ea8113083ae5ce3ae37' into release_joypac	2022-06-16 14:20:44 +08:00
.gitignore	.gitignore	2022-04-01 14:21:31 +08:00