整理config

docker-conf/conf.d/nginx.conf

@@ -17,23 +17,6 @@ server {
         return 301 /competition.html?competition_id=13;
     }
     
-<<<<<<< HEAD
-    # Brotli 压缩 WebAssembly 文件处理
-    location ~* \.wasm\.br$ {
-        default_type "";  
-        add_header Content-Encoding br;
-        add_header Content-Type application/wasm always;
-        add_header Vary Accept-Encoding;
-        expires 30d;
-    }
-
-    location ~* \.asm\.js\.br$ {
-        default_type "";  
-        add_header Content-Encoding br;
-        add_header Content-Type application/javascript always;
-        add_header Vary Accept-Encoding;
-        expires 30d;
-=======
     # Unity 预压缩文件：禁止再次 gzip，避免 Content-Length 与实际内容不一致
     location ~* \.wasm\.br$ {
         gzip off;
@@ -62,22 +45,15 @@ server {
         add_header Vary Accept-Encoding;
         add_header Accept-Ranges bytes;
         expires 1h;
->>>>>>> cocos-main
     }
 
     # 通用 Brotli 文件处理
     location ~* \.br$ {
-<<<<<<< HEAD
-        add_header Content-Encoding br;
-        add_header Vary Accept-Encoding;
-        expires 30d;
-=======
         gzip off;
         add_header Content-Encoding br;
         add_header Vary Accept-Encoding;
         add_header Accept-Ranges bytes;
         expires 1h;
->>>>>>> cocos-main
     }
 
     # 静态资源缓存配置