xiaohui.wang b37de1a726 Merge branch 'feature/lang_ver1.3' into release_joypac ... # Conflicts: # popcorn/Assets/MyGame/Resources/Material_zh/Main/Movie/addVideo.png # popcorn/Assets/MyGame/Resources/Material_zh/Main/Movie/addVideo.png.meta # popcorn/Assets/MyGame/Resources/Material_zh/Main/Movie/offdown.png # popcorn/Assets/MyGame/Resources/Material_zh/Main/Movie/offdown.png.meta # popcorn/Assets/MyGame/Resources/Material_zh/Main/Movie/shoppingSale.png # popcorn/Assets/MyGame/Resources/Material_zh/Main/Movie/shoppingSale.png.meta # popcorn/Assets/MyGame/Scenes/Settings/SettingsDialog.unity # popcorn/Assets/MyGame/Scenes/marketing/Scripts/ProductManagement.cs # popcorn/Assets/MyGame/Scenes/marketing/marketing.unity # popcorn/Assets/MyGame/Scenes/shopping/Prefabs/Frame.prefab # popcorn/Assets/MyGame/Scenes/shopping/shopping.unity # popcorn/Assets/MyGame/Scripts/Const.cs		2022-05-25 15:28:17 +08:00
popcorn	Merge branch 'feature/lang_ver1.3' into release_joypac	2022-05-25 15:28:17 +08:00
.gitignore	.gitignore	2022-04-01 14:21:31 +08:00