Merge branch 'main' of gitea.bywaystudios.com:zhanghongbo/Art_SubModule

Art_Atlas/06Task.spriteatlasv2

@@ -17,6 +17,5 @@ SpriteAtlasAsset:
     - {fileID: 21300000, guid: e790420cc399bc745af430802c5bf02d, type: 3}
     - {fileID: 21300000, guid: df2e89104409b324b9178381c7fec3e0, type: 3}
     - {fileID: 21300000, guid: fe32698dc7a0207418d8a95c5baf3efc, type: 3}
-    - {fileID: 21300000, guid: 7bb75b7f3bacc0145852bcebbaf4aa65, type: 3}
     - {fileID: 21300000, guid: 32ff417cdd659784aa6f7f5682d5a16c, type: 3}
   m_IsVariant: 0

Art_Atlas/12PetHome.spriteatlasv2

@@ -55,70 +55,20 @@ SpriteAtlasAsset:
     - {fileID: 21300000, guid: c26e14459f4fb164f96a164513055d03, type: 3}
     - {fileID: 21300000, guid: ed93de994aad79d4291cf62e0380b52b, type: 3}
     - {fileID: 21300000, guid: 5bb129f26a096334680fc2bf89048e9d, type: 3}
-    - {fileID: 21300000, guid: 165cfa75202749b4eb236e8b43e02469, type: 3}
-    - {fileID: 21300000, guid: c82e3794bdd0d0d4795f0002a87e4231, type: 3}
-    - {fileID: 21300000, guid: 96fb68b0a2f7e424184213b28598073d, type: 3}
-    - {fileID: 21300000, guid: 45564679d82c4214082b2844b0716edc, type: 3}
     - {fileID: 21300000, guid: 7ec143520eec1bc4bbd0732af52e7e84, type: 3}
-    - {fileID: 21300000, guid: b367ab5f61f04b94c86d6f35111da7bc, type: 3}
-    - {fileID: 21300000, guid: b6540ee442c360b42a6157a9b87f8ac7, type: 3}
-    - {fileID: 21300000, guid: 463a0add683394d4db957bbe97b3896b, type: 3}
-    - {fileID: 21300000, guid: a3f64be96e706ff41bdb42bedb4b434f, type: 3}
-    - {fileID: 21300000, guid: e6934a1b07b96234cbbd616978f1ae4e, type: 3}
-    - {fileID: 21300000, guid: cd65ac40f4398e746a93e8ae589489b9, type: 3}
-    - {fileID: 21300000, guid: 9770d9a2e9bce1a4597113fb262424ed, type: 3}
     - {fileID: 21300000, guid: 1f923c89db0b8e946894d91e6aea21d5, type: 3}
-    - {fileID: 21300000, guid: 6f9d71851974ae84e89e5efdbbe64c1c, type: 3}
     - {fileID: 21300000, guid: 2fae47e3a33ddf245a70e3cf86034e95, type: 3}
-    - {fileID: 21300000, guid: 4bb58adffd327cf468d817224e05a557, type: 3}
-    - {fileID: 21300000, guid: d3eebd762f721a94aa8ab08825a812b3, type: 3}
-    - {fileID: 21300000, guid: 085df6cfc8efafe4b9b6e55455a940ac, type: 3}
-    - {fileID: 21300000, guid: 4c88db678d60b22449cae1c005675c53, type: 3}
-    - {fileID: 21300000, guid: 2db668d2155cae845a6622847ea16a74, type: 3}
-    - {fileID: 21300000, guid: 565067edca539b1488c62feb0b9e8cc4, type: 3}
-    - {fileID: 21300000, guid: f679ecf679404cd428c329f2e46e2f60, type: 3}
-    - {fileID: 21300000, guid: 2d78c720a267fb042a2f1d4b5cc4bae3, type: 3}
-    - {fileID: 21300000, guid: 0c23e4970e4feac4b949ab53778ef356, type: 3}
-    - {fileID: 21300000, guid: 928ec0c759fa10546bf0945cca62aa0e, type: 3}
     - {fileID: 21300000, guid: fbfe3cf8e5d24c24982e74b8f48bfa4e, type: 3}
-    - {fileID: 21300000, guid: c4f017a282272354993c10aa4379cd91, type: 3}
     - {fileID: 21300000, guid: 03077aa99e5c02c4b83d1e16f58337a8, type: 3}
-    - {fileID: 21300000, guid: 798974f2d49de2c43a69deb67b40e18d, type: 3}
-    - {fileID: 21300000, guid: b950f6f1edc2e0740b3165f6462d1144, type: 3}
-    - {fileID: 21300000, guid: 3058d90867e264d498cd3ff99432d2e2, type: 3}
-    - {fileID: 21300000, guid: 7fe85800bb83eee47a4b9b052fea89ef, type: 3}
     - {fileID: 21300000, guid: a3c03077185bcee40b0447cfc5823338, type: 3}
-    - {fileID: 21300000, guid: 7c8c5fcb766bfd04eb9d1ebfe14fb61c, type: 3}
-    - {fileID: 21300000, guid: 4dfc62e10121a0d4eb25eb15dbf1fc33, type: 3}
     - {fileID: 21300000, guid: b9cfa72a4f0083a40a71cf67b9a3f51b, type: 3}
     - {fileID: 21300000, guid: a36371873f0f5784395cb8232f50dac5, type: 3}
-    - {fileID: 21300000, guid: ffba6452b48dff44c8f0bf76b822e848, type: 3}
-    - {fileID: 21300000, guid: dee6430845170af40aa75b98738d33bb, type: 3}
-    - {fileID: 21300000, guid: ba6891910e5eca842a31d85d54b73018, type: 3}
-    - {fileID: 21300000, guid: 15b3091a27bb8d64b88d0e33a7658186, type: 3}
-    - {fileID: 21300000, guid: aafd2013e76a6944e80fde0ec26138b7, type: 3}
-    - {fileID: 21300000, guid: d6d51f6e881970e42a6f6d0d5ad59777, type: 3}
-    - {fileID: 21300000, guid: fd2ecc90e0dcbff44add2ee13a75ea03, type: 3}
     - {fileID: 21300000, guid: 1c226458aec91844cbe4e326378becd0, type: 3}
-    - {fileID: 21300000, guid: 756c7248abd092646b647afc9aea79ad, type: 3}
     - {fileID: 21300000, guid: f30cc6ecfee9aca4b81e61a8e13371f7, type: 3}
-    - {fileID: 21300000, guid: 54104615f712a0f4b942db6e09b01879, type: 3}
-    - {fileID: 21300000, guid: 8fe330902ec2c7949a52a7688ca1a13d, type: 3}
-    - {fileID: 21300000, guid: 7c9af18ecdcc95740bd62da513125cf5, type: 3}
-    - {fileID: 21300000, guid: 051d4e2e81b741645a6ffd00f55c5bc6, type: 3}
-    - {fileID: 21300000, guid: be8c4f187ebd6b240b9d2826b3318009, type: 3}
-    - {fileID: 21300000, guid: 71a825e7c48f426498644fe16e08bafc, type: 3}
-    - {fileID: 21300000, guid: 3fb3d9b0a1c10da4c8acd91e7b57a5f9, type: 3}
-    - {fileID: 21300000, guid: dd2e1d433c619b24a9bb9e8487583877, type: 3}
-    - {fileID: 21300000, guid: d733e0a474d31c14eb436b31e107aa2a, type: 3}
-    - {fileID: 21300000, guid: 4bb0b4f53e4841c4d806bb0f8d7d1ff1, type: 3}
-    - {fileID: 21300000, guid: 027756612493f494496197236efcd57b, type: 3}
-    - {fileID: 21300000, guid: 2e64521579a883e48b7a29c354189260, type: 3}
     - {fileID: 21300000, guid: 43cd1bd4c2e32ba44969cafdd24e8391, type: 3}
     - {fileID: 21300000, guid: 8e37b60749398fe4d9312d5e75fb523c, type: 3}
     - {fileID: 21300000, guid: 52da48efba0fd3d4b9b7f0f101a5e61a, type: 3}
     - {fileID: 21300000, guid: 2a0c5aaa457af4342b7ab95b83bc009d, type: 3}
-    - {fileID: 21300000, guid: 2ad11bd01c2f486439dc5ac92cd5daa2, type: 3}
     - {fileID: 21300000, guid: 6713949c526e6cb43b701ceaa15d7870, type: 3}
     - {fileID: 21300000, guid: 291209fe7481e334a94cee7ad7a9c33b, type: 3}
     - {fileID: 21300000, guid: 712cedb8678e2894bb2f2689403c7c25, type: 3}

Art_Atlas/AtlasConfig.json

@@ -1482,7 +1482,6 @@
                 "Assets/Art_SubModule/yyzl/06Task/image/Daily_pic_task_Panel_green.png",
                 "Assets/Art_SubModule/yyzl/06Task/image/Daily_pic_task_Panel_plus.png",
                 "Assets/Art_SubModule/yyzl/06Task/image/Daily_pic_task_Panel_white.png",
-                "Assets/Art_SubModule/yyzl/06Task/image/RP_Dailytasks_UI_pic_bg.png",
                 "Assets/Art_SubModule/yyzl/06Task/image/RP_Dailytasks_UI_pic_zibg.png"
             ]
         },
@@ -1682,70 +1681,20 @@
                 "Assets/Art_SubModule/yyzl/12PetHome/image/playroom_icon_blue_small.png",
                 "Assets/Art_SubModule/yyzl/12PetHome/image/playroom_icon_dibu_bg_light.png",
                 "Assets/Art_SubModule/yyzl/12PetHome/image/playroom_icon_dibu_gray2.png",
-                "Assets/Art_SubModule/yyzl/12PetHome/image/playroom_icon_dibu_green.png",
-                "Assets/Art_SubModule/yyzl/12PetHome/image/playroom_icon_dibu_jindutiao_green.png",
-                "Assets/Art_SubModule/yyzl/12PetHome/image/playroom_icon_dibu_red.png",
-                "Assets/Art_SubModule/yyzl/12PetHome/image/playroom_icon_dibu_red_gray.png",
                 "Assets/Art_SubModule/yyzl/12PetHome/image/playroom_icon_eat .png",
-                "Assets/Art_SubModule/yyzl/12PetHome/image/playroom_icon_feixingqi_dianchi.png",
-                "Assets/Art_SubModule/yyzl/12PetHome/image/playroom_icon_home.png",
-                "Assets/Art_SubModule/yyzl/12PetHome/image/playroom_icon_jiantou.png",
-                "Assets/Art_SubModule/yyzl/12PetHome/image/playroom_icon_plusfriend.png",
-                "Assets/Art_SubModule/yyzl/12PetHome/image/playroom_icon_tiaoguo.png",
-                "Assets/Art_SubModule/yyzl/12PetHome/image/playroom_icon_wanjuqiu.png",
-                "Assets/Art_SubModule/yyzl/12PetHome/image/playroom_icon_xizao.png",
                 "Assets/Art_SubModule/yyzl/12PetHome/image/playroom_kouhong_big.png",
-                "Assets/Art_SubModule/yyzl/12PetHome/image/playroom_pic_baifang_maogou.png",
                 "Assets/Art_SubModule/yyzl/12PetHome/image/playroom_pic_baifang_touxiangbg.png",
-                "Assets/Art_SubModule/yyzl/12PetHome/image/playroom_pic_baifang_zhaogu.png",
-                "Assets/Art_SubModule/yyzl/12PetHome/image/playroom_pic_chuifengji_dizuo.png",
-                "Assets/Art_SubModule/yyzl/12PetHome/image/playroom_pic_chuifengji_dizuo_zhedang.png",
-                "Assets/Art_SubModule/yyzl/12PetHome/image/playroom_pic_chuifengji_new.png",
-                "Assets/Art_SubModule/yyzl/12PetHome/image/playroom_pic_fangdajing1.png",
-                "Assets/Art_SubModule/yyzl/12PetHome/image/playroom_pic_fangdajing2.png",
-                "Assets/Art_SubModule/yyzl/12PetHome/image/playroom_pic_hezi.png",
-                "Assets/Art_SubModule/yyzl/12PetHome/image/playroom_pic_home_blue.png",
-                "Assets/Art_SubModule/yyzl/12PetHome/image/playroom_pic_laji1.png",
-                "Assets/Art_SubModule/yyzl/12PetHome/image/playroom_pic_maoronghezi.png",
                 "Assets/Art_SubModule/yyzl/12PetHome/image/playroom_pic_qiu_bg.png",
-                "Assets/Art_SubModule/yyzl/12PetHome/image/playroom_pic_senlin_maomimote_dengguang_1.png",
                 "Assets/Art_SubModule/yyzl/12PetHome/image/playroom_pic_senlin_maomimote_dengguang_2.png",
-                "Assets/Art_SubModule/yyzl/12PetHome/image/playroom_pic_senlin_maomimote_dengguang_3.png",
-                "Assets/Art_SubModule/yyzl/12PetHome/image/playroom_pic_senlin_maomimote_dengguang_3_1.png",
-                "Assets/Art_SubModule/yyzl/12PetHome/image/playroom_pic_shiyijian_huazhuangmian.png",
-                "Assets/Art_SubModule/yyzl/12PetHome/image/playroom_pic_shiyijian_huazhuangtai_banzi.png",
                 "Assets/Art_SubModule/yyzl/12PetHome/image/playroom_pic_shiyijian_jingzi_bg3.png",
-                "Assets/Art_SubModule/yyzl/12PetHome/image/playroom_pic_shiyijian_lanzi.png",
-                "Assets/Art_SubModule/yyzl/12PetHome/image/playroom_pic_shiyijian_shafa.png",
                 "Assets/Art_SubModule/yyzl/12PetHome/image/playroom_pic_shiyijian_yigui_bg2.png",
                 "Assets/Art_SubModule/yyzl/12PetHome/image/playroom_pic_shiyijian_yigui_bg2_2.png",
-                "Assets/Art_SubModule/yyzl/12PetHome/image/playroom_pic_shiyijian_yinxingyanjing.png",
-                "Assets/Art_SubModule/yyzl/12PetHome/image/playroom_pic_supermiao_qipap1.png",
-                "Assets/Art_SubModule/yyzl/12PetHome/image/playroom_pic_supermiao_qipap1_bg.png",
-                "Assets/Art_SubModule/yyzl/12PetHome/image/playroom_pic_supermiao_qipap2.png",
-                "Assets/Art_SubModule/yyzl/12PetHome/image/playroom_pic_supermiao_qipap2_bg.png",
-                "Assets/Art_SubModule/yyzl/12PetHome/image/playroom_pic_supermiao_qipap3.png",
-                "Assets/Art_SubModule/yyzl/12PetHome/image/playroom_pic_supermiao_qipap3_bg.png",
                 "Assets/Art_SubModule/yyzl/12PetHome/image/playroom_pic_whtie_bg.png",
-                "Assets/Art_SubModule/yyzl/12PetHome/image/playroom_pic_xiaoyouxi_cuowu.png",
                 "Assets/Art_SubModule/yyzl/12PetHome/image/playroom_pic_xiaoyouxi_zhengque.png",
-                "Assets/Art_SubModule/yyzl/12PetHome/image/playroom_pic_yushi_huasa.png",
-                "Assets/Art_SubModule/yyzl/12PetHome/image/playroom_pic_yushi_icon_chuifeng.png",
-                "Assets/Art_SubModule/yyzl/12PetHome/image/playroom_pic_yushi_icon_duigou.png",
-                "Assets/Art_SubModule/yyzl/12PetHome/image/playroom_pic_yushi_icon_huise.png",
-                "Assets/Art_SubModule/yyzl/12PetHome/image/playroom_pic_yushi_icon_lvse.png",
-                "Assets/Art_SubModule/yyzl/12PetHome/image/playroom_pic_yushi_icon_xiyu.png",
-                "Assets/Art_SubModule/yyzl/12PetHome/image/playroom_pic_yushi_icon_yushi.png",
-                "Assets/Art_SubModule/yyzl/12PetHome/image/playroom_pic_yushi_lanzi_yellow.png",
-                "Assets/Art_SubModule/yyzl/12PetHome/image/playroom_xizao_feizao_white.png",
-                "Assets/Art_SubModule/yyzl/12PetHome/image/RP_Dailytasks_UI_icn_dagongdengdai.png",
-                "Assets/Art_SubModule/yyzl/12PetHome/image/RP_Dailytasks_UI_icn_smallbg.png",
-                "Assets/Art_SubModule/yyzl/12PetHome/image/Skin_pic_catpic_bg.png",
                 "Assets/Art_SubModule/yyzl/12PetHome/image/Skin_pic_catpic_smallbg.png",
                 "Assets/Art_SubModule/yyzl/12PetHome/image/Skin_pic_taizi2.png",
                 "Assets/Art_SubModule/yyzl/12PetHome/image/Skin_pic_yulan_bg2.png",
                 "Assets/Art_SubModule/yyzl/12PetHome/image/Skin_pic_yulan_bg3.png",
-                "Assets/Art_SubModule/yyzl/12PetHome/image/Skin_pic_cat1.png",
                 "Assets/Art_SubModule/yyzl/12PetHome/image/playroom_icon_guashi.png",
                 "Assets/Art_SubModule/yyzl/12PetHome/image/playroom_icon_jiaoshi.png",
                 "Assets/Art_SubModule/yyzl/12PetHome/image/playroom_icon_liantifu.png",
@@ -2224,17 +2173,6 @@
         {
             "Name": "Redundant",
             "SpritePaths": [
-                "Assets/Art_SubModule/yyzl/12PetHome/PR_Scene/MainRoom/playroom_pic_senlin_dianchidizuo.png",
-                "Assets/Art_SubModule/yyzl/12PetHome/PR_Scene/MainRoom/playroom_pic_senlin_zhuqingting.png",
-                "Assets/Art_SubModule/yyzl/12PetHome/PR_Scene/MainRoom/pr_scene_fly_huojian.png",
-                "Assets/Art_SubModule/yyzl/12PetHome/PR_Scene/MainRoom/pr_scene_fly_luobo.png",
-                "Assets/Art_SubModule/yyzl/StockImages/Prop/AG/Production_A1_LV1.png",
-                "Assets/Art_SubModule/yyzl/StockImages/Prop/OT/Production_P1_lv1.png",
-                "Assets/Art_SubModule/yyzl/StockImages/Prop/Other/Production_energy_LV1.png",
-                "Assets/Art_SubModule/yyzl/StockImages/Prop/Other/Production_energy_LV2.png",
-                "Assets/Art_SubModule/yyzl/StockImages/Prop/Other/Production_star_LV1.png",
-                "Assets/Art_SubModule/yyzl/StockImages/Prop/Other/Production_star_LV3.png",
-                "Assets/Art_SubModule/yyzl/StockImages/Prop/Other/Production_star_LV4.png",
                 "Assets/GameMain/Effect/Prefab/activityIcon/hslh/hlh1.png",
                 "Assets/GameMain/Effect/Prefab/activityIcon/hslh/hlh2.png",
                 "Assets/GameMain/Effect/Prefab/activityIcon/hslh/hlh3.png",

Art_Atlas/Redundant.spriteatlasv2

@@ -11,17 +11,6 @@ SpriteAtlasAsset:
   m_MasterAtlas: {fileID: 0}
   m_ImporterData:
     packables:
-    - {fileID: 21300000, guid: 5a1bb00e955cbd949b8de6072ba34ce7, type: 3}
-    - {fileID: 21300000, guid: 46bd513f4a696534bbe860d826bc9a73, type: 3}
-    - {fileID: 21300000, guid: 99be70fe836384e43be1bd088528b9bd, type: 3}
-    - {fileID: 21300000, guid: 29860a1f67161724aa6f3e9cbd5e6a05, type: 3}
-    - {fileID: 21300000, guid: f18becc64c1d5984a8a98da0485d78dc, type: 3}
-    - {fileID: 21300000, guid: 81e8054217716f54a9cad31e07fd92df, type: 3}
-    - {fileID: 21300000, guid: a560eeb29458abb49b0fbe38abd2cc41, type: 3}
-    - {fileID: 21300000, guid: 9179c420c3b17de49b977db898123a31, type: 3}
-    - {fileID: 21300000, guid: e43d03c91ce4a3c4e860a0acb670e1be, type: 3}
-    - {fileID: 21300000, guid: b515bd656a5437f4d8fdf556dd926ad3, type: 3}
-    - {fileID: 21300000, guid: 793a5af42b5004044bb04bf9f7a6beb5, type: 3}
     - {fileID: 21300000, guid: 6055bafb3cc4d5640b862395f218db8b, type: 3}
     - {fileID: 21300000, guid: d2ac870e7d229914686b6a2b34e15294, type: 3}
     - {fileID: 21300000, guid: 652de2f8af525b042a8beef3df2f4f69, type: 3}

Art_Json/Shop/ShopOther.json

@@ -198,7 +198,7 @@
             "Id": 25,
             "Name": "shop_panel_title",
             "Desc": "",
-            "SpritePath": "Assets/Art_SubModule/GameMain/UI/UISprites/Shop/Packed/shop_panel_title.png",
+            "SpritePath": "Assets/Art_SubModule/GameMain/UI/UISprites/Other/Packed/Sp1/shop_panel_title.png",
             "SpineAssetPath": "",
             "SpineAnimName": ""
         },
@@ -238,7 +238,7 @@
             "Id": 30,
             "Name": "shop_pic_guanggaojiangli2",
             "Desc": "",
-            "SpritePath": "Assets/Art_SubModule/Art_Resource/Art_UISprites/Shop/Other/shop_pic_guanggaojiangli2.png",
+            "SpritePath": "Assets/Art_SubModule/GameMain/UI/UISprites/Shop/Packed/shop_pic_guanggaojiangli2.png",
             "SpineAssetPath": "",
             "SpineAnimName": ""
         },
@@ -254,7 +254,7 @@
             "Id": 33,
             "Name": "shop_pic_redline",
             "Desc": "",
-            "SpritePath": "Assets/Art_SubModule/Art_Resource/Art_UISprites/Shop/Other/shop_pic_redline.png",
+            "SpritePath": "Assets/Art_SubModule/yyzl/Common/Small/shop_pic_redline.png",
             "SpineAssetPath": "",
             "SpineAnimName": ""
         },
@@ -262,7 +262,7 @@
             "Id": 34,
             "Name": "shop_pic_Special Pack1",
             "Desc": "",
-            "SpritePath": "Assets/Art_SubModule/Art_Resource/Art_UISprites/Shop/Other/shop_pic_Special Pack1.png",
+            "SpritePath": "Assets/Art_SubModule/GameMain/UI/UISprites/Shop/Packed/shop_pic_Special Pack1.png",
             "SpineAssetPath": "",
             "SpineAnimName": ""
         },
@@ -270,7 +270,7 @@
             "Id": 35,
             "Name": "shop_pic_Special Pack2",
             "Desc": "",
-            "SpritePath": "Assets/Art_SubModule/Art_Resource/Art_UISprites/Shop/Other/shop_pic_Special Pack2.png",
+            "SpritePath": "Assets/Art_SubModule/GameMain/UI/UISprites/Shop/Packed/shop_pic_Special Pack2.png",
             "SpineAssetPath": "",
             "SpineAnimName": ""
         },
@@ -278,7 +278,7 @@
             "Id": 36,
             "Name": "shop_pic_Special Pack2_1",
             "Desc": "",
-            "SpritePath": "Assets/Art_SubModule/Art_Resource/Art_UISprites/Shop/Other/shop_pic_Special Pack2_1.png",
+            "SpritePath": "Assets/Art_SubModule/GameMain/UI/UISprites/Shop/Packed/shop_pic_Special Pack2_1.png",
             "SpineAssetPath": "",
             "SpineAnimName": ""
         },
@@ -286,7 +286,7 @@
             "Id": 37,
             "Name": "shop_pic_zhekou",
             "Desc": "",
-            "SpritePath": "Assets/Art_SubModule/Art_Resource/Art_UISprites/Shop/Other/shop_pic_zhekou.png",
+            "SpritePath": "Assets/Art_SubModule/GameMain/UI/UISprites/Shop/Packed/shop_pic_zhekou.png",
             "SpineAssetPath": "",
             "SpineAnimName": ""
         },
@@ -294,7 +294,7 @@
             "Id": 41,
             "Name": "supply_pic_toggle01",
             "Desc": "",
-            "SpritePath": "Assets/Art_SubModule/Art_Resource/Art_UISprites/Shop/Other/supply_pic_toggle01.png",
+            "SpritePath": "Assets/Art_SubModule/GameMain/UI/UISprites/Shop/Packed/supply_pic_toggle01.png",
             "SpineAssetPath": "",
             "SpineAnimName": ""
         },