From cbe3c22d13b30208eccfa75ecd36f88adaa72930 Mon Sep 17 00:00:00 2001
From: hxb <hxb@hdlchina.com.cn>
Date: 星期五, 26 二月 2021 16:50:00 +0800
Subject: [PATCH] Merge branch 'ez-test' into temp-wxr
---
HDL-ON_iOS/Assets.xcassets/AppIcon.appiconset/Contents.json | 28 +++++++++++++++-------------
1 files changed, 15 insertions(+), 13 deletions(-)
diff --git a/HDL-ON_iOS/Assets.xcassets/AppIcon.appiconset/Contents.json b/HDL-ON_iOS/Assets.xcassets/AppIcon.appiconset/Contents.json
index 4d6f470..1502cbc 100644
--- a/HDL-ON_iOS/Assets.xcassets/AppIcon.appiconset/Contents.json
+++ b/HDL-ON_iOS/Assets.xcassets/AppIcon.appiconset/Contents.json
@@ -1,83 +1,85 @@
{
"images": [
{
- "filename": "40路40@2x.png",
+ "filename": "40x40.png",
"size": "20x20",
"scale": "2x",
"idiom": "iphone"
},
{
- "filename": "60路60@3x.png",
+ "filename": "60x60.png",
"size": "20x20",
"scale": "3x",
"idiom": "iphone"
},
{
- "filename": "58路58@2x.png",
+ "filename": "58x58.png",
"size": "29x29",
"scale": "2x",
"idiom": "iphone"
},
{
- "filename": "87路87@3x.png",
+ "filename": "87x87.png",
"size": "29x29",
"scale": "3x",
"idiom": "iphone"
},
{
- "filename": "80路80@2x.png",
+ "filename": "80x80.png",
"size": "40x40",
"scale": "2x",
"idiom": "iphone"
},
{
- "filename": "120路120@2x.png",
+ "filename": "120x120.png",
"size": "40x40",
"scale": "3x",
"idiom": "iphone"
},
{
- "filename": "120路120@3x.png",
+ "filename": "120x120-1.png",
"size": "60x60",
"scale": "2x",
"idiom": "iphone"
},
{
- "filename": "180路180@3x.png",
+ "filename": "180.png",
"size": "60x60",
"scale": "3x",
"idiom": "iphone"
},
{
- "filename": "20路20.png",
+ "filename": "20x20.png",
"size": "20x20",
"scale": "1x",
"idiom": "ipad"
},
{
- "filename": "40路40@2x-1.png",
+ "filename": "40x40-1.png",
"size": "20x20",
"scale": "2x",
"idiom": "ipad"
},
{
- "filename": "29路29.png",
+ "filename": "29x29.png",
"size": "29x29",
"scale": "1x",
"idiom": "ipad"
},
{
- "filename": "58路58@2x-1.png",
+ "filename": "58x58-1.png",
"size": "29x29",
"scale": "2x",
"idiom": "ipad"
},
{
+ "filename": "40x40-2.png",
"size": "40x40",
"scale": "1x",
"idiom": "ipad"
},
{
+ "filename": "80x80-1.png",
"size": "40x40",
"scale": "2x",
"idiom": "ipad"
@@ -98,7 +100,7 @@
"idiom": "ipad"
},
{
- "filename": "1024路1024@2x.png",
+ "filename": "1024.png",
"size": "1024x1024",
"scale": "1x",
"idiom": "ios-marketing"
--
Gitblit v1.8.0