yangwu
/
popcorn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,569 Commits 1 Branch 0 Tags 1.1 GiB
C 38%
C# 36.3%
Objective-C 22.5%
JavaScript 1.5%
ShaderLab 0.8%
Other 0.7%
Go to file
xiaohui.wang 5f2bde6601 Merge commit '44776cafe9ebb62a791d6b058c31a12f3015cc6b' into release_joypac_os 
# Conflicts:
#	popcorn/Assets/MyGame/Scenes/Main/Prefabs/UI/Footer.prefab
#	popcorn/Assets/MyGame/Scripts/AdManager.cs
#	popcorn/Assets/MyGame/Scripts/FooterManager.cs
#	popcorn/Assets/Resources/I2Languages.asset
 		2022-07-08 18:08:23 +08:00
popcorn Merge commit '44776cafe9ebb62a791d6b058c31a12f3015cc6b' into release_joypac_os 2022-07-08 18:08:23 +08:00
.gitignore .gitignore 2022-04-01 14:21:31 +08:00