Merge branch 'master' into dev-hxb

hxb

2021-12-13 ca5001d8800e80ffe226a05e5228802bef159337

 .gitignore

@@ -5,7 +5,7 @@
### Android ###
# Built application files
*.apk
*.aar
# *.aar
*.ap_
*.aab