diff --git a/Assets/ManagedResources/Atlas/ActivityAltas/ArtFont/s_shengxingyouli_banner.png b/Assets/ManagedResources/Atlas/ActivityAltas/ArtFont/s_shengxingyouli_banner.png index af812c4296..eebdeff6f1 100644 Binary files a/Assets/ManagedResources/Atlas/ActivityAltas/ArtFont/s_shengxingyouli_banner.png and b/Assets/ManagedResources/Atlas/ActivityAltas/ArtFont/s_shengxingyouli_banner.png differ diff --git a/Assets/ManagedResources/Atlas/DyAct_ShengXingYouLi.meta b/Assets/ManagedResources/Atlas/DyAct_ShengXingYouLi.meta new file mode 100644 index 0000000000..b624799131 --- /dev/null +++ b/Assets/ManagedResources/Atlas/DyAct_ShengXingYouLi.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a0494286c1405f04b9a59bdf661389ea +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: lz4/atlas/dyact_shengxingyouli + assetBundleVariant: unity3d diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ShengXingYouLi/ArtFont.meta b/Assets/ManagedResources/Atlas/DyAct_ShengXingYouLi/ArtFont.meta similarity index 77% rename from Assets/ManagedResources/Atlas/DynamicActivityAtlas/ShengXingYouLi/ArtFont.meta rename to Assets/ManagedResources/Atlas/DyAct_ShengXingYouLi/ArtFont.meta index 4241199926..418f8025f1 100644 --- a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ShengXingYouLi/ArtFont.meta +++ b/Assets/ManagedResources/Atlas/DyAct_ShengXingYouLi/ArtFont.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: a8565114765606a47bb956272df0d13e +guid: 96dce1dada7945746af66bbcf53abdf3 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/SuoXiangPiMi.meta b/Assets/ManagedResources/Atlas/DyAct_SuoXiangPiMi.meta similarity index 62% rename from Assets/ManagedResources/Atlas/DynamicActivityAtlas/SuoXiangPiMi.meta rename to Assets/ManagedResources/Atlas/DyAct_SuoXiangPiMi.meta index 4fdf17ca14..c71ab9c7fd 100644 --- a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/SuoXiangPiMi.meta +++ b/Assets/ManagedResources/Atlas/DyAct_SuoXiangPiMi.meta @@ -4,5 +4,5 @@ folderAsset: yes DefaultImporter: externalObjects: {} userData: - assetBundleName: - assetBundleVariant: + assetBundleName: lz4/atlas/dyact_suoxiangpimi + assetBundleVariant: unity3d diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/SuoXiangPiMi/s_suoxiangpimi_banner.png b/Assets/ManagedResources/Atlas/DyAct_SuoXiangPiMi/s_suoxiangpimi_banner.png similarity index 100% rename from Assets/ManagedResources/Atlas/DynamicActivityAtlas/SuoXiangPiMi/s_suoxiangpimi_banner.png rename to Assets/ManagedResources/Atlas/DyAct_SuoXiangPiMi/s_suoxiangpimi_banner.png diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/SuoXiangPiMi/s_suoxiangpimi_banner.png.meta b/Assets/ManagedResources/Atlas/DyAct_SuoXiangPiMi/s_suoxiangpimi_banner.png.meta similarity index 97% rename from Assets/ManagedResources/Atlas/DynamicActivityAtlas/SuoXiangPiMi/s_suoxiangpimi_banner.png.meta rename to Assets/ManagedResources/Atlas/DyAct_SuoXiangPiMi/s_suoxiangpimi_banner.png.meta index d341a91fbb..5da55c2d09 100644 --- a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/SuoXiangPiMi/s_suoxiangpimi_banner.png.meta +++ b/Assets/ManagedResources/Atlas/DyAct_SuoXiangPiMi/s_suoxiangpimi_banner.png.meta @@ -80,7 +80,7 @@ TextureImporter: indices: edges: [] weights: [] - spritePackingTag: DynamicActivityAtlas + spritePackingTag: DyAct_SuoXiangPiMi pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/SuoXiangPiMi/s_suoxiangpimi_icon1.png b/Assets/ManagedResources/Atlas/DyAct_SuoXiangPiMi/s_suoxiangpimi_icon1.png similarity index 100% rename from Assets/ManagedResources/Atlas/DynamicActivityAtlas/SuoXiangPiMi/s_suoxiangpimi_icon1.png rename to Assets/ManagedResources/Atlas/DyAct_SuoXiangPiMi/s_suoxiangpimi_icon1.png diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/SuoXiangPiMi/s_suoxiangpimi_icon1.png.meta b/Assets/ManagedResources/Atlas/DyAct_SuoXiangPiMi/s_suoxiangpimi_icon1.png.meta similarity index 97% rename from Assets/ManagedResources/Atlas/DynamicActivityAtlas/SuoXiangPiMi/s_suoxiangpimi_icon1.png.meta rename to Assets/ManagedResources/Atlas/DyAct_SuoXiangPiMi/s_suoxiangpimi_icon1.png.meta index 5aa720091f..897a6f5743 100644 --- a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/SuoXiangPiMi/s_suoxiangpimi_icon1.png.meta +++ b/Assets/ManagedResources/Atlas/DyAct_SuoXiangPiMi/s_suoxiangpimi_icon1.png.meta @@ -80,7 +80,7 @@ TextureImporter: indices: edges: [] weights: [] - spritePackingTag: DynamicActivityAtlas + spritePackingTag: DyAct_SuoXiangPiMi pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/SuoXiangPiMi/s_suoxiangpimi_icon2.png b/Assets/ManagedResources/Atlas/DyAct_SuoXiangPiMi/s_suoxiangpimi_icon2.png similarity index 100% rename from Assets/ManagedResources/Atlas/DynamicActivityAtlas/SuoXiangPiMi/s_suoxiangpimi_icon2.png rename to Assets/ManagedResources/Atlas/DyAct_SuoXiangPiMi/s_suoxiangpimi_icon2.png diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/SuoXiangPiMi/s_suoxiangpimi_icon2.png.meta b/Assets/ManagedResources/Atlas/DyAct_SuoXiangPiMi/s_suoxiangpimi_icon2.png.meta similarity index 97% rename from Assets/ManagedResources/Atlas/DynamicActivityAtlas/SuoXiangPiMi/s_suoxiangpimi_icon2.png.meta rename to Assets/ManagedResources/Atlas/DyAct_SuoXiangPiMi/s_suoxiangpimi_icon2.png.meta index 652be56814..a7b2e07b9b 100644 --- a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/SuoXiangPiMi/s_suoxiangpimi_icon2.png.meta +++ b/Assets/ManagedResources/Atlas/DyAct_SuoXiangPiMi/s_suoxiangpimi_icon2.png.meta @@ -80,7 +80,7 @@ TextureImporter: indices: edges: [] weights: [] - spritePackingTag: DynamicActivityAtlas + spritePackingTag: DyAct_SuoXiangPiMi pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/SuoXiangPiMi/s_suoxiangpimi_shenjiang2.png b/Assets/ManagedResources/Atlas/DyAct_SuoXiangPiMi/s_suoxiangpimi_shenjiang2.png similarity index 100% rename from Assets/ManagedResources/Atlas/DynamicActivityAtlas/SuoXiangPiMi/s_suoxiangpimi_shenjiang2.png rename to Assets/ManagedResources/Atlas/DyAct_SuoXiangPiMi/s_suoxiangpimi_shenjiang2.png diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/SuoXiangPiMi/s_suoxiangpimi_shenjiang2.png.meta b/Assets/ManagedResources/Atlas/DyAct_SuoXiangPiMi/s_suoxiangpimi_shenjiang2.png.meta similarity index 97% rename from Assets/ManagedResources/Atlas/DynamicActivityAtlas/SuoXiangPiMi/s_suoxiangpimi_shenjiang2.png.meta rename to Assets/ManagedResources/Atlas/DyAct_SuoXiangPiMi/s_suoxiangpimi_shenjiang2.png.meta index 263aabe229..fd7a5b7d88 100644 --- a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/SuoXiangPiMi/s_suoxiangpimi_shenjiang2.png.meta +++ b/Assets/ManagedResources/Atlas/DyAct_SuoXiangPiMi/s_suoxiangpimi_shenjiang2.png.meta @@ -80,7 +80,7 @@ TextureImporter: indices: edges: [] weights: [] - spritePackingTag: DynamicActivityAtlas + spritePackingTag: DyAct_SuoXiangPiMi pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/SuoXiangPiMi/s_suoxiangpimi_zi.png b/Assets/ManagedResources/Atlas/DyAct_SuoXiangPiMi/s_suoxiangpimi_zi.png similarity index 100% rename from Assets/ManagedResources/Atlas/DynamicActivityAtlas/SuoXiangPiMi/s_suoxiangpimi_zi.png rename to Assets/ManagedResources/Atlas/DyAct_SuoXiangPiMi/s_suoxiangpimi_zi.png diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/SuoXiangPiMi/s_suoxiangpimi_zi.png.meta b/Assets/ManagedResources/Atlas/DyAct_SuoXiangPiMi/s_suoxiangpimi_zi.png.meta similarity index 97% rename from Assets/ManagedResources/Atlas/DynamicActivityAtlas/SuoXiangPiMi/s_suoxiangpimi_zi.png.meta rename to Assets/ManagedResources/Atlas/DyAct_SuoXiangPiMi/s_suoxiangpimi_zi.png.meta index 1cc70e8f96..daa3c80de6 100644 --- a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/SuoXiangPiMi/s_suoxiangpimi_zi.png.meta +++ b/Assets/ManagedResources/Atlas/DyAct_SuoXiangPiMi/s_suoxiangpimi_zi.png.meta @@ -80,7 +80,7 @@ TextureImporter: indices: edges: [] weights: [] - spritePackingTag: DynamicActivityAtlas + spritePackingTag: DyAct_SuoXiangPiMi pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/XiangYaoDuoBao.meta b/Assets/ManagedResources/Atlas/DyAct_XiangYaoDuoBao.meta similarity index 61% rename from Assets/ManagedResources/Atlas/DynamicActivityAtlas/XiangYaoDuoBao.meta rename to Assets/ManagedResources/Atlas/DyAct_XiangYaoDuoBao.meta index cb21bda1d5..b137b3c248 100644 --- a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/XiangYaoDuoBao.meta +++ b/Assets/ManagedResources/Atlas/DyAct_XiangYaoDuoBao.meta @@ -4,5 +4,5 @@ folderAsset: yes DefaultImporter: externalObjects: {} userData: - assetBundleName: - assetBundleVariant: + assetBundleName: lz4/atlas/dyact_xiangyaoduobao + assetBundleVariant: unity3d diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/XiangYaoDuoBao/ArtFont.meta b/Assets/ManagedResources/Atlas/DyAct_XiangYaoDuoBao/ArtFont.meta similarity index 100% rename from Assets/ManagedResources/Atlas/DynamicActivityAtlas/XiangYaoDuoBao/ArtFont.meta rename to Assets/ManagedResources/Atlas/DyAct_XiangYaoDuoBao/ArtFont.meta diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/XiangYaoDuoBao/ArtFont/x_xiangyaoduobao_icon1.png b/Assets/ManagedResources/Atlas/DyAct_XiangYaoDuoBao/ArtFont/x_xiangyaoduobao_icon1.png similarity index 100% rename from Assets/ManagedResources/Atlas/DynamicActivityAtlas/XiangYaoDuoBao/ArtFont/x_xiangyaoduobao_icon1.png rename to Assets/ManagedResources/Atlas/DyAct_XiangYaoDuoBao/ArtFont/x_xiangyaoduobao_icon1.png diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/XiangYaoDuoBao/ArtFont/x_xiangyaoduobao_icon1.png.meta b/Assets/ManagedResources/Atlas/DyAct_XiangYaoDuoBao/ArtFont/x_xiangyaoduobao_icon1.png.meta similarity index 97% rename from Assets/ManagedResources/Atlas/DynamicActivityAtlas/XiangYaoDuoBao/ArtFont/x_xiangyaoduobao_icon1.png.meta rename to Assets/ManagedResources/Atlas/DyAct_XiangYaoDuoBao/ArtFont/x_xiangyaoduobao_icon1.png.meta index 55742dc1f7..677f6173ae 100644 --- a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/XiangYaoDuoBao/ArtFont/x_xiangyaoduobao_icon1.png.meta +++ b/Assets/ManagedResources/Atlas/DyAct_XiangYaoDuoBao/ArtFont/x_xiangyaoduobao_icon1.png.meta @@ -80,7 +80,7 @@ TextureImporter: indices: edges: [] weights: [] - spritePackingTag: DynamicActivityAtlas + spritePackingTag: DyAct_XiangYaoDuoBao pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/XiangYaoDuoBao/ArtFont/x_xiangyaoduobao_icon2.png b/Assets/ManagedResources/Atlas/DyAct_XiangYaoDuoBao/ArtFont/x_xiangyaoduobao_icon2.png similarity index 100% rename from Assets/ManagedResources/Atlas/DynamicActivityAtlas/XiangYaoDuoBao/ArtFont/x_xiangyaoduobao_icon2.png rename to Assets/ManagedResources/Atlas/DyAct_XiangYaoDuoBao/ArtFont/x_xiangyaoduobao_icon2.png diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/XiangYaoDuoBao/ArtFont/x_xiangyaoduobao_icon2.png.meta b/Assets/ManagedResources/Atlas/DyAct_XiangYaoDuoBao/ArtFont/x_xiangyaoduobao_icon2.png.meta similarity index 97% rename from Assets/ManagedResources/Atlas/DynamicActivityAtlas/XiangYaoDuoBao/ArtFont/x_xiangyaoduobao_icon2.png.meta rename to Assets/ManagedResources/Atlas/DyAct_XiangYaoDuoBao/ArtFont/x_xiangyaoduobao_icon2.png.meta index 371f5dc4a6..55a5788111 100644 --- a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/XiangYaoDuoBao/ArtFont/x_xiangyaoduobao_icon2.png.meta +++ b/Assets/ManagedResources/Atlas/DyAct_XiangYaoDuoBao/ArtFont/x_xiangyaoduobao_icon2.png.meta @@ -80,7 +80,7 @@ TextureImporter: indices: edges: [] weights: [] - spritePackingTag: DynamicActivityAtlas + spritePackingTag: DyAct_XiangYaoDuoBao pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/XinJiangLaiXi.meta b/Assets/ManagedResources/Atlas/DyAct_XinJiangLaiXi.meta similarity index 62% rename from Assets/ManagedResources/Atlas/DynamicActivityAtlas/XinJiangLaiXi.meta rename to Assets/ManagedResources/Atlas/DyAct_XinJiangLaiXi.meta index 129b9db480..77d1aec007 100644 --- a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/XinJiangLaiXi.meta +++ b/Assets/ManagedResources/Atlas/DyAct_XinJiangLaiXi.meta @@ -4,5 +4,5 @@ folderAsset: yes DefaultImporter: externalObjects: {} userData: - assetBundleName: - assetBundleVariant: + assetBundleName: lz4/atlas/dyact_xinjianglaixi + assetBundleVariant: unity3d diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/XinJiangLaiXi/x_xiangjianglaixi_beijin.jpg b/Assets/ManagedResources/Atlas/DyAct_XinJiangLaiXi/x_xiangjianglaixi_beijin.jpg similarity index 100% rename from Assets/ManagedResources/Atlas/DynamicActivityAtlas/XinJiangLaiXi/x_xiangjianglaixi_beijin.jpg rename to Assets/ManagedResources/Atlas/DyAct_XinJiangLaiXi/x_xiangjianglaixi_beijin.jpg diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/XinJiangLaiXi/x_xiangjianglaixi_beijin.jpg.meta b/Assets/ManagedResources/Atlas/DyAct_XinJiangLaiXi/x_xiangjianglaixi_beijin.jpg.meta similarity index 97% rename from Assets/ManagedResources/Atlas/DynamicActivityAtlas/XinJiangLaiXi/x_xiangjianglaixi_beijin.jpg.meta rename to Assets/ManagedResources/Atlas/DyAct_XinJiangLaiXi/x_xiangjianglaixi_beijin.jpg.meta index 67f95976b6..48a8758ad9 100644 --- a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/XinJiangLaiXi/x_xiangjianglaixi_beijin.jpg.meta +++ b/Assets/ManagedResources/Atlas/DyAct_XinJiangLaiXi/x_xiangjianglaixi_beijin.jpg.meta @@ -80,7 +80,7 @@ TextureImporter: indices: edges: [] weights: [] - spritePackingTag: DynamicActivityAtlas + spritePackingTag: DyAct_XinJiangLaiXi pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/XinJiangLaiXi/x_xiangjianglaixi_zhezhao.png b/Assets/ManagedResources/Atlas/DyAct_XinJiangLaiXi/x_xiangjianglaixi_zhezhao.png similarity index 100% rename from Assets/ManagedResources/Atlas/DynamicActivityAtlas/XinJiangLaiXi/x_xiangjianglaixi_zhezhao.png rename to Assets/ManagedResources/Atlas/DyAct_XinJiangLaiXi/x_xiangjianglaixi_zhezhao.png diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/XinJiangLaiXi/x_xiangjianglaixi_zhezhao.png.meta b/Assets/ManagedResources/Atlas/DyAct_XinJiangLaiXi/x_xiangjianglaixi_zhezhao.png.meta similarity index 97% rename from Assets/ManagedResources/Atlas/DynamicActivityAtlas/XinJiangLaiXi/x_xiangjianglaixi_zhezhao.png.meta rename to Assets/ManagedResources/Atlas/DyAct_XinJiangLaiXi/x_xiangjianglaixi_zhezhao.png.meta index 0b0eee015a..a98ed498b6 100644 --- a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/XinJiangLaiXi/x_xiangjianglaixi_zhezhao.png.meta +++ b/Assets/ManagedResources/Atlas/DyAct_XinJiangLaiXi/x_xiangjianglaixi_zhezhao.png.meta @@ -80,7 +80,7 @@ TextureImporter: indices: edges: [] weights: [] - spritePackingTag: DynamicActivityAtlas + spritePackingTag: DyAct_XinJiangLaiXi pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/XinJiangLaiXi/x_xiangjianglaixi_zhuangbeidi.png b/Assets/ManagedResources/Atlas/DyAct_XinJiangLaiXi/x_xiangjianglaixi_zhuangbeidi.png similarity index 100% rename from Assets/ManagedResources/Atlas/DynamicActivityAtlas/XinJiangLaiXi/x_xiangjianglaixi_zhuangbeidi.png rename to Assets/ManagedResources/Atlas/DyAct_XinJiangLaiXi/x_xiangjianglaixi_zhuangbeidi.png diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/XinJiangLaiXi/x_xiangjianglaixi_zhuangbeidi.png.meta b/Assets/ManagedResources/Atlas/DyAct_XinJiangLaiXi/x_xiangjianglaixi_zhuangbeidi.png.meta similarity index 97% rename from Assets/ManagedResources/Atlas/DynamicActivityAtlas/XinJiangLaiXi/x_xiangjianglaixi_zhuangbeidi.png.meta rename to Assets/ManagedResources/Atlas/DyAct_XinJiangLaiXi/x_xiangjianglaixi_zhuangbeidi.png.meta index 0a172de13b..80ef566674 100644 --- a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/XinJiangLaiXi/x_xiangjianglaixi_zhuangbeidi.png.meta +++ b/Assets/ManagedResources/Atlas/DyAct_XinJiangLaiXi/x_xiangjianglaixi_zhuangbeidi.png.meta @@ -80,7 +80,7 @@ TextureImporter: indices: edges: [] weights: [] - spritePackingTag: DynamicActivityAtlas + spritePackingTag: DyAct_XinJiangLaiXi pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ShengXingYouLi.meta b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ShengXingYouLi.meta deleted file mode 100644 index 8745c534e3..0000000000 --- a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ShengXingYouLi.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 814a374fa5248bc4f92e382b5827589b -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ShengXingYouLi/ArtFont/s_shengxingyouli_anniu_01.png b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ShengXingYouLi/ArtFont/s_shengxingyouli_anniu_01.png deleted file mode 100644 index 0d390e37fd..0000000000 Binary files a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ShengXingYouLi/ArtFont/s_shengxingyouli_anniu_01.png and /dev/null differ diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ShengXingYouLi/ArtFont/s_shengxingyouli_anniu_01.png.meta b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ShengXingYouLi/ArtFont/s_shengxingyouli_anniu_01.png.meta deleted file mode 100644 index 3469c6d52d..0000000000 --- a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ShengXingYouLi/ArtFont/s_shengxingyouli_anniu_01.png.meta +++ /dev/null @@ -1,88 +0,0 @@ -fileFormatVersion: 2 -guid: ba752ea6a378c0f4b85eb2c6699d5927 -TextureImporter: - fileIDToRecycleName: {} - externalObjects: {} - serializedVersion: 9 - mipmaps: - mipMapMode: 0 - enableMipMap: 0 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 2 - aniso: -1 - mipBias: -100 - wrapU: 1 - wrapV: 1 - wrapW: 1 - nPOTScale: 0 - lightmap: 0 - compressionQuality: 50 - spriteMode: 1 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 1 - spriteTessellationDetail: -1 - textureType: 8 - textureShape: 1 - singleChannelComponent: 0 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - platformSettings: - - serializedVersion: 2 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: 0596654a55e6eb644955bbd22df5ef88 - vertices: [] - indices: - edges: [] - weights: [] - spritePackingTag: DynamicActivityAtlas - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ShengXingYouLi/ArtFont/s_shengxingyouli_anniu_02.png b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ShengXingYouLi/ArtFont/s_shengxingyouli_anniu_02.png deleted file mode 100644 index c30a33ca83..0000000000 Binary files a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ShengXingYouLi/ArtFont/s_shengxingyouli_anniu_02.png and /dev/null differ diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ShengXingYouLi/ArtFont/s_shengxingyouli_anniu_02.png.meta b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ShengXingYouLi/ArtFont/s_shengxingyouli_anniu_02.png.meta deleted file mode 100644 index f2014d71e3..0000000000 --- a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ShengXingYouLi/ArtFont/s_shengxingyouli_anniu_02.png.meta +++ /dev/null @@ -1,88 +0,0 @@ -fileFormatVersion: 2 -guid: 84d313d3af8bd044abec1ed0102c2553 -TextureImporter: - fileIDToRecycleName: {} - externalObjects: {} - serializedVersion: 9 - mipmaps: - mipMapMode: 0 - enableMipMap: 0 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 2 - aniso: -1 - mipBias: -100 - wrapU: 1 - wrapV: 1 - wrapW: 1 - nPOTScale: 0 - lightmap: 0 - compressionQuality: 50 - spriteMode: 1 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 1 - spriteTessellationDetail: -1 - textureType: 8 - textureShape: 1 - singleChannelComponent: 0 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - platformSettings: - - serializedVersion: 2 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: 294ac2a3f0333424f958e1ce382a03a0 - vertices: [] - indices: - edges: [] - weights: [] - spritePackingTag: DynamicActivityAtlas - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ShengXingYouLi/ArtFont/s_shengxingyouli_banner.png b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ShengXingYouLi/ArtFont/s_shengxingyouli_banner.png deleted file mode 100644 index af812c4296..0000000000 Binary files a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ShengXingYouLi/ArtFont/s_shengxingyouli_banner.png and /dev/null differ diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ShengXingYouLi/ArtFont/s_shengxingyouli_banner.png.meta b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ShengXingYouLi/ArtFont/s_shengxingyouli_banner.png.meta deleted file mode 100644 index 8aff41b6e3..0000000000 --- a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ShengXingYouLi/ArtFont/s_shengxingyouli_banner.png.meta +++ /dev/null @@ -1,88 +0,0 @@ -fileFormatVersion: 2 -guid: d8ad4c7dbbe399f49b5e4848235d8431 -TextureImporter: - fileIDToRecycleName: {} - externalObjects: {} - serializedVersion: 9 - mipmaps: - mipMapMode: 0 - enableMipMap: 0 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 2 - aniso: -1 - mipBias: -100 - wrapU: 1 - wrapV: 1 - wrapW: 1 - nPOTScale: 0 - lightmap: 0 - compressionQuality: 50 - spriteMode: 1 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 1 - spriteTessellationDetail: -1 - textureType: 8 - textureShape: 1 - singleChannelComponent: 0 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - platformSettings: - - serializedVersion: 2 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: d4c961d93e89ce64286416e83b0f9696 - vertices: [] - indices: - edges: [] - weights: [] - spritePackingTag: DynamicActivityAtlas - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/TimeLimitedCall/x_xianshizaohuan_wujiangyulan 1.png b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/TimeLimitedCall/x_xianshizaohuan_wujiangyulan 1.png deleted file mode 100644 index 56b608c403..0000000000 Binary files a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/TimeLimitedCall/x_xianshizaohuan_wujiangyulan 1.png and /dev/null differ diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/TimeLimitedCall/x_xianshizaohuan_wujiangyulan 1.png.meta b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/TimeLimitedCall/x_xianshizaohuan_wujiangyulan 1.png.meta deleted file mode 100644 index 944db11414..0000000000 --- a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/TimeLimitedCall/x_xianshizaohuan_wujiangyulan 1.png.meta +++ /dev/null @@ -1,110 +0,0 @@ -fileFormatVersion: 2 -guid: 2c330d9abc695a041b17e8bcf24aa1f6 -TextureImporter: - fileIDToRecycleName: {} - externalObjects: {} - serializedVersion: 9 - mipmaps: - mipMapMode: 0 - enableMipMap: 0 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 2 - aniso: -1 - mipBias: -100 - wrapU: 1 - wrapV: 1 - wrapW: 1 - nPOTScale: 0 - lightmap: 0 - compressionQuality: 50 - spriteMode: 1 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 1 - spriteTessellationDetail: -1 - textureType: 8 - textureShape: 1 - singleChannelComponent: 0 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - platformSettings: - - serializedVersion: 2 - buildTarget: Android - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: 65 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 1 - androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: iPhone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: 65 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 1 - androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: 4 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 1 - androidETC2FallbackOverride: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: acc4cb5f5338cc94eb87c199f6673697 - vertices: [] - indices: - edges: [] - weights: [] - spritePackingTag: DynamicActivityAtlas - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ManagedResources/EffectResSkill/Effect_buff_hunluan/Materials/H_lizi_20.mat b/Assets/ManagedResources/EffectResSkill/Effect_buff_hunluan/Materials/H_lizi_20_mat.mat similarity index 100% rename from Assets/ManagedResources/EffectResSkill/Effect_buff_hunluan/Materials/H_lizi_20.mat rename to Assets/ManagedResources/EffectResSkill/Effect_buff_hunluan/Materials/H_lizi_20_mat.mat diff --git a/Assets/ManagedResources/EffectResSkill/Effect_buff_hunluan/Materials/H_lizi_20.mat.meta b/Assets/ManagedResources/EffectResSkill/Effect_buff_hunluan/Materials/H_lizi_20_mat.mat.meta similarity index 100% rename from Assets/ManagedResources/EffectResSkill/Effect_buff_hunluan/Materials/H_lizi_20.mat.meta rename to Assets/ManagedResources/EffectResSkill/Effect_buff_hunluan/Materials/H_lizi_20_mat.mat.meta diff --git a/Assets/ManagedResources/EffectResSkill/Effect_buff_hunluan/Texture/Lz_buff_gantanhao.png b/Assets/ManagedResources/EffectResSkill/Effect_buff_hunluan/Texture/Lz_buff_gantanhao_png.png similarity index 100% rename from Assets/ManagedResources/EffectResSkill/Effect_buff_hunluan/Texture/Lz_buff_gantanhao.png rename to Assets/ManagedResources/EffectResSkill/Effect_buff_hunluan/Texture/Lz_buff_gantanhao_png.png diff --git a/Assets/ManagedResources/EffectResSkill/Effect_buff_hunluan/Texture/Lz_buff_gantanhao.png.meta b/Assets/ManagedResources/EffectResSkill/Effect_buff_hunluan/Texture/Lz_buff_gantanhao_png.png.meta similarity index 100% rename from Assets/ManagedResources/EffectResSkill/Effect_buff_hunluan/Texture/Lz_buff_gantanhao.png.meta rename to Assets/ManagedResources/EffectResSkill/Effect_buff_hunluan/Texture/Lz_buff_gantanhao_png.png.meta diff --git a/Assets/ManagedResources/EffectResSkill/Effect_buff_hunluan/Texture/Lz_buff_wenhao.png b/Assets/ManagedResources/EffectResSkill/Effect_buff_hunluan/Texture/Lz_buff_wenhao_png.png similarity index 100% rename from Assets/ManagedResources/EffectResSkill/Effect_buff_hunluan/Texture/Lz_buff_wenhao.png rename to Assets/ManagedResources/EffectResSkill/Effect_buff_hunluan/Texture/Lz_buff_wenhao_png.png diff --git a/Assets/ManagedResources/EffectResSkill/Effect_buff_hunluan/Texture/Lz_buff_wenhao.png.meta b/Assets/ManagedResources/EffectResSkill/Effect_buff_hunluan/Texture/Lz_buff_wenhao_png.png.meta similarity index 100% rename from Assets/ManagedResources/EffectResSkill/Effect_buff_hunluan/Texture/Lz_buff_wenhao.png.meta rename to Assets/ManagedResources/EffectResSkill/Effect_buff_hunluan/Texture/Lz_buff_wenhao_png.png.meta diff --git a/Assets/ManagedResources/Icon/Item/r_LvUpItem_linpai.png.meta b/Assets/ManagedResources/Icon/Item/r_LvUpItem_linpai.png.meta index bc572dd6fb..2700d55987 100644 --- a/Assets/ManagedResources/Icon/Item/r_LvUpItem_linpai.png.meta +++ b/Assets/ManagedResources/Icon/Item/r_LvUpItem_linpai.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 8e1ee64e86d8e264cbf993941acf3d3a +guid: 18c41263352fe2c4daa44c678b1f2850 TextureImporter: fileIDToRecycleName: {} externalObjects: {} diff --git a/Assets/ManagedResources/Icons/r_LvUpItem_linpai.png b/Assets/ManagedResources/Icons/r_LvUpItem_linpai.png deleted file mode 100644 index d6e8a4336c..0000000000 Binary files a/Assets/ManagedResources/Icons/r_LvUpItem_linpai.png and /dev/null differ diff --git a/Assets/ManagedResources/Icons/r_LvUpItem_linpai.png.meta b/Assets/ManagedResources/Icons/r_LvUpItem_linpai.png.meta deleted file mode 100644 index bc572dd6fb..0000000000 --- a/Assets/ManagedResources/Icons/r_LvUpItem_linpai.png.meta +++ /dev/null @@ -1,88 +0,0 @@ -fileFormatVersion: 2 -guid: 8e1ee64e86d8e264cbf993941acf3d3a -TextureImporter: - fileIDToRecycleName: {} - externalObjects: {} - serializedVersion: 9 - mipmaps: - mipMapMode: 0 - enableMipMap: 0 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 - wrapU: 1 - wrapV: 1 - wrapW: 1 - nPOTScale: 0 - lightmap: 0 - compressionQuality: 50 - spriteMode: 1 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 1 - spriteTessellationDetail: -1 - textureType: 8 - textureShape: 1 - singleChannelComponent: 0 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - platformSettings: - - serializedVersion: 2 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: 1aff2425d90bc4647898800200329293 - vertices: [] - indices: - edges: [] - weights: [] - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ManagedResources/Prefabs/UI/DynamicActicity/page13.prefab b/Assets/ManagedResources/Prefabs/UI/DynamicActicity/page13.prefab index 86ab43e4c2..d4b045f060 100644 --- a/Assets/ManagedResources/Prefabs/UI/DynamicActicity/page13.prefab +++ b/Assets/ManagedResources/Prefabs/UI/DynamicActicity/page13.prefab @@ -139,7 +139,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 8e1ee64e86d8e264cbf993941acf3d3a, type: 3} + m_Sprite: {fileID: 21300000, guid: 18c41263352fe2c4daa44c678b1f2850, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/Assets/ManagedResources/Prefabs/UI/DynamicActicity/page15.prefab b/Assets/ManagedResources/Prefabs/UI/DynamicActicity/page15.prefab index 5fda7c172d..12c15f2740 100644 --- a/Assets/ManagedResources/Prefabs/UI/DynamicActicity/page15.prefab +++ b/Assets/ManagedResources/Prefabs/UI/DynamicActicity/page15.prefab @@ -478,7 +478,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: d8ad4c7dbbe399f49b5e4848235d8431, type: 3} + m_Sprite: {fileID: 21300000, guid: a0e8ad18674f72748a755c90097d0c6e, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -500,7 +500,7 @@ GameObject: - component: {fileID: 1869238505622516953} - component: {fileID: 450049816729069031} m_Layer: 5 - m_Name: page13 + m_Name: page15 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 diff --git a/Assets/ManagedResources/Prefabs/UI/Recruit/SingleRecruitPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Recruit/SingleRecruitPanel.prefab index b611586011..061baaaba2 100644 --- a/Assets/ManagedResources/Prefabs/UI/Recruit/SingleRecruitPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Recruit/SingleRecruitPanel.prefab @@ -211285,7 +211285,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &3529688540119053015 RectTransform: m_ObjectHideFlags: 0 @@ -211308,7 +211308,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 22.520008} + m_AnchoredPosition: {x: 0, y: 22.52002} m_SizeDelta: {x: 63.700073, y: 45.759987} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &260006030002974251 @@ -211378,7 +211378,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0.00010521142} + m_AnchoredPosition: {x: 0, y: 0.00022695823} m_SizeDelta: {x: 0, y: 335} m_Pivot: {x: 0, y: 1} --- !u!114 &7831612963117775310 diff --git a/Assets/ManagedResources/~Lua/Modules/Bag/BagResolveAnCompoundPanel.lua b/Assets/ManagedResources/~Lua/Modules/Bag/BagResolveAnCompoundPanel.lua index 7808a33a0c..9c199567f9 100644 --- a/Assets/ManagedResources/~Lua/Modules/Bag/BagResolveAnCompoundPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Bag/BagResolveAnCompoundPanel.lua @@ -262,9 +262,10 @@ function this.OnShowLayout2Data() if openLayoutType==1 then--批量分解 this.nameText.text=Language[10204] this.layout2Text.text=Language[10205] - elseif openLayoutType==2 then--单个装备分解 - this.nameText.text=Language[10206] - this.layout2Text.text=Language[10207]..GetQuantityStrByquality(ConfigManager.GetConfigData(ConfigName.ItemConfig, equipData.id).Quantity)..Language[10208] + elseif openLayoutType==2 then--单个装备分解 + this.nameText.text=Language[12233] + this.layout2Text.text="当前出售的装备为"..GetQuantityStrByquality(ConfigManager.GetConfigData(ConfigName.ItemConfig, equipData.id).Quantity).."品质的装备,确定进行出售?" + end end --初始化Layout3 diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Buff.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Buff.lua index a1b480021b..286c641f5c 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Buff.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Buff.lua @@ -326,7 +326,7 @@ function BuffManager:PassUpdate() end end end - +--只更新不灭buff function BuffManager:PassUpdateNoDead() local curCamp, curPos = BattleLogic.GetCurTurn() for i=1, self.buffDic.size do @@ -339,6 +339,7 @@ function BuffManager:PassUpdateNoDead() and buff.caster.position == curPos and buff.roundDuration > 0 -- 不是无限存在的buff and buff.caster.type~=BattleUnitType.Monster --灵兽的buff在这里处理 + and buff.type==BuffName.NoDead --不灭在这里处理 then -- 当前轮释放的buff不结算 buff.roundPass = buff.roundPass + 1 diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBox.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBox.lua index db4614fe0c..72e8405272 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBox.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBox.lua @@ -89,6 +89,8 @@ function QianKunBox:BindEvent() self.btnBack:SetActive(true) self.tabList:SetActive(true) self.bottomBar:SetActive(true) + parent.UpView:OnOpen({ showType = UpViewOpenType.ShowLeft, panelType = PanelType.QianKunBox }) + QianKunBox:Refresh() end) end @@ -114,6 +116,7 @@ function QianKunBox:refreshBtnShow() -- self.btnTen2:SetActive(BagManager.GetItemCountById(16)>=2000) -- self.btnTen1:SetActive(BagManager.GetItemCountById(16)<2000) + self.shop:SetActive(false) local freeTimesId=lotterySetting[singleRecruit.Id].FreeTimes local maxtimesId=lotterySetting[singleRecruit.Id].MaxTimes --lotterySetting表中的MaxTimes对应privilegeConfig表中的id local curTimes=PrivilegeManager.GetPrivilegeUsedTimes(maxtimesId) diff --git a/Assets/ManagedResources/~Lua/Modules/Map/MapPanel.lua b/Assets/ManagedResources/~Lua/Modules/Map/MapPanel.lua index d8675db721..24d6bb6b29 100644 --- a/Assets/ManagedResources/~Lua/Modules/Map/MapPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Map/MapPanel.lua @@ -475,6 +475,8 @@ function this.OnMapOut(outType) this.BackHome() MapManager.Mapping = false else --换层或者换地图 + -- 音效 + SoundManager.PlaySound(SoundConfig.Sound_xyc) this.ChangeMapByType() end Game.GlobalEvent:DispatchEvent(GameEvent.Event.PointTriggerEnd) @@ -492,7 +494,7 @@ function this.BackHome() this.Dispose() Game.GlobalEvent:RemoveEvent(GameEvent.UI.OnClose, triggerCallBack) end - BagManager.InBagGetMapBag() + -- BagManager.InBagGetMapBag() end Game.GlobalEvent:AddEvent(GameEvent.UI.OnClose, triggerCallBack) -- 清空一下副本任务 diff --git a/Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua b/Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua index 0a17cde15d..bca78d7905 100644 --- a/Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua @@ -13,6 +13,7 @@ function this.RegisterMessage(network) local socket = network.socket -- 监听服务器跨天状态N socket:RegistNetMessage(MessageTypeProto_pb.FIVE_PLAYER_REFLUSH_INDICATION, this.RefreshUpdateIndication) + socket:RegistNetMessage(MessageTypeProto_pb.ZeroPlayerUpdateIndication, this.ZeroRefreshUpdateIndication) --监听红点推送 socket:RegistNetMessage(MessageTypeProto_pb.SEND_RED_POINT_INDICATION, this.ReceiveRedPoint) @@ -115,6 +116,9 @@ function this.RegisterMessage(network) --公户副本推送 socket:RegistNetMessage(MessageTypeProto_pb.GUILD_CHALLENGE_BUY_BUFF_INDICATION, this.GuildChallengeBuyBuffIndication) socket:RegistNetMessage(MessageTypeProto_pb.HERO_SKIN_USE_INDICATION, this.HeroSkinUseIndication) + --跨服天梯信息推送 + -- socket:RegistNetMessage(MessageTypeProto_pb.HERO_SKIN_USE_INDICATION, this.GetWorldArenaInfoIndication) + socket:RegistNetMessage(MessageTypeProto_pb.WorldLevelIndication, this.WorldLevelIndication) end function this.HeroSkinUseIndication(buffer) @@ -198,6 +202,8 @@ function this.RefreshUpdateIndication(buffer) GuildTranscriptManager.SetCanSweep1() end +function this.ZeroRefreshUpdateIndication() +end --服务器推送红点信息 function this.ReceiveRedPoint(buffer) local data = buffer:DataByte() @@ -800,5 +806,11 @@ function this.GuildChallengeBuyBuffIndication(buffer) -- LogGreen("%%%%%%%%%%%msg.buffCount: "..msg.buffCount.." msg.buffTime: "..msg.buffTime) GuildTranscriptManager.RefreshGuildTranscriptBuffInfo(msg) end - +function this.WorldLevelIndication(buffer) + local data = buffer:DataByte() + local msg = PlayerInfoProto_pb.WorldLevelIndication() + msg:ParseFromString(data) + -- LogError("%%%%%%%%%%世界等级推送 "..msg.worldLeve) + -- PlayerManager.RefreshWorldLeveData(msg.worldLeve) +end return this \ No newline at end of file