Merge remote-tracking branch 'origin/master'

k94314517

2024-12-05 0c6d3c66de8c75f82547d51848d4445853d7c4fd

 .gitignore

@@ -17,6 +17,6 @@
/logs
*.log
*.zip

h5/unpackage/
# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
hs_err_pid*