瀏覽代碼

场景单独文件夹

guodong 1 年之前
父節點
當前提交
b6d61a2d88

+ 1 - 1
GameClient/Assets/Editor/ArtsRes/ImportArtResTool.cs

@@ -59,7 +59,7 @@ namespace GFGEditor
 
 
         public static string[] BgSrcPaths { get { return new string[] { ResRootPath + "scene/" }; } }
-        public static string BgTargetPath = $"{ResPathUtil.TEXTURE_DIR_PATH}/DressUp/";
+        public static string BgTargetPath = $"{ResPathUtil.TEXTURE_DIR_PATH}/SceneBg/";
         public static string BgMd5FileSaveName = "BgMd5";
 
 

+ 202 - 1
GameClient/Assets/GFGAsset/AssetBundleCollector.asset

@@ -7747,7 +7747,7 @@ MonoBehaviour:
       - Assets/Res/Texture/Icon/zr_kongquednf.png
   - dir: Assets/Res/Texture/Icon
     status: 0
-    bytes: 2904069
+    bytes: 3013558
     list:
     - key: Assets/Res/Texture/Icon/zr_kunwux
       bytes: 67827
@@ -7905,6 +7905,18 @@ MonoBehaviour:
       bytes: 69378
       list:
       - Assets/Res/Texture/Icon/zr_zhijing.png
+    - key: Assets/Res/Texture/Icon/qt_xiangfengmr_1
+      bytes: 44601
+      list:
+      - Assets/Res/Texture/Icon/qt_xiangfengmr_1.png
+    - key: Assets/Res/Texture/Icon/qt_xiangfengmr_2
+      bytes: 43165
+      list:
+      - Assets/Res/Texture/Icon/qt_xiangfengmr_2.png
+    - key: Assets/Res/Texture/Icon/ts_xiangfengmr
+      bytes: 21723
+      list:
+      - Assets/Res/Texture/Icon/ts_xiangfengmr.png
   - dir: Assets/Res/Texture/Card/Bg
     status: 1
     bytes: 4579940
@@ -28248,3 +28260,192 @@ MonoBehaviour:
       list:
       - Assets/Res/Texture/DressUp/zs_yeyan.bytes
       - Assets/Res/Texture/DressUp/zs_yeyan.png
+  - dir: Assets/Res/Texture/DressUp
+    status: 1
+    bytes: 4194304
+    list:
+    - key: Assets/Res/Texture/DressUp/bs_baibao
+      bytes: 4194304
+      list:
+      - Assets/Res/Texture/DressUp/bs_baibao.bytes
+      - Assets/Res/Texture/DressUp/bs_baibao.png
+  - dir: Assets/Res/Texture/DressUp
+    status: 1
+    bytes: 4194304
+    list:
+    - key: Assets/Res/Texture/DressUp/bs_liangye
+      bytes: 4194304
+      list:
+      - Assets/Res/Texture/DressUp/bs_liangye.bytes
+      - Assets/Res/Texture/DressUp/bs_liangye.png
+  - dir: Assets/Res/Texture/DressUp
+    status: 1
+    bytes: 4194304
+    list:
+    - key: Assets/Res/Texture/DressUp/bs_qiuserc
+      bytes: 4194304
+      list:
+      - Assets/Res/Texture/DressUp/bs_qiuserc.bytes
+      - Assets/Res/Texture/DressUp/bs_qiuserc.png
+  - dir: Assets/Res/Texture/DressUp
+    status: 1
+    bytes: 4194304
+    list:
+    - key: Assets/Res/Texture/DressUp/bs_shuiyunx
+      bytes: 4194304
+      list:
+      - Assets/Res/Texture/DressUp/bs_shuiyunx.bytes
+      - Assets/Res/Texture/DressUp/bs_shuiyunx.png
+  - dir: Assets/Res/Texture/DressUp
+    status: 1
+    bytes: 4194304
+    list:
+    - key: Assets/Res/Texture/DressUp/bs_wulixx
+      bytes: 4194304
+      list:
+      - Assets/Res/Texture/DressUp/bs_wulixx.bytes
+      - Assets/Res/Texture/DressUp/bs_wulixx.png
+  - dir: Assets/Res/Texture/DressUp
+    status: 1
+    bytes: 4194304
+    list:
+    - key: Assets/Res/Texture/DressUp/bs_yingbingx
+      bytes: 4194304
+      list:
+      - Assets/Res/Texture/DressUp/bs_yingbingx.bytes
+      - Assets/Res/Texture/DressUp/bs_yingbingx.png
+  - dir: Assets/Res/Texture/DressUp
+    status: 1
+    bytes: 4194304
+    list:
+    - key: Assets/Res/Texture/DressUp/bs_youyu
+      bytes: 4194304
+      list:
+      - Assets/Res/Texture/DressUp/bs_youyu.bytes
+      - Assets/Res/Texture/DressUp/bs_youyu.png
+  - dir: Assets/Res/Texture/DressUp
+    status: 1
+    bytes: 4194304
+    list:
+    - key: Assets/Res/Texture/DressUp/pb_qingyingbi
+      bytes: 4194304
+      list:
+      - Assets/Res/Texture/DressUp/pb_qingyingbi.bytes
+      - Assets/Res/Texture/DressUp/pb_qingyingbi.png
+  - dir: Assets/Res/Texture/DressUp
+    status: 1
+    bytes: 4194304
+    list:
+    - key: Assets/Res/Texture/DressUp/pb_qingyingbi_t
+      bytes: 4194304
+      list:
+      - Assets/Res/Texture/DressUp/pb_qingyingbi_t.bytes
+      - Assets/Res/Texture/DressUp/pb_qingyingbi_t.png
+  - dir: Assets/Res/Texture/DressUp
+    status: 1
+    bytes: 4194304
+    list:
+    - key: Assets/Res/Texture/DressUp/qj_caiyuns
+      bytes: 4194304
+      list:
+      - Assets/Res/Texture/DressUp/qj_caiyuns.bytes
+      - Assets/Res/Texture/DressUp/qj_caiyuns.png
+  - dir: Assets/Res/Texture/DressUp
+    status: 1
+    bytes: 4194304
+    list:
+    - key: Assets/Res/Texture/DressUp/qj_lianzhi
+      bytes: 4194304
+      list:
+      - Assets/Res/Texture/DressUp/qj_lianzhi.bytes
+      - Assets/Res/Texture/DressUp/qj_lianzhi.png
+  - dir: Assets/Res/Texture/DressUp
+    status: 1
+    bytes: 4194304
+    list:
+    - key: Assets/Res/Texture/DressUp/qj_tianxiangr
+      bytes: 4194304
+      list:
+      - Assets/Res/Texture/DressUp/qj_tianxiangr.bytes
+      - Assets/Res/Texture/DressUp/qj_tianxiangr.png
+  - dir: Assets/Res/Texture/DressUp
+    status: 1
+    bytes: 4194304
+    list:
+    - key: Assets/Res/Texture/DressUp/qj_weifengq
+      bytes: 4194304
+      list:
+      - Assets/Res/Texture/DressUp/qj_weifengq.bytes
+      - Assets/Res/Texture/DressUp/qj_weifengq.png
+  - dir: Assets/Res/Texture/DressUp
+    status: 1
+    bytes: 4194304
+    list:
+    - key: Assets/Res/Texture/DressUp/qt_xiangfengmr_1
+      bytes: 4194304
+      list:
+      - Assets/Res/Texture/DressUp/qt_xiangfengmr_1.bytes
+      - Assets/Res/Texture/DressUp/qt_xiangfengmr_1.png
+  - dir: Assets/Res/Texture/DressUp
+    status: 1
+    bytes: 4194304
+    list:
+    - key: Assets/Res/Texture/DressUp/qt_xiangfengmr_2
+      bytes: 4194304
+      list:
+      - Assets/Res/Texture/DressUp/qt_xiangfengmr_2.bytes
+      - Assets/Res/Texture/DressUp/qt_xiangfengmr_2.png
+  - dir: Assets/Res/Texture/DressUp
+    status: 1
+    bytes: 4194304
+    list:
+    - key: Assets/Res/Texture/DressUp/ts_huazhao
+      bytes: 4194304
+      list:
+      - Assets/Res/Texture/DressUp/ts_huazhao.bytes
+      - Assets/Res/Texture/DressUp/ts_huazhao.png
+  - dir: Assets/Res/Texture/DressUp
+    status: 1
+    bytes: 4194304
+    list:
+    - key: Assets/Res/Texture/DressUp/ts_huazhao_t
+      bytes: 4194304
+      list:
+      - Assets/Res/Texture/DressUp/ts_huazhao_t.bytes
+      - Assets/Res/Texture/DressUp/ts_huazhao_t.png
+  - dir: Assets/Res/Texture/DressUp
+    status: 1
+    bytes: 4194304
+    list:
+    - key: Assets/Res/Texture/DressUp/ts_xiangfengmr
+      bytes: 4194304
+      list:
+      - Assets/Res/Texture/DressUp/ts_xiangfengmr.bytes
+      - Assets/Res/Texture/DressUp/ts_xiangfengmr.png
+  - dir: Assets/Res/Texture/DressUp
+    status: 1
+    bytes: 4194304
+    list:
+    - key: Assets/Res/Texture/DressUp/ts_xiangfengmr_t
+      bytes: 4194304
+      list:
+      - Assets/Res/Texture/DressUp/ts_xiangfengmr_t.bytes
+      - Assets/Res/Texture/DressUp/ts_xiangfengmr_t.png
+  - dir: Assets/Res/Texture/DressUp
+    status: 1
+    bytes: 4194304
+    list:
+    - key: Assets/Res/Texture/DressUp/wt_fanghui
+      bytes: 4194304
+      list:
+      - Assets/Res/Texture/DressUp/wt_fanghui.bytes
+      - Assets/Res/Texture/DressUp/wt_fanghui.png
+  - dir: Assets/Res/Texture/DressUp
+    status: 1
+    bytes: 4194304
+    list:
+    - key: Assets/Res/Texture/DressUp/wt_fanghui_t
+      bytes: 4194304
+      list:
+      - Assets/Res/Texture/DressUp/wt_fanghui_t.bytes
+      - Assets/Res/Texture/DressUp/wt_fanghui_t.png

+ 0 - 1
GameClient/Assets/GFGAsset/AssetBundleFilterRulerPreload.asset

@@ -16,7 +16,6 @@ MonoBehaviour:
   - Assets/Res/Animation/DressUp
   - Assets/Res/Effect/DressUp
   - Assets/Res/Texture/DressUp
-  - Assets/Res/Texture/SceneBg
   - Assets/Res/Animation/Card
   - Assets/Res/ShaderVariants
   - Assets/Res/shader

+ 0 - 1
GameClient/Assets/GFGAsset/PreloadFiles.asset

@@ -20,4 +20,3 @@ MonoBehaviour:
   - Assets/Res/Texture/DressUp/lianyiqun_ys.png
   - Assets/Res/Texture/DressUp/shangyi_ys.png
   - Assets/Res/Texture/DressUp/xiazhuang_ys.png
-  - Assets/Res/Texture/DressUp/sanmiaoy_bg.jpg

+ 2 - 2
GameClient/Assets/Game/HotUpdate/Utils/ResPathUtil.cs

@@ -62,8 +62,8 @@ namespace GFGGame
         }
         public static string GetSceneBgPath(string res, string extName = "jpg")
         {
-            //return $"{TEXTURE_DIR_PATH}/SceneBg/{res}.{extName}";
-            return $"{TEXTURE_DIR_PATH}/DressUp/{res}.{extName}";
+            return $"{TEXTURE_DIR_PATH}/SceneBg/{res}.{extName}";
+            //return $"{TEXTURE_DIR_PATH}/DressUp/{res}.{extName}";
         }
         public static string GetDressUpPath(ItemCfg itemCfg, int layerId)
 {

+ 3 - 3
GameClient/Assets/Resources/BuildinFileManifest.asset

@@ -19,7 +19,6 @@ MonoBehaviour:
   - 0426fa1572b33849430a35a49afc1f34.bundle
   - 0454346e3a595910522b7cb059895b27.bundle
   - 050e07ea07ef205553b63824df7be4f2.bundle
-  - 05d9ac6f230d319fa63fedec7e6b6fe5.bundle
   - 06007e1cb87e9b25a0183ae5d670495d.bundle
   - 08670e459551ea964350883d41600cc6.bundle
   - 0996ecb0c9b99198362049fd6dbef4a6.bundle
@@ -32,7 +31,6 @@ MonoBehaviour:
   - 0c8111fd87db6cc20749d1dda5725d01.bundle
   - 0eda81b30c2c68a338e01242eec8b51b.bundle
   - 0fdb2cff1b4ce245d353457077dd564b.bundle
-  - 0fe0651f5419839a437f3f6d9da7cf57.bundle
   - 116cc3604898b17747b846f150e9ab50.bundle
   - 11c13fc21576755624af2f6656db47ec.bundle
   - 12d15c825109752c59a3cdcfc7fe71e7.bundle
@@ -108,6 +106,7 @@ MonoBehaviour:
   - 6b5c375fe150a1e7dcb95b8ffe584485.bundle
   - 6bb84c3a821068c6f3d641d45c1e02f0.bundle
   - 6c4d2adb69fe0d0230359bc6907d6a6d.bundle
+  - 6ce270a27d540c634853bd9401625680.bundle
   - 6e325cdcc51828650cdf1d4fa6c0d5c8.bundle
   - 6e64e29925851284e20dbed4932a6ab1.bundle
   - 6e7ba1b2e58ab1aa6d397bedbff25379.bundle
@@ -119,11 +118,11 @@ MonoBehaviour:
   - 77a61c6823665f98391999d012164a01.bundle
   - 77bda917e80eefc38b5ebb3b76219d0f.bundle
   - 785704866a667eebe9ea70ac1db22752.bundle
-  - 7c09176ef3f9aeb132dc683692001b56.bundle
   - 7ded0d12b721a22232eec463d25fb0ea.bundle
   - 80891ffa41d0c4b0fba836eb432e6f08.bundle
   - 820e6783e0c0a9d665d82a21a65de402.bundle
   - 83ed18fc4e31997219d50d72725d37d7.bundle
+  - 84b96c5f6d8aa064d344be33f040fd4a.bundle
   - 8591500b0da75e840e23faa8c0d523f2.bundle
   - 85b86aa30872bf935a82f7d6a7fda57b.bundle
   - 877d38589bf1c46ace3d5bb51a7ab79b.bundle
@@ -180,6 +179,7 @@ MonoBehaviour:
   - d1b26d59414885bd476bd69b1b8c3773.bundle
   - d1b9224d96677a87c2f0b9506db076ee.bundle
   - d68c90ceb864f3b4459f9c1d38d6674d.bundle
+  - d8a737652b44a121a423ef205c18cc67.bundle
   - d8c3503e7efd6fcd428e4dff7578a3f8.bundle
   - d9487902f87be674eb9ee5121c18353e.bundle
   - d94a287ac27da3fe1d66811d09d1e5d6.bundle